match FakePiki::doAnimation()

used correct getTranslation
2024-11-23 05:20:06 +00:00 · 2024-08-28 16:51:16 -04:00 · 2024-08-28 16:51:16 -04:00 · 9541fcab5d
commit 9541fcab5d
parent a1c7dc915b
4 changed files with 20 additions and 336 deletions
--- a/docs/recommended_todo.md
+++ b/docs/recommended_todo.md
@ -34,7 +34,7 @@
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMaterial.cpp">J2D/J2DMaterial.cpp</a> | 15401 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio_JParticle/object-particle.cpp">JStudio_JParticle/object-particle.cpp</a> | 16851 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DCluster.cpp">J3D/J3DCluster.cpp</a> | 18929 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMaterialFactory.cpp">J2D/J2DMaterialFactory.cpp</a> | 18966 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DTextBoxEx.cpp">J2D/J2DTextBoxEx.cpp</a> | 19100 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASChannel.cpp">JAudio//JAS/JASChannel.cpp</a> | 19252 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASBNKParser.cpp">JAudio//JAS/JASBNKParser.cpp</a> | 19529 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/fvb.cpp">JStudio/fvb.cpp</a> | 20557 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASBNKParser.cpp">JAudio//JAS/JASBNKParser.cpp</a> | 19529 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/fvb.cpp">JStudio/fvb.cpp</a> | 20332 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DTevs.cpp">J3D/J3DTevs.cpp</a> | 20723 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMtxBuffer.cpp">J3D/J3DMtxBuffer.cpp</a> | 20816 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DModelLoaderCalcSize.cpp">J3D/J3DModelLoaderCalcSize.cpp</a> | 21313 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterial.cpp">J3D/J3DMaterial.cpp</a> | 21616 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIAnimation.cpp">JAudio//JAI/JAIAnimation.cpp</a> | 22715 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DWindow.cpp">J2D/J2DWindow.cpp</a> | 23735 |
@ -55,7 +55,7 @@
 | File | Size (bytes) | File | Size (bytes) |
 | ---- | ---- | ---- | ---- |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebi2DCallBack.cpp">ebi2DCallBack.cpp</a> | 10843 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/particleMgr.cpp">particleMgr.cpp</a> | 12945 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiP2Title.cpp">ebiP2Title.cpp</a> | 23867 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efxPikmin.cpp">efxPikmin.cpp</a> | 31834 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiP2Title.cpp">ebiP2Title.cpp</a> | 23868 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efxPikmin.cpp">efxPikmin.cpp</a> | 31834 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efxEnemy.cpp">efxEnemy.cpp</a> | 32976 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efxBase.cpp">efxBase.cpp</a> | 34373 |

 ### <section id="plugProjectHikinoU">plugProjectHikinoU</section>
@ -74,19 +74,19 @@
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemHoney.cpp">itemHoney.cpp</a> | 12291 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiBreakGate.cpp">aiBreakGate.cpp</a> | 13960 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/texCaster.cpp">texCaster.cpp</a> | 16211 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameCaveInfo.cpp">gameCaveInfo.cpp</a> | 16285 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_CaveResult.cpp">singleGS_CaveResult.cpp</a> | 19814 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemCave.cpp">itemCave.cpp</a> | 20306 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pathfinder.cpp">pathfinder.cpp</a> | 22658 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemPikihead.cpp">itemPikihead.cpp</a> | 24012 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pathfinder.cpp">pathfinder.cpp</a> | 22687 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemPikihead.cpp">itemPikihead.cpp</a> | 24012 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameCPlate.cpp">gameCPlate.cpp</a> | 24190 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/dynCreature.cpp">dynCreature.cpp</a> | 25766 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameDynamics.cpp">gameDynamics.cpp</a> | 27134 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/vsCardMgr.cpp">vsCardMgr.cpp</a> | 30816 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemBridge.cpp">itemBridge.cpp</a> | 32201 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemGate.cpp">itemGate.cpp</a> | 32864 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/routeMgr.cpp">routeMgr.cpp</a> | 34738 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/piki.cpp">piki.cpp</a> | 35847 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/routeMgr.cpp">routeMgr.cpp</a> | 34733 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/piki.cpp">piki.cpp</a> | 35847 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gamePlayDataMemCard.cpp">gamePlayDataMemCard.cpp</a> | 36191 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gamePlayData.cpp">gamePlayData.cpp</a> | 37263 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/collinfo.cpp">collinfo.cpp</a> | 43044 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/cellPyramid.cpp">cellPyramid.cpp</a> | 48069 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/fakePiki.cpp">fakePiki.cpp</a> | 49548 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiFormation.cpp">aiFormation.cpp</a> | 53090 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletState.cpp">pelletState.cpp</a> | 63252 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemUjamushi.cpp">itemUjamushi.cpp</a> | 64520 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/fakePiki.cpp">fakePiki.cpp</a> | 42168 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/collinfo.cpp">collinfo.cpp</a> | 43051 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/cellPyramid.cpp">cellPyramid.cpp</a> | 48069 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiFormation.cpp">aiFormation.cpp</a> | 53090 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletState.cpp">pelletState.cpp</a> | 63252 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemUjamushi.cpp">itemUjamushi.cpp</a> | 64521 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemPlant.cpp">itemPlant.cpp</a> | 73535 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/baseGameSection.cpp">baseGameSection.cpp</a> | 86417 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiPrimitives.cpp">aiPrimitives.cpp</a> | 117179 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletMgr.cpp">pelletMgr.cpp</a> | 134271 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/navi.cpp">navi.cpp</a> | 148667 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pikiState.cpp">pikiState.cpp</a> | 155829 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/naviState.cpp">naviState.cpp</a> | 163213 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_Zukan.cpp">singleGS_Zukan.cpp</a> | 163862 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/navi.cpp">navi.cpp</a> | 148733 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pikiState.cpp">pikiState.cpp</a> | 155829 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/naviState.cpp">naviState.cpp</a> | 163224 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_Zukan.cpp">singleGS_Zukan.cpp</a> | 163862 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameMapParts.cpp">gameMapParts.cpp</a> | 164137 |  |  |

 ### <section id="plugProjectKonoU">plugProjectKonoU</section>
@ -101,9 +101,9 @@
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/scrollList.cpp">scrollList.cpp</a> | 25920 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/dayEndCount.cpp">dayEndCount.cpp</a> | 26621 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/hurryUp2D.cpp">hurryUp2D.cpp</a> | 27172 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/miulin.cpp">miulin.cpp</a> | 27527 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/jigumo.cpp">jigumo.cpp</a> | 42368 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/shijimiChou.cpp">shijimiChou.cpp</a> | 43362 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/panModoki.cpp">panModoki.cpp</a> | 45150 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/kingChappyState.cpp">kingChappyState.cpp</a> | 50807 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/panModoki.cpp">panModoki.cpp</a> | 45170 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/kingChappyState.cpp">kingChappyState.cpp</a> | 50807 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/umiMushi.cpp">umiMushi.cpp</a> | 60146 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/kingChappy.cpp">kingChappy.cpp</a> | 64498 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/hiScore2D.cpp">hiScore2D.cpp</a> | 76415 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/blackMan.cpp">blackMan.cpp</a> | 121887 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/hiScore2D.cpp">hiScore2D.cpp</a> | 76415 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/blackMan.cpp">blackMan.cpp</a> | 121903 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/zukan2D.cpp">zukan2D.cpp</a> | 134432 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/challengeResult2D.cpp">challengeResult2D.cpp</a> | 142175 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/challengeSelect2D.cpp">challengeSelect2D.cpp</a> | 186008 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectMorimuraU/vsSelect2D.cpp">vsSelect2D.cpp</a> | 196475 |

@ -150,7 +150,7 @@
 | ---- | ---- | ---- | ---- |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectYamashitaU/enemyStoneDrawInfo.cpp">enemyStoneDrawInfo.cpp</a> | 19376 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectYamashitaU/singleGS_ZukanParms.cpp">singleGS_ZukanParms.cpp</a> | 22108 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectYamashitaU/vtxAnm.cpp">vtxAnm.cpp</a> | 31264 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectYamashitaU/enemyAction.cpp">enemyAction.cpp</a> | 51404 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectYamashitaU/kochappyState.cpp">kochappyState.cpp</a> | 65689 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectYamashitaU/gameLightMgr.cpp">gameLightMgr.cpp</a> | 74639 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectYamashitaU/kochappyState.cpp">kochappyState.cpp</a> | 65700 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectYamashitaU/gameLightMgr.cpp">gameLightMgr.cpp</a> | 74630 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectYamashitaU/chappyState.cpp">chappyState.cpp</a> | 76099 |  |  |

 ### <section id="sysBootupU">sysBootupU</section>
@ -175,7 +175,7 @@
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/windowMessage.cpp">windowMessage.cpp</a> | 29493 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/system.cpp">system.cpp</a> | 29894 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/memoryCard.cpp">memoryCard.cpp</a> | 31375 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/bootSection.cpp">bootSection.cpp</a> | 38584 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/movieMessage.cpp">movieMessage.cpp</a> | 44324 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/pikmin2MemoryCardMgr.cpp">pikmin2MemoryCardMgr.cpp</a> | 51639 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/graphics.cpp">graphics.cpp</a> | 76184 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/messageRendering.cpp">messageRendering.cpp</a> | 88201 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/graphics.cpp">graphics.cpp</a> | 76184 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/messageRendering.cpp">messageRendering.cpp</a> | 88271 |

 ### <section id="utilityU">utilityU</section>
 | File | Size (bytes) | File | Size (bytes) |
--- a/include/Matrixf.h
+++ b/include/Matrixf.h
@ -345,6 +345,7 @@ struct Matrixf {
 	 * Returns the translation vector of the matrix.
 	 *
 	 * @return The translation vector.
+	 * @note Is this even used? Most calls seem to use the above return-through-parameter. This isn't even in the map.
 	 */
 	inline Vector3f getTranslation() { return getColumn(3); }

--- a/src/plugProjectKandoU/collinfo.cpp
+++ b/src/plugProjectKandoU/collinfo.cpp
@ -1092,7 +1092,9 @@ void CollPart::calcPoseMatrix(Vector3f& input, Matrixf& poseMatrix)
 		Matrixf mtx;
 		makeMatrixTo(mtx);

-		Vector3f pos = mtx.getTranslation();
+		Vector3f pos;
+		mtx.getTranslation(pos);
+
 		pos -= input;
 		f32 len = pos.normalise();

--- a/src/plugProjectKandoU/fakePiki.cpp
+++ b/src/plugProjectKandoU/fakePiki.cpp
@ -1417,7 +1417,9 @@ void FakePiki::doAnimation()
 	updateTrMatrix();
 	if (isNavi() && static_cast<Navi*>(this)->mPellet) {
 		static_cast<Navi*>(this)->viewMakeMatrix(mBaseTrMatrix);
-		mPosition = mBaseTrMatrix.getTranslation(); // mismatch here in this inline
+		Vector3f pos;
+		mBaseTrMatrix.getTranslation(pos);
+		mPosition = pos;
 	}
 	PSMTXCopy(mBaseTrMatrix.mMatrix.mtxView, mModel->getJ3DModel()->mPosMtx);
 	sCurrNeckTheta = mNeckTheta;
@ -1429,327 +1431,6 @@ void FakePiki::doAnimation()
 	if (mDoAnimCallback != nullptr) {
 		mDoAnimCallback->invoke();
 	}
-	/*
-	stwu     r1, -0x60(r1)
-	mflr     r0
-	stw      r0, 0x64(r1)
-	stfd     f31, 0x50(r1)
-	psq_st   f31, 88(r1), 0, qr0
-	stfd     f30, 0x40(r1)
-	psq_st   f30, 72(r1), 0, qr0
-	stw      r31, 0x3c(r1)
-	stw      r30, 0x38(r1)
-	stw      r29, 0x34(r1)
-	lwz      r5, sys@sda21(r13)
-	mr       r30, r3
-	lis      r6, lbl_8047C708@ha
-	addi     r4, r2, lbl_80518330@sda21
-	lwz      r3, 0x28(r5)
-	addi     r31, r6, lbl_8047C708@l
-	li       r5, 1
-	bl       _start__9SysTimersFPcb
-	addi     r3, r1, 0x18
-	bl       __ct__Q24Game9AILODParmFv
-	lfs      f1, lbl_805182C0@sda21(r2)
-	mr       r3, r30
-	lfs      f0, lbl_80518338@sda21(r2)
-	stfs     f1, 0x18(r1)
-	stfs     f0, 0x1c(r1)
-	bl       updateCell__Q24Game8CreatureFv
-	mr       r3, r30
-	addi     r4, r1, 0x18
-	bl       updateLOD__Q24Game8CreatureFRQ24Game9AILODParm
-	lwz      r3, sys@sda21(r13)
-	addi     r4, r2, lbl_80518330@sda21
-	lwz      r3, 0x28(r3)
-	bl       _stop__9SysTimersFPc
-	mr       r3, r30
-	lwz      r4, sys@sda21(r13)
-	lwz      r12, 0(r30)
-	lfs      f31, 0x54(r4)
-	lwz      r12, 0xc0(r12)
-	mtctr    r12
-	bctrl
-	clrlwi.  r0, r3, 0x18
-	beq      lbl_8013E934
-	lfs      f0, lbl_805182B8@sda21(r2)
-	stfs     f0, 0x234(r30)
-
-lbl_8013E934:
-	mr       r3, r30
-	lfs      f0, 0x234(r30)
-	lwz      r12, 0(r30)
-	fmuls    f30, f0, f31
-	lwz      r12, 0x18(r12)
-	mtctr    r12
-	bctrl
-	clrlwi.  r0, r3, 0x18
-	beq      lbl_8013E970
-	mr       r3, r30
-	bl       doped__Q24Game4PikiFv
-	clrlwi.  r0, r3, 0x18
-	beq      lbl_8013E970
-	lfs      f0, lbl_8051833C@sda21(r2)
-	fmuls    f30, f30, f0
-
-lbl_8013E970:
-	lwz      r3, gameSystem__4Game@sda21(r13)
-	lbz      r0, 0x4a(r3)
-	cmplwi   r0, 0
-	bne      lbl_8013E9B8
-	addi     r3, r30, 0x1ac
-	fmr      f1, f30
-	lwz      r12, 0x1ac(r30)
-	lwz      r12, 0xc(r12)
-	mtctr    r12
-	bctrl
-	li       r0, 0
-	addi     r3, r30, 0x1c8
-	stb      r0, verbose__Q28SysShape8Animator@sda21(r13)
-	fmr      f1, f30
-	lwz      r12, 0x1c8(r30)
-	lwz      r12, 0xc(r12)
-	mtctr    r12
-	bctrl
-
-lbl_8013E9B8:
-	mr       r3, r30
-	lwz      r12, 0(r30)
-	lwz      r12, 0x18(r12)
-	mtctr    r12
-	bctrl
-	clrlwi.  r0, r3, 0x18
-	beq      lbl_8013EA50
-	lbz      r0, 0xd8(r30)
-	clrlwi   r0, r0, 0x1e
-	cmpwi    r0, 1
-	blt      lbl_8013EA50
-	lwz      r0, 0x174(r30)
-	cmplwi   r0, 0
-	bne      lbl_8013EA18
-	mr       r3, r30
-	lwz      r12, 0(r30)
-	lwz      r12, 0x1ac(r12)
-	mtctr    r12
-	bctrl
-	addi     r3, r31, 0x18
-	addi     r5, r31, 0x40
-	li       r4, 0x69e
-	crclr    6
-	bl       panic_f__12JUTExceptionFPCciPCce
-
-lbl_8013EA18:
-	lwz      r3, 0x174(r30)
-	li       r0, 0
-	lwz      r3, 8(r3)
-	lwz      r3, 4(r3)
-	lwz      r3, 0x28(r3)
-	lwz      r3, 0(r3)
-	stw      r0, 0x54(r3)
-	lwz      r3, 0x174(r30)
-	lwz      r3, 8(r3)
-	lwz      r3, 4(r3)
-	lwz      r3, 0x28(r3)
-	lwz      r3, 0x10(r3)
-	stw      r0, 0x54(r3)
-	b        lbl_8013EAA8
-
-lbl_8013EA50:
-	addi     r3, r30, 0x1c8
-	lwz      r29, 0x174(r30)
-	lwz      r12, 0x1c8(r30)
-	lwz      r12, 8(r12)
-	mtctr    r12
-	bctrl
-	lwz      r4, 8(r29)
-	lwz      r4, 4(r4)
-	lwz      r4, 0x28(r4)
-	lwz      r4, 0(r4)
-	stw      r3, 0x54(r4)
-	addi     r3, r30, 0x1ac
-	lwz      r12, 0x1ac(r30)
-	lwz      r29, 0x174(r30)
-	lwz      r12, 8(r12)
-	mtctr    r12
-	bctrl
-	lwz      r4, 8(r29)
-	lwz      r4, 4(r4)
-	lwz      r4, 0x28(r4)
-	lwz      r4, 0x10(r4)
-	stw      r3, 0x54(r4)
-
-lbl_8013EAA8:
-	li       r0, 0
-	mr       r3, r30
-	stb      r0, verbose__Q28SysShape8Animator@sda21(r13)
-	lfs      f0, 0x20c(r30)
-	stfs     f0, 0x238(r30)
-	lfs      f0, 0x210(r30)
-	stfs     f0, 0x23c(r30)
-	lfs      f0, 0x214(r30)
-	stfs     f0, 0x240(r30)
-	lwz      r12, 0(r30)
-	lwz      r12, 0xbc(r12)
-	mtctr    r12
-	bctrl
-	clrlwi.  r0, r3, 0x18
-	bne      lbl_8013EB00
-	mr       r3, r30
-	lwz      r12, 0(r30)
-	lwz      r12, 0xb8(r12)
-	mtctr    r12
-	bctrl
-	clrlwi.  r0, r3, 0x18
-	bne      lbl_8013EBBC
-
-lbl_8013EB00:
-	lwz      r0, 0x248(r30)
-	cmplwi   r0, 0
-	beq      lbl_8013EBBC
-	mr       r3, r30
-	lwz      r12, 0(r30)
-	lwz      r12, 0x1e4(r12)
-	mtctr    r12
-	bctrl
-	clrlwi.  r0, r3, 0x18
-	bne      lbl_8013EB34
-	lwz      r0, 0xc8(r30)
-	cmplwi   r0, 0
-	bne      lbl_8013EB3C
-
-lbl_8013EB34:
-	mr       r3, r30
-	bl       moveVelocity__Q24Game8FakePikiFv
-
-lbl_8013EB3C:
-	mr       r3, r30
-	lwz      r12, 0(r30)
-	lwz      r12, 0x1d4(r12)
-	mtctr    r12
-	bctrl
-	clrlwi.  r0, r3, 0x18
-	beq      lbl_8013EBBC
-	lfs      f1, 0x1e4(r30)
-	lfs      f2, 0x1ec(r30)
-	fmuls    f4, f1, f1
-	lwz      r3, sys@sda21(r13)
-	fmuls    f3, f2, f2
-	lfs      f0, lbl_80518304@sda21(r2)
-	lfs      f30, 0x54(r3)
-	fadds    f3, f4, f3
-	fcmpo    cr0, f3, f0
-	ble      lbl_8013EBBC
-	lis      r3, atanTable___5JMath@ha
-	addi     r3, r3, atanTable___5JMath@l
-	bl       "atan2___Q25JMath18TAtanTable<1024,f>CFff"
-	lfs      f2, 0x1fc(r30)
-	bl       angDist__Fff
-	lfs      f0, lbl_80518310@sda21(r2)
-	lfs      f2, lbl_805182BC@sda21(r2)
-	fmuls    f1, f0, f1
-	lfs      f0, 0x1fc(r30)
-	fmuls    f1, f30, f1
-	fmadds   f0, f2, f1, f0
-	stfs     f0, 0x1fc(r30)
-	lfs      f1, 0x1fc(r30)
-	bl       roundAng__Ff
-	stfs     f1, 0x1fc(r30)
-
-lbl_8013EBBC:
-	mr       r3, r30
-	addi     r4, r1, 8
-	lwz      r12, 0(r30)
-	lwz      r12, 0x10(r12)
-	mtctr    r12
-	bctrl
-	lwz      r4, 0x190(r30)
-	mr       r3, r30
-	addi     r5, r1, 8
-	bl       checkWater__Q24Game8CreatureFPQ24Game8WaterBoxRQ23Sys6Sphere
-	stw      r3, 0x190(r30)
-	lwz      r0, mapMgr__4Game@sda21(r13)
-	cmplwi   r0, 0
-	beq      lbl_8013EC08
-	lwz      r3, _aiConstants__4Game@sda21(r13)
-	lfs      f0, 0x204(r30)
-	lfs      f1, 0x28(r3)
-	fnmsubs  f0, f31, f1, f0
-	stfs     f0, 0x204(r30)
-
-lbl_8013EC08:
-	mr       r3, r30
-	lwz      r12, 0(r30)
-	lwz      r12, 0x78(r12)
-	mtctr    r12
-	bctrl
-	mr       r3, r30
-	lwz      r12, 0(r30)
-	lwz      r12, 0x1c(r12)
-	mtctr    r12
-	bctrl
-	clrlwi.  r0, r3, 0x18
-	beq      lbl_8013EC68
-	lwz      r3, 0x250(r30)
-	lwz      r0, 4(r3)
-	cmplwi   r0, 0
-	beq      lbl_8013EC68
-	addi     r4, r30, 0x138
-	bl       viewMakeMatrix__Q24Game10PelletViewFR7Matrixf
-	lfs      f1, 0x154(r30)
-	lfs      f2, 0x164(r30)
-	lfs      f0, 0x144(r30)
-	stfs     f0, 0x20c(r30)
-	stfs     f1, 0x210(r30)
-	stfs     f2, 0x214(r30)
-
-lbl_8013EC68:
-	lwz      r4, 0x174(r30)
-	addi     r3, r30, 0x138
-	lwz      r4, 8(r4)
-	addi     r4, r4, 0x24
-	bl       PSMTXCopy
-	lfs      f0, 0x198(r30)
-	addi     r4, r31, 0x50
-	lwz      r3, sys@sda21(r13)
-	li       r5, 1
-	stfs     f0, sCurrNeckTheta__Q24Game8FakePiki@sda21(r13)
-	lfs      f0, 0x19c(r30)
-	stfs     f0, sCurrNeckPhi__Q24Game8FakePiki@sda21(r13)
-	lwz      r3, 0x28(r3)
-	bl       _start__9SysTimersFPcb
-	lwz      r3, 0x174(r30)
-	lwz      r3, 8(r3)
-	lwz      r12, 0(r3)
-	lwz      r12, 0x10(r12)
-	mtctr    r12
-	bctrl
-	lwz      r3, 0x114(r30)
-	bl       update__8CollTreeFv
-	lwz      r3, sys@sda21(r13)
-	addi     r4, r31, 0x50
-	lwz      r3, 0x28(r3)
-	bl       _stop__9SysTimersFPc
-	lwz      r3, 0x188(r30)
-	cmplwi   r3, 0
-	beq      lbl_8013ECEC
-	lwz      r12, 0(r3)
-	lwz      r12, 8(r12)
-	mtctr    r12
-	bctrl
-
-lbl_8013ECEC:
-	psq_l    f31, 88(r1), 0, qr0
-	lfd      f31, 0x50(r1)
-	psq_l    f30, 72(r1), 0, qr0
-	lfd      f30, 0x40(r1)
-	lwz      r31, 0x3c(r1)
-	lwz      r30, 0x38(r1)
-	lwz      r0, 0x64(r1)
-	lwz      r29, 0x34(r1)
-	mtlr     r0
-	addi     r1, r1, 0x60
-	blr
-	*/
 }

 /**