From ca71275bbecc7db9a4eeca3a6ac4215b66de4318 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Mon, 19 Dec 2022 11:06:32 -0800 Subject: [PATCH] big d_a_alink pass (#214) * d_a_alink pass1 wip * more d_a_alink work * remove asm * more daalink work * 20% dol code decompiled * fixed some nonmatchings for building * a few daalink functions and labeling some HIO data --- Progress.md | 22 +- .../getWeight__13J3DAnmClusterCFUs.s | 3 - .../J3DAnimation/init__12J3DFrameCtrlFs.s | 13 - asm/d/a/d_a_alink/allUnequip__9daAlink_cFi.s | 77 - .../basicModelDraw__9daAlink_cFP8J3DModel.s | 19 - .../bottleModelCallBack__9daAlink_cFv.s | 42 - .../d_a_alink/calcHairAngle__9daAlink_cFPs.s | 14 - ...lBoomerangLock__9daAlink_cFP10fopAc_ac_c.s | 19 - .../cancelBowMoveRideNotAtn__9daAlink_cFv.s | 41 - .../a/d_a_alink/cancelBowMove__9daAlink_cFv.s | 53 - .../d_a_alink/cancelCutCharge__9daAlink_cFv.s | 33 - .../cancelGoronThrowEvent__9daAlink_cFv.s | 21 - .../changeBoarRunRide__9daAlink_cFv.s | 10 - .../changeWolfBlendRate__9daAlink_cFi.s | 24 - ...heckAcceptUseItemInWater__9daAlink_cCFUs.s | 23 - .../checkArrowChargeEnd__9daAlink_cCFv.s | 12 - .../checkAttentionLock__9daAlink_cFv.s | 24 - .../checkBoardRestart__9daAlink_cFv.s | 21 - ...eckBoardSwordTriggerAction__9daAlink_cFv.s | 17 - ...BoomerangCarry__9daAlink_cFP10fopAc_ac_c.s | 76 - .../checkBoomerangCatchAction__9daAlink_cFv.s | 62 - .../checkBootsMoveAnime__9daAlink_cFi.s | 29 - .../checkBowAndSlingItem__9daAlink_cFi.s | 24 - .../d_a_alink/checkBowAnime__9daAlink_cCFv.s | 24 - ...checkBowCameraArrowPosP__9daAlink_cFPsPs.s | 74 - .../checkBowGrabLeftHand__9daAlink_cCFv.s | 28 - .../checkBowReadyAnime__9daAlink_cCFv.s | 15 - ...kCanoeFishingRodGrabOrPut__9daAlink_cCFv.s | 38 - .../checkCanoeJumpRide__9daAlink_cFv.s | 61 - ...noePaddleGrab__9daAlink_cCFP10fopAc_ac_c.s | 35 - .../checkCanoeRideTandem__9daAlink_cFv.s | 27 - .../checkCaughtEscapeCutTurn__9daAlink_cFv.s | 54 - .../checkCoachGuardGame__9daAlink_cFv.s | 23 - .../a/d_a_alink/checkComboCnt__9daAlink_cFv.s | 60 - .../checkCopyRodAnime__9daAlink_cCFv.s | 28 - .../checkCopyRodTopUse__9daAlink_cFv.s | 58 - .../a/d_a_alink/checkCowGame__9daAlink_cFv.s | 29 - .../d_a_alink/checkCutAction__9daAlink_cFv.s | 199 -- .../checkCutAtnActorChange__9daAlink_cFv.s | 10 - .../checkCutBackState__9daAlink_cFv.s | 27 - .../checkCutCancelNextMode__9daAlink_cFi.s | 36 - .../checkCutFinishJumpUp__9daAlink_cFv.s | 26 - .../checkCutHeadState__9daAlink_cFv.s | 62 - .../checkCutLandDamage__9daAlink_cFv.s | 52 - .../checkCutLargeTurnState__9daAlink_cCFv.s | 56 - .../checkCutTurnInput__9daAlink_cCFv.s | 17 - .../checkDemoMoveMode__9daAlink_cCFUl.s | 17 - .../checkDoCutAction__9daAlink_cFv.s | 49 - .../checkDownAttackState__9daAlink_cFv.s | 65 - .../checkEndMessage__9daAlink_cFUl.s | 40 - ...heckEnemyGroup__9daAlink_cFP10fopAc_ac_c.s | 26 - .../checkEquipAnime__9daAlink_cCFv.s | 25 - ...heckFishingRodAndLureItem__9daAlink_cCFv.s | 21 - ...ishingRodGrab__9daAlink_cCFP10fopAc_ac_c.s | 31 - .../d_a_alink/checkFlyAtnWait__9daAlink_cFv.s | 15 - ...GoatCatchActor__9daAlink_cFP10fopAc_ac_c.s | 29 - .../checkGrabAnimeAndThrow__9daAlink_cCFv.s | 25 - .../d_a_alink/checkGrabAnime__9daAlink_cCFv.s | 15 - .../checkGrabCarryActor__9daAlink_cFv.s | 12 - .../checkGrabHeavyActor__9daAlink_cFv.s | 12 - .../checkGrabNotThrow__9daAlink_cFv.s | 9 - .../checkGrabRooster__9daAlink_cFv.s | 15 - .../checkGrabSideActor__9daAlink_cFv.s | 12 - ...kGrabTalkActor__9daAlink_cFP10fopAc_ac_c.s | 16 - .../checkGrabThrowAnime__9daAlink_cCFv.s | 25 - .../checkGroundSpecialMode__9daAlink_cFv.s | 94 - .../checkGuardAccept__9daAlink_cFv.s | 47 - ...kshotReadyMaterialOffMode__9daAlink_cCFv.s | 16 - .../checkHorseDashAccept__9daAlink_cFv.s | 15 - .../checkHorseLieAnime__9daAlink_cCFv.s | 25 - .../checkHorseNoUpperAnime__9daAlink_cCFv.s | 27 - ...eckHorseNotDamageReaction__9daAlink_cCFv.s | 16 - .../checkHorseReinLeftOnly__9daAlink_cCFv.s | 11 - .../checkHorseSubjectivity__9daAlink_cCFv.s | 19 - .../checkHorseWaitLashAnime__9daAlink_cCFv.s | 12 - .../checkHugeAttack__9daAlink_cCFi.s | 13 - ...lygonDamage__9daAlink_cFP13cBgS_PolyInfo.s | 27 - .../checkIronBallAnime__9daAlink_cCFv.s | 13 - .../checkIronBallDelete__9daAlink_cFv.s | 57 - .../checkIronBallGroundStop__9daAlink_cCFv.s | 19 - .../checkIronBallReturnChange__9daAlink_cFv.s | 52 - .../checkIronBallReturn__9daAlink_cCFv.s | 12 - .../checkIronBallThrowMode__9daAlink_cCFv.s | 19 - ...ckIronBallThrowReturnMode__9daAlink_cCFv.s | 21 - .../checkItemActorPointer__9daAlink_cFv.s | 49 - .../checkItemButtonChange__9daAlink_cFv.s | 55 - .../checkItemChangeAutoAction__9daAlink_cFv.s | 63 - .../checkItemChangeFromButton__9daAlink_cFv.s | 268 -- .../checkItemEquipAnime__9daAlink_cCFv.s | 21 - .../checkKandelaarEquipAnime__9daAlink_cCFv.s | 13 - .../checkKandelaarSwing__9daAlink_cCFi.s | 17 - .../d_a_alink/checkLandAction__9daAlink_cFi.s | 183 -- .../checkLargeAttack__9daAlink_cCFi.s | 13 - .../checkLightSwordMtrl__9daAlink_cFv.s | 40 - .../checkMagicArmorNoDamage__9daAlink_cFv.s | 24 - ...heckMagicArmorWearAbility__9daAlink_cCFv.s | 22 - .../checkMiddleBossGoronRoom__9daAlink_cFv.s | 12 - .../checkMidnaDisappearMode__9daAlink_cCFv.s | 26 - .../checkNextActionBoard__9daAlink_cFv.s | 41 - .../checkNextActionBoomerang__9daAlink_cFv.s | 120 - .../checkNextActionCanoe__9daAlink_cFv.s | 88 - .../checkNextActionCopyRod__9daAlink_cFv.s | 84 - .../checkNextActionFromButton__9daAlink_cFv.s | 154 - .../checkNextActionFromCrouch__9daAlink_cFi.s | 35 - .../checkNextActionIronBall__9daAlink_cFv.s | 66 - .../checkNextActionSwim__9daAlink_cFv.s | 95 - ...checkNextActionWolfFromLie__9daAlink_cFv.s | 36 - .../checkNoCollisionCorret__9daAlink_cFv.s | 56 - .../checkNoUpperAnime__9daAlink_cCFv.s | 34 - .../checkOilBottleItemNotGet__9daAlink_cFUs.s | 23 - ...heckOneHandItemEquipAnime__9daAlink_cCFv.s | 13 - .../checkOxygenTimer__9daAlink_cFv.s | 94 - ...checkPlayerGuardAndAttack__9daAlink_cCFv.s | 27 - .../checkPlayerGuard__9daAlink_cCFv.s | 42 - .../checkPossibleWaterInMode__9daAlink_cCFv.s | 18 - ...CodePolygon__9daAlink_cFR13cBgS_PolyInfo.s | 23 - .../d_a_alink/checkSnowCode__9daAlink_cCFv.s | 12 - .../checkSubjectAction__9daAlink_cFv.s | 72 - .../checkSumouVsActor__9daAlink_cFv.s | 40 - .../checkSwimButtonAccept__9daAlink_cFv.s | 12 - .../checkSwimButtonMove__9daAlink_cFv.s | 31 - .../a/d_a_alink/checkSwimFall__9daAlink_cFv.s | 16 - .../checkSwimNeckUpDown__9daAlink_cCFv.s | 21 - .../checkSwordTwirlAnime__9daAlink_cCFv.s | 13 - .../checkUpSwimButtonAccept__9daAlink_cFv.s | 8 - .../checkUpperGuardAnime__9daAlink_cCFv.s | 33 - ...pperItemActionBoomerangFly__9daAlink_cFv.s | 40 - ...ckUpperItemActionBoomerang__9daAlink_cFv.s | 53 - ...checkUpperItemActionBowFly__9daAlink_cFv.s | 34 - ...kUpperItemActionCopyRodFly__9daAlink_cFv.s | 40 - ...heckUpperItemActionCopyRod__9daAlink_cFv.s | 60 - ...eckUpperItemActionIronBall__9daAlink_cFv.s | 114 - ...checkUpperReadyThrowAnime__9daAlink_cCFv.s | 45 - .../checkUseKandelaar__9daAlink_cFi.s | 18 - ...heckWaterInKandelaarOffset__9daAlink_cFf.s | 15 - .../checkWaterInKandelaar__9daAlink_cFf.s | 36 - .../checkWindDashAnime__9daAlink_cCFv.s | 16 - .../checkWolfAtnMoveBack__9daAlink_cFs.s | 24 - ...checkWolfBarrierHitReverse__9daAlink_cFv.s | 65 - ...rierWallHit__9daAlink_cFR13cBgS_PolyInfo.s | 37 - .../checkWolfEnemyThrowAction__9daAlink_cFv.s | 32 - .../checkWolfLandAction__9daAlink_cFi.s | 65 - .../checkWolfLieCode__9daAlink_cFv.s | 12 - .../checkWolfRopeJumpHang__9daAlink_cFv.s | 35 - .../a/d_a_alink/checkWolfRope__9daAlink_cFv.s | 21 - .../checkWolfShapeReverse__9daAlink_cCFv.s | 29 - ...oodShieldEquipNotIronBall__9daAlink_cCFv.s | 23 - .../checkZoraSwimMove__9daAlink_cFv.s | 24 - .../checkZoraWearAbility__9daAlink_cCFv.s | 22 - .../checkZoraWearMaskDraw__9daAlink_cFv.s | 23 - .../clearWoodShieldBurnEffect__9daAlink_cFv.s | 30 - .../commonGrabPutInit__9daAlink_cFv.s | 40 - .../commonInitForceRideRein__9daAlink_cFv.s | 29 - ...t__9daAlink_cFQ29daAlink_c12daAlink_PROC.s | 30 - .../daAlink_Create__FP10fopAc_ac_c.s | 9 - .../a/d_a_alink/daAlink_Draw__FP9daAlink_c.s | 9 - ...aAlink_bottleModelCallBack__FP8J3DJointi.s | 17 - ...ink_kandelaarModelCallBack__FP8J3DJointi.s | 17 - .../daAlink_searchCanoe__FP10fopAc_ac_cPv.s | 10 - .../daAlink_searchCoach__FP10fopAc_ac_cPv.s | 6 - ...Alink_searchEnemyCargo__FP10fopAc_ac_cPv.s | 6 - .../daAlink_searchGiant__FP10fopAc_ac_cPv.s | 24 - ...daAlink_searchGoldWolf__FP10fopAc_ac_cPv.s | 6 - .../daAlink_searchIceLeaf__FP10fopAc_ac_cPv.s | 6 - .../daAlink_searchPeepObj__FP10fopAc_ac_cPv.s | 16 - ...ink_searchTagKandelaar__FP10fopAc_ac_cPv.s | 6 - ...link_searchTagKtOnFire__FP10fopAc_ac_cPv.s | 35 - ...nk_searchWolfLockEnemy__FP10fopAc_ac_cPv.s | 16 - .../damageMagnification__9daAlink_cFii.s | 51 - .../damageTimerCount__9daAlink_cFv.s | 56 - .../a/d_a_alink/decSwordBlur__9daAlink_cFv.s | 27 - asm/d/a/d_a_alink/deleteArrow__9daAlink_cFv.s | 47 - .../a/d_a_alink/endHighModel__9daAlink_cFv.s | 25 - .../freezeTimerDamage__9daAlink_cFv.s | 60 - .../getArrowFlyData__9daAlink_cCFPfPfi.s | 68 - .../getArrowIncAtMaxStart__9daAlink_cCFv.s | 5 - .../getArrowIncAtMax__9daAlink_cCFv.s | 5 - .../d_a_alink/getArrowIncAtR__9daAlink_cCFv.s | 5 - .../getBoardRowAnmSpeed__9daAlink_cFv.s | 14 - .../getBodyAngleXBasePos__9daAlink_cFP4cXyz.s | 30 - ...etBombArrowFlyExplodeTime__9daAlink_cCFv.s | 5 - .../a/d_a_alink/getBoomSpeed__9daAlink_cFv.s | 45 - .../getBottleOpenAppearItem__9daAlink_cCFv.s | 9 - .../getCanoeBackMaxSpeed__9daAlink_cCFv.s | 5 - .../a/d_a_alink/getCanoeCres__9daAlink_cCFv.s | 13 - .../getCanoeLocalPaddleTop__9daAlink_cFv.s | 4 - .../getCanoeMaxSpeed__9daAlink_cCFv.s | 13 - .../getCanoePaddleMatrix__9daAlink_cFv.s | 21 - .../getCanoeSpeedRate__9daAlink_cCFv.s | 13 - .../getChainStickAngleY__9daAlink_cCFs.s | 20 - .../d_a_alink/getCutDirection__9daAlink_cFv.s | 34 - .../getDirectionRopeMove__9daAlink_cCFv.s | 33 - asm/d/a/d_a_alink/getFreezeB__9daAlink_cCFv.s | 5 - asm/d/a/d_a_alink/getFreezeG__9daAlink_cCFv.s | 5 - asm/d/a/d_a_alink/getFreezeR__9daAlink_cCFv.s | 5 - .../getGrabThrowRate__9daAlink_cFv.s | 23 - .../getIronBallBgHit__9daAlink_cCFv.s | 9 - .../getIronBallCenterPos__9daAlink_cFv.s | 9 - .../getKandelaarFlamePos__9daAlink_cFv.s | 21 - .../getReinRideDirection__9daAlink_cFv.s | 35 - .../getSwimFrontMaxSpeed__9daAlink_cCFv.s | 41 - .../getSwimMaxFallSpeed__9daAlink_cCFv.s | 44 - .../getWallGrabStatus__9daAlink_cFv.s | 5 - .../getWolfLieMoveAnmSpeed__9daAlink_cFv.s | 20 - .../a/d_a_alink/getZoraSwim__9daAlink_cCFv.s | 27 - .../grabLineCheck__9daAlink_cFP4cXyzP4cXyz.s | 19 - .../a/d_a_alink/initCanoeRide__9daAlink_cFv.s | 18 - ...initCopyRodUpperAnimeSpeed__9daAlink_cFi.s | 26 - .../initCutAtnActorSearch__9daAlink_cFv.s | 25 - .../initFishingRodHand__9daAlink_cFv.s | 28 - .../initForceRideHorse__9daAlink_cFv.s | 31 - .../initGrabNextMode__9daAlink_cFv.s | 21 - asm/d/a/d_a_alink/initGravity__9daAlink_cFv.s | 83 - .../initWolfRopeShapeAngle__9daAlink_cFv.s | 34 - .../d_a_alink/loadAramBmd__9daAlink_cFUsUl.s | 51 - ...loadAramItemBrk__9daAlink_cFUsP8J3DModel.s | 24 - ...loadAramItemBtk__9daAlink_cFUsP8J3DModel.s | 24 - ...loadAramItemBtp__9daAlink_cFUsP8J3DModel.s | 24 - asm/d/a/d_a_alink/loadAram__9daAlink_cFUsUl.s | 28 - asm/d/a/d_a_alink/makeArrow__9daAlink_cFv.s | 45 - .../makeFairy__9daAlink_cFP4cXyzUl.s | 65 - .../modelDraw__9daAlink_cFP8J3DModeli.s | 36 - .../offKandelaarModel__9daAlink_cFv.s | 16 - .../d_a_alink/offOxygenTimer__9daAlink_cFv.s | 10 - .../onPressedDamage__9daAlink_cFRC4cXyzs.s | 12 - ...nk_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2.s | 43 - .../procBackJumpInit__9daAlink_cFi.s | 119 - .../procBackJumpLandInit__9daAlink_cFi.s | 40 - .../procBackJumpLand__9daAlink_cFv.s | 88 - .../a/d_a_alink/procBackJump__9daAlink_cFv.s | 66 - .../a/d_a_alink/procBoardCut__9daAlink_cFv.s | 34 - .../a/d_a_alink/procBoardJump__9daAlink_cFv.s | 57 - .../a/d_a_alink/procBoardRide__9daAlink_cFv.s | 29 - .../procBoardRowInit__9daAlink_cFv.s | 31 - .../procBoardSubjectivityInit__9daAlink_cFv.s | 19 - .../procBoardSubjectivity__9daAlink_cFv.s | 42 - .../procBoardTurnInit__9daAlink_cFv.s | 32 - .../procBoomerangCatchInit__9daAlink_cFv.s | 31 - .../procBoomerangCatch__9daAlink_cFv.s | 42 - .../procBoomerangMoveInit__9daAlink_cFv.s | 41 - .../procBoomerangMove__9daAlink_cFv.s | 63 - .../procBoomerangSubjectInit__9daAlink_cFv.s | 39 - .../procBoomerangSubject__9daAlink_cFv.s | 56 - .../procBootsEquipInit__9daAlink_cFv.s | 39 - .../procBottleDrinkInit__9daAlink_cFUs.s | 90 - .../d_a_alink/procBottleDrink__9daAlink_cFv.s | 26 - .../procBottleGetInit__9daAlink_cFi.s | 160 - .../a/d_a_alink/procBottleGet__9daAlink_cFv.s | 83 - .../d_a_alink/procBowMoveInit__9daAlink_cFv.s | 37 - asm/d/a/d_a_alink/procBowMove__9daAlink_cFv.s | 78 - .../procBowSubjectInit__9daAlink_cFv.s | 31 - .../d_a_alink/procBowSubject__9daAlink_cFv.s | 26 - ...oeJumpRideInit__9daAlink_cFP10fopAc_ac_c.s | 71 - .../procCanoeJumpRide__9daAlink_cFv.s | 33 - .../procCanoeRideInit__9daAlink_cFv.s | 83 - .../a/d_a_alink/procCanoeRide__9daAlink_cFv.s | 65 - .../procCoHorseCallWaitInit__9daAlink_cFi.s | 60 - .../procCoLargeDamageWall__9daAlink_cFv.s | 25 - .../procCoLavaReturn__9daAlink_cFv.s | 27 - ...procCoMetamorphoseOnlyInit__9daAlink_cFv.s | 53 - .../procCoMetamorphoseOnly__9daAlink_cFv.s | 53 - ...procCoPeepSubjectivityInit__9daAlink_cFv.s | 49 - .../procCoPeepSubjectivity__9daAlink_cFv.s | 45 - .../procCoPolyDamageInit__9daAlink_cFv.s | 73 - .../procCoPolyDamage__9daAlink_cFv.s | 36 - .../procCoSandWallHitInit__9daAlink_cFv.s | 34 - .../procCoSandWallHit__9daAlink_cFv.s | 28 - .../procCoSubjectivityInit__9daAlink_cFv.s | 36 - ...procCoSwimFreezeReturnInit__9daAlink_cFv.s | 136 - ...procCoSwimSubjectivityInit__9daAlink_cFv.s | 45 - .../procCopyRodMoveInit__9daAlink_cFv.s | 41 - .../d_a_alink/procCopyRodMove__9daAlink_cFv.s | 57 - .../procCopyRodReviveInit__9daAlink_cFv.s | 44 - .../procCopyRodRevive__9daAlink_cFv.s | 24 - .../procCopyRodSubjectInit__9daAlink_cFv.s | 39 - .../procCopyRodSubject__9daAlink_cFv.s | 53 - .../procCopyRodSwingInit__9daAlink_cFv.s | 82 - .../procCopyRodSwing__9daAlink_cFv.s | 74 - .../d_a_alink/procCrouchInit__9daAlink_cFv.s | 29 - asm/d/a/d_a_alink/procCrouch__9daAlink_cFv.s | 69 - asm/d/a/d_a_alink/procCutDown__9daAlink_cFv.s | 47 - .../procCutFinishInit__9daAlink_cFi.s | 238 -- .../procCutFinishJumpUpInit__9daAlink_cFv.s | 131 - ...rocCutFinishJumpUpLandInit__9daAlink_cFv.s | 64 - .../procCutFinishJumpUpLand__9daAlink_cFv.s | 114 - .../procCutFinishJumpUp__9daAlink_cFv.s | 75 - .../procCutHeadLandInit__9daAlink_cFv.s | 24 - .../d_a_alink/procCutHeadLand__9daAlink_cFv.s | 47 - asm/d/a/d_a_alink/procCutHead__9daAlink_cFv.s | 96 - .../procCutJumpLandInit__9daAlink_cFi.s | 89 - .../d_a_alink/procCutJumpLand__9daAlink_cFv.s | 95 - asm/d/a/d_a_alink/procCutJump__9daAlink_cFv.s | 84 - ...procCutLargeJumpChargeInit__9daAlink_cFv.s | 27 - .../procCutLargeJumpCharge__9daAlink_cFv.s | 61 - .../procCutLargeJumpInit__9daAlink_cFv.s | 72 - .../procCutLargeJumpLandInit__9daAlink_cFi.s | 80 - .../procCutLargeJumpLand__9daAlink_cFv.s | 108 - .../procCutNormalInit__9daAlink_cFi.s | 168 - .../a/d_a_alink/procCutNormal__9daAlink_cFv.s | 222 -- ...it__9daAlink_cFQ29daAlink_c11daAlink_ANM.s | 111 - .../d_a_alink/procCutReverse__9daAlink_cFv.s | 71 - .../procCutTurnChargeInit__9daAlink_cFv.s | 42 - .../procCutTurnCharge__9daAlink_cFv.s | 61 - .../procCutTurnMoveInit__9daAlink_cFi.s | 77 - asm/d/a/d_a_alink/procCutTurn__9daAlink_cFv.s | 137 - .../procDiveJumpInit__9daAlink_cFv.s | 48 - .../a/d_a_alink/procDiveJump__9daAlink_cFv.s | 51 - asm/d/a/d_a_alink/procFall__9daAlink_cFv.s | 140 - .../procFloorDownReboundInit__9daAlink_cFv.s | 29 - .../procFloorDownRebound__9daAlink_cFv.s | 34 - .../procFrontRollCrashInit__9daAlink_cFv.s | 60 - .../procFrontRollCrash__9daAlink_cFv.s | 96 - .../procFrontRollSuccessInit__9daAlink_cFv.s | 59 - .../procFrontRollSuccess__9daAlink_cFv.s | 63 - .../d_a_alink/procGoatStroke__9daAlink_cFv.s | 20 - .../procGoronMoveInit__9daAlink_cFv.s | 60 - ...onRideWaitInit__9daAlink_cFP10fopAc_ac_c.s | 38 - .../procHawkCatchInit__9daAlink_cFv.s | 31 - .../a/d_a_alink/procHawkCatch__9daAlink_cFv.s | 24 - .../procHawkSubjectInit__9daAlink_cFv.s | 39 - .../procIronBallMoveInit__9daAlink_cFv.s | 39 - .../procIronBallMove__9daAlink_cFv.s | 74 - .../procIronBallReturnInit__9daAlink_cFv.s | 47 - .../procIronBallReturn__9daAlink_cFv.s | 102 - .../procIronBallSubjectInit__9daAlink_cFv.s | 36 - .../procIronBallSubject__9daAlink_cFv.s | 37 - .../procIronBallThrowInit__9daAlink_cFv.s | 58 - .../procKandelaarPourInit__9daAlink_cFv.s | 45 - .../procKandelaarPour__9daAlink_cFv.s | 11 - .../procKandelaarSwing__9daAlink_cFv.s | 48 - .../d_a_alink/procLandDamage__9daAlink_cFv.s | 61 - .../a/d_a_alink/procLandInit__9daAlink_cFf.s | 54 - asm/d/a/d_a_alink/procLand__9daAlink_cFv.s | 77 - .../procOctaIealSpit__9daAlink_cFv.s | 36 - ...onUnequipInit__9daAlink_cFiP10fopAc_ac_c.s | 56 - .../procPreActionUnequip__9daAlink_cFv.s | 145 - .../procRollJumpInit__9daAlink_cFv.s | 56 - .../a/d_a_alink/procRollJump__9daAlink_cFv.s | 78 - .../procScreamWaitInit__9daAlink_cFv.s | 37 - .../d_a_alink/procScreamWait__9daAlink_cFv.s | 26 - .../procSideRollInit__9daAlink_cFi.s | 95 - .../a/d_a_alink/procSlipInit__9daAlink_cFv.s | 32 - .../procSpinnerReadyInit__9daAlink_cFv.s | 93 - .../procStEscapeInit__9daAlink_cFv.s | 25 - .../a/d_a_alink/procStEscape__9daAlink_cFv.s | 40 - .../procStepMoveInit__9daAlink_cFv.s | 35 - .../procSumouReadyInit__9daAlink_cFv.s | 58 - .../procSumouShikoInit__9daAlink_cFv.s | 50 - .../procSumouSideMoveInit__9daAlink_cFv.s | 46 - .../procSumouStaggerInit__9daAlink_cFv.s | 33 - .../procSumouStagger__9daAlink_cFv.s | 45 - .../procSwordUnequipSpInit__9daAlink_cFv.s | 46 - .../procSwordUnequipSp__9daAlink_cFv.s | 238 -- .../procTiredWaitInit__9daAlink_cFv.s | 78 - .../a/d_a_alink/procWaitInit__9daAlink_cFv.s | 94 - .../procWolfAtnActorMoveInit__9daAlink_cFv.s | 44 - .../procWolfAtnActorMove__9daAlink_cFv.s | 54 - .../procWolfBackJumpLandInit__9daAlink_cFss.s | 37 - .../procWolfBackJumpLand__9daAlink_cFv.s | 58 - .../procWolfBackJump__9daAlink_cFv.s | 63 - .../procWolfCargoCarryInit__9daAlink_cFv.s | 67 - .../procWolfChainReadyInit__9daAlink_cFv.s | 27 - .../procWolfChainUpInit__9daAlink_cFv.s | 33 - .../d_a_alink/procWolfChainUp__9daAlink_cFv.s | 51 - .../procWolfDownAtMissLand__9daAlink_cFv.s | 58 - .../procWolfEnemyHangBiteInit__9daAlink_cFv.s | 65 - .../procWolfEnemyThrow__9daAlink_cFv.s | 43 - .../procWolfGiantPuzzleInit__9daAlink_cFv.s | 41 - .../procWolfGrabPutInit__9daAlink_cFv.s | 58 - .../procWolfGrabThrowInit__9daAlink_cFv.s | 22 - .../procWolfGrabThrow__9daAlink_cFv.s | 53 - .../procWolfHangReadyInit__9daAlink_cFv.s | 32 - .../procWolfHangReady__9daAlink_cFv.s | 36 - .../procWolfHowlInit__9daAlink_cFi.s | 63 - ...procWolfJumpAttackKickInit__9daAlink_cFv.s | 46 - .../procWolfJumpAttackKick__9daAlink_cFv.s | 25 - ...lfJumpAttackNormalLandInit__9daAlink_cFi.s | 46 - ...ocWolfJumpAttackNormalLand__9daAlink_cFv.s | 69 - .../procWolfLandDamage__9daAlink_cFv.s | 61 - .../a/d_a_alink/procWolfLand__9daAlink_cFv.s | 38 - ...procWolfMidnaRideShockInit__9daAlink_cFv.s | 49 - .../procWolfMidnaRideShock__9daAlink_cFv.s | 45 - .../procWolfMoveInit__9daAlink_cFv.s | 28 - .../a/d_a_alink/procWolfMove__9daAlink_cFv.s | 39 - .../a/d_a_alink/procWolfPush__9daAlink_cFv.s | 55 - ...ocWolfRollAttackChargeInit__9daAlink_cFv.s | 25 - .../procWolfRollAttackCharge__9daAlink_cFv.s | 53 - ...procWolfRollAttackMoveInit__9daAlink_cFv.s | 45 - ...ocWolfRopeSubjectivityInit__9daAlink_cFv.s | 62 - .../procWolfScreamWaitInit__9daAlink_cFv.s | 44 - .../procWolfScreamWait__9daAlink_cFv.s | 64 - .../procWolfSideStepLandInit__9daAlink_cFs.s | 65 - .../procWolfSideStepLand__9daAlink_cFv.s | 52 - .../d_a_alink/procWolfSitInit__9daAlink_cFi.s | 61 - asm/d/a/d_a_alink/procWolfSit__9daAlink_cFv.s | 54 - .../procWolfSlideLandInit__9daAlink_cFv.s | 26 - .../procWolfSlideLand__9daAlink_cFv.s | 46 - .../procWolfSlipInit__9daAlink_cFv.s | 49 - .../procWolfSlipTurnLandInit__9daAlink_cFv.s | 40 - .../procWolfSlipTurnLand__9daAlink_cFv.s | 36 - .../procWolfSlopeStartInit__9daAlink_cFi.s | 39 - .../procWolfSlopeStart__9daAlink_cFv.s | 42 - .../procWolfSwimMoveInit__9daAlink_cFv.s | 35 - .../d_a_alink/procWolfSwimUp__9daAlink_cFv.s | 46 - .../procWolfSwimWait__9daAlink_cFv.s | 63 - .../procWolfTiredWaitInit__9daAlink_cFv.s | 37 - .../procWolfTiredWait__9daAlink_cFv.s | 27 - .../procWolfWaitSlipInit__9daAlink_cFv.s | 36 - .../procWolfWaitTurnInit__9daAlink_cFv.s | 49 - .../resetAtCollision__9daAlink_cFi.s | 60 - .../a/d_a_alink/resetBasAnime__9daAlink_cFv.s | 9 - .../a/d_a_alink/resetDemoBck__9daAlink_cFv.s | 44 - .../resetOilBottleModel__9daAlink_cFv.s | 24 - .../resetSpecialEvent__9daAlink_cFv.s | 29 - .../resetWolfAtCollision__9daAlink_cFv.s | 58 - .../resetWolfEnemyBiteAll__9daAlink_cFv.s | 17 - .../d_a_alink/returnBoomerang__9daAlink_cFi.s | 126 - .../a/d_a_alink/returnCopyRod__9daAlink_cFv.s | 46 - .../seStartMapInfoLevel__9daAlink_cFUl.s | 15 - .../d_a_alink/seStartMapInfo__9daAlink_cFUl.s | 15 - .../seStartOnlyReverbLevel__9daAlink_cFUl.s | 15 - .../seStartOnlyReverb__9daAlink_cFUl.s | 15 - .../seStartSwordCut__9daAlink_cFUl.s | 15 - ...olfLockEnemy__9daAlink_cFP10fopAc_ac_cPv.s | 53 - .../d_a_alink/setArmReelAnime__9daAlink_cFv.s | 24 - ..._9daAlink_cCFP4cXyzP5csXyzPC4cXyzPC4cXyz.s | 32 - .../setBodyAngleXReadyAnime__9daAlink_cFi.s | 31 - .../setBoomerangReadyAnime__9daAlink_cFv.s | 39 - .../setBoomerangReadyQuake__9daAlink_cFv.s | 30 - .../setBoomerangSight__9daAlink_cFv.s | 46 - .../d_a_alink/setBowHangAnime__9daAlink_cFv.s | 20 - .../setBowNormalAnime__9daAlink_cFv.s | 29 - .../setBowOrSlingStatus__9daAlink_cFv.s | 17 - .../setBowReadyAnime__9daAlink_cFv.s | 63 - .../setBowReloadAnime__9daAlink_cFv.s | 68 - asm/d/a/d_a_alink/setBowSight__9daAlink_cFv.s | 40 - .../d_a_alink/setCollisionPos__9daAlink_cFv.s | 150 - .../setCommonBoardAnime__9daAlink_cFi.s | 24 - .../setCopyRodReadyAnime__9daAlink_cFv.s | 61 - .../d_a_alink/setCopyRodSight__9daAlink_cFv.s | 49 - asm/d/a/d_a_alink/setCutDash__9daAlink_cFii.s | 181 -- .../setCutWaterDropEffect__9daAlink_cFv.s | 41 - ...Param__9daAlink_cFUl11dCcG_At_SplUcUciff.s | 93 - .../setDamagePointNormal__9daAlink_cFi.s | 12 - .../a/d_a_alink/setDashDamage__9daAlink_cFv.s | 42 - .../setDkCaught__9daAlink_cFP10fopAc_ac_c.s | 16 - ...erColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz.s | 46 - .../d_a_alink/setFishGetFace__9daAlink_cFv.s | 59 - ...ionOffset__9daAlink_cFffP13cBgS_PolyInfo.s | 35 - .../setHookshotReadyMaterial__9daAlink_cFv.s | 36 - .../setHorseSwordUpAnime__9daAlink_cFv.s | 23 - .../setIronBallBaseAnime__9daAlink_cFv.s | 31 - .../setIronBallBgCheckPos__9daAlink_cFv.s | 35 - .../setIronBallReadyAnime__9daAlink_cFv.s | 54 - .../setIronBallReturn__9daAlink_cFi.s | 31 - .../setIronBallWaitUpperAnime__9daAlink_cFi.s | 52 - .../setKandelaarMtx__9daAlink_cFPA4_fii.s | 45 - .../setLandDamagePoint__9daAlink_cFi.s | 21 - .../setLastSceneMode__9daAlink_cFPUl.s | 79 - .../setMagicArmorBrk__9daAlink_cFi.s | 58 - .../setMetamorphoseModel__9daAlink_cFi.s | 47 - .../a/d_a_alink/setOutPower__9daAlink_cFfsi.s | 62 - ...deCanoeBasePos__9daAlink_cFP10fopAc_ac_c.s | 15 - asm/d/a/d_a_alink/setRoomInfo__9daAlink_cFv.s | 119 - .../setScreamWaitAnime__9daAlink_cFv.s | 34 - .../d_a_alink/setShieldGuard__9daAlink_cFv.s | 69 - ...__9daAlink_cFQ29daAlink_c12daAlink_WANMf.s | 13 - ..._9daAlink_cFQ29daAlink_c12daAlink_WANMff.s | 12 - ...e__9daAlink_cFQ29daAlink_c12daAlink_WANM.s | 13 - ...link_c12daAlink_WANMPC16daAlinkHIO_anm_c.s | 14 - .../a/d_a_alink/setSlingModel__9daAlink_cFv.s | 45 - .../setSwimUpDownOffset__9daAlink_cFv.s | 53 - .../setSwordAtCollision__9daAlink_cFi.s | 205 -- ...AtParam__9daAlink_cF11dCcG_At_SplUcUciff.s | 70 - ...HitVibration__9daAlink_cFP12dCcD_GObjInf.s | 89 - .../d_a_alink/setSyncRidePos__9daAlink_cFv.s | 24 - .../setThrowDamage__9daAlink_cFsffiii.s | 49 - .../setUpperGuardAnime__9daAlink_cFf.s | 5 - ...rDropColor__9daAlink_cFPC13J3DGXColorS10.s | 295 -- ...AnmRate__9daAlink_cFP16daPy_frameCtrl_cf.s | 34 - .../setWolfAtCollision__9daAlink_cFv.s | 137 - ...__9daAlink_cFQ29daAlink_c12daAlink_WANMf.s | 20 - .../setWolfHangGroundY__9daAlink_cFv.s | 29 - .../setWolfHeadDamage__9daAlink_cFv.s | 35 - .../setWolfHowlNotHappen__9daAlink_cFi.s | 48 - .../setWolfLieMoveVoice__9daAlink_cFi.s | 55 - .../setWoodShieldBurnEffect__9daAlink_cFv.s | 42 - ...setWoodShieldBurnOutEffect__9daAlink_cFv.s | 52 - .../d_a_alink/startPeepChange__9daAlink_cFv.s | 49 - .../stopDrawParticle__9daAlink_cFUl.s | 19 - .../subjectCancelTrigger__9daAlink_cFv.s | 36 - .../d_a_alink/swimDeleteItem__9daAlink_cFv.s | 37 - .../a/d_a_alink/swordUnequip__9daAlink_cFv.s | 54 - .../d_a_alink/throwBoomerang__9daAlink_cFv.s | 141 - .../voiceStartLevel__9daAlink_cFUl.s | 14 - asm/d/a/d_a_alink/voiceStart__9daAlink_cFUl.s | 14 - .../dComIfGs_isVisitedRoom__Fi.s | 24 - .../dComIfGs_offVisitedRoom__Fi.s | 24 - .../dComIfGs_onVisitedRoom__Fi.s | 50 - .../dComIfGs_wolfeye_effect_check__Fv.s | 13 - asm/d/d_item/item_func_WOOD_STICK__Fv.s | 22 - .../isFirstBit__21dSv_player_get_item_cCFUc.s | 15 - .../offFirstBit__21dSv_player_get_item_cFUc.s | 14 - .../onFirstBit__21dSv_player_get_item_cFUc.s | 14 - asm/init/__flush_cache.s | 15 - asm/init/__init_hardware.s | 10 - asm/init/__init_registers.s | 37 - asm/init/__start.s | 98 - .../mDoMemCdRWm_CalcCheckSumGameData__FPvUl.s | 17 - .../mDoMemCdRWm_CalcCheckSum__FPvUl.s | 19 - asm/m_Do/m_Do_main/LOAD_COPYDATE__FPv.s | 33 - asm/m_Do/m_Do_main/main01__Fv.s | 127 - .../d_a_skip_2D/__dt__10daSkip2D_cFv.s | 26 - .../d_a_skip_2D/createHeap__10daSkip2D_cFv.s | 27 - .../d_a_skip_2D/create__10daSkip2D_cFv.s | 42 - .../d_a_skip_2D/daSkip2D_Create__FPv.s | 9 - .../d_a_skip_2D/daSkip2D_Delete__FPv.s | 9 - .../d_a_skip_2D/daSkip2D_Draw__FPv.s | 9 - .../d_a_skip_2D/daSkip2D_Execute__FPv.s | 9 - .../daSkip2D_createHeap__FP10fopAc_ac_c.s | 9 - .../d_a_skip_2D/draw__10daSkip2D_cFv.s | 17 - .../d_a_skip_2D/initiate__10daSkip2D_cFv.s | 6 - .../d_a_tag_hinit/__dt__12daTagHinit_cFv.s | 23 - .../d_a_tag_hinit/create__12daTagHinit_cFv.s | 47 - .../daTagHinit_Create__FP10fopAc_ac_c.s | 9 - .../daTagHinit_Delete__FP12daTagHinit_c.s | 11 - .../daTagHinit_Execute__FP12daTagHinit_c.s | 9 - .../d_a_tag_hinit/execute__12daTagHinit_cFv.s | 77 - .../Create__14daTagRestart_cFv.s | 38 - .../daTagRestart_Create__FP10fopAc_ac_c.s | 9 - .../daTagRestart_Delete__FP14daTagRestart_c.s | 9 - ...daTagRestart_Execute__FP14daTagRestart_c.s | 9 - .../execute__14daTagRestart_cFv.s | 126 - .../d_a_tag_setrestart/func_80D6048C.s | 42 - .../__ct__13daTagWrHowl_cFv.s | 16 - .../__dt__13daTagWrHowl_cFv.s | 26 - .../chkWlfInTag__13daTagWrHowl_cFv.s | 40 - .../create__13daTagWrHowl_cFv.s | 25 - .../daTagWrHowl_Delete__FP13daTagWrHowl_c.s | 9 - .../daTagWrHowl_create__FP13daTagWrHowl_c.s | 24 - .../daTagWrHowl_draw__FP13daTagWrHowl_c.s | 9 - .../daTagWrHowl_execute__FP13daTagWrHowl_c.s | 9 - .../execute__13daTagWrHowl_cFv.s | 23 - .../init__13daTagWrHowl_cFv.s | 10 - .../JSystem/J3DGraphAnimator/J3DAnimation.h | 14 +- .../JSystem/J3DGraphAnimator/J3DModelData.h | 1 + include/JSystem/J3DGraphBase/J3DMaterial.h | 2 + include/JSystem/J3DGraphBase/J3DShapeMtx.h | 1 + include/JSystem/J3DGraphLoader/J3DAnmLoader.h | 2 +- include/JSystem/JAudio2/JAISeMgr.h | 4 + include/JSystem/JKernel/JKRArchive.h | 7 +- include/JSystem/JKernel/JKRDvdFile.h | 2 +- include/JSystem/JKernel/JKRSolidHeap.h | 2 +- include/JSystem/JMath/JMath.h | 12 +- include/JSystem/JParticle/JPAMath.h | 4 +- include/JSystem/JParticle/JPAParticle.h | 4 + .../JSystem/JStudio/JStudio/functionvalue.h | 4 +- .../JSystem/JStudio/JStudio/jstudio-control.h | 2 + include/JSystem/JSupport/JSUList.h | 2 +- include/JSystem/JUtility/JUTConsole.h | 3 +- include/JSystem/JUtility/JUTDirectFile.h | 9 + include/JSystem/JUtility/JUTFader.h | 2 +- include/SSystem/SComponent/c_bg_s_lin_chk.h | 1 + include/SSystem/SComponent/c_cc_d.h | 11 + include/SSystem/SComponent/c_lib.h | 62 +- include/SSystem/SComponent/c_m3d_g_cyl.h | 7 +- include/SSystem/SComponent/c_m3d_g_lin.h | 1 + include/SSystem/SComponent/c_math.h | 8 + include/SSystem/SComponent/c_xyz.h | 6 +- include/Z2AudioLib/Z2Creature.h | 4 + include/Z2AudioLib/Z2SoundHandles.h | 2 +- include/Z2AudioLib/Z2SoundMgr.h | 3 + include/Z2AudioLib/Z2SoundObject.h | 16 +- include/c/c_dylink.h | 1 + include/d/a/d_a_alink.h | 2624 +++++++-------- include/d/a/d_a_player.h | 154 +- include/d/bg/d_bg_s_acch.h | 11 + include/d/cc/d_cc_d.h | 19 +- include/d/cc/d_cc_s.h | 2 + include/d/com/d_com_inf_game.h | 402 ++- include/d/d_attention.h | 10 +- include/d/d_camera.h | 3 + include/d/d_demo.h | 2 + include/d/d_jnt_col.h | 2 + include/d/d_procname.h | 7 +- include/d/d_resorce.h | 2 +- include/d/d_stage.h | 6 +- include/d/d_vibration.h | 2 +- include/d/kankyo/d_kankyo.h | 2 + include/d/meter/d_meter2.h | 2 + include/d/particle/d_particle.h | 12 +- include/d/save/d_save.h | 74 +- include/dolphin/pad/Pad.h | 2 +- include/f_ap/f_ap_game.h | 2 + include/f_op/f_op_actor.h | 8 +- include/f_op/f_op_actor_mng.h | 14 +- include/m_Do/m_Do_audio.h | 1 + include/m_Do/m_Do_controller_pad.h | 1 + include/m_Do/m_Do_ext.h | 3 + include/m_Do/m_Do_machine.h | 1 + include/m_Do/m_Do_main.h | 2 +- include/m_Do/m_Do_mtx.h | 11 +- include/rel/d/a/d_a_arrow/d_a_arrow.h | 95 +- include/rel/d/a/d_a_boomerang/d_a_boomerang.h | 51 +- include/rel/d/a/d_a_canoe/d_a_canoe.h | 79 +- include/rel/d/a/d_a_crod/d_a_crod.h | 10 +- include/rel/d/a/d_a_cstatue/d_a_cstatue.h | 71 +- include/rel/d/a/d_a_horse/d_a_horse.h | 20 +- include/rel/d/a/d_a_mg_rod/d_a_mg_rod.h | 70 +- .../rel/d/a/d_a_scene_exit/d_a_scene_exit.h | 1 + include/rel/d/a/d_a_skip_2D/d_a_skip_2D.h | 22 +- include/rel/d/a/d_a_spinner/d_a_spinner.h | 1 + .../rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.h | 16 +- .../d_a_tag_setrestart/d_a_tag_setrestart.h | 17 +- .../tag/d_a_tag_wara_howl/d_a_tag_wara_howl.h | 20 +- libs/JSystem/J2DGraph/J2DMatBlock.cpp | 6 +- libs/JSystem/J2DGraph/J2DPicture.cpp | 4 +- libs/JSystem/J2DGraph/J2DScreen.cpp | 6 +- .../JSystem/J3DGraphAnimator/J3DAnimation.cpp | 172 +- libs/JSystem/J3DGraphAnimator/J3DJoint.cpp | 2 +- .../J3DGraphAnimator/J3DMaterialAttach.cpp | 4 +- libs/JSystem/J3DGraphAnimator/J3DModel.cpp | 2 +- libs/JSystem/JAudio2/JAISound.cpp | 2 +- libs/JSystem/JFramework/JFWDisplay.cpp | 23 +- libs/JSystem/JFramework/JFWSystem.cpp | 2 +- libs/JSystem/JGadget/linklist.cpp | 15 - libs/JSystem/JKernel/JKRAram.cpp | 13 +- libs/JSystem/JKernel/JKRAramHeap.cpp | 2 +- libs/JSystem/JKernel/JKRAramStream.cpp | 15 +- libs/JSystem/JKernel/JKRDecomp.cpp | 1 + libs/JSystem/JKernel/JKRDvdArchive.cpp | 4 +- libs/JSystem/JKernel/JKRFileCache.cpp | 2 +- libs/JSystem/JKernel/JKRFileLoader.cpp | 22 +- libs/JSystem/JKernel/JKRHeap.cpp | 2 +- libs/JSystem/JKernel/JKRMemArchive.cpp | 8 +- libs/JSystem/JKernel/JKRSolidHeap.cpp | 2 +- libs/JSystem/JParticle/JPAMath.cpp | 7 - .../JSystem/JStudio/JStudio/functionvalue.cpp | 14 +- libs/JSystem/JStudio/JStudio/fvb.cpp | 2 +- libs/JSystem/JStudio/JStudio/stb.cpp | 2 +- libs/JSystem/JUtility/JUTDirectFile.cpp | 19 +- libs/JSystem/JUtility/JUTException.cpp | 1 + libs/JSystem/JUtility/JUTResFont.cpp | 2 +- libs/JSystem/JUtility/JUTTexture.cpp | 14 +- libs/Z2AudioLib/Z2AudioMgr.cpp | 2 +- libs/Z2AudioLib/Z2SceneMgr.cpp | 69 +- libs/Z2AudioLib/Z2SoundObjMgr.cpp | 6 +- libs/Z2AudioLib/Z2SoundObject.cpp | 19 +- libs/Z2AudioLib/Z2StatusMgr.cpp | 2 +- libs/dolphin/pad/Pad.c | 2 +- rel/d/a/b/d_a_b_go/d_a_b_go.cpp | 4 +- rel/d/a/d_a_alldie/d_a_alldie.cpp | 4 +- rel/d/a/d_a_arrow/d_a_arrow.cpp | 336 +- rel/d/a/d_a_boomerang/d_a_boomerang.cpp | 113 +- rel/d/a/d_a_canoe/d_a_canoe.cpp | 318 +- rel/d/a/d_a_cstatue/d_a_cstatue.cpp | 386 +-- rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp | 2 +- rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp | 12 +- rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp | 265 +- rel/d/a/d_a_swc00/d_a_swc00.cpp | 2 +- rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp | 4 +- rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp | 6 +- rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp | 154 +- rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp | 2 +- .../a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp | 2 +- .../d_a_tag_setrestart/d_a_tag_setrestart.cpp | 231 +- .../d_a_tag_wara_howl/d_a_tag_wara_howl.cpp | 265 +- src/__start.c | 125 +- src/d/a/d_a_alink.cpp | 2886 +++++++++++++---- src/d/a/d_a_alink_HIO_data.inc | 2606 ++++++++++++--- src/d/a/d_a_alink_bomb.inc | 2 +- src/d/a/d_a_alink_boom.inc | 457 ++- src/d/a/d_a_alink_bottle.inc | 302 +- src/d/a/d_a_alink_bow.inc | 446 +-- src/d/a/d_a_alink_canoe.inc | 492 +-- src/d/a/d_a_alink_copyrod.inc | 415 ++- src/d/a/d_a_alink_crawl.inc | 16 +- src/d/a/d_a_alink_cut.inc | 1848 ++++++++--- src/d/a/d_a_alink_damage.inc | 632 ++-- src/d/a/d_a_alink_demo.inc | 290 +- src/d/a/d_a_alink_effect.inc | 109 +- src/d/a/d_a_alink_grab.inc | 268 +- src/d/a/d_a_alink_guard.inc | 133 +- src/d/a/d_a_alink_hang.inc | 110 +- src/d/a/d_a_alink_hook.inc | 100 +- src/d/a/d_a_alink_horse.inc | 274 +- src/d/a/d_a_alink_hvyboots.inc | 58 +- src/d/a/d_a_alink_iceleaf.inc | 310 +- src/d/a/d_a_alink_ironball.inc | 461 ++- src/d/a/d_a_alink_kandelaar.inc | 233 +- src/d/a/d_a_alink_link.inc | 1645 +++++++--- src/d/a/d_a_alink_spinner.inc | 56 +- src/d/a/d_a_alink_sumou.inc | 160 +- src/d/a/d_a_alink_swim.inc | 348 +- src/d/a/d_a_alink_swindow.inc | 50 + src/d/a/d_a_alink_whistle.inc | 97 +- src/d/a/d_a_alink_wolf.inc | 2165 ++++++++----- src/d/a/d_a_itembase.cpp | 2 +- src/d/a/d_a_npc.cpp | 4 +- src/d/a/d_a_obj_item.cpp | 28 +- src/d/a/d_a_player.cpp | 8 +- src/d/bg/d_bg_s.cpp | 4 +- src/d/bg/d_bg_s_acch.cpp | 22 +- src/d/bg/d_bg_s_movebg_actor.cpp | 4 +- src/d/bg/d_bg_w.cpp | 5 +- src/d/cc/d_cc_uty.cpp | 28 +- src/d/com/d_com_inf_game.cpp | 440 ++- src/d/d_attention.cpp | 6 +- src/d/d_camera.cpp | 2 +- src/d/d_demo.cpp | 16 +- src/d/d_item.cpp | 15 +- src/d/d_resorce.cpp | 14 +- src/d/event/d_event.cpp | 7 - src/d/event/d_event_data.cpp | 22 +- src/d/event/d_event_manager.cpp | 2 +- src/d/kankyo/d_kankyo_rain.cpp | 12 +- src/d/kankyo/d_kankyo_wether.cpp | 10 +- src/d/meter/d_meter2.cpp | 4 +- src/d/particle/d_particle.cpp | 2 +- src/d/save/d_save.cpp | 177 +- src/f_op/f_op_actor.cpp | 2 +- src/f_op/f_op_actor_mng.cpp | 27 +- src/init.c | 89 +- src/m_Do/m_Do_MemCardRWmng.cpp | 42 +- src/m_Do/m_Do_graphic.cpp | 4 +- src/m_Do/m_Do_machine.cpp | 8 +- src/m_Do/m_Do_main.cpp | 147 +- 727 files changed, 15610 insertions(+), 33013 deletions(-) delete mode 100644 asm/JSystem/J3DGraphAnimator/J3DAnimation/getWeight__13J3DAnmClusterCFUs.s delete mode 100644 asm/JSystem/J3DGraphAnimator/J3DAnimation/init__12J3DFrameCtrlFs.s delete mode 100644 asm/d/a/d_a_alink/allUnequip__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/basicModelDraw__9daAlink_cFP8J3DModel.s delete mode 100644 asm/d/a/d_a_alink/bottleModelCallBack__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/calcHairAngle__9daAlink_cFPs.s delete mode 100644 asm/d/a/d_a_alink/cancelBoomerangLock__9daAlink_cFP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_alink/cancelBowMoveRideNotAtn__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/cancelBowMove__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/cancelCutCharge__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/cancelGoronThrowEvent__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/changeBoarRunRide__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/changeWolfBlendRate__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/checkAcceptUseItemInWater__9daAlink_cCFUs.s delete mode 100644 asm/d/a/d_a_alink/checkArrowChargeEnd__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkAttentionLock__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkBoardRestart__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkBoardSwordTriggerAction__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkBoomerangCarry__9daAlink_cFP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_alink/checkBoomerangCatchAction__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkBootsMoveAnime__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/checkBowAndSlingItem__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/checkBowAnime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkBowCameraArrowPosP__9daAlink_cFPsPs.s delete mode 100644 asm/d/a/d_a_alink/checkBowGrabLeftHand__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkBowReadyAnime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkCanoeFishingRodGrabOrPut__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkCanoeJumpRide__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkCanoePaddleGrab__9daAlink_cCFP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_alink/checkCanoeRideTandem__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkCaughtEscapeCutTurn__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkCoachGuardGame__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkComboCnt__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkCopyRodAnime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkCopyRodTopUse__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkCowGame__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkCutAction__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkCutAtnActorChange__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkCutBackState__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkCutCancelNextMode__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/checkCutFinishJumpUp__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkCutHeadState__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkCutLandDamage__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkCutLargeTurnState__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkCutTurnInput__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkDemoMoveMode__9daAlink_cCFUl.s delete mode 100644 asm/d/a/d_a_alink/checkDoCutAction__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkDownAttackState__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkEndMessage__9daAlink_cFUl.s delete mode 100644 asm/d/a/d_a_alink/checkEnemyGroup__9daAlink_cFP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_alink/checkEquipAnime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkFishingRodAndLureItem__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkFishingRodGrab__9daAlink_cCFP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_alink/checkFlyAtnWait__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_alink/checkGrabAnimeAndThrow__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkGrabAnime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkGrabCarryActor__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkGrabHeavyActor__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkGrabNotThrow__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkGrabRooster__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkGrabSideActor__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkGrabTalkActor__9daAlink_cFP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_alink/checkGrabThrowAnime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkGroundSpecialMode__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkGuardAccept__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkHookshotReadyMaterialOffMode__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkHorseDashAccept__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkHorseLieAnime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkHorseNoUpperAnime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkHorseNotDamageReaction__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkHorseReinLeftOnly__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkHorseSubjectivity__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkHorseWaitLashAnime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkHugeAttack__9daAlink_cCFi.s delete mode 100644 asm/d/a/d_a_alink/checkIcePolygonDamage__9daAlink_cFP13cBgS_PolyInfo.s delete mode 100644 asm/d/a/d_a_alink/checkIronBallAnime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkIronBallDelete__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkIronBallGroundStop__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkIronBallReturnChange__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkIronBallReturn__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkIronBallThrowMode__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkIronBallThrowReturnMode__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkItemActorPointer__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkItemButtonChange__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkItemChangeAutoAction__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkItemChangeFromButton__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkItemEquipAnime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkKandelaarEquipAnime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkKandelaarSwing__9daAlink_cCFi.s delete mode 100644 asm/d/a/d_a_alink/checkLandAction__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/checkLargeAttack__9daAlink_cCFi.s delete mode 100644 asm/d/a/d_a_alink/checkLightSwordMtrl__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkMagicArmorNoDamage__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkMagicArmorWearAbility__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkMiddleBossGoronRoom__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkMidnaDisappearMode__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkNextActionBoard__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkNextActionBoomerang__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkNextActionCanoe__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkNextActionCopyRod__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkNextActionFromButton__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkNextActionFromCrouch__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/checkNextActionIronBall__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkNextActionSwim__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkNextActionWolfFromLie__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkNoCollisionCorret__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkNoUpperAnime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkOilBottleItemNotGet__9daAlink_cFUs.s delete mode 100644 asm/d/a/d_a_alink/checkOneHandItemEquipAnime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkOxygenTimer__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkPlayerGuardAndAttack__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkPlayerGuard__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkPossibleWaterInMode__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkSnowCodePolygon__9daAlink_cFR13cBgS_PolyInfo.s delete mode 100644 asm/d/a/d_a_alink/checkSnowCode__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkSubjectAction__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkSumouVsActor__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkSwimButtonAccept__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkSwimButtonMove__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkSwimFall__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkSwimNeckUpDown__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkSwordTwirlAnime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkUpSwimButtonAccept__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkUpperGuardAnime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkUpperItemActionBoomerangFly__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkUpperItemActionBoomerang__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkUpperItemActionBowFly__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkUpperItemActionCopyRodFly__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkUpperItemActionCopyRod__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkUpperItemActionIronBall__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkUpperReadyThrowAnime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkUseKandelaar__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/checkWaterInKandelaarOffset__9daAlink_cFf.s delete mode 100644 asm/d/a/d_a_alink/checkWaterInKandelaar__9daAlink_cFf.s delete mode 100644 asm/d/a/d_a_alink/checkWindDashAnime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkWolfAtnMoveBack__9daAlink_cFs.s delete mode 100644 asm/d/a/d_a_alink/checkWolfBarrierHitReverse__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkWolfBarrierWallHit__9daAlink_cFR13cBgS_PolyInfo.s delete mode 100644 asm/d/a/d_a_alink/checkWolfEnemyThrowAction__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkWolfLandAction__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/checkWolfLieCode__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkWolfRopeJumpHang__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkWolfRope__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkWolfShapeReverse__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkWoodShieldEquipNotIronBall__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkZoraSwimMove__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkZoraWearAbility__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/checkZoraWearMaskDraw__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/clearWoodShieldBurnEffect__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/commonGrabPutInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/commonInitForceRideRein__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/commonProcBoardInit__9daAlink_cFQ29daAlink_c12daAlink_PROC.s delete mode 100644 asm/d/a/d_a_alink/daAlink_Create__FP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_alink/daAlink_Draw__FP9daAlink_c.s delete mode 100644 asm/d/a/d_a_alink/daAlink_bottleModelCallBack__FP8J3DJointi.s delete mode 100644 asm/d/a/d_a_alink/daAlink_kandelaarModelCallBack__FP8J3DJointi.s delete mode 100644 asm/d/a/d_a_alink/daAlink_searchCanoe__FP10fopAc_ac_cPv.s delete mode 100644 asm/d/a/d_a_alink/daAlink_searchCoach__FP10fopAc_ac_cPv.s delete mode 100644 asm/d/a/d_a_alink/daAlink_searchEnemyCargo__FP10fopAc_ac_cPv.s delete mode 100644 asm/d/a/d_a_alink/daAlink_searchGiant__FP10fopAc_ac_cPv.s delete mode 100644 asm/d/a/d_a_alink/daAlink_searchGoldWolf__FP10fopAc_ac_cPv.s delete mode 100644 asm/d/a/d_a_alink/daAlink_searchIceLeaf__FP10fopAc_ac_cPv.s delete mode 100644 asm/d/a/d_a_alink/daAlink_searchPeepObj__FP10fopAc_ac_cPv.s delete mode 100644 asm/d/a/d_a_alink/daAlink_searchTagKandelaar__FP10fopAc_ac_cPv.s delete mode 100644 asm/d/a/d_a_alink/daAlink_searchTagKtOnFire__FP10fopAc_ac_cPv.s delete mode 100644 asm/d/a/d_a_alink/daAlink_searchWolfLockEnemy__FP10fopAc_ac_cPv.s delete mode 100644 asm/d/a/d_a_alink/damageMagnification__9daAlink_cFii.s delete mode 100644 asm/d/a/d_a_alink/damageTimerCount__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/decSwordBlur__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/deleteArrow__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/endHighModel__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/freezeTimerDamage__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/getArrowFlyData__9daAlink_cCFPfPfi.s delete mode 100644 asm/d/a/d_a_alink/getArrowIncAtMaxStart__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getArrowIncAtMax__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getArrowIncAtR__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getBoardRowAnmSpeed__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/getBodyAngleXBasePos__9daAlink_cFP4cXyz.s delete mode 100644 asm/d/a/d_a_alink/getBombArrowFlyExplodeTime__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getBoomSpeed__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/getBottleOpenAppearItem__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getCanoeBackMaxSpeed__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getCanoeCres__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getCanoeLocalPaddleTop__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/getCanoeMaxSpeed__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getCanoePaddleMatrix__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/getCanoeSpeedRate__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getChainStickAngleY__9daAlink_cCFs.s delete mode 100644 asm/d/a/d_a_alink/getCutDirection__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/getDirectionRopeMove__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getFreezeB__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getFreezeG__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getFreezeR__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getGrabThrowRate__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/getIronBallBgHit__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getIronBallCenterPos__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/getKandelaarFlamePos__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/getReinRideDirection__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/getSwimFrontMaxSpeed__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getSwimMaxFallSpeed__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getWallGrabStatus__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/getWolfLieMoveAnmSpeed__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/getZoraSwim__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/grabLineCheck__9daAlink_cFP4cXyzP4cXyz.s delete mode 100644 asm/d/a/d_a_alink/initCanoeRide__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/initCopyRodUpperAnimeSpeed__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/initCutAtnActorSearch__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/initFishingRodHand__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/initForceRideHorse__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/initGrabNextMode__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/initGravity__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/initWolfRopeShapeAngle__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/loadAramBmd__9daAlink_cFUsUl.s delete mode 100644 asm/d/a/d_a_alink/loadAramItemBrk__9daAlink_cFUsP8J3DModel.s delete mode 100644 asm/d/a/d_a_alink/loadAramItemBtk__9daAlink_cFUsP8J3DModel.s delete mode 100644 asm/d/a/d_a_alink/loadAramItemBtp__9daAlink_cFUsP8J3DModel.s delete mode 100644 asm/d/a/d_a_alink/loadAram__9daAlink_cFUsUl.s delete mode 100644 asm/d/a/d_a_alink/makeArrow__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/makeFairy__9daAlink_cFP4cXyzUl.s delete mode 100644 asm/d/a/d_a_alink/modelDraw__9daAlink_cFP8J3DModeli.s delete mode 100644 asm/d/a/d_a_alink/offKandelaarModel__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/offOxygenTimer__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/onPressedDamage__9daAlink_cFRC4cXyzs.s delete mode 100644 asm/d/a/d_a_alink/onWolfEnemyBiteAll__9daAlink_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2.s delete mode 100644 asm/d/a/d_a_alink/procBackJumpInit__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/procBackJumpLandInit__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/procBackJumpLand__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBackJump__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBoardCut__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBoardJump__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBoardRide__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBoardRowInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBoardSubjectivityInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBoardSubjectivity__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBoardTurnInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBoomerangCatchInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBoomerangCatch__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBoomerangMoveInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBoomerangMove__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBoomerangSubjectInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBoomerangSubject__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBootsEquipInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBottleDrinkInit__9daAlink_cFUs.s delete mode 100644 asm/d/a/d_a_alink/procBottleDrink__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBottleGetInit__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/procBottleGet__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBowMoveInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBowMove__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBowSubjectInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procBowSubject__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_alink/procCanoeJumpRide__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCanoeRideInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCanoeRide__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCoHorseCallWaitInit__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/procCoLargeDamageWall__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCoLavaReturn__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCoMetamorphoseOnlyInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCoMetamorphoseOnly__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCoPeepSubjectivityInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCoPeepSubjectivity__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCoPolyDamageInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCoPolyDamage__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCoSandWallHitInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCoSandWallHit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCoSubjectivityInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCoSwimFreezeReturnInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCoSwimSubjectivityInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCopyRodMoveInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCopyRodMove__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCopyRodReviveInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCopyRodRevive__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCopyRodSubjectInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCopyRodSubject__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCopyRodSwingInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCopyRodSwing__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCrouchInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCrouch__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutDown__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutFinishInit__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/procCutFinishJumpUpInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutFinishJumpUpLandInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutFinishJumpUpLand__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutFinishJumpUp__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutHeadLandInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutHeadLand__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutHead__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutJumpLandInit__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/procCutJumpLand__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutJump__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutLargeJumpChargeInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutLargeJumpCharge__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutLargeJumpInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutLargeJumpLandInit__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/procCutLargeJumpLand__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutNormalInit__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/procCutNormal__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutReverseInit__9daAlink_cFQ29daAlink_c11daAlink_ANM.s delete mode 100644 asm/d/a/d_a_alink/procCutReverse__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutTurnChargeInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutTurnCharge__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procCutTurnMoveInit__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/procCutTurn__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procDiveJumpInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procDiveJump__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procFall__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procFloorDownReboundInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procFloorDownRebound__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procFrontRollCrashInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procFrontRollCrash__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procFrontRollSuccessInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procFrontRollSuccess__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procGoatStroke__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procGoronMoveInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procGoronRideWaitInit__9daAlink_cFP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_alink/procHawkCatchInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procHawkCatch__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procHawkSubjectInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procIronBallMoveInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procIronBallMove__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procIronBallReturnInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procIronBallReturn__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procIronBallSubjectInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procIronBallSubject__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procIronBallThrowInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procKandelaarPourInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procKandelaarPour__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procKandelaarSwing__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procLandDamage__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procLandInit__9daAlink_cFf.s delete mode 100644 asm/d/a/d_a_alink/procLand__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procOctaIealSpit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_alink/procPreActionUnequip__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procRollJumpInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procRollJump__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procScreamWaitInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procScreamWait__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procSideRollInit__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/procSlipInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procSpinnerReadyInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procStEscapeInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procStEscape__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procStepMoveInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procSumouReadyInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procSumouShikoInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procSumouSideMoveInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procSumouStaggerInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procSumouStagger__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procSwordUnequipSpInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procSwordUnequipSp__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procTiredWaitInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWaitInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfAtnActorMoveInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfAtnActorMove__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfBackJumpLandInit__9daAlink_cFss.s delete mode 100644 asm/d/a/d_a_alink/procWolfBackJumpLand__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfBackJump__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfCargoCarryInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfChainReadyInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfChainUpInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfChainUp__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfDownAtMissLand__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfEnemyHangBiteInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfEnemyThrow__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfGiantPuzzleInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfGrabPutInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfGrabThrowInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfGrabThrow__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfHangReadyInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfHangReady__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfHowlInit__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/procWolfJumpAttackKickInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfJumpAttackKick__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfJumpAttackNormalLandInit__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/procWolfJumpAttackNormalLand__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfLandDamage__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfLand__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfMidnaRideShockInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfMidnaRideShock__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfMoveInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfMove__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfPush__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfRollAttackChargeInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfRollAttackCharge__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfRollAttackMoveInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfRopeSubjectivityInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfScreamWaitInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfScreamWait__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfSideStepLandInit__9daAlink_cFs.s delete mode 100644 asm/d/a/d_a_alink/procWolfSideStepLand__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfSitInit__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/procWolfSit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfSlideLandInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfSlideLand__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfSlipInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfSlipTurnLandInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfSlipTurnLand__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfSlopeStartInit__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/procWolfSlopeStart__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfSwimMoveInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfSwimUp__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfSwimWait__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfTiredWaitInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfTiredWait__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfWaitSlipInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procWolfWaitTurnInit__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/resetAtCollision__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/resetBasAnime__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/resetDemoBck__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/resetOilBottleModel__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/resetSpecialEvent__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/resetWolfAtCollision__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/resetWolfEnemyBiteAll__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/returnBoomerang__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/returnCopyRod__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/seStartMapInfoLevel__9daAlink_cFUl.s delete mode 100644 asm/d/a/d_a_alink/seStartMapInfo__9daAlink_cFUl.s delete mode 100644 asm/d/a/d_a_alink/seStartOnlyReverbLevel__9daAlink_cFUl.s delete mode 100644 asm/d/a/d_a_alink/seStartOnlyReverb__9daAlink_cFUl.s delete mode 100644 asm/d/a/d_a_alink/seStartSwordCut__9daAlink_cFUl.s delete mode 100644 asm/d/a/d_a_alink/searchWolfLockEnemy__9daAlink_cFP10fopAc_ac_cPv.s delete mode 100644 asm/d/a/d_a_alink/setArmReelAnime__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setArrowShieldPos__9daAlink_cCFP4cXyzP5csXyzPC4cXyzPC4cXyz.s delete mode 100644 asm/d/a/d_a_alink/setBodyAngleXReadyAnime__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/setBoomerangReadyAnime__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setBoomerangReadyQuake__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setBoomerangSight__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setBowHangAnime__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setBowNormalAnime__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setBowOrSlingStatus__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setBowReadyAnime__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setBowReloadAnime__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setBowSight__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setCollisionPos__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setCommonBoardAnime__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/setCopyRodReadyAnime__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setCopyRodSight__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setCutDash__9daAlink_cFii.s delete mode 100644 asm/d/a/d_a_alink/setCutWaterDropEffect__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff.s delete mode 100644 asm/d/a/d_a_alink/setDamagePointNormal__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/setDashDamage__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setDkCaught__9daAlink_cFP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_alink/setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz.s delete mode 100644 asm/d/a/d_a_alink/setFishGetFace__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setGrabCollisionOffset__9daAlink_cFffP13cBgS_PolyInfo.s delete mode 100644 asm/d/a/d_a_alink/setHookshotReadyMaterial__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setHorseSwordUpAnime__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setIronBallBaseAnime__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setIronBallBgCheckPos__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setIronBallReadyAnime__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setIronBallReturn__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/setIronBallWaitUpperAnime__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/setKandelaarMtx__9daAlink_cFPA4_fii.s delete mode 100644 asm/d/a/d_a_alink/setLandDamagePoint__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/setLastSceneMode__9daAlink_cFPUl.s delete mode 100644 asm/d/a/d_a_alink/setMagicArmorBrk__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/setMetamorphoseModel__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/setOutPower__9daAlink_cFfsi.s delete mode 100644 asm/d/a/d_a_alink/setRideCanoeBasePos__9daAlink_cFP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_alink/setRoomInfo__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setScreamWaitAnime__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setShieldGuard__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setSingleAnimeWolfBaseMorf__9daAlink_cFQ29daAlink_c12daAlink_WANMf.s delete mode 100644 asm/d/a/d_a_alink/setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff.s delete mode 100644 asm/d/a/d_a_alink/setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM.s delete mode 100644 asm/d/a/d_a_alink/setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c.s delete mode 100644 asm/d/a/d_a_alink/setSlingModel__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setSwimUpDownOffset__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setSwordAtCollision__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff.s delete mode 100644 asm/d/a/d_a_alink/setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf.s delete mode 100644 asm/d/a/d_a_alink/setSyncRidePos__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setThrowDamage__9daAlink_cFsffiii.s delete mode 100644 asm/d/a/d_a_alink/setUpperGuardAnime__9daAlink_cFf.s delete mode 100644 asm/d/a/d_a_alink/setWaterDropColor__9daAlink_cFPC13J3DGXColorS10.s delete mode 100644 asm/d/a/d_a_alink/setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf.s delete mode 100644 asm/d/a/d_a_alink/setWolfAtCollision__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setWolfEnemyThrowUpperAnime__9daAlink_cFQ29daAlink_c12daAlink_WANMf.s delete mode 100644 asm/d/a/d_a_alink/setWolfHangGroundY__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setWolfHeadDamage__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setWolfHowlNotHappen__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/setWolfLieMoveVoice__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/setWoodShieldBurnEffect__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setWoodShieldBurnOutEffect__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/startPeepChange__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/stopDrawParticle__9daAlink_cFUl.s delete mode 100644 asm/d/a/d_a_alink/subjectCancelTrigger__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/swimDeleteItem__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/swordUnequip__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/throwBoomerang__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/voiceStartLevel__9daAlink_cFUl.s delete mode 100644 asm/d/a/d_a_alink/voiceStart__9daAlink_cFUl.s delete mode 100644 asm/d/com/d_com_inf_game/dComIfGs_isVisitedRoom__Fi.s delete mode 100644 asm/d/com/d_com_inf_game/dComIfGs_offVisitedRoom__Fi.s delete mode 100644 asm/d/com/d_com_inf_game/dComIfGs_onVisitedRoom__Fi.s delete mode 100644 asm/d/com/d_com_inf_game/dComIfGs_wolfeye_effect_check__Fv.s delete mode 100644 asm/d/d_item/item_func_WOOD_STICK__Fv.s delete mode 100644 asm/d/save/d_save/isFirstBit__21dSv_player_get_item_cCFUc.s delete mode 100644 asm/d/save/d_save/offFirstBit__21dSv_player_get_item_cFUc.s delete mode 100644 asm/d/save/d_save/onFirstBit__21dSv_player_get_item_cFUc.s delete mode 100644 asm/init/__flush_cache.s delete mode 100644 asm/init/__init_hardware.s delete mode 100644 asm/init/__init_registers.s delete mode 100644 asm/init/__start.s delete mode 100644 asm/m_Do/m_Do_MemCardRWmng/mDoMemCdRWm_CalcCheckSumGameData__FPvUl.s delete mode 100644 asm/m_Do/m_Do_MemCardRWmng/mDoMemCdRWm_CalcCheckSum__FPvUl.s delete mode 100644 asm/m_Do/m_Do_main/LOAD_COPYDATE__FPv.s delete mode 100644 asm/m_Do/m_Do_main/main01__Fv.s delete mode 100644 asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/__dt__10daSkip2D_cFv.s delete mode 100644 asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/createHeap__10daSkip2D_cFv.s delete mode 100644 asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/create__10daSkip2D_cFv.s delete mode 100644 asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Create__FPv.s delete mode 100644 asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Delete__FPv.s delete mode 100644 asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Draw__FPv.s delete mode 100644 asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Execute__FPv.s delete mode 100644 asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_createHeap__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/draw__10daSkip2D_cFv.s delete mode 100644 asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/initiate__10daSkip2D_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/__dt__12daTagHinit_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/create__12daTagHinit_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/daTagHinit_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/daTagHinit_Delete__FP12daTagHinit_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/daTagHinit_Execute__FP12daTagHinit_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/execute__12daTagHinit_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/Create__14daTagRestart_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/daTagRestart_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/daTagRestart_Delete__FP14daTagRestart_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/daTagRestart_Execute__FP14daTagRestart_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/execute__14daTagRestart_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/func_80D6048C.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/__ct__13daTagWrHowl_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/__dt__13daTagWrHowl_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/chkWlfInTag__13daTagWrHowl_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/create__13daTagWrHowl_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_Delete__FP13daTagWrHowl_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_create__FP13daTagWrHowl_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_draw__FP13daTagWrHowl_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_execute__FP13daTagWrHowl_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/execute__13daTagWrHowl_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/init__13daTagWrHowl_cFv.s diff --git a/Progress.md b/Progress.md index a1cb743343b..d478f07d07d 100644 --- a/Progress.md +++ b/Progress.md @@ -4,25 +4,25 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -.init | 91.849662% | 8700 | 9472 +.init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 17.786186% | 639688 | 3596544 +.text | 20.092845% | 722648 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 26.439461% | 1063044 | 4020672 +Total | 28.517223% | 1146584 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 26.439461% | 1063044 | 4020672 -RELs | 33.257498% | 3824720 | 11500324 -Total | 31.491304% | 4887764 | 15520996 +main.dol | 28.517223% | 1146584 | 4020672 +RELs | 33.281706% | 3827504 | 11500324 +Total | 32.047479% | 4974088 | 15520996 ## RELs @@ -88,7 +88,7 @@ d_a_balloon_2D | 29.886212% | 3572 | 11952 d_a_fr | 34.866377% | 4488 | 12872 d_a_hitobj | 62.682927% | 1028 | 1640 d_a_mg_rod | 24.484345% | 23836 | 97352 -d_a_skip_2D | 56.456456% | 752 | 1332 +d_a_skip_2D | 100.000000% | 1332 | 1332 d_a_ep | 30.950696% | 5248 | 16956 d_a_grass | 49.074395% | 28312 | 57692 d_a_dshutter | 46.003263% | 2256 | 4904 @@ -109,7 +109,7 @@ d_a_tag_attack_item | 43.212237% | 1808 | 4184 d_a_tag_attention | 50.000000% | 1012 | 2024 d_a_tag_myna2 | 47.260274% | 828 | 1752 d_a_tag_Lv6Gate | 39.281576% | 2712 | 6904 -d_a_tag_hinit | 55.555556% | 800 | 1440 +d_a_tag_hinit | 100.000000% | 1440 | 1440 d_a_tag_camera | 37.023593% | 1632 | 4408 d_a_tag_statue_evt | 38.427948% | 2816 | 7328 d_a_tag_rmbit_sw | 46.642468% | 1028 | 2204 @@ -142,7 +142,7 @@ d_a_tag_waterfall | 46.361502% | 1580 | 3408 d_a_tag_gstart | 100.000000% | 1208 | 1208 d_a_tag_mstop | 36.151961% | 1180 | 3264 d_a_tag_escape | 100.000000% | 712 | 712 -d_a_tag_setrestart | 49.130435% | 904 | 1840 +d_a_tag_setrestart | 96.739130% | 1780 | 1840 d_a_tag_river_back | 45.725916% | 1348 | 2948 d_a_tag_qs | 34.804270% | 1956 | 5620 d_a_tag_event | 31.075697% | 1248 | 4016 @@ -173,7 +173,7 @@ d_a_tag_lantern | 52.013423% | 1240 | 2384 d_a_tag_guard | 54.421769% | 640 | 1176 d_a_tag_assistance | 76.699029% | 632 | 824 d_a_tag_mist | 43.436293% | 900 | 2072 -d_a_tag_wara_howl | 51.549296% | 732 | 1420 +d_a_tag_wara_howl | 100.000000% | 1420 | 1420 d_a_tag_hjump | 40.841584% | 1320 | 3232 d_a_door_dbdoor00 | 40.734908% | 3104 | 7620 d_a_door_spiral | 100.000000% | 504 | 504 @@ -785,4 +785,4 @@ d_a_b_oh2 | 37.960954% | 2100 | 5532 d_a_b_bq | 28.033347% | 11164 | 39824 d_a_b_zant_sima | 40.995025% | 1648 | 4020 d_a_b_gm | 30.376176% | 11628 | 38280 -Total | 33.257498% | 3824720 | 11500324 +Total | 33.281706% | 3827504 | 11500324 diff --git a/asm/JSystem/J3DGraphAnimator/J3DAnimation/getWeight__13J3DAnmClusterCFUs.s b/asm/JSystem/J3DGraphAnimator/J3DAnimation/getWeight__13J3DAnmClusterCFUs.s deleted file mode 100644 index 52ef22fbd83..00000000000 --- a/asm/JSystem/J3DGraphAnimator/J3DAnimation/getWeight__13J3DAnmClusterCFUs.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8032C11C: -/* 8032C11C C0 22 CA 30 */ lfs f1, lit_852(r2) -/* 8032C120 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphAnimator/J3DAnimation/init__12J3DFrameCtrlFs.s b/asm/JSystem/J3DGraphAnimator/J3DAnimation/init__12J3DFrameCtrlFs.s deleted file mode 100644 index 32605ca2c36..00000000000 --- a/asm/JSystem/J3DGraphAnimator/J3DAnimation/init__12J3DFrameCtrlFs.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_803283FC: -/* 803283FC 38 00 00 02 */ li r0, 2 -/* 80328400 98 03 00 04 */ stb r0, 4(r3) -/* 80328404 38 00 00 00 */ li r0, 0 -/* 80328408 98 03 00 05 */ stb r0, 5(r3) -/* 8032840C B0 03 00 06 */ sth r0, 6(r3) -/* 80328410 B0 83 00 08 */ sth r4, 8(r3) -/* 80328414 B0 03 00 0A */ sth r0, 0xa(r3) -/* 80328418 C0 02 CA 30 */ lfs f0, lit_852(r2) -/* 8032841C D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80328420 C0 02 CA 34 */ lfs f0, lit_853(r2) -/* 80328424 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 80328428 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/allUnequip__9daAlink_cFi.s b/asm/d/a/d_a_alink/allUnequip__9daAlink_cFi.s deleted file mode 100644 index c8cb1a78909..00000000000 --- a/asm/d/a/d_a_alink/allUnequip__9daAlink_cFi.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_800B983C: -/* 800B983C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B9840 7C 08 02 A6 */ mflr r0 -/* 800B9844 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B9848 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B984C 93 C1 00 08 */ stw r30, 8(r1) -/* 800B9850 7C 7E 1B 78 */ mr r30, r3 -/* 800B9854 80 03 05 78 */ lwz r0, 0x578(r3) -/* 800B9858 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 800B985C 41 82 00 7C */ beq lbl_800B98D8 -/* 800B9860 2C 04 00 00 */ cmpwi r4, 0 -/* 800B9864 41 82 00 74 */ beq lbl_800B98D8 -/* 800B9868 81 83 06 28 */ lwz r12, 0x628(r3) -/* 800B986C 81 8C 01 90 */ lwz r12, 0x190(r12) -/* 800B9870 7D 89 03 A6 */ mtctr r12 -/* 800B9874 4E 80 04 21 */ bctrl -/* 800B9878 28 03 00 00 */ cmplwi r3, 0 -/* 800B987C 40 82 00 5C */ bne lbl_800B98D8 -/* 800B9880 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) -/* 800B9884 28 00 00 48 */ cmplwi r0, 0x48 -/* 800B9888 41 82 00 50 */ beq lbl_800B98D8 -/* 800B988C 3B E0 00 00 */ li r31, 0 -/* 800B9890 48 00 00 20 */ b lbl_800B98B0 -lbl_800B9894: -/* 800B9894 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800B9898 4B F7 46 85 */ bl dComIfGp_getSelectItem__Fi -/* 800B989C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 800B98A0 28 00 00 48 */ cmplwi r0, 0x48 -/* 800B98A4 40 82 00 08 */ bne lbl_800B98AC -/* 800B98A8 9B FE 2F 9C */ stb r31, 0x2f9c(r30) -lbl_800B98AC: -/* 800B98AC 3B FF 00 01 */ addi r31, r31, 1 -lbl_800B98B0: -/* 800B98B0 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 800B98B4 28 00 00 02 */ cmplwi r0, 2 -/* 800B98B8 41 80 FF DC */ blt lbl_800B9894 -/* 800B98BC 7F C3 F3 78 */ mr r3, r30 -/* 800B98C0 38 80 00 48 */ li r4, 0x48 -/* 800B98C4 4B FF FD 7D */ bl itemEquip__9daAlink_cFUs -/* 800B98C8 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 800B98CC 60 00 00 40 */ ori r0, r0, 0x40 -/* 800B98D0 90 1E 05 74 */ stw r0, 0x574(r30) -/* 800B98D4 48 00 00 60 */ b lbl_800B9934 -lbl_800B98D8: -/* 800B98D8 A0 9E 2F DC */ lhz r4, 0x2fdc(r30) -/* 800B98DC 28 04 01 03 */ cmplwi r4, 0x103 -/* 800B98E0 40 82 00 10 */ bne lbl_800B98F0 -/* 800B98E4 7F C3 F3 78 */ mr r3, r30 -/* 800B98E8 4B FF FC 99 */ bl swordUnequip__9daAlink_cFv -/* 800B98EC 48 00 00 40 */ b lbl_800B992C -lbl_800B98F0: -/* 800B98F0 28 04 01 02 */ cmplwi r4, 0x102 -/* 800B98F4 40 82 00 2C */ bne lbl_800B9920 -/* 800B98F8 7F C3 F3 78 */ mr r3, r30 -/* 800B98FC 38 80 00 00 */ li r4, 0 -/* 800B9900 38 A0 00 00 */ li r5, 0 -/* 800B9904 48 00 79 D9 */ bl deleteEquipItem__9daAlink_cFii -/* 800B9908 80 7E 20 60 */ lwz r3, 0x2060(r30) -/* 800B990C C0 22 93 3C */ lfs f1, lit_7808(r2) -/* 800B9910 38 80 00 00 */ li r4, 0 -/* 800B9914 38 A0 00 23 */ li r5, 0x23 -/* 800B9918 4B F5 5F 31 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs -/* 800B991C 48 00 00 10 */ b lbl_800B992C -lbl_800B9920: -/* 800B9920 7F C3 F3 78 */ mr r3, r30 -/* 800B9924 C0 22 92 B8 */ lfs f1, lit_6040(r2) -/* 800B9928 4B FF FD 7D */ bl itemUnequip__9daAlink_cFUsf -lbl_800B992C: -/* 800B992C 38 00 00 FF */ li r0, 0xff -/* 800B9930 B0 1E 2F DE */ sth r0, 0x2fde(r30) -lbl_800B9934: -/* 800B9934 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B9938 83 C1 00 08 */ lwz r30, 8(r1) -/* 800B993C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B9940 7C 08 03 A6 */ mtlr r0 -/* 800B9944 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B9948 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/basicModelDraw__9daAlink_cFP8J3DModel.s b/asm/d/a/d_a_alink/basicModelDraw__9daAlink_cFP8J3DModel.s deleted file mode 100644 index 5ad573f445b..00000000000 --- a/asm/d/a/d_a_alink/basicModelDraw__9daAlink_cFP8J3DModel.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_800CC298: -/* 800CC298 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800CC29C 7C 08 02 A6 */ mflr r0 -/* 800CC2A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800CC2A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800CC2A8 7C 65 1B 78 */ mr r5, r3 -/* 800CC2AC 7C 9F 23 78 */ mr r31, r4 -/* 800CC2B0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 800CC2B4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 800CC2B8 80 84 00 04 */ lwz r4, 4(r4) -/* 800CC2BC 38 A5 01 0C */ addi r5, r5, 0x10c -/* 800CC2C0 48 0D 8A E1 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 800CC2C4 7F E3 FB 78 */ mr r3, r31 -/* 800CC2C8 4B F4 1A 9D */ bl mDoExt_modelEntryDL__FP8J3DModel -/* 800CC2CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800CC2D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800CC2D4 7C 08 03 A6 */ mtlr r0 -/* 800CC2D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800CC2DC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/bottleModelCallBack__9daAlink_cFv.s b/asm/d/a/d_a_alink/bottleModelCallBack__9daAlink_cFv.s deleted file mode 100644 index b921162df97..00000000000 --- a/asm/d/a/d_a_alink/bottleModelCallBack__9daAlink_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8010E48C: -/* 8010E48C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8010E490 7C 08 02 A6 */ mflr r0 -/* 8010E494 90 01 00 14 */ stw r0, 0x14(r1) -/* 8010E498 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8010E49C 7C 7F 1B 78 */ mr r31, r3 -/* 8010E4A0 A8 03 30 1A */ lha r0, 0x301a(r3) -/* 8010E4A4 2C 00 00 00 */ cmpwi r0, 0 -/* 8010E4A8 41 82 00 6C */ beq lbl_8010E514 -/* 8010E4AC 80 7F 06 50 */ lwz r3, 0x650(r31) -/* 8010E4B0 80 63 00 84 */ lwz r3, 0x84(r3) -/* 8010E4B4 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8010E4B8 A0 1F 30 C2 */ lhz r0, 0x30c2(r31) -/* 8010E4BC 1C 00 00 30 */ mulli r0, r0, 0x30 -/* 8010E4C0 7C 63 02 14 */ add r3, r3, r0 -/* 8010E4C4 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8010E4C8 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8010E4CC 48 23 7F E5 */ bl PSMTXCopy -/* 8010E4D0 C0 22 94 14 */ lfs f1, lit_14616(r2) -/* 8010E4D4 C0 42 92 BC */ lfs f2, lit_6041(r2) -/* 8010E4D8 C0 62 94 A8 */ lfs f3, lit_16570(r2) -/* 8010E4DC 4B EF E8 C1 */ bl transM__14mDoMtx_stack_cFfff -/* 8010E4E0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8010E4E4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8010E4E8 38 80 48 88 */ li r4, 0x4888 -/* 8010E4EC 38 A0 FF A5 */ li r5, -91 -/* 8010E4F0 38 C0 A9 3F */ li r6, -22209 -/* 8010E4F4 4B EF DC 71 */ bl mDoMtx_XYZrotM__FPA4_fsss -/* 8010E4F8 80 7F 07 08 */ lwz r3, 0x708(r31) -/* 8010E4FC 80 63 00 84 */ lwz r3, 0x84(r3) -/* 8010E500 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8010E504 38 83 00 30 */ addi r4, r3, 0x30 -/* 8010E508 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8010E50C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8010E510 48 23 7F A1 */ bl PSMTXCopy -lbl_8010E514: -/* 8010E514 38 60 00 01 */ li r3, 1 -/* 8010E518 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8010E51C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8010E520 7C 08 03 A6 */ mtlr r0 -/* 8010E524 38 21 00 10 */ addi r1, r1, 0x10 -/* 8010E528 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/calcHairAngle__9daAlink_cFPs.s b/asm/d/a/d_a_alink/calcHairAngle__9daAlink_cFPs.s deleted file mode 100644 index fd9756f6b0f..00000000000 --- a/asm/d/a/d_a_alink/calcHairAngle__9daAlink_cFPs.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009FFF8: -/* 8009FFF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009FFFC 7C 08 02 A6 */ mflr r0 -/* 800A0000 90 01 00 14 */ stw r0, 0x14(r1) -/* 800A0004 7C 83 23 78 */ mr r3, r4 -/* 800A0008 38 80 00 00 */ li r4, 0 -/* 800A000C 38 A0 00 05 */ li r5, 5 -/* 800A0010 38 C0 01 90 */ li r6, 0x190 -/* 800A0014 38 E0 00 32 */ li r7, 0x32 -/* 800A0018 48 1D 05 29 */ bl cLib_addCalcAngleS__FPsssss -/* 800A001C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800A0020 7C 08 03 A6 */ mtlr r0 -/* 800A0024 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A0028 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/cancelBoomerangLock__9daAlink_cFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/cancelBoomerangLock__9daAlink_cFP10fopAc_ac_c.s deleted file mode 100644 index 6f3d733e4a1..00000000000 --- a/asm/d/a/d_a_alink/cancelBoomerangLock__9daAlink_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_800E01CC: -/* 800E01CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E01D0 7C 08 02 A6 */ mflr r0 -/* 800E01D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E01D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E01DC 7C 9F 23 78 */ mr r31, r4 -/* 800E01E0 48 00 00 31 */ bl getBoomerangActor__9daAlink_cFv -/* 800E01E4 28 03 00 00 */ cmplwi r3, 0 -/* 800E01E8 41 82 00 14 */ beq lbl_800E01FC -/* 800E01EC 7F E4 FB 78 */ mr r4, r31 -/* 800E01F0 39 83 0D D8 */ addi r12, r3, 0xdd8 -/* 800E01F4 48 28 1E 91 */ bl __ptmf_scall -/* 800E01F8 60 00 00 00 */ nop -lbl_800E01FC: -/* 800E01FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E0200 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E0204 7C 08 03 A6 */ mtlr r0 -/* 800E0208 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E020C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/cancelBowMoveRideNotAtn__9daAlink_cFv.s b/asm/d/a/d_a_alink/cancelBowMoveRideNotAtn__9daAlink_cFv.s deleted file mode 100644 index e6f1f56390d..00000000000 --- a/asm/d/a/d_a_alink/cancelBowMoveRideNotAtn__9daAlink_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_800DED88: -/* 800DED88 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800DED8C 7C 08 02 A6 */ mflr r0 -/* 800DED90 90 01 00 24 */ stw r0, 0x24(r1) -/* 800DED94 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DED98 48 28 34 3D */ bl _savegpr_27 -/* 800DED9C 7C 7B 1B 78 */ mr r27, r3 -/* 800DEDA0 3B C0 00 00 */ li r30, 0 -/* 800DEDA4 7F DD F3 78 */ mr r29, r30 -/* 800DEDA8 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 800DEDAC 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 -/* 800DEDB0 41 82 00 38 */ beq lbl_800DEDE8 -/* 800DEDB4 83 FB 27 E0 */ lwz r31, 0x27e0(r27) -/* 800DEDB8 3B 80 00 01 */ li r28, 1 -/* 800DEDBC 7F E3 FB 78 */ mr r3, r31 -/* 800DEDC0 4B F9 4A 25 */ bl LockonTruth__12dAttention_cFv -/* 800DEDC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800DEDC8 40 82 00 14 */ bne lbl_800DEDDC -/* 800DEDCC 80 1F 03 34 */ lwz r0, 0x334(r31) -/* 800DEDD0 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 800DEDD4 40 82 00 08 */ bne lbl_800DEDDC -/* 800DEDD8 3B 80 00 00 */ li r28, 0 -lbl_800DEDDC: -/* 800DEDDC 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 800DEDE0 41 82 00 08 */ beq lbl_800DEDE8 -/* 800DEDE4 3B A0 00 01 */ li r29, 1 -lbl_800DEDE8: -/* 800DEDE8 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 800DEDEC 41 82 00 14 */ beq lbl_800DEE00 -/* 800DEDF0 80 1B 27 EC */ lwz r0, 0x27ec(r27) -/* 800DEDF4 28 00 00 00 */ cmplwi r0, 0 -/* 800DEDF8 40 82 00 08 */ bne lbl_800DEE00 -/* 800DEDFC 3B C0 00 01 */ li r30, 1 -lbl_800DEE00: -/* 800DEE00 57 C3 06 3E */ clrlwi r3, r30, 0x18 -/* 800DEE04 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DEE08 48 28 34 19 */ bl _restgpr_27 -/* 800DEE0C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800DEE10 7C 08 03 A6 */ mtlr r0 -/* 800DEE14 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DEE18 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/cancelBowMove__9daAlink_cFv.s b/asm/d/a/d_a_alink/cancelBowMove__9daAlink_cFv.s deleted file mode 100644 index d7a406f2708..00000000000 --- a/asm/d/a/d_a_alink/cancelBowMove__9daAlink_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_800DEE1C: -/* 800DEE1C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800DEE20 7C 08 02 A6 */ mflr r0 -/* 800DEE24 90 01 00 24 */ stw r0, 0x24(r1) -/* 800DEE28 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DEE2C 48 28 33 B1 */ bl _savegpr_29 -/* 800DEE30 7C 7D 1B 78 */ mr r29, r3 -/* 800DEE34 80 03 27 EC */ lwz r0, 0x27ec(r3) -/* 800DEE38 28 00 00 00 */ cmplwi r0, 0 -/* 800DEE3C 40 82 00 84 */ bne lbl_800DEEC0 -/* 800DEE40 83 FD 27 E0 */ lwz r31, 0x27e0(r29) -/* 800DEE44 3B C0 00 01 */ li r30, 1 -/* 800DEE48 7F E3 FB 78 */ mr r3, r31 -/* 800DEE4C 4B F9 49 99 */ bl LockonTruth__12dAttention_cFv -/* 800DEE50 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800DEE54 40 82 00 14 */ bne lbl_800DEE68 -/* 800DEE58 80 1F 03 34 */ lwz r0, 0x334(r31) -/* 800DEE5C 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 800DEE60 40 82 00 08 */ bne lbl_800DEE68 -/* 800DEE64 3B C0 00 00 */ li r30, 0 -lbl_800DEE68: -/* 800DEE68 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 800DEE6C 40 82 00 54 */ bne lbl_800DEEC0 -/* 800DEE70 A8 1D 30 8E */ lha r0, 0x308e(r29) -/* 800DEE74 2C 00 00 00 */ cmpwi r0, 0 -/* 800DEE78 40 82 00 48 */ bne lbl_800DEEC0 -/* 800DEE7C 7F A3 EB 78 */ mr r3, r29 -/* 800DEE80 4B FF FB 39 */ bl checkBowReadyAnime__9daAlink_cCFv -/* 800DEE84 2C 03 00 00 */ cmpwi r3, 0 -/* 800DEE88 40 82 00 38 */ bne lbl_800DEEC0 -/* 800DEE8C A0 1D 1F BC */ lhz r0, 0x1fbc(r29) -/* 800DEE90 28 00 00 0C */ cmplwi r0, 0xc -/* 800DEE94 40 82 00 14 */ bne lbl_800DEEA8 -/* 800DEE98 38 7D 20 48 */ addi r3, r29, 0x2048 -/* 800DEE9C 48 07 F6 31 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800DEEA0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800DEEA4 41 82 00 1C */ beq lbl_800DEEC0 -lbl_800DEEA8: -/* 800DEEA8 7F A3 EB 78 */ mr r3, r29 -/* 800DEEAC 38 80 00 02 */ li r4, 2 -/* 800DEEB0 C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800DEEB4 4B FC E8 71 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf -/* 800DEEB8 38 60 00 01 */ li r3, 1 -/* 800DEEBC 48 00 00 08 */ b lbl_800DEEC4 -lbl_800DEEC0: -/* 800DEEC0 38 60 00 00 */ li r3, 0 -lbl_800DEEC4: -/* 800DEEC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DEEC8 48 28 33 61 */ bl _restgpr_29 -/* 800DEECC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800DEED0 7C 08 03 A6 */ mtlr r0 -/* 800DEED4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DEED8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/cancelCutCharge__9daAlink_cFv.s b/asm/d/a/d_a_alink/cancelCutCharge__9daAlink_cFv.s deleted file mode 100644 index f25ae3f50d4..00000000000 --- a/asm/d/a/d_a_alink/cancelCutCharge__9daAlink_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_800D2B88: -/* 800D2B88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D2B8C 7C 08 02 A6 */ mflr r0 -/* 800D2B90 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D2B94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D2B98 7C 7F 1B 78 */ mr r31, r3 -/* 800D2B9C 88 83 05 69 */ lbz r4, 0x569(r3) -/* 800D2BA0 28 04 00 04 */ cmplwi r4, 4 -/* 800D2BA4 40 82 00 1C */ bne lbl_800D2BC0 -/* 800D2BA8 38 80 00 01 */ li r4, 1 -/* 800D2BAC 4B FF E8 85 */ bl resetCombo__9daAlink_cFi -/* 800D2BB0 7F E3 FB 78 */ mr r3, r31 -/* 800D2BB4 38 80 00 00 */ li r4, 0 -/* 800D2BB8 4B FE 75 19 */ bl checkNextAction__9daAlink_cFi -/* 800D2BBC 48 00 00 2C */ b lbl_800D2BE8 -lbl_800D2BC0: -/* 800D2BC0 38 04 00 01 */ addi r0, r4, 1 -/* 800D2BC4 98 1F 05 69 */ stb r0, 0x569(r31) -/* 800D2BC8 88 1F 05 69 */ lbz r0, 0x569(r31) -/* 800D2BCC 28 00 00 03 */ cmplwi r0, 3 -/* 800D2BD0 41 81 00 10 */ bgt lbl_800D2BE0 -/* 800D2BD4 38 80 00 02 */ li r4, 2 -/* 800D2BD8 48 00 03 81 */ bl procCutNormalInit__9daAlink_cFi -/* 800D2BDC 48 00 00 0C */ b lbl_800D2BE8 -lbl_800D2BE0: -/* 800D2BE0 38 80 00 01 */ li r4, 1 -/* 800D2BE4 48 00 08 F5 */ bl procCutFinishInit__9daAlink_cFi -lbl_800D2BE8: -/* 800D2BE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D2BEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D2BF0 7C 08 03 A6 */ mtlr r0 -/* 800D2BF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D2BF8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/cancelGoronThrowEvent__9daAlink_cFv.s b/asm/d/a/d_a_alink/cancelGoronThrowEvent__9daAlink_cFv.s deleted file mode 100644 index 4c55de7d4d4..00000000000 --- a/asm/d/a/d_a_alink/cancelGoronThrowEvent__9daAlink_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_800E91C4: -/* 800E91C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E91C8 7C 08 02 A6 */ mflr r0 -/* 800E91CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E91D0 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800E91D4 28 00 00 C0 */ cmplwi r0, 0xc0 -/* 800E91D8 40 82 00 28 */ bne lbl_800E9200 -/* 800E91DC A8 03 30 12 */ lha r0, 0x3012(r3) -/* 800E91E0 2C 00 00 00 */ cmpwi r0, 0 -/* 800E91E4 40 82 00 1C */ bne lbl_800E9200 -/* 800E91E8 38 00 00 01 */ li r0, 1 -/* 800E91EC B0 03 30 12 */ sth r0, 0x3012(r3) -/* 800E91F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800E91F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800E91F8 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 800E91FC 4B F5 92 6D */ bl reset__14dEvt_control_cFv -lbl_800E9200: -/* 800E9200 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E9204 7C 08 03 A6 */ mtlr r0 -/* 800E9208 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E920C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/changeBoarRunRide__9daAlink_cFv.s b/asm/d/a/d_a_alink/changeBoarRunRide__9daAlink_cFv.s deleted file mode 100644 index 86e30d5d14f..00000000000 --- a/asm/d/a/d_a_alink/changeBoarRunRide__9daAlink_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_800ED4B8: -/* 800ED4B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800ED4BC 7C 08 02 A6 */ mflr r0 -/* 800ED4C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800ED4C4 80 63 28 18 */ lwz r3, 0x2818(r3) -/* 800ED4C8 4B F4 A8 F5 */ bl setRunRideMode__10e_wb_classFv -/* 800ED4CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800ED4D0 7C 08 03 A6 */ mtlr r0 -/* 800ED4D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ED4D8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/changeWolfBlendRate__9daAlink_cFi.s b/asm/d/a/d_a_alink/changeWolfBlendRate__9daAlink_cFi.s deleted file mode 100644 index cbcf88a88c8..00000000000 --- a/asm/d/a/d_a_alink/changeWolfBlendRate__9daAlink_cFi.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8012ACCC: -/* 8012ACCC 38 A0 00 00 */ li r5, 0 -/* 8012ACD0 A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 8012ACD4 28 00 02 DA */ cmplwi r0, 0x2da -/* 8012ACD8 41 82 00 10 */ beq lbl_8012ACE8 -/* 8012ACDC 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 8012ACE0 28 00 02 DB */ cmplwi r0, 0x2db -/* 8012ACE4 40 82 00 08 */ bne lbl_8012ACEC -lbl_8012ACE8: -/* 8012ACE8 38 A0 00 01 */ li r5, 1 -lbl_8012ACEC: -/* 8012ACEC 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 8012ACF0 4D 82 00 20 */ beqlr -/* 8012ACF4 2C 04 00 07 */ cmpwi r4, 7 -/* 8012ACF8 40 82 00 10 */ bne lbl_8012AD08 -/* 8012ACFC C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8012AD00 D0 03 1F 50 */ stfs f0, 0x1f50(r3) -/* 8012AD04 4E 80 00 20 */ blr -lbl_8012AD08: -/* 8012AD08 2C 04 00 03 */ cmpwi r4, 3 -/* 8012AD0C 4C 82 00 20 */ bnelr -/* 8012AD10 C0 02 92 B8 */ lfs f0, lit_6040(r2) -/* 8012AD14 D0 03 1F 50 */ stfs f0, 0x1f50(r3) -/* 8012AD18 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkAcceptUseItemInWater__9daAlink_cCFUs.s b/asm/d/a/d_a_alink/checkAcceptUseItemInWater__9daAlink_cCFUs.s deleted file mode 100644 index a4c1983a526..00000000000 --- a/asm/d/a/d_a_alink/checkAcceptUseItemInWater__9daAlink_cCFUs.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801018E4: -/* 801018E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801018E8 7C 08 02 A6 */ mflr r0 -/* 801018EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801018F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801018F4 3B E0 00 00 */ li r31, 0 -/* 801018F8 54 83 04 3E */ clrlwi r3, r4, 0x10 -/* 801018FC 28 03 00 45 */ cmplwi r3, 0x45 -/* 80101900 41 82 00 18 */ beq lbl_80101918 -/* 80101904 28 03 00 71 */ cmplwi r3, 0x71 -/* 80101908 41 82 00 10 */ beq lbl_80101918 -/* 8010190C 48 05 D2 AD */ bl checkHookshotItem__9daPy_py_cFi -/* 80101910 2C 03 00 00 */ cmpwi r3, 0 -/* 80101914 41 82 00 08 */ beq lbl_8010191C -lbl_80101918: -/* 80101918 3B E0 00 01 */ li r31, 1 -lbl_8010191C: -/* 8010191C 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 80101920 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80101924 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80101928 7C 08 03 A6 */ mtlr r0 -/* 8010192C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80101930 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkArrowChargeEnd__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkArrowChargeEnd__9daAlink_cCFv.s deleted file mode 100644 index d9f6e267d3f..00000000000 --- a/asm/d/a/d_a_alink/checkArrowChargeEnd__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800DE990: -/* 800DE990 38 80 00 00 */ li r4, 0 -/* 800DE994 A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800DE998 28 00 00 0A */ cmplwi r0, 0xa -/* 800DE99C 40 82 00 14 */ bne lbl_800DE9B0 -/* 800DE9A0 A8 03 30 1C */ lha r0, 0x301c(r3) -/* 800DE9A4 2C 00 00 00 */ cmpwi r0, 0 -/* 800DE9A8 40 82 00 08 */ bne lbl_800DE9B0 -/* 800DE9AC 38 80 00 01 */ li r4, 1 -lbl_800DE9B0: -/* 800DE9B0 7C 83 23 78 */ mr r3, r4 -/* 800DE9B4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkAttentionLock__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkAttentionLock__9daAlink_cFv.s deleted file mode 100644 index 8c6a3ce896c..00000000000 --- a/asm/d/a/d_a_alink/checkAttentionLock__9daAlink_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800CFF4C: -/* 800CFF4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800CFF50 7C 08 02 A6 */ mflr r0 -/* 800CFF54 90 01 00 14 */ stw r0, 0x14(r1) -/* 800CFF58 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800CFF5C 93 C1 00 08 */ stw r30, 8(r1) -/* 800CFF60 83 E3 27 E0 */ lwz r31, 0x27e0(r3) -/* 800CFF64 3B C0 00 01 */ li r30, 1 -/* 800CFF68 7F E3 FB 78 */ mr r3, r31 -/* 800CFF6C 4B FA 38 79 */ bl LockonTruth__12dAttention_cFv -/* 800CFF70 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800CFF74 40 82 00 14 */ bne lbl_800CFF88 -/* 800CFF78 80 1F 03 34 */ lwz r0, 0x334(r31) -/* 800CFF7C 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 800CFF80 40 82 00 08 */ bne lbl_800CFF88 -/* 800CFF84 3B C0 00 00 */ li r30, 0 -lbl_800CFF88: -/* 800CFF88 57 C3 06 3E */ clrlwi r3, r30, 0x18 -/* 800CFF8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800CFF90 83 C1 00 08 */ lwz r30, 8(r1) -/* 800CFF94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800CFF98 7C 08 03 A6 */ mtlr r0 -/* 800CFF9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800CFFA0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkBoardRestart__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkBoardRestart__9daAlink_cFv.s deleted file mode 100644 index f4820c5e40b..00000000000 --- a/asm/d/a/d_a_alink/checkBoardRestart__9daAlink_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80105B10: -/* 80105B10 38 A0 00 00 */ li r5, 0 -/* 80105B14 7C A4 2B 78 */ mr r4, r5 -/* 80105B18 88 03 2F AA */ lbz r0, 0x2faa(r3) -/* 80105B1C 28 00 00 00 */ cmplwi r0, 0 -/* 80105B20 40 82 00 14 */ bne lbl_80105B34 -/* 80105B24 80 03 28 18 */ lwz r0, 0x2818(r3) -/* 80105B28 28 00 00 00 */ cmplwi r0, 0 -/* 80105B2C 41 82 00 08 */ beq lbl_80105B34 -/* 80105B30 38 80 00 01 */ li r4, 1 -lbl_80105B34: -/* 80105B34 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 80105B38 41 82 00 18 */ beq lbl_80105B50 -/* 80105B3C 80 63 28 18 */ lwz r3, 0x2818(r3) -/* 80105B40 A8 03 00 08 */ lha r0, 8(r3) -/* 80105B44 2C 00 01 87 */ cmpwi r0, 0x187 -/* 80105B48 40 82 00 08 */ bne lbl_80105B50 -/* 80105B4C 38 A0 00 01 */ li r5, 1 -lbl_80105B50: -/* 80105B50 7C A3 2B 78 */ mr r3, r5 -/* 80105B54 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkBoardSwordTriggerAction__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkBoardSwordTriggerAction__9daAlink_cFv.s deleted file mode 100644 index 12849bb9289..00000000000 --- a/asm/d/a/d_a_alink/checkBoardSwordTriggerAction__9daAlink_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80106618: -/* 80106618 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8010661C 7C 08 02 A6 */ mflr r0 -/* 80106620 90 01 00 14 */ stw r0, 0x14(r1) -/* 80106624 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 80106628 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 8010662C 41 82 00 0C */ beq lbl_80106638 -/* 80106630 48 00 0E 7D */ bl procBoardCutInit__9daAlink_cFv -/* 80106634 48 00 00 0C */ b lbl_80106640 -lbl_80106638: -/* 80106638 38 80 00 00 */ li r4, 0 -/* 8010663C 48 00 03 FD */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c -lbl_80106640: -/* 80106640 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80106644 7C 08 03 A6 */ mtlr r0 -/* 80106648 38 21 00 10 */ addi r1, r1, 0x10 -/* 8010664C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkBoomerangCarry__9daAlink_cFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/checkBoomerangCarry__9daAlink_cFP10fopAc_ac_c.s deleted file mode 100644 index 641a904ea3a..00000000000 --- a/asm/d/a/d_a_alink/checkBoomerangCarry__9daAlink_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,76 +0,0 @@ -lbl_800E02B8: -/* 800E02B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E02BC 7C 08 02 A6 */ mflr r0 -/* 800E02C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E02C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E02C8 93 C1 00 08 */ stw r30, 8(r1) -/* 800E02CC 7C 7E 1B 78 */ mr r30, r3 -/* 800E02D0 7C 9F 23 78 */ mr r31, r4 -/* 800E02D4 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800E02D8 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800E02DC 41 82 00 D8 */ beq lbl_800E03B4 -/* 800E02E0 48 03 59 41 */ bl checkEventRun__9daAlink_cCFv -/* 800E02E4 2C 03 00 00 */ cmpwi r3, 0 -/* 800E02E8 40 82 00 CC */ bne lbl_800E03B4 -/* 800E02EC 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 800E02F0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800E02F4 40 82 00 C0 */ bne lbl_800E03B4 -/* 800E02F8 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 800E02FC 54 00 00 C7 */ rlwinm. r0, r0, 0, 3, 3 -/* 800E0300 41 82 00 B4 */ beq lbl_800E03B4 -/* 800E0304 7F C3 F3 78 */ mr r3, r30 -/* 800E0308 48 00 CD 6D */ bl checkHorseNoUpperAnime__9daAlink_cCFv -/* 800E030C 2C 03 00 00 */ cmpwi r3, 0 -/* 800E0310 40 82 00 3C */ bne lbl_800E034C -/* 800E0314 38 60 00 00 */ li r3, 0 -/* 800E0318 A0 1E 1F BC */ lhz r0, 0x1fbc(r30) -/* 800E031C 28 00 02 4C */ cmplwi r0, 0x24c -/* 800E0320 41 82 00 10 */ beq lbl_800E0330 -/* 800E0324 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800E0328 28 00 02 4D */ cmplwi r0, 0x24d -/* 800E032C 40 82 00 08 */ bne lbl_800E0334 -lbl_800E0330: -/* 800E0330 38 60 00 01 */ li r3, 1 -lbl_800E0334: -/* 800E0334 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E0338 40 82 00 14 */ bne lbl_800E034C -/* 800E033C 7F C3 F3 78 */ mr r3, r30 -/* 800E0340 48 00 01 6D */ bl checkBoomerangThrowAnime__9daAlink_cCFv -/* 800E0344 2C 03 00 00 */ cmpwi r3, 0 -/* 800E0348 41 82 00 6C */ beq lbl_800E03B4 -lbl_800E034C: -/* 800E034C 7F C3 F3 78 */ mr r3, r30 -/* 800E0350 38 80 00 00 */ li r4, 0 -/* 800E0354 38 A0 00 00 */ li r5, 0 -/* 800E0358 4B FE 0F 85 */ bl deleteEquipItem__9daAlink_cFii -/* 800E035C 7F C3 F3 78 */ mr r3, r30 -/* 800E0360 3C 80 00 02 */ lis r4, 0x0002 /* 0x0002002F@ha */ -/* 800E0364 38 84 00 2F */ addi r4, r4, 0x002F /* 0x0002002F@l */ -/* 800E0368 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 800E036C 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 800E0370 7D 89 03 A6 */ mtctr r12 -/* 800E0374 4E 80 04 21 */ bctrl -/* 800E0378 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800E037C 54 00 06 F2 */ rlwinm r0, r0, 0, 0x1b, 0x19 -/* 800E0380 90 1E 05 70 */ stw r0, 0x570(r30) -/* 800E0384 7F C3 F3 78 */ mr r3, r30 -/* 800E0388 7F E4 FB 78 */ mr r4, r31 -/* 800E038C 48 00 58 29 */ bl setGrabItemActor__9daAlink_cFP10fopAc_ac_c -/* 800E0390 C0 02 93 94 */ lfs f0, lit_8785(r2) -/* 800E0394 D0 1E 33 E4 */ stfs f0, 0x33e4(r30) -/* 800E0398 7F C3 F3 78 */ mr r3, r30 -/* 800E039C 3C 80 80 39 */ lis r4, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 800E03A0 38 84 D6 64 */ addi r4, r4, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 800E03A4 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800E03A8 48 00 3A 15 */ bl setGrabUpperAnime__9daAlink_cFf -/* 800E03AC 38 60 00 01 */ li r3, 1 -/* 800E03B0 48 00 00 08 */ b lbl_800E03B8 -lbl_800E03B4: -/* 800E03B4 38 60 00 00 */ li r3, 0 -lbl_800E03B8: -/* 800E03B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E03BC 83 C1 00 08 */ lwz r30, 8(r1) -/* 800E03C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E03C4 7C 08 03 A6 */ mtlr r0 -/* 800E03C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E03CC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkBoomerangCatchAction__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkBoomerangCatchAction__9daAlink_cFv.s deleted file mode 100644 index 2eed4389cbd..00000000000 --- a/asm/d/a/d_a_alink/checkBoomerangCatchAction__9daAlink_cFv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_800E0D8C: -/* 800E0D8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E0D90 7C 08 02 A6 */ mflr r0 -/* 800E0D94 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E0D98 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E0D9C 7C 7F 1B 78 */ mr r31, r3 -/* 800E0DA0 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800E0DA4 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800E0DA8 41 82 00 A4 */ beq lbl_800E0E4C -/* 800E0DAC 48 03 4E 75 */ bl checkEventRun__9daAlink_cCFv -/* 800E0DB0 2C 03 00 00 */ cmpwi r3, 0 -/* 800E0DB4 40 82 00 8C */ bne lbl_800E0E40 -/* 800E0DB8 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800E0DBC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800E0DC0 40 82 00 80 */ bne lbl_800E0E40 -/* 800E0DC4 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800E0DC8 54 00 00 C7 */ rlwinm. r0, r0, 0, 3, 3 -/* 800E0DCC 41 82 00 74 */ beq lbl_800E0E40 -/* 800E0DD0 7F E3 FB 78 */ mr r3, r31 -/* 800E0DD4 4B FD 84 81 */ bl checkNoUpperAnime__9daAlink_cCFv -/* 800E0DD8 2C 03 00 00 */ cmpwi r3, 0 -/* 800E0DDC 40 82 00 3C */ bne lbl_800E0E18 -/* 800E0DE0 38 60 00 00 */ li r3, 0 -/* 800E0DE4 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 800E0DE8 28 00 02 4C */ cmplwi r0, 0x24c -/* 800E0DEC 41 82 00 10 */ beq lbl_800E0DFC -/* 800E0DF0 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800E0DF4 28 00 02 4D */ cmplwi r0, 0x24d -/* 800E0DF8 40 82 00 08 */ bne lbl_800E0E00 -lbl_800E0DFC: -/* 800E0DFC 38 60 00 01 */ li r3, 1 -lbl_800E0E00: -/* 800E0E00 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E0E04 40 82 00 14 */ bne lbl_800E0E18 -/* 800E0E08 7F E3 FB 78 */ mr r3, r31 -/* 800E0E0C 4B FF F6 A1 */ bl checkBoomerangThrowAnime__9daAlink_cCFv -/* 800E0E10 2C 03 00 00 */ cmpwi r3, 0 -/* 800E0E14 41 82 00 2C */ beq lbl_800E0E40 -lbl_800E0E18: -/* 800E0E18 80 7F 31 A0 */ lwz r3, 0x31a0(r31) -/* 800E0E1C 54 60 07 FF */ clrlwi. r0, r3, 0x1f -/* 800E0E20 41 82 00 18 */ beq lbl_800E0E38 -/* 800E0E24 54 60 05 6B */ rlwinm. r0, r3, 0, 0x15, 0x15 -/* 800E0E28 40 82 00 10 */ bne lbl_800E0E38 -/* 800E0E2C 7F E3 FB 78 */ mr r3, r31 -/* 800E0E30 48 00 03 A9 */ bl procBoomerangCatchInit__9daAlink_cFv -/* 800E0E34 48 00 00 1C */ b lbl_800E0E50 -lbl_800E0E38: -/* 800E0E38 7F E3 FB 78 */ mr r3, r31 -/* 800E0E3C 4B FF F7 F5 */ bl setBoomerangCatchAnime__9daAlink_cFv -lbl_800E0E40: -/* 800E0E40 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800E0E44 54 00 06 F2 */ rlwinm r0, r0, 0, 0x1b, 0x19 -/* 800E0E48 90 1F 05 70 */ stw r0, 0x570(r31) -lbl_800E0E4C: -/* 800E0E4C 38 60 00 00 */ li r3, 0 -lbl_800E0E50: -/* 800E0E50 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E0E54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E0E58 7C 08 03 A6 */ mtlr r0 -/* 800E0E5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E0E60 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkBootsMoveAnime__9daAlink_cFi.s b/asm/d/a/d_a_alink/checkBootsMoveAnime__9daAlink_cFi.s deleted file mode 100644 index d12611637e6..00000000000 --- a/asm/d/a/d_a_alink/checkBootsMoveAnime__9daAlink_cFi.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_800E251C: -/* 800E251C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E2520 7C 08 02 A6 */ mflr r0 -/* 800E2524 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E2528 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E252C 93 C1 00 08 */ stw r30, 8(r1) -/* 800E2530 7C 7E 1B 78 */ mr r30, r3 -/* 800E2534 3B E0 00 00 */ li r31, 0 -/* 800E2538 38 A0 00 01 */ li r5, 1 -/* 800E253C 4B FD 8F 7D */ bl checkHeavyStateOn__9daAlink_cFii -/* 800E2540 2C 03 00 00 */ cmpwi r3, 0 -/* 800E2544 41 82 00 10 */ beq lbl_800E2554 -/* 800E2548 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800E254C 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 800E2550 41 82 00 10 */ beq lbl_800E2560 -lbl_800E2554: -/* 800E2554 A0 1E 1F BC */ lhz r0, 0x1fbc(r30) -/* 800E2558 28 00 02 62 */ cmplwi r0, 0x262 -/* 800E255C 40 82 00 08 */ bne lbl_800E2564 -lbl_800E2560: -/* 800E2560 3B E0 00 01 */ li r31, 1 -lbl_800E2564: -/* 800E2564 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800E2568 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E256C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800E2570 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E2574 7C 08 03 A6 */ mtlr r0 -/* 800E2578 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E257C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkBowAndSlingItem__9daAlink_cFi.s b/asm/d/a/d_a_alink/checkBowAndSlingItem__9daAlink_cFi.s deleted file mode 100644 index 9c971633855..00000000000 --- a/asm/d/a/d_a_alink/checkBowAndSlingItem__9daAlink_cFi.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800DE780: -/* 800DE780 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DE784 7C 08 02 A6 */ mflr r0 -/* 800DE788 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DE78C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DE790 93 C1 00 08 */ stw r30, 8(r1) -/* 800DE794 7C 9E 23 78 */ mr r30, r4 -/* 800DE798 3B E0 00 00 */ li r31, 0 -/* 800DE79C 7F C3 F3 78 */ mr r3, r30 -/* 800DE7A0 48 08 03 F1 */ bl checkBowItem__9daPy_py_cFi -/* 800DE7A4 2C 03 00 00 */ cmpwi r3, 0 -/* 800DE7A8 40 82 00 0C */ bne lbl_800DE7B4 -/* 800DE7AC 2C 1E 00 4B */ cmpwi r30, 0x4b -/* 800DE7B0 40 82 00 08 */ bne lbl_800DE7B8 -lbl_800DE7B4: -/* 800DE7B4 3B E0 00 01 */ li r31, 1 -lbl_800DE7B8: -/* 800DE7B8 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800DE7BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DE7C0 83 C1 00 08 */ lwz r30, 8(r1) -/* 800DE7C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DE7C8 7C 08 03 A6 */ mtlr r0 -/* 800DE7CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DE7D0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkBowAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkBowAnime__9daAlink_cCFv.s deleted file mode 100644 index 87fdc625ff0..00000000000 --- a/asm/d/a/d_a_alink/checkBowAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800DE9E8: -/* 800DE9E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DE9EC 7C 08 02 A6 */ mflr r0 -/* 800DE9F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DE9F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DE9F8 93 C1 00 08 */ stw r30, 8(r1) -/* 800DE9FC 7C 7E 1B 78 */ mr r30, r3 -/* 800DEA00 3B E0 00 00 */ li r31, 0 -/* 800DEA04 4B FF FF B5 */ bl checkBowReadyAnime__9daAlink_cCFv -/* 800DEA08 2C 03 00 00 */ cmpwi r3, 0 -/* 800DEA0C 40 82 00 10 */ bne lbl_800DEA1C -/* 800DEA10 A0 1E 1F BC */ lhz r0, 0x1fbc(r30) -/* 800DEA14 28 00 00 0C */ cmplwi r0, 0xc -/* 800DEA18 40 82 00 08 */ bne lbl_800DEA20 -lbl_800DEA1C: -/* 800DEA1C 3B E0 00 01 */ li r31, 1 -lbl_800DEA20: -/* 800DEA20 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800DEA24 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DEA28 83 C1 00 08 */ lwz r30, 8(r1) -/* 800DEA2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DEA30 7C 08 03 A6 */ mtlr r0 -/* 800DEA34 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DEA38 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkBowCameraArrowPosP__9daAlink_cFPsPs.s b/asm/d/a/d_a_alink/checkBowCameraArrowPosP__9daAlink_cFPsPs.s deleted file mode 100644 index f6fc70d6359..00000000000 --- a/asm/d/a/d_a_alink/checkBowCameraArrowPosP__9daAlink_cFPsPs.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_800DE884: -/* 800DE884 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800DE888 7C 08 02 A6 */ mflr r0 -/* 800DE88C 90 01 00 24 */ stw r0, 0x24(r1) -/* 800DE890 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DE894 48 28 39 45 */ bl _savegpr_28 -/* 800DE898 7C 7D 1B 78 */ mr r29, r3 -/* 800DE89C 7C 9E 23 78 */ mr r30, r4 -/* 800DE8A0 7C BF 2B 78 */ mr r31, r5 -/* 800DE8A4 48 00 01 45 */ bl checkBowAnime__9daAlink_cCFv -/* 800DE8A8 2C 03 00 00 */ cmpwi r3, 0 -/* 800DE8AC 41 82 00 10 */ beq lbl_800DE8BC -/* 800DE8B0 A0 1D 2F DC */ lhz r0, 0x2fdc(r29) -/* 800DE8B4 28 00 00 4B */ cmplwi r0, 0x4b -/* 800DE8B8 40 82 00 0C */ bne lbl_800DE8C4 -lbl_800DE8BC: -/* 800DE8BC 38 60 00 00 */ li r3, 0 -/* 800DE8C0 48 00 00 B8 */ b lbl_800DE978 -lbl_800DE8C4: -/* 800DE8C4 7F A3 EB 78 */ mr r3, r29 -/* 800DE8C8 81 9D 06 28 */ lwz r12, 0x628(r29) -/* 800DE8CC 81 8C 01 88 */ lwz r12, 0x188(r12) -/* 800DE8D0 7D 89 03 A6 */ mtctr r12 -/* 800DE8D4 4E 80 04 21 */ bctrl -/* 800DE8D8 28 03 00 00 */ cmplwi r3, 0 -/* 800DE8DC 41 82 00 2C */ beq lbl_800DE908 -/* 800DE8E0 80 1D 05 78 */ lwz r0, 0x578(r29) -/* 800DE8E4 54 00 01 D1 */ rlwinm. r0, r0, 0, 7, 8 -/* 800DE8E8 41 82 00 20 */ beq lbl_800DE908 -/* 800DE8EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800DE8F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800DE8F4 80 63 5D B8 */ lwz r3, 0x5db8(r3) -/* 800DE8F8 28 03 00 00 */ cmplwi r3, 0 -/* 800DE8FC 41 82 00 0C */ beq lbl_800DE908 -/* 800DE900 AB 83 04 E6 */ lha r28, 0x4e6(r3) -/* 800DE904 48 00 00 1C */ b lbl_800DE920 -lbl_800DE908: -/* 800DE908 80 1D 05 70 */ lwz r0, 0x570(r29) -/* 800DE90C 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 800DE910 41 82 00 0C */ beq lbl_800DE91C -/* 800DE914 AB 9D 31 18 */ lha r28, 0x3118(r29) -/* 800DE918 48 00 00 08 */ b lbl_800DE920 -lbl_800DE91C: -/* 800DE91C AB 9D 04 E6 */ lha r28, 0x4e6(r29) -lbl_800DE920: -/* 800DE920 A8 1D 05 9E */ lha r0, 0x59e(r29) -/* 800DE924 7F 9C 02 14 */ add r28, r28, r0 -/* 800DE928 38 7D 38 34 */ addi r3, r29, 0x3834 -/* 800DE92C 4B F2 E4 39 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 800DE930 7F A3 EB 78 */ mr r3, r29 -/* 800DE934 48 00 3A C9 */ bl concatMagneBootMtx__9daAlink_cFv -/* 800DE938 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 800DE93C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 800DE940 A8 9D 05 9C */ lha r4, 0x59c(r29) -/* 800DE944 7F 85 E3 78 */ mr r5, r28 -/* 800DE948 38 C0 00 00 */ li r6, 0 -/* 800DE94C 4B F2 D9 55 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 800DE950 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 800DE954 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 800DE958 3C 80 80 39 */ lis r4, localPos@ha /* 0x803918C4@ha */ -/* 800DE95C 38 84 18 C4 */ addi r4, r4, localPos@l /* 0x803918C4@l */ -/* 800DE960 38 BD 37 E0 */ addi r5, r29, 0x37e0 -/* 800DE964 48 26 84 09 */ bl PSMTXMultVec -/* 800DE968 A8 1D 05 9C */ lha r0, 0x59c(r29) -/* 800DE96C B0 1E 00 00 */ sth r0, 0(r30) -/* 800DE970 B3 9F 00 00 */ sth r28, 0(r31) -/* 800DE974 38 7D 37 E0 */ addi r3, r29, 0x37e0 -lbl_800DE978: -/* 800DE978 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DE97C 48 28 38 A9 */ bl _restgpr_28 -/* 800DE980 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800DE984 7C 08 03 A6 */ mtlr r0 -/* 800DE988 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DE98C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkBowGrabLeftHand__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkBowGrabLeftHand__9daAlink_cCFv.s deleted file mode 100644 index 60cd8062c26..00000000000 --- a/asm/d/a/d_a_alink/checkBowGrabLeftHand__9daAlink_cCFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_800DFBC8: -/* 800DFBC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DFBCC 7C 08 02 A6 */ mflr r0 -/* 800DFBD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DFBD4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DFBD8 3B E0 00 00 */ li r31, 0 -/* 800DFBDC 7F E0 FB 78 */ mr r0, r31 -/* 800DFBE0 88 83 2F AA */ lbz r4, 0x2faa(r3) -/* 800DFBE4 28 04 00 01 */ cmplwi r4, 1 -/* 800DFBE8 41 82 00 0C */ beq lbl_800DFBF4 -/* 800DFBEC 28 04 00 02 */ cmplwi r4, 2 -/* 800DFBF0 40 82 00 08 */ bne lbl_800DFBF8 -lbl_800DFBF4: -/* 800DFBF4 38 00 00 01 */ li r0, 1 -lbl_800DFBF8: -/* 800DFBF8 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 800DFBFC 41 82 00 14 */ beq lbl_800DFC10 -/* 800DFC00 4B FF ED E9 */ bl checkBowAnime__9daAlink_cCFv -/* 800DFC04 2C 03 00 00 */ cmpwi r3, 0 -/* 800DFC08 40 82 00 08 */ bne lbl_800DFC10 -/* 800DFC0C 3B E0 00 01 */ li r31, 1 -lbl_800DFC10: -/* 800DFC10 7F E3 FB 78 */ mr r3, r31 -/* 800DFC14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DFC18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DFC1C 7C 08 03 A6 */ mtlr r0 -/* 800DFC20 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DFC24 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkBowReadyAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkBowReadyAnime__9daAlink_cCFv.s deleted file mode 100644 index 3297effda1b..00000000000 --- a/asm/d/a/d_a_alink/checkBowReadyAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800DE9B8: -/* 800DE9B8 38 80 00 00 */ li r4, 0 -/* 800DE9BC A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800DE9C0 28 00 00 09 */ cmplwi r0, 9 -/* 800DE9C4 41 82 00 18 */ beq lbl_800DE9DC -/* 800DE9C8 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800DE9CC 28 00 00 0A */ cmplwi r0, 0xa -/* 800DE9D0 41 82 00 0C */ beq lbl_800DE9DC -/* 800DE9D4 28 00 00 0D */ cmplwi r0, 0xd -/* 800DE9D8 40 82 00 08 */ bne lbl_800DE9E0 -lbl_800DE9DC: -/* 800DE9DC 38 80 00 01 */ li r4, 1 -lbl_800DE9E0: -/* 800DE9E0 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800DE9E4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCanoeFishingRodGrabOrPut__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkCanoeFishingRodGrabOrPut__9daAlink_cCFv.s deleted file mode 100644 index f455259bde6..00000000000 --- a/asm/d/a/d_a_alink/checkCanoeFishingRodGrabOrPut__9daAlink_cCFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_800F3F38: -/* 800F3F38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800F3F3C 7C 08 02 A6 */ mflr r0 -/* 800F3F40 90 01 00 14 */ stw r0, 0x14(r1) -/* 800F3F44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800F3F48 93 C1 00 08 */ stw r30, 8(r1) -/* 800F3F4C 7C 7E 1B 78 */ mr r30, r3 -/* 800F3F50 3B E0 00 00 */ li r31, 0 -/* 800F3F54 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800F3F58 28 00 01 05 */ cmplwi r0, 0x105 -/* 800F3F5C 40 82 00 4C */ bne lbl_800F3FA8 -/* 800F3F60 81 83 06 28 */ lwz r12, 0x628(r3) -/* 800F3F64 81 8C 01 90 */ lwz r12, 0x190(r12) -/* 800F3F68 7D 89 03 A6 */ mtctr r12 -/* 800F3F6C 4E 80 04 21 */ bctrl -/* 800F3F70 28 03 00 00 */ cmplwi r3, 0 -/* 800F3F74 41 82 00 34 */ beq lbl_800F3FA8 -/* 800F3F78 7F C3 F3 78 */ mr r3, r30 -/* 800F3F7C 4B FC 53 C5 */ bl checkEquipAnime__9daAlink_cCFv -/* 800F3F80 2C 03 00 00 */ cmpwi r3, 0 -/* 800F3F84 40 82 00 20 */ bne lbl_800F3FA4 -/* 800F3F88 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) -/* 800F3F8C 28 00 00 92 */ cmplwi r0, 0x92 -/* 800F3F90 41 82 00 14 */ beq lbl_800F3FA4 -/* 800F3F94 28 00 00 93 */ cmplwi r0, 0x93 -/* 800F3F98 41 82 00 0C */ beq lbl_800F3FA4 -/* 800F3F9C 28 00 00 94 */ cmplwi r0, 0x94 -/* 800F3FA0 40 82 00 08 */ bne lbl_800F3FA8 -lbl_800F3FA4: -/* 800F3FA4 3B E0 00 01 */ li r31, 1 -lbl_800F3FA8: -/* 800F3FA8 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800F3FAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800F3FB0 83 C1 00 08 */ lwz r30, 8(r1) -/* 800F3FB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800F3FB8 7C 08 03 A6 */ mtlr r0 -/* 800F3FBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F3FC0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCanoeJumpRide__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkCanoeJumpRide__9daAlink_cFv.s deleted file mode 100644 index a41076dca71..00000000000 --- a/asm/d/a/d_a_alink/checkCanoeJumpRide__9daAlink_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_800F4008: -/* 800F4008 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800F400C 7C 08 02 A6 */ mflr r0 -/* 800F4010 90 01 00 14 */ stw r0, 0x14(r1) -/* 800F4014 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800F4018 93 C1 00 08 */ stw r30, 8(r1) -/* 800F401C 7C 7E 1B 78 */ mr r30, r3 -/* 800F4020 3B E0 00 00 */ li r31, 0 -/* 800F4024 38 7E 08 50 */ addi r3, r30, 0x850 -/* 800F4028 4B F9 06 31 */ bl ChkCoHit__12dCcD_GObjInfFv -/* 800F402C 28 03 00 00 */ cmplwi r3, 0 -/* 800F4030 41 82 00 14 */ beq lbl_800F4044 -/* 800F4034 38 7E 09 38 */ addi r3, r30, 0x938 -/* 800F4038 4B F8 F6 51 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv -/* 800F403C 7C 7F 1B 78 */ mr r31, r3 -/* 800F4040 48 00 00 20 */ b lbl_800F4060 -lbl_800F4044: -/* 800F4044 38 7E 09 8C */ addi r3, r30, 0x98c -/* 800F4048 4B F9 06 11 */ bl ChkCoHit__12dCcD_GObjInfFv -/* 800F404C 28 03 00 00 */ cmplwi r3, 0 -/* 800F4050 41 82 00 10 */ beq lbl_800F4060 -/* 800F4054 38 7E 0A 74 */ addi r3, r30, 0xa74 -/* 800F4058 4B F8 F6 31 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv -/* 800F405C 7C 7F 1B 78 */ mr r31, r3 -lbl_800F4060: -/* 800F4060 C0 3E 04 FC */ lfs f1, 0x4fc(r30) -/* 800F4064 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800F4068 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800F406C 40 80 00 5C */ bge lbl_800F40C8 -/* 800F4070 28 1F 00 00 */ cmplwi r31, 0 -/* 800F4074 41 82 00 54 */ beq lbl_800F40C8 -/* 800F4078 A8 1F 00 08 */ lha r0, 8(r31) -/* 800F407C 2C 00 00 ED */ cmpwi r0, 0xed -/* 800F4080 40 82 00 48 */ bne lbl_800F40C8 -/* 800F4084 88 1F 14 43 */ lbz r0, 0x1443(r31) -/* 800F4088 28 00 00 00 */ cmplwi r0, 0 -/* 800F408C 41 82 00 3C */ beq lbl_800F40C8 -/* 800F4090 7F C3 F3 78 */ mr r3, r30 -/* 800F4094 48 02 4C 05 */ bl checkDeadHP__9daAlink_cFv -/* 800F4098 2C 03 00 00 */ cmpwi r3, 0 -/* 800F409C 40 82 00 2C */ bne lbl_800F40C8 -/* 800F40A0 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) -/* 800F40A4 28 00 00 18 */ cmplwi r0, 0x18 -/* 800F40A8 40 82 00 10 */ bne lbl_800F40B8 -/* 800F40AC A8 1E 30 10 */ lha r0, 0x3010(r30) -/* 800F40B0 2C 00 00 00 */ cmpwi r0, 0 -/* 800F40B4 41 82 00 14 */ beq lbl_800F40C8 -lbl_800F40B8: -/* 800F40B8 7F C3 F3 78 */ mr r3, r30 -/* 800F40BC 7F E4 FB 78 */ mr r4, r31 -/* 800F40C0 48 00 0B B9 */ bl procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c -/* 800F40C4 48 00 00 08 */ b lbl_800F40CC -lbl_800F40C8: -/* 800F40C8 38 60 00 00 */ li r3, 0 -lbl_800F40CC: -/* 800F40CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800F40D0 83 C1 00 08 */ lwz r30, 8(r1) -/* 800F40D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800F40D8 7C 08 03 A6 */ mtlr r0 -/* 800F40DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F40E0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCanoePaddleGrab__9daAlink_cCFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/checkCanoePaddleGrab__9daAlink_cCFP10fopAc_ac_c.s deleted file mode 100644 index 3b487296bfe..00000000000 --- a/asm/d/a/d_a_alink/checkCanoePaddleGrab__9daAlink_cCFP10fopAc_ac_c.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_800F3EB8: -/* 800F3EB8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800F3EBC 7C 08 02 A6 */ mflr r0 -/* 800F3EC0 90 01 00 24 */ stw r0, 0x24(r1) -/* 800F3EC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F3EC8 48 26 E3 11 */ bl _savegpr_28 -/* 800F3ECC 7C 7C 1B 78 */ mr r28, r3 -/* 800F3ED0 7C 9D 23 78 */ mr r29, r4 -/* 800F3ED4 3B C0 00 00 */ li r30, 0 -/* 800F3ED8 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800F3EDC 28 00 01 0B */ cmplwi r0, 0x10b -/* 800F3EE0 40 82 00 3C */ bne lbl_800F3F1C -/* 800F3EE4 7F DF F3 78 */ mr r31, r30 -/* 800F3EE8 81 83 06 28 */ lwz r12, 0x628(r3) -/* 800F3EEC 81 8C 01 90 */ lwz r12, 0x190(r12) -/* 800F3EF0 7D 89 03 A6 */ mtctr r12 -/* 800F3EF4 4E 80 04 21 */ bctrl -/* 800F3EF8 28 03 00 00 */ cmplwi r3, 0 -/* 800F3EFC 41 82 00 14 */ beq lbl_800F3F10 -/* 800F3F00 80 1C 28 18 */ lwz r0, 0x2818(r28) -/* 800F3F04 7C 00 E8 40 */ cmplw r0, r29 -/* 800F3F08 40 82 00 08 */ bne lbl_800F3F10 -/* 800F3F0C 3B E0 00 01 */ li r31, 1 -lbl_800F3F10: -/* 800F3F10 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 800F3F14 41 82 00 08 */ beq lbl_800F3F1C -/* 800F3F18 3B C0 00 01 */ li r30, 1 -lbl_800F3F1C: -/* 800F3F1C 57 C3 06 3E */ clrlwi r3, r30, 0x18 -/* 800F3F20 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F3F24 48 26 E3 01 */ bl _restgpr_28 -/* 800F3F28 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800F3F2C 7C 08 03 A6 */ mtlr r0 -/* 800F3F30 38 21 00 20 */ addi r1, r1, 0x20 -/* 800F3F34 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCanoeRideTandem__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkCanoeRideTandem__9daAlink_cFv.s deleted file mode 100644 index 59fae3341c1..00000000000 --- a/asm/d/a/d_a_alink/checkCanoeRideTandem__9daAlink_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_800F3CF8: -/* 800F3CF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800F3CFC 7C 08 02 A6 */ mflr r0 -/* 800F3D00 90 01 00 14 */ stw r0, 0x14(r1) -/* 800F3D04 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800F3D08 83 E3 28 18 */ lwz r31, 0x2818(r3) -/* 800F3D0C 81 83 06 28 */ lwz r12, 0x628(r3) -/* 800F3D10 81 8C 01 90 */ lwz r12, 0x190(r12) -/* 800F3D14 7D 89 03 A6 */ mtctr r12 -/* 800F3D18 4E 80 04 21 */ bctrl -/* 800F3D1C 28 03 00 00 */ cmplwi r3, 0 -/* 800F3D20 41 82 00 20 */ beq lbl_800F3D40 -/* 800F3D24 28 1F 00 00 */ cmplwi r31, 0 -/* 800F3D28 41 82 00 18 */ beq lbl_800F3D40 -/* 800F3D2C 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 800F3D30 28 00 00 02 */ cmplwi r0, 2 -/* 800F3D34 40 82 00 0C */ bne lbl_800F3D40 -/* 800F3D38 38 60 00 01 */ li r3, 1 -/* 800F3D3C 48 00 00 08 */ b lbl_800F3D44 -lbl_800F3D40: -/* 800F3D40 38 60 00 00 */ li r3, 0 -lbl_800F3D44: -/* 800F3D44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800F3D48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800F3D4C 7C 08 03 A6 */ mtlr r0 -/* 800F3D50 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F3D54 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCaughtEscapeCutTurn__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkCaughtEscapeCutTurn__9daAlink_cFv.s deleted file mode 100644 index 1c351316d55..00000000000 --- a/asm/d/a/d_a_alink/checkCaughtEscapeCutTurn__9daAlink_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_800D70A0: -/* 800D70A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D70A4 7C 08 02 A6 */ mflr r0 -/* 800D70A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D70AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D70B0 7C 7F 1B 78 */ mr r31, r3 -/* 800D70B4 80 03 19 9C */ lwz r0, 0x199c(r3) -/* 800D70B8 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800D70BC 41 82 00 8C */ beq lbl_800D7148 -/* 800D70C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D70C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D70C8 88 03 00 14 */ lbz r0, 0x14(r3) -/* 800D70CC 28 00 00 FF */ cmplwi r0, 0xff -/* 800D70D0 40 82 00 10 */ bne lbl_800D70E0 -/* 800D70D4 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800D70D8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800D70DC 41 82 00 6C */ beq lbl_800D7148 -lbl_800D70E0: -/* 800D70E0 7F E3 FB 78 */ mr r3, r31 -/* 800D70E4 4B FF B2 85 */ bl checkCutTurnInputTrigger__9daAlink_cFv -/* 800D70E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D70EC 41 82 00 5C */ beq lbl_800D7148 -/* 800D70F0 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800D70F4 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800D70F8 41 82 00 18 */ beq lbl_800D7110 -/* 800D70FC 7F E3 FB 78 */ mr r3, r31 -/* 800D7100 38 80 00 02 */ li r4, 2 -/* 800D7104 38 A0 00 00 */ li r5, 0 -/* 800D7108 48 06 41 99 */ bl procWolfRollAttackInit__9daAlink_cFii -/* 800D710C 48 00 00 40 */ b lbl_800D714C -lbl_800D7110: -/* 800D7110 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800D7114 28 00 01 03 */ cmplwi r0, 0x103 -/* 800D7118 41 82 00 1C */ beq lbl_800D7134 -/* 800D711C 7F E3 FB 78 */ mr r3, r31 -/* 800D7120 38 80 00 00 */ li r4, 0 -/* 800D7124 38 A0 00 00 */ li r5, 0 -/* 800D7128 4B FE A1 B5 */ bl deleteEquipItem__9daAlink_cFii -/* 800D712C 7F E3 FB 78 */ mr r3, r31 -/* 800D7130 4B FF A1 39 */ bl setSwordModel__9daAlink_cFv -lbl_800D7134: -/* 800D7134 7F E3 FB 78 */ mr r3, r31 -/* 800D7138 38 80 00 01 */ li r4, 1 -/* 800D713C 38 A0 00 02 */ li r5, 2 -/* 800D7140 4B FF D6 9D */ bl procCutTurnInit__9daAlink_cFii -/* 800D7144 48 00 00 08 */ b lbl_800D714C -lbl_800D7148: -/* 800D7148 38 60 00 00 */ li r3, 0 -lbl_800D714C: -/* 800D714C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D7150 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D7154 7C 08 03 A6 */ mtlr r0 -/* 800D7158 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D715C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCoachGuardGame__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkCoachGuardGame__9daAlink_cFv.s deleted file mode 100644 index b56d8a774b7..00000000000 --- a/asm/d/a/d_a_alink/checkCoachGuardGame__9daAlink_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_800BE26C: -/* 800BE26C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BE270 7C 08 02 A6 */ mflr r0 -/* 800BE274 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BE278 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800BE27C 3B E0 00 00 */ li r31, 0 -/* 800BE280 80 03 05 78 */ lwz r0, 0x578(r3) -/* 800BE284 54 00 01 D1 */ rlwinm. r0, r0, 0, 7, 8 -/* 800BE288 40 82 00 20 */ bne lbl_800BE2A8 -/* 800BE28C 3C 60 80 0F */ lis r3, daAlink_searchCoach__FP10fopAc_ac_cPv@ha /* 0x800EC758@ha */ -/* 800BE290 38 63 C7 58 */ addi r3, r3, daAlink_searchCoach__FP10fopAc_ac_cPv@l /* 0x800EC758@l */ -/* 800BE294 38 80 00 00 */ li r4, 0 -/* 800BE298 4B F5 B5 61 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 800BE29C 28 03 00 00 */ cmplwi r3, 0 -/* 800BE2A0 41 82 00 08 */ beq lbl_800BE2A8 -/* 800BE2A4 3B E0 00 01 */ li r31, 1 -lbl_800BE2A8: -/* 800BE2A8 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800BE2AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800BE2B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BE2B4 7C 08 03 A6 */ mtlr r0 -/* 800BE2B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BE2BC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkComboCnt__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkComboCnt__9daAlink_cFv.s deleted file mode 100644 index d0c308c6e59..00000000000 --- a/asm/d/a/d_a_alink/checkComboCnt__9daAlink_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_800D1454: -/* 800D1454 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800D1458 7C 08 02 A6 */ mflr r0 -/* 800D145C 90 01 00 24 */ stw r0, 0x24(r1) -/* 800D1460 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D1464 48 29 0D 79 */ bl _savegpr_29 -/* 800D1468 7C 7D 1B 78 */ mr r29, r3 -/* 800D146C A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800D1470 28 00 01 03 */ cmplwi r0, 0x103 -/* 800D1474 40 82 00 7C */ bne lbl_800D14F0 -/* 800D1478 88 1D 05 69 */ lbz r0, 0x569(r29) -/* 800D147C 28 00 00 02 */ cmplwi r0, 2 -/* 800D1480 40 82 00 70 */ bne lbl_800D14F0 -/* 800D1484 83 FD 27 E0 */ lwz r31, 0x27e0(r29) -/* 800D1488 3B C0 00 01 */ li r30, 1 -/* 800D148C 7F E3 FB 78 */ mr r3, r31 -/* 800D1490 4B FA 23 55 */ bl LockonTruth__12dAttention_cFv -/* 800D1494 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D1498 40 82 00 14 */ bne lbl_800D14AC -/* 800D149C 80 1F 03 34 */ lwz r0, 0x334(r31) -/* 800D14A0 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 800D14A4 40 82 00 08 */ bne lbl_800D14AC -/* 800D14A8 3B C0 00 00 */ li r30, 0 -lbl_800D14AC: -/* 800D14AC 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 800D14B0 41 82 00 40 */ beq lbl_800D14F0 -/* 800D14B4 38 7D 12 2C */ addi r3, r29, 0x122c -/* 800D14B8 4B FB 2E 09 */ bl ChkAtHit__12dCcD_GObjInfFv -/* 800D14BC 28 03 00 00 */ cmplwi r3, 0 -/* 800D14C0 40 82 00 24 */ bne lbl_800D14E4 -/* 800D14C4 38 7D 13 70 */ addi r3, r29, 0x1370 -/* 800D14C8 4B FB 2D F9 */ bl ChkAtHit__12dCcD_GObjInfFv -/* 800D14CC 28 03 00 00 */ cmplwi r3, 0 -/* 800D14D0 40 82 00 14 */ bne lbl_800D14E4 -/* 800D14D4 38 7D 14 B4 */ addi r3, r29, 0x14b4 -/* 800D14D8 4B FB 2D E9 */ bl ChkAtHit__12dCcD_GObjInfFv -/* 800D14DC 28 03 00 00 */ cmplwi r3, 0 -/* 800D14E0 41 82 00 10 */ beq lbl_800D14F0 -lbl_800D14E4: -/* 800D14E4 80 1D 05 70 */ lwz r0, 0x570(r29) -/* 800D14E8 60 00 80 00 */ ori r0, r0, 0x8000 -/* 800D14EC 90 1D 05 70 */ stw r0, 0x570(r29) -lbl_800D14F0: -/* 800D14F0 A8 7D 30 7E */ lha r3, 0x307e(r29) -/* 800D14F4 2C 03 00 00 */ cmpwi r3, 0 -/* 800D14F8 40 81 00 10 */ ble lbl_800D1508 -/* 800D14FC 38 03 FF FF */ addi r0, r3, -1 -/* 800D1500 B0 1D 30 7E */ sth r0, 0x307e(r29) -/* 800D1504 48 00 00 10 */ b lbl_800D1514 -lbl_800D1508: -/* 800D1508 7F A3 EB 78 */ mr r3, r29 -/* 800D150C 38 80 00 01 */ li r4, 1 -/* 800D1510 4B FF FF 21 */ bl resetCombo__9daAlink_cFi -lbl_800D1514: -/* 800D1514 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D1518 48 29 0D 11 */ bl _restgpr_29 -/* 800D151C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800D1520 7C 08 03 A6 */ mtlr r0 -/* 800D1524 38 21 00 20 */ addi r1, r1, 0x20 -/* 800D1528 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCopyRodAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkCopyRodAnime__9daAlink_cCFv.s deleted file mode 100644 index 93a8560daa1..00000000000 --- a/asm/d/a/d_a_alink/checkCopyRodAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_800E1530: -/* 800E1530 38 A0 00 00 */ li r5, 0 -/* 800E1534 7C A4 2B 78 */ mr r4, r5 -/* 800E1538 A0 C3 2F DC */ lhz r6, 0x2fdc(r3) -/* 800E153C 28 06 00 46 */ cmplwi r6, 0x46 -/* 800E1540 40 82 00 14 */ bne lbl_800E1554 -/* 800E1544 A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800E1548 28 00 00 54 */ cmplwi r0, 0x54 -/* 800E154C 40 82 00 08 */ bne lbl_800E1554 -/* 800E1550 38 80 00 01 */ li r4, 1 -lbl_800E1554: -/* 800E1554 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 800E1558 40 82 00 28 */ bne lbl_800E1580 -/* 800E155C 38 80 00 00 */ li r4, 0 -/* 800E1560 28 06 00 46 */ cmplwi r6, 0x46 -/* 800E1564 40 82 00 14 */ bne lbl_800E1578 -/* 800E1568 A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800E156C 28 00 00 53 */ cmplwi r0, 0x53 -/* 800E1570 40 82 00 08 */ bne lbl_800E1578 -/* 800E1574 38 80 00 01 */ li r4, 1 -lbl_800E1578: -/* 800E1578 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 800E157C 41 82 00 08 */ beq lbl_800E1584 -lbl_800E1580: -/* 800E1580 38 A0 00 01 */ li r5, 1 -lbl_800E1584: -/* 800E1584 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 800E1588 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCopyRodTopUse__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkCopyRodTopUse__9daAlink_cFv.s deleted file mode 100644 index f4d3472a9db..00000000000 --- a/asm/d/a/d_a_alink/checkCopyRodTopUse__9daAlink_cFv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_800E145C: -/* 800E145C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800E1460 7C 08 02 A6 */ mflr r0 -/* 800E1464 90 01 00 24 */ stw r0, 0x24(r1) -/* 800E1468 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E146C 48 28 0D 6D */ bl _savegpr_28 -/* 800E1470 7C 7C 1B 78 */ mr r28, r3 -/* 800E1474 3B E0 00 01 */ li r31, 1 -/* 800E1478 7F FE FB 78 */ mr r30, r31 -/* 800E147C 3B A0 00 00 */ li r29, 0 -/* 800E1480 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800E1484 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800E1488 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 800E148C 38 80 25 80 */ li r4, 0x2580 -/* 800E1490 4B F5 35 2D */ bl isEventBit__11dSv_event_cCFUs -/* 800E1494 2C 03 00 00 */ cmpwi r3, 0 -/* 800E1498 41 82 00 30 */ beq lbl_800E14C8 -/* 800E149C 38 60 00 00 */ li r3, 0 -/* 800E14A0 A0 1C 2F E8 */ lhz r0, 0x2fe8(r28) -/* 800E14A4 28 00 01 47 */ cmplwi r0, 0x147 -/* 800E14A8 40 82 00 14 */ bne lbl_800E14BC -/* 800E14AC A8 1C 30 0E */ lha r0, 0x300e(r28) -/* 800E14B0 2C 00 00 00 */ cmpwi r0, 0 -/* 800E14B4 41 82 00 08 */ beq lbl_800E14BC -/* 800E14B8 38 60 00 01 */ li r3, 1 -lbl_800E14BC: -/* 800E14BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E14C0 40 82 00 08 */ bne lbl_800E14C8 -/* 800E14C4 3B A0 00 01 */ li r29, 1 -lbl_800E14C8: -/* 800E14C8 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 800E14CC 40 82 00 30 */ bne lbl_800E14FC -/* 800E14D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800E14D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800E14D8 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 800E14DC 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 800E14E0 7D 89 03 A6 */ mtctr r12 -/* 800E14E4 4E 80 04 21 */ bctrl -/* 800E14E8 88 03 00 09 */ lbz r0, 9(r3) -/* 800E14EC 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f -/* 800E14F0 2C 00 00 15 */ cmpwi r0, 0x15 -/* 800E14F4 41 82 00 08 */ beq lbl_800E14FC -/* 800E14F8 3B C0 00 00 */ li r30, 0 -lbl_800E14FC: -/* 800E14FC 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 800E1500 40 82 00 14 */ bne lbl_800E1514 -/* 800E1504 4B FF FF 05 */ bl checkForestOldCentury__9daAlink_cFv -/* 800E1508 2C 03 00 00 */ cmpwi r3, 0 -/* 800E150C 40 82 00 08 */ bne lbl_800E1514 -/* 800E1510 3B E0 00 00 */ li r31, 0 -lbl_800E1514: -/* 800E1514 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800E1518 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E151C 48 28 0D 09 */ bl _restgpr_28 -/* 800E1520 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800E1524 7C 08 03 A6 */ mtlr r0 -/* 800E1528 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E152C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCowGame__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkCowGame__9daAlink_cFv.s deleted file mode 100644 index ebd85cef6c5..00000000000 --- a/asm/d/a/d_a_alink/checkCowGame__9daAlink_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_800EC814: -/* 800EC814 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800EC818 7C 08 02 A6 */ mflr r0 -/* 800EC81C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800EC820 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800EC824 3B E0 00 00 */ li r31, 0 -/* 800EC828 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 800EC82C 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 800EC830 38 63 00 77 */ addi r3, r3, 0x77 -/* 800EC834 4B FB 12 2D */ bl checkStageName__9daAlink_cFPCc -/* 800EC838 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800EC83C 41 82 00 28 */ beq lbl_800EC864 -/* 800EC840 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800EC844 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800EC848 88 03 4E 0B */ lbz r0, 0x4e0b(r3) -/* 800EC84C 7C 00 07 74 */ extsb r0, r0 -/* 800EC850 2C 00 00 04 */ cmpwi r0, 4 -/* 800EC854 41 82 00 0C */ beq lbl_800EC860 -/* 800EC858 2C 00 00 05 */ cmpwi r0, 5 -/* 800EC85C 40 82 00 08 */ bne lbl_800EC864 -lbl_800EC860: -/* 800EC860 3B E0 00 01 */ li r31, 1 -lbl_800EC864: -/* 800EC864 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800EC868 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800EC86C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800EC870 7C 08 03 A6 */ mtlr r0 -/* 800EC874 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EC878 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutAction__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkCutAction__9daAlink_cFv.s deleted file mode 100644 index 7199caa394e..00000000000 --- a/asm/d/a/d_a_alink/checkCutAction__9daAlink_cFv.s +++ /dev/null @@ -1,199 +0,0 @@ -lbl_800D23C0: -/* 800D23C0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800D23C4 7C 08 02 A6 */ mflr r0 -/* 800D23C8 90 01 00 24 */ stw r0, 0x24(r1) -/* 800D23CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D23D0 48 28 FE 05 */ bl _savegpr_27 -/* 800D23D4 7C 7D 1B 78 */ mr r29, r3 -/* 800D23D8 3C 80 80 39 */ lis r4, lit_3757@ha /* 0x8038D658@ha */ -/* 800D23DC 3B C4 D6 58 */ addi r30, r4, lit_3757@l /* 0x8038D658@l */ -/* 800D23E0 4B FF FD F1 */ bl commonCutAction__9daAlink_cFv -/* 800D23E4 2C 03 00 00 */ cmpwi r3, 0 -/* 800D23E8 41 82 00 0C */ beq lbl_800D23F4 -/* 800D23EC 38 60 00 01 */ li r3, 1 -/* 800D23F0 48 00 02 7C */ b lbl_800D266C -lbl_800D23F4: -/* 800D23F4 7F A3 EB 78 */ mr r3, r29 -/* 800D23F8 48 00 02 F5 */ bl getCutDirection__9daAlink_cFv -/* 800D23FC 7C 7F 1B 78 */ mr r31, r3 -/* 800D2400 88 1D 05 69 */ lbz r0, 0x569(r29) -/* 800D2404 28 00 00 04 */ cmplwi r0, 4 -/* 800D2408 40 82 00 D0 */ bne lbl_800D24D8 -/* 800D240C 80 7D 05 70 */ lwz r3, 0x570(r29) -/* 800D2410 54 60 01 CF */ rlwinm. r0, r3, 0, 7, 7 -/* 800D2414 41 82 00 44 */ beq lbl_800D2458 -/* 800D2418 C0 3D 33 AC */ lfs f1, 0x33ac(r29) -/* 800D241C C0 02 92 A4 */ lfs f0, lit_6021(r2) -/* 800D2420 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D2424 40 81 00 24 */ ble lbl_800D2448 -/* 800D2428 2C 1F 00 00 */ cmpwi r31, 0 -/* 800D242C 41 82 00 0C */ beq lbl_800D2438 -/* 800D2430 2C 1F 00 01 */ cmpwi r31, 1 -/* 800D2434 40 82 00 14 */ bne lbl_800D2448 -lbl_800D2438: -/* 800D2438 7F A3 EB 78 */ mr r3, r29 -/* 800D243C 38 80 00 03 */ li r4, 3 -/* 800D2440 48 00 10 99 */ bl procCutFinishInit__9daAlink_cFi -/* 800D2444 48 00 02 24 */ b lbl_800D2668 -lbl_800D2448: -/* 800D2448 7F A3 EB 78 */ mr r3, r29 -/* 800D244C 38 80 00 04 */ li r4, 4 -/* 800D2450 48 00 10 89 */ bl procCutFinishInit__9daAlink_cFi -/* 800D2454 48 00 02 14 */ b lbl_800D2668 -lbl_800D2458: -/* 800D2458 54 60 04 21 */ rlwinm. r0, r3, 0, 0x10, 0x10 -/* 800D245C 41 82 00 1C */ beq lbl_800D2478 -/* 800D2460 7F A3 EB 78 */ mr r3, r29 -/* 800D2464 57 E0 10 3A */ slwi r0, r31, 2 -/* 800D2468 38 9E 41 4C */ addi r4, r30, 0x414c -/* 800D246C 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D2470 48 00 10 69 */ bl procCutFinishInit__9daAlink_cFi -/* 800D2474 48 00 01 F4 */ b lbl_800D2668 -lbl_800D2478: -/* 800D2478 83 9D 27 E0 */ lwz r28, 0x27e0(r29) -/* 800D247C 3B 60 00 01 */ li r27, 1 -/* 800D2480 7F 83 E3 78 */ mr r3, r28 -/* 800D2484 4B FA 13 61 */ bl LockonTruth__12dAttention_cFv -/* 800D2488 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D248C 40 82 00 14 */ bne lbl_800D24A0 -/* 800D2490 80 1C 03 34 */ lwz r0, 0x334(r28) -/* 800D2494 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 800D2498 40 82 00 08 */ bne lbl_800D24A0 -/* 800D249C 3B 60 00 00 */ li r27, 0 -lbl_800D24A0: -/* 800D24A0 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 800D24A4 41 82 00 1C */ beq lbl_800D24C0 -/* 800D24A8 7F A3 EB 78 */ mr r3, r29 -/* 800D24AC 57 E0 10 3A */ slwi r0, r31, 2 -/* 800D24B0 38 9E 41 24 */ addi r4, r30, 0x4124 -/* 800D24B4 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D24B8 48 00 10 21 */ bl procCutFinishInit__9daAlink_cFi -/* 800D24BC 48 00 01 AC */ b lbl_800D2668 -lbl_800D24C0: -/* 800D24C0 7F A3 EB 78 */ mr r3, r29 -/* 800D24C4 57 E0 10 3A */ slwi r0, r31, 2 -/* 800D24C8 38 9E 41 9C */ addi r4, r30, 0x419c -/* 800D24CC 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D24D0 48 00 10 09 */ bl procCutFinishInit__9daAlink_cFi -/* 800D24D4 48 00 01 94 */ b lbl_800D2668 -lbl_800D24D8: -/* 800D24D8 28 00 00 03 */ cmplwi r0, 3 -/* 800D24DC 40 82 00 A8 */ bne lbl_800D2584 -/* 800D24E0 80 1D 05 70 */ lwz r0, 0x570(r29) -/* 800D24E4 54 00 04 21 */ rlwinm. r0, r0, 0, 0x10, 0x10 -/* 800D24E8 41 82 00 3C */ beq lbl_800D2524 -/* 800D24EC 2C 1F 00 00 */ cmpwi r31, 0 -/* 800D24F0 40 82 00 1C */ bne lbl_800D250C -/* 800D24F4 7F A3 EB 78 */ mr r3, r29 -/* 800D24F8 57 E0 10 3A */ slwi r0, r31, 2 -/* 800D24FC 38 9E 41 38 */ addi r4, r30, 0x4138 -/* 800D2500 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D2504 48 00 0A 55 */ bl procCutNormalInit__9daAlink_cFi -/* 800D2508 48 00 01 60 */ b lbl_800D2668 -lbl_800D250C: -/* 800D250C 7F A3 EB 78 */ mr r3, r29 -/* 800D2510 57 E0 10 3A */ slwi r0, r31, 2 -/* 800D2514 38 9E 41 38 */ addi r4, r30, 0x4138 -/* 800D2518 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D251C 48 00 0F BD */ bl procCutFinishInit__9daAlink_cFi -/* 800D2520 48 00 01 48 */ b lbl_800D2668 -lbl_800D2524: -/* 800D2524 83 9D 27 E0 */ lwz r28, 0x27e0(r29) -/* 800D2528 3B 60 00 01 */ li r27, 1 -/* 800D252C 7F 83 E3 78 */ mr r3, r28 -/* 800D2530 4B FA 12 B5 */ bl LockonTruth__12dAttention_cFv -/* 800D2534 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D2538 40 82 00 14 */ bne lbl_800D254C -/* 800D253C 80 1C 03 34 */ lwz r0, 0x334(r28) -/* 800D2540 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 800D2544 40 82 00 08 */ bne lbl_800D254C -/* 800D2548 3B 60 00 00 */ li r27, 0 -lbl_800D254C: -/* 800D254C 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 800D2550 41 82 00 1C */ beq lbl_800D256C -/* 800D2554 7F A3 EB 78 */ mr r3, r29 -/* 800D2558 57 E0 10 3A */ slwi r0, r31, 2 -/* 800D255C 38 9E 41 10 */ addi r4, r30, 0x4110 -/* 800D2560 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D2564 48 00 09 F5 */ bl procCutNormalInit__9daAlink_cFi -/* 800D2568 48 00 01 00 */ b lbl_800D2668 -lbl_800D256C: -/* 800D256C 7F A3 EB 78 */ mr r3, r29 -/* 800D2570 57 E0 10 3A */ slwi r0, r31, 2 -/* 800D2574 38 9E 41 88 */ addi r4, r30, 0x4188 -/* 800D2578 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D257C 48 00 09 DD */ bl procCutNormalInit__9daAlink_cFi -/* 800D2580 48 00 00 E8 */ b lbl_800D2668 -lbl_800D2584: -/* 800D2584 A0 1D 2F E8 */ lhz r0, 0x2fe8(r29) -/* 800D2588 28 00 00 21 */ cmplwi r0, 0x21 -/* 800D258C 40 82 00 38 */ bne lbl_800D25C4 -/* 800D2590 A8 1D 30 0A */ lha r0, 0x300a(r29) -/* 800D2594 2C 00 00 04 */ cmpwi r0, 4 -/* 800D2598 41 82 00 2C */ beq lbl_800D25C4 -/* 800D259C 2C 00 00 02 */ cmpwi r0, 2 -/* 800D25A0 40 82 00 14 */ bne lbl_800D25B4 -/* 800D25A4 7F A3 EB 78 */ mr r3, r29 -/* 800D25A8 38 80 00 01 */ li r4, 1 -/* 800D25AC 48 00 09 AD */ bl procCutNormalInit__9daAlink_cFi -/* 800D25B0 48 00 00 B8 */ b lbl_800D2668 -lbl_800D25B4: -/* 800D25B4 7F A3 EB 78 */ mr r3, r29 -/* 800D25B8 38 80 00 02 */ li r4, 2 -/* 800D25BC 48 00 09 9D */ bl procCutNormalInit__9daAlink_cFi -/* 800D25C0 48 00 00 A8 */ b lbl_800D2668 -lbl_800D25C4: -/* 800D25C4 83 9D 27 E0 */ lwz r28, 0x27e0(r29) -/* 800D25C8 3B 60 00 01 */ li r27, 1 -/* 800D25CC 7F 83 E3 78 */ mr r3, r28 -/* 800D25D0 4B FA 12 15 */ bl LockonTruth__12dAttention_cFv -/* 800D25D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D25D8 40 82 00 14 */ bne lbl_800D25EC -/* 800D25DC 80 1C 03 34 */ lwz r0, 0x334(r28) -/* 800D25E0 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 800D25E4 40 82 00 08 */ bne lbl_800D25EC -/* 800D25E8 3B 60 00 00 */ li r27, 0 -lbl_800D25EC: -/* 800D25EC 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 800D25F0 41 82 00 40 */ beq lbl_800D2630 -/* 800D25F4 88 1D 05 69 */ lbz r0, 0x569(r29) -/* 800D25F8 28 00 00 01 */ cmplwi r0, 1 -/* 800D25FC 40 82 00 1C */ bne lbl_800D2618 -/* 800D2600 7F A3 EB 78 */ mr r3, r29 -/* 800D2604 57 E0 10 3A */ slwi r0, r31, 2 -/* 800D2608 38 9E 40 E8 */ addi r4, r30, 0x40e8 -/* 800D260C 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D2610 48 00 09 49 */ bl procCutNormalInit__9daAlink_cFi -/* 800D2614 48 00 00 54 */ b lbl_800D2668 -lbl_800D2618: -/* 800D2618 7F A3 EB 78 */ mr r3, r29 -/* 800D261C 57 E0 10 3A */ slwi r0, r31, 2 -/* 800D2620 38 9E 40 FC */ addi r4, r30, 0x40fc -/* 800D2624 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D2628 48 00 09 31 */ bl procCutNormalInit__9daAlink_cFi -/* 800D262C 48 00 00 3C */ b lbl_800D2668 -lbl_800D2630: -/* 800D2630 88 1D 05 69 */ lbz r0, 0x569(r29) -/* 800D2634 28 00 00 01 */ cmplwi r0, 1 -/* 800D2638 40 82 00 1C */ bne lbl_800D2654 -/* 800D263C 7F A3 EB 78 */ mr r3, r29 -/* 800D2640 57 E0 10 3A */ slwi r0, r31, 2 -/* 800D2644 38 9E 41 60 */ addi r4, r30, 0x4160 -/* 800D2648 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D264C 48 00 09 0D */ bl procCutNormalInit__9daAlink_cFi -/* 800D2650 48 00 00 18 */ b lbl_800D2668 -lbl_800D2654: -/* 800D2654 7F A3 EB 78 */ mr r3, r29 -/* 800D2658 57 E0 10 3A */ slwi r0, r31, 2 -/* 800D265C 38 9E 41 74 */ addi r4, r30, 0x4174 -/* 800D2660 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D2664 48 00 08 F5 */ bl procCutNormalInit__9daAlink_cFi -lbl_800D2668: -/* 800D2668 38 60 00 01 */ li r3, 1 -lbl_800D266C: -/* 800D266C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D2670 48 28 FB B1 */ bl _restgpr_27 -/* 800D2674 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800D2678 7C 08 03 A6 */ mtlr r0 -/* 800D267C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800D2680 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutAtnActorChange__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkCutAtnActorChange__9daAlink_cFv.s deleted file mode 100644 index c7396e224fd..00000000000 --- a/asm/d/a/d_a_alink/checkCutAtnActorChange__9daAlink_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_800D2C54: -/* 800D2C54 80 83 32 CC */ lwz r4, 0x32cc(r3) -/* 800D2C58 80 03 27 EC */ lwz r0, 0x27ec(r3) -/* 800D2C5C 7C 04 00 40 */ cmplw r4, r0 -/* 800D2C60 4D 82 00 20 */ beqlr -/* 800D2C64 38 00 00 00 */ li r0, 0 -/* 800D2C68 B0 03 30 10 */ sth r0, 0x3010(r3) -/* 800D2C6C 80 03 27 EC */ lwz r0, 0x27ec(r3) -/* 800D2C70 90 03 32 CC */ stw r0, 0x32cc(r3) -/* 800D2C74 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutBackState__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkCutBackState__9daAlink_cFv.s deleted file mode 100644 index 6c8a64f3758..00000000000 --- a/asm/d/a/d_a_alink/checkCutBackState__9daAlink_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_800D2890: -/* 800D2890 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D2894 7C 08 02 A6 */ mflr r0 -/* 800D2898 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D289C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D28A0 93 C1 00 08 */ stw r30, 8(r1) -/* 800D28A4 7C 7E 1B 78 */ mr r30, r3 -/* 800D28A8 3B E0 00 01 */ li r31, 1 -/* 800D28AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D28B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D28B4 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 800D28B8 38 80 29 02 */ li r4, 0x2902 -/* 800D28BC 4B F6 21 01 */ bl isEventBit__11dSv_event_cCFUs -/* 800D28C0 2C 03 00 00 */ cmpwi r3, 0 -/* 800D28C4 40 82 00 14 */ bne lbl_800D28D8 -/* 800D28C8 80 1E 05 7C */ lwz r0, 0x57c(r30) -/* 800D28CC 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800D28D0 40 82 00 08 */ bne lbl_800D28D8 -/* 800D28D4 3B E0 00 00 */ li r31, 0 -lbl_800D28D8: -/* 800D28D8 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800D28DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D28E0 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D28E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D28E8 7C 08 03 A6 */ mtlr r0 -/* 800D28EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D28F0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutCancelNextMode__9daAlink_cFi.s b/asm/d/a/d_a_alink/checkCutCancelNextMode__9daAlink_cFi.s deleted file mode 100644 index 078b9a8c10b..00000000000 --- a/asm/d/a/d_a_alink/checkCutCancelNextMode__9daAlink_cFi.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_800D2760: -/* 800D2760 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800D2764 7C 08 02 A6 */ mflr r0 -/* 800D2768 90 01 00 24 */ stw r0, 0x24(r1) -/* 800D276C DB E1 00 10 */ stfd f31, 0x10(r1) -/* 800D2770 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 800D2774 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D2778 93 C1 00 08 */ stw r30, 8(r1) -/* 800D277C 7C 7E 1B 78 */ mr r30, r3 -/* 800D2780 C3 E3 33 98 */ lfs f31, 0x3398(r3) -/* 800D2784 8B E3 2F 98 */ lbz r31, 0x2f98(r3) -/* 800D2788 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800D278C D0 03 33 98 */ stfs f0, 0x3398(r3) -/* 800D2790 98 83 2F 98 */ stb r4, 0x2f98(r3) -/* 800D2794 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 800D2798 60 00 00 04 */ ori r0, r0, 4 -/* 800D279C 90 03 31 A0 */ stw r0, 0x31a0(r3) -/* 800D27A0 38 80 00 01 */ li r4, 1 -/* 800D27A4 4B FE 79 2D */ bl checkNextAction__9daAlink_cFi -/* 800D27A8 2C 03 00 00 */ cmpwi r3, 0 -/* 800D27AC 41 82 00 0C */ beq lbl_800D27B8 -/* 800D27B0 38 60 00 01 */ li r3, 1 -/* 800D27B4 48 00 00 10 */ b lbl_800D27C4 -lbl_800D27B8: -/* 800D27B8 D3 FE 33 98 */ stfs f31, 0x3398(r30) -/* 800D27BC 9B FE 2F 98 */ stb r31, 0x2f98(r30) -/* 800D27C0 38 60 00 00 */ li r3, 0 -lbl_800D27C4: -/* 800D27C4 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 800D27C8 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 800D27CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D27D0 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D27D4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800D27D8 7C 08 03 A6 */ mtlr r0 -/* 800D27DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800D27E0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutFinishJumpUp__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkCutFinishJumpUp__9daAlink_cFv.s deleted file mode 100644 index 61150f0a5a9..00000000000 --- a/asm/d/a/d_a_alink/checkCutFinishJumpUp__9daAlink_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_800D102C: -/* 800D102C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D1030 7C 08 02 A6 */ mflr r0 -/* 800D1034 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D1038 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D103C 7C 7F 1B 78 */ mr r31, r3 -/* 800D1040 48 00 18 51 */ bl checkCutBackState__9daAlink_cFv -/* 800D1044 2C 03 00 00 */ cmpwi r3, 0 -/* 800D1048 41 82 00 28 */ beq lbl_800D1070 -/* 800D104C 4B FE F5 49 */ bl checkNotBattleStage__9daAlink_cFv -/* 800D1050 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D1054 40 82 00 1C */ bne lbl_800D1070 -/* 800D1058 7F E3 FB 78 */ mr r3, r31 -/* 800D105C 4B FE 16 5D */ bl swordSwingTrigger__9daAlink_cFv -/* 800D1060 2C 03 00 00 */ cmpwi r3, 0 -/* 800D1064 41 82 00 0C */ beq lbl_800D1070 -/* 800D1068 38 60 00 01 */ li r3, 1 -/* 800D106C 48 00 00 08 */ b lbl_800D1074 -lbl_800D1070: -/* 800D1070 38 60 00 00 */ li r3, 0 -lbl_800D1074: -/* 800D1074 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D1078 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D107C 7C 08 03 A6 */ mtlr r0 -/* 800D1080 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D1084 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutHeadState__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkCutHeadState__9daAlink_cFv.s deleted file mode 100644 index 7ba2a495910..00000000000 --- a/asm/d/a/d_a_alink/checkCutHeadState__9daAlink_cFv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_800D28F4: -/* 800D28F4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800D28F8 7C 08 02 A6 */ mflr r0 -/* 800D28FC 90 01 00 24 */ stw r0, 0x24(r1) -/* 800D2900 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D2904 48 28 F8 CD */ bl _savegpr_26 -/* 800D2908 7C 7A 1B 78 */ mr r26, r3 -/* 800D290C 83 63 27 EC */ lwz r27, 0x27ec(r3) -/* 800D2910 3B C0 00 00 */ li r30, 0 -/* 800D2914 7F DD F3 78 */ mr r29, r30 -/* 800D2918 7F DC F3 78 */ mr r28, r30 -/* 800D291C 7F DF F3 78 */ mr r31, r30 -/* 800D2920 81 83 06 28 */ lwz r12, 0x628(r3) -/* 800D2924 81 8C 02 80 */ lwz r12, 0x280(r12) -/* 800D2928 7D 89 03 A6 */ mtctr r12 -/* 800D292C 4E 80 04 21 */ bctrl -/* 800D2930 2C 03 00 00 */ cmpwi r3, 0 -/* 800D2934 40 82 00 10 */ bne lbl_800D2944 -/* 800D2938 28 1B 00 00 */ cmplwi r27, 0 -/* 800D293C 41 82 00 08 */ beq lbl_800D2944 -/* 800D2940 3B E0 00 01 */ li r31, 1 -lbl_800D2944: -/* 800D2944 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 800D2948 41 82 00 40 */ beq lbl_800D2988 -/* 800D294C 3B E0 00 01 */ li r31, 1 -/* 800D2950 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D2954 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D2958 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 800D295C 38 80 29 01 */ li r4, 0x2901 -/* 800D2960 4B F6 20 5D */ bl isEventBit__11dSv_event_cCFUs -/* 800D2964 2C 03 00 00 */ cmpwi r3, 0 -/* 800D2968 40 82 00 14 */ bne lbl_800D297C -/* 800D296C 80 1A 05 7C */ lwz r0, 0x57c(r26) -/* 800D2970 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 800D2974 40 82 00 08 */ bne lbl_800D297C -/* 800D2978 3B E0 00 00 */ li r31, 0 -lbl_800D297C: -/* 800D297C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 800D2980 41 82 00 08 */ beq lbl_800D2988 -/* 800D2984 3B 80 00 01 */ li r28, 1 -lbl_800D2988: -/* 800D2988 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 800D298C 41 82 00 14 */ beq lbl_800D29A0 -/* 800D2990 88 1B 04 96 */ lbz r0, 0x496(r27) -/* 800D2994 28 00 00 02 */ cmplwi r0, 2 -/* 800D2998 40 82 00 08 */ bne lbl_800D29A0 -/* 800D299C 3B A0 00 01 */ li r29, 1 -lbl_800D29A0: -/* 800D29A0 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 800D29A4 41 82 00 14 */ beq lbl_800D29B8 -/* 800D29A8 A0 1B 05 8E */ lhz r0, 0x58e(r27) -/* 800D29AC 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 800D29B0 41 82 00 08 */ beq lbl_800D29B8 -/* 800D29B4 3B C0 00 01 */ li r30, 1 -lbl_800D29B8: -/* 800D29B8 57 C3 06 3E */ clrlwi r3, r30, 0x18 -/* 800D29BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D29C0 48 28 F8 5D */ bl _restgpr_26 -/* 800D29C4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800D29C8 7C 08 03 A6 */ mtlr r0 -/* 800D29CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800D29D0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutLandDamage__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkCutLandDamage__9daAlink_cFv.s deleted file mode 100644 index 6a00ce80e79..00000000000 --- a/asm/d/a/d_a_alink/checkCutLandDamage__9daAlink_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_800D6FE0: -/* 800D6FE0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800D6FE4 7C 08 02 A6 */ mflr r0 -/* 800D6FE8 90 01 00 24 */ stw r0, 0x24(r1) -/* 800D6FEC DB E1 00 10 */ stfd f31, 0x10(r1) -/* 800D6FF0 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 800D6FF4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D6FF8 7C 7F 1B 78 */ mr r31, r3 -/* 800D6FFC 48 03 EC 25 */ bl checkEventRun__9daAlink_cCFv -/* 800D7000 2C 03 00 00 */ cmpwi r3, 0 -/* 800D7004 40 82 00 80 */ bne lbl_800D7084 -/* 800D7008 C0 42 93 88 */ lfs f2, lit_8782(r2) -/* 800D700C C0 3F 33 C4 */ lfs f1, 0x33c4(r31) -/* 800D7010 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 800D7014 EC 01 00 28 */ fsubs f0, f1, f0 -/* 800D7018 EF E2 00 32 */ fmuls f31, f2, f0 -/* 800D701C 3C 60 80 39 */ lis r3, m__21daAlinkHIO_damFall_c0@ha /* 0x8038E454@ha */ -/* 800D7020 38 63 E4 54 */ addi r3, r3, m__21daAlinkHIO_damFall_c0@l /* 0x8038E454@l */ -/* 800D7024 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 800D7028 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 800D702C 4C 41 13 82 */ cror 2, 1, 2 -/* 800D7030 40 82 00 54 */ bne lbl_800D7084 -/* 800D7034 7F E3 FB 78 */ mr r3, r31 -/* 800D7038 4B FF FE F5 */ bl checkNoLandDamageSlidePolygon__9daAlink_cFv -/* 800D703C 2C 03 00 00 */ cmpwi r3, 0 -/* 800D7040 40 82 00 44 */ bne lbl_800D7084 -/* 800D7044 3C 60 80 39 */ lis r3, m__21daAlinkHIO_damFall_c0@ha /* 0x8038E454@ha */ -/* 800D7048 38 63 E4 54 */ addi r3, r3, m__21daAlinkHIO_damFall_c0@l /* 0x8038E454@l */ -/* 800D704C C0 03 00 38 */ lfs f0, 0x38(r3) -/* 800D7050 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 800D7054 4C 41 13 82 */ cror 2, 1, 2 -/* 800D7058 40 82 00 14 */ bne lbl_800D706C -/* 800D705C 7F E3 FB 78 */ mr r3, r31 -/* 800D7060 38 80 00 08 */ li r4, 8 -/* 800D7064 48 00 04 41 */ bl setLandDamagePoint__9daAlink_cFi -/* 800D7068 48 00 00 10 */ b lbl_800D7078 -lbl_800D706C: -/* 800D706C 7F E3 FB 78 */ mr r3, r31 -/* 800D7070 38 80 00 04 */ li r4, 4 -/* 800D7074 48 00 04 31 */ bl setLandDamagePoint__9daAlink_cFi -lbl_800D7078: -/* 800D7078 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800D707C 60 00 00 08 */ ori r0, r0, 8 -/* 800D7080 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_800D7084: -/* 800D7084 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 800D7088 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 800D708C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D7090 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800D7094 7C 08 03 A6 */ mtlr r0 -/* 800D7098 38 21 00 20 */ addi r1, r1, 0x20 -/* 800D709C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutLargeTurnState__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkCutLargeTurnState__9daAlink_cCFv.s deleted file mode 100644 index e58e230e701..00000000000 --- a/asm/d/a/d_a_alink/checkCutLargeTurnState__9daAlink_cCFv.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_800D2ABC: -/* 800D2ABC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800D2AC0 7C 08 02 A6 */ mflr r0 -/* 800D2AC4 90 01 00 24 */ stw r0, 0x24(r1) -/* 800D2AC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D2ACC 48 28 F7 0D */ bl _savegpr_28 -/* 800D2AD0 7C 7C 1B 78 */ mr r28, r3 -/* 800D2AD4 3B C0 00 01 */ li r30, 1 -/* 800D2AD8 3B A0 00 00 */ li r29, 0 -/* 800D2ADC 7F DF F3 78 */ mr r31, r30 -/* 800D2AE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D2AE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D2AE8 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 800D2AEC 38 80 2A 20 */ li r4, 0x2a20 -/* 800D2AF0 4B F6 1E CD */ bl isEventBit__11dSv_event_cCFUs -/* 800D2AF4 2C 03 00 00 */ cmpwi r3, 0 -/* 800D2AF8 40 82 00 14 */ bne lbl_800D2B0C -/* 800D2AFC 80 1C 05 7C */ lwz r0, 0x57c(r28) -/* 800D2B00 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 800D2B04 40 82 00 08 */ bne lbl_800D2B0C -/* 800D2B08 3B E0 00 00 */ li r31, 0 -lbl_800D2B0C: -/* 800D2B0C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 800D2B10 41 82 00 28 */ beq lbl_800D2B38 -/* 800D2B14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D2B18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D2B1C A3 E3 00 02 */ lhz r31, 2(r3) -/* 800D2B20 4B F5 B1 89 */ bl dComIfGs_getMaxLifeGauge__Fv -/* 800D2B24 54 63 04 3E */ clrlwi r3, r3, 0x10 -/* 800D2B28 57 E0 04 3E */ clrlwi r0, r31, 0x10 -/* 800D2B2C 7C 00 18 40 */ cmplw r0, r3 -/* 800D2B30 40 82 00 08 */ bne lbl_800D2B38 -/* 800D2B34 3B A0 00 01 */ li r29, 1 -lbl_800D2B38: -/* 800D2B38 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 800D2B3C 40 82 00 30 */ bne lbl_800D2B6C -/* 800D2B40 38 60 00 00 */ li r3, 0 -/* 800D2B44 80 1C 06 14 */ lwz r0, 0x614(r28) -/* 800D2B48 28 00 00 24 */ cmplwi r0, 0x24 -/* 800D2B4C 40 82 00 14 */ bne lbl_800D2B60 -/* 800D2B50 80 1C 06 0C */ lwz r0, 0x60c(r28) -/* 800D2B54 2C 00 00 33 */ cmpwi r0, 0x33 -/* 800D2B58 40 82 00 08 */ bne lbl_800D2B60 -/* 800D2B5C 38 60 00 01 */ li r3, 1 -lbl_800D2B60: -/* 800D2B60 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D2B64 40 82 00 08 */ bne lbl_800D2B6C -/* 800D2B68 3B C0 00 00 */ li r30, 0 -lbl_800D2B6C: -/* 800D2B6C 57 C3 06 3E */ clrlwi r3, r30, 0x18 -/* 800D2B70 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D2B74 48 28 F6 B1 */ bl _restgpr_28 -/* 800D2B78 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800D2B7C 7C 08 03 A6 */ mtlr r0 -/* 800D2B80 38 21 00 20 */ addi r1, r1, 0x20 -/* 800D2B84 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutTurnInput__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkCutTurnInput__9daAlink_cCFv.s deleted file mode 100644 index ec5b2a4c6fe..00000000000 --- a/asm/d/a/d_a_alink/checkCutTurnInput__9daAlink_cCFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_800D13E4: -/* 800D13E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D13E8 7C 08 02 A6 */ mflr r0 -/* 800D13EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D13F0 80 63 31 80 */ lwz r3, 0x3180(r3) -/* 800D13F4 48 29 3C DD */ bl abs -/* 800D13F8 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000F800@ha */ -/* 800D13FC 38 04 F8 00 */ addi r0, r4, 0xF800 /* 0x0000F800@l */ -/* 800D1400 7C 60 02 78 */ xor r0, r3, r0 -/* 800D1404 7C 04 0E 70 */ srawi r4, r0, 1 -/* 800D1408 7C 00 18 38 */ and r0, r0, r3 -/* 800D140C 7C 00 20 50 */ subf r0, r0, r4 -/* 800D1410 54 03 0F FE */ srwi r3, r0, 0x1f -/* 800D1414 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D1418 7C 08 03 A6 */ mtlr r0 -/* 800D141C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D1420 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkDemoMoveMode__9daAlink_cCFUl.s b/asm/d/a/d_a_alink/checkDemoMoveMode__9daAlink_cCFUl.s deleted file mode 100644 index bed1b9278b1..00000000000 --- a/asm/d/a/d_a_alink/checkDemoMoveMode__9daAlink_cCFUl.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80116E60: -/* 80116E60 38 60 00 01 */ li r3, 1 -/* 80116E64 7C 66 1B 78 */ mr r6, r3 -/* 80116E68 38 04 FF FE */ addi r0, r4, -2 -/* 80116E6C 38 A0 FF FF */ li r5, -1 -/* 80116E70 7C 00 18 10 */ subfc r0, r0, r3 -/* 80116E74 7C 05 01 90 */ subfze r0, r5 -/* 80116E78 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80116E7C 40 82 00 08 */ bne lbl_80116E84 -/* 80116E80 38 C0 00 00 */ li r6, 0 -lbl_80116E84: -/* 80116E84 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 80116E88 4C 82 00 20 */ bnelr -/* 80116E8C 28 04 00 26 */ cmplwi r4, 0x26 -/* 80116E90 4D 82 00 20 */ beqlr -/* 80116E94 38 60 00 00 */ li r3, 0 -/* 80116E98 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkDoCutAction__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkDoCutAction__9daAlink_cFv.s deleted file mode 100644 index 6bbafa1e1e3..00000000000 --- a/asm/d/a/d_a_alink/checkDoCutAction__9daAlink_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_800D27E4: -/* 800D27E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D27E8 7C 08 02 A6 */ mflr r0 -/* 800D27EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D27F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D27F4 7C 7F 1B 78 */ mr r31, r3 -/* 800D27F8 88 03 2F 8E */ lbz r0, 0x2f8e(r3) -/* 800D27FC 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 800D2800 41 82 00 38 */ beq lbl_800D2838 -/* 800D2804 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D2808 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D280C 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 800D2810 38 80 2A 40 */ li r4, 0x2a40 -/* 800D2814 4B F6 21 A9 */ bl isEventBit__11dSv_event_cCFUs -/* 800D2818 2C 03 00 00 */ cmpwi r3, 0 -/* 800D281C 40 82 00 10 */ bne lbl_800D282C -/* 800D2820 80 1F 05 7C */ lwz r0, 0x57c(r31) -/* 800D2824 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16 -/* 800D2828 41 82 00 10 */ beq lbl_800D2838 -lbl_800D282C: -/* 800D282C 7F E3 FB 78 */ mr r3, r31 -/* 800D2830 48 00 3A 09 */ bl procCutLargeJumpChargeInit__9daAlink_cFv -/* 800D2834 48 00 00 48 */ b lbl_800D287C -lbl_800D2838: -/* 800D2838 7F E3 FB 78 */ mr r3, r31 -/* 800D283C 48 00 01 99 */ bl checkDownAttackState__9daAlink_cFv -/* 800D2840 2C 03 00 00 */ cmpwi r3, 0 -/* 800D2844 41 82 00 10 */ beq lbl_800D2854 -/* 800D2848 7F E3 FB 78 */ mr r3, r31 -/* 800D284C 48 00 2B 7D */ bl procCutDownInit__9daAlink_cFv -/* 800D2850 48 00 00 2C */ b lbl_800D287C -lbl_800D2854: -/* 800D2854 7F E3 FB 78 */ mr r3, r31 -/* 800D2858 48 00 00 9D */ bl checkCutHeadState__9daAlink_cFv -/* 800D285C 2C 03 00 00 */ cmpwi r3, 0 -/* 800D2860 41 82 00 10 */ beq lbl_800D2870 -/* 800D2864 7F E3 FB 78 */ mr r3, r31 -/* 800D2868 48 00 34 21 */ bl procCutHeadInit__9daAlink_cFv -/* 800D286C 48 00 00 10 */ b lbl_800D287C -lbl_800D2870: -/* 800D2870 7F E3 FB 78 */ mr r3, r31 -/* 800D2874 38 80 00 00 */ li r4, 0 -/* 800D2878 48 00 1A 85 */ bl procCutJumpInit__9daAlink_cFi -lbl_800D287C: -/* 800D287C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D2880 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D2884 7C 08 03 A6 */ mtlr r0 -/* 800D2888 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D288C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkDownAttackState__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkDownAttackState__9daAlink_cFv.s deleted file mode 100644 index 00a03cad9b3..00000000000 --- a/asm/d/a/d_a_alink/checkDownAttackState__9daAlink_cFv.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_800D29D4: -/* 800D29D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D29D8 7C 08 02 A6 */ mflr r0 -/* 800D29DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D29E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D29E4 93 C1 00 08 */ stw r30, 8(r1) -/* 800D29E8 7C 7E 1B 78 */ mr r30, r3 -/* 800D29EC 83 E3 27 EC */ lwz r31, 0x27ec(r3) -/* 800D29F0 28 1F 00 00 */ cmplwi r31, 0 -/* 800D29F4 41 82 00 AC */ beq lbl_800D2AA0 -/* 800D29F8 88 1F 04 96 */ lbz r0, 0x496(r31) -/* 800D29FC 28 00 00 02 */ cmplwi r0, 2 -/* 800D2A00 40 82 00 A0 */ bne lbl_800D2AA0 -/* 800D2A04 A0 1F 05 8E */ lhz r0, 0x58e(r31) -/* 800D2A08 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 800D2A0C 41 82 00 94 */ beq lbl_800D2AA0 -/* 800D2A10 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 800D2A14 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800D2A18 40 82 00 44 */ bne lbl_800D2A5C -/* 800D2A1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D2A20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D2A24 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 800D2A28 38 80 29 04 */ li r4, 0x2904 -/* 800D2A2C 4B F6 1F 91 */ bl isEventBit__11dSv_event_cCFUs -/* 800D2A30 2C 03 00 00 */ cmpwi r3, 0 -/* 800D2A34 40 82 00 10 */ bne lbl_800D2A44 -/* 800D2A38 80 1E 05 7C */ lwz r0, 0x57c(r30) -/* 800D2A3C 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 800D2A40 41 82 00 1C */ beq lbl_800D2A5C -lbl_800D2A44: -/* 800D2A44 38 7F 05 68 */ addi r3, r31, 0x568 -/* 800D2A48 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 800D2A4C 48 27 49 51 */ bl PSVECSquareDistance -/* 800D2A50 C0 02 93 08 */ lfs f0, lit_7174(r2) -/* 800D2A54 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D2A58 41 80 00 40 */ blt lbl_800D2A98 -lbl_800D2A5C: -/* 800D2A5C 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 800D2A60 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800D2A64 41 82 00 3C */ beq lbl_800D2AA0 -/* 800D2A68 80 7E 27 EC */ lwz r3, 0x27ec(r30) -/* 800D2A6C A8 03 00 08 */ lha r0, 8(r3) -/* 800D2A70 2C 00 01 DA */ cmpwi r0, 0x1da -/* 800D2A74 41 82 00 0C */ beq lbl_800D2A80 -/* 800D2A78 2C 00 01 E1 */ cmpwi r0, 0x1e1 -/* 800D2A7C 40 82 00 24 */ bne lbl_800D2AA0 -lbl_800D2A80: -/* 800D2A80 38 7F 05 68 */ addi r3, r31, 0x568 -/* 800D2A84 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 800D2A88 48 27 49 15 */ bl PSVECSquareDistance -/* 800D2A8C C0 02 93 08 */ lfs f0, lit_7174(r2) -/* 800D2A90 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D2A94 40 80 00 0C */ bge lbl_800D2AA0 -lbl_800D2A98: -/* 800D2A98 38 60 00 01 */ li r3, 1 -/* 800D2A9C 48 00 00 08 */ b lbl_800D2AA4 -lbl_800D2AA0: -/* 800D2AA0 38 60 00 00 */ li r3, 0 -lbl_800D2AA4: -/* 800D2AA4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D2AA8 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D2AAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D2AB0 7C 08 03 A6 */ mtlr r0 -/* 800D2AB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D2AB8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkEndMessage__9daAlink_cFUl.s b/asm/d/a/d_a_alink/checkEndMessage__9daAlink_cFUl.s deleted file mode 100644 index dcdf04c4611..00000000000 --- a/asm/d/a/d_a_alink/checkEndMessage__9daAlink_cFUl.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_801187B4: -/* 801187B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801187B8 7C 08 02 A6 */ mflr r0 -/* 801187BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801187C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801187C4 7C 7F 1B 78 */ mr r31, r3 -/* 801187C8 80 63 28 F0 */ lwz r3, 0x28f0(r3) -/* 801187CC 3C 03 00 01 */ addis r0, r3, 1 -/* 801187D0 28 00 FF FF */ cmplwi r0, 0xffff -/* 801187D4 40 82 00 18 */ bne lbl_801187EC -/* 801187D8 7C 83 23 78 */ mr r3, r4 -/* 801187DC 38 80 03 E8 */ li r4, 0x3e8 -/* 801187E0 4B F0 76 A5 */ bl fopMsgM_messageSet__FUlUl -/* 801187E4 90 7F 28 F0 */ stw r3, 0x28f0(r31) -/* 801187E8 48 00 00 40 */ b lbl_80118828 -lbl_801187EC: -/* 801187EC 4B F0 72 39 */ bl fopMsgM_SearchByID__FUi -/* 801187F0 28 03 00 00 */ cmplwi r3, 0 -/* 801187F4 41 82 00 34 */ beq lbl_80118828 -/* 801187F8 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 801187FC 28 00 00 0E */ cmplwi r0, 0xe -/* 80118800 40 82 00 10 */ bne lbl_80118810 -/* 80118804 38 00 00 10 */ li r0, 0x10 -/* 80118808 B0 03 00 F8 */ sth r0, 0xf8(r3) -/* 8011880C 48 00 00 1C */ b lbl_80118828 -lbl_80118810: -/* 80118810 28 00 00 12 */ cmplwi r0, 0x12 -/* 80118814 40 82 00 14 */ bne lbl_80118828 -/* 80118818 38 00 00 13 */ li r0, 0x13 -/* 8011881C B0 03 00 F8 */ sth r0, 0xf8(r3) -/* 80118820 38 60 00 01 */ li r3, 1 -/* 80118824 48 00 00 08 */ b lbl_8011882C -lbl_80118828: -/* 80118828 38 60 00 00 */ li r3, 0 -lbl_8011882C: -/* 8011882C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80118830 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80118834 7C 08 03 A6 */ mtlr r0 -/* 80118838 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011883C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkEnemyGroup__9daAlink_cFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/checkEnemyGroup__9daAlink_cFP10fopAc_ac_c.s deleted file mode 100644 index 7e0c4d40c0f..00000000000 --- a/asm/d/a/d_a_alink/checkEnemyGroup__9daAlink_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_800DC548: -/* 800DC548 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DC54C 7C 08 02 A6 */ mflr r0 -/* 800DC550 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DC554 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DC558 3B E0 00 00 */ li r31, 0 -/* 800DC55C 28 03 00 00 */ cmplwi r3, 0 -/* 800DC560 41 82 00 2C */ beq lbl_800DC58C -/* 800DC564 88 03 04 96 */ lbz r0, 0x496(r3) -/* 800DC568 28 00 00 02 */ cmplwi r0, 2 -/* 800DC56C 41 82 00 1C */ beq lbl_800DC588 -/* 800DC570 A8 03 00 08 */ lha r0, 8(r3) -/* 800DC574 2C 00 01 E2 */ cmpwi r0, 0x1e2 -/* 800DC578 41 82 00 10 */ beq lbl_800DC588 -/* 800DC57C 48 00 00 29 */ bl checkSpecialNpc__9daAlink_cFP10fopAc_ac_c -/* 800DC580 2C 03 00 00 */ cmpwi r3, 0 -/* 800DC584 41 82 00 08 */ beq lbl_800DC58C -lbl_800DC588: -/* 800DC588 3B E0 00 01 */ li r31, 1 -lbl_800DC58C: -/* 800DC58C 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800DC590 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DC594 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DC598 7C 08 03 A6 */ mtlr r0 -/* 800DC59C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DC5A0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkEquipAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkEquipAnime__9daAlink_cCFv.s deleted file mode 100644 index d2346e001cb..00000000000 --- a/asm/d/a/d_a_alink/checkEquipAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_800B9340: -/* 800B9340 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B9344 7C 08 02 A6 */ mflr r0 -/* 800B9348 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B934C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B9350 93 C1 00 08 */ stw r30, 8(r1) -/* 800B9354 7C 7E 1B 78 */ mr r30, r3 -/* 800B9358 3B E0 00 00 */ li r31, 0 -/* 800B935C 48 01 7B 3D */ bl checkSwordEquipAnime__9daAlink_cCFv -/* 800B9360 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9364 40 82 00 14 */ bne lbl_800B9378 -/* 800B9368 7F C3 F3 78 */ mr r3, r30 -/* 800B936C 4B FF FF 8D */ bl checkItemEquipAnime__9daAlink_cCFv -/* 800B9370 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9374 41 82 00 08 */ beq lbl_800B937C -lbl_800B9378: -/* 800B9378 3B E0 00 01 */ li r31, 1 -lbl_800B937C: -/* 800B937C 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800B9380 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B9384 83 C1 00 08 */ lwz r30, 8(r1) -/* 800B9388 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B938C 7C 08 03 A6 */ mtlr r0 -/* 800B9390 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B9394 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkFishingRodAndLureItem__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkFishingRodAndLureItem__9daAlink_cCFv.s deleted file mode 100644 index 8f9350313f9..00000000000 --- a/asm/d/a/d_a_alink/checkFishingRodAndLureItem__9daAlink_cCFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_800F3D58: -/* 800F3D58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800F3D5C 7C 08 02 A6 */ mflr r0 -/* 800F3D60 90 01 00 14 */ stw r0, 0x14(r1) -/* 800F3D64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800F3D68 3B E0 00 00 */ li r31, 0 -/* 800F3D6C A0 63 2F DC */ lhz r3, 0x2fdc(r3) -/* 800F3D70 28 03 01 05 */ cmplwi r3, 0x105 -/* 800F3D74 41 82 00 10 */ beq lbl_800F3D84 -/* 800F3D78 48 06 AC A9 */ bl checkFishingRodItem__9daPy_py_cFi -/* 800F3D7C 2C 03 00 00 */ cmpwi r3, 0 -/* 800F3D80 41 82 00 08 */ beq lbl_800F3D88 -lbl_800F3D84: -/* 800F3D84 3B E0 00 01 */ li r31, 1 -lbl_800F3D88: -/* 800F3D88 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800F3D8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800F3D90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800F3D94 7C 08 03 A6 */ mtlr r0 -/* 800F3D98 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F3D9C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkFishingRodGrab__9daAlink_cCFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/checkFishingRodGrab__9daAlink_cCFP10fopAc_ac_c.s deleted file mode 100644 index dc0ceac1227..00000000000 --- a/asm/d/a/d_a_alink/checkFishingRodGrab__9daAlink_cCFP10fopAc_ac_c.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_800F3E4C: -/* 800F3E4C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800F3E50 7C 08 02 A6 */ mflr r0 -/* 800F3E54 90 01 00 24 */ stw r0, 0x24(r1) -/* 800F3E58 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F3E5C 48 26 E3 81 */ bl _savegpr_29 -/* 800F3E60 7C 7D 1B 78 */ mr r29, r3 -/* 800F3E64 7C 9E 23 78 */ mr r30, r4 -/* 800F3E68 3B E0 00 00 */ li r31, 0 -/* 800F3E6C 4B FF FE ED */ bl checkFishingRodAndLureItem__9daAlink_cCFv -/* 800F3E70 2C 03 00 00 */ cmpwi r3, 0 -/* 800F3E74 41 82 00 28 */ beq lbl_800F3E9C -/* 800F3E78 80 7D 28 24 */ lwz r3, 0x2824(r29) -/* 800F3E7C 28 1E 00 00 */ cmplwi r30, 0 -/* 800F3E80 41 82 00 0C */ beq lbl_800F3E8C -/* 800F3E84 80 1E 00 04 */ lwz r0, 4(r30) -/* 800F3E88 48 00 00 08 */ b lbl_800F3E90 -lbl_800F3E8C: -/* 800F3E8C 38 00 FF FF */ li r0, -1 -lbl_800F3E90: -/* 800F3E90 7C 03 00 40 */ cmplw r3, r0 -/* 800F3E94 40 82 00 08 */ bne lbl_800F3E9C -/* 800F3E98 3B E0 00 01 */ li r31, 1 -lbl_800F3E9C: -/* 800F3E9C 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800F3EA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F3EA4 48 26 E3 85 */ bl _restgpr_29 -/* 800F3EA8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800F3EAC 7C 08 03 A6 */ mtlr r0 -/* 800F3EB0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800F3EB4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkFlyAtnWait__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkFlyAtnWait__9daAlink_cFv.s deleted file mode 100644 index 73f6e54ff0a..00000000000 --- a/asm/d/a/d_a_alink/checkFlyAtnWait__9daAlink_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80118170: -/* 80118170 38 80 00 00 */ li r4, 0 -/* 80118174 80 03 06 14 */ lwz r0, 0x614(r3) -/* 80118178 28 00 00 17 */ cmplwi r0, 0x17 -/* 8011817C 40 82 00 1C */ bne lbl_80118198 -/* 80118180 80 03 06 10 */ lwz r0, 0x610(r3) -/* 80118184 2C 00 00 04 */ cmpwi r0, 4 -/* 80118188 41 82 00 0C */ beq lbl_80118194 -/* 8011818C 2C 00 00 05 */ cmpwi r0, 5 -/* 80118190 40 82 00 08 */ bne lbl_80118198 -lbl_80118194: -/* 80118194 38 80 00 01 */ li r4, 1 -lbl_80118198: -/* 80118198 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 8011819C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c.s deleted file mode 100644 index 4b253247ca6..00000000000 --- a/asm/d/a/d_a_alink/checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_800E82B0: -/* 800E82B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E82B4 7C 08 02 A6 */ mflr r0 -/* 800E82B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E82BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E82C0 93 C1 00 08 */ stw r30, 8(r1) -/* 800E82C4 AB C4 00 08 */ lha r30, 8(r4) -/* 800E82C8 3B E0 00 00 */ li r31, 0 -/* 800E82CC 2C 1E 01 B1 */ cmpwi r30, 0x1b1 -/* 800E82D0 41 82 00 24 */ beq lbl_800E82F4 -/* 800E82D4 2C 1E 00 21 */ cmpwi r30, 0x21 -/* 800E82D8 40 82 00 14 */ bne lbl_800E82EC -/* 800E82DC 7C 83 23 78 */ mr r3, r4 -/* 800E82E0 4B FF 42 C5 */ bl checkSpecialNpc__9daAlink_cFP10fopAc_ac_c -/* 800E82E4 2C 03 00 00 */ cmpwi r3, 0 -/* 800E82E8 40 82 00 0C */ bne lbl_800E82F4 -lbl_800E82EC: -/* 800E82EC 2C 1E 01 06 */ cmpwi r30, 0x106 -/* 800E82F0 40 82 00 08 */ bne lbl_800E82F8 -lbl_800E82F4: -/* 800E82F4 3B E0 00 01 */ li r31, 1 -lbl_800E82F8: -/* 800E82F8 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800E82FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E8300 83 C1 00 08 */ lwz r30, 8(r1) -/* 800E8304 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E8308 7C 08 03 A6 */ mtlr r0 -/* 800E830C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E8310 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkGrabAnimeAndThrow__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkGrabAnimeAndThrow__9daAlink_cCFv.s deleted file mode 100644 index 2c41c787b72..00000000000 --- a/asm/d/a/d_a_alink/checkGrabAnimeAndThrow__9daAlink_cCFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_800E3C9C: -/* 800E3C9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E3CA0 7C 08 02 A6 */ mflr r0 -/* 800E3CA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E3CA8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E3CAC 93 C1 00 08 */ stw r30, 8(r1) -/* 800E3CB0 7C 7E 1B 78 */ mr r30, r3 -/* 800E3CB4 3B E0 00 00 */ li r31, 0 -/* 800E3CB8 4B FF FF B5 */ bl checkGrabAnime__9daAlink_cCFv -/* 800E3CBC 2C 03 00 00 */ cmpwi r3, 0 -/* 800E3CC0 40 82 00 14 */ bne lbl_800E3CD4 -/* 800E3CC4 7F C3 F3 78 */ mr r3, r30 -/* 800E3CC8 4B FF FF 55 */ bl checkGrabThrowAnime__9daAlink_cCFv -/* 800E3CCC 2C 03 00 00 */ cmpwi r3, 0 -/* 800E3CD0 41 82 00 08 */ beq lbl_800E3CD8 -lbl_800E3CD4: -/* 800E3CD4 3B E0 00 01 */ li r31, 1 -lbl_800E3CD8: -/* 800E3CD8 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800E3CDC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E3CE0 83 C1 00 08 */ lwz r30, 8(r1) -/* 800E3CE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E3CE8 7C 08 03 A6 */ mtlr r0 -/* 800E3CEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E3CF0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkGrabAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkGrabAnime__9daAlink_cCFv.s deleted file mode 100644 index b21575024e8..00000000000 --- a/asm/d/a/d_a_alink/checkGrabAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800E3C6C: -/* 800E3C6C 38 80 00 00 */ li r4, 0 -/* 800E3C70 A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800E3C74 28 00 01 6C */ cmplwi r0, 0x16c -/* 800E3C78 41 82 00 18 */ beq lbl_800E3C90 -/* 800E3C7C 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800E3C80 28 00 00 50 */ cmplwi r0, 0x50 -/* 800E3C84 41 82 00 0C */ beq lbl_800E3C90 -/* 800E3C88 28 00 00 60 */ cmplwi r0, 0x60 -/* 800E3C8C 40 82 00 08 */ bne lbl_800E3C94 -lbl_800E3C90: -/* 800E3C90 38 80 00 01 */ li r4, 1 -lbl_800E3C94: -/* 800E3C94 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800E3C98 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkGrabCarryActor__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkGrabCarryActor__9daAlink_cFv.s deleted file mode 100644 index 7036e3e085d..00000000000 --- a/asm/d/a/d_a_alink/checkGrabCarryActor__9daAlink_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800E3CF4: -/* 800E3CF4 38 80 00 00 */ li r4, 0 -/* 800E3CF8 80 63 28 30 */ lwz r3, 0x2830(r3) -/* 800E3CFC 28 03 00 00 */ cmplwi r3, 0 -/* 800E3D00 41 82 00 14 */ beq lbl_800E3D14 -/* 800E3D04 88 03 04 9A */ lbz r0, 0x49a(r3) -/* 800E3D08 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 800E3D0C 41 82 00 08 */ beq lbl_800E3D14 -/* 800E3D10 38 80 00 01 */ li r4, 1 -lbl_800E3D14: -/* 800E3D14 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800E3D18 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkGrabHeavyActor__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkGrabHeavyActor__9daAlink_cFv.s deleted file mode 100644 index 4cd71e70f5f..00000000000 --- a/asm/d/a/d_a_alink/checkGrabHeavyActor__9daAlink_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800E3D6C: -/* 800E3D6C 38 80 00 00 */ li r4, 0 -/* 800E3D70 80 63 28 30 */ lwz r3, 0x2830(r3) -/* 800E3D74 28 03 00 00 */ cmplwi r3, 0 -/* 800E3D78 41 82 00 14 */ beq lbl_800E3D8C -/* 800E3D7C 88 03 04 9A */ lbz r0, 0x49a(r3) -/* 800E3D80 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 800E3D84 41 82 00 08 */ beq lbl_800E3D8C -/* 800E3D88 38 80 00 01 */ li r4, 1 -lbl_800E3D8C: -/* 800E3D8C 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800E3D90 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkGrabNotThrow__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkGrabNotThrow__9daAlink_cFv.s deleted file mode 100644 index bff18c1122f..00000000000 --- a/asm/d/a/d_a_alink/checkGrabNotThrow__9daAlink_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_800E5150: -/* 800E5150 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E5154 7C 08 02 A6 */ mflr r0 -/* 800E5158 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E515C 4B FF EB 99 */ bl checkGrabCarryActor__9daAlink_cFv -/* 800E5160 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E5164 7C 08 03 A6 */ mtlr r0 -/* 800E5168 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E516C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkGrabRooster__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkGrabRooster__9daAlink_cFv.s deleted file mode 100644 index 0ce0d4d933a..00000000000 --- a/asm/d/a/d_a_alink/checkGrabRooster__9daAlink_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800E3F20: -/* 800E3F20 80 63 28 30 */ lwz r3, 0x2830(r3) -/* 800E3F24 28 03 00 00 */ cmplwi r3, 0 -/* 800E3F28 41 82 00 20 */ beq lbl_800E3F48 -/* 800E3F2C A8 03 00 08 */ lha r0, 8(r3) -/* 800E3F30 2C 00 01 08 */ cmpwi r0, 0x108 -/* 800E3F34 41 82 00 0C */ beq lbl_800E3F40 -/* 800E3F38 2C 00 01 09 */ cmpwi r0, 0x109 -/* 800E3F3C 40 82 00 0C */ bne lbl_800E3F48 -lbl_800E3F40: -/* 800E3F40 38 60 00 01 */ li r3, 1 -/* 800E3F44 4E 80 00 20 */ blr -lbl_800E3F48: -/* 800E3F48 38 60 00 00 */ li r3, 0 -/* 800E3F4C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkGrabSideActor__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkGrabSideActor__9daAlink_cFv.s deleted file mode 100644 index 3cb4d4e0ee0..00000000000 --- a/asm/d/a/d_a_alink/checkGrabSideActor__9daAlink_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800E3D94: -/* 800E3D94 38 80 00 00 */ li r4, 0 -/* 800E3D98 80 63 28 30 */ lwz r3, 0x2830(r3) -/* 800E3D9C 28 03 00 00 */ cmplwi r3, 0 -/* 800E3DA0 41 82 00 14 */ beq lbl_800E3DB4 -/* 800E3DA4 88 03 04 9A */ lbz r0, 0x49a(r3) -/* 800E3DA8 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 800E3DAC 41 82 00 08 */ beq lbl_800E3DB4 -/* 800E3DB0 38 80 00 01 */ li r4, 1 -lbl_800E3DB4: -/* 800E3DB4 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800E3DB8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkGrabTalkActor__9daAlink_cFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/checkGrabTalkActor__9daAlink_cFP10fopAc_ac_c.s deleted file mode 100644 index 95605d7d399..00000000000 --- a/asm/d/a/d_a_alink/checkGrabTalkActor__9daAlink_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_801182D4: -/* 801182D4 A8 64 00 08 */ lha r3, 8(r4) -/* 801182D8 38 00 00 00 */ li r0, 0 -/* 801182DC 2C 03 02 5F */ cmpwi r3, 0x25f -/* 801182E0 41 82 00 1C */ beq lbl_801182FC -/* 801182E4 2C 03 02 32 */ cmpwi r3, 0x232 -/* 801182E8 41 82 00 14 */ beq lbl_801182FC -/* 801182EC 2C 03 01 21 */ cmpwi r3, 0x121 -/* 801182F0 41 82 00 0C */ beq lbl_801182FC -/* 801182F4 2C 03 02 D5 */ cmpwi r3, 0x2d5 -/* 801182F8 40 82 00 08 */ bne lbl_80118300 -lbl_801182FC: -/* 801182FC 38 00 00 01 */ li r0, 1 -lbl_80118300: -/* 80118300 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80118304 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkGrabThrowAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkGrabThrowAnime__9daAlink_cCFv.s deleted file mode 100644 index afa821f130d..00000000000 --- a/asm/d/a/d_a_alink/checkGrabThrowAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_800E3C1C: -/* 800E3C1C 38 C0 00 00 */ li r6, 0 -/* 800E3C20 A0 A3 1F BC */ lhz r5, 0x1fbc(r3) -/* 800E3C24 28 05 01 70 */ cmplwi r5, 0x170 -/* 800E3C28 41 82 00 38 */ beq lbl_800E3C60 -/* 800E3C2C 7C C4 33 78 */ mr r4, r6 -/* 800E3C30 54 A0 04 3E */ clrlwi r0, r5, 0x10 -/* 800E3C34 28 00 00 51 */ cmplwi r0, 0x51 -/* 800E3C38 41 82 00 10 */ beq lbl_800E3C48 -/* 800E3C3C A0 03 1F 94 */ lhz r0, 0x1f94(r3) -/* 800E3C40 28 00 00 51 */ cmplwi r0, 0x51 -/* 800E3C44 40 82 00 08 */ bne lbl_800E3C4C -lbl_800E3C48: -/* 800E3C48 38 80 00 01 */ li r4, 1 -lbl_800E3C4C: -/* 800E3C4C 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 800E3C50 40 82 00 10 */ bne lbl_800E3C60 -/* 800E3C54 54 A0 04 3E */ clrlwi r0, r5, 0x10 -/* 800E3C58 28 00 01 7B */ cmplwi r0, 0x17b -/* 800E3C5C 40 82 00 08 */ bne lbl_800E3C64 -lbl_800E3C60: -/* 800E3C60 38 C0 00 01 */ li r6, 1 -lbl_800E3C64: -/* 800E3C64 54 C3 06 3E */ clrlwi r3, r6, 0x18 -/* 800E3C68 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkGroundSpecialMode__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkGroundSpecialMode__9daAlink_cFv.s deleted file mode 100644 index 1c47e8b25ae..00000000000 --- a/asm/d/a/d_a_alink/checkGroundSpecialMode__9daAlink_cFv.s +++ /dev/null @@ -1,94 +0,0 @@ -lbl_800B9F50: -/* 800B9F50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B9F54 7C 08 02 A6 */ mflr r0 -/* 800B9F58 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B9F5C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B9F60 7C 7F 1B 78 */ mr r31, r3 -/* 800B9F64 80 03 19 9C */ lwz r0, 0x199c(r3) -/* 800B9F68 54 06 06 B5 */ rlwinm. r6, r0, 0, 0x1a, 0x1a -/* 800B9F6C 41 82 00 38 */ beq lbl_800B9FA4 -/* 800B9F70 80 BF 31 A0 */ lwz r5, 0x31a0(r31) -/* 800B9F74 3C 80 00 07 */ lis r4, 0x0007 /* 0x00070C52@ha */ -/* 800B9F78 38 04 0C 52 */ addi r0, r4, 0x0C52 /* 0x00070C52@l */ -/* 800B9F7C 7C A0 00 39 */ and. r0, r5, r0 -/* 800B9F80 40 82 00 24 */ bne lbl_800B9FA4 -/* 800B9F84 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800B9F88 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 800B9F8C 40 82 00 18 */ bne lbl_800B9FA4 -/* 800B9F90 80 1F 05 88 */ lwz r0, 0x588(r31) -/* 800B9F94 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 800B9F98 41 82 00 0C */ beq lbl_800B9FA4 -/* 800B9F9C 48 00 D8 59 */ bl procCoMetamorphoseInit__9daAlink_cFv -/* 800B9FA0 48 00 00 E8 */ b lbl_800BA088 -lbl_800B9FA4: -/* 800B9FA4 28 06 00 00 */ cmplwi r6, 0 -/* 800B9FA8 41 82 00 38 */ beq lbl_800B9FE0 -/* 800B9FAC 80 9F 31 A0 */ lwz r4, 0x31a0(r31) -/* 800B9FB0 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070C52@ha */ -/* 800B9FB4 38 03 0C 52 */ addi r0, r3, 0x0C52 /* 0x00070C52@l */ -/* 800B9FB8 7C 80 00 39 */ and. r0, r4, r0 -/* 800B9FBC 40 82 00 24 */ bne lbl_800B9FE0 -/* 800B9FC0 7F E3 FB 78 */ mr r3, r31 -/* 800B9FC4 48 04 BB 4D */ bl checkBoardRestart__9daAlink_cFv -/* 800B9FC8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800B9FCC 41 82 00 14 */ beq lbl_800B9FE0 -/* 800B9FD0 7F E3 FB 78 */ mr r3, r31 -/* 800B9FD4 80 9F 28 18 */ lwz r4, 0x2818(r31) -/* 800B9FD8 48 04 CA 61 */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c -/* 800B9FDC 48 00 00 AC */ b lbl_800BA088 -lbl_800B9FE0: -/* 800B9FE0 88 1F 05 6A */ lbz r0, 0x56a(r31) -/* 800B9FE4 28 00 00 2A */ cmplwi r0, 0x2a -/* 800B9FE8 40 82 00 10 */ bne lbl_800B9FF8 -/* 800B9FEC 7F E3 FB 78 */ mr r3, r31 -/* 800B9FF0 48 02 F3 55 */ bl procGoatMoveInit__9daAlink_cFv -/* 800B9FF4 48 00 00 94 */ b lbl_800BA088 -lbl_800B9FF8: -/* 800B9FF8 28 00 00 01 */ cmplwi r0, 1 -/* 800B9FFC 40 82 00 10 */ bne lbl_800BA00C -/* 800BA000 7F E3 FB 78 */ mr r3, r31 -/* 800BA004 48 03 09 4D */ bl procSumouReadyInit__9daAlink_cFv -/* 800BA008 48 00 00 80 */ b lbl_800BA088 -lbl_800BA00C: -/* 800BA00C 28 00 00 2B */ cmplwi r0, 0x2b -/* 800BA010 40 82 00 10 */ bne lbl_800BA020 -/* 800BA014 7F E3 FB 78 */ mr r3, r31 -/* 800BA018 48 03 03 DD */ bl procGoronMoveInit__9daAlink_cFv -/* 800BA01C 48 00 00 6C */ b lbl_800BA088 -lbl_800BA020: -/* 800BA020 28 00 00 2D */ cmplwi r0, 0x2d -/* 800BA024 40 82 00 14 */ bne lbl_800BA038 -/* 800BA028 7F E3 FB 78 */ mr r3, r31 -/* 800BA02C 38 80 00 00 */ li r4, 0 -/* 800BA030 48 03 AC 49 */ bl procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c -/* 800BA034 48 00 00 54 */ b lbl_800BA088 -lbl_800BA038: -/* 800BA038 7F E3 FB 78 */ mr r3, r31 -/* 800BA03C 4B FF BF 31 */ bl checkSlideAction__9daAlink_cFv -/* 800BA040 2C 03 00 00 */ cmpwi r3, 0 -/* 800BA044 41 82 00 0C */ beq lbl_800BA050 -/* 800BA048 38 60 00 01 */ li r3, 1 -/* 800BA04C 48 00 00 3C */ b lbl_800BA088 -lbl_800BA050: -/* 800BA050 7F E3 FB 78 */ mr r3, r31 -/* 800BA054 4B FE 82 2D */ bl checkGoronRide__9daAlink_cFv -/* 800BA058 7C 64 1B 79 */ or. r4, r3, r3 -/* 800BA05C 41 82 00 10 */ beq lbl_800BA06C -/* 800BA060 7F E3 FB 78 */ mr r3, r31 -/* 800BA064 48 00 E4 E9 */ bl procGoronRideWaitInit__9daAlink_cFP10fopAc_ac_c -/* 800BA068 48 00 00 20 */ b lbl_800BA088 -lbl_800BA06C: -/* 800BA06C 80 1F 05 8C */ lwz r0, 0x58c(r31) -/* 800BA070 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 800BA074 41 82 00 10 */ beq lbl_800BA084 -/* 800BA078 7F E3 FB 78 */ mr r3, r31 -/* 800BA07C 48 02 1C A1 */ bl procScreamWaitInit__9daAlink_cFv -/* 800BA080 48 00 00 08 */ b lbl_800BA088 -lbl_800BA084: -/* 800BA084 38 60 00 00 */ li r3, 0 -lbl_800BA088: -/* 800BA088 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800BA08C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BA090 7C 08 03 A6 */ mtlr r0 -/* 800BA094 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BA098 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkGuardAccept__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkGuardAccept__9daAlink_cFv.s deleted file mode 100644 index 23cfc3a3fff..00000000000 --- a/asm/d/a/d_a_alink/checkGuardAccept__9daAlink_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_800DCF64: -/* 800DCF64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DCF68 7C 08 02 A6 */ mflr r0 -/* 800DCF6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DCF70 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DCF74 3B E0 00 00 */ li r31, 0 -/* 800DCF78 7F E5 FB 78 */ mr r5, r31 -/* 800DCF7C 7F E6 FB 78 */ mr r6, r31 -/* 800DCF80 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 800DCF84 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 800DCF88 41 82 00 1C */ beq lbl_800DCFA4 -/* 800DCF8C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800DCF90 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800DCF94 88 04 00 15 */ lbz r0, 0x15(r4) -/* 800DCF98 28 00 00 FF */ cmplwi r0, 0xff -/* 800DCF9C 41 82 00 08 */ beq lbl_800DCFA4 -/* 800DCFA0 38 C0 00 01 */ li r6, 1 -lbl_800DCFA4: -/* 800DCFA4 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 800DCFA8 41 82 00 30 */ beq lbl_800DCFD8 -/* 800DCFAC 38 80 00 00 */ li r4, 0 -/* 800DCFB0 A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800DCFB4 28 00 00 62 */ cmplwi r0, 0x62 -/* 800DCFB8 41 82 00 10 */ beq lbl_800DCFC8 -/* 800DCFBC 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800DCFC0 28 00 02 A0 */ cmplwi r0, 0x2a0 -/* 800DCFC4 40 82 00 08 */ bne lbl_800DCFCC -lbl_800DCFC8: -/* 800DCFC8 38 80 00 01 */ li r4, 1 -lbl_800DCFCC: -/* 800DCFCC 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 800DCFD0 40 82 00 08 */ bne lbl_800DCFD8 -/* 800DCFD4 38 A0 00 01 */ li r5, 1 -lbl_800DCFD8: -/* 800DCFD8 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 800DCFDC 41 82 00 14 */ beq lbl_800DCFF0 -/* 800DCFE0 4B FE 35 B5 */ bl checkNotBattleStage__9daAlink_cFv -/* 800DCFE4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800DCFE8 40 82 00 08 */ bne lbl_800DCFF0 -/* 800DCFEC 3B E0 00 01 */ li r31, 1 -lbl_800DCFF0: -/* 800DCFF0 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800DCFF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DCFF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DCFFC 7C 08 03 A6 */ mtlr r0 -/* 800DD000 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DD004 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkHookshotReadyMaterialOffMode__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkHookshotReadyMaterialOffMode__9daAlink_cCFv.s deleted file mode 100644 index 125f7597e1b..00000000000 --- a/asm/d/a/d_a_alink/checkHookshotReadyMaterialOffMode__9daAlink_cCFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8010903C: -/* 8010903C 38 00 00 00 */ li r0, 0 -/* 80109040 A0 63 2F E8 */ lhz r3, 0x2fe8(r3) -/* 80109044 28 03 00 CB */ cmplwi r3, 0xcb -/* 80109048 41 82 00 1C */ beq lbl_80109064 -/* 8010904C 28 03 00 4A */ cmplwi r3, 0x4a -/* 80109050 41 82 00 14 */ beq lbl_80109064 -/* 80109054 28 03 00 7D */ cmplwi r3, 0x7d -/* 80109058 41 82 00 0C */ beq lbl_80109064 -/* 8010905C 28 03 00 C4 */ cmplwi r3, 0xc4 -/* 80109060 40 82 00 08 */ bne lbl_80109068 -lbl_80109064: -/* 80109064 38 00 00 01 */ li r0, 1 -lbl_80109068: -/* 80109068 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8010906C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkHorseDashAccept__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkHorseDashAccept__9daAlink_cFv.s deleted file mode 100644 index ded58bb43bd..00000000000 --- a/asm/d/a/d_a_alink/checkHorseDashAccept__9daAlink_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800EC7DC: -/* 800EC7DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800EC7E0 7C 08 02 A6 */ mflr r0 -/* 800EC7E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800EC7E8 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 800EC7EC 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 800EC7F0 38 63 00 6F */ addi r3, r3, 0x6f -/* 800EC7F4 4B FB 12 6D */ bl checkStageName__9daAlink_cFPCc -/* 800EC7F8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 800EC7FC 7C 00 00 34 */ cntlzw r0, r0 -/* 800EC800 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800EC804 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800EC808 7C 08 03 A6 */ mtlr r0 -/* 800EC80C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EC810 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkHorseLieAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkHorseLieAnime__9daAlink_cCFv.s deleted file mode 100644 index c2357fdbf7e..00000000000 --- a/asm/d/a/d_a_alink/checkHorseLieAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_800ECF04: -/* 800ECF04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800ECF08 7C 08 02 A6 */ mflr r0 -/* 800ECF0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800ECF10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800ECF14 93 C1 00 08 */ stw r30, 8(r1) -/* 800ECF18 7C 7E 1B 78 */ mr r30, r3 -/* 800ECF1C 3B E0 00 00 */ li r31, 0 -/* 800ECF20 38 80 00 55 */ li r4, 0x55 -/* 800ECF24 4B FB F6 35 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM -/* 800ECF28 2C 03 00 00 */ cmpwi r3, 0 -/* 800ECF2C 40 82 00 10 */ bne lbl_800ECF3C -/* 800ECF30 A0 1E 1F BC */ lhz r0, 0x1fbc(r30) -/* 800ECF34 28 00 02 65 */ cmplwi r0, 0x265 -/* 800ECF38 40 82 00 08 */ bne lbl_800ECF40 -lbl_800ECF3C: -/* 800ECF3C 3B E0 00 01 */ li r31, 1 -lbl_800ECF40: -/* 800ECF40 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800ECF44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800ECF48 83 C1 00 08 */ lwz r30, 8(r1) -/* 800ECF4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800ECF50 7C 08 03 A6 */ mtlr r0 -/* 800ECF54 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ECF58 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkHorseNoUpperAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkHorseNoUpperAnime__9daAlink_cCFv.s deleted file mode 100644 index 2fa47768854..00000000000 --- a/asm/d/a/d_a_alink/checkHorseNoUpperAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_800ED074: -/* 800ED074 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800ED078 7C 08 02 A6 */ mflr r0 -/* 800ED07C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800ED080 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800ED084 93 C1 00 08 */ stw r30, 8(r1) -/* 800ED088 7C 7E 1B 78 */ mr r30, r3 -/* 800ED08C 3B E0 00 00 */ li r31, 0 -/* 800ED090 A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800ED094 28 00 02 63 */ cmplwi r0, 0x263 -/* 800ED098 41 82 00 1C */ beq lbl_800ED0B4 -/* 800ED09C 4B FC C1 B9 */ bl checkNoUpperAnime__9daAlink_cCFv -/* 800ED0A0 2C 03 00 00 */ cmpwi r3, 0 -/* 800ED0A4 40 82 00 10 */ bne lbl_800ED0B4 -/* 800ED0A8 A0 1E 1F BC */ lhz r0, 0x1fbc(r30) -/* 800ED0AC 28 00 00 CC */ cmplwi r0, 0xcc -/* 800ED0B0 40 82 00 08 */ bne lbl_800ED0B8 -lbl_800ED0B4: -/* 800ED0B4 3B E0 00 01 */ li r31, 1 -lbl_800ED0B8: -/* 800ED0B8 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800ED0BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800ED0C0 83 C1 00 08 */ lwz r30, 8(r1) -/* 800ED0C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800ED0C8 7C 08 03 A6 */ mtlr r0 -/* 800ED0CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ED0D0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkHorseNotDamageReaction__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkHorseNotDamageReaction__9daAlink_cCFv.s deleted file mode 100644 index ad7c040d1cb..00000000000 --- a/asm/d/a/d_a_alink/checkHorseNotDamageReaction__9daAlink_cCFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_800ECD90: -/* 800ECD90 38 00 00 00 */ li r0, 0 -/* 800ECD94 A0 63 2F E8 */ lhz r3, 0x2fe8(r3) -/* 800ECD98 28 03 00 3D */ cmplwi r3, 0x3d -/* 800ECD9C 41 82 00 1C */ beq lbl_800ECDB8 -/* 800ECDA0 28 03 00 3E */ cmplwi r3, 0x3e -/* 800ECDA4 41 82 00 14 */ beq lbl_800ECDB8 -/* 800ECDA8 28 03 00 50 */ cmplwi r3, 0x50 -/* 800ECDAC 41 82 00 0C */ beq lbl_800ECDB8 -/* 800ECDB0 28 03 00 3F */ cmplwi r3, 0x3f -/* 800ECDB4 40 82 00 08 */ bne lbl_800ECDBC -lbl_800ECDB8: -/* 800ECDB8 38 00 00 01 */ li r0, 1 -lbl_800ECDBC: -/* 800ECDBC 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 800ECDC0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkHorseReinLeftOnly__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkHorseReinLeftOnly__9daAlink_cCFv.s deleted file mode 100644 index 6911d95189b..00000000000 --- a/asm/d/a/d_a_alink/checkHorseReinLeftOnly__9daAlink_cCFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_800ECDEC: -/* 800ECDEC 38 80 00 00 */ li r4, 0 -/* 800ECDF0 88 63 2F AB */ lbz r3, 0x2fab(r3) -/* 800ECDF4 54 60 07 39 */ rlwinm. r0, r3, 0, 0x1c, 0x1c -/* 800ECDF8 41 82 00 10 */ beq lbl_800ECE08 -/* 800ECDFC 54 60 06 F7 */ rlwinm. r0, r3, 0, 0x1b, 0x1b -/* 800ECE00 40 82 00 08 */ bne lbl_800ECE08 -/* 800ECE04 38 80 00 01 */ li r4, 1 -lbl_800ECE08: -/* 800ECE08 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800ECE0C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkHorseSubjectivity__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkHorseSubjectivity__9daAlink_cCFv.s deleted file mode 100644 index d8090495973..00000000000 --- a/asm/d/a/d_a_alink/checkHorseSubjectivity__9daAlink_cCFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_800ECF5C: -/* 800ECF5C 38 A0 00 00 */ li r5, 0 -/* 800ECF60 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800ECF64 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800ECF68 80 04 5F 18 */ lwz r0, 0x5f18(r4) -/* 800ECF6C 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 800ECF70 40 82 00 20 */ bne lbl_800ECF90 -/* 800ECF74 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800ECF78 28 00 00 45 */ cmplwi r0, 0x45 -/* 800ECF7C 41 82 00 14 */ beq lbl_800ECF90 -/* 800ECF80 28 00 00 4A */ cmplwi r0, 0x4a -/* 800ECF84 41 82 00 0C */ beq lbl_800ECF90 -/* 800ECF88 28 00 00 48 */ cmplwi r0, 0x48 -/* 800ECF8C 40 82 00 08 */ bne lbl_800ECF94 -lbl_800ECF90: -/* 800ECF90 38 A0 00 01 */ li r5, 1 -lbl_800ECF94: -/* 800ECF94 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 800ECF98 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkHorseWaitLashAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkHorseWaitLashAnime__9daAlink_cCFv.s deleted file mode 100644 index 1fa7be188cc..00000000000 --- a/asm/d/a/d_a_alink/checkHorseWaitLashAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800ECDC4: -/* 800ECDC4 38 80 00 00 */ li r4, 0 -/* 800ECDC8 A0 03 1F 80 */ lhz r0, 0x1f80(r3) -/* 800ECDCC 28 00 00 DD */ cmplwi r0, 0xdd -/* 800ECDD0 40 82 00 14 */ bne lbl_800ECDE4 -/* 800ECDD4 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 800ECDD8 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 800ECDDC 41 82 00 08 */ beq lbl_800ECDE4 -/* 800ECDE0 38 80 00 01 */ li r4, 1 -lbl_800ECDE4: -/* 800ECDE4 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800ECDE8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkHugeAttack__9daAlink_cCFi.s b/asm/d/a/d_a_alink/checkHugeAttack__9daAlink_cCFi.s deleted file mode 100644 index f657f898bb6..00000000000 --- a/asm/d/a/d_a_alink/checkHugeAttack__9daAlink_cCFi.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800D7BE8: -/* 800D7BE8 38 60 00 00 */ li r3, 0 -/* 800D7BEC 2C 04 00 02 */ cmpwi r4, 2 -/* 800D7BF0 41 82 00 1C */ beq lbl_800D7C0C -/* 800D7BF4 2C 04 00 07 */ cmpwi r4, 7 -/* 800D7BF8 41 82 00 14 */ beq lbl_800D7C0C -/* 800D7BFC 2C 04 00 0B */ cmpwi r4, 0xb -/* 800D7C00 41 82 00 0C */ beq lbl_800D7C0C -/* 800D7C04 2C 04 00 0E */ cmpwi r4, 0xe -/* 800D7C08 4C 82 00 20 */ bnelr -lbl_800D7C0C: -/* 800D7C0C 38 60 00 01 */ li r3, 1 -/* 800D7C10 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkIcePolygonDamage__9daAlink_cFP13cBgS_PolyInfo.s b/asm/d/a/d_a_alink/checkIcePolygonDamage__9daAlink_cFP13cBgS_PolyInfo.s deleted file mode 100644 index f7312ea18e6..00000000000 --- a/asm/d/a/d_a_alink/checkIcePolygonDamage__9daAlink_cFP13cBgS_PolyInfo.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_800D7768: -/* 800D7768 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D776C 7C 08 02 A6 */ mflr r0 -/* 800D7770 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D7774 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D7778 7C 7F 1B 78 */ mr r31, r3 -/* 800D777C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D7780 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D7784 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 800D7788 7F E4 FB 78 */ mr r4, r31 -/* 800D778C 4B F9 D6 C5 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo -/* 800D7790 2C 03 00 08 */ cmpwi r3, 8 -/* 800D7794 40 82 00 1C */ bne lbl_800D77B0 -/* 800D7798 7F E3 FB 78 */ mr r3, r31 -/* 800D779C 48 0D 3E 01 */ bl dKy_pol_argument_get__FPC13cBgS_PolyInfo -/* 800D77A0 54 60 06 75 */ rlwinm. r0, r3, 0, 0x19, 0x1a -/* 800D77A4 41 82 00 0C */ beq lbl_800D77B0 -/* 800D77A8 38 60 00 01 */ li r3, 1 -/* 800D77AC 48 00 00 08 */ b lbl_800D77B4 -lbl_800D77B0: -/* 800D77B0 38 60 00 00 */ li r3, 0 -lbl_800D77B4: -/* 800D77B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D77B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D77BC 7C 08 03 A6 */ mtlr r0 -/* 800D77C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D77C4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkIronBallAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkIronBallAnime__9daAlink_cCFv.s deleted file mode 100644 index 5d42e8536ac..00000000000 --- a/asm/d/a/d_a_alink/checkIronBallAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_801150E4: -/* 801150E4 38 80 00 00 */ li r4, 0 -/* 801150E8 A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 801150EC 28 00 01 9A */ cmplwi r0, 0x19a -/* 801150F0 41 82 00 10 */ beq lbl_80115100 -/* 801150F4 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 801150F8 28 00 01 9B */ cmplwi r0, 0x19b -/* 801150FC 40 82 00 08 */ bne lbl_80115104 -lbl_80115100: -/* 80115100 38 80 00 01 */ li r4, 1 -lbl_80115104: -/* 80115104 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 80115108 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkIronBallDelete__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkIronBallDelete__9daAlink_cFv.s deleted file mode 100644 index 8851c83e2e0..00000000000 --- a/asm/d/a/d_a_alink/checkIronBallDelete__9daAlink_cFv.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_80112628: -/* 80112628 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011262C 7C 08 02 A6 */ mflr r0 -/* 80112630 90 01 00 14 */ stw r0, 0x14(r1) -/* 80112634 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80112638 7C 7F 1B 78 */ mr r31, r3 -/* 8011263C A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 80112640 28 00 00 D8 */ cmplwi r0, 0xd8 -/* 80112644 41 82 00 A0 */ beq lbl_801126E4 -/* 80112648 28 00 00 D9 */ cmplwi r0, 0xd9 -/* 8011264C 41 82 00 98 */ beq lbl_801126E4 -/* 80112650 28 00 00 DA */ cmplwi r0, 0xda -/* 80112654 41 82 00 90 */ beq lbl_801126E4 -/* 80112658 28 00 00 DB */ cmplwi r0, 0xdb -/* 8011265C 40 82 00 08 */ bne lbl_80112664 -/* 80112660 48 00 00 84 */ b lbl_801126E4 -lbl_80112664: -/* 80112664 A8 7F 30 18 */ lha r3, 0x3018(r31) -/* 80112668 2C 03 00 01 */ cmpwi r3, 1 -/* 8011266C 41 82 00 68 */ beq lbl_801126D4 -/* 80112670 2C 03 00 02 */ cmpwi r3, 2 -/* 80112674 41 82 00 60 */ beq lbl_801126D4 -/* 80112678 2C 03 00 03 */ cmpwi r3, 3 -/* 8011267C 41 82 00 58 */ beq lbl_801126D4 -/* 80112680 7C 60 07 35 */ extsh. r0, r3 -/* 80112684 41 82 00 0C */ beq lbl_80112690 -/* 80112688 2C 03 00 08 */ cmpwi r3, 8 -/* 8011268C 40 82 00 58 */ bne lbl_801126E4 -lbl_80112690: -/* 80112690 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 80112694 28 00 01 9C */ cmplwi r0, 0x19c -/* 80112698 41 82 00 4C */ beq lbl_801126E4 -/* 8011269C 7F E3 FB 78 */ mr r3, r31 -/* 801126A0 4B FA 6C A1 */ bl checkEquipAnime__9daAlink_cCFv -/* 801126A4 2C 03 00 00 */ cmpwi r3, 0 -/* 801126A8 40 82 00 3C */ bne lbl_801126E4 -/* 801126AC 80 9F 31 A0 */ lwz r4, 0x31a0(r31) -/* 801126B0 54 80 07 7B */ rlwinm. r0, r4, 0, 0x1d, 0x1d -/* 801126B4 41 82 00 20 */ beq lbl_801126D4 -/* 801126B8 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070C52@ha */ -/* 801126BC 38 03 0C 52 */ addi r0, r3, 0x0C52 /* 0x00070C52@l */ -/* 801126C0 7C 80 00 39 */ and. r0, r4, r0 -/* 801126C4 40 82 00 10 */ bne lbl_801126D4 -/* 801126C8 80 1F 19 9C */ lwz r0, 0x199c(r31) -/* 801126CC 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 801126D0 40 82 00 14 */ bne lbl_801126E4 -lbl_801126D4: -/* 801126D4 7F E3 FB 78 */ mr r3, r31 -/* 801126D8 38 80 00 01 */ li r4, 1 -/* 801126DC 38 A0 00 00 */ li r5, 0 -/* 801126E0 4B FA EB FD */ bl deleteEquipItem__9daAlink_cFii -lbl_801126E4: -/* 801126E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801126E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801126EC 7C 08 03 A6 */ mtlr r0 -/* 801126F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801126F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkIronBallGroundStop__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkIronBallGroundStop__9daAlink_cCFv.s deleted file mode 100644 index b8b9a0c2a49..00000000000 --- a/asm/d/a/d_a_alink/checkIronBallGroundStop__9daAlink_cCFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80112524: -/* 80112524 38 80 00 00 */ li r4, 0 -/* 80112528 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 8011252C 28 00 00 42 */ cmplwi r0, 0x42 -/* 80112530 40 82 00 30 */ bne lbl_80112560 -/* 80112534 A8 03 30 18 */ lha r0, 0x3018(r3) -/* 80112538 2C 00 00 00 */ cmpwi r0, 0 -/* 8011253C 41 82 00 24 */ beq lbl_80112560 -/* 80112540 2C 00 00 08 */ cmpwi r0, 8 -/* 80112544 41 82 00 1C */ beq lbl_80112560 -/* 80112548 A8 03 30 1E */ lha r0, 0x301e(r3) -/* 8011254C 2C 00 00 00 */ cmpwi r0, 0 -/* 80112550 40 82 00 10 */ bne lbl_80112560 -/* 80112554 2C 00 00 0A */ cmpwi r0, 0xa -/* 80112558 40 80 00 08 */ bge lbl_80112560 -/* 8011255C 38 80 00 01 */ li r4, 1 -lbl_80112560: -/* 80112560 7C 83 23 78 */ mr r3, r4 -/* 80112564 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkIronBallReturnChange__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkIronBallReturnChange__9daAlink_cFv.s deleted file mode 100644 index e3edc1fe5bd..00000000000 --- a/asm/d/a/d_a_alink/checkIronBallReturnChange__9daAlink_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_80113CA0: -/* 80113CA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80113CA4 7C 08 02 A6 */ mflr r0 -/* 80113CA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80113CAC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80113CB0 7C 7F 1B 78 */ mr r31, r3 -/* 80113CB4 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 80113CB8 28 00 00 DA */ cmplwi r0, 0xda -/* 80113CBC 40 82 00 70 */ bne lbl_80113D2C -/* 80113CC0 A8 1F 05 9C */ lha r0, 0x59c(r31) -/* 80113CC4 2C 00 04 00 */ cmpwi r0, 0x400 -/* 80113CC8 41 81 00 1C */ bgt lbl_80113CE4 -/* 80113CCC C0 5F 38 08 */ lfs f2, 0x3808(r31) -/* 80113CD0 C0 3F 04 D4 */ lfs f1, 0x4d4(r31) -/* 80113CD4 C0 02 93 68 */ lfs f0, lit_8472(r2) -/* 80113CD8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80113CDC FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80113CE0 41 80 00 4C */ blt lbl_80113D2C -lbl_80113CE4: -/* 80113CE4 2C 00 04 00 */ cmpwi r0, 0x400 -/* 80113CE8 40 81 00 10 */ ble lbl_80113CF8 -/* 80113CEC A8 1F 30 1A */ lha r0, 0x301a(r31) -/* 80113CF0 2C 00 00 64 */ cmpwi r0, 0x64 -/* 80113CF4 41 82 00 38 */ beq lbl_80113D2C -lbl_80113CF8: -/* 80113CF8 38 7F 0F B8 */ addi r3, r31, 0xfb8 -/* 80113CFC 4B F7 05 C5 */ bl ChkAtHit__12dCcD_GObjInfFv -/* 80113D00 28 03 00 00 */ cmplwi r3, 0 -/* 80113D04 41 82 00 3C */ beq lbl_80113D40 -/* 80113D08 38 7F 0F B8 */ addi r3, r31, 0xfb8 -/* 80113D0C 4B F7 06 9D */ bl GetAtHitGObj__12dCcD_GObjInfFv -/* 80113D10 28 03 00 00 */ cmplwi r3, 0 -/* 80113D14 41 82 00 2C */ beq lbl_80113D40 -/* 80113D18 38 7F 0F B8 */ addi r3, r31, 0xfb8 -/* 80113D1C 4B F7 06 8D */ bl GetAtHitGObj__12dCcD_GObjInfFv -/* 80113D20 80 03 00 9C */ lwz r0, 0x9c(r3) -/* 80113D24 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 80113D28 41 82 00 18 */ beq lbl_80113D40 -lbl_80113D2C: -/* 80113D2C 7F E3 FB 78 */ mr r3, r31 -/* 80113D30 38 80 00 00 */ li r4, 0 -/* 80113D34 4B FF E9 C5 */ bl setIronBallReturn__9daAlink_cFi -/* 80113D38 38 60 00 01 */ li r3, 1 -/* 80113D3C 48 00 00 08 */ b lbl_80113D44 -lbl_80113D40: -/* 80113D40 38 60 00 00 */ li r3, 0 -lbl_80113D44: -/* 80113D44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80113D48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80113D4C 7C 08 03 A6 */ mtlr r0 -/* 80113D50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80113D54 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkIronBallReturn__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkIronBallReturn__9daAlink_cCFv.s deleted file mode 100644 index 154f67f74d3..00000000000 --- a/asm/d/a/d_a_alink/checkIronBallReturn__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_801124FC: -/* 801124FC 38 80 00 00 */ li r4, 0 -/* 80112500 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 80112504 28 00 00 42 */ cmplwi r0, 0x42 -/* 80112508 40 82 00 14 */ bne lbl_8011251C -/* 8011250C A8 03 30 18 */ lha r0, 0x3018(r3) -/* 80112510 2C 00 00 07 */ cmpwi r0, 7 -/* 80112514 40 82 00 08 */ bne lbl_8011251C -/* 80112518 38 80 00 01 */ li r4, 1 -lbl_8011251C: -/* 8011251C 7C 83 23 78 */ mr r3, r4 -/* 80112520 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkIronBallThrowMode__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkIronBallThrowMode__9daAlink_cCFv.s deleted file mode 100644 index 9e80025c595..00000000000 --- a/asm/d/a/d_a_alink/checkIronBallThrowMode__9daAlink_cCFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80112474: -/* 80112474 38 80 00 00 */ li r4, 0 -/* 80112478 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 8011247C 28 00 00 42 */ cmplwi r0, 0x42 -/* 80112480 40 82 00 2C */ bne lbl_801124AC -/* 80112484 A8 03 30 18 */ lha r0, 0x3018(r3) -/* 80112488 2C 00 00 04 */ cmpwi r0, 4 -/* 8011248C 41 82 00 1C */ beq lbl_801124A8 -/* 80112490 2C 00 00 05 */ cmpwi r0, 5 -/* 80112494 41 82 00 14 */ beq lbl_801124A8 -/* 80112498 2C 00 00 06 */ cmpwi r0, 6 -/* 8011249C 41 82 00 0C */ beq lbl_801124A8 -/* 801124A0 2C 00 00 03 */ cmpwi r0, 3 -/* 801124A4 40 82 00 08 */ bne lbl_801124AC -lbl_801124A8: -/* 801124A8 38 80 00 01 */ li r4, 1 -lbl_801124AC: -/* 801124AC 7C 83 23 78 */ mr r3, r4 -/* 801124B0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkIronBallThrowReturnMode__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkIronBallThrowReturnMode__9daAlink_cCFv.s deleted file mode 100644 index b5e4c12a5bf..00000000000 --- a/asm/d/a/d_a_alink/checkIronBallThrowReturnMode__9daAlink_cCFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_801124B4: -/* 801124B4 38 80 00 00 */ li r4, 0 -/* 801124B8 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 801124BC 28 00 00 42 */ cmplwi r0, 0x42 -/* 801124C0 40 82 00 34 */ bne lbl_801124F4 -/* 801124C4 A8 03 30 18 */ lha r0, 0x3018(r3) -/* 801124C8 2C 00 00 04 */ cmpwi r0, 4 -/* 801124CC 41 82 00 24 */ beq lbl_801124F0 -/* 801124D0 2C 00 00 05 */ cmpwi r0, 5 -/* 801124D4 41 82 00 1C */ beq lbl_801124F0 -/* 801124D8 2C 00 00 06 */ cmpwi r0, 6 -/* 801124DC 41 82 00 14 */ beq lbl_801124F0 -/* 801124E0 2C 00 00 07 */ cmpwi r0, 7 -/* 801124E4 41 82 00 0C */ beq lbl_801124F0 -/* 801124E8 2C 00 00 03 */ cmpwi r0, 3 -/* 801124EC 40 82 00 08 */ bne lbl_801124F4 -lbl_801124F0: -/* 801124F0 38 80 00 01 */ li r4, 1 -lbl_801124F4: -/* 801124F4 7C 83 23 78 */ mr r3, r4 -/* 801124F8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkItemActorPointer__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkItemActorPointer__9daAlink_cFv.s deleted file mode 100644 index 7a9c2d61907..00000000000 --- a/asm/d/a/d_a_alink/checkItemActorPointer__9daAlink_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_800B72E4: -/* 800B72E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B72E8 7C 08 02 A6 */ mflr r0 -/* 800B72EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B72F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B72F4 7C 7F 1B 78 */ mr r31, r3 -/* 800B72F8 80 03 28 28 */ lwz r0, 0x2828(r3) -/* 800B72FC 28 00 00 00 */ cmplwi r0, 0 -/* 800B7300 41 82 00 0C */ beq lbl_800B730C -/* 800B7304 38 60 00 01 */ li r3, 1 -/* 800B7308 48 00 00 74 */ b lbl_800B737C -lbl_800B730C: -/* 800B730C 38 7F 28 24 */ addi r3, r31, 0x2824 -/* 800B7310 48 0A 79 ED */ bl clearData__16daPy_actorKeep_cFv -/* 800B7314 7F E3 FB 78 */ mr r3, r31 -/* 800B7318 38 80 00 02 */ li r4, 2 -/* 800B731C C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800B7320 4B FF 64 05 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf -/* 800B7324 38 00 00 FF */ li r0, 0xff -/* 800B7328 B0 1F 2F DC */ sth r0, 0x2fdc(r31) -/* 800B732C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800B7330 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 -/* 800B7334 41 82 00 3C */ beq lbl_800B7370 -/* 800B7338 7F E3 FB 78 */ mr r3, r31 -/* 800B733C 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800B7340 81 8C 01 90 */ lwz r12, 0x190(r12) -/* 800B7344 7D 89 03 A6 */ mtctr r12 -/* 800B7348 4E 80 04 21 */ bctrl -/* 800B734C 28 03 00 00 */ cmplwi r3, 0 -/* 800B7350 41 82 00 14 */ beq lbl_800B7364 -/* 800B7354 7F E3 FB 78 */ mr r3, r31 -/* 800B7358 38 80 00 00 */ li r4, 0 -/* 800B735C 48 03 DE 89 */ bl procCanoeWaitInit__9daAlink_cFi -/* 800B7360 48 00 00 18 */ b lbl_800B7378 -lbl_800B7364: -/* 800B7364 7F E3 FB 78 */ mr r3, r31 -/* 800B7368 48 03 96 19 */ bl procHorseWaitInit__9daAlink_cFv -/* 800B736C 48 00 00 0C */ b lbl_800B7378 -lbl_800B7370: -/* 800B7370 7F E3 FB 78 */ mr r3, r31 -/* 800B7374 48 00 C0 45 */ bl procWaitInit__9daAlink_cFv -lbl_800B7378: -/* 800B7378 38 60 00 00 */ li r3, 0 -lbl_800B737C: -/* 800B737C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B7380 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B7384 7C 08 03 A6 */ mtlr r0 -/* 800B7388 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B738C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkItemButtonChange__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkItemButtonChange__9daAlink_cFv.s deleted file mode 100644 index 65aa7876bc7..00000000000 --- a/asm/d/a/d_a_alink/checkItemButtonChange__9daAlink_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_800B7528: -/* 800B7528 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800B752C 7C 08 02 A6 */ mflr r0 -/* 800B7530 90 01 00 24 */ stw r0, 0x24(r1) -/* 800B7534 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B7538 48 2A AC A5 */ bl _savegpr_29 -/* 800B753C 7C 7D 1B 78 */ mr r29, r3 -/* 800B7540 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800B7544 28 00 00 92 */ cmplwi r0, 0x92 -/* 800B7548 41 82 00 8C */ beq lbl_800B75D4 -/* 800B754C A0 1D 2F DC */ lhz r0, 0x2fdc(r29) -/* 800B7550 28 00 00 FF */ cmplwi r0, 0xff -/* 800B7554 41 82 00 80 */ beq lbl_800B75D4 -/* 800B7558 48 00 1D E9 */ bl checkEquipAnime__9daAlink_cCFv -/* 800B755C 2C 03 00 00 */ cmpwi r3, 0 -/* 800B7560 40 82 00 74 */ bne lbl_800B75D4 -/* 800B7564 3B C0 00 00 */ li r30, 0 -/* 800B7568 48 00 00 60 */ b lbl_800B75C8 -lbl_800B756C: -/* 800B756C 57 C3 06 3E */ clrlwi r3, r30, 0x18 -/* 800B7570 38 03 00 01 */ addi r0, r3, 1 -/* 800B7574 54 04 0F FE */ srwi r4, r0, 0x1f -/* 800B7578 54 00 07 FE */ clrlwi r0, r0, 0x1f -/* 800B757C 7C 00 22 78 */ xor r0, r0, r4 -/* 800B7580 7C 04 00 50 */ subf r0, r4, r0 -/* 800B7584 54 1F 06 3E */ clrlwi r31, r0, 0x18 -/* 800B7588 4B F7 69 95 */ bl dComIfGp_getSelectItem__Fi -/* 800B758C 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 800B7590 A0 1D 2F DC */ lhz r0, 0x2fdc(r29) -/* 800B7594 7C 00 18 00 */ cmpw r0, r3 -/* 800B7598 40 82 00 2C */ bne lbl_800B75C4 -/* 800B759C 7F E3 FB 78 */ mr r3, r31 -/* 800B75A0 4B F7 69 7D */ bl dComIfGp_getSelectItem__Fi -/* 800B75A4 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 800B75A8 A0 1D 2F DC */ lhz r0, 0x2fdc(r29) -/* 800B75AC 7C 00 18 00 */ cmpw r0, r3 -/* 800B75B0 40 82 00 10 */ bne lbl_800B75C0 -/* 800B75B4 88 1D 2F 9C */ lbz r0, 0x2f9c(r29) -/* 800B75B8 7C 00 F8 40 */ cmplw r0, r31 -/* 800B75BC 41 82 00 08 */ beq lbl_800B75C4 -lbl_800B75C0: -/* 800B75C0 9B DD 2F 9C */ stb r30, 0x2f9c(r29) -lbl_800B75C4: -/* 800B75C4 3B DE 00 01 */ addi r30, r30, 1 -lbl_800B75C8: -/* 800B75C8 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 800B75CC 28 00 00 02 */ cmplwi r0, 2 -/* 800B75D0 41 80 FF 9C */ blt lbl_800B756C -lbl_800B75D4: -/* 800B75D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B75D8 48 2A AC 51 */ bl _restgpr_29 -/* 800B75DC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800B75E0 7C 08 03 A6 */ mtlr r0 -/* 800B75E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B75E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkItemChangeAutoAction__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkItemChangeAutoAction__9daAlink_cFv.s deleted file mode 100644 index 1cc8099cad9..00000000000 --- a/asm/d/a/d_a_alink/checkItemChangeAutoAction__9daAlink_cFv.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_800B7090: -/* 800B7090 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B7094 7C 08 02 A6 */ mflr r0 -/* 800B7098 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B709C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B70A0 7C 7F 1B 78 */ mr r31, r3 -/* 800B70A4 80 03 05 80 */ lwz r0, 0x580(r3) -/* 800B70A8 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 800B70AC 41 82 00 A4 */ beq lbl_800B7150 -/* 800B70B0 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800B70B4 28 00 01 03 */ cmplwi r0, 0x103 -/* 800B70B8 40 82 00 88 */ bne lbl_800B7140 -/* 800B70BC 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800B70C0 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd -/* 800B70C4 41 82 00 0C */ beq lbl_800B70D0 -/* 800B70C8 38 60 00 00 */ li r3, 0 -/* 800B70CC 48 00 00 88 */ b lbl_800B7154 -lbl_800B70D0: -/* 800B70D0 38 80 00 02 */ li r4, 2 -/* 800B70D4 C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800B70D8 4B FF 66 4D */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf -/* 800B70DC 7F E3 FB 78 */ mr r3, r31 -/* 800B70E0 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800B70E4 81 8C 01 94 */ lwz r12, 0x194(r12) -/* 800B70E8 7D 89 03 A6 */ mtctr r12 -/* 800B70EC 4E 80 04 21 */ bctrl -/* 800B70F0 28 03 00 00 */ cmplwi r3, 0 -/* 800B70F4 41 82 00 10 */ beq lbl_800B7104 -/* 800B70F8 7F E3 FB 78 */ mr r3, r31 -/* 800B70FC 48 04 F5 1D */ bl checkBoardSwordTriggerAction__9daAlink_cFv -/* 800B7100 48 00 00 54 */ b lbl_800B7154 -lbl_800B7104: -/* 800B7104 38 00 00 00 */ li r0, 0 -/* 800B7108 88 7F 2F AA */ lbz r3, 0x2faa(r31) -/* 800B710C 28 03 00 01 */ cmplwi r3, 1 -/* 800B7110 41 82 00 0C */ beq lbl_800B711C -/* 800B7114 28 03 00 02 */ cmplwi r3, 2 -/* 800B7118 40 82 00 08 */ bne lbl_800B7120 -lbl_800B711C: -/* 800B711C 38 00 00 01 */ li r0, 1 -lbl_800B7120: -/* 800B7120 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 800B7124 41 82 00 10 */ beq lbl_800B7134 -/* 800B7128 7F E3 FB 78 */ mr r3, r31 -/* 800B712C 48 03 A7 69 */ bl procHorseCutChargeReadyInit__9daAlink_cFv -/* 800B7130 48 00 00 24 */ b lbl_800B7154 -lbl_800B7134: -/* 800B7134 7F E3 FB 78 */ mr r3, r31 -/* 800B7138 48 01 DB 31 */ bl procCutTurnChargeInit__9daAlink_cFv -/* 800B713C 48 00 00 18 */ b lbl_800B7154 -lbl_800B7140: -/* 800B7140 4B FF FD E9 */ bl checkItemActionInitStart__9daAlink_cFv -/* 800B7144 2C 03 FF FF */ cmpwi r3, -1 -/* 800B7148 41 82 00 08 */ beq lbl_800B7150 -/* 800B714C 48 00 00 08 */ b lbl_800B7154 -lbl_800B7150: -/* 800B7150 38 60 00 00 */ li r3, 0 -lbl_800B7154: -/* 800B7154 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B7158 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B715C 7C 08 03 A6 */ mtlr r0 -/* 800B7160 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B7164 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkItemChangeFromButton__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkItemChangeFromButton__9daAlink_cFv.s deleted file mode 100644 index 2c3f2d70f46..00000000000 --- a/asm/d/a/d_a_alink/checkItemChangeFromButton__9daAlink_cFv.s +++ /dev/null @@ -1,268 +0,0 @@ -lbl_800B994C: -/* 800B994C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800B9950 7C 08 02 A6 */ mflr r0 -/* 800B9954 90 01 00 24 */ stw r0, 0x24(r1) -/* 800B9958 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B995C 48 2A 88 79 */ bl _savegpr_27 -/* 800B9960 7C 7E 1B 78 */ mr r30, r3 -/* 800B9964 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 800B9968 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 800B996C 41 82 03 A4 */ beq lbl_800B9D10 -/* 800B9970 4B FF F9 D1 */ bl checkEquipAnime__9daAlink_cCFv -/* 800B9974 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9978 40 82 03 98 */ bne lbl_800B9D10 -/* 800B997C 7F C3 F3 78 */ mr r3, r30 -/* 800B9980 48 02 6B 2D */ bl checkBoomerangThrowAnime__9daAlink_cCFv -/* 800B9984 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9988 40 82 03 88 */ bne lbl_800B9D10 -/* 800B998C 38 60 00 00 */ li r3, 0 -/* 800B9990 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) -/* 800B9994 28 00 00 46 */ cmplwi r0, 0x46 -/* 800B9998 40 82 00 14 */ bne lbl_800B99AC -/* 800B999C A0 1E 1F BC */ lhz r0, 0x1fbc(r30) -/* 800B99A0 28 00 00 53 */ cmplwi r0, 0x53 -/* 800B99A4 40 82 00 08 */ bne lbl_800B99AC -/* 800B99A8 38 60 00 01 */ li r3, 1 -lbl_800B99AC: -/* 800B99AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800B99B0 40 82 03 60 */ bne lbl_800B9D10 -/* 800B99B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B99B8 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B99BC 88 1F 00 14 */ lbz r0, 0x14(r31) -/* 800B99C0 28 00 00 FF */ cmplwi r0, 0xff -/* 800B99C4 41 82 00 88 */ beq lbl_800B9A4C -/* 800B99C8 48 00 6B CD */ bl checkNotBattleStage__9daAlink_cFv -/* 800B99CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800B99D0 40 82 00 7C */ bne lbl_800B9A4C -/* 800B99D4 7F C3 F3 78 */ mr r3, r30 -/* 800B99D8 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 800B99DC 81 8C 01 90 */ lwz r12, 0x190(r12) -/* 800B99E0 7D 89 03 A6 */ mtctr r12 -/* 800B99E4 4E 80 04 21 */ bctrl -/* 800B99E8 28 03 00 00 */ cmplwi r3, 0 -/* 800B99EC 40 82 00 60 */ bne lbl_800B9A4C -/* 800B99F0 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 800B99F4 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd -/* 800B99F8 41 82 00 10 */ beq lbl_800B9A08 -/* 800B99FC 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800B9A00 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800B9A04 41 82 00 48 */ beq lbl_800B9A4C -lbl_800B9A08: -/* 800B9A08 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) -/* 800B9A0C 28 00 01 03 */ cmplwi r0, 0x103 -/* 800B9A10 41 82 00 3C */ beq lbl_800B9A4C -/* 800B9A14 7F C3 F3 78 */ mr r3, r30 -/* 800B9A18 38 80 00 08 */ li r4, 8 -/* 800B9A1C 4B FF 8B B1 */ bl itemTriggerCheck__9daAlink_cFUc -/* 800B9A20 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9A24 41 82 00 28 */ beq lbl_800B9A4C -/* 800B9A28 80 1E 05 8C */ lwz r0, 0x58c(r30) -/* 800B9A2C 54 00 00 43 */ rlwinm. r0, r0, 0, 1, 1 -/* 800B9A30 41 82 00 0C */ beq lbl_800B9A3C -/* 800B9A34 38 60 00 00 */ li r3, 0 -/* 800B9A38 48 00 02 DC */ b lbl_800B9D14 -lbl_800B9A3C: -/* 800B9A3C 7F C3 F3 78 */ mr r3, r30 -/* 800B9A40 38 80 00 01 */ li r4, 1 -/* 800B9A44 4B FF F9 B1 */ bl swordEquip__9daAlink_cFi -/* 800B9A48 48 00 02 C8 */ b lbl_800B9D10 -lbl_800B9A4C: -/* 800B9A4C 7F C3 F3 78 */ mr r3, r30 -/* 800B9A50 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 800B9A54 81 8C 01 90 */ lwz r12, 0x190(r12) -/* 800B9A58 7D 89 03 A6 */ mtctr r12 -/* 800B9A5C 4E 80 04 21 */ bctrl -/* 800B9A60 28 03 00 00 */ cmplwi r3, 0 -/* 800B9A64 41 82 00 58 */ beq lbl_800B9ABC -/* 800B9A68 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 800B9A6C 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 800B9A70 38 63 00 6F */ addi r3, r3, 0x6f -/* 800B9A74 4B FE 3F ED */ bl checkStageName__9daAlink_cFPCc -/* 800B9A78 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800B9A7C 40 82 00 40 */ bne lbl_800B9ABC -/* 800B9A80 88 1E 05 6A */ lbz r0, 0x56a(r30) -/* 800B9A84 28 00 00 2D */ cmplwi r0, 0x2d -/* 800B9A88 41 82 00 34 */ beq lbl_800B9ABC -/* 800B9A8C A0 1E 2F DC */ lhz r0, 0x2fdc(r30) -/* 800B9A90 28 00 01 05 */ cmplwi r0, 0x105 -/* 800B9A94 41 82 00 28 */ beq lbl_800B9ABC -/* 800B9A98 7F C3 F3 78 */ mr r3, r30 -/* 800B9A9C 38 80 00 08 */ li r4, 8 -/* 800B9AA0 4B FF 8B 2D */ bl itemTriggerCheck__9daAlink_cFUc -/* 800B9AA4 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9AA8 41 82 00 14 */ beq lbl_800B9ABC -/* 800B9AAC 7F C3 F3 78 */ mr r3, r30 -/* 800B9AB0 38 80 01 05 */ li r4, 0x105 -/* 800B9AB4 4B FF FB 8D */ bl itemEquip__9daAlink_cFUs -/* 800B9AB8 48 00 02 58 */ b lbl_800B9D10 -lbl_800B9ABC: -/* 800B9ABC 3B 80 00 00 */ li r28, 0 -/* 800B9AC0 3B A0 00 01 */ li r29, 1 -/* 800B9AC4 48 00 00 4C */ b lbl_800B9B10 -lbl_800B9AC8: -/* 800B9AC8 7F C3 F3 78 */ mr r3, r30 -/* 800B9ACC 7F 84 E3 78 */ mr r4, r28 -/* 800B9AD0 48 00 6F CD */ bl checkNewItemChange__9daAlink_cFUc -/* 800B9AD4 7C 7B 1B 79 */ or. r27, r3, r3 -/* 800B9AD8 41 82 00 34 */ beq lbl_800B9B0C -/* 800B9ADC 7F C3 F3 78 */ mr r3, r30 -/* 800B9AE0 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 800B9AE4 7F A0 00 30 */ slw r0, r29, r0 -/* 800B9AE8 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 800B9AEC 4B FF 8A E1 */ bl itemTriggerCheck__9daAlink_cFUc -/* 800B9AF0 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9AF4 41 82 00 18 */ beq lbl_800B9B0C -/* 800B9AF8 7F C3 F3 78 */ mr r3, r30 -/* 800B9AFC 7F 84 E3 78 */ mr r4, r28 -/* 800B9B00 7F 65 DB 78 */ mr r5, r27 -/* 800B9B04 48 00 6C 79 */ bl changeItemTriggerKeepProc__9daAlink_cFUci -/* 800B9B08 48 00 02 0C */ b lbl_800B9D14 -lbl_800B9B0C: -/* 800B9B0C 3B 9C 00 01 */ addi r28, r28, 1 -lbl_800B9B10: -/* 800B9B10 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 800B9B14 28 00 00 02 */ cmplwi r0, 2 -/* 800B9B18 41 80 FF B0 */ blt lbl_800B9AC8 -/* 800B9B1C 88 1E 2F 8D */ lbz r0, 0x2f8d(r30) -/* 800B9B20 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 800B9B24 41 82 00 84 */ beq lbl_800B9BA8 -/* 800B9B28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B9B2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B9B30 88 03 5E 24 */ lbz r0, 0x5e24(r3) -/* 800B9B34 28 00 00 04 */ cmplwi r0, 4 -/* 800B9B38 40 82 00 70 */ bne lbl_800B9BA8 -/* 800B9B3C A0 7E 2F DC */ lhz r3, 0x2fdc(r30) -/* 800B9B40 28 03 00 48 */ cmplwi r3, 0x48 -/* 800B9B44 41 82 00 1C */ beq lbl_800B9B60 -/* 800B9B48 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 800B9B4C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 800B9B50 41 82 00 10 */ beq lbl_800B9B60 -/* 800B9B54 7F C3 F3 78 */ mr r3, r30 -/* 800B9B58 48 05 6C E9 */ bl offKandelaarModel__9daAlink_cFv -/* 800B9B5C 48 00 01 B4 */ b lbl_800B9D10 -lbl_800B9B60: -/* 800B9B60 A8 1E 30 F4 */ lha r0, 0x30f4(r30) -/* 800B9B64 2C 00 00 00 */ cmpwi r0, 0 -/* 800B9B68 41 82 00 30 */ beq lbl_800B9B98 -/* 800B9B6C 28 03 01 03 */ cmplwi r3, 0x103 -/* 800B9B70 40 82 00 28 */ bne lbl_800B9B98 -/* 800B9B74 88 1F 00 14 */ lbz r0, 0x14(r31) -/* 800B9B78 28 00 00 3F */ cmplwi r0, 0x3f -/* 800B9B7C 41 82 00 1C */ beq lbl_800B9B98 -/* 800B9B80 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 800B9B84 70 00 04 02 */ andi. r0, r0, 0x402 -/* 800B9B88 40 82 00 10 */ bne lbl_800B9B98 -/* 800B9B8C 7F C3 F3 78 */ mr r3, r30 -/* 800B9B90 48 01 CD FD */ bl procSwordUnequipSpInit__9daAlink_cFv -/* 800B9B94 48 00 01 80 */ b lbl_800B9D14 -lbl_800B9B98: -/* 800B9B98 7F C3 F3 78 */ mr r3, r30 -/* 800B9B9C 38 80 00 01 */ li r4, 1 -/* 800B9BA0 4B FF FC 9D */ bl allUnequip__9daAlink_cFi -/* 800B9BA4 48 00 01 6C */ b lbl_800B9D10 -lbl_800B9BA8: -/* 800B9BA8 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) -/* 800B9BAC 28 00 00 FF */ cmplwi r0, 0xff -/* 800B9BB0 40 82 00 94 */ bne lbl_800B9C44 -/* 800B9BB4 80 1E 28 38 */ lwz r0, 0x2838(r30) -/* 800B9BB8 28 00 00 00 */ cmplwi r0, 0 -/* 800B9BBC 40 82 00 88 */ bne lbl_800B9C44 -/* 800B9BC0 7F C3 F3 78 */ mr r3, r30 -/* 800B9BC4 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 800B9BC8 81 8C 01 90 */ lwz r12, 0x190(r12) -/* 800B9BCC 7D 89 03 A6 */ mtctr r12 -/* 800B9BD0 4E 80 04 21 */ bctrl -/* 800B9BD4 28 03 00 00 */ cmplwi r3, 0 -/* 800B9BD8 40 82 00 6C */ bne lbl_800B9C44 -/* 800B9BDC 7F C3 F3 78 */ mr r3, r30 -/* 800B9BE0 4B FF F6 75 */ bl checkNoUpperAnime__9daAlink_cCFv -/* 800B9BE4 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9BE8 41 82 00 5C */ beq lbl_800B9C44 -/* 800B9BEC 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 800B9BF0 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 800B9BF4 41 82 00 50 */ beq lbl_800B9C44 -/* 800B9BF8 3B A0 00 00 */ li r29, 0 -/* 800B9BFC 48 00 00 20 */ b lbl_800B9C1C -lbl_800B9C00: -/* 800B9C00 57 A3 06 3E */ clrlwi r3, r29, 0x18 -/* 800B9C04 4B F7 43 19 */ bl dComIfGp_getSelectItem__Fi -/* 800B9C08 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 800B9C0C 28 00 00 48 */ cmplwi r0, 0x48 -/* 800B9C10 40 82 00 08 */ bne lbl_800B9C18 -/* 800B9C14 9B BE 2F 9C */ stb r29, 0x2f9c(r30) -lbl_800B9C18: -/* 800B9C18 3B BD 00 01 */ addi r29, r29, 1 -lbl_800B9C1C: -/* 800B9C1C 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 800B9C20 28 00 00 02 */ cmplwi r0, 2 -/* 800B9C24 41 80 FF DC */ blt lbl_800B9C00 -/* 800B9C28 7F C3 F3 78 */ mr r3, r30 -/* 800B9C2C 38 80 00 48 */ li r4, 0x48 -/* 800B9C30 4B FF FA 11 */ bl itemEquip__9daAlink_cFUs -/* 800B9C34 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 800B9C38 60 00 00 40 */ ori r0, r0, 0x40 -/* 800B9C3C 90 1E 05 74 */ stw r0, 0x574(r30) -/* 800B9C40 48 00 00 D0 */ b lbl_800B9D10 -lbl_800B9C44: -/* 800B9C44 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) -/* 800B9C48 28 00 01 03 */ cmplwi r0, 0x103 -/* 800B9C4C 41 82 00 C4 */ beq lbl_800B9D10 -/* 800B9C50 28 00 00 FF */ cmplwi r0, 0xff -/* 800B9C54 41 82 00 BC */ beq lbl_800B9D10 -/* 800B9C58 28 00 01 0B */ cmplwi r0, 0x10b -/* 800B9C5C 41 82 00 B4 */ beq lbl_800B9D10 -/* 800B9C60 28 00 01 02 */ cmplwi r0, 0x102 -/* 800B9C64 41 82 00 AC */ beq lbl_800B9D10 -/* 800B9C68 7F C3 F3 78 */ mr r3, r30 -/* 800B9C6C 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 800B9C70 81 8C 01 90 */ lwz r12, 0x190(r12) -/* 800B9C74 7D 89 03 A6 */ mtctr r12 -/* 800B9C78 4E 80 04 21 */ bctrl -/* 800B9C7C 28 03 00 00 */ cmplwi r3, 0 -/* 800B9C80 41 82 00 10 */ beq lbl_800B9C90 -/* 800B9C84 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) -/* 800B9C88 28 00 01 05 */ cmplwi r0, 0x105 -/* 800B9C8C 41 82 00 84 */ beq lbl_800B9D10 -lbl_800B9C90: -/* 800B9C90 7F C3 F3 78 */ mr r3, r30 -/* 800B9C94 48 05 BF 8D */ bl checkEventRun__9daAlink_cCFv -/* 800B9C98 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9C9C 41 82 00 2C */ beq lbl_800B9CC8 -/* 800B9CA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B9CA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B9CA8 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800B9CAC 4B F8 E7 3D */ bl getRunEventName__16dEvent_manager_cFv -/* 800B9CB0 3C 80 80 39 */ lis r4, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 800B9CB4 38 84 20 94 */ addi r4, r4, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 800B9CB8 38 84 04 87 */ addi r4, r4, 0x487 -/* 800B9CBC 48 2A EC D9 */ bl strcmp -/* 800B9CC0 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9CC4 41 82 00 4C */ beq lbl_800B9D10 -lbl_800B9CC8: -/* 800B9CC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B9CCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B9CD0 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800B9CD4 4B F8 E7 15 */ bl getRunEventName__16dEvent_manager_cFv -/* 800B9CD8 3C 80 80 39 */ lis r4, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 800B9CDC 38 84 20 94 */ addi r4, r4, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 800B9CE0 38 84 04 8D */ addi r4, r4, 0x48d -/* 800B9CE4 48 2A EC B1 */ bl strcmp -/* 800B9CE8 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9CEC 41 82 00 24 */ beq lbl_800B9D10 -/* 800B9CF0 7F C3 F3 78 */ mr r3, r30 -/* 800B9CF4 A0 9E 2F DC */ lhz r4, 0x2fdc(r30) -/* 800B9CF8 48 00 65 11 */ bl checkItemSetButton__9daAlink_cFi -/* 800B9CFC 2C 03 00 02 */ cmpwi r3, 2 -/* 800B9D00 40 82 00 10 */ bne lbl_800B9D10 -/* 800B9D04 7F C3 F3 78 */ mr r3, r30 -/* 800B9D08 38 80 00 01 */ li r4, 1 -/* 800B9D0C 4B FF FB 31 */ bl allUnequip__9daAlink_cFi -lbl_800B9D10: -/* 800B9D10 38 60 00 00 */ li r3, 0 -lbl_800B9D14: -/* 800B9D14 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B9D18 48 2A 85 09 */ bl _restgpr_27 -/* 800B9D1C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800B9D20 7C 08 03 A6 */ mtlr r0 -/* 800B9D24 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B9D28 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkItemEquipAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkItemEquipAnime__9daAlink_cCFv.s deleted file mode 100644 index 4f76bce9e2f..00000000000 --- a/asm/d/a/d_a_alink/checkItemEquipAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_800B92F8: -/* 800B92F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B92FC 7C 08 02 A6 */ mflr r0 -/* 800B9300 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B9304 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B9308 3B E0 00 00 */ li r31, 0 -/* 800B930C A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800B9310 28 00 02 45 */ cmplwi r0, 0x245 -/* 800B9314 41 82 00 10 */ beq lbl_800B9324 -/* 800B9318 4B FF FF B9 */ bl checkOneHandItemEquipAnime__9daAlink_cCFv -/* 800B931C 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9320 41 82 00 08 */ beq lbl_800B9328 -lbl_800B9324: -/* 800B9324 3B E0 00 01 */ li r31, 1 -lbl_800B9328: -/* 800B9328 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800B932C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B9330 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B9334 7C 08 03 A6 */ mtlr r0 -/* 800B9338 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B933C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkKandelaarEquipAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkKandelaarEquipAnime__9daAlink_cCFv.s deleted file mode 100644 index 61c7db5f0fa..00000000000 --- a/asm/d/a/d_a_alink/checkKandelaarEquipAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80110C6C: -/* 80110C6C 38 80 00 00 */ li r4, 0 -/* 80110C70 A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 80110C74 28 00 02 64 */ cmplwi r0, 0x264 -/* 80110C78 41 82 00 10 */ beq lbl_80110C88 -/* 80110C7C 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 80110C80 28 00 02 68 */ cmplwi r0, 0x268 -/* 80110C84 40 82 00 08 */ bne lbl_80110C8C -lbl_80110C88: -/* 80110C88 38 80 00 01 */ li r4, 1 -lbl_80110C8C: -/* 80110C8C 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 80110C90 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkKandelaarSwing__9daAlink_cCFi.s b/asm/d/a/d_a_alink/checkKandelaarSwing__9daAlink_cCFi.s deleted file mode 100644 index 269a0dc2150..00000000000 --- a/asm/d/a/d_a_alink/checkKandelaarSwing__9daAlink_cCFi.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_801108B4: -/* 801108B4 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 801108B8 28 00 00 B7 */ cmplwi r0, 0xb7 -/* 801108BC 40 82 00 28 */ bne lbl_801108E4 -/* 801108C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801108C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801108C8 A0 03 00 08 */ lhz r0, 8(r3) -/* 801108CC 28 00 00 00 */ cmplwi r0, 0 -/* 801108D0 40 82 00 0C */ bne lbl_801108DC -/* 801108D4 2C 04 00 00 */ cmpwi r4, 0 -/* 801108D8 40 82 00 0C */ bne lbl_801108E4 -lbl_801108DC: -/* 801108DC 38 60 00 01 */ li r3, 1 -/* 801108E0 4E 80 00 20 */ blr -lbl_801108E4: -/* 801108E4 38 60 00 00 */ li r3, 0 -/* 801108E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkLandAction__9daAlink_cFi.s b/asm/d/a/d_a_alink/checkLandAction__9daAlink_cFi.s deleted file mode 100644 index 5d86877c1c9..00000000000 --- a/asm/d/a/d_a_alink/checkLandAction__9daAlink_cFi.s +++ /dev/null @@ -1,183 +0,0 @@ -lbl_800B5CCC: -/* 800B5CCC 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 800B5CD0 7C 08 02 A6 */ mflr r0 -/* 800B5CD4 90 01 00 44 */ stw r0, 0x44(r1) -/* 800B5CD8 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 800B5CDC F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 800B5CE0 39 61 00 30 */ addi r11, r1, 0x30 -/* 800B5CE4 48 2A C4 F1 */ bl _savegpr_27 -/* 800B5CE8 7C 7E 1B 78 */ mr r30, r3 -/* 800B5CEC 7C 9F 23 78 */ mr r31, r4 -/* 800B5CF0 C0 42 93 88 */ lfs f2, lit_8782(r2) -/* 800B5CF4 C0 23 33 C4 */ lfs f1, 0x33c4(r3) -/* 800B5CF8 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 800B5CFC EC 01 00 28 */ fsubs f0, f1, f0 -/* 800B5D00 EF E2 00 32 */ fmuls f31, f2, f0 -/* 800B5D04 A8 63 04 DE */ lha r3, 0x4de(r3) -/* 800B5D08 A8 1E 2F E2 */ lha r0, 0x2fe2(r30) -/* 800B5D0C 7C 03 00 50 */ subf r0, r3, r0 -/* 800B5D10 7C 03 07 34 */ extsh r3, r0 -/* 800B5D14 4B FF D7 81 */ bl getDirectionFromAngle__9daAlink_cFs -/* 800B5D18 7C 7C 1B 78 */ mr r28, r3 -/* 800B5D1C A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 800B5D20 A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 800B5D24 7C 03 00 50 */ subf r0, r3, r0 -/* 800B5D28 7C 03 07 34 */ extsh r3, r0 -/* 800B5D2C 4B FF D7 69 */ bl getDirectionFromAngle__9daAlink_cFs -/* 800B5D30 7C 7B 1B 78 */ mr r27, r3 -/* 800B5D34 3B A0 00 00 */ li r29, 0 -/* 800B5D38 C0 3E 33 A8 */ lfs f1, 0x33a8(r30) -/* 800B5D3C C0 02 94 08 */ lfs f0, lit_14064(r2) -/* 800B5D40 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800B5D44 40 81 00 34 */ ble lbl_800B5D78 -/* 800B5D48 2C 1B 00 01 */ cmpwi r27, 1 -/* 800B5D4C 41 82 00 2C */ beq lbl_800B5D78 -/* 800B5D50 7F C3 F3 78 */ mr r3, r30 -/* 800B5D54 48 02 DF 19 */ bl checkGrabAnime__9daAlink_cCFv -/* 800B5D58 2C 03 00 00 */ cmpwi r3, 0 -/* 800B5D5C 40 82 00 1C */ bne lbl_800B5D78 -/* 800B5D60 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) -/* 800B5D64 28 00 00 2D */ cmplwi r0, 0x2d -/* 800B5D68 41 82 00 10 */ beq lbl_800B5D78 -/* 800B5D6C 2C 1C 00 00 */ cmpwi r28, 0 -/* 800B5D70 40 82 00 08 */ bne lbl_800B5D78 -/* 800B5D74 3B A0 00 01 */ li r29, 1 -lbl_800B5D78: -/* 800B5D78 57 BD 06 3E */ clrlwi r29, r29, 0x18 -/* 800B5D7C 2C 1F 00 00 */ cmpwi r31, 0 -/* 800B5D80 40 82 00 1C */ bne lbl_800B5D9C -/* 800B5D84 3C 60 80 39 */ lis r3, m__21daAlinkHIO_damFall_c0@ha /* 0x8038E454@ha */ -/* 800B5D88 38 63 E4 54 */ addi r3, r3, m__21daAlinkHIO_damFall_c0@l /* 0x8038E454@l */ -/* 800B5D8C C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 800B5D90 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 800B5D94 4C 41 13 82 */ cror 2, 1, 2 -/* 800B5D98 40 82 00 44 */ bne lbl_800B5DDC -lbl_800B5D9C: -/* 800B5D9C 3C 60 80 39 */ lis r3, m__21daAlinkHIO_damFall_c0@ha /* 0x8038E454@ha */ -/* 800B5DA0 38 63 E4 54 */ addi r3, r3, m__21daAlinkHIO_damFall_c0@l /* 0x8038E454@l */ -/* 800B5DA4 C0 03 00 30 */ lfs f0, 0x30(r3) -/* 800B5DA8 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 800B5DAC 40 80 00 30 */ bge lbl_800B5DDC -/* 800B5DB0 2C 1D 00 00 */ cmpwi r29, 0 -/* 800B5DB4 41 82 00 28 */ beq lbl_800B5DDC -/* 800B5DB8 2C 1B 00 00 */ cmpwi r27, 0 -/* 800B5DBC 40 82 00 10 */ bne lbl_800B5DCC -/* 800B5DC0 7F C3 F3 78 */ mr r3, r30 -/* 800B5DC4 48 00 EB 89 */ bl procFrontRollInit__9daAlink_cFv -/* 800B5DC8 48 00 01 80 */ b lbl_800B5F48 -lbl_800B5DCC: -/* 800B5DCC 7F C3 F3 78 */ mr r3, r30 -/* 800B5DD0 7F 64 DB 78 */ mr r4, r27 -/* 800B5DD4 48 00 F5 55 */ bl procSideRollInit__9daAlink_cFi -/* 800B5DD8 48 00 01 70 */ b lbl_800B5F48 -lbl_800B5DDC: -/* 800B5DDC 7F C3 F3 78 */ mr r3, r30 -/* 800B5DE0 48 02 11 4D */ bl checkNoLandDamageSlidePolygon__9daAlink_cFv -/* 800B5DE4 2C 03 00 00 */ cmpwi r3, 0 -/* 800B5DE8 40 82 00 18 */ bne lbl_800B5E00 -/* 800B5DEC 3C 60 80 39 */ lis r3, m__21daAlinkHIO_damFall_c0@ha /* 0x8038E454@ha */ -/* 800B5DF0 38 83 E4 54 */ addi r4, r3, m__21daAlinkHIO_damFall_c0@l /* 0x8038E454@l */ -/* 800B5DF4 C0 04 00 34 */ lfs f0, 0x34(r4) -/* 800B5DF8 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 800B5DFC 40 80 01 2C */ bge lbl_800B5F28 -lbl_800B5E00: -/* 800B5E00 2C 1F 00 00 */ cmpwi r31, 0 -/* 800B5E04 41 82 00 14 */ beq lbl_800B5E18 -/* 800B5E08 7F C3 F3 78 */ mr r3, r30 -/* 800B5E0C 38 80 00 00 */ li r4, 0 -/* 800B5E10 48 02 50 01 */ bl procLandDamageInit__9daAlink_cFi -/* 800B5E14 48 00 01 34 */ b lbl_800B5F48 -lbl_800B5E18: -/* 800B5E18 2C 1D 00 00 */ cmpwi r29, 0 -/* 800B5E1C 41 82 00 34 */ beq lbl_800B5E50 -/* 800B5E20 A0 1E 30 F0 */ lhz r0, 0x30f0(r30) -/* 800B5E24 28 00 00 32 */ cmplwi r0, 0x32 -/* 800B5E28 40 81 00 28 */ ble lbl_800B5E50 -/* 800B5E2C 2C 1B 00 00 */ cmpwi r27, 0 -/* 800B5E30 40 82 00 10 */ bne lbl_800B5E40 -/* 800B5E34 7F C3 F3 78 */ mr r3, r30 -/* 800B5E38 48 00 EB 15 */ bl procFrontRollInit__9daAlink_cFv -/* 800B5E3C 48 00 01 0C */ b lbl_800B5F48 -lbl_800B5E40: -/* 800B5E40 7F C3 F3 78 */ mr r3, r30 -/* 800B5E44 7F 64 DB 78 */ mr r4, r27 -/* 800B5E48 48 00 F4 E1 */ bl procSideRollInit__9daAlink_cFi -/* 800B5E4C 48 00 00 FC */ b lbl_800B5F48 -lbl_800B5E50: -/* 800B5E50 C0 3E 33 AC */ lfs f1, 0x33ac(r30) -/* 800B5E54 C0 02 92 A4 */ lfs f0, lit_6021(r2) -/* 800B5E58 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800B5E5C 40 81 00 BC */ ble lbl_800B5F18 -/* 800B5E60 2C 1B 00 00 */ cmpwi r27, 0 -/* 800B5E64 40 82 00 B4 */ bne lbl_800B5F18 -/* 800B5E68 2C 1C 00 00 */ cmpwi r28, 0 -/* 800B5E6C 40 82 00 AC */ bne lbl_800B5F18 -/* 800B5E70 C0 3E 33 98 */ lfs f1, 0x3398(r30) -/* 800B5E74 C0 02 93 3C */ lfs f0, lit_7808(r2) -/* 800B5E78 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800B5E7C 40 81 00 9C */ ble lbl_800B5F18 -/* 800B5E80 3C 60 80 39 */ lis r3, m__18daAlinkHIO_move_c0@ha /* 0x8038D6BC@ha */ -/* 800B5E84 38 63 D6 BC */ addi r3, r3, m__18daAlinkHIO_move_c0@l /* 0x8038D6BC@l */ -/* 800B5E88 C0 03 00 30 */ lfs f0, 0x30(r3) -/* 800B5E8C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800B5E90 40 81 00 08 */ ble lbl_800B5E98 -/* 800B5E94 D0 1E 33 98 */ stfs f0, 0x3398(r30) -lbl_800B5E98: -/* 800B5E98 C0 3E 33 98 */ lfs f1, 0x3398(r30) -/* 800B5E9C C0 02 92 AC */ lfs f0, lit_6023(r2) -/* 800B5EA0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800B5EA4 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800B5EA8 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800B5EAC B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800B5EB0 7F C3 F3 78 */ mr r3, r30 -/* 800B5EB4 48 00 D8 19 */ bl procMoveInit__9daAlink_cFv -/* 800B5EB8 7F C3 F3 78 */ mr r3, r30 -/* 800B5EBC 38 80 00 02 */ li r4, 2 -/* 800B5EC0 48 06 B3 01 */ bl setFootEffectProcType__9daAlink_cFi -/* 800B5EC4 38 00 00 04 */ li r0, 4 -/* 800B5EC8 98 1E 2F 9D */ stb r0, 0x2f9d(r30) -/* 800B5ECC 7F C3 F3 78 */ mr r3, r30 -/* 800B5ED0 48 00 96 11 */ bl resetBasAnime__9daAlink_cFv -/* 800B5ED4 7F C3 F3 78 */ mr r3, r30 -/* 800B5ED8 3C 80 00 03 */ lis r4, 0x0003 /* 0x00030001@ha */ -/* 800B5EDC 38 84 00 01 */ addi r4, r4, 0x0001 /* 0x00030001@l */ -/* 800B5EE0 48 00 92 B5 */ bl seStartMapInfo__9daAlink_cFUl -/* 800B5EE4 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800B5EE8 D0 21 00 08 */ stfs f1, 8(r1) -/* 800B5EEC C0 02 92 B8 */ lfs f0, lit_6040(r2) -/* 800B5EF0 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800B5EF4 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800B5EF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B5EFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B5F00 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 800B5F04 38 80 00 01 */ li r4, 1 -/* 800B5F08 38 A0 00 0F */ li r5, 0xf -/* 800B5F0C 38 C1 00 08 */ addi r6, r1, 8 -/* 800B5F10 4B FB 9B 15 */ bl StartShock__12dVibration_cFii4cXyz -/* 800B5F14 48 00 00 34 */ b lbl_800B5F48 -lbl_800B5F18: -/* 800B5F18 7F C3 F3 78 */ mr r3, r30 -/* 800B5F1C FC 20 F8 90 */ fmr f1, f31 -/* 800B5F20 48 01 0F F9 */ bl procLandInit__9daAlink_cFf -/* 800B5F24 48 00 00 24 */ b lbl_800B5F48 -lbl_800B5F28: -/* 800B5F28 7F C3 F3 78 */ mr r3, r30 -/* 800B5F2C C0 04 00 38 */ lfs f0, 0x38(r4) -/* 800B5F30 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 800B5F34 40 80 00 0C */ bge lbl_800B5F40 -/* 800B5F38 38 80 00 01 */ li r4, 1 -/* 800B5F3C 48 00 00 08 */ b lbl_800B5F44 -lbl_800B5F40: -/* 800B5F40 38 80 00 02 */ li r4, 2 -lbl_800B5F44: -/* 800B5F44 48 02 4E CD */ bl procLandDamageInit__9daAlink_cFi -lbl_800B5F48: -/* 800B5F48 38 60 00 01 */ li r3, 1 -/* 800B5F4C E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 800B5F50 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 800B5F54 39 61 00 30 */ addi r11, r1, 0x30 -/* 800B5F58 48 2A C2 C9 */ bl _restgpr_27 -/* 800B5F5C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 800B5F60 7C 08 03 A6 */ mtlr r0 -/* 800B5F64 38 21 00 40 */ addi r1, r1, 0x40 -/* 800B5F68 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkLargeAttack__9daAlink_cCFi.s b/asm/d/a/d_a_alink/checkLargeAttack__9daAlink_cCFi.s deleted file mode 100644 index 8356dbf08e1..00000000000 --- a/asm/d/a/d_a_alink/checkLargeAttack__9daAlink_cCFi.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800D7C14: -/* 800D7C14 38 60 00 00 */ li r3, 0 -/* 800D7C18 2C 04 00 01 */ cmpwi r4, 1 -/* 800D7C1C 41 82 00 1C */ beq lbl_800D7C38 -/* 800D7C20 2C 04 00 06 */ cmpwi r4, 6 -/* 800D7C24 41 82 00 14 */ beq lbl_800D7C38 -/* 800D7C28 2C 04 00 0A */ cmpwi r4, 0xa -/* 800D7C2C 41 82 00 0C */ beq lbl_800D7C38 -/* 800D7C30 2C 04 00 0D */ cmpwi r4, 0xd -/* 800D7C34 4C 82 00 20 */ bnelr -lbl_800D7C38: -/* 800D7C38 38 60 00 01 */ li r3, 1 -/* 800D7C3C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkLightSwordMtrl__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkLightSwordMtrl__9daAlink_cFv.s deleted file mode 100644 index a16690fee2d..00000000000 --- a/asm/d/a/d_a_alink/checkLightSwordMtrl__9daAlink_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_800D0E08: -/* 800D0E08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D0E0C 7C 08 02 A6 */ mflr r0 -/* 800D0E10 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D0E14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D0E18 7C 7F 1B 78 */ mr r31, r3 -/* 800D0E1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D0E20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D0E24 88 03 00 14 */ lbz r0, 0x14(r3) -/* 800D0E28 28 00 00 49 */ cmplwi r0, 0x49 -/* 800D0E2C 40 82 00 4C */ bne lbl_800D0E78 -/* 800D0E30 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 800D0E34 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 800D0E38 7D 89 03 A6 */ mtctr r12 -/* 800D0E3C 4E 80 04 21 */ bctrl -/* 800D0E40 88 03 00 09 */ lbz r0, 9(r3) -/* 800D0E44 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f -/* 800D0E48 2C 00 00 17 */ cmpwi r0, 0x17 -/* 800D0E4C 41 82 00 1C */ beq lbl_800D0E68 -/* 800D0E50 3C 60 80 0D */ lis r3, daAlink_searchNightStalker__FP10fopAc_ac_cPv@ha /* 0x800D0D38@ha */ -/* 800D0E54 38 63 0D 38 */ addi r3, r3, daAlink_searchNightStalker__FP10fopAc_ac_cPv@l /* 0x800D0D38@l */ -/* 800D0E58 38 80 00 00 */ li r4, 0 -/* 800D0E5C 4B F4 89 9D */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 800D0E60 28 03 00 00 */ cmplwi r3, 0 -/* 800D0E64 41 82 00 14 */ beq lbl_800D0E78 -lbl_800D0E68: -/* 800D0E68 80 1F 05 7C */ lwz r0, 0x57c(r31) -/* 800D0E6C 64 00 00 10 */ oris r0, r0, 0x10 -/* 800D0E70 90 1F 05 7C */ stw r0, 0x57c(r31) -/* 800D0E74 48 00 00 10 */ b lbl_800D0E84 -lbl_800D0E78: -/* 800D0E78 80 1F 05 7C */ lwz r0, 0x57c(r31) -/* 800D0E7C 54 00 03 14 */ rlwinm r0, r0, 0, 0xc, 0xa -/* 800D0E80 90 1F 05 7C */ stw r0, 0x57c(r31) -lbl_800D0E84: -/* 800D0E84 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D0E88 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D0E8C 7C 08 03 A6 */ mtlr r0 -/* 800D0E90 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D0E94 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkMagicArmorNoDamage__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkMagicArmorNoDamage__9daAlink_cFv.s deleted file mode 100644 index ae96f50b73f..00000000000 --- a/asm/d/a/d_a_alink/checkMagicArmorNoDamage__9daAlink_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800D77C8: -/* 800D77C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D77CC 7C 08 02 A6 */ mflr r0 -/* 800D77D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D77D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D77D8 93 C1 00 08 */ stw r30, 8(r1) -/* 800D77DC 7C 7E 1B 78 */ mr r30, r3 -/* 800D77E0 3B E0 00 00 */ li r31, 0 -/* 800D77E4 4B FE 86 19 */ bl checkMagicArmorWearAbility__9daAlink_cCFv -/* 800D77E8 2C 03 00 00 */ cmpwi r3, 0 -/* 800D77EC 41 82 00 18 */ beq lbl_800D7804 -/* 800D77F0 7F C3 F3 78 */ mr r3, r30 -/* 800D77F4 4B FE 3C 15 */ bl checkMagicArmorHeavy__9daAlink_cCFv -/* 800D77F8 2C 03 00 00 */ cmpwi r3, 0 -/* 800D77FC 40 82 00 08 */ bne lbl_800D7804 -/* 800D7800 3B E0 00 01 */ li r31, 1 -lbl_800D7804: -/* 800D7804 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800D7808 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D780C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D7810 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D7814 7C 08 03 A6 */ mtlr r0 -/* 800D7818 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D781C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkMagicArmorWearAbility__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkMagicArmorWearAbility__9daAlink_cCFv.s deleted file mode 100644 index 545d43b8a70..00000000000 --- a/asm/d/a/d_a_alink/checkMagicArmorWearAbility__9daAlink_cCFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_800BFDFC: -/* 800BFDFC 38 A0 00 00 */ li r5, 0 -/* 800BFE00 7C A6 2B 78 */ mr r6, r5 -/* 800BFE04 80 03 05 74 */ lwz r0, 0x574(r3) -/* 800BFE08 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800BFE0C 40 82 00 1C */ bne lbl_800BFE28 -/* 800BFE10 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800BFE14 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800BFE18 88 04 00 13 */ lbz r0, 0x13(r4) -/* 800BFE1C 28 00 00 30 */ cmplwi r0, 0x30 -/* 800BFE20 40 82 00 08 */ bne lbl_800BFE28 -/* 800BFE24 38 C0 00 01 */ li r6, 1 -lbl_800BFE28: -/* 800BFE28 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 800BFE2C 41 82 00 14 */ beq lbl_800BFE40 -/* 800BFE30 80 03 05 78 */ lwz r0, 0x578(r3) -/* 800BFE34 54 00 03 19 */ rlwinm. r0, r0, 0, 0xc, 0xc -/* 800BFE38 40 82 00 08 */ bne lbl_800BFE40 -/* 800BFE3C 38 A0 00 01 */ li r5, 1 -lbl_800BFE40: -/* 800BFE40 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 800BFE44 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkMiddleBossGoronRoom__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkMiddleBossGoronRoom__9daAlink_cFv.s deleted file mode 100644 index 1cae1169fc6..00000000000 --- a/asm/d/a/d_a_alink/checkMiddleBossGoronRoom__9daAlink_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D6DC4: -/* 800D6DC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D6DC8 7C 08 02 A6 */ mflr r0 -/* 800D6DCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D6DD0 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 800D6DD4 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 800D6DD8 38 63 00 3B */ addi r3, r3, 0x3b -/* 800D6DDC 4B FC 6C 85 */ bl checkStageName__9daAlink_cFPCc -/* 800D6DE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D6DE4 7C 08 03 A6 */ mtlr r0 -/* 800D6DE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D6DEC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkMidnaDisappearMode__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkMidnaDisappearMode__9daAlink_cCFv.s deleted file mode 100644 index 883b6425e8c..00000000000 --- a/asm/d/a/d_a_alink/checkMidnaDisappearMode__9daAlink_cCFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_801371A0: -/* 801371A0 38 A0 00 00 */ li r5, 0 -/* 801371A4 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 801371A8 28 00 01 33 */ cmplwi r0, 0x133 -/* 801371AC 41 82 00 44 */ beq lbl_801371F0 -/* 801371B0 80 03 05 74 */ lwz r0, 0x574(r3) -/* 801371B4 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 801371B8 41 82 00 3C */ beq lbl_801371F4 -/* 801371BC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801371C0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801371C4 80 84 5F 18 */ lwz r4, 0x5f18(r4) -/* 801371C8 54 80 01 09 */ rlwinm. r0, r4, 0, 4, 4 -/* 801371CC 41 82 00 28 */ beq lbl_801371F4 -/* 801371D0 54 80 06 F7 */ rlwinm. r0, r4, 0, 0x1b, 0x1b -/* 801371D4 40 82 00 20 */ bne lbl_801371F4 -/* 801371D8 80 63 27 EC */ lwz r3, 0x27ec(r3) -/* 801371DC 28 03 00 00 */ cmplwi r3, 0 -/* 801371E0 41 82 00 10 */ beq lbl_801371F0 -/* 801371E4 80 03 05 5C */ lwz r0, 0x55c(r3) -/* 801371E8 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 801371EC 40 82 00 08 */ bne lbl_801371F4 -lbl_801371F0: -/* 801371F0 38 A0 00 01 */ li r5, 1 -lbl_801371F4: -/* 801371F4 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 801371F8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNextActionBoard__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkNextActionBoard__9daAlink_cFv.s deleted file mode 100644 index 8bc7262c91c..00000000000 --- a/asm/d/a/d_a_alink/checkNextActionBoard__9daAlink_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_8010658C: -/* 8010658C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80106590 7C 08 02 A6 */ mflr r0 -/* 80106594 90 01 00 14 */ stw r0, 0x14(r1) -/* 80106598 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8010659C 7C 7F 1B 78 */ mr r31, r3 -/* 801065A0 4B FB 37 8D */ bl checkNextActionFromButton__9daAlink_cFv -/* 801065A4 2C 03 00 00 */ cmpwi r3, 0 -/* 801065A8 41 82 00 0C */ beq lbl_801065B4 -/* 801065AC 38 60 00 01 */ li r3, 1 -/* 801065B0 48 00 00 54 */ b lbl_80106604 -lbl_801065B4: -/* 801065B4 88 1F 2F 8E */ lbz r0, 0x2f8e(r31) -/* 801065B8 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 801065BC 40 82 00 18 */ bne lbl_801065D4 -/* 801065C0 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) -/* 801065C4 28 00 00 A8 */ cmplwi r0, 0xa8 -/* 801065C8 41 82 00 28 */ beq lbl_801065F0 -/* 801065CC 28 00 00 A9 */ cmplwi r0, 0xa9 -/* 801065D0 41 82 00 20 */ beq lbl_801065F0 -lbl_801065D4: -/* 801065D4 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) -/* 801065D8 28 00 00 AC */ cmplwi r0, 0xac -/* 801065DC 41 82 00 14 */ beq lbl_801065F0 -/* 801065E0 28 00 00 A8 */ cmplwi r0, 0xa8 -/* 801065E4 41 82 00 0C */ beq lbl_801065F0 -/* 801065E8 28 00 00 AA */ cmplwi r0, 0xaa -/* 801065EC 40 82 00 0C */ bne lbl_801065F8 -lbl_801065F0: -/* 801065F0 38 60 00 00 */ li r3, 0 -/* 801065F4 48 00 00 10 */ b lbl_80106604 -lbl_801065F8: -/* 801065F8 7F E3 FB 78 */ mr r3, r31 -/* 801065FC 38 80 00 00 */ li r4, 0 -/* 80106600 48 00 04 39 */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c -lbl_80106604: -/* 80106604 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80106608 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8010660C 7C 08 03 A6 */ mtlr r0 -/* 80106610 38 21 00 10 */ addi r1, r1, 0x10 -/* 80106614 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNextActionBoomerang__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkNextActionBoomerang__9daAlink_cFv.s deleted file mode 100644 index 9f6bde27e4b..00000000000 --- a/asm/d/a/d_a_alink/checkNextActionBoomerang__9daAlink_cFv.s +++ /dev/null @@ -1,120 +0,0 @@ -lbl_800E0BE4: -/* 800E0BE4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800E0BE8 7C 08 02 A6 */ mflr r0 -/* 800E0BEC 90 01 00 24 */ stw r0, 0x24(r1) -/* 800E0BF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E0BF4 48 28 15 E9 */ bl _savegpr_29 -/* 800E0BF8 7C 7F 1B 78 */ mr r31, r3 -/* 800E0BFC A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800E0C00 28 00 00 52 */ cmplwi r0, 0x52 -/* 800E0C04 40 82 00 20 */ bne lbl_800E0C24 -/* 800E0C08 C0 3F 20 58 */ lfs f1, 0x2058(r31) -/* 800E0C0C 3C 60 80 39 */ lis r3, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E0C10 38 63 E6 C8 */ addi r3, r3, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E0C14 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 800E0C18 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800E0C1C 4C 40 13 82 */ cror 2, 0, 2 -/* 800E0C20 41 82 00 10 */ beq lbl_800E0C30 -lbl_800E0C24: -/* 800E0C24 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800E0C28 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 800E0C2C 41 82 00 0C */ beq lbl_800E0C38 -lbl_800E0C30: -/* 800E0C30 38 60 00 00 */ li r3, 0 -/* 800E0C34 48 00 01 40 */ b lbl_800E0D74 -lbl_800E0C38: -/* 800E0C38 A8 7F 30 8E */ lha r3, 0x308e(r31) -/* 800E0C3C 2C 03 00 00 */ cmpwi r3, 0 -/* 800E0C40 41 82 00 0C */ beq lbl_800E0C4C -/* 800E0C44 38 03 FF FF */ addi r0, r3, -1 -/* 800E0C48 B0 1F 30 8E */ sth r0, 0x308e(r31) -lbl_800E0C4C: -/* 800E0C4C 7F E3 FB 78 */ mr r3, r31 -/* 800E0C50 4B FF F7 F1 */ bl checkBoomerangAnime__9daAlink_cCFv -/* 800E0C54 2C 03 00 00 */ cmpwi r3, 0 -/* 800E0C58 40 82 00 4C */ bne lbl_800E0CA4 -/* 800E0C5C 7F E3 FB 78 */ mr r3, r31 -/* 800E0C60 4B FF F8 FD */ bl setBoomerangReadyAnime__9daAlink_cFv -/* 800E0C64 7F E3 FB 78 */ mr r3, r31 -/* 800E0C68 4B FD 65 01 */ bl setFastShotTimer__9daAlink_cFv -/* 800E0C6C 83 DF 27 E0 */ lwz r30, 0x27e0(r31) -/* 800E0C70 3B A0 00 01 */ li r29, 1 -/* 800E0C74 7F C3 F3 78 */ mr r3, r30 -/* 800E0C78 4B F9 2B 6D */ bl LockonTruth__12dAttention_cFv -/* 800E0C7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E0C80 40 82 00 14 */ bne lbl_800E0C94 -/* 800E0C84 80 1E 03 34 */ lwz r0, 0x334(r30) -/* 800E0C88 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 800E0C8C 40 82 00 08 */ bne lbl_800E0C94 -/* 800E0C90 3B A0 00 00 */ li r29, 0 -lbl_800E0C94: -/* 800E0C94 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 800E0C98 40 82 00 0C */ bne lbl_800E0CA4 -/* 800E0C9C A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800E0CA0 B0 1F 2F E4 */ sth r0, 0x2fe4(r31) -lbl_800E0CA4: -/* 800E0CA4 83 DF 27 E0 */ lwz r30, 0x27e0(r31) -/* 800E0CA8 3B A0 00 01 */ li r29, 1 -/* 800E0CAC 7F C3 F3 78 */ mr r3, r30 -/* 800E0CB0 4B F9 2B 35 */ bl LockonTruth__12dAttention_cFv -/* 800E0CB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E0CB8 40 82 00 14 */ bne lbl_800E0CCC -/* 800E0CBC 80 1E 03 34 */ lwz r0, 0x334(r30) -/* 800E0CC0 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 800E0CC4 40 82 00 08 */ bne lbl_800E0CCC -/* 800E0CC8 3B A0 00 00 */ li r29, 0 -lbl_800E0CCC: -/* 800E0CCC 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 800E0CD0 40 82 00 5C */ bne lbl_800E0D2C -/* 800E0CD4 A8 1F 30 8E */ lha r0, 0x308e(r31) -/* 800E0CD8 2C 00 00 00 */ cmpwi r0, 0 -/* 800E0CDC 40 82 00 50 */ bne lbl_800E0D2C -/* 800E0CE0 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800E0CE4 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 -/* 800E0CE8 41 82 00 38 */ beq lbl_800E0D20 -/* 800E0CEC 7F E3 FB 78 */ mr r3, r31 -/* 800E0CF0 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800E0CF4 81 8C 01 90 */ lwz r12, 0x190(r12) -/* 800E0CF8 7D 89 03 A6 */ mtctr r12 -/* 800E0CFC 4E 80 04 21 */ bctrl -/* 800E0D00 28 03 00 00 */ cmplwi r3, 0 -/* 800E0D04 41 82 00 10 */ beq lbl_800E0D14 -/* 800E0D08 7F E3 FB 78 */ mr r3, r31 -/* 800E0D0C 48 01 62 99 */ bl procCanoeBoomerangSubjectInit__9daAlink_cFv -/* 800E0D10 48 00 00 64 */ b lbl_800E0D74 -lbl_800E0D14: -/* 800E0D14 7F E3 FB 78 */ mr r3, r31 -/* 800E0D18 48 01 17 3D */ bl procHorseBoomerangSubjectInit__9daAlink_cFv -/* 800E0D1C 48 00 00 58 */ b lbl_800E0D74 -lbl_800E0D20: -/* 800E0D20 7F E3 FB 78 */ mr r3, r31 -/* 800E0D24 48 00 01 ED */ bl procBoomerangSubjectInit__9daAlink_cFv -/* 800E0D28 48 00 00 4C */ b lbl_800E0D74 -lbl_800E0D2C: -/* 800E0D2C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800E0D30 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 -/* 800E0D34 41 82 00 38 */ beq lbl_800E0D6C -/* 800E0D38 7F E3 FB 78 */ mr r3, r31 -/* 800E0D3C 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800E0D40 81 8C 01 90 */ lwz r12, 0x190(r12) -/* 800E0D44 7D 89 03 A6 */ mtctr r12 -/* 800E0D48 4E 80 04 21 */ bctrl -/* 800E0D4C 28 03 00 00 */ cmplwi r3, 0 -/* 800E0D50 41 82 00 10 */ beq lbl_800E0D60 -/* 800E0D54 7F E3 FB 78 */ mr r3, r31 -/* 800E0D58 48 01 63 99 */ bl procCanoeBoomerangMoveInit__9daAlink_cFv -/* 800E0D5C 48 00 00 18 */ b lbl_800E0D74 -lbl_800E0D60: -/* 800E0D60 7F E3 FB 78 */ mr r3, r31 -/* 800E0D64 48 01 18 51 */ bl procHorseBoomerangMoveInit__9daAlink_cFv -/* 800E0D68 48 00 00 0C */ b lbl_800E0D74 -lbl_800E0D6C: -/* 800E0D6C 7F E3 FB 78 */ mr r3, r31 -/* 800E0D70 48 00 02 F1 */ bl procBoomerangMoveInit__9daAlink_cFv -lbl_800E0D74: -/* 800E0D74 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E0D78 48 28 14 B1 */ bl _restgpr_29 -/* 800E0D7C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800E0D80 7C 08 03 A6 */ mtlr r0 -/* 800E0D84 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E0D88 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNextActionCanoe__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkNextActionCanoe__9daAlink_cFv.s deleted file mode 100644 index ef8ffa404fb..00000000000 --- a/asm/d/a/d_a_alink/checkNextActionCanoe__9daAlink_cFv.s +++ /dev/null @@ -1,88 +0,0 @@ -lbl_800F4924: -/* 800F4924 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800F4928 7C 08 02 A6 */ mflr r0 -/* 800F492C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800F4930 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800F4934 7C 7F 1B 78 */ mr r31, r3 -/* 800F4938 4B FF F4 21 */ bl checkFishingRodAndLureItem__9daAlink_cCFv -/* 800F493C 2C 03 00 00 */ cmpwi r3, 0 -/* 800F4940 41 82 00 1C */ beq lbl_800F495C -/* 800F4944 80 7F 28 28 */ lwz r3, 0x2828(r31) -/* 800F4948 28 03 00 00 */ cmplwi r3, 0 -/* 800F494C 41 82 00 10 */ beq lbl_800F495C -/* 800F4950 88 03 15 14 */ lbz r0, 0x1514(r3) -/* 800F4954 28 00 00 00 */ cmplwi r0, 0 -/* 800F4958 40 82 00 1C */ bne lbl_800F4974 -lbl_800F495C: -/* 800F495C 7F E3 FB 78 */ mr r3, r31 -/* 800F4960 4B FC 53 CD */ bl checkNextActionFromButton__9daAlink_cFv -/* 800F4964 2C 03 00 00 */ cmpwi r3, 0 -/* 800F4968 41 82 00 0C */ beq lbl_800F4974 -/* 800F496C 38 60 00 01 */ li r3, 1 -/* 800F4970 48 00 00 CC */ b lbl_800F4A3C -lbl_800F4974: -/* 800F4974 7F E3 FB 78 */ mr r3, r31 -/* 800F4978 4B FE A0 71 */ bl checkBowAnime__9daAlink_cCFv -/* 800F497C 2C 03 00 00 */ cmpwi r3, 0 -/* 800F4980 41 82 00 10 */ beq lbl_800F4990 -/* 800F4984 7F E3 FB 78 */ mr r3, r31 -/* 800F4988 4B FE AE 8D */ bl checkNextActionBow__9daAlink_cFv -/* 800F498C 48 00 00 B0 */ b lbl_800F4A3C -lbl_800F4990: -/* 800F4990 7F E3 FB 78 */ mr r3, r31 -/* 800F4994 4B FE BA AD */ bl checkBoomerangAnime__9daAlink_cCFv -/* 800F4998 2C 03 00 00 */ cmpwi r3, 0 -/* 800F499C 41 82 00 10 */ beq lbl_800F49AC -/* 800F49A0 7F E3 FB 78 */ mr r3, r31 -/* 800F49A4 4B FE C2 41 */ bl checkNextActionBoomerang__9daAlink_cFv -/* 800F49A8 48 00 00 94 */ b lbl_800F4A3C -lbl_800F49AC: -/* 800F49AC 38 60 00 00 */ li r3, 0 -/* 800F49B0 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 800F49B4 28 00 01 8D */ cmplwi r0, 0x18d -/* 800F49B8 41 82 00 10 */ beq lbl_800F49C8 -/* 800F49BC 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800F49C0 28 00 01 8C */ cmplwi r0, 0x18c -/* 800F49C4 40 82 00 08 */ bne lbl_800F49CC -lbl_800F49C8: -/* 800F49C8 38 60 00 01 */ li r3, 1 -lbl_800F49CC: -/* 800F49CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800F49D0 41 82 00 10 */ beq lbl_800F49E0 -/* 800F49D4 7F E3 FB 78 */ mr r3, r31 -/* 800F49D8 48 01 4B F1 */ bl checkNextActionHookshot__9daAlink_cFv -/* 800F49DC 48 00 00 60 */ b lbl_800F4A3C -lbl_800F49E0: -/* 800F49E0 7F E3 FB 78 */ mr r3, r31 -/* 800F49E4 4B FE F2 B9 */ bl checkGrabAnimeAndThrow__9daAlink_cCFv -/* 800F49E8 2C 03 00 00 */ cmpwi r3, 0 -/* 800F49EC 41 82 00 10 */ beq lbl_800F49FC -/* 800F49F0 7F E3 FB 78 */ mr r3, r31 -/* 800F49F4 48 00 24 BD */ bl procCanoeGrabMoveInit__9daAlink_cFv -/* 800F49F8 48 00 00 44 */ b lbl_800F4A3C -lbl_800F49FC: -/* 800F49FC 38 60 00 00 */ li r3, 0 -/* 800F4A00 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 800F4A04 28 00 00 5D */ cmplwi r0, 0x5d -/* 800F4A08 41 82 00 10 */ beq lbl_800F4A18 -/* 800F4A0C 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800F4A10 28 00 02 60 */ cmplwi r0, 0x260 -/* 800F4A14 40 82 00 08 */ bne lbl_800F4A1C -lbl_800F4A18: -/* 800F4A18 38 60 00 01 */ li r3, 1 -lbl_800F4A1C: -/* 800F4A1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800F4A20 41 82 00 10 */ beq lbl_800F4A30 -/* 800F4A24 7F E3 FB 78 */ mr r3, r31 -/* 800F4A28 48 00 1A 3D */ bl procCanoeFishingWaitInit__9daAlink_cFv -/* 800F4A2C 48 00 00 10 */ b lbl_800F4A3C -lbl_800F4A30: -/* 800F4A30 7F E3 FB 78 */ mr r3, r31 -/* 800F4A34 38 80 00 00 */ li r4, 0 -/* 800F4A38 48 00 07 AD */ bl procCanoeWaitInit__9daAlink_cFi -lbl_800F4A3C: -/* 800F4A3C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800F4A40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800F4A44 7C 08 03 A6 */ mtlr r0 -/* 800F4A48 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F4A4C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNextActionCopyRod__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkNextActionCopyRod__9daAlink_cFv.s deleted file mode 100644 index ede252ac719..00000000000 --- a/asm/d/a/d_a_alink/checkNextActionCopyRod__9daAlink_cFv.s +++ /dev/null @@ -1,84 +0,0 @@ -lbl_800E1C44: -/* 800E1C44 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800E1C48 7C 08 02 A6 */ mflr r0 -/* 800E1C4C 90 01 00 24 */ stw r0, 0x24(r1) -/* 800E1C50 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E1C54 48 28 05 89 */ bl _savegpr_29 -/* 800E1C58 7C 7F 1B 78 */ mr r31, r3 -/* 800E1C5C A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800E1C60 28 00 00 52 */ cmplwi r0, 0x52 -/* 800E1C64 40 82 00 20 */ bne lbl_800E1C84 -/* 800E1C68 C0 3F 20 58 */ lfs f1, 0x2058(r31) -/* 800E1C6C 3C 60 80 39 */ lis r3, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E1C70 38 63 E6 C8 */ addi r3, r3, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E1C74 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 800E1C78 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800E1C7C 4C 40 13 82 */ cror 2, 0, 2 -/* 800E1C80 41 82 00 10 */ beq lbl_800E1C90 -lbl_800E1C84: -/* 800E1C84 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800E1C88 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf -/* 800E1C8C 41 82 00 0C */ beq lbl_800E1C98 -lbl_800E1C90: -/* 800E1C90 38 60 00 00 */ li r3, 0 -/* 800E1C94 48 00 00 C0 */ b lbl_800E1D54 -lbl_800E1C98: -/* 800E1C98 A8 7F 30 8E */ lha r3, 0x308e(r31) -/* 800E1C9C 2C 03 00 00 */ cmpwi r3, 0 -/* 800E1CA0 41 82 00 0C */ beq lbl_800E1CAC -/* 800E1CA4 38 03 FF FF */ addi r0, r3, -1 -/* 800E1CA8 B0 1F 30 8E */ sth r0, 0x308e(r31) -lbl_800E1CAC: -/* 800E1CAC 7F E3 FB 78 */ mr r3, r31 -/* 800E1CB0 4B FF F8 81 */ bl checkCopyRodAnime__9daAlink_cCFv -/* 800E1CB4 2C 03 00 00 */ cmpwi r3, 0 -/* 800E1CB8 40 82 00 4C */ bne lbl_800E1D04 -/* 800E1CBC 7F E3 FB 78 */ mr r3, r31 -/* 800E1CC0 4B FF FB 81 */ bl setCopyRodReadyAnime__9daAlink_cFv -/* 800E1CC4 7F E3 FB 78 */ mr r3, r31 -/* 800E1CC8 4B FD 54 A1 */ bl setFastShotTimer__9daAlink_cFv -/* 800E1CCC 83 DF 27 E0 */ lwz r30, 0x27e0(r31) -/* 800E1CD0 3B A0 00 01 */ li r29, 1 -/* 800E1CD4 7F C3 F3 78 */ mr r3, r30 -/* 800E1CD8 4B F9 1B 0D */ bl LockonTruth__12dAttention_cFv -/* 800E1CDC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E1CE0 40 82 00 14 */ bne lbl_800E1CF4 -/* 800E1CE4 80 1E 03 34 */ lwz r0, 0x334(r30) -/* 800E1CE8 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 800E1CEC 40 82 00 08 */ bne lbl_800E1CF4 -/* 800E1CF0 3B A0 00 00 */ li r29, 0 -lbl_800E1CF4: -/* 800E1CF4 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 800E1CF8 40 82 00 0C */ bne lbl_800E1D04 -/* 800E1CFC A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800E1D00 B0 1F 2F E4 */ sth r0, 0x2fe4(r31) -lbl_800E1D04: -/* 800E1D04 83 DF 27 E0 */ lwz r30, 0x27e0(r31) -/* 800E1D08 3B A0 00 01 */ li r29, 1 -/* 800E1D0C 7F C3 F3 78 */ mr r3, r30 -/* 800E1D10 4B F9 1A D5 */ bl LockonTruth__12dAttention_cFv -/* 800E1D14 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E1D18 40 82 00 14 */ bne lbl_800E1D2C -/* 800E1D1C 80 1E 03 34 */ lwz r0, 0x334(r30) -/* 800E1D20 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 800E1D24 40 82 00 08 */ bne lbl_800E1D2C -/* 800E1D28 3B A0 00 00 */ li r29, 0 -lbl_800E1D2C: -/* 800E1D2C 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 800E1D30 40 82 00 1C */ bne lbl_800E1D4C -/* 800E1D34 A8 1F 30 8E */ lha r0, 0x308e(r31) -/* 800E1D38 2C 00 00 00 */ cmpwi r0, 0 -/* 800E1D3C 40 82 00 10 */ bne lbl_800E1D4C -/* 800E1D40 7F E3 FB 78 */ mr r3, r31 -/* 800E1D44 48 00 00 DD */ bl procCopyRodSubjectInit__9daAlink_cFv -/* 800E1D48 48 00 00 0C */ b lbl_800E1D54 -lbl_800E1D4C: -/* 800E1D4C 7F E3 FB 78 */ mr r3, r31 -/* 800E1D50 48 00 02 19 */ bl procCopyRodMoveInit__9daAlink_cFv -lbl_800E1D54: -/* 800E1D54 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E1D58 48 28 04 D1 */ bl _restgpr_29 -/* 800E1D5C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800E1D60 7C 08 03 A6 */ mtlr r0 -/* 800E1D64 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E1D68 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNextActionFromButton__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkNextActionFromButton__9daAlink_cFv.s deleted file mode 100644 index 2a4b0cd9eba..00000000000 --- a/asm/d/a/d_a_alink/checkNextActionFromButton__9daAlink_cFv.s +++ /dev/null @@ -1,154 +0,0 @@ -lbl_800B9D2C: -/* 800B9D2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B9D30 7C 08 02 A6 */ mflr r0 -/* 800B9D34 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B9D38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B9D3C 7C 7F 1B 78 */ mr r31, r3 -/* 800B9D40 4B FF D3 51 */ bl checkItemChangeAutoAction__9daAlink_cFv -/* 800B9D44 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9D48 41 82 00 0C */ beq lbl_800B9D54 -/* 800B9D4C 38 60 00 01 */ li r3, 1 -/* 800B9D50 48 00 01 EC */ b lbl_800B9F3C -lbl_800B9D54: -/* 800B9D54 7F E3 FB 78 */ mr r3, r31 -/* 800B9D58 4B FF D8 95 */ bl checkUpperItemAction__9daAlink_cFv -/* 800B9D5C 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9D60 41 82 00 0C */ beq lbl_800B9D6C -/* 800B9D64 38 60 00 01 */ li r3, 1 -/* 800B9D68 48 00 01 D4 */ b lbl_800B9F3C -lbl_800B9D6C: -/* 800B9D6C A0 9F 1F BC */ lhz r4, 0x1fbc(r31) -/* 800B9D70 28 04 02 62 */ cmplwi r4, 0x262 -/* 800B9D74 40 82 00 0C */ bne lbl_800B9D80 -/* 800B9D78 38 60 00 00 */ li r3, 0 -/* 800B9D7C 48 00 01 C0 */ b lbl_800B9F3C -lbl_800B9D80: -/* 800B9D80 80 7F 31 A0 */ lwz r3, 0x31a0(r31) -/* 800B9D84 54 60 05 6B */ rlwinm. r0, r3, 0, 0x15, 0x15 -/* 800B9D88 41 82 00 50 */ beq lbl_800B9DD8 -/* 800B9D8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B9D90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B9D94 88 03 5E 24 */ lbz r0, 0x5e24(r3) -/* 800B9D98 28 00 00 00 */ cmplwi r0, 0 -/* 800B9D9C 40 82 00 FC */ bne lbl_800B9E98 -/* 800B9DA0 7F E3 FB 78 */ mr r3, r31 -/* 800B9DA4 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800B9DA8 81 8C 01 90 */ lwz r12, 0x190(r12) -/* 800B9DAC 7D 89 03 A6 */ mtctr r12 -/* 800B9DB0 4E 80 04 21 */ bctrl -/* 800B9DB4 28 03 00 00 */ cmplwi r3, 0 -/* 800B9DB8 41 82 00 E0 */ beq lbl_800B9E98 -/* 800B9DBC A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800B9DC0 28 00 01 05 */ cmplwi r0, 0x105 -/* 800B9DC4 40 82 00 D4 */ bne lbl_800B9E98 -/* 800B9DC8 7F E3 FB 78 */ mr r3, r31 -/* 800B9DCC 38 80 00 04 */ li r4, 4 -/* 800B9DD0 4B FF 94 81 */ bl setDoStatus__9daAlink_cFUc -/* 800B9DD4 48 00 00 C4 */ b lbl_800B9E98 -lbl_800B9DD8: -/* 800B9DD8 54 60 03 5B */ rlwinm. r0, r3, 0, 0xd, 0xd -/* 800B9DDC 40 82 00 BC */ bne lbl_800B9E98 -/* 800B9DE0 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800B9DE4 54 05 01 8D */ rlwinm. r5, r0, 0, 6, 6 -/* 800B9DE8 41 82 00 28 */ beq lbl_800B9E10 -/* 800B9DEC 38 60 00 00 */ li r3, 0 -/* 800B9DF0 54 80 04 3E */ clrlwi r0, r4, 0x10 -/* 800B9DF4 28 00 02 DA */ cmplwi r0, 0x2da -/* 800B9DF8 41 82 00 0C */ beq lbl_800B9E04 -/* 800B9DFC 28 00 02 DB */ cmplwi r0, 0x2db -/* 800B9E00 40 82 00 08 */ bne lbl_800B9E08 -lbl_800B9E04: -/* 800B9E04 38 60 00 01 */ li r3, 1 -lbl_800B9E08: -/* 800B9E08 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800B9E0C 41 82 00 64 */ beq lbl_800B9E70 -lbl_800B9E10: -/* 800B9E10 28 05 00 00 */ cmplwi r5, 0 -/* 800B9E14 40 82 00 7C */ bne lbl_800B9E90 -/* 800B9E18 7F E3 FB 78 */ mr r3, r31 -/* 800B9E1C 48 02 75 59 */ bl getCopyRodControllActor__9daAlink_cFv -/* 800B9E20 28 03 00 00 */ cmplwi r3, 0 -/* 800B9E24 40 82 00 6C */ bne lbl_800B9E90 -/* 800B9E28 7F E3 FB 78 */ mr r3, r31 -/* 800B9E2C 4B FF F5 15 */ bl checkEquipAnime__9daAlink_cCFv -/* 800B9E30 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9E34 40 82 00 3C */ bne lbl_800B9E70 -/* 800B9E38 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800B9E3C 54 00 01 CF */ rlwinm. r0, r0, 0, 7, 7 -/* 800B9E40 40 82 00 30 */ bne lbl_800B9E70 -/* 800B9E44 7F E3 FB 78 */ mr r3, r31 -/* 800B9E48 48 02 2F A9 */ bl checkUpperGuardAnime__9daAlink_cCFv -/* 800B9E4C 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9E50 40 82 00 20 */ bne lbl_800B9E70 -/* 800B9E54 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 800B9E58 28 00 01 9C */ cmplwi r0, 0x19c -/* 800B9E5C 41 82 00 14 */ beq lbl_800B9E70 -/* 800B9E60 7F E3 FB 78 */ mr r3, r31 -/* 800B9E64 4B FF F3 F1 */ bl checkNoUpperAnime__9daAlink_cCFv -/* 800B9E68 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9E6C 41 82 00 24 */ beq lbl_800B9E90 -lbl_800B9E70: -/* 800B9E70 7F E3 FB 78 */ mr r3, r31 -/* 800B9E74 4B FF B4 11 */ bl decideDoStatus__9daAlink_cFv -/* 800B9E78 7F E3 FB 78 */ mr r3, r31 -/* 800B9E7C 4B FF E4 F9 */ bl checkNormalAction__9daAlink_cFv -/* 800B9E80 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9E84 41 82 00 14 */ beq lbl_800B9E98 -/* 800B9E88 38 60 00 01 */ li r3, 1 -/* 800B9E8C 48 00 00 B0 */ b lbl_800B9F3C -lbl_800B9E90: -/* 800B9E90 7F E3 FB 78 */ mr r3, r31 -/* 800B9E94 4B FF AC E9 */ bl decideCommonDoStatus__9daAlink_cFv -lbl_800B9E98: -/* 800B9E98 7F E3 FB 78 */ mr r3, r31 -/* 800B9E9C 38 80 00 00 */ li r4, 0 -/* 800B9EA0 4B FF D3 4D */ bl cancelUpperItemReadyAnime__9daAlink_cFi -/* 800B9EA4 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9EA8 41 82 00 0C */ beq lbl_800B9EB4 -/* 800B9EAC 38 60 00 01 */ li r3, 1 -/* 800B9EB0 48 00 00 8C */ b lbl_800B9F3C -lbl_800B9EB4: -/* 800B9EB4 7F E3 FB 78 */ mr r3, r31 -/* 800B9EB8 4B FF EA D1 */ bl checkItemAction__9daAlink_cFv -/* 800B9EBC 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9EC0 41 82 00 0C */ beq lbl_800B9ECC -/* 800B9EC4 38 60 00 01 */ li r3, 1 -/* 800B9EC8 48 00 00 74 */ b lbl_800B9F3C -lbl_800B9ECC: -/* 800B9ECC 80 9F 31 A0 */ lwz r4, 0x31a0(r31) -/* 800B9ED0 3C 60 00 04 */ lis r3, 0x0004 /* 0x00040400@ha */ -/* 800B9ED4 38 03 04 00 */ addi r0, r3, 0x0400 /* 0x00040400@l */ -/* 800B9ED8 7C 80 00 39 */ and. r0, r4, r0 -/* 800B9EDC 40 82 00 34 */ bne lbl_800B9F10 -/* 800B9EE0 7F E3 FB 78 */ mr r3, r31 -/* 800B9EE4 4B FF F1 2D */ bl checkRAction__9daAlink_cFv -/* 800B9EE8 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9EEC 41 82 00 0C */ beq lbl_800B9EF8 -/* 800B9EF0 38 60 00 01 */ li r3, 1 -/* 800B9EF4 48 00 00 48 */ b lbl_800B9F3C -lbl_800B9EF8: -/* 800B9EF8 7F E3 FB 78 */ mr r3, r31 -/* 800B9EFC 4B FF F1 1D */ bl checkMoveDoAction__9daAlink_cFv -/* 800B9F00 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9F04 41 82 00 0C */ beq lbl_800B9F10 -/* 800B9F08 38 60 00 01 */ li r3, 1 -/* 800B9F0C 48 00 00 30 */ b lbl_800B9F3C -lbl_800B9F10: -/* 800B9F10 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800B9F14 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd -/* 800B9F18 40 82 00 1C */ bne lbl_800B9F34 -/* 800B9F1C 7F E3 FB 78 */ mr r3, r31 -/* 800B9F20 48 01 47 09 */ bl checkSubjectAction__9daAlink_cFv -/* 800B9F24 2C 03 00 00 */ cmpwi r3, 0 -/* 800B9F28 41 82 00 0C */ beq lbl_800B9F34 -/* 800B9F2C 38 60 00 01 */ li r3, 1 -/* 800B9F30 48 00 00 0C */ b lbl_800B9F3C -lbl_800B9F34: -/* 800B9F34 7F E3 FB 78 */ mr r3, r31 -/* 800B9F38 4B FF FA 15 */ bl checkItemChangeFromButton__9daAlink_cFv -lbl_800B9F3C: -/* 800B9F3C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B9F40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B9F44 7C 08 03 A6 */ mtlr r0 -/* 800B9F48 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B9F4C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNextActionFromCrouch__9daAlink_cFi.s b/asm/d/a/d_a_alink/checkNextActionFromCrouch__9daAlink_cFi.s deleted file mode 100644 index 9b65c3bcfdb..00000000000 --- a/asm/d/a/d_a_alink/checkNextActionFromCrouch__9daAlink_cFi.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_800BAF08: -/* 800BAF08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BAF0C 7C 08 02 A6 */ mflr r0 -/* 800BAF10 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BAF14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800BAF18 7C 7F 1B 78 */ mr r31, r3 -/* 800BAF1C 4B FF F1 B5 */ bl checkNextAction__9daAlink_cFi -/* 800BAF20 2C 03 00 00 */ cmpwi r3, 0 -/* 800BAF24 41 82 00 44 */ beq lbl_800BAF68 -/* 800BAF28 88 1F 2F 8C */ lbz r0, 0x2f8c(r31) -/* 800BAF2C 28 00 00 01 */ cmplwi r0, 1 -/* 800BAF30 41 82 00 14 */ beq lbl_800BAF44 -/* 800BAF34 28 00 00 02 */ cmplwi r0, 2 -/* 800BAF38 41 82 00 0C */ beq lbl_800BAF44 -/* 800BAF3C 28 00 00 03 */ cmplwi r0, 3 -/* 800BAF40 40 82 00 20 */ bne lbl_800BAF60 -lbl_800BAF44: -/* 800BAF44 80 7F 20 60 */ lwz r3, 0x2060(r31) -/* 800BAF48 3C 80 80 39 */ lis r4, m__20daAlinkHIO_crouch_c0@ha /* 0x8038E01C@ha */ -/* 800BAF4C 38 84 E0 1C */ addi r4, r4, m__20daAlinkHIO_crouch_c0@l /* 0x8038E01C@l */ -/* 800BAF50 C0 24 00 38 */ lfs f1, 0x38(r4) -/* 800BAF54 38 80 00 00 */ li r4, 0 -/* 800BAF58 38 A0 00 23 */ li r5, 0x23 -/* 800BAF5C 4B F5 48 ED */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs -lbl_800BAF60: -/* 800BAF60 38 60 00 01 */ li r3, 1 -/* 800BAF64 48 00 00 08 */ b lbl_800BAF6C -lbl_800BAF68: -/* 800BAF68 38 60 00 00 */ li r3, 0 -lbl_800BAF6C: -/* 800BAF6C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800BAF70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BAF74 7C 08 03 A6 */ mtlr r0 -/* 800BAF78 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BAF7C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNextActionIronBall__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkNextActionIronBall__9daAlink_cFv.s deleted file mode 100644 index 0babcee9825..00000000000 --- a/asm/d/a/d_a_alink/checkNextActionIronBall__9daAlink_cFv.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_801153F8: -/* 801153F8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801153FC 7C 08 02 A6 */ mflr r0 -/* 80115400 90 01 00 24 */ stw r0, 0x24(r1) -/* 80115404 39 61 00 20 */ addi r11, r1, 0x20 -/* 80115408 48 24 CD D5 */ bl _savegpr_29 -/* 8011540C 7C 7D 1B 78 */ mr r29, r3 -/* 80115410 A8 63 30 8E */ lha r3, 0x308e(r3) -/* 80115414 2C 03 00 00 */ cmpwi r3, 0 -/* 80115418 41 82 00 0C */ beq lbl_80115424 -/* 8011541C 38 03 FF FF */ addi r0, r3, -1 -/* 80115420 B0 1D 30 8E */ sth r0, 0x308e(r29) -lbl_80115424: -/* 80115424 7F A3 EB 78 */ mr r3, r29 -/* 80115428 4B FF FC BD */ bl checkIronBallAnime__9daAlink_cCFv -/* 8011542C 2C 03 00 00 */ cmpwi r3, 0 -/* 80115430 40 82 00 4C */ bne lbl_8011547C -/* 80115434 7F A3 EB 78 */ mr r3, r29 -/* 80115438 4B FF FC D5 */ bl setIronBallReadyAnime__9daAlink_cFv -/* 8011543C 7F A3 EB 78 */ mr r3, r29 -/* 80115440 4B FA 1D 29 */ bl setFastShotTimer__9daAlink_cFv -/* 80115444 83 FD 27 E0 */ lwz r31, 0x27e0(r29) -/* 80115448 3B C0 00 01 */ li r30, 1 -/* 8011544C 7F E3 FB 78 */ mr r3, r31 -/* 80115450 4B F5 E3 95 */ bl LockonTruth__12dAttention_cFv -/* 80115454 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80115458 40 82 00 14 */ bne lbl_8011546C -/* 8011545C 80 1F 03 34 */ lwz r0, 0x334(r31) -/* 80115460 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 80115464 40 82 00 08 */ bne lbl_8011546C -/* 80115468 3B C0 00 00 */ li r30, 0 -lbl_8011546C: -/* 8011546C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80115470 40 82 00 0C */ bne lbl_8011547C -/* 80115474 A8 1D 04 E6 */ lha r0, 0x4e6(r29) -/* 80115478 B0 1D 2F E4 */ sth r0, 0x2fe4(r29) -lbl_8011547C: -/* 8011547C 83 FD 27 E0 */ lwz r31, 0x27e0(r29) -/* 80115480 3B C0 00 01 */ li r30, 1 -/* 80115484 7F E3 FB 78 */ mr r3, r31 -/* 80115488 4B F5 E3 5D */ bl LockonTruth__12dAttention_cFv -/* 8011548C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80115490 40 82 00 14 */ bne lbl_801154A4 -/* 80115494 80 1F 03 34 */ lwz r0, 0x334(r31) -/* 80115498 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 8011549C 40 82 00 08 */ bne lbl_801154A4 -/* 801154A0 3B C0 00 00 */ li r30, 0 -lbl_801154A4: -/* 801154A4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 801154A8 40 82 00 1C */ bne lbl_801154C4 -/* 801154AC A8 1D 30 8E */ lha r0, 0x308e(r29) -/* 801154B0 2C 00 00 00 */ cmpwi r0, 0 -/* 801154B4 40 82 00 10 */ bne lbl_801154C4 -/* 801154B8 7F A3 EB 78 */ mr r3, r29 -/* 801154BC 48 00 00 29 */ bl procIronBallSubjectInit__9daAlink_cFv -/* 801154C0 48 00 00 0C */ b lbl_801154CC -lbl_801154C4: -/* 801154C4 7F A3 EB 78 */ mr r3, r29 -/* 801154C8 48 00 01 25 */ bl procIronBallMoveInit__9daAlink_cFv -lbl_801154CC: -/* 801154CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801154D0 48 24 CD 59 */ bl _restgpr_29 -/* 801154D4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801154D8 7C 08 03 A6 */ mtlr r0 -/* 801154DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801154E0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNextActionSwim__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkNextActionSwim__9daAlink_cFv.s deleted file mode 100644 index 2b34e01811f..00000000000 --- a/asm/d/a/d_a_alink/checkNextActionSwim__9daAlink_cFv.s +++ /dev/null @@ -1,95 +0,0 @@ -lbl_801029C8: -/* 801029C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801029CC 7C 08 02 A6 */ mflr r0 -/* 801029D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801029D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801029D8 7C 7F 1B 78 */ mr r31, r3 -/* 801029DC 48 00 15 49 */ bl checkSwimButtonMove__9daAlink_cFv -/* 801029E0 2C 03 00 00 */ cmpwi r3, 0 -/* 801029E4 41 82 00 1C */ beq lbl_80102A00 -/* 801029E8 7F E3 FB 78 */ mr r3, r31 -/* 801029EC 4B FF EF CD */ bl getZoraSwim__9daAlink_cCFv -/* 801029F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801029F4 41 82 00 0C */ beq lbl_80102A00 -/* 801029F8 38 00 00 1E */ li r0, 0x1e -/* 801029FC B0 1F 30 00 */ sth r0, 0x3000(r31) -lbl_80102A00: -/* 80102A00 7F E3 FB 78 */ mr r3, r31 -/* 80102A04 4B FB D3 AD */ bl checkZoraWearAbility__9daAlink_cCFv -/* 80102A08 2C 03 00 00 */ cmpwi r3, 0 -/* 80102A0C 41 82 00 1C */ beq lbl_80102A28 -/* 80102A10 7F E3 FB 78 */ mr r3, r31 -/* 80102A14 38 80 00 01 */ li r4, 1 -/* 80102A18 38 A0 00 01 */ li r5, 1 -/* 80102A1C 4B FB 8A 9D */ bl checkHeavyStateOn__9daAlink_cFii -/* 80102A20 2C 03 00 00 */ cmpwi r3, 0 -/* 80102A24 41 82 00 10 */ beq lbl_80102A34 -lbl_80102A28: -/* 80102A28 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 80102A2C 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 80102A30 41 82 00 0C */ beq lbl_80102A3C -lbl_80102A34: -/* 80102A34 7F E3 FB 78 */ mr r3, r31 -/* 80102A38 4B FB 1F D1 */ bl setTalkStatus__9daAlink_cFv -lbl_80102A3C: -/* 80102A3C 7F E3 FB 78 */ mr r3, r31 -/* 80102A40 38 80 00 01 */ li r4, 1 -/* 80102A44 4B FB 51 B5 */ bl orderTalk__9daAlink_cFi -/* 80102A48 2C 03 00 00 */ cmpwi r3, 0 -/* 80102A4C 41 82 00 0C */ beq lbl_80102A58 -/* 80102A50 38 60 00 01 */ li r3, 1 -/* 80102A54 48 00 00 B4 */ b lbl_80102B08 -lbl_80102A58: -/* 80102A58 80 7F 27 E4 */ lwz r3, 0x27e4(r31) -/* 80102A5C 28 03 00 00 */ cmplwi r3, 0 -/* 80102A60 41 82 00 50 */ beq lbl_80102AB0 -/* 80102A64 80 03 00 0C */ lwz r0, 0xc(r3) -/* 80102A68 28 00 00 07 */ cmplwi r0, 7 -/* 80102A6C 40 82 00 44 */ bne lbl_80102AB0 -/* 80102A70 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 80102A74 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 80102A78 41 82 00 38 */ beq lbl_80102AB0 -/* 80102A7C 80 7F 27 F4 */ lwz r3, 0x27f4(r31) -/* 80102A80 A8 03 00 08 */ lha r0, 8(r3) -/* 80102A84 2C 00 00 ED */ cmpwi r0, 0xed -/* 80102A88 40 82 00 28 */ bne lbl_80102AB0 -/* 80102A8C 7F E3 FB 78 */ mr r3, r31 -/* 80102A90 38 80 00 17 */ li r4, 0x17 -/* 80102A94 4B FB 07 BD */ bl setDoStatus__9daAlink_cFUc -/* 80102A98 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) -/* 80102A9C 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 80102AA0 41 82 00 60 */ beq lbl_80102B00 -/* 80102AA4 7F E3 FB 78 */ mr r3, r31 -/* 80102AA8 4B FF 1F A9 */ bl procCanoeRideInit__9daAlink_cFv -/* 80102AAC 48 00 00 5C */ b lbl_80102B08 -lbl_80102AB0: -/* 80102AB0 7F E3 FB 78 */ mr r3, r31 -/* 80102AB4 48 00 14 71 */ bl checkSwimButtonMove__9daAlink_cFv -/* 80102AB8 2C 03 00 00 */ cmpwi r3, 0 -/* 80102ABC 41 82 00 44 */ beq lbl_80102B00 -/* 80102AC0 7F E3 FB 78 */ mr r3, r31 -/* 80102AC4 48 00 14 D1 */ bl checkZoraSwimMove__9daAlink_cFv -/* 80102AC8 2C 03 00 00 */ cmpwi r3, 0 -/* 80102ACC 40 82 00 34 */ bne lbl_80102B00 -/* 80102AD0 7F E3 FB 78 */ mr r3, r31 -/* 80102AD4 48 00 14 0D */ bl checkSwimButtonAccept__9daAlink_cFv -/* 80102AD8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80102ADC 41 82 00 10 */ beq lbl_80102AEC -/* 80102AE0 7F E3 FB 78 */ mr r3, r31 -/* 80102AE4 48 00 1E 75 */ bl procSwimDiveInit__9daAlink_cFv -/* 80102AE8 48 00 00 20 */ b lbl_80102B08 -lbl_80102AEC: -/* 80102AEC 38 00 00 1E */ li r0, 0x1e -/* 80102AF0 B0 1F 30 00 */ sth r0, 0x3000(r31) -/* 80102AF4 7F E3 FB 78 */ mr r3, r31 -/* 80102AF8 48 00 1B 79 */ bl procSwimMoveInit__9daAlink_cFv -/* 80102AFC 48 00 00 0C */ b lbl_80102B08 -lbl_80102B00: -/* 80102B00 7F E3 FB 78 */ mr r3, r31 -/* 80102B04 4B FB 72 29 */ bl checkNextActionFromButton__9daAlink_cFv -lbl_80102B08: -/* 80102B08 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80102B0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80102B10 7C 08 03 A6 */ mtlr r0 -/* 80102B14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80102B18 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNextActionWolfFromLie__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkNextActionWolfFromLie__9daAlink_cFv.s deleted file mode 100644 index f5315a1eb84..00000000000 --- a/asm/d/a/d_a_alink/checkNextActionWolfFromLie__9daAlink_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_801372B4: -/* 801372B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801372B8 7C 08 02 A6 */ mflr r0 -/* 801372BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801372C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801372C4 7C 7F 1B 78 */ mr r31, r3 -/* 801372C8 38 80 00 00 */ li r4, 0 -/* 801372CC 4B FF 28 79 */ bl checkNextActionWolf__9daAlink_cFi -/* 801372D0 2C 03 00 00 */ cmpwi r3, 0 -/* 801372D4 41 82 00 44 */ beq lbl_80137318 -/* 801372D8 88 1F 2F 8C */ lbz r0, 0x2f8c(r31) -/* 801372DC 28 00 00 01 */ cmplwi r0, 1 -/* 801372E0 41 82 00 14 */ beq lbl_801372F4 -/* 801372E4 28 00 00 02 */ cmplwi r0, 2 -/* 801372E8 41 82 00 0C */ beq lbl_801372F4 -/* 801372EC 28 00 00 03 */ cmplwi r0, 3 -/* 801372F0 40 82 00 20 */ bne lbl_80137310 -lbl_801372F4: -/* 801372F4 80 7F 20 60 */ lwz r3, 0x2060(r31) -/* 801372F8 3C 80 80 39 */ lis r4, m__19daAlinkHIO_wlLie_c0@ha /* 0x8038F138@ha */ -/* 801372FC 38 84 F1 38 */ addi r4, r4, m__19daAlinkHIO_wlLie_c0@l /* 0x8038F138@l */ -/* 80137300 C0 24 00 30 */ lfs f1, 0x30(r4) -/* 80137304 38 80 00 00 */ li r4, 0 -/* 80137308 38 A0 00 28 */ li r5, 0x28 -/* 8013730C 4B ED 85 3D */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs -lbl_80137310: -/* 80137310 38 60 00 01 */ li r3, 1 -/* 80137314 48 00 00 08 */ b lbl_8013731C -lbl_80137318: -/* 80137318 38 60 00 00 */ li r3, 0 -lbl_8013731C: -/* 8013731C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80137320 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80137324 7C 08 03 A6 */ mtlr r0 -/* 80137328 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013732C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNoCollisionCorret__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkNoCollisionCorret__9daAlink_cFv.s deleted file mode 100644 index 9c99560454f..00000000000 --- a/asm/d/a/d_a_alink/checkNoCollisionCorret__9daAlink_cFv.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_800AA5E8: -/* 800AA5E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800AA5EC 7C 08 02 A6 */ mflr r0 -/* 800AA5F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800AA5F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800AA5F8 93 C1 00 08 */ stw r30, 8(r1) -/* 800AA5FC 7C 7E 1B 78 */ mr r30, r3 -/* 800AA600 80 A3 31 A0 */ lwz r5, 0x31a0(r3) -/* 800AA604 3C 80 00 01 */ lis r4, 0x0001 /* 0x00012800@ha */ -/* 800AA608 38 04 28 00 */ addi r0, r4, 0x2800 /* 0x00012800@l */ -/* 800AA60C 7C A0 00 39 */ and. r0, r5, r0 -/* 800AA610 40 82 00 80 */ bne lbl_800AA690 -/* 800AA614 A0 1E 06 04 */ lhz r0, 0x604(r30) -/* 800AA618 2C 00 00 01 */ cmpwi r0, 1 -/* 800AA61C 41 82 00 74 */ beq lbl_800AA690 -/* 800AA620 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) -/* 800AA624 28 00 00 B0 */ cmplwi r0, 0xb0 -/* 800AA628 41 82 00 68 */ beq lbl_800AA690 -/* 800AA62C 48 06 B5 F5 */ bl checkEventRun__9daAlink_cCFv -/* 800AA630 2C 03 00 00 */ cmpwi r3, 0 -/* 800AA634 41 82 00 50 */ beq lbl_800AA684 -/* 800AA638 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800AA63C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800AA640 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800AA644 4B F9 DD A5 */ bl getRunEventName__16dEvent_manager_cFv -/* 800AA648 3C 80 80 39 */ lis r4, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 800AA64C 38 84 20 94 */ addi r4, r4, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 800AA650 38 84 04 65 */ addi r4, r4, 0x465 -/* 800AA654 48 2B E3 41 */ bl strcmp -/* 800AA658 2C 03 00 00 */ cmpwi r3, 0 -/* 800AA65C 41 82 00 34 */ beq lbl_800AA690 -/* 800AA660 7F C3 F3 78 */ mr r3, r30 -/* 800AA664 4B F7 14 B1 */ bl fopAcM_getTalkEventPartner__FPC10fopAc_ac_c -/* 800AA668 28 03 00 00 */ cmplwi r3, 0 -/* 800AA66C 41 82 00 18 */ beq lbl_800AA684 -/* 800AA670 83 ED 8A 98 */ lwz r31, m_midnaActor__9daPy_py_c(r13) -/* 800AA674 7F C3 F3 78 */ mr r3, r30 -/* 800AA678 4B F7 14 9D */ bl fopAcM_getTalkEventPartner__FPC10fopAc_ac_c -/* 800AA67C 7C 03 F8 40 */ cmplw r3, r31 -/* 800AA680 41 82 00 10 */ beq lbl_800AA690 -lbl_800AA684: -/* 800AA684 A0 1E 00 F8 */ lhz r0, 0xf8(r30) -/* 800AA688 28 00 00 03 */ cmplwi r0, 3 -/* 800AA68C 40 82 00 0C */ bne lbl_800AA698 -lbl_800AA690: -/* 800AA690 38 60 00 01 */ li r3, 1 -/* 800AA694 48 00 00 08 */ b lbl_800AA69C -lbl_800AA698: -/* 800AA698 38 60 00 00 */ li r3, 0 -lbl_800AA69C: -/* 800AA69C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800AA6A0 83 C1 00 08 */ lwz r30, 8(r1) -/* 800AA6A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800AA6A8 7C 08 03 A6 */ mtlr r0 -/* 800AA6AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AA6B0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNoUpperAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkNoUpperAnime__9daAlink_cCFv.s deleted file mode 100644 index 03f0aeada68..00000000000 --- a/asm/d/a/d_a_alink/checkNoUpperAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_800B9254: -/* 800B9254 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B9258 7C 08 02 A6 */ mflr r0 -/* 800B925C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B9260 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B9264 93 C1 00 08 */ stw r30, 8(r1) -/* 800B9268 7C 7E 1B 78 */ mr r30, r3 -/* 800B926C 3B E0 00 00 */ li r31, 0 -/* 800B9270 A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800B9274 28 00 FF FF */ cmplwi r0, 0xffff -/* 800B9278 41 82 00 38 */ beq lbl_800B92B0 -/* 800B927C 28 00 02 3F */ cmplwi r0, 0x23f -/* 800B9280 41 82 00 30 */ beq lbl_800B92B0 -/* 800B9284 48 00 01 15 */ bl checkWindDashAnime__9daAlink_cCFv -/* 800B9288 2C 03 00 00 */ cmpwi r3, 0 -/* 800B928C 40 82 00 24 */ bne lbl_800B92B0 -/* 800B9290 7F C3 F3 78 */ mr r3, r30 -/* 800B9294 48 00 01 39 */ bl checkSwordTwirlAnime__9daAlink_cCFv -/* 800B9298 2C 03 00 00 */ cmpwi r3, 0 -/* 800B929C 40 82 00 14 */ bne lbl_800B92B0 -/* 800B92A0 7F C3 F3 78 */ mr r3, r30 -/* 800B92A4 48 05 79 C9 */ bl checkKandelaarEquipAnime__9daAlink_cCFv -/* 800B92A8 2C 03 00 00 */ cmpwi r3, 0 -/* 800B92AC 41 82 00 08 */ beq lbl_800B92B4 -lbl_800B92B0: -/* 800B92B0 3B E0 00 01 */ li r31, 1 -lbl_800B92B4: -/* 800B92B4 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800B92B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B92BC 83 C1 00 08 */ lwz r30, 8(r1) -/* 800B92C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B92C4 7C 08 03 A6 */ mtlr r0 -/* 800B92C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B92CC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkOilBottleItemNotGet__9daAlink_cFUs.s b/asm/d/a/d_a_alink/checkOilBottleItemNotGet__9daAlink_cFUs.s deleted file mode 100644 index 9940559c548..00000000000 --- a/asm/d/a/d_a_alink/checkOilBottleItemNotGet__9daAlink_cFUs.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8010E584: -/* 8010E584 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8010E588 7C 08 02 A6 */ mflr r0 -/* 8010E58C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8010E590 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8010E594 3B E0 00 00 */ li r31, 0 -/* 8010E598 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 8010E59C 28 00 00 B6 */ cmplwi r0, 0xb6 -/* 8010E5A0 41 82 00 20 */ beq lbl_8010E5C0 -/* 8010E5A4 28 00 00 B5 */ cmplwi r0, 0xb5 -/* 8010E5A8 41 82 00 18 */ beq lbl_8010E5C0 -/* 8010E5AC 54 83 04 3E */ clrlwi r3, r4, 0x10 -/* 8010E5B0 48 05 05 91 */ bl checkOilBottleItem__9daPy_py_cFi -/* 8010E5B4 2C 03 00 00 */ cmpwi r3, 0 -/* 8010E5B8 41 82 00 08 */ beq lbl_8010E5C0 -/* 8010E5BC 3B E0 00 01 */ li r31, 1 -lbl_8010E5C0: -/* 8010E5C0 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8010E5C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8010E5C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8010E5CC 7C 08 03 A6 */ mtlr r0 -/* 8010E5D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8010E5D4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkOneHandItemEquipAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkOneHandItemEquipAnime__9daAlink_cCFv.s deleted file mode 100644 index 57c8ab8583e..00000000000 --- a/asm/d/a/d_a_alink/checkOneHandItemEquipAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800B92D0: -/* 800B92D0 38 80 00 00 */ li r4, 0 -/* 800B92D4 A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800B92D8 28 00 02 47 */ cmplwi r0, 0x247 -/* 800B92DC 41 82 00 10 */ beq lbl_800B92EC -/* 800B92E0 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800B92E4 28 00 02 48 */ cmplwi r0, 0x248 -/* 800B92E8 40 82 00 08 */ bne lbl_800B92F0 -lbl_800B92EC: -/* 800B92EC 38 80 00 01 */ li r4, 1 -lbl_800B92F0: -/* 800B92F0 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800B92F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkOxygenTimer__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkOxygenTimer__9daAlink_cFv.s deleted file mode 100644 index 857ff9dd866..00000000000 --- a/asm/d/a/d_a_alink/checkOxygenTimer__9daAlink_cFv.s +++ /dev/null @@ -1,94 +0,0 @@ -lbl_80101B44: -/* 80101B44 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80101B48 7C 08 02 A6 */ mflr r0 -/* 80101B4C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80101B50 39 61 00 20 */ addi r11, r1, 0x20 -/* 80101B54 48 26 06 89 */ bl _savegpr_29 -/* 80101B58 7C 7D 1B 78 */ mr r29, r3 -/* 80101B5C 80 03 05 70 */ lwz r0, 0x570(r3) -/* 80101B60 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 80101B64 41 82 00 28 */ beq lbl_80101B8C -/* 80101B68 80 1D 31 A0 */ lwz r0, 0x31a0(r29) -/* 80101B6C 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd -/* 80101B70 41 82 00 24 */ beq lbl_80101B94 -/* 80101B74 C0 5D 33 B4 */ lfs f2, 0x33b4(r29) -/* 80101B78 C0 22 93 3C */ lfs f1, lit_7808(r2) -/* 80101B7C C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80101B80 EC 01 00 2A */ fadds f0, f1, f0 -/* 80101B84 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80101B88 40 81 00 0C */ ble lbl_80101B94 -lbl_80101B8C: -/* 80101B8C 3B C0 00 00 */ li r30, 0 -/* 80101B90 48 00 00 08 */ b lbl_80101B98 -lbl_80101B94: -/* 80101B94 3B C0 00 01 */ li r30, 1 -lbl_80101B98: -/* 80101B98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80101B9C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80101BA0 88 1F 5E B7 */ lbz r0, 0x5eb7(r31) -/* 80101BA4 28 00 00 00 */ cmplwi r0, 0 -/* 80101BA8 41 82 00 8C */ beq lbl_80101C34 -/* 80101BAC 7F A3 EB 78 */ mr r3, r29 -/* 80101BB0 4B FB E2 01 */ bl checkZoraWearAbility__9daAlink_cCFv -/* 80101BB4 2C 03 00 00 */ cmpwi r3, 0 -/* 80101BB8 41 82 00 10 */ beq lbl_80101BC8 -/* 80101BBC 7F A3 EB 78 */ mr r3, r29 -/* 80101BC0 48 00 00 D5 */ bl offOxygenTimer__9daAlink_cFv -/* 80101BC4 48 00 00 B8 */ b lbl_80101C7C -lbl_80101BC8: -/* 80101BC8 2C 1E 00 00 */ cmpwi r30, 0 -/* 80101BCC 41 82 00 40 */ beq lbl_80101C0C -/* 80101BD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80101BD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80101BD8 80 83 5D E8 */ lwz r4, 0x5de8(r3) -/* 80101BDC 80 03 5D EC */ lwz r0, 0x5dec(r3) -/* 80101BE0 7C 00 22 14 */ add r0, r0, r4 -/* 80101BE4 90 03 5D EC */ stw r0, 0x5dec(r3) -/* 80101BE8 88 7D 2F BE */ lbz r3, 0x2fbe(r29) -/* 80101BEC 28 03 00 5A */ cmplwi r3, 0x5a -/* 80101BF0 40 80 00 10 */ bge lbl_80101C00 -/* 80101BF4 38 03 00 01 */ addi r0, r3, 1 -/* 80101BF8 98 1D 2F BE */ stb r0, 0x2fbe(r29) -/* 80101BFC 48 00 00 80 */ b lbl_80101C7C -lbl_80101C00: -/* 80101C00 7F A3 EB 78 */ mr r3, r29 -/* 80101C04 48 00 00 91 */ bl offOxygenTimer__9daAlink_cFv -/* 80101C08 48 00 00 74 */ b lbl_80101C7C -lbl_80101C0C: -/* 80101C0C 7F A3 EB 78 */ mr r3, r29 -/* 80101C10 48 01 40 11 */ bl checkEventRun__9daAlink_cCFv -/* 80101C14 2C 03 00 00 */ cmpwi r3, 0 -/* 80101C18 40 82 00 64 */ bne lbl_80101C7C -/* 80101C1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80101C20 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80101C24 80 64 5D EC */ lwz r3, 0x5dec(r4) -/* 80101C28 38 03 FF FF */ addi r0, r3, -1 -/* 80101C2C 90 04 5D EC */ stw r0, 0x5dec(r4) -/* 80101C30 48 00 00 4C */ b lbl_80101C7C -lbl_80101C34: -/* 80101C34 2C 1E 00 00 */ cmpwi r30, 0 -/* 80101C38 40 82 00 44 */ bne lbl_80101C7C -/* 80101C3C 7F A3 EB 78 */ mr r3, r29 -/* 80101C40 4B FB E1 71 */ bl checkZoraWearAbility__9daAlink_cCFv -/* 80101C44 2C 03 00 00 */ cmpwi r3, 0 -/* 80101C48 40 82 00 34 */ bne lbl_80101C7C -/* 80101C4C 88 7D 2F BE */ lbz r3, 0x2fbe(r29) -/* 80101C50 28 03 00 00 */ cmplwi r3, 0 -/* 80101C54 41 82 00 10 */ beq lbl_80101C64 -/* 80101C58 38 03 FF FF */ addi r0, r3, -1 -/* 80101C5C 98 1D 2F BE */ stb r0, 0x2fbe(r29) -/* 80101C60 48 00 00 1C */ b lbl_80101C7C -lbl_80101C64: -/* 80101C64 38 00 00 01 */ li r0, 1 -/* 80101C68 98 1F 5E B7 */ stb r0, 0x5eb7(r31) -/* 80101C6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80101C70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80101C74 80 03 5D E8 */ lwz r0, 0x5de8(r3) -/* 80101C78 90 03 5D E0 */ stw r0, 0x5de0(r3) -lbl_80101C7C: -/* 80101C7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80101C80 48 26 05 A9 */ bl _restgpr_29 -/* 80101C84 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80101C88 7C 08 03 A6 */ mtlr r0 -/* 80101C8C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80101C90 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkPlayerGuardAndAttack__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkPlayerGuardAndAttack__9daAlink_cCFv.s deleted file mode 100644 index 58241610cb6..00000000000 --- a/asm/d/a/d_a_alink/checkPlayerGuardAndAttack__9daAlink_cCFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_800DCF04: -/* 800DCF04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DCF08 7C 08 02 A6 */ mflr r0 -/* 800DCF0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DCF10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DCF14 93 C1 00 08 */ stw r30, 8(r1) -/* 800DCF18 7C 7E 1B 78 */ mr r30, r3 -/* 800DCF1C 3B E0 00 00 */ li r31, 0 -/* 800DCF20 81 83 06 28 */ lwz r12, 0x628(r3) -/* 800DCF24 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 800DCF28 7D 89 03 A6 */ mtctr r12 -/* 800DCF2C 4E 80 04 21 */ bctrl -/* 800DCF30 2C 03 00 00 */ cmpwi r3, 0 -/* 800DCF34 40 82 00 10 */ bne lbl_800DCF44 -/* 800DCF38 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) -/* 800DCF3C 28 00 00 1E */ cmplwi r0, 0x1e -/* 800DCF40 40 82 00 08 */ bne lbl_800DCF48 -lbl_800DCF44: -/* 800DCF44 3B E0 00 01 */ li r31, 1 -lbl_800DCF48: -/* 800DCF48 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800DCF4C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DCF50 83 C1 00 08 */ lwz r30, 8(r1) -/* 800DCF54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DCF58 7C 08 03 A6 */ mtlr r0 -/* 800DCF5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DCF60 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkPlayerGuard__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkPlayerGuard__9daAlink_cCFv.s deleted file mode 100644 index d2a66e3d3d5..00000000000 --- a/asm/d/a/d_a_alink/checkPlayerGuard__9daAlink_cCFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_800DCE6C: -/* 800DCE6C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800DCE70 7C 08 02 A6 */ mflr r0 -/* 800DCE74 90 01 00 24 */ stw r0, 0x24(r1) -/* 800DCE78 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DCE7C 48 28 53 5D */ bl _savegpr_28 -/* 800DCE80 7C 7C 1B 78 */ mr r28, r3 -/* 800DCE84 3B E0 00 01 */ li r31, 1 -/* 800DCE88 7F FE FB 78 */ mr r30, r31 -/* 800DCE8C A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800DCE90 28 00 00 16 */ cmplwi r0, 0x16 -/* 800DCE94 41 82 00 38 */ beq lbl_800DCECC -/* 800DCE98 3B A0 00 00 */ li r29, 0 -/* 800DCE9C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800DCEA0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800DCEA4 88 04 00 15 */ lbz r0, 0x15(r4) -/* 800DCEA8 28 00 00 FF */ cmplwi r0, 0xff -/* 800DCEAC 41 82 00 14 */ beq lbl_800DCEC0 -/* 800DCEB0 48 01 00 55 */ bl checkHorseLieAnime__9daAlink_cCFv -/* 800DCEB4 2C 03 00 00 */ cmpwi r3, 0 -/* 800DCEB8 41 82 00 08 */ beq lbl_800DCEC0 -/* 800DCEBC 3B A0 00 01 */ li r29, 1 -lbl_800DCEC0: -/* 800DCEC0 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 800DCEC4 40 82 00 08 */ bne lbl_800DCECC -/* 800DCEC8 3B C0 00 00 */ li r30, 0 -lbl_800DCECC: -/* 800DCECC 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 800DCED0 40 82 00 18 */ bne lbl_800DCEE8 -/* 800DCED4 7F 83 E3 78 */ mr r3, r28 -/* 800DCED8 4B FF FF 19 */ bl checkUpperGuardAnime__9daAlink_cCFv -/* 800DCEDC 2C 03 00 00 */ cmpwi r3, 0 -/* 800DCEE0 40 82 00 08 */ bne lbl_800DCEE8 -/* 800DCEE4 3B E0 00 00 */ li r31, 0 -lbl_800DCEE8: -/* 800DCEE8 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800DCEEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DCEF0 48 28 53 35 */ bl _restgpr_28 -/* 800DCEF4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800DCEF8 7C 08 03 A6 */ mtlr r0 -/* 800DCEFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DCF00 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkPossibleWaterInMode__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkPossibleWaterInMode__9daAlink_cCFv.s deleted file mode 100644 index 2f5314e0057..00000000000 --- a/asm/d/a/d_a_alink/checkPossibleWaterInMode__9daAlink_cCFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80101CB8: -/* 80101CB8 38 A0 00 00 */ li r5, 0 -/* 80101CBC 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 80101CC0 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf -/* 80101CC4 40 82 00 24 */ bne lbl_80101CE8 -/* 80101CC8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80101CCC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80101CD0 80 04 5F 1C */ lwz r0, 0x5f1c(r4) -/* 80101CD4 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80101CD8 40 82 00 10 */ bne lbl_80101CE8 -/* 80101CDC A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 80101CE0 28 00 00 C6 */ cmplwi r0, 0xc6 -/* 80101CE4 40 82 00 08 */ bne lbl_80101CEC -lbl_80101CE8: -/* 80101CE8 38 A0 00 01 */ li r5, 1 -lbl_80101CEC: -/* 80101CEC 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 80101CF0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkSnowCodePolygon__9daAlink_cFR13cBgS_PolyInfo.s b/asm/d/a/d_a_alink/checkSnowCodePolygon__9daAlink_cFR13cBgS_PolyInfo.s deleted file mode 100644 index 002579ce49b..00000000000 --- a/asm/d/a/d_a_alink/checkSnowCodePolygon__9daAlink_cFR13cBgS_PolyInfo.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80105ABC: -/* 80105ABC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80105AC0 7C 08 02 A6 */ mflr r0 -/* 80105AC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80105AC8 7C 64 1B 78 */ mr r4, r3 -/* 80105ACC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80105AD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80105AD4 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80105AD8 4B F6 F1 E5 */ bl GetSpecialCode__4dBgSFRC13cBgS_PolyInfo -/* 80105ADC 38 80 00 01 */ li r4, 1 -/* 80105AE0 38 03 FF FB */ addi r0, r3, -5 -/* 80105AE4 38 60 FF FF */ li r3, -1 -/* 80105AE8 7C 00 20 10 */ subfc r0, r0, r4 -/* 80105AEC 7C 03 01 90 */ subfze r0, r3 -/* 80105AF0 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80105AF4 40 82 00 08 */ bne lbl_80105AFC -/* 80105AF8 38 80 00 00 */ li r4, 0 -lbl_80105AFC: -/* 80105AFC 7C 83 23 78 */ mr r3, r4 -/* 80105B00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80105B04 7C 08 03 A6 */ mtlr r0 -/* 80105B08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80105B0C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkSnowCode__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkSnowCode__9daAlink_cCFv.s deleted file mode 100644 index 8ad8b6e36fb..00000000000 --- a/asm/d/a/d_a_alink/checkSnowCode__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80105A98: -/* 80105A98 38 00 00 00 */ li r0, 0 -/* 80105A9C 88 63 2F A8 */ lbz r3, 0x2fa8(r3) -/* 80105AA0 28 03 00 06 */ cmplwi r3, 6 -/* 80105AA4 41 82 00 0C */ beq lbl_80105AB0 -/* 80105AA8 28 03 00 05 */ cmplwi r3, 5 -/* 80105AAC 40 82 00 08 */ bne lbl_80105AB4 -lbl_80105AB0: -/* 80105AB0 38 00 00 01 */ li r0, 1 -lbl_80105AB4: -/* 80105AB4 7C 03 03 78 */ mr r3, r0 -/* 80105AB8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkSubjectAction__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkSubjectAction__9daAlink_cFv.s deleted file mode 100644 index 145ffaa1212..00000000000 --- a/asm/d/a/d_a_alink/checkSubjectAction__9daAlink_cFv.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_800CE628: -/* 800CE628 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800CE62C 7C 08 02 A6 */ mflr r0 -/* 800CE630 90 01 00 14 */ stw r0, 0x14(r1) -/* 800CE634 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800CE638 7C 7F 1B 78 */ mr r31, r3 -/* 800CE63C 4B FF FE 2D */ bl acceptSubjectModeChange__9daAlink_cFv -/* 800CE640 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800CE644 41 82 00 CC */ beq lbl_800CE710 -/* 800CE648 80 1F 05 80 */ lwz r0, 0x580(r31) -/* 800CE64C 64 00 04 00 */ oris r0, r0, 0x400 -/* 800CE650 90 1F 05 80 */ stw r0, 0x580(r31) -/* 800CE654 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800CE658 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800CE65C 80 1F 31 7C */ lwz r0, 0x317c(r31) -/* 800CE660 1C 00 00 38 */ mulli r0, r0, 0x38 -/* 800CE664 7C 63 02 14 */ add r3, r3, r0 -/* 800CE668 80 03 5D 7C */ lwz r0, 0x5d7c(r3) -/* 800CE66C 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 800CE670 41 82 00 A0 */ beq lbl_800CE710 -/* 800CE674 80 7F 31 A0 */ lwz r3, 0x31a0(r31) -/* 800CE678 54 60 05 6B */ rlwinm. r0, r3, 0, 0x15, 0x15 -/* 800CE67C 41 82 00 60 */ beq lbl_800CE6DC -/* 800CE680 7F E3 FB 78 */ mr r3, r31 -/* 800CE684 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800CE688 81 8C 01 90 */ lwz r12, 0x190(r12) -/* 800CE68C 7D 89 03 A6 */ mtctr r12 -/* 800CE690 4E 80 04 21 */ bctrl -/* 800CE694 28 03 00 00 */ cmplwi r3, 0 -/* 800CE698 41 82 00 10 */ beq lbl_800CE6A8 -/* 800CE69C 7F E3 FB 78 */ mr r3, r31 -/* 800CE6A0 48 02 85 4D */ bl procCanoeSubjectivityInit__9daAlink_cFv -/* 800CE6A4 48 00 00 70 */ b lbl_800CE714 -lbl_800CE6A8: -/* 800CE6A8 7F E3 FB 78 */ mr r3, r31 -/* 800CE6AC 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800CE6B0 81 8C 01 94 */ lwz r12, 0x194(r12) -/* 800CE6B4 7D 89 03 A6 */ mtctr r12 -/* 800CE6B8 4E 80 04 21 */ bctrl -/* 800CE6BC 28 03 00 00 */ cmplwi r3, 0 -/* 800CE6C0 41 82 00 10 */ beq lbl_800CE6D0 -/* 800CE6C4 7F E3 FB 78 */ mr r3, r31 -/* 800CE6C8 48 03 8D 09 */ bl procBoardSubjectivityInit__9daAlink_cFv -/* 800CE6CC 48 00 00 48 */ b lbl_800CE714 -lbl_800CE6D0: -/* 800CE6D0 7F E3 FB 78 */ mr r3, r31 -/* 800CE6D4 48 02 2B C1 */ bl procHorseSubjectivityInit__9daAlink_cFv -/* 800CE6D8 48 00 00 3C */ b lbl_800CE714 -lbl_800CE6DC: -/* 800CE6DC 54 60 03 9D */ rlwinm. r0, r3, 0, 0xe, 0xe -/* 800CE6E0 41 82 00 10 */ beq lbl_800CE6F0 -/* 800CE6E4 7F E3 FB 78 */ mr r3, r31 -/* 800CE6E8 48 06 51 65 */ bl procWolfRopeSubjectivityInit__9daAlink_cFv -/* 800CE6EC 48 00 00 28 */ b lbl_800CE714 -lbl_800CE6F0: -/* 800CE6F0 54 60 03 5B */ rlwinm. r0, r3, 0, 0xd, 0xd -/* 800CE6F4 41 82 00 10 */ beq lbl_800CE704 -/* 800CE6F8 7F E3 FB 78 */ mr r3, r31 -/* 800CE6FC 48 00 08 75 */ bl procCoSwimSubjectivityInit__9daAlink_cFv -/* 800CE700 48 00 00 14 */ b lbl_800CE714 -lbl_800CE704: -/* 800CE704 7F E3 FB 78 */ mr r3, r31 -/* 800CE708 48 00 06 7D */ bl procCoSubjectivityInit__9daAlink_cFv -/* 800CE70C 48 00 00 08 */ b lbl_800CE714 -lbl_800CE710: -/* 800CE710 38 60 00 00 */ li r3, 0 -lbl_800CE714: -/* 800CE714 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800CE718 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800CE71C 7C 08 03 A6 */ mtlr r0 -/* 800CE720 38 21 00 10 */ addi r1, r1, 0x10 -/* 800CE724 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkSumouVsActor__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkSumouVsActor__9daAlink_cFv.s deleted file mode 100644 index 3becabddb5e..00000000000 --- a/asm/d/a/d_a_alink/checkSumouVsActor__9daAlink_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_800EA844: -/* 800EA844 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800EA848 7C 08 02 A6 */ mflr r0 -/* 800EA84C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800EA850 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800EA854 7C 7F 1B 78 */ mr r31, r3 -/* 800EA858 38 7F 28 54 */ addi r3, r31, 0x2854 -/* 800EA85C 48 07 43 ED */ bl setActor__16daPy_actorKeep_cFv -/* 800EA860 80 1F 28 58 */ lwz r0, 0x2858(r31) -/* 800EA864 28 00 00 00 */ cmplwi r0, 0 -/* 800EA868 40 82 00 1C */ bne lbl_800EA884 -/* 800EA86C 7F E3 FB 78 */ mr r3, r31 -/* 800EA870 48 00 00 61 */ bl cancelSumouMode__9daAlink_cFv -/* 800EA874 7F E3 FB 78 */ mr r3, r31 -/* 800EA878 4B FD 8B 41 */ bl procWaitInit__9daAlink_cFv -/* 800EA87C 38 60 00 00 */ li r3, 0 -/* 800EA880 48 00 00 3C */ b lbl_800EA8BC -lbl_800EA884: -/* 800EA884 88 1F 05 6A */ lbz r0, 0x56a(r31) -/* 800EA888 28 00 00 0D */ cmplwi r0, 0xd -/* 800EA88C 41 82 00 1C */ beq lbl_800EA8A8 -/* 800EA890 28 00 00 0B */ cmplwi r0, 0xb -/* 800EA894 41 82 00 14 */ beq lbl_800EA8A8 -/* 800EA898 28 00 00 0C */ cmplwi r0, 0xc -/* 800EA89C 41 82 00 0C */ beq lbl_800EA8A8 -/* 800EA8A0 28 00 00 0E */ cmplwi r0, 0xe -/* 800EA8A4 40 82 00 14 */ bne lbl_800EA8B8 -lbl_800EA8A8: -/* 800EA8A8 7F E3 FB 78 */ mr r3, r31 -/* 800EA8AC 48 00 19 61 */ bl procSumouWinLoseInit__9daAlink_cFv -/* 800EA8B0 38 60 00 00 */ li r3, 0 -/* 800EA8B4 48 00 00 08 */ b lbl_800EA8BC -lbl_800EA8B8: -/* 800EA8B8 38 60 00 01 */ li r3, 1 -lbl_800EA8BC: -/* 800EA8BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800EA8C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800EA8C4 7C 08 03 A6 */ mtlr r0 -/* 800EA8C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EA8CC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkSwimButtonAccept__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkSwimButtonAccept__9daAlink_cFv.s deleted file mode 100644 index 2916f2d4461..00000000000 --- a/asm/d/a/d_a_alink/checkSwimButtonAccept__9daAlink_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80103EE0: -/* 80103EE0 38 60 00 00 */ li r3, 0 -/* 80103EE4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80103EE8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80103EEC 88 04 5E 24 */ lbz r0, 0x5e24(r4) -/* 80103EF0 28 00 00 41 */ cmplwi r0, 0x41 -/* 80103EF4 41 82 00 0C */ beq lbl_80103F00 -/* 80103EF8 28 00 00 4C */ cmplwi r0, 0x4c -/* 80103EFC 4C 82 00 20 */ bnelr -lbl_80103F00: -/* 80103F00 38 60 00 01 */ li r3, 1 -/* 80103F04 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkSwimButtonMove__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkSwimButtonMove__9daAlink_cFv.s deleted file mode 100644 index a4e16fe9c01..00000000000 --- a/asm/d/a/d_a_alink/checkSwimButtonMove__9daAlink_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80103F24: -/* 80103F24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80103F28 7C 08 02 A6 */ mflr r0 -/* 80103F2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80103F30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80103F34 93 C1 00 08 */ stw r30, 8(r1) -/* 80103F38 7C 7E 1B 78 */ mr r30, r3 -/* 80103F3C 3B E0 00 00 */ li r31, 0 -/* 80103F40 80 03 05 70 */ lwz r0, 0x570(r3) -/* 80103F44 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 80103F48 40 82 00 30 */ bne lbl_80103F78 -/* 80103F4C 4B FF FF 95 */ bl checkSwimButtonAccept__9daAlink_cFv -/* 80103F50 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80103F54 40 82 00 14 */ bne lbl_80103F68 -/* 80103F58 7F C3 F3 78 */ mr r3, r30 -/* 80103F5C 4B FF FF AD */ bl checkUpSwimButtonAccept__9daAlink_cFv -/* 80103F60 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80103F64 41 82 00 14 */ beq lbl_80103F78 -lbl_80103F68: -/* 80103F68 88 1E 2F 8E */ lbz r0, 0x2f8e(r30) -/* 80103F6C 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 80103F70 41 82 00 08 */ beq lbl_80103F78 -/* 80103F74 3B E0 00 01 */ li r31, 1 -lbl_80103F78: -/* 80103F78 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 80103F7C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80103F80 83 C1 00 08 */ lwz r30, 8(r1) -/* 80103F84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80103F88 7C 08 03 A6 */ mtlr r0 -/* 80103F8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80103F90 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkSwimFall__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkSwimFall__9daAlink_cFv.s deleted file mode 100644 index 614b6e17167..00000000000 --- a/asm/d/a/d_a_alink/checkSwimFall__9daAlink_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80103398: -/* 80103398 80 03 05 70 */ lwz r0, 0x570(r3) -/* 8010339C 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 801033A0 41 82 00 1C */ beq lbl_801033BC -/* 801033A4 C0 43 04 D4 */ lfs f2, 0x4d4(r3) -/* 801033A8 C0 23 33 B4 */ lfs f1, 0x33b4(r3) -/* 801033AC C0 0D 81 10 */ lfs f0, l_autoUpHeight(r13) -/* 801033B0 EC 01 00 2A */ fadds f0, f1, f0 -/* 801033B4 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 801033B8 40 81 00 0C */ ble lbl_801033C4 -lbl_801033BC: -/* 801033BC 38 60 00 01 */ li r3, 1 -/* 801033C0 4E 80 00 20 */ blr -lbl_801033C4: -/* 801033C4 38 60 00 00 */ li r3, 0 -/* 801033C8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkSwimNeckUpDown__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkSwimNeckUpDown__9daAlink_cCFv.s deleted file mode 100644 index a84fe15af6c..00000000000 --- a/asm/d/a/d_a_alink/checkSwimNeckUpDown__9daAlink_cCFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80103FE8: -/* 80103FE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80103FEC 7C 08 02 A6 */ mflr r0 -/* 80103FF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80103FF4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80103FF8 3B E0 00 00 */ li r31, 0 -/* 80103FFC 80 03 05 70 */ lwz r0, 0x570(r3) -/* 80104000 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 80104004 40 82 00 18 */ bne lbl_8010401C -/* 80104008 38 80 00 14 */ li r4, 0x14 -/* 8010400C 4B FA 85 4D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM -/* 80104010 2C 03 00 00 */ cmpwi r3, 0 -/* 80104014 41 82 00 08 */ beq lbl_8010401C -/* 80104018 3B E0 00 01 */ li r31, 1 -lbl_8010401C: -/* 8010401C 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 80104020 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80104024 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80104028 7C 08 03 A6 */ mtlr r0 -/* 8010402C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80104030 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkSwordTwirlAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkSwordTwirlAnime__9daAlink_cCFv.s deleted file mode 100644 index 2c757a093d8..00000000000 --- a/asm/d/a/d_a_alink/checkSwordTwirlAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800B93CC: -/* 800B93CC 38 80 00 00 */ li r4, 0 -/* 800B93D0 A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800B93D4 28 00 00 40 */ cmplwi r0, 0x40 -/* 800B93D8 41 82 00 10 */ beq lbl_800B93E8 -/* 800B93DC 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800B93E0 28 00 00 3F */ cmplwi r0, 0x3f -/* 800B93E4 40 82 00 08 */ bne lbl_800B93EC -lbl_800B93E8: -/* 800B93E8 38 80 00 01 */ li r4, 1 -lbl_800B93EC: -/* 800B93EC 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800B93F0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkUpSwimButtonAccept__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkUpSwimButtonAccept__9daAlink_cFv.s deleted file mode 100644 index fa793209a6a..00000000000 --- a/asm/d/a/d_a_alink/checkUpSwimButtonAccept__9daAlink_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80103F08: -/* 80103F08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80103F0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80103F10 88 03 5E 24 */ lbz r0, 0x5e24(r3) -/* 80103F14 20 00 00 97 */ subfic r0, r0, 0x97 -/* 80103F18 7C 00 00 34 */ cntlzw r0, r0 -/* 80103F1C 54 03 D9 7E */ srwi r3, r0, 5 -/* 80103F20 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkUpperGuardAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkUpperGuardAnime__9daAlink_cCFv.s deleted file mode 100644 index ab941c80f07..00000000000 --- a/asm/d/a/d_a_alink/checkUpperGuardAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_800DCDF0: -/* 800DCDF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DCDF4 7C 08 02 A6 */ mflr r0 -/* 800DCDF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DCDFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DCE00 93 C1 00 08 */ stw r30, 8(r1) -/* 800DCE04 7C 7E 1B 78 */ mr r30, r3 -/* 800DCE08 3B E0 00 00 */ li r31, 0 -/* 800DCE0C 80 03 05 78 */ lwz r0, 0x578(r3) -/* 800DCE10 54 00 01 09 */ rlwinm. r0, r0, 0, 4, 4 -/* 800DCE14 41 82 00 3C */ beq lbl_800DCE50 -/* 800DCE18 48 03 8E 09 */ bl checkEventRun__9daAlink_cCFv -/* 800DCE1C 2C 03 00 00 */ cmpwi r3, 0 -/* 800DCE20 40 82 00 30 */ bne lbl_800DCE50 -/* 800DCE24 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800DCE28 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 800DCE2C 40 82 00 24 */ bne lbl_800DCE50 -/* 800DCE30 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) -/* 800DCE34 28 00 00 1F */ cmplwi r0, 0x1f -/* 800DCE38 41 82 00 18 */ beq lbl_800DCE50 -/* 800DCE3C 28 00 00 25 */ cmplwi r0, 0x25 -/* 800DCE40 41 82 00 10 */ beq lbl_800DCE50 -/* 800DCE44 28 00 00 1E */ cmplwi r0, 0x1e -/* 800DCE48 41 82 00 08 */ beq lbl_800DCE50 -/* 800DCE4C 3B E0 00 01 */ li r31, 1 -lbl_800DCE50: -/* 800DCE50 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800DCE54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DCE58 83 C1 00 08 */ lwz r30, 8(r1) -/* 800DCE5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DCE60 7C 08 03 A6 */ mtlr r0 -/* 800DCE64 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DCE68 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkUpperItemActionBoomerangFly__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkUpperItemActionBoomerangFly__9daAlink_cFv.s deleted file mode 100644 index 1acc7e81a36..00000000000 --- a/asm/d/a/d_a_alink/checkUpperItemActionBoomerangFly__9daAlink_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_800E0B58: -/* 800E0B58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E0B5C 7C 08 02 A6 */ mflr r0 -/* 800E0B60 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E0B64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E0B68 7C 7F 1B 78 */ mr r31, r3 -/* 800E0B6C 38 60 00 00 */ li r3, 0 -/* 800E0B70 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800E0B74 28 00 00 40 */ cmplwi r0, 0x40 -/* 800E0B78 41 82 00 0C */ beq lbl_800E0B84 -/* 800E0B7C 28 00 01 02 */ cmplwi r0, 0x102 -/* 800E0B80 40 82 00 14 */ bne lbl_800E0B94 -lbl_800E0B84: -/* 800E0B84 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 800E0B88 28 00 00 54 */ cmplwi r0, 0x54 -/* 800E0B8C 40 82 00 08 */ bne lbl_800E0B94 -/* 800E0B90 38 60 00 01 */ li r3, 1 -lbl_800E0B94: -/* 800E0B94 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E0B98 41 82 00 10 */ beq lbl_800E0BA8 -/* 800E0B9C 7F E3 FB 78 */ mr r3, r31 -/* 800E0BA0 4B FF FE FD */ bl checkUpperItemActionBoomerang__9daAlink_cFv -/* 800E0BA4 48 00 00 2C */ b lbl_800E0BD0 -lbl_800E0BA8: -/* 800E0BA8 7F E3 FB 78 */ mr r3, r31 -/* 800E0BAC 4B FD 7D 85 */ bl checkReadyItem__9daAlink_cFv -/* 800E0BB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E0BB4 41 82 00 1C */ beq lbl_800E0BD0 -/* 800E0BB8 7F E3 FB 78 */ mr r3, r31 -/* 800E0BBC 4B FD 1A 79 */ bl itemTrigger__9daAlink_cFv -/* 800E0BC0 2C 03 00 00 */ cmpwi r3, 0 -/* 800E0BC4 41 82 00 0C */ beq lbl_800E0BD0 -/* 800E0BC8 7F E3 FB 78 */ mr r3, r31 -/* 800E0BCC 4B FF F9 91 */ bl setBoomerangReadyAnime__9daAlink_cFv -lbl_800E0BD0: -/* 800E0BD0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E0BD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E0BD8 7C 08 03 A6 */ mtlr r0 -/* 800E0BDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E0BE0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkUpperItemActionBoomerang__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkUpperItemActionBoomerang__9daAlink_cFv.s deleted file mode 100644 index 1aef71410c7..00000000000 --- a/asm/d/a/d_a_alink/checkUpperItemActionBoomerang__9daAlink_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_800E0A9C: -/* 800E0A9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E0AA0 7C 08 02 A6 */ mflr r0 -/* 800E0AA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E0AA8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E0AAC 7C 7F 1B 78 */ mr r31, r3 -/* 800E0AB0 A8 83 30 18 */ lha r4, 0x3018(r3) -/* 800E0AB4 2C 04 00 00 */ cmpwi r4, 0 -/* 800E0AB8 41 82 00 20 */ beq lbl_800E0AD8 -/* 800E0ABC 38 04 FF FF */ addi r0, r4, -1 -/* 800E0AC0 B0 1F 30 18 */ sth r0, 0x3018(r31) -/* 800E0AC4 A8 1F 30 18 */ lha r0, 0x3018(r31) -/* 800E0AC8 2C 00 00 00 */ cmpwi r0, 0 -/* 800E0ACC 40 82 00 0C */ bne lbl_800E0AD8 -/* 800E0AD0 38 80 00 00 */ li r4, 0 -/* 800E0AD4 4B FD 66 BD */ bl cancelItemUseQuake__9daAlink_cFi -lbl_800E0AD8: -/* 800E0AD8 7F E3 FB 78 */ mr r3, r31 -/* 800E0ADC 4B FD 7E 55 */ bl checkReadyItem__9daAlink_cFv -/* 800E0AE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E0AE4 41 82 00 54 */ beq lbl_800E0B38 -/* 800E0AE8 7F E3 FB 78 */ mr r3, r31 -/* 800E0AEC 4B FD 1B 19 */ bl itemButton__9daAlink_cFv -/* 800E0AF0 2C 03 00 00 */ cmpwi r3, 0 -/* 800E0AF4 40 82 00 44 */ bne lbl_800E0B38 -/* 800E0AF8 38 60 00 00 */ li r3, 0 -/* 800E0AFC A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800E0B00 28 00 00 40 */ cmplwi r0, 0x40 -/* 800E0B04 41 82 00 0C */ beq lbl_800E0B10 -/* 800E0B08 28 00 01 02 */ cmplwi r0, 0x102 -/* 800E0B0C 40 82 00 14 */ bne lbl_800E0B20 -lbl_800E0B10: -/* 800E0B10 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 800E0B14 28 00 00 54 */ cmplwi r0, 0x54 -/* 800E0B18 40 82 00 08 */ bne lbl_800E0B20 -/* 800E0B1C 38 60 00 01 */ li r3, 1 -lbl_800E0B20: -/* 800E0B20 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E0B24 41 82 00 14 */ beq lbl_800E0B38 -/* 800E0B28 7F E3 FB 78 */ mr r3, r31 -/* 800E0B2C 4B FF FA BD */ bl setThrowBoomerangAnime__9daAlink_cFv -/* 800E0B30 38 60 00 01 */ li r3, 1 -/* 800E0B34 48 00 00 10 */ b lbl_800E0B44 -lbl_800E0B38: -/* 800E0B38 7F E3 FB 78 */ mr r3, r31 -/* 800E0B3C 38 80 00 00 */ li r4, 0 -/* 800E0B40 4B FD 66 AD */ bl cancelUpperItemReadyAnime__9daAlink_cFi -lbl_800E0B44: -/* 800E0B44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E0B48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E0B4C 7C 08 03 A6 */ mtlr r0 -/* 800E0B50 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E0B54 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkUpperItemActionBowFly__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkUpperItemActionBowFly__9daAlink_cFv.s deleted file mode 100644 index 1110f227837..00000000000 --- a/asm/d/a/d_a_alink/checkUpperItemActionBowFly__9daAlink_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_800DF798: -/* 800DF798 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DF79C 7C 08 02 A6 */ mflr r0 -/* 800DF7A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DF7A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DF7A8 7C 7F 1B 78 */ mr r31, r3 -/* 800DF7AC 4B FF F2 3D */ bl checkBowAnime__9daAlink_cCFv -/* 800DF7B0 2C 03 00 00 */ cmpwi r3, 0 -/* 800DF7B4 41 82 00 1C */ beq lbl_800DF7D0 -/* 800DF7B8 7F E3 FB 78 */ mr r3, r31 -/* 800DF7BC 4B FF F9 01 */ bl checkUpperItemActionBow__9daAlink_cFv -/* 800DF7C0 7F E3 FB 78 */ mr r3, r31 -/* 800DF7C4 38 80 00 00 */ li r4, 0 -/* 800DF7C8 4B FD BA E9 */ bl setBodyAngleXReadyAnime__9daAlink_cFi -/* 800DF7CC 48 00 00 34 */ b lbl_800DF800 -lbl_800DF7D0: -/* 800DF7D0 7F E3 FB 78 */ mr r3, r31 -/* 800DF7D4 4B FD 91 5D */ bl checkReadyItem__9daAlink_cFv -/* 800DF7D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800DF7DC 41 82 00 24 */ beq lbl_800DF800 -/* 800DF7E0 7F E3 FB 78 */ mr r3, r31 -/* 800DF7E4 4B FD 2E 51 */ bl itemTrigger__9daAlink_cFv -/* 800DF7E8 2C 03 00 00 */ cmpwi r3, 0 -/* 800DF7EC 41 82 00 14 */ beq lbl_800DF800 -/* 800DF7F0 7F E3 FB 78 */ mr r3, r31 -/* 800DF7F4 4B FF F6 E9 */ bl setBowReadyAnime__9daAlink_cFv -/* 800DF7F8 38 00 00 00 */ li r0, 0 -/* 800DF7FC B0 1F 30 1A */ sth r0, 0x301a(r31) -lbl_800DF800: -/* 800DF800 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DF804 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DF808 7C 08 03 A6 */ mtlr r0 -/* 800DF80C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DF810 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkUpperItemActionCopyRodFly__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkUpperItemActionCopyRodFly__9daAlink_cFv.s deleted file mode 100644 index 8c333b91bfe..00000000000 --- a/asm/d/a/d_a_alink/checkUpperItemActionCopyRodFly__9daAlink_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_800E1BB4: -/* 800E1BB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E1BB8 7C 08 02 A6 */ mflr r0 -/* 800E1BBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E1BC0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E1BC4 7C 7F 1B 78 */ mr r31, r3 -/* 800E1BC8 80 03 28 40 */ lwz r0, 0x2840(r3) -/* 800E1BCC 28 00 00 00 */ cmplwi r0, 0 -/* 800E1BD0 40 82 00 60 */ bne lbl_800E1C30 -/* 800E1BD4 38 60 00 00 */ li r3, 0 -/* 800E1BD8 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800E1BDC 28 00 00 46 */ cmplwi r0, 0x46 -/* 800E1BE0 40 82 00 14 */ bne lbl_800E1BF4 -/* 800E1BE4 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 800E1BE8 28 00 00 54 */ cmplwi r0, 0x54 -/* 800E1BEC 40 82 00 08 */ bne lbl_800E1BF4 -/* 800E1BF0 38 60 00 01 */ li r3, 1 -lbl_800E1BF4: -/* 800E1BF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E1BF8 41 82 00 10 */ beq lbl_800E1C08 -/* 800E1BFC 7F E3 FB 78 */ mr r3, r31 -/* 800E1C00 4B FF FE DD */ bl checkUpperItemActionCopyRod__9daAlink_cFv -/* 800E1C04 48 00 00 2C */ b lbl_800E1C30 -lbl_800E1C08: -/* 800E1C08 7F E3 FB 78 */ mr r3, r31 -/* 800E1C0C 4B FD 6D 25 */ bl checkReadyItem__9daAlink_cFv -/* 800E1C10 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E1C14 41 82 00 1C */ beq lbl_800E1C30 -/* 800E1C18 7F E3 FB 78 */ mr r3, r31 -/* 800E1C1C 4B FD 0A 19 */ bl itemTrigger__9daAlink_cFv -/* 800E1C20 2C 03 00 00 */ cmpwi r3, 0 -/* 800E1C24 41 82 00 0C */ beq lbl_800E1C30 -/* 800E1C28 7F E3 FB 78 */ mr r3, r31 -/* 800E1C2C 4B FF FC 15 */ bl setCopyRodReadyAnime__9daAlink_cFv -lbl_800E1C30: -/* 800E1C30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E1C34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E1C38 7C 08 03 A6 */ mtlr r0 -/* 800E1C3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E1C40 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkUpperItemActionCopyRod__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkUpperItemActionCopyRod__9daAlink_cFv.s deleted file mode 100644 index 6b98d6eb8da..00000000000 --- a/asm/d/a/d_a_alink/checkUpperItemActionCopyRod__9daAlink_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_800E1ADC: -/* 800E1ADC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E1AE0 7C 08 02 A6 */ mflr r0 -/* 800E1AE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E1AE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E1AEC 7C 7F 1B 78 */ mr r31, r3 -/* 800E1AF0 A8 63 30 18 */ lha r3, 0x3018(r3) -/* 800E1AF4 2C 03 00 00 */ cmpwi r3, 0 -/* 800E1AF8 41 82 00 0C */ beq lbl_800E1B04 -/* 800E1AFC 38 03 FF FF */ addi r0, r3, -1 -/* 800E1B00 B0 1F 30 18 */ sth r0, 0x3018(r31) -lbl_800E1B04: -/* 800E1B04 7F E3 FB 78 */ mr r3, r31 -/* 800E1B08 4B FD 6E 29 */ bl checkReadyItem__9daAlink_cFv -/* 800E1B0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E1B10 41 82 00 84 */ beq lbl_800E1B94 -/* 800E1B14 7F E3 FB 78 */ mr r3, r31 -/* 800E1B18 4B FD 0A ED */ bl itemButton__9daAlink_cFv -/* 800E1B1C 2C 03 00 00 */ cmpwi r3, 0 -/* 800E1B20 40 82 00 74 */ bne lbl_800E1B94 -/* 800E1B24 38 60 00 00 */ li r3, 0 -/* 800E1B28 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800E1B2C 28 00 00 46 */ cmplwi r0, 0x46 -/* 800E1B30 40 82 00 14 */ bne lbl_800E1B44 -/* 800E1B34 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 800E1B38 28 00 00 54 */ cmplwi r0, 0x54 -/* 800E1B3C 40 82 00 08 */ bne lbl_800E1B44 -/* 800E1B40 38 60 00 01 */ li r3, 1 -lbl_800E1B44: -/* 800E1B44 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E1B48 41 82 00 4C */ beq lbl_800E1B94 -/* 800E1B4C 7F E3 FB 78 */ mr r3, r31 -/* 800E1B50 38 80 00 53 */ li r4, 0x53 -/* 800E1B54 38 A0 00 02 */ li r5, 2 -/* 800E1B58 3C C0 80 39 */ lis r6, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E1B5C 38 C6 E6 C8 */ addi r6, r6, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E1B60 4B FC BB 91 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c -/* 800E1B64 7F E3 FB 78 */ mr r3, r31 -/* 800E1B68 4B FF F7 C9 */ bl getCopyRodBallDisMax__9daAlink_cCFv -/* 800E1B6C D0 3F 34 90 */ stfs f1, 0x3490(r31) -/* 800E1B70 88 1F 20 B0 */ lbz r0, 0x20b0(r31) -/* 800E1B74 28 00 00 00 */ cmplwi r0, 0 -/* 800E1B78 40 82 00 14 */ bne lbl_800E1B8C -/* 800E1B7C C0 3F 34 90 */ lfs f1, 0x3490(r31) -/* 800E1B80 C0 02 93 18 */ lfs f0, lit_7308(r2) -/* 800E1B84 EC 01 00 28 */ fsubs f0, f1, f0 -/* 800E1B88 D0 1F 34 90 */ stfs f0, 0x3490(r31) -lbl_800E1B8C: -/* 800E1B8C 38 60 00 01 */ li r3, 1 -/* 800E1B90 48 00 00 10 */ b lbl_800E1BA0 -lbl_800E1B94: -/* 800E1B94 7F E3 FB 78 */ mr r3, r31 -/* 800E1B98 38 80 00 00 */ li r4, 0 -/* 800E1B9C 4B FD 56 51 */ bl cancelUpperItemReadyAnime__9daAlink_cFi -lbl_800E1BA0: -/* 800E1BA0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E1BA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E1BA8 7C 08 03 A6 */ mtlr r0 -/* 800E1BAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E1BB0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkUpperItemActionIronBall__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkUpperItemActionIronBall__9daAlink_cFv.s deleted file mode 100644 index c3cdc4b9c27..00000000000 --- a/asm/d/a/d_a_alink/checkUpperItemActionIronBall__9daAlink_cFv.s +++ /dev/null @@ -1,114 +0,0 @@ -lbl_80115254: -/* 80115254 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80115258 7C 08 02 A6 */ mflr r0 -/* 8011525C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80115260 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80115264 93 C1 00 08 */ stw r30, 8(r1) -/* 80115268 7C 7F 1B 78 */ mr r31, r3 -/* 8011526C 4B F9 D3 99 */ bl itemButton__9daAlink_cFv -/* 80115270 2C 03 00 00 */ cmpwi r3, 0 -/* 80115274 40 82 00 1C */ bne lbl_80115290 -/* 80115278 7F E3 FB 78 */ mr r3, r31 -/* 8011527C 4B FA 36 B5 */ bl checkReadyItem__9daAlink_cFv -/* 80115280 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80115284 41 82 00 0C */ beq lbl_80115290 -/* 80115288 38 00 00 01 */ li r0, 1 -/* 8011528C B0 1F 30 20 */ sth r0, 0x3020(r31) -lbl_80115290: -/* 80115290 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 80115294 28 00 01 9A */ cmplwi r0, 0x19a -/* 80115298 40 82 00 DC */ bne lbl_80115374 -/* 8011529C 3B DF 1F D0 */ addi r30, r31, 0x1fd0 -/* 801152A0 A8 1F 30 20 */ lha r0, 0x3020(r31) -/* 801152A4 2C 00 00 00 */ cmpwi r0, 0 -/* 801152A8 41 82 00 24 */ beq lbl_801152CC -/* 801152AC 7F C3 F3 78 */ mr r3, r30 -/* 801152B0 C0 22 93 C8 */ lfs f1, lit_10286(r2) -/* 801152B4 48 21 31 79 */ bl checkPass__12J3DFrameCtrlFf -/* 801152B8 2C 03 00 00 */ cmpwi r3, 0 -/* 801152BC 41 82 00 10 */ beq lbl_801152CC -/* 801152C0 7F E3 FB 78 */ mr r3, r31 -/* 801152C4 48 00 04 B9 */ bl procIronBallThrowInit__9daAlink_cFv -/* 801152C8 48 00 01 18 */ b lbl_801153E0 -lbl_801152CC: -/* 801152CC 7F C3 F3 78 */ mr r3, r30 -/* 801152D0 48 04 91 FD */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 801152D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801152D8 41 82 00 80 */ beq lbl_80115358 -/* 801152DC 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 801152E0 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 801152E4 41 82 00 20 */ beq lbl_80115304 -/* 801152E8 7F E3 FB 78 */ mr r3, r31 -/* 801152EC 38 80 01 63 */ li r4, 0x163 -/* 801152F0 3C A0 80 39 */ lis r5, m__22daAlinkHIO_ironBall_c0@ha /* 0x8038EA70@ha */ -/* 801152F4 38 A5 EA 70 */ addi r5, r5, m__22daAlinkHIO_ironBall_c0@l /* 0x8038EA70@l */ -/* 801152F8 C0 25 00 24 */ lfs f1, 0x24(r5) -/* 801152FC C0 45 00 28 */ lfs f2, 0x28(r5) -/* 80115300 4B F9 7C E1 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -lbl_80115304: -/* 80115304 7F E3 FB 78 */ mr r3, r31 -/* 80115308 38 80 01 63 */ li r4, 0x163 -/* 8011530C 4B F9 71 45 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM -/* 80115310 A0 83 00 02 */ lhz r4, 2(r3) -/* 80115314 7F E3 FB 78 */ mr r3, r31 -/* 80115318 3C A0 80 39 */ lis r5, m__22daAlinkHIO_ironBall_c0@ha /* 0x8038EA70@ha */ -/* 8011531C 38 A5 EA 70 */ addi r5, r5, m__22daAlinkHIO_ironBall_c0@l /* 0x8038EA70@l */ -/* 80115320 C0 25 00 24 */ lfs f1, 0x24(r5) -/* 80115324 C0 45 00 28 */ lfs f2, 0x28(r5) -/* 80115328 4B F9 80 81 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff -/* 8011532C 38 00 00 02 */ li r0, 2 -/* 80115330 B0 1F 30 18 */ sth r0, 0x3018(r31) -/* 80115334 7F E3 FB 78 */ mr r3, r31 -/* 80115338 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020031@ha */ -/* 8011533C 38 84 00 31 */ addi r4, r4, 0x0031 /* 0x00020031@l */ -/* 80115340 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 80115344 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 80115348 7D 89 03 A6 */ mtctr r12 -/* 8011534C 4E 80 04 21 */ bctrl -/* 80115350 38 60 00 01 */ li r3, 1 -/* 80115354 48 00 00 8C */ b lbl_801153E0 -lbl_80115358: -/* 80115358 C0 3E 00 10 */ lfs f1, 0x10(r30) -/* 8011535C C0 02 93 84 */ lfs f0, lit_8781(r2) -/* 80115360 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80115364 40 81 00 70 */ ble lbl_801153D4 -/* 80115368 38 00 00 01 */ li r0, 1 -/* 8011536C B0 1F 30 18 */ sth r0, 0x3018(r31) -/* 80115370 48 00 00 64 */ b lbl_801153D4 -lbl_80115374: -/* 80115374 3B DF 20 48 */ addi r30, r31, 0x2048 -/* 80115378 A8 1F 30 20 */ lha r0, 0x3020(r31) -/* 8011537C 2C 00 00 00 */ cmpwi r0, 0 -/* 80115380 41 82 00 24 */ beq lbl_801153A4 -/* 80115384 7F C3 F3 78 */ mr r3, r30 -/* 80115388 C0 22 93 C0 */ lfs f1, lit_10193(r2) -/* 8011538C 48 21 30 A1 */ bl checkPass__12J3DFrameCtrlFf -/* 80115390 2C 03 00 00 */ cmpwi r3, 0 -/* 80115394 41 82 00 10 */ beq lbl_801153A4 -/* 80115398 7F E3 FB 78 */ mr r3, r31 -/* 8011539C 48 00 03 E1 */ bl procIronBallThrowInit__9daAlink_cFv -/* 801153A0 48 00 00 40 */ b lbl_801153E0 -lbl_801153A4: -/* 801153A4 7F C3 F3 78 */ mr r3, r30 -/* 801153A8 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 801153AC 48 21 30 81 */ bl checkPass__12J3DFrameCtrlFf -/* 801153B0 2C 03 00 00 */ cmpwi r3, 0 -/* 801153B4 41 82 00 20 */ beq lbl_801153D4 -/* 801153B8 7F E3 FB 78 */ mr r3, r31 -/* 801153BC 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020031@ha */ -/* 801153C0 38 84 00 31 */ addi r4, r4, 0x0031 /* 0x00020031@l */ -/* 801153C4 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 801153C8 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 801153CC 7D 89 03 A6 */ mtctr r12 -/* 801153D0 4E 80 04 21 */ bctrl -lbl_801153D4: -/* 801153D4 7F E3 FB 78 */ mr r3, r31 -/* 801153D8 38 80 00 00 */ li r4, 0 -/* 801153DC 4B FA 1E 11 */ bl cancelUpperItemReadyAnime__9daAlink_cFi -lbl_801153E0: -/* 801153E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801153E4 83 C1 00 08 */ lwz r30, 8(r1) -/* 801153E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801153EC 7C 08 03 A6 */ mtlr r0 -/* 801153F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801153F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkUpperReadyThrowAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkUpperReadyThrowAnime__9daAlink_cCFv.s deleted file mode 100644 index fbb02dc89e1..00000000000 --- a/asm/d/a/d_a_alink/checkUpperReadyThrowAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_800BAF80: -/* 800BAF80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BAF84 7C 08 02 A6 */ mflr r0 -/* 800BAF88 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BAF8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800BAF90 93 C1 00 08 */ stw r30, 8(r1) -/* 800BAF94 7C 7E 1B 78 */ mr r30, r3 -/* 800BAF98 3B E0 00 00 */ li r31, 0 -/* 800BAF9C 48 02 54 A5 */ bl checkBoomerangAnime__9daAlink_cCFv -/* 800BAFA0 2C 03 00 00 */ cmpwi r3, 0 -/* 800BAFA4 40 82 00 5C */ bne lbl_800BB000 -/* 800BAFA8 7F C3 F3 78 */ mr r3, r30 -/* 800BAFAC 48 02 65 85 */ bl checkCopyRodAnime__9daAlink_cCFv -/* 800BAFB0 2C 03 00 00 */ cmpwi r3, 0 -/* 800BAFB4 40 82 00 4C */ bne lbl_800BB000 -/* 800BAFB8 38 60 00 00 */ li r3, 0 -/* 800BAFBC A0 1E 1F BC */ lhz r0, 0x1fbc(r30) -/* 800BAFC0 28 00 01 8D */ cmplwi r0, 0x18d -/* 800BAFC4 41 82 00 10 */ beq lbl_800BAFD4 -/* 800BAFC8 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800BAFCC 28 00 01 8C */ cmplwi r0, 0x18c -/* 800BAFD0 40 82 00 08 */ bne lbl_800BAFD8 -lbl_800BAFD4: -/* 800BAFD4 38 60 00 01 */ li r3, 1 -lbl_800BAFD8: -/* 800BAFD8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800BAFDC 40 82 00 24 */ bne lbl_800BB000 -/* 800BAFE0 7F C3 F3 78 */ mr r3, r30 -/* 800BAFE4 48 05 A1 01 */ bl checkIronBallAnime__9daAlink_cCFv -/* 800BAFE8 2C 03 00 00 */ cmpwi r3, 0 -/* 800BAFEC 40 82 00 14 */ bne lbl_800BB000 -/* 800BAFF0 7F C3 F3 78 */ mr r3, r30 -/* 800BAFF4 48 02 39 F5 */ bl checkBowAnime__9daAlink_cCFv -/* 800BAFF8 2C 03 00 00 */ cmpwi r3, 0 -/* 800BAFFC 41 82 00 08 */ beq lbl_800BB004 -lbl_800BB000: -/* 800BB000 3B E0 00 01 */ li r31, 1 -lbl_800BB004: -/* 800BB004 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800BB008 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800BB00C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800BB010 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BB014 7C 08 03 A6 */ mtlr r0 -/* 800BB018 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BB01C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkUseKandelaar__9daAlink_cFi.s b/asm/d/a/d_a_alink/checkUseKandelaar__9daAlink_cFi.s deleted file mode 100644 index 033a4c6052d..00000000000 --- a/asm/d/a/d_a_alink/checkUseKandelaar__9daAlink_cFi.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8011087C: -/* 8011087C 38 A0 00 00 */ li r5, 0 -/* 80110880 2C 04 00 00 */ cmpwi r4, 0 -/* 80110884 40 82 00 10 */ bne lbl_80110894 -/* 80110888 80 03 05 78 */ lwz r0, 0x578(r3) -/* 8011088C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80110890 40 82 00 18 */ bne lbl_801108A8 -lbl_80110894: -/* 80110894 2C 04 00 00 */ cmpwi r4, 0 -/* 80110898 41 82 00 14 */ beq lbl_801108AC -/* 8011089C A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 801108A0 28 00 00 48 */ cmplwi r0, 0x48 -/* 801108A4 40 82 00 08 */ bne lbl_801108AC -lbl_801108A8: -/* 801108A8 38 A0 00 01 */ li r5, 1 -lbl_801108AC: -/* 801108AC 7C A3 2B 78 */ mr r3, r5 -/* 801108B0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWaterInKandelaarOffset__9daAlink_cFf.s b/asm/d/a/d_a_alink/checkWaterInKandelaarOffset__9daAlink_cFf.s deleted file mode 100644 index 7fd7e3f7fef..00000000000 --- a/asm/d/a/d_a_alink/checkWaterInKandelaarOffset__9daAlink_cFf.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8011078C: -/* 8011078C C0 42 94 BC */ lfs f2, lit_17593(r2) -/* 80110790 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 80110794 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 80110798 41 82 00 0C */ beq lbl_801107A4 -/* 8011079C C0 03 05 F0 */ lfs f0, 0x5f0(r3) -/* 801107A0 48 00 00 08 */ b lbl_801107A8 -lbl_801107A4: -/* 801107A4 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -lbl_801107A8: -/* 801107A8 EC 02 00 2A */ fadds f0, f2, f0 -/* 801107AC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801107B0 7C 00 00 26 */ mfcr r0 -/* 801107B4 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 801107B8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWaterInKandelaar__9daAlink_cFf.s b/asm/d/a/d_a_alink/checkWaterInKandelaar__9daAlink_cFf.s deleted file mode 100644 index 5a48a3a85bb..00000000000 --- a/asm/d/a/d_a_alink/checkWaterInKandelaar__9daAlink_cFf.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_801107BC: -/* 801107BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801107C0 7C 08 02 A6 */ mflr r0 -/* 801107C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801107C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801107CC 7C 7F 1B 78 */ mr r31, r3 -/* 801107D0 80 03 05 78 */ lwz r0, 0x578(r3) -/* 801107D4 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 801107D8 41 82 00 54 */ beq lbl_8011082C -/* 801107DC 4B FF FF B1 */ bl checkWaterInKandelaarOffset__9daAlink_cFf -/* 801107E0 2C 03 00 00 */ cmpwi r3, 0 -/* 801107E4 41 82 00 48 */ beq lbl_8011082C -/* 801107E8 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 801107EC 28 00 00 48 */ cmplwi r0, 0x48 -/* 801107F0 40 82 00 18 */ bne lbl_80110808 -/* 801107F4 7F E3 FB 78 */ mr r3, r31 -/* 801107F8 38 80 00 01 */ li r4, 1 -/* 801107FC 38 A0 00 01 */ li r5, 1 -/* 80110800 4B FB 0A DD */ bl deleteEquipItem__9daAlink_cFii -/* 80110804 48 00 00 28 */ b lbl_8011082C -lbl_80110808: -/* 80110808 7F E3 FB 78 */ mr r3, r31 -/* 8011080C 48 00 00 35 */ bl offKandelaarModel__9daAlink_cFv -/* 80110810 7F E3 FB 78 */ mr r3, r31 -/* 80110814 3C 80 00 02 */ lis r4, 0x0002 /* 0x0002002D@ha */ -/* 80110818 38 84 00 2D */ addi r4, r4, 0x002D /* 0x0002002D@l */ -/* 8011081C 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 80110820 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 80110824 7D 89 03 A6 */ mtctr r12 -/* 80110828 4E 80 04 21 */ bctrl -lbl_8011082C: -/* 8011082C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80110830 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80110834 7C 08 03 A6 */ mtlr r0 -/* 80110838 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011083C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWindDashAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkWindDashAnime__9daAlink_cCFv.s deleted file mode 100644 index 2b24ae37e3d..00000000000 --- a/asm/d/a/d_a_alink/checkWindDashAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_800B9398: -/* 800B9398 38 80 00 00 */ li r4, 0 -/* 800B939C A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800B93A0 28 00 02 B7 */ cmplwi r0, 0x2b7 -/* 800B93A4 41 82 00 1C */ beq lbl_800B93C0 -/* 800B93A8 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800B93AC 28 00 00 CE */ cmplwi r0, 0xce -/* 800B93B0 40 82 00 14 */ bne lbl_800B93C4 -/* 800B93B4 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800B93B8 28 00 00 0C */ cmplwi r0, 0xc -/* 800B93BC 41 82 00 08 */ beq lbl_800B93C4 -lbl_800B93C0: -/* 800B93C0 38 80 00 01 */ li r4, 1 -lbl_800B93C4: -/* 800B93C4 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800B93C8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfAtnMoveBack__9daAlink_cFs.s b/asm/d/a/d_a_alink/checkWolfAtnMoveBack__9daAlink_cFs.s deleted file mode 100644 index 9a4aeea0acd..00000000000 --- a/asm/d/a/d_a_alink/checkWolfAtnMoveBack__9daAlink_cFs.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80128F0C: -/* 80128F0C 3C A0 80 44 */ lis r5, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80128F10 38 A5 9A 20 */ addi r5, r5, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80128F14 54 80 04 38 */ rlwinm r0, r4, 0, 0x10, 0x1c -/* 80128F18 7C 85 02 14 */ add r4, r5, r0 -/* 80128F1C C0 24 00 04 */ lfs f1, 4(r4) -/* 80128F20 38 00 00 00 */ li r0, 0 -/* 80128F24 88 63 2F 98 */ lbz r3, 0x2f98(r3) -/* 80128F28 28 03 00 01 */ cmplwi r3, 1 -/* 80128F2C 41 82 00 10 */ beq lbl_80128F3C -/* 80128F30 C0 02 97 44 */ lfs f0, lit_44003(r2) -/* 80128F34 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80128F38 41 80 00 18 */ blt lbl_80128F50 -lbl_80128F3C: -/* 80128F3C 28 03 00 01 */ cmplwi r3, 1 -/* 80128F40 40 82 00 14 */ bne lbl_80128F54 -/* 80128F44 C0 02 97 48 */ lfs f0, lit_44004(r2) -/* 80128F48 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80128F4C 40 80 00 08 */ bge lbl_80128F54 -lbl_80128F50: -/* 80128F50 38 00 00 01 */ li r0, 1 -lbl_80128F54: -/* 80128F54 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80128F58 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfBarrierHitReverse__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkWolfBarrierHitReverse__9daAlink_cFv.s deleted file mode 100644 index 3c424c53471..00000000000 --- a/asm/d/a/d_a_alink/checkWolfBarrierHitReverse__9daAlink_cFv.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_8012A330: -/* 8012A330 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012A334 7C 08 02 A6 */ mflr r0 -/* 8012A338 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012A33C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012A340 7C 7F 1B 78 */ mr r31, r3 -/* 8012A344 A8 03 31 00 */ lha r0, 0x3100(r3) -/* 8012A348 2C 00 00 00 */ cmpwi r0, 0 -/* 8012A34C 41 82 00 B8 */ beq lbl_8012A404 -/* 8012A350 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) -/* 8012A354 28 00 00 10 */ cmplwi r0, 0x10 -/* 8012A358 41 82 00 AC */ beq lbl_8012A404 -/* 8012A35C 28 00 00 32 */ cmplwi r0, 0x32 -/* 8012A360 41 82 00 A4 */ beq lbl_8012A404 -/* 8012A364 28 00 01 34 */ cmplwi r0, 0x134 -/* 8012A368 41 82 00 9C */ beq lbl_8012A404 -/* 8012A36C 28 00 00 F4 */ cmplwi r0, 0xf4 -/* 8012A370 41 82 00 94 */ beq lbl_8012A404 -/* 8012A374 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8012A378 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8012A37C 41 82 00 10 */ beq lbl_8012A38C -/* 8012A380 38 80 00 01 */ li r4, 1 -/* 8012A384 48 00 35 3D */ bl procWolfDashReverseInit__9daAlink_cFi -/* 8012A388 48 00 00 80 */ b lbl_8012A408 -lbl_8012A38C: -/* 8012A38C 80 1F 19 9C */ lwz r0, 0x199c(r31) -/* 8012A390 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 8012A394 41 82 00 44 */ beq lbl_8012A3D8 -/* 8012A398 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 8012A39C A8 9F 31 02 */ lha r4, 0x3102(r31) -/* 8012A3A0 48 14 6A 85 */ bl cLib_distanceAngleS__Fss -/* 8012A3A4 2C 03 40 00 */ cmpwi r3, 0x4000 -/* 8012A3A8 41 80 00 24 */ blt lbl_8012A3CC -/* 8012A3AC 7F E3 FB 78 */ mr r3, r31 -/* 8012A3B0 38 80 00 00 */ li r4, 0 -/* 8012A3B4 4B F9 79 39 */ bl setFrontRollCrashShock__9daAlink_cFUc -/* 8012A3B8 7F E3 FB 78 */ mr r3, r31 -/* 8012A3BC 38 80 00 00 */ li r4, 0 -/* 8012A3C0 38 A0 00 01 */ li r5, 1 -/* 8012A3C4 4B FA EB 79 */ bl procDamageInit__9daAlink_cFP12dCcD_GObjInfi -/* 8012A3C8 48 00 00 40 */ b lbl_8012A408 -lbl_8012A3CC: -/* 8012A3CC 7F E3 FB 78 */ mr r3, r31 -/* 8012A3D0 4B F9 AD 91 */ bl procFrontRollSuccessInit__9daAlink_cFv -/* 8012A3D4 48 00 00 34 */ b lbl_8012A408 -lbl_8012A3D8: -/* 8012A3D8 38 80 00 00 */ li r4, 0 -/* 8012A3DC 4B F9 79 11 */ bl setFrontRollCrashShock__9daAlink_cFUc -/* 8012A3E0 7F E3 FB 78 */ mr r3, r31 -/* 8012A3E4 38 80 FF FA */ li r4, -6 -/* 8012A3E8 38 A0 00 01 */ li r5, 1 -/* 8012A3EC 38 C0 00 00 */ li r6, 0 -/* 8012A3F0 38 E0 00 00 */ li r7, 0 -/* 8012A3F4 39 00 00 00 */ li r8, 0 -/* 8012A3F8 39 20 00 00 */ li r9, 0 -/* 8012A3FC 4B FA F2 E1 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi -/* 8012A400 48 00 00 08 */ b lbl_8012A408 -lbl_8012A404: -/* 8012A404 38 60 00 00 */ li r3, 0 -lbl_8012A408: -/* 8012A408 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012A40C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012A410 7C 08 03 A6 */ mtlr r0 -/* 8012A414 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012A418 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfBarrierWallHit__9daAlink_cFR13cBgS_PolyInfo.s b/asm/d/a/d_a_alink/checkWolfBarrierWallHit__9daAlink_cFR13cBgS_PolyInfo.s deleted file mode 100644 index 7e45dc8c078..00000000000 --- a/asm/d/a/d_a_alink/checkWolfBarrierWallHit__9daAlink_cFR13cBgS_PolyInfo.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8012A41C: -/* 8012A41C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012A420 7C 08 02 A6 */ mflr r0 -/* 8012A424 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012A428 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012A42C 7C 9F 23 78 */ mr r31, r4 -/* 8012A430 A8 03 31 00 */ lha r0, 0x3100(r3) -/* 8012A434 2C 00 00 00 */ cmpwi r0, 0 -/* 8012A438 40 82 00 10 */ bne lbl_8012A448 -/* 8012A43C 4B F8 94 C9 */ bl checkZeroSpeedF__9daAlink_cCFv -/* 8012A440 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8012A444 41 82 00 0C */ beq lbl_8012A450 -lbl_8012A448: -/* 8012A448 38 60 00 00 */ li r3, 0 -/* 8012A44C 48 00 00 38 */ b lbl_8012A484 -lbl_8012A450: -/* 8012A450 7F E3 FB 78 */ mr r3, r31 -/* 8012A454 38 80 00 01 */ li r4, 1 -/* 8012A458 4B F7 7D 89 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi -/* 8012A45C 7C 60 07 34 */ extsh r0, r3 -/* 8012A460 2C 00 00 30 */ cmpwi r0, 0x30 -/* 8012A464 41 82 00 14 */ beq lbl_8012A478 -/* 8012A468 2C 00 00 2D */ cmpwi r0, 0x2d -/* 8012A46C 41 82 00 0C */ beq lbl_8012A478 -/* 8012A470 2C 00 00 C0 */ cmpwi r0, 0xc0 -/* 8012A474 40 82 00 0C */ bne lbl_8012A480 -lbl_8012A478: -/* 8012A478 38 60 00 01 */ li r3, 1 -/* 8012A47C 48 00 00 08 */ b lbl_8012A484 -lbl_8012A480: -/* 8012A480 38 60 00 00 */ li r3, 0 -lbl_8012A484: -/* 8012A484 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012A488 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012A48C 7C 08 03 A6 */ mtlr r0 -/* 8012A490 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012A494 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfEnemyThrowAction__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkWolfEnemyThrowAction__9daAlink_cFv.s deleted file mode 100644 index 445a3dbd070..00000000000 --- a/asm/d/a/d_a_alink/checkWolfEnemyThrowAction__9daAlink_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80138C44: -/* 80138C44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80138C48 7C 08 02 A6 */ mflr r0 -/* 80138C4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80138C50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80138C54 93 C1 00 08 */ stw r30, 8(r1) -/* 80138C58 7C 7E 1B 78 */ mr r30, r3 -/* 80138C5C 3B FE 20 48 */ addi r31, r30, 0x2048 -/* 80138C60 7F E3 FB 78 */ mr r3, r31 -/* 80138C64 48 02 58 69 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 80138C68 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80138C6C 41 82 00 18 */ beq lbl_80138C84 -/* 80138C70 7F C3 F3 78 */ mr r3, r30 -/* 80138C74 38 80 00 02 */ li r4, 2 -/* 80138C78 C0 22 92 C4 */ lfs f1, lit_6109(r2) -/* 80138C7C 4B F7 4A A9 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf -/* 80138C80 48 00 00 20 */ b lbl_80138CA0 -lbl_80138C84: -/* 80138C84 7F E3 FB 78 */ mr r3, r31 -/* 80138C88 C0 22 94 94 */ lfs f1, lit_16210(r2) -/* 80138C8C 48 1E F7 A1 */ bl checkPass__12J3DFrameCtrlFf -/* 80138C90 2C 03 00 00 */ cmpwi r3, 0 -/* 80138C94 41 82 00 0C */ beq lbl_80138CA0 -/* 80138C98 7F C3 F3 78 */ mr r3, r30 -/* 80138C9C 4B FF FF 69 */ bl resetWolfEnemyBiteAll__9daAlink_cFv -lbl_80138CA0: -/* 80138CA0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80138CA4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80138CA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80138CAC 7C 08 03 A6 */ mtlr r0 -/* 80138CB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80138CB4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfLandAction__9daAlink_cFi.s b/asm/d/a/d_a_alink/checkWolfLandAction__9daAlink_cFi.s deleted file mode 100644 index 6858ae1c651..00000000000 --- a/asm/d/a/d_a_alink/checkWolfLandAction__9daAlink_cFi.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_8012987C: -/* 8012987C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80129880 7C 08 02 A6 */ mflr r0 -/* 80129884 90 01 00 24 */ stw r0, 0x24(r1) -/* 80129888 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 8012988C F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 80129890 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80129894 93 C1 00 08 */ stw r30, 8(r1) -/* 80129898 7C 7E 1B 78 */ mr r30, r3 -/* 8012989C 7C 9F 23 78 */ mr r31, r4 -/* 801298A0 C0 42 93 88 */ lfs f2, lit_8782(r2) -/* 801298A4 C0 23 33 C4 */ lfs f1, 0x33c4(r3) -/* 801298A8 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 801298AC EC 01 00 28 */ fsubs f0, f1, f0 -/* 801298B0 EF E2 00 32 */ fmuls f31, f2, f0 -/* 801298B4 4B FA D6 79 */ bl checkNoLandDamageSlidePolygon__9daAlink_cFv -/* 801298B8 2C 03 00 00 */ cmpwi r3, 0 -/* 801298BC 40 82 00 18 */ bne lbl_801298D4 -/* 801298C0 3C 60 80 39 */ lis r3, m__23daAlinkHIO_wlDamFall_c0@ha /* 0x8038F374@ha */ -/* 801298C4 38 83 F3 74 */ addi r4, r3, m__23daAlinkHIO_wlDamFall_c0@l /* 0x8038F374@l */ -/* 801298C8 C0 04 00 2C */ lfs f0, 0x2c(r4) -/* 801298CC FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 801298D0 40 80 00 44 */ bge lbl_80129914 -lbl_801298D4: -/* 801298D4 2C 1F 00 00 */ cmpwi r31, 0 -/* 801298D8 41 82 00 14 */ beq lbl_801298EC -/* 801298DC 7F C3 F3 78 */ mr r3, r30 -/* 801298E0 38 80 00 00 */ li r4, 0 -/* 801298E4 48 00 D3 35 */ bl procWolfLandDamageInit__9daAlink_cFi -/* 801298E8 48 00 00 4C */ b lbl_80129934 -lbl_801298EC: -/* 801298EC A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) -/* 801298F0 28 00 01 1C */ cmplwi r0, 0x11c -/* 801298F4 41 82 00 0C */ beq lbl_80129900 -/* 801298F8 28 00 00 F4 */ cmplwi r0, 0xf4 -/* 801298FC 40 82 00 0C */ bne lbl_80129908 -lbl_80129900: -/* 80129900 38 60 00 00 */ li r3, 0 -/* 80129904 48 00 00 34 */ b lbl_80129938 -lbl_80129908: -/* 80129908 7F C3 F3 78 */ mr r3, r30 -/* 8012990C 48 00 58 2D */ bl procWolfLandInit__9daAlink_cFv -/* 80129910 48 00 00 24 */ b lbl_80129934 -lbl_80129914: -/* 80129914 7F C3 F3 78 */ mr r3, r30 -/* 80129918 C0 04 00 30 */ lfs f0, 0x30(r4) -/* 8012991C FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 80129920 40 80 00 0C */ bge lbl_8012992C -/* 80129924 38 80 00 01 */ li r4, 1 -/* 80129928 48 00 00 08 */ b lbl_80129930 -lbl_8012992C: -/* 8012992C 38 80 00 02 */ li r4, 2 -lbl_80129930: -/* 80129930 48 00 D2 E9 */ bl procWolfLandDamageInit__9daAlink_cFi -lbl_80129934: -/* 80129934 38 60 00 01 */ li r3, 1 -lbl_80129938: -/* 80129938 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 8012993C CB E1 00 10 */ lfd f31, 0x10(r1) -/* 80129940 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80129944 83 C1 00 08 */ lwz r30, 8(r1) -/* 80129948 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8012994C 7C 08 03 A6 */ mtlr r0 -/* 80129950 38 21 00 20 */ addi r1, r1, 0x20 -/* 80129954 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfLieCode__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkWolfLieCode__9daAlink_cFv.s deleted file mode 100644 index 0fb3a43c64a..00000000000 --- a/asm/d/a/d_a_alink/checkWolfLieCode__9daAlink_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_801373F8: -/* 801373F8 80 03 19 9C */ lwz r0, 0x199c(r3) -/* 801373FC 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80137400 41 82 00 18 */ beq lbl_80137418 -/* 80137404 88 03 2F A8 */ lbz r0, 0x2fa8(r3) -/* 80137408 28 00 00 04 */ cmplwi r0, 4 -/* 8013740C 40 82 00 0C */ bne lbl_80137418 -/* 80137410 38 60 00 01 */ li r3, 1 -/* 80137414 4E 80 00 20 */ blr -lbl_80137418: -/* 80137418 38 60 00 00 */ li r3, 0 -/* 8013741C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfRopeJumpHang__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkWolfRopeJumpHang__9daAlink_cFv.s deleted file mode 100644 index 77a3cf06ea3..00000000000 --- a/asm/d/a/d_a_alink/checkWolfRopeJumpHang__9daAlink_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80131628: -/* 80131628 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013162C 7C 08 02 A6 */ mflr r0 -/* 80131630 90 01 00 14 */ stw r0, 0x14(r1) -/* 80131634 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80131638 7C 7F 1B 78 */ mr r31, r3 -/* 8013163C 38 9F 08 50 */ addi r4, r31, 0x850 -/* 80131640 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80131644 38 C0 00 01 */ li r6, 1 -/* 80131648 4B FF FE 09 */ bl checkWolfRopeHit__9daAlink_cCFP12dCcD_GObjInfPC4cXyzi -/* 8013164C 7C 64 1B 79 */ or. r4, r3, r3 -/* 80131650 40 82 00 1C */ bne lbl_8013166C -/* 80131654 7F E3 FB 78 */ mr r3, r31 -/* 80131658 38 9F 0F B8 */ addi r4, r31, 0xfb8 -/* 8013165C 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80131660 38 C0 00 01 */ li r6, 1 -/* 80131664 4B FF FD ED */ bl checkWolfRopeHit__9daAlink_cCFP12dCcD_GObjInfPC4cXyzi -/* 80131668 7C 64 1B 78 */ mr r4, r3 -lbl_8013166C: -/* 8013166C 28 04 00 00 */ cmplwi r4, 0 -/* 80131670 41 82 00 1C */ beq lbl_8013168C -/* 80131674 38 7F 28 0C */ addi r3, r31, 0x280c -/* 80131678 48 02 D6 41 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -/* 8013167C 7F E3 FB 78 */ mr r3, r31 -/* 80131680 38 80 00 04 */ li r4, 4 -/* 80131684 48 00 10 B5 */ bl procWolfRopeHangInit__9daAlink_cFi -/* 80131688 48 00 00 08 */ b lbl_80131690 -lbl_8013168C: -/* 8013168C 38 60 00 00 */ li r3, 0 -lbl_80131690: -/* 80131690 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80131694 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80131698 7C 08 03 A6 */ mtlr r0 -/* 8013169C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801316A0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfRope__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkWolfRope__9daAlink_cFv.s deleted file mode 100644 index c97ca84a74c..00000000000 --- a/asm/d/a/d_a_alink/checkWolfRope__9daAlink_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80131408: -/* 80131408 38 A0 00 00 */ li r5, 0 -/* 8013140C 7C A4 2B 78 */ mr r4, r5 -/* 80131410 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 80131414 54 00 03 9D */ rlwinm. r0, r0, 0, 0xe, 0xe -/* 80131418 41 82 00 14 */ beq lbl_8013142C -/* 8013141C 80 03 28 10 */ lwz r0, 0x2810(r3) -/* 80131420 28 00 00 00 */ cmplwi r0, 0 -/* 80131424 41 82 00 08 */ beq lbl_8013142C -/* 80131428 38 80 00 01 */ li r4, 1 -lbl_8013142C: -/* 8013142C 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 80131430 41 82 00 18 */ beq lbl_80131448 -/* 80131434 80 63 28 10 */ lwz r3, 0x2810(r3) -/* 80131438 A8 03 00 08 */ lha r0, 8(r3) -/* 8013143C 2C 00 02 BE */ cmpwi r0, 0x2be -/* 80131440 40 82 00 08 */ bne lbl_80131448 -/* 80131444 38 A0 00 01 */ li r5, 1 -lbl_80131448: -/* 80131448 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 8013144C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfShapeReverse__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkWolfShapeReverse__9daAlink_cCFv.s deleted file mode 100644 index ef78cea3bab..00000000000 --- a/asm/d/a/d_a_alink/checkWolfShapeReverse__9daAlink_cCFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80127D68: -/* 80127D68 38 80 00 00 */ li r4, 0 -/* 80127D6C A0 A3 2F E8 */ lhz r5, 0x2fe8(r3) -/* 80127D70 28 05 01 0E */ cmplwi r5, 0x10e -/* 80127D74 41 82 00 14 */ beq lbl_80127D88 -/* 80127D78 28 05 01 26 */ cmplwi r5, 0x126 -/* 80127D7C 41 82 00 0C */ beq lbl_80127D88 -/* 80127D80 28 05 01 1E */ cmplwi r5, 0x11e -/* 80127D84 40 82 00 10 */ bne lbl_80127D94 -lbl_80127D88: -/* 80127D88 A8 03 30 0C */ lha r0, 0x300c(r3) -/* 80127D8C 2C 00 00 00 */ cmpwi r0, 0 -/* 80127D90 40 82 00 28 */ bne lbl_80127DB8 -lbl_80127D94: -/* 80127D94 28 05 01 0D */ cmplwi r5, 0x10d -/* 80127D98 41 82 00 20 */ beq lbl_80127DB8 -/* 80127D9C 28 05 01 08 */ cmplwi r5, 0x108 -/* 80127DA0 40 82 00 10 */ bne lbl_80127DB0 -/* 80127DA4 80 03 31 98 */ lwz r0, 0x3198(r3) -/* 80127DA8 2C 00 00 00 */ cmpwi r0, 0 -/* 80127DAC 40 82 00 0C */ bne lbl_80127DB8 -lbl_80127DB0: -/* 80127DB0 28 05 01 15 */ cmplwi r5, 0x115 -/* 80127DB4 40 82 00 08 */ bne lbl_80127DBC -lbl_80127DB8: -/* 80127DB8 38 80 00 01 */ li r4, 1 -lbl_80127DBC: -/* 80127DBC 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 80127DC0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWoodShieldEquipNotIronBall__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkWoodShieldEquipNotIronBall__9daAlink_cCFv.s deleted file mode 100644 index 60b81fed313..00000000000 --- a/asm/d/a/d_a_alink/checkWoodShieldEquipNotIronBall__9daAlink_cCFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_800DCA2C: -/* 800DCA2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DCA30 7C 08 02 A6 */ mflr r0 -/* 800DCA34 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DCA38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DCA3C 93 C1 00 08 */ stw r30, 8(r1) -/* 800DCA40 7C 7E 1B 78 */ mr r30, r3 -/* 800DCA44 3B E0 00 00 */ li r31, 0 -/* 800DCA48 48 08 29 7D */ bl checkWoodShieldEquip__9daPy_py_cFv -/* 800DCA4C 2C 03 00 00 */ cmpwi r3, 0 -/* 800DCA50 41 82 00 14 */ beq lbl_800DCA64 -/* 800DCA54 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) -/* 800DCA58 28 00 00 42 */ cmplwi r0, 0x42 -/* 800DCA5C 41 82 00 08 */ beq lbl_800DCA64 -/* 800DCA60 3B E0 00 01 */ li r31, 1 -lbl_800DCA64: -/* 800DCA64 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800DCA68 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DCA6C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800DCA70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DCA74 7C 08 03 A6 */ mtlr r0 -/* 800DCA78 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DCA7C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkZoraSwimMove__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkZoraSwimMove__9daAlink_cFv.s deleted file mode 100644 index dae1102e88c..00000000000 --- a/asm/d/a/d_a_alink/checkZoraSwimMove__9daAlink_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80103F94: -/* 80103F94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80103F98 7C 08 02 A6 */ mflr r0 -/* 80103F9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80103FA0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80103FA4 93 C1 00 08 */ stw r30, 8(r1) -/* 80103FA8 7C 7E 1B 78 */ mr r30, r3 -/* 80103FAC 3B E0 00 00 */ li r31, 0 -/* 80103FB0 4B FF FF 75 */ bl checkSwimButtonMove__9daAlink_cFv -/* 80103FB4 2C 03 00 00 */ cmpwi r3, 0 -/* 80103FB8 40 82 00 10 */ bne lbl_80103FC8 -/* 80103FBC A8 1E 30 00 */ lha r0, 0x3000(r30) -/* 80103FC0 2C 00 00 00 */ cmpwi r0, 0 -/* 80103FC4 41 82 00 08 */ beq lbl_80103FCC -lbl_80103FC8: -/* 80103FC8 3B E0 00 01 */ li r31, 1 -lbl_80103FCC: -/* 80103FCC 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 80103FD0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80103FD4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80103FD8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80103FDC 7C 08 03 A6 */ mtlr r0 -/* 80103FE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80103FE4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkZoraWearAbility__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkZoraWearAbility__9daAlink_cCFv.s deleted file mode 100644 index a99fbbcc99b..00000000000 --- a/asm/d/a/d_a_alink/checkZoraWearAbility__9daAlink_cCFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_800BFDB0: -/* 800BFDB0 38 A0 00 00 */ li r5, 0 -/* 800BFDB4 7C A6 2B 78 */ mr r6, r5 -/* 800BFDB8 80 03 05 74 */ lwz r0, 0x574(r3) -/* 800BFDBC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800BFDC0 40 82 00 1C */ bne lbl_800BFDDC -/* 800BFDC4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800BFDC8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800BFDCC 88 04 00 13 */ lbz r0, 0x13(r4) -/* 800BFDD0 28 00 00 31 */ cmplwi r0, 0x31 -/* 800BFDD4 40 82 00 08 */ bne lbl_800BFDDC -/* 800BFDD8 38 C0 00 01 */ li r6, 1 -lbl_800BFDDC: -/* 800BFDDC 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 800BFDE0 41 82 00 14 */ beq lbl_800BFDF4 -/* 800BFDE4 80 03 05 78 */ lwz r0, 0x578(r3) -/* 800BFDE8 54 00 03 19 */ rlwinm. r0, r0, 0, 0xc, 0xc -/* 800BFDEC 40 82 00 08 */ bne lbl_800BFDF4 -/* 800BFDF0 38 A0 00 01 */ li r5, 1 -lbl_800BFDF4: -/* 800BFDF4 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 800BFDF8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkZoraWearMaskDraw__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkZoraWearMaskDraw__9daAlink_cFv.s deleted file mode 100644 index ebb965a9b64..00000000000 --- a/asm/d/a/d_a_alink/checkZoraWearMaskDraw__9daAlink_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80101890: -/* 80101890 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80101894 7C 08 02 A6 */ mflr r0 -/* 80101898 90 01 00 14 */ stw r0, 0x14(r1) -/* 8010189C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801018A0 93 C1 00 08 */ stw r30, 8(r1) -/* 801018A4 7C 7E 1B 78 */ mr r30, r3 -/* 801018A8 3B E0 00 00 */ li r31, 0 -/* 801018AC 4B FB E5 05 */ bl checkZoraWearAbility__9daAlink_cCFv -/* 801018B0 2C 03 00 00 */ cmpwi r3, 0 -/* 801018B4 41 82 00 14 */ beq lbl_801018C8 -/* 801018B8 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 801018BC 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 801018C0 40 82 00 08 */ bne lbl_801018C8 -/* 801018C4 3B E0 00 01 */ li r31, 1 -lbl_801018C8: -/* 801018C8 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 801018CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801018D0 83 C1 00 08 */ lwz r30, 8(r1) -/* 801018D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801018D8 7C 08 03 A6 */ mtlr r0 -/* 801018DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801018E0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/clearWoodShieldBurnEffect__9daAlink_cFv.s b/asm/d/a/d_a_alink/clearWoodShieldBurnEffect__9daAlink_cFv.s deleted file mode 100644 index b378cf8f76d..00000000000 --- a/asm/d/a/d_a_alink/clearWoodShieldBurnEffect__9daAlink_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_801255BC: -/* 801255BC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801255C0 7C 08 02 A6 */ mflr r0 -/* 801255C4 90 01 00 24 */ stw r0, 0x24(r1) -/* 801255C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801255CC 48 23 CC 11 */ bl _savegpr_29 -/* 801255D0 7C 7D 1B 78 */ mr r29, r3 -/* 801255D4 88 03 2F CB */ lbz r0, 0x2fcb(r3) -/* 801255D8 28 00 00 00 */ cmplwi r0, 0 -/* 801255DC 41 82 00 34 */ beq lbl_80125610 -/* 801255E0 3B C0 00 00 */ li r30, 0 -/* 801255E4 3B E0 00 00 */ li r31, 0 -lbl_801255E8: -/* 801255E8 7F A3 EB 78 */ mr r3, r29 -/* 801255EC 38 1F 32 60 */ addi r0, r31, 0x3260 -/* 801255F0 7C 9D 00 2E */ lwzx r4, r29, r0 -/* 801255F4 4B FF B1 85 */ bl stopDrawParticle__9daAlink_cFUl -/* 801255F8 3B DE 00 01 */ addi r30, r30, 1 -/* 801255FC 2C 1E 00 02 */ cmpwi r30, 2 -/* 80125600 3B FF 00 04 */ addi r31, r31, 4 -/* 80125604 41 80 FF E4 */ blt lbl_801255E8 -/* 80125608 38 00 00 00 */ li r0, 0 -/* 8012560C 98 1D 2F CB */ stb r0, 0x2fcb(r29) -lbl_80125610: -/* 80125610 39 61 00 20 */ addi r11, r1, 0x20 -/* 80125614 48 23 CC 15 */ bl _restgpr_29 -/* 80125618 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8012561C 7C 08 03 A6 */ mtlr r0 -/* 80125620 38 21 00 20 */ addi r1, r1, 0x20 -/* 80125624 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/commonGrabPutInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/commonGrabPutInit__9daAlink_cFv.s deleted file mode 100644 index aca676dcfd4..00000000000 --- a/asm/d/a/d_a_alink/commonGrabPutInit__9daAlink_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80120474: -/* 80120474 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80120478 7C 08 02 A6 */ mflr r0 -/* 8012047C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80120480 7C 64 1B 78 */ mr r4, r3 -/* 80120484 80 03 28 30 */ lwz r0, 0x2830(r3) -/* 80120488 28 00 00 00 */ cmplwi r0, 0 -/* 8012048C 40 82 00 44 */ bne lbl_801204D0 -/* 80120490 A0 04 2F E8 */ lhz r0, 0x2fe8(r4) -/* 80120494 28 00 00 73 */ cmplwi r0, 0x73 -/* 80120498 41 82 00 38 */ beq lbl_801204D0 -/* 8012049C 28 00 01 2C */ cmplwi r0, 0x12c -/* 801204A0 40 82 00 14 */ bne lbl_801204B4 -/* 801204A4 C0 24 1F E0 */ lfs f1, 0x1fe0(r4) -/* 801204A8 C0 04 34 78 */ lfs f0, 0x3478(r4) -/* 801204AC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801204B0 41 80 00 20 */ blt lbl_801204D0 -lbl_801204B4: -/* 801204B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801204B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801204BC 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 801204C0 80 84 31 84 */ lwz r4, 0x3184(r4) -/* 801204C4 4B F2 7C B9 */ bl cutEnd__16dEvent_manager_cFi -/* 801204C8 38 60 00 01 */ li r3, 1 -/* 801204CC 48 00 00 24 */ b lbl_801204F0 -lbl_801204D0: -/* 801204D0 80 04 05 74 */ lwz r0, 0x574(r4) -/* 801204D4 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 801204D8 41 82 00 10 */ beq lbl_801204E8 -/* 801204DC 7C 83 23 78 */ mr r3, r4 -/* 801204E0 48 01 D0 A9 */ bl procWolfGrabPutInit__9daAlink_cFv -/* 801204E4 48 00 00 0C */ b lbl_801204F0 -lbl_801204E8: -/* 801204E8 7C 83 23 78 */ mr r3, r4 -/* 801204EC 4B FC 62 41 */ bl procGrabPutInit__9daAlink_cFv -lbl_801204F0: -/* 801204F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801204F4 7C 08 03 A6 */ mtlr r0 -/* 801204F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801204FC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/commonInitForceRideRein__9daAlink_cFv.s b/asm/d/a/d_a_alink/commonInitForceRideRein__9daAlink_cFv.s deleted file mode 100644 index 04c95e9f4c9..00000000000 --- a/asm/d/a/d_a_alink/commonInitForceRideRein__9daAlink_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_800ECA3C: -/* 800ECA3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800ECA40 7C 08 02 A6 */ mflr r0 -/* 800ECA44 90 01 00 14 */ stw r0, 0x14(r1) -/* 800ECA48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800ECA4C 7C 7F 1B 78 */ mr r31, r3 -/* 800ECA50 38 80 00 00 */ li r4, 0 -/* 800ECA54 4B FF 5B 2D */ bl setHeavyBoots__9daAlink_cFi -/* 800ECA58 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800ECA5C 60 00 04 00 */ ori r0, r0, 0x400 -/* 800ECA60 90 1F 31 A0 */ stw r0, 0x31a0(r31) -/* 800ECA64 38 60 00 00 */ li r3, 0 -/* 800ECA68 98 7F 2F C0 */ stb r3, 0x2fc0(r31) -/* 800ECA6C 38 00 00 13 */ li r0, 0x13 -/* 800ECA70 98 1F 2F AB */ stb r0, 0x2fab(r31) -/* 800ECA74 B0 7F 30 02 */ sth r3, 0x3002(r31) -/* 800ECA78 B0 7F 30 04 */ sth r3, 0x3004(r31) -/* 800ECA7C B0 7F 30 A6 */ sth r3, 0x30a6(r31) -/* 800ECA80 7F E3 FB 78 */ mr r3, r31 -/* 800ECA84 4B FC 6D C1 */ bl initServiceWaitTime__9daAlink_cFv -/* 800ECA88 38 00 00 46 */ li r0, 0x46 -/* 800ECA8C B0 1F 05 4E */ sth r0, 0x54e(r31) -/* 800ECA90 38 00 00 01 */ li r0, 1 -/* 800ECA94 B0 1F 1F E4 */ sth r0, 0x1fe4(r31) -/* 800ECA98 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800ECA9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800ECAA0 7C 08 03 A6 */ mtlr r0 -/* 800ECAA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ECAA8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/commonProcBoardInit__9daAlink_cFQ29daAlink_c12daAlink_PROC.s b/asm/d/a/d_a_alink/commonProcBoardInit__9daAlink_cFQ29daAlink_c12daAlink_PROC.s deleted file mode 100644 index 8e365bf7b60..00000000000 --- a/asm/d/a/d_a_alink/commonProcBoardInit__9daAlink_cFQ29daAlink_c12daAlink_PROC.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80106650: -/* 80106650 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80106654 7C 08 02 A6 */ mflr r0 -/* 80106658 90 01 00 14 */ stw r0, 0x14(r1) -/* 8010665C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80106660 93 C1 00 08 */ stw r30, 8(r1) -/* 80106664 7C 7E 1B 78 */ mr r30, r3 -/* 80106668 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 8010666C 7C 00 20 00 */ cmpw r0, r4 -/* 80106670 40 82 00 0C */ bne lbl_8010667C -/* 80106674 38 60 00 00 */ li r3, 0 -/* 80106678 48 00 00 28 */ b lbl_801066A0 -lbl_8010667C: -/* 8010667C 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 80106680 54 1F 07 BC */ rlwinm r31, r0, 0, 0x1e, 0x1e -/* 80106684 4B FB B8 E9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80106688 28 1F 00 00 */ cmplwi r31, 0 -/* 8010668C 41 82 00 10 */ beq lbl_8010669C -/* 80106690 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 80106694 60 00 00 02 */ ori r0, r0, 2 -/* 80106698 90 1E 31 A0 */ stw r0, 0x31a0(r30) -lbl_8010669C: -/* 8010669C 38 60 00 01 */ li r3, 1 -lbl_801066A0: -/* 801066A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801066A4 83 C1 00 08 */ lwz r30, 8(r1) -/* 801066A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801066AC 7C 08 03 A6 */ mtlr r0 -/* 801066B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801066B4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_Create__FP10fopAc_ac_c.s b/asm/d/a/d_a_alink/daAlink_Create__FP10fopAc_ac_c.s deleted file mode 100644 index a4a21a90b15..00000000000 --- a/asm/d/a/d_a_alink/daAlink_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_800A660C: -/* 800A660C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800A6610 7C 08 02 A6 */ mflr r0 -/* 800A6614 90 01 00 14 */ stw r0, 0x14(r1) -/* 800A6618 4B FF F6 B1 */ bl create__9daAlink_cFv -/* 800A661C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800A6620 7C 08 03 A6 */ mtlr r0 -/* 800A6624 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A6628 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_Draw__FP9daAlink_c.s b/asm/d/a/d_a_alink/daAlink_Draw__FP9daAlink_c.s deleted file mode 100644 index 7e391096f80..00000000000 --- a/asm/d/a/d_a_alink/daAlink_Draw__FP9daAlink_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_800CD78C: -/* 800CD78C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800CD790 7C 08 02 A6 */ mflr r0 -/* 800CD794 90 01 00 14 */ stw r0, 0x14(r1) -/* 800CD798 4B FF F0 65 */ bl draw__9daAlink_cFv -/* 800CD79C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800CD7A0 7C 08 03 A6 */ mtlr r0 -/* 800CD7A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800CD7A8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_bottleModelCallBack__FP8J3DJointi.s b/asm/d/a/d_a_alink/daAlink_bottleModelCallBack__FP8J3DJointi.s deleted file mode 100644 index 9c17e4030b7..00000000000 --- a/asm/d/a/d_a_alink/daAlink_bottleModelCallBack__FP8J3DJointi.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8010E52C: -/* 8010E52C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8010E530 7C 08 02 A6 */ mflr r0 -/* 8010E534 90 01 00 14 */ stw r0, 0x14(r1) -/* 8010E538 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8010E53C 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 8010E540 80 63 00 38 */ lwz r3, 0x38(r3) -/* 8010E544 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8010E548 2C 04 00 00 */ cmpwi r4, 0 -/* 8010E54C 40 82 00 08 */ bne lbl_8010E554 -/* 8010E550 4B FF FF 3D */ bl bottleModelCallBack__9daAlink_cFv -lbl_8010E554: -/* 8010E554 38 60 00 01 */ li r3, 1 -/* 8010E558 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8010E55C 7C 08 03 A6 */ mtlr r0 -/* 8010E560 38 21 00 10 */ addi r1, r1, 0x10 -/* 8010E564 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_kandelaarModelCallBack__FP8J3DJointi.s b/asm/d/a/d_a_alink/daAlink_kandelaarModelCallBack__FP8J3DJointi.s deleted file mode 100644 index 9480f15085e..00000000000 --- a/asm/d/a/d_a_alink/daAlink_kandelaarModelCallBack__FP8J3DJointi.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80110BEC: -/* 80110BEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80110BF0 7C 08 02 A6 */ mflr r0 -/* 80110BF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80110BF8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80110BFC 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80110C00 80 63 00 38 */ lwz r3, 0x38(r3) -/* 80110C04 80 63 00 14 */ lwz r3, 0x14(r3) -/* 80110C08 2C 04 00 00 */ cmpwi r4, 0 -/* 80110C0C 40 82 00 08 */ bne lbl_80110C14 -/* 80110C10 4B FF FC DD */ bl kandelaarModelCallBack__9daAlink_cFv -lbl_80110C14: -/* 80110C14 38 60 00 01 */ li r3, 1 -/* 80110C18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80110C1C 7C 08 03 A6 */ mtlr r0 -/* 80110C20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80110C24 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_searchCanoe__FP10fopAc_ac_cPv.s b/asm/d/a/d_a_alink/daAlink_searchCanoe__FP10fopAc_ac_cPv.s deleted file mode 100644 index 268addbc434..00000000000 --- a/asm/d/a/d_a_alink/daAlink_searchCanoe__FP10fopAc_ac_cPv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_800F3CD8: -/* 800F3CD8 A8 03 00 08 */ lha r0, 8(r3) -/* 800F3CDC 2C 00 00 ED */ cmpwi r0, 0xed -/* 800F3CE0 40 82 00 10 */ bne lbl_800F3CF0 -/* 800F3CE4 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800F3CE8 28 00 00 00 */ cmplwi r0, 0 -/* 800F3CEC 4C 82 00 20 */ bnelr -lbl_800F3CF0: -/* 800F3CF0 38 60 00 00 */ li r3, 0 -/* 800F3CF4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_searchCoach__FP10fopAc_ac_cPv.s b/asm/d/a/d_a_alink/daAlink_searchCoach__FP10fopAc_ac_cPv.s deleted file mode 100644 index c773992b84d..00000000000 --- a/asm/d/a/d_a_alink/daAlink_searchCoach__FP10fopAc_ac_cPv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800EC758: -/* 800EC758 A8 03 00 08 */ lha r0, 8(r3) -/* 800EC75C 2C 00 00 56 */ cmpwi r0, 0x56 -/* 800EC760 4D 82 00 20 */ beqlr -/* 800EC764 38 60 00 00 */ li r3, 0 -/* 800EC768 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_searchEnemyCargo__FP10fopAc_ac_cPv.s b/asm/d/a/d_a_alink/daAlink_searchEnemyCargo__FP10fopAc_ac_cPv.s deleted file mode 100644 index 2a73d09da5b..00000000000 --- a/asm/d/a/d_a_alink/daAlink_searchEnemyCargo__FP10fopAc_ac_cPv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8013DB58: -/* 8013DB58 A8 03 00 08 */ lha r0, 8(r3) -/* 8013DB5C 2C 00 00 F5 */ cmpwi r0, 0xf5 -/* 8013DB60 4D 82 00 20 */ beqlr -/* 8013DB64 38 60 00 00 */ li r3, 0 -/* 8013DB68 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_searchGiant__FP10fopAc_ac_cPv.s b/asm/d/a/d_a_alink/daAlink_searchGiant__FP10fopAc_ac_cPv.s deleted file mode 100644 index ad32ac526fa..00000000000 --- a/asm/d/a/d_a_alink/daAlink_searchGiant__FP10fopAc_ac_cPv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80135050: -/* 80135050 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80135054 7C 08 02 A6 */ mflr r0 -/* 80135058 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013505C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80135060 7C 7F 1B 78 */ mr r31, r3 -/* 80135064 A8 03 00 08 */ lha r0, 8(r3) -/* 80135068 2C 00 00 20 */ cmpwi r0, 0x20 -/* 8013506C 40 82 00 20 */ bne lbl_8013508C -/* 80135070 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80135074 48 21 23 29 */ bl PSVECSquareDistance -/* 80135078 C0 02 97 98 */ lfs f0, lit_49124(r2) -/* 8013507C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80135080 40 80 00 0C */ bge lbl_8013508C -/* 80135084 7F E3 FB 78 */ mr r3, r31 -/* 80135088 48 00 00 08 */ b lbl_80135090 -lbl_8013508C: -/* 8013508C 38 60 00 00 */ li r3, 0 -lbl_80135090: -/* 80135090 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80135094 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80135098 7C 08 03 A6 */ mtlr r0 -/* 8013509C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801350A0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_searchGoldWolf__FP10fopAc_ac_cPv.s b/asm/d/a/d_a_alink/daAlink_searchGoldWolf__FP10fopAc_ac_cPv.s deleted file mode 100644 index e17293fc3be..00000000000 --- a/asm/d/a/d_a_alink/daAlink_searchGoldWolf__FP10fopAc_ac_cPv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8013056C: -/* 8013056C A8 03 00 08 */ lha r0, 8(r3) -/* 80130570 2C 00 02 4F */ cmpwi r0, 0x24f -/* 80130574 4D 82 00 20 */ beqlr -/* 80130578 38 60 00 00 */ li r3, 0 -/* 8013057C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_searchIceLeaf__FP10fopAc_ac_cPv.s b/asm/d/a/d_a_alink/daAlink_searchIceLeaf__FP10fopAc_ac_cPv.s deleted file mode 100644 index 2437b866ec4..00000000000 --- a/asm/d/a/d_a_alink/daAlink_searchIceLeaf__FP10fopAc_ac_cPv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80105A84: -/* 80105A84 A8 03 00 08 */ lha r0, 8(r3) -/* 80105A88 2C 00 01 87 */ cmpwi r0, 0x187 -/* 80105A8C 4D 82 00 20 */ beqlr -/* 80105A90 38 60 00 00 */ li r3, 0 -/* 80105A94 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_searchPeepObj__FP10fopAc_ac_cPv.s b/asm/d/a/d_a_alink/daAlink_searchPeepObj__FP10fopAc_ac_cPv.s deleted file mode 100644 index a2b78f1990b..00000000000 --- a/asm/d/a/d_a_alink/daAlink_searchPeepObj__FP10fopAc_ac_cPv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_800CED48: -/* 800CED48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800CED4C 7C 08 02 A6 */ mflr r0 -/* 800CED50 90 01 00 14 */ stw r0, 0x14(r1) -/* 800CED54 7C 60 1B 78 */ mr r0, r3 -/* 800CED58 7C 85 23 78 */ mr r5, r4 -/* 800CED5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800CED60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800CED64 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 800CED68 7C 04 03 78 */ mr r4, r0 -/* 800CED6C 4B FF FF 79 */ bl searchPeepObj__9daAlink_cFP10fopAc_ac_cPv -/* 800CED70 38 60 00 00 */ li r3, 0 -/* 800CED74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800CED78 7C 08 03 A6 */ mtlr r0 -/* 800CED7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800CED80 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_searchTagKandelaar__FP10fopAc_ac_cPv.s b/asm/d/a/d_a_alink/daAlink_searchTagKandelaar__FP10fopAc_ac_cPv.s deleted file mode 100644 index 23e1fb9cf27..00000000000 --- a/asm/d/a/d_a_alink/daAlink_searchTagKandelaar__FP10fopAc_ac_cPv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80110654: -/* 80110654 A8 03 00 08 */ lha r0, 8(r3) -/* 80110658 2C 00 02 D6 */ cmpwi r0, 0x2d6 -/* 8011065C 4D 82 00 20 */ beqlr -/* 80110660 38 60 00 00 */ li r3, 0 -/* 80110664 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_searchTagKtOnFire__FP10fopAc_ac_cPv.s b/asm/d/a/d_a_alink/daAlink_searchTagKtOnFire__FP10fopAc_ac_cPv.s deleted file mode 100644 index a09c33f4af0..00000000000 --- a/asm/d/a/d_a_alink/daAlink_searchTagKtOnFire__FP10fopAc_ac_cPv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80110668: -/* 80110668 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011066C 7C 08 02 A6 */ mflr r0 -/* 80110670 90 01 00 14 */ stw r0, 0x14(r1) -/* 80110674 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80110678 93 C1 00 08 */ stw r30, 8(r1) -/* 8011067C 7C 7E 1B 78 */ mr r30, r3 -/* 80110680 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80110684 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80110688 83 E3 5D B4 */ lwz r31, 0x5db4(r3) -/* 8011068C A8 1E 00 08 */ lha r0, 8(r30) -/* 80110690 2C 00 01 68 */ cmpwi r0, 0x168 -/* 80110694 40 82 00 38 */ bne lbl_801106CC -/* 80110698 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 8011069C 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 801106A0 48 23 6C FD */ bl PSVECSquareDistance -/* 801106A4 C0 02 95 C0 */ lfs f0, lit_26816(r2) -/* 801106A8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801106AC 40 80 00 20 */ bge lbl_801106CC -/* 801106B0 7F E3 FB 78 */ mr r3, r31 -/* 801106B4 7F C4 F3 78 */ mr r4, r30 -/* 801106B8 4B F0 A0 E5 */ bl fopAcM_seenActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 801106BC 2C 03 30 00 */ cmpwi r3, 0x3000 -/* 801106C0 40 80 00 0C */ bge lbl_801106CC -/* 801106C4 7F C3 F3 78 */ mr r3, r30 -/* 801106C8 48 00 00 08 */ b lbl_801106D0 -lbl_801106CC: -/* 801106CC 38 60 00 00 */ li r3, 0 -lbl_801106D0: -/* 801106D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801106D4 83 C1 00 08 */ lwz r30, 8(r1) -/* 801106D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801106DC 7C 08 03 A6 */ mtlr r0 -/* 801106E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801106E4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_searchWolfLockEnemy__FP10fopAc_ac_cPv.s b/asm/d/a/d_a_alink/daAlink_searchWolfLockEnemy__FP10fopAc_ac_cPv.s deleted file mode 100644 index 1818f23995b..00000000000 --- a/asm/d/a/d_a_alink/daAlink_searchWolfLockEnemy__FP10fopAc_ac_cPv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_801392A8: -/* 801392A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801392AC 7C 08 02 A6 */ mflr r0 -/* 801392B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801392B4 7C 60 1B 78 */ mr r0, r3 -/* 801392B8 7C 85 23 78 */ mr r5, r4 -/* 801392BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801392C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801392C4 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 801392C8 7C 04 03 78 */ mr r4, r0 -/* 801392CC 4B FF FF 19 */ bl searchWolfLockEnemy__9daAlink_cFP10fopAc_ac_cPv -/* 801392D0 38 60 00 00 */ li r3, 0 -/* 801392D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801392D8 7C 08 03 A6 */ mtlr r0 -/* 801392DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801392E0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/damageMagnification__9daAlink_cFii.s b/asm/d/a/d_a_alink/damageMagnification__9daAlink_cFii.s deleted file mode 100644 index 9b718e193c1..00000000000 --- a/asm/d/a/d_a_alink/damageMagnification__9daAlink_cFii.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_800D7208: -/* 800D7208 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800D720C 7C 08 02 A6 */ mflr r0 -/* 800D7210 90 01 00 24 */ stw r0, 0x24(r1) -/* 800D7214 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 800D7218 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 800D721C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D7220 7C 9F 23 78 */ mr r31, r4 -/* 800D7224 2C 05 00 00 */ cmpwi r5, 0 -/* 800D7228 40 82 00 24 */ bne lbl_800D724C -/* 800D722C 80 03 05 7C */ lwz r0, 0x57c(r3) -/* 800D7230 54 00 00 43 */ rlwinm. r0, r0, 0, 1, 1 -/* 800D7234 41 82 00 18 */ beq lbl_800D724C -/* 800D7238 80 03 05 90 */ lwz r0, 0x590(r3) -/* 800D723C 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 800D7240 40 82 00 0C */ bne lbl_800D724C -/* 800D7244 C3 E2 93 2C */ lfs f31, lit_7624(r2) -/* 800D7248 48 00 00 08 */ b lbl_800D7250 -lbl_800D724C: -/* 800D724C C3 E2 92 B8 */ lfs f31, lit_6040(r2) -lbl_800D7250: -/* 800D7250 80 03 05 74 */ lwz r0, 0x574(r3) -/* 800D7254 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800D7258 41 82 00 24 */ beq lbl_800D727C -/* 800D725C 88 03 05 6A */ lbz r0, 0x56a(r3) -/* 800D7260 28 00 00 2C */ cmplwi r0, 0x2c -/* 800D7264 41 82 00 18 */ beq lbl_800D727C -/* 800D7268 2C 05 00 00 */ cmpwi r5, 0 -/* 800D726C 40 82 00 10 */ bne lbl_800D727C -/* 800D7270 C0 02 93 14 */ lfs f0, lit_7307(r2) -/* 800D7274 EC 20 07 F2 */ fmuls f1, f0, f31 -/* 800D7278 48 00 00 28 */ b lbl_800D72A0 -lbl_800D727C: -/* 800D727C 4B FE 8B 35 */ bl checkZoraWearAbility__9daAlink_cCFv -/* 800D7280 2C 03 00 00 */ cmpwi r3, 0 -/* 800D7284 41 82 00 18 */ beq lbl_800D729C -/* 800D7288 2C 1F 00 00 */ cmpwi r31, 0 -/* 800D728C 41 82 00 10 */ beq lbl_800D729C -/* 800D7290 C0 02 93 30 */ lfs f0, lit_7625(r2) -/* 800D7294 EC 20 07 F2 */ fmuls f1, f0, f31 -/* 800D7298 48 00 00 08 */ b lbl_800D72A0 -lbl_800D729C: -/* 800D729C FC 20 F8 90 */ fmr f1, f31 -lbl_800D72A0: -/* 800D72A0 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 800D72A4 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 800D72A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D72AC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800D72B0 7C 08 03 A6 */ mtlr r0 -/* 800D72B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800D72B8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/damageTimerCount__9daAlink_cFv.s b/asm/d/a/d_a_alink/damageTimerCount__9daAlink_cFv.s deleted file mode 100644 index e953305c8db..00000000000 --- a/asm/d/a/d_a_alink/damageTimerCount__9daAlink_cFv.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_800D7B18: -/* 800D7B18 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 800D7B1C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 800D7B20 40 82 00 70 */ bne lbl_800D7B90 -/* 800D7B24 88 83 2F B5 */ lbz r4, 0x2fb5(r3) -/* 800D7B28 28 04 00 00 */ cmplwi r4, 0 -/* 800D7B2C 41 82 00 0C */ beq lbl_800D7B38 -/* 800D7B30 38 04 FF FF */ addi r0, r4, -1 -/* 800D7B34 98 03 2F B5 */ stb r0, 0x2fb5(r3) -lbl_800D7B38: -/* 800D7B38 A8 83 05 6C */ lha r4, 0x56c(r3) -/* 800D7B3C 38 04 FF FF */ addi r0, r4, -1 -/* 800D7B40 B0 03 05 6C */ sth r0, 0x56c(r3) -/* 800D7B44 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D7B48 28 00 00 78 */ cmplwi r0, 0x78 -/* 800D7B4C 41 82 00 1C */ beq lbl_800D7B68 -/* 800D7B50 80 03 05 74 */ lwz r0, 0x574(r3) -/* 800D7B54 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 800D7B58 41 82 00 10 */ beq lbl_800D7B68 -/* 800D7B5C 80 03 05 74 */ lwz r0, 0x574(r3) -/* 800D7B60 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 800D7B64 90 03 05 74 */ stw r0, 0x574(r3) -lbl_800D7B68: -/* 800D7B68 A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800D7B6C 28 00 02 62 */ cmplwi r0, 0x262 -/* 800D7B70 4D 82 00 20 */ beqlr -/* 800D7B74 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800D7B78 54 00 03 9D */ rlwinm. r0, r0, 0, 0xe, 0xe -/* 800D7B7C 4D 82 00 20 */ beqlr -/* 800D7B80 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800D7B84 54 00 03 DA */ rlwinm r0, r0, 0, 0xf, 0xd -/* 800D7B88 90 03 05 70 */ stw r0, 0x570(r3) -/* 800D7B8C 4E 80 00 20 */ blr -lbl_800D7B90: -/* 800D7B90 88 83 2F B5 */ lbz r4, 0x2fb5(r3) -/* 800D7B94 28 04 00 00 */ cmplwi r4, 0 -/* 800D7B98 4D 82 00 20 */ beqlr -/* 800D7B9C 38 04 FF FF */ addi r0, r4, -1 -/* 800D7BA0 98 03 2F B5 */ stb r0, 0x2fb5(r3) -/* 800D7BA4 88 03 2F B5 */ lbz r0, 0x2fb5(r3) -/* 800D7BA8 A8 A3 05 6C */ lha r5, 0x56c(r3) -/* 800D7BAC 7C 80 2A 14 */ add r4, r0, r5 -/* 800D7BB0 54 80 E0 06 */ slwi r0, r4, 0x1c -/* 800D7BB4 54 84 0F FE */ srwi r4, r4, 0x1f -/* 800D7BB8 7C 04 00 50 */ subf r0, r4, r0 -/* 800D7BBC 54 00 20 3E */ rotlwi r0, r0, 4 -/* 800D7BC0 7C 00 22 15 */ add. r0, r0, r4 -/* 800D7BC4 4C 82 00 20 */ bnelr -/* 800D7BC8 54 A0 E0 06 */ slwi r0, r5, 0x1c -/* 800D7BCC 54 A4 0F FE */ srwi r4, r5, 0x1f -/* 800D7BD0 7C 04 00 50 */ subf r0, r4, r0 -/* 800D7BD4 54 00 20 3E */ rotlwi r0, r0, 4 -/* 800D7BD8 7C 00 22 14 */ add r0, r0, r4 -/* 800D7BDC 20 00 00 20 */ subfic r0, r0, 0x20 -/* 800D7BE0 98 03 2F B5 */ stb r0, 0x2fb5(r3) -/* 800D7BE4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/decSwordBlur__9daAlink_cFv.s b/asm/d/a/d_a_alink/decSwordBlur__9daAlink_cFv.s deleted file mode 100644 index 77a3998fe54..00000000000 --- a/asm/d/a/d_a_alink/decSwordBlur__9daAlink_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_800AA6B4: -/* 800AA6B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800AA6B8 7C 08 02 A6 */ mflr r0 -/* 800AA6BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800AA6C0 7C 67 1B 78 */ mr r7, r3 -/* 800AA6C4 80 63 22 04 */ lwz r3, 0x2204(r3) -/* 800AA6C8 2C 03 00 0A */ cmpwi r3, 0xa -/* 800AA6CC 40 80 00 10 */ bge lbl_800AA6DC -/* 800AA6D0 38 00 00 00 */ li r0, 0 -/* 800AA6D4 90 07 22 04 */ stw r0, 0x2204(r7) -/* 800AA6D8 48 00 00 2C */ b lbl_800AA704 -lbl_800AA6DC: -/* 800AA6DC 38 03 FF F6 */ addi r0, r3, -10 -/* 800AA6E0 90 07 22 04 */ stw r0, 0x2204(r7) -/* 800AA6E4 38 67 21 F0 */ addi r3, r7, 0x21f0 -/* 800AA6E8 38 87 04 D0 */ addi r4, r7, 0x4d0 -/* 800AA6EC 38 A7 04 BC */ addi r5, r7, 0x4bc -/* 800AA6F0 A8 C7 2F E6 */ lha r6, 0x2fe6(r7) -/* 800AA6F4 A8 07 04 E6 */ lha r0, 0x4e6(r7) -/* 800AA6F8 7C 06 00 50 */ subf r0, r6, r0 -/* 800AA6FC 7C 06 07 34 */ extsh r6, r0 -/* 800AA700 48 07 B4 0D */ bl traceBlur__14daAlink_blur_cFPC4cXyzPC4cXyzs -lbl_800AA704: -/* 800AA704 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800AA708 7C 08 03 A6 */ mtlr r0 -/* 800AA70C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AA710 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/deleteArrow__9daAlink_cFv.s b/asm/d/a/d_a_alink/deleteArrow__9daAlink_cFv.s deleted file mode 100644 index 69ab0bc1c90..00000000000 --- a/asm/d/a/d_a_alink/deleteArrow__9daAlink_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_800DEAE4: -/* 800DEAE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DEAE8 7C 08 02 A6 */ mflr r0 -/* 800DEAEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DEAF0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DEAF4 7C 7F 1B 78 */ mr r31, r3 -/* 800DEAF8 80 63 28 28 */ lwz r3, 0x2828(r3) -/* 800DEAFC 28 03 00 00 */ cmplwi r3, 0 -/* 800DEB00 41 82 00 78 */ beq lbl_800DEB78 -/* 800DEB04 A8 03 00 08 */ lha r0, 8(r3) -/* 800DEB08 2C 00 03 08 */ cmpwi r0, 0x308 -/* 800DEB0C 40 82 00 6C */ bne lbl_800DEB78 -/* 800DEB10 88 03 09 3C */ lbz r0, 0x93c(r3) -/* 800DEB14 28 00 00 01 */ cmplwi r0, 1 -/* 800DEB18 40 82 00 54 */ bne lbl_800DEB6C -/* 800DEB1C A8 BF 05 6C */ lha r5, 0x56c(r31) -/* 800DEB20 3C 80 80 39 */ lis r4, m__20daAlinkHIO_damage_c0@ha /* 0x8038E54C@ha */ -/* 800DEB24 38 84 E5 4C */ addi r4, r4, m__20daAlinkHIO_damage_c0@l /* 0x8038E54C@l */ -/* 800DEB28 A8 04 00 2A */ lha r0, 0x2a(r4) -/* 800DEB2C 7C 05 00 00 */ cmpw r5, r0 -/* 800DEB30 41 82 00 10 */ beq lbl_800DEB40 -/* 800DEB34 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800DEB38 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 800DEB3C 41 82 00 30 */ beq lbl_800DEB6C -lbl_800DEB40: -/* 800DEB40 38 00 00 00 */ li r0, 0 -/* 800DEB44 B0 03 09 50 */ sth r0, 0x950(r3) -/* 800DEB48 88 7F 2F 9C */ lbz r3, 0x2f9c(r31) -/* 800DEB4C 38 80 FF FF */ li r4, -1 -/* 800DEB50 4B F4 FC ED */ bl dComIfGp_addSelectItemNum__Fis -/* 800DEB54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800DEB58 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800DEB5C A8 64 5D F4 */ lha r3, 0x5df4(r4) -/* 800DEB60 38 03 FF FF */ addi r0, r3, -1 -/* 800DEB64 B0 04 5D F4 */ sth r0, 0x5df4(r4) -/* 800DEB68 48 00 00 08 */ b lbl_800DEB70 -lbl_800DEB6C: -/* 800DEB6C 4B F3 B1 11 */ bl fopAcM_delete__FP10fopAc_ac_c -lbl_800DEB70: -/* 800DEB70 38 7F 28 24 */ addi r3, r31, 0x2824 -/* 800DEB74 48 08 01 89 */ bl clearData__16daPy_actorKeep_cFv -lbl_800DEB78: -/* 800DEB78 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DEB7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DEB80 7C 08 03 A6 */ mtlr r0 -/* 800DEB84 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DEB88 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/endHighModel__9daAlink_cFv.s b/asm/d/a/d_a_alink/endHighModel__9daAlink_cFv.s deleted file mode 100644 index 011c7d8412a..00000000000 --- a/asm/d/a/d_a_alink/endHighModel__9daAlink_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80117C34: -/* 80117C34 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80117C38 7C 08 02 A6 */ mflr r0 -/* 80117C3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80117C40 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80117C44 7C 7F 1B 78 */ mr r31, r3 -/* 80117C48 80 83 06 8C */ lwz r4, 0x68c(r3) -/* 80117C4C 28 04 00 00 */ cmplwi r4, 0 -/* 80117C50 41 82 00 14 */ beq lbl_80117C64 -/* 80117C54 80 7F 06 88 */ lwz r3, 0x688(r31) -/* 80117C58 80 63 00 04 */ lwz r3, 4(r3) -/* 80117C5C 38 63 00 58 */ addi r3, r3, 0x58 -/* 80117C60 48 21 7B 55 */ bl removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey -lbl_80117C64: -/* 80117C64 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 80117C68 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 80117C6C 90 1F 05 74 */ stw r0, 0x574(r31) -/* 80117C70 38 00 00 00 */ li r0, 0 -/* 80117C74 90 1F 06 98 */ stw r0, 0x698(r31) -/* 80117C78 90 1F 06 8C */ stw r0, 0x68c(r31) -/* 80117C7C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80117C80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80117C84 7C 08 03 A6 */ mtlr r0 -/* 80117C88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80117C8C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/freezeTimerDamage__9daAlink_cFv.s b/asm/d/a/d_a_alink/freezeTimerDamage__9daAlink_cFv.s deleted file mode 100644 index 5d931a22b51..00000000000 --- a/asm/d/a/d_a_alink/freezeTimerDamage__9daAlink_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_800D6E24: -/* 800D6E24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D6E28 7C 08 02 A6 */ mflr r0 -/* 800D6E2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D6E30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D6E34 7C 7F 1B 78 */ mr r31, r3 -/* 800D6E38 A8 83 30 08 */ lha r4, 0x3008(r3) -/* 800D6E3C 38 04 FF FF */ addi r0, r4, -1 -/* 800D6E40 B0 03 30 08 */ sth r0, 0x3008(r3) -/* 800D6E44 A8 83 30 0A */ lha r4, 0x300a(r3) -/* 800D6E48 38 04 00 01 */ addi r0, r4, 1 -/* 800D6E4C B0 03 30 0A */ sth r0, 0x300a(r3) -/* 800D6E50 A8 A3 30 0A */ lha r5, 0x300a(r3) -/* 800D6E54 38 80 00 2D */ li r4, 0x2d -/* 800D6E58 7C 05 23 D6 */ divw r0, r5, r4 -/* 800D6E5C 7C 00 21 D6 */ mullw r0, r0, r4 -/* 800D6E60 7C 00 28 51 */ subf. r0, r0, r5 -/* 800D6E64 40 82 00 18 */ bne lbl_800D6E7C -/* 800D6E68 38 80 00 01 */ li r4, 1 -/* 800D6E6C 38 A0 00 01 */ li r5, 1 -/* 800D6E70 38 C0 00 00 */ li r6, 0 -/* 800D6E74 38 E0 00 00 */ li r7, 0 -/* 800D6E78 48 00 04 45 */ bl setDamagePoint__9daAlink_cFiiii -lbl_800D6E7C: -/* 800D6E7C 88 1F 2F AE */ lbz r0, 0x2fae(r31) -/* 800D6E80 60 00 00 08 */ ori r0, r0, 8 -/* 800D6E84 98 1F 2F AE */ stb r0, 0x2fae(r31) -/* 800D6E88 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) -/* 800D6E8C 54 00 06 F9 */ rlwinm. r0, r0, 0, 0x1b, 0x1c -/* 800D6E90 41 82 00 10 */ beq lbl_800D6EA0 -/* 800D6E94 A8 7F 30 08 */ lha r3, 0x3008(r31) -/* 800D6E98 38 03 FF FE */ addi r0, r3, -2 -/* 800D6E9C B0 1F 30 08 */ sth r0, 0x3008(r31) -lbl_800D6EA0: -/* 800D6EA0 C0 3F 33 AC */ lfs f1, 0x33ac(r31) -/* 800D6EA4 C0 02 92 A4 */ lfs f0, lit_6021(r2) -/* 800D6EA8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D6EAC 40 81 00 2C */ ble lbl_800D6ED8 -/* 800D6EB0 A8 7F 30 7C */ lha r3, 0x307c(r31) -/* 800D6EB4 A8 1F 2F E0 */ lha r0, 0x2fe0(r31) -/* 800D6EB8 7C 03 00 50 */ subf r0, r3, r0 -/* 800D6EBC 7C 03 07 34 */ extsh r3, r0 -/* 800D6EC0 48 28 E2 11 */ bl abs -/* 800D6EC4 2C 03 10 00 */ cmpwi r3, 0x1000 -/* 800D6EC8 40 81 00 10 */ ble lbl_800D6ED8 -/* 800D6ECC A8 7F 30 08 */ lha r3, 0x3008(r31) -/* 800D6ED0 38 03 FF FE */ addi r0, r3, -2 -/* 800D6ED4 B0 1F 30 08 */ sth r0, 0x3008(r31) -lbl_800D6ED8: -/* 800D6ED8 A8 1F 30 08 */ lha r0, 0x3008(r31) -/* 800D6EDC 2C 00 00 00 */ cmpwi r0, 0 -/* 800D6EE0 40 80 00 0C */ bge lbl_800D6EEC -/* 800D6EE4 38 00 00 00 */ li r0, 0 -/* 800D6EE8 B0 1F 30 08 */ sth r0, 0x3008(r31) -lbl_800D6EEC: -/* 800D6EEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D6EF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D6EF4 7C 08 03 A6 */ mtlr r0 -/* 800D6EF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D6EFC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getArrowFlyData__9daAlink_cCFPfPfi.s b/asm/d/a/d_a_alink/getArrowFlyData__9daAlink_cCFPfPfi.s deleted file mode 100644 index 58eb680677e..00000000000 --- a/asm/d/a/d_a_alink/getArrowFlyData__9daAlink_cCFPfPfi.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_800DE64C: -/* 800DE64C A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800DE650 28 00 00 4B */ cmplwi r0, 0x4b -/* 800DE654 40 82 00 20 */ bne lbl_800DE674 -/* 800DE658 3C 60 80 39 */ lis r3, m__17daAlinkHIO_bow_c0@ha /* 0x8038E658@ha */ -/* 800DE65C 38 63 E6 58 */ addi r3, r3, m__17daAlinkHIO_bow_c0@l /* 0x8038E658@l */ -/* 800DE660 C0 03 00 6C */ lfs f0, 0x6c(r3) -/* 800DE664 D0 04 00 00 */ stfs f0, 0(r4) -/* 800DE668 C0 03 00 68 */ lfs f0, 0x68(r3) -/* 800DE66C D0 05 00 00 */ stfs f0, 0(r5) -/* 800DE670 4E 80 00 20 */ blr -lbl_800DE674: -/* 800DE674 3C E0 80 40 */ lis r7, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800DE678 38 E7 61 C0 */ addi r7, r7, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800DE67C 80 07 5F 18 */ lwz r0, 0x5f18(r7) -/* 800DE680 54 00 02 95 */ rlwinm. r0, r0, 0, 0xa, 0xa -/* 800DE684 41 82 00 20 */ beq lbl_800DE6A4 -/* 800DE688 3C 60 80 39 */ lis r3, m__17daAlinkHIO_bow_c0@ha /* 0x8038E658@ha */ -/* 800DE68C 38 63 E6 58 */ addi r3, r3, m__17daAlinkHIO_bow_c0@l /* 0x8038E658@l */ -/* 800DE690 C0 03 00 5C */ lfs f0, 0x5c(r3) -/* 800DE694 D0 04 00 00 */ stfs f0, 0(r4) -/* 800DE698 C0 03 00 58 */ lfs f0, 0x58(r3) -/* 800DE69C D0 05 00 00 */ stfs f0, 0(r5) -/* 800DE6A0 4E 80 00 20 */ blr -lbl_800DE6A4: -/* 800DE6A4 A8 03 30 1C */ lha r0, 0x301c(r3) -/* 800DE6A8 2C 00 00 00 */ cmpwi r0, 0 -/* 800DE6AC 41 82 00 0C */ beq lbl_800DE6B8 -/* 800DE6B0 2C 06 00 00 */ cmpwi r6, 0 -/* 800DE6B4 41 82 00 48 */ beq lbl_800DE6FC -lbl_800DE6B8: -/* 800DE6B8 A8 03 30 1E */ lha r0, 0x301e(r3) -/* 800DE6BC 2C 00 00 01 */ cmpwi r0, 1 -/* 800DE6C0 40 82 00 20 */ bne lbl_800DE6E0 -/* 800DE6C4 3C 60 80 39 */ lis r3, m__17daAlinkHIO_bow_c0@ha /* 0x8038E658@ha */ -/* 800DE6C8 38 63 E6 58 */ addi r3, r3, m__17daAlinkHIO_bow_c0@l /* 0x8038E658@l */ -/* 800DE6CC C0 03 00 54 */ lfs f0, 0x54(r3) -/* 800DE6D0 D0 04 00 00 */ stfs f0, 0(r4) -/* 800DE6D4 C0 03 00 50 */ lfs f0, 0x50(r3) -/* 800DE6D8 D0 05 00 00 */ stfs f0, 0(r5) -/* 800DE6DC 4E 80 00 20 */ blr -lbl_800DE6E0: -/* 800DE6E0 3C 60 80 39 */ lis r3, m__17daAlinkHIO_bow_c0@ha /* 0x8038E658@ha */ -/* 800DE6E4 38 63 E6 58 */ addi r3, r3, m__17daAlinkHIO_bow_c0@l /* 0x8038E658@l */ -/* 800DE6E8 C0 03 00 40 */ lfs f0, 0x40(r3) -/* 800DE6EC D0 04 00 00 */ stfs f0, 0(r4) -/* 800DE6F0 C0 03 00 3C */ lfs f0, 0x3c(r3) -/* 800DE6F4 D0 05 00 00 */ stfs f0, 0(r5) -/* 800DE6F8 4E 80 00 20 */ blr -lbl_800DE6FC: -/* 800DE6FC A8 03 30 1E */ lha r0, 0x301e(r3) -/* 800DE700 2C 00 00 01 */ cmpwi r0, 1 -/* 800DE704 40 82 00 20 */ bne lbl_800DE724 -/* 800DE708 3C 60 80 39 */ lis r3, m__17daAlinkHIO_bow_c0@ha /* 0x8038E658@ha */ -/* 800DE70C 38 63 E6 58 */ addi r3, r3, m__17daAlinkHIO_bow_c0@l /* 0x8038E658@l */ -/* 800DE710 C0 03 00 4C */ lfs f0, 0x4c(r3) -/* 800DE714 D0 04 00 00 */ stfs f0, 0(r4) -/* 800DE718 C0 03 00 48 */ lfs f0, 0x48(r3) -/* 800DE71C D0 05 00 00 */ stfs f0, 0(r5) -/* 800DE720 4E 80 00 20 */ blr -lbl_800DE724: -/* 800DE724 3C 60 80 39 */ lis r3, m__17daAlinkHIO_bow_c0@ha /* 0x8038E658@ha */ -/* 800DE728 38 63 E6 58 */ addi r3, r3, m__17daAlinkHIO_bow_c0@l /* 0x8038E658@l */ -/* 800DE72C C0 03 00 38 */ lfs f0, 0x38(r3) -/* 800DE730 D0 04 00 00 */ stfs f0, 0(r4) -/* 800DE734 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 800DE738 D0 05 00 00 */ stfs f0, 0(r5) -/* 800DE73C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getArrowIncAtMaxStart__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getArrowIncAtMaxStart__9daAlink_cCFv.s deleted file mode 100644 index e3dd130a0e5..00000000000 --- a/asm/d/a/d_a_alink/getArrowIncAtMaxStart__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800DE760: -/* 800DE760 3C 60 80 39 */ lis r3, m__17daAlinkHIO_bow_c0@ha /* 0x8038E658@ha */ -/* 800DE764 38 63 E6 58 */ addi r3, r3, m__17daAlinkHIO_bow_c0@l /* 0x8038E658@l */ -/* 800DE768 C0 23 00 60 */ lfs f1, 0x60(r3) -/* 800DE76C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getArrowIncAtMax__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getArrowIncAtMax__9daAlink_cCFv.s deleted file mode 100644 index 62095436444..00000000000 --- a/asm/d/a/d_a_alink/getArrowIncAtMax__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800DE770: -/* 800DE770 3C 60 80 39 */ lis r3, m__17daAlinkHIO_bow_c0@ha /* 0x8038E658@ha */ -/* 800DE774 38 63 E6 58 */ addi r3, r3, m__17daAlinkHIO_bow_c0@l /* 0x8038E658@l */ -/* 800DE778 C0 23 00 64 */ lfs f1, 0x64(r3) -/* 800DE77C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getArrowIncAtR__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getArrowIncAtR__9daAlink_cCFv.s deleted file mode 100644 index 3536630b45b..00000000000 --- a/asm/d/a/d_a_alink/getArrowIncAtR__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800DE740: -/* 800DE740 3C 60 80 39 */ lis r3, m__17daAlinkHIO_bow_c0@ha /* 0x8038E658@ha */ -/* 800DE744 38 63 E6 58 */ addi r3, r3, m__17daAlinkHIO_bow_c0@l /* 0x8038E658@l */ -/* 800DE748 C0 23 00 44 */ lfs f1, 0x44(r3) -/* 800DE74C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBoardRowAnmSpeed__9daAlink_cFv.s b/asm/d/a/d_a_alink/getBoardRowAnmSpeed__9daAlink_cFv.s deleted file mode 100644 index fb503d2b823..00000000000 --- a/asm/d/a/d_a_alink/getBoardRowAnmSpeed__9daAlink_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_801066B8: -/* 801066B8 3C 80 80 39 */ lis r4, m__19daAlinkHIO_board_c0@ha /* 0x8038E870@ha */ -/* 801066BC 38 84 E8 70 */ addi r4, r4, m__19daAlinkHIO_board_c0@l /* 0x8038E870@l */ -/* 801066C0 C0 84 00 88 */ lfs f4, 0x88(r4) -/* 801066C4 C0 04 00 78 */ lfs f0, 0x78(r4) -/* 801066C8 EC 60 20 28 */ fsubs f3, f0, f4 -/* 801066CC C0 42 92 B8 */ lfs f2, lit_6040(r2) -/* 801066D0 C0 23 33 98 */ lfs f1, 0x3398(r3) -/* 801066D4 C0 04 00 7C */ lfs f0, 0x7c(r4) -/* 801066D8 EC 01 00 24 */ fdivs f0, f1, f0 -/* 801066DC EC 02 00 28 */ fsubs f0, f2, f0 -/* 801066E0 EC 03 00 32 */ fmuls f0, f3, f0 -/* 801066E4 EC 24 00 2A */ fadds f1, f4, f0 -/* 801066E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBodyAngleXBasePos__9daAlink_cFP4cXyz.s b/asm/d/a/d_a_alink/getBodyAngleXBasePos__9daAlink_cFP4cXyz.s deleted file mode 100644 index 825cda3365d..00000000000 --- a/asm/d/a/d_a_alink/getBodyAngleXBasePos__9daAlink_cFP4cXyz.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_800BB020: -/* 800BB020 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800BB024 28 00 00 CB */ cmplwi r0, 0xcb -/* 800BB028 41 82 00 0C */ beq lbl_800BB034 -/* 800BB02C 28 00 00 C8 */ cmplwi r0, 0xc8 -/* 800BB030 40 82 00 20 */ bne lbl_800BB050 -lbl_800BB034: -/* 800BB034 A8 03 30 20 */ lha r0, 0x3020(r3) -/* 800BB038 2C 00 00 00 */ cmpwi r0, 0 -/* 800BB03C 40 82 00 0C */ bne lbl_800BB048 -/* 800BB040 38 00 00 07 */ li r0, 7 -/* 800BB044 48 00 00 10 */ b lbl_800BB054 -lbl_800BB048: -/* 800BB048 38 00 00 0C */ li r0, 0xc -/* 800BB04C 48 00 00 08 */ b lbl_800BB054 -lbl_800BB050: -/* 800BB050 38 00 00 01 */ li r0, 1 -lbl_800BB054: -/* 800BB054 80 63 06 50 */ lwz r3, 0x650(r3) -/* 800BB058 80 63 00 84 */ lwz r3, 0x84(r3) -/* 800BB05C 80 63 00 0C */ lwz r3, 0xc(r3) -/* 800BB060 1C 00 00 30 */ mulli r0, r0, 0x30 -/* 800BB064 7C 63 02 14 */ add r3, r3, r0 -/* 800BB068 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 800BB06C D0 04 00 00 */ stfs f0, 0(r4) -/* 800BB070 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 800BB074 D0 04 00 04 */ stfs f0, 4(r4) -/* 800BB078 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 800BB07C D0 04 00 08 */ stfs f0, 8(r4) -/* 800BB080 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBombArrowFlyExplodeTime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getBombArrowFlyExplodeTime__9daAlink_cCFv.s deleted file mode 100644 index 2c535c95d07..00000000000 --- a/asm/d/a/d_a_alink/getBombArrowFlyExplodeTime__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800DE750: -/* 800DE750 3C 60 80 39 */ lis r3, m__17daAlinkHIO_bow_c0@ha /* 0x8038E658@ha */ -/* 800DE754 38 63 E6 58 */ addi r3, r3, m__17daAlinkHIO_bow_c0@l /* 0x8038E658@l */ -/* 800DE758 A8 63 00 2C */ lha r3, 0x2c(r3) -/* 800DE75C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBoomSpeed__9daAlink_cFv.s b/asm/d/a/d_a_alink/getBoomSpeed__9daAlink_cFv.s deleted file mode 100644 index 0b939d19259..00000000000 --- a/asm/d/a/d_a_alink/getBoomSpeed__9daAlink_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_800E0010: -/* 800E0010 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E0014 7C 08 02 A6 */ mflr r0 -/* 800E0018 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E001C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E0020 93 C1 00 08 */ stw r30, 8(r1) -/* 800E0024 7C 7E 1B 78 */ mr r30, r3 -/* 800E0028 3B E0 00 00 */ li r31, 0 -/* 800E002C A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800E0030 28 00 01 02 */ cmplwi r0, 0x102 -/* 800E0034 41 82 00 14 */ beq lbl_800E0048 -/* 800E0038 48 00 04 09 */ bl checkBoomerangAnime__9daAlink_cCFv -/* 800E003C 2C 03 00 00 */ cmpwi r3, 0 -/* 800E0040 41 82 00 08 */ beq lbl_800E0048 -/* 800E0044 3B E0 00 01 */ li r31, 1 -lbl_800E0048: -/* 800E0048 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 800E004C 41 82 00 14 */ beq lbl_800E0060 -/* 800E0050 3C 60 80 39 */ lis r3, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E0054 38 63 E6 C8 */ addi r3, r3, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E0058 C0 23 00 38 */ lfs f1, 0x38(r3) -/* 800E005C 48 00 00 10 */ b lbl_800E006C -lbl_800E0060: -/* 800E0060 3C 60 80 39 */ lis r3, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E0064 38 63 E6 C8 */ addi r3, r3, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E0068 C0 23 00 34 */ lfs f1, 0x34(r3) -lbl_800E006C: -/* 800E006C 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 800E0070 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 -/* 800E0074 41 82 00 24 */ beq lbl_800E0098 -/* 800E0078 80 7E 28 18 */ lwz r3, 0x2818(r30) -/* 800E007C 28 03 00 00 */ cmplwi r3, 0 -/* 800E0080 41 82 00 18 */ beq lbl_800E0098 -/* 800E0084 C0 43 05 2C */ lfs f2, 0x52c(r3) -/* 800E0088 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800E008C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 800E0090 40 81 00 08 */ ble lbl_800E0098 -/* 800E0094 EC 21 10 2A */ fadds f1, f1, f2 -lbl_800E0098: -/* 800E0098 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E009C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800E00A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E00A4 7C 08 03 A6 */ mtlr r0 -/* 800E00A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E00AC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBottleOpenAppearItem__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getBottleOpenAppearItem__9daAlink_cCFv.s deleted file mode 100644 index d1a674d27d7..00000000000 --- a/asm/d/a/d_a_alink/getBottleOpenAppearItem__9daAlink_cCFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8010E568: -/* 8010E568 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 8010E56C 28 00 00 B4 */ cmplwi r0, 0xb4 -/* 8010E570 40 82 00 0C */ bne lbl_8010E57C -/* 8010E574 A0 63 2F DC */ lhz r3, 0x2fdc(r3) -/* 8010E578 4E 80 00 20 */ blr -lbl_8010E57C: -/* 8010E57C 38 60 FF FF */ li r3, -1 -/* 8010E580 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getCanoeBackMaxSpeed__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getCanoeBackMaxSpeed__9daAlink_cCFv.s deleted file mode 100644 index d1e88cfd5ac..00000000000 --- a/asm/d/a/d_a_alink/getCanoeBackMaxSpeed__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800F3BDC: -/* 800F3BDC 3C 60 80 39 */ lis r3, m__19daAlinkHIO_canoe_c0@ha /* 0x8038E610@ha */ -/* 800F3BE0 38 63 E6 10 */ addi r3, r3, m__19daAlinkHIO_canoe_c0@l /* 0x8038E610@l */ -/* 800F3BE4 C0 23 00 38 */ lfs f1, 0x38(r3) -/* 800F3BE8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getCanoeCres__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getCanoeCres__9daAlink_cCFv.s deleted file mode 100644 index 9fa298c6ef8..00000000000 --- a/asm/d/a/d_a_alink/getCanoeCres__9daAlink_cCFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800F3BEC: -/* 800F3BEC 88 03 05 6A */ lbz r0, 0x56a(r3) -/* 800F3BF0 28 00 00 2D */ cmplwi r0, 0x2d -/* 800F3BF4 40 82 00 14 */ bne lbl_800F3C08 -/* 800F3BF8 3C 60 80 39 */ lis r3, m__19daAlinkHIO_canoe_c0@ha /* 0x8038E610@ha */ -/* 800F3BFC 38 63 E6 10 */ addi r3, r3, m__19daAlinkHIO_canoe_c0@l /* 0x8038E610@l */ -/* 800F3C00 C0 23 00 44 */ lfs f1, 0x44(r3) -/* 800F3C04 4E 80 00 20 */ blr -lbl_800F3C08: -/* 800F3C08 3C 60 80 39 */ lis r3, m__19daAlinkHIO_canoe_c0@ha /* 0x8038E610@ha */ -/* 800F3C0C 38 63 E6 10 */ addi r3, r3, m__19daAlinkHIO_canoe_c0@l /* 0x8038E610@l */ -/* 800F3C10 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 800F3C14 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getCanoeLocalPaddleTop__9daAlink_cFv.s b/asm/d/a/d_a_alink/getCanoeLocalPaddleTop__9daAlink_cFv.s deleted file mode 100644 index e67164e946c..00000000000 --- a/asm/d/a/d_a_alink/getCanoeLocalPaddleTop__9daAlink_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_800F3CCC: -/* 800F3CCC 3C 60 80 39 */ lis r3, localPaddleTop@ha /* 0x803919E4@ha */ -/* 800F3CD0 38 63 19 E4 */ addi r3, r3, localPaddleTop@l /* 0x803919E4@l */ -/* 800F3CD4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getCanoeMaxSpeed__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getCanoeMaxSpeed__9daAlink_cCFv.s deleted file mode 100644 index c385335c630..00000000000 --- a/asm/d/a/d_a_alink/getCanoeMaxSpeed__9daAlink_cCFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800F3BB0: -/* 800F3BB0 88 03 05 6A */ lbz r0, 0x56a(r3) -/* 800F3BB4 28 00 00 2D */ cmplwi r0, 0x2d -/* 800F3BB8 40 82 00 14 */ bne lbl_800F3BCC -/* 800F3BBC 3C 60 80 39 */ lis r3, m__19daAlinkHIO_canoe_c0@ha /* 0x8038E610@ha */ -/* 800F3BC0 38 63 E6 10 */ addi r3, r3, m__19daAlinkHIO_canoe_c0@l /* 0x8038E610@l */ -/* 800F3BC4 C0 23 00 3C */ lfs f1, 0x3c(r3) -/* 800F3BC8 4E 80 00 20 */ blr -lbl_800F3BCC: -/* 800F3BCC 3C 60 80 39 */ lis r3, m__19daAlinkHIO_canoe_c0@ha /* 0x8038E610@ha */ -/* 800F3BD0 38 63 E6 10 */ addi r3, r3, m__19daAlinkHIO_canoe_c0@l /* 0x8038E610@l */ -/* 800F3BD4 C0 23 00 24 */ lfs f1, 0x24(r3) -/* 800F3BD8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getCanoePaddleMatrix__9daAlink_cFv.s b/asm/d/a/d_a_alink/getCanoePaddleMatrix__9daAlink_cFv.s deleted file mode 100644 index 05886e2690e..00000000000 --- a/asm/d/a/d_a_alink/getCanoePaddleMatrix__9daAlink_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_800F3DFC: -/* 800F3DFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800F3E00 7C 08 02 A6 */ mflr r0 -/* 800F3E04 90 01 00 14 */ stw r0, 0x14(r1) -/* 800F3E08 81 83 06 28 */ lwz r12, 0x628(r3) -/* 800F3E0C 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 800F3E10 7D 89 03 A6 */ mtctr r12 -/* 800F3E14 4E 80 04 21 */ bctrl -/* 800F3E18 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 800F3E1C 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 800F3E20 48 25 26 91 */ bl PSMTXCopy -/* 800F3E24 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800F3E28 FC 40 08 90 */ fmr f2, f1 -/* 800F3E2C C0 62 92 9C */ lfs f3, lit_5944(r2) -/* 800F3E30 4B F1 8F 6D */ bl transM__14mDoMtx_stack_cFfff -/* 800F3E34 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 800F3E38 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 800F3E3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800F3E40 7C 08 03 A6 */ mtlr r0 -/* 800F3E44 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F3E48 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getCanoeSpeedRate__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getCanoeSpeedRate__9daAlink_cCFv.s deleted file mode 100644 index af8b7b4e073..00000000000 --- a/asm/d/a/d_a_alink/getCanoeSpeedRate__9daAlink_cCFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800F3C18: -/* 800F3C18 88 03 05 6A */ lbz r0, 0x56a(r3) -/* 800F3C1C 28 00 00 2D */ cmplwi r0, 0x2d -/* 800F3C20 40 82 00 14 */ bne lbl_800F3C34 -/* 800F3C24 3C 60 80 39 */ lis r3, m__19daAlinkHIO_canoe_c0@ha /* 0x8038E610@ha */ -/* 800F3C28 38 63 E6 10 */ addi r3, r3, m__19daAlinkHIO_canoe_c0@l /* 0x8038E610@l */ -/* 800F3C2C C0 23 00 40 */ lfs f1, 0x40(r3) -/* 800F3C30 4E 80 00 20 */ blr -lbl_800F3C34: -/* 800F3C34 3C 60 80 39 */ lis r3, m__19daAlinkHIO_canoe_c0@ha /* 0x8038E610@ha */ -/* 800F3C38 38 63 E6 10 */ addi r3, r3, m__19daAlinkHIO_canoe_c0@l /* 0x8038E610@l */ -/* 800F3C3C C0 23 00 20 */ lfs f1, 0x20(r3) -/* 800F3C40 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getChainStickAngleY__9daAlink_cCFs.s b/asm/d/a/d_a_alink/getChainStickAngleY__9daAlink_cCFs.s deleted file mode 100644 index e179b22626b..00000000000 --- a/asm/d/a/d_a_alink/getChainStickAngleY__9daAlink_cCFs.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_800E794C: -/* 800E794C 7C 84 07 34 */ extsh r4, r4 -/* 800E7950 A8 63 2F E2 */ lha r3, 0x2fe2(r3) -/* 800E7954 7C 04 18 50 */ subf r0, r4, r3 -/* 800E7958 7C 00 07 34 */ extsh r0, r0 -/* 800E795C 2C 00 38 00 */ cmpwi r0, 0x3800 -/* 800E7960 41 80 00 18 */ blt lbl_800E7978 -/* 800E7964 2C 00 7F 80 */ cmpwi r0, 0x7f80 -/* 800E7968 40 80 00 10 */ bge lbl_800E7978 -/* 800E796C 38 04 7F 80 */ addi r0, r4, 0x7f80 -/* 800E7970 7C 03 07 34 */ extsh r3, r0 -/* 800E7974 4E 80 00 20 */ blr -lbl_800E7978: -/* 800E7978 2C 00 C8 00 */ cmpwi r0, -14336 -/* 800E797C 4D 81 00 20 */ bgtlr -/* 800E7980 2C 00 80 80 */ cmpwi r0, -32640 -/* 800E7984 4C 81 00 20 */ blelr -/* 800E7988 38 04 80 80 */ addi r0, r4, -32640 -/* 800E798C 7C 03 07 34 */ extsh r3, r0 -/* 800E7990 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getCutDirection__9daAlink_cFv.s b/asm/d/a/d_a_alink/getCutDirection__9daAlink_cFv.s deleted file mode 100644 index a3f510f71bd..00000000000 --- a/asm/d/a/d_a_alink/getCutDirection__9daAlink_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_800D26EC: -/* 800D26EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D26F0 7C 08 02 A6 */ mflr r0 -/* 800D26F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D26F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D26FC 7C 7F 1B 78 */ mr r31, r3 -/* 800D2700 C0 23 33 AC */ lfs f1, 0x33ac(r3) -/* 800D2704 C0 02 92 A4 */ lfs f0, lit_6021(r2) -/* 800D2708 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D270C 41 81 00 0C */ bgt lbl_800D2718 -/* 800D2710 38 60 00 04 */ li r3, 4 -/* 800D2714 48 00 00 38 */ b lbl_800D274C -lbl_800D2718: -/* 800D2718 80 9F 27 EC */ lwz r4, 0x27ec(r31) -/* 800D271C 28 04 00 00 */ cmplwi r4, 0 -/* 800D2720 41 82 00 18 */ beq lbl_800D2738 -/* 800D2724 4B F4 7F ED */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 800D2728 A8 1F 2F E2 */ lha r0, 0x2fe2(r31) -/* 800D272C 7C 03 00 50 */ subf r0, r3, r0 -/* 800D2730 7C 03 07 34 */ extsh r3, r0 -/* 800D2734 48 00 00 14 */ b lbl_800D2748 -lbl_800D2738: -/* 800D2738 A8 7F 2F E6 */ lha r3, 0x2fe6(r31) -/* 800D273C A8 1F 2F E2 */ lha r0, 0x2fe2(r31) -/* 800D2740 7C 03 00 50 */ subf r0, r3, r0 -/* 800D2744 7C 03 07 34 */ extsh r3, r0 -lbl_800D2748: -/* 800D2748 4B FE 0D 4D */ bl getDirectionFromAngle__9daAlink_cFs -lbl_800D274C: -/* 800D274C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D2750 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D2754 7C 08 03 A6 */ mtlr r0 -/* 800D2758 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D275C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getDirectionRopeMove__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getDirectionRopeMove__9daAlink_cCFv.s deleted file mode 100644 index 3686935601f..00000000000 --- a/asm/d/a/d_a_alink/getDirectionRopeMove__9daAlink_cCFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80131C00: -/* 80131C00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80131C04 7C 08 02 A6 */ mflr r0 -/* 80131C08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80131C0C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80131C10 A8 83 04 E6 */ lha r4, 0x4e6(r3) -/* 80131C14 A8 03 2F E2 */ lha r0, 0x2fe2(r3) -/* 80131C18 7C 04 00 50 */ subf r0, r4, r0 -/* 80131C1C 7C 1F 07 34 */ extsh r31, r0 -/* 80131C20 7F E3 FB 78 */ mr r3, r31 -/* 80131C24 48 23 34 AD */ bl abs -/* 80131C28 2C 03 50 00 */ cmpwi r3, 0x5000 -/* 80131C2C 40 81 00 0C */ ble lbl_80131C38 -/* 80131C30 38 60 00 01 */ li r3, 1 -/* 80131C34 48 00 00 2C */ b lbl_80131C60 -lbl_80131C38: -/* 80131C38 2C 1F 30 00 */ cmpwi r31, 0x3000 -/* 80131C3C 41 80 00 0C */ blt lbl_80131C48 -/* 80131C40 38 60 00 02 */ li r3, 2 -/* 80131C44 48 00 00 1C */ b lbl_80131C60 -lbl_80131C48: -/* 80131C48 6F E3 80 00 */ xoris r3, r31, 0x8000 -/* 80131C4C 20 1F D0 00 */ subfic r0, r31, -12288 -/* 80131C50 7C 00 18 14 */ addc r0, r0, r3 -/* 80131C54 7C 60 01 10 */ subfe r3, r0, r0 -/* 80131C58 38 00 00 03 */ li r0, 3 -/* 80131C5C 7C 03 18 38 */ and r3, r0, r3 -lbl_80131C60: -/* 80131C60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80131C64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80131C68 7C 08 03 A6 */ mtlr r0 -/* 80131C6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80131C70 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getFreezeB__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getFreezeB__9daAlink_cCFv.s deleted file mode 100644 index 80114b1872b..00000000000 --- a/asm/d/a/d_a_alink/getFreezeB__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800D6DB4: -/* 800D6DB4 3C 60 80 39 */ lis r3, m__20daAlinkHIO_damage_c0@ha /* 0x8038E54C@ha */ -/* 800D6DB8 38 63 E5 4C */ addi r3, r3, m__20daAlinkHIO_damage_c0@l /* 0x8038E54C@l */ -/* 800D6DBC A8 63 00 4C */ lha r3, 0x4c(r3) -/* 800D6DC0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getFreezeG__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getFreezeG__9daAlink_cCFv.s deleted file mode 100644 index 5ad8747fe66..00000000000 --- a/asm/d/a/d_a_alink/getFreezeG__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800D6DA4: -/* 800D6DA4 3C 60 80 39 */ lis r3, m__20daAlinkHIO_damage_c0@ha /* 0x8038E54C@ha */ -/* 800D6DA8 38 63 E5 4C */ addi r3, r3, m__20daAlinkHIO_damage_c0@l /* 0x8038E54C@l */ -/* 800D6DAC A8 63 00 4A */ lha r3, 0x4a(r3) -/* 800D6DB0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getFreezeR__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getFreezeR__9daAlink_cCFv.s deleted file mode 100644 index e8f462c7b22..00000000000 --- a/asm/d/a/d_a_alink/getFreezeR__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800D6D94: -/* 800D6D94 3C 60 80 39 */ lis r3, m__20daAlinkHIO_damage_c0@ha /* 0x8038E54C@ha */ -/* 800D6D98 38 63 E5 4C */ addi r3, r3, m__20daAlinkHIO_damage_c0@l /* 0x8038E54C@l */ -/* 800D6D9C A8 63 00 48 */ lha r3, 0x48(r3) -/* 800D6DA0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getGrabThrowRate__9daAlink_cFv.s b/asm/d/a/d_a_alink/getGrabThrowRate__9daAlink_cFv.s deleted file mode 100644 index cbbabd8948b..00000000000 --- a/asm/d/a/d_a_alink/getGrabThrowRate__9daAlink_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_800E3BCC: -/* 800E3BCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E3BD0 7C 08 02 A6 */ mflr r0 -/* 800E3BD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E3BD8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E3BDC 7C 7F 1B 78 */ mr r31, r3 -/* 800E3BE0 38 80 00 01 */ li r4, 1 -/* 800E3BE4 38 A0 00 01 */ li r5, 1 -/* 800E3BE8 4B FD 78 D1 */ bl checkHeavyStateOn__9daAlink_cFii -/* 800E3BEC 2C 03 00 00 */ cmpwi r3, 0 -/* 800E3BF0 41 82 00 14 */ beq lbl_800E3C04 -/* 800E3BF4 C0 22 92 AC */ lfs f1, lit_6023(r2) -/* 800E3BF8 C0 1F 34 34 */ lfs f0, 0x3434(r31) -/* 800E3BFC EC 21 00 32 */ fmuls f1, f1, f0 -/* 800E3C00 48 00 00 08 */ b lbl_800E3C08 -lbl_800E3C04: -/* 800E3C04 C0 22 92 AC */ lfs f1, lit_6023(r2) -lbl_800E3C08: -/* 800E3C08 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E3C0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E3C10 7C 08 03 A6 */ mtlr r0 -/* 800E3C14 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E3C18 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getIronBallBgHit__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getIronBallBgHit__9daAlink_cCFv.s deleted file mode 100644 index 8bdc5ea9a7f..00000000000 --- a/asm/d/a/d_a_alink/getIronBallBgHit__9daAlink_cCFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80112458: -/* 80112458 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 8011245C 28 00 00 42 */ cmplwi r0, 0x42 -/* 80112460 40 82 00 0C */ bne lbl_8011246C -/* 80112464 A8 63 30 1C */ lha r3, 0x301c(r3) -/* 80112468 4E 80 00 20 */ blr -lbl_8011246C: -/* 8011246C 38 60 00 00 */ li r3, 0 -/* 80112470 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getIronBallCenterPos__9daAlink_cFv.s b/asm/d/a/d_a_alink/getIronBallCenterPos__9daAlink_cFv.s deleted file mode 100644 index efebd866679..00000000000 --- a/asm/d/a/d_a_alink/getIronBallCenterPos__9daAlink_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8011243C: -/* 8011243C A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 80112440 28 00 00 42 */ cmplwi r0, 0x42 -/* 80112444 40 82 00 0C */ bne lbl_80112450 -/* 80112448 38 63 37 F8 */ addi r3, r3, 0x37f8 -/* 8011244C 4E 80 00 20 */ blr -lbl_80112450: -/* 80112450 38 60 00 00 */ li r3, 0 -/* 80112454 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getKandelaarFlamePos__9daAlink_cFv.s b/asm/d/a/d_a_alink/getKandelaarFlamePos__9daAlink_cFv.s deleted file mode 100644 index fb55c75aea4..00000000000 --- a/asm/d/a/d_a_alink/getKandelaarFlamePos__9daAlink_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80110C28: -/* 80110C28 80 A3 05 78 */ lwz r5, 0x578(r3) -/* 80110C2C 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020001@ha */ -/* 80110C30 38 04 00 01 */ addi r0, r4, 0x0001 /* 0x00020001@l */ -/* 80110C34 7C A0 00 39 */ and. r0, r5, r0 -/* 80110C38 40 82 00 10 */ bne lbl_80110C48 -/* 80110C3C 80 03 05 8C */ lwz r0, 0x58c(r3) -/* 80110C40 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 80110C44 41 82 00 18 */ beq lbl_80110C5C -lbl_80110C48: -/* 80110C48 80 83 05 74 */ lwz r4, 0x574(r3) -/* 80110C4C 54 80 01 8D */ rlwinm. r0, r4, 0, 6, 6 -/* 80110C50 40 82 00 0C */ bne lbl_80110C5C -/* 80110C54 54 80 06 31 */ rlwinm. r0, r4, 0, 0x18, 0x18 -/* 80110C58 40 82 00 0C */ bne lbl_80110C64 -lbl_80110C5C: -/* 80110C5C 38 60 00 00 */ li r3, 0 -/* 80110C60 4E 80 00 20 */ blr -lbl_80110C64: -/* 80110C64 38 63 36 0C */ addi r3, r3, 0x360c -/* 80110C68 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getReinRideDirection__9daAlink_cFv.s b/asm/d/a/d_a_alink/getReinRideDirection__9daAlink_cFv.s deleted file mode 100644 index 92aa3f31624..00000000000 --- a/asm/d/a/d_a_alink/getReinRideDirection__9daAlink_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_800EC87C: -/* 800EC87C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800EC880 7C 08 02 A6 */ mflr r0 -/* 800EC884 90 01 00 14 */ stw r0, 0x14(r1) -/* 800EC888 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800EC88C 7C 7F 1B 78 */ mr r31, r3 -/* 800EC890 80 63 27 F4 */ lwz r3, 0x27f4(r3) -/* 800EC894 7F E4 FB 78 */ mr r4, r31 -/* 800EC898 4B F2 DE 79 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 800EC89C 80 9F 27 F4 */ lwz r4, 0x27f4(r31) -/* 800EC8A0 A8 04 04 E6 */ lha r0, 0x4e6(r4) -/* 800EC8A4 7C 00 18 50 */ subf r0, r0, r3 -/* 800EC8A8 7C 1F 07 34 */ extsh r31, r0 -/* 800EC8AC A8 04 00 08 */ lha r0, 8(r4) -/* 800EC8B0 2C 00 00 EE */ cmpwi r0, 0xee -/* 800EC8B4 40 82 00 1C */ bne lbl_800EC8D0 -/* 800EC8B8 7F E3 FB 78 */ mr r3, r31 -/* 800EC8BC 48 27 88 15 */ bl abs -/* 800EC8C0 2C 03 68 00 */ cmpwi r3, 0x6800 -/* 800EC8C4 40 81 00 0C */ ble lbl_800EC8D0 -/* 800EC8C8 38 60 00 01 */ li r3, 1 -/* 800EC8CC 48 00 00 18 */ b lbl_800EC8E4 -lbl_800EC8D0: -/* 800EC8D0 7F E0 07 35 */ extsh. r0, r31 -/* 800EC8D4 40 81 00 0C */ ble lbl_800EC8E0 -/* 800EC8D8 38 60 00 02 */ li r3, 2 -/* 800EC8DC 48 00 00 08 */ b lbl_800EC8E4 -lbl_800EC8E0: -/* 800EC8E0 38 60 00 03 */ li r3, 3 -lbl_800EC8E4: -/* 800EC8E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800EC8E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800EC8EC 7C 08 03 A6 */ mtlr r0 -/* 800EC8F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EC8F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSwimFrontMaxSpeed__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getSwimFrontMaxSpeed__9daAlink_cCFv.s deleted file mode 100644 index f43d1912c56..00000000000 --- a/asm/d/a/d_a_alink/getSwimFrontMaxSpeed__9daAlink_cCFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80101A18: -/* 80101A18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80101A1C 7C 08 02 A6 */ mflr r0 -/* 80101A20 90 01 00 14 */ stw r0, 0x14(r1) -/* 80101A24 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80101A28 7C 7F 1B 78 */ mr r31, r3 -/* 80101A2C 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80101A30 81 8C 02 80 */ lwz r12, 0x280(r12) -/* 80101A34 7D 89 03 A6 */ mtctr r12 -/* 80101A38 4E 80 04 21 */ bctrl -/* 80101A3C 2C 03 00 00 */ cmpwi r3, 0 -/* 80101A40 41 82 00 14 */ beq lbl_80101A54 -/* 80101A44 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 80101A48 38 63 ED 2C */ addi r3, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 80101A4C C0 23 00 78 */ lfs f1, 0x78(r3) -/* 80101A50 48 00 00 44 */ b lbl_80101A94 -lbl_80101A54: -/* 80101A54 7F E3 FB 78 */ mr r3, r31 -/* 80101A58 4B FB E3 59 */ bl checkZoraWearAbility__9daAlink_cCFv -/* 80101A5C 2C 03 00 00 */ cmpwi r3, 0 -/* 80101A60 41 82 00 0C */ beq lbl_80101A6C -/* 80101A64 C0 22 93 48 */ lfs f1, lit_8130(r2) -/* 80101A68 48 00 00 2C */ b lbl_80101A94 -lbl_80101A6C: -/* 80101A6C 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 80101A70 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 -/* 80101A74 41 82 00 14 */ beq lbl_80101A88 -/* 80101A78 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 80101A7C 38 63 ED 2C */ addi r3, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 80101A80 C0 23 00 EC */ lfs f1, 0xec(r3) -/* 80101A84 48 00 00 10 */ b lbl_80101A94 -lbl_80101A88: -/* 80101A88 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 80101A8C 38 63 ED 2C */ addi r3, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 80101A90 C0 23 00 68 */ lfs f1, 0x68(r3) -lbl_80101A94: -/* 80101A94 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80101A98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80101A9C 7C 08 03 A6 */ mtlr r0 -/* 80101AA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80101AA4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSwimMaxFallSpeed__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getSwimMaxFallSpeed__9daAlink_cCFv.s deleted file mode 100644 index 579b36e52a8..00000000000 --- a/asm/d/a/d_a_alink/getSwimMaxFallSpeed__9daAlink_cCFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80101AA8: -/* 80101AA8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80101AAC 7C 08 02 A6 */ mflr r0 -/* 80101AB0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80101AB4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80101AB8 7C 7F 1B 78 */ mr r31, r3 -/* 80101ABC A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 80101AC0 28 00 00 16 */ cmplwi r0, 0x16 -/* 80101AC4 40 82 00 18 */ bne lbl_80101ADC -/* 80101AC8 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 80101ACC 38 63 ED 2C */ addi r3, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 80101AD0 C0 03 00 74 */ lfs f0, 0x74(r3) -/* 80101AD4 FC 20 00 50 */ fneg f1, f0 -/* 80101AD8 48 00 00 58 */ b lbl_80101B30 -lbl_80101ADC: -/* 80101ADC 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80101AE0 81 8C 02 80 */ lwz r12, 0x280(r12) -/* 80101AE4 7D 89 03 A6 */ mtctr r12 -/* 80101AE8 4E 80 04 21 */ bctrl -/* 80101AEC 2C 03 00 00 */ cmpwi r3, 0 -/* 80101AF0 41 82 00 14 */ beq lbl_80101B04 -/* 80101AF4 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 80101AF8 38 63 ED 2C */ addi r3, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 80101AFC C0 23 00 D0 */ lfs f1, 0xd0(r3) -/* 80101B00 48 00 00 30 */ b lbl_80101B30 -lbl_80101B04: -/* 80101B04 7F E3 FB 78 */ mr r3, r31 -/* 80101B08 4B FF FE B1 */ bl getZoraSwim__9daAlink_cCFv -/* 80101B0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80101B10 41 82 00 14 */ beq lbl_80101B24 -/* 80101B14 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 80101B18 38 63 ED 2C */ addi r3, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 80101B1C C0 23 00 84 */ lfs f1, 0x84(r3) -/* 80101B20 48 00 00 10 */ b lbl_80101B30 -lbl_80101B24: -/* 80101B24 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 80101B28 38 63 ED 2C */ addi r3, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 80101B2C C0 23 00 CC */ lfs f1, 0xcc(r3) -lbl_80101B30: -/* 80101B30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80101B34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80101B38 7C 08 03 A6 */ mtlr r0 -/* 80101B3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80101B40 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getWallGrabStatus__9daAlink_cFv.s b/asm/d/a/d_a_alink/getWallGrabStatus__9daAlink_cFv.s deleted file mode 100644 index afbb92895de..00000000000 --- a/asm/d/a/d_a_alink/getWallGrabStatus__9daAlink_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800E7EE4: -/* 800E7EE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800E7EE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800E7EEC 88 63 5E 1C */ lbz r3, 0x5e1c(r3) -/* 800E7EF0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getWolfLieMoveAnmSpeed__9daAlink_cFv.s b/asm/d/a/d_a_alink/getWolfLieMoveAnmSpeed__9daAlink_cFv.s deleted file mode 100644 index 5ed2699ef82..00000000000 --- a/asm/d/a/d_a_alink/getWolfLieMoveAnmSpeed__9daAlink_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_801370E4: -/* 801370E4 80 03 31 98 */ lwz r0, 0x3198(r3) -/* 801370E8 2C 00 00 00 */ cmpwi r0, 0 -/* 801370EC 41 82 00 1C */ beq lbl_80137108 -/* 801370F0 C0 42 92 98 */ lfs f2, lit_5943(r2) -/* 801370F4 C0 23 33 A8 */ lfs f1, 0x33a8(r3) -/* 801370F8 C0 02 93 2C */ lfs f0, lit_7624(r2) -/* 801370FC EC 01 00 32 */ fmuls f0, f1, f0 -/* 80137100 EC 22 00 2A */ fadds f1, f2, f0 -/* 80137104 4E 80 00 20 */ blr -lbl_80137108: -/* 80137108 3C 80 80 39 */ lis r4, m__19daAlinkHIO_wlLie_c0@ha /* 0x8038F138@ha */ -/* 8013710C 38 84 F1 38 */ addi r4, r4, m__19daAlinkHIO_wlLie_c0@l /* 0x8038F138@l */ -/* 80137110 C0 44 00 3C */ lfs f2, 0x3c(r4) -/* 80137114 C0 23 33 A8 */ lfs f1, 0x33a8(r3) -/* 80137118 C0 04 00 38 */ lfs f0, 0x38(r4) -/* 8013711C EC 00 10 28 */ fsubs f0, f0, f2 -/* 80137120 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80137124 EC 22 00 2A */ fadds f1, f2, f0 -/* 80137128 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getZoraSwim__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getZoraSwim__9daAlink_cCFv.s deleted file mode 100644 index 7820cecd16a..00000000000 --- a/asm/d/a/d_a_alink/getZoraSwim__9daAlink_cCFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_801019B8: -/* 801019B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801019BC 7C 08 02 A6 */ mflr r0 -/* 801019C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801019C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801019C8 93 C1 00 08 */ stw r30, 8(r1) -/* 801019CC 7C 7E 1B 78 */ mr r30, r3 -/* 801019D0 3B E0 00 00 */ li r31, 0 -/* 801019D4 38 80 00 C9 */ li r4, 0xc9 -/* 801019D8 4B FA AB 81 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM -/* 801019DC 2C 03 00 00 */ cmpwi r3, 0 -/* 801019E0 40 82 00 18 */ bne lbl_801019F8 -/* 801019E4 7F C3 F3 78 */ mr r3, r30 -/* 801019E8 38 80 00 C8 */ li r4, 0xc8 -/* 801019EC 4B FA AB 6D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM -/* 801019F0 2C 03 00 00 */ cmpwi r3, 0 -/* 801019F4 41 82 00 08 */ beq lbl_801019FC -lbl_801019F8: -/* 801019F8 3B E0 00 01 */ li r31, 1 -lbl_801019FC: -/* 801019FC 7F E3 FB 78 */ mr r3, r31 -/* 80101A00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80101A04 83 C1 00 08 */ lwz r30, 8(r1) -/* 80101A08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80101A0C 7C 08 03 A6 */ mtlr r0 -/* 80101A10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80101A14 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/grabLineCheck__9daAlink_cFP4cXyzP4cXyz.s b/asm/d/a/d_a_alink/grabLineCheck__9daAlink_cFP4cXyzP4cXyz.s deleted file mode 100644 index 01ccab0890e..00000000000 --- a/asm/d/a/d_a_alink/grabLineCheck__9daAlink_cFP4cXyzP4cXyz.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_800E5B6C: -/* 800E5B6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E5B70 7C 08 02 A6 */ mflr r0 -/* 800E5B74 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E5B78 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E5B7C 7C 7F 1B 78 */ mr r31, r3 -/* 800E5B80 38 7F 1E 5C */ addi r3, r31, 0x1e5c -/* 800E5B84 80 DF 28 30 */ lwz r6, 0x2830(r31) -/* 800E5B88 4B F9 21 DD */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c -/* 800E5B8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800E5B90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800E5B94 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 800E5B98 38 9F 1E 5C */ addi r4, r31, 0x1e5c -/* 800E5B9C 4B F8 E8 19 */ bl LineCross__4cBgSFP11cBgS_LinChk -/* 800E5BA0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E5BA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E5BA8 7C 08 03 A6 */ mtlr r0 -/* 800E5BAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E5BB0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/initCanoeRide__9daAlink_cFv.s b/asm/d/a/d_a_alink/initCanoeRide__9daAlink_cFv.s deleted file mode 100644 index 75c7a9414e5..00000000000 --- a/asm/d/a/d_a_alink/initCanoeRide__9daAlink_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_800F3FC4: -/* 800F3FC4 38 00 00 01 */ li r0, 1 -/* 800F3FC8 B0 03 30 12 */ sth r0, 0x3012(r3) -/* 800F3FCC 3C 80 80 42 */ lis r4, l_waitBaseAnime@ha /* 0x80425514@ha */ -/* 800F3FD0 C4 04 55 14 */ lfsu f0, l_waitBaseAnime@l(r4) /* 0x80425514@l */ -/* 800F3FD4 D0 03 35 88 */ stfs f0, 0x3588(r3) -/* 800F3FD8 C0 04 00 04 */ lfs f0, 4(r4) -/* 800F3FDC D0 03 35 8C */ stfs f0, 0x358c(r3) -/* 800F3FE0 C0 04 00 08 */ lfs f0, 8(r4) -/* 800F3FE4 D0 03 35 90 */ stfs f0, 0x3590(r3) -/* 800F3FE8 3C 80 80 42 */ lis r4, l_canoeBaseAnime@ha /* 0x804255EC@ha */ -/* 800F3FEC 38 04 55 EC */ addi r0, r4, l_canoeBaseAnime@l /* 0x804255EC@l */ -/* 800F3FF0 90 03 38 4C */ stw r0, 0x384c(r3) -/* 800F3FF4 38 00 00 03 */ li r0, 3 -/* 800F3FF8 98 03 2F AA */ stb r0, 0x2faa(r3) -/* 800F3FFC 38 00 00 00 */ li r0, 0 -/* 800F4000 B0 03 30 10 */ sth r0, 0x3010(r3) -/* 800F4004 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/initCopyRodUpperAnimeSpeed__9daAlink_cFi.s b/asm/d/a/d_a_alink/initCopyRodUpperAnimeSpeed__9daAlink_cFi.s deleted file mode 100644 index 346e27c75d0..00000000000 --- a/asm/d/a/d_a_alink/initCopyRodUpperAnimeSpeed__9daAlink_cFi.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_800E13AC: -/* 800E13AC 38 A0 00 00 */ li r5, 0 -/* 800E13B0 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800E13B4 28 00 00 46 */ cmplwi r0, 0x46 -/* 800E13B8 40 82 00 14 */ bne lbl_800E13CC -/* 800E13BC A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800E13C0 28 00 00 53 */ cmplwi r0, 0x53 -/* 800E13C4 40 82 00 08 */ bne lbl_800E13CC -/* 800E13C8 38 A0 00 01 */ li r5, 1 -lbl_800E13CC: -/* 800E13CC 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 800E13D0 4C 82 00 20 */ bnelr -/* 800E13D4 2C 04 00 00 */ cmpwi r4, 0 -/* 800E13D8 41 82 00 1C */ beq lbl_800E13F4 -/* 800E13DC C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800E13E0 D0 03 20 54 */ stfs f0, 0x2054(r3) -/* 800E13E4 D0 03 20 58 */ stfs f0, 0x2058(r3) -/* 800E13E8 80 63 1F 54 */ lwz r3, 0x1f54(r3) -/* 800E13EC D0 03 00 08 */ stfs f0, 8(r3) -/* 800E13F0 4E 80 00 20 */ blr -lbl_800E13F4: -/* 800E13F4 3C 80 80 39 */ lis r4, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E13F8 38 84 E6 C8 */ addi r4, r4, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E13FC C0 04 00 2C */ lfs f0, 0x2c(r4) -/* 800E1400 D0 03 20 54 */ stfs f0, 0x2054(r3) -/* 800E1404 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/initCutAtnActorSearch__9daAlink_cFv.s b/asm/d/a/d_a_alink/initCutAtnActorSearch__9daAlink_cFv.s deleted file mode 100644 index 2c5feee04a6..00000000000 --- a/asm/d/a/d_a_alink/initCutAtnActorSearch__9daAlink_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_800D2BFC: -/* 800D2BFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D2C00 7C 08 02 A6 */ mflr r0 -/* 800D2C04 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D2C08 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D2C0C 7C 7F 1B 78 */ mr r31, r3 -/* 800D2C10 4B FE 0A 21 */ bl getShapeAngleYAtnActor__9daAlink_cFv -/* 800D2C14 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 800D2C18 48 19 E2 0D */ bl cLib_distanceAngleS__Fss -/* 800D2C1C 2C 03 08 00 */ cmpwi r3, 0x800 -/* 800D2C20 40 80 00 10 */ bge lbl_800D2C30 -/* 800D2C24 38 00 00 01 */ li r0, 1 -/* 800D2C28 B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 800D2C2C 48 00 00 0C */ b lbl_800D2C38 -lbl_800D2C30: -/* 800D2C30 38 00 00 00 */ li r0, 0 -/* 800D2C34 B0 1F 30 10 */ sth r0, 0x3010(r31) -lbl_800D2C38: -/* 800D2C38 80 1F 27 EC */ lwz r0, 0x27ec(r31) -/* 800D2C3C 90 1F 32 CC */ stw r0, 0x32cc(r31) -/* 800D2C40 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D2C44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D2C48 7C 08 03 A6 */ mtlr r0 -/* 800D2C4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D2C50 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/initFishingRodHand__9daAlink_cFv.s b/asm/d/a/d_a_alink/initFishingRodHand__9daAlink_cFv.s deleted file mode 100644 index 34ce2e11fa5..00000000000 --- a/asm/d/a/d_a_alink/initFishingRodHand__9daAlink_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_800F3DA0: -/* 800F3DA0 38 00 00 65 */ li r0, 0x65 -/* 800F3DA4 98 03 2F 94 */ stb r0, 0x2f94(r3) -/* 800F3DA8 98 03 2F 95 */ stb r0, 0x2f95(r3) -/* 800F3DAC 38 00 00 01 */ li r0, 1 -/* 800F3DB0 B0 03 30 18 */ sth r0, 0x3018(r3) -/* 800F3DB4 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800F3DB8 28 00 00 5F */ cmplwi r0, 0x5f -/* 800F3DBC 41 82 00 0C */ beq lbl_800F3DC8 -/* 800F3DC0 28 00 00 5D */ cmplwi r0, 0x5d -/* 800F3DC4 40 82 00 10 */ bne lbl_800F3DD4 -lbl_800F3DC8: -/* 800F3DC8 38 00 00 74 */ li r0, 0x74 -/* 800F3DCC B0 03 30 1A */ sth r0, 0x301a(r3) -/* 800F3DD0 4E 80 00 20 */ blr -lbl_800F3DD4: -/* 800F3DD4 28 00 00 5E */ cmplwi r0, 0x5e -/* 800F3DD8 41 82 00 0C */ beq lbl_800F3DE4 -/* 800F3DDC 28 00 00 5B */ cmplwi r0, 0x5b -/* 800F3DE0 40 82 00 10 */ bne lbl_800F3DF0 -lbl_800F3DE4: -/* 800F3DE4 38 00 00 76 */ li r0, 0x76 -/* 800F3DE8 B0 03 30 1A */ sth r0, 0x301a(r3) -/* 800F3DEC 4E 80 00 20 */ blr -lbl_800F3DF0: -/* 800F3DF0 38 00 00 FF */ li r0, 0xff -/* 800F3DF4 B0 03 30 1A */ sth r0, 0x301a(r3) -/* 800F3DF8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/initForceRideHorse__9daAlink_cFv.s b/asm/d/a/d_a_alink/initForceRideHorse__9daAlink_cFv.s deleted file mode 100644 index 9d99e5856f5..00000000000 --- a/asm/d/a/d_a_alink/initForceRideHorse__9daAlink_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_800ECB58: -/* 800ECB58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800ECB5C 7C 08 02 A6 */ mflr r0 -/* 800ECB60 90 01 00 14 */ stw r0, 0x14(r1) -/* 800ECB64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800ECB68 93 C1 00 08 */ stw r30, 8(r1) -/* 800ECB6C 7C 7E 1B 78 */ mr r30, r3 -/* 800ECB70 4B FF FE CD */ bl commonInitForceRideRein__9daAlink_cFv -/* 800ECB74 38 00 00 01 */ li r0, 1 -/* 800ECB78 98 1E 2F AA */ stb r0, 0x2faa(r30) -/* 800ECB7C 38 7E 28 14 */ addi r3, r30, 0x2814 -/* 800ECB80 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800ECB84 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800ECB88 80 9F 5D B8 */ lwz r4, 0x5db8(r31) -/* 800ECB8C 48 07 21 2D */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -/* 800ECB90 3C 60 80 42 */ lis r3, l_horseBaseAnime@ha /* 0x8042558C@ha */ -/* 800ECB94 38 03 55 8C */ addi r0, r3, l_horseBaseAnime@l /* 0x8042558C@l */ -/* 800ECB98 90 1E 38 4C */ stw r0, 0x384c(r30) -/* 800ECB9C 80 7F 5D B8 */ lwz r3, 0x5db8(r31) -/* 800ECBA0 39 83 18 EC */ addi r12, r3, 0x18ec -/* 800ECBA4 48 27 54 E1 */ bl __ptmf_scall -/* 800ECBA8 60 00 00 00 */ nop -/* 800ECBAC 38 7E 2C A8 */ addi r3, r30, 0x2ca8 -/* 800ECBB0 38 80 00 01 */ li r4, 1 -/* 800ECBB4 48 1D 6E B9 */ bl setRiding__14Z2CreatureLinkFb -/* 800ECBB8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800ECBBC 83 C1 00 08 */ lwz r30, 8(r1) -/* 800ECBC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800ECBC4 7C 08 03 A6 */ mtlr r0 -/* 800ECBC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ECBCC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/initGrabNextMode__9daAlink_cFv.s b/asm/d/a/d_a_alink/initGrabNextMode__9daAlink_cFv.s deleted file mode 100644 index c148e400f11..00000000000 --- a/asm/d/a/d_a_alink/initGrabNextMode__9daAlink_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_800E53AC: -/* 800E53AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E53B0 7C 08 02 A6 */ mflr r0 -/* 800E53B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E53B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E53BC 7C 7F 1B 78 */ mr r31, r3 -/* 800E53C0 4B FF E8 AD */ bl checkGrabAnime__9daAlink_cCFv -/* 800E53C4 2C 03 00 00 */ cmpwi r3, 0 -/* 800E53C8 40 82 00 10 */ bne lbl_800E53D8 -/* 800E53CC 7F E3 FB 78 */ mr r3, r31 -/* 800E53D0 C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800E53D4 4B FF E9 E9 */ bl setGrabUpperAnime__9daAlink_cFf -lbl_800E53D8: -/* 800E53D8 7F E3 FB 78 */ mr r3, r31 -/* 800E53DC 38 80 00 00 */ li r4, 0 -/* 800E53E0 4B FD 4C F1 */ bl checkNextAction__9daAlink_cFi -/* 800E53E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E53E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E53EC 7C 08 03 A6 */ mtlr r0 -/* 800E53F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E53F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/initGravity__9daAlink_cFv.s b/asm/d/a/d_a_alink/initGravity__9daAlink_cFv.s deleted file mode 100644 index 52af2f5f577..00000000000 --- a/asm/d/a/d_a_alink/initGravity__9daAlink_cFv.s +++ /dev/null @@ -1,83 +0,0 @@ -lbl_800BB644: -/* 800BB644 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800BB648 7C 08 02 A6 */ mflr r0 -/* 800BB64C 90 01 00 24 */ stw r0, 0x24(r1) -/* 800BB650 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 800BB654 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 800BB658 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800BB65C 93 C1 00 08 */ stw r30, 8(r1) -/* 800BB660 7C 7E 1B 78 */ mr r30, r3 -/* 800BB664 3C 80 80 39 */ lis r4, lit_3757@ha /* 0x8038D658@ha */ -/* 800BB668 3B E4 D6 58 */ addi r31, r4, lit_3757@l /* 0x8038D658@l */ -/* 800BB66C 80 03 05 74 */ lwz r0, 0x574(r3) -/* 800BB670 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800BB674 41 82 00 5C */ beq lbl_800BB6D0 -/* 800BB678 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 800BB67C 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd -/* 800BB680 41 82 00 40 */ beq lbl_800BB6C0 -/* 800BB684 38 80 00 01 */ li r4, 1 -/* 800BB688 38 A0 00 01 */ li r5, 1 -/* 800BB68C 4B FF FE 2D */ bl checkHeavyStateOn__9daAlink_cFii -/* 800BB690 2C 03 00 00 */ cmpwi r3, 0 -/* 800BB694 41 82 00 18 */ beq lbl_800BB6AC -/* 800BB698 38 7F 22 5C */ addi r3, r31, 0x225c -/* 800BB69C C0 03 00 9C */ lfs f0, 0x9c(r3) -/* 800BB6A0 FC 20 00 50 */ fneg f1, f0 -/* 800BB6A4 C3 E3 00 A0 */ lfs f31, 0xa0(r3) -/* 800BB6A8 48 00 00 98 */ b lbl_800BB740 -lbl_800BB6AC: -/* 800BB6AC 38 7F 22 5C */ addi r3, r31, 0x225c -/* 800BB6B0 C0 03 00 60 */ lfs f0, 0x60(r3) -/* 800BB6B4 FC 20 00 50 */ fneg f1, f0 -/* 800BB6B8 C3 E3 00 58 */ lfs f31, 0x58(r3) -/* 800BB6BC 48 00 00 84 */ b lbl_800BB740 -lbl_800BB6C0: -/* 800BB6C0 38 7F 1A 50 */ addi r3, r31, 0x1a50 -/* 800BB6C4 C0 23 00 58 */ lfs f1, 0x58(r3) -/* 800BB6C8 C3 E3 00 5C */ lfs f31, 0x5c(r3) -/* 800BB6CC 48 00 00 74 */ b lbl_800BB740 -lbl_800BB6D0: -/* 800BB6D0 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 800BB6D4 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd -/* 800BB6D8 40 82 00 10 */ bne lbl_800BB6E8 -/* 800BB6DC 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800BB6E0 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 800BB6E4 41 82 00 50 */ beq lbl_800BB734 -lbl_800BB6E8: -/* 800BB6E8 7F C3 F3 78 */ mr r3, r30 -/* 800BB6EC 48 04 63 BD */ bl getSwimMaxFallSpeed__9daAlink_cCFv -/* 800BB6F0 FF E0 08 90 */ fmr f31, f1 -/* 800BB6F4 7F C3 F3 78 */ mr r3, r30 -/* 800BB6F8 38 80 00 01 */ li r4, 1 -/* 800BB6FC 38 A0 00 01 */ li r5, 1 -/* 800BB700 4B FF FD B9 */ bl checkHeavyStateOn__9daAlink_cFii -/* 800BB704 2C 03 00 00 */ cmpwi r3, 0 -/* 800BB708 41 82 00 1C */ beq lbl_800BB724 -/* 800BB70C A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) -/* 800BB710 28 00 00 DD */ cmplwi r0, 0xdd -/* 800BB714 41 82 00 10 */ beq lbl_800BB724 -/* 800BB718 38 7F 16 D4 */ addi r3, r31, 0x16d4 -/* 800BB71C C0 23 00 E4 */ lfs f1, 0xe4(r3) -/* 800BB720 48 00 00 20 */ b lbl_800BB740 -lbl_800BB724: -/* 800BB724 38 7F 16 D4 */ addi r3, r31, 0x16d4 -/* 800BB728 C0 03 00 8C */ lfs f0, 0x8c(r3) -/* 800BB72C FC 20 00 50 */ fneg f1, f0 -/* 800BB730 48 00 00 10 */ b lbl_800BB740 -lbl_800BB734: -/* 800BB734 38 7F 0A 10 */ addi r3, r31, 0xa10 -/* 800BB738 C0 23 00 74 */ lfs f1, 0x74(r3) -/* 800BB73C C3 E3 00 78 */ lfs f31, 0x78(r3) -lbl_800BB740: -/* 800BB740 7F C3 F3 78 */ mr r3, r30 -/* 800BB744 FC 40 F8 90 */ fmr f2, f31 -/* 800BB748 38 80 00 01 */ li r4, 1 -/* 800BB74C 48 00 00 25 */ bl setSpecialGravity__9daAlink_cFffi -/* 800BB750 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 800BB754 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 800BB758 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800BB75C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800BB760 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800BB764 7C 08 03 A6 */ mtlr r0 -/* 800BB768 38 21 00 20 */ addi r1, r1, 0x20 -/* 800BB76C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/initWolfRopeShapeAngle__9daAlink_cFv.s b/asm/d/a/d_a_alink/initWolfRopeShapeAngle__9daAlink_cFv.s deleted file mode 100644 index 0b16be6fcab..00000000000 --- a/asm/d/a/d_a_alink/initWolfRopeShapeAngle__9daAlink_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_801319F0: -/* 801319F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801319F4 7C 08 02 A6 */ mflr r0 -/* 801319F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801319FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80131A00 93 C1 00 08 */ stw r30, 8(r1) -/* 80131A04 7C 7E 1B 78 */ mr r30, r3 -/* 80131A08 83 E3 28 10 */ lwz r31, 0x2810(r3) -/* 80131A0C A8 63 04 E6 */ lha r3, 0x4e6(r3) -/* 80131A10 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 80131A14 7C 03 00 50 */ subf r0, r3, r0 -/* 80131A18 7C 03 07 34 */ extsh r3, r0 -/* 80131A1C 48 23 36 B5 */ bl abs -/* 80131A20 2C 03 40 00 */ cmpwi r3, 0x4000 -/* 80131A24 40 80 00 14 */ bge lbl_80131A38 -/* 80131A28 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 80131A2C B0 1E 04 E6 */ sth r0, 0x4e6(r30) -/* 80131A30 A8 7F 04 E4 */ lha r3, 0x4e4(r31) -/* 80131A34 48 00 00 20 */ b lbl_80131A54 -lbl_80131A38: -/* 80131A38 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 80131A3C 3C 63 00 01 */ addis r3, r3, 1 -/* 80131A40 38 03 80 00 */ addi r0, r3, -32768 -/* 80131A44 B0 1E 04 E6 */ sth r0, 0x4e6(r30) -/* 80131A48 A8 1F 04 E4 */ lha r0, 0x4e4(r31) -/* 80131A4C 7C 00 00 D0 */ neg r0, r0 -/* 80131A50 7C 03 07 34 */ extsh r3, r0 -lbl_80131A54: -/* 80131A54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80131A58 83 C1 00 08 */ lwz r30, 8(r1) -/* 80131A5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80131A60 7C 08 03 A6 */ mtlr r0 -/* 80131A64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80131A68 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/loadAramBmd__9daAlink_cFUsUl.s b/asm/d/a/d_a_alink/loadAramBmd__9daAlink_cFUsUl.s deleted file mode 100644 index 8477d02f1ad..00000000000 --- a/asm/d/a/d_a_alink/loadAramBmd__9daAlink_cFUsUl.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_800BFE48: -/* 800BFE48 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800BFE4C 7C 08 02 A6 */ mflr r0 -/* 800BFE50 90 01 00 24 */ stw r0, 0x24(r1) -/* 800BFE54 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BFE58 48 2A 23 81 */ bl _savegpr_28 -/* 800BFE5C 7C 9C 23 78 */ mr r28, r4 -/* 800BFE60 7C BD 2B 78 */ mr r29, r5 -/* 800BFE64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800BFE68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800BFE6C 83 E3 5C AC */ lwz r31, 0x5cac(r3) -/* 800BFE70 7F A3 EB 78 */ mr r3, r29 -/* 800BFE74 38 80 00 20 */ li r4, 0x20 -/* 800BFE78 48 20 EE 75 */ bl __nwa__FUli -/* 800BFE7C 7C 7E 1B 78 */ mr r30, r3 -/* 800BFE80 7F E3 FB 78 */ mr r3, r31 -/* 800BFE84 7F C4 F3 78 */ mr r4, r30 -/* 800BFE88 7F A5 EB 78 */ mr r5, r29 -/* 800BFE8C 57 86 04 3E */ clrlwi r6, r28, 0x10 -/* 800BFE90 48 21 60 3D */ bl readIdxResource__10JKRArchiveFPvUlUl -/* 800BFE94 3C 60 42 4D */ lis r3, 0x424D /* 0x424D5752@ha */ -/* 800BFE98 38 63 57 52 */ addi r3, r3, 0x5752 /* 0x424D5752@l */ -/* 800BFE9C 80 DF 00 48 */ lwz r6, 0x48(r31) -/* 800BFEA0 57 85 04 3E */ clrlwi r5, r28, 0x10 -/* 800BFEA4 80 9F 00 44 */ lwz r4, 0x44(r31) -/* 800BFEA8 80 04 00 00 */ lwz r0, 0(r4) -/* 800BFEAC 7C 09 03 A6 */ mtctr r0 -/* 800BFEB0 2C 00 00 00 */ cmpwi r0, 0 -/* 800BFEB4 40 81 00 30 */ ble lbl_800BFEE4 -lbl_800BFEB8: -/* 800BFEB8 80 86 00 0C */ lwz r4, 0xc(r6) -/* 800BFEBC 7C 05 20 40 */ cmplw r5, r4 -/* 800BFEC0 41 80 00 1C */ blt lbl_800BFEDC -/* 800BFEC4 A0 06 00 0A */ lhz r0, 0xa(r6) -/* 800BFEC8 7C 04 02 14 */ add r0, r4, r0 -/* 800BFECC 7C 05 00 40 */ cmplw r5, r0 -/* 800BFED0 40 80 00 0C */ bge lbl_800BFEDC -/* 800BFED4 80 66 00 00 */ lwz r3, 0(r6) -/* 800BFED8 48 00 00 0C */ b lbl_800BFEE4 -lbl_800BFEDC: -/* 800BFEDC 38 C6 00 10 */ addi r6, r6, 0x10 -/* 800BFEE0 42 00 FF D8 */ bdnz lbl_800BFEB8 -lbl_800BFEE4: -/* 800BFEE4 7F C4 F3 78 */ mr r4, r30 -/* 800BFEE8 4B F7 AF 2D */ bl loaderBasicBmd__11dRes_info_cFUlPv -/* 800BFEEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BFEF0 48 2A 23 35 */ bl _restgpr_28 -/* 800BFEF4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800BFEF8 7C 08 03 A6 */ mtlr r0 -/* 800BFEFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800BFF00 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/loadAramItemBrk__9daAlink_cFUsP8J3DModel.s b/asm/d/a/d_a_alink/loadAramItemBrk__9daAlink_cFUsP8J3DModel.s deleted file mode 100644 index a62a3639225..00000000000 --- a/asm/d/a/d_a_alink/loadAramItemBrk__9daAlink_cFUsP8J3DModel.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800BFF70: -/* 800BFF70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BFF74 7C 08 02 A6 */ mflr r0 -/* 800BFF78 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BFF7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800BFF80 93 C1 00 08 */ stw r30, 8(r1) -/* 800BFF84 83 E5 00 04 */ lwz r31, 4(r5) -/* 800BFF88 38 A0 04 00 */ li r5, 0x400 -/* 800BFF8C 4B FF FF 79 */ bl loadAram__9daAlink_cFUsUl -/* 800BFF90 7C 7E 1B 78 */ mr r30, r3 -/* 800BFF94 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800BFF98 D0 03 00 08 */ stfs f0, 8(r3) -/* 800BFF9C 7F E4 FB 78 */ mr r4, r31 -/* 800BFFA0 48 26 B8 DD */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData -/* 800BFFA4 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800BFFA8 7F C4 F3 78 */ mr r4, r30 -/* 800BFFAC 48 26 FE C5 */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey -/* 800BFFB0 7F C3 F3 78 */ mr r3, r30 -/* 800BFFB4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800BFFB8 83 C1 00 08 */ lwz r30, 8(r1) -/* 800BFFBC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BFFC0 7C 08 03 A6 */ mtlr r0 -/* 800BFFC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BFFC8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/loadAramItemBtk__9daAlink_cFUsP8J3DModel.s b/asm/d/a/d_a_alink/loadAramItemBtk__9daAlink_cFUsP8J3DModel.s deleted file mode 100644 index 3d7016f529d..00000000000 --- a/asm/d/a/d_a_alink/loadAramItemBtk__9daAlink_cFUsP8J3DModel.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800BFFCC: -/* 800BFFCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BFFD0 7C 08 02 A6 */ mflr r0 -/* 800BFFD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BFFD8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800BFFDC 93 C1 00 08 */ stw r30, 8(r1) -/* 800BFFE0 83 E5 00 04 */ lwz r31, 4(r5) -/* 800BFFE4 38 A0 04 00 */ li r5, 0x400 -/* 800BFFE8 4B FF FF 1D */ bl loadAram__9daAlink_cFUsUl -/* 800BFFEC 7C 7E 1B 78 */ mr r30, r3 -/* 800BFFF0 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800BFFF4 D0 03 00 08 */ stfs f0, 8(r3) -/* 800BFFF8 7F E4 FB 78 */ mr r4, r31 -/* 800BFFFC 48 26 B1 D9 */ bl searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData -/* 800C0000 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800C0004 7F C4 F3 78 */ mr r4, r30 -/* 800C0008 48 26 FC BD */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey -/* 800C000C 7F C3 F3 78 */ mr r3, r30 -/* 800C0010 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C0014 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C0018 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C001C 7C 08 03 A6 */ mtlr r0 -/* 800C0020 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C0024 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/loadAramItemBtp__9daAlink_cFUsP8J3DModel.s b/asm/d/a/d_a_alink/loadAramItemBtp__9daAlink_cFUsP8J3DModel.s deleted file mode 100644 index 0359dcbed37..00000000000 --- a/asm/d/a/d_a_alink/loadAramItemBtp__9daAlink_cFUsP8J3DModel.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800C0028: -/* 800C0028 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C002C 7C 08 02 A6 */ mflr r0 -/* 800C0030 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C0034 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C0038 93 C1 00 08 */ stw r30, 8(r1) -/* 800C003C 83 E5 00 04 */ lwz r31, 4(r5) -/* 800C0040 38 A0 04 00 */ li r5, 0x400 -/* 800C0044 4B FF FE C1 */ bl loadAram__9daAlink_cFUsUl -/* 800C0048 7C 7E 1B 78 */ mr r30, r3 -/* 800C004C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C0050 D0 03 00 08 */ stfs f0, 8(r3) -/* 800C0054 7F E4 FB 78 */ mr r4, r31 -/* 800C0058 48 26 B0 45 */ bl searchUpdateMaterialID__16J3DAnmTexPatternFP12J3DModelData -/* 800C005C 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800C0060 7F C4 F3 78 */ mr r4, r30 -/* 800C0064 48 26 FB 65 */ bl entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern -/* 800C0068 7F C3 F3 78 */ mr r3, r30 -/* 800C006C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C0070 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C0074 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C0078 7C 08 03 A6 */ mtlr r0 -/* 800C007C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C0080 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/loadAram__9daAlink_cFUsUl.s b/asm/d/a/d_a_alink/loadAram__9daAlink_cFUsUl.s deleted file mode 100644 index 4da697abaf1..00000000000 --- a/asm/d/a/d_a_alink/loadAram__9daAlink_cFUsUl.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_800BFF04: -/* 800BFF04 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800BFF08 7C 08 02 A6 */ mflr r0 -/* 800BFF0C 90 01 00 24 */ stw r0, 0x24(r1) -/* 800BFF10 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BFF14 48 2A 22 C9 */ bl _savegpr_29 -/* 800BFF18 7C 9D 23 78 */ mr r29, r4 -/* 800BFF1C 7C BE 2B 78 */ mr r30, r5 -/* 800BFF20 7F C3 F3 78 */ mr r3, r30 -/* 800BFF24 38 80 00 20 */ li r4, 0x20 -/* 800BFF28 48 20 ED C5 */ bl __nwa__FUli -/* 800BFF2C 7C 7F 1B 78 */ mr r31, r3 -/* 800BFF30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800BFF34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800BFF38 80 63 5C AC */ lwz r3, 0x5cac(r3) -/* 800BFF3C 7F E4 FB 78 */ mr r4, r31 -/* 800BFF40 7F C5 F3 78 */ mr r5, r30 -/* 800BFF44 57 A6 04 3E */ clrlwi r6, r29, 0x10 -/* 800BFF48 48 21 5F 85 */ bl readIdxResource__10JKRArchiveFPvUlUl -/* 800BFF4C 7F E3 FB 78 */ mr r3, r31 -/* 800BFF50 38 80 00 00 */ li r4, 0 -/* 800BFF54 48 27 7B ED */ bl load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag -/* 800BFF58 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BFF5C 48 2A 22 CD */ bl _restgpr_29 -/* 800BFF60 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800BFF64 7C 08 03 A6 */ mtlr r0 -/* 800BFF68 38 21 00 20 */ addi r1, r1, 0x20 -/* 800BFF6C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/makeArrow__9daAlink_cFv.s b/asm/d/a/d_a_alink/makeArrow__9daAlink_cFv.s deleted file mode 100644 index 57e5f7cb38f..00000000000 --- a/asm/d/a/d_a_alink/makeArrow__9daAlink_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_800DEA3C: -/* 800DEA3C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800DEA40 7C 08 02 A6 */ mflr r0 -/* 800DEA44 90 01 00 24 */ stw r0, 0x24(r1) -/* 800DEA48 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 800DEA4C 7C 7F 1B 78 */ mr r31, r3 -/* 800DEA50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800DEA54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800DEA58 88 03 00 EC */ lbz r0, 0xec(r3) -/* 800DEA5C 28 00 00 00 */ cmplwi r0, 0 -/* 800DEA60 41 82 00 68 */ beq lbl_800DEAC8 -/* 800DEA64 A8 1F 30 1E */ lha r0, 0x301e(r31) -/* 800DEA68 2C 00 00 01 */ cmpwi r0, 1 -/* 800DEA6C 40 82 00 1C */ bne lbl_800DEA88 -/* 800DEA70 88 7F 2F 9C */ lbz r3, 0x2f9c(r31) -/* 800DEA74 4B F4 FB 4D */ bl dComIfGp_getSelectItemNum__Fi -/* 800DEA78 7C 60 07 35 */ extsh. r0, r3 -/* 800DEA7C 40 82 00 0C */ bne lbl_800DEA88 -/* 800DEA80 38 00 00 00 */ li r0, 0 -/* 800DEA84 B0 1F 30 1E */ sth r0, 0x301e(r31) -lbl_800DEA88: -/* 800DEA88 38 00 00 00 */ li r0, 0 -/* 800DEA8C 90 01 00 08 */ stw r0, 8(r1) -/* 800DEA90 38 60 03 08 */ li r3, 0x308 -/* 800DEA94 A8 1F 30 1E */ lha r0, 0x301e(r31) -/* 800DEA98 54 04 42 2E */ rlwinm r4, r0, 8, 8, 0x17 -/* 800DEA9C 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 800DEAA0 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 800DEAA4 7C 06 07 74 */ extsb r6, r0 -/* 800DEAA8 38 E0 00 00 */ li r7, 0 -/* 800DEAAC 39 00 00 00 */ li r8, 0 -/* 800DEAB0 39 20 FF FF */ li r9, -1 -/* 800DEAB4 39 40 00 00 */ li r10, 0 -/* 800DEAB8 4B F3 B3 4D */ bl fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv -/* 800DEABC 7C 64 1B 78 */ mr r4, r3 -/* 800DEAC0 38 7F 28 24 */ addi r3, r31, 0x2824 -/* 800DEAC4 48 08 01 F5 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -lbl_800DEAC8: -/* 800DEAC8 38 00 00 00 */ li r0, 0 -/* 800DEACC B0 1F 30 18 */ sth r0, 0x3018(r31) -/* 800DEAD0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 800DEAD4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800DEAD8 7C 08 03 A6 */ mtlr r0 -/* 800DEADC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DEAE0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/makeFairy__9daAlink_cFP4cXyzUl.s b/asm/d/a/d_a_alink/makeFairy__9daAlink_cFP4cXyzUl.s deleted file mode 100644 index 7eb8071d1f8..00000000000 --- a/asm/d/a/d_a_alink/makeFairy__9daAlink_cFP4cXyzUl.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_8010F45C: -/* 8010F45C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8010F460 7C 08 02 A6 */ mflr r0 -/* 8010F464 90 01 00 34 */ stw r0, 0x34(r1) -/* 8010F468 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 8010F46C 7C 7F 1B 78 */ mr r31, r3 -/* 8010F470 7C 86 23 78 */ mr r6, r4 -/* 8010F474 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 8010F478 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd -/* 8010F47C 41 82 00 48 */ beq lbl_8010F4C4 -/* 8010F480 C0 06 00 00 */ lfs f0, 0(r6) -/* 8010F484 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8010F488 C0 26 00 04 */ lfs f1, 4(r6) -/* 8010F48C D0 21 00 14 */ stfs f1, 0x14(r1) -/* 8010F490 C0 06 00 08 */ lfs f0, 8(r6) -/* 8010F494 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8010F498 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8010F49C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8010F4A0 41 82 00 14 */ beq lbl_8010F4B4 -/* 8010F4A4 C0 02 93 50 */ lfs f0, lit_8247(r2) -/* 8010F4A8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8010F4AC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8010F4B0 48 00 00 10 */ b lbl_8010F4C0 -lbl_8010F4B4: -/* 8010F4B4 C0 02 93 04 */ lfs f0, lit_6896(r2) -/* 8010F4B8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8010F4BC D0 01 00 14 */ stfs f0, 0x14(r1) -lbl_8010F4C0: -/* 8010F4C0 38 C1 00 10 */ addi r6, r1, 0x10 -lbl_8010F4C4: -/* 8010F4C4 38 00 00 00 */ li r0, 0 -/* 8010F4C8 90 01 00 08 */ stw r0, 8(r1) -/* 8010F4CC 38 60 01 3F */ li r3, 0x13f -/* 8010F4D0 7C A4 2B 78 */ mr r4, r5 -/* 8010F4D4 7C C5 33 78 */ mr r5, r6 -/* 8010F4D8 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8010F4DC 7C 06 07 74 */ extsb r6, r0 -/* 8010F4E0 38 FF 04 E4 */ addi r7, r31, 0x4e4 -/* 8010F4E4 39 00 00 00 */ li r8, 0 -/* 8010F4E8 39 20 FF FF */ li r9, -1 -/* 8010F4EC 39 40 00 00 */ li r10, 0 -/* 8010F4F0 4B F0 A9 15 */ bl fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv -/* 8010F4F4 7C 64 1B 78 */ mr r4, r3 -/* 8010F4F8 38 7F 28 5C */ addi r3, r31, 0x285c -/* 8010F4FC 48 04 F7 BD */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -/* 8010F500 80 1F 05 80 */ lwz r0, 0x580(r31) -/* 8010F504 60 00 04 00 */ ori r0, r0, 0x400 -/* 8010F508 90 1F 05 80 */ stw r0, 0x580(r31) -/* 8010F50C 7F E3 FB 78 */ mr r3, r31 -/* 8010F510 48 00 67 11 */ bl checkEventRun__9daAlink_cCFv -/* 8010F514 2C 03 00 00 */ cmpwi r3, 0 -/* 8010F518 41 82 00 1C */ beq lbl_8010F534 -/* 8010F51C 80 7F 28 60 */ lwz r3, 0x2860(r31) -/* 8010F520 28 03 00 00 */ cmplwi r3, 0 -/* 8010F524 41 82 00 10 */ beq lbl_8010F534 -/* 8010F528 80 03 04 9C */ lwz r0, 0x49c(r3) -/* 8010F52C 60 00 08 00 */ ori r0, r0, 0x800 -/* 8010F530 90 03 04 9C */ stw r0, 0x49c(r3) -lbl_8010F534: -/* 8010F534 80 7F 28 60 */ lwz r3, 0x2860(r31) -/* 8010F538 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 8010F53C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8010F540 7C 08 03 A6 */ mtlr r0 -/* 8010F544 38 21 00 30 */ addi r1, r1, 0x30 -/* 8010F548 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/modelDraw__9daAlink_cFP8J3DModeli.s b/asm/d/a/d_a_alink/modelDraw__9daAlink_cFP8J3DModeli.s deleted file mode 100644 index 12eb8f457e4..00000000000 --- a/asm/d/a/d_a_alink/modelDraw__9daAlink_cFP8J3DModeli.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_800CC2E0: -/* 800CC2E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800CC2E4 7C 08 02 A6 */ mflr r0 -/* 800CC2E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800CC2EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800CC2F0 93 C1 00 08 */ stw r30, 8(r1) -/* 800CC2F4 7C 66 1B 78 */ mr r6, r3 -/* 800CC2F8 7C 9E 23 78 */ mr r30, r4 -/* 800CC2FC 7C BF 2B 78 */ mr r31, r5 -/* 800CC300 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 800CC304 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 800CC308 80 84 00 04 */ lwz r4, 4(r4) -/* 800CC30C 38 A6 01 0C */ addi r5, r6, 0x10c -/* 800CC310 48 0D 8A 91 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 800CC314 2C 1F 00 00 */ cmpwi r31, 0 -/* 800CC318 40 82 00 10 */ bne lbl_800CC328 -/* 800CC31C 7F C3 F3 78 */ mr r3, r30 -/* 800CC320 4B F4 1A 45 */ bl mDoExt_modelEntryDL__FP8J3DModel -/* 800CC324 48 00 00 20 */ b lbl_800CC344 -lbl_800CC328: -/* 800CC328 7F C3 F3 78 */ mr r3, r30 -/* 800CC32C 81 9E 00 00 */ lwz r12, 0(r30) -/* 800CC330 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 800CC334 7D 89 03 A6 */ mtctr r12 -/* 800CC338 4E 80 04 21 */ bctrl -/* 800CC33C 7F C3 F3 78 */ mr r3, r30 -/* 800CC340 48 25 B6 61 */ bl diff__8J3DModelFv -lbl_800CC344: -/* 800CC344 7F C3 F3 78 */ mr r3, r30 -/* 800CC348 4B F6 56 05 */ bl entry__10daMirror_cFP8J3DModel -/* 800CC34C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800CC350 83 C1 00 08 */ lwz r30, 8(r1) -/* 800CC354 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800CC358 7C 08 03 A6 */ mtlr r0 -/* 800CC35C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800CC360 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/offKandelaarModel__9daAlink_cFv.s b/asm/d/a/d_a_alink/offKandelaarModel__9daAlink_cFv.s deleted file mode 100644 index 510fc72ee90..00000000000 --- a/asm/d/a/d_a_alink/offKandelaarModel__9daAlink_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80110840: -/* 80110840 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80110844 7C 08 02 A6 */ mflr r0 -/* 80110848 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011084C 80 A3 05 78 */ lwz r5, 0x578(r3) -/* 80110850 3C 80 F0 00 */ lis r4, 0xF000 /* 0xEFFFFFFE@ha */ -/* 80110854 38 04 FF FE */ addi r0, r4, 0xFFFE /* 0xEFFFFFFE@l */ -/* 80110858 7C A0 00 38 */ and r0, r5, r0 -/* 8011085C 90 03 05 78 */ stw r0, 0x578(r3) -/* 80110860 38 80 00 00 */ li r4, 0 -/* 80110864 38 63 2C A8 */ addi r3, r3, 0x2ca8 -/* 80110868 48 1B 2F 11 */ bl setKanteraState__14Z2CreatureLinkFUc -/* 8011086C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80110870 7C 08 03 A6 */ mtlr r0 -/* 80110874 38 21 00 10 */ addi r1, r1, 0x10 -/* 80110878 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/offOxygenTimer__9daAlink_cFv.s b/asm/d/a/d_a_alink/offOxygenTimer__9daAlink_cFv.s deleted file mode 100644 index a2b3906ceac..00000000000 --- a/asm/d/a/d_a_alink/offOxygenTimer__9daAlink_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80101C94: -/* 80101C94 38 00 00 00 */ li r0, 0 -/* 80101C98 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80101C9C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80101CA0 98 04 5E B7 */ stb r0, 0x5eb7(r4) -/* 80101CA4 80 04 5D E8 */ lwz r0, 0x5de8(r4) -/* 80101CA8 90 04 5D E0 */ stw r0, 0x5de0(r4) -/* 80101CAC 38 00 00 5A */ li r0, 0x5a -/* 80101CB0 98 03 2F BE */ stb r0, 0x2fbe(r3) -/* 80101CB4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/onPressedDamage__9daAlink_cFRC4cXyzs.s b/asm/d/a/d_a_alink/onPressedDamage__9daAlink_cFRC4cXyzs.s deleted file mode 100644 index 5db79b3db1c..00000000000 --- a/asm/d/a/d_a_alink/onPressedDamage__9daAlink_cFRC4cXyzs.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D6F00: -/* 800D6F00 80 03 05 78 */ lwz r0, 0x578(r3) -/* 800D6F04 60 00 10 00 */ ori r0, r0, 0x1000 -/* 800D6F08 90 03 05 78 */ stw r0, 0x578(r3) -/* 800D6F0C B0 A3 31 04 */ sth r5, 0x3104(r3) -/* 800D6F10 C0 04 00 00 */ lfs f0, 0(r4) -/* 800D6F14 D0 03 37 44 */ stfs f0, 0x3744(r3) -/* 800D6F18 C0 04 00 04 */ lfs f0, 4(r4) -/* 800D6F1C D0 03 37 48 */ stfs f0, 0x3748(r3) -/* 800D6F20 C0 04 00 08 */ lfs f0, 8(r4) -/* 800D6F24 D0 03 37 4C */ stfs f0, 0x374c(r3) -/* 800D6F28 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/onWolfEnemyBiteAll__9daAlink_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2.s b/asm/d/a/d_a_alink/onWolfEnemyBiteAll__9daAlink_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2.s deleted file mode 100644 index 9e5472b3c69..00000000000 --- a/asm/d/a/d_a_alink/onWolfEnemyBiteAll__9daAlink_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80138B6C: -/* 80138B6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80138B70 7C 08 02 A6 */ mflr r0 -/* 80138B74 90 01 00 14 */ stw r0, 0x14(r1) -/* 80138B78 80 03 28 20 */ lwz r0, 0x2820(r3) -/* 80138B7C 28 00 00 00 */ cmplwi r0, 0 -/* 80138B80 41 82 00 0C */ beq lbl_80138B8C -/* 80138B84 38 60 00 00 */ li r3, 0 -/* 80138B88 48 00 00 6C */ b lbl_80138BF4 -lbl_80138B8C: -/* 80138B8C 2C 05 00 08 */ cmpwi r5, 8 -/* 80138B90 40 82 00 38 */ bne lbl_80138BC8 -/* 80138B94 88 03 05 68 */ lbz r0, 0x568(r3) -/* 80138B98 28 00 00 2C */ cmplwi r0, 0x2c -/* 80138B9C 41 82 00 40 */ beq lbl_80138BDC -/* 80138BA0 28 00 00 2D */ cmplwi r0, 0x2d -/* 80138BA4 41 82 00 38 */ beq lbl_80138BDC -/* 80138BA8 28 00 00 31 */ cmplwi r0, 0x31 -/* 80138BAC 41 82 00 30 */ beq lbl_80138BDC -/* 80138BB0 28 00 00 39 */ cmplwi r0, 0x39 -/* 80138BB4 41 82 00 28 */ beq lbl_80138BDC -/* 80138BB8 28 00 00 32 */ cmplwi r0, 0x32 -/* 80138BBC 41 82 00 20 */ beq lbl_80138BDC -/* 80138BC0 38 60 00 00 */ li r3, 0 -/* 80138BC4 48 00 00 30 */ b lbl_80138BF4 -lbl_80138BC8: -/* 80138BC8 88 03 05 68 */ lbz r0, 0x568(r3) -/* 80138BCC 28 00 00 39 */ cmplwi r0, 0x39 -/* 80138BD0 41 82 00 0C */ beq lbl_80138BDC -/* 80138BD4 38 60 00 00 */ li r3, 0 -/* 80138BD8 48 00 00 1C */ b lbl_80138BF4 -lbl_80138BDC: -/* 80138BDC 80 03 05 78 */ lwz r0, 0x578(r3) -/* 80138BE0 7C 00 2B 78 */ or r0, r0, r5 -/* 80138BE4 90 03 05 78 */ stw r0, 0x578(r3) -/* 80138BE8 38 63 28 1C */ addi r3, r3, 0x281c -/* 80138BEC 48 02 60 CD */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -/* 80138BF0 38 60 00 01 */ li r3, 1 -lbl_80138BF4: -/* 80138BF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80138BF8 7C 08 03 A6 */ mtlr r0 -/* 80138BFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80138C00 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBackJumpInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procBackJumpInit__9daAlink_cFi.s deleted file mode 100644 index e808cfd346d..00000000000 --- a/asm/d/a/d_a_alink/procBackJumpInit__9daAlink_cFi.s +++ /dev/null @@ -1,119 +0,0 @@ -lbl_800C57A4: -/* 800C57A4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800C57A8 7C 08 02 A6 */ mflr r0 -/* 800C57AC 90 01 00 24 */ stw r0, 0x24(r1) -/* 800C57B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C57B4 48 29 CA 21 */ bl _savegpr_27 -/* 800C57B8 7C 7E 1B 78 */ mr r30, r3 -/* 800C57BC 7C 9B 23 78 */ mr r27, r4 -/* 800C57C0 81 83 06 28 */ lwz r12, 0x628(r3) -/* 800C57C4 81 8C 01 88 */ lwz r12, 0x188(r12) -/* 800C57C8 7D 89 03 A6 */ mtctr r12 -/* 800C57CC 4E 80 04 21 */ bctrl -/* 800C57D0 7C 7D 1B 78 */ mr r29, r3 -/* 800C57D4 7F C3 F3 78 */ mr r3, r30 -/* 800C57D8 48 01 76 19 */ bl checkUpperGuardAnime__9daAlink_cCFv -/* 800C57DC 7C 7F 1B 78 */ mr r31, r3 -/* 800C57E0 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) -/* 800C57E4 20 00 00 E6 */ subfic r0, r0, 0xe6 -/* 800C57E8 7C 00 00 34 */ cntlzw r0, r0 -/* 800C57EC 54 1C DE 3E */ rlwinm r28, r0, 0x1b, 0x18, 0x1f -/* 800C57F0 7F C3 F3 78 */ mr r3, r30 -/* 800C57F4 38 80 00 12 */ li r4, 0x12 -/* 800C57F8 4B FF C7 75 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C57FC 2C 1B 00 00 */ cmpwi r27, 0 -/* 800C5800 41 82 00 54 */ beq lbl_800C5854 -/* 800C5804 7F C3 F3 78 */ mr r3, r30 -/* 800C5808 38 80 00 26 */ li r4, 0x26 -/* 800C580C 3C A0 80 39 */ lis r5, m__21daAlinkHIO_cutDown_c0@ha /* 0x8038DD44@ha */ -/* 800C5810 38 A5 DD 44 */ addi r5, r5, m__21daAlinkHIO_cutDown_c0@l /* 0x8038DD44@l */ -/* 800C5814 38 A5 00 50 */ addi r5, r5, 0x50 -/* 800C5818 4B FE 78 DD */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800C581C 3C 60 80 39 */ lis r3, m__21daAlinkHIO_cutDown_c0@ha /* 0x8038DD44@ha */ -/* 800C5820 38 63 DD 44 */ addi r3, r3, m__21daAlinkHIO_cutDown_c0@l /* 0x8038DD44@l */ -/* 800C5824 C0 03 00 6C */ lfs f0, 0x6c(r3) -/* 800C5828 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800C582C C0 03 00 70 */ lfs f0, 0x70(r3) -/* 800C5830 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 800C5834 7F C3 F3 78 */ mr r3, r30 -/* 800C5838 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010095@ha */ -/* 800C583C 38 84 00 95 */ addi r4, r4, 0x0095 /* 0x00010095@l */ -/* 800C5840 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 800C5844 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800C5848 7D 89 03 A6 */ mtctr r12 -/* 800C584C 4E 80 04 21 */ bctrl -/* 800C5850 48 00 00 4C */ b lbl_800C589C -lbl_800C5854: -/* 800C5854 7F C3 F3 78 */ mr r3, r30 -/* 800C5858 38 80 00 26 */ li r4, 0x26 -/* 800C585C 3C A0 80 39 */ lis r5, m__22daAlinkHIO_backJump_c0@ha /* 0x8038D82C@ha */ -/* 800C5860 38 A5 D8 2C */ addi r5, r5, m__22daAlinkHIO_backJump_c0@l /* 0x8038D82C@l */ -/* 800C5864 4B FE 78 91 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800C5868 3C 60 80 39 */ lis r3, m__22daAlinkHIO_backJump_c0@ha /* 0x8038D82C@ha */ -/* 800C586C 38 63 D8 2C */ addi r3, r3, m__22daAlinkHIO_backJump_c0@l /* 0x8038D82C@l */ -/* 800C5870 C0 03 00 28 */ lfs f0, 0x28(r3) -/* 800C5874 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800C5878 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 800C587C D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 800C5880 7F C3 F3 78 */ mr r3, r30 -/* 800C5884 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010007@ha */ -/* 800C5888 38 84 00 07 */ addi r4, r4, 0x0007 /* 0x00010007@l */ -/* 800C588C 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 800C5890 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800C5894 7D 89 03 A6 */ mtctr r12 -/* 800C5898 4E 80 04 21 */ bctrl -lbl_800C589C: -/* 800C589C C0 1E 33 98 */ lfs f0, 0x3398(r30) -/* 800C58A0 D0 1E 34 78 */ stfs f0, 0x3478(r30) -/* 800C58A4 28 1D 00 00 */ cmplwi r29, 0 -/* 800C58A8 41 82 00 1C */ beq lbl_800C58C4 -/* 800C58AC 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 800C58B0 60 00 20 00 */ ori r0, r0, 0x2000 -/* 800C58B4 90 1E 31 A0 */ stw r0, 0x31a0(r30) -/* 800C58B8 38 00 00 05 */ li r0, 5 -/* 800C58BC B0 1E 30 08 */ sth r0, 0x3008(r30) -/* 800C58C0 48 00 00 0C */ b lbl_800C58CC -lbl_800C58C4: -/* 800C58C4 38 00 00 00 */ li r0, 0 -/* 800C58C8 B0 1E 30 08 */ sth r0, 0x3008(r30) -lbl_800C58CC: -/* 800C58CC 2C 1C 00 00 */ cmpwi r28, 0 -/* 800C58D0 41 82 00 4C */ beq lbl_800C591C -/* 800C58D4 A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 800C58D8 3C 63 00 01 */ addis r3, r3, 1 -/* 800C58DC 38 03 80 00 */ addi r0, r3, -32768 -/* 800C58E0 B0 1E 04 E6 */ sth r0, 0x4e6(r30) -/* 800C58E4 7F C3 F3 78 */ mr r3, r30 -/* 800C58E8 38 80 00 00 */ li r4, 0 -/* 800C58EC 38 A0 80 00 */ li r5, -32768 -/* 800C58F0 38 C0 00 00 */ li r6, 0 -/* 800C58F4 4B FE 82 85 */ bl setOldRootQuaternion__9daAlink_cFsss -/* 800C58F8 80 7E 20 60 */ lwz r3, 0x2060(r30) -/* 800C58FC 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 800C5900 C0 23 00 1C */ lfs f1, 0x1c(r3) -/* 800C5904 C0 02 95 1C */ lfs f0, lit_20991(r2) -/* 800C5908 EC 01 00 2A */ fadds f0, f1, f0 -/* 800C590C D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 800C5910 80 1E 05 7C */ lwz r0, 0x57c(r30) -/* 800C5914 64 00 04 00 */ oris r0, r0, 0x400 -/* 800C5918 90 1E 05 7C */ stw r0, 0x57c(r30) -lbl_800C591C: -/* 800C591C A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 800C5920 3C 63 00 01 */ addis r3, r3, 1 -/* 800C5924 38 03 80 00 */ addi r0, r3, -32768 -/* 800C5928 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800C592C 38 00 00 02 */ li r0, 2 -/* 800C5930 90 1E 31 98 */ stw r0, 0x3198(r30) -/* 800C5934 2C 1F 00 00 */ cmpwi r31, 0 -/* 800C5938 41 82 00 10 */ beq lbl_800C5948 -/* 800C593C 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800C5940 60 00 00 02 */ ori r0, r0, 2 -/* 800C5944 90 1E 05 70 */ stw r0, 0x570(r30) -lbl_800C5948: -/* 800C5948 38 60 00 01 */ li r3, 1 -/* 800C594C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C5950 48 29 C8 D1 */ bl _restgpr_27 -/* 800C5954 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800C5958 7C 08 03 A6 */ mtlr r0 -/* 800C595C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800C5960 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBackJumpLandInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procBackJumpLandInit__9daAlink_cFi.s deleted file mode 100644 index d22263f6106..00000000000 --- a/asm/d/a/d_a_alink/procBackJumpLandInit__9daAlink_cFi.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_800C5A54: -/* 800C5A54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C5A58 7C 08 02 A6 */ mflr r0 -/* 800C5A5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C5A60 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C5A64 93 C1 00 08 */ stw r30, 8(r1) -/* 800C5A68 7C 7E 1B 78 */ mr r30, r3 -/* 800C5A6C 7C 9F 23 78 */ mr r31, r4 -/* 800C5A70 38 80 00 13 */ li r4, 0x13 -/* 800C5A74 4B FF C4 F9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C5A78 7F C3 F3 78 */ mr r3, r30 -/* 800C5A7C 38 80 00 27 */ li r4, 0x27 -/* 800C5A80 3C A0 80 39 */ lis r5, m__22daAlinkHIO_backJump_c0@ha /* 0x8038D82C@ha */ -/* 800C5A84 38 A5 D8 2C */ addi r5, r5, m__22daAlinkHIO_backJump_c0@l /* 0x8038D82C@l */ -/* 800C5A88 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800C5A8C 4B FE 76 69 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800C5A90 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C5A94 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800C5A98 38 00 00 04 */ li r0, 4 -/* 800C5A9C 98 1E 2F 9D */ stb r0, 0x2f9d(r30) -/* 800C5AA0 7F C3 F3 78 */ mr r3, r30 -/* 800C5AA4 38 80 00 02 */ li r4, 2 -/* 800C5AA8 48 05 B7 19 */ bl setFootEffectProcType__9daAlink_cFi -/* 800C5AAC 80 1E 05 84 */ lwz r0, 0x584(r30) -/* 800C5AB0 60 00 00 30 */ ori r0, r0, 0x30 -/* 800C5AB4 90 1E 05 84 */ stw r0, 0x584(r30) -/* 800C5AB8 93 FE 31 98 */ stw r31, 0x3198(r30) -/* 800C5ABC A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800C5AC0 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800C5AC4 38 00 00 0A */ li r0, 0xa -/* 800C5AC8 98 1E 2F CC */ stb r0, 0x2fcc(r30) -/* 800C5ACC 7F C3 F3 78 */ mr r3, r30 -/* 800C5AD0 4B FF 01 95 */ bl setStepLandVibration__9daAlink_cFv -/* 800C5AD4 38 60 00 01 */ li r3, 1 -/* 800C5AD8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C5ADC 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C5AE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C5AE4 7C 08 03 A6 */ mtlr r0 -/* 800C5AE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C5AEC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBackJumpLand__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBackJumpLand__9daAlink_cFv.s deleted file mode 100644 index d5bfcfc8e88..00000000000 --- a/asm/d/a/d_a_alink/procBackJumpLand__9daAlink_cFv.s +++ /dev/null @@ -1,88 +0,0 @@ -lbl_800C5AF0: -/* 800C5AF0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800C5AF4 7C 08 02 A6 */ mflr r0 -/* 800C5AF8 90 01 00 24 */ stw r0, 0x24(r1) -/* 800C5AFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C5B00 48 29 C6 DD */ bl _savegpr_29 -/* 800C5B04 7C 7F 1B 78 */ mr r31, r3 -/* 800C5B08 3B BF 1F D0 */ addi r29, r31, 0x1fd0 -/* 800C5B0C 88 03 2F CC */ lbz r0, 0x2fcc(r3) -/* 800C5B10 28 00 00 00 */ cmplwi r0, 0 -/* 800C5B14 41 82 00 0C */ beq lbl_800C5B20 -/* 800C5B18 38 00 00 0A */ li r0, 0xa -/* 800C5B1C 98 1F 2F CC */ stb r0, 0x2fcc(r31) -lbl_800C5B20: -/* 800C5B20 80 1F 05 88 */ lwz r0, 0x588(r31) -/* 800C5B24 64 00 08 00 */ oris r0, r0, 0x800 -/* 800C5B28 90 1F 05 88 */ stw r0, 0x588(r31) -/* 800C5B2C 7F A3 EB 78 */ mr r3, r29 -/* 800C5B30 48 09 89 9D */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800C5B34 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C5B38 41 82 00 74 */ beq lbl_800C5BAC -/* 800C5B3C 80 1F 06 14 */ lwz r0, 0x614(r31) -/* 800C5B40 28 00 00 10 */ cmplwi r0, 0x10 -/* 800C5B44 40 82 00 1C */ bne lbl_800C5B60 -/* 800C5B48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800C5B4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800C5B50 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800C5B54 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 800C5B58 4B F8 26 25 */ bl cutEnd__16dEvent_manager_cFi -/* 800C5B5C 48 00 00 B0 */ b lbl_800C5C0C -lbl_800C5B60: -/* 800C5B60 83 DF 27 E0 */ lwz r30, 0x27e0(r31) -/* 800C5B64 3B A0 00 01 */ li r29, 1 -/* 800C5B68 7F C3 F3 78 */ mr r3, r30 -/* 800C5B6C 4B FA DC 79 */ bl LockonTruth__12dAttention_cFv -/* 800C5B70 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C5B74 40 82 00 14 */ bne lbl_800C5B88 -/* 800C5B78 80 1E 03 34 */ lwz r0, 0x334(r30) -/* 800C5B7C 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 800C5B80 40 82 00 08 */ bne lbl_800C5B88 -/* 800C5B84 3B A0 00 00 */ li r29, 0 -lbl_800C5B88: -/* 800C5B88 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 800C5B8C 40 82 00 10 */ bne lbl_800C5B9C -/* 800C5B90 80 1F 05 78 */ lwz r0, 0x578(r31) -/* 800C5B94 54 00 01 46 */ rlwinm r0, r0, 0, 5, 3 -/* 800C5B98 90 1F 05 78 */ stw r0, 0x578(r31) -lbl_800C5B9C: -/* 800C5B9C 7F E3 FB 78 */ mr r3, r31 -/* 800C5BA0 38 80 00 00 */ li r4, 0 -/* 800C5BA4 4B FF 45 2D */ bl checkNextAction__9daAlink_cFi -/* 800C5BA8 48 00 00 64 */ b lbl_800C5C0C -lbl_800C5BAC: -/* 800C5BAC C0 3D 00 10 */ lfs f1, 0x10(r29) -/* 800C5BB0 3C 60 80 39 */ lis r3, m__22daAlinkHIO_backJump_c0@ha /* 0x8038D82C@ha */ -/* 800C5BB4 38 63 D8 2C */ addi r3, r3, m__22daAlinkHIO_backJump_c0@l /* 0x8038D82C@l */ -/* 800C5BB8 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 800C5BBC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800C5BC0 40 81 00 4C */ ble lbl_800C5C0C -/* 800C5BC4 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800C5BC8 28 00 01 03 */ cmplwi r0, 0x103 -/* 800C5BCC 40 82 00 34 */ bne lbl_800C5C00 -/* 800C5BD0 80 1F 31 98 */ lwz r0, 0x3198(r31) -/* 800C5BD4 2C 00 00 02 */ cmpwi r0, 2 -/* 800C5BD8 40 82 00 14 */ bne lbl_800C5BEC -/* 800C5BDC 7F E3 FB 78 */ mr r3, r31 -/* 800C5BE0 48 00 B8 05 */ bl checkCutTurnInput__9daAlink_cCFv -/* 800C5BE4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C5BE8 41 82 00 18 */ beq lbl_800C5C00 -lbl_800C5BEC: -/* 800C5BEC 7F E3 FB 78 */ mr r3, r31 -/* 800C5BF0 38 80 00 01 */ li r4, 1 -/* 800C5BF4 80 BF 31 98 */ lwz r5, 0x3198(r31) -/* 800C5BF8 48 00 EB E5 */ bl procCutTurnInit__9daAlink_cFii -/* 800C5BFC 48 00 00 14 */ b lbl_800C5C10 -lbl_800C5C00: -/* 800C5C00 7F E3 FB 78 */ mr r3, r31 -/* 800C5C04 38 80 00 01 */ li r4, 1 -/* 800C5C08 4B FF 44 C9 */ bl checkNextAction__9daAlink_cFi -lbl_800C5C0C: -/* 800C5C0C 38 60 00 01 */ li r3, 1 -lbl_800C5C10: -/* 800C5C10 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C5C14 48 29 C6 15 */ bl _restgpr_29 -/* 800C5C18 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800C5C1C 7C 08 03 A6 */ mtlr r0 -/* 800C5C20 38 21 00 20 */ addi r1, r1, 0x20 -/* 800C5C24 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBackJump__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBackJump__9daAlink_cFv.s deleted file mode 100644 index 99be6b5d24c..00000000000 --- a/asm/d/a/d_a_alink/procBackJump__9daAlink_cFv.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_800C5964: -/* 800C5964 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C5968 7C 08 02 A6 */ mflr r0 -/* 800C596C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C5970 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C5974 7C 7F 1B 78 */ mr r31, r3 -/* 800C5978 A8 63 30 08 */ lha r3, 0x3008(r3) -/* 800C597C 2C 03 00 00 */ cmpwi r3, 0 -/* 800C5980 41 82 00 10 */ beq lbl_800C5990 -/* 800C5984 38 03 FF FF */ addi r0, r3, -1 -/* 800C5988 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 800C598C 48 00 00 10 */ b lbl_800C599C -lbl_800C5990: -/* 800C5990 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800C5994 54 00 04 E2 */ rlwinm r0, r0, 0, 0x13, 0x11 -/* 800C5998 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_800C599C: -/* 800C599C 7F E3 FB 78 */ mr r3, r31 -/* 800C59A0 48 00 BA 45 */ bl checkCutTurnInput__9daAlink_cCFv -/* 800C59A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C59A8 41 82 00 1C */ beq lbl_800C59C4 -/* 800C59AC A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800C59B0 28 00 01 03 */ cmplwi r0, 0x103 -/* 800C59B4 40 82 00 10 */ bne lbl_800C59C4 -/* 800C59B8 7F E3 FB 78 */ mr r3, r31 -/* 800C59BC 48 00 BA 69 */ bl getCutTurnDirection__9daAlink_cCFv -/* 800C59C0 90 7F 31 98 */ stw r3, 0x3198(r31) -lbl_800C59C4: -/* 800C59C4 7F E3 FB 78 */ mr r3, r31 -/* 800C59C8 4B FF FD 39 */ bl backJumpSpeedDec__9daAlink_cFv -/* 800C59CC 80 1F 19 9C */ lwz r0, 0x199c(r31) -/* 800C59D0 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800C59D4 41 82 00 24 */ beq lbl_800C59F8 -/* 800C59D8 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800C59DC 48 09 8A F1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800C59E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C59E4 41 82 00 14 */ beq lbl_800C59F8 -/* 800C59E8 7F E3 FB 78 */ mr r3, r31 -/* 800C59EC 80 9F 31 98 */ lwz r4, 0x3198(r31) -/* 800C59F0 48 00 00 65 */ bl procBackJumpLandInit__9daAlink_cFi -/* 800C59F4 48 00 00 40 */ b lbl_800C5A34 -lbl_800C59F8: -/* 800C59F8 80 1F 06 14 */ lwz r0, 0x614(r31) -/* 800C59FC 28 00 00 10 */ cmplwi r0, 0x10 -/* 800C5A00 41 82 00 34 */ beq lbl_800C5A34 -/* 800C5A04 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 800C5A08 C0 3F 34 FC */ lfs f1, 0x34fc(r31) -/* 800C5A0C 3C 60 80 39 */ lis r3, m__22daAlinkHIO_backJump_c0@ha /* 0x8038D82C@ha */ -/* 800C5A10 38 A3 D8 2C */ addi r5, r3, m__22daAlinkHIO_backJump_c0@l /* 0x8038D82C@l */ -/* 800C5A14 C0 05 00 30 */ lfs f0, 0x30(r5) -/* 800C5A18 EC 01 00 28 */ fsubs f0, f1, f0 -/* 800C5A1C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 800C5A20 40 80 00 14 */ bge lbl_800C5A34 -/* 800C5A24 7F E3 FB 78 */ mr r3, r31 -/* 800C5A28 38 80 00 02 */ li r4, 2 -/* 800C5A2C C0 25 00 34 */ lfs f1, 0x34(r5) -/* 800C5A30 48 00 10 19 */ bl procFallInit__9daAlink_cFif -lbl_800C5A34: -/* 800C5A34 7F E3 FB 78 */ mr r3, r31 -/* 800C5A38 4B FF 3F 15 */ bl checkItemChangeFromButton__9daAlink_cFv -/* 800C5A3C 38 60 00 01 */ li r3, 1 -/* 800C5A40 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C5A44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C5A48 7C 08 03 A6 */ mtlr r0 -/* 800C5A4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C5A50 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBoardCut__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBoardCut__9daAlink_cFv.s deleted file mode 100644 index 0ae589c8166..00000000000 --- a/asm/d/a/d_a_alink/procBoardCut__9daAlink_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8010755C: -/* 8010755C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80107560 7C 08 02 A6 */ mflr r0 -/* 80107564 90 01 00 14 */ stw r0, 0x14(r1) -/* 80107568 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8010756C 7C 7F 1B 78 */ mr r31, r3 -/* 80107570 38 80 00 01 */ li r4, 1 -/* 80107574 4B FF E5 E5 */ bl boardCommon__9daAlink_cFi -/* 80107578 2C 03 00 00 */ cmpwi r3, 0 -/* 8010757C 41 82 00 0C */ beq lbl_80107588 -/* 80107580 38 60 00 01 */ li r3, 1 -/* 80107584 48 00 00 3C */ b lbl_801075C0 -lbl_80107588: -/* 80107588 7F E3 FB 78 */ mr r3, r31 -/* 8010758C 4B FC B0 F9 */ bl checkCutTurnCharge__9daAlink_cFv -/* 80107590 7F E3 FB 78 */ mr r3, r31 -/* 80107594 4B FF EF F9 */ bl checkNextActionBoard__9daAlink_cFv -/* 80107598 2C 03 00 00 */ cmpwi r3, 0 -/* 8010759C 40 82 00 20 */ bne lbl_801075BC -/* 801075A0 7F E3 FB 78 */ mr r3, r31 -/* 801075A4 4B FB 1C B1 */ bl checkNoUpperAnime__9daAlink_cCFv -/* 801075A8 2C 03 00 00 */ cmpwi r3, 0 -/* 801075AC 41 82 00 10 */ beq lbl_801075BC -/* 801075B0 7F E3 FB 78 */ mr r3, r31 -/* 801075B4 38 80 00 00 */ li r4, 0 -/* 801075B8 4B FF F4 81 */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c -lbl_801075BC: -/* 801075BC 38 60 00 01 */ li r3, 1 -lbl_801075C0: -/* 801075C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801075C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801075C8 7C 08 03 A6 */ mtlr r0 -/* 801075CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801075D0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBoardJump__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBoardJump__9daAlink_cFv.s deleted file mode 100644 index f7d89642a2c..00000000000 --- a/asm/d/a/d_a_alink/procBoardJump__9daAlink_cFv.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_80107300: -/* 80107300 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80107304 7C 08 02 A6 */ mflr r0 -/* 80107308 90 01 00 14 */ stw r0, 0x14(r1) -/* 8010730C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80107310 7C 7F 1B 78 */ mr r31, r3 -/* 80107314 38 80 00 01 */ li r4, 1 -/* 80107318 4B FF E8 41 */ bl boardCommon__9daAlink_cFi -/* 8010731C 2C 03 00 00 */ cmpwi r3, 0 -/* 80107320 41 82 00 0C */ beq lbl_8010732C -/* 80107324 38 60 00 01 */ li r3, 1 -/* 80107328 48 00 00 94 */ b lbl_801073BC -lbl_8010732C: -/* 8010732C 7F E3 FB 78 */ mr r3, r31 -/* 80107330 4B FF F2 5D */ bl checkNextActionBoard__9daAlink_cFv -/* 80107334 2C 03 00 00 */ cmpwi r3, 0 -/* 80107338 40 82 00 80 */ bne lbl_801073B8 -/* 8010733C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 80107340 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80107344 40 82 00 1C */ bne lbl_80107360 -/* 80107348 7F E3 FB 78 */ mr r3, r31 -/* 8010734C 4B FF F3 A1 */ bl setBoardLandAnime__9daAlink_cFv -/* 80107350 7F E3 FB 78 */ mr r3, r31 -/* 80107354 38 80 00 00 */ li r4, 0 -/* 80107358 4B FF F6 E1 */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c -/* 8010735C 48 00 00 5C */ b lbl_801073B8 -lbl_80107360: -/* 80107360 A8 1F 30 12 */ lha r0, 0x3012(r31) -/* 80107364 2C 00 00 00 */ cmpwi r0, 0 -/* 80107368 41 82 00 50 */ beq lbl_801073B8 -/* 8010736C A8 1F 30 10 */ lha r0, 0x3010(r31) -/* 80107370 2C 00 00 00 */ cmpwi r0, 0 -/* 80107374 40 82 00 44 */ bne lbl_801073B8 -/* 80107378 80 7F 20 60 */ lwz r3, 0x2060(r31) -/* 8010737C C0 23 00 0C */ lfs f1, 0xc(r3) -/* 80107380 C0 02 93 88 */ lfs f0, lit_8782(r2) -/* 80107384 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80107388 40 80 00 30 */ bge lbl_801073B8 -/* 8010738C 7F E3 FB 78 */ mr r3, r31 -/* 80107390 38 80 00 F7 */ li r4, 0xf7 -/* 80107394 3C A0 80 39 */ lis r5, m__19daAlinkHIO_board_c0@ha /* 0x8038E870@ha */ -/* 80107398 38 A5 E8 70 */ addi r5, r5, m__19daAlinkHIO_board_c0@l /* 0x8038E870@l */ -/* 8010739C C0 25 00 18 */ lfs f1, 0x18(r5) -/* 801073A0 C0 45 00 1C */ lfs f2, 0x1c(r5) -/* 801073A4 A8 A5 00 14 */ lha r5, 0x14(r5) -/* 801073A8 C0 62 92 BC */ lfs f3, lit_6041(r2) -/* 801073AC 4B FA 5C 61 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -/* 801073B0 38 00 00 01 */ li r0, 1 -/* 801073B4 B0 1F 30 10 */ sth r0, 0x3010(r31) -lbl_801073B8: -/* 801073B8 38 60 00 01 */ li r3, 1 -lbl_801073BC: -/* 801073BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801073C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801073C4 7C 08 03 A6 */ mtlr r0 -/* 801073C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801073CC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBoardRide__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBoardRide__9daAlink_cFv.s deleted file mode 100644 index ba6f297aef8..00000000000 --- a/asm/d/a/d_a_alink/procBoardRide__9daAlink_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_801069D0: -/* 801069D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801069D4 7C 08 02 A6 */ mflr r0 -/* 801069D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801069DC 38 00 00 0F */ li r0, 0xf -/* 801069E0 98 03 2F 99 */ stb r0, 0x2f99(r3) -/* 801069E4 80 03 19 9C */ lwz r0, 0x199c(r3) -/* 801069E8 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 801069EC 41 82 00 38 */ beq lbl_80106A24 -/* 801069F0 80 83 28 10 */ lwz r4, 0x2810(r3) -/* 801069F4 28 04 00 00 */ cmplwi r4, 0 -/* 801069F8 41 82 00 24 */ beq lbl_80106A1C -/* 801069FC A8 84 04 E6 */ lha r4, 0x4e6(r4) -/* 80106A00 38 04 C0 00 */ addi r0, r4, -16384 -/* 80106A04 B0 03 04 E6 */ sth r0, 0x4e6(r3) -/* 80106A08 A8 03 04 E6 */ lha r0, 0x4e6(r3) -/* 80106A0C B0 03 04 DE */ sth r0, 0x4de(r3) -/* 80106A10 80 83 28 10 */ lwz r4, 0x2810(r3) -/* 80106A14 48 00 00 25 */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c -/* 80106A18 48 00 00 0C */ b lbl_80106A24 -lbl_80106A1C: -/* 80106A1C 38 80 00 01 */ li r4, 1 -/* 80106A20 4B FB 36 B1 */ bl checkNextAction__9daAlink_cFi -lbl_80106A24: -/* 80106A24 38 60 00 01 */ li r3, 1 -/* 80106A28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80106A2C 7C 08 03 A6 */ mtlr r0 -/* 80106A30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80106A34 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBoardRowInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBoardRowInit__9daAlink_cFv.s deleted file mode 100644 index d0119f414fc..00000000000 --- a/asm/d/a/d_a_alink/procBoardRowInit__9daAlink_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80106E88: -/* 80106E88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80106E8C 7C 08 02 A6 */ mflr r0 -/* 80106E90 90 01 00 14 */ stw r0, 0x14(r1) -/* 80106E94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80106E98 7C 7F 1B 78 */ mr r31, r3 -/* 80106E9C 38 80 00 A8 */ li r4, 0xa8 -/* 80106EA0 4B FB B0 CD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80106EA4 7F E3 FB 78 */ mr r3, r31 -/* 80106EA8 4B FF F8 11 */ bl getBoardRowAnmSpeed__9daAlink_cFv -/* 80106EAC 7F E3 FB 78 */ mr r3, r31 -/* 80106EB0 38 80 00 F9 */ li r4, 0xf9 -/* 80106EB4 3C A0 80 39 */ lis r5, m__19daAlinkHIO_board_c0@ha /* 0x8038E870@ha */ -/* 80106EB8 38 A5 E8 70 */ addi r5, r5, m__19daAlinkHIO_board_c0@l /* 0x8038E870@l */ -/* 80106EBC C0 45 00 84 */ lfs f2, 0x84(r5) -/* 80106EC0 4B FA 61 21 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -/* 80106EC4 80 1F 05 84 */ lwz r0, 0x584(r31) -/* 80106EC8 60 00 00 40 */ ori r0, r0, 0x40 -/* 80106ECC 90 1F 05 84 */ stw r0, 0x584(r31) -/* 80106ED0 38 00 00 04 */ li r0, 4 -/* 80106ED4 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 80106ED8 38 00 00 01 */ li r0, 1 -/* 80106EDC B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 80106EE0 38 00 00 00 */ li r0, 0 -/* 80106EE4 B0 1F 30 12 */ sth r0, 0x3012(r31) -/* 80106EE8 38 60 00 01 */ li r3, 1 -/* 80106EEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80106EF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80106EF4 7C 08 03 A6 */ mtlr r0 -/* 80106EF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80106EFC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBoardSubjectivityInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBoardSubjectivityInit__9daAlink_cFv.s deleted file mode 100644 index c8ff9d387cb..00000000000 --- a/asm/d/a/d_a_alink/procBoardSubjectivityInit__9daAlink_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_801073D0: -/* 801073D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801073D4 7C 08 02 A6 */ mflr r0 -/* 801073D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801073DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801073E0 7C 7F 1B 78 */ mr r31, r3 -/* 801073E4 38 80 00 AB */ li r4, 0xab -/* 801073E8 4B FF F2 69 */ bl commonProcBoardInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 801073EC 7F E3 FB 78 */ mr r3, r31 -/* 801073F0 4B FC 77 05 */ bl setSubjectMode__9daAlink_cFv -/* 801073F4 7F E3 FB 78 */ mr r3, r31 -/* 801073F8 38 80 00 00 */ li r4, 0 -/* 801073FC 4B FF F1 39 */ bl setCommonBoardAnime__9daAlink_cFi -/* 80107400 38 60 00 01 */ li r3, 1 -/* 80107404 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80107408 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8010740C 7C 08 03 A6 */ mtlr r0 -/* 80107410 38 21 00 10 */ addi r1, r1, 0x10 -/* 80107414 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBoardSubjectivity__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBoardSubjectivity__9daAlink_cFv.s deleted file mode 100644 index ab7e9d74f7d..00000000000 --- a/asm/d/a/d_a_alink/procBoardSubjectivity__9daAlink_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80107418: -/* 80107418 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8010741C 7C 08 02 A6 */ mflr r0 -/* 80107420 90 01 00 24 */ stw r0, 0x24(r1) -/* 80107424 39 61 00 20 */ addi r11, r1, 0x20 -/* 80107428 48 25 AD B5 */ bl _savegpr_29 -/* 8010742C 7C 7D 1B 78 */ mr r29, r3 -/* 80107430 80 03 05 80 */ lwz r0, 0x580(r3) -/* 80107434 64 00 04 00 */ oris r0, r0, 0x400 -/* 80107438 90 03 05 80 */ stw r0, 0x580(r3) -/* 8010743C AB E3 04 E6 */ lha r31, 0x4e6(r3) -/* 80107440 AB C3 04 DE */ lha r30, 0x4de(r3) -/* 80107444 38 80 00 00 */ li r4, 0 -/* 80107448 4B FF E7 11 */ bl boardCommon__9daAlink_cFi -/* 8010744C 2C 03 00 00 */ cmpwi r3, 0 -/* 80107450 41 82 00 0C */ beq lbl_8010745C -/* 80107454 38 60 00 01 */ li r3, 1 -/* 80107458 48 00 00 3C */ b lbl_80107494 -lbl_8010745C: -/* 8010745C B3 FD 04 E6 */ sth r31, 0x4e6(r29) -/* 80107460 7F A3 EB 78 */ mr r3, r29 -/* 80107464 38 80 00 01 */ li r4, 1 -/* 80107468 4B FC 77 71 */ bl checkSubjectEnd__9daAlink_cFi -/* 8010746C 2C 03 00 00 */ cmpwi r3, 0 -/* 80107470 41 82 00 14 */ beq lbl_80107484 -/* 80107474 7F A3 EB 78 */ mr r3, r29 -/* 80107478 38 80 00 00 */ li r4, 0 -/* 8010747C 4B FF F5 BD */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c -/* 80107480 48 00 00 10 */ b lbl_80107490 -lbl_80107484: -/* 80107484 7F A3 EB 78 */ mr r3, r29 -/* 80107488 7F C4 F3 78 */ mr r4, r30 -/* 8010748C 4B FE 7A A5 */ bl setRideSubjectAngle__9daAlink_cFs -lbl_80107490: -/* 80107490 38 60 00 01 */ li r3, 1 -lbl_80107494: -/* 80107494 39 61 00 20 */ addi r11, r1, 0x20 -/* 80107498 48 25 AD 91 */ bl _restgpr_29 -/* 8010749C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801074A0 7C 08 03 A6 */ mtlr r0 -/* 801074A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801074A8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBoardTurnInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBoardTurnInit__9daAlink_cFv.s deleted file mode 100644 index 1b440a03965..00000000000 --- a/asm/d/a/d_a_alink/procBoardTurnInit__9daAlink_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80107060: -/* 80107060 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80107064 7C 08 02 A6 */ mflr r0 -/* 80107068 90 01 00 14 */ stw r0, 0x14(r1) -/* 8010706C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80107070 7C 7F 1B 78 */ mr r31, r3 -/* 80107074 38 80 00 A9 */ li r4, 0xa9 -/* 80107078 4B FB AE F5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8010707C 7F E3 FB 78 */ mr r3, r31 -/* 80107080 38 80 00 F7 */ li r4, 0xf7 -/* 80107084 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 80107088 C0 42 92 B8 */ lfs f2, lit_6040(r2) -/* 8010708C 3C A0 80 39 */ lis r5, m__19daAlinkHIO_board_c0@ha /* 0x8038E870@ha */ -/* 80107090 38 A5 E8 70 */ addi r5, r5, m__19daAlinkHIO_board_c0@l /* 0x8038E870@l */ -/* 80107094 A8 A5 00 14 */ lha r5, 0x14(r5) -/* 80107098 C0 62 92 C4 */ lfs f3, lit_6109(r2) -/* 8010709C 4B FA 5F 71 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -/* 801070A0 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 801070A4 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 801070A8 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 801070AC 3C 63 00 01 */ addis r3, r3, 1 -/* 801070B0 38 03 80 00 */ addi r0, r3, -32768 -/* 801070B4 B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 801070B8 38 00 00 00 */ li r0, 0 -/* 801070BC B0 1F 30 12 */ sth r0, 0x3012(r31) -/* 801070C0 B0 1F 30 0A */ sth r0, 0x300a(r31) -/* 801070C4 38 60 00 01 */ li r3, 1 -/* 801070C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801070CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801070D0 7C 08 03 A6 */ mtlr r0 -/* 801070D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801070D8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBoomerangCatchInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBoomerangCatchInit__9daAlink_cFv.s deleted file mode 100644 index 303544ca0a0..00000000000 --- a/asm/d/a/d_a_alink/procBoomerangCatchInit__9daAlink_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_800E11D8: -/* 800E11D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E11DC 7C 08 02 A6 */ mflr r0 -/* 800E11E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E11E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E11E8 7C 7F 1B 78 */ mr r31, r3 -/* 800E11EC 38 80 00 62 */ li r4, 0x62 -/* 800E11F0 4B FE 1B B5 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800E11F4 2C 03 00 00 */ cmpwi r3, 0 -/* 800E11F8 40 82 00 0C */ bne lbl_800E1204 -/* 800E11FC 38 60 00 00 */ li r3, 0 -/* 800E1200 48 00 00 34 */ b lbl_800E1234 -lbl_800E1204: -/* 800E1204 7F E3 FB 78 */ mr r3, r31 -/* 800E1208 38 80 00 BB */ li r4, 0xbb -/* 800E120C 3C A0 80 39 */ lis r5, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E1210 38 A5 E6 C8 */ addi r5, r5, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E1214 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800E1218 4B FC BE DD */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800E121C 7F E3 FB 78 */ mr r3, r31 -/* 800E1220 4B FF F4 11 */ bl setBoomerangCatchAnime__9daAlink_cFv -/* 800E1224 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800E1228 54 00 06 F2 */ rlwinm r0, r0, 0, 0x1b, 0x19 -/* 800E122C 90 1F 05 70 */ stw r0, 0x570(r31) -/* 800E1230 38 60 00 01 */ li r3, 1 -lbl_800E1234: -/* 800E1234 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E1238 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E123C 7C 08 03 A6 */ mtlr r0 -/* 800E1240 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E1244 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBoomerangCatch__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBoomerangCatch__9daAlink_cFv.s deleted file mode 100644 index a98b49d78a3..00000000000 --- a/asm/d/a/d_a_alink/procBoomerangCatch__9daAlink_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_800E1248: -/* 800E1248 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E124C 7C 08 02 A6 */ mflr r0 -/* 800E1250 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E1254 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E1258 7C 7F 1B 78 */ mr r31, r3 -/* 800E125C 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800E1260 80 1F 05 88 */ lwz r0, 0x588(r31) -/* 800E1264 64 00 08 00 */ oris r0, r0, 0x800 -/* 800E1268 90 1F 05 88 */ stw r0, 0x588(r31) -/* 800E126C C0 3F 1F E0 */ lfs f1, 0x1fe0(r31) -/* 800E1270 3C 80 80 39 */ lis r4, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E1274 38 84 E6 C8 */ addi r4, r4, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E1278 C0 04 00 24 */ lfs f0, 0x24(r4) -/* 800E127C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800E1280 40 81 00 10 */ ble lbl_800E1290 -/* 800E1284 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800E1288 60 00 00 04 */ ori r0, r0, 4 -/* 800E128C 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_800E1290: -/* 800E1290 48 07 D2 3D */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800E1294 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E1298 41 82 00 24 */ beq lbl_800E12BC -/* 800E129C 7F E3 FB 78 */ mr r3, r31 -/* 800E12A0 38 80 00 02 */ li r4, 2 -/* 800E12A4 C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800E12A8 4B FC C4 7D */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf -/* 800E12AC 7F E3 FB 78 */ mr r3, r31 -/* 800E12B0 38 80 00 00 */ li r4, 0 -/* 800E12B4 4B FD 8E 1D */ bl checkNextAction__9daAlink_cFi -/* 800E12B8 48 00 00 10 */ b lbl_800E12C8 -lbl_800E12BC: -/* 800E12BC 7F E3 FB 78 */ mr r3, r31 -/* 800E12C0 38 80 00 01 */ li r4, 1 -/* 800E12C4 4B FD 8E 0D */ bl checkNextAction__9daAlink_cFi -lbl_800E12C8: -/* 800E12C8 38 60 00 01 */ li r3, 1 -/* 800E12CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E12D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E12D4 7C 08 03 A6 */ mtlr r0 -/* 800E12D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E12DC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBoomerangMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBoomerangMoveInit__9daAlink_cFv.s deleted file mode 100644 index 1c6d4c499c6..00000000000 --- a/asm/d/a/d_a_alink/procBoomerangMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_800E1060: -/* 800E1060 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E1064 7C 08 02 A6 */ mflr r0 -/* 800E1068 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E106C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E1070 7C 7F 1B 78 */ mr r31, r3 -/* 800E1074 38 80 00 61 */ li r4, 0x61 -/* 800E1078 4B FE 1D 2D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800E107C 2C 03 00 00 */ cmpwi r3, 0 -/* 800E1080 40 82 00 0C */ bne lbl_800E108C -/* 800E1084 38 60 00 00 */ li r3, 0 -/* 800E1088 48 00 00 58 */ b lbl_800E10E0 -lbl_800E108C: -/* 800E108C 7F E3 FB 78 */ mr r3, r31 -/* 800E1090 4B FD 28 75 */ bl checkZeroSpeedF__9daAlink_cCFv -/* 800E1094 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E1098 41 82 00 10 */ beq lbl_800E10A8 -/* 800E109C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800E10A0 60 00 00 01 */ ori r0, r0, 1 -/* 800E10A4 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_800E10A8: -/* 800E10A8 7F E3 FB 78 */ mr r3, r31 -/* 800E10AC 38 80 00 00 */ li r4, 0 -/* 800E10B0 4B FF F3 21 */ bl initBoomerangUpperAnimeSpeed__9daAlink_cFi -/* 800E10B4 7F E3 FB 78 */ mr r3, r31 -/* 800E10B8 3C 80 80 39 */ lis r4, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E10BC 38 84 E6 C8 */ addi r4, r4, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E10C0 C0 24 00 30 */ lfs f1, 0x30(r4) -/* 800E10C4 4B FC D9 AD */ bl setBlendAtnMoveAnime__9daAlink_cFf -/* 800E10C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800E10CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800E10D0 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 800E10D4 64 00 00 08 */ oris r0, r0, 8 -/* 800E10D8 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 800E10DC 38 60 00 01 */ li r3, 1 -lbl_800E10E0: -/* 800E10E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E10E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E10E8 7C 08 03 A6 */ mtlr r0 -/* 800E10EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E10F0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBoomerangMove__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBoomerangMove__9daAlink_cFv.s deleted file mode 100644 index f48baee7da7..00000000000 --- a/asm/d/a/d_a_alink/procBoomerangMove__9daAlink_cFv.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_800E10F4: -/* 800E10F4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800E10F8 7C 08 02 A6 */ mflr r0 -/* 800E10FC 90 01 00 24 */ stw r0, 0x24(r1) -/* 800E1100 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 800E1104 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 800E1108 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E110C 7C 7F 1B 78 */ mr r31, r3 -/* 800E1110 4B FD 61 D5 */ bl checkItemActorPointer__9daAlink_cFv -/* 800E1114 2C 03 00 00 */ cmpwi r3, 0 -/* 800E1118 40 82 00 0C */ bne lbl_800E1124 -/* 800E111C 38 60 00 01 */ li r3, 1 -/* 800E1120 48 00 00 9C */ b lbl_800E11BC -lbl_800E1124: -/* 800E1124 7F E3 FB 78 */ mr r3, r31 -/* 800E1128 38 80 00 00 */ li r4, 0 -/* 800E112C 4B FD 8F A5 */ bl checkNextAction__9daAlink_cFi -/* 800E1130 2C 03 00 00 */ cmpwi r3, 0 -/* 800E1134 40 82 00 84 */ bne lbl_800E11B8 -/* 800E1138 C3 E2 92 BC */ lfs f31, lit_6041(r2) -/* 800E113C 7F E3 FB 78 */ mr r3, r31 -/* 800E1140 4B FD 27 C5 */ bl checkZeroSpeedF__9daAlink_cCFv -/* 800E1144 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E1148 41 82 00 34 */ beq lbl_800E117C -/* 800E114C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800E1150 60 00 00 01 */ ori r0, r0, 1 -/* 800E1154 90 1F 31 A0 */ stw r0, 0x31a0(r31) -/* 800E1158 88 1F 2F 98 */ lbz r0, 0x2f98(r31) -/* 800E115C 28 00 00 03 */ cmplwi r0, 3 -/* 800E1160 41 82 00 40 */ beq lbl_800E11A0 -/* 800E1164 38 00 00 03 */ li r0, 3 -/* 800E1168 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 800E116C 3C 60 80 39 */ lis r3, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 800E1170 38 63 D6 64 */ addi r3, r3, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 800E1174 C3 E3 00 18 */ lfs f31, 0x18(r3) -/* 800E1178 48 00 00 28 */ b lbl_800E11A0 -lbl_800E117C: -/* 800E117C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800E1180 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 800E1184 90 1F 31 A0 */ stw r0, 0x31a0(r31) -/* 800E1188 80 7F 28 28 */ lwz r3, 0x2828(r31) -/* 800E118C 28 03 00 00 */ cmplwi r3, 0 -/* 800E1190 41 82 00 10 */ beq lbl_800E11A0 -/* 800E1194 80 03 09 64 */ lwz r0, 0x964(r3) -/* 800E1198 60 00 08 00 */ ori r0, r0, 0x800 -/* 800E119C 90 03 09 64 */ stw r0, 0x964(r3) -lbl_800E11A0: -/* 800E11A0 7F E3 FB 78 */ mr r3, r31 -/* 800E11A4 FC 20 F8 90 */ fmr f1, f31 -/* 800E11A8 4B FC D8 C9 */ bl setBlendAtnMoveAnime__9daAlink_cFf -/* 800E11AC 7F E3 FB 78 */ mr r3, r31 -/* 800E11B0 38 80 00 00 */ li r4, 0 -/* 800E11B4 4B FD A0 FD */ bl setBodyAngleXReadyAnime__9daAlink_cFi -lbl_800E11B8: -/* 800E11B8 38 60 00 01 */ li r3, 1 -lbl_800E11BC: -/* 800E11BC E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 800E11C0 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 800E11C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E11C8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800E11CC 7C 08 03 A6 */ mtlr r0 -/* 800E11D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E11D4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBoomerangSubjectInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBoomerangSubjectInit__9daAlink_cFv.s deleted file mode 100644 index 24d3148b5f4..00000000000 --- a/asm/d/a/d_a_alink/procBoomerangSubjectInit__9daAlink_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_800E0F10: -/* 800E0F10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E0F14 7C 08 02 A6 */ mflr r0 -/* 800E0F18 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E0F1C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E0F20 7C 7F 1B 78 */ mr r31, r3 -/* 800E0F24 38 80 00 60 */ li r4, 0x60 -/* 800E0F28 4B FE 1E 7D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800E0F2C 2C 03 00 00 */ cmpwi r3, 0 -/* 800E0F30 40 82 00 0C */ bne lbl_800E0F3C -/* 800E0F34 38 60 00 00 */ li r3, 0 -/* 800E0F38 48 00 00 54 */ b lbl_800E0F8C -lbl_800E0F3C: -/* 800E0F3C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800E0F40 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800E0F44 7F E3 FB 78 */ mr r3, r31 -/* 800E0F48 38 80 00 01 */ li r4, 1 -/* 800E0F4C 4B FF F4 85 */ bl initBoomerangUpperAnimeSpeed__9daAlink_cFi -/* 800E0F50 7F E3 FB 78 */ mr r3, r31 -/* 800E0F54 38 80 00 11 */ li r4, 0x11 -/* 800E0F58 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800E0F5C 3C A0 80 39 */ lis r5, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E0F60 38 A5 E6 C8 */ addi r5, r5, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E0F64 C0 45 00 30 */ lfs f2, 0x30(r5) -/* 800E0F68 4B FC C0 79 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -/* 800E0F6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800E0F70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800E0F74 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 800E0F78 64 00 00 08 */ oris r0, r0, 8 -/* 800E0F7C 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 800E0F80 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800E0F84 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800E0F88 38 60 00 01 */ li r3, 1 -lbl_800E0F8C: -/* 800E0F8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E0F90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E0F94 7C 08 03 A6 */ mtlr r0 -/* 800E0F98 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E0F9C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBoomerangSubject__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBoomerangSubject__9daAlink_cFv.s deleted file mode 100644 index b3239e054a6..00000000000 --- a/asm/d/a/d_a_alink/procBoomerangSubject__9daAlink_cFv.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_800E0FA0: -/* 800E0FA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E0FA4 7C 08 02 A6 */ mflr r0 -/* 800E0FA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E0FAC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E0FB0 7C 7F 1B 78 */ mr r31, r3 -/* 800E0FB4 4B FD 63 31 */ bl checkItemActorPointer__9daAlink_cFv -/* 800E0FB8 2C 03 00 00 */ cmpwi r3, 0 -/* 800E0FBC 40 82 00 0C */ bne lbl_800E0FC8 -/* 800E0FC0 38 60 00 01 */ li r3, 1 -/* 800E0FC4 48 00 00 88 */ b lbl_800E104C -lbl_800E0FC8: -/* 800E0FC8 38 60 00 00 */ li r3, 0 -/* 800E0FCC A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800E0FD0 28 00 00 40 */ cmplwi r0, 0x40 -/* 800E0FD4 41 82 00 0C */ beq lbl_800E0FE0 -/* 800E0FD8 28 00 01 02 */ cmplwi r0, 0x102 -/* 800E0FDC 40 82 00 14 */ bne lbl_800E0FF0 -lbl_800E0FE0: -/* 800E0FE0 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 800E0FE4 28 00 00 54 */ cmplwi r0, 0x54 -/* 800E0FE8 40 82 00 08 */ bne lbl_800E0FF0 -/* 800E0FEC 38 60 00 01 */ li r3, 1 -lbl_800E0FF0: -/* 800E0FF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E0FF4 41 82 00 10 */ beq lbl_800E1004 -/* 800E0FF8 7F E3 FB 78 */ mr r3, r31 -/* 800E0FFC 38 80 00 12 */ li r4, 0x12 -/* 800E1000 4B FD 22 51 */ bl setDoStatus__9daAlink_cFUc -lbl_800E1004: -/* 800E1004 7F E3 FB 78 */ mr r3, r31 -/* 800E1008 38 80 00 00 */ li r4, 0 -/* 800E100C 4B FD 27 29 */ bl setShapeAngleToAtnActor__9daAlink_cFi -/* 800E1010 7F E3 FB 78 */ mr r3, r31 -/* 800E1014 38 80 00 00 */ li r4, 0 -/* 800E1018 4B FD 90 B9 */ bl checkNextAction__9daAlink_cFi -/* 800E101C 2C 03 00 00 */ cmpwi r3, 0 -/* 800E1020 40 82 00 20 */ bne lbl_800E1040 -/* 800E1024 7F E3 FB 78 */ mr r3, r31 -/* 800E1028 4B FE D8 79 */ bl setBodyAngleToCamera__9daAlink_cFv -/* 800E102C 2C 03 00 00 */ cmpwi r3, 0 -/* 800E1030 41 82 00 18 */ beq lbl_800E1048 -/* 800E1034 7F E3 FB 78 */ mr r3, r31 -/* 800E1038 4B FF FE 2D */ bl setBoomerangSight__9daAlink_cFv -/* 800E103C 48 00 00 0C */ b lbl_800E1048 -lbl_800E1040: -/* 800E1040 38 00 00 00 */ li r0, 0 -/* 800E1044 98 1F 20 68 */ stb r0, 0x2068(r31) -lbl_800E1048: -/* 800E1048 38 60 00 01 */ li r3, 1 -lbl_800E104C: -/* 800E104C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E1050 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E1054 7C 08 03 A6 */ mtlr r0 -/* 800E1058 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E105C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBootsEquipInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBootsEquipInit__9daAlink_cFv.s deleted file mode 100644 index 30993629151..00000000000 --- a/asm/d/a/d_a_alink/procBootsEquipInit__9daAlink_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_800E3048: -/* 800E3048 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E304C 7C 08 02 A6 */ mflr r0 -/* 800E3050 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E3054 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E3058 7C 7F 1B 78 */ mr r31, r3 -/* 800E305C 38 80 00 CD */ li r4, 0xcd -/* 800E3060 4B FD EF 0D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800E3064 7F E3 FB 78 */ mr r3, r31 -/* 800E3068 38 80 01 3E */ li r4, 0x13e -/* 800E306C 3C A0 80 39 */ lis r5, m__24daAlinkHIO_magneBoots_c0@ha /* 0x8038E7F4@ha */ -/* 800E3070 38 A5 E7 F4 */ addi r5, r5, m__24daAlinkHIO_magneBoots_c0@l /* 0x8038E7F4@l */ -/* 800E3074 4B FC A0 81 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800E3078 7F E3 FB 78 */ mr r3, r31 -/* 800E307C 4B FD 7F 05 */ bl checkUpperReadyThrowAnime__9daAlink_cCFv -/* 800E3080 2C 03 00 00 */ cmpwi r3, 0 -/* 800E3084 41 82 00 30 */ beq lbl_800E30B4 -/* 800E3088 7F E3 FB 78 */ mr r3, r31 -/* 800E308C 38 80 00 02 */ li r4, 2 -/* 800E3090 C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800E3094 4B FC A6 91 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf -/* 800E3098 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800E309C 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800E30A0 80 85 5F 18 */ lwz r4, 0x5f18(r5) -/* 800E30A4 3C 60 00 40 */ lis r3, 0x0040 /* 0x00400030@ha */ -/* 800E30A8 38 03 00 30 */ addi r0, r3, 0x0030 /* 0x00400030@l */ -/* 800E30AC 7C 80 00 38 */ and r0, r4, r0 -/* 800E30B0 90 05 5F 18 */ stw r0, 0x5f18(r5) -lbl_800E30B4: -/* 800E30B4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800E30B8 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800E30BC C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800E30C0 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800E30C4 38 60 00 01 */ li r3, 1 -/* 800E30C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E30CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E30D0 7C 08 03 A6 */ mtlr r0 -/* 800E30D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E30D8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBottleDrinkInit__9daAlink_cFUs.s b/asm/d/a/d_a_alink/procBottleDrinkInit__9daAlink_cFUs.s deleted file mode 100644 index 8d1764b8dba..00000000000 --- a/asm/d/a/d_a_alink/procBottleDrinkInit__9daAlink_cFUs.s +++ /dev/null @@ -1,90 +0,0 @@ -lbl_8010F54C: -/* 8010F54C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8010F550 7C 08 02 A6 */ mflr r0 -/* 8010F554 90 01 00 14 */ stw r0, 0x14(r1) -/* 8010F558 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8010F55C 93 C1 00 08 */ stw r30, 8(r1) -/* 8010F560 7C 7F 1B 78 */ mr r31, r3 -/* 8010F564 7C 9E 23 78 */ mr r30, r4 -/* 8010F568 80 03 06 14 */ lwz r0, 0x614(r3) -/* 8010F56C 28 00 00 2A */ cmplwi r0, 0x2a -/* 8010F570 40 82 00 18 */ bne lbl_8010F588 -/* 8010F574 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) -/* 8010F578 28 00 00 B3 */ cmplwi r0, 0xb3 -/* 8010F57C 40 82 00 44 */ bne lbl_8010F5C0 -/* 8010F580 38 60 00 01 */ li r3, 1 -/* 8010F584 48 00 00 FC */ b lbl_8010F680 -lbl_8010F588: -/* 8010F588 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8010F58C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8010F590 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 8010F594 7F E4 FB 78 */ mr r4, r31 -/* 8010F598 38 A0 00 00 */ li r5, 0 -/* 8010F59C 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8010F5A0 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8010F5A4 4B F3 3B C9 */ bl compulsory__14dEvt_control_cFPvPCcUs -/* 8010F5A8 2C 03 00 00 */ cmpwi r3, 0 -/* 8010F5AC 40 82 00 0C */ bne lbl_8010F5B8 -/* 8010F5B0 38 60 00 00 */ li r3, 0 -/* 8010F5B4 48 00 00 CC */ b lbl_8010F680 -lbl_8010F5B8: -/* 8010F5B8 38 00 00 05 */ li r0, 5 -/* 8010F5BC B0 1F 06 04 */ sth r0, 0x604(r31) -lbl_8010F5C0: -/* 8010F5C0 7F E3 FB 78 */ mr r3, r31 -/* 8010F5C4 38 80 00 B3 */ li r4, 0xb3 -/* 8010F5C8 4B FB 29 A5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8010F5CC A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 8010F5D0 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 8010F5D4 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8010F5D8 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8010F5DC 38 00 00 04 */ li r0, 4 -/* 8010F5E0 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 8010F5E4 7F E3 FB 78 */ mr r3, r31 -/* 8010F5E8 38 80 01 00 */ li r4, 0x100 -/* 8010F5EC 3C A0 80 39 */ lis r5, m__20daAlinkHIO_bottle_c0@ha /* 0x8038E90C@ha */ -/* 8010F5F0 38 A5 E9 0C */ addi r5, r5, m__20daAlinkHIO_bottle_c0@l /* 0x8038E90C@l */ -/* 8010F5F4 4B F9 DB 01 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 8010F5F8 7F E3 FB 78 */ mr r3, r31 -/* 8010F5FC 4B FB 02 59 */ bl keepItemData__9daAlink_cFv -/* 8010F600 7F E3 FB 78 */ mr r3, r31 -/* 8010F604 7F C4 F3 78 */ mr r4, r30 -/* 8010F608 4B FF EF D1 */ bl setBottleModel__9daAlink_cFUs -/* 8010F60C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8010F610 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8010F614 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 8010F618 60 00 20 00 */ ori r0, r0, 0x2000 -/* 8010F61C 90 03 5F 1C */ stw r0, 0x5f1c(r3) -/* 8010F620 38 00 00 01 */ li r0, 1 -/* 8010F624 90 1F 31 94 */ stw r0, 0x3194(r31) -/* 8010F628 38 00 00 00 */ li r0, 0 -/* 8010F62C B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 8010F630 28 1F 00 00 */ cmplwi r31, 0 -/* 8010F634 41 82 00 0C */ beq lbl_8010F640 -/* 8010F638 83 DF 00 04 */ lwz r30, 4(r31) -/* 8010F63C 48 00 00 08 */ b lbl_8010F644 -lbl_8010F640: -/* 8010F640 3B C0 FF FF */ li r30, -1 -lbl_8010F644: -/* 8010F644 48 07 1F FD */ bl dCam_getBody__Fv -/* 8010F648 38 80 00 12 */ li r4, 0x12 -/* 8010F64C 7F C5 F3 78 */ mr r5, r30 -/* 8010F650 3C C0 80 39 */ lis r6, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 8010F654 38 C6 20 94 */ addi r6, r6, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 8010F658 38 C6 00 43 */ addi r6, r6, 0x43 -/* 8010F65C 38 E0 00 01 */ li r7, 1 -/* 8010F660 39 1F 31 94 */ addi r8, r31, 0x3194 -/* 8010F664 39 20 00 00 */ li r9, 0 -/* 8010F668 4C C6 31 82 */ crclr 6 -/* 8010F66C 4B F7 94 11 */ bl StartEventCamera__9dCamera_cFiie -/* 8010F670 38 00 00 00 */ li r0, 0 -/* 8010F674 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8010F678 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 8010F67C 38 60 00 01 */ li r3, 1 -lbl_8010F680: -/* 8010F680 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8010F684 83 C1 00 08 */ lwz r30, 8(r1) -/* 8010F688 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8010F68C 7C 08 03 A6 */ mtlr r0 -/* 8010F690 38 21 00 10 */ addi r1, r1, 0x10 -/* 8010F694 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBottleDrink__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBottleDrink__9daAlink_cFv.s deleted file mode 100644 index 95f5036faeb..00000000000 --- a/asm/d/a/d_a_alink/procBottleDrink__9daAlink_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8010F698: -/* 8010F698 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8010F69C 7C 08 02 A6 */ mflr r0 -/* 8010F6A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8010F6A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8010F6A8 7C 7F 1B 78 */ mr r31, r3 -/* 8010F6AC A8 03 30 0E */ lha r0, 0x300e(r3) -/* 8010F6B0 2C 00 00 00 */ cmpwi r0, 0 -/* 8010F6B4 41 82 00 1C */ beq lbl_8010F6D0 -/* 8010F6B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8010F6BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8010F6C0 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8010F6C4 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8010F6C8 4B F3 8A B5 */ bl cutEnd__16dEvent_manager_cFi -/* 8010F6CC 48 00 00 10 */ b lbl_8010F6DC -lbl_8010F6D0: -/* 8010F6D0 38 80 00 00 */ li r4, 0 -/* 8010F6D4 4B FF F3 F1 */ bl commonBottleDrink__9daAlink_cFi -/* 8010F6D8 B0 7F 30 0E */ sth r3, 0x300e(r31) -lbl_8010F6DC: -/* 8010F6DC 38 60 00 01 */ li r3, 1 -/* 8010F6E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8010F6E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8010F6E8 7C 08 03 A6 */ mtlr r0 -/* 8010F6EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8010F6F0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBottleGetInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procBottleGetInit__9daAlink_cFi.s deleted file mode 100644 index d08cfdc2122..00000000000 --- a/asm/d/a/d_a_alink/procBottleGetInit__9daAlink_cFi.s +++ /dev/null @@ -1,160 +0,0 @@ -lbl_801102D0: -/* 801102D0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801102D4 7C 08 02 A6 */ mflr r0 -/* 801102D8 90 01 00 24 */ stw r0, 0x24(r1) -/* 801102DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801102E0 48 25 1E FD */ bl _savegpr_29 -/* 801102E4 7C 7F 1B 78 */ mr r31, r3 -/* 801102E8 7C 9D 23 78 */ mr r29, r4 -/* 801102EC A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 801102F0 20 00 00 75 */ subfic r0, r0, 0x75 -/* 801102F4 7C 00 00 34 */ cntlzw r0, r0 -/* 801102F8 54 1E DE 3E */ rlwinm r30, r0, 0x1b, 0x18, 0x1f -/* 801102FC 38 80 00 B6 */ li r4, 0xb6 -/* 80110300 4B FB 1C 6D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80110304 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 80110308 28 00 00 48 */ cmplwi r0, 0x48 -/* 8011030C 40 82 00 A0 */ bne lbl_801103AC -/* 80110310 7F E3 FB 78 */ mr r3, r31 -/* 80110314 38 80 01 09 */ li r4, 0x109 -/* 80110318 3C A0 80 39 */ lis r5, m__20daAlinkHIO_bottle_c0@ha /* 0x8038E90C@ha */ -/* 8011031C 38 C5 E9 0C */ addi r6, r5, m__20daAlinkHIO_bottle_c0@l /* 0x8038E90C@l */ -/* 80110320 C0 26 00 7C */ lfs f1, 0x7c(r6) -/* 80110324 C0 42 93 D4 */ lfs f2, lit_11442(r2) -/* 80110328 A8 A6 00 78 */ lha r5, 0x78(r6) -/* 8011032C C0 66 00 84 */ lfs f3, 0x84(r6) -/* 80110330 4B F9 CC DD */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -/* 80110334 38 00 00 FE */ li r0, 0xfe -/* 80110338 98 1F 2F 93 */ stb r0, 0x2f93(r31) -/* 8011033C 2C 1E 00 00 */ cmpwi r30, 0 -/* 80110340 41 82 00 30 */ beq lbl_80110370 -/* 80110344 38 60 00 48 */ li r3, 0x48 -/* 80110348 4B F8 7B 45 */ bl execItemGet__FUc -/* 8011034C 3B C0 00 F8 */ li r30, 0xf8 -/* 80110350 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80110354 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80110358 A0 04 00 06 */ lhz r0, 6(r4) -/* 8011035C 80 64 5D D4 */ lwz r3, 0x5dd4(r4) -/* 80110360 7C 00 00 D0 */ neg r0, r0 -/* 80110364 7C 03 02 14 */ add r0, r3, r0 -/* 80110368 90 04 5D D4 */ stw r0, 0x5dd4(r4) -/* 8011036C 48 00 00 30 */ b lbl_8011039C -lbl_80110370: -/* 80110370 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80110374 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80110378 A0 64 00 06 */ lhz r3, 6(r4) -/* 8011037C 80 04 5D D4 */ lwz r0, 0x5dd4(r4) -/* 80110380 7C 00 1A 14 */ add r0, r0, r3 -/* 80110384 90 04 5D D4 */ stw r0, 0x5dd4(r4) -/* 80110388 2C 1D 00 00 */ cmpwi r29, 0 -/* 8011038C 41 82 00 0C */ beq lbl_80110398 -/* 80110390 3B C0 00 9C */ li r30, 0x9c -/* 80110394 48 00 00 08 */ b lbl_8011039C -lbl_80110398: -/* 80110398 3B C0 00 6E */ li r30, 0x6e -lbl_8011039C: -/* 8011039C 7F E3 FB 78 */ mr r3, r31 -/* 801103A0 7F C4 F3 78 */ mr r4, r30 -/* 801103A4 48 00 A2 E5 */ bl setGetSubBgm__9daAlink_cFi -/* 801103A8 48 00 00 20 */ b lbl_801103C8 -lbl_801103AC: -/* 801103AC 7F E3 FB 78 */ mr r3, r31 -/* 801103B0 38 80 01 09 */ li r4, 0x109 -/* 801103B4 3C A0 80 39 */ lis r5, m__20daAlinkHIO_bottle_c0@ha /* 0x8038E90C@ha */ -/* 801103B8 38 A5 E9 0C */ addi r5, r5, m__20daAlinkHIO_bottle_c0@l /* 0x8038E90C@l */ -/* 801103BC 38 A5 00 78 */ addi r5, r5, 0x78 -/* 801103C0 4B F9 CD 35 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 801103C4 A3 DF 2F DC */ lhz r30, 0x2fdc(r31) -lbl_801103C8: -/* 801103C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801103CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801103D0 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 801103D4 64 00 04 00 */ oris r0, r0, 0x400 -/* 801103D8 60 00 10 00 */ ori r0, r0, 0x1000 -/* 801103DC 90 03 5F 1C */ stw r0, 0x5f1c(r3) -/* 801103E0 38 00 FF FF */ li r0, -1 -/* 801103E4 90 1F 28 F0 */ stw r0, 0x28f0(r31) -/* 801103E8 38 00 00 00 */ li r0, 0 -/* 801103EC 90 1F 31 94 */ stw r0, 0x3194(r31) -/* 801103F0 38 1E 00 65 */ addi r0, r30, 0x65 -/* 801103F4 90 1F 32 CC */ stw r0, 0x32cc(r31) -/* 801103F8 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 801103FC 28 00 00 48 */ cmplwi r0, 0x48 -/* 80110400 40 82 00 0C */ bne lbl_8011040C -/* 80110404 38 00 00 0C */ li r0, 0xc -/* 80110408 90 1F 31 94 */ stw r0, 0x3194(r31) -lbl_8011040C: -/* 8011040C A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 80110410 28 00 00 48 */ cmplwi r0, 0x48 -/* 80110414 40 82 00 0C */ bne lbl_80110420 -/* 80110418 7F E3 FB 78 */ mr r3, r31 -/* 8011041C 4B FA F0 C5 */ bl resetBasAnime__9daAlink_cFv -lbl_80110420: -/* 80110420 28 1F 00 00 */ cmplwi r31, 0 -/* 80110424 41 82 00 0C */ beq lbl_80110430 -/* 80110428 83 DF 00 04 */ lwz r30, 4(r31) -/* 8011042C 48 00 00 08 */ b lbl_80110434 -lbl_80110430: -/* 80110430 3B C0 FF FF */ li r30, -1 -lbl_80110434: -/* 80110434 48 07 12 0D */ bl dCam_getBody__Fv -/* 80110438 38 80 00 12 */ li r4, 0x12 -/* 8011043C 7F C5 F3 78 */ mr r5, r30 -/* 80110440 3C C0 80 39 */ lis r6, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 80110444 38 C6 20 94 */ addi r6, r6, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 80110448 38 C6 00 43 */ addi r6, r6, 0x43 -/* 8011044C 38 E0 00 01 */ li r7, 1 -/* 80110450 39 1F 31 94 */ addi r8, r31, 0x3194 -/* 80110454 39 20 00 00 */ li r9, 0 -/* 80110458 4C C6 31 82 */ crclr 6 -/* 8011045C 4B F7 86 21 */ bl StartEventCamera__9dCamera_cFiie -/* 80110460 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 80110464 28 00 00 73 */ cmplwi r0, 0x73 -/* 80110468 41 82 00 14 */ beq lbl_8011047C -/* 8011046C 28 00 00 77 */ cmplwi r0, 0x77 -/* 80110470 41 82 00 0C */ beq lbl_8011047C -/* 80110474 28 00 00 74 */ cmplwi r0, 0x74 -/* 80110478 40 82 00 2C */ bne lbl_801104A4 -lbl_8011047C: -/* 8011047C 7F E3 FB 78 */ mr r3, r31 -/* 80110480 38 80 00 48 */ li r4, 0x48 -/* 80110484 4B F9 F4 1D */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -/* 80110488 7F E3 FB 78 */ mr r3, r31 -/* 8011048C 38 80 01 43 */ li r4, 0x143 -/* 80110490 38 A0 00 00 */ li r5, 0 -/* 80110494 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 80110498 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8011049C 4B F9 F0 15 */ bl setFaceBck__9daAlink_cFUsiUs -/* 801104A0 48 00 00 24 */ b lbl_801104C4 -lbl_801104A4: -/* 801104A4 28 00 00 6A */ cmplwi r0, 0x6a -/* 801104A8 40 82 00 1C */ bne lbl_801104C4 -/* 801104AC 7F E3 FB 78 */ mr r3, r31 -/* 801104B0 38 80 01 46 */ li r4, 0x146 -/* 801104B4 38 A0 00 00 */ li r5, 0 -/* 801104B8 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 801104BC 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 801104C0 4B F9 EF F1 */ bl setFaceBck__9daAlink_cFUsiUs -lbl_801104C4: -/* 801104C4 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 801104C8 28 00 00 76 */ cmplwi r0, 0x76 -/* 801104CC 40 82 00 30 */ bne lbl_801104FC -/* 801104D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801104D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801104D8 3B C3 07 F0 */ addi r30, r3, 0x7f0 -/* 801104DC 7F C3 F3 78 */ mr r3, r30 -/* 801104E0 38 80 4A 40 */ li r4, 0x4a40 -/* 801104E4 4B F2 44 D9 */ bl isEventBit__11dSv_event_cCFUs -/* 801104E8 2C 03 00 00 */ cmpwi r3, 0 -/* 801104EC 41 82 00 10 */ beq lbl_801104FC -/* 801104F0 7F C3 F3 78 */ mr r3, r30 -/* 801104F4 38 80 4C 80 */ li r4, 0x4c80 -/* 801104F8 4B F2 44 95 */ bl onEventBit__11dSv_event_cFUs -lbl_801104FC: -/* 801104FC 38 60 00 01 */ li r3, 1 -/* 80110500 39 61 00 20 */ addi r11, r1, 0x20 -/* 80110504 48 25 1D 25 */ bl _restgpr_29 -/* 80110508 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8011050C 7C 08 03 A6 */ mtlr r0 -/* 80110510 38 21 00 20 */ addi r1, r1, 0x20 -/* 80110514 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBottleGet__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBottleGet__9daAlink_cFv.s deleted file mode 100644 index 0461233d527..00000000000 --- a/asm/d/a/d_a_alink/procBottleGet__9daAlink_cFv.s +++ /dev/null @@ -1,83 +0,0 @@ -lbl_80110518: -/* 80110518 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011051C 7C 08 02 A6 */ mflr r0 -/* 80110520 90 01 00 14 */ stw r0, 0x14(r1) -/* 80110524 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80110528 93 C1 00 08 */ stw r30, 8(r1) -/* 8011052C 7C 7E 1B 78 */ mr r30, r3 -/* 80110530 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 80110534 80 63 07 18 */ lwz r3, 0x718(r3) -/* 80110538 4B F9 8D 11 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase -/* 8011053C 7F E3 FB 78 */ mr r3, r31 -/* 80110540 48 04 DF 8D */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 80110544 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80110548 41 82 00 48 */ beq lbl_80110590 -/* 8011054C 7F C3 F3 78 */ mr r3, r30 -/* 80110550 80 9E 32 CC */ lwz r4, 0x32cc(r30) -/* 80110554 48 00 82 61 */ bl checkEndMessage__9daAlink_cFUl -/* 80110558 2C 03 00 00 */ cmpwi r3, 0 -/* 8011055C 41 82 00 34 */ beq lbl_80110590 -/* 80110560 7F C3 F3 78 */ mr r3, r30 -/* 80110564 48 01 46 05 */ bl resetFairyEffect__9daAlink_cFv -/* 80110568 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) -/* 8011056C 28 00 00 48 */ cmplwi r0, 0x48 -/* 80110570 41 82 00 14 */ beq lbl_80110584 -/* 80110574 7F C3 F3 78 */ mr r3, r30 -/* 80110578 38 80 00 00 */ li r4, 0 -/* 8011057C 38 A0 00 00 */ li r5, 0 -/* 80110580 4B FB 0D 5D */ bl deleteEquipItem__9daAlink_cFii -lbl_80110584: -/* 80110584 7F C3 F3 78 */ mr r3, r30 -/* 80110588 48 00 77 09 */ bl resetSpecialEvent__9daAlink_cFv -/* 8011058C 48 00 00 80 */ b lbl_8011060C -lbl_80110590: -/* 80110590 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 80110594 C0 02 93 60 */ lfs f0, lit_8369(r2) -/* 80110598 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8011059C 4C 41 13 82 */ cror 2, 1, 2 -/* 801105A0 40 82 00 10 */ bne lbl_801105B0 -/* 801105A4 38 00 00 FE */ li r0, 0xfe -/* 801105A8 98 1E 2F 93 */ stb r0, 0x2f93(r30) -/* 801105AC 48 00 00 60 */ b lbl_8011060C -lbl_801105B0: -/* 801105B0 C0 02 94 64 */ lfs f0, lit_14954(r2) -/* 801105B4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801105B8 4C 41 13 82 */ cror 2, 1, 2 -/* 801105BC 40 82 00 10 */ bne lbl_801105CC -/* 801105C0 38 00 00 00 */ li r0, 0 -/* 801105C4 B0 1E 30 1A */ sth r0, 0x301a(r30) -/* 801105C8 48 00 00 44 */ b lbl_8011060C -lbl_801105CC: -/* 801105CC C0 02 93 3C */ lfs f0, lit_7808(r2) -/* 801105D0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801105D4 4C 41 13 82 */ cror 2, 1, 2 -/* 801105D8 40 82 00 34 */ bne lbl_8011060C -/* 801105DC 80 7E 07 08 */ lwz r3, 0x708(r30) -/* 801105E0 80 63 00 04 */ lwz r3, 4(r3) -/* 801105E4 80 63 00 60 */ lwz r3, 0x60(r3) -/* 801105E8 80 63 00 00 */ lwz r3, 0(r3) -/* 801105EC 80 63 00 08 */ lwz r3, 8(r3) -/* 801105F0 80 03 00 0C */ lwz r0, 0xc(r3) -/* 801105F4 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 801105F8 90 03 00 0C */ stw r0, 0xc(r3) -/* 801105FC 38 00 00 05 */ li r0, 5 -/* 80110600 98 1E 2F 93 */ stb r0, 0x2f93(r30) -/* 80110604 38 00 00 01 */ li r0, 1 -/* 80110608 B0 1E 30 1A */ sth r0, 0x301a(r30) -lbl_8011060C: -/* 8011060C 7F E3 FB 78 */ mr r3, r31 -/* 80110610 C0 22 93 7C */ lfs f1, lit_8779(r2) -/* 80110614 48 21 7E 19 */ bl checkPass__12J3DFrameCtrlFf -/* 80110618 2C 03 00 00 */ cmpwi r3, 0 -/* 8011061C 41 82 00 10 */ beq lbl_8011062C -/* 80110620 7F C3 F3 78 */ mr r3, r30 -/* 80110624 A0 9E 2F DC */ lhz r4, 0x2fdc(r30) -/* 80110628 48 00 A0 61 */ bl setGetSubBgm__9daAlink_cFi -lbl_8011062C: -/* 8011062C 38 60 00 01 */ li r3, 1 -/* 80110630 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80110634 83 C1 00 08 */ lwz r30, 8(r1) -/* 80110638 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011063C 7C 08 03 A6 */ mtlr r0 -/* 80110640 38 21 00 10 */ addi r1, r1, 0x10 -/* 80110644 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBowMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBowMoveInit__9daAlink_cFv.s deleted file mode 100644 index f0bf33c2f8b..00000000000 --- a/asm/d/a/d_a_alink/procBowMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_800DFE3C: -/* 800DFE3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DFE40 7C 08 02 A6 */ mflr r0 -/* 800DFE44 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DFE48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DFE4C 7C 7F 1B 78 */ mr r31, r3 -/* 800DFE50 38 80 00 5F */ li r4, 0x5f -/* 800DFE54 4B FE 2F 51 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800DFE58 2C 03 00 00 */ cmpwi r3, 0 -/* 800DFE5C 40 82 00 0C */ bne lbl_800DFE68 -/* 800DFE60 38 60 00 00 */ li r3, 0 -/* 800DFE64 48 00 00 48 */ b lbl_800DFEAC -lbl_800DFE68: -/* 800DFE68 7F E3 FB 78 */ mr r3, r31 -/* 800DFE6C 4B FD 3A 99 */ bl checkZeroSpeedF__9daAlink_cCFv -/* 800DFE70 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800DFE74 41 82 00 10 */ beq lbl_800DFE84 -/* 800DFE78 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800DFE7C 60 00 00 01 */ ori r0, r0, 1 -/* 800DFE80 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_800DFE84: -/* 800DFE84 7F E3 FB 78 */ mr r3, r31 -/* 800DFE88 3C 80 80 39 */ lis r4, m__17daAlinkHIO_bow_c0@ha /* 0x8038E658@ha */ -/* 800DFE8C 38 84 E6 58 */ addi r4, r4, m__17daAlinkHIO_bow_c0@l /* 0x8038E658@l */ -/* 800DFE90 C0 24 00 30 */ lfs f1, 0x30(r4) -/* 800DFE94 4B FC EB DD */ bl setBlendAtnMoveAnime__9daAlink_cFf -/* 800DFE98 38 00 00 00 */ li r0, 0 -/* 800DFE9C B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800DFEA0 7F E3 FB 78 */ mr r3, r31 -/* 800DFEA4 4B FF EC E9 */ bl setBowOrSlingStatus__9daAlink_cFv -/* 800DFEA8 38 60 00 01 */ li r3, 1 -lbl_800DFEAC: -/* 800DFEAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DFEB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DFEB4 7C 08 03 A6 */ mtlr r0 -/* 800DFEB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DFEBC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBowMove__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBowMove__9daAlink_cFv.s deleted file mode 100644 index 43127572ab5..00000000000 --- a/asm/d/a/d_a_alink/procBowMove__9daAlink_cFv.s +++ /dev/null @@ -1,78 +0,0 @@ -lbl_800DFEC0: -/* 800DFEC0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800DFEC4 7C 08 02 A6 */ mflr r0 -/* 800DFEC8 90 01 00 24 */ stw r0, 0x24(r1) -/* 800DFECC DB E1 00 10 */ stfd f31, 0x10(r1) -/* 800DFED0 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 800DFED4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DFED8 7C 7F 1B 78 */ mr r31, r3 -/* 800DFEDC 4B FF EF 41 */ bl cancelBowMove__9daAlink_cFv -/* 800DFEE0 A8 1F 30 8E */ lha r0, 0x308e(r31) -/* 800DFEE4 2C 00 00 00 */ cmpwi r0, 0 -/* 800DFEE8 40 82 00 3C */ bne lbl_800DFF24 -/* 800DFEEC A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 800DFEF0 2C 00 00 00 */ cmpwi r0, 0 -/* 800DFEF4 41 82 00 30 */ beq lbl_800DFF24 -/* 800DFEF8 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 800DFEFC 28 00 00 0D */ cmplwi r0, 0xd -/* 800DFF00 40 82 00 24 */ bne lbl_800DFF24 -/* 800DFF04 7F E3 FB 78 */ mr r3, r31 -/* 800DFF08 4B FD 26 FD */ bl itemButton__9daAlink_cFv -/* 800DFF0C 2C 03 00 00 */ cmpwi r3, 0 -/* 800DFF10 40 82 00 14 */ bne lbl_800DFF24 -/* 800DFF14 7F E3 FB 78 */ mr r3, r31 -/* 800DFF18 38 80 00 02 */ li r4, 2 -/* 800DFF1C C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800DFF20 4B FC D8 05 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf -lbl_800DFF24: -/* 800DFF24 38 00 00 01 */ li r0, 1 -/* 800DFF28 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800DFF2C 80 1F 05 88 */ lwz r0, 0x588(r31) -/* 800DFF30 64 00 08 00 */ oris r0, r0, 0x800 -/* 800DFF34 90 1F 05 88 */ stw r0, 0x588(r31) -/* 800DFF38 7F E3 FB 78 */ mr r3, r31 -/* 800DFF3C 38 80 00 00 */ li r4, 0 -/* 800DFF40 4B FD A1 91 */ bl checkNextAction__9daAlink_cFi -/* 800DFF44 2C 03 00 00 */ cmpwi r3, 0 -/* 800DFF48 40 82 00 78 */ bne lbl_800DFFC0 -/* 800DFF4C C3 E2 92 BC */ lfs f31, lit_6041(r2) -/* 800DFF50 7F E3 FB 78 */ mr r3, r31 -/* 800DFF54 4B FD 39 B1 */ bl checkZeroSpeedF__9daAlink_cCFv -/* 800DFF58 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800DFF5C 41 82 00 40 */ beq lbl_800DFF9C -/* 800DFF60 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800DFF64 60 00 00 01 */ ori r0, r0, 1 -/* 800DFF68 90 1F 31 A0 */ stw r0, 0x31a0(r31) -/* 800DFF6C 88 1F 2F 98 */ lbz r0, 0x2f98(r31) -/* 800DFF70 28 00 00 03 */ cmplwi r0, 3 -/* 800DFF74 41 82 00 18 */ beq lbl_800DFF8C -/* 800DFF78 38 00 00 03 */ li r0, 3 -/* 800DFF7C 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 800DFF80 3C 60 80 39 */ lis r3, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 800DFF84 38 63 D6 64 */ addi r3, r3, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 800DFF88 C3 E3 00 18 */ lfs f31, 0x18(r3) -lbl_800DFF8C: -/* 800DFF8C A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 800DFF90 38 03 C0 00 */ addi r0, r3, -16384 -/* 800DFF94 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800DFF98 48 00 00 10 */ b lbl_800DFFA8 -lbl_800DFF9C: -/* 800DFF9C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800DFFA0 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 800DFFA4 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_800DFFA8: -/* 800DFFA8 7F E3 FB 78 */ mr r3, r31 -/* 800DFFAC FC 20 F8 90 */ fmr f1, f31 -/* 800DFFB0 4B FC EA C1 */ bl setBlendAtnMoveAnime__9daAlink_cFf -/* 800DFFB4 7F E3 FB 78 */ mr r3, r31 -/* 800DFFB8 38 80 00 00 */ li r4, 0 -/* 800DFFBC 4B FD B2 F5 */ bl setBodyAngleXReadyAnime__9daAlink_cFi -lbl_800DFFC0: -/* 800DFFC0 38 60 00 01 */ li r3, 1 -/* 800DFFC4 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 800DFFC8 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 800DFFCC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DFFD0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800DFFD4 7C 08 03 A6 */ mtlr r0 -/* 800DFFD8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DFFDC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBowSubjectInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBowSubjectInit__9daAlink_cFv.s deleted file mode 100644 index f306a1b316c..00000000000 --- a/asm/d/a/d_a_alink/procBowSubjectInit__9daAlink_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_800DFD6C: -/* 800DFD6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DFD70 7C 08 02 A6 */ mflr r0 -/* 800DFD74 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DFD78 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DFD7C 7C 7F 1B 78 */ mr r31, r3 -/* 800DFD80 38 80 00 5E */ li r4, 0x5e -/* 800DFD84 4B FE 30 21 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800DFD88 2C 03 00 00 */ cmpwi r3, 0 -/* 800DFD8C 40 82 00 0C */ bne lbl_800DFD98 -/* 800DFD90 38 60 00 00 */ li r3, 0 -/* 800DFD94 48 00 00 34 */ b lbl_800DFDC8 -lbl_800DFD98: -/* 800DFD98 7F E3 FB 78 */ mr r3, r31 -/* 800DFD9C 38 80 00 11 */ li r4, 0x11 -/* 800DFDA0 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800DFDA4 3C A0 80 39 */ lis r5, m__17daAlinkHIO_bow_c0@ha /* 0x8038E658@ha */ -/* 800DFDA8 38 A5 E6 58 */ addi r5, r5, m__17daAlinkHIO_bow_c0@l /* 0x8038E658@l */ -/* 800DFDAC C0 45 00 30 */ lfs f2, 0x30(r5) -/* 800DFDB0 4B FC D2 31 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -/* 800DFDB4 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800DFDB8 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800DFDBC 7F E3 FB 78 */ mr r3, r31 -/* 800DFDC0 4B FF ED CD */ bl setBowOrSlingStatus__9daAlink_cFv -/* 800DFDC4 38 60 00 01 */ li r3, 1 -lbl_800DFDC8: -/* 800DFDC8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DFDCC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DFDD0 7C 08 03 A6 */ mtlr r0 -/* 800DFDD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DFDD8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBowSubject__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBowSubject__9daAlink_cFv.s deleted file mode 100644 index 56d4df778f2..00000000000 --- a/asm/d/a/d_a_alink/procBowSubject__9daAlink_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_800DFDDC: -/* 800DFDDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DFDE0 7C 08 02 A6 */ mflr r0 -/* 800DFDE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DFDE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DFDEC 7C 7F 1B 78 */ mr r31, r3 -/* 800DFDF0 38 80 00 12 */ li r4, 0x12 -/* 800DFDF4 4B FD 34 5D */ bl setDoStatus__9daAlink_cFUc -/* 800DFDF8 7F E3 FB 78 */ mr r3, r31 -/* 800DFDFC 38 80 00 00 */ li r4, 0 -/* 800DFE00 4B FD A2 D1 */ bl checkNextAction__9daAlink_cFi -/* 800DFE04 2C 03 00 00 */ cmpwi r3, 0 -/* 800DFE08 40 82 00 1C */ bne lbl_800DFE24 -/* 800DFE0C 7F E3 FB 78 */ mr r3, r31 -/* 800DFE10 4B FE EA 91 */ bl setBodyAngleToCamera__9daAlink_cFv -/* 800DFE14 2C 03 00 00 */ cmpwi r3, 0 -/* 800DFE18 41 82 00 0C */ beq lbl_800DFE24 -/* 800DFE1C 7F E3 FB 78 */ mr r3, r31 -/* 800DFE20 4B FF FE B9 */ bl setBowSight__9daAlink_cFv -lbl_800DFE24: -/* 800DFE24 38 60 00 01 */ li r3, 1 -/* 800DFE28 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DFE2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DFE30 7C 08 03 A6 */ mtlr r0 -/* 800DFE34 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DFE38 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c.s deleted file mode 100644 index 11f7e61582f..00000000000 --- a/asm/d/a/d_a_alink/procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_800F4C78: -/* 800F4C78 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800F4C7C 7C 08 02 A6 */ mflr r0 -/* 800F4C80 90 01 00 24 */ stw r0, 0x24(r1) -/* 800F4C84 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F4C88 48 26 D5 55 */ bl _savegpr_29 -/* 800F4C8C 7C 7D 1B 78 */ mr r29, r3 -/* 800F4C90 7C 9E 23 78 */ mr r30, r4 -/* 800F4C94 38 80 00 8D */ li r4, 0x8d -/* 800F4C98 4B FC D2 D5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800F4C9C 28 1E 00 00 */ cmplwi r30, 0 -/* 800F4CA0 40 82 00 20 */ bne lbl_800F4CC0 -/* 800F4CA4 3C 60 80 0F */ lis r3, daAlink_searchCanoe__FP10fopAc_ac_cPv@ha /* 0x800F3CD8@ha */ -/* 800F4CA8 38 63 3C D8 */ addi r3, r3, daAlink_searchCanoe__FP10fopAc_ac_cPv@l /* 0x800F3CD8@l */ -/* 800F4CAC 38 80 00 00 */ li r4, 0 -/* 800F4CB0 4B F2 4B 49 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 800F4CB4 7C 7E 1B 78 */ mr r30, r3 -/* 800F4CB8 3B E0 00 01 */ li r31, 1 -/* 800F4CBC 48 00 00 08 */ b lbl_800F4CC4 -lbl_800F4CC0: -/* 800F4CC0 3B E0 00 00 */ li r31, 0 -lbl_800F4CC4: -/* 800F4CC4 7F A3 EB 78 */ mr r3, r29 -/* 800F4CC8 38 80 00 00 */ li r4, 0 -/* 800F4CCC 4B FE D8 B5 */ bl setHeavyBoots__9daAlink_cFi -/* 800F4CD0 7F A3 EB 78 */ mr r3, r29 -/* 800F4CD4 38 80 00 33 */ li r4, 0x33 -/* 800F4CD8 3C A0 80 39 */ lis r5, m__22daAlinkHIO_autoJump_c0@ha /* 0x8038E068@ha */ -/* 800F4CDC 38 A5 E0 68 */ addi r5, r5, m__22daAlinkHIO_autoJump_c0@l /* 0x8038E068@l */ -/* 800F4CE0 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800F4CE4 4B FB 84 11 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800F4CE8 7F A3 EB 78 */ mr r3, r29 -/* 800F4CEC 38 80 00 00 */ li r4, 0 -/* 800F4CF0 38 A0 00 00 */ li r5, 0 -/* 800F4CF4 4B FC C5 E9 */ bl deleteEquipItem__9daAlink_cFii -/* 800F4CF8 38 7D 28 14 */ addi r3, r29, 0x2814 -/* 800F4CFC 7F C4 F3 78 */ mr r4, r30 -/* 800F4D00 48 06 9F B9 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -/* 800F4D04 7F A3 EB 78 */ mr r3, r29 -/* 800F4D08 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800F4D0C C0 5D 05 34 */ lfs f2, 0x534(r29) -/* 800F4D10 38 80 00 00 */ li r4, 0 -/* 800F4D14 4B FC 6A 5D */ bl setSpecialGravity__9daAlink_cFffi -/* 800F4D18 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800F4D1C D0 1D 33 98 */ stfs f0, 0x3398(r29) -/* 800F4D20 D0 1D 04 FC */ stfs f0, 0x4fc(r29) -/* 800F4D24 7F A3 EB 78 */ mr r3, r29 -/* 800F4D28 7F C4 F3 78 */ mr r4, r30 -/* 800F4D2C 4B FF F8 39 */ bl setRideCanoeBasePos__9daAlink_cFP10fopAc_ac_c -/* 800F4D30 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 800F4D34 38 63 00 24 */ addi r3, r3, 0x24 -/* 800F4D38 38 9D 37 C8 */ addi r4, r29, 0x37c8 -/* 800F4D3C 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 800F4D40 48 25 20 2D */ bl PSMTXMultVec -/* 800F4D44 A8 1D 04 E6 */ lha r0, 0x4e6(r29) -/* 800F4D48 B0 1D 04 DE */ sth r0, 0x4de(r29) -/* 800F4D4C 7F A3 EB 78 */ mr r3, r29 -/* 800F4D50 4B FF F2 75 */ bl initCanoeRide__9daAlink_cFv -/* 800F4D54 2C 1F 00 00 */ cmpwi r31, 0 -/* 800F4D58 41 82 00 10 */ beq lbl_800F4D68 -/* 800F4D5C 7F A3 EB 78 */ mr r3, r29 -/* 800F4D60 38 80 00 02 */ li r4, 2 -/* 800F4D64 48 00 04 81 */ bl procCanoeWaitInit__9daAlink_cFi -lbl_800F4D68: -/* 800F4D68 38 60 00 01 */ li r3, 1 -/* 800F4D6C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F4D70 48 26 D4 B9 */ bl _restgpr_29 -/* 800F4D74 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800F4D78 7C 08 03 A6 */ mtlr r0 -/* 800F4D7C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800F4D80 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCanoeJumpRide__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCanoeJumpRide__9daAlink_cFv.s deleted file mode 100644 index 093649d78d0..00000000000 --- a/asm/d/a/d_a_alink/procCanoeJumpRide__9daAlink_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_800F4D84: -/* 800F4D84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800F4D88 7C 08 02 A6 */ mflr r0 -/* 800F4D8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800F4D90 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800F4D94 7C 7F 1B 78 */ mr r31, r3 -/* 800F4D98 80 83 28 18 */ lwz r4, 0x2818(r3) -/* 800F4D9C 28 04 00 00 */ cmplwi r4, 0 -/* 800F4DA0 40 82 00 10 */ bne lbl_800F4DB0 -/* 800F4DA4 38 80 00 00 */ li r4, 0 -/* 800F4DA8 4B FC 53 29 */ bl checkNextAction__9daAlink_cFi -/* 800F4DAC 48 00 00 38 */ b lbl_800F4DE4 -lbl_800F4DB0: -/* 800F4DB0 80 64 05 70 */ lwz r3, 0x570(r4) -/* 800F4DB4 38 63 00 24 */ addi r3, r3, 0x24 -/* 800F4DB8 38 9F 37 C8 */ addi r4, r31, 0x37c8 -/* 800F4DBC 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 800F4DC0 48 25 1F AD */ bl PSMTXMultVec -/* 800F4DC4 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800F4DC8 48 06 97 05 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800F4DCC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800F4DD0 41 82 00 10 */ beq lbl_800F4DE0 -/* 800F4DD4 7F E3 FB 78 */ mr r3, r31 -/* 800F4DD8 38 80 00 01 */ li r4, 1 -/* 800F4DDC 48 00 04 09 */ bl procCanoeWaitInit__9daAlink_cFi -lbl_800F4DE0: -/* 800F4DE0 38 60 00 01 */ li r3, 1 -lbl_800F4DE4: -/* 800F4DE4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800F4DE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800F4DEC 7C 08 03 A6 */ mtlr r0 -/* 800F4DF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F4DF4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCanoeRideInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCanoeRideInit__9daAlink_cFv.s deleted file mode 100644 index 004c34e5ce3..00000000000 --- a/asm/d/a/d_a_alink/procCanoeRideInit__9daAlink_cFv.s +++ /dev/null @@ -1,83 +0,0 @@ -lbl_800F4A50: -/* 800F4A50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800F4A54 7C 08 02 A6 */ mflr r0 -/* 800F4A58 90 01 00 14 */ stw r0, 0x14(r1) -/* 800F4A5C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800F4A60 93 C1 00 08 */ stw r30, 8(r1) -/* 800F4A64 7C 7E 1B 78 */ mr r30, r3 -/* 800F4A68 38 80 00 8C */ li r4, 0x8c -/* 800F4A6C 4B FC D5 01 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800F4A70 7F C3 F3 78 */ mr r3, r30 -/* 800F4A74 38 80 00 00 */ li r4, 0 -/* 800F4A78 4B FE DB 09 */ bl setHeavyBoots__9daAlink_cFi -/* 800F4A7C 38 7E 28 14 */ addi r3, r30, 0x2814 -/* 800F4A80 80 9E 27 F4 */ lwz r4, 0x27f4(r30) -/* 800F4A84 48 06 A2 35 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -/* 800F4A88 7F C3 F3 78 */ mr r3, r30 -/* 800F4A8C 38 80 00 00 */ li r4, 0 -/* 800F4A90 38 A0 00 00 */ li r5, 0 -/* 800F4A94 4B FC C8 49 */ bl deleteEquipItem__9daAlink_cFii -/* 800F4A98 83 FE 27 F4 */ lwz r31, 0x27f4(r30) -/* 800F4A9C 7F C3 F3 78 */ mr r3, r30 -/* 800F4AA0 38 80 00 94 */ li r4, 0x94 -/* 800F4AA4 3C A0 80 39 */ lis r5, m__23daAlinkHIO_wallCatch_c0@ha /* 0x8038E164@ha */ -/* 800F4AA8 38 C5 E1 64 */ addi r6, r5, m__23daAlinkHIO_wallCatch_c0@l /* 0x8038E164@l */ -/* 800F4AAC C0 26 00 2C */ lfs f1, 0x2c(r6) -/* 800F4AB0 C0 46 00 50 */ lfs f2, 0x50(r6) -/* 800F4AB4 A8 A6 00 28 */ lha r5, 0x28(r6) -/* 800F4AB8 C0 66 00 34 */ lfs f3, 0x34(r6) -/* 800F4ABC 4B FB 85 51 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -/* 800F4AC0 7F C3 F3 78 */ mr r3, r30 -/* 800F4AC4 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800F4AC8 C0 5E 05 34 */ lfs f2, 0x534(r30) -/* 800F4ACC 38 80 00 00 */ li r4, 0 -/* 800F4AD0 4B FC 6C A1 */ bl setSpecialGravity__9daAlink_cFffi -/* 800F4AD4 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800F4AD8 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800F4ADC D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 800F4AE0 7F C3 F3 78 */ mr r3, r30 -/* 800F4AE4 7F E4 FB 78 */ mr r4, r31 -/* 800F4AE8 4B FF FA 7D */ bl setRideCanoeBasePos__9daAlink_cFP10fopAc_ac_c -/* 800F4AEC 7F E3 FB 78 */ mr r3, r31 -/* 800F4AF0 7F C4 F3 78 */ mr r4, r30 -/* 800F4AF4 4B F2 5C 1D */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 800F4AF8 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 800F4AFC 7C 04 18 50 */ subf r0, r4, r3 -/* 800F4B00 7C 00 07 35 */ extsh. r0, r0 -/* 800F4B04 40 81 00 20 */ ble lbl_800F4B24 -/* 800F4B08 38 04 C0 00 */ addi r0, r4, -16384 -/* 800F4B0C B0 1E 04 E6 */ sth r0, 0x4e6(r30) -/* 800F4B10 38 00 00 00 */ li r0, 0 -/* 800F4B14 B0 1E 30 08 */ sth r0, 0x3008(r30) -/* 800F4B18 C0 02 95 1C */ lfs f0, lit_20991(r2) -/* 800F4B1C D0 1E 37 C8 */ stfs f0, 0x37c8(r30) -/* 800F4B20 48 00 00 1C */ b lbl_800F4B3C -lbl_800F4B24: -/* 800F4B24 38 04 40 00 */ addi r0, r4, 0x4000 -/* 800F4B28 B0 1E 04 E6 */ sth r0, 0x4e6(r30) -/* 800F4B2C 38 00 00 01 */ li r0, 1 -/* 800F4B30 B0 1E 30 08 */ sth r0, 0x3008(r30) -/* 800F4B34 C0 02 95 20 */ lfs f0, lit_20992(r2) -/* 800F4B38 D0 1E 37 C8 */ stfs f0, 0x37c8(r30) -lbl_800F4B3C: -/* 800F4B3C 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 800F4B40 38 63 00 24 */ addi r3, r3, 0x24 -/* 800F4B44 38 9E 37 C8 */ addi r4, r30, 0x37c8 -/* 800F4B48 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 800F4B4C 48 25 22 21 */ bl PSMTXMultVec -/* 800F4B50 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800F4B54 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800F4B58 7F C3 F3 78 */ mr r3, r30 -/* 800F4B5C 4B FF F4 69 */ bl initCanoeRide__9daAlink_cFv -/* 800F4B60 38 00 00 80 */ li r0, 0x80 -/* 800F4B64 B0 1E 30 0E */ sth r0, 0x300e(r30) -/* 800F4B68 7F C3 F3 78 */ mr r3, r30 -/* 800F4B6C 38 80 00 01 */ li r4, 1 -/* 800F4B70 48 00 E7 59 */ bl swimOutAfter__9daAlink_cFi -/* 800F4B74 38 60 00 01 */ li r3, 1 -/* 800F4B78 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800F4B7C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800F4B80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800F4B84 7C 08 03 A6 */ mtlr r0 -/* 800F4B88 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F4B8C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCanoeRide__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCanoeRide__9daAlink_cFv.s deleted file mode 100644 index 4bf39ff591c..00000000000 --- a/asm/d/a/d_a_alink/procCanoeRide__9daAlink_cFv.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_800F4B90: -/* 800F4B90 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800F4B94 7C 08 02 A6 */ mflr r0 -/* 800F4B98 90 01 00 24 */ stw r0, 0x24(r1) -/* 800F4B9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F4BA0 48 26 D6 3D */ bl _savegpr_29 -/* 800F4BA4 7C 7D 1B 78 */ mr r29, r3 -/* 800F4BA8 83 E3 28 18 */ lwz r31, 0x2818(r3) -/* 800F4BAC 28 1F 00 00 */ cmplwi r31, 0 -/* 800F4BB0 40 82 00 10 */ bne lbl_800F4BC0 -/* 800F4BB4 38 80 00 00 */ li r4, 0 -/* 800F4BB8 4B FC 55 19 */ bl checkNextAction__9daAlink_cFi -/* 800F4BBC 48 00 00 A4 */ b lbl_800F4C60 -lbl_800F4BC0: -/* 800F4BC0 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 800F4BC4 38 63 00 24 */ addi r3, r3, 0x24 -/* 800F4BC8 38 9D 37 C8 */ addi r4, r29, 0x37c8 -/* 800F4BCC 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 800F4BD0 48 25 21 9D */ bl PSMTXMultVec -/* 800F4BD4 3B DD 1F D0 */ addi r30, r29, 0x1fd0 -/* 800F4BD8 7F C3 F3 78 */ mr r3, r30 -/* 800F4BDC 48 06 98 F1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800F4BE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800F4BE4 41 82 00 14 */ beq lbl_800F4BF8 -/* 800F4BE8 7F A3 EB 78 */ mr r3, r29 -/* 800F4BEC 38 80 00 01 */ li r4, 1 -/* 800F4BF0 48 00 05 F5 */ bl procCanoeWaitInit__9daAlink_cFi -/* 800F4BF4 48 00 00 68 */ b lbl_800F4C5C -lbl_800F4BF8: -/* 800F4BF8 C0 3E 00 10 */ lfs f1, 0x10(r30) -/* 800F4BFC C0 02 93 34 */ lfs f0, lit_7710(r2) -/* 800F4C00 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800F4C04 40 80 00 58 */ bge lbl_800F4C5C -/* 800F4C08 A8 7D 30 0E */ lha r3, 0x300e(r29) -/* 800F4C0C 38 03 01 80 */ addi r0, r3, 0x180 -/* 800F4C10 B0 1D 30 0E */ sth r0, 0x300e(r29) -/* 800F4C14 A8 1D 30 08 */ lha r0, 0x3008(r29) -/* 800F4C18 2C 00 00 00 */ cmpwi r0, 0 -/* 800F4C1C 40 82 00 20 */ bne lbl_800F4C3C -/* 800F4C20 A8 7F 04 E8 */ lha r3, 0x4e8(r31) -/* 800F4C24 A8 1D 30 0E */ lha r0, 0x300e(r29) -/* 800F4C28 7C 00 00 D0 */ neg r0, r0 -/* 800F4C2C 7C 00 07 34 */ extsh r0, r0 -/* 800F4C30 7C 03 02 14 */ add r0, r3, r0 -/* 800F4C34 B0 1F 04 E8 */ sth r0, 0x4e8(r31) -/* 800F4C38 48 00 00 14 */ b lbl_800F4C4C -lbl_800F4C3C: -/* 800F4C3C A8 7F 04 E8 */ lha r3, 0x4e8(r31) -/* 800F4C40 A8 1D 30 0E */ lha r0, 0x300e(r29) -/* 800F4C44 7C 03 02 14 */ add r0, r3, r0 -/* 800F4C48 B0 1F 04 E8 */ sth r0, 0x4e8(r31) -lbl_800F4C4C: -/* 800F4C4C C0 3F 14 6C */ lfs f1, 0x146c(r31) -/* 800F4C50 C0 02 95 24 */ lfs f0, lit_21021(r2) -/* 800F4C54 EC 01 00 2A */ fadds f0, f1, f0 -/* 800F4C58 D0 1F 14 6C */ stfs f0, 0x146c(r31) -lbl_800F4C5C: -/* 800F4C5C 38 60 00 01 */ li r3, 1 -lbl_800F4C60: -/* 800F4C60 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F4C64 48 26 D5 C5 */ bl _restgpr_29 -/* 800F4C68 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800F4C6C 7C 08 03 A6 */ mtlr r0 -/* 800F4C70 38 21 00 20 */ addi r1, r1, 0x20 -/* 800F4C74 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoHorseCallWaitInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procCoHorseCallWaitInit__9daAlink_cFi.s deleted file mode 100644 index 2f1b1737a5d..00000000000 --- a/asm/d/a/d_a_alink/procCoHorseCallWaitInit__9daAlink_cFi.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_80111FF0: -/* 80111FF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80111FF4 7C 08 02 A6 */ mflr r0 -/* 80111FF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80111FFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80112000 93 C1 00 08 */ stw r30, 8(r1) -/* 80112004 7C 7E 1B 78 */ mr r30, r3 -/* 80112008 7C 9F 23 78 */ mr r31, r4 -/* 8011200C 38 80 01 5E */ li r4, 0x15e -/* 80112010 4B FA FF 5D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80112014 2C 1F 00 04 */ cmpwi r31, 4 -/* 80112018 40 82 00 10 */ bne lbl_80112028 -/* 8011201C 38 00 00 02 */ li r0, 2 -/* 80112020 B0 1E 30 10 */ sth r0, 0x3010(r30) -/* 80112024 48 00 00 20 */ b lbl_80112044 -lbl_80112028: -/* 80112028 2C 1F 00 01 */ cmpwi r31, 1 -/* 8011202C 40 82 00 10 */ bne lbl_8011203C -/* 80112030 38 00 00 3D */ li r0, 0x3d -/* 80112034 B0 1E 30 10 */ sth r0, 0x3010(r30) -/* 80112038 48 00 00 0C */ b lbl_80112044 -lbl_8011203C: -/* 8011203C 38 00 00 10 */ li r0, 0x10 -/* 80112040 B0 1E 30 10 */ sth r0, 0x3010(r30) -lbl_80112044: -/* 80112044 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 80112048 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8011204C 41 82 00 24 */ beq lbl_80112070 -/* 80112050 7F C3 F3 78 */ mr r3, r30 -/* 80112054 38 80 00 00 */ li r4, 0 -/* 80112058 3C A0 80 39 */ lis r5, m__20daAlinkHIO_wlMove_c0@ha /* 0x8038EE28@ha */ -/* 8011205C 38 A5 EE 28 */ addi r5, r5, m__20daAlinkHIO_wlMove_c0@l /* 0x8038EE28@l */ -/* 80112060 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 80112064 C0 42 92 C4 */ lfs f2, lit_6109(r2) -/* 80112068 48 01 76 71 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff -/* 8011206C 48 00 00 20 */ b lbl_8011208C -lbl_80112070: -/* 80112070 7F C3 F3 78 */ mr r3, r30 -/* 80112074 38 80 00 19 */ li r4, 0x19 -/* 80112078 3C A0 80 39 */ lis r5, m__18daAlinkHIO_move_c0@ha /* 0x8038D6BC@ha */ -/* 8011207C 38 A5 D6 BC */ addi r5, r5, m__18daAlinkHIO_move_c0@l /* 0x8038D6BC@l */ -/* 80112080 C0 25 00 1C */ lfs f1, 0x1c(r5) -/* 80112084 C0 42 92 C4 */ lfs f2, lit_6109(r2) -/* 80112088 4B F9 AF 59 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -lbl_8011208C: -/* 8011208C 7F C3 F3 78 */ mr r3, r30 -/* 80112090 38 80 00 00 */ li r4, 0 -/* 80112094 4B FA 12 05 */ bl setBStatus__9daAlink_cFUc -/* 80112098 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011209C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801120A0 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 801120A4 64 00 04 00 */ oris r0, r0, 0x400 -/* 801120A8 90 03 5F 1C */ stw r0, 0x5f1c(r3) -/* 801120AC 38 60 00 01 */ li r3, 1 -/* 801120B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801120B4 83 C1 00 08 */ lwz r30, 8(r1) -/* 801120B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801120BC 7C 08 03 A6 */ mtlr r0 -/* 801120C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801120C4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoLargeDamageWall__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoLargeDamageWall__9daAlink_cFv.s deleted file mode 100644 index 0f61822279f..00000000000 --- a/asm/d/a/d_a_alink/procCoLargeDamageWall__9daAlink_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_800DAC28: -/* 800DAC28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DAC2C 7C 08 02 A6 */ mflr r0 -/* 800DAC30 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DAC34 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DAC38 7C 7F 1B 78 */ mr r31, r3 -/* 800DAC3C 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800DAC40 48 08 38 8D */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800DAC44 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800DAC48 41 82 00 24 */ beq lbl_800DAC6C -/* 800DAC4C 7F E3 FB 78 */ mr r3, r31 -/* 800DAC50 80 9F 31 98 */ lwz r4, 0x3198(r31) -/* 800DAC54 A8 BF 30 08 */ lha r5, 0x3008(r31) -/* 800DAC58 A8 DF 30 80 */ lha r6, 0x3080(r31) -/* 800DAC5C A8 FF 30 82 */ lha r7, 0x3082(r31) -/* 800DAC60 39 00 00 00 */ li r8, 0 -/* 800DAC64 39 20 00 00 */ li r9, 0 -/* 800DAC68 4B FF EA 75 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi -lbl_800DAC6C: -/* 800DAC6C 38 60 00 01 */ li r3, 1 -/* 800DAC70 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DAC74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DAC78 7C 08 03 A6 */ mtlr r0 -/* 800DAC7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DAC80 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoLavaReturn__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoLavaReturn__9daAlink_cFv.s deleted file mode 100644 index 7109fa3bff6..00000000000 --- a/asm/d/a/d_a_alink/procCoLavaReturn__9daAlink_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_800DC214: -/* 800DC214 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DC218 7C 08 02 A6 */ mflr r0 -/* 800DC21C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DC220 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DC224 7C 7F 1B 78 */ mr r31, r3 -/* 800DC228 38 7F 2B A8 */ addi r3, r31, 0x2ba8 -/* 800DC22C C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800DC230 C0 42 93 44 */ lfs f2, lit_7977(r2) -/* 800DC234 48 19 45 0D */ bl cLib_chaseF__FPfff -/* 800DC238 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800DC23C 48 08 22 91 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800DC240 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800DC244 41 82 00 1C */ beq lbl_800DC260 -/* 800DC248 7F E3 FB 78 */ mr r3, r31 -/* 800DC24C 80 9F 32 CC */ lwz r4, 0x32cc(r31) -/* 800DC250 38 A0 00 C9 */ li r5, 0xc9 -/* 800DC254 80 DF 31 98 */ lwz r6, 0x3198(r31) -/* 800DC258 38 E0 00 01 */ li r7, 1 -/* 800DC25C 4B FE 1D 05 */ bl startRestartRoom__9daAlink_cFUliii -lbl_800DC260: -/* 800DC260 38 60 00 01 */ li r3, 1 -/* 800DC264 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DC268 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DC26C 7C 08 03 A6 */ mtlr r0 -/* 800DC270 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DC274 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoMetamorphoseOnlyInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoMetamorphoseOnlyInit__9daAlink_cFv.s deleted file mode 100644 index 779e6fd2eef..00000000000 --- a/asm/d/a/d_a_alink/procCoMetamorphoseOnlyInit__9daAlink_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_800C82E8: -/* 800C82E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C82EC 7C 08 02 A6 */ mflr r0 -/* 800C82F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C82F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C82F8 7C 7F 1B 78 */ mr r31, r3 -/* 800C82FC 38 80 01 4E */ li r4, 0x14e -/* 800C8300 4B FF AA A5 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C8304 2C 03 00 00 */ cmpwi r3, 0 -/* 800C8308 40 82 00 0C */ bne lbl_800C8314 -/* 800C830C 38 60 00 01 */ li r3, 1 -/* 800C8310 48 00 00 7C */ b lbl_800C838C -lbl_800C8314: -/* 800C8314 7F E3 FB 78 */ mr r3, r31 -/* 800C8318 38 80 00 00 */ li r4, 0 -/* 800C831C 38 A0 00 01 */ li r5, 1 -/* 800C8320 4B FF 8F BD */ bl deleteEquipItem__9daAlink_cFii -/* 800C8324 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800C8328 54 03 01 8D */ rlwinm. r3, r0, 0, 6, 6 -/* 800C832C 41 82 00 10 */ beq lbl_800C833C -/* 800C8330 80 1F 06 14 */ lwz r0, 0x614(r31) -/* 800C8334 28 00 00 46 */ cmplwi r0, 0x46 -/* 800C8338 41 82 00 18 */ beq lbl_800C8350 -lbl_800C833C: -/* 800C833C 28 03 00 00 */ cmplwi r3, 0 -/* 800C8340 40 82 00 20 */ bne lbl_800C8360 -/* 800C8344 80 1F 06 14 */ lwz r0, 0x614(r31) -/* 800C8348 28 00 00 47 */ cmplwi r0, 0x47 -/* 800C834C 40 82 00 14 */ bne lbl_800C8360 -lbl_800C8350: -/* 800C8350 38 00 00 01 */ li r0, 1 -/* 800C8354 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800C8358 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 800C835C 48 00 00 10 */ b lbl_800C836C -lbl_800C8360: -/* 800C8360 38 00 00 00 */ li r0, 0 -/* 800C8364 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800C8368 B0 1F 30 0E */ sth r0, 0x300e(r31) -lbl_800C836C: -/* 800C836C C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800C8370 D0 3F 33 98 */ stfs f1, 0x3398(r31) -/* 800C8374 D0 3F 04 FC */ stfs f1, 0x4fc(r31) -/* 800C8378 7F E3 FB 78 */ mr r3, r31 -/* 800C837C C0 5F 05 34 */ lfs f2, 0x534(r31) -/* 800C8380 38 80 00 00 */ li r4, 0 -/* 800C8384 4B FF 33 ED */ bl setSpecialGravity__9daAlink_cFffi -/* 800C8388 38 60 00 01 */ li r3, 1 -lbl_800C838C: -/* 800C838C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C8390 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C8394 7C 08 03 A6 */ mtlr r0 -/* 800C8398 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C839C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoMetamorphoseOnly__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoMetamorphoseOnly__9daAlink_cFv.s deleted file mode 100644 index 85454cfc631..00000000000 --- a/asm/d/a/d_a_alink/procCoMetamorphoseOnly__9daAlink_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_800C83A0: -/* 800C83A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C83A4 7C 08 02 A6 */ mflr r0 -/* 800C83A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C83AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C83B0 7C 7F 1B 78 */ mr r31, r3 -/* 800C83B4 A8 03 30 0C */ lha r0, 0x300c(r3) -/* 800C83B8 2C 00 00 00 */ cmpwi r0, 0 -/* 800C83BC 40 82 00 18 */ bne lbl_800C83D4 -/* 800C83C0 38 00 00 04 */ li r0, 4 -/* 800C83C4 98 1F 2F BF */ stb r0, 0x2fbf(r31) -/* 800C83C8 38 00 00 01 */ li r0, 1 -/* 800C83CC B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800C83D0 48 00 00 78 */ b lbl_800C8448 -lbl_800C83D4: -/* 800C83D4 88 1F 2F BF */ lbz r0, 0x2fbf(r31) -/* 800C83D8 28 00 00 00 */ cmplwi r0, 0 -/* 800C83DC 40 82 00 6C */ bne lbl_800C8448 -/* 800C83E0 A8 1F 30 0E */ lha r0, 0x300e(r31) -/* 800C83E4 2C 00 00 00 */ cmpwi r0, 0 -/* 800C83E8 40 82 00 4C */ bne lbl_800C8434 -/* 800C83EC 38 00 00 01 */ li r0, 1 -/* 800C83F0 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 800C83F4 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800C83F8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800C83FC 41 82 00 20 */ beq lbl_800C841C -/* 800C8400 38 80 00 00 */ li r4, 0 -/* 800C8404 3C A0 80 39 */ lis r5, m__23daAlinkHIO_wlMoveNoP_c0@ha /* 0x8038EF28@ha */ -/* 800C8408 38 A5 EF 28 */ addi r5, r5, m__23daAlinkHIO_wlMoveNoP_c0@l /* 0x8038EF28@l */ -/* 800C840C C0 25 00 14 */ lfs f1, 0x14(r5) -/* 800C8410 C0 42 92 BC */ lfs f2, lit_6041(r2) -/* 800C8414 48 06 12 C5 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff -/* 800C8418 48 00 00 1C */ b lbl_800C8434 -lbl_800C841C: -/* 800C841C 38 80 00 19 */ li r4, 0x19 -/* 800C8420 3C A0 80 39 */ lis r5, m__18daAlinkHIO_move_c0@ha /* 0x8038D6BC@ha */ -/* 800C8424 38 A5 D6 BC */ addi r5, r5, m__18daAlinkHIO_move_c0@l /* 0x8038D6BC@l */ -/* 800C8428 C0 25 00 1C */ lfs f1, 0x1c(r5) -/* 800C842C C0 42 92 BC */ lfs f2, lit_6041(r2) -/* 800C8430 4B FE 4B B1 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -lbl_800C8434: -/* 800C8434 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800C8438 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800C843C 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800C8440 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 800C8444 4B F7 FD 39 */ bl cutEnd__16dEvent_manager_cFi -lbl_800C8448: -/* 800C8448 38 60 00 01 */ li r3, 1 -/* 800C844C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C8450 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C8454 7C 08 03 A6 */ mtlr r0 -/* 800C8458 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C845C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoPeepSubjectivityInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoPeepSubjectivityInit__9daAlink_cFv.s deleted file mode 100644 index fe54efc3eeb..00000000000 --- a/asm/d/a/d_a_alink/procCoPeepSubjectivityInit__9daAlink_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_800CF100: -/* 800CF100 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800CF104 7C 08 02 A6 */ mflr r0 -/* 800CF108 90 01 00 14 */ stw r0, 0x14(r1) -/* 800CF10C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800CF110 7C 7F 1B 78 */ mr r31, r3 -/* 800CF114 38 80 01 40 */ li r4, 0x140 -/* 800CF118 4B FF 2E 55 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800CF11C C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800CF120 D0 3F 33 98 */ stfs f1, 0x3398(r31) -/* 800CF124 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800CF128 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800CF12C 41 82 00 18 */ beq lbl_800CF144 -/* 800CF130 7F E3 FB 78 */ mr r3, r31 -/* 800CF134 38 80 00 00 */ li r4, 0 -/* 800CF138 C0 42 92 C4 */ lfs f2, lit_6109(r2) -/* 800CF13C 48 05 A5 9D */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff -/* 800CF140 48 00 00 14 */ b lbl_800CF154 -lbl_800CF144: -/* 800CF144 7F E3 FB 78 */ mr r3, r31 -/* 800CF148 38 80 00 19 */ li r4, 0x19 -/* 800CF14C C0 42 92 C4 */ lfs f2, lit_6109(r2) -/* 800CF150 4B FD DE 91 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -lbl_800CF154: -/* 800CF154 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800CF158 64 00 08 00 */ oris r0, r0, 0x800 -/* 800CF15C 90 1F 05 70 */ stw r0, 0x570(r31) -/* 800CF160 7F E3 FB 78 */ mr r3, r31 -/* 800CF164 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800CF168 C0 5F 05 34 */ lfs f2, 0x534(r31) -/* 800CF16C 38 80 00 00 */ li r4, 0 -/* 800CF170 4B FE C6 01 */ bl setSpecialGravity__9daAlink_cFffi -/* 800CF174 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800CF178 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 800CF17C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800CF180 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800CF184 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 800CF188 60 00 20 00 */ ori r0, r0, 0x2000 -/* 800CF18C 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 800CF190 C0 02 92 C8 */ lfs f0, lit_6183(r2) -/* 800CF194 D0 1F 34 78 */ stfs f0, 0x3478(r31) -/* 800CF198 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800CF19C B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800CF1A0 38 60 00 01 */ li r3, 1 -/* 800CF1A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800CF1A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800CF1AC 7C 08 03 A6 */ mtlr r0 -/* 800CF1B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800CF1B4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoPeepSubjectivity__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoPeepSubjectivity__9daAlink_cFv.s deleted file mode 100644 index 23f10a740a3..00000000000 --- a/asm/d/a/d_a_alink/procCoPeepSubjectivity__9daAlink_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_800CF1B8: -/* 800CF1B8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800CF1BC 7C 08 02 A6 */ mflr r0 -/* 800CF1C0 90 01 00 24 */ stw r0, 0x24(r1) -/* 800CF1C4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 800CF1C8 7C 7F 1B 78 */ mr r31, r3 -/* 800CF1CC 88 03 2F 8D */ lbz r0, 0x2f8d(r3) -/* 800CF1D0 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 800CF1D4 40 82 00 14 */ bne lbl_800CF1E8 -/* 800CF1D8 38 80 00 08 */ li r4, 8 -/* 800CF1DC 4B FE 33 F1 */ bl itemTriggerCheck__9daAlink_cFUc -/* 800CF1E0 2C 03 00 00 */ cmpwi r3, 0 -/* 800CF1E4 41 82 00 60 */ beq lbl_800CF244 -lbl_800CF1E8: -/* 800CF1E8 38 00 00 00 */ li r0, 0 -/* 800CF1EC 90 01 00 08 */ stw r0, 8(r1) -/* 800CF1F0 3C 60 80 0D */ lis r3, daAlink_searchPeepObj__FP10fopAc_ac_cPv@ha /* 0x800CED48@ha */ -/* 800CF1F4 38 63 ED 48 */ addi r3, r3, daAlink_searchPeepObj__FP10fopAc_ac_cPv@l /* 0x800CED48@l */ -/* 800CF1F8 38 81 00 08 */ addi r4, r1, 8 -/* 800CF1FC 4B F4 A5 C1 */ bl fopAcIt_Executor__FPFPvPv_iPv -/* 800CF200 80 61 00 08 */ lwz r3, 8(r1) -/* 800CF204 28 03 00 00 */ cmplwi r3, 0 -/* 800CF208 41 82 00 0C */ beq lbl_800CF214 -/* 800CF20C 88 03 05 6D */ lbz r0, 0x56d(r3) -/* 800CF210 98 1F 2F AD */ stb r0, 0x2fad(r31) -lbl_800CF214: -/* 800CF214 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800CF218 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800CF21C 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 800CF220 7F E4 FB 78 */ mr r4, r31 -/* 800CF224 38 A0 00 00 */ li r5, 0 -/* 800CF228 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800CF22C 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800CF230 4B F7 3F 3D */ bl compulsory__14dEvt_control_cFPvPCcUs -/* 800CF234 2C 03 00 00 */ cmpwi r3, 0 -/* 800CF238 41 82 00 0C */ beq lbl_800CF244 -/* 800CF23C 7F E3 FB 78 */ mr r3, r31 -/* 800CF240 4B FE EB 31 */ bl startPeepChange__9daAlink_cFv -lbl_800CF244: -/* 800CF244 38 60 00 01 */ li r3, 1 -/* 800CF248 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 800CF24C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800CF250 7C 08 03 A6 */ mtlr r0 -/* 800CF254 38 21 00 20 */ addi r1, r1, 0x20 -/* 800CF258 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoPolyDamageInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoPolyDamageInit__9daAlink_cFv.s deleted file mode 100644 index 5d4a642f469..00000000000 --- a/asm/d/a/d_a_alink/procCoPolyDamageInit__9daAlink_cFv.s +++ /dev/null @@ -1,73 +0,0 @@ -lbl_800DAC84: -/* 800DAC84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DAC88 7C 08 02 A6 */ mflr r0 -/* 800DAC8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DAC90 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DAC94 7C 7F 1B 78 */ mr r31, r3 -/* 800DAC98 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020014@ha */ -/* 800DAC9C 38 84 00 14 */ addi r4, r4, 0x0014 /* 0x00020014@l */ -/* 800DACA0 81 83 06 28 */ lwz r12, 0x628(r3) -/* 800DACA4 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 800DACA8 7D 89 03 A6 */ mtctr r12 -/* 800DACAC 4E 80 04 21 */ bctrl -/* 800DACB0 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800DACB4 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800DACB8 40 82 00 20 */ bne lbl_800DACD8 -/* 800DACBC 7F E3 FB 78 */ mr r3, r31 -/* 800DACC0 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010002@ha */ -/* 800DACC4 38 84 00 02 */ addi r4, r4, 0x0002 /* 0x00010002@l */ -/* 800DACC8 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800DACCC 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800DACD0 7D 89 03 A6 */ mtctr r12 -/* 800DACD4 4E 80 04 21 */ bctrl -lbl_800DACD8: -/* 800DACD8 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 800DACDC 28 00 01 9C */ cmplwi r0, 0x19c -/* 800DACE0 40 82 00 0C */ bne lbl_800DACEC -/* 800DACE4 38 60 00 01 */ li r3, 1 -/* 800DACE8 48 00 00 94 */ b lbl_800DAD7C -lbl_800DACEC: -/* 800DACEC 7F E3 FB 78 */ mr r3, r31 -/* 800DACF0 38 80 01 41 */ li r4, 0x141 -/* 800DACF4 4B FE 72 79 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800DACF8 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800DACFC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800DAD00 41 82 00 4C */ beq lbl_800DAD4C -/* 800DAD04 7F E3 FB 78 */ mr r3, r31 -/* 800DAD08 38 80 00 16 */ li r4, 0x16 -/* 800DAD0C 3C A0 80 39 */ lis r5, m__22daAlinkHIO_wlDamage_c0@ha /* 0x8038F3C4@ha */ -/* 800DAD10 38 A5 F3 C4 */ addi r5, r5, m__22daAlinkHIO_wlDamage_c0@l /* 0x8038F3C4@l */ -/* 800DAD14 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800DAD18 48 04 EB 31 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 800DAD1C 7F E3 FB 78 */ mr r3, r31 -/* 800DAD20 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010034@ha */ -/* 800DAD24 38 84 00 34 */ addi r4, r4, 0x0034 /* 0x00010034@l */ -/* 800DAD28 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800DAD2C 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800DAD30 7D 89 03 A6 */ mtctr r12 -/* 800DAD34 4E 80 04 21 */ bctrl -/* 800DAD38 3C 60 80 39 */ lis r3, m__22daAlinkHIO_wlDamage_c0@ha /* 0x8038F3C4@ha */ -/* 800DAD3C 38 63 F3 C4 */ addi r3, r3, m__22daAlinkHIO_wlDamage_c0@l /* 0x8038F3C4@l */ -/* 800DAD40 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 800DAD44 D0 1F 34 78 */ stfs f0, 0x3478(r31) -/* 800DAD48 48 00 00 28 */ b lbl_800DAD70 -lbl_800DAD4C: -/* 800DAD4C 7F E3 FB 78 */ mr r3, r31 -/* 800DAD50 38 80 00 8B */ li r4, 0x8b -/* 800DAD54 3C A0 80 39 */ lis r5, m__20daAlinkHIO_damage_c0@ha /* 0x8038E54C@ha */ -/* 800DAD58 38 A5 E5 4C */ addi r5, r5, m__20daAlinkHIO_damage_c0@l /* 0x8038E54C@l */ -/* 800DAD5C 4B FD 23 99 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800DAD60 3C 60 80 39 */ lis r3, m__20daAlinkHIO_damage_c0@ha /* 0x8038E54C@ha */ -/* 800DAD64 38 63 E5 4C */ addi r3, r3, m__20daAlinkHIO_damage_c0@l /* 0x8038E54C@l */ -/* 800DAD68 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 800DAD6C D0 1F 34 78 */ stfs f0, 0x3478(r31) -lbl_800DAD70: -/* 800DAD70 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800DAD74 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800DAD78 38 60 00 01 */ li r3, 1 -lbl_800DAD7C: -/* 800DAD7C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DAD80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DAD84 7C 08 03 A6 */ mtlr r0 -/* 800DAD88 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DAD8C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoPolyDamage__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoPolyDamage__9daAlink_cFv.s deleted file mode 100644 index f15f36ff17e..00000000000 --- a/asm/d/a/d_a_alink/procCoPolyDamage__9daAlink_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_800DAD90: -/* 800DAD90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DAD94 7C 08 02 A6 */ mflr r0 -/* 800DAD98 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DAD9C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DADA0 7C 7F 1B 78 */ mr r31, r3 -/* 800DADA4 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800DADA8 48 08 37 25 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800DADAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800DADB0 41 82 00 14 */ beq lbl_800DADC4 -/* 800DADB4 7F E3 FB 78 */ mr r3, r31 -/* 800DADB8 38 80 00 00 */ li r4, 0 -/* 800DADBC 4B FD F2 E1 */ bl commonCheckNextAction__9daAlink_cFi -/* 800DADC0 48 00 00 38 */ b lbl_800DADF8 -lbl_800DADC4: -/* 800DADC4 C0 3F 1F E0 */ lfs f1, 0x1fe0(r31) -/* 800DADC8 C0 1F 34 78 */ lfs f0, 0x3478(r31) -/* 800DADCC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800DADD0 40 81 00 28 */ ble lbl_800DADF8 -/* 800DADD4 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800DADD8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800DADDC 40 82 00 10 */ bne lbl_800DADEC -/* 800DADE0 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800DADE4 60 00 00 04 */ ori r0, r0, 4 -/* 800DADE8 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_800DADEC: -/* 800DADEC 7F E3 FB 78 */ mr r3, r31 -/* 800DADF0 38 80 00 01 */ li r4, 1 -/* 800DADF4 4B FD F2 A9 */ bl commonCheckNextAction__9daAlink_cFi -lbl_800DADF8: -/* 800DADF8 38 60 00 01 */ li r3, 1 -/* 800DADFC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DAE00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DAE04 7C 08 03 A6 */ mtlr r0 -/* 800DAE08 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DAE0C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoSandWallHitInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoSandWallHitInit__9daAlink_cFv.s deleted file mode 100644 index ce3a24734ee..00000000000 --- a/asm/d/a/d_a_alink/procCoSandWallHitInit__9daAlink_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_800DBE00: -/* 800DBE00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DBE04 7C 08 02 A6 */ mflr r0 -/* 800DBE08 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DBE0C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DBE10 7C 7F 1B 78 */ mr r31, r3 -/* 800DBE14 38 80 01 54 */ li r4, 0x154 -/* 800DBE18 4B FE 6F 8D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800DBE1C 2C 03 00 00 */ cmpwi r3, 0 -/* 800DBE20 40 82 00 0C */ bne lbl_800DBE2C -/* 800DBE24 38 60 00 01 */ li r3, 1 -/* 800DBE28 48 00 00 38 */ b lbl_800DBE60 -lbl_800DBE2C: -/* 800DBE2C 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800DBE30 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800DBE34 41 82 00 14 */ beq lbl_800DBE48 -/* 800DBE38 7F E3 FB 78 */ mr r3, r31 -/* 800DBE3C 38 80 00 71 */ li r4, 0x71 -/* 800DBE40 48 04 D8 39 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM -/* 800DBE44 48 00 00 10 */ b lbl_800DBE54 -lbl_800DBE48: -/* 800DBE48 7F E3 FB 78 */ mr r3, r31 -/* 800DBE4C 38 80 00 FF */ li r4, 0xff -/* 800DBE50 4B FD 11 31 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -lbl_800DBE54: -/* 800DBE54 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800DBE58 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800DBE5C 38 60 00 01 */ li r3, 1 -lbl_800DBE60: -/* 800DBE60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DBE64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DBE68 7C 08 03 A6 */ mtlr r0 -/* 800DBE6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DBE70 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoSandWallHit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoSandWallHit__9daAlink_cFv.s deleted file mode 100644 index e5bbc53dea1..00000000000 --- a/asm/d/a/d_a_alink/procCoSandWallHit__9daAlink_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_800DBE74: -/* 800DBE74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DBE78 7C 08 02 A6 */ mflr r0 -/* 800DBE7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DBE80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DBE84 7C 7F 1B 78 */ mr r31, r3 -/* 800DBE88 80 03 19 9C */ lwz r0, 0x199c(r3) -/* 800DBE8C 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800DBE90 41 82 00 10 */ beq lbl_800DBEA0 -/* 800DBE94 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800DBE98 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d -/* 800DBE9C 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_800DBEA0: -/* 800DBEA0 80 1F 05 8C */ lwz r0, 0x58c(r31) -/* 800DBEA4 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 -/* 800DBEA8 40 82 00 18 */ bne lbl_800DBEC0 -/* 800DBEAC 7F E3 FB 78 */ mr r3, r31 -/* 800DBEB0 38 80 00 01 */ li r4, 1 -/* 800DBEB4 4B FF B5 C5 */ bl setDamagePointNormal__9daAlink_cFi -/* 800DBEB8 7F E3 FB 78 */ mr r3, r31 -/* 800DBEBC 4B FF ED C9 */ bl procCoPolyDamageInit__9daAlink_cFv -lbl_800DBEC0: -/* 800DBEC0 38 60 00 01 */ li r3, 1 -/* 800DBEC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DBEC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DBECC 7C 08 03 A6 */ mtlr r0 -/* 800DBED0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DBED4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoSubjectivityInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoSubjectivityInit__9daAlink_cFv.s deleted file mode 100644 index 31f9ad7b811..00000000000 --- a/asm/d/a/d_a_alink/procCoSubjectivityInit__9daAlink_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_800CED84: -/* 800CED84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800CED88 7C 08 02 A6 */ mflr r0 -/* 800CED8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800CED90 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800CED94 7C 7F 1B 78 */ mr r31, r3 -/* 800CED98 38 80 01 3E */ li r4, 0x13e -/* 800CED9C 4B FF 31 D1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800CEDA0 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800CEDA4 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800CEDA8 7F E3 FB 78 */ mr r3, r31 -/* 800CEDAC 4B FF FD 49 */ bl setSubjectMode__9daAlink_cFv -/* 800CEDB0 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800CEDB4 B0 1F 2F E6 */ sth r0, 0x2fe6(r31) -/* 800CEDB8 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800CEDBC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800CEDC0 41 82 00 1C */ beq lbl_800CEDDC -/* 800CEDC4 7F E3 FB 78 */ mr r3, r31 -/* 800CEDC8 38 80 00 00 */ li r4, 0 -/* 800CEDCC C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800CEDD0 C0 42 92 C4 */ lfs f2, lit_6109(r2) -/* 800CEDD4 48 05 A9 05 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff -/* 800CEDD8 48 00 00 18 */ b lbl_800CEDF0 -lbl_800CEDDC: -/* 800CEDDC 7F E3 FB 78 */ mr r3, r31 -/* 800CEDE0 38 80 00 19 */ li r4, 0x19 -/* 800CEDE4 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800CEDE8 C0 42 92 C4 */ lfs f2, lit_6109(r2) -/* 800CEDEC 4B FD E1 F5 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -lbl_800CEDF0: -/* 800CEDF0 38 60 00 01 */ li r3, 1 -/* 800CEDF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800CEDF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800CEDFC 7C 08 03 A6 */ mtlr r0 -/* 800CEE00 38 21 00 10 */ addi r1, r1, 0x10 -/* 800CEE04 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoSwimFreezeReturnInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoSwimFreezeReturnInit__9daAlink_cFv.s deleted file mode 100644 index 08bd57a9591..00000000000 --- a/asm/d/a/d_a_alink/procCoSwimFreezeReturnInit__9daAlink_cFv.s +++ /dev/null @@ -1,136 +0,0 @@ -lbl_800DC278: -/* 800DC278 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 800DC27C 7C 08 02 A6 */ mflr r0 -/* 800DC280 90 01 00 34 */ stw r0, 0x34(r1) -/* 800DC284 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 800DC288 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 800DC28C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DC290 48 28 5F 49 */ bl _savegpr_28 -/* 800DC294 7C 7F 1B 78 */ mr r31, r3 -/* 800DC298 3C 60 80 39 */ lis r3, lit_3757@ha /* 0x8038D658@ha */ -/* 800DC29C 3B C3 D6 58 */ addi r30, r3, lit_3757@l /* 0x8038D658@l */ -/* 800DC2A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800DC2A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800DC2A8 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 800DC2AC 7F E4 FB 78 */ mr r4, r31 -/* 800DC2B0 38 A0 00 00 */ li r5, 0 -/* 800DC2B4 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800DC2B8 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800DC2BC 4B F6 6E B1 */ bl compulsory__14dEvt_control_cFPvPCcUs -/* 800DC2C0 2C 03 00 00 */ cmpwi r3, 0 -/* 800DC2C4 40 82 00 0C */ bne lbl_800DC2D0 -/* 800DC2C8 38 60 00 00 */ li r3, 0 -/* 800DC2CC 48 00 01 88 */ b lbl_800DC454 -lbl_800DC2D0: -/* 800DC2D0 38 00 00 05 */ li r0, 5 -/* 800DC2D4 B0 1F 06 04 */ sth r0, 0x604(r31) -/* 800DC2D8 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800DC2DC 54 1D 03 5A */ rlwinm r29, r0, 0, 0xd, 0xd -/* 800DC2E0 7F E3 FB 78 */ mr r3, r31 -/* 800DC2E4 38 80 01 56 */ li r4, 0x156 -/* 800DC2E8 4B FE 6A BD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800DC2EC 2C 03 00 00 */ cmpwi r3, 0 -/* 800DC2F0 40 82 00 0C */ bne lbl_800DC2FC -/* 800DC2F4 38 60 00 01 */ li r3, 1 -/* 800DC2F8 48 00 01 5C */ b lbl_800DC454 -lbl_800DC2FC: -/* 800DC2FC 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800DC300 60 00 01 00 */ ori r0, r0, 0x100 -/* 800DC304 90 1F 05 70 */ stw r0, 0x570(r31) -/* 800DC308 80 7F 20 60 */ lwz r3, 0x2060(r31) -/* 800DC30C 83 83 00 1C */ lwz r28, 0x1c(r3) -/* 800DC310 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800DC314 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800DC318 41 82 00 4C */ beq lbl_800DC364 -/* 800DC31C 7F E3 FB 78 */ mr r3, r31 -/* 800DC320 38 80 00 37 */ li r4, 0x37 -/* 800DC324 38 BE 1B E4 */ addi r5, r30, 0x1be4 -/* 800DC328 C0 25 00 5C */ lfs f1, 0x5c(r5) -/* 800DC32C C0 42 93 30 */ lfs f2, lit_7625(r2) -/* 800DC330 48 04 D3 A9 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff -/* 800DC334 38 00 00 03 */ li r0, 3 -/* 800DC338 B0 1F 1F D8 */ sth r0, 0x1fd8(r31) -/* 800DC33C 38 00 00 00 */ li r0, 0 -/* 800DC340 98 1F 1F D4 */ stb r0, 0x1fd4(r31) -/* 800DC344 7F E3 FB 78 */ mr r3, r31 -/* 800DC348 38 80 00 90 */ li r4, 0x90 -/* 800DC34C 4B FD 35 55 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -/* 800DC350 38 00 00 01 */ li r0, 1 -/* 800DC354 98 1F 2F 9B */ stb r0, 0x2f9b(r31) -/* 800DC358 38 7E 22 5C */ addi r3, r30, 0x225c -/* 800DC35C C3 E3 00 48 */ lfs f31, 0x48(r3) -/* 800DC360 48 00 00 48 */ b lbl_800DC3A8 -lbl_800DC364: -/* 800DC364 7F E3 FB 78 */ mr r3, r31 -/* 800DC368 38 80 00 CE */ li r4, 0xce -/* 800DC36C 38 BE 0B F4 */ addi r5, r30, 0xbf4 -/* 800DC370 C0 25 00 60 */ lfs f1, 0x60(r5) -/* 800DC374 C0 42 92 C0 */ lfs f2, lit_6108(r2) -/* 800DC378 38 A0 00 05 */ li r5, 5 -/* 800DC37C C0 62 93 30 */ lfs f3, lit_7625(r2) -/* 800DC380 4B FD 0C 8D */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -/* 800DC384 7F E3 FB 78 */ mr r3, r31 -/* 800DC388 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010053@ha */ -/* 800DC38C 38 84 00 53 */ addi r4, r4, 0x0053 /* 0x00010053@l */ -/* 800DC390 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800DC394 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800DC398 7D 89 03 A6 */ mtctr r12 -/* 800DC39C 4E 80 04 21 */ bctrl -/* 800DC3A0 38 7E 16 D4 */ addi r3, r30, 0x16d4 -/* 800DC3A4 C3 E3 00 60 */ lfs f31, 0x60(r3) -lbl_800DC3A8: -/* 800DC3A8 7F E3 FB 78 */ mr r3, r31 -/* 800DC3AC 3C 80 00 02 */ lis r4, 0x0002 /* 0x0002004C@ha */ -/* 800DC3B0 38 84 00 4C */ addi r4, r4, 0x004C /* 0x0002004C@l */ -/* 800DC3B4 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800DC3B8 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 800DC3BC 7D 89 03 A6 */ mtctr r12 -/* 800DC3C0 4E 80 04 21 */ bctrl -/* 800DC3C4 28 1D 00 00 */ cmplwi r29, 0 -/* 800DC3C8 40 82 00 18 */ bne lbl_800DC3E0 -/* 800DC3CC C0 1C 00 18 */ lfs f0, 0x18(r28) -/* 800DC3D0 EC 00 F8 28 */ fsubs f0, f0, f31 -/* 800DC3D4 D0 1C 00 18 */ stfs f0, 0x18(r28) -/* 800DC3D8 C0 1F 33 B4 */ lfs f0, 0x33b4(r31) -/* 800DC3DC D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -lbl_800DC3E0: -/* 800DC3E0 38 00 00 00 */ li r0, 0 -/* 800DC3E4 B0 1F 30 80 */ sth r0, 0x3080(r31) -/* 800DC3E8 B0 1F 05 6C */ sth r0, 0x56c(r31) -/* 800DC3EC C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800DC3F0 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800DC3F4 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800DC3F8 64 00 40 00 */ oris r0, r0, 0x4000 -/* 800DC3FC 90 1F 05 74 */ stw r0, 0x574(r31) -/* 800DC400 38 00 00 01 */ li r0, 1 -/* 800DC404 90 1F 31 94 */ stw r0, 0x3194(r31) -/* 800DC408 28 1F 00 00 */ cmplwi r31, 0 -/* 800DC40C 41 82 00 0C */ beq lbl_800DC418 -/* 800DC410 83 9F 00 04 */ lwz r28, 4(r31) -/* 800DC414 48 00 00 08 */ b lbl_800DC41C -lbl_800DC418: -/* 800DC418 3B 80 FF FF */ li r28, -1 -lbl_800DC41C: -/* 800DC41C 48 0A 52 25 */ bl dCam_getBody__Fv -/* 800DC420 38 80 00 09 */ li r4, 9 -/* 800DC424 7F 85 E3 78 */ mr r5, r28 -/* 800DC428 3C C0 80 39 */ lis r6, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 800DC42C 38 C6 20 94 */ addi r6, r6, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 800DC430 38 C6 00 43 */ addi r6, r6, 0x43 -/* 800DC434 38 E0 00 01 */ li r7, 1 -/* 800DC438 39 1F 31 94 */ addi r8, r31, 0x3194 -/* 800DC43C 39 20 00 00 */ li r9, 0 -/* 800DC440 4C C6 31 82 */ crclr 6 -/* 800DC444 4B FA C6 39 */ bl StartEventCamera__9dCamera_cFiie -/* 800DC448 38 00 00 2D */ li r0, 0x2d -/* 800DC44C B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800DC450 38 60 00 01 */ li r3, 1 -lbl_800DC454: -/* 800DC454 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 800DC458 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 800DC45C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DC460 48 28 5D C5 */ bl _restgpr_28 -/* 800DC464 80 01 00 34 */ lwz r0, 0x34(r1) -/* 800DC468 7C 08 03 A6 */ mtlr r0 -/* 800DC46C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800DC470 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoSwimSubjectivityInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoSwimSubjectivityInit__9daAlink_cFv.s deleted file mode 100644 index b77d98cb147..00000000000 --- a/asm/d/a/d_a_alink/procCoSwimSubjectivityInit__9daAlink_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_800CEF70: -/* 800CEF70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800CEF74 7C 08 02 A6 */ mflr r0 -/* 800CEF78 90 01 00 14 */ stw r0, 0x14(r1) -/* 800CEF7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800CEF80 7C 7F 1B 78 */ mr r31, r3 -/* 800CEF84 38 80 01 3F */ li r4, 0x13f -/* 800CEF88 4B FF 2F E5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800CEF8C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800CEF90 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800CEF94 7F E3 FB 78 */ mr r3, r31 -/* 800CEF98 4B FF FB 5D */ bl setSubjectMode__9daAlink_cFv -/* 800CEF9C 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800CEFA0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800CEFA4 41 82 00 24 */ beq lbl_800CEFC8 -/* 800CEFA8 7F E3 FB 78 */ mr r3, r31 -/* 800CEFAC 38 80 00 37 */ li r4, 0x37 -/* 800CEFB0 3C A0 80 39 */ lis r5, m__20daAlinkHIO_wlSwim_c0@ha /* 0x8038F8B4@ha */ -/* 800CEFB4 38 A5 F8 B4 */ addi r5, r5, m__20daAlinkHIO_wlSwim_c0@l /* 0x8038F8B4@l */ -/* 800CEFB8 C0 25 00 88 */ lfs f1, 0x88(r5) -/* 800CEFBC C0 45 00 68 */ lfs f2, 0x68(r5) -/* 800CEFC0 48 05 A7 19 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff -/* 800CEFC4 48 00 00 20 */ b lbl_800CEFE4 -lbl_800CEFC8: -/* 800CEFC8 7F E3 FB 78 */ mr r3, r31 -/* 800CEFCC 38 80 00 14 */ li r4, 0x14 -/* 800CEFD0 3C A0 80 39 */ lis r5, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 800CEFD4 38 A5 ED 2C */ addi r5, r5, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 800CEFD8 C0 25 00 90 */ lfs f1, 0x90(r5) -/* 800CEFDC C0 45 00 94 */ lfs f2, 0x94(r5) -/* 800CEFE0 4B FD E0 01 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -lbl_800CEFE4: -/* 800CEFE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800CEFE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800CEFEC 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 800CEFF0 64 00 00 10 */ oris r0, r0, 0x10 -/* 800CEFF4 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 800CEFF8 38 00 00 00 */ li r0, 0 -/* 800CEFFC B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800CF000 38 60 00 01 */ li r3, 1 -/* 800CF004 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800CF008 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800CF00C 7C 08 03 A6 */ mtlr r0 -/* 800CF010 38 21 00 10 */ addi r1, r1, 0x10 -/* 800CF014 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCopyRodMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCopyRodMoveInit__9daAlink_cFv.s deleted file mode 100644 index 39f36e339a4..00000000000 --- a/asm/d/a/d_a_alink/procCopyRodMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_800E1F68: -/* 800E1F68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E1F6C 7C 08 02 A6 */ mflr r0 -/* 800E1F70 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E1F74 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E1F78 7C 7F 1B 78 */ mr r31, r3 -/* 800E1F7C 38 80 00 64 */ li r4, 0x64 -/* 800E1F80 4B FE 0E 25 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800E1F84 2C 03 00 00 */ cmpwi r3, 0 -/* 800E1F88 40 82 00 0C */ bne lbl_800E1F94 -/* 800E1F8C 38 60 00 00 */ li r3, 0 -/* 800E1F90 48 00 00 58 */ b lbl_800E1FE8 -lbl_800E1F94: -/* 800E1F94 7F E3 FB 78 */ mr r3, r31 -/* 800E1F98 4B FD 19 6D */ bl checkZeroSpeedF__9daAlink_cCFv -/* 800E1F9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E1FA0 41 82 00 10 */ beq lbl_800E1FB0 -/* 800E1FA4 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800E1FA8 60 00 00 01 */ ori r0, r0, 1 -/* 800E1FAC 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_800E1FB0: -/* 800E1FB0 7F E3 FB 78 */ mr r3, r31 -/* 800E1FB4 38 80 00 00 */ li r4, 0 -/* 800E1FB8 4B FF F3 F5 */ bl initCopyRodUpperAnimeSpeed__9daAlink_cFi -/* 800E1FBC 7F E3 FB 78 */ mr r3, r31 -/* 800E1FC0 3C 80 80 39 */ lis r4, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E1FC4 38 84 E6 C8 */ addi r4, r4, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E1FC8 C0 24 00 30 */ lfs f1, 0x30(r4) -/* 800E1FCC 4B FC CA A5 */ bl setBlendAtnMoveAnime__9daAlink_cFf -/* 800E1FD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800E1FD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800E1FD8 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 800E1FDC 60 00 00 80 */ ori r0, r0, 0x80 -/* 800E1FE0 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 800E1FE4 38 60 00 01 */ li r3, 1 -lbl_800E1FE8: -/* 800E1FE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E1FEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E1FF0 7C 08 03 A6 */ mtlr r0 -/* 800E1FF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E1FF8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCopyRodMove__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCopyRodMove__9daAlink_cFv.s deleted file mode 100644 index 160d83211d7..00000000000 --- a/asm/d/a/d_a_alink/procCopyRodMove__9daAlink_cFv.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_800E1FFC: -/* 800E1FFC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800E2000 7C 08 02 A6 */ mflr r0 -/* 800E2004 90 01 00 24 */ stw r0, 0x24(r1) -/* 800E2008 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 800E200C F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 800E2010 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E2014 7C 7F 1B 78 */ mr r31, r3 -/* 800E2018 4B FD 52 CD */ bl checkItemActorPointer__9daAlink_cFv -/* 800E201C 2C 03 00 00 */ cmpwi r3, 0 -/* 800E2020 40 82 00 0C */ bne lbl_800E202C -/* 800E2024 38 60 00 01 */ li r3, 1 -/* 800E2028 48 00 00 84 */ b lbl_800E20AC -lbl_800E202C: -/* 800E202C 7F E3 FB 78 */ mr r3, r31 -/* 800E2030 38 80 00 00 */ li r4, 0 -/* 800E2034 4B FD 80 9D */ bl checkNextAction__9daAlink_cFi -/* 800E2038 2C 03 00 00 */ cmpwi r3, 0 -/* 800E203C 40 82 00 6C */ bne lbl_800E20A8 -/* 800E2040 C3 E2 92 BC */ lfs f31, lit_6041(r2) -/* 800E2044 7F E3 FB 78 */ mr r3, r31 -/* 800E2048 4B FD 18 BD */ bl checkZeroSpeedF__9daAlink_cCFv -/* 800E204C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E2050 41 82 00 34 */ beq lbl_800E2084 -/* 800E2054 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800E2058 60 00 00 01 */ ori r0, r0, 1 -/* 800E205C 90 1F 31 A0 */ stw r0, 0x31a0(r31) -/* 800E2060 88 1F 2F 98 */ lbz r0, 0x2f98(r31) -/* 800E2064 28 00 00 03 */ cmplwi r0, 3 -/* 800E2068 41 82 00 28 */ beq lbl_800E2090 -/* 800E206C 38 00 00 03 */ li r0, 3 -/* 800E2070 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 800E2074 3C 60 80 39 */ lis r3, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 800E2078 38 63 D6 64 */ addi r3, r3, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 800E207C C3 E3 00 18 */ lfs f31, 0x18(r3) -/* 800E2080 48 00 00 10 */ b lbl_800E2090 -lbl_800E2084: -/* 800E2084 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800E2088 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 800E208C 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_800E2090: -/* 800E2090 7F E3 FB 78 */ mr r3, r31 -/* 800E2094 FC 20 F8 90 */ fmr f1, f31 -/* 800E2098 4B FC C9 D9 */ bl setBlendAtnMoveAnime__9daAlink_cFf -/* 800E209C 7F E3 FB 78 */ mr r3, r31 -/* 800E20A0 38 80 00 00 */ li r4, 0 -/* 800E20A4 4B FD 92 0D */ bl setBodyAngleXReadyAnime__9daAlink_cFi -lbl_800E20A8: -/* 800E20A8 38 60 00 01 */ li r3, 1 -lbl_800E20AC: -/* 800E20AC E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 800E20B0 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 800E20B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E20B8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800E20BC 7C 08 03 A6 */ mtlr r0 -/* 800E20C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E20C4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCopyRodReviveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCopyRodReviveInit__9daAlink_cFv.s deleted file mode 100644 index 0298a6a97ec..00000000000 --- a/asm/d/a/d_a_alink/procCopyRodReviveInit__9daAlink_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_800E2308: -/* 800E2308 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E230C 7C 08 02 A6 */ mflr r0 -/* 800E2310 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E2314 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E2318 7C 7F 1B 78 */ mr r31, r3 -/* 800E231C 38 80 00 66 */ li r4, 0x66 -/* 800E2320 4B FE 0A 85 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800E2324 2C 03 00 00 */ cmpwi r3, 0 -/* 800E2328 40 82 00 0C */ bne lbl_800E2334 -/* 800E232C 38 60 00 01 */ li r3, 1 -/* 800E2330 48 00 00 60 */ b lbl_800E2390 -lbl_800E2334: -/* 800E2334 80 1F 06 0C */ lwz r0, 0x60c(r31) -/* 800E2338 2C 00 00 00 */ cmpwi r0, 0 -/* 800E233C 40 82 00 3C */ bne lbl_800E2378 -/* 800E2340 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800E2344 28 00 00 46 */ cmplwi r0, 0x46 -/* 800E2348 41 82 00 24 */ beq lbl_800E236C -/* 800E234C 7F E3 FB 78 */ mr r3, r31 -/* 800E2350 38 80 00 00 */ li r4, 0 -/* 800E2354 38 A0 00 00 */ li r5, 0 -/* 800E2358 4B FD EF 85 */ bl deleteEquipItem__9daAlink_cFii -/* 800E235C 38 00 00 46 */ li r0, 0x46 -/* 800E2360 B0 1F 2F DC */ sth r0, 0x2fdc(r31) -/* 800E2364 7F E3 FB 78 */ mr r3, r31 -/* 800E2368 4B FF F3 E1 */ bl setCopyRodModel__9daAlink_cFv -lbl_800E236C: -/* 800E236C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800E2370 80 7F 07 24 */ lwz r3, 0x724(r31) -/* 800E2374 D0 03 00 08 */ stfs f0, 8(r3) -lbl_800E2378: -/* 800E2378 7F E3 FB 78 */ mr r3, r31 -/* 800E237C 38 80 01 7A */ li r4, 0x17a -/* 800E2380 4B FC AC 01 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 800E2384 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800E2388 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800E238C 38 60 00 01 */ li r3, 1 -lbl_800E2390: -/* 800E2390 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E2394 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E2398 7C 08 03 A6 */ mtlr r0 -/* 800E239C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E23A0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCopyRodRevive__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCopyRodRevive__9daAlink_cFv.s deleted file mode 100644 index 3fecfd354c4..00000000000 --- a/asm/d/a/d_a_alink/procCopyRodRevive__9daAlink_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800E23A4: -/* 800E23A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E23A8 7C 08 02 A6 */ mflr r0 -/* 800E23AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E23B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E23B4 7C 7F 1B 78 */ mr r31, r3 -/* 800E23B8 80 63 07 24 */ lwz r3, 0x724(r3) -/* 800E23BC 4B FC 6E 8D */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase -/* 800E23C0 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800E23C4 48 07 C1 09 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800E23C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E23CC 41 82 00 18 */ beq lbl_800E23E4 -/* 800E23D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800E23D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800E23D8 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800E23DC 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 800E23E0 4B F6 5D 9D */ bl cutEnd__16dEvent_manager_cFi -lbl_800E23E4: -/* 800E23E4 38 60 00 01 */ li r3, 1 -/* 800E23E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E23EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E23F0 7C 08 03 A6 */ mtlr r0 -/* 800E23F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E23F8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCopyRodSubjectInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCopyRodSubjectInit__9daAlink_cFv.s deleted file mode 100644 index e16f54921bc..00000000000 --- a/asm/d/a/d_a_alink/procCopyRodSubjectInit__9daAlink_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_800E1E20: -/* 800E1E20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E1E24 7C 08 02 A6 */ mflr r0 -/* 800E1E28 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E1E2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E1E30 7C 7F 1B 78 */ mr r31, r3 -/* 800E1E34 38 80 00 63 */ li r4, 0x63 -/* 800E1E38 4B FE 0F 6D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800E1E3C 2C 03 00 00 */ cmpwi r3, 0 -/* 800E1E40 40 82 00 0C */ bne lbl_800E1E4C -/* 800E1E44 38 60 00 00 */ li r3, 0 -/* 800E1E48 48 00 00 54 */ b lbl_800E1E9C -lbl_800E1E4C: -/* 800E1E4C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800E1E50 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800E1E54 7F E3 FB 78 */ mr r3, r31 -/* 800E1E58 38 80 00 01 */ li r4, 1 -/* 800E1E5C 4B FF F5 51 */ bl initCopyRodUpperAnimeSpeed__9daAlink_cFi -/* 800E1E60 7F E3 FB 78 */ mr r3, r31 -/* 800E1E64 38 80 00 11 */ li r4, 0x11 -/* 800E1E68 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800E1E6C 3C A0 80 39 */ lis r5, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E1E70 38 A5 E6 C8 */ addi r5, r5, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E1E74 C0 45 00 30 */ lfs f2, 0x30(r5) -/* 800E1E78 4B FC B1 69 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -/* 800E1E7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800E1E80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800E1E84 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 800E1E88 60 00 00 80 */ ori r0, r0, 0x80 -/* 800E1E8C 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 800E1E90 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800E1E94 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800E1E98 38 60 00 01 */ li r3, 1 -lbl_800E1E9C: -/* 800E1E9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E1EA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E1EA4 7C 08 03 A6 */ mtlr r0 -/* 800E1EA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E1EAC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCopyRodSubject__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCopyRodSubject__9daAlink_cFv.s deleted file mode 100644 index eb4b35a325c..00000000000 --- a/asm/d/a/d_a_alink/procCopyRodSubject__9daAlink_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_800E1EB0: -/* 800E1EB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E1EB4 7C 08 02 A6 */ mflr r0 -/* 800E1EB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E1EBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E1EC0 7C 7F 1B 78 */ mr r31, r3 -/* 800E1EC4 4B FD 54 21 */ bl checkItemActorPointer__9daAlink_cFv -/* 800E1EC8 2C 03 00 00 */ cmpwi r3, 0 -/* 800E1ECC 40 82 00 0C */ bne lbl_800E1ED8 -/* 800E1ED0 38 60 00 01 */ li r3, 1 -/* 800E1ED4 48 00 00 80 */ b lbl_800E1F54 -lbl_800E1ED8: -/* 800E1ED8 38 60 00 00 */ li r3, 0 -/* 800E1EDC A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800E1EE0 28 00 00 46 */ cmplwi r0, 0x46 -/* 800E1EE4 40 82 00 14 */ bne lbl_800E1EF8 -/* 800E1EE8 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 800E1EEC 28 00 00 54 */ cmplwi r0, 0x54 -/* 800E1EF0 40 82 00 08 */ bne lbl_800E1EF8 -/* 800E1EF4 38 60 00 01 */ li r3, 1 -lbl_800E1EF8: -/* 800E1EF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E1EFC 41 82 00 10 */ beq lbl_800E1F0C -/* 800E1F00 7F E3 FB 78 */ mr r3, r31 -/* 800E1F04 38 80 00 12 */ li r4, 0x12 -/* 800E1F08 4B FD 13 49 */ bl setDoStatus__9daAlink_cFUc -lbl_800E1F0C: -/* 800E1F0C 7F E3 FB 78 */ mr r3, r31 -/* 800E1F10 38 80 00 00 */ li r4, 0 -/* 800E1F14 4B FD 18 21 */ bl setShapeAngleToAtnActor__9daAlink_cFi -/* 800E1F18 7F E3 FB 78 */ mr r3, r31 -/* 800E1F1C 38 80 00 00 */ li r4, 0 -/* 800E1F20 4B FD 81 B1 */ bl checkNextAction__9daAlink_cFi -/* 800E1F24 2C 03 00 00 */ cmpwi r3, 0 -/* 800E1F28 40 82 00 20 */ bne lbl_800E1F48 -/* 800E1F2C 7F E3 FB 78 */ mr r3, r31 -/* 800E1F30 4B FE C9 71 */ bl setBodyAngleToCamera__9daAlink_cFv -/* 800E1F34 2C 03 00 00 */ cmpwi r3, 0 -/* 800E1F38 41 82 00 18 */ beq lbl_800E1F50 -/* 800E1F3C 7F E3 FB 78 */ mr r3, r31 -/* 800E1F40 4B FF FE 2D */ bl setCopyRodSight__9daAlink_cFv -/* 800E1F44 48 00 00 0C */ b lbl_800E1F50 -lbl_800E1F48: -/* 800E1F48 38 00 00 00 */ li r0, 0 -/* 800E1F4C 98 1F 20 68 */ stb r0, 0x2068(r31) -lbl_800E1F50: -/* 800E1F50 38 60 00 01 */ li r3, 1 -lbl_800E1F54: -/* 800E1F54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E1F58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E1F5C 7C 08 03 A6 */ mtlr r0 -/* 800E1F60 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E1F64 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCopyRodSwingInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCopyRodSwingInit__9daAlink_cFv.s deleted file mode 100644 index 2a170cee70e..00000000000 --- a/asm/d/a/d_a_alink/procCopyRodSwingInit__9daAlink_cFv.s +++ /dev/null @@ -1,82 +0,0 @@ -lbl_800E20C8: -/* 800E20C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E20CC 7C 08 02 A6 */ mflr r0 -/* 800E20D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E20D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E20D8 7C 7F 1B 78 */ mr r31, r3 -/* 800E20DC 38 80 00 65 */ li r4, 0x65 -/* 800E20E0 4B FD FE 8D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800E20E4 7F E3 FB 78 */ mr r3, r31 -/* 800E20E8 4B FF F2 8D */ bl getCopyRodControllActor__9daAlink_cFv -/* 800E20EC 28 03 00 00 */ cmplwi r3, 0 -/* 800E20F0 41 82 00 68 */ beq lbl_800E2158 -/* 800E20F4 A8 83 00 08 */ lha r4, 8(r3) -/* 800E20F8 2C 04 01 98 */ cmpwi r4, 0x198 -/* 800E20FC 40 82 00 10 */ bne lbl_800E210C -/* 800E2100 88 03 0A DD */ lbz r0, 0xadd(r3) -/* 800E2104 28 00 00 01 */ cmplwi r0, 1 -/* 800E2108 40 82 00 0C */ bne lbl_800E2114 -lbl_800E210C: -/* 800E210C 2C 04 01 98 */ cmpwi r4, 0x198 -/* 800E2110 41 82 00 48 */ beq lbl_800E2158 -lbl_800E2114: -/* 800E2114 7F E3 FB 78 */ mr r3, r31 -/* 800E2118 38 80 01 79 */ li r4, 0x179 -/* 800E211C 3C A0 80 39 */ lis r5, m__21daAlinkHIO_copyRod_c0@ha /* 0x8038EAFC@ha */ -/* 800E2120 38 A5 EA FC */ addi r5, r5, m__21daAlinkHIO_copyRod_c0@l /* 0x8038EAFC@l */ -/* 800E2124 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800E2128 4B FC AF CD */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800E212C C0 02 93 84 */ lfs f0, lit_8781(r2) -/* 800E2130 D0 1F 34 78 */ stfs f0, 0x3478(r31) -/* 800E2134 C0 02 93 F0 */ lfs f0, lit_13382(r2) -/* 800E2138 D0 1F 34 7C */ stfs f0, 0x347c(r31) -/* 800E213C 3C 60 80 39 */ lis r3, m__21daAlinkHIO_copyRod_c0@ha /* 0x8038EAFC@ha */ -/* 800E2140 38 63 EA FC */ addi r3, r3, m__21daAlinkHIO_copyRod_c0@l /* 0x8038EAFC@l */ -/* 800E2144 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 800E2148 D0 1F 34 80 */ stfs f0, 0x3480(r31) -/* 800E214C C0 02 93 38 */ lfs f0, lit_7807(r2) -/* 800E2150 D0 1F 34 84 */ stfs f0, 0x3484(r31) -/* 800E2154 48 00 00 40 */ b lbl_800E2194 -lbl_800E2158: -/* 800E2158 7F E3 FB 78 */ mr r3, r31 -/* 800E215C 38 80 01 78 */ li r4, 0x178 -/* 800E2160 3C A0 80 39 */ lis r5, m__21daAlinkHIO_copyRod_c0@ha /* 0x8038EAFC@ha */ -/* 800E2164 38 A5 EA FC */ addi r5, r5, m__21daAlinkHIO_copyRod_c0@l /* 0x8038EAFC@l */ -/* 800E2168 4B FC AF 8D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800E216C C0 02 93 24 */ lfs f0, lit_7450(r2) -/* 800E2170 D0 1F 34 78 */ stfs f0, 0x3478(r31) -/* 800E2174 C0 02 93 8C */ lfs f0, lit_8783(r2) -/* 800E2178 D0 1F 34 7C */ stfs f0, 0x347c(r31) -/* 800E217C 3C 60 80 39 */ lis r3, m__21daAlinkHIO_copyRod_c0@ha /* 0x8038EAFC@ha */ -/* 800E2180 38 63 EA FC */ addi r3, r3, m__21daAlinkHIO_copyRod_c0@l /* 0x8038EAFC@l */ -/* 800E2184 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 800E2188 D0 1F 34 80 */ stfs f0, 0x3480(r31) -/* 800E218C C0 02 93 48 */ lfs f0, lit_8130(r2) -/* 800E2190 D0 1F 34 84 */ stfs f0, 0x3484(r31) -lbl_800E2194: -/* 800E2194 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800E2198 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800E219C A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800E21A0 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800E21A4 38 00 00 01 */ li r0, 1 -/* 800E21A8 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800E21AC 38 00 00 00 */ li r0, 0 -/* 800E21B0 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 800E21B4 7F E3 FB 78 */ mr r3, r31 -/* 800E21B8 3C 80 00 01 */ lis r4, 1 -/* 800E21BC 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800E21C0 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800E21C4 7D 89 03 A6 */ mtctr r12 -/* 800E21C8 4E 80 04 21 */ bctrl -/* 800E21CC C0 02 93 D4 */ lfs f0, lit_11442(r2) -/* 800E21D0 D0 1F 13 6C */ stfs f0, 0x136c(r31) -/* 800E21D4 3C 00 00 80 */ lis r0, 0x80 -/* 800E21D8 90 1F 12 3C */ stw r0, 0x123c(r31) -/* 800E21DC 7F E3 FB 78 */ mr r3, r31 -/* 800E21E0 4B FC 99 49 */ bl cancelLockAt__9daAlink_cFv -/* 800E21E4 38 60 00 01 */ li r3, 1 -/* 800E21E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E21EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E21F0 7C 08 03 A6 */ mtlr r0 -/* 800E21F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E21F8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCopyRodSwing__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCopyRodSwing__9daAlink_cFv.s deleted file mode 100644 index 9ac112f8d82..00000000000 --- a/asm/d/a/d_a_alink/procCopyRodSwing__9daAlink_cFv.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_800E21FC: -/* 800E21FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E2200 7C 08 02 A6 */ mflr r0 -/* 800E2204 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E2208 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E220C 93 C1 00 08 */ stw r30, 8(r1) -/* 800E2210 7C 7E 1B 78 */ mr r30, r3 -/* 800E2214 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800E2218 38 00 00 00 */ li r0, 0 -/* 800E221C B0 03 30 0C */ sth r0, 0x300c(r3) -/* 800E2220 7F E3 FB 78 */ mr r3, r31 -/* 800E2224 48 07 C2 A9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800E2228 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E222C 41 82 00 1C */ beq lbl_800E2248 -/* 800E2230 7F C3 F3 78 */ mr r3, r30 -/* 800E2234 4B FF F3 59 */ bl setCopyRodControllAnime__9daAlink_cFv -/* 800E2238 7F C3 F3 78 */ mr r3, r30 -/* 800E223C 38 80 00 00 */ li r4, 0 -/* 800E2240 4B FD 7E 91 */ bl checkNextAction__9daAlink_cFi -/* 800E2244 48 00 00 A8 */ b lbl_800E22EC -lbl_800E2248: -/* 800E2248 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800E224C C0 1E 34 80 */ lfs f0, 0x3480(r30) -/* 800E2250 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800E2254 40 81 00 30 */ ble lbl_800E2284 -/* 800E2258 7F C3 F3 78 */ mr r3, r30 -/* 800E225C 38 80 00 01 */ li r4, 1 -/* 800E2260 4B FD 7E 71 */ bl checkNextAction__9daAlink_cFi -/* 800E2264 2C 03 00 00 */ cmpwi r3, 0 -/* 800E2268 41 82 00 1C */ beq lbl_800E2284 -/* 800E226C 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 800E2270 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 800E2274 41 82 00 78 */ beq lbl_800E22EC -/* 800E2278 7F C3 F3 78 */ mr r3, r30 -/* 800E227C 4B FF F3 11 */ bl setCopyRodControllAnime__9daAlink_cFv -/* 800E2280 48 00 00 6C */ b lbl_800E22EC -lbl_800E2284: -/* 800E2284 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800E2288 C0 1E 34 78 */ lfs f0, 0x3478(r30) -/* 800E228C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800E2290 4C 41 13 82 */ cror 2, 1, 2 -/* 800E2294 40 82 00 50 */ bne lbl_800E22E4 -/* 800E2298 C0 1E 34 7C */ lfs f0, 0x347c(r30) -/* 800E229C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800E22A0 40 80 00 44 */ bge lbl_800E22E4 -/* 800E22A4 A8 1E 30 0E */ lha r0, 0x300e(r30) -/* 800E22A8 2C 00 00 00 */ cmpwi r0, 0 -/* 800E22AC 40 82 00 14 */ bne lbl_800E22C0 -/* 800E22B0 7F C3 F3 78 */ mr r3, r30 -/* 800E22B4 3C 80 00 02 */ lis r4, 0x0002 /* 0x0002006A@ha */ -/* 800E22B8 38 84 00 6A */ addi r4, r4, 0x006A /* 0x0002006A@l */ -/* 800E22BC 4B FD CE 31 */ bl seStartSwordCut__9daAlink_cFUl -lbl_800E22C0: -/* 800E22C0 38 00 00 01 */ li r0, 1 -/* 800E22C4 B0 1E 30 0E */ sth r0, 0x300e(r30) -/* 800E22C8 7F C3 F3 78 */ mr r3, r30 -/* 800E22CC 38 80 00 6F */ li r4, 0x6f -/* 800E22D0 4B FE F6 F9 */ bl changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 800E22D4 2C 03 00 00 */ cmpwi r3, 0 -/* 800E22D8 41 82 00 14 */ beq lbl_800E22EC -/* 800E22DC 38 60 00 01 */ li r3, 1 -/* 800E22E0 48 00 00 10 */ b lbl_800E22F0 -lbl_800E22E4: -/* 800E22E4 38 00 00 00 */ li r0, 0 -/* 800E22E8 B0 1E 30 0E */ sth r0, 0x300e(r30) -lbl_800E22EC: -/* 800E22EC 38 60 00 01 */ li r3, 1 -lbl_800E22F0: -/* 800E22F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E22F4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800E22F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E22FC 7C 08 03 A6 */ mtlr r0 -/* 800E2300 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E2304 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCrouchInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCrouchInit__9daAlink_cFv.s deleted file mode 100644 index cacf8e85fd2..00000000000 --- a/asm/d/a/d_a_alink/procCrouchInit__9daAlink_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_800C7690: -/* 800C7690 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C7694 7C 08 02 A6 */ mflr r0 -/* 800C7698 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C769C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C76A0 7C 7F 1B 78 */ mr r31, r3 -/* 800C76A4 38 80 00 1C */ li r4, 0x1c -/* 800C76A8 4B FF B6 FD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C76AC 2C 03 00 00 */ cmpwi r3, 0 -/* 800C76B0 40 82 00 0C */ bne lbl_800C76BC -/* 800C76B4 38 60 00 00 */ li r3, 0 -/* 800C76B8 48 00 00 2C */ b lbl_800C76E4 -lbl_800C76BC: -/* 800C76BC 7F E3 FB 78 */ mr r3, r31 -/* 800C76C0 38 80 00 29 */ li r4, 0x29 -/* 800C76C4 3C A0 80 39 */ lis r5, m__20daAlinkHIO_crouch_c0@ha /* 0x8038E01C@ha */ -/* 800C76C8 38 A5 E0 1C */ addi r5, r5, m__20daAlinkHIO_crouch_c0@l /* 0x8038E01C@l */ -/* 800C76CC C0 25 00 30 */ lfs f1, 0x30(r5) -/* 800C76D0 C0 45 00 34 */ lfs f2, 0x34(r5) -/* 800C76D4 4B FE 59 0D */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -/* 800C76D8 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800C76DC B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800C76E0 38 60 00 01 */ li r3, 1 -lbl_800C76E4: -/* 800C76E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C76E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C76EC 7C 08 03 A6 */ mtlr r0 -/* 800C76F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C76F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCrouch__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCrouch__9daAlink_cFv.s deleted file mode 100644 index dca455ad843..00000000000 --- a/asm/d/a/d_a_alink/procCrouch__9daAlink_cFv.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_800C76F8: -/* 800C76F8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800C76FC 7C 08 02 A6 */ mflr r0 -/* 800C7700 90 01 00 24 */ stw r0, 0x24(r1) -/* 800C7704 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C7708 48 29 AA D5 */ bl _savegpr_29 -/* 800C770C 7C 7D 1B 78 */ mr r29, r3 -/* 800C7710 38 7D 33 98 */ addi r3, r29, 0x3398 -/* 800C7714 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800C7718 3C 80 80 39 */ lis r4, m__18daAlinkHIO_move_c0@ha /* 0x8038D6BC@ha */ -/* 800C771C 38 84 D6 BC */ addi r4, r4, m__18daAlinkHIO_move_c0@l /* 0x8038D6BC@l */ -/* 800C7720 C0 44 00 38 */ lfs f2, 0x38(r4) -/* 800C7724 48 1A 90 1D */ bl cLib_chaseF__FPfff -/* 800C7728 7F A3 EB 78 */ mr r3, r29 -/* 800C772C 4B FE BD D5 */ bl checkAttentionState__9daAlink_cFv -/* 800C7730 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C7734 41 82 00 20 */ beq lbl_800C7754 -/* 800C7738 7F A3 EB 78 */ mr r3, r29 -/* 800C773C 38 80 00 E8 */ li r4, 0xe8 -/* 800C7740 38 A0 00 00 */ li r5, 0 -/* 800C7744 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800C7748 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800C774C 4B FE 7D 65 */ bl setFaceBck__9daAlink_cFUsiUs -/* 800C7750 48 00 00 1C */ b lbl_800C776C -lbl_800C7754: -/* 800C7754 7F A3 EB 78 */ mr r3, r29 -/* 800C7758 38 80 00 00 */ li r4, 0 -/* 800C775C 38 A0 00 00 */ li r5, 0 -/* 800C7760 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800C7764 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800C7768 4B FE 7D 49 */ bl setFaceBck__9daAlink_cFUsiUs -lbl_800C776C: -/* 800C776C 80 1D 06 14 */ lwz r0, 0x614(r29) -/* 800C7770 28 00 00 29 */ cmplwi r0, 0x29 -/* 800C7774 41 82 00 64 */ beq lbl_800C77D8 -/* 800C7778 C0 3D 2B A8 */ lfs f1, 0x2ba8(r29) -/* 800C777C C0 02 98 EC */ lfs f0, lit_74138(r2) -/* 800C7780 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800C7784 4C 40 13 82 */ cror 2, 0, 2 -/* 800C7788 41 82 00 44 */ beq lbl_800C77CC -/* 800C778C 83 FD 27 E0 */ lwz r31, 0x27e0(r29) -/* 800C7790 3B C0 00 01 */ li r30, 1 -/* 800C7794 7F E3 FB 78 */ mr r3, r31 -/* 800C7798 4B FA C0 4D */ bl LockonTruth__12dAttention_cFv -/* 800C779C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C77A0 40 82 00 14 */ bne lbl_800C77B4 -/* 800C77A4 80 1F 03 34 */ lwz r0, 0x334(r31) -/* 800C77A8 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 800C77AC 40 82 00 08 */ bne lbl_800C77B4 -/* 800C77B0 3B C0 00 00 */ li r30, 0 -lbl_800C77B4: -/* 800C77B4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 800C77B8 41 82 00 20 */ beq lbl_800C77D8 -/* 800C77BC 7F A3 EB 78 */ mr r3, r29 -/* 800C77C0 48 01 57 A5 */ bl checkGuardAccept__9daAlink_cFv -/* 800C77C4 2C 03 00 00 */ cmpwi r3, 0 -/* 800C77C8 41 82 00 10 */ beq lbl_800C77D8 -lbl_800C77CC: -/* 800C77CC 7F A3 EB 78 */ mr r3, r29 -/* 800C77D0 38 80 00 00 */ li r4, 0 -/* 800C77D4 4B FF 37 35 */ bl checkNextActionFromCrouch__9daAlink_cFi -lbl_800C77D8: -/* 800C77D8 38 60 00 01 */ li r3, 1 -/* 800C77DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C77E0 48 29 AA 49 */ bl _restgpr_29 -/* 800C77E4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800C77E8 7C 08 03 A6 */ mtlr r0 -/* 800C77EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800C77F0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutDown__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutDown__9daAlink_cFv.s deleted file mode 100644 index c7626759c73..00000000000 --- a/asm/d/a/d_a_alink/procCutDown__9daAlink_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_800D57F8: -/* 800D57F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D57FC 7C 08 02 A6 */ mflr r0 -/* 800D5800 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D5804 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D5808 7C 7F 1B 78 */ mr r31, r3 -/* 800D580C A8 03 30 0E */ lha r0, 0x300e(r3) -/* 800D5810 2C 00 00 00 */ cmpwi r0, 0 -/* 800D5814 41 82 00 0C */ beq lbl_800D5820 -/* 800D5818 38 60 00 01 */ li r3, 1 -/* 800D581C 48 00 00 70 */ b lbl_800D588C -lbl_800D5820: -/* 800D5820 80 1F 19 9C */ lwz r0, 0x199c(r31) -/* 800D5824 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800D5828 41 82 00 24 */ beq lbl_800D584C -/* 800D582C C0 3F 04 FC */ lfs f1, 0x4fc(r31) -/* 800D5830 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800D5834 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D5838 4C 40 13 82 */ cror 2, 0, 2 -/* 800D583C 40 82 00 10 */ bne lbl_800D584C -/* 800D5840 80 9F 28 10 */ lwz r4, 0x2810(r31) -/* 800D5844 48 00 00 5D */ bl procCutDownLandInit__9daAlink_cFP13fopEn_enemy_c -/* 800D5848 48 00 00 40 */ b lbl_800D5888 -lbl_800D584C: -/* 800D584C 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800D5850 48 08 8C 7D */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800D5854 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D5858 41 82 00 30 */ beq lbl_800D5888 -/* 800D585C A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 800D5860 2C 00 00 00 */ cmpwi r0, 0 -/* 800D5864 40 82 00 24 */ bne lbl_800D5888 -/* 800D5868 38 00 00 01 */ li r0, 1 -/* 800D586C B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800D5870 7F E3 FB 78 */ mr r3, r31 -/* 800D5874 38 80 00 79 */ li r4, 0x79 -/* 800D5878 3C A0 80 39 */ lis r5, m__21daAlinkHIO_cutDown_c0@ha /* 0x8038DD44@ha */ -/* 800D587C 38 A5 DD 44 */ addi r5, r5, m__21daAlinkHIO_cutDown_c0@l /* 0x8038DD44@l */ -/* 800D5880 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800D5884 4B FD 78 71 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -lbl_800D5888: -/* 800D5888 38 60 00 01 */ li r3, 1 -lbl_800D588C: -/* 800D588C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D5890 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D5894 7C 08 03 A6 */ mtlr r0 -/* 800D5898 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D589C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutFinishInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procCutFinishInit__9daAlink_cFi.s deleted file mode 100644 index b3af3cbe448..00000000000 --- a/asm/d/a/d_a_alink/procCutFinishInit__9daAlink_cFi.s +++ /dev/null @@ -1,238 +0,0 @@ -lbl_800D34D8: -/* 800D34D8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 800D34DC 7C 08 02 A6 */ mflr r0 -/* 800D34E0 90 01 00 44 */ stw r0, 0x44(r1) -/* 800D34E4 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 800D34E8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 800D34EC 39 61 00 30 */ addi r11, r1, 0x30 -/* 800D34F0 48 28 EC DD */ bl _savegpr_25 -/* 800D34F4 7C 7C 1B 78 */ mr r28, r3 -/* 800D34F8 7C 9D 23 78 */ mr r29, r4 -/* 800D34FC 3C 80 80 39 */ lis r4, lit_3757@ha /* 0x8038D658@ha */ -/* 800D3500 3B 64 D6 58 */ addi r27, r4, lit_3757@l /* 0x8038D658@l */ -/* 800D3504 57 A0 20 36 */ slwi r0, r29, 4 -/* 800D3508 3B FB 42 00 */ addi r31, r27, 0x4200 -/* 800D350C 7F FF 02 14 */ add r31, r31, r0 -/* 800D3510 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D3514 20 00 00 0E */ subfic r0, r0, 0xe -/* 800D3518 7C 00 00 34 */ cntlzw r0, r0 -/* 800D351C 54 19 DE 3E */ rlwinm r25, r0, 0x1b, 0x18, 0x1f -/* 800D3520 38 80 00 22 */ li r4, 0x22 -/* 800D3524 4B FE EA 49 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800D3528 7F 83 E3 78 */ mr r3, r28 -/* 800D352C 88 9F 00 08 */ lbz r4, 8(r31) -/* 800D3530 4B FF DF FD */ bl setCutType__9daAlink_cFUc -/* 800D3534 80 1F 00 04 */ lwz r0, 4(r31) -/* 800D3538 90 1C 31 98 */ stw r0, 0x3198(r28) -/* 800D353C 88 1F 00 0A */ lbz r0, 0xa(r31) -/* 800D3540 B0 1C 30 0C */ sth r0, 0x300c(r28) -/* 800D3544 88 1F 00 0B */ lbz r0, 0xb(r31) -/* 800D3548 B0 1C 30 0E */ sth r0, 0x300e(r28) -/* 800D354C 3B C0 00 00 */ li r30, 0 -/* 800D3550 2C 1D 00 00 */ cmpwi r29, 0 -/* 800D3554 40 82 00 0C */ bne lbl_800D3560 -/* 800D3558 3B 5B 03 8C */ addi r26, r27, 0x38c -/* 800D355C 48 00 00 50 */ b lbl_800D35AC -lbl_800D3560: -/* 800D3560 2C 1D 00 01 */ cmpwi r29, 1 -/* 800D3564 40 82 00 0C */ bne lbl_800D3570 -/* 800D3568 3B 5B 03 B8 */ addi r26, r27, 0x3b8 -/* 800D356C 48 00 00 40 */ b lbl_800D35AC -lbl_800D3570: -/* 800D3570 2C 1D 00 02 */ cmpwi r29, 2 -/* 800D3574 40 82 00 0C */ bne lbl_800D3580 -/* 800D3578 3B 5B 03 E4 */ addi r26, r27, 0x3e4 -/* 800D357C 48 00 00 30 */ b lbl_800D35AC -lbl_800D3580: -/* 800D3580 2C 1D 00 03 */ cmpwi r29, 3 -/* 800D3584 40 82 00 10 */ bne lbl_800D3594 -/* 800D3588 3B 5B 04 10 */ addi r26, r27, 0x410 -/* 800D358C 3B C0 00 01 */ li r30, 1 -/* 800D3590 48 00 00 1C */ b lbl_800D35AC -lbl_800D3594: -/* 800D3594 2C 1D 00 04 */ cmpwi r29, 4 -/* 800D3598 40 82 00 10 */ bne lbl_800D35A8 -/* 800D359C 3B 5B 04 3C */ addi r26, r27, 0x43c -/* 800D35A0 3B C0 00 01 */ li r30, 1 -/* 800D35A4 48 00 00 08 */ b lbl_800D35AC -lbl_800D35A8: -/* 800D35A8 3B 5B 04 68 */ addi r26, r27, 0x468 -lbl_800D35AC: -/* 800D35AC 2C 19 00 00 */ cmpwi r25, 0 -/* 800D35B0 41 82 00 0C */ beq lbl_800D35BC -/* 800D35B4 C3 FA 00 1C */ lfs f31, 0x1c(r26) -/* 800D35B8 48 00 00 1C */ b lbl_800D35D4 -lbl_800D35BC: -/* 800D35BC 88 1C 05 69 */ lbz r0, 0x569(r28) -/* 800D35C0 28 00 00 03 */ cmplwi r0, 3 -/* 800D35C4 40 82 00 0C */ bne lbl_800D35D0 -/* 800D35C8 C3 FA 00 28 */ lfs f31, 0x28(r26) -/* 800D35CC 48 00 00 08 */ b lbl_800D35D4 -lbl_800D35D0: -/* 800D35D0 C3 FA 00 08 */ lfs f31, 8(r26) -lbl_800D35D4: -/* 800D35D4 7F 83 E3 78 */ mr r3, r28 -/* 800D35D8 4B FE C7 D9 */ bl checkZoraWearAbility__9daAlink_cCFv -/* 800D35DC 2C 03 00 00 */ cmpwi r3, 0 -/* 800D35E0 40 82 00 18 */ bne lbl_800D35F8 -/* 800D35E4 80 1C 05 70 */ lwz r0, 0x570(r28) -/* 800D35E8 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 800D35EC 41 82 00 0C */ beq lbl_800D35F8 -/* 800D35F0 C0 7F 00 0C */ lfs f3, 0xc(r31) -/* 800D35F4 48 00 00 08 */ b lbl_800D35FC -lbl_800D35F8: -/* 800D35F8 C0 7A 00 0C */ lfs f3, 0xc(r26) -lbl_800D35FC: -/* 800D35FC 7F 83 E3 78 */ mr r3, r28 -/* 800D3600 80 9F 00 00 */ lwz r4, 0(r31) -/* 800D3604 C0 3A 00 04 */ lfs f1, 4(r26) -/* 800D3608 FC 40 F8 90 */ fmr f2, f31 -/* 800D360C A8 BA 00 00 */ lha r5, 0(r26) -/* 800D3610 4B FD 99 FD */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -/* 800D3614 C0 1A 00 1C */ lfs f0, 0x1c(r26) -/* 800D3618 D0 1C 34 78 */ stfs f0, 0x3478(r28) -/* 800D361C C0 1A 00 20 */ lfs f0, 0x20(r26) -/* 800D3620 D0 1C 34 7C */ stfs f0, 0x347c(r28) -/* 800D3624 C0 1A 00 18 */ lfs f0, 0x18(r26) -/* 800D3628 D0 1C 34 80 */ stfs f0, 0x3480(r28) -/* 800D362C 7F 83 E3 78 */ mr r3, r28 -/* 800D3630 38 80 00 01 */ li r4, 1 -/* 800D3634 38 A0 00 01 */ li r5, 1 -/* 800D3638 4B FE 7E 81 */ bl checkHeavyStateOn__9daAlink_cFii -/* 800D363C 2C 03 00 00 */ cmpwi r3, 0 -/* 800D3640 41 82 00 14 */ beq lbl_800D3654 -/* 800D3644 C0 3C 34 80 */ lfs f1, 0x3480(r28) -/* 800D3648 C0 1C 34 34 */ lfs f0, 0x3434(r28) -/* 800D364C EC 01 00 32 */ fmuls f0, f1, f0 -/* 800D3650 D0 1C 34 80 */ stfs f0, 0x3480(r28) -lbl_800D3654: -/* 800D3654 A8 1C 04 E6 */ lha r0, 0x4e6(r28) -/* 800D3658 B0 1C 04 DE */ sth r0, 0x4de(r28) -/* 800D365C 39 1B 08 34 */ addi r8, r27, 0x834 -/* 800D3660 A8 08 00 52 */ lha r0, 0x52(r8) -/* 800D3664 B0 1C 30 7E */ sth r0, 0x307e(r28) -/* 800D3668 88 1C 05 69 */ lbz r0, 0x569(r28) -/* 800D366C 28 00 00 03 */ cmplwi r0, 3 -/* 800D3670 40 82 00 44 */ bne lbl_800D36B4 -/* 800D3674 C0 1A 00 24 */ lfs f0, 0x24(r26) -/* 800D3678 D0 1C 34 84 */ stfs f0, 0x3484(r28) -/* 800D367C A8 1A 00 16 */ lha r0, 0x16(r26) -/* 800D3680 B0 1C 30 08 */ sth r0, 0x3008(r28) -/* 800D3684 7F 83 E3 78 */ mr r3, r28 -/* 800D3688 38 80 00 00 */ li r4, 0 -/* 800D368C 38 A0 00 01 */ li r5, 1 -/* 800D3690 88 DF 00 09 */ lbz r6, 9(r31) -/* 800D3694 38 E0 00 02 */ li r7, 2 -/* 800D3698 C0 28 00 74 */ lfs f1, 0x74(r8) -/* 800D369C C0 48 00 78 */ lfs f2, 0x78(r8) -/* 800D36A0 4B FF DF E9 */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff -/* 800D36A4 3C 60 00 02 */ lis r3, 0x0002 /* 0x00020002@ha */ -/* 800D36A8 38 03 00 02 */ addi r0, r3, 0x0002 /* 0x00020002@l */ -/* 800D36AC 90 1C 32 D0 */ stw r0, 0x32d0(r28) -/* 800D36B0 48 00 00 60 */ b lbl_800D3710 -lbl_800D36B4: -/* 800D36B4 C0 1A 00 10 */ lfs f0, 0x10(r26) -/* 800D36B8 D0 1C 34 84 */ stfs f0, 0x3484(r28) -/* 800D36BC A8 1A 00 14 */ lha r0, 0x14(r26) -/* 800D36C0 B0 1C 30 08 */ sth r0, 0x3008(r28) -/* 800D36C4 7F 83 E3 78 */ mr r3, r28 -/* 800D36C8 38 80 00 01 */ li r4, 1 -/* 800D36CC 38 A0 00 03 */ li r5, 3 -/* 800D36D0 88 DF 00 09 */ lbz r6, 9(r31) -/* 800D36D4 30 1E FF FF */ addic r0, r30, -1 -/* 800D36D8 7C E0 F1 10 */ subfe r7, r0, r30 -/* 800D36DC 38 E7 00 03 */ addi r7, r7, 3 -/* 800D36E0 C0 28 00 74 */ lfs f1, 0x74(r8) -/* 800D36E4 C0 48 00 78 */ lfs f2, 0x78(r8) -/* 800D36E8 4B FF DF A1 */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff -/* 800D36EC 2C 1D 00 02 */ cmpwi r29, 2 -/* 800D36F0 40 82 00 14 */ bne lbl_800D3704 -/* 800D36F4 3C 60 00 02 */ lis r3, 0x0002 /* 0x00020004@ha */ -/* 800D36F8 38 03 00 04 */ addi r0, r3, 0x0004 /* 0x00020004@l */ -/* 800D36FC 90 1C 32 D0 */ stw r0, 0x32d0(r28) -/* 800D3700 48 00 00 10 */ b lbl_800D3710 -lbl_800D3704: -/* 800D3704 3C 60 00 02 */ lis r3, 0x0002 /* 0x00020003@ha */ -/* 800D3708 38 03 00 03 */ addi r0, r3, 0x0003 /* 0x00020003@l */ -/* 800D370C 90 1C 32 D0 */ stw r0, 0x32d0(r28) -lbl_800D3710: -/* 800D3710 2C 1E 00 00 */ cmpwi r30, 0 -/* 800D3714 41 82 00 18 */ beq lbl_800D372C -/* 800D3718 7F 83 E3 78 */ mr r3, r28 -/* 800D371C 3C 80 00 01 */ lis r4, 0x0001 /* 0x0001009A@ha */ -/* 800D3720 38 84 00 9A */ addi r4, r4, 0x009A /* 0x0001009A@l */ -/* 800D3724 4B FF EB 61 */ bl setSwordVoiceSe__9daAlink_cFUl -/* 800D3728 48 00 00 0C */ b lbl_800D3734 -lbl_800D372C: -/* 800D372C 7F 83 E3 78 */ mr r3, r28 -/* 800D3730 4B FF EB D5 */ bl setSwordComboVoice__9daAlink_cFv -lbl_800D3734: -/* 800D3734 38 00 00 0C */ li r0, 0xc -/* 800D3738 98 1C 2F 99 */ stb r0, 0x2f99(r28) -/* 800D373C 3C 60 80 42 */ lis r3, l_halfAtnWaitBaseAnime@ha /* 0x80425544@ha */ -/* 800D3740 C4 03 55 44 */ lfsu f0, l_halfAtnWaitBaseAnime@l(r3) /* 0x80425544@l */ -/* 800D3744 D0 1C 35 88 */ stfs f0, 0x3588(r28) -/* 800D3748 C0 03 00 04 */ lfs f0, 4(r3) -/* 800D374C D0 1C 35 8C */ stfs f0, 0x358c(r28) -/* 800D3750 C0 03 00 08 */ lfs f0, 8(r3) -/* 800D3754 D0 1C 35 90 */ stfs f0, 0x3590(r28) -/* 800D3758 88 1C 05 68 */ lbz r0, 0x568(r28) -/* 800D375C 28 00 00 1A */ cmplwi r0, 0x1a -/* 800D3760 41 82 00 0C */ beq lbl_800D376C -/* 800D3764 28 00 00 20 */ cmplwi r0, 0x20 -/* 800D3768 40 82 00 0C */ bne lbl_800D3774 -lbl_800D376C: -/* 800D376C 38 00 00 0D */ li r0, 0xd -/* 800D3770 98 1C 2F 99 */ stb r0, 0x2f99(r28) -lbl_800D3774: -/* 800D3774 38 00 00 00 */ li r0, 0 -/* 800D3778 B0 1C 30 12 */ sth r0, 0x3012(r28) -/* 800D377C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D3780 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D3784 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 800D3788 60 00 80 00 */ ori r0, r0, 0x8000 -/* 800D378C 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 800D3790 7F 83 E3 78 */ mr r3, r28 -/* 800D3794 48 05 09 B1 */ bl setCutWaterDropEffect__9daAlink_cFv -/* 800D3798 7F 83 E3 78 */ mr r3, r28 -/* 800D379C 4B FF F4 61 */ bl initCutAtnActorSearch__9daAlink_cFv -/* 800D37A0 80 7C 27 E0 */ lwz r3, 0x27e0(r28) -/* 800D37A4 38 80 00 00 */ li r4, 0 -/* 800D37A8 4B F9 FD 95 */ bl LockonTarget__12dAttention_cFl -/* 800D37AC 28 03 00 00 */ cmplwi r3, 0 -/* 800D37B0 41 82 00 28 */ beq lbl_800D37D8 -/* 800D37B4 2C 1E 00 00 */ cmpwi r30, 0 -/* 800D37B8 41 82 00 20 */ beq lbl_800D37D8 -/* 800D37BC 80 7C 27 E0 */ lwz r3, 0x27e0(r28) -/* 800D37C0 38 80 00 00 */ li r4, 0 -/* 800D37C4 4B F9 FD 79 */ bl LockonTarget__12dAttention_cFl -/* 800D37C8 7C 64 1B 78 */ mr r4, r3 -/* 800D37CC 38 7C 28 0C */ addi r3, r28, 0x280c -/* 800D37D0 48 08 B4 E9 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -/* 800D37D4 48 00 00 0C */ b lbl_800D37E0 -lbl_800D37D8: -/* 800D37D8 38 7C 28 0C */ addi r3, r28, 0x280c -/* 800D37DC 48 08 B5 21 */ bl clearData__16daPy_actorKeep_cFv -lbl_800D37E0: -/* 800D37E0 88 1C 05 68 */ lbz r0, 0x568(r28) -/* 800D37E4 28 00 00 1A */ cmplwi r0, 0x1a -/* 800D37E8 41 82 00 0C */ beq lbl_800D37F4 -/* 800D37EC 28 00 00 1F */ cmplwi r0, 0x1f -/* 800D37F0 40 82 00 10 */ bne lbl_800D3800 -lbl_800D37F4: -/* 800D37F4 38 00 00 01 */ li r0, 1 -/* 800D37F8 98 1C 2F D0 */ stb r0, 0x2fd0(r28) -/* 800D37FC 48 00 00 0C */ b lbl_800D3808 -lbl_800D3800: -/* 800D3800 38 00 00 00 */ li r0, 0 -/* 800D3804 98 1C 2F D0 */ stb r0, 0x2fd0(r28) -lbl_800D3808: -/* 800D3808 38 60 00 01 */ li r3, 1 -/* 800D380C E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 800D3810 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 800D3814 39 61 00 30 */ addi r11, r1, 0x30 -/* 800D3818 48 28 EA 01 */ bl _restgpr_25 -/* 800D381C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 800D3820 7C 08 03 A6 */ mtlr r0 -/* 800D3824 38 21 00 40 */ addi r1, r1, 0x40 -/* 800D3828 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutFinishJumpUpInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutFinishJumpUpInit__9daAlink_cFv.s deleted file mode 100644 index 85365123077..00000000000 --- a/asm/d/a/d_a_alink/procCutFinishJumpUpInit__9daAlink_cFv.s +++ /dev/null @@ -1,131 +0,0 @@ -lbl_800D3ADC: -/* 800D3ADC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 800D3AE0 7C 08 02 A6 */ mflr r0 -/* 800D3AE4 90 01 00 34 */ stw r0, 0x34(r1) -/* 800D3AE8 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 800D3AEC F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 800D3AF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D3AF4 48 28 E6 E9 */ bl _savegpr_29 -/* 800D3AF8 7C 7E 1B 78 */ mr r30, r3 -/* 800D3AFC 3C 80 80 39 */ lis r4, lit_3757@ha /* 0x8038D658@ha */ -/* 800D3B00 3B E4 D6 58 */ addi r31, r4, lit_3757@l /* 0x8038D658@l */ -/* 800D3B04 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D3B08 20 00 00 11 */ subfic r0, r0, 0x11 -/* 800D3B0C 7C 00 00 34 */ cntlzw r0, r0 -/* 800D3B10 54 1D DE 3E */ rlwinm r29, r0, 0x1b, 0x18, 0x1f -/* 800D3B14 38 80 00 23 */ li r4, 0x23 -/* 800D3B18 4B FE E4 55 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800D3B1C A0 1E 2F DC */ lhz r0, 0x2fdc(r30) -/* 800D3B20 28 00 01 03 */ cmplwi r0, 0x103 -/* 800D3B24 41 82 00 1C */ beq lbl_800D3B40 -/* 800D3B28 7F C3 F3 78 */ mr r3, r30 -/* 800D3B2C 38 80 00 00 */ li r4, 0 -/* 800D3B30 38 A0 00 00 */ li r5, 0 -/* 800D3B34 4B FE D7 A9 */ bl deleteEquipItem__9daAlink_cFii -/* 800D3B38 7F C3 F3 78 */ mr r3, r30 -/* 800D3B3C 4B FF D7 2D */ bl setSwordModel__9daAlink_cFv -lbl_800D3B40: -/* 800D3B40 7F C3 F3 78 */ mr r3, r30 -/* 800D3B44 38 80 00 1E */ li r4, 0x1e -/* 800D3B48 4B FF D9 E5 */ bl setCutType__9daAlink_cFUc -/* 800D3B4C 38 7F 04 94 */ addi r3, r31, 0x494 -/* 800D3B50 C0 03 00 30 */ lfs f0, 0x30(r3) -/* 800D3B54 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 800D3B58 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 800D3B5C D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800D3B60 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800D3B64 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 800D3B68 41 82 00 2C */ beq lbl_800D3B94 -/* 800D3B6C C0 3E 33 98 */ lfs f1, 0x3398(r30) -/* 800D3B70 38 7F 11 9C */ addi r3, r31, 0x119c -/* 800D3B74 C0 03 00 3C */ lfs f0, 0x3c(r3) -/* 800D3B78 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800D3B7C D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800D3B80 C0 3E 04 FC */ lfs f1, 0x4fc(r30) -/* 800D3B84 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 800D3B88 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800D3B8C D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 800D3B90 48 00 00 2C */ b lbl_800D3BBC -lbl_800D3B94: -/* 800D3B94 7F C3 F3 78 */ mr r3, r30 -/* 800D3B98 38 80 00 01 */ li r4, 1 -/* 800D3B9C 38 A0 00 01 */ li r5, 1 -/* 800D3BA0 4B FE 79 19 */ bl checkHeavyStateOn__9daAlink_cFii -/* 800D3BA4 2C 03 00 00 */ cmpwi r3, 0 -/* 800D3BA8 41 82 00 14 */ beq lbl_800D3BBC -/* 800D3BAC C0 3E 04 FC */ lfs f1, 0x4fc(r30) -/* 800D3BB0 C0 02 93 2C */ lfs f0, lit_7624(r2) -/* 800D3BB4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800D3BB8 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -lbl_800D3BBC: -/* 800D3BBC 2C 1D 00 00 */ cmpwi r29, 0 -/* 800D3BC0 41 82 00 30 */ beq lbl_800D3BF0 -/* 800D3BC4 88 1E 2F 98 */ lbz r0, 0x2f98(r30) -/* 800D3BC8 28 00 00 02 */ cmplwi r0, 2 -/* 800D3BCC 40 82 00 14 */ bne lbl_800D3BE0 -/* 800D3BD0 A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 800D3BD4 38 03 40 00 */ addi r0, r3, 0x4000 -/* 800D3BD8 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800D3BDC 48 00 00 1C */ b lbl_800D3BF8 -lbl_800D3BE0: -/* 800D3BE0 A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 800D3BE4 38 03 C0 00 */ addi r0, r3, -16384 -/* 800D3BE8 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800D3BEC 48 00 00 0C */ b lbl_800D3BF8 -lbl_800D3BF0: -/* 800D3BF0 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800D3BF4 B0 1E 04 DE */ sth r0, 0x4de(r30) -lbl_800D3BF8: -/* 800D3BF8 38 7F 08 34 */ addi r3, r31, 0x834 -/* 800D3BFC A8 03 00 52 */ lha r0, 0x52(r3) -/* 800D3C00 B0 1E 30 7E */ sth r0, 0x307e(r30) -/* 800D3C04 38 7F 04 94 */ addi r3, r31, 0x494 -/* 800D3C08 C3 E3 00 08 */ lfs f31, 8(r3) -/* 800D3C0C 4B FF D3 51 */ bl getSwordAtType__9daAlink_cFv -/* 800D3C10 7C 64 1B 78 */ mr r4, r3 -/* 800D3C14 7F C3 F3 78 */ mr r3, r30 -/* 800D3C18 38 A0 00 01 */ li r5, 1 -/* 800D3C1C 38 C0 00 03 */ li r6, 3 -/* 800D3C20 38 E0 00 01 */ li r7, 1 -/* 800D3C24 39 00 00 03 */ li r8, 3 -/* 800D3C28 39 3F 04 94 */ addi r9, r31, 0x494 -/* 800D3C2C C0 29 00 4C */ lfs f1, 0x4c(r9) -/* 800D3C30 C0 42 93 30 */ lfs f2, lit_7625(r2) -/* 800D3C34 4B FF D9 0D */ bl setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff -/* 800D3C38 3C 60 00 02 */ lis r3, 0x0002 /* 0x00020003@ha */ -/* 800D3C3C 38 03 00 03 */ addi r0, r3, 0x0003 /* 0x00020003@l */ -/* 800D3C40 90 1E 32 CC */ stw r0, 0x32cc(r30) -/* 800D3C44 7F C3 F3 78 */ mr r3, r30 -/* 800D3C48 38 80 00 6D */ li r4, 0x6d -/* 800D3C4C 38 DF 04 94 */ addi r6, r31, 0x494 -/* 800D3C50 C0 26 00 04 */ lfs f1, 4(r6) -/* 800D3C54 FC 40 F8 90 */ fmr f2, f31 -/* 800D3C58 A8 BF 04 94 */ lha r5, 0x494(r31) -/* 800D3C5C C0 66 00 0C */ lfs f3, 0xc(r6) -/* 800D3C60 4B FD 93 AD */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -/* 800D3C64 7F C3 F3 78 */ mr r3, r30 -/* 800D3C68 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010097@ha */ -/* 800D3C6C 38 84 00 97 */ addi r4, r4, 0x0097 /* 0x00010097@l */ -/* 800D3C70 4B FF E6 15 */ bl setSwordVoiceSe__9daAlink_cFUl -/* 800D3C74 38 00 00 00 */ li r0, 0 -/* 800D3C78 B0 1E 30 12 */ sth r0, 0x3012(r30) -/* 800D3C7C C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 800D3C80 D0 1E 34 78 */ stfs f0, 0x3478(r30) -/* 800D3C84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D3C88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D3C8C 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 800D3C90 60 00 80 00 */ ori r0, r0, 0x8000 -/* 800D3C94 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 800D3C98 7F C3 F3 78 */ mr r3, r30 -/* 800D3C9C 48 05 04 A9 */ bl setCutWaterDropEffect__9daAlink_cFv -/* 800D3CA0 38 00 00 01 */ li r0, 1 -/* 800D3CA4 98 1E 2F D0 */ stb r0, 0x2fd0(r30) -/* 800D3CA8 38 60 00 01 */ li r3, 1 -/* 800D3CAC E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 800D3CB0 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 800D3CB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D3CB8 48 28 E5 71 */ bl _restgpr_29 -/* 800D3CBC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 800D3CC0 7C 08 03 A6 */ mtlr r0 -/* 800D3CC4 38 21 00 30 */ addi r1, r1, 0x30 -/* 800D3CC8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutFinishJumpUpLandInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutFinishJumpUpLandInit__9daAlink_cFv.s deleted file mode 100644 index 544a7188358..00000000000 --- a/asm/d/a/d_a_alink/procCutFinishJumpUpLandInit__9daAlink_cFv.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_800D3DD8: -/* 800D3DD8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D3DDC 7C 08 02 A6 */ mflr r0 -/* 800D3DE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D3DE4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D3DE8 7C 7F 1B 78 */ mr r31, r3 -/* 800D3DEC 38 80 00 24 */ li r4, 0x24 -/* 800D3DF0 4B FE E1 7D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800D3DF4 7F E3 FB 78 */ mr r3, r31 -/* 800D3DF8 48 00 31 E9 */ bl checkCutLandDamage__9daAlink_cFv -/* 800D3DFC 7F E3 FB 78 */ mr r3, r31 -/* 800D3E00 38 80 00 6E */ li r4, 0x6e -/* 800D3E04 3C A0 80 39 */ lis r5, m__21daAlinkHIO_cutFnJU_c0@ha /* 0x8038DAEC@ha */ -/* 800D3E08 38 A5 DA EC */ addi r5, r5, m__21daAlinkHIO_cutFnJU_c0@l /* 0x8038DAEC@l */ -/* 800D3E0C 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800D3E10 4B FD 92 E5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800D3E14 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800D3E18 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800D3E1C 7F E3 FB 78 */ mr r3, r31 -/* 800D3E20 38 80 00 1E */ li r4, 0x1e -/* 800D3E24 4B FF D7 09 */ bl setCutType__9daAlink_cFUc -/* 800D3E28 38 00 00 04 */ li r0, 4 -/* 800D3E2C 98 1F 2F 9D */ stb r0, 0x2f9d(r31) -/* 800D3E30 7F E3 FB 78 */ mr r3, r31 -/* 800D3E34 38 80 00 02 */ li r4, 2 -/* 800D3E38 48 04 D3 89 */ bl setFootEffectProcType__9daAlink_cFi -/* 800D3E3C 80 1F 05 84 */ lwz r0, 0x584(r31) -/* 800D3E40 60 00 00 30 */ ori r0, r0, 0x30 -/* 800D3E44 90 1F 05 84 */ stw r0, 0x584(r31) -/* 800D3E48 88 1F 05 69 */ lbz r0, 0x569(r31) -/* 800D3E4C 28 00 00 03 */ cmplwi r0, 3 -/* 800D3E50 40 82 00 20 */ bne lbl_800D3E70 -/* 800D3E54 3C 60 80 39 */ lis r3, m__21daAlinkHIO_cutFnJU_c0@ha /* 0x8038DAEC@ha */ -/* 800D3E58 38 63 DA EC */ addi r3, r3, m__21daAlinkHIO_cutFnJU_c0@l /* 0x8038DAEC@l */ -/* 800D3E5C C0 03 00 3C */ lfs f0, 0x3c(r3) -/* 800D3E60 D0 1F 34 84 */ stfs f0, 0x3484(r31) -/* 800D3E64 A8 03 00 2A */ lha r0, 0x2a(r3) -/* 800D3E68 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 800D3E6C 48 00 00 1C */ b lbl_800D3E88 -lbl_800D3E70: -/* 800D3E70 3C 60 80 39 */ lis r3, m__21daAlinkHIO_cutFnJU_c0@ha /* 0x8038DAEC@ha */ -/* 800D3E74 38 63 DA EC */ addi r3, r3, m__21daAlinkHIO_cutFnJU_c0@l /* 0x8038DAEC@l */ -/* 800D3E78 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 800D3E7C D0 1F 34 84 */ stfs f0, 0x3484(r31) -/* 800D3E80 A8 03 00 28 */ lha r0, 0x28(r3) -/* 800D3E84 B0 1F 30 08 */ sth r0, 0x3008(r31) -lbl_800D3E88: -/* 800D3E88 38 00 00 00 */ li r0, 0 -/* 800D3E8C B0 1F 30 12 */ sth r0, 0x3012(r31) -/* 800D3E90 3C 60 80 42 */ lis r3, l_halfAtnWaitBaseAnime@ha /* 0x80425544@ha */ -/* 800D3E94 C4 03 55 44 */ lfsu f0, l_halfAtnWaitBaseAnime@l(r3) /* 0x80425544@l */ -/* 800D3E98 D0 1F 35 88 */ stfs f0, 0x3588(r31) -/* 800D3E9C C0 03 00 04 */ lfs f0, 4(r3) -/* 800D3EA0 D0 1F 35 8C */ stfs f0, 0x358c(r31) -/* 800D3EA4 C0 03 00 08 */ lfs f0, 8(r3) -/* 800D3EA8 D0 1F 35 90 */ stfs f0, 0x3590(r31) -/* 800D3EAC 7F E3 FB 78 */ mr r3, r31 -/* 800D3EB0 4B FF ED 4D */ bl initCutAtnActorSearch__9daAlink_cFv -/* 800D3EB4 38 60 00 01 */ li r3, 1 -/* 800D3EB8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D3EBC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D3EC0 7C 08 03 A6 */ mtlr r0 -/* 800D3EC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D3EC8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutFinishJumpUpLand__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutFinishJumpUpLand__9daAlink_cFv.s deleted file mode 100644 index 080a4d16061..00000000000 --- a/asm/d/a/d_a_alink/procCutFinishJumpUpLand__9daAlink_cFv.s +++ /dev/null @@ -1,114 +0,0 @@ -lbl_800D3ECC: -/* 800D3ECC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D3ED0 7C 08 02 A6 */ mflr r0 -/* 800D3ED4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D3ED8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D3EDC 93 C1 00 08 */ stw r30, 8(r1) -/* 800D3EE0 7C 7E 1B 78 */ mr r30, r3 -/* 800D3EE4 4B FE 60 6D */ bl checkGroundSpecialMode__9daAlink_cFv -/* 800D3EE8 2C 03 00 00 */ cmpwi r3, 0 -/* 800D3EEC 41 82 00 0C */ beq lbl_800D3EF8 -/* 800D3EF0 38 60 00 01 */ li r3, 1 -/* 800D3EF4 48 00 01 5C */ b lbl_800D4050 -lbl_800D3EF8: -/* 800D3EF8 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800D3EFC 80 1E 05 88 */ lwz r0, 0x588(r30) -/* 800D3F00 64 00 08 00 */ oris r0, r0, 0x800 -/* 800D3F04 90 1E 05 88 */ stw r0, 0x588(r30) -/* 800D3F08 7F C3 F3 78 */ mr r3, r30 -/* 800D3F0C 4B FF E1 F1 */ bl setComboReserb__9daAlink_cFv -/* 800D3F10 7F C3 F3 78 */ mr r3, r30 -/* 800D3F14 4B FF E7 71 */ bl checkCutTurnCharge__9daAlink_cFv -/* 800D3F18 38 00 00 04 */ li r0, 4 -/* 800D3F1C 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 800D3F20 7F C3 F3 78 */ mr r3, r30 -/* 800D3F24 4B FF ED 31 */ bl checkCutAtnActorChange__9daAlink_cFv -/* 800D3F28 7F E3 FB 78 */ mr r3, r31 -/* 800D3F2C 48 08 A5 A1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800D3F30 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D3F34 41 82 00 88 */ beq lbl_800D3FBC -/* 800D3F38 80 1E 06 14 */ lwz r0, 0x614(r30) -/* 800D3F3C 28 00 00 52 */ cmplwi r0, 0x52 -/* 800D3F40 40 82 00 1C */ bne lbl_800D3F5C -/* 800D3F44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D3F48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D3F4C 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800D3F50 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800D3F54 4B F7 42 29 */ bl cutEnd__16dEvent_manager_cFi -/* 800D3F58 48 00 00 F4 */ b lbl_800D404C -lbl_800D3F5C: -/* 800D3F5C A8 1E 30 08 */ lha r0, 0x3008(r30) -/* 800D3F60 2C 00 00 00 */ cmpwi r0, 0 -/* 800D3F64 40 81 00 38 */ ble lbl_800D3F9C -/* 800D3F68 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D3F6C C0 1E 34 84 */ lfs f0, 0x3484(r30) -/* 800D3F70 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D3F74 40 81 00 18 */ ble lbl_800D3F8C -/* 800D3F78 7F C3 F3 78 */ mr r3, r30 -/* 800D3F7C 38 80 00 03 */ li r4, 3 -/* 800D3F80 4B FF E7 E1 */ bl checkCutCancelNextMode__9daAlink_cFi -/* 800D3F84 2C 03 00 00 */ cmpwi r3, 0 -/* 800D3F88 40 82 00 C4 */ bne lbl_800D404C -lbl_800D3F8C: -/* 800D3F8C A8 7E 30 08 */ lha r3, 0x3008(r30) -/* 800D3F90 38 03 FF FF */ addi r0, r3, -1 -/* 800D3F94 B0 1E 30 08 */ sth r0, 0x3008(r30) -/* 800D3F98 48 00 00 B4 */ b lbl_800D404C -lbl_800D3F9C: -/* 800D3F9C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800D3FA0 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800D3FA4 38 00 00 02 */ li r0, 2 -/* 800D3FA8 98 1E 2F 98 */ stb r0, 0x2f98(r30) -/* 800D3FAC 7F C3 F3 78 */ mr r3, r30 -/* 800D3FB0 38 80 00 00 */ li r4, 0 -/* 800D3FB4 4B FE 61 1D */ bl checkNextAction__9daAlink_cFi -/* 800D3FB8 48 00 00 94 */ b lbl_800D404C -lbl_800D3FBC: -/* 800D3FBC C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D3FC0 C0 1E 34 84 */ lfs f0, 0x3484(r30) -/* 800D3FC4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D3FC8 40 81 00 18 */ ble lbl_800D3FE0 -/* 800D3FCC 7F C3 F3 78 */ mr r3, r30 -/* 800D3FD0 38 80 00 03 */ li r4, 3 -/* 800D3FD4 4B FF E7 8D */ bl checkCutCancelNextMode__9daAlink_cFi -/* 800D3FD8 2C 03 00 00 */ cmpwi r3, 0 -/* 800D3FDC 40 82 00 70 */ bne lbl_800D404C -lbl_800D3FE0: -/* 800D3FE0 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D3FE4 C0 1E 34 84 */ lfs f0, 0x3484(r30) -/* 800D3FE8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D3FEC 40 81 00 10 */ ble lbl_800D3FFC -/* 800D3FF0 7F C3 F3 78 */ mr r3, r30 -/* 800D3FF4 38 80 00 01 */ li r4, 1 -/* 800D3FF8 4B FF D4 39 */ bl resetCombo__9daAlink_cFi -lbl_800D3FFC: -/* 800D3FFC 7F C3 F3 78 */ mr r3, r30 -/* 800D4000 A8 9E 30 10 */ lha r4, 0x3010(r30) -/* 800D4004 4B FD F7 31 */ bl setShapeAngleToAtnActor__9daAlink_cFi -/* 800D4008 7F C3 F3 78 */ mr r3, r30 -/* 800D400C 4B FD F6 25 */ bl getShapeAngleYAtnActor__9daAlink_cFv -/* 800D4010 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 800D4014 48 19 CE 11 */ bl cLib_distanceAngleS__Fss -/* 800D4018 2C 03 08 00 */ cmpwi r3, 0x800 -/* 800D401C 40 80 00 0C */ bge lbl_800D4028 -/* 800D4020 38 00 00 01 */ li r0, 1 -/* 800D4024 B0 1E 30 10 */ sth r0, 0x3010(r30) -lbl_800D4028: -/* 800D4028 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800D402C B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800D4030 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D4034 C0 02 93 34 */ lfs f0, lit_7710(r2) -/* 800D4038 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D403C 4C 41 13 82 */ cror 2, 1, 2 -/* 800D4040 40 82 00 0C */ bne lbl_800D404C -/* 800D4044 38 00 00 00 */ li r0, 0 -/* 800D4048 98 1E 2F 92 */ stb r0, 0x2f92(r30) -lbl_800D404C: -/* 800D404C 38 60 00 01 */ li r3, 1 -lbl_800D4050: -/* 800D4050 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D4054 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D4058 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D405C 7C 08 03 A6 */ mtlr r0 -/* 800D4060 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D4064 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutFinishJumpUp__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutFinishJumpUp__9daAlink_cFv.s deleted file mode 100644 index 4ecc67f4809..00000000000 --- a/asm/d/a/d_a_alink/procCutFinishJumpUp__9daAlink_cFv.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_800D3CCC: -/* 800D3CCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D3CD0 7C 08 02 A6 */ mflr r0 -/* 800D3CD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D3CD8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D3CDC 7C 7F 1B 78 */ mr r31, r3 -/* 800D3CE0 C0 23 1F E0 */ lfs f1, 0x1fe0(r3) -/* 800D3CE4 C0 02 93 1C */ lfs f0, lit_7448(r2) -/* 800D3CE8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D3CEC 4C 41 13 82 */ cror 2, 1, 2 -/* 800D3CF0 40 82 00 10 */ bne lbl_800D3D00 -/* 800D3CF4 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800D3CF8 54 00 06 2C */ rlwinm r0, r0, 0, 0x18, 0x16 -/* 800D3CFC 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_800D3D00: -/* 800D3D00 C0 3F 1F E0 */ lfs f1, 0x1fe0(r31) -/* 800D3D04 C0 02 92 C4 */ lfs f0, lit_6109(r2) -/* 800D3D08 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D3D0C 4C 41 13 82 */ cror 2, 1, 2 -/* 800D3D10 40 82 00 0C */ bne lbl_800D3D1C -/* 800D3D14 38 00 00 64 */ li r0, 0x64 -/* 800D3D18 98 1F 2F 92 */ stb r0, 0x2f92(r31) -lbl_800D3D1C: -/* 800D3D1C 80 1F 19 9C */ lwz r0, 0x199c(r31) -/* 800D3D20 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800D3D24 41 82 00 10 */ beq lbl_800D3D34 -/* 800D3D28 7F E3 FB 78 */ mr r3, r31 -/* 800D3D2C 48 00 00 AD */ bl procCutFinishJumpUpLandInit__9daAlink_cFv -/* 800D3D30 48 00 00 94 */ b lbl_800D3DC4 -lbl_800D3D34: -/* 800D3D34 80 1F 06 14 */ lwz r0, 0x614(r31) -/* 800D3D38 28 00 00 52 */ cmplwi r0, 0x52 -/* 800D3D3C 41 82 00 38 */ beq lbl_800D3D74 -/* 800D3D40 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 800D3D44 C0 3F 34 FC */ lfs f1, 0x34fc(r31) -/* 800D3D48 3C 60 80 39 */ lis r3, m__21daAlinkHIO_cutFnJU_c0@ha /* 0x8038DAEC@ha */ -/* 800D3D4C 38 A3 DA EC */ addi r5, r3, m__21daAlinkHIO_cutFnJU_c0@l /* 0x8038DAEC@l */ -/* 800D3D50 C0 05 00 44 */ lfs f0, 0x44(r5) -/* 800D3D54 EC 01 00 28 */ fsubs f0, f1, f0 -/* 800D3D58 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 800D3D5C 40 80 00 18 */ bge lbl_800D3D74 -/* 800D3D60 7F E3 FB 78 */ mr r3, r31 -/* 800D3D64 38 80 00 02 */ li r4, 2 -/* 800D3D68 C0 25 00 48 */ lfs f1, 0x48(r5) -/* 800D3D6C 4B FF 2C DD */ bl procFallInit__9daAlink_cFif -/* 800D3D70 48 00 00 54 */ b lbl_800D3DC4 -lbl_800D3D74: -/* 800D3D74 C0 3F 1F E0 */ lfs f1, 0x1fe0(r31) -/* 800D3D78 3C 60 80 39 */ lis r3, m__21daAlinkHIO_cutFnJU_c0@ha /* 0x8038DAEC@ha */ -/* 800D3D7C 38 63 DA EC */ addi r3, r3, m__21daAlinkHIO_cutFnJU_c0@l /* 0x8038DAEC@l */ -/* 800D3D80 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 800D3D84 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D3D88 4C 41 13 82 */ cror 2, 1, 2 -/* 800D3D8C 40 82 00 34 */ bne lbl_800D3DC0 -/* 800D3D90 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 800D3D94 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D3D98 40 80 00 28 */ bge lbl_800D3DC0 -/* 800D3D9C 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800D3DA0 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 800D3DA4 40 82 00 10 */ bne lbl_800D3DB4 -/* 800D3DA8 7F E3 FB 78 */ mr r3, r31 -/* 800D3DAC 80 9F 32 CC */ lwz r4, 0x32cc(r31) -/* 800D3DB0 4B FE B3 3D */ bl seStartSwordCut__9daAlink_cFUl -lbl_800D3DB4: -/* 800D3DB4 80 1F 05 80 */ lwz r0, 0x580(r31) -/* 800D3DB8 60 00 00 02 */ ori r0, r0, 2 -/* 800D3DBC 90 1F 05 80 */ stw r0, 0x580(r31) -lbl_800D3DC0: -/* 800D3DC0 38 60 00 01 */ li r3, 1 -lbl_800D3DC4: -/* 800D3DC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D3DC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D3DCC 7C 08 03 A6 */ mtlr r0 -/* 800D3DD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D3DD4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutHeadLandInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutHeadLandInit__9daAlink_cFv.s deleted file mode 100644 index a78afcebf44..00000000000 --- a/asm/d/a/d_a_alink/procCutHeadLandInit__9daAlink_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800D6130: -/* 800D6130 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D6134 7C 08 02 A6 */ mflr r0 -/* 800D6138 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D613C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D6140 7C 7F 1B 78 */ mr r31, r3 -/* 800D6144 38 80 00 2E */ li r4, 0x2e -/* 800D6148 4B FE BE 25 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800D614C 7F E3 FB 78 */ mr r3, r31 -/* 800D6150 48 00 0E 91 */ bl checkCutLandDamage__9daAlink_cFv -/* 800D6154 7F E3 FB 78 */ mr r3, r31 -/* 800D6158 38 80 00 7E */ li r4, 0x7e -/* 800D615C 3C A0 80 39 */ lis r5, m__21daAlinkHIO_cutHead_c0@ha /* 0x8038DDB8@ha */ -/* 800D6160 38 A5 DD B8 */ addi r5, r5, m__21daAlinkHIO_cutHead_c0@l /* 0x8038DDB8@l */ -/* 800D6164 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800D6168 4B FD 6F 8D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800D616C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800D6170 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800D6174 38 60 00 01 */ li r3, 1 -/* 800D6178 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D617C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D6180 7C 08 03 A6 */ mtlr r0 -/* 800D6184 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D6188 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutHeadLand__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutHeadLand__9daAlink_cFv.s deleted file mode 100644 index e444f83ad4f..00000000000 --- a/asm/d/a/d_a_alink/procCutHeadLand__9daAlink_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_800D618C: -/* 800D618C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D6190 7C 08 02 A6 */ mflr r0 -/* 800D6194 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D6198 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D619C 93 C1 00 08 */ stw r30, 8(r1) -/* 800D61A0 7C 7E 1B 78 */ mr r30, r3 -/* 800D61A4 80 03 05 88 */ lwz r0, 0x588(r3) -/* 800D61A8 64 00 08 00 */ oris r0, r0, 0x800 -/* 800D61AC 90 03 05 88 */ stw r0, 0x588(r3) -/* 800D61B0 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800D61B4 7F E3 FB 78 */ mr r3, r31 -/* 800D61B8 48 08 83 15 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800D61BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D61C0 41 82 00 38 */ beq lbl_800D61F8 -/* 800D61C4 80 1E 06 14 */ lwz r0, 0x614(r30) -/* 800D61C8 28 00 00 53 */ cmplwi r0, 0x53 -/* 800D61CC 40 82 00 1C */ bne lbl_800D61E8 -/* 800D61D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D61D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D61D8 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800D61DC 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800D61E0 4B F7 1F 9D */ bl cutEnd__16dEvent_manager_cFi -/* 800D61E4 48 00 00 38 */ b lbl_800D621C -lbl_800D61E8: -/* 800D61E8 7F C3 F3 78 */ mr r3, r30 -/* 800D61EC 38 80 00 00 */ li r4, 0 -/* 800D61F0 4B FE 3E E1 */ bl checkNextAction__9daAlink_cFi -/* 800D61F4 48 00 00 28 */ b lbl_800D621C -lbl_800D61F8: -/* 800D61F8 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D61FC 3C 60 80 39 */ lis r3, m__21daAlinkHIO_cutHead_c0@ha /* 0x8038DDB8@ha */ -/* 800D6200 38 63 DD B8 */ addi r3, r3, m__21daAlinkHIO_cutHead_c0@l /* 0x8038DDB8@l */ -/* 800D6204 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 800D6208 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D620C 40 81 00 10 */ ble lbl_800D621C -/* 800D6210 7F C3 F3 78 */ mr r3, r30 -/* 800D6214 38 80 00 01 */ li r4, 1 -/* 800D6218 4B FE 3E B9 */ bl checkNextAction__9daAlink_cFi -lbl_800D621C: -/* 800D621C 38 60 00 01 */ li r3, 1 -/* 800D6220 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D6224 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D6228 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D622C 7C 08 03 A6 */ mtlr r0 -/* 800D6230 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D6234 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutHead__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutHead__9daAlink_cFv.s deleted file mode 100644 index d56c428d9f0..00000000000 --- a/asm/d/a/d_a_alink/procCutHead__9daAlink_cFv.s +++ /dev/null @@ -1,96 +0,0 @@ -lbl_800D5FC8: -/* 800D5FC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D5FCC 7C 08 02 A6 */ mflr r0 -/* 800D5FD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D5FD4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D5FD8 93 C1 00 08 */ stw r30, 8(r1) -/* 800D5FDC 7C 7E 1B 78 */ mr r30, r3 -/* 800D5FE0 A8 03 30 0E */ lha r0, 0x300e(r3) -/* 800D5FE4 2C 00 00 00 */ cmpwi r0, 0 -/* 800D5FE8 40 82 00 80 */ bne lbl_800D6068 -/* 800D5FEC 38 7E 33 98 */ addi r3, r30, 0x3398 -/* 800D5FF0 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800D5FF4 C0 5E 34 78 */ lfs f2, 0x3478(r30) -/* 800D5FF8 48 19 A7 49 */ bl cLib_chaseF__FPfff -/* 800D5FFC C0 3E 04 FC */ lfs f1, 0x4fc(r30) -/* 800D6000 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800D6004 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D6008 4C 40 13 82 */ cror 2, 0, 2 -/* 800D600C 40 82 01 08 */ bne lbl_800D6114 -/* 800D6010 7F C3 F3 78 */ mr r3, r30 -/* 800D6014 38 80 00 7D */ li r4, 0x7d -/* 800D6018 3C A0 80 39 */ lis r5, m__21daAlinkHIO_cutHead_c0@ha /* 0x8038DDB8@ha */ -/* 800D601C 38 A5 DD B8 */ addi r5, r5, m__21daAlinkHIO_cutHead_c0@l /* 0x8038DDB8@l */ -/* 800D6020 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800D6024 4B FD 70 D1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800D6028 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800D602C D0 3E 33 98 */ stfs f1, 0x3398(r30) -/* 800D6030 D0 3E 04 FC */ stfs f1, 0x4fc(r30) -/* 800D6034 7F C3 F3 78 */ mr r3, r30 -/* 800D6038 C0 5E 05 34 */ lfs f2, 0x534(r30) -/* 800D603C 38 80 00 00 */ li r4, 0 -/* 800D6040 4B FE 57 31 */ bl setSpecialGravity__9daAlink_cFffi -/* 800D6044 38 00 00 01 */ li r0, 1 -/* 800D6048 B0 1E 30 0E */ sth r0, 0x300e(r30) -/* 800D604C 7F C3 F3 78 */ mr r3, r30 -/* 800D6050 48 04 E0 F5 */ bl setCutWaterDropEffect__9daAlink_cFv -/* 800D6054 7F C3 F3 78 */ mr r3, r30 -/* 800D6058 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010099@ha */ -/* 800D605C 38 84 00 99 */ addi r4, r4, 0x0099 /* 0x00010099@l */ -/* 800D6060 4B FF C2 25 */ bl setSwordVoiceSe__9daAlink_cFUl -/* 800D6064 48 00 00 B0 */ b lbl_800D6114 -lbl_800D6068: -/* 800D6068 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800D606C C0 3E 33 98 */ lfs f1, 0x3398(r30) -/* 800D6070 C0 02 93 70 */ lfs f0, lit_8501(r2) -/* 800D6074 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800D6078 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800D607C 7F E3 FB 78 */ mr r3, r31 -/* 800D6080 C0 22 93 74 */ lfs f1, lit_8502(r2) -/* 800D6084 48 25 23 A9 */ bl checkPass__12J3DFrameCtrlFf -/* 800D6088 2C 03 00 00 */ cmpwi r3, 0 -/* 800D608C 41 82 00 24 */ beq lbl_800D60B0 -/* 800D6090 3C 60 80 39 */ lis r3, m__21daAlinkHIO_cutHead_c0@ha /* 0x8038DDB8@ha */ -/* 800D6094 38 63 DD B8 */ addi r3, r3, m__21daAlinkHIO_cutHead_c0@l /* 0x8038DDB8@l */ -/* 800D6098 C0 03 00 48 */ lfs f0, 0x48(r3) -/* 800D609C D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 800D60A0 C0 03 00 4C */ lfs f0, 0x4c(r3) -/* 800D60A4 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800D60A8 7F C3 F3 78 */ mr r3, r30 -/* 800D60AC 4B FE 55 99 */ bl initGravity__9daAlink_cFv -lbl_800D60B0: -/* 800D60B0 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D60B4 3C 60 80 39 */ lis r3, m__21daAlinkHIO_cutHead_c0@ha /* 0x8038DDB8@ha */ -/* 800D60B8 38 63 DD B8 */ addi r3, r3, m__21daAlinkHIO_cutHead_c0@l /* 0x8038DDB8@l */ -/* 800D60BC C0 03 00 50 */ lfs f0, 0x50(r3) -/* 800D60C0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D60C4 4C 41 13 82 */ cror 2, 1, 2 -/* 800D60C8 40 82 00 38 */ bne lbl_800D6100 -/* 800D60CC C0 03 00 54 */ lfs f0, 0x54(r3) -/* 800D60D0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D60D4 40 80 00 2C */ bge lbl_800D6100 -/* 800D60D8 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800D60DC 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 800D60E0 40 82 00 14 */ bne lbl_800D60F4 -/* 800D60E4 7F C3 F3 78 */ mr r3, r30 -/* 800D60E8 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020003@ha */ -/* 800D60EC 38 84 00 03 */ addi r4, r4, 0x0003 /* 0x00020003@l */ -/* 800D60F0 4B FE 8F FD */ bl seStartSwordCut__9daAlink_cFUl -lbl_800D60F4: -/* 800D60F4 80 1E 05 80 */ lwz r0, 0x580(r30) -/* 800D60F8 60 00 00 02 */ ori r0, r0, 2 -/* 800D60FC 90 1E 05 80 */ stw r0, 0x580(r30) -lbl_800D6100: -/* 800D6100 80 1E 19 9C */ lwz r0, 0x199c(r30) -/* 800D6104 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800D6108 41 82 00 0C */ beq lbl_800D6114 -/* 800D610C 7F C3 F3 78 */ mr r3, r30 -/* 800D6110 48 00 00 21 */ bl procCutHeadLandInit__9daAlink_cFv -lbl_800D6114: -/* 800D6114 38 60 00 01 */ li r3, 1 -/* 800D6118 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D611C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D6120 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D6124 7C 08 03 A6 */ mtlr r0 -/* 800D6128 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D612C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutJumpLandInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procCutJumpLandInit__9daAlink_cFi.s deleted file mode 100644 index cdbce405ebd..00000000000 --- a/asm/d/a/d_a_alink/procCutJumpLandInit__9daAlink_cFi.s +++ /dev/null @@ -1,89 +0,0 @@ -lbl_800D452C: -/* 800D452C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D4530 7C 08 02 A6 */ mflr r0 -/* 800D4534 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D4538 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D453C 93 C1 00 08 */ stw r30, 8(r1) -/* 800D4540 7C 7E 1B 78 */ mr r30, r3 -/* 800D4544 7C 9F 23 78 */ mr r31, r4 -/* 800D4548 38 80 00 27 */ li r4, 0x27 -/* 800D454C 4B FE DA 21 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800D4550 7F C3 F3 78 */ mr r3, r30 -/* 800D4554 48 00 2A 8D */ bl checkCutLandDamage__9daAlink_cFv -/* 800D4558 7F C3 F3 78 */ mr r3, r30 -/* 800D455C 38 80 00 72 */ li r4, 0x72 -/* 800D4560 3C A0 80 39 */ lis r5, m__21daAlinkHIO_cutJump_c0@ha /* 0x8038DB40@ha */ -/* 800D4564 38 A5 DB 40 */ addi r5, r5, m__21daAlinkHIO_cutJump_c0@l /* 0x8038DB40@l */ -/* 800D4568 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800D456C 4B FD 8B 89 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800D4570 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800D4574 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 800D4578 41 82 00 28 */ beq lbl_800D45A0 -/* 800D457C 80 7E 20 60 */ lwz r3, 0x2060(r30) -/* 800D4580 C0 22 93 3C */ lfs f1, lit_7808(r2) -/* 800D4584 3C 80 80 39 */ lis r4, m__21daAlinkHIO_cutJump_c0@ha /* 0x8038DB40@ha */ -/* 800D4588 38 84 DB 40 */ addi r4, r4, m__21daAlinkHIO_cutJump_c0@l /* 0x8038DB40@l */ -/* 800D458C C0 04 00 20 */ lfs f0, 0x20(r4) -/* 800D4590 EC 21 00 32 */ fmuls f1, f1, f0 -/* 800D4594 38 80 00 00 */ li r4, 0 -/* 800D4598 38 A0 00 23 */ li r5, 0x23 -/* 800D459C 4B F3 B2 AD */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs -lbl_800D45A0: -/* 800D45A0 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800D45A4 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 800D45A8 40 82 00 58 */ bne lbl_800D4600 -/* 800D45AC 7F C3 F3 78 */ mr r3, r30 -/* 800D45B0 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020003@ha */ -/* 800D45B4 38 84 00 03 */ addi r4, r4, 0x0003 /* 0x00020003@l */ -/* 800D45B8 4B FE AB 35 */ bl seStartSwordCut__9daAlink_cFUl -/* 800D45BC 38 7E 21 F0 */ addi r3, r30, 0x21f0 -/* 800D45C0 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800D45C4 38 80 00 00 */ li r4, 0 -/* 800D45C8 38 BE 05 BC */ addi r5, r30, 0x5bc -/* 800D45CC 38 DE 34 98 */ addi r6, r30, 0x3498 -/* 800D45D0 38 FE 34 A4 */ addi r7, r30, 0x34a4 -/* 800D45D4 48 05 11 19 */ bl initBlur__14daAlink_blur_cFfiPC4cXyzPC4cXyzPC4cXyz -/* 800D45D8 7F C3 F3 78 */ mr r3, r30 -/* 800D45DC 38 80 00 01 */ li r4, 1 -/* 800D45E0 38 A0 00 03 */ li r5, 3 -/* 800D45E4 38 C0 00 01 */ li r6, 1 -/* 800D45E8 38 E0 00 03 */ li r7, 3 -/* 800D45EC 3D 00 80 39 */ lis r8, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800D45F0 39 08 DE 8C */ addi r8, r8, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800D45F4 C0 28 00 74 */ lfs f1, 0x74(r8) -/* 800D45F8 C0 48 00 78 */ lfs f2, 0x78(r8) -/* 800D45FC 4B FF D0 8D */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff -lbl_800D4600: -/* 800D4600 80 1E 05 80 */ lwz r0, 0x580(r30) -/* 800D4604 60 00 00 02 */ ori r0, r0, 2 -/* 800D4608 90 1E 05 80 */ stw r0, 0x580(r30) -/* 800D460C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800D4610 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800D4614 7F C3 F3 78 */ mr r3, r30 -/* 800D4618 38 80 00 0A */ li r4, 0xa -/* 800D461C 4B FF CF 11 */ bl setCutType__9daAlink_cFUc -/* 800D4620 38 00 00 04 */ li r0, 4 -/* 800D4624 98 1E 2F 9D */ stb r0, 0x2f9d(r30) -/* 800D4628 7F C3 F3 78 */ mr r3, r30 -/* 800D462C 38 80 00 02 */ li r4, 2 -/* 800D4630 48 04 CB 91 */ bl setFootEffectProcType__9daAlink_cFi -/* 800D4634 80 1E 05 84 */ lwz r0, 0x584(r30) -/* 800D4638 60 00 00 30 */ ori r0, r0, 0x30 -/* 800D463C 90 1E 05 84 */ stw r0, 0x584(r30) -/* 800D4640 3C 60 80 42 */ lis r3, l_halfAtnWaitBaseAnime@ha /* 0x80425544@ha */ -/* 800D4644 C4 03 55 44 */ lfsu f0, l_halfAtnWaitBaseAnime@l(r3) /* 0x80425544@l */ -/* 800D4648 D0 1E 35 88 */ stfs f0, 0x3588(r30) -/* 800D464C C0 03 00 04 */ lfs f0, 4(r3) -/* 800D4650 D0 1E 35 8C */ stfs f0, 0x358c(r30) -/* 800D4654 C0 03 00 08 */ lfs f0, 8(r3) -/* 800D4658 D0 1E 35 90 */ stfs f0, 0x3590(r30) -/* 800D465C 93 FE 31 98 */ stw r31, 0x3198(r30) -/* 800D4660 7F C3 F3 78 */ mr r3, r30 -/* 800D4664 4B FE 16 01 */ bl setStepLandVibration__9daAlink_cFv -/* 800D4668 38 60 00 01 */ li r3, 1 -/* 800D466C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D4670 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D4674 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D4678 7C 08 03 A6 */ mtlr r0 -/* 800D467C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D4680 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutJumpLand__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutJumpLand__9daAlink_cFv.s deleted file mode 100644 index caed0fff114..00000000000 --- a/asm/d/a/d_a_alink/procCutJumpLand__9daAlink_cFv.s +++ /dev/null @@ -1,95 +0,0 @@ -lbl_800D4684: -/* 800D4684 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D4688 7C 08 02 A6 */ mflr r0 -/* 800D468C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D4690 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D4694 93 C1 00 08 */ stw r30, 8(r1) -/* 800D4698 7C 7F 1B 78 */ mr r31, r3 -/* 800D469C 4B FE 58 B5 */ bl checkGroundSpecialMode__9daAlink_cFv -/* 800D46A0 2C 03 00 00 */ cmpwi r3, 0 -/* 800D46A4 41 82 00 0C */ beq lbl_800D46B0 -/* 800D46A8 38 60 00 01 */ li r3, 1 -/* 800D46AC 48 00 01 18 */ b lbl_800D47C4 -lbl_800D46B0: -/* 800D46B0 3B DF 1F D0 */ addi r30, r31, 0x1fd0 -/* 800D46B4 7F E3 FB 78 */ mr r3, r31 -/* 800D46B8 38 80 00 70 */ li r4, 0x70 -/* 800D46BC 4B FF D3 0D */ bl changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 800D46C0 2C 03 00 00 */ cmpwi r3, 0 -/* 800D46C4 41 82 00 0C */ beq lbl_800D46D0 -/* 800D46C8 38 60 00 01 */ li r3, 1 -/* 800D46CC 48 00 00 F8 */ b lbl_800D47C4 -lbl_800D46D0: -/* 800D46D0 38 00 00 04 */ li r0, 4 -/* 800D46D4 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 800D46D8 80 1F 05 88 */ lwz r0, 0x588(r31) -/* 800D46DC 64 00 08 00 */ oris r0, r0, 0x800 -/* 800D46E0 90 1F 05 88 */ stw r0, 0x588(r31) -/* 800D46E4 80 1F 31 98 */ lwz r0, 0x3198(r31) -/* 800D46E8 2C 00 00 02 */ cmpwi r0, 2 -/* 800D46EC 41 82 00 20 */ beq lbl_800D470C -/* 800D46F0 7F E3 FB 78 */ mr r3, r31 -/* 800D46F4 4B FF CC F1 */ bl checkCutTurnInput__9daAlink_cCFv -/* 800D46F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D46FC 41 82 00 10 */ beq lbl_800D470C -/* 800D4700 7F E3 FB 78 */ mr r3, r31 -/* 800D4704 4B FF CD 21 */ bl getCutTurnDirection__9daAlink_cCFv -/* 800D4708 90 7F 31 98 */ stw r3, 0x3198(r31) -lbl_800D470C: -/* 800D470C 7F C3 F3 78 */ mr r3, r30 -/* 800D4710 48 08 9D BD */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800D4714 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D4718 41 82 00 14 */ beq lbl_800D472C -/* 800D471C 7F E3 FB 78 */ mr r3, r31 -/* 800D4720 38 80 00 00 */ li r4, 0 -/* 800D4724 4B FE 59 AD */ bl checkNextAction__9daAlink_cFi -/* 800D4728 48 00 00 98 */ b lbl_800D47C0 -lbl_800D472C: -/* 800D472C C0 3E 00 10 */ lfs f1, 0x10(r30) -/* 800D4730 3C 60 80 39 */ lis r3, m__21daAlinkHIO_cutJump_c0@ha /* 0x8038DB40@ha */ -/* 800D4734 38 63 DB 40 */ addi r3, r3, m__21daAlinkHIO_cutJump_c0@l /* 0x8038DB40@l */ -/* 800D4738 C0 03 00 40 */ lfs f0, 0x40(r3) -/* 800D473C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D4740 40 81 00 20 */ ble lbl_800D4760 -/* 800D4744 80 BF 31 98 */ lwz r5, 0x3198(r31) -/* 800D4748 2C 05 00 02 */ cmpwi r5, 2 -/* 800D474C 41 82 00 14 */ beq lbl_800D4760 -/* 800D4750 7F E3 FB 78 */ mr r3, r31 -/* 800D4754 38 80 00 01 */ li r4, 1 -/* 800D4758 48 00 00 85 */ bl procCutTurnInit__9daAlink_cFii -/* 800D475C 48 00 00 64 */ b lbl_800D47C0 -lbl_800D4760: -/* 800D4760 3C 60 80 39 */ lis r3, m__21daAlinkHIO_cutJump_c0@ha /* 0x8038DB40@ha */ -/* 800D4764 38 63 DB 40 */ addi r3, r3, m__21daAlinkHIO_cutJump_c0@l /* 0x8038DB40@l */ -/* 800D4768 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 800D476C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D4770 40 81 00 2C */ ble lbl_800D479C -/* 800D4774 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800D4778 60 00 00 04 */ ori r0, r0, 4 -/* 800D477C 90 1F 31 A0 */ stw r0, 0x31a0(r31) -/* 800D4780 7F E3 FB 78 */ mr r3, r31 -/* 800D4784 38 80 00 01 */ li r4, 1 -/* 800D4788 4B FE 59 49 */ bl checkNextAction__9daAlink_cFi -/* 800D478C 2C 03 00 00 */ cmpwi r3, 0 -/* 800D4790 41 82 00 0C */ beq lbl_800D479C -/* 800D4794 38 60 00 01 */ li r3, 1 -/* 800D4798 48 00 00 2C */ b lbl_800D47C4 -lbl_800D479C: -/* 800D479C C0 3E 00 10 */ lfs f1, 0x10(r30) -/* 800D47A0 3C 60 80 39 */ lis r3, m__21daAlinkHIO_cutJump_c0@ha /* 0x8038DB40@ha */ -/* 800D47A4 38 63 DB 40 */ addi r3, r3, m__21daAlinkHIO_cutJump_c0@l /* 0x8038DB40@l */ -/* 800D47A8 C0 03 00 3C */ lfs f0, 0x3c(r3) -/* 800D47AC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D47B0 40 80 00 10 */ bge lbl_800D47C0 -/* 800D47B4 80 1F 05 80 */ lwz r0, 0x580(r31) -/* 800D47B8 60 00 00 02 */ ori r0, r0, 2 -/* 800D47BC 90 1F 05 80 */ stw r0, 0x580(r31) -lbl_800D47C0: -/* 800D47C0 38 60 00 01 */ li r3, 1 -lbl_800D47C4: -/* 800D47C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D47C8 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D47CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D47D0 7C 08 03 A6 */ mtlr r0 -/* 800D47D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D47D8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutJump__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutJump__9daAlink_cFv.s deleted file mode 100644 index 38f99070c55..00000000000 --- a/asm/d/a/d_a_alink/procCutJump__9daAlink_cFv.s +++ /dev/null @@ -1,84 +0,0 @@ -lbl_800D43F8: -/* 800D43F8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800D43FC 7C 08 02 A6 */ mflr r0 -/* 800D4400 90 01 00 24 */ stw r0, 0x24(r1) -/* 800D4404 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 800D4408 7C 7F 1B 78 */ mr r31, r3 -/* 800D440C A8 83 04 DE */ lha r4, 0x4de(r3) -/* 800D4410 A8 03 04 E6 */ lha r0, 0x4e6(r3) -/* 800D4414 7C 04 00 00 */ cmpw r4, r0 -/* 800D4418 40 82 00 60 */ bne lbl_800D4478 -/* 800D441C 38 80 00 71 */ li r4, 0x71 -/* 800D4420 4B FF D5 A9 */ bl changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 800D4424 2C 03 00 00 */ cmpwi r3, 0 -/* 800D4428 41 82 00 50 */ beq lbl_800D4478 -/* 800D442C A8 7F 04 DE */ lha r3, 0x4de(r31) -/* 800D4430 3C 63 00 01 */ addis r3, r3, 1 -/* 800D4434 38 03 80 00 */ addi r0, r3, -32768 -/* 800D4438 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800D443C C0 02 93 38 */ lfs f0, lit_7807(r2) -/* 800D4440 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800D4444 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800D4448 D0 21 00 08 */ stfs f1, 8(r1) -/* 800D444C C0 02 92 B8 */ lfs f0, lit_6040(r2) -/* 800D4450 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800D4454 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800D4458 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D445C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D4460 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 800D4464 38 80 00 05 */ li r4, 5 -/* 800D4468 38 A0 00 1F */ li r5, 0x1f -/* 800D446C 38 C1 00 08 */ addi r6, r1, 8 -/* 800D4470 4B F9 B5 B5 */ bl StartShock__12dVibration_cFii4cXyz -/* 800D4474 48 00 00 24 */ b lbl_800D4498 -lbl_800D4478: -/* 800D4478 A8 7F 04 DE */ lha r3, 0x4de(r31) -/* 800D447C A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800D4480 7C 03 00 00 */ cmpw r3, r0 -/* 800D4484 41 82 00 14 */ beq lbl_800D4498 -/* 800D4488 38 7F 33 98 */ addi r3, r31, 0x3398 -/* 800D448C C0 22 93 3C */ lfs f1, lit_7808(r2) -/* 800D4490 C0 42 92 B8 */ lfs f2, lit_6040(r2) -/* 800D4494 48 19 C2 AD */ bl cLib_chaseF__FPfff -lbl_800D4498: -/* 800D4498 7F E3 FB 78 */ mr r3, r31 -/* 800D449C 4B FF CF 49 */ bl checkCutTurnInput__9daAlink_cCFv -/* 800D44A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D44A4 41 82 00 10 */ beq lbl_800D44B4 -/* 800D44A8 7F E3 FB 78 */ mr r3, r31 -/* 800D44AC 4B FF CF 79 */ bl getCutTurnDirection__9daAlink_cCFv -/* 800D44B0 90 7F 31 98 */ stw r3, 0x3198(r31) -lbl_800D44B4: -/* 800D44B4 80 1F 19 9C */ lwz r0, 0x199c(r31) -/* 800D44B8 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800D44BC 41 82 00 14 */ beq lbl_800D44D0 -/* 800D44C0 7F E3 FB 78 */ mr r3, r31 -/* 800D44C4 80 9F 31 98 */ lwz r4, 0x3198(r31) -/* 800D44C8 48 00 00 65 */ bl procCutJumpLandInit__9daAlink_cFi -/* 800D44CC 48 00 00 48 */ b lbl_800D4514 -lbl_800D44D0: -/* 800D44D0 C0 3F 1F E0 */ lfs f1, 0x1fe0(r31) -/* 800D44D4 3C 60 80 39 */ lis r3, m__21daAlinkHIO_cutJump_c0@ha /* 0x8038DB40@ha */ -/* 800D44D8 38 63 DB 40 */ addi r3, r3, m__21daAlinkHIO_cutJump_c0@l /* 0x8038DB40@l */ -/* 800D44DC C0 03 00 38 */ lfs f0, 0x38(r3) -/* 800D44E0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D44E4 4C 41 13 82 */ cror 2, 1, 2 -/* 800D44E8 40 82 00 2C */ bne lbl_800D4514 -/* 800D44EC 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800D44F0 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 800D44F4 40 82 00 14 */ bne lbl_800D4508 -/* 800D44F8 7F E3 FB 78 */ mr r3, r31 -/* 800D44FC 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020003@ha */ -/* 800D4500 38 84 00 03 */ addi r4, r4, 0x0003 /* 0x00020003@l */ -/* 800D4504 4B FE AB E9 */ bl seStartSwordCut__9daAlink_cFUl -lbl_800D4508: -/* 800D4508 80 1F 05 80 */ lwz r0, 0x580(r31) -/* 800D450C 60 00 00 02 */ ori r0, r0, 2 -/* 800D4510 90 1F 05 80 */ stw r0, 0x580(r31) -lbl_800D4514: -/* 800D4514 38 60 00 01 */ li r3, 1 -/* 800D4518 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 800D451C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800D4520 7C 08 03 A6 */ mtlr r0 -/* 800D4524 38 21 00 20 */ addi r1, r1, 0x20 -/* 800D4528 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutLargeJumpChargeInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutLargeJumpChargeInit__9daAlink_cFv.s deleted file mode 100644 index 700322bd5e3..00000000000 --- a/asm/d/a/d_a_alink/procCutLargeJumpChargeInit__9daAlink_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_800D6238: -/* 800D6238 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D623C 7C 08 02 A6 */ mflr r0 -/* 800D6240 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D6244 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D6248 7C 7F 1B 78 */ mr r31, r3 -/* 800D624C 38 80 00 2F */ li r4, 0x2f -/* 800D6250 4B FE BD 1D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800D6254 7F E3 FB 78 */ mr r3, r31 -/* 800D6258 38 80 01 8B */ li r4, 0x18b -/* 800D625C 3C A0 80 39 */ lis r5, m__26daAlinkHIO_cutLargeJump_c0@ha /* 0x8038DE18@ha */ -/* 800D6260 38 A5 DE 18 */ addi r5, r5, m__26daAlinkHIO_cutLargeJump_c0@l /* 0x8038DE18@l */ -/* 800D6264 4B FD 6E 91 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800D6268 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800D626C D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800D6270 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800D6274 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800D6278 3C 60 80 39 */ lis r3, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800D627C 38 63 DE 8C */ addi r3, r3, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800D6280 A8 03 00 56 */ lha r0, 0x56(r3) -/* 800D6284 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800D6288 38 60 00 01 */ li r3, 1 -/* 800D628C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D6290 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D6294 7C 08 03 A6 */ mtlr r0 -/* 800D6298 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D629C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutLargeJumpCharge__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutLargeJumpCharge__9daAlink_cFv.s deleted file mode 100644 index 1530160d5a0..00000000000 --- a/asm/d/a/d_a_alink/procCutLargeJumpCharge__9daAlink_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_800D62A0: -/* 800D62A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D62A4 7C 08 02 A6 */ mflr r0 -/* 800D62A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D62AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D62B0 7C 7F 1B 78 */ mr r31, r3 -/* 800D62B4 4B FE 3C 9D */ bl checkGroundSpecialMode__9daAlink_cFv -/* 800D62B8 2C 03 00 00 */ cmpwi r3, 0 -/* 800D62BC 41 82 00 0C */ beq lbl_800D62C8 -/* 800D62C0 38 60 00 01 */ li r3, 1 -/* 800D62C4 48 00 00 9C */ b lbl_800D6360 -lbl_800D62C8: -/* 800D62C8 7F E3 FB 78 */ mr r3, r31 -/* 800D62CC 4B FF C7 09 */ bl checkDownAttackState__9daAlink_cFv -/* 800D62D0 2C 03 00 00 */ cmpwi r3, 0 -/* 800D62D4 41 82 00 14 */ beq lbl_800D62E8 -/* 800D62D8 7F E3 FB 78 */ mr r3, r31 -/* 800D62DC 38 80 00 30 */ li r4, 0x30 -/* 800D62E0 4B FD CF 89 */ bl setDoStatusEmphasys__9daAlink_cFUc -/* 800D62E4 48 00 00 30 */ b lbl_800D6314 -lbl_800D62E8: -/* 800D62E8 7F E3 FB 78 */ mr r3, r31 -/* 800D62EC 4B FF C6 09 */ bl checkCutHeadState__9daAlink_cFv -/* 800D62F0 2C 03 00 00 */ cmpwi r3, 0 -/* 800D62F4 41 82 00 14 */ beq lbl_800D6308 -/* 800D62F8 7F E3 FB 78 */ mr r3, r31 -/* 800D62FC 38 80 00 77 */ li r4, 0x77 -/* 800D6300 4B FD CF 69 */ bl setDoStatusEmphasys__9daAlink_cFUc -/* 800D6304 48 00 00 10 */ b lbl_800D6314 -lbl_800D6308: -/* 800D6308 7F E3 FB 78 */ mr r3, r31 -/* 800D630C 38 80 00 86 */ li r4, 0x86 -/* 800D6310 4B FD CF 41 */ bl setDoStatus__9daAlink_cFUc -lbl_800D6314: -/* 800D6314 7F E3 FB 78 */ mr r3, r31 -/* 800D6318 4B FF BF A5 */ bl setSwordChargeVoiceSe__9daAlink_cFv -/* 800D631C 88 1F 2F 8E */ lbz r0, 0x2f8e(r31) -/* 800D6320 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 800D6324 40 82 00 1C */ bne lbl_800D6340 -/* 800D6328 80 1F 06 14 */ lwz r0, 0x614(r31) -/* 800D632C 28 00 00 5C */ cmplwi r0, 0x5c -/* 800D6330 41 82 00 10 */ beq lbl_800D6340 -/* 800D6334 7F E3 FB 78 */ mr r3, r31 -/* 800D6338 4B FF C4 AD */ bl checkDoCutAction__9daAlink_cFv -/* 800D633C 48 00 00 20 */ b lbl_800D635C -lbl_800D6340: -/* 800D6340 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800D6344 48 08 81 89 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800D6348 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D634C 41 82 00 10 */ beq lbl_800D635C -/* 800D6350 7F E3 FB 78 */ mr r3, r31 -/* 800D6354 38 80 00 01 */ li r4, 1 -/* 800D6358 4B FF EA 85 */ bl procCutTurnMoveInit__9daAlink_cFi -lbl_800D635C: -/* 800D635C 38 60 00 01 */ li r3, 1 -lbl_800D6360: -/* 800D6360 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D6364 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D6368 7C 08 03 A6 */ mtlr r0 -/* 800D636C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D6370 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutLargeJumpInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutLargeJumpInit__9daAlink_cFv.s deleted file mode 100644 index 68ca0224fd0..00000000000 --- a/asm/d/a/d_a_alink/procCutLargeJumpInit__9daAlink_cFv.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_800D6374: -/* 800D6374 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D6378 7C 08 02 A6 */ mflr r0 -/* 800D637C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D6380 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D6384 7C 7F 1B 78 */ mr r31, r3 -/* 800D6388 80 03 06 14 */ lwz r0, 0x614(r3) -/* 800D638C 28 00 00 56 */ cmplwi r0, 0x56 -/* 800D6390 40 82 00 20 */ bne lbl_800D63B0 -/* 800D6394 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) -/* 800D6398 28 00 00 30 */ cmplwi r0, 0x30 -/* 800D639C 41 82 00 0C */ beq lbl_800D63A8 -/* 800D63A0 28 00 00 31 */ cmplwi r0, 0x31 -/* 800D63A4 40 82 00 0C */ bne lbl_800D63B0 -lbl_800D63A8: -/* 800D63A8 38 60 00 01 */ li r3, 1 -/* 800D63AC 48 00 00 C4 */ b lbl_800D6470 -lbl_800D63B0: -/* 800D63B0 7F E3 FB 78 */ mr r3, r31 -/* 800D63B4 38 80 00 30 */ li r4, 0x30 -/* 800D63B8 4B FE BB B5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800D63BC 7F E3 FB 78 */ mr r3, r31 -/* 800D63C0 38 80 01 8C */ li r4, 0x18c -/* 800D63C4 3C A0 80 39 */ lis r5, m__26daAlinkHIO_cutLargeJump_c0@ha /* 0x8038DE18@ha */ -/* 800D63C8 38 A5 DE 18 */ addi r5, r5, m__26daAlinkHIO_cutLargeJump_c0@l /* 0x8038DE18@l */ -/* 800D63CC 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800D63D0 4B FD 6D 25 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800D63D4 3C 60 80 42 */ lis r3, l_halfAtnWaitBaseAnime@ha /* 0x80425544@ha */ -/* 800D63D8 C4 03 55 44 */ lfsu f0, l_halfAtnWaitBaseAnime@l(r3) /* 0x80425544@l */ -/* 800D63DC D0 1F 35 88 */ stfs f0, 0x3588(r31) -/* 800D63E0 C0 03 00 04 */ lfs f0, 4(r3) -/* 800D63E4 D0 1F 35 8C */ stfs f0, 0x358c(r31) -/* 800D63E8 C0 03 00 08 */ lfs f0, 8(r3) -/* 800D63EC D0 1F 35 90 */ stfs f0, 0x3590(r31) -/* 800D63F0 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800D63F4 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800D63F8 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800D63FC B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800D6400 38 00 00 00 */ li r0, 0 -/* 800D6404 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800D6408 7F E3 FB 78 */ mr r3, r31 -/* 800D640C 38 80 00 00 */ li r4, 0 -/* 800D6410 38 A0 00 01 */ li r5, 1 -/* 800D6414 38 C0 00 01 */ li r6, 1 -/* 800D6418 38 E0 00 02 */ li r7, 2 -/* 800D641C 3D 00 80 39 */ lis r8, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800D6420 39 08 DE 8C */ addi r8, r8, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800D6424 C0 28 00 74 */ lfs f1, 0x74(r8) -/* 800D6428 C0 48 00 78 */ lfs f2, 0x78(r8) -/* 800D642C 4B FF B2 5D */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff -/* 800D6430 7F E3 FB 78 */ mr r3, r31 -/* 800D6434 38 80 00 12 */ li r4, 0x12 -/* 800D6438 4B FF B0 F5 */ bl setCutType__9daAlink_cFUc -/* 800D643C 7F E3 FB 78 */ mr r3, r31 -/* 800D6440 3C 80 00 01 */ lis r4, 0x0001 /* 0x0001009B@ha */ -/* 800D6444 38 84 00 9B */ addi r4, r4, 0x009B /* 0x0001009B@l */ -/* 800D6448 4B FF BE 3D */ bl setSwordVoiceSe__9daAlink_cFUl -/* 800D644C 7F E3 FB 78 */ mr r3, r31 -/* 800D6450 48 04 DC F5 */ bl setCutWaterDropEffect__9daAlink_cFv -/* 800D6454 38 00 00 04 */ li r0, 4 -/* 800D6458 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 800D645C 38 00 00 00 */ li r0, 0 -/* 800D6460 B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 800D6464 38 00 00 02 */ li r0, 2 -/* 800D6468 90 1F 31 98 */ stw r0, 0x3198(r31) -/* 800D646C 38 60 00 01 */ li r3, 1 -lbl_800D6470: -/* 800D6470 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D6474 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D6478 7C 08 03 A6 */ mtlr r0 -/* 800D647C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D6480 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutLargeJumpLandInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procCutLargeJumpLandInit__9daAlink_cFi.s deleted file mode 100644 index 84bb408feba..00000000000 --- a/asm/d/a/d_a_alink/procCutLargeJumpLandInit__9daAlink_cFi.s +++ /dev/null @@ -1,80 +0,0 @@ -lbl_800D66C0: -/* 800D66C0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800D66C4 7C 08 02 A6 */ mflr r0 -/* 800D66C8 90 01 00 24 */ stw r0, 0x24(r1) -/* 800D66CC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 800D66D0 93 C1 00 18 */ stw r30, 0x18(r1) -/* 800D66D4 7C 7E 1B 78 */ mr r30, r3 -/* 800D66D8 7C 9F 23 78 */ mr r31, r4 -/* 800D66DC 38 80 00 31 */ li r4, 0x31 -/* 800D66E0 4B FE B8 8D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800D66E4 7F C3 F3 78 */ mr r3, r30 -/* 800D66E8 48 00 08 F9 */ bl checkCutLandDamage__9daAlink_cFv -/* 800D66EC 7F C3 F3 78 */ mr r3, r30 -/* 800D66F0 38 80 01 8E */ li r4, 0x18e -/* 800D66F4 3C A0 80 39 */ lis r5, m__26daAlinkHIO_cutLargeJump_c0@ha /* 0x8038DE18@ha */ -/* 800D66F8 38 A5 DE 18 */ addi r5, r5, m__26daAlinkHIO_cutLargeJump_c0@l /* 0x8038DE18@l */ -/* 800D66FC 38 A5 00 3C */ addi r5, r5, 0x3c -/* 800D6700 4B FD 69 F5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800D6704 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800D6708 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800D670C 38 00 00 0C */ li r0, 0xc -/* 800D6710 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 800D6714 3C 60 80 42 */ lis r3, l_halfAtnWaitBaseAnime@ha /* 0x80425544@ha */ -/* 800D6718 C4 03 55 44 */ lfsu f0, l_halfAtnWaitBaseAnime@l(r3) /* 0x80425544@l */ -/* 800D671C D0 1E 35 88 */ stfs f0, 0x3588(r30) -/* 800D6720 C0 03 00 04 */ lfs f0, 4(r3) -/* 800D6724 D0 1E 35 8C */ stfs f0, 0x358c(r30) -/* 800D6728 C0 03 00 08 */ lfs f0, 8(r3) -/* 800D672C D0 1E 35 90 */ stfs f0, 0x3590(r30) -/* 800D6730 38 00 00 04 */ li r0, 4 -/* 800D6734 98 1E 2F 9D */ stb r0, 0x2f9d(r30) -/* 800D6738 7F C3 F3 78 */ mr r3, r30 -/* 800D673C 38 80 00 04 */ li r4, 4 -/* 800D6740 48 04 AA 81 */ bl setFootEffectProcType__9daAlink_cFi -/* 800D6744 80 1E 05 84 */ lwz r0, 0x584(r30) -/* 800D6748 60 00 00 30 */ ori r0, r0, 0x30 -/* 800D674C 90 1E 05 84 */ stw r0, 0x584(r30) -/* 800D6750 80 1E 05 80 */ lwz r0, 0x580(r30) -/* 800D6754 60 00 00 02 */ ori r0, r0, 2 -/* 800D6758 90 1E 05 80 */ stw r0, 0x580(r30) -/* 800D675C 7F C3 F3 78 */ mr r3, r30 -/* 800D6760 38 80 00 13 */ li r4, 0x13 -/* 800D6764 4B FF AD C9 */ bl setCutType__9daAlink_cFUc -/* 800D6768 3C 60 80 39 */ lis r3, m__26daAlinkHIO_cutLargeJump_c0@ha /* 0x8038DE18@ha */ -/* 800D676C 38 63 DE 18 */ addi r3, r3, m__26daAlinkHIO_cutLargeJump_c0@l /* 0x8038DE18@l */ -/* 800D6770 C0 03 00 6C */ lfs f0, 0x6c(r3) -/* 800D6774 D0 1E 34 78 */ stfs f0, 0x3478(r30) -/* 800D6778 C0 02 93 04 */ lfs f0, lit_6896(r2) -/* 800D677C D0 1E 34 7C */ stfs f0, 0x347c(r30) -/* 800D6780 38 00 00 00 */ li r0, 0 -/* 800D6784 B0 1E 30 0C */ sth r0, 0x300c(r30) -/* 800D6788 93 FE 31 98 */ stw r31, 0x3198(r30) -/* 800D678C C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800D6790 D0 21 00 08 */ stfs f1, 8(r1) -/* 800D6794 C0 02 92 B8 */ lfs f0, lit_6040(r2) -/* 800D6798 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800D679C D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800D67A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D67A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D67A8 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 800D67AC 38 80 00 03 */ li r4, 3 -/* 800D67B0 38 A0 00 1F */ li r5, 0x1f -/* 800D67B4 38 C1 00 08 */ addi r6, r1, 8 -/* 800D67B8 4B F9 92 6D */ bl StartShock__12dVibration_cFii4cXyz -/* 800D67BC 7F C3 F3 78 */ mr r3, r30 -/* 800D67C0 48 04 CC 75 */ bl setCutLargeJumpLandEffect__9daAlink_cFv -/* 800D67C4 7F C3 F3 78 */ mr r3, r30 -/* 800D67C8 3C 80 00 02 */ lis r4, 0x0002 /* 0x000200B3@ha */ -/* 800D67CC 38 84 00 B3 */ addi r4, r4, 0x00B3 /* 0x000200B3@l */ -/* 800D67D0 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 800D67D4 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 800D67D8 7D 89 03 A6 */ mtctr r12 -/* 800D67DC 4E 80 04 21 */ bctrl -/* 800D67E0 38 60 00 01 */ li r3, 1 -/* 800D67E4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 800D67E8 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 800D67EC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800D67F0 7C 08 03 A6 */ mtlr r0 -/* 800D67F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800D67F8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutLargeJumpLand__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutLargeJumpLand__9daAlink_cFv.s deleted file mode 100644 index e1d6c247595..00000000000 --- a/asm/d/a/d_a_alink/procCutLargeJumpLand__9daAlink_cFv.s +++ /dev/null @@ -1,108 +0,0 @@ -lbl_800D67FC: -/* 800D67FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D6800 7C 08 02 A6 */ mflr r0 -/* 800D6804 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D6808 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D680C 93 C1 00 08 */ stw r30, 8(r1) -/* 800D6810 7C 7F 1B 78 */ mr r31, r3 -/* 800D6814 3B DF 1F D0 */ addi r30, r31, 0x1fd0 -/* 800D6818 80 03 05 88 */ lwz r0, 0x588(r3) -/* 800D681C 64 00 08 00 */ oris r0, r0, 0x800 -/* 800D6820 90 03 05 88 */ stw r0, 0x588(r3) -/* 800D6824 38 00 00 04 */ li r0, 4 -/* 800D6828 98 03 2F 99 */ stb r0, 0x2f99(r3) -/* 800D682C 80 03 31 98 */ lwz r0, 0x3198(r3) -/* 800D6830 2C 00 00 02 */ cmpwi r0, 2 -/* 800D6834 41 82 00 1C */ beq lbl_800D6850 -/* 800D6838 4B FF AB AD */ bl checkCutTurnInput__9daAlink_cCFv -/* 800D683C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D6840 41 82 00 10 */ beq lbl_800D6850 -/* 800D6844 7F E3 FB 78 */ mr r3, r31 -/* 800D6848 4B FF AB DD */ bl getCutTurnDirection__9daAlink_cCFv -/* 800D684C 90 7F 31 98 */ stw r3, 0x3198(r31) -lbl_800D6850: -/* 800D6850 7F C3 F3 78 */ mr r3, r30 -/* 800D6854 48 08 7C 79 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800D6858 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D685C 41 82 00 38 */ beq lbl_800D6894 -/* 800D6860 80 1F 06 14 */ lwz r0, 0x614(r31) -/* 800D6864 28 00 00 56 */ cmplwi r0, 0x56 -/* 800D6868 40 82 00 1C */ bne lbl_800D6884 -/* 800D686C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D6870 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D6874 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800D6878 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 800D687C 4B F7 19 01 */ bl cutEnd__16dEvent_manager_cFi -/* 800D6880 48 00 00 F0 */ b lbl_800D6970 -lbl_800D6884: -/* 800D6884 7F E3 FB 78 */ mr r3, r31 -/* 800D6888 38 80 00 00 */ li r4, 0 -/* 800D688C 4B FE 38 45 */ bl checkNextAction__9daAlink_cFi -/* 800D6890 48 00 00 E0 */ b lbl_800D6970 -lbl_800D6894: -/* 800D6894 C0 3E 00 10 */ lfs f1, 0x10(r30) -/* 800D6898 3C 60 80 39 */ lis r3, m__26daAlinkHIO_cutLargeJump_c0@ha /* 0x8038DE18@ha */ -/* 800D689C 38 63 DE 18 */ addi r3, r3, m__26daAlinkHIO_cutLargeJump_c0@l /* 0x8038DE18@l */ -/* 800D68A0 C0 03 00 70 */ lfs f0, 0x70(r3) -/* 800D68A4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D68A8 40 81 00 20 */ ble lbl_800D68C8 -/* 800D68AC 80 BF 31 98 */ lwz r5, 0x3198(r31) -/* 800D68B0 2C 05 00 02 */ cmpwi r5, 2 -/* 800D68B4 41 82 00 14 */ beq lbl_800D68C8 -/* 800D68B8 7F E3 FB 78 */ mr r3, r31 -/* 800D68BC 38 80 00 01 */ li r4, 1 -/* 800D68C0 4B FF DF 1D */ bl procCutTurnInit__9daAlink_cFii -/* 800D68C4 48 00 00 AC */ b lbl_800D6970 -lbl_800D68C8: -/* 800D68C8 3C 60 80 39 */ lis r3, m__26daAlinkHIO_cutLargeJump_c0@ha /* 0x8038DE18@ha */ -/* 800D68CC 38 63 DE 18 */ addi r3, r3, m__26daAlinkHIO_cutLargeJump_c0@l /* 0x8038DE18@l */ -/* 800D68D0 C0 03 00 4C */ lfs f0, 0x4c(r3) -/* 800D68D4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D68D8 40 81 00 14 */ ble lbl_800D68EC -/* 800D68DC 7F E3 FB 78 */ mr r3, r31 -/* 800D68E0 38 80 00 01 */ li r4, 1 -/* 800D68E4 4B FE 37 ED */ bl checkNextAction__9daAlink_cFi -/* 800D68E8 48 00 00 88 */ b lbl_800D6970 -lbl_800D68EC: -/* 800D68EC C0 03 00 68 */ lfs f0, 0x68(r3) -/* 800D68F0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D68F4 40 80 00 7C */ bge lbl_800D6970 -/* 800D68F8 80 1F 05 80 */ lwz r0, 0x580(r31) -/* 800D68FC 60 00 00 02 */ ori r0, r0, 2 -/* 800D6900 90 1F 05 80 */ stw r0, 0x580(r31) -/* 800D6904 C0 3E 00 10 */ lfs f1, 0x10(r30) -/* 800D6908 C0 03 00 64 */ lfs f0, 0x64(r3) -/* 800D690C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D6910 4C 41 13 82 */ cror 2, 1, 2 -/* 800D6914 40 82 00 5C */ bne lbl_800D6970 -/* 800D6918 A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 800D691C 2C 00 00 00 */ cmpwi r0, 0 -/* 800D6920 40 82 00 34 */ bne lbl_800D6954 -/* 800D6924 7F E3 FB 78 */ mr r3, r31 -/* 800D6928 38 80 00 00 */ li r4, 0 -/* 800D692C 4B FD 40 B1 */ bl resetAtCollision__9daAlink_cFi -/* 800D6930 38 00 00 01 */ li r0, 1 -/* 800D6934 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800D6938 7F E3 FB 78 */ mr r3, r31 -/* 800D693C 38 80 00 14 */ li r4, 0x14 -/* 800D6940 4B FF AB ED */ bl setCutType__9daAlink_cFUc -/* 800D6944 7F E3 FB 78 */ mr r3, r31 -/* 800D6948 C0 3F 34 7C */ lfs f1, 0x347c(r31) -/* 800D694C 38 80 00 04 */ li r4, 4 -/* 800D6950 4B FF A6 41 */ bl initCutTurnAt__9daAlink_cFfi -lbl_800D6954: -/* 800D6954 38 7F 34 7C */ addi r3, r31, 0x347c -/* 800D6958 C0 3F 34 78 */ lfs f1, 0x3478(r31) -/* 800D695C C0 42 93 78 */ lfs f2, lit_8676(r2) -/* 800D6960 48 19 9D E1 */ bl cLib_chaseF__FPfff -/* 800D6964 38 7F 10 DC */ addi r3, r31, 0x10dc -/* 800D6968 C0 3F 34 7C */ lfs f1, 0x347c(r31) -/* 800D696C 48 19 8D 9D */ bl SetR__8cM3dGSphFf -lbl_800D6970: -/* 800D6970 38 60 00 01 */ li r3, 1 -/* 800D6974 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D6978 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D697C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D6980 7C 08 03 A6 */ mtlr r0 -/* 800D6984 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D6988 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutNormalInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procCutNormalInit__9daAlink_cFi.s deleted file mode 100644 index b472e002a37..00000000000 --- a/asm/d/a/d_a_alink/procCutNormalInit__9daAlink_cFi.s +++ /dev/null @@ -1,168 +0,0 @@ -lbl_800D2F58: -/* 800D2F58 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800D2F5C 7C 08 02 A6 */ mflr r0 -/* 800D2F60 90 01 00 24 */ stw r0, 0x24(r1) -/* 800D2F64 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D2F68 48 28 F2 6D */ bl _savegpr_27 -/* 800D2F6C 7C 7D 1B 78 */ mr r29, r3 -/* 800D2F70 7C 9B 23 78 */ mr r27, r4 -/* 800D2F74 3C 80 80 39 */ lis r4, lit_3757@ha /* 0x8038D658@ha */ -/* 800D2F78 3B E4 D6 58 */ addi r31, r4, lit_3757@l /* 0x8038D658@l */ -/* 800D2F7C 57 60 20 36 */ slwi r0, r27, 4 -/* 800D2F80 3B DF 41 B0 */ addi r30, r31, 0x41b0 -/* 800D2F84 7F DE 02 14 */ add r30, r30, r0 -/* 800D2F88 38 80 00 21 */ li r4, 0x21 -/* 800D2F8C 4B FE EF E1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800D2F90 7F A3 EB 78 */ mr r3, r29 -/* 800D2F94 88 9E 00 08 */ lbz r4, 8(r30) -/* 800D2F98 4B FF E5 95 */ bl setCutType__9daAlink_cFUc -/* 800D2F9C 80 1E 00 04 */ lwz r0, 4(r30) -/* 800D2FA0 90 1D 31 98 */ stw r0, 0x3198(r29) -/* 800D2FA4 2C 1B 00 01 */ cmpwi r27, 1 -/* 800D2FA8 40 82 00 0C */ bne lbl_800D2FB4 -/* 800D2FAC 3B 7F 03 0C */ addi r27, r31, 0x30c -/* 800D2FB0 48 00 00 38 */ b lbl_800D2FE8 -lbl_800D2FB4: -/* 800D2FB4 2C 1B 00 02 */ cmpwi r27, 2 -/* 800D2FB8 40 82 00 0C */ bne lbl_800D2FC4 -/* 800D2FBC 3B 7F 03 2C */ addi r27, r31, 0x32c -/* 800D2FC0 48 00 00 28 */ b lbl_800D2FE8 -lbl_800D2FC4: -/* 800D2FC4 2C 1B 00 04 */ cmpwi r27, 4 -/* 800D2FC8 40 82 00 0C */ bne lbl_800D2FD4 -/* 800D2FCC 3B 7F 03 6C */ addi r27, r31, 0x36c -/* 800D2FD0 48 00 00 18 */ b lbl_800D2FE8 -lbl_800D2FD4: -/* 800D2FD4 2C 1B 00 03 */ cmpwi r27, 3 -/* 800D2FD8 40 82 00 0C */ bne lbl_800D2FE4 -/* 800D2FDC 3B 7F 03 4C */ addi r27, r31, 0x34c -/* 800D2FE0 48 00 00 08 */ b lbl_800D2FE8 -lbl_800D2FE4: -/* 800D2FE4 3B 7F 02 EC */ addi r27, r31, 0x2ec -lbl_800D2FE8: -/* 800D2FE8 C0 1B 00 18 */ lfs f0, 0x18(r27) -/* 800D2FEC D0 1D 34 78 */ stfs f0, 0x3478(r29) -/* 800D2FF0 C0 1B 00 1C */ lfs f0, 0x1c(r27) -/* 800D2FF4 D0 1D 34 7C */ stfs f0, 0x347c(r29) -/* 800D2FF8 C0 1B 00 14 */ lfs f0, 0x14(r27) -/* 800D2FFC D0 1D 34 80 */ stfs f0, 0x3480(r29) -/* 800D3000 7F A3 EB 78 */ mr r3, r29 -/* 800D3004 38 80 00 01 */ li r4, 1 -/* 800D3008 38 A0 00 01 */ li r5, 1 -/* 800D300C 4B FE 84 AD */ bl checkHeavyStateOn__9daAlink_cFii -/* 800D3010 2C 03 00 00 */ cmpwi r3, 0 -/* 800D3014 41 82 00 14 */ beq lbl_800D3028 -/* 800D3018 C0 3D 34 80 */ lfs f1, 0x3480(r29) -/* 800D301C C0 1D 34 34 */ lfs f0, 0x3434(r29) -/* 800D3020 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800D3024 D0 1D 34 80 */ stfs f0, 0x3480(r29) -lbl_800D3028: -/* 800D3028 C0 1B 00 10 */ lfs f0, 0x10(r27) -/* 800D302C D0 1D 34 84 */ stfs f0, 0x3484(r29) -/* 800D3030 7F A3 EB 78 */ mr r3, r29 -/* 800D3034 4B FE CD 7D */ bl checkZoraWearAbility__9daAlink_cCFv -/* 800D3038 2C 03 00 00 */ cmpwi r3, 0 -/* 800D303C 40 82 00 18 */ bne lbl_800D3054 -/* 800D3040 80 1D 05 70 */ lwz r0, 0x570(r29) -/* 800D3044 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 800D3048 41 82 00 0C */ beq lbl_800D3054 -/* 800D304C C0 7E 00 0C */ lfs f3, 0xc(r30) -/* 800D3050 48 00 00 08 */ b lbl_800D3058 -lbl_800D3054: -/* 800D3054 C0 7B 00 0C */ lfs f3, 0xc(r27) -lbl_800D3058: -/* 800D3058 7F A3 EB 78 */ mr r3, r29 -/* 800D305C 80 9E 00 00 */ lwz r4, 0(r30) -/* 800D3060 C0 3B 00 04 */ lfs f1, 4(r27) -/* 800D3064 C0 5B 00 08 */ lfs f2, 8(r27) -/* 800D3068 A8 BB 00 00 */ lha r5, 0(r27) -/* 800D306C 4B FD 9F A1 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -/* 800D3070 A8 1D 04 E6 */ lha r0, 0x4e6(r29) -/* 800D3074 B0 1D 04 DE */ sth r0, 0x4de(r29) -/* 800D3078 83 9D 27 E0 */ lwz r28, 0x27e0(r29) -/* 800D307C 3B 60 00 01 */ li r27, 1 -/* 800D3080 7F 83 E3 78 */ mr r3, r28 -/* 800D3084 4B FA 07 61 */ bl LockonTruth__12dAttention_cFv -/* 800D3088 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D308C 40 82 00 14 */ bne lbl_800D30A0 -/* 800D3090 80 1C 03 34 */ lwz r0, 0x334(r28) -/* 800D3094 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 800D3098 40 82 00 08 */ bne lbl_800D30A0 -/* 800D309C 3B 60 00 00 */ li r27, 0 -lbl_800D30A0: -/* 800D30A0 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 800D30A4 40 82 00 20 */ bne lbl_800D30C4 -/* 800D30A8 C0 3D 33 AC */ lfs f1, 0x33ac(r29) -/* 800D30AC C0 02 92 A4 */ lfs f0, lit_6021(r2) -/* 800D30B0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D30B4 40 81 00 10 */ ble lbl_800D30C4 -/* 800D30B8 A8 1D 2F E2 */ lha r0, 0x2fe2(r29) -/* 800D30BC B0 1D 30 0C */ sth r0, 0x300c(r29) -/* 800D30C0 48 00 00 0C */ b lbl_800D30CC -lbl_800D30C4: -/* 800D30C4 A8 1D 04 E6 */ lha r0, 0x4e6(r29) -/* 800D30C8 B0 1D 30 0C */ sth r0, 0x300c(r29) -lbl_800D30CC: -/* 800D30CC 88 1D 05 69 */ lbz r0, 0x569(r29) -/* 800D30D0 28 00 00 01 */ cmplwi r0, 1 -/* 800D30D4 41 82 00 0C */ beq lbl_800D30E0 -/* 800D30D8 38 00 00 0C */ li r0, 0xc -/* 800D30DC 98 1D 2F 99 */ stb r0, 0x2f99(r29) -lbl_800D30E0: -/* 800D30E0 3C 60 80 42 */ lis r3, l_halfAtnWaitBaseAnime@ha /* 0x80425544@ha */ -/* 800D30E4 C4 03 55 44 */ lfsu f0, l_halfAtnWaitBaseAnime@l(r3) /* 0x80425544@l */ -/* 800D30E8 D0 1D 35 88 */ stfs f0, 0x3588(r29) -/* 800D30EC C0 03 00 04 */ lfs f0, 4(r3) -/* 800D30F0 D0 1D 35 8C */ stfs f0, 0x358c(r29) -/* 800D30F4 C0 03 00 08 */ lfs f0, 8(r3) -/* 800D30F8 D0 1D 35 90 */ stfs f0, 0x3590(r29) -/* 800D30FC 39 1F 08 34 */ addi r8, r31, 0x834 -/* 800D3100 A8 08 00 52 */ lha r0, 0x52(r8) -/* 800D3104 B0 1D 30 7E */ sth r0, 0x307e(r29) -/* 800D3108 7F A3 EB 78 */ mr r3, r29 -/* 800D310C 38 80 00 00 */ li r4, 0 -/* 800D3110 38 A0 00 01 */ li r5, 1 -/* 800D3114 88 DE 00 09 */ lbz r6, 9(r30) -/* 800D3118 38 E0 00 02 */ li r7, 2 -/* 800D311C C0 28 00 74 */ lfs f1, 0x74(r8) -/* 800D3120 C0 48 00 78 */ lfs f2, 0x78(r8) -/* 800D3124 4B FF E5 65 */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff -/* 800D3128 7F A3 EB 78 */ mr r3, r29 -/* 800D312C 4B FF F1 D9 */ bl setSwordComboVoice__9daAlink_cFv -/* 800D3130 38 00 00 00 */ li r0, 0 -/* 800D3134 B0 1D 30 12 */ sth r0, 0x3012(r29) -/* 800D3138 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D313C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D3140 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 800D3144 60 00 80 00 */ ori r0, r0, 0x8000 -/* 800D3148 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 800D314C 7F A3 EB 78 */ mr r3, r29 -/* 800D3150 48 05 0F F5 */ bl setCutWaterDropEffect__9daAlink_cFv -/* 800D3154 7F A3 EB 78 */ mr r3, r29 -/* 800D3158 4B FF F5 95 */ bl getCutDirection__9daAlink_cFv -/* 800D315C 88 1D 05 69 */ lbz r0, 0x569(r29) -/* 800D3160 28 00 00 01 */ cmplwi r0, 1 -/* 800D3164 40 82 00 20 */ bne lbl_800D3184 -/* 800D3168 2C 03 00 02 */ cmpwi r3, 2 -/* 800D316C 41 82 00 0C */ beq lbl_800D3178 -/* 800D3170 2C 03 00 03 */ cmpwi r3, 3 -/* 800D3174 40 82 00 10 */ bne lbl_800D3184 -lbl_800D3178: -/* 800D3178 38 00 00 01 */ li r0, 1 -/* 800D317C B0 1D 30 0E */ sth r0, 0x300e(r29) -/* 800D3180 48 00 00 0C */ b lbl_800D318C -lbl_800D3184: -/* 800D3184 38 00 00 00 */ li r0, 0 -/* 800D3188 B0 1D 30 0E */ sth r0, 0x300e(r29) -lbl_800D318C: -/* 800D318C 38 00 00 04 */ li r0, 4 -/* 800D3190 B0 1D 30 0A */ sth r0, 0x300a(r29) -/* 800D3194 7F A3 EB 78 */ mr r3, r29 -/* 800D3198 4B FF FA 65 */ bl initCutAtnActorSearch__9daAlink_cFv -/* 800D319C 38 60 00 01 */ li r3, 1 -/* 800D31A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D31A4 48 28 F0 7D */ bl _restgpr_27 -/* 800D31A8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800D31AC 7C 08 03 A6 */ mtlr r0 -/* 800D31B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800D31B4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutNormal__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutNormal__9daAlink_cFv.s deleted file mode 100644 index 5c99251cb99..00000000000 --- a/asm/d/a/d_a_alink/procCutNormal__9daAlink_cFv.s +++ /dev/null @@ -1,222 +0,0 @@ -lbl_800D31B8: -/* 800D31B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D31BC 7C 08 02 A6 */ mflr r0 -/* 800D31C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D31C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D31C8 93 C1 00 08 */ stw r30, 8(r1) -/* 800D31CC 7C 7E 1B 78 */ mr r30, r3 -/* 800D31D0 4B FE 6D 81 */ bl checkGroundSpecialMode__9daAlink_cFv -/* 800D31D4 2C 03 00 00 */ cmpwi r3, 0 -/* 800D31D8 41 82 00 0C */ beq lbl_800D31E4 -/* 800D31DC 38 60 00 01 */ li r3, 1 -/* 800D31E0 48 00 02 E0 */ b lbl_800D34C0 -lbl_800D31E4: -/* 800D31E4 7F C3 F3 78 */ mr r3, r30 -/* 800D31E8 38 80 00 01 */ li r4, 1 -/* 800D31EC 4B FE 80 C5 */ bl setBodyAngleXReadyAnime__9daAlink_cFi -/* 800D31F0 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800D31F4 7F C3 F3 78 */ mr r3, r30 -/* 800D31F8 4B FF EF 05 */ bl setComboReserb__9daAlink_cFv -/* 800D31FC 7F C3 F3 78 */ mr r3, r30 -/* 800D3200 4B FF F4 85 */ bl checkCutTurnCharge__9daAlink_cFv -/* 800D3204 7F C3 F3 78 */ mr r3, r30 -/* 800D3208 4B FF FA 4D */ bl checkCutAtnActorChange__9daAlink_cFv -/* 800D320C 38 7E 33 98 */ addi r3, r30, 0x3398 -/* 800D3210 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800D3214 3C 80 80 39 */ lis r4, m__18daAlinkHIO_move_c0@ha /* 0x8038D6BC@ha */ -/* 800D3218 38 84 D6 BC */ addi r4, r4, m__18daAlinkHIO_move_c0@l /* 0x8038D6BC@l */ -/* 800D321C C0 44 00 38 */ lfs f2, 0x38(r4) -/* 800D3220 48 19 D5 21 */ bl cLib_chaseF__FPfff -/* 800D3224 80 1E 05 88 */ lwz r0, 0x588(r30) -/* 800D3228 64 00 08 00 */ oris r0, r0, 0x800 -/* 800D322C 90 1E 05 88 */ stw r0, 0x588(r30) -/* 800D3230 38 00 00 04 */ li r0, 4 -/* 800D3234 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 800D3238 A8 1E 30 0E */ lha r0, 0x300e(r30) -/* 800D323C 2C 00 00 00 */ cmpwi r0, 0 -/* 800D3240 41 82 00 64 */ beq lbl_800D32A4 -/* 800D3244 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 800D3248 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 800D324C 41 82 00 58 */ beq lbl_800D32A4 -/* 800D3250 7F C3 F3 78 */ mr r3, r30 -/* 800D3254 4B FF F4 99 */ bl getCutDirection__9daAlink_cFv -/* 800D3258 2C 03 00 03 */ cmpwi r3, 3 -/* 800D325C 40 82 00 20 */ bne lbl_800D327C -/* 800D3260 88 1E 05 68 */ lbz r0, 0x568(r30) -/* 800D3264 28 00 00 04 */ cmplwi r0, 4 -/* 800D3268 40 82 00 14 */ bne lbl_800D327C -/* 800D326C C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D3270 C0 02 93 1C */ lfs f0, lit_7448(r2) -/* 800D3274 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D3278 41 81 00 28 */ bgt lbl_800D32A0 -lbl_800D327C: -/* 800D327C 2C 03 00 02 */ cmpwi r3, 2 -/* 800D3280 40 82 00 24 */ bne lbl_800D32A4 -/* 800D3284 88 1E 05 68 */ lbz r0, 0x568(r30) -/* 800D3288 28 00 00 03 */ cmplwi r0, 3 -/* 800D328C 40 82 00 18 */ bne lbl_800D32A4 -/* 800D3290 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D3294 C0 02 93 1C */ lfs f0, lit_7448(r2) -/* 800D3298 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D329C 40 81 00 08 */ ble lbl_800D32A4 -lbl_800D32A0: -/* 800D32A0 B0 7E 30 0A */ sth r3, 0x300a(r30) -lbl_800D32A4: -/* 800D32A4 7F E3 FB 78 */ mr r3, r31 -/* 800D32A8 48 08 B2 25 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800D32AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D32B0 41 82 00 4C */ beq lbl_800D32FC -/* 800D32B4 7F C3 F3 78 */ mr r3, r30 -/* 800D32B8 38 80 00 01 */ li r4, 1 -/* 800D32BC 4B FF E1 75 */ bl resetCombo__9daAlink_cFi -/* 800D32C0 80 1E 06 14 */ lwz r0, 0x614(r30) -/* 800D32C4 28 00 00 24 */ cmplwi r0, 0x24 -/* 800D32C8 41 82 00 0C */ beq lbl_800D32D4 -/* 800D32CC 28 00 00 54 */ cmplwi r0, 0x54 -/* 800D32D0 40 82 00 1C */ bne lbl_800D32EC -lbl_800D32D4: -/* 800D32D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D32D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D32DC 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800D32E0 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800D32E4 4B F7 4E 99 */ bl cutEnd__16dEvent_manager_cFi -/* 800D32E8 48 00 01 D4 */ b lbl_800D34BC -lbl_800D32EC: -/* 800D32EC 7F C3 F3 78 */ mr r3, r30 -/* 800D32F0 38 80 00 00 */ li r4, 0 -/* 800D32F4 4B FE 6D DD */ bl checkNextAction__9daAlink_cFi -/* 800D32F8 48 00 01 C4 */ b lbl_800D34BC -lbl_800D32FC: -/* 800D32FC C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D3300 C0 1E 34 84 */ lfs f0, 0x3484(r30) -/* 800D3304 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D3308 41 81 00 10 */ bgt lbl_800D3318 -/* 800D330C A8 1E 30 0A */ lha r0, 0x300a(r30) -/* 800D3310 2C 00 00 04 */ cmpwi r0, 4 -/* 800D3314 41 82 00 18 */ beq lbl_800D332C -lbl_800D3318: -/* 800D3318 7F C3 F3 78 */ mr r3, r30 -/* 800D331C 38 80 00 03 */ li r4, 3 -/* 800D3320 4B FF F4 41 */ bl checkCutCancelNextMode__9daAlink_cFi -/* 800D3324 2C 03 00 00 */ cmpwi r3, 0 -/* 800D3328 40 82 01 94 */ bne lbl_800D34BC -lbl_800D332C: -/* 800D332C C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D3330 C0 1E 34 84 */ lfs f0, 0x3484(r30) -/* 800D3334 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D3338 40 81 00 10 */ ble lbl_800D3348 -/* 800D333C 7F C3 F3 78 */ mr r3, r30 -/* 800D3340 38 80 00 01 */ li r4, 1 -/* 800D3344 4B FF E0 ED */ bl resetCombo__9daAlink_cFi -lbl_800D3348: -/* 800D3348 7F C3 F3 78 */ mr r3, r30 -/* 800D334C 80 9E 31 98 */ lwz r4, 0x3198(r30) -/* 800D3350 4B FF E6 79 */ bl changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 800D3354 2C 03 00 00 */ cmpwi r3, 0 -/* 800D3358 41 82 00 0C */ beq lbl_800D3364 -/* 800D335C 38 60 00 01 */ li r3, 1 -/* 800D3360 48 00 01 60 */ b lbl_800D34C0 -lbl_800D3364: -/* 800D3364 7F C3 F3 78 */ mr r3, r30 -/* 800D3368 A8 9E 30 10 */ lha r4, 0x3010(r30) -/* 800D336C 4B FE 03 C9 */ bl setShapeAngleToAtnActor__9daAlink_cFi -/* 800D3370 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D3374 41 82 00 30 */ beq lbl_800D33A4 -/* 800D3378 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800D337C B0 1E 30 0C */ sth r0, 0x300c(r30) -/* 800D3380 7F C3 F3 78 */ mr r3, r30 -/* 800D3384 4B FE 02 AD */ bl getShapeAngleYAtnActor__9daAlink_cFv -/* 800D3388 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 800D338C 48 19 DA 99 */ bl cLib_distanceAngleS__Fss -/* 800D3390 2C 03 08 00 */ cmpwi r3, 0x800 -/* 800D3394 40 80 00 28 */ bge lbl_800D33BC -/* 800D3398 38 00 00 01 */ li r0, 1 -/* 800D339C B0 1E 30 10 */ sth r0, 0x3010(r30) -/* 800D33A0 48 00 00 1C */ b lbl_800D33BC -lbl_800D33A4: -/* 800D33A4 38 7E 04 E6 */ addi r3, r30, 0x4e6 -/* 800D33A8 A8 9E 30 0C */ lha r4, 0x300c(r30) -/* 800D33AC 38 A0 00 02 */ li r5, 2 -/* 800D33B0 38 C0 20 00 */ li r6, 0x2000 -/* 800D33B4 38 E0 08 00 */ li r7, 0x800 -/* 800D33B8 48 19 D1 89 */ bl cLib_addCalcAngleS__FPsssss -lbl_800D33BC: -/* 800D33BC A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800D33C0 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800D33C4 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D33C8 C0 1E 34 78 */ lfs f0, 0x3478(r30) -/* 800D33CC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D33D0 4C 41 13 82 */ cror 2, 1, 2 -/* 800D33D4 40 82 00 40 */ bne lbl_800D3414 -/* 800D33D8 C0 1E 34 7C */ lfs f0, 0x347c(r30) -/* 800D33DC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D33E0 40 80 00 34 */ bge lbl_800D3414 -/* 800D33E4 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800D33E8 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 800D33EC 40 82 00 1C */ bne lbl_800D3408 -/* 800D33F0 7F C3 F3 78 */ mr r3, r30 -/* 800D33F4 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020002@ha */ -/* 800D33F8 38 84 00 02 */ addi r4, r4, 0x0002 /* 0x00020002@l */ -/* 800D33FC 4B FE BC F1 */ bl seStartSwordCut__9daAlink_cFUl -/* 800D3400 C0 1E 34 80 */ lfs f0, 0x3480(r30) -/* 800D3404 D0 1E 33 98 */ stfs f0, 0x3398(r30) -lbl_800D3408: -/* 800D3408 80 1E 05 80 */ lwz r0, 0x580(r30) -/* 800D340C 60 00 00 02 */ ori r0, r0, 2 -/* 800D3410 90 1E 05 80 */ stw r0, 0x580(r30) -lbl_800D3414: -/* 800D3414 88 1E 05 68 */ lbz r0, 0x568(r30) -/* 800D3418 28 00 00 04 */ cmplwi r0, 4 -/* 800D341C 40 82 00 40 */ bne lbl_800D345C -/* 800D3420 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D3424 C0 02 93 20 */ lfs f0, lit_7449(r2) -/* 800D3428 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D342C 4C 41 13 82 */ cror 2, 1, 2 -/* 800D3430 40 82 00 10 */ bne lbl_800D3440 -/* 800D3434 38 00 00 00 */ li r0, 0 -/* 800D3438 98 1E 2F 92 */ stb r0, 0x2f92(r30) -/* 800D343C 48 00 00 80 */ b lbl_800D34BC -lbl_800D3440: -/* 800D3440 C0 02 93 24 */ lfs f0, lit_7450(r2) -/* 800D3444 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D3448 4C 41 13 82 */ cror 2, 1, 2 -/* 800D344C 40 82 00 70 */ bne lbl_800D34BC -/* 800D3450 38 00 00 64 */ li r0, 0x64 -/* 800D3454 98 1E 2F 92 */ stb r0, 0x2f92(r30) -/* 800D3458 48 00 00 64 */ b lbl_800D34BC -lbl_800D345C: -/* 800D345C 28 00 00 03 */ cmplwi r0, 3 -/* 800D3460 40 82 00 40 */ bne lbl_800D34A0 -/* 800D3464 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D3468 C0 02 93 28 */ lfs f0, lit_7451(r2) -/* 800D346C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D3470 4C 41 13 82 */ cror 2, 1, 2 -/* 800D3474 40 82 00 10 */ bne lbl_800D3484 -/* 800D3478 38 00 00 00 */ li r0, 0 -/* 800D347C 98 1E 2F 92 */ stb r0, 0x2f92(r30) -/* 800D3480 48 00 00 3C */ b lbl_800D34BC -lbl_800D3484: -/* 800D3484 C0 02 93 24 */ lfs f0, lit_7450(r2) -/* 800D3488 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D348C 4C 41 13 82 */ cror 2, 1, 2 -/* 800D3490 40 82 00 2C */ bne lbl_800D34BC -/* 800D3494 38 00 00 64 */ li r0, 0x64 -/* 800D3498 98 1E 2F 92 */ stb r0, 0x2f92(r30) -/* 800D349C 48 00 00 20 */ b lbl_800D34BC -lbl_800D34A0: -/* 800D34A0 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D34A4 C0 02 93 20 */ lfs f0, lit_7449(r2) -/* 800D34A8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D34AC 4C 41 13 82 */ cror 2, 1, 2 -/* 800D34B0 40 82 00 0C */ bne lbl_800D34BC -/* 800D34B4 38 00 00 00 */ li r0, 0 -/* 800D34B8 98 1E 2F 92 */ stb r0, 0x2f92(r30) -lbl_800D34BC: -/* 800D34BC 38 60 00 01 */ li r3, 1 -lbl_800D34C0: -/* 800D34C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D34C4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D34C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D34CC 7C 08 03 A6 */ mtlr r0 -/* 800D34D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D34D4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutReverseInit__9daAlink_cFQ29daAlink_c11daAlink_ANM.s b/asm/d/a/d_a_alink/procCutReverseInit__9daAlink_cFQ29daAlink_c11daAlink_ANM.s deleted file mode 100644 index ab912ad5a29..00000000000 --- a/asm/d/a/d_a_alink/procCutReverseInit__9daAlink_cFQ29daAlink_c11daAlink_ANM.s +++ /dev/null @@ -1,111 +0,0 @@ -lbl_800D4068: -/* 800D4068 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 800D406C 7C 08 02 A6 */ mflr r0 -/* 800D4070 90 01 00 34 */ stw r0, 0x34(r1) -/* 800D4074 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 800D4078 93 C1 00 28 */ stw r30, 0x28(r1) -/* 800D407C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 800D4080 7C 9E 23 78 */ mr r30, r4 -/* 800D4084 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 800D4088 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 800D408C C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 800D4090 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 800D4094 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 800D4098 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 800D409C 38 61 00 14 */ addi r3, r1, 0x14 -/* 800D40A0 38 80 00 64 */ li r4, 0x64 -/* 800D40A4 41 82 00 0C */ beq lbl_800D40B0 -/* 800D40A8 80 BF 00 04 */ lwz r5, 4(r31) -/* 800D40AC 48 00 00 08 */ b lbl_800D40B4 -lbl_800D40B0: -/* 800D40B0 38 A0 FF FF */ li r5, -1 -lbl_800D40B4: -/* 800D40B4 38 C0 00 05 */ li r6, 5 -/* 800D40B8 48 0D 41 09 */ bl dKy_Sound_set__F4cXyziUii -/* 800D40BC 2C 1E 00 71 */ cmpwi r30, 0x71 -/* 800D40C0 40 82 00 0C */ bne lbl_800D40CC -/* 800D40C4 38 60 00 01 */ li r3, 1 -/* 800D40C8 48 00 01 1C */ b lbl_800D41E4 -lbl_800D40CC: -/* 800D40CC 7F E3 FB 78 */ mr r3, r31 -/* 800D40D0 38 80 00 25 */ li r4, 0x25 -/* 800D40D4 4B FE DE 99 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800D40D8 2C 1E 00 2F */ cmpwi r30, 0x2f -/* 800D40DC 40 82 00 4C */ bne lbl_800D4128 -/* 800D40E0 7F E3 FB 78 */ mr r3, r31 -/* 800D40E4 7F C4 F3 78 */ mr r4, r30 -/* 800D40E8 3C A0 80 39 */ lis r5, m__19daAlinkHIO_guard_c0@ha /* 0x8038DF9C@ha */ -/* 800D40EC 38 A5 DF 9C */ addi r5, r5, m__19daAlinkHIO_guard_c0@l /* 0x8038DF9C@l */ -/* 800D40F0 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800D40F4 4B FD 90 01 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800D40F8 38 00 00 01 */ li r0, 1 -/* 800D40FC B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800D4100 3C 60 80 39 */ lis r3, m__19daAlinkHIO_guard_c0@ha /* 0x8038DF9C@ha */ -/* 800D4104 38 63 DF 9C */ addi r3, r3, m__19daAlinkHIO_guard_c0@l /* 0x8038DF9C@l */ -/* 800D4108 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 800D410C D0 1F 34 78 */ stfs f0, 0x3478(r31) -/* 800D4110 38 00 00 02 */ li r0, 2 -/* 800D4114 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 800D4118 7F E3 FB 78 */ mr r3, r31 -/* 800D411C C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800D4120 48 00 8E E9 */ bl setUpperGuardAnime__9daAlink_cFf -/* 800D4124 48 00 00 3C */ b lbl_800D4160 -lbl_800D4128: -/* 800D4128 7F E3 FB 78 */ mr r3, r31 -/* 800D412C 7F C4 F3 78 */ mr r4, r30 -/* 800D4130 3C A0 80 39 */ lis r5, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800D4134 38 A5 DE 8C */ addi r5, r5, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800D4138 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800D413C 4B FD 8F B9 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800D4140 38 00 00 00 */ li r0, 0 -/* 800D4144 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800D4148 3C 60 80 39 */ lis r3, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800D414C 38 63 DE 8C */ addi r3, r3, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800D4150 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 800D4154 D0 1F 34 78 */ stfs f0, 0x3478(r31) -/* 800D4158 38 00 00 04 */ li r0, 4 -/* 800D415C 98 1F 2F 98 */ stb r0, 0x2f98(r31) -lbl_800D4160: -/* 800D4160 3C 60 80 39 */ lis r3, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800D4164 38 63 DE 8C */ addi r3, r3, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800D4168 C0 03 00 64 */ lfs f0, 0x64(r3) -/* 800D416C D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800D4170 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 800D4174 3C 63 00 01 */ addis r3, r3, 1 -/* 800D4178 38 03 80 00 */ addi r0, r3, -32768 -/* 800D417C B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800D4180 38 00 00 00 */ li r0, 0 -/* 800D4184 B0 1F 30 7E */ sth r0, 0x307e(r31) -/* 800D4188 B0 1F 30 12 */ sth r0, 0x3012(r31) -/* 800D418C 88 1F 05 68 */ lbz r0, 0x568(r31) -/* 800D4190 28 00 00 1A */ cmplwi r0, 0x1a -/* 800D4194 41 82 00 14 */ beq lbl_800D41A8 -/* 800D4198 28 00 00 1F */ cmplwi r0, 0x1f -/* 800D419C 41 82 00 0C */ beq lbl_800D41A8 -/* 800D41A0 28 00 00 0A */ cmplwi r0, 0xa -/* 800D41A4 40 82 00 0C */ bne lbl_800D41B0 -lbl_800D41A8: -/* 800D41A8 38 80 00 05 */ li r4, 5 -/* 800D41AC 48 00 00 08 */ b lbl_800D41B4 -lbl_800D41B0: -/* 800D41B0 38 80 00 03 */ li r4, 3 -lbl_800D41B4: -/* 800D41B4 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800D41B8 D0 21 00 08 */ stfs f1, 8(r1) -/* 800D41BC C0 02 92 B8 */ lfs f0, lit_6040(r2) -/* 800D41C0 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800D41C4 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800D41C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D41CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D41D0 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 800D41D4 38 A0 00 1F */ li r5, 0x1f -/* 800D41D8 38 C1 00 08 */ addi r6, r1, 8 -/* 800D41DC 4B F9 B8 49 */ bl StartShock__12dVibration_cFii4cXyz -/* 800D41E0 38 60 00 01 */ li r3, 1 -lbl_800D41E4: -/* 800D41E4 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 800D41E8 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 800D41EC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 800D41F0 7C 08 03 A6 */ mtlr r0 -/* 800D41F4 38 21 00 30 */ addi r1, r1, 0x30 -/* 800D41F8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutReverse__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutReverse__9daAlink_cFv.s deleted file mode 100644 index 2435b019a0b..00000000000 --- a/asm/d/a/d_a_alink/procCutReverse__9daAlink_cFv.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_800D41FC: -/* 800D41FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D4200 7C 08 02 A6 */ mflr r0 -/* 800D4204 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D4208 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D420C 93 C1 00 08 */ stw r30, 8(r1) -/* 800D4210 7C 7E 1B 78 */ mr r30, r3 -/* 800D4214 4B FE 5D 3D */ bl checkGroundSpecialMode__9daAlink_cFv -/* 800D4218 2C 03 00 00 */ cmpwi r3, 0 -/* 800D421C 41 82 00 0C */ beq lbl_800D4228 -/* 800D4220 38 60 00 01 */ li r3, 1 -/* 800D4224 48 00 00 C0 */ b lbl_800D42E4 -lbl_800D4228: -/* 800D4228 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800D422C 38 7E 33 98 */ addi r3, r30, 0x3398 -/* 800D4230 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800D4234 3C 80 80 39 */ lis r4, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800D4238 38 84 DE 8C */ addi r4, r4, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800D423C C0 44 00 68 */ lfs f2, 0x68(r4) -/* 800D4240 48 19 C5 01 */ bl cLib_chaseF__FPfff -/* 800D4244 A8 1E 30 0C */ lha r0, 0x300c(r30) -/* 800D4248 2C 00 00 00 */ cmpwi r0, 0 -/* 800D424C 40 82 00 18 */ bne lbl_800D4264 -/* 800D4250 7F C3 F3 78 */ mr r3, r30 -/* 800D4254 4B FF E4 31 */ bl checkCutTurnCharge__9daAlink_cFv -/* 800D4258 80 1E 05 88 */ lwz r0, 0x588(r30) -/* 800D425C 64 00 08 00 */ oris r0, r0, 0x800 -/* 800D4260 90 1E 05 88 */ stw r0, 0x588(r30) -lbl_800D4264: -/* 800D4264 A8 1E 30 0C */ lha r0, 0x300c(r30) -/* 800D4268 2C 00 00 00 */ cmpwi r0, 0 -/* 800D426C 41 82 00 10 */ beq lbl_800D427C -/* 800D4270 7F C3 F3 78 */ mr r3, r30 -/* 800D4274 C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800D4278 48 00 8D 91 */ bl setUpperGuardAnime__9daAlink_cFf -lbl_800D427C: -/* 800D427C 7F E3 FB 78 */ mr r3, r31 -/* 800D4280 48 08 A2 4D */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800D4284 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D4288 41 82 00 1C */ beq lbl_800D42A4 -/* 800D428C A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800D4290 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800D4294 7F C3 F3 78 */ mr r3, r30 -/* 800D4298 38 80 00 00 */ li r4, 0 -/* 800D429C 4B FE 5E 35 */ bl checkNextAction__9daAlink_cFi -/* 800D42A0 48 00 00 40 */ b lbl_800D42E0 -lbl_800D42A4: -/* 800D42A4 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D42A8 C0 1E 34 78 */ lfs f0, 0x3478(r30) -/* 800D42AC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D42B0 40 81 00 30 */ ble lbl_800D42E0 -/* 800D42B4 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800D42B8 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800D42BC 7F C3 F3 78 */ mr r3, r30 -/* 800D42C0 38 80 00 01 */ li r4, 1 -/* 800D42C4 4B FE 5E 0D */ bl checkNextAction__9daAlink_cFi -/* 800D42C8 2C 03 00 00 */ cmpwi r3, 0 -/* 800D42CC 40 82 00 14 */ bne lbl_800D42E0 -/* 800D42D0 A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 800D42D4 3C 63 00 01 */ addis r3, r3, 1 -/* 800D42D8 38 03 80 00 */ addi r0, r3, -32768 -/* 800D42DC B0 1E 04 DE */ sth r0, 0x4de(r30) -lbl_800D42E0: -/* 800D42E0 38 60 00 01 */ li r3, 1 -lbl_800D42E4: -/* 800D42E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D42E8 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D42EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D42F0 7C 08 03 A6 */ mtlr r0 -/* 800D42F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D42F8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutTurnChargeInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutTurnChargeInit__9daAlink_cFv.s deleted file mode 100644 index 27c6691b479..00000000000 --- a/asm/d/a/d_a_alink/procCutTurnChargeInit__9daAlink_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_800D4C68: -/* 800D4C68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D4C6C 7C 08 02 A6 */ mflr r0 -/* 800D4C70 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D4C74 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D4C78 7C 7F 1B 78 */ mr r31, r3 -/* 800D4C7C 88 03 05 69 */ lbz r0, 0x569(r3) -/* 800D4C80 28 00 00 00 */ cmplwi r0, 0 -/* 800D4C84 40 82 00 24 */ bne lbl_800D4CA8 -/* 800D4C88 4B FD 2D D5 */ bl checkDashAnime__9daAlink_cCFv -/* 800D4C8C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D4C90 41 82 00 18 */ beq lbl_800D4CA8 -/* 800D4C94 7F E3 FB 78 */ mr r3, r31 -/* 800D4C98 38 80 00 83 */ li r4, 0x83 -/* 800D4C9C 4B FD 86 A5 */ bl setUpperAnimeBase__9daAlink_cFUs -/* 800D4CA0 38 60 00 01 */ li r3, 1 -/* 800D4CA4 48 00 00 4C */ b lbl_800D4CF0 -lbl_800D4CA8: -/* 800D4CA8 7F E3 FB 78 */ mr r3, r31 -/* 800D4CAC 38 80 00 29 */ li r4, 0x29 -/* 800D4CB0 4B FE D2 BD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800D4CB4 7F E3 FB 78 */ mr r3, r31 -/* 800D4CB8 38 80 00 75 */ li r4, 0x75 -/* 800D4CBC 3C A0 80 39 */ lis r5, m__21daAlinkHIO_cutTurn_c0@ha /* 0x8038DB84@ha */ -/* 800D4CC0 38 A5 DB 84 */ addi r5, r5, m__21daAlinkHIO_cutTurn_c0@l /* 0x8038DB84@l */ -/* 800D4CC4 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800D4CC8 4B FD 84 2D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800D4CCC C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800D4CD0 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800D4CD4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800D4CD8 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800D4CDC 3C 60 80 39 */ lis r3, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800D4CE0 38 63 DE 8C */ addi r3, r3, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800D4CE4 A8 03 00 56 */ lha r0, 0x56(r3) -/* 800D4CE8 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800D4CEC 38 60 00 01 */ li r3, 1 -lbl_800D4CF0: -/* 800D4CF0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D4CF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D4CF8 7C 08 03 A6 */ mtlr r0 -/* 800D4CFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D4D00 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutTurnCharge__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutTurnCharge__9daAlink_cFv.s deleted file mode 100644 index c0fdb5241f3..00000000000 --- a/asm/d/a/d_a_alink/procCutTurnCharge__9daAlink_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_800D4D04: -/* 800D4D04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D4D08 7C 08 02 A6 */ mflr r0 -/* 800D4D0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D4D10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D4D14 7C 7F 1B 78 */ mr r31, r3 -/* 800D4D18 4B FE 52 39 */ bl checkGroundSpecialMode__9daAlink_cFv -/* 800D4D1C 2C 03 00 00 */ cmpwi r3, 0 -/* 800D4D20 41 82 00 0C */ beq lbl_800D4D2C -/* 800D4D24 38 60 00 01 */ li r3, 1 -/* 800D4D28 48 00 00 A0 */ b lbl_800D4DC8 -lbl_800D4D2C: -/* 800D4D2C 7F E3 FB 78 */ mr r3, r31 -/* 800D4D30 4B FF D5 8D */ bl setSwordChargeVoiceSe__9daAlink_cFv -/* 800D4D34 3C 60 80 39 */ lis r3, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800D4D38 38 63 DE 8C */ addi r3, r3, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800D4D3C A8 03 00 52 */ lha r0, 0x52(r3) -/* 800D4D40 B0 1F 30 7E */ sth r0, 0x307e(r31) -/* 800D4D44 7F E3 FB 78 */ mr r3, r31 -/* 800D4D48 38 80 00 08 */ li r4, 8 -/* 800D4D4C 4B FD D8 9D */ bl itemButtonCheck__9daAlink_cFUc -/* 800D4D50 2C 03 00 00 */ cmpwi r3, 0 -/* 800D4D54 40 82 00 34 */ bne lbl_800D4D88 -/* 800D4D58 80 1F 06 14 */ lwz r0, 0x614(r31) -/* 800D4D5C 28 00 00 5B */ cmplwi r0, 0x5b -/* 800D4D60 41 82 00 28 */ beq lbl_800D4D88 -/* 800D4D64 A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 800D4D68 2C 00 00 00 */ cmpwi r0, 0 -/* 800D4D6C 41 82 00 10 */ beq lbl_800D4D7C -/* 800D4D70 7F E3 FB 78 */ mr r3, r31 -/* 800D4D74 4B FF D6 4D */ bl checkCutAction__9daAlink_cFv -/* 800D4D78 48 00 00 4C */ b lbl_800D4DC4 -lbl_800D4D7C: -/* 800D4D7C 7F E3 FB 78 */ mr r3, r31 -/* 800D4D80 4B FF DE 09 */ bl cancelCutCharge__9daAlink_cFv -/* 800D4D84 48 00 00 40 */ b lbl_800D4DC4 -lbl_800D4D88: -/* 800D4D88 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800D4D8C 48 08 97 41 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800D4D90 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D4D94 41 82 00 14 */ beq lbl_800D4DA8 -/* 800D4D98 7F E3 FB 78 */ mr r3, r31 -/* 800D4D9C 38 80 00 00 */ li r4, 0 -/* 800D4DA0 48 00 00 3D */ bl procCutTurnMoveInit__9daAlink_cFi -/* 800D4DA4 48 00 00 20 */ b lbl_800D4DC4 -lbl_800D4DA8: -/* 800D4DA8 C0 3F 1F E0 */ lfs f1, 0x1fe0(r31) -/* 800D4DAC C0 02 93 44 */ lfs f0, lit_7977(r2) -/* 800D4DB0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D4DB4 4C 41 13 82 */ cror 2, 1, 2 -/* 800D4DB8 40 82 00 0C */ bne lbl_800D4DC4 -/* 800D4DBC 38 00 00 64 */ li r0, 0x64 -/* 800D4DC0 98 1F 2F 92 */ stb r0, 0x2f92(r31) -lbl_800D4DC4: -/* 800D4DC4 38 60 00 01 */ li r3, 1 -lbl_800D4DC8: -/* 800D4DC8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D4DCC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D4DD0 7C 08 03 A6 */ mtlr r0 -/* 800D4DD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D4DD8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutTurnMoveInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procCutTurnMoveInit__9daAlink_cFi.s deleted file mode 100644 index b1cb658ecca..00000000000 --- a/asm/d/a/d_a_alink/procCutTurnMoveInit__9daAlink_cFi.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_800D4DDC: -/* 800D4DDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D4DE0 7C 08 02 A6 */ mflr r0 -/* 800D4DE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D4DE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D4DEC 93 C1 00 08 */ stw r30, 8(r1) -/* 800D4DF0 7C 7E 1B 78 */ mr r30, r3 -/* 800D4DF4 7C 9F 23 78 */ mr r31, r4 -/* 800D4DF8 38 80 00 2A */ li r4, 0x2a -/* 800D4DFC 4B FE D1 71 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800D4E00 7F C3 F3 78 */ mr r3, r30 -/* 800D4E04 4B FD EB 01 */ bl checkZeroSpeedF__9daAlink_cCFv -/* 800D4E08 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D4E0C 41 82 00 10 */ beq lbl_800D4E1C -/* 800D4E10 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 800D4E14 60 00 00 01 */ ori r0, r0, 1 -/* 800D4E18 90 1E 31 A0 */ stw r0, 0x31a0(r30) -lbl_800D4E1C: -/* 800D4E1C 2C 1F 00 00 */ cmpwi r31, 0 -/* 800D4E20 41 82 00 40 */ beq lbl_800D4E60 -/* 800D4E24 7F C3 F3 78 */ mr r3, r30 -/* 800D4E28 38 80 01 8B */ li r4, 0x18b -/* 800D4E2C 4B FD 76 25 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM -/* 800D4E30 A0 83 00 00 */ lhz r4, 0(r3) -/* 800D4E34 7F C3 F3 78 */ mr r3, r30 -/* 800D4E38 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800D4E3C C0 42 92 BC */ lfs f2, lit_6041(r2) -/* 800D4E40 4B FD 85 69 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff -/* 800D4E44 C0 1E 1F E0 */ lfs f0, 0x1fe0(r30) -/* 800D4E48 D0 1E 20 58 */ stfs f0, 0x2058(r30) -/* 800D4E4C 80 7E 1F 54 */ lwz r3, 0x1f54(r30) -/* 800D4E50 D0 03 00 08 */ stfs f0, 8(r3) -/* 800D4E54 7F C3 F3 78 */ mr r3, r30 -/* 800D4E58 38 80 01 8B */ li r4, 0x18b -/* 800D4E5C 4B FD AC B9 */ bl setFacePriAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM -lbl_800D4E60: -/* 800D4E60 7F C3 F3 78 */ mr r3, r30 -/* 800D4E64 38 80 00 76 */ li r4, 0x76 -/* 800D4E68 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800D4E6C 3C A0 80 39 */ lis r5, m__21daAlinkHIO_cutTurn_c0@ha /* 0x8038DB84@ha */ -/* 800D4E70 38 A5 DB 84 */ addi r5, r5, m__21daAlinkHIO_cutTurn_c0@l /* 0x8038DB84@l */ -/* 800D4E74 C0 45 00 50 */ lfs f2, 0x50(r5) -/* 800D4E78 4B FD 81 69 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -/* 800D4E7C 38 00 00 00 */ li r0, 0 -/* 800D4E80 98 1E 2F 98 */ stb r0, 0x2f98(r30) -/* 800D4E84 3C 60 80 39 */ lis r3, m__21daAlinkHIO_cutTurn_c0@ha /* 0x8038DB84@ha */ -/* 800D4E88 38 63 DB 84 */ addi r3, r3, m__21daAlinkHIO_cutTurn_c0@l /* 0x8038DB84@l */ -/* 800D4E8C C0 03 00 5C */ lfs f0, 0x5c(r3) -/* 800D4E90 D0 1E 05 94 */ stfs f0, 0x594(r30) -/* 800D4E94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D4E98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D4E9C 88 03 00 14 */ lbz r0, 0x14(r3) -/* 800D4EA0 28 00 00 3F */ cmplwi r0, 0x3f -/* 800D4EA4 41 82 00 10 */ beq lbl_800D4EB4 -/* 800D4EA8 80 7E 06 C4 */ lwz r3, 0x6c4(r30) -/* 800D4EAC 4B FD 43 9D */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase -/* 800D4EB0 48 00 00 0C */ b lbl_800D4EBC -lbl_800D4EB4: -/* 800D4EB4 38 00 00 01 */ li r0, 1 -/* 800D4EB8 B0 1E 30 08 */ sth r0, 0x3008(r30) -lbl_800D4EBC: -/* 800D4EBC B3 FE 30 0C */ sth r31, 0x300c(r30) -/* 800D4EC0 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 800D4EC4 64 00 10 00 */ oris r0, r0, 0x1000 -/* 800D4EC8 90 1E 05 74 */ stw r0, 0x574(r30) -/* 800D4ECC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D4ED0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D4ED4 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 800D4ED8 64 00 40 00 */ oris r0, r0, 0x4000 -/* 800D4EDC 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 800D4EE0 38 60 00 01 */ li r3, 1 -/* 800D4EE4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D4EE8 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D4EEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D4EF0 7C 08 03 A6 */ mtlr r0 -/* 800D4EF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D4EF8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutTurn__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutTurn__9daAlink_cFv.s deleted file mode 100644 index 74bd5518f9b..00000000000 --- a/asm/d/a/d_a_alink/procCutTurn__9daAlink_cFv.s +++ /dev/null @@ -1,137 +0,0 @@ -lbl_800D4A74: -/* 800D4A74 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800D4A78 7C 08 02 A6 */ mflr r0 -/* 800D4A7C 90 01 00 24 */ stw r0, 0x24(r1) -/* 800D4A80 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D4A84 48 28 D7 59 */ bl _savegpr_29 -/* 800D4A88 7C 7F 1B 78 */ mr r31, r3 -/* 800D4A8C 3C 80 80 39 */ lis r4, lit_3757@ha /* 0x8038D658@ha */ -/* 800D4A90 3B C4 D6 58 */ addi r30, r4, lit_3757@l /* 0x8038D658@l */ -/* 800D4A94 4B FE 54 BD */ bl checkGroundSpecialMode__9daAlink_cFv -/* 800D4A98 2C 03 00 00 */ cmpwi r3, 0 -/* 800D4A9C 41 82 00 0C */ beq lbl_800D4AA8 -/* 800D4AA0 38 60 00 01 */ li r3, 1 -/* 800D4AA4 48 00 01 AC */ b lbl_800D4C50 -lbl_800D4AA8: -/* 800D4AA8 3B BF 1F D0 */ addi r29, r31, 0x1fd0 -/* 800D4AAC 38 00 00 04 */ li r0, 4 -/* 800D4AB0 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 800D4AB4 38 7F 33 98 */ addi r3, r31, 0x3398 -/* 800D4AB8 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800D4ABC 38 9E 00 64 */ addi r4, r30, 0x64 -/* 800D4AC0 C0 44 00 38 */ lfs f2, 0x38(r4) -/* 800D4AC4 48 19 BC 7D */ bl cLib_chaseF__FPfff -/* 800D4AC8 80 1F 05 88 */ lwz r0, 0x588(r31) -/* 800D4ACC 64 00 08 00 */ oris r0, r0, 0x800 -/* 800D4AD0 90 1F 05 88 */ stw r0, 0x588(r31) -/* 800D4AD4 88 1F 05 69 */ lbz r0, 0x569(r31) -/* 800D4AD8 28 00 00 00 */ cmplwi r0, 0 -/* 800D4ADC 41 82 00 10 */ beq lbl_800D4AEC -/* 800D4AE0 38 7E 08 34 */ addi r3, r30, 0x834 -/* 800D4AE4 A8 03 00 52 */ lha r0, 0x52(r3) -/* 800D4AE8 B0 1F 30 7E */ sth r0, 0x307e(r31) -lbl_800D4AEC: -/* 800D4AEC C0 3D 00 10 */ lfs f1, 0x10(r29) -/* 800D4AF0 C0 02 93 40 */ lfs f0, lit_7945(r2) -/* 800D4AF4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D4AF8 4C 41 13 82 */ cror 2, 1, 2 -/* 800D4AFC 40 82 00 0C */ bne lbl_800D4B08 -/* 800D4B00 38 00 00 00 */ li r0, 0 -/* 800D4B04 98 1F 2F 92 */ stb r0, 0x2f92(r31) -lbl_800D4B08: -/* 800D4B08 7F A3 EB 78 */ mr r3, r29 -/* 800D4B0C 48 08 99 C1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800D4B10 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D4B14 41 82 00 80 */ beq lbl_800D4B94 -/* 800D4B18 A8 1F 30 08 */ lha r0, 0x3008(r31) -/* 800D4B1C 2C 00 00 00 */ cmpwi r0, 0 -/* 800D4B20 40 81 00 38 */ ble lbl_800D4B58 -/* 800D4B24 C0 3D 00 10 */ lfs f1, 0x10(r29) -/* 800D4B28 C0 1F 34 80 */ lfs f0, 0x3480(r31) -/* 800D4B2C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D4B30 40 81 00 18 */ ble lbl_800D4B48 -/* 800D4B34 7F E3 FB 78 */ mr r3, r31 -/* 800D4B38 38 80 00 03 */ li r4, 3 -/* 800D4B3C 4B FF DC 25 */ bl checkCutCancelNextMode__9daAlink_cFi -/* 800D4B40 2C 03 00 00 */ cmpwi r3, 0 -/* 800D4B44 40 82 01 08 */ bne lbl_800D4C4C -lbl_800D4B48: -/* 800D4B48 A8 7F 30 08 */ lha r3, 0x3008(r31) -/* 800D4B4C 38 03 FF FF */ addi r0, r3, -1 -/* 800D4B50 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 800D4B54 48 00 00 F8 */ b lbl_800D4C4C -lbl_800D4B58: -/* 800D4B58 80 1F 06 14 */ lwz r0, 0x614(r31) -/* 800D4B5C 28 00 00 24 */ cmplwi r0, 0x24 -/* 800D4B60 40 82 00 1C */ bne lbl_800D4B7C -/* 800D4B64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D4B68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D4B6C 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800D4B70 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 800D4B74 4B F7 36 09 */ bl cutEnd__16dEvent_manager_cFi -/* 800D4B78 48 00 00 D4 */ b lbl_800D4C4C -lbl_800D4B7C: -/* 800D4B7C 38 00 00 03 */ li r0, 3 -/* 800D4B80 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 800D4B84 7F E3 FB 78 */ mr r3, r31 -/* 800D4B88 38 80 00 00 */ li r4, 0 -/* 800D4B8C 4B FE 55 45 */ bl checkNextAction__9daAlink_cFi -/* 800D4B90 48 00 00 BC */ b lbl_800D4C4C -lbl_800D4B94: -/* 800D4B94 C0 3D 00 10 */ lfs f1, 0x10(r29) -/* 800D4B98 C0 1F 34 80 */ lfs f0, 0x3480(r31) -/* 800D4B9C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D4BA0 40 81 00 18 */ ble lbl_800D4BB8 -/* 800D4BA4 7F E3 FB 78 */ mr r3, r31 -/* 800D4BA8 38 80 00 03 */ li r4, 3 -/* 800D4BAC 4B FF DB B5 */ bl checkCutCancelNextMode__9daAlink_cFi -/* 800D4BB0 2C 03 00 00 */ cmpwi r3, 0 -/* 800D4BB4 40 82 00 98 */ bne lbl_800D4C4C -lbl_800D4BB8: -/* 800D4BB8 C0 3D 00 10 */ lfs f1, 0x10(r29) -/* 800D4BBC C0 1F 34 84 */ lfs f0, 0x3484(r31) -/* 800D4BC0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D4BC4 4C 41 13 82 */ cror 2, 1, 2 -/* 800D4BC8 40 82 00 84 */ bne lbl_800D4C4C -/* 800D4BCC C0 1F 34 88 */ lfs f0, 0x3488(r31) -/* 800D4BD0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D4BD4 40 80 00 78 */ bge lbl_800D4C4C -/* 800D4BD8 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800D4BDC 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 800D4BE0 40 82 00 44 */ bne lbl_800D4C24 -/* 800D4BE4 7F E3 FB 78 */ mr r3, r31 -/* 800D4BE8 80 9F 32 CC */ lwz r4, 0x32cc(r31) -/* 800D4BEC 4B FE A5 01 */ bl seStartSwordCut__9daAlink_cFUl -/* 800D4BF0 38 7E 05 2C */ addi r3, r30, 0x52c -/* 800D4BF4 C0 03 00 68 */ lfs f0, 0x68(r3) -/* 800D4BF8 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800D4BFC 7F E3 FB 78 */ mr r3, r31 -/* 800D4C00 38 80 00 01 */ li r4, 1 -/* 800D4C04 38 A0 00 01 */ li r5, 1 -/* 800D4C08 4B FE 68 B1 */ bl checkHeavyStateOn__9daAlink_cFii -/* 800D4C0C 2C 03 00 00 */ cmpwi r3, 0 -/* 800D4C10 41 82 00 14 */ beq lbl_800D4C24 -/* 800D4C14 C0 3F 33 98 */ lfs f1, 0x3398(r31) -/* 800D4C18 C0 1F 34 34 */ lfs f0, 0x3434(r31) -/* 800D4C1C EC 01 00 32 */ fmuls f0, f1, f0 -/* 800D4C20 D0 1F 33 98 */ stfs f0, 0x3398(r31) -lbl_800D4C24: -/* 800D4C24 80 1F 05 80 */ lwz r0, 0x580(r31) -/* 800D4C28 60 00 00 02 */ ori r0, r0, 2 -/* 800D4C2C 90 1F 05 80 */ stw r0, 0x580(r31) -/* 800D4C30 38 7F 34 7C */ addi r3, r31, 0x347c -/* 800D4C34 C0 3F 34 78 */ lfs f1, 0x3478(r31) -/* 800D4C38 C0 5F 34 8C */ lfs f2, 0x348c(r31) -/* 800D4C3C 48 19 BB 05 */ bl cLib_chaseF__FPfff -/* 800D4C40 38 7F 10 DC */ addi r3, r31, 0x10dc -/* 800D4C44 C0 3F 34 7C */ lfs f1, 0x347c(r31) -/* 800D4C48 48 19 AA C1 */ bl SetR__8cM3dGSphFf -lbl_800D4C4C: -/* 800D4C4C 38 60 00 01 */ li r3, 1 -lbl_800D4C50: -/* 800D4C50 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D4C54 48 28 D5 D5 */ bl _restgpr_29 -/* 800D4C58 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800D4C5C 7C 08 03 A6 */ mtlr r0 -/* 800D4C60 38 21 00 20 */ addi r1, r1, 0x20 -/* 800D4C64 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procDiveJumpInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procDiveJumpInit__9daAlink_cFv.s deleted file mode 100644 index b742d3ff883..00000000000 --- a/asm/d/a/d_a_alink/procDiveJumpInit__9daAlink_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_800C66DC: -/* 800C66DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C66E0 7C 08 02 A6 */ mflr r0 -/* 800C66E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C66E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C66EC 7C 7F 1B 78 */ mr r31, r3 -/* 800C66F0 38 80 00 16 */ li r4, 0x16 -/* 800C66F4 4B FF B8 79 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C66F8 7F E3 FB 78 */ mr r3, r31 -/* 800C66FC 38 80 01 9A */ li r4, 0x19a -/* 800C6700 3C A0 80 39 */ lis r5, m__22daAlinkHIO_autoJump_c0@ha /* 0x8038E068@ha */ -/* 800C6704 38 A5 E0 68 */ addi r5, r5, m__22daAlinkHIO_autoJump_c0@l /* 0x8038E068@l */ -/* 800C6708 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800C670C 4B FE 69 E9 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800C6710 7F E3 FB 78 */ mr r3, r31 -/* 800C6714 38 80 00 01 */ li r4, 1 -/* 800C6718 38 A0 00 01 */ li r5, 1 -/* 800C671C 4B FF AB C1 */ bl deleteEquipItem__9daAlink_cFii -/* 800C6720 7F E3 FB 78 */ mr r3, r31 -/* 800C6724 38 80 00 00 */ li r4, 0 -/* 800C6728 48 01 BE 59 */ bl setHeavyBoots__9daAlink_cFi -/* 800C672C 3C 60 80 39 */ lis r3, m__22daAlinkHIO_autoJump_c0@ha /* 0x8038E068@ha */ -/* 800C6730 38 63 E0 68 */ addi r3, r3, m__22daAlinkHIO_autoJump_c0@l /* 0x8038E068@l */ -/* 800C6734 C0 03 00 9C */ lfs f0, 0x9c(r3) -/* 800C6738 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 800C673C C0 03 00 A0 */ lfs f0, 0xa0(r3) -/* 800C6740 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800C6744 C0 03 00 A4 */ lfs f0, 0xa4(r3) -/* 800C6748 D0 1F 05 30 */ stfs f0, 0x530(r31) -/* 800C674C 38 00 00 00 */ li r0, 0 -/* 800C6750 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800C6754 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800C6758 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800C675C C0 02 98 E8 */ lfs f0, lit_73790(r2) -/* 800C6760 D0 1F 33 B0 */ stfs f0, 0x33b0(r31) -/* 800C6764 7F E3 FB 78 */ mr r3, r31 -/* 800C6768 3C 80 00 01 */ lis r4, 0x0001 /* 0x0001008F@ha */ -/* 800C676C 38 84 00 8F */ addi r4, r4, 0x008F /* 0x0001008F@l */ -/* 800C6770 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800C6774 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800C6778 7D 89 03 A6 */ mtctr r12 -/* 800C677C 4E 80 04 21 */ bctrl -/* 800C6780 38 60 00 01 */ li r3, 1 -/* 800C6784 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C6788 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C678C 7C 08 03 A6 */ mtlr r0 -/* 800C6790 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C6794 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procDiveJump__9daAlink_cFv.s b/asm/d/a/d_a_alink/procDiveJump__9daAlink_cFv.s deleted file mode 100644 index 0b79d99e6da..00000000000 --- a/asm/d/a/d_a_alink/procDiveJump__9daAlink_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_800C6798: -/* 800C6798 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C679C 7C 08 02 A6 */ mflr r0 -/* 800C67A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C67A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C67A8 7C 7F 1B 78 */ mr r31, r3 -/* 800C67AC 38 9F 1F D0 */ addi r4, r31, 0x1fd0 -/* 800C67B0 80 03 19 9C */ lwz r0, 0x199c(r3) -/* 800C67B4 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800C67B8 41 82 00 0C */ beq lbl_800C67C4 -/* 800C67BC 4B FF E1 91 */ bl procFrontRollInit__9daAlink_cFv -/* 800C67C0 48 00 00 7C */ b lbl_800C683C -lbl_800C67C4: -/* 800C67C4 A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 800C67C8 2C 00 00 00 */ cmpwi r0, 0 -/* 800C67CC 40 82 00 40 */ bne lbl_800C680C -/* 800C67D0 7C 83 23 78 */ mr r3, r4 -/* 800C67D4 48 09 7C F9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800C67D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C67DC 41 82 00 5C */ beq lbl_800C6838 -/* 800C67E0 7F E3 FB 78 */ mr r3, r31 -/* 800C67E4 38 80 01 9B */ li r4, 0x19b -/* 800C67E8 3C A0 80 39 */ lis r5, m__22daAlinkHIO_autoJump_c0@ha /* 0x8038E068@ha */ -/* 800C67EC 38 A5 E0 68 */ addi r5, r5, m__22daAlinkHIO_autoJump_c0@l /* 0x8038E068@l */ -/* 800C67F0 38 A5 00 3C */ addi r5, r5, 0x3c -/* 800C67F4 4B FE 69 01 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800C67F8 38 00 00 01 */ li r0, 1 -/* 800C67FC B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800C6800 38 00 00 02 */ li r0, 2 -/* 800C6804 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 800C6808 48 00 00 30 */ b lbl_800C6838 -lbl_800C680C: -/* 800C680C 38 00 00 02 */ li r0, 2 -/* 800C6810 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 800C6814 C0 24 00 10 */ lfs f1, 0x10(r4) -/* 800C6818 C0 02 92 C4 */ lfs f0, lit_6109(r2) -/* 800C681C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800C6820 4C 41 13 82 */ cror 2, 1, 2 -/* 800C6824 40 82 00 14 */ bne lbl_800C6838 -/* 800C6828 38 7F 33 98 */ addi r3, r31, 0x3398 -/* 800C682C C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800C6830 C0 42 92 98 */ lfs f2, lit_5943(r2) -/* 800C6834 48 1A 9F 0D */ bl cLib_chaseF__FPfff -lbl_800C6838: -/* 800C6838 38 60 00 01 */ li r3, 1 -lbl_800C683C: -/* 800C683C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C6840 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C6844 7C 08 03 A6 */ mtlr r0 -/* 800C6848 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C684C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procFall__9daAlink_cFv.s b/asm/d/a/d_a_alink/procFall__9daAlink_cFv.s deleted file mode 100644 index bcb9fb6a418..00000000000 --- a/asm/d/a/d_a_alink/procFall__9daAlink_cFv.s +++ /dev/null @@ -1,140 +0,0 @@ -lbl_800C6D20: -/* 800C6D20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C6D24 7C 08 02 A6 */ mflr r0 -/* 800C6D28 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C6D2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C6D30 93 C1 00 08 */ stw r30, 8(r1) -/* 800C6D34 7C 7F 1B 78 */ mr r31, r3 -/* 800C6D38 A8 63 30 12 */ lha r3, 0x3012(r3) -/* 800C6D3C 7C 60 07 35 */ extsh. r0, r3 -/* 800C6D40 40 82 00 18 */ bne lbl_800C6D58 -/* 800C6D44 38 7F 33 98 */ addi r3, r31, 0x3398 -/* 800C6D48 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800C6D4C C0 42 93 A0 */ lfs f2, lit_9054(r2) -/* 800C6D50 48 1A 99 F1 */ bl cLib_chaseF__FPfff -/* 800C6D54 48 00 00 1C */ b lbl_800C6D70 -lbl_800C6D58: -/* 800C6D58 7C 60 07 35 */ extsh. r0, r3 -/* 800C6D5C 40 81 00 14 */ ble lbl_800C6D70 -/* 800C6D60 38 00 FF FF */ li r0, -1 -/* 800C6D64 B0 1F 30 12 */ sth r0, 0x3012(r31) -/* 800C6D68 38 60 00 01 */ li r3, 1 -/* 800C6D6C 48 00 01 94 */ b lbl_800C6F00 -lbl_800C6D70: -/* 800C6D70 7F E3 FB 78 */ mr r3, r31 -/* 800C6D74 4B FE EE C1 */ bl setLandPassiveData__9daAlink_cFv -/* 800C6D78 7F E3 FB 78 */ mr r3, r31 -/* 800C6D7C 4B FF 07 39 */ bl checkUpperItemActionFly__9daAlink_cFv -/* 800C6D80 2C 03 00 00 */ cmpwi r3, 0 -/* 800C6D84 41 82 00 0C */ beq lbl_800C6D90 -/* 800C6D88 38 60 00 01 */ li r3, 1 -/* 800C6D8C 48 00 01 74 */ b lbl_800C6F00 -lbl_800C6D90: -/* 800C6D90 80 1F 19 9C */ lwz r0, 0x199c(r31) -/* 800C6D94 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800C6D98 41 82 00 14 */ beq lbl_800C6DAC -/* 800C6D9C 7F E3 FB 78 */ mr r3, r31 -/* 800C6DA0 A8 9F 30 0E */ lha r4, 0x300e(r31) -/* 800C6DA4 4B FE EF 29 */ bl checkLandAction__9daAlink_cFi -/* 800C6DA8 48 00 01 58 */ b lbl_800C6F00 -lbl_800C6DAC: -/* 800C6DAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800C6DB0 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800C6DB4 A0 1E 00 02 */ lhz r0, 2(r30) -/* 800C6DB8 28 00 00 00 */ cmplwi r0, 0 -/* 800C6DBC 41 82 01 2C */ beq lbl_800C6EE8 -/* 800C6DC0 A8 1F 30 08 */ lha r0, 0x3008(r31) -/* 800C6DC4 2C 00 00 01 */ cmpwi r0, 1 -/* 800C6DC8 40 82 00 80 */ bne lbl_800C6E48 -/* 800C6DCC A8 7F 30 0A */ lha r3, 0x300a(r31) -/* 800C6DD0 2C 03 00 00 */ cmpwi r3, 0 -/* 800C6DD4 40 81 00 10 */ ble lbl_800C6DE4 -/* 800C6DD8 38 03 FF FF */ addi r0, r3, -1 -/* 800C6DDC B0 1F 30 0A */ sth r0, 0x300a(r31) -/* 800C6DE0 48 00 00 88 */ b lbl_800C6E68 -lbl_800C6DE4: -/* 800C6DE4 7F E3 FB 78 */ mr r3, r31 -/* 800C6DE8 4B FE 94 D5 */ bl setFrontWallType__9daAlink_cFv -/* 800C6DEC 80 1F 32 CC */ lwz r0, 0x32cc(r31) -/* 800C6DF0 28 00 00 00 */ cmplwi r0, 0 -/* 800C6DF4 40 82 00 3C */ bne lbl_800C6E30 -/* 800C6DF8 C0 3F 33 AC */ lfs f1, 0x33ac(r31) -/* 800C6DFC C0 02 92 A4 */ lfs f0, lit_6021(r2) -/* 800C6E00 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800C6E04 40 81 00 20 */ ble lbl_800C6E24 -/* 800C6E08 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 800C6E0C A8 1F 2F E2 */ lha r0, 0x2fe2(r31) -/* 800C6E10 7C 03 00 50 */ subf r0, r3, r0 -/* 800C6E14 7C 03 07 34 */ extsh r3, r0 -/* 800C6E18 4B FE C6 7D */ bl getDirectionFromAngle__9daAlink_cFs -/* 800C6E1C 2C 03 00 00 */ cmpwi r3, 0 -/* 800C6E20 41 82 00 10 */ beq lbl_800C6E30 -lbl_800C6E24: -/* 800C6E24 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) -/* 800C6E28 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 800C6E2C 41 82 00 3C */ beq lbl_800C6E68 -lbl_800C6E30: -/* 800C6E30 7F E3 FB 78 */ mr r3, r31 -/* 800C6E34 4B FE FB FD */ bl checkFrontWallTypeAction__9daAlink_cFv -/* 800C6E38 2C 03 00 00 */ cmpwi r3, 0 -/* 800C6E3C 41 82 00 2C */ beq lbl_800C6E68 -/* 800C6E40 38 60 00 01 */ li r3, 1 -/* 800C6E44 48 00 00 BC */ b lbl_800C6F00 -lbl_800C6E48: -/* 800C6E48 2C 00 00 02 */ cmpwi r0, 2 -/* 800C6E4C 40 82 00 1C */ bne lbl_800C6E68 -/* 800C6E50 7F E3 FB 78 */ mr r3, r31 -/* 800C6E54 4B FE FB DD */ bl checkFrontWallTypeAction__9daAlink_cFv -/* 800C6E58 2C 03 00 00 */ cmpwi r3, 0 -/* 800C6E5C 41 82 00 0C */ beq lbl_800C6E68 -/* 800C6E60 38 60 00 01 */ li r3, 1 -/* 800C6E64 48 00 00 9C */ b lbl_800C6F00 -lbl_800C6E68: -/* 800C6E68 7F E3 FB 78 */ mr r3, r31 -/* 800C6E6C 4B FE ED 55 */ bl setFallVoice__9daAlink_cFv -/* 800C6E70 C0 42 93 88 */ lfs f2, lit_8782(r2) -/* 800C6E74 C0 3F 33 C4 */ lfs f1, 0x33c4(r31) -/* 800C6E78 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 800C6E7C EC 01 00 28 */ fsubs f0, f1, f0 -/* 800C6E80 EC 22 00 32 */ fmuls f1, f2, f0 -/* 800C6E84 A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 800C6E88 2C 00 00 00 */ cmpwi r0, 0 -/* 800C6E8C 40 82 00 34 */ bne lbl_800C6EC0 -/* 800C6E90 3C 60 80 39 */ lis r3, m__21daAlinkHIO_damFall_c0@ha /* 0x8038E454@ha */ -/* 800C6E94 38 A3 E4 54 */ addi r5, r3, m__21daAlinkHIO_damFall_c0@l /* 0x8038E454@l */ -/* 800C6E98 C0 05 00 40 */ lfs f0, 0x40(r5) -/* 800C6E9C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800C6EA0 40 81 00 20 */ ble lbl_800C6EC0 -/* 800C6EA4 7F E3 FB 78 */ mr r3, r31 -/* 800C6EA8 38 80 00 8C */ li r4, 0x8c -/* 800C6EAC C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800C6EB0 C0 45 00 44 */ lfs f2, 0x44(r5) -/* 800C6EB4 4B FE 61 2D */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -/* 800C6EB8 38 00 00 01 */ li r0, 1 -/* 800C6EBC B0 1F 30 0C */ sth r0, 0x300c(r31) -lbl_800C6EC0: -/* 800C6EC0 A8 7F 04 DE */ lha r3, 0x4de(r31) -/* 800C6EC4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800C6EC8 7C 03 00 00 */ cmpw r3, r0 -/* 800C6ECC 40 82 00 1C */ bne lbl_800C6EE8 -/* 800C6ED0 7F E3 FB 78 */ mr r3, r31 -/* 800C6ED4 4B FE FA F9 */ bl checkCutJumpInFly__9daAlink_cFv -/* 800C6ED8 2C 03 00 00 */ cmpwi r3, 0 -/* 800C6EDC 41 82 00 0C */ beq lbl_800C6EE8 -/* 800C6EE0 38 60 00 01 */ li r3, 1 -/* 800C6EE4 48 00 00 1C */ b lbl_800C6F00 -lbl_800C6EE8: -/* 800C6EE8 A0 1E 00 02 */ lhz r0, 2(r30) -/* 800C6EEC 28 00 00 00 */ cmplwi r0, 0 -/* 800C6EF0 41 82 00 0C */ beq lbl_800C6EFC -/* 800C6EF4 7F E3 FB 78 */ mr r3, r31 -/* 800C6EF8 4B FF 2A 55 */ bl checkItemChangeFromButton__9daAlink_cFv -lbl_800C6EFC: -/* 800C6EFC 38 60 00 01 */ li r3, 1 -lbl_800C6F00: -/* 800C6F00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C6F04 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C6F08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C6F0C 7C 08 03 A6 */ mtlr r0 -/* 800C6F10 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C6F14 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procFloorDownReboundInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procFloorDownReboundInit__9daAlink_cFv.s deleted file mode 100644 index 3a2114db866..00000000000 --- a/asm/d/a/d_a_alink/procFloorDownReboundInit__9daAlink_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_800C8460: -/* 800C8460 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C8464 7C 08 02 A6 */ mflr r0 -/* 800C8468 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C846C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C8470 7C 7F 1B 78 */ mr r31, r3 -/* 800C8474 38 80 00 BD */ li r4, 0xbd -/* 800C8478 4B FF 9A F5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C847C 7F E3 FB 78 */ mr r3, r31 -/* 800C8480 38 80 00 33 */ li r4, 0x33 -/* 800C8484 C0 22 93 A8 */ lfs f1, lit_9652(r2) -/* 800C8488 3C A0 80 39 */ lis r5, m__22daAlinkHIO_autoJump_c0@ha /* 0x8038E068@ha */ -/* 800C848C 38 A5 E0 68 */ addi r5, r5, m__22daAlinkHIO_autoJump_c0@l /* 0x8038E068@l */ -/* 800C8490 C0 45 00 1C */ lfs f2, 0x1c(r5) -/* 800C8494 A8 A5 00 14 */ lha r5, 0x14(r5) -/* 800C8498 C0 62 93 30 */ lfs f3, lit_7625(r2) -/* 800C849C 4B FE 4B 71 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -/* 800C84A0 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C84A4 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800C84A8 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800C84AC B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800C84B0 38 00 00 04 */ li r0, 4 -/* 800C84B4 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 800C84B8 38 60 00 01 */ li r3, 1 -/* 800C84BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C84C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C84C4 7C 08 03 A6 */ mtlr r0 -/* 800C84C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C84CC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procFloorDownRebound__9daAlink_cFv.s b/asm/d/a/d_a_alink/procFloorDownRebound__9daAlink_cFv.s deleted file mode 100644 index 6ad2c6d4ae9..00000000000 --- a/asm/d/a/d_a_alink/procFloorDownRebound__9daAlink_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_800C84D0: -/* 800C84D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C84D4 7C 08 02 A6 */ mflr r0 -/* 800C84D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C84DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C84E0 93 C1 00 08 */ stw r30, 8(r1) -/* 800C84E4 7C 7E 1B 78 */ mr r30, r3 -/* 800C84E8 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800C84EC 7F E3 FB 78 */ mr r3, r31 -/* 800C84F0 48 09 5F DD */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800C84F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C84F8 41 82 00 14 */ beq lbl_800C850C -/* 800C84FC 7F C3 F3 78 */ mr r3, r30 -/* 800C8500 38 80 00 00 */ li r4, 0 -/* 800C8504 4B FF 1B CD */ bl checkNextAction__9daAlink_cFi -/* 800C8508 48 00 00 28 */ b lbl_800C8530 -lbl_800C850C: -/* 800C850C C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800C8510 3C 60 80 39 */ lis r3, m__22daAlinkHIO_autoJump_c0@ha /* 0x8038E068@ha */ -/* 800C8514 38 63 E0 68 */ addi r3, r3, m__22daAlinkHIO_autoJump_c0@l /* 0x8038E068@l */ -/* 800C8518 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 800C851C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800C8520 40 81 00 10 */ ble lbl_800C8530 -/* 800C8524 7F C3 F3 78 */ mr r3, r30 -/* 800C8528 38 80 00 01 */ li r4, 1 -/* 800C852C 4B FF 1B A5 */ bl checkNextAction__9daAlink_cFi -lbl_800C8530: -/* 800C8530 38 60 00 01 */ li r3, 1 -/* 800C8534 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C8538 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C853C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C8540 7C 08 03 A6 */ mtlr r0 -/* 800C8544 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C8548 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procFrontRollCrashInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procFrontRollCrashInit__9daAlink_cFv.s deleted file mode 100644 index 2820e61b658..00000000000 --- a/asm/d/a/d_a_alink/procFrontRollCrashInit__9daAlink_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_800C4F14: -/* 800C4F14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C4F18 7C 08 02 A6 */ mflr r0 -/* 800C4F1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C4F20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C4F24 7C 7F 1B 78 */ mr r31, r3 -/* 800C4F28 38 80 00 0F */ li r4, 0xf -/* 800C4F2C 4B FF D0 41 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C4F30 7F E3 FB 78 */ mr r3, r31 -/* 800C4F34 38 80 00 24 */ li r4, 0x24 -/* 800C4F38 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800C4F3C 3C A0 80 39 */ lis r5, m__23daAlinkHIO_frontRoll_c0@ha /* 0x8038D7BC@ha */ -/* 800C4F40 38 C5 D7 BC */ addi r6, r5, m__23daAlinkHIO_frontRoll_c0@l /* 0x8038D7BC@l */ -/* 800C4F44 C0 46 00 1C */ lfs f2, 0x1c(r6) -/* 800C4F48 A8 A6 00 14 */ lha r5, 0x14(r6) -/* 800C4F4C C0 66 00 20 */ lfs f3, 0x20(r6) -/* 800C4F50 4B FE 80 BD */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -/* 800C4F54 3C 60 80 39 */ lis r3, m__23daAlinkHIO_frontRoll_c0@ha /* 0x8038D7BC@ha */ -/* 800C4F58 38 63 D7 BC */ addi r3, r3, m__23daAlinkHIO_frontRoll_c0@l /* 0x8038D7BC@l */ -/* 800C4F5C C0 03 00 5C */ lfs f0, 0x5c(r3) -/* 800C4F60 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800C4F64 C0 03 00 60 */ lfs f0, 0x60(r3) -/* 800C4F68 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 800C4F6C 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800C4F70 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 800C4F74 41 82 00 2C */ beq lbl_800C4FA0 -/* 800C4F78 C0 3F 33 98 */ lfs f1, 0x3398(r31) -/* 800C4F7C 3C 60 80 39 */ lis r3, m__24daAlinkHIO_magneBoots_c0@ha /* 0x8038E7F4@ha */ -/* 800C4F80 38 63 E7 F4 */ addi r3, r3, m__24daAlinkHIO_magneBoots_c0@l /* 0x8038E7F4@l */ -/* 800C4F84 C0 03 00 3C */ lfs f0, 0x3c(r3) -/* 800C4F88 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800C4F8C D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800C4F90 C0 3F 04 FC */ lfs f1, 0x4fc(r31) -/* 800C4F94 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 800C4F98 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800C4F9C D0 1F 04 FC */ stfs f0, 0x4fc(r31) -lbl_800C4FA0: -/* 800C4FA0 A8 7F 04 DE */ lha r3, 0x4de(r31) -/* 800C4FA4 3C 63 00 01 */ addis r3, r3, 1 -/* 800C4FA8 38 03 80 00 */ addi r0, r3, -32768 -/* 800C4FAC B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800C4FB0 7F E3 FB 78 */ mr r3, r31 -/* 800C4FB4 88 9F 2F A4 */ lbz r4, 0x2fa4(r31) -/* 800C4FB8 4B FF CD 35 */ bl setFrontRollCrashShock__9daAlink_cFUc -/* 800C4FBC 7F E3 FB 78 */ mr r3, r31 -/* 800C4FC0 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010008@ha */ -/* 800C4FC4 38 84 00 08 */ addi r4, r4, 0x0008 /* 0x00010008@l */ -/* 800C4FC8 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800C4FCC 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800C4FD0 7D 89 03 A6 */ mtctr r12 -/* 800C4FD4 4E 80 04 21 */ bctrl -/* 800C4FD8 80 1F 05 80 */ lwz r0, 0x580(r31) -/* 800C4FDC 60 00 20 00 */ ori r0, r0, 0x2000 -/* 800C4FE0 90 1F 05 80 */ stw r0, 0x580(r31) -/* 800C4FE4 38 60 00 01 */ li r3, 1 -/* 800C4FE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C4FEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C4FF0 7C 08 03 A6 */ mtlr r0 -/* 800C4FF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C4FF8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procFrontRollCrash__9daAlink_cFv.s b/asm/d/a/d_a_alink/procFrontRollCrash__9daAlink_cFv.s deleted file mode 100644 index de9efe7e014..00000000000 --- a/asm/d/a/d_a_alink/procFrontRollCrash__9daAlink_cFv.s +++ /dev/null @@ -1,96 +0,0 @@ -lbl_800C4FFC: -/* 800C4FFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C5000 7C 08 02 A6 */ mflr r0 -/* 800C5004 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C5008 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C500C 93 C1 00 08 */ stw r30, 8(r1) -/* 800C5010 7C 7F 1B 78 */ mr r31, r3 -/* 800C5014 3B DF 1F D0 */ addi r30, r31, 0x1fd0 -/* 800C5018 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 800C501C 54 03 07 BD */ rlwinm. r3, r0, 0, 0x1e, 0x1e -/* 800C5020 40 82 00 90 */ bne lbl_800C50B0 -/* 800C5024 7F C3 F3 78 */ mr r3, r30 -/* 800C5028 48 09 94 A5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800C502C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C5030 41 82 00 14 */ beq lbl_800C5044 -/* 800C5034 7F E3 FB 78 */ mr r3, r31 -/* 800C5038 38 80 00 00 */ li r4, 0 -/* 800C503C 4B FF 50 95 */ bl checkNextAction__9daAlink_cFi -/* 800C5040 48 00 01 04 */ b lbl_800C5144 -lbl_800C5044: -/* 800C5044 C0 3E 00 10 */ lfs f1, 0x10(r30) -/* 800C5048 3C 60 80 39 */ lis r3, m__23daAlinkHIO_frontRoll_c0@ha /* 0x8038D7BC@ha */ -/* 800C504C 38 63 D7 BC */ addi r3, r3, m__23daAlinkHIO_frontRoll_c0@l /* 0x8038D7BC@l */ -/* 800C5050 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 800C5054 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800C5058 40 81 00 20 */ ble lbl_800C5078 -/* 800C505C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800C5060 60 00 00 04 */ ori r0, r0, 4 -/* 800C5064 90 1F 31 A0 */ stw r0, 0x31a0(r31) -/* 800C5068 7F E3 FB 78 */ mr r3, r31 -/* 800C506C 38 80 00 01 */ li r4, 1 -/* 800C5070 4B FF 50 61 */ bl checkNextAction__9daAlink_cFi -/* 800C5074 48 00 00 D0 */ b lbl_800C5144 -lbl_800C5078: -/* 800C5078 C0 02 93 C0 */ lfs f0, lit_10193(r2) -/* 800C507C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800C5080 4C 41 13 82 */ cror 2, 1, 2 -/* 800C5084 40 82 00 10 */ bne lbl_800C5094 -/* 800C5088 38 00 00 04 */ li r0, 4 -/* 800C508C 98 1F 2F 92 */ stb r0, 0x2f92(r31) -/* 800C5090 48 00 00 B4 */ b lbl_800C5144 -lbl_800C5094: -/* 800C5094 C0 02 93 48 */ lfs f0, lit_8130(r2) -/* 800C5098 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800C509C 4C 41 13 82 */ cror 2, 1, 2 -/* 800C50A0 40 82 00 A4 */ bne lbl_800C5144 -/* 800C50A4 38 00 00 0A */ li r0, 0xa -/* 800C50A8 98 1F 2F 93 */ stb r0, 0x2f93(r31) -/* 800C50AC 48 00 00 98 */ b lbl_800C5144 -lbl_800C50B0: -/* 800C50B0 80 1F 19 9C */ lwz r0, 0x199c(r31) -/* 800C50B4 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800C50B8 40 82 00 1C */ bne lbl_800C50D4 -/* 800C50BC 80 1F 05 90 */ lwz r0, 0x590(r31) -/* 800C50C0 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 800C50C4 40 82 00 10 */ bne lbl_800C50D4 -/* 800C50C8 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800C50CC 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 800C50D0 41 82 00 74 */ beq lbl_800C5144 -lbl_800C50D4: -/* 800C50D4 28 03 00 00 */ cmplwi r3, 0 -/* 800C50D8 41 82 00 6C */ beq lbl_800C5144 -/* 800C50DC C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C50E0 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800C50E4 7F E3 FB 78 */ mr r3, r31 -/* 800C50E8 7F C4 F3 78 */ mr r4, r30 -/* 800C50EC 3C A0 80 39 */ lis r5, m__23daAlinkHIO_frontRoll_c0@ha /* 0x8038D7BC@ha */ -/* 800C50F0 38 A5 D7 BC */ addi r5, r5, m__23daAlinkHIO_frontRoll_c0@l /* 0x8038D7BC@l */ -/* 800C50F4 C0 25 00 18 */ lfs f1, 0x18(r5) -/* 800C50F8 48 03 CB FD */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf -/* 800C50FC 38 00 00 00 */ li r0, 0 -/* 800C5100 B0 1E 00 14 */ sth r0, 0x14(r30) -/* 800C5104 B0 1E 00 16 */ sth r0, 0x16(r30) -/* 800C5108 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800C510C B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800C5110 7F E3 FB 78 */ mr r3, r31 -/* 800C5114 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010009@ha */ -/* 800C5118 38 84 00 09 */ addi r4, r4, 0x0009 /* 0x00010009@l */ -/* 800C511C 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800C5120 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800C5124 7D 89 03 A6 */ mtctr r12 -/* 800C5128 4E 80 04 21 */ bctrl -/* 800C512C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800C5130 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d -/* 800C5134 90 1F 31 A0 */ stw r0, 0x31a0(r31) -/* 800C5138 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800C513C 60 00 80 01 */ ori r0, r0, 0x8001 -/* 800C5140 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_800C5144: -/* 800C5144 38 60 00 01 */ li r3, 1 -/* 800C5148 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C514C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C5150 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C5154 7C 08 03 A6 */ mtlr r0 -/* 800C5158 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C515C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procFrontRollSuccessInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procFrontRollSuccessInit__9daAlink_cFv.s deleted file mode 100644 index 6c6729ae887..00000000000 --- a/asm/d/a/d_a_alink/procFrontRollSuccessInit__9daAlink_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_800C5160: -/* 800C5160 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C5164 7C 08 02 A6 */ mflr r0 -/* 800C5168 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C516C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C5170 93 C1 00 08 */ stw r30, 8(r1) -/* 800C5174 7C 7E 1B 78 */ mr r30, r3 -/* 800C5178 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800C517C 20 00 00 78 */ subfic r0, r0, 0x78 -/* 800C5180 7C 00 00 34 */ cntlzw r0, r0 -/* 800C5184 54 1F DE 3E */ rlwinm r31, r0, 0x1b, 0x18, 0x1f -/* 800C5188 38 80 00 10 */ li r4, 0x10 -/* 800C518C 4B FF CD E1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C5190 7F C3 F3 78 */ mr r3, r30 -/* 800C5194 38 80 00 25 */ li r4, 0x25 -/* 800C5198 3C A0 80 39 */ lis r5, m__23daAlinkHIO_frontRoll_c0@ha /* 0x8038D7BC@ha */ -/* 800C519C 38 A5 D7 BC */ addi r5, r5, m__23daAlinkHIO_frontRoll_c0@l /* 0x8038D7BC@l */ -/* 800C51A0 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800C51A4 4B FE 7F 51 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800C51A8 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C51AC D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800C51B0 2C 1F 00 00 */ cmpwi r31, 0 -/* 800C51B4 40 82 00 20 */ bne lbl_800C51D4 -/* 800C51B8 7F C3 F3 78 */ mr r3, r30 -/* 800C51BC 88 9E 2F A4 */ lbz r4, 0x2fa4(r30) -/* 800C51C0 4B FF CB 2D */ bl setFrontRollCrashShock__9daAlink_cFUc -/* 800C51C4 80 1E 05 80 */ lwz r0, 0x580(r30) -/* 800C51C8 60 00 20 00 */ ori r0, r0, 0x2000 -/* 800C51CC 90 1E 05 80 */ stw r0, 0x580(r30) -/* 800C51D0 48 00 00 14 */ b lbl_800C51E4 -lbl_800C51D4: -/* 800C51D4 C0 02 92 C4 */ lfs f0, lit_6109(r2) -/* 800C51D8 D0 1E 1F E0 */ stfs f0, 0x1fe0(r30) -/* 800C51DC 80 7E 1F 2C */ lwz r3, 0x1f2c(r30) -/* 800C51E0 D0 03 00 08 */ stfs f0, 8(r3) -lbl_800C51E4: -/* 800C51E4 3C 60 80 42 */ lis r3, l_halfAtnWaitBaseAnime@ha /* 0x80425544@ha */ -/* 800C51E8 C4 03 55 44 */ lfsu f0, l_halfAtnWaitBaseAnime@l(r3) /* 0x80425544@l */ -/* 800C51EC D0 1E 35 88 */ stfs f0, 0x3588(r30) -/* 800C51F0 C0 03 00 04 */ lfs f0, 4(r3) -/* 800C51F4 D0 1E 35 8C */ stfs f0, 0x358c(r30) -/* 800C51F8 C0 03 00 08 */ lfs f0, 8(r3) -/* 800C51FC D0 1E 35 90 */ stfs f0, 0x3590(r30) -/* 800C5200 38 00 00 04 */ li r0, 4 -/* 800C5204 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 800C5208 7F C3 F3 78 */ mr r3, r30 -/* 800C520C 38 80 00 01 */ li r4, 1 -/* 800C5210 48 05 BF B1 */ bl setFootEffectProcType__9daAlink_cFi -/* 800C5214 A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 800C5218 3C 63 00 01 */ addis r3, r3, 1 -/* 800C521C 38 03 80 00 */ addi r0, r3, -32768 -/* 800C5220 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800C5224 38 60 00 01 */ li r3, 1 -/* 800C5228 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C522C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C5230 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C5234 7C 08 03 A6 */ mtlr r0 -/* 800C5238 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C523C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procFrontRollSuccess__9daAlink_cFv.s b/asm/d/a/d_a_alink/procFrontRollSuccess__9daAlink_cFv.s deleted file mode 100644 index cbd788449d3..00000000000 --- a/asm/d/a/d_a_alink/procFrontRollSuccess__9daAlink_cFv.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_800C5240: -/* 800C5240 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C5244 7C 08 02 A6 */ mflr r0 -/* 800C5248 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C524C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C5250 93 C1 00 08 */ stw r30, 8(r1) -/* 800C5254 7C 7E 1B 78 */ mr r30, r3 -/* 800C5258 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800C525C 38 00 00 04 */ li r0, 4 -/* 800C5260 98 03 2F 99 */ stb r0, 0x2f99(r3) -/* 800C5264 80 03 05 88 */ lwz r0, 0x588(r3) -/* 800C5268 64 00 08 00 */ oris r0, r0, 0x800 -/* 800C526C 90 03 05 88 */ stw r0, 0x588(r3) -/* 800C5270 7F E3 FB 78 */ mr r3, r31 -/* 800C5274 48 09 92 59 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800C5278 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C527C 41 82 00 1C */ beq lbl_800C5298 -/* 800C5280 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800C5284 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800C5288 7F C3 F3 78 */ mr r3, r30 -/* 800C528C 38 80 00 00 */ li r4, 0 -/* 800C5290 4B FF 4E 41 */ bl checkNextAction__9daAlink_cFi -/* 800C5294 48 00 00 78 */ b lbl_800C530C -lbl_800C5298: -/* 800C5298 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800C529C 3C 60 80 39 */ lis r3, m__23daAlinkHIO_frontRoll_c0@ha /* 0x8038D7BC@ha */ -/* 800C52A0 38 63 D7 BC */ addi r3, r3, m__23daAlinkHIO_frontRoll_c0@l /* 0x8038D7BC@l */ -/* 800C52A4 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 800C52A8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800C52AC 40 81 00 28 */ ble lbl_800C52D4 -/* 800C52B0 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 800C52B4 60 00 00 04 */ ori r0, r0, 4 -/* 800C52B8 90 1E 31 A0 */ stw r0, 0x31a0(r30) -/* 800C52BC A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800C52C0 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800C52C4 7F C3 F3 78 */ mr r3, r30 -/* 800C52C8 38 80 00 01 */ li r4, 1 -/* 800C52CC 4B FF 4E 05 */ bl checkNextAction__9daAlink_cFi -/* 800C52D0 48 00 00 3C */ b lbl_800C530C -lbl_800C52D4: -/* 800C52D4 C0 02 93 48 */ lfs f0, lit_8130(r2) -/* 800C52D8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800C52DC 4C 41 13 82 */ cror 2, 1, 2 -/* 800C52E0 40 82 00 18 */ bne lbl_800C52F8 -/* 800C52E4 38 00 00 01 */ li r0, 1 -/* 800C52E8 98 1E 2F 92 */ stb r0, 0x2f92(r30) -/* 800C52EC 38 00 00 06 */ li r0, 6 -/* 800C52F0 98 1E 2F 93 */ stb r0, 0x2f93(r30) -/* 800C52F4 48 00 00 18 */ b lbl_800C530C -lbl_800C52F8: -/* 800C52F8 C0 02 93 34 */ lfs f0, lit_7710(r2) -/* 800C52FC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800C5300 40 81 00 0C */ ble lbl_800C530C -/* 800C5304 38 00 00 60 */ li r0, 0x60 -/* 800C5308 98 1E 2F 9D */ stb r0, 0x2f9d(r30) -lbl_800C530C: -/* 800C530C 38 60 00 01 */ li r3, 1 -/* 800C5310 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C5314 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C5318 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C531C 7C 08 03 A6 */ mtlr r0 -/* 800C5320 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C5324 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procGoatStroke__9daAlink_cFv.s b/asm/d/a/d_a_alink/procGoatStroke__9daAlink_cFv.s deleted file mode 100644 index 90a29adcbc9..00000000000 --- a/asm/d/a/d_a_alink/procGoatStroke__9daAlink_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_800EA3AC: -/* 800EA3AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800EA3B0 7C 08 02 A6 */ mflr r0 -/* 800EA3B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800EA3B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800EA3BC 7C 7F 1B 78 */ mr r31, r3 -/* 800EA3C0 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800EA3C4 48 07 41 09 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800EA3C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800EA3CC 41 82 00 10 */ beq lbl_800EA3DC -/* 800EA3D0 7F E3 FB 78 */ mr r3, r31 -/* 800EA3D4 38 80 00 00 */ li r4, 0 -/* 800EA3D8 4B FC FC F9 */ bl checkNextAction__9daAlink_cFi -lbl_800EA3DC: -/* 800EA3DC 38 60 00 01 */ li r3, 1 -/* 800EA3E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800EA3E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800EA3E8 7C 08 03 A6 */ mtlr r0 -/* 800EA3EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EA3F0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procGoronMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procGoronMoveInit__9daAlink_cFv.s deleted file mode 100644 index 7f50e8cd585..00000000000 --- a/asm/d/a/d_a_alink/procGoronMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_800EA3F4: -/* 800EA3F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800EA3F8 7C 08 02 A6 */ mflr r0 -/* 800EA3FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800EA400 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800EA404 7C 7F 1B 78 */ mr r31, r3 -/* 800EA408 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800EA40C 28 00 00 FF */ cmplwi r0, 0xff -/* 800EA410 41 82 00 14 */ beq lbl_800EA424 -/* 800EA414 38 80 00 C2 */ li r4, 0xc2 -/* 800EA418 38 A0 00 00 */ li r5, 0 -/* 800EA41C 4B FD 89 C1 */ bl procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c -/* 800EA420 48 00 00 98 */ b lbl_800EA4B8 -lbl_800EA424: -/* 800EA424 38 80 00 C2 */ li r4, 0xc2 -/* 800EA428 4B FD 89 7D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800EA42C 2C 03 00 00 */ cmpwi r3, 0 -/* 800EA430 40 82 00 0C */ bne lbl_800EA43C -/* 800EA434 38 60 00 00 */ li r3, 0 -/* 800EA438 48 00 00 80 */ b lbl_800EA4B8 -lbl_800EA43C: -/* 800EA43C 38 7F 28 54 */ addi r3, r31, 0x2854 -/* 800EA440 48 07 48 09 */ bl setActor__16daPy_actorKeep_cFv -/* 800EA444 80 1F 28 58 */ lwz r0, 0x2858(r31) -/* 800EA448 28 00 00 00 */ cmplwi r0, 0 -/* 800EA44C 40 82 00 20 */ bne lbl_800EA46C -/* 800EA450 88 1F 05 6A */ lbz r0, 0x56a(r31) -/* 800EA454 28 00 00 2B */ cmplwi r0, 0x2b -/* 800EA458 40 82 00 0C */ bne lbl_800EA464 -/* 800EA45C 38 00 00 00 */ li r0, 0 -/* 800EA460 98 1F 05 6A */ stb r0, 0x56a(r31) -lbl_800EA464: -/* 800EA464 38 60 00 00 */ li r3, 0 -/* 800EA468 48 00 00 50 */ b lbl_800EA4B8 -lbl_800EA46C: -/* 800EA46C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800EA470 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800EA474 38 00 00 03 */ li r0, 3 -/* 800EA478 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 800EA47C A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 800EA480 38 03 C0 00 */ addi r0, r3, -16384 -/* 800EA484 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800EA488 3C 60 80 39 */ lis r3, m__21daAlinkHIO_atnMove_c0@ha /* 0x8038D714@ha */ -/* 800EA48C 38 63 D7 14 */ addi r3, r3, m__21daAlinkHIO_atnMove_c0@l /* 0x8038D714@l */ -/* 800EA490 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 800EA494 D0 1F 05 94 */ stfs f0, 0x594(r31) -/* 800EA498 7F E3 FB 78 */ mr r3, r31 -/* 800EA49C 38 80 01 21 */ li r4, 0x121 -/* 800EA4A0 4B FC 2A E1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 800EA4A4 38 00 00 01 */ li r0, 1 -/* 800EA4A8 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800EA4AC 38 00 00 00 */ li r0, 0 -/* 800EA4B0 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 800EA4B4 38 60 00 01 */ li r3, 1 -lbl_800EA4B8: -/* 800EA4B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800EA4BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800EA4C0 7C 08 03 A6 */ mtlr r0 -/* 800EA4C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EA4C8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procGoronRideWaitInit__9daAlink_cFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/procGoronRideWaitInit__9daAlink_cFP10fopAc_ac_c.s deleted file mode 100644 index 8b3110003e4..00000000000 --- a/asm/d/a/d_a_alink/procGoronRideWaitInit__9daAlink_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_800C854C: -/* 800C854C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C8550 7C 08 02 A6 */ mflr r0 -/* 800C8554 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C8558 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C855C 93 C1 00 08 */ stw r30, 8(r1) -/* 800C8560 7C 7E 1B 78 */ mr r30, r3 -/* 800C8564 7C 9F 23 78 */ mr r31, r4 -/* 800C8568 38 80 00 BE */ li r4, 0xbe -/* 800C856C 4B FF A8 39 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C8570 2C 03 00 00 */ cmpwi r3, 0 -/* 800C8574 40 82 00 0C */ bne lbl_800C8580 -/* 800C8578 38 60 00 00 */ li r3, 0 -/* 800C857C 48 00 00 44 */ b lbl_800C85C0 -lbl_800C8580: -/* 800C8580 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C8584 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800C8588 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 800C858C D0 1E 04 D0 */ stfs f0, 0x4d0(r30) -/* 800C8590 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 800C8594 D0 1E 04 D8 */ stfs f0, 0x4d8(r30) -/* 800C8598 38 00 00 50 */ li r0, 0x50 -/* 800C859C 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 800C85A0 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800C85A4 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800C85A8 7F C3 F3 78 */ mr r3, r30 -/* 800C85AC 3C 80 80 39 */ lis r4, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 800C85B0 38 84 D6 64 */ addi r4, r4, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 800C85B4 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800C85B8 4B FE 58 5D */ bl setBlendMoveAnime__9daAlink_cFf -/* 800C85BC 38 60 00 01 */ li r3, 1 -lbl_800C85C0: -/* 800C85C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C85C4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C85C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C85CC 7C 08 03 A6 */ mtlr r0 -/* 800C85D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C85D4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procHawkCatchInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procHawkCatchInit__9daAlink_cFv.s deleted file mode 100644 index e9276a4e71d..00000000000 --- a/asm/d/a/d_a_alink/procHawkCatchInit__9daAlink_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_801121B4: -/* 801121B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801121B8 7C 08 02 A6 */ mflr r0 -/* 801121BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801121C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801121C4 7C 7F 1B 78 */ mr r31, r3 -/* 801121C8 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 801121CC 28 00 00 BC */ cmplwi r0, 0xbc -/* 801121D0 41 82 00 14 */ beq lbl_801121E4 -/* 801121D4 38 80 00 BB */ li r4, 0xbb -/* 801121D8 4B FB 0B CD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 801121DC 2C 03 00 00 */ cmpwi r3, 0 -/* 801121E0 40 82 00 0C */ bne lbl_801121EC -lbl_801121E4: -/* 801121E4 38 60 00 00 */ li r3, 0 -/* 801121E8 48 00 00 24 */ b lbl_8011220C -lbl_801121EC: -/* 801121EC 7F E3 FB 78 */ mr r3, r31 -/* 801121F0 38 80 01 11 */ li r4, 0x111 -/* 801121F4 4B F9 AD 8D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 801121F8 7F E3 FB 78 */ mr r3, r31 -/* 801121FC 38 80 00 00 */ li r4, 0 -/* 80112200 38 A0 00 01 */ li r5, 1 -/* 80112204 4B FA F0 D9 */ bl deleteEquipItem__9daAlink_cFii -/* 80112208 38 60 00 01 */ li r3, 1 -lbl_8011220C: -/* 8011220C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80112210 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80112214 7C 08 03 A6 */ mtlr r0 -/* 80112218 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011221C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procHawkCatch__9daAlink_cFv.s b/asm/d/a/d_a_alink/procHawkCatch__9daAlink_cFv.s deleted file mode 100644 index ceb56dc705c..00000000000 --- a/asm/d/a/d_a_alink/procHawkCatch__9daAlink_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80112220: -/* 80112220 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80112224 7C 08 02 A6 */ mflr r0 -/* 80112228 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011222C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80112230 7C 7F 1B 78 */ mr r31, r3 -/* 80112234 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 80112238 48 04 C2 95 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8011223C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80112240 41 82 00 20 */ beq lbl_80112260 -/* 80112244 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80112248 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011224C 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80112250 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 80112254 4B F3 5F 29 */ bl cutEnd__16dEvent_manager_cFi -/* 80112258 7F E3 FB 78 */ mr r3, r31 -/* 8011225C 48 00 00 1D */ bl procHawkSubjectInit__9daAlink_cFv -lbl_80112260: -/* 80112260 38 60 00 01 */ li r3, 1 -/* 80112264 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80112268 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011226C 7C 08 03 A6 */ mtlr r0 -/* 80112270 38 21 00 10 */ addi r1, r1, 0x10 -/* 80112274 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procHawkSubjectInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procHawkSubjectInit__9daAlink_cFv.s deleted file mode 100644 index 10324c2a786..00000000000 --- a/asm/d/a/d_a_alink/procHawkSubjectInit__9daAlink_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80112278: -/* 80112278 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011227C 7C 08 02 A6 */ mflr r0 -/* 80112280 90 01 00 14 */ stw r0, 0x14(r1) -/* 80112284 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80112288 7C 7F 1B 78 */ mr r31, r3 -/* 8011228C 38 80 00 BC */ li r4, 0xbc -/* 80112290 4B FB 0B 15 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80112294 2C 03 00 00 */ cmpwi r3, 0 -/* 80112298 40 82 00 0C */ bne lbl_801122A4 -/* 8011229C 38 60 00 00 */ li r3, 0 -/* 801122A0 48 00 00 50 */ b lbl_801122F0 -lbl_801122A4: -/* 801122A4 7F E3 FB 78 */ mr r3, r31 -/* 801122A8 38 80 01 12 */ li r4, 0x112 -/* 801122AC 4B F9 AC D5 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 801122B0 3C 60 80 11 */ lis r3, daAlink_searchHawk__FP10fopAc_ac_cPv@ha /* 0x80111770@ha */ -/* 801122B4 38 63 17 70 */ addi r3, r3, daAlink_searchHawk__FP10fopAc_ac_cPv@l /* 0x80111770@l */ -/* 801122B8 38 80 00 00 */ li r4, 0 -/* 801122BC 4B F0 75 3D */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 801122C0 7C 64 1B 79 */ or. r4, r3, r3 -/* 801122C4 41 82 00 0C */ beq lbl_801122D0 -/* 801122C8 38 7F 28 0C */ addi r3, r31, 0x280c -/* 801122CC 48 04 C9 ED */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -lbl_801122D0: -/* 801122D0 38 00 00 00 */ li r0, 0 -/* 801122D4 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 801122D8 B0 1F 05 9E */ sth r0, 0x59e(r31) -/* 801122DC 7F E3 FB 78 */ mr r3, r31 -/* 801122E0 38 80 00 00 */ li r4, 0 -/* 801122E4 38 A0 00 01 */ li r5, 1 -/* 801122E8 4B FA EF F5 */ bl deleteEquipItem__9daAlink_cFii -/* 801122EC 38 60 00 01 */ li r3, 1 -lbl_801122F0: -/* 801122F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801122F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801122F8 7C 08 03 A6 */ mtlr r0 -/* 801122FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80112300 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procIronBallMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procIronBallMoveInit__9daAlink_cFv.s deleted file mode 100644 index 2a56369423b..00000000000 --- a/asm/d/a/d_a_alink/procIronBallMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_801155EC: -/* 801155EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801155F0 7C 08 02 A6 */ mflr r0 -/* 801155F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801155F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801155FC 7C 7F 1B 78 */ mr r31, r3 -/* 80115600 38 80 00 D9 */ li r4, 0xd9 -/* 80115604 4B FA D7 A1 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80115608 2C 03 00 00 */ cmpwi r3, 0 -/* 8011560C 40 82 00 0C */ bne lbl_80115618 -/* 80115610 38 60 00 00 */ li r3, 0 -/* 80115614 48 00 00 4C */ b lbl_80115660 -lbl_80115618: -/* 80115618 7F E3 FB 78 */ mr r3, r31 -/* 8011561C 4B F9 E2 E9 */ bl checkZeroSpeedF__9daAlink_cCFv -/* 80115620 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80115624 41 82 00 10 */ beq lbl_80115634 -/* 80115628 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 8011562C 60 00 00 01 */ ori r0, r0, 1 -/* 80115630 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_80115634: -/* 80115634 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 80115638 28 00 01 9A */ cmplwi r0, 0x19a -/* 8011563C 40 82 00 0C */ bne lbl_80115648 -/* 80115640 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 80115644 D0 1F 33 98 */ stfs f0, 0x3398(r31) -lbl_80115648: -/* 80115648 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011564C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80115650 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 80115654 60 00 04 00 */ ori r0, r0, 0x400 -/* 80115658 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 8011565C 38 60 00 01 */ li r3, 1 -lbl_80115660: -/* 80115660 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80115664 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80115668 7C 08 03 A6 */ mtlr r0 -/* 8011566C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80115670 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procIronBallMove__9daAlink_cFv.s b/asm/d/a/d_a_alink/procIronBallMove__9daAlink_cFv.s deleted file mode 100644 index 719a11aec89..00000000000 --- a/asm/d/a/d_a_alink/procIronBallMove__9daAlink_cFv.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_80115674: -/* 80115674 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80115678 7C 08 02 A6 */ mflr r0 -/* 8011567C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80115680 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 80115684 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 80115688 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011568C 7C 7F 1B 78 */ mr r31, r3 -/* 80115690 4B FF FA 55 */ bl checkIronBallAnime__9daAlink_cCFv -/* 80115694 2C 03 00 00 */ cmpwi r3, 0 -/* 80115698 41 82 00 10 */ beq lbl_801156A8 -/* 8011569C 7F E3 FB 78 */ mr r3, r31 -/* 801156A0 38 80 00 12 */ li r4, 0x12 -/* 801156A4 4B F9 DB AD */ bl setDoStatus__9daAlink_cFUc -lbl_801156A8: -/* 801156A8 7F E3 FB 78 */ mr r3, r31 -/* 801156AC 38 80 00 00 */ li r4, 0 -/* 801156B0 4B F9 E0 85 */ bl setShapeAngleToAtnActor__9daAlink_cFi -/* 801156B4 7F E3 FB 78 */ mr r3, r31 -/* 801156B8 38 80 00 00 */ li r4, 0 -/* 801156BC 4B FA 4A 15 */ bl checkNextAction__9daAlink_cFi -/* 801156C0 2C 03 00 00 */ cmpwi r3, 0 -/* 801156C4 40 82 00 98 */ bne lbl_8011575C -/* 801156C8 C3 E2 92 BC */ lfs f31, lit_6041(r2) -/* 801156CC A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 801156D0 28 00 01 9A */ cmplwi r0, 0x19a -/* 801156D4 40 82 00 0C */ bne lbl_801156E0 -/* 801156D8 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 801156DC D0 1F 33 98 */ stfs f0, 0x3398(r31) -lbl_801156E0: -/* 801156E0 7F E3 FB 78 */ mr r3, r31 -/* 801156E4 4B F9 E2 21 */ bl checkZeroSpeedF__9daAlink_cCFv -/* 801156E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801156EC 41 82 00 34 */ beq lbl_80115720 -/* 801156F0 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 801156F4 60 00 00 01 */ ori r0, r0, 1 -/* 801156F8 90 1F 31 A0 */ stw r0, 0x31a0(r31) -/* 801156FC 88 1F 2F 98 */ lbz r0, 0x2f98(r31) -/* 80115700 28 00 00 02 */ cmplwi r0, 2 -/* 80115704 41 82 00 28 */ beq lbl_8011572C -/* 80115708 38 00 00 02 */ li r0, 2 -/* 8011570C 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 80115710 3C 60 80 39 */ lis r3, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 80115714 38 63 D6 64 */ addi r3, r3, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 80115718 C3 E3 00 18 */ lfs f31, 0x18(r3) -/* 8011571C 48 00 00 10 */ b lbl_8011572C -lbl_80115720: -/* 80115720 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 80115724 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80115728 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_8011572C: -/* 8011572C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 80115730 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80115734 41 82 00 10 */ beq lbl_80115744 -/* 80115738 7F E3 FB 78 */ mr r3, r31 -/* 8011573C 4B FF FA A5 */ bl setIronBallBaseAnime__9daAlink_cFv -/* 80115740 48 00 00 10 */ b lbl_80115750 -lbl_80115744: -/* 80115744 7F E3 FB 78 */ mr r3, r31 -/* 80115748 FC 20 F8 90 */ fmr f1, f31 -/* 8011574C 4B F9 93 25 */ bl setBlendAtnMoveAnime__9daAlink_cFf -lbl_80115750: -/* 80115750 7F E3 FB 78 */ mr r3, r31 -/* 80115754 38 80 00 00 */ li r4, 0 -/* 80115758 4B FA 5B 59 */ bl setBodyAngleXReadyAnime__9daAlink_cFi -lbl_8011575C: -/* 8011575C 38 60 00 01 */ li r3, 1 -/* 80115760 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 80115764 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 80115768 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011576C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80115770 7C 08 03 A6 */ mtlr r0 -/* 80115774 38 21 00 20 */ addi r1, r1, 0x20 -/* 80115778 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procIronBallReturnInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procIronBallReturnInit__9daAlink_cFv.s deleted file mode 100644 index f6edc37e4f5..00000000000 --- a/asm/d/a/d_a_alink/procIronBallReturnInit__9daAlink_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_801159F0: -/* 801159F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801159F4 7C 08 02 A6 */ mflr r0 -/* 801159F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801159FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80115A00 7C 7F 1B 78 */ mr r31, r3 -/* 80115A04 38 80 00 DB */ li r4, 0xdb -/* 80115A08 4B FA C5 65 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80115A0C A8 1F 30 18 */ lha r0, 0x3018(r31) -/* 80115A10 2C 00 00 08 */ cmpwi r0, 8 -/* 80115A14 40 82 00 2C */ bne lbl_80115A40 -/* 80115A18 38 00 00 01 */ li r0, 1 -/* 80115A1C B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 80115A20 7F E3 FB 78 */ mr r3, r31 -/* 80115A24 38 80 01 66 */ li r4, 0x166 -/* 80115A28 3C A0 80 39 */ lis r5, m__22daAlinkHIO_ironBall_c0@ha /* 0x8038EA70@ha */ -/* 80115A2C 38 A5 EA 70 */ addi r5, r5, m__22daAlinkHIO_ironBall_c0@l /* 0x8038EA70@l */ -/* 80115A30 4B F9 76 C5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 80115A34 38 00 00 0C */ li r0, 0xc -/* 80115A38 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 80115A3C 48 00 00 30 */ b lbl_80115A6C -lbl_80115A40: -/* 80115A40 7F E3 FB 78 */ mr r3, r31 -/* 80115A44 38 80 01 65 */ li r4, 0x165 -/* 80115A48 3C A0 80 39 */ lis r5, m__22daAlinkHIO_ironBall_c0@ha /* 0x8038EA70@ha */ -/* 80115A4C 38 A5 EA 70 */ addi r5, r5, m__22daAlinkHIO_ironBall_c0@l /* 0x8038EA70@l */ -/* 80115A50 C0 25 00 3C */ lfs f1, 0x3c(r5) -/* 80115A54 C0 45 00 40 */ lfs f2, 0x40(r5) -/* 80115A58 4B F9 75 89 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -/* 80115A5C 38 00 00 0C */ li r0, 0xc -/* 80115A60 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 80115A64 38 00 00 00 */ li r0, 0 -/* 80115A68 B0 1F 30 0C */ sth r0, 0x300c(r31) -lbl_80115A6C: -/* 80115A6C 3C 60 80 42 */ lis r3, l_ironBallBaseAnime@ha /* 0x8042552C@ha */ -/* 80115A70 C4 03 55 2C */ lfsu f0, l_ironBallBaseAnime@l(r3) /* 0x8042552C@l */ -/* 80115A74 D0 1F 35 88 */ stfs f0, 0x3588(r31) -/* 80115A78 C0 03 00 04 */ lfs f0, 4(r3) -/* 80115A7C D0 1F 35 8C */ stfs f0, 0x358c(r31) -/* 80115A80 C0 03 00 08 */ lfs f0, 8(r3) -/* 80115A84 D0 1F 35 90 */ stfs f0, 0x3590(r31) -/* 80115A88 38 60 00 01 */ li r3, 1 -/* 80115A8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80115A90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80115A94 7C 08 03 A6 */ mtlr r0 -/* 80115A98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80115A9C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procIronBallReturn__9daAlink_cFv.s b/asm/d/a/d_a_alink/procIronBallReturn__9daAlink_cFv.s deleted file mode 100644 index d50901c64a6..00000000000 --- a/asm/d/a/d_a_alink/procIronBallReturn__9daAlink_cFv.s +++ /dev/null @@ -1,102 +0,0 @@ -lbl_80115AA0: -/* 80115AA0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80115AA4 7C 08 02 A6 */ mflr r0 -/* 80115AA8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80115AAC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80115AB0 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80115AB4 7C 7F 1B 78 */ mr r31, r3 -/* 80115AB8 3B DF 1F D0 */ addi r30, r31, 0x1fd0 -/* 80115ABC A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 80115AC0 28 00 00 42 */ cmplwi r0, 0x42 -/* 80115AC4 41 82 00 0C */ beq lbl_80115AD0 -/* 80115AC8 4B F9 FE 25 */ bl checkWaitAction__9daAlink_cFv -/* 80115ACC 48 00 01 3C */ b lbl_80115C08 -lbl_80115AD0: -/* 80115AD0 38 00 00 04 */ li r0, 4 -/* 80115AD4 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 80115AD8 A8 1F 30 18 */ lha r0, 0x3018(r31) -/* 80115ADC 2C 00 00 08 */ cmpwi r0, 8 -/* 80115AE0 40 82 00 80 */ bne lbl_80115B60 -/* 80115AE4 A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 80115AE8 2C 00 00 00 */ cmpwi r0, 0 -/* 80115AEC 40 82 00 74 */ bne lbl_80115B60 -/* 80115AF0 38 00 00 01 */ li r0, 1 -/* 80115AF4 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 80115AF8 38 80 01 66 */ li r4, 0x166 -/* 80115AFC 3C A0 80 39 */ lis r5, m__22daAlinkHIO_ironBall_c0@ha /* 0x8038EA70@ha */ -/* 80115B00 38 A5 EA 70 */ addi r5, r5, m__22daAlinkHIO_ironBall_c0@l /* 0x8038EA70@l */ -/* 80115B04 4B F9 75 F1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 80115B08 38 00 00 0C */ li r0, 0xc -/* 80115B0C 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 80115B10 7F E3 FB 78 */ mr r3, r31 -/* 80115B14 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020034@ha */ -/* 80115B18 38 84 00 34 */ addi r4, r4, 0x0034 /* 0x00020034@l */ -/* 80115B1C 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 80115B20 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 80115B24 7D 89 03 A6 */ mtctr r12 -/* 80115B28 4E 80 04 21 */ bctrl -/* 80115B2C C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 80115B30 D0 21 00 08 */ stfs f1, 8(r1) -/* 80115B34 C0 02 92 B8 */ lfs f0, lit_6040(r2) -/* 80115B38 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80115B3C D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80115B40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80115B44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80115B48 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 80115B4C 38 80 00 03 */ li r4, 3 -/* 80115B50 38 A0 00 01 */ li r5, 1 -/* 80115B54 38 C1 00 08 */ addi r6, r1, 8 -/* 80115B58 4B F5 9E CD */ bl StartShock__12dVibration_cFii4cXyz -/* 80115B5C 48 00 00 A8 */ b lbl_80115C04 -lbl_80115B60: -/* 80115B60 7F C3 F3 78 */ mr r3, r30 -/* 80115B64 48 04 89 69 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 80115B68 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80115B6C 41 82 00 34 */ beq lbl_80115BA0 -/* 80115B70 A8 1F 30 18 */ lha r0, 0x3018(r31) -/* 80115B74 2C 00 00 08 */ cmpwi r0, 8 -/* 80115B78 40 82 00 8C */ bne lbl_80115C04 -/* 80115B7C 38 00 00 00 */ li r0, 0 -/* 80115B80 B0 1F 30 18 */ sth r0, 0x3018(r31) -/* 80115B84 7F E3 FB 78 */ mr r3, r31 -/* 80115B88 38 80 00 01 */ li r4, 1 -/* 80115B8C 4B FF C9 DD */ bl setIronBallWaitUpperAnime__9daAlink_cFi -/* 80115B90 7F E3 FB 78 */ mr r3, r31 -/* 80115B94 38 80 00 00 */ li r4, 0 -/* 80115B98 4B FA 45 39 */ bl checkNextAction__9daAlink_cFi -/* 80115B9C 48 00 00 68 */ b lbl_80115C04 -lbl_80115BA0: -/* 80115BA0 A8 1F 30 18 */ lha r0, 0x3018(r31) -/* 80115BA4 2C 00 00 08 */ cmpwi r0, 8 -/* 80115BA8 40 82 00 5C */ bne lbl_80115C04 -/* 80115BAC C0 3E 00 10 */ lfs f1, 0x10(r30) -/* 80115BB0 3C 60 80 39 */ lis r3, m__22daAlinkHIO_ironBall_c0@ha /* 0x8038EA70@ha */ -/* 80115BB4 38 63 EA 70 */ addi r3, r3, m__22daAlinkHIO_ironBall_c0@l /* 0x8038EA70@l */ -/* 80115BB8 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 80115BBC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80115BC0 40 81 00 44 */ ble lbl_80115C04 -/* 80115BC4 38 00 00 00 */ li r0, 0 -/* 80115BC8 B0 1F 30 18 */ sth r0, 0x3018(r31) -/* 80115BCC 7F E3 FB 78 */ mr r3, r31 -/* 80115BD0 38 80 00 01 */ li r4, 1 -/* 80115BD4 4B FF C9 95 */ bl setIronBallWaitUpperAnime__9daAlink_cFi -/* 80115BD8 7F E3 FB 78 */ mr r3, r31 -/* 80115BDC 38 80 00 01 */ li r4, 1 -/* 80115BE0 4B FA 44 F1 */ bl checkNextAction__9daAlink_cFi -/* 80115BE4 2C 03 00 00 */ cmpwi r3, 0 -/* 80115BE8 40 82 00 1C */ bne lbl_80115C04 -/* 80115BEC 38 00 00 08 */ li r0, 8 -/* 80115BF0 B0 1F 30 18 */ sth r0, 0x3018(r31) -/* 80115BF4 7F E3 FB 78 */ mr r3, r31 -/* 80115BF8 38 80 00 02 */ li r4, 2 -/* 80115BFC C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 80115C00 4B F9 7B 25 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf -lbl_80115C04: -/* 80115C04 38 60 00 01 */ li r3, 1 -lbl_80115C08: -/* 80115C08 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80115C0C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80115C10 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80115C14 7C 08 03 A6 */ mtlr r0 -/* 80115C18 38 21 00 20 */ addi r1, r1, 0x20 -/* 80115C1C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procIronBallSubjectInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procIronBallSubjectInit__9daAlink_cFv.s deleted file mode 100644 index f911c91015c..00000000000 --- a/asm/d/a/d_a_alink/procIronBallSubjectInit__9daAlink_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_801154E4: -/* 801154E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801154E8 7C 08 02 A6 */ mflr r0 -/* 801154EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801154F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801154F4 7C 7F 1B 78 */ mr r31, r3 -/* 801154F8 38 80 00 D8 */ li r4, 0xd8 -/* 801154FC 4B FA D8 A9 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80115500 2C 03 00 00 */ cmpwi r3, 0 -/* 80115504 40 82 00 0C */ bne lbl_80115510 -/* 80115508 38 60 00 00 */ li r3, 0 -/* 8011550C 48 00 00 44 */ b lbl_80115550 -lbl_80115510: -/* 80115510 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 80115514 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 80115518 7F E3 FB 78 */ mr r3, r31 -/* 8011551C 4B FF FB C9 */ bl checkIronBallAnime__9daAlink_cCFv -/* 80115520 2C 03 00 00 */ cmpwi r3, 0 -/* 80115524 41 82 00 0C */ beq lbl_80115530 -/* 80115528 7F E3 FB 78 */ mr r3, r31 -/* 8011552C 4B FF FC B5 */ bl setIronBallBaseAnime__9daAlink_cFv -lbl_80115530: -/* 80115530 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 80115534 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 80115538 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011553C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80115540 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 80115544 60 00 04 00 */ ori r0, r0, 0x400 -/* 80115548 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 8011554C 38 60 00 01 */ li r3, 1 -lbl_80115550: -/* 80115550 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80115554 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80115558 7C 08 03 A6 */ mtlr r0 -/* 8011555C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80115560 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procIronBallSubject__9daAlink_cFv.s b/asm/d/a/d_a_alink/procIronBallSubject__9daAlink_cFv.s deleted file mode 100644 index c6228feafc9..00000000000 --- a/asm/d/a/d_a_alink/procIronBallSubject__9daAlink_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80115564: -/* 80115564 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80115568 7C 08 02 A6 */ mflr r0 -/* 8011556C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80115570 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80115574 7C 7F 1B 78 */ mr r31, r3 -/* 80115578 4B FF FB 6D */ bl checkIronBallAnime__9daAlink_cCFv -/* 8011557C 2C 03 00 00 */ cmpwi r3, 0 -/* 80115580 41 82 00 10 */ beq lbl_80115590 -/* 80115584 7F E3 FB 78 */ mr r3, r31 -/* 80115588 38 80 00 12 */ li r4, 0x12 -/* 8011558C 4B F9 DC C5 */ bl setDoStatus__9daAlink_cFUc -lbl_80115590: -/* 80115590 7F E3 FB 78 */ mr r3, r31 -/* 80115594 38 80 00 00 */ li r4, 0 -/* 80115598 4B F9 E1 9D */ bl setShapeAngleToAtnActor__9daAlink_cFi -/* 8011559C 7F E3 FB 78 */ mr r3, r31 -/* 801155A0 38 80 00 00 */ li r4, 0 -/* 801155A4 4B FA 4B 2D */ bl checkNextAction__9daAlink_cFi -/* 801155A8 2C 03 00 00 */ cmpwi r3, 0 -/* 801155AC 40 82 00 28 */ bne lbl_801155D4 -/* 801155B0 7F E3 FB 78 */ mr r3, r31 -/* 801155B4 4B F9 D0 51 */ bl itemButton__9daAlink_cFv -/* 801155B8 2C 03 00 00 */ cmpwi r3, 0 -/* 801155BC 41 82 00 18 */ beq lbl_801155D4 -/* 801155C0 A8 1F 30 18 */ lha r0, 0x3018(r31) -/* 801155C4 2C 00 00 02 */ cmpwi r0, 2 -/* 801155C8 40 82 00 0C */ bne lbl_801155D4 -/* 801155CC 7F E3 FB 78 */ mr r3, r31 -/* 801155D0 4B FB 92 D1 */ bl setBodyAngleToCamera__9daAlink_cFv -lbl_801155D4: -/* 801155D4 38 60 00 01 */ li r3, 1 -/* 801155D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801155DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801155E0 7C 08 03 A6 */ mtlr r0 -/* 801155E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801155E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procIronBallThrowInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procIronBallThrowInit__9daAlink_cFv.s deleted file mode 100644 index 3e63641fea1..00000000000 --- a/asm/d/a/d_a_alink/procIronBallThrowInit__9daAlink_cFv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_8011577C: -/* 8011577C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80115780 7C 08 02 A6 */ mflr r0 -/* 80115784 90 01 00 14 */ stw r0, 0x14(r1) -/* 80115788 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011578C 7C 7F 1B 78 */ mr r31, r3 -/* 80115790 38 80 00 DA */ li r4, 0xda -/* 80115794 4B FA C7 D9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80115798 7F E3 FB 78 */ mr r3, r31 -/* 8011579C 38 80 01 62 */ li r4, 0x162 -/* 801157A0 3C A0 80 39 */ lis r5, m__22daAlinkHIO_ironBall_c0@ha /* 0x8038EA70@ha */ -/* 801157A4 38 C5 EA 70 */ addi r6, r5, m__22daAlinkHIO_ironBall_c0@l /* 0x8038EA70@l */ -/* 801157A8 C0 26 00 2C */ lfs f1, 0x2c(r6) -/* 801157AC C0 42 96 50 */ lfs f2, lit_34957(r2) -/* 801157B0 38 A0 00 1E */ li r5, 0x1e -/* 801157B4 C0 66 00 30 */ lfs f3, 0x30(r6) -/* 801157B8 4B F9 78 55 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -/* 801157BC 38 00 00 0C */ li r0, 0xc -/* 801157C0 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 801157C4 3C 60 80 42 */ lis r3, l_ironBallBaseAnime@ha /* 0x8042552C@ha */ -/* 801157C8 C4 03 55 2C */ lfsu f0, l_ironBallBaseAnime@l(r3) /* 0x8042552C@l */ -/* 801157CC D0 1F 35 88 */ stfs f0, 0x3588(r31) -/* 801157D0 C0 03 00 04 */ lfs f0, 4(r3) -/* 801157D4 D0 1F 35 8C */ stfs f0, 0x358c(r31) -/* 801157D8 C0 03 00 08 */ lfs f0, 8(r3) -/* 801157DC D0 1F 35 90 */ stfs f0, 0x3590(r31) -/* 801157E0 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 801157E4 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 801157E8 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 801157EC B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 801157F0 38 60 00 00 */ li r3, 0 -/* 801157F4 B0 7F 30 0C */ sth r3, 0x300c(r31) -/* 801157F8 38 00 00 03 */ li r0, 3 -/* 801157FC B0 1F 30 18 */ sth r0, 0x3018(r31) -/* 80115800 B0 7F 30 24 */ sth r3, 0x3024(r31) -/* 80115804 B0 7F 30 26 */ sth r3, 0x3026(r31) -/* 80115808 7F E3 FB 78 */ mr r3, r31 -/* 8011580C 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010028@ha */ -/* 80115810 38 84 00 28 */ addi r4, r4, 0x0028 /* 0x00010028@l */ -/* 80115814 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 80115818 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 8011581C 7D 89 03 A6 */ mtctr r12 -/* 80115820 4E 80 04 21 */ bctrl -/* 80115824 7F E3 FB 78 */ mr r3, r31 -/* 80115828 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020032@ha */ -/* 8011582C 38 84 00 32 */ addi r4, r4, 0x0032 /* 0x00020032@l */ -/* 80115830 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 80115834 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 80115838 7D 89 03 A6 */ mtctr r12 -/* 8011583C 4E 80 04 21 */ bctrl -/* 80115840 38 00 00 03 */ li r0, 3 -/* 80115844 98 1F 0F CC */ stb r0, 0xfcc(r31) -/* 80115848 38 60 00 01 */ li r3, 1 -/* 8011584C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80115850 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80115854 7C 08 03 A6 */ mtlr r0 -/* 80115858 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011585C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procKandelaarPourInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procKandelaarPourInit__9daAlink_cFv.s deleted file mode 100644 index 94018b56027..00000000000 --- a/asm/d/a/d_a_alink/procKandelaarPourInit__9daAlink_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8011167C: -/* 8011167C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80111680 7C 08 02 A6 */ mflr r0 -/* 80111684 90 01 00 14 */ stw r0, 0x14(r1) -/* 80111688 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011168C 7C 7F 1B 78 */ mr r31, r3 -/* 80111690 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80111694 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80111698 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 8011169C 7F E4 FB 78 */ mr r4, r31 -/* 801116A0 38 A0 00 00 */ li r5, 0 -/* 801116A4 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FBFF@ha */ -/* 801116A8 38 C6 FB FF */ addi r6, r6, 0xFBFF /* 0x0000FBFF@l */ -/* 801116AC 4B F3 1A C1 */ bl compulsory__14dEvt_control_cFPvPCcUs -/* 801116B0 2C 03 00 00 */ cmpwi r3, 0 -/* 801116B4 40 82 00 0C */ bne lbl_801116C0 -/* 801116B8 38 60 00 00 */ li r3, 0 -/* 801116BC 48 00 00 54 */ b lbl_80111710 -lbl_801116C0: -/* 801116C0 38 00 00 05 */ li r0, 5 -/* 801116C4 B0 1F 06 04 */ sth r0, 0x604(r31) -/* 801116C8 7F E3 FB 78 */ mr r3, r31 -/* 801116CC 38 80 00 B8 */ li r4, 0xb8 -/* 801116D0 4B FB 08 9D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 801116D4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 801116D8 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 801116DC C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 801116E0 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 801116E4 38 00 00 04 */ li r0, 4 -/* 801116E8 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 801116EC 7F E3 FB 78 */ mr r3, r31 -/* 801116F0 38 80 01 0C */ li r4, 0x10c -/* 801116F4 3C A0 80 39 */ lis r5, m__23daAlinkHIO_kandelaar_c0@ha /* 0x8038E77C@ha */ -/* 801116F8 38 A5 E7 7C */ addi r5, r5, m__23daAlinkHIO_kandelaar_c0@l /* 0x8038E77C@l */ -/* 801116FC 38 A5 00 14 */ addi r5, r5, 0x14 -/* 80111700 4B F9 B9 F5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 80111704 7F E3 FB 78 */ mr r3, r31 -/* 80111708 4B FF F8 D9 */ bl commonKandelaarPourInit__9daAlink_cFv -/* 8011170C 38 60 00 01 */ li r3, 1 -lbl_80111710: -/* 80111710 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80111714 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80111718 7C 08 03 A6 */ mtlr r0 -/* 8011171C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80111720 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procKandelaarPour__9daAlink_cFv.s b/asm/d/a/d_a_alink/procKandelaarPour__9daAlink_cFv.s deleted file mode 100644 index 93a7b1c4566..00000000000 --- a/asm/d/a/d_a_alink/procKandelaarPour__9daAlink_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80111724: -/* 80111724 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80111728 7C 08 02 A6 */ mflr r0 -/* 8011172C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80111730 38 80 00 00 */ li r4, 0 -/* 80111734 4B FF F9 85 */ bl commonKandelaarPour__9daAlink_cFi -/* 80111738 38 60 00 01 */ li r3, 1 -/* 8011173C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80111740 7C 08 03 A6 */ mtlr r0 -/* 80111744 38 21 00 10 */ addi r1, r1, 0x10 -/* 80111748 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procKandelaarSwing__9daAlink_cFv.s b/asm/d/a/d_a_alink/procKandelaarSwing__9daAlink_cFv.s deleted file mode 100644 index c6482a5a72d..00000000000 --- a/asm/d/a/d_a_alink/procKandelaarSwing__9daAlink_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_801115CC: -/* 801115CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801115D0 7C 08 02 A6 */ mflr r0 -/* 801115D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801115D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801115DC 93 C1 00 08 */ stw r30, 8(r1) -/* 801115E0 7C 7E 1B 78 */ mr r30, r3 -/* 801115E4 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 801115E8 7F E3 FB 78 */ mr r3, r31 -/* 801115EC 48 04 CE E1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 801115F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801115F4 41 82 00 38 */ beq lbl_8011162C -/* 801115F8 80 1E 06 14 */ lwz r0, 0x614(r30) -/* 801115FC 28 00 00 27 */ cmplwi r0, 0x27 -/* 80111600 40 82 00 1C */ bne lbl_8011161C -/* 80111604 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80111608 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011160C 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80111610 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 80111614 4B F3 6B 69 */ bl cutEnd__16dEvent_manager_cFi -/* 80111618 48 00 00 48 */ b lbl_80111660 -lbl_8011161C: -/* 8011161C 7F C3 F3 78 */ mr r3, r30 -/* 80111620 38 80 00 00 */ li r4, 0 -/* 80111624 4B FA 8A AD */ bl checkNextAction__9daAlink_cFi -/* 80111628 48 00 00 38 */ b lbl_80111660 -lbl_8011162C: -/* 8011162C C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 80111630 C0 1E 34 78 */ lfs f0, 0x3478(r30) -/* 80111634 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80111638 40 81 00 28 */ ble lbl_80111660 -/* 8011163C 80 1E 06 14 */ lwz r0, 0x614(r30) -/* 80111640 28 00 00 27 */ cmplwi r0, 0x27 -/* 80111644 41 82 00 1C */ beq lbl_80111660 -/* 80111648 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 8011164C 60 00 00 04 */ ori r0, r0, 4 -/* 80111650 90 1E 31 A0 */ stw r0, 0x31a0(r30) -/* 80111654 7F C3 F3 78 */ mr r3, r30 -/* 80111658 38 80 00 01 */ li r4, 1 -/* 8011165C 4B FA 8A 75 */ bl checkNextAction__9daAlink_cFi -lbl_80111660: -/* 80111660 38 60 00 01 */ li r3, 1 -/* 80111664 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80111668 83 C1 00 08 */ lwz r30, 8(r1) -/* 8011166C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80111670 7C 08 03 A6 */ mtlr r0 -/* 80111674 38 21 00 10 */ addi r1, r1, 0x10 -/* 80111678 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procLandDamage__9daAlink_cFv.s b/asm/d/a/d_a_alink/procLandDamage__9daAlink_cFv.s deleted file mode 100644 index 4081e0dd467..00000000000 --- a/asm/d/a/d_a_alink/procLandDamage__9daAlink_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_800DB060: -/* 800DB060 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DB064 7C 08 02 A6 */ mflr r0 -/* 800DB068 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DB06C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DB070 93 C1 00 08 */ stw r30, 8(r1) -/* 800DB074 7C 7E 1B 78 */ mr r30, r3 -/* 800DB078 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800DB07C 80 03 31 98 */ lwz r0, 0x3198(r3) -/* 800DB080 2C 00 00 00 */ cmpwi r0, 0 -/* 800DB084 41 82 00 58 */ beq lbl_800DB0DC -/* 800DB088 7F E3 FB 78 */ mr r3, r31 -/* 800DB08C 48 08 34 41 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800DB090 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800DB094 41 82 00 14 */ beq lbl_800DB0A8 -/* 800DB098 7F C3 F3 78 */ mr r3, r30 -/* 800DB09C 38 80 00 00 */ li r4, 0 -/* 800DB0A0 4B FD F0 31 */ bl checkNextAction__9daAlink_cFi -/* 800DB0A4 48 00 00 80 */ b lbl_800DB124 -lbl_800DB0A8: -/* 800DB0A8 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800DB0AC 3C 60 80 39 */ lis r3, m__21daAlinkHIO_damFall_c0@ha /* 0x8038E454@ha */ -/* 800DB0B0 38 63 E4 54 */ addi r3, r3, m__21daAlinkHIO_damFall_c0@l /* 0x8038E454@l */ -/* 800DB0B4 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 800DB0B8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800DB0BC 40 81 00 68 */ ble lbl_800DB124 -/* 800DB0C0 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 800DB0C4 60 00 00 04 */ ori r0, r0, 4 -/* 800DB0C8 90 1E 31 A0 */ stw r0, 0x31a0(r30) -/* 800DB0CC 7F C3 F3 78 */ mr r3, r30 -/* 800DB0D0 38 80 00 01 */ li r4, 1 -/* 800DB0D4 4B FD EF FD */ bl checkNextAction__9daAlink_cFi -/* 800DB0D8 48 00 00 4C */ b lbl_800DB124 -lbl_800DB0DC: -/* 800DB0DC 7F E3 FB 78 */ mr r3, r31 -/* 800DB0E0 48 08 33 ED */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800DB0E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800DB0E8 41 82 00 3C */ beq lbl_800DB124 -/* 800DB0EC A8 7E 30 08 */ lha r3, 0x3008(r30) -/* 800DB0F0 2C 03 00 00 */ cmpwi r3, 0 -/* 800DB0F4 40 81 00 10 */ ble lbl_800DB104 -/* 800DB0F8 38 03 FF FF */ addi r0, r3, -1 -/* 800DB0FC B0 1E 30 08 */ sth r0, 0x3008(r30) -/* 800DB100 48 00 00 24 */ b lbl_800DB124 -lbl_800DB104: -/* 800DB104 7F C3 F3 78 */ mr r3, r30 -/* 800DB108 38 80 00 8D */ li r4, 0x8d -/* 800DB10C 3C A0 80 39 */ lis r5, m__21daAlinkHIO_damFall_c0@ha /* 0x8038E454@ha */ -/* 800DB110 38 A5 E4 54 */ addi r5, r5, m__21daAlinkHIO_damFall_c0@l /* 0x8038E454@l */ -/* 800DB114 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800DB118 4B FD 1F DD */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800DB11C 38 00 00 01 */ li r0, 1 -/* 800DB120 90 1E 31 98 */ stw r0, 0x3198(r30) -lbl_800DB124: -/* 800DB124 38 60 00 01 */ li r3, 1 -/* 800DB128 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DB12C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800DB130 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DB134 7C 08 03 A6 */ mtlr r0 -/* 800DB138 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DB13C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procLandInit__9daAlink_cFf.s b/asm/d/a/d_a_alink/procLandInit__9daAlink_cFf.s deleted file mode 100644 index 57db77260d1..00000000000 --- a/asm/d/a/d_a_alink/procLandInit__9daAlink_cFf.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_800C6F18: -/* 800C6F18 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800C6F1C 7C 08 02 A6 */ mflr r0 -/* 800C6F20 90 01 00 24 */ stw r0, 0x24(r1) -/* 800C6F24 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 800C6F28 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 800C6F2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C6F30 7C 7F 1B 78 */ mr r31, r3 -/* 800C6F34 FF E0 08 90 */ fmr f31, f1 -/* 800C6F38 38 80 00 19 */ li r4, 0x19 -/* 800C6F3C 4B FF B0 31 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C6F40 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C6F44 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800C6F48 7F E3 FB 78 */ mr r3, r31 -/* 800C6F4C 38 80 00 33 */ li r4, 0x33 -/* 800C6F50 3C A0 80 39 */ lis r5, m__22daAlinkHIO_autoJump_c0@ha /* 0x8038E068@ha */ -/* 800C6F54 38 A5 E0 68 */ addi r5, r5, m__22daAlinkHIO_autoJump_c0@l /* 0x8038E068@l */ -/* 800C6F58 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800C6F5C 4B FE 61 99 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800C6F60 7F E3 FB 78 */ mr r3, r31 -/* 800C6F64 48 01 CF BD */ bl checkGrabRooster__9daAlink_cFv -/* 800C6F68 2C 03 00 00 */ cmpwi r3, 0 -/* 800C6F6C 41 82 00 10 */ beq lbl_800C6F7C -/* 800C6F70 C0 02 92 98 */ lfs f0, lit_5943(r2) -/* 800C6F74 D0 1F 1F DC */ stfs f0, 0x1fdc(r31) -/* 800C6F78 48 00 00 20 */ b lbl_800C6F98 -lbl_800C6F7C: -/* 800C6F7C 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800C6F80 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 800C6F84 41 82 00 14 */ beq lbl_800C6F98 -/* 800C6F88 C0 22 95 F0 */ lfs f1, lit_28286(r2) -/* 800C6F8C C0 1F 1F DC */ lfs f0, 0x1fdc(r31) -/* 800C6F90 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800C6F94 D0 1F 1F DC */ stfs f0, 0x1fdc(r31) -lbl_800C6F98: -/* 800C6F98 38 00 00 04 */ li r0, 4 -/* 800C6F9C 98 1F 2F 9D */ stb r0, 0x2f9d(r31) -/* 800C6FA0 7F E3 FB 78 */ mr r3, r31 -/* 800C6FA4 38 80 00 04 */ li r4, 4 -/* 800C6FA8 48 05 A2 19 */ bl setFootEffectProcType__9daAlink_cFi -/* 800C6FAC 80 1F 05 84 */ lwz r0, 0x584(r31) -/* 800C6FB0 60 00 00 30 */ ori r0, r0, 0x30 -/* 800C6FB4 90 1F 05 84 */ stw r0, 0x584(r31) -/* 800C6FB8 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800C6FBC B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800C6FC0 D3 FF 34 78 */ stfs f31, 0x3478(r31) -/* 800C6FC4 38 60 00 01 */ li r3, 1 -/* 800C6FC8 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 800C6FCC CB E1 00 10 */ lfd f31, 0x10(r1) -/* 800C6FD0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C6FD4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800C6FD8 7C 08 03 A6 */ mtlr r0 -/* 800C6FDC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800C6FE0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procLand__9daAlink_cFv.s b/asm/d/a/d_a_alink/procLand__9daAlink_cFv.s deleted file mode 100644 index 3d44e284031..00000000000 --- a/asm/d/a/d_a_alink/procLand__9daAlink_cFv.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_800C6FE4: -/* 800C6FE4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800C6FE8 7C 08 02 A6 */ mflr r0 -/* 800C6FEC 90 01 00 24 */ stw r0, 0x24(r1) -/* 800C6FF0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 800C6FF4 93 C1 00 18 */ stw r30, 0x18(r1) -/* 800C6FF8 7C 7E 1B 78 */ mr r30, r3 -/* 800C6FFC 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800C7000 7F E3 FB 78 */ mr r3, r31 -/* 800C7004 48 09 74 C9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800C7008 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C700C 41 82 00 14 */ beq lbl_800C7020 -/* 800C7010 7F C3 F3 78 */ mr r3, r30 -/* 800C7014 38 80 00 00 */ li r4, 0 -/* 800C7018 4B FF 30 B9 */ bl checkNextAction__9daAlink_cFi -/* 800C701C 48 00 00 C0 */ b lbl_800C70DC -lbl_800C7020: -/* 800C7020 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800C7024 3C 60 80 39 */ lis r3, m__22daAlinkHIO_autoJump_c0@ha /* 0x8038E068@ha */ -/* 800C7028 38 63 E0 68 */ addi r3, r3, m__22daAlinkHIO_autoJump_c0@l /* 0x8038E068@l */ -/* 800C702C C0 03 00 24 */ lfs f0, 0x24(r3) -/* 800C7030 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800C7034 40 81 00 14 */ ble lbl_800C7048 -/* 800C7038 7F C3 F3 78 */ mr r3, r30 -/* 800C703C 38 80 00 01 */ li r4, 1 -/* 800C7040 4B FF 30 91 */ bl checkNextAction__9daAlink_cFi -/* 800C7044 48 00 00 98 */ b lbl_800C70DC -lbl_800C7048: -/* 800C7048 7F E3 FB 78 */ mr r3, r31 -/* 800C704C C0 22 93 24 */ lfs f1, lit_7450(r2) -/* 800C7050 48 26 13 DD */ bl checkPass__12J3DFrameCtrlFf -/* 800C7054 2C 03 00 00 */ cmpwi r3, 0 -/* 800C7058 41 82 00 84 */ beq lbl_800C70DC -/* 800C705C 7F C3 F3 78 */ mr r3, r30 -/* 800C7060 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 800C7064 81 8C 02 80 */ lwz r12, 0x280(r12) -/* 800C7068 7D 89 03 A6 */ mtctr r12 -/* 800C706C 4E 80 04 21 */ bctrl -/* 800C7070 2C 03 00 00 */ cmpwi r3, 0 -/* 800C7074 41 82 00 0C */ beq lbl_800C7080 -/* 800C7078 38 80 00 03 */ li r4, 3 -/* 800C707C 48 00 00 34 */ b lbl_800C70B0 -lbl_800C7080: -/* 800C7080 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800C7084 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 800C7088 40 82 00 1C */ bne lbl_800C70A4 -/* 800C708C C0 3E 34 78 */ lfs f1, 0x3478(r30) -/* 800C7090 3C 60 80 39 */ lis r3, m__21daAlinkHIO_damFall_c0@ha /* 0x8038E454@ha */ -/* 800C7094 38 63 E4 54 */ addi r3, r3, m__21daAlinkHIO_damFall_c0@l /* 0x8038E454@l */ -/* 800C7098 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 800C709C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800C70A0 40 80 00 0C */ bge lbl_800C70AC -lbl_800C70A4: -/* 800C70A4 38 80 00 01 */ li r4, 1 -/* 800C70A8 48 00 00 08 */ b lbl_800C70B0 -lbl_800C70AC: -/* 800C70AC 38 80 00 02 */ li r4, 2 -lbl_800C70B0: -/* 800C70B0 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800C70B4 D0 21 00 08 */ stfs f1, 8(r1) -/* 800C70B8 C0 02 92 B8 */ lfs f0, lit_6040(r2) -/* 800C70BC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800C70C0 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800C70C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800C70C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800C70CC 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 800C70D0 38 A0 00 0F */ li r5, 0xf -/* 800C70D4 38 C1 00 08 */ addi r6, r1, 8 -/* 800C70D8 4B FA 89 4D */ bl StartShock__12dVibration_cFii4cXyz -lbl_800C70DC: -/* 800C70DC 38 60 00 01 */ li r3, 1 -/* 800C70E0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 800C70E4 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 800C70E8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800C70EC 7C 08 03 A6 */ mtlr r0 -/* 800C70F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800C70F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procOctaIealSpit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procOctaIealSpit__9daAlink_cFv.s deleted file mode 100644 index aece5cbfca6..00000000000 --- a/asm/d/a/d_a_alink/procOctaIealSpit__9daAlink_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80105A00: -/* 80105A00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80105A04 7C 08 02 A6 */ mflr r0 -/* 80105A08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80105A0C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80105A10 7C 7F 1B 78 */ mr r31, r3 -/* 80105A14 80 03 06 14 */ lwz r0, 0x614(r3) -/* 80105A18 28 00 00 2E */ cmplwi r0, 0x2e -/* 80105A1C 40 82 00 14 */ bne lbl_80105A30 -/* 80105A20 38 00 00 02 */ li r0, 2 -/* 80105A24 B0 1F 06 04 */ sth r0, 0x604(r31) -/* 80105A28 38 00 00 01 */ li r0, 1 -/* 80105A2C 90 1F 06 14 */ stw r0, 0x614(r31) -lbl_80105A30: -/* 80105A30 38 7F 33 98 */ addi r3, r31, 0x3398 -/* 80105A34 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 80105A38 C0 42 92 98 */ lfs f2, lit_5943(r2) -/* 80105A3C C0 7F 34 78 */ lfs f3, 0x3478(r31) -/* 80105A40 C0 82 93 A0 */ lfs f4, lit_9054(r2) -/* 80105A44 48 16 9F 39 */ bl cLib_addCalc__FPfffff -/* 80105A48 38 00 00 07 */ li r0, 7 -/* 80105A4C 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 80105A50 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 80105A54 48 05 8A 79 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 80105A58 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80105A5C 41 82 00 10 */ beq lbl_80105A6C -/* 80105A60 7F E3 FB 78 */ mr r3, r31 -/* 80105A64 38 80 00 00 */ li r4, 0 -/* 80105A68 4B FF E8 91 */ bl procSwimWaitInit__9daAlink_cFi -lbl_80105A6C: -/* 80105A6C 38 60 00 01 */ li r3, 1 -/* 80105A70 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80105A74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80105A78 7C 08 03 A6 */ mtlr r0 -/* 80105A7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80105A80 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c.s b/asm/d/a/d_a_alink/procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c.s deleted file mode 100644 index c4d40552bb3..00000000000 --- a/asm/d/a/d_a_alink/procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_800C2DDC: -/* 800C2DDC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800C2DE0 7C 08 02 A6 */ mflr r0 -/* 800C2DE4 90 01 00 24 */ stw r0, 0x24(r1) -/* 800C2DE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C2DEC 48 29 F3 F1 */ bl _savegpr_29 -/* 800C2DF0 7C 7D 1B 78 */ mr r29, r3 -/* 800C2DF4 7C 9E 23 78 */ mr r30, r4 -/* 800C2DF8 7C BF 2B 78 */ mr r31, r5 -/* 800C2DFC 38 80 00 00 */ li r4, 0 -/* 800C2E00 4B FF F1 6D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C2E04 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C2E08 D0 1D 33 98 */ stfs f0, 0x3398(r29) -/* 800C2E0C 7F A3 EB 78 */ mr r3, r29 -/* 800C2E10 3C 80 80 39 */ lis r4, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 800C2E14 38 84 D6 64 */ addi r4, r4, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 800C2E18 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800C2E1C 4B FE AF F9 */ bl setBlendMoveAnime__9daAlink_cFf -/* 800C2E20 7F A3 EB 78 */ mr r3, r29 -/* 800C2E24 38 80 00 00 */ li r4, 0 -/* 800C2E28 4B FF 6A 15 */ bl allUnequip__9daAlink_cFi -/* 800C2E2C 38 00 00 00 */ li r0, 0 -/* 800C2E30 B0 1D 30 10 */ sth r0, 0x3010(r29) -/* 800C2E34 28 1F 00 00 */ cmplwi r31, 0 -/* 800C2E38 41 82 00 50 */ beq lbl_800C2E88 -/* 800C2E3C 38 7D 28 0C */ addi r3, r29, 0x280c -/* 800C2E40 7F E4 FB 78 */ mr r4, r31 -/* 800C2E44 48 09 BE 75 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -/* 800C2E48 38 60 00 01 */ li r3, 1 -/* 800C2E4C B0 7D 30 0E */ sth r3, 0x300e(r29) -/* 800C2E50 A8 1F 00 08 */ lha r0, 8(r31) -/* 800C2E54 2C 00 02 CB */ cmpwi r0, 0x2cb -/* 800C2E58 40 82 00 34 */ bne lbl_800C2E8C -/* 800C2E5C A0 1D 2F DC */ lhz r0, 0x2fdc(r29) -/* 800C2E60 28 00 00 48 */ cmplwi r0, 0x48 -/* 800C2E64 40 82 00 0C */ bne lbl_800C2E70 -/* 800C2E68 B0 7D 30 10 */ sth r3, 0x3010(r29) -/* 800C2E6C 48 00 00 20 */ b lbl_800C2E8C -lbl_800C2E70: -/* 800C2E70 80 1D 05 78 */ lwz r0, 0x578(r29) -/* 800C2E74 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 800C2E78 41 82 00 14 */ beq lbl_800C2E8C -/* 800C2E7C 7F A3 EB 78 */ mr r3, r29 -/* 800C2E80 48 04 D9 C1 */ bl offKandelaarModel__9daAlink_cFv -/* 800C2E84 48 00 00 08 */ b lbl_800C2E8C -lbl_800C2E88: -/* 800C2E88 B0 1D 30 0E */ sth r0, 0x300e(r29) -lbl_800C2E8C: -/* 800C2E8C 93 DD 31 98 */ stw r30, 0x3198(r29) -/* 800C2E90 38 60 00 01 */ li r3, 1 -/* 800C2E94 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C2E98 48 29 F3 91 */ bl _restgpr_29 -/* 800C2E9C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800C2EA0 7C 08 03 A6 */ mtlr r0 -/* 800C2EA4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800C2EA8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procPreActionUnequip__9daAlink_cFv.s b/asm/d/a/d_a_alink/procPreActionUnequip__9daAlink_cFv.s deleted file mode 100644 index 1a8531d95e7..00000000000 --- a/asm/d/a/d_a_alink/procPreActionUnequip__9daAlink_cFv.s +++ /dev/null @@ -1,145 +0,0 @@ -lbl_800C2EAC: -/* 800C2EAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C2EB0 7C 08 02 A6 */ mflr r0 -/* 800C2EB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C2EB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C2EBC 7C 7F 1B 78 */ mr r31, r3 -/* 800C2EC0 4B FF 63 95 */ bl checkNoUpperAnime__9daAlink_cCFv -/* 800C2EC4 2C 03 00 00 */ cmpwi r3, 0 -/* 800C2EC8 41 82 01 AC */ beq lbl_800C3074 -/* 800C2ECC A8 1F 30 0E */ lha r0, 0x300e(r31) -/* 800C2ED0 2C 00 00 00 */ cmpwi r0, 0 -/* 800C2ED4 41 82 00 28 */ beq lbl_800C2EFC -/* 800C2ED8 80 7F 27 F4 */ lwz r3, 0x27f4(r31) -/* 800C2EDC 28 03 00 00 */ cmplwi r3, 0 -/* 800C2EE0 41 82 00 10 */ beq lbl_800C2EF0 -/* 800C2EE4 80 1F 28 10 */ lwz r0, 0x2810(r31) -/* 800C2EE8 7C 03 00 40 */ cmplw r3, r0 -/* 800C2EEC 41 82 00 10 */ beq lbl_800C2EFC -lbl_800C2EF0: -/* 800C2EF0 7F E3 FB 78 */ mr r3, r31 -/* 800C2EF4 4B FF 29 F9 */ bl checkWaitAction__9daAlink_cFv -/* 800C2EF8 48 00 01 88 */ b lbl_800C3080 -lbl_800C2EFC: -/* 800C2EFC 80 1F 31 98 */ lwz r0, 0x3198(r31) -/* 800C2F00 2C 00 01 43 */ cmpwi r0, 0x143 -/* 800C2F04 40 82 00 14 */ bne lbl_800C2F18 -/* 800C2F08 7F E3 FB 78 */ mr r3, r31 -/* 800C2F0C 38 80 00 01 */ li r4, 1 -/* 800C2F10 48 02 55 19 */ bl procCoPushPullWaitInit__9daAlink_cFi -/* 800C2F14 48 00 01 6C */ b lbl_800C3080 -lbl_800C2F18: -/* 800C2F18 2C 00 00 69 */ cmpwi r0, 0x69 -/* 800C2F1C 40 82 00 10 */ bne lbl_800C2F2C -/* 800C2F20 7F E3 FB 78 */ mr r3, r31 -/* 800C2F24 48 03 AA A9 */ bl procLadderDownStartInit__9daAlink_cFv -/* 800C2F28 48 00 01 58 */ b lbl_800C3080 -lbl_800C2F2C: -/* 800C2F2C 2C 00 00 67 */ cmpwi r0, 0x67 -/* 800C2F30 40 82 00 10 */ bne lbl_800C2F40 -/* 800C2F34 7F E3 FB 78 */ mr r3, r31 -/* 800C2F38 48 03 A7 11 */ bl procLadderUpStartInit__9daAlink_cFv -/* 800C2F3C 48 00 01 44 */ b lbl_800C3080 -lbl_800C2F40: -/* 800C2F40 2C 00 00 6C */ cmpwi r0, 0x6c -/* 800C2F44 40 82 00 10 */ bne lbl_800C2F54 -/* 800C2F48 7F E3 FB 78 */ mr r3, r31 -/* 800C2F4C 48 02 2D 71 */ bl procGrabReadyInit__9daAlink_cFv -/* 800C2F50 48 00 01 30 */ b lbl_800C3080 -lbl_800C2F54: -/* 800C2F54 2C 00 01 48 */ cmpwi r0, 0x148 -/* 800C2F58 40 82 00 10 */ bne lbl_800C2F68 -/* 800C2F5C 7F E3 FB 78 */ mr r3, r31 -/* 800C2F60 48 05 78 39 */ bl procCoGetItemInit__9daAlink_cFv -/* 800C2F64 48 00 01 1C */ b lbl_800C3080 -lbl_800C2F68: -/* 800C2F68 2C 00 01 57 */ cmpwi r0, 0x157 -/* 800C2F6C 40 82 00 10 */ bne lbl_800C2F7C -/* 800C2F70 7F E3 FB 78 */ mr r3, r31 -/* 800C2F74 48 05 A5 D1 */ bl procCoGetReadySitInit__9daAlink_cFv -/* 800C2F78 48 00 01 08 */ b lbl_800C3080 -lbl_800C2F7C: -/* 800C2F7C 2C 00 00 AE */ cmpwi r0, 0xae -/* 800C2F80 40 82 00 10 */ bne lbl_800C2F90 -/* 800C2F84 7F E3 FB 78 */ mr r3, r31 -/* 800C2F88 48 02 4C A9 */ bl procFmChainUpInit__9daAlink_cFv -/* 800C2F8C 48 00 00 F4 */ b lbl_800C3080 -lbl_800C2F90: -/* 800C2F90 2C 00 00 75 */ cmpwi r0, 0x75 -/* 800C2F94 40 82 00 10 */ bne lbl_800C2FA4 -/* 800C2F98 7F E3 FB 78 */ mr r3, r31 -/* 800C2F9C 48 02 42 B9 */ bl procPickUpInit__9daAlink_cFv -/* 800C2FA0 48 00 00 E0 */ b lbl_800C3080 -lbl_800C2FA4: -/* 800C2FA4 2C 00 00 35 */ cmpwi r0, 0x35 -/* 800C2FA8 40 82 00 10 */ bne lbl_800C2FB8 -/* 800C2FAC 7F E3 FB 78 */ mr r3, r31 -/* 800C2FB0 48 03 62 61 */ bl procCrawlStartInit__9daAlink_cFv -/* 800C2FB4 48 00 00 CC */ b lbl_800C3080 -lbl_800C2FB8: -/* 800C2FB8 2C 00 00 B9 */ cmpwi r0, 0xb9 -/* 800C2FBC 40 82 00 10 */ bne lbl_800C2FCC -/* 800C2FC0 7F E3 FB 78 */ mr r3, r31 -/* 800C2FC4 48 04 E8 D1 */ bl procGrassWhistleGetInit__9daAlink_cFv -/* 800C2FC8 48 00 00 B8 */ b lbl_800C3080 -lbl_800C2FCC: -/* 800C2FCC 2C 00 00 C1 */ cmpwi r0, 0xc1 -/* 800C2FD0 40 82 00 10 */ bne lbl_800C2FE0 -/* 800C2FD4 7F E3 FB 78 */ mr r3, r31 -/* 800C2FD8 48 02 72 D1 */ bl procGoatStrokeInit__9daAlink_cFv -/* 800C2FDC 48 00 00 A4 */ b lbl_800C3080 -lbl_800C2FE0: -/* 800C2FE0 2C 00 00 5C */ cmpwi r0, 0x5c -/* 800C2FE4 40 82 00 10 */ bne lbl_800C2FF4 -/* 800C2FE8 7F E3 FB 78 */ mr r3, r31 -/* 800C2FEC 48 03 91 8D */ bl procHangReadyInit__9daAlink_cFv -/* 800C2FF0 48 00 00 90 */ b lbl_800C3080 -lbl_800C2FF4: -/* 800C2FF4 2C 00 00 74 */ cmpwi r0, 0x74 -/* 800C2FF8 40 82 00 10 */ bne lbl_800C3008 -/* 800C2FFC 7F E3 FB 78 */ mr r3, r31 -/* 800C3000 48 02 40 FD */ bl procInsectCatchInit__9daAlink_cFv -/* 800C3004 48 00 00 7C */ b lbl_800C3080 -lbl_800C3008: -/* 800C3008 2C 00 00 C2 */ cmpwi r0, 0xc2 -/* 800C300C 40 82 00 10 */ bne lbl_800C301C -/* 800C3010 7F E3 FB 78 */ mr r3, r31 -/* 800C3014 48 02 73 E1 */ bl procGoronMoveInit__9daAlink_cFv -/* 800C3018 48 00 00 68 */ b lbl_800C3080 -lbl_800C301C: -/* 800C301C 2C 00 00 B5 */ cmpwi r0, 0xb5 -/* 800C3020 40 82 00 18 */ bne lbl_800C3038 -/* 800C3024 7F E3 FB 78 */ mr r3, r31 -/* 800C3028 38 80 00 00 */ li r4, 0 -/* 800C302C 38 A0 00 00 */ li r5, 0 -/* 800C3030 48 04 CC 09 */ bl procBottleSwingInit__9daAlink_cFP10fopAc_ac_ci -/* 800C3034 48 00 00 4C */ b lbl_800C3080 -lbl_800C3038: -/* 800C3038 2C 00 00 5D */ cmpwi r0, 0x5d -/* 800C303C 40 82 00 10 */ bne lbl_800C304C -/* 800C3040 7F E3 FB 78 */ mr r3, r31 -/* 800C3044 48 03 92 B1 */ bl procHangLeverDownInit__9daAlink_cFv -/* 800C3048 48 00 00 38 */ b lbl_800C3080 -lbl_800C304C: -/* 800C304C 2C 00 00 76 */ cmpwi r0, 0x76 -/* 800C3050 40 82 00 14 */ bne lbl_800C3064 -/* 800C3054 7F E3 FB 78 */ mr r3, r31 -/* 800C3058 38 80 00 01 */ li r4, 1 -/* 800C305C 48 02 45 91 */ bl procPickPutInit__9daAlink_cFi -/* 800C3060 48 00 00 20 */ b lbl_800C3080 -lbl_800C3064: -/* 800C3064 7F E3 FB 78 */ mr r3, r31 -/* 800C3068 38 80 00 00 */ li r4, 0 -/* 800C306C 4B FF 70 65 */ bl checkNextAction__9daAlink_cFi -/* 800C3070 48 00 00 10 */ b lbl_800C3080 -lbl_800C3074: -/* 800C3074 7F E3 FB 78 */ mr r3, r31 -/* 800C3078 C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800C307C 4B FE AD 99 */ bl setBlendMoveAnime__9daAlink_cFf -lbl_800C3080: -/* 800C3080 38 60 00 01 */ li r3, 1 -/* 800C3084 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C3088 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C308C 7C 08 03 A6 */ mtlr r0 -/* 800C3090 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C3094 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procRollJumpInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procRollJumpInit__9daAlink_cFv.s deleted file mode 100644 index 4e92c2acd00..00000000000 --- a/asm/d/a/d_a_alink/procRollJumpInit__9daAlink_cFv.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_800C6850: -/* 800C6850 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C6854 7C 08 02 A6 */ mflr r0 -/* 800C6858 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C685C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C6860 7C 7F 1B 78 */ mr r31, r3 -/* 800C6864 38 80 00 17 */ li r4, 0x17 -/* 800C6868 4B FF B7 05 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C686C 7F E3 FB 78 */ mr r3, r31 -/* 800C6870 38 80 00 EF */ li r4, 0xef -/* 800C6874 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800C6878 3C A0 80 39 */ lis r5, m__22daAlinkHIO_autoJump_c0@ha /* 0x8038E068@ha */ -/* 800C687C 38 A5 E0 68 */ addi r5, r5, m__22daAlinkHIO_autoJump_c0@l /* 0x8038E068@l */ -/* 800C6880 C0 45 00 80 */ lfs f2, 0x80(r5) -/* 800C6884 4B FE 67 5D */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -/* 800C6888 C0 1F 34 10 */ lfs f0, 0x3410(r31) -/* 800C688C D0 1F 34 78 */ stfs f0, 0x3478(r31) -/* 800C6890 C0 1F 34 10 */ lfs f0, 0x3410(r31) -/* 800C6894 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800C6898 C0 1F 34 14 */ lfs f0, 0x3414(r31) -/* 800C689C D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 800C68A0 A8 1F 30 EE */ lha r0, 0x30ee(r31) -/* 800C68A4 B0 1F 2F E6 */ sth r0, 0x2fe6(r31) -/* 800C68A8 A8 1F 30 EE */ lha r0, 0x30ee(r31) -/* 800C68AC B0 1F 04 E6 */ sth r0, 0x4e6(r31) -/* 800C68B0 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800C68B4 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800C68B8 80 1F 19 9C */ lwz r0, 0x199c(r31) -/* 800C68BC 54 00 06 F2 */ rlwinm r0, r0, 0, 0x1b, 0x19 -/* 800C68C0 90 1F 19 9C */ stw r0, 0x199c(r31) -/* 800C68C4 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C68C8 D0 1F 34 7C */ stfs f0, 0x347c(r31) -/* 800C68CC 38 00 00 01 */ li r0, 1 -/* 800C68D0 B0 1F 04 E4 */ sth r0, 0x4e4(r31) -/* 800C68D4 7F E3 FB 78 */ mr r3, r31 -/* 800C68D8 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010025@ha */ -/* 800C68DC 38 84 00 25 */ addi r4, r4, 0x0025 /* 0x00010025@l */ -/* 800C68E0 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800C68E4 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800C68E8 7D 89 03 A6 */ mtctr r12 -/* 800C68EC 4E 80 04 21 */ bctrl -/* 800C68F0 7F E3 FB 78 */ mr r3, r31 -/* 800C68F4 3C 80 00 02 */ lis r4, 0x0002 /* 0x0002005B@ha */ -/* 800C68F8 38 84 00 5B */ addi r4, r4, 0x005B /* 0x0002005B@l */ -/* 800C68FC 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800C6900 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 800C6904 7D 89 03 A6 */ mtctr r12 -/* 800C6908 4E 80 04 21 */ bctrl -/* 800C690C 38 00 00 01 */ li r0, 1 -/* 800C6910 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800C6914 38 60 00 01 */ li r3, 1 -/* 800C6918 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C691C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C6920 7C 08 03 A6 */ mtlr r0 -/* 800C6924 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C6928 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procRollJump__9daAlink_cFv.s b/asm/d/a/d_a_alink/procRollJump__9daAlink_cFv.s deleted file mode 100644 index 63cfd7e26f5..00000000000 --- a/asm/d/a/d_a_alink/procRollJump__9daAlink_cFv.s +++ /dev/null @@ -1,78 +0,0 @@ -lbl_800C692C: -/* 800C692C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C6930 7C 08 02 A6 */ mflr r0 -/* 800C6934 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C6938 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C693C 7C 7F 1B 78 */ mr r31, r3 -/* 800C6940 80 03 19 9C */ lwz r0, 0x199c(r3) -/* 800C6944 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800C6948 41 82 00 10 */ beq lbl_800C6958 -/* 800C694C 38 80 00 00 */ li r4, 0 -/* 800C6950 4B FE F3 7D */ bl checkLandAction__9daAlink_cFi -/* 800C6954 48 00 00 E0 */ b lbl_800C6A34 -lbl_800C6958: -/* 800C6958 C0 3F 04 FC */ lfs f1, 0x4fc(r31) -/* 800C695C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C6960 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800C6964 40 80 00 1C */ bge lbl_800C6980 -/* 800C6968 38 80 00 03 */ li r4, 3 -/* 800C696C 3C A0 80 39 */ lis r5, m__22daAlinkHIO_autoJump_c0@ha /* 0x8038E068@ha */ -/* 800C6970 38 A5 E0 68 */ addi r5, r5, m__22daAlinkHIO_autoJump_c0@l /* 0x8038E068@l */ -/* 800C6974 C0 25 00 84 */ lfs f1, 0x84(r5) -/* 800C6978 48 00 00 D1 */ bl procFallInit__9daAlink_cFif -/* 800C697C 48 00 00 B4 */ b lbl_800C6A30 -lbl_800C6980: -/* 800C6980 A8 BF 04 E4 */ lha r5, 0x4e4(r31) -/* 800C6984 3C 80 80 39 */ lis r4, m__22daAlinkHIO_autoJump_c0@ha /* 0x8038E068@ha */ -/* 800C6988 38 84 E0 68 */ addi r4, r4, m__22daAlinkHIO_autoJump_c0@l /* 0x8038E068@l */ -/* 800C698C A8 04 00 54 */ lha r0, 0x54(r4) -/* 800C6990 7C 05 02 14 */ add r0, r5, r0 -/* 800C6994 B0 1F 04 E4 */ sth r0, 0x4e4(r31) -/* 800C6998 A8 1F 04 E4 */ lha r0, 0x4e4(r31) -/* 800C699C 7C 00 29 D7 */ mullw. r0, r0, r5 -/* 800C69A0 41 81 00 3C */ bgt lbl_800C69DC -/* 800C69A4 A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 800C69A8 2C 00 00 00 */ cmpwi r0, 0 -/* 800C69AC 41 82 00 28 */ beq lbl_800C69D4 -/* 800C69B0 3C 80 00 02 */ lis r4, 0x0002 /* 0x0002005C@ha */ -/* 800C69B4 38 84 00 5C */ addi r4, r4, 0x005C /* 0x0002005C@l */ -/* 800C69B8 81 83 06 28 */ lwz r12, 0x628(r3) -/* 800C69BC 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 800C69C0 7D 89 03 A6 */ mtctr r12 -/* 800C69C4 4E 80 04 21 */ bctrl -/* 800C69C8 38 00 00 00 */ li r0, 0 -/* 800C69CC B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800C69D0 48 00 00 0C */ b lbl_800C69DC -lbl_800C69D4: -/* 800C69D4 38 00 00 01 */ li r0, 1 -/* 800C69D8 B0 1F 30 0C */ sth r0, 0x300c(r31) -lbl_800C69DC: -/* 800C69DC 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 800C69E0 38 83 9A 20 */ addi r4, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 800C69E4 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 800C69E8 A8 1F 2F E2 */ lha r0, 0x2fe2(r31) -/* 800C69EC 7C 03 00 50 */ subf r0, r3, r0 -/* 800C69F0 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 800C69F4 7C 64 02 14 */ add r3, r4, r0 -/* 800C69F8 C0 43 00 04 */ lfs f2, 4(r3) -/* 800C69FC 38 7F 34 7C */ addi r3, r31, 0x347c -/* 800C6A00 3C 80 80 39 */ lis r4, m__22daAlinkHIO_autoJump_c0@ha /* 0x8038E068@ha */ -/* 800C6A04 38 84 E0 68 */ addi r4, r4, m__22daAlinkHIO_autoJump_c0@l /* 0x8038E068@l */ -/* 800C6A08 C0 24 00 88 */ lfs f1, 0x88(r4) -/* 800C6A0C C0 1F 33 A8 */ lfs f0, 0x33a8(r31) -/* 800C6A10 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 800C6A14 EC 21 00 32 */ fmuls f1, f1, f0 -/* 800C6A18 C0 44 00 8C */ lfs f2, 0x8c(r4) -/* 800C6A1C 48 1A 9D 25 */ bl cLib_chaseF__FPfff -/* 800C6A20 C0 3F 34 78 */ lfs f1, 0x3478(r31) -/* 800C6A24 C0 1F 34 7C */ lfs f0, 0x347c(r31) -/* 800C6A28 EC 01 00 2A */ fadds f0, f1, f0 -/* 800C6A2C D0 1F 33 98 */ stfs f0, 0x3398(r31) -lbl_800C6A30: -/* 800C6A30 38 60 00 01 */ li r3, 1 -lbl_800C6A34: -/* 800C6A34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C6A38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C6A3C 7C 08 03 A6 */ mtlr r0 -/* 800C6A40 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C6A44 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procScreamWaitInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procScreamWaitInit__9daAlink_cFv.s deleted file mode 100644 index 61fa7d7f978..00000000000 --- a/asm/d/a/d_a_alink/procScreamWaitInit__9daAlink_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_800DBD1C: -/* 800DBD1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DBD20 7C 08 02 A6 */ mflr r0 -/* 800DBD24 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DBD28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DBD2C 7C 7F 1B 78 */ mr r31, r3 -/* 800DBD30 38 80 00 DE */ li r4, 0xde -/* 800DBD34 4B FE 62 39 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800DBD38 80 1F 05 8C */ lwz r0, 0x58c(r31) -/* 800DBD3C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 800DBD40 41 82 00 10 */ beq lbl_800DBD50 -/* 800DBD44 7F E3 FB 78 */ mr r3, r31 -/* 800DBD48 4B FF FF 51 */ bl setScreamWaitAnime__9daAlink_cFv -/* 800DBD4C 48 00 00 30 */ b lbl_800DBD7C -lbl_800DBD50: -/* 800DBD50 7F E3 FB 78 */ mr r3, r31 -/* 800DBD54 38 80 00 19 */ li r4, 0x19 -/* 800DBD58 3C A0 80 39 */ lis r5, m__18daAlinkHIO_move_c0@ha /* 0x8038D6BC@ha */ -/* 800DBD5C 38 A5 D6 BC */ addi r5, r5, m__18daAlinkHIO_move_c0@l /* 0x8038D6BC@l */ -/* 800DBD60 C0 25 00 1C */ lfs f1, 0x1c(r5) -/* 800DBD64 3C A0 80 39 */ lis r5, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 800DBD68 38 A5 D6 64 */ addi r5, r5, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 800DBD6C C0 45 00 18 */ lfs f2, 0x18(r5) -/* 800DBD70 4B FD 12 71 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -/* 800DBD74 38 00 00 00 */ li r0, 0 -/* 800DBD78 B0 1F 30 0C */ sth r0, 0x300c(r31) -lbl_800DBD7C: -/* 800DBD7C A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800DBD80 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800DBD84 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800DBD88 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800DBD8C 38 60 00 01 */ li r3, 1 -/* 800DBD90 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DBD94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DBD98 7C 08 03 A6 */ mtlr r0 -/* 800DBD9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DBDA0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procScreamWait__9daAlink_cFv.s b/asm/d/a/d_a_alink/procScreamWait__9daAlink_cFv.s deleted file mode 100644 index ce34f31d1bc..00000000000 --- a/asm/d/a/d_a_alink/procScreamWait__9daAlink_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_800DBDA4: -/* 800DBDA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DBDA8 7C 08 02 A6 */ mflr r0 -/* 800DBDAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DBDB0 80 03 05 88 */ lwz r0, 0x588(r3) -/* 800DBDB4 64 00 08 00 */ oris r0, r0, 0x800 -/* 800DBDB8 90 03 05 88 */ stw r0, 0x588(r3) -/* 800DBDBC 80 83 05 8C */ lwz r4, 0x58c(r3) -/* 800DBDC0 54 80 07 FF */ clrlwi. r0, r4, 0x1f -/* 800DBDC4 40 82 00 10 */ bne lbl_800DBDD4 -/* 800DBDC8 38 80 00 00 */ li r4, 0 -/* 800DBDCC 4B FD E3 05 */ bl checkNextAction__9daAlink_cFi -/* 800DBDD0 48 00 00 1C */ b lbl_800DBDEC -lbl_800DBDD4: -/* 800DBDD4 A8 03 30 0C */ lha r0, 0x300c(r3) -/* 800DBDD8 2C 00 00 00 */ cmpwi r0, 0 -/* 800DBDDC 40 82 00 10 */ bne lbl_800DBDEC -/* 800DBDE0 54 80 07 BD */ rlwinm. r0, r4, 0, 0x1e, 0x1e -/* 800DBDE4 41 82 00 08 */ beq lbl_800DBDEC -/* 800DBDE8 4B FF FE B1 */ bl setScreamWaitAnime__9daAlink_cFv -lbl_800DBDEC: -/* 800DBDEC 38 60 00 01 */ li r3, 1 -/* 800DBDF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DBDF4 7C 08 03 A6 */ mtlr r0 -/* 800DBDF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DBDFC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSideRollInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procSideRollInit__9daAlink_cFi.s deleted file mode 100644 index dbd4c4569a2..00000000000 --- a/asm/d/a/d_a_alink/procSideRollInit__9daAlink_cFi.s +++ /dev/null @@ -1,95 +0,0 @@ -lbl_800C5328: -/* 800C5328 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800C532C 7C 08 02 A6 */ mflr r0 -/* 800C5330 90 01 00 24 */ stw r0, 0x24(r1) -/* 800C5334 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C5338 48 29 CE A5 */ bl _savegpr_29 -/* 800C533C 7C 7E 1B 78 */ mr r30, r3 -/* 800C5340 7C 9D 23 78 */ mr r29, r4 -/* 800C5344 48 01 7A AD */ bl checkUpperGuardAnime__9daAlink_cCFv -/* 800C5348 7C 7F 1B 78 */ mr r31, r3 -/* 800C534C 7F C3 F3 78 */ mr r3, r30 -/* 800C5350 38 80 00 11 */ li r4, 0x11 -/* 800C5354 4B FF DA 51 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C5358 2C 03 00 00 */ cmpwi r3, 0 -/* 800C535C 40 82 00 0C */ bne lbl_800C5368 -/* 800C5360 38 60 00 00 */ li r3, 0 -/* 800C5364 48 00 01 08 */ b lbl_800C546C -lbl_800C5368: -/* 800C5368 9B BE 2F 98 */ stb r29, 0x2f98(r30) -/* 800C536C 88 1E 2F 98 */ lbz r0, 0x2f98(r30) -/* 800C5370 28 00 00 02 */ cmplwi r0, 2 -/* 800C5374 40 82 00 18 */ bne lbl_800C538C -/* 800C5378 38 80 00 F0 */ li r4, 0xf0 -/* 800C537C A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 800C5380 38 03 40 00 */ addi r0, r3, 0x4000 -/* 800C5384 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800C5388 48 00 00 14 */ b lbl_800C539C -lbl_800C538C: -/* 800C538C 38 80 00 F1 */ li r4, 0xf1 -/* 800C5390 A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 800C5394 38 03 C0 00 */ addi r0, r3, -16384 -/* 800C5398 B0 1E 04 DE */ sth r0, 0x4de(r30) -lbl_800C539C: -/* 800C539C 7F C3 F3 78 */ mr r3, r30 -/* 800C53A0 3C A0 80 39 */ lis r5, m__22daAlinkHIO_turnMove_c0@ha /* 0x8038DF70@ha */ -/* 800C53A4 38 C5 DF 70 */ addi r6, r5, m__22daAlinkHIO_turnMove_c0@l /* 0x8038DF70@l */ -/* 800C53A8 C0 26 00 24 */ lfs f1, 0x24(r6) -/* 800C53AC C0 46 00 08 */ lfs f2, 8(r6) -/* 800C53B0 A8 A6 00 00 */ lha r5, 0(r6) -/* 800C53B4 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 800C53B8 4B FE 7C 55 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -/* 800C53BC 3C 60 80 39 */ lis r3, m__22daAlinkHIO_turnMove_c0@ha /* 0x8038DF70@ha */ -/* 800C53C0 38 63 DF 70 */ addi r3, r3, m__22daAlinkHIO_turnMove_c0@l /* 0x8038DF70@l */ -/* 800C53C4 C0 03 00 28 */ lfs f0, 0x28(r3) -/* 800C53C8 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800C53CC 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800C53D0 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 800C53D4 41 82 00 20 */ beq lbl_800C53F4 -/* 800C53D8 C0 3E 33 98 */ lfs f1, 0x3398(r30) -/* 800C53DC 3C 60 80 39 */ lis r3, m__24daAlinkHIO_magneBoots_c0@ha /* 0x8038E7F4@ha */ -/* 800C53E0 38 63 E7 F4 */ addi r3, r3, m__24daAlinkHIO_magneBoots_c0@l /* 0x8038E7F4@l */ -/* 800C53E4 C0 03 00 3C */ lfs f0, 0x3c(r3) -/* 800C53E8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800C53EC D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800C53F0 48 00 00 2C */ b lbl_800C541C -lbl_800C53F4: -/* 800C53F4 7F C3 F3 78 */ mr r3, r30 -/* 800C53F8 38 80 00 01 */ li r4, 1 -/* 800C53FC 38 A0 00 01 */ li r5, 1 -/* 800C5400 4B FF 60 B9 */ bl checkHeavyStateOn__9daAlink_cFii -/* 800C5404 2C 03 00 00 */ cmpwi r3, 0 -/* 800C5408 41 82 00 14 */ beq lbl_800C541C -/* 800C540C C0 3E 33 98 */ lfs f1, 0x3398(r30) -/* 800C5410 C0 1E 34 34 */ lfs f0, 0x3434(r30) -/* 800C5414 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800C5418 D0 1E 33 98 */ stfs f0, 0x3398(r30) -lbl_800C541C: -/* 800C541C 7F C3 F3 78 */ mr r3, r30 -/* 800C5420 38 80 00 00 */ li r4, 0 -/* 800C5424 48 05 BD 9D */ bl setFootEffectProcType__9daAlink_cFi -/* 800C5428 38 00 00 04 */ li r0, 4 -/* 800C542C 98 1E 2F 9D */ stb r0, 0x2f9d(r30) -/* 800C5430 7F C3 F3 78 */ mr r3, r30 -/* 800C5434 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010096@ha */ -/* 800C5438 38 84 00 96 */ addi r4, r4, 0x0096 /* 0x00010096@l */ -/* 800C543C 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 800C5440 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800C5444 7D 89 03 A6 */ mtctr r12 -/* 800C5448 4E 80 04 21 */ bctrl -/* 800C544C 2C 1F 00 00 */ cmpwi r31, 0 -/* 800C5450 41 82 00 10 */ beq lbl_800C5460 -/* 800C5454 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800C5458 60 00 00 02 */ ori r0, r0, 2 -/* 800C545C 90 1E 05 70 */ stw r0, 0x570(r30) -lbl_800C5460: -/* 800C5460 38 00 00 00 */ li r0, 0 -/* 800C5464 B0 1E 30 0C */ sth r0, 0x300c(r30) -/* 800C5468 38 60 00 01 */ li r3, 1 -lbl_800C546C: -/* 800C546C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C5470 48 29 CD B9 */ bl _restgpr_29 -/* 800C5474 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800C5478 7C 08 03 A6 */ mtlr r0 -/* 800C547C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800C5480 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSlipInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSlipInit__9daAlink_cFv.s deleted file mode 100644 index 3cf57028ac2..00000000000 --- a/asm/d/a/d_a_alink/procSlipInit__9daAlink_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_800C5C28: -/* 800C5C28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C5C2C 7C 08 02 A6 */ mflr r0 -/* 800C5C30 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C5C34 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C5C38 7C 7F 1B 78 */ mr r31, r3 -/* 800C5C3C 38 80 00 14 */ li r4, 0x14 -/* 800C5C40 4B FF C3 2D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C5C44 7F E3 FB 78 */ mr r3, r31 -/* 800C5C48 38 80 00 28 */ li r4, 0x28 -/* 800C5C4C 3C A0 80 39 */ lis r5, m__18daAlinkHIO_move_c0@ha /* 0x8038D6BC@ha */ -/* 800C5C50 38 A5 D6 BC */ addi r5, r5, m__18daAlinkHIO_move_c0@l /* 0x8038D6BC@l */ -/* 800C5C54 4B FE 74 A1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800C5C58 C0 3F 05 2C */ lfs f1, 0x52c(r31) -/* 800C5C5C 3C 60 80 39 */ lis r3, m__18daAlinkHIO_move_c0@ha /* 0x8038D6BC@ha */ -/* 800C5C60 38 63 D6 BC */ addi r3, r3, m__18daAlinkHIO_move_c0@l /* 0x8038D6BC@l */ -/* 800C5C64 C0 03 00 40 */ lfs f0, 0x40(r3) -/* 800C5C68 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800C5C6C D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800C5C70 38 00 00 40 */ li r0, 0x40 -/* 800C5C74 98 1F 2F 9D */ stb r0, 0x2f9d(r31) -/* 800C5C78 7F E3 FB 78 */ mr r3, r31 -/* 800C5C7C 38 80 00 01 */ li r4, 1 -/* 800C5C80 48 05 B5 41 */ bl setFootEffectProcType__9daAlink_cFi -/* 800C5C84 38 00 00 05 */ li r0, 5 -/* 800C5C88 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 800C5C8C 38 60 00 01 */ li r3, 1 -/* 800C5C90 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C5C94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C5C98 7C 08 03 A6 */ mtlr r0 -/* 800C5C9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C5CA0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSpinnerReadyInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSpinnerReadyInit__9daAlink_cFv.s deleted file mode 100644 index 68f73f520b3..00000000000 --- a/asm/d/a/d_a_alink/procSpinnerReadyInit__9daAlink_cFv.s +++ /dev/null @@ -1,93 +0,0 @@ -lbl_8010DC64: -/* 8010DC64 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8010DC68 7C 08 02 A6 */ mflr r0 -/* 8010DC6C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8010DC70 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8010DC74 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8010DC78 7C 7E 1B 78 */ mr r30, r3 -/* 8010DC7C 38 00 00 00 */ li r0, 0 -/* 8010DC80 90 01 00 08 */ stw r0, 8(r1) -/* 8010DC84 38 60 00 F2 */ li r3, 0xf2 -/* 8010DC88 38 80 00 00 */ li r4, 0 -/* 8010DC8C 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 8010DC90 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 8010DC94 7C 06 07 74 */ extsb r6, r0 -/* 8010DC98 38 FE 04 E4 */ addi r7, r30, 0x4e4 -/* 8010DC9C 39 00 00 00 */ li r8, 0 -/* 8010DCA0 39 20 FF FF */ li r9, -1 -/* 8010DCA4 39 40 00 00 */ li r10, 0 -/* 8010DCA8 4B F0 C1 5D */ bl fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv -/* 8010DCAC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8010DCB0 40 82 00 0C */ bne lbl_8010DCBC -/* 8010DCB4 38 60 00 00 */ li r3, 0 -/* 8010DCB8 48 00 00 FC */ b lbl_8010DDB4 -lbl_8010DCBC: -/* 8010DCBC 7F C3 F3 78 */ mr r3, r30 -/* 8010DCC0 38 80 00 A4 */ li r4, 0xa4 -/* 8010DCC4 4B FB 42 A9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8010DCC8 38 7E 28 14 */ addi r3, r30, 0x2814 -/* 8010DCCC 7F E4 FB 78 */ mr r4, r31 -/* 8010DCD0 48 05 0F E9 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -/* 8010DCD4 7F C3 F3 78 */ mr r3, r30 -/* 8010DCD8 38 80 00 D7 */ li r4, 0xd7 -/* 8010DCDC 3C A0 80 39 */ lis r5, m__23daAlinkHIO_smallJump_c0@ha /* 0x8038E11C@ha */ -/* 8010DCE0 38 C5 E1 1C */ addi r6, r5, m__23daAlinkHIO_smallJump_c0@l /* 0x8038E11C@l */ -/* 8010DCE4 C0 26 00 04 */ lfs f1, 4(r6) -/* 8010DCE8 C0 42 93 44 */ lfs f2, lit_7977(r2) -/* 8010DCEC A8 A6 00 00 */ lha r5, 0(r6) -/* 8010DCF0 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 8010DCF4 4B F9 F3 19 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -/* 8010DCF8 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8010DCFC D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 8010DD00 7F C3 F3 78 */ mr r3, r30 -/* 8010DD04 38 80 00 00 */ li r4, 0 -/* 8010DD08 4B FD 48 79 */ bl setHeavyBoots__9daAlink_cFi -/* 8010DD0C C0 02 93 28 */ lfs f0, lit_7451(r2) -/* 8010DD10 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 8010DD14 7F C3 F3 78 */ mr r3, r30 -/* 8010DD18 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010005@ha */ -/* 8010DD1C 38 84 00 05 */ addi r4, r4, 0x0005 /* 0x00010005@l */ -/* 8010DD20 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 8010DD24 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 8010DD28 7D 89 03 A6 */ mtctr r12 -/* 8010DD2C 4E 80 04 21 */ bctrl -/* 8010DD30 7F C3 F3 78 */ mr r3, r30 -/* 8010DD34 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020076@ha */ -/* 8010DD38 38 84 00 76 */ addi r4, r4, 0x0076 /* 0x00020076@l */ -/* 8010DD3C 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 8010DD40 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 8010DD44 7D 89 03 A6 */ mtctr r12 -/* 8010DD48 4E 80 04 21 */ bctrl -/* 8010DD4C 38 00 00 0F */ li r0, 0xf -/* 8010DD50 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 8010DD54 7F C3 F3 78 */ mr r3, r30 -/* 8010DD58 38 80 00 01 */ li r4, 1 -/* 8010DD5C 38 A0 00 01 */ li r5, 1 -/* 8010DD60 4B FB 35 7D */ bl deleteEquipItem__9daAlink_cFii -/* 8010DD64 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 8010DD68 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 8010DD6C 3C 60 80 42 */ lis r3, l_waitBaseAnime@ha /* 0x80425514@ha */ -/* 8010DD70 C4 03 55 14 */ lfsu f0, l_waitBaseAnime@l(r3) /* 0x80425514@l */ -/* 8010DD74 D0 1E 35 88 */ stfs f0, 0x3588(r30) -/* 8010DD78 C0 03 00 04 */ lfs f0, 4(r3) -/* 8010DD7C D0 1E 35 8C */ stfs f0, 0x358c(r30) -/* 8010DD80 C0 03 00 08 */ lfs f0, 8(r3) -/* 8010DD84 D0 1E 35 90 */ stfs f0, 0x3590(r30) -/* 8010DD88 C0 1E 35 8C */ lfs f0, 0x358c(r30) -/* 8010DD8C D0 1E 33 B0 */ stfs f0, 0x33b0(r30) -/* 8010DD90 C0 03 00 00 */ lfs f0, 0(r3) -/* 8010DD94 D0 1E 34 D4 */ stfs f0, 0x34d4(r30) -/* 8010DD98 C0 03 00 04 */ lfs f0, 4(r3) -/* 8010DD9C D0 1E 34 D8 */ stfs f0, 0x34d8(r30) -/* 8010DDA0 C0 03 00 08 */ lfs f0, 8(r3) -/* 8010DDA4 D0 1E 34 DC */ stfs f0, 0x34dc(r30) -/* 8010DDA8 38 00 00 08 */ li r0, 8 -/* 8010DDAC B0 1E 30 0C */ sth r0, 0x300c(r30) -/* 8010DDB0 38 60 00 01 */ li r3, 1 -lbl_8010DDB4: -/* 8010DDB4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8010DDB8 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8010DDBC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8010DDC0 7C 08 03 A6 */ mtlr r0 -/* 8010DDC4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8010DDC8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procStEscapeInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procStEscapeInit__9daAlink_cFv.s deleted file mode 100644 index 3c755c6adb2..00000000000 --- a/asm/d/a/d_a_alink/procStEscapeInit__9daAlink_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_800DB5B0: -/* 800DB5B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DB5B4 7C 08 02 A6 */ mflr r0 -/* 800DB5B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DB5BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DB5C0 7C 7F 1B 78 */ mr r31, r3 -/* 800DB5C4 38 80 00 77 */ li r4, 0x77 -/* 800DB5C8 4B FE 69 A5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800DB5CC 7F E3 FB 78 */ mr r3, r31 -/* 800DB5D0 38 80 00 BA */ li r4, 0xba -/* 800DB5D4 3C A0 80 39 */ lis r5, m__23daAlinkHIO_damCaught_c0@ha /* 0x8038E49C@ha */ -/* 800DB5D8 38 A5 E4 9C */ addi r5, r5, m__23daAlinkHIO_damCaught_c0@l /* 0x8038E49C@l */ -/* 800DB5DC 4B FD 1B 19 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800DB5E0 C0 02 93 74 */ lfs f0, lit_8502(r2) -/* 800DB5E4 D0 1F 1F E0 */ stfs f0, 0x1fe0(r31) -/* 800DB5E8 80 7F 1F 2C */ lwz r3, 0x1f2c(r31) -/* 800DB5EC D0 03 00 08 */ stfs f0, 8(r3) -/* 800DB5F0 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800DB5F4 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800DB5F8 38 60 00 01 */ li r3, 1 -/* 800DB5FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DB600 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DB604 7C 08 03 A6 */ mtlr r0 -/* 800DB608 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DB60C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procStEscape__9daAlink_cFv.s b/asm/d/a/d_a_alink/procStEscape__9daAlink_cFv.s deleted file mode 100644 index af62697c599..00000000000 --- a/asm/d/a/d_a_alink/procStEscape__9daAlink_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_800DB610: -/* 800DB610 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DB614 7C 08 02 A6 */ mflr r0 -/* 800DB618 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DB61C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DB620 93 C1 00 08 */ stw r30, 8(r1) -/* 800DB624 7C 7E 1B 78 */ mr r30, r3 -/* 800DB628 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800DB62C 80 03 05 88 */ lwz r0, 0x588(r3) -/* 800DB630 64 00 08 00 */ oris r0, r0, 0x800 -/* 800DB634 90 03 05 88 */ stw r0, 0x588(r3) -/* 800DB638 7F E3 FB 78 */ mr r3, r31 -/* 800DB63C 48 08 2E 91 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800DB640 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800DB644 41 82 00 14 */ beq lbl_800DB658 -/* 800DB648 7F C3 F3 78 */ mr r3, r30 -/* 800DB64C 38 80 00 00 */ li r4, 0 -/* 800DB650 4B FD EA 81 */ bl checkNextAction__9daAlink_cFi -/* 800DB654 48 00 00 34 */ b lbl_800DB688 -lbl_800DB658: -/* 800DB658 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800DB65C 3C 60 80 39 */ lis r3, m__23daAlinkHIO_damCaught_c0@ha /* 0x8038E49C@ha */ -/* 800DB660 38 63 E4 9C */ addi r3, r3, m__23daAlinkHIO_damCaught_c0@l /* 0x8038E49C@l */ -/* 800DB664 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 800DB668 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800DB66C 40 81 00 1C */ ble lbl_800DB688 -/* 800DB670 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 800DB674 60 00 00 04 */ ori r0, r0, 4 -/* 800DB678 90 1E 31 A0 */ stw r0, 0x31a0(r30) -/* 800DB67C 7F C3 F3 78 */ mr r3, r30 -/* 800DB680 38 80 00 01 */ li r4, 1 -/* 800DB684 4B FD EA 4D */ bl checkNextAction__9daAlink_cFi -lbl_800DB688: -/* 800DB688 38 60 00 01 */ li r3, 1 -/* 800DB68C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DB690 83 C1 00 08 */ lwz r30, 8(r1) -/* 800DB694 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DB698 7C 08 03 A6 */ mtlr r0 -/* 800DB69C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DB6A0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procStepMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procStepMoveInit__9daAlink_cFv.s deleted file mode 100644 index df4d98791cb..00000000000 --- a/asm/d/a/d_a_alink/procStepMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_800C74D4: -/* 800C74D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C74D8 7C 08 02 A6 */ mflr r0 -/* 800C74DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C74E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C74E4 7C 7F 1B 78 */ mr r31, r3 -/* 800C74E8 38 80 00 1B */ li r4, 0x1b -/* 800C74EC 4B FF AA 81 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C74F0 7F E3 FB 78 */ mr r3, r31 -/* 800C74F4 38 80 01 27 */ li r4, 0x127 -/* 800C74F8 3C A0 80 39 */ lis r5, m__23daAlinkHIO_smallJump_c0@ha /* 0x8038E11C@ha */ -/* 800C74FC 38 A5 E1 1C */ addi r5, r5, m__23daAlinkHIO_smallJump_c0@l /* 0x8038E11C@l */ -/* 800C7500 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800C7504 4B FE 5B F1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800C7508 C0 22 92 98 */ lfs f1, lit_5943(r2) -/* 800C750C C0 1F 33 98 */ lfs f0, 0x3398(r31) -/* 800C7510 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800C7514 D0 1F 34 78 */ stfs f0, 0x3478(r31) -/* 800C7518 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C751C D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800C7520 38 00 00 00 */ li r0, 0 -/* 800C7524 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800C7528 3C 60 80 42 */ lis r3, l_waitBaseAnime@ha /* 0x80425514@ha */ -/* 800C752C C4 03 55 14 */ lfsu f0, l_waitBaseAnime@l(r3) /* 0x80425514@l */ -/* 800C7530 D0 1F 35 88 */ stfs f0, 0x3588(r31) -/* 800C7534 C0 03 00 04 */ lfs f0, 4(r3) -/* 800C7538 D0 1F 35 8C */ stfs f0, 0x358c(r31) -/* 800C753C C0 03 00 08 */ lfs f0, 8(r3) -/* 800C7540 D0 1F 35 90 */ stfs f0, 0x3590(r31) -/* 800C7544 38 60 00 01 */ li r3, 1 -/* 800C7548 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C754C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C7550 7C 08 03 A6 */ mtlr r0 -/* 800C7554 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C7558 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSumouReadyInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSumouReadyInit__9daAlink_cFv.s deleted file mode 100644 index 857f7eb9097..00000000000 --- a/asm/d/a/d_a_alink/procSumouReadyInit__9daAlink_cFv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_800EA950: -/* 800EA950 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800EA954 7C 08 02 A6 */ mflr r0 -/* 800EA958 90 01 00 14 */ stw r0, 0x14(r1) -/* 800EA95C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800EA960 7C 7F 1B 78 */ mr r31, r3 -/* 800EA964 38 80 00 CE */ li r4, 0xce -/* 800EA968 4B FD 84 3D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800EA96C 2C 03 00 00 */ cmpwi r3, 0 -/* 800EA970 40 82 00 0C */ bne lbl_800EA97C -/* 800EA974 38 60 00 00 */ li r3, 0 -/* 800EA978 48 00 00 9C */ b lbl_800EAA14 -lbl_800EA97C: -/* 800EA97C 7F E3 FB 78 */ mr r3, r31 -/* 800EA980 38 80 01 3F */ li r4, 0x13f -/* 800EA984 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800EA988 4B FC 26 29 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf -/* 800EA98C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800EA990 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800EA994 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800EA998 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800EA99C 3C 60 80 42 */ lis r3, l_waitBaseAnime@ha /* 0x80425514@ha */ -/* 800EA9A0 C4 03 55 14 */ lfsu f0, l_waitBaseAnime@l(r3) /* 0x80425514@l */ -/* 800EA9A4 D0 1F 35 88 */ stfs f0, 0x3588(r31) -/* 800EA9A8 C0 03 00 04 */ lfs f0, 4(r3) -/* 800EA9AC D0 1F 35 8C */ stfs f0, 0x358c(r31) -/* 800EA9B0 C0 03 00 08 */ lfs f0, 8(r3) -/* 800EA9B4 D0 1F 35 90 */ stfs f0, 0x3590(r31) -/* 800EA9B8 C0 1F 35 88 */ lfs f0, 0x3588(r31) -/* 800EA9BC D0 1F 34 D4 */ stfs f0, 0x34d4(r31) -/* 800EA9C0 C0 1F 35 8C */ lfs f0, 0x358c(r31) -/* 800EA9C4 D0 1F 34 D8 */ stfs f0, 0x34d8(r31) -/* 800EA9C8 C0 1F 35 90 */ lfs f0, 0x3590(r31) -/* 800EA9CC D0 1F 34 DC */ stfs f0, 0x34dc(r31) -/* 800EA9D0 38 00 00 04 */ li r0, 4 -/* 800EA9D4 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 800EA9D8 38 00 00 01 */ li r0, 1 -/* 800EA9DC 98 1F 05 6A */ stb r0, 0x56a(r31) -/* 800EA9E0 38 00 00 00 */ li r0, 0 -/* 800EA9E4 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800EA9E8 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 800EA9EC 7F E3 FB 78 */ mr r3, r31 -/* 800EA9F0 38 80 00 00 */ li r4, 0 -/* 800EA9F4 38 A0 00 01 */ li r5, 1 -/* 800EA9F8 4B FD 68 E5 */ bl deleteEquipItem__9daAlink_cFii -/* 800EA9FC 80 7F 28 38 */ lwz r3, 0x2838(r31) -/* 800EAA00 28 03 00 00 */ cmplwi r3, 0 -/* 800EAA04 41 82 00 0C */ beq lbl_800EAA10 -/* 800EAA08 38 00 00 01 */ li r0, 1 -/* 800EAA0C 98 03 09 56 */ stb r0, 0x956(r3) -lbl_800EAA10: -/* 800EAA10 38 60 00 01 */ li r3, 1 -lbl_800EAA14: -/* 800EAA14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800EAA18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800EAA1C 7C 08 03 A6 */ mtlr r0 -/* 800EAA20 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EAA24 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSumouShikoInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSumouShikoInit__9daAlink_cFv.s deleted file mode 100644 index ecfbd2c38b3..00000000000 --- a/asm/d/a/d_a_alink/procSumouShikoInit__9daAlink_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_800EC538: -/* 800EC538 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800EC53C 7C 08 02 A6 */ mflr r0 -/* 800EC540 90 01 00 14 */ stw r0, 0x14(r1) -/* 800EC544 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800EC548 7C 7F 1B 78 */ mr r31, r3 -/* 800EC54C 38 80 00 D4 */ li r4, 0xd4 -/* 800EC550 4B FD 68 55 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800EC554 2C 03 00 00 */ cmpwi r3, 0 -/* 800EC558 40 82 00 0C */ bne lbl_800EC564 -/* 800EC55C 38 60 00 00 */ li r3, 0 -/* 800EC560 48 00 00 80 */ b lbl_800EC5E0 -lbl_800EC564: -/* 800EC564 7F E3 FB 78 */ mr r3, r31 -/* 800EC568 38 80 01 5D */ li r4, 0x15d -/* 800EC56C 4B FC 0A 15 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 800EC570 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800EC574 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800EC578 3C 60 80 42 */ lis r3, l_waitBaseAnime@ha /* 0x80425514@ha */ -/* 800EC57C C4 03 55 14 */ lfsu f0, l_waitBaseAnime@l(r3) /* 0x80425514@l */ -/* 800EC580 D0 1F 35 88 */ stfs f0, 0x3588(r31) -/* 800EC584 C0 03 00 04 */ lfs f0, 4(r3) -/* 800EC588 D0 1F 35 8C */ stfs f0, 0x358c(r31) -/* 800EC58C C0 03 00 08 */ lfs f0, 8(r3) -/* 800EC590 D0 1F 35 90 */ stfs f0, 0x3590(r31) -/* 800EC594 C0 1F 35 88 */ lfs f0, 0x3588(r31) -/* 800EC598 D0 1F 34 D4 */ stfs f0, 0x34d4(r31) -/* 800EC59C C0 1F 35 8C */ lfs f0, 0x358c(r31) -/* 800EC5A0 D0 1F 34 D8 */ stfs f0, 0x34d8(r31) -/* 800EC5A4 C0 1F 35 90 */ lfs f0, 0x3590(r31) -/* 800EC5A8 D0 1F 34 DC */ stfs f0, 0x34dc(r31) -/* 800EC5AC 38 00 00 0C */ li r0, 0xc -/* 800EC5B0 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 800EC5B4 38 00 00 00 */ li r0, 0 -/* 800EC5B8 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800EC5BC 98 1F 05 6A */ stb r0, 0x56a(r31) -/* 800EC5C0 7F E3 FB 78 */ mr r3, r31 -/* 800EC5C4 38 80 00 05 */ li r4, 5 -/* 800EC5C8 48 03 4B F9 */ bl setFootEffectProcType__9daAlink_cFi -/* 800EC5CC 7F E3 FB 78 */ mr r3, r31 -/* 800EC5D0 38 80 00 00 */ li r4, 0 -/* 800EC5D4 38 A0 00 01 */ li r5, 1 -/* 800EC5D8 4B FD 4D 05 */ bl deleteEquipItem__9daAlink_cFii -/* 800EC5DC 38 60 00 01 */ li r3, 1 -lbl_800EC5E0: -/* 800EC5E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800EC5E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800EC5E8 7C 08 03 A6 */ mtlr r0 -/* 800EC5EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EC5F0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSumouSideMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSumouSideMoveInit__9daAlink_cFv.s deleted file mode 100644 index 61ceaf943a6..00000000000 --- a/asm/d/a/d_a_alink/procSumouSideMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_800EB208: -/* 800EB208 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800EB20C 7C 08 02 A6 */ mflr r0 -/* 800EB210 90 01 00 14 */ stw r0, 0x14(r1) -/* 800EB214 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800EB218 7C 7F 1B 78 */ mr r31, r3 -/* 800EB21C 38 80 00 D0 */ li r4, 0xd0 -/* 800EB220 4B FD 6D 4D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800EB224 38 00 00 16 */ li r0, 0x16 -/* 800EB228 98 1F 05 6A */ stb r0, 0x56a(r31) -/* 800EB22C 38 00 00 03 */ li r0, 3 -/* 800EB230 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 800EB234 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 800EB238 38 03 C0 00 */ addi r0, r3, -16384 -/* 800EB23C B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800EB240 3C 60 80 39 */ lis r3, m__21daAlinkHIO_atnMove_c0@ha /* 0x8038D714@ha */ -/* 800EB244 38 63 D7 14 */ addi r3, r3, m__21daAlinkHIO_atnMove_c0@l /* 0x8038D714@l */ -/* 800EB248 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 800EB24C D0 1F 05 94 */ stfs f0, 0x594(r31) -/* 800EB250 7F E3 FB 78 */ mr r3, r31 -/* 800EB254 38 80 01 41 */ li r4, 0x141 -/* 800EB258 4B FC 1D 29 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 800EB25C 38 00 01 41 */ li r0, 0x141 -/* 800EB260 90 1F 31 98 */ stw r0, 0x3198(r31) -/* 800EB264 7F E3 FB 78 */ mr r3, r31 -/* 800EB268 4B FF F6 C5 */ bl setSumouPunchStatus__9daAlink_cFv -/* 800EB26C 7F E3 FB 78 */ mr r3, r31 -/* 800EB270 38 80 00 15 */ li r4, 0x15 -/* 800EB274 4B FC 7F F5 */ bl setDoStatusEmphasys__9daAlink_cFUc -/* 800EB278 38 00 00 05 */ li r0, 5 -/* 800EB27C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800EB280 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800EB284 98 03 5E 81 */ stb r0, 0x5e81(r3) -/* 800EB288 38 00 00 0C */ li r0, 0xc -/* 800EB28C 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 800EB290 7F E3 FB 78 */ mr r3, r31 -/* 800EB294 38 80 00 05 */ li r4, 5 -/* 800EB298 48 03 5F 29 */ bl setFootEffectProcType__9daAlink_cFi -/* 800EB29C 38 00 00 0F */ li r0, 0xf -/* 800EB2A0 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 800EB2A4 38 60 00 01 */ li r3, 1 -/* 800EB2A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800EB2AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800EB2B0 7C 08 03 A6 */ mtlr r0 -/* 800EB2B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EB2B8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSumouStaggerInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSumouStaggerInit__9daAlink_cFv.s deleted file mode 100644 index 3ddd625459e..00000000000 --- a/asm/d/a/d_a_alink/procSumouStaggerInit__9daAlink_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_800EC0F8: -/* 800EC0F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800EC0FC 7C 08 02 A6 */ mflr r0 -/* 800EC100 90 01 00 14 */ stw r0, 0x14(r1) -/* 800EC104 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800EC108 7C 7F 1B 78 */ mr r31, r3 -/* 800EC10C 38 80 00 D2 */ li r4, 0xd2 -/* 800EC110 4B FD 5E 5D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800EC114 88 1F 05 6A */ lbz r0, 0x56a(r31) -/* 800EC118 28 00 00 11 */ cmplwi r0, 0x11 -/* 800EC11C 40 82 00 10 */ bne lbl_800EC12C -/* 800EC120 38 00 00 20 */ li r0, 0x20 -/* 800EC124 98 1F 05 6A */ stb r0, 0x56a(r31) -/* 800EC128 48 00 00 0C */ b lbl_800EC134 -lbl_800EC12C: -/* 800EC12C 38 00 00 1F */ li r0, 0x1f -/* 800EC130 98 1F 05 6A */ stb r0, 0x56a(r31) -lbl_800EC134: -/* 800EC134 7F E3 FB 78 */ mr r3, r31 -/* 800EC138 38 80 01 53 */ li r4, 0x153 -/* 800EC13C 4B FC 0E 45 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 800EC140 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800EC144 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800EC148 38 00 00 0C */ li r0, 0xc -/* 800EC14C 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 800EC150 38 00 00 1E */ li r0, 0x1e -/* 800EC154 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 800EC158 38 60 00 01 */ li r3, 1 -/* 800EC15C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800EC160 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800EC164 7C 08 03 A6 */ mtlr r0 -/* 800EC168 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EC16C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSumouStagger__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSumouStagger__9daAlink_cFv.s deleted file mode 100644 index b556f1cea99..00000000000 --- a/asm/d/a/d_a_alink/procSumouStagger__9daAlink_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_800EC170: -/* 800EC170 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800EC174 7C 08 02 A6 */ mflr r0 -/* 800EC178 90 01 00 14 */ stw r0, 0x14(r1) -/* 800EC17C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800EC180 7C 7F 1B 78 */ mr r31, r3 -/* 800EC184 38 00 00 04 */ li r0, 4 -/* 800EC188 98 03 2F 99 */ stb r0, 0x2f99(r3) -/* 800EC18C 4B FF E6 B9 */ bl checkSumouVsActor__9daAlink_cFv -/* 800EC190 2C 03 00 00 */ cmpwi r3, 0 -/* 800EC194 40 82 00 0C */ bne lbl_800EC1A0 -/* 800EC198 38 60 00 01 */ li r3, 1 -/* 800EC19C 48 00 00 5C */ b lbl_800EC1F8 -lbl_800EC1A0: -/* 800EC1A0 A8 7F 30 08 */ lha r3, 0x3008(r31) -/* 800EC1A4 38 03 FF FF */ addi r0, r3, -1 -/* 800EC1A8 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 800EC1AC 88 1F 05 6A */ lbz r0, 0x56a(r31) -/* 800EC1B0 28 00 00 1C */ cmplwi r0, 0x1c -/* 800EC1B4 41 82 00 14 */ beq lbl_800EC1C8 -/* 800EC1B8 28 00 00 21 */ cmplwi r0, 0x21 -/* 800EC1BC 41 82 00 0C */ beq lbl_800EC1C8 -/* 800EC1C0 28 00 00 1B */ cmplwi r0, 0x1b -/* 800EC1C4 40 82 00 1C */ bne lbl_800EC1E0 -lbl_800EC1C8: -/* 800EC1C8 7F E3 FB 78 */ mr r3, r31 -/* 800EC1CC 38 80 00 00 */ li r4, 0 -/* 800EC1D0 38 A0 00 00 */ li r5, 0 -/* 800EC1D4 38 C0 00 00 */ li r6, 0 -/* 800EC1D8 4B FF F4 4D */ bl procSumouActionInit__9daAlink_cFiii -/* 800EC1DC 48 00 00 18 */ b lbl_800EC1F4 -lbl_800EC1E0: -/* 800EC1E0 A8 1F 30 08 */ lha r0, 0x3008(r31) -/* 800EC1E4 2C 00 00 00 */ cmpwi r0, 0 -/* 800EC1E8 40 82 00 0C */ bne lbl_800EC1F4 -/* 800EC1EC 7F E3 FB 78 */ mr r3, r31 -/* 800EC1F0 4B FF F0 19 */ bl procSumouSideMoveInit__9daAlink_cFv -lbl_800EC1F4: -/* 800EC1F4 38 60 00 01 */ li r3, 1 -lbl_800EC1F8: -/* 800EC1F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800EC1FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800EC200 7C 08 03 A6 */ mtlr r0 -/* 800EC204 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EC208 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSwordUnequipSpInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSwordUnequipSpInit__9daAlink_cFv.s deleted file mode 100644 index e5011f0577a..00000000000 --- a/asm/d/a/d_a_alink/procSwordUnequipSpInit__9daAlink_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_800D698C: -/* 800D698C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D6990 7C 08 02 A6 */ mflr r0 -/* 800D6994 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D6998 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D699C 7C 7F 1B 78 */ mr r31, r3 -/* 800D69A0 38 80 00 54 */ li r4, 0x54 -/* 800D69A4 4B FE C4 01 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800D69A8 2C 03 00 00 */ cmpwi r3, 0 -/* 800D69AC 40 82 00 0C */ bne lbl_800D69B8 -/* 800D69B0 38 60 00 00 */ li r3, 0 -/* 800D69B4 48 00 00 70 */ b lbl_800D6A24 -lbl_800D69B8: -/* 800D69B8 7F E3 FB 78 */ mr r3, r31 -/* 800D69BC 38 80 00 8E */ li r4, 0x8e -/* 800D69C0 3C A0 80 39 */ lis r5, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800D69C4 38 A5 DE 8C */ addi r5, r5, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800D69C8 C0 25 00 6C */ lfs f1, 0x6c(r5) -/* 800D69CC C0 42 92 C4 */ lfs f2, lit_6109(r2) -/* 800D69D0 4B FD 66 11 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -/* 800D69D4 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800D69D8 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800D69DC 3C 60 80 42 */ lis r3, l_halfAtnWaitBaseAnime@ha /* 0x80425544@ha */ -/* 800D69E0 C4 03 55 44 */ lfsu f0, l_halfAtnWaitBaseAnime@l(r3) /* 0x80425544@l */ -/* 800D69E4 D0 1F 35 88 */ stfs f0, 0x3588(r31) -/* 800D69E8 C0 03 00 04 */ lfs f0, 4(r3) -/* 800D69EC D0 1F 35 8C */ stfs f0, 0x358c(r31) -/* 800D69F0 C0 03 00 08 */ lfs f0, 8(r3) -/* 800D69F4 D0 1F 35 90 */ stfs f0, 0x3590(r31) -/* 800D69F8 38 80 00 00 */ li r4, 0 -/* 800D69FC 90 9F 31 98 */ stw r4, 0x3198(r31) -/* 800D6A00 B0 9F 30 0C */ sth r4, 0x300c(r31) -/* 800D6A04 80 1F 06 14 */ lwz r0, 0x614(r31) -/* 800D6A08 20 60 00 1E */ subfic r3, r0, 0x1e -/* 800D6A0C 30 03 FF FF */ addic r0, r3, -1 -/* 800D6A10 7C 00 19 10 */ subfe r0, r0, r3 -/* 800D6A14 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 800D6A18 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 800D6A1C B0 9F 30 10 */ sth r4, 0x3010(r31) -/* 800D6A20 38 60 00 01 */ li r3, 1 -lbl_800D6A24: -/* 800D6A24 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D6A28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D6A2C 7C 08 03 A6 */ mtlr r0 -/* 800D6A30 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D6A34 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSwordUnequipSp__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSwordUnequipSp__9daAlink_cFv.s deleted file mode 100644 index d499d328ef7..00000000000 --- a/asm/d/a/d_a_alink/procSwordUnequipSp__9daAlink_cFv.s +++ /dev/null @@ -1,238 +0,0 @@ -lbl_800D6A38: -/* 800D6A38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D6A3C 7C 08 02 A6 */ mflr r0 -/* 800D6A40 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D6A44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D6A48 93 C1 00 08 */ stw r30, 8(r1) -/* 800D6A4C 7C 7E 1B 78 */ mr r30, r3 -/* 800D6A50 4B FE 35 01 */ bl checkGroundSpecialMode__9daAlink_cFv -/* 800D6A54 2C 03 00 00 */ cmpwi r3, 0 -/* 800D6A58 41 82 00 0C */ beq lbl_800D6A64 -/* 800D6A5C 38 60 00 01 */ li r3, 1 -/* 800D6A60 48 00 03 1C */ b lbl_800D6D7C -lbl_800D6A64: -/* 800D6A64 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800D6A68 A8 1E 30 0E */ lha r0, 0x300e(r30) -/* 800D6A6C 2C 00 00 00 */ cmpwi r0, 0 -/* 800D6A70 41 82 00 10 */ beq lbl_800D6A80 -/* 800D6A74 38 00 00 04 */ li r0, 4 -/* 800D6A78 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 800D6A7C 48 00 00 0C */ b lbl_800D6A88 -lbl_800D6A80: -/* 800D6A80 38 00 00 01 */ li r0, 1 -/* 800D6A84 B0 1E 30 0E */ sth r0, 0x300e(r30) -lbl_800D6A88: -/* 800D6A88 80 1E 05 88 */ lwz r0, 0x588(r30) -/* 800D6A8C 64 00 08 00 */ oris r0, r0, 0x800 -/* 800D6A90 90 1E 05 88 */ stw r0, 0x588(r30) -/* 800D6A94 A8 1E 30 0C */ lha r0, 0x300c(r30) -/* 800D6A98 2C 00 00 00 */ cmpwi r0, 0 -/* 800D6A9C 41 82 00 10 */ beq lbl_800D6AAC -/* 800D6AA0 80 1E 05 8C */ lwz r0, 0x58c(r30) -/* 800D6AA4 64 00 80 00 */ oris r0, r0, 0x8000 -/* 800D6AA8 90 1E 05 8C */ stw r0, 0x58c(r30) -lbl_800D6AAC: -/* 800D6AAC A8 1E 30 10 */ lha r0, 0x3010(r30) -/* 800D6AB0 2C 00 00 00 */ cmpwi r0, 0 -/* 800D6AB4 40 82 00 54 */ bne lbl_800D6B08 -/* 800D6AB8 80 1E 06 14 */ lwz r0, 0x614(r30) -/* 800D6ABC 28 00 00 1E */ cmplwi r0, 0x1e -/* 800D6AC0 40 82 00 48 */ bne lbl_800D6B08 -/* 800D6AC4 80 1E 06 10 */ lwz r0, 0x610(r30) -/* 800D6AC8 2C 00 00 01 */ cmpwi r0, 1 -/* 800D6ACC 40 82 00 3C */ bne lbl_800D6B08 -/* 800D6AD0 38 00 00 01 */ li r0, 1 -/* 800D6AD4 B0 1E 30 10 */ sth r0, 0x3010(r30) -/* 800D6AD8 7F C3 F3 78 */ mr r3, r30 -/* 800D6ADC 38 80 01 49 */ li r4, 0x149 -/* 800D6AE0 38 A0 00 00 */ li r5, 0 -/* 800D6AE4 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800D6AE8 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800D6AEC 4B FD 89 C5 */ bl setFaceBck__9daAlink_cFUsiUs -/* 800D6AF0 7F C3 F3 78 */ mr r3, r30 -/* 800D6AF4 38 80 03 E1 */ li r4, 0x3e1 -/* 800D6AF8 38 A0 00 00 */ li r5, 0 -/* 800D6AFC 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800D6B00 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800D6B04 4B FD 8B 19 */ bl setFaceBtp__9daAlink_cFUsiUs -lbl_800D6B08: -/* 800D6B08 7F E3 FB 78 */ mr r3, r31 -/* 800D6B0C 48 08 79 C1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800D6B10 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D6B14 41 82 00 6C */ beq lbl_800D6B80 -/* 800D6B18 80 1E 31 98 */ lwz r0, 0x3198(r30) -/* 800D6B1C 2C 00 00 00 */ cmpwi r0, 0 -/* 800D6B20 41 82 00 38 */ beq lbl_800D6B58 -/* 800D6B24 80 1E 06 14 */ lwz r0, 0x614(r30) -/* 800D6B28 28 00 00 1E */ cmplwi r0, 0x1e -/* 800D6B2C 40 82 00 1C */ bne lbl_800D6B48 -/* 800D6B30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D6B34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D6B38 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800D6B3C 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800D6B40 4B F7 16 3D */ bl cutEnd__16dEvent_manager_cFi -/* 800D6B44 48 00 02 34 */ b lbl_800D6D78 -lbl_800D6B48: -/* 800D6B48 7F C3 F3 78 */ mr r3, r30 -/* 800D6B4C 38 80 00 00 */ li r4, 0 -/* 800D6B50 4B FE 35 81 */ bl checkNextAction__9daAlink_cFi -/* 800D6B54 48 00 02 24 */ b lbl_800D6D78 -lbl_800D6B58: -/* 800D6B58 38 00 00 01 */ li r0, 1 -/* 800D6B5C 90 1E 31 98 */ stw r0, 0x3198(r30) -/* 800D6B60 7F C3 F3 78 */ mr r3, r30 -/* 800D6B64 38 80 00 8F */ li r4, 0x8f -/* 800D6B68 3C A0 80 39 */ lis r5, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800D6B6C 38 A5 DE 8C */ addi r5, r5, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800D6B70 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 800D6B74 C0 42 92 C4 */ lfs f2, lit_6109(r2) -/* 800D6B78 4B FD 64 69 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -/* 800D6B7C 48 00 01 FC */ b lbl_800D6D78 -lbl_800D6B80: -/* 800D6B80 80 1E 31 98 */ lwz r0, 0x3198(r30) -/* 800D6B84 2C 00 00 00 */ cmpwi r0, 0 -/* 800D6B88 41 82 01 38 */ beq lbl_800D6CC0 -/* 800D6B8C C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D6B90 3C 60 80 39 */ lis r3, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800D6B94 38 63 DE 8C */ addi r3, r3, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800D6B98 C0 03 00 98 */ lfs f0, 0x98(r3) -/* 800D6B9C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D6BA0 40 81 00 18 */ ble lbl_800D6BB8 -/* 800D6BA4 7F C3 F3 78 */ mr r3, r30 -/* 800D6BA8 38 80 00 01 */ li r4, 1 -/* 800D6BAC 4B FE 35 25 */ bl checkNextAction__9daAlink_cFi -/* 800D6BB0 2C 03 00 00 */ cmpwi r3, 0 -/* 800D6BB4 40 82 01 C4 */ bne lbl_800D6D78 -lbl_800D6BB8: -/* 800D6BB8 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D6BBC C0 02 93 7C */ lfs f0, lit_8779(r2) -/* 800D6BC0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D6BC4 4C 41 13 82 */ cror 2, 1, 2 -/* 800D6BC8 40 82 00 10 */ bne lbl_800D6BD8 -/* 800D6BCC 38 00 00 01 */ li r0, 1 -/* 800D6BD0 98 1E 2F 92 */ stb r0, 0x2f92(r30) -/* 800D6BD4 48 00 01 A4 */ b lbl_800D6D78 -lbl_800D6BD8: -/* 800D6BD8 C0 02 93 80 */ lfs f0, lit_8780(r2) -/* 800D6BDC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D6BE0 4C 41 13 82 */ cror 2, 1, 2 -/* 800D6BE4 40 82 00 10 */ bne lbl_800D6BF4 -/* 800D6BE8 38 00 00 06 */ li r0, 6 -/* 800D6BEC 98 1E 2F 93 */ stb r0, 0x2f93(r30) -/* 800D6BF0 48 00 01 88 */ b lbl_800D6D78 -lbl_800D6BF4: -/* 800D6BF4 C0 02 93 28 */ lfs f0, lit_7451(r2) -/* 800D6BF8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D6BFC 4C 41 13 82 */ cror 2, 1, 2 -/* 800D6C00 40 82 00 10 */ bne lbl_800D6C10 -/* 800D6C04 38 00 00 04 */ li r0, 4 -/* 800D6C08 98 1E 2F 92 */ stb r0, 0x2f92(r30) -/* 800D6C0C 48 00 01 6C */ b lbl_800D6D78 -lbl_800D6C10: -/* 800D6C10 C0 02 93 84 */ lfs f0, lit_8781(r2) -/* 800D6C14 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D6C18 4C 41 13 82 */ cror 2, 1, 2 -/* 800D6C1C 40 82 00 7C */ bne lbl_800D6C98 -/* 800D6C20 80 1E 06 14 */ lwz r0, 0x614(r30) -/* 800D6C24 28 00 00 1E */ cmplwi r0, 0x1e -/* 800D6C28 40 82 00 5C */ bne lbl_800D6C84 -/* 800D6C2C 80 1E 06 0C */ lwz r0, 0x60c(r30) -/* 800D6C30 2C 00 00 01 */ cmpwi r0, 1 -/* 800D6C34 40 82 00 28 */ bne lbl_800D6C5C -/* 800D6C38 D0 1F 00 10 */ stfs f0, 0x10(r31) -/* 800D6C3C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800D6C40 D0 1F 00 0C */ stfs f0, 0xc(r31) -/* 800D6C44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D6C48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D6C4C 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800D6C50 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800D6C54 4B F7 15 29 */ bl cutEnd__16dEvent_manager_cFi -/* 800D6C58 48 00 00 2C */ b lbl_800D6C84 -lbl_800D6C5C: -/* 800D6C5C C0 3F 00 0C */ lfs f1, 0xc(r31) -/* 800D6C60 C0 02 93 88 */ lfs f0, lit_8782(r2) -/* 800D6C64 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D6C68 40 80 00 1C */ bge lbl_800D6C84 -/* 800D6C6C 7F C3 F3 78 */ mr r3, r30 -/* 800D6C70 7F E4 FB 78 */ mr r4, r31 -/* 800D6C74 3C A0 80 39 */ lis r5, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800D6C78 38 A5 DE 8C */ addi r5, r5, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800D6C7C C0 25 00 70 */ lfs f1, 0x70(r5) -/* 800D6C80 48 02 B0 75 */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf -lbl_800D6C84: -/* 800D6C84 7F C3 F3 78 */ mr r3, r30 -/* 800D6C88 38 80 00 00 */ li r4, 0 -/* 800D6C8C 38 A0 00 01 */ li r5, 1 -/* 800D6C90 4B FE A6 4D */ bl deleteEquipItem__9daAlink_cFii -/* 800D6C94 48 00 00 E4 */ b lbl_800D6D78 -lbl_800D6C98: -/* 800D6C98 7F E3 FB 78 */ mr r3, r31 -/* 800D6C9C C0 22 93 8C */ lfs f1, lit_8783(r2) -/* 800D6CA0 48 25 17 8D */ bl checkPass__12J3DFrameCtrlFf -/* 800D6CA4 2C 03 00 00 */ cmpwi r3, 0 -/* 800D6CA8 41 82 00 D0 */ beq lbl_800D6D78 -/* 800D6CAC 7F C3 F3 78 */ mr r3, r30 -/* 800D6CB0 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020008@ha */ -/* 800D6CB4 38 84 00 08 */ addi r4, r4, 0x0008 /* 0x00020008@l */ -/* 800D6CB8 4B FE 84 35 */ bl seStartSwordCut__9daAlink_cFUl -/* 800D6CBC 48 00 00 BC */ b lbl_800D6D78 -lbl_800D6CC0: -/* 800D6CC0 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D6CC4 C0 02 93 34 */ lfs f0, lit_7710(r2) -/* 800D6CC8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D6CCC 4C 41 13 82 */ cror 2, 1, 2 -/* 800D6CD0 40 82 00 20 */ bne lbl_800D6CF0 -/* 800D6CD4 38 00 00 FE */ li r0, 0xfe -/* 800D6CD8 98 1E 2F 93 */ stb r0, 0x2f93(r30) -/* 800D6CDC 38 00 00 01 */ li r0, 1 -/* 800D6CE0 B0 1E 30 0C */ sth r0, 0x300c(r30) -/* 800D6CE4 80 1E 05 8C */ lwz r0, 0x58c(r30) -/* 800D6CE8 64 00 80 00 */ oris r0, r0, 0x8000 -/* 800D6CEC 90 1E 05 8C */ stw r0, 0x58c(r30) -lbl_800D6CF0: -/* 800D6CF0 7F E3 FB 78 */ mr r3, r31 -/* 800D6CF4 C0 22 93 74 */ lfs f1, lit_8502(r2) -/* 800D6CF8 48 25 17 35 */ bl checkPass__12J3DFrameCtrlFf -/* 800D6CFC 2C 03 00 00 */ cmpwi r3, 0 -/* 800D6D00 40 82 00 18 */ bne lbl_800D6D18 -/* 800D6D04 7F E3 FB 78 */ mr r3, r31 -/* 800D6D08 C0 22 93 84 */ lfs f1, lit_8781(r2) -/* 800D6D0C 48 25 17 21 */ bl checkPass__12J3DFrameCtrlFf -/* 800D6D10 2C 03 00 00 */ cmpwi r3, 0 -/* 800D6D14 41 82 00 18 */ beq lbl_800D6D2C -lbl_800D6D18: -/* 800D6D18 7F C3 F3 78 */ mr r3, r30 -/* 800D6D1C 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020006@ha */ -/* 800D6D20 38 84 00 06 */ addi r4, r4, 0x0006 /* 0x00020006@l */ -/* 800D6D24 4B FE 83 C9 */ bl seStartSwordCut__9daAlink_cFUl -/* 800D6D28 48 00 00 50 */ b lbl_800D6D78 -lbl_800D6D2C: -/* 800D6D2C 7F E3 FB 78 */ mr r3, r31 -/* 800D6D30 C0 22 93 90 */ lfs f1, lit_8784(r2) -/* 800D6D34 48 25 16 F9 */ bl checkPass__12J3DFrameCtrlFf -/* 800D6D38 2C 03 00 00 */ cmpwi r3, 0 -/* 800D6D3C 40 82 00 2C */ bne lbl_800D6D68 -/* 800D6D40 7F E3 FB 78 */ mr r3, r31 -/* 800D6D44 C0 22 93 94 */ lfs f1, lit_8785(r2) -/* 800D6D48 48 25 16 E5 */ bl checkPass__12J3DFrameCtrlFf -/* 800D6D4C 2C 03 00 00 */ cmpwi r3, 0 -/* 800D6D50 40 82 00 18 */ bne lbl_800D6D68 -/* 800D6D54 7F E3 FB 78 */ mr r3, r31 -/* 800D6D58 C0 22 93 98 */ lfs f1, lit_8786(r2) -/* 800D6D5C 48 25 16 D1 */ bl checkPass__12J3DFrameCtrlFf -/* 800D6D60 2C 03 00 00 */ cmpwi r3, 0 -/* 800D6D64 41 82 00 14 */ beq lbl_800D6D78 -lbl_800D6D68: -/* 800D6D68 7F C3 F3 78 */ mr r3, r30 -/* 800D6D6C 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020007@ha */ -/* 800D6D70 38 84 00 07 */ addi r4, r4, 0x0007 /* 0x00020007@l */ -/* 800D6D74 4B FE 83 79 */ bl seStartSwordCut__9daAlink_cFUl -lbl_800D6D78: -/* 800D6D78 38 60 00 01 */ li r3, 1 -lbl_800D6D7C: -/* 800D6D7C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D6D80 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D6D84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D6D88 7C 08 03 A6 */ mtlr r0 -/* 800D6D8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D6D90 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procTiredWaitInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procTiredWaitInit__9daAlink_cFv.s deleted file mode 100644 index f4a5732eb96..00000000000 --- a/asm/d/a/d_a_alink/procTiredWaitInit__9daAlink_cFv.s +++ /dev/null @@ -1,78 +0,0 @@ -lbl_800C3224: -/* 800C3224 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 800C3228 7C 08 02 A6 */ mflr r0 -/* 800C322C 90 01 00 34 */ stw r0, 0x34(r1) -/* 800C3230 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 800C3234 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 800C3238 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C323C 48 29 EF A1 */ bl _savegpr_29 -/* 800C3240 7C 7D 1B 78 */ mr r29, r3 -/* 800C3244 A0 A3 1F BC */ lhz r5, 0x1fbc(r3) -/* 800C3248 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 800C324C 38 04 FF FF */ addi r0, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 800C3250 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800C3254 7C 05 00 50 */ subf r0, r5, r0 -/* 800C3258 7C 00 00 34 */ cntlzw r0, r0 -/* 800C325C 54 1E DE 3E */ rlwinm r30, r0, 0x1b, 0x18, 0x1f -/* 800C3260 38 80 00 02 */ li r4, 2 -/* 800C3264 4B FF FB 41 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C3268 2C 03 00 00 */ cmpwi r3, 0 -/* 800C326C 40 82 00 0C */ bne lbl_800C3278 -/* 800C3270 38 60 00 00 */ li r3, 0 -/* 800C3274 48 00 00 A4 */ b lbl_800C3318 -lbl_800C3278: -/* 800C3278 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C327C D0 1D 33 98 */ stfs f0, 0x3398(r29) -/* 800C3280 7F A3 EB 78 */ mr r3, r29 -/* 800C3284 38 80 00 B6 */ li r4, 0xb6 -/* 800C3288 4B FE 92 D1 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM -/* 800C328C 7C 7F 1B 78 */ mr r31, r3 -/* 800C3290 2C 1E 00 00 */ cmpwi r30, 0 -/* 800C3294 41 82 00 74 */ beq lbl_800C3308 -/* 800C3298 2C 1F 00 00 */ cmpwi r31, 0 -/* 800C329C 41 82 00 14 */ beq lbl_800C32B0 -/* 800C32A0 C0 3D 1F 28 */ lfs f1, 0x1f28(r29) -/* 800C32A4 C0 02 94 AC */ lfs f0, lit_16641(r2) -/* 800C32A8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800C32AC 41 80 00 2C */ blt lbl_800C32D8 -lbl_800C32B0: -/* 800C32B0 7F A3 EB 78 */ mr r3, r29 -/* 800C32B4 38 80 00 15 */ li r4, 0x15 -/* 800C32B8 4B FE 92 FD */ bl checkUnderMove1BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM -/* 800C32BC 2C 03 00 00 */ cmpwi r3, 0 -/* 800C32C0 40 82 00 18 */ bne lbl_800C32D8 -/* 800C32C4 7F A3 EB 78 */ mr r3, r29 -/* 800C32C8 38 80 00 16 */ li r4, 0x16 -/* 800C32CC 4B FE 92 E9 */ bl checkUnderMove1BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM -/* 800C32D0 2C 03 00 00 */ cmpwi r3, 0 -/* 800C32D4 41 82 00 34 */ beq lbl_800C3308 -lbl_800C32D8: -/* 800C32D8 2C 1F 00 00 */ cmpwi r31, 0 -/* 800C32DC 41 82 00 0C */ beq lbl_800C32E8 -/* 800C32E0 C3 FD 1F E0 */ lfs f31, 0x1fe0(r29) -/* 800C32E4 48 00 00 08 */ b lbl_800C32EC -lbl_800C32E8: -/* 800C32E8 C3 FD 20 40 */ lfs f31, 0x2040(r29) -lbl_800C32EC: -/* 800C32EC 7F A3 EB 78 */ mr r3, r29 -/* 800C32F0 38 80 00 B6 */ li r4, 0xb6 -/* 800C32F4 4B FE 9C 8D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 800C32F8 D3 FD 1F E0 */ stfs f31, 0x1fe0(r29) -/* 800C32FC 80 7D 1F 2C */ lwz r3, 0x1f2c(r29) -/* 800C3300 D3 E3 00 08 */ stfs f31, 8(r3) -/* 800C3304 48 00 00 10 */ b lbl_800C3314 -lbl_800C3308: -/* 800C3308 7F A3 EB 78 */ mr r3, r29 -/* 800C330C 38 80 00 B7 */ li r4, 0xb7 -/* 800C3310 4B FE 9C 71 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -lbl_800C3314: -/* 800C3314 38 60 00 01 */ li r3, 1 -lbl_800C3318: -/* 800C3318 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 800C331C CB E1 00 20 */ lfd f31, 0x20(r1) -/* 800C3320 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C3324 48 29 EF 05 */ bl _restgpr_29 -/* 800C3328 80 01 00 34 */ lwz r0, 0x34(r1) -/* 800C332C 7C 08 03 A6 */ mtlr r0 -/* 800C3330 38 21 00 30 */ addi r1, r1, 0x30 -/* 800C3334 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWaitInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWaitInit__9daAlink_cFv.s deleted file mode 100644 index aa5f0878d18..00000000000 --- a/asm/d/a/d_a_alink/procWaitInit__9daAlink_cFv.s +++ /dev/null @@ -1,94 +0,0 @@ -lbl_800C33B8: -/* 800C33B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C33BC 7C 08 02 A6 */ mflr r0 -/* 800C33C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C33C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C33C8 93 C1 00 08 */ stw r30, 8(r1) -/* 800C33CC 7C 7E 1B 78 */ mr r30, r3 -/* 800C33D0 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800C33D4 28 00 01 49 */ cmplwi r0, 0x149 -/* 800C33D8 40 82 00 10 */ bne lbl_800C33E8 -/* 800C33DC 80 1E 05 88 */ lwz r0, 0x588(r30) -/* 800C33E0 64 00 08 00 */ oris r0, r0, 0x800 -/* 800C33E4 90 1E 05 88 */ stw r0, 0x588(r30) -lbl_800C33E8: -/* 800C33E8 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) -/* 800C33EC 28 00 00 03 */ cmplwi r0, 3 -/* 800C33F0 40 82 00 0C */ bne lbl_800C33FC -/* 800C33F4 38 60 00 00 */ li r3, 0 -/* 800C33F8 48 00 00 F4 */ b lbl_800C34EC -lbl_800C33FC: -/* 800C33FC 7F C3 F3 78 */ mr r3, r30 -/* 800C3400 48 05 28 21 */ bl checkEventRun__9daAlink_cCFv -/* 800C3404 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3408 40 82 00 38 */ bne lbl_800C3440 -/* 800C340C A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) -/* 800C3410 28 00 00 01 */ cmplwi r0, 1 -/* 800C3414 40 82 00 2C */ bne lbl_800C3440 -/* 800C3418 38 7E 1F D0 */ addi r3, r30, 0x1fd0 -/* 800C341C 48 09 B0 B1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800C3420 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C3424 40 82 00 1C */ bne lbl_800C3440 -/* 800C3428 7F C3 F3 78 */ mr r3, r30 -/* 800C342C 4B FF 5E 29 */ bl checkNoUpperAnime__9daAlink_cCFv -/* 800C3430 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3434 41 82 00 0C */ beq lbl_800C3440 -/* 800C3438 38 60 00 00 */ li r3, 0 -/* 800C343C 48 00 00 B0 */ b lbl_800C34EC -lbl_800C3440: -/* 800C3440 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) -/* 800C3444 28 00 00 1E */ cmplwi r0, 0x1e -/* 800C3448 41 82 00 0C */ beq lbl_800C3454 -/* 800C344C 28 00 00 25 */ cmplwi r0, 0x25 -/* 800C3450 40 82 00 0C */ bne lbl_800C345C -lbl_800C3454: -/* 800C3454 3B E0 00 00 */ li r31, 0 -/* 800C3458 48 00 00 08 */ b lbl_800C3460 -lbl_800C345C: -/* 800C345C 3B E0 00 01 */ li r31, 1 -lbl_800C3460: -/* 800C3460 7F C3 F3 78 */ mr r3, r30 -/* 800C3464 38 80 00 03 */ li r4, 3 -/* 800C3468 4B FF EB 05 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C346C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C3470 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800C3474 7F C3 F3 78 */ mr r3, r30 -/* 800C3478 3C 80 80 39 */ lis r4, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 800C347C 38 84 D6 64 */ addi r4, r4, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 800C3480 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800C3484 4B FE A9 91 */ bl setBlendMoveAnime__9daAlink_cFf -/* 800C3488 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800C348C B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800C3490 2C 1F 00 00 */ cmpwi r31, 0 -/* 800C3494 41 82 00 0C */ beq lbl_800C34A0 -/* 800C3498 38 00 00 04 */ li r0, 4 -/* 800C349C 98 1E 2F 98 */ stb r0, 0x2f98(r30) -lbl_800C34A0: -/* 800C34A0 7F C3 F3 78 */ mr r3, r30 -/* 800C34A4 4B FF 03 A1 */ bl initServiceWaitTime__9daAlink_cFv -/* 800C34A8 80 1E 05 88 */ lwz r0, 0x588(r30) -/* 800C34AC 54 00 01 09 */ rlwinm. r0, r0, 0, 4, 4 -/* 800C34B0 41 82 00 38 */ beq lbl_800C34E8 -/* 800C34B4 7F C3 F3 78 */ mr r3, r30 -/* 800C34B8 38 80 00 19 */ li r4, 0x19 -/* 800C34BC 4B FE 90 9D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM -/* 800C34C0 2C 03 00 00 */ cmpwi r3, 0 -/* 800C34C4 40 82 00 18 */ bne lbl_800C34DC -/* 800C34C8 7F C3 F3 78 */ mr r3, r30 -/* 800C34CC 38 80 00 B6 */ li r4, 0xb6 -/* 800C34D0 4B FE 90 89 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM -/* 800C34D4 2C 03 00 00 */ cmpwi r3, 0 -/* 800C34D8 41 82 00 10 */ beq lbl_800C34E8 -lbl_800C34DC: -/* 800C34DC 7F C3 F3 78 */ mr r3, r30 -/* 800C34E0 38 80 00 1B */ li r4, 0x1b -/* 800C34E4 4B FE 9A 9D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -lbl_800C34E8: -/* 800C34E8 38 60 00 01 */ li r3, 1 -lbl_800C34EC: -/* 800C34EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C34F0 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C34F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C34F8 7C 08 03 A6 */ mtlr r0 -/* 800C34FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C3500 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfAtnActorMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfAtnActorMoveInit__9daAlink_cFv.s deleted file mode 100644 index 82cb232142a..00000000000 --- a/asm/d/a/d_a_alink/procWolfAtnActorMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8012DBA8: -/* 8012DBA8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012DBAC 7C 08 02 A6 */ mflr r0 -/* 8012DBB0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012DBB4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012DBB8 7C 7F 1B 78 */ mr r31, r3 -/* 8012DBBC 38 80 00 F6 */ li r4, 0xf6 -/* 8012DBC0 4B F9 51 E5 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8012DBC4 2C 03 00 00 */ cmpwi r3, 0 -/* 8012DBC8 40 82 00 0C */ bne lbl_8012DBD4 -/* 8012DBCC 38 60 00 00 */ li r3, 0 -/* 8012DBD0 48 00 00 60 */ b lbl_8012DC30 -lbl_8012DBD4: -/* 8012DBD4 7F E3 FB 78 */ mr r3, r31 -/* 8012DBD8 4B F8 5D 2D */ bl checkZeroSpeedF__9daAlink_cCFv -/* 8012DBDC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8012DBE0 41 82 00 10 */ beq lbl_8012DBF0 -/* 8012DBE4 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 8012DBE8 60 00 00 01 */ ori r0, r0, 1 -/* 8012DBEC 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_8012DBF0: -/* 8012DBF0 7F E3 FB 78 */ mr r3, r31 -/* 8012DBF4 4B FF B3 69 */ bl setWolfAtnMoveDirection__9daAlink_cFv -/* 8012DBF8 7F E3 FB 78 */ mr r3, r31 -/* 8012DBFC 3C 80 80 39 */ lis r4, m__20daAlinkHIO_wlMove_c0@ha /* 0x8038EE28@ha */ -/* 8012DC00 38 84 EE 28 */ addi r4, r4, m__20daAlinkHIO_wlMove_c0@l /* 0x8038EE28@l */ -/* 8012DC04 C0 24 00 94 */ lfs f1, 0x94(r4) -/* 8012DC08 4B FF B5 0D */ bl setBlendWolfAtnMoveAnime__9daAlink_cFf -/* 8012DC0C 7F E3 FB 78 */ mr r3, r31 -/* 8012DC10 4B FF AB 89 */ bl checkWolfAtnWait__9daAlink_cFv -/* 8012DC14 2C 03 00 00 */ cmpwi r3, 0 -/* 8012DC18 41 82 00 14 */ beq lbl_8012DC2C -/* 8012DC1C 7F E3 FB 78 */ mr r3, r31 -/* 8012DC20 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010037@ha */ -/* 8012DC24 38 84 00 37 */ addi r4, r4, 0x0037 /* 0x00010037@l */ -/* 8012DC28 4B F9 14 91 */ bl voiceStartLevel__9daAlink_cFUl -lbl_8012DC2C: -/* 8012DC2C 38 60 00 01 */ li r3, 1 -lbl_8012DC30: -/* 8012DC30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012DC34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012DC38 7C 08 03 A6 */ mtlr r0 -/* 8012DC3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012DC40 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfAtnActorMove__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfAtnActorMove__9daAlink_cFv.s deleted file mode 100644 index 40634772d0b..00000000000 --- a/asm/d/a/d_a_alink/procWolfAtnActorMove__9daAlink_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_8012DC44: -/* 8012DC44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012DC48 7C 08 02 A6 */ mflr r0 -/* 8012DC4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012DC50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012DC54 7C 7F 1B 78 */ mr r31, r3 -/* 8012DC58 4B FF B3 05 */ bl setWolfAtnMoveDirection__9daAlink_cFv -/* 8012DC5C 7F E3 FB 78 */ mr r3, r31 -/* 8012DC60 38 80 00 00 */ li r4, 0 -/* 8012DC64 4B FF BE E1 */ bl checkNextActionWolf__9daAlink_cFi -/* 8012DC68 2C 03 00 00 */ cmpwi r3, 0 -/* 8012DC6C 40 82 00 84 */ bne lbl_8012DCF0 -/* 8012DC70 7F E3 FB 78 */ mr r3, r31 -/* 8012DC74 4B F8 5C 91 */ bl checkZeroSpeedF__9daAlink_cCFv -/* 8012DC78 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8012DC7C 41 82 00 3C */ beq lbl_8012DCB8 -/* 8012DC80 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 8012DC84 60 00 00 01 */ ori r0, r0, 1 -/* 8012DC88 90 1F 31 A0 */ stw r0, 0x31a0(r31) -/* 8012DC8C 7F E3 FB 78 */ mr r3, r31 -/* 8012DC90 4B FF E3 19 */ bl checkWolfWaitSlipPolygon__9daAlink_cFv -/* 8012DC94 2C 03 00 00 */ cmpwi r3, 0 -/* 8012DC98 41 82 00 2C */ beq lbl_8012DCC4 -/* 8012DC9C C0 3F 33 AC */ lfs f1, 0x33ac(r31) -/* 8012DCA0 C0 02 92 A4 */ lfs f0, lit_6021(r2) -/* 8012DCA4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8012DCA8 41 81 00 1C */ bgt lbl_8012DCC4 -/* 8012DCAC 7F E3 FB 78 */ mr r3, r31 -/* 8012DCB0 48 00 25 35 */ bl procWolfWaitSlipInit__9daAlink_cFv -/* 8012DCB4 48 00 00 40 */ b lbl_8012DCF4 -lbl_8012DCB8: -/* 8012DCB8 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 8012DCBC 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 8012DCC0 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_8012DCC4: -/* 8012DCC4 7F E3 FB 78 */ mr r3, r31 -/* 8012DCC8 C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 8012DCCC 4B FF B4 49 */ bl setBlendWolfAtnMoveAnime__9daAlink_cFf -/* 8012DCD0 7F E3 FB 78 */ mr r3, r31 -/* 8012DCD4 4B FF AA C5 */ bl checkWolfAtnWait__9daAlink_cFv -/* 8012DCD8 2C 03 00 00 */ cmpwi r3, 0 -/* 8012DCDC 41 82 00 14 */ beq lbl_8012DCF0 -/* 8012DCE0 7F E3 FB 78 */ mr r3, r31 -/* 8012DCE4 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010037@ha */ -/* 8012DCE8 38 84 00 37 */ addi r4, r4, 0x0037 /* 0x00010037@l */ -/* 8012DCEC 4B F9 13 CD */ bl voiceStartLevel__9daAlink_cFUl -lbl_8012DCF0: -/* 8012DCF0 38 60 00 01 */ li r3, 1 -lbl_8012DCF4: -/* 8012DCF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012DCF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012DCFC 7C 08 03 A6 */ mtlr r0 -/* 8012DD00 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012DD04 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfBackJumpLandInit__9daAlink_cFss.s b/asm/d/a/d_a_alink/procWolfBackJumpLandInit__9daAlink_cFss.s deleted file mode 100644 index 8225ac80ddc..00000000000 --- a/asm/d/a/d_a_alink/procWolfBackJumpLandInit__9daAlink_cFss.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8012E5F4: -/* 8012E5F4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8012E5F8 7C 08 02 A6 */ mflr r0 -/* 8012E5FC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8012E600 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012E604 48 23 3B D9 */ bl _savegpr_29 -/* 8012E608 7C 7D 1B 78 */ mr r29, r3 -/* 8012E60C 7C 9E 23 78 */ mr r30, r4 -/* 8012E610 7C BF 2B 78 */ mr r31, r5 -/* 8012E614 38 80 00 FA */ li r4, 0xfa -/* 8012E618 4B F9 39 55 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8012E61C 7F A3 EB 78 */ mr r3, r29 -/* 8012E620 38 80 00 67 */ li r4, 0x67 -/* 8012E624 3C A0 80 39 */ lis r5, m__24daAlinkHIO_wlBackJump_c0@ha /* 0x8038F010@ha */ -/* 8012E628 38 A5 F0 10 */ addi r5, r5, m__24daAlinkHIO_wlBackJump_c0@l /* 0x8038F010@l */ -/* 8012E62C 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8012E630 4B FF B2 19 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 8012E634 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8012E638 D0 1D 33 98 */ stfs f0, 0x3398(r29) -/* 8012E63C 38 00 00 04 */ li r0, 4 -/* 8012E640 98 1D 2F 9D */ stb r0, 0x2f9d(r29) -/* 8012E644 7F A3 EB 78 */ mr r3, r29 -/* 8012E648 38 80 00 02 */ li r4, 2 -/* 8012E64C 4B FF 2B 75 */ bl setFootEffectProcType__9daAlink_cFi -/* 8012E650 38 00 00 0A */ li r0, 0xa -/* 8012E654 98 1D 2F CC */ stb r0, 0x2fcc(r29) -/* 8012E658 B3 DD 30 12 */ sth r30, 0x3012(r29) -/* 8012E65C B3 FD 30 10 */ sth r31, 0x3010(r29) -/* 8012E660 7F A3 EB 78 */ mr r3, r29 -/* 8012E664 4B F8 76 01 */ bl setStepLandVibration__9daAlink_cFv -/* 8012E668 38 60 00 01 */ li r3, 1 -/* 8012E66C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012E670 48 23 3B B9 */ bl _restgpr_29 -/* 8012E674 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8012E678 7C 08 03 A6 */ mtlr r0 -/* 8012E67C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8012E680 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfBackJumpLand__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfBackJumpLand__9daAlink_cFv.s deleted file mode 100644 index 0dedfac658b..00000000000 --- a/asm/d/a/d_a_alink/procWolfBackJumpLand__9daAlink_cFv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_8012E684: -/* 8012E684 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012E688 7C 08 02 A6 */ mflr r0 -/* 8012E68C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012E690 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012E694 93 C1 00 08 */ stw r30, 8(r1) -/* 8012E698 7C 7E 1B 78 */ mr r30, r3 -/* 8012E69C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 8012E6A0 88 03 2F CC */ lbz r0, 0x2fcc(r3) -/* 8012E6A4 28 00 00 00 */ cmplwi r0, 0 -/* 8012E6A8 41 82 00 0C */ beq lbl_8012E6B4 -/* 8012E6AC 38 00 00 0A */ li r0, 0xa -/* 8012E6B0 98 1E 2F CC */ stb r0, 0x2fcc(r30) -lbl_8012E6B4: -/* 8012E6B4 7F C3 F3 78 */ mr r3, r30 -/* 8012E6B8 4B FF A8 A5 */ bl setWolfAtnMoveDirection__9daAlink_cFv -/* 8012E6BC A8 1E 30 10 */ lha r0, 0x3010(r30) -/* 8012E6C0 2C 00 00 00 */ cmpwi r0, 0 -/* 8012E6C4 41 82 00 0C */ beq lbl_8012E6D0 -/* 8012E6C8 7F C3 F3 78 */ mr r3, r30 -/* 8012E6CC 4B FF DC 3D */ bl checkWolfAtnDoCharge__9daAlink_cFv -lbl_8012E6D0: -/* 8012E6D0 7F E3 FB 78 */ mr r3, r31 -/* 8012E6D4 48 02 FD F9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8012E6D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8012E6DC 41 82 00 38 */ beq lbl_8012E714 -/* 8012E6E0 80 1E 06 14 */ lwz r0, 0x614(r30) -/* 8012E6E4 28 00 00 10 */ cmplwi r0, 0x10 -/* 8012E6E8 40 82 00 1C */ bne lbl_8012E704 -/* 8012E6EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8012E6F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8012E6F4 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8012E6F8 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8012E6FC 4B F1 9A 81 */ bl cutEnd__16dEvent_manager_cFi -/* 8012E700 48 00 00 38 */ b lbl_8012E738 -lbl_8012E704: -/* 8012E704 7F C3 F3 78 */ mr r3, r30 -/* 8012E708 38 80 00 00 */ li r4, 0 -/* 8012E70C 4B FF B4 39 */ bl checkNextActionWolf__9daAlink_cFi -/* 8012E710 48 00 00 28 */ b lbl_8012E738 -lbl_8012E714: -/* 8012E714 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8012E718 3C 60 80 39 */ lis r3, m__24daAlinkHIO_wlBackJump_c0@ha /* 0x8038F010@ha */ -/* 8012E71C 38 63 F0 10 */ addi r3, r3, m__24daAlinkHIO_wlBackJump_c0@l /* 0x8038F010@l */ -/* 8012E720 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 8012E724 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8012E728 40 81 00 10 */ ble lbl_8012E738 -/* 8012E72C 7F C3 F3 78 */ mr r3, r30 -/* 8012E730 38 80 00 01 */ li r4, 1 -/* 8012E734 4B FF B4 11 */ bl checkNextActionWolf__9daAlink_cFi -lbl_8012E738: -/* 8012E738 38 60 00 01 */ li r3, 1 -/* 8012E73C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012E740 83 C1 00 08 */ lwz r30, 8(r1) -/* 8012E744 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012E748 7C 08 03 A6 */ mtlr r0 -/* 8012E74C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012E750 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfBackJump__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfBackJump__9daAlink_cFv.s deleted file mode 100644 index 6215b3d7509..00000000000 --- a/asm/d/a/d_a_alink/procWolfBackJump__9daAlink_cFv.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_8012E508: -/* 8012E508 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012E50C 7C 08 02 A6 */ mflr r0 -/* 8012E510 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012E514 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012E518 7C 7F 1B 78 */ mr r31, r3 -/* 8012E51C 38 7F 04 E6 */ addi r3, r31, 0x4e6 -/* 8012E520 A8 9F 30 0C */ lha r4, 0x300c(r31) -/* 8012E524 3C A0 80 39 */ lis r5, m__23daAlinkHIO_wlAtnMove_c0@ha /* 0x8038EF70@ha */ -/* 8012E528 38 E5 EF 70 */ addi r7, r5, m__23daAlinkHIO_wlAtnMove_c0@l /* 0x8038EF70@l */ -/* 8012E52C A8 A7 00 04 */ lha r5, 4(r7) -/* 8012E530 A8 C7 00 00 */ lha r6, 0(r7) -/* 8012E534 A8 E7 00 02 */ lha r7, 2(r7) -/* 8012E538 48 14 20 09 */ bl cLib_addCalcAngleS__FPsssss -/* 8012E53C A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 8012E540 3C 63 00 01 */ addis r3, r3, 1 -/* 8012E544 38 03 80 00 */ addi r0, r3, -32768 -/* 8012E548 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 8012E54C A8 1F 30 10 */ lha r0, 0x3010(r31) -/* 8012E550 2C 00 00 00 */ cmpwi r0, 0 -/* 8012E554 41 82 00 0C */ beq lbl_8012E560 -/* 8012E558 7F E3 FB 78 */ mr r3, r31 -/* 8012E55C 4B FF DD AD */ bl checkWolfAtnDoCharge__9daAlink_cFv -lbl_8012E560: -/* 8012E560 7F E3 FB 78 */ mr r3, r31 -/* 8012E564 4B F9 71 9D */ bl backJumpSpeedDec__9daAlink_cFv -/* 8012E568 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8012E56C 48 02 FF 61 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8012E570 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8012E574 41 82 00 24 */ beq lbl_8012E598 -/* 8012E578 80 1F 19 9C */ lwz r0, 0x199c(r31) -/* 8012E57C 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 8012E580 41 82 00 18 */ beq lbl_8012E598 -/* 8012E584 7F E3 FB 78 */ mr r3, r31 -/* 8012E588 A8 9F 30 12 */ lha r4, 0x3012(r31) -/* 8012E58C A8 BF 30 10 */ lha r5, 0x3010(r31) -/* 8012E590 48 00 00 65 */ bl procWolfBackJumpLandInit__9daAlink_cFss -/* 8012E594 48 00 00 48 */ b lbl_8012E5DC -lbl_8012E598: -/* 8012E598 80 1F 06 14 */ lwz r0, 0x614(r31) -/* 8012E59C 28 00 00 10 */ cmplwi r0, 0x10 -/* 8012E5A0 41 82 00 3C */ beq lbl_8012E5DC -/* 8012E5A4 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 8012E5A8 C0 3F 34 FC */ lfs f1, 0x34fc(r31) -/* 8012E5AC 3C 60 80 39 */ lis r3, m__24daAlinkHIO_wlBackJump_c0@ha /* 0x8038F010@ha */ -/* 8012E5B0 38 A3 F0 10 */ addi r5, r3, m__24daAlinkHIO_wlBackJump_c0@l /* 0x8038F010@l */ -/* 8012E5B4 C0 05 00 30 */ lfs f0, 0x30(r5) -/* 8012E5B8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8012E5BC FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8012E5C0 40 80 00 1C */ bge lbl_8012E5DC -/* 8012E5C4 38 00 00 00 */ li r0, 0 -/* 8012E5C8 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 8012E5CC 7F E3 FB 78 */ mr r3, r31 -/* 8012E5D0 38 80 00 02 */ li r4, 2 -/* 8012E5D4 C0 25 00 34 */ lfs f1, 0x34(r5) -/* 8012E5D8 48 00 07 F9 */ bl procWolfFallInit__9daAlink_cFif -lbl_8012E5DC: -/* 8012E5DC 38 60 00 01 */ li r3, 1 -/* 8012E5E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012E5E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012E5E8 7C 08 03 A6 */ mtlr r0 -/* 8012E5EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012E5F0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfCargoCarryInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfCargoCarryInit__9daAlink_cFv.s deleted file mode 100644 index 3d07fa6e710..00000000000 --- a/asm/d/a/d_a_alink/procWolfCargoCarryInit__9daAlink_cFv.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_8013DB6C: -/* 8013DB6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013DB70 7C 08 02 A6 */ mflr r0 -/* 8013DB74 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013DB78 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8013DB7C 93 C1 00 08 */ stw r30, 8(r1) -/* 8013DB80 7C 7E 1B 78 */ mr r30, r3 -/* 8013DB84 38 80 01 38 */ li r4, 0x138 -/* 8013DB88 4B F8 52 1D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8013DB8C 2C 03 00 00 */ cmpwi r3, 0 -/* 8013DB90 40 82 00 0C */ bne lbl_8013DB9C -/* 8013DB94 38 60 00 01 */ li r3, 1 -/* 8013DB98 48 00 00 AC */ b lbl_8013DC44 -lbl_8013DB9C: -/* 8013DB9C C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8013DBA0 D0 3E 33 98 */ stfs f1, 0x3398(r30) -/* 8013DBA4 D0 3E 04 FC */ stfs f1, 0x4fc(r30) -/* 8013DBA8 7F C3 F3 78 */ mr r3, r30 -/* 8013DBAC C0 5E 05 34 */ lfs f2, 0x534(r30) -/* 8013DBB0 38 80 00 00 */ li r4, 0 -/* 8013DBB4 4B F7 DB BD */ bl setSpecialGravity__9daAlink_cFffi -/* 8013DBB8 88 1E 05 6A */ lbz r0, 0x56a(r30) -/* 8013DBBC 28 00 00 2C */ cmplwi r0, 0x2c -/* 8013DBC0 40 82 00 14 */ bne lbl_8013DBD4 -/* 8013DBC4 38 00 00 01 */ li r0, 1 -/* 8013DBC8 B0 1E 30 0C */ sth r0, 0x300c(r30) -/* 8013DBCC 3B E0 00 85 */ li r31, 0x85 -/* 8013DBD0 48 00 00 30 */ b lbl_8013DC00 -lbl_8013DBD4: -/* 8013DBD4 38 00 00 00 */ li r0, 0 -/* 8013DBD8 B0 1E 30 0C */ sth r0, 0x300c(r30) -/* 8013DBDC 3C 60 80 14 */ lis r3, daAlink_searchEnemyCargo__FP10fopAc_ac_cPv@ha /* 0x8013DB58@ha */ -/* 8013DBE0 38 63 DB 58 */ addi r3, r3, daAlink_searchEnemyCargo__FP10fopAc_ac_cPv@l /* 0x8013DB58@l */ -/* 8013DBE4 38 80 00 00 */ li r4, 0 -/* 8013DBE8 4B ED BC 11 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 8013DBEC 7C 64 1B 79 */ or. r4, r3, r3 -/* 8013DBF0 41 82 00 0C */ beq lbl_8013DBFC -/* 8013DBF4 38 7E 28 0C */ addi r3, r30, 0x280c -/* 8013DBF8 48 02 10 C1 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -lbl_8013DBFC: -/* 8013DBFC 3B E0 00 86 */ li r31, 0x86 -lbl_8013DC00: -/* 8013DC00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8013DC04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8013DC08 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8013DC0C 4B F0 AC 21 */ bl checkStartDemo__16dEvent_manager_cFv -/* 8013DC10 2C 03 00 00 */ cmpwi r3, 0 -/* 8013DC14 40 82 00 20 */ bne lbl_8013DC34 -/* 8013DC18 7F C3 F3 78 */ mr r3, r30 -/* 8013DC1C 3C 80 00 01 */ lis r4, 0x0001 /* 0x000100AE@ha */ -/* 8013DC20 38 84 00 AE */ addi r4, r4, 0x00AE /* 0x000100AE@l */ -/* 8013DC24 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 8013DC28 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 8013DC2C 7D 89 03 A6 */ mtctr r12 -/* 8013DC30 4E 80 04 21 */ bctrl -lbl_8013DC34: -/* 8013DC34 7F C3 F3 78 */ mr r3, r30 -/* 8013DC38 7F E4 FB 78 */ mr r4, r31 -/* 8013DC3C 4B FE BA 3D */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM -/* 8013DC40 38 60 00 01 */ li r3, 1 -lbl_8013DC44: -/* 8013DC44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8013DC48 83 C1 00 08 */ lwz r30, 8(r1) -/* 8013DC4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8013DC50 7C 08 03 A6 */ mtlr r0 -/* 8013DC54 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013DC58 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfChainReadyInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfChainReadyInit__9daAlink_cFv.s deleted file mode 100644 index 584f3b6ce78..00000000000 --- a/asm/d/a/d_a_alink/procWolfChainReadyInit__9daAlink_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8013E240: -/* 8013E240 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013E244 7C 08 02 A6 */ mflr r0 -/* 8013E248 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013E24C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8013E250 7C 7F 1B 78 */ mr r31, r3 -/* 8013E254 38 80 01 30 */ li r4, 0x130 -/* 8013E258 4B F8 3D 15 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8013E25C 38 7F 28 0C */ addi r3, r31, 0x280c -/* 8013E260 80 9F 27 F4 */ lwz r4, 0x27f4(r31) -/* 8013E264 48 02 0A 55 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -/* 8013E268 7F E3 FB 78 */ mr r3, r31 -/* 8013E26C 38 80 00 50 */ li r4, 0x50 -/* 8013E270 3C A0 80 39 */ lis r5, m__23daAlinkHIO_wlAtNjump_c0@ha /* 0x8038F578@ha */ -/* 8013E274 38 A5 F5 78 */ addi r5, r5, m__23daAlinkHIO_wlAtNjump_c0@l /* 0x8038F578@l */ -/* 8013E278 4B FE B5 D1 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 8013E27C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8013E280 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8013E284 38 00 00 00 */ li r0, 0 -/* 8013E288 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8013E28C B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 8013E290 38 60 00 01 */ li r3, 1 -/* 8013E294 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8013E298 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8013E29C 7C 08 03 A6 */ mtlr r0 -/* 8013E2A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013E2A4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfChainUpInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfChainUpInit__9daAlink_cFv.s deleted file mode 100644 index aa614586bfc..00000000000 --- a/asm/d/a/d_a_alink/procWolfChainUpInit__9daAlink_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8013DDF8: -/* 8013DDF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013DDFC 7C 08 02 A6 */ mflr r0 -/* 8013DE00 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013DE04 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8013DE08 7C 7F 1B 78 */ mr r31, r3 -/* 8013DE0C 4B FA 9B ED */ bl searchFmChainPos__9daAlink_cFv -/* 8013DE10 98 7F 2F A3 */ stb r3, 0x2fa3(r31) -/* 8013DE14 88 1F 2F A3 */ lbz r0, 0x2fa3(r31) -/* 8013DE18 28 00 00 00 */ cmplwi r0, 0 -/* 8013DE1C 40 82 00 10 */ bne lbl_8013DE2C -/* 8013DE20 7F E3 FB 78 */ mr r3, r31 -/* 8013DE24 4B FE F3 85 */ bl procWolfWaitInit__9daAlink_cFv -/* 8013DE28 48 00 00 34 */ b lbl_8013DE5C -lbl_8013DE2C: -/* 8013DE2C 7F E3 FB 78 */ mr r3, r31 -/* 8013DE30 38 80 01 2E */ li r4, 0x12e -/* 8013DE34 4B F8 41 39 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8013DE38 7F E3 FB 78 */ mr r3, r31 -/* 8013DE3C 38 80 00 4E */ li r4, 0x4e -/* 8013DE40 3C A0 80 39 */ lis r5, m__20daAlinkHIO_wlGrab_c0@ha /* 0x8038F95C@ha */ -/* 8013DE44 38 A5 F9 5C */ addi r5, r5, m__20daAlinkHIO_wlGrab_c0@l /* 0x8038F95C@l */ -/* 8013DE48 38 A5 00 28 */ addi r5, r5, 0x28 -/* 8013DE4C 4B FE B9 FD */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 8013DE50 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8013DE54 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8013DE58 38 60 00 01 */ li r3, 1 -lbl_8013DE5C: -/* 8013DE5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8013DE60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8013DE64 7C 08 03 A6 */ mtlr r0 -/* 8013DE68 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013DE6C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfChainUp__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfChainUp__9daAlink_cFv.s deleted file mode 100644 index 4319beabfff..00000000000 --- a/asm/d/a/d_a_alink/procWolfChainUp__9daAlink_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_8013DE70: -/* 8013DE70 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8013DE74 7C 08 02 A6 */ mflr r0 -/* 8013DE78 90 01 00 24 */ stw r0, 0x24(r1) -/* 8013DE7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8013DE80 48 22 43 5D */ bl _savegpr_29 -/* 8013DE84 7C 7D 1B 78 */ mr r29, r3 -/* 8013DE88 3B FD 1F D0 */ addi r31, r29, 0x1fd0 -/* 8013DE8C 38 80 00 96 */ li r4, 0x96 -/* 8013DE90 38 A0 00 02 */ li r5, 2 -/* 8013DE94 4B FA A0 3D */ bl setWallGrabStatus__9daAlink_cFUcUc -/* 8013DE98 7F E3 FB 78 */ mr r3, r31 -/* 8013DE9C 48 02 06 31 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8013DEA0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8013DEA4 40 82 00 2C */ bne lbl_8013DED0 -/* 8013DEA8 C0 3D 33 AC */ lfs f1, 0x33ac(r29) -/* 8013DEAC C0 02 92 A4 */ lfs f0, lit_6021(r2) -/* 8013DEB0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8013DEB4 40 81 00 60 */ ble lbl_8013DF14 -/* 8013DEB8 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8013DEBC 3C 60 80 39 */ lis r3, m__20daAlinkHIO_wlGrab_c0@ha /* 0x8038F95C@ha */ -/* 8013DEC0 38 63 F9 5C */ addi r3, r3, m__20daAlinkHIO_wlGrab_c0@l /* 0x8038F95C@l */ -/* 8013DEC4 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 8013DEC8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8013DECC 40 81 00 48 */ ble lbl_8013DF14 -lbl_8013DED0: -/* 8013DED0 8B DD 2F A3 */ lbz r30, 0x2fa3(r29) -/* 8013DED4 83 FD 28 48 */ lwz r31, 0x2848(r29) -/* 8013DED8 7F A3 EB 78 */ mr r3, r29 -/* 8013DEDC 4B FE F2 CD */ bl procWolfWaitInit__9daAlink_cFv -/* 8013DEE0 7F A3 EB 78 */ mr r3, r29 -/* 8013DEE4 3C 80 80 39 */ lis r4, m_wlAnmDataTable__9daAlink_c@ha /* 0x80391010@ha */ -/* 8013DEE8 38 84 10 10 */ addi r4, r4, m_wlAnmDataTable__9daAlink_c@l /* 0x80391010@l */ -/* 8013DEEC A0 84 04 50 */ lhz r4, 0x450(r4) -/* 8013DEF0 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8013DEF4 C0 42 92 C4 */ lfs f2, lit_6109(r2) -/* 8013DEF8 4B F6 F4 B1 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff -/* 8013DEFC 28 1F 00 00 */ cmplwi r31, 0 -/* 8013DF00 41 82 00 14 */ beq lbl_8013DF14 -/* 8013DF04 9B DD 2F A3 */ stb r30, 0x2fa3(r29) -/* 8013DF08 38 7D 28 44 */ addi r3, r29, 0x2844 -/* 8013DF0C 7F E4 FB 78 */ mr r4, r31 -/* 8013DF10 48 02 0D A9 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -lbl_8013DF14: -/* 8013DF14 38 60 00 01 */ li r3, 1 -/* 8013DF18 39 61 00 20 */ addi r11, r1, 0x20 -/* 8013DF1C 48 22 43 0D */ bl _restgpr_29 -/* 8013DF20 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8013DF24 7C 08 03 A6 */ mtlr r0 -/* 8013DF28 38 21 00 20 */ addi r1, r1, 0x20 -/* 8013DF2C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfDownAtMissLand__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfDownAtMissLand__9daAlink_cFv.s deleted file mode 100644 index 0329235043f..00000000000 --- a/asm/d/a/d_a_alink/procWolfDownAtMissLand__9daAlink_cFv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_8013BD54: -/* 8013BD54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013BD58 7C 08 02 A6 */ mflr r0 -/* 8013BD5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013BD60 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8013BD64 93 C1 00 08 */ stw r30, 8(r1) -/* 8013BD68 7C 7E 1B 78 */ mr r30, r3 -/* 8013BD6C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 8013BD70 4B FE DD 11 */ bl checkWolfGroundSpecialMode__9daAlink_cFv -/* 8013BD74 2C 03 00 00 */ cmpwi r3, 0 -/* 8013BD78 41 82 00 0C */ beq lbl_8013BD84 -/* 8013BD7C 38 60 00 01 */ li r3, 1 -/* 8013BD80 48 00 00 8C */ b lbl_8013BE0C -lbl_8013BD84: -/* 8013BD84 38 00 00 04 */ li r0, 4 -/* 8013BD88 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 8013BD8C 7F E3 FB 78 */ mr r3, r31 -/* 8013BD90 48 02 27 3D */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8013BD94 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8013BD98 41 82 00 14 */ beq lbl_8013BDAC -/* 8013BD9C 7F C3 F3 78 */ mr r3, r30 -/* 8013BDA0 38 80 00 00 */ li r4, 0 -/* 8013BDA4 4B FE DD A1 */ bl checkNextActionWolf__9daAlink_cFi -/* 8013BDA8 48 00 00 60 */ b lbl_8013BE08 -lbl_8013BDAC: -/* 8013BDAC C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8013BDB0 3C 60 80 39 */ lis r3, m__22daAlinkHIO_wlAtDown_c0@ha /* 0x8038F658@ha */ -/* 8013BDB4 38 63 F6 58 */ addi r3, r3, m__22daAlinkHIO_wlAtDown_c0@l /* 0x8038F658@l */ -/* 8013BDB8 C0 03 00 74 */ lfs f0, 0x74(r3) -/* 8013BDBC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8013BDC0 40 81 00 14 */ ble lbl_8013BDD4 -/* 8013BDC4 7F C3 F3 78 */ mr r3, r30 -/* 8013BDC8 38 80 00 01 */ li r4, 1 -/* 8013BDCC 4B FE DD 79 */ bl checkNextActionWolf__9daAlink_cFi -/* 8013BDD0 48 00 00 38 */ b lbl_8013BE08 -lbl_8013BDD4: -/* 8013BDD4 C0 02 92 C4 */ lfs f0, lit_6109(r2) -/* 8013BDD8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8013BDDC 4C 41 13 82 */ cror 2, 1, 2 -/* 8013BDE0 40 82 00 28 */ bne lbl_8013BE08 -/* 8013BDE4 C0 02 93 8C */ lfs f0, lit_8783(r2) -/* 8013BDE8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8013BDEC 40 80 00 1C */ bge lbl_8013BE08 -/* 8013BDF0 7F C3 F3 78 */ mr r3, r30 -/* 8013BDF4 3C 80 00 03 */ lis r4, 0x0003 /* 0x00030018@ha */ -/* 8013BDF8 38 84 00 18 */ addi r4, r4, 0x0018 /* 0x00030018@l */ -/* 8013BDFC 4B F8 33 D1 */ bl seStartMapInfoLevel__9daAlink_cFUl -/* 8013BE00 38 00 00 18 */ li r0, 0x18 -/* 8013BE04 98 1E 2F 9D */ stb r0, 0x2f9d(r30) -lbl_8013BE08: -/* 8013BE08 38 60 00 01 */ li r3, 1 -lbl_8013BE0C: -/* 8013BE0C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8013BE10 83 C1 00 08 */ lwz r30, 8(r1) -/* 8013BE14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8013BE18 7C 08 03 A6 */ mtlr r0 -/* 8013BE1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013BE20 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfEnemyHangBiteInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfEnemyHangBiteInit__9daAlink_cFv.s deleted file mode 100644 index 48e8ffa1bfb..00000000000 --- a/asm/d/a/d_a_alink/procWolfEnemyHangBiteInit__9daAlink_cFv.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_8013CCF4: -/* 8013CCF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013CCF8 7C 08 02 A6 */ mflr r0 -/* 8013CCFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013CD00 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8013CD04 7C 7F 1B 78 */ mr r31, r3 -/* 8013CD08 38 80 01 36 */ li r4, 0x136 -/* 8013CD0C 4B F8 52 61 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8013CD10 7F E3 FB 78 */ mr r3, r31 -/* 8013CD14 38 80 00 78 */ li r4, 0x78 -/* 8013CD18 3C A0 80 39 */ lis r5, m__22daAlinkHIO_wlAtBite_c0@ha /* 0x8038F748@ha */ -/* 8013CD1C 38 A5 F7 48 */ addi r5, r5, m__22daAlinkHIO_wlAtBite_c0@l /* 0x8038F748@l */ -/* 8013CD20 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8013CD24 4B FE CB 25 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 8013CD28 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8013CD2C D0 3F 33 98 */ stfs f1, 0x3398(r31) -/* 8013CD30 D0 3F 04 FC */ stfs f1, 0x4fc(r31) -/* 8013CD34 7F E3 FB 78 */ mr r3, r31 -/* 8013CD38 C0 5F 05 34 */ lfs f2, 0x534(r31) -/* 8013CD3C 38 80 00 00 */ li r4, 0 -/* 8013CD40 4B F7 EA 31 */ bl setSpecialGravity__9daAlink_cFffi -/* 8013CD44 7F E3 FB 78 */ mr r3, r31 -/* 8013CD48 80 9F 28 20 */ lwz r4, 0x2820(r31) -/* 8013CD4C 4B FF C8 B5 */ bl setWolfEnemyHangBitePos__9daAlink_cFP13fopEn_enemy_c -/* 8013CD50 2C 03 00 00 */ cmpwi r3, 0 -/* 8013CD54 40 82 00 10 */ bne lbl_8013CD64 -/* 8013CD58 7F E3 FB 78 */ mr r3, r31 -/* 8013CD5C 4B FF DA 91 */ bl procWolfJumpAttackKickInit__9daAlink_cFv -/* 8013CD60 48 00 00 78 */ b lbl_8013CDD8 -lbl_8013CD64: -/* 8013CD64 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 8013CD68 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 8013CD6C 38 00 00 50 */ li r0, 0x50 -/* 8013CD70 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 8013CD74 3C 60 80 39 */ lis r3, m__22daAlinkHIO_wlAtBite_c0@ha /* 0x8038F748@ha */ -/* 8013CD78 38 63 F7 48 */ addi r3, r3, m__22daAlinkHIO_wlAtBite_c0@l /* 0x8038F748@l */ -/* 8013CD7C A8 03 00 28 */ lha r0, 0x28(r3) -/* 8013CD80 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 8013CD84 38 00 00 00 */ li r0, 0 -/* 8013CD88 B0 1F 30 0A */ sth r0, 0x300a(r31) -/* 8013CD8C B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8013CD90 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 8013CD94 C0 03 00 40 */ lfs f0, 0x40(r3) -/* 8013CD98 D0 1F 34 78 */ stfs f0, 0x3478(r31) -/* 8013CD9C A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 8013CDA0 B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 8013CDA4 7F E3 FB 78 */ mr r3, r31 -/* 8013CDA8 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010044@ha */ -/* 8013CDAC 38 84 00 44 */ addi r4, r4, 0x0044 /* 0x00010044@l */ -/* 8013CDB0 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 8013CDB4 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 8013CDB8 7D 89 03 A6 */ mtctr r12 -/* 8013CDBC 4E 80 04 21 */ bctrl -/* 8013CDC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8013CDC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8013CDC8 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 8013CDCC 64 00 00 20 */ oris r0, r0, 0x20 -/* 8013CDD0 90 03 5F 1C */ stw r0, 0x5f1c(r3) -/* 8013CDD4 38 60 00 01 */ li r3, 1 -lbl_8013CDD8: -/* 8013CDD8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8013CDDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8013CDE0 7C 08 03 A6 */ mtlr r0 -/* 8013CDE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013CDE8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfEnemyThrow__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfEnemyThrow__9daAlink_cFv.s deleted file mode 100644 index 93500243d64..00000000000 --- a/asm/d/a/d_a_alink/procWolfEnemyThrow__9daAlink_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_8013CC5C: -/* 8013CC5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013CC60 7C 08 02 A6 */ mflr r0 -/* 8013CC64 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013CC68 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8013CC6C 93 C1 00 08 */ stw r30, 8(r1) -/* 8013CC70 7C 7E 1B 78 */ mr r30, r3 -/* 8013CC74 4B FE CE 0D */ bl checkWolfGroundSpecialMode__9daAlink_cFv -/* 8013CC78 2C 03 00 00 */ cmpwi r3, 0 -/* 8013CC7C 41 82 00 0C */ beq lbl_8013CC88 -/* 8013CC80 38 60 00 01 */ li r3, 1 -/* 8013CC84 48 00 00 58 */ b lbl_8013CCDC -lbl_8013CC88: -/* 8013CC88 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 8013CC8C 38 00 00 05 */ li r0, 5 -/* 8013CC90 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 8013CC94 7F E3 FB 78 */ mr r3, r31 -/* 8013CC98 48 02 18 35 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8013CC9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8013CCA0 41 82 00 14 */ beq lbl_8013CCB4 -/* 8013CCA4 7F C3 F3 78 */ mr r3, r30 -/* 8013CCA8 38 80 00 00 */ li r4, 0 -/* 8013CCAC 4B FE CE 99 */ bl checkNextActionWolf__9daAlink_cFi -/* 8013CCB0 48 00 00 28 */ b lbl_8013CCD8 -lbl_8013CCB4: -/* 8013CCB4 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8013CCB8 3C 60 80 39 */ lis r3, m__22daAlinkHIO_wlAtBite_c0@ha /* 0x8038F748@ha */ -/* 8013CCBC 38 63 F7 48 */ addi r3, r3, m__22daAlinkHIO_wlAtBite_c0@l /* 0x8038F748@l */ -/* 8013CCC0 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 8013CCC4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8013CCC8 40 81 00 10 */ ble lbl_8013CCD8 -/* 8013CCCC 7F C3 F3 78 */ mr r3, r30 -/* 8013CCD0 38 80 00 01 */ li r4, 1 -/* 8013CCD4 4B FE CE 71 */ bl checkNextActionWolf__9daAlink_cFi -lbl_8013CCD8: -/* 8013CCD8 38 60 00 01 */ li r3, 1 -lbl_8013CCDC: -/* 8013CCDC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8013CCE0 83 C1 00 08 */ lwz r30, 8(r1) -/* 8013CCE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8013CCE8 7C 08 03 A6 */ mtlr r0 -/* 8013CCEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013CCF0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfGiantPuzzleInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfGiantPuzzleInit__9daAlink_cFv.s deleted file mode 100644 index 00880d26fa9..00000000000 --- a/asm/d/a/d_a_alink/procWolfGiantPuzzleInit__9daAlink_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80135160: -/* 80135160 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80135164 7C 08 02 A6 */ mflr r0 -/* 80135168 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013516C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80135170 7C 7F 1B 78 */ mr r31, r3 -/* 80135174 38 80 01 37 */ li r4, 0x137 -/* 80135178 4B F8 DC 2D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8013517C 2C 03 00 00 */ cmpwi r3, 0 -/* 80135180 40 82 00 0C */ bne lbl_8013518C -/* 80135184 38 60 00 00 */ li r3, 0 -/* 80135188 48 00 00 5C */ b lbl_801351E4 -lbl_8013518C: -/* 8013518C 7F E3 FB 78 */ mr r3, r31 -/* 80135190 3C 80 80 39 */ lis r4, m__20daAlinkHIO_wlMove_c0@ha /* 0x8038EE28@ha */ -/* 80135194 38 84 EE 28 */ addi r4, r4, m__20daAlinkHIO_wlMove_c0@l /* 0x8038EE28@l */ -/* 80135198 C0 24 00 BC */ lfs f1, 0xbc(r4) -/* 8013519C 4B FF 36 A9 */ bl setBlendWolfMoveAnime__9daAlink_cFf -/* 801351A0 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 801351A4 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 801351A8 38 00 00 04 */ li r0, 4 -/* 801351AC 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 801351B0 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 801351B4 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 801351B8 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 801351BC D0 1F 34 78 */ stfs f0, 0x3478(r31) -/* 801351C0 3C 60 80 39 */ lis r3, m__23daAlinkHIO_wlMoveNoP_c0@ha /* 0x8038EF28@ha */ -/* 801351C4 38 63 EF 28 */ addi r3, r3, m__23daAlinkHIO_wlMoveNoP_c0@l /* 0x8038EF28@l */ -/* 801351C8 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 801351CC D0 1F 34 7C */ stfs f0, 0x347c(r31) -/* 801351D0 C0 03 00 08 */ lfs f0, 8(r3) -/* 801351D4 D0 1F 05 94 */ stfs f0, 0x594(r31) -/* 801351D8 7F E3 FB 78 */ mr r3, r31 -/* 801351DC 4B FF 2A D1 */ bl offWolfEyeUp__9daAlink_cFv -/* 801351E0 38 60 00 01 */ li r3, 1 -lbl_801351E4: -/* 801351E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801351E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801351EC 7C 08 03 A6 */ mtlr r0 -/* 801351F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801351F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfGrabPutInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfGrabPutInit__9daAlink_cFv.s deleted file mode 100644 index 437288d6e3d..00000000000 --- a/asm/d/a/d_a_alink/procWolfGrabPutInit__9daAlink_cFv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_8013D588: -/* 8013D588 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013D58C 7C 08 02 A6 */ mflr r0 -/* 8013D590 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013D594 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8013D598 93 C1 00 08 */ stw r30, 8(r1) -/* 8013D59C 7C 7E 1B 78 */ mr r30, r3 -/* 8013D5A0 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 8013D5A4 28 00 01 2C */ cmplwi r0, 0x12c -/* 8013D5A8 40 82 00 0C */ bne lbl_8013D5B4 -/* 8013D5AC 38 60 00 00 */ li r3, 0 -/* 8013D5B0 48 00 00 94 */ b lbl_8013D644 -lbl_8013D5B4: -/* 8013D5B4 A0 1E 1F BC */ lhz r0, 0x1fbc(r30) -/* 8013D5B8 20 00 02 DA */ subfic r0, r0, 0x2da -/* 8013D5BC 7C 00 00 34 */ cntlzw r0, r0 -/* 8013D5C0 54 1F DE 3E */ rlwinm r31, r0, 0x1b, 0x18, 0x1f -/* 8013D5C4 38 80 01 2C */ li r4, 0x12c -/* 8013D5C8 4B F8 49 A5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8013D5CC 2C 1F 00 00 */ cmpwi r31, 0 -/* 8013D5D0 41 82 00 38 */ beq lbl_8013D608 -/* 8013D5D4 7F C3 F3 78 */ mr r3, r30 -/* 8013D5D8 38 80 00 47 */ li r4, 0x47 -/* 8013D5DC 3C A0 80 39 */ lis r5, m__20daAlinkHIO_wlGrab_c0@ha /* 0x8038F95C@ha */ -/* 8013D5E0 38 A5 F9 5C */ addi r5, r5, m__20daAlinkHIO_wlGrab_c0@l /* 0x8038F95C@l */ -/* 8013D5E4 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8013D5E8 4B FE C2 61 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 8013D5EC C0 02 93 30 */ lfs f0, lit_7625(r2) -/* 8013D5F0 D0 1E 34 78 */ stfs f0, 0x3478(r30) -/* 8013D5F4 3C 60 80 39 */ lis r3, m__20daAlinkHIO_wlGrab_c0@ha /* 0x8038F95C@ha */ -/* 8013D5F8 38 63 F9 5C */ addi r3, r3, m__20daAlinkHIO_wlGrab_c0@l /* 0x8038F95C@l */ -/* 8013D5FC C0 03 00 24 */ lfs f0, 0x24(r3) -/* 8013D600 D0 1E 34 7C */ stfs f0, 0x347c(r30) -/* 8013D604 48 00 00 34 */ b lbl_8013D638 -lbl_8013D608: -/* 8013D608 7F C3 F3 78 */ mr r3, r30 -/* 8013D60C 38 80 00 4E */ li r4, 0x4e -/* 8013D610 3C A0 80 39 */ lis r5, m__20daAlinkHIO_wlGrab_c0@ha /* 0x8038F95C@ha */ -/* 8013D614 38 A5 F9 5C */ addi r5, r5, m__20daAlinkHIO_wlGrab_c0@l /* 0x8038F95C@l */ -/* 8013D618 38 A5 00 3C */ addi r5, r5, 0x3c -/* 8013D61C 4B FE C2 2D */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 8013D620 C0 02 93 74 */ lfs f0, lit_8502(r2) -/* 8013D624 D0 1E 34 78 */ stfs f0, 0x3478(r30) -/* 8013D628 3C 60 80 39 */ lis r3, m__20daAlinkHIO_wlGrab_c0@ha /* 0x8038F95C@ha */ -/* 8013D62C 38 63 F9 5C */ addi r3, r3, m__20daAlinkHIO_wlGrab_c0@l /* 0x8038F95C@l */ -/* 8013D630 C0 03 00 4C */ lfs f0, 0x4c(r3) -/* 8013D634 D0 1E 34 7C */ stfs f0, 0x347c(r30) -lbl_8013D638: -/* 8013D638 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8013D63C D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 8013D640 38 60 00 01 */ li r3, 1 -lbl_8013D644: -/* 8013D644 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8013D648 83 C1 00 08 */ lwz r30, 8(r1) -/* 8013D64C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8013D650 7C 08 03 A6 */ mtlr r0 -/* 8013D654 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013D658 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfGrabThrowInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfGrabThrowInit__9daAlink_cFv.s deleted file mode 100644 index 75251b370ba..00000000000 --- a/asm/d/a/d_a_alink/procWolfGrabThrowInit__9daAlink_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8013D818: -/* 8013D818 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013D81C 7C 08 02 A6 */ mflr r0 -/* 8013D820 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013D824 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8013D828 7C 7F 1B 78 */ mr r31, r3 -/* 8013D82C 38 80 01 2D */ li r4, 0x12d -/* 8013D830 4B F8 47 3D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8013D834 7F E3 FB 78 */ mr r3, r31 -/* 8013D838 38 80 00 4F */ li r4, 0x4f -/* 8013D83C 3C A0 80 39 */ lis r5, m__20daAlinkHIO_wlGrab_c0@ha /* 0x8038F95C@ha */ -/* 8013D840 38 A5 F9 5C */ addi r5, r5, m__20daAlinkHIO_wlGrab_c0@l /* 0x8038F95C@l */ -/* 8013D844 38 A5 00 50 */ addi r5, r5, 0x50 -/* 8013D848 4B FE C0 01 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 8013D84C A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 8013D850 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 8013D854 38 60 00 01 */ li r3, 1 -/* 8013D858 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8013D85C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8013D860 7C 08 03 A6 */ mtlr r0 -/* 8013D864 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013D868 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfGrabThrow__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfGrabThrow__9daAlink_cFv.s deleted file mode 100644 index 4b1382fb8f3..00000000000 --- a/asm/d/a/d_a_alink/procWolfGrabThrow__9daAlink_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_8013D86C: -/* 8013D86C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013D870 7C 08 02 A6 */ mflr r0 -/* 8013D874 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013D878 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8013D87C 93 C1 00 08 */ stw r30, 8(r1) -/* 8013D880 7C 7E 1B 78 */ mr r30, r3 -/* 8013D884 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 8013D888 38 7E 33 98 */ addi r3, r30, 0x3398 -/* 8013D88C C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8013D890 3C 80 80 39 */ lis r4, m__23daAlinkHIO_wlMoveNoP_c0@ha /* 0x8038EF28@ha */ -/* 8013D894 38 84 EF 28 */ addi r4, r4, m__23daAlinkHIO_wlMoveNoP_c0@l /* 0x8038EF28@l */ -/* 8013D898 C0 44 00 10 */ lfs f2, 0x10(r4) -/* 8013D89C 48 13 2E A5 */ bl cLib_chaseF__FPfff -/* 8013D8A0 7F C3 F3 78 */ mr r3, r30 -/* 8013D8A4 38 80 00 00 */ li r4, 0 -/* 8013D8A8 4B F7 5E 8D */ bl setShapeAngleToAtnActor__9daAlink_cFi -/* 8013D8AC A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 8013D8B0 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 8013D8B4 7F E3 FB 78 */ mr r3, r31 -/* 8013D8B8 C0 22 93 30 */ lfs f1, lit_7625(r2) -/* 8013D8BC 48 1E AB 71 */ bl checkPass__12J3DFrameCtrlFf -/* 8013D8C0 2C 03 00 00 */ cmpwi r3, 0 -/* 8013D8C4 41 82 00 0C */ beq lbl_8013D8D0 -/* 8013D8C8 7F C3 F3 78 */ mr r3, r30 -/* 8013D8CC 4B FA 7B 2D */ bl setGrabItemThrow__9daAlink_cFv -lbl_8013D8D0: -/* 8013D8D0 7F E3 FB 78 */ mr r3, r31 -/* 8013D8D4 48 02 0B F9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8013D8D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8013D8DC 41 82 00 14 */ beq lbl_8013D8F0 -/* 8013D8E0 7F C3 F3 78 */ mr r3, r30 -/* 8013D8E4 38 80 00 00 */ li r4, 0 -/* 8013D8E8 4B FE C2 5D */ bl checkNextActionWolf__9daAlink_cFi -/* 8013D8EC 48 00 00 28 */ b lbl_8013D914 -lbl_8013D8F0: -/* 8013D8F0 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8013D8F4 3C 60 80 39 */ lis r3, m__20daAlinkHIO_wlGrab_c0@ha /* 0x8038F95C@ha */ -/* 8013D8F8 38 63 F9 5C */ addi r3, r3, m__20daAlinkHIO_wlGrab_c0@l /* 0x8038F95C@l */ -/* 8013D8FC C0 03 00 60 */ lfs f0, 0x60(r3) -/* 8013D900 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8013D904 40 81 00 10 */ ble lbl_8013D914 -/* 8013D908 7F C3 F3 78 */ mr r3, r30 -/* 8013D90C 38 80 00 01 */ li r4, 1 -/* 8013D910 4B FE C2 35 */ bl checkNextActionWolf__9daAlink_cFi -lbl_8013D914: -/* 8013D914 38 60 00 01 */ li r3, 1 -/* 8013D918 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8013D91C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8013D920 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8013D924 7C 08 03 A6 */ mtlr r0 -/* 8013D928 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013D92C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfHangReadyInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfHangReadyInit__9daAlink_cFv.s deleted file mode 100644 index e7a16e67f2d..00000000000 --- a/asm/d/a/d_a_alink/procWolfHangReadyInit__9daAlink_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_801355EC: -/* 801355EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801355F0 7C 08 02 A6 */ mflr r0 -/* 801355F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801355F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801355FC 7C 7F 1B 78 */ mr r31, r3 -/* 80135600 38 80 01 03 */ li r4, 0x103 -/* 80135604 4B F8 C9 69 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80135608 7F E3 FB 78 */ mr r3, r31 -/* 8013560C 38 80 00 10 */ li r4, 0x10 -/* 80135610 3C A0 80 39 */ lis r5, m__24daAlinkHIO_wlWallHang_c0@ha /* 0x8038F1A0@ha */ -/* 80135614 38 C5 F1 A0 */ addi r6, r5, m__24daAlinkHIO_wlWallHang_c0@l /* 0x8038F1A0@l */ -/* 80135618 C0 26 00 04 */ lfs f1, 4(r6) -/* 8013561C C0 46 00 08 */ lfs f2, 8(r6) -/* 80135620 38 A0 00 0C */ li r5, 0xc -/* 80135624 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 80135628 4B FF 40 DD */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf -/* 8013562C 88 1F 2F 91 */ lbz r0, 0x2f91(r31) -/* 80135630 90 1F 31 98 */ stw r0, 0x3198(r31) -/* 80135634 A8 7F 30 6E */ lha r3, 0x306e(r31) -/* 80135638 3C 63 00 01 */ addis r3, r3, 1 -/* 8013563C 38 03 80 00 */ addi r0, r3, -32768 -/* 80135640 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 80135644 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 80135648 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8013564C D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 80135650 38 60 00 01 */ li r3, 1 -/* 80135654 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80135658 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8013565C 7C 08 03 A6 */ mtlr r0 -/* 80135660 38 21 00 10 */ addi r1, r1, 0x10 -/* 80135664 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfHangReady__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfHangReady__9daAlink_cFv.s deleted file mode 100644 index c72e4a113cd..00000000000 --- a/asm/d/a/d_a_alink/procWolfHangReady__9daAlink_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80135668: -/* 80135668 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013566C 7C 08 02 A6 */ mflr r0 -/* 80135670 90 01 00 14 */ stw r0, 0x14(r1) -/* 80135674 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80135678 7C 7F 1B 78 */ mr r31, r3 -/* 8013567C 38 7F 04 E6 */ addi r3, r31, 0x4e6 -/* 80135680 A8 9F 30 0C */ lha r4, 0x300c(r31) -/* 80135684 38 A0 00 02 */ li r5, 2 -/* 80135688 38 C0 10 00 */ li r6, 0x1000 -/* 8013568C 38 E0 04 00 */ li r7, 0x400 -/* 80135690 48 13 AE B1 */ bl cLib_addCalcAngleS__FPsssss -/* 80135694 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 80135698 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 8013569C 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 801356A0 48 02 8E 2D */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 801356A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801356A8 41 82 00 30 */ beq lbl_801356D8 -/* 801356AC A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 801356B0 B0 1F 04 E6 */ sth r0, 0x4e6(r31) -/* 801356B4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 801356B8 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 801356BC 7F E3 FB 78 */ mr r3, r31 -/* 801356C0 80 9F 31 98 */ lwz r4, 0x3198(r31) -/* 801356C4 48 00 00 2D */ bl procWolfHangWallCatchInit__9daAlink_cFi -/* 801356C8 2C 03 00 00 */ cmpwi r3, 0 -/* 801356CC 40 82 00 0C */ bne lbl_801356D8 -/* 801356D0 7F E3 FB 78 */ mr r3, r31 -/* 801356D4 4B F8 02 19 */ bl checkWaitAction__9daAlink_cFv -lbl_801356D8: -/* 801356D8 38 60 00 01 */ li r3, 1 -/* 801356DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801356E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801356E4 7C 08 03 A6 */ mtlr r0 -/* 801356E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801356EC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfHowlInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procWolfHowlInit__9daAlink_cFi.s deleted file mode 100644 index 894b73a4dd1..00000000000 --- a/asm/d/a/d_a_alink/procWolfHowlInit__9daAlink_cFi.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_8012E754: -/* 8012E754 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012E758 7C 08 02 A6 */ mflr r0 -/* 8012E75C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012E760 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012E764 93 C1 00 08 */ stw r30, 8(r1) -/* 8012E768 7C 7E 1B 78 */ mr r30, r3 -/* 8012E76C 7C 9F 23 78 */ mr r31, r4 -/* 8012E770 4B FE 74 B1 */ bl checkEventRun__9daAlink_cCFv -/* 8012E774 2C 03 00 00 */ cmpwi r3, 0 -/* 8012E778 41 82 00 18 */ beq lbl_8012E790 -/* 8012E77C A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) -/* 8012E780 28 00 00 FB */ cmplwi r0, 0xfb -/* 8012E784 40 82 00 0C */ bne lbl_8012E790 -/* 8012E788 38 60 00 00 */ li r3, 0 -/* 8012E78C 48 00 00 98 */ b lbl_8012E824 -lbl_8012E790: -/* 8012E790 7F C3 F3 78 */ mr r3, r30 -/* 8012E794 38 80 00 FB */ li r4, 0xfb -/* 8012E798 4B F9 37 D5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8012E79C 2C 1F 00 00 */ cmpwi r31, 0 -/* 8012E7A0 41 82 00 44 */ beq lbl_8012E7E4 -/* 8012E7A4 7F C3 F3 78 */ mr r3, r30 -/* 8012E7A8 38 80 00 5D */ li r4, 0x5d -/* 8012E7AC 3C A0 80 39 */ lis r5, m__20daAlinkHIO_wlHowl_c0@ha /* 0x8038F048@ha */ -/* 8012E7B0 38 A5 F0 48 */ addi r5, r5, m__20daAlinkHIO_wlHowl_c0@l /* 0x8038F048@l */ -/* 8012E7B4 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8012E7B8 4B FF B0 91 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 8012E7BC 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 8012E7C0 64 00 00 80 */ oris r0, r0, 0x80 -/* 8012E7C4 90 1E 31 A0 */ stw r0, 0x31a0(r30) -/* 8012E7C8 3C 60 80 39 */ lis r3, m__20daAlinkHIO_wlHowl_c0@ha /* 0x8038F048@ha */ -/* 8012E7CC 38 63 F0 48 */ addi r3, r3, m__20daAlinkHIO_wlHowl_c0@l /* 0x8038F048@l */ -/* 8012E7D0 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 8012E7D4 D0 1E 34 78 */ stfs f0, 0x3478(r30) -/* 8012E7D8 38 00 00 01 */ li r0, 1 -/* 8012E7DC B0 1E 30 0E */ sth r0, 0x300e(r30) -/* 8012E7E0 48 00 00 30 */ b lbl_8012E810 -lbl_8012E7E4: -/* 8012E7E4 7F C3 F3 78 */ mr r3, r30 -/* 8012E7E8 38 80 00 5C */ li r4, 0x5c -/* 8012E7EC 3C A0 80 39 */ lis r5, m__20daAlinkHIO_wlHowl_c0@ha /* 0x8038F048@ha */ -/* 8012E7F0 38 A5 F0 48 */ addi r5, r5, m__20daAlinkHIO_wlHowl_c0@l /* 0x8038F048@l */ -/* 8012E7F4 4B FF B0 55 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 8012E7F8 3C 60 80 39 */ lis r3, m__20daAlinkHIO_wlHowl_c0@ha /* 0x8038F048@ha */ -/* 8012E7FC 38 63 F0 48 */ addi r3, r3, m__20daAlinkHIO_wlHowl_c0@l /* 0x8038F048@l */ -/* 8012E800 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 8012E804 D0 1E 34 78 */ stfs f0, 0x3478(r30) -/* 8012E808 38 00 00 00 */ li r0, 0 -/* 8012E80C B0 1E 30 0E */ sth r0, 0x300e(r30) -lbl_8012E810: -/* 8012E810 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8012E814 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 8012E818 38 00 00 00 */ li r0, 0 -/* 8012E81C B0 1E 30 0C */ sth r0, 0x300c(r30) -/* 8012E820 38 60 00 01 */ li r3, 1 -lbl_8012E824: -/* 8012E824 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012E828 83 C1 00 08 */ lwz r30, 8(r1) -/* 8012E82C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012E830 7C 08 03 A6 */ mtlr r0 -/* 8012E834 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012E838 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfJumpAttackKickInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfJumpAttackKickInit__9daAlink_cFv.s deleted file mode 100644 index 7b3cc8c13a8..00000000000 --- a/asm/d/a/d_a_alink/procWolfJumpAttackKickInit__9daAlink_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_8013A7EC: -/* 8013A7EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013A7F0 7C 08 02 A6 */ mflr r0 -/* 8013A7F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013A7F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8013A7FC 7C 7F 1B 78 */ mr r31, r3 -/* 8013A800 38 80 01 1D */ li r4, 0x11d -/* 8013A804 4B F8 77 69 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8013A808 7F E3 FB 78 */ mr r3, r31 -/* 8013A80C 38 80 00 6C */ li r4, 0x6c -/* 8013A810 3C A0 80 39 */ lis r5, m__23daAlinkHIO_wlAtCjump_c0@ha /* 0x8038F5B4@ha */ -/* 8013A814 38 A5 F5 B4 */ addi r5, r5, m__23daAlinkHIO_wlAtCjump_c0@l /* 0x8038F5B4@l */ -/* 8013A818 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8013A81C 4B FE F0 2D */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 8013A820 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8013A824 D0 3F 04 FC */ stfs f1, 0x4fc(r31) -/* 8013A828 D0 3F 33 98 */ stfs f1, 0x3398(r31) -/* 8013A82C 7F E3 FB 78 */ mr r3, r31 -/* 8013A830 C0 5F 05 34 */ lfs f2, 0x534(r31) -/* 8013A834 38 80 00 00 */ li r4, 0 -/* 8013A838 4B F8 0F 39 */ bl setSpecialGravity__9daAlink_cFffi -/* 8013A83C 7F E3 FB 78 */ mr r3, r31 -/* 8013A840 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010038@ha */ -/* 8013A844 38 84 00 38 */ addi r4, r4, 0x0038 /* 0x00010038@l */ -/* 8013A848 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 8013A84C 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 8013A850 7D 89 03 A6 */ mtctr r12 -/* 8013A854 4E 80 04 21 */ bctrl -/* 8013A858 7F E3 FB 78 */ mr r3, r31 -/* 8013A85C 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020009@ha */ -/* 8013A860 38 84 00 09 */ addi r4, r4, 0x0009 /* 0x00020009@l */ -/* 8013A864 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 8013A868 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 8013A86C 7D 89 03 A6 */ mtctr r12 -/* 8013A870 4E 80 04 21 */ bctrl -/* 8013A874 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8013A878 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8013A87C 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 8013A880 64 00 00 20 */ oris r0, r0, 0x20 -/* 8013A884 90 03 5F 1C */ stw r0, 0x5f1c(r3) -/* 8013A888 38 60 00 01 */ li r3, 1 -/* 8013A88C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8013A890 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8013A894 7C 08 03 A6 */ mtlr r0 -/* 8013A898 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013A89C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfJumpAttackKick__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfJumpAttackKick__9daAlink_cFv.s deleted file mode 100644 index 43bcd1ec20e..00000000000 --- a/asm/d/a/d_a_alink/procWolfJumpAttackKick__9daAlink_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8013A8A0: -/* 8013A8A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013A8A4 7C 08 02 A6 */ mflr r0 -/* 8013A8A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013A8AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8013A8B0 7C 7F 1B 78 */ mr r31, r3 -/* 8013A8B4 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8013A8B8 48 02 3C 15 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8013A8BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8013A8C0 41 82 00 24 */ beq lbl_8013A8E4 -/* 8013A8C4 7F E3 FB 78 */ mr r3, r31 -/* 8013A8C8 38 80 00 02 */ li r4, 2 -/* 8013A8CC 4B FF 3A CD */ bl procWolfBackJumpInit__9daAlink_cFi -/* 8013A8D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8013A8D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8013A8D8 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 8013A8DC 64 00 00 20 */ oris r0, r0, 0x20 -/* 8013A8E0 90 03 5F 1C */ stw r0, 0x5f1c(r3) -lbl_8013A8E4: -/* 8013A8E4 38 60 00 01 */ li r3, 1 -/* 8013A8E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8013A8EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8013A8F0 7C 08 03 A6 */ mtlr r0 -/* 8013A8F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013A8F8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfJumpAttackNormalLandInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procWolfJumpAttackNormalLandInit__9daAlink_cFi.s deleted file mode 100644 index 4fe0e5c9814..00000000000 --- a/asm/d/a/d_a_alink/procWolfJumpAttackNormalLandInit__9daAlink_cFi.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_8013AC44: -/* 8013AC44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013AC48 7C 08 02 A6 */ mflr r0 -/* 8013AC4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013AC50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8013AC54 93 C1 00 08 */ stw r30, 8(r1) -/* 8013AC58 7C 7E 1B 78 */ mr r30, r3 -/* 8013AC5C 7C 9F 23 78 */ mr r31, r4 -/* 8013AC60 38 80 01 1F */ li r4, 0x11f -/* 8013AC64 4B F8 73 09 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8013AC68 7F C3 F3 78 */ mr r3, r30 -/* 8013AC6C 38 80 00 52 */ li r4, 0x52 -/* 8013AC70 3C A0 80 39 */ lis r5, m__22daAlinkHIO_wlAtLand_c0@ha /* 0x8038F618@ha */ -/* 8013AC74 38 A5 F6 18 */ addi r5, r5, m__22daAlinkHIO_wlAtLand_c0@l /* 0x8038F618@l */ -/* 8013AC78 4B FE EB D1 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 8013AC7C 7F C3 F3 78 */ mr r3, r30 -/* 8013AC80 38 80 00 02 */ li r4, 2 -/* 8013AC84 4B FE 65 3D */ bl setFootEffectProcType__9daAlink_cFi -/* 8013AC88 38 00 00 18 */ li r0, 0x18 -/* 8013AC8C 98 1E 2F 9D */ stb r0, 0x2f9d(r30) -/* 8013AC90 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8013AC94 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 8013AC98 38 00 00 00 */ li r0, 0 -/* 8013AC9C B0 1E 30 12 */ sth r0, 0x3012(r30) -/* 8013ACA0 B3 FE 30 0C */ sth r31, 0x300c(r30) -/* 8013ACA4 38 00 00 0C */ li r0, 0xc -/* 8013ACA8 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 8013ACAC 3C 60 80 39 */ lis r3, m__22daAlinkHIO_wlAttack_c0@ha /* 0x8038F7A4@ha */ -/* 8013ACB0 38 63 F7 A4 */ addi r3, r3, m__22daAlinkHIO_wlAttack_c0@l /* 0x8038F7A4@l */ -/* 8013ACB4 A8 03 00 16 */ lha r0, 0x16(r3) -/* 8013ACB8 B0 1E 30 7E */ sth r0, 0x307e(r30) -/* 8013ACBC 2C 1F 00 00 */ cmpwi r31, 0 -/* 8013ACC0 41 82 00 18 */ beq lbl_8013ACD8 -/* 8013ACC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8013ACC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8013ACCC 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 8013ACD0 64 00 00 20 */ oris r0, r0, 0x20 -/* 8013ACD4 90 03 5F 1C */ stw r0, 0x5f1c(r3) -lbl_8013ACD8: -/* 8013ACD8 38 60 00 01 */ li r3, 1 -/* 8013ACDC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8013ACE0 83 C1 00 08 */ lwz r30, 8(r1) -/* 8013ACE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8013ACE8 7C 08 03 A6 */ mtlr r0 -/* 8013ACEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013ACF0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfJumpAttackNormalLand__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfJumpAttackNormalLand__9daAlink_cFv.s deleted file mode 100644 index 13a2d52704c..00000000000 --- a/asm/d/a/d_a_alink/procWolfJumpAttackNormalLand__9daAlink_cFv.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_8013ACF4: -/* 8013ACF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013ACF8 7C 08 02 A6 */ mflr r0 -/* 8013ACFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013AD00 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8013AD04 93 C1 00 08 */ stw r30, 8(r1) -/* 8013AD08 7C 7E 1B 78 */ mr r30, r3 -/* 8013AD0C 4B FE ED 75 */ bl checkWolfGroundSpecialMode__9daAlink_cFv -/* 8013AD10 2C 03 00 00 */ cmpwi r3, 0 -/* 8013AD14 41 82 00 0C */ beq lbl_8013AD20 -/* 8013AD18 38 60 00 01 */ li r3, 1 -/* 8013AD1C 48 00 00 BC */ b lbl_8013ADD8 -lbl_8013AD20: -/* 8013AD20 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 8013AD24 38 00 00 04 */ li r0, 4 -/* 8013AD28 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 8013AD2C 38 7E 33 98 */ addi r3, r30, 0x3398 -/* 8013AD30 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8013AD34 3C 80 80 39 */ lis r4, m__23daAlinkHIO_wlMoveNoP_c0@ha /* 0x8038EF28@ha */ -/* 8013AD38 38 84 EF 28 */ addi r4, r4, m__23daAlinkHIO_wlMoveNoP_c0@l /* 0x8038EF28@l */ -/* 8013AD3C C0 44 00 10 */ lfs f2, 0x10(r4) -/* 8013AD40 48 13 5A 01 */ bl cLib_chaseF__FPfff -/* 8013AD44 7F C3 F3 78 */ mr r3, r30 -/* 8013AD48 4B F9 73 B5 */ bl setComboReserb__9daAlink_cFv -/* 8013AD4C 7F C3 F3 78 */ mr r3, r30 -/* 8013AD50 4B F9 79 35 */ bl checkCutTurnCharge__9daAlink_cFv -/* 8013AD54 7F E3 FB 78 */ mr r3, r31 -/* 8013AD58 48 02 37 75 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8013AD5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8013AD60 41 82 00 14 */ beq lbl_8013AD74 -/* 8013AD64 7F C3 F3 78 */ mr r3, r30 -/* 8013AD68 38 80 00 00 */ li r4, 0 -/* 8013AD6C 4B FE ED D9 */ bl checkNextActionWolf__9daAlink_cFi -/* 8013AD70 48 00 00 64 */ b lbl_8013ADD4 -lbl_8013AD74: -/* 8013AD74 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8013AD78 3C 60 80 39 */ lis r3, m__22daAlinkHIO_wlAtLand_c0@ha /* 0x8038F618@ha */ -/* 8013AD7C 38 63 F6 18 */ addi r3, r3, m__22daAlinkHIO_wlAtLand_c0@l /* 0x8038F618@l */ -/* 8013AD80 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 8013AD84 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8013AD88 40 81 00 4C */ ble lbl_8013ADD4 -/* 8013AD8C A8 1E 30 0C */ lha r0, 0x300c(r30) -/* 8013AD90 2C 00 00 00 */ cmpwi r0, 0 -/* 8013AD94 41 82 00 24 */ beq lbl_8013ADB8 -/* 8013AD98 A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 8013AD9C 3C 63 00 01 */ addis r3, r3, 1 -/* 8013ADA0 38 03 80 00 */ addi r0, r3, -32768 -/* 8013ADA4 B0 1E 04 E6 */ sth r0, 0x4e6(r30) -/* 8013ADA8 7F C3 F3 78 */ mr r3, r30 -/* 8013ADAC 38 80 00 03 */ li r4, 3 -/* 8013ADB0 4B FF F0 31 */ bl procWolfJumpAttackInit__9daAlink_cFi -/* 8013ADB4 48 00 00 24 */ b lbl_8013ADD8 -lbl_8013ADB8: -/* 8013ADB8 7F C3 F3 78 */ mr r3, r30 -/* 8013ADBC 38 80 00 01 */ li r4, 1 -/* 8013ADC0 4B FE ED 85 */ bl checkNextActionWolf__9daAlink_cFi -/* 8013ADC4 2C 03 00 00 */ cmpwi r3, 0 -/* 8013ADC8 41 82 00 0C */ beq lbl_8013ADD4 -/* 8013ADCC 38 60 00 01 */ li r3, 1 -/* 8013ADD0 48 00 00 08 */ b lbl_8013ADD8 -lbl_8013ADD4: -/* 8013ADD4 38 60 00 01 */ li r3, 1 -lbl_8013ADD8: -/* 8013ADD8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8013ADDC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8013ADE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8013ADE4 7C 08 03 A6 */ mtlr r0 -/* 8013ADE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013ADEC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfLandDamage__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfLandDamage__9daAlink_cFv.s deleted file mode 100644 index ccd51290530..00000000000 --- a/asm/d/a/d_a_alink/procWolfLandDamage__9daAlink_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_80136DE4: -/* 80136DE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80136DE8 7C 08 02 A6 */ mflr r0 -/* 80136DEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80136DF0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80136DF4 93 C1 00 08 */ stw r30, 8(r1) -/* 80136DF8 7C 7E 1B 78 */ mr r30, r3 -/* 80136DFC 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 80136E00 80 03 31 98 */ lwz r0, 0x3198(r3) -/* 80136E04 2C 00 00 00 */ cmpwi r0, 0 -/* 80136E08 41 82 00 4C */ beq lbl_80136E54 -/* 80136E0C 7F E3 FB 78 */ mr r3, r31 -/* 80136E10 48 02 76 BD */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 80136E14 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80136E18 41 82 00 14 */ beq lbl_80136E2C -/* 80136E1C 7F C3 F3 78 */ mr r3, r30 -/* 80136E20 38 80 00 00 */ li r4, 0 -/* 80136E24 4B FF 2D 21 */ bl checkNextActionWolf__9daAlink_cFi -/* 80136E28 48 00 00 80 */ b lbl_80136EA8 -lbl_80136E2C: -/* 80136E2C C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 80136E30 3C 60 80 39 */ lis r3, m__23daAlinkHIO_wlDamFall_c0@ha /* 0x8038F374@ha */ -/* 80136E34 38 63 F3 74 */ addi r3, r3, m__23daAlinkHIO_wlDamFall_c0@l /* 0x8038F374@l */ -/* 80136E38 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 80136E3C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80136E40 40 81 00 68 */ ble lbl_80136EA8 -/* 80136E44 7F C3 F3 78 */ mr r3, r30 -/* 80136E48 38 80 00 01 */ li r4, 1 -/* 80136E4C 4B FF 2C F9 */ bl checkNextActionWolf__9daAlink_cFi -/* 80136E50 48 00 00 58 */ b lbl_80136EA8 -lbl_80136E54: -/* 80136E54 7F E3 FB 78 */ mr r3, r31 -/* 80136E58 48 02 76 75 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 80136E5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80136E60 41 82 00 48 */ beq lbl_80136EA8 -/* 80136E64 A8 7E 30 08 */ lha r3, 0x3008(r30) -/* 80136E68 2C 03 00 00 */ cmpwi r3, 0 -/* 80136E6C 40 81 00 10 */ ble lbl_80136E7C -/* 80136E70 38 03 FF FF */ addi r0, r3, -1 -/* 80136E74 B0 1E 30 08 */ sth r0, 0x3008(r30) -/* 80136E78 48 00 00 30 */ b lbl_80136EA8 -lbl_80136E7C: -/* 80136E7C 7F C3 F3 78 */ mr r3, r30 -/* 80136E80 38 80 00 61 */ li r4, 0x61 -/* 80136E84 3C A0 80 39 */ lis r5, m__23daAlinkHIO_wlDamFall_c0@ha /* 0x8038F374@ha */ -/* 80136E88 38 A5 F3 74 */ addi r5, r5, m__23daAlinkHIO_wlDamFall_c0@l /* 0x8038F374@l */ -/* 80136E8C 38 A5 00 14 */ addi r5, r5, 0x14 -/* 80136E90 4B FF 29 B9 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 80136E94 7F C3 F3 78 */ mr r3, r30 -/* 80136E98 38 80 00 96 */ li r4, 0x96 -/* 80136E9C 4B F7 8A 05 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -/* 80136EA0 38 00 00 01 */ li r0, 1 -/* 80136EA4 90 1E 31 98 */ stw r0, 0x3198(r30) -lbl_80136EA8: -/* 80136EA8 38 60 00 01 */ li r3, 1 -/* 80136EAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80136EB0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80136EB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80136EB8 7C 08 03 A6 */ mtlr r0 -/* 80136EBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80136EC0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfLand__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfLand__9daAlink_cFv.s deleted file mode 100644 index 4e74b9b3169..00000000000 --- a/asm/d/a/d_a_alink/procWolfLand__9daAlink_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_8012F1F0: -/* 8012F1F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012F1F4 7C 08 02 A6 */ mflr r0 -/* 8012F1F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012F1FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012F200 93 C1 00 08 */ stw r30, 8(r1) -/* 8012F204 7C 7E 1B 78 */ mr r30, r3 -/* 8012F208 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 8012F20C A8 03 30 0C */ lha r0, 0x300c(r3) -/* 8012F210 2C 00 00 00 */ cmpwi r0, 0 -/* 8012F214 41 82 00 0C */ beq lbl_8012F220 -/* 8012F218 38 00 00 04 */ li r0, 4 -/* 8012F21C 98 1E 2F 99 */ stb r0, 0x2f99(r30) -lbl_8012F220: -/* 8012F220 7F E3 FB 78 */ mr r3, r31 -/* 8012F224 48 02 F2 A9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8012F228 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8012F22C 41 82 00 14 */ beq lbl_8012F240 -/* 8012F230 7F C3 F3 78 */ mr r3, r30 -/* 8012F234 38 80 00 00 */ li r4, 0 -/* 8012F238 4B FF A9 0D */ bl checkNextActionWolf__9daAlink_cFi -/* 8012F23C 48 00 00 20 */ b lbl_8012F25C -lbl_8012F240: -/* 8012F240 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8012F244 C0 1E 34 78 */ lfs f0, 0x3478(r30) -/* 8012F248 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8012F24C 40 81 00 10 */ ble lbl_8012F25C -/* 8012F250 7F C3 F3 78 */ mr r3, r30 -/* 8012F254 38 80 00 01 */ li r4, 1 -/* 8012F258 4B FF A8 ED */ bl checkNextActionWolf__9daAlink_cFi -lbl_8012F25C: -/* 8012F25C 38 60 00 01 */ li r3, 1 -/* 8012F260 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012F264 83 C1 00 08 */ lwz r30, 8(r1) -/* 8012F268 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012F26C 7C 08 03 A6 */ mtlr r0 -/* 8012F270 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012F274 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfMidnaRideShockInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfMidnaRideShockInit__9daAlink_cFv.s deleted file mode 100644 index 58142485885..00000000000 --- a/asm/d/a/d_a_alink/procWolfMidnaRideShockInit__9daAlink_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_8012D050: -/* 8012D050 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012D054 7C 08 02 A6 */ mflr r0 -/* 8012D058 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012D05C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012D060 7C 7F 1B 78 */ mr r31, r3 -/* 8012D064 80 03 05 74 */ lwz r0, 0x574(r3) -/* 8012D068 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8012D06C 40 82 00 24 */ bne lbl_8012D090 -/* 8012D070 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8012D074 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8012D078 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8012D07C 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8012D080 4B F1 B0 FD */ bl cutEnd__16dEvent_manager_cFi -/* 8012D084 7F E3 FB 78 */ mr r3, r31 -/* 8012D088 4B F9 63 31 */ bl procWaitInit__9daAlink_cFv -/* 8012D08C 48 00 00 64 */ b lbl_8012D0F0 -lbl_8012D090: -/* 8012D090 38 80 00 F0 */ li r4, 0xf0 -/* 8012D094 4B F9 5D 11 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8012D098 2C 03 00 00 */ cmpwi r3, 0 -/* 8012D09C 40 82 00 0C */ bne lbl_8012D0A8 -/* 8012D0A0 38 60 00 00 */ li r3, 0 -/* 8012D0A4 48 00 00 4C */ b lbl_8012D0F0 -lbl_8012D0A8: -/* 8012D0A8 7F E3 FB 78 */ mr r3, r31 -/* 8012D0AC 38 80 00 81 */ li r4, 0x81 -/* 8012D0B0 4B FF C5 C9 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM -/* 8012D0B4 7F E3 FB 78 */ mr r3, r31 -/* 8012D0B8 38 80 00 9F */ li r4, 0x9f -/* 8012D0BC 4B F8 27 E5 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -/* 8012D0C0 7F E3 FB 78 */ mr r3, r31 -/* 8012D0C4 3C 80 00 01 */ lis r4, 0x0001 /* 0x000100BC@ha */ -/* 8012D0C8 38 84 00 BC */ addi r4, r4, 0x00BC /* 0x000100BC@l */ -/* 8012D0CC 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 8012D0D0 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 8012D0D4 7D 89 03 A6 */ mtctr r12 -/* 8012D0D8 4E 80 04 21 */ bctrl -/* 8012D0DC C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8012D0E0 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8012D0E4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 8012D0E8 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 8012D0EC 38 60 00 01 */ li r3, 1 -lbl_8012D0F0: -/* 8012D0F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012D0F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012D0F8 7C 08 03 A6 */ mtlr r0 -/* 8012D0FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012D100 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfMidnaRideShock__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfMidnaRideShock__9daAlink_cFv.s deleted file mode 100644 index 7c6e8d4df93..00000000000 --- a/asm/d/a/d_a_alink/procWolfMidnaRideShock__9daAlink_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8012D104: -/* 8012D104 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012D108 7C 08 02 A6 */ mflr r0 -/* 8012D10C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012D110 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012D114 93 C1 00 08 */ stw r30, 8(r1) -/* 8012D118 7C 7E 1B 78 */ mr r30, r3 -/* 8012D11C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 8012D120 7F E3 FB 78 */ mr r3, r31 -/* 8012D124 48 03 13 A9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8012D128 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8012D12C 41 82 00 38 */ beq lbl_8012D164 -/* 8012D130 80 1E 06 14 */ lwz r0, 0x614(r30) -/* 8012D134 28 00 00 32 */ cmplwi r0, 0x32 -/* 8012D138 40 82 00 1C */ bne lbl_8012D154 -/* 8012D13C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8012D140 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8012D144 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8012D148 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8012D14C 4B F1 B0 31 */ bl cutEnd__16dEvent_manager_cFi -/* 8012D150 48 00 00 3C */ b lbl_8012D18C -lbl_8012D154: -/* 8012D154 7F C3 F3 78 */ mr r3, r30 -/* 8012D158 38 80 00 00 */ li r4, 0 -/* 8012D15C 4B FF C9 E9 */ bl checkNextActionWolf__9daAlink_cFi -/* 8012D160 48 00 00 2C */ b lbl_8012D18C -lbl_8012D164: -/* 8012D164 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8012D168 C0 02 94 B4 */ lfs f0, lit_17382(r2) -/* 8012D16C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8012D170 40 81 00 1C */ ble lbl_8012D18C -/* 8012D174 80 1E 06 14 */ lwz r0, 0x614(r30) -/* 8012D178 28 00 00 32 */ cmplwi r0, 0x32 -/* 8012D17C 41 82 00 10 */ beq lbl_8012D18C -/* 8012D180 7F C3 F3 78 */ mr r3, r30 -/* 8012D184 38 80 00 01 */ li r4, 1 -/* 8012D188 4B FF C9 BD */ bl checkNextActionWolf__9daAlink_cFi -lbl_8012D18C: -/* 8012D18C 38 60 00 01 */ li r3, 1 -/* 8012D190 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012D194 83 C1 00 08 */ lwz r30, 8(r1) -/* 8012D198 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012D19C 7C 08 03 A6 */ mtlr r0 -/* 8012D1A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012D1A4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfMoveInit__9daAlink_cFv.s deleted file mode 100644 index 39a30922796..00000000000 --- a/asm/d/a/d_a_alink/procWolfMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8012D380: -/* 8012D380 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012D384 7C 08 02 A6 */ mflr r0 -/* 8012D388 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012D38C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012D390 7C 7F 1B 78 */ mr r31, r3 -/* 8012D394 38 80 00 F2 */ li r4, 0xf2 -/* 8012D398 4B F9 5A 0D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8012D39C 2C 03 00 00 */ cmpwi r3, 0 -/* 8012D3A0 40 82 00 0C */ bne lbl_8012D3AC -/* 8012D3A4 38 60 00 00 */ li r3, 0 -/* 8012D3A8 48 00 00 28 */ b lbl_8012D3D0 -lbl_8012D3AC: -/* 8012D3AC 7F E3 FB 78 */ mr r3, r31 -/* 8012D3B0 3C 80 80 39 */ lis r4, m__20daAlinkHIO_wlMove_c0@ha /* 0x8038EE28@ha */ -/* 8012D3B4 38 84 EE 28 */ addi r4, r4, m__20daAlinkHIO_wlMove_c0@l /* 0x8038EE28@l */ -/* 8012D3B8 C0 24 00 94 */ lfs f1, 0x94(r4) -/* 8012D3BC 4B FF B4 89 */ bl setBlendWolfMoveAnime__9daAlink_cFf -/* 8012D3C0 7F E3 FB 78 */ mr r3, r31 -/* 8012D3C4 38 80 00 03 */ li r4, 3 -/* 8012D3C8 4B FF 3D F9 */ bl setFootEffectProcType__9daAlink_cFi -/* 8012D3CC 38 60 00 01 */ li r3, 1 -lbl_8012D3D0: -/* 8012D3D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012D3D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012D3D8 7C 08 03 A6 */ mtlr r0 -/* 8012D3DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012D3E0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfMove__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfMove__9daAlink_cFv.s deleted file mode 100644 index fff33adf5d1..00000000000 --- a/asm/d/a/d_a_alink/procWolfMove__9daAlink_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8012D3E4: -/* 8012D3E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012D3E8 7C 08 02 A6 */ mflr r0 -/* 8012D3EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012D3F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012D3F4 7C 7F 1B 78 */ mr r31, r3 -/* 8012D3F8 38 80 00 00 */ li r4, 0 -/* 8012D3FC 4B FF C7 49 */ bl checkNextActionWolf__9daAlink_cFi -/* 8012D400 2C 03 00 00 */ cmpwi r3, 0 -/* 8012D404 40 82 00 58 */ bne lbl_8012D45C -/* 8012D408 7F E3 FB 78 */ mr r3, r31 -/* 8012D40C 4B F8 96 25 */ bl checkFrontWallTypeAction__9daAlink_cFv -/* 8012D410 2C 03 00 00 */ cmpwi r3, 0 -/* 8012D414 40 82 00 48 */ bne lbl_8012D45C -/* 8012D418 80 1F 06 14 */ lwz r0, 0x614(r31) -/* 8012D41C 28 00 00 02 */ cmplwi r0, 2 -/* 8012D420 40 82 00 28 */ bne lbl_8012D448 -/* 8012D424 C0 5F 33 98 */ lfs f2, 0x3398(r31) -/* 8012D428 C0 3F 05 94 */ lfs f1, 0x594(r31) -/* 8012D42C 3C 60 80 39 */ lis r3, m__23daAlinkHIO_wlMoveNoP_c0@ha /* 0x8038EF28@ha */ -/* 8012D430 38 63 EF 28 */ addi r3, r3, m__23daAlinkHIO_wlMoveNoP_c0@l /* 0x8038EF28@l */ -/* 8012D434 C0 03 00 28 */ lfs f0, 0x28(r3) -/* 8012D438 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8012D43C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8012D440 40 81 00 08 */ ble lbl_8012D448 -/* 8012D444 D0 1F 33 98 */ stfs f0, 0x3398(r31) -lbl_8012D448: -/* 8012D448 7F E3 FB 78 */ mr r3, r31 -/* 8012D44C C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 8012D450 4B FF B3 F5 */ bl setBlendWolfMoveAnime__9daAlink_cFf -/* 8012D454 A8 1F 2F EC */ lha r0, 0x2fec(r31) -/* 8012D458 B0 1F 30 A2 */ sth r0, 0x30a2(r31) -lbl_8012D45C: -/* 8012D45C 38 60 00 01 */ li r3, 1 -/* 8012D460 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012D464 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012D468 7C 08 03 A6 */ mtlr r0 -/* 8012D46C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012D470 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfPush__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfPush__9daAlink_cFv.s deleted file mode 100644 index ad6f305d7c8..00000000000 --- a/asm/d/a/d_a_alink/procWolfPush__9daAlink_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_8013DA8C: -/* 8013DA8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013DA90 7C 08 02 A6 */ mflr r0 -/* 8013DA94 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013DA98 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8013DA9C 93 C1 00 08 */ stw r30, 8(r1) -/* 8013DAA0 7C 7E 1B 78 */ mr r30, r3 -/* 8013DAA4 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 8013DAA8 38 00 00 04 */ li r0, 4 -/* 8013DAAC 98 03 2F 99 */ stb r0, 0x2f99(r3) -/* 8013DAB0 7F E3 FB 78 */ mr r3, r31 -/* 8013DAB4 48 02 0A 19 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8013DAB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8013DABC 41 82 00 4C */ beq lbl_8013DB08 -/* 8013DAC0 A8 1E 30 0C */ lha r0, 0x300c(r30) -/* 8013DAC4 2C 00 00 00 */ cmpwi r0, 0 -/* 8013DAC8 41 82 00 30 */ beq lbl_8013DAF8 -/* 8013DACC 7F C3 F3 78 */ mr r3, r30 -/* 8013DAD0 38 80 00 08 */ li r4, 8 -/* 8013DAD4 C0 22 92 B8 */ lfs f1, lit_6040(r2) -/* 8013DAD8 C0 42 92 C0 */ lfs f2, lit_6108(r2) -/* 8013DADC A8 BE 30 0E */ lha r5, 0x300e(r30) -/* 8013DAE0 C0 62 92 C4 */ lfs f3, lit_6109(r2) -/* 8013DAE4 4B FE BC 21 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf -/* 8013DAE8 38 00 00 00 */ li r0, 0 -/* 8013DAEC 98 1E 1F D4 */ stb r0, 0x1fd4(r30) -/* 8013DAF0 B0 1E 30 0C */ sth r0, 0x300c(r30) -/* 8013DAF4 48 00 00 48 */ b lbl_8013DB3C -lbl_8013DAF8: -/* 8013DAF8 7F C3 F3 78 */ mr r3, r30 -/* 8013DAFC 38 80 00 00 */ li r4, 0 -/* 8013DB00 4B FE C0 45 */ bl checkNextActionWolf__9daAlink_cFi -/* 8013DB04 48 00 00 38 */ b lbl_8013DB3C -lbl_8013DB08: -/* 8013DB08 A8 1E 30 0C */ lha r0, 0x300c(r30) -/* 8013DB0C 2C 00 00 00 */ cmpwi r0, 0 -/* 8013DB10 40 82 00 2C */ bne lbl_8013DB3C -/* 8013DB14 7F E3 FB 78 */ mr r3, r31 -/* 8013DB18 C0 22 97 B8 */ lfs f1, lit_52470(r2) -/* 8013DB1C 48 1E A9 11 */ bl checkPass__12J3DFrameCtrlFf -/* 8013DB20 2C 03 00 00 */ cmpwi r3, 0 -/* 8013DB24 41 82 00 18 */ beq lbl_8013DB3C -/* 8013DB28 80 7E 28 10 */ lwz r3, 0x2810(r30) -/* 8013DB2C 28 03 00 00 */ cmplwi r3, 0 -/* 8013DB30 41 82 00 0C */ beq lbl_8013DB3C -/* 8013DB34 38 80 00 00 */ li r4, 0 -/* 8013DB38 4B ED F0 11 */ bl fopAcM_setCarryNow__FP10fopAc_ac_ci -lbl_8013DB3C: -/* 8013DB3C 38 60 00 01 */ li r3, 1 -/* 8013DB40 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8013DB44 83 C1 00 08 */ lwz r30, 8(r1) -/* 8013DB48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8013DB4C 7C 08 03 A6 */ mtlr r0 -/* 8013DB50 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013DB54 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfRollAttackChargeInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfRollAttackChargeInit__9daAlink_cFv.s deleted file mode 100644 index 565c9db0c43..00000000000 --- a/asm/d/a/d_a_alink/procWolfRollAttackChargeInit__9daAlink_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801398A8: -/* 801398A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801398AC 7C 08 02 A6 */ mflr r0 -/* 801398B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801398B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801398B8 7C 7F 1B 78 */ mr r31, r3 -/* 801398BC 38 80 01 1A */ li r4, 0x11a -/* 801398C0 4B F8 86 AD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 801398C4 7F E3 FB 78 */ mr r3, r31 -/* 801398C8 38 80 00 6E */ li r4, 0x6e -/* 801398CC C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 801398D0 3C A0 80 39 */ lis r5, m__22daAlinkHIO_wlAttack_c0@ha /* 0x8038F7A4@ha */ -/* 801398D4 38 A5 F7 A4 */ addi r5, r5, m__22daAlinkHIO_wlAttack_c0@l /* 0x8038F7A4@l */ -/* 801398D8 C0 45 00 20 */ lfs f2, 0x20(r5) -/* 801398DC 4B FE FD FD */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff -/* 801398E0 7F E3 FB 78 */ mr r3, r31 -/* 801398E4 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010037@ha */ -/* 801398E8 38 84 00 37 */ addi r4, r4, 0x0037 /* 0x00010037@l */ -/* 801398EC 4B F8 57 CD */ bl voiceStartLevel__9daAlink_cFUl -/* 801398F0 38 60 00 01 */ li r3, 1 -/* 801398F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801398F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801398FC 7C 08 03 A6 */ mtlr r0 -/* 80139900 38 21 00 10 */ addi r1, r1, 0x10 -/* 80139904 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfRollAttackCharge__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfRollAttackCharge__9daAlink_cFv.s deleted file mode 100644 index 76ae0b3dedf..00000000000 --- a/asm/d/a/d_a_alink/procWolfRollAttackCharge__9daAlink_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_80139908: -/* 80139908 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013990C 7C 08 02 A6 */ mflr r0 -/* 80139910 90 01 00 14 */ stw r0, 0x14(r1) -/* 80139914 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80139918 7C 7F 1B 78 */ mr r31, r3 -/* 8013991C 4B FF 01 65 */ bl checkWolfGroundSpecialMode__9daAlink_cFv -/* 80139920 2C 03 00 00 */ cmpwi r3, 0 -/* 80139924 41 82 00 0C */ beq lbl_80139930 -/* 80139928 38 60 00 01 */ li r3, 1 -/* 8013992C 48 00 00 84 */ b lbl_801399B0 -lbl_80139930: -/* 80139930 7F E3 FB 78 */ mr r3, r31 -/* 80139934 38 80 00 08 */ li r4, 8 -/* 80139938 4B F7 8C B1 */ bl itemButtonCheck__9daAlink_cFUc -/* 8013993C 2C 03 00 00 */ cmpwi r3, 0 -/* 80139940 40 82 00 10 */ bne lbl_80139950 -/* 80139944 7F E3 FB 78 */ mr r3, r31 -/* 80139948 4B FF FA 5D */ bl checkWolfAttackAction__9daAlink_cFv -/* 8013994C 48 00 00 60 */ b lbl_801399AC -lbl_80139950: -/* 80139950 80 7F 20 60 */ lwz r3, 0x2060(r31) -/* 80139954 C0 23 00 0C */ lfs f1, 0xc(r3) -/* 80139958 C0 02 93 A0 */ lfs f0, lit_9054(r2) -/* 8013995C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80139960 40 80 00 10 */ bge lbl_80139970 -/* 80139964 7F E3 FB 78 */ mr r3, r31 -/* 80139968 48 00 00 5D */ bl procWolfRollAttackMoveInit__9daAlink_cFv -/* 8013996C 48 00 00 40 */ b lbl_801399AC -lbl_80139970: -/* 80139970 38 7F 33 98 */ addi r3, r31, 0x3398 -/* 80139974 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 80139978 3C 80 80 39 */ lis r4, m__23daAlinkHIO_wlMoveNoP_c0@ha /* 0x8038EF28@ha */ -/* 8013997C 38 84 EF 28 */ addi r4, r4, m__23daAlinkHIO_wlMoveNoP_c0@l /* 0x8038EF28@l */ -/* 80139980 C0 44 00 10 */ lfs f2, 0x10(r4) -/* 80139984 48 13 6D BD */ bl cLib_chaseF__FPfff -/* 80139988 7F E3 FB 78 */ mr r3, r31 -/* 8013998C 38 80 00 00 */ li r4, 0 -/* 80139990 4B F7 9D A5 */ bl setShapeAngleToAtnActor__9daAlink_cFi -/* 80139994 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 80139998 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 8013999C 7F E3 FB 78 */ mr r3, r31 -/* 801399A0 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010037@ha */ -/* 801399A4 38 84 00 37 */ addi r4, r4, 0x0037 /* 0x00010037@l */ -/* 801399A8 4B F8 57 11 */ bl voiceStartLevel__9daAlink_cFUl -lbl_801399AC: -/* 801399AC 38 60 00 01 */ li r3, 1 -lbl_801399B0: -/* 801399B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801399B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801399B8 7C 08 03 A6 */ mtlr r0 -/* 801399BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801399C0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfRollAttackMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfRollAttackMoveInit__9daAlink_cFv.s deleted file mode 100644 index e957f147e0a..00000000000 --- a/asm/d/a/d_a_alink/procWolfRollAttackMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_801399C4: -/* 801399C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801399C8 7C 08 02 A6 */ mflr r0 -/* 801399CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801399D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801399D4 7C 7F 1B 78 */ mr r31, r3 -/* 801399D8 38 80 01 1B */ li r4, 0x11b -/* 801399DC 4B F8 85 91 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 801399E0 7F E3 FB 78 */ mr r3, r31 -/* 801399E4 4B F7 9F 21 */ bl checkZeroSpeedF__9daAlink_cCFv -/* 801399E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801399EC 41 82 00 10 */ beq lbl_801399FC -/* 801399F0 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 801399F4 60 00 00 01 */ ori r0, r0, 1 -/* 801399F8 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_801399FC: -/* 801399FC 3C 60 80 39 */ lis r3, m__22daAlinkHIO_wlAttack_c0@ha /* 0x8038F7A4@ha */ -/* 80139A00 38 63 F7 A4 */ addi r3, r3, m__22daAlinkHIO_wlAttack_c0@l /* 0x8038F7A4@l */ -/* 80139A04 A8 03 00 14 */ lha r0, 0x14(r3) -/* 80139A08 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 80139A0C 3C 60 80 39 */ lis r3, m__22daAlinkHIO_wlAtLock_c0@ha /* 0x8038F6F4@ha */ -/* 80139A10 38 63 F6 F4 */ addi r3, r3, m__22daAlinkHIO_wlAtLock_c0@l /* 0x8038F6F4@l */ -/* 80139A14 A8 03 00 28 */ lha r0, 0x28(r3) -/* 80139A18 B0 1F 30 0A */ sth r0, 0x300a(r31) -/* 80139A1C 38 00 00 1E */ li r0, 0x1e -/* 80139A20 B0 1F 30 12 */ sth r0, 0x3012(r31) -/* 80139A24 38 00 00 00 */ li r0, 0 -/* 80139A28 90 1F 31 98 */ stw r0, 0x3198(r31) -/* 80139A2C A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 80139A30 B0 1F 2F E4 */ sth r0, 0x2fe4(r31) -/* 80139A34 7F E3 FB 78 */ mr r3, r31 -/* 80139A38 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010037@ha */ -/* 80139A3C 38 84 00 37 */ addi r4, r4, 0x0037 /* 0x00010037@l */ -/* 80139A40 4B F8 56 79 */ bl voiceStartLevel__9daAlink_cFUl -/* 80139A44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80139A48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80139A4C 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 80139A50 64 00 40 00 */ oris r0, r0, 0x4000 -/* 80139A54 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 80139A58 38 60 00 01 */ li r3, 1 -/* 80139A5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80139A60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80139A64 7C 08 03 A6 */ mtlr r0 -/* 80139A68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80139A6C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfRopeSubjectivityInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfRopeSubjectivityInit__9daAlink_cFv.s deleted file mode 100644 index 6904fa006d4..00000000000 --- a/asm/d/a/d_a_alink/procWolfRopeSubjectivityInit__9daAlink_cFv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_8013384C: -/* 8013384C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80133850 7C 08 02 A6 */ mflr r0 -/* 80133854 90 01 00 14 */ stw r0, 0x14(r1) -/* 80133858 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8013385C 7C 7F 1B 78 */ mr r31, r3 -/* 80133860 38 80 01 17 */ li r4, 0x117 -/* 80133864 4B F8 E7 09 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80133868 7F E3 FB 78 */ mr r3, r31 -/* 8013386C 38 80 00 21 */ li r4, 0x21 -/* 80133870 4B FF 4F 9D */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM -/* 80133874 2C 03 00 00 */ cmpwi r3, 0 -/* 80133878 40 82 00 20 */ bne lbl_80133898 -/* 8013387C 7F E3 FB 78 */ mr r3, r31 -/* 80133880 38 80 00 21 */ li r4, 0x21 -/* 80133884 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 80133888 3C A0 80 39 */ lis r5, m__20daAlinkHIO_wlRope_c0@ha /* 0x8038F46C@ha */ -/* 8013388C 38 A5 F4 6C */ addi r5, r5, m__20daAlinkHIO_wlRope_c0@l /* 0x8038F46C@l */ -/* 80133890 C0 45 00 20 */ lfs f2, 0x20(r5) -/* 80133894 4B FF 5E 45 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff -lbl_80133898: -/* 80133898 7F E3 FB 78 */ mr r3, r31 -/* 8013389C 4B FF E1 55 */ bl initWolfRopeShapeAngle__9daAlink_cFv -/* 801338A0 B0 7F 30 0C */ sth r3, 0x300c(r31) -/* 801338A4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 801338A8 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 801338AC 7F E3 FB 78 */ mr r3, r31 -/* 801338B0 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 801338B4 C0 5F 05 34 */ lfs f2, 0x534(r31) -/* 801338B8 38 80 00 00 */ li r4, 0 -/* 801338BC 4B F8 7E B5 */ bl setSpecialGravity__9daAlink_cFffi -/* 801338C0 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 801338C4 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 801338C8 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 801338CC 7F E3 FB 78 */ mr r3, r31 -/* 801338D0 4B FF DE 49 */ bl setWolfRopePosY__9daAlink_cFv -/* 801338D4 7C 64 1B 78 */ mr r4, r3 -/* 801338D8 7F E3 FB 78 */ mr r3, r31 -/* 801338DC 4B FF E2 21 */ bl setWolfRopeOffsetY__9daAlink_cFi -/* 801338E0 38 60 00 00 */ li r3, 0 -/* 801338E4 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 801338E8 28 00 02 DA */ cmplwi r0, 0x2da -/* 801338EC 41 82 00 10 */ beq lbl_801338FC -/* 801338F0 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 801338F4 28 00 02 DB */ cmplwi r0, 0x2db -/* 801338F8 40 82 00 08 */ bne lbl_80133900 -lbl_801338FC: -/* 801338FC 38 60 00 01 */ li r3, 1 -lbl_80133900: -/* 80133900 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80133904 41 82 00 0C */ beq lbl_80133910 -/* 80133908 38 00 E8 00 */ li r0, -6144 -/* 8013390C B0 1F 30 A0 */ sth r0, 0x30a0(r31) -lbl_80133910: -/* 80133910 7F E3 FB 78 */ mr r3, r31 -/* 80133914 4B F9 B1 E1 */ bl setSubjectMode__9daAlink_cFv -/* 80133918 38 60 00 01 */ li r3, 1 -/* 8013391C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80133920 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80133924 7C 08 03 A6 */ mtlr r0 -/* 80133928 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013392C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfScreamWaitInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfScreamWaitInit__9daAlink_cFv.s deleted file mode 100644 index 73117d9e3e0..00000000000 --- a/asm/d/a/d_a_alink/procWolfScreamWaitInit__9daAlink_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80136F54: -/* 80136F54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80136F58 7C 08 02 A6 */ mflr r0 -/* 80136F5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80136F60 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80136F64 7C 7F 1B 78 */ mr r31, r3 -/* 80136F68 38 80 01 0A */ li r4, 0x10a -/* 80136F6C 4B F8 B0 01 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80136F70 80 1F 05 8C */ lwz r0, 0x58c(r31) -/* 80136F74 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80136F78 41 82 00 10 */ beq lbl_80136F88 -/* 80136F7C 7F E3 FB 78 */ mr r3, r31 -/* 80136F80 4B FF FF 45 */ bl setWolfScreamWaitAnime__9daAlink_cFv -/* 80136F84 48 00 00 30 */ b lbl_80136FB4 -lbl_80136F88: -/* 80136F88 7F E3 FB 78 */ mr r3, r31 -/* 80136F8C 38 80 00 00 */ li r4, 0 -/* 80136F90 3C A0 80 39 */ lis r5, m__23daAlinkHIO_wlMoveNoP_c0@ha /* 0x8038EF28@ha */ -/* 80136F94 38 A5 EF 28 */ addi r5, r5, m__23daAlinkHIO_wlMoveNoP_c0@l /* 0x8038EF28@l */ -/* 80136F98 C0 25 00 14 */ lfs f1, 0x14(r5) -/* 80136F9C 3C A0 80 39 */ lis r5, m__20daAlinkHIO_wlMove_c0@ha /* 0x8038EE28@ha */ -/* 80136FA0 38 A5 EE 28 */ addi r5, r5, m__20daAlinkHIO_wlMove_c0@l /* 0x8038EE28@l */ -/* 80136FA4 C0 45 00 BC */ lfs f2, 0xbc(r5) -/* 80136FA8 4B FF 27 31 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff -/* 80136FAC 38 00 00 00 */ li r0, 0 -/* 80136FB0 B0 1F 30 0C */ sth r0, 0x300c(r31) -lbl_80136FB4: -/* 80136FB4 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 80136FB8 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 80136FBC 38 00 00 00 */ li r0, 0 -/* 80136FC0 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 80136FC4 3C 60 80 42 */ lis r3, l_wolfBaseAnime@ha /* 0x8042561C@ha */ -/* 80136FC8 C4 03 56 1C */ lfsu f0, l_wolfBaseAnime@l(r3) /* 0x8042561C@l */ -/* 80136FCC D0 1F 35 88 */ stfs f0, 0x3588(r31) -/* 80136FD0 C0 03 00 04 */ lfs f0, 4(r3) -/* 80136FD4 D0 1F 35 8C */ stfs f0, 0x358c(r31) -/* 80136FD8 C0 03 00 08 */ lfs f0, 8(r3) -/* 80136FDC D0 1F 35 90 */ stfs f0, 0x3590(r31) -/* 80136FE0 38 60 00 01 */ li r3, 1 -/* 80136FE4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80136FE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80136FEC 7C 08 03 A6 */ mtlr r0 -/* 80136FF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80136FF4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfScreamWait__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfScreamWait__9daAlink_cFv.s deleted file mode 100644 index 5bca903d10f..00000000000 --- a/asm/d/a/d_a_alink/procWolfScreamWait__9daAlink_cFv.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_80136FF8: -/* 80136FF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80136FFC 7C 08 02 A6 */ mflr r0 -/* 80137000 90 01 00 14 */ stw r0, 0x14(r1) -/* 80137004 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80137008 93 C1 00 08 */ stw r30, 8(r1) -/* 8013700C 7C 7E 1B 78 */ mr r30, r3 -/* 80137010 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 80137014 80 83 05 8C */ lwz r4, 0x58c(r3) -/* 80137018 54 80 07 FF */ clrlwi. r0, r4, 0x1f -/* 8013701C 40 82 00 94 */ bne lbl_801370B0 -/* 80137020 A8 1E 30 0E */ lha r0, 0x300e(r30) -/* 80137024 2C 00 00 00 */ cmpwi r0, 0 -/* 80137028 41 82 00 54 */ beq lbl_8013707C -/* 8013702C 38 00 00 05 */ li r0, 5 -/* 80137030 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 80137034 7F E3 FB 78 */ mr r3, r31 -/* 80137038 48 02 74 95 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8013703C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80137040 41 82 00 14 */ beq lbl_80137054 -/* 80137044 7F C3 F3 78 */ mr r3, r30 -/* 80137048 38 80 00 00 */ li r4, 0 -/* 8013704C 4B FF 2A F9 */ bl checkNextActionWolf__9daAlink_cFi -/* 80137050 48 00 00 78 */ b lbl_801370C8 -lbl_80137054: -/* 80137054 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 80137058 3C 60 80 39 */ lis r3, m__24daAlinkHIO_wlDamLarge_c0@ha /* 0x8038F29C@ha */ -/* 8013705C 38 63 F2 9C */ addi r3, r3, m__24daAlinkHIO_wlDamLarge_c0@l /* 0x8038F29C@l */ -/* 80137060 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 80137064 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80137068 40 81 00 60 */ ble lbl_801370C8 -/* 8013706C 7F C3 F3 78 */ mr r3, r30 -/* 80137070 38 80 00 01 */ li r4, 1 -/* 80137074 4B FF 2A D1 */ bl checkNextActionWolf__9daAlink_cFi -/* 80137078 48 00 00 50 */ b lbl_801370C8 -lbl_8013707C: -/* 8013707C 38 00 00 01 */ li r0, 1 -/* 80137080 B0 1E 30 0E */ sth r0, 0x300e(r30) -/* 80137084 38 80 00 2C */ li r4, 0x2c -/* 80137088 3C A0 80 39 */ lis r5, m__24daAlinkHIO_wlDamLarge_c0@ha /* 0x8038F29C@ha */ -/* 8013708C 38 C5 F2 9C */ addi r6, r5, m__24daAlinkHIO_wlDamLarge_c0@l /* 0x8038F29C@l */ -/* 80137090 C0 26 00 04 */ lfs f1, 4(r6) -/* 80137094 C0 42 93 78 */ lfs f2, lit_8676(r2) -/* 80137098 A8 A6 00 00 */ lha r5, 0(r6) -/* 8013709C C0 66 00 0C */ lfs f3, 0xc(r6) -/* 801370A0 4B FF 26 65 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf -/* 801370A4 38 00 00 0D */ li r0, 0xd -/* 801370A8 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 801370AC 48 00 00 1C */ b lbl_801370C8 -lbl_801370B0: -/* 801370B0 A8 1E 30 0C */ lha r0, 0x300c(r30) -/* 801370B4 2C 00 00 00 */ cmpwi r0, 0 -/* 801370B8 40 82 00 10 */ bne lbl_801370C8 -/* 801370BC 54 80 07 BD */ rlwinm. r0, r4, 0, 0x1e, 0x1e -/* 801370C0 41 82 00 08 */ beq lbl_801370C8 -/* 801370C4 4B FF FE 01 */ bl setWolfScreamWaitAnime__9daAlink_cFv -lbl_801370C8: -/* 801370C8 38 60 00 01 */ li r3, 1 -/* 801370CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801370D0 83 C1 00 08 */ lwz r30, 8(r1) -/* 801370D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801370D8 7C 08 03 A6 */ mtlr r0 -/* 801370DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801370E0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfSideStepLandInit__9daAlink_cFs.s b/asm/d/a/d_a_alink/procWolfSideStepLandInit__9daAlink_cFs.s deleted file mode 100644 index 819c485e8e8..00000000000 --- a/asm/d/a/d_a_alink/procWolfSideStepLandInit__9daAlink_cFs.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_8012E1E8: -/* 8012E1E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012E1EC 7C 08 02 A6 */ mflr r0 -/* 8012E1F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012E1F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012E1F8 93 C1 00 08 */ stw r30, 8(r1) -/* 8012E1FC 7C 7E 1B 78 */ mr r30, r3 -/* 8012E200 7C 9F 23 78 */ mr r31, r4 -/* 8012E204 38 80 00 F8 */ li r4, 0xf8 -/* 8012E208 4B F9 3D 65 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8012E20C 88 1E 2F 98 */ lbz r0, 0x2f98(r30) -/* 8012E210 28 00 00 01 */ cmplwi r0, 1 -/* 8012E214 40 82 00 38 */ bne lbl_8012E24C -/* 8012E218 7F C3 F3 78 */ mr r3, r30 -/* 8012E21C 38 80 00 4D */ li r4, 0x4d -/* 8012E220 3C A0 80 39 */ lis r5, m__24daAlinkHIO_wlSideStep_c0@ha /* 0x8038EFA8@ha */ -/* 8012E224 38 A5 EF A8 */ addi r5, r5, m__24daAlinkHIO_wlSideStep_c0@l /* 0x8038EFA8@l */ -/* 8012E228 38 A5 00 3C */ addi r5, r5, 0x3c -/* 8012E22C 4B FF B6 1D */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 8012E230 3C 60 80 39 */ lis r3, m__24daAlinkHIO_wlSideStep_c0@ha /* 0x8038EFA8@ha */ -/* 8012E234 38 63 EF A8 */ addi r3, r3, m__24daAlinkHIO_wlSideStep_c0@l /* 0x8038EFA8@l */ -/* 8012E238 C0 03 00 4C */ lfs f0, 0x4c(r3) -/* 8012E23C D0 1E 34 78 */ stfs f0, 0x3478(r30) -/* 8012E240 38 00 00 0A */ li r0, 0xa -/* 8012E244 98 1E 2F CC */ stb r0, 0x2fcc(r30) -/* 8012E248 48 00 00 44 */ b lbl_8012E28C -lbl_8012E24C: -/* 8012E24C 38 00 00 00 */ li r0, 0 -/* 8012E250 98 1E 2F CC */ stb r0, 0x2fcc(r30) -/* 8012E254 7F C3 F3 78 */ mr r3, r30 -/* 8012E258 88 1E 2F 98 */ lbz r0, 0x2f98(r30) -/* 8012E25C 28 00 00 02 */ cmplwi r0, 2 -/* 8012E260 38 80 00 4B */ li r4, 0x4b -/* 8012E264 40 82 00 08 */ bne lbl_8012E26C -/* 8012E268 38 80 00 49 */ li r4, 0x49 -lbl_8012E26C: -/* 8012E26C 3C A0 80 39 */ lis r5, m__24daAlinkHIO_wlSideStep_c0@ha /* 0x8038EFA8@ha */ -/* 8012E270 38 A5 EF A8 */ addi r5, r5, m__24daAlinkHIO_wlSideStep_c0@l /* 0x8038EFA8@l */ -/* 8012E274 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8012E278 4B FF B5 D1 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 8012E27C 3C 60 80 39 */ lis r3, m__24daAlinkHIO_wlSideStep_c0@ha /* 0x8038EFA8@ha */ -/* 8012E280 38 63 EF A8 */ addi r3, r3, m__24daAlinkHIO_wlSideStep_c0@l /* 0x8038EFA8@l */ -/* 8012E284 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 8012E288 D0 1E 34 78 */ stfs f0, 0x3478(r30) -lbl_8012E28C: -/* 8012E28C B3 FE 30 12 */ sth r31, 0x3012(r30) -/* 8012E290 38 00 00 04 */ li r0, 4 -/* 8012E294 98 1E 2F 9D */ stb r0, 0x2f9d(r30) -/* 8012E298 7F C3 F3 78 */ mr r3, r30 -/* 8012E29C 38 80 00 02 */ li r4, 2 -/* 8012E2A0 4B FF 2F 21 */ bl setFootEffectProcType__9daAlink_cFi -/* 8012E2A4 80 1E 05 84 */ lwz r0, 0x584(r30) -/* 8012E2A8 60 00 00 0C */ ori r0, r0, 0xc -/* 8012E2AC 90 1E 05 84 */ stw r0, 0x584(r30) -/* 8012E2B0 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8012E2B4 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 8012E2B8 7F C3 F3 78 */ mr r3, r30 -/* 8012E2BC 4B F8 79 A9 */ bl setStepLandVibration__9daAlink_cFv -/* 8012E2C0 38 60 00 01 */ li r3, 1 -/* 8012E2C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012E2C8 83 C1 00 08 */ lwz r30, 8(r1) -/* 8012E2CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012E2D0 7C 08 03 A6 */ mtlr r0 -/* 8012E2D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012E2D8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfSideStepLand__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfSideStepLand__9daAlink_cFv.s deleted file mode 100644 index 0282b6c58a6..00000000000 --- a/asm/d/a/d_a_alink/procWolfSideStepLand__9daAlink_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_8012E2DC: -/* 8012E2DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012E2E0 7C 08 02 A6 */ mflr r0 -/* 8012E2E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012E2E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012E2EC 93 C1 00 08 */ stw r30, 8(r1) -/* 8012E2F0 7C 7E 1B 78 */ mr r30, r3 -/* 8012E2F4 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 8012E2F8 88 03 2F CC */ lbz r0, 0x2fcc(r3) -/* 8012E2FC 28 00 00 00 */ cmplwi r0, 0 -/* 8012E300 41 82 00 0C */ beq lbl_8012E30C -/* 8012E304 38 00 00 0A */ li r0, 0xa -/* 8012E308 98 1E 2F CC */ stb r0, 0x2fcc(r30) -lbl_8012E30C: -/* 8012E30C 7F C3 F3 78 */ mr r3, r30 -/* 8012E310 4B FF AC 4D */ bl setWolfAtnMoveDirection__9daAlink_cFv -/* 8012E314 7F C3 F3 78 */ mr r3, r30 -/* 8012E318 4B FF DF F1 */ bl checkWolfAtnDoCharge__9daAlink_cFv -/* 8012E31C 7F E3 FB 78 */ mr r3, r31 -/* 8012E320 48 03 01 AD */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8012E324 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8012E328 41 82 00 38 */ beq lbl_8012E360 -/* 8012E32C 80 1E 06 14 */ lwz r0, 0x614(r30) -/* 8012E330 28 00 00 10 */ cmplwi r0, 0x10 -/* 8012E334 40 82 00 1C */ bne lbl_8012E350 -/* 8012E338 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8012E33C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8012E340 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8012E344 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8012E348 4B F1 9E 35 */ bl cutEnd__16dEvent_manager_cFi -/* 8012E34C 48 00 00 30 */ b lbl_8012E37C -lbl_8012E350: -/* 8012E350 7F C3 F3 78 */ mr r3, r30 -/* 8012E354 38 80 00 00 */ li r4, 0 -/* 8012E358 4B FF B7 ED */ bl checkNextActionWolf__9daAlink_cFi -/* 8012E35C 48 00 00 20 */ b lbl_8012E37C -lbl_8012E360: -/* 8012E360 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8012E364 C0 1E 34 78 */ lfs f0, 0x3478(r30) -/* 8012E368 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8012E36C 40 81 00 10 */ ble lbl_8012E37C -/* 8012E370 7F C3 F3 78 */ mr r3, r30 -/* 8012E374 38 80 00 01 */ li r4, 1 -/* 8012E378 4B FF B7 CD */ bl checkNextActionWolf__9daAlink_cFi -lbl_8012E37C: -/* 8012E37C 38 60 00 01 */ li r3, 1 -/* 8012E380 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012E384 83 C1 00 08 */ lwz r30, 8(r1) -/* 8012E388 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012E38C 7C 08 03 A6 */ mtlr r0 -/* 8012E390 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012E394 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfSitInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procWolfSitInit__9daAlink_cFi.s deleted file mode 100644 index 14fa57ab316..00000000000 --- a/asm/d/a/d_a_alink/procWolfSitInit__9daAlink_cFi.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_8012F278: -/* 8012F278 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012F27C 7C 08 02 A6 */ mflr r0 -/* 8012F280 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012F284 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012F288 93 C1 00 08 */ stw r30, 8(r1) -/* 8012F28C 7C 7E 1B 78 */ mr r30, r3 -/* 8012F290 7C 9F 23 78 */ mr r31, r4 -/* 8012F294 38 80 00 FF */ li r4, 0xff -/* 8012F298 4B F9 3B 0D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8012F29C 2C 03 00 00 */ cmpwi r3, 0 -/* 8012F2A0 40 82 00 0C */ bne lbl_8012F2AC -/* 8012F2A4 38 60 00 00 */ li r3, 0 -/* 8012F2A8 48 00 00 98 */ b lbl_8012F340 -lbl_8012F2AC: -/* 8012F2AC 2C 1F 00 00 */ cmpwi r31, 0 -/* 8012F2B0 41 82 00 4C */ beq lbl_8012F2FC -/* 8012F2B4 7F C3 F3 78 */ mr r3, r30 -/* 8012F2B8 38 80 00 0E */ li r4, 0xe -/* 8012F2BC 4B FF 95 51 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM -/* 8012F2C0 2C 03 00 00 */ cmpwi r3, 0 -/* 8012F2C4 40 82 00 38 */ bne lbl_8012F2FC -/* 8012F2C8 7F C3 F3 78 */ mr r3, r30 -/* 8012F2CC 38 80 00 5D */ li r4, 0x5d -/* 8012F2D0 4B FF 95 3D */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM -/* 8012F2D4 2C 03 00 00 */ cmpwi r3, 0 -/* 8012F2D8 40 82 00 24 */ bne lbl_8012F2FC -/* 8012F2DC 7F C3 F3 78 */ mr r3, r30 -/* 8012F2E0 38 80 00 0B */ li r4, 0xb -/* 8012F2E4 3C A0 80 39 */ lis r5, m__19daAlinkHIO_wlLie_c0@ha /* 0x8038F138@ha */ -/* 8012F2E8 38 A5 F1 38 */ addi r5, r5, m__19daAlinkHIO_wlLie_c0@l /* 0x8038F138@l */ -/* 8012F2EC 4B FF A5 5D */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 8012F2F0 38 00 00 00 */ li r0, 0 -/* 8012F2F4 90 1E 31 98 */ stw r0, 0x3198(r30) -/* 8012F2F8 48 00 00 3C */ b lbl_8012F334 -lbl_8012F2FC: -/* 8012F2FC 38 00 00 01 */ li r0, 1 -/* 8012F300 90 1E 31 98 */ stw r0, 0x3198(r30) -/* 8012F304 7F C3 F3 78 */ mr r3, r30 -/* 8012F308 38 80 00 0E */ li r4, 0xe -/* 8012F30C 4B FF 95 01 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM -/* 8012F310 2C 03 00 00 */ cmpwi r3, 0 -/* 8012F314 40 82 00 20 */ bne lbl_8012F334 -/* 8012F318 7F C3 F3 78 */ mr r3, r30 -/* 8012F31C 38 80 00 0E */ li r4, 0xe -/* 8012F320 3C A0 80 39 */ lis r5, m__19daAlinkHIO_wlLie_c0@ha /* 0x8038F138@ha */ -/* 8012F324 38 A5 F1 38 */ addi r5, r5, m__19daAlinkHIO_wlLie_c0@l /* 0x8038F138@l */ -/* 8012F328 C0 25 00 44 */ lfs f1, 0x44(r5) -/* 8012F32C C0 45 00 48 */ lfs f2, 0x48(r5) -/* 8012F330 4B FF A3 A9 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff -lbl_8012F334: -/* 8012F334 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 8012F338 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 8012F33C 38 60 00 01 */ li r3, 1 -lbl_8012F340: -/* 8012F340 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012F344 83 C1 00 08 */ lwz r30, 8(r1) -/* 8012F348 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012F34C 7C 08 03 A6 */ mtlr r0 -/* 8012F350 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012F354 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfSit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfSit__9daAlink_cFv.s deleted file mode 100644 index 67660dde2ec..00000000000 --- a/asm/d/a/d_a_alink/procWolfSit__9daAlink_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_8012F358: -/* 8012F358 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8012F35C 7C 08 02 A6 */ mflr r0 -/* 8012F360 90 01 00 24 */ stw r0, 0x24(r1) -/* 8012F364 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012F368 48 23 2E 75 */ bl _savegpr_29 -/* 8012F36C 7C 7D 1B 78 */ mr r29, r3 -/* 8012F370 3C 60 80 39 */ lis r3, lit_3757@ha /* 0x8038D658@ha */ -/* 8012F374 3B E3 D6 58 */ addi r31, r3, lit_3757@l /* 0x8038D658@l */ -/* 8012F378 3B DD 1F D0 */ addi r30, r29, 0x1fd0 -/* 8012F37C 38 7D 33 98 */ addi r3, r29, 0x3398 -/* 8012F380 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8012F384 80 1D 05 74 */ lwz r0, 0x574(r29) -/* 8012F388 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 -/* 8012F38C 41 82 00 10 */ beq lbl_8012F39C -/* 8012F390 38 9F 17 D0 */ addi r4, r31, 0x17d0 -/* 8012F394 C0 44 00 6C */ lfs f2, 0x6c(r4) -/* 8012F398 48 00 00 0C */ b lbl_8012F3A4 -lbl_8012F39C: -/* 8012F39C 38 9F 18 D0 */ addi r4, r31, 0x18d0 -/* 8012F3A0 C0 44 00 10 */ lfs f2, 0x10(r4) -lbl_8012F3A4: -/* 8012F3A4 48 14 13 9D */ bl cLib_chaseF__FPfff -/* 8012F3A8 7F A3 EB 78 */ mr r3, r29 -/* 8012F3AC 4B F8 32 B9 */ bl spActionButton__9daAlink_cFv -/* 8012F3B0 2C 03 00 00 */ cmpwi r3, 0 -/* 8012F3B4 40 82 00 1C */ bne lbl_8012F3D0 -/* 8012F3B8 80 1D 06 14 */ lwz r0, 0x614(r29) -/* 8012F3BC 28 00 00 0F */ cmplwi r0, 0xf -/* 8012F3C0 41 82 00 10 */ beq lbl_8012F3D0 -/* 8012F3C4 7F A3 EB 78 */ mr r3, r29 -/* 8012F3C8 48 00 7E ED */ bl checkNextActionWolfFromLie__9daAlink_cFv -/* 8012F3CC 48 00 00 34 */ b lbl_8012F400 -lbl_8012F3D0: -/* 8012F3D0 7F C3 F3 78 */ mr r3, r30 -/* 8012F3D4 48 02 F0 F9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8012F3D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8012F3DC 41 82 00 24 */ beq lbl_8012F400 -/* 8012F3E0 7F A3 EB 78 */ mr r3, r29 -/* 8012F3E4 38 80 00 0E */ li r4, 0xe -/* 8012F3E8 38 BF 1A E0 */ addi r5, r31, 0x1ae0 -/* 8012F3EC C0 25 00 44 */ lfs f1, 0x44(r5) -/* 8012F3F0 C0 45 00 48 */ lfs f2, 0x48(r5) -/* 8012F3F4 4B FF A2 E5 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff -/* 8012F3F8 38 00 00 01 */ li r0, 1 -/* 8012F3FC 90 1D 31 98 */ stw r0, 0x3198(r29) -lbl_8012F400: -/* 8012F400 38 60 00 01 */ li r3, 1 -/* 8012F404 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012F408 48 23 2E 21 */ bl _restgpr_29 -/* 8012F40C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8012F410 7C 08 03 A6 */ mtlr r0 -/* 8012F414 38 21 00 20 */ addi r1, r1, 0x20 -/* 8012F418 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfSlideLandInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfSlideLandInit__9daAlink_cFv.s deleted file mode 100644 index 3a36b0c3465..00000000000 --- a/asm/d/a/d_a_alink/procWolfSlideLandInit__9daAlink_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_801300D4: -/* 801300D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801300D8 7C 08 02 A6 */ mflr r0 -/* 801300DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801300E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801300E4 7C 7F 1B 78 */ mr r31, r3 -/* 801300E8 38 80 01 10 */ li r4, 0x110 -/* 801300EC 4B F9 1E 81 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 801300F0 7F E3 FB 78 */ mr r3, r31 -/* 801300F4 38 80 00 1F */ li r4, 0x1f -/* 801300F8 3C A0 80 39 */ lis r5, m__21daAlinkHIO_wlSlide_c0@ha /* 0x8038F3F0@ha */ -/* 801300FC 38 A5 F3 F0 */ addi r5, r5, m__21daAlinkHIO_wlSlide_c0@l /* 0x8038F3F0@l */ -/* 80130100 38 A5 00 28 */ addi r5, r5, 0x28 -/* 80130104 4B FF 97 45 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 80130108 C0 3F 33 98 */ lfs f1, 0x3398(r31) -/* 8013010C C0 02 92 98 */ lfs f0, lit_5943(r2) -/* 80130110 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80130114 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 80130118 38 00 00 FF */ li r0, 0xff -/* 8013011C 98 1F 08 28 */ stb r0, 0x828(r31) -/* 80130120 38 60 00 01 */ li r3, 1 -/* 80130124 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80130128 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8013012C 7C 08 03 A6 */ mtlr r0 -/* 80130130 38 21 00 10 */ addi r1, r1, 0x10 -/* 80130134 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfSlideLand__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfSlideLand__9daAlink_cFv.s deleted file mode 100644 index a53f8018c08..00000000000 --- a/asm/d/a/d_a_alink/procWolfSlideLand__9daAlink_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80130138: -/* 80130138 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013013C 7C 08 02 A6 */ mflr r0 -/* 80130140 90 01 00 14 */ stw r0, 0x14(r1) -/* 80130144 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80130148 93 C1 00 08 */ stw r30, 8(r1) -/* 8013014C 7C 7E 1B 78 */ mr r30, r3 -/* 80130150 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 80130154 38 7E 33 98 */ addi r3, r30, 0x3398 -/* 80130158 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8013015C C0 42 93 24 */ lfs f2, lit_7450(r2) -/* 80130160 48 14 05 E1 */ bl cLib_chaseF__FPfff -/* 80130164 7F E3 FB 78 */ mr r3, r31 -/* 80130168 48 02 E3 65 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8013016C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80130170 41 82 00 1C */ beq lbl_8013018C -/* 80130174 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 80130178 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 8013017C 7F C3 F3 78 */ mr r3, r30 -/* 80130180 38 80 00 00 */ li r4, 0 -/* 80130184 4B FF 99 C1 */ bl checkNextActionWolf__9daAlink_cFi -/* 80130188 48 00 00 40 */ b lbl_801301C8 -lbl_8013018C: -/* 8013018C C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 80130190 3C 60 80 39 */ lis r3, m__21daAlinkHIO_wlSlide_c0@ha /* 0x8038F3F0@ha */ -/* 80130194 38 63 F3 F0 */ addi r3, r3, m__21daAlinkHIO_wlSlide_c0@l /* 0x8038F3F0@l */ -/* 80130198 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 8013019C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801301A0 40 81 00 28 */ ble lbl_801301C8 -/* 801301A4 AB FE 04 DE */ lha r31, 0x4de(r30) -/* 801301A8 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 801301AC B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 801301B0 7F C3 F3 78 */ mr r3, r30 -/* 801301B4 38 80 00 01 */ li r4, 1 -/* 801301B8 4B FF 99 8D */ bl checkNextActionWolf__9daAlink_cFi -/* 801301BC 2C 03 00 00 */ cmpwi r3, 0 -/* 801301C0 40 82 00 08 */ bne lbl_801301C8 -/* 801301C4 B3 FE 04 DE */ sth r31, 0x4de(r30) -lbl_801301C8: -/* 801301C8 38 60 00 01 */ li r3, 1 -/* 801301CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801301D0 83 C1 00 08 */ lwz r30, 8(r1) -/* 801301D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801301D8 7C 08 03 A6 */ mtlr r0 -/* 801301DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801301E0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfSlipInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfSlipInit__9daAlink_cFv.s deleted file mode 100644 index cdbfb3f8759..00000000000 --- a/asm/d/a/d_a_alink/procWolfSlipInit__9daAlink_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_8012F634: -/* 8012F634 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012F638 7C 08 02 A6 */ mflr r0 -/* 8012F63C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012F640 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012F644 7C 7F 1B 78 */ mr r31, r3 -/* 8012F648 38 80 01 0B */ li r4, 0x10b -/* 8012F64C 4B F9 29 21 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8012F650 7F E3 FB 78 */ mr r3, r31 -/* 8012F654 38 80 00 1A */ li r4, 0x1a -/* 8012F658 3C A0 80 39 */ lis r5, m__20daAlinkHIO_wlMove_c0@ha /* 0x8038EE28@ha */ -/* 8012F65C 38 A5 EE 28 */ addi r5, r5, m__20daAlinkHIO_wlMove_c0@l /* 0x8038EE28@l */ -/* 8012F660 4B FF A1 E9 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 8012F664 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8012F668 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 -/* 8012F66C 41 82 00 20 */ beq lbl_8012F68C -/* 8012F670 C0 3F 05 2C */ lfs f1, 0x52c(r31) -/* 8012F674 3C 60 80 39 */ lis r3, m__20daAlinkHIO_wlMove_c0@ha /* 0x8038EE28@ha */ -/* 8012F678 38 63 EE 28 */ addi r3, r3, m__20daAlinkHIO_wlMove_c0@l /* 0x8038EE28@l */ -/* 8012F67C C0 03 00 A4 */ lfs f0, 0xa4(r3) -/* 8012F680 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8012F684 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8012F688 48 00 00 1C */ b lbl_8012F6A4 -lbl_8012F68C: -/* 8012F68C C0 3F 05 2C */ lfs f1, 0x52c(r31) -/* 8012F690 3C 60 80 39 */ lis r3, m__23daAlinkHIO_wlMoveNoP_c0@ha /* 0x8038EF28@ha */ -/* 8012F694 38 63 EF 28 */ addi r3, r3, m__23daAlinkHIO_wlMoveNoP_c0@l /* 0x8038EF28@l */ -/* 8012F698 C0 03 00 3C */ lfs f0, 0x3c(r3) -/* 8012F69C EC 01 00 32 */ fmuls f0, f1, f0 -/* 8012F6A0 D0 1F 33 98 */ stfs f0, 0x3398(r31) -lbl_8012F6A4: -/* 8012F6A4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 8012F6A8 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 8012F6AC 3C 60 80 42 */ lis r3, l_wolfBaseAnime@ha /* 0x8042561C@ha */ -/* 8012F6B0 C4 03 56 1C */ lfsu f0, l_wolfBaseAnime@l(r3) /* 0x8042561C@l */ -/* 8012F6B4 D0 1F 35 88 */ stfs f0, 0x3588(r31) -/* 8012F6B8 C0 03 00 04 */ lfs f0, 4(r3) -/* 8012F6BC D0 1F 35 8C */ stfs f0, 0x358c(r31) -/* 8012F6C0 C0 03 00 08 */ lfs f0, 8(r3) -/* 8012F6C4 D0 1F 35 90 */ stfs f0, 0x3590(r31) -/* 8012F6C8 7F E3 FB 78 */ mr r3, r31 -/* 8012F6CC 38 80 00 01 */ li r4, 1 -/* 8012F6D0 4B FF 1A F1 */ bl setFootEffectProcType__9daAlink_cFi -/* 8012F6D4 38 60 00 01 */ li r3, 1 -/* 8012F6D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012F6DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012F6E0 7C 08 03 A6 */ mtlr r0 -/* 8012F6E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012F6E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfSlipTurnLandInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfSlipTurnLandInit__9daAlink_cFv.s deleted file mode 100644 index 103f708a545..00000000000 --- a/asm/d/a/d_a_alink/procWolfSlipTurnLandInit__9daAlink_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8012FB18: -/* 8012FB18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012FB1C 7C 08 02 A6 */ mflr r0 -/* 8012FB20 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012FB24 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012FB28 7C 7F 1B 78 */ mr r31, r3 -/* 8012FB2C 38 80 01 0D */ li r4, 0x10d -/* 8012FB30 4B F9 24 3D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8012FB34 38 9F 1F D0 */ addi r4, r31, 0x1fd0 -/* 8012FB38 3C 60 80 39 */ lis r3, m__20daAlinkHIO_wlMove_c0@ha /* 0x8038EE28@ha */ -/* 8012FB3C 38 E3 EE 28 */ addi r7, r3, m__20daAlinkHIO_wlMove_c0@l /* 0x8038EE28@l */ -/* 8012FB40 C0 27 00 18 */ lfs f1, 0x18(r7) -/* 8012FB44 7F E3 FB 78 */ mr r3, r31 -/* 8012FB48 38 A0 00 00 */ li r5, 0 -/* 8012FB4C 38 C0 00 00 */ li r6, 0 -/* 8012FB50 A8 E7 00 14 */ lha r7, 0x14(r7) -/* 8012FB54 C0 1F 1F E0 */ lfs f0, 0x1fe0(r31) -/* 8012FB58 EC 41 00 2A */ fadds f2, f1, f0 -/* 8012FB5C 4B F7 C8 39 */ bl setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff -/* 8012FB60 C0 22 94 E0 */ lfs f1, lit_19379(r2) -/* 8012FB64 3C 60 80 39 */ lis r3, m__23daAlinkHIO_wlMoveNoP_c0@ha /* 0x8038EF28@ha */ -/* 8012FB68 38 63 EF 28 */ addi r3, r3, m__23daAlinkHIO_wlMoveNoP_c0@l /* 0x8038EF28@l */ -/* 8012FB6C C0 03 00 08 */ lfs f0, 8(r3) -/* 8012FB70 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8012FB74 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8012FB78 38 00 00 05 */ li r0, 5 -/* 8012FB7C 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 8012FB80 7F E3 FB 78 */ mr r3, r31 -/* 8012FB84 38 80 00 02 */ li r4, 2 -/* 8012FB88 4B FF 16 39 */ bl setFootEffectProcType__9daAlink_cFi -/* 8012FB8C 38 00 00 08 */ li r0, 8 -/* 8012FB90 98 1F 2F 9D */ stb r0, 0x2f9d(r31) -/* 8012FB94 38 00 00 00 */ li r0, 0 -/* 8012FB98 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 8012FB9C 38 60 00 01 */ li r3, 1 -/* 8012FBA0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012FBA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012FBA8 7C 08 03 A6 */ mtlr r0 -/* 8012FBAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012FBB0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfSlipTurnLand__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfSlipTurnLand__9daAlink_cFv.s deleted file mode 100644 index ead55ac5dca..00000000000 --- a/asm/d/a/d_a_alink/procWolfSlipTurnLand__9daAlink_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8012FBB4: -/* 8012FBB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012FBB8 7C 08 02 A6 */ mflr r0 -/* 8012FBBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012FBC0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012FBC4 93 C1 00 08 */ stw r30, 8(r1) -/* 8012FBC8 7C 7E 1B 78 */ mr r30, r3 -/* 8012FBCC 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 8012FBD0 38 00 00 05 */ li r0, 5 -/* 8012FBD4 98 03 2F 99 */ stb r0, 0x2f99(r3) -/* 8012FBD8 7F E3 FB 78 */ mr r3, r31 -/* 8012FBDC 48 02 E8 F1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8012FBE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8012FBE4 41 82 00 14 */ beq lbl_8012FBF8 -/* 8012FBE8 7F C3 F3 78 */ mr r3, r30 -/* 8012FBEC 38 80 00 00 */ li r4, 0 -/* 8012FBF0 4B FF 9F 55 */ bl checkNextActionWolf__9daAlink_cFi -/* 8012FBF4 48 00 00 28 */ b lbl_8012FC1C -lbl_8012FBF8: -/* 8012FBF8 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8012FBFC 3C 60 80 39 */ lis r3, m__20daAlinkHIO_wlMove_c0@ha /* 0x8038EE28@ha */ -/* 8012FC00 38 63 EE 28 */ addi r3, r3, m__20daAlinkHIO_wlMove_c0@l /* 0x8038EE28@l */ -/* 8012FC04 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 8012FC08 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8012FC0C 40 81 00 10 */ ble lbl_8012FC1C -/* 8012FC10 7F C3 F3 78 */ mr r3, r30 -/* 8012FC14 38 80 00 01 */ li r4, 1 -/* 8012FC18 4B FF 9F 2D */ bl checkNextActionWolf__9daAlink_cFi -lbl_8012FC1C: -/* 8012FC1C 38 60 00 01 */ li r3, 1 -/* 8012FC20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012FC24 83 C1 00 08 */ lwz r30, 8(r1) -/* 8012FC28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012FC2C 7C 08 03 A6 */ mtlr r0 -/* 8012FC30 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012FC34 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfSlopeStartInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procWolfSlopeStartInit__9daAlink_cFi.s deleted file mode 100644 index 8df4b616510..00000000000 --- a/asm/d/a/d_a_alink/procWolfSlopeStartInit__9daAlink_cFi.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80130440: -/* 80130440 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80130444 7C 08 02 A6 */ mflr r0 -/* 80130448 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013044C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80130450 93 C1 00 08 */ stw r30, 8(r1) -/* 80130454 7C 7E 1B 78 */ mr r30, r3 -/* 80130458 7C 9F 23 78 */ mr r31, r4 -/* 8013045C 38 80 01 12 */ li r4, 0x112 -/* 80130460 4B F9 1B 0D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80130464 7F C3 F3 78 */ mr r3, r30 -/* 80130468 38 80 00 6B */ li r4, 0x6b -/* 8013046C 3C A0 80 39 */ lis r5, m__21daAlinkHIO_wlSlide_c0@ha /* 0x8038F3F0@ha */ -/* 80130470 38 A5 F3 F0 */ addi r5, r5, m__21daAlinkHIO_wlSlide_c0@l /* 0x8038F3F0@l */ -/* 80130474 38 A5 00 3C */ addi r5, r5, 0x3c -/* 80130478 4B FF 93 D1 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -/* 8013047C 3C 60 80 42 */ lis r3, l_wolfBaseAnime@ha /* 0x8042561C@ha */ -/* 80130480 C4 03 56 1C */ lfsu f0, l_wolfBaseAnime@l(r3) /* 0x8042561C@l */ -/* 80130484 D0 1E 35 88 */ stfs f0, 0x3588(r30) -/* 80130488 C0 03 00 04 */ lfs f0, 4(r3) -/* 8013048C D0 1E 35 8C */ stfs f0, 0x358c(r30) -/* 80130490 C0 03 00 08 */ lfs f0, 8(r3) -/* 80130494 D0 1E 35 90 */ stfs f0, 0x3590(r30) -/* 80130498 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8013049C D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 801304A0 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 801304A4 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 801304A8 2C 1F 00 00 */ cmpwi r31, 0 -/* 801304AC 41 82 00 0C */ beq lbl_801304B8 -/* 801304B0 38 00 00 0D */ li r0, 0xd -/* 801304B4 98 1E 2F 99 */ stb r0, 0x2f99(r30) -lbl_801304B8: -/* 801304B8 38 60 00 01 */ li r3, 1 -/* 801304BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801304C0 83 C1 00 08 */ lwz r30, 8(r1) -/* 801304C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801304C8 7C 08 03 A6 */ mtlr r0 -/* 801304CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801304D0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfSlopeStart__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfSlopeStart__9daAlink_cFv.s deleted file mode 100644 index eeec88cf2be..00000000000 --- a/asm/d/a/d_a_alink/procWolfSlopeStart__9daAlink_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_801304D4: -/* 801304D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801304D8 7C 08 02 A6 */ mflr r0 -/* 801304DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801304E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801304E4 93 C1 00 08 */ stw r30, 8(r1) -/* 801304E8 7C 7E 1B 78 */ mr r30, r3 -/* 801304EC 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 801304F0 7F E3 FB 78 */ mr r3, r31 -/* 801304F4 48 02 DF D9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 801304F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801304FC 41 82 00 14 */ beq lbl_80130510 -/* 80130500 7F C3 F3 78 */ mr r3, r30 -/* 80130504 38 80 00 00 */ li r4, 0 -/* 80130508 4B FF 96 3D */ bl checkNextActionWolf__9daAlink_cFi -/* 8013050C 48 00 00 44 */ b lbl_80130550 -lbl_80130510: -/* 80130510 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 80130514 3C 60 80 39 */ lis r3, m__21daAlinkHIO_wlSlide_c0@ha /* 0x8038F3F0@ha */ -/* 80130518 38 63 F3 F0 */ addi r3, r3, m__21daAlinkHIO_wlSlide_c0@l /* 0x8038F3F0@l */ -/* 8013051C C0 03 00 4C */ lfs f0, 0x4c(r3) -/* 80130520 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80130524 40 81 00 24 */ ble lbl_80130548 -/* 80130528 7F C3 F3 78 */ mr r3, r30 -/* 8013052C 38 80 00 01 */ li r4, 1 -/* 80130530 4B FF 96 15 */ bl checkNextActionWolf__9daAlink_cFi -/* 80130534 2C 03 00 00 */ cmpwi r3, 0 -/* 80130538 40 82 00 18 */ bne lbl_80130550 -/* 8013053C 38 00 00 05 */ li r0, 5 -/* 80130540 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 80130544 48 00 00 0C */ b lbl_80130550 -lbl_80130548: -/* 80130548 38 00 00 05 */ li r0, 5 -/* 8013054C 98 1E 2F 99 */ stb r0, 0x2f99(r30) -lbl_80130550: -/* 80130550 38 60 00 01 */ li r3, 1 -/* 80130554 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80130558 83 C1 00 08 */ lwz r30, 8(r1) -/* 8013055C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80130560 7C 08 03 A6 */ mtlr r0 -/* 80130564 38 21 00 10 */ addi r1, r1, 0x10 -/* 80130568 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfSwimMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfSwimMoveInit__9daAlink_cFv.s deleted file mode 100644 index abc4b515273..00000000000 --- a/asm/d/a/d_a_alink/procWolfSwimMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_8013871C: -/* 8013871C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80138720 7C 08 02 A6 */ mflr r0 -/* 80138724 90 01 00 14 */ stw r0, 0x14(r1) -/* 80138728 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8013872C 7C 7F 1B 78 */ mr r31, r3 -/* 80138730 38 80 01 29 */ li r4, 0x129 -/* 80138734 4B F8 98 39 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80138738 7F E3 FB 78 */ mr r3, r31 -/* 8013873C 4B FF FA 4D */ bl getWolfSwimMoveAnmSpeed__9daAlink_cFv -/* 80138740 7F E3 FB 78 */ mr r3, r31 -/* 80138744 38 80 00 38 */ li r4, 0x38 -/* 80138748 3C A0 80 39 */ lis r5, m__20daAlinkHIO_wlSwim_c0@ha /* 0x8038F8B4@ha */ -/* 8013874C 38 A5 F8 B4 */ addi r5, r5, m__20daAlinkHIO_wlSwim_c0@l /* 0x8038F8B4@l */ -/* 80138750 C0 45 00 78 */ lfs f2, 0x78(r5) -/* 80138754 4B FF 0F 85 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff -/* 80138758 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 8013875C 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 80138760 41 82 00 14 */ beq lbl_80138774 -/* 80138764 C0 1F 33 B4 */ lfs f0, 0x33b4(r31) -/* 80138768 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 8013876C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 80138770 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -lbl_80138774: -/* 80138774 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80138778 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8013877C 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 80138780 64 00 00 10 */ oris r0, r0, 0x10 -/* 80138784 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 80138788 38 60 00 01 */ li r3, 1 -/* 8013878C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80138790 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80138794 7C 08 03 A6 */ mtlr r0 -/* 80138798 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013879C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfSwimUp__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfSwimUp__9daAlink_cFv.s deleted file mode 100644 index dab63ea7b51..00000000000 --- a/asm/d/a/d_a_alink/procWolfSwimUp__9daAlink_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80138484: -/* 80138484 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80138488 7C 08 02 A6 */ mflr r0 -/* 8013848C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80138490 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80138494 93 C1 00 08 */ stw r30, 8(r1) -/* 80138498 7C 7E 1B 78 */ mr r30, r3 -/* 8013849C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 801384A0 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 801384A4 3C 80 80 39 */ lis r4, m__20daAlinkHIO_wlSwim_c0@ha /* 0x8038F8B4@ha */ -/* 801384A8 38 84 F8 B4 */ addi r4, r4, m__20daAlinkHIO_wlSwim_c0@l /* 0x8038F8B4@l */ -/* 801384AC C0 44 00 54 */ lfs f2, 0x54(r4) -/* 801384B0 4B F7 B4 75 */ bl setNormalSpeedF__9daAlink_cFff -/* 801384B4 7F E3 FB 78 */ mr r3, r31 -/* 801384B8 48 02 60 15 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 801384BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801384C0 41 82 00 14 */ beq lbl_801384D4 -/* 801384C4 7F C3 F3 78 */ mr r3, r30 -/* 801384C8 38 80 00 00 */ li r4, 0 -/* 801384CC 48 00 00 61 */ bl procWolfSwimWaitInit__9daAlink_cFi -/* 801384D0 48 00 00 40 */ b lbl_80138510 -lbl_801384D4: -/* 801384D4 C0 3E 33 AC */ lfs f1, 0x33ac(r30) -/* 801384D8 C0 02 92 A4 */ lfs f0, lit_6021(r2) -/* 801384DC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801384E0 40 81 00 28 */ ble lbl_80138508 -/* 801384E4 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 801384E8 3C 60 80 39 */ lis r3, m__20daAlinkHIO_wlSwim_c0@ha /* 0x8038F8B4@ha */ -/* 801384EC 38 63 F8 B4 */ addi r3, r3, m__20daAlinkHIO_wlSwim_c0@l /* 0x8038F8B4@l */ -/* 801384F0 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 801384F4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801384F8 40 81 00 10 */ ble lbl_80138508 -/* 801384FC 7F C3 F3 78 */ mr r3, r30 -/* 80138500 48 00 02 1D */ bl procWolfSwimMoveInit__9daAlink_cFv -/* 80138504 48 00 00 0C */ b lbl_80138510 -lbl_80138508: -/* 80138508 C0 1E 33 B4 */ lfs f0, 0x33b4(r30) -/* 8013850C D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -lbl_80138510: -/* 80138510 38 60 00 01 */ li r3, 1 -/* 80138514 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80138518 83 C1 00 08 */ lwz r30, 8(r1) -/* 8013851C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80138520 7C 08 03 A6 */ mtlr r0 -/* 80138524 38 21 00 10 */ addi r1, r1, 0x10 -/* 80138528 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfSwimWait__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfSwimWait__9daAlink_cFv.s deleted file mode 100644 index 71cb473ca05..00000000000 --- a/asm/d/a/d_a_alink/procWolfSwimWait__9daAlink_cFv.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_80138644: -/* 80138644 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80138648 7C 08 02 A6 */ mflr r0 -/* 8013864C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80138650 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80138654 7C 7F 1B 78 */ mr r31, r3 -/* 80138658 80 03 06 14 */ lwz r0, 0x614(r3) -/* 8013865C 28 00 00 06 */ cmplwi r0, 6 -/* 80138660 41 82 00 0C */ beq lbl_8013866C -/* 80138664 28 00 00 08 */ cmplwi r0, 8 -/* 80138668 40 82 00 14 */ bne lbl_8013867C -lbl_8013866C: -/* 8013866C 7F E3 FB 78 */ mr r3, r31 -/* 80138670 4B FD FE FD */ bl setShapeAngleToTalkActor__9daAlink_cFv -/* 80138674 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 80138678 B0 1F 04 DE */ sth r0, 0x4de(r31) -lbl_8013867C: -/* 8013867C 7F E3 FB 78 */ mr r3, r31 -/* 80138680 4B FF F9 81 */ bl setSpeedAndAngleSwimWolf__9daAlink_cFv -/* 80138684 7F E3 FB 78 */ mr r3, r31 -/* 80138688 4B FC B9 AD */ bl setSwimUpDownOffset__9daAlink_cFv -/* 8013868C 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 80138690 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 -/* 80138694 41 82 00 18 */ beq lbl_801386AC -/* 80138698 3C 60 80 39 */ lis r3, m__20daAlinkHIO_wlSwim_c0@ha /* 0x8038F8B4@ha */ -/* 8013869C 38 63 F8 B4 */ addi r3, r3, m__20daAlinkHIO_wlSwim_c0@l /* 0x8038F8B4@l */ -/* 801386A0 C0 03 00 64 */ lfs f0, 0x64(r3) -/* 801386A4 D0 1F 1F DC */ stfs f0, 0x1fdc(r31) -/* 801386A8 48 00 00 14 */ b lbl_801386BC -lbl_801386AC: -/* 801386AC 3C 60 80 39 */ lis r3, m__20daAlinkHIO_wlSwim_c0@ha /* 0x8038F8B4@ha */ -/* 801386B0 38 63 F8 B4 */ addi r3, r3, m__20daAlinkHIO_wlSwim_c0@l /* 0x8038F8B4@l */ -/* 801386B4 C0 03 00 88 */ lfs f0, 0x88(r3) -/* 801386B8 D0 1F 1F DC */ stfs f0, 0x1fdc(r31) -lbl_801386BC: -/* 801386BC 7F E3 FB 78 */ mr r3, r31 -/* 801386C0 4B FC A9 99 */ bl checkSwimUpAction__9daAlink_cFv -/* 801386C4 2C 03 00 00 */ cmpwi r3, 0 -/* 801386C8 41 82 00 0C */ beq lbl_801386D4 -/* 801386CC 38 60 00 01 */ li r3, 1 -/* 801386D0 48 00 00 38 */ b lbl_80138708 -lbl_801386D4: -/* 801386D4 7F E3 FB 78 */ mr r3, r31 -/* 801386D8 4B FF FB 21 */ bl decideDoStatusSwimWolf__9daAlink_cFv -/* 801386DC 2C 03 00 00 */ cmpwi r3, 0 -/* 801386E0 41 82 00 0C */ beq lbl_801386EC -/* 801386E4 38 60 00 01 */ li r3, 1 -/* 801386E8 48 00 00 20 */ b lbl_80138708 -lbl_801386EC: -/* 801386EC C0 3F 33 AC */ lfs f1, 0x33ac(r31) -/* 801386F0 C0 02 92 A4 */ lfs f0, lit_6021(r2) -/* 801386F4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801386F8 40 81 00 0C */ ble lbl_80138704 -/* 801386FC 7F E3 FB 78 */ mr r3, r31 -/* 80138700 48 00 00 1D */ bl procWolfSwimMoveInit__9daAlink_cFv -lbl_80138704: -/* 80138704 38 60 00 01 */ li r3, 1 -lbl_80138708: -/* 80138708 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8013870C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80138710 7C 08 03 A6 */ mtlr r0 -/* 80138714 38 21 00 10 */ addi r1, r1, 0x10 -/* 80138718 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfTiredWaitInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfTiredWaitInit__9daAlink_cFv.s deleted file mode 100644 index c8c0440cc78..00000000000 --- a/asm/d/a/d_a_alink/procWolfTiredWaitInit__9daAlink_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8012CF68: -/* 8012CF68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012CF6C 7C 08 02 A6 */ mflr r0 -/* 8012CF70 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012CF74 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012CF78 7C 7F 1B 78 */ mr r31, r3 -/* 8012CF7C 4B FF F0 2D */ bl checkWolfWaitSlipPolygon__9daAlink_cFv -/* 8012CF80 2C 03 00 00 */ cmpwi r3, 0 -/* 8012CF84 41 82 00 20 */ beq lbl_8012CFA4 -/* 8012CF88 C0 3F 33 AC */ lfs f1, 0x33ac(r31) -/* 8012CF8C C0 02 92 A4 */ lfs f0, lit_6021(r2) -/* 8012CF90 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8012CF94 41 81 00 10 */ bgt lbl_8012CFA4 -/* 8012CF98 7F E3 FB 78 */ mr r3, r31 -/* 8012CF9C 48 00 32 49 */ bl procWolfWaitSlipInit__9daAlink_cFv -/* 8012CFA0 48 00 00 38 */ b lbl_8012CFD8 -lbl_8012CFA4: -/* 8012CFA4 7F E3 FB 78 */ mr r3, r31 -/* 8012CFA8 38 80 00 EF */ li r4, 0xef -/* 8012CFAC 4B F9 5D F9 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8012CFB0 2C 03 00 00 */ cmpwi r3, 0 -/* 8012CFB4 40 82 00 0C */ bne lbl_8012CFC0 -/* 8012CFB8 38 60 00 00 */ li r3, 0 -/* 8012CFBC 48 00 00 1C */ b lbl_8012CFD8 -lbl_8012CFC0: -/* 8012CFC0 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8012CFC4 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8012CFC8 7F E3 FB 78 */ mr r3, r31 -/* 8012CFCC 38 80 00 18 */ li r4, 0x18 -/* 8012CFD0 4B FF C6 A9 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM -/* 8012CFD4 38 60 00 01 */ li r3, 1 -lbl_8012CFD8: -/* 8012CFD8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012CFDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012CFE0 7C 08 03 A6 */ mtlr r0 -/* 8012CFE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012CFE8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfTiredWait__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfTiredWait__9daAlink_cFv.s deleted file mode 100644 index 37e46cf9f69..00000000000 --- a/asm/d/a/d_a_alink/procWolfTiredWait__9daAlink_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8012CFEC: -/* 8012CFEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012CFF0 7C 08 02 A6 */ mflr r0 -/* 8012CFF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012CFF8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012CFFC 93 C1 00 08 */ stw r30, 8(r1) -/* 8012D000 7C 7E 1B 78 */ mr r30, r3 -/* 8012D004 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 8012D008 38 80 00 00 */ li r4, 0 -/* 8012D00C 4B FF CB 39 */ bl checkNextActionWolf__9daAlink_cFi -/* 8012D010 2C 03 00 00 */ cmpwi r3, 0 -/* 8012D014 40 82 00 20 */ bne lbl_8012D034 -/* 8012D018 7F E3 FB 78 */ mr r3, r31 -/* 8012D01C 48 03 14 B1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8012D020 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8012D024 41 82 00 10 */ beq lbl_8012D034 -/* 8012D028 7F C3 F3 78 */ mr r3, r30 -/* 8012D02C 38 80 00 17 */ li r4, 0x17 -/* 8012D030 4B FF C6 49 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM -lbl_8012D034: -/* 8012D034 38 60 00 01 */ li r3, 1 -/* 8012D038 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012D03C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8012D040 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012D044 7C 08 03 A6 */ mtlr r0 -/* 8012D048 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012D04C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfWaitSlipInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfWaitSlipInit__9daAlink_cFv.s deleted file mode 100644 index ed7483215b4..00000000000 --- a/asm/d/a/d_a_alink/procWolfWaitSlipInit__9daAlink_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_801301E4: -/* 801301E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801301E8 7C 08 02 A6 */ mflr r0 -/* 801301EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801301F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801301F4 7C 7F 1B 78 */ mr r31, r3 -/* 801301F8 38 80 01 11 */ li r4, 0x111 -/* 801301FC 4B F9 2B A9 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80130200 2C 03 00 00 */ cmpwi r3, 0 -/* 80130204 40 82 00 0C */ bne lbl_80130210 -/* 80130208 38 60 00 00 */ li r3, 0 -/* 8013020C 48 00 00 48 */ b lbl_80130254 -lbl_80130210: -/* 80130210 7F E3 FB 78 */ mr r3, r31 -/* 80130214 38 80 00 1C */ li r4, 0x1c -/* 80130218 3C A0 80 39 */ lis r5, m__20daAlinkHIO_wlMove_c0@ha /* 0x8038EE28@ha */ -/* 8013021C 38 A5 EE 28 */ addi r5, r5, m__20daAlinkHIO_wlMove_c0@l /* 0x8038EE28@l */ -/* 80130220 C0 25 00 B8 */ lfs f1, 0xb8(r5) -/* 80130224 C0 45 00 BC */ lfs f2, 0xbc(r5) -/* 80130228 4B FF 94 B1 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff -/* 8013022C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 80130230 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 80130234 7F E3 FB 78 */ mr r3, r31 -/* 80130238 4B FF BF BD */ bl setWolfWaitSlip__9daAlink_cFv -/* 8013023C 38 00 00 78 */ li r0, 0x78 -/* 80130240 98 1F 2F 9D */ stb r0, 0x2f9d(r31) -/* 80130244 7F E3 FB 78 */ mr r3, r31 -/* 80130248 38 80 00 01 */ li r4, 1 -/* 8013024C 4B FF 0F 75 */ bl setFootEffectProcType__9daAlink_cFi -/* 80130250 38 60 00 01 */ li r3, 1 -lbl_80130254: -/* 80130254 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80130258 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8013025C 7C 08 03 A6 */ mtlr r0 -/* 80130260 38 21 00 10 */ addi r1, r1, 0x10 -/* 80130264 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfWaitTurnInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfWaitTurnInit__9daAlink_cFv.s deleted file mode 100644 index aa3c9939453..00000000000 --- a/asm/d/a/d_a_alink/procWolfWaitTurnInit__9daAlink_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_8012DD08: -/* 8012DD08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012DD0C 7C 08 02 A6 */ mflr r0 -/* 8012DD10 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012DD14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8012DD18 7C 7F 1B 78 */ mr r31, r3 -/* 8012DD1C 38 80 00 F5 */ li r4, 0xf5 -/* 8012DD20 4B F9 50 85 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8012DD24 2C 03 00 00 */ cmpwi r3, 0 -/* 8012DD28 40 82 00 0C */ bne lbl_8012DD34 -/* 8012DD2C 38 60 00 00 */ li r3, 0 -/* 8012DD30 48 00 00 70 */ b lbl_8012DDA0 -lbl_8012DD34: -/* 8012DD34 7F E3 FB 78 */ mr r3, r31 -/* 8012DD38 38 80 00 01 */ li r4, 1 -/* 8012DD3C 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8012DD40 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 -/* 8012DD44 41 82 00 14 */ beq lbl_8012DD58 -/* 8012DD48 3C A0 80 39 */ lis r5, m__20daAlinkHIO_wlMove_c0@ha /* 0x8038EE28@ha */ -/* 8012DD4C 38 A5 EE 28 */ addi r5, r5, m__20daAlinkHIO_wlMove_c0@l /* 0x8038EE28@l */ -/* 8012DD50 C0 25 00 74 */ lfs f1, 0x74(r5) -/* 8012DD54 48 00 00 10 */ b lbl_8012DD64 -lbl_8012DD58: -/* 8012DD58 3C A0 80 39 */ lis r5, m__23daAlinkHIO_wlMoveNoP_c0@ha /* 0x8038EF28@ha */ -/* 8012DD5C 38 A5 EF 28 */ addi r5, r5, m__23daAlinkHIO_wlMoveNoP_c0@l /* 0x8038EF28@l */ -/* 8012DD60 C0 25 00 18 */ lfs f1, 0x18(r5) -lbl_8012DD64: -/* 8012DD64 3C A0 80 39 */ lis r5, m__20daAlinkHIO_wlMove_c0@ha /* 0x8038EE28@ha */ -/* 8012DD68 38 A5 EE 28 */ addi r5, r5, m__20daAlinkHIO_wlMove_c0@l /* 0x8038EE28@l */ -/* 8012DD6C C0 45 00 94 */ lfs f2, 0x94(r5) -/* 8012DD70 4B FF B9 69 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff -/* 8012DD74 7F E3 FB 78 */ mr r3, r31 -/* 8012DD78 4B FE 7E A9 */ bl checkEventRun__9daAlink_cCFv -/* 8012DD7C 2C 03 00 00 */ cmpwi r3, 0 -/* 8012DD80 41 82 00 0C */ beq lbl_8012DD8C -/* 8012DD84 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8012DD88 D0 1F 33 98 */ stfs f0, 0x3398(r31) -lbl_8012DD8C: -/* 8012DD8C A8 1F 2F E2 */ lha r0, 0x2fe2(r31) -/* 8012DD90 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 8012DD94 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 8012DD98 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 8012DD9C 38 60 00 01 */ li r3, 1 -lbl_8012DDA0: -/* 8012DDA0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012DDA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012DDA8 7C 08 03 A6 */ mtlr r0 -/* 8012DDAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012DDB0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/resetAtCollision__9daAlink_cFi.s b/asm/d/a/d_a_alink/resetAtCollision__9daAlink_cFi.s deleted file mode 100644 index e100aef754a..00000000000 --- a/asm/d/a/d_a_alink/resetAtCollision__9daAlink_cFi.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_800AA9DC: -/* 800AA9DC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800AA9E0 7C 08 02 A6 */ mflr r0 -/* 800AA9E4 90 01 00 24 */ stw r0, 0x24(r1) -/* 800AA9E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800AA9EC 48 2B 77 ED */ bl _savegpr_28 -/* 800AA9F0 7C 7C 1B 78 */ mr r28, r3 -/* 800AA9F4 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800AA9F8 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 800AA9FC 41 82 00 A8 */ beq lbl_800AAAA4 -/* 800AAA00 2C 04 00 00 */ cmpwi r4, 0 -/* 800AAA04 41 82 00 5C */ beq lbl_800AAA60 -/* 800AAA08 38 9C 12 2C */ addi r4, r28, 0x122c -/* 800AAA0C 48 02 6D E1 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf -/* 800AAA10 2C 03 00 00 */ cmpwi r3, 0 -/* 800AAA14 40 82 00 4C */ bne lbl_800AAA60 -/* 800AAA18 7F 83 E3 78 */ mr r3, r28 -/* 800AAA1C 38 9C 13 70 */ addi r4, r28, 0x1370 -/* 800AAA20 48 02 6D CD */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf -/* 800AAA24 2C 03 00 00 */ cmpwi r3, 0 -/* 800AAA28 40 82 00 38 */ bne lbl_800AAA60 -/* 800AAA2C 7F 83 E3 78 */ mr r3, r28 -/* 800AAA30 38 9C 14 B4 */ addi r4, r28, 0x14b4 -/* 800AAA34 48 02 6D B9 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf -/* 800AAA38 2C 03 00 00 */ cmpwi r3, 0 -/* 800AAA3C 40 82 00 24 */ bne lbl_800AAA60 -/* 800AAA40 7F 83 E3 78 */ mr r3, r28 -/* 800AAA44 38 9C 10 F0 */ addi r4, r28, 0x10f0 -/* 800AAA48 48 02 6D A5 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf -/* 800AAA4C 2C 03 00 00 */ cmpwi r3, 0 -/* 800AAA50 40 82 00 10 */ bne lbl_800AAA60 -/* 800AAA54 7F 83 E3 78 */ mr r3, r28 -/* 800AAA58 38 9C 0F B8 */ addi r4, r28, 0xfb8 -/* 800AAA5C 48 02 6D 91 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf -lbl_800AAA60: -/* 800AAA60 80 1C 05 70 */ lwz r0, 0x570(r28) -/* 800AAA64 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 800AAA68 90 1C 05 70 */ stw r0, 0x570(r28) -/* 800AAA6C 3B A0 00 00 */ li r29, 0 -/* 800AAA70 3B E0 00 00 */ li r31, 0 -lbl_800AAA74: -/* 800AAA74 7F DC FA 14 */ add r30, r28, r31 -/* 800AAA78 38 7E 12 2C */ addi r3, r30, 0x122c -/* 800AAA7C 4B FD 98 9D */ bl ResetAtHit__12dCcD_GObjInfFv -/* 800AAA80 80 1E 12 2C */ lwz r0, 0x122c(r30) -/* 800AAA84 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 800AAA88 90 1E 12 2C */ stw r0, 0x122c(r30) -/* 800AAA8C 3B BD 00 01 */ addi r29, r29, 1 -/* 800AAA90 2C 1D 00 03 */ cmpwi r29, 3 -/* 800AAA94 3B FF 01 44 */ addi r31, r31, 0x144 -/* 800AAA98 41 80 FF DC */ blt lbl_800AAA74 -/* 800AAA9C 38 7C 0F B8 */ addi r3, r28, 0xfb8 -/* 800AAAA0 4B FD 98 79 */ bl ResetAtHit__12dCcD_GObjInfFv -lbl_800AAAA4: -/* 800AAAA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800AAAA8 48 2B 77 7D */ bl _restgpr_28 -/* 800AAAAC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800AAAB0 7C 08 03 A6 */ mtlr r0 -/* 800AAAB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800AAAB8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/resetBasAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/resetBasAnime__9daAlink_cFv.s deleted file mode 100644 index 50e01f128df..00000000000 --- a/asm/d/a/d_a_alink/resetBasAnime__9daAlink_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_800BF4E0: -/* 800BF4E0 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 800BF4E4 38 04 FF FF */ addi r0, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 800BF4E8 B0 03 30 84 */ sth r0, 0x3084(r3) -/* 800BF4EC B0 03 30 86 */ sth r0, 0x3086(r3) -/* 800BF4F0 38 00 00 00 */ li r0, 0 -/* 800BF4F4 90 03 2D 7C */ stw r0, 0x2d7c(r3) -/* 800BF4F8 90 03 2D 80 */ stw r0, 0x2d80(r3) -/* 800BF4FC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/resetDemoBck__9daAlink_cFv.s b/asm/d/a/d_a_alink/resetDemoBck__9daAlink_cFv.s deleted file mode 100644 index 98dd32e6fb4..00000000000 --- a/asm/d/a/d_a_alink/resetDemoBck__9daAlink_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80117B90: -/* 80117B90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80117B94 7C 08 02 A6 */ mflr r0 -/* 80117B98 90 01 00 14 */ stw r0, 0x14(r1) -/* 80117B9C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80117BA0 7C 7F 1B 78 */ mr r31, r3 -/* 80117BA4 3C 80 80 39 */ lis r4, lit_3757@ha /* 0x8038D658@ha */ -/* 80117BA8 38 C4 D6 58 */ addi r6, r4, lit_3757@l /* 0x8038D658@l */ -/* 80117BAC 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 80117BB0 38 04 FF FF */ addi r0, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 80117BB4 B0 03 21 44 */ sth r0, 0x2144(r3) -/* 80117BB8 B0 03 21 1C */ sth r0, 0x211c(r3) -/* 80117BBC B0 03 21 30 */ sth r0, 0x2130(r3) -/* 80117BC0 B0 03 1F 5C */ sth r0, 0x1f5c(r3) -/* 80117BC4 B0 03 1F 58 */ sth r0, 0x1f58(r3) -/* 80117BC8 B0 03 21 40 */ sth r0, 0x2140(r3) -/* 80117BCC B0 03 21 18 */ sth r0, 0x2118(r3) -/* 80117BD0 B0 03 21 2C */ sth r0, 0x212c(r3) -/* 80117BD4 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80117BD8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80117BDC 41 82 00 2C */ beq lbl_80117C08 -/* 80117BE0 38 80 00 00 */ li r4, 0 -/* 80117BE4 38 A6 18 D0 */ addi r5, r6, 0x18d0 -/* 80117BE8 C0 25 00 14 */ lfs f1, 0x14(r5) -/* 80117BEC 38 A6 17 D0 */ addi r5, r6, 0x17d0 -/* 80117BF0 C0 45 00 94 */ lfs f2, 0x94(r5) -/* 80117BF4 48 01 1A E5 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff -/* 80117BF8 7F E3 FB 78 */ mr r3, r31 -/* 80117BFC 38 80 00 19 */ li r4, 0x19 -/* 80117C00 4B F9 7D A9 */ bl setFaceBasicAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 80117C04 48 00 00 1C */ b lbl_80117C20 -lbl_80117C08: -/* 80117C08 38 80 00 19 */ li r4, 0x19 -/* 80117C0C 38 A6 00 64 */ addi r5, r6, 0x64 -/* 80117C10 C0 25 00 1C */ lfs f1, 0x1c(r5) -/* 80117C14 38 A6 00 0C */ addi r5, r6, 0xc -/* 80117C18 C0 45 00 18 */ lfs f2, 0x18(r5) -/* 80117C1C 4B F9 53 C5 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -lbl_80117C20: -/* 80117C20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80117C24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80117C28 7C 08 03 A6 */ mtlr r0 -/* 80117C2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80117C30 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/resetOilBottleModel__9daAlink_cFv.s b/asm/d/a/d_a_alink/resetOilBottleModel__9daAlink_cFv.s deleted file mode 100644 index 080a0a76b88..00000000000 --- a/asm/d/a/d_a_alink/resetOilBottleModel__9daAlink_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80110F88: -/* 80110F88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80110F8C 7C 08 02 A6 */ mflr r0 -/* 80110F90 90 01 00 14 */ stw r0, 0x14(r1) -/* 80110F94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80110F98 7C 7F 1B 78 */ mr r31, r3 -/* 80110F9C 38 80 00 00 */ li r4, 0 -/* 80110FA0 38 A0 00 01 */ li r5, 1 -/* 80110FA4 4B FB 03 39 */ bl deleteEquipItem__9daAlink_cFii -/* 80110FA8 A8 1F 30 0E */ lha r0, 0x300e(r31) -/* 80110FAC 2C 00 00 00 */ cmpwi r0, 0 -/* 80110FB0 41 82 00 14 */ beq lbl_80110FC4 -/* 80110FB4 7F E3 FB 78 */ mr r3, r31 -/* 80110FB8 4B FF FE CD */ bl setKandelaarModel__9daAlink_cFv -/* 80110FBC 38 00 00 48 */ li r0, 0x48 -/* 80110FC0 B0 1F 2F DC */ sth r0, 0x2fdc(r31) -lbl_80110FC4: -/* 80110FC4 7F E3 FB 78 */ mr r3, r31 -/* 80110FC8 4B FA E8 BD */ bl returnKeepItemData__9daAlink_cFv -/* 80110FCC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80110FD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80110FD4 7C 08 03 A6 */ mtlr r0 -/* 80110FD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80110FDC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/resetSpecialEvent__9daAlink_cFv.s b/asm/d/a/d_a_alink/resetSpecialEvent__9daAlink_cFv.s deleted file mode 100644 index d58891bc218..00000000000 --- a/asm/d/a/d_a_alink/resetSpecialEvent__9daAlink_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80117C90: -/* 80117C90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80117C94 7C 08 02 A6 */ mflr r0 -/* 80117C98 90 01 00 14 */ stw r0, 0x14(r1) -/* 80117C9C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80117CA0 93 C1 00 08 */ stw r30, 8(r1) -/* 80117CA4 7C 7E 1B 78 */ mr r30, r3 -/* 80117CA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80117CAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80117CB0 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80117CB4 4B F2 A7 B5 */ bl reset__14dEvt_control_cFv -/* 80117CB8 28 1E 00 00 */ cmplwi r30, 0 -/* 80117CBC 41 82 00 0C */ beq lbl_80117CC8 -/* 80117CC0 83 FE 00 04 */ lwz r31, 4(r30) -/* 80117CC4 48 00 00 08 */ b lbl_80117CCC -lbl_80117CC8: -/* 80117CC8 3B E0 FF FF */ li r31, -1 -lbl_80117CCC: -/* 80117CCC 48 06 99 75 */ bl dCam_getBody__Fv -/* 80117CD0 7F E4 FB 78 */ mr r4, r31 -/* 80117CD4 4B F7 0E E9 */ bl EndEventCamera__9dCamera_cFi -/* 80117CD8 7F C3 F3 78 */ mr r3, r30 -/* 80117CDC 48 00 00 1D */ bl endDemoMode__9daAlink_cFv -/* 80117CE0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80117CE4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80117CE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80117CEC 7C 08 03 A6 */ mtlr r0 -/* 80117CF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80117CF4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/resetWolfAtCollision__9daAlink_cFv.s b/asm/d/a/d_a_alink/resetWolfAtCollision__9daAlink_cFv.s deleted file mode 100644 index 0023cdff0b1..00000000000 --- a/asm/d/a/d_a_alink/resetWolfAtCollision__9daAlink_cFv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_800AA714: -/* 800AA714 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800AA718 7C 08 02 A6 */ mflr r0 -/* 800AA71C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800AA720 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800AA724 93 C1 00 08 */ stw r30, 8(r1) -/* 800AA728 7C 7E 1B 78 */ mr r30, r3 -/* 800AA72C 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800AA730 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 800AA734 41 82 00 A0 */ beq lbl_800AA7D4 -/* 800AA738 38 9E 10 F0 */ addi r4, r30, 0x10f0 -/* 800AA73C 48 02 70 B1 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf -/* 800AA740 2C 03 00 00 */ cmpwi r3, 0 -/* 800AA744 40 82 00 38 */ bne lbl_800AA77C -/* 800AA748 7F C3 F3 78 */ mr r3, r30 -/* 800AA74C 38 9E 08 50 */ addi r4, r30, 0x850 -/* 800AA750 48 02 70 9D */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf -/* 800AA754 2C 03 00 00 */ cmpwi r3, 0 -/* 800AA758 40 82 00 24 */ bne lbl_800AA77C -/* 800AA75C 7F C3 F3 78 */ mr r3, r30 -/* 800AA760 38 9E 09 8C */ addi r4, r30, 0x98c -/* 800AA764 48 02 70 89 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf -/* 800AA768 2C 03 00 00 */ cmpwi r3, 0 -/* 800AA76C 40 82 00 10 */ bne lbl_800AA77C -/* 800AA770 7F C3 F3 78 */ mr r3, r30 -/* 800AA774 38 9E 0A C8 */ addi r4, r30, 0xac8 -/* 800AA778 48 02 70 75 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf -lbl_800AA77C: -/* 800AA77C 80 1E 10 54 */ lwz r0, 0x1054(r30) -/* 800AA780 54 00 05 66 */ rlwinm r0, r0, 0, 0x15, 0x13 -/* 800AA784 90 1E 10 54 */ stw r0, 0x1054(r30) -/* 800AA788 38 7E 10 F0 */ addi r3, r30, 0x10f0 -/* 800AA78C 4B FD 9B 8D */ bl ResetAtHit__12dCcD_GObjInfFv -/* 800AA790 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800AA794 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 800AA798 90 1E 05 70 */ stw r0, 0x570(r30) -/* 800AA79C 3B FE 08 50 */ addi r31, r30, 0x850 -/* 800AA7A0 3B C0 00 00 */ li r30, 0 -lbl_800AA7A4: -/* 800AA7A4 80 1F 00 00 */ lwz r0, 0(r31) -/* 800AA7A8 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 800AA7AC 90 1F 00 00 */ stw r0, 0(r31) -/* 800AA7B0 7F E3 FB 78 */ mr r3, r31 -/* 800AA7B4 4B FD 9B 65 */ bl ResetAtHit__12dCcD_GObjInfFv -/* 800AA7B8 80 1F 00 9C */ lwz r0, 0x9c(r31) -/* 800AA7BC 54 00 05 66 */ rlwinm r0, r0, 0, 0x15, 0x13 -/* 800AA7C0 90 1F 00 9C */ stw r0, 0x9c(r31) -/* 800AA7C4 3B DE 00 01 */ addi r30, r30, 1 -/* 800AA7C8 2C 1E 00 03 */ cmpwi r30, 3 -/* 800AA7CC 3B FF 01 3C */ addi r31, r31, 0x13c -/* 800AA7D0 41 80 FF D4 */ blt lbl_800AA7A4 -lbl_800AA7D4: -/* 800AA7D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800AA7D8 83 C1 00 08 */ lwz r30, 8(r1) -/* 800AA7DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800AA7E0 7C 08 03 A6 */ mtlr r0 -/* 800AA7E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AA7E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/resetWolfEnemyBiteAll__9daAlink_cFv.s b/asm/d/a/d_a_alink/resetWolfEnemyBiteAll__9daAlink_cFv.s deleted file mode 100644 index af59c0cc416..00000000000 --- a/asm/d/a/d_a_alink/resetWolfEnemyBiteAll__9daAlink_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80138C04: -/* 80138C04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80138C08 7C 08 02 A6 */ mflr r0 -/* 80138C0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80138C10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80138C14 7C 7F 1B 78 */ mr r31, r3 -/* 80138C18 38 7F 28 1C */ addi r3, r31, 0x281c -/* 80138C1C 48 02 60 E1 */ bl clearData__16daPy_actorKeep_cFv -/* 80138C20 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 80138C24 38 00 FF A7 */ li r0, -89 -/* 80138C28 7C 60 00 38 */ and r0, r3, r0 -/* 80138C2C 90 1F 05 78 */ stw r0, 0x578(r31) -/* 80138C30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80138C34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80138C38 7C 08 03 A6 */ mtlr r0 -/* 80138C3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80138C40 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/returnBoomerang__9daAlink_cFi.s b/asm/d/a/d_a_alink/returnBoomerang__9daAlink_cFi.s deleted file mode 100644 index 0518ab3c4aa..00000000000 --- a/asm/d/a/d_a_alink/returnBoomerang__9daAlink_cFi.s +++ /dev/null @@ -1,126 +0,0 @@ -lbl_800E08C4: -/* 800E08C4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800E08C8 7C 08 02 A6 */ mflr r0 -/* 800E08CC 90 01 00 24 */ stw r0, 0x24(r1) -/* 800E08D0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 800E08D4 93 C1 00 18 */ stw r30, 0x18(r1) -/* 800E08D8 7C 7F 1B 78 */ mr r31, r3 -/* 800E08DC 7C 9E 23 78 */ mr r30, r4 -/* 800E08E0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800E08E4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800E08E8 80 04 5F 18 */ lwz r0, 0x5f18(r4) -/* 800E08EC 54 00 02 90 */ rlwinm r0, r0, 0, 0xa, 8 -/* 800E08F0 90 04 5F 18 */ stw r0, 0x5f18(r4) -/* 800E08F4 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800E08F8 28 00 00 FF */ cmplwi r0, 0xff -/* 800E08FC 40 82 01 7C */ bne lbl_800E0A78 -/* 800E0900 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800E0904 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 800E0908 40 82 01 70 */ bne lbl_800E0A78 -/* 800E090C 80 1F 28 28 */ lwz r0, 0x2828(r31) -/* 800E0910 28 00 00 00 */ cmplwi r0, 0 -/* 800E0914 40 82 01 64 */ bne lbl_800E0A78 -/* 800E0918 81 83 06 28 */ lwz r12, 0x628(r3) -/* 800E091C 81 8C 01 94 */ lwz r12, 0x194(r12) -/* 800E0920 7D 89 03 A6 */ mtctr r12 -/* 800E0924 4E 80 04 21 */ bctrl -/* 800E0928 28 03 00 00 */ cmplwi r3, 0 -/* 800E092C 40 82 01 4C */ bne lbl_800E0A78 -/* 800E0930 7F E3 FB 78 */ mr r3, r31 -/* 800E0934 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800E0938 81 8C 01 8C */ lwz r12, 0x18c(r12) -/* 800E093C 7D 89 03 A6 */ mtctr r12 -/* 800E0940 4E 80 04 21 */ bctrl -/* 800E0944 28 03 00 00 */ cmplwi r3, 0 -/* 800E0948 40 82 01 30 */ bne lbl_800E0A78 -/* 800E094C 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800E0950 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800E0954 40 82 01 24 */ bne lbl_800E0A78 -/* 800E0958 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) -/* 800E095C 28 00 00 5C */ cmplwi r0, 0x5c -/* 800E0960 40 82 00 10 */ bne lbl_800E0970 -/* 800E0964 80 1F 31 98 */ lwz r0, 0x3198(r31) -/* 800E0968 2C 00 00 03 */ cmpwi r0, 3 -/* 800E096C 41 82 01 0C */ beq lbl_800E0A78 -lbl_800E0970: -/* 800E0970 7F E3 FB 78 */ mr r3, r31 -/* 800E0974 48 03 52 AD */ bl checkEventRun__9daAlink_cCFv -/* 800E0978 2C 03 00 00 */ cmpwi r3, 0 -/* 800E097C 41 82 00 0C */ beq lbl_800E0988 -/* 800E0980 2C 1E 00 00 */ cmpwi r30, 0 -/* 800E0984 41 82 00 F4 */ beq lbl_800E0A78 -lbl_800E0988: -/* 800E0988 7F E3 FB 78 */ mr r3, r31 -/* 800E098C 4B FD 88 C9 */ bl checkNoUpperAnime__9daAlink_cCFv -/* 800E0990 2C 03 00 00 */ cmpwi r3, 0 -/* 800E0994 40 82 00 64 */ bne lbl_800E09F8 -/* 800E0998 7F E3 FB 78 */ mr r3, r31 -/* 800E099C 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800E09A0 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 800E09A4 7D 89 03 A6 */ mtctr r12 -/* 800E09A8 4E 80 04 21 */ bctrl -/* 800E09AC 2C 03 00 00 */ cmpwi r3, 0 -/* 800E09B0 40 82 00 48 */ bne lbl_800E09F8 -/* 800E09B4 38 60 00 00 */ li r3, 0 -/* 800E09B8 A0 9F 1F BC */ lhz r4, 0x1fbc(r31) -/* 800E09BC 28 04 02 4C */ cmplwi r4, 0x24c -/* 800E09C0 41 82 00 10 */ beq lbl_800E09D0 -/* 800E09C4 54 80 04 3E */ clrlwi r0, r4, 0x10 -/* 800E09C8 28 00 02 4D */ cmplwi r0, 0x24d -/* 800E09CC 40 82 00 08 */ bne lbl_800E09D4 -lbl_800E09D0: -/* 800E09D0 38 60 00 01 */ li r3, 1 -lbl_800E09D4: -/* 800E09D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E09D8 40 82 00 20 */ bne lbl_800E09F8 -/* 800E09DC 54 80 04 3E */ clrlwi r0, r4, 0x10 -/* 800E09E0 28 00 00 AD */ cmplwi r0, 0xad -/* 800E09E4 41 82 00 14 */ beq lbl_800E09F8 -/* 800E09E8 7F E3 FB 78 */ mr r3, r31 -/* 800E09EC 4B FF FA 55 */ bl checkBoomerangAnime__9daAlink_cCFv -/* 800E09F0 2C 03 00 00 */ cmpwi r3, 0 -/* 800E09F4 41 82 00 84 */ beq lbl_800E0A78 -lbl_800E09F8: -/* 800E09F8 80 9F 31 A0 */ lwz r4, 0x31a0(r31) -/* 800E09FC 3C 60 01 BD */ lis r3, 0x01BD /* 0x01BD0810@ha */ -/* 800E0A00 38 03 08 10 */ addi r0, r3, 0x0810 /* 0x01BD0810@l */ -/* 800E0A04 7C 80 00 39 */ and. r0, r4, r0 -/* 800E0A08 40 82 00 70 */ bne lbl_800E0A78 -/* 800E0A0C 80 1F 28 34 */ lwz r0, 0x2834(r31) -/* 800E0A10 90 1F 28 24 */ stw r0, 0x2824(r31) -/* 800E0A14 80 1F 28 38 */ lwz r0, 0x2838(r31) -/* 800E0A18 90 1F 28 28 */ stw r0, 0x2828(r31) -/* 800E0A1C 38 7F 28 34 */ addi r3, r31, 0x2834 -/* 800E0A20 48 07 E2 DD */ bl clearData__16daPy_actorKeep_cFv -/* 800E0A24 38 00 00 40 */ li r0, 0x40 -/* 800E0A28 B0 1F 2F DC */ sth r0, 0x2fdc(r31) -/* 800E0A2C 38 00 00 02 */ li r0, 2 -/* 800E0A30 98 1F 2F 94 */ stb r0, 0x2f94(r31) -/* 800E0A34 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800E0A38 60 00 00 20 */ ori r0, r0, 0x20 -/* 800E0A3C 90 1F 05 70 */ stw r0, 0x570(r31) -/* 800E0A40 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800E0A44 D0 21 00 08 */ stfs f1, 8(r1) -/* 800E0A48 C0 02 92 B8 */ lfs f0, lit_6040(r2) -/* 800E0A4C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800E0A50 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800E0A54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800E0A58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800E0A5C 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 800E0A60 38 80 00 01 */ li r4, 1 -/* 800E0A64 38 A0 00 01 */ li r5, 1 -/* 800E0A68 38 C1 00 08 */ addi r6, r1, 8 -/* 800E0A6C 4B F8 EF B9 */ bl StartShock__12dVibration_cFii4cXyz -/* 800E0A70 38 60 00 01 */ li r3, 1 -/* 800E0A74 48 00 00 10 */ b lbl_800E0A84 -lbl_800E0A78: -/* 800E0A78 38 7F 28 34 */ addi r3, r31, 0x2834 -/* 800E0A7C 48 07 E2 81 */ bl clearData__16daPy_actorKeep_cFv -/* 800E0A80 38 60 00 00 */ li r3, 0 -lbl_800E0A84: -/* 800E0A84 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 800E0A88 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 800E0A8C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800E0A90 7C 08 03 A6 */ mtlr r0 -/* 800E0A94 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E0A98 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/returnCopyRod__9daAlink_cFv.s b/asm/d/a/d_a_alink/returnCopyRod__9daAlink_cFv.s deleted file mode 100644 index 27ae24ff5ac..00000000000 --- a/asm/d/a/d_a_alink/returnCopyRod__9daAlink_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_800E1A30: -/* 800E1A30 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800E1A34 7C 08 02 A6 */ mflr r0 -/* 800E1A38 90 01 00 24 */ stw r0, 0x24(r1) -/* 800E1A3C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 800E1A40 93 C1 00 18 */ stw r30, 0x18(r1) -/* 800E1A44 7C 7E 1B 78 */ mr r30, r3 -/* 800E1A48 80 03 05 7C */ lwz r0, 0x57c(r3) -/* 800E1A4C 54 00 03 98 */ rlwinm r0, r0, 0, 0xe, 0xc -/* 800E1A50 90 03 05 7C */ stw r0, 0x57c(r3) -/* 800E1A54 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800E1A58 28 00 00 46 */ cmplwi r0, 0x46 -/* 800E1A5C 40 82 00 58 */ bne lbl_800E1AB4 -/* 800E1A60 80 1E 28 3C */ lwz r0, 0x283c(r30) -/* 800E1A64 90 1E 28 24 */ stw r0, 0x2824(r30) -/* 800E1A68 80 1E 28 40 */ lwz r0, 0x2840(r30) -/* 800E1A6C 90 1E 28 28 */ stw r0, 0x2828(r30) -/* 800E1A70 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800E1A74 60 00 00 20 */ ori r0, r0, 0x20 -/* 800E1A78 90 1E 05 70 */ stw r0, 0x570(r30) -/* 800E1A7C 3B E0 00 01 */ li r31, 1 -/* 800E1A80 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800E1A84 D0 21 00 08 */ stfs f1, 8(r1) -/* 800E1A88 C0 02 92 B8 */ lfs f0, lit_6040(r2) -/* 800E1A8C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800E1A90 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800E1A94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800E1A98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800E1A9C 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 800E1AA0 38 80 00 01 */ li r4, 1 -/* 800E1AA4 38 A0 00 01 */ li r5, 1 -/* 800E1AA8 38 C1 00 08 */ addi r6, r1, 8 -/* 800E1AAC 4B F8 DF 79 */ bl StartShock__12dVibration_cFii4cXyz -/* 800E1AB0 48 00 00 08 */ b lbl_800E1AB8 -lbl_800E1AB4: -/* 800E1AB4 3B E0 00 00 */ li r31, 0 -lbl_800E1AB8: -/* 800E1AB8 38 7E 28 3C */ addi r3, r30, 0x283c -/* 800E1ABC 48 07 D2 41 */ bl clearData__16daPy_actorKeep_cFv -/* 800E1AC0 7F E3 FB 78 */ mr r3, r31 -/* 800E1AC4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 800E1AC8 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 800E1ACC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800E1AD0 7C 08 03 A6 */ mtlr r0 -/* 800E1AD4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E1AD8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/seStartMapInfoLevel__9daAlink_cFUl.s b/asm/d/a/d_a_alink/seStartMapInfoLevel__9daAlink_cFUl.s deleted file mode 100644 index 7d20d2afb80..00000000000 --- a/asm/d/a/d_a_alink/seStartMapInfoLevel__9daAlink_cFUl.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800BF1CC: -/* 800BF1CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BF1D0 7C 08 02 A6 */ mflr r0 -/* 800BF1D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BF1D8 7C 66 1B 78 */ mr r6, r3 -/* 800BF1DC 90 81 00 08 */ stw r4, 8(r1) -/* 800BF1E0 38 66 2C A8 */ addi r3, r6, 0x2ca8 -/* 800BF1E4 38 81 00 08 */ addi r4, r1, 8 -/* 800BF1E8 88 A6 2F A5 */ lbz r5, 0x2fa5(r6) -/* 800BF1EC 88 C6 2F 9A */ lbz r6, 0x2f9a(r6) -/* 800BF1F0 48 20 4C 79 */ bl startLinkSoundLevel__14Z2CreatureLinkF10JAISoundIDUlSc -/* 800BF1F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BF1F8 7C 08 03 A6 */ mtlr r0 -/* 800BF1FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BF200 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/seStartMapInfo__9daAlink_cFUl.s b/asm/d/a/d_a_alink/seStartMapInfo__9daAlink_cFUl.s deleted file mode 100644 index 0fe3ac17e8f..00000000000 --- a/asm/d/a/d_a_alink/seStartMapInfo__9daAlink_cFUl.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800BF194: -/* 800BF194 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BF198 7C 08 02 A6 */ mflr r0 -/* 800BF19C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BF1A0 7C 66 1B 78 */ mr r6, r3 -/* 800BF1A4 90 81 00 08 */ stw r4, 8(r1) -/* 800BF1A8 38 66 2C A8 */ addi r3, r6, 0x2ca8 -/* 800BF1AC 38 81 00 08 */ addi r4, r1, 8 -/* 800BF1B0 88 A6 2F A5 */ lbz r5, 0x2fa5(r6) -/* 800BF1B4 88 C6 2F 9A */ lbz r6, 0x2f9a(r6) -/* 800BF1B8 48 20 4A 1D */ bl startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc -/* 800BF1BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BF1C0 7C 08 03 A6 */ mtlr r0 -/* 800BF1C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BF1C8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/seStartOnlyReverbLevel__9daAlink_cFUl.s b/asm/d/a/d_a_alink/seStartOnlyReverbLevel__9daAlink_cFUl.s deleted file mode 100644 index 0daf3c117c6..00000000000 --- a/asm/d/a/d_a_alink/seStartOnlyReverbLevel__9daAlink_cFUl.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800BF15C: -/* 800BF15C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BF160 7C 08 02 A6 */ mflr r0 -/* 800BF164 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BF168 7C 66 1B 78 */ mr r6, r3 -/* 800BF16C 90 81 00 08 */ stw r4, 8(r1) -/* 800BF170 38 66 2C A8 */ addi r3, r6, 0x2ca8 -/* 800BF174 38 81 00 08 */ addi r4, r1, 8 -/* 800BF178 38 A0 00 00 */ li r5, 0 -/* 800BF17C 88 C6 2F 9A */ lbz r6, 0x2f9a(r6) -/* 800BF180 48 20 4C E9 */ bl startLinkSoundLevel__14Z2CreatureLinkF10JAISoundIDUlSc -/* 800BF184 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BF188 7C 08 03 A6 */ mtlr r0 -/* 800BF18C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BF190 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/seStartOnlyReverb__9daAlink_cFUl.s b/asm/d/a/d_a_alink/seStartOnlyReverb__9daAlink_cFUl.s deleted file mode 100644 index 167750ff9da..00000000000 --- a/asm/d/a/d_a_alink/seStartOnlyReverb__9daAlink_cFUl.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800BF124: -/* 800BF124 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BF128 7C 08 02 A6 */ mflr r0 -/* 800BF12C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BF130 7C 66 1B 78 */ mr r6, r3 -/* 800BF134 90 81 00 08 */ stw r4, 8(r1) -/* 800BF138 38 66 2C A8 */ addi r3, r6, 0x2ca8 -/* 800BF13C 38 81 00 08 */ addi r4, r1, 8 -/* 800BF140 38 A0 00 00 */ li r5, 0 -/* 800BF144 88 C6 2F 9A */ lbz r6, 0x2f9a(r6) -/* 800BF148 48 20 4A 8D */ bl startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc -/* 800BF14C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BF150 7C 08 03 A6 */ mtlr r0 -/* 800BF154 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BF158 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/seStartSwordCut__9daAlink_cFUl.s b/asm/d/a/d_a_alink/seStartSwordCut__9daAlink_cFUl.s deleted file mode 100644 index f401a548289..00000000000 --- a/asm/d/a/d_a_alink/seStartSwordCut__9daAlink_cFUl.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800BF0EC: -/* 800BF0EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BF0F0 7C 08 02 A6 */ mflr r0 -/* 800BF0F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BF0F8 7C 66 1B 78 */ mr r6, r3 -/* 800BF0FC 90 81 00 08 */ stw r4, 8(r1) -/* 800BF100 38 66 2C A8 */ addi r3, r6, 0x2ca8 -/* 800BF104 38 81 00 08 */ addi r4, r1, 8 -/* 800BF108 38 A0 00 00 */ li r5, 0 -/* 800BF10C 88 C6 2F 9A */ lbz r6, 0x2f9a(r6) -/* 800BF110 48 20 55 E1 */ bl startLinkSwordSound__14Z2CreatureLinkF10JAISoundIDUlSc -/* 800BF114 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BF118 7C 08 03 A6 */ mtlr r0 -/* 800BF11C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BF120 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/searchWolfLockEnemy__9daAlink_cFP10fopAc_ac_cPv.s b/asm/d/a/d_a_alink/searchWolfLockEnemy__9daAlink_cFP10fopAc_ac_cPv.s deleted file mode 100644 index c2534e8a2e8..00000000000 --- a/asm/d/a/d_a_alink/searchWolfLockEnemy__9daAlink_cFP10fopAc_ac_cPv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_801391E4: -/* 801391E4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801391E8 7C 08 02 A6 */ mflr r0 -/* 801391EC 90 01 00 24 */ stw r0, 0x24(r1) -/* 801391F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801391F4 48 22 8F E9 */ bl _savegpr_29 -/* 801391F8 7C 7D 1B 78 */ mr r29, r3 -/* 801391FC 7C 9E 23 78 */ mr r30, r4 -/* 80139200 7C BF 2B 78 */ mr r31, r5 -/* 80139204 38 60 00 00 */ li r3, 0 -/* 80139208 88 1D 2F B1 */ lbz r0, 0x2fb1(r29) -/* 8013920C 7C 09 03 A6 */ mtctr r0 -/* 80139210 2C 00 00 00 */ cmpwi r0, 0 -/* 80139214 40 81 00 1C */ ble lbl_80139230 -lbl_80139218: -/* 80139218 38 03 07 C8 */ addi r0, r3, 0x7c8 -/* 8013921C 7C 1D 00 2E */ lwzx r0, r29, r0 -/* 80139220 7C 00 F0 40 */ cmplw r0, r30 -/* 80139224 41 82 00 6C */ beq lbl_80139290 -/* 80139228 38 63 00 08 */ addi r3, r3, 8 -/* 8013922C 42 00 FF EC */ bdnz lbl_80139218 -lbl_80139230: -/* 80139230 88 1E 04 96 */ lbz r0, 0x496(r30) -/* 80139234 28 00 00 02 */ cmplwi r0, 2 -/* 80139238 40 82 00 58 */ bne lbl_80139290 -/* 8013923C 80 1E 05 5C */ lwz r0, 0x55c(r30) -/* 80139240 70 00 00 05 */ andi. r0, r0, 5 -/* 80139244 41 82 00 4C */ beq lbl_80139290 -/* 80139248 A0 1E 05 8E */ lhz r0, 0x58e(r30) -/* 8013924C 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16 -/* 80139250 40 82 00 40 */ bne lbl_80139290 -/* 80139254 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 80139258 38 9E 05 38 */ addi r4, r30, 0x538 -/* 8013925C 48 20 E1 41 */ bl PSVECSquareDistance -/* 80139260 C0 7E 05 3C */ lfs f3, 0x53c(r30) -/* 80139264 C0 5D 04 D4 */ lfs f2, 0x4d4(r29) -/* 80139268 C0 02 93 00 */ lfs f0, lit_6895(r2) -/* 8013926C EC 02 00 28 */ fsubs f0, f2, f0 -/* 80139270 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80139274 4C 41 13 82 */ cror 2, 1, 2 -/* 80139278 40 82 00 18 */ bne lbl_80139290 -/* 8013927C C0 1D 34 78 */ lfs f0, 0x3478(r29) -/* 80139280 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80139284 40 80 00 0C */ bge lbl_80139290 -/* 80139288 D0 3D 34 78 */ stfs f1, 0x3478(r29) -/* 8013928C 93 DF 00 00 */ stw r30, 0(r31) -lbl_80139290: -/* 80139290 39 61 00 20 */ addi r11, r1, 0x20 -/* 80139294 48 22 8F 95 */ bl _restgpr_29 -/* 80139298 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8013929C 7C 08 03 A6 */ mtlr r0 -/* 801392A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801392A4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setArmReelAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/setArmReelAnime__9daAlink_cFv.s deleted file mode 100644 index 1f66ca0c510..00000000000 --- a/asm/d/a/d_a_alink/setArmReelAnime__9daAlink_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800F40E4: -/* 800F40E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800F40E8 7C 08 02 A6 */ mflr r0 -/* 800F40EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800F40F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800F40F4 7C 7F 1B 78 */ mr r31, r3 -/* 800F40F8 38 80 01 FB */ li r4, 0x1fb -/* 800F40FC C0 22 92 B8 */ lfs f1, lit_6040(r2) -/* 800F4100 C0 42 92 BC */ lfs f2, lit_6041(r2) -/* 800F4104 4B FB 92 A5 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff -/* 800F4108 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800F410C D0 1F 20 54 */ stfs f0, 0x2054(r31) -/* 800F4110 C0 02 92 B8 */ lfs f0, lit_6040(r2) -/* 800F4114 D0 1F 1F 50 */ stfs f0, 0x1f50(r31) -/* 800F4118 38 00 00 08 */ li r0, 8 -/* 800F411C 98 1F 2F 97 */ stb r0, 0x2f97(r31) -/* 800F4120 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800F4124 54 00 04 5E */ rlwinm r0, r0, 0, 0x11, 0xf -/* 800F4128 90 1F 05 74 */ stw r0, 0x574(r31) -/* 800F412C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800F4130 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800F4134 7C 08 03 A6 */ mtlr r0 -/* 800F4138 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F413C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setArrowShieldPos__9daAlink_cCFP4cXyzP5csXyzPC4cXyzPC4cXyz.s b/asm/d/a/d_a_alink/setArrowShieldPos__9daAlink_cCFP4cXyzP5csXyzPC4cXyzPC4cXyz.s deleted file mode 100644 index 253663b653e..00000000000 --- a/asm/d/a/d_a_alink/setArrowShieldPos__9daAlink_cCFP4cXyzP5csXyzPC4cXyzPC4cXyz.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_800DCD74: -/* 800DCD74 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 800DCD78 7C 08 02 A6 */ mflr r0 -/* 800DCD7C 90 01 00 34 */ stw r0, 0x34(r1) -/* 800DCD80 39 61 00 30 */ addi r11, r1, 0x30 -/* 800DCD84 48 28 54 55 */ bl _savegpr_28 -/* 800DCD88 7C 7C 1B 78 */ mr r28, r3 -/* 800DCD8C 7C 9D 23 78 */ mr r29, r4 -/* 800DCD90 7C BE 2B 78 */ mr r30, r5 -/* 800DCD94 7C DF 33 78 */ mr r31, r6 -/* 800DCD98 80 63 06 78 */ lwz r3, 0x678(r3) -/* 800DCD9C 38 63 00 24 */ addi r3, r3, 0x24 -/* 800DCDA0 7C E4 3B 78 */ mr r4, r7 -/* 800DCDA4 38 A1 00 08 */ addi r5, r1, 8 -/* 800DCDA8 48 26 A0 A5 */ bl PSMTXMultVecSR -/* 800DCDAC 38 61 00 08 */ addi r3, r1, 8 -/* 800DCDB0 48 18 A3 A1 */ bl atan2sY_XZ__4cXyzCFv -/* 800DCDB4 B0 7E 00 00 */ sth r3, 0(r30) -/* 800DCDB8 38 61 00 08 */ addi r3, r1, 8 -/* 800DCDBC 48 18 A3 6D */ bl atan2sX_Z__4cXyzCFv -/* 800DCDC0 B0 7E 00 02 */ sth r3, 2(r30) -/* 800DCDC4 80 7C 06 78 */ lwz r3, 0x678(r28) -/* 800DCDC8 38 63 00 24 */ addi r3, r3, 0x24 -/* 800DCDCC 7F E4 FB 78 */ mr r4, r31 -/* 800DCDD0 7F A5 EB 78 */ mr r5, r29 -/* 800DCDD4 48 26 9F 99 */ bl PSMTXMultVec -/* 800DCDD8 39 61 00 30 */ addi r11, r1, 0x30 -/* 800DCDDC 48 28 54 49 */ bl _restgpr_28 -/* 800DCDE0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 800DCDE4 7C 08 03 A6 */ mtlr r0 -/* 800DCDE8 38 21 00 30 */ addi r1, r1, 0x30 -/* 800DCDEC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setBodyAngleXReadyAnime__9daAlink_cFi.s b/asm/d/a/d_a_alink/setBodyAngleXReadyAnime__9daAlink_cFi.s deleted file mode 100644 index 6128bd9bf6d..00000000000 --- a/asm/d/a/d_a_alink/setBodyAngleXReadyAnime__9daAlink_cFi.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_800BB2B0: -/* 800BB2B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BB2B4 7C 08 02 A6 */ mflr r0 -/* 800BB2B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BB2BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800BB2C0 93 C1 00 08 */ stw r30, 8(r1) -/* 800BB2C4 7C 7E 1B 78 */ mr r30, r3 -/* 800BB2C8 4B FF FD BD */ bl getBodyAngleXAtnActor__9daAlink_cFi -/* 800BB2CC 7C 7F 1B 78 */ mr r31, r3 -/* 800BB2D0 7F C3 F3 78 */ mr r3, r30 -/* 800BB2D4 48 02 1B 1D */ bl checkUpperGuardAnime__9daAlink_cCFv -/* 800BB2D8 2C 03 00 00 */ cmpwi r3, 0 -/* 800BB2DC 41 82 00 10 */ beq lbl_800BB2EC -/* 800BB2E0 7F E0 07 34 */ extsh r0, r31 -/* 800BB2E4 7C 00 0E 70 */ srawi r0, r0, 1 -/* 800BB2E8 7C 1F 07 34 */ extsh r31, r0 -lbl_800BB2EC: -/* 800BB2EC 38 7E 05 9C */ addi r3, r30, 0x59c -/* 800BB2F0 7F E4 FB 78 */ mr r4, r31 -/* 800BB2F4 38 A0 00 04 */ li r5, 4 -/* 800BB2F8 38 C0 0C 00 */ li r6, 0xc00 -/* 800BB2FC 38 E0 01 80 */ li r7, 0x180 -/* 800BB300 48 1B 52 41 */ bl cLib_addCalcAngleS__FPsssss -/* 800BB304 A8 1E 05 9C */ lha r0, 0x59c(r30) -/* 800BB308 B0 1E 31 0A */ sth r0, 0x310a(r30) -/* 800BB30C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800BB310 83 C1 00 08 */ lwz r30, 8(r1) -/* 800BB314 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BB318 7C 08 03 A6 */ mtlr r0 -/* 800BB31C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BB320 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setBoomerangReadyAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/setBoomerangReadyAnime__9daAlink_cFv.s deleted file mode 100644 index 9d93e4252e3..00000000000 --- a/asm/d/a/d_a_alink/setBoomerangReadyAnime__9daAlink_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_800E055C: -/* 800E055C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800E0560 7C 08 02 A6 */ mflr r0 -/* 800E0564 90 01 00 24 */ stw r0, 0x24(r1) -/* 800E0568 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E056C 48 28 1C 71 */ bl _savegpr_29 -/* 800E0570 7C 7D 1B 78 */ mr r29, r3 -/* 800E0574 83 E3 27 E0 */ lwz r31, 0x27e0(r3) -/* 800E0578 3B C0 00 01 */ li r30, 1 -/* 800E057C 7F E3 FB 78 */ mr r3, r31 -/* 800E0580 4B F9 32 65 */ bl LockonTruth__12dAttention_cFv -/* 800E0584 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E0588 40 82 00 14 */ bne lbl_800E059C -/* 800E058C 80 1F 03 34 */ lwz r0, 0x334(r31) -/* 800E0590 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 800E0594 40 82 00 08 */ bne lbl_800E059C -/* 800E0598 3B C0 00 00 */ li r30, 0 -lbl_800E059C: -/* 800E059C 7F A3 EB 78 */ mr r3, r29 -/* 800E05A0 38 80 00 54 */ li r4, 0x54 -/* 800E05A4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 800E05A8 41 82 00 14 */ beq lbl_800E05BC -/* 800E05AC 3C A0 80 39 */ lis r5, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E05B0 38 A5 E6 C8 */ addi r5, r5, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E05B4 C0 25 00 2C */ lfs f1, 0x2c(r5) -/* 800E05B8 48 00 00 08 */ b lbl_800E05C0 -lbl_800E05BC: -/* 800E05BC C0 22 92 C0 */ lfs f1, lit_6108(r2) -lbl_800E05C0: -/* 800E05C0 C0 42 92 C4 */ lfs f2, lit_6109(r2) -/* 800E05C4 4B FC CD E5 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff -/* 800E05C8 7F A3 EB 78 */ mr r3, r29 -/* 800E05CC 4B FF FF 1D */ bl setBoomerangReadyQuake__9daAlink_cFv -/* 800E05D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E05D4 48 28 1C 55 */ bl _restgpr_29 -/* 800E05D8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800E05DC 7C 08 03 A6 */ mtlr r0 -/* 800E05E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E05E4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setBoomerangReadyQuake__9daAlink_cFv.s b/asm/d/a/d_a_alink/setBoomerangReadyQuake__9daAlink_cFv.s deleted file mode 100644 index 90c7c2b922c..00000000000 --- a/asm/d/a/d_a_alink/setBoomerangReadyQuake__9daAlink_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_800E04E8: -/* 800E04E8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800E04EC 7C 08 02 A6 */ mflr r0 -/* 800E04F0 90 01 00 24 */ stw r0, 0x24(r1) -/* 800E04F4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 800E04F8 7C 7F 1B 78 */ mr r31, r3 -/* 800E04FC C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800E0500 D0 21 00 08 */ stfs f1, 8(r1) -/* 800E0504 C0 02 92 B8 */ lfs f0, lit_6040(r2) -/* 800E0508 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800E050C D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800E0510 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800E0514 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800E0518 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 800E051C 38 80 00 01 */ li r4, 1 -/* 800E0520 38 A0 00 01 */ li r5, 1 -/* 800E0524 38 C1 00 08 */ addi r6, r1, 8 -/* 800E0528 4B F8 F5 E9 */ bl StartQuake__12dVibration_cFii4cXyz -/* 800E052C 80 1F 05 7C */ lwz r0, 0x57c(r31) -/* 800E0530 60 00 00 04 */ ori r0, r0, 4 -/* 800E0534 90 1F 05 7C */ stw r0, 0x57c(r31) -/* 800E0538 3C 60 80 39 */ lis r3, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E053C 38 63 E6 C8 */ addi r3, r3, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E0540 A8 03 00 28 */ lha r0, 0x28(r3) -/* 800E0544 B0 1F 30 18 */ sth r0, 0x3018(r31) -/* 800E0548 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 800E054C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800E0550 7C 08 03 A6 */ mtlr r0 -/* 800E0554 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E0558 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setBoomerangSight__9daAlink_cFv.s b/asm/d/a/d_a_alink/setBoomerangSight__9daAlink_cFv.s deleted file mode 100644 index c6fea3a45b2..00000000000 --- a/asm/d/a/d_a_alink/setBoomerangSight__9daAlink_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_800E0E64: -/* 800E0E64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E0E68 7C 08 02 A6 */ mflr r0 -/* 800E0E6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E0E70 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E0E74 7C 7F 1B 78 */ mr r31, r3 -/* 800E0E78 80 03 28 28 */ lwz r0, 0x2828(r3) -/* 800E0E7C 28 00 00 00 */ cmplwi r0, 0 -/* 800E0E80 41 82 00 7C */ beq lbl_800E0EFC -/* 800E0E84 4B FF F6 29 */ bl checkBoomerangThrowAnime__9daAlink_cCFv -/* 800E0E88 2C 03 00 00 */ cmpwi r3, 0 -/* 800E0E8C 40 82 00 70 */ bne lbl_800E0EFC -/* 800E0E90 7F E3 FB 78 */ mr r3, r31 -/* 800E0E94 4B FF F2 89 */ bl getBoomLockMax__9daAlink_cFv -/* 800E0E98 7F E3 FB 78 */ mr r3, r31 -/* 800E0E9C 38 9F 37 E0 */ addi r4, r31, 0x37e0 -/* 800E0EA0 4B FD E6 61 */ bl checkSightLine__9daAlink_cFfP4cXyz -/* 800E0EA4 C0 1F 37 E0 */ lfs f0, 0x37e0(r31) -/* 800E0EA8 D0 1F 20 6C */ stfs f0, 0x206c(r31) -/* 800E0EAC C0 1F 37 E4 */ lfs f0, 0x37e4(r31) -/* 800E0EB0 D0 1F 20 70 */ stfs f0, 0x2070(r31) -/* 800E0EB4 C0 1F 37 E8 */ lfs f0, 0x37e8(r31) -/* 800E0EB8 D0 1F 20 74 */ stfs f0, 0x2074(r31) -/* 800E0EBC 38 00 00 01 */ li r0, 1 -/* 800E0EC0 98 1F 20 68 */ stb r0, 0x2068(r31) -/* 800E0EC4 80 9F 28 28 */ lwz r4, 0x2828(r31) -/* 800E0EC8 88 04 05 F9 */ lbz r0, 0x5f9(r4) -/* 800E0ECC 28 00 00 00 */ cmplwi r0, 0 -/* 800E0ED0 40 82 00 18 */ bne lbl_800E0EE8 -/* 800E0ED4 2C 03 00 00 */ cmpwi r3, 0 -/* 800E0ED8 41 82 00 24 */ beq lbl_800E0EFC -/* 800E0EDC 88 04 09 50 */ lbz r0, 0x950(r4) -/* 800E0EE0 28 00 00 05 */ cmplwi r0, 5 -/* 800E0EE4 40 80 00 18 */ bge lbl_800E0EFC -lbl_800E0EE8: -/* 800E0EE8 7F E3 FB 78 */ mr r3, r31 -/* 800E0EEC 38 80 00 10 */ li r4, 0x10 -/* 800E0EF0 4B FD 17 ED */ bl setItemActionButtonStatus__9daAlink_cFUc -/* 800E0EF4 7F E3 FB 78 */ mr r3, r31 -/* 800E0EF8 4B FD 18 05 */ bl itemActionTrigger__9daAlink_cFv -lbl_800E0EFC: -/* 800E0EFC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E0F00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E0F04 7C 08 03 A6 */ mtlr r0 -/* 800E0F08 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E0F0C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setBowHangAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/setBowHangAnime__9daAlink_cFv.s deleted file mode 100644 index 7e682e0bd06..00000000000 --- a/asm/d/a/d_a_alink/setBowHangAnime__9daAlink_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_800DFC28: -/* 800DFC28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DFC2C 7C 08 02 A6 */ mflr r0 -/* 800DFC30 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DFC34 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DFC38 7C 7F 1B 78 */ mr r31, r3 -/* 800DFC3C A0 63 2F DC */ lhz r3, 0x2fdc(r3) -/* 800DFC40 48 07 EF 51 */ bl checkBowItem__9daPy_py_cFi -/* 800DFC44 2C 03 00 00 */ cmpwi r3, 0 -/* 800DFC48 41 82 00 14 */ beq lbl_800DFC5C -/* 800DFC4C 7F E3 FB 78 */ mr r3, r31 -/* 800DFC50 38 80 00 58 */ li r4, 0x58 -/* 800DFC54 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800DFC58 4B FE 04 2D */ bl changeItemBck__9daAlink_cFUsf -lbl_800DFC5C: -/* 800DFC5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DFC60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DFC64 7C 08 03 A6 */ mtlr r0 -/* 800DFC68 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DFC6C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setBowNormalAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/setBowNormalAnime__9daAlink_cFv.s deleted file mode 100644 index d2e2c7f2fb5..00000000000 --- a/asm/d/a/d_a_alink/setBowNormalAnime__9daAlink_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_800DFC70: -/* 800DFC70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DFC74 7C 08 02 A6 */ mflr r0 -/* 800DFC78 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DFC7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DFC80 7C 7F 1B 78 */ mr r31, r3 -/* 800DFC84 A0 63 2F DC */ lhz r3, 0x2fdc(r3) -/* 800DFC88 48 07 EF 09 */ bl checkBowItem__9daPy_py_cFi -/* 800DFC8C 2C 03 00 00 */ cmpwi r3, 0 -/* 800DFC90 41 82 00 18 */ beq lbl_800DFCA8 -/* 800DFC94 7F E3 FB 78 */ mr r3, r31 -/* 800DFC98 38 80 00 59 */ li r4, 0x59 -/* 800DFC9C C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800DFCA0 4B FE 03 E5 */ bl changeItemBck__9daAlink_cFUsf -/* 800DFCA4 48 00 00 20 */ b lbl_800DFCC4 -lbl_800DFCA8: -/* 800DFCA8 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800DFCAC 28 00 00 4B */ cmplwi r0, 0x4b -/* 800DFCB0 40 82 00 14 */ bne lbl_800DFCC4 -/* 800DFCB4 7F E3 FB 78 */ mr r3, r31 -/* 800DFCB8 38 80 01 F9 */ li r4, 0x1f9 -/* 800DFCBC C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800DFCC0 4B FE 03 C5 */ bl changeItemBck__9daAlink_cFUsf -lbl_800DFCC4: -/* 800DFCC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DFCC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DFCCC 7C 08 03 A6 */ mtlr r0 -/* 800DFCD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DFCD4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setBowOrSlingStatus__9daAlink_cFv.s b/asm/d/a/d_a_alink/setBowOrSlingStatus__9daAlink_cFv.s deleted file mode 100644 index e0fa2b96917..00000000000 --- a/asm/d/a/d_a_alink/setBowOrSlingStatus__9daAlink_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_800DEB8C: -/* 800DEB8C A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800DEB90 28 00 00 4B */ cmplwi r0, 0x4b -/* 800DEB94 40 82 00 1C */ bne lbl_800DEBB0 -/* 800DEB98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800DEB9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800DEBA0 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 800DEBA4 60 00 00 40 */ ori r0, r0, 0x40 -/* 800DEBA8 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 800DEBAC 4E 80 00 20 */ blr -lbl_800DEBB0: -/* 800DEBB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800DEBB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800DEBB8 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 800DEBBC 60 00 10 00 */ ori r0, r0, 0x1000 -/* 800DEBC0 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 800DEBC4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setBowReadyAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/setBowReadyAnime__9daAlink_cFv.s deleted file mode 100644 index 2d153776776..00000000000 --- a/asm/d/a/d_a_alink/setBowReadyAnime__9daAlink_cFv.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_800DEEDC: -/* 800DEEDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DEEE0 7C 08 02 A6 */ mflr r0 -/* 800DEEE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DEEE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DEEEC 7C 7F 1B 78 */ mr r31, r3 -/* 800DEEF0 4B FF FA F9 */ bl checkBowAnime__9daAlink_cCFv -/* 800DEEF4 2C 03 00 00 */ cmpwi r3, 0 -/* 800DEEF8 40 82 00 40 */ bne lbl_800DEF38 -/* 800DEEFC A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800DEF00 28 00 00 59 */ cmplwi r0, 0x59 -/* 800DEF04 40 82 00 2C */ bne lbl_800DEF30 -/* 800DEF08 88 7F 2F 9C */ lbz r3, 0x2f9c(r31) -/* 800DEF0C 4B F4 F6 B5 */ bl dComIfGp_getSelectItemNum__Fi -/* 800DEF10 7C 60 07 35 */ extsh. r0, r3 -/* 800DEF14 41 82 00 10 */ beq lbl_800DEF24 -/* 800DEF18 38 00 00 01 */ li r0, 1 -/* 800DEF1C B0 1F 30 1E */ sth r0, 0x301e(r31) -/* 800DEF20 48 00 00 18 */ b lbl_800DEF38 -lbl_800DEF24: -/* 800DEF24 38 00 00 00 */ li r0, 0 -/* 800DEF28 B0 1F 30 1E */ sth r0, 0x301e(r31) -/* 800DEF2C 48 00 00 0C */ b lbl_800DEF38 -lbl_800DEF30: -/* 800DEF30 38 00 00 00 */ li r0, 0 -/* 800DEF34 B0 1F 30 1E */ sth r0, 0x301e(r31) -lbl_800DEF38: -/* 800DEF38 7F E3 FB 78 */ mr r3, r31 -/* 800DEF3C 38 80 00 0D */ li r4, 0xd -/* 800DEF40 4B FC E4 01 */ bl setUpperAnimeBase__9daAlink_cFUs -/* 800DEF44 80 1F 05 80 */ lwz r0, 0x580(r31) -/* 800DEF48 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 800DEF4C 41 82 00 10 */ beq lbl_800DEF5C -/* 800DEF50 38 00 00 00 */ li r0, 0 -/* 800DEF54 B0 1F 30 1A */ sth r0, 0x301a(r31) -/* 800DEF58 48 00 00 0C */ b lbl_800DEF64 -lbl_800DEF5C: -/* 800DEF5C 38 00 00 03 */ li r0, 3 -/* 800DEF60 B0 1F 30 1A */ sth r0, 0x301a(r31) -lbl_800DEF64: -/* 800DEF64 38 00 00 05 */ li r0, 5 -/* 800DEF68 98 1F 2F 97 */ stb r0, 0x2f97(r31) -/* 800DEF6C 38 00 00 04 */ li r0, 4 -/* 800DEF70 98 1F 2F 96 */ stb r0, 0x2f96(r31) -/* 800DEF74 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800DEF78 28 00 00 4B */ cmplwi r0, 0x4b -/* 800DEF7C 40 82 00 18 */ bne lbl_800DEF94 -/* 800DEF80 7F E3 FB 78 */ mr r3, r31 -/* 800DEF84 38 80 01 F1 */ li r4, 0x1f1 -/* 800DEF88 C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800DEF8C 4B FE 10 F9 */ bl changeItemBck__9daAlink_cFUsf -/* 800DEF90 48 00 00 14 */ b lbl_800DEFA4 -lbl_800DEF94: -/* 800DEF94 7F E3 FB 78 */ mr r3, r31 -/* 800DEF98 38 80 00 43 */ li r4, 0x43 -/* 800DEF9C C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800DEFA0 4B FE 10 E5 */ bl changeItemBck__9daAlink_cFUsf -lbl_800DEFA4: -/* 800DEFA4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DEFA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DEFAC 7C 08 03 A6 */ mtlr r0 -/* 800DEFB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DEFB4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setBowReloadAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/setBowReloadAnime__9daAlink_cFv.s deleted file mode 100644 index 7c222282b1e..00000000000 --- a/asm/d/a/d_a_alink/setBowReloadAnime__9daAlink_cFv.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_800DEFB8: -/* 800DEFB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DEFBC 7C 08 02 A6 */ mflr r0 -/* 800DEFC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DEFC4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DEFC8 7C 7F 1B 78 */ mr r31, r3 -/* 800DEFCC 38 80 00 09 */ li r4, 9 -/* 800DEFD0 38 A0 00 02 */ li r5, 2 -/* 800DEFD4 3C C0 80 39 */ lis r6, m__17daAlinkHIO_bow_c0@ha /* 0x8038E658@ha */ -/* 800DEFD8 38 C6 E6 58 */ addi r6, r6, m__17daAlinkHIO_bow_c0@l /* 0x8038E658@l */ -/* 800DEFDC 38 C6 00 14 */ addi r6, r6, 0x14 -/* 800DEFE0 4B FC E7 11 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c -/* 800DEFE4 7F E3 FB 78 */ mr r3, r31 -/* 800DEFE8 38 80 00 08 */ li r4, 8 -/* 800DEFEC 4B FD 0A BD */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -/* 800DEFF0 7F E3 FB 78 */ mr r3, r31 -/* 800DEFF4 38 80 00 E5 */ li r4, 0xe5 -/* 800DEFF8 38 A0 00 01 */ li r5, 1 -/* 800DEFFC 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800DF000 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800DF004 4B FD 04 AD */ bl setFaceBck__9daAlink_cFUsiUs -/* 800DF008 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800DF00C 28 00 00 4B */ cmplwi r0, 0x4b -/* 800DF010 40 82 00 44 */ bne lbl_800DF054 -/* 800DF014 7F E3 FB 78 */ mr r3, r31 -/* 800DF018 38 80 01 F0 */ li r4, 0x1f0 -/* 800DF01C 3C A0 80 39 */ lis r5, m__17daAlinkHIO_bow_c0@ha /* 0x8038E658@ha */ -/* 800DF020 38 A5 E6 58 */ addi r5, r5, m__17daAlinkHIO_bow_c0@l /* 0x8038E658@l */ -/* 800DF024 C0 25 00 1C */ lfs f1, 0x1c(r5) -/* 800DF028 4B FE 10 5D */ bl changeItemBck__9daAlink_cFUsf -/* 800DF02C 38 00 00 05 */ li r0, 5 -/* 800DF030 98 1F 2F 97 */ stb r0, 0x2f97(r31) -/* 800DF034 7F E3 FB 78 */ mr r3, r31 -/* 800DF038 3C 80 00 02 */ lis r4, 0x0002 /* 0x000200AF@ha */ -/* 800DF03C 38 84 00 AF */ addi r4, r4, 0x00AF /* 0x000200AF@l */ -/* 800DF040 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800DF044 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 800DF048 7D 89 03 A6 */ mtctr r12 -/* 800DF04C 4E 80 04 21 */ bctrl -/* 800DF050 48 00 00 40 */ b lbl_800DF090 -lbl_800DF054: -/* 800DF054 7F E3 FB 78 */ mr r3, r31 -/* 800DF058 38 80 00 41 */ li r4, 0x41 -/* 800DF05C 3C A0 80 39 */ lis r5, m__17daAlinkHIO_bow_c0@ha /* 0x8038E658@ha */ -/* 800DF060 38 A5 E6 58 */ addi r5, r5, m__17daAlinkHIO_bow_c0@l /* 0x8038E658@l */ -/* 800DF064 C0 25 00 1C */ lfs f1, 0x1c(r5) -/* 800DF068 4B FE 10 1D */ bl changeItemBck__9daAlink_cFUsf -/* 800DF06C 38 00 00 07 */ li r0, 7 -/* 800DF070 98 1F 2F 97 */ stb r0, 0x2f97(r31) -/* 800DF074 7F E3 FB 78 */ mr r3, r31 -/* 800DF078 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020042@ha */ -/* 800DF07C 38 84 00 42 */ addi r4, r4, 0x0042 /* 0x00020042@l */ -/* 800DF080 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800DF084 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 800DF088 7D 89 03 A6 */ mtctr r12 -/* 800DF08C 4E 80 04 21 */ bctrl -lbl_800DF090: -/* 800DF090 38 00 00 00 */ li r0, 0 -/* 800DF094 98 1F 2F 96 */ stb r0, 0x2f96(r31) -/* 800DF098 3C 60 80 39 */ lis r3, m__17daAlinkHIO_bow_c0@ha /* 0x8038E658@ha */ -/* 800DF09C 38 63 E6 58 */ addi r3, r3, m__17daAlinkHIO_bow_c0@l /* 0x8038E658@l */ -/* 800DF0A0 A8 03 00 28 */ lha r0, 0x28(r3) -/* 800DF0A4 B0 1F 30 1C */ sth r0, 0x301c(r31) -/* 800DF0A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DF0AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DF0B0 7C 08 03 A6 */ mtlr r0 -/* 800DF0B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DF0B8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setBowSight__9daAlink_cFv.s b/asm/d/a/d_a_alink/setBowSight__9daAlink_cFv.s deleted file mode 100644 index 0e9cf99d874..00000000000 --- a/asm/d/a/d_a_alink/setBowSight__9daAlink_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_800DFCD8: -/* 800DFCD8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 800DFCDC 7C 08 02 A6 */ mflr r0 -/* 800DFCE0 90 01 00 34 */ stw r0, 0x34(r1) -/* 800DFCE4 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 800DFCE8 7C 7F 1B 78 */ mr r31, r3 -/* 800DFCEC A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800DFCF0 28 00 00 0A */ cmplwi r0, 0xa -/* 800DFCF4 40 82 00 5C */ bne lbl_800DFD50 -/* 800DFCF8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800DFCFC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800DFD00 80 04 5F 18 */ lwz r0, 0x5f18(r4) -/* 800DFD04 54 00 02 95 */ rlwinm. r0, r0, 0, 0xa, 0xa -/* 800DFD08 40 82 00 48 */ bne lbl_800DFD50 -/* 800DFD0C 38 81 00 0C */ addi r4, r1, 0xc -/* 800DFD10 38 A1 00 08 */ addi r5, r1, 8 -/* 800DFD14 38 C0 00 01 */ li r6, 1 -/* 800DFD18 4B FF E9 35 */ bl getArrowFlyData__9daAlink_cCFPfPfi -/* 800DFD1C 7F E3 FB 78 */ mr r3, r31 -/* 800DFD20 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 800DFD24 38 81 00 10 */ addi r4, r1, 0x10 -/* 800DFD28 4B FD F7 D9 */ bl checkSightLine__9daAlink_cFfP4cXyz -/* 800DFD2C C0 01 00 10 */ lfs f0, 0x10(r1) -/* 800DFD30 D0 1F 20 6C */ stfs f0, 0x206c(r31) -/* 800DFD34 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 800DFD38 D0 1F 20 70 */ stfs f0, 0x2070(r31) -/* 800DFD3C C0 01 00 18 */ lfs f0, 0x18(r1) -/* 800DFD40 D0 1F 20 74 */ stfs f0, 0x2074(r31) -/* 800DFD44 38 00 00 00 */ li r0, 0 -/* 800DFD48 98 1F 20 68 */ stb r0, 0x2068(r31) -/* 800DFD4C 48 00 00 0C */ b lbl_800DFD58 -lbl_800DFD50: -/* 800DFD50 38 00 00 00 */ li r0, 0 -/* 800DFD54 98 1F 20 68 */ stb r0, 0x2068(r31) -lbl_800DFD58: -/* 800DFD58 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 800DFD5C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 800DFD60 7C 08 03 A6 */ mtlr r0 -/* 800DFD64 38 21 00 30 */ addi r1, r1, 0x30 -/* 800DFD68 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setCollisionPos__9daAlink_cFv.s b/asm/d/a/d_a_alink/setCollisionPos__9daAlink_cFv.s deleted file mode 100644 index 78ab4020d9a..00000000000 --- a/asm/d/a/d_a_alink/setCollisionPos__9daAlink_cFv.s +++ /dev/null @@ -1,150 +0,0 @@ -lbl_800ABB84: -/* 800ABB84 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 800ABB88 7C 08 02 A6 */ mflr r0 -/* 800ABB8C 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 800ABB90 DB E1 00 90 */ stfd f31, 0x90(r1) -/* 800ABB94 F3 E1 00 98 */ psq_st f31, 152(r1), 0, 0 /* qr0 */ -/* 800ABB98 93 E1 00 8C */ stw r31, 0x8c(r1) -/* 800ABB9C 7C 7F 1B 78 */ mr r31, r3 -/* 800ABBA0 80 63 06 50 */ lwz r3, 0x650(r3) -/* 800ABBA4 80 63 00 84 */ lwz r3, 0x84(r3) -/* 800ABBA8 80 63 00 0C */ lwz r3, 0xc(r3) -/* 800ABBAC C0 03 00 0C */ lfs f0, 0xc(r3) -/* 800ABBB0 D0 01 00 74 */ stfs f0, 0x74(r1) -/* 800ABBB4 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 800ABBB8 D0 01 00 78 */ stfs f0, 0x78(r1) -/* 800ABBBC C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 800ABBC0 D0 01 00 7C */ stfs f0, 0x7c(r1) -/* 800ABBC4 38 61 00 5C */ addi r3, r1, 0x5c -/* 800ABBC8 38 81 00 74 */ addi r4, r1, 0x74 -/* 800ABBCC 38 BF 05 A4 */ addi r5, r31, 0x5a4 -/* 800ABBD0 48 1B AF 15 */ bl __pl__4cXyzCFRC3Vec -/* 800ABBD4 38 61 00 50 */ addi r3, r1, 0x50 -/* 800ABBD8 38 81 00 5C */ addi r4, r1, 0x5c -/* 800ABBDC C0 22 92 98 */ lfs f1, lit_5943(r2) -/* 800ABBE0 48 1B AF A5 */ bl __ml__4cXyzCFf -/* 800ABBE4 C0 01 00 50 */ lfs f0, 0x50(r1) -/* 800ABBE8 D0 01 00 68 */ stfs f0, 0x68(r1) -/* 800ABBEC C0 01 00 54 */ lfs f0, 0x54(r1) -/* 800ABBF0 D0 01 00 6C */ stfs f0, 0x6c(r1) -/* 800ABBF4 C0 01 00 58 */ lfs f0, 0x58(r1) -/* 800ABBF8 D0 01 00 70 */ stfs f0, 0x70(r1) -/* 800ABBFC C0 21 00 78 */ lfs f1, 0x78(r1) -/* 800ABC00 C0 1F 05 A8 */ lfs f0, 0x5a8(r31) -/* 800ABC04 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800ABC08 40 81 00 10 */ ble lbl_800ABC18 -/* 800ABC0C D0 01 00 6C */ stfs f0, 0x6c(r1) -/* 800ABC10 EF E1 00 28 */ fsubs f31, f1, f0 -/* 800ABC14 48 00 00 0C */ b lbl_800ABC20 -lbl_800ABC18: -/* 800ABC18 D0 21 00 6C */ stfs f1, 0x6c(r1) -/* 800ABC1C EF E0 08 28 */ fsubs f31, f0, f1 -lbl_800ABC20: -/* 800ABC20 C0 62 93 B4 */ lfs f3, lit_10040(r2) -/* 800ABC24 FC 1F 18 40 */ fcmpo cr0, f31, f3 -/* 800ABC28 40 80 00 20 */ bge lbl_800ABC48 -/* 800ABC2C C0 41 00 6C */ lfs f2, 0x6c(r1) -/* 800ABC30 C0 22 92 98 */ lfs f1, lit_5943(r2) -/* 800ABC34 EC 03 F8 28 */ fsubs f0, f3, f31 -/* 800ABC38 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800ABC3C EC 02 00 28 */ fsubs f0, f2, f0 -/* 800ABC40 D0 01 00 6C */ stfs f0, 0x6c(r1) -/* 800ABC44 FF E0 18 90 */ fmr f31, f3 -lbl_800ABC48: -/* 800ABC48 38 7F 0B EC */ addi r3, r31, 0xbec -/* 800ABC4C 38 81 00 68 */ addi r4, r1, 0x68 -/* 800ABC50 48 1C 35 8D */ bl SetC__8cM3dGCylFRC4cXyz -/* 800ABC54 38 7F 0B EC */ addi r3, r31, 0xbec -/* 800ABC58 FC 20 F8 90 */ fmr f1, f31 -/* 800ABC5C 48 1C 35 9D */ bl SetH__8cM3dGCylFf -/* 800ABC60 38 61 00 44 */ addi r3, r1, 0x44 -/* 800ABC64 38 9F 05 E0 */ addi r4, r31, 0x5e0 -/* 800ABC68 38 BF 05 EC */ addi r5, r31, 0x5ec -/* 800ABC6C 48 1B AE 79 */ bl __pl__4cXyzCFRC3Vec -/* 800ABC70 38 61 00 38 */ addi r3, r1, 0x38 -/* 800ABC74 38 81 00 44 */ addi r4, r1, 0x44 -/* 800ABC78 C0 22 92 98 */ lfs f1, lit_5943(r2) -/* 800ABC7C 48 1B AF 09 */ bl __ml__4cXyzCFf -/* 800ABC80 38 61 00 2C */ addi r3, r1, 0x2c -/* 800ABC84 38 81 00 38 */ addi r4, r1, 0x38 -/* 800ABC88 38 A1 00 74 */ addi r5, r1, 0x74 -/* 800ABC8C 48 1B AE 59 */ bl __pl__4cXyzCFRC3Vec -/* 800ABC90 38 61 00 20 */ addi r3, r1, 0x20 -/* 800ABC94 38 81 00 2C */ addi r4, r1, 0x2c -/* 800ABC98 C0 22 92 98 */ lfs f1, lit_5943(r2) -/* 800ABC9C 48 1B AE E9 */ bl __ml__4cXyzCFf -/* 800ABCA0 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 800ABCA4 D0 01 00 68 */ stfs f0, 0x68(r1) -/* 800ABCA8 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 800ABCAC D0 01 00 6C */ stfs f0, 0x6c(r1) -/* 800ABCB0 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 800ABCB4 D0 01 00 70 */ stfs f0, 0x70(r1) -/* 800ABCB8 C0 3F 05 E4 */ lfs f1, 0x5e4(r31) -/* 800ABCBC C0 1F 05 F0 */ lfs f0, 0x5f0(r31) -/* 800ABCC0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800ABCC4 40 81 00 08 */ ble lbl_800ABCCC -/* 800ABCC8 48 00 00 08 */ b lbl_800ABCD0 -lbl_800ABCCC: -/* 800ABCCC FC 00 08 90 */ fmr f0, f1 -lbl_800ABCD0: -/* 800ABCD0 C0 21 00 78 */ lfs f1, 0x78(r1) -/* 800ABCD4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800ABCD8 40 81 00 10 */ ble lbl_800ABCE8 -/* 800ABCDC D0 01 00 6C */ stfs f0, 0x6c(r1) -/* 800ABCE0 EF E1 00 28 */ fsubs f31, f1, f0 -/* 800ABCE4 48 00 00 0C */ b lbl_800ABCF0 -lbl_800ABCE8: -/* 800ABCE8 D0 21 00 6C */ stfs f1, 0x6c(r1) -/* 800ABCEC EF E0 08 28 */ fsubs f31, f0, f1 -lbl_800ABCF0: -/* 800ABCF0 C0 62 93 B4 */ lfs f3, lit_10040(r2) -/* 800ABCF4 FC 1F 18 40 */ fcmpo cr0, f31, f3 -/* 800ABCF8 40 80 00 20 */ bge lbl_800ABD18 -/* 800ABCFC C0 41 00 6C */ lfs f2, 0x6c(r1) -/* 800ABD00 C0 22 92 98 */ lfs f1, lit_5943(r2) -/* 800ABD04 EC 03 F8 28 */ fsubs f0, f3, f31 -/* 800ABD08 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800ABD0C EC 02 00 28 */ fsubs f0, f2, f0 -/* 800ABD10 D0 01 00 6C */ stfs f0, 0x6c(r1) -/* 800ABD14 FF E0 18 90 */ fmr f31, f3 -lbl_800ABD18: -/* 800ABD18 38 7F 09 74 */ addi r3, r31, 0x974 -/* 800ABD1C 38 81 00 68 */ addi r4, r1, 0x68 -/* 800ABD20 48 1C 34 BD */ bl SetC__8cM3dGCylFRC4cXyz -/* 800ABD24 38 7F 09 74 */ addi r3, r31, 0x974 -/* 800ABD28 FC 20 F8 90 */ fmr f1, f31 -/* 800ABD2C 48 1C 34 CD */ bl SetH__8cM3dGCylFf -/* 800ABD30 38 61 00 14 */ addi r3, r1, 0x14 -/* 800ABD34 38 9F 09 74 */ addi r4, r31, 0x974 -/* 800ABD38 38 BF 0B EC */ addi r5, r31, 0xbec -/* 800ABD3C 48 1B AD A9 */ bl __pl__4cXyzCFRC3Vec -/* 800ABD40 38 61 00 08 */ addi r3, r1, 8 -/* 800ABD44 38 81 00 14 */ addi r4, r1, 0x14 -/* 800ABD48 C0 22 92 98 */ lfs f1, lit_5943(r2) -/* 800ABD4C 48 1B AE 39 */ bl __ml__4cXyzCFf -/* 800ABD50 C0 01 00 08 */ lfs f0, 8(r1) -/* 800ABD54 D0 01 00 68 */ stfs f0, 0x68(r1) -/* 800ABD58 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 800ABD5C D0 01 00 6C */ stfs f0, 0x6c(r1) -/* 800ABD60 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 800ABD64 D0 01 00 70 */ stfs f0, 0x70(r1) -/* 800ABD68 C0 42 92 98 */ lfs f2, lit_5943(r2) -/* 800ABD6C C0 3F 09 84 */ lfs f1, 0x984(r31) -/* 800ABD70 C0 1F 0B FC */ lfs f0, 0xbfc(r31) -/* 800ABD74 EC 01 00 2A */ fadds f0, f1, f0 -/* 800ABD78 EF E2 00 32 */ fmuls f31, f2, f0 -/* 800ABD7C 38 7F 0A B0 */ addi r3, r31, 0xab0 -/* 800ABD80 38 81 00 68 */ addi r4, r1, 0x68 -/* 800ABD84 48 1C 34 59 */ bl SetC__8cM3dGCylFRC4cXyz -/* 800ABD88 38 7F 0A B0 */ addi r3, r31, 0xab0 -/* 800ABD8C FC 20 F8 90 */ fmr f1, f31 -/* 800ABD90 48 1C 34 69 */ bl SetH__8cM3dGCylFf -/* 800ABD94 C0 1F 38 38 */ lfs f0, 0x3838(r31) -/* 800ABD98 D0 1F 34 54 */ stfs f0, 0x3454(r31) -/* 800ABD9C E3 E1 00 98 */ psq_l f31, 152(r1), 0, 0 /* qr0 */ -/* 800ABDA0 CB E1 00 90 */ lfd f31, 0x90(r1) -/* 800ABDA4 83 E1 00 8C */ lwz r31, 0x8c(r1) -/* 800ABDA8 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 800ABDAC 7C 08 03 A6 */ mtlr r0 -/* 800ABDB0 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 800ABDB4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setCommonBoardAnime__9daAlink_cFi.s b/asm/d/a/d_a_alink/setCommonBoardAnime__9daAlink_cFi.s deleted file mode 100644 index a95d3ecb1b8..00000000000 --- a/asm/d/a/d_a_alink/setCommonBoardAnime__9daAlink_cFi.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80106534: -/* 80106534 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80106538 7C 08 02 A6 */ mflr r0 -/* 8010653C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80106540 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 80106544 3C A0 80 39 */ lis r5, m__19daAlinkHIO_board_c0@ha /* 0x8038E870@ha */ -/* 80106548 38 A5 E8 70 */ addi r5, r5, m__19daAlinkHIO_board_c0@l /* 0x8038E870@l */ -/* 8010654C C0 45 00 60 */ lfs f2, 0x60(r5) -/* 80106550 C0 62 92 B8 */ lfs f3, lit_6040(r2) -/* 80106554 2C 04 00 00 */ cmpwi r4, 0 -/* 80106558 38 80 00 F2 */ li r4, 0xf2 -/* 8010655C 41 82 00 08 */ beq lbl_80106564 -/* 80106560 38 80 00 F3 */ li r4, 0xf3 -lbl_80106564: -/* 80106564 38 A0 00 F5 */ li r5, 0xf5 -/* 80106568 38 C0 00 0B */ li r6, 0xb -/* 8010656C 3C E0 80 39 */ lis r7, m__19daAlinkHIO_board_c0@ha /* 0x8038E870@ha */ -/* 80106570 38 E7 E8 70 */ addi r7, r7, m__19daAlinkHIO_board_c0@l /* 0x8038E870@l */ -/* 80106574 C0 87 00 64 */ lfs f4, 0x64(r7) -/* 80106578 4B FA 64 9D */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif -/* 8010657C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80106580 7C 08 03 A6 */ mtlr r0 -/* 80106584 38 21 00 10 */ addi r1, r1, 0x10 -/* 80106588 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setCopyRodReadyAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/setCopyRodReadyAnime__9daAlink_cFv.s deleted file mode 100644 index 4e3083d9e1b..00000000000 --- a/asm/d/a/d_a_alink/setCopyRodReadyAnime__9daAlink_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_800E1840: -/* 800E1840 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800E1844 7C 08 02 A6 */ mflr r0 -/* 800E1848 90 01 00 24 */ stw r0, 0x24(r1) -/* 800E184C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E1850 48 28 09 8D */ bl _savegpr_29 -/* 800E1854 7C 7D 1B 78 */ mr r29, r3 -/* 800E1858 83 E3 27 E0 */ lwz r31, 0x27e0(r3) -/* 800E185C 3B C0 00 01 */ li r30, 1 -/* 800E1860 7F E3 FB 78 */ mr r3, r31 -/* 800E1864 4B F9 1F 81 */ bl LockonTruth__12dAttention_cFv -/* 800E1868 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E186C 40 82 00 14 */ bne lbl_800E1880 -/* 800E1870 80 1F 03 34 */ lwz r0, 0x334(r31) -/* 800E1874 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 800E1878 40 82 00 08 */ bne lbl_800E1880 -/* 800E187C 3B C0 00 00 */ li r30, 0 -lbl_800E1880: -/* 800E1880 7F A3 EB 78 */ mr r3, r29 -/* 800E1884 38 80 00 54 */ li r4, 0x54 -/* 800E1888 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 800E188C 41 82 00 14 */ beq lbl_800E18A0 -/* 800E1890 3C A0 80 39 */ lis r5, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E1894 38 A5 E6 C8 */ addi r5, r5, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E1898 C0 25 00 2C */ lfs f1, 0x2c(r5) -/* 800E189C 48 00 00 08 */ b lbl_800E18A4 -lbl_800E18A0: -/* 800E18A0 C0 22 92 C0 */ lfs f1, lit_6108(r2) -lbl_800E18A4: -/* 800E18A4 C0 42 92 C4 */ lfs f2, lit_6109(r2) -/* 800E18A8 4B FC BB 01 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff -/* 800E18AC 7F A3 EB 78 */ mr r3, r29 -/* 800E18B0 81 9D 06 28 */ lwz r12, 0x628(r29) -/* 800E18B4 81 8C 02 A0 */ lwz r12, 0x2a0(r12) -/* 800E18B8 7D 89 03 A6 */ mtctr r12 -/* 800E18BC 4E 80 04 21 */ bctrl -/* 800E18C0 2C 03 00 00 */ cmpwi r3, 0 -/* 800E18C4 41 82 00 18 */ beq lbl_800E18DC -/* 800E18C8 7F A3 EB 78 */ mr r3, r29 -/* 800E18CC 3C 80 00 02 */ lis r4, 0x0002 /* 0x0002006B@ha */ -/* 800E18D0 38 84 00 6B */ addi r4, r4, 0x006B /* 0x0002006B@l */ -/* 800E18D4 4B FD D8 19 */ bl seStartSwordCut__9daAlink_cFUl -/* 800E18D8 48 00 00 14 */ b lbl_800E18EC -lbl_800E18DC: -/* 800E18DC 7F A3 EB 78 */ mr r3, r29 -/* 800E18E0 3C 80 00 02 */ lis r4, 0x0002 /* 0x0002008F@ha */ -/* 800E18E4 38 84 00 8F */ addi r4, r4, 0x008F /* 0x0002008F@l */ -/* 800E18E8 4B FD D8 05 */ bl seStartSwordCut__9daAlink_cFUl -lbl_800E18EC: -/* 800E18EC C0 02 93 78 */ lfs f0, lit_8676(r2) -/* 800E18F0 D0 1D 13 6C */ stfs f0, 0x136c(r29) -/* 800E18F4 3C 00 01 00 */ lis r0, 0x100 -/* 800E18F8 90 1D 12 3C */ stw r0, 0x123c(r29) -/* 800E18FC 7F A3 EB 78 */ mr r3, r29 -/* 800E1900 4B FC A1 E1 */ bl initLockAt__9daAlink_cFv -/* 800E1904 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E1908 48 28 09 21 */ bl _restgpr_29 -/* 800E190C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800E1910 7C 08 03 A6 */ mtlr r0 -/* 800E1914 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E1918 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setCopyRodSight__9daAlink_cFv.s b/asm/d/a/d_a_alink/setCopyRodSight__9daAlink_cFv.s deleted file mode 100644 index ea18cefc90f..00000000000 --- a/asm/d/a/d_a_alink/setCopyRodSight__9daAlink_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_800E1D6C: -/* 800E1D6C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800E1D70 7C 08 02 A6 */ mflr r0 -/* 800E1D74 90 01 00 24 */ stw r0, 0x24(r1) -/* 800E1D78 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 800E1D7C 7C 7F 1B 78 */ mr r31, r3 -/* 800E1D80 80 03 28 28 */ lwz r0, 0x2828(r3) -/* 800E1D84 28 00 00 00 */ cmplwi r0, 0 -/* 800E1D88 41 82 00 84 */ beq lbl_800E1E0C -/* 800E1D8C 38 60 00 00 */ li r3, 0 -/* 800E1D90 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800E1D94 28 00 00 46 */ cmplwi r0, 0x46 -/* 800E1D98 40 82 00 14 */ bne lbl_800E1DAC -/* 800E1D9C A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 800E1DA0 28 00 00 53 */ cmplwi r0, 0x53 -/* 800E1DA4 40 82 00 08 */ bne lbl_800E1DAC -/* 800E1DA8 38 60 00 01 */ li r3, 1 -lbl_800E1DAC: -/* 800E1DAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E1DB0 40 82 00 5C */ bne lbl_800E1E0C -/* 800E1DB4 7F E3 FB 78 */ mr r3, r31 -/* 800E1DB8 4B FF F5 79 */ bl getCopyRodBallDisMax__9daAlink_cCFv -/* 800E1DBC 7F E3 FB 78 */ mr r3, r31 -/* 800E1DC0 38 81 00 08 */ addi r4, r1, 8 -/* 800E1DC4 4B FD D7 3D */ bl checkSightLine__9daAlink_cFfP4cXyz -/* 800E1DC8 C0 01 00 08 */ lfs f0, 8(r1) -/* 800E1DCC D0 1F 20 6C */ stfs f0, 0x206c(r31) -/* 800E1DD0 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 800E1DD4 D0 1F 20 70 */ stfs f0, 0x2070(r31) -/* 800E1DD8 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 800E1DDC D0 1F 20 74 */ stfs f0, 0x2074(r31) -/* 800E1DE0 38 00 00 01 */ li r0, 1 -/* 800E1DE4 98 1F 20 68 */ stb r0, 0x2068(r31) -/* 800E1DE8 38 7F 12 2C */ addi r3, r31, 0x122c -/* 800E1DEC 4B FA 24 D5 */ bl ChkAtHit__12dCcD_GObjInfFv -/* 800E1DF0 28 03 00 00 */ cmplwi r3, 0 -/* 800E1DF4 41 82 00 10 */ beq lbl_800E1E04 -/* 800E1DF8 38 7F 20 64 */ addi r3, r31, 0x2064 -/* 800E1DFC 48 04 49 15 */ bl onLockFlg__15daAlink_sight_cFv -/* 800E1E00 48 00 00 0C */ b lbl_800E1E0C -lbl_800E1E04: -/* 800E1E04 38 00 00 00 */ li r0, 0 -/* 800E1E08 98 1F 20 B0 */ stb r0, 0x20b0(r31) -lbl_800E1E0C: -/* 800E1E0C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 800E1E10 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800E1E14 7C 08 03 A6 */ mtlr r0 -/* 800E1E18 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E1E1C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setCutDash__9daAlink_cFii.s b/asm/d/a/d_a_alink/setCutDash__9daAlink_cFii.s deleted file mode 100644 index 36aaf7c9e7a..00000000000 --- a/asm/d/a/d_a_alink/setCutDash__9daAlink_cFii.s +++ /dev/null @@ -1,181 +0,0 @@ -lbl_800D1E1C: -/* 800D1E1C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800D1E20 7C 08 02 A6 */ mflr r0 -/* 800D1E24 90 01 00 24 */ stw r0, 0x24(r1) -/* 800D1E28 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D1E2C 48 29 03 B1 */ bl _savegpr_29 -/* 800D1E30 7C 7F 1B 78 */ mr r31, r3 -/* 800D1E34 7C BD 2B 78 */ mr r29, r5 -/* 800D1E38 3C A0 80 39 */ lis r5, lit_3757@ha /* 0x8038D658@ha */ -/* 800D1E3C 3B C5 D6 58 */ addi r30, r5, lit_3757@l /* 0x8038D658@l */ -/* 800D1E40 2C 04 00 00 */ cmpwi r4, 0 -/* 800D1E44 40 82 00 18 */ bne lbl_800D1E5C -/* 800D1E48 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800D1E4C 54 00 01 4B */ rlwinm. r0, r0, 0, 5, 5 -/* 800D1E50 41 82 00 0C */ beq lbl_800D1E5C -/* 800D1E54 48 00 05 6D */ bl checkCutAction__9daAlink_cFv -/* 800D1E58 48 00 02 44 */ b lbl_800D209C -lbl_800D1E5C: -/* 800D1E5C 38 00 00 05 */ li r0, 5 -/* 800D1E60 98 1F 2F CE */ stb r0, 0x2fce(r31) -/* 800D1E64 7F E3 FB 78 */ mr r3, r31 -/* 800D1E68 38 80 00 00 */ li r4, 0 -/* 800D1E6C 4B FF F5 C5 */ bl resetCombo__9daAlink_cFi -/* 800D1E70 80 1F 05 78 */ lwz r0, 0x578(r31) -/* 800D1E74 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d -/* 800D1E78 90 1F 05 78 */ stw r0, 0x578(r31) -/* 800D1E7C 7F E3 FB 78 */ mr r3, r31 -/* 800D1E80 38 80 00 00 */ li r4, 0 -/* 800D1E84 38 A0 00 07 */ li r5, 7 -/* 800D1E88 38 C0 00 10 */ li r6, 0x10 -/* 800D1E8C 38 E0 00 01 */ li r7, 1 -/* 800D1E90 39 1E 08 34 */ addi r8, r30, 0x834 -/* 800D1E94 C0 28 00 84 */ lfs f1, 0x84(r8) -/* 800D1E98 C0 48 00 88 */ lfs f2, 0x88(r8) -/* 800D1E9C 4B FF F7 ED */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff -/* 800D1EA0 38 00 00 02 */ li r0, 2 -/* 800D1EA4 98 1F 2F D0 */ stb r0, 0x2fd0(r31) -/* 800D1EA8 88 7F 2F A1 */ lbz r3, 0x2fa1(r31) -/* 800D1EAC 38 03 00 01 */ addi r0, r3, 1 -/* 800D1EB0 98 1F 2F A1 */ stb r0, 0x2fa1(r31) -/* 800D1EB4 2C 1D 00 00 */ cmpwi r29, 0 -/* 800D1EB8 41 82 00 68 */ beq lbl_800D1F20 -/* 800D1EBC 7F E3 FB 78 */ mr r3, r31 -/* 800D1EC0 38 80 00 82 */ li r4, 0x82 -/* 800D1EC4 38 A0 00 02 */ li r5, 2 -/* 800D1EC8 38 DE 06 D0 */ addi r6, r30, 0x6d0 -/* 800D1ECC 4B FD B8 25 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c -/* 800D1ED0 7F E3 FB 78 */ mr r3, r31 -/* 800D1ED4 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800D1ED8 81 8C 01 94 */ lwz r12, 0x194(r12) -/* 800D1EDC 7D 89 03 A6 */ mtctr r12 -/* 800D1EE0 4E 80 04 21 */ bctrl -/* 800D1EE4 28 03 00 00 */ cmplwi r3, 0 -/* 800D1EE8 41 82 00 14 */ beq lbl_800D1EFC -/* 800D1EEC 7F E3 FB 78 */ mr r3, r31 -/* 800D1EF0 38 80 00 0D */ li r4, 0xd -/* 800D1EF4 4B FF F6 39 */ bl setCutType__9daAlink_cFUc -/* 800D1EF8 48 00 00 10 */ b lbl_800D1F08 -lbl_800D1EFC: -/* 800D1EFC 7F E3 FB 78 */ mr r3, r31 -/* 800D1F00 38 80 00 38 */ li r4, 0x38 -/* 800D1F04 4B FF F6 29 */ bl setCutType__9daAlink_cFUc -lbl_800D1F08: -/* 800D1F08 88 1F 2F A1 */ lbz r0, 0x2fa1(r31) -/* 800D1F0C 28 00 00 03 */ cmplwi r0, 3 -/* 800D1F10 40 82 01 18 */ bne lbl_800D2028 -/* 800D1F14 38 00 00 01 */ li r0, 1 -/* 800D1F18 98 1F 2F A1 */ stb r0, 0x2fa1(r31) -/* 800D1F1C 48 00 01 0C */ b lbl_800D2028 -lbl_800D1F20: -/* 800D1F20 88 1F 2F A1 */ lbz r0, 0x2fa1(r31) -/* 800D1F24 28 00 00 01 */ cmplwi r0, 1 -/* 800D1F28 41 82 00 0C */ beq lbl_800D1F34 -/* 800D1F2C 28 00 00 03 */ cmplwi r0, 3 -/* 800D1F30 40 82 00 84 */ bne lbl_800D1FB4 -lbl_800D1F34: -/* 800D1F34 7F E3 FB 78 */ mr r3, r31 -/* 800D1F38 38 80 00 80 */ li r4, 0x80 -/* 800D1F3C 38 A0 00 02 */ li r5, 2 -/* 800D1F40 38 DE 06 98 */ addi r6, r30, 0x698 -/* 800D1F44 4B FD B7 AD */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c -/* 800D1F48 7F E3 FB 78 */ mr r3, r31 -/* 800D1F4C 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800D1F50 81 8C 01 94 */ lwz r12, 0x194(r12) -/* 800D1F54 7D 89 03 A6 */ mtctr r12 -/* 800D1F58 4E 80 04 21 */ bctrl -/* 800D1F5C 28 03 00 00 */ cmplwi r3, 0 -/* 800D1F60 41 82 00 14 */ beq lbl_800D1F74 -/* 800D1F64 7F E3 FB 78 */ mr r3, r31 -/* 800D1F68 38 80 00 0B */ li r4, 0xb -/* 800D1F6C 4B FF F5 C1 */ bl setCutType__9daAlink_cFUc -/* 800D1F70 48 00 00 2C */ b lbl_800D1F9C -lbl_800D1F74: -/* 800D1F74 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) -/* 800D1F78 28 00 00 0A */ cmplwi r0, 0xa -/* 800D1F7C 40 82 00 14 */ bne lbl_800D1F90 -/* 800D1F80 7F E3 FB 78 */ mr r3, r31 -/* 800D1F84 38 80 00 10 */ li r4, 0x10 -/* 800D1F88 4B FF F5 A5 */ bl setCutType__9daAlink_cFUc -/* 800D1F8C 48 00 00 10 */ b lbl_800D1F9C -lbl_800D1F90: -/* 800D1F90 7F E3 FB 78 */ mr r3, r31 -/* 800D1F94 38 80 00 25 */ li r4, 0x25 -/* 800D1F98 4B FF F5 95 */ bl setCutType__9daAlink_cFUc -lbl_800D1F9C: -/* 800D1F9C 38 00 00 01 */ li r0, 1 -/* 800D1FA0 98 1F 2F A1 */ stb r0, 0x2fa1(r31) -/* 800D1FA4 7F E3 FB 78 */ mr r3, r31 -/* 800D1FA8 38 80 00 13 */ li r4, 0x13 -/* 800D1FAC 4B FD DA FD */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -/* 800D1FB0 48 00 00 78 */ b lbl_800D2028 -lbl_800D1FB4: -/* 800D1FB4 7F E3 FB 78 */ mr r3, r31 -/* 800D1FB8 38 80 00 81 */ li r4, 0x81 -/* 800D1FBC 38 A0 00 02 */ li r5, 2 -/* 800D1FC0 38 DE 06 B4 */ addi r6, r30, 0x6b4 -/* 800D1FC4 4B FD B7 2D */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c -/* 800D1FC8 7F E3 FB 78 */ mr r3, r31 -/* 800D1FCC 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800D1FD0 81 8C 01 94 */ lwz r12, 0x194(r12) -/* 800D1FD4 7D 89 03 A6 */ mtctr r12 -/* 800D1FD8 4E 80 04 21 */ bctrl -/* 800D1FDC 28 03 00 00 */ cmplwi r3, 0 -/* 800D1FE0 41 82 00 14 */ beq lbl_800D1FF4 -/* 800D1FE4 7F E3 FB 78 */ mr r3, r31 -/* 800D1FE8 38 80 00 0C */ li r4, 0xc -/* 800D1FEC 4B FF F5 41 */ bl setCutType__9daAlink_cFUc -/* 800D1FF0 48 00 00 2C */ b lbl_800D201C -lbl_800D1FF4: -/* 800D1FF4 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) -/* 800D1FF8 28 00 00 0A */ cmplwi r0, 0xa -/* 800D1FFC 40 82 00 14 */ bne lbl_800D2010 -/* 800D2000 7F E3 FB 78 */ mr r3, r31 -/* 800D2004 38 80 00 11 */ li r4, 0x11 -/* 800D2008 4B FF F5 25 */ bl setCutType__9daAlink_cFUc -/* 800D200C 48 00 00 10 */ b lbl_800D201C -lbl_800D2010: -/* 800D2010 7F E3 FB 78 */ mr r3, r31 -/* 800D2014 38 80 00 26 */ li r4, 0x26 -/* 800D2018 4B FF F5 15 */ bl setCutType__9daAlink_cFUc -lbl_800D201C: -/* 800D201C 7F E3 FB 78 */ mr r3, r31 -/* 800D2020 38 80 00 14 */ li r4, 0x14 -/* 800D2024 4B FD DA 85 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -lbl_800D2028: -/* 800D2028 7F E3 FB 78 */ mr r3, r31 -/* 800D202C 38 80 01 04 */ li r4, 0x104 -/* 800D2030 38 A0 00 01 */ li r5, 1 -/* 800D2034 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800D2038 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800D203C 4B FD D4 75 */ bl setFaceBck__9daAlink_cFUsiUs -/* 800D2040 38 00 00 02 */ li r0, 2 -/* 800D2044 98 1F 2F 96 */ stb r0, 0x2f96(r31) -/* 800D2048 38 7E 08 34 */ addi r3, r30, 0x834 -/* 800D204C A8 03 00 52 */ lha r0, 0x52(r3) -/* 800D2050 B0 1F 30 7E */ sth r0, 0x307e(r31) -/* 800D2054 7F E3 FB 78 */ mr r3, r31 -/* 800D2058 3C 80 00 01 */ lis r4, 0x0001 /* 0x0001001C@ha */ -/* 800D205C 38 84 00 1C */ addi r4, r4, 0x001C /* 0x0001001C@l */ -/* 800D2060 48 00 02 25 */ bl setSwordVoiceSe__9daAlink_cFUl -/* 800D2064 4B FF EE F9 */ bl getSwordAtType__9daAlink_cFv -/* 800D2068 7C 64 1B 78 */ mr r4, r3 -/* 800D206C 7F E3 FB 78 */ mr r3, r31 -/* 800D2070 38 A0 00 00 */ li r5, 0 -/* 800D2074 38 C0 00 07 */ li r6, 7 -/* 800D2078 38 E0 00 10 */ li r7, 0x10 -/* 800D207C 39 00 00 01 */ li r8, 1 -/* 800D2080 C0 22 93 00 */ lfs f1, lit_6895(r2) -/* 800D2084 C0 42 93 04 */ lfs f2, lit_6896(r2) -/* 800D2088 4B FF F4 B9 */ bl setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff -/* 800D208C 7F E3 FB 78 */ mr r3, r31 -/* 800D2090 48 05 20 B5 */ bl setCutWaterDropEffect__9daAlink_cFv -/* 800D2094 38 00 00 00 */ li r0, 0 -/* 800D2098 98 1F 2F B7 */ stb r0, 0x2fb7(r31) -lbl_800D209C: -/* 800D209C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D20A0 48 29 01 89 */ bl _restgpr_29 -/* 800D20A4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800D20A8 7C 08 03 A6 */ mtlr r0 -/* 800D20AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800D20B0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setCutWaterDropEffect__9daAlink_cFv.s b/asm/d/a/d_a_alink/setCutWaterDropEffect__9daAlink_cFv.s deleted file mode 100644 index 3e97f95dd0b..00000000000 --- a/asm/d/a/d_a_alink/setCutWaterDropEffect__9daAlink_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80124144: -/* 80124144 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80124148 7C 08 02 A6 */ mflr r0 -/* 8012414C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80124150 7C 68 1B 78 */ mr r8, r3 -/* 80124154 A8 03 32 C0 */ lha r0, 0x32c0(r3) -/* 80124158 2C 00 00 00 */ cmpwi r0, 0 -/* 8012415C 40 81 00 74 */ ble lbl_801241D0 -/* 80124160 80 68 06 50 */ lwz r3, 0x650(r8) -/* 80124164 80 63 00 84 */ lwz r3, 0x84(r3) -/* 80124168 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8012416C C0 03 00 3C */ lfs f0, 0x3c(r3) -/* 80124170 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80124174 C0 03 00 4C */ lfs f0, 0x4c(r3) -/* 80124178 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8012417C C0 03 00 5C */ lfs f0, 0x5c(r3) -/* 80124180 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80124184 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80124188 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8012418C 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 80124190 38 80 00 00 */ li r4, 0 -/* 80124194 90 81 00 08 */ stw r4, 8(r1) -/* 80124198 38 00 FF FF */ li r0, -1 -/* 8012419C 90 01 00 0C */ stw r0, 0xc(r1) -/* 801241A0 90 81 00 10 */ stw r4, 0x10(r1) -/* 801241A4 90 81 00 14 */ stw r4, 0x14(r1) -/* 801241A8 90 81 00 18 */ stw r4, 0x18(r1) -/* 801241AC 38 80 00 00 */ li r4, 0 -/* 801241B0 38 A0 02 A4 */ li r5, 0x2a4 -/* 801241B4 38 C1 00 20 */ addi r6, r1, 0x20 -/* 801241B8 38 E8 01 0C */ addi r7, r8, 0x10c -/* 801241BC 39 08 04 E4 */ addi r8, r8, 0x4e4 -/* 801241C0 39 20 00 00 */ li r9, 0 -/* 801241C4 39 40 00 FF */ li r10, 0xff -/* 801241C8 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 801241CC 4B F2 88 C5 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -lbl_801241D0: -/* 801241D0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801241D4 7C 08 03 A6 */ mtlr r0 -/* 801241D8 38 21 00 30 */ addi r1, r1, 0x30 -/* 801241DC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff.s b/asm/d/a/d_a_alink/setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff.s deleted file mode 100644 index e6b2d80768c..00000000000 --- a/asm/d/a/d_a_alink/setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff.s +++ /dev/null @@ -1,93 +0,0 @@ -lbl_800D1540: -/* 800D1540 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 800D1544 7C 08 02 A6 */ mflr r0 -/* 800D1548 90 01 00 34 */ stw r0, 0x34(r1) -/* 800D154C DB E1 00 28 */ stfd f31, 0x28(r1) -/* 800D1550 39 61 00 28 */ addi r11, r1, 0x28 -/* 800D1554 48 29 0C 79 */ bl _savegpr_25 -/* 800D1558 7C 7A 1B 78 */ mr r26, r3 -/* 800D155C 7C 9B 23 78 */ mr r27, r4 -/* 800D1560 7C BC 2B 78 */ mr r28, r5 -/* 800D1564 7C DD 33 78 */ mr r29, r6 -/* 800D1568 7C FE 3B 78 */ mr r30, r7 -/* 800D156C 7D 1F 43 78 */ mr r31, r8 -/* 800D1570 FF E0 10 90 */ fmr f31, f2 -/* 800D1574 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D1578 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D157C 88 03 00 14 */ lbz r0, 0x14(r3) -/* 800D1580 28 00 00 3F */ cmplwi r0, 0x3f -/* 800D1584 40 82 00 24 */ bne lbl_800D15A8 -/* 800D1588 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 800D158C 28 00 00 0E */ cmplwi r0, 0xe -/* 800D1590 41 82 00 14 */ beq lbl_800D15A4 -/* 800D1594 28 00 00 01 */ cmplwi r0, 1 -/* 800D1598 41 82 00 0C */ beq lbl_800D15A4 -/* 800D159C 28 00 00 10 */ cmplwi r0, 0x10 -/* 800D15A0 40 82 00 08 */ bne lbl_800D15A8 -lbl_800D15A4: -/* 800D15A4 3B C0 00 05 */ li r30, 5 -lbl_800D15A8: -/* 800D15A8 57 60 07 BD */ rlwinm. r0, r27, 0, 0x1e, 0x1e -/* 800D15AC 41 82 00 20 */ beq lbl_800D15CC -/* 800D15B0 80 1A 05 7C */ lwz r0, 0x57c(r26) -/* 800D15B4 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb -/* 800D15B8 41 82 00 0C */ beq lbl_800D15C4 -/* 800D15BC 3B 20 00 04 */ li r25, 4 -/* 800D15C0 48 00 00 24 */ b lbl_800D15E4 -lbl_800D15C4: -/* 800D15C4 3B 20 00 00 */ li r25, 0 -/* 800D15C8 48 00 00 1C */ b lbl_800D15E4 -lbl_800D15CC: -/* 800D15CC A0 1A 2F DC */ lhz r0, 0x2fdc(r26) -/* 800D15D0 28 00 00 67 */ cmplwi r0, 0x67 -/* 800D15D4 40 82 00 0C */ bne lbl_800D15E0 -/* 800D15D8 3B 20 00 06 */ li r25, 6 -/* 800D15DC 48 00 00 08 */ b lbl_800D15E4 -lbl_800D15E0: -/* 800D15E0 3B 20 00 00 */ li r25, 0 -lbl_800D15E4: -/* 800D15E4 93 7A 11 00 */ stw r27, 0x1100(r26) -/* 800D15E8 9B 9A 11 67 */ stb r28, 0x1167(r26) -/* 800D15EC 9B BA 11 66 */ stb r29, 0x1166(r26) -/* 800D15F0 9B DA 11 64 */ stb r30, 0x1164(r26) -/* 800D15F4 9B FA 11 04 */ stb r31, 0x1104(r26) -/* 800D15F8 38 7A 12 14 */ addi r3, r26, 0x1214 -/* 800D15FC 48 19 DC 05 */ bl SetR__8cM3dGCylFf -/* 800D1600 38 7A 12 14 */ addi r3, r26, 0x1214 -/* 800D1604 FC 20 F8 90 */ fmr f1, f31 -/* 800D1608 48 19 DB F1 */ bl SetH__8cM3dGCylFf -/* 800D160C 9B 3A 11 65 */ stb r25, 0x1165(r26) -/* 800D1610 A0 1A 2F E8 */ lhz r0, 0x2fe8(r26) -/* 800D1614 28 00 00 1E */ cmplwi r0, 0x1e -/* 800D1618 40 82 00 14 */ bne lbl_800D162C -/* 800D161C 80 1A 11 48 */ lwz r0, 0x1148(r26) -/* 800D1620 60 00 00 02 */ ori r0, r0, 2 -/* 800D1624 90 1A 11 48 */ stw r0, 0x1148(r26) -/* 800D1628 48 00 00 10 */ b lbl_800D1638 -lbl_800D162C: -/* 800D162C 80 1A 11 48 */ lwz r0, 0x1148(r26) -/* 800D1630 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d -/* 800D1634 90 1A 11 48 */ stw r0, 0x1148(r26) -lbl_800D1638: -/* 800D1638 80 1A 05 74 */ lwz r0, 0x574(r26) -/* 800D163C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800D1640 41 82 00 2C */ beq lbl_800D166C -/* 800D1644 38 7A 08 50 */ addi r3, r26, 0x850 -/* 800D1648 38 00 00 03 */ li r0, 3 -/* 800D164C 7C 09 03 A6 */ mtctr r0 -lbl_800D1650: -/* 800D1650 93 63 00 10 */ stw r27, 0x10(r3) -/* 800D1654 9B 83 00 77 */ stb r28, 0x77(r3) -/* 800D1658 9B A3 00 76 */ stb r29, 0x76(r3) -/* 800D165C 9B C3 00 74 */ stb r30, 0x74(r3) -/* 800D1660 9B E3 00 14 */ stb r31, 0x14(r3) -/* 800D1664 38 63 01 3C */ addi r3, r3, 0x13c -/* 800D1668 42 00 FF E8 */ bdnz lbl_800D1650 -lbl_800D166C: -/* 800D166C CB E1 00 28 */ lfd f31, 0x28(r1) -/* 800D1670 39 61 00 28 */ addi r11, r1, 0x28 -/* 800D1674 48 29 0B A5 */ bl _restgpr_25 -/* 800D1678 80 01 00 34 */ lwz r0, 0x34(r1) -/* 800D167C 7C 08 03 A6 */ mtlr r0 -/* 800D1680 38 21 00 30 */ addi r1, r1, 0x30 -/* 800D1684 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setDamagePointNormal__9daAlink_cFi.s b/asm/d/a/d_a_alink/setDamagePointNormal__9daAlink_cFi.s deleted file mode 100644 index ad4420a554e..00000000000 --- a/asm/d/a/d_a_alink/setDamagePointNormal__9daAlink_cFi.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D7478: -/* 800D7478 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D747C 7C 08 02 A6 */ mflr r0 -/* 800D7480 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D7484 38 A0 00 00 */ li r5, 0 -/* 800D7488 38 C0 00 01 */ li r6, 1 -/* 800D748C 38 E0 00 00 */ li r7, 0 -/* 800D7490 4B FF FE 2D */ bl setDamagePoint__9daAlink_cFiiii -/* 800D7494 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D7498 7C 08 03 A6 */ mtlr r0 -/* 800D749C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D74A0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setDashDamage__9daAlink_cFv.s b/asm/d/a/d_a_alink/setDashDamage__9daAlink_cFv.s deleted file mode 100644 index 0e2527a3b1e..00000000000 --- a/asm/d/a/d_a_alink/setDashDamage__9daAlink_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_800D76C4: -/* 800D76C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D76C8 7C 08 02 A6 */ mflr r0 -/* 800D76CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D76D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D76D4 7C 7F 1B 78 */ mr r31, r3 -/* 800D76D8 38 80 00 AD */ li r4, 0xad -/* 800D76DC 38 A0 00 02 */ li r5, 2 -/* 800D76E0 3C C0 80 39 */ lis r6, m__20daAlinkHIO_damage_c0@ha /* 0x8038E54C@ha */ -/* 800D76E4 38 C6 E5 4C */ addi r6, r6, m__20daAlinkHIO_damage_c0@l /* 0x8038E54C@l */ -/* 800D76E8 38 C6 00 14 */ addi r6, r6, 0x14 -/* 800D76EC 4B FD 60 05 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c -/* 800D76F0 7F E3 FB 78 */ mr r3, r31 -/* 800D76F4 38 80 01 21 */ li r4, 0x121 -/* 800D76F8 38 A0 00 01 */ li r5, 1 -/* 800D76FC 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800D7700 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800D7704 4B FD 7D AD */ bl setFaceBck__9daAlink_cFUsiUs -/* 800D7708 7F E3 FB 78 */ mr r3, r31 -/* 800D770C 38 80 00 27 */ li r4, 0x27 -/* 800D7710 4B FD 83 99 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -/* 800D7714 7F E3 FB 78 */ mr r3, r31 -/* 800D7718 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010002@ha */ -/* 800D771C 38 84 00 02 */ addi r4, r4, 0x0002 /* 0x00010002@l */ -/* 800D7720 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800D7724 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800D7728 7D 89 03 A6 */ mtctr r12 -/* 800D772C 4E 80 04 21 */ bctrl -/* 800D7730 7F E3 FB 78 */ mr r3, r31 -/* 800D7734 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020014@ha */ -/* 800D7738 38 84 00 14 */ addi r4, r4, 0x0014 /* 0x00020014@l */ -/* 800D773C 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800D7740 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 800D7744 7D 89 03 A6 */ mtctr r12 -/* 800D7748 4E 80 04 21 */ bctrl -/* 800D774C 7F E3 FB 78 */ mr r3, r31 -/* 800D7750 48 00 D4 85 */ bl freeGrabItem__9daAlink_cFv -/* 800D7754 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D7758 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D775C 7C 08 03 A6 */ mtlr r0 -/* 800D7760 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D7764 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setDkCaught__9daAlink_cFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/setDkCaught__9daAlink_cFP10fopAc_ac_c.s deleted file mode 100644 index cd20da10bd3..00000000000 --- a/asm/d/a/d_a_alink/setDkCaught__9daAlink_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_800D6DF0: -/* 800D6DF0 80 03 05 74 */ lwz r0, 0x574(r3) -/* 800D6DF4 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 800D6DF8 4C 82 00 20 */ bnelr -/* 800D6DFC 80 03 05 74 */ lwz r0, 0x574(r3) -/* 800D6E00 60 00 00 01 */ ori r0, r0, 1 -/* 800D6E04 90 03 05 74 */ stw r0, 0x574(r3) -/* 800D6E08 28 04 00 00 */ cmplwi r4, 0 -/* 800D6E0C 41 82 00 0C */ beq lbl_800D6E18 -/* 800D6E10 80 04 00 04 */ lwz r0, 4(r4) -/* 800D6E14 48 00 00 08 */ b lbl_800D6E1C -lbl_800D6E18: -/* 800D6E18 38 00 FF FF */ li r0, -1 -lbl_800D6E1C: -/* 800D6E1C 90 03 28 F8 */ stw r0, 0x28f8(r3) -/* 800D6E20 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz.s b/asm/d/a/d_a_alink/setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz.s deleted file mode 100644 index 0e9643da2f4..00000000000 --- a/asm/d/a/d_a_alink/setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_801206C4: -/* 801206C4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801206C8 7C 08 02 A6 */ mflr r0 -/* 801206CC 90 01 00 34 */ stw r0, 0x34(r1) -/* 801206D0 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 801206D4 93 C1 00 28 */ stw r30, 0x28(r1) -/* 801206D8 7C 6B 1B 78 */ mr r11, r3 -/* 801206DC 7C 9E 23 78 */ mr r30, r4 -/* 801206E0 7C AA 2B 78 */ mr r10, r5 -/* 801206E4 7C C8 33 78 */ mr r8, r6 -/* 801206E8 7C E9 3B 78 */ mr r9, r7 -/* 801206EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801206F0 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801206F4 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 801206F8 38 00 00 FF */ li r0, 0xff -/* 801206FC 90 01 00 08 */ stw r0, 8(r1) -/* 80120700 38 80 00 00 */ li r4, 0 -/* 80120704 90 81 00 0C */ stw r4, 0xc(r1) -/* 80120708 38 00 FF FF */ li r0, -1 -/* 8012070C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80120710 90 81 00 14 */ stw r4, 0x14(r1) -/* 80120714 90 81 00 18 */ stw r4, 0x18(r1) -/* 80120718 90 81 00 1C */ stw r4, 0x1c(r1) -/* 8012071C 80 9E 00 00 */ lwz r4, 0(r30) -/* 80120720 38 A0 00 00 */ li r5, 0 -/* 80120724 7D 46 53 78 */ mr r6, r10 -/* 80120728 7D 07 43 78 */ mr r7, r8 -/* 8012072C 39 0B 01 0C */ addi r8, r11, 0x10c -/* 80120730 39 40 00 00 */ li r10, 0 -/* 80120734 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 80120738 4B F2 CD 95 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8012073C 90 7E 00 00 */ stw r3, 0(r30) -/* 80120740 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80120744 38 63 02 10 */ addi r3, r3, 0x210 -/* 80120748 80 9E 00 00 */ lwz r4, 0(r30) -/* 8012074C 4B F2 B1 69 */ bl forceOnEventMove__Q213dPa_control_c7level_cFUl -/* 80120750 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80120754 38 63 02 10 */ addi r3, r3, 0x210 -/* 80120758 80 9E 00 00 */ lwz r4, 0(r30) -/* 8012075C 4B F2 B1 BD */ bl getEmitter__Q213dPa_control_c7level_cFUl -/* 80120760 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80120764 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80120768 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8012076C 7C 08 03 A6 */ mtlr r0 -/* 80120770 38 21 00 30 */ addi r1, r1, 0x30 -/* 80120774 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setFishGetFace__9daAlink_cFv.s b/asm/d/a/d_a_alink/setFishGetFace__9daAlink_cFv.s deleted file mode 100644 index 4ce05a426b0..00000000000 --- a/asm/d/a/d_a_alink/setFishGetFace__9daAlink_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_800F4490: -/* 800F4490 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800F4494 7C 08 02 A6 */ mflr r0 -/* 800F4498 90 01 00 14 */ stw r0, 0x14(r1) -/* 800F449C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800F44A0 7C 7F 1B 78 */ mr r31, r3 -/* 800F44A4 88 03 2F C8 */ lbz r0, 0x2fc8(r3) -/* 800F44A8 28 00 00 01 */ cmplwi r0, 1 -/* 800F44AC 40 82 00 1C */ bne lbl_800F44C8 -/* 800F44B0 38 80 01 40 */ li r4, 0x140 -/* 800F44B4 38 A0 00 01 */ li r5, 1 -/* 800F44B8 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800F44BC 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800F44C0 4B FB AF F1 */ bl setFaceBck__9daAlink_cFUsiUs -/* 800F44C4 48 00 00 8C */ b lbl_800F4550 -lbl_800F44C8: -/* 800F44C8 28 00 00 02 */ cmplwi r0, 2 -/* 800F44CC 40 82 00 28 */ bne lbl_800F44F4 -/* 800F44D0 38 80 00 7A */ li r4, 0x7a -/* 800F44D4 4B FB B5 D5 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -/* 800F44D8 7F E3 FB 78 */ mr r3, r31 -/* 800F44DC 38 80 01 43 */ li r4, 0x143 -/* 800F44E0 38 A0 00 01 */ li r5, 1 -/* 800F44E4 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800F44E8 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800F44EC 4B FB AF C5 */ bl setFaceBck__9daAlink_cFUsiUs -/* 800F44F0 48 00 00 60 */ b lbl_800F4550 -lbl_800F44F4: -/* 800F44F4 28 00 00 03 */ cmplwi r0, 3 -/* 800F44F8 40 82 00 28 */ bne lbl_800F4520 -/* 800F44FC 38 80 00 7B */ li r4, 0x7b -/* 800F4500 4B FB B5 A9 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -/* 800F4504 7F E3 FB 78 */ mr r3, r31 -/* 800F4508 38 80 01 46 */ li r4, 0x146 -/* 800F450C 38 A0 00 01 */ li r5, 1 -/* 800F4510 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800F4514 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800F4518 4B FB AF 99 */ bl setFaceBck__9daAlink_cFUsiUs -/* 800F451C 48 00 00 34 */ b lbl_800F4550 -lbl_800F4520: -/* 800F4520 28 00 00 04 */ cmplwi r0, 4 -/* 800F4524 40 82 00 28 */ bne lbl_800F454C -/* 800F4528 38 80 00 7C */ li r4, 0x7c -/* 800F452C 4B FB B5 7D */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -/* 800F4530 7F E3 FB 78 */ mr r3, r31 -/* 800F4534 38 80 01 49 */ li r4, 0x149 -/* 800F4538 38 A0 00 01 */ li r5, 1 -/* 800F453C 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800F4540 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800F4544 4B FB AF 6D */ bl setFaceBck__9daAlink_cFUsiUs -/* 800F4548 48 00 00 08 */ b lbl_800F4550 -lbl_800F454C: -/* 800F454C 4B FB B7 71 */ bl resetFacePriAnime__9daAlink_cFv -lbl_800F4550: -/* 800F4550 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800F4554 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800F4558 7C 08 03 A6 */ mtlr r0 -/* 800F455C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F4560 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setGrabCollisionOffset__9daAlink_cFffP13cBgS_PolyInfo.s b/asm/d/a/d_a_alink/setGrabCollisionOffset__9daAlink_cFffP13cBgS_PolyInfo.s deleted file mode 100644 index a32274bca28..00000000000 --- a/asm/d/a/d_a_alink/setGrabCollisionOffset__9daAlink_cFffP13cBgS_PolyInfo.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_800E3994: -/* 800E3994 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 800E3998 7C 08 02 A6 */ mflr r0 -/* 800E399C 90 01 00 34 */ stw r0, 0x34(r1) -/* 800E39A0 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 800E39A4 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 800E39A8 DB C1 00 10 */ stfd f30, 0x10(r1) -/* 800E39AC F3 C1 00 18 */ psq_st f30, 24(r1), 0, 0 /* qr0 */ -/* 800E39B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E39B4 7C 7F 1B 78 */ mr r31, r3 -/* 800E39B8 FF C0 08 90 */ fmr f30, f1 -/* 800E39BC FF E0 10 90 */ fmr f31, f2 -/* 800E39C0 28 04 00 00 */ cmplwi r4, 0 -/* 800E39C4 41 82 00 10 */ beq lbl_800E39D4 -/* 800E39C8 38 7F 1E 4C */ addi r3, r31, 0x1e4c -/* 800E39CC 48 18 47 7D */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo -/* 800E39D0 48 00 00 0C */ b lbl_800E39DC -lbl_800E39D4: -/* 800E39D4 38 7F 1E 4C */ addi r3, r31, 0x1e4c -/* 800E39D8 48 18 47 49 */ bl ClearPi__13cBgS_PolyInfoFv -lbl_800E39DC: -/* 800E39DC C0 22 94 08 */ lfs f1, lit_14064(r2) -/* 800E39E0 EC 01 07 B2 */ fmuls f0, f1, f30 -/* 800E39E4 D0 1F 34 2C */ stfs f0, 0x342c(r31) -/* 800E39E8 EC 01 07 F2 */ fmuls f0, f1, f31 -/* 800E39EC D0 1F 34 30 */ stfs f0, 0x3430(r31) -/* 800E39F0 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 800E39F4 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 800E39F8 E3 C1 00 18 */ psq_l f30, 24(r1), 0, 0 /* qr0 */ -/* 800E39FC CB C1 00 10 */ lfd f30, 0x10(r1) -/* 800E3A00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E3A04 80 01 00 34 */ lwz r0, 0x34(r1) -/* 800E3A08 7C 08 03 A6 */ mtlr r0 -/* 800E3A0C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800E3A10 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setHookshotReadyMaterial__9daAlink_cFv.s b/asm/d/a/d_a_alink/setHookshotReadyMaterial__9daAlink_cFv.s deleted file mode 100644 index 8901edecf10..00000000000 --- a/asm/d/a/d_a_alink/setHookshotReadyMaterial__9daAlink_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80109070: -/* 80109070 80 03 05 78 */ lwz r0, 0x578(r3) -/* 80109074 54 00 03 19 */ rlwinm. r0, r0, 0, 0xc, 0xc -/* 80109078 40 82 00 18 */ bne lbl_80109090 -/* 8010907C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80109080 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80109084 88 04 00 13 */ lbz r0, 0x13(r4) -/* 80109088 28 00 00 2E */ cmplwi r0, 0x2e -/* 8010908C 40 82 00 10 */ bne lbl_8010909C -lbl_80109090: -/* 80109090 38 00 00 00 */ li r0, 0 -/* 80109094 B0 03 30 14 */ sth r0, 0x3014(r3) -/* 80109098 4E 80 00 20 */ blr -lbl_8010909C: -/* 8010909C 28 00 00 31 */ cmplwi r0, 0x31 -/* 801090A0 40 82 00 18 */ bne lbl_801090B8 -/* 801090A4 38 00 03 7B */ li r0, 0x37b -/* 801090A8 90 03 32 CC */ stw r0, 0x32cc(r3) -/* 801090AC 38 00 00 0E */ li r0, 0xe -/* 801090B0 B0 03 30 14 */ sth r0, 0x3014(r3) -/* 801090B4 4E 80 00 20 */ blr -lbl_801090B8: -/* 801090B8 28 00 00 30 */ cmplwi r0, 0x30 -/* 801090BC 40 82 00 18 */ bne lbl_801090D4 -/* 801090C0 38 00 0C 80 */ li r0, 0xc80 -/* 801090C4 90 03 32 CC */ stw r0, 0x32cc(r3) -/* 801090C8 38 00 00 0D */ li r0, 0xd -/* 801090CC B0 03 30 14 */ sth r0, 0x3014(r3) -/* 801090D0 4E 80 00 20 */ blr -lbl_801090D4: -/* 801090D4 3C 80 00 01 */ lis r4, 0x0001 /* 0x00011C47@ha */ -/* 801090D8 38 04 1C 47 */ addi r0, r4, 0x1C47 /* 0x00011C47@l */ -/* 801090DC 90 03 32 CC */ stw r0, 0x32cc(r3) -/* 801090E0 38 00 00 12 */ li r0, 0x12 -/* 801090E4 B0 03 30 14 */ sth r0, 0x3014(r3) -/* 801090E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setHorseSwordUpAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/setHorseSwordUpAnime__9daAlink_cFv.s deleted file mode 100644 index 63794f73418..00000000000 --- a/asm/d/a/d_a_alink/setHorseSwordUpAnime__9daAlink_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_800ECF9C: -/* 800ECF9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800ECFA0 7C 08 02 A6 */ mflr r0 -/* 800ECFA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800ECFA8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800ECFAC 7C 7F 1B 78 */ mr r31, r3 -/* 800ECFB0 38 80 00 CC */ li r4, 0xcc -/* 800ECFB4 3C A0 80 39 */ lis r5, m__19daAlinkHIO_horse_c0@ha /* 0x8038E5A4@ha */ -/* 800ECFB8 38 A5 E5 A4 */ addi r5, r5, m__19daAlinkHIO_horse_c0@l /* 0x8038E5A4@l */ -/* 800ECFBC C0 25 00 5C */ lfs f1, 0x5c(r5) -/* 800ECFC0 C0 45 00 60 */ lfs f2, 0x60(r5) -/* 800ECFC4 4B FC 03 E5 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff -/* 800ECFC8 7F E3 FB 78 */ mr r3, r31 -/* 800ECFCC 38 80 00 E8 */ li r4, 0xe8 -/* 800ECFD0 38 A0 00 01 */ li r5, 1 -/* 800ECFD4 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800ECFD8 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800ECFDC 4B FC 24 D5 */ bl setFaceBck__9daAlink_cFUsiUs -/* 800ECFE0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800ECFE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800ECFE8 7C 08 03 A6 */ mtlr r0 -/* 800ECFEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ECFF0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setIronBallBaseAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/setIronBallBaseAnime__9daAlink_cFv.s deleted file mode 100644 index 022da91498c..00000000000 --- a/asm/d/a/d_a_alink/setIronBallBaseAnime__9daAlink_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_801151E0: -/* 801151E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801151E4 7C 08 02 A6 */ mflr r0 -/* 801151E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801151EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801151F0 7C 7F 1B 78 */ mr r31, r3 -/* 801151F4 A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 801151F8 28 00 01 9B */ cmplwi r0, 0x19b -/* 801151FC 40 82 00 44 */ bne lbl_80115240 -/* 80115200 38 80 01 63 */ li r4, 0x163 -/* 80115204 4B F9 73 55 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM -/* 80115208 2C 03 00 00 */ cmpwi r3, 0 -/* 8011520C 40 82 00 34 */ bne lbl_80115240 -/* 80115210 7F E3 FB 78 */ mr r3, r31 -/* 80115214 38 80 01 63 */ li r4, 0x163 -/* 80115218 3C A0 80 39 */ lis r5, m__22daAlinkHIO_ironBall_c0@ha /* 0x8038EA70@ha */ -/* 8011521C 38 A5 EA 70 */ addi r5, r5, m__22daAlinkHIO_ironBall_c0@l /* 0x8038EA70@l */ -/* 80115220 C0 25 00 24 */ lfs f1, 0x24(r5) -/* 80115224 C0 45 00 28 */ lfs f2, 0x28(r5) -/* 80115228 4B F9 7D B9 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -/* 8011522C C0 1F 20 58 */ lfs f0, 0x2058(r31) -/* 80115230 D0 1F 1F E0 */ stfs f0, 0x1fe0(r31) -/* 80115234 C0 1F 20 58 */ lfs f0, 0x2058(r31) -/* 80115238 80 7F 1F 2C */ lwz r3, 0x1f2c(r31) -/* 8011523C D0 03 00 08 */ stfs f0, 8(r3) -lbl_80115240: -/* 80115240 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80115244 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80115248 7C 08 03 A6 */ mtlr r0 -/* 8011524C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80115250 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setIronBallBgCheckPos__9daAlink_cFv.s b/asm/d/a/d_a_alink/setIronBallBgCheckPos__9daAlink_cFv.s deleted file mode 100644 index 1d27ae5f879..00000000000 --- a/asm/d/a/d_a_alink/setIronBallBgCheckPos__9daAlink_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80112768: -/* 80112768 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8011276C 7C 08 02 A6 */ mflr r0 -/* 80112770 90 01 00 24 */ stw r0, 0x24(r1) -/* 80112774 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80112778 7C 7F 1B 78 */ mr r31, r3 -/* 8011277C 80 63 38 40 */ lwz r3, 0x3840(r3) -/* 80112780 4B EF A5 E5 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80112784 80 7F 38 44 */ lwz r3, 0x3844(r31) -/* 80112788 4B EF A7 BD */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 8011278C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80112790 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80112794 3C 80 80 39 */ lis r4, l_ironBallCenterVec@ha /* 0x8038FB50@ha */ -/* 80112798 38 84 FB 50 */ addi r4, r4, l_ironBallCenterVec@l /* 0x8038FB50@l */ -/* 8011279C 38 A1 00 08 */ addi r5, r1, 8 -/* 801127A0 48 23 45 CD */ bl PSMTXMultVec -/* 801127A4 C0 41 00 10 */ lfs f2, 0x10(r1) -/* 801127A8 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 801127AC C0 02 94 28 */ lfs f0, lit_14621(r2) -/* 801127B0 EC 21 00 28 */ fsubs f1, f1, f0 -/* 801127B4 C0 1F 34 90 */ lfs f0, 0x3490(r31) -/* 801127B8 EC 21 00 28 */ fsubs f1, f1, f0 -/* 801127BC C0 01 00 08 */ lfs f0, 8(r1) -/* 801127C0 D0 1F 38 04 */ stfs f0, 0x3804(r31) -/* 801127C4 D0 3F 38 08 */ stfs f1, 0x3808(r31) -/* 801127C8 D0 5F 38 0C */ stfs f2, 0x380c(r31) -/* 801127CC 38 7F 34 90 */ addi r3, r31, 0x3490 -/* 801127D0 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 801127D4 C0 42 93 14 */ lfs f2, lit_7307(r2) -/* 801127D8 48 15 DF 69 */ bl cLib_chaseF__FPfff -/* 801127DC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801127E0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801127E4 7C 08 03 A6 */ mtlr r0 -/* 801127E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801127EC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setIronBallReadyAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/setIronBallReadyAnime__9daAlink_cFv.s deleted file mode 100644 index 117806fe11f..00000000000 --- a/asm/d/a/d_a_alink/setIronBallReadyAnime__9daAlink_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_8011510C: -/* 8011510C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80115110 7C 08 02 A6 */ mflr r0 -/* 80115114 90 01 00 14 */ stw r0, 0x14(r1) -/* 80115118 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011511C 93 C1 00 08 */ stw r30, 8(r1) -/* 80115120 7C 7E 1B 78 */ mr r30, r3 -/* 80115124 38 80 00 02 */ li r4, 2 -/* 80115128 C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 8011512C 4B F9 85 F9 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf -/* 80115130 7F C3 F3 78 */ mr r3, r30 -/* 80115134 38 80 01 62 */ li r4, 0x162 -/* 80115138 3C A0 80 39 */ lis r5, m__22daAlinkHIO_ironBall_c0@ha /* 0x8038EA70@ha */ -/* 8011513C 3B E5 EA 70 */ addi r31, r5, m__22daAlinkHIO_ironBall_c0@l /* 0x8038EA70@l */ -/* 80115140 C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 80115144 C0 42 92 C0 */ lfs f2, lit_6108(r2) -/* 80115148 38 A0 00 15 */ li r5, 0x15 -/* 8011514C C0 7F 00 20 */ lfs f3, 0x20(r31) -/* 80115150 4B F9 7E BD */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -/* 80115154 7F C3 F3 78 */ mr r3, r30 -/* 80115158 38 80 01 9A */ li r4, 0x19a -/* 8011515C C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 80115160 C0 42 92 BC */ lfs f2, lit_6041(r2) -/* 80115164 4B F9 82 45 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff -/* 80115168 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011516C D0 1E 1F 50 */ stfs f0, 0x1f50(r30) -/* 80115170 7F C3 F3 78 */ mr r3, r30 -/* 80115174 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010027@ha */ -/* 80115178 38 84 00 27 */ addi r4, r4, 0x0027 /* 0x00010027@l */ -/* 8011517C 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 80115180 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 80115184 7D 89 03 A6 */ mtctr r12 -/* 80115188 4E 80 04 21 */ bctrl -/* 8011518C 80 1E 0F B8 */ lwz r0, 0xfb8(r30) -/* 80115190 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80115194 90 1E 0F B8 */ stw r0, 0xfb8(r30) -/* 80115198 38 7E 0F B8 */ addi r3, r30, 0xfb8 -/* 8011519C 4B F6 F1 7D */ bl ResetAtHit__12dCcD_GObjInfFv -/* 801151A0 38 00 00 02 */ li r0, 2 -/* 801151A4 98 1E 0F CC */ stb r0, 0xfcc(r30) -/* 801151A8 38 00 00 0A */ li r0, 0xa -/* 801151AC B0 1E 30 1E */ sth r0, 0x301e(r30) -/* 801151B0 38 00 00 00 */ li r0, 0 -/* 801151B4 B0 1E 30 20 */ sth r0, 0x3020(r30) -/* 801151B8 C0 02 93 3C */ lfs f0, lit_7808(r2) -/* 801151BC D0 1E 34 94 */ stfs f0, 0x3494(r30) -/* 801151C0 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 801151C4 D0 1E 34 90 */ stfs f0, 0x3490(r30) -/* 801151C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801151CC 83 C1 00 08 */ lwz r30, 8(r1) -/* 801151D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801151D4 7C 08 03 A6 */ mtlr r0 -/* 801151D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801151DC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setIronBallReturn__9daAlink_cFi.s b/asm/d/a/d_a_alink/setIronBallReturn__9daAlink_cFi.s deleted file mode 100644 index 53a047249ee..00000000000 --- a/asm/d/a/d_a_alink/setIronBallReturn__9daAlink_cFi.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_801126F8: -/* 801126F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801126FC 7C 08 02 A6 */ mflr r0 -/* 80112700 90 01 00 14 */ stw r0, 0x14(r1) -/* 80112704 2C 04 00 00 */ cmpwi r4, 0 -/* 80112708 41 82 00 1C */ beq lbl_80112724 -/* 8011270C A8 83 30 1E */ lha r4, 0x301e(r3) -/* 80112710 2C 04 00 00 */ cmpwi r4, 0 -/* 80112714 41 82 00 10 */ beq lbl_80112724 -/* 80112718 38 04 FF FF */ addi r0, r4, -1 -/* 8011271C B0 03 30 1E */ sth r0, 0x301e(r3) -/* 80112720 48 00 00 38 */ b lbl_80112758 -lbl_80112724: -/* 80112724 A8 03 30 18 */ lha r0, 0x3018(r3) -/* 80112728 2C 00 00 07 */ cmpwi r0, 7 -/* 8011272C 41 82 00 2C */ beq lbl_80112758 -/* 80112730 38 00 00 07 */ li r0, 7 -/* 80112734 B0 03 30 18 */ sth r0, 0x3018(r3) -/* 80112738 38 00 00 00 */ li r0, 0 -/* 8011273C B0 03 30 1E */ sth r0, 0x301e(r3) -/* 80112740 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020033@ha */ -/* 80112744 38 84 00 33 */ addi r4, r4, 0x0033 /* 0x00020033@l */ -/* 80112748 81 83 06 28 */ lwz r12, 0x628(r3) -/* 8011274C 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 80112750 7D 89 03 A6 */ mtctr r12 -/* 80112754 4E 80 04 21 */ bctrl -lbl_80112758: -/* 80112758 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011275C 7C 08 03 A6 */ mtlr r0 -/* 80112760 38 21 00 10 */ addi r1, r1, 0x10 -/* 80112764 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setIronBallWaitUpperAnime__9daAlink_cFi.s b/asm/d/a/d_a_alink/setIronBallWaitUpperAnime__9daAlink_cFi.s deleted file mode 100644 index e3697e85bcd..00000000000 --- a/asm/d/a/d_a_alink/setIronBallWaitUpperAnime__9daAlink_cFi.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_80112568: -/* 80112568 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011256C 7C 08 02 A6 */ mflr r0 -/* 80112570 90 01 00 14 */ stw r0, 0x14(r1) -/* 80112574 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80112578 7C 7F 1B 78 */ mr r31, r3 -/* 8011257C A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 80112580 28 00 01 9C */ cmplwi r0, 0x19c -/* 80112584 41 82 00 90 */ beq lbl_80112614 -/* 80112588 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 8011258C 28 00 01 9A */ cmplwi r0, 0x19a -/* 80112590 41 82 00 84 */ beq lbl_80112614 -/* 80112594 A8 7F 30 18 */ lha r3, 0x3018(r31) -/* 80112598 7C 60 07 35 */ extsh. r0, r3 -/* 8011259C 41 82 00 0C */ beq lbl_801125A8 -/* 801125A0 2C 03 00 08 */ cmpwi r3, 8 -/* 801125A4 40 82 00 70 */ bne lbl_80112614 -lbl_801125A8: -/* 801125A8 2C 04 00 00 */ cmpwi r4, 0 -/* 801125AC 40 82 00 14 */ bne lbl_801125C0 -/* 801125B0 7F E3 FB 78 */ mr r3, r31 -/* 801125B4 4B FA 6C A1 */ bl checkNoUpperAnime__9daAlink_cCFv -/* 801125B8 2C 03 00 00 */ cmpwi r3, 0 -/* 801125BC 41 82 00 58 */ beq lbl_80112614 -lbl_801125C0: -/* 801125C0 7F E3 FB 78 */ mr r3, r31 -/* 801125C4 38 80 01 9C */ li r4, 0x19c -/* 801125C8 3C A0 80 39 */ lis r5, m__22daAlinkHIO_ironBall_c0@ha /* 0x8038EA70@ha */ -/* 801125CC 38 A5 EA 70 */ addi r5, r5, m__22daAlinkHIO_ironBall_c0@l /* 0x8038EA70@l */ -/* 801125D0 C0 25 00 18 */ lfs f1, 0x18(r5) -/* 801125D4 3C A0 80 39 */ lis r5, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 801125D8 38 A5 D6 64 */ addi r5, r5, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 801125DC C0 45 00 18 */ lfs f2, 0x18(r5) -/* 801125E0 4B F9 AD C9 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff -/* 801125E4 7F E3 FB 78 */ mr r3, r31 -/* 801125E8 38 80 00 E8 */ li r4, 0xe8 -/* 801125EC 38 A0 00 01 */ li r5, 1 -/* 801125F0 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 801125F4 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 801125F8 4B F9 CE B9 */ bl setFaceBck__9daAlink_cFUsiUs -/* 801125FC 38 00 00 FE */ li r0, 0xfe -/* 80112600 98 1F 2F 96 */ stb r0, 0x2f96(r31) -/* 80112604 38 00 00 05 */ li r0, 5 -/* 80112608 98 1F 2F 97 */ stb r0, 0x2f97(r31) -/* 8011260C 38 00 00 00 */ li r0, 0 -/* 80112610 B0 1F 30 18 */ sth r0, 0x3018(r31) -lbl_80112614: -/* 80112614 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80112618 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011261C 7C 08 03 A6 */ mtlr r0 -/* 80112620 38 21 00 10 */ addi r1, r1, 0x10 -/* 80112624 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setKandelaarMtx__9daAlink_cFPA4_fii.s b/asm/d/a/d_a_alink/setKandelaarMtx__9daAlink_cFPA4_fii.s deleted file mode 100644 index 9b85ff2e7ee..00000000000 --- a/asm/d/a/d_a_alink/setKandelaarMtx__9daAlink_cFPA4_fii.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_801106E8: -/* 801106E8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801106EC 7C 08 02 A6 */ mflr r0 -/* 801106F0 90 01 00 24 */ stw r0, 0x24(r1) -/* 801106F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801106F8 48 25 1A E1 */ bl _savegpr_28 -/* 801106FC 7C 7C 1B 78 */ mr r28, r3 -/* 80110700 7C 9D 23 78 */ mr r29, r4 -/* 80110704 7C BE 2B 78 */ mr r30, r5 -/* 80110708 7C DF 33 78 */ mr r31, r6 -/* 8011070C 80 03 06 FC */ lwz r0, 0x6fc(r3) -/* 80110710 28 00 00 00 */ cmplwi r0, 0 -/* 80110714 41 82 00 60 */ beq lbl_80110774 -/* 80110718 80 1C 05 78 */ lwz r0, 0x578(r28) -/* 8011071C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80110720 41 82 00 10 */ beq lbl_80110730 -/* 80110724 38 80 00 00 */ li r4, 0 -/* 80110728 38 A0 00 01 */ li r5, 1 -/* 8011072C 4B FB 0B B1 */ bl deleteEquipItem__9daAlink_cFii -lbl_80110730: -/* 80110730 80 1C 05 8C */ lwz r0, 0x58c(r28) -/* 80110734 60 00 00 04 */ ori r0, r0, 4 -/* 80110738 90 1C 05 8C */ stw r0, 0x58c(r28) -/* 8011073C 7F A3 EB 78 */ mr r3, r29 -/* 80110740 80 9C 06 FC */ lwz r4, 0x6fc(r28) -/* 80110744 38 84 00 24 */ addi r4, r4, 0x24 -/* 80110748 48 23 5D 69 */ bl PSMTXCopy -/* 8011074C 2C 1E 00 00 */ cmpwi r30, 0 -/* 80110750 40 82 00 10 */ bne lbl_80110760 -/* 80110754 80 1C 05 8C */ lwz r0, 0x58c(r28) -/* 80110758 60 00 00 08 */ ori r0, r0, 8 -/* 8011075C 90 1C 05 8C */ stw r0, 0x58c(r28) -lbl_80110760: -/* 80110760 2C 1F 00 00 */ cmpwi r31, 0 -/* 80110764 41 82 00 10 */ beq lbl_80110774 -/* 80110768 80 1C 05 8C */ lwz r0, 0x58c(r28) -/* 8011076C 60 00 00 10 */ ori r0, r0, 0x10 -/* 80110770 90 1C 05 8C */ stw r0, 0x58c(r28) -lbl_80110774: -/* 80110774 39 61 00 20 */ addi r11, r1, 0x20 -/* 80110778 48 25 1A AD */ bl _restgpr_28 -/* 8011077C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80110780 7C 08 03 A6 */ mtlr r0 -/* 80110784 38 21 00 20 */ addi r1, r1, 0x20 -/* 80110788 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setLandDamagePoint__9daAlink_cFi.s b/asm/d/a/d_a_alink/setLandDamagePoint__9daAlink_cFi.s deleted file mode 100644 index 0deda068512..00000000000 --- a/asm/d/a/d_a_alink/setLandDamagePoint__9daAlink_cFi.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_800D74A4: -/* 800D74A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D74A8 7C 08 02 A6 */ mflr r0 -/* 800D74AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D74B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D74B4 7C 7F 1B 78 */ mr r31, r3 -/* 800D74B8 80 03 05 90 */ lwz r0, 0x590(r3) -/* 800D74BC 60 00 00 40 */ ori r0, r0, 0x40 -/* 800D74C0 90 03 05 90 */ stw r0, 0x590(r3) -/* 800D74C4 38 A0 00 00 */ li r5, 0 -/* 800D74C8 38 C0 00 01 */ li r6, 1 -/* 800D74CC 38 E0 00 00 */ li r7, 0 -/* 800D74D0 4B FF FD ED */ bl setDamagePoint__9daAlink_cFiiii -/* 800D74D4 80 1F 05 90 */ lwz r0, 0x590(r31) -/* 800D74D8 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 800D74DC 90 1F 05 90 */ stw r0, 0x590(r31) -/* 800D74E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D74E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D74E8 7C 08 03 A6 */ mtlr r0 -/* 800D74EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D74F0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setLastSceneMode__9daAlink_cFPUl.s b/asm/d/a/d_a_alink/setLastSceneMode__9daAlink_cFPUl.s deleted file mode 100644 index b88dcc40b46..00000000000 --- a/asm/d/a/d_a_alink/setLastSceneMode__9daAlink_cFPUl.s +++ /dev/null @@ -1,79 +0,0 @@ -lbl_800BDE48: -/* 800BDE48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BDE4C 7C 08 02 A6 */ mflr r0 -/* 800BDE50 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BDE54 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800BDE58 93 C1 00 08 */ stw r30, 8(r1) -/* 800BDE5C 7C 7E 1B 78 */ mr r30, r3 -/* 800BDE60 7C 9F 23 78 */ mr r31, r4 -/* 800BDE64 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800BDE68 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800BDE6C 41 82 00 10 */ beq lbl_800BDE7C -/* 800BDE70 80 1F 00 00 */ lwz r0, 0(r31) -/* 800BDE74 64 00 00 40 */ oris r0, r0, 0x40 -/* 800BDE78 90 1F 00 00 */ stw r0, 0(r31) -lbl_800BDE7C: -/* 800BDE7C 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 800BDE80 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800BDE84 41 82 00 10 */ beq lbl_800BDE94 -/* 800BDE88 80 1F 00 00 */ lwz r0, 0(r31) -/* 800BDE8C 64 00 00 80 */ oris r0, r0, 0x80 -/* 800BDE90 90 1F 00 00 */ stw r0, 0(r31) -lbl_800BDE94: -/* 800BDE94 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 800BDE98 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 800BDE9C 41 82 00 1C */ beq lbl_800BDEB8 -/* 800BDEA0 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) -/* 800BDEA4 28 00 00 48 */ cmplwi r0, 0x48 -/* 800BDEA8 41 82 00 10 */ beq lbl_800BDEB8 -/* 800BDEAC 80 1F 00 00 */ lwz r0, 0(r31) -/* 800BDEB0 64 00 00 20 */ oris r0, r0, 0x20 -/* 800BDEB4 90 1F 00 00 */ stw r0, 0(r31) -lbl_800BDEB8: -/* 800BDEB8 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) -/* 800BDEBC 28 00 01 03 */ cmplwi r0, 0x103 -/* 800BDEC0 40 82 00 14 */ bne lbl_800BDED4 -/* 800BDEC4 80 1F 00 00 */ lwz r0, 0(r31) -/* 800BDEC8 64 00 28 00 */ oris r0, r0, 0x2800 -/* 800BDECC 90 1F 00 00 */ stw r0, 0(r31) -/* 800BDED0 48 00 00 1C */ b lbl_800BDEEC -lbl_800BDED4: -/* 800BDED4 28 00 00 FF */ cmplwi r0, 0xff -/* 800BDED8 40 80 00 14 */ bge lbl_800BDEEC -/* 800BDEDC 80 7F 00 00 */ lwz r3, 0(r31) -/* 800BDEE0 54 00 C0 0E */ slwi r0, r0, 0x18 -/* 800BDEE4 7C 60 03 78 */ or r0, r3, r0 -/* 800BDEE8 90 1F 00 00 */ stw r0, 0(r31) -lbl_800BDEEC: -/* 800BDEEC 80 7E 28 30 */ lwz r3, 0x2830(r30) -/* 800BDEF0 28 03 00 00 */ cmplwi r3, 0 -/* 800BDEF4 41 82 00 38 */ beq lbl_800BDF2C -/* 800BDEF8 48 02 59 39 */ bl daAlink_checkLightBallA__FP10fopAc_ac_c -/* 800BDEFC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800BDF00 41 82 00 10 */ beq lbl_800BDF10 -/* 800BDF04 80 1F 00 00 */ lwz r0, 0(r31) -/* 800BDF08 64 00 00 10 */ oris r0, r0, 0x10 -/* 800BDF0C 90 1F 00 00 */ stw r0, 0(r31) -lbl_800BDF10: -/* 800BDF10 80 7E 28 30 */ lwz r3, 0x2830(r30) -/* 800BDF14 48 02 59 45 */ bl daAlink_checkLightBallB__FP10fopAc_ac_c -/* 800BDF18 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800BDF1C 41 82 00 10 */ beq lbl_800BDF2C -/* 800BDF20 80 1F 00 00 */ lwz r0, 0(r31) -/* 800BDF24 64 00 00 08 */ oris r0, r0, 8 -/* 800BDF28 90 1F 00 00 */ stw r0, 0(r31) -lbl_800BDF2C: -/* 800BDF2C A0 1E 05 6E */ lhz r0, 0x56e(r30) -/* 800BDF30 28 00 00 00 */ cmplwi r0, 0 -/* 800BDF34 41 82 00 14 */ beq lbl_800BDF48 -/* 800BDF38 80 7F 00 00 */ lwz r3, 0(r31) -/* 800BDF3C 54 00 51 A8 */ rlwinm r0, r0, 0xa, 6, 0x14 -/* 800BDF40 7C 60 03 78 */ or r0, r3, r0 -/* 800BDF44 90 1F 00 00 */ stw r0, 0(r31) -lbl_800BDF48: -/* 800BDF48 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800BDF4C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800BDF50 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BDF54 7C 08 03 A6 */ mtlr r0 -/* 800BDF58 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BDF5C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setMagicArmorBrk__9daAlink_cFi.s b/asm/d/a/d_a_alink/setMagicArmorBrk__9daAlink_cFi.s deleted file mode 100644 index cdc8a0fad9a..00000000000 --- a/asm/d/a/d_a_alink/setMagicArmorBrk__9daAlink_cFi.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_800BB324: -/* 800BB324 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800BB328 7C 08 02 A6 */ mflr r0 -/* 800BB32C 90 01 00 24 */ stw r0, 0x24(r1) -/* 800BB330 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BB334 48 2A 6E A1 */ bl _savegpr_27 -/* 800BB338 7C 7B 1B 78 */ mr r27, r3 -/* 800BB33C 7C 9C 23 78 */ mr r28, r4 -/* 800BB340 80 63 06 50 */ lwz r3, 0x650(r3) -/* 800BB344 83 E3 00 04 */ lwz r31, 4(r3) -/* 800BB348 38 62 92 70 */ la r3, l_mArcName(r2) /* 80452C70-_SDA2_BASE_ */ -/* 800BB34C 54 9D 10 3A */ slwi r29, r4, 2 -/* 800BB350 3C 80 80 3B */ lis r4, bodyBrkName@ha /* 0x803B2D94@ha */ -/* 800BB354 38 84 2D 94 */ addi r4, r4, bodyBrkName@l /* 0x803B2D94@l */ -/* 800BB358 7C 84 E8 2E */ lwzx r4, r4, r29 -/* 800BB35C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800BB360 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800BB364 3F C5 00 02 */ addis r30, r5, 2 -/* 800BB368 3B DE C2 F8 */ addi r30, r30, -15624 -/* 800BB36C 7F C5 F3 78 */ mr r5, r30 -/* 800BB370 38 C0 00 80 */ li r6, 0x80 -/* 800BB374 4B F8 10 09 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 800BB378 90 7B 06 7C */ stw r3, 0x67c(r27) -/* 800BB37C 80 7B 06 7C */ lwz r3, 0x67c(r27) -/* 800BB380 7F E4 FB 78 */ mr r4, r31 -/* 800BB384 48 27 04 F9 */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData -/* 800BB388 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800BB38C 80 9B 06 7C */ lwz r4, 0x67c(r27) -/* 800BB390 48 27 4A E1 */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey -/* 800BB394 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800BB398 80 7B 06 7C */ lwz r3, 0x67c(r27) -/* 800BB39C D0 03 00 08 */ stfs f0, 8(r3) -/* 800BB3A0 80 7B 06 58 */ lwz r3, 0x658(r27) -/* 800BB3A4 83 E3 00 04 */ lwz r31, 4(r3) -/* 800BB3A8 38 62 92 70 */ la r3, l_mArcName(r2) /* 80452C70-_SDA2_BASE_ */ -/* 800BB3AC 3C 80 80 3B */ lis r4, headBrkName@ha /* 0x803B2DA0@ha */ -/* 800BB3B0 38 84 2D A0 */ addi r4, r4, headBrkName@l /* 0x803B2DA0@l */ -/* 800BB3B4 7C 84 E8 2E */ lwzx r4, r4, r29 -/* 800BB3B8 7F C5 F3 78 */ mr r5, r30 -/* 800BB3BC 38 C0 00 80 */ li r6, 0x80 -/* 800BB3C0 4B F8 0F BD */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 800BB3C4 90 7B 06 80 */ stw r3, 0x680(r27) -/* 800BB3C8 80 7B 06 80 */ lwz r3, 0x680(r27) -/* 800BB3CC 7F E4 FB 78 */ mr r4, r31 -/* 800BB3D0 48 27 04 AD */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData -/* 800BB3D4 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800BB3D8 80 9B 06 80 */ lwz r4, 0x680(r27) -/* 800BB3DC 48 27 4A 95 */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey -/* 800BB3E0 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800BB3E4 80 7B 06 80 */ lwz r3, 0x680(r27) -/* 800BB3E8 D0 03 00 08 */ stfs f0, 8(r3) -/* 800BB3EC 9B 9B 2F D7 */ stb r28, 0x2fd7(r27) -/* 800BB3F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BB3F4 48 2A 6E 2D */ bl _restgpr_27 -/* 800BB3F8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800BB3FC 7C 08 03 A6 */ mtlr r0 -/* 800BB400 38 21 00 20 */ addi r1, r1, 0x20 -/* 800BB404 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setMetamorphoseModel__9daAlink_cFi.s b/asm/d/a/d_a_alink/setMetamorphoseModel__9daAlink_cFi.s deleted file mode 100644 index 66d30a9fe6e..00000000000 --- a/asm/d/a/d_a_alink/setMetamorphoseModel__9daAlink_cFi.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_800BF79C: -/* 800BF79C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800BF7A0 7C 08 02 A6 */ mflr r0 -/* 800BF7A4 90 01 00 24 */ stw r0, 0x24(r1) -/* 800BF7A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BF7AC 48 2A 2A 31 */ bl _savegpr_29 -/* 800BF7B0 7C 7D 1B 78 */ mr r29, r3 -/* 800BF7B4 38 7D 21 D8 */ addi r3, r29, 0x21d8 -/* 800BF7B8 20 04 00 00 */ subfic r0, r4, 0 -/* 800BF7BC 7C 80 01 10 */ subfe r4, r0, r0 -/* 800BF7C0 38 84 02 7D */ addi r4, r4, 0x27d -/* 800BF7C4 48 09 F8 A5 */ bl loadDataIdx__14daPy_anmHeap_cFUs -/* 800BF7C8 7C 7F 1B 78 */ mr r31, r3 -/* 800BF7CC 7F A3 EB 78 */ mr r3, r29 -/* 800BF7D0 4B FE 44 BD */ bl setItemHeap__9daAlink_cFv -/* 800BF7D4 7C 7E 1B 78 */ mr r30, r3 -/* 800BF7D8 7F A3 EB 78 */ mr r3, r29 -/* 800BF7DC 38 80 03 1B */ li r4, 0x31b -/* 800BF7E0 38 A0 60 00 */ li r5, 0x6000 -/* 800BF7E4 48 00 06 65 */ bl loadAramBmd__9daAlink_cFUsUl -/* 800BF7E8 7C 64 1B 78 */ mr r4, r3 -/* 800BF7EC 7F A3 EB 78 */ mr r3, r29 -/* 800BF7F0 3C A0 00 08 */ lis r5, 8 -/* 800BF7F4 38 C0 00 00 */ li r6, 0 -/* 800BF7F8 4B FE 45 85 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl -/* 800BF7FC 90 7D 07 08 */ stw r3, 0x708(r29) -/* 800BF800 38 7D 07 30 */ addi r3, r29, 0x730 -/* 800BF804 7F E4 FB 78 */ mr r4, r31 -/* 800BF808 38 A0 00 00 */ li r5, 0 -/* 800BF80C 38 C0 00 02 */ li r6, 2 -/* 800BF810 C0 22 92 B8 */ lfs f1, lit_6040(r2) -/* 800BF814 38 E0 00 00 */ li r7, 0 -/* 800BF818 39 00 FF FF */ li r8, -1 -/* 800BF81C 39 20 00 00 */ li r9, 0 -/* 800BF820 4B F4 DF BD */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 800BF824 7F C3 F3 78 */ mr r3, r30 -/* 800BF828 4B F4 F9 A5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 800BF82C 38 00 01 06 */ li r0, 0x106 -/* 800BF830 B0 1D 2F DC */ sth r0, 0x2fdc(r29) -/* 800BF834 C0 1D 1F E0 */ lfs f0, 0x1fe0(r29) -/* 800BF838 D0 1D 33 DC */ stfs f0, 0x33dc(r29) -/* 800BF83C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BF840 48 2A 29 E9 */ bl _restgpr_29 -/* 800BF844 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800BF848 7C 08 03 A6 */ mtlr r0 -/* 800BF84C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800BF850 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setOutPower__9daAlink_cFfsi.s b/asm/d/a/d_a_alink/setOutPower__9daAlink_cFfsi.s deleted file mode 100644 index 396de05d0cb..00000000000 --- a/asm/d/a/d_a_alink/setOutPower__9daAlink_cFfsi.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_800BB560: -/* 800BB560 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 800BB564 7C 08 02 A6 */ mflr r0 -/* 800BB568 90 01 00 34 */ stw r0, 0x34(r1) -/* 800BB56C DB E1 00 20 */ stfd f31, 0x20(r1) -/* 800BB570 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 800BB574 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BB578 48 2A 6C 65 */ bl _savegpr_29 -/* 800BB57C 7C 7D 1B 78 */ mr r29, r3 -/* 800BB580 FF E0 08 90 */ fmr f31, f1 -/* 800BB584 7C 9E 23 78 */ mr r30, r4 -/* 800BB588 7C BF 2B 78 */ mr r31, r5 -/* 800BB58C 38 60 00 00 */ li r3, 0 -/* 800BB590 A0 1D 1F BC */ lhz r0, 0x1fbc(r29) -/* 800BB594 28 00 00 62 */ cmplwi r0, 0x62 -/* 800BB598 41 82 00 10 */ beq lbl_800BB5A8 -/* 800BB59C 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800BB5A0 28 00 02 A0 */ cmplwi r0, 0x2a0 -/* 800BB5A4 40 82 00 08 */ bne lbl_800BB5AC -lbl_800BB5A8: -/* 800BB5A8 38 60 00 01 */ li r3, 1 -lbl_800BB5AC: -/* 800BB5AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800BB5B0 41 82 00 28 */ beq lbl_800BB5D8 -/* 800BB5B4 48 00 4D 15 */ bl checkBossRoom__9daAlink_cFv -/* 800BB5B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800BB5BC 41 82 00 1C */ beq lbl_800BB5D8 -/* 800BB5C0 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 800BB5C4 2C 00 00 32 */ cmpwi r0, 0x32 -/* 800BB5C8 40 82 00 10 */ bne lbl_800BB5D8 -/* 800BB5CC 80 1D 05 70 */ lwz r0, 0x570(r29) -/* 800BB5D0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800BB5D4 40 82 00 50 */ bne lbl_800BB624 -lbl_800BB5D8: -/* 800BB5D8 C0 3D 34 00 */ lfs f1, 0x3400(r29) -/* 800BB5DC 57 C0 04 38 */ rlwinm r0, r30, 0, 0x10, 0x1c -/* 800BB5E0 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 800BB5E4 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 800BB5E8 7C 03 04 2E */ lfsx f0, r3, r0 -/* 800BB5EC EC 1F 00 32 */ fmuls f0, f31, f0 -/* 800BB5F0 EC 01 00 2A */ fadds f0, f1, f0 -/* 800BB5F4 D0 1D 34 00 */ stfs f0, 0x3400(r29) -/* 800BB5F8 C0 3D 34 04 */ lfs f1, 0x3404(r29) -/* 800BB5FC 7C 63 02 14 */ add r3, r3, r0 -/* 800BB600 C0 03 00 04 */ lfs f0, 4(r3) -/* 800BB604 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 800BB608 EC 01 00 2A */ fadds f0, f1, f0 -/* 800BB60C D0 1D 34 04 */ stfs f0, 0x3404(r29) -/* 800BB610 2C 1F 00 00 */ cmpwi r31, 0 -/* 800BB614 41 82 00 10 */ beq lbl_800BB624 -/* 800BB618 80 1D 05 88 */ lwz r0, 0x588(r29) -/* 800BB61C 60 00 00 08 */ ori r0, r0, 8 -/* 800BB620 90 1D 05 88 */ stw r0, 0x588(r29) -lbl_800BB624: -/* 800BB624 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 800BB628 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 800BB62C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BB630 48 2A 6B F9 */ bl _restgpr_29 -/* 800BB634 80 01 00 34 */ lwz r0, 0x34(r1) -/* 800BB638 7C 08 03 A6 */ mtlr r0 -/* 800BB63C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800BB640 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setRideCanoeBasePos__9daAlink_cFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/setRideCanoeBasePos__9daAlink_cFP10fopAc_ac_c.s deleted file mode 100644 index aa1e7852d90..00000000000 --- a/asm/d/a/d_a_alink/setRideCanoeBasePos__9daAlink_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800F4564: -/* 800F4564 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800F4568 D0 03 37 C8 */ stfs f0, 0x37c8(r3) -/* 800F456C C0 02 92 9C */ lfs f0, lit_5944(r2) -/* 800F4570 D0 03 37 CC */ stfs f0, 0x37cc(r3) -/* 800F4574 C0 02 95 14 */ lfs f0, lit_20823(r2) -/* 800F4578 D0 03 37 D0 */ stfs f0, 0x37d0(r3) -/* 800F457C 80 04 00 B0 */ lwz r0, 0xb0(r4) -/* 800F4580 28 00 00 02 */ cmplwi r0, 2 -/* 800F4584 4C 82 00 20 */ bnelr -/* 800F4588 C0 23 37 D0 */ lfs f1, 0x37d0(r3) -/* 800F458C C0 02 95 18 */ lfs f0, lit_20824(r2) -/* 800F4590 EC 01 00 2A */ fadds f0, f1, f0 -/* 800F4594 D0 03 37 D0 */ stfs f0, 0x37d0(r3) -/* 800F4598 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setRoomInfo__9daAlink_cFv.s b/asm/d/a/d_a_alink/setRoomInfo__9daAlink_cFv.s deleted file mode 100644 index 12865b68a0e..00000000000 --- a/asm/d/a/d_a_alink/setRoomInfo__9daAlink_cFv.s +++ /dev/null @@ -1,119 +0,0 @@ -lbl_800A662C: -/* 800A662C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800A6630 7C 08 02 A6 */ mflr r0 -/* 800A6634 90 01 00 24 */ stw r0, 0x24(r1) -/* 800A6638 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A663C 48 2B BB A1 */ bl _savegpr_29 -/* 800A6640 7C 7E 1B 78 */ mr r30, r3 -/* 800A6644 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800A6648 28 00 01 58 */ cmplwi r0, 0x158 -/* 800A664C 41 82 00 4C */ beq lbl_800A6698 -/* 800A6650 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800A6654 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800A6658 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 800A665C 38 9E 1A 60 */ addi r4, r30, 0x1a60 -/* 800A6660 4B FC EA A1 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 800A6664 7C 7F 1B 78 */ mr r31, r3 -/* 800A6668 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 800A666C 7C 00 07 74 */ extsb r0, r0 -/* 800A6670 7C 1F 00 00 */ cmpw r31, r0 -/* 800A6674 41 82 00 18 */ beq lbl_800A668C -/* 800A6678 9B FE 04 8C */ stb r31, 0x48c(r30) -/* 800A667C 4B F8 69 F1 */ bl dComIfGp_getReverb__Fi -/* 800A6680 98 7E 2F 9A */ stb r3, 0x2f9a(r30) -/* 800A6684 9B FE 08 36 */ stb r31, 0x836(r30) -/* 800A6688 9B FE 04 E2 */ stb r31, 0x4e2(r30) -lbl_800A668C: -/* 800A668C 38 7E 1A 4C */ addi r3, r30, 0x1a4c -/* 800A6690 4B F8 09 59 */ bl dStage_RoomCheck__FP11cBgS_GndChk -/* 800A6694 48 00 00 10 */ b lbl_800A66A4 -lbl_800A6698: -/* 800A6698 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 800A669C 7C 00 07 74 */ extsb r0, r0 -/* 800A66A0 7C 1F 03 78 */ mr r31, r0 -lbl_800A66A4: -/* 800A66A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800A66A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800A66AC 3B A3 0F 38 */ addi r29, r3, 0xf38 -/* 800A66B0 7F A3 EB 78 */ mr r3, r29 -/* 800A66B4 38 9E 1A 60 */ addi r4, r30, 0x1a60 -/* 800A66B8 4B FC E5 31 */ bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo -/* 800A66BC 98 7E 04 8D */ stb r3, 0x48d(r30) -/* 800A66C0 7F A3 EB 78 */ mr r3, r29 -/* 800A66C4 38 9E 1A 60 */ addi r4, r30, 0x1a60 -/* 800A66C8 4B FC E8 29 */ bl GetGroundCode__4dBgSFRC13cBgS_PolyInfo -/* 800A66CC 90 7E 31 74 */ stw r3, 0x3174(r30) -/* 800A66D0 7F A3 EB 78 */ mr r3, r29 -/* 800A66D4 38 9E 1A 60 */ addi r4, r30, 0x1a60 -/* 800A66D8 4B FC E7 79 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo -/* 800A66DC 98 7E 2F BB */ stb r3, 0x2fbb(r30) -/* 800A66E0 7F A3 EB 78 */ mr r3, r29 -/* 800A66E4 38 9E 1A 60 */ addi r4, r30, 0x1a60 -/* 800A66E8 4B FC E5 D5 */ bl GetSpecialCode__4dBgSFRC13cBgS_PolyInfo -/* 800A66EC 98 7E 2F A8 */ stb r3, 0x2fa8(r30) -/* 800A66F0 88 1E 2F A8 */ lbz r0, 0x2fa8(r30) -/* 800A66F4 28 00 00 06 */ cmplwi r0, 6 -/* 800A66F8 40 82 00 18 */ bne lbl_800A6710 -/* 800A66FC 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 800A6700 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800A6704 41 82 00 0C */ beq lbl_800A6710 -/* 800A6708 38 00 00 05 */ li r0, 5 -/* 800A670C 98 1E 2F A8 */ stb r0, 0x2fa8(r30) -lbl_800A6710: -/* 800A6710 88 1E 2F BD */ lbz r0, 0x2fbd(r30) -/* 800A6714 28 00 00 FF */ cmplwi r0, 0xff -/* 800A6718 41 82 00 AC */ beq lbl_800A67C4 -/* 800A671C 88 1E 2F BB */ lbz r0, 0x2fbb(r30) -/* 800A6720 28 00 00 03 */ cmplwi r0, 3 -/* 800A6724 40 82 00 98 */ bne lbl_800A67BC -/* 800A6728 7F A3 EB 78 */ mr r3, r29 -/* 800A672C 38 9E 1A 60 */ addi r4, r30, 0x1a60 -/* 800A6730 4B FC E7 71 */ bl GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo -/* 800A6734 98 7E 2F BD */ stb r3, 0x2fbd(r30) -/* 800A6738 88 1E 2F BD */ lbz r0, 0x2fbd(r30) -/* 800A673C 28 00 00 04 */ cmplwi r0, 4 -/* 800A6740 40 82 00 18 */ bne lbl_800A6758 -/* 800A6744 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 800A6748 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800A674C 41 82 00 0C */ beq lbl_800A6758 -/* 800A6750 38 00 00 00 */ li r0, 0 -/* 800A6754 98 1E 2F BD */ stb r0, 0x2fbd(r30) -lbl_800A6758: -/* 800A6758 7F C3 F3 78 */ mr r3, r30 -/* 800A675C 48 06 F4 C5 */ bl checkEventRun__9daAlink_cCFv -/* 800A6760 2C 03 00 00 */ cmpwi r3, 0 -/* 800A6764 40 82 00 60 */ bne lbl_800A67C4 -/* 800A6768 88 1E 2F BD */ lbz r0, 0x2fbd(r30) -/* 800A676C 28 00 00 01 */ cmplwi r0, 1 -/* 800A6770 41 82 00 0C */ beq lbl_800A677C -/* 800A6774 28 00 00 03 */ cmplwi r0, 3 -/* 800A6778 40 82 00 4C */ bne lbl_800A67C4 -lbl_800A677C: -/* 800A677C 7F C3 F3 78 */ mr r3, r30 -/* 800A6780 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 800A6784 81 8C 02 80 */ lwz r12, 0x280(r12) -/* 800A6788 7D 89 03 A6 */ mtctr r12 -/* 800A678C 4E 80 04 21 */ bctrl -/* 800A6790 2C 03 00 00 */ cmpwi r3, 0 -/* 800A6794 40 82 00 1C */ bne lbl_800A67B0 -/* 800A6798 C0 5E 2B A8 */ lfs f2, 0x2ba8(r30) -/* 800A679C C0 22 92 B8 */ lfs f1, lit_6040(r2) -/* 800A67A0 C0 1E 34 58 */ lfs f0, 0x3458(r30) -/* 800A67A4 EC 01 00 2A */ fadds f0, f1, f0 -/* 800A67A8 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 800A67AC 40 80 00 18 */ bge lbl_800A67C4 -lbl_800A67B0: -/* 800A67B0 38 00 00 02 */ li r0, 2 -/* 800A67B4 98 1E 2F BD */ stb r0, 0x2fbd(r30) -/* 800A67B8 48 00 00 0C */ b lbl_800A67C4 -lbl_800A67BC: -/* 800A67BC 38 00 00 00 */ li r0, 0 -/* 800A67C0 98 1E 2F BD */ stb r0, 0x2fbd(r30) -lbl_800A67C4: -/* 800A67C4 7F E3 FB 78 */ mr r3, r31 -/* 800A67C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A67CC 48 2B BA 5D */ bl _restgpr_29 -/* 800A67D0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800A67D4 7C 08 03 A6 */ mtlr r0 -/* 800A67D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800A67DC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setScreamWaitAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/setScreamWaitAnime__9daAlink_cFv.s deleted file mode 100644 index c24d17279be..00000000000 --- a/asm/d/a/d_a_alink/setScreamWaitAnime__9daAlink_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_800DBC98: -/* 800DBC98 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800DBC9C 7C 08 02 A6 */ mflr r0 -/* 800DBCA0 90 01 00 24 */ stw r0, 0x24(r1) -/* 800DBCA4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 800DBCA8 7C 7F 1B 78 */ mr r31, r3 -/* 800DBCAC 38 80 01 7B */ li r4, 0x17b -/* 800DBCB0 4B FD 12 D1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 800DBCB4 7F E3 FB 78 */ mr r3, r31 -/* 800DBCB8 3C 80 00 01 */ lis r4, 0x0001 /* 0x000100A9@ha */ -/* 800DBCBC 38 84 00 A9 */ addi r4, r4, 0x00A9 /* 0x000100A9@l */ -/* 800DBCC0 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800DBCC4 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800DBCC8 7D 89 03 A6 */ mtctr r12 -/* 800DBCCC 4E 80 04 21 */ bctrl -/* 800DBCD0 38 00 00 01 */ li r0, 1 -/* 800DBCD4 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800DBCD8 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800DBCDC D0 21 00 08 */ stfs f1, 8(r1) -/* 800DBCE0 C0 02 92 B8 */ lfs f0, lit_6040(r2) -/* 800DBCE4 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800DBCE8 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800DBCEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800DBCF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800DBCF4 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 800DBCF8 38 80 00 05 */ li r4, 5 -/* 800DBCFC 38 A0 00 01 */ li r5, 1 -/* 800DBD00 38 C1 00 08 */ addi r6, r1, 8 -/* 800DBD04 4B F9 3E 0D */ bl StartQuake__12dVibration_cFii4cXyz -/* 800DBD08 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 800DBD0C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800DBD10 7C 08 03 A6 */ mtlr r0 -/* 800DBD14 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DBD18 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setShieldGuard__9daAlink_cFv.s b/asm/d/a/d_a_alink/setShieldGuard__9daAlink_cFv.s deleted file mode 100644 index f6acaa29d47..00000000000 --- a/asm/d/a/d_a_alink/setShieldGuard__9daAlink_cFv.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_800DD018: -/* 800DD018 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800DD01C 7C 08 02 A6 */ mflr r0 -/* 800DD020 90 01 00 14 */ stw r0, 0x14(r1) -/* 800DD024 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800DD028 7C 7F 1B 78 */ mr r31, r3 -/* 800DD02C A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800DD030 28 00 00 1D */ cmplwi r0, 0x1d -/* 800DD034 40 82 00 10 */ bne lbl_800DD044 -/* 800DD038 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800DD03C 28 00 00 42 */ cmplwi r0, 0x42 -/* 800DD040 40 82 00 A4 */ bne lbl_800DD0E4 -lbl_800DD044: -/* 800DD044 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 800DD048 28 00 00 16 */ cmplwi r0, 0x16 -/* 800DD04C 41 82 00 98 */ beq lbl_800DD0E4 -/* 800DD050 7F E3 FB 78 */ mr r3, r31 -/* 800DD054 4B FF FF 11 */ bl checkGuardAccept__9daAlink_cFv -/* 800DD058 2C 03 00 00 */ cmpwi r3, 0 -/* 800DD05C 41 82 00 98 */ beq lbl_800DD0F4 -/* 800DD060 7F E3 FB 78 */ mr r3, r31 -/* 800DD064 48 00 6C 09 */ bl checkGrabAnime__9daAlink_cCFv -/* 800DD068 2C 03 00 00 */ cmpwi r3, 0 -/* 800DD06C 40 82 00 88 */ bne lbl_800DD0F4 -/* 800DD070 7F E3 FB 78 */ mr r3, r31 -/* 800DD074 4B FD DF 0D */ bl checkUpperReadyThrowAnime__9daAlink_cCFv -/* 800DD078 2C 03 00 00 */ cmpwi r3, 0 -/* 800DD07C 40 82 00 78 */ bne lbl_800DD0F4 -/* 800DD080 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 800DD084 28 00 02 62 */ cmplwi r0, 0x262 -/* 800DD088 41 82 00 6C */ beq lbl_800DD0F4 -/* 800DD08C 7F E3 FB 78 */ mr r3, r31 -/* 800DD090 4B FF 3E 3D */ bl checkCutDashAnime__9daAlink_cCFv -/* 800DD094 2C 03 00 00 */ cmpwi r3, 0 -/* 800DD098 40 82 00 5C */ bne lbl_800DD0F4 -/* 800DD09C A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 800DD0A0 28 00 00 83 */ cmplwi r0, 0x83 -/* 800DD0A4 41 82 00 50 */ beq lbl_800DD0F4 -/* 800DD0A8 7F E3 FB 78 */ mr r3, r31 -/* 800DD0AC 4B FD C2 95 */ bl checkEquipAnime__9daAlink_cCFv -/* 800DD0B0 2C 03 00 00 */ cmpwi r3, 0 -/* 800DD0B4 41 82 00 14 */ beq lbl_800DD0C8 -/* 800DD0B8 7F E3 FB 78 */ mr r3, r31 -/* 800DD0BC 4B FF FD 35 */ bl checkUpperGuardAnime__9daAlink_cCFv -/* 800DD0C0 2C 03 00 00 */ cmpwi r3, 0 -/* 800DD0C4 41 82 00 30 */ beq lbl_800DD0F4 -lbl_800DD0C8: -/* 800DD0C8 88 1F 2F AA */ lbz r0, 0x2faa(r31) -/* 800DD0CC 28 00 00 00 */ cmplwi r0, 0 -/* 800DD0D0 40 82 00 24 */ bne lbl_800DD0F4 -/* 800DD0D4 7F E3 FB 78 */ mr r3, r31 -/* 800DD0D8 4B FF F5 A1 */ bl checkGuardActionChange__9daAlink_cFv -/* 800DD0DC 2C 03 00 00 */ cmpwi r3, 0 -/* 800DD0E0 41 82 00 14 */ beq lbl_800DD0F4 -lbl_800DD0E4: -/* 800DD0E4 80 1F 05 78 */ lwz r0, 0x578(r31) -/* 800DD0E8 64 00 08 00 */ oris r0, r0, 0x800 -/* 800DD0EC 90 1F 05 78 */ stw r0, 0x578(r31) -/* 800DD0F0 48 00 00 10 */ b lbl_800DD100 -lbl_800DD0F4: -/* 800DD0F4 80 1F 05 78 */ lwz r0, 0x578(r31) -/* 800DD0F8 54 00 01 46 */ rlwinm r0, r0, 0, 5, 3 -/* 800DD0FC 90 1F 05 78 */ stw r0, 0x578(r31) -lbl_800DD100: -/* 800DD100 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800DD104 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800DD108 7C 08 03 A6 */ mtlr r0 -/* 800DD10C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DD110 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSingleAnimeWolfBaseMorf__9daAlink_cFQ29daAlink_c12daAlink_WANMf.s b/asm/d/a/d_a_alink/setSingleAnimeWolfBaseMorf__9daAlink_cFQ29daAlink_c12daAlink_WANMf.s deleted file mode 100644 index af2cfdf0e07..00000000000 --- a/asm/d/a/d_a_alink/setSingleAnimeWolfBaseMorf__9daAlink_cFQ29daAlink_c12daAlink_WANMf.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_801296A8: -/* 801296A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801296AC 7C 08 02 A6 */ mflr r0 -/* 801296B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801296B4 FC 60 08 90 */ fmr f3, f1 -/* 801296B8 C0 22 92 B8 */ lfs f1, lit_6040(r2) -/* 801296BC C0 42 92 C0 */ lfs f2, lit_6108(r2) -/* 801296C0 38 A0 FF FF */ li r5, -1 -/* 801296C4 48 00 00 41 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf -/* 801296C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801296CC 7C 08 03 A6 */ mtlr r0 -/* 801296D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801296D4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff.s b/asm/d/a/d_a_alink/setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff.s deleted file mode 100644 index 21bc28a7d67..00000000000 --- a/asm/d/a/d_a_alink/setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_801296D8: -/* 801296D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801296DC 7C 08 02 A6 */ mflr r0 -/* 801296E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801296E4 FC 60 10 90 */ fmr f3, f2 -/* 801296E8 C0 42 92 C0 */ lfs f2, lit_6108(r2) -/* 801296EC 38 A0 FF FF */ li r5, -1 -/* 801296F0 48 00 00 15 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf -/* 801296F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801296F8 7C 08 03 A6 */ mtlr r0 -/* 801296FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80129700 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM.s b/asm/d/a/d_a_alink/setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM.s deleted file mode 100644 index 1b04131d795..00000000000 --- a/asm/d/a/d_a_alink/setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80129678: -/* 80129678 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012967C 7C 08 02 A6 */ mflr r0 -/* 80129680 90 01 00 14 */ stw r0, 0x14(r1) -/* 80129684 C0 22 92 B8 */ lfs f1, lit_6040(r2) -/* 80129688 C0 42 92 C0 */ lfs f2, lit_6108(r2) -/* 8012968C 38 A0 FF FF */ li r5, -1 -/* 80129690 C0 62 92 C4 */ lfs f3, lit_6109(r2) -/* 80129694 48 00 00 71 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf -/* 80129698 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012969C 7C 08 03 A6 */ mtlr r0 -/* 801296A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801296A4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c.s b/asm/d/a/d_a_alink/setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c.s deleted file mode 100644 index 4f59fe8874d..00000000000 --- a/asm/d/a/d_a_alink/setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80129848: -/* 80129848 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012984C 7C 08 02 A6 */ mflr r0 -/* 80129850 90 01 00 14 */ stw r0, 0x14(r1) -/* 80129854 7C A6 2B 78 */ mr r6, r5 -/* 80129858 C0 25 00 04 */ lfs f1, 4(r5) -/* 8012985C C0 45 00 08 */ lfs f2, 8(r5) -/* 80129860 A8 A5 00 00 */ lha r5, 0(r5) -/* 80129864 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 80129868 4B FF FE 9D */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf -/* 8012986C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80129870 7C 08 03 A6 */ mtlr r0 -/* 80129874 38 21 00 10 */ addi r1, r1, 0x10 -/* 80129878 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSlingModel__9daAlink_cFv.s b/asm/d/a/d_a_alink/setSlingModel__9daAlink_cFv.s deleted file mode 100644 index 15b1f49c859..00000000000 --- a/asm/d/a/d_a_alink/setSlingModel__9daAlink_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_800DE7D4: -/* 800DE7D4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800DE7D8 7C 08 02 A6 */ mflr r0 -/* 800DE7DC 90 01 00 24 */ stw r0, 0x24(r1) -/* 800DE7E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DE7E4 48 28 39 F9 */ bl _savegpr_29 -/* 800DE7E8 7C 7D 1B 78 */ mr r29, r3 -/* 800DE7EC 38 7D 21 D8 */ addi r3, r29, 0x21d8 -/* 800DE7F0 38 80 01 F9 */ li r4, 0x1f9 -/* 800DE7F4 48 08 08 75 */ bl loadDataIdx__14daPy_anmHeap_cFUs -/* 800DE7F8 7C 7F 1B 78 */ mr r31, r3 -/* 800DE7FC 7F A3 EB 78 */ mr r3, r29 -/* 800DE800 4B FC 54 8D */ bl setItemHeap__9daAlink_cFv -/* 800DE804 7C 7E 1B 78 */ mr r30, r3 -/* 800DE808 7F A3 EB 78 */ mr r3, r29 -/* 800DE80C 38 80 03 19 */ li r4, 0x319 -/* 800DE810 38 A0 2C 00 */ li r5, 0x2c00 -/* 800DE814 4B FE 16 35 */ bl loadAramBmd__9daAlink_cFUsUl -/* 800DE818 7C 64 1B 78 */ mr r4, r3 -/* 800DE81C 7F A3 EB 78 */ mr r3, r29 -/* 800DE820 3C A0 00 08 */ lis r5, 8 -/* 800DE824 38 C0 00 00 */ li r6, 0 -/* 800DE828 4B FC 55 55 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl -/* 800DE82C 90 7D 07 08 */ stw r3, 0x708(r29) -/* 800DE830 38 7D 07 30 */ addi r3, r29, 0x730 -/* 800DE834 7F E4 FB 78 */ mr r4, r31 -/* 800DE838 38 A0 00 00 */ li r5, 0 -/* 800DE83C 38 C0 00 02 */ li r6, 2 -/* 800DE840 C0 22 92 B8 */ lfs f1, lit_6040(r2) -/* 800DE844 38 E0 00 00 */ li r7, 0 -/* 800DE848 39 00 FF FF */ li r8, -1 -/* 800DE84C 39 20 00 00 */ li r9, 0 -/* 800DE850 4B F2 EF 8D */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 800DE854 7F C3 F3 78 */ mr r3, r30 -/* 800DE858 4B F3 09 75 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 800DE85C 38 00 00 05 */ li r0, 5 -/* 800DE860 98 1D 2F 95 */ stb r0, 0x2f95(r29) -/* 800DE864 38 00 00 67 */ li r0, 0x67 -/* 800DE868 98 1D 2F 94 */ stb r0, 0x2f94(r29) -/* 800DE86C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DE870 48 28 39 B9 */ bl _restgpr_29 -/* 800DE874 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800DE878 7C 08 03 A6 */ mtlr r0 -/* 800DE87C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DE880 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSwimUpDownOffset__9daAlink_cFv.s b/asm/d/a/d_a_alink/setSwimUpDownOffset__9daAlink_cFv.s deleted file mode 100644 index 631e9e2610c..00000000000 --- a/asm/d/a/d_a_alink/setSwimUpDownOffset__9daAlink_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_80104034: -/* 80104034 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80104038 7C 08 02 A6 */ mflr r0 -/* 8010403C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80104040 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80104044 7C 7F 1B 78 */ mr r31, r3 -/* 80104048 C0 22 94 A8 */ lfs f1, lit_16570(r2) -/* 8010404C 48 16 39 09 */ bl cM_rndF__Ff -/* 80104050 C0 02 95 DC */ lfs f0, lit_27477(r2) -/* 80104054 EC 20 08 2A */ fadds f1, f0, f1 -/* 80104058 C0 02 95 D8 */ lfs f0, lit_27476(r2) -/* 8010405C EC 00 00 72 */ fmuls f0, f0, f1 -/* 80104060 FC 00 00 1E */ fctiwz f0, f0 -/* 80104064 D8 01 00 08 */ stfd f0, 8(r1) -/* 80104068 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8010406C A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 80104070 7C 00 1A 14 */ add r0, r0, r3 -/* 80104074 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 80104078 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8010407C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80104080 41 82 00 3C */ beq lbl_801040BC -/* 80104084 7F E3 FB 78 */ mr r3, r31 -/* 80104088 38 80 00 01 */ li r4, 1 -/* 8010408C 38 A0 00 01 */ li r5, 1 -/* 80104090 4B FB 74 29 */ bl checkHeavyStateOn__9daAlink_cFii -/* 80104094 2C 03 00 00 */ cmpwi r3, 0 -/* 80104098 41 82 00 14 */ beq lbl_801040AC -/* 8010409C 3C 60 80 39 */ lis r3, m__20daAlinkHIO_wlSwim_c0@ha /* 0x8038F8B4@ha */ -/* 801040A0 38 63 F8 B4 */ addi r3, r3, m__20daAlinkHIO_wlSwim_c0@l /* 0x8038F8B4@l */ -/* 801040A4 C0 23 00 98 */ lfs f1, 0x98(r3) -/* 801040A8 48 00 00 20 */ b lbl_801040C8 -lbl_801040AC: -/* 801040AC 3C 60 80 39 */ lis r3, m__20daAlinkHIO_wlSwim_c0@ha /* 0x8038F8B4@ha */ -/* 801040B0 38 63 F8 B4 */ addi r3, r3, m__20daAlinkHIO_wlSwim_c0@l /* 0x8038F8B4@l */ -/* 801040B4 C0 23 00 6C */ lfs f1, 0x6c(r3) -/* 801040B8 48 00 00 10 */ b lbl_801040C8 -lbl_801040BC: -/* 801040BC 3C 60 80 39 */ lis r3, m__18daAlinkHIO_swim_c0@ha /* 0x8038ED2C@ha */ -/* 801040C0 38 63 ED 2C */ addi r3, r3, m__18daAlinkHIO_swim_c0@l /* 0x8038ED2C@l */ -/* 801040C4 C0 23 00 98 */ lfs f1, 0x98(r3) -lbl_801040C8: -/* 801040C8 A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 801040CC 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 801040D0 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 801040D4 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 801040D8 7C 03 04 2E */ lfsx f0, r3, r0 -/* 801040DC EC 01 00 32 */ fmuls f0, f1, f0 -/* 801040E0 D0 1F 2B 98 */ stfs f0, 0x2b98(r31) -/* 801040E4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801040E8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801040EC 7C 08 03 A6 */ mtlr r0 -/* 801040F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801040F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSwordAtCollision__9daAlink_cFi.s b/asm/d/a/d_a_alink/setSwordAtCollision__9daAlink_cFi.s deleted file mode 100644 index 34127ec9783..00000000000 --- a/asm/d/a/d_a_alink/setSwordAtCollision__9daAlink_cFi.s +++ /dev/null @@ -1,205 +0,0 @@ -lbl_800AA2E0: -/* 800AA2E0 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 800AA2E4 7C 08 02 A6 */ mflr r0 -/* 800AA2E8 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 800AA2EC 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 800AA2F0 48 2B 7E E1 */ bl _savegpr_26 -/* 800AA2F4 7C 7F 1B 78 */ mr r31, r3 -/* 800AA2F8 7C 9A 23 78 */ mr r26, r4 -/* 800AA2FC 48 02 6B D1 */ bl checkCutDashAnime__9daAlink_cCFv -/* 800AA300 2C 03 00 00 */ cmpwi r3, 0 -/* 800AA304 41 82 00 4C */ beq lbl_800AA350 -/* 800AA308 7F E3 FB 78 */ mr r3, r31 -/* 800AA30C 38 9F 12 2C */ addi r4, r31, 0x122c -/* 800AA310 48 02 6B ED */ bl checkCutDashEnemyHit__9daAlink_cFR12dCcD_GObjInf -/* 800AA314 2C 03 00 00 */ cmpwi r3, 0 -/* 800AA318 40 82 00 2C */ bne lbl_800AA344 -/* 800AA31C 7F E3 FB 78 */ mr r3, r31 -/* 800AA320 38 9F 13 70 */ addi r4, r31, 0x1370 -/* 800AA324 48 02 6B D9 */ bl checkCutDashEnemyHit__9daAlink_cFR12dCcD_GObjInf -/* 800AA328 2C 03 00 00 */ cmpwi r3, 0 -/* 800AA32C 40 82 00 18 */ bne lbl_800AA344 -/* 800AA330 7F E3 FB 78 */ mr r3, r31 -/* 800AA334 38 9F 14 B4 */ addi r4, r31, 0x14b4 -/* 800AA338 48 02 6B C5 */ bl checkCutDashEnemyHit__9daAlink_cFR12dCcD_GObjInf -/* 800AA33C 2C 03 00 00 */ cmpwi r3, 0 -/* 800AA340 41 82 00 10 */ beq lbl_800AA350 -lbl_800AA344: -/* 800AA344 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800AA348 64 00 04 00 */ oris r0, r0, 0x400 -/* 800AA34C 90 1F 05 74 */ stw r0, 0x574(r31) -lbl_800AA350: -/* 800AA350 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) -/* 800AA354 28 00 00 23 */ cmplwi r0, 0x23 -/* 800AA358 40 82 00 C8 */ bne lbl_800AA420 -/* 800AA35C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 800AA360 38 83 9A 20 */ addi r4, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 800AA364 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800AA368 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 800AA36C 7C 64 02 14 */ add r3, r4, r0 -/* 800AA370 C0 03 00 04 */ lfs f0, 4(r3) -/* 800AA374 C0 3F 04 D8 */ lfs f1, 0x4d8(r31) -/* 800AA378 3C 60 80 39 */ lis r3, m__21daAlinkHIO_cutFnJU_c0@ha /* 0x8038DAEC@ha */ -/* 800AA37C 38 63 DA EC */ addi r3, r3, m__21daAlinkHIO_cutFnJU_c0@l /* 0x8038DAEC@l */ -/* 800AA380 C0 83 00 50 */ lfs f4, 0x50(r3) -/* 800AA384 EC 04 00 32 */ fmuls f0, f4, f0 -/* 800AA388 EC 61 00 2A */ fadds f3, f1, f0 -/* 800AA38C C0 5F 34 78 */ lfs f2, 0x3478(r31) -/* 800AA390 7C 04 04 2E */ lfsx f0, r4, r0 -/* 800AA394 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 800AA398 EC 04 00 32 */ fmuls f0, f4, f0 -/* 800AA39C EC 01 00 2A */ fadds f0, f1, f0 -/* 800AA3A0 D0 01 00 74 */ stfs f0, 0x74(r1) -/* 800AA3A4 D0 41 00 78 */ stfs f2, 0x78(r1) -/* 800AA3A8 D0 61 00 7C */ stfs f3, 0x7c(r1) -/* 800AA3AC C0 1F 05 C0 */ lfs f0, 0x5c0(r31) -/* 800AA3B0 EC 20 10 28 */ fsubs f1, f0, f2 -/* 800AA3B4 C0 02 93 30 */ lfs f0, lit_7625(r2) -/* 800AA3B8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800AA3BC 40 80 00 08 */ bge lbl_800AA3C4 -/* 800AA3C0 FC 20 00 90 */ fmr f1, f0 -lbl_800AA3C4: -/* 800AA3C4 38 7F 12 14 */ addi r3, r31, 0x1214 -/* 800AA3C8 48 1C 4E 31 */ bl SetH__8cM3dGCylFf -/* 800AA3CC 2C 1A 00 00 */ cmpwi r26, 0 -/* 800AA3D0 41 82 00 14 */ beq lbl_800AA3E4 -/* 800AA3D4 38 7F 10 F0 */ addi r3, r31, 0x10f0 -/* 800AA3D8 38 81 00 74 */ addi r4, r1, 0x74 -/* 800AA3DC 4B FD A5 2D */ bl StartCAt__8dCcD_CylFR4cXyz -/* 800AA3E0 48 00 00 10 */ b lbl_800AA3F0 -lbl_800AA3E4: -/* 800AA3E4 38 7F 10 F0 */ addi r3, r31, 0x10f0 -/* 800AA3E8 38 81 00 74 */ addi r4, r1, 0x74 -/* 800AA3EC 4B FD A5 69 */ bl MoveCAt__8dCcD_CylFR4cXyz -lbl_800AA3F0: -/* 800AA3F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800AA3F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800AA3F8 38 63 23 3C */ addi r3, r3, 0x233c -/* 800AA3FC 38 9F 10 F0 */ addi r4, r31, 0x10f0 -/* 800AA400 48 1B A7 A9 */ bl Set__4cCcSFP8cCcD_Obj -/* 800AA404 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800AA408 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800AA40C 38 63 4B 88 */ addi r3, r3, 0x4b88 -/* 800AA410 38 9F 10 F0 */ addi r4, r31, 0x10f0 -/* 800AA414 38 A0 00 01 */ li r5, 1 -/* 800AA418 4B FD B9 81 */ bl Set__12dCcMassS_MngFP8cCcD_ObjUc -/* 800AA41C 48 00 01 B4 */ b lbl_800AA5D0 -lbl_800AA420: -/* 800AA420 38 61 00 50 */ addi r3, r1, 0x50 -/* 800AA424 38 9F 05 BC */ addi r4, r31, 0x5bc -/* 800AA428 38 BF 34 98 */ addi r5, r31, 0x3498 -/* 800AA42C 48 1B C7 09 */ bl __mi__4cXyzCFRC3Vec -/* 800AA430 38 61 00 44 */ addi r3, r1, 0x44 -/* 800AA434 38 81 00 50 */ addi r4, r1, 0x50 -/* 800AA438 C0 3F 33 D0 */ lfs f1, 0x33d0(r31) -/* 800AA43C 48 1B C7 49 */ bl __ml__4cXyzCFf -/* 800AA440 38 61 00 38 */ addi r3, r1, 0x38 -/* 800AA444 38 81 00 44 */ addi r4, r1, 0x44 -/* 800AA448 38 BF 34 98 */ addi r5, r31, 0x3498 -/* 800AA44C 48 1B C6 99 */ bl __pl__4cXyzCFRC3Vec -/* 800AA450 C0 01 00 38 */ lfs f0, 0x38(r1) -/* 800AA454 D0 01 00 74 */ stfs f0, 0x74(r1) -/* 800AA458 C0 01 00 3C */ lfs f0, 0x3c(r1) -/* 800AA45C D0 01 00 78 */ stfs f0, 0x78(r1) -/* 800AA460 C0 01 00 40 */ lfs f0, 0x40(r1) -/* 800AA464 D0 01 00 7C */ stfs f0, 0x7c(r1) -/* 800AA468 38 61 00 2C */ addi r3, r1, 0x2c -/* 800AA46C 38 9F 34 B0 */ addi r4, r31, 0x34b0 -/* 800AA470 38 BF 34 BC */ addi r5, r31, 0x34bc -/* 800AA474 48 1B C6 C1 */ bl __mi__4cXyzCFRC3Vec -/* 800AA478 38 61 00 20 */ addi r3, r1, 0x20 -/* 800AA47C 38 81 00 2C */ addi r4, r1, 0x2c -/* 800AA480 C0 3F 33 D0 */ lfs f1, 0x33d0(r31) -/* 800AA484 48 1B C7 01 */ bl __ml__4cXyzCFf -/* 800AA488 38 61 00 14 */ addi r3, r1, 0x14 -/* 800AA48C 38 81 00 20 */ addi r4, r1, 0x20 -/* 800AA490 38 BF 34 BC */ addi r5, r31, 0x34bc -/* 800AA494 48 1B C6 51 */ bl __pl__4cXyzCFRC3Vec -/* 800AA498 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 800AA49C D0 01 00 68 */ stfs f0, 0x68(r1) -/* 800AA4A0 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 800AA4A4 D0 01 00 6C */ stfs f0, 0x6c(r1) -/* 800AA4A8 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 800AA4AC D0 01 00 70 */ stfs f0, 0x70(r1) -/* 800AA4B0 38 7F 13 50 */ addi r3, r31, 0x1350 -/* 800AA4B4 38 9F 34 98 */ addi r4, r31, 0x3498 -/* 800AA4B8 38 A1 00 74 */ addi r5, r1, 0x74 -/* 800AA4BC 48 1C 4E 2D */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz -/* 800AA4C0 38 7F 14 94 */ addi r3, r31, 0x1494 -/* 800AA4C4 38 81 00 68 */ addi r4, r1, 0x68 -/* 800AA4C8 38 A1 00 74 */ addi r5, r1, 0x74 -/* 800AA4CC 48 1C 4E 1D */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz -/* 800AA4D0 38 7F 15 D8 */ addi r3, r31, 0x15d8 -/* 800AA4D4 38 9F 34 98 */ addi r4, r31, 0x3498 -/* 800AA4D8 38 A1 00 68 */ addi r5, r1, 0x68 -/* 800AA4DC 48 1C 4E 0D */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz -/* 800AA4E0 80 1F 12 2C */ lwz r0, 0x122c(r31) -/* 800AA4E4 60 00 00 01 */ ori r0, r0, 1 -/* 800AA4E8 90 1F 12 2C */ stw r0, 0x122c(r31) -/* 800AA4EC 2C 1A 00 00 */ cmpwi r26, 0 -/* 800AA4F0 41 82 00 24 */ beq lbl_800AA514 -/* 800AA4F4 3C 60 80 43 */ lis r3, Zero__4cXyz@ha /* 0x80430CF4@ha */ -/* 800AA4F8 C4 03 0C F4 */ lfsu f0, Zero__4cXyz@l(r3) /* 0x80430CF4@l */ -/* 800AA4FC D0 01 00 5C */ stfs f0, 0x5c(r1) -/* 800AA500 C0 03 00 04 */ lfs f0, 4(r3) -/* 800AA504 D0 01 00 60 */ stfs f0, 0x60(r1) -/* 800AA508 C0 03 00 08 */ lfs f0, 8(r3) -/* 800AA50C D0 01 00 64 */ stfs f0, 0x64(r1) -/* 800AA510 48 00 00 44 */ b lbl_800AA554 -lbl_800AA514: -/* 800AA514 38 61 00 08 */ addi r3, r1, 8 -/* 800AA518 38 9F 05 BC */ addi r4, r31, 0x5bc -/* 800AA51C 38 BF 34 B0 */ addi r5, r31, 0x34b0 -/* 800AA520 48 1B C6 15 */ bl __mi__4cXyzCFRC3Vec -/* 800AA524 C0 01 00 08 */ lfs f0, 8(r1) -/* 800AA528 D0 01 00 5C */ stfs f0, 0x5c(r1) -/* 800AA52C C0 01 00 0C */ lfs f0, 0xc(r1) -/* 800AA530 D0 01 00 60 */ stfs f0, 0x60(r1) -/* 800AA534 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 800AA538 D0 01 00 64 */ stfs f0, 0x64(r1) -/* 800AA53C 80 1F 13 70 */ lwz r0, 0x1370(r31) -/* 800AA540 60 00 00 01 */ ori r0, r0, 1 -/* 800AA544 90 1F 13 70 */ stw r0, 0x1370(r31) -/* 800AA548 80 1F 14 B4 */ lwz r0, 0x14b4(r31) -/* 800AA54C 60 00 00 01 */ ori r0, r0, 1 -/* 800AA550 90 1F 14 B4 */ stw r0, 0x14b4(r31) -lbl_800AA554: -/* 800AA554 C0 41 00 5C */ lfs f2, 0x5c(r1) -/* 800AA558 D0 5F 12 B0 */ stfs f2, 0x12b0(r31) -/* 800AA55C C0 21 00 60 */ lfs f1, 0x60(r1) -/* 800AA560 D0 3F 12 B4 */ stfs f1, 0x12b4(r31) -/* 800AA564 C0 01 00 64 */ lfs f0, 0x64(r1) -/* 800AA568 D0 1F 12 B8 */ stfs f0, 0x12b8(r31) -/* 800AA56C D0 5F 13 F4 */ stfs f2, 0x13f4(r31) -/* 800AA570 D0 3F 13 F8 */ stfs f1, 0x13f8(r31) -/* 800AA574 D0 1F 13 FC */ stfs f0, 0x13fc(r31) -/* 800AA578 D0 5F 15 38 */ stfs f2, 0x1538(r31) -/* 800AA57C D0 3F 15 3C */ stfs f1, 0x153c(r31) -/* 800AA580 D0 1F 15 40 */ stfs f0, 0x1540(r31) -/* 800AA584 3B 40 00 00 */ li r26, 0 -/* 800AA588 3B C0 00 00 */ li r30, 0 -/* 800AA58C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800AA590 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800AA594 3B A3 23 3C */ addi r29, r3, 0x233c -/* 800AA598 3B 83 4B 88 */ addi r28, r3, 0x4b88 -lbl_800AA59C: -/* 800AA59C 7F A3 EB 78 */ mr r3, r29 -/* 800AA5A0 3B 7E 12 2C */ addi r27, r30, 0x122c -/* 800AA5A4 7F 7F DA 14 */ add r27, r31, r27 -/* 800AA5A8 7F 64 DB 78 */ mr r4, r27 -/* 800AA5AC 48 1B A5 FD */ bl Set__4cCcSFP8cCcD_Obj -/* 800AA5B0 7F 83 E3 78 */ mr r3, r28 -/* 800AA5B4 7F 64 DB 78 */ mr r4, r27 -/* 800AA5B8 38 A0 00 01 */ li r5, 1 -/* 800AA5BC 4B FD B7 DD */ bl Set__12dCcMassS_MngFP8cCcD_ObjUc -/* 800AA5C0 3B 5A 00 01 */ addi r26, r26, 1 -/* 800AA5C4 2C 1A 00 03 */ cmpwi r26, 3 -/* 800AA5C8 3B DE 01 44 */ addi r30, r30, 0x144 -/* 800AA5CC 41 80 FF D0 */ blt lbl_800AA59C -lbl_800AA5D0: -/* 800AA5D0 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 800AA5D4 48 2B 7C 49 */ bl _restgpr_26 -/* 800AA5D8 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 800AA5DC 7C 08 03 A6 */ mtlr r0 -/* 800AA5E0 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 800AA5E4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff.s b/asm/d/a/d_a_alink/setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff.s deleted file mode 100644 index 066716c8570..00000000000 --- a/asm/d/a/d_a_alink/setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff.s +++ /dev/null @@ -1,70 +0,0 @@ -lbl_800D1688: -/* 800D1688 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 800D168C 7C 08 02 A6 */ mflr r0 -/* 800D1690 90 01 00 34 */ stw r0, 0x34(r1) -/* 800D1694 DB E1 00 28 */ stfd f31, 0x28(r1) -/* 800D1698 DB C1 00 20 */ stfd f30, 0x20(r1) -/* 800D169C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D16A0 48 29 0B 31 */ bl _savegpr_26 -/* 800D16A4 7C 7A 1B 78 */ mr r26, r3 -/* 800D16A8 7C 9B 23 78 */ mr r27, r4 -/* 800D16AC 7C BC 2B 78 */ mr r28, r5 -/* 800D16B0 7C DD 33 78 */ mr r29, r6 -/* 800D16B4 7C FE 3B 78 */ mr r30, r7 -/* 800D16B8 FF C0 08 90 */ fmr f30, f1 -/* 800D16BC FF E0 10 90 */ fmr f31, f2 -/* 800D16C0 3B FA 12 2C */ addi r31, r26, 0x122c -/* 800D16C4 4B FF F8 99 */ bl getSwordAtType__9daAlink_cFv -/* 800D16C8 80 1A 12 84 */ lwz r0, 0x1284(r26) -/* 800D16CC 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d -/* 800D16D0 90 1A 12 84 */ stw r0, 0x1284(r26) -/* 800D16D4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D16D8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D16DC 88 04 00 14 */ lbz r0, 0x14(r4) -/* 800D16E0 28 00 00 3F */ cmplwi r0, 0x3f -/* 800D16E4 40 82 00 24 */ bne lbl_800D1708 -/* 800D16E8 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 800D16EC 28 00 00 0E */ cmplwi r0, 0xe -/* 800D16F0 41 82 00 14 */ beq lbl_800D1704 -/* 800D16F4 28 00 00 01 */ cmplwi r0, 1 -/* 800D16F8 41 82 00 0C */ beq lbl_800D1704 -/* 800D16FC 28 00 00 10 */ cmplwi r0, 0x10 -/* 800D1700 40 82 00 08 */ bne lbl_800D1708 -lbl_800D1704: -/* 800D1704 3B A0 00 05 */ li r29, 5 -lbl_800D1708: -/* 800D1708 2C 1B 00 00 */ cmpwi r27, 0 -/* 800D170C 40 82 00 10 */ bne lbl_800D171C -/* 800D1710 38 00 00 00 */ li r0, 0 -/* 800D1714 98 1A 2F D0 */ stb r0, 0x2fd0(r26) -/* 800D1718 48 00 00 0C */ b lbl_800D1724 -lbl_800D171C: -/* 800D171C 38 00 00 01 */ li r0, 1 -/* 800D1720 98 1A 2F D0 */ stb r0, 0x2fd0(r26) -lbl_800D1724: -/* 800D1724 80 1A 05 7C */ lwz r0, 0x57c(r26) -/* 800D1728 54 00 67 FE */ rlwinm r0, r0, 0xc, 0x1f, 0x1f -/* 800D172C 7C 80 00 D0 */ neg r4, r0 -/* 800D1730 38 00 00 04 */ li r0, 4 -/* 800D1734 7C 04 20 38 */ and r4, r0, r4 -/* 800D1738 38 00 00 03 */ li r0, 3 -/* 800D173C 7C 09 03 A6 */ mtctr r0 -lbl_800D1740: -/* 800D1740 9B 7F 00 77 */ stb r27, 0x77(r31) -/* 800D1744 9B 9F 00 76 */ stb r28, 0x76(r31) -/* 800D1748 9B DF 00 14 */ stb r30, 0x14(r31) -/* 800D174C D3 FF 01 40 */ stfs f31, 0x140(r31) -/* 800D1750 9B BF 00 74 */ stb r29, 0x74(r31) -/* 800D1754 98 9F 00 75 */ stb r4, 0x75(r31) -/* 800D1758 90 7F 00 10 */ stw r3, 0x10(r31) -/* 800D175C 3B FF 01 44 */ addi r31, r31, 0x144 -/* 800D1760 42 00 FF E0 */ bdnz lbl_800D1740 -/* 800D1764 D3 DA 33 D0 */ stfs f30, 0x33d0(r26) -/* 800D1768 CB E1 00 28 */ lfd f31, 0x28(r1) -/* 800D176C CB C1 00 20 */ lfd f30, 0x20(r1) -/* 800D1770 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D1774 48 29 0A A9 */ bl _restgpr_26 -/* 800D1778 80 01 00 34 */ lwz r0, 0x34(r1) -/* 800D177C 7C 08 03 A6 */ mtlr r0 -/* 800D1780 38 21 00 30 */ addi r1, r1, 0x30 -/* 800D1784 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf.s b/asm/d/a/d_a_alink/setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf.s deleted file mode 100644 index 10424c202ef..00000000000 --- a/asm/d/a/d_a_alink/setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf.s +++ /dev/null @@ -1,89 +0,0 @@ -lbl_800D17EC: -/* 800D17EC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800D17F0 7C 08 02 A6 */ mflr r0 -/* 800D17F4 90 01 00 24 */ stw r0, 0x24(r1) -/* 800D17F8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 800D17FC 93 C1 00 18 */ stw r30, 0x18(r1) -/* 800D1800 7C 7E 1B 78 */ mr r30, r3 -/* 800D1804 7C 9F 23 78 */ mr r31, r4 -/* 800D1808 7F E3 FB 78 */ mr r3, r31 -/* 800D180C 4B FB 2A B5 */ bl ChkAtHit__12dCcD_GObjInfFv -/* 800D1810 28 03 00 00 */ cmplwi r3, 0 -/* 800D1814 41 82 00 F0 */ beq lbl_800D1904 -/* 800D1818 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800D181C 4B FB 1E 6D */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv -/* 800D1820 4B FF FF 69 */ bl notSwordHitVibActor__9daAlink_cFP10fopAc_ac_c -/* 800D1824 2C 03 00 00 */ cmpwi r3, 0 -/* 800D1828 41 82 00 0C */ beq lbl_800D1834 -/* 800D182C 38 60 00 01 */ li r3, 1 -/* 800D1830 48 00 00 D8 */ b lbl_800D1908 -lbl_800D1834: -/* 800D1834 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 800D1838 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800D183C 41 82 00 0C */ beq lbl_800D1848 -/* 800D1840 38 80 00 03 */ li r4, 3 -/* 800D1844 48 00 00 8C */ b lbl_800D18D0 -lbl_800D1848: -/* 800D1848 80 1F 00 5C */ lwz r0, 0x5c(r31) -/* 800D184C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 800D1850 41 82 00 30 */ beq lbl_800D1880 -/* 800D1854 88 1E 2F D0 */ lbz r0, 0x2fd0(r30) -/* 800D1858 28 00 00 01 */ cmplwi r0, 1 -/* 800D185C 40 82 00 0C */ bne lbl_800D1868 -/* 800D1860 38 80 00 05 */ li r4, 5 -/* 800D1864 48 00 00 6C */ b lbl_800D18D0 -lbl_800D1868: -/* 800D1868 28 00 00 02 */ cmplwi r0, 2 -/* 800D186C 40 82 00 0C */ bne lbl_800D1878 -/* 800D1870 38 80 00 02 */ li r4, 2 -/* 800D1874 48 00 00 5C */ b lbl_800D18D0 -lbl_800D1878: -/* 800D1878 38 80 00 03 */ li r4, 3 -/* 800D187C 48 00 00 54 */ b lbl_800D18D0 -lbl_800D1880: -/* 800D1880 88 1E 2F D0 */ lbz r0, 0x2fd0(r30) -/* 800D1884 28 00 00 02 */ cmplwi r0, 2 -/* 800D1888 41 82 00 28 */ beq lbl_800D18B0 -/* 800D188C 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800D1890 4B FB 1D F9 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv -/* 800D1894 28 03 00 00 */ cmplwi r3, 0 -/* 800D1898 41 82 00 20 */ beq lbl_800D18B8 -/* 800D189C 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800D18A0 4B FB 1D E9 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv -/* 800D18A4 88 03 04 96 */ lbz r0, 0x496(r3) -/* 800D18A8 28 00 00 03 */ cmplwi r0, 3 -/* 800D18AC 40 82 00 0C */ bne lbl_800D18B8 -lbl_800D18B0: -/* 800D18B0 38 80 00 02 */ li r4, 2 -/* 800D18B4 48 00 00 1C */ b lbl_800D18D0 -lbl_800D18B8: -/* 800D18B8 88 1E 2F D0 */ lbz r0, 0x2fd0(r30) -/* 800D18BC 28 00 00 01 */ cmplwi r0, 1 -/* 800D18C0 40 82 00 0C */ bne lbl_800D18CC -/* 800D18C4 38 80 00 04 */ li r4, 4 -/* 800D18C8 48 00 00 08 */ b lbl_800D18D0 -lbl_800D18CC: -/* 800D18CC 38 80 00 02 */ li r4, 2 -lbl_800D18D0: -/* 800D18D0 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800D18D4 D0 21 00 08 */ stfs f1, 8(r1) -/* 800D18D8 C0 02 92 B8 */ lfs f0, lit_6040(r2) -/* 800D18DC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800D18E0 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 800D18E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D18E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D18EC 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 800D18F0 38 A0 00 1F */ li r5, 0x1f -/* 800D18F4 38 C1 00 08 */ addi r6, r1, 8 -/* 800D18F8 4B F9 E1 2D */ bl StartShock__12dVibration_cFii4cXyz -/* 800D18FC 38 60 00 01 */ li r3, 1 -/* 800D1900 48 00 00 08 */ b lbl_800D1908 -lbl_800D1904: -/* 800D1904 38 60 00 00 */ li r3, 0 -lbl_800D1908: -/* 800D1908 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 800D190C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 800D1910 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800D1914 7C 08 03 A6 */ mtlr r0 -/* 800D1918 38 21 00 20 */ addi r1, r1, 0x20 -/* 800D191C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSyncRidePos__9daAlink_cFv.s b/asm/d/a/d_a_alink/setSyncRidePos__9daAlink_cFv.s deleted file mode 100644 index 0cb11aaa2bf..00000000000 --- a/asm/d/a/d_a_alink/setSyncRidePos__9daAlink_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800EDA24: -/* 800EDA24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800EDA28 7C 08 02 A6 */ mflr r0 -/* 800EDA2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800EDA30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800EDA34 7C 7F 1B 78 */ mr r31, r3 -/* 800EDA38 81 83 06 28 */ lwz r12, 0x628(r3) -/* 800EDA3C 81 8C 01 88 */ lwz r12, 0x188(r12) -/* 800EDA40 7D 89 03 A6 */ mtctr r12 -/* 800EDA44 4E 80 04 21 */ bctrl -/* 800EDA48 28 03 00 00 */ cmplwi r3, 0 -/* 800EDA4C 41 82 00 10 */ beq lbl_800EDA5C -/* 800EDA50 7F E3 FB 78 */ mr r3, r31 -/* 800EDA54 4B FF FA 89 */ bl setSyncHorsePos__9daAlink_cFv -/* 800EDA58 48 00 00 0C */ b lbl_800EDA64 -lbl_800EDA5C: -/* 800EDA5C 7F E3 FB 78 */ mr r3, r31 -/* 800EDA60 4B FF FD 2D */ bl setSyncBoarPos__9daAlink_cFv -lbl_800EDA64: -/* 800EDA64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800EDA68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800EDA6C 7C 08 03 A6 */ mtlr r0 -/* 800EDA70 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EDA74 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setThrowDamage__9daAlink_cFsffiii.s b/asm/d/a/d_a_alink/setThrowDamage__9daAlink_cFsffiii.s deleted file mode 100644 index 77a2ff83db2..00000000000 --- a/asm/d/a/d_a_alink/setThrowDamage__9daAlink_cFsffiii.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_800D7160: -/* 800D7160 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D7164 7C 08 02 A6 */ mflr r0 -/* 800D7168 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D716C D0 23 34 08 */ stfs f1, 0x3408(r3) -/* 800D7170 D0 43 34 0C */ stfs f2, 0x340c(r3) -/* 800D7174 90 A3 31 8C */ stw r5, 0x318c(r3) -/* 800D7178 B0 83 2F FE */ sth r4, 0x2ffe(r3) -/* 800D717C 2C 06 00 00 */ cmpwi r6, 0 -/* 800D7180 41 82 00 14 */ beq lbl_800D7194 -/* 800D7184 80 03 05 88 */ lwz r0, 0x588(r3) -/* 800D7188 60 00 00 40 */ ori r0, r0, 0x40 -/* 800D718C 90 03 05 88 */ stw r0, 0x588(r3) -/* 800D7190 48 00 00 10 */ b lbl_800D71A0 -lbl_800D7194: -/* 800D7194 80 03 05 88 */ lwz r0, 0x588(r3) -/* 800D7198 60 00 00 80 */ ori r0, r0, 0x80 -/* 800D719C 90 03 05 88 */ stw r0, 0x588(r3) -lbl_800D71A0: -/* 800D71A0 2C 07 00 01 */ cmpwi r7, 1 -/* 800D71A4 40 82 00 14 */ bne lbl_800D71B8 -/* 800D71A8 80 03 05 88 */ lwz r0, 0x588(r3) -/* 800D71AC 64 00 40 00 */ oris r0, r0, 0x4000 -/* 800D71B0 90 03 05 88 */ stw r0, 0x588(r3) -/* 800D71B4 48 00 00 18 */ b lbl_800D71CC -lbl_800D71B8: -/* 800D71B8 2C 07 00 02 */ cmpwi r7, 2 -/* 800D71BC 40 82 00 10 */ bne lbl_800D71CC -/* 800D71C0 80 03 05 8C */ lwz r0, 0x58c(r3) -/* 800D71C4 60 00 00 80 */ ori r0, r0, 0x80 -/* 800D71C8 90 03 05 8C */ stw r0, 0x58c(r3) -lbl_800D71CC: -/* 800D71CC 38 00 00 00 */ li r0, 0 -/* 800D71D0 88 83 05 6A */ lbz r4, 0x56a(r3) -/* 800D71D4 28 04 00 00 */ cmplwi r4, 0 -/* 800D71D8 41 82 00 10 */ beq lbl_800D71E8 -/* 800D71DC 28 04 00 26 */ cmplwi r4, 0x26 -/* 800D71E0 40 80 00 08 */ bge lbl_800D71E8 -/* 800D71E4 38 00 00 01 */ li r0, 1 -lbl_800D71E8: -/* 800D71E8 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 800D71EC 41 82 00 08 */ beq lbl_800D71F4 -/* 800D71F0 48 01 36 E1 */ bl cancelSumouMode__9daAlink_cFv -lbl_800D71F4: -/* 800D71F4 38 60 00 01 */ li r3, 1 -/* 800D71F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D71FC 7C 08 03 A6 */ mtlr r0 -/* 800D7200 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D7204 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setUpperGuardAnime__9daAlink_cFf.s b/asm/d/a/d_a_alink/setUpperGuardAnime__9daAlink_cFf.s deleted file mode 100644 index 412694d667c..00000000000 --- a/asm/d/a/d_a_alink/setUpperGuardAnime__9daAlink_cFf.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800DD008: -/* 800DD008 80 03 05 78 */ lwz r0, 0x578(r3) -/* 800DD00C 64 00 08 00 */ oris r0, r0, 0x800 -/* 800DD010 90 03 05 78 */ stw r0, 0x578(r3) -/* 800DD014 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setWaterDropColor__9daAlink_cFPC13J3DGXColorS10.s b/asm/d/a/d_a_alink/setWaterDropColor__9daAlink_cFPC13J3DGXColorS10.s deleted file mode 100644 index 5217dcd2e65..00000000000 --- a/asm/d/a/d_a_alink/setWaterDropColor__9daAlink_cFPC13J3DGXColorS10.s +++ /dev/null @@ -1,295 +0,0 @@ -lbl_800CC364: -/* 800CC364 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800CC368 7C 08 02 A6 */ mflr r0 -/* 800CC36C 90 01 00 24 */ stw r0, 0x24(r1) -/* 800CC370 39 61 00 20 */ addi r11, r1, 0x20 -/* 800CC374 48 29 5E 69 */ bl _savegpr_29 -/* 800CC378 7C 7D 1B 78 */ mr r29, r3 -/* 800CC37C 7C 9E 23 78 */ mr r30, r4 -/* 800CC380 38 1D 32 A0 */ addi r0, r29, 0x32a0 -/* 800CC384 7C 00 F0 40 */ cmplw r0, r30 -/* 800CC388 40 82 00 40 */ bne lbl_800CC3C8 -/* 800CC38C 80 1D 05 78 */ lwz r0, 0x578(r29) -/* 800CC390 54 00 03 19 */ rlwinm. r0, r0, 0, 0xc, 0xc -/* 800CC394 40 82 00 20 */ bne lbl_800CC3B4 -/* 800CC398 4B FF 3A 19 */ bl checkZoraWearAbility__9daAlink_cCFv -/* 800CC39C 2C 03 00 00 */ cmpwi r3, 0 -/* 800CC3A0 40 82 00 14 */ bne lbl_800CC3B4 -/* 800CC3A4 7F A3 EB 78 */ mr r3, r29 -/* 800CC3A8 4B FF 3A 55 */ bl checkMagicArmorWearAbility__9daAlink_cCFv -/* 800CC3AC 2C 03 00 00 */ cmpwi r3, 0 -/* 800CC3B0 41 82 00 10 */ beq lbl_800CC3C0 -lbl_800CC3B4: -/* 800CC3B4 3B E2 99 3C */ la r31, notColor0(r2) /* 8045333C-_SDA2_BASE_ */ -/* 800CC3B8 3B C2 99 3C */ la r30, notColor0(r2) /* 8045333C-_SDA2_BASE_ */ -/* 800CC3BC 48 00 00 10 */ b lbl_800CC3CC -lbl_800CC3C0: -/* 800CC3C0 3B FE 00 08 */ addi r31, r30, 8 -/* 800CC3C4 48 00 00 08 */ b lbl_800CC3CC -lbl_800CC3C8: -/* 800CC3C8 7F DF F3 78 */ mr r31, r30 -lbl_800CC3CC: -/* 800CC3CC 80 1D 05 78 */ lwz r0, 0x578(r29) -/* 800CC3D0 54 00 03 19 */ rlwinm. r0, r0, 0, 0xc, 0xc -/* 800CC3D4 40 82 03 F0 */ bne lbl_800CC7C4 -/* 800CC3D8 7F A3 EB 78 */ mr r3, r29 -/* 800CC3DC 4B FF 39 D5 */ bl checkZoraWearAbility__9daAlink_cCFv -/* 800CC3E0 2C 03 00 00 */ cmpwi r3, 0 -/* 800CC3E4 41 82 00 AC */ beq lbl_800CC490 -/* 800CC3E8 80 7D 06 4C */ lwz r3, 0x64c(r29) -/* 800CC3EC 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC3F0 80 63 00 34 */ lwz r3, 0x34(r3) -/* 800CC3F4 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC3F8 38 80 00 01 */ li r4, 1 -/* 800CC3FC 7F C5 F3 78 */ mr r5, r30 -/* 800CC400 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC404 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC408 7D 89 03 A6 */ mtctr r12 -/* 800CC40C 4E 80 04 21 */ bctrl -/* 800CC410 80 7D 06 4C */ lwz r3, 0x64c(r29) -/* 800CC414 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC418 80 63 00 00 */ lwz r3, 0(r3) -/* 800CC41C 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC420 38 80 00 01 */ li r4, 1 -/* 800CC424 7F C5 F3 78 */ mr r5, r30 -/* 800CC428 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC42C 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC430 7D 89 03 A6 */ mtctr r12 -/* 800CC434 4E 80 04 21 */ bctrl -/* 800CC438 80 7D 06 4C */ lwz r3, 0x64c(r29) -/* 800CC43C 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC440 80 63 00 04 */ lwz r3, 4(r3) -/* 800CC444 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC448 38 80 00 01 */ li r4, 1 -/* 800CC44C 7F C5 F3 78 */ mr r5, r30 -/* 800CC450 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC454 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC458 7D 89 03 A6 */ mtctr r12 -/* 800CC45C 4E 80 04 21 */ bctrl -/* 800CC460 80 7D 06 58 */ lwz r3, 0x658(r29) -/* 800CC464 80 63 00 04 */ lwz r3, 4(r3) -/* 800CC468 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC46C 80 63 00 04 */ lwz r3, 4(r3) -/* 800CC470 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC474 38 80 00 01 */ li r4, 1 -/* 800CC478 7F C5 F3 78 */ mr r5, r30 -/* 800CC47C 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC480 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC484 7D 89 03 A6 */ mtctr r12 -/* 800CC488 4E 80 04 21 */ bctrl -/* 800CC48C 48 00 03 38 */ b lbl_800CC7C4 -lbl_800CC490: -/* 800CC490 7F A3 EB 78 */ mr r3, r29 -/* 800CC494 4B FF 39 69 */ bl checkMagicArmorWearAbility__9daAlink_cCFv -/* 800CC498 2C 03 00 00 */ cmpwi r3, 0 -/* 800CC49C 41 82 01 28 */ beq lbl_800CC5C4 -/* 800CC4A0 80 7D 06 4C */ lwz r3, 0x64c(r29) -/* 800CC4A4 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC4A8 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC4AC 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC4B0 38 80 00 01 */ li r4, 1 -/* 800CC4B4 7F C5 F3 78 */ mr r5, r30 -/* 800CC4B8 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC4BC 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC4C0 7D 89 03 A6 */ mtctr r12 -/* 800CC4C4 4E 80 04 21 */ bctrl -/* 800CC4C8 80 7D 06 4C */ lwz r3, 0x64c(r29) -/* 800CC4CC 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC4D0 80 63 00 28 */ lwz r3, 0x28(r3) -/* 800CC4D4 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC4D8 38 80 00 01 */ li r4, 1 -/* 800CC4DC 7F C5 F3 78 */ mr r5, r30 -/* 800CC4E0 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC4E4 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC4E8 7D 89 03 A6 */ mtctr r12 -/* 800CC4EC 4E 80 04 21 */ bctrl -/* 800CC4F0 80 7D 06 4C */ lwz r3, 0x64c(r29) -/* 800CC4F4 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC4F8 80 63 00 24 */ lwz r3, 0x24(r3) -/* 800CC4FC 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC500 38 80 00 01 */ li r4, 1 -/* 800CC504 7F C5 F3 78 */ mr r5, r30 -/* 800CC508 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC50C 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC510 7D 89 03 A6 */ mtctr r12 -/* 800CC514 4E 80 04 21 */ bctrl -/* 800CC518 80 7D 06 4C */ lwz r3, 0x64c(r29) -/* 800CC51C 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC520 80 63 00 20 */ lwz r3, 0x20(r3) -/* 800CC524 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC528 38 80 00 01 */ li r4, 1 -/* 800CC52C 7F C5 F3 78 */ mr r5, r30 -/* 800CC530 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC534 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC538 7D 89 03 A6 */ mtctr r12 -/* 800CC53C 4E 80 04 21 */ bctrl -/* 800CC540 80 7D 06 4C */ lwz r3, 0x64c(r29) -/* 800CC544 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC548 80 63 00 18 */ lwz r3, 0x18(r3) -/* 800CC54C 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC550 38 80 00 01 */ li r4, 1 -/* 800CC554 7F C5 F3 78 */ mr r5, r30 -/* 800CC558 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC55C 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC560 7D 89 03 A6 */ mtctr r12 -/* 800CC564 4E 80 04 21 */ bctrl -/* 800CC568 80 7D 06 58 */ lwz r3, 0x658(r29) -/* 800CC56C 80 63 00 04 */ lwz r3, 4(r3) -/* 800CC570 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC574 80 63 00 08 */ lwz r3, 8(r3) -/* 800CC578 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC57C 38 80 00 01 */ li r4, 1 -/* 800CC580 7F C5 F3 78 */ mr r5, r30 -/* 800CC584 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC588 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC58C 7D 89 03 A6 */ mtctr r12 -/* 800CC590 4E 80 04 21 */ bctrl -/* 800CC594 80 7D 06 58 */ lwz r3, 0x658(r29) -/* 800CC598 80 63 00 04 */ lwz r3, 4(r3) -/* 800CC59C 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC5A0 80 63 00 04 */ lwz r3, 4(r3) -/* 800CC5A4 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC5A8 38 80 00 01 */ li r4, 1 -/* 800CC5AC 7F C5 F3 78 */ mr r5, r30 -/* 800CC5B0 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC5B4 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC5B8 7D 89 03 A6 */ mtctr r12 -/* 800CC5BC 4E 80 04 21 */ bctrl -/* 800CC5C0 48 00 02 04 */ b lbl_800CC7C4 -lbl_800CC5C4: -/* 800CC5C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800CC5C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800CC5CC 88 03 00 13 */ lbz r0, 0x13(r3) -/* 800CC5D0 28 00 00 2E */ cmplwi r0, 0x2e -/* 800CC5D4 40 82 00 84 */ bne lbl_800CC658 -/* 800CC5D8 80 7D 06 4C */ lwz r3, 0x64c(r29) -/* 800CC5DC 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC5E0 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 800CC5E4 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC5E8 38 80 00 01 */ li r4, 1 -/* 800CC5EC 7F C5 F3 78 */ mr r5, r30 -/* 800CC5F0 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC5F4 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC5F8 7D 89 03 A6 */ mtctr r12 -/* 800CC5FC 4E 80 04 21 */ bctrl -/* 800CC600 80 7D 06 58 */ lwz r3, 0x658(r29) -/* 800CC604 80 63 00 04 */ lwz r3, 4(r3) -/* 800CC608 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC60C 80 63 00 00 */ lwz r3, 0(r3) -/* 800CC610 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC614 38 80 00 01 */ li r4, 1 -/* 800CC618 7F C5 F3 78 */ mr r5, r30 -/* 800CC61C 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC620 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC624 7D 89 03 A6 */ mtctr r12 -/* 800CC628 4E 80 04 21 */ bctrl -/* 800CC62C 80 7D 06 4C */ lwz r3, 0x64c(r29) -/* 800CC630 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC634 80 63 00 14 */ lwz r3, 0x14(r3) -/* 800CC638 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC63C 38 80 00 01 */ li r4, 1 -/* 800CC640 7F E5 FB 78 */ mr r5, r31 -/* 800CC644 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC648 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC64C 7D 89 03 A6 */ mtctr r12 -/* 800CC650 4E 80 04 21 */ bctrl -/* 800CC654 48 00 01 70 */ b lbl_800CC7C4 -lbl_800CC658: -/* 800CC658 80 7D 06 4C */ lwz r3, 0x64c(r29) -/* 800CC65C 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC660 80 63 00 44 */ lwz r3, 0x44(r3) -/* 800CC664 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC668 38 80 00 01 */ li r4, 1 -/* 800CC66C 7F C5 F3 78 */ mr r5, r30 -/* 800CC670 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC674 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC678 7D 89 03 A6 */ mtctr r12 -/* 800CC67C 4E 80 04 21 */ bctrl -/* 800CC680 80 7D 06 4C */ lwz r3, 0x64c(r29) -/* 800CC684 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC688 80 63 00 24 */ lwz r3, 0x24(r3) -/* 800CC68C 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC690 38 80 00 01 */ li r4, 1 -/* 800CC694 7F C5 F3 78 */ mr r5, r30 -/* 800CC698 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC69C 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC6A0 7D 89 03 A6 */ mtctr r12 -/* 800CC6A4 4E 80 04 21 */ bctrl -/* 800CC6A8 80 7D 06 4C */ lwz r3, 0x64c(r29) -/* 800CC6AC 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC6B0 80 63 00 00 */ lwz r3, 0(r3) -/* 800CC6B4 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC6B8 38 80 00 01 */ li r4, 1 -/* 800CC6BC 7F C5 F3 78 */ mr r5, r30 -/* 800CC6C0 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC6C4 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC6C8 7D 89 03 A6 */ mtctr r12 -/* 800CC6CC 4E 80 04 21 */ bctrl -/* 800CC6D0 80 7D 06 4C */ lwz r3, 0x64c(r29) -/* 800CC6D4 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC6D8 80 63 00 04 */ lwz r3, 4(r3) -/* 800CC6DC 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC6E0 38 80 00 01 */ li r4, 1 -/* 800CC6E4 7F C5 F3 78 */ mr r5, r30 -/* 800CC6E8 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC6EC 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC6F0 7D 89 03 A6 */ mtctr r12 -/* 800CC6F4 4E 80 04 21 */ bctrl -/* 800CC6F8 80 7D 06 4C */ lwz r3, 0x64c(r29) -/* 800CC6FC 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC700 80 63 00 08 */ lwz r3, 8(r3) -/* 800CC704 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC708 38 80 00 01 */ li r4, 1 -/* 800CC70C 7F C5 F3 78 */ mr r5, r30 -/* 800CC710 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC714 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC718 7D 89 03 A6 */ mtctr r12 -/* 800CC71C 4E 80 04 21 */ bctrl -/* 800CC720 80 7D 06 58 */ lwz r3, 0x658(r29) -/* 800CC724 80 63 00 04 */ lwz r3, 4(r3) -/* 800CC728 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC72C 80 63 00 00 */ lwz r3, 0(r3) -/* 800CC730 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC734 38 80 00 01 */ li r4, 1 -/* 800CC738 7F C5 F3 78 */ mr r5, r30 -/* 800CC73C 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC740 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC744 7D 89 03 A6 */ mtctr r12 -/* 800CC748 4E 80 04 21 */ bctrl -/* 800CC74C 80 7D 06 4C */ lwz r3, 0x64c(r29) -/* 800CC750 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC754 80 63 00 40 */ lwz r3, 0x40(r3) -/* 800CC758 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC75C 38 80 00 01 */ li r4, 1 -/* 800CC760 7F E5 FB 78 */ mr r5, r31 -/* 800CC764 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC768 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC76C 7D 89 03 A6 */ mtctr r12 -/* 800CC770 4E 80 04 21 */ bctrl -/* 800CC774 80 7D 06 4C */ lwz r3, 0x64c(r29) -/* 800CC778 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC77C 80 63 00 3C */ lwz r3, 0x3c(r3) -/* 800CC780 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC784 38 80 00 01 */ li r4, 1 -/* 800CC788 7F E5 FB 78 */ mr r5, r31 -/* 800CC78C 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC790 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC794 7D 89 03 A6 */ mtctr r12 -/* 800CC798 4E 80 04 21 */ bctrl -/* 800CC79C 80 7D 06 4C */ lwz r3, 0x64c(r29) -/* 800CC7A0 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800CC7A4 80 63 00 38 */ lwz r3, 0x38(r3) -/* 800CC7A8 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 800CC7AC 38 80 00 01 */ li r4, 1 -/* 800CC7B0 7F E5 FB 78 */ mr r5, r31 -/* 800CC7B4 81 83 00 00 */ lwz r12, 0(r3) -/* 800CC7B8 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 800CC7BC 7D 89 03 A6 */ mtctr r12 -/* 800CC7C0 4E 80 04 21 */ bctrl -lbl_800CC7C4: -/* 800CC7C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800CC7C8 48 29 5A 61 */ bl _restgpr_29 -/* 800CC7CC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800CC7D0 7C 08 03 A6 */ mtlr r0 -/* 800CC7D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800CC7D8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf.s b/asm/d/a/d_a_alink/setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf.s deleted file mode 100644 index 9e0259ca9fc..00000000000 --- a/asm/d/a/d_a_alink/setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80101CF4: -/* 80101CF4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80101CF8 7C 08 02 A6 */ mflr r0 -/* 80101CFC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80101D00 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 80101D04 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 80101D08 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80101D0C 7C 9F 23 78 */ mr r31, r4 -/* 80101D10 FF E0 08 90 */ fmr f31, f1 -/* 80101D14 80 03 05 70 */ lwz r0, 0x570(r3) -/* 80101D18 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 80101D1C 41 82 00 34 */ beq lbl_80101D50 -/* 80101D20 4B FB E0 91 */ bl checkZoraWearAbility__9daAlink_cCFv -/* 80101D24 2C 03 00 00 */ cmpwi r3, 0 -/* 80101D28 41 82 00 18 */ beq lbl_80101D40 -/* 80101D2C 3C 60 80 39 */ lis r3, m__24daAlinkHIO_magneBoots_c0@ha /* 0x8038E7F4@ha */ -/* 80101D30 38 63 E7 F4 */ addi r3, r3, m__24daAlinkHIO_magneBoots_c0@l /* 0x8038E7F4@l */ -/* 80101D34 C0 03 00 48 */ lfs f0, 0x48(r3) -/* 80101D38 EF FF 00 32 */ fmuls f31, f31, f0 -/* 80101D3C 48 00 00 14 */ b lbl_80101D50 -lbl_80101D40: -/* 80101D40 3C 60 80 39 */ lis r3, m__24daAlinkHIO_magneBoots_c0@ha /* 0x8038E7F4@ha */ -/* 80101D44 38 63 E7 F4 */ addi r3, r3, m__24daAlinkHIO_magneBoots_c0@l /* 0x8038E7F4@l */ -/* 80101D48 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 80101D4C EF FF 00 32 */ fmuls f31, f31, f0 -lbl_80101D50: -/* 80101D50 D3 FF 00 0C */ stfs f31, 0xc(r31) -/* 80101D54 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 80101D58 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 80101D5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80101D60 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80101D64 7C 08 03 A6 */ mtlr r0 -/* 80101D68 38 21 00 20 */ addi r1, r1, 0x20 -/* 80101D6C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setWolfAtCollision__9daAlink_cFv.s b/asm/d/a/d_a_alink/setWolfAtCollision__9daAlink_cFv.s deleted file mode 100644 index 4832702f8bb..00000000000 --- a/asm/d/a/d_a_alink/setWolfAtCollision__9daAlink_cFv.s +++ /dev/null @@ -1,137 +0,0 @@ -lbl_800AA7EC: -/* 800AA7EC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800AA7F0 7C 08 02 A6 */ mflr r0 -/* 800AA7F4 90 01 00 24 */ stw r0, 0x24(r1) -/* 800AA7F8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 800AA7FC 7C 7F 1B 78 */ mr r31, r3 -/* 800AA800 80 03 05 80 */ lwz r0, 0x580(r3) -/* 800AA804 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 800AA808 41 82 01 BC */ beq lbl_800AA9C4 -/* 800AA80C 38 9F 10 F0 */ addi r4, r31, 0x10f0 -/* 800AA810 48 02 6F DD */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf -/* 800AA814 2C 03 00 00 */ cmpwi r3, 0 -/* 800AA818 40 82 00 38 */ bne lbl_800AA850 -/* 800AA81C 7F E3 FB 78 */ mr r3, r31 -/* 800AA820 38 9F 08 50 */ addi r4, r31, 0x850 -/* 800AA824 48 02 6F C9 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf -/* 800AA828 2C 03 00 00 */ cmpwi r3, 0 -/* 800AA82C 40 82 00 24 */ bne lbl_800AA850 -/* 800AA830 7F E3 FB 78 */ mr r3, r31 -/* 800AA834 38 9F 09 8C */ addi r4, r31, 0x98c -/* 800AA838 48 02 6F B5 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf -/* 800AA83C 2C 03 00 00 */ cmpwi r3, 0 -/* 800AA840 40 82 00 10 */ bne lbl_800AA850 -/* 800AA844 7F E3 FB 78 */ mr r3, r31 -/* 800AA848 38 9F 0A C8 */ addi r4, r31, 0xac8 -/* 800AA84C 48 02 6F A1 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf -lbl_800AA850: -/* 800AA850 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) -/* 800AA854 28 00 01 21 */ cmplwi r0, 0x121 -/* 800AA858 40 82 00 40 */ bne lbl_800AA898 -/* 800AA85C 38 7F 12 14 */ addi r3, r31, 0x1214 -/* 800AA860 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 800AA864 48 1C 49 79 */ bl SetC__8cM3dGCylFRC4cXyz -/* 800AA868 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800AA86C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800AA870 38 63 23 3C */ addi r3, r3, 0x233c -/* 800AA874 38 9F 10 F0 */ addi r4, r31, 0x10f0 -/* 800AA878 48 1B A3 31 */ bl Set__4cCcSFP8cCcD_Obj -/* 800AA87C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800AA880 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800AA884 38 63 4B 88 */ addi r3, r3, 0x4b88 -/* 800AA888 38 9F 10 F0 */ addi r4, r31, 0x10f0 -/* 800AA88C 38 A0 00 01 */ li r5, 1 -/* 800AA890 4B FD B5 09 */ bl Set__12dCcMassS_MngFP8cCcD_ObjUc -/* 800AA894 48 00 01 20 */ b lbl_800AA9B4 -lbl_800AA898: -/* 800AA898 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 800AA89C 38 83 9A 20 */ addi r4, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 800AA8A0 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800AA8A4 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 800AA8A8 7C 64 02 14 */ add r3, r4, r0 -/* 800AA8AC C0 03 00 04 */ lfs f0, 4(r3) -/* 800AA8B0 C0 3F 04 D8 */ lfs f1, 0x4d8(r31) -/* 800AA8B4 C0 9F 34 38 */ lfs f4, 0x3438(r31) -/* 800AA8B8 EC 04 00 32 */ fmuls f0, f4, f0 -/* 800AA8BC EC 61 00 2A */ fadds f3, f1, f0 -/* 800AA8C0 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 800AA8C4 7C 04 04 2E */ lfsx f0, r4, r0 -/* 800AA8C8 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 800AA8CC EC 04 00 32 */ fmuls f0, f4, f0 -/* 800AA8D0 EC 01 00 2A */ fadds f0, f1, f0 -/* 800AA8D4 D0 01 00 08 */ stfs f0, 8(r1) -/* 800AA8D8 D0 41 00 0C */ stfs f2, 0xc(r1) -/* 800AA8DC D0 61 00 10 */ stfs f3, 0x10(r1) -/* 800AA8E0 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800AA8E4 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 800AA8E8 40 82 00 94 */ bne lbl_800AA97C -/* 800AA8EC 38 7F 10 F0 */ addi r3, r31, 0x10f0 -/* 800AA8F0 38 81 00 08 */ addi r4, r1, 8 -/* 800AA8F4 4B FD A0 15 */ bl StartCAt__8dCcD_CylFR4cXyz -/* 800AA8F8 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) -/* 800AA8FC 28 00 01 25 */ cmplwi r0, 0x125 -/* 800AA900 41 82 00 0C */ beq lbl_800AA90C -/* 800AA904 28 00 01 1C */ cmplwi r0, 0x11c -/* 800AA908 40 82 00 34 */ bne lbl_800AA93C -lbl_800AA90C: -/* 800AA90C 80 1F 10 54 */ lwz r0, 0x1054(r31) -/* 800AA910 60 00 08 00 */ ori r0, r0, 0x800 -/* 800AA914 90 1F 10 54 */ stw r0, 0x1054(r31) -/* 800AA918 38 60 00 00 */ li r3, 0 -/* 800AA91C 38 00 00 03 */ li r0, 3 -/* 800AA920 7C 09 03 A6 */ mtctr r0 -lbl_800AA924: -/* 800AA924 38 83 08 EC */ addi r4, r3, 0x8ec -/* 800AA928 7C 1F 20 2E */ lwzx r0, r31, r4 -/* 800AA92C 60 00 08 00 */ ori r0, r0, 0x800 -/* 800AA930 7C 1F 21 2E */ stwx r0, r31, r4 -/* 800AA934 38 63 01 3C */ addi r3, r3, 0x13c -/* 800AA938 42 00 FF EC */ bdnz lbl_800AA924 -lbl_800AA93C: -/* 800AA93C 88 1F 05 68 */ lbz r0, 0x568(r31) -/* 800AA940 28 00 00 32 */ cmplwi r0, 0x32 -/* 800AA944 41 82 00 10 */ beq lbl_800AA954 -/* 800AA948 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) -/* 800AA94C 28 00 01 25 */ cmplwi r0, 0x125 -/* 800AA950 40 82 00 38 */ bne lbl_800AA988 -lbl_800AA954: -/* 800AA954 38 60 00 00 */ li r3, 0 -/* 800AA958 38 00 00 03 */ li r0, 3 -/* 800AA95C 7C 09 03 A6 */ mtctr r0 -lbl_800AA960: -/* 800AA960 38 83 08 50 */ addi r4, r3, 0x850 -/* 800AA964 7C 1F 20 2E */ lwzx r0, r31, r4 -/* 800AA968 60 00 00 01 */ ori r0, r0, 1 -/* 800AA96C 7C 1F 21 2E */ stwx r0, r31, r4 -/* 800AA970 38 63 01 3C */ addi r3, r3, 0x13c -/* 800AA974 42 00 FF EC */ bdnz lbl_800AA960 -/* 800AA978 48 00 00 10 */ b lbl_800AA988 -lbl_800AA97C: -/* 800AA97C 38 7F 10 F0 */ addi r3, r31, 0x10f0 -/* 800AA980 38 81 00 08 */ addi r4, r1, 8 -/* 800AA984 4B FD 9F D1 */ bl MoveCAt__8dCcD_CylFR4cXyz -lbl_800AA988: -/* 800AA988 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800AA98C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800AA990 38 63 23 3C */ addi r3, r3, 0x233c -/* 800AA994 38 9F 10 F0 */ addi r4, r31, 0x10f0 -/* 800AA998 48 1B A2 11 */ bl Set__4cCcSFP8cCcD_Obj -/* 800AA99C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800AA9A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800AA9A4 38 63 4B 88 */ addi r3, r3, 0x4b88 -/* 800AA9A8 38 9F 10 F0 */ addi r4, r31, 0x10f0 -/* 800AA9AC 38 A0 00 01 */ li r5, 1 -/* 800AA9B0 4B FD B3 E9 */ bl Set__12dCcMassS_MngFP8cCcD_ObjUc -lbl_800AA9B4: -/* 800AA9B4 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800AA9B8 60 00 00 40 */ ori r0, r0, 0x40 -/* 800AA9BC 90 1F 05 70 */ stw r0, 0x570(r31) -/* 800AA9C0 48 00 00 08 */ b lbl_800AA9C8 -lbl_800AA9C4: -/* 800AA9C4 4B FF FD 51 */ bl resetWolfAtCollision__9daAlink_cFv -lbl_800AA9C8: -/* 800AA9C8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 800AA9CC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800AA9D0 7C 08 03 A6 */ mtlr r0 -/* 800AA9D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800AA9D8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setWolfEnemyThrowUpperAnime__9daAlink_cFQ29daAlink_c12daAlink_WANMf.s b/asm/d/a/d_a_alink/setWolfEnemyThrowUpperAnime__9daAlink_cFQ29daAlink_c12daAlink_WANMf.s deleted file mode 100644 index 844571dc999..00000000000 --- a/asm/d/a/d_a_alink/setWolfEnemyThrowUpperAnime__9daAlink_cFQ29daAlink_c12daAlink_WANMf.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_801395B4: -/* 801395B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801395B8 7C 08 02 A6 */ mflr r0 -/* 801395BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801395C0 FC 40 08 90 */ fmr f2, f1 -/* 801395C4 38 04 FF 8A */ addi r0, r4, -118 -/* 801395C8 30 00 FF FF */ addic r0, r0, -1 -/* 801395CC 7C 80 01 10 */ subfe r4, r0, r0 -/* 801395D0 38 84 02 BE */ addi r4, r4, 0x2be -/* 801395D4 38 A0 00 02 */ li r5, 2 -/* 801395D8 3C C0 80 39 */ lis r6, m__22daAlinkHIO_wlAtBite_c0@ha /* 0x8038F748@ha */ -/* 801395DC 38 C6 F7 48 */ addi r6, r6, m__22daAlinkHIO_wlAtBite_c0@l /* 0x8038F748@l */ -/* 801395E0 C0 26 00 2C */ lfs f1, 0x2c(r6) -/* 801395E4 38 C0 FF FF */ li r6, -1 -/* 801395E8 C0 62 92 BC */ lfs f3, lit_6041(r2) -/* 801395EC 4B F7 3D ED */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf -/* 801395F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801395F4 7C 08 03 A6 */ mtlr r0 -/* 801395F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801395FC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setWolfHangGroundY__9daAlink_cFv.s b/asm/d/a/d_a_alink/setWolfHangGroundY__9daAlink_cFv.s deleted file mode 100644 index 061d43f3b6a..00000000000 --- a/asm/d/a/d_a_alink/setWolfHangGroundY__9daAlink_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80135458: -/* 80135458 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8013545C 7C 08 02 A6 */ mflr r0 -/* 80135460 90 01 00 24 */ stw r0, 0x24(r1) -/* 80135464 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80135468 7C 7F 1B 78 */ mr r31, r3 -/* 8013546C 80 63 06 50 */ lwz r3, 0x650(r3) -/* 80135470 80 63 00 84 */ lwz r3, 0x84(r3) -/* 80135474 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80135478 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8013547C D0 01 00 08 */ stfs f0, 8(r1) -/* 80135480 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 80135484 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80135488 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 8013548C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80135490 38 7F 1D 08 */ addi r3, r31, 0x1d08 -/* 80135494 38 81 00 08 */ addi r4, r1, 8 -/* 80135498 48 13 28 91 */ bl SetPos__11cBgS_GndChkFPC4cXyz -/* 8013549C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801354A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801354A4 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 801354A8 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 801354AC 4B F3 EF F5 */ bl GroundCross__4cBgSFP11cBgS_GndChk -/* 801354B0 D0 3F 33 D8 */ stfs f1, 0x33d8(r31) -/* 801354B4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801354B8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801354BC 7C 08 03 A6 */ mtlr r0 -/* 801354C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801354C4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setWolfHeadDamage__9daAlink_cFv.s b/asm/d/a/d_a_alink/setWolfHeadDamage__9daAlink_cFv.s deleted file mode 100644 index d7e0540bcd7..00000000000 --- a/asm/d/a/d_a_alink/setWolfHeadDamage__9daAlink_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80136064: -/* 80136064 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80136068 7C 08 02 A6 */ mflr r0 -/* 8013606C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80136070 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80136074 7C 7F 1B 78 */ mr r31, r3 -/* 80136078 38 80 02 A7 */ li r4, 0x2a7 -/* 8013607C 38 A0 00 02 */ li r5, 2 -/* 80136080 3C C0 80 39 */ lis r6, m__22daAlinkHIO_wlDamage_c0@ha /* 0x8038F3C4@ha */ -/* 80136084 38 C6 F3 C4 */ addi r6, r6, m__22daAlinkHIO_wlDamage_c0@l /* 0x8038F3C4@l */ -/* 80136088 4B F7 76 69 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c -/* 8013608C 7F E3 FB 78 */ mr r3, r31 -/* 80136090 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020014@ha */ -/* 80136094 38 84 00 14 */ addi r4, r4, 0x0014 /* 0x00020014@l */ -/* 80136098 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 8013609C 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 801360A0 7D 89 03 A6 */ mtctr r12 -/* 801360A4 4E 80 04 21 */ bctrl -/* 801360A8 7F E3 FB 78 */ mr r3, r31 -/* 801360AC 4B FA EB 29 */ bl freeGrabItem__9daAlink_cFv -/* 801360B0 7F E3 FB 78 */ mr r3, r31 -/* 801360B4 38 80 00 90 */ li r4, 0x90 -/* 801360B8 4B F7 99 F1 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -/* 801360BC 7F E3 FB 78 */ mr r3, r31 -/* 801360C0 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010034@ha */ -/* 801360C4 38 84 00 34 */ addi r4, r4, 0x0034 /* 0x00010034@l */ -/* 801360C8 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 801360CC 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 801360D0 7D 89 03 A6 */ mtctr r12 -/* 801360D4 4E 80 04 21 */ bctrl -/* 801360D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801360DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801360E0 7C 08 03 A6 */ mtlr r0 -/* 801360E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801360E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setWolfHowlNotHappen__9daAlink_cFi.s b/asm/d/a/d_a_alink/setWolfHowlNotHappen__9daAlink_cFi.s deleted file mode 100644 index e4de5c0ccf4..00000000000 --- a/asm/d/a/d_a_alink/setWolfHowlNotHappen__9daAlink_cFi.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80130654: -/* 80130654 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80130658 7C 08 02 A6 */ mflr r0 -/* 8013065C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80130660 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80130664 93 C1 00 08 */ stw r30, 8(r1) -/* 80130668 7C 7E 1B 78 */ mr r30, r3 -/* 8013066C 7C 9F 23 78 */ mr r31, r4 -/* 80130670 38 00 FF FF */ li r0, -1 -/* 80130674 90 03 28 F0 */ stw r0, 0x28f0(r3) -/* 80130678 80 03 31 98 */ lwz r0, 0x3198(r3) -/* 8013067C 2C 00 00 EE */ cmpwi r0, 0xee -/* 80130680 40 82 00 10 */ bne lbl_80130690 -/* 80130684 38 00 05 32 */ li r0, 0x532 -/* 80130688 90 1E 32 CC */ stw r0, 0x32cc(r30) -/* 8013068C 48 00 00 0C */ b lbl_80130698 -lbl_80130690: -/* 80130690 38 00 05 35 */ li r0, 0x535 -/* 80130694 90 1E 32 CC */ stw r0, 0x32cc(r30) -lbl_80130698: -/* 80130698 38 00 00 00 */ li r0, 0 -/* 8013069C B0 1E 30 0C */ sth r0, 0x300c(r30) -/* 801306A0 7F C3 F3 78 */ mr r3, r30 -/* 801306A4 38 80 00 5F */ li r4, 0x5f -/* 801306A8 4B FF 81 65 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM -/* 801306AC 2C 03 00 00 */ cmpwi r3, 0 -/* 801306B0 40 82 00 38 */ bne lbl_801306E8 -/* 801306B4 2C 1F 00 00 */ cmpwi r31, 0 -/* 801306B8 41 82 00 24 */ beq lbl_801306DC -/* 801306BC 7F C3 F3 78 */ mr r3, r30 -/* 801306C0 38 80 00 0E */ li r4, 0xe -/* 801306C4 3C A0 80 39 */ lis r5, m__19daAlinkHIO_wlLie_c0@ha /* 0x8038F138@ha */ -/* 801306C8 38 A5 F1 38 */ addi r5, r5, m__19daAlinkHIO_wlLie_c0@l /* 0x8038F138@l */ -/* 801306CC C0 25 00 44 */ lfs f1, 0x44(r5) -/* 801306D0 C0 45 00 48 */ lfs f2, 0x48(r5) -/* 801306D4 4B FF 90 05 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff -/* 801306D8 48 00 00 10 */ b lbl_801306E8 -lbl_801306DC: -/* 801306DC 7F C3 F3 78 */ mr r3, r30 -/* 801306E0 38 80 00 80 */ li r4, 0x80 -/* 801306E4 4B FF 8F 95 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM -lbl_801306E8: -/* 801306E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801306EC 83 C1 00 08 */ lwz r30, 8(r1) -/* 801306F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801306F4 7C 08 03 A6 */ mtlr r0 -/* 801306F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801306FC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setWolfLieMoveVoice__9daAlink_cFi.s b/asm/d/a/d_a_alink/setWolfLieMoveVoice__9daAlink_cFi.s deleted file mode 100644 index d10ded56cc8..00000000000 --- a/asm/d/a/d_a_alink/setWolfLieMoveVoice__9daAlink_cFi.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80137330: -/* 80137330 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80137334 7C 08 02 A6 */ mflr r0 -/* 80137338 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013733C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80137340 93 C1 00 08 */ stw r30, 8(r1) -/* 80137344 7C 7E 1B 78 */ mr r30, r3 -/* 80137348 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 8013734C C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 80137350 C0 03 1F DC */ lfs f0, 0x1fdc(r3) -/* 80137354 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80137358 40 82 00 18 */ bne lbl_80137370 -/* 8013735C A8 7E 30 12 */ lha r3, 0x3012(r30) -/* 80137360 2C 03 00 00 */ cmpwi r3, 0 -/* 80137364 41 82 00 0C */ beq lbl_80137370 -/* 80137368 38 03 FF FF */ addi r0, r3, -1 -/* 8013736C B0 1E 30 12 */ sth r0, 0x3012(r30) -lbl_80137370: -/* 80137370 2C 04 00 00 */ cmpwi r4, 0 -/* 80137374 41 82 00 2C */ beq lbl_801373A0 -/* 80137378 7F E3 FB 78 */ mr r3, r31 -/* 8013737C C0 22 94 B4 */ lfs f1, lit_17382(r2) -/* 80137380 48 1F 10 AD */ bl checkPass__12J3DFrameCtrlFf -/* 80137384 2C 03 00 00 */ cmpwi r3, 0 -/* 80137388 40 82 00 34 */ bne lbl_801373BC -/* 8013738C 7F E3 FB 78 */ mr r3, r31 -/* 80137390 C0 22 93 28 */ lfs f1, lit_7451(r2) -/* 80137394 48 1F 10 99 */ bl checkPass__12J3DFrameCtrlFf -/* 80137398 2C 03 00 00 */ cmpwi r3, 0 -/* 8013739C 40 82 00 20 */ bne lbl_801373BC -lbl_801373A0: -/* 801373A0 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 801373A4 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 801373A8 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 801373AC 40 82 00 34 */ bne lbl_801373E0 -/* 801373B0 A8 1E 30 12 */ lha r0, 0x3012(r30) -/* 801373B4 2C 00 00 00 */ cmpwi r0, 0 -/* 801373B8 40 82 00 28 */ bne lbl_801373E0 -lbl_801373BC: -/* 801373BC 7F C3 F3 78 */ mr r3, r30 -/* 801373C0 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010031@ha */ -/* 801373C4 38 84 00 31 */ addi r4, r4, 0x0031 /* 0x00010031@l */ -/* 801373C8 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 801373CC 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 801373D0 7D 89 03 A6 */ mtctr r12 -/* 801373D4 4E 80 04 21 */ bctrl -/* 801373D8 38 00 00 1E */ li r0, 0x1e -/* 801373DC B0 1E 30 12 */ sth r0, 0x3012(r30) -lbl_801373E0: -/* 801373E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801373E4 83 C1 00 08 */ lwz r30, 8(r1) -/* 801373E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801373EC 7C 08 03 A6 */ mtlr r0 -/* 801373F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801373F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setWoodShieldBurnEffect__9daAlink_cFv.s b/asm/d/a/d_a_alink/setWoodShieldBurnEffect__9daAlink_cFv.s deleted file mode 100644 index 771d275b748..00000000000 --- a/asm/d/a/d_a_alink/setWoodShieldBurnEffect__9daAlink_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80125524: -/* 80125524 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80125528 7C 08 02 A6 */ mflr r0 -/* 8012552C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80125530 39 61 00 20 */ addi r11, r1, 0x20 -/* 80125534 48 23 CC A1 */ bl _savegpr_27 -/* 80125538 7C 7B 1B 78 */ mr r27, r3 -/* 8012553C 88 03 2F CB */ lbz r0, 0x2fcb(r3) -/* 80125540 28 00 00 00 */ cmplwi r0, 0 -/* 80125544 41 82 00 60 */ beq lbl_801255A4 -/* 80125548 3B 80 00 00 */ li r28, 0 -/* 8012554C 3B E0 00 00 */ li r31, 0 -/* 80125550 3B C0 00 00 */ li r30, 0 -/* 80125554 3B A2 97 10 */ la r29, effName_42309(r2) /* 80453110-_SDA2_BASE_ */ -lbl_80125558: -/* 80125558 7F 63 DB 78 */ mr r3, r27 -/* 8012555C 38 9E 32 60 */ addi r4, r30, 0x3260 -/* 80125560 7C 9B 22 14 */ add r4, r27, r4 -/* 80125564 7C BD FA 2E */ lhzx r5, r29, r31 -/* 80125568 38 DB 04 D0 */ addi r6, r27, 0x4d0 -/* 8012556C 38 E0 00 00 */ li r7, 0 -/* 80125570 4B FF B0 11 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz -/* 80125574 7C 65 1B 79 */ or. r5, r3, r3 -/* 80125578 41 82 00 18 */ beq lbl_80125590 -/* 8012557C 80 7B 06 78 */ lwz r3, 0x678(r27) -/* 80125580 38 63 00 24 */ addi r3, r3, 0x24 -/* 80125584 38 85 00 68 */ addi r4, r5, 0x68 -/* 80125588 38 A5 00 A4 */ addi r5, r5, 0xa4 -/* 8012558C 48 15 B2 55 */ bl func_802807E0 -lbl_80125590: -/* 80125590 3B 9C 00 01 */ addi r28, r28, 1 -/* 80125594 2C 1C 00 02 */ cmpwi r28, 2 -/* 80125598 3B FF 00 02 */ addi r31, r31, 2 -/* 8012559C 3B DE 00 04 */ addi r30, r30, 4 -/* 801255A0 41 80 FF B8 */ blt lbl_80125558 -lbl_801255A4: -/* 801255A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801255A8 48 23 CC 79 */ bl _restgpr_27 -/* 801255AC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801255B0 7C 08 03 A6 */ mtlr r0 -/* 801255B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801255B8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setWoodShieldBurnOutEffect__9daAlink_cFv.s b/asm/d/a/d_a_alink/setWoodShieldBurnOutEffect__9daAlink_cFv.s deleted file mode 100644 index 56c1f6b8984..00000000000 --- a/asm/d/a/d_a_alink/setWoodShieldBurnOutEffect__9daAlink_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_80125628: -/* 80125628 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8012562C 7C 08 02 A6 */ mflr r0 -/* 80125630 90 01 00 34 */ stw r0, 0x34(r1) -/* 80125634 39 61 00 30 */ addi r11, r1, 0x30 -/* 80125638 48 23 CB A1 */ bl _savegpr_28 -/* 8012563C 7C 7C 1B 78 */ mr r28, r3 -/* 80125640 3B A0 00 00 */ li r29, 0 -/* 80125644 3B E0 00 00 */ li r31, 0 -/* 80125648 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8012564C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -lbl_80125650: -/* 80125650 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 80125654 38 80 00 00 */ li r4, 0 -/* 80125658 90 81 00 08 */ stw r4, 8(r1) -/* 8012565C 38 00 FF FF */ li r0, -1 -/* 80125660 90 01 00 0C */ stw r0, 0xc(r1) -/* 80125664 90 81 00 10 */ stw r4, 0x10(r1) -/* 80125668 90 81 00 14 */ stw r4, 0x14(r1) -/* 8012566C 90 81 00 18 */ stw r4, 0x18(r1) -/* 80125670 38 80 00 00 */ li r4, 0 -/* 80125674 38 A2 97 14 */ la r5, effName_42340(r2) /* 80453114-_SDA2_BASE_ */ -/* 80125678 7C A5 FA 2E */ lhzx r5, r5, r31 -/* 8012567C 38 DC 04 D0 */ addi r6, r28, 0x4d0 -/* 80125680 38 FC 01 0C */ addi r7, r28, 0x10c -/* 80125684 39 00 00 00 */ li r8, 0 -/* 80125688 39 20 00 00 */ li r9, 0 -/* 8012568C 39 40 00 FF */ li r10, 0xff -/* 80125690 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 80125694 4B F2 73 FD */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80125698 7C 65 1B 79 */ or. r5, r3, r3 -/* 8012569C 41 82 00 18 */ beq lbl_801256B4 -/* 801256A0 80 7C 06 78 */ lwz r3, 0x678(r28) -/* 801256A4 38 63 00 24 */ addi r3, r3, 0x24 -/* 801256A8 38 85 00 68 */ addi r4, r5, 0x68 -/* 801256AC 38 A5 00 A4 */ addi r5, r5, 0xa4 -/* 801256B0 48 15 B1 31 */ bl func_802807E0 -lbl_801256B4: -/* 801256B4 3B BD 00 01 */ addi r29, r29, 1 -/* 801256B8 2C 1D 00 02 */ cmpwi r29, 2 -/* 801256BC 3B FF 00 02 */ addi r31, r31, 2 -/* 801256C0 41 80 FF 90 */ blt lbl_80125650 -/* 801256C4 38 00 00 01 */ li r0, 1 -/* 801256C8 98 1C 2F CB */ stb r0, 0x2fcb(r28) -/* 801256CC 7F 83 E3 78 */ mr r3, r28 -/* 801256D0 4B FF FE ED */ bl clearWoodShieldBurnEffect__9daAlink_cFv -/* 801256D4 39 61 00 30 */ addi r11, r1, 0x30 -/* 801256D8 48 23 CB 4D */ bl _restgpr_28 -/* 801256DC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801256E0 7C 08 03 A6 */ mtlr r0 -/* 801256E4 38 21 00 30 */ addi r1, r1, 0x30 -/* 801256E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/startPeepChange__9daAlink_cFv.s b/asm/d/a/d_a_alink/startPeepChange__9daAlink_cFv.s deleted file mode 100644 index fab919357c7..00000000000 --- a/asm/d/a/d_a_alink/startPeepChange__9daAlink_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_800BDD70: -/* 800BDD70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BDD74 7C 08 02 A6 */ mflr r0 -/* 800BDD78 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BDD7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800BDD80 93 C1 00 08 */ stw r30, 8(r1) -/* 800BDD84 7C 7E 1B 78 */ mr r30, r3 -/* 800BDD88 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800BDD8C 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11 -/* 800BDD90 40 82 00 74 */ bne lbl_800BDE04 -/* 800BDD94 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800BDD98 60 00 40 00 */ ori r0, r0, 0x4000 -/* 800BDD9C 90 1E 05 70 */ stw r0, 0x570(r30) -/* 800BDDA0 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) -/* 800BDDA4 28 00 01 40 */ cmplwi r0, 0x140 -/* 800BDDA8 40 82 00 0C */ bne lbl_800BDDB4 -/* 800BDDAC 3B E0 00 07 */ li r31, 7 -/* 800BDDB0 48 00 00 2C */ b lbl_800BDDDC -lbl_800BDDB4: -/* 800BDDB4 3B E0 00 06 */ li r31, 6 -/* 800BDDB8 80 FE 00 B0 */ lwz r7, 0xb0(r30) -/* 800BDDBC 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 800BDDC0 7C 06 07 74 */ extsb r6, r0 -/* 800BDDC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800BDDC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800BDDCC 38 63 0E D8 */ addi r3, r3, 0xed8 -/* 800BDDD0 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 800BDDD4 A8 BE 04 E6 */ lha r5, 0x4e6(r30) -/* 800BDDD8 4B F7 71 CD */ bl set__17dSv_turnRestart_cFRC4cXyzsScUl -lbl_800BDDDC: -/* 800BDDDC 88 7E 2F AD */ lbz r3, 0x2fad(r30) -/* 800BDDE0 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800BDDE4 7F E4 FB 78 */ mr r4, r31 -/* 800BDDE8 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 800BDDEC 7C 05 07 74 */ extsb r5, r0 -/* 800BDDF0 A8 DE 04 E6 */ lha r6, 0x4e6(r30) -/* 800BDDF4 38 E0 FF FF */ li r7, -1 -/* 800BDDF8 4B F6 93 79 */ bl dStage_changeScene__FifUlScsi -/* 800BDDFC 38 60 00 01 */ li r3, 1 -/* 800BDE00 48 00 00 08 */ b lbl_800BDE08 -lbl_800BDE04: -/* 800BDE04 38 60 00 00 */ li r3, 0 -lbl_800BDE08: -/* 800BDE08 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800BDE0C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800BDE10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BDE14 7C 08 03 A6 */ mtlr r0 -/* 800BDE18 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BDE1C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/stopDrawParticle__9daAlink_cFUl.s b/asm/d/a/d_a_alink/stopDrawParticle__9daAlink_cFUl.s deleted file mode 100644 index 30d971aa63c..00000000000 --- a/asm/d/a/d_a_alink/stopDrawParticle__9daAlink_cFUl.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80120778: -/* 80120778 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012077C 7C 08 02 A6 */ mflr r0 -/* 80120780 90 01 00 14 */ stw r0, 0x14(r1) -/* 80120784 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80120788 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8012078C 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 80120790 38 63 02 10 */ addi r3, r3, 0x210 -/* 80120794 4B F2 B1 85 */ bl getEmitter__Q213dPa_control_c7level_cFUl -/* 80120798 28 03 00 00 */ cmplwi r3, 0 -/* 8012079C 41 82 00 10 */ beq lbl_801207AC -/* 801207A0 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 801207A4 60 00 00 04 */ ori r0, r0, 4 -/* 801207A8 90 03 00 F4 */ stw r0, 0xf4(r3) -lbl_801207AC: -/* 801207AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801207B0 7C 08 03 A6 */ mtlr r0 -/* 801207B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801207B8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/subjectCancelTrigger__9daAlink_cFv.s b/asm/d/a/d_a_alink/subjectCancelTrigger__9daAlink_cFv.s deleted file mode 100644 index 336017f1a17..00000000000 --- a/asm/d/a/d_a_alink/subjectCancelTrigger__9daAlink_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_800CEB58: -/* 800CEB58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800CEB5C 7C 08 02 A6 */ mflr r0 -/* 800CEB60 90 01 00 14 */ stw r0, 0x14(r1) -/* 800CEB64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800CEB68 7C 7F 1B 78 */ mr r31, r3 -/* 800CEB6C 80 03 05 74 */ lwz r0, 0x574(r3) -/* 800CEB70 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800CEB74 40 82 00 3C */ bne lbl_800CEBB0 -/* 800CEB78 4B FF 1A 1D */ bl checkNotBattleStage__9daAlink_cFv -/* 800CEB7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800CEB80 40 82 00 30 */ bne lbl_800CEBB0 -/* 800CEB84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800CEB88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800CEB8C 88 03 00 14 */ lbz r0, 0x14(r3) -/* 800CEB90 28 00 00 FF */ cmplwi r0, 0xff -/* 800CEB94 41 82 00 1C */ beq lbl_800CEBB0 -/* 800CEB98 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800CEB9C 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd -/* 800CEBA0 41 82 00 20 */ beq lbl_800CEBC0 -/* 800CEBA4 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800CEBA8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800CEBAC 40 82 00 14 */ bne lbl_800CEBC0 -lbl_800CEBB0: -/* 800CEBB0 7F E3 FB 78 */ mr r3, r31 -/* 800CEBB4 38 80 00 08 */ li r4, 8 -/* 800CEBB8 4B FE 3A 15 */ bl itemTriggerCheck__9daAlink_cFUc -/* 800CEBBC 48 00 00 08 */ b lbl_800CEBC4 -lbl_800CEBC0: -/* 800CEBC0 38 60 00 00 */ li r3, 0 -lbl_800CEBC4: -/* 800CEBC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800CEBC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800CEBCC 7C 08 03 A6 */ mtlr r0 -/* 800CEBD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800CEBD4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/swimDeleteItem__9daAlink_cFv.s b/asm/d/a/d_a_alink/swimDeleteItem__9daAlink_cFv.s deleted file mode 100644 index be2ae4fc75c..00000000000 --- a/asm/d/a/d_a_alink/swimDeleteItem__9daAlink_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80101934: -/* 80101934 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80101938 7C 08 02 A6 */ mflr r0 -/* 8010193C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80101940 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80101944 7C 7F 1B 78 */ mr r31, r3 -/* 80101948 A0 63 2F DC */ lhz r3, 0x2fdc(r3) -/* 8010194C 48 05 D2 6D */ bl checkHookshotItem__9daPy_py_cFi -/* 80101950 2C 03 00 00 */ cmpwi r3, 0 -/* 80101954 40 82 00 3C */ bne lbl_80101990 -/* 80101958 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 8010195C 28 00 01 03 */ cmplwi r0, 0x103 -/* 80101960 40 82 00 20 */ bne lbl_80101980 -/* 80101964 7F E3 FB 78 */ mr r3, r31 -/* 80101968 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 8010196C 81 8C 02 80 */ lwz r12, 0x280(r12) -/* 80101970 7D 89 03 A6 */ mtctr r12 -/* 80101974 4E 80 04 21 */ bctrl -/* 80101978 2C 03 00 00 */ cmpwi r3, 0 -/* 8010197C 40 82 00 14 */ bne lbl_80101990 -lbl_80101980: -/* 80101980 7F E3 FB 78 */ mr r3, r31 -/* 80101984 38 80 00 01 */ li r4, 1 -/* 80101988 38 A0 00 01 */ li r5, 1 -/* 8010198C 4B FB F9 51 */ bl deleteEquipItem__9daAlink_cFii -lbl_80101990: -/* 80101990 80 1F 05 78 */ lwz r0, 0x578(r31) -/* 80101994 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80101998 41 82 00 0C */ beq lbl_801019A4 -/* 8010199C 7F E3 FB 78 */ mr r3, r31 -/* 801019A0 48 00 EE A1 */ bl offKandelaarModel__9daAlink_cFv -lbl_801019A4: -/* 801019A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801019A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801019AC 7C 08 03 A6 */ mtlr r0 -/* 801019B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801019B4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/swordUnequip__9daAlink_cFv.s b/asm/d/a/d_a_alink/swordUnequip__9daAlink_cFv.s deleted file mode 100644 index 0726145f527..00000000000 --- a/asm/d/a/d_a_alink/swordUnequip__9daAlink_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_800B9580: -/* 800B9580 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B9584 7C 08 02 A6 */ mflr r0 -/* 800B9588 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B958C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B9590 7C 7F 1B 78 */ mr r31, r3 -/* 800B9594 48 00 02 59 */ bl checkFastUnequip__9daAlink_cFv -/* 800B9598 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800B959C 41 82 00 14 */ beq lbl_800B95B0 -/* 800B95A0 3C 60 80 39 */ lis r3, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800B95A4 38 63 DE 8C */ addi r3, r3, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800B95A8 C0 23 00 8C */ lfs f1, 0x8c(r3) -/* 800B95AC 48 00 00 10 */ b lbl_800B95BC -lbl_800B95B0: -/* 800B95B0 3C 60 80 39 */ lis r3, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800B95B4 38 63 DE 8C */ addi r3, r3, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800B95B8 C0 23 00 18 */ lfs f1, 0x18(r3) -lbl_800B95BC: -/* 800B95BC 38 00 00 00 */ li r0, 0 -/* 800B95C0 88 7F 2F AA */ lbz r3, 0x2faa(r31) -/* 800B95C4 28 03 00 01 */ cmplwi r3, 1 -/* 800B95C8 41 82 00 0C */ beq lbl_800B95D4 -/* 800B95CC 28 03 00 02 */ cmplwi r3, 2 -/* 800B95D0 40 82 00 08 */ bne lbl_800B95D8 -lbl_800B95D4: -/* 800B95D4 38 00 00 01 */ li r0, 1 -lbl_800B95D8: -/* 800B95D8 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 800B95DC 38 80 02 55 */ li r4, 0x255 -/* 800B95E0 41 82 00 08 */ beq lbl_800B95E8 -/* 800B95E4 38 80 02 61 */ li r4, 0x261 -lbl_800B95E8: -/* 800B95E8 7F E3 FB 78 */ mr r3, r31 -/* 800B95EC 38 A0 00 02 */ li r5, 2 -/* 800B95F0 3C C0 80 39 */ lis r6, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800B95F4 38 E6 DE 8C */ addi r7, r6, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800B95F8 C0 47 00 1C */ lfs f2, 0x1c(r7) -/* 800B95FC A8 C7 00 14 */ lha r6, 0x14(r7) -/* 800B9600 C0 67 00 20 */ lfs f3, 0x20(r7) -/* 800B9604 4B FF 3D D5 */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf -/* 800B9608 7F E3 FB 78 */ mr r3, r31 -/* 800B960C 38 80 00 2D */ li r4, 0x2d -/* 800B9610 4B FF 64 99 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -/* 800B9614 7F E3 FB 78 */ mr r3, r31 -/* 800B9618 38 80 01 5E */ li r4, 0x15e -/* 800B961C 38 A0 00 01 */ li r5, 1 -/* 800B9620 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800B9624 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800B9628 4B FF 5E 89 */ bl setFaceBck__9daAlink_cFUsiUs -/* 800B962C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B9630 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B9634 7C 08 03 A6 */ mtlr r0 -/* 800B9638 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B963C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/throwBoomerang__9daAlink_cFv.s b/asm/d/a/d_a_alink/throwBoomerang__9daAlink_cFv.s deleted file mode 100644 index dc8922a68d4..00000000000 --- a/asm/d/a/d_a_alink/throwBoomerang__9daAlink_cFv.s +++ /dev/null @@ -1,141 +0,0 @@ -lbl_800E06B8: -/* 800E06B8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800E06BC 7C 08 02 A6 */ mflr r0 -/* 800E06C0 90 01 00 24 */ stw r0, 0x24(r1) -/* 800E06C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E06C8 48 28 1B 15 */ bl _savegpr_29 -/* 800E06CC 7C 7D 1B 78 */ mr r29, r3 -/* 800E06D0 83 E3 28 28 */ lwz r31, 0x2828(r3) -/* 800E06D4 80 03 05 74 */ lwz r0, 0x574(r3) -/* 800E06D8 60 00 00 02 */ ori r0, r0, 2 -/* 800E06DC 90 03 05 74 */ stw r0, 0x574(r3) -/* 800E06E0 A8 1F 00 08 */ lha r0, 8(r31) -/* 800E06E4 20 00 00 FE */ subfic r0, r0, 0xfe -/* 800E06E8 7C 00 00 34 */ cntlzw r0, r0 -/* 800E06EC 54 1E DE 3F */ rlwinm. r30, r0, 0x1b, 0x18, 0x1f -/* 800E06F0 41 82 00 94 */ beq lbl_800E0784 -/* 800E06F4 38 00 00 01 */ li r0, 1 -/* 800E06F8 90 1F 00 B0 */ stw r0, 0xb0(r31) -/* 800E06FC A8 7D 04 E6 */ lha r3, 0x4e6(r29) -/* 800E0700 A8 1D 05 9E */ lha r0, 0x59e(r29) -/* 800E0704 7C 03 02 14 */ add r0, r3, r0 -/* 800E0708 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800E070C A8 1D 05 9C */ lha r0, 0x59c(r29) -/* 800E0710 7C 00 00 D0 */ neg r0, r0 -/* 800E0714 B0 1F 04 DC */ sth r0, 0x4dc(r31) -/* 800E0718 80 9D 27 EC */ lwz r4, 0x27ec(r29) -/* 800E071C 28 04 00 00 */ cmplwi r4, 0 -/* 800E0720 41 82 00 14 */ beq lbl_800E0734 -/* 800E0724 7F E3 FB 78 */ mr r3, r31 -/* 800E0728 39 9F 0D CC */ addi r12, r31, 0xdcc -/* 800E072C 48 28 19 59 */ bl __ptmf_scall -/* 800E0730 60 00 00 00 */ nop -lbl_800E0734: -/* 800E0734 A8 1D 04 E6 */ lha r0, 0x4e6(r29) -/* 800E0738 B0 1F 04 E6 */ sth r0, 0x4e6(r31) -/* 800E073C 80 1D 28 24 */ lwz r0, 0x2824(r29) -/* 800E0740 90 1D 28 34 */ stw r0, 0x2834(r29) -/* 800E0744 80 1D 28 28 */ lwz r0, 0x2828(r29) -/* 800E0748 90 1D 28 38 */ stw r0, 0x2838(r29) -/* 800E074C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800E0750 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800E0754 80 04 5F 18 */ lwz r0, 0x5f18(r4) -/* 800E0758 64 03 00 40 */ oris r3, r0, 0x40 -/* 800E075C 90 64 5F 18 */ stw r3, 0x5f18(r4) -/* 800E0760 38 00 40 00 */ li r0, 0x4000 -/* 800E0764 B0 0D 8A 9C */ sth r0, m_dropAngleY__20daPy_boomerangMove_c+0x0(r13) -/* 800E0768 54 60 03 56 */ rlwinm r0, r3, 0, 0xd, 0xb -/* 800E076C 90 04 5F 18 */ stw r0, 0x5f18(r4) -/* 800E0770 38 00 FF FF */ li r0, -1 -/* 800E0774 B0 1D 30 8E */ sth r0, 0x308e(r29) -/* 800E0778 38 00 00 00 */ li r0, 0 -/* 800E077C B0 0D 8A 9E */ sth r0, m_dropAngleY__20daPy_boomerangMove_c+0x2(r13) -/* 800E0780 48 00 00 44 */ b lbl_800E07C4 -lbl_800E0784: -/* 800E0784 3C 60 80 39 */ lis r3, m__20daAlinkHIO_pickUp_c0@ha /* 0x8038E840@ha */ -/* 800E0788 38 63 E8 40 */ addi r3, r3, m__20daAlinkHIO_pickUp_c0@l /* 0x8038E840@l */ -/* 800E078C C0 03 00 28 */ lfs f0, 0x28(r3) -/* 800E0790 D0 1F 05 2C */ stfs f0, 0x52c(r31) -/* 800E0794 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 800E0798 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 800E079C A8 1D 04 E6 */ lha r0, 0x4e6(r29) -/* 800E07A0 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800E07A4 7F E3 FB 78 */ mr r3, r31 -/* 800E07A8 4B F3 C3 F9 */ bl fopAcM_cancelCarryNow__FP10fopAc_ac_c -/* 800E07AC 3B E0 00 00 */ li r31, 0 -/* 800E07B0 38 00 00 FF */ li r0, 0xff -/* 800E07B4 B0 1D 2F DC */ sth r0, 0x2fdc(r29) -/* 800E07B8 98 1D 2F 94 */ stb r0, 0x2f94(r29) -/* 800E07BC 38 00 00 FE */ li r0, 0xfe -/* 800E07C0 98 1D 2F 96 */ stb r0, 0x2f96(r29) -lbl_800E07C4: -/* 800E07C4 38 7D 28 24 */ addi r3, r29, 0x2824 -/* 800E07C8 48 07 E5 35 */ bl clearData__16daPy_actorKeep_cFv -/* 800E07CC 38 00 00 FF */ li r0, 0xff -/* 800E07D0 B0 1D 2F DC */ sth r0, 0x2fdc(r29) -/* 800E07D4 98 1D 2F 94 */ stb r0, 0x2f94(r29) -/* 800E07D8 38 00 00 FE */ li r0, 0xfe -/* 800E07DC 98 1D 2F 96 */ stb r0, 0x2f96(r29) -/* 800E07E0 7F A3 EB 78 */ mr r3, r29 -/* 800E07E4 3C 80 00 01 */ lis r4, 1 -/* 800E07E8 81 9D 06 28 */ lwz r12, 0x628(r29) -/* 800E07EC 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800E07F0 7D 89 03 A6 */ mtctr r12 -/* 800E07F4 4E 80 04 21 */ bctrl -/* 800E07F8 80 1D 31 A0 */ lwz r0, 0x31a0(r29) -/* 800E07FC 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 -/* 800E0800 41 82 00 3C */ beq lbl_800E083C -/* 800E0804 7F A3 EB 78 */ mr r3, r29 -/* 800E0808 81 9D 06 28 */ lwz r12, 0x628(r29) -/* 800E080C 81 8C 01 90 */ lwz r12, 0x190(r12) -/* 800E0810 7D 89 03 A6 */ mtctr r12 -/* 800E0814 4E 80 04 21 */ bctrl -/* 800E0818 28 03 00 00 */ cmplwi r3, 0 -/* 800E081C 41 82 00 14 */ beq lbl_800E0830 -/* 800E0820 7F A3 EB 78 */ mr r3, r29 -/* 800E0824 38 80 00 00 */ li r4, 0 -/* 800E0828 48 01 49 BD */ bl procCanoeWaitInit__9daAlink_cFi -/* 800E082C 48 00 00 80 */ b lbl_800E08AC -lbl_800E0830: -/* 800E0830 7F A3 EB 78 */ mr r3, r29 -/* 800E0834 48 01 01 4D */ bl procHorseWaitInit__9daAlink_cFv -/* 800E0838 48 00 00 74 */ b lbl_800E08AC -lbl_800E083C: -/* 800E083C 80 1D 19 9C */ lwz r0, 0x199c(r29) -/* 800E0840 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800E0844 41 82 00 68 */ beq lbl_800E08AC -/* 800E0848 2C 1E 00 00 */ cmpwi r30, 0 -/* 800E084C 41 82 00 60 */ beq lbl_800E08AC -/* 800E0850 80 1D 27 EC */ lwz r0, 0x27ec(r29) -/* 800E0854 28 00 00 00 */ cmplwi r0, 0 -/* 800E0858 40 82 00 14 */ bne lbl_800E086C -/* 800E085C 28 1F 00 00 */ cmplwi r31, 0 -/* 800E0860 41 82 00 0C */ beq lbl_800E086C -/* 800E0864 93 FD 27 EC */ stw r31, 0x27ec(r29) -/* 800E0868 93 FD 27 F4 */ stw r31, 0x27f4(r29) -lbl_800E086C: -/* 800E086C 7F A3 EB 78 */ mr r3, r29 -/* 800E0870 4B FD 30 95 */ bl checkZeroSpeedF__9daAlink_cCFv -/* 800E0874 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E0878 41 82 00 18 */ beq lbl_800E0890 -/* 800E087C 38 00 00 03 */ li r0, 3 -/* 800E0880 98 1D 2F 98 */ stb r0, 0x2f98(r29) -/* 800E0884 7F A3 EB 78 */ mr r3, r29 -/* 800E0888 4B FE 30 45 */ bl procAtnActorWaitInit__9daAlink_cFv -/* 800E088C 48 00 00 0C */ b lbl_800E0898 -lbl_800E0890: -/* 800E0890 7F A3 EB 78 */ mr r3, r29 -/* 800E0894 4B FE 31 59 */ bl procAtnActorMoveInit__9daAlink_cFv -lbl_800E0898: -/* 800E0898 80 7D 20 60 */ lwz r3, 0x2060(r29) -/* 800E089C C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800E08A0 38 80 00 00 */ li r4, 0 -/* 800E08A4 38 A0 00 23 */ li r5, 0x23 -/* 800E08A8 4B F2 EF A1 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs -lbl_800E08AC: -/* 800E08AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E08B0 48 28 19 79 */ bl _restgpr_29 -/* 800E08B4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800E08B8 7C 08 03 A6 */ mtlr r0 -/* 800E08BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E08C0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/voiceStartLevel__9daAlink_cFUl.s b/asm/d/a/d_a_alink/voiceStartLevel__9daAlink_cFUl.s deleted file mode 100644 index 2a8d822d6d7..00000000000 --- a/asm/d/a/d_a_alink/voiceStartLevel__9daAlink_cFUl.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800BF0B8: -/* 800BF0B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BF0BC 7C 08 02 A6 */ mflr r0 -/* 800BF0C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BF0C4 7C 65 1B 78 */ mr r5, r3 -/* 800BF0C8 90 81 00 08 */ stw r4, 8(r1) -/* 800BF0CC 38 65 2C A8 */ addi r3, r5, 0x2ca8 -/* 800BF0D0 38 81 00 08 */ addi r4, r1, 8 -/* 800BF0D4 88 A5 2F 9A */ lbz r5, 0x2f9a(r5) -/* 800BF0D8 48 20 54 D9 */ bl startLinkVoiceLevel__14Z2CreatureLinkF10JAISoundIDSc -/* 800BF0DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BF0E0 7C 08 03 A6 */ mtlr r0 -/* 800BF0E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BF0E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/voiceStart__9daAlink_cFUl.s b/asm/d/a/d_a_alink/voiceStart__9daAlink_cFUl.s deleted file mode 100644 index 1df0ccccd86..00000000000 --- a/asm/d/a/d_a_alink/voiceStart__9daAlink_cFUl.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800BF084: -/* 800BF084 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BF088 7C 08 02 A6 */ mflr r0 -/* 800BF08C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BF090 7C 65 1B 78 */ mr r5, r3 -/* 800BF094 90 81 00 08 */ stw r4, 8(r1) -/* 800BF098 38 65 2C A8 */ addi r3, r5, 0x2ca8 -/* 800BF09C 38 81 00 08 */ addi r4, r1, 8 -/* 800BF0A0 88 A5 2F 9A */ lbz r5, 0x2f9a(r5) -/* 800BF0A4 48 20 52 7D */ bl startLinkVoice__14Z2CreatureLinkF10JAISoundIDSc -/* 800BF0A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BF0AC 7C 08 03 A6 */ mtlr r0 -/* 800BF0B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BF0B4 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_isVisitedRoom__Fi.s b/asm/d/com/d_com_inf_game/dComIfGs_isVisitedRoom__Fi.s deleted file mode 100644 index 0274fe16544..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_isVisitedRoom__Fi.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8002FC98: -/* 8002FC98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002FC9C 7C 08 02 A6 */ mflr r0 -/* 8002FCA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002FCA4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002FCA8 7C 7F 1B 78 */ mr r31, r3 -/* 8002FCAC 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) -/* 8002FCB0 7C 00 07 74 */ extsb r0, r0 -/* 8002FCB4 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 8002FCB8 38 63 60 94 */ addi r3, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 8002FCBC 1C 00 04 04 */ mulli r0, r0, 0x404 -/* 8002FCC0 7C 63 02 14 */ add r3, r3, r0 -/* 8002FCC4 80 83 00 20 */ lwz r4, 0x20(r3) -/* 8002FCC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002FCCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002FCD0 88 84 00 13 */ lbz r4, 0x13(r4) -/* 8002FCD4 48 00 53 D5 */ bl getSave2__10dSv_save_cFi -/* 8002FCD8 7F E4 FB 78 */ mr r4, r31 -/* 8002FCDC 48 00 4E 11 */ bl isVisitedRoom__13dSv_memory2_cFi -/* 8002FCE0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002FCE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002FCE8 7C 08 03 A6 */ mtlr r0 -/* 8002FCEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002FCF0 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_offVisitedRoom__Fi.s b/asm/d/com/d_com_inf_game/dComIfGs_offVisitedRoom__Fi.s deleted file mode 100644 index 8e256c7a2f7..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_offVisitedRoom__Fi.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8002FC3C: -/* 8002FC3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002FC40 7C 08 02 A6 */ mflr r0 -/* 8002FC44 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002FC48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002FC4C 7C 7F 1B 78 */ mr r31, r3 -/* 8002FC50 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) -/* 8002FC54 7C 00 07 74 */ extsb r0, r0 -/* 8002FC58 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 8002FC5C 38 63 60 94 */ addi r3, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 8002FC60 1C 00 04 04 */ mulli r0, r0, 0x404 -/* 8002FC64 7C 63 02 14 */ add r3, r3, r0 -/* 8002FC68 80 83 00 20 */ lwz r4, 0x20(r3) -/* 8002FC6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002FC70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002FC74 88 84 00 13 */ lbz r4, 0x13(r4) -/* 8002FC78 48 00 54 31 */ bl getSave2__10dSv_save_cFi -/* 8002FC7C 7F E4 FB 78 */ mr r4, r31 -/* 8002FC80 48 00 4E 49 */ bl offVisitedRoom__13dSv_memory2_cFi -/* 8002FC84 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002FC88 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002FC8C 7C 08 03 A6 */ mtlr r0 -/* 8002FC90 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002FC94 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_onVisitedRoom__Fi.s b/asm/d/com/d_com_inf_game/dComIfGs_onVisitedRoom__Fi.s deleted file mode 100644 index 9722587bc26..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_onVisitedRoom__Fi.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_8002FB80: -/* 8002FB80 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8002FB84 7C 08 02 A6 */ mflr r0 -/* 8002FB88 90 01 00 24 */ stw r0, 0x24(r1) -/* 8002FB8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002FB90 48 33 26 49 */ bl _savegpr_28 -/* 8002FB94 7C 7C 1B 78 */ mr r28, r3 -/* 8002FB98 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 8002FB9C 38 63 60 94 */ addi r3, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 8002FBA0 3B A3 00 20 */ addi r29, r3, 0x20 -/* 8002FBA4 1C 1C 04 04 */ mulli r0, r28, 0x404 -/* 8002FBA8 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 8002FBAC 28 03 00 00 */ cmplwi r3, 0 -/* 8002FBB0 41 82 00 74 */ beq lbl_8002FC24 -/* 8002FBB4 88 03 00 13 */ lbz r0, 0x13(r3) -/* 8002FBB8 28 00 00 40 */ cmplwi r0, 0x40 -/* 8002FBBC 40 80 00 68 */ bge lbl_8002FC24 -/* 8002FBC0 4B FF F0 95 */ bl dComIfG_getNowCalcRegion__Fv -/* 8002FBC4 54 7E 06 3E */ clrlwi r30, r3, 0x18 -/* 8002FBC8 28 1E 00 FF */ cmplwi r30, 0xff -/* 8002FBCC 41 82 00 30 */ beq lbl_8002FBFC -/* 8002FBD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002FBD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002FBD8 3B E3 00 64 */ addi r31, r3, 0x64 -/* 8002FBDC 7F E3 FB 78 */ mr r3, r31 -/* 8002FBE0 7F C4 F3 78 */ mr r4, r30 -/* 8002FBE4 48 00 32 95 */ bl isRegionBit__33dSv_player_field_last_stay_info_cCFi -/* 8002FBE8 2C 03 00 00 */ cmpwi r3, 0 -/* 8002FBEC 40 82 00 10 */ bne lbl_8002FBFC -/* 8002FBF0 7F E3 FB 78 */ mr r3, r31 -/* 8002FBF4 7F C4 F3 78 */ mr r4, r30 -/* 8002FBF8 48 00 32 55 */ bl onRegionBit__33dSv_player_field_last_stay_info_cFi -lbl_8002FBFC: -/* 8002FBFC 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) -/* 8002FC00 7C 00 07 74 */ extsb r0, r0 -/* 8002FC04 1C 00 04 04 */ mulli r0, r0, 0x404 -/* 8002FC08 7C 9D 00 2E */ lwzx r4, r29, r0 -/* 8002FC0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002FC10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002FC14 88 84 00 13 */ lbz r4, 0x13(r4) -/* 8002FC18 48 00 54 91 */ bl getSave2__10dSv_save_cFi -/* 8002FC1C 7F 84 E3 78 */ mr r4, r28 -/* 8002FC20 48 00 4E 85 */ bl onVisitedRoom__13dSv_memory2_cFi -lbl_8002FC24: -/* 8002FC24 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002FC28 48 33 25 FD */ bl _restgpr_28 -/* 8002FC2C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002FC30 7C 08 03 A6 */ mtlr r0 -/* 8002FC34 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002FC38 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_wolfeye_effect_check__Fv.s b/asm/d/com/d_com_inf_game/dComIfGs_wolfeye_effect_check__Fv.s deleted file mode 100644 index 52b56ac728a..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_wolfeye_effect_check__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8002FA54: -/* 8002FA54 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8002FA58 38 83 CA 54 */ addi r4, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8002FA5C 38 60 00 00 */ li r3, 0 -/* 8002FA60 88 04 0F 3D */ lbz r0, 0xf3d(r4) -/* 8002FA64 28 00 00 01 */ cmplwi r0, 1 -/* 8002FA68 4C 82 00 20 */ bnelr -/* 8002FA6C C0 24 0F 40 */ lfs f1, 0xf40(r4) -/* 8002FA70 C8 02 83 20 */ lfd f0, lit_7580(r2) -/* 8002FA74 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8002FA78 4C 81 00 20 */ blelr -/* 8002FA7C 38 60 00 01 */ li r3, 1 -/* 8002FA80 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_WOOD_STICK__Fv.s b/asm/d/d_item/item_func_WOOD_STICK__Fv.s deleted file mode 100644 index acfe2e43279..00000000000 --- a/asm/d/d_item/item_func_WOOD_STICK__Fv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_800986C4: -/* 800986C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800986C8 7C 08 02 A6 */ mflr r0 -/* 800986CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800986D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800986D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800986D8 38 63 01 00 */ addi r3, r3, 0x100 -/* 800986DC 38 80 00 01 */ li r4, 1 -/* 800986E0 38 A0 00 02 */ li r5, 2 -/* 800986E4 4B F9 BB 05 */ bl setCollect__20dSv_player_collect_cFiUc -/* 800986E8 38 60 00 3F */ li r3, 0x3f -/* 800986EC 4B F9 67 D5 */ bl dComIfGs_setSelectEquipSword__FUc -/* 800986F0 88 AD 87 E4 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0(r13) -/* 800986F4 7C A5 07 74 */ extsb r5, r5 -/* 800986F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800986FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098700 38 80 00 1C */ li r4, 0x1c -/* 80098704 4B F9 CA FD */ bl onSwitch__10dSv_info_cFii -/* 80098708 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009870C 7C 08 03 A6 */ mtlr r0 -/* 80098710 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098714 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/isFirstBit__21dSv_player_get_item_cCFUc.s b/asm/d/save/d_save/isFirstBit__21dSv_player_get_item_cCFUc.s deleted file mode 100644 index 90b405f13d6..00000000000 --- a/asm/d/save/d_save/isFirstBit__21dSv_player_get_item_cCFUc.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80033EC8: -/* 80033EC8 38 C0 00 01 */ li r6, 1 -/* 80033ECC 54 85 06 3E */ clrlwi r5, r4, 0x18 -/* 80033ED0 54 80 D8 08 */ slwi r0, r4, 0x1b -/* 80033ED4 54 A5 0F FE */ srwi r5, r5, 0x1f -/* 80033ED8 7C 05 00 50 */ subf r0, r5, r0 -/* 80033EDC 54 00 28 3E */ rotlwi r0, r0, 5 -/* 80033EE0 7C 00 2A 14 */ add r0, r0, r5 -/* 80033EE4 7C C5 00 30 */ slw r5, r6, r0 -/* 80033EE8 54 80 EE FA */ rlwinm r0, r4, 0x1d, 0x1b, 0x1d -/* 80033EEC 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80033EF0 7C A3 00 38 */ and r3, r5, r0 -/* 80033EF4 30 03 FF FF */ addic r0, r3, -1 -/* 80033EF8 7C 60 19 10 */ subfe r3, r0, r3 -/* 80033EFC 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/offFirstBit__21dSv_player_get_item_cFUc.s b/asm/d/save/d_save/offFirstBit__21dSv_player_get_item_cFUc.s deleted file mode 100644 index a37447d9557..00000000000 --- a/asm/d/save/d_save/offFirstBit__21dSv_player_get_item_cFUc.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80033E94: -/* 80033E94 54 88 06 3E */ clrlwi r8, r4, 0x18 -/* 80033E98 54 87 EE FA */ rlwinm r7, r4, 0x1d, 0x1b, 0x1d -/* 80033E9C 7C C3 38 2E */ lwzx r6, r3, r7 -/* 80033EA0 38 A0 00 01 */ li r5, 1 -/* 80033EA4 54 80 D8 08 */ slwi r0, r4, 0x1b -/* 80033EA8 55 04 0F FE */ srwi r4, r8, 0x1f -/* 80033EAC 7C 04 00 50 */ subf r0, r4, r0 -/* 80033EB0 54 00 28 3E */ rotlwi r0, r0, 5 -/* 80033EB4 7C 00 22 14 */ add r0, r0, r4 -/* 80033EB8 7C A0 00 30 */ slw r0, r5, r0 -/* 80033EBC 7C C0 00 78 */ andc r0, r6, r0 -/* 80033EC0 7C 03 39 2E */ stwx r0, r3, r7 -/* 80033EC4 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/onFirstBit__21dSv_player_get_item_cFUc.s b/asm/d/save/d_save/onFirstBit__21dSv_player_get_item_cFUc.s deleted file mode 100644 index 1205c52ca4e..00000000000 --- a/asm/d/save/d_save/onFirstBit__21dSv_player_get_item_cFUc.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80033E60: -/* 80033E60 54 88 06 3E */ clrlwi r8, r4, 0x18 -/* 80033E64 54 87 EE FA */ rlwinm r7, r4, 0x1d, 0x1b, 0x1d -/* 80033E68 7C C3 38 2E */ lwzx r6, r3, r7 -/* 80033E6C 38 A0 00 01 */ li r5, 1 -/* 80033E70 54 80 D8 08 */ slwi r0, r4, 0x1b -/* 80033E74 55 04 0F FE */ srwi r4, r8, 0x1f -/* 80033E78 7C 04 00 50 */ subf r0, r4, r0 -/* 80033E7C 54 00 28 3E */ rotlwi r0, r0, 5 -/* 80033E80 7C 00 22 14 */ add r0, r0, r4 -/* 80033E84 7C A0 00 30 */ slw r0, r5, r0 -/* 80033E88 7C C0 03 78 */ or r0, r6, r0 -/* 80033E8C 7C 03 39 2E */ stwx r0, r3, r7 -/* 80033E90 4E 80 00 20 */ blr diff --git a/asm/init/__flush_cache.s b/asm/init/__flush_cache.s deleted file mode 100644 index 4db8f4ecc63..00000000000 --- a/asm/init/__flush_cache.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80003424: -/* 80003424 3C A0 FF FF */ lis r5, 0xFFFF /* 0xFFFFFFF1@h */ -/* 80003428 60 A5 FF F1 */ ori r5, r5, 0xFFF1 /* 0xFFFFFFF1@l */ -/* 8000342C 7C A5 18 38 */ and r5, r5, r3 -/* 80003430 7C 65 18 50 */ subf r3, r5, r3 -/* 80003434 7C 84 1A 14 */ add r4, r4, r3 -lbl_80003438: -/* 80003438 7C 00 28 6C */ dcbst 0, r5 -/* 8000343C 7C 00 04 AC */ sync -/* 80003440 7C 00 2F AC */ icbi 0, r5 -/* 80003444 30 A5 00 08 */ addic r5, r5, 8 -/* 80003448 34 84 FF F8 */ addic. r4, r4, -8 -/* 8000344C 40 80 FF EC */ bge lbl_80003438 -/* 80003450 4C 00 01 2C */ isync -/* 80003454 4E 80 00 20 */ blr diff --git a/asm/init/__init_hardware.s b/asm/init/__init_hardware.s deleted file mode 100644 index aed5e07e2be..00000000000 --- a/asm/init/__init_hardware.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80003400: -/* 80003400 7C 00 00 A6 */ mfmsr r0 -/* 80003404 60 00 20 00 */ ori r0, r0, 0x2000 -/* 80003408 7C 00 01 24 */ mtmsr r0 -/* 8000340C 7F E8 02 A6 */ mflr r31 -/* 80003410 48 33 73 FD */ bl __OSPSInit -/* 80003414 48 33 69 C1 */ bl __OSFPRInit -/* 80003418 48 33 86 D9 */ bl __OSCacheInit -/* 8000341C 7F E8 03 A6 */ mtlr r31 -/* 80003420 4E 80 00 20 */ blr diff --git a/asm/init/__init_registers.s b/asm/init/__init_registers.s deleted file mode 100644 index 638d8155233..00000000000 --- a/asm/init/__init_registers.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_800032B0: -/* 800032B0 38 00 00 00 */ li r0, 0 -/* 800032B4 38 60 00 00 */ li r3, 0 -/* 800032B8 38 80 00 00 */ li r4, 0 -/* 800032BC 38 A0 00 00 */ li r5, 0 -/* 800032C0 38 C0 00 00 */ li r6, 0 -/* 800032C4 38 E0 00 00 */ li r7, 0 -/* 800032C8 39 00 00 00 */ li r8, 0 -/* 800032CC 39 20 00 00 */ li r9, 0 -/* 800032D0 39 40 00 00 */ li r10, 0 -/* 800032D4 39 60 00 00 */ li r11, 0 -/* 800032D8 39 80 00 00 */ li r12, 0 -/* 800032DC 39 C0 00 00 */ li r14, 0 -/* 800032E0 39 E0 00 00 */ li r15, 0 -/* 800032E4 3A 00 00 00 */ li r16, 0 -/* 800032E8 3A 20 00 00 */ li r17, 0 -/* 800032EC 3A 40 00 00 */ li r18, 0 -/* 800032F0 3A 60 00 00 */ li r19, 0 -/* 800032F4 3A 80 00 00 */ li r20, 0 -/* 800032F8 3A A0 00 00 */ li r21, 0 -/* 800032FC 3A C0 00 00 */ li r22, 0 -/* 80003300 3A E0 00 00 */ li r23, 0 -/* 80003304 3B 00 00 00 */ li r24, 0 -/* 80003308 3B 20 00 00 */ li r25, 0 -/* 8000330C 3B 40 00 00 */ li r26, 0 -/* 80003310 3B 60 00 00 */ li r27, 0 -/* 80003314 3B 80 00 00 */ li r28, 0 -/* 80003318 3B A0 00 00 */ li r29, 0 -/* 8000331C 3B C0 00 00 */ li r30, 0 -/* 80003320 3B E0 00 00 */ li r31, 0 -/* 80003324 3C 20 80 45 */ lis r1, _stack_end+0x1000@h /* 0x80457BC8@h */ -/* 80003328 60 21 7B C8 */ ori r1, r1, _stack_end+0x1000@l /* 0x80457BC8@l */ -/* 8000332C 3C 40 80 45 */ lis r2, _SDA2_BASE_@h /* 0x80459A00@h */ -/* 80003330 60 42 9A 00 */ ori r2, r2, _SDA2_BASE_@l /* 0x80459A00@l */ -/* 80003334 3D A0 80 45 */ lis r13, _SDA_BASE_@h /* 0x80458580@h */ -/* 80003338 61 AD 85 80 */ ori r13, r13, _SDA_BASE_@l /* 0x80458580@l */ -/* 8000333C 4E 80 00 20 */ blr diff --git a/asm/init/__start.s b/asm/init/__start.s deleted file mode 100644 index 84528f2eef7..00000000000 --- a/asm/init/__start.s +++ /dev/null @@ -1,98 +0,0 @@ -lbl_80003154: -/* 80003154 48 00 01 5D */ bl __init_registers -/* 80003158 48 00 02 A9 */ bl __init_hardware -/* 8000315C 38 00 FF FF */ li r0, -1 -/* 80003160 94 21 FF F8 */ stwu r1, -8(r1) -/* 80003164 90 01 00 04 */ stw r0, 4(r1) -/* 80003168 90 01 00 00 */ stw r0, 0(r1) -/* 8000316C 48 00 01 D5 */ bl __init_data -/* 80003170 38 00 00 00 */ li r0, 0 -/* 80003174 3C C0 80 00 */ lis r6, 0x8000 /* 0x80000044@ha */ -/* 80003178 38 C6 00 44 */ addi r6, r6, 0x0044 /* 0x80000044@l */ -/* 8000317C 90 06 00 00 */ stw r0, 0(r6) -/* 80003180 3C C0 80 00 */ lis r6, 0x8000 /* 0x800000F4@ha */ -/* 80003184 38 C6 00 F4 */ addi r6, r6, 0x00F4 /* 0x800000F4@l */ -/* 80003188 80 C6 00 00 */ lwz r6, 0(r6) -/* 8000318C 28 06 00 00 */ cmplwi r6, 0 -/* 80003190 41 82 00 0C */ beq lbl_8000319C -/* 80003194 80 E6 00 0C */ lwz r7, 0xc(r6) -/* 80003198 48 00 00 24 */ b lbl_800031BC -lbl_8000319C: -/* 8000319C 3C A0 80 00 */ lis r5, 0x8000 /* 0x80000034@ha */ -/* 800031A0 38 A5 00 34 */ addi r5, r5, 0x0034 /* 0x80000034@l */ -/* 800031A4 80 A5 00 00 */ lwz r5, 0(r5) -/* 800031A8 28 05 00 00 */ cmplwi r5, 0 -/* 800031AC 41 82 00 4C */ beq lbl_800031F8 -/* 800031B0 3C E0 80 00 */ lis r7, 0x8000 /* 0x800030E8@ha */ -/* 800031B4 38 E7 30 E8 */ addi r7, r7, 0x30E8 /* 0x800030E8@l */ -/* 800031B8 80 E7 00 00 */ lwz r7, 0(r7) -lbl_800031BC: -/* 800031BC 38 A0 00 00 */ li r5, 0 -/* 800031C0 28 07 00 02 */ cmplwi r7, 2 -/* 800031C4 41 82 00 24 */ beq lbl_800031E8 -/* 800031C8 28 07 00 03 */ cmplwi r7, 3 -/* 800031CC 38 A0 00 01 */ li r5, 1 -/* 800031D0 41 82 00 18 */ beq lbl_800031E8 -/* 800031D4 28 07 00 04 */ cmplwi r7, 4 -/* 800031D8 40 82 00 20 */ bne lbl_800031F8 -/* 800031DC 38 A0 00 02 */ li r5, 2 -/* 800031E0 4B FF FF 61 */ bl __set_debug_bba -/* 800031E4 48 00 00 14 */ b lbl_800031F8 -lbl_800031E8: -/* 800031E8 3C C0 80 37 */ lis r6, InitMetroTRK@ha /* 0x80371560@ha */ -/* 800031EC 38 C6 15 60 */ addi r6, r6, InitMetroTRK@l /* 0x80371560@l */ -/* 800031F0 7C C8 03 A6 */ mtlr r6 -/* 800031F4 4E 80 00 21 */ blrl -lbl_800031F8: -/* 800031F8 3C C0 80 00 */ lis r6, 0x8000 /* 0x800000F4@ha */ -/* 800031FC 38 C6 00 F4 */ addi r6, r6, 0x00F4 /* 0x800000F4@l */ -/* 80003200 80 A6 00 00 */ lwz r5, 0(r6) -/* 80003204 28 05 00 00 */ cmplwi r5, 0 -/* 80003208 41 A2 00 50 */ beq+ lbl_80003258 -/* 8000320C 80 C5 00 08 */ lwz r6, 8(r5) -/* 80003210 28 06 00 00 */ cmplwi r6, 0 -/* 80003214 41 A2 00 44 */ beq+ lbl_80003258 -/* 80003218 7C C5 32 14 */ add r6, r5, r6 -/* 8000321C 81 C6 00 00 */ lwz r14, 0(r6) -/* 80003220 28 0E 00 00 */ cmplwi r14, 0 -/* 80003224 41 82 00 34 */ beq lbl_80003258 -/* 80003228 39 E6 00 04 */ addi r15, r6, 4 -/* 8000322C 7D C9 03 A6 */ mtctr r14 -lbl_80003230: -/* 80003230 38 C6 00 04 */ addi r6, r6, 4 -/* 80003234 80 E6 00 00 */ lwz r7, 0(r6) -/* 80003238 7C E7 2A 14 */ add r7, r7, r5 -/* 8000323C 90 E6 00 00 */ stw r7, 0(r6) -/* 80003240 42 00 FF F0 */ bdnz lbl_80003230 -/* 80003244 3C A0 80 00 */ lis r5, 0x8000 /* 0x80000034@ha */ -/* 80003248 38 A5 00 34 */ addi r5, r5, 0x0034 /* 0x80000034@l */ -/* 8000324C 55 E7 00 34 */ rlwinm r7, r15, 0, 0, 0x1a -/* 80003250 90 E5 00 00 */ stw r7, 0(r5) -/* 80003254 48 00 00 0C */ b lbl_80003260 -lbl_80003258: -/* 80003258 39 C0 00 00 */ li r14, 0 -/* 8000325C 39 E0 00 00 */ li r15, 0 -lbl_80003260: -/* 80003260 48 34 31 39 */ bl DBInit -/* 80003264 48 33 6C FD */ bl OSInit -/* 80003268 3C 80 80 00 */ lis r4, 0x8000 /* 0x800030E6@ha */ -/* 8000326C 38 84 30 E6 */ addi r4, r4, 0x30E6 /* 0x800030E6@l */ -/* 80003270 A0 64 00 00 */ lhz r3, 0(r4) -/* 80003274 70 65 80 00 */ andi. r5, r3, 0x8000 -/* 80003278 41 82 00 10 */ beq lbl_80003288 -/* 8000327C 70 63 7F FF */ andi. r3, r3, 0x7fff -/* 80003280 28 03 00 01 */ cmplwi r3, 1 -/* 80003284 40 82 00 08 */ bne lbl_8000328C -lbl_80003288: -/* 80003288 4B FF FE 79 */ bl __check_pad3 -lbl_8000328C: -/* 8000328C 4B FF FE C1 */ bl __get_debug_bba -/* 80003290 28 03 00 01 */ cmplwi r3, 1 -/* 80003294 40 82 00 08 */ bne lbl_8000329C -/* 80003298 48 36 E3 61 */ bl InitMetroTRK_BBA -lbl_8000329C: -/* 8000329C 48 33 F8 DD */ bl __init_user -/* 800032A0 7D C3 73 78 */ mr r3, r14 -/* 800032A4 7D E4 7B 78 */ mr r4, r15 -/* 800032A8 48 00 31 AD */ bl main -/* 800032AC 48 35 F7 20 */ b exit diff --git a/asm/m_Do/m_Do_MemCardRWmng/mDoMemCdRWm_CalcCheckSumGameData__FPvUl.s b/asm/m_Do/m_Do_MemCardRWmng/mDoMemCdRWm_CalcCheckSumGameData__FPvUl.s deleted file mode 100644 index 95a1d84f96d..00000000000 --- a/asm/m_Do/m_Do_MemCardRWmng/mDoMemCdRWm_CalcCheckSumGameData__FPvUl.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80017CB4: -/* 80017CB4 38 C0 00 00 */ li r6, 0 -/* 80017CB8 38 A0 00 00 */ li r5, 0 -/* 80017CBC 7C 89 03 A6 */ mtctr r4 -/* 80017CC0 28 04 00 00 */ cmplwi r4, 0 -/* 80017CC4 40 81 00 1C */ ble lbl_80017CE0 -lbl_80017CC8: -/* 80017CC8 88 03 00 00 */ lbz r0, 0(r3) -/* 80017CCC 7C A5 02 14 */ add r5, r5, r0 -/* 80017CD0 7C 00 00 F8 */ nor r0, r0, r0 -/* 80017CD4 7C C6 02 14 */ add r6, r6, r0 -/* 80017CD8 38 63 00 01 */ addi r3, r3, 1 -/* 80017CDC 42 00 FF EC */ bdnz lbl_80017CC8 -lbl_80017CE0: -/* 80017CE0 7C C4 33 78 */ mr r4, r6 -/* 80017CE4 7C A3 2B 78 */ mr r3, r5 -/* 80017CE8 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_MemCardRWmng/mDoMemCdRWm_CalcCheckSum__FPvUl.s b/asm/m_Do/m_Do_MemCardRWmng/mDoMemCdRWm_CalcCheckSum__FPvUl.s deleted file mode 100644 index cebd60d33fd..00000000000 --- a/asm/m_Do/m_Do_MemCardRWmng/mDoMemCdRWm_CalcCheckSum__FPvUl.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80017C74: -/* 80017C74 38 C0 00 00 */ li r6, 0 -/* 80017C78 38 A0 00 00 */ li r5, 0 -/* 80017C7C 54 80 F8 7E */ srwi r0, r4, 1 -/* 80017C80 7C 09 03 A6 */ mtctr r0 -/* 80017C84 28 00 00 00 */ cmplwi r0, 0 -/* 80017C88 40 81 00 20 */ ble lbl_80017CA8 -lbl_80017C8C: -/* 80017C8C A0 03 00 00 */ lhz r0, 0(r3) -/* 80017C90 7C A5 02 14 */ add r5, r5, r0 -/* 80017C94 7C 00 00 F8 */ nor r0, r0, r0 -/* 80017C98 7C 06 02 14 */ add r0, r6, r0 -/* 80017C9C 54 06 04 3E */ clrlwi r6, r0, 0x10 -/* 80017CA0 38 63 00 02 */ addi r3, r3, 2 -/* 80017CA4 42 00 FF E8 */ bdnz lbl_80017C8C -lbl_80017CA8: -/* 80017CA8 7C C3 33 78 */ mr r3, r6 -/* 80017CAC 50 A3 80 1E */ rlwimi r3, r5, 0x10, 0, 0xf -/* 80017CB0 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_main/LOAD_COPYDATE__FPv.s b/asm/m_Do/m_Do_main/LOAD_COPYDATE__FPv.s deleted file mode 100644 index 54660ed5fbf..00000000000 --- a/asm/m_Do/m_Do_main/LOAD_COPYDATE__FPv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8000614C: -/* 8000614C 54 2B 06 FE */ clrlwi r11, r1, 0x1b -/* 80006150 21 6B FF 80 */ subfic r11, r11, -128 -/* 80006154 7C 2C 0B 78 */ mr r12, r1 -/* 80006158 7C 21 59 6E */ stwux r1, r1, r11 -/* 8000615C 7C 08 02 A6 */ mflr r0 -/* 80006160 90 0C 00 04 */ stw r0, 4(r12) -/* 80006164 3C 60 80 37 */ lis r3, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */ -/* 80006168 38 63 39 A0 */ addi r3, r3, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */ -/* 8000616C 38 63 02 83 */ addi r3, r3, 0x283 -/* 80006170 38 81 00 40 */ addi r4, r1, 0x40 -/* 80006174 48 34 27 1D */ bl DVDOpen -/* 80006178 2C 03 00 00 */ cmpwi r3, 0 -/* 8000617C 41 82 00 38 */ beq lbl_800061B4 -/* 80006180 38 61 00 40 */ addi r3, r1, 0x40 -/* 80006184 38 81 00 20 */ addi r4, r1, 0x20 -/* 80006188 38 A0 00 20 */ li r5, 0x20 -/* 8000618C 38 C0 00 00 */ li r6, 0 -/* 80006190 38 E0 00 02 */ li r7, 2 -/* 80006194 48 34 2C B1 */ bl DVDReadPrio -/* 80006198 3C 60 80 3A */ lis r3, COPYDATE_STRING__7mDoMain@ha /* 0x803A2EE0@ha */ -/* 8000619C 38 63 2E E0 */ addi r3, r3, COPYDATE_STRING__7mDoMain@l /* 0x803A2EE0@l */ -/* 800061A0 38 81 00 20 */ addi r4, r1, 0x20 -/* 800061A4 38 A0 00 11 */ li r5, 0x11 -/* 800061A8 4B FF D3 99 */ bl memcpy -/* 800061AC 38 61 00 40 */ addi r3, r1, 0x40 -/* 800061B0 48 34 27 A9 */ bl DVDClose -lbl_800061B4: -/* 800061B4 81 41 00 00 */ lwz r10, 0(r1) -/* 800061B8 80 0A 00 04 */ lwz r0, 4(r10) -/* 800061BC 7C 08 03 A6 */ mtlr r0 -/* 800061C0 7D 41 53 78 */ mr r1, r10 -/* 800061C4 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_main/main01__Fv.s b/asm/m_Do/m_Do_main/main01__Fv.s deleted file mode 100644 index 6b30e86e9f1..00000000000 --- a/asm/m_Do/m_Do_main/main01__Fv.s +++ /dev/null @@ -1,127 +0,0 @@ -lbl_8000628C: -/* 8000628C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80006290 7C 08 02 A6 */ mflr r0 -/* 80006294 90 01 00 14 */ stw r0, 0x14(r1) -/* 80006298 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8000629C 3C 60 80 3D */ lis r3, RootHeapCheck@ha /* 0x803D32E0@ha */ -/* 800062A0 3B E3 32 E0 */ addi r31, r3, RootHeapCheck@l /* 0x803D32E0@l */ -/* 800062A4 48 00 5A A1 */ bl mDoMch_Create__Fv -/* 800062A8 48 00 4E CD */ bl mDoGph_Create__Fv -/* 800062AC 48 00 16 A9 */ bl create__8mDoCPd_cFv -/* 800062B0 80 8D 8D F8 */ lwz r4, sRootHeap__7JKRHeap(r13) -/* 800062B4 38 7F 00 00 */ addi r3, r31, 0 -/* 800062B8 90 83 00 08 */ stw r4, 8(r3) -/* 800062BC 28 04 00 00 */ cmplwi r4, 0 -/* 800062C0 41 82 00 0C */ beq lbl_800062CC -/* 800062C4 80 04 00 38 */ lwz r0, 0x38(r4) -/* 800062C8 90 03 00 1C */ stw r0, 0x1c(r3) -lbl_800062CC: -/* 800062CC 80 8D 8D F0 */ lwz r4, sSystemHeap__7JKRHeap(r13) -/* 800062D0 38 7F 00 28 */ addi r3, r31, 0x28 -/* 800062D4 90 83 00 08 */ stw r4, 8(r3) -/* 800062D8 28 04 00 00 */ cmplwi r4, 0 -/* 800062DC 41 82 00 0C */ beq lbl_800062E8 -/* 800062E0 80 04 00 38 */ lwz r0, 0x38(r4) -/* 800062E4 90 03 00 1C */ stw r0, 0x1c(r3) -lbl_800062E8: -/* 800062E8 48 00 8A 99 */ bl mDoExt_getZeldaHeap__Fv -/* 800062EC 38 9F 00 50 */ addi r4, r31, 0x50 -/* 800062F0 90 64 00 08 */ stw r3, 8(r4) -/* 800062F4 28 03 00 00 */ cmplwi r3, 0 -/* 800062F8 41 82 00 0C */ beq lbl_80006304 -/* 800062FC 80 03 00 38 */ lwz r0, 0x38(r3) -/* 80006300 90 04 00 1C */ stw r0, 0x1c(r4) -lbl_80006304: -/* 80006304 48 00 8A 4D */ bl mDoExt_getGameHeap__Fv -/* 80006308 38 9F 00 78 */ addi r4, r31, 0x78 -/* 8000630C 90 64 00 08 */ stw r3, 8(r4) -/* 80006310 28 03 00 00 */ cmplwi r3, 0 -/* 80006314 41 82 00 0C */ beq lbl_80006320 -/* 80006318 80 03 00 38 */ lwz r0, 0x38(r3) -/* 8000631C 90 04 00 1C */ stw r0, 0x1c(r4) -lbl_80006320: -/* 80006320 48 00 8A CD */ bl mDoExt_getArchiveHeap__Fv -/* 80006324 38 9F 00 A0 */ addi r4, r31, 0xa0 -/* 80006328 90 64 00 08 */ stw r3, 8(r4) -/* 8000632C 28 03 00 00 */ cmplwi r3, 0 -/* 80006330 41 82 00 0C */ beq lbl_8000633C -/* 80006334 80 03 00 38 */ lwz r0, 0x38(r3) -/* 80006338 90 04 00 1C */ stw r0, 0x1c(r4) -lbl_8000633C: -/* 8000633C 48 00 8A F5 */ bl mDoExt_getJ2dHeap__Fv -/* 80006340 38 9F 00 C8 */ addi r4, r31, 0xc8 -/* 80006344 90 64 00 08 */ stw r3, 8(r4) -/* 80006348 28 03 00 00 */ cmplwi r3, 0 -/* 8000634C 41 82 00 0C */ beq lbl_80006358 -/* 80006350 80 03 00 38 */ lwz r0, 0x38(r3) -/* 80006354 90 04 00 1C */ stw r0, 0x1c(r4) -lbl_80006358: -/* 80006358 48 00 8A E1 */ bl mDoExt_getHostIOHeap__Fv -/* 8000635C 38 9F 00 F0 */ addi r4, r31, 0xf0 -/* 80006360 90 64 00 08 */ stw r3, 8(r4) -/* 80006364 28 03 00 00 */ cmplwi r3, 0 -/* 80006368 41 82 00 0C */ beq lbl_80006374 -/* 8000636C 80 03 00 38 */ lwz r0, 0x38(r3) -/* 80006370 90 04 00 1C */ stw r0, 0x1c(r4) -lbl_80006374: -/* 80006374 48 00 8A 3D */ bl mDoExt_getCommandHeap__Fv -/* 80006378 38 9F 01 18 */ addi r4, r31, 0x118 -/* 8000637C 90 64 00 08 */ stw r3, 8(r4) -/* 80006380 28 03 00 00 */ cmplwi r3, 0 -/* 80006384 41 82 00 0C */ beq lbl_80006390 -/* 80006388 80 03 00 38 */ lwz r0, 0x38(r3) -/* 8000638C 90 04 00 1C */ stw r0, 0x1c(r4) -lbl_80006390: -/* 80006390 80 6D 8C 38 */ lwz r3, systemConsole__9JFWSystem(r13) -/* 80006394 88 0D 80 00 */ lbz r0, developmentMode__7mDoMain(r13) -/* 80006398 7C 00 07 75 */ extsb. r0, r0 -/* 8000639C 38 00 00 00 */ li r0, 0 -/* 800063A0 41 82 00 08 */ beq lbl_800063A8 -/* 800063A4 38 00 00 03 */ li r0, 3 -lbl_800063A8: -/* 800063A8 90 03 00 58 */ stw r0, 0x58(r3) -/* 800063AC 38 00 00 20 */ li r0, 0x20 -/* 800063B0 90 03 00 40 */ stw r0, 0x40(r3) -/* 800063B4 38 00 00 2A */ li r0, 0x2a -/* 800063B8 90 03 00 44 */ stw r0, 0x44(r3) -/* 800063BC 3C 60 80 00 */ lis r3, LOAD_COPYDATE__FPv@ha /* 0x8000614C@ha */ -/* 800063C0 38 63 61 4C */ addi r3, r3, LOAD_COPYDATE__FPv@l /* 0x8000614C@l */ -/* 800063C4 38 80 00 00 */ li r4, 0 -/* 800063C8 48 00 F8 AD */ bl create__20mDoDvdThd_callback_cFPFPv_PvPv -/* 800063CC 48 01 26 D5 */ bl fapGm_Create__Fv -/* 800063D0 48 01 7A 41 */ bl fopAcM_initManager__Fv -/* 800063D4 38 00 00 00 */ li r0, 0 -/* 800063D8 98 0D 85 98 */ stb r0, mDisplayHeapSize(r13) -/* 800063DC 48 01 23 89 */ bl cDyl_InitAsync__Fv -/* 800063E0 3C 60 00 15 */ lis r3, 0x0015 /* 0x0014D800@ha */ -/* 800063E4 38 63 D8 00 */ addi r3, r3, 0xD800 /* 0x0014D800@l */ -/* 800063E8 80 8D 8D F4 */ lwz r4, sCurrentHeap__7JKRHeap(r13) -/* 800063EC 38 A0 00 00 */ li r5, 0 -/* 800063F0 48 2C A6 35 */ bl create__12JKRSolidHeapFUlP7JKRHeapb -/* 800063F4 90 6D 86 3C */ stw r3, g_mDoAud_audioHeap(r13) -/* 800063F8 3C 60 80 3F */ lis r3, g_mDoMemCd_control@ha /* 0x803EAF40@ha */ -/* 800063FC 3B E3 AF 40 */ addi r31, r3, g_mDoMemCd_control@l /* 0x803EAF40@l */ -lbl_80006400: -/* 80006400 80 6D 85 B4 */ lwz r3, frame(r13) -/* 80006404 38 63 00 01 */ addi r3, r3, 1 -/* 80006408 90 6D 85 B4 */ stw r3, frame(r13) -/* 8000640C 88 8D 85 80 */ lbz r4, fillcheck_check_frame(r13) -/* 80006410 28 04 00 00 */ cmplwi r4, 0 -/* 80006414 41 82 00 18 */ beq lbl_8000642C -/* 80006418 7C 03 23 96 */ divwu r0, r3, r4 -/* 8000641C 7C 00 21 D6 */ mullw r0, r0, r4 -/* 80006420 7C 00 18 51 */ subf. r0, r0, r3 -/* 80006424 40 82 00 08 */ bne lbl_8000642C -/* 80006428 48 00 52 41 */ bl mDoMch_HeapCheckAll__Fv -lbl_8000642C: -/* 8000642C 88 0D 87 00 */ lbz r0, SyncWidthSound(r13) -/* 80006430 28 00 00 00 */ cmplwi r0, 0 -/* 80006434 41 82 00 0C */ beq lbl_80006440 -/* 80006438 7F E3 FB 78 */ mr r3, r31 -/* 8000643C 48 01 04 59 */ bl update__15mDoMemCd_Ctrl_cFv -lbl_80006440: -/* 80006440 48 00 16 55 */ bl read__8mDoCPd_cFv -/* 80006444 48 01 26 29 */ bl fapGm_Execute__Fv -/* 80006448 48 00 0D 1D */ bl mDoAud_Execute__Fv -/* 8000644C 4B FF FD 7D */ bl debug__Fv -/* 80006450 4B FF FF B0 */ b lbl_80006400 diff --git a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/__dt__10daSkip2D_cFv.s b/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/__dt__10daSkip2D_cFv.s deleted file mode 100644 index 04a6dd661d1..00000000000 --- a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/__dt__10daSkip2D_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80D4D674: -/* 80D4D674 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D4D678 7C 08 02 A6 */ mflr r0 -/* 80D4D67C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D4D680 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D4D684 93 C1 00 08 */ stw r30, 8(r1) -/* 80D4D688 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80D4D68C 7C 9F 23 78 */ mr r31, r4 -/* 80D4D690 41 82 00 28 */ beq lbl_80D4D6B8 -/* 80D4D694 3C 80 80 D5 */ lis r4, __vt__10daSkip2D_c@ha /* 0x80D4D72C@ha */ -/* 80D4D698 38 04 D7 2C */ addi r0, r4, __vt__10daSkip2D_c@l /* 0x80D4D72C@l */ -/* 80D4D69C 90 1E 05 68 */ stw r0, 0x568(r30) -/* 80D4D6A0 38 80 00 00 */ li r4, 0 -/* 80D4D6A4 4B 2C B5 E9 */ bl __dt__10fopAc_ac_cFv -/* 80D4D6A8 7F E0 07 35 */ extsh. r0, r31 -/* 80D4D6AC 40 81 00 0C */ ble lbl_80D4D6B8 -/* 80D4D6B0 7F C3 F3 78 */ mr r3, r30 -/* 80D4D6B4 4B 58 16 89 */ bl __dl__FPv -lbl_80D4D6B8: -/* 80D4D6B8 7F C3 F3 78 */ mr r3, r30 -/* 80D4D6BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D4D6C0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D4D6C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D4D6C8 7C 08 03 A6 */ mtlr r0 -/* 80D4D6CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D4D6D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/createHeap__10daSkip2D_cFv.s b/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/createHeap__10daSkip2D_cFv.s deleted file mode 100644 index 42d83d4c434..00000000000 --- a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/createHeap__10daSkip2D_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80D4D498: -/* 80D4D498 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D4D49C 7C 08 02 A6 */ mflr r0 -/* 80D4D4A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D4D4A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D4D4A8 7C 7F 1B 78 */ mr r31, r3 -/* 80D4D4AC 38 60 06 30 */ li r3, 0x630 -/* 80D4D4B0 4B 58 17 9D */ bl __nw__FUl -/* 80D4D4B4 7C 60 1B 79 */ or. r0, r3, r3 -/* 80D4D4B8 41 82 00 0C */ beq lbl_80D4D4C4 -/* 80D4D4BC 4B 4B 3E 6D */ bl __ct__14dMeterButton_cFv -/* 80D4D4C0 7C 60 1B 78 */ mr r0, r3 -lbl_80D4D4C4: -/* 80D4D4C4 90 1F 05 70 */ stw r0, 0x570(r31) -/* 80D4D4C8 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 80D4D4CC 28 00 00 00 */ cmplwi r0, 0 -/* 80D4D4D0 40 82 00 0C */ bne lbl_80D4D4DC -/* 80D4D4D4 38 60 00 00 */ li r3, 0 -/* 80D4D4D8 48 00 00 08 */ b lbl_80D4D4E0 -lbl_80D4D4DC: -/* 80D4D4DC 38 60 00 01 */ li r3, 1 -lbl_80D4D4E0: -/* 80D4D4E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D4D4E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D4D4E8 7C 08 03 A6 */ mtlr r0 -/* 80D4D4EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D4D4F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/create__10daSkip2D_cFv.s b/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/create__10daSkip2D_cFv.s deleted file mode 100644 index 840d3cc04a9..00000000000 --- a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/create__10daSkip2D_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80D4D4F4: -/* 80D4D4F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D4D4F8 7C 08 02 A6 */ mflr r0 -/* 80D4D4FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D4D500 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D4D504 93 C1 00 08 */ stw r30, 8(r1) -/* 80D4D508 7C 7F 1B 78 */ mr r31, r3 -/* 80D4D50C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D4D510 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D4D514 40 82 00 34 */ bne lbl_80D4D548 -/* 80D4D518 7F E0 FB 79 */ or. r0, r31, r31 -/* 80D4D51C 41 82 00 20 */ beq lbl_80D4D53C -/* 80D4D520 7C 1E 03 78 */ mr r30, r0 -/* 80D4D524 4B 2C B6 41 */ bl __ct__10fopAc_ac_cFv -/* 80D4D528 3C 60 80 D5 */ lis r3, __vt__10daSkip2D_c@ha /* 0x80D4D72C@ha */ -/* 80D4D52C 38 03 D7 2C */ addi r0, r3, __vt__10daSkip2D_c@l /* 0x80D4D72C@l */ -/* 80D4D530 90 1E 05 68 */ stw r0, 0x568(r30) -/* 80D4D534 7F C3 F3 78 */ mr r3, r30 -/* 80D4D538 48 00 00 A1 */ bl initiate__10daSkip2D_cFv -lbl_80D4D53C: -/* 80D4D53C 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80D4D540 60 00 00 08 */ ori r0, r0, 8 -/* 80D4D544 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80D4D548: -/* 80D4D548 7F E3 FB 78 */ mr r3, r31 -/* 80D4D54C 3C 80 80 D5 */ lis r4, daSkip2D_createHeap__FP10fopAc_ac_c@ha /* 0x80D4D478@ha */ -/* 80D4D550 38 84 D4 78 */ addi r4, r4, daSkip2D_createHeap__FP10fopAc_ac_c@l /* 0x80D4D478@l */ -/* 80D4D554 38 A0 00 00 */ li r5, 0 -/* 80D4D558 4B 2C CF 59 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80D4D55C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D4D560 40 82 00 0C */ bne lbl_80D4D56C -/* 80D4D564 38 60 00 05 */ li r3, 5 -/* 80D4D568 48 00 00 08 */ b lbl_80D4D570 -lbl_80D4D56C: -/* 80D4D56C 38 60 00 04 */ li r3, 4 -lbl_80D4D570: -/* 80D4D570 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D4D574 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D4D578 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D4D57C 7C 08 03 A6 */ mtlr r0 -/* 80D4D580 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D4D584 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Create__FPv.s b/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Create__FPv.s deleted file mode 100644 index 2945fe8ad31..00000000000 --- a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Create__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D4D5EC: -/* 80D4D5EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D4D5F0 7C 08 02 A6 */ mflr r0 -/* 80D4D5F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D4D5F8 4B FF FE FD */ bl create__10daSkip2D_cFv -/* 80D4D5FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D4D600 7C 08 03 A6 */ mtlr r0 -/* 80D4D604 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D4D608 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Delete__FPv.s b/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Delete__FPv.s deleted file mode 100644 index 42fedaa2e18..00000000000 --- a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Delete__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D4D60C: -/* 80D4D60C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D4D610 7C 08 02 A6 */ mflr r0 -/* 80D4D614 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D4D618 4B FF FF 71 */ bl destroy__10daSkip2D_cFv -/* 80D4D61C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D4D620 7C 08 03 A6 */ mtlr r0 -/* 80D4D624 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D4D628 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Draw__FPv.s b/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Draw__FPv.s deleted file mode 100644 index 47e194fc9f4..00000000000 --- a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Draw__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D4D64C: -/* 80D4D64C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D4D650 7C 08 02 A6 */ mflr r0 -/* 80D4D654 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D4D658 4B FF FF 39 */ bl draw__10daSkip2D_cFv -/* 80D4D65C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D4D660 7C 08 03 A6 */ mtlr r0 -/* 80D4D664 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D4D668 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Execute__FPv.s b/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Execute__FPv.s deleted file mode 100644 index 2ddd56d549b..00000000000 --- a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Execute__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D4D62C: -/* 80D4D62C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D4D630 7C 08 02 A6 */ mflr r0 -/* 80D4D634 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D4D638 4B FF FF 99 */ bl execute__10daSkip2D_cFv -/* 80D4D63C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D4D640 7C 08 03 A6 */ mtlr r0 -/* 80D4D644 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D4D648 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_createHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_createHeap__FP10fopAc_ac_c.s deleted file mode 100644 index a4dc0746a16..00000000000 --- a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_createHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D4D478: -/* 80D4D478 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D4D47C 7C 08 02 A6 */ mflr r0 -/* 80D4D480 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D4D484 48 00 00 15 */ bl createHeap__10daSkip2D_cFv -/* 80D4D488 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D4D48C 7C 08 03 A6 */ mtlr r0 -/* 80D4D490 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D4D494 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/draw__10daSkip2D_cFv.s b/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/draw__10daSkip2D_cFv.s deleted file mode 100644 index e29d5f42b66..00000000000 --- a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/draw__10daSkip2D_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80D4D590: -/* 80D4D590 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D4D594 7C 08 02 A6 */ mflr r0 -/* 80D4D598 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D4D59C 7C 66 1B 78 */ mr r6, r3 -/* 80D4D5A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D4D5A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D4D5A8 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 80D4D5AC 38 83 00 AC */ addi r4, r3, 0xac -/* 80D4D5B0 38 A3 00 B0 */ addi r5, r3, 0xb0 -/* 80D4D5B4 38 C6 05 70 */ addi r6, r6, 0x570 -/* 80D4D5B8 4B 30 91 DD */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 80D4D5BC 38 60 00 01 */ li r3, 1 -/* 80D4D5C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D4D5C4 7C 08 03 A6 */ mtlr r0 -/* 80D4D5C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D4D5CC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/initiate__10daSkip2D_cFv.s b/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/initiate__10daSkip2D_cFv.s deleted file mode 100644 index 6676c6cc9f9..00000000000 --- a/asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/initiate__10daSkip2D_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80D4D5D8: -/* 80D4D5D8 38 00 00 00 */ li r0, 0 -/* 80D4D5DC 90 03 05 6C */ stw r0, 0x56c(r3) -/* 80D4D5E0 90 03 05 70 */ stw r0, 0x570(r3) -/* 80D4D5E4 98 03 05 74 */ stb r0, 0x574(r3) -/* 80D4D5E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/__dt__12daTagHinit_cFv.s b/asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/__dt__12daTagHinit_cFv.s deleted file mode 100644 index 1dcb16c5967..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/__dt__12daTagHinit_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_805A3820: -/* 805A3820 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A3824 7C 08 02 A6 */ mflr r0 -/* 805A3828 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A382C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A3830 93 C1 00 08 */ stw r30, 8(r1) -/* 805A3834 7C 7E 1B 79 */ or. r30, r3, r3 -/* 805A3838 7C 9F 23 78 */ mr r31, r4 -/* 805A383C 41 82 00 1C */ beq lbl_805A3858 -/* 805A3840 38 80 00 00 */ li r4, 0 -/* 805A3844 4B A7 54 49 */ bl __dt__10fopAc_ac_cFv -/* 805A3848 7F E0 07 35 */ extsh. r0, r31 -/* 805A384C 40 81 00 0C */ ble lbl_805A3858 -/* 805A3850 7F C3 F3 78 */ mr r3, r30 -/* 805A3854 4B D2 B4 E9 */ bl __dl__FPv -lbl_805A3858: -/* 805A3858 7F C3 F3 78 */ mr r3, r30 -/* 805A385C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A3860 83 C1 00 08 */ lwz r30, 8(r1) -/* 805A3864 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A3868 7C 08 03 A6 */ mtlr r0 -/* 805A386C 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A3870 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/create__12daTagHinit_cFv.s b/asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/create__12daTagHinit_cFv.s deleted file mode 100644 index 03b4a642298..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/create__12daTagHinit_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_805A3758: -/* 805A3758 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A375C 7C 08 02 A6 */ mflr r0 -/* 805A3760 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A3764 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A3768 7C 7F 1B 78 */ mr r31, r3 -/* 805A376C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 805A3770 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 805A3774 40 82 00 1C */ bne lbl_805A3790 -/* 805A3778 28 1F 00 00 */ cmplwi r31, 0 -/* 805A377C 41 82 00 08 */ beq lbl_805A3784 -/* 805A3780 4B A7 53 E5 */ bl __ct__10fopAc_ac_cFv -lbl_805A3784: -/* 805A3784 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 805A3788 60 00 00 08 */ ori r0, r0, 8 -/* 805A378C 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_805A3790: -/* 805A3790 A8 1F 04 E4 */ lha r0, 0x4e4(r31) -/* 805A3794 98 1F 05 69 */ stb r0, 0x569(r31) -/* 805A3798 88 9F 05 69 */ lbz r4, 0x569(r31) -/* 805A379C 28 04 00 FF */ cmplwi r4, 0xff -/* 805A37A0 41 82 00 28 */ beq lbl_805A37C8 -/* 805A37A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A37A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A37AC 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 805A37B0 7C 05 07 74 */ extsb r5, r0 -/* 805A37B4 4B A9 1B AD */ bl isSwitch__10dSv_info_cCFii -/* 805A37B8 2C 03 00 00 */ cmpwi r3, 0 -/* 805A37BC 41 82 00 0C */ beq lbl_805A37C8 -/* 805A37C0 38 60 00 05 */ li r3, 5 -/* 805A37C4 48 00 00 28 */ b lbl_805A37EC -lbl_805A37C8: -/* 805A37C8 A8 1F 04 E4 */ lha r0, 0x4e4(r31) -/* 805A37CC 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 805A37D0 98 1F 05 68 */ stb r0, 0x568(r31) -/* 805A37D4 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 805A37D8 B0 1F 05 6C */ sth r0, 0x56c(r31) -/* 805A37DC 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 805A37E0 54 00 84 3E */ srwi r0, r0, 0x10 -/* 805A37E4 B0 1F 05 6E */ sth r0, 0x56e(r31) -/* 805A37E8 38 60 00 04 */ li r3, 4 -lbl_805A37EC: -/* 805A37EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A37F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A37F4 7C 08 03 A6 */ mtlr r0 -/* 805A37F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A37FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/daTagHinit_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/daTagHinit_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 92ac59ea645..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/daTagHinit_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_805A3800: -/* 805A3800 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A3804 7C 08 02 A6 */ mflr r0 -/* 805A3808 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A380C 4B FF FF 4D */ bl create__12daTagHinit_cFv -/* 805A3810 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A3814 7C 08 03 A6 */ mtlr r0 -/* 805A3818 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A381C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/daTagHinit_Delete__FP12daTagHinit_c.s b/asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/daTagHinit_Delete__FP12daTagHinit_c.s deleted file mode 100644 index a9642d8d562..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/daTagHinit_Delete__FP12daTagHinit_c.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_805A3874: -/* 805A3874 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A3878 7C 08 02 A6 */ mflr r0 -/* 805A387C 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A3880 38 80 FF FF */ li r4, -1 -/* 805A3884 4B FF FF 9D */ bl __dt__12daTagHinit_cFv -/* 805A3888 38 60 00 01 */ li r3, 1 -/* 805A388C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A3890 7C 08 03 A6 */ mtlr r0 -/* 805A3894 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A3898 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/daTagHinit_Execute__FP12daTagHinit_c.s b/asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/daTagHinit_Execute__FP12daTagHinit_c.s deleted file mode 100644 index 6a263113e7e..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/daTagHinit_Execute__FP12daTagHinit_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_805A39B8: -/* 805A39B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A39BC 7C 08 02 A6 */ mflr r0 -/* 805A39C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A39C4 4B FF FE D9 */ bl execute__12daTagHinit_cFv -/* 805A39C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A39CC 7C 08 03 A6 */ mtlr r0 -/* 805A39D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A39D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/execute__12daTagHinit_cFv.s b/asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/execute__12daTagHinit_cFv.s deleted file mode 100644 index 544fad71a3b..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/execute__12daTagHinit_cFv.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_805A389C: -/* 805A389C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A38A0 7C 08 02 A6 */ mflr r0 -/* 805A38A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A38A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A38AC 93 C1 00 08 */ stw r30, 8(r1) -/* 805A38B0 7C 7F 1B 78 */ mr r31, r3 -/* 805A38B4 A0 03 05 6C */ lhz r0, 0x56c(r3) -/* 805A38B8 28 00 FF FF */ cmplwi r0, 0xffff -/* 805A38BC 41 82 00 2C */ beq lbl_805A38E8 -/* 805A38C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A38C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A38C8 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 805A38CC 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 805A38D0 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 805A38D4 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 805A38D8 7C 84 02 2E */ lhzx r4, r4, r0 -/* 805A38DC 4B A9 10 E1 */ bl isEventBit__11dSv_event_cCFUs -/* 805A38E0 2C 03 00 00 */ cmpwi r3, 0 -/* 805A38E4 41 82 00 B8 */ beq lbl_805A399C -lbl_805A38E8: -/* 805A38E8 A0 1F 05 6E */ lhz r0, 0x56e(r31) -/* 805A38EC 28 00 FF FF */ cmplwi r0, 0xffff -/* 805A38F0 41 82 00 2C */ beq lbl_805A391C -/* 805A38F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A38F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A38FC 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 805A3900 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 805A3904 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 805A3908 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 805A390C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 805A3910 4B A9 10 AD */ bl isEventBit__11dSv_event_cCFUs -/* 805A3914 2C 03 00 00 */ cmpwi r3, 0 -/* 805A3918 40 82 00 84 */ bne lbl_805A399C -lbl_805A391C: -/* 805A391C 88 9F 05 68 */ lbz r4, 0x568(r31) -/* 805A3920 28 04 00 FF */ cmplwi r4, 0xff -/* 805A3924 41 82 00 20 */ beq lbl_805A3944 -/* 805A3928 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A392C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A3930 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 805A3934 7C 05 07 74 */ extsb r5, r0 -/* 805A3938 4B A9 1A 29 */ bl isSwitch__10dSv_info_cCFii -/* 805A393C 2C 03 00 00 */ cmpwi r3, 0 -/* 805A3940 41 82 00 5C */ beq lbl_805A399C -lbl_805A3944: -/* 805A3944 88 9F 05 69 */ lbz r4, 0x569(r31) -/* 805A3948 28 04 00 FF */ cmplwi r4, 0xff -/* 805A394C 41 82 00 18 */ beq lbl_805A3964 -/* 805A3950 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A3954 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A3958 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 805A395C 7C 05 07 74 */ extsb r5, r0 -/* 805A3960 4B A9 18 A1 */ bl onSwitch__10dSv_info_cFii -lbl_805A3964: -/* 805A3964 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A3968 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A396C 83 C3 5D B8 */ lwz r30, 0x5db8(r3) -/* 805A3970 7F C3 F3 78 */ mr r3, r30 -/* 805A3974 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 805A3978 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 805A397C 39 9E 18 E0 */ addi r12, r30, 0x18e0 -/* 805A3980 4B DB E7 05 */ bl __ptmf_scall -/* 805A3984 60 00 00 00 */ nop -/* 805A3988 80 1E 17 44 */ lwz r0, 0x1744(r30) -/* 805A398C 54 00 06 6E */ rlwinm r0, r0, 0, 0x19, 0x17 -/* 805A3990 90 1E 17 44 */ stw r0, 0x1744(r30) -/* 805A3994 7F E3 FB 78 */ mr r3, r31 -/* 805A3998 4B A7 62 E5 */ bl fopAcM_delete__FP10fopAc_ac_c -lbl_805A399C: -/* 805A399C 38 60 00 01 */ li r3, 1 -/* 805A39A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A39A4 83 C1 00 08 */ lwz r30, 8(r1) -/* 805A39A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A39AC 7C 08 03 A6 */ mtlr r0 -/* 805A39B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A39B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/Create__14daTagRestart_cFv.s b/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/Create__14daTagRestart_cFv.s deleted file mode 100644 index 4dc7e407fae..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/Create__14daTagRestart_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80D603F8: -/* 80D603F8 3C 80 80 D6 */ lis r4, lit_3650@ha /* 0x80D607B4@ha */ -/* 80D603FC 38 84 07 B4 */ addi r4, r4, lit_3650@l /* 0x80D607B4@l */ -/* 80D60400 C0 44 00 00 */ lfs f2, 0(r4) -/* 80D60404 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80D60408 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80D6040C D0 03 05 6C */ stfs f0, 0x56c(r3) -/* 80D60410 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80D60414 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80D60418 D0 03 05 74 */ stfs f0, 0x574(r3) -/* 80D6041C C0 24 00 04 */ lfs f1, 4(r4) -/* 80D60420 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80D60424 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80D60428 D0 03 05 78 */ stfs f0, 0x578(r3) -/* 80D6042C C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80D60430 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80D60434 D0 03 05 80 */ stfs f0, 0x580(r3) -/* 80D60438 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80D6043C EC 01 00 32 */ fmuls f0, f1, f0 -/* 80D60440 D0 03 05 84 */ stfs f0, 0x584(r3) -/* 80D60444 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80D60448 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80D6044C D0 03 05 8C */ stfs f0, 0x58c(r3) -/* 80D60450 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80D60454 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80D60458 D0 03 05 90 */ stfs f0, 0x590(r3) -/* 80D6045C C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80D60460 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80D60464 D0 03 05 98 */ stfs f0, 0x598(r3) -/* 80D60468 C0 04 00 08 */ lfs f0, 8(r4) -/* 80D6046C D0 03 05 94 */ stfs f0, 0x594(r3) -/* 80D60470 D0 03 05 88 */ stfs f0, 0x588(r3) -/* 80D60474 D0 03 05 7C */ stfs f0, 0x57c(r3) -/* 80D60478 D0 03 05 70 */ stfs f0, 0x570(r3) -/* 80D6047C 38 00 FF FF */ li r0, -1 -/* 80D60480 98 03 05 68 */ stb r0, 0x568(r3) -/* 80D60484 38 60 00 01 */ li r3, 1 -/* 80D60488 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/daTagRestart_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/daTagRestart_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 6af6f46bde6..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/daTagRestart_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D6078C: -/* 80D6078C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D60790 7C 08 02 A6 */ mflr r0 -/* 80D60794 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D60798 4B FF FC F5 */ bl create__14daTagRestart_cFv -/* 80D6079C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D607A0 7C 08 03 A6 */ mtlr r0 -/* 80D607A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D607A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/daTagRestart_Delete__FP14daTagRestart_c.s b/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/daTagRestart_Delete__FP14daTagRestart_c.s deleted file mode 100644 index 05df477073e..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/daTagRestart_Delete__FP14daTagRestart_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D6076C: -/* 80D6076C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D60770 7C 08 02 A6 */ mflr r0 -/* 80D60774 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D60778 4B FF FF CD */ bl _delete__14daTagRestart_cFv -/* 80D6077C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D60780 7C 08 03 A6 */ mtlr r0 -/* 80D60784 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D60788 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/daTagRestart_Execute__FP14daTagRestart_c.s b/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/daTagRestart_Execute__FP14daTagRestart_c.s deleted file mode 100644 index 8c8622b68a8..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/daTagRestart_Execute__FP14daTagRestart_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D6074C: -/* 80D6074C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D60750 7C 08 02 A6 */ mflr r0 -/* 80D60754 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D60758 4B FF FE 09 */ bl execute__14daTagRestart_cFv -/* 80D6075C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D60760 7C 08 03 A6 */ mtlr r0 -/* 80D60764 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D60768 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/execute__14daTagRestart_cFv.s b/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/execute__14daTagRestart_cFv.s deleted file mode 100644 index 071ca40fa9c..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/execute__14daTagRestart_cFv.s +++ /dev/null @@ -1,126 +0,0 @@ -lbl_80D60560: -/* 80D60560 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80D60564 7C 08 02 A6 */ mflr r0 -/* 80D60568 90 01 00 54 */ stw r0, 0x54(r1) -/* 80D6056C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80D60570 4B 60 1C 69 */ bl _savegpr_28 -/* 80D60574 7C 7D 1B 78 */ mr r29, r3 -/* 80D60578 3C 60 80 D6 */ lis r3, lit_3650@ha /* 0x80D607B4@ha */ -/* 80D6057C 3B E3 07 B4 */ addi r31, r3, lit_3650@l /* 0x80D607B4@l */ -/* 80D60580 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D60584 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D60588 83 C3 5D AC */ lwz r30, 0x5dac(r3) -/* 80D6058C C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80D60590 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80D60594 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80D60598 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80D6059C C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80D605A0 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80D605A4 38 61 00 2C */ addi r3, r1, 0x2c -/* 80D605A8 38 9D 04 A8 */ addi r4, r29, 0x4a8 -/* 80D605AC 7C 65 1B 78 */ mr r5, r3 -/* 80D605B0 4B 5E 6B 05 */ bl PSVECSubtract -/* 80D605B4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D605B8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D605BC A8 1D 04 DE */ lha r0, 0x4de(r29) -/* 80D605C0 7C 00 00 D0 */ neg r0, r0 -/* 80D605C4 7C 04 07 34 */ extsh r4, r0 -/* 80D605C8 4B 2A BE 15 */ bl mDoMtx_YrotS__FPA4_fs -/* 80D605CC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D605D0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D605D4 38 81 00 2C */ addi r4, r1, 0x2c -/* 80D605D8 7C 85 23 78 */ mr r5, r4 -/* 80D605DC 4B 5E 67 91 */ bl PSMTXMultVec -/* 80D605E0 C0 1D 05 6C */ lfs f0, 0x56c(r29) -/* 80D605E4 C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 80D605E8 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80D605EC 40 80 01 34 */ bge lbl_80D60720 -/* 80D605F0 C0 1D 05 74 */ lfs f0, 0x574(r29) -/* 80D605F4 C0 41 00 34 */ lfs f2, 0x34(r1) -/* 80D605F8 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 80D605FC 40 80 01 24 */ bge lbl_80D60720 -/* 80D60600 C0 1D 05 84 */ lfs f0, 0x584(r29) -/* 80D60604 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80D60608 40 81 01 18 */ ble lbl_80D60720 -/* 80D6060C C0 1D 05 8C */ lfs f0, 0x58c(r29) -/* 80D60610 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 80D60614 40 81 01 0C */ ble lbl_80D60720 -/* 80D60618 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 80D6061C 38 63 0D 64 */ addi r3, r3, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ -/* 80D60620 88 63 00 00 */ lbz r3, 0(r3) -/* 80D60624 7C 63 07 74 */ extsb r3, r3 -/* 80D60628 88 1D 05 68 */ lbz r0, 0x568(r29) -/* 80D6062C 7C 00 07 74 */ extsb r0, r0 -/* 80D60630 7C 03 00 00 */ cmpw r3, r0 -/* 80D60634 41 82 00 EC */ beq lbl_80D60720 -/* 80D60638 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80D6063C 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80D60640 7C 03 00 00 */ cmpw r3, r0 -/* 80D60644 40 82 00 20 */ bne lbl_80D60664 -/* 80D60648 AB 9D 04 B6 */ lha r28, 0x4b6(r29) -/* 80D6064C C0 1F 00 08 */ lfs f0, 8(r31) -/* 80D60650 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80D60654 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80D60658 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80D6065C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80D60660 48 00 00 28 */ b lbl_80D60688 -lbl_80D60664: -/* 80D60664 A8 7D 04 B6 */ lha r3, 0x4b6(r29) -/* 80D60668 3C 63 00 01 */ addis r3, r3, 1 -/* 80D6066C 38 03 80 00 */ addi r0, r3, -32768 -/* 80D60670 7C 1C 07 34 */ extsh r28, r0 -/* 80D60674 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80D60678 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80D6067C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80D60680 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80D60684 D0 01 00 28 */ stfs f0, 0x28(r1) -lbl_80D60688: -/* 80D60688 C0 21 00 24 */ lfs f1, 0x24(r1) -/* 80D6068C C0 1F 00 04 */ lfs f0, 4(r31) -/* 80D60690 EC 01 00 2A */ fadds f0, f1, f0 -/* 80D60694 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80D60698 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D6069C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D606A0 A8 9D 04 B6 */ lha r4, 0x4b6(r29) -/* 80D606A4 4B 2A BD 39 */ bl mDoMtx_YrotS__FPA4_fs -/* 80D606A8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D606AC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D606B0 38 81 00 20 */ addi r4, r1, 0x20 -/* 80D606B4 7C 85 23 78 */ mr r5, r4 -/* 80D606B8 4B 5E 66 B5 */ bl PSMTXMultVec -/* 80D606BC 38 61 00 08 */ addi r3, r1, 8 -/* 80D606C0 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80D606C4 38 A1 00 20 */ addi r5, r1, 0x20 -/* 80D606C8 4B 50 64 1D */ bl __pl__4cXyzCFRC3Vec -/* 80D606CC C0 01 00 08 */ lfs f0, 8(r1) -/* 80D606D0 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80D606D4 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80D606D8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80D606DC C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80D606E0 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80D606E4 38 61 00 14 */ addi r3, r1, 0x14 -/* 80D606E8 4B 2B D5 D5 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz -/* 80D606EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D606F0 41 82 00 10 */ beq lbl_80D60700 -/* 80D606F4 3C 60 80 45 */ lis r3, mGroundY__11fopAcM_gc_c@ha /* 0x80450CD0@ha */ -/* 80D606F8 C0 03 0C D0 */ lfs f0, mGroundY__11fopAcM_gc_c@l(r3) /* 0x80450CD0@l */ -/* 80D606FC D0 01 00 18 */ stfs f0, 0x18(r1) -lbl_80D60700: -/* 80D60700 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80D60704 7C 06 07 74 */ extsb r6, r0 -/* 80D60708 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D6070C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D60710 38 63 0D B4 */ addi r3, r3, 0xdb4 -/* 80D60714 38 81 00 14 */ addi r4, r1, 0x14 -/* 80D60718 7F 85 E3 78 */ mr r5, r28 -/* 80D6071C 4B 2D 48 65 */ bl setRoom__13dSv_restart_cFRC4cXyzsSc -lbl_80D60720: -/* 80D60720 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80D60724 98 1D 05 68 */ stb r0, 0x568(r29) -/* 80D60728 38 60 00 01 */ li r3, 1 -/* 80D6072C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80D60730 4B 60 1A F5 */ bl _restgpr_28 -/* 80D60734 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80D60738 7C 08 03 A6 */ mtlr r0 -/* 80D6073C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80D60740 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/func_80D6048C.s b/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/func_80D6048C.s deleted file mode 100644 index 31d3b0c50e8..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/func_80D6048C.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80D6048C: -/* 80D6048C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D60490 7C 08 02 A6 */ mflr r0 -/* 80D60494 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D60498 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D6049C 93 C1 00 08 */ stw r30, 8(r1) -/* 80D604A0 7C 7F 1B 78 */ mr r31, r3 -/* 80D604A4 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D604A8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D604AC 40 82 00 40 */ bne lbl_80D604EC -/* 80D604B0 7F E0 FB 79 */ or. r0, r31, r31 -/* 80D604B4 41 82 00 2C */ beq lbl_80D604E0 -/* 80D604B8 7C 1E 03 78 */ mr r30, r0 -/* 80D604BC 4B 2B 86 A9 */ bl __ct__10fopAc_ac_cFv -/* 80D604C0 38 7E 05 6C */ addi r3, r30, 0x56c -/* 80D604C4 3C 80 80 D6 */ lis r4, __ct__4cXyzFv@ha /* 0x80D6055C@ha */ -/* 80D604C8 38 84 05 5C */ addi r4, r4, __ct__4cXyzFv@l /* 0x80D6055C@l */ -/* 80D604CC 3C A0 80 D6 */ lis r5, __dt__4cXyzFv@ha /* 0x80D60520@ha */ -/* 80D604D0 38 A5 05 20 */ addi r5, r5, __dt__4cXyzFv@l /* 0x80D60520@l */ -/* 80D604D4 38 C0 00 0C */ li r6, 0xc -/* 80D604D8 38 E0 00 04 */ li r7, 4 -/* 80D604DC 4B 60 18 85 */ bl __construct_array -lbl_80D604E0: -/* 80D604E0 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80D604E4 60 00 00 08 */ ori r0, r0, 8 -/* 80D604E8 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80D604EC: -/* 80D604EC 7F E3 FB 78 */ mr r3, r31 -/* 80D604F0 4B FF FF 09 */ bl Create__14daTagRestart_cFv -/* 80D604F4 2C 03 00 00 */ cmpwi r3, 0 -/* 80D604F8 40 82 00 0C */ bne lbl_80D60504 -/* 80D604FC 38 60 00 05 */ li r3, 5 -/* 80D60500 48 00 00 08 */ b lbl_80D60508 -lbl_80D60504: -/* 80D60504 38 60 00 04 */ li r3, 4 -lbl_80D60508: -/* 80D60508 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D6050C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D60510 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D60514 7C 08 03 A6 */ mtlr r0 -/* 80D60518 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D6051C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/__ct__13daTagWrHowl_cFv.s b/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/__ct__13daTagWrHowl_cFv.s deleted file mode 100644 index 782cf470108..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/__ct__13daTagWrHowl_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80D63F38: -/* 80D63F38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D63F3C 7C 08 02 A6 */ mflr r0 -/* 80D63F40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D63F44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D63F48 7C 7F 1B 78 */ mr r31, r3 -/* 80D63F4C 4B 2B 4C 19 */ bl __ct__10fopAc_ac_cFv -/* 80D63F50 3C 60 80 D6 */ lis r3, __vt__13daTagWrHowl_c@ha /* 0x80D64254@ha */ -/* 80D63F54 38 03 42 54 */ addi r0, r3, __vt__13daTagWrHowl_c@l /* 0x80D64254@l */ -/* 80D63F58 90 1F 05 68 */ stw r0, 0x568(r31) -/* 80D63F5C 7F E3 FB 78 */ mr r3, r31 -/* 80D63F60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D63F64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D63F68 7C 08 03 A6 */ mtlr r0 -/* 80D63F6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D63F70 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/__dt__13daTagWrHowl_cFv.s b/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/__dt__13daTagWrHowl_cFv.s deleted file mode 100644 index fe5110731c7..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/__dt__13daTagWrHowl_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80D63F74: -/* 80D63F74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D63F78 7C 08 02 A6 */ mflr r0 -/* 80D63F7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D63F80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D63F84 93 C1 00 08 */ stw r30, 8(r1) -/* 80D63F88 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80D63F8C 7C 9F 23 78 */ mr r31, r4 -/* 80D63F90 41 82 00 28 */ beq lbl_80D63FB8 -/* 80D63F94 3C 80 80 D6 */ lis r4, __vt__13daTagWrHowl_c@ha /* 0x80D64254@ha */ -/* 80D63F98 38 04 42 54 */ addi r0, r4, __vt__13daTagWrHowl_c@l /* 0x80D64254@l */ -/* 80D63F9C 90 1E 05 68 */ stw r0, 0x568(r30) -/* 80D63FA0 38 80 00 00 */ li r4, 0 -/* 80D63FA4 4B 2B 4C E9 */ bl __dt__10fopAc_ac_cFv -/* 80D63FA8 7F E0 07 35 */ extsh. r0, r31 -/* 80D63FAC 40 81 00 0C */ ble lbl_80D63FB8 -/* 80D63FB0 7F C3 F3 78 */ mr r3, r30 -/* 80D63FB4 4B 56 AD 89 */ bl __dl__FPv -lbl_80D63FB8: -/* 80D63FB8 7F C3 F3 78 */ mr r3, r30 -/* 80D63FBC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D63FC0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D63FC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D63FC8 7C 08 03 A6 */ mtlr r0 -/* 80D63FCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D63FD0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/chkWlfInTag__13daTagWrHowl_cFv.s b/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/chkWlfInTag__13daTagWrHowl_cFv.s deleted file mode 100644 index dcf2fd76c94..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/chkWlfInTag__13daTagWrHowl_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80D640B4: -/* 80D640B4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D640B8 7C 08 02 A6 */ mflr r0 -/* 80D640BC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D640C0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80D640C4 7C 7F 1B 78 */ mr r31, r3 -/* 80D640C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D640CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D640D0 80 83 5D AC */ lwz r4, 0x5dac(r3) -/* 80D640D4 28 04 00 00 */ cmplwi r4, 0 -/* 80D640D8 40 82 00 0C */ bne lbl_80D640E4 -/* 80D640DC 38 60 00 00 */ li r3, 0 -/* 80D640E0 48 00 00 50 */ b lbl_80D64130 -lbl_80D640E4: -/* 80D640E4 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80D640E8 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80D640EC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80D640F0 41 82 00 3C */ beq lbl_80D6412C -/* 80D640F4 C0 04 04 D0 */ lfs f0, 0x4d0(r4) -/* 80D640F8 D0 01 00 08 */ stfs f0, 8(r1) -/* 80D640FC C0 04 04 D4 */ lfs f0, 0x4d4(r4) -/* 80D64100 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80D64104 C0 04 04 D8 */ lfs f0, 0x4d8(r4) -/* 80D64108 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80D6410C 38 61 00 08 */ addi r3, r1, 8 -/* 80D64110 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80D64114 4B 5E 32 89 */ bl PSVECSquareDistance -/* 80D64118 C0 1F 05 70 */ lfs f0, 0x570(r31) -/* 80D6411C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80D64120 40 80 00 0C */ bge lbl_80D6412C -/* 80D64124 38 60 00 01 */ li r3, 1 -/* 80D64128 48 00 00 08 */ b lbl_80D64130 -lbl_80D6412C: -/* 80D6412C 38 60 00 00 */ li r3, 0 -lbl_80D64130: -/* 80D64130 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80D64134 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D64138 7C 08 03 A6 */ mtlr r0 -/* 80D6413C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D64140 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/create__13daTagWrHowl_cFv.s b/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/create__13daTagWrHowl_cFv.s deleted file mode 100644 index ef44b1b1b8a..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/create__13daTagWrHowl_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80D63FD4: -/* 80D63FD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D63FD8 7C 08 02 A6 */ mflr r0 -/* 80D63FDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D63FE0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D63FE4 7C 7F 1B 78 */ mr r31, r3 -/* 80D63FE8 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D63FEC 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D63FF0 40 82 00 1C */ bne lbl_80D6400C -/* 80D63FF4 28 1F 00 00 */ cmplwi r31, 0 -/* 80D63FF8 41 82 00 08 */ beq lbl_80D64000 -/* 80D63FFC 4B FF FF 3D */ bl __ct__13daTagWrHowl_cFv -lbl_80D64000: -/* 80D64000 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80D64004 60 00 00 08 */ ori r0, r0, 8 -/* 80D64008 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80D6400C: -/* 80D6400C 7F E3 FB 78 */ mr r3, r31 -/* 80D64010 48 00 00 81 */ bl init__13daTagWrHowl_cFv -/* 80D64014 38 60 00 04 */ li r3, 4 -/* 80D64018 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D6401C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D64020 7C 08 03 A6 */ mtlr r0 -/* 80D64024 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D64028 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_Delete__FP13daTagWrHowl_c.s b/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_Delete__FP13daTagWrHowl_c.s deleted file mode 100644 index 669a112df86..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_Delete__FP13daTagWrHowl_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D64198: -/* 80D64198 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D6419C 7C 08 02 A6 */ mflr r0 -/* 80D641A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D641A4 4B FF FE 89 */ bl Delete__13daTagWrHowl_cFv -/* 80D641A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D641AC 7C 08 03 A6 */ mtlr r0 -/* 80D641B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D641B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_create__FP13daTagWrHowl_c.s b/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_create__FP13daTagWrHowl_c.s deleted file mode 100644 index bbf6df654bb..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_create__FP13daTagWrHowl_c.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80D64144: -/* 80D64144 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D64148 7C 08 02 A6 */ mflr r0 -/* 80D6414C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D64150 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D64154 7C 7F 1B 78 */ mr r31, r3 -/* 80D64158 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D6415C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D64160 40 82 00 1C */ bne lbl_80D6417C -/* 80D64164 28 1F 00 00 */ cmplwi r31, 0 -/* 80D64168 41 82 00 08 */ beq lbl_80D64170 -/* 80D6416C 4B FF FD CD */ bl __ct__13daTagWrHowl_cFv -lbl_80D64170: -/* 80D64170 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80D64174 60 00 00 08 */ ori r0, r0, 8 -/* 80D64178 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80D6417C: -/* 80D6417C 7F E3 FB 78 */ mr r3, r31 -/* 80D64180 4B FF FE 55 */ bl create__13daTagWrHowl_cFv -/* 80D64184 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D64188 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D6418C 7C 08 03 A6 */ mtlr r0 -/* 80D64190 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D64194 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_draw__FP13daTagWrHowl_c.s b/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_draw__FP13daTagWrHowl_c.s deleted file mode 100644 index ca1d105f8a0..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_draw__FP13daTagWrHowl_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D641D8: -/* 80D641D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D641DC 7C 08 02 A6 */ mflr r0 -/* 80D641E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D641E4 4B FF FE 51 */ bl draw__13daTagWrHowl_cFv -/* 80D641E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D641EC 7C 08 03 A6 */ mtlr r0 -/* 80D641F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D641F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_execute__FP13daTagWrHowl_c.s b/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_execute__FP13daTagWrHowl_c.s deleted file mode 100644 index b1a2a069e65..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_execute__FP13daTagWrHowl_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D641B8: -/* 80D641B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D641BC 7C 08 02 A6 */ mflr r0 -/* 80D641C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D641C4 4B FF FE 79 */ bl execute__13daTagWrHowl_cFv -/* 80D641C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D641CC 7C 08 03 A6 */ mtlr r0 -/* 80D641D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D641D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/execute__13daTagWrHowl_cFv.s b/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/execute__13daTagWrHowl_cFv.s deleted file mode 100644 index ccafecfd582..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/execute__13daTagWrHowl_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80D6403C: -/* 80D6403C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D64040 7C 08 02 A6 */ mflr r0 -/* 80D64044 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D64048 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D6404C 7C 7F 1B 78 */ mr r31, r3 -/* 80D64050 38 00 00 00 */ li r0, 0 -/* 80D64054 90 03 05 5C */ stw r0, 0x55c(r3) -/* 80D64058 48 00 00 5D */ bl chkWlfInTag__13daTagWrHowl_cFv -/* 80D6405C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D64060 41 82 00 18 */ beq lbl_80D64078 -/* 80D64064 80 1F 05 5C */ lwz r0, 0x55c(r31) -/* 80D64068 60 00 00 80 */ ori r0, r0, 0x80 -/* 80D6406C 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 80D64070 38 00 00 41 */ li r0, 0x41 -/* 80D64074 98 1F 05 4B */ stb r0, 0x54b(r31) -lbl_80D64078: -/* 80D64078 38 60 00 01 */ li r3, 1 -/* 80D6407C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D64080 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D64084 7C 08 03 A6 */ mtlr r0 -/* 80D64088 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D6408C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/init__13daTagWrHowl_cFv.s b/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/init__13daTagWrHowl_cFv.s deleted file mode 100644 index 003c1768516..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/init__13daTagWrHowl_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80D64090: -/* 80D64090 3C 80 80 D6 */ lis r4, lit_3680@ha /* 0x80D64200@ha */ -/* 80D64094 C0 24 42 00 */ lfs f1, lit_3680@l(r4) /* 0x80D64200@l */ -/* 80D64098 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80D6409C EC 01 00 32 */ fmuls f0, f1, f0 -/* 80D640A0 D0 03 05 6C */ stfs f0, 0x56c(r3) -/* 80D640A4 C0 03 05 6C */ lfs f0, 0x56c(r3) -/* 80D640A8 EC 00 00 32 */ fmuls f0, f0, f0 -/* 80D640AC D0 03 05 70 */ stfs f0, 0x570(r3) -/* 80D640B0 4E 80 00 20 */ blr diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index 4daebd16ec9..8fcde1731e5 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -278,6 +278,13 @@ STATIC_ASSERT(sizeof(J3DAnmColorFullData) == 0x34); class J3DAnmBase { public: + J3DAnmBase(s16 i_frameMax) { + mAttribute = 0; + field_0x5 = 0; + mFrameMax = i_frameMax; + mFrame = 0.0f; + } + virtual ~J3DAnmBase(); u8 getAttribute() const { return mAttribute; } @@ -287,6 +294,7 @@ public: private: /* 0x4 */ u8 mAttribute; + /* 0x5 */ u8 field_0x5; /* 0x6 */ s16 mFrameMax; /* 0x8 */ f32 mFrame; }; // Size: 0xC @@ -539,7 +547,7 @@ class J3DAnmCluster : public J3DAnmBase { public: /* 8032BCAC */ virtual ~J3DAnmCluster(); /* 8032BF44 */ virtual s32 getKind() const; - /* 8032BF4C */ virtual void getWeight(u16) const; + /* 8032BF4C */ virtual f32 getWeight(u16) const; private: /* 0x0C */ f32* field_0xc; @@ -549,7 +557,7 @@ class J3DAnmClusterFull : public J3DAnmCluster { public: /* 8032BCAC */ virtual ~J3DAnmClusterFull(); /* 8032BF44 */ virtual s32 getKind() const; - /* 8032BF4C */ virtual void getWeight(u16) const; + /* 8032BF4C */ virtual f32 getWeight(u16) const; private: /* 0x10 */ int field_0x10; @@ -559,7 +567,7 @@ class J3DAnmClusterKey : public J3DAnmCluster { public: /* 8032C044 */ virtual ~J3DAnmClusterKey(); /* 8032C0B0 */ virtual s32 getKind() const; - /* 8032A218 */ virtual void getWeight(u16) const; + /* 8032A218 */ virtual f32 getWeight(u16) const; private: /* 0x10 */ int field_0x10; diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h index bc4c2ba9a64..51d8f08e8cc 100644 --- a/include/JSystem/J3DGraphAnimator/J3DModelData.h +++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h @@ -47,6 +47,7 @@ public: bool isLocked() { return mMaterialTable.isLocked(); } void entryTexMtxAnimator(J3DAnmTextureSRTKey* anm) { mMaterialTable.entryTexMtxAnimator(anm); } void entryTevRegAnimator(J3DAnmTevRegKey* anm) { mMaterialTable.entryTevRegAnimator(anm); } + void entryTexNoAnimator(J3DAnmTexPattern* anm) { mMaterialTable.entryTexNoAnimator(anm); } int removeTexNoAnimator(J3DAnmTexPattern* anm) { return mMaterialTable.removeTexNoAnimator(anm); } diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index c9c21cfd406..3e6b8228233 100644 --- a/include/JSystem/J3DGraphBase/J3DMaterial.h +++ b/include/JSystem/J3DGraphBase/J3DMaterial.h @@ -61,6 +61,8 @@ public: } J3DNBTScale* getNBTScale() const { return mTexGenBlock->getNBTScale(); } + void setTevColor(u32 i, const J3DGXColorS10* i_color) { mTevBlock->setTevColor(i, i_color); } + public: /* 0x04 */ J3DMaterial* mNext; /* 0x08 */ J3DShape* mShape; diff --git a/include/JSystem/J3DGraphBase/J3DShapeMtx.h b/include/JSystem/J3DGraphBase/J3DShapeMtx.h index 1b745e5fc19..2496c9b8a3d 100644 --- a/include/JSystem/J3DGraphBase/J3DShapeMtx.h +++ b/include/JSystem/J3DGraphBase/J3DShapeMtx.h @@ -50,6 +50,7 @@ public: static void setCurrentPipeline(u32 pipeline) { sCurrentPipeline = pipeline; } static void setLODFlag(u8 flag) { struct_804515B0[1] = flag; } + static u8 getLODFlag() { return struct_804515B0[1]; } static void resetMtxLoadCache(); private: diff --git a/include/JSystem/J3DGraphLoader/J3DAnmLoader.h b/include/JSystem/J3DGraphLoader/J3DAnmLoader.h index 0c6a6a84746..c9ec70a8ab3 100644 --- a/include/JSystem/J3DGraphLoader/J3DAnmLoader.h +++ b/include/JSystem/J3DGraphLoader/J3DAnmLoader.h @@ -3,7 +3,7 @@ #include "dolphin/types.h" -enum J3DAnmLoaderDataBaseFlag { UNK_FLAG0 }; +enum J3DAnmLoaderDataBaseFlag { J3DLOADER_UNK_FLAG0 }; struct J3DAnmBase; diff --git a/include/JSystem/JAudio2/JAISeMgr.h b/include/JSystem/JAudio2/JAISeMgr.h index c52af94cf71..45bf084cd41 100644 --- a/include/JSystem/JAudio2/JAISeMgr.h +++ b/include/JSystem/JAudio2/JAISeMgr.h @@ -39,6 +39,8 @@ public: /* 8029F8B0 */ virtual bool isUsingSeqData(JAISeqDataRegion const&); /* 8029F91C */ virtual void releaseSeqData(JAISeqDataRegion const&); + JAISoundParamsMove* getParams() { return &mParams; } + /* 0x04 */ JASNonCopyable field_0x4; /* 0x08 */ JAISoundParamsMove mParams; /* 0x58 */ JSUList mSeList; @@ -66,6 +68,8 @@ public: /* 802A0168 */ virtual bool isUsingSeqData(JAISeqDataRegion const&); /* 802A01D8 */ virtual void releaseSeqData(JAISeqDataRegion const&); + JAISeCategoryMgr* getCategory(int categoryIndex) { return &mCategoryMgrs[categoryIndex]; } + private: /* 0x008 */ JAIAudience* mAudience; /* 0x00C */ JAISeqDataMgr* mSeqDataMgr; diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h index c9767d3a7e4..b339fb71efa 100644 --- a/include/JSystem/JKernel/JKRArchive.h +++ b/include/JSystem/JKernel/JKRArchive.h @@ -62,7 +62,7 @@ public: u32 name_offset; u16 field_0x8; u16 num_entries; - s32 first_file_index; + u32 first_file_index; }; struct SDIFileEntry { @@ -163,8 +163,9 @@ public: /* vt[19] */ virtual u32 getExpandSize(SDIFileEntry*) const; u32 countFile() const { return mArcInfoBlock->num_file_entries; } + s32 countDirectory() const { return mArcInfoBlock->num_nodes; } -protected: +public: /* 0x00 */ // vtable /* 0x04 */ // JKRFileLoader /* 0x38 */ JKRHeap* mHeap; @@ -173,8 +174,6 @@ protected: /* 0x40 */ s32 mEntryNum; /* 0x44 */ SArcDataInfo* mArcInfoBlock; /* 0x48 */ SDIDirEntry* mNodes; - -public: /* 0x4C */ SDIFileEntry* mFiles; protected: diff --git a/include/JSystem/JKernel/JKRDvdFile.h b/include/JSystem/JKernel/JKRDvdFile.h index 4a9daa94e76..ecb722531aa 100644 --- a/include/JSystem/JKernel/JKRDvdFile.h +++ b/include/JSystem/JKernel/JKRDvdFile.h @@ -31,7 +31,7 @@ public: /* vt[07] */ virtual s32 getFileSize(void) const; /* override */ /* vt[08] */ virtual bool open(s32); -private: +// private: /* 0x00 */ // vtable /* 0x04 */ // JKRFile /* 0x1C */ OSMutex mMutex1; diff --git a/include/JSystem/JKernel/JKRSolidHeap.h b/include/JSystem/JKernel/JKRSolidHeap.h index a61e8cc78bd..f3058bb0297 100644 --- a/include/JSystem/JKernel/JKRSolidHeap.h +++ b/include/JSystem/JKernel/JKRSolidHeap.h @@ -21,7 +21,7 @@ protected: void* allocFromHead(u32, int); void* allocFromTail(u32, int); - s32 getUsedSize() { return mSize - getTotalFreeSize(); } + static s32 getUsedSize(JKRSolidHeap* heap) { return heap->mSize - heap->getTotalFreeSize(); } public: /* vt[04] */ virtual u32 getHeapType(void); /* override */ diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h index 71bad19d43f..5b6b2c5978c 100644 --- a/include/JSystem/JMath/JMath.h +++ b/include/JSystem/JMath/JMath.h @@ -11,9 +11,19 @@ inline f32 JMAFastReciprocal(f32 value) { return __fres(value); } +inline float __frsqrtes(register double f) { + register float out; + // clang-format off + asm { + frsqrte out, f + } + // clang-format on + return out; +} + inline f32 JMAFastSqrt(f32 input) { if (input > 0.0f) { - f64 tmp = __frsqrte(input); + f32 tmp = __frsqrtes(input); return tmp * input; } return input; diff --git a/include/JSystem/JParticle/JPAMath.h b/include/JSystem/JParticle/JPAMath.h index 3c0e94b43c6..abad96a07d1 100644 --- a/include/JSystem/JParticle/JPAMath.h +++ b/include/JSystem/JParticle/JPAMath.h @@ -2,8 +2,10 @@ #define JPAMATH_H #include "dolphin/mtx/mtx.h" -#include "dolphin/types.h" +#include "JSystem/JGeometry.h" void JPAGetXYZRotateMtx(s16 x, s16 y, s16 z, Mtx dst); +void JPASetRMtxTVecfromMtx(f32 const (*param_0)[4], f32 (*param_1)[4], + JGeometry::TVec3* param_2); #endif /* JPAMATH_H */ diff --git a/include/JSystem/JParticle/JPAParticle.h b/include/JSystem/JParticle/JPAParticle.h index 979d41b3dd3..dc4f2127ed3 100644 --- a/include/JSystem/JParticle/JPAParticle.h +++ b/include/JSystem/JParticle/JPAParticle.h @@ -9,6 +9,7 @@ #include "JSystem/JParticle/JPADynamicsBlock.h" #include "JSystem/JParticle/JPAResource.h" +#include "JSystem/JParticle/JPAMath.h" class JKRHeap; class JPABaseEmitter; @@ -205,6 +206,7 @@ public: enum { JPAEmtrStts_StopEmit = 0x01, JPAEmtrStts_StopCalc = 0x02, + JPAEmtrStts_StopDraw = 0x04, JPAEmtrStts_FirstEmit = 0x10, JPAEmtrStts_RateStepEmit = 0x20, JPAEmtrStts_Immortal = 0x40, @@ -234,6 +236,7 @@ public: u8 getDrawTimes() const { return mDrawTimes; } void setRate(f32 rate) { mRate = rate; } void setEmitterCallBackPtr(JPAEmitterCallBack* ptr) { mpEmtrCallBack = ptr; } + void setGlobalRTMatrix(const Mtx m) { JPASetRMtxTVecfromMtx(m, mGlobalRot, &mGlobalTrs); } f32 get_r_f() { return mRndm.get_rndm_f(); } f32 get_r_zp() { return mRndm.get_rndm_zp(); } @@ -251,6 +254,7 @@ public: void quitImmortalEmitter() { clearStatus(JPAEmtrStts_Immortal); } void stopCalcEmitter() { setStatus(JPAEmtrStts_StopCalc); } void playCalcEmitter() { clearStatus(JPAEmtrStts_StopCalc); } + void stopDrawParticle() { setStatus(JPAEmtrStts_StopDraw); } public: /* 0x00 */ Vec mLocalScl; diff --git a/include/JSystem/JStudio/JStudio/functionvalue.h b/include/JSystem/JStudio/JStudio/functionvalue.h index 35d849e27cc..9db6ffee4f2 100644 --- a/include/JSystem/JStudio/JStudio/functionvalue.h +++ b/include/JSystem/JStudio/JStudio/functionvalue.h @@ -167,7 +167,7 @@ private: f64 fValue_; }; -class TFunctionValue_composite : TFunctionValue, TFunctionValueAttribute_refer { +class TFunctionValue_composite : public TFunctionValue, public TFunctionValueAttribute_refer { public: struct TData { TData(void* data) : u32data((u32)data) {} @@ -216,7 +216,7 @@ public: const TData* data_getData() const { return &data; } void data_setData(const TData& dat) { data = dat; } -private: +// private: UnkFunc pfn_; TData data; }; diff --git a/include/JSystem/JStudio/JStudio/jstudio-control.h b/include/JSystem/JStudio/JStudio/jstudio-control.h index b2cd99f6b8b..e5c742b97fd 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-control.h +++ b/include/JSystem/JStudio/JStudio/jstudio-control.h @@ -68,6 +68,8 @@ public: transform_setOrigin_TxyzRy(xyz, rotY); } + void setSecondPerFrame(double param_0) { mSecondPerFrame = param_0; } + /* 0x58 */ f64 mSecondPerFrame; /* 0x60 */ fvb::TControl fvb_Control; /* 0x74 */ ctb::TControl ctb_Control; diff --git a/include/JSystem/JSupport/JSUList.h b/include/JSystem/JSupport/JSUList.h index c1deabae92d..6adb0bc74bc 100644 --- a/include/JSystem/JSupport/JSUList.h +++ b/include/JSystem/JSupport/JSUList.h @@ -147,7 +147,7 @@ public: T* operator->() { return this->getObject(); } -private: +// private: JSULink* mLink; }; diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h index 8ed869395df..c1c2a5adfac 100644 --- a/include/JSystem/JUtility/JUTConsole.h +++ b/include/JSystem/JUtility/JUTConsole.h @@ -19,7 +19,8 @@ public: enum OutputFlag { /* 0x0 */ OUTPUT_NONE, /* 0x1 */ OUTPUT_OSREPORT, - /* 0x2 */ OUTPUT_CONSOLE + /* 0x2 */ OUTPUT_CONSOLE, + /* 0x3 */ OUTPUT_OSR_AND_CONSOLE, }; /* 802E73E4 */ static JUTConsole* create(unsigned int, void*, u32); diff --git a/include/JSystem/JUtility/JUTDirectFile.h b/include/JSystem/JUtility/JUTDirectFile.h index 840f796d7d0..b0f956ff23e 100644 --- a/include/JSystem/JUtility/JUTDirectFile.h +++ b/include/JSystem/JUtility/JUTDirectFile.h @@ -3,4 +3,13 @@ #include "dolphin/types.h" +struct JUTDirectFile { + /* 802E8730 */ void fetch32byte(); + /* 802E87F8 */ JUTDirectFile(); + /* 802E881C */ ~JUTDirectFile(); + /* 802E8860 */ bool fopen(char const*); + /* 802E88FC */ bool fclose(); + /* 802E8958 */ int fgets(void*, int); +}; + #endif /* JUTDIRECTFILE_H */ diff --git a/include/JSystem/JUtility/JUTFader.h b/include/JSystem/JUtility/JUTFader.h index 3615612ee1f..af3c2fba732 100644 --- a/include/JSystem/JUtility/JUTFader.h +++ b/include/JSystem/JUtility/JUTFader.h @@ -30,7 +30,7 @@ public: /* 0x0A */ u16 field_0xa; /* 0x0C */ JUtility::TColor mColor; /* 0x10 */ JGeometry::TBox2 mBox; - /* 0x20 */ EStatus mEStatus; + /* 0x20 */ int mEStatus; /* 0x24 */ u32 field_0x24; }; diff --git a/include/SSystem/SComponent/c_bg_s_lin_chk.h b/include/SSystem/SComponent/c_bg_s_lin_chk.h index ca5c282fd24..639ada0798b 100644 --- a/include/SSystem/SComponent/c_bg_s_lin_chk.h +++ b/include/SSystem/SComponent/c_bg_s_lin_chk.h @@ -31,6 +31,7 @@ public: void SetHit() { field_0x4c |= 16; } u32 ChkHit() const { return field_0x4c & 16; } void SetCross(const cXyz& pos) { mLin.SetEnd(pos); } + cXyz& i_GetCross() { return mLin.GetEnd(); } cM3dGLin* GetLinP() { return &mLin; } bool ChkBackFlag() const { return mBackFlag; } bool ChkFrontFlag() const { return mFrontFlag; } diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 5259f17acd9..40c9f774a11 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -11,6 +11,11 @@ #include "f_op/f_op_actor.h" #include "global.h" +enum CcG_Tg_HitMark { + CcG_Tg_UNK_MARK_6 = 6, + CcG_Tg_UNK_MARK_8 = 8, +}; + class cCcD_PntAttr; class cCcD_CpsAttr; class cCcD_TriAttr; @@ -341,6 +346,7 @@ public: u32 MskType(u32 msk) const { return mType & msk; } void SetType(u32 type) { mType = type; } void SetAtp(int atp) { mAtp = atp; } + void ClrSet() { OffSPrmBit(1); } protected: /* 0x10 */ int mType; @@ -361,6 +367,7 @@ public: void SetType(u32 type) { mType = type; } u32 GetGrp() const { return MskSPrm(0x1E); } bool ChkSet() const { return MskSPrm(1); } + void ClrSet() { OffSPrmBit(1); } private: /* 0x10 */ int mType; @@ -429,6 +436,10 @@ public: void OffCoSetBit() { mObjCo.ClrSet(); } void SetTgType(u32 type) { mObjTg.SetType(type); } void OnTgSPrmBit(u32 flag) { mObjTg.OnSPrmBit(flag); } + void OffAtSetBit() { mObjAt.ClrSet(); } + void OnTgSetBit() { mObjTg.OnSPrmBit(1); } + void OffTgSetBit() { mObjTg.ClrSet(); } + void OnCoSetBit() { mObjCo.OnSPrmBit(1); } }; // Size = 0x40 diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h index cd22aa70a6c..6eb7142e4f6 100644 --- a/include/SSystem/SComponent/c_lib.h +++ b/include/SSystem/SComponent/c_lib.h @@ -4,47 +4,46 @@ #include "MSL_C/math.h" #include "SSystem/SComponent/c_xyz.h" #include "dolphin/mtx/mtx.h" -#include "dolphin/types.h" -inline bool cLib_IsZero(f32 f) { - return fabsf(f) < 8e-11f; +inline bool cLib_IsZero(f32 value) { + return fabsf(value) < 8e-11f; } void cLib_memCpy(void* dst, const void* src, unsigned long size); void cLib_memSet(void* ptr, int value, unsigned long size); -float cLib_addCalc(float*, float, float, float, float); -void cLib_addCalc2(float*, float, float, float); -void cLib_addCalc0(float*, float, float); -float cLib_addCalcPos(cXyz*, const cXyz&, float, float, float); -float cLib_addCalcPosXZ(cXyz*, const cXyz&, float, float, float); -void cLib_addCalcPos2(cXyz*, const cXyz&, float, float); -void cLib_addCalcPosXZ2(cXyz*, const cXyz&, float, float); -short cLib_addCalcAngleS(short*, short, short, short, short); -void cLib_addCalcAngleS2(short*, short, short, short); +f32 cLib_addCalc(f32* o_value, f32 target, f32 scale, f32 maxStep, f32 minStep); +void cLib_addCalc2(f32* o_value, f32 target, f32 scale, f32 maxStep); +void cLib_addCalc0(f32* o_value, f32 scale, f32 maxStep); +f32 cLib_addCalcPos(cXyz* o_value, cXyz const& target, f32 scale, f32 maxStep, f32 minStep); +f32 cLib_addCalcPosXZ(cXyz* o_value, cXyz const& target, f32 scale, f32 maxStep, f32 minStep); +void cLib_addCalcPos2(cXyz* o_value, cXyz const& target, f32 scale, f32 maxStep); +void cLib_addCalcPosXZ2(cXyz* o_value, cXyz const& target, f32 scale, f32 maxStep); +s16 cLib_addCalcAngleS(s16* o_value, s16 target, s16 scale, s16 maxStep, s16 minStep); +void cLib_addCalcAngleS2(s16* o_value, s16 target, s16 scale, s16 maxStep); -int cLib_chaseUC(unsigned char*, unsigned char, unsigned char); -int cLib_chaseS(short*, short, short); -int cLib_chaseF(float* value, float target, float step); -int cLib_chasePos(cXyz*, const cXyz&, float); -int cLib_chasePosXZ(cXyz*, const cXyz&, float); -int cLib_chaseAngleS(short*, short, short); +int cLib_chaseUC(u8* o_value, u8 target, u8 step); +int cLib_chaseS(s16* o_value, s16 target, s16 step); +int cLib_chaseF(f32* o_value, f32 target, f32 step); +int cLib_chasePos(cXyz* o_value, cXyz const& target, f32 step); +int cLib_chasePosXZ(cXyz* o_value, cXyz const& target, f32 step); +int cLib_chaseAngleS(s16* o_value, s16 target, s16 step); s16 cLib_targetAngleY(const Vec* lhs, const Vec* rhs); s16 cLib_targetAngleY(const Vec& lhs, const Vec& rhs); -short cLib_targetAngleX(const cXyz*, const cXyz*); +s16 cLib_targetAngleX(const cXyz*, const cXyz*); -void cLib_offsetPos(cXyz*, const cXyz*, short, const cXyz*); +void cLib_offsetPos(cXyz* pDest, cXyz const* pSrc, s16 angle, cXyz const* vec); s32 cLib_distanceAngleS(s16 x, s16 y); -inline void cLib_offBit(u8& pVar, u8 pBit) { - pVar &= ~pBit; +inline void cLib_offBit(u8& value, u8 bit) { + value &= ~bit; } -inline void cLib_onBit(u8& pVar, u8 pBit) { - pVar |= pBit; +inline void cLib_onBit(u8& value, u8 bit) { + value |= bit; } -inline u8 cLib_checkBit(u8& pVar, u8 pBit) { - return pVar & pBit; +inline u8 cLib_checkBit(u8& value, u8 bit) { + return value & bit; } template @@ -53,11 +52,12 @@ inline T cLib_minMaxLimit(T val, T min, T max) { if (val < min) { ret = min; } else { - ret = max; - if (val <= max) { - ret = val; + if (val > max) { + val = max; } + ret = val; } + return ret; } @@ -65,8 +65,8 @@ template T cLib_calcTimer(T* val); void MtxInit(void); -void MtxTrans(float, float, float, unsigned char); -void MtxScale(float, float, float, unsigned char); +void MtxTrans(f32, f32, f32, u8); +void MtxScale(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void MtxPush(void); Mtx* MtxPull(void); diff --git a/include/SSystem/SComponent/c_m3d_g_cyl.h b/include/SSystem/SComponent/c_m3d_g_cyl.h index ec5c29fc5dc..12be442b34e 100644 --- a/include/SSystem/SComponent/c_m3d_g_cyl.h +++ b/include/SSystem/SComponent/c_m3d_g_cyl.h @@ -24,15 +24,16 @@ public: virtual ~cM3dGCyl() {} void Set(const cM3dGCylS&); void Set(const cXyz&, f32, f32); - void SetC(const cXyz&); - void SetH(f32); - void SetR(f32); + void SetC(const cXyz& pos); + void SetH(f32 h); + void SetR(f32 r); bool cross(const cM3dGSph*, cXyz*) const; bool cross(const cM3dGCyl*, cXyz*) const; void calcMinMax(cXyz*, cXyz*); const cXyz& GetCP(void) const { return mCenter; } f32 GetR(void) const { return mRadius; } f32 GetH(void) const { return mHeight; } + cXyz& GetC() { return mCenter; } bool Cross(const cM3dGCps* cps, cXyz* xyz) const { return cM3d_Cross_CpsCyl(*cps, *this, xyz); } bool Cross(const cM3dGTri& tri, cXyz* xyz) const { return cM3d_Cross_CylTri(this, &tri, xyz); } diff --git a/include/SSystem/SComponent/c_m3d_g_lin.h b/include/SSystem/SComponent/c_m3d_g_lin.h index 92f4342c139..5ef690a9be7 100644 --- a/include/SSystem/SComponent/c_m3d_g_lin.h +++ b/include/SSystem/SComponent/c_m3d_g_lin.h @@ -25,6 +25,7 @@ public: cXyz& GetStartP(void) { return mStart; } const cXyz& GetEndP(void) const { return mEnd; } cXyz& GetEndP(void) { return mEnd; } + cXyz& GetEnd() { return mEnd; } }; // Size = 0x1C STATIC_ASSERT(0x1C == sizeof(cM3dGLin)); diff --git a/include/SSystem/SComponent/c_math.h b/include/SSystem/SComponent/c_math.h index 1ea9516d83a..86330cc7d30 100644 --- a/include/SSystem/SComponent/c_math.h +++ b/include/SSystem/SComponent/c_math.h @@ -29,4 +29,12 @@ inline s16 cM_deg2s(f32 val) { return val * 182.04445f; } +inline f32 cM_fsin(f32 v) { + return JMASSin(cM_rad2s(v)); +} + +inline f32 cM_sht2d(f32 v) { + return v * 0.005493164f; +} + #endif /* C_MATH_H */ diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index 3b7c4fb4e41..b875f06b233 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -54,11 +54,7 @@ struct cXyz : Vec { z -= f; } void operator-=(const Vec& other) { PSVECSubtract(this, &other, this); } - void operator+=(const Vec& vec) { - x += vec.x; - y += vec.y; - z += vec.z; - } + void operator+=(const Vec& other) { PSVECAdd(this, &other, this); } void operator*=(f32 scale) { PSVECScale(this, this, scale); } /* 80266C6C */ cXyz getCrossProduct(Vec const&) const; /* 80266CBC */ cXyz outprod(Vec const&) const; diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h index 2d92cdce468..64e2a8e7f97 100644 --- a/include/Z2AudioLib/Z2Creature.h +++ b/include/Z2AudioLib/Z2Creature.h @@ -72,6 +72,10 @@ public: int startHitItemSE(u32, u32, Z2SoundObjBase*, float); void setResumeAttack(bool); + void setInWater(bool status) { + mFlags = (u8)((mFlags & ~0x40) | ((status << 6) & 0x40)); // what is going on here + } + static Z2CreatureLink* mLinkPtr; private: diff --git a/include/Z2AudioLib/Z2SoundHandles.h b/include/Z2AudioLib/Z2SoundHandles.h index 51414f3d70a..8e43695b6e9 100644 --- a/include/Z2AudioLib/Z2SoundHandles.h +++ b/include/Z2AudioLib/Z2SoundHandles.h @@ -29,7 +29,7 @@ public: u32 getNumHandles() const { return this->getNumLinks(); } private: - u8 mNumHandles; + /* 0xC */ u8 mNumHandles; }; #endif /* Z2SOUNDHANDLES_H */ diff --git a/include/Z2AudioLib/Z2SoundMgr.h b/include/Z2AudioLib/Z2SoundMgr.h index 7d90ecfc62b..8070294ba83 100644 --- a/include/Z2AudioLib/Z2SoundMgr.h +++ b/include/Z2AudioLib/Z2SoundMgr.h @@ -27,6 +27,9 @@ public: /* 802A9EE8 */ /* virtual */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*); /* 0x000 */ void* vtable; // remove later + + JAISeMgr* getSeMgr() { return &mSeMgr; } + private: /* 0x004 */ JAISeMgr mSeMgr; /* 0x728 */ JAISeqMgr mSeqMgr; diff --git a/include/Z2AudioLib/Z2SoundObject.h b/include/Z2AudioLib/Z2SoundObject.h index 22fdd22cef7..f5be57d2084 100644 --- a/include/Z2AudioLib/Z2SoundObject.h +++ b/include/Z2AudioLib/Z2SoundObject.h @@ -72,14 +72,28 @@ public: }; class Z2DopplerSoundObjBase : public Z2SoundHandles { +public: Z2DopplerSoundObjBase(); ~Z2DopplerSoundObjBase(); - virtual void temp(); // temp to build OK, remove later virtual void framework(u32, s8); virtual void init(Vec*, u8); virtual void startSound(JAISoundID, u32, s8); virtual void startLevelSound(JAISoundID, u32, s8); + + /* 0x14 */ Z2SoundStarter* field_0x14; + /* 0x18 */ JGeometry::TVec3* field_0x18; + /* 0x1C */ u16 field_0x1c; + /* 0x1E */ u8 field_0x1e; + /* 0x1F */ bool field_0x1f; + /* 0x20 */ JGeometry::TVec3 field_0x20; + /* 0x2C */ JGeometry::TVec3 field_0x2c; +}; + +class Z2SoundObjArrow : public Z2DopplerSoundObjBase { +public: + /* 802BEB38 */ Z2SoundObjArrow(); + /* 802BEB74 */ virtual void init(Vec*, u8); }; #endif /* Z2SOUNDOBJECT_H */ diff --git a/include/c/c_dylink.h b/include/c/c_dylink.h index 74734c763e0..53294d9a265 100644 --- a/include/c/c_dylink.h +++ b/include/c/c_dylink.h @@ -18,5 +18,6 @@ struct DynamicNameTableEntry { }; int cDyl_InitAsyncIsDone(); +void cDyl_InitAsync(); #endif /* C_C_DYLINK_H */ diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index c142c1ec95f..f381434c6be 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -74,6 +74,9 @@ public: /* 801266C0 */ virtual void draw(); /* 800CFDF4 */ virtual ~daAlink_sight_c(); + bool getLockFlg() { return mLockFlag; } + void offLockFlg() { mLockFlag = false; } + /* 0x4C */ bool mLockFlag; /* 0x4D */ u8 field_0x4d[3]; /* 0x50 */ daAlink_lockCursor_c mLockCursor; @@ -127,7 +130,10 @@ public: /* 800CFCF4 */ daAlink_footData_c(); private: - /* 0x00 */ u8 field_0x00[0x8]; + /* 0x00 */ u8 field_0x00[2]; + /* 0x02 */ u16 field_0x2; + /* 0x04 */ u16 field_0x4; + /* 0x06 */ u16 field_0x6; /* 0x08 */ cXyz field_0x8; /* 0x14 */ Mtx field_0x14; /* 0x44 */ Mtx field_0x44; @@ -198,6 +204,11 @@ public: class daAlink_c; typedef int (daAlink_c::*daAlink_procFunc)(); +struct daAlink_procInitTable { + /* 0x0 */ daAlink_procFunc m_procFunc; + /* 0xC */ u32 m_mode; +}; // Size: 0x10 + class daAlink_c : public daPy_py_c { public: enum daAlink_ANM { @@ -476,9 +487,9 @@ public: /* 0x110 */ ANM_GRASS_WHISTLE_PLAY, /* 0x111 */ ANM_HAWK_CATCH, /* 0x112 */ ANM_HAWK_WAIT, - /* 0x113 */ ANM_WAIT_D_B, // ghost rats? + /* 0x113 */ ANM_WAIT_D_B, // ghost rats? /* 0x114 */ ANM_HORSE_WAIT_D_B, // ? - /* 0x115 */ ANM_MG_KICK, // ? + /* 0x115 */ ANM_MG_KICK, // ? /* 0x116 */ ANM_DIE, /* 0x117 */ ANM_HORSE_DIE, /* 0x118 */ ANM_SWIM_DIE, @@ -497,7 +508,7 @@ public: /* 0x125 */ ANM_FALL, /* 0x126 */ ANM_APPEARANCE, /* 0x127 */ ANM_S_JUMP_START, // ? - /* 0x128 */ ANM_S_JUMP_END, // ? + /* 0x128 */ ANM_S_JUMP_END, // ? /* 0x129 */ ANM_HOOKSHOT_FLY_LEFT, /* 0x12A */ ANM_HOOKSHOT_FLY_RIGHT, /* 0x12B */ ANM_HOOKSHOT_SHOOT, @@ -520,7 +531,7 @@ public: /* 0x13C */ ANM_HOOKSHOT_WALL_SHOOT_LEFT, /* 0x13D */ ANM_HOOKSHOT_WALL_SHOOT_RIGHT, /* 0x13E */ ANM_HVY_BOOTS_PUT_ON, - /* 0x13F */ ANM_SUMOU_MIAU, // ? + /* 0x13F */ ANM_SUMOU_MIAU, // ? /* 0x140 */ ANM_SUMOU_HAKEYOI, // ? /* 0x141 */ ANM_SUMOU_FIGHT_WAIT, /* 0x142 */ ANM_SUMOU_FIGHT_STEP_LEFT, @@ -579,7 +590,7 @@ public: /* 0x177 */ ANM_DRAGON_CUT_FINAL, /* 0x178 */ ANM_COPYROD_SWING, /* 0x179 */ ANM_COPYROD_SWING_LARGE, - /* 0x17A */ ANM_GET_MASTER_SWORD, // ? + /* 0x17A */ ANM_GET_MASTER_SWORD, // ? /* 0x17B */ ANM_WAIT_F, /* 0x17C */ ANM_ELEC_STUN_GND, /* 0x17D */ ANM_ELEC_STUN_AIR, @@ -613,7 +624,7 @@ public: /* 0x199 */ ANM_GANON_ON_HORSE, /* 0x19A */ ANM_DIVE_START, /* 0x19B */ ANM_DIVE, - /* 0x19C */ ANM_ODOROKU, // ? + /* 0x19C */ ANM_ODOROKU, // ? /* 0x19D */ ANM_ASHIMOTO, // ? }; @@ -629,8 +640,21 @@ public: UNDER_2, }; + enum daAlink_FTANM { + FTANM_UNK_8 = 8, + FTANM_UNK_13 = 0x13, + FTANM_UNK_14 = 0x14, + FTANM_UNK_27 = 0x27, + FTANM_UNK_2D = 0x2D, + FTANM_UNK_48 = 0x48, + FTANM_UNK_7A = 0x7A, + FTANM_UNK_7B = 0x7B, + FTANM_UNK_7C = 0x7C, + FTANM_UNK_90 = 0x90, + FTANM_UNK_96 = 0x96, + FTANM_UNK_9F = 0x9F, + }; - enum daAlink_FTANM {}; enum daAlink_WARP_MAT_MODE {}; enum daAlink_WANM { @@ -761,7 +785,7 @@ public: /* 0x7C */ WANM_SWIM_DIE, /* 0x7D */ WANM_SWIM_DROWN, /* 0x7E */ WANM_WAIT_STUNNED, // ? - /* 0x7F */ WANM_WAIT_A_TO_S, // ? + /* 0x7F */ WANM_WAIT_A_TO_S, // ? /* 0x80 */ WANM_SERVICE_WAIT_D, /* 0x81 */ WANM_MIDNA_SHOCK, /* 0x82 */ WANM_ENTRANCE, @@ -1258,7 +1282,7 @@ public: /* 800A54F4 */ BOOL checkHorseStart(u32, int); /* 800A551C */ int setStartProcInit(); /* 800A5CC8 */ int create(); - /* 800A662C */ void setRoomInfo(); + /* 800A662C */ s32 setRoomInfo(); /* 800A67E0 */ void setShapeAngleOnGround(); /* 800A6B0C */ void setStepsOffset(); /* 800A6DCC */ void iceSlipBgCheck(); @@ -1278,7 +1302,7 @@ public: /* 800A9F4C */ void setWolfItemMatrix(); /* 800AA2BC */ void setHandIndex(daAlink_c::daAlink_ANM); /* 800AA2E0 */ void setSwordAtCollision(int); - /* 800AA5E8 */ void checkNoCollisionCorret(); + /* 800AA5E8 */ BOOL checkNoCollisionCorret(); /* 800AA6B4 */ void decSwordBlur(); /* 800AA714 */ void resetWolfAtCollision(); /* 800AA7EC */ void setWolfAtCollision(); @@ -1289,12 +1313,13 @@ public: /* 800ABB28 */ void cancelLockAt(); /* 800ABB84 */ void setCollisionPos(); /* 800ABDB8 */ void setCollision(); - /* 800AC394 */ void setFrameCtrl(daPy_frameCtrl_c*, u8, s16, s16, f32, f32); + /* 800AC394 */ void setFrameCtrl(daPy_frameCtrl_c* i_ctrl, u8 i_attr, s16 i_start, s16 i_end, + f32 i_rate, f32 i_frame); /* 800AC450 */ const daAlink_BckData* getMainBckData(daAlink_c::daAlink_ANM) const; /* 800AC558 */ BOOL checkUnderMove0BckNoArc(daAlink_c::daAlink_ANM) const; /* 800AC5B4 */ BOOL checkUnderMove1BckNoArc(daAlink_c::daAlink_ANM) const; /* 800AC610 */ int getUnderUpperAnime(daAlink_c::daAlink_ANM, J3DAnmTransform**, - J3DAnmTransform**, int, u32); + J3DAnmTransform**, int, u32); /* 800AC738 */ void setDoubleAnimeBlendRatio(f32); /* 800AC754 */ void commonDoubleAnime(J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*, f32, f32, f32, int); @@ -1304,7 +1329,8 @@ public: /* 800ACF80 */ void setSingleAnimeBase(daAlink_c::daAlink_ANM anmID); /* 800ACFB0 */ void setSingleAnimeBaseMorf(daAlink_c::daAlink_ANM anmID, f32); /* 800ACFE0 */ void setSingleAnimeBaseSpeed(daAlink_c::daAlink_ANM anmID, f32 speed, f32 morf); - /* 800AD00C */ int setSingleAnime(daAlink_c::daAlink_ANM anmID, f32 rate, f32 start, s16 endF, f32 morf); + /* 800AD00C */ int setSingleAnime(daAlink_c::daAlink_ANM anmID, f32 rate, f32 start, s16 endF, + f32 morf); /* 800AD0F4 */ int setSingleAnimeParam(daAlink_c::daAlink_ANM anmID, daAlinkHIO_anm_c const*); /* 800AD128 */ void animePlay(J3DAnmTransform*, daPy_frameCtrl_c*); /* 800AD170 */ void allAnimePlay(); @@ -1357,9 +1383,9 @@ public: /* 800B25CC */ BOOL itemTriggerCheck(u8); /* 800B25E8 */ BOOL itemButtonCheck(u8); /* 800B2604 */ BOOL itemButton(); - /* 800B2634 */ void itemTrigger(); - /* 800B2664 */ void spActionButton(); - /* 800B2688 */ void spActionTrigger(); + /* 800B2634 */ BOOL itemTrigger(); + /* 800B2664 */ BOOL spActionButton(); + /* 800B2688 */ BOOL spActionTrigger(); /* 800B26AC */ BOOL midnaTalkTrigger() const; /* 800B26B8 */ BOOL swordSwingTrigger(); /* 800B26DC */ void setItemActionButtonStatus(u8); @@ -1376,9 +1402,9 @@ public: /* 800B3358 */ void setTiredVoice(daPy_frameCtrl_c*); /* 800B33E4 */ void checkRestHPAnime(); /* 800B3494 */ static int getDirectionFromAngle(s16 angle); - /* 800B3500 */ void checkAttentionState(); - /* 800B3630 */ void getShapeAngleYAtnActor(); - /* 800B3734 */ void setShapeAngleToAtnActor(int); + /* 800B3500 */ bool checkAttentionState(); + /* 800B3630 */ s16 getShapeAngleYAtnActor(); + /* 800B3734 */ bool setShapeAngleToAtnActor(int); /* 800B3844 */ void initServiceWaitTime(); /* 800B3904 */ bool checkZeroSpeedF() const; /* 800B3924 */ void setNormalSpeedF(f32, f32); @@ -1386,7 +1412,7 @@ public: /* 800B3FD4 */ void setSpeedAndAngleNormal(); /* 800B444C */ void setSpeedAndAngleAtn(); /* 800B477C */ int checkRequestTalkActor(dAttList_c*, fopAc_ac_c*); - /* 800B47B4 */ void checkServiceWaitMode(); + /* 800B47B4 */ bool checkServiceWaitMode(); /* 800B48D0 */ void setJumpMode(); /* 800B4908 */ f32 getMetamorphoseNearDis() const; /* 800B4918 */ f32 getMetamorphoseFarDis() const; @@ -1401,40 +1427,40 @@ public: /* 800B5BC0 */ void setFallVoice(); /* 800B5C34 */ void setLandPassiveData(); /* 800B5C64 */ void setStepLandVibration(); - /* 800B5CCC */ void checkLandAction(int); + /* 800B5CCC */ BOOL checkLandAction(int); /* 800B5F6C */ BOOL checkSlideAction(); /* 800B607C */ BOOL checkAutoJumpAction(); - /* 800B69CC */ bool checkCutJumpInFly(); + /* 800B69CC */ BOOL checkCutJumpInFly(); /* 800B6A30 */ BOOL checkFrontWallTypeAction(); - /* 800B6F28 */ void checkItemActionInitStart(); - /* 800B7090 */ void checkItemChangeAutoAction(); + /* 800B6F28 */ int checkItemActionInitStart(); + /* 800B7090 */ int checkItemChangeAutoAction(); /* 800B7168 */ void setFastShotTimer(); /* 800B7190 */ void cancelItemUseQuake(int); - /* 800B71EC */ void cancelUpperItemReadyAnime(int); - /* 800B72E4 */ void checkItemActorPointer(); + /* 800B71EC */ int cancelUpperItemReadyAnime(int); + /* 800B72E4 */ BOOL checkItemActorPointer(); /* 800B7390 */ bool checkSwordTwirlAction(); /* 800B74B4 */ BOOL checkUpperItemActionFly(); /* 800B7528 */ void checkItemButtonChange(); - /* 800B75EC */ void checkUpperItemAction(); + /* 800B75EC */ BOOL checkUpperItemAction(); /* 800B7B7C */ void orderPeep(); /* 800B7BF8 */ int orderTalk(int); /* 800B80C4 */ int orderZTalk(); - /* 800B8374 */ void checkNormalAction(); + /* 800B8374 */ int checkNormalAction(); /* 800B8930 */ bool checkReadyItem(); - /* 800B8988 */ void checkItemAction(); - /* 800B9010 */ bool checkRAction(); - /* 800B9018 */ void checkMoveDoAction(); + /* 800B8988 */ BOOL checkItemAction(); + /* 800B9010 */ BOOL checkRAction(); + /* 800B9018 */ BOOL checkMoveDoAction(); /* 800B9148 */ BOOL checkSideRollAction(int); /* 800B9254 */ BOOL checkNoUpperAnime() const; - /* 800B92D0 */ void checkOneHandItemEquipAnime() const; - /* 800B92F8 */ void checkItemEquipAnime() const; + /* 800B92D0 */ BOOL checkOneHandItemEquipAnime() const; + /* 800B92F8 */ BOOL checkItemEquipAnime() const; /* 800B9340 */ BOOL checkEquipAnime() const; /* 800B9398 */ BOOL checkWindDashAnime() const; - /* 800B93CC */ void checkSwordTwirlAnime() const; + /* 800B93CC */ BOOL checkSwordTwirlAnime() const; /* 800B93F4 */ void swordEquip(int); /* 800B9580 */ void swordUnequip(); - /* 800B9640 */ void itemEquip(u16); - /* 800B96A4 */ void itemUnequip(u16, f32); + /* 800B9640 */ void itemEquip(u16 i_itemID); + /* 800B96A4 */ void itemUnequip(u16 i_itemID, f32 i_playSpeed); /* 800B97EC */ bool checkFastUnequip(); /* 800B983C */ void allUnequip(int); /* 800B994C */ BOOL checkItemChangeFromButton(); @@ -1444,10 +1470,10 @@ public: /* 800BA0D0 */ int checkNextAction(int); /* 800BA6A0 */ void commonChangeItem(); /* 800BA914 */ void setItemAction(); - /* 800BAF08 */ void checkNextActionFromCrouch(int); + /* 800BAF08 */ bool checkNextActionFromCrouch(int); /* 800BAF80 */ int checkUpperReadyThrowAnime() const; /* 800BB020 */ void getBodyAngleXBasePos(cXyz*); - /* 800BB084 */ void getBodyAngleXAtnActor(int); + /* 800BB084 */ s16 getBodyAngleXAtnActor(int); /* 800BB2B0 */ void setBodyAngleXReadyAnime(int); /* 800BB324 */ void setMagicArmorBrk(int); /* 800BB408 */ BOOL checkMagicArmorHeavy() const; @@ -1458,11 +1484,11 @@ public: /* 800BBD40 */ void setFootSpeed(); /* 800BBF68 */ void posMove(); /* 800BD6FC */ void autoGroundHit(); - /* 800BDD70 */ void startPeepChange(); + /* 800BDD70 */ bool startPeepChange(); /* 800BDE20 */ void setLastSceneDamage(int, u32*); /* 800BDE48 */ void setLastSceneMode(u32*); - /* 800BDF60 */ void startRestartRoom(u32, int, int, int); - /* 800BE26C */ void checkCoachGuardGame(); + /* 800BDF60 */ int startRestartRoom(u32, int, int, int); + /* 800BE26C */ BOOL checkCoachGuardGame(); /* 800BE2C0 */ void checkRoofRestart(); /* 800BE3E4 */ bool checkRestartRoom(); /* 800BE9D4 */ s16 getSceneExitMoveAngle(); @@ -1474,7 +1500,7 @@ public: /* 800BF204 */ void setBasAnime(daAlink_c::daAlink_UNDER); /* 800BF37C */ void initBasAnime(); /* 800BF4E0 */ void resetBasAnime(); - /* 800BF500 */ void checkSightLine(f32, cXyz*); + /* 800BF500 */ BOOL checkSightLine(f32, cXyz*); /* 800BF79C */ void setMetamorphoseModel(int); /* 800BF854 */ void keepItemData(); /* 800BF884 */ void returnKeepItemData(); @@ -1486,8 +1512,8 @@ public: /* 800BFE48 */ J3DModelData* loadAramBmd(u16, u32); /* 800BFF04 */ void* loadAram(u16, u32); /* 800BFF70 */ J3DAnmTevRegKey* loadAramItemBrk(u16, J3DModel*); - /* 800BFFCC */ void loadAramItemBtk(u16, J3DModel*); - /* 800C0028 */ void loadAramItemBtp(u16, J3DModel*); + /* 800BFFCC */ J3DAnmTextureSRTKey* loadAramItemBtk(u16, J3DModel*); + /* 800C0028 */ J3DAnmTexPattern* loadAramItemBtp(u16, J3DModel*); /* 800C0084 */ void changeItemBck(u16, f32); /* 800C0114 */ int checkGroupItem(int, int) const; /* 800C0164 */ int checkSetItemTrigger(int); @@ -1505,8 +1531,8 @@ public: /* 800C05DC */ bool checkNotHeavyBootsStage(); /* 800C0630 */ bool checkNotAutoJumpStage(); /* 800C0678 */ static bool checkCastleTownUseItem(u16); - /* 800C077C */ void changeItemTriggerKeepProc(u8, int); - /* 800C0A9C */ void checkNewItemChange(u8); + /* 800C077C */ int changeItemTriggerKeepProc(u8, int); + /* 800C0A9C */ int checkNewItemChange(u8); /* 800C12DC */ void deleteEquipItem(int playSound, int deleteKantera); /* 800C1704 */ void setLight(); /* 800C1CEC */ void setFrontRollCrashShock(u8); @@ -1514,13 +1540,13 @@ public: /* 800C1F6C */ void commonProcInit(daAlink_c::daAlink_PROC procID); /* 800C2DA4 */ BOOL commonProcInitNotSameProc(daAlink_PROC procID); /* 800C2DDC */ int procPreActionUnequipInit(int, fopAc_ac_c*); - /* 800C2EAC */ void procPreActionUnequip(); + /* 800C2EAC */ int procPreActionUnequip(); /* 800C3098 */ int procServiceWaitInit(); /* 800C30F0 */ int procServiceWait(); - /* 800C3224 */ void procTiredWaitInit(); + /* 800C3224 */ int procTiredWaitInit(); /* 800C3338 */ int procTiredWait(); /* 800C33B8 */ int procWaitInit(); - /* 800C3504 */ void procWait(); + /* 800C3504 */ int procWait(); /* 800C36CC */ int procMoveInit(); /* 800C3730 */ int procMove(); /* 800C3810 */ int procAtnMoveInit(); @@ -1538,48 +1564,48 @@ public: /* 800C40F0 */ int procSideStepLandInit(); /* 800C4278 */ int procSideStepLand(); /* 800C4378 */ int procSlideInit(s16); - /* 800C4514 */ void procSlide(); + /* 800C4514 */ int procSlide(); /* 800C47AC */ int procSlideLandInit(int); /* 800C4894 */ int procSlideLand(); /* 800C494C */ int procFrontRollInit(); - /* 800C4B40 */ void procFrontRoll(); - /* 800C4F14 */ void procFrontRollCrashInit(); - /* 800C4FFC */ void procFrontRollCrash(); - /* 800C5160 */ void procFrontRollSuccessInit(); - /* 800C5240 */ void procFrontRollSuccess(); + /* 800C4B40 */ int procFrontRoll(); + /* 800C4F14 */ int procFrontRollCrashInit(); + /* 800C4FFC */ int procFrontRollCrash(); + /* 800C5160 */ int procFrontRollSuccessInit(); + /* 800C5240 */ int procFrontRollSuccess(); /* 800C5328 */ int procSideRollInit(int); - /* 800C5484 */ void procSideRoll(); + /* 800C5484 */ int procSideRoll(); /* 800C5700 */ void backJumpSpeedDec(); /* 800C57A4 */ int procBackJumpInit(int); - /* 800C5964 */ void procBackJump(); - /* 800C5A54 */ void procBackJumpLandInit(int); - /* 800C5AF0 */ void procBackJumpLand(); - /* 800C5C28 */ void procSlipInit(); - /* 800C5CA4 */ void procSlip(); - /* 800C5E68 */ void procAutoJumpInit(int); - /* 800C61EC */ void procAutoJump(); - /* 800C66DC */ void procDiveJumpInit(); - /* 800C6798 */ void procDiveJump(); - /* 800C6850 */ void procRollJumpInit(); - /* 800C692C */ void procRollJump(); + /* 800C5964 */ int procBackJump(); + /* 800C5A54 */ int procBackJumpLandInit(int); + /* 800C5AF0 */ int procBackJumpLand(); + /* 800C5C28 */ int procSlipInit(); + /* 800C5CA4 */ int procSlip(); + /* 800C5E68 */ int procAutoJumpInit(int); + /* 800C61EC */ int procAutoJump(); + /* 800C66DC */ int procDiveJumpInit(); + /* 800C6798 */ int procDiveJump(); + /* 800C6850 */ int procRollJumpInit(); + /* 800C692C */ int procRollJump(); /* 800C6A48 */ int procFallInit(int, f32); - /* 800C6D20 */ void procFall(); - /* 800C6F18 */ void procLandInit(f32); - /* 800C6FE4 */ void procLand(); + /* 800C6D20 */ int procFall(); + /* 800C6F18 */ int procLandInit(f32); + /* 800C6FE4 */ int procLand(); /* 800C70F8 */ int procSmallJumpInit(int); - /* 800C72D4 */ void procSmallJump(); - /* 800C74D4 */ void procStepMoveInit(); - /* 800C755C */ void procStepMove(); - /* 800C7690 */ void procCrouchInit(); - /* 800C76F8 */ void procCrouch(); + /* 800C72D4 */ int procSmallJump(); + /* 800C74D4 */ int procStepMoveInit(); + /* 800C755C */ int procStepMove(); + /* 800C7690 */ int procCrouchInit(); + /* 800C76F8 */ int procCrouch(); /* 800C77F4 */ int procCoMetamorphoseInit(); - /* 800C7C64 */ void procCoMetamorphose(); - /* 800C82E8 */ void procCoMetamorphoseOnlyInit(); - /* 800C83A0 */ void procCoMetamorphoseOnly(); + /* 800C7C64 */ int procCoMetamorphose(); + /* 800C82E8 */ int procCoMetamorphoseOnlyInit(); + /* 800C83A0 */ int procCoMetamorphoseOnly(); /* 800C8460 */ int procFloorDownReboundInit(); - /* 800C84D0 */ void procFloorDownRebound(); - /* 800C854C */ void procGoronRideWaitInit(fopAc_ac_c*); - /* 800C85D8 */ void procGoronRideWait(); + /* 800C84D0 */ int procFloorDownRebound(); + /* 800C854C */ int procGoronRideWaitInit(fopAc_ac_c*); + /* 800C85D8 */ int procGoronRideWait(); /* 800C8700 */ int execute(); /* 800CAFC8 */ void setDrawHand(); /* 800CB480 */ bool checkSwordDraw(); @@ -1593,23 +1619,23 @@ public: /* 800CC2E0 */ void modelDraw(J3DModel*, int); /* 800CC364 */ void setWaterDropColor(J3DGXColorS10 const*); /* 800CC7DC */ void initTevCustomColor(); - /* 800CC7FC */ void draw(); + /* 800CC7FC */ int draw(); /* 800CD7AC */ ~daAlink_c(); /* 800CE294 */ void checkNoSubjectModeCamera(); - /* 800CE468 */ void acceptSubjectModeChange(); - /* 800CE628 */ void checkSubjectAction(); + /* 800CE468 */ bool acceptSubjectModeChange(); + /* 800CE628 */ int checkSubjectAction(); /* 800CE728 */ void checkBodyAngleX(s16); - /* 800CE8A0 */ void setBodyAngleToCamera(); + /* 800CE8A0 */ BOOL setBodyAngleToCamera(); /* 800CEAF4 */ void setSubjectMode(); - /* 800CEB58 */ void subjectCancelTrigger(); - /* 800CEBD8 */ void checkSubjectEnd(int); + /* 800CEB58 */ BOOL subjectCancelTrigger(); + /* 800CEBD8 */ int checkSubjectEnd(int); /* 800CECE4 */ void searchPeepObj(fopAc_ac_c*, void*); - /* 800CED84 */ void procCoSubjectivityInit(); - /* 800CEE08 */ void procCoSubjectivity(); - /* 800CEF70 */ void procCoSwimSubjectivityInit(); - /* 800CF018 */ void procCoSwimSubjectivity(); - /* 800CF100 */ void procCoPeepSubjectivityInit(); - /* 800CF1B8 */ void procCoPeepSubjectivity(); + /* 800CED84 */ int procCoSubjectivityInit(); + /* 800CEE08 */ int procCoSubjectivity(); + /* 800CEF70 */ int procCoSwimSubjectivityInit(); + /* 800CF018 */ int procCoSwimSubjectivity(); + /* 800CF100 */ int procCoPeepSubjectivityInit(); + /* 800CF1B8 */ int procCoPeepSubjectivity(); /* 800CF380 */ daAlink_c(); /* 800CFEB0 */ BOOL checkRideOn() const; /* 800CFF4C */ BOOL checkAttentionLock(); @@ -1640,9 +1666,10 @@ public: /* 800D1454 */ void checkComboCnt(); /* 800D152C */ void setCutType(u8); /* 800D1540 */ void setCylAtParam(u32, dCcG_At_Spl, u8, u8, int, f32, f32); - /* 800D1688 */ void setSwordAtParam(dCcG_At_Spl, u8, u8, int, f32, f32); - /* 800D1788 */ static bool notSwordHitVibActor(fopAc_ac_c*); - /* 800D17EC */ void setSwordHitVibration(dCcD_GObjInf*); + /* 800D1688 */ void setSwordAtParam(dCcG_At_Spl i_spl, u8 i_hitMark, u8 i_AtSe, int i_atp, f32 param_4, + f32 i_radius); + /* 800D1788 */ static BOOL notSwordHitVibActor(fopAc_ac_c*); + /* 800D17EC */ BOOL setSwordHitVibration(dCcD_GObjInf*); /* 800D1920 */ BOOL checkAtShieldHit(dCcD_GObjInf&); /* 800D1978 */ bool checkCutReverseAt(dCcD_GObjInf*); /* 800D19C8 */ BOOL changeCutReverseProc(daAlink_c::daAlink_ANM); @@ -1650,162 +1677,162 @@ public: /* 800D20B4 */ BOOL checkForceSwordSwing(); /* 800D20FC */ void setComboReserb(); /* 800D2188 */ BOOL checkComboReserb(); - /* 800D21D0 */ bool commonCutAction(); + /* 800D21D0 */ int commonCutAction(); /* 800D2284 */ void setSwordVoiceSe(u32); /* 800D22BC */ void setSwordChargeVoiceSe(); /* 800D2304 */ void setSwordComboVoice(); /* 800D2368 */ bool checkCutTurnInputTrigger(); - /* 800D23C0 */ void checkCutAction(); - /* 800D26EC */ void getCutDirection(); - /* 800D2760 */ void checkCutCancelNextMode(int); + /* 800D23C0 */ int checkCutAction(); + /* 800D26EC */ int getCutDirection(); + /* 800D2760 */ BOOL checkCutCancelNextMode(int); /* 800D27E4 */ void checkDoCutAction(); - /* 800D2890 */ static BOOL checkCutBackState(); - /* 800D28F4 */ void checkCutHeadState(); - /* 800D29D4 */ void checkDownAttackState(); - /* 800D2ABC */ void checkCutLargeTurnState() const; + /* 800D2890 */ BOOL checkCutBackState(); + /* 800D28F4 */ BOOL checkCutHeadState(); + /* 800D29D4 */ BOOL checkDownAttackState(); + /* 800D2ABC */ BOOL checkCutLargeTurnState() const; /* 800D2B88 */ void cancelCutCharge(); /* 800D2BFC */ void initCutAtnActorSearch(); /* 800D2C54 */ void checkCutAtnActorChange(); /* 800D2C78 */ void setCutJumpSpeed(int); - /* 800D2F58 */ void procCutNormalInit(int); - /* 800D31B8 */ void procCutNormal(); - /* 800D34D8 */ void procCutFinishInit(int); - /* 800D382C */ void procCutFinish(); - /* 800D3ADC */ void procCutFinishJumpUpInit(); - /* 800D3CCC */ void procCutFinishJumpUp(); - /* 800D3DD8 */ void procCutFinishJumpUpLandInit(); - /* 800D3ECC */ void procCutFinishJumpUpLand(); - /* 800D4068 */ void procCutReverseInit(daAlink_c::daAlink_ANM); - /* 800D41FC */ void procCutReverse(); - /* 800D42FC */ bool procCutJumpInit(int); - /* 800D43F8 */ bool procCutJump(); - /* 800D452C */ void procCutJumpLandInit(int); - /* 800D4684 */ void procCutJumpLand(); - /* 800D47DC */ void procCutTurnInit(int, int); - /* 800D4A74 */ void procCutTurn(); - /* 800D4C68 */ void procCutTurnChargeInit(); - /* 800D4D04 */ void procCutTurnCharge(); - /* 800D4DDC */ void procCutTurnMoveInit(int); - /* 800D4EFC */ void procCutTurnMove(); - /* 800D53C8 */ void procCutDownInit(); - /* 800D57F8 */ void procCutDown(); - /* 800D58A0 */ void procCutDownLandInit(fopEn_enemy_c*); - /* 800D5ADC */ void procCutDownLand(); - /* 800D5C88 */ void procCutHeadInit(); - /* 800D5FC8 */ void procCutHead(); - /* 800D6130 */ void procCutHeadLandInit(); - /* 800D618C */ void procCutHeadLand(); - /* 800D6238 */ void procCutLargeJumpChargeInit(); - /* 800D62A0 */ void procCutLargeJumpCharge(); - /* 800D6374 */ void procCutLargeJumpInit(); - /* 800D6484 */ bool procCutLargeJump(); - /* 800D66C0 */ void procCutLargeJumpLandInit(int); - /* 800D67FC */ void procCutLargeJumpLand(); - /* 800D698C */ void procSwordUnequipSpInit(); - /* 800D6A38 */ void procSwordUnequipSp(); - /* 800D6D94 */ void getFreezeR() const; - /* 800D6DA4 */ void getFreezeG() const; - /* 800D6DB4 */ void getFreezeB() const; - /* 800D6DC4 */ void checkMiddleBossGoronRoom(); + /* 800D2F58 */ int procCutNormalInit(int); + /* 800D31B8 */ int procCutNormal(); + /* 800D34D8 */ int procCutFinishInit(int); + /* 800D382C */ int procCutFinish(); + /* 800D3ADC */ int procCutFinishJumpUpInit(); + /* 800D3CCC */ int procCutFinishJumpUp(); + /* 800D3DD8 */ int procCutFinishJumpUpLandInit(); + /* 800D3ECC */ int procCutFinishJumpUpLand(); + /* 800D4068 */ int procCutReverseInit(daAlink_c::daAlink_ANM); + /* 800D41FC */ int procCutReverse(); + /* 800D42FC */ int procCutJumpInit(int); + /* 800D43F8 */ int procCutJump(); + /* 800D452C */ int procCutJumpLandInit(int); + /* 800D4684 */ int procCutJumpLand(); + /* 800D47DC */ int procCutTurnInit(int, int); + /* 800D4A74 */ int procCutTurn(); + /* 800D4C68 */ int procCutTurnChargeInit(); + /* 800D4D04 */ int procCutTurnCharge(); + /* 800D4DDC */ int procCutTurnMoveInit(int); + /* 800D4EFC */ int procCutTurnMove(); + /* 800D53C8 */ int procCutDownInit(); + /* 800D57F8 */ int procCutDown(); + /* 800D58A0 */ int procCutDownLandInit(fopEn_enemy_c*); + /* 800D5ADC */ int procCutDownLand(); + /* 800D5C88 */ int procCutHeadInit(); + /* 800D5FC8 */ int procCutHead(); + /* 800D6130 */ int procCutHeadLandInit(); + /* 800D618C */ int procCutHeadLand(); + /* 800D6238 */ int procCutLargeJumpChargeInit(); + /* 800D62A0 */ int procCutLargeJumpCharge(); + /* 800D6374 */ int procCutLargeJumpInit(); + /* 800D6484 */ int procCutLargeJump(); + /* 800D66C0 */ int procCutLargeJumpLandInit(int); + /* 800D67FC */ int procCutLargeJumpLand(); + /* 800D698C */ int procSwordUnequipSpInit(); + /* 800D6A38 */ int procSwordUnequipSp(); + /* 800D6D94 */ s16 getFreezeR() const; + /* 800D6DA4 */ s16 getFreezeG() const; + /* 800D6DB4 */ s16 getFreezeB() const; + /* 800D6DC4 */ bool checkMiddleBossGoronRoom(); /* 800D6E24 */ void freezeTimerDamage(); - /* 800D6F2C */ void checkNoLandDamageSlidePolygon(); + /* 800D6F2C */ BOOL checkNoLandDamageSlidePolygon(); /* 800D6FE0 */ void checkCutLandDamage(); - /* 800D70A0 */ void checkCaughtEscapeCutTurn(); - /* 800D7208 */ f32 damageMagnification(int, int); - /* 800D72BC */ void setDamagePoint(int, int, int, int); + /* 800D70A0 */ BOOL checkCaughtEscapeCutTurn(); + /* 800D7208 */ f32 damageMagnification(int i_checkZoraMag, int); + /* 800D72BC */ int setDamagePoint(int i_dmgAmount, int i_checkZoraMag, int i_setDmgTimer, int); /* 800D7478 */ void setDamagePointNormal(int); /* 800D74A4 */ void setLandDamagePoint(int); /* 800D74F4 */ void getDamageVec(dCcD_GObjInf*); /* 800D76C4 */ void setDashDamage(); - /* 800D7768 */ void checkIcePolygonDamage(cBgS_PolyInfo*); + /* 800D7768 */ static bool checkIcePolygonDamage(cBgS_PolyInfo*); /* 800D77C8 */ BOOL checkMagicArmorNoDamage(); /* 800D7820 */ void checkPolyDamage(); /* 800D7A98 */ void checkElecReturnDamage(dCcD_GObjInf&, fopAc_ac_c**); /* 800D7B18 */ void damageTimerCount(); - /* 800D7BE8 */ void checkHugeAttack(int) const; - /* 800D7C14 */ void checkLargeAttack(int) const; + /* 800D7BE8 */ bool checkHugeAttack(int) const; + /* 800D7C14 */ bool checkLargeAttack(int) const; /* 800D7C40 */ BOOL checkDamageAction(); - /* 800D8F3C */ void procDamageInit(dCcD_GObjInf*, int); - /* 800D9514 */ void procDamage(); - /* 800D96DC */ void procCoLargeDamageInit(int, int, s16, s16, dCcD_GObjInf*, int); - /* 800D9E88 */ void procCoLargeDamage(); - /* 800DA180 */ void procLargeDamageUpInit(int, int, s16, s16); - /* 800DA554 */ void procLargeDamageUp(); - /* 800DA82C */ void procCoLargeDamageWallInit(int, int, s16, s16); - /* 800DAC28 */ void procCoLargeDamageWall(); - /* 800DAC84 */ void procCoPolyDamageInit(); - /* 800DAD90 */ void procCoPolyDamage(); - /* 800DAE10 */ void procLandDamageInit(int); - /* 800DB060 */ void procLandDamage(); - /* 800DB140 */ void procCoElecDamageInit(fopAc_ac_c*, dCcD_GObjInf*, int); - /* 800DB418 */ void procCoElecDamage(); - /* 800DB5B0 */ void procStEscapeInit(); - /* 800DB610 */ void procStEscape(); - /* 800DB6A4 */ void procDkCaughtInit(unsigned int); - /* 800DB860 */ void procDkCaught(); + /* 800D8F3C */ int procDamageInit(dCcD_GObjInf*, int); + /* 800D9514 */ int procDamage(); + /* 800D96DC */ int procCoLargeDamageInit(int, int, s16, s16, dCcD_GObjInf*, int); + /* 800D9E88 */ int procCoLargeDamage(); + /* 800DA180 */ int procLargeDamageUpInit(int, int, s16, s16); + /* 800DA554 */ int procLargeDamageUp(); + /* 800DA82C */ int procCoLargeDamageWallInit(int, int, s16, s16); + /* 800DAC28 */ int procCoLargeDamageWall(); + /* 800DAC84 */ int procCoPolyDamageInit(); + /* 800DAD90 */ int procCoPolyDamage(); + /* 800DAE10 */ int procLandDamageInit(int); + /* 800DB060 */ int procLandDamage(); + /* 800DB140 */ int procCoElecDamageInit(fopAc_ac_c*, dCcD_GObjInf*, int); + /* 800DB418 */ int procCoElecDamage(); + /* 800DB5B0 */ int procStEscapeInit(); + /* 800DB610 */ int procStEscape(); + /* 800DB6A4 */ int procDkCaughtInit(unsigned int); + /* 800DB860 */ int procDkCaught(); /* 800DBC98 */ void setScreamWaitAnime(); - /* 800DBD1C */ void procScreamWaitInit(); - /* 800DBDA4 */ void procScreamWait(); - /* 800DBE00 */ void procCoSandWallHitInit(); - /* 800DBE74 */ void procCoSandWallHit(); - /* 800DBED8 */ void procCoLavaReturnInit(int); - /* 800DC214 */ void procCoLavaReturn(); - /* 800DC278 */ void procCoSwimFreezeReturnInit(); - /* 800DC474 */ void procCoSwimFreezeReturn(); + /* 800DBD1C */ int procScreamWaitInit(); + /* 800DBDA4 */ int procScreamWait(); + /* 800DBE00 */ int procCoSandWallHitInit(); + /* 800DBE74 */ int procCoSandWallHit(); + /* 800DBED8 */ int procCoLavaReturnInit(int); + /* 800DC214 */ int procCoLavaReturn(); + /* 800DC278 */ int procCoSwimFreezeReturnInit(); + /* 800DC474 */ int procCoSwimFreezeReturn(); /* 800DC548 */ static BOOL checkEnemyGroup(fopAc_ac_c*); /* 800DC5A4 */ static BOOL checkSpecialNpc(fopAc_ac_c*); /* 800DC5DC */ bool checkShieldAttackEmphasys(); /* 800DC678 */ BOOL checkGuardActionChange(); /* 800DC79C */ void stickArrowIncrement(int); /* 800DC8C4 */ void setArrowShieldActor(fopAc_ac_c*, int); - /* 800DCA2C */ void checkWoodShieldEquipNotIronBall() const; + /* 800DCA2C */ BOOL checkWoodShieldEquipNotIronBall() const; /* 800DCA80 */ void getArrowShieldOffset(cXyz const*, csXyz const*, cXyz*, cXyz*) const; /* 800DCD74 */ void setArrowShieldPos(cXyz*, csXyz*, cXyz const*, cXyz const*) const; /* 800DCDF0 */ BOOL checkUpperGuardAnime() const; - /* 800DCF04 */ void checkPlayerGuardAndAttack() const; - /* 800DCF64 */ void checkGuardAccept(); + /* 800DCF04 */ BOOL checkPlayerGuardAndAttack() const; + /* 800DCF64 */ BOOL checkGuardAccept(); /* 800DD008 */ void setUpperGuardAnime(f32); /* 800DD018 */ void setShieldGuard(); /* 800DD114 */ void setGuardSe(dCcD_GObjInf*); /* 800DD1D4 */ void setSmallGuard(dCcD_GObjInf*); - /* 800DD3E4 */ void procGuardSlipInit(int, dCcD_GObjInf*); - /* 800DD894 */ void procGuardSlip(); - /* 800DDA10 */ void procGuardAttackInit(); - /* 800DDBA8 */ void procGuardAttack(); - /* 800DDE58 */ void procGuardBreakInit(); - /* 800DDF2C */ void procGuardBreak(); + /* 800DD3E4 */ int procGuardSlipInit(int, dCcD_GObjInf*); + /* 800DD894 */ int procGuardSlip(); + /* 800DDA10 */ int procGuardAttackInit(); + /* 800DDBA8 */ int procGuardAttack(); + /* 800DDE58 */ int procGuardBreakInit(); + /* 800DDF2C */ int procGuardBreak(); /* 800DE008 */ bool procTurnMoveInit(int); - /* 800DE380 */ void procTurnMove(); + /* 800DE380 */ int procTurnMove(); /* 800DE64C */ void getArrowFlyData(f32*, f32*, int) const; - /* 800DE740 */ void getArrowIncAtR() const; - /* 800DE750 */ void getBombArrowFlyExplodeTime() const; - /* 800DE760 */ void getArrowIncAtMaxStart() const; - /* 800DE770 */ void getArrowIncAtMax() const; + /* 800DE740 */ f32 getArrowIncAtR() const; + /* 800DE750 */ s16 getBombArrowFlyExplodeTime() const; + /* 800DE760 */ f32 getArrowIncAtMaxStart() const; + /* 800DE770 */ f32 getArrowIncAtMax() const; /* 800DE780 */ BOOL checkBowAndSlingItem(int); /* 800DE7D4 */ void setSlingModel(); - /* 800DE884 */ void checkBowCameraArrowPosP(s16*, s16*); - /* 800DE9B8 */ void checkBowReadyAnime() const; - /* 800DE9E8 */ void checkBowAnime() const; + /* 800DE884 */ cXyz* checkBowCameraArrowPosP(s16*, s16*); + /* 800DE9B8 */ BOOL checkBowReadyAnime() const; + /* 800DE9E8 */ BOOL checkBowAnime() const; /* 800DEA3C */ void makeArrow(); /* 800DEAE4 */ void deleteArrow(); /* 800DEB8C */ void setBowOrSlingStatus(); /* 800DEBC8 */ void changeArrowType(); - /* 800DED88 */ void cancelBowMoveRideNotAtn(); - /* 800DEE1C */ void cancelBowMove(); + /* 800DED88 */ BOOL cancelBowMoveRideNotAtn(); + /* 800DEE1C */ BOOL cancelBowMove(); /* 800DEEDC */ void setBowReadyAnime(); /* 800DEFB8 */ void setBowReloadAnime(); /* 800DF0BC */ void checkUpperItemActionBow(); /* 800DF798 */ void checkUpperItemActionBowFly(); - /* 800DF814 */ void checkNextActionBow(); + /* 800DF814 */ int checkNextActionBow(); /* 800DFAE8 */ void setBowModel(); /* 800DFBC8 */ bool checkBowGrabLeftHand() const; /* 800DFC28 */ void setBowHangAnime(); /* 800DFC70 */ void setBowNormalAnime(); /* 800DFCD8 */ void setBowSight(); - /* 800DFD6C */ void procBowSubjectInit(); - /* 800DFDDC */ void procBowSubject(); - /* 800DFE3C */ void procBowMoveInit(); - /* 800DFEC0 */ void procBowMove(); + /* 800DFD6C */ int procBowSubjectInit(); + /* 800DFDDC */ int procBowSubject(); + /* 800DFE3C */ int procBowMoveInit(); + /* 800DFEC0 */ int procBowMove(); /* 800DFFE0 */ BOOL checkBoomerangLockAccept(); /* 800E0010 */ f32 getBoomSpeed(); /* 800E00B0 */ f32 getBoomCatchSpeed() const; @@ -1825,18 +1852,18 @@ public: /* 800E05E8 */ void setThrowBoomerangAnime(); /* 800E0630 */ void setBoomerangCatchAnime(); /* 800E06B8 */ void throwBoomerang(); - /* 800E08C4 */ void returnBoomerang(int); - /* 800E0A9C */ void checkUpperItemActionBoomerang(); + /* 800E08C4 */ int returnBoomerang(int); + /* 800E0A9C */ int checkUpperItemActionBoomerang(); /* 800E0B58 */ void checkUpperItemActionBoomerangFly(); - /* 800E0BE4 */ void checkNextActionBoomerang(); - /* 800E0D8C */ void checkBoomerangCatchAction(); + /* 800E0BE4 */ int checkNextActionBoomerang(); + /* 800E0D8C */ int checkBoomerangCatchAction(); /* 800E0E64 */ void setBoomerangSight(); - /* 800E0F10 */ void procBoomerangSubjectInit(); - /* 800E0FA0 */ void procBoomerangSubject(); - /* 800E1060 */ void procBoomerangMoveInit(); - /* 800E10F4 */ void procBoomerangMove(); - /* 800E11D8 */ void procBoomerangCatchInit(); - /* 800E1248 */ void procBoomerangCatch(); + /* 800E0F10 */ int procBoomerangSubjectInit(); + /* 800E0FA0 */ int procBoomerangSubject(); + /* 800E1060 */ int procBoomerangMoveInit(); + /* 800E10F4 */ int procBoomerangMove(); + /* 800E11D8 */ int procBoomerangCatchInit(); + /* 800E1248 */ int procBoomerangCatch(); /* 800E12E0 */ static BOOL checkLv6BossRoom(); /* 800E1310 */ f32 getCopyRodBallSpeed() const; /* 800E1320 */ f32 getCopyRodBallReturnSpeed() const; @@ -1845,39 +1872,39 @@ public: /* 800E1390 */ fopAc_ac_c* getCopyRodCameraActor(); /* 800E13AC */ void initCopyRodUpperAnimeSpeed(int); /* 800E1408 */ static BOOL checkForestOldCentury(); - /* 800E1530 */ void checkCopyRodAnime() const; + /* 800E1530 */ int checkCopyRodAnime() const; /* 800E158C */ void setCopyRodControllAnime(); /* 800E15FC */ void setCopyRodControllUpperSpeedRate(); /* 800E1748 */ void setCopyRodModel(); /* 800E1840 */ void setCopyRodReadyAnime(); /* 800E191C */ void throwCopyRod(); - /* 800E1A30 */ void returnCopyRod(); - /* 800E1ADC */ void checkUpperItemActionCopyRod(); + /* 800E1A30 */ int returnCopyRod(); + /* 800E1ADC */ int checkUpperItemActionCopyRod(); /* 800E1BB4 */ void checkUpperItemActionCopyRodFly(); - /* 800E1C44 */ void checkNextActionCopyRod(); + /* 800E1C44 */ int checkNextActionCopyRod(); /* 800E1D6C */ void setCopyRodSight(); - /* 800E1E20 */ void procCopyRodSubjectInit(); - /* 800E1EB0 */ void procCopyRodSubject(); - /* 800E1F68 */ void procCopyRodMoveInit(); - /* 800E1FFC */ void procCopyRodMove(); - /* 800E20C8 */ void procCopyRodSwingInit(); - /* 800E21FC */ void procCopyRodSwing(); - /* 800E2308 */ void procCopyRodReviveInit(); - /* 800E23A4 */ void procCopyRodRevive(); + /* 800E1E20 */ int procCopyRodSubjectInit(); + /* 800E1EB0 */ int procCopyRodSubject(); + /* 800E1F68 */ int procCopyRodMoveInit(); + /* 800E1FFC */ int procCopyRodMove(); + /* 800E20C8 */ int procCopyRodSwingInit(); + /* 800E21FC */ int procCopyRodSwing(); + /* 800E2308 */ int procCopyRodReviveInit(); + /* 800E23A4 */ int procCopyRodRevive(); /* 800E23FC */ void concatMagneBootMtx(); /* 800E243C */ void concatMagneBootInvMtx(); /* 800E247C */ void multVecMagneBootInvMtx(cXyz*); /* 800E24B0 */ int commonMagneLineCheck(cXyz*, cXyz*); - /* 800E251C */ void checkBootsMoveAnime(int); + /* 800E251C */ BOOL checkBootsMoveAnime(int); /* 800E2580 */ void setHeavyBoots(int); /* 800E2738 */ s16 getMagneBootsLocalAngleY(s16, int); /* 800E2808 */ void setMagneBootsMtx(cBgS_PolyInfo*, int); /* 800E2DC4 */ void cancelMagneBootsOn(); /* 800E2F88 */ int checkMagneBootsFly(); - /* 800E3048 */ void procBootsEquipInit(); - /* 800E30DC */ void procBootsEquip(); + /* 800E3048 */ int procBootsEquipInit(); + /* 800E30DC */ int procBootsEquip(); /* 800E3218 */ int procMagneBootsFlyInit(); - /* 800E3454 */ void procMagneBootsFly(); + /* 800E3454 */ int procMagneBootsFly(); /* 800E3760 */ s16 getBombExplodeTime() const; /* 800E3770 */ f32 getBombGravity() const; /* 800E3780 */ f32 getBombMaxFallSpeed() const; @@ -1892,21 +1919,21 @@ public: /* 800E3810 */ f32 getBombExplodeWaterEffectLimit() const; /* 800E3820 */ s16 getBombInsectLimitAngle() const; /* 800E38EC */ void checkGrabLineCheck(); - /* 800E3BCC */ void getGrabThrowRate(); - /* 800E3C1C */ void checkGrabThrowAnime() const; - /* 800E3C6C */ void checkGrabAnime() const; - /* 800E3C9C */ void checkGrabAnimeAndThrow() const; + /* 800E3BCC */ f32 getGrabThrowRate(); + /* 800E3C1C */ BOOL checkGrabThrowAnime() const; + /* 800E3C6C */ BOOL checkGrabAnime() const; + /* 800E3C9C */ BOOL checkGrabAnimeAndThrow() const; /* 800E3CF4 */ BOOL checkGrabCarryActor(); /* 800E3D1C */ void checkGrabSlowMoveActor(); - /* 800E3D6C */ void checkGrabHeavyActor(); - /* 800E3D94 */ void checkGrabSideActor(); + /* 800E3D6C */ BOOL checkGrabHeavyActor(); + /* 800E3D94 */ BOOL checkGrabSideActor(); /* 800E3DBC */ void setGrabUpperAnime(f32); /* 800E3F20 */ BOOL checkGrabRooster(); /* 800E3F50 */ void setGrabItemPos(); /* 800E4BD4 */ void freeGrabItem(); /* 800E4DEC */ void setGrabUpperSpeedRate(); /* 800E4FA8 */ void setCarryArmAngle(f32, f32); - /* 800E5150 */ void checkGrabNotThrow(); + /* 800E5150 */ BOOL checkGrabNotThrow(); /* 800E5170 */ void checkNextActionGrab(); /* 800E53AC */ void initGrabNextMode(); /* 800E53F8 */ void setGrabItemThrow(); @@ -1914,37 +1941,37 @@ public: /* 800E5830 */ void putObjLineCheck(dBgS_LinChk&, cXyz*, fopAc_ac_c*); /* 800E5B6C */ void grabLineCheck(cXyz*, cXyz*); /* 800E5BB4 */ void setGrabItemActor(fopAc_ac_c*); - /* 800E5CBC */ void procGrabReadyInit(); - /* 800E5EC8 */ void procGrabReady(); - /* 800E5FD0 */ void procGrabUpInit(); - /* 800E6230 */ void procGrabUp(); - /* 800E637C */ void procGrabMiss(); - /* 800E63F0 */ void procGrabThrowInit(int); - /* 800E65F8 */ void procGrabThrow(); - /* 800E672C */ void procGrabPutInit(); - /* 800E6914 */ void procGrabPut(); - /* 800E6A9C */ void procGrabWaitInit(); - /* 800E6C34 */ void procGrabWait(); - /* 800E6D6C */ void procGrabReboundInit(int); - /* 800E6E0C */ void procGrabRebound(); - /* 800E6EEC */ void procGrabStandInit(); - /* 800E6FE0 */ void procGrabStand(); + /* 800E5CBC */ int procGrabReadyInit(); + /* 800E5EC8 */ int procGrabReady(); + /* 800E5FD0 */ int procGrabUpInit(); + /* 800E6230 */ int procGrabUp(); + /* 800E637C */ int procGrabMiss(); + /* 800E63F0 */ int procGrabThrowInit(int); + /* 800E65F8 */ int procGrabThrow(); + /* 800E672C */ int procGrabPutInit(); + /* 800E6914 */ int procGrabPut(); + /* 800E6A9C */ int procGrabWaitInit(); + /* 800E6C34 */ int procGrabWait(); + /* 800E6D6C */ int procGrabReboundInit(int); + /* 800E6E0C */ int procGrabRebound(); + /* 800E6EEC */ int procGrabStandInit(); + /* 800E6FE0 */ int procGrabStand(); /* 800E70C0 */ bool checkInsectActorName(fopAc_ac_c*); - /* 800E70FC */ void procInsectCatchInit(); + /* 800E70FC */ int procInsectCatchInit(); /* 800E71D4 */ bool procInsectCatch(); - /* 800E7254 */ void procPickUpInit(); - /* 800E7460 */ void procPickUp(); - /* 800E75EC */ void procPickPutInit(int); - /* 800E76E0 */ void procPickPut(); + /* 800E7254 */ int procPickUpInit(); + /* 800E7460 */ int procPickUp(); + /* 800E75EC */ int procPickPutInit(int); + /* 800E76E0 */ int procPickPut(); /* 800E7894 */ void checkSetChainPullAnime(s16); /* 800E794C */ s16 getChainStickAngleY(s16) const; /* 800E7994 */ u8 checkChainEmphasys(); - /* 800E79F8 */ void searchFmChainPos(); + /* 800E79F8 */ u8 searchFmChainPos(); /* 800E7AEC */ void setFmChainPosFromOut(fopAc_ac_c*, cXyz*, int); - /* 800E7C30 */ void procFmChainUpInit(); - /* 800E7CC0 */ void procFmChainUp(); - /* 800E7DD8 */ void procFmChainStrongPullInit(); - /* 800E7E50 */ void procFmChainStrongPull(); + /* 800E7C30 */ int procFmChainUpInit(); + /* 800E7CC0 */ int procFmChainUp(); + /* 800E7DD8 */ int procFmChainStrongPullInit(); + /* 800E7E50 */ int procFmChainStrongPull(); /* 800E7ED0 */ void setWallGrabStatus(u8, u8); /* 800E7EE4 */ int getWallGrabStatus(); /* 800E7EF4 */ void wallGrabTrigger(); @@ -1957,55 +1984,55 @@ public: /* 800E8314 */ f32 getGoatCatchDistance2(); /* 800E8334 */ void endPushPull(); /* 800E8354 */ void getPushPullAnimeSpeed(); - /* 800E8428 */ void procCoPushPullWaitInit(int); - /* 800E857C */ void procCoPushPullWait(); - /* 800E875C */ void procCoPushMoveInit(int, int); - /* 800E89F0 */ void procCoPushMove(); - /* 800E8D1C */ void procPullMoveInit(int); - /* 800E8F44 */ void procPullMove(); + /* 800E8428 */ int procCoPushPullWaitInit(int); + /* 800E857C */ int procCoPushPullWait(); + /* 800E875C */ int procCoPushMoveInit(int, int); + /* 800E89F0 */ int procCoPushMove(); + /* 800E8D1C */ int procPullMoveInit(int); + /* 800E8F44 */ int procPullMove(); /* 800E9210 */ void setGoatStopGameFail(fopAc_ac_c*); - /* 800E9344 */ void procGoatMoveInit(); - /* 800E9434 */ void procGoatMove(); - /* 800E9894 */ void procGoatCatchInit(fopAc_ac_c*, f32); - /* 800E9BD0 */ void procGoatCatch(); - /* 800EA2A8 */ void procGoatStrokeInit(); - /* 800EA3AC */ void procGoatStroke(); - /* 800EA3F4 */ void procGoronMoveInit(); - /* 800EA4CC */ void procGoronMove(); - /* 800EA844 */ void checkSumouVsActor(); + /* 800E9344 */ int procGoatMoveInit(); + /* 800E9434 */ int procGoatMove(); + /* 800E9894 */ int procGoatCatchInit(fopAc_ac_c*, f32); + /* 800E9BD0 */ int procGoatCatch(); + /* 800EA2A8 */ int procGoatStrokeInit(); + /* 800EA3AC */ int procGoatStroke(); + /* 800EA3F4 */ int procGoronMoveInit(); + /* 800EA4CC */ int procGoronMove(); + /* 800EA844 */ BOOL checkSumouVsActor(); /* 800EA8D0 */ void cancelSumouMode(); /* 800EA908 */ void sumouPunchTrigger(); /* 800EA92C */ void setSumouPunchStatus(); - /* 800EA950 */ void procSumouReadyInit(); - /* 800EAA28 */ void procSumouReady(); - /* 800EAC4C */ void procSumouMoveInit(); - /* 800EAD84 */ void procSumouMove(); - /* 800EB208 */ void procSumouSideMoveInit(); - /* 800EB2BC */ void procSumouSideMove(); - /* 800EB624 */ void procSumouActionInit(int, int, int); - /* 800EBCE0 */ void procSumouAction(); - /* 800EC0F8 */ void procSumouStaggerInit(); - /* 800EC170 */ void procSumouStagger(); - /* 800EC20C */ void procSumouWinLoseInit(); - /* 800EC3D8 */ void procSumouWinLose(); - /* 800EC538 */ void procSumouShikoInit(); - /* 800EC5F4 */ void procSumouShiko(); + /* 800EA950 */ int procSumouReadyInit(); + /* 800EAA28 */ int procSumouReady(); + /* 800EAC4C */ int procSumouMoveInit(); + /* 800EAD84 */ int procSumouMove(); + /* 800EB208 */ int procSumouSideMoveInit(); + /* 800EB2BC */ int procSumouSideMove(); + /* 800EB624 */ int procSumouActionInit(int, int, int); + /* 800EBCE0 */ int procSumouAction(); + /* 800EC0F8 */ int procSumouStaggerInit(); + /* 800EC170 */ int procSumouStagger(); + /* 800EC20C */ int procSumouWinLoseInit(); + /* 800EC3D8 */ int procSumouWinLose(); + /* 800EC538 */ int procSumouShikoInit(); + /* 800EC5F4 */ int procSumouShiko(); /* 800EC76C */ void checkHorseZeldaBowMode(); /* 800EC7B0 */ void setHorseZeldaDamage(); - /* 800EC7DC */ bool checkHorseDashAccept(); - /* 800EC814 */ void checkCowGame(); - /* 800EC87C */ void getReinRideDirection(); + /* 800EC7DC */ BOOL checkHorseDashAccept(); + /* 800EC814 */ BOOL checkCowGame(); + /* 800EC87C */ int getReinRideDirection(); /* 800EC8F8 */ void checkReinRideBgCheck(); /* 800ECA3C */ void commonInitForceRideRein(); /* 800ECAAC */ void initForceRideBoar(); /* 800ECB58 */ void initForceRideHorse(); /* 800ECBD0 */ void rideGetOff(); - /* 800ECD90 */ void checkHorseNotDamageReaction() const; - /* 800ECDC4 */ void checkHorseWaitLashAnime() const; - /* 800ECDEC */ void checkHorseReinLeftOnly() const; + /* 800ECD90 */ BOOL checkHorseNotDamageReaction() const; + /* 800ECDC4 */ BOOL checkHorseWaitLashAnime() const; + /* 800ECDEC */ BOOL checkHorseReinLeftOnly() const; /* 800ECE10 */ void getReinHandType() const; /* 800ECF04 */ BOOL checkHorseLieAnime() const; - /* 800ECF5C */ void checkHorseSubjectivity() const; + /* 800ECF5C */ BOOL checkHorseSubjectivity() const; /* 800ECF9C */ void setHorseSwordUpAnime(); /* 800ECFF4 */ void setHorseTurnUpperAnime(int); /* 800ED074 */ BOOL checkHorseNoUpperAnime() const; @@ -2039,71 +2066,71 @@ public: /* 800EF598 */ void checkHorseGetOff(); /* 800EF6B0 */ void checkHorseGetOffAndSetDoStatus(); /* 800EF884 */ void setHorseGetOff(int); - /* 800EF95C */ void procHorseRideInit(); - /* 800EFDC4 */ void procHorseRide(); - /* 800F038C */ void procHorseGetOffInit(int); - /* 800F0620 */ void procHorseGetOff(); - /* 800F0980 */ void procHorseWaitInit(); - /* 800F0AA4 */ void procHorseWait(); - /* 800F0C6C */ void procHorseTurnInit(); - /* 800F0CE4 */ void procHorseTurn(); - /* 800F1060 */ void procHorseJumpInit(); - /* 800F10F8 */ void procHorseJump(); - /* 800F1188 */ void procHorseLandInit(); - /* 800F1204 */ void procHorseLand(); - /* 800F1294 */ void procHorseSubjectivityInit(); - /* 800F12F8 */ void procHorseSubjectivity(); - /* 800F13D8 */ void procHorseCutInit(); - /* 800F1688 */ void procHorseCut(); - /* 800F1894 */ void procHorseCutChargeReadyInit(); - /* 800F194C */ void procHorseCutChargeReady(); - /* 800F1AAC */ void procHorseCutTurnInit(); - /* 800F1BA4 */ void procHorseCutTurn(); - /* 800F1D18 */ void procHorseDamageInit(dCcD_GObjInf*); - /* 800F2028 */ void procHorseDamage(); - /* 800F2150 */ void procHorseBowSubjectInit(); - /* 800F21B4 */ void procHorseBowSubject(); - /* 800F224C */ void procHorseBowMoveInit(); - /* 800F22A8 */ void procHorseBowMove(); - /* 800F2334 */ void procHorseGrabMoveInit(); - /* 800F2390 */ void procHorseGrabMove(); - /* 800F2454 */ void procHorseBoomerangSubjectInit(); - /* 800F24C8 */ void procHorseBoomerangSubject(); - /* 800F25B4 */ void procHorseBoomerangMoveInit(); - /* 800F2628 */ void procHorseBoomerangMove(); - /* 800F26F4 */ void procHorseHookshotSubjectInit(); - /* 800F2770 */ void procHorseHookshotSubject(); - /* 800F2824 */ void procHorseHookshotMoveInit(); - /* 800F2898 */ void procHorseHookshotMove(); - /* 800F2934 */ void procHorseBottleDrinkInit(u16); - /* 800F2AD8 */ void procHorseBottleDrink(); - /* 800F2B4C */ void procHorseKandelaarPourInit(); - /* 800F2C78 */ void procHorseKandelaarPour(); - /* 800F2D84 */ void procHorseComebackInit(); - /* 800F2DE4 */ void procHorseComeback(); - /* 800F2EE0 */ void procHorseRunInit(); - /* 800F2F98 */ void procHorseRun(); - /* 800F3430 */ void procHorseHangInit(dCcD_GObjInf*, int); - /* 800F3580 */ void procHorseHang(); - /* 800F36E4 */ void procHorseGetKeyInit(); - /* 800F3754 */ void procHorseGetKey(); - /* 800F3818 */ void procHorseLookDownInit(); - /* 800F3894 */ void procHorseLookDown(); - /* 800F38E8 */ void procBoarRunInit(); - /* 800F3998 */ void procBoarRun(); - /* 800F3BB0 */ void getCanoeMaxSpeed() const; - /* 800F3BDC */ void getCanoeBackMaxSpeed() const; - /* 800F3BEC */ void getCanoeCres() const; - /* 800F3C18 */ void getCanoeSpeedRate() const; - /* 800F3C44 */ void getCanoeMaxRotSpeed() const; - /* 800F3CCC */ void getCanoeLocalPaddleTop(); - /* 800F3CF8 */ void checkCanoeRideTandem(); + /* 800EF95C */ int procHorseRideInit(); + /* 800EFDC4 */ int procHorseRide(); + /* 800F038C */ int procHorseGetOffInit(int); + /* 800F0620 */ int procHorseGetOff(); + /* 800F0980 */ int procHorseWaitInit(); + /* 800F0AA4 */ int procHorseWait(); + /* 800F0C6C */ int procHorseTurnInit(); + /* 800F0CE4 */ int procHorseTurn(); + /* 800F1060 */ int procHorseJumpInit(); + /* 800F10F8 */ int procHorseJump(); + /* 800F1188 */ int procHorseLandInit(); + /* 800F1204 */ int procHorseLand(); + /* 800F1294 */ int procHorseSubjectivityInit(); + /* 800F12F8 */ int procHorseSubjectivity(); + /* 800F13D8 */ int procHorseCutInit(); + /* 800F1688 */ int procHorseCut(); + /* 800F1894 */ int procHorseCutChargeReadyInit(); + /* 800F194C */ int procHorseCutChargeReady(); + /* 800F1AAC */ int procHorseCutTurnInit(); + /* 800F1BA4 */ int procHorseCutTurn(); + /* 800F1D18 */ int procHorseDamageInit(dCcD_GObjInf*); + /* 800F2028 */ int procHorseDamage(); + /* 800F2150 */ int procHorseBowSubjectInit(); + /* 800F21B4 */ int procHorseBowSubject(); + /* 800F224C */ int procHorseBowMoveInit(); + /* 800F22A8 */ int procHorseBowMove(); + /* 800F2334 */ int procHorseGrabMoveInit(); + /* 800F2390 */ int procHorseGrabMove(); + /* 800F2454 */ int procHorseBoomerangSubjectInit(); + /* 800F24C8 */ int procHorseBoomerangSubject(); + /* 800F25B4 */ int procHorseBoomerangMoveInit(); + /* 800F2628 */ int procHorseBoomerangMove(); + /* 800F26F4 */ int procHorseHookshotSubjectInit(); + /* 800F2770 */ int procHorseHookshotSubject(); + /* 800F2824 */ int procHorseHookshotMoveInit(); + /* 800F2898 */ int procHorseHookshotMove(); + /* 800F2934 */ int procHorseBottleDrinkInit(u16); + /* 800F2AD8 */ int procHorseBottleDrink(); + /* 800F2B4C */ int procHorseKandelaarPourInit(); + /* 800F2C78 */ int procHorseKandelaarPour(); + /* 800F2D84 */ int procHorseComebackInit(); + /* 800F2DE4 */ int procHorseComeback(); + /* 800F2EE0 */ int procHorseRunInit(); + /* 800F2F98 */ int procHorseRun(); + /* 800F3430 */ int procHorseHangInit(dCcD_GObjInf*, int); + /* 800F3580 */ int procHorseHang(); + /* 800F36E4 */ int procHorseGetKeyInit(); + /* 800F3754 */ int procHorseGetKey(); + /* 800F3818 */ int procHorseLookDownInit(); + /* 800F3894 */ int procHorseLookDown(); + /* 800F38E8 */ int procBoarRunInit(); + /* 800F3998 */ int procBoarRun(); + /* 800F3BB0 */ f32 getCanoeMaxSpeed() const; + /* 800F3BDC */ f32 getCanoeBackMaxSpeed() const; + /* 800F3BEC */ f32 getCanoeCres() const; + /* 800F3C18 */ f32 getCanoeSpeedRate() const; + /* 800F3C44 */ s16 getCanoeMaxRotSpeed() const; + /* 800F3CCC */ cXyz* getCanoeLocalPaddleTop(); + /* 800F3CF8 */ BOOL checkCanoeRideTandem(); /* 800F3D58 */ BOOL checkFishingRodAndLureItem() const; /* 800F3DA0 */ void initFishingRodHand(); - /* 800F3DFC */ void getCanoePaddleMatrix(); - /* 800F3E4C */ void checkFishingRodGrab(fopAc_ac_c*) const; - /* 800F3EB8 */ void checkCanoePaddleGrab(fopAc_ac_c*) const; - /* 800F3F38 */ void checkCanoeFishingRodGrabOrPut() const; + /* 800F3DFC */ MtxP getCanoePaddleMatrix(); + /* 800F3E4C */ BOOL checkFishingRodGrab(fopAc_ac_c*) const; + /* 800F3EB8 */ BOOL checkCanoePaddleGrab(fopAc_ac_c*) const; + /* 800F3F38 */ BOOL checkCanoeFishingRodGrabOrPut() const; /* 800F3FC4 */ void initCanoeRide(); /* 800F4008 */ BOOL checkCanoeJumpRide(); /* 800F40E4 */ void setArmReelAnime(); @@ -2112,56 +2139,56 @@ public: /* 800F4564 */ void setRideCanoeBasePos(fopAc_ac_c*); /* 800F459C */ void setSyncCanoePos(); /* 800F47D8 */ void canoeCommon(); - /* 800F4924 */ void checkNextActionCanoe(); - /* 800F4A50 */ void procCanoeRideInit(); - /* 800F4B90 */ void procCanoeRide(); - /* 800F4C78 */ void procCanoeJumpRideInit(fopAc_ac_c*); - /* 800F4D84 */ void procCanoeJumpRide(); - /* 800F4DF8 */ void procCanoeGetOffInit(); - /* 800F5048 */ void procCanoeGetOff(); - /* 800F51E4 */ void procCanoeWaitInit(int); - /* 800F542C */ void procCanoeWait(); - /* 800F571C */ void procCanoeRowInit(int); - /* 800F5A1C */ void procCanoeRow(); - /* 800F5D04 */ void procCanoePaddleShiftInit(int); - /* 800F5DB8 */ void procCanoePaddleShift(); - /* 800F5EA8 */ void procCanoePaddlePutInit(int); - /* 800F5FEC */ void procCanoePaddlePut(); - /* 800F6140 */ void procCanoePaddleGrabInit(); - /* 800F6188 */ void procCanoePaddleGrab(); - /* 800F6320 */ void procCanoeRodGrabInit(); - /* 800F6394 */ void procCanoeRodGrab(); - /* 800F6464 */ void procCanoeFishingWaitInit(); - /* 800F659C */ void procCanoeFishingWait(); - /* 800F67C0 */ void procCanoeFishingReelInit(); - /* 800F6874 */ void procCanoeFishingReel(); - /* 800F69D4 */ void procCanoeFishingGetInit(); - /* 800F6A70 */ void procCanoeFishingGet(); - /* 800F6BEC */ void procCanoeSubjectivityInit(); - /* 800F6C30 */ void procCanoeSubjectivity(); - /* 800F6D10 */ void procCanoeBowSubjectInit(); - /* 800F6D64 */ void procCanoeBowSubject(); - /* 800F6DF0 */ void procCanoeBowMoveInit(); - /* 800F6E44 */ void procCanoeBowMove(); - /* 800F6EB0 */ void procCanoeGrabMoveInit(); - /* 800F6EFC */ void procCanoeGrabMove(); - /* 800F6FA4 */ void procCanoeBoomerangSubjectInit(); - /* 800F7010 */ void procCanoeBoomerangSubject(); - /* 800F70F0 */ void procCanoeBoomerangMoveInit(); - /* 800F715C */ void procCanoeBoomerangMove(); - /* 800F7208 */ void procCanoeHookshotSubjectInit(); - /* 800F7274 */ void procCanoeHookshotSubject(); - /* 800F731C */ void procCanoeHookshotMoveInit(); - /* 800F7388 */ void procCanoeHookshotMove(); - /* 800F7404 */ void procCanoeBottleDrinkInit(u16); - /* 800F7550 */ void procCanoeBottleDrink(); - /* 800F75BC */ void procCanoeKandelaarPourInit(); - /* 800F7684 */ void procCanoeKandelaarPour(); + /* 800F4924 */ int checkNextActionCanoe(); + /* 800F4A50 */ int procCanoeRideInit(); + /* 800F4B90 */ int procCanoeRide(); + /* 800F4C78 */ int procCanoeJumpRideInit(fopAc_ac_c*); + /* 800F4D84 */ int procCanoeJumpRide(); + /* 800F4DF8 */ int procCanoeGetOffInit(); + /* 800F5048 */ int procCanoeGetOff(); + /* 800F51E4 */ int procCanoeWaitInit(int); + /* 800F542C */ int procCanoeWait(); + /* 800F571C */ int procCanoeRowInit(int); + /* 800F5A1C */ int procCanoeRow(); + /* 800F5D04 */ int procCanoePaddleShiftInit(int); + /* 800F5DB8 */ int procCanoePaddleShift(); + /* 800F5EA8 */ int procCanoePaddlePutInit(int); + /* 800F5FEC */ int procCanoePaddlePut(); + /* 800F6140 */ int procCanoePaddleGrabInit(); + /* 800F6188 */ int procCanoePaddleGrab(); + /* 800F6320 */ int procCanoeRodGrabInit(); + /* 800F6394 */ int procCanoeRodGrab(); + /* 800F6464 */ int procCanoeFishingWaitInit(); + /* 800F659C */ int procCanoeFishingWait(); + /* 800F67C0 */ int procCanoeFishingReelInit(); + /* 800F6874 */ int procCanoeFishingReel(); + /* 800F69D4 */ int procCanoeFishingGetInit(); + /* 800F6A70 */ int procCanoeFishingGet(); + /* 800F6BEC */ int procCanoeSubjectivityInit(); + /* 800F6C30 */ int procCanoeSubjectivity(); + /* 800F6D10 */ int procCanoeBowSubjectInit(); + /* 800F6D64 */ int procCanoeBowSubject(); + /* 800F6DF0 */ int procCanoeBowMoveInit(); + /* 800F6E44 */ int procCanoeBowMove(); + /* 800F6EB0 */ int procCanoeGrabMoveInit(); + /* 800F6EFC */ int procCanoeGrabMove(); + /* 800F6FA4 */ int procCanoeBoomerangSubjectInit(); + /* 800F7010 */ int procCanoeBoomerangSubject(); + /* 800F70F0 */ int procCanoeBoomerangMoveInit(); + /* 800F715C */ int procCanoeBoomerangMove(); + /* 800F7208 */ int procCanoeHookshotSubjectInit(); + /* 800F7274 */ int procCanoeHookshotSubject(); + /* 800F731C */ int procCanoeHookshotMoveInit(); + /* 800F7388 */ int procCanoeHookshotMove(); + /* 800F7404 */ int procCanoeBottleDrinkInit(u16); + /* 800F7550 */ int procCanoeBottleDrink(); + /* 800F75BC */ int procCanoeKandelaarPourInit(); + /* 800F7684 */ int procCanoeKandelaarPour(); /* 800F7708 */ void setGroundFishingRodActor(); - /* 800F7760 */ void procFishingCastInit(); - /* 800F7814 */ void procFishingCast(); - /* 800F7988 */ void procFishingFoodInit(); - /* 800F7AA8 */ void procFishingFood(); + /* 800F7760 */ int procFishingCastInit(); + /* 800F7814 */ int procFishingCast(); + /* 800F7988 */ int procFishingFoodInit(); + /* 800F7AA8 */ int procFishingFood(); /* 800F7C50 */ void getCrawlMoveAnmSpeed(); /* 800F7C74 */ void getCrawlMoveSpeed(); /* 800F7CE8 */ void setCrawlMoveDirectionArrow(); @@ -2177,45 +2204,45 @@ public: /* 800F8DBC */ void setCrawlMoveAngle(); /* 800F8F08 */ void stopHalfMoveAnime(f32); /* 800F8F84 */ void setCrawlAutoMoveAimPos(); - /* 800F9210 */ void procCrawlStartInit(); - /* 800F9384 */ void procCrawlStart(); - /* 800F9474 */ void procCrawlMoveInit(s16, s16); - /* 800F95B8 */ void procCrawlMove(); - /* 800F99FC */ void procCrawlAutoMoveInit(int, cXyz*); - /* 800F9ABC */ void procCrawlAutoMove(); - /* 800F9D7C */ void procCrawlEndInit(int, s16, s16); - /* 800F9F30 */ void procCrawlEnd(); + /* 800F9210 */ int procCrawlStartInit(); + /* 800F9384 */ int procCrawlStart(); + /* 800F9474 */ int procCrawlMoveInit(s16, s16); + /* 800F95B8 */ int procCrawlMove(); + /* 800F99FC */ int procCrawlAutoMoveInit(int, cXyz*); + /* 800F9ABC */ int procCrawlAutoMove(); + /* 800F9D7C */ int procCrawlEndInit(int, s16, s16); + /* 800F9F30 */ int procCrawlEnd(); /* 800F9FDC */ void getHangMoveAnmSpeed(); /* 800F9FFC */ void getHangDirectionFromAngle(); - /* 800FA070 */ void hangMoveBgCheck(s16, cXyz*); + /* 800FA070 */ BOOL hangMoveBgCheck(s16, cXyz*); /* 800FA338 */ void changeHangMoveProc(int); /* 800FA5C8 */ void checkHangFootWall(); /* 800FA6E4 */ void setHangGroundY(); /* 800FA78C */ void changeHangEndProc(); /* 800FA85C */ void checkHangStartSideWall(s16); - /* 800FAA7C */ void procHangStartInit(); - /* 800FAE14 */ void procHangStart(); - /* 800FAECC */ void procHangFallStartInit(cM3dGPla*); - /* 800FB1A4 */ void procHangFallStart(); - /* 800FB2A0 */ void procHangUpInit(int); - /* 800FB328 */ void procHangUp(); - /* 800FB43C */ void procHangWaitInit(); - /* 800FB544 */ void procHangWait(); - /* 800FB650 */ void procHangMoveInit(int); - /* 800FB790 */ void procHangMove(); - /* 800FBBC8 */ void procHangClimbInit(f32); - /* 800FBCD4 */ void procHangClimb(); - /* 800FBE04 */ void procHangWallCatchInit(); - /* 800FC0D8 */ void procHangWallCatch(); - /* 800FC178 */ void procHangReadyInit(); - /* 800FC240 */ void procHangReady(); - /* 800FC2F4 */ void procHangLeverDownInit(); - /* 800FC390 */ void procHangLeverDown(); + /* 800FAA7C */ int procHangStartInit(); + /* 800FAE14 */ int procHangStart(); + /* 800FAECC */ int procHangFallStartInit(cM3dGPla*); + /* 800FB1A4 */ int procHangFallStart(); + /* 800FB2A0 */ int procHangUpInit(int); + /* 800FB328 */ int procHangUp(); + /* 800FB43C */ int procHangWaitInit(); + /* 800FB544 */ int procHangWait(); + /* 800FB650 */ int procHangMoveInit(int); + /* 800FB790 */ int procHangMove(); + /* 800FBBC8 */ int procHangClimbInit(f32); + /* 800FBCD4 */ int procHangClimb(); + /* 800FBE04 */ int procHangWallCatchInit(); + /* 800FC0D8 */ int procHangWallCatch(); + /* 800FC178 */ int procHangReadyInit(); + /* 800FC240 */ int procHangReady(); + /* 800FC2F4 */ int procHangLeverDownInit(); + /* 800FC390 */ int procHangLeverDown(); /* 800FC5A4 */ void setDragonHangPos(); /* 800FC6B4 */ void setOctaIealHangPos(); /* 800FC748 */ void setBossBodyHangPos(); - /* 800FC77C */ void procBossBodyHangInit(fopAc_ac_c*); - /* 800FC870 */ void procBossBodyHang(); + /* 800FC77C */ int procBossBodyHangInit(fopAc_ac_c*); + /* 800FC870 */ int procBossBodyHang(); /* 800FCF58 */ void getLadderUnitCount() const; /* 800FCF84 */ void setLadderInit(); /* 800FD048 */ void setLadderPosInit(); @@ -2224,16 +2251,16 @@ public: /* 800FD2AC */ void changeLadderMoveProc(int); /* 800FD4A8 */ void setMoveBGLadderCorrect(); /* 800FD5E4 */ void checkLadderFall(); - /* 800FD648 */ void procLadderUpStartInit(); - /* 800FD7B0 */ void procLadderUpStart(); - /* 800FD824 */ void procLadderUpEndInit(int); - /* 800FD8E8 */ void procLadderUpEnd(); - /* 800FD9CC */ void procLadderDownStartInit(); - /* 800FDB74 */ void procLadderDownStart(); - /* 800FDC18 */ void procLadderDownEndInit(int); - /* 800FDCCC */ void procLadderDownEnd(); - /* 800FDD90 */ void procLadderMoveInit(int, int, cXyz*); - /* 800FDF50 */ void procLadderMove(); + /* 800FD648 */ int procLadderUpStartInit(); + /* 800FD7B0 */ int procLadderUpStart(); + /* 800FD824 */ int procLadderUpEndInit(int); + /* 800FD8E8 */ int procLadderUpEnd(); + /* 800FD9CC */ int procLadderDownStartInit(); + /* 800FDB74 */ int procLadderDownStart(); + /* 800FDC18 */ int procLadderDownEndInit(int); + /* 800FDCCC */ int procLadderDownEnd(); + /* 800FDD90 */ int procLadderMoveInit(int, int, cXyz*); + /* 800FDF50 */ int procLadderMove(); /* 800FE010 */ void getClimbMoveUpDownAnmSpeed(); /* 800FE034 */ void getClimbMoveSideAnmSpeed(); /* 800FE058 */ void checkClimbCode(cBgS_PolyInfo&); @@ -2249,104 +2276,104 @@ public: /* 800FED50 */ void checkClimbGround(cXyz*, f32); /* 800FEEC0 */ void checkBgClimbMove(int); /* 800FF28C */ void setClimbStartNotGround(); - /* 800FF450 */ void procClimbUpStartInit(int); - /* 800FF704 */ void procClimbUpStart(); - /* 800FF818 */ void procClimbDownStartInit(s16); - /* 800FF9A8 */ void procClimbDownStart(); - /* 800FFAB0 */ void procClimbMoveUpDownInit(int); - /* 800FFC58 */ void procClimbMoveUpDown(); - /* 800FFDB0 */ void procClimbMoveSideInit(); - /* 800FFF4C */ void procClimbMoveSide(); - /* 801000F8 */ void procClimbWaitInit(int, int); - /* 80100258 */ void procClimbWait(); - /* 801003E4 */ void procClimbToRoofInit(); - /* 80100464 */ void procClimbToRoof(); + /* 800FF450 */ int procClimbUpStartInit(int); + /* 800FF704 */ int procClimbUpStart(); + /* 800FF818 */ int procClimbDownStartInit(s16); + /* 800FF9A8 */ int procClimbDownStart(); + /* 800FFAB0 */ int procClimbMoveUpDownInit(int); + /* 800FFC58 */ int procClimbMoveUpDown(); + /* 800FFDB0 */ int procClimbMoveSideInit(); + /* 800FFF4C */ int procClimbMoveSide(); + /* 801000F8 */ int procClimbWaitInit(int, int); + /* 80100258 */ int procClimbWait(); + /* 801003E4 */ int procClimbToRoofInit(); + /* 80100464 */ int procClimbToRoof(); /* 801005CC */ void getRoofHangFMoveAnmSpeed() const; /* 801005F0 */ void getRoofHangSMoveAnmSpeed() const; /* 80100614 */ void setRoofHangHandOnSE(cBgS_PolyInfo*); /* 80100668 */ void checkRoofHangMovePos(); /* 80100770 */ void commonRoofHangProc(); /* 801008EC */ void checkNextActionRoofHang(); - /* 80100A10 */ void procRoofHangStartInit(cBgS_PolyInfo const&, cXyz const&, int); - /* 80100AE4 */ void procRoofHangStart(); - /* 80100BB4 */ void procRoofHangWaitInit(int); - /* 80100D38 */ void procRoofHangWait(); - /* 80100DA4 */ void procRoofHangFrontMoveInit(); - /* 80100EEC */ void procRoofHangFrontMove(); - /* 8010121C */ void procRoofHangSideMoveInit(); - /* 80101308 */ void procRoofHangSideMove(); - /* 801013B8 */ void procRoofHangTurnInit(); - /* 80101534 */ void procRoofHangTurn(); + /* 80100A10 */ int procRoofHangStartInit(cBgS_PolyInfo const&, cXyz const&, int); + /* 80100AE4 */ int procRoofHangStart(); + /* 80100BB4 */ int procRoofHangWaitInit(int); + /* 80100D38 */ int procRoofHangWait(); + /* 80100DA4 */ int procRoofHangFrontMoveInit(); + /* 80100EEC */ int procRoofHangFrontMove(); + /* 8010121C */ int procRoofHangSideMoveInit(); + /* 80101308 */ int procRoofHangSideMove(); + /* 801013B8 */ int procRoofHangTurnInit(); + /* 80101534 */ int procRoofHangTurn(); /* 8010163C */ void setRoofHangSwitch(); - /* 801016AC */ void procRoofSwitchHangInit(fopAc_ac_c*); - /* 801017AC */ void procRoofSwitchHang(); + /* 801016AC */ int procRoofSwitchHangInit(fopAc_ac_c*); + /* 801017AC */ int procRoofSwitchHang(); /* 80101890 */ BOOL checkZoraWearMaskDraw(); - /* 801018E4 */ void checkAcceptUseItemInWater(u16) const; + /* 801018E4 */ BOOL checkAcceptUseItemInWater(u16) const; /* 80101934 */ void swimDeleteItem(); /* 801019B8 */ bool getZoraSwim() const; - /* 80101A18 */ void getSwimFrontMaxSpeed() const; - /* 80101AA8 */ void getSwimMaxFallSpeed() const; + /* 80101A18 */ f32 getSwimFrontMaxSpeed() const; + /* 80101AA8 */ f32 getSwimMaxFallSpeed() const; /* 80101B44 */ void checkOxygenTimer(); /* 80101C94 */ void offOxygenTimer(); - /* 80101CB8 */ bool checkPossibleWaterInMode() const; + /* 80101CB8 */ BOOL checkPossibleWaterInMode() const; /* 80101CF4 */ void setWaterInAnmRate(daPy_frameCtrl_c*, f32); /* 80101D70 */ void swimBgCheck(f32); /* 801023E4 */ void setSpeedAndAngleSwim(); - /* 801029C8 */ void checkNextActionSwim(); + /* 801029C8 */ int checkNextActionSwim(); /* 80102B1C */ void checkSwimAction(int); - /* 80103058 */ void checkSwimUpAction(); + /* 80103058 */ int checkSwimUpAction(); /* 801032C8 */ void swimOutAfter(int); - /* 80103398 */ void checkSwimFall(); + /* 80103398 */ bool checkSwimFall(); /* 801033CC */ void checkSwimOutAction(); /* 80103698 */ void setSwimMoveAnime(); - /* 80103EE0 */ void checkSwimButtonAccept(); - /* 80103F08 */ void checkUpSwimButtonAccept(); - /* 80103F24 */ void checkSwimButtonMove(); - /* 80103F94 */ void checkZoraSwimMove(); - /* 80103FE8 */ void checkSwimNeckUpDown() const; + /* 80103EE0 */ bool checkSwimButtonAccept(); + /* 80103F08 */ bool checkUpSwimButtonAccept(); + /* 80103F24 */ BOOL checkSwimButtonMove(); + /* 80103F94 */ BOOL checkZoraSwimMove(); + /* 80103FE8 */ BOOL checkSwimNeckUpDown() const; /* 80104034 */ void setSwimUpDownOffset(); - /* 801040F8 */ void procSwimUpInit(); - /* 801041E8 */ void procSwimUp(); - /* 801042F8 */ void procSwimWaitInit(int); - /* 801044B4 */ void procSwimWait(); - /* 80104670 */ void procSwimMoveInit(); - /* 801047B8 */ void procSwimMove(); - /* 80104958 */ void procSwimDiveInit(); - /* 80104AA0 */ void procSwimDive(); - /* 80104C50 */ void procSwimHookshotSubjectInit(); - /* 80104D7C */ void procSwimHookshotSubject(); - /* 80104EB8 */ void procSwimHookshotMoveInit(); - /* 80104FC4 */ void procSwimHookshotMove(); - /* 8010519C */ void procSwimDamageInit(dCcD_GObjInf*); - /* 80105728 */ void procSwimDamage(); - /* 801058A0 */ void procOctaIealSpitInit(); - /* 80105A00 */ void procOctaIealSpit(); - /* 80105A98 */ void checkSnowCode() const; - /* 80105ABC */ void checkSnowCodePolygon(cBgS_PolyInfo&); - /* 80105B10 */ void checkBoardRestart(); - /* 80105B58 */ void boardCommon(int); + /* 801040F8 */ int procSwimUpInit(); + /* 801041E8 */ int procSwimUp(); + /* 801042F8 */ int procSwimWaitInit(int); + /* 801044B4 */ int procSwimWait(); + /* 80104670 */ int procSwimMoveInit(); + /* 801047B8 */ int procSwimMove(); + /* 80104958 */ int procSwimDiveInit(); + /* 80104AA0 */ int procSwimDive(); + /* 80104C50 */ int procSwimHookshotSubjectInit(); + /* 80104D7C */ int procSwimHookshotSubject(); + /* 80104EB8 */ int procSwimHookshotMoveInit(); + /* 80104FC4 */ int procSwimHookshotMove(); + /* 8010519C */ int procSwimDamageInit(dCcD_GObjInf*); + /* 80105728 */ int procSwimDamage(); + /* 801058A0 */ int procOctaIealSpitInit(); + /* 80105A00 */ int procOctaIealSpit(); + /* 80105A98 */ bool checkSnowCode() const; + /* 80105ABC */ static bool checkSnowCodePolygon(cBgS_PolyInfo&); + /* 80105B10 */ bool checkBoardRestart(); + /* 80105B58 */ int boardCommon(int); /* 80106534 */ void setCommonBoardAnime(int); - /* 8010658C */ void checkNextActionBoard(); - /* 80106618 */ void checkBoardSwordTriggerAction(); - /* 80106650 */ void commonProcBoardInit(daAlink_c::daAlink_PROC); - /* 801066B8 */ void getBoardRowAnmSpeed(); + /* 8010658C */ int checkNextActionBoard(); + /* 80106618 */ int checkBoardSwordTriggerAction(); + /* 80106650 */ int commonProcBoardInit(daAlink_c::daAlink_PROC); + /* 801066B8 */ f32 getBoardRowAnmSpeed(); /* 801066EC */ void setBoardLandAnime(); - /* 80106774 */ void procBoardRideInit(); - /* 801069D0 */ void procBoardRide(); - /* 80106A38 */ void procBoardWaitInit(fopAc_ac_c*); - /* 80106BCC */ void procBoardWait(); - /* 80106E88 */ void procBoardRowInit(); - /* 80106F00 */ void procBoardRow(); - /* 80107060 */ void procBoardTurnInit(); - /* 801070DC */ void procBoardTurn(); - /* 80107218 */ void procBoardJumpInit(f32, int); - /* 80107300 */ void procBoardJump(); - /* 801073D0 */ void procBoardSubjectivityInit(); - /* 80107418 */ void procBoardSubjectivity(); - /* 801074AC */ void procBoardCutInit(); - /* 8010755C */ void procBoardCut(); - /* 801075D4 */ void procBoardCutTurnInit(); - /* 80107744 */ void procBoardCutTurn(); + /* 80106774 */ int procBoardRideInit(); + /* 801069D0 */ int procBoardRide(); + /* 80106A38 */ int procBoardWaitInit(fopAc_ac_c*); + /* 80106BCC */ int procBoardWait(); + /* 80106E88 */ int procBoardRowInit(); + /* 80106F00 */ int procBoardRow(); + /* 80107060 */ int procBoardTurnInit(); + /* 801070DC */ int procBoardTurn(); + /* 80107218 */ int procBoardJumpInit(f32, int); + /* 80107300 */ int procBoardJump(); + /* 801073D0 */ int procBoardSubjectivityInit(); + /* 80107418 */ int procBoardSubjectivity(); + /* 801074AC */ int procBoardCutInit(); + /* 8010755C */ int procBoardCut(); + /* 801075D4 */ int procBoardCutTurnInit(); + /* 80107744 */ int procBoardCutTurn(); /* 801083C8 */ void hookshotAtHitCallBack(dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801086DC */ void resetHookshotMode(); /* 8010871C */ bool setEnemyBombHookshot(fopAc_ac_c*); @@ -2364,13 +2391,13 @@ public: /* 80108DB4 */ void setHookshotSight(); /* 80108EEC */ void cancelHookshotShot(); /* 80108F64 */ bool cancelHookshotMove(); - /* 8010903C */ void checkHookshotReadyMaterialOffMode() const; + /* 8010903C */ BOOL checkHookshotReadyMaterialOffMode() const; /* 80109070 */ void setHookshotReadyMaterial(); /* 801090EC */ void initHookshotUpperAnimeSpeed(int); /* 80109170 */ void initHookshotReady(); /* 801091E4 */ void setHookshotReadyAnime(); /* 80109284 */ void checkUpperItemActionHookshot(); - /* 801095C8 */ void checkNextActionHookshot(); + /* 801095C8 */ int checkNextActionHookshot(); /* 801097A0 */ void setHookshotReturnEnd(); /* 80109890 */ void setHookshotHangMoveBGCollect(); /* 80109AAC */ void setHookshotTopPosFly(); @@ -2383,22 +2410,22 @@ public: /* 8010B84C */ void checkLandHookshotHang(); /* 8010B96C */ void commonHookshotRoofWait(); /* 8010BA6C */ void commonHookshotWallWait(); - /* 8010BAA8 */ void procHookshotSubjectInit(); - /* 8010BB48 */ void procHookshotSubject(); - /* 8010BC08 */ void procHookshotMoveInit(); - /* 8010BCA4 */ void procHookshotMove(); - /* 8010BD90 */ void procHookshotFlyInit(); - /* 8010BEF0 */ void procHookshotFly(); - /* 8010C830 */ void procHookshotRoofWaitInit(int, fopAc_ac_c*, int); - /* 8010C9F4 */ void procHookshotRoofWait(); - /* 8010CC80 */ void procHookshotRoofShootInit(fopAc_ac_c*); - /* 8010CD60 */ void procHookshotRoofShoot(); - /* 8010CF6C */ void procHookshotRoofBootsInit(fopAc_ac_c*); - /* 8010D034 */ void procHookshotRoofBoots(); - /* 8010D174 */ void procHookshotWallWaitInit(int, s16, int); - /* 8010D38C */ void procHookshotWallWait(); - /* 8010D5F4 */ void procHookshotWallShootInit(); - /* 8010D6CC */ void procHookshotWallShoot(); + /* 8010BAA8 */ int procHookshotSubjectInit(); + /* 8010BB48 */ int procHookshotSubject(); + /* 8010BC08 */ int procHookshotMoveInit(); + /* 8010BCA4 */ int procHookshotMove(); + /* 8010BD90 */ int procHookshotFlyInit(); + /* 8010BEF0 */ int procHookshotFly(); + /* 8010C830 */ int procHookshotRoofWaitInit(int, fopAc_ac_c*, int); + /* 8010C9F4 */ int procHookshotRoofWait(); + /* 8010CC80 */ int procHookshotRoofShootInit(fopAc_ac_c*); + /* 8010CD60 */ int procHookshotRoofShoot(); + /* 8010CF6C */ int procHookshotRoofBootsInit(fopAc_ac_c*); + /* 8010D034 */ int procHookshotRoofBoots(); + /* 8010D174 */ int procHookshotWallWaitInit(int, s16, int); + /* 8010D38C */ int procHookshotWallWait(); + /* 8010D5F4 */ int procHookshotWallShootInit(); + /* 8010D6CC */ int procHookshotWallShoot(); /* 8010D93C */ f32 getSpinnerGravity() const; /* 8010D94C */ f32 getSpinnerMaxFallSpeed() const; /* 8010D95C */ f32 getSpinnerJumpRate() const; @@ -2416,20 +2443,20 @@ public: /* 8010DE64 */ void setSpinnerStatus(u8, u8); /* 8010DE78 */ int procSpinnerWaitInit(); /* 8010DF4C */ int procSpinnerWait(); - /* 8010E48C */ void bottleModelCallBack(); - /* 8010E584 */ void checkOilBottleItemNotGet(u16); + /* 8010E48C */ int bottleModelCallBack(); + /* 8010E584 */ BOOL checkOilBottleItemNotGet(u16); /* 8010E5D8 */ void setBottleModel(u16); - /* 8010EAC4 */ void commonBottleDrink(int); - /* 8010F45C */ void makeFairy(cXyz*, u32); - /* 8010F54C */ void procBottleDrinkInit(u16); - /* 8010F698 */ void procBottleDrink(); - /* 8010F6F4 */ void procBottleOpenInit(u16); - /* 8010F8E4 */ void procBottleOpen(); - /* 8010FC38 */ void procBottleSwingInit(fopAc_ac_c*, int); - /* 8010FF58 */ void procBottleSwing(); - /* 801102D0 */ void procBottleGetInit(int); - /* 80110518 */ void procBottleGet(); - /* 8011078C */ void checkWaterInKandelaarOffset(f32); + /* 8010EAC4 */ int commonBottleDrink(int); + /* 8010F45C */ fopAc_ac_c* makeFairy(cXyz*, u32); + /* 8010F54C */ int procBottleDrinkInit(u16); + /* 8010F698 */ int procBottleDrink(); + /* 8010F6F4 */ int procBottleOpenInit(u16); + /* 8010F8E4 */ int procBottleOpen(); + /* 8010FC38 */ int procBottleSwingInit(fopAc_ac_c*, int); + /* 8010FF58 */ int procBottleSwing(); + /* 801102D0 */ int procBottleGetInit(int); + /* 80110518 */ int procBottleGet(); + /* 8011078C */ BOOL checkWaterInKandelaarOffset(f32); /* 801107BC */ void checkWaterInKandelaar(f32); /* 80110840 */ void offKandelaarModel(); /* 801108EC */ void kandelaarModelCallBack(); @@ -2440,24 +2467,24 @@ public: /* 80110FE0 */ void commonKandelaarPourInit(); /* 801110B8 */ void commonKandelaarPour(int); /* 8011130C */ void initKandelaarSwing(); - /* 80111440 */ void procKandelaarSwingInit(); - /* 801115CC */ void procKandelaarSwing(); - /* 8011167C */ void procKandelaarPourInit(); - /* 80111724 */ void procKandelaarPour(); + /* 80111440 */ int procKandelaarSwingInit(); + /* 801115CC */ int procKandelaarSwing(); + /* 8011167C */ int procKandelaarPourInit(); + /* 80111724 */ int procKandelaarPour(); /* 80111784 */ void setGrassWhistleModel(int); /* 8011181C */ void setHorseWhistleModel(); /* 80111894 */ int procGrassWhistleGetInit(); /* 801119D8 */ int procGrassWhistleGet(); - /* 80111A9C */ void procGrassWhistleWaitInit(int, int, int, s16, cXyz*); - /* 80111CA4 */ void procGrassWhistleWait(); - /* 80111FF0 */ void procCoHorseCallWaitInit(int); - /* 801120C8 */ void procCoHorseCallWait(); - /* 801121B4 */ void procHawkCatchInit(); - /* 80112220 */ void procHawkCatch(); - /* 80112278 */ void procHawkSubjectInit(); - /* 80112304 */ void procHawkSubject(); - /* 80112474 */ void checkIronBallThrowMode() const; - /* 801124B4 */ void checkIronBallThrowReturnMode() const; + /* 80111A9C */ int procGrassWhistleWaitInit(int, int, int, s16, cXyz*); + /* 80111CA4 */ int procGrassWhistleWait(); + /* 80111FF0 */ int procCoHorseCallWaitInit(int); + /* 801120C8 */ int procCoHorseCallWait(); + /* 801121B4 */ int procHawkCatchInit(); + /* 80112220 */ int procHawkCatch(); + /* 80112278 */ int procHawkSubjectInit(); + /* 80112304 */ int procHawkSubject(); + /* 80112474 */ bool checkIronBallThrowMode() const; + /* 801124B4 */ bool checkIronBallThrowReturnMode() const; /* 80112568 */ void setIronBallWaitUpperAnime(int); /* 80112628 */ void checkIronBallDelete(); /* 801126F8 */ void setIronBallReturn(int); @@ -2465,25 +2492,25 @@ public: /* 801127F0 */ void setIronBallModel(); /* 80112C84 */ void setIronBallGroundVec(cXyz const*, cXyz*); /* 80112E7C */ void setIronBallChainPos(); - /* 80113CA0 */ void checkIronBallReturnChange(); + /* 80113CA0 */ BOOL checkIronBallReturnChange(); /* 80113D58 */ void setIronBallPos(); /* 801150E4 */ BOOL checkIronBallAnime() const; /* 8011510C */ void setIronBallReadyAnime(); /* 801151E0 */ void setIronBallBaseAnime(); - /* 80115254 */ void checkUpperItemActionIronBall(); - /* 801153F8 */ void checkNextActionIronBall(); - /* 801154E4 */ void procIronBallSubjectInit(); - /* 80115564 */ void procIronBallSubject(); - /* 801155EC */ void procIronBallMoveInit(); - /* 80115674 */ void procIronBallMove(); - /* 8011577C */ void procIronBallThrowInit(); - /* 80115860 */ void procIronBallThrow(); - /* 801159F0 */ void procIronBallReturnInit(); - /* 80115AA0 */ void procIronBallReturn(); + /* 80115254 */ BOOL checkUpperItemActionIronBall(); + /* 801153F8 */ int checkNextActionIronBall(); + /* 801154E4 */ int procIronBallSubjectInit(); + /* 80115564 */ int procIronBallSubject(); + /* 801155EC */ int procIronBallMoveInit(); + /* 80115674 */ int procIronBallMove(); + /* 8011577C */ int procIronBallThrowInit(); + /* 80115860 */ int procIronBallThrow(); + /* 801159F0 */ int procIronBallReturnInit(); + /* 80115AA0 */ int procIronBallReturn(); /* 80115C20 */ BOOL checkEventRun() const; /* 80115C50 */ void createNpcTks(cXyz*, int, u32); /* 80115EC0 */ int checkDemoAction(); - /* 80116E60 */ void checkDemoMoveMode(u32) const; + /* 80116E60 */ bool checkDemoMoveMode(u32) const; /* 80116E9C */ void setDemoMoveData(u32*, cXyz const*); /* 80117064 */ void setNoDrawSwordShield(int, u16); /* 801171F4 */ void setDemoData(); @@ -2491,21 +2518,21 @@ public: /* 80117C34 */ void endHighModel(); /* 80117C90 */ void resetSpecialEvent(); /* 80117CF8 */ void endDemoMode(); - /* 801180EC */ void getDemoLookActor(); - /* 80118170 */ bool checkFlyAtnWait(); + /* 801180EC */ fopAc_ac_c* getDemoLookActor(); + /* 80118170 */ BOOL checkFlyAtnWait(); /* 801181A0 */ void setGetItemFace(u16); - /* 801182D4 */ void checkGrabTalkActor(fopAc_ac_c*); + /* 801182D4 */ BOOL checkGrabTalkActor(fopAc_ac_c*); /* 80118308 */ void setTalkStartBack(cXyz*); /* 8011856C */ void setShapeAngleToTalkActor(); /* 80118654 */ void setTalkAnime(); /* 801186D4 */ void setTradeItemAnime(); /* 80118778 */ void setTradeItemOutHand(); - /* 801187B4 */ void checkEndMessage(u32); + /* 801187B4 */ BOOL checkEndMessage(u32); /* 80118840 */ void setDemoRightHandIndex(u16); /* 801188B0 */ void setDemoLeftHandIndex(u16); /* 8011894C */ void setDemoRide(u16); /* 801189F8 */ void setDemoBodyBck(dDemo_actor_c*, u16); - /* 80118AD0 */ BOOL checkFinalBattle(); + /* 80118AD0 */ static BOOL checkFinalBattle(); /* 80118B34 */ BOOL checkRestartDead(int, int); /* 80118BF4 */ void setDeadRideSyncPos(); /* 80118C98 */ BOOL checkDeadHP(); @@ -2515,101 +2542,101 @@ public: /* 80119134 */ void setDemoBrk(J3DAnmTevRegKey**, J3DModel*, u16); /* 801191C4 */ void setStickAnmData(J3DAnmBase*, int, int, u16, int); /* 801195C0 */ int procDemoCommon(); - /* 801195F8 */ void procCoToolDemoInit(); - /* 801196D8 */ void procCoToolDemo(); - /* 80119D98 */ void procCoTalkInit(); - /* 80119F64 */ void procCoTalk(); - /* 8011A214 */ void procCoOpenTreasureInit(); - /* 8011A42C */ void procCoOpenTreasure(); - /* 8011A4C0 */ void procCoUnequipInit(); - /* 8011A5CC */ void procCoUnequip(); + /* 801195F8 */ int procCoToolDemoInit(); + /* 801196D8 */ int procCoToolDemo(); + /* 80119D98 */ int procCoTalkInit(); + /* 80119F64 */ int procCoTalk(); + /* 8011A214 */ int procCoOpenTreasureInit(); + /* 8011A42C */ int procCoOpenTreasure(); + /* 8011A4C0 */ int procCoUnequipInit(); + /* 8011A5CC */ int procCoUnequip(); /* 8011A688 */ void setGetSubBgm(int); - /* 8011A798 */ void procCoGetItemInit(); - /* 8011AC28 */ void procCoGetItem(); - /* 8011B3F0 */ void procCoTurnBackInit(); - /* 8011B46C */ void procCoTurnBack(); - /* 8011B57C */ void procDoorOpenInit(); - /* 8011B71C */ void procDoorOpen(); - /* 8011B914 */ void procCoLookWaitInit(); - /* 8011BA20 */ void procCoLookWait(); - /* 8011BABC */ void procCoDemoPushPullWaitInit(); - /* 8011BB40 */ void procCoDemoPushMoveInit(); + /* 8011A798 */ int procCoGetItemInit(); + /* 8011AC28 */ int procCoGetItem(); + /* 8011B3F0 */ int procCoTurnBackInit(); + /* 8011B46C */ int procCoTurnBack(); + /* 8011B57C */ int procDoorOpenInit(); + /* 8011B71C */ int procDoorOpen(); + /* 8011B914 */ int procCoLookWaitInit(); + /* 8011BA20 */ int procCoLookWait(); + /* 8011BABC */ int procCoDemoPushPullWaitInit(); + /* 8011BB40 */ int procCoDemoPushMoveInit(); /* 8011BC14 */ void setMonkeyMoveAnime(); - /* 8011BC74 */ void procMonkeyMoveInit(); - /* 8011BD18 */ void procMonkeyMove(); - /* 8011BD6C */ void procDemoBoomerangCatchInit(); - /* 8011BDF0 */ void procDemoBoomerangCatch(); - /* 8011BE54 */ void procCoDeadInit(int); - /* 8011C1B4 */ void procCoDead(); - /* 8011C62C */ void procCoLookAroundInit(); - /* 8011C760 */ void procCoLookAround(); - /* 8011C81C */ void procBossAtnWaitInit(); - /* 8011C890 */ void procCoQuakeWaitInit(); - /* 8011C904 */ void procCoCaughtInit(); - /* 8011C9D0 */ void procLookUpInit(); - /* 8011CA4C */ void procLookUp(); - /* 8011CA98 */ void procLookUpToGetItemInit(); - /* 8011CB20 */ void procLookUpToGetItem(); - /* 8011CBD4 */ void procHandPatInit(); - /* 8011CCA8 */ void procHandPat(); - /* 8011CDE0 */ void procCoFogDeadInit(); - /* 8011CF60 */ void procCoFogDead(); - /* 8011D0A0 */ void procWolfSmellWaitInit(); - /* 8011D110 */ void procCoNodInit(); - /* 8011D1F4 */ void procCoNod(); - /* 8011D268 */ void procCoEyeAwayInit(); - /* 8011D304 */ void procCoGlareInit(); - /* 8011D3CC */ void procCoGlare(); - /* 8011D474 */ void procGoatStopReadyInit(); - /* 8011D4D4 */ void procGoatStopReady(); - /* 8011D544 */ void procCoGetReadySitInit(); - /* 8011D64C */ void procCoGetReadySit(); - /* 8011D6D0 */ void procCoTwGateInit(); + /* 8011BC74 */ int procMonkeyMoveInit(); + /* 8011BD18 */ int procMonkeyMove(); + /* 8011BD6C */ int procDemoBoomerangCatchInit(); + /* 8011BDF0 */ int procDemoBoomerangCatch(); + /* 8011BE54 */ int procCoDeadInit(int); + /* 8011C1B4 */ int procCoDead(); + /* 8011C62C */ int procCoLookAroundInit(); + /* 8011C760 */ int procCoLookAround(); + /* 8011C81C */ int procBossAtnWaitInit(); + /* 8011C890 */ int procCoQuakeWaitInit(); + /* 8011C904 */ int procCoCaughtInit(); + /* 8011C9D0 */ int procLookUpInit(); + /* 8011CA4C */ int procLookUp(); + /* 8011CA98 */ int procLookUpToGetItemInit(); + /* 8011CB20 */ int procLookUpToGetItem(); + /* 8011CBD4 */ int procHandPatInit(); + /* 8011CCA8 */ int procHandPat(); + /* 8011CDE0 */ int procCoFogDeadInit(); + /* 8011CF60 */ int procCoFogDead(); + /* 8011D0A0 */ int procWolfSmellWaitInit(); + /* 8011D110 */ int procCoNodInit(); + /* 8011D1F4 */ int procCoNod(); + /* 8011D268 */ int procCoEyeAwayInit(); + /* 8011D304 */ int procCoGlareInit(); + /* 8011D3CC */ int procCoGlare(); + /* 8011D474 */ int procGoatStopReadyInit(); + /* 8011D4D4 */ int procGoatStopReady(); + /* 8011D544 */ int procCoGetReadySitInit(); + /* 8011D64C */ int procCoGetReadySit(); + /* 8011D6D0 */ int procCoTwGateInit(); /* 8011D7D4 */ int procCoTwGate(); - /* 8011D82C */ void procWolfSnowEscapeInit(); - /* 8011D8F8 */ void procWolfSnowEscape(); - /* 8011DB04 */ void procZoraMoveInit(); - /* 8011DB9C */ void procZoraMove(); - /* 8011DDD4 */ void procLookAroundTurnInit(); - /* 8011DED8 */ void procLookAroundTurn(); - /* 8011DF68 */ void procTradeItemOutInit(); - /* 8011E060 */ void procTradeItemOut(); + /* 8011D82C */ int procWolfSnowEscapeInit(); + /* 8011D8F8 */ int procWolfSnowEscape(); + /* 8011DB04 */ int procZoraMoveInit(); + /* 8011DB9C */ int procZoraMove(); + /* 8011DDD4 */ int procLookAroundTurnInit(); + /* 8011DED8 */ int procLookAroundTurn(); + /* 8011DF68 */ int procTradeItemOutInit(); + /* 8011E060 */ int procTradeItemOut(); /* 8011E3D8 */ void checkLetterItem(int); - /* 8011E448 */ void procNotUseItemInit(int); - /* 8011E57C */ void procNotUseItem(); - /* 8011E6E0 */ void procSwordReadyInit(); - /* 8011E748 */ void procSwordReady(); + /* 8011E448 */ int procNotUseItemInit(int); + /* 8011E57C */ int procNotUseItem(); + /* 8011E6E0 */ int procSwordReadyInit(); + /* 8011E748 */ int procSwordReady(); /* 8011E83C */ void setSwordPushAnime(); - /* 8011E8E0 */ void procSwordPushInit(); - /* 8011E960 */ void procSwordPush(); - /* 8011E9F8 */ void procGanonFinishInit(); + /* 8011E8E0 */ int procSwordPushInit(); + /* 8011E960 */ int procSwordPush(); + /* 8011E9F8 */ int procGanonFinishInit(); /* 8011EA78 */ bool procGanonFinish(); - /* 8011EAE8 */ void procCutFastReadyInit(); + /* 8011EAE8 */ int procCutFastReadyInit(); /* 8011EB8C */ int procCutFastReady(); /* 8011EBDC */ int procMasterSwordStickInit(); /* 8011EC60 */ int procMasterSwordStick(); /* 8011ED18 */ int procMasterSwordPullInit(); - /* 8011ED8C */ void procMasterSwordPull(); + /* 8011ED8C */ int procMasterSwordPull(); /* 8011EE40 */ static BOOL checkLv7DungeonShop(); /* 8011EE94 */ int procDungeonWarpReadyInit(); - /* 8011EFB8 */ void procDungeonWarpReady(); - /* 8011F084 */ void procDungeonWarpInit(); + /* 8011EFB8 */ int procDungeonWarpReady(); + /* 8011F084 */ int procDungeonWarpInit(); /* 8011F0F4 */ int procDungeonWarp(); - /* 8011F360 */ void procDungeonWarpSceneStartInit(); - /* 8011F460 */ void procDungeonWarpSceneStart(); + /* 8011F360 */ int procDungeonWarpSceneStartInit(); + /* 8011F460 */ int procDungeonWarpSceneStart(); /* 8011F658 */ bool checkAcceptWarp(); /* 8011F7D8 */ void dungeonReturnWarp(); /* 8011F9EC */ void checkWarpStart(); /* 8011FBC0 */ void warpModelTexScroll(); - /* 8011FD4C */ void procCoWarpInit(int, int); - /* 80120124 */ void procCoWarp(); + /* 8011FD4C */ int procCoWarpInit(int, int); + /* 80120124 */ int procCoWarp(); /* 80120440 */ void commonWaitTurnInit(); - /* 80120474 */ void commonGrabPutInit(); + /* 80120474 */ int commonGrabPutInit(); /* 80120500 */ void commonLargeDamageUpInit(int, int, s16, s16); /* 80120534 */ void commonFallInit(int); - /* 80120580 */ void setEmitter(u32*, u16, cXyz const*, csXyz const*); - /* 80120634 */ void setEmitterPolyColor(u32*, u16, cBgS_PolyInfo&, cXyz const*, csXyz const*); - /* 801206C4 */ void setEmitterColor(u32*, u16, cXyz const*, csXyz const*); + /* 80120580 */ JPABaseEmitter* setEmitter(u32*, u16, cXyz const*, csXyz const*); + /* 80120634 */ JPABaseEmitter* setEmitterPolyColor(u32*, u16, cBgS_PolyInfo&, cXyz const*, csXyz const*); + /* 801206C4 */ JPABaseEmitter* setEmitterColor(u32*, u16, cXyz const*, csXyz const*); /* 80120778 */ void stopDrawParticle(u32); /* 801207BC */ void setEffectFrontRollParam(); /* 80120880 */ void setEffectSlipParam(); @@ -2671,10 +2698,10 @@ public: /* 80127F20 */ BOOL checkWolfSlowDash(); /* 80127F50 */ void setSpeedAndAngleWolf(); /* 80128478 */ void setSpeedAndAngleWolfAtn(); - /* 80128798 */ void checkWolfAtnWait(); + /* 80128798 */ BOOL checkWolfAtnWait(); /* 8012880C */ BOOL checkUnderMove0BckNoArcWolf(daAlink_c::daAlink_WANM) const; /* 80128844 */ void setBlendWolfMoveAnime(f32); - /* 80128F0C */ void checkWolfAtnMoveBack(s16); + /* 80128F0C */ BOOL checkWolfAtnMoveBack(s16); /* 80128F5C */ void setWolfAtnMoveDirection(); /* 80129114 */ void setBlendWolfAtnMoveAnime(f32); /* 8012933C */ void setBlendWolfAtnBackMoveAnime(f32); @@ -2685,149 +2712,149 @@ public: /* 801296D8 */ void setSingleAnimeWolfBaseSpeed(daAlink_c::daAlink_WANM, f32, f32); /* 80129704 */ void setSingleAnimeWolf(daAlink_c::daAlink_WANM, f32, f32, s16, f32); /* 80129848 */ void setSingleAnimeWolfParam(daAlink_c::daAlink_WANM, daAlinkHIO_anm_c const*); - /* 8012987C */ void checkWolfLandAction(int); + /* 8012987C */ int checkWolfLandAction(int); /* 80129958 */ BOOL checkMidnaUseAbility() const; /* 801299A8 */ void checkWolfUseAbility(); /* 80129A80 */ int checkWolfGroundSpecialMode(); - /* 80129B44 */ void checkNextActionWolf(int); + /* 80129B44 */ int checkNextActionWolf(int); /* 8012A02C */ void wolfSideBgCheck(s16); /* 8012A228 */ void checkWolfAttackReverse(int); - /* 8012A330 */ void checkWolfBarrierHitReverse(); - /* 8012A41C */ void checkWolfBarrierWallHit(cBgS_PolyInfo&); + /* 8012A330 */ int checkWolfBarrierHitReverse(); + /* 8012A41C */ bool checkWolfBarrierWallHit(cBgS_PolyInfo&); /* 8012A498 */ void wolfBgCheck(); /* 8012ACCC */ void changeWolfBlendRate(int); /* 8012AD1C */ void setWolfFootMatrix(); /* 8012B724 */ void wolfFootBgCheck(); - /* 8012BFA8 */ void checkWolfWaitSlipPolygon(); + /* 8012BFA8 */ BOOL checkWolfWaitSlipPolygon(); /* 8012C1F4 */ void setWolfWaitSlip(); /* 8012C308 */ void checkWolfAtnDoCharge(); /* 8012C30C */ void setWolfChainPos(); /* 8012CB0C */ void setWolfAnmVoice(); - /* 8012CBE4 */ void procWolfServiceWaitInit(int); - /* 8012CD28 */ void procWolfServiceWait(); - /* 8012CF68 */ void procWolfTiredWaitInit(); - /* 8012CFEC */ void procWolfTiredWait(); - /* 8012D050 */ void procWolfMidnaRideShockInit(); - /* 8012D104 */ void procWolfMidnaRideShock(); - /* 8012D1A8 */ void procWolfWaitInit(); - /* 8012D2A8 */ void procWolfWait(); - /* 8012D380 */ void procWolfMoveInit(); - /* 8012D3E4 */ void procWolfMove(); - /* 8012D474 */ void procWolfDashInit(); - /* 8012D590 */ void procWolfDash(); - /* 8012D8C0 */ void procWolfDashReverseInit(int); - /* 8012DA5C */ void procWolfDashReverse(); - /* 8012DBA8 */ void procWolfAtnActorMoveInit(); - /* 8012DC44 */ void procWolfAtnActorMove(); - /* 8012DD08 */ void procWolfWaitTurnInit(); - /* 8012DDB4 */ void procWolfWaitTurn(); - /* 8012DEC8 */ void procWolfSideStepInit(int); - /* 8012E0AC */ void procWolfSideStep(); - /* 8012E1E8 */ void procWolfSideStepLandInit(s16); - /* 8012E2DC */ void procWolfSideStepLand(); - /* 8012E398 */ void procWolfBackJumpInit(int); - /* 8012E508 */ void procWolfBackJump(); - /* 8012E5F4 */ void procWolfBackJumpLandInit(s16, s16); - /* 8012E684 */ void procWolfBackJumpLand(); - /* 8012E754 */ void procWolfHowlInit(int); - /* 8012E83C */ void procWolfHowl(); - /* 8012E9C8 */ void procWolfAutoJumpInit(int); - /* 8012EB94 */ void procWolfAutoJump(); - /* 8012EDD0 */ void procWolfFallInit(int, f32); - /* 8012EFB8 */ void procWolfFall(); - /* 8012F138 */ void procWolfLandInit(); - /* 8012F1F0 */ void procWolfLand(); - /* 8012F278 */ void procWolfSitInit(int); - /* 8012F358 */ void procWolfSit(); - /* 8012F41C */ void procWolfStepMoveInit(); - /* 8012F500 */ void procWolfStepMove(); - /* 8012F634 */ void procWolfSlipInit(); - /* 8012F6EC */ void procWolfSlip(); - /* 8012F840 */ void procWolfSlipTurnInit(int); - /* 8012F9C0 */ void procWolfSlipTurn(); - /* 8012FB18 */ void procWolfSlipTurnLandInit(); - /* 8012FBB4 */ void procWolfSlipTurnLand(); - /* 8012FC38 */ void procWolfSlideReadyInit(s16, int); - /* 8012FD2C */ void procWolfSlideReady(); - /* 8012FE80 */ void procWolfSlideInit(s16, int); - /* 8012FFA4 */ void procWolfSlide(); - /* 801300D4 */ void procWolfSlideLandInit(); - /* 80130138 */ void procWolfSlideLand(); - /* 801301E4 */ void procWolfWaitSlipInit(); - /* 80130268 */ void procWolfWaitSlip(); - /* 80130440 */ void procWolfSlopeStartInit(int); - /* 801304D4 */ void procWolfSlopeStart(); + /* 8012CBE4 */ int procWolfServiceWaitInit(int); + /* 8012CD28 */ int procWolfServiceWait(); + /* 8012CF68 */ int procWolfTiredWaitInit(); + /* 8012CFEC */ int procWolfTiredWait(); + /* 8012D050 */ int procWolfMidnaRideShockInit(); + /* 8012D104 */ int procWolfMidnaRideShock(); + /* 8012D1A8 */ int procWolfWaitInit(); + /* 8012D2A8 */ int procWolfWait(); + /* 8012D380 */ int procWolfMoveInit(); + /* 8012D3E4 */ int procWolfMove(); + /* 8012D474 */ int procWolfDashInit(); + /* 8012D590 */ int procWolfDash(); + /* 8012D8C0 */ int procWolfDashReverseInit(int); + /* 8012DA5C */ int procWolfDashReverse(); + /* 8012DBA8 */ int procWolfAtnActorMoveInit(); + /* 8012DC44 */ int procWolfAtnActorMove(); + /* 8012DD08 */ int procWolfWaitTurnInit(); + /* 8012DDB4 */ int procWolfWaitTurn(); + /* 8012DEC8 */ int procWolfSideStepInit(int); + /* 8012E0AC */ int procWolfSideStep(); + /* 8012E1E8 */ int procWolfSideStepLandInit(s16); + /* 8012E2DC */ int procWolfSideStepLand(); + /* 8012E398 */ int procWolfBackJumpInit(int); + /* 8012E508 */ int procWolfBackJump(); + /* 8012E5F4 */ int procWolfBackJumpLandInit(s16, s16); + /* 8012E684 */ int procWolfBackJumpLand(); + /* 8012E754 */ int procWolfHowlInit(int); + /* 8012E83C */ int procWolfHowl(); + /* 8012E9C8 */ int procWolfAutoJumpInit(int); + /* 8012EB94 */ int procWolfAutoJump(); + /* 8012EDD0 */ int procWolfFallInit(int, f32); + /* 8012EFB8 */ int procWolfFall(); + /* 8012F138 */ int procWolfLandInit(); + /* 8012F1F0 */ int procWolfLand(); + /* 8012F278 */ int procWolfSitInit(int); + /* 8012F358 */ int procWolfSit(); + /* 8012F41C */ int procWolfStepMoveInit(); + /* 8012F500 */ int procWolfStepMove(); + /* 8012F634 */ int procWolfSlipInit(); + /* 8012F6EC */ int procWolfSlip(); + /* 8012F840 */ int procWolfSlipTurnInit(int); + /* 8012F9C0 */ int procWolfSlipTurn(); + /* 8012FB18 */ int procWolfSlipTurnLandInit(); + /* 8012FBB4 */ int procWolfSlipTurnLand(); + /* 8012FC38 */ int procWolfSlideReadyInit(s16, int); + /* 8012FD2C */ int procWolfSlideReady(); + /* 8012FE80 */ int procWolfSlideInit(s16, int); + /* 8012FFA4 */ int procWolfSlide(); + /* 801300D4 */ int procWolfSlideLandInit(); + /* 80130138 */ int procWolfSlideLand(); + /* 801301E4 */ int procWolfWaitSlipInit(); + /* 80130268 */ int procWolfWaitSlip(); + /* 80130440 */ int procWolfSlopeStartInit(int); + /* 801304D4 */ int procWolfSlopeStart(); /* 80130654 */ void setWolfHowlNotHappen(int); - /* 80130700 */ void procWolfHowlDemoInit(); - /* 80130BC4 */ void procWolfHowlDemo(); - /* 80131450 */ void checkWolfRopeHit(dCcD_GObjInf*, cXyz const*, int) const; - /* 80131628 */ void checkWolfRopeJumpHang(); - /* 801316A4 */ void getWolfRopeMoveSpeed(); - /* 80131718 */ void setWolfRopePosY(); - /* 801319F0 */ void initWolfRopeShapeAngle(); + /* 80130700 */ int procWolfHowlDemoInit(); + /* 80130BC4 */ int procWolfHowlDemo(); + /* 80131450 */ fopAc_ac_c* checkWolfRopeHit(dCcD_GObjInf*, cXyz const*, int) const; + /* 80131628 */ int checkWolfRopeJumpHang(); + /* 801316A4 */ f32 getWolfRopeMoveSpeed(); + /* 80131718 */ int setWolfRopePosY(); + /* 801319F0 */ s16 initWolfRopeShapeAngle(); /* 80131A6C */ void wolfRopeSwingInc(f32); /* 80131AFC */ void setWolfRopeOffsetY(int); - /* 80131C00 */ void getDirectionRopeMove() const; - /* 80131C74 */ void procWolfRopeMoveInit(int, int); - /* 80131DA0 */ void procWolfRopeMove(); - /* 80132738 */ void procWolfRopeHangInit(int); - /* 80132914 */ void procWolfRopeHang(); - /* 80132D68 */ void procWolfRopeTurnInit(); - /* 80132E88 */ void procWolfRopeTurn(); - /* 80133054 */ void procWolfRopeStaggerInit(int); - /* 80133164 */ void procWolfRopeStagger(); - /* 8013384C */ void procWolfRopeSubjectivityInit(); - /* 80133930 */ void procWolfRopeSubjectivity(); + /* 80131C00 */ int getDirectionRopeMove() const; + /* 80131C74 */ int procWolfRopeMoveInit(int, int); + /* 80131DA0 */ int procWolfRopeMove(); + /* 80132738 */ int procWolfRopeHangInit(int); + /* 80132914 */ int procWolfRopeHang(); + /* 80132D68 */ int procWolfRopeTurnInit(); + /* 80132E88 */ int procWolfRopeTurn(); + /* 80133054 */ int procWolfRopeStaggerInit(int); + /* 80133164 */ int procWolfRopeStagger(); + /* 8013384C */ int procWolfRopeSubjectivityInit(); + /* 80133930 */ int procWolfRopeSubjectivity(); /* 80133D6C */ void getWolfTagJumpTime() const; /* 80133EF0 */ cXyz* checkMidnaLockJumpPoint() const; - /* 80134000 */ void procWolfTagJumpInit(fopAc_ac_c*); - /* 80134838 */ void procWolfTagJump(); - /* 80134DB8 */ void procWolfTagJumpLandInit(fopAc_ac_c*); - /* 80134EBC */ void procWolfTagJumpLand(); + /* 80134000 */ int procWolfTagJumpInit(fopAc_ac_c*); + /* 80134838 */ int procWolfTagJump(); + /* 80134DB8 */ int procWolfTagJumpLandInit(fopAc_ac_c*); + /* 80134EBC */ int procWolfTagJumpLand(); /* 80135160 */ int procWolfGiantPuzzleInit(); - /* 801351F8 */ void procWolfGiantPuzzle(); + /* 801351F8 */ int procWolfGiantPuzzle(); /* 80135458 */ void setWolfHangGroundY(); /* 801354C8 */ void changeWolfHangEndProc(); - /* 801355EC */ void procWolfHangReadyInit(); - /* 80135668 */ void procWolfHangReady(); - /* 801356F0 */ void procWolfHangWallCatchInit(int); - /* 80135AF4 */ void procWolfHangWallCatch(); - /* 80135CD8 */ void procWolfHangFallStartInit(cM3dGPla*); - /* 80135F00 */ void procWolfHangFallStart(); + /* 801355EC */ int procWolfHangReadyInit(); + /* 80135668 */ int procWolfHangReady(); + /* 801356F0 */ int procWolfHangWallCatchInit(int); + /* 80135AF4 */ int procWolfHangWallCatch(); + /* 80135CD8 */ int procWolfHangFallStartInit(cM3dGPla*); + /* 80135F00 */ int procWolfHangFallStart(); /* 80136064 */ void setWolfHeadDamage(); - /* 801360EC */ void procWolfDamageInit(dCcD_GObjInf*); - /* 80136508 */ void procWolfDamage(); - /* 80136624 */ void procWolfLargeDamageUpInit(int, int, s16, s16); - /* 801369E4 */ void procWolfLargeDamageUp(); - /* 80136C18 */ void procWolfLandDamageInit(int); - /* 80136DE4 */ void procWolfLandDamage(); + /* 801360EC */ int procWolfDamageInit(dCcD_GObjInf*); + /* 80136508 */ int procWolfDamage(); + /* 80136624 */ int procWolfLargeDamageUpInit(int, int, s16, s16); + /* 801369E4 */ int procWolfLargeDamageUp(); + /* 80136C18 */ int procWolfLandDamageInit(int); + /* 80136DE4 */ int procWolfLandDamage(); /* 80136EC4 */ void setWolfScreamWaitAnime(); /* 80136F54 */ int procWolfScreamWaitInit(); - /* 80136FF8 */ void procWolfScreamWait(); - /* 801370E4 */ void getWolfLieMoveAnmSpeed(); + /* 80136FF8 */ int procWolfScreamWait(); + /* 801370E4 */ f32 getWolfLieMoveAnmSpeed(); /* 8013712C */ void getWolfLieMoveSpeed(); - /* 801371A0 */ void checkMidnaDisappearMode() const; + /* 801371A0 */ BOOL checkMidnaDisappearMode() const; /* 801371FC */ void checkWolfLieContinue(int); - /* 801372B4 */ void checkNextActionWolfFromLie(); + /* 801372B4 */ int checkNextActionWolfFromLie(); /* 80137330 */ void setWolfLieMoveVoice(int); - /* 801373F8 */ void checkWolfLieCode(); - /* 80137420 */ void procWolfLieStartInit(int); - /* 8013753C */ void procWolfLieStart(); - /* 80137634 */ void procWolfLieMoveInit(int); - /* 801377F0 */ void procWolfLieMove(); - /* 80137C90 */ void procWolfLieAutoMoveInit(int, cXyz*); - /* 80137D4C */ void procWolfLieAutoMove(); + /* 801373F8 */ bool checkWolfLieCode(); + /* 80137420 */ int procWolfLieStartInit(int); + /* 8013753C */ int procWolfLieStart(); + /* 80137634 */ int procWolfLieMoveInit(int); + /* 801377F0 */ int procWolfLieMove(); + /* 80137C90 */ int procWolfLieAutoMoveInit(int, cXyz*); + /* 80137D4C */ int procWolfLieAutoMove(); /* 80138000 */ void setSpeedAndAngleSwimWolf(); - /* 80138188 */ void getWolfSwimMoveAnmSpeed(); - /* 801381F8 */ void decideDoStatusSwimWolf(); - /* 801383D8 */ void procWolfSwimUpInit(); - /* 80138484 */ void procWolfSwimUp(); - /* 8013852C */ void procWolfSwimWaitInit(int); - /* 80138644 */ void procWolfSwimWait(); - /* 8013871C */ void procWolfSwimMoveInit(); - /* 801387A0 */ void procWolfSwimMove(); - /* 8013890C */ void procWolfSwimEndWaitInit(int); - /* 80138A18 */ void procWolfSwimEndWait(); + /* 80138188 */ f32 getWolfSwimMoveAnmSpeed(); + /* 801381F8 */ int decideDoStatusSwimWolf(); + /* 801383D8 */ int procWolfSwimUpInit(); + /* 80138484 */ int procWolfSwimUp(); + /* 8013852C */ int procWolfSwimWaitInit(int); + /* 80138644 */ int procWolfSwimWait(); + /* 8013871C */ int procWolfSwimMoveInit(); + /* 801387A0 */ int procWolfSwimMove(); + /* 8013890C */ int procWolfSwimEndWaitInit(int); + /* 80138A18 */ int procWolfSwimEndWait(); /* 80138C04 */ void resetWolfEnemyBiteAll(); /* 80138C44 */ void checkWolfEnemyThrowAction(); /* 80138CB8 */ void setWolfLockDomeModel(); @@ -2839,66 +2866,66 @@ public: /* 801392E4 */ void checkWolfComboCnt(); /* 801393A4 */ void checkWolfAttackAction(); /* 801395B4 */ void setWolfEnemyThrowUpperAnime(daAlink_c::daAlink_WANM, f32); - /* 80139600 */ void setWolfEnemyHangBitePos(fopEn_enemy_c*); + /* 80139600 */ BOOL setWolfEnemyHangBitePos(fopEn_enemy_c*); /* 801396F8 */ void setWolfBiteDamage(fopEn_enemy_c*); /* 801397A4 */ void checkWolfLockAttackChargeState(); - /* 801398A8 */ void procWolfRollAttackChargeInit(); - /* 80139908 */ void procWolfRollAttackCharge(); - /* 801399C4 */ void procWolfRollAttackMoveInit(); - /* 80139A70 */ void procWolfRollAttackMove(); - /* 80139DE0 */ void procWolfJumpAttackInit(int); - /* 8013A4F8 */ void procWolfJumpAttack(); - /* 8013A7EC */ void procWolfJumpAttackKickInit(); - /* 8013A8A0 */ void procWolfJumpAttackKick(); - /* 8013A8FC */ void procWolfJumpAttackSlideLandInit(int, int, int); - /* 8013AAC4 */ void procWolfJumpAttackSlideLand(); - /* 8013AC44 */ void procWolfJumpAttackNormalLandInit(int); - /* 8013ACF4 */ void procWolfJumpAttackNormalLand(); - /* 8013ADF0 */ void procWolfWaitAttackInit(int); - /* 8013AFC0 */ void procWolfWaitAttack(); - /* 8013B2A0 */ void procWolfRollAttackInit(int, int); - /* 8013B424 */ void procWolfRollAttack(); - /* 8013B528 */ void procWolfDownAttackInit(); - /* 8013B808 */ void procWolfDownAttack(); - /* 8013B964 */ void procWolfDownAtLandInit(fopEn_enemy_c*); - /* 8013BA44 */ void procWolfDownAtLand(); - /* 8013BC94 */ void procWolfDownAtMissLandInit(); - /* 8013BD54 */ void procWolfDownAtMissLand(); - /* 8013BE24 */ void procWolfLockAttackInit(int); - /* 8013C3E4 */ void procWolfLockAttack(); - /* 8013C630 */ void procWolfLockAttackTurnInit(int); - /* 8013C7A4 */ void procWolfLockAttackTurn(); - /* 8013C8C8 */ void procWolfAttackReverseInit(); - /* 8013C9EC */ void procWolfAttackReverse(); - /* 8013CB48 */ void procWolfEnemyThrowInit(int); - /* 8013CC5C */ void procWolfEnemyThrow(); - /* 8013CCF4 */ void procWolfEnemyHangBiteInit(); - /* 8013CDEC */ void procWolfEnemyHangBite(); - /* 8013D0D4 */ void procWolfGrabUpInit(); - /* 8013D3FC */ void procWolfGrabUp(); - /* 8013D588 */ void procWolfGrabPutInit(); - /* 8013D65C */ void procWolfGrabPut(); - /* 8013D818 */ void procWolfGrabThrowInit(); - /* 8013D86C */ void procWolfGrabThrow(); - /* 8013D930 */ void procWolfPushInit(); - /* 8013DA8C */ void procWolfPush(); + /* 801398A8 */ int procWolfRollAttackChargeInit(); + /* 80139908 */ int procWolfRollAttackCharge(); + /* 801399C4 */ int procWolfRollAttackMoveInit(); + /* 80139A70 */ int procWolfRollAttackMove(); + /* 80139DE0 */ int procWolfJumpAttackInit(int); + /* 8013A4F8 */ int procWolfJumpAttack(); + /* 8013A7EC */ int procWolfJumpAttackKickInit(); + /* 8013A8A0 */ int procWolfJumpAttackKick(); + /* 8013A8FC */ int procWolfJumpAttackSlideLandInit(int, int, int); + /* 8013AAC4 */ int procWolfJumpAttackSlideLand(); + /* 8013AC44 */ int procWolfJumpAttackNormalLandInit(int); + /* 8013ACF4 */ int procWolfJumpAttackNormalLand(); + /* 8013ADF0 */ int procWolfWaitAttackInit(int); + /* 8013AFC0 */ int procWolfWaitAttack(); + /* 8013B2A0 */ int procWolfRollAttackInit(int, int); + /* 8013B424 */ int procWolfRollAttack(); + /* 8013B528 */ int procWolfDownAttackInit(); + /* 8013B808 */ int procWolfDownAttack(); + /* 8013B964 */ int procWolfDownAtLandInit(fopEn_enemy_c*); + /* 8013BA44 */ int procWolfDownAtLand(); + /* 8013BC94 */ int procWolfDownAtMissLandInit(); + /* 8013BD54 */ int procWolfDownAtMissLand(); + /* 8013BE24 */ int procWolfLockAttackInit(int); + /* 8013C3E4 */ int procWolfLockAttack(); + /* 8013C630 */ int procWolfLockAttackTurnInit(int); + /* 8013C7A4 */ int procWolfLockAttackTurn(); + /* 8013C8C8 */ int procWolfAttackReverseInit(); + /* 8013C9EC */ int procWolfAttackReverse(); + /* 8013CB48 */ int procWolfEnemyThrowInit(int); + /* 8013CC5C */ int procWolfEnemyThrow(); + /* 8013CCF4 */ int procWolfEnemyHangBiteInit(); + /* 8013CDEC */ int procWolfEnemyHangBite(); + /* 8013D0D4 */ int procWolfGrabUpInit(); + /* 8013D3FC */ int procWolfGrabUp(); + /* 8013D588 */ int procWolfGrabPutInit(); + /* 8013D65C */ int procWolfGrabPut(); + /* 8013D818 */ int procWolfGrabThrowInit(); + /* 8013D86C */ int procWolfGrabThrow(); + /* 8013D930 */ int procWolfPushInit(); + /* 8013DA8C */ int procWolfPush(); /* 8013DB6C */ int procWolfCargoCarryInit(); - /* 8013DC5C */ void procWolfCargoCarry(); - /* 8013DDF8 */ void procWolfChainUpInit(); - /* 8013DE70 */ void procWolfChainUp(); - /* 8013DF30 */ void procWolfGanonCatchInit(); - /* 8013E034 */ void procWolfGanonCatch(); - /* 8013E240 */ void procWolfChainReadyInit(); - /* 8013E2A8 */ void procWolfChainReady(); - /* 8013E6C0 */ void procWolfChainWaitInit(); - /* 8013E80C */ void procWolfChainWait(); - /* 8013ED44 */ void procWolfDigInit(); - /* 8013F1F0 */ void procWolfDig(); - /* 8013F4A8 */ void procWolfDigThroughInit(int); - /* 8013F7C4 */ void procWolfDigThrough(); + /* 8013DC5C */ int procWolfCargoCarry(); + /* 8013DDF8 */ int procWolfChainUpInit(); + /* 8013DE70 */ int procWolfChainUp(); + /* 8013DF30 */ int procWolfGanonCatchInit(); + /* 8013E034 */ int procWolfGanonCatch(); + /* 8013E240 */ int procWolfChainReadyInit(); + /* 8013E2A8 */ int procWolfChainReady(); + /* 8013E6C0 */ int procWolfChainWaitInit(); + /* 8013E80C */ int procWolfChainWait(); + /* 8013ED44 */ int procWolfDigInit(); + /* 8013F1F0 */ int procWolfDig(); + /* 8013F4A8 */ int procWolfDigThroughInit(int); + /* 8013F7C4 */ int procWolfDigThrough(); /* 8013F90C */ void setSmellSave(); - /* 8013FA14 */ void procWolfGetSmellInit(); - /* 8013FC24 */ void procWolfGetSmell(); + /* 8013FA14 */ int procWolfGetSmellInit(); + /* 8013FC24 */ int procWolfGetSmell(); /* 8013FF28 */ void setArcName(int); /* 8013FF90 */ void setShieldArcName(); /* 8013FFD8 */ void setOriginalHeap(JKRExpHeap**, u32); @@ -2952,7 +2979,7 @@ public: virtual BOOL checkGoatThrowAfter() const; virtual BOOL checkWolfTagLockJump() const; virtual BOOL checkWolfTagLockJumpLand() const; - virtual bool checkWolfRope(); + virtual BOOL checkWolfRope(); virtual BOOL checkWolfRopeHang() const; virtual BOOL checkRollJump() const; virtual BOOL checkGoronRideWait() const; @@ -3020,7 +3047,7 @@ public: virtual bool checkKandelaarSwing(int) const; virtual s16 getBoardCutTurnOffsetAngleY() const; virtual cXyz* getMagneBootsTopVec(); - virtual bool getKandelaarFlamePos(); + virtual cXyz* getKandelaarFlamePos(); virtual bool checkUseKandelaar(int); virtual void setDkCaught(fopAc_ac_c*); virtual void onPressedDamage(cXyz const&, short); @@ -3033,8 +3060,8 @@ public: virtual bool checkSpinnerPathMove(); virtual bool checkSpinnerTriggerAttack(); virtual void onSpinnerPathForceRemove(); - virtual bool getIronBallBgHit() const; - virtual bool getIronBallCenterPos(); + virtual s16 getIronBallBgHit() const; + virtual cXyz* getIronBallCenterPos(); virtual bool checkCanoeFishingGetLeft() const; virtual bool checkCanoeFishingGetRight() const; virtual u8 checkBeeChildDrink() const; @@ -3081,22 +3108,58 @@ public: u32 i_checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; } bool i_checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); } bool i_checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); } + + // wrapping functions that use this with "#pragma optimization_level 2" can help fix some issues, but not always BOOL i_checkAttentionLock() { return mAttention->Lockon(); } - bool checkUpperAnime(u16 pIdx) const { return mUpperAnmHeap[UPPER_2].getIdx() == pIdx; } + bool checkUpperAnime(u16 i_idx) const { return mUpperAnmHeap[UPPER_2].getIdx() == i_idx; } + bool checkUnderAnime(u16 i_idx) const { return mUnderAnmHeap[UNDER_2].getIdx() == i_idx; } + + bool checkNoSetUpperAnime() const { return mUpperAnmHeap[UPPER_2].checkNoSetIdx(); } + bool checkSwimMoveHandAnime() const { return checkUpperAnime(0x23F); } + bool checkZoraSwimDamageAnime() const { return checkUpperAnime(0xBF); } bool checkIronBallWaitAnime() const { return checkUpperAnime(0x19C); } bool checkHorseTurnLAnime() const { return checkUpperAnime(0x24C); } bool checkHorseTurnRAnime() const { return checkUpperAnime(0x24D); } bool checkHorseTurnAnime() const { return checkHorseTurnLAnime() || checkHorseTurnRAnime(); } bool checkHookshotShootAnime() const { return checkUpperAnime(0x18C); } bool checkHookshotReadyAnime() const { return checkUpperAnime(0x18D); } - bool checkHookshotAnime() const { + BOOL checkHookshotAnime() const { return checkHookshotReadyAnime() || checkHookshotShootAnime(); } BOOL checkBoomerangReadyAnime() const { return (mEquipItem == BOOMERANG || mEquipItem == 0x102) && checkUpperAnime(0x54); } bool checkDkCaught2Anime() const { return checkUpperAnime(0x262); } + BOOL checkCopyRodThrowAnime() const { return mEquipItem == COPY_ROD && checkUpperAnime(0x53); } + BOOL checkCutDashChargeAnime() const { return checkUpperAnime(0x83); } + BOOL checkBoomerangAnimeAndReturnWait() const { return checkBoomerangAnime(); } + BOOL checkTwoHandItemEquipAnime() const { return checkUpperAnime(0x245); } + BOOL checkBarkAnime() const { return 0; } + bool checkWolfGrabAnimeObj() const { return checkUpperAnime(0x2DA); } + bool checkWolfGrabAnimeStick() const { return checkUpperAnime(0x2DB); } + bool checkWolfGrabAnime() const { return checkWolfGrabAnimeObj() || checkWolfGrabAnimeStick(); } + bool checkKandelaarSwingAnime() const { return false; } + bool checkBowChargeWaitAnime() const { return checkUpperAnime(0xA); } + bool checkBowReloadAnime() const { return checkUpperAnime(0x9); } + bool checkBowShootAnime() const { return checkUpperAnime(0xC); } + bool checkBowWaitAnime() const { return checkUpperAnime(0xD); } + BOOL checkGrabUpThrowAnime() const { return checkUpperAnime(0x170); } + BOOL checkGrabSideThrowAnime() const { return checkUpperAnime(0x51) || mUpperAnmHeap[0].getIdx() == 0x51; } + BOOL checkGrabHeavyThrowAnime() const { return checkUpperAnime(0x17B); } + BOOL checkGrabAnimeUp() const { return checkUpperAnime(0x16C); } + BOOL checkGrabAnimeSide() const { return checkUpperAnime(0x50); } + BOOL checkGrabAnimeCarry() const { return checkUpperAnime(0x60); } + bool checkHorseUnderDashStartAnime() const { return checkUnderAnime(0xDD); } + bool checkUpperHorseLieAnime() const { return checkUpperAnime(0x265); } + bool checkHorseTiredAnime() const { return checkUpperAnime(0x263); } + bool checkHorseSwordUpAnime() const { return checkUpperAnime(0xCC); } + bool checkIronBallPreSwingAnime() const { return checkUpperAnime(0x19A); } + bool checkIronBallSwingAnime() const { return checkUpperAnime(0x19B); } + bool checkDashDamageAnime() const { return checkUpperAnime(0xAD); } + bool checkBoomerangCatchAnime() const { return checkUpperAnime(0x52); } + BOOL checkCopyRodReadyAnime() const { return mEquipItem == COPY_ROD && checkUpperAnime(0x54); } + BOOL checkCanoeFishingWaitAnime() const { return checkUpperAnime(0x5D) || checkUpperAnime(0x260); } s16 checkWolfEyeUp() const { return mWolfEyeUp; } void onModeFlg(u32 flag) { mModeFlg |= flag; } @@ -3105,9 +3168,11 @@ public: daPy_actorKeep_c* getThrowBoomerangAcKeep() { return &mThrowBoomerangAcKeep; } s32 getStartRoomNo() { return fopAcM_GetParam(this) & 0x3F; } bool checkFisingRodLure() const { return mEquipItem == 0x105; } - bool doTrigger() const { return mItemTrigger & 0x10; } + bool doTrigger() const { return mItemTrigger & BTN_A; } + bool swordTrigger() { return itemTriggerCheck(BTN_B); } + bool peepSubjectCancelTrigger() { return itemTriggerCheck(0x8); } u32 getStartMode() { return (fopAcM_GetParam(this) >> 0xC) & 0x1F; } - bool checkInputOnR() const { return field_0x33ac > 0.05f; } + inline bool checkInputOnR() const; static int getSightBti() { return 0x5B; } bool checkBoomerangChargeEndWait() const { return mEquipItem != 0x102 && checkBoomerangAnime(); @@ -3116,6 +3181,8 @@ public: return mNowAnmPackUpper[param_0].getAnmTransform(); } void setFacePriBck(u16 param_0) { setFaceBck(param_0, 1, 0xFFFF); } + void setFaceBasicBck(u16 param_0) { setFaceBck(param_0, 0, 0xFFFF); } + void setFaceBasicBtp(u16 param_0) { setFaceBtp(param_0, 0, 0xFFFF); } void cancelFmChainGrabFromOut() { field_0x2fa3 = 0; field_0x2844.clearData(); @@ -3127,6 +3194,7 @@ public: BOOL i_checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; } int getGrassHowlEventActor() const { return field_0x3198; } + MtxP getShieldMtx() const { return mShieldModel->getBaseTRMtx(); } bool checkFishingCastMode() const { bool var_r5; @@ -3160,6 +3228,9 @@ public: return var_r4; } + BOOL checkCanoeRideOwn(const fopAc_ac_c* param_0) const { return checkCanoeRide() && mRideAcKeep.getActorConst() == param_0; } + bool checkWolfDashMode() const { return i_checkNoResetFlg1(FLG1_DASH_MODE); } + J3DModel* initModel(J3DModelData* p_modelData, u32 param_1) { return initModel(p_modelData, 0x80000, param_1); } @@ -3168,13 +3239,51 @@ public: return initModel(p_modelData, 0, param_1); } - bool checkWindSpeedOnXZ() const { return field_0x35b8.abs2XZ() > 1.0f; } - bool checkResetRootMtx(int param_0) const { return field_0x2f90 != 0 && param_0 == 1; } - bool talkTrigger() const { return mItemTrigger & BTN_A; } - J3DAnmTransform* getNowAnmPackUnder(daAlink_UNDER i_idx) { return mNowAnmPackUnder[i_idx].getAnmTransform(); } + bool checkGrabGlide() { return checkGrabRooster(); } + BOOL i_checkRideOn() const { return mRideStatus != 0; } + + bool checkSwimDashMode() const { return i_checkNoResetFlg1(FLG1_DASH_MODE); } + + bool talkTrigger() const { return mItemTrigger & BTN_A; } + J3DAnmTransform* getNowAnmPackUnder(daAlink_UNDER i_idx) { + return mNowAnmPackUnder[i_idx].getAnmTransform(); + } + bool doButton() const { return mItemButton & BTN_A; } + void setGrassCancelStatus(u8 param_0) { setBStatus(param_0); } + + void seStartSystem(u32 i_seID) { mDoAud_seStart(i_seID, NULL, 0, 0); } + bool checkIronBallEquip() const { return mEquipItem == IRONBALL; } + + f32 getAnmSpeedStickRate(f32 param_0, f32 param_1) const { + return param_0 + (field_0x33a8 * (param_1 - param_0)); + } + + bool escapeTrigger() { + field_0x2fae |= 8; + return mItemTrigger & (BTN_A | BTN_B); + } + + void setDamageColorTime() { + mDamageColorTime = 32 - (mDamageTimer % 16); + } + + int getDirectionFromShapeAngle() const { + return getDirectionFromAngle(field_0x2fe2 - shape_angle.y); + } + + int getDirectionFromCurrentAngle() const { + return getDirectionFromAngle(field_0x2fe2 - current.angle.y); + } + + bool checkRootTransClearMode() { return field_0x2f99 & 7; } + bool checkRootTransZClearMode() { return field_0x2f99 & 4; } + bool checkRootTransXClearMode() { return field_0x2f99 & 1; } + bool checkRootTransYClearMode() { return field_0x2f99 & 2; } + + inline bool checkWindSpeedOnXZ() const; inline void startRestartRoomFromOut(int, u32, int); inline u16 getReadyItem(); @@ -3204,18 +3313,18 @@ private: /* 0x00654 */ J3DModel* mpLinkFaceModel; /* 0x00658 */ J3DModel* mpLinkHatModel; /* 0x0065C */ J3DModel* field_0x065c; - /* 0x00660 */ J3DModel* mpSwAModel; // Ordon Sword model + /* 0x00660 */ J3DModel* mpSwAModel; // Ordon Sword model /* 0x00664 */ J3DModel* mpSwASheathModel; // Ordon Sword sheath model - /* 0x00668 */ J3DModel* mpSwMModel; // Master Sword model + /* 0x00668 */ J3DModel* mpSwMModel; // Master Sword model /* 0x0066C */ J3DModel* mpSwMSheathModel; // Master Sword sheath model /* 0x00670 */ J3DModel* mWoodSwordModel; /* 0x00674 */ J3DModel* mpWlChangeModel; /* 0x00678 */ J3DModel* mShieldModel; - /* 0x0067C */ J3DAnmBase* field_0x067c; - /* 0x00680 */ J3DAnmBase* field_0x0680; + /* 0x0067C */ J3DAnmTevRegKey* mMagicArmorBodyBrk; + /* 0x00680 */ J3DAnmTevRegKey* mMagicArmorHeadBrk; /* 0x00684 */ J3DModel* mpDemoFCBlendModel; /* 0x00688 */ J3DModel* mpDemoFCTongueModel; - /* 0x0068C */ J3DAnmBase* field_0x068c; + /* 0x0068C */ J3DAnmTextureSRTKey* field_0x068c; /* 0x00690 */ mDoExt_bckAnm* mpDemoFCTmpBck; /* 0x00694 */ J3DDeformData* mpDemoFCTmpBls; /* 0x00698 */ void* field_0x0698; @@ -3284,9 +3393,9 @@ private: /* 0x00850 */ dCcD_Cyl field_0x850[3]; /* 0x00C04 */ dCcD_Cyl field_0xC04[3]; /* 0x00FB8 */ dCcD_Sph field_0xFB8; - /* 0x010F0 */ dCcD_Cyl field_0x10F0; - /* 0x0122C */ dCcD_Cps field_0x122C[3]; - /* 0x015F8 */ dCcD_Cps mGuardAttackAtCps; + /* 0x010F0 */ dCcD_Cyl mAtCyl; + /* 0x0122C */ dCcD_Cps mAtCps[3]; + /* 0x015F8 */ dCcD_Cps mGuardAtCps; /* 0x0173C */ dCcD_Stts field_0x173c; // related to ball and chain /* 0x01778 */ dCcD_Sph field_0x1778; /* 0x018B0 */ dBgS_AcchCir field_0x18B0[3]; @@ -3319,8 +3428,11 @@ private: /* 0x02118 */ daPy_anmHeap_c mAnmHeap5; /* 0x0212C */ daPy_anmHeap_c mAnmHeap6; /* 0x02140 */ daPy_anmHeap_c mAnmHeap7; - /* 0x02154 */ mDoExt_bckAnm field_0x2154; - /* 0x02170 */ u8 field_0x2170[0x10]; + /* 0x02154 */ J3DAnmTexPattern* field_0x2154; + /* 0x02158 */ J3DAnmTextureSRTKey* field_0x2158; + /* 0x0215C */ daPy_frameCtrl_c* field_0x215c; + /* 0x02160 */ s8* field_0x2160; + /* 0x02164 */ mDoExt_bckAnm field_0x2164; /* 0x02180 */ daAlink_matAnm_c* field_0x2180[2]; /* 0x02188 */ dEyeHL_c mEyeHL1; /* 0x0219C */ dEyeHL_c mEyeHL2; @@ -3353,7 +3465,7 @@ private: /* 0x0285C */ daPy_actorKeep_c field_0x285c; /* 0x02864 */ dMsgFlow_c mMsgFlow; /* 0x028B0 */ int field_0x28b0[0x10]; - /* 0x028F0 */ int field_0x28f0; + /* 0x028F0 */ u32 mMsgClassID; /* 0x028F4 */ int mAtnActorID; /* 0x028F8 */ int field_0x28f8; /* 0x028FC */ int field_0x28fc; @@ -3364,7 +3476,7 @@ private: /* 0x02B98 */ f32 field_0x2b98; /* 0x02B98 */ f32 field_0x2b9c; /* 0x02BA0 */ f32* field_0x2ba0; - /* 0x02BA4 */ f32* field_0x2ba4; + /* 0x02BA4 */ f32 field_0x2ba4; /* 0x02BA8 */ f32 mSinkShapeOffset; /* 0x02BAC */ f32 field_0x2bac[3]; /* 0x02BB8 */ Mtx mInvMtx; @@ -3421,7 +3533,7 @@ private: /* 0x02FAA */ u8 mRideStatus; /* 0x02FAB */ u8 field_0x2fab; /* 0x02FAC */ u8 mExitDirection; - /* 0x02FAD */ u8 field_0x2fad; + /* 0x02FAD */ u8 mPeepExitID; /* 0x02FAE */ u8 field_0x2fae; /* 0x02FAF */ u8 field_0x2faf; /* 0x02FB0 */ u8 field_0x2fb0; @@ -3469,7 +3581,7 @@ private: /* 0x02FDC */ u16 mEquipItem; /* 0x02FDE */ u16 field_0x2fde; /* 0x02FE0 */ s16 mStickAngle; - /* 0x02FE2 */ s16 field_0x2fe2; + /* 0x02FE2 */ s16 field_0x2fe2; // related to current stick angle /* 0x02FE4 */ s16 field_0x2fe4; /* 0x02FE6 */ s16 field_0x2fe6; /* 0x02FE8 */ u16 mProcID; @@ -3497,7 +3609,7 @@ private: /* 0x03014 */ s16 mFallVoiceInit; /* 0x03016 */ u8 field_0x3016[2]; /* 0x03018 */ s16 field_0x3018; - /* 0x0301A */ s16 mHookshotMode; + /* 0x0301A */ s16 mItemMode; /* 0x0301C */ s16 field_0x301c; /* 0x0301E */ s16 field_0x301e; /* 0x03020 */ s16 field_0x3020; @@ -3542,8 +3654,8 @@ private: /* 0x03074 */ s16 field_0x3074; /* 0x03076 */ s16 field_0x3076; /* 0x03078 */ s16 field_0x3078; - /* 0x0307A */ s16 field_0x307a; - /* 0x0307C */ s16 field_0x307c; + /* 0x0307A */ s16 mStickSpinTimer; + /* 0x0307C */ s16 mPrevStickAngle; /* 0x0307E */ s16 field_0x307e; /* 0x03080 */ s16 field_0x3080; /* 0x03082 */ s16 field_0x3082; @@ -3582,7 +3694,7 @@ private: /* 0x030C8 */ s16 field_0x30c8; /* 0x030CA */ s16 field_0x30ca; /* 0x030CC */ s16 field_0x30cc; - /* 0x030CE */ u16 field_0x30ce; + /* 0x030CE */ u16 mKeepItem; /* 0x030D0 */ s16 field_0x30d0; /* 0x030D2 */ s16 field_0x30d2; /* 0x030D4 */ u16 field_0x30d4; @@ -3622,7 +3734,7 @@ private: /* 0x0312A */ csXyz field_0x312a[2]; /* 0x03136 */ csXyz field_0x3136[2]; /* 0x03142 */ csXyz field_0x3142[4]; - /* 0x0315A */ csXyz field_0x315a; + /* 0x0315A */ csXyz mFishingArm1Angle; /* 0x03160 */ csXyz field_0x3160; /* 0x03166 */ csXyz field_0x3166; /* 0x0316C */ csXyz field_0x316c; @@ -3667,7 +3779,8 @@ private: /* 0x03244 */ u8 field_0x3244[20]; /* 0x03258 */ u32 field_0x3258; /* 0x0325C */ u32 field_0x325c; - /* 0x03260 */ u8 field_0x3260[40]; + /* 0x03260 */ u32 field_0x3260[2]; + /* 0x03268 */ u8 field_0x3268[0x3288 - 0x3268]; /* 0x03288 */ u32 field_0x3288; /* 0x0328C */ u32 field_0x328c; /* 0x03290 */ u32 field_0x3290; @@ -3776,7 +3889,7 @@ private: /* 0x035E8 */ cXyz field_0x35e8; /* 0x035F4 */ cXyz mMidnaAtnPos; /* 0x03600 */ cXyz field_0x3600; - /* 0x0360C */ cXyz field_0x360c; + /* 0x0360C */ cXyz mKandelaarFlamePos; /* 0x03618 */ cXyz field_0x3618; /* 0x03624 */ cXyz field_0x3624; /* 0x03630 */ cXyz field_0x3630; @@ -3804,8 +3917,8 @@ private: /* 0x037D4 */ cXyz field_0x37d4; /* 0x037E0 */ cXyz field_0x37e0; /* 0x037EC */ cXyz mHookshotTopPos; - /* 0x037F8 */ cXyz field_0x37f8; - /* 0x03804 */ cXyz field_0x3804; + /* 0x037F8 */ cXyz mIronBallCenterPos; + /* 0x03804 */ cXyz mIronBallBgChkPos; /* 0x03810 */ cXyz field_0x3810; /* 0x0381C */ cXyz field_0x381c; /* 0x03828 */ cXyz field_0x3828; @@ -3813,17 +3926,21 @@ private: /* 0x03840 */ cXyz* mIronBallChainPos; /* 0x03844 */ csXyz* mIronBallChainAngle; /* 0x03848 */ void* field_0x3848; - /* 0x0384C */ f32* field_0x384c; + /* 0x0384C */ cXyz* field_0x384c; /* 0x03850 */ daAlink_procFunc mpProcFunc; }; // Size: 0x38BC +static bool daAlink_checkLightBallA(fopAc_ac_c* p_actor); +static bool daAlink_checkLightBallB(fopAc_ac_c* p_actor); +static fopAc_ac_c* daAlink_searchCoach(fopAc_ac_c* param_0, void* param_1); + struct daAlinkHIO_anm_c { - /* 0x00 */ s16 mEndF; - /* 0x04 */ f32 mRate; - /* 0x08 */ f32 mStart; - /* 0x0C */ f32 mInterpolation; // morf - /* 0x10 */ f32 field_0x10; // CF? -}; // size = 0x14 + /* 0x00 */ s16 mEndFrame; + /* 0x04 */ f32 mSpeed; + /* 0x08 */ f32 mStartFrame; + /* 0x0C */ f32 mInterpolation; + /* 0x10 */ f32 mCheckFrame; // name maybe wrong +}; // size: 0x14 struct daAlinkHIO_basic_c1 { /* 0x00 */ bool mOneHitKill; @@ -3861,12 +3978,12 @@ public: class daAlinkHIO_backJump_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ daAlinkHIO_anm_c field_0x14; - /* 0x28 */ f32 field_0x28; - /* 0x2C */ f32 field_0x2C; - /* 0x30 */ f32 field_0x30; - /* 0x34 */ f32 field_0x34; + /* 0x00 */ daAlinkHIO_anm_c mBackflipAnm; + /* 0x14 */ daAlinkHIO_anm_c mLandAnm; + /* 0x28 */ f32 mBackflipSpeedH; + /* 0x2C */ f32 mBackflipSpeedV; + /* 0x30 */ f32 mFallHeight; + /* 0x34 */ f32 mFallInterpolation; }; // Size: 0x38 class daAlinkHIO_backJump_c0 { @@ -3879,7 +3996,7 @@ public: /* 0x00 */ daAlinkHIO_anm_c mJumpAnm; /* 0x14 */ daAlinkHIO_anm_c mLandAnm; /* 0x28 */ daAlinkHIO_anm_c mDiveAnm; - /* 0x3C */ daAlinkHIO_anm_c mDiveUnkAnm; + /* 0x3C */ daAlinkHIO_anm_c mDiveConnectAnm; /* 0x50 */ bool mAlwaysMaxSpeedJump; /* 0x52 */ s16 mJumpAngle; /* 0x54 */ s16 mSpinJumpRotateSpeed; @@ -3932,7 +4049,7 @@ public: class daAlinkHIO_cut_c1 { public: /* 0x00 */ daAlinkHIO_anm_c mEquipAnm; - /* 0x14 */ daAlinkHIO_anm_c mReleaseAnm; + /* 0x14 */ daAlinkHIO_anm_c mUnequipAnm; /* 0x28 */ daAlinkHIO_anm_c mRecoilAnm; /* 0x3C */ daAlinkHIO_anm_c mStabAnm; /* 0x50 */ bool mForceHitCombo; @@ -3955,7 +4072,7 @@ public: /* 0x80 */ f32 mSwordRadiusHorseback; /* 0x84 */ f32 mRunCutLength; /* 0x88 */ f32 mRunCutRadius; - /* 0x8C */ f32 mUnkReleaseASpeed; + /* 0x8C */ f32 mFastUnequipAnmSpeed; /* 0x90 */ f32 mSwordLengthHorsebackFight; /* 0x94 */ f32 mSwordRadiusHorsebackFight; /* 0x98 */ f32 mFlourishControlStartFrame; @@ -3986,19 +4103,19 @@ public: class daAlinkHIO_cutLargeJump_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c mChargeAnm; // ? - /* 0x14 */ daAlinkHIO_anm_c mChargeMoveAnm; // ? + /* 0x00 */ daAlinkHIO_anm_c mChargeAnm; + /* 0x14 */ daAlinkHIO_anm_c mChargeMoveAnm; /* 0x28 */ daAlinkHIO_anm_c mCutAnm; /* 0x3C */ daAlinkHIO_anm_c mLandAnm; /* 0x50 */ f32 mCutSpeedH; /* 0x54 */ f32 mCutSpeedV; - /* 0x58 */ f32 mJumpAttackStartF; - /* 0x5C */ f32 mJumpAttackEndF; - /* 0x60 */ f32 mCutInitF; - /* 0x64 */ f32 mLandAttackInitF; - /* 0x68 */ f32 mLandAttackEndF; + /* 0x58 */ f32 mJumpAttackStartFrame; + /* 0x5C */ f32 mJumpAttackEndFrame; + /* 0x60 */ f32 mCutInitFrame; + /* 0x64 */ f32 mLandAttackInitFrame; + /* 0x68 */ f32 mLandAttackEndFrame; /* 0x6C */ f32 mLandAttackRadius; - /* 0x70 */ f32 mSpinSlashUnkCF; + /* 0x70 */ f32 mSpinSlashCheckFrame; }; // Size: 0x74 class daAlinkHIO_cutLargeJump_c0 { @@ -4006,185 +4123,97 @@ public: static daAlinkHIO_cutLargeJump_c1 const m; }; -class daAlinkHIO_cutNmV_c1 { +class daAlinkHIO_cutNormal_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1C; + /* 0x00 */ daAlinkHIO_anm_c mCutAnm; + /* 0x14 */ f32 mSpeed; + /* 0x18 */ f32 mAttackStartFrame; + /* 0x1C */ f32 mAttackEndFrame; }; // Size: 0x20 class daAlinkHIO_cutNmV_c0 { public: - static daAlinkHIO_cutNmV_c1 const m; + static daAlinkHIO_cutNormal_c1 const m; }; -class daAlinkHIO_cutNmL_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1C; -}; // Size: 0x20 - class daAlinkHIO_cutNmL_c0 { public: - static daAlinkHIO_cutNmL_c1 const m; + static daAlinkHIO_cutNormal_c1 const m; }; -class daAlinkHIO_cutNmR_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1C; -}; // Size: 0x20 - class daAlinkHIO_cutNmR_c0 { public: - static daAlinkHIO_cutNmR_c1 const m; + static daAlinkHIO_cutNormal_c1 const m; }; -class daAlinkHIO_cutNmSL_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1C; -}; // Size: 0x20 - class daAlinkHIO_cutNmSL_c0 { public: - static daAlinkHIO_cutNmSL_c1 const m; + static daAlinkHIO_cutNormal_c1 const m; }; -class daAlinkHIO_cutNmSR_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1C; -}; // Size: 0x20 - class daAlinkHIO_cutNmSR_c0 { public: - static daAlinkHIO_cutNmSR_c1 const m; + static daAlinkHIO_cutNormal_c1 const m; }; -class daAlinkHIO_cutFnL_c1 { +class daAlinkHIO_cutFinish_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1C; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; - /* 0x28 */ f32 field_0x28; + /* 0x00 */ daAlinkHIO_anm_c mCutAnm; + /* 0x14 */ s16 mStopTime; + /* 0x16 */ s16 mComboStopTime; + /* 0x18 */ f32 mSpeed; + /* 0x1C */ f32 mAttackStartFrame; + /* 0x20 */ f32 mAttackEndFrame; + /* 0x24 */ f32 mComboCheckFrame; + /* 0x28 */ f32 mComboStartFrame; }; // Size: 0x2C class daAlinkHIO_cutFnL_c0 { public: - static daAlinkHIO_cutFnL_c1 const m; + static daAlinkHIO_cutFinish_c1 const m; }; -class daAlinkHIO_cutFnV_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1C; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; - /* 0x28 */ f32 field_0x28; -}; // Size: 0x2C - class daAlinkHIO_cutFnV_c0 { public: - static daAlinkHIO_cutFnV_c1 const m; + static daAlinkHIO_cutFinish_c1 const m; }; -class daAlinkHIO_cutFnS_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ s16 field_0x14; - /* 0x16 */ s16 field_0x16; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1C; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; - /* 0x28 */ f32 field_0x28; -}; // Size: 0x2C - class daAlinkHIO_cutFnS_c0 { public: - static daAlinkHIO_cutFnS_c1 const m; + static daAlinkHIO_cutFinish_c1 const m; }; -class daAlinkHIO_cutFnSl_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ s16 field_0x14; - /* 0x16 */ s16 field_0x16; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1C; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; - /* 0x28 */ f32 field_0x28; -}; // Size: 0x2C - class daAlinkHIO_cutFnSl_c0 { public: - static daAlinkHIO_cutFnSl_c1 const m; + static daAlinkHIO_cutFinish_c1 const m; }; -class daAlinkHIO_cutFnSm_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ s16 field_0x14; - /* 0x16 */ s16 field_0x16; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1C; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; - /* 0x28 */ f32 field_0x28; -}; // Size: 0x2C - class daAlinkHIO_cutFnSm_c0 { public: - static daAlinkHIO_cutFnSm_c1 const m; + static daAlinkHIO_cutFinish_c1 const m; }; -class daAlinkHIO_cutFnR_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1C; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; - /* 0x28 */ f32 field_0x28; -}; // Size: 0x2C - class daAlinkHIO_cutFnR_c0 { public: - static daAlinkHIO_cutFnR_c1 const m; + static daAlinkHIO_cutFinish_c1 const m; }; class daAlinkHIO_cutFnJU_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ daAlinkHIO_anm_c field_0x14; - /* 0x28 */ f32 field_0x28; - /* 0x2C */ f32 field_0x2C; - /* 0x30 */ f32 field_0x30; - /* 0x34 */ f32 field_0x34; - /* 0x38 */ f32 field_0x38; - /* 0x3C */ f32 field_0x3C; - /* 0x40 */ f32 field_0x40; - /* 0x44 */ f32 field_0x44; - /* 0x48 */ f32 field_0x48; - /* 0x4C */ f32 field_0x4C; - /* 0x50 */ f32 field_0x50; + /* 0x00 */ daAlinkHIO_anm_c mCutAnm; + /* 0x14 */ daAlinkHIO_anm_c mLandAnm; + /* 0x28 */ s16 mStopTime; + /* 0x2A */ s16 mComboStopTime; + /* 0x2C */ f32 mSpeedH; + /* 0x30 */ f32 mSpeedV; + /* 0x34 */ f32 mAttackStartFrame; + /* 0x38 */ f32 mAttackEndFrame; + /* 0x3C */ f32 mComboCheckFrame; + /* 0x40 */ f32 mComboStartFrame; + /* 0x44 */ f32 mFallHeight; + /* 0x48 */ f32 mFallInterpolation; + /* 0x4C */ f32 mAttackRadius; + /* 0x50 */ f32 mAttackOffset; }; // Size: 0x54 class daAlinkHIO_cutFnJU_c0 { @@ -4194,32 +4223,33 @@ public: class daAlinkHIO_cutTurn_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ daAlinkHIO_anm_c field_0x14; - /* 0x28 */ daAlinkHIO_anm_c field_0x28; - /* 0x3C */ f32 field_0x3C; - /* 0x40 */ f32 field_0x40; - /* 0x44 */ f32 field_0x44; - /* 0x48 */ f32 field_0x48; - /* 0x4C */ f32 field_0x4C; - /* 0x50 */ f32 field_0x50; - /* 0x54 */ f32 field_0x54; - /* 0x58 */ f32 field_0x58; - /* 0x5C */ f32 field_0x5C; - /* 0x60 */ f32 field_0x60; - /* 0x64 */ f32 field_0x64; - /* 0x68 */ f32 field_0x68; - /* 0x6C */ f32 field_0x6C; - /* 0x70 */ f32 field_0x70; - /* 0x74 */ f32 field_0x74; - /* 0x78 */ f32 field_0x78; - /* 0x7C */ f32 field_0x7C; - /* 0x80 */ f32 field_0x80; - /* 0x84 */ f32 field_0x84; - /* 0x88 */ f32 field_0x88; - /* 0x8C */ f32 field_0x8C; - /* 0x90 */ f32 field_0x90; - /* 0x94 */ f32 field_0x94; + /* 0x00 */ daAlinkHIO_anm_c mRightTurnAnm; + /* 0x14 */ daAlinkHIO_anm_c mChargeAnm; + /* 0x28 */ daAlinkHIO_anm_c mLeftTurnAnm; + /* 0x3C */ s16 mStopTime; + /* 0x3E */ s16 field_0x3E; + /* 0x40 */ f32 mRightTurnInputStartFrame; + /* 0x44 */ f32 mRightAttackStartFrame; + /* 0x48 */ f32 mRightAttackEndFrame; + /* 0x4C */ f32 mMoveFBAnmSpeed; + /* 0x50 */ f32 mMoveFBInterpolation; + /* 0x54 */ f32 mMoveLRAnmSpeed; + /* 0x58 */ f32 mMoveLRInterpolation; + /* 0x5C */ f32 mMaxSpeed; + /* 0x60 */ f32 mChargeMoveAccel; + /* 0x64 */ f32 mChargeMoveDecel; + /* 0x68 */ f32 mSpeed; + /* 0x6C */ f32 mRightComboStartFrame; + /* 0x70 */ f32 mAttackRadius; + /* 0x74 */ f32 mLeftTurnInputStartFrame; + /* 0x78 */ f32 mLeftAttackStartFrame; + /* 0x7C */ f32 mLeftAttackEndFrame; + /* 0x80 */ f32 mLeftComboStartFrame; + /* 0x84 */ f32 mAttackRadiusAccel; + /* 0x88 */ f32 mLightAttackRadius; + /* 0x8C */ f32 mLightAttackRadiusAccel; + /* 0x90 */ f32 mLargeAttackRadius; + /* 0x94 */ f32 mLargeAttackAccel; }; // Size: 0x98 class daAlinkHIO_cutTurn_c0 { @@ -4298,54 +4328,40 @@ public: static daAlinkHIO_hoCutCharge_c1 const m; }; -class daAlinkHIO_cutDaL_c1 { +class daAlinkHIO_cutDash_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; + /* 0x00 */ daAlinkHIO_anm_c mCutAnm; + /* 0x14 */ f32 mAttackStartFrame; + /* 0x18 */ f32 mAttackEndFrame; }; // Size: 0x1C class daAlinkHIO_cutDaL_c0 { public: - static daAlinkHIO_cutDaL_c1 const m; + static daAlinkHIO_cutDash_c1 const m; }; -class daAlinkHIO_cutDaR_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; -}; // Size: 0x1C - class daAlinkHIO_cutDaR_c0 { public: - static daAlinkHIO_cutDaR_c1 const m; + static daAlinkHIO_cutDash_c1 const m; }; -class daAlinkHIO_cutDaCharge_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; -}; // Size: 0x1C - class daAlinkHIO_cutDaCharge_c0 { public: - static daAlinkHIO_cutDaCharge_c1 const m; + static daAlinkHIO_cutDash_c1 const m; }; class daAlinkHIO_cutDown_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ daAlinkHIO_anm_c field_0x14; - /* 0x28 */ daAlinkHIO_anm_c field_0x28; - /* 0x3C */ daAlinkHIO_anm_c field_0x3C; - /* 0x50 */ daAlinkHIO_anm_c field_0x50; - /* 0x64 */ s16 field_0x64; - /* 0x66 */ s16 field_0x66; - /* 0x68 */ f32 field_0x68; - /* 0x6C */ f32 field_0x6C; - /* 0x70 */ f32 field_0x70; + /* 0x00 */ daAlinkHIO_anm_c mJumpAnm; + /* 0x14 */ daAlinkHIO_anm_c mFallAnm; + /* 0x28 */ daAlinkHIO_anm_c mLandAnm; + /* 0x3C */ daAlinkHIO_anm_c mMissAnm; + /* 0x50 */ daAlinkHIO_anm_c mRecoverAnm; + /* 0x64 */ s16 mSuccessStopTime; + /* 0x66 */ s16 mFailStopTime; + /* 0x68 */ f32 mRecoverSpeedH; + /* 0x6C */ f32 mRecoverSpeedV; + /* 0x70 */ f32 mSpeedV; }; // Size: 0x74 class daAlinkHIO_cutDown_c0 { @@ -4355,18 +4371,18 @@ public: class daAlinkHIO_cutHead_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ daAlinkHIO_anm_c field_0x14; - /* 0x28 */ daAlinkHIO_anm_c field_0x28; - /* 0x3C */ f32 field_0x3C; - /* 0x40 */ f32 field_0x40; - /* 0x44 */ f32 field_0x44; - /* 0x48 */ f32 field_0x48; - /* 0x4C */ f32 field_0x4C; - /* 0x50 */ f32 field_0x50; - /* 0x54 */ f32 field_0x54; - /* 0x58 */ f32 field_0x58; - /* 0x5C */ f32 field_0x5C; + /* 0x00 */ daAlinkHIO_anm_c mJumpAnm; + /* 0x14 */ daAlinkHIO_anm_c mCutAnm; + /* 0x28 */ daAlinkHIO_anm_c mLandAnm; + /* 0x3C */ f32 mGravity; + /* 0x40 */ f32 mMaxHeight; + /* 0x44 */ f32 mMaxDistance; + /* 0x48 */ f32 mAddSpeedV; + /* 0x4C */ f32 mAddSpeedH; + /* 0x50 */ f32 mAttackStartFrame; + /* 0x54 */ f32 mAttackEndFrame; + /* 0x58 */ f32 mSwordRadius; + /* 0x5C */ f32 mSwordLength; }; // Size: 0x60 class daAlinkHIO_cutHead_c0 { @@ -4374,54 +4390,45 @@ public: static daAlinkHIO_cutHead_c1 const m; }; -class daAlinkHIO_gAtPush_c1 { +class daAlinkHIO_guardAttack_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1C; - /* 0x20 */ f32 field_0x20; + /* 0x00 */ daAlinkHIO_anm_c mAttackAnm; + /* 0x14 */ f32 mSpeed; + /* 0x18 */ f32 mAttackStartFrame; + /* 0x1C */ f32 mAttackEndFrame; + /* 0x20 */ f32 mSlashCheckFrame; }; // Size: 0x24 class daAlinkHIO_gAtPush_c0 { public: - static daAlinkHIO_gAtPush_c1 const m; + static daAlinkHIO_guardAttack_c1 const m; }; -class daAlinkHIO_gAtKick_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1C; - /* 0x20 */ f32 field_0x20; -}; // Size: 0x24 - class daAlinkHIO_gAtKick_c0 { public: - static daAlinkHIO_gAtKick_c1 const m; + static daAlinkHIO_guardAttack_c1 const m; }; class daAlinkHIO_guard_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ daAlinkHIO_anm_c field_0x14; - /* 0x28 */ daAlinkHIO_anm_c field_0x28; - /* 0x3C */ daAlinkHIO_anm_c field_0x3C; - /* 0x50 */ s16 field_0x50; - /* 0x52 */ s16 field_0x52; - /* 0x54 */ s16 field_0x54; - /* 0x56 */ s16 field_0x56; - /* 0x58 */ s16 field_0x58; - /* 0x5C */ f32 field_0x5C; - /* 0x60 */ f32 field_0x60; - /* 0x64 */ f32 field_0x64; - /* 0x68 */ f32 field_0x68; - /* 0x6C */ f32 field_0x6C; - /* 0x70 */ f32 field_0x70; - /* 0x74 */ f32 field_0x74; - /* 0x78 */ f32 field_0x78; - /* 0x7C */ f32 field_0x7C; + /* 0x00 */ daAlinkHIO_anm_c mGuardHitAnm; + /* 0x14 */ daAlinkHIO_anm_c mCrouchGuardHitAnm; // Unused + /* 0x28 */ daAlinkHIO_anm_c mRecoilAnm; + /* 0x3C */ daAlinkHIO_anm_c mGuardBreakAnm; + /* 0x50 */ s16 mGuardLRAngleMax; + /* 0x52 */ s16 mGuardFBAngleMax; + /* 0x54 */ s16 mGuardBodyInterpolation; + /* 0x56 */ s16 mSmallGuardLRAngleMax; + /* 0x58 */ s16 mSmallGuardFBAngleMax; + /* 0x5C */ f32 mCrouchGuardAnmSpeed; // Unused + /* 0x60 */ f32 mCrouchGuardInterpolation; // Unused + /* 0x64 */ f32 mGuardSpeedNormal; + /* 0x68 */ f32 mGuardSpeedLarge; + /* 0x6C */ f32 mGuardSpeedHuge; + /* 0x70 */ f32 mAttackPosOffset; + /* 0x74 */ f32 mAttackRadius; + /* 0x78 */ f32 mMagneGuardSpeed; + /* 0x7C */ f32 mMagneHvyGuardSpeed; }; // Size: 0x80 class daAlinkHIO_guard_c0 { @@ -4431,18 +4438,18 @@ public: class daAlinkHIO_crouch_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ daAlinkHIO_anm_c field_0x14; - /* 0x28 */ s16 field_0x28; - /* 0x2A */ s16 field_0x2A; - /* 0x2C */ s16 field_0x2C; - /* 0x30 */ f32 field_0x30; - /* 0x34 */ f32 field_0x34; - /* 0x38 */ f32 field_0x38; - /* 0x3C */ f32 field_0x3C; - /* 0x40 */ f32 field_0x40; - /* 0x44 */ f32 field_0x44; - /* 0x48 */ f32 field_0x48; + /* 0x00 */ daAlinkHIO_anm_c mCrawlStartAnm; + /* 0x14 */ daAlinkHIO_anm_c mCrawlEndAnm; + /* 0x28 */ s16 mCrawlTurnRate; + /* 0x2A */ s16 mCrawlTurnMax; + /* 0x2C */ s16 mCrawlTurnMin; + /* 0x30 */ f32 mCrouchAnmSpeed; + /* 0x34 */ f32 mCrouchInterpolation; + /* 0x38 */ f32 mStandInterpolation; + /* 0x3C */ f32 mCrawlMoveRate; + /* 0x40 */ f32 mCrawlAnmSpeedMax; + /* 0x44 */ f32 mCrawlAnmSpeedMin; + /* 0x48 */ f32 mCrawlInterpolation; }; // Size: 0x4C class daAlinkHIO_crouch_c0 { @@ -4468,9 +4475,9 @@ public: /* 0x40 */ f32 mSlideSpeed; /* 0x44 */ f32 mSlideDeceleration; /* 0x48 */ f32 mFootPositionRatio; - /* 0x4C */ f32 mUnkInterpolation; - /* 0x50 */ f32 mMinWalkFrame; - /* 0x54 */ f32 mMinTiredWalkFrame; + /* 0x4C */ f32 mWaitBInterpolation; + /* 0x50 */ f32 mMinWalkRate; + /* 0x54 */ f32 mMinTiredWalkRate; }; // Size: 0x58 class daAlinkHIO_move_c0 { @@ -4530,28 +4537,28 @@ public: class daAlinkHIO_noActAtnMove_c1 { public: - /* 0x00 */ s16 field_0x0; - /* 0x02 */ s16 field_0x2; - /* 0x04 */ s16 field_0x4; - /* 0x08 */ f32 field_0x8; - /* 0x0C */ f32 field_0xC; - /* 0x10 */ f32 field_0x10; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1C; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; - /* 0x28 */ f32 field_0x28; - /* 0x2C */ f32 field_0x2C; - /* 0x30 */ f32 field_0x30; - /* 0x34 */ f32 field_0x34; - /* 0x38 */ f32 field_0x38; - /* 0x3C */ f32 field_0x3C; - /* 0x40 */ f32 field_0x40; - /* 0x44 */ f32 field_0x44; - /* 0x48 */ f32 field_0x48; - /* 0x4C */ f32 field_0x4C; - /* 0x50 */ f32 field_0x50; + /* 0x00 */ s16 mMaxTurnAngle; + /* 0x02 */ s16 mMinTurnAngle; + /* 0x04 */ s16 mTurnAngleRate; + /* 0x08 */ f32 mWaitAnmSpeed; + /* 0x0C */ f32 mWalkAnmSpeed; + /* 0x10 */ f32 mRunAnmSpeed; + /* 0x14 */ f32 mWalkChangeRate; + /* 0x18 */ f32 mRunChangeRate; + /* 0x1C */ f32 mMaxSpeed; + /* 0x20 */ f32 mAcceleration; + /* 0x24 */ f32 mDeceleration; + /* 0x28 */ f32 mBackWalkAnmSpeed; + /* 0x2C */ f32 mBackRunAnmSpeed; + /* 0x30 */ f32 mBackWalkChangeRate; + /* 0x34 */ f32 mBackRunChangeRate; + /* 0x38 */ f32 mMaxBackwardsSpeed; + /* 0x3C */ f32 mBackAcceleration; + /* 0x40 */ f32 mBackDeceleration; + /* 0x44 */ f32 mMinWalkFrame; + /* 0x48 */ f32 mMinBackWalkFrame; + /* 0x4C */ f32 mWalkForwardAnmSpeed; + /* 0x50 */ f32 mRunForwardAnmSpeed; }; // Size: 0x54 class daAlinkHIO_noActAtnMove_c0 { @@ -4573,19 +4580,10 @@ public: static daAlinkHIO_wallMove_c1 const m; }; -class daAlinkHIO_wallCatch_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ daAlinkHIO_anm_c field_0x14; - /* 0x28 */ daAlinkHIO_anm_c field_0x28; - /* 0x3C */ daAlinkHIO_anm_c field_0x3C; - /* 0x50 */ f32 field_0x50; -}; // Size: 0x54 - class daAlinkHIO_wallFall_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x00 */ daAlinkHIO_anm_c mOneHandGrabAnm; + /* 0x14 */ daAlinkHIO_anm_c mTwoHandGrabAnm; }; // Size: 0x28 class daAlinkHIO_wallFall_c0 { @@ -4593,6 +4591,15 @@ public: static daAlinkHIO_wallFall_c1 const m; }; +class daAlinkHIO_wallCatch_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mGrabAAnm; + /* 0x14 */ daAlinkHIO_anm_c mGrabBAnm; + /* 0x28 */ daAlinkHIO_anm_c mClimbAnm; + /* 0x3C */ daAlinkHIO_anm_c mJumpAnm; + /* 0x50 */ f32 mClimbStartFrame; +}; // Size: 0x54 + class daAlinkHIO_wallCatch_c0 { public: static daAlinkHIO_wallCatch_c1 const m; @@ -4660,10 +4667,9 @@ public: class daAlinkHIO_slide_c1 { public: - // most of these havent been verified yet /* 0x00 */ daAlinkHIO_anm_c mForwardSlideAnm; /* 0x14 */ daAlinkHIO_anm_c mBackwardSlideAnm; - /* 0x28 */ daAlinkHIO_anm_c mForwardLandAnm; // this and 0x3C might have names reversed? + /* 0x28 */ daAlinkHIO_anm_c mForwardLandAnm; /* 0x3C */ daAlinkHIO_anm_c mBackwardLandAnm; /* 0x50 */ f32 mMaxSpeed; /* 0x54 */ f32 mAcceleration; @@ -4671,9 +4677,9 @@ public: /* 0x5C */ f32 mClimbAngle; /* 0x60 */ f32 mClimbAnmMinSpeed; /* 0x64 */ f32 mMaxClimbSpeed; - /* 0x68 */ f32 mLavaFloorSlideAngle; // ? - /* 0x6C */ f32 mLavaFloorWeakSlideAngle; // ? - /* 0x70 */ f32 mLavaFloorWeakSlideSpeed; + /* 0x68 */ f32 mLV2MinibossFloorSlideAngle; + /* 0x6C */ f32 mLV2MinibossFloorWeakSlideAngle; + /* 0x70 */ f32 mLV2MinibossFloorWeakSlideSpeed; /* 0x74 */ f32 mMaxClimbAnmSpeed; }; // Size: 0x78 @@ -4721,7 +4727,7 @@ public: /* 0x56 */ s16 mUnderwaterTurnRate; /* 0x58 */ s16 mUnderwaterTurnMin; /* 0x5A */ s16 mUnderwaterTurnMax; - /* 0x5C */ s16 field_0x5c; // related to dash + /* 0x5C */ s16 field_0x5c; // related to dash /* 0x5E */ s16 field_0x5e; // related to dash /* 0x60 */ f32 mInitHeight; /* 0x64 */ f32 mResurfaceHeight; @@ -4851,20 +4857,20 @@ public: class daAlinkHIO_horse_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ daAlinkHIO_anm_c field_0x14; - /* 0x28 */ daAlinkHIO_anm_c field_0x28; - /* 0x3C */ daAlinkHIO_anm_c field_0x3C; - /* 0x50 */ s16 field_0x50; - /* 0x52 */ s16 field_0x52; - /* 0x54 */ s16 field_0x54; - /* 0x56 */ s16 field_0x56; + /* 0x00 */ daAlinkHIO_anm_c mWalkAnm; + /* 0x14 */ daAlinkHIO_anm_c mRunAnm; + /* 0x28 */ daAlinkHIO_anm_c mWhipAnm; + /* 0x3C */ daAlinkHIO_anm_c mWhipRunAnm; + /* 0x50 */ s16 mSwordUpTime; + /* 0x52 */ s16 mSearchRangeAngle; + /* 0x54 */ s16 mNoWalkTime; + /* 0x56 */ s16 mWhipWaitTime; /* 0x58 */ s16 field_0x58; /* 0x5A */ s16 field_0x5A; - /* 0x5C */ f32 field_0x5C; - /* 0x60 */ f32 field_0x60; - /* 0x64 */ f32 field_0x64; - /* 0x68 */ f32 field_0x68; + /* 0x5C */ f32 mSwordUpAnmSpeed; + /* 0x60 */ f32 mSwordUpInterpolation; + /* 0x64 */ f32 mHorseWalkStartFrame; + /* 0x68 */ f32 mTiredWaitInterpolation; }; // Size: 0x6C class daAlinkHIO_horse_c0 { @@ -4885,7 +4891,7 @@ public: /* 0x2C */ f32 field_0x2C; /* 0x30 */ f32 field_0x30; /* 0x34 */ f32 field_0x34; - /* 0x38 */ f32 field_0x38; + /* 0x38 */ f32 mBackMaxSpeed; /* 0x3C */ f32 field_0x3C; /* 0x40 */ f32 field_0x40; /* 0x44 */ f32 field_0x44; @@ -4898,29 +4904,29 @@ public: class daAlinkHIO_damage_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ daAlinkHIO_anm_c field_0x14; - /* 0x28 */ u8 field_0x28; - /* 0x2A */ s16 field_0x2A; - /* 0x2C */ s16 field_0x2C; - /* 0x2E */ s16 field_0x2E; - /* 0x30 */ s16 field_0x30; - /* 0x32 */ s16 field_0x32; - /* 0x34 */ s16 field_0x34; - /* 0x36 */ s16 field_0x36; - /* 0x38 */ s16 field_0x38; - /* 0x3A */ s16 field_0x3A; - /* 0x3C */ s16 field_0x3C; - /* 0x3E */ s16 field_0x3E; - /* 0x40 */ s16 field_0x40; - /* 0x42 */ s16 field_0x42; - /* 0x44 */ s16 field_0x44; - /* 0x46 */ s16 field_0x46; - /* 0x48 */ s16 field_0x48; - /* 0x4A */ s16 field_0x4A; - /* 0x4C */ s16 field_0x4C; - /* 0x50 */ f32 field_0x50; - /* 0x54 */ f32 field_0x54; + /* 0x00 */ daAlinkHIO_anm_c mFloorDmgAnm; + /* 0x14 */ daAlinkHIO_anm_c mDashDmgAnm; + /* 0x28 */ u8 mInvincible; + /* 0x2A */ s16 mInvincibleTime; + /* 0x2C */ s16 mWolfFloorInvincibleTime; + /* 0x2E */ s16 mFreezeTime; + /* 0x30 */ s16 mFreezeInitR; + /* 0x32 */ s16 mFreezeInitG; + /* 0x34 */ s16 mFreezeInitB; + /* 0x36 */ s16 mDamageR0; + /* 0x38 */ s16 mDamageG0; + /* 0x3A */ s16 mDamageB0; + /* 0x3C */ s16 mDamageR1; + /* 0x3E */ s16 mDamageG1; + /* 0x40 */ s16 mDamageB1; + /* 0x42 */ s16 mDamageR2; + /* 0x44 */ s16 mDamageG2; + /* 0x46 */ s16 mDamageB2; + /* 0x48 */ s16 mFreezeR; + /* 0x4A */ s16 mFreezeG; + /* 0x4C */ s16 mFreezeB; + /* 0x50 */ f32 mRecoverStandAnmSpeed; + /* 0x54 */ f32 mInvertedFallInterpolation; }; // Size: 0x58 class daAlinkHIO_damage_c0 { @@ -5010,17 +5016,17 @@ public: class daAlinkHIO_damFall_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ daAlinkHIO_anm_c field_0x14; - /* 0x28 */ s16 field_0x28; - /* 0x2A */ s16 field_0x2A; - /* 0x2C */ f32 field_0x2C; - /* 0x30 */ f32 field_0x30; - /* 0x34 */ f32 field_0x34; - /* 0x38 */ f32 field_0x38; - /* 0x3C */ f32 field_0x3C; - /* 0x40 */ f32 field_0x40; - /* 0x44 */ f32 field_0x44; + /* 0x00 */ daAlinkHIO_anm_c mLandAnm; + /* 0x14 */ daAlinkHIO_anm_c mStandAnm; + /* 0x28 */ s16 mSmallStopTime; + /* 0x2A */ s16 mBigStopTime; + /* 0x2C */ f32 mMinRollHeight; + /* 0x30 */ f32 mMaxRollHeight; + /* 0x34 */ f32 mSmallDmgHeight; + /* 0x38 */ f32 mBigDmgHeight; + /* 0x3C */ f32 mSmallDmgLandStartFrame; + /* 0x40 */ f32 mFallAnmTransitionHeight; + /* 0x44 */ f32 mFallAnmMorf; }; // Size: 0x48 class daAlinkHIO_damFall_c0 { @@ -5119,8 +5125,8 @@ public: /* 0x0E */ s16 mLightDropR; /* 0x10 */ s16 mLightDropG; /* 0x12 */ s16 mLightDropB; - /* 0x14 */ f32 mSwampInputRate; // ? -}; // Size: 0x18 + /* 0x14 */ f32 mUnderwaterInputRate; +}; // Size: 0x18 class daAlinkHIO_wolf_c0 { public: @@ -5968,15 +5974,15 @@ public: class daAlinkHIO_bottle_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ daAlinkHIO_anm_c field_0x14; - /* 0x28 */ daAlinkHIO_anm_c field_0x28; - /* 0x3C */ daAlinkHIO_anm_c field_0x3C; - /* 0x50 */ daAlinkHIO_anm_c field_0x50; - /* 0x64 */ daAlinkHIO_anm_c field_0x64; - /* 0x78 */ daAlinkHIO_anm_c field_0x78; + /* 0x00 */ daAlinkHIO_anm_c mStartDrinkAnm; + /* 0x14 */ daAlinkHIO_anm_c mEndDrinkAnm; + /* 0x28 */ daAlinkHIO_anm_c mOpenBottleAnm; + /* 0x3C */ daAlinkHIO_anm_c mPourAnm; + /* 0x50 */ daAlinkHIO_anm_c mSwingDownAnm; + /* 0x64 */ daAlinkHIO_anm_c mSwingSideAnm; + /* 0x78 */ daAlinkHIO_anm_c mGetAnm; /* 0x8C */ daAlinkHIO_anm_c field_0x8C; - /* 0xA0 */ daAlinkHIO_anm_c field_0xA0; + /* 0xA0 */ daAlinkHIO_anm_c mScoopAnm; }; // Size: 0xB4 class daAlinkHIO_bottle_c0 { @@ -5988,12 +5994,12 @@ class daAlinkHIO_boom_c1 { public: /* 0x00 */ daAlinkHIO_anm_c mThrowAnm; /* 0x14 */ daAlinkHIO_anm_c mCatchAnm; - /* 0x28 */ s16 field_0x28; // return time? + /* 0x28 */ s16 mChargeTime; /* 0x2A */ s16 mBgThroughTime; /* 0x2C */ f32 mIdleAnmSpeed; /* 0x30 */ f32 mStartInterpolation; /* 0x34 */ f32 mFlySpeed; - /* 0x38 */ f32 mFlySpeed2; // return speed? + /* 0x38 */ f32 mChargeFlySpeed; /* 0x3C */ f32 mFlyDistMax; /* 0x40 */ f32 mHorsebackFlyDistMax; /* 0x44 */ f32 mLockDistMax; @@ -6007,27 +6013,27 @@ public: class daAlinkHIO_bow_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ daAlinkHIO_anm_c field_0x14; - /* 0x28 */ s16 field_0x28; - /* 0x2A */ s16 field_0x2a; - /* 0x2C */ s16 field_0x2c; - /* 0x30 */ f32 field_0x30; - /* 0x34 */ f32 field_0x34; - /* 0x38 */ f32 field_0x38; - /* 0x3C */ f32 field_0x3c; - /* 0x40 */ f32 field_0x40; - /* 0x44 */ f32 field_0x44; - /* 0x48 */ f32 field_0x48; - /* 0x4C */ f32 field_0x4c; - /* 0x50 */ f32 field_0x50; - /* 0x54 */ f32 field_0x54; - /* 0x58 */ f32 field_0x58; - /* 0x5C */ f32 field_0x5c; - /* 0x60 */ f32 field_0x60; - /* 0x64 */ f32 field_0x64; - /* 0x68 */ f32 field_0x68; - /* 0x6C */ f32 field_0x6c; + /* 0x00 */ daAlinkHIO_anm_c mShootAnm; + /* 0x14 */ daAlinkHIO_anm_c mLoadAnm; + /* 0x28 */ s16 mChargeArrowTime; + /* 0x2A */ s16 mBombArrowHoldTime; + /* 0x2C */ s16 mBombArrowFlyExplodeTime; + /* 0x30 */ f32 mStartInterpolation; + /* 0x34 */ f32 mArrowSpeed; + /* 0x38 */ f32 mArrowDistance; + /* 0x3C */ f32 mChargeArrowSpeed; + /* 0x40 */ f32 mChargeArrowDistance; + /* 0x44 */ f32 mArrowAttackRadius; + /* 0x48 */ f32 mBombArrowSpeed; + /* 0x4C */ f32 mBombArrowDistance; + /* 0x50 */ f32 mChargeBombArrowSpeed; + /* 0x54 */ f32 mChargeBombArrowDistance; + /* 0x58 */ f32 mScopeArrowSpeed; + /* 0x5C */ f32 mScopeArrowDistance; + /* 0x60 */ f32 mArrowIncAttackMaxStart; + /* 0x64 */ f32 mArrowIncAttackMax; + /* 0x68 */ f32 mSlingshotSpeed; + /* 0x6C */ f32 mSlingshotDistance; }; // Size: 0x70 class daAlinkHIO_bow_c0 { @@ -6037,38 +6043,38 @@ public: class daAlinkHIO_ironBall_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ s16 field_0x14; - /* 0x16 */ s16 field_0x16; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1C; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; - /* 0x28 */ f32 field_0x28; - /* 0x2C */ f32 field_0x2C; - /* 0x30 */ f32 field_0x30; - /* 0x34 */ f32 field_0x34; - /* 0x38 */ f32 field_0x38; - /* 0x3C */ f32 field_0x3C; - /* 0x40 */ f32 field_0x40; - /* 0x44 */ f32 field_0x44; - /* 0x48 */ f32 field_0x48; - /* 0x4C */ f32 field_0x4C; - /* 0x50 */ f32 field_0x50; - /* 0x54 */ f32 field_0x54; - /* 0x58 */ f32 field_0x58; - /* 0x5C */ f32 field_0x5C; - /* 0x60 */ f32 field_0x60; - /* 0x64 */ f32 field_0x64; - /* 0x68 */ f32 field_0x68; + /* 0x00 */ daAlinkHIO_anm_c mCatchAnm; + /* 0x14 */ s16 mThrowChainNum; + /* 0x16 */ s16 mReturnChainRemoveNum; + /* 0x18 */ f32 mWaitAnmSpeed; + /* 0x1C */ f32 mPrepareAnmSpeed; + /* 0x20 */ f32 mPrepareInterpolation; + /* 0x24 */ f32 mTurnAnmSpeed; + /* 0x28 */ f32 mTurnInterpolation; + /* 0x2C */ f32 mPreThrowAnmSpeed; + /* 0x30 */ f32 mPreThrowAnmInterpolation; + /* 0x34 */ f32 mThrowAnmSpeed; + /* 0x38 */ f32 mThrowInterpolation; + /* 0x3C */ f32 mPullAnmSpeed; + /* 0x40 */ f32 mPullInterpolation; + /* 0x44 */ f32 mChainSpeedRate; + /* 0x48 */ f32 mChainGravity; + /* 0x4C */ f32 mReturnChainAccelY; + /* 0x50 */ f32 mReturnChainRate; + /* 0x54 */ f32 mThrowChainAccelZ; + /* 0x58 */ f32 mThrowChainAccelY; + /* 0x5C */ f32 mThrowChainGravity; + /* 0x60 */ f32 mBallGravity; + /* 0x64 */ f32 mThrowBallGravity; + /* 0x68 */ f32 mBallMaxFallSpeed; /* 0x6C */ f32 field_0x6C; - /* 0x70 */ f32 field_0x70; - /* 0x74 */ f32 field_0x74; - /* 0x78 */ f32 field_0x78; - /* 0x7C */ f32 field_0x7C; - /* 0x80 */ f32 field_0x80; - /* 0x84 */ f32 field_0x84; - /* 0x88 */ f32 field_0x88; + /* 0x70 */ f32 mThrowSpeedZ; + /* 0x74 */ f32 mThrowSpeedY; + /* 0x78 */ f32 mReturnBallGravity; + /* 0x7C */ f32 mAttackRadius; + /* 0x80 */ f32 mFeetPosRatio; + /* 0x84 */ f32 mWalkAnmSpeedMax; + /* 0x88 */ f32 mWalkAnmSpeedMin; }; // Size: 0x8C class daAlinkHIO_ironBall_c0 { @@ -6102,7 +6108,7 @@ public: /* 0x14 */ f32 mStopSpeedY; /* 0x18 */ f32 mMaxSpeedY; /* 0x1C */ f32 mEffScale; - /* 0x20 */ f32 mAtRadius; + /* 0x20 */ f32 mAttackRadius; /* 0x24 */ f32 mPokeBombTrackRate; /* 0x28 */ f32 mWaterGravity; /* 0x2C */ f32 mWaterMaxFallSpeed; @@ -6169,22 +6175,22 @@ public: class daAlinkHIO_hookshot_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ daAlinkHIO_anm_c field_0x14; - /* 0x28 */ daAlinkHIO_anm_c field_0x28; - /* 0x3C */ f32 field_0x3C; - /* 0x40 */ f32 field_0x40; - /* 0x44 */ f32 field_0x44; - /* 0x48 */ f32 field_0x48; - /* 0x4C */ f32 field_0x4C; - /* 0x50 */ f32 field_0x50; - /* 0x54 */ f32 field_0x54; - /* 0x58 */ f32 field_0x58; - /* 0x5C */ f32 field_0x5C; - /* 0x60 */ f32 field_0x60; - /* 0x64 */ f32 field_0x64; - /* 0x68 */ f32 field_0x68; - /* 0x6C */ f32 field_0x6C; + /* 0x00 */ daAlinkHIO_anm_c mShootAnm; + /* 0x14 */ daAlinkHIO_anm_c mRoofHangAnm; + /* 0x28 */ daAlinkHIO_anm_c mWallHangAnm; + /* 0x3C */ u8 mForceStick; + /* 0x40 */ f32 mWaitAnmSpeed; + /* 0x44 */ f32 mStartInterpolation; + /* 0x48 */ f32 mMaxLength; + /* 0x4C */ f32 mShootSpeed; + /* 0x50 */ f32 mReturnSpeed; + /* 0x54 */ f32 mStickReturnSpeed; + /* 0x58 */ f32 mRoofHangRiseSpeed; + /* 0x5C */ f32 mRoofHangDecendSpeed; + /* 0x60 */ f32 mBossMaxLength; + /* 0x64 */ f32 mBossShootSpeed; + /* 0x68 */ f32 mBossReturnSpeed; + /* 0x6C */ f32 mBossStickReturnSpeed; }; // Size: 0x70 class daAlinkHIO_hookshot_c0 { @@ -6206,6 +6212,7 @@ public: FLG0_UNK_8000000 = 0x8000000, FLG0_NPC_NEAR = 0x100000, FLG0_NPC_FAR = 0x40000, + FLG0_NO_INPUT = 0x4000, FLG0_NO_DRAW = 0x2000, FLG0_UNK_200 = 0x200, }; @@ -6278,13 +6285,14 @@ public: BOOL checkNpcNear() { return checkStateFlg0(FLG0_NPC_NEAR); } BOOL checkNpcFar() { return checkStateFlg0(FLG0_NPC_FAR); } BOOL checkNoDraw() const { return checkStateFlg0(FLG0_NO_DRAW); } + BOOL checkNoInput() const { return checkStateFlg0(FLG0_NO_INPUT); } int checkMetamorphoseEnable() { return (this->*mpFunc)(); } - + bool checkPortalObjRide() const { return checkStateFlg0(FLG0_UNK_8000000) && checkStateFlg0(FLG0_UNK_200); } - inline bool checkMidnaRealBody(); + inline static BOOL checkMidnaRealBody(); static u8 const m_texDataTable[84]; static u8 const m_anmDataTable[636]; @@ -6387,7 +6395,7 @@ private: }; static fopAc_ac_c* daAlink_searchPortal(fopAc_ac_c* param_0, void* param_1); -static void* daAlink_searchCanoe(fopAc_ac_c* param_0, void* param_1); +static fopAc_ac_c* daAlink_searchCanoe(fopAc_ac_c* param_0, void* param_1); static void* daAlink_searchBoar(fopAc_ac_c* param_0, void* param_1); static fopAc_ac_c* daAlink_searchLightBall(fopAc_ac_c* p_actor, void* param_1); diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index ee49352f59c..97ee69ced6b 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -21,6 +21,9 @@ public: /* 8015F384 */ void setSightImage(ResTIMG*); bool getDrawFlg() { return mDrawFlag; } + void onDrawFlg() { mDrawFlag = true; } + void offDrawFlg() { mDrawFlag = false; } + void setPos(const cXyz* i_pos) { mPos = *i_pos; } private: /* 0x04 */ bool mDrawFlag; @@ -37,6 +40,9 @@ public: /* 8015E654 */ int posMove(cXyz*, s16*, fopAc_ac_c*, s16); /* 8015E87C */ void bgCheckAfterOffset(cXyz const*); + static void initDropAngleY() { m_dropAngleY = 0x4000; } + static void offEventKeepFlg() { m_eventKeepFlg = 0; } + static s16 m_dropAngleY; static s16 m_eventKeepFlg; @@ -138,15 +144,18 @@ public: void setSpecialDemoType(); void setDemoType(u16 pType) { mDemoType = pType; } - u16 getDemoType() const { return mDemoType; } + int getDemoType() const { return mDemoType; } void setDemoMode(u32 mode) { mDemoMode = mode; } u32 getDemoMode() const { return mDemoMode; } int getParam1() const { return mParam1; } void setOriginalDemoType() { setDemoType(3); } void i_setSpecialDemoType() { setDemoType(5); } + void setSystemDemoType() { setDemoType(2); } void setStick(f32 stick) { mStick = stick; } void setMoveAngle(s16 angle) { mDemoMoveAngle = angle; } s16 getMoveAngle() const { return mDemoMoveAngle; } + f32 getStick() { return mStick; } + int getParam0() const { return mParam0; } private: /* 0x00 */ u16 mDemoType; @@ -156,7 +165,7 @@ private: /* 0x08 */ int mParam0; /* 0x0C */ int mParam1; /* 0x10 */ u32 mDemoMode; - /* 0x14 */ float mStick; + /* 0x14 */ f32 mStick; /* 0x18 */ cXyz mDemoPos0; }; // Size: 0x24 @@ -191,8 +200,8 @@ public: /* 0x05BC */ cXyz mSwordTopPos; /* 0x05C8 */ cXyz mLeftHandPos; /* 0x05D4 */ cXyz mRightHandPos; - /* 0x05E0 */ cXyz mLeftFootPosP; - /* 0x05EC */ cXyz mRightFootPosP; + /* 0x05E0 */ cXyz mLeftFootPos; + /* 0x05EC */ cXyz mRightFootPos; /* 0x05F8 */ u8 field_0x5f8[0xC]; /* 0x0604 */ daPy_demo_c mDemo; @@ -221,25 +230,34 @@ public: FLG0_UNK_2 = 2, FLG0_HVY_STATE = FLG0_UNK_40000000 | FLG0_EQUIP_HVY_BOOTS | FLG0_UNK_20000, + FLG0_UNK_14000 = 0x14000, }; enum daPy_FLG1 { + FLG1_UNK_40000000 = 0x40000000, FLG1_UNK_10000000 = 0x10000000, + FLG1_UNK_4000000 = 0x4000000, FLG1_IS_WOLF = 0x2000000, - FLG1_UNK_400000 = 0x400000, + FLG1_DASH_MODE = 0x400000, FLG1_UNK_10000 = 0x10000, + FLG1_UNK_8000 = 0x8000, FLG1_THROW_DAMAGE = 0x4000, + FLG1_UNK_80 = 0x80, + FLG1_UNK_40 = 0x40, FLG1_UNK_20 = 0x20, FLG1_UNK_10 = 0x10, FLG1_UNK_4 = 4, FLG1_UNK_2 = 2, + FLG1_UNK_1 = 1, }; enum daPy_FLG2 { FLG2_UNK_20000000 = 0x20000000, + FLG2_UNK_10000000 = 0x10000000, FLG2_UNK_4080000 = 0x4080000, FLG2_UNK_2080000 = 0x2080000, FLG2_BOAR_SINGLE_BATTLE = 0x1800000, + FLG2_UNK_8000000 = 0x8000000, FLG2_UNK_1000000 = 0x1000000, FLG2_UNK_800000 = 0x800000, FLG2_STATUS_WINDOW_DRAW = 0x400000, @@ -250,6 +268,8 @@ public: FLG2_UNK_20000 = 0x20000, FLG2_SCN_CHG_START = 0x8000, FLG2_UNK_4000 = 0x4000, + FLG2_UNK_1000 = 0x1000, + FLG2_UNK_200 = 0x200, FLG2_UNK_80 = 0x80, FLG2_UNK_40 = 0x40, FLG2_UNK_10 = 0x10, @@ -262,15 +282,25 @@ public: enum daPy_FLG3 { FLG3_UNK_40000000 = 0x40000000, + FLG3_UNK_20000000 = 0x20000000, + FLG3_UNK_4000000 = 0x4000000, FLG3_UNK_2000000 = 0x2000000, FLG3_UNK_1000000 = 0x1000000, FLG3_UNK_100000 = 0x100000, FLG3_UNK_80000 = 0x80000, FLG3_COPY_ROD_THROW_AFTER = 0x40000, FLG3_UNK_4000 = 0x4000, + FLG3_UNK_200 = 0x200, + FLG3_UNK_100 = 0x100, + FLG3_UNK_40 = 0x40, + FLG3_UNK_20 = 0x20, + FLG3_UNK_10 = 0x10, + FLG3_UNK_4 = 4, }; enum daPy_ERFLG0 { + ERFLG0_UNK_40000000 = 0x40000000, + ERFLG0_UNK_10000000 = 0x10000000, ERFLG0_UNK_8000000 = 0x8000000, ERFLG0_UNK_2000000 = 0x2000000, ERFLG0_UNK_1000000 = 0x1000000, @@ -279,8 +309,12 @@ public: ERFLG0_UNK_200000 = 0x200000, ERFLG0_UNK_100000 = 0x100000, ERFLG0_UNK_2000 = 0x2000, + ERFLG0_UNK_1000 = 0x1000, ERFLG0_UNK_400 = 0x400, ERFLG0_UNK_100 = 0x100, + ERFLG0_UNK_80 = 0x80, + ERFLG0_UNK_40 = 0x40, + ERFLG0_UNK_8 = 8, ERFLG0_UNK_4 = 4, ERFLG0_UNK_2 = 2, ERFLG0_UNK_1 = 1, @@ -288,11 +322,19 @@ public: enum daPy_ERFLG1 { ERFLG1_GANON_FINISH = 0x80000000, + ERFLG1_UNK_40000000 = 0x40000000, ERFLG1_UNK_10000000 = 0x10000000, ERFLG1_UNK_4000000 = 0x4000000, ERFLG1_UNK_40000 = 0x40000, ERFLG1_UNK_2000 = 0x2000, + ERFLG1_UNK_800 = 0x800, + ERFLG1_UNK_400 = 0x400, ERFLG1_UNK_200 = 0x200, + ERFLG1_UNK_100 = 0x100, + ERFLG1_UNK_80 = 0x80, + ERFLG1_UNK_10 = 0x10, + ERFLG1_UNK_20 = 0x20, + ERFLG1_UNK_8 = 8, ERFLG1_UNK_4 = 4, ERFLG1_UNK_2 = 2, ERFLG1_UNK_1 = 1, @@ -300,11 +342,13 @@ public: enum daPy_ERFLG2 { ERFLG2_UNK_100 = 0x100, + ERFLG2_UNK_40 = 0x40, ERFLG2_UNK_20 = 0x20, }; enum daPy_RFLG0 { RFLG0_UNK_8000000 = 0x8000000, + RFLG0_UNK_4000000 = 0x4000000, RFLG0_UNK_4000 = 0x4000, RFLG0_ENEMY_ATTN_LOCK = 0x1000, RFLG0_UNK_400 = 0x400, @@ -314,6 +358,11 @@ public: RFLG0_UNK_2 = 0x2, }; + enum daPy_RFLG1 { + RFLG1_UNK_30 = 0x30, + RFLG1_UNK_2 = 0x2, + }; + enum { /* 0x01 */ SMODE_SUMO_READY = 1, /* 0x25 */ SMODE_SUMO_LOSE = 37, @@ -324,28 +373,51 @@ public: }; enum CutType { - /* 0x01 */ TYPE_CUT_VERTICAL = 1, - /* 0x02 */ TYPE_CUT_STAB, - /* 0x03 */ TYPE_CUT_SWEEP, - /* 0x04 */ TYPE_CUT_HORIZONTAL, - /* 0x05 */ TYPE_CUT_HEAD, // Helm Splitter - /* 0x06 */ TYPE_CUT_LEFT_SWEEP_FINISH, - /* 0x07 */ TYPE_CUT_DOWN_FINISH, - /* 0x08 */ TYPE_CUT_TURN_RIGHT, - /* 0x0A */ TYPE_CUT_JUMP = 10, - /* 0x10 */ TYPE_CUT_AIR = 0x10, - /* 0x12 */ TYPE_CUT_LARGE_JUMP_INIT = 0x12, - /* 0x13 */ TYPE_CUT_LARGE_JUMP, - /* 0x14 */ TYPE_CUT_LARGE_JUMP_FINISH, - /* 0x15 */ TYPE_CUT_RIGHT_SWEEP_FINISH, - /* 0x16 */ TYPE_CUT_TURN_LEFT, - /* 0x17 */ TYPE_CUT_LARGE_TURN_LEFT, - /* 0x18 */ TYPE_CUT_LARGE_TURN_RIGHT, - /* 0x1A */ TYPE_CUT_FAST_MOVE = 0x1A, - /* 0x1E */ TYPE_CUT_TWIRL = 0x1E, // Back Slice - /* 0x1F */ TYPE_CUT_FAST, - /* 0x20 */ TYPE_CUT_STAB_FINISH, - /* 0x21 */ TYPE_CUT_STAB_COMBO, + /* 0x01 */ CUT_TYPE_NM_VERTICAL = 1, + /* 0x02 */ CUT_TYPE_NM_STAB, + /* 0x03 */ CUT_TYPE_NM_RIGHT, + /* 0x04 */ CUT_TYPE_NM_LEFT, + /* 0x05 */ CUT_TYPE_HEAD_JUMP, // Helm Splitter + /* 0x06 */ CUT_TYPE_FINISH_LEFT, + /* 0x07 */ CUT_TYPE_FINISH_VERTICAL, + /* 0x08 */ CUT_TYPE_TURN_RIGHT, + /* 0x0A */ CUT_TYPE_JUMP = 10, + /* 0x0B */ CUT_TYPE_DASH_UNK_B, + /* 0x0C */ CUT_TYPE_DASH_UNK_C, + /* 0x0D */ CUT_TYPE_DASH_UNK_D, + /* 0x10 */ CUT_TYPE_AIR = 0x10, + /* 0x11 */ CUT_TYPE_DASH_UNK_11, + /* 0x12 */ CUT_TYPE_LARGE_JUMP_INIT, + /* 0x13 */ CUT_TYPE_LARGE_JUMP, + /* 0x14 */ CUT_TYPE_LARGE_JUMP_FINISH, + /* 0x15 */ CUT_TYPE_FINISH_RIGHT, + /* 0x16 */ CUT_TYPE_TURN_LEFT, + /* 0x17 */ CUT_TYPE_LARGE_TURN_LEFT, + /* 0x18 */ CUT_TYPE_LARGE_TURN_RIGHT, + /* 0x1A */ CUT_TYPE_MORTAL_DRAW_A = 0x1A, + /* 0x1E */ CUT_TYPE_TWIRL = 0x1E, // Back Slice + /* 0x1F */ CUT_TYPE_MORTAL_DRAW_B, + /* 0x20 */ CUT_TYPE_FINISH_STAB, + /* 0x21 */ CUT_TYPE_COMBO_STAB, + /* 0x22 */ CUT_TYPE_HORSE_UNK_22, + /* 0x23 */ CUT_TYPE_HORSE_UNK_23, + /* 0x25 */ CUT_TYPE_DASH_UNK_25 = 0x25, + /* 0x26 */ CUT_TYPE_DASH_UNK_26 = 0x26, + /* 0x27 */ CUT_TYPE_DOWN, + /* 0x29 */ CUT_TYPE_GUARD_ATTACK = 0x29, + /* 0x2A */ CUT_TYPE_HORSE_UNK_2A, + /* 0x2B */ CUT_TYPE_HORSE_TURN, + /* 0x2C */ CUT_TYPE_WOLF_B_LEFT, + /* 0x2D */ CUT_TYPE_WOLF_B_RIGHT, + /* 0x2E */ CUT_TYPE_WOLF_B_FRONT, + /* 0x2F */ CUT_TYPE_WOLF_B_BACK, + /* 0x31 */ CUT_TYPE_WOLF_UNK_31 = 0x31, + /* 0x32 */ CUT_TYPE_WOLF_UNK_32, + /* 0x33 */ CUT_TYPE_WOLF_TURN_LEFT, + /* 0x34 */ CUT_TYPE_WOLF_TURN_RIGHT, + /* 0x36 */ CUT_TYPE_WOLF_LOCK = 0x36, + /* 0x38 */ CUT_TYPE_DASH_UNK_38 = 0x38, + /* 0x39 */ CUT_TYPE_WOLF_UNK_39, }; static u32 setParamData(int, int, int, int); @@ -360,7 +432,7 @@ public: static BOOL checkTradeItem(int); static BOOL checkDungeonWarpItem(int); static BOOL checkMasterSwordEquip(); - bool checkWoodShieldEquip(); + static BOOL checkWoodShieldEquip(); f32 getAttentionOffsetY(); s16 checkNowWolfEyeUp(); static void forceRestartRoom(int, u32, int); @@ -458,7 +530,7 @@ public: virtual BOOL checkGoatThrowAfter() const; virtual BOOL checkWolfTagLockJump() const; virtual BOOL checkWolfTagLockJumpLand() const; - virtual bool checkWolfRope(); + virtual BOOL checkWolfRope(); virtual BOOL checkWolfRopeHang() const; virtual BOOL checkRollJump() const; virtual BOOL checkGoronRideWait() const; @@ -537,7 +609,7 @@ public: virtual s16 getBoardCutTurnOffsetAngleY() const; virtual cXyz* getMagneHitPos(); virtual cXyz* getMagneBootsTopVec(); - virtual bool getKandelaarFlamePos(); + virtual cXyz* getKandelaarFlamePos(); virtual bool checkUseKandelaar(int); virtual void setDkCaught(fopAc_ac_c*); virtual void onPressedDamage(cXyz const&, short); @@ -550,8 +622,8 @@ public: virtual bool checkSpinnerPathMove(); virtual bool checkSpinnerTriggerAttack(); virtual void onSpinnerPathForceRemove(); - virtual bool getIronBallBgHit() const; - virtual bool getIronBallCenterPos(); + virtual s16 getIronBallBgHit() const; + virtual cXyz* getIronBallCenterPos(); virtual bool checkCanoeFishingGetLeft() const; virtual bool checkCanoeFishingGetRight() const; virtual u8 checkBeeChildDrink() const; @@ -604,16 +676,28 @@ public: } bool i_getSumouMode() const { return getSumouCameraMode(); } + void i_cancelOriginalDemo() { + mDemo.setSystemDemoType(); + mDemo.setDemoMode(1); + } bool checkStatusWindowDraw() { return i_checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); } bool checkCargoCarry() const { return mSpecialMode == SMODE_CARGO_CARRY; } bool getHeavyStateAndBoots() { return i_checkNoResetFlg0(FLG0_HVY_STATE); } bool checkEnemyAttentionLock() const { return i_checkResetFlg0(RFLG0_ENEMY_ATTN_LOCK); } bool checkCanoeSlider() const { return mSpecialMode == 0x2D; } + bool checkGoatStopGame() const { return mSpecialMode == 0x2A; } + bool i_checkGoronSideMove() const { return mSpecialMode == 0x2B; } u8 getCutType() const { return mCutType; } u16 getSwordAtUpTime() const { return mSwordUpTimer; } bool checkWaterInMove() const { return i_checkNoResetFlg0(FLG0_UNDERWATER); } bool checkSceneChangeAreaStart() const { return i_checkNoResetFlg2(FLG2_SCN_CHG_START); } + + void offGoronSideMove() { + if (i_checkGoronSideMove()) { + mSpecialMode = 0; + } + } // some functions use these function as an inline // is there a better way to handle this? @@ -628,6 +712,7 @@ public: void i_onNoResetFlg3(int pFlg) { mNoResetFlg3 |= pFlg; } void i_offNoResetFlg0(int pFlg) { mNoResetFlg0 &= ~pFlg; } + void i_offNoResetFlg1(int pFlg) { mNoResetFlg1 &= ~pFlg; } void i_offNoResetFlg2(int pFlg) { mNoResetFlg2 &= ~pFlg; } void i_offNoResetFlg3(int pFlg) { mNoResetFlg3 &= ~pFlg; } @@ -637,11 +722,13 @@ public: void i_onEndResetFlg0(int flag) { mEndResetFlg0 |= flag; } void i_onEndResetFlg2(int flag) { mEndResetFlg2 |= flag; } + void i_offEndResetFlg2(daPy_ERFLG2 flag) { mEndResetFlg2 &= ~flag; } int i_checkResetFlg0(daPy_py_c::daPy_RFLG0 flag) const { return mResetFlg0 & flag; } int i_checkEndResetFlg0(daPy_py_c::daPy_ERFLG0 flag) const { return mEndResetFlg0 & flag; } int i_checkEndResetFlg1(daPy_py_c::daPy_ERFLG1 flag) const { return mEndResetFlg1 & flag; } + int i_checkEndResetFlg2(daPy_py_c::daPy_ERFLG2 flag) const { return mEndResetFlg2 & flag; } void i_onEndResetFlg1(daPy_ERFLG1 pFlg) { mEndResetFlg1 |= pFlg; } @@ -652,9 +739,12 @@ public: void i_onPlayerNoDraw() { i_onNoResetFlg0(FLG0_PLAYER_NO_DRAW); } void i_offPlayerNoDraw() { i_offNoResetFlg0(FLG0_PLAYER_NO_DRAW); } + u32 i_checkBoarSingleBattle() const { return i_checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); } + inline static u32 i_getLastSceneMode(); inline static u32 getLastSceneMode(); inline static bool checkWoodSwordEquip(); + inline static bool checkLightMasterSwordEquip(); inline BOOL i_checkSwordGet(); inline bool i_checkShieldGet() const; inline static BOOL checkNowWolf(); diff --git a/include/d/bg/d_bg_s_acch.h b/include/d/bg/d_bg_s_acch.h index dce36370276..a00f1768aee 100644 --- a/include/d/bg/d_bg_s_acch.h +++ b/include/d/bg/d_bg_s_acch.h @@ -113,6 +113,7 @@ public: cXyz* GetPos() { return pm_pos; } cXyz* GetOldPos() { return pm_old_pos; } f32 GetGroundH() const { return m_ground_h; } + f32 GetRoofHeight() const { return m_roof_height; } void SetLin() { m_lin.SetStartEnd(*pm_old_pos, *pm_pos); } bool ChkGroundFind() { return m_flags & GROUND_FIND; } bool ChkGroundHit() { return m_flags & GROUND_HIT; } @@ -123,6 +124,7 @@ public: void SetRoofHit() { m_flags |= ROOF_HIT; } bool ChkWallHit() { return m_flags & WALL_HIT; } void OffLineCheckHit() { m_flags &= ~LINE_CHECK_HIT; } + void OffLineCheck() { m_flags &= ~LINE_CHECK; } bool ChkLineCheckNone() { return m_flags & LINE_CHECK_NONE; } bool ChkLineCheck() { return m_flags & LINE_CHECK; } void ClrRoofHit() { m_flags &= ~ROOF_HIT; } @@ -206,4 +208,13 @@ public: /* 80BB336C */ virtual ~dBgS_ObjAcch(); }; +class dBgS_StatueAcch : public dBgS_Acch { +public: + dBgS_StatueAcch() { + SetStatue(); + } + + /* 806646F8 */ virtual ~dBgS_StatueAcch(); +}; + #endif /* D_BG_D_BG_S_ACCH_H */ diff --git a/include/d/cc/d_cc_d.h b/include/d/cc/d_cc_d.h index 5a7813a55b2..53f5cad8074 100644 --- a/include/d/cc/d_cc_d.h +++ b/include/d/cc/d_cc_d.h @@ -87,7 +87,7 @@ public: enum dCcG_At_Spl { /* 0x0 */ dCcG_At_Spl_UNK_0, - /* 0x1 */ dCcG_At_Spl_UNK_01, + /* 0x1 */ dCcG_At_Spl_UNK_1, }; class dCcD_GObjInf; @@ -151,6 +151,7 @@ public: /* 0x2C */ cXyz mVec; /* 0x38 */ cXyz mRVec; }; // Size = 0x44 + class dCcD_GObjTg : public dCcD_GAtTgCoCommonBase { public: /* 800839A0 */ void Set(dCcD_SrcGObjTg const&); @@ -159,6 +160,7 @@ public: cXyz& GetVec() { return mVec; } void SetShieldFrontRangeYAngle(s16* angle) { mShieldFrontRangeYAngle = angle; } void SetMtrl(u8 mtrl) { mMtrl = mtrl; } + void SetHitMark(CcG_Tg_HitMark mark) { mHitMark = mark; } private: /* 0x1C */ u8 mSe; @@ -171,6 +173,7 @@ private: /* 0x44 */ s16* mShieldFrontRangeYAngle; /* 0x48 */ s16 mShieldRange; }; // Size = 0x4A ? + class dCcD_GObjCo : public dCcD_GAtTgCoCommonBase { public: /* 80083B8C */ virtual ~dCcD_GObjCo() {} @@ -195,11 +198,13 @@ public: /* 8008457C */ u8 GetTgHitObjSe(); /* 800845B0 */ static u32 getHitSeID(u8, int); /* 8008460C */ void ClrCoHit(); - /* 80084658 */ bool ChkCoHit(); + /* 80084658 */ u32 ChkCoHit(); /* 800846B0 */ void ResetCoHit(); /* 800846F0 */ cCcD_Obj* GetCoHitObj(); /* 80084740 */ void Set(dCcD_SrcGObjInf const&); + fopAc_ac_c* GetCoHitAc() { return mGObjCo.GetAc(); } + void SetAtVec(cXyz& vec) { mGObjAt.SetVec(vec); } bool ChkAtNoMass() const { return mGObjAt.ChkSPrm(8); } void OnAtNoHitMark() { mGObjAt.OnSPrm(2); } @@ -224,6 +229,16 @@ public: u8 GetAtMtrl() { return mGObjAt.GetMtrl(); } fopAc_ac_c* GetTgHitAc() { return mGObjTg.GetAc(); } void SetTgShieldFrontRangeYAngle(s16* angle) { mGObjTg.SetShieldFrontRangeYAngle(angle); } + void OffTgWolfSpNoDamage() { mGObjTg.OffSPrm(0x800); } + void OnTgWolfSpNoDamage() { mGObjTg.OnSPrm(0x800); } + void SetTgHitMark(CcG_Tg_HitMark mark) { mGObjTg.SetHitMark(mark); } + void OnTgSpShield() { mGObjTg.OnSPrm(0x40); } + void OffTgSpShield() { mGObjTg.OffSPrm(0x40); } + void OnTgShield() { mGObjTg.OnSPrm(0x1); } + void OffTgShield() { mGObjTg.OffSPrm(0x1); } + void OnTgShieldFrontRange() { mGObjTg.OnSPrm(0x8); } + void OffTgShieldFrontRange() { mGObjTg.OffSPrm(0x8); } + bool ChkTgIronBallRebound() { return mGObjTg.ChkSPrm(0x100); } static u32 const m_hitSeID[24]; diff --git a/include/d/cc/d_cc_s.h b/include/d/cc/d_cc_s.h index b78889dd3f6..55874fcae1d 100644 --- a/include/d/cc/d_cc_s.h +++ b/include/d/cc/d_cc_s.h @@ -43,6 +43,8 @@ public: /* 800872A8 */ virtual void MoveAfterCheck(); /* 80086754 */ virtual void CalcParticleAngle(dCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, csXyz*); + void SetMass(cCcD_Obj* i_obj, u8 i_priority) { mMass_Mng.Set(i_obj, i_priority); } + static u8 m_mtrl_hit_tbl[64]; private: diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 51fda45e96e..7123ba90696 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -135,7 +135,7 @@ public: dAttention_c& getAttention() { return mAttention; } dStage_startStage_c* getStartStage() { return &mStartStage; } - void setSelectItem(int idx, u8 itemId) { mSelectItem[idx] = itemId; } + void setSelectItem(int idx, u8 i_itemNo) { mSelectItem[idx] = i_itemNo; } u8 getSelectItem(int idx) { return mSelectItem[idx]; } void setSelectEquip(int idx, u8 item_id) { mSelectEquip[idx] = item_id; } void setItem(u8 slot, u8 i_no) { @@ -273,6 +273,7 @@ public: void setItemMaxLifeCount(s16 max) { mItemMaxLifeCount += max; } void setOxygen(int oxygen) { mOxygen = oxygen; } void setNowOxygen(s32 oxygen) { mNowOxygen = oxygen; } + void setOxygenCount(s32 oxygen) { mOxygenCount += oxygen; } int getOxygen() { return mOxygen; } void setMaxOxygen(int max) { mMaxOxygen = max; } int getMaxOxygen() { return mMaxOxygen; } @@ -395,11 +396,15 @@ public: void setStatus(u16 status) { mStatus = status; } s32 checkStatus(u16 flags) { return flags & mStatus; } + void setDirection(u8 i_dir) { mDirection = i_dir; } + bool& isPauseFlag() { return mPauseFlag; } void offPauseFlag() { mPauseFlag = false; } void onPauseFlag() { mPauseFlag = true; } u8 getOxygenShowFlag() { return mOxygenShowFlag; } + void setOxygenShowFlag(u8 flag) { mOxygenShowFlag = flag; } void show2dOn() { mShow2D = 1; } + void show2dOff() { mShow2D = 0; } s8 getLayerOld() { return mLayerOld; } void setMesgCancelButton(u8 button) { mMesgCancelButton = button; } void setMesgBgm(u8 param_0) { mMesgBgm = param_0; } @@ -744,6 +749,10 @@ inline dCcS* dComIfG_Ccsp() { return &g_dComIfG_gameInfo.play.mCcs; } +inline dCcS& dComIfG_Ccsp2() { + return g_dComIfG_gameInfo.play.mCcs; +} + inline dRes_info_c* dComIfG_getObjectResInfo(const char* arc_name) { return g_dComIfG_gameInfo.mResControl.getObjectResInfo(arc_name); } @@ -770,34 +779,27 @@ void dComIfGs_setMixItemIndex(int i_no, u8 item_index); u8 dComIfGs_getBottleMax(); u8 dComIfGs_checkGetItem(u8 i_itemNo); void dComIfGs_setSelectEquipClothes(u8 i_itemNo); -void dComIfGs_setKeyNum(int i_stageNo, u8 keyNum); +void dComIfGs_setKeyNum(int i_stageNo, u8 i_keyNum); void dComIfGs_BossLife_public_Set(s8); s8 dComIfGs_sense_type_change_Get(); cXyz& dComIfGs_getWarpPlayerPos(); const char* dComIfGs_getWarpStageName(); s16 dComIfGs_getWarpPlayerAngleY(); s8 dComIfGs_getWarpRoomNo(); -BOOL dComIfGs_isOneZoneSwitch(int swBit, int roomNo); +BOOL dComIfGs_isOneZoneSwitch(int i_swBit, int i_roomNo); void dComIfGs_setLastWarpMarkItemData(const char* stage, cXyz pos, s16 angle, s8 roomNo, u8, u8); u16 dComIfGs_getMaxLifeGauge(); void dComIfGs_setWarpMarkFlag(u8); void dComIfGs_setSelectEquipSword(u8 i_itemNo); void dComIfGs_setSelectEquipShield(u8 i_itemNo); -inline int i_dComIfGs_isItemFirstBit(u8 i_no) { - return g_dComIfG_gameInfo.info.getPlayer().getGetItem().isFirstBit(i_no); -} - -inline u16 i_dComIfGs_getRupee() { - return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getRupee(); -} BOOL dComIfGs_isVisitedRoom(int i_roomNo); -void dComIfGs_onZoneSwitch(int swBit, int roomNo); -void dComIfGs_onOneZoneSwitch(int param_0, int param_1); -void dComIfGs_offZoneSwitch(int param_0, int param_1); -void dComIfGs_offOneZoneSwitch(int param_0, int param_1); -s8 dComIfGp_getReverb(int roomNo); +void dComIfGs_onZoneSwitch(int i_swBit, int i_roomNo); +void dComIfGs_onOneZoneSwitch(int i_swBit, int i_roomNo); +void dComIfGs_offZoneSwitch(int i_swBit, int i_roomNo); +void dComIfGs_offOneZoneSwitch(int i_swBit, int i_roomNo); +s8 dComIfGp_getReverb(int i_roomNo); void dComIfGs_gameStart(); -int dComIfGs_wolfeye_effect_check(); +bool dComIfGs_wolfeye_effect_check(); BOOL dComIfGs_Wolf_Change_Check(); void dComIfGs_onVisitedRoom(int param_0); void dComIfGs_setWarpItemData(char const* stage, cXyz pos, s16 angle, s8 roomNo, u8 param_4, @@ -807,7 +809,7 @@ void dComIfGs_onStageSwitch(int i_stageNo, int i_no); void dComIfGs_offStageSwitch(int i_stageNo, int i_no); void dComIfGs_PolyDamageOff_Set(s8 param_0); u8 dComIfGs_staffroll_next_go_check(); -BOOL dComIfGs_isEventBit(u16 id); +BOOL dComIfGs_isEventBit(u16 i_flag); int dComIfGs_isItemFirstBit(u8 i_no); u16 dComIfGs_getRupee(); static u16 dComIfGs_getLife(); @@ -816,6 +818,14 @@ inline void dComIfGs_init() { g_dComIfG_gameInfo.info.init(); } +inline int i_dComIfGs_isItemFirstBit(u8 i_no) { + return g_dComIfG_gameInfo.info.getPlayer().getGetItem().isFirstBit(i_no); +} + +inline u16 i_dComIfGs_getRupee() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getRupee(); +} + inline void dComIfGs_onDungeonItemMap() { g_dComIfG_gameInfo.info.getMemory().getBit().onDungeonItemMap(); } @@ -828,76 +838,68 @@ inline void dComIfGs_onDungeonItemWarp() { g_dComIfG_gameInfo.info.getMemory().getBit().onDungeonItemWarp(); } -inline void dComIfGs_setItem(int slot, u8 i_no) { - g_dComIfG_gameInfo.info.getPlayer().getItem().setItem(slot, i_no); +inline void dComIfGs_setItem(int i_slotNo, u8 i_itemNo) { + g_dComIfG_gameInfo.info.getPlayer().getItem().setItem(i_slotNo, i_itemNo); } -inline void dComIfGs_setOxygen(int amount) { - g_dComIfG_gameInfo.play.setOxygen(amount); +inline void dComIfGs_setOil(u16 i_oil) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setOil(i_oil); } -inline void dComIfGs_setMaxOxygen(int max) { - g_dComIfG_gameInfo.play.setMaxOxygen(max); +inline void dComIfGs_setMaxOil(u16 i_maxOil) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMaxOil(i_maxOil); } -inline void dComIfGs_setOil(u16 amount) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setOil(amount); +inline void dComIfGs_setWalletSize(u8 i_size) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setWalletSize(i_size); } -inline void dComIfGs_setMaxOil(u16 max) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMaxOil(max); +inline void dComIfGs_setMagic(u8 i_magic) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMagic(i_magic); } -inline void dComIfGs_setWalletSize(u8 size) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setWalletSize(size); +inline void dComIfGs_setMaxMagic(u8 i_maxMagic) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMaxMagic(i_maxMagic); } -inline void dComIfGs_setMagic(u8 amount) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMagic(amount); +inline void dComIfGs_setRupee(u16 i_rupees) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setRupee(i_rupees); } -inline void dComIfGs_setMaxMagic(u8 max) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMaxMagic(max); +inline void dComIfGs_setLife(u16 i_life) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setLife(i_life); } -inline void dComIfGs_setRupee(u16 amount) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setRupee(amount); -} - -inline void dComIfGs_setLife(u16 amount) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setLife(amount); -} - -inline void dComIfGs_setMaxLife(u8 max) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMaxLife(max); +inline void dComIfGs_setMaxLife(u8 i_maxLife) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMaxLife(i_maxLife); } inline void dComIfGs_onDungeonItemBossKey() { g_dComIfG_gameInfo.info.getMemory().getBit().onDungeonItemBossKey(); } -inline void dComIfGs_setCollectSword(u8 sword_id) { - g_dComIfG_gameInfo.info.getPlayer().getCollect().setCollect(COLLECT_SWORD, sword_id); +inline void dComIfGs_setCollectSword(u8 i_swordNo) { + g_dComIfG_gameInfo.info.getPlayer().getCollect().setCollect(COLLECT_SWORD, i_swordNo); } -inline void dComIfGs_setCollectShield(u8 shield_id) { - g_dComIfG_gameInfo.info.getPlayer().getCollect().setCollect(COLLECT_SHIELD, shield_id); +inline void dComIfGs_setCollectShield(u8 i_shieldNo) { + g_dComIfG_gameInfo.info.getPlayer().getCollect().setCollect(COLLECT_SHIELD, i_shieldNo); } -inline void dComIfGs_setCollectClothes(u8 clothes_id) { - g_dComIfG_gameInfo.info.getPlayer().getCollect().setCollect(COLLECT_CLOTHING, clothes_id); +inline void dComIfGs_setCollectClothes(u8 i_clothesNo) { + g_dComIfG_gameInfo.info.getPlayer().getCollect().setCollect(COLLECT_CLOTHING, i_clothesNo); } inline void dComIfGs_setRodTypeLevelUp() { g_dComIfG_gameInfo.info.getPlayer().getItem().setRodTypeLevelUp(); } -inline void dComIfGs_setArrowNum(u8 num) { - g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setArrowNum(num); +inline void dComIfGs_setArrowNum(u8 i_arrowNum) { + g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setArrowNum(i_arrowNum); } -inline void dComIfGs_setArrowMax(u8 max) { - g_dComIfG_gameInfo.info.getPlayer().getItemMax().setArrowNum(max); +inline void dComIfGs_setArrowMax(u8 i_arrowMax) { + g_dComIfG_gameInfo.info.getPlayer().getItemMax().setArrowNum(i_arrowMax); } inline u8 dComIfGs_getPachinkoMax() { @@ -908,16 +910,16 @@ inline void dComIfGs_setEmptyBombBag() { g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBag(); } -inline void dComIfGs_setEmptyBombBag(u8 newBomb, u8 bombNum) { - g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBag(newBomb, bombNum); +inline void dComIfGs_setEmptyBombBag(u8 i_newBomb, u8 i_bombNum) { + g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBag(i_newBomb, i_bombNum); } -inline void dComIfGs_setEmptyBombBagItemIn(u8 newBomb, bool setNum) { - g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBagItemIn(newBomb, setNum); +inline void dComIfGs_setEmptyBombBagItemIn(u8 i_newBomb, bool i_setNum) { + g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBagItemIn(i_newBomb, i_setNum); } -inline void dComIfGs_setEmptyBombBagItemIn(u8 newBomb, u8 bombNum, bool setNum) { - g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBagItemIn(newBomb, bombNum, setNum); +inline void dComIfGs_setEmptyBombBagItemIn(u8 i_newBomb, u8 i_bombNum, bool i_setNum) { + g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBagItemIn(i_newBomb, i_bombNum, i_setNum); } inline void dComIfGs_setEmptyBottle() { @@ -932,16 +934,16 @@ inline void dComIfGs_setEmptyBottleItemIn(u8 i_itemNo) { g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBottleItemIn(i_itemNo); } -inline void dComIfGs_setBottleNum(u8 i_bottleIdx, u8 bottle_num) { - g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setBottleNum(i_bottleIdx, bottle_num); +inline void dComIfGs_setBottleNum(u8 i_bottleIdx, u8 i_bottleNum) { + g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setBottleNum(i_bottleIdx, i_bottleNum); } -inline void dComIfGs_onEventBit(u16 id) { - g_dComIfG_gameInfo.info.getSavedata().getEvent().onEventBit(id); +inline void dComIfGs_onEventBit(u16 i_flag) { + g_dComIfG_gameInfo.info.getSavedata().getEvent().onEventBit(i_flag); } -inline BOOL i_dComIfGs_isEventBit(u16 id) { - return g_dComIfG_gameInfo.info.getEvent().isEventBit(id); +inline BOOL i_dComIfGs_isEventBit(u16 i_flag) { + return g_dComIfG_gameInfo.info.getEvent().isEventBit(i_flag); } inline void dComIfGs_onLightDropFlag(u8 i_nowLevel) { @@ -960,8 +962,16 @@ inline BOOL dComIfGs_isSwitch(int i_no, int i_roomNo) { return g_dComIfG_gameInfo.info.isSwitch(i_no, i_roomNo); } -inline void dComIfGs_onSvZoneSwitch(int zoneNo, int swBit) { - g_dComIfG_gameInfo.info.getZone(zoneNo).getZoneBit().onSwitch(swBit); +inline BOOL dComIfGs_isRegionBit(int i_region) { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().isRegionBit(i_region); +} + +inline void dComIfGs_onRegionBit(int i_region) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().onRegionBit(i_region); +} + +inline void dComIfGs_onSvZoneSwitch(int i_zoneNo, int i_swBit) { + g_dComIfG_gameInfo.info.getZone(i_zoneNo).getZoneBit().onSwitch(i_swBit); } inline s32 dComIfGs_isDungeonItemMap() { @@ -976,17 +986,17 @@ inline s32 dComIfGs_isDungeonItemBossKey() { return g_dComIfG_gameInfo.info.getMemory().getBit().isDungeonItemBossKey(); } -inline u8 dComIfGs_getItem(int slot_no, bool check_combo) { - return g_dComIfG_gameInfo.info.getPlayer().getItem().getItem(slot_no, check_combo); +inline u8 dComIfGs_getItem(int i_slotNo, bool i_checkCombo) { + return g_dComIfG_gameInfo.info.getPlayer().getItem().getItem(i_slotNo, i_checkCombo); } -inline BOOL dComIfGs_isCollectSword(u8 sword_id) { - return g_dComIfG_gameInfo.info.getPlayer().getCollect().isCollect(COLLECT_SWORD, sword_id); +inline BOOL dComIfGs_isCollectSword(u8 i_swordNo) { + return g_dComIfG_gameInfo.info.getPlayer().getCollect().isCollect(COLLECT_SWORD, i_swordNo); } -inline BOOL dComIfGs_isCollectClothing(u8 clothing_id) { +inline BOOL dComIfGs_isCollectClothing(u8 i_clothesNo) { return g_dComIfG_gameInfo.info.getPlayer().getCollect().isCollect(COLLECT_CLOTHING, - clothing_id); + i_clothesNo); } inline u8 dComIfGs_checkBottle(u8 i_itemNo) { @@ -1025,8 +1035,8 @@ inline u16 i_dComIfGs_getLife() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getLife(); } -inline void dComIfGs_offEventBit(u16 event) { - g_dComIfG_gameInfo.info.getSavedata().getEvent().offEventBit(event); +inline void dComIfGs_offEventBit(u16 i_flag) { + g_dComIfG_gameInfo.info.getSavedata().getEvent().offEventBit(i_flag); } inline const char* dComIfGs_getLastWarpMarkStageName() { @@ -1065,8 +1075,8 @@ inline u8 dComIfGs_getLightDropNum(u8 i_nowLevel) { return g_dComIfG_gameInfo.info.getPlayer().getLightDrop().getLightDropNum(i_nowLevel); } -inline u8 dComIfGs_getSelectItemIndex(int idx) { - return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectItemIndex(idx); +inline u8 dComIfGs_getSelectItemIndex(int i_no) { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectItemIndex(i_no); } inline u8 dComIfGs_getOptVibration() { @@ -1125,19 +1135,27 @@ inline s32 dComIfGs_isStageBossEnemy() { return g_dComIfG_gameInfo.info.getMemory().getBit().isStageBossEnemy(); } -inline void dComIfGs_setKeyNum(u8 keyNum) { - g_dComIfG_gameInfo.info.getMemory().getBit().setKeyNum(keyNum); +inline void dComIfGs_setKeyNum(u8 i_keyNum) { + g_dComIfG_gameInfo.info.getMemory().getBit().setKeyNum(i_keyNum); } -inline BOOL dComIfGs_isSaveVisitedRoom(int param_0, int param_1) { - return g_dComIfG_gameInfo.info.getSavedata().getSave2(param_0)->isVisitedRoom(param_1); +inline BOOL dComIfGs_isSaveVisitedRoom(int param_0, int i_roomNo) { + return g_dComIfG_gameInfo.info.getSavedata().getSave2(param_0)->isVisitedRoom(i_roomNo); } -inline s16 dComIfGs_getOil() { +inline void dComIfGs_onSaveVisitedRoom(int param_0, int i_roomNo) { + return g_dComIfG_gameInfo.info.getSavedata().getSave2(param_0)->onVisitedRoom(i_roomNo); +} + +inline void dComIfGs_offSaveVisitedRoom(int param_0, int i_roomNo) { + return g_dComIfG_gameInfo.info.getSavedata().getSave2(param_0)->offVisitedRoom(i_roomNo); +} + +inline u16 dComIfGs_getOil() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getOil(); } -inline s16 dComIfGs_getMaxOil() { +inline u16 dComIfGs_getMaxOil() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getMaxOil(); } @@ -1161,20 +1179,20 @@ inline s32 dComIfGs_isGetMagicUseFlag() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().isMagicFlag(0); } -inline void dComIfGs_offTmpBit(u16 flag) { - g_dComIfG_gameInfo.info.getTmp().offEventBit(flag); +inline void dComIfGs_offTmpBit(u16 i_flag) { + g_dComIfG_gameInfo.info.getTmp().offEventBit(i_flag); } inline BOOL dComIfGs_isDarkClearLV(int i_no) { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().isDarkClearLV(i_no); } -inline BOOL dComIfGs_isTmpBit(u16 flag) { - return g_dComIfG_gameInfo.info.getTmp().isEventBit(flag); +inline BOOL dComIfGs_isTmpBit(u16 i_flag) { + return g_dComIfG_gameInfo.info.getTmp().isEventBit(i_flag); } -inline void dComIfGs_onTmpBit(u16 flag) { - g_dComIfG_gameInfo.info.getTmp().onEventBit(flag); +inline void dComIfGs_onTmpBit(u16 i_flag) { + g_dComIfG_gameInfo.info.getTmp().onEventBit(i_flag); } inline BOOL dComIfGs_isTransformLV(int i_no) { @@ -1197,20 +1215,20 @@ inline u8 dComIfGs_getBottleNum(u8 i_bottleIdx) { return g_dComIfG_gameInfo.info.getPlayer().getItemRecord().getBottleNum(i_bottleIdx); } -inline u8 dComIfGs_getBombMax(u8 bombId) { - return g_dComIfG_gameInfo.info.getPlayer().getItemMax().getBombNum(bombId); +inline u8 dComIfGs_getBombMax(u8 i_bombType) { + return g_dComIfG_gameInfo.info.getPlayer().getItemMax().getBombNum(i_bombType); } -inline void dComIfGs_setBombNum(u8 i_bagIdx, u8 bombId) { - g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setBombNum(i_bagIdx, bombId); +inline void dComIfGs_setBombNum(u8 i_bagIdx, u8 i_bombNum) { + g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setBombNum(i_bagIdx, i_bombNum); } -inline void dComIfGs_setPachinkoNum(u8 num) { - g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setPachinkoNum(num); +inline void dComIfGs_setPachinkoNum(u8 i_num) { + g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setPachinkoNum(i_num); } -inline void dComIfGs_addBottleNum(u8 i_bottleIdx, s16 num) { - g_dComIfG_gameInfo.info.getPlayer().getItemRecord().addBottleNum(i_bottleIdx, num); +inline void dComIfGs_addBottleNum(u8 i_bottleIdx, s16 i_num) { + g_dComIfG_gameInfo.info.getPlayer().getItemRecord().addBottleNum(i_bottleIdx, i_num); } inline void dComIfGs_resetLastWarpAcceptStage() { @@ -1253,8 +1271,8 @@ inline s8 dComIfGs_getRestartRoomNo() { return g_dComIfG_gameInfo.info.getRestart().getRoomNo(); } -inline void dComIfGs_setRestartRoomParam(u32 param) { - g_dComIfG_gameInfo.info.getRestart().setRoomParam(param); +inline void dComIfGs_setRestartRoomParam(u32 i_param) { + g_dComIfG_gameInfo.info.getRestart().setRoomParam(i_param); } inline u8 dComIfGs_getMagic() { @@ -1285,44 +1303,44 @@ inline u16 dComIfGs_getDate() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().getDate(); } -inline void dComIfGs_setDate(u16 date) { - return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().setDate(date); +inline void dComIfGs_setDate(u16 i_date) { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().setDate(i_date); } inline f32 dComIfGs_getTime() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().getTime(); } -inline void dComIfGs_setTime(f32 time) { - return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().setTime(time); +inline void dComIfGs_setTime(f32 i_time) { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().setTime(i_time); } -inline void dComIfGs_onDarkClearLV(int lv) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().onDarkClearLV(lv); +inline void dComIfGs_onDarkClearLV(int i_no) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().onDarkClearLV(i_no); } -inline void dComIfGs_onTransformLV(int lv) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().onTransformLV(lv); +inline void dComIfGs_onTransformLV(int i_no) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().onTransformLV(i_no); } -inline void dComIfGs_onSaveDunSwitch(int flag) { - g_dComIfG_gameInfo.info.getDan().onSwitch(flag); +inline void dComIfGs_onSaveDunSwitch(int i_swNo) { + g_dComIfG_gameInfo.info.getDan().onSwitch(i_swNo); } -inline void dComIfGs_offSaveDunSwitch(int flag) { - g_dComIfG_gameInfo.info.getDan().offSwitch(flag); +inline void dComIfGs_offSaveDunSwitch(int i_swNo) { + g_dComIfG_gameInfo.info.getDan().offSwitch(i_swNo); } inline u8 dComIfGs_getDataNum() { return g_dComIfG_gameInfo.info.getDataNum(); } -inline void dComIfGs_setDataNum(u8 num) { - return g_dComIfG_gameInfo.info.setDataNum(num); +inline void dComIfGs_setDataNum(u8 i_num) { + return g_dComIfG_gameInfo.info.setDataNum(i_num); } -inline void dComIfGs_setNewFile(u8 file) { - return g_dComIfG_gameInfo.info.setNewFile(file); +inline void dComIfGs_setNewFile(u8 i_fileNo) { + return g_dComIfG_gameInfo.info.setNewFile(i_fileNo); } inline char* dComIfGs_getPlayerName() { @@ -1337,26 +1355,26 @@ inline bool dComIfGs_isPlayerFieldLastStayFieldDataExistFlag() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().isFieldDataExistFlag(); } -inline void dComIfGs_setPlayerFieldLastStayInfo(const char* stage, cXyz& pos, s16 angle, s8 point, - u8 region) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().set(stage, pos, angle, point, - region); +inline void dComIfGs_setPlayerFieldLastStayInfo(const char* i_stage, cXyz& i_pos, s16 i_angle, s8 i_point, + u8 i_region) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().set(i_stage, i_pos, i_angle, i_point, + i_region); } -inline void dComIfGs_setStartPoint(s16 point) { - g_dComIfG_gameInfo.info.getRestart().setStartPoint(point); +inline void dComIfGs_setStartPoint(s16 i_point) { + g_dComIfG_gameInfo.info.getRestart().setStartPoint(i_point); } -inline void dComIfGs_clearRoomSwitch(int zoneNo) { - g_dComIfG_gameInfo.info.getZone(zoneNo).getZoneBit().clearRoomSwitch(); +inline void dComIfGs_clearRoomSwitch(int i_zoneNo) { + g_dComIfG_gameInfo.info.getZone(i_zoneNo).getZoneBit().clearRoomSwitch(); } -inline void dComIfGs_clearRoomItem(int zoneNo) { - g_dComIfG_gameInfo.info.getZone(zoneNo).getZoneBit().clearRoomItem(); +inline void dComIfGs_clearRoomItem(int i_zoneNo) { + g_dComIfG_gameInfo.info.getZone(i_zoneNo).getZoneBit().clearRoomItem(); } -inline void dComIfGs_removeZone(int zoneNo) { - g_dComIfG_gameInfo.info.removeZone(zoneNo); +inline void dComIfGs_removeZone(int i_zoneNo) { + g_dComIfG_gameInfo.info.removeZone(i_zoneNo); } inline u32 dComIfGs_getTurnRestartParam() { @@ -1407,20 +1425,20 @@ inline u16 dComIfGs_getRupeeMax() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getRupeeMax(); } -inline void dComIfGs_onLightDropGetFlag(u8 level) { - g_dComIfG_gameInfo.info.getPlayer().getLightDrop().onLightDropGetFlag(level); +inline void dComIfGs_onLightDropGetFlag(u8 i_nowLevel) { + g_dComIfG_gameInfo.info.getPlayer().getLightDrop().onLightDropGetFlag(i_nowLevel); } -inline void dComIfGs_setTmpReg(u16 reg, u8 flag) { - g_dComIfG_gameInfo.info.getTmp().setEventReg(reg, flag); +inline void dComIfGs_setTmpReg(u16 i_reg, u8 i_no) { + g_dComIfG_gameInfo.info.getTmp().setEventReg(i_reg, i_no); } -inline int dComIfGs_getTmpReg(u16 reg) { - return g_dComIfG_gameInfo.info.getTmp().getEventReg(reg); +inline int dComIfGs_getTmpReg(u16 i_reg) { + return g_dComIfG_gameInfo.info.getTmp().getEventReg(i_reg); } -inline void dComIfGs_setWarashibeItem(u8 itemNo) { - g_dComIfG_gameInfo.info.getPlayer().getItem().setWarashibeItem(itemNo); +inline void dComIfGs_setWarashibeItem(u8 i_itemNo) { + g_dComIfG_gameInfo.info.getPlayer().getItem().setWarashibeItem(i_itemNo); } inline void dComIfGs_setBottleItemIn(u8 curItem, u8 newItem) { @@ -1435,44 +1453,36 @@ inline u8 dComIfGs_checkBombBag(u8 i_itemNo) { return g_dComIfG_gameInfo.info.getPlayer().getItem().checkBombBag(i_itemNo); } -inline bool i_dComIfGp_checkPlayerStatus0(int param_0, u32 flag) { - return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 0, flag); -} - -inline bool i_dComIfGp_checkPlayerStatus1(int param_0, u32 flag) { - return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 1, flag); -} - inline s64 dComIfGs_getTotalTime() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().getTotalTime(); } -inline void dComIfGs_setSaveTotalTime(s64 time) { - g_dComIfG_gameInfo.info.setSaveTotalTime(time); +inline void dComIfGs_setSaveTotalTime(s64 i_time) { + g_dComIfG_gameInfo.info.setSaveTotalTime(i_time); } -inline void dComIfGs_setSaveStartTime(s64 time) { - g_dComIfG_gameInfo.info.setStartTime(time); +inline void dComIfGs_setSaveStartTime(s64 i_time) { + g_dComIfG_gameInfo.info.setStartTime(i_time); } -inline void dComIfGs_setNoFile(u8 file) { - g_dComIfG_gameInfo.info.setNoFile(file); +inline void dComIfGs_setNoFile(u8 i_file) { + g_dComIfG_gameInfo.info.setNoFile(i_file); } inline void* dComIfGs_getPEventBit() { return g_dComIfG_gameInfo.info.getEvent().getPEventBit(); } -inline bool dComIfGs_isItem(int bitNo, int roomNo) { - return g_dComIfG_gameInfo.info.isItem(bitNo, roomNo); +inline bool dComIfGs_isItem(int i_bitNo, int i_roomNo) { + return g_dComIfG_gameInfo.info.isItem(i_bitNo, i_roomNo); } -inline void dComIfGs_onItem(int bitNo, int roomNo) { - g_dComIfG_gameInfo.info.onItem(bitNo, roomNo); +inline void dComIfGs_onItem(int i_bitNo, int i_roomNo) { + g_dComIfG_gameInfo.info.onItem(i_bitNo, i_roomNo); } -inline void dComIfGs_onActor(int bitNo, int roomNo) { - g_dComIfG_gameInfo.info.onActor(bitNo, roomNo); +inline void dComIfGs_onActor(int i_bitNo, int i_roomNo) { + g_dComIfG_gameInfo.info.onActor(i_bitNo, i_roomNo); } inline void dComIfGs_setLastWarpAcceptStage(s8 param_0) { @@ -1487,14 +1497,15 @@ inline u8 dComIfGs_getNewFile() { return g_dComIfG_gameInfo.info.getNewFile(); } -inline void dComIfGs_setInitDataToCard(u8* p_saveData, int dataNum) { - g_dComIfG_gameInfo.info.initdata_to_card((char*)p_saveData, dataNum); +inline void dComIfGs_setInitDataToCard(u8* i_saveData, int i_dataNum) { + g_dComIfG_gameInfo.info.initdata_to_card((char*)i_saveData, i_dataNum); } -inline void dComIfGs_setMemoryToCard(u8* p_saveData, int dataNum) { - g_dComIfG_gameInfo.info.memory_to_card((char*)p_saveData, dataNum); +inline void dComIfGs_setMemoryToCard(u8* i_saveData, int i_dataNum) { + g_dComIfG_gameInfo.info.memory_to_card((char*)i_saveData, i_dataNum); } + void dComIfGp_setSelectItem(int index); s32 dComIfGp_offHeapLockFlag(int flag); void dComIfGp_createSubExpHeap2D(); @@ -1510,7 +1521,7 @@ u8 dComIfGp_SelectWarpPt_get(); void dComIfGp_setNextStage(char const* stage, s16 point, s8 roomNo, s8 layer, f32 lastSpeed, u32 lastMode, int, s8 wipe, s16 lastAngle, int, int); void dComIfGp_setNextStage(char const* stage, s16 point, s8 roomNo, s8 layer); -int dComIfGp_getSelectItemNum(int index); +s16 dComIfGp_getSelectItemNum(int index); int dComIfGp_getSelectItemMaxNum(int index); void dComIfGp_mapShow(); void dComIfGp_mapHide(); @@ -1539,9 +1550,18 @@ static u8 dComIfGp_getRStatus(); static dAttCatch_c* dComIfGp_att_getCatghTarget(); static void dComIfGp_setBottleStatus(u8 param_0, u8 param_1); +inline bool i_dComIfGp_checkPlayerStatus0(int param_0, u32 flag) { + return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 0, flag); +} + +inline bool i_dComIfGp_checkPlayerStatus1(int param_0, u32 flag) { + return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 1, flag); +} + inline void i_dComIfGp_setItemLifeCount(float amount, u8 type) { g_dComIfG_gameInfo.play.setItemLifeCount(amount, type); } + inline void i_dComIfGp_setItemRupeeCount(int amount) { g_dComIfG_gameInfo.play.setItemRupeeCount(amount); } @@ -2030,6 +2050,10 @@ inline void dComIfGp_setStatus(u16 status) { g_dComIfG_gameInfo.play.setStatus(status); } +inline void dComIfGp_setAdvanceDirection(u8 i_dir) { + g_dComIfG_gameInfo.play.setDirection(i_dir); +} + inline void dComIfGp_setLinkPlayer(fopAc_ac_c* ptr) { g_dComIfG_gameInfo.play.setPlayerPtr(0, ptr); } @@ -2099,7 +2123,11 @@ inline void dComIfGp_setNowOxygen(s32 oxygen) { g_dComIfG_gameInfo.play.setNowOxygen(oxygen); } -inline int dComIfGp_getMaxOxygen() { +inline void dComIfGp_setOxygenCount(s32 oxygen) { + g_dComIfG_gameInfo.play.setOxygenCount(oxygen); +} + +inline s32 dComIfGp_getMaxOxygen() { return g_dComIfG_gameInfo.play.getMaxOxygen(); } @@ -2115,6 +2143,14 @@ inline u8 dComIfGp_getOxygenShowFlag() { return g_dComIfG_gameInfo.play.getOxygenShowFlag(); } +inline void dComIfGp_onOxygenShowFlag() { + g_dComIfG_gameInfo.play.setOxygenShowFlag(1); +} + +inline void dComIfGp_offOxygenShowFlag() { + g_dComIfG_gameInfo.play.setOxygenShowFlag(0); +} + inline u8 dComIfGp_getNeedLightDropNum() { return g_dComIfG_gameInfo.play.getNeedLightDropNum(); } @@ -2183,6 +2219,10 @@ inline void dComIfGp_2dShowOn() { g_dComIfG_gameInfo.play.show2dOn(); } +inline void dComIfGp_2dShowOff() { + g_dComIfG_gameInfo.play.show2dOff(); +} + inline s16 dComIfGp_getItemMaxLifeCount() { return g_dComIfG_gameInfo.play.getItemMaxLifeCount(); } @@ -2359,6 +2399,10 @@ inline void dComIfGp_event_setGtItm(int i_itemNo) { g_dComIfG_gameInfo.play.getEvent().setGtItm(i_itemNo); } +inline void i_dComIfGp_event_reset() { + g_dComIfG_gameInfo.play.getEvent().reset(); +} + inline void dComIfGp_evmng_cutEnd(int param_0) { dComIfGp_getPEvtManager()->cutEnd(param_0); } @@ -2446,6 +2490,10 @@ inline int dComIfGp_evmng_getMySubstanceNum(int index, char* name) { return dComIfGp_getPEvtManager()->getMySubstanceNum(index, name); } +inline int dComIfGp_evmng_checkStartDemo() { + return dComIfGp_getPEvtManager()->checkStartDemo(); +} + inline void dComIfGp_evmng_create() { g_dComIfG_gameInfo.play.getEvtManager().create(); } @@ -2509,7 +2557,7 @@ inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, param_9, param_10, 1.0f); } -inline u32 dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3, +inline JPABaseEmitter* dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3, const csXyz* param_4, const cXyz* param_5, u8 param_6, dPa_levelEcallBack* param_7, s8 param_8, const GXColor* param_9, const GXColor* param_10, const cXyz* param_11) { @@ -2518,7 +2566,7 @@ inline u32 dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const dKy_tev param_9, param_10, param_11, 1.0f); } -inline u32 dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const csXyz* param_3, +inline JPABaseEmitter* dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const csXyz* param_3, const cXyz* param_4, u8 param_5, dPa_levelEcallBack* param_6, s8 param_7, const GXColor* param_8, const GXColor* param_9, const cXyz* param_10) { @@ -2527,13 +2575,13 @@ inline u32 dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const csXyz* param_8, param_9, param_10, 1.0f); } -inline u32 dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const csXyz* param_2, +inline JPABaseEmitter* dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const csXyz* param_2, const cXyz* param_3) { return dComIfGp_particle_set(param_0, param_1, NULL, param_2, param_3, 0xFF, NULL, -1, NULL, NULL, NULL); } -inline u32 dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const dKy_tevstr_c* param_2, +inline JPABaseEmitter* dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const dKy_tevstr_c* param_2, const csXyz* param_3, const cXyz* param_4) { return dComIfGp_particle_set(param_0, param_1, param_2, param_3, param_4, 0xFF, NULL, -1, NULL, NULL, NULL); @@ -2545,6 +2593,30 @@ inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, NULL, NULL); } +inline u32 dComIfGp_particle_setColor(u32 param_0, u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3, + const GXColor* param_4, const GXColor* param_5, f32 param_6, u8 param_7, + const csXyz* param_8, const cXyz* param_9, dPa_levelEcallBack* param_10, + s8 param_11, const cXyz* param_12) { + return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_0, param_1, param_2, param_3, + param_8, param_9, param_7, param_10, + param_11, param_4, param_5, param_12, + param_6); +} + +inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* param_1, const dKy_tevstr_c* param_2, + const GXColor* param_3, const GXColor* param_4, f32 param_5, u8 param_6, + const csXyz* param_7, const cXyz* param_8, dPa_levelEcallBack* param_9, + s8 param_10, const cXyz* param_11) { + return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_0, param_1, param_2, param_7, + param_8, param_6, param_9, param_10, + param_3, param_4, param_11, param_5); +} + +inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* param_1, const dKy_tevstr_c* param_2, + const GXColor* param_3, const GXColor* param_4, f32 param_5, u8 param_6) { + return dComIfGp_particle_setColor(param_0, param_1, param_2, param_3, param_4, param_5, param_6, NULL, NULL, NULL, -1, NULL); +} + inline void dComIfGp_particle_levelEmitterOnEventMove(u32 param_0) { g_dComIfG_gameInfo.play.getParticle()->forceOnEventMove(param_0); } diff --git a/include/d/d_attention.h b/include/d/d_attention.h index b214b991cdd..75dc8aa5d30 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -211,15 +211,7 @@ public: BOOL chkFlag(u32 flag) { return mFlags & flag; } void setFlag(u32 flag) { mFlags |= flag; } void clrFlag(u32 flag) { mFlags &= ~flag; } - s8 Lockon() { - /* s32 chk = true; - if (!LockonTruth() && !chkFlag(0x20000000)) { - chk = false; - } - return chk; */ - - return !LockonTruth() && !chkFlag(0x20000000); - } + bool Lockon() { return LockonTruth() || chkFlag(0x20000000); } // only matches with -O2? static type_tbl_entry loc_type_tbl[3]; static type_tbl_entry act_type_tbl[5]; diff --git a/include/d/d_camera.h b/include/d/d_camera.h index b0baf02a57b..5aad5b6ae16 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -164,6 +164,8 @@ public: /* 0x40 */ cSAngle field_0x40; }; // Size: 0x44 + /* 80088A7C */ void StartEventCamera(int, int, ...); + /* 80088BBC */ void EndEventCamera(int); /* 8008908C */ void getEvIntData(int*, char*, int); /* 80088CB0 */ void getEvIntData(int*, char*); /* 80089154 */ void getEvFloatData(f32*, char*, f32); @@ -521,5 +523,6 @@ public: dCamera_c* dCam_getBody(); dCamera_c* dCam_getCamera(); +s16 dCam_getControledAngleY(camera_class* param_0); #endif /* D_D_CAMERA_H */ diff --git a/include/d/d_demo.h b/include/d/d_demo.h index 15d09fb5cda..9238020210d 100644 --- a/include/d/d_demo.h +++ b/include/d/d_demo.h @@ -118,6 +118,8 @@ public: /* 80039AAC */ virtual ~dDemo_system_c(); /* 80039528 */ virtual bool JSGFindObject(JStage::TObject**, char const*, JStage::TEObject) const; + + void setObject(dDemo_object_c* i_object) { mpObject = i_object; } private: /* 0x4 */ dDemo_object_c* mpObject; diff --git a/include/d/d_jnt_col.h b/include/d/d_jnt_col.h index 71d566c05d5..ce664a66e77 100644 --- a/include/d/d_jnt_col.h +++ b/include/d/d_jnt_col.h @@ -21,6 +21,8 @@ public: /* 80036FA8 */ void setArrowPosAndAngle(cXyz const*, cXyz const*, int, cXyz*, csXyz*); bool checkPassNum(int bit) { return field_0xc & (1 << bit); } + void onPassNum(int num) { field_0xc |= (1 << num); } + void offPassNum(int num) { field_0xc &= ~(1 << num); } /* 0x00 */ dJntColData_c* mData; /* 0x04 */ J3DModel* mModel; diff --git a/include/d/d_procname.h b/include/d/d_procname.h index 0ec11077fcf..21c6600ce26 100644 --- a/include/d/d_procname.h +++ b/include/d/d_procname.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef D_PROCNAME_H +#define D_PROCNAME_H enum { PROC_OVERLAP0 = 0x0000, @@ -793,4 +794,6 @@ enum { PROC_TIMER = 0x0315, PROC_METER2 = 0x0316, PROC_GAMEOVER = 0x0317, -}; \ No newline at end of file +}; + +#endif /* D_PROCNAME_H */ \ No newline at end of file diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index 75ec2f715b1..1af4ce76bfb 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -16,7 +16,7 @@ public: /* 8003AB30 */ static void onWarpMaterial(J3DModelData*); /* 8003AC1C */ static void offWarpMaterial(J3DModelData*); /* 8003AD08 */ void setWarpSRT(J3DModelData*, cXyz const&, f32, f32); - /* 8003AE14 */ void loaderBasicBmd(u32, void*); + /* 8003AE14 */ static J3DModelData* loaderBasicBmd(u32, void*); /* 8003B30C */ int loadResource(); /* 8003B998 */ void deleteArchiveRes(); /* 8003BAC4 */ int setRes(JKRArchive*, JKRHeap*); diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 6e6bdbe678b..54cfaa08479 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -292,7 +292,8 @@ struct dStage_MapEvent_dt_c { /* 0x08 */ u8 field_0x8; /* 0x09 */ u8 field_0x9; /* 0x0A */ u8 field_0xA[0xD - 0xA]; - /* 0x0D */ char mName[9]; + /* 0x0D */ char mName[7]; + /* 0x14 */ u16 field_0x14; /* 0x16 */ u8 field_0x16; /* 0x17 */ u8 field_0x17; /* 0x18 */ u8 mSeType; // 1: RIDDLE_A, 2: RIDDLE_B @@ -908,6 +909,9 @@ int dStage_changeScene4Event(int i_exitId, s8 room_no, int i_wipe, bool param_3, u32 mode, s16 angle, int param_7); void dStage_Create(); static s32 dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0); +void dStage_restartRoom(u32 roomParam, u32 mode, int param_2); +struct cBgS_GndChk; +int dStage_RoomCheck(cBgS_GndChk* gndChk); inline s32 dStage_roomRead_dt_c_GetVrboxswitch(roomRead_data_class& data) { return data.field_0x2 & 8; diff --git a/include/d/d_vibration.h b/include/d/d_vibration.h index 58b6634557c..b24ff7248da 100644 --- a/include/d/d_vibration.h +++ b/include/d/d_vibration.h @@ -28,7 +28,7 @@ private: public: class { public: - /* 0x00 */ u32 field_0x0; + /* 0x00 */ u32 field_0x0; /* 0x04 */ int field_0x4; /* 0x08 */ s32 field_0x8; /* 0x0C */ s32 field_0xc; diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index 198e1294342..c99567d4b52 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -35,6 +35,8 @@ static void dKy_vrbox_addcol_set(s16 param_0, s16 param_1, s16 param_2, f32 para void dKy_GxFog_set(); static void GxFog_set(); static void GxXFog_set(); +u8 dKy_pol_argument_get(cBgS_PolyInfo const* i_poly); +void dKy_Sound_set(cXyz param_0, int param_1, unsigned int param_2, int param_3); struct LIGHT_INFLUENCE { diff --git a/include/d/meter/d_meter2.h b/include/d/meter/d_meter2.h index de6d979ed5b..3e10104ce9c 100644 --- a/include/d/meter/d_meter2.h +++ b/include/d/meter/d_meter2.h @@ -116,6 +116,8 @@ public: /* 80202240 */ virtual void draw(); /* 80201370 */ virtual ~dMeterButton_c(); + + /* 0x004 */ u8 field_0x4[0x630 - 0x4]; }; class dMeterString_c : public dMeterSub_c { diff --git a/include/d/particle/d_particle.h b/include/d/particle/d_particle.h index 270c1347d0f..b2c122b1305 100644 --- a/include/d/particle/d_particle.h +++ b/include/d/particle/d_particle.h @@ -300,7 +300,7 @@ public: /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); /* 8004C838 */ void setWaterRipple(u32*, cBgS_PolyInfo&, cXyz const*, f32, dKy_tevstr_c const*, cXyz const*, s8); - /* 8004CA90 */ u32 set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, + /* 8004CA90 */ JPABaseEmitter* set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, cXyz const*, f32); /* 8004D4CC */ u32 set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, @@ -334,10 +334,10 @@ public: param_8, param_9, param_10, param_11, param_12); } - u32 setNormal(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3, - const csXyz* param_4, const cXyz* param_5, u8 param_6, - dPa_levelEcallBack* param_7, s8 param_8, const GXColor* param_9, - const GXColor* param_10, const cXyz* param_11, f32 param_12) { + JPABaseEmitter* setNormal(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3, + const csXyz* param_4, const cXyz* param_5, u8 param_6, + dPa_levelEcallBack* param_7, s8 param_8, const GXColor* param_9, + const GXColor* param_10, const cXyz* param_11, f32 param_12) { return set(0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, param_9, param_10, param_11, param_12); } @@ -352,6 +352,8 @@ public: return ((dPa_selectTexEcallBack*)mTsubo) + idx; } + static JPAEmitterManager* getEmitterManager() { return mEmitterMng; } + static u8 mTsubo[64]; static u8 mLifeBall[24]; static Mtx mWindViewMatrix; diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index 9669f985315..a31380e64b3 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -376,9 +376,9 @@ enum { class dSv_player_status_a_c { public: void init(); - void setSelectItemIndex(int i_no, u8 item_index); + void setSelectItemIndex(int i_no, u8 i_slotNo); u8 getSelectItemIndex(int i_no) const; - void setMixItemIndex(int i_no, u8 item_index); + void setMixItemIndex(int i_no, u8 i_slotNo); u8 getMixItemIndex(int i_no) const; u16 getRupeeMax() const; int isMagicFlag(u8 i_magic) const; @@ -392,15 +392,15 @@ public: u8& getMaxMagic() { return mMaxMagic; } u8 getSelectEquip(int item) const { return mSelectEquip[item]; } u8 getTransformStatus() const { return mTransformStatus; } - void setOil(u16 oil) { mOil = oil; } - void setMaxOil(u16 max) { mMaxOil = max; } - void setWalletSize(u8 size) { mWalletSize = size; } - void setMagic(u8 magic) { mMagic = magic; } - void setMaxMagic(u8 max) { mMaxMagic = max; } - void setRupee(u16 rupees) { mRupee = rupees; } - void setLife(u16 life) { mLife = life; } - void setMaxLife(u8 max) { mMaxLife = max; } - void setSelectEquip(int item_index, u8 item) { mSelectEquip[item_index] = item; } + void setOil(u16 i_oil) { mOil = i_oil; } + void setMaxOil(u16 i_maxOil) { mMaxOil = i_maxOil; } + void setWalletSize(u8 i_size) { mWalletSize = i_size; } + void setMagic(u8 i_magic) { mMagic = i_magic; } + void setMaxMagic(u8 i_maxMagic) { mMaxMagic = i_maxMagic; } + void setRupee(u16 i_rupees) { mRupee = i_rupees; } + void setLife(u16 i_life) { mLife = i_life; } + void setMaxLife(u8 i_maxLife) { mMaxLife = i_maxLife; } + void setSelectEquip(int i_equipId, u8 i_itemNo) { mSelectEquip[i_equipId] = i_itemNo; } private: /* 0x00 */ u16 mMaxLife; @@ -431,11 +431,11 @@ public: void onTransformLV(int i_no); BOOL isTransformLV(int i_no) const; - void setDateIpl(s64 time) { mDateIpl = time; } + void setDateIpl(s64 i_time) { mDateIpl = i_time; } u16 getDate() const { return mDate; } f32 getTime() const { return mTime; } - void setDate(u16 date) { mDate = date; } - void setTime(f32 time) { mTime = time; } + void setDate(u16 i_date) { mDate = i_date; } + void setTime(f32 i_time) { mTime = i_time; } OSTime getDateIpl() const { return mDateIpl; } private: @@ -530,10 +530,10 @@ private: class dSv_player_item_c { public: void init(); - void setItem(int item_slot, u8 i_itemNo); - u8 getItem(int slot_no, bool check_combo) const; + void setItem(int i_slotNo, u8 i_itemNo); + u8 getItem(int i_slotNo, bool i_checkCombo) const; void setLineUpItem(); - u8 getLineUpItem(int slot_no) const; + u8 getLineUpItem(int i_slotNo) const; void setBottleItemIn(u8 curItemIn, u8 newItemIn); void setEmptyBottleItemIn(u8 i_itemNo); void setEmptyBottle(); @@ -543,12 +543,12 @@ public: u8 checkBottle(u8 i_itemNo); int checkInsectBottle(); u8 checkEmptyBottle(); - void setBombBagItemIn(u8 curBomb, u8 newBomb, bool setNum); - void setBombBagItemIn(u8 curBomb, u8 newBomb, u8 bombNum, bool setNum); - void setEmptyBombBagItemIn(u8 newBomb, bool setNum); - void setEmptyBombBagItemIn(u8 newBomb, u8 bombNum, bool setNum); + void setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, bool i_setNum); + void setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, u8 i_bombNum, bool i_setNum); + void setEmptyBombBagItemIn(u8 i_newBomb, bool i_setNum); + void setEmptyBombBagItemIn(u8 i_newBomb, u8 i_bombNum, bool i_setNum); void setEmptyBombBag(); - void setEmptyBombBag(u8 newBomb, u8 bombNum); + void setEmptyBombBag(u8 i_newBomb, u8 i_bombNum); u8 checkBombBag(u8 i_itemNo); void setWarashibeItem(u8 i_itemNo); void setRodTypeLevelUp(); @@ -573,16 +573,16 @@ private: class dSv_player_item_record_c { public: void init(); - void setBombNum(u8 i_bagIdx, u8 bag_id); + void setBombNum(u8 i_bagIdx, u8 i_bombNum); u8 getBombNum(u8 i_bagIdx) const; - void setBottleNum(u8 i_bottleIdx, u8 bottle_num); - u8 addBottleNum(u8 i_bottleIdx, s16 num); + void setBottleNum(u8 i_bottleIdx, u8 i_bottleNum); + u8 addBottleNum(u8 i_bottleIdx, s16 i_num); u8 getBottleNum(u8 i_bottleIdx) const; u8 getArrowNum() const { return mArrowNum; } - void setArrowNum(u8 amount) { mArrowNum = amount; } + void setArrowNum(u8 i_num) { mArrowNum = i_num; } u8 getPachinkoNum() const { return mPachinkoNum; } - void setPachinkoNum(u8 num) { mPachinkoNum = num; } + void setPachinkoNum(u8 i_num) { mPachinkoNum = i_num; } private: /* 0x0 */ u8 mArrowNum; @@ -595,10 +595,10 @@ private: class dSv_player_item_max_c { public: void init(); - void setBombNum(u8 bomb_id, u8 bomb_max); - u8 getBombNum(u8 bomb_id) const; + void setBombNum(u8 i_bombType, u8 i_maxNum); + u8 getBombNum(u8 i_bombType) const; - void setArrowNum(u8 max) { mItemMax[ARROW_MAX] = max; } + void setArrowNum(u8 i_maxNum) { mItemMax[ARROW_MAX] = i_maxNum; } u8 getArrowNum() { return mItemMax[ARROW_MAX]; } private: @@ -639,7 +639,7 @@ private: class dSv_light_drop_c { public: void init(); - void setLightDropNum(u8 i_nowLevel, u8 dropNum); + void setLightDropNum(u8 i_nowLevel, u8 i_dropNum); u8 getLightDropNum(u8 i_nowLevel) const; void onLightDropGetFlag(u8 i_nowLevel); BOOL isLightDropGetFlag(u8 i_nowLevel) const; @@ -667,7 +667,7 @@ private: class dSv_fishing_info_c { public: void init(); - void addFishCount(u8 fish_index); + void addFishCount(u8 i_fishIndex); private: /* 0x00 */ u16 mFishCount[16]; @@ -678,9 +678,9 @@ class dSv_player_info_c { public: void init(); char* getLinkName() { return mPlayerName; } - void setPlayerName(const char* name) { strcpy((char*)mPlayerName, name); } - void setHorseName(const char* name) { strcpy((char*)mHorseName, name); } - void setTotalTime(s64 time) { mTotalTime = time; } + void setPlayerName(const char* i_name) { strcpy((char*)mPlayerName, i_name); } + void setHorseName(const char* i_name) { strcpy((char*)mHorseName, i_name); } + void setTotalTime(s64 i_time) { mTotalTime = i_time; } s64 getTotalTime() const { return mTotalTime; } private: @@ -802,7 +802,7 @@ public: s32 isDungeonItem(int i_no) const; u8 getKeyNum() { return mKeyNum; } - void setKeyNum(u8 keyNum) { mKeyNum = keyNum; } + void setKeyNum(u8 i_keyNum) { mKeyNum = i_keyNum; } void onDungeonItemMap() { onDungeonItem(MAP); } s32 isDungeonItemMap() const { return isDungeonItem(MAP); } void onDungeonItemCompass() { onDungeonItem(COMPASS); } @@ -884,7 +884,7 @@ STATIC_ASSERT(sizeof(dSv_memory2_c) == 8); class dSv_danBit_c { public: - bool init(s8 i_stage); + bool init(s8 i_stageNo); void onSwitch(int i_no); void offSwitch(int i_no); BOOL isSwitch(int i_no) const; diff --git a/include/dolphin/pad/Pad.h b/include/dolphin/pad/Pad.h index 984b69b2f6a..7cc798cb449 100644 --- a/include/dolphin/pad/Pad.h +++ b/include/dolphin/pad/Pad.h @@ -33,7 +33,7 @@ void PADSetSpec(int spec); BOOL PADReset(u32 mask); void PADClampCircle(PADStatus* status); void PADClamp(PADStatus* status); -void PADRead(PADStatus* status); +u32 PADRead(PADStatus* status); void PADControlMotor(s32 channel, u32 command); BOOL PADRecalibrate(u32 mask); diff --git a/include/f_ap/f_ap_game.h b/include/f_ap/f_ap_game.h index 611a9feae0f..60f9e23a135 100644 --- a/include/f_ap/f_ap_game.h +++ b/include/f_ap/f_ap_game.h @@ -5,6 +5,8 @@ #include "dolphin/types.h" void fapGm_After(); +void fapGm_Create(); +void fapGm_Execute(); class fapGm_HIO_c { public: diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index a7fe695e1d9..f61f9386696 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -93,13 +93,14 @@ public: /* 0x497 */ u8 mCullType; /* 0x498 */ u8 mDemoActorId; /* 0x499 */ s8 mSubtype; + /* 0x49A */ u8 field_0x49a; /* 0x49C */ u32 mStatus; /* 0x4A0 */ u32 mCondition; /* 0x4A4 */ u32 mParentPcId; /* 0x4A8 */ actor_place orig; /* 0x4BC */ actor_place next; /* 0x4D0 */ actor_place current; - /* 0x4E4 */ csXyz mCollisionRot; + /* 0x4E4 */ csXyz shape_angle; /* 0x4EC */ cXyz mScale; /* 0x4F8 */ cXyz mSpeed; /* 0x504 */ MtxP mCullMtx; @@ -142,6 +143,11 @@ public: /* 80019520 */ void setBallModelEffect(dKy_tevstr_c*); /* 800196A0 */ void drawBallModel(dKy_tevstr_c*); + bool checkWolfNoLock() const { return mFlags & 0x200; } + bool checkHeadLockFlg() const { return mFlags & 0x80; } + bool checkDownFlg() const { return mFlags & 0x1; } + cXyz& getDownPos() { return mDownPos; } + /* 0x568 */ cXyz mDownPos; /* 0x574 */ cXyz mHeadLockPos; /* 0x580 */ J3DModel* mBallModel; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 828081077a9..86ae2b644d6 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -124,6 +124,16 @@ inline u32 fopAcM_checkCarryNow(fopAc_ac_c* pActor) { return pActor->mStatus & 0x2000; } +enum fopAcM_CARRY { + fopAcM_CARRY_HEAVY = 2, + fopAcM_CARRY_SIDE = 4, + fopAcM_CARRY_TYPE_8 = 8, +}; + +inline u32 fopAcM_CheckCarryType(fopAc_ac_c* actor, fopAcM_CARRY type) { + return actor->field_0x49a & type; +} + inline u32 fopAcM_checkHookCarryNow(fopAc_ac_c* pActor) { return fopAcM_checkStatus(pActor, 0x100000); } @@ -181,7 +191,7 @@ inline csXyz& fopAcM_GetAngle_p(fopAc_ac_c* pActor) { } inline csXyz& fopAcM_GetShapeAngle_p(fopAc_ac_c* pActor) { - return pActor->mCollisionRot; + return pActor->shape_angle; } inline bool fopAcM_CheckCondition(fopAc_ac_c* p_actor, u32 flag) { @@ -305,6 +315,8 @@ inline void fopAcM_onActor(const fopAc_ac_c* p_actor) { dComIfGs_onActor(setId, fopAcM_GetHomeRoomNo(p_actor)); } +void fopAcM_initManager(); + void* fopAcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3, void* pData); void fopAcM_setStageLayer(void* p_proc); diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index f205d388d14..3cc4b621608 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -38,6 +38,7 @@ public: extern JKRSolidHeap* g_mDoAud_audioHeap; +void mDoAud_Execute(); void mDoAud_resetProcess(); bool mDoAud_resetRecover(); void mDoAud_setSceneName(char const* spot, s32 room, s32 layer); diff --git a/include/m_Do/m_Do_controller_pad.h b/include/m_Do/m_Do_controller_pad.h index 161420fca64..1737fe56fd9 100644 --- a/include/m_Do/m_Do_controller_pad.h +++ b/include/m_Do/m_Do_controller_pad.h @@ -52,6 +52,7 @@ public: static f32 getStickY(u32 pad) { return getCpadInfo(pad).mMainStickPosY; } static f32 getStickValue(u32 pad) { return getCpadInfo(pad).mMainStickValue; } static s16 getStickAngle(u32 pad) { return getCpadInfo(pad).mMainStickAngle; } + static s16 getStickAngle3D(u32 pad) { return getCpadInfo(pad).mMainStickAngle; } static f32 getSubStickX(u32 pad) { return getCpadInfo(pad).mCStickPosX; } static f32 getSubStickY(u32 pad) { return getCpadInfo(pad).mCStickPosY; } static f32 getSubStickValue(u32 pad) { return getCpadInfo(pad).mCStickValue; } diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 550109b9c20..2cf1ce8edcc 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -182,6 +182,7 @@ public: /* 80140E2C */ mDoExt_AnmRatioPack(); void setRatio(f32 ratio) { mRatio = ratio; } + f32 getRatio() { return mRatio; } J3DAnmTransform* getAnmTransform() { return mAnmTransform; } void setAnmTransform(J3DAnmTransform* anm) { mAnmTransform = anm; } @@ -359,6 +360,7 @@ public: /* 8000F8CC */ void decOldFrameMorfCounter(); f32 getOldFrameRate() { return mOldFrameRate; } + J3DTransformInfo* getOldFrameTransInfo(int i) { return &mOldFrameTransInfo[i]; } private: /* 0x00 */ bool mOldFrameFlg; @@ -500,6 +502,7 @@ void mDoExt_modelUpdateDL(J3DModel* i_model); J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 param_1, u32 param_2); void mDoExt_setAraCacheSize(u32 size); int mDoExt_resIDToIndex(JKRArchive* p_archive, u16 id); +void mDoExt_modelEntryDL(J3DModel* i_model); struct JUTFont; JUTFont* mDoExt_getMesgFont(); diff --git a/include/m_Do/m_Do_machine.h b/include/m_Do/m_Do_machine.h index 70bfe4ddd34..88cf77a4eb0 100644 --- a/include/m_Do/m_Do_machine.h +++ b/include/m_Do/m_Do_machine.h @@ -15,6 +15,7 @@ void exceptionRestart(); void myExceptionCallback(u16, OSContext*, u32, u32); void my_SysPrintHeap(char const*, void*, u32); void mDoMch_HeapCheckAll(); +int mDoMch_Create(); extern GXRenderModeObj g_ntscZeldaProg; diff --git a/include/m_Do/m_Do_main.h b/include/m_Do/m_Do_main.h index c006df31ec2..b012752efea 100644 --- a/include/m_Do/m_Do_main.h +++ b/include/m_Do/m_Do_main.h @@ -6,7 +6,7 @@ #include "dolphin/types.h" void version_check(); -void* LOAD_COPYDATE(void*); +s32 LOAD_COPYDATE(void*); class HeapCheck { public: diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index 1f9d82853c4..f2103edf581 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -25,6 +25,14 @@ inline void mDoMtx_multVecSR(Mtx m, const Vec* src, Vec* dst) { PSMTXMultVecSR(m, src, dst); } +inline void mDoMtx_multVec(Mtx m, const Vec* src, Vec* dst) { + PSMTXMultVec(m, src, dst); +} + +inline void mDoMtx_copy(const Mtx src, Mtx dst) { + PSMTXCopy(src, dst); +} + class mDoMtx_stack_c { public: /* 8000CCC8 */ static bool push(); @@ -46,6 +54,7 @@ public: static void transS(f32 x, f32 y, f32 z) { PSMTXTrans(now, x, y, z); } static void scaleS(f32 x, f32 y, f32 z) { PSMTXScale(now, x, y, z); } static void multVec(const Vec* a, Vec* b) { PSMTXMultVec(now, a, b); } + static void multVecSR(const Vec* a, Vec* b) { PSMTXMultVecSR(now, a, b); } static void XYZrotS(s16 x, s16 y, s16 z) { mDoMtx_XYZrotS(now, x, y, z); } static void XYZrotM(s16 x, s16 y, s16 z) { mDoMtx_XYZrotM(now, x, y, z); } static void ZXYrotS(s16 x, s16 y, s16 z) { mDoMtx_ZXYrotS(now, x, y, z); } @@ -55,7 +64,7 @@ public: static void XrotM(s16 x) { mDoMtx_XrotM(now, x); } static void inverse() { PSMTXInverse(now, now); } static void concat(const Mtx m) { PSMTXConcat(now, m, now); } - static void copy(Mtx m) { PSMTXCopy(now, m); } + static void copy(const Mtx m) { PSMTXCopy(m, now); } static Mtx now; static Mtx buffer[16]; diff --git a/include/rel/d/a/d_a_arrow/d_a_arrow.h b/include/rel/d/a/d_a_arrow/d_a_arrow.h index da1d0ba26f4..31d7392100d 100644 --- a/include/rel/d/a/d_a_arrow/d_a_arrow.h +++ b/include/rel/d/a/d_a_arrow/d_a_arrow.h @@ -1,6 +1,99 @@ #ifndef D_A_ARROW_H #define D_A_ARROW_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "d/d_procname.h" +#include "d/cc/d_cc_d.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/bg/d_bg_s_lin_chk.h" +#include "d/particle/d_particle.h" + +class daArrow_c : public fopAc_ac_c { +public: + /* 80499C6C */ void createHeap(); + /* 80499D8C */ void atHitCallBack(dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); + /* 80499FBC */ void decAlphaBlur(); + /* 8049A04C */ void setBlur(); + /* 8049A110 */ void setLightArrowHitMark(cXyz const*); + /* 8049A1EC */ void setLightChargeEffect(int); + /* 8049A370 */ void setArrowWaterNextPos(cXyz*, cXyz*); + /* 8049A76C */ void setArrowAt(f32); + /* 8049A9CC */ void arrowShooting(); + /* 8049AC84 */ void setBombArrowExplode(cXyz*); + /* 8049ACE0 */ void setRoomInfo(); + /* 8049AD74 */ void clearNearActorData(); + /* 8049AD94 */ void getVibAngle(); + /* 8049AE64 */ void setNormalMatrix(); + /* 8049AF18 */ void setSmokePos(); + /* 8049AFEC */ void setKeepMatrix(); + /* 8049B120 */ void setStopActorMatrix(); + /* 8049B214 */ void setBombMoveEffect(); + /* 8049B370 */ void checkReget(); + /* 8049B45C */ void procWait(); + /* 8049B764 */ void procMove(); + /* 8049C700 */ void procReturnInit(int); + /* 8049C874 */ void procReturn(); + /* 8049CB70 */ void procBGStop(); + /* 8049CC60 */ void procActorStop(); + /* 8049CCCC */ void procActorControllStop(); + /* 8049CCF0 */ void procSlingHitInit(cXyz*, dCcD_GObjInf*); + /* 8049CE50 */ void procSlingHit(); + /* 8049CEA0 */ void execute(); + /* 8049D0CC */ void draw(); + /* 8049D440 */ void create(); + /* 8049D98C */ ~daArrow_c(); + + void setBombArrowExplode() { field_0x950 = 0; } + bool checkBombArrow() const { return mIsBombArrow == true; } + + static fopAc_ac_c* makeArrow(fopAc_ac_c* i_player, u16 param_1) { + return (fopAc_ac_c*)fopAcM_fastCreate(PROC_ARROW, + param_1 << 8, + &i_player->current.pos, + fopAcM_GetRoomNo(i_player), + NULL, + NULL, + -1, + NULL, + NULL); + } + + /* 0x568 */ J3DModel* field_0x568; + /* 0x56C */ dBgS_ArrowLinChk field_0x56c; + /* 0x5DC */ dBgS_ObjLinChk field_0x5dc; + /* 0x64C */ dCcD_Stts field_0x64c; + /* 0x688 */ dCcD_Cps field_0x688; + /* 0x7CC */ dCcD_Sph field_0x7cc; + /* 0x904 */ Z2SoundObjArrow field_0x904; + /* 0x93C */ bool mIsBombArrow; + /* 0x93D */ u8 field_0x93d[0x948 - 0x93D]; + /* 0x948 */ u8 mReverb; + /* 0x949 */ u8 field_0x949[0x950 - 0x949]; + /* 0x950 */ u16 field_0x950; + /* 0x952 */ s16 field_0x952; + /* 0x954 */ s16 field_0x954; + /* 0x956 */ u16 field_0x956; + /* 0x958 */ csXyz field_0x958; + /* 0x960 */ int field_0x960; + /* 0x964 */ u32 field_0x964; + /* 0x968 */ u32 field_0x968; + /* 0x96C */ u8 field_0x96c[0x994 - 0x96C]; + /* 0x994 */ u32 mHitAcID; + /* 0x998 */ f32 field_0x998; + /* 0x99C */ f32 field_0x99c; + /* 0x9A0 */ f32 mOutLengthRate; + /* 0x9A4 */ f32 mFlyMax; + /* 0x9A8 */ cXyz field_0x9a8; + /* 0x9B4 */ cXyz field_0x9b4; + /* 0x9C0 */ cXyz mStartPos; + /* 0x9CC */ cXyz field_0x9cc; + /* 0x9D8 */ cXyz field_0x9d8; + /* 0x9E4 */ cXyz field_0x9e4; + /* 0x9F0 */ cXyz mSmokePos; + /* 0x9FC */ cXyz field_0x9fc; + /* 0xA08 */ daPy_actorKeep_c field_0xa08; + /* 0xA10 */ dPa_hermiteEcallBack_c field_0xa10; + /* 0xA28 */ void (daArrow_c::*mProcFunc)(); +}; #endif /* D_A_ARROW_H */ diff --git a/include/rel/d/a/d_a_boomerang/d_a_boomerang.h b/include/rel/d/a/d_a_boomerang/d_a_boomerang.h index e3f802d51b5..a8b0541df31 100644 --- a/include/rel/d/a/d_a_boomerang/d_a_boomerang.h +++ b/include/rel/d/a/d_a_boomerang/d_a_boomerang.h @@ -4,9 +4,9 @@ #include "JSystem/J2DGraph/J2DScreen.h" #include "Z2AudioLib/Z2SoundObject.h" #include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" #include "d/particle/d_particle_copoly.h" -#include "dolphin/types.h" -#include "f_op/f_op_actor.h" +#include "f_op/f_op_actor_mng.h" class daBoomerang_sight_c { public: @@ -20,6 +20,8 @@ public: /* 804A278C */ virtual ~daBoomerang_sight_c(); + u8 getReserve() const { return mReserve; } + private: /* 0x04 */ J2DScreen* field_0x4; /* 0x08 */ J2DPane* field_0x8; @@ -60,7 +62,8 @@ class daAlink_c; class daBoomerang_c : public fopAc_ac_c { public: enum daBoomerang_FLG0 { - /* 0x80 */ WIND_CATCH = 0x80, + /* 0x800 */ FLG0_LOCK_DIST_CANCEL = 0x800, + /* 0x080 */ WIND_CATCH = 0x80, }; /* 8049F280 */ void windModelCallBack(); @@ -91,26 +94,34 @@ public: void onStateFlg0(daBoomerang_FLG0 flag) { mStateFlg0 |= flag; } void onWindCatch() { onStateFlg0(WIND_CATCH); } bool checkForceDelete() const { return mForceDelete; } + void onForceDelete() { mForceDelete = true; } bool checkCharge() const { return true; } + void setThrow() { fopAcM_SetParam(this, 1); } + void setAimActor(fopAc_ac_c* i_actor) { (this->*mpSetAimActorFn)(i_actor); } + void cancelLockActor(fopAc_ac_c* i_actor) { (this->*mpCancelLockActorFn)(i_actor); } + u8 getLockReserve() const { return mSight.getReserve(); } + bool getLockCntMax() { return mLockCnt >= 5; } + void onLockDistanceCancel() { onStateFlg0(FLG0_LOCK_DIST_CANCEL); } private: - /* 0x568 */ daMirror_c* field_0x568; + /* 0x568 */ J3DModel* field_0x568; /* 0x56C */ J3DModel* field_0x56c; - /* 0x570 */ daAlink_c* field_0x570; - /* 0x574 */ u8 field_0x574[0x1C]; + /* 0x570 */ J3DAnmTextureSRTKey* m_windBtk; + /* 0x574 */ mDoExt_bckAnm field_0x574; /* 0x590 */ J3DModel* field_0x590; - /* 0x594 */ void* field_0x594; + /* 0x594 */ J3DAnmTextureSRTKey* m_waitEffBtk; /* 0x598 */ daBoomerang_sight_c mSight; - /* 0x6A8 */ int field_0x6a8; - /* 0x6AC */ int field_0x6ac[5]; + /* 0x6A8 */ u32 field_0x6a8; + /* 0x6AC */ u32 field_0x6ac[5]; /* 0x6C0 */ fopAc_ac_c* field_0x6c0[5]; - /* 0x6D4 */ u8 field_0x6d4[8]; + /* 0x6D4 */ fopAc_ac_c* field_0x6d4; + /* 0x6D8 */ u8 field_0x6d8[4]; /* 0x6DC */ cXyz field_0x6dc[5]; /* 0x718 */ u8 field_0x718[5]; /* 0x720 */ Z2SoundObjSimple field_0x720; /* 0x740 */ dBgS_Acch field_0x740; /* 0x918 */ dPaPo_c field_0x918; - /* 0x950 */ u8 field_0x950; + /* 0x950 */ u8 mLockCnt; /* 0x951 */ u8 field_0x951; /* 0x952 */ u8 field_0x952; /* 0x953 */ u8 field_0x953; @@ -125,6 +136,22 @@ private: /* 0x960 */ s16 field_0x960; /* 0x962 */ s16 field_0x962; /* 0x964 */ u32 mStateFlg0; -}; + /* 0x968 */ u8 field_0x968[0x990 - 0x968]; + /* 0x990 */ cXyz field_0x990; + /* 0x99C */ cXyz field_0x99c; + /* 0x9A8 */ f32 field_0x9a8; + /* 0x9AC */ cXyz field_0x9ac; + /* 0x9B8 */ cXyz field_0x9b8; + /* 0x9C4 */ cXyz field_0x9c4; + /* 0x9D0 */ dCcD_Stts field_0x9d0; + /* 0xA0C */ dCcD_Cps field_0xa0c; + /* 0xB50 */ dCcD_Cyl field_0xb50; + /* 0xC8C */ dBgS_BoomerangLinChk field_0xc8c; + /* 0xCFC */ dBgS_ObjLinChk field_0xcfc; + /* 0xD6C */ dBgS_ObjGndChk field_0xd6c; + /* 0xDC0 */ int (daBoomerang_c::*mpProcFn)(); + /* 0xDCC */ void (daBoomerang_c::*mpSetAimActorFn)(fopAc_ac_c*); + /* 0xDD8 */ void (daBoomerang_c::*mpCancelLockActorFn)(fopAc_ac_c*); +}; // Size: 0xDE4 #endif /* D_A_BOOMERANG_H */ diff --git a/include/rel/d/a/d_a_canoe/d_a_canoe.h b/include/rel/d/a/d_a_canoe/d_a_canoe.h index e9746a5608f..27d6242a584 100644 --- a/include/rel/d/a/d_a_canoe/d_a_canoe.h +++ b/include/rel/d/a/d_a_canoe/d_a_canoe.h @@ -1,6 +1,83 @@ #ifndef D_A_CANOE_H #define D_A_CANOE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "d/cc/d_cc_d.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/bg/d_bg_s_lin_chk.h" +#include "Z2AudioLib/Z2SoundObject.h" +#include "SSystem/SComponent/c_phase.h" + +class daCanoe_c : public fopAc_ac_c { +public: + /* 804DA5F4 */ void createHeap(); + /* 804DA740 */ void create(); + /* 804DAEA8 */ ~daCanoe_c(); + /* 804DB008 */ void setRoomInfo(); + /* 804DB0B0 */ void setMatrix(); + /* 804DB3F4 */ void setCollision(); + /* 804DB578 */ void posMove(); + /* 804DB754 */ void checkGomikabe(cBgS_PolyInfo&); + /* 804DB7AC */ void setFrontBackPos(); + /* 804DB828 */ void frontBackBgCheck(); + /* 804DC330 */ void setPaddleEffect(); + /* 804DC554 */ void setCanoeSliderEffect(); + /* 804DC7B4 */ void execute(); + /* 804DD35C */ void draw(); + + J3DModel* getModel() { return mpModel; } + MtxP getModelMtx() { return mpModel->getBaseTRMtx(); } + bool checkTandem() { return fopAcM_GetParam(this) == 2; } + bool checkJumpRideFlg() { return mJumpRideFlg; } + void incShapeOffsetY(f32 offset) { mShapeOffsetY += offset; } + void incShapeAngleZ(s16 incZ) { shape_angle.z += incZ; } + + /* 0x0568 */ request_of_phase_process_class mPhaseReq; + /* 0x0570 */ J3DModel* mpModel; + /* 0x0574 */ J3DModel* mpPaddleModel; + /* 0x0578 */ J3DModel* mpMaskModel; + /* 0x057C */ dCcD_Stts field_0x57c; + /* 0x05B8 */ dBgS_AcchCir field_0x5b8[9]; + /* 0x07F8 */ dBgS_LinkAcch field_0x7f8[3]; + /* 0x0D80 */ dCcD_Cyl field_0xd80[5]; + /* 0x13AC */ dBgS_LinkLinChk field_0x13ac; + /* 0x141C */ Z2SoundObjSimple field_0x141c; + /* 0x143C */ char* mResName; + /* 0x1440 */ u8 mPaddleWaterType; + /* 0x1441 */ u8 field_0x1441; + /* 0x1442 */ u8 field_0x1442; + /* 0x1443 */ u8 mJumpRideFlg; + /* 0x1444 */ u8 field_0x1444; + /* 0x1445 */ u8 mReverb; + /* 0x1446 */ u8 field_0x1446[0x1448 - 0x1446]; + /* 0x1448 */ s16 field_0x1448; + /* 0x144A */ u8 field_0x144a[0x144C - 0x144A]; + /* 0x144C */ s16 mAimAngle; + /* 0x144E */ s16 field_0x144e; + /* 0x1450 */ s16 field_0x1450; + /* 0x1452 */ s16 field_0x1452; + /* 0x1454 */ s16 field_0x1454; + /* 0x1456 */ s16 field_0x1456; + /* 0x1458 */ s16 field_0x1458; + /* 0x145A */ s16 field_0x145a; + /* 0x145C */ s16 field_0x145c; + /* 0x145E */ s16 field_0x145e; + /* 0x1460 */ s16 field_0x1460; + /* 0x1464 */ u32 mRodID; + /* 0x1468 */ f32 mAimSpeed; + /* 0x146C */ f32 mShapeOffsetY; + /* 0x1470 */ f32 field_0x1470; + /* 0x1474 */ u32 field_0x1474; + /* 0x1478 */ u8 field_0x1478[0x1480 - 0x1478]; + /* 0x1480 */ u32 field_0x1480; + /* 0x1484 */ u8 field_0x1484[0x1490 - 0x1484]; + /* 0x1490 */ u32 field_0x1490; + /* 0x1494 */ cXyz field_0x1494; + /* 0x14A0 */ cXyz field_0x14a0; + /* 0x14AC */ cXyz field_0x14ac; + /* 0x14B8 */ cXyz field_0x14b8; + /* 0x14C4 */ cXyz field_0x14c4; + /* 0x14D0 */ cXyz field_0x14d0; +}; // Size: 0x14DC #endif /* D_A_CANOE_H */ diff --git a/include/rel/d/a/d_a_crod/d_a_crod.h b/include/rel/d/a/d_a_crod/d_a_crod.h index 38ac7fb48f2..bf0e65fb208 100644 --- a/include/rel/d/a/d_a_crod/d_a_crod.h +++ b/include/rel/d/a/d_a_crod/d_a_crod.h @@ -28,15 +28,15 @@ public: NULL); } - fopAc_ac_c* getControllActor() { return mControllActor.getActor(); } + fopAc_ac_c* getControllActor() { return mControllAcKeep.getActor(); } - fopAc_ac_c* getCameraActor() { return mCameraActor.getActor(); } + fopAc_ac_c* getCameraActor() { return mCameraAcKeep.getActor(); } void setThrow() { fopAcM_SetParam(this, 2); } private: /* 0x568 */ J3DModel* field_568; - /* 0x56C */ mDoExt_bckAnm field_0x56c; + /* 0x56C */ mDoExt_bckAnm mBckAnm; /* 0x588 */ J3DAnmTevRegKey* field_0x588; /* 0x58C */ J3DAnmTextureSRTKey* field_0x58c; /* 0x590 */ dCcD_Stts field_0x590; @@ -46,8 +46,8 @@ private: /* 0x731 */ u8 field_0x731; /* 0x732 */ u8 field_0x732; /* 0x734 */ cXyz field_0x734; - /* 0x740 */ daPy_actorKeep_c mControllActor; - /* 0x748 */ daPy_actorKeep_c mCameraActor; + /* 0x740 */ daPy_actorKeep_c mControllAcKeep; + /* 0x748 */ daPy_actorKeep_c mCameraAcKeep; }; // Size: 0x750 #endif /* D_A_CROD_H */ diff --git a/include/rel/d/a/d_a_cstatue/d_a_cstatue.h b/include/rel/d/a/d_a_cstatue/d_a_cstatue.h index 24acf9e1d06..9861393d27c 100644 --- a/include/rel/d/a/d_a_cstatue/d_a_cstatue.h +++ b/include/rel/d/a/d_a_cstatue/d_a_cstatue.h @@ -1,6 +1,75 @@ #ifndef D_A_CSTATUE_H #define D_A_CSTATUE_H -#include "dolphin/types.h" +#include "SSystem/SComponent/c_phase.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" +#include "d/particle/d_particle_copoly.h" +#include "f_op/f_op_actor.h" + +class daCstatue_c : public fopAc_ac_c { +public: + /* 806636AC */ void atHitCallback(fopAc_ac_c*); + /* 806636EC */ void createHeap(); + /* 80663D28 */ void create(); + /* 80664840 */ ~daCstatue_c(); + /* 80664AA0 */ void setRoomInfo(); + /* 80664B38 */ void setMatrix(); + /* 80664C9C */ void posMove(); + /* 8066555C */ void setCollision(); + /* 80665E14 */ void checkHammerReverse(); + /* 80665F80 */ void setDemo(); + /* 80666390 */ void setAnime(); + /* 80666B80 */ void initBrk(u16); + /* 80666BF8 */ void initStopBrkBtk(); + /* 80666C38 */ void initStartBrkBtk(); + /* 80666DE8 */ void execute(); + /* 80667438 */ void draw(); + + bool checkNotSmallType() const { return mType == 1; } + + static u8 const m_bckIdxTable[70 + 2 /* padding */]; + + /* 0x568 */ char* mResName; + /* 0x56C */ request_of_phase_process_class mPhaseReq; + /* 0x574 */ J3DModel* field_0x574; + /* 0x578 */ mDoExt_McaMorfSO* field_0x578; + /* 0x57C */ mDoExt_btkAnm field_0x57c; + /* 0x594 */ mDoExt_brkAnm field_0x594; + /* 0x5AC */ dBgS_AcchCir field_0x5ac[4]; + /* 0x6AC */ dBgS_StatueAcch field_0x6ac; + /* 0x884 */ dCcD_Stts field_0x884; + /* 0x8C0 */ dCcD_Cyl field_0x8c0; + /* 0x9FC */ dCcD_Cyl* field_0x9fc; + /* 0xA00 */ dCcD_Cps* field_0xa00; + /* 0xA04 */ dCcD_Cps* field_0xa04; + /* 0xA08 */ dCcD_Sph* field_0xa08; + /* 0xA0C */ mDoExt_invisibleModel field_0xa0c; + /* 0xA14 */ Z2Creature field_0xa14; + /* 0xAA4 */ dPaPo_c field_0xaa4; + /* 0xADC */ u8 mReverb; + /* 0xADD */ u8 mType; + /* 0xADE */ u8 field_0xade; + /* 0xADF */ u8 field_0xadf; + /* 0xAE0 */ u8 field_0xae0; + /* 0xAE1 */ u8 field_0xae1; + /* 0xAE2 */ u8 field_0xae2; + /* 0xAE3 */ u8 field_0xae3; + /* 0xAE4 */ u8 field_0xae4; + /* 0xAE5 */ u8 mBossAtGndHit; + /* 0xAE6 */ u8 field_0xae6[0xAE8 - 0xAE6]; + /* 0xAE8 */ s16 field_0xae8; + /* 0xAEA */ s16 field_0xaea; + /* 0xAEC */ u32 mStateFlg0; + /* 0xAF0 */ u32 field_0xaf0; + /* 0xAF4 */ f32 field_0xaf4; + /* 0xAF8 */ f32 field_0xaf8; + /* 0xAFC */ f32 field_0xafc; + /* 0xB00 */ f32 field_0xb00; + /* 0xB04 */ f32 field_0xb04; + /* 0xB08 */ cXyz field_0xb08; + /* 0xB14 */ cXyz field_0xb14; + /* 0xB20 */ cXyz mBallPos; +}; // Size: 0xB2C #endif /* D_A_CSTATUE_H */ diff --git a/include/rel/d/a/d_a_horse/d_a_horse.h b/include/rel/d/a/d_a_horse/d_a_horse.h index b109ebe2f7c..76016519a96 100644 --- a/include/rel/d/a/d_a_horse/d_a_horse.h +++ b/include/rel/d/a/d_a_horse/d_a_horse.h @@ -51,6 +51,7 @@ public: enum daHorse_FLG0 { /* 0x00000020 */ RODEO_LEFT = 0x20, /* 0x00000040 */ RIDE_START_FLG = 0x40, + /* 0x00000080 */ NO_DRAW_WAIT = 0x80, /* 0x00010000 */ PLAYER_BACK_RIDE_LASH = 0x10000, /* 0x20000000 */ TURN_CANCEL_KEEP = 0x20000000, /* 0x80000000 */ RODEO_MODE = 0x80000000 @@ -158,6 +159,11 @@ public: void i_changeDemoMode(u32 param_0, int param_1) { field_0x1740 = param_0; field_0x1728 = param_1; } void i_changeOriginalDemo() { field_0x16b8 = 3; field_0x1728 = 0; } void i_setHorsePosAndAngle(cXyz const* i_pos, s16 i_angle) { (this->*mpSetHorsePosAngleFn)(i_pos, i_angle); } + void onRideFlg() { (this->*mpOnRideFlgFn)(); } + void onStateFlg0(daHorse_FLG0 flag) { mStateFlg0 |= flag; } + void offStateFlg0(daHorse_FLG0 flag) { mStateFlg0 &= ~flag; } + void offNoDrawWait() { offStateFlg0(NO_DRAW_WAIT); } + int checkSpecialWallHit(const cXyz& param_0) { return (this->*mpCheckSpecialWallHitFn)(param_0); } bool checkTurnStandCamera() const { return checkResetStateFlg0(TURN_STAND_CAMERA); } bool checkTurnStand() const { return checkResetStateFlg0(TURN_STAND); } @@ -226,13 +232,13 @@ public: /* 0x17C4 */ cXyz mDemoPos0; /* 0x17D0 */ u8 field_0x17d0[0x18A4 - 0x17D0]; /* 0x18A4 */ int (daHorse_c::*mpProcFn)(); - /* 0x18A4 */ int (daHorse_c::*mpCheckSpecialWallHitFn)(const cXyz&); - /* 0x18A4 */ void (daHorse_c::*mpSetReinPosHandFn)(int); - /* 0x18A4 */ void (daHorse_c::*mpSetReinPosNormalFn)(); - /* 0x18A4 */ int (daHorse_c::*mpCallHorseFn)(const cXyz*); - /* 0x18A4 */ int (daHorse_c::*mpSetHorsePosAngleFn)(const cXyz* i_pos, s16 i_angle); - /* 0x18A4 */ void (daHorse_c::*mpOnRideFlgFn)(); - /* 0x18A4 */ void (daHorse_c::*mpOffRideFlgFn)(); + /* 0x18B0 */ int (daHorse_c::*mpCheckSpecialWallHitFn)(const cXyz&); + /* 0x18BC */ void (daHorse_c::*mpSetReinPosHandFn)(int); + /* 0x18C8 */ void (daHorse_c::*mpSetReinPosNormalFn)(); + /* 0x18D4 */ int (daHorse_c::*mpCallHorseFn)(const cXyz*); + /* 0x18E0 */ int (daHorse_c::*mpSetHorsePosAngleFn)(const cXyz* i_pos, s16 i_angle); + /* 0x18EC */ void (daHorse_c::*mpOnRideFlgFn)(); + /* 0x18F8 */ void (daHorse_c::*mpOffRideFlgFn)(); }; #endif /* D_A_HORSE_H */ diff --git a/include/rel/d/a/d_a_mg_rod/d_a_mg_rod.h b/include/rel/d/a/d_a_mg_rod/d_a_mg_rod.h index 24a62675dae..4dfe12b7e2b 100644 --- a/include/rel/d/a/d_a_mg_rod/d_a_mg_rod.h +++ b/include/rel/d/a/d_a_mg_rod/d_a_mg_rod.h @@ -1,6 +1,74 @@ #ifndef D_A_MG_ROD_H #define D_A_MG_ROD_H -#include "dolphin/types.h" +#include "Z2AudioLib/Z2Creature.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" +#include "d/msg/d_msg_flow.h" +#include "f_op/f_op_actor.h" + +struct mg_rod_s { + /* 0x0 */ cXyz field_0x0[16]; +}; + +struct mg_line_s { + /* 0x0 */ cXyz field_0x0[100]; +}; + +struct mg_hook_s { + /* 0x00 */ cXyz field_0x0[2]; + /* 0x18 */ u8 field_0x18[0x20 - 0x18]; +}; + +class dmg_rod_class : public fopAc_ac_c { +public: + /* 804BAC0C */ dmg_rod_class(); + + f32 getRodStickX() { return mRodStickX; } + f32 getRodStickY() { return mRodStickY; } + bool checkRodEquipPermission() { return field_0x1514 == 0; } + +private: + /* 0x0568 */ u8 field_0x568[0x5A4 - 0x568]; + /* 0x05A4 */ mg_rod_s field_0x5a4; + /* 0x0664 */ u8 field_0x664[0x6AC - 0x664]; + /* 0x06AC */ cXyz field_0x6ac; + /* 0x06B8 */ cXyz field_0x6b8; + /* 0x06C4 */ u8 field_0x6c4[0x6C8 - 0x6C4]; + /* 0x06C8 */ cXyz field_0x6c8; + /* 0x06D4 */ cXyz field_0x6d4; + /* 0x06E0 */ u8 field_0x6e0[0x6EC - 0x6E0]; + /* 0x06EC */ cXyz field_0x6ec; + /* 0x06F8 */ u8 field_0x6f8[0x71C - 0x6F8]; + /* 0x071C */ csXyz field_0x71c[6]; + /* 0x0740 */ u8 field_0x740[0x744 - 0x740]; + /* 0x0744 */ cXyz field_0x744; + /* 0x0750 */ cXyz field_0x750; + /* 0x075C */ u8 field_0x75c[0x764 - 0x75C]; + /* 0x0764 */ cXyz field_0x764; + /* 0x0770 */ mg_line_s field_0x770; + /* 0x0C20 */ u8 field_0xc20[0xFAC - 0xC20]; + /* 0x0FAC */ mg_hook_s field_0xfac[2]; + /* 0x0FEC */ u8 field_0xfec[0x1060 - 0xFEC]; + /* 0x1060 */ cXyz field_0x1060; + /* 0x106C */ cXyz field_0x106c; + /* 0x1078 */ cXyz field_0x1078; + /* 0x1084 */ csXyz field_0x1084; + /* 0x108A */ u8 field_0x108a[0x10B4 - 0x108A]; + /* 0x10B4 */ Z2Creature field_0x10b4; + /* 0x1144 */ u8 field_0x1144[0x1190 - 0x1144]; + /* 0x1190 */ dBgS_AcchCir field_0x1190; + /* 0x11D0 */ dBgS_ObjAcch field_0x11d0; + /* 0x13A8 */ u8 field_0x13a8[0x1474 - 0x13A8]; + /* 0x1474 */ dMsgFlow_c mMsgFlow; + /* 0x14C0 */ u8 field_0x14c0[0x14C8 - 0x14C0]; + /* 0x14C8 */ f32 mRodStickX; + /* 0x14CC */ f32 mRodStickY; + /* 0x14D0 */ u8 field_0x14d0[0x1514 - 0x14D0]; + /* 0x1514 */ u8 field_0x1514; + /* 0x1515 */ u8 field_0x1515[0x1518 - 0x1515]; + /* 0x1518 */ dCcD_Stts field_0x1518; + /* 0x1554 */ dCcD_Sph field_0x1554; +}; #endif /* D_A_MG_ROD_H */ diff --git a/include/rel/d/a/d_a_scene_exit/d_a_scene_exit.h b/include/rel/d/a/d_a_scene_exit/d_a_scene_exit.h index cf94fb234c2..dc6e8346d25 100644 --- a/include/rel/d/a/d_a_scene_exit/d_a_scene_exit.h +++ b/include/rel/d/a/d_a_scene_exit/d_a_scene_exit.h @@ -15,6 +15,7 @@ public: u32 getSwNo() { return fopAcM_GetParam(this) >> 0x18; } u16 getOffEventBit() { return orig.angle.z & 0xFFF; } u16 getOnEventBit() { return orig.angle.x & 0xFFF; } + u8 getPathID() { return (fopAcM_GetParam(this) >> 0x10) & 0xFF; } void setSceneChangeOK() { mSceneChangeOK = true; } /* 0x568 */ Mtx mMatrix; diff --git a/include/rel/d/a/d_a_skip_2D/d_a_skip_2D.h b/include/rel/d/a/d_a_skip_2D/d_a_skip_2D.h index 9ab71ef5fce..48fe2419d4d 100644 --- a/include/rel/d/a/d_a_skip_2D/d_a_skip_2D.h +++ b/include/rel/d/a/d_a_skip_2D/d_a_skip_2D.h @@ -1,6 +1,26 @@ #ifndef D_A_SKIP_2D_H #define D_A_SKIP_2D_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" + +class daSkip2D_c : public fopAc_ac_c { +public: + daSkip2D_c() { + initiate(); + } + + /* 80D4D498 */ int createHeap(); + /* 80D4D4F4 */ int create(); + /* 80D4D588 */ int destroy(); + /* 80D4D590 */ int draw(); + /* 80D4D5D0 */ int execute(); + /* 80D4D5D8 */ void initiate(); + + /* 80D4D674 */ virtual ~daSkip2D_c() {} + + /* 0x56C */ u32 field_0x56c; + /* 0x570 */ dMeterButton_c* mpButton; + /* 0x574 */ u8 field_0x574; +}; // Size: 0x578 #endif /* D_A_SKIP_2D_H */ diff --git a/include/rel/d/a/d_a_spinner/d_a_spinner.h b/include/rel/d/a/d_a_spinner/d_a_spinner.h index 3d70f93a1b2..383bfe5b764 100644 --- a/include/rel/d/a/d_a_spinner/d_a_spinner.h +++ b/include/rel/d/a/d_a_spinner/d_a_spinner.h @@ -36,6 +36,7 @@ public: bool checkSpinnerTagEnd() const { return mSpinnerTag == 5; } bool checkSpinnerTagIntoIncRot() const { return mSpinnerTag == 4; } bool checkSpinnerTagInto() const { return mSpinnerTag == 3; } + bool checkGroundHit() { return mAcch.ChkGroundHit(); } u8 getButtonJump() const { return mButtonJump; } u8 getJumpFlg() const { return mJumpFlg; } diff --git a/include/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.h b/include/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.h index 91ab7cd78d3..fbefe37b548 100644 --- a/include/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.h +++ b/include/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.h @@ -1,6 +1,20 @@ #ifndef D_A_TAG_HINIT_H #define D_A_TAG_HINIT_H -#include "dolphin/types.h" +#include "f_op/f_op_actor.h" + +class daTagHinit_c : public fopAc_ac_c { +public: + /* 805A3758 */ int create(); + /* 805A3820 */ ~daTagHinit_c(); + /* 805A389C */ int execute(); + + /* 0x568 */ u8 field_0x568; + /* 0x569 */ u8 field_0x569; + /* 0x56A */ u8 field_0x56a; + /* 0x56B */ u8 field_0x56b; + /* 0x56C */ u16 field_0x56c; + /* 0x56E */ u16 field_0x56e; +}; #endif /* D_A_TAG_HINIT_H */ diff --git a/include/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.h b/include/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.h index 4b3d375c2cd..616380f04b6 100644 --- a/include/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.h +++ b/include/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.h @@ -1,6 +1,21 @@ #ifndef D_A_TAG_SETRESTART_H #define D_A_TAG_SETRESTART_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class daTagRestart_c : public fopAc_ac_c { +public: + /* 80D603F8 */ int Create(); + /* 80D6048C */ int create(); + /* 80D60560 */ int execute(); + /* 80D60744 */ int _delete(); + + /* 0x568 */ s8 mPlayerRoomNo; + /* 0x56C */ cXyz field_0x56c[4]; +}; + +namespace daTagRestart_prm { + inline u8 getFRoomNo(daTagRestart_c* i_tag) { return fopAcM_GetParam(i_tag); } +}; #endif /* D_A_TAG_SETRESTART_H */ diff --git a/include/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.h b/include/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.h index 4652f9a4abc..83937c34b09 100644 --- a/include/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.h +++ b/include/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.h @@ -1,6 +1,24 @@ #ifndef D_A_TAG_WARA_HOWL_H #define D_A_TAG_WARA_HOWL_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class daTagWrHowl_c : public fopAc_ac_c { +public: + /* 80D63F38 */ daTagWrHowl_c(); + /* 80D63FD4 */ int create(); + /* 80D6402C */ int Delete(); + /* 80D64034 */ int draw(); + /* 80D6403C */ int execute(); + /* 80D64090 */ void init(); + /* 80D640B4 */ bool chkWlfInTag(); + + /* 80D63F74 */ virtual ~daTagWrHowl_c(); + + u8 getTuneId() { return fopAcM_GetParamBit(this, 4, 4); } + + /* 0x56C */ f32 field_0x56c; + /* 0x570 */ f32 field_0x570; +}; #endif /* D_A_TAG_WARA_HOWL_H */ diff --git a/libs/JSystem/J2DGraph/J2DMatBlock.cpp b/libs/JSystem/J2DGraph/J2DMatBlock.cpp index 8585bfcd17d..1268d8e9abd 100644 --- a/libs/JSystem/J2DGraph/J2DMatBlock.cpp +++ b/libs/JSystem/J2DGraph/J2DMatBlock.cpp @@ -995,17 +995,17 @@ void J2DTevBlock1::setGX() { for (int i = 0; i < 4; i++) { GXColorS10 color = mTevColor[i]; - GXTevRegID id; + int id; if (i == 3) { id = 0; } else { id = i + 1; } - GXSetTevColorS10(id, color); + GXSetTevColorS10((GXTevRegID)id, color); } GXSetNumTevStages(1); - GXSetTevColorIn(GX_TEVSTAGE0, ) + } #else #pragma push diff --git a/libs/JSystem/J2DGraph/J2DPicture.cpp b/libs/JSystem/J2DGraph/J2DPicture.cpp index b74dba0716b..3e3a0ec79be 100644 --- a/libs/JSystem/J2DGraph/J2DPicture.cpp +++ b/libs/JSystem/J2DGraph/J2DPicture.cpp @@ -251,7 +251,7 @@ SECTION_DATA extern void* __vt__10J2DPicture[83 + 1 /* padding */] = { /* 802FC050-802FC118 2F6990 00C8+00 0/0 2/2 0/0 .text __ct__10J2DPictureFv */ #ifdef NONMATCHING J2DPicture::J2DPicture() - : field_0x10a(), field_0x12c(NULL), mWhite(), mBlack(), mCornerColor(), field_0x148(), + : field_0x10a(), mPalette(NULL), mWhite(), mBlack(), mCornerColor(), field_0x148(), field_0x14c() { for (int i = 0; i < 2; i++) { mTexture[i] = NULL; @@ -276,7 +276,7 @@ asm J2DPicture::J2DPicture() { * __ct__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP10JKRArchive */ #ifdef NONMATCHING J2DPicture::J2DPicture(J2DPane* p_pane, JSURandomInputStream* p_stream, JKRArchive* p_archive) - : field_0x10a(), field_0x12c(NULL), mWhite(), mBlack(), mCornerColor(), field_0x148(), + : field_0x10a(), mPalette(NULL), mWhite(), mBlack(), mCornerColor(), field_0x148(), field_0x14c() { private_readStream(p_pane, p_stream, p_archive); } diff --git a/libs/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/J2DGraph/J2DScreen.cpp index bb60ce1778d..d4aeeaa12bf 100644 --- a/libs/JSystem/J2DGraph/J2DScreen.cpp +++ b/libs/JSystem/J2DGraph/J2DScreen.cpp @@ -468,10 +468,10 @@ SECTION_SDATA2 static f32 lit_1830 = 1.0f; // matches with literals #ifdef NONMATCHING void J2DScreen::draw(f32 x, f32 y, J2DGrafContext const* grafCtx) { - u32 x, y, width, height; + u32 l_x, l_y, width, height; if (mScissor) { - GXGetScissor(&x, &y, &width, &height); + GXGetScissor(&l_x, &l_y, &width, &height); } if (grafCtx != NULL) { @@ -483,7 +483,7 @@ void J2DScreen::draw(f32 x, f32 y, J2DGrafContext const* grafCtx) { } if (mScissor) { - GXSetScissor(x, y, width, height); + GXSetScissor(l_x, l_y, width, height); } GXSetNumIndStages(0); diff --git a/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp index 19bf206bbc5..5a22db2d787 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp @@ -116,27 +116,15 @@ SECTION_SDATA2 static u8 lit_853[4] = { }; /* 803283FC-8032842C 322D3C 0030+00 0/0 25/25 285/285 .text init__12J3DFrameCtrlFs */ -// zero-initialized literal -#ifdef NONMATCHING -void J3DFrameCtrl::init(s16 pEnd) { +void J3DFrameCtrl::init(s16 i_end) { mAttribute = 2; - mState = false; + mState = 0; mStart = 0; - mEnd = pEnd; + mEnd = i_end; mLoop = 0; - mRate = 1.0f; - mFrame = 0.0f; + mRate = lit_852; + mFrame = FLOAT_LABEL(lit_853); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DFrameCtrl::init(s16 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphAnimator/J3DAnimation/init__12J3DFrameCtrlFs.s" -} -#pragma pop -#endif /* ############################################################################################## */ /* 80456438-80456440 004A38 0004+04 2/2 0/0 0/0 .sdata2 @973 */ @@ -151,14 +139,135 @@ SECTION_SDATA2 static f64 lit_975 = 4503601774854144.0 /* cast s32 to float */; /* 8032842C-803289CC 322D6C 05A0+00 0/0 92/92 382/382 .text checkPass__12J3DFrameCtrlFf */ +// matches with literals +#ifdef NONMATCHING +int J3DFrameCtrl::checkPass(f32 pass_frame) { + f32 cur_frame = mFrame; + f32 next_frame = cur_frame + mRate; + + switch (mAttribute) { + case 0: + case 1: + if (next_frame < mStart) { + next_frame = mStart; + } + + if (next_frame >= mEnd) { + next_frame = mEnd - 0.001f; + } + + if (cur_frame <= next_frame) { + if (cur_frame <= pass_frame && pass_frame < next_frame) { + return true; + } else { + return false; + } + } + + if (next_frame <= pass_frame && pass_frame < cur_frame) { + return true; + } + return false; + case 2: + if (cur_frame < mStart) { + while (next_frame < mStart) { + if (mLoop - mStart <= 0.0f) { + break; + } + next_frame += mLoop - mStart; + } + + if (next_frame <= pass_frame && pass_frame < mLoop) { + return true; + } else { + return false; + } + } else if (mEnd <= cur_frame) { + while (next_frame >= mEnd) { + if (mEnd - mLoop <= 0.0f) { + break; + } + next_frame -= mEnd - mLoop; + } + + if (mLoop <= pass_frame && pass_frame < next_frame) { + return true; + } else { + return false; + } + } else if (next_frame < mStart) { + while (next_frame < mStart) { + if (mLoop - mStart <= 0.0f) { + break; + } + next_frame += mLoop - mStart; + } + + if ((mStart <= pass_frame && pass_frame < cur_frame) || (next_frame <= pass_frame && pass_frame < mLoop)) { + return true; + } else { + return false; + } + } else if (mEnd <= next_frame) { + while (next_frame >= mEnd) { + if (mEnd - mLoop <= 0.0f) { + break; + } + + next_frame -= mEnd - mLoop; + } + + if ((cur_frame <= pass_frame && pass_frame < mEnd) || (mLoop <= pass_frame && pass_frame < next_frame)) { + return true; + } else { + return false; + } + } else if (cur_frame <= next_frame) { + if (cur_frame <= pass_frame && pass_frame < next_frame) { + return true; + } else { + return false; + } + } else if (next_frame <= pass_frame && pass_frame < cur_frame) { + return true; + } + return false; + case 3: + case 4: + if (next_frame >= mEnd) { + next_frame = mEnd - 0.001f; + } + + if (next_frame < mStart) { + next_frame = mStart; + } + + if (cur_frame <= next_frame) { + if (cur_frame <= pass_frame && pass_frame < next_frame) { + return true; + } else { + return false; + } + } + + if (next_frame <= pass_frame && pass_frame < cur_frame) { + return true; + } + return false; + default: + return false; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int J3DFrameCtrl::checkPass(f32 param_0) { +asm int J3DFrameCtrl::checkPass(f32 pass_frame) { nofralloc #include "asm/JSystem/J3DGraphAnimator/J3DAnimation/checkPass__12J3DFrameCtrlFf.s" } #pragma pop +#endif /* 803289CC-80328E40 32330C 0474+00 0/0 3/3 0/0 .text update__12J3DFrameCtrlFv */ #pragma push @@ -171,6 +280,19 @@ asm void J3DFrameCtrl::update() { #pragma pop /* 80328E40-80328E90 323780 0050+00 0/0 3/3 0/0 .text __ct__15J3DAnmTransformFsPfPsPf */ +// matches with literals +#ifdef NONMATCHING +J3DAnmTransform::J3DAnmTransform(s16 param_0, f32* param_1, s16* param_2, f32* param_3) + : J3DAnmBase(param_0) { + field_0xc = param_1; + field_0x10 = param_2; + field_0x14 = param_3; + field_0x18 = 0; + field_0x1a = 0; + field_0x1c = 0; + field_0x1e = 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -179,6 +301,7 @@ asm J3DAnmTransform::J3DAnmTransform(s16 param_0, f32* param_1, s16* param_2, f3 #include "asm/JSystem/J3DGraphAnimator/J3DAnimation/__ct__15J3DAnmTransformFsPfPsPf.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80456448-80456450 004A48 0004+04 4/4 0/0 0/0 .sdata2 @1092 */ @@ -359,7 +482,7 @@ asm void J3DAnmTextureSRTKey::calcTransform(f32 param_0, u16 param_1, #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DAnmClusterFull::getWeight(u16 param_0) const { +asm f32 J3DAnmClusterFull::getWeight(u16 param_0) const { nofralloc #include "asm/JSystem/J3DGraphAnimator/J3DAnimation/getWeight__17J3DAnmClusterFullCFUs.s" } @@ -370,7 +493,7 @@ asm void J3DAnmClusterFull::getWeight(u16 param_0) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DAnmClusterKey::getWeight(u16 param_0) const { +asm f32 J3DAnmClusterKey::getWeight(u16 param_0) const { nofralloc #include "asm/JSystem/J3DGraphAnimator/J3DAnimation/getWeight__16J3DAnmClusterKeyCFUs.s" } @@ -818,14 +941,9 @@ s32 J3DAnmCluster::getKind() const { } /* 8032C11C-8032C124 326A5C 0008+00 1/0 0/0 0/0 .text getWeight__13J3DAnmClusterCFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DAnmCluster::getWeight(u16 param_0) const { - nofralloc -#include "asm/JSystem/J3DGraphAnimator/J3DAnimation/getWeight__13J3DAnmClusterCFUs.s" +f32 J3DAnmCluster::getWeight(u16 param_0) const { + return lit_852; } -#pragma pop /* 8032C124-8032C190 326A64 006C+00 1/0 0/0 0/0 .text __dt__17J3DAnmClusterFullFv */ #pragma push diff --git a/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp b/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp index 6f1e6b2fd2b..fb10d64833b 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp @@ -233,7 +233,7 @@ J3DJoint::J3DJoint() { mChild = NULL; mYounger = NULL; mJntNo = 0; - mMtxType = 1; + mKind = 1; mScaleCompensate = false; mTransformInfo = j3dDefaultTransformInfo; mBoundingSphereRadius = 0.0f; diff --git a/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp b/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp index f7332ea6bf2..9aa446515e3 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp @@ -93,8 +93,8 @@ J3DMaterialTable::~J3DMaterialTable() {} /* 8032F64C-8032F6F8 329F8C 00AC+00 0/0 1/1 5/5 .text * removeMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor */ #ifdef NONMATCHING -bool J3DMaterialTable::removeMatColorAnimator(J3DAnmColor* pAnmColor) { - bool ret = false; +int J3DMaterialTable::removeMatColorAnimator(J3DAnmColor* pAnmColor) { + int ret = false; u16 updateMatNum = pAnmColor->getUpdateMaterialNum(); for (u16 i = 0; i < updateMatNum; i++) { if (pAnmColor->isValidUpdateMaterialID(i)) { diff --git a/libs/JSystem/J3DGraphAnimator/J3DModel.cpp b/libs/JSystem/J3DGraphAnimator/J3DModel.cpp index c70594f53c8..80f312c3815 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DModel.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DModel.cpp @@ -585,7 +585,7 @@ void J3DModel::prepareShapePackets() { if (getMtxCalcMode() == 2) { pkt->setBaseMtxPtr(&mInternalView); } else { - pkt->setBaseMtxPtr(j3dSys.getViewMtx()); + pkt->setBaseMtxPtr(&j3dSys.mViewMtx); } } } diff --git a/libs/JSystem/JAudio2/JAISound.cpp b/libs/JSystem/JAudio2/JAISound.cpp index 22a65961ddd..2f943947c1e 100644 --- a/libs/JSystem/JAudio2/JAISound.cpp +++ b/libs/JSystem/JAudio2/JAISound.cpp @@ -168,7 +168,7 @@ void JAISound::start_JAISound_(JAISoundID param_0, JGeometry::TVec3 const* params.init(); fader.forceIn(); audience_ = param_2; - num_prepare_steps = 0; + prepareCount = 0; mCount = 0; if (param_1 == NULL || audience_ == NULL) { diff --git a/libs/JSystem/JFramework/JFWDisplay.cpp b/libs/JSystem/JFramework/JFWDisplay.cpp index 2ee0175cba7..7134e6cf231 100644 --- a/libs/JSystem/JFramework/JFWDisplay.cpp +++ b/libs/JSystem/JFramework/JFWDisplay.cpp @@ -480,12 +480,10 @@ void JFWDisplay::waitBlanking(int param_0) { } } +#ifdef NONMATCHING /* ############################################################################################## */ /* 804511D0-804511D4 0006D0 0004+00 1/1 0/0 0/0 .sbss nextTick$2642 */ -static u8 nextTick[4] ALIGN_DECL(8); - -/* 804511D4-804511D8 0006D4 0004+00 1/1 0/0 0/0 .sbss None */ -static u8 data_804511D4[4]; +static OSTime nextTick ALIGN_DECL(8); /* 804511D8-804511DC 0006D8 0004+00 1/1 0/0 0/0 .sbss None */ static s8 data_804511D8; @@ -497,7 +495,6 @@ static u32 nextCount; static s8 data_804511E0; /* 80272CB0-80272DD0 26D5F0 0120+00 2/2 0/0 0/0 .text waitForTick__FUlUs */ -#ifdef NONMATCHING static void waitForTick(u32 param_0, u16 param_1) { if (param_0 != 0) { if (!data_804511D8) { @@ -531,6 +528,22 @@ static void waitForTick(u32 param_0, u16 param_1) { } } #else +/* ############################################################################################## */ +/* 804511D0-804511D4 0006D0 0004+00 1/1 0/0 0/0 .sbss nextTick$2642 */ +static u8 nextTick[4] ALIGN_DECL(8); + +/* 804511D4-804511D8 0006D4 0004+00 1/1 0/0 0/0 .sbss None */ +static u8 data_804511D4[4]; + +/* 804511D8-804511DC 0006D8 0004+00 1/1 0/0 0/0 .sbss None */ +static s8 data_804511D8; + +/* 804511DC-804511E0 0006DC 0004+00 1/1 0/0 0/0 .sbss nextCount$2650 */ +static u32 nextCount; + +/* 804511E0-804511E8 0006E0 0008+00 1/1 0/0 0/0 .sbss None */ +static s8 data_804511E0; + #pragma push #pragma optimization_level 0 #pragma optimizewithasm off diff --git a/libs/JSystem/JFramework/JFWSystem.cpp b/libs/JSystem/JFramework/JFWSystem.cpp index 329a6f23568..48efb937be9 100644 --- a/libs/JSystem/JFramework/JFWSystem.cpp +++ b/libs/JSystem/JFramework/JFWSystem.cpp @@ -161,7 +161,7 @@ void JFWSystem::init() { if (rootHeap == NULL) { firstInit(); } - sInitCalled = true; + data_804511BC = true; JKRAram::create(CSetUpParam::aramAudioBufSize, CSetUpParam::aramGraphBufSize, CSetUpParam::streamPriority, CSetUpParam::decompPriority, diff --git a/libs/JSystem/JGadget/linklist.cpp b/libs/JSystem/JGadget/linklist.cpp index 513b9f35222..2a45b636157 100644 --- a/libs/JSystem/JGadget/linklist.cpp +++ b/libs/JSystem/JGadget/linklist.cpp @@ -89,20 +89,6 @@ JGadget::TNodeLinkList::iterator JGadget::TNodeLinkList::erase(iterator start, i /* 802DCB08-802DCBA8 2D7448 00A0+00 1/1 0/0 0/0 .text * splice__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorRQ27JGadget13TNodeLinkListQ37JGadget13TNodeLinkList8iterator */ -#ifdef NONMATCHING -void JGadget::TNodeLinkList::splice(iterator myIt, TNodeLinkList& otherList, iterator otherIt) { - TLinkListNode* otherNode = otherIt; - TLinkListNode* otherNextNode = otherNode->mNext; - - if (myIt == otherIt) { - return; - } - if (myIt.node != otherNextNode) { - otherList.Erase(otherNode); - Insert(myIt, otherNode); - } -} -#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -113,7 +99,6 @@ asm void JGadget::TNodeLinkList::splice(JGadget::TNodeLinkList::iterator param_0 #include "asm/JSystem/JGadget/linklist/func_802DCB08.s" } #pragma pop -#endif /* 802DCBA8-802DCBD4 2D74E8 002C+00 1/1 7/7 0/0 .text * Insert__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorPQ27JGadget13TLinkListNode */ diff --git a/libs/JSystem/JKernel/JKRAram.cpp b/libs/JSystem/JKernel/JKRAram.cpp index fad1d82be90..119155979c7 100644 --- a/libs/JSystem/JKernel/JKRAram.cpp +++ b/libs/JSystem/JKernel/JKRAram.cpp @@ -10,6 +10,7 @@ #include "JSystem/JKernel/JKRAramStream.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTException.h" +#include "MSL_C/string.h" #include "dol2asm.h" #include "dolphin/ar/ar.h" #include "global.h" @@ -28,7 +29,9 @@ extern "C" void mainRamToAram__7JKRAramFPUcUlUl15JKRExpandSwitchUlP7JKRHeapiPUl( extern "C" void aramToMainRam__7JKRAramFUlPUcUl15JKRExpandSwitchUlP7JKRHeapiPUl(); extern "C" static void JKRDecompressFromAramToMainRam__FUlPvUlUlUlPUl(); extern "C" static void decompSZS_subroutine__FPUcPUc(); +static int decompSZS_subroutine(u8* param_0, u8* param_1); extern "C" static void firstSrcData__Fv(); +static u8* firstSrcData(void); extern "C" static void nextSrcData__FPUc(); extern "C" void __sinit_JKRAram_cpp(); extern "C" void func_802D2DF0(void* _this); @@ -43,7 +46,6 @@ extern "C" u8 sAramObject__7JKRAram[4]; // External References: // -SECTION_INIT void memcpy(); extern "C" void alloc__7JKRHeapFUliP7JKRHeap(); extern "C" void alloc__7JKRHeapFUli(); extern "C" void free__7JKRHeapFPvP7JKRHeap(); @@ -281,7 +283,7 @@ static u32 readCount; static u32 maxDest; /* 804513FC-80451400 0008FC 0004+00 1/1 0/0 0/0 .sbss None */ -static u8 data_804513FC[4]; +static bool data_804513FC; /* 80451400-80451404 000900 0004+00 2/2 0/0 0/0 .sbss tsPtr */ static u32* tsPtr; @@ -297,8 +299,7 @@ static u32 tsArea; // doesn't use r13 void JKRDecompressFromAramToMainRam(u32 src, void* dst, u32 srcLength, u32 dstLength, u32 offset, u32* resourceSize) { -#define s_is_decompress_mutex_initialized lbl_804513FC -#define decompMutex lbl_804343C0 +#define s_is_decompress_mutex_initialized data_804513FC // STATIC BEGIN // This code is probably generated by the compiler for a static variable @@ -311,7 +312,7 @@ void JKRDecompressFromAramToMainRam(u32 src, void* dst, u32 srcLength, u32 dstLe // STATIC END OSLockMutex(&decompMutex); - u32 szpSize = getSZSBufferSize(); + u32 szpSize = JKRAram::getSZSBufferSize(); szpBuf = (u8*)JKRAllocFromSysHeap(szpSize, 0x20); ASSERT(szpBuf != 0); szpEnd = szpBuf + szpSize; @@ -431,7 +432,7 @@ static u8* nextSrcData(u8* current) { transLeft -= transSize; if (transLeft == 0) { - srcLimit = (u32)(dest + left) + transSize; + srcLimit = (dest + left) + transSize; } return dest; diff --git a/libs/JSystem/JKernel/JKRAramHeap.cpp b/libs/JSystem/JKernel/JKRAramHeap.cpp index a3d800e6906..0e04176dc3d 100644 --- a/libs/JSystem/JKernel/JKRAramHeap.cpp +++ b/libs/JSystem/JKernel/JKRAramHeap.cpp @@ -78,7 +78,7 @@ JKRAramHeap::JKRAramHeap(u32 startAddress, u32 size) { // close match, regalloc problem in the beginning of the while loop #ifdef NONMATCHING JKRAramHeap::~JKRAramHeap() { - JSUList* list = &lbl_8043430C; + JSUList* list = &sAramList; JSUListIterator iterator = list; while (iterator != list->getEnd()) { diff --git a/libs/JSystem/JKernel/JKRAramStream.cpp b/libs/JSystem/JKernel/JKRAramStream.cpp index 7f770f9f0ae..90b754a50ff 100644 --- a/libs/JSystem/JKernel/JKRAramStream.cpp +++ b/libs/JSystem/JKernel/JKRAramStream.cpp @@ -7,6 +7,8 @@ #include "JSystem/JKernel/JKRAramPiece.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JSupport/JSUFileStream.h" +#include "JSystem/JSupport/JSURandomInputStream.h" +#include "JSystem/JUtility/JUTException.h" #include "dol2asm.h" #include "global.h" @@ -125,10 +127,10 @@ s32 JKRAramStream::readFromAram(void) { #ifdef NONMATCHING s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) { u32 size; - u32 dstSize = command->mDstLength; + u32 dstSize = command->mSize; u32 offset = command->mOffset; u32 writtenLength = 0; - u32 destination = command->mDst; + u32 destination = command->mAddress; u8* buffer = command->mTransferBuffer; u32 bufferSize = command->mTransferBufferSize; JKRHeap* heap = command->mHeap; @@ -167,13 +169,11 @@ s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) { heap->dump(); } - panic_f__12JUTExceptionFPCciPCce("JKRAramStream.cpp", 0xac, "%s", - ":::Cannot alloc memory\n"); + JUTException::panic_f("JKRAramStream.cpp", 0xac, "%s", ":::Cannot alloc memory\n"); } if (buffer) { - seek__20JSURandomInputStreamFl17JSUStreamSeekFrom((JSURandomInputStream*)command->mStream, - offset, 0); + ((JSURandomInputStream*)command->mStream)->seek(offset, JSUStreamSeekFrom_SET); while (dstSize != 0) { u32 length; if (dstSize > size) { @@ -182,8 +182,7 @@ s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) { length = dstSize; } - s32 readLength = - read__14JSUInputStreamFPvl((JSUInputStream*)command->mStream, buffer, length); + s32 readLength = ((JSURandomInputStream*)command->mStream)->read(buffer, length); if (readLength == 0) { writtenLength = 0; break; diff --git a/libs/JSystem/JKernel/JKRDecomp.cpp b/libs/JSystem/JKernel/JKRDecomp.cpp index 1ea61165edd..f1f2a1799be 100644 --- a/libs/JSystem/JKernel/JKRDecomp.cpp +++ b/libs/JSystem/JKernel/JKRDecomp.cpp @@ -6,6 +6,7 @@ #include "JSystem/JKernel/JKRDecomp.h" #include "JSystem/JKernel/JKRAramPiece.h" #include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JKernel/JKRArchive.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JKernel/JKRDvdArchive.cpp b/libs/JSystem/JKernel/JKRDvdArchive.cpp index 1e2ee8eb916..70597f9992f 100644 --- a/libs/JSystem/JKernel/JKRDvdArchive.cpp +++ b/libs/JSystem/JKernel/JKRDvdArchive.cpp @@ -8,6 +8,8 @@ #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTException.h" +#include "MSL_C/math.h" +#include "MSL_C/string.h" #include "dol2asm.h" #include "global.h" @@ -29,7 +31,6 @@ extern "C" extern char const* const JKRDvdArchive__stringBase0; // External References: // -SECTION_INIT void memset(); extern "C" void alloc__7JKRHeapFUliP7JKRHeap(); extern "C" void alloc__7JKRHeapFUli(); extern "C" void free__7JKRHeapFPvP7JKRHeap(); @@ -70,7 +71,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void abs(); extern "C" u8 sVolumeList__13JKRFileLoader[12]; extern "C" u8 sSystemHeap__7JKRHeap[4]; diff --git a/libs/JSystem/JKernel/JKRFileCache.cpp b/libs/JSystem/JKernel/JKRFileCache.cpp index 33f231947cf..e480f0bc2c1 100644 --- a/libs/JSystem/JKernel/JKRFileCache.cpp +++ b/libs/JSystem/JKernel/JKRFileCache.cpp @@ -319,7 +319,7 @@ void JKRFileCache::removeResourceAll(void) { iterator = mCacheBlockList.getFirst(); while (iterator != mCacheBlockList.getEnd()) { JKRFreeToHeap(mParentHeap, iterator->mMemoryPtr); - mCacheBlockList.remove(&iterator->mLink); + mCacheBlockList.remove(iterator.mLink); JSUListIterator next = iterator++; CCacheBlock* cacheBlock = next.getObject(); delete cacheBlock; diff --git a/libs/JSystem/JKernel/JKRFileLoader.cpp b/libs/JSystem/JKernel/JKRFileLoader.cpp index 88e153fef80..7570bec0161 100644 --- a/libs/JSystem/JKernel/JKRFileLoader.cpp +++ b/libs/JSystem/JKernel/JKRFileLoader.cpp @@ -177,17 +177,7 @@ SECTION_DEAD static char const* const pad_8039D152 = "\0\0\0\0\0"; #pragma pop /* 804508C0-804508C8 000340 0002+06 1/1 0/0 0/0 .sdata rootPath$2498 */ -SECTION_SDATA static u8 rootPath[2 + 6 /* padding */] = { - 0x2F, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, -}; +SECTION_SDATA static char rootPath[2] = "/"; /* 802D44C4-802D45A0 2CEE04 00DC+00 1/1 0/0 0/0 .text fetchVolumeName__13JKRFileLoaderFPclPCc */ // matches, but lbl_804508C0 is accessed through r13 @@ -198,9 +188,9 @@ const char* JKRFileLoader::fetchVolumeName(char* buffer, long bufferSize, const // lbl_804508C0 = JKernel::rootPath$2498 "/" // lbl_803D2D18 = MSL_C::__lower_map - if (strcmp(path, lbl_8039D150) == 0) { - strcpy(buffer, lbl_804508C0); - return lbl_804508C0; + if (strcmp(path, "/") == 0) { + strcpy(buffer, rootPath); + return rootPath; } path++; @@ -211,7 +201,7 @@ const char* JKRFileLoader::fetchVolumeName(char* buffer, long bufferSize, const if (ch == -1) { lower_char = -1; } else { - lower_char = lbl_803D2D18[ch & 0xFF]; + lower_char = __lower_map[ch & 0xFF]; } *buffer = lower_char; @@ -223,7 +213,7 @@ const char* JKRFileLoader::fetchVolumeName(char* buffer, long bufferSize, const *buffer = '\0'; if (*path == '\0') { - path = lbl_804508C0; + path = rootPath; } return path; diff --git a/libs/JSystem/JKernel/JKRHeap.cpp b/libs/JSystem/JKernel/JKRHeap.cpp index 09ee11deebd..1087bc1edae 100644 --- a/libs/JSystem/JKernel/JKRHeap.cpp +++ b/libs/JSystem/JKernel/JKRHeap.cpp @@ -359,7 +359,7 @@ s32 JKRHeap::changeGroupID(u8 param_1) { */ // "not/nor" instruction in the wrong place #ifdef NONMATCHING -s32 JKRHeap::getMaxAllocatableSize(int alignment) { +u32 JKRHeap::getMaxAllocatableSize(int alignment) { u32 maxFreeBlock = (u32)getMaxFreeBlock(); s32 freeSize = getFreeSize(); diff --git a/libs/JSystem/JKernel/JKRMemArchive.cpp b/libs/JSystem/JKernel/JKRMemArchive.cpp index 5f530435435..4d834d4dba6 100644 --- a/libs/JSystem/JKernel/JKRMemArchive.cpp +++ b/libs/JSystem/JKernel/JKRMemArchive.cpp @@ -206,10 +206,10 @@ bool JKRMemArchive::open(long entryNum, JKRArchive::EMountDirection mountDirecti mIsOpen = false; mMountDirection = mountDirection; - if (mMountDirection == JKRArchive::HEAD) { + if (mMountDirection == JKRArchive::MOUNT_DIRECTION_HEAD) { u32 loadedSize; mArcHeader = (SArcHeader*)JKRDvdRipper::loadToMainRAM( - entryNum, NULL, EXPAND_SWITCH_UNKNOWN1, 0, mHeap, JKRDvdRipper::FORWARD, 0, + entryNum, NULL, EXPAND_SWITCH_UNKNOWN1, 0, mHeap, JKRDvdRipper::ALLOC_DIRECTION_FORWARD, 0, &mCompression, &loadedSize); if (mArcHeader) { DCInvalidateRange(mArcHeader, loadedSize); @@ -217,7 +217,7 @@ bool JKRMemArchive::open(long entryNum, JKRArchive::EMountDirection mountDirecti } else { u32 loadedSize; mArcHeader = (SArcHeader*)JKRDvdRipper::loadToMainRAM( - entryNum, NULL, EXPAND_SWITCH_UNKNOWN1, 0, mHeap, JKRDvdRipper::BACKWARD, 0, + entryNum, NULL, EXPAND_SWITCH_UNKNOWN1, 0, mHeap, JKRDvdRipper::ALLOC_DIRECTION_BACKWARD, 0, &mCompression, &loadedSize); if (mArcHeader) { DCInvalidateRange(mArcHeader, loadedSize); @@ -269,7 +269,7 @@ bool JKRMemArchive::open(void* buffer, u32 bufferSize, JKRMemBreakFlag flag) { (u8*)(mArcHeader->file_data_offset + mArcHeader->header_length + (u32)mArcHeader); mIsOpen = (flag == JKRMEMBREAK_FLAG_UNKNOWN1); mHeap = JKRHeap::findFromRoot(buffer); - mCompression = JKRDecomp::NONE; + mCompression = COMPRESSION_NONE; return true; } #else diff --git a/libs/JSystem/JKernel/JKRSolidHeap.cpp b/libs/JSystem/JKernel/JKRSolidHeap.cpp index 79d79d5f6b5..ab4185671ad 100644 --- a/libs/JSystem/JKernel/JKRSolidHeap.cpp +++ b/libs/JSystem/JKernel/JKRSolidHeap.cpp @@ -323,7 +323,7 @@ void JKRSolidHeap::state_register(JKRHeap::TState* p, u32 id) const { getState_(p); setState_u32ID_(p, id); - setState_uUsedSize_(p, getUsedSize()); + setState_uUsedSize_(p, getUsedSize((JKRSolidHeap*)this)); setState_u32CheckCode_(p, (u32)mSolidHead + (u32)mSolidTail * 3); } #else diff --git a/libs/JSystem/JParticle/JPAMath.cpp b/libs/JSystem/JParticle/JPAMath.cpp index d0a4f911ae1..36e6211995b 100644 --- a/libs/JSystem/JParticle/JPAMath.cpp +++ b/libs/JSystem/JParticle/JPAMath.cpp @@ -15,13 +15,6 @@ struct JMath { static u8 sincosTable_[65536]; }; -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; - // // Forward References: // diff --git a/libs/JSystem/JStudio/JStudio/functionvalue.cpp b/libs/JSystem/JStudio/JStudio/functionvalue.cpp index a79c09925d8..9cd2828c9b1 100644 --- a/libs/JSystem/JStudio/JStudio/functionvalue.cpp +++ b/libs/JSystem/JStudio/JStudio/functionvalue.cpp @@ -365,10 +365,10 @@ f64 interpolateValue_hermite(f64 c0, f64 c1, f64 x, f64 c2, f64 x2, f64 c3, f64 f64 b; a = c0 - c1; - b = a * (lbl_80455408 / (x2 - c1)); // (a - b) * 1.0 / (c - d) - c = b - lbl_80455408; // 1.0 - d = (lbl_80455410 + lbl_80455418 * b) * (b * b); // 3.0 - 2.0 * b - return (a * b * c * x3) + ((lbl_80455408 - d) * x + (d * c3)) + (a * (c * c) * c2); + b = a * (1.0 / (x2 - c1)); // (a - b) * 1.0 / (c - d) + c = b - 1.0; // 1.0 + d = (3.0 + -2.0 * b) * (b * b); // 3.0 - 2.0 * b + return (a * b * c * x3) + ((1.0 - d) * x + (d * c3)) + (a * (c * c) * c2); } #else /* 80281710-80281774 27C050 0064+00 4/4 0/0 0/0 .text @@ -387,15 +387,15 @@ asm f64 interpolateValue_hermite(f64 param_0, f64 param_1, f64 param_2, f64 para #ifdef NONMATCHING // really minor regalloc f64 interpolateValue_BSpline_uniform(f64 f1, f64 f2, f64 f3, f64 f4, f64 f5) { // pow3(1.0 - f1) - f64 f6 = (lbl_80455408 - f1); + f64 f6 = (1.0 - f1); f64 temp = f6; temp *= f6 * f6; f64 f0 = f1 * f1; f64 f8 = f0 * f1; - return ((lbl_80455420 * f8 - f0) + lbl_80455430) * f3 + (temp * f2 + f8 * f5) * lbl_80455428 + - f4 * (lbl_80455428 + lbl_80455420 * ((f1 + f0) - f8)); + return ((lit_799 * f8 - f0) + lit_801) * f3 + (temp * f2 + f8 * f5) * 0.5 + + f4 * (0.5 + lit_799 * ((f1 + f0) - f8)); } #else /* 80281774-802817D8 27C0B4 0064+00 1/1 0/0 0/0 .text diff --git a/libs/JSystem/JStudio/JStudio/fvb.cpp b/libs/JSystem/JStudio/JStudio/fvb.cpp index f822d7cd099..c7c256244ff 100644 --- a/libs/JSystem/JStudio/JStudio/fvb.cpp +++ b/libs/JSystem/JStudio/JStudio/fvb.cpp @@ -562,7 +562,7 @@ void TObject_composite::prepare_data_(const data::TParse_TParagraph::TData& rDat ASSERT(pfn != NULL); pfn(pContent->data); - fnValue.data_set(*ops, pContent->data); + fnValue.data_set((TFunctionValue_composite::CompositeFunc)*ops, pContent->data); } #else /* 802842D4-80284338 27EC14 0064+00 1/0 0/0 0/0 .text diff --git a/libs/JSystem/JStudio/JStudio/stb.cpp b/libs/JSystem/JStudio/JStudio/stb.cpp index e624ce6b73f..38af2c2c3a3 100644 --- a/libs/JSystem/JStudio/JStudio/stb.cpp +++ b/libs/JSystem/JStudio/JStudio/stb.cpp @@ -333,7 +333,7 @@ TControl::~TControl() { #ifdef NONMATCHING void TControl::appendObject(TObject* p) { - p->setControl(this); + p->setControl_(this); mObjectContainer.Push_back(p); } #else diff --git a/libs/JSystem/JUtility/JUTDirectFile.cpp b/libs/JSystem/JUtility/JUTDirectFile.cpp index d791df3cc5e..fbdf04b7ea5 100644 --- a/libs/JSystem/JUtility/JUTDirectFile.cpp +++ b/libs/JSystem/JUtility/JUTDirectFile.cpp @@ -7,19 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct JUTDirectFile { - /* 802E8730 */ void fetch32byte(); - /* 802E87F8 */ JUTDirectFile(); - /* 802E881C */ ~JUTDirectFile(); - /* 802E8860 */ void fopen(char const*); - /* 802E88FC */ void fclose(); - /* 802E8958 */ void fgets(void*, int); -}; - // // Forward References: // @@ -85,7 +72,7 @@ asm JUTDirectFile::~JUTDirectFile() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JUTDirectFile::fopen(char const* param_0) { +asm bool JUTDirectFile::fopen(char const* param_0) { nofralloc #include "asm/JSystem/JUtility/JUTDirectFile/fopen__13JUTDirectFileFPCc.s" } @@ -95,7 +82,7 @@ asm void JUTDirectFile::fopen(char const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JUTDirectFile::fclose() { +asm bool JUTDirectFile::fclose() { nofralloc #include "asm/JSystem/JUtility/JUTDirectFile/fclose__13JUTDirectFileFv.s" } @@ -105,7 +92,7 @@ asm void JUTDirectFile::fclose() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JUTDirectFile::fgets(void* param_0, int param_1) { +asm int JUTDirectFile::fgets(void* param_0, int param_1) { nofralloc #include "asm/JSystem/JUtility/JUTDirectFile/fgets__13JUTDirectFileFPvi.s" } diff --git a/libs/JSystem/JUtility/JUTException.cpp b/libs/JSystem/JUtility/JUTException.cpp index 2bd2f9140f2..36bee8c8262 100644 --- a/libs/JSystem/JUtility/JUTException.cpp +++ b/libs/JSystem/JUtility/JUTException.cpp @@ -6,6 +6,7 @@ #include "JSystem/JUtility/JUTException.h" #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDirectPrint.h" +#include "JSystem/JUtility/JUTDirectFile.h" #include "MSL_C/MSL_Common/Src/float.h" #include "MSL_C/MSL_Common/Src/printf.h" #include "Runtime.PPCEABI.H/__va_arg.h" diff --git a/libs/JSystem/JUtility/JUTResFont.cpp b/libs/JSystem/JUtility/JUTResFont.cpp index 8c6cf5aeb15..6fb3d7a6fe6 100644 --- a/libs/JSystem/JUtility/JUTResFont.cpp +++ b/libs/JSystem/JUtility/JUTResFont.cpp @@ -365,7 +365,7 @@ asm void JUTResFont::getWidthEntry(int param_0, JUTFont::TWidth* param_1) const /* 802DFD0C-802DFD58 2DA64C 004C+00 1/0 1/0 0/0 .text getCellWidth__10JUTResFontCFv */ // regalloc #ifdef NONMATCHING -u16 JUTResFont::getCellWidth() const { +int JUTResFont::getCellWidth() const { u16 width; if (mGly1Ptr && mGly1Ptr->magic != 0) { diff --git a/libs/JSystem/JUtility/JUTTexture.cpp b/libs/JSystem/JUtility/JUTTexture.cpp index 82e6b9e8c44..eb7e6e97ba2 100644 --- a/libs/JSystem/JUtility/JUTTexture.cpp +++ b/libs/JSystem/JUtility/JUTTexture.cpp @@ -82,13 +82,9 @@ void JUTTexture::storeTIMG(ResTIMG const* param_0, u8 param_1) { } if (mEmbPalette == NULL || !getEmbPaletteDelFlag()) { - JUTPalette* palette = new JUTPalette(); - if (palette) { - palette->storeTLUT(tlut, (_GXTlutFmt)tmp->colorFormat, - (JUTTransparency)tmp->alphaEnabled, tmp->numColors, - (void*)(tmp->format + tmp->paletteOffset)); - } - mEmbPalette = palette; + mEmbPalette = new JUTPalette(tlut, (_GXTlutFmt)tmp->colorFormat, + (JUTTransparency)tmp->alphaEnabled, tmp->numColors, + (void*)(tmp->format + tmp->paletteOffset)); mFlags = mFlags & 1 | 2; } else { mEmbPalette->storeTLUT(tlut, (_GXTlutFmt)tmp->colorFormat, @@ -185,10 +181,10 @@ void JUTTexture::initTexObj() { offset = 0x20; } - GXInitTexObj(mTexObj, &mTexInfo + offset, mTexInfo->width, mTexInfo->height, + GXInitTexObj(&mTexObj, &mTexInfo + offset, mTexInfo->width, mTexInfo->height, (GXTexFmt)mTexInfo->format, (GXTexWrapMode)mTexInfo->wrapS, (GXTexWrapMode)mTexInfo->wrapT, mTexInfo->mipmapEnabled); - GXInitTexObjLOD(mTexObj, (GXTexFilter)mTexInfo->minFilter, (GXTexFilter)mTexInfo->magFilter, + GXInitTexObjLOD(&mTexObj, (GXTexFilter)mTexInfo->minFilter, (GXTexFilter)mTexInfo->magFilter, mTexInfo->minLOD, mTexInfo->maxLOD, mTexInfo->LODBias, mTexInfo->biasClamp, mTexInfo->doEdgeLOD, (GXAnisotropy)mTexInfo->maxAnisotropy); } diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp index b6424a7e29c..905cb2b8879 100644 --- a/libs/Z2AudioLib/Z2AudioMgr.cpp +++ b/libs/Z2AudioLib/Z2AudioMgr.cpp @@ -380,7 +380,7 @@ void Z2AudioMgr::resetRecover() { mSeqMgr.setTwilightGateVol(1.0f); mSeqMgr.setWindStoneVol(1.0f, 0); mStatusMgr.menuOut(); - mSeqMgr.bgmAllUnMute(0); + mSeqMgr.i_bgmAllUnMute(0); mSeqMgr.unMuteSceneBgm(0); } #else diff --git a/libs/Z2AudioLib/Z2SceneMgr.cpp b/libs/Z2AudioLib/Z2SceneMgr.cpp index e1286580473..c139fc41202 100644 --- a/libs/Z2AudioLib/Z2SceneMgr.cpp +++ b/libs/Z2AudioLib/Z2SceneMgr.cpp @@ -4,6 +4,8 @@ // #include "Z2AudioLib/Z2SceneMgr.h" +#include "Z2AudioLib/Z2SoundMgr.h" +#include "Z2AudioLib/Z2SeqMgr.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -39,29 +41,6 @@ struct Z2SoundObjMgr { /* 802C013C */ void deleteEnemyAll(); }; -struct Z2SoundMgr { - /* 802AA430 */ void resetFilterAll(); -}; - -struct Z2SeqMgr { - /* 802AF010 */ void bgmStart(u32, u32, s32); - /* 802AF408 */ void bgmStop(u32, s32); - /* 802AFB94 */ void bgmStreamPrepare(u32); - /* 802AFDEC */ void bgmStreamCheckReady(); - /* 802AFE18 */ void bgmStreamPlay(); - /* 802AFF8C */ void changeBgmStatus(s32); - /* 802B3318 */ void setHeightVolMod(bool, u32); - /* 802B3398 */ void setTimeProcVolMod(bool, u32); - /* 802B3EAC */ void checkBgmIDPlaying(u32); - /* 802B4128 */ void resetBattleBgmParams(); - /* 802B4164 */ void setBattleBgmOff(bool); - /* 802B9968 */ void setFieldBgmPlay(bool); - /* 802B99AC */ void unMuteSceneBgm(u32); - /* 802B9A24 */ void muteSceneBgm(u32, f32); - /* 802B9AD0 */ void setTwilightGateVol(f32); - /* 802B9AFC */ void setWindStoneVol(f32, u32); -}; - struct Z2SeMgr { /* 802AB80C */ void resetModY(); /* 802AD94C */ void seStopAll(u32); @@ -78,13 +57,6 @@ struct Z2EnvSeMgr { /* 802C6AC0 */ void initSceneEnvSe(s32, s8, f32); }; -template -struct JSUList {}; -/* JSUList */ -struct JSUList__template2 { - /* 802B9994 */ void func_802B9994(void* _this) /* const */; -}; - struct JAUSoundTable { /* 802A7160 */ void getTypeID(JAISoundID) const; }; @@ -97,10 +69,6 @@ struct JASWaveArc { /* 8029A640 */ void erase(); }; -struct JAIStreamMgr { - /* 802B9978 */ void isActive() const; -}; - // // Forward References: // @@ -193,11 +161,11 @@ extern "C" extern u8 data_80450B3C[4]; extern "C" extern u8 data_80450B40[4]; extern "C" extern u8 data_80450B48[4]; extern "C" extern u8 data_80450B58[4]; -extern "C" extern u8 data_80450B60[4]; +extern "C" extern Z2SoundMgr* data_80450B60; extern "C" extern u8 data_80450B7C[4]; -extern "C" extern u8 data_80450B80[4]; +extern "C" extern Z2SceneMgr* data_80450B80; extern "C" extern u8 data_80450B84[4]; -extern "C" extern u8 data_80450B88[4]; +extern "C" extern Z2SeMgr* data_80450B88; extern "C" extern u8 data_80450CC0[4 + 4 /* padding */]; // @@ -208,7 +176,7 @@ extern "C" extern u8 data_80450CC0[4 + 4 /* padding */]; // Missing 2 instructions (beginning and end) #ifdef NONMATCHING Z2SceneMgr::Z2SceneMgr(void) { - lbl_80450B80 = this; + data_80450B80 = this; sceneNum = -1; timer = -1; BGM_ID = -1; @@ -269,25 +237,24 @@ SECTION_SDATA2 static f32 lit_3512 = 1.0f; /* 802B68E0-802B697C 2B1220 009C+00 3/3 2/2 2/2 .text setSceneExist__10Z2SceneMgrFb */ #ifdef NONMATCHING void Z2SceneMgr::setSceneExist(bool param_1) { - Z2SoundMgr* Z2soundMgrPtr; sceneExist = param_1; timer = 0; - Z2soundMgrPtr = lbl_80450B60; - if (param_1 == false) { - Z2soundMgrPtr->JAISoundParamsMove->moveVolume(FLOAT_LABEL(lit_3511), 0xb4); - } else { + + JAISeMgr* seMgr = data_80450B60->getSeMgr(); + + if (param_1) { inGame = 1; + if (SeWave_3 == 0x85) { - Z2soundMgrPtr->JAISoundParamsMove->moveVolume(FLOAT_LABEL(lit_3511), 0); + seMgr->getCategory(9)->getParams()->moveVolume(FLOAT_LABEL(lit_3511), 0); + } else if (SeWave_3 == 0x7F) { + data_80450B88->seMoveVolumeAll(FLOAT_LABEL(lit_3511), 0); } else { - if (SeWave_3 == 0x7f) { - lbl_80450B88->seMoveVolumeAll(FLOAT_LABEL(lit_3511), 0); - } else { - Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lit_3512, 0x21); - } + seMgr->getCategory(9)->getParams()->moveVolume(lit_3512, 33); } + } else { + seMgr->getCategory(9)->getParams()->moveVolume(FLOAT_LABEL(lit_3511), 180); } - return; } #else #pragma push @@ -749,7 +716,7 @@ JAISoundID::JAISoundID(JAISoundID const& soundIdToSet) { // 1 Instruction off #ifdef NONMATCHING void Z2SeqMgr::setFieldBgmPlay(bool param_1) { - unk_1 = (param_1 & 1U) << 2 | unk_1 & 0xfb; + mFlags = (param_1 & 1U) << 2 | mFlags & 0xfb; } #else #pragma push diff --git a/libs/Z2AudioLib/Z2SoundObjMgr.cpp b/libs/Z2AudioLib/Z2SoundObjMgr.cpp index 6c7a7191eff..17d781338e7 100644 --- a/libs/Z2AudioLib/Z2SoundObjMgr.cpp +++ b/libs/Z2AudioLib/Z2SoundObjMgr.cpp @@ -53,7 +53,7 @@ extern "C" void _savegpr_27(); extern "C" void _restgpr_23(); extern "C" void _restgpr_27(); extern "C" void strcmp(); -extern "C" extern u8 data_80450B48[4]; +extern "C" extern Z2SoundObjMgr* data_80450B48; extern "C" extern u8 data_80450B80[4]; extern "C" extern Z2SeqMgr* data_80450B84; extern "C" u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; @@ -66,9 +66,9 @@ extern "C" u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; #ifdef NONMATCHING // order wrong because this needs to inherit from JASGlobalInstance Z2SoundObjMgr::Z2SoundObjMgr() { - data_80450B84 = this; + data_80450B48 = this; mGhostEnemyState = 0; - mIsTwilightBattle = false; + mTwilightBattle = false; setBattleInit(); setForceBattleArea(false, 700, 1100, 1500); } diff --git a/libs/Z2AudioLib/Z2SoundObject.cpp b/libs/Z2AudioLib/Z2SoundObject.cpp index 9cd329f33ef..41a56257d92 100644 --- a/libs/Z2AudioLib/Z2SoundObject.cpp +++ b/libs/Z2AudioLib/Z2SoundObject.cpp @@ -11,13 +11,8 @@ // Types: // -struct Z2SoundObjArrow { - /* 802BEB38 */ Z2SoundObjArrow(); - /* 802BEB74 */ void init(Vec*, u8); -}; - struct Z2SoundInfo { - /* 802BBAC8 */ void getSwBit(JAISoundID) const; + /* 802BBAC8 */ int getSwBit(JAISoundID) const; }; struct Z2SeMgr { @@ -106,7 +101,7 @@ extern "C" void _restgpr_23(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" extern u32 __float_max; -extern "C" extern u8 data_80450B4C[4]; +extern "C" extern Z2SoundInfo* data_80450B4C; extern "C" extern u8 data_80450B60[4]; extern "C" extern Z2SoundStarter* data_80450B74; extern "C" extern u8 data_80450B88[4]; @@ -232,7 +227,7 @@ void Z2SoundObjBase::dispose() { for (link = getFirst(); link != NULL; link = link->getNext()) { handle = link->getObject(); if (handle != NULL && (bool)*handle) { - u32 swBit = lbl_80450B4C->getSwBit((*handle)->getID()); + u32 swBit = data_80450B4C->getSwBit((*handle)->getID()); if ((swBit & 0x8000) != 0) { handle->releaseSound(); } else { @@ -260,7 +255,7 @@ asm void Z2SoundObjBase::dispose() { // sInstance stuff #ifdef NONMATCHING bool Z2SoundObjBase::stopOK(Z2SoundHandlePool& pSoundHandlePool) { - return !(lbl_80450B4C->getSwBit(pSoundHandlePool->getID()) & 0x8000); + return !(data_80450B4C->getSwBit(pSoundHandlePool->getID()) & 0x8000); } #else #pragma push @@ -380,7 +375,8 @@ asm void Z2DopplerSoundObjBase::init(Vec* param_0, u8 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void Z2DopplerSoundObjBase::framework(u32 param_0, s8 param_1) { +// asm void Z2DopplerSoundObjBase::framework(u32 param_0, s8 param_1) { +extern "C" asm void framework__21Z2DopplerSoundObjBaseFUlSc() { nofralloc #include "asm/Z2AudioLib/Z2SoundObject/framework__21Z2DopplerSoundObjBaseFUlSc.s" } @@ -499,7 +495,8 @@ asm Z2SoundObjArrow::Z2SoundObjArrow() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void Z2SoundObjArrow::init(Vec* param_0, u8 param_1) { +// asm void Z2SoundObjArrow::init(Vec* param_0, u8 param_1) { +extern "C" asm void init__15Z2SoundObjArrowFP3VecUc() { nofralloc #include "asm/Z2AudioLib/Z2SoundObject/init__15Z2SoundObjArrowFP3VecUc.s" } diff --git a/libs/Z2AudioLib/Z2StatusMgr.cpp b/libs/Z2AudioLib/Z2StatusMgr.cpp index a194402f76c..d011ed06902 100644 --- a/libs/Z2AudioLib/Z2StatusMgr.cpp +++ b/libs/Z2AudioLib/Z2StatusMgr.cpp @@ -108,7 +108,7 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 struct_80450860[4]; extern "C" extern u8 data_80450B40[4]; extern "C" extern u8 data_80450B60[4]; -extern "C" extern u8 data_80450B7C[4]; +extern "C" extern Z2StatusMgr* data_80450B7C; extern "C" extern u8 data_80450B80[4]; extern "C" extern Z2SeqMgr* data_80450B84; extern "C" extern Z2SeMgr* data_80450B88; diff --git a/libs/dolphin/pad/Pad.c b/libs/dolphin/pad/Pad.c index b963c96a2ce..98e8ca4aaca 100644 --- a/libs/dolphin/pad/Pad.c +++ b/libs/dolphin/pad/Pad.c @@ -239,7 +239,7 @@ asm u32 PADInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void PADRead(PADStatus* status) { +asm u32 PADRead(PADStatus* status) { nofralloc #include "asm/dolphin/pad/Pad/PADRead.s" } diff --git a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp index 14fa344b207..4d4c48ce260 100644 --- a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp +++ b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp @@ -531,7 +531,7 @@ static void action(b_go_class* b_go) { break; } - cLib_addCalcAngleS2(&b_go->mCollisionRot.y, b_go->current.angle.y, 4, 0x2000); + cLib_addCalcAngleS2(&b_go->shape_angle.y, b_go->current.angle.y, 4, 0x2000); mDoMtx_stack_c::YrotS(b_go->current.angle.y); cXyz speed; @@ -579,7 +579,7 @@ static int daB_GO_Execute(b_go_class* b_go) { damage_check(b_go); mDoMtx_stack_c::transS(b_go->current.pos.x, b_go->current.pos.y, b_go->current.pos.z); - mDoMtx_stack_c::YrotM(b_go->mCollisionRot.y); + mDoMtx_stack_c::YrotM(b_go->shape_angle.y); mDoMtx_stack_c::scaleM((*(daB_GO_HIO_c*)l_HIO).mSmallSize, (*(daB_GO_HIO_c*)l_HIO).mSmallSize, (*(daB_GO_HIO_c*)l_HIO).mSmallSize); mDoMtx_stack_c::copy(b_go->mpMorf->getModel()->getBaseTRMtx()); b_go->mpMorf->play(0, dComIfGp_getReverb(b_go->current.mRoomNo)); diff --git a/rel/d/a/d_a_alldie/d_a_alldie.cpp b/rel/d/a/d_a_alldie/d_a_alldie.cpp index 333d8087b5a..768142b1a4e 100644 --- a/rel/d/a/d_a_alldie/d_a_alldie.cpp +++ b/rel/d/a/d_a_alldie/d_a_alldie.cpp @@ -185,8 +185,8 @@ int daAlldie_c::create() { mAction = ACT_WAIT; } - mCollisionRot.z = 0; - mCollisionRot.x = 0; + shape_angle.z = 0; + shape_angle.x = 0; current.angle.z = 0; current.angle.x = 0; diff --git a/rel/d/a/d_a_arrow/d_a_arrow.cpp b/rel/d/a/d_a_arrow/d_a_arrow.cpp index e4e0cf05ba2..3982cbdb6aa 100644 --- a/rel/d/a/d_a_arrow/d_a_arrow.cpp +++ b/rel/d/a/d_a_arrow/d_a_arrow.cpp @@ -5,301 +5,7 @@ #include "rel/d/a/d_a_arrow/d_a_arrow.h" #include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; - /* 80266F48 */ void normalizeZP(); - /* 80267150 */ void atan2sY_XZ() const; - /* 8049A334 */ ~cXyz(); -}; - -struct fopAcM_wt_c { - /* 8001DD84 */ void waterCheck(cXyz const*); - - static u8 mWaterCheck[84 + 4 /* padding */]; - static f32 mWaterY[1 + 1 /* padding */]; -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static u8 mGndCheck[84]; -}; - -struct daPy_actorKeep_c { - /* 8015EC48 */ void setActor(); - /* 8015ECB8 */ void setData(fopAc_ac_c*); - /* 8015ECFC */ void clearData(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 800842C0 */ void ChkAtHit(); - /* 80084318 */ void ResetAtHit(); - /* 800843A8 */ void GetAtHitGObj(); - /* 80084460 */ void ChkTgHit(); - /* 80084548 */ void GetTgHitGObj(); - /* 80084658 */ void ChkCoHit(); -}; - -struct daArrow_c { - /* 80499C6C */ void createHeap(); - /* 80499D8C */ void atHitCallBack(dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); - /* 80499FBC */ void decAlphaBlur(); - /* 8049A04C */ void setBlur(); - /* 8049A110 */ void setLightArrowHitMark(cXyz const*); - /* 8049A1EC */ void setLightChargeEffect(int); - /* 8049A370 */ void setArrowWaterNextPos(cXyz*, cXyz*); - /* 8049A76C */ void setArrowAt(f32); - /* 8049A9CC */ void arrowShooting(); - /* 8049AC84 */ void setBombArrowExplode(cXyz*); - /* 8049ACE0 */ void setRoomInfo(); - /* 8049AD74 */ void clearNearActorData(); - /* 8049AD94 */ void getVibAngle(); - /* 8049AE64 */ void setNormalMatrix(); - /* 8049AF18 */ void setSmokePos(); - /* 8049AFEC */ void setKeepMatrix(); - /* 8049B120 */ void setStopActorMatrix(); - /* 8049B214 */ void setBombMoveEffect(); - /* 8049B370 */ void checkReget(); - /* 8049B45C */ void procWait(); - /* 8049B764 */ void procMove(); - /* 8049C700 */ void procReturnInit(int); - /* 8049C874 */ void procReturn(); - /* 8049CB70 */ void procBGStop(); - /* 8049CC60 */ void procActorStop(); - /* 8049CCCC */ void procActorControllStop(); - /* 8049CCF0 */ void procSlingHitInit(cXyz*, dCcD_GObjInf*); - /* 8049CE50 */ void procSlingHit(); - /* 8049CEA0 */ void execute(); - /* 8049D0CC */ void draw(); - /* 8049D440 */ void create(); - /* 8049D98C */ ~daArrow_c(); -}; - -struct cBgS_PolyInfo {}; - -struct daAlink_c { - /* 8009D884 */ void getAlinkArcName(); - /* 800D1788 */ void notSwordHitVibActor(fopAc_ac_c*); - /* 800D6D94 */ void getFreezeR() const; - /* 800D6DA4 */ void getFreezeG() const; - /* 800D6DB4 */ void getFreezeB() const; - /* 800D7768 */ void checkIcePolygonDamage(cBgS_PolyInfo*); - /* 800DE64C */ void getArrowFlyData(f32*, f32*, int) const; - /* 800DE740 */ void getArrowIncAtR() const; - /* 800DE750 */ void getBombArrowFlyExplodeTime() const; - /* 800DE760 */ void getArrowIncAtMaxStart() const; - /* 800DE770 */ void getArrowIncAtMax() const; - /* 800DE884 */ void checkBowCameraArrowPosP(s16*, s16*); - /* 800E3760 */ void getBombExplodeTime() const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack { - /* 8049D808 */ void cleanup(); - /* 8049D80C */ ~dPa_levelEcallBack(); -}; - -struct dPa_hermiteEcallBack_c { - /* 8004F6B8 */ void setOldPosP(cXyz const*, cXyz const*); -}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B8B4 */ void forceOnEventMove(u32); - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - - static u8 mParticleTracePCB[4 + 4 /* padding */]; -}; - -struct dJntCol_c { - /* 80036AEC */ void getArrowOffsetPosAndAngle(cXyz const*, csXyz const*, cXyz*, cXyz*) const; - /* 80036FA8 */ void setArrowPosAndAngle(cXyz const*, cXyz const*, int, cXyz*, csXyz*); -}; - -struct cCcD_Obj {}; - -struct dCcMassS_Mng { - /* 80085D98 */ void Set(cCcD_Obj*, u8); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_SrcCps {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 8049D910 */ ~dCcD_GStts(); -}; - -struct dCcD_GAtTgCoCommonBase { - /* 80083688 */ void GetAc(); -}; - -struct dCcD_Cps { - /* 800847D0 */ void Set(dCcD_SrcCps const&); - /* 80084824 */ void CalcAtVec(); -}; - -struct dBgS_ObjLinChk { - /* 80077F5C */ dBgS_ObjLinChk(); - /* 80077FB8 */ ~dBgS_ObjLinChk(); -}; - -struct dBgS_LinChk { - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_ArrowLinChk { - /* 800781D8 */ dBgS_ArrowLinChk(); - /* 80078240 */ ~dBgS_ArrowLinChk(); -}; - -struct dBgS { - /* 80074ABC */ void ChkMoveBG(cBgS_PolyInfo const&); - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80074E50 */ void GetPolyAtt0(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); - /* 80075880 */ void MoveBgTransPos(cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); - /* 80075BF4 */ void ArrowStickCallBack(cBgS_PolyInfo const&, fopAc_ac_c*, cXyz&); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8049D880 */ ~cM3dGSph(); -}; - -struct cM3dGPla { - /* 8049C6B8 */ ~cM3dGPla(); -}; - -struct cM3dGCps { - /* 8026EF88 */ cM3dGCps(); - /* 8026EFA4 */ ~cM3dGCps(); - /* 8026F000 */ void Set(cXyz const&, cXyz const&, f32); -}; - -struct cM3dGAab { - /* 8049D8C8 */ ~cM3dGAab(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 8049DC00 */ ~cCcD_GStts(); -}; - -struct cBgS_LinChk {}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 80074660 */ void ChkPolySafe(cBgS_PolyInfo const&); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); -}; - -struct Z2SoundObjArrow { - /* 802BEB38 */ Z2SoundObjArrow(); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2DopplerSoundObjBase { - /* 802BE5FC */ ~Z2DopplerSoundObjBase(); -}; - -struct Z2CreatureLink { - /* 802C4814 */ void startHitItemSE(u32, u32, Z2SoundObjBase*, f32); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JPABaseEmitter {}; - -struct JPAEmitterCallBack { - /* 8027E6A4 */ ~JPAEmitterCallBack(); - /* 8049DC48 */ void execute(JPABaseEmitter*); - /* 8049DC4C */ void executeAfter(JPABaseEmitter*); - /* 8049DC50 */ void draw(JPABaseEmitter*); - /* 8049DC54 */ void drawAfter(JPABaseEmitter*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; +#include "d/com/d_com_inf_game.h" // // Forward References: @@ -474,15 +180,6 @@ extern "C" void __dt__21Z2DopplerSoundObjBaseFv(); extern "C" void __ct__15Z2SoundObjArrowFv(); extern "C" void startHitItemSE__14Z2CreatureLinkFUlUlP14Z2SoundObjBasef(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void PSVECScale(); -extern "C" void PSVECSquareMag(); -extern "C" void C_VECReflect(); -extern "C" void PSVECSquareDistance(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_24(); extern "C" void _savegpr_25(); @@ -497,7 +194,6 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__22dPa_hermiteEcallBack_c[9]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__8dCcD_Cps[36]; @@ -510,14 +206,8 @@ extern "C" extern void* __vt__15Z2SoundObjArrow[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mGndCheck__11fopAcM_gc_c[84]; extern "C" u8 mWaterCheck__11fopAcM_wt_c[84 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_max; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" extern u8 m_count__9daArrow_c[4]; extern "C" u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -728,7 +418,8 @@ asm void daArrow_c::setLightChargeEffect(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/d_a_arrow/d_a_arrow/__dt__4cXyzFv.s" } @@ -1345,7 +1036,8 @@ asm void daArrow_c::procMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGPla::~cM3dGPla() { +// asm cM3dGPla::~cM3dGPla() { +extern "C" asm void __dt__8cM3dGPlaFv() { nofralloc #include "asm/rel/d/a/d_a_arrow/d_a_arrow/__dt__8cM3dGPlaFv.s" } @@ -1583,7 +1275,8 @@ void dPa_levelEcallBack::cleanup() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dPa_levelEcallBack::~dPa_levelEcallBack() { +// asm dPa_levelEcallBack::~dPa_levelEcallBack() { +extern "C" asm void __dt__18dPa_levelEcallBackFv() { nofralloc #include "asm/rel/d/a/d_a_arrow/d_a_arrow/__dt__18dPa_levelEcallBackFv.s" } @@ -1593,7 +1286,8 @@ asm dPa_levelEcallBack::~dPa_levelEcallBack() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/d_a_arrow/d_a_arrow/__dt__8cM3dGSphFv.s" } @@ -1603,7 +1297,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/d_a_arrow/d_a_arrow/__dt__8cM3dGAabFv.s" } @@ -1613,7 +1308,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/d_a_arrow/d_a_arrow/__dt__10dCcD_GSttsFv.s" } @@ -1653,7 +1349,8 @@ static asm void daArrow_delete(daArrow_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/d_a_arrow/d_a_arrow/__dt__10cCcD_GSttsFv.s" } @@ -1661,7 +1358,8 @@ asm cCcD_GStts::~cCcD_GStts() { /* 8049DC48-8049DC4C 0040C8 0004+00 2/0 0/0 0/0 .text * execute__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) { +// void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) { +extern "C" void execute__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } diff --git a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp index 5bd6f439f4c..d9b6feef7d9 100644 --- a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp +++ b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp @@ -6,19 +6,12 @@ #include "rel/d/a/d_a_boomerang/d_a_boomerang.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" // // Types: // -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - struct daMirror_c { /* 8003194C */ void entry(J3DModel*); }; @@ -32,100 +25,6 @@ struct daBoomerang_HIO_c0 { static f32 const m_lockWindScale; }; -struct daAlink_c { - /* 8009D884 */ void getAlinkArcName(); - /* 800A9248 */ void simpleAnmPlay(J3DAnmBase*); - /* 800B26FC */ void itemActionTrigger(); - /* 800DFFE0 */ void checkBoomerangLockAccept(); - /* 800E0010 */ void getBoomSpeed(); - /* 800E00B0 */ void getBoomCatchSpeed() const; - /* 800E00C0 */ void getBoomFlyMax() const; - /* 800E011C */ void getBoomLockMax(); - /* 800E0190 */ void getBoomBgThroughTime() const; - /* 800E08C4 */ void returnBoomerang(int); -}; - -struct dPa_levelEcallBack {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80074DAC */ void GetUnderwaterRoofCode(cBgS_PolyInfo const&); - /* 80074E50 */ void GetPolyAtt0(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct cCcD_Obj {}; - -struct dCcMassS_Mng { - /* 80085D98 */ void Set(cCcD_Obj*, u8); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_SrcCps {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 804A262C */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084318 */ void ResetAtHit(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dCcD_Cps { - /* 800847D0 */ void Set(dCcD_SrcCps const&); - /* 80084824 */ void CalcAtVec(); -}; - -struct cM3dGCps { - /* 8026EF88 */ cM3dGCps(); - /* 8026EFA4 */ ~cM3dGCps(); - /* 8026F000 */ void Set(cXyz const&, cXyz const&, f32); -}; - -struct cM3dGAab { - /* 804A25E4 */ ~cM3dGAab(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 804A271C */ ~cCcD_GStts(); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct J2DAnmLoaderDataBase { - /* 80308A6C */ void load(void const*); -}; - // // Forward References: // @@ -341,7 +240,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" extern void* __vt__16Z2SoundObjSimple[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mRoofCheck__11fopAcM_rc_c[80]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" f32 mRoofY__11fopAcM_rc_c; @@ -1591,7 +1489,8 @@ extern "C" asm void __dt__8cM3dGCylFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/d_a_boomerang/d_a_boomerang/__dt__8cM3dGAabFv.s" } @@ -1601,7 +1500,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/d_a_boomerang/d_a_boomerang/__dt__10dCcD_GSttsFv.s" } @@ -1638,7 +1538,8 @@ void draw__12dDlst_base_cFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/d_a_boomerang/d_a_boomerang/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/d_a_canoe/d_a_canoe.cpp b/rel/d/a/d_a_canoe/d_a_canoe.cpp index 7fa03a02177..69dc9952a30 100644 --- a/rel/d/a/d_a_canoe/d_a_canoe.cpp +++ b/rel/d/a/d_a_canoe/d_a_canoe.cpp @@ -5,287 +5,20 @@ #include "rel/d/a/d_a_canoe/d_a_canoe.h" #include "dol2asm.h" -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" // // Types: // -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; - /* 80267128 */ void atan2sX_Z() const; - /* 80267150 */ void atan2sY_XZ() const; - /* 804DA5B8 */ ~cXyz(); - - static f32 Zero[3]; -}; - -struct fopAcM_wt_c { - /* 8001DD84 */ void waterCheck(cXyz const*); - - static u8 mWaterCheck[84 + 4 /* padding */]; - static f32 mWaterY[1 + 1 /* padding */]; -}; - struct daTagWaterFall_c { /* 80D64768 */ void checkHitWaterFall(cXyz); }; -struct daPy_py_c { - /* 8015EA20 */ void checkFishingRodItem(int); -}; - struct daObjGOMIKABE_c { /* 80BFE52C */ void BreakSet(); }; -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct daCanoe_c { - /* 804DA5F4 */ void createHeap(); - /* 804DA740 */ void create(); - /* 804DAEA8 */ ~daCanoe_c(); - /* 804DB008 */ void setRoomInfo(); - /* 804DB0B0 */ void setMatrix(); - /* 804DB3F4 */ void setCollision(); - /* 804DB578 */ void posMove(); - /* 804DB754 */ void checkGomikabe(cBgS_PolyInfo&); - /* 804DB7AC */ void setFrontBackPos(); - /* 804DB828 */ void frontBackBgCheck(); - /* 804DC330 */ void setPaddleEffect(); - /* 804DC554 */ void setCanoeSliderEffect(); - /* 804DC7B4 */ void execute(); - /* 804DD35C */ void draw(); -}; - -struct daAlink_c { - /* 800A21E0 */ void getMoveBGActorName(cBgS_PolyInfo&, int); - /* 800F3BB0 */ void getCanoeMaxSpeed() const; - /* 800F3BDC */ void getCanoeBackMaxSpeed() const; - /* 800F3BEC */ void getCanoeCres() const; - /* 800F3C44 */ void getCanoeMaxRotSpeed() const; - /* 800F3CCC */ void getCanoeLocalPaddleTop(); - /* 800F3DFC */ void getCanoePaddleMatrix(); - /* 800F3EB8 */ void checkCanoePaddleGrab(fopAc_ac_c*) const; -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004C838 */ void setWaterRipple(u32*, cBgS_PolyInfo&, cXyz const*, f32, dKy_tevstr_c const*, - cXyz const*, s8); - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dMeter2Info_c { - /* 8021E268 */ void setMiniGameCount(s8); -}; - -struct J3DModel {}; - -struct dDlst_shadowControl_c { - /* 80055F1C */ void addReal(u32, J3DModel*); - - static u8 mSimpleTexObj[32]; -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 804DAE2C */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084658 */ void ChkCoHit(); -}; - -struct dCcD_GAtTgCoCommonBase { - /* 80083688 */ void GetAc(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); - /* 804DAB18 */ ~dCcD_Cyl(); - /* 804DABE4 */ dCcD_Cyl(); -}; - -struct dBgS_PolyPassChk { - /* 80078E98 */ void SetLink(); -}; - -struct dBgS_LinkLinChk { - /* 80078030 */ dBgS_LinkLinChk(); - /* 8007808C */ ~dBgS_LinkLinChk(); -}; - -struct dBgS_LinkAcch { - /* 804DACF8 */ ~dBgS_LinkAcch(); - /* 804DAD68 */ dBgS_LinkAcch(); -}; - -struct dBgS_LinChk { - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 804DADBC */ ~dBgS_AcchCir(); -}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076288 */ void Set(fopAc_ac_c*, int, dBgS_AcchCir*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGPla { - /* 804DC2E8 */ ~cM3dGPla(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 804DAC68 */ ~cM3dGCyl(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 804DACB0 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_Stts { - /* 8026395C */ void ClrCcMove(); -}; - -struct cCcD_ObjCo { - /* 8026491C */ void SetVsGrp(u32); -}; - -struct cCcD_GStts { - /* 804DD574 */ ~cCcD_GStts(); -}; - -struct cBgS_LinChk {}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 80074618 */ void GetActorPointer(int) const; - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct _GXTexObj {}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDF48 */ ~Z2SoundObjBase(); - /* 802BDFF8 */ void deleteObject(); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; - // // Forward References: // @@ -419,13 +152,6 @@ extern "C" void __dt__14Z2SoundObjBaseFv(); extern "C" void deleteObject__14Z2SoundObjBaseFv(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSubtract(); -extern "C" void PSVECScale(); -extern "C" void PSVECSquareMag(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void __cvt_fp2unsigned(); @@ -443,10 +169,7 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void abs(); -extern "C" void strcmp(); extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -456,16 +179,10 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" extern void* __vt__16Z2SoundObjSimple[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mWaterCheck__11fopAcM_wt_c[84 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; extern "C" f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); extern "C" void BreakSet__15daObjGOMIKABE_cFv(); @@ -490,7 +207,8 @@ static asm void daCanoe_searchTagWaterFall(fopAc_ac_c* param_0, void* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/d_a_canoe/d_a_canoe/__dt__4cXyzFv.s" } @@ -744,7 +462,8 @@ SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::~dCcD_Cyl() { +// asm dCcD_Cyl::~dCcD_Cyl() { +extern "C" asm void __dt__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/d_a_canoe/d_a_canoe/__dt__8dCcD_CylFv.s" } @@ -754,7 +473,8 @@ asm dCcD_Cyl::~dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::dCcD_Cyl() { +// asm dCcD_Cyl::dCcD_Cyl() { +extern "C" asm void __ct__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/d_a_canoe/d_a_canoe/__ct__8dCcD_CylFv.s" } @@ -764,7 +484,8 @@ asm dCcD_Cyl::dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/d_a_canoe/d_a_canoe/__dt__8cM3dGCylFv.s" } @@ -774,7 +495,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/d_a_canoe/d_a_canoe/__dt__8cM3dGAabFv.s" } @@ -784,7 +506,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_LinkAcch::~dBgS_LinkAcch() { +// asm dBgS_LinkAcch::~dBgS_LinkAcch() { +extern "C" asm void __dt__13dBgS_LinkAcchFv() { nofralloc #include "asm/rel/d/a/d_a_canoe/d_a_canoe/__dt__13dBgS_LinkAcchFv.s" } @@ -794,7 +517,8 @@ asm dBgS_LinkAcch::~dBgS_LinkAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_LinkAcch::dBgS_LinkAcch() { +// asm dBgS_LinkAcch::dBgS_LinkAcch() { +extern "C" asm void __ct__13dBgS_LinkAcchFv() { nofralloc #include "asm/rel/d/a/d_a_canoe/d_a_canoe/__ct__13dBgS_LinkAcchFv.s" } @@ -804,7 +528,8 @@ asm dBgS_LinkAcch::dBgS_LinkAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/d_a_canoe/d_a_canoe/__dt__12dBgS_AcchCirFv.s" } @@ -814,7 +539,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/d_a_canoe/d_a_canoe/__dt__10dCcD_GSttsFv.s" } @@ -1119,7 +845,8 @@ asm void daCanoe_c::frontBackBgCheck() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGPla::~cM3dGPla() { +// asm cM3dGPla::~cM3dGPla() { +extern "C" asm void __dt__8cM3dGPlaFv() { nofralloc #include "asm/rel/d/a/d_a_canoe/d_a_canoe/__dt__8cM3dGPlaFv.s" } @@ -1414,7 +1141,8 @@ static asm void daCanoe_Draw(daCanoe_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/d_a_canoe/d_a_canoe/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/d_a_cstatue/d_a_cstatue.cpp b/rel/d/a/d_a_cstatue/d_a_cstatue.cpp index 1aea9a75b4f..67f19db567b 100644 --- a/rel/d/a/d_a_cstatue/d_a_cstatue.cpp +++ b/rel/d/a/d_a_cstatue/d_a_cstatue.cpp @@ -5,345 +5,7 @@ #include "rel/d/a/d_a_cstatue/d_a_cstatue.h" #include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); - - static u8 Zero[4]; -}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; - /* 80267128 */ void atan2sX_Z() const; - /* 80663B34 */ ~cXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct mDoExt_morf_c { - /* 8000FB7C */ void setMorf(f32); -}; - -struct J3DModel {}; - -struct mDoExt_invisibleModel { - /* 8000E53C */ void create(J3DModel*, u8); - /* 8000E7C0 */ void entryDL(cXyz*); -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0420 */ ~Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); - /* 800110B0 */ void play(u32, s8); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct fopAcM_lc_c { - /* 8001DC68 */ void lineCheck(cXyz const*, cXyz const*, fopAc_ac_c const*); - - static u8 mLineCheck[112]; -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static u8 mGndCheck[84]; - static f32 mGroundY; -}; - -struct daPy_actorKeep_c { - /* 8015ECFC */ void clearData(); -}; - -struct daCstatue_c { - /* 806636AC */ void atHitCallback(fopAc_ac_c*); - /* 806636EC */ void createHeap(); - /* 80663D28 */ void create(); - /* 80664840 */ ~daCstatue_c(); - /* 80664AA0 */ void setRoomInfo(); - /* 80664B38 */ void setMatrix(); - /* 80664C9C */ void posMove(); - /* 8066555C */ void setCollision(); - /* 80665E14 */ void checkHammerReverse(); - /* 80665F80 */ void setDemo(); - /* 80666390 */ void setAnime(); - /* 80666B80 */ void initBrk(u16); - /* 80666BF8 */ void initStopBrkBtk(); - /* 80666C38 */ void initStartBrkBtk(); - /* 80666DE8 */ void execute(); - /* 80667438 */ void draw(); - - static u8 const m_bckIdxTable[70 + 2 /* padding */]; -}; - -struct daAlink_c { - /* 800E1330 */ void getCopyRodBallDisMax() const; - /* 800E1374 */ void getCopyRodControllActor(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dTres_c { - /* 8009C3CC */ void setPosition(int, u8, Vec const*, int); -}; - -struct dSv_memBit_c { - /* 800347A0 */ void onTbox(int); - /* 800347C4 */ void offTbox(int); - /* 800347E8 */ void isTbox(int) const; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_c { - /* 8003498C */ void onEventBit(u16); -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS { - /* 80074B40 */ void ChkMoveBG_NoDABg(cBgS_PolyInfo const&); - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80074E00 */ void GetWallCode(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80664768 */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076288 */ void Set(fopAc_ac_c*, int, dBgS_AcchCir*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct dPaPo_c { - /* 80050C9C */ void init(dBgS_Acch*, f32, f32); - /* 80051008 */ void setEffectCenter(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*, - csXyz const*, cXyz const*, s8, f32, f32); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_SrcCyl {}; - -struct dCcD_SrcCps {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); - /* 80084AC4 */ void MoveCAt(cXyz&); - /* 80663B70 */ ~dCcD_Sph(); - /* 80663C3C */ dCcD_Sph(); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 8066469C */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084318 */ void ResetAtHit(); - /* 80084460 */ void ChkTgHit(); - /* 800844B8 */ void ResetTgHit(); - /* 80084548 */ void GetTgHitGObj(); - /* 8008457C */ void GetTgHitObjSe(); - /* 800845B0 */ void getHitSeID(u8, int); - /* 800846B0 */ void ResetCoHit(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); - /* 80084908 */ void StartCAt(cXyz&); - /* 80084954 */ void MoveCAt(cXyz&); -}; - -struct dCcD_Cps { - /* 800847D0 */ void Set(dCcD_SrcCps const&); -}; - -struct dCamera_c { - /* 801614AC */ void Start(); - /* 801614D0 */ void Stop(); - /* 8016300C */ void SetTrimSize(s32); - /* 80180AA8 */ void Set(cXyz, cXyz); -}; - -struct dBgS_StatueAcch { - /* 806646F8 */ ~dBgS_StatueAcch(); -}; - -struct dBgS_PolyPassChk { - /* 80078F7C */ void SetStatue(); -}; - -struct cM3dGSph { - /* 8026F708 */ void SetR(f32); - /* 80663CC0 */ ~cM3dGSph(); -}; - -struct cM3dGPla { - /* 80665514 */ ~cM3dGPla(); -}; - -struct cM3dGLin { - /* 8026F2E8 */ void SetStartEnd(cXyz const&, cXyz const&); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80663AA4 */ ~cM3dGCyl(); -}; - -struct cM3dGCps { - /* 8026EF88 */ cM3dGCps(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80663AEC */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_Stts { - /* 8026395C */ void ClrCcMove(); -}; - -struct cCcD_GStts { - /* 80667630 */ ~cCcD_GStts(); -}; - -struct cBgS { - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct _GXTexObj {}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 8032842C */ void checkPass(f32); - /* 806647D8 */ ~J3DFrameCtrl(); -}; +#include "d/com/d_com_inf_game.h" // // Forward References: @@ -506,11 +168,6 @@ extern "C" void* __nwa__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); extern "C" void checkPass__12J3DFrameCtrlFf(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECSquareDistance(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void __construct_new_array(); @@ -525,7 +182,6 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__8dCcD_Cps[36]; @@ -538,13 +194,9 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mLineCheck__11fopAcM_lc_c[112]; extern "C" u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 Zero__5csXyz[4]; extern "C" void __register_global_object(); @@ -872,7 +524,8 @@ asm void daCstatue_c::createHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/d_a_cstatue/d_a_cstatue/__dt__8cM3dGCylFv.s" } @@ -882,7 +535,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/d_a_cstatue/d_a_cstatue/__dt__8cM3dGAabFv.s" } @@ -892,7 +546,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/d_a_cstatue/d_a_cstatue/__dt__4cXyzFv.s" } @@ -902,7 +557,8 @@ asm cXyz::~cXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Sph::~dCcD_Sph() { +// asm dCcD_Sph::~dCcD_Sph() { +extern "C" asm void __dt__8dCcD_SphFv() { nofralloc #include "asm/rel/d/a/d_a_cstatue/d_a_cstatue/__dt__8dCcD_SphFv.s" } @@ -912,7 +568,8 @@ asm dCcD_Sph::~dCcD_Sph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Sph::dCcD_Sph() { +// asm dCcD_Sph::dCcD_Sph() { +extern "C" asm void __ct__8dCcD_SphFv() { nofralloc #include "asm/rel/d/a/d_a_cstatue/d_a_cstatue/__ct__8dCcD_SphFv.s" } @@ -922,7 +579,8 @@ asm dCcD_Sph::dCcD_Sph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +// asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { nofralloc #include "asm/rel/d/a/d_a_cstatue/d_a_cstatue/__dt__8cM3dGSphFv.s" } @@ -1179,7 +837,8 @@ asm void daCstatue_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/d_a_cstatue/d_a_cstatue/__dt__10dCcD_GSttsFv.s" } @@ -1189,7 +848,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_StatueAcch::~dBgS_StatueAcch() { +// asm dBgS_StatueAcch::~dBgS_StatueAcch() { +extern "C" asm void __dt__15dBgS_StatueAcchFv() { nofralloc #include "asm/rel/d/a/d_a_cstatue/d_a_cstatue/__dt__15dBgS_StatueAcchFv.s" } @@ -1199,7 +859,8 @@ asm dBgS_StatueAcch::~dBgS_StatueAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/d_a_cstatue/d_a_cstatue/__dt__12dBgS_AcchCirFv.s" } @@ -1209,7 +870,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/d_a_cstatue/d_a_cstatue/__dt__12J3DFrameCtrlFv.s" } @@ -1440,7 +1102,8 @@ asm void daCstatue_c::posMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGPla::~cM3dGPla() { +// asm cM3dGPla::~cM3dGPla() { +extern "C" asm void __dt__8cM3dGPlaFv() { nofralloc #include "asm/rel/d/a/d_a_cstatue/d_a_cstatue/__dt__8cM3dGPlaFv.s" } @@ -1932,7 +1595,8 @@ static asm void daCstatue_Draw(daCstatue_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/d_a_cstatue/d_a_cstatue/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp b/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp index 52d84c3bf43..2c72f1d3053 100644 --- a/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp +++ b/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_mg_rod // -#include "rel/d/a/d_a_mg_rod/d_a_mg_rod.h" +// #include "rel/d/a/d_a_mg_rod/d_a_mg_rod.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp b/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp index 2df64f0e079..f4f6f80eec4 100644 --- a/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp +++ b/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp @@ -85,7 +85,7 @@ static int daScex_Create(fopAc_ac_c* ac) { daScex_c* scex = static_cast(ac); mDoMtx_stack_c::transS(scex->current.pos.x, scex->current.pos.y, scex->current.pos.z); - mDoMtx_stack_c::YrotM(scex->mCollisionRot.y); + mDoMtx_stack_c::YrotM(scex->shape_angle.y); PSMTXInverse(mDoMtx_stack_c::get(), scex->mMatrix); scex->mScale.x *= 75.0f; scex->mScale.z *= 75.0f; @@ -145,25 +145,25 @@ COMPILER_STRIP_GATE(0x80485CA8, &lit_3842); // regalloc #ifdef NONMATCHING int daScex_c::execute() { - Vec spC; daPy_py_c* player = daPy_getPlayerActorClass(); + cXyz spC; if (checkWork()) { - PSMTXMultVec(mMatrix, &player->current.pos, &spC); + mDoMtx_multVec(mMatrix, &player->current.pos, &spC); if (spC.y >= 0.0f && spC.y <= mScale.y && fabsf(spC.x) <= mScale.x && fabsf(spC.z) <= mScale.z) { switch (getArg1()) { case 0xFF: case 1: - player->onSceneChangeArea(getArg0(), ((fopAcM_GetParam(this) >> 0x10) & 0xFF), this); + player->onSceneChangeArea(getArg0(), getPathID(), this); break; case 2: case 0: - player->onSceneChangeAreaJump(getArg0(), ((fopAcM_GetParam(this) >> 0x10) & 0xFF), this); + player->onSceneChangeAreaJump(getArg0(), getPathID(), this); break; case 3: case 4: - player->onSceneChangeAreaJump(getArg0(), ((fopAcM_GetParam(this) >> 0x10) & 0xFF), this); + player->onSceneChangeAreaJump(getArg0(), getPathID(), this); break; } } diff --git a/rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp b/rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp index 14d674bc4e0..7883e680c25 100644 --- a/rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp +++ b/rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp @@ -1,73 +1,16 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_skip_2D -// +/** + * d_a_skip2D.cpp + * + */ #include "rel/d/a/d_a_skip_2D/d_a_skip_2D.h" #include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daSkip2D_c { - /* 80D4D498 */ void createHeap(); - /* 80D4D4F4 */ void create(); - /* 80D4D588 */ bool destroy(); - /* 80D4D590 */ void draw(); - /* 80D4D5D0 */ bool execute(); - /* 80D4D5D8 */ void initiate(); - /* 80D4D674 */ ~daSkip2D_c(); -}; - -struct dMeterButton_c { - /* 80201328 */ dMeterButton_c(); -}; - -struct dDlst_base_c {}; - -struct dDlst_list_c { - /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); -}; - -// -// Forward References: -// - -extern "C" static void daSkip2D_createHeap__FP10fopAc_ac_c(); -extern "C" void createHeap__10daSkip2D_cFv(); -extern "C" void create__10daSkip2D_cFv(); -extern "C" bool destroy__10daSkip2D_cFv(); -extern "C" void draw__10daSkip2D_cFv(); -extern "C" bool execute__10daSkip2D_cFv(); -extern "C" void initiate__10daSkip2D_cFv(); -extern "C" static void daSkip2D_Create__FPv(); -extern "C" static void daSkip2D_Delete__FPv(); -extern "C" static void daSkip2D_Execute__FPv(); -extern "C" static void daSkip2D_Draw__FPv(); -extern "C" static bool daSkip2D_IsDelete__FPv(); -extern "C" void __dt__10daSkip2D_cFv(); // // External References: // -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c(); -extern "C" void __ct__14dMeterButton_cFv(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; // // Declarations: @@ -75,33 +18,91 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; /* 80D4D478-80D4D498 000078 0020+00 1/1 0/0 0/0 .text daSkip2D_createHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSkip2D_createHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_createHeap__FP10fopAc_ac_c.s" +static int daSkip2D_createHeap(fopAc_ac_c* i_this) { + return static_cast(i_this)->createHeap(); } -#pragma pop /* 80D4D498-80D4D4F4 000098 005C+00 1/1 0/0 0/0 .text createHeap__10daSkip2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSkip2D_c::createHeap() { - nofralloc -#include "asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/createHeap__10daSkip2D_cFv.s" +int daSkip2D_c::createHeap() { + mpButton = new dMeterButton_c(); + + if (mpButton == NULL) { + return 0; + } + + return 1; +} + +/* 80D4D4F4-80D4D588 0000F4 0094+00 1/1 0/0 0/0 .text create__10daSkip2D_cFv */ +int daSkip2D_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daSkip2D_c(); + fopAcM_OnCondition(this, 8); + } + + if (!fopAcM_entrySolidHeap(this, daSkip2D_createHeap, 0)) { + return cPhs_ERROR_e; + } + + return cPhs_COMPLEATE_e; +} + +/* 80D4D588-80D4D590 000188 0008+00 1/1 0/0 0/0 .text destroy__10daSkip2D_cFv */ +int daSkip2D_c::destroy() { + return 1; +} + +/* 80D4D590-80D4D5D0 000190 0040+00 1/1 0/0 0/0 .text draw__10daSkip2D_cFv */ +int daSkip2D_c::draw() { + dComIfGd_set2DOpaTop((dDlst_base_c*)&mpButton); // ??? + return 1; +} + +/* 80D4D5D0-80D4D5D8 0001D0 0008+00 1/1 0/0 0/0 .text execute__10daSkip2D_cFv */ +int daSkip2D_c::execute() { + return 1; +} + +/* 80D4D5D8-80D4D5EC 0001D8 0014+00 1/1 0/0 0/0 .text initiate__10daSkip2D_cFv */ +void daSkip2D_c::initiate() { + field_0x56c = 0; + mpButton = NULL; + field_0x574 = 0; +} + +/* 80D4D5EC-80D4D60C 0001EC 0020+00 1/0 0/0 0/0 .text daSkip2D_Create__FPv */ +static int daSkip2D_Create(void* i_this) { + return static_cast(i_this)->create(); +} + +/* 80D4D60C-80D4D62C 00020C 0020+00 1/0 0/0 0/0 .text daSkip2D_Delete__FPv */ +static int daSkip2D_Delete(void* i_this) { + return static_cast(i_this)->destroy(); +} + +/* 80D4D62C-80D4D64C 00022C 0020+00 1/0 0/0 0/0 .text daSkip2D_Execute__FPv */ +static int daSkip2D_Execute(void* i_this) { + return static_cast(i_this)->execute(); +} + +/* 80D4D64C-80D4D66C 00024C 0020+00 1/0 0/0 0/0 .text daSkip2D_Draw__FPv */ +static int daSkip2D_Draw(void* i_this) { + return static_cast(i_this)->draw(); +} + +/* 80D4D66C-80D4D674 00026C 0008+00 1/0 0/0 0/0 .text daSkip2D_IsDelete__FPv */ +static int daSkip2D_IsDelete(void*) { + return 1; } -#pragma pop /* ############################################################################################## */ /* 80D4D6DC-80D4D6FC -00001 0020+00 1/0 0/0 0/0 .data daSkip2D_MethodTable */ SECTION_DATA static void* daSkip2D_MethodTable[8] = { - (void*)daSkip2D_Create__FPv, - (void*)daSkip2D_Delete__FPv, - (void*)daSkip2D_Execute__FPv, - (void*)daSkip2D_IsDelete__FPv, - (void*)daSkip2D_Draw__FPv, + (void*)daSkip2D_Create, + (void*)daSkip2D_Delete, + (void*)daSkip2D_Execute, + (void*)daSkip2D_IsDelete, + (void*)daSkip2D_Draw, (void*)NULL, (void*)NULL, (void*)NULL, @@ -115,106 +116,4 @@ SECTION_DATA extern void* g_profile_SKIP2D[12] = { (void*)NULL, (void*)&g_fopAc_Method, (void*)0x03040000, (void*)&daSkip2D_MethodTable, (void*)0x00040000, (void*)NULL, -}; - -/* 80D4D72C-80D4D738 000050 000C+00 2/2 0/0 0/0 .data __vt__10daSkip2D_c */ -SECTION_DATA extern void* __vt__10daSkip2D_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10daSkip2D_cFv, -}; - -/* 80D4D4F4-80D4D588 0000F4 0094+00 1/1 0/0 0/0 .text create__10daSkip2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSkip2D_c::create() { - nofralloc -#include "asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/create__10daSkip2D_cFv.s" -} -#pragma pop - -/* 80D4D588-80D4D590 000188 0008+00 1/1 0/0 0/0 .text destroy__10daSkip2D_cFv */ -bool daSkip2D_c::destroy() { - return true; -} - -/* 80D4D590-80D4D5D0 000190 0040+00 1/1 0/0 0/0 .text draw__10daSkip2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSkip2D_c::draw() { - nofralloc -#include "asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/draw__10daSkip2D_cFv.s" -} -#pragma pop - -/* 80D4D5D0-80D4D5D8 0001D0 0008+00 1/1 0/0 0/0 .text execute__10daSkip2D_cFv */ -bool daSkip2D_c::execute() { - return true; -} - -/* 80D4D5D8-80D4D5EC 0001D8 0014+00 1/1 0/0 0/0 .text initiate__10daSkip2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSkip2D_c::initiate() { - nofralloc -#include "asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/initiate__10daSkip2D_cFv.s" -} -#pragma pop - -/* 80D4D5EC-80D4D60C 0001EC 0020+00 1/0 0/0 0/0 .text daSkip2D_Create__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSkip2D_Create(void* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Create__FPv.s" -} -#pragma pop - -/* 80D4D60C-80D4D62C 00020C 0020+00 1/0 0/0 0/0 .text daSkip2D_Delete__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSkip2D_Delete(void* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Delete__FPv.s" -} -#pragma pop - -/* 80D4D62C-80D4D64C 00022C 0020+00 1/0 0/0 0/0 .text daSkip2D_Execute__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSkip2D_Execute(void* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Execute__FPv.s" -} -#pragma pop - -/* 80D4D64C-80D4D66C 00024C 0020+00 1/0 0/0 0/0 .text daSkip2D_Draw__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSkip2D_Draw(void* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/daSkip2D_Draw__FPv.s" -} -#pragma pop - -/* 80D4D66C-80D4D674 00026C 0008+00 1/0 0/0 0/0 .text daSkip2D_IsDelete__FPv */ -static bool daSkip2D_IsDelete(void* param_0) { - return true; -} - -/* 80D4D674-80D4D6D4 000274 0060+00 1/0 0/0 0/0 .text __dt__10daSkip2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daSkip2D_c::~daSkip2D_c() { - nofralloc -#include "asm/rel/d/a/d_a_skip_2D/d_a_skip_2D/__dt__10daSkip2D_cFv.s" -} -#pragma pop +}; \ No newline at end of file diff --git a/rel/d/a/d_a_swc00/d_a_swc00.cpp b/rel/d/a/d_a_swc00/d_a_swc00.cpp index 4c32ca25a01..f372879ee65 100644 --- a/rel/d/a/d_a_swc00/d_a_swc00.cpp +++ b/rel/d/a/d_a_swc00/d_a_swc00.cpp @@ -76,7 +76,7 @@ SECTION_RODATA static f32 const lit_3708 = -100.0f; COMPILER_STRIP_GATE(0x805A1D94, &lit_3708); inline u8 daSwc00_getCondition(daSwc00_c* i_this) { - return i_this->mCollisionRot.x; + return i_this->shape_angle.x; } inline int daSwc00_getShape(daSwc00_c* i_this) { diff --git a/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp b/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp index 34faa9a8ff4..958b1ff6265 100644 --- a/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp +++ b/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp @@ -521,8 +521,8 @@ static int daNPC_TR_Execute(npc_tr_class* npc_tr) { action(npc_tr); mDoMtx_stack_c::transS(npc_tr->current.pos.x, npc_tr->current.pos.y, npc_tr->current.pos.z); - mDoMtx_stack_c::YrotM(npc_tr->mCollisionRot.y + npc_tr->field_0x5f0); - mDoMtx_stack_c::XrotM(npc_tr->mCollisionRot.x); + mDoMtx_stack_c::YrotM(npc_tr->shape_angle.y + npc_tr->field_0x5f0); + mDoMtx_stack_c::XrotM(npc_tr->shape_angle.x); f32 scale = npc_tr->mScale.x * l_HIO.field_0x8; mDoMtx_stack_c::scaleM(scale, scale, scale); diff --git a/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp b/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp index 21f24d9b9d2..6b9e900c689 100644 --- a/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp +++ b/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp @@ -753,7 +753,7 @@ void daTagTWGate_c::executeDemoFilone3() { if (old_5e1 == 43) { daPy_py_c* player = daPy_getPlayerActorClass(); - csXyz sxyz(0, player->mCollisionRot.y + 0x8000, 0); + csXyz sxyz(0, player->shape_angle.y + 0x8000, 0); mDoMtx_stack_c::transS(player->current.pos); mDoMtx_stack_c::YrotM(sxyz.y); @@ -1013,9 +1013,9 @@ void daTagTWGate_c::initBaseMtx() { mCullMtx = mpMorf->getModel()->getBaseTRMtx(); fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); - mCollisionRot.y = player->mCollisionRot.y + 0x8000; + shape_angle.y = player->shape_angle.y + 0x8000; mDoMtx_stack_c::transS(player->current.pos); - mDoMtx_stack_c::YrotM(mCollisionRot.y); + mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::transM(0.0f, 250.0f, -840.0f); current.pos.x = mDoMtx_stack_c::get()[0][3]; diff --git a/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp b/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp index 88e30b81edb..bfc6a3cb369 100644 --- a/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp +++ b/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp @@ -1,150 +1,104 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_tag_hinit -// +/** + * d_a_tag_hinit.cpp + * + */ #include "rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daTagHinit_c { - /* 805A3758 */ void create(); - /* 805A3820 */ ~daTagHinit_c(); - /* 805A389C */ void execute(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; +#include "rel/d/a/d_a_horse/d_a_horse.h" // // Forward References: // -extern "C" void create__12daTagHinit_cFv(); -extern "C" static void daTagHinit_Create__FP10fopAc_ac_c(); -extern "C" void __dt__12daTagHinit_cFv(); -extern "C" static void daTagHinit_Delete__FP12daTagHinit_c(); -extern "C" void execute__12daTagHinit_cFv(); -extern "C" static void daTagHinit_Execute__FP12daTagHinit_c(); -extern "C" static bool daTagHinit_Draw__FP12daTagHinit_c(); extern "C" extern void* g_profile_Tag_Hinit[12]; // // External References: // -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void __dl__FPv(); -extern "C" void __ptmf_scall(); extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; // // Declarations: // /* 805A3758-805A3800 000078 00A8+00 1/1 0/0 0/0 .text create__12daTagHinit_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagHinit_c::create() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/create__12daTagHinit_cFv.s" +int daTagHinit_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daTagHinit_c(); + fopAcM_OnCondition(this, 8); + } + + field_0x569 = shape_angle.x; + + if (field_0x569 != 0xFF && i_fopAcM_isSwitch(this, field_0x569)) { + return cPhs_ERROR_e; + } + + field_0x568 = (shape_angle.x >> 8) & 0xFF; + field_0x56c = fopAcM_GetParam(this); + field_0x56e = (fopAcM_GetParam(this) >> 0x10); + + return cPhs_COMPLEATE_e; } -#pragma pop /* 805A3800-805A3820 000120 0020+00 1/0 0/0 0/0 .text daTagHinit_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagHinit_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/daTagHinit_Create__FP10fopAc_ac_c.s" +static int daTagHinit_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 805A3820-805A3874 000140 0054+00 1/1 0/0 0/0 .text __dt__12daTagHinit_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daTagHinit_c::~daTagHinit_c() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/__dt__12daTagHinit_cFv.s" -} -#pragma pop +daTagHinit_c::~daTagHinit_c() {} /* 805A3874-805A389C 000194 0028+00 1/0 0/0 0/0 .text daTagHinit_Delete__FP12daTagHinit_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagHinit_Delete(daTagHinit_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/daTagHinit_Delete__FP12daTagHinit_c.s" +static int daTagHinit_Delete(daTagHinit_c* i_this) { + i_this->~daTagHinit_c(); + return 1; } -#pragma pop /* 805A389C-805A39B8 0001BC 011C+00 1/1 0/0 0/0 .text execute__12daTagHinit_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagHinit_c::execute() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/execute__12daTagHinit_cFv.s" +int daTagHinit_c::execute() { + if ((field_0x56c == 0xFFFF || + i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x56c])) && + (field_0x56e == 0xFFFF || + !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x56e])) && + (field_0x568 == 0xFF || i_fopAcM_isSwitch(this, field_0x568))) { + if (field_0x569 != 0xFF) { + i_fopAcM_onSwitch(this, field_0x569); + } + + daHorse_c* horse = i_dComIfGp_getHorseActor(); + horse->i_setHorsePosAndAngle(¤t.pos, shape_angle.y); + horse->offNoDrawWait(); + fopAcM_delete(this); + } + + return 1; } -#pragma pop /* 805A39B8-805A39D8 0002D8 0020+00 1/0 0/0 0/0 .text daTagHinit_Execute__FP12daTagHinit_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagHinit_Execute(daTagHinit_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit/daTagHinit_Execute__FP12daTagHinit_c.s" +static int daTagHinit_Execute(daTagHinit_c* i_this) { + return i_this->execute(); } -#pragma pop /* 805A39D8-805A39E0 0002F8 0008+00 1/0 0/0 0/0 .text daTagHinit_Draw__FP12daTagHinit_c */ -static bool daTagHinit_Draw(daTagHinit_c* param_0) { - return true; +static int daTagHinit_Draw(daTagHinit_c*) { + return 1; } /* ############################################################################################## */ /* 805A39E8-805A3A08 -00001 0020+00 1/0 0/0 0/0 .data l_daTagHinit_Method */ SECTION_DATA static void* l_daTagHinit_Method[8] = { - (void*)daTagHinit_Create__FP10fopAc_ac_c, - (void*)daTagHinit_Delete__FP12daTagHinit_c, - (void*)daTagHinit_Execute__FP12daTagHinit_c, + (void*)daTagHinit_Create, + (void*)daTagHinit_Delete, + (void*)daTagHinit_Execute, (void*)NULL, - (void*)daTagHinit_Draw__FP12daTagHinit_c, + (void*)daTagHinit_Draw, (void*)NULL, (void*)NULL, (void*)NULL, diff --git a/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp b/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp index 50d9b5f318a..b310eb1ce49 100644 --- a/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp +++ b/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp @@ -121,7 +121,7 @@ dMsgFlow_c daTagHstop_c::m_msgFlow; int daTagHstop_c::execute() { if (mEvtInfo.checkCommandTalk()) { if (field_0x573 == 2) { - m_msgFlow.init(this, (u16)mCollisionRot.z, 0, NULL); + m_msgFlow.init(this, (u16)shape_angle.z, 0, NULL); field_0x573 = 3; } else if (m_msgFlow.doFlow(this, NULL, 0)) { i_dComIfGp_getEvent().reset(); diff --git a/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp b/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp index 5e6531a913d..c561240b683 100644 --- a/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp +++ b/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp @@ -120,7 +120,7 @@ bool daTag_Lv5Soup_c::isAreaCheck() { f32 boundX = mScale.x * 100.0f; f32 boundY = mScale.y * 100.0f; - if (sqrtf(dist.abs2XZ()) < boundX && -boundY < dist.y && dist.y < boundY) { + if (dist.absXZ() < boundX && -boundY < dist.y && dist.y < boundY) { return true; } else { return false; diff --git a/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp b/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp index ec5321ba4e3..aa111959a6e 100644 --- a/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp +++ b/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp @@ -1,201 +1,150 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_tag_setrestart -// +/** + * d_a_tag_setrestart.cpp + * RMBack0 + * Sets player room restart info + */ #include "rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80D60520 */ ~cXyz(); - /* 80D6055C */ cXyz(); -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct daTagRestart_c { - /* 80D603F8 */ void Create(); - /* 80D6048C */ void create(); - /* 80D60560 */ void execute(); - /* 80D60744 */ bool _delete(); -}; - -struct dSv_restart_c { - /* 80034F80 */ void setRoom(cXyz const&, s16, s8); -}; // // Forward References: // -extern "C" void Create__14daTagRestart_cFv(); -extern "C" void create__14daTagRestart_cFv(); -extern "C" void __dt__4cXyzFv(); -extern "C" void __ct__4cXyzFv(); -extern "C" void execute__14daTagRestart_cFv(); -extern "C" bool _delete__14daTagRestart_cFv(); -extern "C" static void daTagRestart_Execute__FP14daTagRestart_c(); -extern "C" static void daTagRestart_Delete__FP14daTagRestart_c(); -extern "C" static void daTagRestart_Create__FP10fopAc_ac_c(); extern "C" extern void* g_profile_Tag_Restart[12]; // // External References: // -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void gndCheck__11fopAcM_gc_cFPC4cXyz(); -extern "C" void setRoom__13dSv_restart_cFRC4cXyzsSc(); -extern "C" void __pl__4cXyzCFRC3Vec(); extern "C" void __dl__FPv(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECSubtract(); -extern "C" void __construct_array(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_28(); extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: // -/* ############################################################################################## */ -/* 80D607B4-80D607B8 000000 0004+00 2/2 0/0 0/0 .rodata @3650 */ -SECTION_RODATA static f32 const lit_3650 = -100.0f; -COMPILER_STRIP_GATE(0x80D607B4, &lit_3650); - -/* 80D607B8-80D607BC 000004 0004+00 0/2 0/0 0/0 .rodata @3651 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3651 = 100.0f; -COMPILER_STRIP_GATE(0x80D607B8, &lit_3651); -#pragma pop - -/* 80D607BC-80D607C0 000008 0004+00 0/2 0/0 0/0 .rodata @3652 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3652[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80D607BC, &lit_3652); -#pragma pop - /* 80D603F8-80D6048C 000078 0094+00 1/1 0/0 0/0 .text Create__14daTagRestart_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagRestart_c::Create() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/Create__14daTagRestart_cFv.s" +int daTagRestart_c::Create() { + field_0x56c[0].x = mScale.x * -100.0f; + field_0x56c[0].z = mScale.z * -100.0f; + + field_0x56c[1].x = mScale.x * 100.0f; + field_0x56c[1].z = mScale.z * -100.0f; + + field_0x56c[2].x = mScale.x * 100.0f; + field_0x56c[2].z = mScale.z * 100.0f; + + field_0x56c[3].x = mScale.x * -100.0f; + field_0x56c[3].z = mScale.z * 100.0f; + + field_0x56c[3].y = 0.0f; + field_0x56c[2].y = 0.0f; + field_0x56c[1].y = 0.0f; + field_0x56c[0].y = 0.0f; + + mPlayerRoomNo = -1; + return 1; } -#pragma pop /* 80D6048C-80D60520 00010C 0094+00 1/1 0/0 0/0 .text create__14daTagRestart_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagRestart_c::create() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/func_80D6048C.s" +int daTagRestart_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daTagRestart_c(); + fopAcM_OnCondition(this, 8); + } + + if (!Create()) { + return cPhs_ERROR_e; + } + + return cPhs_COMPLEATE_e; } -#pragma pop /* 80D60520-80D6055C 0001A0 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/__dt__4cXyzFv.s" } #pragma pop /* 80D6055C-80D60560 0001DC 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { - /* empty function */ -} +// cXyz::cXyz() { +extern "C" void __ct__4cXyzFv() {} /* 80D60560-80D60744 0001E0 01E4+00 1/1 0/0 0/0 .text execute__14daTagRestart_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagRestart_c::execute() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/execute__14daTagRestart_cFv.s" +int daTagRestart_c::execute() { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + + cXyz player_pos = player->current.pos; + player_pos -= orig.pos; + mDoMtx_stack_c::YrotS(-current.angle.y); + mDoMtx_stack_c::multVec(&player_pos, &player_pos); + + if (field_0x56c[0].x < player_pos.x && field_0x56c[0].z < player_pos.z && + field_0x56c[2].x > player_pos.x && field_0x56c[2].z > player_pos.z) { + int roomNo = dComIfGp_roomControl_getStayNo(); + if (roomNo != mPlayerRoomNo) { + cXyz pos_offset; + s16 restart_angle; + if (roomNo == daTagRestart_prm::getFRoomNo(this)) { + restart_angle = orig.angle.y; + pos_offset.set(0.0f, 0.0f, 100.0f); + } else { + restart_angle = orig.angle.y + 0x8000; + pos_offset.set(0.0f, 0.0f, -100.0f); + } + + pos_offset.y += 100.0f; + mDoMtx_stack_c::YrotS(orig.angle.y); + mDoMtx_stack_c::multVec(&pos_offset, &pos_offset); + cXyz restart_pos = current.pos + pos_offset; + + if (fopAcM_gc_c::gndCheck(&restart_pos)) { + restart_pos.y = fopAcM_gc_c::getGroundY(); + } + + s32 player_roomNo = fopAcM_GetRoomNo(player); + dComIfGs_setRestartRoom(restart_pos, restart_angle, player_roomNo); + } + } + + mPlayerRoomNo = fopAcM_GetRoomNo(player); + return 1; } -#pragma pop /* 80D60744-80D6074C 0003C4 0008+00 1/1 0/0 0/0 .text _delete__14daTagRestart_cFv */ -bool daTagRestart_c::_delete() { - return true; +int daTagRestart_c::_delete() { + return 1; } /* 80D6074C-80D6076C 0003CC 0020+00 1/0 0/0 0/0 .text daTagRestart_Execute__FP14daTagRestart_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagRestart_Execute(daTagRestart_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/daTagRestart_Execute__FP14daTagRestart_c.s" +static int daTagRestart_Execute(daTagRestart_c* i_this) { + return i_this->execute(); } -#pragma pop /* 80D6076C-80D6078C 0003EC 0020+00 1/0 0/0 0/0 .text daTagRestart_Delete__FP14daTagRestart_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagRestart_Delete(daTagRestart_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/daTagRestart_Delete__FP14daTagRestart_c.s" +static int daTagRestart_Delete(daTagRestart_c* i_this) { + return i_this->_delete(); } -#pragma pop /* 80D6078C-80D607AC 00040C 0020+00 1/0 0/0 0/0 .text daTagRestart_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagRestart_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/daTagRestart_Create__FP10fopAc_ac_c.s" +static int daTagRestart_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* ############################################################################################## */ /* 80D607C0-80D607E0 -00001 0020+00 1/0 0/0 0/0 .data l_daTagRestart_Method */ SECTION_DATA static void* l_daTagRestart_Method[8] = { - (void*)daTagRestart_Create__FP10fopAc_ac_c, - (void*)daTagRestart_Delete__FP14daTagRestart_c, - (void*)daTagRestart_Execute__FP14daTagRestart_c, + (void*)daTagRestart_Create, + (void*)daTagRestart_Delete, + (void*)daTagRestart_Execute, (void*)NULL, (void*)NULL, (void*)NULL, diff --git a/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp b/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp index 9e3058b28d4..9742c4be233 100644 --- a/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp +++ b/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp @@ -4,70 +4,114 @@ // #include "rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daTagWrHowl_c { - /* 80D63F38 */ daTagWrHowl_c(); - /* 80D63F74 */ ~daTagWrHowl_c(); - /* 80D63FD4 */ void create(); - /* 80D6402C */ bool Delete(); - /* 80D64034 */ bool draw(); - /* 80D6403C */ void execute(); - /* 80D64090 */ void init(); - /* 80D640B4 */ void chkWlfInTag(); -}; - -// -// Forward References: -// - -extern "C" void __ct__13daTagWrHowl_cFv(); -extern "C" void __dt__13daTagWrHowl_cFv(); -extern "C" void create__13daTagWrHowl_cFv(); -extern "C" bool Delete__13daTagWrHowl_cFv(); -extern "C" bool draw__13daTagWrHowl_cFv(); -extern "C" void execute__13daTagWrHowl_cFv(); -extern "C" void init__13daTagWrHowl_cFv(); -extern "C" void chkWlfInTag__13daTagWrHowl_cFv(); -extern "C" static void daTagWrHowl_create__FP13daTagWrHowl_c(); -extern "C" static void daTagWrHowl_Delete__FP13daTagWrHowl_c(); -extern "C" static void daTagWrHowl_execute__FP13daTagWrHowl_c(); -extern "C" static void daTagWrHowl_draw__FP13daTagWrHowl_c(); // // External References: // -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void __dl__FPv(); -extern "C" void PSVECSquareDistance(); extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; // // Declarations: // +/* 80D63F38-80D63F74 000078 003C+00 2/2 0/0 0/0 .text __ct__13daTagWrHowl_cFv */ +daTagWrHowl_c::daTagWrHowl_c() {} + +/* 80D63F74-80D63FD4 0000B4 0060+00 1/0 0/0 0/0 .text __dt__13daTagWrHowl_cFv */ +daTagWrHowl_c::~daTagWrHowl_c() {} + +/* 80D63FD4-80D6402C 000114 0058+00 1/1 0/0 0/0 .text create__13daTagWrHowl_cFv */ +int daTagWrHowl_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daTagWrHowl_c(); + fopAcM_OnCondition(this, 8); + } + + init(); + return cPhs_COMPLEATE_e; +} + +/* 80D6402C-80D64034 00016C 0008+00 1/1 0/0 0/0 .text Delete__13daTagWrHowl_cFv */ +int daTagWrHowl_c::Delete() { + return 1; +} + +/* 80D64034-80D6403C 000174 0008+00 1/1 0/0 0/0 .text draw__13daTagWrHowl_cFv */ +int daTagWrHowl_c::draw() { + return 1; +} + +/* 80D6403C-80D64090 00017C 0054+00 1/1 0/0 0/0 .text execute__13daTagWrHowl_cFv */ +int daTagWrHowl_c::execute() { + mAttentionInfo.mFlags = 0; + + if (chkWlfInTag()) { + mAttentionInfo.mFlags |= 0x80; + mAttentionInfo.field_0x4[3] = 65; + } + + return 1; +} + +/* 80D64090-80D640B4 0001D0 0024+00 1/1 0/0 0/0 .text init__13daTagWrHowl_cFv */ +void daTagWrHowl_c::init() { + field_0x56c = 50.0f * mScale.x; + field_0x570 = field_0x56c * field_0x56c; +} + +/* 80D640B4-80D64144 0001F4 0090+00 1/1 0/0 0/0 .text chkWlfInTag__13daTagWrHowl_cFv */ +bool daTagWrHowl_c::chkWlfInTag() { + if (dComIfGp_getPlayer(0) == NULL) { + return false; + } + + if (daPy_py_c::i_checkNowWolf()) { + cXyz player_pos = dComIfGp_getPlayer(0)->current.pos; + if (player_pos.abs2(current.pos) < field_0x570) { + return true; + } + } + + return false; +} + +/* 80D64144-80D64198 000284 0054+00 1/0 0/0 0/0 .text daTagWrHowl_create__FP13daTagWrHowl_c */ +static int daTagWrHowl_create(daTagWrHowl_c* i_this) { + if (!fopAcM_CheckCondition(i_this, 8)) { + new (i_this) daTagWrHowl_c(); + fopAcM_OnCondition(i_this, 8); + } + + return i_this->create(); +} + +/* 80D64198-80D641B8 0002D8 0020+00 1/0 0/0 0/0 .text daTagWrHowl_Delete__FP13daTagWrHowl_c */ +static int daTagWrHowl_Delete(daTagWrHowl_c* i_this) { + return i_this->Delete(); +} + +/* 80D641B8-80D641D8 0002F8 0020+00 1/0 0/0 0/0 .text daTagWrHowl_execute__FP13daTagWrHowl_c */ +static int daTagWrHowl_execute(daTagWrHowl_c* i_this) { + return i_this->execute(); +} + +/* 80D641D8-80D641F8 000318 0020+00 1/0 0/0 0/0 .text daTagWrHowl_draw__FP13daTagWrHowl_c + */ +static int daTagWrHowl_draw(daTagWrHowl_c* i_this) { + return i_this->draw(); +} + /* ############################################################################################## */ /* 80D64204-80D64224 -00001 0020+00 1/0 0/0 0/0 .data daTagWrHowl_METHODS */ SECTION_DATA static void* daTagWrHowl_METHODS[8] = { - (void*)daTagWrHowl_create__FP13daTagWrHowl_c, - (void*)daTagWrHowl_Delete__FP13daTagWrHowl_c, - (void*)daTagWrHowl_execute__FP13daTagWrHowl_c, + (void*)daTagWrHowl_create, + (void*)daTagWrHowl_Delete, + (void*)daTagWrHowl_execute, (void*)NULL, - (void*)daTagWrHowl_draw__FP13daTagWrHowl_c, + (void*)daTagWrHowl_draw, (void*)NULL, (void*)NULL, (void*)NULL, @@ -81,127 +125,4 @@ SECTION_DATA extern void* g_profile_Tag_WaraHowl[12] = { (void*)NULL, (void*)&g_fopAc_Method, (void*)0x02DD0000, (void*)&daTagWrHowl_METHODS, (void*)0x00040000, (void*)0x000E0000, -}; - -/* 80D64254-80D64260 000050 000C+00 2/2 0/0 0/0 .data __vt__13daTagWrHowl_c */ -SECTION_DATA extern void* __vt__13daTagWrHowl_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__13daTagWrHowl_cFv, -}; - -/* 80D63F38-80D63F74 000078 003C+00 2/2 0/0 0/0 .text __ct__13daTagWrHowl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daTagWrHowl_c::daTagWrHowl_c() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/__ct__13daTagWrHowl_cFv.s" -} -#pragma pop - -/* 80D63F74-80D63FD4 0000B4 0060+00 1/0 0/0 0/0 .text __dt__13daTagWrHowl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daTagWrHowl_c::~daTagWrHowl_c() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/__dt__13daTagWrHowl_cFv.s" -} -#pragma pop - -/* 80D63FD4-80D6402C 000114 0058+00 1/1 0/0 0/0 .text create__13daTagWrHowl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagWrHowl_c::create() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/create__13daTagWrHowl_cFv.s" -} -#pragma pop - -/* 80D6402C-80D64034 00016C 0008+00 1/1 0/0 0/0 .text Delete__13daTagWrHowl_cFv */ -bool daTagWrHowl_c::Delete() { - return true; -} - -/* 80D64034-80D6403C 000174 0008+00 1/1 0/0 0/0 .text draw__13daTagWrHowl_cFv */ -bool daTagWrHowl_c::draw() { - return true; -} - -/* 80D6403C-80D64090 00017C 0054+00 1/1 0/0 0/0 .text execute__13daTagWrHowl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagWrHowl_c::execute() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/execute__13daTagWrHowl_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D64200-80D64204 000000 0004+00 1/1 0/0 0/0 .rodata @3680 */ -SECTION_RODATA static f32 const lit_3680 = 50.0f; -COMPILER_STRIP_GATE(0x80D64200, &lit_3680); - -/* 80D64090-80D640B4 0001D0 0024+00 1/1 0/0 0/0 .text init__13daTagWrHowl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagWrHowl_c::init() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/init__13daTagWrHowl_cFv.s" -} -#pragma pop - -/* 80D640B4-80D64144 0001F4 0090+00 1/1 0/0 0/0 .text chkWlfInTag__13daTagWrHowl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagWrHowl_c::chkWlfInTag() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/chkWlfInTag__13daTagWrHowl_cFv.s" -} -#pragma pop - -/* 80D64144-80D64198 000284 0054+00 1/0 0/0 0/0 .text daTagWrHowl_create__FP13daTagWrHowl_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagWrHowl_create(daTagWrHowl_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_create__FP13daTagWrHowl_c.s" -} -#pragma pop - -/* 80D64198-80D641B8 0002D8 0020+00 1/0 0/0 0/0 .text daTagWrHowl_Delete__FP13daTagWrHowl_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagWrHowl_Delete(daTagWrHowl_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_Delete__FP13daTagWrHowl_c.s" -} -#pragma pop - -/* 80D641B8-80D641D8 0002F8 0020+00 1/0 0/0 0/0 .text daTagWrHowl_execute__FP13daTagWrHowl_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagWrHowl_execute(daTagWrHowl_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_execute__FP13daTagWrHowl_c.s" -} -#pragma pop - -/* 80D641D8-80D641F8 000318 0020+00 1/0 0/0 0/0 .text daTagWrHowl_draw__FP13daTagWrHowl_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagWrHowl_draw(daTagWrHowl_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl/daTagWrHowl_draw__FP13daTagWrHowl_c.s" -} -#pragma pop +}; \ No newline at end of file diff --git a/src/__start.c b/src/__start.c index 2c7a0dc4b4b..a022ef7430a 100644 --- a/src/__start.c +++ b/src/__start.c @@ -6,10 +6,10 @@ // Forward References: // -SECTION_INIT void __check_pad3(); -SECTION_INIT void __set_debug_bba(); -SECTION_INIT u8 __get_debug_bba(); -SECTION_INIT void __start(); +SECTION_INIT void __check_pad3(void); +SECTION_INIT void __set_debug_bba(void); +SECTION_INIT u8 __get_debug_bba(void); +SECTION_INIT void __start(void); // // External References: @@ -51,11 +51,116 @@ SECTION_INIT u8 __get_debug_bba(void) { } /* 80003154-800032B0 000054 015C+00 0/0 1/0 0/0 .init __start */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -SECTION_INIT asm void __start() { +SECTION_INIT asm void __start(void) { + // clang-format off nofralloc -#include "asm/init/__start.s" + + bl __init_registers + bl __init_hardware + li r0, -1 + stwu r1, -8(r1) + stw r0, 4(r1) + stw r0, 0(r1) + bl __init_data + li r0, 0 + lis r6, 0x8000 + addi r6, r6, 0x0044 + stw r0, 0(r6) + lis r6, 0x8000 + addi r6, r6, 0x00F4 + lwz r6, 0(r6) + cmplwi r6, 0 + beq lbl_8000319C + lwz r7, 0xc(r6) + b lbl_800031BC + +lbl_8000319C: + lis r5, 0x8000 + addi r5, r5, 0x0034 + lwz r5, 0(r5) + cmplwi r5, 0 + beq lbl_800031F8 + lis r7, 0x8000 + addi r7, r7, 0x30E8 + lwz r7, 0(r7) + +lbl_800031BC: + li r5, 0 + cmplwi r7, 2 + beq lbl_800031E8 + cmplwi r7, 3 + li r5, 1 + beq lbl_800031E8 + cmplwi r7, 4 + bne lbl_800031F8 + li r5, 2 + bl __set_debug_bba + b lbl_800031F8 + +lbl_800031E8: + lis r6, InitMetroTRK@ha + addi r6, r6, InitMetroTRK@l + mtlr r6 + blrl + +lbl_800031F8: + lis r6, 0x8000 + addi r6, r6, 0x00F4 + lwz r5, 0(r6) + cmplwi r5, 0 + beq+ lbl_80003258 + lwz r6, 8(r5) + cmplwi r6, 0 + beq+ lbl_80003258 + add r6, r5, r6 + lwz r14, 0(r6) + cmplwi r14, 0 + beq lbl_80003258 + addi r15, r6, 4 + mtctr r14 + +lbl_80003230: + addi r6, r6, 4 + lwz r7, 0(r6) + add r7, r7, r5 + stw r7, 0(r6) + bdnz lbl_80003230 + lis r5, 0x8000 + addi r5, r5, 0x0034 + rlwinm r7, r15, 0, 0, 0x1a + stw r7, 0(r5) + b lbl_80003260 + +lbl_80003258: + li r14, 0 + li r15, 0 + +lbl_80003260: + bl DBInit + bl OSInit + lis r4, 0x8000 + addi r4, r4, 0x30E6 + lhz r3, 0(r4) + andi. r5, r3, 0x8000 + beq lbl_80003288 + andi. r3, r3, 0x7fff + cmplwi r3, 1 + bne lbl_8000328C + +lbl_80003288: + bl __check_pad3 + +lbl_8000328C: + bl __get_debug_bba + cmplwi r3, 1 + bne lbl_8000329C + bl InitMetroTRK_BBA + +lbl_8000329C: + bl __init_user + mr r3, r14 + mr r4, r15 + bl main + b exit + // clang-format on } -#pragma pop diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 787cc79044a..6b7ac4fac91 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -16,6 +16,7 @@ #include "d/d_item.h" #include "d/d_path.h" #include "d/d_procname.h" +#include "d/d_demo.h" #include "d/msg/d_msg_object.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -26,6 +27,8 @@ #include "rel/d/a/d_a_crod/d_a_crod.h" #include "rel/d/a/d_a_horse/d_a_horse.h" #include "rel/d/a/d_a_scene_exit/d_a_scene_exit.h" +#include "rel/d/a/d_a_mg_rod/d_a_mg_rod.h" +#include "rel/d/a/d_a_spinner/d_a_spinner.h" #include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" #include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h" @@ -64,12 +67,7 @@ struct daNpcT_ActorMngr_c { }; struct daMirror_c { - /* 8003194C */ void entry(J3DModel*); -}; - -struct dDemo_actor_c { - /* 8003819C */ void getPrm_Morf(); - /* 80038338 */ void getDemoIDData(int*, int*, int*, u16*, u8*); + /* 8003194C */ static void entry(J3DModel*); }; struct dPaPoF_c { @@ -86,17 +84,6 @@ struct dInsect_c { /* 80110648 */ void Insect_Release(); }; -struct dDemo_object_c { - /* 80039088 */ void getActor(u8); -}; - -struct dDemo_c { - /* 80039EEC */ void setBranchId(u16, s16); - - static u16 m_branchId[1 + 3 /* padding */]; - static u8 m_object[4]; -}; - struct JASKernel { /* 80290B08 */ void getAramHeap(); }; @@ -3218,6 +3205,10 @@ SECTION_SDATA2 static u8 lit_6108[4] = { 0x00, }; +// temporary for literal matching +bool daAlink_c::checkInputOnR() const { return field_0x33ac > /* 0.05f */ lit_6021; } +bool daAlink_c::checkWindSpeedOnXZ() const { return field_0x35b8.abs2XZ() > lit_6040 /* 1.0f */; } + /* 8009D8E4-8009D90C 098224 0028+00 2/2 0/0 0/0 .text init__16daAlink_matAnm_cFv */ void daAlink_matAnm_c::init() { f32 tmp_0 = FLOAT_LABEL(lit_6108); @@ -3251,18 +3242,18 @@ asm void daAlink_matAnm_c::calc(J3DMaterial* param_0) const { if (mSetFlag == 0) { f32 tmp = 1.0f / sMorfFrame; info->field_0x10.field_0xc = field_0xf4 * (1.0f - tmp) + -info->field_0x10.field_0xc * tmp; info->field_0x10.field_0x10 = field_0xf8 * (1.0f - tmp) + +info->field_0x10.field_0xc * tmp; info->field_0x10.mCheckFrame = field_0xf8 * (1.0f - tmp) + info->field_0x10.field_0xc * tmp; //mSetFlag = 1; } else { info->field_0x10.field_0xc = field_0xf4; - info->field_0x10.field_0x10 = field_0xf8; + info->field_0x10.mCheckFrame = field_0xf8; } } if (struct_80450FC8) { info->field_0x10.field_0xc = mNowOffsetX; - info->field_0x10.field_0x10 = mNowOffsetY; + info->field_0x10.mCheckFrame = mNowOffsetY; } @@ -3322,9 +3313,9 @@ void daAlink_c::setMatrixWorldAxisRot(MtxP param_0, s16 param_1, s16 param_2, s1 } concatMagneBootMtx(); - mDoMtx_stack_c::YrotM(mCollisionRot.y); + mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::ZXYrotM(param_1, param_2, param_3); - mDoMtx_stack_c::YrotM(-mCollisionRot.y); + mDoMtx_stack_c::YrotM(-shape_angle.y); concatMagneBootInvMtx(); mDoMtx_stack_c::transM(-tmp.x, -tmp.y, -tmp.z); PSMTXConcat(mDoMtx_stack_c::get(), param_0, mDoMtx_stack_c::get()); @@ -4355,19 +4346,15 @@ SECTION_SDATA2 static u8 effName_42224[4] = { }; /* 80453110-80453114 001710 0004+00 1/1 0/0 0/0 .sdata2 effName$42309 */ -SECTION_SDATA2 static u8 effName_42309[4] = { - 0x08, - 0x14, - 0x08, - 0x15, +SECTION_SDATA2 static u16 effName_42309[2] = { + 0x0814, + 0x0815, }; /* 80453114-80453118 001714 0004+00 1/1 0/0 0/0 .sdata2 effName$42340 */ -SECTION_SDATA2 static u8 effName_42340[4] = { - 0x08, - 0x16, - 0x08, - 0x17, +SECTION_SDATA2 static u16 effName_42340[2] = { + 0x0816, + 0x0817, }; /* 80453118-8045311C 001718 0004+00 4/4 0/0 0/0 .sdata2 @42493 */ @@ -4554,14 +4541,9 @@ asm void daAlink_c::setHatAngle() { #pragma pop /* 8009FFF8-800A002C 09A938 0034+00 1/1 0/0 0/0 .text calcHairAngle__9daAlink_cFPs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::calcHairAngle(s16* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/calcHairAngle__9daAlink_cFPs.s" +void daAlink_c::calcHairAngle(s16* o_angle) { + cLib_addCalcAngleS(o_angle, 0, 5, 400, 50); } -#pragma pop /* ############################################################################################## */ /* 804531F8-804531FC 0017F8 0004+00 2/2 0/0 0/0 .sdata2 @55145 */ @@ -4625,7 +4607,7 @@ bool daAlink_c::checkAttentionPosAngle(cXyz* param_0) { int tmp; if (i_checkModeFlg(MODE_RIDING) || i_checkEndResetFlg0(ERFLG0_UNK_400)) { - tmp = daAlinkHIO_horse_c0::m.field_0x52; + tmp = daAlinkHIO_horse_c0::m.mSearchRangeAngle; } else { tmp = 0x6000; } @@ -4703,21 +4685,20 @@ asm void daAlink_c::setNeckAngle() { /* 800A2160-800A2198 09CAA0 0038+00 1/0 0/0 0/0 .text getStickAngleFromPlayerShape__9daAlink_cCFPs */ -bool daAlink_c::getStickAngleFromPlayerShape(s16* param_0) const { - // inline uses literal - // if (checkInputOnR()) { - if (field_0x33ac > lit_6021) { - *param_0 = field_0x2fe2 - mCollisionRot.y; +bool daAlink_c::getStickAngleFromPlayerShape(s16* o_angle) const { + if (checkInputOnR()) { + *o_angle = field_0x2fe2 - shape_angle.y; return true; } - *param_0 = 0; + + *o_angle = 0; return false; } /* 800A2198-800A21E0 09CAD8 0048+00 42/42 0/0 0/0 .text commonLineCheck__9daAlink_cFP4cXyzP4cXyz */ -bool daAlink_c::commonLineCheck(cXyz* param_0, cXyz* param_1) { - mLinkLinChk.Set(param_0, param_1, this); +bool daAlink_c::commonLineCheck(cXyz* i_startPos, cXyz* i_endPos) { + mLinkLinChk.Set(i_startPos, i_endPos, this); return dComIfG_Bgsp().LineCross(&mLinkLinChk); } @@ -4728,14 +4709,16 @@ s16 daAlink_c::getMoveBGActorName(cBgS_PolyInfo& param_0, int param_1) { dComIfG_Bgsp().ChkMoveBG_NoDABg(param_0) && dComIfG_Bgsp().GetActorPointer(param_0)) { return fopAcM_GetName(dComIfG_Bgsp().GetActorPointer(param_0)); } + return PROC_ALINK; } /* 800A2280-800A22E8 09CBC0 0068+00 2/2 0/0 0/0 .text checkGoronRide__9daAlink_cFv */ fopAc_ac_c* daAlink_c::checkGoronRide() { - if (mLinkAcch.ChkGroundHit() && getMoveBGActorName(mLinkAcch.m_gnd, 0) == 0x21) { + if (mLinkAcch.ChkGroundHit() && getMoveBGActorName(mLinkAcch.m_gnd, 0) == PROC_OBJ_GRA) { return dComIfG_Bgsp().GetActorPointer(mLinkAcch.m_gnd); } + return NULL; } @@ -4954,8 +4937,8 @@ SECTION_RODATA static u8 const l_ironBallChainVec[12] = { COMPILER_STRIP_GATE(0x8038FB44, &l_ironBallChainVec); /* 8038FB50-8038FB5C 01C1B0 000C+00 1/2 0/0 0/0 .rodata l_ironBallCenterVec */ -SECTION_RODATA static u8 const l_ironBallCenterVec[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x28, 0x00, 0x00, +SECTION_RODATA static Vec const l_ironBallCenterVec = { + 0.0f, 0.0f, 42.0f, }; COMPILER_STRIP_GATE(0x8038FB50, &l_ironBallCenterVec); @@ -5625,15 +5608,65 @@ static int const normalType3[5] = {4, 0, 1, 2, 1}; static int const finishType[5] = {2, 0, 0, 5, 1}; #pragma pop +struct daAlink_cutParamTbl { + /* 0x0 */ daAlink_c::daAlink_ANM m_anmID; + /* 0x4 */ int field_0x4; + /* 0x8 */ u8 m_cutType; + /* 0x9 */ u8 m_atSe; + /* 0xA */ u8 field_0xa; + /* 0xB */ u8 field_0xb; + /* 0xC */ f32 m_morf; +}; // Size: 0x10 + /* 80391808-80391858 01DE68 0050+00 0/1 0/0 0/0 .rodata cutParamTable$7312 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const cutParamTable_7312[80] = { - 0x00, 0x00, 0x00, 0x62, 0x00, 0x00, 0x00, 0x6F, 0x01, 0x01, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x63, 0x00, 0x00, 0x00, 0x6F, 0x04, 0x01, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x6F, 0x03, 0x01, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x6F, 0x21, 0x0E, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0x70, 0x02, 0x0E, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, +SECTION_RODATA static daAlink_cutParamTbl const cutParamTable_7312[5] = { + { + daAlink_c::ANM_CUT_NM_VERTICAL, + 0x6F, + daAlink_c::CUT_TYPE_NM_VERTICAL, + 1, + 0, + 0, + 6.0f, + }, + { + daAlink_c::ANM_CUT_NM_LEFT, + 0x6F, + daAlink_c::CUT_TYPE_NM_LEFT, + 1, + 0, + 0, + 5.0f, + }, + { + daAlink_c::ANM_CUT_NM_RIGHT, + 0x6F, + daAlink_c::CUT_TYPE_NM_RIGHT, + 1, + 0, + 0, + 5.0f, + }, + { + daAlink_c::ANM_CUT_COMBO_STAB, + 0x6F, + daAlink_c::CUT_TYPE_COMBO_STAB, + 14, + 0, + 0, + 6.0f, + }, + { + daAlink_c::ANM_CUT_NM_STAB, + 0x70, + daAlink_c::CUT_TYPE_NM_STAB, + 14, + 0, + 0, + 6.0f, + }, }; COMPILER_STRIP_GATE(0x80391808, &cutParamTable_7312); #pragma pop @@ -5641,13 +5674,61 @@ COMPILER_STRIP_GATE(0x80391808, &cutParamTable_7312); /* 80391858-803918B8 01DEB8 0060+00 0/1 0/0 0/0 .rodata cutParamTable$7455 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const cutParamTable_7455[96] = { - 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00, 0x6F, 0x06, 0x01, 0x64, 0x64, 0x40, 0xA0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x6F, 0x07, 0x01, 0x64, 0x64, 0x41, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x69, 0x00, 0x00, 0x00, 0x6F, 0x20, 0x0E, 0x64, 0x64, 0x41, 0x20, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x6A, 0x00, 0x00, 0x00, 0x6F, 0x1A, 0x01, 0x05, 0x0C, 0x41, 0x20, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x6B, 0x00, 0x00, 0x00, 0x6F, 0x1F, 0x01, 0x07, 0x0E, 0x41, 0x20, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x6C, 0x00, 0x00, 0x00, 0x6F, 0x15, 0x01, 0x64, 0x64, 0x41, 0x20, 0x00, 0x00, +SECTION_RODATA static daAlink_cutParamTbl const cutParamTable_7455[6] = { + { + daAlink_c::ANM_CUT_FINISH_LEFT, + 0x6F, + daAlink_c::CUT_TYPE_FINISH_LEFT, + 1, + 100, + 100, + 5.0f, + }, + { + daAlink_c::ANM_CUT_FINISH_VERTICAL, + 0x6F, + daAlink_c::CUT_TYPE_FINISH_VERTICAL, + 1, + 100, + 100, + 8.0f, + }, + { + daAlink_c::ANM_CUT_FINISH_STAB, + 0x6F, + daAlink_c::CUT_TYPE_FINISH_STAB, + 14, + 100, + 100, + 10.0f, + }, + { + daAlink_c::ANM_CUT_MORTAL_DRAW_A, + 0x6F, + daAlink_c::CUT_TYPE_MORTAL_DRAW_A, + 1, + 5, + 12, + 10.0f, + }, + { + daAlink_c::ANM_CUT_MORTAL_DRAW_B, + 0x6F, + daAlink_c::CUT_TYPE_MORTAL_DRAW_B, + 1, + 7, + 14, + 10.0f, + }, + { + daAlink_c::ANM_CUT_FINISH_RIGHT, + 0x6F, + daAlink_c::CUT_TYPE_FINISH_RIGHT, + 1, + 100, + 100, + 10.0f, + }, }; COMPILER_STRIP_GATE(0x80391858, &cutParamTable_7455); #pragma pop @@ -5812,8 +5893,8 @@ SECTION_RODATA static u8 const anmIdx[10 + 2 /* padding */] = { COMPILER_STRIP_GATE(0x803919D8, &anmIdx); /* 803919E4-803919F0 01E044 000C+00 1/1 0/0 0/0 .rodata localPaddleTop$20605 */ -SECTION_RODATA static u8 const localPaddleTop[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x1E, 0x00, 0x00, +SECTION_RODATA static Vec const localPaddleTop = { + 0.0f, 0.0f, -158.0f, }; COMPILER_STRIP_GATE(0x803919E4, &localPaddleTop); @@ -6241,10 +6322,19 @@ SECTION_RODATA static u8 const wolfChainVec[12] = { COMPILER_STRIP_GATE(0x80391E3C, &wolfChainVec); /* 80391E48-80391E78 01E4A8 0030+00 1/1 0/0 0/0 .rodata label$45760 */ -SECTION_RODATA static u8 const label[48] = { - 0x00, 0x01, 0x00, 0x30, 0x00, 0x01, 0x00, 0x2E, 0x00, 0x01, 0x00, 0x31, 0x00, 0x01, 0x00, 0x2F, - 0x00, 0x01, 0x00, 0x3D, 0x00, 0x01, 0x00, 0x33, 0x00, 0x01, 0x00, 0xB1, 0x00, 0x01, 0x00, 0xB5, - 0x00, 0x01, 0x00, 0xB6, 0x00, 0x01, 0x00, 0xB7, 0x00, 0x01, 0x00, 0xB9, 0x00, 0x01, 0x00, 0x3F, +SECTION_RODATA static u32 const label[12] = { + Z2SE_WL_V_BREATH_SIT, + Z2SE_WL_V_BREATH_WAIT, + Z2SE_WL_V_BREATH_WALK, + Z2SE_WL_V_BREATH_TIRED, + Z2SE_WL_V_DASH, + Z2SE_WL_V_BREATH_JUMP, + Z2SE_WL_V_SLIP_CLIMB, + Z2SE_WL_V_PUSH_ROCK, + Z2SE_WL_V_TURN_BACK, + Z2SE_WL_V_HOLD_THROW, + Z2SE_WL_V_FAILED, + Z2SE_WL_V_NOSE, }; COMPILER_STRIP_GATE(0x80391E48, &label); @@ -6447,6 +6537,7 @@ JKRHeap* daAlink_c::setItemHeap() { field_0x2fa0 ^= 1; i_onResetFlg0(RFLG0_UNK_4000); } + return mItemHeap[field_0x2fa0].setAnimeHeap(); } @@ -11596,17 +11687,17 @@ SECTION_DATA static u8 rodTopOffset[12] = { }; /* 803B2D94-803B2DA0 -00001 000C+00 1/1 0/0 0/0 .data bodyBrkName$69118 */ -SECTION_DATA static void* bodyBrkName[3] = { - (void*)(((char*)&d_a_d_a_alink__stringBase0) + 0x494), - (void*)(((char*)&d_a_d_a_alink__stringBase0) + 0x4AB), - (void*)(((char*)&d_a_d_a_alink__stringBase0) + 0x4C2), +SECTION_DATA static char* bodyBrkName[3] = { + "ml_body_power_down.brk", + "ml_body_power_up_a.brk", + "ml_body_power_up_b.brk", }; /* 803B2DA0-803B2DAC -00001 000C+00 1/1 0/0 0/0 .data headBrkName$69119 */ -SECTION_DATA static void* headBrkName[3] = { - (void*)(((char*)&d_a_d_a_alink__stringBase0) + 0x4D9), - (void*)(((char*)&d_a_d_a_alink__stringBase0) + 0x4F0), - (void*)(((char*)&d_a_d_a_alink__stringBase0) + 0x507), +SECTION_DATA static char* headBrkName[3] = { + "ml_head_power_down.brk", + "ml_head_power_up_a.brk", + "ml_head_power_up_b.brk", }; /* 803B2DAC-803B2DCC -00001 0020+00 1/0 0/0 0/0 .data l_daAlink_Method */ @@ -12191,6 +12282,10 @@ bool daPy_py_c::checkWoodSwordEquip() { return dComIfGs_getSelectEquipSword() == WOOD_STICK; } +bool daPy_py_c::checkLightMasterSwordEquip() { + return dComIfGs_getSelectEquipSword() == LIGHT_SWORD; +} + BOOL daPy_py_c::i_checkSwordGet() { return dComIfGs_getSelectEquipSword() != NO_ITEM; } @@ -12263,8 +12358,8 @@ void daAlink_c::setSelectEquipItem(int param_0) { } } - simpleAnmPlay(field_0x067c); - simpleAnmPlay(field_0x0680); + simpleAnmPlay(mMagicArmorBodyBrk); + simpleAnmPlay(mMagicArmorHeadBrk); } } @@ -12334,20 +12429,20 @@ void daAlink_c::playerInit() { mSheathModel = mpSwASheathModel; field_0x814.Init(120, 0xFF, this); - field_0x306c = mCollisionRot.y + field_0x59e; + field_0x306c = shape_angle.y + field_0x59e; for (u16 i = 0; i < 3; i++) { - field_0x122C[i].Set(*(dCcD_SrcCps*)l_atCpsSrc); - field_0x122C[i].SetStts(&field_0x814); + mAtCps[i].Set(*(dCcD_SrcCps*)l_atCpsSrc); + mAtCps[i].SetStts(&field_0x814); } - mGuardAttackAtCps.Set(*(dCcD_SrcCps*)l_atCpsSrc); - mGuardAttackAtCps.SetStts(&field_0x814); - mGuardAttackAtCps.SetAtType(AT_TYPE_SHIELD_ATTACK); - mGuardAttackAtCps.OnAtNoHitMark(); - mGuardAttackAtCps.SetAtHitMark(0); - mGuardAttackAtCps.SetAtAtp(0); - field_0x10F0.Set(*(dCcD_SrcCyl*)l_atCylSrc); - field_0x10F0.SetStts(&field_0x814); + mGuardAtCps.Set(*(dCcD_SrcCps*)l_atCpsSrc); + mGuardAtCps.SetStts(&field_0x814); + mGuardAtCps.SetAtType(AT_TYPE_SHIELD_ATTACK); + mGuardAtCps.OnAtNoHitMark(); + mGuardAtCps.SetAtHitMark(0); + mGuardAtCps.SetAtAtp(0); + mAtCyl.Set(*(dCcD_SrcCyl*)l_atCylSrc); + mAtCyl.SetStts(&field_0x814); mLinkAcch.Set(this, 3, field_0x18B0); mLinkAcch.ClrWaterNone(); @@ -12361,7 +12456,7 @@ void daAlink_c::playerInit() { field_0x18B0[0].SetWall(l_autoUpHeight, lit_10042); field_0x18B0[1].SetWall(lit_16037, lit_10042); field_0x18B0[2].SetWall(field_0x598, lit_10042); - field_0x2fe6 = mCollisionRot.y; + field_0x2fe6 = shape_angle.y; for (u16 i = 0; i < 3; i++) { u8* underBuf = mUnderAnmHeap[0].getBuffer(); @@ -12388,7 +12483,7 @@ void daAlink_c::playerInit() { resetBasAnime(); mZ2Link.init(¤t.pos, &mEyePos, &field_0x3720); - mZ2Link.initKantera(&field_0x360c); + mZ2Link.initKantera(&mKandelaarFlamePos); mZ2Link.setKanteraState(0); mProcID = 0x160; @@ -12474,12 +12569,12 @@ void daAlink_c::playerInit() { field_0x28b0[i] = -1; } mAtnActorID = -1; - field_0x28f0 = -1; + mMsgClassID = -1; field_0x28f8 = -1; field_0x28fc = -1; field_0x2e54.init(&mLinkAcch, daAlinkHIO_basic_c0::m.mWaterSurfaceEffectHeight, field_0x598); - field_0x3108 = mCollisionRot.y; + field_0x3108 = shape_angle.y; field_0x2f20.setOldPosP(&field_0x3624, &field_0x3630); field_0x2fc3 = 10; @@ -12589,15 +12684,15 @@ int daAlink_c::create() { if (sceneMode == 7) { current.pos = dComIfGs_getTurnRestartPos(); - mCollisionRot.y = dComIfGs_getTurnRestartAngleY(); - current.angle.y = mCollisionRot.y; + shape_angle.y = dComIfGs_getTurnRestartAngleY(); + current.angle.y = shape_angle.y; } if ((!checkBossOctaIealRoom() && dComIfGs_Wolf_Change_Check() == 1) || startPoint == -4 || sceneMode == 9) { - mAttentionInfo.mPosition.set(current.pos.x + cM_ssin(mCollisionRot.y) * 70.0f, + mAttentionInfo.mPosition.set(current.pos.x + cM_ssin(shape_angle.y) * 70.0f, current.pos.y + 80.0f, - current.pos.z + cM_scos(mCollisionRot.y) * 70.0f); + current.pos.z + cM_scos(shape_angle.y) * 70.0f); i_onNoResetFlg1(FLG1_IS_WOLF); } else if (horseStart) { mAttentionInfo.mPosition.y = current.pos.y + 150.0f; @@ -12634,10 +12729,10 @@ int daAlink_c::create() { if (checkCanoeStart()) { field_0x2900 = fopAcM_create(PROC_CANOE, 0, ¤t.pos, fopAcM_GetRoomNo(this), - &mCollisionRot, NULL, -1); + &shape_angle, NULL, -1); } else if (sceneMode == 11) { field_0x2900 = fopAcM_create(PROC_Obj_IceLeaf, 0x1FFFF, ¤t.pos, - fopAcM_GetRoomNo(this), &mCollisionRot, NULL, -1); + fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); } else { field_0x2900 = -1; } @@ -12667,7 +12762,7 @@ int daAlink_c::create() { bgWaitFlg = 0; - dComIfGs_setRestartRoom(current.pos, mCollisionRot.y, getStartRoomNo()); + dComIfGs_setRestartRoom(current.pos, shape_angle.y, getStartRoomNo()); field_0x3780 = current.pos; mLinkAcch.ClrGndThinCellingOff(); fopAcM_SetRoomNo(this, dComIfG_Bgsp().GetRoomId(mLinkAcch.m_gnd) + 1); @@ -12729,7 +12824,7 @@ int daAlink_c::create() { 1, 1); } - fopAcM_create(PROC_MIDNA, prm, ¤t.pos, fopAcM_GetRoomNo(this), &mCollisionRot, + fopAcM_create(PROC_MIDNA, prm, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); checkSetNpcTks(¤t.pos, fopAcM_GetRoomNo(this), 1); @@ -12760,24 +12855,56 @@ asm int daAlink_c::create() { #endif /* 800A660C-800A662C 0A0F4C 0020+00 1/0 0/0 0/0 .text daAlink_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_Create__FP10fopAc_ac_c.s" +static int daAlink_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 800A662C-800A67E0 0A0F6C 01B4+00 2/2 0/0 0/0 .text setRoomInfo__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setRoomInfo() { - nofralloc -#include "asm/d/a/d_a_alink/setRoomInfo__9daAlink_cFv.s" +s32 daAlink_c::setRoomInfo() { + s32 roomID; + + if (mProcID != PROC_TW_GATE) { + roomID = dComIfG_Bgsp().GetRoomId(mLinkAcch.m_gnd); + + if (roomID != fopAcM_GetRoomNo(this)) { + mTevStr.mRoomNo = roomID; + mVoiceReverbIntensity = dComIfGp_getReverb(roomID); + field_0x814.SetRoomId(roomID); + fopAcM_SetRoomNo(this, roomID); + } + + dStage_RoomCheck(&mLinkAcch.m_gnd); + } else { + roomID = fopAcM_GetRoomNo(this); + } + + mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mLinkAcch.m_gnd); + field_0x3174 = dComIfG_Bgsp().GetGroundCode(mLinkAcch.m_gnd); + field_0x2fbb = dComIfG_Bgsp().GetPolyAtt0(mLinkAcch.m_gnd); + field_0x2fa8 = dComIfG_Bgsp().GetSpecialCode(mLinkAcch.m_gnd); + + if (field_0x2fa8 == 6 && i_checkWolf()) { + field_0x2fa8 = 5; + } + + if (field_0x2fbd != 0xFF) { + if (field_0x2fbb == 3) { + field_0x2fbd = dComIfG_Bgsp().GetPolyAtt1(mLinkAcch.m_gnd); + + if (field_0x2fbd == 4 && i_checkWolf()) { + field_0x2fbd = 0; + } + + if (!checkEventRun() && (field_0x2fbd == 1 || field_0x2fbd == 3) && (checkBootsOrArmorHeavy() || mSinkShapeOffset < lit_6040 + field_0x3458)) { + field_0x2fbd = 2; + } + } else { + field_0x2fbd = 0; + } + } + + return roomID; } -#pragma pop /* 800A67E0-800A6B0C 0A1120 032C+00 1/1 0/0 0/0 .text setShapeAngleOnGround__9daAlink_cFv */ @@ -13054,7 +13181,7 @@ static u8 lit_4410[12]; #pragma pop /* 8042552C-80425538 05224C 000C+00 2/3 0/0 0/0 .bss l_ironBallBaseAnime */ -static f32 l_ironBallBaseAnime[3]; +static Vec l_ironBallBaseAnime; /* 80425538-80425544 052258 000C+00 0/1 0/0 0/0 .bss @4411 */ #pragma push @@ -13063,7 +13190,7 @@ static u8 lit_4411[12]; #pragma pop /* 80425544-80425550 052264 000C+00 15/17 0/0 0/0 .bss l_halfAtnWaitBaseAnime */ -static f32 l_halfAtnWaitBaseAnime[3]; +static Vec l_halfAtnWaitBaseAnime; /* 80425550-8042555C 052270 000C+00 0/1 0/0 0/0 .bss @4412 */ #pragma push @@ -13093,7 +13220,7 @@ static u8 lit_4414[12]; #pragma pop /* 8042558C-80425598 0522AC 000C+00 3/5 0/0 0/0 .bss l_horseBaseAnime */ -static u8 l_horseBaseAnime[12]; +static Vec l_horseBaseAnime; /* 80425598-804255A4 0522B8 000C+00 0/1 0/0 0/0 .bss @4415 */ #pragma push @@ -13129,7 +13256,7 @@ static u8 lit_4418[12]; #pragma pop /* 804255EC-804255F8 05230C 000C+00 2/3 0/0 0/0 .bss l_canoeBaseAnime */ -static u8 l_canoeBaseAnime[12]; +static Vec l_canoeBaseAnime; /* 800A87F8-800A8CE4 0A3138 04EC+00 2/2 0/0 0/0 .text setAttentionPos__9daAlink_cFv */ #pragma push @@ -13301,65 +13428,174 @@ void daAlink_c::setHandIndex(daAlink_c::daAlink_ANM i_anmID) { /* 800AA2E0-800AA5E8 0A4C20 0308+00 1/1 0/0 0/0 .text setSwordAtCollision__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSwordAtCollision(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setSwordAtCollision__9daAlink_cFi.s" +void daAlink_c::setSwordAtCollision(int param_0) { + cXyz sp74; + + if (checkCutDashAnime() && (checkCutDashEnemyHit(mAtCps[0]) || checkCutDashEnemyHit(mAtCps[1]) || checkCutDashEnemyHit(mAtCps[2]))) { + i_onNoResetFlg1(FLG1_UNK_4000000); + } + + if (mProcID == PROC_CUT_FINISH_JUMP_UP) { + sp74.set(current.pos.x + daAlinkHIO_cutFnJU_c0::m.mAttackOffset * cM_ssin(shape_angle.y), + field_0x3478, + current.pos.z + daAlinkHIO_cutFnJU_c0::m.mAttackOffset * cM_scos(shape_angle.y)); + f32 height = mSwordTopPos.y - field_0x3478; + + if (height < lit_7625) { + height = lit_7625; + } + + mAtCyl.SetH(height); + + if (param_0 != 0) { + mAtCyl.StartCAt(sp74); + } else { + mAtCyl.MoveCAt(sp74); + } + + g_dComIfG_gameInfo.play.mCcs.Set(&mAtCyl); + g_dComIfG_gameInfo.play.mCcs.SetMass(&mAtCyl, 1); + return; + } + + sp74 = ((mSwordTopPos - field_0x3498) * field_0x33d0) + field_0x3498; + cXyz sp68 = ((field_0x34b0 - field_0x34bc) * field_0x33d0) + field_0x34bc; + + mAtCps[0].SetStartEnd(field_0x3498, sp74); + mAtCps[1].SetStartEnd(sp68, sp74); + mAtCps[2].SetStartEnd(field_0x3498, sp68); + mAtCps[0].OnAtSetBit(); + + cXyz sp5C; + if (param_0 != 0) { + sp5C = cXyz::Zero; + } else { + sp5C = mSwordTopPos - field_0x34b0; + mAtCps[1].OnAtSetBit(); + mAtCps[2].OnAtSetBit(); + } + + mAtCps[0].SetAtVec(sp5C); + mAtCps[1].SetAtVec(sp5C); + mAtCps[2].SetAtVec(sp5C); + + for (int i = 0; i < 3; i++) { + g_dComIfG_gameInfo.play.mCcs.Set(&mAtCps[i]); + g_dComIfG_gameInfo.play.mCcs.SetMass(&mAtCps[i], 1); + } } -#pragma pop /* 800AA5E8-800AA6B4 0A4F28 00CC+00 4/4 0/0 0/0 .text checkNoCollisionCorret__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNoCollisionCorret() { - nofralloc -#include "asm/d/a/d_a_alink/checkNoCollisionCorret__9daAlink_cFv.s" +BOOL daAlink_c::checkNoCollisionCorret() { + if (i_checkModeFlg(0x12800) || mDemo.getDemoType() == 1 || mProcID == PROC_DOOR_OPEN || + (checkEventRun() && (!strcmp(i_dComIfGp_getEventManager().getRunEventName(), "SCENE_EXIT") || + (fopAcM_getTalkEventPartner(this) && fopAcM_getTalkEventPartner(this) == getMidnaActor()))) || + mEvtInfo.i_checkCommandDoor()) { + return true; + } + + return false; } -#pragma pop /* 800AA6B4-800AA714 0A4FF4 0060+00 1/1 0/0 0/0 .text decSwordBlur__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::decSwordBlur() { - nofralloc -#include "asm/d/a/d_a_alink/decSwordBlur__9daAlink_cFv.s" +void daAlink_c::decSwordBlur() { + if (m_swordBlur.field_0x14 < 10) { + m_swordBlur.field_0x14 = 0; + } else { + m_swordBlur.field_0x14 -= 10; + m_swordBlur.traceBlur(¤t.pos, &next.pos, shape_angle.y - field_0x2fe6); + } } -#pragma pop /* 800AA714-800AA7EC 0A5054 00D8+00 2/2 0/0 0/0 .text resetWolfAtCollision__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetWolfAtCollision() { - nofralloc -#include "asm/d/a/d_a_alink/resetWolfAtCollision__9daAlink_cFv.s" +void daAlink_c::resetWolfAtCollision() { + if (i_checkNoResetFlg0(FLG0_UNK_40)) { + if (!setSwordHitVibration(&mAtCyl) && !setSwordHitVibration(&field_0x850[0]) && !setSwordHitVibration(&field_0x850[1])) { + setSwordHitVibration(&field_0x850[2]); + } + + field_0xFB8.OffTgWolfSpNoDamage(); + mAtCyl.ResetAtHit(); + i_offNoResetFlg0(FLG0_UNK_40); + + dCcD_Cyl* cyl = field_0x850; + for (int i = 0; i < 3; i++) { + cyl->OffAtSetBit(); + cyl->ResetAtHit(); + cyl->OffTgWolfSpNoDamage(); + cyl++; + } + } } -#pragma pop /* 800AA7EC-800AA9DC 0A512C 01F0+00 1/1 0/0 0/0 .text setWolfAtCollision__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfAtCollision() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfAtCollision__9daAlink_cFv.s" +void daAlink_c::setWolfAtCollision() { + cXyz sp8; + + if (i_checkResetFlg0(RFLG0_UNK_2)) { + if (!setSwordHitVibration(&mAtCyl) && !setSwordHitVibration(&field_0x850[0]) && !setSwordHitVibration(&field_0x850[1])) { + setSwordHitVibration(&field_0x850[2]); + } + + if (mProcID == PROC_WOLF_ROLL_ATTACK) { + mAtCyl.SetC(current.pos); + + g_dComIfG_gameInfo.play.mCcs.Set(&mAtCyl); + g_dComIfG_gameInfo.play.mCcs.SetMass(&mAtCyl, 1); + } else { + sp8.set(current.pos.x + field_0x3438 * cM_ssin(shape_angle.y), + current.pos.y, + current.pos.z + field_0x3438 * cM_scos(shape_angle.y)); + + if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + mAtCyl.StartCAt(sp8); + + if (mProcID == PROC_WOLF_LOCK_ATTACK || mProcID == PROC_WOLF_JUMP_ATTACK) { + field_0xFB8.OnTgWolfSpNoDamage(); + + for (int i = 0; i < 3; i++) { + field_0x850[i].OnTgWolfSpNoDamage(); + } + } + + if (mCutType == 0x32 || mProcID == PROC_WOLF_LOCK_ATTACK) { + for (int i = 0; i < 3; i++) { + field_0x850[i].OnAtSetBit(); + } + } + } else { + mAtCyl.MoveCAt(sp8); + } + + g_dComIfG_gameInfo.play.mCcs.Set(&mAtCyl); + g_dComIfG_gameInfo.play.mCcs.SetMass(&mAtCyl, 1); + } + + i_onNoResetFlg0(FLG0_UNK_40); + } else { + resetWolfAtCollision(); + } } -#pragma pop /* 800AA9DC-800AAABC 0A531C 00E0+00 3/3 0/0 0/0 .text resetAtCollision__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetAtCollision(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/resetAtCollision__9daAlink_cFi.s" +void daAlink_c::resetAtCollision(int param_0) { + if (i_checkNoResetFlg0(FLG0_UNK_40)) { + if (param_0 && !setSwordHitVibration(&mAtCps[0]) && !setSwordHitVibration(&mAtCps[1]) && + !setSwordHitVibration(&mAtCps[2]) && !setSwordHitVibration(&mAtCyl)) { + setSwordHitVibration(&field_0xFB8); + } + + i_offNoResetFlg0(FLG0_UNK_40); + + for (int i = 0; i < 3; i++) { + mAtCps[i].ResetAtHit(); + mAtCps[i].OffAtSetBit(); + } + + field_0xFB8.ResetAtHit(); + } } -#pragma pop /* ############################################################################################## */ /* 80392028-80392034 01E688 000C+00 0/1 0/0 0/0 .rodata bottleTopPos$61387 */ @@ -13401,32 +13637,214 @@ asm void daAlink_c::setWolfCollisionPos() { /* 800ABAE0-800ABB28 0A6420 0048+00 2/2 0/0 0/0 .text initLockAt__9daAlink_cFv */ void daAlink_c::initLockAt() { - field_0x122C[0].OnAtSPrmBit(0x20); - field_0x122C[0].OnAtNoHitMark(); - field_0x122C[0].OffAtNoConHit(); - field_0x122C[0].ResetAtHit(); + mAtCps[0].OnAtSPrmBit(0x20); + mAtCps[0].OnAtNoHitMark(); + mAtCps[0].OffAtNoConHit(); + mAtCps[0].ResetAtHit(); } /* 800ABB28-800ABB84 0A6468 005C+00 3/3 0/0 0/0 .text cancelLockAt__9daAlink_cFv */ void daAlink_c::cancelLockAt() { - field_0x122C[0].OffAtSPrmBit(0x20); - field_0x122C[0].OffAtNoHitMark(); - field_0x122C[0].OnAtNoConHit(); - field_0x122C[0].ResetAtHit(); + mAtCps[0].OffAtSPrmBit(0x20); + mAtCps[0].OffAtNoHitMark(); + mAtCps[0].OnAtNoConHit(); + mAtCps[0].ResetAtHit(); field_0x814.SetAtApid(0xFFFFFFFF); } /* 800ABB84-800ABDB8 0A64C4 0234+00 1/1 0/0 0/0 .text setCollisionPos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCollisionPos() { - nofralloc -#include "asm/d/a/d_a_alink/setCollisionPos__9daAlink_cFv.s" +void daAlink_c::setCollisionPos() { + cXyz sp74; + mDoMtx_multVecZero(mpLinkModel->i_getAnmMtx(0), &sp74); + cXyz sp68 = (sp74 + mHeadTopPos) * lit_5943; + + f32 var_f31; + if (sp74.y > mHeadTopPos.y) { + sp68.y = mHeadTopPos.y; + var_f31 = sp74.y - mHeadTopPos.y; + } else { + sp68.y = sp74.y; + var_f31 = mHeadTopPos.y - sp74.y; + } + + if (var_f31 < lit_10040) { + sp68.y -= lit_5943 * (lit_10040 - var_f31); + var_f31 = lit_10040; + } + + field_0x850[2].SetC(sp68); + field_0x850[2].SetH(var_f31); + + sp68 = (((mLeftFootPos + mRightFootPos) * lit_5943) + sp74) * lit_5943; + f32 var_f0 = mLeftFootPos.y > mRightFootPos.y ? mRightFootPos.y : mLeftFootPos.y; + + f32 var_f31_2; + if (sp74.y > var_f0) { + sp68.y = var_f0; + var_f31_2 = sp74.y - var_f0; + } else { + sp68.y = sp74.y; + var_f31_2 = var_f0 - sp74.y; + } + + if (var_f31_2 < lit_10040) { + sp68.y -= lit_5943 * (lit_10040 - var_f31_2); + var_f31_2 = lit_10040; + } + + field_0x850[0].SetC(sp68); + field_0x850[0].SetH(var_f31_2); + + sp68 = (field_0x850[0].GetC() + field_0x850[2].GetC()) * lit_5943; + f32 temp_f31 = lit_5943 * (field_0x850[0].GetH() + field_0x850[2].GetH()); + + field_0x850[1].SetC(sp68); + field_0x850[1].SetH(temp_f31); + field_0x3454 = field_0x3834.y; } -#pragma pop /* 800ABDB8-800AC328 0A66F8 0570+00 1/1 0/0 0/0 .text setCollision__9daAlink_cFv */ +#ifdef NONMATCHING +void daAlink_c::setCollision() { + field_0x814.Move(); + field_0x173c.Move(); + + dCcD_Cyl* var_r26 = field_0x850; + CcG_Tg_HitMark var_r3 = checkMagicArmorNoDamage() ? CcG_Tg_UNK_MARK_8 : CcG_Tg_UNK_MARK_6; + + if (checkIronBallWaitAnime()) { + field_0x2e44.offPassNum(0x11); + } else { + field_0x2e44.onPassNum(0x11); + } + + for (int i = 0; i < 3; i++) { + var_r26->SetTgHitMark(var_r3); + var_r26++; + } + + dCcD_Cyl* var_r31 = field_0x850; + if (checkIronBallWaitAnime() || (checkPlayerGuardAndAttack() && !i_checkEndResetFlg1(ERFLG1_UNK_20))) { + BOOL var_r27; + if (field_0x3114 >= 0x3000 && field_0x3114 <= 0x5000) { + var_r27 = 1; + } else { + var_r27 = 0; + } + + for (int i = 0; i < 3; i++) { + if (var_r27) { + var_r31->OnTgSpShield(); + var_r31->OffTgShield(); + } else { + var_r31->OffTgSpShield(); + var_r31->OnTgShield(); + } + + if (checkHorseRide()) { + var_r31->OffTgShieldFrontRange(); + } else { + var_r31->OnTgShieldFrontRange(); + } + + var_r31++; + } + } else { + for (int i = 0; i < 3; i++) { + var_r31->OffTgShield(); + var_r31->OffTgSpShield(); + + if (i_checkWolf()) { + var_r31->OffTgShieldFrontRange(); + } else { + var_r31->OnTgShieldFrontRange(); + } + + var_r31++; + } + } + + if (checkNoCollisionCorret() && !checkOctaIealSpecialCollect()) { + i_onNoResetFlg3(FLG3_UNK_20000000); + } + + if (i_checkWolf()) { + setWolfCollisionPos(); + } else { + setCollisionPos(); + } + + if (mDamageTimer != 0 || i_checkModeFlg(8)) { + for (int i = 0; i < 3; i++) { + field_0x850[i].OffTgSetBit(); + field_0x850[i].ResetTgHit(); + } + + if (i_checkWolf()) { + field_0xFB8.OffTgSetBit(); + field_0xFB8.ResetTgHit(); + } + } else { + for (int i = 0; i < 3; i++) { + field_0x850[i].OnTgSetBit(); + } + + if (i_checkWolf()) { + field_0xFB8.OnTgSetBit(); + } + } + + mDoMtx_multVecSR(getShieldMtx(), &cXyz::BaseZ, &field_0x351c); + + if (checkIronBallWaitAnime() || field_0x351c.absXZ() > lit_8782) { + field_0x306c = field_0x351c.atan2sX_Z(); + } else { + field_0x306c = shape_angle.y + field_0x59e; + } + + g_dComIfG_gameInfo.play.mCcs.Set(&field_0x850[0]); + g_dComIfG_gameInfo.play.mCcs.SetMass(&field_0x850[0], 1); + + if (i_checkWolf()) { + setWolfAtCollision(); + + for (int i = 0; i < 3; i++) { + g_dComIfG_gameInfo.play.mCcs.Set(&field_0x850[i]); + g_dComIfG_gameInfo.play.mCcs.SetMass(&field_0x850[i], 1); + } + + if (i_checkModeFlg(0x100000)) { + field_0xFB8.OffCoSetBit(); + field_0xFB8.ResetCoHit(); + } else { + field_0xFB8.OnCoSetBit(); + } + + g_dComIfG_gameInfo.play.mCcs.Set(&field_0xFB8); + g_dComIfG_gameInfo.play.mCcs.SetMass(&field_0xFB8, 1); + } else { + for (int i = 0; i < 3; i++) { + g_dComIfG_gameInfo.play.mCcs.Set(&field_0x850[i]); + g_dComIfG_gameInfo.play.mCcs.SetMass(&field_0x850[i], 1); + } + + setAtCollision(); + } + + + dCcD_Cyl* var_r27_2 = field_0x850; + dCcD_Cyl* var_r26_6 = field_0xC04; + for (int i = 0; i < 3; i++) { + var_r26_6->SetC(var_r27_2->GetC()); + var_r26_6->SetR(var_r27_2->GetR()); + var_r26_6->SetH(var_r27_2->GetH()); + g_dComIfG_gameInfo.play.mCcs.Set(var_r26_6); + + var_r27_2++; + var_r26_6++; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -13435,6 +13853,7 @@ asm void daAlink_c::setCollision() { #include "asm/d/a/d_a_alink/setCollision__9daAlink_cFv.s" } #pragma pop +#endif /* 800AC328-800AC378 0A6C68 0050+00 1/0 0/0 0/0 .text getBaseAnimeFrame__9daAlink_cCFv */ // matches with literals @@ -13462,6 +13881,7 @@ void daAlink_c::setAnimeFrame(f32 frame) { mUnderFrameCtrl[0].setFrame(frame); mUnderFrameCtrl[1].setFrame(frame); mUnderFrameCtrl[2].setFrame(frame); + mUpperFrameCtrl[0].setFrame(frame); mUpperFrameCtrl[1].setFrame(frame); mUpperFrameCtrl[2].setFrame(frame); @@ -13469,17 +13889,17 @@ void daAlink_c::setAnimeFrame(f32 frame) { /* 800AC394-800AC450 0A6CD4 00BC+00 6/6 0/0 0/0 .text * setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff */ -void daAlink_c::setFrameCtrl(daPy_frameCtrl_c* p_ctrl, u8 attr, s16 start, s16 end, f32 rate, - f32 frame) { +void daAlink_c::setFrameCtrl(daPy_frameCtrl_c* i_ctrl, u8 i_attr, s16 i_start, s16 i_end, f32 i_rate, + f32 i_frame) { if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { if (checkZoraWearAbility()) { - rate *= daAlinkHIO_magneBoots_c0::m.mZoraWaterAnmSpeed; + i_rate *= daAlinkHIO_magneBoots_c0::m.mZoraWaterAnmSpeed; } else { - rate *= daAlinkHIO_magneBoots_c0::m.mWaterWalkAnmRate; + i_rate *= daAlinkHIO_magneBoots_c0::m.mWaterWalkAnmRate; } } - p_ctrl->setFrameCtrl(attr, start, end, rate, frame); + i_ctrl->setFrameCtrl(i_attr, i_start, i_end, i_rate, i_frame); } /* ############################################################################################## */ @@ -13662,7 +14082,7 @@ int daAlink_c::setSingleAnime(daAlink_c::daAlink_ANM i_anmID, f32 i_rate, f32 i_ * setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c */ int daAlink_c::setSingleAnimeParam(daAlink_c::daAlink_ANM i_anmID, daAlinkHIO_anm_c const* i_anmData) { - return setSingleAnime(i_anmID, i_anmData->mRate, i_anmData->mStart, i_anmData->mEndF, i_anmData->mInterpolation); + return setSingleAnime(i_anmID, i_anmData->mSpeed, i_anmData->mStartFrame, i_anmData->mEndFrame, i_anmData->mInterpolation); } /* 800AD128-800AD170 0A7A68 0048+00 1/1 0/0 0/0 .text @@ -13831,7 +14251,7 @@ asm int daAlink_c::setUnderAnime(u16 param_0, daAlink_c::daAlink_UNDER param_1, * setUnderAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UNDERPC16daAlinkHIO_anm_c */ int daAlink_c::setUnderAnimeParam(u16 i_resID, daAlink_c::daAlink_UNDER i_packIdx, daAlinkHIO_anm_c const* i_anmData) { - return setUnderAnime(i_resID, i_packIdx, i_anmData->mRate, i_anmData->mStart, i_anmData->mEndF, i_anmData->mInterpolation); + return setUnderAnime(i_resID, i_packIdx, i_anmData->mSpeed, i_anmData->mStartFrame, i_anmData->mEndFrame, i_anmData->mInterpolation); } /* 800ADAEC-800ADB78 0A842C 008C+00 17/17 0/0 0/0 .text @@ -14255,7 +14675,7 @@ BOOL daAlink_c::checkSlope() const { /* 800B221C-800B23FC 0ACB5C 01E0+00 1/0 0/0 0/0 .text setPlayerPosAndAngle__9daAlink_cFPC4cXyzsi */ -void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, s16 param_1, int param_2) { +void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, s16 i_angle, int param_2) { if (checkEventRun() || param_2 != 0 || mSpecialMode != 0) { if (p_pos != NULL) { current.pos = *p_pos; @@ -14268,9 +14688,9 @@ void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, s16 param_1, int param_2 } } - mCollisionRot.y = param_1; - current.angle.y = param_1; - field_0x2fe6 = mCollisionRot.y; + shape_angle.y = i_angle; + current.angle.y = i_angle; + field_0x2fe6 = shape_angle.y; if ((mProcID == PROC_TALK || mProcID == PROC_TRADE_ITEM_OUT) && !i_checkWolf()) { if (field_0x3198 != 0) { field_0x37c8.x = current.pos.x; @@ -14279,16 +14699,16 @@ void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, s16 param_1, int param_2 } if (i_checkMagneBootsOn() && cBgW_CheckBGround(mMagneBootsTopVec.y)) { - field_0x3118 = mCollisionRot.y; + field_0x3118 = shape_angle.y; } if (checkHorseRide()) { - i_dComIfGp_getHorseActor()->i_setHorsePosAndAngle(¤t.pos, mCollisionRot.y); + i_dComIfGp_getHorseActor()->i_setHorsePosAndAngle(¤t.pos, shape_angle.y); } else if (checkSpinnerRide()) { fopAc_ac_c* rideAc = mRideAcKeep.getActor(); rideAc->current.pos = current.pos; - rideAc->mCollisionRot.y = mCollisionRot.y; - rideAc->current.angle.y = mCollisionRot.y; + rideAc->shape_angle.y = shape_angle.y; + rideAc->current.angle.y = shape_angle.y; rideAc->mSpeed.y = FLOAT_LABEL(lit_6108); } @@ -14310,9 +14730,9 @@ void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, csXyz const* p_angle) { } if (p_angle != NULL) { - mCollisionRot = *p_angle; - current.angle.y = mCollisionRot.y; - field_0x2fe6 = mCollisionRot.y; + shape_angle = *p_angle; + current.angle.y = shape_angle.y; + field_0x2fe6 = shape_angle.y; } field_0x814.ClrCcMove(); @@ -14329,9 +14749,9 @@ void daAlink_c::setPlayerPosAndAngle(Mtx param_0) { field_0x3798 = current.pos; i_onEndResetFlg0(ERFLG0_UNK_800000); i_onEndResetFlg2(ERFLG2_UNK_100); - mDoMtx_MtxToRot(param_0, &mCollisionRot); - current.angle.y = mCollisionRot.y; - field_0x2fe6 = mCollisionRot.y; + mDoMtx_MtxToRot(param_0, &shape_angle); + current.angle.y = shape_angle.y; + field_0x2fe6 = shape_angle.y; mSpeed.y = FLOAT_LABEL(lit_6108); field_0x814.ClrCcMove(); } @@ -14354,16 +14774,16 @@ BOOL daAlink_c::itemButton() { return itemButtonCheck(1 << mSelectItemId); } -void daAlink_c::itemTrigger() { - itemTriggerCheck(1 << mSelectItemId); +BOOL daAlink_c::itemTrigger() { + return itemTriggerCheck(1 << mSelectItemId); } -void daAlink_c::spActionButton() { - itemButtonCheck(BTN_R); +BOOL daAlink_c::spActionButton() { + return itemButtonCheck(BTN_R); } -void daAlink_c::spActionTrigger() { - itemTriggerCheck(BTN_R); +BOOL daAlink_c::spActionTrigger() { + return itemTriggerCheck(BTN_R); } BOOL daAlink_c::midnaTalkTrigger() const { @@ -14385,8 +14805,10 @@ void daAlink_c::itemActionTrigger() { } /* 800B271C-800B2EA4 0AD05C 0788+00 1/1 0/0 0/0 .text setStickData__9daAlink_cFv */ +// matches with literals #ifdef NONMATCHING void daAlink_c::setStickData() { + BOOL var_r31 = false; field_0x2f8f = mItemButton; mItemTrigger = 0; mItemButton = 0; @@ -14398,7 +14820,7 @@ void daAlink_c::setStickData() { u32 demoMode = mDemo.getDemoMode(); if (checkDemoMoveMode(demoMode)) { - if (dDemo_c::m_object->getActor() != NULL) { + if (dDemo_c::m_object->getActor(mDemoActorId) != NULL) { field_0x33a8 = 1.0f; } else { field_0x33a8 = mDemo.getStick(); @@ -14433,9 +14855,9 @@ void daAlink_c::setStickData() { dComIfGp_2dShowOff(); i_onNoResetFlg2(FLG2_UNK_80); var_r31 = 1; - field_0x2fe4 = mCollisionRot.y; + field_0x2fe4 = shape_angle.y; } else { - if (field_0x33ac > 0.05f) { + if (!(field_0x33ac > 0.05f)) { field_0x2fb9 = 0; } @@ -14447,12 +14869,13 @@ void daAlink_c::setStickData() { if (usingFishRod) { dmg_rod_class* mg_rod = (dmg_rod_class*)mItemAcKeep.getActor(); - field_0x33a8 = JMAFastSqrt((mg_rod->getRodStickX() * mg_rod->getRodStickX()) + - (mg_rod->getRodStickY() * mg_rod->getRodStickY())); + f32 stick_x = mg_rod->getRodStickX() * mg_rod->getRodStickX(); + f32 stick_y = mg_rod->getRodStickY() * mg_rod->getRodStickY(); + field_0x33a8 = JMAFastSqrt(stick_x + stick_y); mStickAngle = cM_atan2s(-mg_rod->getRodStickX(), mg_rod->getRodStickY()); } else { field_0x33a8 = mDoCPd_c::getStickValue(PAD_1); - mStickAngle = mDoCPd_c::getStickAngle3D(PAD_1) - 0x8000; + mStickAngle = mDoCPd_c::getStickAngle3D(PAD_1) - -0x8000; } field_0x33ac = field_0x33a8; @@ -14460,16 +14883,16 @@ void daAlink_c::setStickData() { if (i_checkMagneBootsOn()) { if (field_0x2fb9 == 1 || - (field_0x2fb9 == 0 && field_0x3114 == -0x8000 && field_0x3114 <= 0x6000)) { + (field_0x2fb9 == 0 && field_0x3114 != -0x8000 && field_0x3114 <= 0x6000)) { field_0x2fb9 = 1; } else { field_0x2fb9 = 2; } - if (field_0x2fb9 == 1 && - ((field_0x3114 > 0x6000 || field_0x3114 == -0x8000) || - (field_0x2fb9 == 2 && field_0x3114 == -0x8000)) && - field_0x3114 < 0x4000) { + if ((field_0x2fb9 == 1 && + (field_0x3114 > 0x6000 || field_0x3114 == -0x8000)) || + (field_0x2fb9 == 2 && field_0x3114 != -0x8000 && + field_0x3114 < 0x4000)) { field_0x2fe2 = getMagneBootsLocalAngleY(field_0x2fe2, 0) + 0x8000; } else { field_0x2fe2 = getMagneBootsLocalAngleY(field_0x2fe2, field_0x2fb9); @@ -14522,7 +14945,7 @@ void daAlink_c::setStickData() { mItemButton |= BTN_R; } - if (checkHeavyStateOn(1, 1) && (!checkBootsOrArmorHeavy() || !checkNoResetFlg0(FLG0_UNDERWATER))) { + if (checkHeavyStateOn(1, 1) && (!checkBootsOrArmorHeavy() || !i_checkNoResetFlg0(FLG0_UNDERWATER))) { if (i_checkWolf() && checkHeavyStateOn(1, 0) && mSinkShapeOffset < -30.0f) { mHeavySpeedMultiplier = daAlinkHIO_magneBoots_c0::m.mInputFactor * 0.4f; } else { @@ -14536,25 +14959,25 @@ void daAlink_c::setStickData() { mHeavySpeedMultiplier = daAlinkHIO_magneBoots_c0::m.mWaterInputFactor; } field_0x33a8 *= mHeavySpeedMultiplier; - } else if (i_checkWolf() && - ((field_0x2fbc == 11 && checkWaterPolygonUnder()) || field_0x2fbb == 11)) { + } else if ((i_checkWolf() && + field_0x2fbc == 11 && checkWaterPolygonUnder()) || field_0x2fbb == 11) { i_onNoResetFlg0(FLG0_UNK_40000000); - field_0x33a8 *= daAlinkHIO_wolf_c0::m.mSwampInputRate; - mHeavySpeedMultiplier = daAlinkHIO_wolf_c0::m.mSwampInputRate; + field_0x33a8 *= daAlinkHIO_wolf_c0::m.mUnderwaterInputRate; + mHeavySpeedMultiplier = daAlinkHIO_wolf_c0::m.mUnderwaterInputRate; } } - s16 sub = mStickAngle - field_0x307c; - int x = abs(sub); + s16 angle_diff = mStickAngle - mPrevStickAngle; + int abs_v = abs(angle_diff); - if (x < 0x4000 && x > 0x6D4 && field_0x3180 * sub > 0) { - field_0x3180 += sub; - field_0x307a = 4; - } else if (field_0x3180 * sub < 0) { - field_0x3180 = sub; - field_0x307a = 4; - } else if (field_0x307a > 0) { - field_0x307a--; + if (abs_v < 0x4000 && abs_v > 0x6D4 && field_0x3180 * angle_diff >= 0) { + field_0x3180 += angle_diff; + mStickSpinTimer = 4; + } else if (field_0x3180 * angle_diff < 0) { + field_0x3180 = angle_diff; + mStickSpinTimer = 4; + } else if (mStickSpinTimer > 0) { + mStickSpinTimer--; } else { field_0x3180 = 0; } @@ -14563,7 +14986,7 @@ void daAlink_c::setStickData() { i_offNoResetFlg0(FLG0_UNK_10000000); } - if (!var_r31 && checkNoResetFlg2(FLG2_UNK_80)) { + if (!var_r31 && i_checkNoResetFlg2(FLG2_UNK_80)) { i_offNoResetFlg2(FLG2_UNK_80); dComIfGp_2dShowOn(); } @@ -14632,8 +15055,8 @@ asm BOOL daAlink_c::checkAtnWaitAnime() { /* 800B3358-800B33E4 0ADC98 008C+00 2/2 0/0 0/0 .text * setTiredVoice__9daAlink_cFP16daPy_frameCtrl_c */ -void daAlink_c::setTiredVoice(daPy_frameCtrl_c* param_0) { - if (param_0->checkPass(lit_7448)) { +void daAlink_c::setTiredVoice(daPy_frameCtrl_c* i_frameCtrl) { + if (i_frameCtrl->checkPass(lit_7448)) { if (i_dComIfGs_getLife() <= 2) { voiceStart(Z2SE_AL_V_TIRED_L); } else { @@ -14674,7 +15097,7 @@ int daAlink_c::getDirectionFromAngle(s16 angle) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkAttentionState() { +asm bool daAlink_c::checkAttentionState() { nofralloc #include "asm/d/a/d_a_alink/checkAttentionState__9daAlink_cFv.s" } @@ -14684,7 +15107,7 @@ asm void daAlink_c::checkAttentionState() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getShapeAngleYAtnActor() { +asm s16 daAlink_c::getShapeAngleYAtnActor() { nofralloc #include "asm/d/a/d_a_alink/getShapeAngleYAtnActor__9daAlink_cFv.s" } @@ -14694,7 +15117,7 @@ asm void daAlink_c::getShapeAngleYAtnActor() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::setShapeAngleToAtnActor(int param_0) { +asm bool daAlink_c::setShapeAngleToAtnActor(int param_0) { nofralloc #include "asm/d/a/d_a_alink/setShapeAngleToAtnActor__9daAlink_cFi.s" } @@ -14772,7 +15195,7 @@ int daAlink_c::checkRequestTalkActor(dAttList_c* param_0, fopAc_ac_c* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkServiceWaitMode() { +asm bool daAlink_c::checkServiceWaitMode() { nofralloc #include "asm/d/a/d_a_alink/checkServiceWaitMode__9daAlink_cFv.s" } @@ -14949,14 +15372,57 @@ asm void daAlink_c::setStepLandVibration() { #endif /* 800B5CCC-800B5F6C 0B060C 02A0+00 5/5 0/0 0/0 .text checkLandAction__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkLandAction(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkLandAction__9daAlink_cFi.s" +BOOL daAlink_c::checkLandAction(int param_0) { + f32 temp_f31 = lit_8782 * (mFallHeight - current.pos.y); + int temp_r3 = getDirectionFromCurrentAngle(); + int temp_r27 = getDirectionFromAngle(current.angle.y - shape_angle.y); + BOOL var_r29 = field_0x33a8 > lit_14064 && temp_r27 != 1 && !checkGrabAnime() && mProcID != PROC_CUT_HEAD && temp_r3 == DIR_FORWARD; + + if ((param_0 || temp_f31 >= daAlinkHIO_damFall_c0::m.mMinRollHeight) && temp_f31 < daAlinkHIO_damFall_c0::m.mMaxRollHeight && var_r29) { + if (temp_r27 == DIR_FORWARD) { + procFrontRollInit(); + } else { + procSideRollInit(temp_r27); + } + } else if (checkNoLandDamageSlidePolygon() || temp_f31 < daAlinkHIO_damFall_c0::m.mSmallDmgHeight) { + if (param_0) { + procLandDamageInit(0); + } else if (var_r29 && field_0x30f0 > 0x32) { + if (temp_r27 == DIR_FORWARD) { + procFrontRollInit(); + } else { + procSideRollInit(temp_r27); + } + } else if (checkInputOnR() && temp_r27 == DIR_FORWARD && temp_r3 == DIR_FORWARD && mNormalSpeed > lit_7808) { + if (mNormalSpeed > daAlinkHIO_move_c0::m.mMaxSpeed) { + mNormalSpeed = daAlinkHIO_move_c0::m.mMaxSpeed; + } + mNormalSpeed *= lit_6023; + current.angle.y = shape_angle.y; + procMoveInit(); + setFootEffectProcType(2); + field_0x2f9d = 4; + resetBasAnime(); + seStartMapInfo(0x30001); + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + dComIfGp_getVibration().StartShock(1, 15, cXyz(tmp_0, lit_6040, tmp_0)); + } else { + procLandInit(temp_f31); + } + } else { + int var_r4; + if (temp_f31 < daAlinkHIO_damFall_c0::m.mBigDmgHeight) { + var_r4 = 1; + } else { + var_r4 = 2; + } + + procLandDamageInit(var_r4); + } + + return 1; } -#pragma pop /* 800B5F6C-800B607C 0B08AC 0110+00 3/3 0/0 0/0 .text checkSlideAction__9daAlink_cFv */ #pragma push @@ -14980,7 +15446,7 @@ asm BOOL daAlink_c::checkAutoJumpAction() { #pragma pop /* 800B69CC-800B6A30 0B130C 0064+00 2/2 0/0 0/0 .text checkCutJumpInFly__9daAlink_cFv */ -bool daAlink_c::checkCutJumpInFly() { +BOOL daAlink_c::checkCutJumpInFly() { if ((mEquipItem == EQUIP_SWORD && i_checkResetFlg0(RFLG0_UNK_80)) || checkForceSwordSwing()) { return procCutJumpInit(1); } @@ -15005,21 +15471,39 @@ asm BOOL daAlink_c::checkFrontWallTypeAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkItemActionInitStart() { +asm int daAlink_c::checkItemActionInitStart() { nofralloc #include "asm/d/a/d_a_alink/checkItemActionInitStart__9daAlink_cFv.s" } #pragma pop /* 800B7090-800B7168 0B19D0 00D8+00 1/1 0/0 0/0 .text checkItemChangeAutoAction__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkItemChangeAutoAction() { - nofralloc -#include "asm/d/a/d_a_alink/checkItemChangeAutoAction__9daAlink_cFv.s" +int daAlink_c::checkItemChangeAutoAction() { + if (i_checkResetFlg0(RFLG0_UNK_80)) { + if (mEquipItem == 0x103) { + if (i_checkModeFlg(0x40000)) { + return 0; + } + + resetUpperAnime(UPPER_2, lit_6041); + + if (checkBoardRide()) { + return checkBoardSwordTriggerAction(); + } else if (i_checkReinRide()) { + return procHorseCutChargeReadyInit(); + } + + return procCutTurnChargeInit(); + } + + int ivar2 = checkItemActionInitStart(); + if (ivar2 != -1) { + return ivar2; + } + } + + return 0; } -#pragma pop /* 800B7168-800B7190 0B1AA8 0028+00 7/7 0/0 0/0 .text setFastShotTimer__9daAlink_cFv */ void daAlink_c::setFastShotTimer() { @@ -15042,7 +15526,7 @@ asm void daAlink_c::cancelItemUseQuake(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::cancelUpperItemReadyAnime(int param_0) { +asm int daAlink_c::cancelUpperItemReadyAnime(int param_0) { nofralloc #include "asm/d/a/d_a_alink/cancelUpperItemReadyAnime__9daAlink_cFi.s" } @@ -15050,14 +15534,27 @@ asm void daAlink_c::cancelUpperItemReadyAnime(int param_0) { /* 800B72E4-800B7390 0B1C24 00AC+00 8/8 0/0 0/0 .text checkItemActorPointer__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkItemActorPointer() { - nofralloc -#include "asm/d/a/d_a_alink/checkItemActorPointer__9daAlink_cFv.s" +BOOL daAlink_c::checkItemActorPointer() { + if (mItemAcKeep.getActor() != NULL) { + return true; + } + + mItemAcKeep.clearData(); + resetUpperAnime(UPPER_2, lit_6041); + mEquipItem = NO_ITEM; + + if (i_checkModeFlg(MODE_RIDING)) { + if (checkCanoeRide()) { + procCanoeWaitInit(0); + } else { + procHorseWaitInit(); + } + } else { + procWaitInit(); + } + + return false; } -#pragma pop /* 800B7390-800B74B4 0B1CD0 0124+00 2/2 0/0 0/0 .text checkSwordTwirlAction__9daAlink_cFv */ @@ -15085,21 +15582,24 @@ BOOL daAlink_c::checkUpperItemActionFly() { /* 800B7528-800B75EC 0B1E68 00C4+00 1/1 0/0 0/0 .text checkItemButtonChange__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkItemButtonChange() { - nofralloc -#include "asm/d/a/d_a_alink/checkItemButtonChange__9daAlink_cFv.s" +void daAlink_c::checkItemButtonChange() { + if (mProcID != PROC_CANOE_PADDLE_PUT && mEquipItem != NO_ITEM && !checkEquipAnime()) { + u8 temp_r0; + for (u8 i = 0; i < 2; i++) { + temp_r0 = (i + 1) % 2; + if (mEquipItem == dComIfGp_getSelectItem(i) && (mEquipItem != dComIfGp_getSelectItem(temp_r0) || mSelectItemId != temp_r0)) { + mSelectItemId = i; + } + } + } } -#pragma pop /* 800B75EC-800B7B7C 0B1F2C 0590+00 1/1 0/0 0/0 .text checkUpperItemAction__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkUpperItemAction() { +asm BOOL daAlink_c::checkUpperItemAction() { nofralloc #include "asm/d/a/d_a_alink/checkUpperItemAction__9daAlink_cFv.s" } @@ -15107,7 +15607,7 @@ asm void daAlink_c::checkUpperItemAction() { /* 800B7B7C-800B7BF8 0B24BC 007C+00 1/1 0/0 0/0 .text orderPeep__9daAlink_cFv */ void daAlink_c::orderPeep() { - field_0x2fad = ((kytag05_class*)field_0x27f4)->getSceneListID(); + mPeepExitID = ((kytag05_class*)field_0x27f4)->getSceneListID(); field_0x2ff2 = 20; fopAcM_orderOtherEvent(this, field_0x27f4, l_peepEventName, 0xFFFF, 1, 0); if (i_checkWolf()) { @@ -15191,7 +15691,8 @@ asm int daAlink_c::orderZTalk() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkNormalAction(){nofralloc +asm int daAlink_c::checkNormalAction(){ + nofralloc #include "asm/d/a/d_a_alink/checkNormalAction__9daAlink_cFv.s" } #pragma pop @@ -15213,14 +15714,14 @@ bool daAlink_c::checkReadyItem() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkItemAction() { +asm BOOL daAlink_c::checkItemAction() { nofralloc #include "asm/d/a/d_a_alink/checkItemAction__9daAlink_cFv.s" } #pragma pop /* 800B9010-800B9018 0B3950 0008+00 1/1 0/0 0/0 .text checkRAction__9daAlink_cFv */ -bool daAlink_c::checkRAction() { +BOOL daAlink_c::checkRAction() { return false; } @@ -15228,7 +15729,7 @@ bool daAlink_c::checkRAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkMoveDoAction() { +asm BOOL daAlink_c::checkMoveDoAction() { nofralloc #include "asm/d/a/d_a_alink/checkMoveDoAction__9daAlink_cFv.s" } @@ -15268,67 +15769,37 @@ asm BOOL daAlink_c::checkSideRollAction(int param_0) { /* 800B9254-800B92D0 0B3B94 007C+00 35/35 0/0 0/0 .text checkNoUpperAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkNoUpperAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkNoUpperAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkNoUpperAnime() const { + return checkNoSetUpperAnime() || checkSwimMoveHandAnime() || checkWindDashAnime() || checkSwordTwirlAnime() || checkKandelaarEquipAnime(); } -#pragma pop /* 800B92D0-800B92F8 0B3C10 0028+00 1/1 0/0 0/0 .text checkOneHandItemEquipAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkOneHandItemEquipAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkOneHandItemEquipAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkOneHandItemEquipAnime() const { + return checkUpperAnime(0x247) || checkUpperAnime(0x248); } -#pragma pop /* 800B92F8-800B9340 0B3C38 0048+00 1/1 0/0 0/0 .text checkItemEquipAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkItemEquipAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkItemEquipAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkItemEquipAnime() const { + return checkTwoHandItemEquipAnime() || checkOneHandItemEquipAnime(); } -#pragma pop /* 800B9340-800B9398 0B3C80 0058+00 30/30 0/0 1/1 .text checkEquipAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkEquipAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkEquipAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkEquipAnime() const { + return checkSwordEquipAnime() || checkItemEquipAnime(); } -#pragma pop /* 800B9398-800B93CC 0B3CD8 0034+00 4/4 0/0 0/0 .text checkWindDashAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkWindDashAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWindDashAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkWindDashAnime() const { + return checkUpperAnime(0x2B7) || (checkUpperAnime(0xCE) && mProcID != PROC_SLIDE); } -#pragma pop /* 800B93CC-800B93F4 0B3D0C 0028+00 4/4 0/0 0/0 .text checkSwordTwirlAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSwordTwirlAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkSwordTwirlAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkSwordTwirlAnime() const { + return checkUpperAnime(0x40) || checkUpperAnime(0x3F); } -#pragma pop /* ############################################################################################## */ /* 804532B8-804532BC 0018B8 0004+00 1/1 0/0 0/0 .sdata2 @68266 */ @@ -15345,19 +15816,27 @@ asm void daAlink_c::swordEquip(int param_0) { #pragma pop /* 800B9580-800B9640 0B3EC0 00C0+00 1/1 0/0 0/0 .text swordUnequip__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::swordUnequip() { - nofralloc -#include "asm/d/a/d_a_alink/swordUnequip__9daAlink_cFv.s" +void daAlink_c::swordUnequip() { + f32 anm_speed; + if (checkFastUnequip()) { + anm_speed = daAlinkHIO_cut_c0::m.mFastUnequipAnmSpeed; + } else { + anm_speed = daAlinkHIO_cut_c0::m.mUnequipAnm.mSpeed; + } + + u16 anm_id = i_checkReinRide() ? (u16)0x261 : (u16)0x255; + + setUpperAnime(anm_id, UPPER_2, anm_speed, + daAlinkHIO_cut_c0::m.mUnequipAnm.mStartFrame, daAlinkHIO_cut_c0::m.mUnequipAnm.mEndFrame, + daAlinkHIO_cut_c0::m.mUnequipAnm.mInterpolation); + setFacePriTexture(FTANM_UNK_2D); + setFaceBck(0x15E, 1, 0xFFFF); } -#pragma pop /* 800B9640-800B96A4 0B3F80 0064+00 6/6 0/0 0/0 .text itemEquip__9daAlink_cFUs */ -void daAlink_c::itemEquip(u16 item_id) { - if (mThrowBoomerangAcKeep.getActor() == NULL || item_id != BOOMERANG) { - field_0x2fde = item_id; +void daAlink_c::itemEquip(u16 i_itemID) { + if (mThrowBoomerangAcKeep.getActor() == NULL || i_itemID != BOOMERANG) { + field_0x2fde = i_itemID; dComIfGp_clearPlayerStatus0(0, 0x400000); i_offNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); itemUnequip(field_0x2fde, lit_6041); @@ -15365,14 +15844,53 @@ void daAlink_c::itemEquip(u16 item_id) { } /* 800B96A4-800B97EC 0B3FE4 0148+00 2/2 0/0 0/0 .text itemUnequip__9daAlink_cFUsf */ +/** + * This handles setting the animation for both equipping and unequipping items + * When `param_1` is positive, it will play the unequip animation + * When `param_1` is negative, it will play the equip animation + * + */ +// matches with literals +#ifdef NONMATCHING +void daAlink_c::itemUnequip(u16 i_itemID, f32 i_playSpeed) { + u16 anm_id; + const daAlinkHIO_anm_c* anm_data; + + if (i_itemID == BOOMERANG || i_itemID == COPY_ROD || i_itemID == KANTERA || + i_itemID == HOOKSHOT || checkBottleItem(i_itemID)) { + anm_id = 0x247; + anm_data = &daAlinkHIO_item_c0::m.mOneHandEquipAnm; + } else if (checkBowAndSlingItem(i_itemID)) { + anm_id = checkBowGrabLeftHand() ? (u16)0x247 : (u16)0x248; + anm_data = &daAlinkHIO_item_c0::m.mOneHandEquipAnm; + } else { + anm_id = 0x245; + anm_data = &daAlinkHIO_item_c0::m.mTwoHandEquipAnm; + } + + f32 anm_speed; + if (i_playSpeed > 0.0f && checkFastUnequip()) { + if (anm_id == 0x245) { + anm_speed = daAlinkHIO_item_c0::m.mTwoHandReleaseAnmSpeed; + } else { + anm_speed = daAlinkHIO_item_c0::m.mOneHandReleaseAnmSpeed; + } + } else { + anm_speed = anm_data->mSpeed * i_playSpeed; + } + + setUpperAnime(anm_id, UPPER_2, anm_speed, anm_data->mStartFrame, anm_data->mEndFrame, anm_data->mInterpolation); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::itemUnequip(u16 param_0, f32 param_1) { +asm void daAlink_c::itemUnequip(u16 i_itemID, f32 i_playSpeed) { nofralloc #include "asm/d/a/d_a_alink/itemUnequip__9daAlink_cFUsf.s" } #pragma pop +#endif /* 800B97EC-800B983C 0B412C 0050+00 2/2 0/0 0/0 .text checkFastUnequip__9daAlink_cFv */ bool daAlink_c::checkFastUnequip() { @@ -15380,44 +15898,183 @@ bool daAlink_c::checkFastUnequip() { } /* 800B983C-800B994C 0B417C 0110+00 10/10 0/0 0/0 .text allUnequip__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::allUnequip(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/allUnequip__9daAlink_cFi.s" +void daAlink_c::allUnequip(int param_0) { + if (i_checkNoResetFlg2(FLG2_UNK_1) && param_0 != 0 && !checkCanoeRide() && mEquipItem != KANTERA) { + for (u8 i = 0; i < 2; i++) { + if (dComIfGp_getSelectItem(i) == KANTERA) { + mSelectItemId = i; + } + } + itemEquip(KANTERA); + i_onNoResetFlg1(FLG1_UNK_40); + return; + } else if (mEquipItem == 0x103) { + swordUnequip(); + } else if (mEquipItem == 0x102) { + deleteEquipItem(0, 0); + field_0x2060->initOldFrameMorf(lit_7808, 0, 35); + } else { + itemUnequip(mEquipItem, lit_6040); + } + + field_0x2fde = 0xFF; } -#pragma pop /* 800B994C-800B9D2C 0B428C 03E0+00 8/8 0/0 0/0 .text checkItemChangeFromButton__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkItemChangeFromButton() { - nofralloc -#include "asm/d/a/d_a_alink/checkItemChangeFromButton__9daAlink_cFv.s" +BOOL daAlink_c::checkItemChangeFromButton() { + if (i_checkModeFlg(4) && !checkEquipAnime() && !checkBoomerangThrowAnime() && + !checkCopyRodThrowAnime() && !checkKandelaarSwingAnime() && !checkKandelaarSwingAnime()) { + + if (dComIfGs_getSelectEquipSword() != NO_ITEM && !checkNotBattleStage() && !checkCanoeRide() && + (!i_checkModeFlg(0x40000) || i_checkEquipHeavyBoots()) && mEquipItem != 0x103 && swordTrigger()) { + if (i_checkEndResetFlg1(ERFLG1_UNK_40000000)) { + return 0; + } + + swordEquip(1); + } else if (checkCanoeRide() && !checkStageName("F_SP103") && !checkCanoeSlider() && + !checkFisingRodLure() && swordTrigger()) { + itemEquip(0x105); + } else { + u8 i; + for (i = 0; i < 2; i++) { + int tmp = checkNewItemChange(i); + if (tmp && itemTriggerCheck(1 << i)) { + return changeItemTriggerKeepProc(i, tmp); + } + } + + if (doTrigger() && i_dComIfGp_getDoStatus() == 4) { + if (mEquipItem != KANTERA && i_checkNoResetFlg2(FLG2_UNK_1)) { + offKandelaarModel(); + } else if (mSwordFlourishTimer != 0 && mEquipItem == 0x103 && !checkWoodSwordEquip() && !i_checkModeFlg(0x402)) { + return procSwordUnequipSpInit(); + } else { + allUnequip(1); + } + } else if (mEquipItem == NO_ITEM && mThrowBoomerangAcKeep.getActor() == NULL && + !checkCanoeRide() && checkNoUpperAnime() && i_checkNoResetFlg2(FLG2_UNK_1)) { + for (i = 0; i < 2; i++) { + if (dComIfGp_getSelectItem(i) == KANTERA) { + mSelectItemId = i; + } + } + + itemEquip(KANTERA); + i_onNoResetFlg1(FLG1_UNK_40); + } else if (mEquipItem != 0x103 && mEquipItem != NO_ITEM && mEquipItem != 0x10B && + mEquipItem != 0x102 && (!checkCanoeRide() || !checkFisingRodLure())) { + if (!checkEventRun() || strcmp(i_dComIfGp_getEventManager().getRunEventName(), "ANGER")) { + if (strcmp(i_dComIfGp_getEventManager().getRunEventName(), "ANGER2") && checkItemSetButton(mEquipItem) == 2) { + allUnequip(1); + } + } + } + } + } + + return 0; } -#pragma pop /* 800B9D2C-800B9F50 0B466C 0224+00 12/12 0/0 0/0 .text checkNextActionFromButton__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkNextActionFromButton() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionFromButton__9daAlink_cFv.s" +BOOL daAlink_c::checkNextActionFromButton() { + if (checkItemChangeAutoAction()) { + return 1; + } + + if (checkUpperItemAction()) { + return 1; + } + + if (checkDkCaught2Anime()) { + return 0; + } + + if (i_checkModeFlg(0x400)) { + if (i_dComIfGp_getDoStatus() == 0 && checkCanoeRide() && checkFisingRodLure()) { + setDoStatus(4); + } + } else if (!i_checkModeFlg(0x40000)) { + if ((i_checkWolf() && !checkWolfGrabAnime()) || + (!i_checkWolf() && getCopyRodControllActor() == NULL && (checkEquipAnime() || + i_checkNoResetFlg0(FLG0_UNK_1000000) || checkUpperGuardAnime() || + checkIronBallWaitAnime() || checkNoUpperAnime()))) { + decideDoStatus(); + + if (checkNormalAction()) { + return 1; + } + } else { + decideCommonDoStatus(); + } + } + + if (cancelUpperItemReadyAnime(0)) { + return 1; + } + + if (checkItemAction()) { + return 1; + } + + if (!i_checkModeFlg(0x40400)) { + if (checkRAction()) { + return 1; + } + + if (checkMoveDoAction()) { + return 1; + } + } + + if (!i_checkModeFlg(0x40000) && checkSubjectAction()) { + return 1; + } + + return checkItemChangeFromButton(); } -#pragma pop /* 800B9F50-800BA09C 0B4890 014C+00 14/14 0/0 0/0 .text checkGroundSpecialMode__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkGroundSpecialMode() { - nofralloc -#include "asm/d/a/d_a_alink/checkGroundSpecialMode__9daAlink_cFv.s" +BOOL daAlink_c::checkGroundSpecialMode() { + if (mLinkAcch.ChkGroundHit() && !i_checkModeFlg(MODE_PLAYER_FLY) && !i_checkMagneBootsOn() && i_checkEndResetFlg0(ERFLG0_UNK_2)) { + return procCoMetamorphoseInit(); + } + + if (mLinkAcch.ChkGroundHit() && !i_checkModeFlg(MODE_PLAYER_FLY) && checkBoardRestart()) { + return procBoardWaitInit(mRideAcKeep.getActor()); + } + + if (checkGoatStopGame()) { + return procGoatMoveInit(); + } + + if (mSpecialMode == 1) { + return procSumouReadyInit(); + } + + if (i_checkGoronSideMove()) { + return procGoronMoveInit(); + } + + if (checkCanoeSlider()) { + return procCanoeJumpRideInit(NULL); + } + + if (checkSlideAction()) { + return 1; + } + + fopAc_ac_c* actor = checkGoronRide(); + if (actor != NULL) { + return procGoronRideWaitInit(actor); + } + + if (i_checkEndResetFlg1(ERFLG1_UNK_1)) { + return procScreamWaitInit(); + } + + return NULL; } -#pragma pop /* 800BA09C-800BA0D0 0B49DC 0034+00 4/4 0/0 0/0 .text commonCheckNextAction__9daAlink_cFi */ @@ -15430,6 +16087,121 @@ void daAlink_c::commonCheckNextAction(int param_0) { } /* 800BA0D0-800BA6A0 0B4A10 05D0+00 91/91 0/0 0/0 .text checkNextAction__9daAlink_cFi */ +// checkAttentionLock issue / literals +#ifdef NONMATCHING +#pragma push +#pragma optimization_level 2 +int daAlink_c::checkNextAction(int param_0) { + f32 temp_f31 = field_0x594; + + if (checkDeadAction(1)) { + return 1; + } + + if (checkGroundSpecialMode()) { + return 1; + } + + u32 procID = mProcID; + if (procID != PROC_MOVE_TURN && (param_0 == 0 || checkInputOnR()) && (procID != PROC_HOOKSHOT_MOVE || checkHookshotWait())) { + if (mTargetedActor != NULL || i_checkAttentionLock()) { + setSpeedAndAngleAtn(); + } else if (((!checkUpperReadyThrowAnime() || mFastShotTime != 0) || + (checkBoomerangThrowAnime() && (mThrowBoomerangAcKeep.getActor() != NULL || mEquipItem == 0x102 || i_checkNoResetFlg1(FLG1_UNK_2)))) || + (checkCopyRodThrowAnime() && (mCopyRodAcKeep.getActor() != NULL || i_checkNoResetFlg1(FLG1_UNK_10000)))) { + setSpeedAndAngleNormal(); + } + } + + setFrontWallType(); + + bool attention_state = checkAttentionState(); + if (attention_state) { + if (i_checkFmChainGrabAnime()) { + field_0x594 = 13.0f; + } else if (mTargetedActor != NULL) { + field_0x594 = daAlinkHIO_atnMove_c0::m.mMaxSpeed; + } else { + field_0x594 = daAlinkHIO_noActAtnMove_c0::m.mMaxSpeed; + } + } else if (checkSlope()) { + field_0x594 = daAlinkHIO_slide_c0::m.mMaxClimbSpeed; + } else { + field_0x594 = daAlinkHIO_move_c0::m.mMaxSpeed; + } + + if (i_checkEndResetFlg0(ERFLG0_UNK_100000) && mLinkAcch.ChkGroundHit() && !i_checkModeFlg(MODE_PLAYER_FLY)) { + return procFloorDownReboundInit(); + } + + if (checkCutDashChargeAnime() && !checkDashAnime()) { + return procCutTurnMoveInit(0); + } + + if (checkNextActionFromButton()) { + return 1; + } + + if (param_0 != 0 && !checkInputOnR() && !checkEquipAnime()) { + field_0x594 = temp_f31; + return 0; + } + + int ret; + if (attention_state) { + if (checkBowAnime()) { + ret = checkNextActionBow(); + } else if (checkBoomerangAnimeAndReturnWait() && mEquipItem != 0x102) { + ret = checkNextActionBoomerang(); + } else if (checkCopyRodAnime()) { + ret = checkNextActionCopyRod(); + } else if (checkHookshotAnime()) { + ret = checkNextActionHookshot(); + } else if (checkIronBallAnime()) { + ret = checkNextActionIronBall(); + } else if (mTargetedActor != NULL || mDemo.getDemoMode() == 0x17) { + if (checkZeroSpeedF()) { + ret = procAtnActorWaitInit(); + } else { + ret = procAtnActorMoveInit(); + } + } else if (checkZeroSpeedF()) { + ret = checkWaitAction(); + } else { + ret = procAtnMoveInit(); + } + } else { + field_0x2f98 = 4; + + if (checkZeroSpeedF()) { + if (cLib_distanceAngleS(field_0x2fe2, current.angle.y) > 0x7800 && checkInputOnR()) { + ret = procWaitTurnInit(); + if (!ret && !checkEventRun()) { + ret = checkWaitAction(); + } + } else { + ret = checkWaitAction(); + } + } else if (mProcID == PROC_MOVE_TURN && current.angle.y != shape_angle.y) { + ret = procMoveTurnInit(0); + } else if (checkInputOnR() && cLib_distanceAngleS(field_0x2fe2, current.angle.y) > 0x7800) { + if (mSpeedF / field_0x594 > daAlinkHIO_move_c0::m.mSlideThresholdSpeed && field_0x2fa8 != 8 && + !checkGrabAnime() && getDirectionFromAngle(mPrevStickAngle - mStickAngle) == DIR_BACKWARD) { + ret = procSlipInit(); + } else { + ret = procMoveTurnInit(1); + } + } else if (checkInputOnR() && getDirectionFromAngle(field_0x2fe2 - current.angle.y) == DIR_BACKWARD) { + ret = procMoveTurnInit(1); + } else { + ret = procMoveInit(); + } + } + + return ret; +} +#pragma pop +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -15438,6 +16210,7 @@ asm int daAlink_c::checkNextAction(int param_0) { #include "asm/d/a/d_a_alink/checkNextAction__9daAlink_cFi.s" } #pragma pop +#endif /* 800BA6A0-800BA914 0B4FE0 0274+00 3/3 0/0 0/0 .text commonChangeItem__9daAlink_cFv */ #pragma push @@ -15464,66 +16237,80 @@ asm void daAlink_c::setItemAction() { #pragma pop /* 800BAF08-800BAF80 0B5848 0078+00 2/2 0/0 0/0 .text checkNextActionFromCrouch__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionFromCrouch(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionFromCrouch__9daAlink_cFi.s" +bool daAlink_c::checkNextActionFromCrouch(int param_0) { + if (checkNextAction(param_0)) { + if (field_0x2f8c == 1 || field_0x2f8c == 2 || field_0x2f8c == 3) { + field_0x2060->initOldFrameMorf(daAlinkHIO_crouch_c0::m.mStandInterpolation, 0, 0x23); + } + + return true; + } + + return false; } -#pragma pop /* 800BAF80-800BB020 0B58C0 00A0+00 18/18 0/0 0/0 .text checkUpperReadyThrowAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::checkUpperReadyThrowAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperReadyThrowAnime__9daAlink_cCFv.s" +int daAlink_c::checkUpperReadyThrowAnime() const { + return checkBoomerangAnime() || checkCopyRodAnime() || checkHookshotAnime() || checkIronBallAnime() || checkBowAnime(); } -#pragma pop /* 800BB020-800BB084 0B5960 0064+00 2/2 0/0 0/0 .text getBodyAngleXBasePos__9daAlink_cFP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBodyAngleXBasePos(cXyz* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/getBodyAngleXBasePos__9daAlink_cFP4cXyz.s" +void daAlink_c::getBodyAngleXBasePos(cXyz* o_pos) { + int mtx_id; + + if (mProcID == PROC_HOOKSHOT_WALL_SHOOT || mProcID == PROC_HOOKSHOT_ROOF_SHOOT) { + if (field_0x3020 == 0) { + mtx_id = 7; + } else { + mtx_id = 12; + } + } else { + mtx_id = 1; + } + + mDoMtx_multVecZero(mpLinkModel->i_getAnmMtx(mtx_id), o_pos); } -#pragma pop /* 800BB084-800BB2B0 0B59C4 022C+00 3/3 0/0 0/0 .text getBodyAngleXAtnActor__9daAlink_cFi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getBodyAngleXAtnActor(int param_0) { +asm s16 daAlink_c::getBodyAngleXAtnActor(int param_0) { nofralloc #include "asm/d/a/d_a_alink/getBodyAngleXAtnActor__9daAlink_cFi.s" } #pragma pop /* 800BB2B0-800BB324 0B5BF0 0074+00 13/13 0/0 0/0 .text setBodyAngleXReadyAnime__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBodyAngleXReadyAnime(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setBodyAngleXReadyAnime__9daAlink_cFi.s" +void daAlink_c::setBodyAngleXReadyAnime(int param_0) { + s16 angle_x = getBodyAngleXAtnActor(param_0); + + if (checkUpperGuardAnime()) { + angle_x >>= 1; // divide by 2 adds extra addze? + } + + cLib_addCalcAngleS(&mLookAngleY, angle_x, 4, 0x0C00, 0x0180); + field_0x310a = mLookAngleY; } -#pragma pop /* 800BB324-800BB408 0B5C64 00E4+00 2/2 0/0 0/0 .text setMagicArmorBrk__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setMagicArmorBrk(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setMagicArmorBrk__9daAlink_cFi.s" +void daAlink_c::setMagicArmorBrk(int param_0) { + J3DModelData* model_data = mpLinkModel->getModelData(); + mMagicArmorBodyBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_mArcName, bodyBrkName[param_0]); + mMagicArmorBodyBrk->searchUpdateMaterialID(model_data); + model_data->entryTevRegAnimator(mMagicArmorBodyBrk); + mMagicArmorBodyBrk->setFrame(FLOAT_LABEL(lit_6108)); + + J3DModelData* head_model_data = mpLinkHatModel->getModelData(); + mMagicArmorHeadBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_mArcName, headBrkName[param_0]); + mMagicArmorHeadBrk->searchUpdateMaterialID(head_model_data); + head_model_data->entryTevRegAnimator(mMagicArmorHeadBrk); + mMagicArmorHeadBrk->setFrame(FLOAT_LABEL(lit_6108)); + + field_0x2fd7 = param_0; } -#pragma pop /* 800BB408-800BB458 0B5D48 0050+00 6/6 0/0 0/0 .text checkMagicArmorHeavy__9daAlink_cCFv */ @@ -15551,35 +16338,61 @@ BOOL daAlink_c::checkHeavyStateOn(int param_0, int param_1) { } /* 800BB560-800BB644 0B5EA0 00E4+00 1/0 0/0 0/0 .text setOutPower__9daAlink_cFfsi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setOutPower(f32 param_0, s16 param_1, int param_2) { - nofralloc -#include "asm/d/a/d_a_alink/setOutPower__9daAlink_cFfsi.s" +void daAlink_c::setOutPower(f32 param_0, s16 param_1, int param_2) { + if (!i_checkFmChainGrabAnime() || !checkBossRoom() || fopAcM_GetRoomNo(this) != 50 || !i_checkEquipHeavyBoots()) { + field_0x3400 += param_0 * cM_ssin(param_1); + field_0x3404 += param_0 * cM_scos(param_1); + + if (param_2) { + i_onEndResetFlg0(ERFLG0_UNK_8); + } + } } -#pragma pop /* 800BB644-800BB770 0B5F84 012C+00 3/3 0/0 0/0 .text initGravity__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initGravity() { - nofralloc -#include "asm/d/a/d_a_alink/initGravity__9daAlink_cFv.s" +void daAlink_c::initGravity() { + f32 gravity; + f32 max_fall_speed; + + if (i_checkWolf()) { + if (i_checkModeFlg(MODE_SWIMMING)) { + if (checkHeavyStateOn(1, 1)) { + gravity = -daAlinkHIO_wlSwim_c0::m.field_0x9C; + max_fall_speed = daAlinkHIO_wlSwim_c0::m.field_0xA0; + } else { + gravity = -daAlinkHIO_wlSwim_c0::m.field_0x60; + max_fall_speed = daAlinkHIO_wlSwim_c0::m.field_0x58; + } + } else { + gravity = daAlinkHIO_wlAutoJump_c0::m.field_0x58; + max_fall_speed = daAlinkHIO_wlAutoJump_c0::m.field_0x5c; + } + } else if (i_checkModeFlg(MODE_SWIMMING) || i_checkNoResetFlg0(FLG0_UNDERWATER)) { + max_fall_speed = getSwimMaxFallSpeed(); + if (checkHeavyStateOn(1, 1) && mProcID != PROC_OCTAIEAL_SPIT) { + gravity = daAlinkHIO_swim_c0::m.mBootsGravity; + } else { + gravity = -daAlinkHIO_swim_c0::m.mBuoyancy; + } + } else { + gravity = daAlinkHIO_autoJump_c0::m.mGravity; + max_fall_speed = daAlinkHIO_autoJump_c0::m.mMaxFallSpeed; + } + + setSpecialGravity(gravity, max_fall_speed, 1); } -#pragma pop /* 800BB770-800BB7A0 0B60B0 0030+00 64/64 0/0 0/0 .text setSpecialGravity__9daAlink_cFffi */ -void daAlink_c::setSpecialGravity(f32 gravity, f32 speed, int param_2) { - if (param_2 != 0) { +void daAlink_c::setSpecialGravity(f32 i_gravity, f32 i_speed, int i_offFlag) { + if (i_offFlag) { i_offNoResetFlg3(FLG3_UNK_4000); } else { i_onNoResetFlg3(FLG3_UNK_4000); } - mGravity = gravity; - mMaxFallSpeed = speed; + + mGravity = i_gravity; + mMaxFallSpeed = i_speed; } /* 800BB7A0-800BBD40 0B60E0 05A0+00 1/1 0/0 0/0 .text transAnimeProc__9daAlink_cFP4cXyzff @@ -15632,6 +16445,374 @@ SECTION_DEAD static char const* const stringBase_803925B2 = "F_SP113"; SECTION_SDATA2 static f32 lit_70084 = 2.25f; /* 800BBF68-800BD6FC 0B68A8 1794+00 1/1 0/0 0/0 .text posMove__9daAlink_cFv */ +// mostly matches outside some cXyz literals and float literals +#ifdef NONMATCHING +void daAlink_c::posMove() { + cXyz sp108; + + f32 temp_f30 = cM_ssin(shape_angle.y); + f32 temp_f29 = cM_scos(shape_angle.y); + + if (!i_checkNoResetFlg3(FLG3_UNK_4000)) { + initGravity(); + } + + transAnimeProc(&sp108, temp_f30, temp_f29); + + s16 var_r26; + if (i_checkModeFlg(MODE_SWIMMING)) { + var_r26 = field_0x3080; + } else if (!mLinkAcch.ChkGroundHit() || i_checkMagneBootsOn() || (i_checkModeFlg(MODE_PLAYER_FLY) && + !checkBoardRide()) || field_0x3174 == 8) { + var_r26 = 0; + } else { + var_r26 = getGroundAngle(&mLinkAcch.m_gnd, current.angle.y); + } + + setFootSpeed(); + if (i_checkEndResetFlg0(ERFLG0_UNK_10000000)) { + mSpeedF = 0.0f; + mNormalSpeed = 0.0f; + } + + mSpeedF = mNormalSpeed * (1.0f - fabsf(mSpeedModifier)); + + f32 mod = field_0x33a0 * (1.0f - field_0x2060->getOldFrameRate()) * mSpeedModifier; + if (mSpeedF < 0.0f) { + mSpeedF -= mod; + } else { + mSpeedF += mod; + } + + if (getZoraSwim() && !checkZoraWearAbility()) { + mSpeedF *= daAlinkHIO_swim_c0::m.mSurfaceSwimSpeedRate; + } + + f32 var_f31 = mSpeedF; + mSpeedF *= cM_scos(var_r26); + + if (var_r26 < 0 && !checkBoardRide() && !i_checkModeFlg(MODE_SWIMMING)) { + mSpeedF *= 0.85f; + } + + if (mProcID == PROC_AUTO_JUMP && checkGrabGlide() && + (field_0xC04[0].ChkTgHit() || field_0xC04[1].ChkTgHit() || field_0xC04[2].ChkTgHit())) { + mSpeedF *= 0.5f; + } + + mSpeed.x = mSpeedF * cM_ssin(current.angle.y); + mSpeed.z = mSpeedF * cM_scos(current.angle.y); + + if (checkNoCollisionCorret() || (i_checkModeFlg(0x40) && i_checkModeFlg(0x4000))) { + field_0x342c = 0.0f; + field_0x3430 = 0.0f; + } + + BOOL eventRunning = checkEventRun(); + if (!i_checkEquipHeavyBoots() && mLinkAcch.ChkGroundHit() && !i_checkModeFlg(0x40) && !eventRunning) { + if (checkLv2MiddleBossBgRide(getMoveBGActorName(mLinkAcch.m_gnd, 0))) { + cM3dGPla plane; + dComIfG_Bgsp().GetTriPla(mLinkAcch.m_gnd, &plane); + + f32 temp_f0 = cM_sht2d(cM_atan2s(plane.mNormal.absXZ(), plane.mNormal.y)); + + if (temp_f0 >= daAlinkHIO_slide_c0::m.mLV2MinibossFloorWeakSlideAngle && temp_f0 <= daAlinkHIO_slide_c0::m.mLV2MinibossFloorSlideAngle) { + temp_f0 = ((temp_f0 - daAlinkHIO_slide_c0::m.mLV2MinibossFloorWeakSlideAngle) * daAlinkHIO_slide_c0::m.mLV2MinibossFloorWeakSlideSpeed) / + (daAlinkHIO_slide_c0::m.mLV2MinibossFloorSlideAngle - daAlinkHIO_slide_c0::m.mLV2MinibossFloorWeakSlideAngle); + plane.mNormal.y = 0.0f; + plane.mNormal.normalizeZP(); + + mSpeed.x += temp_f0 * plane.mNormal.x; + mSpeed.z += temp_f0 * plane.mNormal.z; + } + } + } + + if (i_checkModeFlg(MODE_SWIMMING)) { + cLib_chasePos(&field_0x3750, cXyz::Zero, daAlinkHIO_damSwim_c0::m.field_0x84); + current.pos += field_0x3750; + + if (i_checkNoResetFlg0(FLG0_UNK_100) && mProcID != PROC_SWIM_DIVE) { + current.pos.y = mWaterY; + } else if (mDemo.getDemoType() == 4 || mProcID == PROC_ELEC_DAMAGE || i_dComIfGp_checkPlayerStatus0(0, 0x10)) { + mSpeed.y = 0.0f; + } else if (i_checkWolf()) { + if (checkHeavyStateOn(1, 1)) { + mSpeed.y += daAlinkHIO_wlSwim_c0::m.field_0x9C; + + if (mSpeed.y > daAlinkHIO_wlSwim_c0::m.field_0xA4) { + mSpeed.y = daAlinkHIO_wlSwim_c0::m.field_0xA4; + } + } else { + mSpeed.y += daAlinkHIO_wlSwim_c0::m.field_0x60; + + if (mSpeed.y > daAlinkHIO_wlSwim_c0::m.field_0x5C) { + mSpeed.y = daAlinkHIO_wlSwim_c0::m.field_0x5C; + } + } + } else if (!i_checkEquipHeavyBoots() && getZoraSwim()) { + mSpeed.y = -var_f31 * cM_ssin(var_r26); + } else if ((checkBootsOrArmorHeavy() && mProcID != PROC_DEAD) || mProcID == PROC_SWIM_DIVE) { + mSpeed.y += mGravity; + + if (mSpeed.y < mMaxFallSpeed) { + mSpeed.y = mMaxFallSpeed; + } + } else if (mSpeed.y > daAlinkHIO_swim_c0::m.mMaxFloatUpSpeed) { + mSpeed.y += mGravity; + } else if (mSpeed.y < mMaxFallSpeed) { + mSpeed.y += 1.0f; + } else { + if (checkZoraWearAbility() && mWaterY > current.pos.y + daAlinkHIO_swim_c0::m.mNormalFloatDepth) { + mSpeed.y += daAlinkHIO_swim_c0::m.mZoraFloatDepth; + + if (mSpeed.y < 0.0f) { + mSpeed.y = 0.0f; + } + } else { + mSpeed.y += daAlinkHIO_swim_c0::m.mBuoyancy; + } + + if (mSpeed.y > daAlinkHIO_swim_c0::m.mMaxFloatUpSpeed) { + mSpeed.y = daAlinkHIO_swim_c0::m.mMaxFloatUpSpeed; + } + } + } else if (!i_checkModeFlg(0x400)) { + if (checkHeavyStateOn(1, 1) && mProcID != PROC_SPINNER_READY && !i_checkNoResetFlg0(FLG0_UNDERWATER)) { + mSpeed.y += mGravity * 2.25f; + + if (mSpeed.y < mMaxFallSpeed * 1.5f) { + mSpeed.y = mMaxFallSpeed * 1.5f; + } + } else { + mSpeed.y += mGravity; + + if (mSpeed.y < mMaxFallSpeed) { + mSpeed.y = mMaxFallSpeed; + } + } + } else if (checkBoardRide()) { + mLinkAcch.OffLineCheck(); + mSpeed.y += mGravity; + + if (mSpeed.y < mMaxFallSpeed) { + mSpeed.y = mMaxFallSpeed; + } + } + + setIceSlipSpeed(); + var_f31 = current.pos.y; + + if (!i_checkModeFlg(0x400) || checkBoardRide()) { + if (i_checkMagneBootsOn()) { + mDoMtx_stack_c::copy(mMagneBootMtx); + mDoMtx_stack_c::YrotM(current.angle.y); + + cXyz spFC; + spFC.z = mSpeedF; + mDoMtx_stack_c::multVecSR(&spFC, &mSpeed); + current.pos += mSpeed; + current.pos.x += field_0x342c; + current.pos.z += field_0x3430; + } else { + current.pos += mSpeed; + current.pos.x += field_0x342c; + current.pos.z += field_0x3430; + + if (i_checkEndResetFlg1(ERFLG1_UNK_800) && checkStageName("F_SP113")) { + current.pos.y -= 50.0f; + } + } + } + + if (checkBoardRide() && !i_checkModeFlg(2)) { + current.pos.y -= mSpeedF * cM_ssin(var_r26); + } + + if (i_getSumouMode() && mProcID != PROC_SUMOU_WIN_LOSE) { + current.pos.y = var_f31 - 1.0f; + mSpeed.y = mGravity; + } + + field_0x342c = 0.0f; + field_0x3430 = 0.0f; + + setPolygonSpeed(); + setWindSpeed(); + BOOL var_r27 = FALSE; + + if (!checkNoCollisionCorret() && !i_checkModeFlg(0x40)) { + if (!i_checkNoResetFlg3(FLG3_UNK_20000000)) { + current.pos += *field_0x814.GetCCMoveP(); + } + + if (!eventRunning) { + if (!i_checkEndResetFlg0(ERFLG0_UNK_8) || !checkHeavyStateOn(1, 1)) { + current.pos.x += field_0x3400; + current.pos.z += field_0x3404; + } + + if (mLinkAcch.ChkGroundHit() && dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd)) { + s16 angle1 = getGroundAngle(&mLinkAcch.m_gnd, 0); + current.pos.z += field_0x35c4.z * cM_scos(angle1); + + s16 angle2 = getGroundAngle(&mLinkAcch.m_gnd, 0x4000); + current.pos.x += field_0x35c4.x * cM_scos(angle2); + + if (checkZeroSpeedF() && field_0x35c4.abs2() > 9.0f) { + seStartOnlyReverbLevel(Z2SE_AL_ICE_SLIP); + } + } + + current.pos += field_0x3594; + + if (i_checkModeFlg(2)) { + current.pos += field_0x35ac; + } else { + current.pos.x += field_0x35ac.x; + current.pos.z += field_0x35ac.z; + } + } else if (i_checkNoResetFlg0(FLG0_UNK_14000)) { + current.pos += field_0x3594; + } + } else if (checkOctaIealSpecialCollect()) { + f32 temp_f1 = getHookshotTopPos()->abs(current.pos); + + current.pos += *field_0x814.GetCCMoveP(); + + f32 temp_f31 = getHookshotTopPos()->abs(current.pos); + if (temp_f31 > temp_f1) { + current.pos.y += temp_f31 - temp_f1; + } + } else if (!eventRunning && (mProcID == PROC_HANG_MOVE || mProcID == PROC_CLIMB_MOVE_SIDE || + mProcID == PROC_CLIMB_MOVE_UPDOWN || mProcID == PROC_CLIMB_WAIT || mProcID == PROC_HANG_WAIT)) { + f32 temp_f31 = field_0x814.GetCCMoveP()->absXZ(); + var_r27 = TRUE; + + if (temp_f31 > 1.0f) { + if ((s16)(field_0x814.GetCCMoveP()->atan2sX_Z() - shape_angle.y) >= 0) { + current.pos.x += temp_f31 * temp_f29; + current.pos.z -= temp_f31 * temp_f30; + } else { + current.pos.x -= temp_f31 * temp_f29; + current.pos.z += temp_f31 * temp_f30; + } + } + } + + if (i_checkModeFlg(MODE_SWIMMING) && i_checkNoResetFlg0(FLG0_UNK_100)) { + cXyz sp84 = current.pos - field_0x3798; + + f32 temp_f3 = sp84.absXZ(); + s16 gnd_angle = getGroundAngle(&mLinkAcch.m_wtr, sp84.atan2sX_Z()); + temp_f3 *= cM_ssin(gnd_angle); + + if (temp_f3 < 0.0f) { + temp_f3 = 0.0f; + } + + if (!(current.pos.y > mWaterY + l_autoUpHeight + temp_f3) && mProcID != PROC_SWIM_DIVE) { + current.pos.y = mWaterY; + } + } + + field_0x3400 = 0.0f; + field_0x3404 = 0.0f; + field_0x814.ClrCcMove(); + i_offNoResetFlg3(FLG3_UNK_20000000); + field_0x3464 = 0.0f; + field_0x3468 = 0.0f; + + if (checkRootTransClearMode()) { + cXyz sp78 = field_0x34d4 - sp108; + if (mProcID == PROC_CLIMB_UP_START && field_0x3012 != 0) { + sp78 = cXyz::Zero; + } + + f32 var_f0; + if (i_checkModeFlg(MODE_PLAYER_FLY)) { + var_f0 = 1.0f; + } else { + var_f0 = cM_scos(field_0x2ff0); + } + + if (!checkRootTransZClearMode()) { + sp78.z = 0.0f; + } + + if (!checkRootTransXClearMode()) { + sp78.x = 0.0f; + } + + field_0x3464 = var_f0 * (sp78.z * temp_f30 + sp78.x * temp_f29); + field_0x3464 = var_f0 * (sp78.z * temp_f29 - sp78.x * temp_f30); + + if (i_checkMagneBootsOn()) { + cXyz spD8; + mDoMtx_stack_c::copy(mMagneBootMtx); + mDoMtx_stack_c::YrotM(shape_angle.y); + mDoMtx_stack_c::multVec(&sp78, &spD8); + current.pos += spD8; + } else { + current.pos.x += field_0x3464; + current.pos.z += field_0x3468; + + if (checkRootTransYClearMode()) { + current.pos.y += sp78.y; + } + } + } + + if (i_checkModeFlg(2) && current.pos.y > mFallHeight) { + mFallHeight = current.pos.y; + } + + if (i_checkMagneBootsOn()) { + cXyz spCC; + cXyz spC0 = current.pos + (mMagneBootsTopVec * l_autoUpHeight); + cXyz spB4; + Vec spA8; + + s16 var_r27 = -0x8000; + cM3dGPla plane; + + for (int i = 0; i < 8; i++) { + spA8.x = field_0x18B0[0].GetWallR() * cM_ssin(var_r27); + spA8.z = field_0x18B0[0].GetWallR() * cM_scos(var_r27); + mDoMtx_multVec(mMagneBootMtx, &spA8, &spCC); + spB4 = spC0 + spCC; + + if (commonLineCheck(&spC0, &spB4)) { + dComIfG_Bgsp().GetTriPla(mLinkLinChk, &plane); + f32 temp_f31 = spB4.abs(mLinkLinChk.i_GetCross()); + + mDoMtx_multVecSR(mMagneBootInvMtx, &plane.mNormal, &spCC); + if (cBgW_CheckBWall(spCC.y)) { + f32 temp_f1 = spCC.absXZ(); + + f32 div = temp_f31 / temp_f1; + spCC.x *= div; + spCC.y = 0.0f; + spCC.z *= div; + + mDoMtx_multVecSR(mMagneBootMtx, &spCC, &spCC); + current.pos += spCC; + spC0 += spCC; + } + } + + var_r27 += 0x2000; + } + } else if (var_r27) { + cXyz sp9C = cXyz::Zero; + + if (hangMoveBgCheck(shape_angle.y + 0x4000, &sp9C) || hangMoveBgCheck(shape_angle.y - 0x4000, &sp9C)) { + current.pos.x += sp9C.x; + current.pos.z += sp9C.z; + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -15640,6 +16821,7 @@ asm void daAlink_c::posMove() { #include "asm/d/a/d_a_alink/posMove__9daAlink_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 804532C4-804532C8 0018C4 0004+00 1/1 0/0 0/0 .sdata2 @70267 */ @@ -15656,60 +16838,170 @@ asm void daAlink_c::autoGroundHit() { #pragma pop /* 800BDD70-800BDE20 0B86B0 00B0+00 2/2 0/0 0/0 .text startPeepChange__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::startPeepChange() { - nofralloc -#include "asm/d/a/d_a_alink/startPeepChange__9daAlink_cFv.s" +bool daAlink_c::startPeepChange() { + if (!i_checkNoResetFlg0(FLG0_UNK_4000)) { + i_onNoResetFlg0(FLG0_UNK_4000); + + u32 mode; + if (mProcID == PROC_PEEP_SUBJECTIVITY) { + mode = 7; + } else { + mode = 6; + u32 param = fopAcM_GetParam(this); + s32 roomNo = fopAcM_GetRoomNo(this); + dComIfGs_setTurnRestart(current.pos, shape_angle.y, roomNo, param); + } + + dStage_changeScene(mPeepExitID, FLOAT_LABEL(lit_6108), mode, fopAcM_GetRoomNo(this), shape_angle.y, -1); + return 1; + } + + return 0; } -#pragma pop /* 800BDE20-800BDE48 0B8760 0028+00 3/3 0/0 0/0 .text setLastSceneDamage__9daAlink_cFiPUl */ -void daAlink_c::setLastSceneDamage(int p1, u32* p2) { - if (p1 <= 0) { +void daAlink_c::setLastSceneDamage(int i_dmgAmount, u32* o_mode) { + if (i_dmgAmount <= 0) { return; } - if (0x80 <= p1) { - p1 = 0x7f; + + if (0x80 <= i_dmgAmount) { + i_dmgAmount = 0x7F; } - *p2 |= p1 << 4; + + *o_mode |= i_dmgAmount << 4; } /* 800BDE48-800BDF60 0B8788 0118+00 0/0 1/1 0/0 .text setLastSceneMode__9daAlink_cFPUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setLastSceneMode(u32* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setLastSceneMode__9daAlink_cFPUl.s" +void daAlink_c::setLastSceneMode(u32* o_mode) { + if (i_checkEquipHeavyBoots()) { + *o_mode |= 0x400000; + } + + if (i_checkWolf()) { + *o_mode |= 0x800000; + } + + if (i_checkNoResetFlg2(FLG2_UNK_1) && mEquipItem != KANTERA) { + *o_mode |= 0x200000; + } + + if (mEquipItem == 0x103) { + *o_mode |= 0x28000000; + } else if (mEquipItem < NO_ITEM) { + *o_mode |= mEquipItem << 0x18; + } + + if (mGrabItemAcKeep.getActor() != NULL) { + if (daAlink_checkLightBallA(mGrabItemAcKeep.getActor())) { + *o_mode |= 0x100000; + } + + if (daAlink_checkLightBallB(mGrabItemAcKeep.getActor())) { + *o_mode |= 0x80000; + } + } + + if (mSwordUpTimer != 0) { + *o_mode |= (mSwordUpTimer & 0xFFFE) << 0xA; + } } -#pragma pop /* 800BDF60-800BE26C 0B88A0 030C+00 4/4 1/1 0/0 .text startRestartRoom__9daAlink_cFUliii */ +// matches with literals +#ifdef NONMATCHING +int daAlink_c::startRestartRoom(u32 i_mode, int param_1, int i_dmgAmount, int i_eventRun) { + if (!i_checkNoResetFlg0(FLG0_UNK_4000) && (i_eventRun != 0 || dComIfGp_event_compulsory(this, NULL, 0xFFFF))) { + if (!checkRestartDead(i_dmgAmount, i_mode == 4)) { + i_onNoResetFlg0(FLG0_UNK_4000); + + if (i_eventRun == 0) { + mDemo.setOriginalDemoType(); + mDemo.setDemoMode(1); + } + + u32 tmp = getStartMode(); + int start_mode = tmp; + if ((start_mode != 13 && start_mode != 2 && start_mode != 14) || checkFinalBattle() || field_0x3780.abs(dComIfGs_getRestartRoomPos()) > 0.1f) { + start_mode = 0; + } + + // event flag 0x2008 = cleared snowpeak ruins + if (!i_dComIfGs_isEventBit(0x2008) && (checkBoardRide() || checkBoardRestart())) { + i_mode = 11; + } else if (i_checkBoarSingleBattle() || (start_mode == 2 && !checkFinalBattle() && i_mode == 5)) { + i_mode = 8; + } + + setLastSceneDamage(i_dmgAmount, &i_mode); + u32 params = setParamData(dComIfGs_getRestartRoomNo(), start_mode, param_1, 0); + dStage_restartRoom(params, i_mode, 0); + + if (mProcID != PROC_DEAD) { + seStartSystem(Z2SE_FORCE_BACK); + } + } + + return 1; + } + + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::startRestartRoom(u32 param_0, int param_1, int param_2, int param_3) { +asm int daAlink_c::startRestartRoom(u32 param_0, int param_1, int param_2, int param_3) { nofralloc #include "asm/d/a/d_a_alink/startRestartRoom__9daAlink_cFUliii.s" } #pragma pop +#endif /* 800BE26C-800BE2C0 0B8BAC 0054+00 2/2 0/0 0/0 .text checkCoachGuardGame__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCoachGuardGame() { - nofralloc -#include "asm/d/a/d_a_alink/checkCoachGuardGame__9daAlink_cFv.s" +BOOL daAlink_c::checkCoachGuardGame() { + return !i_checkBoarSingleBattle() && fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchCoach, NULL); } -#pragma pop /* 800BE2C0-800BE3E4 0B8C00 0124+00 1/1 0/0 0/0 .text checkRoofRestart__9daAlink_cFv */ +// branch issues +#ifdef NONMATCHING +void daAlink_c::checkRoofRestart() { + daSpinner_c* spinner; + + if (checkSpinnerRide()) { + spinner = (daSpinner_c*)mRideAcKeep.getActor(); + } else { + spinner = NULL; + } + + if (mLinkAcch.ChkRoofHit() && (mLinkAcch.ChkGroundHit() || + (spinner != NULL && spinner->checkGroundHit() && spinner->getJumpFlg() == 0)) && + !i_checkMagneBootsOn() && (mProcID != PROC_CRAWL_START && mProcID != PROC_CRAWL_END && !checkCoachGuardGame())) { + s16 ac_name = getMoveBGActorName(mLinkAcch.m_roof, 1); + if (ac_name == PROC_OBJ_SO || ac_name == PROC_Obj_SCannon) { + return; + } + } + + f32 roof_height = mLinkAcch.GetRoofHeight(); + if (roof_height > mLinkAcch.GetGroundH()) { + f32 head_pos = mHeadTopPos.y - 10.0f; + f32 temp_f0 = 10.0f + current.pos.y; + + if (head_pos < temp_f0) { + head_pos = temp_f0; + } + + if (roof_height < head_pos) { + startRestartRoom(5, 0xC9, 4, 0); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -15718,6 +17010,7 @@ asm void daAlink_c::checkRoofRestart() { #include "asm/d/a/d_a_alink/checkRoofRestart__9daAlink_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80392094-80392094 01E6F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -15852,7 +17145,7 @@ int daAlink_c::checkSceneChange(int exitID) { } else { if (mExitID != 0x3F) { sceneChanged = dStage_changeScene(mExitID, exitSpeed, exitMode, - fopAcM_GetRoomNo(this), mCollisionRot.y, -1); + fopAcM_GetRoomNo(this), shape_angle.y, -1); if (sceneChanged) { i_onNoResetFlg2(FLG2_SCN_CHG_START); if (mpScnChg != NULL && fopAcM_GetName(mpScnChg) == PROC_SCENE_EXIT) { @@ -15866,7 +17159,7 @@ int daAlink_c::checkSceneChange(int exitID) { } else { sceneChanged = dStage_changeSceneExitId(mLinkAcch.m_gnd, exitSpeed, exitMode, - fopAcM_GetRoomNo(this), mCollisionRot.y); + fopAcM_GetRoomNo(this), shape_angle.y); field_0x2f58 = dPath_GetRoomPath(dComIfG_Bgsp().GetRoomPathId(mLinkAcch.m_gnd), fopAcM_GetRoomNo(this)); } @@ -15917,82 +17210,40 @@ asm int daAlink_c::checkSceneChange(int param_0) { #endif /* 800BF084-800BF0B8 0B99C4 0034+00 1/0 0/0 0/0 .text voiceStart__9daAlink_cFUl */ -// matches, but JAISoundID(u32) constructor needs to be inlined? -#ifdef NONMATCHING -void daAlink_c::voiceStart(u32 sfx_id) { - mZ2Link.startLinkVoice(sfx_id, mVoiceReverbIntensity); +void daAlink_c::voiceStart(u32 i_seID) { + mZ2Link.startLinkVoice(i_seID, mVoiceReverbIntensity); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::voiceStart(u32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/voiceStart__9daAlink_cFUl.s" -} -#pragma pop -#endif /* 800BF0B8-800BF0EC 0B99F8 0034+00 14/14 0/0 0/0 .text voiceStartLevel__9daAlink_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::voiceStartLevel(u32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/voiceStartLevel__9daAlink_cFUl.s" +void daAlink_c::voiceStartLevel(u32 i_seID) { + mZ2Link.startLinkVoiceLevel(i_seID, mVoiceReverbIntensity); } -#pragma pop /* 800BF0EC-800BF124 0B9A2C 0038+00 21/21 0/0 0/0 .text seStartSwordCut__9daAlink_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::seStartSwordCut(u32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/seStartSwordCut__9daAlink_cFUl.s" +void daAlink_c::seStartSwordCut(u32 i_seID) { + mZ2Link.startLinkSwordSound(i_seID, 0, mVoiceReverbIntensity); } -#pragma pop /* 800BF124-800BF15C 0B9A64 0038+00 1/0 0/0 0/0 .text seStartOnlyReverb__9daAlink_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::seStartOnlyReverb(u32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/seStartOnlyReverb__9daAlink_cFUl.s" +void daAlink_c::seStartOnlyReverb(u32 i_seID) { + mZ2Link.startLinkSound(i_seID, 0, mVoiceReverbIntensity); } -#pragma pop /* 800BF15C-800BF194 0B9A9C 0038+00 1/0 0/0 0/0 .text seStartOnlyReverbLevel__9daAlink_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::seStartOnlyReverbLevel(u32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/seStartOnlyReverbLevel__9daAlink_cFUl.s" +void daAlink_c::seStartOnlyReverbLevel(u32 i_seID) { + mZ2Link.startLinkSoundLevel(i_seID, 0, mVoiceReverbIntensity); } -#pragma pop /* 800BF194-800BF1CC 0B9AD4 0038+00 10/10 0/0 0/0 .text seStartMapInfo__9daAlink_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::seStartMapInfo(u32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/seStartMapInfo__9daAlink_cFUl.s" +void daAlink_c::seStartMapInfo(u32 i_seID) { + mZ2Link.startLinkSound(i_seID, mPolySound, mVoiceReverbIntensity); } -#pragma pop /* 800BF1CC-800BF204 0B9B0C 0038+00 9/9 0/0 0/0 .text seStartMapInfoLevel__9daAlink_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::seStartMapInfoLevel(u32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/seStartMapInfoLevel__9daAlink_cFUl.s" +void daAlink_c::seStartMapInfoLevel(u32 i_seID) { + mZ2Link.startLinkSoundLevel(i_seID, mPolySound, mVoiceReverbIntensity); } -#pragma pop /* 800BF204-800BF37C 0B9B44 0178+00 3/3 0/0 0/0 .text * setBasAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDER */ @@ -16016,21 +17267,19 @@ asm void daAlink_c::initBasAnime() { #pragma pop /* 800BF4E0-800BF500 0B9E20 0020+00 6/6 0/0 0/0 .text resetBasAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetBasAnime() { - nofralloc -#include "asm/d/a/d_a_alink/resetBasAnime__9daAlink_cFv.s" +void daAlink_c::resetBasAnime() { + field_0x3084 = 0xFFFF; + field_0x3086 = 0xFFFF; + field_0x2d7c = NULL; + field_0x2d80 = 0; } -#pragma pop /* 800BF500-800BF79C 0B9E40 029C+00 5/5 0/0 0/0 .text checkSightLine__9daAlink_cFfP4cXyz */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkSightLine(f32 param_0, cXyz* param_1) { +asm BOOL daAlink_c::checkSightLine(f32 param_0, cXyz* param_1) { nofralloc #include "asm/d/a/d_a_alink/checkSightLine__9daAlink_cFfP4cXyz.s" } @@ -16038,26 +17287,30 @@ asm void daAlink_c::checkSightLine(f32 param_0, cXyz* param_1) { /* 800BF79C-800BF854 0BA0DC 00B8+00 2/2 0/0 0/0 .text setMetamorphoseModel__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setMetamorphoseModel(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setMetamorphoseModel__9daAlink_cFi.s" +void daAlink_c::setMetamorphoseModel(int param_0) { + J3DAnmTransform* bck = (J3DAnmTransform*)mAnmHeap9.loadDataIdx(param_0 != 0 ? (u16)0x27C : (u16)0x27D); + JKRHeap* heap = setItemHeap(); + + J3DModelData* model_data = loadAramBmd(0x31B, 0x6000); + mHeldItemModel = initModel(model_data, 0); + field_0x730.init(bck, 0, 2, lit_6040, 0, -1, false); + + mDoExt_setCurrentHeap(heap); + mEquipItem = 0x106; + field_0x33dc = mUnderFrameCtrl[0].getFrame(); } -#pragma pop /* 800BF854-800BF884 0BA194 0030+00 10/10 0/0 0/0 .text keepItemData__9daAlink_cFv */ void daAlink_c::keepItemData() { - field_0x30ce = mEquipItem; + mKeepItem = mEquipItem; deleteEquipItem(FALSE, FALSE); } /* 800BF884-800BF8D0 0BA1C4 004C+00 8/8 0/0 0/0 .text returnKeepItemData__9daAlink_cFv */ void daAlink_c::returnKeepItemData() { deleteEquipItem(FALSE, FALSE); - mEquipItem = field_0x30ce; - field_0x30ce = NO_ITEM; + mEquipItem = mKeepItem; + mKeepItem = NO_ITEM; makeItemType(); } @@ -16224,111 +17477,94 @@ bool daPy_py_c::checkMagicArmorWearFlg() const { } /* 800BFDB0-800BFDFC 0BA6F0 004C+00 28/28 0/0 0/0 .text checkZoraWearAbility__9daAlink_cCFv */ -// li 0 needs to be mr -#ifdef NONMATCHING BOOL daAlink_c::checkZoraWearAbility() const { - bool ret = false; - bool wear_zora = false; - - if (!i_checkWolf() && checkZoraWearFlg()) { - wear_zora = true; - } - - if (wear_zora && !i_checkNoResetFlg2(FLG2_UNK_80000)) { - ret = true; - } - - return ret; + return (!i_checkWolf() && checkZoraWearFlg()) && !i_checkNoResetFlg2(FLG2_UNK_80000); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkZoraWearAbility() const { - nofralloc -#include "asm/d/a/d_a_alink/checkZoraWearAbility__9daAlink_cCFv.s" -} -#pragma pop -#endif /* 800BFDFC-800BFE48 0BA73C 004C+00 5/5 0/0 0/0 .text checkMagicArmorWearAbility__9daAlink_cCFv */ -#ifdef NONMATCHING BOOL daAlink_c::checkMagicArmorWearAbility() const { - bool ret = false; - bool wear_armor = false; - - if (!i_checkWolf() && checkMagicArmorWearFlg()) { - wear_armor = true; - } - - if (wear_armor && !i_checkNoResetFlg2(FLG2_UNK_80000)) { - ret = true; - } - - return ret; + return (!i_checkWolf() && checkMagicArmorWearFlg()) && !i_checkNoResetFlg2(FLG2_UNK_80000); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkMagicArmorWearAbility() const { - nofralloc -#include "asm/d/a/d_a_alink/checkMagicArmorWearAbility__9daAlink_cCFv.s" -} -#pragma pop -#endif /* 800BFE48-800BFF04 0BA788 00BC+00 9/9 0/0 0/0 .text loadAramBmd__9daAlink_cFUsUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DModelData* daAlink_c::loadAramBmd(u16 param_0, u32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/loadAramBmd__9daAlink_cFUsUl.s" +J3DModelData* daAlink_c::loadAramBmd(u16 i_resID, u32 i_bufSize) { + JKRArchive* anm_arc = dComIfGp_getAnmArchive(); + u8* tmpBuffer = new (0x20) u8[i_bufSize]; + + anm_arc->readIdxResource(tmpBuffer, i_bufSize, i_resID); + + u32 type = 'BMWR'; + JKRArchive::SDIDirEntry* dir = anm_arc->mNodes; + for (int i = 0; i < anm_arc->countDirectory(); i++) { + if (i_resID >= dir->first_file_index && i_resID < dir->first_file_index + dir->num_entries) { + type = dir->type; + break; + } + dir++; + } + + return dRes_info_c::loaderBasicBmd(type, tmpBuffer); } -#pragma pop /* 800BFF04-800BFF70 0BA844 006C+00 5/5 0/0 0/0 .text loadAram__9daAlink_cFUsUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void* daAlink_c::loadAram(u16 param_0, u32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/loadAram__9daAlink_cFUsUl.s" +void* daAlink_c::loadAram(u16 i_resID, u32 i_bufSize) { + u8* tmpBuffer = new (0x20) u8[i_bufSize]; + dComIfGp_getAnmArchive()->readIdxResource(tmpBuffer, i_bufSize, i_resID); + return J3DAnmLoaderDataBase::load(tmpBuffer, J3DLOADER_UNK_FLAG0); } -#pragma pop /* 800BFF70-800BFFCC 0BA8B0 005C+00 3/3 0/0 0/0 .text loadAramItemBrk__9daAlink_cFUsP8J3DModel */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DAnmTevRegKey* daAlink_c::loadAramItemBrk(u16 param_0, J3DModel* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/loadAramItemBrk__9daAlink_cFUsP8J3DModel.s" +J3DAnmTevRegKey* daAlink_c::loadAramItemBrk(u16 i_resID, J3DModel* i_model) { + J3DModelData* model_data = i_model->getModelData(); + J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)loadAram(i_resID, 0x400); + + brk->setFrame(FLOAT_LABEL(lit_6108)); + brk->searchUpdateMaterialID(model_data); + model_data->entryTevRegAnimator(brk); + + return brk; } -#pragma pop /* 800BFFCC-800C0028 0BA90C 005C+00 2/2 0/0 0/0 .text loadAramItemBtk__9daAlink_cFUsP8J3DModel */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::loadAramItemBtk(u16 param_0, J3DModel* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/loadAramItemBtk__9daAlink_cFUsP8J3DModel.s" +J3DAnmTextureSRTKey* daAlink_c::loadAramItemBtk(u16 i_resID, J3DModel* i_model) { + J3DModelData* model_data = i_model->getModelData(); + J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)loadAram(i_resID, 0x400); + + btk->setFrame(FLOAT_LABEL(lit_6108)); + btk->searchUpdateMaterialID(model_data); + model_data->entryTexMtxAnimator(btk); + + return btk; } -#pragma pop /* 800C0028-800C0084 0BA968 005C+00 1/1 0/0 0/0 .text loadAramItemBtp__9daAlink_cFUsP8J3DModel */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::loadAramItemBtp(u16 param_0, J3DModel* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/loadAramItemBtp__9daAlink_cFUsP8J3DModel.s" +J3DAnmTexPattern* daAlink_c::loadAramItemBtp(u16 i_resID, J3DModel* i_model) { + J3DModelData* model_data = i_model->getModelData(); + J3DAnmTexPattern* btp = (J3DAnmTexPattern*)loadAram(i_resID, 0x400); + + btp->setFrame(FLOAT_LABEL(lit_6108)); + btp->searchUpdateMaterialID(model_data); + model_data->entryTexNoAnimator(btp); + + return btp; } -#pragma pop /* 800C0084-800C0114 0BA9C4 0090+00 5/5 0/0 0/0 .text changeItemBck__9daAlink_cFUsf */ +// matches with literals +#ifdef NONMATCHING +void daAlink_c::changeItemBck(u16 i_resID, f32 param_1) { + J3DAnmTransform* bck = (J3DAnmTransform*)mAnmHeap9.loadDataIdx(i_resID); + if (bck != NULL) { + field_0x730.changeBckOnly(bck); + } + + if (param_1 < 0.0f) { + field_0x33dc = field_0x730.getBckAnm()->getFrameMax(); + } else { + field_0x33dc = param_1; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -16337,6 +17573,7 @@ asm void daAlink_c::changeItemBck(u16 param_0, f32 param_1) { #include "asm/d/a/d_a_alink/changeItemBck__9daAlink_cFUsf.s" } #pragma pop +#endif /* 800C0114-800C0164 0BAA54 0050+00 2/2 0/0 0/0 .text checkGroupItem__9daAlink_cCFii */ int daAlink_c::checkGroupItem(int i_itemNo, int i_selItem) const { @@ -16464,7 +17701,7 @@ bool daAlink_c::checkCastleTownUseItem(u16 item_id) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::changeItemTriggerKeepProc(u8 param_0, int param_1) { +asm int daAlink_c::changeItemTriggerKeepProc(u8 param_0, int param_1) { nofralloc #include "asm/d/a/d_a_alink/changeItemTriggerKeepProc__9daAlink_cFUci.s" } @@ -16475,7 +17712,7 @@ asm void daAlink_c::changeItemTriggerKeepProc(u8 param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkNewItemChange(u8 param_0) { +asm int daAlink_c::checkNewItemChange(u8 param_0) { nofralloc #include "asm/d/a/d_a_alink/checkNewItemChange__9daAlink_cFUc.s" } @@ -16580,6 +17817,353 @@ asm void daAlink_c::changeWarpMaterial(daAlink_c::daAlink_WARP_MAT_MODE param_0) /* 800C1F6C-800C2DA4 0BC8AC 0E38+00 229/229 0/0 0/0 .text * commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC */ +#ifdef NONMATCHING +void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { + if (mProcID == PROC_TOOL_DEMO) { + mSpeed.y = 0.0f; + resetDemoBck(); + if (i_checkModeFlg(MODE_RIDING)) { + initForceRideHorse(); + } + + if (mCommonCounter != 0) { + changeWarpMaterial(1); + } + } else if (mProcID == PROC_GRAB_STAND) { + for (int i = 0; i < 2; i++) { + field_0x312a[i] = csXyz::Zero; + } + } else if (mProcID == PROC_GRASS_WHISTLE_WAIT) { + returnKeepItemData(); + } else if (i_checkModeFlg(MODE_UNK_20)) { + fopAc_ac_c* actor = field_0x280c.getActor(); + + if (enemy != NULL) { + if (mProcID == PROC_WOLF_DOWN_AT_LAND) { + static_cast(actor)->offWolfDownPullFlg(); + if (i_procID != PROC_WOLF_BACKJUMP) { + resetWolfBallGrab(); + } + } else if (mProcID == PROC_HAWK_SUBJECT) { + static_cast(actor)->setAway(); + } else if (mProcID == PROC_GOAT_STROKE) { + static_cast(actor)->setNaderuFinish(); + } else if (mProcID == PROC_TRADE_ITEM_OUT || mProcID == PROC_NOT_USE_ITEM) { + static_cast(actor)->dead(); + } + } + field_0x280c.clearData(); + + if (mProcID == PROC_BOTTLE_SWING) { + i_offNoResetFlg2(FLG2_UNK_10000000); + } + } else if (mProcID == PROC_HOOKSHOT_FLY) { + cancelHookshotCarry(); + setOldRootQuaternion(shape_angle.x, 0, 0); + cancelItemUseQuake(1); + } else if (i_dComIfGp_checkPlayerStatus1(0x02010000)) { + if (mProcID != PROC_HOOKSHOT_FLY) { + cancelItemUseQuake(0); + } + + if (mCargoCarryAcKeep.getActor() != NULL) { + fopAcM_cancelHookCarryNow(mCargoCarryAcKeep.getActor()); + mCargoCarryAcKeep.clearData(); + } + } else if (mProcID == PROC_WOLF_ENEMY_HANG_BITE) { + resetWolfEnemyBiteAll(); + } else if (checkWolfShapeReverse()) { + setOldRootQuaternion(0, -0x8000, 0); + shape_angle.y += 0x8000; + field_0x2fe4 = shape_angle.y; + shape_angle.x = -shape_angle.x; + field_0x2fe6 = shape_angle.y; + if (mProcID != PROC_WOLF_READY_SLIDE) { + current.angle.y = shape_angle.y; + } + } else if (mProcID == PROC_WARP) { + changeWarpMaterial(1); + } else if (mProcID == PROC_WOLF_BACKJUMP) { + resetWolfBallGrab(); + } else if (mProcID == PROC_CHAIN_STRONG_PULL) { + mNowAnmPackUpper[2].setRatio(0.0f); + } else if (mProcID == PROC_SCREAM_WAIT || mProcID == PROC_WOLF_SCREAM_WAIT || mProcID == PROC_ELEC_DAMAGE) { + dComIfGp_getVibration().StopQuake(0x1F); + } else if (mProcID == PROC_GUARD_BREAK) { + field_0x814.SetTgApid(-1); + } + + if (mProcID == PROC_CHAIN_UP || mProcID == PROC_WOLF_CHAIN_UP) { + cancelFmChainGrabFromOut(); + } + + bool temp_r31 = mProcID == PROC_FISHING_CAST; + i_offNoResetFlg0(FLG0_UNK_2); + + bool flg_20000_set = checkModeFlag(0x20000); + bool flg_400_set = checkModeFlag(0x400); + if (flg_400_set && !checkBoardRide() && !checkSpinnerRide()) { + field_0x2f99 = 0xA0; + } else if (checkModeFlg(0x40840) || mProcID == PROC_BOSS_BODY_HANG || mProcID == PROC_WOLF_CHAIN_WAIT) { + field_0x2f99 = 0x70; + } + + mpProcFunc = m_procInitTable[i_procID].m_procFunc; + mProcID = i_procID; + mModeFlg = m_procInitTable[i_procID].m_mode; + + if (checkBoarRide()) { + offModeFlg(4); + } + + if (mProcID == PROC_DEAD) { + if (flg_400_set) { + if (checkHorseRide()) { + resetUnderAnime(UNDER_2, -1.0f); + } + onModeFlg(MODE_RIDING); + } else if (flg_20000_set) { + onModeFlg(MODE_SWIMMING); + } + } else if (mProcID == PROC_BOSS_BODY_HANG) { + if (checkBossOctaIealRoom()) { + onModeFlg(MODE_SWIMMING); + } + } else if (mProcID == PROC_GET_ITEM) { + if (flg_400_set) { + if (checkHorseRide()) { + resetUnderAnime(UNDER_2, -1.0f); + } + onModeFlg(MODE_RIDING); + } + } else if (mProcID == PROC_ELEC_DAMAGE) { + if (flg_20000_set) { + onModeFlg(MODE_SWIMMING); + } + + if (i_checkResetFlg1(RFLG1_UNK_2) && (checkHookshotItem(mEquipItem)) { + onModeFlg(MODE_UNK_1000); + } + } + + if (temp_r31 && (mItemAcKeep.getActor() == NULL || mItemAcKeep.getActor()->mEvtInfo.i_checkCommandDemoAccrpt()) && !i_checkEndResetFlg0(ERFLG0_UNK_1000)) { + deleteEquipItem(0, 0); + resetUpperAnime(UPPER_2, -1.0f); + } + + if (i_checkModeFlg(MODE_VINE_CLIMB)) { + mLinkAcch.SetRoofNone(); + } else { + mLinkAcch.ClrRoofNone(); + } + + field_0x2b9c = 0.0f; + field_0x2b98 = 0.0f; + mSpeedModifier = 0.0f; + field_0x2fb3 = 0; + field_0x2f9e = 6; + + clearCutTurnEffectID(); + if (!i_checkModeFlg(MODE_SWIMMING) { + field_0x3080 = 0; + } + + field_0x3082 = 0; + field_0x3088 = 0; + field_0x308a = 0; + + if (i_checkWolf()) { + shape_angle.z = 0; + mLookAngleY = 0; + field_0x59e = 0; + } else if (!i_checkReinRide() && !checkBoardRide()) { + shape_angle.x = 0; + shape_angle.z = 0; + } + + initGravity(); + + field_0x308c = 0; + field_0x33f0 = 0.0f; + field_0x33f4 = 0.0f; + field_0x30a0 = 0; + field_0x30a2 = 0; + field_0x30f0 = 0; + m_nSwordBtk->setFrame(0.0f); + field_0x310a = 0; + field_0x310c = shape_angle.y; + + if (field_0x3190 != 0) { + field_0x3190 = 0; + field_0x59e = 0; + } + + mFishingArm1Angle = csXyz::Zero; + field_0x3160 = csXyz::Zero; + + if (field_0x2fc8 != 0) { + field_0x2fc8 = 0; + resetFacePriAnime(); + } + + field_0x2fce = 5; + if (field_0x2f99 == 5) { + field_0x2f99 = 0x30; + } else if (field_0x2f99 == 4) { + field_0x2f99 = 0x20; + } + + if (i_checkModeFlg(0x40840) || mProcID == PROC_BOSS_BODY_HANG) { + field_0x2f99 = 0x50; + } + + if (i_checkModeFlg(MODE_NO_COLLISION) || mProcID == PROC_STEP_MOVE || mProcID == PROC_WOLF_TAG_JUMP) { + mLinkAcch.OffLineCheck(); + mLinkAcch.OnLineCheckNone(); + } else { + mLinkAcch.OnLineCheck(); + mLinkAcch.OffLineCheckNone(); + + for (int i = 0; i < 2; i++) { + mFootData2[i].field_0x6 = 0; + mFootData2[i].field_0x4 = 0; + mFootData2[i].field_0x2 = 0; + } + + field_0x2ba4 = 0.0f; + } + + i_onNoResetFlg0(FLG0_PLAYER_NO_DRAW); + + if (mProcID != PROC_WOLF_FALL && mProcID != PROC_WOLF_LAND) { + i_offNoResetFlg2(FLG2_UNK_200); + } + + i_offNoResetFlg2(0x11102); + i_offResetFlg0(RFLG0_UNK_2); + i_offNoResetFlg1(0x48004001); + i_offNoResetFlg0(0x80018); + + field_0x28f8 = -1; + mSight.offDrawFlg(); + mSight.offLockFlg(); + + if (mWolfLockNum != 0 && mProcID != PROC_WOLF_LOCK_ATTACK_TURN && mProcID != PROC_WOLF_LOCK_ATTACK) { + for (int i = 0; i < mWolfLockNum; i++) { + mWolfLockAcKeep[i].clearData(); + } + mWolfLockNum = 0; + } + + field_0x3078 = 0; + + if ((!checkEquipAnime() || !i_checkModeFlg(4) && + ((!i_checkModeFlg(MODE_SWIMMING) || !checkWolfEnemyThrowAnime()) && !checkModeFlg(MODE_UNK_1000))) || + (checkSwordTwirlAnime() && mProcID != PROC_ATN_ACTOR_WAIT && mProcID != PROC_ATN_ACTOR_MOVE) || + (i_checkWolf() && checkFmChainGrabAnime() && i_checkModeFlg(MODE_NO_COLLISION)) || + i_checkNoResetFlg1(FLG1_UNK_40)) + { + if ((!checkDkCaught2Anime() || mProcID != PROC_DAMAGE) && !checkNoSetUpperAnime()) { + resetUpperAnime(UPPER_2, 4.0f); + } + + if (checkBombItem(mEquipItem)) { + mEquipItem = NO_ITEM; + } + } + + if (!i_checkModeFlg(MODE_GRAB_PLACE) && !checkGrabAnime() && + !checkWolfGrabAnime() && mGrabItemAcKeep.getActor() != NULL) { + freeGrabItem(); + } + + if (!checkHookshotAnime() && mProcID != PROC_HOOKSHOT_FLY) { + cancelHookshotCarry(); + } + + if ((i_dComIfGp_checkPlayerStatus0(0, 8) && !i_checkModeFlg(MODE_VINE_CLIMB) && mProcID != PROC_HANG_CLIMB) || + ((i_dComIfGp_checkPlayerStatus1(0, 0x2000000) && mProcID != PROC_HOOKSHOT_WALL_SHOOT && mProcID != PROC_HOOKSHOT_WALL_WAIT)) { + if (mProcID == PROC_CLIMB_TO_ROOF) { + current.pos.x += 10.0f * cM_ssin(shape_angle.y); + current.pos.z += 10.0f * cM_scos(shape_angle.y); + } else { + current.pos.x -= 10.0f * cM_ssin(shape_angle.y); + current.pos.z -= 10.0f * cM_scos(shape_angle.y); + } + } + + if (i_dComIfGp_checkPlayerStatus0(0, 0x200000)) { + seStartSystem(Z2SE_AL_HAWK_EYE_PUTOFF); + } + + if (checkUpperReadyThrowAnime() && mEquipItem != 0x102) { + i_dComIfGp_clearPlayerStatus0(0, 0xfeb5ab0f); + } else { + i_dComIfGp_clearPlayerStatus0(0, 0xffbfffcf); + } + + i_dComIfGp_clearPlayerStatus1(0,0x7fb7b78); + + cancelHookshotShot(); + if (mEquipItem == 0x109) { + deleteEquipItem(0, 0); + } + + if ((mModeFlg >> 1) % 2 && i_checkModeFlg(MODE_JUMP)) { + mLastJumpPos = current.pos; + mFallHeight = mLastJumpPos.y; + field_0x33c8 = mLastJumpPos.y; + } + + if (!i_checkModeFlg(MODE_RIDING) && flg_400_set) { + rideGetOff(); + } + + if (!checkBoarRide() && !checkHorseRide()) { + resetUnderAnime(UNDER_2, -1.0f); + } + + if (i_checkModeFlg(MODE_VINE_CLIMB | MODE_NO_COLLISION)) { + if (i_checkWolf()) { + field_0x814.SetWeight(0xFF); + } else { + field_0x814.SetWeight(0xFE); + } + } else { + field_0x814.SetWeight(0x78); + } + + dComIfGp_setAdvanceDirection(0); + + if (!checkBowAnime()) { + setBowNormalAnime(); + } + + if (flg_20000_set && !i_checkModeFlg(MODE_SWIMMING)) { + if (mProcID != PROC_CAUGHT && mProcID != PROC_HOOKSHOT_FLY && !i_checkNoResetFlg0(FLG0_UNDERWATER)) { + swimOutAfter(0); + } + } + + setBgCheckParam(); + + if ((i_checkNoResetFlg2(FLG2_UNK_40) && mProcID != PROC_WOLF_ENEMY_HANG_BITE) || + (i_checkNoResetFlg2(FLG2_UNK_8) && mProcID != PROC_WOLF_ENEMY_THROW && !i_checkWolfEnemyThrowAnime())) { + resetWolfEnemyBiteAll(); + } + + fopAc_ac_c* actor = field_0x280c.getActor(); + if (actor != NULL && (mModeFlg >> 0x11) % 2 && !i_checkModeFlg(MODE_ROPE_WALK)) { + field_0x280c.clearData(); + + if (fopAcM_GetName(actor) == PROC_Obj_Crope) { + static_cast(actor)->offRide(); + } else if (fopAcM_GetName(actor) == PROC_Obj_Wchain) { + static_cast(actor)->offRide(); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -16588,6 +18172,7 @@ asm void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC param_0) { #include "asm/d/a/d_a_alink/commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC.s" } #pragma pop +#endif /* 800C2DA4-800C2DDC 0BD6E4 0038+00 121/121 0/0 0/0 .text * commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC */ @@ -16621,23 +18206,22 @@ BOOL daAlink_c::commonProcInitNotSameProc(daAlink_PROC procID) { #include "d/a/d_a_alink_grab.inc" /* 800E91B0-800E91C4 0E3AF0 0014+00 1/1 0/0 0/0 .text daAlink_searchGoat__FP10fopAc_ac_cPv */ -static fopAc_ac_c* daAlink_searchGoat(fopAc_ac_c* param_0, void* param_1) { - if (fopAcM_GetName(param_0) == 0x106) { - return param_0; +static fopAc_ac_c* daAlink_searchGoat(fopAc_ac_c* i_actor, void*) { + if (fopAcM_GetName(i_actor) == PROC_COW) { + return i_actor; } + return NULL; } /* 800E91C4-800E9210 0E3B04 004C+00 1/0 0/0 0/0 .text cancelGoronThrowEvent__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::cancelGoronThrowEvent() { - nofralloc -#include "asm/d/a/d_a_alink/cancelGoronThrowEvent__9daAlink_cFv.s" +void daAlink_c::cancelGoronThrowEvent() { + if (mProcID == PROC_GOAT_CATCH && field_0x3012 == 0) { + field_0x3012 = 1; + i_dComIfGp_event_reset(); + } } -#pragma pop /* 800E9210-800E9344 0E3B50 0134+00 2/2 0/0 0/0 .text * setGoatStopGameFail__9daAlink_cFP10fopAc_ac_c */ @@ -16654,7 +18238,7 @@ asm void daAlink_c::setGoatStopGameFail(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGoatMoveInit() { +asm int daAlink_c::procGoatMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procGoatMoveInit__9daAlink_cFv.s" } @@ -16664,7 +18248,7 @@ asm void daAlink_c::procGoatMoveInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGoatMove() { +asm int daAlink_c::procGoatMove() { nofralloc #include "asm/d/a/d_a_alink/procGoatMove__9daAlink_cFv.s" } @@ -16675,7 +18259,7 @@ asm void daAlink_c::procGoatMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGoatCatchInit(fopAc_ac_c* param_0, f32 param_1) { +asm int daAlink_c::procGoatCatchInit(fopAc_ac_c* param_0, f32 param_1) { nofralloc #include "asm/d/a/d_a_alink/procGoatCatchInit__9daAlink_cFP10fopAc_ac_cf.s" } @@ -16685,7 +18269,7 @@ asm void daAlink_c::procGoatCatchInit(fopAc_ac_c* param_0, f32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGoatCatch() { +asm int daAlink_c::procGoatCatch() { nofralloc #include "asm/d/a/d_a_alink/procGoatCatch__9daAlink_cFv.s" } @@ -16695,37 +18279,53 @@ asm void daAlink_c::procGoatCatch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGoatStrokeInit() { +asm int daAlink_c::procGoatStrokeInit() { nofralloc #include "asm/d/a/d_a_alink/procGoatStrokeInit__9daAlink_cFv.s" } #pragma pop /* 800EA3AC-800EA3F4 0E4CEC 0048+00 1/0 0/0 0/0 .text procGoatStroke__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGoatStroke() { - nofralloc -#include "asm/d/a/d_a_alink/procGoatStroke__9daAlink_cFv.s" +int daAlink_c::procGoatStroke() { + if (mUnderFrameCtrl[0].checkAnmEnd()) { + checkNextAction(0); + } + + return 1; } -#pragma pop /* 800EA3F4-800EA4CC 0E4D34 00D8+00 2/2 0/0 0/0 .text procGoronMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGoronMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procGoronMoveInit__9daAlink_cFv.s" +int daAlink_c::procGoronMoveInit() { + if (mEquipItem != NO_ITEM) { + return procPreActionUnequipInit(PROC_GORON_MOVE, NULL); + } + + if (!commonProcInitNotSameProc(PROC_GORON_MOVE)) { + return 0; + } + + mCargoCarryAcKeep.setActor(); + + if (mCargoCarryAcKeep.getActor() == NULL) { + offGoronSideMove(); + return 0; + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x2f98 = 3; + current.angle.y = shape_angle.y + -0x4000; + field_0x594 = daAlinkHIO_atnMove_c0::m.mMaxSpeed; + setSingleAnimeBase(ANM_ATN_RIGHT); + mCommonCounter = 1; + field_0x300e = 0; + return 1; } -#pragma pop /* 800EA4CC-800EA844 0E4E0C 0378+00 1/0 0/0 0/0 .text procGoronMove__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGoronMove() { +asm int daAlink_c::procGoronMove() { nofralloc #include "asm/d/a/d_a_alink/procGoronMove__9daAlink_cFv.s" } @@ -16769,14 +18369,20 @@ void daAlink_c::commonWaitTurnInit() { } /* 80120474-80120500 11ADB4 008C+00 2/1 0/0 0/0 .text commonGrabPutInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::commonGrabPutInit() { - nofralloc -#include "asm/d/a/d_a_alink/commonGrabPutInit__9daAlink_cFv.s" +int daAlink_c::commonGrabPutInit() { + if (mGrabItemAcKeep.getActor() == NULL) { + if (mProcID != PROC_GRAB_STAND && (mProcID != PROC_WOLF_GRAB_PUT || !(mUnderFrameCtrl[0].getFrame() < field_0x3478))) { + dComIfGp_evmng_cutEnd(field_0x3184); + return 1; + } + } + + if (i_checkWolf()) { + return procWolfGrabPutInit(); + } + + return procGrabPutInit(); } -#pragma pop /* 80120500-80120534 11AE40 0034+00 3/3 0/0 0/0 .text commonLargeDamageUpInit__9daAlink_cFiiss */ void daAlink_c::commonLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16 param_3) { @@ -17640,7 +19246,7 @@ BOOL daPy_py_c::checkWolfTagLockJumpLand() const { } /* 801415E4-801415EC 13BF24 0008+00 1/0 0/0 0/0 .text checkWolfRope__9daPy_py_cFv */ -bool daPy_py_c::checkWolfRope() { +BOOL daPy_py_c::checkWolfRope() { return false; } @@ -18081,14 +19687,14 @@ void daPy_py_c::onSpinnerPathForceRemove() { } /* 80141814-8014181C 13C154 0008+00 1/0 0/0 0/0 .text getIronBallBgHit__9daPy_py_cCFv */ -bool daPy_py_c::getIronBallBgHit() const { - return false; +s16 daPy_py_c::getIronBallBgHit() const { + return 0; } /* 8014181C-80141824 13C15C 0008+00 1/0 0/0 0/0 .text getIronBallCenterPos__9daPy_py_cFv */ -bool daPy_py_c::getIronBallCenterPos() { - return false; +cXyz* daPy_py_c::getIronBallCenterPos() { + return NULL; } /* 80141824-8014182C 13C164 0008+00 1/0 0/0 0/0 .text checkCanoeFishingGetLeft__9daPy_py_cCFv */ @@ -18161,7 +19767,7 @@ void daPy_py_c::setSumouLoseHeadUp() { /* 80141874-8014187C 13C1B4 0008+00 1/0 0/0 0/0 .text getGiantPuzzleAimAngle__9daPy_py_cCFv */ s16 daPy_py_c::getGiantPuzzleAimAngle() const { - return mCollisionRot.y; + return shape_angle.y; } /* 8014187C-80141880 13C1BC 0004+00 1/0 0/0 0/0 .text setGoronSideMove__9daPy_py_cFP10fopAc_ac_c diff --git a/src/d/a/d_a_alink_HIO_data.inc b/src/d/a/d_a_alink_HIO_data.inc index 87469b134ce..f069583b84d 100644 --- a/src/d/a/d_a_alink_HIO_data.inc +++ b/src/d/a/d_a_alink_HIO_data.inc @@ -1,12 +1,43 @@ +// clang-format off /* 8038D664-8038D6BC 019CC4 0058+00 41/50 0/0 0/0 .rodata m__19daAlinkHIO_basic_c0 */ -daAlinkHIO_basic_c1 const daAlinkHIO_basic_c0::m = { - false, 20000, -10000, 8000, 1, 30, 400, 600, 16384, 1.0f, 4.0f, 0.7f, 3.0f, - 60.0f, 85.0f, 300.0f, 200.0f, 20.0f, 30.0f, 23.0f, 41.0f, 0.7f, 0.5f, 0.7f, 400.0f, 5000.0f, +const daAlinkHIO_basic_c1 daAlinkHIO_basic_c0::m = { + false, + 20000, + -10000, + 8000, + 1, + 30, + 400, + 600, + 16384, + 1.0f, + 4.0f, + 0.7f, + 3.0f, + 60.0f, + 85.0f, + 300.0f, + 200.0f, + 20.0f, + 30.0f, + 23.0f, + 41.0f, + 0.7f, + 0.5f, + 0.7f, + 400.0f, + 5000.0f, }; /* 8038D6BC-8038D714 019D1C 0058+00 34/47 0/0 0/0 .rodata m__18daAlinkHIO_move_c0 */ -daAlinkHIO_move_c1 const daAlinkHIO_move_c0::m = { - {11, 0.7f, 3.0f, 4.0f, 12.0f}, +const daAlinkHIO_move_c1 daAlinkHIO_move_c0::m = { + { + 11, + 0.7f, + 3.0f, + 4.0f, + 12.0f, + }, 4500, 100, 5, @@ -28,22 +59,80 @@ daAlinkHIO_move_c1 const daAlinkHIO_move_c0::m = { }; /* 8038D714-8038D768 019D74 0054+00 10/16 0/0 0/0 .rodata m__21daAlinkHIO_atnMove_c0 */ -daAlinkHIO_atnMove_c1 const daAlinkHIO_atnMove_c0::m = { - 3000, 2000, 6, 1.2f, 1.1f, 1.5f, 0.5f, 0.6f, 13.0f, 6.0f, 7.5f, - 0.7f, 1.4f, 0.25f, 0.7f, 15.0f, 2.5f, 8.0f, 0.5f, 0.4f, 1.0f, 1.3f, +const daAlinkHIO_atnMove_c1 daAlinkHIO_atnMove_c0::m = { + 3000, + 2000, + 6, + 1.2f, + 1.1f, + 1.5f, + 0.5f, + 0.6f, + 13.0f, + 6.0f, + 7.5f, + 0.7f, + 1.4f, + 0.25f, + 0.7f, + 15.0f, + 2.5f, + 8.0f, + 0.5f, + 0.4f, + 1.0f, + 1.3f, }; /* 8038D768-8038D7BC 019DC8 0054+00 3/9 0/0 0/0 .rodata m__26daAlinkHIO_noActAtnMove_c0 */ -daAlinkHIO_noActAtnMove_c1 const daAlinkHIO_noActAtnMove_c0::m = { - 3000, 2000, 6, 0.9f, 1.1f, 1.3f, 0.5f, 0.6f, 13.0f, 6.0f, 7.5f, - 0.7f, 1.3f, 0.25f, 0.7f, 13.0f, 2.5f, 8.0f, 0.35f, 0.4f, 0.1f, 2.3f, +const daAlinkHIO_noActAtnMove_c1 daAlinkHIO_noActAtnMove_c0::m = { + 3000, + 2000, + 6, + 0.9f, + 1.1f, + 1.3f, + 0.5f, + 0.6f, + 13.0f, + 6.0f, + 7.5f, + 0.7f, + 1.3f, + 0.25f, + 0.7f, + 13.0f, + 2.5f, + 8.0f, + 0.35f, + 0.4f, + 0.1f, + 2.3f, }; /* 8038D7BC-8038D82C 019E1C 0070+00 5/7 0/0 0/0 .rodata m__23daAlinkHIO_frontRoll_c0 */ -daAlinkHIO_frontRoll_c1 const daAlinkHIO_frontRoll_c0::m = { - {29, 1.1f, 0.0f, 3.0f, 22.0f}, - {29, 0.8f, 3.0f, 2.0f, 25.0f}, - {33, 1.2f, 0.0f, 1.0f, 25.0f}, +const daAlinkHIO_frontRoll_c1 daAlinkHIO_frontRoll_c0::m = { + { + 29, + 1.1f, + 0.0f, + 3.0f, + 22.0f, + }, + { + 29, + 0.8f, + 3.0f, + 2.0f, + 25.0f, + }, + { + 33, + 1.2f, + 0.0f, + 1.0f, + 25.0f, + }, 10000, 5, 1000, @@ -62,16 +151,57 @@ daAlinkHIO_frontRoll_c1 const daAlinkHIO_frontRoll_c0::m = { }; /* 8038D82C-8038D864 019E8C 0038+00 5/5 0/0 0/0 .rodata m__22daAlinkHIO_backJump_c0 */ -daAlinkHIO_backJump_c1 const daAlinkHIO_backJump_c0::m = { - {9, 0.7f, 0.0f, 2.0f, 12.0f}, {17, 1.0f, 2.0f, 2.0f, 3.0f}, 24.0f, 10.0f, 100.0f, 10.0f, +const daAlinkHIO_backJump_c1 daAlinkHIO_backJump_c0::m = { + { + 9, + 0.7f, + 0.0f, + 2.0f, + 12.0f, + }, + { + 17, + 1.0f, + 2.0f, + 2.0f, + 3.0f, + }, + 24.0f, + 10.0f, + 100.0f, + 10.0f, }; /* 8038D864-8038D8CC 019EC4 0068+00 3/3 0/0 0/0 .rodata m__22daAlinkHIO_sideStep_c0 */ -daAlinkHIO_sideStep_c1 const daAlinkHIO_sideStep_c0::m = { - {5, 1.1f, 1.0f, 3.0f, 6.0f}, - {9, 1.0f, 0.0f, 3.0f, 2.0f}, - {6, 1.0f, 0.0f, 3.0f, 7.0f}, - {9, 1.1f, 0.0f, 3.0f, 4.0f}, +const daAlinkHIO_sideStep_c1 daAlinkHIO_sideStep_c0::m = { + { + 5, + 1.1f, + 1.0f, + 3.0f, + 6.0f, + }, + { + 9, + 1.0f, + 0.0f, + 3.0f, + 2.0f, + }, + { + 6, + 1.0f, + 0.0f, + 3.0f, + 7.0f, + }, + { + 9, + 1.1f, + 0.0f, + 3.0f, + 4.0f, + }, 28.0f, 22.0f, 25.0f, @@ -81,11 +211,35 @@ daAlinkHIO_sideStep_c1 const daAlinkHIO_sideStep_c0::m = { }; /* 8038D8CC-8038D944 019F2C 0078+00 5/10 0/0 0/0 .rodata m__19daAlinkHIO_slide_c0 */ -daAlinkHIO_slide_c1 const daAlinkHIO_slide_c0::m = { - {14, 0.75f, 0.0f, 5.0f, 15.0f}, - {6, 0.9f, 0.0f, 3.0f, 7.0f}, - {15, 1.0f, 0.0f, 3.0f, 9.0f}, - {20, 1.0f, 0.0f, 3.0f, 16.0f}, +const daAlinkHIO_slide_c1 daAlinkHIO_slide_c0::m = { + { + 14, + 0.75f, + 0.0f, + 5.0f, + 15.0f, + }, + { + 6, + 0.9f, + 0.0f, + 3.0f, + 7.0f, + }, + { + 15, + 1.0f, + 0.0f, + 3.0f, + 9.0f, + }, + { + 20, + 1.0f, + 0.0f, + 3.0f, + 16.0f, + }, 40.0f, 3.0f, 50.0f, @@ -101,8 +255,14 @@ daAlinkHIO_slide_c1 const daAlinkHIO_slide_c0::m = { /* 8038D944-8038D964 019FA4 0020+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutNmV_c0 */ #pragma push #pragma force_active on -daAlinkHIO_cutNmV_c1 const daAlinkHIO_cutNmV_c0::m = { - {27, 1.2f, 2.0f, 2.0f, 16.0f}, +const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmV_c0::m = { + { + 27, + 1.2f, + 2.0f, + 2.0f, + 16.0f, + }, 5.0f, 5.0f, 10.0f, @@ -112,8 +272,14 @@ daAlinkHIO_cutNmV_c1 const daAlinkHIO_cutNmV_c0::m = { /* 8038D964-8038D984 019FC4 0020+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutNmL_c0 */ #pragma push #pragma force_active on -daAlinkHIO_cutNmL_c1 const daAlinkHIO_cutNmL_c0::m = { - {27, 1.2f, 2.0f, 2.0f, 16.0f}, +const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmL_c0::m = { + { + 27, + 1.2f, + 2.0f, + 2.0f, + 16.0f, + }, 3.0f, 7.0f, 13.0f, @@ -123,8 +289,14 @@ daAlinkHIO_cutNmL_c1 const daAlinkHIO_cutNmL_c0::m = { /* 8038D984-8038D9A4 019FE4 0020+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutNmR_c0 */ #pragma push #pragma force_active on -daAlinkHIO_cutNmR_c1 const daAlinkHIO_cutNmR_c0::m = { - {27, 1.2f, 3.0f, 1.0f, 16.0f}, +const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmR_c0::m = { + { + 27, + 1.2f, + 3.0f, + 1.0f, + 16.0f, + }, 3.0f, 7.0f, 12.5f, @@ -134,8 +306,14 @@ daAlinkHIO_cutNmR_c1 const daAlinkHIO_cutNmR_c0::m = { /* 8038D9A4-8038D9C4 01A004 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_cutNmSL_c0 */ #pragma push #pragma force_active on -daAlinkHIO_cutNmSL_c1 const daAlinkHIO_cutNmSL_c0::m = { - {31, 1.1f, 3.0f, 3.0f, 17.0f}, +const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSL_c0::m = { + { + 31, + 1.1f, + 3.0f, + 3.0f, + 17.0f, + }, 10.0f, 3.0f, 10.0f, @@ -145,8 +323,14 @@ daAlinkHIO_cutNmSL_c1 const daAlinkHIO_cutNmSL_c0::m = { /* 8038D9C4-8038D9E4 01A024 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_cutNmSR_c0 */ #pragma push #pragma force_active on -daAlinkHIO_cutNmSR_c1 const daAlinkHIO_cutNmSR_c0::m = { - {27, 1.1f, 4.0f, 3.0f, 17.0f}, +const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSR_c0::m = { + { + 27, + 1.1f, + 4.0f, + 3.0f, + 17.0f, + }, 8.0f, 3.0f, 10.0f, @@ -156,55 +340,146 @@ daAlinkHIO_cutNmSR_c1 const daAlinkHIO_cutNmSR_c0::m = { /* 8038D9E4-8038DA10 01A044 002C+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutFnL_c0 */ #pragma push #pragma force_active on -daAlinkHIO_cutFnL_c1 const daAlinkHIO_cutFnL_c0::m = { - {29, 1.0f, 0.0f, 3.0f, 27.0f}, 0.0f, 5.0f, 7.0f, 12.0f, 21.0f, 3.0f, +const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnL_c0::m = { + { + 29, + 1.0f, + 0.0f, + 3.0f, + 27.0f, + }, + 0, + 0, + 5.0f, + 7.0f, + 12.0f, + 21.0f, + 3.0f, }; #pragma pop /* 8038DA10-8038DA3C 01A070 002C+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutFnV_c0 */ #pragma push #pragma force_active on -daAlinkHIO_cutFnV_c1 const daAlinkHIO_cutFnV_c0::m = { - {33, 1.0f, 0.0f, 3.0f, 20.0f}, 0.0f, 5.0f, 5.0f, 11.0f, 17.0f, 1.0f, +const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnV_c0::m = { + { + 33, + 1.0f, + 0.0f, + 3.0f, + 20.0f, + }, + 0, + 0, + 5.0f, + 5.0f, + 11.0f, + 17.0f, + 1.0f, }; #pragma pop /* 8038DA3C-8038DA68 01A09C 002C+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutFnS_c0 */ #pragma push #pragma force_active on -daAlinkHIO_cutFnS_c1 const daAlinkHIO_cutFnS_c0::m = { - {31, 1.1f, 0.0f, 3.0f, 28.0f}, 0, 4, 10.0f, 10.0f, 17.0f, 23.0f, 3.0f, +const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnS_c0::m = { + { + 31, + 1.1f, + 0.0f, + 3.0f, + 28.0f, + }, + 0, + 4, + 10.0f, + 10.0f, + 17.0f, + 23.0f, + 3.0f, }; #pragma pop /* 8038DA68-8038DA94 01A0C8 002C+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_cutFnSl_c0 */ #pragma push #pragma force_active on -daAlinkHIO_cutFnSl_c1 const daAlinkHIO_cutFnSl_c0::m = { - {33, 0.9f, 2.0f, 3.0f, 25.0f}, 0, 4, 15.0f, 6.0f, 13.0f, 21.0f, 5.0f, +const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSl_c0::m = { + { + 33, + 0.9f, + 2.0f, + 3.0f, + 25.0f, + }, + 0, + 4, + 15.0f, + 6.0f, + 13.0f, + 21.0f, + 5.0f, }; #pragma pop /* 8038DA94-8038DAC0 01A0F4 002C+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_cutFnSm_c0 */ #pragma push #pragma force_active on -daAlinkHIO_cutFnSm_c1 const daAlinkHIO_cutFnSm_c0::m = { - {31, 0.9f, 2.0f, 3.0f, 20.0f}, 0, 2, 5.0f, 10.0f, 17.0f, 24.0f, 5.0f, +const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSm_c0::m = { + { + 31, + 0.9f, + 2.0f, + 3.0f, + 20.0f, + }, + 0, + 2, + 5.0f, + 10.0f, + 17.0f, + 24.0f, + 5.0f, }; #pragma pop /* 8038DAC0-8038DAEC 01A120 002C+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutFnR_c0 */ #pragma push -daAlinkHIO_cutFnR_c1 const daAlinkHIO_cutFnR_c0::m = { - {34, 1.1f, 0.0f, 3.0f, 25.0f}, 0.0f, 5.0f, 8.0f, 14.0f, 17.0f, 1.0f, +const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnR_c0::m = { + { + 34, + 1.1f, + 0.0f, + 3.0f, + 25.0f, + }, + 0, + 0, + 5.0f, + 8.0f, + 14.0f, + 17.0f, + 1.0f, }; #pragma pop /* 8038DAEC-8038DB40 01A14C 0054+00 3/4 0/0 0/0 .rodata m__21daAlinkHIO_cutFnJU_c0 */ -daAlinkHIO_cutFnJU_c1 const daAlinkHIO_cutFnJU_c0::m = { - {19, 1.0f, 5.0f, 2.0f, 20.0f}, - {17, 1.1f, 2.0f, 4.0f, 8.0f}, - 0.0f, +const daAlinkHIO_cutFnJU_c1 daAlinkHIO_cutFnJU_c0::m = { + { + 19, + 1.0f, + 5.0f, + 2.0f, + 20.0f, + }, + { + 17, + 1.1f, + 2.0f, + 4.0f, + 8.0f, + }, + 0, + 0, 8.0f, 33.0f, 2.0f, @@ -218,9 +493,21 @@ daAlinkHIO_cutFnJU_c1 const daAlinkHIO_cutFnJU_c0::m = { }; /* 8038DB40-8038DB84 01A1A0 0044+00 4/4 0/0 0/0 .rodata m__21daAlinkHIO_cutJump_c0 */ -daAlinkHIO_cutJump_c1 const daAlinkHIO_cutJump_c0::m = { - {17, 1.1f, 0.0f, 2.0f, 18.0f}, - {29, 1.0f, 2.0f, 0.0f, 9.0f}, +const daAlinkHIO_cutJump_c1 daAlinkHIO_cutJump_c0::m = { + { + 17, + 1.1f, + 0.0f, + 2.0f, + 18.0f, + }, + { + 29, + 1.0f, + 2.0f, + 0.0f, + 9.0f, + }, 25.0f, 27.0f, 15.0f, @@ -231,11 +518,30 @@ daAlinkHIO_cutJump_c1 const daAlinkHIO_cutJump_c0::m = { }; /* 8038DB84-8038DC1C 01A1E4 0098+00 5/6 0/0 0/0 .rodata m__21daAlinkHIO_cutTurn_c0 */ -daAlinkHIO_cutTurn_c1 const daAlinkHIO_cutTurn_c0::m = { - {47, 1.0f, 2.0f, 3.0f, 28.0f}, - {9, 0.55f, 0.0f, 3.0f, 10.0f}, - {42, 1.0f, 2.0f, 3.0f, 27.0f}, - 0.0f, +const daAlinkHIO_cutTurn_c1 daAlinkHIO_cutTurn_c0::m = { + { + 47, + 1.0f, + 2.0f, + 3.0f, + 28.0f, + }, + { + 9, + 0.55f, + 0.0f, + 3.0f, + 10.0f, + }, + { + 42, + 1.0f, + 2.0f, + 3.0f, + 27.0f, + }, + 0, + 0, 7.0f, 6.0f, 22.0f, @@ -263,8 +569,14 @@ daAlinkHIO_cutTurn_c1 const daAlinkHIO_cutTurn_c0::m = { /* 8038DC1C-8038DC3C 01A27C 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_hoCutLA_c0 */ #pragma push #pragma force_active on -daAlinkHIO_hoCutLA_c1 const daAlinkHIO_hoCutLA_c0::m = { - {21, 0.9f, 1.0f, 2.0f, 14.0f}, +const daAlinkHIO_hoCutLA_c1 daAlinkHIO_hoCutLA_c0::m = { + { + 21, + 0.9f, + 1.0f, + 2.0f, + 14.0f, + }, 2.0f, 6.0f, 6.0f, @@ -274,8 +586,14 @@ daAlinkHIO_hoCutLA_c1 const daAlinkHIO_hoCutLA_c0::m = { /* 8038DC3C-8038DC5C 01A29C 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_hoCutLB_c0 */ #pragma push #pragma force_active on -daAlinkHIO_hoCutLB_c1 const daAlinkHIO_hoCutLB_c0::m = { - {24, 0.9f, 4.0f, 2.0f, 16.0f}, +const daAlinkHIO_hoCutLB_c1 daAlinkHIO_hoCutLB_c0::m = { + { + 24, + 0.9f, + 4.0f, + 2.0f, + 16.0f, + }, 7.0f, 13.0f, 6.0f, @@ -285,8 +603,14 @@ daAlinkHIO_hoCutLB_c1 const daAlinkHIO_hoCutLB_c0::m = { /* 8038DC5C-8038DC7C 01A2BC 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_hoCutRA_c0 */ #pragma push #pragma force_active on -daAlinkHIO_hoCutRA_c1 const daAlinkHIO_hoCutRA_c0::m = { - {24, 0.95f, 0.0f, 2.0f, 13.0f}, +const daAlinkHIO_hoCutRA_c1 daAlinkHIO_hoCutRA_c0::m = { + { + 24, + 0.95f, + 0.0f, + 2.0f, + 13.0f, + }, 2.0f, 6.0f, 6.0f, @@ -296,8 +620,14 @@ daAlinkHIO_hoCutRA_c1 const daAlinkHIO_hoCutRA_c0::m = { /* 8038DC7C-8038DC9C 01A2DC 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_hoCutRB_c0 */ #pragma push #pragma force_active on -daAlinkHIO_hoCutRB_c1 const daAlinkHIO_hoCutRB_c0::m = { - {11, 0.9f, 0.0f, 2.0f, 10.0f}, +const daAlinkHIO_hoCutRB_c1 daAlinkHIO_hoCutRB_c0::m = { + { + 11, + 0.9f, + 0.0f, + 2.0f, + 10.0f, + }, 2.0f, 11.0f, 6.0f, @@ -305,10 +635,28 @@ daAlinkHIO_hoCutRB_c1 const daAlinkHIO_hoCutRB_c0::m = { #pragma pop /* 8038DC9C-8038DCF0 01A2FC 0054+00 3/3 0/0 0/0 .rodata m__25daAlinkHIO_hoCutCharge_c0 */ -daAlinkHIO_hoCutCharge_c1 const daAlinkHIO_hoCutCharge_c0::m = { - {6, 0.45f, 0.0f, 3.0f, 7.0f}, - {21, 1.0f, 3.0f, 3.0f, 22.0f}, - {49, 1.0f, 5.0f, 2.0f, 27.0f}, +const daAlinkHIO_hoCutCharge_c1 daAlinkHIO_hoCutCharge_c0::m = { + { + 6, + 0.45f, + 0.0f, + 3.0f, + 7.0f, + }, + { + 21, + 1.0f, + 3.0f, + 3.0f, + 22.0f, + }, + { + 49, + 1.0f, + 5.0f, + 2.0f, + 27.0f, + }, 4, 5, 8.0f, @@ -321,8 +669,14 @@ daAlinkHIO_hoCutCharge_c1 const daAlinkHIO_hoCutCharge_c0::m = { /* 8038DCF0-8038DD0C 01A350 001C+00 0/3 0/0 0/0 .rodata m__20daAlinkHIO_cutDaL_c0 */ #pragma push #pragma force_active on -daAlinkHIO_cutDaL_c1 const daAlinkHIO_cutDaL_c0::m = { - {12, 0.8f, 1.0f, 3.0f, 10.0f}, +const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaL_c0::m = { + { + 12, + 0.8f, + 1.0f, + 3.0f, + 10.0f, + }, 2.0f, 6.0f, }; @@ -331,8 +685,14 @@ daAlinkHIO_cutDaL_c1 const daAlinkHIO_cutDaL_c0::m = { /* 8038DD0C-8038DD28 01A36C 001C+00 0/3 0/0 0/0 .rodata m__20daAlinkHIO_cutDaR_c0 */ #pragma push #pragma force_active on -daAlinkHIO_cutDaR_c1 const daAlinkHIO_cutDaR_c0::m = { - {14, 1.0f, 0.0f, 5.0f, 11.0f}, +const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaR_c0::m = { + { + 14, + 1.0f, + 0.0f, + 5.0f, + 11.0f, + }, 2.0f, 6.0f, }; @@ -341,20 +701,56 @@ daAlinkHIO_cutDaR_c1 const daAlinkHIO_cutDaR_c0::m = { /* 8038DD28-8038DD44 01A388 001C+00 0/3 0/0 0/0 .rodata m__25daAlinkHIO_cutDaCharge_c0 */ #pragma push #pragma force_active on -daAlinkHIO_cutDaCharge_c1 const daAlinkHIO_cutDaCharge_c0::m = { - {14, 1.0f, 0.0f, 3.0f, 15.0f}, +const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaCharge_c0::m = { + { + 14, + 1.0f, + 0.0f, + 3.0f, + 15.0f, + }, 3.0f, 8.0f, }; #pragma pop /* 8038DD44-8038DDB8 01A3A4 0074+00 5/5 0/0 0/0 .rodata m__21daAlinkHIO_cutDown_c0 */ -daAlinkHIO_cutDown_c1 const daAlinkHIO_cutDown_c0::m = { - {8, 1.0f, 0.0f, 3.0f, 9.0f}, - {15, 1.0f, 0.0f, 3.0f, 9.0f}, - {16, 1.3f, 1.0f, 3.0f, 17.0f}, - {73, 1.0f, 0.0f, 2.0f, 70.0f}, - {9, 0.85f, 0.0f, 3.0f, 12.0f}, +const daAlinkHIO_cutDown_c1 daAlinkHIO_cutDown_c0::m = { + { + 8, + 1.0f, + 0.0f, + 3.0f, + 9.0f, + }, + { + 15, + 1.0f, + 0.0f, + 3.0f, + 9.0f, + }, + { + 16, + 1.3f, + 1.0f, + 3.0f, + 17.0f, + }, + { + 73, + 1.0f, + 0.0f, + 2.0f, + 70.0f, + }, + { + 9, + 0.85f, + 0.0f, + 3.0f, + 12.0f, + }, 15, 6, 40.0f, @@ -363,10 +759,28 @@ daAlinkHIO_cutDown_c1 const daAlinkHIO_cutDown_c0::m = { }; /* 8038DDB8-8038DE18 01A418 0060+00 4/4 0/0 0/0 .rodata m__21daAlinkHIO_cutHead_c0 */ -daAlinkHIO_cutHead_c1 const daAlinkHIO_cutHead_c0::m = { - {8, 0.9f, 0.0f, 1.0f, 9.0f}, - {21, 1.0f, 0.0f, 2.0f, 22.0f}, - {16, 1.2f, 1.0f, 3.0f, 10.0f}, +const daAlinkHIO_cutHead_c1 daAlinkHIO_cutHead_c0::m = { + { + 8, + 0.9f, + 0.0f, + 1.0f, + 9.0f, + }, + { + 21, + 1.0f, + 0.0f, + 2.0f, + 22.0f, + }, + { + 16, + 1.2f, + 1.0f, + 3.0f, + 10.0f, + }, -4.0f, 300.0f, 400.0f, @@ -379,11 +793,35 @@ daAlinkHIO_cutHead_c1 const daAlinkHIO_cutHead_c0::m = { }; /* 8038DE18-8038DE8C 01A478 0074+00 5/5 0/0 0/0 .rodata m__26daAlinkHIO_cutLargeJump_c0 */ -daAlinkHIO_cutLargeJump_c1 const daAlinkHIO_cutLargeJump_c0::m = { - {29, 1.3f, 0.0f, 3.0f, 30.0f}, - {6, 1.0f, 0.0f, 3.0f, 7.0f}, - {16, 1.0f, 0.0f, 2.0f, 17.0f}, - {35, 1.25f, 0.0f, 0.0f, 22.0f}, +const daAlinkHIO_cutLargeJump_c1 daAlinkHIO_cutLargeJump_c0::m = { + { + 29, + 1.3f, + 0.0f, + 3.0f, + 30.0f, + }, + { + 6, + 1.0f, + 0.0f, + 3.0f, + 7.0f, + }, + { + 16, + 1.0f, + 0.0f, + 2.0f, + 17.0f, + }, + { + 35, + 1.25f, + 0.0f, + 0.0f, + 22.0f, + }, 20.0f, 33.0f, 2.0f, @@ -396,11 +834,35 @@ daAlinkHIO_cutLargeJump_c1 const daAlinkHIO_cutLargeJump_c0::m = { }; /* 8038DE8C-8038DF28 01A4EC 009C+00 21/30 0/0 0/0 .rodata m__17daAlinkHIO_cut_c0 */ -daAlinkHIO_cut_c1 const daAlinkHIO_cut_c0::m = { - {18, -1.100f, 0.0f, 3.0f, -1.0f}, - {22, 0.9f, 0.0f, 3.0f, 23.0f}, - {45, 1.0f, 0.0f, 3.0f, 15.0f}, - {47, 1.0f, 0.0f, 5.0f, 27.0f}, +const daAlinkHIO_cut_c1 daAlinkHIO_cut_c0::m = { + { + 18, + -1.100f, + 0.0f, + 3.0f, + -1.0f, + }, + { + 22, + 0.9f, + 0.0f, + 3.0f, + 23.0f, + }, + { + 45, + 1.0f, + 0.0f, + 3.0f, + 15.0f, + }, + { + 47, + 1.0f, + 0.0f, + 5.0f, + 27.0f, + }, 0, 1, 15, @@ -428,29 +890,87 @@ daAlinkHIO_cut_c1 const daAlinkHIO_cut_c0::m = { }; /* 8038DF28-8038DF4C 01A588 0024+00 1/1 0/0 0/0 .rodata m__21daAlinkHIO_gAtPush_c0 */ -daAlinkHIO_gAtPush_c1 const daAlinkHIO_gAtPush_c0::m = { - {14, 1.0f, 1.0f, 5.0f, 18.0f}, 14.0f, 1.0f, 12.0f, 14.0f, +const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtPush_c0::m = { + { + 14, + 1.0f, + 1.0f, + 5.0f, + 18.0f, + }, + 14.0f, + 1.0f, + 12.0f, + 14.0f, }; /* 8038DF4C-8038DF70 01A5AC 0024+00 0/0 0/0 0/0 .rodata m__21daAlinkHIO_gAtKick_c0 */ #pragma push #pragma force_active on -daAlinkHIO_gAtKick_c1 const daAlinkHIO_gAtKick_c0::m = { - {21, 1.2f, 0.0f, 0.0f, 22.0f}, 10.0f, 6.0f, 11.0f, 18.0f, +const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtKick_c0::m = { + { + 21, + 1.2f, + 0.0f, + 0.0f, + 22.0f, + }, + 10.0f, + 6.0f, + 11.0f, + 18.0f, }; #pragma pop /* 8038DF70-8038DF9C 01A5D0 002C+00 4/4 0/0 0/0 .rodata m__22daAlinkHIO_turnMove_c0 */ -daAlinkHIO_turnMove_c1 const daAlinkHIO_turnMove_c0::m = { - {27, 1.0f, 0.0f, 3.0f, 22.0f}, 5, 2500, 200, 1000, 1.1f, 19.0f, 1.5f, 25.0f, +const daAlinkHIO_turnMove_c1 daAlinkHIO_turnMove_c0::m = { + { + 27, + 1.0f, + 0.0f, + 3.0f, + 22.0f, + }, + 5, + 2500, + 200, + 1000, + 1.1f, + 19.0f, + 1.5f, + 25.0f, }; /* 8038DF9C-8038E01C 01A5FC 0080+00 6/7 0/0 0/0 .rodata m__19daAlinkHIO_guard_c0 */ -daAlinkHIO_guard_c1 const daAlinkHIO_guard_c0::m = { - {11, 1.0f, 0.0f, 0.0f, 12.0f}, - {11, 1.0f, 0.0f, 0.0f, 12.0f}, - {19, 1.0f, 0.0f, 3.0f, 20.0f}, - {35, 1.0f, 0.0f, 3.0f, 28.0f}, +const daAlinkHIO_guard_c1 daAlinkHIO_guard_c0::m = { + { + 11, + 1.0f, + 0.0f, + 0.0f, + 12.0f, + }, + { + 11, + 1.0f, + 0.0f, + 0.0f, + 12.0f, + }, + { + 19, + 1.0f, + 0.0f, + 3.0f, + 20.0f, + }, + { + 35, + 1.0f, + 0.0f, + 3.0f, + 28.0f, + }, 8000, 5000, 0, @@ -468,9 +988,21 @@ daAlinkHIO_guard_c1 const daAlinkHIO_guard_c0::m = { }; /* 8038E01C-8038E068 01A67C 004C+00 8/9 0/0 0/0 .rodata m__20daAlinkHIO_crouch_c0 */ -daAlinkHIO_crouch_c1 const daAlinkHIO_crouch_c0::m = { - {9, 1.0f, 0.0f, 3.0f, 10.0f}, - {7, -1.0f, 0.0f, 3.0f, 2.0f}, +const daAlinkHIO_crouch_c1 daAlinkHIO_crouch_c0::m = { + { + 9, + 1.0f, + 0.0f, + 3.0f, + 10.0f, + }, + { + 7, + -1.0f, + 0.0f, + 3.0f, + 2.0f, + }, 5, 500, 50, @@ -484,11 +1016,35 @@ daAlinkHIO_crouch_c1 const daAlinkHIO_crouch_c0::m = { }; /* 8038E068-8038E11C 01A6C8 00B4+00 26/32 0/0 0/0 .rodata m__22daAlinkHIO_autoJump_c0 */ -daAlinkHIO_autoJump_c1 const daAlinkHIO_autoJump_c0::m = { - {6, 1.2f, 3.0f, 6.0f, 7.0f}, - {7, 0.9f, 1.0f, 0.0f, 5.0f}, - {4, 0.75f, 0.0f, 2.0f, 5.0f}, - {10, 0.6f, 0.0f, 2.0f, 11.0f}, +const daAlinkHIO_autoJump_c1 daAlinkHIO_autoJump_c0::m = { + { + 6, + 1.2f, + 3.0f, + 6.0f, + 7.0f, + }, + { + 7, + 0.9f, + 1.0f, + 0.0f, + 5.0f, + }, + { + 4, + 0.75f, + 0.0f, + 2.0f, + 5.0f, + }, + { + 10, + 0.6f, + 0.0f, + 2.0f, + 11.0f, + }, 1, 9158, 12287, @@ -519,52 +1075,158 @@ daAlinkHIO_autoJump_c1 const daAlinkHIO_autoJump_c0::m = { }; /* 8038E11C-8038E164 01A77C 0048+00 7/7 0/0 0/0 .rodata m__23daAlinkHIO_smallJump_c0 */ -daAlinkHIO_smallJump_c1 const daAlinkHIO_smallJump_c0::m = { - {8, 0.6f, 3.0f, 3.0f, 9.0f}, - {5, 1.0f, 0.0f, 2.0f, 6.0f}, - {29, 0.85f, 0.0f, 5.0f, 6.0f}, +const daAlinkHIO_smallJump_c1 daAlinkHIO_smallJump_c0::m = { + { + 8, + 0.6f, + 3.0f, + 3.0f, + 9.0f, + }, + { + 5, + 1.0f, + 0.0f, + 2.0f, + 6.0f, + }, + { + 29, + 0.85f, + 0.0f, + 5.0f, + 6.0f, + }, 6.0f, 3.0f, 7.0f, }; /* 8038E164-8038E1B8 01A7C4 0054+00 15/15 0/0 0/0 .rodata m__23daAlinkHIO_wallCatch_c0 */ -daAlinkHIO_wallCatch_c1 const daAlinkHIO_wallCatch_c0::m = { - {19, 1.0f, 0.0f, 3.0f, 10.0f}, - {7, 1.0f, 0.0f, 3.0f, 8.0f}, - {29, 1.0f, 0.0f, 3.0f, 26.0f}, - {13, 1.0f, 1.0f, 2.0f, 14.0f}, +const daAlinkHIO_wallCatch_c1 daAlinkHIO_wallCatch_c0::m = { + { + 19, + 1.0f, + 0.0f, + 3.0f, + 10.0f, + }, + { + 7, + 1.0f, + 0.0f, + 3.0f, + 8.0f, + }, + { + 29, + 1.0f, + 0.0f, + 3.0f, + 26.0f, + }, + { + 13, + 1.0f, + 1.0f, + 2.0f, + 14.0f, + }, 4.0f, }; /* 8038E1B8-8038E1E0 01A818 0028+00 4/4 0/0 0/0 .rodata m__22daAlinkHIO_wallFall_c0 */ -daAlinkHIO_wallFall_c1 const daAlinkHIO_wallFall_c0::m = { - {22, 0.8f, 0.0f, 3.0f, 23.0f}, - {12, 1.0f, 0.0f, 3.0f, 13.0f}, +const daAlinkHIO_wallFall_c1 daAlinkHIO_wallFall_c0::m = { + { + 22, + 0.8f, + 0.0f, + 3.0f, + 23.0f, + }, + { + 12, + 1.0f, + 0.0f, + 3.0f, + 13.0f, + }, }; /* 8038E1E0-8038E1F4 01A840 0014+00 2/2 0/0 0/0 .rodata m__22daAlinkHIO_wallMove_c0 */ -daAlinkHIO_wallMove_c1 const daAlinkHIO_wallMove_c0::m = { - 0.8f, 1.1f, 3.0f, 2.0f, 3.0f, +const daAlinkHIO_wallMove_c1 daAlinkHIO_wallMove_c0::m = { + 0.8f, + 1.1f, + 3.0f, + 2.0f, + 3.0f, }; /* 8038E1F4-8038E210 01A854 001C+00 2/5 0/0 0/0 .rodata m__22daAlinkHIO_wallHang_c0 */ -daAlinkHIO_wallHang_c1 const daAlinkHIO_wallHang_c0::m = { - 2, 3, 50.0f, 100.0f, 150.0f, 200.0f, 250.0f, 200.0f, +const daAlinkHIO_wallHang_c1 daAlinkHIO_wallHang_c0::m = { + 2, + 3, + 50.0f, + 100.0f, + 150.0f, + 200.0f, + 250.0f, + 200.0f, }; /* 8038E210-8038E24C 01A870 003C+00 7/7 0/0 0/0 .rodata m__22daAlinkHIO_pushpull_c0 */ -daAlinkHIO_pushpull_c1 const daAlinkHIO_pushpull_c0::m = { - 0, 120, 7, 60, 80, 40, 2, 64, 1.0f, 5.0f, - 1.0f, 3.0f, 1.0f, 3.0f, 1.0f, 0.25f, 1.0f, 0.15f, 0.75f, +const daAlinkHIO_pushpull_c1 daAlinkHIO_pushpull_c0::m = { + 0, + 120, + 7, + 60, + 80, + 40, + 2, + 64, + 1.0f, + 5.0f, + 1.0f, + 3.0f, + 1.0f, + 3.0f, + 1.0f, + 0.25f, + 1.0f, + 0.15f, + 0.75f, }; /* 8038E24C-8038E2B0 01A8AC 0064+00 1/3 0/0 0/0 .rodata m__23daAlinkHIO_damNormal_c0 */ -daAlinkHIO_damNormal_c1 const daAlinkHIO_damNormal_c0::m = { - {22, 2.3f, 0.0f, 3.0f, 20.0f}, - {19, 2.3f, 0.0f, 3.0f, 17.0f}, - {19, 2.3f, 0.0f, 3.0f, 17.0f}, - {19, 2.3f, 0.0f, 3.0f, 17.0f}, +const daAlinkHIO_damNormal_c1 daAlinkHIO_damNormal_c0::m = { + { + 22, + 2.3f, + 0.0f, + 3.0f, + 20.0f, + }, + { + 19, + 2.3f, + 0.0f, + 3.0f, + 17.0f, + }, + { + 19, + 2.3f, + 0.0f, + 3.0f, + 17.0f, + }, + { + 19, + 2.3f, + 0.0f, + 3.0f, + 17.0f, + }, 2000, 5000, 10.0f, @@ -574,15 +1236,63 @@ daAlinkHIO_damNormal_c1 const daAlinkHIO_damNormal_c0::m = { }; /* 8038E2B0-8038E36C 01A910 00BC+00 2/4 0/0 0/0 .rodata m__22daAlinkHIO_damLarge_c0 */ -daAlinkHIO_damLarge_c1 const daAlinkHIO_damLarge_c0::m = { - {49, 0.8f, 0.0f, 3.0f, 40.0f}, - {64, 1.0f, 0.0f, 3.0f, 50.0f}, - {39, 0.8f, 0.0f, 3.0f, 33.0f}, - {39, 0.8f, 0.0f, 3.0f, 33.0f}, - {2, 0.8f, 0.0f, 1.0f, 50.0f}, - {2, 1.0f, 0.0f, 1.0f, 40.0f}, - {2, 1.0f, 0.0f, 1.0f, 40.0f}, - {2, 1.0f, 0.0f, 1.0f, 40.0f}, +const daAlinkHIO_damLarge_c1 daAlinkHIO_damLarge_c0::m = { + { + 49, + 0.8f, + 0.0f, + 3.0f, + 40.0f, + }, + { + 64, + 1.0f, + 0.0f, + 3.0f, + 50.0f, + }, + { + 39, + 0.8f, + 0.0f, + 3.0f, + 33.0f, + }, + { + 39, + 0.8f, + 0.0f, + 3.0f, + 33.0f, + }, + { + 2, + 0.8f, + 0.0f, + 1.0f, + 50.0f, + }, + { + 2, + 1.0f, + 0.0f, + 1.0f, + 40.0f, + }, + { + 2, + 1.0f, + 0.0f, + 1.0f, + 40.0f, + }, + { + 2, + 1.0f, + 0.0f, + 1.0f, + 40.0f, + }, 1300, -5.0f, 3.0f, @@ -593,15 +1303,63 @@ daAlinkHIO_damLarge_c1 const daAlinkHIO_damLarge_c0::m = { }; /* 8038E36C-8038E428 01A9CC 00BC+00 1/3 0/0 0/0 .rodata m__21daAlinkHIO_damHuge_c0 */ -daAlinkHIO_damHuge_c1 const daAlinkHIO_damHuge_c0::m = { - {49, 0.8f, 0.0f, 3.0f, 40.0f}, - {64, 0.8f, 0.0f, 3.0f, 50.0f}, - {39, 0.8f, 0.0f, 3.0f, 33.0f}, - {39, 0.8f, 0.0f, 3.0f, 33.0f}, - {2, 1.0f, 0.0f, 1.0f, 50.0f}, - {2, 1.0f, 0.0f, 1.0f, 40.0f}, - {2, 1.0f, 0.0f, 1.0f, 40.0f}, - {2, 1.0f, 0.0f, 1.0f, 40.0f}, +const daAlinkHIO_damHuge_c1 daAlinkHIO_damHuge_c0::m = { + { + 49, + 0.8f, + 0.0f, + 3.0f, + 40.0f, + }, + { + 64, + 0.8f, + 0.0f, + 3.0f, + 50.0f, + }, + { + 39, + 0.8f, + 0.0f, + 3.0f, + 33.0f, + }, + { + 39, + 0.8f, + 0.0f, + 3.0f, + 33.0f, + }, + { + 2, + 1.0f, + 0.0f, + 1.0f, + 50.0f, + }, + { + 2, + 1.0f, + 0.0f, + 1.0f, + 40.0f, + }, + { + 2, + 1.0f, + 0.0f, + 1.0f, + 40.0f, + }, + { + 2, + 1.0f, + 0.0f, + 1.0f, + 40.0f, + }, 2000, -7.5f, 3.0f, @@ -612,17 +1370,41 @@ daAlinkHIO_damHuge_c1 const daAlinkHIO_damHuge_c0::m = { }; /* 8038E428-8038E454 01AA88 002C+00 1/1 0/0 0/0 .rodata m__22daAlinkHIO_damHorse_c0 */ -daAlinkHIO_damHorse_c1 const daAlinkHIO_damHorse_c0::m = { - {9, 2.0f, 0.0f, 3.0f, 10.0f}, - {11, 1.0f, 0.0f, 3.0f, 12.0f}, +const daAlinkHIO_damHorse_c1 daAlinkHIO_damHorse_c0::m = { + { + 9, + 2.0f, + 0.0f, + 3.0f, + 10.0f, + }, + { + 11, + 1.0f, + 0.0f, + 3.0f, + 12.0f, + }, 2500, 5000, }; /* 8038E454-8038E49C 01AAB4 0048+00 9/9 0/0 0/0 .rodata m__21daAlinkHIO_damFall_c0 */ -daAlinkHIO_damFall_c1 const daAlinkHIO_damFall_c0::m = { - {11, 1.2f, 2.0f, 3.0f, 12.0f}, - {17, 0.8f, 0.0f, 0.0f, 12.0f}, +const daAlinkHIO_damFall_c1 daAlinkHIO_damFall_c0::m = { + { + 11, + 1.2f, + 2.0f, + 3.0f, + 12.0f, + }, + { + 17, + 0.8f, + 0.0f, + 0.0f, + 12.0f, + }, 10, 25, 4.0f, @@ -635,18 +1417,65 @@ daAlinkHIO_damFall_c1 const daAlinkHIO_damFall_c0::m = { }; /* 8038E49C-8038E4C0 01AAFC 0024+00 6/7 0/0 0/0 .rodata m__23daAlinkHIO_damCaught_c0 */ -daAlinkHIO_damCaught_c1 const daAlinkHIO_damCaught_c0::m = { - {59, 1.5f, 0.0f, 3.0f, 35.0f}, 300, 5, 0.7f, 3.0f, 1.3f, +const daAlinkHIO_damCaught_c1 daAlinkHIO_damCaught_c0::m = { + { + 59, + 1.5f, + 0.0f, + 3.0f, + 35.0f, + }, + 300, + 5, + 0.7f, + 3.0f, + 1.3f, }; /* 8038E4C0-8038E54C 01AB20 008C+00 1/2 0/0 0/0 .rodata m__21daAlinkHIO_damSwim_c0 */ -daAlinkHIO_damSwim_c1 const daAlinkHIO_damSwim_c0::m = { - {22, 1.2f, 0.0f, 3.0f, 18.0f}, - {19, 1.0f, 0.0f, 3.0f, 15.0f}, - {19, 1.2f, 0.0f, 3.0f, 15.0f}, - {19, 1.2f, 0.0f, 3.0f, 15.0f}, - {10, 1.0f, 0.0f, 3.0f, 11.0f}, - {11, 1.0f, 0.0f, 3.0f, 12.0f}, +const daAlinkHIO_damSwim_c1 daAlinkHIO_damSwim_c0::m = { + { + 22, + 1.2f, + 0.0f, + 3.0f, + 18.0f, + }, + { + 19, + 1.0f, + 0.0f, + 3.0f, + 15.0f, + }, + { + 19, + 1.2f, + 0.0f, + 3.0f, + 15.0f, + }, + { + 19, + 1.2f, + 0.0f, + 3.0f, + 15.0f, + }, + { + 10, + 1.0f, + 0.0f, + 3.0f, + 11.0f, + }, + { + 11, + 1.0f, + 0.0f, + 3.0f, + 12.0f, + }, 1500, 4000, 8.0f, @@ -656,9 +1485,21 @@ daAlinkHIO_damSwim_c1 const daAlinkHIO_damSwim_c0::m = { }; /* 8038E54C-8038E5A4 01ABAC 0058+00 10/12 0/0 0/0 .rodata m__20daAlinkHIO_damage_c0 */ -daAlinkHIO_damage_c1 const daAlinkHIO_damage_c0::m = { - {14, 1.0f, 0.0f, 3.0f, 15.0f}, - {9, 1.0f, 0.0f, 3.0f, 10.0f}, +const daAlinkHIO_damage_c1 daAlinkHIO_damage_c0::m = { + { + 14, + 1.0f, + 0.0f, + 3.0f, + 15.0f, + }, + { + 9, + 1.0f, + 0.0f, + 3.0f, + 10.0f, + }, 0, 30, 30, @@ -683,11 +1524,35 @@ daAlinkHIO_damage_c1 const daAlinkHIO_damage_c0::m = { }; /* 8038E5A4-8038E610 01AC04 006C+00 7/8 0/0 0/0 .rodata m__19daAlinkHIO_horse_c0 */ -daAlinkHIO_horse_c1 const daAlinkHIO_horse_c0::m = { - {18, 1.2f, 0.0f, 5.0f, 19.0f}, - {22, 1.2f, 0.0f, 3.0f, 23.0f}, - {43, 1.45f, 3.0f, 3.0f, 44.0f}, - {18, 1.2f, 0.0f, 3.0f, 23.0f}, +const daAlinkHIO_horse_c1 daAlinkHIO_horse_c0::m = { + { + 18, + 1.2f, + 0.0f, + 5.0f, + 19.0f, + }, + { + 22, + 1.2f, + 0.0f, + 3.0f, + 23.0f, + }, + { + 43, + 1.45f, + 3.0f, + 3.0f, + 44.0f, + }, + { + 18, + 1.2f, + 0.0f, + 3.0f, + 23.0f, + }, 100, 32767, 30, @@ -702,8 +1567,14 @@ daAlinkHIO_horse_c1 const daAlinkHIO_horse_c0::m = { /* ############################################################################################## */ /* 8038E610-8038E658 01AC70 0048+00 11/11 0/0 0/0 .rodata m__19daAlinkHIO_canoe_c0 */ -daAlinkHIO_canoe_c1 const daAlinkHIO_canoe_c0::m = { - {23, 1.3f, 0.0f, 3.0f, 24.0f}, +const daAlinkHIO_canoe_c1 daAlinkHIO_canoe_c0::m = { + { + 23, + 1.3f, + 0.0f, + 3.0f, + 24.0f, + }, 150, 360, 1.0f, @@ -721,9 +1592,21 @@ daAlinkHIO_canoe_c1 const daAlinkHIO_canoe_c0::m = { }; /* 8038E658-8038E6C8 01ACB8 0070+00 9/9 0/0 0/0 .rodata m__17daAlinkHIO_bow_c0 */ -daAlinkHIO_bow_c1 const daAlinkHIO_bow_c0::m = { - {9, 1.0f, 0.0f, 3.0f, 5.0f}, - {6, 1.0f, 0.0f, 3.0f, 7.0f}, +const daAlinkHIO_bow_c1 daAlinkHIO_bow_c0::m = { + { + 9, + 1.0f, + 0.0f, + 3.0f, + 5.0f, + }, + { + 6, + 1.0f, + 0.0f, + 3.0f, + 7.0f, + }, 10, 30, 70, @@ -746,9 +1629,21 @@ daAlinkHIO_bow_c1 const daAlinkHIO_bow_c0::m = { }; /* 8038E6C8-8038E714 01AD28 004C+00 22/23 0/0 0/0 .rodata m__18daAlinkHIO_boom_c0 */ -daAlinkHIO_boom_c1 const daAlinkHIO_boom_c0::m = { - {21, 0.9f, 3.0f, 2.0f, 22.0f}, - {25, 1.0f, 3.0f, 1.0f, 10.0f}, +const daAlinkHIO_boom_c1 daAlinkHIO_boom_c0::m = { + { + 21, + 0.9f, + 3.0f, + 2.0f, + 22.0f, + }, + { + 25, + 1.0f, + 3.0f, + 1.0f, + 10.0f, + }, 40, 0, 1.0f, @@ -762,24 +1657,69 @@ daAlinkHIO_boom_c1 const daAlinkHIO_boom_c0::m = { }; /* 8038E714-8038E760 01AD74 004C+00 14/14 0/0 0/0 .rodata m__18daAlinkHIO_bomb_c0 */ -daAlinkHIO_bomb_c1 const daAlinkHIO_bomb_c0::m = { - 160, 50, 50, -4.2f, -100.0f, 0.350f, 2.0f, 20.0f, 1.3f, 225.0f, - 0.0f, -0.8f, -7.0f, 26.0f, 33.0f, 10.0f, 15.0f, 40.0f, 15.0f, 300.0f, +const daAlinkHIO_bomb_c1 daAlinkHIO_bomb_c0::m = { + 160, + 50, + 50, + -4.2f, + -100.0f, + 0.350f, + 2.0f, + 20.0f, + 1.3f, + 225.0f, + 0.0f, + -0.8f, + -7.0f, + 26.0f, + 33.0f, + 10.0f, + 15.0f, + 40.0f, + 15.0f, + 300.0f, }; /* 8038E760-8038E77C 01ADC0 001C+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_huLight_c0 */ #pragma push #pragma force_active on -daAlinkHIO_huLight_c1 const daAlinkHIO_huLight_c0::m = { - 3, 0, 181, 112, 40, -70, 1.0f, 50.0f, 350.0f, 0.0f, +const daAlinkHIO_huLight_c1 daAlinkHIO_huLight_c0::m = { + 3, + 0, + 181, + 112, + 40, + -70, + 1.0f, + 50.0f, + 350.0f, + 0.0f, }; #pragma pop /* 8038E77C-8038E7CC 01ADDC 0050+00 7/8 0/0 0/0 .rodata m__23daAlinkHIO_kandelaar_c0 */ -daAlinkHIO_kandelaar_c1 const daAlinkHIO_kandelaar_c0::m = { - {30, 1.1f, 2.0f, 3.0f, 17.0f}, - {11, 1.0f, 0.0f, 3.0f, 12.0f}, - {17, 1.0f, 0.0f, 3.0f, 18.0f}, +const daAlinkHIO_kandelaar_c1 daAlinkHIO_kandelaar_c0::m = { + { + 30, + 1.1f, + 2.0f, + 3.0f, + 17.0f, + }, + { + 11, + 1.0f, + 0.0f, + 3.0f, + 12.0f, + }, + { + 17, + 1.0f, + 0.0f, + 3.0f, + 18.0f, + }, 80, 40, 20, @@ -792,14 +1732,32 @@ daAlinkHIO_kandelaar_c1 const daAlinkHIO_kandelaar_c0::m = { }; /* 8038E7CC-8038E7F4 01AE2C 0028+00 2/2 0/0 0/0 .rodata m__21daAlinkHIO_fmChain_c0 */ -daAlinkHIO_fmChain_c1 const daAlinkHIO_fmChain_c0::m = { - {20, 1.2f, 0.0f, 3.0f, 16.0f}, - {20, -1.1f, 0.0f, 3.0f, 5.0f}, +const daAlinkHIO_fmChain_c1 daAlinkHIO_fmChain_c0::m = { + { + 20, + 1.2f, + 0.0f, + 3.0f, + 16.0f, + }, + { + 20, + -1.1f, + 0.0f, + 3.0f, + 5.0f, + }, }; /* 8038E7F4-8038E840 01AE54 004C+00 17/21 0/0 0/0 .rodata m__24daAlinkHIO_magneBoots_c0 */ -daAlinkHIO_magneBoots_c1 const daAlinkHIO_magneBoots_c0::m = { - {29, 1.1f, 0.0f, 3.0f, 23.0f}, +const daAlinkHIO_magneBoots_c1 daAlinkHIO_magneBoots_c0::m = { + { + 29, + 1.1f, + 0.0f, + 3.0f, + 23.0f, + }, 0.4f, 1.0f, 1.8f, @@ -817,19 +1775,55 @@ daAlinkHIO_magneBoots_c1 const daAlinkHIO_magneBoots_c0::m = { }; /* 8038E840-8038E870 01AEA0 0030+00 6/6 0/0 0/0 .rodata m__20daAlinkHIO_pickUp_c0 */ -daAlinkHIO_pickUp_c1 const daAlinkHIO_pickUp_c0::m = { - {18, 0.9f, 0.0f, 2.0f, 13.0f}, - {18, -1.0f, 0.0f, 1.0f, 4.0f}, +const daAlinkHIO_pickUp_c1 daAlinkHIO_pickUp_c0::m = { + { + 18, + 0.9f, + 0.0f, + 2.0f, + 13.0f, + }, + { + 18, + -1.0f, + 0.0f, + 1.0f, + 4.0f, + }, 30.0f, 30.0f, }; /* 8038E870-8038E90C 01AED0 009C+00 16/17 0/0 0/0 .rodata m__19daAlinkHIO_board_c0 */ -daAlinkHIO_board_c1 const daAlinkHIO_board_c0::m = { - {9, 2.5f, 0.0f, 3.0f, 10.0f}, - {14, 0.7f, 0.0f, 8.0f, 15.0f}, - {24, 1.6f, 5.0f, 5.0f, 25.0f}, - {24, 0.8f, 0.0f, 3.0f, 25.0f}, +const daAlinkHIO_board_c1 daAlinkHIO_board_c0::m = { + { + 9, + 2.5f, + 0.0f, + 3.0f, + 10.0f, + }, + { + 14, + 0.7f, + 0.0f, + 8.0f, + 15.0f, + }, + { + 24, + 1.6f, + 5.0f, + 5.0f, + 25.0f, + }, + { + 24, + 0.8f, + 0.0f, + 3.0f, + 25.0f, + }, 70.0f, 4.0f, 22.0f, @@ -852,18 +1846,96 @@ daAlinkHIO_board_c1 const daAlinkHIO_board_c0::m = { }; /* 8038E90C-8038E9C0 01AF6C 00B4+00 12/12 0/0 0/0 .rodata m__20daAlinkHIO_bottle_c0 */ -daAlinkHIO_bottle_c1 const daAlinkHIO_bottle_c0::m = { - {56, 1.15f, 0.0f, 3.0f, 57.0f}, {39, 1.2f, 0.0f, 3.0f, 40.0f}, {44, 1.2f, 0.0f, 3.0f, 50.0f}, - {54, 1.1f, 0.0f, 3.0f, 55.0f}, {24, 1.0f, 0.0f, 3.0f, 25.0f}, {12, 0.6f, 1.0f, 3.0f, 10.0f}, - {47, 1.0f, 0.0f, 3.0f, 48.0f}, {86, 1.0f, 0.0f, 3.0f, 87.0f}, {29, 1.2f, 0.0f, 3.0f, 30.0f}, +const daAlinkHIO_bottle_c1 daAlinkHIO_bottle_c0::m = { + { + 56, + 1.15f, + 0.0f, + 3.0f, + 57.0f, + }, + { + 39, + 1.2f, + 0.0f, + 3.0f, + 40.0f, + }, + { + 44, + 1.2f, + 0.0f, + 3.0f, + 50.0f, + }, + { + 54, + 1.1f, + 0.0f, + 3.0f, + 55.0f, + }, + { + 24, + 1.0f, + 0.0f, + 3.0f, + 25.0f, + }, + { + 12, + 0.6f, + 1.0f, + 3.0f, + 10.0f, + }, + { + 47, + 1.0f, + 0.0f, + 3.0f, + 48.0f, + }, + { + 86, + 1.0f, + 0.0f, + 3.0f, + 87.0f, + }, + { + 29, + 1.2f, + 0.0f, + 3.0f, + 30.0f, + }, }; /* 8038E9C0-8038EA30 01B020 0070+00 15/16 0/0 0/0 .rodata m__22daAlinkHIO_hookshot_c0 */ -daAlinkHIO_hookshot_c1 const daAlinkHIO_hookshot_c0::m = { - {12, 1.0f, 0.0f, 0.0f, 13.0f}, - {39, 1.0f, 0.0f, 1.0f, 11.0f}, - {28, 1.0f, 0.0f, 2.0f, 7.0f}, - 0.0f, +const daAlinkHIO_hookshot_c1 daAlinkHIO_hookshot_c0::m = { + { + 12, + 1.0f, + 0.0f, + 0.0f, + 13.0f, + }, + { + 39, + 1.0f, + 0.0f, + 1.0f, + 11.0f, + }, + { + 28, + 1.0f, + 0.0f, + 2.0f, + 7.0f, + }, + 0, 1.0f, 3.0f, 2000.0f, @@ -879,8 +1951,14 @@ daAlinkHIO_hookshot_c1 const daAlinkHIO_hookshot_c0::m = { }; /* 8038EA30-8038EA70 01B090 0040+00 10/10 0/0 0/0 .rodata m__21daAlinkHIO_spinner_c0 */ -daAlinkHIO_spinner_c1 const daAlinkHIO_spinner_c0::m = { - {21, 0.8f, 0.0f, 3.0f, 13.0f}, +const daAlinkHIO_spinner_c1 daAlinkHIO_spinner_c0::m = { + { + 21, + 0.8f, + 0.0f, + 3.0f, + 13.0f, + }, 30, 15, 360, @@ -897,8 +1975,14 @@ daAlinkHIO_spinner_c1 const daAlinkHIO_spinner_c0::m = { }; /* 8038EA70-8038EAFC 01B0D0 008C+00 10/12 0/0 0/0 .rodata m__22daAlinkHIO_ironBall_c0 */ -daAlinkHIO_ironBall_c1 const daAlinkHIO_ironBall_c0::m = { - {19, 1.1f, 5.0f, 2.0f, 15.0f}, +const daAlinkHIO_ironBall_c1 daAlinkHIO_ironBall_c0::m = { + { + 19, + 1.1f, + 5.0f, + 2.0f, + 15.0f, + }, 5, 5, 1.0f, @@ -933,23 +2017,58 @@ daAlinkHIO_ironBall_c1 const daAlinkHIO_ironBall_c0::m = { }; /* 8038EAFC-8038EB34 01B15C 0038+00 4/4 0/0 0/0 .rodata m__21daAlinkHIO_copyRod_c0 */ -daAlinkHIO_copyRod_c1 const daAlinkHIO_copyRod_c0::m = { - 19, 1.0f, 0.0f, 3.0f, 14.0f, 39, 1.0f, 0.0f, 3.0f, 30.0f, 80.0f, 1500.0f, 100.0f, 2000.0f, +const daAlinkHIO_copyRod_c1 daAlinkHIO_copyRod_c0::m = { + 19, + 1.0f, + 0.0f, + 3.0f, + 14.0f, + 39, + 1.0f, + 0.0f, + 3.0f, + 30.0f, + 80.0f, + 1500.0f, + 100.0f, + 2000.0f, }; /* 8038EB34-8038EB50 01B194 001C+00 0/0 0/0 0/0 .rodata m__21daAlinkHIO_zwLight_c0 */ #pragma push #pragma force_active on -daAlinkHIO_zwLight_c1 const daAlinkHIO_zwLight_c0::m = { - 771, 0, 182, 225, 243, -87, 1.0f, 70.75195f, 131.83594f, 0.0f, +const daAlinkHIO_zwLight_c1 daAlinkHIO_zwLight_c0::m = { + 771, + 0, + 182, + 225, + 243, + -87, + 1.0f, + 70.75195f, + 131.83594f, + 0.0f, }; -COMPILER_STRIP_GATE(0x8038EB34, &daAlinkHIO_zwLight_c0::m); +COMPILER_STRIP_GATE(0x8038EB34, + &daAlinkHIO_zwLight_c0::m); #pragma pop /* 8038EB50-8038EB8C 01B1B0 003C+00 3/3 0/0 0/0 .rodata m__18daAlinkHIO_item_c0 */ -daAlinkHIO_item_c1 const daAlinkHIO_item_c0::m = { - {12, 1.0f, 0.0f, 3.0f, 13.0f}, - {14, 1.0f, 0.0f, 3.0f, 15.0f}, +const daAlinkHIO_item_c1 daAlinkHIO_item_c0::m = { + { + 12, + 1.0f, + 0.0f, + 3.0f, + 13.0f, + }, + { + 14, + 1.0f, + 0.0f, + 3.0f, + 15.0f, + }, 15, 10000, -13000, @@ -960,9 +2079,21 @@ daAlinkHIO_item_c1 const daAlinkHIO_item_c0::m = { }; /* 8038EB8C-8038EBFC 01B1EC 0070+00 14/14 0/0 0/0 .rodata m__20daAlinkHIO_ladder_c0 */ -daAlinkHIO_ladder_c1 const daAlinkHIO_ladder_c0::m = { - {13, 0.8f, 2.0f, 3.0f, 10.0f}, - {47, 1.25f, 0.0f, 2.0f, 48.0f}, +const daAlinkHIO_ladder_c1 daAlinkHIO_ladder_c0::m = { + { + 13, + 0.8f, + 2.0f, + 3.0f, + 10.0f, + }, + { + 47, + 1.25f, + 0.0f, + 2.0f, + 48.0f, + }, 0.8f, 5.0f, 1.0f, @@ -984,8 +2115,14 @@ daAlinkHIO_ladder_c1 const daAlinkHIO_ladder_c0::m = { }; /* 8038EBFC-8038EC48 01B25C 004C+00 11/11 0/0 0/0 .rodata m__22daAlinkHIO_roofHang_c0 */ -daAlinkHIO_roofHang_c1 const daAlinkHIO_roofHang_c0::m = { - {34, 1.0f, 0.0f, 3.0f, 20.0f}, +const daAlinkHIO_roofHang_c1 daAlinkHIO_roofHang_c0::m = { + { + 34, + 1.0f, + 0.0f, + 3.0f, + 20.0f, + }, 4, 100, 2400, @@ -1004,29 +2141,119 @@ daAlinkHIO_roofHang_c1 const daAlinkHIO_roofHang_c0::m = { }; /* 8038EC48-8038ED2C 01B2A8 00E4+00 10/11 0/0 0/0 .rodata m__18daAlinkHIO_grab_c0 */ -daAlinkHIO_grab_c1 const daAlinkHIO_grab_c0::m = { - {4, 0.9f, 0.0f, 3.0f, 5.0f}, - {9, 0.65f, 0.0f, 3.0f, 8.0f}, - {4, -0.8f, 1.0f, 3.0f, 2.0f}, - {39, 0.9f, 0.0f, 3.0f, 17.0f}, - {9, -0.75f, 0.0f, 2.0f, -1.0f}, - {19, 1.0f, 6.0f, 5.0f, 11.0f}, - {19, 0.9f, 2.0f, 4.0f, 10.0f}, - {39, 1.5f, 0.0f, 3.0f, 40.0f}, - {30, -1.3f, 0.0f, 3.0f, 10.0f}, - {12, 0.55f, 0.0f, 3.0f, 10.0f}, - {49, 0.8f, 0.0f, 3.0f, 35.0f}, +const daAlinkHIO_grab_c1 daAlinkHIO_grab_c0::m = { + { + 4, + 0.9f, + 0.0f, + 3.0f, + 5.0f, + }, + { + 9, + 0.65f, + 0.0f, + 3.0f, + 8.0f, + }, + { + 4, + -0.8f, + 1.0f, + 3.0f, + 2.0f, + }, + { + 39, + 0.9f, + 0.0f, + 3.0f, + 17.0f, + }, + { + 9, + -0.75f, + 0.0f, + 2.0f, + -1.0f, + }, + { + 19, + 1.0f, + 6.0f, + 5.0f, + 11.0f, + }, + { + 19, + 0.9f, + 2.0f, + 4.0f, + 10.0f, + }, + { + 39, + 1.5f, + 0.0f, + 3.0f, + 40.0f, + }, + { + 30, + -1.3f, + 0.0f, + 3.0f, + 10.0f, + }, + { + 12, + 0.55f, + 0.0f, + 3.0f, + 10.0f, + }, + { + 49, + 0.8f, + 0.0f, + 3.0f, + 35.0f, + }, 0, 15, 0.55f, }; /* 8038ED2C-8038EE28 01B38C 00FC+00 21/30 0/0 0/0 .rodata m__18daAlinkHIO_swim_c0 */ -daAlinkHIO_swim_c1 const daAlinkHIO_swim_c0::m = { - {25, 1.0f, 0.0f, 3.0f, -1.0f}, - {23, 1.0f, 0.0f, 3.0f, 24.0f}, - {12, 2.0f, 0.0f, 10.0f, 24.0f}, - {37, 1.0f, 3.0f, 5.0f, 38.0f}, +const daAlinkHIO_swim_c1 daAlinkHIO_swim_c0::m = { + { + 25, + 1.0f, + 0.0f, + 3.0f, + -1.0f, + }, + { + 23, + 1.0f, + 0.0f, + 3.0f, + 24.0f, + }, + { + 12, + 2.0f, + 0.0f, + 10.0f, + 24.0f, + }, + { + 37, + 1.0f, + 3.0f, + 5.0f, + 38.0f, + }, 15, 800, 5000, @@ -1077,11 +2304,35 @@ daAlinkHIO_swim_c1 const daAlinkHIO_swim_c0::m = { }; /* 8038EE28-8038EF28 01B488 0100+00 32/41 0/0 0/0 .rodata m__20daAlinkHIO_wlMove_c0 */ -daAlinkHIO_wlMove_c1 const daAlinkHIO_wlMove_c0::m = { - {14, 1.0f, 0.0f, 3.0f, 15.0f}, - {14, 1.0f, 0.0f, 3.0f, 12.0f}, - {8, 1.0f, 0.0f, 1.0f, 20.0f}, - {41, 1.0f, 0.0f, 3.0f, 20.0f}, +const daAlinkHIO_wlMove_c1 daAlinkHIO_wlMove_c0::m = { + { + 14, + 1.0f, + 0.0f, + 3.0f, + 15.0f, + }, + { + 14, + 1.0f, + 0.0f, + 3.0f, + 12.0f, + }, + { + 8, + 1.0f, + 0.0f, + 1.0f, + 20.0f, + }, + { + 41, + 1.0f, + 0.0f, + 3.0f, + 20.0f, + }, 9000, 100, 5, @@ -1133,22 +2384,77 @@ daAlinkHIO_wlMove_c1 const daAlinkHIO_wlMove_c0::m = { }; /* 8038EF28-8038EF70 01B588 0048+00 19/27 0/0 0/0 .rodata m__23daAlinkHIO_wlMoveNoP_c0 */ -daAlinkHIO_wlMoveNoP_c1 const daAlinkHIO_wlMoveNoP_c0::m = { - 9000, 100, 5, 25.0f, 3.0f, 1.8f, 1.0f, 0.8f, 2.2f, 1.1f, - 0.1f, 0.6f, 0.6f, 5.0f, 0.5f, 0.85f, 0.9f, 2.5f, 30.0f, +const daAlinkHIO_wlMoveNoP_c1 daAlinkHIO_wlMoveNoP_c0::m = { + 9000, + 100, + 5, + 25.0f, + 3.0f, + 1.8f, + 1.0f, + 0.8f, + 2.2f, + 1.1f, + 0.1f, + 0.6f, + 0.6f, + 5.0f, + 0.5f, + 0.85f, + 0.9f, + 2.5f, + 30.0f, }; /* 8038EF70-8038EFA8 01B5D0 0038+00 3/6 0/0 0/0 .rodata m__23daAlinkHIO_wlAtnMove_c0 */ -daAlinkHIO_wlAtnMove_c1 const daAlinkHIO_wlAtnMove_c0::m = { - 9000, 100, 3, 0.8f, 1.8f, 0.2f, 0.6f, 18.0f, 2.0f, 2.0f, 1.7f, 0.4f, 12.0f, 3.0f, 2.0f, +const daAlinkHIO_wlAtnMove_c1 daAlinkHIO_wlAtnMove_c0::m = { + 9000, + 100, + 3, + 0.8f, + 1.8f, + 0.2f, + 0.6f, + 18.0f, + 2.0f, + 2.0f, + 1.7f, + 0.4f, + 12.0f, + 3.0f, + 2.0f, }; /* 8038EFA8-8038F010 01B608 0068+00 3/3 0/0 0/0 .rodata m__24daAlinkHIO_wlSideStep_c0 */ -daAlinkHIO_wlSideStep_c1 const daAlinkHIO_wlSideStep_c0::m = { - {5, 1.0f, 0.0f, 3.0f, 6.0f}, - {23, 1.0f, 1.0f, 2.0f, 2.0f}, - {4, 0.9f, 0.0f, 3.0f, 5.0f}, - {23, 1.0f, 1.0f, 2.0f, 3.0f}, +const daAlinkHIO_wlSideStep_c1 daAlinkHIO_wlSideStep_c0::m = { + { + 5, + 1.0f, + 0.0f, + 3.0f, + 6.0f, + }, + { + 23, + 1.0f, + 1.0f, + 2.0f, + 2.0f, + }, + { + 4, + 0.9f, + 0.0f, + 3.0f, + 5.0f, + }, + { + 23, + 1.0f, + 1.0f, + 2.0f, + 3.0f, + }, 33.0f, 23.0f, 30.0f, @@ -1158,16 +2464,57 @@ daAlinkHIO_wlSideStep_c1 const daAlinkHIO_wlSideStep_c0::m = { }; /* 8038F010-8038F048 01B670 0038+00 3/4 0/0 0/0 .rodata m__24daAlinkHIO_wlBackJump_c0 */ -daAlinkHIO_wlBackJump_c1 const daAlinkHIO_wlBackJump_c0::m = { - {11, 0.8f, 0.0f, 2.0f, 12.0f}, {28, 1.0f, 0.0f, 3.0f, 1.0f}, 30.0f, 20.0f, 100.0f, 10.0f, +const daAlinkHIO_wlBackJump_c1 daAlinkHIO_wlBackJump_c0::m = { + { + 11, + 0.8f, + 0.0f, + 2.0f, + 12.0f, + }, + { + 28, + 1.0f, + 0.0f, + 3.0f, + 1.0f, + }, + 30.0f, + 20.0f, + 100.0f, + 10.0f, }; /* 8038F048-8038F0A8 01B6A8 0060+00 2/2 0/0 0/0 .rodata m__20daAlinkHIO_wlHowl_c0 */ -daAlinkHIO_wlHowl_c1 const daAlinkHIO_wlHowl_c0::m = { - {49, 1.0f, 0.0f, 3.0f, 40.0f}, - {71, 1.0f, 0.0f, 3.0f, 72.0f}, - {14, 1.3f, 1.0f, 3.0f, 11.0f}, - {17, 0.9f, 0.0f, 3.0f, 18.0f}, +const daAlinkHIO_wlHowl_c1 daAlinkHIO_wlHowl_c0::m = { + { + 49, + 1.0f, + 0.0f, + 3.0f, + 40.0f, + }, + { + 71, + 1.0f, + 0.0f, + 3.0f, + 72.0f, + }, + { + 14, + 1.3f, + 1.0f, + 3.0f, + 11.0f, + }, + { + 17, + 0.9f, + 0.0f, + 3.0f, + 18.0f, + }, 3.0f, 8.0f, 1.7f, @@ -1175,10 +2522,28 @@ daAlinkHIO_wlHowl_c1 const daAlinkHIO_wlHowl_c0::m = { }; /* 8038F0A8-8038F124 01B708 007C+00 8/13 0/0 0/0 .rodata m__24daAlinkHIO_wlAutoJump_c0 */ -daAlinkHIO_wlAutoJump_c1 const daAlinkHIO_wlAutoJump_c0::m = { - {3, 1.2f, 1.0f, 2.0f, 4.0f}, - {24, 1.0f, 1.0f, 2.0f, 2.0f}, - {5, 0.5f, 2.0f, 5.0f, 7.0f}, +const daAlinkHIO_wlAutoJump_c1 daAlinkHIO_wlAutoJump_c0::m = { + { + 3, + 1.2f, + 1.0f, + 2.0f, + 4.0f, + }, + { + 24, + 1.0f, + 1.0f, + 2.0f, + 2.0f, + }, + { + 5, + 0.5f, + 2.0f, + 5.0f, + 7.0f, + }, 1, 0, 7500, @@ -1200,14 +2565,30 @@ daAlinkHIO_wlAutoJump_c1 const daAlinkHIO_wlAutoJump_c0::m = { }; /* 8038F124-8038F138 01B784 0014+00 4/4 0/0 0/0 .rodata m__20daAlinkHIO_wlPush_c0 */ -daAlinkHIO_wlPush_c1 const daAlinkHIO_wlPush_c0::m = { - 1.0f, 3.0f, 1.0f, 3.0f, 0.75f, +const daAlinkHIO_wlPush_c1 daAlinkHIO_wlPush_c0::m = { + 1.0f, + 3.0f, + 1.0f, + 3.0f, + 0.75f, }; /* 8038F138-8038F184 01B798 004C+00 13/15 0/0 0/0 .rodata m__19daAlinkHIO_wlLie_c0 */ -daAlinkHIO_wlLie_c1 const daAlinkHIO_wlLie_c0::m = { - {14, 1.5f, 0.0f, 3.0f, 10.0f}, - {11, 1.5f, 3.0f, 3.0f, 8.0f}, +const daAlinkHIO_wlLie_c1 daAlinkHIO_wlLie_c0::m = { + { + 14, + 1.5f, + 0.0f, + 3.0f, + 10.0f, + }, + { + 11, + 1.5f, + 3.0f, + 3.0f, + 8.0f, + }, 5, 500, 50, @@ -1223,19 +2604,64 @@ daAlinkHIO_wlLie_c1 const daAlinkHIO_wlLie_c0::m = { /* 8038F184-8038F1A0 01B7E4 001C+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_wlLight_c0 */ #pragma push #pragma force_active on -daAlinkHIO_wlLight_c1 const daAlinkHIO_wlLight_c0::m = { - 515, 0, 120, 120, 120, -30, 3.0f, 20.0f, 512.0f, -638.0f, +const daAlinkHIO_wlLight_c1 daAlinkHIO_wlLight_c0::m = { + 515, + 0, + 120, + 120, + 120, + -30, + 3.0f, + 20.0f, + 512.0f, + -638.0f, }; #pragma pop /* 8038F1A0-8038F23C 01B800 009C+00 9/11 0/0 0/0 .rodata m__24daAlinkHIO_wlWallHang_c0 */ -daAlinkHIO_wlWallHang_c1 const daAlinkHIO_wlWallHang_c0::m = { - {13, 1.2f, 8.0f, 2.0f, 14.0f}, - {39, 1.1f, 0.0f, 3.0f, 31.0f}, - {39, 1.0f, 0.0f, 5.0f, 40.0f}, - {5, 1.0f, 0.0f, 3.0f, 6.0f}, - {6, 1.0f, 0.0f, 3.0f, 7.0f}, - {16, 1.0f, 0.0f, 3.0f, 10.0f}, +const daAlinkHIO_wlWallHang_c1 daAlinkHIO_wlWallHang_c0::m = { + { + 13, + 1.2f, + 8.0f, + 2.0f, + 14.0f, + }, + { + 39, + 1.1f, + 0.0f, + 3.0f, + 31.0f, + }, + { + 39, + 1.0f, + 0.0f, + 5.0f, + 40.0f, + }, + { + 5, + 1.0f, + 0.0f, + 3.0f, + 6.0f, + }, + { + 6, + 1.0f, + 0.0f, + 3.0f, + 7.0f, + }, + { + 16, + 1.0f, + 0.0f, + 3.0f, + 10.0f, + }, 50.0f, 100.0f, 200.0f, @@ -1248,11 +2674,35 @@ daAlinkHIO_wlWallHang_c1 const daAlinkHIO_wlWallHang_c0::m = { }; /* 8038F23C-8038F29C 01B89C 0060+00 2/3 0/0 0/0 .rodata m__25daAlinkHIO_wlDamNormal_c0 */ -daAlinkHIO_wlDamNormal_c1 const daAlinkHIO_wlDamNormal_c0::m = { - {9, 1.0f, 0.0f, 0.0f, 8.0f}, - {9, 1.0f, 0.0f, 0.0f, 8.0f}, - {9, 1.0f, 0.0f, 0.0f, 8.0f}, - {9, 1.0f, 0.0f, 0.0f, 8.0f}, +const daAlinkHIO_wlDamNormal_c1 daAlinkHIO_wlDamNormal_c0::m = { + { + 9, + 1.0f, + 0.0f, + 0.0f, + 8.0f, + }, + { + 9, + 1.0f, + 0.0f, + 0.0f, + 8.0f, + }, + { + 9, + 1.0f, + 0.0f, + 0.0f, + 8.0f, + }, + { + 9, + 1.0f, + 0.0f, + 0.0f, + 8.0f, + }, 10.0f, 0.01f, 1.0f, @@ -1260,11 +2710,35 @@ daAlinkHIO_wlDamNormal_c1 const daAlinkHIO_wlDamNormal_c0::m = { }; /* 8038F29C-8038F308 01B8FC 006C+00 2/4 0/0 0/0 .rodata m__24daAlinkHIO_wlDamLarge_c0 */ -daAlinkHIO_wlDamLarge_c1 const daAlinkHIO_wlDamLarge_c0::m = { - {49, 1.0f, 0.0f, 3.0f, 40.0f}, - {39, 1.0f, 0.0f, 3.0f, 35.0f}, - {34, 1.1f, 0.0f, 3.0f, 32.0f}, - {34, 1.1f, 0.0f, 3.0f, 32.0f}, +const daAlinkHIO_wlDamLarge_c1 daAlinkHIO_wlDamLarge_c0::m = { + { + 49, + 1.0f, + 0.0f, + 3.0f, + 40.0f, + }, + { + 39, + 1.0f, + 0.0f, + 3.0f, + 35.0f, + }, + { + 34, + 1.1f, + 0.0f, + 3.0f, + 32.0f, + }, + { + 34, + 1.1f, + 0.0f, + 3.0f, + 32.0f, + }, 1300, -5.2f, 3.0f, @@ -1277,11 +2751,35 @@ daAlinkHIO_wlDamLarge_c1 const daAlinkHIO_wlDamLarge_c0::m = { /* 8038F308-8038F374 01B968 006C+00 0/2 0/0 0/0 .rodata m__23daAlinkHIO_wlDamHuge_c0 */ #pragma push #pragma force_active on -daAlinkHIO_wlDamHuge_c1 const daAlinkHIO_wlDamHuge_c0::m = { - {49, 1.1f, 0.0f, 3.0f, 40.0f}, - {39, 1.1f, 0.0f, 3.0f, 35.0f}, - {34, 1.2f, 0.0f, 3.0f, 30.0f}, - {34, 1.2f, 0.0f, 3.0f, 30.0f}, +const daAlinkHIO_wlDamHuge_c1 daAlinkHIO_wlDamHuge_c0::m = { + { + 49, + 1.1f, + 0.0f, + 3.0f, + 40.0f, + }, + { + 39, + 1.1f, + 0.0f, + 3.0f, + 35.0f, + }, + { + 34, + 1.2f, + 0.0f, + 3.0f, + 30.0f, + }, + { + 34, + 1.2f, + 0.0f, + 3.0f, + 30.0f, + }, 2000, -7.5f, 3.0f, @@ -1293,9 +2791,21 @@ daAlinkHIO_wlDamHuge_c1 const daAlinkHIO_wlDamHuge_c0::m = { #pragma pop /* 8038F374-8038F3B4 01B9D4 0040+00 6/6 0/0 0/0 .rodata m__23daAlinkHIO_wlDamFall_c0 */ -daAlinkHIO_wlDamFall_c1 const daAlinkHIO_wlDamFall_c0::m = { - {11, 1.0f, 0.0f, 3.0f, 12.0f}, - {17, 0.8f, 0.0f, 0.0f, 12.0f}, +const daAlinkHIO_wlDamFall_c1 daAlinkHIO_wlDamFall_c0::m = { + { + 11, + 1.0f, + 0.0f, + 3.0f, + 12.0f, + }, + { + 17, + 0.8f, + 0.0f, + 0.0f, + 12.0f, + }, 15, 35, 40.0f, @@ -1306,23 +2816,63 @@ daAlinkHIO_wlDamFall_c1 const daAlinkHIO_wlDamFall_c0::m = { }; /* 8038F3B4-8038F3C4 01BA14 0010+00 1/1 0/0 0/0 .rodata m__25daAlinkHIO_wlDamCaught_c0 */ -daAlinkHIO_wlDamCaught_c1 const daAlinkHIO_wlDamCaught_c0::m = { - 300, 5, 1.2f, 3.0f, 1.5f, +const daAlinkHIO_wlDamCaught_c1 daAlinkHIO_wlDamCaught_c0::m = { + 300, + 5, + 1.2f, + 3.0f, + 1.5f, }; /* 8038F3C4-8038F3F0 01BA24 002C+00 3/4 0/0 0/0 .rodata m__22daAlinkHIO_wlDamage_c0 */ -daAlinkHIO_wlDamage_c1 const daAlinkHIO_wlDamage_c0::m = { - {9, 1.1f, 0.0f, 3.0f, 10.0f}, - {9, 1.1f, 0.0f, 3.0f, 7.0f}, +const daAlinkHIO_wlDamage_c1 daAlinkHIO_wlDamage_c0::m = { + { + 9, + 1.1f, + 0.0f, + 3.0f, + 10.0f, + }, + { + 9, + 1.1f, + 0.0f, + 3.0f, + 7.0f, + }, 0.7f, }; /* 8038F3F0-8038F46C 01BA50 007C+00 10/14 0/0 0/0 .rodata m__21daAlinkHIO_wlSlide_c0 */ -daAlinkHIO_wlSlide_c1 const daAlinkHIO_wlSlide_c0::m = { - {20, 1.25f, 0.0f, 3.0f, 25.0f}, - {7, 1.0f, 0.0f, 3.0f, 8.0f}, - {14, 1.0f, 0.0f, 3.0f, 15.0f}, - {29, 1.0f, 0.0f, 3.0f, 27.0f}, +const daAlinkHIO_wlSlide_c1 daAlinkHIO_wlSlide_c0::m = { + { + 20, + 1.25f, + 0.0f, + 3.0f, + 25.0f, + }, + { + 7, + 1.0f, + 0.0f, + 3.0f, + 8.0f, + }, + { + 14, + 1.0f, + 0.0f, + 3.0f, + 15.0f, + }, + { + 29, + 1.0f, + 0.0f, + 3.0f, + 27.0f, + }, 512, 64, 35.0f, @@ -1338,15 +2888,37 @@ daAlinkHIO_wlSlide_c1 const daAlinkHIO_wlSlide_c0::m = { }; /* 8038F46C-8038F4A4 01BACC 0038+00 7/7 0/0 0/0 .rodata m__20daAlinkHIO_wlRope_c0 */ -daAlinkHIO_wlRope_c1 const daAlinkHIO_wlRope_c0::m = { - {16, 1.0f, 0.0f, 3.0f, 17.0f}, 90, 30, 0.5f, 1.2f, 3.0f, 15.0f, 1.0f, 3.0f, 3.0f, 0.8f, +const daAlinkHIO_wlRope_c1 daAlinkHIO_wlRope_c0::m = { + { + 16, + 1.0f, + 0.0f, + 3.0f, + 17.0f, + }, + 90, + 30, + 0.5f, + 1.2f, + 3.0f, + 15.0f, + 1.0f, + 3.0f, + 3.0f, + 0.8f, }; /* 8038F4A4-8038F4E0 01BB04 003C+00 0/1 0/0 0/0 .rodata m__22daAlinkHIO_wlAtWaLr_c0 */ #pragma push #pragma force_active on -daAlinkHIO_wlAtWaLr_c1 const daAlinkHIO_wlAtWaLr_c0::m = { - {41, 0.9f, 4.0f, 3.0f, 16.0f}, +const daAlinkHIO_wlAtWaLr_c1 daAlinkHIO_wlAtWaLr_c0::m = { + { + 41, + 0.9f, + 4.0f, + 3.0f, + 16.0f, + }, 5, 3, 0.0f, @@ -1364,8 +2936,14 @@ daAlinkHIO_wlAtWaLr_c1 const daAlinkHIO_wlAtWaLr_c0::m = { /* 8038F4E0-8038F51C 01BB40 003C+00 0/1 0/0 0/0 .rodata m__22daAlinkHIO_wlAtWaSc_c0 */ #pragma push #pragma force_active on -daAlinkHIO_wlAtWaSc_c1 const daAlinkHIO_wlAtWaSc_c0::m = { - {15, 0.9f, 0.0f, 3.0f, 15.0f}, +const daAlinkHIO_wlAtWaSc_c1 daAlinkHIO_wlAtWaSc_c0::m = { + { + 15, + 0.9f, + 0.0f, + 3.0f, + 15.0f, + }, 5, 5, 10.0f, @@ -1383,8 +2961,14 @@ daAlinkHIO_wlAtWaSc_c1 const daAlinkHIO_wlAtWaSc_c0::m = { /* 8038F51C-8038F558 01BB7C 003C+00 0/1 0/0 0/0 .rodata m__22daAlinkHIO_wlAtWaTl_c0 */ #pragma push #pragma force_active on -daAlinkHIO_wlAtWaTl_c1 const daAlinkHIO_wlAtWaTl_c0::m = { - {42, 1.05f, 3.0f, 3.0f, 28.0f}, +const daAlinkHIO_wlAtWaTl_c1 daAlinkHIO_wlAtWaTl_c0::m = { + { + 42, + 1.05f, + 3.0f, + 3.0f, + 28.0f, + }, 0, 3, 10.0f, @@ -1400,16 +2984,28 @@ daAlinkHIO_wlAtWaTl_c1 const daAlinkHIO_wlAtWaTl_c0::m = { #pragma pop /* 8038F558-8038F578 01BBB8 0020+00 2/2 0/0 0/0 .rodata m__22daAlinkHIO_wlAtRoll_c0 */ -daAlinkHIO_wlAtRoll_c1 const daAlinkHIO_wlAtRoll_c0::m = { - {40, 1.0f, 4.0f, 3.0f, 23.0f}, +const daAlinkHIO_wlAtRoll_c1 daAlinkHIO_wlAtRoll_c0::m = { + { + 40, + 1.0f, + 4.0f, + 3.0f, + 23.0f, + }, 250.0f, 20.0f, 0.0f, }; /* 8038F578-8038F5B4 01BBD8 003C+00 3/5 0/0 0/0 .rodata m__23daAlinkHIO_wlAtNjump_c0 */ -daAlinkHIO_wlAtNjump_c1 const daAlinkHIO_wlAtNjump_c0::m = { - {6, 1.0f, 4.0f, 3.0f, 7.0f}, +const daAlinkHIO_wlAtNjump_c1 daAlinkHIO_wlAtNjump_c0::m = { + { + 6, + 1.0f, + 4.0f, + 3.0f, + 7.0f, + }, 30.0f, 40.0f, 23.0f, @@ -1423,9 +3019,21 @@ daAlinkHIO_wlAtNjump_c1 const daAlinkHIO_wlAtNjump_c0::m = { }; /* 8038F5B4-8038F618 01BC14 0064+00 1/4 0/0 0/0 .rodata m__23daAlinkHIO_wlAtCjump_c0 */ -daAlinkHIO_wlAtCjump_c1 const daAlinkHIO_wlAtCjump_c0::m = { - {3, 2.0f, 0.0f, 3.0f, 4.0f}, - {7, 1.2f, 2.0f, 1.0f, 8.0f}, +const daAlinkHIO_wlAtCjump_c1 daAlinkHIO_wlAtCjump_c0::m = { + { + 3, + 2.0f, + 0.0f, + 3.0f, + 4.0f, + }, + { + 7, + 1.2f, + 2.0f, + 1.0f, + 8.0f, + }, 26.0f, 45.0f, 35.0f, @@ -1444,22 +3052,82 @@ daAlinkHIO_wlAtCjump_c1 const daAlinkHIO_wlAtCjump_c0::m = { }; /* 8038F618-8038F658 01BC78 0040+00 4/4 0/0 0/0 .rodata m__22daAlinkHIO_wlAtLand_c0 */ -daAlinkHIO_wlAtLand_c1 const daAlinkHIO_wlAtLand_c0::m = { - {19, 0.9f, 0.0f, 2.0f, 2.0f}, - {14, 1.0f, 0.0f, 3.0f, 1.0f}, - {19, 1.1f, 0.0f, 2.0f, 1.0f}, +const daAlinkHIO_wlAtLand_c1 daAlinkHIO_wlAtLand_c0::m = { + { + 19, + 0.9f, + 0.0f, + 2.0f, + 2.0f, + }, + { + 14, + 1.0f, + 0.0f, + 3.0f, + 1.0f, + }, + { + 19, + 1.1f, + 0.0f, + 2.0f, + 1.0f, + }, 2.0f, }; /* 8038F658-8038F6F4 01BCB8 009C+00 6/7 0/0 0/0 .rodata m__22daAlinkHIO_wlAtDown_c0 */ -daAlinkHIO_wlAtDown_c1 const daAlinkHIO_wlAtDown_c0::m = { - {3, 1.0f, 0.0f, 3.0f, 4.0f}, - {16, 1.0f, 0.0f, 3.0f, 17.0f}, - {21, 1.0f, 0.0f, 3.0f, 22.0f}, - {49, 1.0f, 0.0f, 3.0f, 50.0f}, - {11, 1.0f, 0.0f, 3.0f, 12.0f}, - {84, 0.85f, 0.0f, 3.0f, 60.0f}, - {6, 1.0f, 0.0f, 3.0f, 9.0f}, +const daAlinkHIO_wlAtDown_c1 daAlinkHIO_wlAtDown_c0::m = { + { + 3, + 1.0f, + 0.0f, + 3.0f, + 4.0f, + }, + { + 16, + 1.0f, + 0.0f, + 3.0f, + 17.0f, + }, + { + 21, + 1.0f, + 0.0f, + 3.0f, + 22.0f, + }, + { + 49, + 1.0f, + 0.0f, + 3.0f, + 50.0f, + }, + { + 11, + 1.0f, + 0.0f, + 3.0f, + 12.0f, + }, + { + 84, + 0.85f, + 0.0f, + 3.0f, + 60.0f, + }, + { + 6, + 1.0f, + 0.0f, + 3.0f, + 9.0f, + }, 40, 3, 45.0f, @@ -1468,10 +3136,28 @@ daAlinkHIO_wlAtDown_c1 const daAlinkHIO_wlAtDown_c0::m = { }; /* 8038F6F4-8038F748 01BD54 0054+00 6/6 0/0 0/0 .rodata m__22daAlinkHIO_wlAtLock_c0 */ -daAlinkHIO_wlAtLock_c1 const daAlinkHIO_wlAtLock_c0::m = { - {6, 3.0f, 0.0f, 3.0f, 15.0f}, - {6, 2.0f, 0.0f, 2.0f, 20.0f}, - {120, 100.0f, 550.0f, 25.0f, 85.0f}, +const daAlinkHIO_wlAtLock_c1 daAlinkHIO_wlAtLock_c0::m = { + { + 6, + 3.0f, + 0.0f, + 3.0f, + 15.0f, + }, + { + 6, + 2.0f, + 0.0f, + 2.0f, + 20.0f, + }, + { + 120, + 100.0f, + 550.0f, + 25.0f, + 85.0f, + }, 80.0f, 60.0f, 120.0f, @@ -1481,9 +3167,21 @@ daAlinkHIO_wlAtLock_c1 const daAlinkHIO_wlAtLock_c0::m = { }; /* 8038F748-8038F7A4 01BDA8 005C+00 5/5 0/0 0/0 .rodata m__22daAlinkHIO_wlAtBite_c0 */ -daAlinkHIO_wlAtBite_c1 const daAlinkHIO_wlAtBite_c0::m = { - {5, 1.0f, 1.0f, 0.0f, 6.0f}, - {20, 1.6f, 0.0f, 3.0f, 32.0f}, +const daAlinkHIO_wlAtBite_c1 daAlinkHIO_wlAtBite_c0::m = { + { + 5, + 1.0f, + 1.0f, + 0.0f, + 6.0f, + }, + { + 20, + 1.6f, + 0.0f, + 3.0f, + 32.0f, + }, 25, 15, 1.2f, @@ -1501,17 +3199,63 @@ daAlinkHIO_wlAtBite_c1 const daAlinkHIO_wlAtBite_c0::m = { }; /* 8038F7A4-8038F7DC 01BE04 0038+00 7/10 0/0 0/0 .rodata m__22daAlinkHIO_wlAttack_c0 */ -daAlinkHIO_wlAttack_c1 const daAlinkHIO_wlAttack_c0::m = { - {59, 1.2f, 0.0f, 2.0f, 5.0f}, 15, 5, 100.0f, 10.0f, 5.0f, 230.0f, 10.0f, 12.0f, 35.0f, 30.0f, +const daAlinkHIO_wlAttack_c1 daAlinkHIO_wlAttack_c0::m = { + { + 59, + 1.2f, + 0.0f, + 2.0f, + 5.0f, + }, + 15, + 5, + 100.0f, + 10.0f, + 5.0f, + 230.0f, + 10.0f, + 12.0f, + 35.0f, + 30.0f, }; /* 8038F7DC-8038F858 01BE3C 007C+00 5/5 0/0 0/0 .rodata m__21daAlinkHIO_wlPoint_c0 */ -daAlinkHIO_wlPoint_c1 const daAlinkHIO_wlPoint_c0::m = { - {6, 0.9f, 2.0f, 3.0f, 7.0f}, - {7, 1.0f, 0.0f, 3.0f, 8.0f}, - {11, 0.75f, 0.0f, 3.0f, 5.0f}, - {14, 1.0f, 0.0f, 3.0f, 3.0f}, - {20, 1.0f, 3.0f, 5.0f, 50.0f}, +const daAlinkHIO_wlPoint_c1 daAlinkHIO_wlPoint_c0::m = { + { + 6, + 0.9f, + 2.0f, + 3.0f, + 7.0f, + }, + { + 7, + 1.0f, + 0.0f, + 3.0f, + 8.0f, + }, + { + 11, + 0.75f, + 0.0f, + 3.0f, + 5.0f, + }, + { + 14, + 1.0f, + 0.0f, + 3.0f, + 3.0f, + }, + { + 20, + 1.0f, + 3.0f, + 5.0f, + 50.0f, + }, 45.0f, 65.0f, 15.0f, @@ -1521,10 +3265,28 @@ daAlinkHIO_wlPoint_c1 const daAlinkHIO_wlPoint_c0::m = { }; /* 8038F858-8038F8B4 01BEB8 005C+00 6/6 0/0 0/0 .rodata m__21daAlinkHIO_wlChain_c0 */ -daAlinkHIO_wlChain_c1 const daAlinkHIO_wlChain_c0::m = { - {39, 1.0f, 0.0f, 3.0f, 40.0f}, - {81, 1.0f, 0.0f, 3.0f, 82.0f}, - {47, 1.0f, 0.0f, 0.0f, 48.0f}, +const daAlinkHIO_wlChain_c1 daAlinkHIO_wlChain_c0::m = { + { + 39, + 1.0f, + 0.0f, + 3.0f, + 40.0f, + }, + { + 81, + 1.0f, + 0.0f, + 3.0f, + 82.0f, + }, + { + 47, + 1.0f, + 0.0f, + 0.0f, + 48.0f, + }, 20, 5, 1.0f, @@ -1537,10 +3299,28 @@ daAlinkHIO_wlChain_c1 const daAlinkHIO_wlChain_c0::m = { }; /* 8038F8B4-8038F95C 01BF14 00A8+00 16/24 0/0 0/0 .rodata m__20daAlinkHIO_wlSwim_c0 */ -daAlinkHIO_wlSwim_c1 const daAlinkHIO_wlSwim_c0::m = { - {25, 0.9f, 0.0f, 5.0f, -1.0f}, - {45, 1.0f, 0.0f, 3.0f, 20.0f}, - {28, 1.1f, 0.0f, 1.0f, 32.0f}, +const daAlinkHIO_wlSwim_c1 daAlinkHIO_wlSwim_c0::m = { + { + 25, + 0.9f, + 0.0f, + 5.0f, + -1.0f, + }, + { + 45, + 1.0f, + 0.0f, + 3.0f, + 20.0f, + }, + { + 28, + 1.1f, + 0.0f, + 1.0f, + 32.0f, + }, 5, 1000, 1600, @@ -1574,20 +3354,82 @@ daAlinkHIO_wlSwim_c1 const daAlinkHIO_wlSwim_c0::m = { }; /* 8038F95C-8038F9C0 01BFBC 0064+00 6/6 0/0 0/0 .rodata m__20daAlinkHIO_wlGrab_c0 */ -daAlinkHIO_wlGrab_c1 const daAlinkHIO_wlGrab_c0::m = { - {20, 1.5f, 0.0f, 3.0f, 15.0f}, {20, -1.3f, 0.0f, 3.0f, 5.0f}, {14, 1.0f, 0.0f, 3.0f, 15.0f}, - {14, -1.0f, 0.0f, 3.0f, -1.0f}, {19, 1.3f, 4.0f, 3.0f, 15.0f}, +const daAlinkHIO_wlGrab_c1 daAlinkHIO_wlGrab_c0::m = { + { + 20, + 1.5f, + 0.0f, + 3.0f, + 15.0f, + }, + { + 20, + -1.3f, + 0.0f, + 3.0f, + 5.0f, + }, + { + 14, + 1.0f, + 0.0f, + 3.0f, + 15.0f, + }, + { + 14, + -1.0f, + 0.0f, + 3.0f, + -1.0f, + }, + { + 19, + 1.3f, + 4.0f, + 3.0f, + 15.0f, + }, }; /* 8038F9C0-8038F9F8 01C020 0038+00 0/0 0/0 0/0 .rodata m__20daAlinkHIO_wlBall_c0 */ #pragma push #pragma force_active on -daAlinkHIO_wlBall_c1 const daAlinkHIO_wlBall_c0::m = { - {64, 1.0f, 0.0f, 3.0f, 35.0f}, {54, 1.0f, 0.0f, 3.0f, 55.0f}, 60, -5.0f, 60.0f, 20.0f, +const daAlinkHIO_wlBall_c1 daAlinkHIO_wlBall_c0::m = { + { + 64, + 1.0f, + 0.0f, + 3.0f, + 35.0f, + }, + { + 54, + 1.0f, + 0.0f, + 3.0f, + 55.0f, + }, + 60, + -5.0f, + 60.0f, + 20.0f, }; #pragma pop /* 8038F9F8-8038FA10 01C058 0018+00 5/6 0/0 0/0 .rodata m__18daAlinkHIO_wolf_c0 */ -daAlinkHIO_wolf_c1 const daAlinkHIO_wolf_c0::m = { - 13000, -10000, 8000, 4000, -2000, 8000, 150, 5, 35, 60, 0.7f, -}; \ No newline at end of file +const daAlinkHIO_wolf_c1 daAlinkHIO_wolf_c0::m = { + 13000, + -10000, + 8000, + 4000, + -2000, + 8000, + 150, + 5, + 35, + 60, + 0.7f, +}; + +// clang-format on \ No newline at end of file diff --git a/src/d/a/d_a_alink_bomb.inc b/src/d/a/d_a_alink_bomb.inc index 72add7bc059..114265b47fa 100644 --- a/src/d/a/d_a_alink_bomb.inc +++ b/src/d/a/d_a_alink_bomb.inc @@ -37,7 +37,7 @@ f32 daAlink_c::getBombEffScale() const { /* 800E37D0-800E37E0 0DE110 0010+00 0/0 0/0 1/1 .text getBombAtR__9daAlink_cCFv */ f32 daAlink_c::getBombAtR() const { - return daAlinkHIO_bomb_c0::m.mAtRadius; + return daAlinkHIO_bomb_c0::m.mAttackRadius; } /* 800E37E0-800E37F0 0DE120 0010+00 0/0 0/0 1/1 .text getEnemyBombColorR__9daAlink_cCFv diff --git a/src/d/a/d_a_alink_boom.inc b/src/d/a/d_a_alink_boom.inc index 258657501e8..7b1b62b5e5f 100644 --- a/src/d/a/d_a_alink_boom.inc +++ b/src/d/a/d_a_alink_boom.inc @@ -6,32 +6,23 @@ BOOL daAlink_c::checkBoomerangLockAccept() { } /* 800E0010-800E00B0 0DA950 00A0+00 0/0 0/0 1/1 .text getBoomSpeed__9daAlink_cFv */ -// small regalloc -#ifdef NONMATCHING f32 daAlink_c::getBoomSpeed() { f32 speed; if (checkBoomerangChargeEndWait()) { - speed = daAlinkHIO_boom_c0::m.mFlySpeed2; + speed = daAlinkHIO_boom_c0::m.mChargeFlySpeed; } else { speed = daAlinkHIO_boom_c0::m.mFlySpeed; } - if (i_checkModeFlg(0x400) && mRideAcKeep.getActor() != NULL && mSpeedF > FLOAT_LABEL(lit_6108)) { - speed += mSpeedF; + if (i_checkModeFlg(0x400)) { + fopAc_ac_c* ride_actor = mRideAcKeep.getActor(); + if (ride_actor != NULL && ride_actor->mSpeedF > FLOAT_LABEL(lit_6108)) { + speed += ride_actor->mSpeedF; + } } return speed; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 daAlink_c::getBoomSpeed() { - nofralloc -#include "asm/d/a/d_a_alink/getBoomSpeed__9daAlink_cFv.s" -} -#pragma pop -#endif /* 800E00B0-800E00C0 0DA9F0 0010+00 0/0 0/0 1/1 .text getBoomCatchSpeed__9daAlink_cCFv */ f32 daAlink_c::getBoomCatchSpeed() const { @@ -73,14 +64,13 @@ bool daAlink_c::checkBossBabaRoom() { /* 800E01CC-800E0210 0DAB0C 0044+00 0/0 1/1 0/0 .text * cancelBoomerangLock__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::cancelBoomerangLock(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/cancelBoomerangLock__9daAlink_cFP10fopAc_ac_c.s" +void daAlink_c::cancelBoomerangLock(fopAc_ac_c* i_actor) { + daBoomerang_c* boomerang = (daBoomerang_c*)getBoomerangActor(); + + if (boomerang != NULL) { + boomerang->cancelLockActor(i_actor); + } } -#pragma pop /* 800E0210-800E0244 0DAB50 0034+00 2/2 0/0 0/0 .text getBoomerangActor__9daAlink_cFv */ fopAc_ac_c* daAlink_c::getBoomerangActor() { @@ -111,14 +101,22 @@ bool daAlink_c::checkBoomerangChargeEnd() { /* 800E02B8-800E03D0 0DABF8 0118+00 0/0 1/1 0/0 .text * checkBoomerangCarry__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkBoomerangCarry(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkBoomerangCarry__9daAlink_cFP10fopAc_ac_c.s" +BOOL daAlink_c::checkBoomerangCarry(fopAc_ac_c* i_grabActor) { + if (i_checkNoResetFlg0(FLG0_UNK_20) && !checkEventRun() && !i_checkWolf() && + i_checkModeFlg(0x10000000) && + (checkHorseNoUpperAnime() || checkHorseTurnAnime() || checkBoomerangThrowAnime())) { + deleteEquipItem(0, 0); + seStartOnlyReverb(JA_SE_LK_BOOM_CATCH); + i_offNoResetFlg0(FLG0_UNK_20); + + setGrabItemActor(i_grabActor); + field_0x33e4 = lit_8785; + setGrabUpperAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + return 1; + } + + return 0; } -#pragma pop /* 800E03D0-800E0440 0DAD10 0070+00 6/6 0/0 0/0 .text initBoomerangUpperAnimeSpeed__9daAlink_cFi */ @@ -143,26 +141,32 @@ BOOL daAlink_c::checkBoomerangAnime() const { /* 800E04AC-800E04E8 0DADEC 003C+00 13/13 0/0 0/0 .text checkBoomerangThrowAnime__9daAlink_cCFv */ BOOL daAlink_c::checkBoomerangThrowAnime() const { - return (mEquipItem == BOOMERANG || i_checkNoResetFlg1(FLG1_UNK_2) || mEquipItem == 0x102) && checkUpperAnime(0x53); + return (mEquipItem == BOOMERANG || i_checkNoResetFlg1(FLG1_UNK_2) || mEquipItem == 0x102) && + checkUpperAnime(0x53); } /* 800E04E8-800E055C 0DAE28 0074+00 1/1 0/0 0/0 .text setBoomerangReadyQuake__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBoomerangReadyQuake() { - nofralloc -#include "asm/d/a/d_a_alink/setBoomerangReadyQuake__9daAlink_cFv.s" +void daAlink_c::setBoomerangReadyQuake() { + f32 tmp_0 = FLOAT_LABEL(lit_6108); + dComIfGp_getVibration().StartQuake(1, 1, cXyz(tmp_0, lit_6040, tmp_0)); + + i_onNoResetFlg3(FLG3_UNK_4); + field_0x3018 = daAlinkHIO_boom_c0::m.mChargeTime; } -#pragma pop /* 800E055C-800E05E8 0DAE9C 008C+00 2/2 0/0 0/0 .text setBoomerangReadyAnime__9daAlink_cFv */ #pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBoomerangReadyAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setBoomerangReadyAnime__9daAlink_cFv.s" +#pragma optimization_level 2 +void daAlink_c::setBoomerangReadyAnime() { + f32 var_f31; + if (i_checkAttentionLock()) { + var_f31 = daAlinkHIO_boom_c0::m.mIdleAnmSpeed; + } else { + var_f31 = FLOAT_LABEL(lit_6108); + } + + setUpperAnimeBaseSpeed(0x54, var_f31, lit_6109); + setBoomerangReadyQuake(); } #pragma pop @@ -177,141 +181,330 @@ void daAlink_c::setBoomerangCatchAnime() { setUpperAnimeParam(0x52, UPPER_2, &daAlinkHIO_boom_c0::m.mCatchAnm); setFacePriBck(0xE8); field_0x2f97 = 254; + if (mEquipItem != COPY_ROD) { seStartOnlyReverb(JA_SE_LK_BOOM_CATCH); } } /* 800E06B8-800E08C4 0DAFF8 020C+00 1/1 0/0 0/0 .text throwBoomerang__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::throwBoomerang() { - nofralloc -#include "asm/d/a/d_a_alink/throwBoomerang__9daAlink_cFv.s" +void daAlink_c::throwBoomerang() { + daBoomerang_c* item = (daBoomerang_c*)mItemAcKeep.getActor(); + i_onNoResetFlg1(FLG1_UNK_2); + + //! @bug `item` pointer is being accessed without checking if NULL first + BOOL boomerang_item = fopAcM_GetName(item) == PROC_BOOMERANG; + if (boomerang_item) { + item->setThrow(); + item->current.angle.y = shape_angle.y + field_0x59e; + item->current.angle.x = -mLookAngleY; + + if (mTargetedActor != NULL) { + item->setAimActor(mTargetedActor); + } + + item->shape_angle.y = shape_angle.y; + mThrowBoomerangAcKeep = mItemAcKeep; + dComIfGp_setPlayerStatus0(0, 0x400000); + daPy_boomerangMove_c::initDropAngleY(); + dComIfGp_clearPlayerStatus0(0, 0x80000); + mFastShotTime = -1; + daPy_boomerangMove_c::offEventKeepFlg(); + } else { + item->mSpeedF = daAlinkHIO_pickUp_c0::m.field_0x28; + item->mSpeed.y = daAlinkHIO_pickUp_c0::m.field_0x2C; + item->current.angle.y = shape_angle.y; + + fopAcM_cancelCarryNow(item); + item = NULL; + mEquipItem = NO_ITEM; + field_0x2f94 = 0xFF; + field_0x2f96 = 0xFE; + } + + mItemAcKeep.clearData(); + mEquipItem = NO_ITEM; + field_0x2f94 = 0xFF; + field_0x2f96 = 0xFE; + + voiceStart(Z2SE_AL_V_ATTACK_S); + + if (i_checkModeFlg(MODE_RIDING)) { + if (checkCanoeRide()) { + procCanoeWaitInit(0); + } else { + procHorseWaitInit(); + } + } else if (mLinkAcch.ChkGroundHit() && boomerang_item) { + if (mTargetedActor == NULL && item != NULL) { + mTargetedActor = item; + field_0x27f4 = item; + } + + if (checkZeroSpeedF()) { + field_0x2f98 = 3; + procAtnActorWaitInit(); + } else { + procAtnActorMoveInit(); + } + + field_0x2060->initOldFrameMorf(FLOAT_LABEL(lit_6108), 0, 35); + } } -#pragma pop /* 800E08C4-800E0A9C 0DB204 01D8+00 0/0 0/0 1/1 .text returnBoomerang__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::returnBoomerang(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/returnBoomerang__9daAlink_cFi.s" +int daAlink_c::returnBoomerang(int param_0) { + dComIfGp_clearPlayerStatus0(0, 0x400000); + + if (mEquipItem == NO_ITEM && !i_checkMagneBootsOn() && mItemAcKeep.getActor() == NULL && + !checkBoardRide() && !checkBoarRide() && !i_checkWolf() && + (mProcID != PROC_HANG_READY || field_0x3198 != 3) && (!checkEventRun() || param_0 != 0) && + (checkNoUpperAnime() || checkPlayerGuard() || checkHorseTurnAnime() || + checkDashDamageAnime() || checkBoomerangAnime()) && + !i_checkModeFlg(0x1BD0810)) { + mItemAcKeep = mThrowBoomerangAcKeep; + mThrowBoomerangAcKeep.clearData(); + + mEquipItem = BOOMERANG; + field_0x2f94 = 2; + i_onNoResetFlg0(FLG0_UNK_20); + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + dComIfGp_getVibration().StartShock(1, 1, cXyz(tmp_0, lit_6040, tmp_0)); + return 1; + } + + mThrowBoomerangAcKeep.clearData(); + return 0; } -#pragma pop /* 800E0A9C-800E0B58 0DB3DC 00BC+00 2/2 0/0 0/0 .text checkUpperItemActionBoomerang__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUpperItemActionBoomerang() { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperItemActionBoomerang__9daAlink_cFv.s" +int daAlink_c::checkUpperItemActionBoomerang() { + if (field_0x3018 != 0) { + field_0x3018--; + + if (field_0x3018 == 0) { + cancelItemUseQuake(0); + } + } + + if (checkReadyItem() && !itemButton() && checkBoomerangReadyAnime()) { + setThrowBoomerangAnime(); + return 1; + } + + return cancelUpperItemReadyAnime(0); } -#pragma pop /* 800E0B58-800E0BE4 0DB498 008C+00 1/1 0/0 0/0 .text * checkUpperItemActionBoomerangFly__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUpperItemActionBoomerangFly() { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperItemActionBoomerangFly__9daAlink_cFv.s" +void daAlink_c::checkUpperItemActionBoomerangFly() { + if (checkBoomerangReadyAnime()) { + checkUpperItemActionBoomerang(); + } else if (checkReadyItem() && itemTrigger()) { + setBoomerangReadyAnime(); + } } -#pragma pop /* 800E0BE4-800E0D8C 0DB524 01A8+00 4/4 0/0 0/0 .text checkNextActionBoomerang__9daAlink_cFv */ #pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionBoomerang() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionBoomerang__9daAlink_cFv.s" +#pragma optimization_level 2 +int daAlink_c::checkNextActionBoomerang() { + if ((checkBoomerangCatchAnime() && + mUpperFrameCtrl[2].getFrame() <= daAlinkHIO_boom_c0::m.mCatchAnm.mCheckFrame) || + i_checkNoResetFlg1(FLG1_UNK_2)) { + return 0; + } + + if (mFastShotTime != 0) { + mFastShotTime--; + } + + if (!checkBoomerangAnime()) { + setBoomerangReadyAnime(); + setFastShotTimer(); + + if (!i_checkAttentionLock()) { + field_0x2fe4 = shape_angle.y; + } + } + + if (!i_checkAttentionLock() && mFastShotTime == 0) { + if (i_checkModeFlg(0x400)) { + if (checkCanoeRide()) { + return procCanoeBoomerangSubjectInit(); + } else { + return procHorseBoomerangSubjectInit(); + } + } else { + return procBoomerangSubjectInit(); + } + } else if (i_checkModeFlg(0x400)) { + if (checkCanoeRide()) { + return procCanoeBoomerangMoveInit(); + } else { + return procHorseBoomerangMoveInit(); + } + } else { + return procBoomerangMoveInit(); + } } #pragma pop /* 800E0D8C-800E0E64 0DB6CC 00D8+00 1/1 0/0 0/0 .text checkBoomerangCatchAction__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBoomerangCatchAction() { - nofralloc -#include "asm/d/a/d_a_alink/checkBoomerangCatchAction__9daAlink_cFv.s" +int daAlink_c::checkBoomerangCatchAction() { + if (i_checkNoResetFlg0(FLG0_UNK_20)) { + if (!checkEventRun() && !i_checkWolf() && i_checkModeFlg(0x10000000)) { + if (checkNoUpperAnime() || checkHorseTurnAnime() || checkBoomerangThrowAnime()) { + if (i_checkModeFlg(0x1) && !i_checkModeFlg(0x400)) { + return procBoomerangCatchInit(); + } + + setBoomerangCatchAnime(); + } + } + + i_offNoResetFlg0(FLG0_UNK_20); + } + + return 0; } -#pragma pop /* 800E0E64-800E0F10 0DB7A4 00AC+00 3/3 0/0 0/0 .text setBoomerangSight__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBoomerangSight() { - nofralloc -#include "asm/d/a/d_a_alink/setBoomerangSight__9daAlink_cFv.s" +void daAlink_c::setBoomerangSight() { + if (mItemAcKeep.getActor() && !checkBoomerangThrowAnime()) { + BOOL check_line = checkSightLine(getBoomLockMax(), &field_0x37e0); + + mSight.setPos(&field_0x37e0); + mSight.onDrawFlg(); + + daBoomerang_c* boomerang = (daBoomerang_c*)mItemAcKeep.getActor(); + if (boomerang->getLockReserve() || (check_line && !boomerang->getLockCntMax())) { + setItemActionButtonStatus(0x10); + itemActionTrigger(); + } + } } -#pragma pop /* 800E0F10-800E0FA0 0DB850 0090+00 1/1 0/0 0/0 .text procBoomerangSubjectInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoomerangSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBoomerangSubjectInit__9daAlink_cFv.s" +int daAlink_c::procBoomerangSubjectInit() { + if (!commonProcInitNotSameProc(PROC_BOOMERANG_SUBJECT)) { + return 0; + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + initBoomerangUpperAnimeSpeed(1); + setSingleAnimeBaseSpeed(ANM_ATN_WAIT_RIGHT, FLOAT_LABEL(lit_6108), + daAlinkHIO_boom_c0::m.mStartInterpolation); + dComIfGp_setPlayerStatus0(0, 0x80000); + current.angle.y = shape_angle.y; + + return 1; } -#pragma pop /* 800E0FA0-800E1060 0DB8E0 00C0+00 1/0 0/0 0/0 .text procBoomerangSubject__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoomerangSubject() { - nofralloc -#include "asm/d/a/d_a_alink/procBoomerangSubject__9daAlink_cFv.s" +int daAlink_c::procBoomerangSubject() { + if (!checkItemActorPointer()) { + return 1; + } + + if (checkBoomerangReadyAnime()) { + setDoStatus(0x12); + } + + setShapeAngleToAtnActor(0); + + if (!checkNextAction(0)) { + if (setBodyAngleToCamera()) { + setBoomerangSight(); + } + } else { + mSight.offDrawFlg(); + } + + return 1; } -#pragma pop /* 800E1060-800E10F4 0DB9A0 0094+00 1/1 0/0 0/0 .text procBoomerangMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoomerangMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBoomerangMoveInit__9daAlink_cFv.s" +int daAlink_c::procBoomerangMoveInit() { + if (!commonProcInitNotSameProc(PROC_BOOMERANG_MOVE)) { + return 0; + } + + if (checkZeroSpeedF()) { + onModeFlg(1); + } + + initBoomerangUpperAnimeSpeed(0); + setBlendAtnMoveAnime(daAlinkHIO_boom_c0::m.mStartInterpolation); + + dComIfGp_setPlayerStatus0(0, 0x80000); + return 1; } -#pragma pop /* 800E10F4-800E11D8 0DBA34 00E4+00 1/0 0/0 0/0 .text procBoomerangMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoomerangMove() { - nofralloc -#include "asm/d/a/d_a_alink/procBoomerangMove__9daAlink_cFv.s" +int daAlink_c::procBoomerangMove() { + if (!checkItemActorPointer()) { + return 1; + } + + if (!checkNextAction(0)) { + f32 var_f31 = lit_6041; + + if (checkZeroSpeedF()) { + onModeFlg(1); + + if (field_0x2f98 != 3) { + field_0x2f98 = 3; + var_f31 = daAlinkHIO_basic_c0::m.mAnmBlendFactor; + } + } else { + offModeFlg(1); + + daBoomerang_c* boomerang = (daBoomerang_c*)mItemAcKeep.getActor(); + if (boomerang != NULL) { + boomerang->onLockDistanceCancel(); + } + } + + setBlendAtnMoveAnime(var_f31); + setBodyAngleXReadyAnime(0); + } + + return 1; } -#pragma pop /* 800E11D8-800E1248 0DBB18 0070+00 1/1 0/0 0/0 .text procBoomerangCatchInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoomerangCatchInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBoomerangCatchInit__9daAlink_cFv.s" +int daAlink_c::procBoomerangCatchInit() { + if (!commonProcInitNotSameProc(PROC_BOOMERANG_CATCH)) { + return 0; + } + + setSingleAnimeParam(ANM_BOOMERANG_CATCH, &daAlinkHIO_boom_c0::m.mCatchAnm); + setBoomerangCatchAnime(); + i_offNoResetFlg0(FLG0_UNK_20); + + return 1; } -#pragma pop /* 800E1248-800E12E0 0DBB88 0098+00 1/0 0/0 0/0 .text procBoomerangCatch__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoomerangCatch() { - nofralloc -#include "asm/d/a/d_a_alink/procBoomerangCatch__9daAlink_cFv.s" -} -#pragma pop \ No newline at end of file +int daAlink_c::procBoomerangCatch() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + i_onEndResetFlg0(ERFLG0_UNK_8000000); + + if (frameCtrl->getFrame() > daAlinkHIO_boom_c0::m.mCatchAnm.mCheckFrame) { + onModeFlg(4); + } + + if (frameCtrl->checkAnmEnd()) { + resetUpperAnime(UPPER_2, lit_6041); + checkNextAction(0); + } else { + checkNextAction(1); + } + + return 1; +} \ No newline at end of file diff --git a/src/d/a/d_a_alink_bottle.inc b/src/d/a/d_a_alink_bottle.inc index 9480a5aa8d4..f4c9cff3adc 100644 --- a/src/d/a/d_a_alink_bottle.inc +++ b/src/d/a/d_a_alink_bottle.inc @@ -1,43 +1,41 @@ /* 8010E48C-8010E52C 108DCC 00A0+00 1/1 0/0 0/0 .text bottleModelCallBack__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::bottleModelCallBack() { - nofralloc -#include "asm/d/a/d_a_alink/bottleModelCallBack__9daAlink_cFv.s" +int daAlink_c::bottleModelCallBack() { + if (mItemMode != 0) { + mDoMtx_stack_c::copy(mpLinkModel->i_getAnmMtx(field_0x30c2)); + mDoMtx_stack_c::transM(lit_14616, lit_6041, lit_16570); + mDoMtx_stack_c::XYZrotM(cM_deg2s(102.0f), cM_deg2s(-0.5f), cM_deg2s(-122.0f)); + mDoMtx_copy(mDoMtx_stack_c::get(), mHeldItemModel->i_getAnmMtx(1)); + } + + return 1; } -#pragma pop /* 8010E52C-8010E568 108E6C 003C+00 1/1 0/0 0/0 .text daAlink_bottleModelCallBack__FP8J3DJointi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_bottleModelCallBack(J3DJoint* param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_bottleModelCallBack__FP8J3DJointi.s" +static int daAlink_bottleModelCallBack(J3DJoint* i_joint, int param_1) { + daAlink_c* link = (daAlink_c*)j3dSys.getModel()->getUserArea(); + + if (param_1 == 0) { + link->bottleModelCallBack(); + } + + return 1; } -#pragma pop /* 8010E568-8010E584 108EA8 001C+00 1/0 0/0 0/0 .text getBottleOpenAppearItem__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 daAlink_c::getBottleOpenAppearItem() const { - nofralloc -#include "asm/d/a/d_a_alink/getBottleOpenAppearItem__9daAlink_cCFv.s" +s32 daAlink_c::getBottleOpenAppearItem() const { + if (mProcID == PROC_BOTTLE_OPEN) { + return mEquipItem; + } + + return -1; } -#pragma pop /* 8010E584-8010E5D8 108EC4 0054+00 2/2 0/0 0/0 .text checkOilBottleItemNotGet__9daAlink_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkOilBottleItemNotGet(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkOilBottleItemNotGet__9daAlink_cFUs.s" +BOOL daAlink_c::checkOilBottleItemNotGet(u16 i_itemNo) { + return mProcID != PROC_BOTTLE_GET && mProcID != PROC_BOTTLE_SWING && + checkOilBottleItem(i_itemNo); } -#pragma pop /* 8010E5D8-8010EAC4 108F18 04EC+00 7/7 0/0 0/0 .text setBottleModel__9daAlink_cFUs */ #pragma push @@ -53,59 +51,154 @@ asm void daAlink_c::setBottleModel(u16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::commonBottleDrink(int param_0) { +asm int daAlink_c::commonBottleDrink(int param_0) { nofralloc #include "asm/d/a/d_a_alink/commonBottleDrink__9daAlink_cFi.s" } #pragma pop /* 8010F45C-8010F54C 109D9C 00F0+00 2/2 0/0 0/0 .text makeFairy__9daAlink_cFP4cXyzUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::makeFairy(cXyz* param_0, u32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/makeFairy__9daAlink_cFP4cXyzUl.s" +fopAc_ac_c* daAlink_c::makeFairy(cXyz* i_pos, u32 i_params) { + cXyz fairy_pos; + + if (i_checkModeFlg(0x40000)) { + fairy_pos = *i_pos; + + if (i_checkWolf()) { + fairy_pos.y -= lit_8247; + } else { + fairy_pos.y -= lit_6896; + } + + i_pos = &fairy_pos; + } + + fopAc_ac_c* fairy_actor = + (fopAc_ac_c*)fopAcM_fastCreate(PROC_Obj_Yousei, i_params, i_pos, fopAcM_GetRoomNo(this), + &shape_angle, NULL, -1, NULL, NULL); + + field_0x285c.setData(fairy_actor); + i_onResetFlg0(RFLG0_UNK_400); + + if (checkEventRun() && field_0x285c.getActor() != NULL) { + fopAcM_OnStatus(field_0x285c.getActor(), 0x800); + } + + return field_0x285c.getActor(); } -#pragma pop /* 8010F54C-8010F698 109E8C 014C+00 2/2 0/0 0/0 .text procBottleDrinkInit__9daAlink_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBottleDrinkInit(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procBottleDrinkInit__9daAlink_cFUs.s" +int daAlink_c::procBottleDrinkInit(u16 param_0) { + if (mDemo.getDemoMode() == 0x2A) { + if (mProcID == PROC_BOTTLE_DRINK) { + return 1; + } + } else { + if (!dComIfGp_event_compulsory(this, 0, 0xFFFF)) { + return 0; + } + + mDemo.i_setSpecialDemoType(); + } + + commonProcInit(PROC_BOTTLE_DRINK); + current.angle.y = shape_angle.y; + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x2f98 = 4; + + setSingleAnimeParam(ANM_BOTTLE_DRINK_START, &daAlinkHIO_bottle_c0::m.mStartDrinkAnm); + keepItemData(); + setBottleModel(param_0); + dComIfGp_setPlayerStatus1(0, 0x2000); + field_0x3194 = 1; + field_0x3008 = 0; + + u32 id = fopAcM_GetID(this); + dCam_getBody()->StartEventCamera(0x12, id, "Type", 1, &field_0x3194, 0); + mCommonCounter = 0; + field_0x300e = 0; + return 1; } -#pragma pop /* 8010F698-8010F6F4 109FD8 005C+00 1/0 0/0 0/0 .text procBottleDrink__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBottleDrink() { - nofralloc -#include "asm/d/a/d_a_alink/procBottleDrink__9daAlink_cFv.s" +int daAlink_c::procBottleDrink() { + if (field_0x300e != 0) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else { + field_0x300e = commonBottleDrink(0); + } + + return 1; } -#pragma pop /* 8010F6F4-8010F8E4 10A034 01F0+00 1/1 0/0 0/0 .text procBottleOpenInit__9daAlink_cFUs */ +// literals +#ifdef NONMATCHING +int daAlink_c::procBottleOpenInit(u16 param_0) { + if (!dComIfGp_event_compulsory(this, 0, 0xFFFF)) { + return 0; + } + + mDemo.i_setSpecialDemoType(); + commonProcInit(PROC_BOTTLE_OPEN); + current.angle.y = shape_angle.y; + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x2f98 = 4; + + setSingleAnimeParam(ANM_BOTTLE_OPEN, &daAlinkHIO_bottle_c0::m.mOpenBottleAnm); + keepItemData(); + setBottleModel(param_0); + dComIfGp_setPlayerStatus1(0, 0x4000); + field_0x300a = 0; + field_0x32cc = -1; + field_0x3008 = 1; + + if (mEquipItem == FAIRY) { + field_0x3194 = 3; + } else { + field_0x3194 = 2; + + if (mEquipItem == WORM) { + field_0x32cc = fopAcM_create(PROC_NPC_WORM, 2, ¤t.pos, fopAcM_GetRoomNo(this), + NULL, NULL, -1); + field_0x3008 = 0; + field_0x300a = 1; + } + } + + field_0x300e = 0; + + u32 id = fopAcM_GetID(this); + dCam_getBody()->StartEventCamera(0x12, id, "Type", 1, &field_0x3194, 0); + mCommonCounter = 0; + + field_0x27c8.initialize(); + + if (param_0 == 0x67) { + setCylAtParam(0x200, 0, 0, 0, 0, 30.0f, 30.0f); + } + field_0x3010 = 0; + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBottleOpenInit(u16 param_0) { +asm int daAlink_c::procBottleOpenInit(u16 param_0) { nofralloc #include "asm/d/a/d_a_alink/procBottleOpenInit__9daAlink_cFUs.s" } #pragma pop +#endif /* 8010F8E4-8010FC38 10A224 0354+00 1/0 0/0 0/0 .text procBottleOpen__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBottleOpen() { +asm int daAlink_c::procBottleOpen() { nofralloc #include "asm/d/a/d_a_alink/procBottleOpen__9daAlink_cFv.s" } @@ -116,7 +209,7 @@ asm void daAlink_c::procBottleOpen() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) { +asm int daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) { nofralloc #include "asm/d/a/d_a_alink/procBottleSwingInit__9daAlink_cFP10fopAc_ac_ci.s" } @@ -126,31 +219,104 @@ asm void daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBottleSwing() { +asm int daAlink_c::procBottleSwing() { nofralloc #include "asm/d/a/d_a_alink/procBottleSwing__9daAlink_cFv.s" } #pragma pop /* 801102D0-80110518 10AC10 0248+00 2/2 0/0 0/0 .text procBottleGetInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBottleGetInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procBottleGetInit__9daAlink_cFi.s" +int daAlink_c::procBottleGetInit(int param_0) { + BOOL proc_pickup = mProcID == PROC_PICK_UP; + commonProcInit(PROC_BOTTLE_GET); + + int var_r30; + if (mEquipItem == KANTERA) { + setSingleAnime(ANM_BOTTLE_GET, daAlinkHIO_bottle_c0::m.mGetAnm.mSpeed, lit_11442, + daAlinkHIO_bottle_c0::m.mGetAnm.mEndFrame, + daAlinkHIO_bottle_c0::m.mGetAnm.mInterpolation); + field_0x2f93 = 0xFE; + + if (proc_pickup) { + execItemGet(KANTERA); + var_r30 = 0xF8; + dComIfGp_setItemOilCount(-dComIfGs_getMaxOil()); + } else { + dComIfGp_setItemOilCount(dComIfGs_getMaxOil()); + + if (param_0) { + var_r30 = 0x9C; + } else { + var_r30 = 0x6E; + } + } + + setGetSubBgm(var_r30); + } else { + setSingleAnimeParam(ANM_BOTTLE_GET, &daAlinkHIO_bottle_c0::m.mGetAnm); + var_r30 = mEquipItem; + } + + dComIfGp_setPlayerStatus1(0, 0x4001000); + mMsgClassID = -1; + field_0x3194 = 0; + field_0x32cc = var_r30 + 0x65; + + if (mEquipItem == KANTERA) { + field_0x3194 = 12; + } + + if (mEquipItem == KANTERA) { + resetBasAnime(); + } + + u32 id = fopAcM_GetID(this); + dCam_getBody()->StartEventCamera(0x12, id, "Type", 1, &field_0x3194, 0); + + if (mEquipItem == FAIRY_DROP || mEquipItem == CHUCHU_RARE || mEquipItem == WORM) { + setFaceBasicTexture(FTANM_UNK_48); + setFaceBasicBck(0x143); + } else if (mEquipItem == UGLY_SOUP) { + setFaceBasicBck(0x146); + } + + // event flag 0x4A40: Ordon Day 1 completed + if (mEquipItem == BEE_CHILD && i_dComIfGs_isEventBit(0x4A40)) { + dComIfGs_onEventBit(0x4C80); // event flag 0x4C80: Collected Bee Larva on Ordon Day 2 + } + + return 1; } -#pragma pop /* 80110518-80110648 10AE58 0130+00 1/0 0/0 0/0 .text procBottleGet__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBottleGet() { - nofralloc -#include "asm/d/a/d_a_alink/procBottleGet__9daAlink_cFv.s" +int daAlink_c::procBottleGet() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + simpleAnmPlay(field_0x0718); + + if (frameCtrl->checkAnmEnd() && checkEndMessage(field_0x32cc)) { + resetFairyEffect(); + if (mEquipItem != KANTERA) { + deleteEquipItem(0, 0); + } + + resetSpecialEvent(); + } else if (frameCtrl->getFrame() >= lit_8369) { + field_0x2f93 = 0xFE; + } else if (frameCtrl->getFrame() >= lit_14954) { + mItemMode = 0; + } else if (frameCtrl->getFrame() >= lit_7808) { + mHeldItemModel->getModelData()->getMaterialNodePointer(0)->getShape()->show(); + field_0x2f93 = 5; + mItemMode = 1; + } + + if (frameCtrl->checkPass(lit_8779)) { + setGetSubBgm(mEquipItem); + } + + return 1; } -#pragma pop /* 80110648-80110654 10AF88 000C+00 0/0 1/0 0/0 .text Insect_Release__9dInsect_cFv */ #pragma push diff --git a/src/d/a/d_a_alink_bow.inc b/src/d/a/d_a_alink_bow.inc index 21c62374702..81a4814d5c7 100644 --- a/src/d/a/d_a_alink_bow.inc +++ b/src/d/a/d_a_alink_bow.inc @@ -1,146 +1,154 @@ +#include "rel/d/a/d_a_arrow/d_a_arrow.h" + /* 800DE64C-800DE740 0D8F8C 00F4+00 1/1 0/0 2/2 .text getArrowFlyData__9daAlink_cCFPfPfi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getArrowFlyData(f32* param_0, f32* param_1, int param_2) const { - nofralloc -#include "asm/d/a/d_a_alink/getArrowFlyData__9daAlink_cCFPfPfi.s" +void daAlink_c::getArrowFlyData(f32* o_distance, f32* o_speed, int i_forceCharge) const { + if (mEquipItem == PACHINKO) { + *o_distance = daAlinkHIO_bow_c0::m.mSlingshotDistance; + *o_speed = daAlinkHIO_bow_c0::m.mSlingshotSpeed; + } else if (i_dComIfGp_checkPlayerStatus0(0, 0x200000)) { + *o_distance = daAlinkHIO_bow_c0::m.mScopeArrowDistance; + *o_speed = daAlinkHIO_bow_c0::m.mScopeArrowSpeed; + } else if (field_0x301c == 0 || i_forceCharge) { + if (field_0x301e == 1) { + *o_distance = daAlinkHIO_bow_c0::m.mChargeBombArrowDistance; + *o_speed = daAlinkHIO_bow_c0::m.mChargeBombArrowSpeed; + } else { + *o_distance = daAlinkHIO_bow_c0::m.mChargeArrowDistance; + *o_speed = daAlinkHIO_bow_c0::m.mChargeArrowSpeed; + } + } else if (field_0x301e == 1) { + *o_distance = daAlinkHIO_bow_c0::m.mBombArrowDistance; + *o_speed = daAlinkHIO_bow_c0::m.mBombArrowSpeed; + } else { + *o_distance = daAlinkHIO_bow_c0::m.mArrowDistance; + *o_speed = daAlinkHIO_bow_c0::m.mArrowSpeed; + } } -#pragma pop /* 800DE740-800DE750 0D9080 0010+00 0/0 0/0 1/1 .text getArrowIncAtR__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getArrowIncAtR() const { - nofralloc -#include "asm/d/a/d_a_alink/getArrowIncAtR__9daAlink_cCFv.s" +f32 daAlink_c::getArrowIncAtR() const { + return daAlinkHIO_bow_c0::m.mArrowAttackRadius; } -#pragma pop /* 800DE750-800DE760 0D9090 0010+00 0/0 0/0 1/1 .text getBombArrowFlyExplodeTime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBombArrowFlyExplodeTime() const { - nofralloc -#include "asm/d/a/d_a_alink/getBombArrowFlyExplodeTime__9daAlink_cCFv.s" +s16 daAlink_c::getBombArrowFlyExplodeTime() const { + return daAlinkHIO_bow_c0::m.mBombArrowFlyExplodeTime; } -#pragma pop /* 800DE760-800DE770 0D90A0 0010+00 0/0 0/0 1/1 .text getArrowIncAtMaxStart__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getArrowIncAtMaxStart() const { - nofralloc -#include "asm/d/a/d_a_alink/getArrowIncAtMaxStart__9daAlink_cCFv.s" +f32 daAlink_c::getArrowIncAtMaxStart() const { + return daAlinkHIO_bow_c0::m.mArrowIncAttackMaxStart; } -#pragma pop /* 800DE770-800DE780 0D90B0 0010+00 0/0 0/0 1/1 .text getArrowIncAtMax__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getArrowIncAtMax() const { - nofralloc -#include "asm/d/a/d_a_alink/getArrowIncAtMax__9daAlink_cCFv.s" +f32 daAlink_c::getArrowIncAtMax() const { + return daAlinkHIO_bow_c0::m.mArrowIncAttackMax; } -#pragma pop /* 800DE780-800DE7D4 0D90C0 0054+00 10/10 0/0 0/0 .text checkBowAndSlingItem__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkBowAndSlingItem(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkBowAndSlingItem__9daAlink_cFi.s" +BOOL daAlink_c::checkBowAndSlingItem(int i_itemNo) { + return checkBowItem(i_itemNo) || i_itemNo == PACHINKO; } -#pragma pop /* 800DE7D4-800DE884 0D9114 00B0+00 1/1 0/0 0/0 .text setSlingModel__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSlingModel() { - nofralloc -#include "asm/d/a/d_a_alink/setSlingModel__9daAlink_cFv.s" +void daAlink_c::setSlingModel() { + J3DAnmTransform* bck = (J3DAnmTransform*)mAnmHeap9.loadDataIdx(0x1F9); + JKRHeap* heap = setItemHeap(); + + J3DModelData* model_data = loadAramBmd(0x319, 0x2C00); + mHeldItemModel = initModel(model_data, 0); + field_0x730.init(bck, 0, 2, lit_6040, 0, -1, false); + + mDoExt_setCurrentHeap(heap); + field_0x2f95 = 5; + field_0x2f94 = 103; } -#pragma pop /* 800DE884-800DE990 0D91C4 010C+00 0/0 1/1 1/1 .text checkBowCameraArrowPosP__9daAlink_cFPsPs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBowCameraArrowPosP(s16* param_0, s16* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/checkBowCameraArrowPosP__9daAlink_cFPsPs.s" +cXyz* daAlink_c::checkBowCameraArrowPosP(s16* param_0, s16* param_1) { + if (!checkBowAnime() || mEquipItem == PACHINKO) { + return NULL; + } + + s16 var_28; + if (checkHorseRide() && i_checkBoarSingleBattle() && i_dComIfGp_getHorseActor() != NULL) { + var_28 = i_dComIfGp_getHorseActor()->shape_angle.y; + } else if (i_checkMagneBootsOn()) { + var_28 = field_0x3118; + } else { + var_28 = shape_angle.y; + } + + var_28 += field_0x59e; + + mDoMtx_stack_c::transS(field_0x3834); + concatMagneBootMtx(); + mDoMtx_stack_c::ZXYrotM(mLookAngleY, var_28, 0); + mDoMtx_stack_c::multVec(&localPos, &field_0x37e0); + + *param_0 = mLookAngleY; + *param_1 = var_28; + return &field_0x37e0; } -#pragma pop /* 800DE990-800DE9B8 0D92D0 0028+00 1/0 0/0 0/0 .text checkArrowChargeEnd__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkArrowChargeEnd() const { - nofralloc -#include "asm/d/a/d_a_alink/checkArrowChargeEnd__9daAlink_cCFv.s" +bool daAlink_c::checkArrowChargeEnd() const { + return checkBowChargeWaitAnime() && field_0x301c == 0; } -#pragma pop /* 800DE9B8-800DE9E8 0D92F8 0030+00 3/3 0/0 0/0 .text checkBowReadyAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBowReadyAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkBowReadyAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkBowReadyAnime() const { + return checkBowReloadAnime() || checkBowChargeWaitAnime() || checkBowWaitAnime(); } -#pragma pop /* 800DE9E8-800DEA3C 0D9328 0054+00 16/16 0/0 0/0 .text checkBowAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBowAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkBowAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkBowAnime() const { + return checkBowReadyAnime() || checkBowShootAnime(); } -#pragma pop /* 800DEA3C-800DEAE4 0D937C 00A8+00 2/2 0/0 0/0 .text makeArrow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::makeArrow() { - nofralloc -#include "asm/d/a/d_a_alink/makeArrow__9daAlink_cFv.s" +void daAlink_c::makeArrow() { + if (dComIfGs_getArrowNum() != 0) { + if (field_0x301e == 1 && dComIfGp_getSelectItemNum(mSelectItemId) == 0) { + field_0x301e = 0; + } + + fopAc_ac_c* arrow_actor = daArrow_c::makeArrow(this, field_0x301e); + mItemAcKeep.setData(arrow_actor); + } + + field_0x3018 = 0; } -#pragma pop /* 800DEAE4-800DEB8C 0D9424 00A8+00 3/3 0/0 0/0 .text deleteArrow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::deleteArrow() { - nofralloc -#include "asm/d/a/d_a_alink/deleteArrow__9daAlink_cFv.s" +void daAlink_c::deleteArrow() { + daArrow_c* arrow = (daArrow_c*)mItemAcKeep.getActor(); + + if (arrow != NULL && fopAcM_GetName(arrow) == PROC_ARROW) { + if (arrow->checkBombArrow() && + (mDamageTimer == daAlinkHIO_damage_c0::m.mInvincibleTime || i_checkModeFlg(8))) { + arrow->setBombArrowExplode(); + dComIfGp_addSelectItemNum(mSelectItemId, -1); + dComIfGp_setItemArrowNumCount(-1); + } else { + fopAcM_delete(arrow); + } + mItemAcKeep.clearData(); + } } -#pragma pop /* 800DEB8C-800DEBC8 0D94CC 003C+00 6/6 0/0 0/0 .text setBowOrSlingStatus__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBowOrSlingStatus() { - nofralloc -#include "asm/d/a/d_a_alink/setBowOrSlingStatus__9daAlink_cFv.s" +void daAlink_c::setBowOrSlingStatus() { + if (mEquipItem == PACHINKO) { + dComIfGp_setPlayerStatus0(0, 0x40); + } else { + dComIfGp_setPlayerStatus0(0, 0x1000); + } } -#pragma pop /* 800DEBC8-800DED88 0D9508 01C0+00 1/1 0/0 0/0 .text changeArrowType__9daAlink_cFv */ #pragma push @@ -154,43 +162,77 @@ asm void daAlink_c::changeArrowType() { /* 800DED88-800DEE1C 0D96C8 0094+00 1/1 0/0 0/0 .text cancelBowMoveRideNotAtn__9daAlink_cFv */ #pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::cancelBowMoveRideNotAtn() { - nofralloc -#include "asm/d/a/d_a_alink/cancelBowMoveRideNotAtn__9daAlink_cFv.s" +#pragma optimization_level 2 +BOOL daAlink_c::cancelBowMoveRideNotAtn() { + return i_checkModeFlg(0x400) && i_checkAttentionLock() && mTargetedActor == NULL; } #pragma pop /* 800DEE1C-800DEEDC 0D975C 00C0+00 3/3 0/0 0/0 .text cancelBowMove__9daAlink_cFv */ #pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::cancelBowMove() { - nofralloc -#include "asm/d/a/d_a_alink/cancelBowMove__9daAlink_cFv.s" +#pragma optimization_level 2 +BOOL daAlink_c::cancelBowMove() { + if (mTargetedActor == NULL && !i_checkAttentionLock() && mFastShotTime == 0 && + !checkBowReadyAnime() && (!checkBowShootAnime() || mUpperFrameCtrl[2].checkAnmEnd())) { + resetUpperAnime(UPPER_2, lit_6041); + return true; + } + + return false; } #pragma pop /* 800DEEDC-800DEFB8 0D981C 00DC+00 3/3 0/0 0/0 .text setBowReadyAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBowReadyAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setBowReadyAnime__9daAlink_cFv.s" +void daAlink_c::setBowReadyAnime() { + if (!checkBowAnime()) { + if (mEquipItem == BOMB_ARROW) { + if (dComIfGp_getSelectItemNum(mSelectItemId) != 0) { + field_0x301e = 1; + } else { + field_0x301e = 0; + } + } else { + field_0x301e = 0; + } + } + + setUpperAnimeBase(0xD); + + if (i_checkResetFlg0(RFLG0_UNK_80)) { + mItemMode = 0; + } else { + mItemMode = 3; + } + + field_0x2f97 = 5; + field_0x2f96 = 4; + + if (mEquipItem == PACHINKO) { + changeItemBck(0x1F1, lit_6041); + } else { + changeItemBck(0x43, lit_6041); + } } -#pragma pop /* 800DEFB8-800DF0BC 0D98F8 0104+00 2/2 0/0 0/0 .text setBowReloadAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBowReloadAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setBowReloadAnime__9daAlink_cFv.s" +void daAlink_c::setBowReloadAnime() { + setUpperAnimeParam(9, UPPER_2, &daAlinkHIO_bow_c0::m.mLoadAnm); + setFacePriTexture(FTANM_UNK_8); + setFacePriBck(0xE5); + + if (mEquipItem == PACHINKO) { + changeItemBck(0x1F0, daAlinkHIO_bow_c0::m.mLoadAnm.mStartFrame); + field_0x2f97 = 5; + seStartOnlyReverb(Z2SE_AL_PACHINKO_DRAW); + } else { + changeItemBck(0x41, daAlinkHIO_bow_c0::m.mLoadAnm.mStartFrame); + field_0x2f97 = 7; + seStartOnlyReverb(Z2SE_AL_DRAW_BOW); + } + + field_0x2f96 = 0; + field_0x301c = daAlinkHIO_bow_c0::m.mChargeArrowTime; } -#pragma pop /* 800DF0BC-800DF798 0D99FC 06DC+00 2/2 0/0 0/0 .text checkUpperItemActionBow__9daAlink_cFv */ #pragma push @@ -203,20 +245,21 @@ asm void daAlink_c::checkUpperItemActionBow() { #pragma pop /* 800DF798-800DF814 0DA0D8 007C+00 1/1 0/0 0/0 .text checkUpperItemActionBowFly__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUpperItemActionBowFly() { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperItemActionBowFly__9daAlink_cFv.s" +void daAlink_c::checkUpperItemActionBowFly() { + if (checkBowAnime()) { + checkUpperItemActionBow(); + setBodyAngleXReadyAnime(0); + } else if (checkReadyItem() && itemTrigger()) { + setBowReadyAnime(); + mItemMode = 0; + } } -#pragma pop /* 800DF814-800DFAE8 0DA154 02D4+00 4/4 0/0 0/0 .text checkNextActionBow__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkNextActionBow() { +asm int daAlink_c::checkNextActionBow() { nofralloc #include "asm/d/a/d_a_alink/checkNextActionBow__9daAlink_cFv.s" } @@ -234,81 +277,110 @@ asm void daAlink_c::setBowModel() { /* 800DFBC8-800DFC28 0DA508 0060+00 4/4 0/0 0/0 .text checkBowGrabLeftHand__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkBowGrabLeftHand() const { - nofralloc -#include "asm/d/a/d_a_alink/checkBowGrabLeftHand__9daAlink_cCFv.s" +bool daAlink_c::checkBowGrabLeftHand() const { + return i_checkReinRide() && !checkBowAnime(); } -#pragma pop /* 800DFC28-800DFC70 0DA568 0048+00 6/6 0/0 0/0 .text setBowHangAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBowHangAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setBowHangAnime__9daAlink_cFv.s" +void daAlink_c::setBowHangAnime() { + if (checkBowItem(mEquipItem)) { + changeItemBck(0x58, FLOAT_LABEL(lit_6108)); + } } -#pragma pop /* 800DFC70-800DFCD8 0DA5B0 0068+00 3/3 0/0 0/0 .text setBowNormalAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBowNormalAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setBowNormalAnime__9daAlink_cFv.s" +void daAlink_c::setBowNormalAnime() { + if (checkBowItem(mEquipItem)) { + changeItemBck(0x59, lit_6041); + } else if (mEquipItem == PACHINKO) { + changeItemBck(0x1F9, lit_6041); + } } -#pragma pop /* 800DFCD8-800DFD6C 0DA618 0094+00 3/3 0/0 0/0 .text setBowSight__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBowSight() { - nofralloc -#include "asm/d/a/d_a_alink/setBowSight__9daAlink_cFv.s" +void daAlink_c::setBowSight() { + if (checkBowChargeWaitAnime() && !i_dComIfGp_checkPlayerStatus0(0, 0x200000)) { + cXyz sight_pos; + f32 dist; + f32 speed; + + getArrowFlyData(&dist, &speed, TRUE); + checkSightLine(dist, &sight_pos); + mSight.setPos(&sight_pos); + mSight.offDrawFlg(); + } else { + mSight.offDrawFlg(); + } } -#pragma pop /* 800DFD6C-800DFDDC 0DA6AC 0070+00 1/1 0/0 0/0 .text procBowSubjectInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBowSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBowSubjectInit__9daAlink_cFv.s" +int daAlink_c::procBowSubjectInit() { + if (!commonProcInitNotSameProc(PROC_BOW_SUBJECT)) { + return 0; + } + + setSingleAnimeBaseSpeed(ANM_ATN_WAIT_RIGHT, FLOAT_LABEL(lit_6108), + daAlinkHIO_bow_c0::m.mStartInterpolation); + mNormalSpeed = FLOAT_LABEL(lit_6108); + setBowOrSlingStatus(); + return 1; } -#pragma pop /* 800DFDDC-800DFE3C 0DA71C 0060+00 1/0 0/0 0/0 .text procBowSubject__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBowSubject() { - nofralloc -#include "asm/d/a/d_a_alink/procBowSubject__9daAlink_cFv.s" +int daAlink_c::procBowSubject() { + setDoStatus(0x12); + if (!checkNextAction(0) && setBodyAngleToCamera()) { + setBowSight(); + } + + return 1; } -#pragma pop /* 800DFE3C-800DFEC0 0DA77C 0084+00 1/1 0/0 0/0 .text procBowMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBowMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBowMoveInit__9daAlink_cFv.s" +int daAlink_c::procBowMoveInit() { + if (!commonProcInitNotSameProc(PROC_BOW_MOVE)) { + return 0; + } + + if (checkZeroSpeedF()) { + onModeFlg(1); + } + + setBlendAtnMoveAnime(daAlinkHIO_bow_c0::m.mStartInterpolation); + mCommonCounter = 0; + setBowOrSlingStatus(); + return 1; } -#pragma pop /* 800DFEC0-800DFFE0 0DA800 0120+00 1/0 0/0 0/0 .text procBowMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBowMove() { - nofralloc -#include "asm/d/a/d_a_alink/procBowMove__9daAlink_cFv.s" -} -#pragma pop \ No newline at end of file +int daAlink_c::procBowMove() { + cancelBowMove(); + + if (mFastShotTime == 0 && mCommonCounter != 0 && checkBowWaitAnime() && !itemButton()) { + resetUpperAnime(UPPER_2, lit_6041); + } + + mCommonCounter = 1; + i_onEndResetFlg0(ERFLG0_UNK_8000000); + + if (!checkNextAction(0)) { + f32 var_f31 = lit_6041; + + if (checkZeroSpeedF()) { + onModeFlg(1); + + if (field_0x2f98 != 3) { + field_0x2f98 = 3; + var_f31 = daAlinkHIO_basic_c0::m.mAnmBlendFactor; + } + current.angle.y = shape_angle.y - 0x4000; + } else { + offModeFlg(1); + } + + setBlendAtnMoveAnime(var_f31); + setBodyAngleXReadyAnime(0); + } + + return 1; +} \ No newline at end of file diff --git a/src/d/a/d_a_alink_canoe.inc b/src/d/a/d_a_alink_canoe.inc index 4e36f7cca95..6f2121d764d 100644 --- a/src/d/a/d_a_alink_canoe.inc +++ b/src/d/a/d_a_alink_canoe.inc @@ -1,179 +1,161 @@ +#include "rel/d/a/d_a_canoe/d_a_canoe.h" + /* 800F3BB0-800F3BDC 0EE4F0 002C+00 1/1 0/0 2/2 .text getCanoeMaxSpeed__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCanoeMaxSpeed() const { - nofralloc -#include "asm/d/a/d_a_alink/getCanoeMaxSpeed__9daAlink_cCFv.s" +f32 daAlink_c::getCanoeMaxSpeed() const { + if (checkCanoeSlider()) { + return daAlinkHIO_canoe_c0::m.field_0x3C; + } + + return daAlinkHIO_canoe_c0::m.field_0x24; } -#pragma pop /* 800F3BDC-800F3BEC 0EE51C 0010+00 0/0 0/0 1/1 .text getCanoeBackMaxSpeed__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCanoeBackMaxSpeed() const { - nofralloc -#include "asm/d/a/d_a_alink/getCanoeBackMaxSpeed__9daAlink_cCFv.s" +f32 daAlink_c::getCanoeBackMaxSpeed() const { + return daAlinkHIO_canoe_c0::m.mBackMaxSpeed; } -#pragma pop /* 800F3BEC-800F3C18 0EE52C 002C+00 0/0 0/0 1/1 .text getCanoeCres__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCanoeCres() const { - nofralloc -#include "asm/d/a/d_a_alink/getCanoeCres__9daAlink_cCFv.s" +f32 daAlink_c::getCanoeCres() const { + if (checkCanoeSlider()) { + return daAlinkHIO_canoe_c0::m.field_0x44; + } + + return daAlinkHIO_canoe_c0::m.field_0x28; } -#pragma pop /* 800F3C18-800F3C44 0EE558 002C+00 2/2 0/0 0/0 .text getCanoeSpeedRate__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCanoeSpeedRate() const { - nofralloc -#include "asm/d/a/d_a_alink/getCanoeSpeedRate__9daAlink_cCFv.s" +f32 daAlink_c::getCanoeSpeedRate() const { + if (checkCanoeSlider()) { + return daAlinkHIO_canoe_c0::m.field_0x40; + } + + return daAlinkHIO_canoe_c0::m.field_0x20; } -#pragma pop /* 800F3C44-800F3CCC 0EE584 0088+00 0/0 0/0 1/1 .text getCanoeMaxRotSpeed__9daAlink_cCFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getCanoeMaxRotSpeed() const { +asm s16 daAlink_c::getCanoeMaxRotSpeed() const { nofralloc #include "asm/d/a/d_a_alink/getCanoeMaxRotSpeed__9daAlink_cCFv.s" } #pragma pop /* 800F3CCC-800F3CD8 0EE60C 000C+00 1/1 0/0 1/1 .text getCanoeLocalPaddleTop__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCanoeLocalPaddleTop() { - nofralloc -#include "asm/d/a/d_a_alink/getCanoeLocalPaddleTop__9daAlink_cFv.s" +cXyz* daAlink_c::getCanoeLocalPaddleTop() { + return (cXyz*)&localPaddleTop; } -#pragma pop /* 800F3CD8-800F3CF8 0EE618 0020+00 3/3 0/0 0/0 .text daAlink_searchCanoe__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void* daAlink_searchCanoe(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchCanoe__FP10fopAc_ac_cPv.s" +static fopAc_ac_c* daAlink_searchCanoe(fopAc_ac_c* param_0, void* param_1) { + if (fopAcM_GetName(param_0) == PROC_CANOE && + static_cast(param_0)->getModel() != NULL) { + return param_0; + } + + return NULL; } -#pragma pop /* 800F3CF8-800F3D58 0EE638 0060+00 0/0 2/2 0/0 .text checkCanoeRideTandem__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCanoeRideTandem() { - nofralloc -#include "asm/d/a/d_a_alink/checkCanoeRideTandem__9daAlink_cFv.s" +BOOL daAlink_c::checkCanoeRideTandem() { + daCanoe_c* canoe = (daCanoe_c*)mRideAcKeep.getActor(); + + if (checkCanoeRide() && canoe != NULL && canoe->checkTandem()) { + return true; + } + + return false; } -#pragma pop /* 800F3D58-800F3DA0 0EE698 0048+00 7/7 0/0 0/0 .text checkFishingRodAndLureItem__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkFishingRodAndLureItem() const { - nofralloc -#include "asm/d/a/d_a_alink/checkFishingRodAndLureItem__9daAlink_cCFv.s" +BOOL daAlink_c::checkFishingRodAndLureItem() const { + return checkFisingRodLure() || checkFishingRodItem(mEquipItem); } -#pragma pop /* 800F3DA0-800F3DFC 0EE6E0 005C+00 4/4 0/0 0/0 .text initFishingRodHand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initFishingRodHand() { - nofralloc -#include "asm/d/a/d_a_alink/initFishingRodHand__9daAlink_cFv.s" +void daAlink_c::initFishingRodHand() { + field_0x2f94 = 0x65; + field_0x2f95 = 0x65; + field_0x3018 = 1; + + if (mEquipItem == JEWEL_WORM_ROD || mEquipItem == WORM_ROD) { + mItemMode = 0x74; + } else if (mEquipItem == JEWEL_BEE_ROD || mEquipItem == BEE_ROD) { + mItemMode = 0x76; + } else { + mItemMode = 0xFF; + } } -#pragma pop /* 800F3DFC-800F3E4C 0EE73C 0050+00 1/1 0/0 1/1 .text getCanoePaddleMatrix__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCanoePaddleMatrix() { - nofralloc -#include "asm/d/a/d_a_alink/getCanoePaddleMatrix__9daAlink_cFv.s" +MtxP daAlink_c::getCanoePaddleMatrix() { + mDoMtx_stack_c::copy(getRightItemMatrix()); + f32 tmp_0 = FLOAT_LABEL(lit_6108); + mDoMtx_stack_c::transM(tmp_0, tmp_0, lit_5944); + return mDoMtx_stack_c::get(); } -#pragma pop /* 800F3E4C-800F3EB8 0EE78C 006C+00 0/0 0/0 4/4 .text * checkFishingRodGrab__9daAlink_cCFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkFishingRodGrab(fopAc_ac_c* param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkFishingRodGrab__9daAlink_cCFP10fopAc_ac_c.s" +BOOL daAlink_c::checkFishingRodGrab(fopAc_ac_c* param_0) const { + return checkFishingRodAndLureItem() && mItemAcKeep.getID() == fopAcM_GetID(param_0); } -#pragma pop /* 800F3EB8-800F3F38 0EE7F8 0080+00 0/0 0/0 2/2 .text * checkCanoePaddleGrab__9daAlink_cCFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCanoePaddleGrab(fopAc_ac_c* param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkCanoePaddleGrab__9daAlink_cCFP10fopAc_ac_c.s" +BOOL daAlink_c::checkCanoePaddleGrab(fopAc_ac_c* param_0) const { + return mEquipItem == 0x10B && checkCanoeRideOwn(param_0); } -#pragma pop /* 800F3F38-800F3FC4 0EE878 008C+00 0/0 0/0 1/1 .text checkCanoeFishingRodGrabOrPut__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCanoeFishingRodGrabOrPut() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCanoeFishingRodGrabOrPut__9daAlink_cCFv.s" +BOOL daAlink_c::checkCanoeFishingRodGrabOrPut() const { + return checkFisingRodLure() && checkCanoeRide() && + (checkEquipAnime() || mProcID == PROC_CANOE_PADDLE_PUT || + mProcID == PROC_CANOE_PADDLE_GRAB || mProcID == PROC_CANOE_ROD_GRAB); } -#pragma pop /* 800F3FC4-800F4008 0EE904 0044+00 2/2 0/0 0/0 .text initCanoeRide__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initCanoeRide() { - nofralloc -#include "asm/d/a/d_a_alink/initCanoeRide__9daAlink_cFv.s" +void daAlink_c::initCanoeRide() { + field_0x3012 = 1; + field_0x3588 = l_waitBaseAnime; + field_0x384c = (cXyz*)&l_canoeBaseAnime; + mRideStatus = 3; + field_0x3010 = 0; } -#pragma pop /* 800F4008-800F40E4 0EE948 00DC+00 2/2 0/0 0/0 .text checkCanoeJumpRide__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkCanoeJumpRide() { - nofralloc -#include "asm/d/a/d_a_alink/checkCanoeJumpRide__9daAlink_cFv.s" +BOOL daAlink_c::checkCanoeJumpRide() { + daCanoe_c* canoe = NULL; + + if (field_0x850[0].ChkCoHit()) { + canoe = (daCanoe_c*)field_0x850[0].GetCoHitAc(); + } else if (field_0x850[1].ChkCoHit()) { + canoe = (daCanoe_c*)field_0x850[1].GetCoHitAc(); + } + + if (mSpeed.y < FLOAT_LABEL(lit_6108) && canoe != NULL && fopAcM_GetName(canoe) == PROC_CANOE && + canoe->checkJumpRideFlg() && !checkDeadHP() && + (mProcID != PROC_FALL || field_0x3010 != 0)) { + return procCanoeJumpRideInit(canoe); + } + + return 0; } -#pragma pop /* 800F40E4-800F4140 0EEA24 005C+00 2/2 0/0 0/0 .text setArmReelAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setArmReelAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setArmReelAnime__9daAlink_cFv.s" +void daAlink_c::setArmReelAnime() { + setUpperAnimeBaseSpeed(0x1FB, lit_6040, lit_6041); + mUpperFrameCtrl[2].setRate(FLOAT_LABEL(lit_6108)); + mNowAnmPackUpper[2].setRatio(lit_6040); + field_0x2f97 = 8; + i_offNoResetFlg1(FLG1_UNK_8000); } -#pragma pop /* 800F4140-800F4490 0EEA80 0350+00 1/1 0/0 0/0 .text setFishingWaitAction__9daAlink_cFv */ @@ -187,25 +169,34 @@ asm void daAlink_c::setFishingWaitAction() { #pragma pop /* 800F4490-800F4564 0EEDD0 00D4+00 3/3 0/0 0/0 .text setFishGetFace__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setFishGetFace() { - nofralloc -#include "asm/d/a/d_a_alink/setFishGetFace__9daAlink_cFv.s" +void daAlink_c::setFishGetFace() { + if (field_0x2fc8 == 1) { + setFacePriBck(0x140); + } else if (field_0x2fc8 == 2) { + setFacePriTexture(FTANM_UNK_7A); + setFacePriBck(0x143); + } else if (field_0x2fc8 == 3) { + setFacePriTexture(FTANM_UNK_7B); + setFacePriBck(0x146); + } else if (field_0x2fc8 == 4) { + setFacePriTexture(FTANM_UNK_7C); + setFacePriBck(0x149); + } else { + resetFacePriAnime(); + } } -#pragma pop /* 800F4564-800F459C 0EEEA4 0038+00 3/3 0/0 0/0 .text * setRideCanoeBasePos__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setRideCanoeBasePos(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setRideCanoeBasePos__9daAlink_cFP10fopAc_ac_c.s" +void daAlink_c::setRideCanoeBasePos(fopAc_ac_c* param_0) { + field_0x37c8.x = FLOAT_LABEL(lit_6108); + field_0x37c8.y = lit_5944; + field_0x37c8.z = lit_20823; + + if (static_cast(param_0)->checkTandem()) { + field_0x37c8.z += lit_20824; + } } -#pragma pop /* 800F459C-800F47D8 0EEEDC 023C+00 20/20 0/0 0/0 .text setSyncCanoePos__9daAlink_cFv */ #pragma push @@ -228,62 +219,151 @@ asm void daAlink_c::canoeCommon() { #pragma pop /* 800F4924-800F4A50 0EF264 012C+00 10/10 0/0 0/0 .text checkNextActionCanoe__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionCanoe() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionCanoe__9daAlink_cFv.s" +int daAlink_c::checkNextActionCanoe() { + if ((!checkFishingRodAndLureItem() || mItemAcKeep.getActor() == NULL || + static_cast(mItemAcKeep.getActor())->checkRodEquipPermission()) && + checkNextActionFromButton()) { + return 1; + } + + if (checkBowAnime()) { + return checkNextActionBow(); + } else if (checkBoomerangAnimeAndReturnWait()) { + return checkNextActionBoomerang(); + } else if (checkHookshotAnime()) { + return checkNextActionHookshot(); + } else if (checkGrabAnimeAndThrow()) { + return procCanoeGrabMoveInit(); + } else if (checkCanoeFishingWaitAnime()) { + return procCanoeFishingWaitInit(); + } else { + return procCanoeWaitInit(0); + } } -#pragma pop /* 800F4A50-800F4B90 0EF390 0140+00 2/2 0/0 0/0 .text procCanoeRideInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeRideInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeRideInit__9daAlink_cFv.s" +int daAlink_c::procCanoeRideInit() { + commonProcInit(PROC_CANOE_RIDE); + setHeavyBoots(0); + mRideAcKeep.setData(field_0x27f4); + deleteEquipItem(0, 0); + daCanoe_c* canoe = (daCanoe_c*)field_0x27f4; + + setSingleAnime(ANM_HANG_CLIMB_TOP, daAlinkHIO_wallCatch_c0::m.mClimbAnm.mSpeed, + daAlinkHIO_wallCatch_c0::m.mClimbStartFrame, + daAlinkHIO_wallCatch_c0::m.mClimbAnm.mEndFrame, + daAlinkHIO_wallCatch_c0::m.mClimbAnm.mInterpolation); + setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + mNormalSpeed = tmp_0; + mSpeed.y = tmp_0; + setRideCanoeBasePos(canoe); + + if ((s16)(fopAcM_searchActorAngleY(canoe, this) - canoe->shape_angle.y) > 0) { + shape_angle.y = canoe->shape_angle.y - 0x4000; + field_0x3008 = 0; + field_0x37c8.x = lit_20991; + } else { + shape_angle.y = canoe->shape_angle.y + 0x4000; + field_0x3008 = 1; + field_0x37c8.x = lit_20992; + } + + mDoMtx_multVec(canoe->getModelMtx(), &field_0x37c8, ¤t.pos); + current.angle.y = shape_angle.y; + + initCanoeRide(); + field_0x300e = 0x80; + swimOutAfter(1); + return 1; } -#pragma pop /* 800F4B90-800F4C78 0EF4D0 00E8+00 1/0 0/0 0/0 .text procCanoeRide__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeRide() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeRide__9daAlink_cFv.s" +int daAlink_c::procCanoeRide() { + daCanoe_c* canoe = (daCanoe_c*)mRideAcKeep.getActor(); + if (canoe == NULL) { + return checkNextAction(0); + } + + mDoMtx_multVec(canoe->getModelMtx(), &field_0x37c8, ¤t.pos); + + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + if (frameCtrl->checkAnmEnd()) { + procCanoeWaitInit(1); + } else if (frameCtrl->getFrame() < lit_7710) { + field_0x300e += 0x180; + + if (field_0x3008 == 0) { + canoe->incShapeAngleZ(-field_0x300e); + } else { + canoe->incShapeAngleZ(field_0x300e); + } + canoe->incShapeOffsetY(lit_21021); + } + + return 1; } -#pragma pop /* 800F4C78-800F4D84 0EF5B8 010C+00 4/4 0/0 0/0 .text * procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeJumpRideInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c.s" +int daAlink_c::procCanoeJumpRideInit(fopAc_ac_c* param_0) { + BOOL var_r31; + daCanoe_c* canoe = (daCanoe_c*)param_0; + + commonProcInit(PROC_CANOE_JUMP_RIDE); + + if (canoe == NULL) { + canoe = (daCanoe_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchCanoe, NULL); + var_r31 = true; + } else { + var_r31 = false; + } + + setHeavyBoots(0); + setSingleAnimeParam(ANM_JUMP_LAND, &daAlinkHIO_autoJump_c0::m.mLandAnm); + deleteEquipItem(0, 0); + + mRideAcKeep.setData(canoe); + setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + mNormalSpeed = tmp_0; + mSpeed.y = tmp_0; + setRideCanoeBasePos(canoe); + mDoMtx_multVec(canoe->getModelMtx(), &field_0x37c8, ¤t.pos); + current.angle.y = shape_angle.y; + + initCanoeRide(); + if (var_r31) { + procCanoeWaitInit(2); + } + + return 1; } -#pragma pop /* 800F4D84-800F4DF8 0EF6C4 0074+00 1/0 0/0 0/0 .text procCanoeJumpRide__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeJumpRide() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeJumpRide__9daAlink_cFv.s" +int daAlink_c::procCanoeJumpRide() { + daCanoe_c* canoe = (daCanoe_c*)mRideAcKeep.getActor(); + if (canoe == NULL) { + return checkNextAction(0); + } + + mDoMtx_multVec(canoe->getModelMtx(), &field_0x37c8, ¤t.pos); + + if (mUnderFrameCtrl[0].checkAnmEnd()) { + procCanoeWaitInit(1); + } + + return 1; } -#pragma pop /* 800F4DF8-800F5048 0EF738 0250+00 2/2 0/0 0/0 .text procCanoeGetOffInit__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeGetOffInit() { +asm int daAlink_c::procCanoeGetOffInit() { nofralloc #include "asm/d/a/d_a_alink/procCanoeGetOffInit__9daAlink_cFv.s" } @@ -293,7 +373,7 @@ asm void daAlink_c::procCanoeGetOffInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeGetOff() { +asm int daAlink_c::procCanoeGetOff() { nofralloc #include "asm/d/a/d_a_alink/procCanoeGetOff__9daAlink_cFv.s" } @@ -304,7 +384,7 @@ asm void daAlink_c::procCanoeGetOff() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeWaitInit(int param_0) { +asm int daAlink_c::procCanoeWaitInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procCanoeWaitInit__9daAlink_cFi.s" } @@ -314,7 +394,7 @@ asm void daAlink_c::procCanoeWaitInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeWait() { +asm int daAlink_c::procCanoeWait() { nofralloc #include "asm/d/a/d_a_alink/procCanoeWait__9daAlink_cFv.s" } @@ -324,7 +404,7 @@ asm void daAlink_c::procCanoeWait() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeRowInit(int param_0) { +asm int daAlink_c::procCanoeRowInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procCanoeRowInit__9daAlink_cFi.s" } @@ -334,7 +414,7 @@ asm void daAlink_c::procCanoeRowInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeRow() { +asm int daAlink_c::procCanoeRow() { nofralloc #include "asm/d/a/d_a_alink/procCanoeRow__9daAlink_cFv.s" } @@ -344,7 +424,7 @@ asm void daAlink_c::procCanoeRow() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoePaddleShiftInit(int param_0) { +asm int daAlink_c::procCanoePaddleShiftInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procCanoePaddleShiftInit__9daAlink_cFi.s" } @@ -355,7 +435,7 @@ asm void daAlink_c::procCanoePaddleShiftInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoePaddleShift() { +asm int daAlink_c::procCanoePaddleShift() { nofralloc #include "asm/d/a/d_a_alink/procCanoePaddleShift__9daAlink_cFv.s" } @@ -365,7 +445,7 @@ asm void daAlink_c::procCanoePaddleShift() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoePaddlePutInit(int param_0) { +asm int daAlink_c::procCanoePaddlePutInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procCanoePaddlePutInit__9daAlink_cFi.s" } @@ -375,7 +455,7 @@ asm void daAlink_c::procCanoePaddlePutInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoePaddlePut() { +asm int daAlink_c::procCanoePaddlePut() { nofralloc #include "asm/d/a/d_a_alink/procCanoePaddlePut__9daAlink_cFv.s" } @@ -385,7 +465,7 @@ asm void daAlink_c::procCanoePaddlePut() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoePaddleGrabInit() { +asm int daAlink_c::procCanoePaddleGrabInit() { nofralloc #include "asm/d/a/d_a_alink/procCanoePaddleGrabInit__9daAlink_cFv.s" } @@ -396,7 +476,7 @@ asm void daAlink_c::procCanoePaddleGrabInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoePaddleGrab() { +asm int daAlink_c::procCanoePaddleGrab() { nofralloc #include "asm/d/a/d_a_alink/procCanoePaddleGrab__9daAlink_cFv.s" } @@ -407,7 +487,7 @@ asm void daAlink_c::procCanoePaddleGrab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeRodGrabInit() { +asm int daAlink_c::procCanoeRodGrabInit() { nofralloc #include "asm/d/a/d_a_alink/procCanoeRodGrabInit__9daAlink_cFv.s" } @@ -417,7 +497,7 @@ asm void daAlink_c::procCanoeRodGrabInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeRodGrab() { +asm int daAlink_c::procCanoeRodGrab() { nofralloc #include "asm/d/a/d_a_alink/procCanoeRodGrab__9daAlink_cFv.s" } @@ -427,7 +507,7 @@ asm void daAlink_c::procCanoeRodGrab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeFishingWaitInit() { +asm int daAlink_c::procCanoeFishingWaitInit() { nofralloc #include "asm/d/a/d_a_alink/procCanoeFishingWaitInit__9daAlink_cFv.s" } @@ -438,7 +518,7 @@ asm void daAlink_c::procCanoeFishingWaitInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeFishingWait() { +asm int daAlink_c::procCanoeFishingWait() { nofralloc #include "asm/d/a/d_a_alink/procCanoeFishingWait__9daAlink_cFv.s" } @@ -448,7 +528,7 @@ asm void daAlink_c::procCanoeFishingWait() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeFishingReelInit() { +asm int daAlink_c::procCanoeFishingReelInit() { nofralloc #include "asm/d/a/d_a_alink/procCanoeFishingReelInit__9daAlink_cFv.s" } @@ -459,7 +539,7 @@ asm void daAlink_c::procCanoeFishingReelInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeFishingReel() { +asm int daAlink_c::procCanoeFishingReel() { nofralloc #include "asm/d/a/d_a_alink/procCanoeFishingReel__9daAlink_cFv.s" } @@ -469,7 +549,7 @@ asm void daAlink_c::procCanoeFishingReel() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeFishingGetInit() { +asm int daAlink_c::procCanoeFishingGetInit() { nofralloc #include "asm/d/a/d_a_alink/procCanoeFishingGetInit__9daAlink_cFv.s" } @@ -480,7 +560,7 @@ asm void daAlink_c::procCanoeFishingGetInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeFishingGet() { +asm int daAlink_c::procCanoeFishingGet() { nofralloc #include "asm/d/a/d_a_alink/procCanoeFishingGet__9daAlink_cFv.s" } @@ -490,7 +570,7 @@ asm void daAlink_c::procCanoeFishingGet() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeSubjectivityInit() { +asm int daAlink_c::procCanoeSubjectivityInit() { nofralloc #include "asm/d/a/d_a_alink/procCanoeSubjectivityInit__9daAlink_cFv.s" } @@ -501,7 +581,7 @@ asm void daAlink_c::procCanoeSubjectivityInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeSubjectivity() { +asm int daAlink_c::procCanoeSubjectivity() { nofralloc #include "asm/d/a/d_a_alink/procCanoeSubjectivity__9daAlink_cFv.s" } @@ -511,7 +591,7 @@ asm void daAlink_c::procCanoeSubjectivity() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeBowSubjectInit() { +asm int daAlink_c::procCanoeBowSubjectInit() { nofralloc #include "asm/d/a/d_a_alink/procCanoeBowSubjectInit__9daAlink_cFv.s" } @@ -522,7 +602,7 @@ asm void daAlink_c::procCanoeBowSubjectInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeBowSubject() { +asm int daAlink_c::procCanoeBowSubject() { nofralloc #include "asm/d/a/d_a_alink/procCanoeBowSubject__9daAlink_cFv.s" } @@ -533,7 +613,7 @@ asm void daAlink_c::procCanoeBowSubject() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeBowMoveInit() { +asm int daAlink_c::procCanoeBowMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procCanoeBowMoveInit__9daAlink_cFv.s" } @@ -543,7 +623,7 @@ asm void daAlink_c::procCanoeBowMoveInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeBowMove() { +asm int daAlink_c::procCanoeBowMove() { nofralloc #include "asm/d/a/d_a_alink/procCanoeBowMove__9daAlink_cFv.s" } @@ -554,7 +634,7 @@ asm void daAlink_c::procCanoeBowMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeGrabMoveInit() { +asm int daAlink_c::procCanoeGrabMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procCanoeGrabMoveInit__9daAlink_cFv.s" } @@ -564,7 +644,7 @@ asm void daAlink_c::procCanoeGrabMoveInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeGrabMove() { +asm int daAlink_c::procCanoeGrabMove() { nofralloc #include "asm/d/a/d_a_alink/procCanoeGrabMove__9daAlink_cFv.s" } @@ -575,7 +655,7 @@ asm void daAlink_c::procCanoeGrabMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeBoomerangSubjectInit() { +asm int daAlink_c::procCanoeBoomerangSubjectInit() { nofralloc #include "asm/d/a/d_a_alink/procCanoeBoomerangSubjectInit__9daAlink_cFv.s" } @@ -585,7 +665,7 @@ asm void daAlink_c::procCanoeBoomerangSubjectInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeBoomerangSubject() { +asm int daAlink_c::procCanoeBoomerangSubject() { nofralloc #include "asm/d/a/d_a_alink/procCanoeBoomerangSubject__9daAlink_cFv.s" } @@ -595,7 +675,7 @@ asm void daAlink_c::procCanoeBoomerangSubject() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeBoomerangMoveInit() { +asm int daAlink_c::procCanoeBoomerangMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procCanoeBoomerangMoveInit__9daAlink_cFv.s" } @@ -605,7 +685,7 @@ asm void daAlink_c::procCanoeBoomerangMoveInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeBoomerangMove() { +asm int daAlink_c::procCanoeBoomerangMove() { nofralloc #include "asm/d/a/d_a_alink/procCanoeBoomerangMove__9daAlink_cFv.s" } @@ -616,7 +696,7 @@ asm void daAlink_c::procCanoeBoomerangMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeHookshotSubjectInit() { +asm int daAlink_c::procCanoeHookshotSubjectInit() { nofralloc #include "asm/d/a/d_a_alink/procCanoeHookshotSubjectInit__9daAlink_cFv.s" } @@ -626,7 +706,7 @@ asm void daAlink_c::procCanoeHookshotSubjectInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeHookshotSubject() { +asm int daAlink_c::procCanoeHookshotSubject() { nofralloc #include "asm/d/a/d_a_alink/procCanoeHookshotSubject__9daAlink_cFv.s" } @@ -636,7 +716,7 @@ asm void daAlink_c::procCanoeHookshotSubject() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeHookshotMoveInit() { +asm int daAlink_c::procCanoeHookshotMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procCanoeHookshotMoveInit__9daAlink_cFv.s" } @@ -647,7 +727,7 @@ asm void daAlink_c::procCanoeHookshotMoveInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeHookshotMove() { +asm int daAlink_c::procCanoeHookshotMove() { nofralloc #include "asm/d/a/d_a_alink/procCanoeHookshotMove__9daAlink_cFv.s" } @@ -657,7 +737,7 @@ asm void daAlink_c::procCanoeHookshotMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeBottleDrinkInit(u16 param_0) { +asm int daAlink_c::procCanoeBottleDrinkInit(u16 param_0) { nofralloc #include "asm/d/a/d_a_alink/procCanoeBottleDrinkInit__9daAlink_cFUs.s" } @@ -668,7 +748,7 @@ asm void daAlink_c::procCanoeBottleDrinkInit(u16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeBottleDrink() { +asm int daAlink_c::procCanoeBottleDrink() { nofralloc #include "asm/d/a/d_a_alink/procCanoeBottleDrink__9daAlink_cFv.s" } @@ -678,7 +758,7 @@ asm void daAlink_c::procCanoeBottleDrink() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeKandelaarPourInit() { +asm int daAlink_c::procCanoeKandelaarPourInit() { nofralloc #include "asm/d/a/d_a_alink/procCanoeKandelaarPourInit__9daAlink_cFv.s" } @@ -688,7 +768,7 @@ asm void daAlink_c::procCanoeKandelaarPourInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCanoeKandelaarPour() { +asm int daAlink_c::procCanoeKandelaarPour() { nofralloc #include "asm/d/a/d_a_alink/procCanoeKandelaarPour__9daAlink_cFv.s" } @@ -709,7 +789,7 @@ asm void daAlink_c::setGroundFishingRodActor() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procFishingCastInit() { +asm int daAlink_c::procFishingCastInit() { nofralloc #include "asm/d/a/d_a_alink/procFishingCastInit__9daAlink_cFv.s" } @@ -719,7 +799,7 @@ asm void daAlink_c::procFishingCastInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procFishingCast() { +asm int daAlink_c::procFishingCast() { nofralloc #include "asm/d/a/d_a_alink/procFishingCast__9daAlink_cFv.s" } @@ -730,7 +810,7 @@ asm void daAlink_c::procFishingCast() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procFishingFoodInit() { +asm int daAlink_c::procFishingFoodInit() { nofralloc #include "asm/d/a/d_a_alink/procFishingFoodInit__9daAlink_cFv.s" } @@ -740,7 +820,7 @@ asm void daAlink_c::procFishingFoodInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procFishingFood() { +asm int daAlink_c::procFishingFood() { nofralloc #include "asm/d/a/d_a_alink/procFishingFood__9daAlink_cFv.s" } diff --git a/src/d/a/d_a_alink_copyrod.inc b/src/d/a/d_a_alink_copyrod.inc index 6c4044c00f7..1a847756e30 100644 --- a/src/d/a/d_a_alink_copyrod.inc +++ b/src/d/a/d_a_alink_copyrod.inc @@ -1,3 +1,5 @@ +#include "rel/d/a/d_a_cstatue/d_a_cstatue.h" + /* 800E12E0-800E1310 0DBC20 0030+00 1/1 0/0 0/0 .text checkLv6BossRoom__9daAlink_cFv */ BOOL daAlink_c::checkLv6BossRoom() { return checkStageName("D_MN06A"); @@ -44,26 +46,18 @@ fopAc_ac_c* daAlink_c::getCopyRodCameraActor() { } /* 800E13AC-800E1408 0DBCEC 005C+00 2/2 0/0 0/0 .text initCopyRodUpperAnimeSpeed__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initCopyRodUpperAnimeSpeed(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/initCopyRodUpperAnimeSpeed__9daAlink_cFi.s" -} -#pragma pop - -/* void daAlink_c::initCopyRodUpperAnimeSpeed(int param_0) { - if (checkCopyRodThrowAnime()) { - if (param_1 == 0) { - mUpperFrameCtrl[2].setRate(); +void daAlink_c::initCopyRodUpperAnimeSpeed(int param_0) { + if (!checkCopyRodThrowAnime()) { + if (param_0) { + f32 tmp_0 = FLOAT_LABEL(lit_6108); + mUpperFrameCtrl[2].setRate(tmp_0); + mUpperFrameCtrl[2].setFrame(tmp_0); + getNowAnmPackUpper(UPPER_2)->setFrame(tmp_0); + } else { + mUpperFrameCtrl[2].setRate(daAlinkHIO_boom_c0::m.mIdleAnmSpeed); } - f32 tmp = FLOAT_LABEL(lit_6108); - mUpperFrameCtrl[2].setRate(tmp); - mUpperFrameCtrl[2].setFrame(tmp); - } -} */ +} /* 800E1408-800E145C 0DBD48 0054+00 2/2 0/0 0/0 .text checkForestOldCentury__9daAlink_cFv */ @@ -72,24 +66,17 @@ BOOL daAlink_c::checkForestOldCentury() { } /* 800E145C-800E1530 0DBD9C 00D4+00 1/0 0/0 0/0 .text checkCopyRodTopUse__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkCopyRodTopUse() { - nofralloc -#include "asm/d/a/d_a_alink/checkCopyRodTopUse__9daAlink_cFv.s" +BOOL daAlink_c::checkCopyRodTopUse() { + // Event flag 0x2580: Dominion Rod power restored + return (i_dComIfGs_isEventBit(0x2580) && !(mProcID == PROC_UNEQUIP && field_0x300e != 0)) || + i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x15 || + checkForestOldCentury(); } -#pragma pop /* 800E1530-800E158C 0DBE70 005C+00 4/4 0/0 0/0 .text checkCopyRodAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCopyRodAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCopyRodAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkCopyRodAnime() const { + return checkCopyRodReadyAnime() || checkCopyRodThrowAnime(); } -#pragma pop /* 800E158C-800E15FC 0DBECC 0070+00 2/2 0/0 0/0 .text setCopyRodControllAnime__9daAlink_cFv */ void daAlink_c::setCopyRodControllAnime() { @@ -121,49 +108,42 @@ void daAlink_c::setCopyRodModel() { mDoExt_setCurrentHeap(heap); field_0x0724->setFrame(FLOAT_LABEL(lit_6108)); field_0x2f94 = 2; - field_0x122C[0].SetAtSpl(dCcG_At_Spl_UNK_0); - field_0x122C[0].SetAtAtp(0); - field_0x122C[0].SetAtSe(20); - field_0x122C[0].SetAtHitMark(1); - field_0x122C[0].OnAtSetBit(); - field_0x122C[0].SetAtHitCallback(NULL); - field_0x122C[0].SetAtMtrl(0); + mAtCps[0].SetAtSpl(dCcG_At_Spl_UNK_0); + mAtCps[0].SetAtAtp(0); + mAtCps[0].SetAtSe(20); + mAtCps[0].SetAtHitMark(1); + mAtCps[0].OnAtSetBit(); + mAtCps[0].SetAtHitCallback(NULL); + mAtCps[0].SetAtMtrl(0); mHeldItemModel->i_setBaseTRMtx(mpLinkModel->i_getAnmMtx(field_0x30c0)); mHeldItemModel->calc(); } /* 800E1840-800E191C 0DC180 00DC+00 2/2 0/0 0/0 .text setCopyRodReadyAnime__9daAlink_cFv */ -// regalloc -#ifdef NONMATCHING +#pragma push +#pragma optimization_level 2 void daAlink_c::setCopyRodReadyAnime() { - f32 tmp; + f32 speed; if (i_checkAttentionLock()) { - tmp = daAlinkHIO_boom_c0::m.valc; + speed = daAlinkHIO_boom_c0::m.mIdleAnmSpeed; } else { - tmp = FLOAT_LABEL(lit_6108); + speed = FLOAT_LABEL(lit_6108); } - setUpperAnimeBaseSpeed(0x54, tmp, lit_6109); + setUpperAnimeBaseSpeed(0x54, speed, lit_6109); + if (checkCopyRodTopUse()) { seStartSwordCut(Z2SE_AL_COPYROD_READY); } else { seStartSwordCut(Z2SE_AL_COPYROD_READY_OFF); } - field_0x122C[0].SetR(lit_8676); - field_0x122C[0].SetAtType(0x1000000); + + mAtCps[0].SetR(lit_8676); + mAtCps[0].SetAtType(0x1000000); initLockAt(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCopyRodReadyAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setCopyRodReadyAnime__9daAlink_cFv.s" -} #pragma pop -#endif /* 800E191C-800E1A30 0DC25C 0114+00 1/1 0/0 0/0 .text throwCopyRod__9daAlink_cFv */ void daAlink_c::throwCopyRod() { @@ -193,147 +173,276 @@ void daAlink_c::throwCopyRod() { } /* 800E1A30-800E1ADC 0DC370 00AC+00 0/0 0/0 1/1 .text returnCopyRod__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::returnCopyRod() { - nofralloc -#include "asm/d/a/d_a_alink/returnCopyRod__9daAlink_cFv.s" -} -#pragma pop - -/* void daAlink_c::returnCopyRod() { +int daAlink_c::returnCopyRod() { i_offNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); - if (mEquipItem == 0x46) { + int var_r31; + if (mEquipItem == COPY_ROD) { mItemAcKeep = mCopyRodAcKeep; i_onNoResetFlg0(FLG0_UNK_20); - cXyz tmp(0, 1, 0); - dComIfGp_getVibration().StartShock(1, 1, tmp); + var_r31 = 1; + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + dComIfGp_getVibration().StartShock(1, 1, cXyz(tmp_0, lit_6040, tmp_0)); + } else { + var_r31 = 0; } + mCopyRodAcKeep.clearData(); -} */ + return var_r31; +} /* 800E1ADC-800E1BB4 0DC41C 00D8+00 2/2 0/0 0/0 .text checkUpperItemActionCopyRod__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUpperItemActionCopyRod() { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperItemActionCopyRod__9daAlink_cFv.s" +BOOL daAlink_c::checkUpperItemActionCopyRod() { + if (field_0x3018 != 0) { + field_0x3018--; + } + + if (checkReadyItem() && !itemButton() && checkCopyRodReadyAnime()) { + setUpperAnimeParam(0x53, UPPER_2, &daAlinkHIO_boom_c0::m.mThrowAnm); + mSearchBallScale = getCopyRodBallDisMax(); + + if (!mSight.getLockFlg()) { + mSearchBallScale -= lit_7308; + } + + return true; + } + + return cancelUpperItemReadyAnime(0); } -#pragma pop /* 800E1BB4-800E1C44 0DC4F4 0090+00 1/1 0/0 0/0 .text checkUpperItemActionCopyRodFly__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUpperItemActionCopyRodFly() { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperItemActionCopyRodFly__9daAlink_cFv.s" +void daAlink_c::checkUpperItemActionCopyRodFly() { + if (mCopyRodAcKeep.getActor() == NULL) { + if (checkCopyRodReadyAnime()) { + checkUpperItemActionCopyRod(); + } else if (checkReadyItem() && itemTrigger()) { + setCopyRodReadyAnime(); + } + } } -#pragma pop /* 800E1C44-800E1D6C 0DC584 0128+00 2/2 0/0 0/0 .text checkNextActionCopyRod__9daAlink_cFv */ #pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionCopyRod() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionCopyRod__9daAlink_cFv.s" +#pragma optimization_level 2 +int daAlink_c::checkNextActionCopyRod() { + if ((checkBoomerangCatchAnime() && + mUpperFrameCtrl[2].getFrame() <= daAlinkHIO_boom_c0::m.mCatchAnm.mCheckFrame) || + i_checkNoResetFlg1(FLG1_UNK_10000)) { + return 0; + } + + if (mFastShotTime != 0) { + mFastShotTime--; + } + + if (!checkCopyRodAnime()) { + setCopyRodReadyAnime(); + setFastShotTimer(); + + if (!i_checkAttentionLock()) { + field_0x2fe4 = shape_angle.y; + } + } + + if (!i_checkAttentionLock() && mFastShotTime == 0) { + return procCopyRodSubjectInit(); + } + + return procCopyRodMoveInit(); } #pragma pop /* 800E1D6C-800E1E20 0DC6AC 00B4+00 1/1 0/0 0/0 .text setCopyRodSight__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCopyRodSight() { - nofralloc -#include "asm/d/a/d_a_alink/setCopyRodSight__9daAlink_cFv.s" +void daAlink_c::setCopyRodSight() { + if (mItemAcKeep.getActor() && !checkCopyRodThrowAnime()) { + cXyz sight_pos; + + checkSightLine(getCopyRodBallDisMax(), &sight_pos); + mSight.setPos(&sight_pos); + mSight.onDrawFlg(); + + if (mAtCps[0].ChkAtHit()) { + mSight.onLockFlg(); + } else { + mSight.offLockFlg(); + } + } } -#pragma pop /* 800E1E20-800E1EB0 0DC760 0090+00 1/1 0/0 0/0 .text procCopyRodSubjectInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCopyRodSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCopyRodSubjectInit__9daAlink_cFv.s" +int daAlink_c::procCopyRodSubjectInit() { + if (!commonProcInitNotSameProc(PROC_COPY_ROD_SUBJECT)) { + return 0; + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + initCopyRodUpperAnimeSpeed(1); + setSingleAnimeBaseSpeed(ANM_ATN_WAIT_RIGHT, FLOAT_LABEL(lit_6108), daAlinkHIO_boom_c0::m.mStartInterpolation); + + dComIfGp_setPlayerStatus0(0, 0x80); + current.angle.y = shape_angle.y; + return 1; } -#pragma pop /* 800E1EB0-800E1F68 0DC7F0 00B8+00 1/0 0/0 0/0 .text procCopyRodSubject__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCopyRodSubject() { - nofralloc -#include "asm/d/a/d_a_alink/procCopyRodSubject__9daAlink_cFv.s" +int daAlink_c::procCopyRodSubject() { + if (!checkItemActorPointer()) { + return 1; + } + + if (checkCopyRodReadyAnime()) { + setDoStatus(0x12); + } + + setShapeAngleToAtnActor(0); + + if (!checkNextAction(0)) { + if (setBodyAngleToCamera()) { + setCopyRodSight(); + } + } else { + mSight.offDrawFlg(); + } + + return 1; } -#pragma pop /* 800E1F68-800E1FFC 0DC8A8 0094+00 1/1 0/0 0/0 .text procCopyRodMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCopyRodMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCopyRodMoveInit__9daAlink_cFv.s" +int daAlink_c::procCopyRodMoveInit() { + if (!commonProcInitNotSameProc(PROC_COPY_ROD_MOVE)) { + return 0; + } + + if (checkZeroSpeedF()) { + onModeFlg(1); + } + + initCopyRodUpperAnimeSpeed(0); + setBlendAtnMoveAnime(daAlinkHIO_boom_c0::m.mStartInterpolation); + + dComIfGp_setPlayerStatus0(0, 0x80); + return 1; } -#pragma pop /* 800E1FFC-800E20C8 0DC93C 00CC+00 1/0 0/0 0/0 .text procCopyRodMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCopyRodMove() { - nofralloc -#include "asm/d/a/d_a_alink/procCopyRodMove__9daAlink_cFv.s" +int daAlink_c::procCopyRodMove() { + if (!checkItemActorPointer()) { + return 1; + } + + if (!checkNextAction(0)) { + f32 var_f31 = lit_6041; + + if (checkZeroSpeedF()) { + onModeFlg(1); + + if (field_0x2f98 != 3) { + field_0x2f98 = 3; + var_f31 = daAlinkHIO_basic_c0::m.mAnmBlendFactor; + } + } else { + offModeFlg(1); + } + + setBlendAtnMoveAnime(var_f31); + setBodyAngleXReadyAnime(0); + } + + return 1; } -#pragma pop /* 800E20C8-800E21FC 0DCA08 0134+00 1/1 0/0 0/0 .text procCopyRodSwingInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCopyRodSwingInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCopyRodSwingInit__9daAlink_cFv.s" +int daAlink_c::procCopyRodSwingInit() { + commonProcInit(PROC_COPY_ROD_SWING); + daCstatue_c* statue = (daCstatue_c*)getCopyRodControllActor(); + + if (statue != NULL && ((fopAcM_GetName(statue) == PROC_CSTATUE && !statue->checkNotSmallType()) || fopAcM_GetName(statue) != PROC_CSTATUE)) { + setSingleAnimeParam(ANM_COPYROD_SWING_LARGE, &daAlinkHIO_copyRod_c0::m.mBigSwingAnm); + field_0x3478 = lit_8781; + field_0x347c = lit_13382; + field_0x3480 = daAlinkHIO_copyRod_c0::m.mBigSwingAnm.mCheckFrame; + field_0x3484 = lit_7807; + } else { + setSingleAnimeParam(ANM_COPYROD_SWING, &daAlinkHIO_copyRod_c0::m.mSwingAnm); + field_0x3478 = lit_7450; + field_0x347c = lit_8783; + field_0x3480 = daAlinkHIO_copyRod_c0::m.mSwingAnm.mCheckFrame; + field_0x3484 = lit_8130; + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + current.angle.y = shape_angle.y; + mCommonCounter = 1; + field_0x300e = 0; + + voiceStart(Z2SE_AL_V_ATTACK_S); + mAtCps[0].SetR(lit_11442); + mAtCps[0].SetAtType(AT_TYPE_COPY_ROD); + cancelLockAt(); + return 1; } -#pragma pop /* 800E21FC-800E2308 0DCB3C 010C+00 1/0 0/0 0/0 .text procCopyRodSwing__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCopyRodSwing() { - nofralloc -#include "asm/d/a/d_a_alink/procCopyRodSwing__9daAlink_cFv.s" +int daAlink_c::procCopyRodSwing() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + mCommonCounter = 0; + + if (frameCtrl->checkAnmEnd()) { + setCopyRodControllAnime(); + checkNextAction(0); + } else if (frameCtrl->getFrame() > field_0x3480 && checkNextAction(1)) { + if (i_checkModeFlg(0x1000)) { + setCopyRodControllAnime(); + } + } else if (frameCtrl->getFrame() >= field_0x3478 && frameCtrl->getFrame() < field_0x347c) { + if (field_0x300e == 0) { + seStartSwordCut(Z2SE_AL_COPYROD_SWING); + } + + field_0x300e = 1; + if (changeCutReverseProc(ANM_CUT_RECOIL_A)) { + return 1; + } + } else { + field_0x300e = 0; + } + + return 1; } -#pragma pop /* 800E2308-800E23A4 0DCC48 009C+00 1/0 0/0 0/0 .text procCopyRodReviveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCopyRodReviveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCopyRodReviveInit__9daAlink_cFv.s" +int daAlink_c::procCopyRodReviveInit() { + if (!commonProcInitNotSameProc(PROC_COPY_ROD_REVIVE)) { + return 1; + } + + if (mDemo.getParam0() == 0) { + if (mEquipItem != COPY_ROD) { + deleteEquipItem(0, 0); + mEquipItem = COPY_ROD; + setCopyRodModel(); + } + field_0x0724->setFrame(FLOAT_LABEL(lit_6108)); + } + + setSingleAnimeBase(ANM_GET_MASTER_SWORD); + mNormalSpeed = FLOAT_LABEL(lit_6108); + return 1; } -#pragma pop /* 800E23A4-800E23FC 0DCCE4 0058+00 1/0 0/0 0/0 .text procCopyRodRevive__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCopyRodRevive() { - nofralloc -#include "asm/d/a/d_a_alink/procCopyRodRevive__9daAlink_cFv.s" -} -#pragma pop \ No newline at end of file +int daAlink_c::procCopyRodRevive() { + simpleAnmPlay(field_0x0724); + + if (mUnderFrameCtrl[0].checkAnmEnd()) { + dComIfGp_evmng_cutEnd(field_0x3184); + } + + return 1; +} \ No newline at end of file diff --git a/src/d/a/d_a_alink_crawl.inc b/src/d/a/d_a_alink_crawl.inc index 8ca8b73d66e..fa8986da387 100644 --- a/src/d/a/d_a_alink_crawl.inc +++ b/src/d/a/d_a_alink_crawl.inc @@ -161,7 +161,7 @@ asm void daAlink_c::setCrawlAutoMoveAimPos() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCrawlStartInit() { +asm int daAlink_c::procCrawlStartInit() { nofralloc #include "asm/d/a/d_a_alink/procCrawlStartInit__9daAlink_cFv.s" } @@ -171,7 +171,7 @@ asm void daAlink_c::procCrawlStartInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCrawlStart() { +asm int daAlink_c::procCrawlStart() { nofralloc #include "asm/d/a/d_a_alink/procCrawlStart__9daAlink_cFv.s" } @@ -181,7 +181,7 @@ asm void daAlink_c::procCrawlStart() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCrawlMoveInit(s16 param_0, s16 param_1) { +asm int daAlink_c::procCrawlMoveInit(s16 param_0, s16 param_1) { nofralloc #include "asm/d/a/d_a_alink/procCrawlMoveInit__9daAlink_cFss.s" } @@ -191,7 +191,7 @@ asm void daAlink_c::procCrawlMoveInit(s16 param_0, s16 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCrawlMove() { +asm int daAlink_c::procCrawlMove() { nofralloc #include "asm/d/a/d_a_alink/procCrawlMove__9daAlink_cFv.s" } @@ -201,7 +201,7 @@ asm void daAlink_c::procCrawlMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCrawlAutoMoveInit(int param_0, cXyz* param_1) { +asm int daAlink_c::procCrawlAutoMoveInit(int param_0, cXyz* param_1) { nofralloc #include "asm/d/a/d_a_alink/procCrawlAutoMoveInit__9daAlink_cFiP4cXyz.s" } @@ -211,7 +211,7 @@ asm void daAlink_c::procCrawlAutoMoveInit(int param_0, cXyz* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCrawlAutoMove() { +asm int daAlink_c::procCrawlAutoMove() { nofralloc #include "asm/d/a/d_a_alink/procCrawlAutoMove__9daAlink_cFv.s" } @@ -221,7 +221,7 @@ asm void daAlink_c::procCrawlAutoMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCrawlEndInit(int param_0, s16 param_1, s16 param_2) { +asm int daAlink_c::procCrawlEndInit(int param_0, s16 param_1, s16 param_2) { nofralloc #include "asm/d/a/d_a_alink/procCrawlEndInit__9daAlink_cFiss.s" } @@ -231,7 +231,7 @@ asm void daAlink_c::procCrawlEndInit(int param_0, s16 param_1, s16 param_2) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCrawlEnd() { +asm int daAlink_c::procCrawlEnd() { nofralloc #include "asm/d/a/d_a_alink/procCrawlEnd__9daAlink_cFv.s" } diff --git a/src/d/a/d_a_alink_cut.inc b/src/d/a/d_a_alink_cut.inc index 630267549c5..1521bfc777c 100644 --- a/src/d/a/d_a_alink_cut.inc +++ b/src/d/a/d_a_alink_cut.inc @@ -11,14 +11,19 @@ static asm void daAlink_searchNightStalker(fopAc_ac_c* param_0, void* param_1) { /* 800D0E08-800D0E98 0CB748 0090+00 1/1 0/0 0/0 .text checkLightSwordMtrl__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkLightSwordMtrl() { - nofralloc -#include "asm/d/a/d_a_alink/checkLightSwordMtrl__9daAlink_cFv.s" +void daAlink_c::checkLightSwordMtrl() { + if (checkLightMasterSwordEquip()) { + stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); + + if (i_dStage_stagInfo_GetSaveTbl(stag_info) == 0x17 || + fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchNightStalker, NULL)) { + i_onNoResetFlg3(FLG3_UNK_100000); + return; + } + } + + i_offNoResetFlg3(FLG3_UNK_100000); } -#pragma pop /* 800D0E98-800D0ECC 0CB7D8 0034+00 5/5 0/0 0/0 .text checkSwordEquipAnime__9daAlink_cCFv */ @@ -51,6 +56,7 @@ void daAlink_c::initCutTurnAt(f32 param_0, int param_1) { field_0xFB8.SetAtHitMark(3); field_0xFB8.SetAtSe(1); field_0xFB8.SetAtAtp(param_1); + u8 mtrl; if (!i_checkNoResetFlg3(FLG3_UNK_100000)) { mtrl = 0; @@ -64,20 +70,13 @@ void daAlink_c::initCutTurnAt(f32 param_0, int param_1) { /* 800D102C-800D1088 0CB96C 005C+00 2/2 0/0 0/0 .text checkCutFinishJumpUp__9daAlink_cFv */ -#ifdef NONMATCHING bool daAlink_c::checkCutFinishJumpUp() { - return checkCutBackState() && (!checkNotBattleStage() && swordSwingTrigger()); + if (checkCutBackState() && !checkNotBattleStage() && swordSwingTrigger()) { + return true; + } + + return false; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkCutFinishJumpUp() { - nofralloc -#include "asm/d/a/d_a_alink/checkCutFinishJumpUp__9daAlink_cFv.s" -} -#pragma pop -#endif /* 800D1088-800D10E0 0CB9C8 0058+00 2/2 0/0 0/0 .text changeCutFast__9daAlink_cFv */ void daAlink_c::changeCutFast() { @@ -127,19 +126,14 @@ void daAlink_c::offSwordModel() { /* 800D13AC-800D13E4 0CBCEC 0038+00 1/1 0/0 0/0 .text checkCutTypeNoBlur__9daAlink_cCFv */ BOOL daAlink_c::checkCutTypeNoBlur() const { - return mCutType == TYPE_CUT_STAB || mCutType == TYPE_CUT_STAB_COMBO || - mCutType == TYPE_CUT_STAB_FINISH || i_checkNoResetFlg0(FLG0_UNDERWATER); + return mCutType == CUT_TYPE_NM_STAB || mCutType == CUT_TYPE_COMBO_STAB || + mCutType == CUT_TYPE_FINISH_STAB || i_checkNoResetFlg0(FLG0_UNDERWATER); } /* 800D13E4-800D1424 0CBD24 0040+00 7/7 0/0 0/0 .text checkCutTurnInput__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkCutTurnInput() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCutTurnInput__9daAlink_cCFv.s" +bool daAlink_c::checkCutTurnInput() const { + return 0xF800 < abs(field_0x3180); } -#pragma pop /* 800D1424-800D1430 0CBD64 000C+00 7/7 0/0 0/0 .text getCutTurnDirection__9daAlink_cCFv */ @@ -157,12 +151,12 @@ void daAlink_c::resetCombo(int param_0) { } /* 800D1454-800D152C 0CBD94 00D8+00 1/1 0/0 0/0 .text checkComboCnt__9daAlink_cFv */ -// something with i_checkAttentionLock -#ifdef NONMATCHING +#pragma push +#pragma optimization_level 2 void daAlink_c::checkComboCnt() { if ((mEquipItem == EQUIP_SWORD && mComboCutCount == 2) && - (i_checkAttentionLock() && (field_0x122C[0].ChkAtHit() || field_0x122C[1].ChkAtHit() || - field_0x122C[2].ChkAtHit()))) { + (i_checkAttentionLock() && + (mAtCps[0].ChkAtHit() || mAtCps[1].ChkAtHit() || mAtCps[2].ChkAtHit()))) { i_onNoResetFlg0(FLG0_UNK_8000); } if (field_0x307e > 0) { @@ -171,16 +165,7 @@ void daAlink_c::checkComboCnt() { resetCombo(1); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkComboCnt() { - nofralloc -#include "asm/d/a/d_a_alink/checkComboCnt__9daAlink_cFv.s" -} #pragma pop -#endif /* 800D152C-800D1540 0CBE6C 0014+00 22/22 0/0 0/0 .text setCutType__9daAlink_cFUc */ void daAlink_c::setCutType(u8 type) { @@ -190,50 +175,141 @@ void daAlink_c::setCutType(u8 type) { /* 800D1540-800D1688 0CBE80 0148+00 8/8 0/0 0/0 .text * setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCylAtParam(u32 param_0, dCcG_At_Spl param_1, u8 param_2, u8 param_3, - int param_4, f32 param_5, f32 param_6) { - nofralloc -#include "asm/d/a/d_a_alink/setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff.s" +void daAlink_c::setCylAtParam(u32 i_AtType, dCcG_At_Spl i_spl, u8 i_hitMark, u8 i_AtSe, int i_atp, + f32 i_radius, f32 i_height) { + if (checkWoodSwordEquip() && (i_AtSe == 14 || i_AtSe == 1 || i_AtSe == 16)) { + i_AtSe = 5; + } + + u8 mtrl; + if (i_AtType & 2) { + if (i_checkNoResetFlg3(FLG3_UNK_100000)) { + mtrl = 4; + } else { + mtrl = 0; + } + } else if (mEquipItem == WATER_BOTTLE) { + mtrl = 6; + } else { + mtrl = 0; + } + + mAtCyl.SetAtType(i_AtType); + mAtCyl.SetAtSpl(i_spl); + mAtCyl.SetAtHitMark(i_hitMark); + mAtCyl.SetAtSe(i_AtSe); + mAtCyl.SetAtAtp(i_atp); + mAtCyl.SetR(i_radius); + mAtCyl.SetH(i_height); + mAtCyl.SetAtMtrl(mtrl); + + if (mProcID == PROC_GUARD_ATTACK) { + mAtCyl.OnAtNoHitMark(); + } else { + mAtCyl.OffAtNoHitMark(); + } + + if (i_checkWolf()) { + dCcD_Cyl* cyl = field_0x850; + for (int i = 0; i < 3; i++) { + cyl->SetAtType(i_AtType); + cyl->SetAtSpl(i_spl); + cyl->SetAtHitMark(i_hitMark); + cyl->SetAtSe(i_AtSe); + cyl->SetAtAtp(i_atp); + cyl++; + } + } } -#pragma pop /* 800D1688-800D1788 0CBFC8 0100+00 9/9 0/0 0/0 .text * setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSwordAtParam(dCcG_At_Spl param_0, u8 param_1, u8 param_2, int param_3, - f32 param_4, f32 param_5) { - nofralloc -#include "asm/d/a/d_a_alink/setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff.s" +void daAlink_c::setSwordAtParam(dCcG_At_Spl i_spl, u8 i_hitMark, u8 i_AtSe, int i_atp, f32 param_4, + f32 i_radius) { + dCcD_Cps* atCps = mAtCps; + u32 atType = getSwordAtType(); + mAtCps[0].OffAtNoHitMark(); + + if (checkWoodSwordEquip() && (i_AtSe == 14 || i_AtSe == 1 || i_AtSe == 16)) { + i_AtSe = 5; + } + + if (i_spl == 0) { + field_0x2fd0 = 0; + } else { + field_0x2fd0 = 1; + } + + u8 mtrl; + if (i_checkNoResetFlg3(FLG3_UNK_100000)) { + mtrl = 4; + } else { + mtrl = 0; + } + + for (int i = 0; i < 3; i++) { + atCps->SetAtSpl(i_spl); + atCps->SetAtHitMark(i_hitMark); + atCps->SetAtAtp(i_atp); + atCps->SetR(i_radius); + atCps->SetAtSe(i_AtSe); + atCps->SetAtMtrl(mtrl); + atCps->SetAtType(atType); + atCps++; + } + + field_0x33d0 = param_4; } -#pragma pop /* 800D1788-800D17EC 0CC0C8 0064+00 1/1 0/0 1/1 .text * notSwordHitVibActor__9daAlink_cFP10fopAc_ac_c */ -bool daAlink_c::notSwordHitVibActor(fopAc_ac_c* p_actor) { +BOOL daAlink_c::notSwordHitVibActor(fopAc_ac_c* p_actor) { if (p_actor != NULL && fopAcM_GetGroup(p_actor) == 4) { s16 name = fopAcM_GetName(p_actor); - if (!checkSpecialNpc(p_actor) && name != 0x108 && name != 0x240) { + + if (!checkSpecialNpc(p_actor) && name != PROC_NI && name != PROC_NPC_BLUENS) { return true; } } + return false; } /* 800D17EC-800D1920 0CC12C 0134+00 4/4 0/0 0/0 .text * setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSwordHitVibration(dCcD_GObjInf* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf.s" +BOOL daAlink_c::setSwordHitVibration(dCcD_GObjInf* i_gobj) { + if (i_gobj->ChkAtHit()) { + if (notSwordHitVibActor(i_gobj->GetAtHitAc())) { + return true; + } + + int var_r4; + if (i_checkWolf()) { + var_r4 = 3; + } else if (i_gobj->ChkAtShieldHit()) { + if (field_0x2fd0 == 1) { + var_r4 = 5; + } else if (field_0x2fd0 == 2) { + var_r4 = 2; + } else { + var_r4 = 3; + } + } else if (field_0x2fd0 == 2 || + (i_gobj->GetAtHitAc() != NULL && fopAcM_GetGroup(i_gobj->GetAtHitAc()) == 3)) { + var_r4 = 2; + } else if (field_0x2fd0 == 1) { + var_r4 = 4; + } else { + var_r4 = 2; + } + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + dComIfGp_getVibration().StartShock(var_r4, 31, cXyz(tmp_0, lit_6040, tmp_0)); + return true; + } + + return false; } -#pragma pop /* 800D1920-800D1978 0CC260 0058+00 3/3 0/0 0/0 .text checkAtShieldHit__9daAlink_cFR12dCcD_GObjInf */ @@ -260,14 +336,68 @@ asm BOOL daAlink_c::changeCutReverseProc(daAlink_c::daAlink_ANM param_0) { #pragma pop /* 800D1E1C-800D20B4 0CC75C 0298+00 4/4 0/0 0/0 .text setCutDash__9daAlink_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCutDash(int param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setCutDash__9daAlink_cFii.s" +void daAlink_c::setCutDash(int param_0, int param_1) { + if (!param_0 && i_checkNoResetFlg1(FLG1_UNK_4000000)) { + checkCutAction(); + } else { + field_0x2fce = 5; + resetCombo(0); + i_offNoResetFlg2(FLG2_UNK_2); + + setSwordAtParam(dCcG_At_Spl_UNK_0, 7, 16, 1, daAlinkHIO_cut_c0::m.mRunCutLength, + daAlinkHIO_cut_c0::m.mRunCutRadius); + field_0x2fd0 = 2; + mRunCutComboCount++; + + if (param_1) { + setUpperAnimeParam(0x82, UPPER_2, &daAlinkHIO_cutDaCharge_c0::m.mCutAnm); + + if (checkBoardRide()) { + setCutType(13); + } else { + setCutType(0x38); + } + + if (mRunCutComboCount == 3) { + mRunCutComboCount = 1; + } + } else if (mRunCutComboCount == 1 || mRunCutComboCount == 3) { + setUpperAnimeParam(0x80, UPPER_2, &daAlinkHIO_cutDaL_c0::m.mCutAnm); + + if (checkBoardRide()) { + setCutType(11); + } else if (mProcID == PROC_SIDESTEP) { + setCutType(CUT_TYPE_AIR); + } else { + setCutType(0x25); + } + + mRunCutComboCount = 1; + setFacePriTexture(FTANM_UNK_13); + } else { + setUpperAnimeParam(0x81, UPPER_2, &daAlinkHIO_cutDaR_c0::m.mCutAnm); + + if (checkBoardRide()) { + setCutType(12); + } else if (mProcID == PROC_SIDESTEP) { + setCutType(0x11); + } else { + setCutType(0x26); + } + + setFacePriTexture(FTANM_UNK_14); + } + + setFacePriBck(0x104); + field_0x2f96 = 2; + field_0x307e = daAlinkHIO_cut_c0::m.mComboDuration; + + setSwordVoiceSe(Z2SE_AL_V_ATTACK_RUN); + setCylAtParam(getSwordAtType(), dCcG_At_Spl_UNK_0, 7, 16, 1, lit_6895, lit_6896); + setCutWaterDropEffect(); + field_0x2fb7 = 0; + } } -#pragma pop /* 800D20B4-800D20FC 0CC9F4 0048+00 4/4 0/0 0/0 .text checkForceSwordSwing__9daAlink_cFv */ @@ -282,6 +412,7 @@ void daAlink_c::setComboReserb() { } else { field_0x307e = daAlinkHIO_cut_c0::m.mComboDuration; } + if (mComboCutCount != 4 && field_0x2fce == 0 && swordSwingTrigger()) { i_onNoResetFlg2(FLG2_UNK_2); } @@ -293,7 +424,7 @@ BOOL daAlink_c::checkComboReserb() { } /* 800D21D0-800D2284 0CCB10 00B4+00 1/1 0/0 0/0 .text commonCutAction__9daAlink_cFv */ -bool daAlink_c::commonCutAction() { +int daAlink_c::commonCutAction() { if (mComboCutCount == 4) { resetCombo(1); } @@ -308,16 +439,16 @@ bool daAlink_c::commonCutAction() { if (mComboCutCount > 1) { mComboCutCount = 1; } - return true; - } else { - return false; + return 1; } + + return 0; } /* 800D2284-800D22BC 0CCBC4 0038+00 13/13 0/0 0/0 .text setSwordVoiceSe__9daAlink_cFUl */ -void daAlink_c::setSwordVoiceSe(u32 sfx_id) { +void daAlink_c::setSwordVoiceSe(u32 i_seID) { if (!i_checkNoResetFlg0(FLG0_UNDERWATER)) { - voiceStart(sfx_id); + voiceStart(i_seID); } } @@ -326,6 +457,7 @@ void daAlink_c::setSwordVoiceSe(u32 sfx_id) { void daAlink_c::setSwordChargeVoiceSe() { if (mCommonCounter != 0) { mCommonCounter--; + if (mCommonCounter == 0) { setSwordVoiceSe(Z2SE_AL_V_TAME); } @@ -350,11 +482,59 @@ bool daAlink_c::checkCutTurnInputTrigger() { /* 800D23C0-800D2684 0CCD00 02C4+00 7/7 0/0 0/0 .text checkCutAction__9daAlink_cFv */ #pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutAction() { - nofralloc -#include "asm/d/a/d_a_alink/checkCutAction__9daAlink_cFv.s" +#pragma optimization_level 2 +int daAlink_c::checkCutAction() { + if (commonCutAction()) { + return 1; + } + + int cutDir = getCutDirection(); + + if (mComboCutCount == 4) { + if (i_checkNoResetFlg0(FLG0_UNK_1000000)) { + if (checkInputOnR() && (cutDir == DIR_FORWARD || cutDir == DIR_BACKWARD)) { + procCutFinishInit(3); + } else { + procCutFinishInit(4); + } + } else if (i_checkNoResetFlg0(FLG0_UNK_8000)) { + procCutFinishInit(hitFinishType[cutDir]); + } else if (i_checkAttentionLock()) { + procCutFinishInit(atnFinishType[cutDir]); + } else { + procCutFinishInit(finishType[cutDir]); + } + } else if (mComboCutCount == 3) { + if (i_checkNoResetFlg0(FLG0_UNK_8000)) { + if (cutDir == 0) { + procCutNormalInit(hitType[cutDir]); + } else { + procCutFinishInit(hitType[cutDir]); + } + } else if (i_checkAttentionLock()) { + procCutNormalInit(atnNormalType3[cutDir]); + } else { + procCutNormalInit(normalType3[cutDir]); + } + } else if (mProcID == PROC_CUT_NORMAL && field_0x300a != 4) { + if (field_0x300a == 2) { + procCutNormalInit(1); + } else { + procCutNormalInit(2); + } + } else if (i_checkAttentionLock()) { + if (mComboCutCount == 1) { + procCutNormalInit(atnNormalType1[cutDir]); + } else { + procCutNormalInit(atnNormalType2[cutDir]); + } + } else if (mComboCutCount == 1) { + procCutNormalInit(normalType1_6982[cutDir]); + } else { + procCutNormalInit(normalType2[cutDir]); + } + + return 1; } #pragma pop @@ -372,111 +552,138 @@ void daAlink_c::checkCutTurnCharge() { } /* 800D26EC-800D2760 0CD02C 0074+00 4/4 0/0 0/0 .text getCutDirection__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCutDirection() { - nofralloc -#include "asm/d/a/d_a_alink/getCutDirection__9daAlink_cFv.s" +int daAlink_c::getCutDirection() { + s16 angle; + + if (!checkInputOnR()) { + return DIR_NONE; + } + + if (mTargetedActor != NULL) { + angle = field_0x2fe2 - fopAcM_searchActorAngleY(this, mTargetedActor); + } else { + angle = field_0x2fe2 - field_0x2fe6; + } + + return getDirectionFromAngle(angle); } -#pragma pop /* 800D2760-800D27E4 0CD0A0 0084+00 4/4 0/0 0/0 .text checkCutCancelNextMode__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutCancelNextMode(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkCutCancelNextMode__9daAlink_cFi.s" +BOOL daAlink_c::checkCutCancelNextMode(int param_0) { + f32 old_speed = mNormalSpeed; + u8 old_2f98 = field_0x2f98; + + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x2f98 = param_0; + onModeFlg(4); + + if (checkNextAction(1)) { + return 1; + } + + mNormalSpeed = old_speed; + field_0x2f98 = old_2f98; + return 0; } -#pragma pop /* 800D27E4-800D2890 0CD124 00AC+00 4/4 0/0 0/0 .text checkDoCutAction__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkDoCutAction() { - nofralloc -#include "asm/d/a/d_a_alink/checkDoCutAction__9daAlink_cFv.s" +void daAlink_c::checkDoCutAction() { + // event flag 0x2A40: Learned Jump Strike + if (doButton() && (i_dComIfGs_isEventBit(0x2A40) || i_checkNoResetFlg3(FLG3_UNK_200))) { + procCutLargeJumpChargeInit(); + } else if (checkDownAttackState()) { + procCutDownInit(); + } else if (checkCutHeadState()) { + procCutHeadInit(); + } else { + procCutJumpInit(0); + } } -#pragma pop /* 800D2890-800D28F4 0CD1D0 0064+00 2/2 0/0 0/0 .text checkCutBackState__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkCutBackState() { - nofralloc -#include "asm/d/a/d_a_alink/checkCutBackState__9daAlink_cFv.s" +BOOL daAlink_c::checkCutBackState() { + // event flag 0x2902: Learned Backslice + return i_dComIfGs_isEventBit(0x2902) || i_checkNoResetFlg3(FLG3_UNK_20); } -#pragma pop /* 800D28F4-800D29D4 0CD234 00E0+00 6/6 0/0 0/0 .text checkCutHeadState__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutHeadState() { - nofralloc -#include "asm/d/a/d_a_alink/checkCutHeadState__9daAlink_cFv.s" +BOOL daAlink_c::checkCutHeadState() { + fopEn_enemy_c* temp_r27 = (fopEn_enemy_c*)mTargetedActor; + + // event flag 0x2901: Learned Helm Splitter + return ((!checkBootsOrArmorHeavy() && (temp_r27 != NULL) && + (i_dComIfGs_isEventBit(0x2901) || i_checkNoResetFlg3(FLG3_UNK_40))) && + fopAcM_GetGroup(temp_r27) == 2) && + temp_r27->checkHeadLockFlg(); } -#pragma pop /* 800D29D4-800D2ABC 0CD314 00E8+00 4/4 0/0 0/0 .text checkDownAttackState__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkDownAttackState() { - nofralloc -#include "asm/d/a/d_a_alink/checkDownAttackState__9daAlink_cFv.s" +BOOL daAlink_c::checkDownAttackState() { + fopEn_enemy_c* enemy = (fopEn_enemy_c*)mTargetedActor; + + if (enemy != NULL && + (fopAcM_GetGroup(enemy) == 2 && enemy->checkDownFlg() && + ((!i_checkWolf() && (i_dComIfGs_isEventBit(0x2904) || i_checkNoResetFlg3(FLG3_UNK_10)) && + enemy->getDownPos().abs2(current.pos) < lit_7174) || + (i_checkWolf() && + (fopAcM_GetName(mTargetedActor) == PROC_E_PO || + fopAcM_GetName(mTargetedActor) == PROC_E_HP) && + enemy->getDownPos().abs2(current.pos) < lit_7174)))) { + return true; + } + + return false; } -#pragma pop /* 800D2ABC-800D2B88 0CD3FC 00CC+00 1/1 1/1 0/0 .text checkCutLargeTurnState__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutLargeTurnState() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCutLargeTurnState__9daAlink_cCFv.s" +BOOL daAlink_c::checkCutLargeTurnState() const { + // event flag 0x2A20: Learned Great Spin + return ((i_dComIfGs_isEventBit(0x2A20) || i_checkNoResetFlg3(FLG3_UNK_100)) && + i_dComIfGs_getLife() == dComIfGs_getMaxLifeGauge()) || + (mDemo.getDemoMode() == 0x24 && mDemo.getParam0() == 0x33); } -#pragma pop /* 800D2B88-800D2BFC 0CD4C8 0074+00 2/2 0/0 0/0 .text cancelCutCharge__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::cancelCutCharge() { - nofralloc -#include "asm/d/a/d_a_alink/cancelCutCharge__9daAlink_cFv.s" +void daAlink_c::cancelCutCharge() { + if (mComboCutCount == 4) { + resetCombo(1); + checkNextAction(0); + } else { + mComboCutCount++; + + if (mComboCutCount <= 3) { + procCutNormalInit(2); + } else { + procCutFinishInit(1); + } + } } -#pragma pop /* 800D2BFC-800D2C54 0CD53C 0058+00 3/3 0/0 0/0 .text initCutAtnActorSearch__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initCutAtnActorSearch() { - nofralloc -#include "asm/d/a/d_a_alink/initCutAtnActorSearch__9daAlink_cFv.s" +void daAlink_c::initCutAtnActorSearch() { + if (cLib_distanceAngleS(getShapeAngleYAtnActor(), shape_angle.y) < 0x800) { + field_0x3010 = 1; + } else { + field_0x3010 = 0; + } + + field_0x32cc = (u32)mTargetedActor; } -#pragma pop /* 800D2C54-800D2C78 0CD594 0024+00 3/3 0/0 0/0 .text checkCutAtnActorChange__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutAtnActorChange() { - nofralloc -#include "asm/d/a/d_a_alink/checkCutAtnActorChange__9daAlink_cFv.s" +void daAlink_c::checkCutAtnActorChange() { + if (field_0x32cc != (u32)mTargetedActor) { + field_0x3010 = 0; + field_0x32cc = (u32)mTargetedActor; + } } -#pragma pop /* 800D2C78-800D2F58 0CD5B8 02E0+00 2/2 0/0 0/0 .text setCutJumpSpeed__9daAlink_cFi */ -// literals, and small issue with JMAFastSqrt instructions +// matches with literals #ifdef NONMATCHING -void daAlink_c::setCutJumpSpeed(int cut_type) { +void daAlink_c::setCutJumpSpeed(int i_airAt) { if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; mSpeed.y *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityY; @@ -484,12 +691,11 @@ void daAlink_c::setCutJumpSpeed(int cut_type) { mSpeed.y *= 1.35f; } - // cut_type 0 = standing jump attack - if (mTargetedActor != NULL && cut_type == 0) { - mCollisionRot.y = cLib_targetAngleY(¤t.pos, &mTargetedActor->mEyePos); - cXyz targetPos(mTargetedActor->mEyePos.x - (cM_ssin(mCollisionRot.y) * 70.0f), + if (mTargetedActor != NULL && !i_airAt) { + shape_angle.y = cLib_targetAngleY(¤t.pos, &mTargetedActor->mEyePos); + cXyz targetPos(mTargetedActor->mEyePos.x - (cM_ssin(shape_angle.y) * 70.0f), mTargetedActor->mEyePos.y + 50.0f, - mTargetedActor->mEyePos.z - (cM_scos(mCollisionRot.y) * 70.0f)); + mTargetedActor->mEyePos.z - (cM_scos(shape_angle.y) * 70.0f)); if (fopAcM_gc_c::gndCheck(&targetPos)) { targetPos.y = fopAcM_gc_c::getGroundY(); @@ -527,242 +733,891 @@ asm void daAlink_c::setCutJumpSpeed(int param_0) { /* 800D2F58-800D31B8 0CD898 0260+00 3/3 0/0 0/0 .text procCutNormalInit__9daAlink_cFi */ #pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutNormalInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCutNormalInit__9daAlink_cFi.s" +#pragma optimization_level 2 +int daAlink_c::procCutNormalInit(int i_type) { + const daAlink_cutParamTbl* cutParams = &cutParamTable_7312[i_type]; + + commonProcInit(PROC_CUT_NORMAL); + setCutType(cutParams->m_cutType); + field_0x3198 = cutParams->field_0x4; + + const daAlinkHIO_cutNormal_c1* cutData; + if (i_type == 1) { + cutData = &daAlinkHIO_cutNmL_c0::m; + } else if (i_type == 2) { + cutData = &daAlinkHIO_cutNmR_c0::m; + } else if (i_type == 4) { + cutData = &daAlinkHIO_cutNmSR_c0::m; + } else if (i_type == 3) { + cutData = &daAlinkHIO_cutNmSL_c0::m; + } else { + cutData = &daAlinkHIO_cutNmV_c0::m; + } + + field_0x3478 = cutData->mAttackStartFrame; + field_0x347c = cutData->mAttackEndFrame; + field_0x3480 = cutData->mSpeed; + + if (checkHeavyStateOn(1, 1)) { + field_0x3480 *= mHeavySpeedMultiplier; + } + + field_0x3484 = cutData->mCutAnm.mCheckFrame; + + f32 morf; + if (!checkZoraWearAbility() && i_checkNoResetFlg0(FLG0_UNDERWATER)) { + morf = cutParams->m_morf; + } else { + morf = cutData->mCutAnm.mInterpolation; + } + + setSingleAnime(cutParams->m_anmID, cutData->mCutAnm.mSpeed, cutData->mCutAnm.mStartFrame, + cutData->mCutAnm.mEndFrame, morf); + current.angle.y = shape_angle.y; + + if (!i_checkAttentionLock() && checkInputOnR()) { + mCommonCounter = field_0x2fe2; + } else { + mCommonCounter = shape_angle.y; + } + + if (mComboCutCount != 1) { + field_0x2f99 = 12; + } + + field_0x3588 = l_halfAtnWaitBaseAnime; + field_0x307e = daAlinkHIO_cut_c0::m.mComboDuration; + + setSwordAtParam(dCcG_At_Spl_UNK_0, 1, cutParams->m_atSe, 2, daAlinkHIO_cut_c0::m.mSwordLength, + daAlinkHIO_cut_c0::m.mSwordRadius); + setSwordComboVoice(); + field_0x3012 = 0; + + dComIfGp_setPlayerStatus0(0, 0x8000); + setCutWaterDropEffect(); + + int cutDir = getCutDirection(); + if (mComboCutCount == 1 && (cutDir == DIR_LEFT || cutDir == DIR_RIGHT)) { + field_0x300e = 1; + } else { + field_0x300e = 0; + } + + field_0x300a = 4; + initCutAtnActorSearch(); + return 1; } #pragma pop /* 800D31B8-800D34D8 0CDAF8 0320+00 1/0 0/0 0/0 .text procCutNormal__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutNormal() { - nofralloc -#include "asm/d/a/d_a_alink/procCutNormal__9daAlink_cFv.s" +int daAlink_c::procCutNormal() { + if (checkGroundSpecialMode()) { + return 1; + } + setBodyAngleXReadyAnime(1); + + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + setComboReserb(); + checkCutTurnCharge(); + checkCutAtnActorChange(); + + cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), daAlinkHIO_move_c0::m.mDeceleration); + i_onEndResetFlg0(ERFLG0_UNK_8000000); + field_0x2f99 = 4; + + if (field_0x300e != 0 && i_checkNoResetFlg2(FLG2_UNK_2)) { + int cutDir = getCutDirection(); + if ((cutDir == DIR_RIGHT && mCutType == CUT_TYPE_NM_LEFT && + frameCtrl->getFrame() > lit_7448) || + (cutDir == DIR_LEFT && mCutType == CUT_TYPE_NM_RIGHT && + frameCtrl->getFrame() > lit_7448)) { + field_0x300a = cutDir; + } + } + + if (frameCtrl->checkAnmEnd()) { + resetCombo(1); + + if (mDemo.getDemoMode() == 0x24 || mDemo.getDemoMode() == 0x54) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else { + checkNextAction(0); + } + } else if ((!(frameCtrl->getFrame() > field_0x3484) && field_0x300a == 4) || + !checkCutCancelNextMode(3)) { + if (frameCtrl->getFrame() > field_0x3484) { + resetCombo(1); + } + + if (changeCutReverseProc((daAlink_ANM)field_0x3198)) { + return 1; + } + + if (setShapeAngleToAtnActor(field_0x3010)) { + mCommonCounter = shape_angle.y; + + if (cLib_distanceAngleS(getShapeAngleYAtnActor(), shape_angle.y) < 0x800) { + field_0x3010 = 1; + } + } else { + cLib_addCalcAngleS(&shape_angle.y, mCommonCounter, 2, 0x2000, 0x800); + } + + current.angle.y = shape_angle.y; + + if (frameCtrl->getFrame() >= field_0x3478 && frameCtrl->getFrame() < field_0x347c) { + if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + seStartSwordCut(Z2SE_AL_SWORD_SWING_S); + mNormalSpeed = field_0x3480; + } + + i_onResetFlg0(FLG0_UNK_2); + } + + if (mCutType == CUT_TYPE_NM_LEFT) { + if (frameCtrl->getFrame() >= lit_7449) { + field_0x2f92 = 0; + } else if (frameCtrl->getFrame() >= lit_7450) { + field_0x2f92 = 100; + } + } else if (mCutType == CUT_TYPE_NM_RIGHT) { + if (frameCtrl->getFrame() >= lit_7451) { + field_0x2f92 = 0; + } else if (frameCtrl->getFrame() >= lit_7450) { + field_0x2f92 = 100; + } + } else if (frameCtrl->getFrame() >= lit_7449) { + field_0x2f92 = 0; + } + } + + return 1; } -#pragma pop /* 800D34D8-800D382C 0CDE18 0354+00 4/4 0/0 0/0 .text procCutFinishInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutFinishInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCutFinishInit__9daAlink_cFi.s" +int daAlink_c::procCutFinishInit(int i_type) { + const daAlinkHIO_cutFinish_c1* cutData; + const daAlink_cutParamTbl* cutParams = &cutParamTable_7455[i_type]; + BOOL front_roll = mProcID == PROC_FRONT_ROLL; + + commonProcInit(PROC_CUT_FINISH); + setCutType(cutParams->m_cutType); + field_0x3198 = cutParams->field_0x4; + mCommonCounter = cutParams->field_0xa; + field_0x300e = cutParams->field_0xb; + + BOOL var_r30 = FALSE; + if (i_type == 0) { + cutData = &daAlinkHIO_cutFnL_c0::m; + } else if (i_type == 1) { + cutData = &daAlinkHIO_cutFnV_c0::m; + } else if (i_type == 2) { + cutData = &daAlinkHIO_cutFnS_c0::m; + } else if (i_type == 3) { + cutData = &daAlinkHIO_cutFnSl_c0::m; + var_r30 = TRUE; + } else if (i_type == 4) { + cutData = &daAlinkHIO_cutFnSm_c0::m; + var_r30 = TRUE; + } else { + cutData = &daAlinkHIO_cutFnR_c0::m; + } + + f32 var_f31; + if (front_roll) { + var_f31 = cutData->mAttackStartFrame; + } else if (mComboCutCount == 3) { + var_f31 = cutData->mComboStartFrame; + } else { + var_f31 = cutData->mCutAnm.mStartFrame; + } + + f32 morf; + if (!checkZoraWearAbility() && i_checkNoResetFlg0(FLG0_UNDERWATER)) { + morf = cutParams->m_morf; + } else { + morf = cutData->mCutAnm.mInterpolation; + } + + setSingleAnime(cutParams->m_anmID, cutData->mCutAnm.mSpeed, var_f31, cutData->mCutAnm.mEndFrame, + morf); + + field_0x3478 = cutData->mAttackStartFrame; + field_0x347c = cutData->mAttackEndFrame; + field_0x3480 = cutData->mSpeed; + + if (checkHeavyStateOn(1, 1)) { + field_0x3480 *= mHeavySpeedMultiplier; + } + + current.angle.y = shape_angle.y; + field_0x307e = daAlinkHIO_cut_c0::m.mComboDuration; + + if (mComboCutCount == 3) { + field_0x3484 = cutData->mComboCheckFrame; + field_0x3008 = cutData->mComboStopTime; + setSwordAtParam(dCcG_At_Spl_UNK_0, 1, cutParams->m_atSe, 2, + daAlinkHIO_cut_c0::m.mSwordLength, daAlinkHIO_cut_c0::m.mSwordRadius); + field_0x32d0 = Z2SE_AL_SWORD_SWING_S; + } else { + field_0x3484 = cutData->mCutAnm.mCheckFrame; + field_0x3008 = cutData->mStopTime; + setSwordAtParam(dCcG_At_Spl_UNK_1, 3, cutParams->m_atSe, (var_r30 ? TRUE : FALSE) + 3, + daAlinkHIO_cut_c0::m.mSwordLength, daAlinkHIO_cut_c0::m.mSwordRadius); + + if (i_type == 2) { + field_0x32d0 = Z2SE_AL_SWORD_THRUST; + } else { + field_0x32d0 = Z2SE_AL_SWORD_SWING_L; + } + } + + if (var_r30) { + setSwordVoiceSe(Z2SE_AL_V_IAIGIRI); + } else { + setSwordComboVoice(); + } + + field_0x2f99 = 12; + field_0x3588 = l_halfAtnWaitBaseAnime; + + if (mCutType == CUT_TYPE_MORTAL_DRAW_A || mCutType == CUT_TYPE_FINISH_STAB) { + field_0x2f99 = 13; + } + + field_0x3012 = 0; + dComIfGp_setPlayerStatus0(0, 0x8000); + setCutWaterDropEffect(); + initCutAtnActorSearch(); + + if (mAttention->LockonTarget(0) != NULL && var_r30) { + field_0x280c.setData(mAttention->LockonTarget(0)); + } else { + field_0x280c.clearData(); + } + + if (mCutType == CUT_TYPE_MORTAL_DRAW_A || mCutType == CUT_TYPE_MORTAL_DRAW_B) { + field_0x2fd0 = 1; + } else { + field_0x2fd0 = 0; + } + + return 1; } -#pragma pop /* 800D382C-800D3ADC 0CE16C 02B0+00 1/0 0/0 0/0 .text procCutFinish__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCutFinish() { +asm int daAlink_c::procCutFinish() { nofralloc #include "asm/d/a/d_a_alink/procCutFinish__9daAlink_cFv.s" } #pragma pop /* 800D3ADC-800D3CCC 0CE41C 01F0+00 2/2 0/0 0/0 .text procCutFinishJumpUpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutFinishJumpUpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCutFinishJumpUpInit__9daAlink_cFv.s" +int daAlink_c::procCutFinishJumpUpInit() { + BOOL side_roll = mProcID == PROC_SIDE_ROLL; + + commonProcInit(PROC_CUT_FINISH_JUMP_UP); + + if (mEquipItem != 0x103) { + deleteEquipItem(0, 0); + setSwordModel(); + } + + setCutType(CUT_TYPE_TWIRL); + mSpeed.y = daAlinkHIO_cutFnJU_c0::m.mSpeedV; + mNormalSpeed = daAlinkHIO_cutFnJU_c0::m.mSpeedH; + + if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; + mSpeed.y *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityY; + } else if (checkHeavyStateOn(1, 1)) { + mSpeed.y *= lit_7624; + } + + if (side_roll) { + if (field_0x2f98 == 2) { + current.angle.y = shape_angle.y + 0x4000; + } else { + current.angle.y = shape_angle.y - 0x4000; + } + } else { + current.angle.y = shape_angle.y; + } + + field_0x307e = daAlinkHIO_cut_c0::m.mComboDuration; + f32 var_f31 = daAlinkHIO_cutFnJU_c0::m.mCutAnm.mStartFrame; + + setCylAtParam(getSwordAtType(), dCcG_At_Spl_UNK_1, 3, 1, 3, daAlinkHIO_cutFnJU_c0::m.mAttackRadius, + lit_7625); + field_0x32cc = Z2SE_AL_SWORD_SWING_L; + + setSingleAnime(ANM_CUT_TWIRL, daAlinkHIO_cutFnJU_c0::m.mCutAnm.mSpeed, var_f31, + daAlinkHIO_cutFnJU_c0::m.mCutAnm.mEndFrame, + daAlinkHIO_cutFnJU_c0::m.mCutAnm.mInterpolation); + setSwordVoiceSe(Z2SE_AL_V_SOTOMO_ATK); + field_0x3012 = 0; + field_0x3478 = current.pos.y; + dComIfGp_setPlayerStatus0(0, 0x8000); + setCutWaterDropEffect(); + field_0x2fd0 = 1; + return 1; } -#pragma pop /* 800D3CCC-800D3DD8 0CE60C 010C+00 1/0 0/0 0/0 .text procCutFinishJumpUp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutFinishJumpUp() { - nofralloc -#include "asm/d/a/d_a_alink/procCutFinishJumpUp__9daAlink_cFv.s" +int daAlink_c::procCutFinishJumpUp() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (frameCtrl->getFrame() >= lit_7448) { + offModeFlg(0x100); + } + + if (frameCtrl->getFrame() >= lit_6109) { + field_0x2f92 = 100; + } + + if (mLinkAcch.ChkGroundHit()) { + return procCutFinishJumpUpLandInit(); + } + + if (mDemo.getDemoMode() != 0x52 && + current.pos.y < mLastJumpPos.y - daAlinkHIO_cutFnJU_c0::m.mFallHeight) { + return procFallInit(2, daAlinkHIO_cutFnJU_c0::m.mFallInterpolation); + } + + if (frameCtrl->getFrame() >= daAlinkHIO_cutFnJU_c0::m.mAttackStartFrame && + frameCtrl->getFrame() < daAlinkHIO_cutFnJU_c0::m.mAttackEndFrame) { + if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + seStartSwordCut(field_0x32cc); + } + + i_onResetFlg0(RFLG0_UNK_2); + } + + return 1; } -#pragma pop /* 800D3DD8-800D3ECC 0CE718 00F4+00 1/1 0/0 0/0 .text procCutFinishJumpUpLandInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutFinishJumpUpLandInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCutFinishJumpUpLandInit__9daAlink_cFv.s" +int daAlink_c::procCutFinishJumpUpLandInit() { + commonProcInit(PROC_CUT_FINISH_JUMP_UP_LAND); + checkCutLandDamage(); + + setSingleAnimeParam(ANM_CUT_TWIRL_LAND, &daAlinkHIO_cutFnJU_c0::m.mLandAnm); + mNormalSpeed = FLOAT_LABEL(lit_6108); + setCutType(CUT_TYPE_TWIRL); + + field_0x2f9d = 4; + setFootEffectProcType(2); + i_onResetFlg1(RFLG1_UNK_30); + + if (mComboCutCount == 3) { + field_0x3484 = daAlinkHIO_cutFnJU_c0::m.mComboCheckFrame; + field_0x3008 = daAlinkHIO_cutFnJU_c0::m.mComboStopTime; + } else { + field_0x3484 = daAlinkHIO_cutFnJU_c0::m.mLandAnm.mCheckFrame; + field_0x3008 = daAlinkHIO_cutFnJU_c0::m.mStopTime; + } + + field_0x3012 = 0; + field_0x3588 = l_halfAtnWaitBaseAnime; + initCutAtnActorSearch(); + return 1; } -#pragma pop /* 800D3ECC-800D4068 0CE80C 019C+00 1/0 0/0 0/0 .text procCutFinishJumpUpLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutFinishJumpUpLand() { - nofralloc -#include "asm/d/a/d_a_alink/procCutFinishJumpUpLand__9daAlink_cFv.s" +int daAlink_c::procCutFinishJumpUpLand() { + if (checkGroundSpecialMode()) { + return 1; + } + + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + i_onEndResetFlg0(ERFLG0_UNK_8000000); + + setComboReserb(); + checkCutTurnCharge(); + field_0x2f99 = 4; + checkCutAtnActorChange(); + + if (frameCtrl->checkAnmEnd()) { + if (mDemo.getDemoMode() == 0x52) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else if (field_0x3008 > 0) { + if (!(frameCtrl->getFrame() > field_0x3484) || !checkCutCancelNextMode(3)) { + field_0x3008--; + } + } else { + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x2f98 = 2; + checkNextAction(0); + } + } else if (!(frameCtrl->getFrame() > field_0x3484) || !checkCutCancelNextMode(3)) { + if (frameCtrl->getFrame() > field_0x3484) { + resetCombo(1); + } + + setShapeAngleToAtnActor(field_0x3010); + + if (cLib_distanceAngleS(getShapeAngleYAtnActor(), shape_angle.y) < 0x800) { + field_0x3010 = 1; + } + + current.angle.y = shape_angle.y; + + if (frameCtrl->getFrame() >= lit_7710) { + field_0x2f92 = 0; + } + } + + return 1; } -#pragma pop /* 800D4068-800D41FC 0CE9A8 0194+00 2/2 0/0 0/0 .text * procCutReverseInit__9daAlink_cFQ29daAlink_c11daAlink_ANM */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutReverseInit(daAlink_c::daAlink_ANM param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCutReverseInit__9daAlink_cFQ29daAlink_c11daAlink_ANM.s" +int daAlink_c::procCutReverseInit(daAlink_c::daAlink_ANM i_anmID) { + dKy_Sound_set(current.pos, 100, fopAcM_GetID(this), 5); + + if (i_anmID == ANM_CUT_JUMP) { + return 1; + } + + commonProcInit(PROC_CUT_REVERSE); + + if (i_anmID == ANM_SHIELD_ATTACK_RECOIL) { + setSingleAnimeParam(i_anmID, &daAlinkHIO_guard_c0::m.mRecoilAnm); + mCommonCounter = 1; + field_0x3478 = daAlinkHIO_guard_c0::m.mRecoilAnm.mCheckFrame; + field_0x2f98 = 2; + setUpperGuardAnime(lit_6041); + } else { + setSingleAnimeParam(i_anmID, &daAlinkHIO_cut_c0::m.mRecoilAnm); + mCommonCounter = 0; + field_0x3478 = daAlinkHIO_cut_c0::m.mRecoilAnm.mCheckFrame; + field_0x2f98 = 4; + } + + mNormalSpeed = daAlinkHIO_cut_c0::m.mRecoilSpeed; + current.angle.y = shape_angle.y - -0x8000; + field_0x307e = 0; + field_0x3012 = 0; + + int temp_r3; + if (mCutType == CUT_TYPE_MORTAL_DRAW_A || mCutType == CUT_TYPE_MORTAL_DRAW_B || + mCutType == CUT_TYPE_JUMP) { + temp_r3 = 5; + } else { + temp_r3 = 3; + } + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + dComIfGp_getVibration().StartShock(temp_r3, 31, cXyz(tmp_0, lit_6040, tmp_0)); + return 1; } -#pragma pop /* 800D41FC-800D42FC 0CEB3C 0100+00 1/0 0/0 0/0 .text procCutReverse__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutReverse() { - nofralloc -#include "asm/d/a/d_a_alink/procCutReverse__9daAlink_cFv.s" +int daAlink_c::procCutReverse() { + if (checkGroundSpecialMode()) { + return 1; + } + + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), daAlinkHIO_cut_c0::m.mRecoilDeceleration); + + if (mCommonCounter == 0) { + checkCutTurnCharge(); + i_onEndResetFlg0(ERFLG0_UNK_8000000); + } + + if (mCommonCounter != 0) { + setUpperGuardAnime(lit_6041); + } + + if (frameCtrl->checkAnmEnd()) { + current.angle.y = shape_angle.y; + checkNextAction(0); + } else if (frameCtrl->getFrame() > field_0x3478) { + current.angle.y = shape_angle.y; + + if (!checkNextAction(1)) { + current.angle.y = shape_angle.y - -0x8000; + } + } + + return 1; } -#pragma pop /* 800D42FC-800D43F8 0CEC3C 00FC+00 2/2 0/0 0/0 .text procCutJumpInit__9daAlink_cFi */ -bool daAlink_c::procCutJumpInit(int jump_type) { +int daAlink_c::procCutJumpInit(int i_airCut) { commonProcInit(PROC_CUT_JUMP); setSingleAnimeParam(ANM_CUT_JUMP, &daAlinkHIO_cutJump_c0::m.mCutAnm); - if (jump_type != 0) { + + if (i_airCut) { mNormalSpeed = daAlinkHIO_cutJump_c0::m.mAirJumpSpeedH; mSpeed.y = daAlinkHIO_cutJump_c0::m.mAirJumpSpeedV; } else { mNormalSpeed = daAlinkHIO_cutJump_c0::m.mBaseJumpSpeedH; mSpeed.y = daAlinkHIO_cutJump_c0::m.mBaseJumpSpeedV; } - setCutJumpSpeed(jump_type); - current.angle.y = mCollisionRot.y; - setSwordAtParam(dCcG_At_Spl_UNK_01, 3, 1, 3, daAlinkHIO_cut_c0::m.mSwordLength, + + setCutJumpSpeed(i_airCut); + current.angle.y = shape_angle.y; + setSwordAtParam(dCcG_At_Spl_UNK_1, 3, 1, 3, daAlinkHIO_cut_c0::m.mSwordLength, daAlinkHIO_cut_c0::m.mSwordRadius); - setCutType(TYPE_CUT_JUMP); + setCutType(CUT_TYPE_JUMP); setSwordComboVoice(); dComIfGp_setPlayerStatus0(0, 0x8000); field_0x3198 = 2; - return true; + return 1; } /* 800D43F8-800D452C 0CED38 0134+00 1/0 0/0 0/0 .text procCutJump__9daAlink_cFv */ -#ifdef NONMATCHING -bool daAlink_c::procCutJump() { - if (current.angle.y == mCollisionRot.y && changeCutReverseProc(ANM_CUT_JUMP)) { +int daAlink_c::procCutJump() { + if (current.angle.y == shape_angle.y && changeCutReverseProc(ANM_CUT_JUMP)) { current.angle.y += 0x8000; - mNormalSpeed = 27.0f; - cXyz xyz(0.0f, 1.0f, 0.0f); - dComIfGp_getVibration().StartShock(5, 31, xyz); - } else if (current.angle.y != mCollisionRot.y) { - cLib_chaseF(&mNormalSpeed, 5.0f, 1.0f); + mNormalSpeed = lit_7807; + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + dComIfGp_getVibration().StartShock(5, 31, cXyz(tmp_0, lit_6040, tmp_0)); + } else if (current.angle.y != shape_angle.y) { + cLib_chaseF(&mNormalSpeed, lit_7808, lit_6040); } if (checkCutTurnInput()) { field_0x3198 = getCutTurnDirection(); } + if (mLinkAcch.ChkGroundHit()) { procCutJumpLandInit(field_0x3198); } else if (mUnderFrameCtrl[0].getFrame() >= daAlinkHIO_cutJump_c0::m.mStartAttackFrame) { if (!i_checkNoResetFlg0(FLG0_UNK_40)) { seStartSwordCut(Z2SE_AL_SWORD_SWING_L); } + i_onResetFlg0(RFLG0_UNK_2); } - return true; + + return 1; +} + +/* 800D452C-800D4684 0CEE6C 0158+00 1/1 0/0 0/0 .text procCutJumpLandInit__9daAlink_cFi + */ +int daAlink_c::procCutJumpLandInit(int param_0) { + commonProcInit(PROC_CUT_JUMP_LAND); + checkCutLandDamage(); + setSingleAnimeParam(ANM_CUT_JUMP_LAND, &daAlinkHIO_cutJump_c0::m.mLandAnm); + + if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + field_0x2060->initOldFrameMorf(lit_7808 * daAlinkHIO_cutJump_c0::m.mLandAnm.mInterpolation, + 0, 0x23); + } + + if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + seStartSwordCut(Z2SE_AL_SWORD_SWING_L); + m_swordBlur.initBlur(FLOAT_LABEL(lit_6108), 0, &mSwordTopPos, &field_0x3498, &field_0x34a4); + setSwordAtParam(dCcG_At_Spl_UNK_1, 3, 1, 3, daAlinkHIO_cut_c0::m.mSwordLength, + daAlinkHIO_cut_c0::m.mSwordRadius); + } + + i_onResetFlg0(RFLG0_UNK_2); + mNormalSpeed = FLOAT_LABEL(lit_6108); + setCutType(CUT_TYPE_JUMP); + field_0x2f9d = 4; + setFootEffectProcType(2); + + i_onResetFlg1(RFLG1_UNK_30); + field_0x3588 = l_halfAtnWaitBaseAnime; + field_0x3198 = param_0; + setStepLandVibration(); + return 1; +} + +/* 800D4684-800D47DC 0CEFC4 0158+00 1/0 0/0 0/0 .text procCutJumpLand__9daAlink_cFv */ +int daAlink_c::procCutJumpLand() { + if (checkGroundSpecialMode()) { + return 1; + } + + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (changeCutReverseProc(ANM_CUT_RECOIL_B)) { + return 1; + } + + field_0x2f99 = 4; + i_onEndResetFlg0(ERFLG0_UNK_8000000); + + if (field_0x3198 != 2 && checkCutTurnInput()) { + field_0x3198 = getCutTurnDirection(); + } + + if (frameCtrl->checkAnmEnd()) { + checkNextAction(0); + } else if (frameCtrl->getFrame() > daAlinkHIO_cutJump_c0::m.mJumpSpinDelay && + field_0x3198 != 2) { + procCutTurnInit(1, field_0x3198); + } else { + if (frameCtrl->getFrame() > daAlinkHIO_cutJump_c0::m.mLandAnm.mCheckFrame) { + onModeFlg(4); + + if (checkNextAction(1)) { + return 1; + } + } + + if (frameCtrl->getFrame() < daAlinkHIO_cutJump_c0::m.mEndAttackFrame) { + i_onResetFlg0(RFLG0_UNK_2); + } + } + + return 1; +} + +/* 800D47DC-800D4A74 0CF11C 0298+00 7/7 0/0 0/0 .text procCutTurnInit__9daAlink_cFii */ +// regalloc +#ifdef NONMATCHING +int daAlink_c::procCutTurnInit(int param_0, int param_1) { + const daAlinkHIO_cutTurn_c1* cutData = &daAlinkHIO_cutTurn_c0::m; + const daAlinkHIO_anm_c* anm_data; + daAlink_ANM anmID; + + commonProcInit(PROC_CUT_TURN); + + if (param_1 == 2) { + param_1 = getCutTurnDirection(); + } + + f32 var_f31; + if (param_1 == 1) { + anmID = ANM_CUT_TURN_RIGHT; + anm_data = &cutData->mRightTurnAnm; + + if (param_0) { + var_f31 = cutData->mRightTurnInputStartFrame; + } else { + var_f31 = cutData->mRightTurnAnm.mStartFrame; + } + + field_0x3484 = cutData->mRightAttackStartFrame; + field_0x3488 = cutData->mRightAttackEndFrame; + field_0x3010 = 1; + field_0x300a = 6; + } else { + anmID = ANM_CUT_TURN_LEFT; + anm_data = &cutData->mLeftTurnAnm; + + if (param_0) { + var_f31 = cutData->mLeftTurnInputStartFrame; + } else { + var_f31 = anm_data->mStartFrame; + } + + field_0x3484 = cutData->mLeftAttackStartFrame; + field_0x3488 = cutData->mLeftAttackEndFrame; + field_0x3010 = 0; + field_0x300a = 8; + } + + field_0x3480 = anm_data->->mCheckFrame; + resetCombo(1); + + f32 morf; + if (!checkZoraWearAbility() && i_checkNoResetFlg0(FLG0_UNDERWATER)) { + morf = lit_7625; + } else { + morf = anm_data->mInterpolation; + } + + setSingleAnime(anmID, anm_data->mSpeed, var_f31, anm_data->mEndFrame, morf); + + int var_r29_3; + if (checkCutLargeTurnState()) { + var_r29_3 = 4; + field_0x32cc = Z2SE_AL_KAITEN_L_SLASH; + setSwordVoiceSe(Z2SE_AL_V_KAITENGIRI_L); + field_0x3478 = cutData->mLargeAttackRadius; + field_0x348c = cutData->mLargeAttackAccel; + + if (anmID == ANM_CUT_TURN_RIGHT) { + setCutType(CUT_TYPE_LARGE_TURN_RIGHT); + } else { + setCutType(CUT_TYPE_LARGE_TURN_LEFT); + } + } else { + var_r29_3 = 3; + field_0x32cc = Z2SE_AL_KAITENGIRI; + setSwordVoiceSe(Z2SE_AL_V_KAITEN); + + if (anmID == ANM_CUT_TURN_RIGHT) { + setCutType(CUT_TYPE_TURN_RIGHT); + } else { + setCutType(CUT_TYPE_TURN_LEFT); + } + + if (i_checkNoResetFlg3(FLG3_UNK_100000)) { + field_0x3478 = cutData->mLightAttackRadius; + field_0x348c = cutData->mLightAttackRadiusAccel; + } else { + field_0x3478 = cutData->mAttackRadius; + field_0x348c = cutData->mAttackRadiusAccel; + } + } + + field_0x347c = lit_6896; + field_0x3588 = l_halfAtnWaitBaseAnime; + field_0x3008 = cutData->mStopTime; + current.angle.y = shape_angle.y; + field_0x3180 = 0; + dComIfGp_setPlayerStatus0(0, 0x8000); + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x3012 = 0; + setCutWaterDropEffect(); + initCutTurnAt(field_0x347c, var_r29_3); + return 1; } #else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool daAlink_c::procCutJump() { - nofralloc -#include "asm/d/a/d_a_alink/procCutJump__9daAlink_cFv.s" -} -#pragma pop -#endif - -/* 800D452C-800D4684 0CEE6C 0158+00 1/1 0/0 0/0 .text procCutJumpLandInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutJumpLandInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCutJumpLandInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800D4684-800D47DC 0CEFC4 0158+00 1/0 0/0 0/0 .text procCutJumpLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutJumpLand() { - nofralloc -#include "asm/d/a/d_a_alink/procCutJumpLand__9daAlink_cFv.s" -} -#pragma pop - -/* 800D47DC-800D4A74 0CF11C 0298+00 7/7 0/0 0/0 .text procCutTurnInit__9daAlink_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutTurnInit(int param_0, int param_1) { +asm int daAlink_c::procCutTurnInit(int param_0, int param_1) { nofralloc #include "asm/d/a/d_a_alink/procCutTurnInit__9daAlink_cFii.s" } #pragma pop +#endif /* 800D4A74-800D4C68 0CF3B4 01F4+00 1/0 0/0 0/0 .text procCutTurn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutTurn() { - nofralloc -#include "asm/d/a/d_a_alink/procCutTurn__9daAlink_cFv.s" +int daAlink_c::procCutTurn() { + if (checkGroundSpecialMode()) { + return 1; + } + + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + field_0x2f99 = 4; + cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), daAlinkHIO_move_c0::m.mDeceleration); + i_onEndResetFlg0(ERFLG0_UNK_8000000); + + if (mComboCutCount != 0) { + field_0x307e = daAlinkHIO_cut_c0::m.mComboDuration; + } + + if (frameCtrl->getFrame() >= lit_7945) { + field_0x2f92 = 0; + } + + if (frameCtrl->checkAnmEnd()) { + if (field_0x3008 > 0) { + if (!(frameCtrl->getFrame() > field_0x3480) || !checkCutCancelNextMode(3)) { + field_0x3008--; + } + } else if (mDemo.getDemoMode() == 0x24) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else { + field_0x2f98 = 3; + checkNextAction(0); + } + } else if (!(frameCtrl->getFrame() > field_0x3480) || !checkCutCancelNextMode(3)) { + if (frameCtrl->getFrame() >= field_0x3484 && frameCtrl->getFrame() < field_0x3488) { + if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + seStartSwordCut(field_0x32cc); + mNormalSpeed = daAlinkHIO_cutTurn_c0::m.mSpeed; + + if (checkHeavyStateOn(1, 1)) { + mNormalSpeed *= mHeavySpeedMultiplier; + } + } + + i_onResetFlg0(RFLG0_UNK_2); + cLib_chaseF(&field_0x347c, field_0x3478, field_0x348c); + field_0xFB8.SetR(field_0x347c); + } + } + + return 1; } -#pragma pop /* 800D4C68-800D4D04 0CF5A8 009C+00 3/3 0/0 0/0 .text procCutTurnChargeInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutTurnChargeInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCutTurnChargeInit__9daAlink_cFv.s" +int daAlink_c::procCutTurnChargeInit() { + if (mComboCutCount == 0 && checkDashAnime()) { + setUpperAnimeBase(0x83); + return 1; + } + + commonProcInit(PROC_CUT_TURN_CHARGE); + setSingleAnimeParam(ANM_CUT_TURN_CHARGE_START, &daAlinkHIO_cutTurn_c0::m.mChargeAnm); + mNormalSpeed = FLOAT_LABEL(lit_6108); + current.angle.y = shape_angle.y; + mCommonCounter = daAlinkHIO_cut_c0::m.mNormalSwingDuration; + return 1; } -#pragma pop /* 800D4D04-800D4DDC 0CF644 00D8+00 1/0 0/0 0/0 .text procCutTurnCharge__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutTurnCharge() { - nofralloc -#include "asm/d/a/d_a_alink/procCutTurnCharge__9daAlink_cFv.s" +int daAlink_c::procCutTurnCharge() { + if (checkGroundSpecialMode()) { + return 1; + } + + setSwordChargeVoiceSe(); + field_0x307e = daAlinkHIO_cut_c0::m.mComboDuration; + + if (!swordButton() && mDemo.getDemoMode() != 0x5B) { + if (mCommonCounter != 0) { + checkCutAction(); + } else { + cancelCutCharge(); + } + } else if (mUnderFrameCtrl[0].checkAnmEnd()) { + procCutTurnMoveInit(0); + } else if (mUnderFrameCtrl[0].getFrame() >= lit_7977) { + field_0x2f92 = 100; + } + + return 1; } -#pragma pop /* 800D4DDC-800D4EFC 0CF71C 0120+00 3/3 0/0 0/0 .text procCutTurnMoveInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutTurnMoveInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCutTurnMoveInit__9daAlink_cFi.s" +int daAlink_c::procCutTurnMoveInit(int param_0) { + commonProcInit(PROC_CUT_TURN_MOVE); + + if (checkZeroSpeedF()) { + onModeFlg(1); + } + + if (param_0) { + setUpperAnimeBaseSpeed(getMainBckData(ANM_CUT_JUMP_LARGE_CHARGE)->m_underID, + FLOAT_LABEL(lit_6108), lit_6041); + + f32 frame = mUnderFrameCtrl[0].getFrame(); + mUpperFrameCtrl[2].setFrame(frame); + getNowAnmPackUpper(UPPER_2)->setFrame(frame); + setFacePriAnime(ANM_CUT_JUMP_LARGE_CHARGE); + } + + setSingleAnimeBaseSpeed(ANM_CUT_TURN_CHARGE, FLOAT_LABEL(lit_6108), + daAlinkHIO_cutTurn_c0::m.mMoveFBInterpolation); + field_0x2f98 = 0; + field_0x594 = daAlinkHIO_cutTurn_c0::m.mMaxSpeed; + + if (!checkWoodSwordEquip()) { + simpleAnmPlay(m_nSwordBtk); + } else { + field_0x3008 = 1; + } + + mCommonCounter = param_0; + i_onNoResetFlg1(FLG1_UNK_10000000); + dComIfGp_setPlayerStatus0(0, 0x40000000); + return 1; } -#pragma pop /* 800D4EFC-800D53C8 0CF83C 04CC+00 1/0 0/0 0/0 .text procCutTurnMove__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCutTurnMove() { +asm int daAlink_c::procCutTurnMove() { nofralloc #include "asm/d/a/d_a_alink/procCutTurnMove__9daAlink_cFv.s" } @@ -772,28 +1627,34 @@ asm void daAlink_c::procCutTurnMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCutDownInit() { +asm int daAlink_c::procCutDownInit() { nofralloc #include "asm/d/a/d_a_alink/procCutDownInit__9daAlink_cFv.s" } #pragma pop /* 800D57F8-800D58A0 0D0138 00A8+00 1/0 0/0 0/0 .text procCutDown__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutDown() { - nofralloc -#include "asm/d/a/d_a_alink/procCutDown__9daAlink_cFv.s" +int daAlink_c::procCutDown() { + if (field_0x300e != 0) { + return 1; + } + + if (mLinkAcch.ChkGroundHit() && mSpeed.y <= FLOAT_LABEL(lit_6108)) { + procCutDownLandInit((fopEn_enemy_c*)field_0x280c.getActor()); + } else if (mUnderFrameCtrl[0].checkAnmEnd() && mCommonCounter == 0) { + mCommonCounter = 1; + setSingleAnimeParam(ANM_CUT_FINISHING_BLOW_FALL, &daAlinkHIO_cutDown_c0::m.mFallAnm); + } + + return 1; } -#pragma pop /* 800D58A0-800D5ADC 0D01E0 023C+00 1/1 0/0 0/0 .text * procCutDownLandInit__9daAlink_cFP13fopEn_enemy_c */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCutDownLandInit(fopEn_enemy_c* param_0) { +asm int daAlink_c::procCutDownLandInit(fopEn_enemy_c* param_0) { nofralloc #include "asm/d/a/d_a_alink/procCutDownLandInit__9daAlink_cFP13fopEn_enemy_c.s" } @@ -803,7 +1664,7 @@ asm void daAlink_c::procCutDownLandInit(fopEn_enemy_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCutDownLand() { +asm int daAlink_c::procCutDownLand() { nofralloc #include "asm/d/a/d_a_alink/procCutDownLand__9daAlink_cFv.s" } @@ -813,77 +1674,146 @@ asm void daAlink_c::procCutDownLand() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCutHeadInit() { +asm int daAlink_c::procCutHeadInit() { nofralloc #include "asm/d/a/d_a_alink/procCutHeadInit__9daAlink_cFv.s" } #pragma pop /* 800D5FC8-800D6130 0D0908 0168+00 1/0 0/0 0/0 .text procCutHead__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutHead() { - nofralloc -#include "asm/d/a/d_a_alink/procCutHead__9daAlink_cFv.s" +int daAlink_c::procCutHead() { + if (field_0x300e == 0) { + cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), field_0x3478); + + if (mSpeed.y <= FLOAT_LABEL(lit_6108)) { + setSingleAnimeParam(ANM_CUT_HEAD, &daAlinkHIO_cutHead_c0::m.mCutAnm); + f32 tmp_0 = FLOAT_LABEL(lit_6108); + mNormalSpeed = tmp_0; + mSpeed.y = tmp_0; + setSpecialGravity(tmp_0, mMaxFallSpeed, 0); + field_0x300e = 1; + setCutWaterDropEffect(); + setSwordVoiceSe(Z2SE_AL_V_KABUTO_ATK); + } + } else { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + mNormalSpeed *= lit_8501; + + if (frameCtrl->checkPass(lit_8502)) { + mSpeed.y = daAlinkHIO_cutHead_c0::m.mAddSpeedV; + mNormalSpeed = daAlinkHIO_cutHead_c0::m.mAddSpeedH; + initGravity(); + } + + if (frameCtrl->getFrame() >= daAlinkHIO_cutHead_c0::m.mAttackStartFrame && + frameCtrl->getFrame() < daAlinkHIO_cutHead_c0::m.mAttackEndFrame) { + if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + seStartSwordCut(Z2SE_AL_SWORD_SWING_L); + } + + i_onResetFlg0(RFLG0_UNK_2); + } + + if (mLinkAcch.ChkGroundHit()) { + procCutHeadLandInit(); + } + } + + return 1; } -#pragma pop /* 800D6130-800D618C 0D0A70 005C+00 1/1 0/0 0/0 .text procCutHeadLandInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutHeadLandInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCutHeadLandInit__9daAlink_cFv.s" +int daAlink_c::procCutHeadLandInit() { + commonProcInit(PROC_CUT_HEAD_LAND); + checkCutLandDamage(); + setSingleAnimeParam(ANM_CUT_HEAD_LAND, &daAlinkHIO_cutHead_c0::m.mLandAnm); + mNormalSpeed = FLOAT_LABEL(lit_6108); + return 1; } -#pragma pop /* 800D618C-800D6238 0D0ACC 00AC+00 1/0 0/0 0/0 .text procCutHeadLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutHeadLand() { - nofralloc -#include "asm/d/a/d_a_alink/procCutHeadLand__9daAlink_cFv.s" +int daAlink_c::procCutHeadLand() { + i_onEndResetFlg0(ERFLG0_UNK_8000000); + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (frameCtrl->checkAnmEnd()) { + if (mDemo.getDemoMode() == 0x53) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else { + checkNextAction(0); + } + } else if (frameCtrl->getFrame() > daAlinkHIO_cutHead_c0::m.mLandAnm.mCheckFrame) { + checkNextAction(1); + } + + return 1; } -#pragma pop /* 800D6238-800D62A0 0D0B78 0068+00 2/2 0/0 0/0 .text procCutLargeJumpChargeInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutLargeJumpChargeInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCutLargeJumpChargeInit__9daAlink_cFv.s" +int daAlink_c::procCutLargeJumpChargeInit() { + commonProcInit(PROC_CUT_LARGE_JUMP_CHARGE); + setSingleAnimeParam(ANM_CUT_JUMP_LARGE_CHARGE, &daAlinkHIO_cutLargeJump_c0::m.mChargeAnm); + mNormalSpeed = FLOAT_LABEL(lit_6108); + current.angle.y = shape_angle.y; + mCommonCounter = daAlinkHIO_cut_c0::m.mNormalSwingDuration; + return 1; } -#pragma pop /* 800D62A0-800D6374 0D0BE0 00D4+00 1/0 0/0 0/0 .text procCutLargeJumpCharge__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutLargeJumpCharge() { - nofralloc -#include "asm/d/a/d_a_alink/procCutLargeJumpCharge__9daAlink_cFv.s" +int daAlink_c::procCutLargeJumpCharge() { + if (checkGroundSpecialMode()) { + return 1; + } + + if (checkDownAttackState()) { + setDoStatusEmphasys(0x30); + } else if (checkCutHeadState()) { + setDoStatusEmphasys(0x77); + } else { + setDoStatus(0x86); + } + + setSwordChargeVoiceSe(); + + if (!doButton() && mDemo.getDemoMode() != 0x5C) { + checkDoCutAction(); + } else if (mUnderFrameCtrl[0].checkAnmEnd()) { + procCutTurnMoveInit(1); + } + + return 1; } -#pragma pop /* 800D6374-800D6484 0D0CB4 0110+00 2/1 0/0 0/0 .text procCutLargeJumpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutLargeJumpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCutLargeJumpInit__9daAlink_cFv.s" +int daAlink_c::procCutLargeJumpInit() { + if (mDemo.getDemoMode() == 0x56 && + (mProcID == PROC_CUT_LARGE_JUMP || mProcID == PROC_CUT_LARGE_JUMP_LAND)) { + return 1; + } + + commonProcInit(PROC_CUT_LARGE_JUMP); + setSingleAnimeParam(ANM_CUT_JUMP_LARGE_START, &daAlinkHIO_cutLargeJump_c0::m.mChargeMoveAnm); + field_0x3588 = l_halfAtnWaitBaseAnime; + mNormalSpeed = FLOAT_LABEL(lit_6108); + current.angle.y = shape_angle.y; + mCommonCounter = 0; + + setSwordAtParam(dCcG_At_Spl_UNK_0, 1, 1, 2, daAlinkHIO_cut_c0::m.mSwordLength, + daAlinkHIO_cut_c0::m.mSwordRadius); + setCutType(CUT_TYPE_LARGE_JUMP_INIT); + setSwordVoiceSe(Z2SE_AL_V_JUMP_ATTACK_L_1); + setCutWaterDropEffect(); + field_0x300e = 4; + field_0x3010 = 0; + field_0x3198 = 2; + return 1; } -#pragma pop /* 800D6484-800D66C0 0D0DC4 023C+00 1/0 0/0 0/0 .text procCutLargeJump__9daAlink_cFv */ -bool daAlink_c::procCutLargeJump() { - daPy_frameCtrl_c* ctrl = &mUnderFrameCtrl[0]; +int daAlink_c::procCutLargeJump() { + daPy_frameCtrl_c* frameCtrl = &mUnderFrameCtrl[0]; if (field_0x3010 != 0) { field_0x2f99 = 4; @@ -894,25 +1824,25 @@ bool daAlink_c::procCutLargeJump() { } if (mCommonCounter == 0) { - if (ctrl->checkAnmEnd()) { + if (frameCtrl->checkAnmEnd()) { field_0x2f99 = 12; setSingleAnimeParam(ANM_CUT_JUMP_LARGE, &daAlinkHIO_cutLargeJump_c0::m.mCutAnm); mCommonCounter = 1; setSwordVoiceSe(Z2SE_AL_V_JUMP_ATTACK_L_2); } else { - if (ctrl->getFrame() >= lit_7307) { + if (frameCtrl->getFrame() >= lit_7307) { field_0x3010 = 1; } - if (!i_checkModeFlg(2) && ctrl->getFrame() >= lit_7808) { + if (!i_checkModeFlg(2) && frameCtrl->getFrame() >= lit_7808) { setJumpMode(); mNormalSpeed = daAlinkHIO_cutLargeJump_c0::m.mCutSpeedH; mSpeed.y = daAlinkHIO_cutLargeJump_c0::m.mCutSpeedV; setCutJumpSpeed(0); } - if (ctrl->getFrame() >= daAlinkHIO_cutLargeJump_c0::m.mJumpAttackStartF && - ctrl->getFrame() < daAlinkHIO_cutLargeJump_c0::m.mJumpAttackEndF) { + if (frameCtrl->getFrame() >= daAlinkHIO_cutLargeJump_c0::m.mJumpAttackStartFrame && + frameCtrl->getFrame() < daAlinkHIO_cutLargeJump_c0::m.mJumpAttackEndFrame) { if (!i_checkNoResetFlg0(FLG0_UNK_40)) { seStartSwordCut(Z2SE_AL_SWORD_SWING_S); } @@ -922,64 +1852,184 @@ bool daAlink_c::procCutLargeJump() { } else { if (field_0x300e != 0) { field_0x300e--; + if (field_0x300e == 0) { - setSwordAtParam(dCcG_At_Spl_UNK_01, 3, 1, 4, daAlinkHIO_cut_c0::m.mSwordLength, + setSwordAtParam(dCcG_At_Spl_UNK_1, 3, 1, 4, daAlinkHIO_cut_c0::m.mSwordLength, daAlinkHIO_cut_c0::m.mSwordRadius); - setCutType(TYPE_CUT_LARGE_JUMP); + setCutType(CUT_TYPE_LARGE_JUMP); } } if (mLinkAcch.ChkGroundHit()) { procCutLargeJumpLandInit(field_0x3198); - } else { - if (ctrl->getFrame() >= daAlinkHIO_cutLargeJump_c0::m.mCutInitF) { - if (!i_checkNoResetFlg0(FLG0_UNK_40)) { - seStartSwordCut(Z2SE_AL_SWORD_SWING_S); - } - i_onResetFlg0(2); + } else if (frameCtrl->getFrame() >= daAlinkHIO_cutLargeJump_c0::m.mCutInitFrame) { + if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + seStartSwordCut(Z2SE_AL_SWORD_SWING_S); } + + i_onResetFlg0(2); } } - return true; + + return 1; } /* 800D66C0-800D67FC 0D1000 013C+00 1/1 0/0 0/0 .text procCutLargeJumpLandInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutLargeJumpLandInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCutLargeJumpLandInit__9daAlink_cFi.s" +int daAlink_c::procCutLargeJumpLandInit(int param_0) { + commonProcInit(PROC_CUT_LARGE_JUMP_LAND); + checkCutLandDamage(); + setSingleAnimeParam(ANM_CUT_JUMP_LARGE_LAND, &daAlinkHIO_cutLargeJump_c0::m.mLandAnm); + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x2f99 = 12; + field_0x3588 = l_halfAtnWaitBaseAnime; + field_0x2f9d = 4; + setFootEffectProcType(4); + i_onResetFlg1(RFLG1_UNK_30); + i_onResetFlg0(RFLG0_UNK_2); + setCutType(CUT_TYPE_LARGE_JUMP); + field_0x3478 = daAlinkHIO_cutLargeJump_c0::m.mLandAttackRadius; + field_0x347c = lit_6896; + mCommonCounter = 0; + field_0x3198 = param_0; + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + dComIfGp_getVibration().StartShock(3, 31, cXyz(tmp_0, lit_6040, tmp_0)); + setCutLargeJumpLandEffect(); + seStartOnlyReverb(Z2SE_AL_JUMP_ATK_L_IMPACT); + return 1; } -#pragma pop /* 800D67FC-800D698C 0D113C 0190+00 1/0 0/0 0/0 .text procCutLargeJumpLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutLargeJumpLand() { - nofralloc -#include "asm/d/a/d_a_alink/procCutLargeJumpLand__9daAlink_cFv.s" +int daAlink_c::procCutLargeJumpLand() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + i_onEndResetFlg0(ERFLG0_UNK_8000000); + field_0x2f99 = 4; + + if (field_0x3198 != 2 && checkCutTurnInput()) { + field_0x3198 = getCutTurnDirection(); + } + + if (frameCtrl->checkAnmEnd()) { + if (mDemo.getDemoMode() == 0x56) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else { + checkNextAction(0); + } + } else if (frameCtrl->getFrame() > daAlinkHIO_cutLargeJump_c0::m.mSpinSlashCheckFrame && field_0x3198 != 2) { + procCutTurnInit(1, field_0x3198); + } else if (frameCtrl->getFrame() > daAlinkHIO_cutLargeJump_c0::m.mLandAnm.mCheckFrame) { + checkNextAction(1); + } else if (frameCtrl->getFrame() < daAlinkHIO_cutLargeJump_c0::m.mLandAttackEndFrame) { + i_onResetFlg0(RFLG0_UNK_2); + + if (frameCtrl->getFrame() >= daAlinkHIO_cutLargeJump_c0::m.mLandAttackInitFrame) { + if (mCommonCounter == 0) { + resetAtCollision(0); + mCommonCounter = 1; + setCutType(CUT_TYPE_LARGE_JUMP_FINISH); + initCutTurnAt(field_0x347c, 4); + } + + cLib_chaseF(&field_0x347c, field_0x3478, lit_8676); + field_0xFB8.SetR(field_0x347c); + } + } + + return 1; } -#pragma pop /* 800D698C-800D6A38 0D12CC 00AC+00 2/1 0/0 0/0 .text procSwordUnequipSpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwordUnequipSpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSwordUnequipSpInit__9daAlink_cFv.s" +int daAlink_c::procSwordUnequipSpInit() { + if (!commonProcInitNotSameProc(PROC_SWORD_UNEQUIP_SP)) { + return 0; + } + + setSingleAnimeBaseSpeed(ANM_FINISH, daAlinkHIO_cut_c0::m.mFlourishAnmSpeed, lit_6109); + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x3588 = l_halfAtnWaitBaseAnime; + field_0x3198 = 0; + mCommonCounter = 0; + field_0x300e = (0x1E - mDemo.getDemoMode()) != 0; + field_0x3010 = 0; + + return 1; } -#pragma pop /* 800D6A38-800D6D94 0D1378 035C+00 1/0 0/0 0/0 .text procSwordUnequipSp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwordUnequipSp() { - nofralloc -#include "asm/d/a/d_a_alink/procSwordUnequipSp__9daAlink_cFv.s" -} -#pragma pop \ No newline at end of file +int daAlink_c::procSwordUnequipSp() { + if (checkGroundSpecialMode()) { + return 1; + } + + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (field_0x300e != 0) { + field_0x2f99 = 4; + } else { + field_0x300e = 1; + } + + i_onEndResetFlg0(ERFLG0_UNK_8000000); + + if (mCommonCounter != 0) { + i_onEndResetFlg1(ERFLG1_GANON_FINISH); + } + + if (field_0x3010 == 0 && mDemo.getDemoMode() == 0x1E && mDemo.getParam1() == 1) { + field_0x3010 = 1; + setFaceBasicBck(0x149); + setFaceBasicBtp(0x3E1); + } + + if (frameCtrl->checkAnmEnd()) { + if (field_0x3198 != 0) { + if (mDemo.getDemoMode() == 0x1E) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else { + checkNextAction(0); + } + } else { + field_0x3198 = 1; + setSingleAnimeBaseSpeed(ANM_FINISH_END, daAlinkHIO_cut_c0::m.mFlourishEndAnmSpeed, lit_6109); + } + } else if (field_0x3198 != 0) { + if (!(frameCtrl->getFrame() > daAlinkHIO_cut_c0::m.mFlourishControlStartFrame) || !checkNextAction(1)) { + if (frameCtrl->getFrame() >= lit_8779) { + field_0x2f92 = 1; + } else if (frameCtrl->getFrame() >= lit_8780) { + field_0x2f93 = 6; + } else if (frameCtrl->getFrame() >= lit_7451) { + field_0x2f92 = 4; + } else if (frameCtrl->getFrame() >= lit_8781) { + if (mDemo.getDemoMode() == 0x1E) { + if (mDemo.getParam0() == 1) { + frameCtrl->setFrame(lit_8781); + frameCtrl->setRate(FLOAT_LABEL(lit_6108)); + dComIfGp_evmng_cutEnd(field_0x3184); + } else if (frameCtrl->getRate() < lit_8782) { + setWaterInAnmRate(frameCtrl, daAlinkHIO_cut_c0::m.mFlourishEndAnmSpeed); + } + } + deleteEquipItem(0, 1); + } else if (frameCtrl->checkPass(lit_8783)) { + seStartSwordCut(0x20008); + } + } + } else { + if (frameCtrl->getFrame() >= lit_7710) { + field_0x2f93 = 0xFE; + mCommonCounter = 1; + i_onEndResetFlg1(ERFLG1_GANON_FINISH); + } + + if (frameCtrl->checkPass(lit_8502) || frameCtrl->checkPass(lit_8781)) { + seStartSwordCut(0x20006); + } else if (frameCtrl->checkPass(lit_8784) || frameCtrl->checkPass(lit_8785) || frameCtrl->checkPass(lit_8786)) { + seStartSwordCut(0x20007); + } + } + + return 1; +} \ No newline at end of file diff --git a/src/d/a/d_a_alink_damage.inc b/src/d/a/d_a_alink_damage.inc index a36565f3d9c..bcc8870b332 100644 --- a/src/d/a/d_a_alink_damage.inc +++ b/src/d/a/d_a_alink_damage.inc @@ -1,157 +1,216 @@ /* 800D6D94-800D6DA4 0D16D4 0010+00 0/0 0/0 2/2 .text getFreezeR__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getFreezeR() const { - nofralloc -#include "asm/d/a/d_a_alink/getFreezeR__9daAlink_cCFv.s" +s16 daAlink_c::getFreezeR() const { + return daAlinkHIO_damage_c0::m.mFreezeR; } -#pragma pop /* 800D6DA4-800D6DB4 0D16E4 0010+00 0/0 0/0 2/2 .text getFreezeG__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getFreezeG() const { - nofralloc -#include "asm/d/a/d_a_alink/getFreezeG__9daAlink_cCFv.s" +s16 daAlink_c::getFreezeG() const { + return daAlinkHIO_damage_c0::m.mFreezeG; } -#pragma pop /* 800D6DB4-800D6DC4 0D16F4 0010+00 0/0 0/0 2/2 .text getFreezeB__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getFreezeB() const { - nofralloc -#include "asm/d/a/d_a_alink/getFreezeB__9daAlink_cCFv.s" +s16 daAlink_c::getFreezeB() const { + return daAlinkHIO_damage_c0::m.mFreezeB; } -#pragma pop /* 800D6DC4-800D6DF0 0D1704 002C+00 2/2 0/0 0/0 .text checkMiddleBossGoronRoom__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkMiddleBossGoronRoom() { - nofralloc -#include "asm/d/a/d_a_alink/checkMiddleBossGoronRoom__9daAlink_cFv.s" +bool daAlink_c::checkMiddleBossGoronRoom() { + return checkStageName("D_MN04B"); } -#pragma pop /* 800D6DF0-800D6E24 0D1730 0034+00 1/0 0/0 0/0 .text setDkCaught__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDkCaught(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setDkCaught__9daAlink_cFP10fopAc_ac_c.s" +void daAlink_c::setDkCaught(fopAc_ac_c* param_0) { + if (!i_checkNoResetFlg1(FLG1_UNK_1)) { + i_onNoResetFlg1(FLG1_UNK_1); + field_0x28f8 = fopAcM_GetID(param_0); + } } -#pragma pop /* 800D6E24-800D6F00 0D1764 00DC+00 2/2 0/0 0/0 .text freezeTimerDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::freezeTimerDamage() { - nofralloc -#include "asm/d/a/d_a_alink/freezeTimerDamage__9daAlink_cFv.s" +void daAlink_c::freezeTimerDamage() { + field_0x3008--; + field_0x300a++; + + if (field_0x300a % 45 == 0) { + setDamagePoint(1, 1, 0, 0); + } + + if (escapeTrigger()) { + field_0x3008 -= 2; + } + + if (checkInputOnR() && abs((s16)(mStickAngle - mPrevStickAngle)) > 0x1000) { + field_0x3008 -= 2; + } + + if (field_0x3008 < 0) { + field_0x3008 = 0; + } } -#pragma pop /* 800D6F00-800D6F2C 0D1840 002C+00 1/0 0/0 0/0 .text onPressedDamage__9daAlink_cFRC4cXyzs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::onPressedDamage(cXyz const& param_0, s16 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/onPressedDamage__9daAlink_cFRC4cXyzs.s" +void daAlink_c::onPressedDamage(cXyz const& param_0, s16 param_1) { + i_onNoResetFlg2(FLG2_UNK_1000); + field_0x3104 = param_1; + field_0x3744 = param_0; } -#pragma pop /* 800D6F2C-800D6FE0 0D186C 00B4+00 3/3 0/0 0/0 .text checkNoLandDamageSlidePolygon__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkNoLandDamageSlidePolygon() { +asm BOOL daAlink_c::checkNoLandDamageSlidePolygon() { nofralloc #include "asm/d/a/d_a_alink/checkNoLandDamageSlidePolygon__9daAlink_cFv.s" } #pragma pop /* 800D6FE0-800D70A0 0D1920 00C0+00 6/6 0/0 0/0 .text checkCutLandDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutLandDamage() { - nofralloc -#include "asm/d/a/d_a_alink/checkCutLandDamage__9daAlink_cFv.s" +void daAlink_c::checkCutLandDamage() { + if (!checkEventRun()) { + f32 var_f31 = (mFallHeight - current.pos.y) * lit_8782; + + if (var_f31 >= daAlinkHIO_damFall_c0::m.mSmallDmgHeight && !checkNoLandDamageSlidePolygon()) { + if (var_f31 >= daAlinkHIO_damFall_c0::m.mBigDmgHeight) { + setLandDamagePoint(8); + } else { + setLandDamagePoint(4); + } + + onModeFlg(8); + } + } } -#pragma pop /* 800D70A0-800D7160 0D19E0 00C0+00 2/2 0/0 0/0 .text checkCaughtEscapeCutTurn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCaughtEscapeCutTurn() { - nofralloc -#include "asm/d/a/d_a_alink/checkCaughtEscapeCutTurn__9daAlink_cFv.s" +BOOL daAlink_c::checkCaughtEscapeCutTurn() { + if (mLinkAcch.ChkGroundHit() && (i_checkSwordGet() || i_checkWolf()) && checkCutTurnInputTrigger()) { + if (i_checkWolf()) { + return procWolfRollAttackInit(2, 0); + } + + if (mEquipItem != 0x103) { + deleteEquipItem(0, 0); + setSwordModel(); + } + + return procCutTurnInit(1, 2); + } + + return 0; } -#pragma pop /* 800D7160-800D7208 0D1AA0 00A8+00 1/0 0/0 0/0 .text setThrowDamage__9daAlink_cFsffiii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::setThrowDamage(s16 param_0, f32 param_1, f32 param_2, int param_3, int param_4, +bool daAlink_c::setThrowDamage(s16 param_0, f32 param_1, f32 param_2, int param_3, int param_4, int param_5) { - nofralloc -#include "asm/d/a/d_a_alink/setThrowDamage__9daAlink_cFsffiii.s" + field_0x3408 = param_1; + field_0x340c = param_2; + field_0x318c = param_3; + field_0x2ffe = param_0; + + if (param_4) { + i_onEndResetFlg0(ERFLG0_UNK_40); + } else { + i_onEndResetFlg0(ERFLG0_UNK_80); + } + + if (param_5 == 1) { + i_onEndResetFlg0(ERFLG0_UNK_40000000); + } else if (param_5 == 2) { + i_onEndResetFlg1(ERFLG1_UNK_80); + } + + if (i_getSumouMode()) { + cancelSumouMode(); + } + + return true; } -#pragma pop /* 800D7208-800D72BC 0D1B48 00B4+00 2/2 0/0 0/0 .text damageMagnification__9daAlink_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 daAlink_c::damageMagnification(int param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/damageMagnification__9daAlink_cFii.s" +f32 daAlink_c::damageMagnification(int i_checkZoraMag, int param_1) { + f32 base_mag; + + if (param_1 == 0 && i_checkNoResetFlg3(FLG3_UNK_40000000) && !i_checkEndResetFlg2(ERFLG2_UNK_40)) { + base_mag = lit_7624; /* 1.5 */ + } else { + base_mag = lit_6040; /* 1.0 */ + } + + if (i_checkWolf() && !checkCargoCarry() && param_1 == 0) { + return /* 2.0 */ lit_7307 * base_mag; + } + + if (checkZoraWearAbility() && i_checkZoraMag) { + return /* 10.0 */ lit_7625 * base_mag; + } + + return base_mag; } -#pragma pop /* 800D72BC-800D7478 0D1BFC 01BC+00 6/6 1/1 0/0 .text setDamagePoint__9daAlink_cFiiii */ +// regalloc and literals +#ifdef NONMATCHING +int daAlink_c::setDamagePoint(int i_dmgAmount, int i_checkZoraMag, int i_setDmgTimer, int param_3) { + if (i_dmgAmount <= 0) { + i_dComIfGp_setItemLifeCount(-i_dmgAmount, 0); + return 0; + } + + f32 magnified_dmgF = (f32)i_dmgAmount * damageMagnification(i_checkZoraMag, param_3); + int magnified_dmg = magnified_dmgF; + if ((int)(magnified_dmgF * 10.0f) % 10 != 0) { + magnified_dmg++; + } + + if (i_checkWolf()) { + offWolfEyeUp(); + } + + if (checkMagicArmorNoDamage()) { + i_dComIfGp_setItemRupeeCount(-magnified_dmg * 10); + } else { + i_dComIfGp_setItemLifeCount(-magnified_dmg, 0); + } + + i_onResetFlg1(0x400); + mSwordUpTimer = 0; + + if (i_setDmgTimer) { + mDamageTimer = daAlinkHIO_damage_c0::m.mInvincibleTime; + setDamageColorTime(); + } + + field_0x3006 = 0; + + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::setDamagePoint(int param_0, int param_1, int param_2, int param_3) { +asm int daAlink_c::setDamagePoint(int param_0, int param_1, int param_2, int param_3) { nofralloc #include "asm/d/a/d_a_alink/setDamagePoint__9daAlink_cFiiii.s" } #pragma pop +#endif /* 800D7478-800D74A4 0D1DB8 002C+00 6/6 0/0 0/0 .text setDamagePointNormal__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDamagePointNormal(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setDamagePointNormal__9daAlink_cFi.s" +void daAlink_c::setDamagePointNormal(int i_dmgAmount) { + setDamagePoint(i_dmgAmount, FALSE, TRUE, 0); } -#pragma pop /* 800D74A4-800D74F4 0D1DE4 0050+00 3/3 0/0 0/0 .text setLandDamagePoint__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setLandDamagePoint(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setLandDamagePoint__9daAlink_cFi.s" +void daAlink_c::setLandDamagePoint(int i_dmgAmount) { + i_onEndResetFlg2(ERFLG2_UNK_40); + setDamagePoint(i_dmgAmount, FALSE, TRUE, 0); + i_offEndResetFlg2(ERFLG2_UNK_40); } -#pragma pop /* 800D74F4-800D76C4 0D1E34 01D0+00 11/11 0/0 0/0 .text getDamageVec__9daAlink_cFP12dCcD_GObjInf */ @@ -165,35 +224,29 @@ asm void daAlink_c::getDamageVec(dCcD_GObjInf* param_0) { #pragma pop /* 800D76C4-800D7768 0D2004 00A4+00 1/1 0/0 0/0 .text setDashDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDashDamage() { - nofralloc -#include "asm/d/a/d_a_alink/setDashDamage__9daAlink_cFv.s" +void daAlink_c::setDashDamage() { + setUpperAnimeParam(0xAD, UPPER_2, &daAlinkHIO_damage_c0::m.mDashDmgAnm); + setFacePriBck(0x121); + setFacePriTexture(FTANM_UNK_27); + voiceStart(Z2SE_AL_V_DAMAGE_S); + seStartOnlyReverb(Z2SE_AL_DAMAGE_NORMAL); + freeGrabItem(); } -#pragma pop /* 800D7768-800D77C8 0D20A8 0060+00 2/2 0/0 3/3 .text * checkIcePolygonDamage__9daAlink_cFP13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkIcePolygonDamage(cBgS_PolyInfo* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkIcePolygonDamage__9daAlink_cFP13cBgS_PolyInfo.s" +bool daAlink_c::checkIcePolygonDamage(cBgS_PolyInfo* i_poly) { + if (dComIfG_Bgsp().GetPolyAtt0(*i_poly) == 8 && dKy_pol_argument_get(i_poly) & 0x60) { + return true; + } + + return false; } -#pragma pop /* 800D77C8-800D7820 0D2108 0058+00 8/8 0/0 0/0 .text checkMagicArmorNoDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkMagicArmorNoDamage() { - nofralloc -#include "asm/d/a/d_a_alink/checkMagicArmorNoDamage__9daAlink_cFv.s" +BOOL daAlink_c::checkMagicArmorNoDamage() { + return checkMagicArmorWearAbility() && !checkMagicArmorHeavy(); } -#pragma pop /* 800D7820-800D7A98 0D2160 0278+00 1/1 0/0 0/0 .text checkPolyDamage__9daAlink_cFv */ #pragma push @@ -217,57 +270,38 @@ asm void daAlink_c::checkElecReturnDamage(dCcD_GObjInf& param_0, fopAc_ac_c** pa #pragma pop /* 800D7B18-800D7BE8 0D2458 00D0+00 1/1 0/0 0/0 .text damageTimerCount__9daAlink_cFv */ -#ifdef NONMATCHING void daAlink_c::damageTimerCount() { if (!i_checkModeFlg(8)) { if (mDamageColorTime != 0) { mDamageColorTime--; } + mDamageTimer--; - if (mProcID != PROC_DK_CAUGHT && i_checkNoResetFlg1(1)) { + if (mProcID != PROC_DK_CAUGHT && i_checkNoResetFlg1(FLG1_UNK_1)) { i_offNoResetFlg1(1); } - if (checkDkCaught2Anime() && i_checkNoResetFlg0(FLG0_UNK_20000)) { + if (!checkDkCaught2Anime() && i_checkNoResetFlg0(FLG0_UNK_20000)) { i_offNoResetFlg0(FLG0_UNK_20000); } } else if (mDamageColorTime != 0) { mDamageColorTime--; - if (mDamageColorTime + mDamageTimer == 0) { + if ((mDamageColorTime + mDamageTimer) % 16 == 0) { + setDamageColorTime(); } } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::damageTimerCount() { - nofralloc -#include "asm/d/a/d_a_alink/damageTimerCount__9daAlink_cFv.s" -} -#pragma pop -#endif /* 800D7BE8-800D7C14 0D2528 002C+00 3/3 0/0 0/0 .text checkHugeAttack__9daAlink_cCFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHugeAttack(int param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkHugeAttack__9daAlink_cCFi.s" +bool daAlink_c::checkHugeAttack(int param_0) const { + return param_0 == 2 || param_0 == 7 || param_0 == 11 || param_0 == 14; } -#pragma pop /* 800D7C14-800D7C40 0D2554 002C+00 3/3 0/0 0/0 .text checkLargeAttack__9daAlink_cCFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkLargeAttack(int param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkLargeAttack__9daAlink_cCFi.s" +bool daAlink_c::checkLargeAttack(int param_0) const { + return param_0 == 1 || param_0 == 6 || param_0 == 10 || param_0 == 13; } -#pragma pop /* 800D7C40-800D8F3C 0D2580 12FC+00 1/1 0/0 0/0 .text checkDamageAction__9daAlink_cFv */ #pragma push @@ -284,7 +318,7 @@ asm BOOL daAlink_c::checkDamageAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procDamageInit(dCcD_GObjInf* param_0, int param_1) { +asm int daAlink_c::procDamageInit(dCcD_GObjInf* param_0, int param_1) { nofralloc #include "asm/d/a/d_a_alink/procDamageInit__9daAlink_cFP12dCcD_GObjInfi.s" } @@ -294,7 +328,7 @@ asm void daAlink_c::procDamageInit(dCcD_GObjInf* param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procDamage() { +asm int daAlink_c::procDamage() { nofralloc #include "asm/d/a/d_a_alink/procDamage__9daAlink_cFv.s" } @@ -305,7 +339,7 @@ asm void daAlink_c::procDamage() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoLargeDamageInit(int param_0, int param_1, s16 param_2, s16 param_3, +asm int daAlink_c::procCoLargeDamageInit(int param_0, int param_1, s16 param_2, s16 param_3, dCcD_GObjInf* param_4, int param_5) { nofralloc #include "asm/d/a/d_a_alink/procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi.s" @@ -316,7 +350,7 @@ asm void daAlink_c::procCoLargeDamageInit(int param_0, int param_1, s16 param_2, #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoLargeDamage() { +asm int daAlink_c::procCoLargeDamage() { nofralloc #include "asm/d/a/d_a_alink/procCoLargeDamage__9daAlink_cFv.s" } @@ -326,7 +360,7 @@ asm void daAlink_c::procCoLargeDamage() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16 param_3) { +asm int daAlink_c::procLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16 param_3) { nofralloc #include "asm/d/a/d_a_alink/procLargeDamageUpInit__9daAlink_cFiiss.s" } @@ -336,7 +370,7 @@ asm void daAlink_c::procLargeDamageUpInit(int param_0, int param_1, s16 param_2, #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLargeDamageUp() { +asm int daAlink_c::procLargeDamageUp() { nofralloc #include "asm/d/a/d_a_alink/procLargeDamageUp__9daAlink_cFv.s" } @@ -347,7 +381,7 @@ asm void daAlink_c::procLargeDamageUp() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoLargeDamageWallInit(int param_0, int param_1, s16 param_2, s16 param_3) { +asm int daAlink_c::procCoLargeDamageWallInit(int param_0, int param_1, s16 param_2, s16 param_3) { nofralloc #include "asm/d/a/d_a_alink/procCoLargeDamageWallInit__9daAlink_cFiiss.s" } @@ -355,62 +389,98 @@ asm void daAlink_c::procCoLargeDamageWallInit(int param_0, int param_1, s16 para /* 800DAC28-800DAC84 0D5568 005C+00 1/0 0/0 0/0 .text procCoLargeDamageWall__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoLargeDamageWall() { - nofralloc -#include "asm/d/a/d_a_alink/procCoLargeDamageWall__9daAlink_cFv.s" +int daAlink_c::procCoLargeDamageWall() { + if (mUnderFrameCtrl[0].checkAnmEnd()) { + procCoLargeDamageInit(field_0x3198, field_0x3008, field_0x3080, field_0x3082, NULL, 0); + } + + return 1; } -#pragma pop /* 800DAC84-800DAD90 0D55C4 010C+00 2/2 0/0 0/0 .text procCoPolyDamageInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoPolyDamageInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoPolyDamageInit__9daAlink_cFv.s" +int daAlink_c::procCoPolyDamageInit() { + seStartOnlyReverb(Z2SE_AL_DAMAGE_NORMAL); + + if (!i_checkWolf()) { + voiceStart(Z2SE_AL_V_DAMAGE_S); + } + + if (checkIronBallWaitAnime()) { + return 1; + } + + commonProcInit(PROC_POLY_DAMAGE); + + if (i_checkWolf()) { + setSingleAnimeWolfParam(WANM_DMG_SMALL, &daAlinkHIO_wlDamage_c0::m.field_0x14); + voiceStart(Z2SE_WL_V_DAMAGE); + field_0x3478 = daAlinkHIO_wlDamage_c0::m.field_0x14.mCheckFrame; + } else { + setSingleAnimeParam(ANM_DMG, &daAlinkHIO_damage_c0::m.mFloorDmgAnm); + field_0x3478 = daAlinkHIO_damage_c0::m.mFloorDmgAnm.mCheckFrame; + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + return 1; } -#pragma pop /* 800DAD90-800DAE10 0D56D0 0080+00 1/0 0/0 0/0 .text procCoPolyDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoPolyDamage() { - nofralloc -#include "asm/d/a/d_a_alink/procCoPolyDamage__9daAlink_cFv.s" +int daAlink_c::procCoPolyDamage() { + if (mUnderFrameCtrl[0].checkAnmEnd()) { + commonCheckNextAction(0); + } else if (mUnderFrameCtrl[0].getFrame() > field_0x3478) { + if (!i_checkWolf()) { + onModeFlg(4); + } + + commonCheckNextAction(1); + } + + return 1; } -#pragma pop /* 800DAE10-800DB060 0D5750 0250+00 2/2 0/0 0/0 .text procLandDamageInit__9daAlink_cFi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLandDamageInit(int param_0) { +asm int daAlink_c::procLandDamageInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procLandDamageInit__9daAlink_cFi.s" } #pragma pop /* 800DB060-800DB140 0D59A0 00E0+00 1/0 0/0 0/0 .text procLandDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLandDamage() { - nofralloc -#include "asm/d/a/d_a_alink/procLandDamage__9daAlink_cFv.s" +int daAlink_c::procLandDamage() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (field_0x3198 != 0) { + if (frameCtrl->checkAnmEnd()) { + checkNextAction(0); + } else if (frameCtrl->getFrame() > daAlinkHIO_damFall_c0::m.mStandAnm.mCheckFrame) { + onModeFlg(4); + checkNextAction(1); + } + } else { + if (frameCtrl->checkAnmEnd()) { + if (field_0x3008 > 0) { + field_0x3008--; + } else { + setSingleAnimeParam(ANM_DMG_FALL_RECOVER, &daAlinkHIO_damFall_c0::m.mStandAnm); + field_0x3198 = 1; + } + } + } + + return 1; } -#pragma pop /* 800DB140-800DB418 0D5A80 02D8+00 1/1 0/0 0/0 .text * procCoElecDamageInit__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoElecDamageInit(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, int param_2) { +asm int daAlink_c::procCoElecDamageInit(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, int param_2) { nofralloc #include "asm/d/a/d_a_alink/procCoElecDamageInit__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfi.s" } @@ -420,37 +490,45 @@ asm void daAlink_c::procCoElecDamageInit(fopAc_ac_c* param_0, dCcD_GObjInf* para #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoElecDamage() { +asm int daAlink_c::procCoElecDamage() { nofralloc #include "asm/d/a/d_a_alink/procCoElecDamage__9daAlink_cFv.s" } #pragma pop /* 800DB5B0-800DB610 0D5EF0 0060+00 2/2 0/0 0/0 .text procStEscapeInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procStEscapeInit() { - nofralloc -#include "asm/d/a/d_a_alink/procStEscapeInit__9daAlink_cFv.s" +int daAlink_c::procStEscapeInit() { + commonProcInit(PROC_HUMAN_ST_ESCAPE); + setSingleAnimeParam(ANM_FROZEN_FREE, &daAlinkHIO_damCaught_c0::m.field_0x0); + + f32 tmp_7 = lit_8502; + mUnderFrameCtrl[0].setFrame(tmp_7); + getNowAnmPackUnder(UNDER_0)->setFrame(tmp_7); + mNormalSpeed = FLOAT_LABEL(lit_6108); + + return 1; } -#pragma pop /* 800DB610-800DB6A4 0D5F50 0094+00 1/0 0/0 0/0 .text procStEscape__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procStEscape() { - nofralloc -#include "asm/d/a/d_a_alink/procStEscape__9daAlink_cFv.s" +int daAlink_c::procStEscape() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + i_onEndResetFlg0(ERFLG0_UNK_8000000); + + if (frameCtrl->checkAnmEnd()) { + checkNextAction(0); + } else if (frameCtrl->getFrame() > daAlinkHIO_damCaught_c0::m.field_0x0.mCheckFrame) { + onModeFlg(4); + checkNextAction(1); + } + + return 1; } -#pragma pop /* 800DB6A4-800DB860 0D5FE4 01BC+00 1/1 0/0 0/0 .text procDkCaughtInit__9daAlink_cFUi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procDkCaughtInit(unsigned int param_0) { +asm int daAlink_c::procDkCaughtInit(unsigned int param_0) { nofralloc #include "asm/d/a/d_a_alink/procDkCaughtInit__9daAlink_cFUi.s" } @@ -460,99 +538,159 @@ asm void daAlink_c::procDkCaughtInit(unsigned int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procDkCaught() { +asm int daAlink_c::procDkCaught() { nofralloc #include "asm/d/a/d_a_alink/procDkCaught__9daAlink_cFv.s" } #pragma pop /* 800DBC98-800DBD1C 0D65D8 0084+00 2/2 0/0 0/0 .text setScreamWaitAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setScreamWaitAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setScreamWaitAnime__9daAlink_cFv.s" +void daAlink_c::setScreamWaitAnime() { + setSingleAnimeBase(ANM_WAIT_F); + voiceStart(Z2SE_AL_V_TERRORED); + mCommonCounter = 1; + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + dComIfGp_getVibration().StartQuake(5, 1, cXyz(tmp_0, lit_6040, tmp_0)); } -#pragma pop /* 800DBD1C-800DBDA4 0D665C 0088+00 1/1 0/0 0/0 .text procScreamWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procScreamWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procScreamWaitInit__9daAlink_cFv.s" +int daAlink_c::procScreamWaitInit() { + commonProcInit(PROC_SCREAM_WAIT); + + if (i_checkEndResetFlg1(ERFLG1_UNK_2)) { + setScreamWaitAnime(); + } else { + setSingleAnimeBaseSpeed(ANM_WAIT, daAlinkHIO_move_c0::m.mWaitAnmSpeed, daAlinkHIO_basic_c0::m.mAnmBlendFactor); + mCommonCounter = 0; + } + + current.angle.y = shape_angle.y; + mNormalSpeed = FLOAT_LABEL(lit_6108); + return 1; } -#pragma pop /* 800DBDA4-800DBE00 0D66E4 005C+00 1/0 0/0 0/0 .text procScreamWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procScreamWait() { - nofralloc -#include "asm/d/a/d_a_alink/procScreamWait__9daAlink_cFv.s" +int daAlink_c::procScreamWait() { + i_onEndResetFlg0(ERFLG0_UNK_8000000); + + if (!i_checkEndResetFlg1(ERFLG1_UNK_1)) { + checkNextAction(0); + } else if (mCommonCounter == 0 && i_checkEndResetFlg1(ERFLG1_UNK_2)) { + setScreamWaitAnime(); + } + + return 1; } -#pragma pop /* 800DBE00-800DBE74 0D6740 0074+00 1/1 0/0 0/0 .text procCoSandWallHitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoSandWallHitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoSandWallHitInit__9daAlink_cFv.s" +int daAlink_c::procCoSandWallHitInit() { + if (!commonProcInitNotSameProc(PROC_SAND_WALL_HIT)) { + return 1; + } + + if (i_checkWolf()) { + setSingleAnimeWolfBase(WANM_WAIT_WIND); + } else { + setSingleAnimeBase(ANM_WAIT_WIND); + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + + return 1; } -#pragma pop /* 800DBE74-800DBED8 0D67B4 0064+00 1/0 0/0 0/0 .text procCoSandWallHit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoSandWallHit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoSandWallHit__9daAlink_cFv.s" +int daAlink_c::procCoSandWallHit() { + if (mLinkAcch.ChkGroundHit()) { + offModeFlg(2); + } + + if (!i_checkEndResetFlg1(ERFLG1_UNK_400)) { + setDamagePointNormal(1); + procCoPolyDamageInit(); + } + + return 1; } -#pragma pop /* 800DBED8-800DC214 0D6818 033C+00 1/1 0/0 0/0 .text procCoLavaReturnInit__9daAlink_cFi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoLavaReturnInit(int param_0) { +asm int daAlink_c::procCoLavaReturnInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procCoLavaReturnInit__9daAlink_cFi.s" } #pragma pop /* 800DC214-800DC278 0D6B54 0064+00 1/0 0/0 0/0 .text procCoLavaReturn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoLavaReturn() { - nofralloc -#include "asm/d/a/d_a_alink/procCoLavaReturn__9daAlink_cFv.s" +int daAlink_c::procCoLavaReturn() { + cLib_chaseF(&mSinkShapeOffset, FLOAT_LABEL(lit_6108), lit_7977); + + if (mUnderFrameCtrl[0].checkAnmEnd()) { + startRestartRoom(field_0x32cc, 0xC9, field_0x3198, 1); + } + + return 1; } -#pragma pop /* 800DC278-800DC474 0D6BB8 01FC+00 1/1 0/0 0/0 .text procCoSwimFreezeReturnInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoSwimFreezeReturnInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoSwimFreezeReturnInit__9daAlink_cFv.s" +int daAlink_c::procCoSwimFreezeReturnInit() { + if (!dComIfGp_event_compulsory(this, 0, 0xFFFF)) { + return 0; + } + + mDemo.i_setSpecialDemoType(); + u32 chk_40000 = i_checkModeFlg(0x40000); + + if (!commonProcInitNotSameProc(PROC_SWIM_FREEZE_RETURN)) { + return 1; + } + + i_onNoResetFlg0(FLG0_UNK_100); + J3DTransformInfo* transInfo = field_0x2060->getOldFrameTransInfo(0); + + f32 var_f31; + if (i_checkWolf()) { + setSingleAnimeWolfBaseSpeed(WANM_SWIM_WAIT, daAlinkHIO_wlDamNormal_c0::m.field_0x5C, lit_7625); + mUnderFrameCtrl[0].setEnd(3); + mUnderFrameCtrl[0].setAttribute(0); + setFaceBasicTexture(FTANM_UNK_90); + field_0x2f9b = 1; + var_f31 = daAlinkHIO_wlSwim_c0::m.field_0x48; + } else { + setSingleAnime(ANM_SWIM_DMG_FREEZE, daAlinkHIO_damNormal_c0::m.field_0x60, FLOAT_LABEL(lit_6108), 5, lit_7625); + voiceStart(Z2SE_AL_V_DAMAGE_FREEZE); + var_f31 = daAlinkHIO_swim_c0::m.mInitHeight; + } + + seStartOnlyReverb(Z2SE_AL_FREEZE); + + if (!chk_40000) { + transInfo->mTranslate.y -= var_f31; + current.pos.y = mWaterY; + } + + field_0x3080 = 0; + mDamageTimer = 0; + mNormalSpeed = FLOAT_LABEL(lit_6108); + i_onNoResetFlg1(FLG1_UNK_40000000); + field_0x3194 = 1; + + u32 id = fopAcM_GetID(this); + dCam_getBody()->StartEventCamera(9, id, "Type", 1, &field_0x3194, 0); + mCommonCounter = 0x2D; + return 1; } -#pragma pop /* 800DC474-800DC548 0D6DB4 00D4+00 1/0 0/0 0/0 .text procCoSwimFreezeReturn__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoSwimFreezeReturn() { +asm int daAlink_c::procCoSwimFreezeReturn() { nofralloc #include "asm/d/a/d_a_alink/procCoSwimFreezeReturn__9daAlink_cFv.s" } diff --git a/src/d/a/d_a_alink_demo.inc b/src/d/a/d_a_alink_demo.inc index b9b983841f9..3358f549753 100644 --- a/src/d/a/d_a_alink_demo.inc +++ b/src/d/a/d_a_alink_demo.inc @@ -1,3 +1,5 @@ +#include "f_op/f_op_msg_mng.h" + /* 80115C20-80115C50 110560 0030+00 72/72 0/0 0/0 .text checkEventRun__9daAlink_cCFv */ BOOL daAlink_c::checkEventRun() const { return i_dComIfGp_event_runCheck() || checkPlayerDemoMode(); @@ -37,14 +39,9 @@ asm int daAlink_c::checkDemoAction() { /* 80116E60-80116E9C 1117A0 003C+00 4/4 0/0 0/0 .text checkDemoMoveMode__9daAlink_cCFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkDemoMoveMode(u32 param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkDemoMoveMode__9daAlink_cCFUl.s" +bool daAlink_c::checkDemoMoveMode(u32 i_mode) const { + return i_mode == 2 || i_mode == 3 || i_mode == 0x26; } -#pragma pop /* 80116E9C-80117064 1117DC 01C8+00 1/1 0/0 0/0 .text setDemoMoveData__9daAlink_cFPUlPC4cXyz */ #pragma push @@ -77,35 +74,42 @@ asm void daAlink_c::setDemoData() { #pragma pop /* 80117B90-80117C34 1124D0 00A4+00 1/1 0/0 0/0 .text resetDemoBck__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetDemoBck() { - nofralloc -#include "asm/d/a/d_a_alink/resetDemoBck__9daAlink_cFv.s" +void daAlink_c::resetDemoBck() { + mAnmHeap7.resetArcNo(); + mAnmHeap5.resetArcNo(); + mAnmHeap6.resetArcNo(); + mUnderAnmHeap[0].resetArcNo(); + mUnderAnmHeap[0].resetIdx(); + mAnmHeap7.resetIdx(); + mAnmHeap5.resetIdx(); + mAnmHeap6.resetIdx(); + + if (i_checkWolf()) { + setSingleAnimeWolfBaseSpeed(WANM_WAIT, daAlinkHIO_wlMoveNoP_c0::m.field_0x14, daAlinkHIO_wlMove_c0::m.field_0x94); + setFaceBasicAnime(ANM_WAIT); + } else { + setSingleAnimeBaseSpeed(ANM_WAIT, daAlinkHIO_move_c0::m.mWaitAnmSpeed, daAlinkHIO_basic_c0::m.mAnmBlendFactor); + } } -#pragma pop /* 80117C34-80117C90 112574 005C+00 3/3 0/0 0/0 .text endHighModel__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::endHighModel() { - nofralloc -#include "asm/d/a/d_a_alink/endHighModel__9daAlink_cFv.s" +void daAlink_c::endHighModel() { + if (field_0x068c != NULL) { + mpDemoFCTongueModel->getModelData()->removeTexMtxAnimator(field_0x068c); + } + + i_offNoResetFlg1(FLG1_UNK_10); + field_0x0698 = NULL; + field_0x068c = NULL; } -#pragma pop /* 80117C90-80117CF8 1125D0 0068+00 21/21 0/0 0/0 .text resetSpecialEvent__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetSpecialEvent() { - nofralloc -#include "asm/d/a/d_a_alink/resetSpecialEvent__9daAlink_cFv.s" +void daAlink_c::resetSpecialEvent() { + i_dComIfGp_event_reset(); + dCam_getBody()->EndEventCamera(fopAcM_GetID(this)); + endDemoMode(); } -#pragma pop /* 80117CF8-801180EC 112638 03F4+00 4/4 0/0 0/0 .text endDemoMode__9daAlink_cFv */ #pragma push @@ -118,24 +122,36 @@ asm void daAlink_c::endDemoMode() { #pragma pop /* 801180EC-80118170 112A2C 0084+00 2/2 0/0 0/0 .text getDemoLookActor__9daAlink_cFv */ +// weird gameinfo load +#ifdef NONMATCHING +fopAc_ac_c* daAlink_c::getDemoLookActor() { + if (mDemo.getParam0() == 1) { + return (fopAc_ac_c*)dComIfGp_event_getPt1(); + } else if (mDemo.getParam0() == 2) { + return (fopAc_ac_c*)dComIfGp_event_getPt2(); + } else if (mDemo.getParam0() == 3) { + return (fopAc_ac_c*)fopAcM_getTalkEventPartner(this); + } else if (mDemo.getParam0() == 4) { + return getMidnaActor(); + } + + return NULL; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getDemoLookActor() { +asm fopAc_ac_c* daAlink_c::getDemoLookActor() { nofralloc #include "asm/d/a/d_a_alink/getDemoLookActor__9daAlink_cFv.s" } #pragma pop +#endif /* 80118170-801181A0 112AB0 0030+00 4/4 0/0 0/0 .text checkFlyAtnWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkFlyAtnWait() { - nofralloc -#include "asm/d/a/d_a_alink/checkFlyAtnWait__9daAlink_cFv.s" +BOOL daAlink_c::checkFlyAtnWait() { + return mDemo.getDemoMode() == 0x17 && (mDemo.getParam1() == 4 || mDemo.getParam1() == 5); } -#pragma pop /* 801181A0-801182D4 112AE0 0134+00 2/2 0/0 0/0 .text setGetItemFace__9daAlink_cFUs */ #pragma push @@ -149,14 +165,10 @@ asm void daAlink_c::setGetItemFace(u16 param_0) { /* 801182D4-80118308 112C14 0034+00 2/2 0/0 0/0 .text checkGrabTalkActor__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGrabTalkActor(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabTalkActor__9daAlink_cFP10fopAc_ac_c.s" +BOOL daAlink_c::checkGrabTalkActor(fopAc_ac_c* i_actor) { + s16 name = fopAcM_GetName(i_actor); + return name == PROC_NPC_KYURY || name == PROC_MYNA || name == PROC_OBJ_SSITEM || name == PROC_TAG_MSG; } -#pragma pop /* 80118308-8011856C 112C48 0264+00 2/2 0/0 0/0 .text setTalkStartBack__9daAlink_cFP4cXyz */ @@ -211,14 +223,24 @@ asm void daAlink_c::setTradeItemOutHand() { #pragma pop /* 801187B4-80118840 1130F4 008C+00 5/5 0/0 0/0 .text checkEndMessage__9daAlink_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkEndMessage(u32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkEndMessage__9daAlink_cFUl.s" +BOOL daAlink_c::checkEndMessage(u32 param_0) { + if (mMsgClassID == -1) { + mMsgClassID = fopMsgM_messageSet(param_0, 1000); + } else { + msg_class* msg = fopMsgM_SearchByID(mMsgClassID); + + if (msg != NULL) { + if (msg->field_0xf8 == 14) { + msg->field_0xf8 = 16; + } else if (msg->field_0xf8 == 0x12) { + msg->field_0xf8 = 0x13; + return 1; + } + } + } + + return 0; } -#pragma pop /* 80118840-801188B0 113180 0070+00 1/1 0/0 0/0 .text setDemoRightHandIndex__9daAlink_cFUs */ #pragma push @@ -268,8 +290,8 @@ BOOL daAlink_c::checkFinalBattle() { } /* 80118B34-80118BF4 113474 00C0+00 3/3 0/0 0/0 .text checkRestartDead__9daAlink_cFii */ -BOOL daAlink_c::checkRestartDead(int i_dmgAmount, int param_1) { - i_dmgAmount *= (int)damageMagnification(param_1, 1); +BOOL daAlink_c::checkRestartDead(int i_dmgAmount, int i_checkZoraMag) { + i_dmgAmount *= (int)damageMagnification(i_checkZoraMag, 1); if (mProcID != PROC_DEAD && i_dmgAmount >= i_dComIfGs_getLife() && !checkMagicArmorNoDamage() && !dComIfGs_checkBottle(FAIRY)) { @@ -287,9 +309,9 @@ void daAlink_c::setDeadRideSyncPos() { if (i_checkReinRide()) { setSyncRidePos(); } else if (checkSpinnerRide()) { - s16 old_angle = mCollisionRot.y; + s16 old_angle = shape_angle.y; setSpinnerSyncPos(); - mCollisionRot.y = old_angle; + shape_angle.y = old_angle; } } } @@ -383,7 +405,7 @@ int daAlink_c::procDemoCommon() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoToolDemoInit() { +asm int daAlink_c::procCoToolDemoInit() { nofralloc #include "asm/d/a/d_a_alink/procCoToolDemoInit__9daAlink_cFv.s" } @@ -393,7 +415,7 @@ asm void daAlink_c::procCoToolDemoInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoToolDemo() { +asm int daAlink_c::procCoToolDemo() { nofralloc #include "asm/d/a/d_a_alink/procCoToolDemo__9daAlink_cFv.s" } @@ -403,7 +425,7 @@ asm void daAlink_c::procCoToolDemo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoTalkInit() { +asm int daAlink_c::procCoTalkInit() { nofralloc #include "asm/d/a/d_a_alink/procCoTalkInit__9daAlink_cFv.s" } @@ -413,7 +435,7 @@ asm void daAlink_c::procCoTalkInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoTalk() { +asm int daAlink_c::procCoTalk() { nofralloc #include "asm/d/a/d_a_alink/procCoTalk__9daAlink_cFv.s" } @@ -423,7 +445,7 @@ asm void daAlink_c::procCoTalk() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoOpenTreasureInit() { +asm int daAlink_c::procCoOpenTreasureInit() { nofralloc #include "asm/d/a/d_a_alink/procCoOpenTreasureInit__9daAlink_cFv.s" } @@ -433,7 +455,7 @@ asm void daAlink_c::procCoOpenTreasureInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoOpenTreasure() { +asm int daAlink_c::procCoOpenTreasure() { nofralloc #include "asm/d/a/d_a_alink/procCoOpenTreasure__9daAlink_cFv.s" } @@ -443,7 +465,7 @@ asm void daAlink_c::procCoOpenTreasure() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoUnequipInit() { +asm int daAlink_c::procCoUnequipInit() { nofralloc #include "asm/d/a/d_a_alink/procCoUnequipInit__9daAlink_cFv.s" } @@ -453,7 +475,7 @@ asm void daAlink_c::procCoUnequipInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoUnequip() { +asm int daAlink_c::procCoUnequip() { nofralloc #include "asm/d/a/d_a_alink/procCoUnequip__9daAlink_cFv.s" } @@ -505,7 +527,7 @@ asm bool daAlink_c::checkTreasureRupeeReturn(int param_0) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoGetItemInit() { +asm int daAlink_c::procCoGetItemInit() { nofralloc #include "asm/d/a/d_a_alink/procCoGetItemInit__9daAlink_cFv.s" } @@ -515,7 +537,7 @@ asm void daAlink_c::procCoGetItemInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoGetItem() { +asm int daAlink_c::procCoGetItem() { nofralloc #include "asm/d/a/d_a_alink/procCoGetItem__9daAlink_cFv.s" } @@ -525,7 +547,7 @@ asm void daAlink_c::procCoGetItem() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoTurnBackInit() { +asm int daAlink_c::procCoTurnBackInit() { nofralloc #include "asm/d/a/d_a_alink/procCoTurnBackInit__9daAlink_cFv.s" } @@ -535,7 +557,7 @@ asm void daAlink_c::procCoTurnBackInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoTurnBack() { +asm int daAlink_c::procCoTurnBack() { nofralloc #include "asm/d/a/d_a_alink/procCoTurnBack__9daAlink_cFv.s" } @@ -545,7 +567,7 @@ asm void daAlink_c::procCoTurnBack() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procDoorOpenInit() { +asm int daAlink_c::procDoorOpenInit() { nofralloc #include "asm/d/a/d_a_alink/procDoorOpenInit__9daAlink_cFv.s" } @@ -555,7 +577,7 @@ asm void daAlink_c::procDoorOpenInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procDoorOpen() { +asm int daAlink_c::procDoorOpen() { nofralloc #include "asm/d/a/d_a_alink/procDoorOpen__9daAlink_cFv.s" } @@ -565,7 +587,7 @@ asm void daAlink_c::procDoorOpen() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoLookWaitInit() { +asm int daAlink_c::procCoLookWaitInit() { nofralloc #include "asm/d/a/d_a_alink/procCoLookWaitInit__9daAlink_cFv.s" } @@ -575,7 +597,7 @@ asm void daAlink_c::procCoLookWaitInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoLookWait() { +asm int daAlink_c::procCoLookWait() { nofralloc #include "asm/d/a/d_a_alink/procCoLookWait__9daAlink_cFv.s" } @@ -585,7 +607,7 @@ asm void daAlink_c::procCoLookWait() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoDemoPushPullWaitInit() { +asm int daAlink_c::procCoDemoPushPullWaitInit() { nofralloc #include "asm/d/a/d_a_alink/procCoDemoPushPullWaitInit__9daAlink_cFv.s" } @@ -595,7 +617,7 @@ asm void daAlink_c::procCoDemoPushPullWaitInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoDemoPushMoveInit() { +asm int daAlink_c::procCoDemoPushMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procCoDemoPushMoveInit__9daAlink_cFv.s" } @@ -615,7 +637,7 @@ asm void daAlink_c::setMonkeyMoveAnime() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procMonkeyMoveInit() { +asm int daAlink_c::procMonkeyMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procMonkeyMoveInit__9daAlink_cFv.s" } @@ -625,7 +647,7 @@ asm void daAlink_c::procMonkeyMoveInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procMonkeyMove() { +asm int daAlink_c::procMonkeyMove() { nofralloc #include "asm/d/a/d_a_alink/procMonkeyMove__9daAlink_cFv.s" } @@ -635,7 +657,7 @@ asm void daAlink_c::procMonkeyMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procDemoBoomerangCatchInit() { +asm int daAlink_c::procDemoBoomerangCatchInit() { nofralloc #include "asm/d/a/d_a_alink/procDemoBoomerangCatchInit__9daAlink_cFv.s" } @@ -645,7 +667,7 @@ asm void daAlink_c::procDemoBoomerangCatchInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procDemoBoomerangCatch() { +asm int daAlink_c::procDemoBoomerangCatch() { nofralloc #include "asm/d/a/d_a_alink/procDemoBoomerangCatch__9daAlink_cFv.s" } @@ -655,7 +677,7 @@ asm void daAlink_c::procDemoBoomerangCatch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoDeadInit(int param_0) { +asm int daAlink_c::procCoDeadInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procCoDeadInit__9daAlink_cFi.s" } @@ -665,7 +687,7 @@ asm void daAlink_c::procCoDeadInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoDead() { +asm int daAlink_c::procCoDead() { nofralloc #include "asm/d/a/d_a_alink/procCoDead__9daAlink_cFv.s" } @@ -676,7 +698,7 @@ asm void daAlink_c::procCoDead() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoLookAroundInit() { +asm int daAlink_c::procCoLookAroundInit() { nofralloc #include "asm/d/a/d_a_alink/procCoLookAroundInit__9daAlink_cFv.s" } @@ -686,7 +708,7 @@ asm void daAlink_c::procCoLookAroundInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoLookAround() { +asm int daAlink_c::procCoLookAround() { nofralloc #include "asm/d/a/d_a_alink/procCoLookAround__9daAlink_cFv.s" } @@ -697,7 +719,7 @@ asm void daAlink_c::procCoLookAround() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBossAtnWaitInit() { +asm int daAlink_c::procBossAtnWaitInit() { nofralloc #include "asm/d/a/d_a_alink/procBossAtnWaitInit__9daAlink_cFv.s" } @@ -708,7 +730,7 @@ asm void daAlink_c::procBossAtnWaitInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoQuakeWaitInit() { +asm int daAlink_c::procCoQuakeWaitInit() { nofralloc #include "asm/d/a/d_a_alink/procCoQuakeWaitInit__9daAlink_cFv.s" } @@ -718,7 +740,7 @@ asm void daAlink_c::procCoQuakeWaitInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoCaughtInit() { +asm int daAlink_c::procCoCaughtInit() { nofralloc #include "asm/d/a/d_a_alink/procCoCaughtInit__9daAlink_cFv.s" } @@ -728,7 +750,7 @@ asm void daAlink_c::procCoCaughtInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLookUpInit() { +asm int daAlink_c::procLookUpInit() { nofralloc #include "asm/d/a/d_a_alink/procLookUpInit__9daAlink_cFv.s" } @@ -738,7 +760,7 @@ asm void daAlink_c::procLookUpInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLookUp() { +asm int daAlink_c::procLookUp() { nofralloc #include "asm/d/a/d_a_alink/procLookUp__9daAlink_cFv.s" } @@ -748,7 +770,7 @@ asm void daAlink_c::procLookUp() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLookUpToGetItemInit() { +asm int daAlink_c::procLookUpToGetItemInit() { nofralloc #include "asm/d/a/d_a_alink/procLookUpToGetItemInit__9daAlink_cFv.s" } @@ -759,7 +781,7 @@ asm void daAlink_c::procLookUpToGetItemInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLookUpToGetItem() { +asm int daAlink_c::procLookUpToGetItem() { nofralloc #include "asm/d/a/d_a_alink/procLookUpToGetItem__9daAlink_cFv.s" } @@ -769,7 +791,7 @@ asm void daAlink_c::procLookUpToGetItem() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHandPatInit() { +asm int daAlink_c::procHandPatInit() { nofralloc #include "asm/d/a/d_a_alink/procHandPatInit__9daAlink_cFv.s" } @@ -779,7 +801,7 @@ asm void daAlink_c::procHandPatInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHandPat() { +asm int daAlink_c::procHandPat() { nofralloc #include "asm/d/a/d_a_alink/procHandPat__9daAlink_cFv.s" } @@ -789,7 +811,7 @@ asm void daAlink_c::procHandPat() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoFogDeadInit() { +asm int daAlink_c::procCoFogDeadInit() { nofralloc #include "asm/d/a/d_a_alink/procCoFogDeadInit__9daAlink_cFv.s" } @@ -799,7 +821,7 @@ asm void daAlink_c::procCoFogDeadInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoFogDead() { +asm int daAlink_c::procCoFogDead() { nofralloc #include "asm/d/a/d_a_alink/procCoFogDead__9daAlink_cFv.s" } @@ -810,7 +832,7 @@ asm void daAlink_c::procCoFogDead() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfSmellWaitInit() { +asm int daAlink_c::procWolfSmellWaitInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfSmellWaitInit__9daAlink_cFv.s" } @@ -820,7 +842,7 @@ asm void daAlink_c::procWolfSmellWaitInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoNodInit() { +asm int daAlink_c::procCoNodInit() { nofralloc #include "asm/d/a/d_a_alink/procCoNodInit__9daAlink_cFv.s" } @@ -830,7 +852,7 @@ asm void daAlink_c::procCoNodInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoNod() { +asm int daAlink_c::procCoNod() { nofralloc #include "asm/d/a/d_a_alink/procCoNod__9daAlink_cFv.s" } @@ -840,7 +862,7 @@ asm void daAlink_c::procCoNod() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoEyeAwayInit() { +asm int daAlink_c::procCoEyeAwayInit() { nofralloc #include "asm/d/a/d_a_alink/procCoEyeAwayInit__9daAlink_cFv.s" } @@ -850,7 +872,7 @@ asm void daAlink_c::procCoEyeAwayInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoGlareInit() { +asm int daAlink_c::procCoGlareInit() { nofralloc #include "asm/d/a/d_a_alink/procCoGlareInit__9daAlink_cFv.s" } @@ -860,7 +882,7 @@ asm void daAlink_c::procCoGlareInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoGlare() { +asm int daAlink_c::procCoGlare() { nofralloc #include "asm/d/a/d_a_alink/procCoGlare__9daAlink_cFv.s" } @@ -871,7 +893,7 @@ asm void daAlink_c::procCoGlare() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGoatStopReadyInit() { +asm int daAlink_c::procGoatStopReadyInit() { nofralloc #include "asm/d/a/d_a_alink/procGoatStopReadyInit__9daAlink_cFv.s" } @@ -881,7 +903,7 @@ asm void daAlink_c::procGoatStopReadyInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGoatStopReady() { +asm int daAlink_c::procGoatStopReady() { nofralloc #include "asm/d/a/d_a_alink/procGoatStopReady__9daAlink_cFv.s" } @@ -892,7 +914,7 @@ asm void daAlink_c::procGoatStopReady() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoGetReadySitInit() { +asm int daAlink_c::procCoGetReadySitInit() { nofralloc #include "asm/d/a/d_a_alink/procCoGetReadySitInit__9daAlink_cFv.s" } @@ -902,7 +924,7 @@ asm void daAlink_c::procCoGetReadySitInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoGetReadySit() { +asm int daAlink_c::procCoGetReadySit() { nofralloc #include "asm/d/a/d_a_alink/procCoGetReadySit__9daAlink_cFv.s" } @@ -912,7 +934,7 @@ asm void daAlink_c::procCoGetReadySit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoTwGateInit() { +asm int daAlink_c::procCoTwGateInit() { nofralloc #include "asm/d/a/d_a_alink/procCoTwGateInit__9daAlink_cFv.s" } @@ -932,7 +954,7 @@ int daAlink_c::procCoTwGate() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfSnowEscapeInit() { +asm int daAlink_c::procWolfSnowEscapeInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfSnowEscapeInit__9daAlink_cFv.s" } @@ -942,7 +964,7 @@ asm void daAlink_c::procWolfSnowEscapeInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfSnowEscape() { +asm int daAlink_c::procWolfSnowEscape() { nofralloc #include "asm/d/a/d_a_alink/procWolfSnowEscape__9daAlink_cFv.s" } @@ -952,7 +974,7 @@ asm void daAlink_c::procWolfSnowEscape() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procZoraMoveInit() { +asm int daAlink_c::procZoraMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procZoraMoveInit__9daAlink_cFv.s" } @@ -962,7 +984,7 @@ asm void daAlink_c::procZoraMoveInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procZoraMove() { +asm int daAlink_c::procZoraMove() { nofralloc #include "asm/d/a/d_a_alink/procZoraMove__9daAlink_cFv.s" } @@ -972,7 +994,7 @@ asm void daAlink_c::procZoraMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLookAroundTurnInit() { +asm int daAlink_c::procLookAroundTurnInit() { nofralloc #include "asm/d/a/d_a_alink/procLookAroundTurnInit__9daAlink_cFv.s" } @@ -982,7 +1004,7 @@ asm void daAlink_c::procLookAroundTurnInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLookAroundTurn() { +asm int daAlink_c::procLookAroundTurn() { nofralloc #include "asm/d/a/d_a_alink/procLookAroundTurn__9daAlink_cFv.s" } @@ -993,7 +1015,7 @@ asm void daAlink_c::procLookAroundTurn() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procTradeItemOutInit() { +asm int daAlink_c::procTradeItemOutInit() { nofralloc #include "asm/d/a/d_a_alink/procTradeItemOutInit__9daAlink_cFv.s" } @@ -1003,7 +1025,7 @@ asm void daAlink_c::procTradeItemOutInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procTradeItemOut() { +asm int daAlink_c::procTradeItemOut() { nofralloc #include "asm/d/a/d_a_alink/procTradeItemOut__9daAlink_cFv.s" } @@ -1023,7 +1045,7 @@ asm void daAlink_c::checkLetterItem(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procNotUseItemInit(int param_0) { +asm int daAlink_c::procNotUseItemInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procNotUseItemInit__9daAlink_cFi.s" } @@ -1033,7 +1055,7 @@ asm void daAlink_c::procNotUseItemInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procNotUseItem() { +asm int daAlink_c::procNotUseItem() { nofralloc #include "asm/d/a/d_a_alink/procNotUseItem__9daAlink_cFv.s" } @@ -1043,7 +1065,7 @@ asm void daAlink_c::procNotUseItem() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSwordReadyInit() { +asm int daAlink_c::procSwordReadyInit() { nofralloc #include "asm/d/a/d_a_alink/procSwordReadyInit__9daAlink_cFv.s" } @@ -1053,7 +1075,7 @@ asm void daAlink_c::procSwordReadyInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSwordReady() { +asm int daAlink_c::procSwordReady() { nofralloc #include "asm/d/a/d_a_alink/procSwordReady__9daAlink_cFv.s" } @@ -1073,7 +1095,7 @@ asm void daAlink_c::setSwordPushAnime() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSwordPushInit() { +asm int daAlink_c::procSwordPushInit() { nofralloc #include "asm/d/a/d_a_alink/procSwordPushInit__9daAlink_cFv.s" } @@ -1083,7 +1105,7 @@ asm void daAlink_c::procSwordPushInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSwordPush() { +asm int daAlink_c::procSwordPush() { nofralloc #include "asm/d/a/d_a_alink/procSwordPush__9daAlink_cFv.s" } @@ -1094,7 +1116,7 @@ asm void daAlink_c::procSwordPush() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGanonFinishInit() { +asm int daAlink_c::procGanonFinishInit() { nofralloc #include "asm/d/a/d_a_alink/procGanonFinishInit__9daAlink_cFv.s" } @@ -1115,7 +1137,7 @@ bool daAlink_c::procGanonFinish() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCutFastReadyInit() { +asm int daAlink_c::procCutFastReadyInit() { nofralloc #include "asm/d/a/d_a_alink/procCutFastReadyInit__9daAlink_cFv.s" } @@ -1139,7 +1161,7 @@ int daAlink_c::procMasterSwordStickInit() { setSingleAnimeBase(ANM_DEMO_MASTER_SWORD_STICK); voiceStart(Z2SE_AL_V_MSTR_SW_STICK); mNormalSpeed = FLOAT_LABEL(lit_6108); - current.angle.y = mCollisionRot.y; + current.angle.y = shape_angle.y; mCommonCounter = 0; return 1; @@ -1181,7 +1203,7 @@ int daAlink_c::procMasterSwordPullInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procMasterSwordPull() { +asm int daAlink_c::procMasterSwordPull() { nofralloc #include "asm/d/a/d_a_alink/procMasterSwordPull__9daAlink_cFv.s" } @@ -1201,10 +1223,10 @@ int daAlink_c::procDungeonWarpReadyInit() { u32 id; if (checkItemSetButton(DUNGEON_EXIT) != 2) { - id = fopAcM_create(PROC_OBJ_TKS, 0, ¤t.pos, fopAcM_GetRoomNo(this), &mCollisionRot, + id = fopAcM_create(PROC_OBJ_TKS, 0, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); } else { - id = fopAcM_create(PROC_NPC_TKC, 2, ¤t.pos, fopAcM_GetRoomNo(this), &mCollisionRot, + id = fopAcM_create(PROC_NPC_TKC, 2, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); } @@ -1216,7 +1238,7 @@ int daAlink_c::procDungeonWarpReadyInit() { commonProcInit(PROC_DUNGEON_WARP_READY); setSingleAnimeBase(ANM_TRADE_ITEM_PULL_OUT); mNormalSpeed = FLOAT_LABEL(lit_6108); - current.angle.y = mCollisionRot.y; + current.angle.y = shape_angle.y; field_0x32cc = id; mCommonCounter = 0; keepItemData(); @@ -1229,7 +1251,7 @@ int daAlink_c::procDungeonWarpReadyInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procDungeonWarpReady() { +asm int daAlink_c::procDungeonWarpReady() { nofralloc #include "asm/d/a/d_a_alink/procDungeonWarpReady__9daAlink_cFv.s" } @@ -1253,7 +1275,7 @@ bool daAlink_c::procDungeonWarpInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procDungeonWarpInit() { +asm int daAlink_c::procDungeonWarpInit() { nofralloc #include "asm/d/a/d_a_alink/procDungeonWarpInit__9daAlink_cFv.s" } @@ -1273,7 +1295,7 @@ int daAlink_c::procDungeonWarp() { } f32 sin = cM_ssin(mCommonCounter); - mCollisionRot.y += (s16)(14336.0f * sin); + shape_angle.y += (s16)(14336.0f * sin); field_0x300e = 8.0f * sin + 24.0f * (1.0f - mScale.x); if (field_0x3012 != 0) { @@ -1293,7 +1315,7 @@ int daAlink_c::procDungeonWarp() { if (checkItemGet(DUNGEON_EXIT, 1)) { int escape = dStage_stagInfo_GetEscapeWarp(i_dComIfGp_getStage()->getStagInfo()); - dStage_changeScene(escape, 0.0f, 12, -1, mCollisionRot.y, -1); + dStage_changeScene(escape, 0.0f, 12, -1, shape_angle.y, -1); dMeter2Info_warpOutProc(); } else { dungeonReturnWarp(); @@ -1330,7 +1352,7 @@ asm int daAlink_c::procDungeonWarp() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procDungeonWarpSceneStartInit() { +asm int daAlink_c::procDungeonWarpSceneStartInit() { nofralloc #include "asm/d/a/d_a_alink/procDungeonWarpSceneStartInit__9daAlink_cFv.s" } @@ -1340,7 +1362,7 @@ asm void daAlink_c::procDungeonWarpSceneStartInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procDungeonWarpSceneStart() { +asm int daAlink_c::procDungeonWarpSceneStart() { nofralloc #include "asm/d/a/d_a_alink/procDungeonWarpSceneStart__9daAlink_cFv.s" } @@ -1429,14 +1451,14 @@ void daAlink_c::skipPortalObjWarp() { if (i_checkNoResetFlg3(FLG3_UNK_2000000) && (dComIfGp_TargetWarpPt_get() == 9 && dComIfGp_TransportWarp_check())) { - dStage_changeScene(2, FLOAT_LABEL(lit_6108), 0, fopAcM_GetRoomNo(this), mCollisionRot.y, + dStage_changeScene(2, FLOAT_LABEL(lit_6108), 0, fopAcM_GetRoomNo(this), shape_angle.y, -1); } else { u32 data = setParamData(dMeter2Info_getWarpRoomNo(), 0, 0xCA, 0); dComIfGs_setTurnRestart(dMeter2Info_getWarpPos(), dMeter2Info_getWarpPlayerNo(), dMeter2Info_getWarpRoomNo(), data); dComIfGp_setNextStage(dMeter2Info_getWarpStageName(), -4, dMeter2Info_getWarpRoomNo(), -1, - FLOAT_LABEL(lit_6108), 0, 1, 0, mCollisionRot.y, 1, 0); + FLOAT_LABEL(lit_6108), 0, 1, 0, shape_angle.y, 1, 0); } if (mProcID == PROC_WARP) { @@ -1477,7 +1499,7 @@ void daAlink_c::checkWarpStart() { if (dMeter2Info_getWarpStatus() == 1) { stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); u32 exitID = dStage_stagInfo_GetEscapeWarp(stag_info); - dStage_changeScene(exitID, FLOAT_LABEL(lit_6108), 0, -1, mCollisionRot.y, -1); + dStage_changeScene(exitID, FLOAT_LABEL(lit_6108), 0, -1, shape_angle.y, -1); } else { dungeonReturnWarp(); } @@ -1501,7 +1523,7 @@ asm void daAlink_c::warpModelTexScroll() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoWarpInit(int param_0, int param_1) { +asm int daAlink_c::procCoWarpInit(int param_0, int param_1) { nofralloc #include "asm/d/a/d_a_alink/procCoWarpInit__9daAlink_cFii.s" } @@ -1511,7 +1533,7 @@ asm void daAlink_c::procCoWarpInit(int param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoWarp() { +asm int daAlink_c::procCoWarp() { nofralloc #include "asm/d/a/d_a_alink/procCoWarp__9daAlink_cFv.s" } diff --git a/src/d/a/d_a_alink_effect.inc b/src/d/a/d_a_alink_effect.inc index e019bfb82b2..6f0931a6238 100644 --- a/src/d/a/d_a_alink_effect.inc +++ b/src/d/a/d_a_alink_effect.inc @@ -12,8 +12,8 @@ void daAlink_c::setEmitter(u32* param_0, u16 param_1, cXyz const* param_2, csXyz #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::setEmitter(u32* param_0, u16 param_1, cXyz const* param_2, - csXyz const* param_3) { +asm JPABaseEmitter* daAlink_c::setEmitter(u32* param_0, u16 param_1, cXyz const* param_2, + csXyz const* param_3) { nofralloc #include "asm/d/a/d_a_alink/setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz.s" } @@ -22,35 +22,34 @@ asm void daAlink_c::setEmitter(u32* param_0, u16 param_1, cXyz const* param_2, /* 80120634-801206C4 11AF74 0090+00 4/4 0/0 0/0 .text * setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz */ -void daAlink_c::setEmitterPolyColor(u32* param_0, u16 param_1, cBgS_PolyInfo& param_2, - cXyz const* param_3, csXyz const* param_4) { +JPABaseEmitter* daAlink_c::setEmitterPolyColor(u32* param_0, u16 param_1, cBgS_PolyInfo& param_2, + cXyz const* param_3, csXyz const* param_4) { *param_0 = dComIfGp_particle_setPolyColor(*param_0, param_1, param_2, param_3, &mTevStr, param_4, NULL, 0, NULL, -1, NULL); dComIfGp_particle_levelEmitterOnEventMove(*param_0); - dComIfGp_particle_getEmitter(*param_0); + + return dComIfGp_particle_getEmitter(*param_0); } /* 801206C4-80120778 11B004 00B4+00 2/2 0/0 0/0 .text * setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setEmitterColor(u32* param_0, u16 param_1, cXyz const* param_2, - csXyz const* param_3) { - nofralloc -#include "asm/d/a/d_a_alink/setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz.s" +JPABaseEmitter* daAlink_c::setEmitterColor(u32* param_0, u16 param_1, cXyz const* param_2, + csXyz const* param_3) { + *param_0 = dComIfGp_particle_setColor(*param_0, param_1, param_2, &mTevStr, NULL, NULL, + FLOAT_LABEL(lit_6108), -1, param_3, NULL, NULL, -1, NULL); + dComIfGp_particle_levelEmitterOnEventMove(*param_0); + + return dComIfGp_particle_getEmitter(*param_0); } -#pragma pop /* 80120778-801207BC 11B0B8 0044+00 9/9 0/0 0/0 .text stopDrawParticle__9daAlink_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::stopDrawParticle(u32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/stopDrawParticle__9daAlink_cFUl.s" +void daAlink_c::stopDrawParticle(u32 param_0) { + JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(param_0); + + if (emitter != NULL) { + emitter->stopDrawParticle(); + } } -#pragma pop /* 801207BC-80120880 11B0FC 00C4+00 1/0 0/0 0/0 .text setEffectFrontRollParam__9daAlink_cFv */ #pragma push @@ -93,9 +92,7 @@ asm void daAlink_c::setEffectSmallLandParam() { #pragma pop /* 80121000-80121004 11B940 0004+00 1/0 0/0 0/0 .text setEffectLandParam__9daAlink_cFv */ -void daAlink_c::setEffectLandParam() { - /* empty function */ -} +void daAlink_c::setEffectLandParam() {} /* 80121004-801211C0 11B944 01BC+00 1/0 0/0 0/0 .text setEffectSumouParam__9daAlink_cFv */ @@ -339,14 +336,14 @@ asm void daAlink_c::setWolfBarrierHitEffect(dBgS_LinChk& param_0) { /* 80124144-801241E0 11EA84 009C+00 9/9 0/0 0/0 .text setCutWaterDropEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCutWaterDropEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setCutWaterDropEffect__9daAlink_cFv.s" +void daAlink_c::setCutWaterDropEffect() { + if (field_0x32c0 > 0) { + cXyz sp18; + mDoMtx_multVecZero(mpLinkModel->i_getAnmMtx(1), &sp18); + dComIfGp_particle_setColor(0x2A4, &sp18, &mTevStr, NULL, NULL, FLOAT_LABEL(lit_6108), -1, + &shape_angle, NULL, NULL, -1, NULL); + } } -#pragma pop /* 801241E0-801244E4 11EB20 0304+00 1/1 0/0 0/0 .text setWaterDropEffect__9daAlink_cFv */ #pragma push @@ -511,45 +508,44 @@ asm void daAlink_c::setFreezeEffect() { #pragma pop /* 80125524-801255BC 11FE64 0098+00 1/1 0/0 0/0 .text setWoodShieldBurnEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWoodShieldBurnEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setWoodShieldBurnEffect__9daAlink_cFv.s" +void daAlink_c::setWoodShieldBurnEffect() { + if (field_0x2fcb != 0) { + for (int i = 0; i < 2; i++) { + JPABaseEmitter* emitter = + setEmitter(&field_0x3260[i], effName_42309[i], ¤t.pos, NULL); + + if (emitter != NULL) { + emitter->setGlobalRTMatrix(mShieldModel->getBaseTRMtx()); + } + } + } } -#pragma pop /* 801255BC-80125628 11FEFC 006C+00 3/3 0/0 0/0 .text clearWoodShieldBurnEffect__9daAlink_cFv */ -#ifdef NONMATCHING void daAlink_c::clearWoodShieldBurnEffect() { if (field_0x2fcb != 0) { for (int i = 0; i < 2; i++) { - stopDrawParticle(field_0x3260[i].field_0x0); + stopDrawParticle(field_0x3260[i]); } + field_0x2fcb = 0; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::clearWoodShieldBurnEffect() { - nofralloc -#include "asm/d/a/d_a_alink/clearWoodShieldBurnEffect__9daAlink_cFv.s" -} -#pragma pop -#endif /* 80125628-801256EC 11FF68 00C4+00 1/1 0/0 0/0 .text setWoodShieldBurnOutEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWoodShieldBurnOutEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setWoodShieldBurnOutEffect__9daAlink_cFv.s" +void daAlink_c::setWoodShieldBurnOutEffect() { + for (int i = 0; i < 2; i++) { + JPABaseEmitter* emitter = dComIfGp_particle_setColor( + effName_42340[i], ¤t.pos, &mTevStr, NULL, NULL, FLOAT_LABEL(lit_6108), -1); + + if (emitter != NULL) { + emitter->setGlobalRTMatrix(mShieldModel->getBaseTRMtx()); + } + } + + field_0x2fcb = 1; + clearWoodShieldBurnEffect(); } -#pragma pop /* 801256EC-80125778 12002C 008C+00 2/2 0/0 0/0 .text * initBlur__14daAlink_blur_cFfiPC4cXyzPC4cXyzPC4cXyz */ @@ -738,6 +734,7 @@ bool daAlink_sight_c::create() { if (!mLockCursor.create()) { return false; } + ResTIMG* data = (ResTIMG*)dComIfG_getObjectRes(l_arcName, daAlink_c::getSightBti()); setSightImage(data); return true; diff --git a/src/d/a/d_a_alink_grab.inc b/src/d/a/d_a_alink_grab.inc index 8afa86684a6..4a60fcfe625 100644 --- a/src/d/a/d_a_alink_grab.inc +++ b/src/d/a/d_a_alink_grab.inc @@ -37,8 +37,6 @@ asm void daAlink_c::checkGrabLineCheck() { /* 800E3994-800E3A14 0DE2D4 0080+00 1/0 0/0 0/0 .text * setGrabCollisionOffset__9daAlink_cFffP13cBgS_PolyInfo */ -// matches with literals -#ifdef NONMATCHING void daAlink_c::setGrabCollisionOffset(f32 param_0, f32 param_1, cBgS_PolyInfo* param_2) { if (param_2 != NULL) { mPolyInfo4.SetPolyInfo(*param_2); @@ -46,36 +44,28 @@ void daAlink_c::setGrabCollisionOffset(f32 param_0, f32 param_1, cBgS_PolyInfo* mPolyInfo4.ClearPi(); } - field_0x342c = param_0 * 0.8f; - field_0x3430 = param_1 * 0.8f; + f32 tmp_08 = lit_14064; + field_0x342c = tmp_08 * param_0; + field_0x3430 = tmp_08 * param_1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setGrabCollisionOffset(f32 param_0, f32 param_1, cBgS_PolyInfo* param_2) { - nofralloc -#include "asm/d/a/d_a_alink/setGrabCollisionOffset__9daAlink_cFffP13cBgS_PolyInfo.s" -} -#pragma pop -#endif /* 800E3A14-800E3A9C 0DE354 0088+00 1/0 0/0 0/0 .text exchangeGrabActor__9daAlink_cFP10fopAc_ac_c */ bool daAlink_c::exchangeGrabActor(fopAc_ac_c* p_actor) { fopAc_ac_c* actor = mGrabItemAcKeep.getActor(); - if (actor == NULL) { return false; } fopAcM_cancelCarryNow(actor); - actor->mCollisionRot.z = 0; - actor->mCollisionRot.x = 0; + actor->shape_angle.z = 0; + actor->shape_angle.x = 0; + if (checkGrabCarryActor()) { actor->current.angle.z = 0; actor->current.angle.x = 0; } + setGrabItemActor(p_actor); return true; } @@ -93,60 +83,41 @@ bool daAlink_c::setForceGrab(fopAc_ac_c* p_actor, int param_1, int param_2) { setGrabUpperAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); return true; } + return false; } /* 800E3BCC-800E3C1C 0DE50C 0050+00 2/2 0/0 0/0 .text getGrabThrowRate__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getGrabThrowRate() { - nofralloc -#include "asm/d/a/d_a_alink/getGrabThrowRate__9daAlink_cFv.s" +f32 daAlink_c::getGrabThrowRate() { + if (checkHeavyStateOn(1, 1)) { + return lit_6023 * mHeavySpeedMultiplier; + } + + return lit_6023; } -#pragma pop /* 800E3C1C-800E3C6C 0DE55C 0050+00 3/3 0/0 0/0 .text checkGrabThrowAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGrabThrowAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabThrowAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkGrabThrowAnime() const { + return checkGrabUpThrowAnime() || checkGrabSideThrowAnime() || checkGrabHeavyThrowAnime(); } -#pragma pop /* 800E3C6C-800E3C9C 0DE5AC 0030+00 25/25 0/0 0/0 .text checkGrabAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGrabAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkGrabAnime() const { + return checkGrabAnimeUp() || checkGrabAnimeSide() || checkGrabAnimeCarry(); } -#pragma pop /* 800E3C9C-800E3CF4 0DE5DC 0058+00 5/5 0/0 0/0 .text checkGrabAnimeAndThrow__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGrabAnimeAndThrow() const { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabAnimeAndThrow__9daAlink_cCFv.s" +BOOL daAlink_c::checkGrabAnimeAndThrow() const { + return checkGrabAnime() || checkGrabThrowAnime(); } -#pragma pop /* 800E3CF4-800E3D1C 0DE634 0028+00 10/10 0/0 0/0 .text checkGrabCarryActor__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkGrabCarryActor() { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabCarryActor__9daAlink_cFv.s" +BOOL daAlink_c::checkGrabCarryActor() { + return mGrabItemAcKeep.getActor() != NULL && + fopAcM_CheckCarryType(mGrabItemAcKeep.getActor(), fopAcM_CARRY_TYPE_8); } -#pragma pop /* 800E3D1C-800E3D6C 0DE65C 0050+00 1/1 0/0 0/0 .text checkGrabSlowMoveActor__9daAlink_cFv */ #pragma push @@ -160,24 +131,16 @@ asm void daAlink_c::checkGrabSlowMoveActor() { /* 800E3D6C-800E3D94 0DE6AC 0028+00 1/1 0/0 0/0 .text checkGrabHeavyActor__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGrabHeavyActor() { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabHeavyActor__9daAlink_cFv.s" +BOOL daAlink_c::checkGrabHeavyActor() { + return mGrabItemAcKeep.getActor() != NULL && + fopAcM_CheckCarryType(mGrabItemAcKeep.getActor(), fopAcM_CARRY_HEAVY); } -#pragma pop /* 800E3D94-800E3DBC 0DE6D4 0028+00 2/2 0/0 0/0 .text checkGrabSideActor__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGrabSideActor() { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabSideActor__9daAlink_cFv.s" +BOOL daAlink_c::checkGrabSideActor() { + return mGrabItemAcKeep.getActor() != NULL && + fopAcM_CheckCarryType(mGrabItemAcKeep.getActor(), fopAcM_CARRY_SIDE); } -#pragma pop /* 800E3DBC-800E3F20 0DE6FC 0164+00 5/5 0/0 0/0 .text setGrabUpperAnime__9daAlink_cFf */ #pragma push @@ -190,14 +153,15 @@ asm void daAlink_c::setGrabUpperAnime(f32 param_0) { #pragma pop /* 800E3F20-800E3F50 0DE860 0030+00 8/8 0/0 0/0 .text checkGrabRooster__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkGrabRooster() { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabRooster__9daAlink_cFv.s" +BOOL daAlink_c::checkGrabRooster() { + if (mGrabItemAcKeep.getActor() != NULL && + (fopAcM_GetName(mGrabItemAcKeep.getActor()) == PROC_NI || + fopAcM_GetName(mGrabItemAcKeep.getActor()) == PROC_NPC_TKJ2)) { + return true; + } + + return false; } -#pragma pop /* ############################################################################################## */ /* 80425628-80425634 052348 000C+00 0/1 0/0 0/0 .bss @4421 */ @@ -299,14 +263,9 @@ asm void daAlink_c::setCarryArmAngle(f32 param_0, f32 param_1) { #pragma pop /* 800E5150-800E5170 0DFA90 0020+00 1/1 0/0 0/0 .text checkGrabNotThrow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGrabNotThrow() { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabNotThrow__9daAlink_cFv.s" +BOOL daAlink_c::checkGrabNotThrow() { + return checkGrabCarryActor(); } -#pragma pop /* 800E5170-800E53AC 0DFAB0 023C+00 1/1 0/0 0/0 .text checkNextActionGrab__9daAlink_cFv */ @@ -320,14 +279,13 @@ asm void daAlink_c::checkNextActionGrab() { #pragma pop /* 800E53AC-800E53F8 0DFCEC 004C+00 2/2 0/0 0/0 .text initGrabNextMode__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initGrabNextMode() { - nofralloc -#include "asm/d/a/d_a_alink/initGrabNextMode__9daAlink_cFv.s" +void daAlink_c::initGrabNextMode() { + if (!checkGrabAnime()) { + setGrabUpperAnime(lit_6041); + } + + checkNextAction(0); } -#pragma pop /* 800E53F8-800E57AC 0DFD38 03B4+00 3/3 0/0 0/0 .text setGrabItemThrow__9daAlink_cFv */ #pragma push @@ -361,14 +319,10 @@ asm void daAlink_c::putObjLineCheck(dBgS_LinChk& param_0, cXyz* param_1, fopAc_a #pragma pop /* 800E5B6C-800E5BB4 0E04AC 0048+00 3/3 0/0 0/0 .text grabLineCheck__9daAlink_cFP4cXyzP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::grabLineCheck(cXyz* param_0, cXyz* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/grabLineCheck__9daAlink_cFP4cXyzP4cXyz.s" +void daAlink_c::grabLineCheck(cXyz* i_start, cXyz* i_end) { + mObjLinChk.Set(i_start, i_end, mGrabItemAcKeep.getActor()); + dComIfG_Bgsp().LineCross(&mObjLinChk); } -#pragma pop /* 800E5BB4-800E5CBC 0E04F4 0108+00 6/6 0/0 0/0 .text setGrabItemActor__9daAlink_cFP10fopAc_ac_c */ @@ -385,7 +339,7 @@ asm void daAlink_c::setGrabItemActor(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGrabReadyInit() { +asm int daAlink_c::procGrabReadyInit() { nofralloc #include "asm/d/a/d_a_alink/procGrabReadyInit__9daAlink_cFv.s" } @@ -395,7 +349,7 @@ asm void daAlink_c::procGrabReadyInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGrabReady() { +asm int daAlink_c::procGrabReady() { nofralloc #include "asm/d/a/d_a_alink/procGrabReady__9daAlink_cFv.s" } @@ -405,7 +359,7 @@ asm void daAlink_c::procGrabReady() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGrabUpInit() { +asm int daAlink_c::procGrabUpInit() { nofralloc #include "asm/d/a/d_a_alink/procGrabUpInit__9daAlink_cFv.s" } @@ -415,7 +369,7 @@ asm void daAlink_c::procGrabUpInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGrabUp() { +asm int daAlink_c::procGrabUp() { nofralloc #include "asm/d/a/d_a_alink/procGrabUp__9daAlink_cFv.s" } @@ -425,7 +379,7 @@ asm void daAlink_c::procGrabUp() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGrabMiss() { +asm int daAlink_c::procGrabMiss() { nofralloc #include "asm/d/a/d_a_alink/procGrabMiss__9daAlink_cFv.s" } @@ -435,7 +389,7 @@ asm void daAlink_c::procGrabMiss() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGrabThrowInit(int param_0) { +asm int daAlink_c::procGrabThrowInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procGrabThrowInit__9daAlink_cFi.s" } @@ -445,7 +399,7 @@ asm void daAlink_c::procGrabThrowInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGrabThrow() { +asm int daAlink_c::procGrabThrow() { nofralloc #include "asm/d/a/d_a_alink/procGrabThrow__9daAlink_cFv.s" } @@ -455,7 +409,7 @@ asm void daAlink_c::procGrabThrow() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGrabPutInit() { +asm int daAlink_c::procGrabPutInit() { nofralloc #include "asm/d/a/d_a_alink/procGrabPutInit__9daAlink_cFv.s" } @@ -465,7 +419,7 @@ asm void daAlink_c::procGrabPutInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGrabPut() { +asm int daAlink_c::procGrabPut() { nofralloc #include "asm/d/a/d_a_alink/procGrabPut__9daAlink_cFv.s" } @@ -475,7 +429,7 @@ asm void daAlink_c::procGrabPut() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGrabWaitInit() { +asm int daAlink_c::procGrabWaitInit() { nofralloc #include "asm/d/a/d_a_alink/procGrabWaitInit__9daAlink_cFv.s" } @@ -485,7 +439,7 @@ asm void daAlink_c::procGrabWaitInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGrabWait() { +asm int daAlink_c::procGrabWait() { nofralloc #include "asm/d/a/d_a_alink/procGrabWait__9daAlink_cFv.s" } @@ -496,7 +450,7 @@ asm void daAlink_c::procGrabWait() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGrabReboundInit(int param_0) { +asm int daAlink_c::procGrabReboundInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procGrabReboundInit__9daAlink_cFi.s" } @@ -506,7 +460,7 @@ asm void daAlink_c::procGrabReboundInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGrabRebound() { +asm int daAlink_c::procGrabRebound() { nofralloc #include "asm/d/a/d_a_alink/procGrabRebound__9daAlink_cFv.s" } @@ -516,7 +470,7 @@ asm void daAlink_c::procGrabRebound() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGrabStandInit() { +asm int daAlink_c::procGrabStandInit() { nofralloc #include "asm/d/a/d_a_alink/procGrabStandInit__9daAlink_cFv.s" } @@ -526,7 +480,7 @@ asm void daAlink_c::procGrabStandInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGrabStand() { +asm int daAlink_c::procGrabStand() { nofralloc #include "asm/d/a/d_a_alink/procGrabStand__9daAlink_cFv.s" } @@ -550,7 +504,7 @@ bool daAlink_c::checkInsectActorName(fopAc_ac_c* insectActor) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procInsectCatchInit() { +asm int daAlink_c::procInsectCatchInit() { nofralloc #include "asm/d/a/d_a_alink/procInsectCatchInit__9daAlink_cFv.s" } @@ -577,7 +531,7 @@ bool daAlink_c::procInsectCatch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procPickUpInit() { +asm int daAlink_c::procPickUpInit() { nofralloc #include "asm/d/a/d_a_alink/procPickUpInit__9daAlink_cFv.s" } @@ -587,7 +541,7 @@ asm void daAlink_c::procPickUpInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procPickUp() { +asm int daAlink_c::procPickUp() { nofralloc #include "asm/d/a/d_a_alink/procPickUp__9daAlink_cFv.s" } @@ -597,7 +551,7 @@ asm void daAlink_c::procPickUp() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procPickPutInit(int param_0) { +asm int daAlink_c::procPickPutInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procPickPutInit__9daAlink_cFi.s" } @@ -607,7 +561,7 @@ asm void daAlink_c::procPickPutInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procPickPut() { +asm int daAlink_c::procPickPut() { nofralloc #include "asm/d/a/d_a_alink/procPickPut__9daAlink_cFv.s" } @@ -625,28 +579,17 @@ asm void daAlink_c::checkSetChainPullAnime(s16 param_0) { /* 800E794C-800E7994 0E228C 0048+00 3/3 0/0 0/0 .text getChainStickAngleY__9daAlink_cCFs */ -// one instruction off -#ifdef NONMATCHING s16 daAlink_c::getChainStickAngleY(s16 param_0) const { - s16 tmp = field_0x2fe2 - param_0; + s16 angle = field_0x2fe2 - param_0; - if (tmp >= 14336 && tmp < 32640) { - return param_0 + 32640; - } else if (tmp <= -14336 && tmp <= -32640) { - return field_0x2fe2; + if (angle >= 0x3800 && angle < 0x7F80) { + return param_0 + 0x7F80; + } else if (angle <= -0x3800 && angle > -0x7F80) { + return param_0 - 0x7F80; } - return param_0 - 32640; + + return field_0x2fe2; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s16 daAlink_c::getChainStickAngleY(s16 param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/getChainStickAngleY__9daAlink_cCFs.s" -} -#pragma pop -#endif /* 800E7994-800E79F8 0E22D4 0064+00 1/1 0/0 0/0 .text checkChainEmphasys__9daAlink_cFv */ #pragma push @@ -662,7 +605,7 @@ asm u8 daAlink_c::checkChainEmphasys() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::searchFmChainPos() { +asm u8 daAlink_c::searchFmChainPos() { nofralloc #include "asm/d/a/d_a_alink/searchFmChainPos__9daAlink_cFv.s" } @@ -698,7 +641,7 @@ bool daAlink_c::checkChainBlockPushPull() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procFmChainUpInit() { +asm int daAlink_c::procFmChainUpInit() { nofralloc #include "asm/d/a/d_a_alink/procFmChainUpInit__9daAlink_cFv.s" } @@ -708,7 +651,7 @@ asm void daAlink_c::procFmChainUpInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procFmChainUp() { +asm int daAlink_c::procFmChainUp() { nofralloc #include "asm/d/a/d_a_alink/procFmChainUp__9daAlink_cFv.s" } @@ -718,7 +661,7 @@ asm void daAlink_c::procFmChainUp() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procFmChainStrongPullInit() { +asm int daAlink_c::procFmChainStrongPullInit() { nofralloc #include "asm/d/a/d_a_alink/procFmChainStrongPullInit__9daAlink_cFv.s" } @@ -729,7 +672,7 @@ asm void daAlink_c::procFmChainStrongPullInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procFmChainStrongPull() { +asm int daAlink_c::procFmChainStrongPull() { nofralloc #include "asm/d/a/d_a_alink/procFmChainStrongPull__9daAlink_cFv.s" } @@ -747,14 +690,9 @@ asm void daAlink_c::setWallGrabStatus(u8 param_0, u8 param_1) { #pragma pop /* 800E7EE4-800E7EF4 0E2824 0010+00 2/2 0/0 0/0 .text getWallGrabStatus__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::getWallGrabStatus() { - nofralloc -#include "asm/d/a/d_a_alink/getWallGrabStatus__9daAlink_cFv.s" +int daAlink_c::getWallGrabStatus() { + return i_dComIfGp_getRStatus(); } -#pragma pop /* 800E7EF4-800E7F18 0E2834 0024+00 1/1 0/0 0/0 .text wallGrabTrigger__9daAlink_cFv */ void daAlink_c::wallGrabTrigger() { @@ -802,43 +740,25 @@ asm void daAlink_c::checkPullBehindWall() { void daAlink_c::offGoatStopGame() { if (mSpecialMode != SMODE_GOAT_STOP) { return; - } else { - mSpecialMode = 0; } + + mSpecialMode = 0; } /* 800E82B0-800E8314 0E2BF0 0064+00 4/4 0/0 0/0 .text * checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c */ -#ifdef NONMATCHING BOOL daAlink_c::checkGoatCatchActor(fopAc_ac_c* param_0) { s16 name = fopAcM_GetName(param_0); - bool check = false; - - if (name == 0x1b1 || name == 0x21) { - if (checkSpecialNpc(param_0) || name == 0x106) { - check = true; - } - } - - return check; + return name == PROC_E_GOB || (name == PROC_OBJ_GRA && checkSpecialNpc(param_0)) || name == PROC_COW; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkGoatCatchActor(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop -#endif /* 800E8314-800E8334 0E2C54 0020+00 2/2 0/0 0/0 .text getGoatCatchDistance2__9daAlink_cFv */ -float daAlink_c::getGoatCatchDistance2() { - if (field_0x27f4->mBase.mProcName == 0x216) { +f32 daAlink_c::getGoatCatchDistance2() { + if (fopAcM_GetName(field_0x27f4) == PROC_B_MGN) { return lit_16066; } + return lit_16067; } @@ -862,7 +782,7 @@ asm void daAlink_c::getPushPullAnimeSpeed() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoPushPullWaitInit(int param_0) { +asm int daAlink_c::procCoPushPullWaitInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procCoPushPullWaitInit__9daAlink_cFi.s" } @@ -872,7 +792,7 @@ asm void daAlink_c::procCoPushPullWaitInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoPushPullWait() { +asm int daAlink_c::procCoPushPullWait() { nofralloc #include "asm/d/a/d_a_alink/procCoPushPullWait__9daAlink_cFv.s" } @@ -883,7 +803,7 @@ asm void daAlink_c::procCoPushPullWait() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoPushMoveInit(int param_0, int param_1) { +asm int daAlink_c::procCoPushMoveInit(int param_0, int param_1) { nofralloc #include "asm/d/a/d_a_alink/procCoPushMoveInit__9daAlink_cFii.s" } @@ -893,7 +813,7 @@ asm void daAlink_c::procCoPushMoveInit(int param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoPushMove() { +asm int daAlink_c::procCoPushMove() { nofralloc #include "asm/d/a/d_a_alink/procCoPushMove__9daAlink_cFv.s" } @@ -903,7 +823,7 @@ asm void daAlink_c::procCoPushMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procPullMoveInit(int param_0) { +asm int daAlink_c::procPullMoveInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procPullMoveInit__9daAlink_cFi.s" } @@ -913,7 +833,7 @@ asm void daAlink_c::procPullMoveInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procPullMove() { +asm int daAlink_c::procPullMove() { nofralloc #include "asm/d/a/d_a_alink/procPullMove__9daAlink_cFv.s" } diff --git a/src/d/a/d_a_alink_guard.inc b/src/d/a/d_a_alink_guard.inc index 13ee2abf87c..0b579dde627 100644 --- a/src/d/a/d_a_alink_guard.inc +++ b/src/d/a/d_a_alink_guard.inc @@ -1,13 +1,8 @@ /* 800DC548-800DC5A4 0D6E88 005C+00 13/13 0/0 0/0 .text checkEnemyGroup__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkEnemyGroup(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkEnemyGroup__9daAlink_cFP10fopAc_ac_c.s" +BOOL daAlink_c::checkEnemyGroup(fopAc_ac_c* i_actor) { + return i_actor != NULL && (fopAcM_GetGroup(i_actor) == 2 || fopAcM_GetName(i_actor) == PROC_E_ZH || checkSpecialNpc(i_actor)); } -#pragma pop /* 800DC5A4-800DC5DC 0D6EE4 0038+00 4/4 0/0 0/0 .text checkSpecialNpc__9daAlink_cFP10fopAc_ac_c */ #pragma push @@ -63,14 +58,9 @@ asm void daAlink_c::setArrowShieldActor(fopAc_ac_c* param_0, int param_1) { /* 800DCA2C-800DCA80 0D736C 0054+00 1/1 0/0 2/2 .text * checkWoodShieldEquipNotIronBall__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWoodShieldEquipNotIronBall() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWoodShieldEquipNotIronBall__9daAlink_cCFv.s" +BOOL daAlink_c::checkWoodShieldEquipNotIronBall() const { + return checkWoodShieldEquip() && !checkIronBallEquip(); } -#pragma pop /* 800DCA80-800DCD74 0D73C0 02F4+00 0/0 0/0 1/1 .text * getArrowShieldOffset__9daAlink_cCFPC4cXyzPC5csXyzP4cXyzP4cXyz */ @@ -86,98 +76,57 @@ asm void daAlink_c::getArrowShieldOffset(cXyz const* param_0, csXyz const* param /* 800DCD74-800DCDF0 0D76B4 007C+00 0/0 0/0 2/2 .text * setArrowShieldPos__9daAlink_cCFP4cXyzP5csXyzPC4cXyzPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setArrowShieldPos(cXyz* param_0, csXyz* param_1, cXyz const* param_2, - cXyz const* param_3) const { - nofralloc -#include "asm/d/a/d_a_alink/setArrowShieldPos__9daAlink_cCFP4cXyzP5csXyzPC4cXyzPC4cXyz.s" +void daAlink_c::setArrowShieldPos(cXyz* param_0, csXyz* param_1, cXyz const* param_2, + cXyz const* param_3) const { + cXyz sp1C; + + mDoMtx_multVecSR(getShieldMtx(), param_3, &sp1C); + param_1->x = sp1C.atan2sY_XZ(); + param_1->y = sp1C.atan2sX_Z(); + + mDoMtx_multVec(getShieldMtx(), param_2, param_0); } -#pragma pop /* 800DCDF0-800DCE6C 0D7730 007C+00 17/17 0/0 0/0 .text checkUpperGuardAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkUpperGuardAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperGuardAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkUpperGuardAnime() const { + return i_checkNoResetFlg2(FLG2_UNK_8000000) && !checkEventRun() && !i_checkNoResetFlg0(FLG0_UNK_2) && + mProcID != PROC_GUARD_BREAK && mProcID != PROC_CUT_REVERSE && mProcID != PROC_GUARD_ATTACK; } -#pragma pop /* 800DCE6C-800DCF04 0D77AC 0098+00 1/0 0/0 0/0 .text checkPlayerGuard__9daAlink_cCFv */ -#ifdef NONMATCHING BOOL daAlink_c::checkPlayerGuard() const { - bool ret = true; - bool bvar2 = true; - if (!i_checkSmallUpperGuardAnime()) { - bool bvar1 = false; - if (i_checkShieldGet() && checkHorseLieAnime()) { - bvar1 = true; - } - if (!bvar1) { - bvar2 = false; - } - } - - if (!bvar2 && !checkUpperGuardAnime()) { - ret = false; - } - - return ret; + return (i_checkSmallUpperGuardAnime() || (i_checkShieldGet() && checkHorseLieAnime())) || + checkUpperGuardAnime(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkPlayerGuard() const { - nofralloc -#include "asm/d/a/d_a_alink/checkPlayerGuard__9daAlink_cCFv.s" -} -#pragma pop -#endif /* 800DCF04-800DCF64 0D7844 0060+00 5/5 0/0 0/0 .text checkPlayerGuardAndAttack__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkPlayerGuardAndAttack() const { - nofralloc -#include "asm/d/a/d_a_alink/checkPlayerGuardAndAttack__9daAlink_cCFv.s" +BOOL daAlink_c::checkPlayerGuardAndAttack() const { + return checkPlayerGuard() || mProcID == PROC_GUARD_ATTACK; } -#pragma pop /* 800DCF64-800DD008 0D78A4 00A4+00 2/2 0/0 0/0 .text checkGuardAccept__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGuardAccept() { - nofralloc -#include "asm/d/a/d_a_alink/checkGuardAccept__9daAlink_cFv.s" +BOOL daAlink_c::checkGuardAccept() { + return i_checkModeFlg(0x80) && i_checkShieldGet() && !i_checkFmChainGrabAnime() && !checkNotBattleStage(); } -#pragma pop /* 800DD008-800DD018 0D7948 0010+00 11/11 0/0 0/0 .text setUpperGuardAnime__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setUpperGuardAnime(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setUpperGuardAnime__9daAlink_cFf.s" +void daAlink_c::setUpperGuardAnime(f32) { + i_onNoResetFlg2(FLG2_UNK_8000000); } -#pragma pop /* 800DD018-800DD114 0D7958 00FC+00 1/1 0/0 0/0 .text setShieldGuard__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setShieldGuard() { - nofralloc -#include "asm/d/a/d_a_alink/setShieldGuard__9daAlink_cFv.s" +void daAlink_c::setShieldGuard() { + if ((mProcID == PROC_GUARD_SLIP && mEquipItem != IRONBALL) || i_checkSmallUpperGuardAnime() || + (checkGuardAccept() && !checkGrabAnime() && !checkUpperReadyThrowAnime() && + !checkDkCaught2Anime() && !checkKandelaarSwingAnime() && !checkCutDashAnime() && + !checkCutDashChargeAnime() && (!checkEquipAnime() || checkUpperGuardAnime()) && + !i_checkRideOn() && checkGuardActionChange())) { + i_onNoResetFlg2(FLG2_UNK_8000000); + } else { + i_offNoResetFlg2(FLG2_UNK_8000000); + } } -#pragma pop /* 800DD114-800DD1D4 0D7A54 00C0+00 1/1 0/0 0/0 .text setGuardSe__9daAlink_cFP12dCcD_GObjInf */ #pragma push @@ -204,7 +153,7 @@ asm void daAlink_c::setSmallGuard(dCcD_GObjInf* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGuardSlipInit(int param_0, dCcD_GObjInf* param_1) { +asm int daAlink_c::procGuardSlipInit(int param_0, dCcD_GObjInf* param_1) { nofralloc #include "asm/d/a/d_a_alink/procGuardSlipInit__9daAlink_cFiP12dCcD_GObjInf.s" } @@ -214,7 +163,7 @@ asm void daAlink_c::procGuardSlipInit(int param_0, dCcD_GObjInf* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGuardSlip() { +asm int daAlink_c::procGuardSlip() { nofralloc #include "asm/d/a/d_a_alink/procGuardSlip__9daAlink_cFv.s" } @@ -225,7 +174,7 @@ asm void daAlink_c::procGuardSlip() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGuardAttackInit() { +asm int daAlink_c::procGuardAttackInit() { nofralloc #include "asm/d/a/d_a_alink/procGuardAttackInit__9daAlink_cFv.s" } @@ -235,7 +184,7 @@ asm void daAlink_c::procGuardAttackInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGuardAttack() { +asm int daAlink_c::procGuardAttack() { nofralloc #include "asm/d/a/d_a_alink/procGuardAttack__9daAlink_cFv.s" } @@ -245,7 +194,7 @@ asm void daAlink_c::procGuardAttack() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGuardBreakInit() { +asm int daAlink_c::procGuardBreakInit() { nofralloc #include "asm/d/a/d_a_alink/procGuardBreakInit__9daAlink_cFv.s" } @@ -255,7 +204,7 @@ asm void daAlink_c::procGuardBreakInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGuardBreak() { +asm int daAlink_c::procGuardBreak() { nofralloc #include "asm/d/a/d_a_alink/procGuardBreak__9daAlink_cFv.s" } @@ -275,7 +224,7 @@ asm bool daAlink_c::procTurnMoveInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procTurnMove() { +asm int daAlink_c::procTurnMove() { nofralloc #include "asm/d/a/d_a_alink/procTurnMove__9daAlink_cFv.s" } diff --git a/src/d/a/d_a_alink_hang.inc b/src/d/a/d_a_alink_hang.inc index aa285e3a141..72ce24aeeb5 100644 --- a/src/d/a/d_a_alink_hang.inc +++ b/src/d/a/d_a_alink_hang.inc @@ -24,7 +24,7 @@ asm void daAlink_c::getHangDirectionFromAngle() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::hangMoveBgCheck(s16 param_0, cXyz* param_1) { +asm BOOL daAlink_c::hangMoveBgCheck(s16 param_0, cXyz* param_1) { nofralloc #include "asm/d/a/d_a_alink/hangMoveBgCheck__9daAlink_cFsP4cXyz.s" } @@ -84,7 +84,7 @@ asm void daAlink_c::checkHangStartSideWall(s16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHangStartInit() { +asm int daAlink_c::procHangStartInit() { nofralloc #include "asm/d/a/d_a_alink/procHangStartInit__9daAlink_cFv.s" } @@ -94,7 +94,7 @@ asm void daAlink_c::procHangStartInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHangStart() { +asm int daAlink_c::procHangStart() { nofralloc #include "asm/d/a/d_a_alink/procHangStart__9daAlink_cFv.s" } @@ -105,7 +105,7 @@ asm void daAlink_c::procHangStart() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHangFallStartInit(cM3dGPla* param_0) { +asm int daAlink_c::procHangFallStartInit(cM3dGPla* param_0) { nofralloc #include "asm/d/a/d_a_alink/procHangFallStartInit__9daAlink_cFP8cM3dGPla.s" } @@ -115,7 +115,7 @@ asm void daAlink_c::procHangFallStartInit(cM3dGPla* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHangFallStart() { +asm int daAlink_c::procHangFallStart() { nofralloc #include "asm/d/a/d_a_alink/procHangFallStart__9daAlink_cFv.s" } @@ -125,7 +125,7 @@ asm void daAlink_c::procHangFallStart() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHangUpInit(int param_0) { +asm int daAlink_c::procHangUpInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procHangUpInit__9daAlink_cFi.s" } @@ -135,7 +135,7 @@ asm void daAlink_c::procHangUpInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHangUp() { +asm int daAlink_c::procHangUp() { nofralloc #include "asm/d/a/d_a_alink/procHangUp__9daAlink_cFv.s" } @@ -145,7 +145,7 @@ asm void daAlink_c::procHangUp() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHangWaitInit() { +asm int daAlink_c::procHangWaitInit() { nofralloc #include "asm/d/a/d_a_alink/procHangWaitInit__9daAlink_cFv.s" } @@ -155,7 +155,7 @@ asm void daAlink_c::procHangWaitInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHangWait() { +asm int daAlink_c::procHangWait() { nofralloc #include "asm/d/a/d_a_alink/procHangWait__9daAlink_cFv.s" } @@ -165,7 +165,7 @@ asm void daAlink_c::procHangWait() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHangMoveInit(int param_0) { +asm int daAlink_c::procHangMoveInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procHangMoveInit__9daAlink_cFi.s" } @@ -175,7 +175,7 @@ asm void daAlink_c::procHangMoveInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHangMove() { +asm int daAlink_c::procHangMove() { nofralloc #include "asm/d/a/d_a_alink/procHangMove__9daAlink_cFv.s" } @@ -185,7 +185,7 @@ asm void daAlink_c::procHangMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHangClimbInit(f32 param_0) { +asm int daAlink_c::procHangClimbInit(f32 param_0) { nofralloc #include "asm/d/a/d_a_alink/procHangClimbInit__9daAlink_cFf.s" } @@ -195,7 +195,7 @@ asm void daAlink_c::procHangClimbInit(f32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHangClimb() { +asm int daAlink_c::procHangClimb() { nofralloc #include "asm/d/a/d_a_alink/procHangClimb__9daAlink_cFv.s" } @@ -206,7 +206,7 @@ asm void daAlink_c::procHangClimb() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHangWallCatchInit() { +asm int daAlink_c::procHangWallCatchInit() { nofralloc #include "asm/d/a/d_a_alink/procHangWallCatchInit__9daAlink_cFv.s" } @@ -216,7 +216,7 @@ asm void daAlink_c::procHangWallCatchInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHangWallCatch() { +asm int daAlink_c::procHangWallCatch() { nofralloc #include "asm/d/a/d_a_alink/procHangWallCatch__9daAlink_cFv.s" } @@ -226,7 +226,7 @@ asm void daAlink_c::procHangWallCatch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHangReadyInit() { +asm int daAlink_c::procHangReadyInit() { nofralloc #include "asm/d/a/d_a_alink/procHangReadyInit__9daAlink_cFv.s" } @@ -236,7 +236,7 @@ asm void daAlink_c::procHangReadyInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHangReady() { +asm int daAlink_c::procHangReady() { nofralloc #include "asm/d/a/d_a_alink/procHangReady__9daAlink_cFv.s" } @@ -247,7 +247,7 @@ asm void daAlink_c::procHangReady() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHangLeverDownInit() { +asm int daAlink_c::procHangLeverDownInit() { nofralloc #include "asm/d/a/d_a_alink/procHangLeverDownInit__9daAlink_cFv.s" } @@ -257,7 +257,7 @@ asm void daAlink_c::procHangLeverDownInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHangLeverDown() { +asm int daAlink_c::procHangLeverDown() { nofralloc #include "asm/d/a/d_a_alink/procHangLeverDown__9daAlink_cFv.s" } @@ -309,7 +309,7 @@ asm void daAlink_c::setBossBodyHangPos() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBossBodyHangInit(fopAc_ac_c* param_0) { +asm int daAlink_c::procBossBodyHangInit(fopAc_ac_c* param_0) { nofralloc #include "asm/d/a/d_a_alink/procBossBodyHangInit__9daAlink_cFP10fopAc_ac_c.s" } @@ -319,7 +319,7 @@ asm void daAlink_c::procBossBodyHangInit(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBossBodyHang() { +asm int daAlink_c::procBossBodyHang() { nofralloc #include "asm/d/a/d_a_alink/procBossBodyHang__9daAlink_cFv.s" } @@ -413,7 +413,7 @@ asm void daAlink_c::checkLadderFall() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLadderUpStartInit() { +asm int daAlink_c::procLadderUpStartInit() { nofralloc #include "asm/d/a/d_a_alink/procLadderUpStartInit__9daAlink_cFv.s" } @@ -423,7 +423,7 @@ asm void daAlink_c::procLadderUpStartInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLadderUpStart() { +asm int daAlink_c::procLadderUpStart() { nofralloc #include "asm/d/a/d_a_alink/procLadderUpStart__9daAlink_cFv.s" } @@ -434,7 +434,7 @@ asm void daAlink_c::procLadderUpStart() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLadderUpEndInit(int param_0) { +asm int daAlink_c::procLadderUpEndInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procLadderUpEndInit__9daAlink_cFi.s" } @@ -444,7 +444,7 @@ asm void daAlink_c::procLadderUpEndInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLadderUpEnd() { +asm int daAlink_c::procLadderUpEnd() { nofralloc #include "asm/d/a/d_a_alink/procLadderUpEnd__9daAlink_cFv.s" } @@ -454,7 +454,7 @@ asm void daAlink_c::procLadderUpEnd() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLadderDownStartInit() { +asm int daAlink_c::procLadderDownStartInit() { nofralloc #include "asm/d/a/d_a_alink/procLadderDownStartInit__9daAlink_cFv.s" } @@ -465,7 +465,7 @@ asm void daAlink_c::procLadderDownStartInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLadderDownStart() { +asm int daAlink_c::procLadderDownStart() { nofralloc #include "asm/d/a/d_a_alink/procLadderDownStart__9daAlink_cFv.s" } @@ -476,7 +476,7 @@ asm void daAlink_c::procLadderDownStart() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLadderDownEndInit(int param_0) { +asm int daAlink_c::procLadderDownEndInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procLadderDownEndInit__9daAlink_cFi.s" } @@ -486,7 +486,7 @@ asm void daAlink_c::procLadderDownEndInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLadderDownEnd() { +asm int daAlink_c::procLadderDownEnd() { nofralloc #include "asm/d/a/d_a_alink/procLadderDownEnd__9daAlink_cFv.s" } @@ -496,7 +496,7 @@ asm void daAlink_c::procLadderDownEnd() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLadderMoveInit(int param_0, int param_1, cXyz* param_2) { +asm int daAlink_c::procLadderMoveInit(int param_0, int param_1, cXyz* param_2) { nofralloc #include "asm/d/a/d_a_alink/procLadderMoveInit__9daAlink_cFiiP4cXyz.s" } @@ -506,7 +506,7 @@ asm void daAlink_c::procLadderMoveInit(int param_0, int param_1, cXyz* param_2) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procLadderMove() { +asm int daAlink_c::procLadderMove() { nofralloc #include "asm/d/a/d_a_alink/procLadderMove__9daAlink_cFv.s" } @@ -672,7 +672,7 @@ asm void daAlink_c::setClimbStartNotGround() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procClimbUpStartInit(int param_0) { +asm int daAlink_c::procClimbUpStartInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procClimbUpStartInit__9daAlink_cFi.s" } @@ -682,7 +682,7 @@ asm void daAlink_c::procClimbUpStartInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procClimbUpStart() { +asm int daAlink_c::procClimbUpStart() { nofralloc #include "asm/d/a/d_a_alink/procClimbUpStart__9daAlink_cFv.s" } @@ -692,7 +692,7 @@ asm void daAlink_c::procClimbUpStart() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procClimbDownStartInit(s16 param_0) { +asm int daAlink_c::procClimbDownStartInit(s16 param_0) { nofralloc #include "asm/d/a/d_a_alink/procClimbDownStartInit__9daAlink_cFs.s" } @@ -702,7 +702,7 @@ asm void daAlink_c::procClimbDownStartInit(s16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procClimbDownStart() { +asm int daAlink_c::procClimbDownStart() { nofralloc #include "asm/d/a/d_a_alink/procClimbDownStart__9daAlink_cFv.s" } @@ -712,7 +712,7 @@ asm void daAlink_c::procClimbDownStart() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procClimbMoveUpDownInit(int param_0) { +asm int daAlink_c::procClimbMoveUpDownInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procClimbMoveUpDownInit__9daAlink_cFi.s" } @@ -723,7 +723,7 @@ asm void daAlink_c::procClimbMoveUpDownInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procClimbMoveUpDown() { +asm int daAlink_c::procClimbMoveUpDown() { nofralloc #include "asm/d/a/d_a_alink/procClimbMoveUpDown__9daAlink_cFv.s" } @@ -734,7 +734,7 @@ asm void daAlink_c::procClimbMoveUpDown() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procClimbMoveSideInit() { +asm int daAlink_c::procClimbMoveSideInit() { nofralloc #include "asm/d/a/d_a_alink/procClimbMoveSideInit__9daAlink_cFv.s" } @@ -744,7 +744,7 @@ asm void daAlink_c::procClimbMoveSideInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procClimbMoveSide() { +asm int daAlink_c::procClimbMoveSide() { nofralloc #include "asm/d/a/d_a_alink/procClimbMoveSide__9daAlink_cFv.s" } @@ -754,7 +754,7 @@ asm void daAlink_c::procClimbMoveSide() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procClimbWaitInit(int param_0, int param_1) { +asm int daAlink_c::procClimbWaitInit(int param_0, int param_1) { nofralloc #include "asm/d/a/d_a_alink/procClimbWaitInit__9daAlink_cFii.s" } @@ -764,7 +764,7 @@ asm void daAlink_c::procClimbWaitInit(int param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procClimbWait() { +asm int daAlink_c::procClimbWait() { nofralloc #include "asm/d/a/d_a_alink/procClimbWait__9daAlink_cFv.s" } @@ -775,7 +775,7 @@ asm void daAlink_c::procClimbWait() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procClimbToRoofInit() { +asm int daAlink_c::procClimbToRoofInit() { nofralloc #include "asm/d/a/d_a_alink/procClimbToRoofInit__9daAlink_cFv.s" } @@ -785,7 +785,7 @@ asm void daAlink_c::procClimbToRoofInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procClimbToRoof() { +asm int daAlink_c::procClimbToRoof() { nofralloc #include "asm/d/a/d_a_alink/procClimbToRoof__9daAlink_cFv.s" } @@ -858,7 +858,7 @@ asm void daAlink_c::checkNextActionRoofHang() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procRoofHangStartInit(cBgS_PolyInfo const& param_0, cXyz const& param_1, +asm int daAlink_c::procRoofHangStartInit(cBgS_PolyInfo const& param_0, cXyz const& param_1, int param_2) { nofralloc #include "asm/d/a/d_a_alink/procRoofHangStartInit__9daAlink_cFRC13cBgS_PolyInfoRC4cXyzi.s" @@ -869,7 +869,7 @@ asm void daAlink_c::procRoofHangStartInit(cBgS_PolyInfo const& param_0, cXyz con #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procRoofHangStart() { +asm int daAlink_c::procRoofHangStart() { nofralloc #include "asm/d/a/d_a_alink/procRoofHangStart__9daAlink_cFv.s" } @@ -880,7 +880,7 @@ asm void daAlink_c::procRoofHangStart() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procRoofHangWaitInit(int param_0) { +asm int daAlink_c::procRoofHangWaitInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procRoofHangWaitInit__9daAlink_cFi.s" } @@ -890,7 +890,7 @@ asm void daAlink_c::procRoofHangWaitInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procRoofHangWait() { +asm int daAlink_c::procRoofHangWait() { nofralloc #include "asm/d/a/d_a_alink/procRoofHangWait__9daAlink_cFv.s" } @@ -900,7 +900,7 @@ asm void daAlink_c::procRoofHangWait() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procRoofHangFrontMoveInit() { +asm int daAlink_c::procRoofHangFrontMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procRoofHangFrontMoveInit__9daAlink_cFv.s" } @@ -911,7 +911,7 @@ asm void daAlink_c::procRoofHangFrontMoveInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procRoofHangFrontMove() { +asm int daAlink_c::procRoofHangFrontMove() { nofralloc #include "asm/d/a/d_a_alink/procRoofHangFrontMove__9daAlink_cFv.s" } @@ -921,7 +921,7 @@ asm void daAlink_c::procRoofHangFrontMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procRoofHangSideMoveInit() { +asm int daAlink_c::procRoofHangSideMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procRoofHangSideMoveInit__9daAlink_cFv.s" } @@ -932,7 +932,7 @@ asm void daAlink_c::procRoofHangSideMoveInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procRoofHangSideMove() { +asm int daAlink_c::procRoofHangSideMove() { nofralloc #include "asm/d/a/d_a_alink/procRoofHangSideMove__9daAlink_cFv.s" } @@ -943,7 +943,7 @@ asm void daAlink_c::procRoofHangSideMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procRoofHangTurnInit() { +asm int daAlink_c::procRoofHangTurnInit() { nofralloc #include "asm/d/a/d_a_alink/procRoofHangTurnInit__9daAlink_cFv.s" } @@ -953,7 +953,7 @@ asm void daAlink_c::procRoofHangTurnInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procRoofHangTurn() { +asm int daAlink_c::procRoofHangTurn() { nofralloc #include "asm/d/a/d_a_alink/procRoofHangTurn__9daAlink_cFv.s" } @@ -974,7 +974,7 @@ asm void daAlink_c::setRoofHangSwitch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procRoofSwitchHangInit(fopAc_ac_c* param_0) { +asm int daAlink_c::procRoofSwitchHangInit(fopAc_ac_c* param_0) { nofralloc #include "asm/d/a/d_a_alink/procRoofSwitchHangInit__9daAlink_cFP10fopAc_ac_c.s" } @@ -984,7 +984,7 @@ asm void daAlink_c::procRoofSwitchHangInit(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procRoofSwitchHang() { +asm int daAlink_c::procRoofSwitchHang() { nofralloc #include "asm/d/a/d_a_alink/procRoofSwitchHang__9daAlink_cFv.s" } diff --git a/src/d/a/d_a_alink_hook.inc b/src/d/a/d_a_alink_hook.inc index c2fe6d7661a..6e6f036a87f 100644 --- a/src/d/a/d_a_alink_hook.inc +++ b/src/d/a/d_a_alink_hook.inc @@ -40,18 +40,18 @@ cXyz* daAlink_c::getHookshotTopPos() { /* 80108600-80108668 102F40 0068+00 1/0 0/0 0/0 .text checkHookshotReturnMode__9daAlink_cCFv */ bool daAlink_c::checkHookshotReturnMode() const { return checkHookshotItem(mEquipItem) && - (mHookshotMode == 4 || mHookshotMode == 5 || mHookshotMode == 6); + (mItemMode == 4 || mItemMode == 5 || mItemMode == 6); } /* 80108668-801086DC 102FA8 0074+00 1/0 0/0 0/0 .text checkHookshotShootReturnMode__9daAlink_cCFv */ bool daAlink_c::checkHookshotShootReturnMode() const { - return (checkHookshotItem(mEquipItem) && mHookshotMode == 3) || checkHookshotReturnMode(); + return (checkHookshotItem(mEquipItem) && mItemMode == 3) || checkHookshotReturnMode(); } /* 801086DC-8010871C 10301C 0040+00 6/6 0/0 0/0 .text resetHookshotMode__9daAlink_cFv */ void daAlink_c::resetHookshotMode() { - mHookshotMode = 0; + mItemMode = 0; initLockAt(); mSearchBallScale = __float_max[0]; } @@ -150,7 +150,7 @@ BOOL daAlink_c::checkBossOctaIealRoom() { /* 80108A18-80108A3C 103358 0024+00 19/19 0/0 0/0 .text checkHookshotWait__9daAlink_cCFv */ BOOL daAlink_c::checkHookshotWait() const { - return mHookshotMode == 0 || mHookshotMode == 1; + return mItemMode == 0 || mItemMode == 1; } /* 80108A3C-80108A90 10337C 0054+00 1/1 0/0 0/0 .text setHookshotCatchNow__9daAlink_cFv @@ -187,7 +187,7 @@ bool daAlink_c::setHookshotCarryOffset(unsigned int actorID, cXyz const* offset) fopAc_ac_c* actor = field_0x284c.getActor(); if (actor != NULL && fopAcM_checkHookCarryNow(actor) && actorID == field_0x284c.getID()) { - field_0x37f8 = *offset; + mIronBallCenterPos = *offset; return true; } @@ -231,16 +231,16 @@ void daAlink_c::setHookshotModel() { field_0x3020 = 0; field_0x3024 = 0; - field_0x122C[0].SetAtSpl(dCcG_At_Spl_UNK_0); - field_0x122C[0].OffAtNoHitMark(); - field_0x122C[0].SetAtAtp(0); - field_0x122C[0].SetR(lit_7808); - field_0x122C[0].SetAtSe(8); - field_0x122C[0].SetAtType(AT_TYPE_HOOKSHOT); - field_0x122C[0].SetAtHitMark(1); - field_0x122C[0].OnAtSetBit(); - field_0x122C[0].SetAtHitCallback(daAlink_hookshotAtHitCallBack); - field_0x122C[0].SetAtMtrl(0); + mAtCps[0].SetAtSpl(dCcG_At_Spl_UNK_0); + mAtCps[0].OffAtNoHitMark(); + mAtCps[0].SetAtAtp(0); + mAtCps[0].SetR(lit_7808); + mAtCps[0].SetAtSe(8); + mAtCps[0].SetAtType(AT_TYPE_HOOKSHOT); + mAtCps[0].SetAtHitMark(1); + mAtCps[0].OnAtSetBit(); + mAtCps[0].SetAtHitCallback(daAlink_hookshotAtHitCallBack); + mAtCps[0].SetAtMtrl(0); field_0x076c->init(&mHookshotTopPos, 1); } @@ -257,9 +257,9 @@ asm void daAlink_c::setHookshotSight() { /* 80108EEC-80108F64 10382C 0078+00 1/1 0/0 0/0 .text cancelHookshotShot__9daAlink_cFv */ void daAlink_c::cancelHookshotShot() { if (checkHookshotItem(mEquipItem) && - (mHookshotMode == 3 || mHookshotMode == 5 || mHookshotMode == 4)) { + (mItemMode == 3 || mItemMode == 5 || mItemMode == 4)) { if (mProcID != PROC_HOOKSHOT_MOVE && mProcID != PROC_HOOKSHOT_FLY && mProcID != PROC_HOOKSHOT_SUBJECT) { - mHookshotMode = 6; + mItemMode = 6; } } } @@ -268,7 +268,7 @@ void daAlink_c::cancelHookshotShot() { // checkAttentionLock has weird codegen #ifdef NONMATCHING bool daAlink_c::cancelHookshotMove() { - if (mFastShotTime == 0 && mHookshotMode == 0) { + if (mFastShotTime == 0 && mItemMode == 0) { if (checkHookshotAnime() && (mTargetedActor == NULL && !i_checkAttentionLock() || !itemButton())) { resetUpperAnime(UPPER_2, -1.0f); @@ -291,24 +291,26 @@ asm bool daAlink_c::cancelHookshotMove() { /* 8010903C-80109070 10397C 0034+00 2/2 0/0 0/0 .text * checkHookshotReadyMaterialOffMode__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHookshotReadyMaterialOffMode() const { - nofralloc -#include "asm/d/a/d_a_alink/checkHookshotReadyMaterialOffMode__9daAlink_cCFv.s" +BOOL daAlink_c::checkHookshotReadyMaterialOffMode() const { + return mProcID == PROC_HOOKSHOT_WALL_SHOOT || mProcID == PROC_HORSE_HOOKSHOT_SUBJECT || + mProcID == PROC_SWIM_HOOKSHOT_SUBJECT || mProcID == PROC_HOOKSHOT_SUBJECT; } -#pragma pop /* 80109070-801090EC 1039B0 007C+00 5/5 0/0 0/0 .text setHookshotReadyMaterial__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHookshotReadyMaterial() { - nofralloc -#include "asm/d/a/d_a_alink/setHookshotReadyMaterial__9daAlink_cFv.s" +void daAlink_c::setHookshotReadyMaterial() { + if (i_checkNoResetFlg2(FLG2_UNK_80000) || checkCasualWearFlg()) { + mFallVoiceInit = 0; + } else if (checkZoraWearFlg()) { + field_0x32cc = 0x37B; + mFallVoiceInit = 14; + } else if (checkMagicArmorWearFlg()) { + field_0x32cc = 0xC80; + mFallVoiceInit = 13; + } else { + field_0x32cc = 0x11C47; + mFallVoiceInit = 18; + } } -#pragma pop /* 801090EC-80109170 103A2C 0084+00 8/8 0/0 0/0 .text initHookshotUpperAnimeSpeed__9daAlink_cFi */ #pragma push @@ -356,7 +358,7 @@ asm void daAlink_c::checkUpperItemActionHookshot() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkNextActionHookshot() { +asm int daAlink_c::checkNextActionHookshot() { nofralloc #include "asm/d/a/d_a_alink/checkNextActionHookshot__9daAlink_cFv.s" } @@ -501,7 +503,7 @@ asm void daAlink_c::commonHookshotWallWait() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHookshotSubjectInit() { +asm int daAlink_c::procHookshotSubjectInit() { nofralloc #include "asm/d/a/d_a_alink/procHookshotSubjectInit__9daAlink_cFv.s" } @@ -512,7 +514,7 @@ asm void daAlink_c::procHookshotSubjectInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHookshotSubject() { +asm int daAlink_c::procHookshotSubject() { nofralloc #include "asm/d/a/d_a_alink/procHookshotSubject__9daAlink_cFv.s" } @@ -523,7 +525,7 @@ asm void daAlink_c::procHookshotSubject() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHookshotMoveInit() { +asm int daAlink_c::procHookshotMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procHookshotMoveInit__9daAlink_cFv.s" } @@ -533,7 +535,7 @@ asm void daAlink_c::procHookshotMoveInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHookshotMove() { +asm int daAlink_c::procHookshotMove() { nofralloc #include "asm/d/a/d_a_alink/procHookshotMove__9daAlink_cFv.s" } @@ -544,7 +546,7 @@ asm void daAlink_c::procHookshotMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHookshotFlyInit() { +asm int daAlink_c::procHookshotFlyInit() { nofralloc #include "asm/d/a/d_a_alink/procHookshotFlyInit__9daAlink_cFv.s" } @@ -554,7 +556,7 @@ asm void daAlink_c::procHookshotFlyInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHookshotFly() { +asm int daAlink_c::procHookshotFly() { nofralloc #include "asm/d/a/d_a_alink/procHookshotFly__9daAlink_cFv.s" } @@ -565,7 +567,7 @@ asm void daAlink_c::procHookshotFly() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHookshotRoofWaitInit(int param_0, fopAc_ac_c* param_1, int param_2) { +asm int daAlink_c::procHookshotRoofWaitInit(int param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/a/d_a_alink/procHookshotRoofWaitInit__9daAlink_cFiP10fopAc_ac_ci.s" } @@ -576,7 +578,7 @@ asm void daAlink_c::procHookshotRoofWaitInit(int param_0, fopAc_ac_c* param_1, i #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHookshotRoofWait() { +asm int daAlink_c::procHookshotRoofWait() { nofralloc #include "asm/d/a/d_a_alink/procHookshotRoofWait__9daAlink_cFv.s" } @@ -587,7 +589,7 @@ asm void daAlink_c::procHookshotRoofWait() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHookshotRoofShootInit(fopAc_ac_c* param_0) { +asm int daAlink_c::procHookshotRoofShootInit(fopAc_ac_c* param_0) { nofralloc #include "asm/d/a/d_a_alink/procHookshotRoofShootInit__9daAlink_cFP10fopAc_ac_c.s" } @@ -598,7 +600,7 @@ asm void daAlink_c::procHookshotRoofShootInit(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHookshotRoofShoot() { +asm int daAlink_c::procHookshotRoofShoot() { nofralloc #include "asm/d/a/d_a_alink/procHookshotRoofShoot__9daAlink_cFv.s" } @@ -609,7 +611,7 @@ asm void daAlink_c::procHookshotRoofShoot() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHookshotRoofBootsInit(fopAc_ac_c* param_0) { +asm int daAlink_c::procHookshotRoofBootsInit(fopAc_ac_c* param_0) { nofralloc #include "asm/d/a/d_a_alink/procHookshotRoofBootsInit__9daAlink_cFP10fopAc_ac_c.s" } @@ -620,7 +622,7 @@ asm void daAlink_c::procHookshotRoofBootsInit(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHookshotRoofBoots() { +asm int daAlink_c::procHookshotRoofBoots() { nofralloc #include "asm/d/a/d_a_alink/procHookshotRoofBoots__9daAlink_cFv.s" } @@ -630,7 +632,7 @@ asm void daAlink_c::procHookshotRoofBoots() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHookshotWallWaitInit(int param_0, s16 param_1, int param_2) { +asm int daAlink_c::procHookshotWallWaitInit(int param_0, s16 param_1, int param_2) { nofralloc #include "asm/d/a/d_a_alink/procHookshotWallWaitInit__9daAlink_cFisi.s" } @@ -641,7 +643,7 @@ asm void daAlink_c::procHookshotWallWaitInit(int param_0, s16 param_1, int param #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHookshotWallWait() { +asm int daAlink_c::procHookshotWallWait() { nofralloc #include "asm/d/a/d_a_alink/procHookshotWallWait__9daAlink_cFv.s" } @@ -651,7 +653,7 @@ asm void daAlink_c::procHookshotWallWait() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHookshotWallShootInit() { +asm int daAlink_c::procHookshotWallShootInit() { nofralloc #include "asm/d/a/d_a_alink/procHookshotWallShootInit__9daAlink_cFv.s" } @@ -662,7 +664,7 @@ asm void daAlink_c::procHookshotWallShootInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHookshotWallShoot() { +asm int daAlink_c::procHookshotWallShoot() { nofralloc #include "asm/d/a/d_a_alink/procHookshotWallShoot__9daAlink_cFv.s" } diff --git a/src/d/a/d_a_alink_horse.inc b/src/d/a/d_a_alink_horse.inc index c2d4c511095..d7d33e5dbb0 100644 --- a/src/d/a/d_a_alink_horse.inc +++ b/src/d/a/d_a_alink_horse.inc @@ -9,14 +9,13 @@ static asm void* daAlink_searchBoar(fopAc_ac_c* param_0, void* param_1) { #pragma pop /* 800EC758-800EC76C 0E7098 0014+00 1/1 0/0 0/0 .text daAlink_searchCoach__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchCoach(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchCoach__FP10fopAc_ac_cPv.s" +static fopAc_ac_c* daAlink_searchCoach(fopAc_ac_c* param_0, void* param_1) { + if (fopAcM_GetName(param_0) == PROC_NPC_COACH) { + return param_0; + } + + return NULL; } -#pragma pop /* 800EC76C-800EC7B0 0E70AC 0044+00 3/3 0/0 0/0 .text checkHorseZeldaBowMode__9daAlink_cFv */ #pragma push @@ -41,35 +40,29 @@ asm void daAlink_c::setHorseZeldaDamage() { /* 800EC7DC-800EC814 0E711C 0038+00 2/2 0/0 0/0 .text checkHorseDashAccept__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkHorseDashAccept() { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseDashAccept__9daAlink_cFv.s" +BOOL daAlink_c::checkHorseDashAccept() { + return !checkStageName("F_SP103"); } -#pragma pop /* 800EC814-800EC87C 0E7154 0068+00 1/1 0/0 0/0 .text checkCowGame__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCowGame() { - nofralloc -#include "asm/d/a/d_a_alink/checkCowGame__9daAlink_cFv.s" +BOOL daAlink_c::checkCowGame() { + return checkStageName("F_SP00") && + (dComIfGp_getStartStageLayer() == 4 || dComIfGp_getStartStageLayer() == 5); } -#pragma pop /* 800EC87C-800EC8F8 0E71BC 007C+00 2/2 0/0 0/0 .text getReinRideDirection__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getReinRideDirection() { - nofralloc -#include "asm/d/a/d_a_alink/getReinRideDirection__9daAlink_cFv.s" +int daAlink_c::getReinRideDirection() { + s16 angle = fopAcM_searchActorAngleY(field_0x27f4, this) - field_0x27f4->shape_angle.y; + + if (fopAcM_GetName(field_0x27f4) == PROC_HORSE && abs(angle) > 0x6800) { + return DIR_BACKWARD; + } else if (angle > 0) { + return DIR_LEFT; + } + + return DIR_RIGHT; } -#pragma pop /* 800EC8F8-800ECA3C 0E7238 0144+00 1/1 0/0 0/0 .text checkReinRideBgCheck__9daAlink_cFv */ @@ -83,14 +76,19 @@ asm void daAlink_c::checkReinRideBgCheck() { #pragma pop /* 800ECA3C-800ECAAC 0E737C 0070+00 3/3 0/0 0/0 .text commonInitForceRideRein__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::commonInitForceRideRein() { - nofralloc -#include "asm/d/a/d_a_alink/commonInitForceRideRein__9daAlink_cFv.s" +void daAlink_c::commonInitForceRideRein() { + setHeavyBoots(0); + onModeFlg(0x400); + field_0x2fc0 = 0; + field_0x2fab = 0x13; + field_0x3002 = 0; + field_0x3004 = 0; + field_0x30a6 = 0; + + initServiceWaitTime(); + mAttentionInfo.field_0xa = 0x46; + mUnderFrameCtrl[0].onEndFlg(); } -#pragma pop /* 800ECAAC-800ECB58 0E73EC 00AC+00 1/1 0/0 0/0 .text initForceRideBoar__9daAlink_cFv */ #pragma push @@ -103,14 +101,14 @@ asm void daAlink_c::initForceRideBoar() { #pragma pop /* 800ECB58-800ECBD0 0E7498 0078+00 4/4 0/0 0/0 .text initForceRideHorse__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initForceRideHorse() { - nofralloc -#include "asm/d/a/d_a_alink/initForceRideHorse__9daAlink_cFv.s" +void daAlink_c::initForceRideHorse() { + commonInitForceRideRein(); + mRideStatus = 1; + mRideAcKeep.setData(i_dComIfGp_getHorseActor()); + field_0x384c = (cXyz*)&l_horseBaseAnime; + i_dComIfGp_getHorseActor()->onRideFlg(); + mZ2Link.setRiding(true); } -#pragma pop /* 800ECBD0-800ECD90 0E7510 01C0+00 5/5 0/0 0/0 .text rideGetOff__9daAlink_cFv */ #pragma push @@ -124,34 +122,20 @@ asm void daAlink_c::rideGetOff() { /* 800ECD90-800ECDC4 0E76D0 0034+00 1/1 0/0 0/0 .text checkHorseNotDamageReaction__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseNotDamageReaction() const { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseNotDamageReaction__9daAlink_cCFv.s" +BOOL daAlink_c::checkHorseNotDamageReaction() const { + return mProcID == PROC_HORSE_TURN || mProcID == PROC_HORSE_JUMP || mProcID == PROC_HORSE_HANG || + mProcID == PROC_HORSE_LAND; } -#pragma pop /* 800ECDC4-800ECDEC 0E7704 0028+00 1/1 0/0 2/2 .text checkHorseWaitLashAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseWaitLashAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseWaitLashAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkHorseWaitLashAnime() const { + return checkHorseUnderDashStartAnime() && i_checkModeFlg(1); } -#pragma pop /* 800ECDEC-800ECE10 0E772C 0024+00 1/1 0/0 0/0 .text checkHorseReinLeftOnly__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseReinLeftOnly() const { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseReinLeftOnly__9daAlink_cCFv.s" +BOOL daAlink_c::checkHorseReinLeftOnly() const { + return (field_0x2fab & 8) && !(field_0x2fab & 0x10); } -#pragma pop /* 800ECE10-800ECF04 0E7750 00F4+00 2/2 0/0 0/0 .text getReinHandType__9daAlink_cCFv */ #pragma push @@ -165,35 +149,22 @@ asm void daAlink_c::getReinHandType() const { /* 800ECF04-800ECF5C 0E7844 0058+00 5/5 0/0 1/1 .text checkHorseLieAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkHorseLieAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseLieAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkHorseLieAnime() const { + return checkUnderMove0BckNoArc(ANM_HORSE_CROUCH) || checkUpperHorseLieAnime(); } -#pragma pop /* 800ECF5C-800ECF9C 0E789C 0040+00 0/0 0/0 3/3 .text checkHorseSubjectivity__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseSubjectivity() const { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseSubjectivity__9daAlink_cCFv.s" +BOOL daAlink_c::checkHorseSubjectivity() const { + return i_dComIfGp_checkPlayerStatus0(0, 0x2000) || mProcID == PROC_HORSE_BOW_SUBJECT || + mProcID == PROC_HORSE_HOOKSHOT_SUBJECT || mProcID == PROC_HORSE_BOOMERANG_SUBJECT; } -#pragma pop /* 800ECF9C-800ECFF4 0E78DC 0058+00 2/2 0/0 0/0 .text setHorseSwordUpAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHorseSwordUpAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setHorseSwordUpAnime__9daAlink_cFv.s" +void daAlink_c::setHorseSwordUpAnime() { + setUpperAnimeBaseSpeed(0xCC, daAlinkHIO_horse_c0::m.mSwordUpAnmSpeed, daAlinkHIO_horse_c0::m.mSwordUpInterpolation); + setFaceBck(0xE8, 1, 0xFFFF); } -#pragma pop /* 800ECFF4-800ED074 0E7934 0080+00 1/1 0/0 0/0 .text setHorseTurnUpperAnime__9daAlink_cFi */ #pragma push @@ -206,14 +177,9 @@ asm void daAlink_c::setHorseTurnUpperAnime(int param_0) { #pragma pop /* 800ED074-800ED0D4 0E79B4 0060+00 9/9 0/0 0/0 .text checkHorseNoUpperAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkHorseNoUpperAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseNoUpperAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkHorseNoUpperAnime() const { + return checkHorseTiredAnime() || checkNoUpperAnime() || checkHorseSwordUpAnime(); } -#pragma pop /* 800ED0D4-800ED1F0 0E7A14 011C+00 0/0 0/0 2/2 .text getHorseReinHandPos__9daAlink_cFP4cXyzP4cXyz */ @@ -247,14 +213,9 @@ asm void daAlink_c::setHorseStirrup() { #pragma pop /* 800ED4B8-800ED4DC 0E7DF8 0024+00 1/1 0/0 0/0 .text changeBoarRunRide__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::changeBoarRunRide() { - nofralloc -#include "asm/d/a/d_a_alink/changeBoarRunRide__9daAlink_cFv.s" +void daAlink_c::changeBoarRunRide() { + static_cast(mRideAcKeep.getActor())->setRunRideMode(); } -#pragma pop /* 800ED4DC-800ED78C 0E7E1C 02B0+00 7/7 0/0 0/0 .text setSyncHorsePos__9daAlink_cFv */ #pragma push @@ -287,14 +248,13 @@ asm void daAlink_c::setSyncBoarRunPos() { #pragma pop /* 800EDA24-800EDA78 0E8364 0054+00 33/33 0/0 0/0 .text setSyncRidePos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSyncRidePos() { - nofralloc -#include "asm/d/a/d_a_alink/setSyncRidePos__9daAlink_cFv.s" +void daAlink_c::setSyncRidePos() { + if (checkHorseRide()) { + setSyncHorsePos(); + } else { + setSyncBoarPos(); + } } -#pragma pop /* 800EDA78-800EDB48 0E83B8 00D0+00 6/6 0/0 0/0 .text setHorseTurnAnime__9daAlink_cFv */ #pragma push @@ -525,7 +485,7 @@ asm void daAlink_c::setHorseGetOff(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseRideInit() { +asm int daAlink_c::procHorseRideInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseRideInit__9daAlink_cFv.s" } @@ -535,7 +495,7 @@ asm void daAlink_c::procHorseRideInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseRide() { +asm int daAlink_c::procHorseRide() { nofralloc #include "asm/d/a/d_a_alink/procHorseRide__9daAlink_cFv.s" } @@ -546,7 +506,7 @@ asm void daAlink_c::procHorseRide() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseGetOffInit(int param_0) { +asm int daAlink_c::procHorseGetOffInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procHorseGetOffInit__9daAlink_cFi.s" } @@ -556,7 +516,7 @@ asm void daAlink_c::procHorseGetOffInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseGetOff() { +asm int daAlink_c::procHorseGetOff() { nofralloc #include "asm/d/a/d_a_alink/procHorseGetOff__9daAlink_cFv.s" } @@ -567,7 +527,7 @@ asm void daAlink_c::procHorseGetOff() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseWaitInit() { +asm int daAlink_c::procHorseWaitInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseWaitInit__9daAlink_cFv.s" } @@ -577,7 +537,7 @@ asm void daAlink_c::procHorseWaitInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseWait() { +asm int daAlink_c::procHorseWait() { nofralloc #include "asm/d/a/d_a_alink/procHorseWait__9daAlink_cFv.s" } @@ -587,7 +547,7 @@ asm void daAlink_c::procHorseWait() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseTurnInit() { +asm int daAlink_c::procHorseTurnInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseTurnInit__9daAlink_cFv.s" } @@ -597,7 +557,7 @@ asm void daAlink_c::procHorseTurnInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseTurn() { +asm int daAlink_c::procHorseTurn() { nofralloc #include "asm/d/a/d_a_alink/procHorseTurn__9daAlink_cFv.s" } @@ -607,7 +567,7 @@ asm void daAlink_c::procHorseTurn() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseJumpInit() { +asm int daAlink_c::procHorseJumpInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseJumpInit__9daAlink_cFv.s" } @@ -617,7 +577,7 @@ asm void daAlink_c::procHorseJumpInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseJump() { +asm int daAlink_c::procHorseJump() { nofralloc #include "asm/d/a/d_a_alink/procHorseJump__9daAlink_cFv.s" } @@ -627,7 +587,7 @@ asm void daAlink_c::procHorseJump() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseLandInit() { +asm int daAlink_c::procHorseLandInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseLandInit__9daAlink_cFv.s" } @@ -637,7 +597,7 @@ asm void daAlink_c::procHorseLandInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseLand() { +asm int daAlink_c::procHorseLand() { nofralloc #include "asm/d/a/d_a_alink/procHorseLand__9daAlink_cFv.s" } @@ -647,7 +607,7 @@ asm void daAlink_c::procHorseLand() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseSubjectivityInit() { +asm int daAlink_c::procHorseSubjectivityInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseSubjectivityInit__9daAlink_cFv.s" } @@ -658,7 +618,7 @@ asm void daAlink_c::procHorseSubjectivityInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseSubjectivity() { +asm int daAlink_c::procHorseSubjectivity() { nofralloc #include "asm/d/a/d_a_alink/procHorseSubjectivity__9daAlink_cFv.s" } @@ -668,7 +628,7 @@ asm void daAlink_c::procHorseSubjectivity() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseCutInit() { +asm int daAlink_c::procHorseCutInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseCutInit__9daAlink_cFv.s" } @@ -678,7 +638,7 @@ asm void daAlink_c::procHorseCutInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseCut() { +asm int daAlink_c::procHorseCut() { nofralloc #include "asm/d/a/d_a_alink/procHorseCut__9daAlink_cFv.s" } @@ -688,7 +648,7 @@ asm void daAlink_c::procHorseCut() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseCutChargeReadyInit() { +asm int daAlink_c::procHorseCutChargeReadyInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseCutChargeReadyInit__9daAlink_cFv.s" } @@ -698,7 +658,7 @@ asm void daAlink_c::procHorseCutChargeReadyInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseCutChargeReady() { +asm int daAlink_c::procHorseCutChargeReady() { nofralloc #include "asm/d/a/d_a_alink/procHorseCutChargeReady__9daAlink_cFv.s" } @@ -709,7 +669,7 @@ asm void daAlink_c::procHorseCutChargeReady() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseCutTurnInit() { +asm int daAlink_c::procHorseCutTurnInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseCutTurnInit__9daAlink_cFv.s" } @@ -719,7 +679,7 @@ asm void daAlink_c::procHorseCutTurnInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseCutTurn() { +asm int daAlink_c::procHorseCutTurn() { nofralloc #include "asm/d/a/d_a_alink/procHorseCutTurn__9daAlink_cFv.s" } @@ -730,7 +690,7 @@ asm void daAlink_c::procHorseCutTurn() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseDamageInit(dCcD_GObjInf* param_0) { +asm int daAlink_c::procHorseDamageInit(dCcD_GObjInf* param_0) { nofralloc #include "asm/d/a/d_a_alink/procHorseDamageInit__9daAlink_cFP12dCcD_GObjInf.s" } @@ -740,7 +700,7 @@ asm void daAlink_c::procHorseDamageInit(dCcD_GObjInf* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseDamage() { +asm int daAlink_c::procHorseDamage() { nofralloc #include "asm/d/a/d_a_alink/procHorseDamage__9daAlink_cFv.s" } @@ -750,7 +710,7 @@ asm void daAlink_c::procHorseDamage() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseBowSubjectInit() { +asm int daAlink_c::procHorseBowSubjectInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseBowSubjectInit__9daAlink_cFv.s" } @@ -761,7 +721,7 @@ asm void daAlink_c::procHorseBowSubjectInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseBowSubject() { +asm int daAlink_c::procHorseBowSubject() { nofralloc #include "asm/d/a/d_a_alink/procHorseBowSubject__9daAlink_cFv.s" } @@ -772,7 +732,7 @@ asm void daAlink_c::procHorseBowSubject() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseBowMoveInit() { +asm int daAlink_c::procHorseBowMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseBowMoveInit__9daAlink_cFv.s" } @@ -782,7 +742,7 @@ asm void daAlink_c::procHorseBowMoveInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseBowMove() { +asm int daAlink_c::procHorseBowMove() { nofralloc #include "asm/d/a/d_a_alink/procHorseBowMove__9daAlink_cFv.s" } @@ -793,7 +753,7 @@ asm void daAlink_c::procHorseBowMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseGrabMoveInit() { +asm int daAlink_c::procHorseGrabMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseGrabMoveInit__9daAlink_cFv.s" } @@ -803,7 +763,7 @@ asm void daAlink_c::procHorseGrabMoveInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseGrabMove() { +asm int daAlink_c::procHorseGrabMove() { nofralloc #include "asm/d/a/d_a_alink/procHorseGrabMove__9daAlink_cFv.s" } @@ -814,7 +774,7 @@ asm void daAlink_c::procHorseGrabMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseBoomerangSubjectInit() { +asm int daAlink_c::procHorseBoomerangSubjectInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseBoomerangSubjectInit__9daAlink_cFv.s" } @@ -824,7 +784,7 @@ asm void daAlink_c::procHorseBoomerangSubjectInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseBoomerangSubject() { +asm int daAlink_c::procHorseBoomerangSubject() { nofralloc #include "asm/d/a/d_a_alink/procHorseBoomerangSubject__9daAlink_cFv.s" } @@ -834,7 +794,7 @@ asm void daAlink_c::procHorseBoomerangSubject() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseBoomerangMoveInit() { +asm int daAlink_c::procHorseBoomerangMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseBoomerangMoveInit__9daAlink_cFv.s" } @@ -844,7 +804,7 @@ asm void daAlink_c::procHorseBoomerangMoveInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseBoomerangMove() { +asm int daAlink_c::procHorseBoomerangMove() { nofralloc #include "asm/d/a/d_a_alink/procHorseBoomerangMove__9daAlink_cFv.s" } @@ -855,7 +815,7 @@ asm void daAlink_c::procHorseBoomerangMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseHookshotSubjectInit() { +asm int daAlink_c::procHorseHookshotSubjectInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseHookshotSubjectInit__9daAlink_cFv.s" } @@ -865,7 +825,7 @@ asm void daAlink_c::procHorseHookshotSubjectInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseHookshotSubject() { +asm int daAlink_c::procHorseHookshotSubject() { nofralloc #include "asm/d/a/d_a_alink/procHorseHookshotSubject__9daAlink_cFv.s" } @@ -875,7 +835,7 @@ asm void daAlink_c::procHorseHookshotSubject() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseHookshotMoveInit() { +asm int daAlink_c::procHorseHookshotMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseHookshotMoveInit__9daAlink_cFv.s" } @@ -886,7 +846,7 @@ asm void daAlink_c::procHorseHookshotMoveInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseHookshotMove() { +asm int daAlink_c::procHorseHookshotMove() { nofralloc #include "asm/d/a/d_a_alink/procHorseHookshotMove__9daAlink_cFv.s" } @@ -896,7 +856,7 @@ asm void daAlink_c::procHorseHookshotMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseBottleDrinkInit(u16 param_0) { +asm int daAlink_c::procHorseBottleDrinkInit(u16 param_0) { nofralloc #include "asm/d/a/d_a_alink/procHorseBottleDrinkInit__9daAlink_cFUs.s" } @@ -907,7 +867,7 @@ asm void daAlink_c::procHorseBottleDrinkInit(u16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseBottleDrink() { +asm int daAlink_c::procHorseBottleDrink() { nofralloc #include "asm/d/a/d_a_alink/procHorseBottleDrink__9daAlink_cFv.s" } @@ -917,7 +877,7 @@ asm void daAlink_c::procHorseBottleDrink() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseKandelaarPourInit() { +asm int daAlink_c::procHorseKandelaarPourInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseKandelaarPourInit__9daAlink_cFv.s" } @@ -927,7 +887,7 @@ asm void daAlink_c::procHorseKandelaarPourInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseKandelaarPour() { +asm int daAlink_c::procHorseKandelaarPour() { nofralloc #include "asm/d/a/d_a_alink/procHorseKandelaarPour__9daAlink_cFv.s" } @@ -938,7 +898,7 @@ asm void daAlink_c::procHorseKandelaarPour() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseComebackInit() { +asm int daAlink_c::procHorseComebackInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseComebackInit__9daAlink_cFv.s" } @@ -948,7 +908,7 @@ asm void daAlink_c::procHorseComebackInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseComeback() { +asm int daAlink_c::procHorseComeback() { nofralloc #include "asm/d/a/d_a_alink/procHorseComeback__9daAlink_cFv.s" } @@ -958,7 +918,7 @@ asm void daAlink_c::procHorseComeback() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseRunInit() { +asm int daAlink_c::procHorseRunInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseRunInit__9daAlink_cFv.s" } @@ -968,7 +928,7 @@ asm void daAlink_c::procHorseRunInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseRun() { +asm int daAlink_c::procHorseRun() { nofralloc #include "asm/d/a/d_a_alink/procHorseRun__9daAlink_cFv.s" } @@ -979,7 +939,7 @@ asm void daAlink_c::procHorseRun() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseHangInit(dCcD_GObjInf* param_0, int param_1) { +asm int daAlink_c::procHorseHangInit(dCcD_GObjInf* param_0, int param_1) { nofralloc #include "asm/d/a/d_a_alink/procHorseHangInit__9daAlink_cFP12dCcD_GObjInfi.s" } @@ -989,7 +949,7 @@ asm void daAlink_c::procHorseHangInit(dCcD_GObjInf* param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseHang() { +asm int daAlink_c::procHorseHang() { nofralloc #include "asm/d/a/d_a_alink/procHorseHang__9daAlink_cFv.s" } @@ -1000,7 +960,7 @@ asm void daAlink_c::procHorseHang() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseGetKeyInit() { +asm int daAlink_c::procHorseGetKeyInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseGetKeyInit__9daAlink_cFv.s" } @@ -1010,7 +970,7 @@ asm void daAlink_c::procHorseGetKeyInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseGetKey() { +asm int daAlink_c::procHorseGetKey() { nofralloc #include "asm/d/a/d_a_alink/procHorseGetKey__9daAlink_cFv.s" } @@ -1021,7 +981,7 @@ asm void daAlink_c::procHorseGetKey() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseLookDownInit() { +asm int daAlink_c::procHorseLookDownInit() { nofralloc #include "asm/d/a/d_a_alink/procHorseLookDownInit__9daAlink_cFv.s" } @@ -1031,7 +991,7 @@ asm void daAlink_c::procHorseLookDownInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHorseLookDown() { +asm int daAlink_c::procHorseLookDown() { nofralloc #include "asm/d/a/d_a_alink/procHorseLookDown__9daAlink_cFv.s" } @@ -1041,7 +1001,7 @@ asm void daAlink_c::procHorseLookDown() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBoarRunInit() { +asm int daAlink_c::procBoarRunInit() { nofralloc #include "asm/d/a/d_a_alink/procBoarRunInit__9daAlink_cFv.s" } @@ -1051,7 +1011,7 @@ asm void daAlink_c::procBoarRunInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBoarRun() { +asm int daAlink_c::procBoarRun() { nofralloc #include "asm/d/a/d_a_alink/procBoarRun__9daAlink_cFv.s" } diff --git a/src/d/a/d_a_alink_hvyboots.inc b/src/d/a/d_a_alink_hvyboots.inc index e4de9b88618..61afe884e9f 100644 --- a/src/d/a/d_a_alink_hvyboots.inc +++ b/src/d/a/d_a_alink_hvyboots.inc @@ -1,3 +1,24 @@ +#include "dolphin/types.h" +#include "d/a/d_a_alink.h" +#include "JSystem/J2DGraph/J2DAnmLoader.h" +#include "JSystem/J3DGraphLoader/J3DAnmLoader.h" +#include "JSystem/JMath/JMath.h" +#include "SSystem/SComponent/c_math.h" +#include "Z2AudioLib/Z2AudioMgr.h" +#include "d/com/d_com_inf_game.h" +#include "d/msg/d_msg_object.h" +#include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_audio.h" +#include "m_Do/m_Do_ext.h" +#include "m_Do/m_Do_mtx.h" +#include "rel/d/a/d_a_crod/d_a_crod.h" +#include "rel/d/a/d_a_horse/d_a_horse.h" +#include "rel/d/a/d_a_scene_exit/d_a_scene_exit.h" +#include "rel/d/a/d_a_mg_rod/d_a_mg_rod.h" +#include "rel/d/a/d_a_spinner/d_a_spinner.h" +#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" +#include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h" + /* 800E23FC-800E243C 0DCD3C 0040+00 6/6 0/0 0/0 .text concatMagneBootMtx__9daAlink_cFv */ void daAlink_c::concatMagneBootMtx() { if (i_checkMagneBootsOn()) { @@ -22,8 +43,8 @@ void daAlink_c::multVecMagneBootInvMtx(cXyz* vec) { /* 800E24B0-800E251C 0DCDF0 006C+00 2/2 0/0 0/0 .text * commonMagneLineCheck__9daAlink_cFP4cXyzP4cXyz */ -int daAlink_c::commonMagneLineCheck(cXyz* param_0, cXyz* param_1) { - mMagneLineChk.Set(param_0, param_1, this); +int daAlink_c::commonMagneLineCheck(cXyz* i_start, cXyz* i_end) { + mMagneLineChk.Set(i_start, i_end, this); if (dComIfG_Bgsp().LineCross(&mMagneLineChk) && daTagMagne_c::checkMagnetCode(mMagneLineChk)) { return 1; @@ -34,14 +55,9 @@ int daAlink_c::commonMagneLineCheck(cXyz* param_0, cXyz* param_1) { /* 800E251C-800E2580 0DCE5C 0064+00 2/2 0/0 0/0 .text checkBootsMoveAnime__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBootsMoveAnime(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkBootsMoveAnime__9daAlink_cFi.s" +BOOL daAlink_c::checkBootsMoveAnime(int param_0) { + return (checkHeavyStateOn(param_0, 1) && !i_checkNoResetFlg0(FLG0_UNDERWATER)) || checkDkCaught2Anime(); } -#pragma pop /* 800E2580-800E2738 0DCEC0 01B8+00 17/17 0/0 0/0 .text setHeavyBoots__9daAlink_cFi */ #pragma push @@ -116,20 +132,26 @@ int daAlink_c::checkMagneBootsFly() { } /* 800E3048-800E30DC 0DD988 0094+00 2/2 0/0 0/0 .text procBootsEquipInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBootsEquipInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBootsEquipInit__9daAlink_cFv.s" +int daAlink_c::procBootsEquipInit() { + commonProcInit(PROC_BOOTS_EQUIP); + setSingleAnimeParam(ANM_HVY_BOOTS_PUT_ON, &daAlinkHIO_magneBoots_c0::m.mEquipAnm); + + if (checkUpperReadyThrowAnime()) { + resetUpperAnime(UPPER_2, lit_6041); + dComIfGp_clearPlayerStatus0(0, ~0x400030); + } + + current.angle.y = shape_angle.y; + mNormalSpeed = FLOAT_LABEL(lit_6108); + + return 1; } -#pragma pop /* 800E30DC-800E3218 0DDA1C 013C+00 1/0 0/0 0/0 .text procBootsEquip__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBootsEquip() { +asm int daAlink_c::procBootsEquip() { nofralloc #include "asm/d/a/d_a_alink/procBootsEquip__9daAlink_cFv.s" } @@ -150,7 +172,7 @@ asm int daAlink_c::procMagneBootsFlyInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procMagneBootsFly() { +asm int daAlink_c::procMagneBootsFly() { nofralloc #include "asm/d/a/d_a_alink/procMagneBootsFly__9daAlink_cFv.s" } diff --git a/src/d/a/d_a_alink_iceleaf.inc b/src/d/a/d_a_alink_iceleaf.inc index d18fc409e3a..c6edc3f52c6 100644 --- a/src/d/a/d_a_alink_iceleaf.inc +++ b/src/d/a/d_a_alink_iceleaf.inc @@ -1,49 +1,34 @@ /* 80105A84-80105A98 1003C4 0014+00 1/1 0/0 0/0 .text daAlink_searchIceLeaf__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchIceLeaf(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchIceLeaf__FP10fopAc_ac_cPv.s" +static fopAc_ac_c* daAlink_searchIceLeaf(fopAc_ac_c* i_actor, void* param_1) { + if (fopAcM_GetName(i_actor) == PROC_Obj_IceLeaf) { + return i_actor; + } + + return NULL; } -#pragma pop /* 80105A98-80105ABC 1003D8 0024+00 3/3 0/0 0/0 .text checkSnowCode__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSnowCode() const { - nofralloc -#include "asm/d/a/d_a_alink/checkSnowCode__9daAlink_cCFv.s" +bool daAlink_c::checkSnowCode() const { + return field_0x2fa8 == 6 || field_0x2fa8 == 5; } -#pragma pop /* 80105ABC-80105B10 1003FC 0054+00 1/1 0/0 1/1 .text * checkSnowCodePolygon__9daAlink_cFR13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSnowCodePolygon(cBgS_PolyInfo& param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkSnowCodePolygon__9daAlink_cFR13cBgS_PolyInfo.s" +bool daAlink_c::checkSnowCodePolygon(cBgS_PolyInfo& i_poly) { + int code = dComIfG_Bgsp().GetSpecialCode(i_poly); + return code == 6 || code == 5; } -#pragma pop /* 80105B10-80105B58 100450 0048+00 2/2 0/0 0/0 .text checkBoardRestart__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBoardRestart() { - nofralloc -#include "asm/d/a/d_a_alink/checkBoardRestart__9daAlink_cFv.s" +bool daAlink_c::checkBoardRestart() { + return (mRideStatus == 0 && mRideAcKeep.getActor() != NULL) && fopAcM_GetName(mRideAcKeep.getActor()) == PROC_Obj_IceLeaf; } -#pragma pop /* 80105B58-80106534 100498 09DC+00 7/7 0/0 0/0 .text boardCommon__9daAlink_cFi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::boardCommon(int param_0) { +asm int daAlink_c::boardCommon(int param_0) { nofralloc #include "asm/d/a/d_a_alink/boardCommon__9daAlink_cFi.s" } @@ -51,58 +36,61 @@ asm void daAlink_c::boardCommon(int param_0) { /* 80106534-8010658C 100E74 0058+00 6/6 0/0 0/0 .text setCommonBoardAnime__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCommonBoardAnime(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setCommonBoardAnime__9daAlink_cFi.s" +void daAlink_c::setCommonBoardAnime(int param_0) { + setDoubleAnime(FLOAT_LABEL(lit_6108), daAlinkHIO_board_c0::m.mStandAnmSpeed, lit_6040, + param_0 != 0 ? ANM_RIDE_FRONT : ANM_RIDE_WAIT, ANM_RIDE_STOP, + 11, daAlinkHIO_board_c0::m.mStandInterpolation); } -#pragma pop /* 8010658C-80106618 100ECC 008C+00 5/5 0/0 0/0 .text checkNextActionBoard__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionBoard() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionBoard__9daAlink_cFv.s" +int daAlink_c::checkNextActionBoard() { + if (checkNextActionFromButton()) { + return 1; + } + + if ((!doButton() && (mProcID == PROC_BOARD_ROW || mProcID == PROC_BOARD_TURN)) || + mProcID == PROC_BOARD_CUT || mProcID == PROC_BOARD_ROW || mProcID == PROC_BOARD_JUMP) { + return 0; + } + + return procBoardWaitInit(NULL); } -#pragma pop /* 80106618-80106650 100F58 0038+00 2/2 0/0 0/0 .text checkBoardSwordTriggerAction__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBoardSwordTriggerAction() { - nofralloc -#include "asm/d/a/d_a_alink/checkBoardSwordTriggerAction__9daAlink_cFv.s" +int daAlink_c::checkBoardSwordTriggerAction() { + if (i_checkModeFlg(2)) { + return procBoardCutInit(); + } else { + return procBoardWaitInit(NULL); + } } -#pragma pop /* 80106650-801066B8 100F90 0068+00 3/3 0/0 0/0 .text * commonProcBoardInit__9daAlink_cFQ29daAlink_c12daAlink_PROC */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::commonProcBoardInit(daAlink_c::daAlink_PROC param_0) { - nofralloc -#include "asm/d/a/d_a_alink/commonProcBoardInit__9daAlink_cFQ29daAlink_c12daAlink_PROC.s" +int daAlink_c::commonProcBoardInit(daAlink_c::daAlink_PROC i_procID) { + if (mProcID == i_procID) { + return 0; + } + + u32 check = i_checkModeFlg(2); + commonProcInit(i_procID); + + if (check) { + onModeFlg(2); + } + + return 1; } -#pragma pop /* 801066B8-801066EC 100FF8 0034+00 1/1 0/0 0/0 .text getBoardRowAnmSpeed__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBoardRowAnmSpeed() { - nofralloc -#include "asm/d/a/d_a_alink/getBoardRowAnmSpeed__9daAlink_cFv.s" +f32 daAlink_c::getBoardRowAnmSpeed() { + return daAlinkHIO_board_c0::m.mPushAnmMinSpeed + + ((daAlinkHIO_board_c0::m.mPushAnmMaxSpeed - daAlinkHIO_board_c0::m.mPushAnmMinSpeed) * + (lit_6040 - (mNormalSpeed / daAlinkHIO_board_c0::m.mFastPushSwitchSpeed))); } -#pragma pop /* 801066EC-80106774 10102C 0088+00 3/3 0/0 0/0 .text setBoardLandAnime__9daAlink_cFv */ #pragma push @@ -118,28 +106,35 @@ asm void daAlink_c::setBoardLandAnime() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBoardRideInit() { +asm int daAlink_c::procBoardRideInit() { nofralloc #include "asm/d/a/d_a_alink/procBoardRideInit__9daAlink_cFv.s" } #pragma pop /* 801069D0-80106A38 101310 0068+00 1/0 0/0 0/0 .text procBoardRide__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardRide() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardRide__9daAlink_cFv.s" +int daAlink_c::procBoardRide() { + field_0x2f99 = 15; + + if (mLinkAcch.ChkGroundHit()) { + if (field_0x280c.getActor()) { + shape_angle.y = field_0x280c.getActor()->shape_angle.y + -0x4000; + current.angle.y = shape_angle.y; + procBoardWaitInit(field_0x280c.getActor()); + } else { + checkNextAction(1); + } + } + + return 1; } -#pragma pop /* 80106A38-80106BCC 101378 0194+00 13/13 0/0 0/0 .text * procBoardWaitInit__9daAlink_cFP10fopAc_ac_c */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBoardWaitInit(fopAc_ac_c* param_0) { +asm int daAlink_c::procBoardWaitInit(fopAc_ac_c* param_0) { nofralloc #include "asm/d/a/d_a_alink/procBoardWaitInit__9daAlink_cFP10fopAc_ac_c.s" } @@ -149,119 +144,190 @@ asm void daAlink_c::procBoardWaitInit(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBoardWait() { +asm int daAlink_c::procBoardWait() { nofralloc #include "asm/d/a/d_a_alink/procBoardWait__9daAlink_cFv.s" } #pragma pop /* 80106E88-80106F00 1017C8 0078+00 1/1 0/0 0/0 .text procBoardRowInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardRowInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardRowInit__9daAlink_cFv.s" +int daAlink_c::procBoardRowInit() { + commonProcInit(PROC_BOARD_ROW); + setSingleAnimeBaseSpeed(ANM_RIDE_KICK, getBoardRowAnmSpeed(), daAlinkHIO_board_c0::m.mPushInterpolation); + i_onResetFlg1(0x40); + field_0x3008 = 4; + field_0x3010 = 1; + field_0x3012 = 0; + + return 1; } -#pragma pop /* 80106F00-80107060 101840 0160+00 1/0 0/0 0/0 .text procBoardRow__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBoardRow() { +asm int daAlink_c::procBoardRow() { nofralloc #include "asm/d/a/d_a_alink/procBoardRow__9daAlink_cFv.s" } #pragma pop /* 80107060-801070DC 1019A0 007C+00 1/1 0/0 0/0 .text procBoardTurnInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardTurnInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardTurnInit__9daAlink_cFv.s" +int daAlink_c::procBoardTurnInit() { + commonProcInit(PROC_BOARD_TURN); + setSingleAnime(ANM_RIDE_JUMP, FLOAT_LABEL(lit_6108), lit_6040, daAlinkHIO_board_c0::m.mAirborneAnm.mEndFrame, lit_6109); + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x3010 = shape_angle.y + 0x8000; + field_0x3012 = 0; + field_0x300a = 0; + + return 1; } -#pragma pop /* 801070DC-80107218 101A1C 013C+00 1/0 0/0 0/0 .text procBoardTurn__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBoardTurn() { +asm int daAlink_c::procBoardTurn() { nofralloc #include "asm/d/a/d_a_alink/procBoardTurn__9daAlink_cFv.s" } #pragma pop /* 80107218-80107300 101B58 00E8+00 4/4 0/0 0/0 .text procBoardJumpInit__9daAlink_cFfi */ +#ifdef NONMATCHING +int daAlink_c::procBoardJumpInit(f32 param_0, int param_1) { + commonProcInit(PROC_BOARD_JUMP); + field_0x3008 = 0; + field_0x3012 = 1; + + setSingleAnime(ANM_RIDE_JUMP, FLOAT_LABEL(lit_6108), + daAlinkHIO_board_c0::m.mAirborneAnm.mStartFrame, + daAlinkHIO_board_c0::m.mAirborneAnm.mEndFrame, + daAlinkHIO_board_c0::m.mAirborneAnm.mInterpolation); + + if (param_1 == 0) { + mSpeed.y = cLib_minMaxLimit(param_0, daAlinkHIO_board_c0::m.mMinJumpSpeedY, daAlinkHIO_board_c0::m.mMaxJumpSpeedY); + } + + field_0x3010 = 0; + seStartOnlyReverb(Z2SE_AL_SNOBO_JUMP); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBoardJumpInit(f32 param_0, int param_1) { +asm int daAlink_c::procBoardJumpInit(f32 param_0, int param_1) { nofralloc #include "asm/d/a/d_a_alink/procBoardJumpInit__9daAlink_cFfi.s" } #pragma pop +#endif /* 80107300-801073D0 101C40 00D0+00 1/0 0/0 0/0 .text procBoardJump__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardJump() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardJump__9daAlink_cFv.s" +int daAlink_c::procBoardJump() { + if (boardCommon(1)) { + return 1; + } + + if (!checkNextActionBoard()) { + if (!i_checkModeFlg(2)) { + setBoardLandAnime(); + procBoardWaitInit(NULL); + } else if (field_0x3012 != 0 && field_0x3010 == 0 && field_0x2060->getOldFrameRate() < lit_8782) { + setSingleAnime(ANM_RIDE_JUMP, daAlinkHIO_board_c0::m.mAirborneAnm.mSpeed, + daAlinkHIO_board_c0::m.mAirborneAnm.mStartFrame, + daAlinkHIO_board_c0::m.mAirborneAnm.mEndFrame, + lit_6041); + field_0x3010 = 1; + } + } + + return 1; } -#pragma pop /* 801073D0-80107418 101D10 0048+00 1/1 0/0 0/0 .text procBoardSubjectivityInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardSubjectivityInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardSubjectivityInit__9daAlink_cFv.s" +int daAlink_c::procBoardSubjectivityInit() { + commonProcBoardInit(PROC_BOARD_SUBJECTIVITY); + setSubjectMode(); + setCommonBoardAnime(0); + + return 1; } -#pragma pop /* 80107418-801074AC 101D58 0094+00 1/0 0/0 0/0 .text procBoardSubjectivity__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardSubjectivity() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardSubjectivity__9daAlink_cFv.s" +int daAlink_c::procBoardSubjectivity() { + i_onResetFlg0(0x4000000); + s16 old_shape_angle = shape_angle.y; + s16 old_angle = current.angle.y; + + if (boardCommon(0)) { + return 1; + } + + shape_angle.y = old_shape_angle; + + if (checkSubjectEnd(1)) { + procBoardWaitInit(NULL); + } else { + setRideSubjectAngle(old_angle); + } + + return 1; } -#pragma pop /* 801074AC-8010755C 101DEC 00B0+00 3/3 0/0 0/0 .text procBoardCutInit__9daAlink_cFv */ +// matches with literals +#ifdef NONMATCHING +int daAlink_c::procBoardCutInit() { + commonProcBoardInit(PROC_BOARD_CUT); + + bool var_r31 = false; + if (checkUnderMove0BckNoArc(ANM_RIDE_CUT_TURN_CHARGE)) { + if (mUnderFrameCtrl[0].getFrame() > daAlinkHIO_cut_c0::m.mNormalSwingDuration) { + var_r31 = true; + } + } + + setCommonBoardAnime(0); + setCutDash(1, var_r31); + field_0x3012 = 0; + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBoardCutInit() { +asm int daAlink_c::procBoardCutInit() { nofralloc #include "asm/d/a/d_a_alink/procBoardCutInit__9daAlink_cFv.s" } #pragma pop +#endif /* 8010755C-801075D4 101E9C 0078+00 1/0 0/0 0/0 .text procBoardCut__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardCut() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardCut__9daAlink_cFv.s" +int daAlink_c::procBoardCut() { + if (boardCommon(1)) { + return 1; + } + + checkCutTurnCharge(); + if (!checkNextActionBoard() && checkNoUpperAnime()) { + procBoardWaitInit(NULL); + } + + return 1; } -#pragma pop /* 801075D4-80107744 101F14 0170+00 2/2 0/0 0/0 .text procBoardCutTurnInit__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBoardCutTurnInit() { +asm int daAlink_c::procBoardCutTurnInit() { nofralloc #include "asm/d/a/d_a_alink/procBoardCutTurnInit__9daAlink_cFv.s" } @@ -271,7 +337,7 @@ asm void daAlink_c::procBoardCutTurnInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBoardCutTurn() { +asm int daAlink_c::procBoardCutTurn() { nofralloc #include "asm/d/a/d_a_alink/procBoardCutTurn__9daAlink_cFv.s" } diff --git a/src/d/a/d_a_alink_ironball.inc b/src/d/a/d_a_alink_ironball.inc index b8274680358..3fc4fd5c7fa 100644 --- a/src/d/a/d_a_alink_ironball.inc +++ b/src/d/a/d_a_alink_ironball.inc @@ -1,107 +1,98 @@ /* 8011243C-80112458 10CD7C 001C+00 1/0 0/0 0/0 .text getIronBallCenterPos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::getIronBallCenterPos() { - nofralloc -#include "asm/d/a/d_a_alink/getIronBallCenterPos__9daAlink_cFv.s" +cXyz* daAlink_c::getIronBallCenterPos() { + if (mEquipItem == IRONBALL) { + return &mIronBallCenterPos; + } + + return NULL; } -#pragma pop /* 80112458-80112474 10CD98 001C+00 1/0 0/0 0/0 .text getIronBallBgHit__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::getIronBallBgHit() const { - nofralloc -#include "asm/d/a/d_a_alink/getIronBallBgHit__9daAlink_cCFv.s" +s16 daAlink_c::getIronBallBgHit() const { + if (mEquipItem == IRONBALL) { + return field_0x301c; + } + + return 0; } -#pragma pop /* 80112474-801124B4 10CDB4 0040+00 0/0 2/2 1/1 .text checkIronBallThrowMode__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkIronBallThrowMode() const { - nofralloc -#include "asm/d/a/d_a_alink/checkIronBallThrowMode__9daAlink_cCFv.s" +bool daAlink_c::checkIronBallThrowMode() const { + return mEquipItem == IRONBALL && + (field_0x3018 == 4 || field_0x3018 == 5 || field_0x3018 == 6 || field_0x3018 == 3); } -#pragma pop /* 801124B4-801124FC 10CDF4 0048+00 0/0 1/1 1/1 .text checkIronBallThrowReturnMode__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkIronBallThrowReturnMode() const { - nofralloc -#include "asm/d/a/d_a_alink/checkIronBallThrowReturnMode__9daAlink_cCFv.s" +bool daAlink_c::checkIronBallThrowReturnMode() const { + return mEquipItem == IRONBALL && (field_0x3018 == 4 || field_0x3018 == 5 || field_0x3018 == 6 || + field_0x3018 == 7 || field_0x3018 == 3); } -#pragma pop /* 801124FC-80112524 10CE3C 0028+00 1/0 0/0 0/0 .text checkIronBallReturn__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkIronBallReturn() const { - nofralloc -#include "asm/d/a/d_a_alink/checkIronBallReturn__9daAlink_cCFv.s" +bool daAlink_c::checkIronBallReturn() const { + return mEquipItem == IRONBALL && field_0x3018 == 7; } -#pragma pop /* 80112524-80112568 10CE64 0044+00 1/0 0/0 0/0 .text checkIronBallGroundStop__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkIronBallGroundStop() const { - nofralloc -#include "asm/d/a/d_a_alink/checkIronBallGroundStop__9daAlink_cCFv.s" +bool daAlink_c::checkIronBallGroundStop() const { + return mEquipItem == IRONBALL && field_0x3018 != 0 && field_0x3018 != 8 && field_0x301e == 0 && + field_0x301e < 10; } -#pragma pop /* 80112568-80112628 10CEA8 00C0+00 5/5 0/0 0/0 .text setIronBallWaitUpperAnime__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setIronBallWaitUpperAnime(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setIronBallWaitUpperAnime__9daAlink_cFi.s" +void daAlink_c::setIronBallWaitUpperAnime(int param_0) { + if (!checkIronBallWaitAnime() && !checkIronBallPreSwingAnime() && + (field_0x3018 == 0 || field_0x3018 == 8) && (param_0 || checkNoUpperAnime())) { + setUpperAnimeBaseSpeed(0x19C, daAlinkHIO_ironBall_c0::m.mWaitAnmSpeed, + daAlinkHIO_basic_c0::m.mAnmBlendFactor); + setFacePriBck(0xE8); + field_0x2f96 = 254; + field_0x2f97 = 5; + field_0x3018 = 0; + } } -#pragma pop /* 80112628-801126F8 10CF68 00D0+00 1/1 0/0 0/0 .text checkIronBallDelete__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkIronBallDelete() { - nofralloc -#include "asm/d/a/d_a_alink/checkIronBallDelete__9daAlink_cFv.s" +void daAlink_c::checkIronBallDelete() { + if (mProcID == PROC_IRON_BALL_SUBJECT || mProcID == PROC_IRON_BALL_MOVE || + mProcID == PROC_IRON_BALL_THROW || mProcID == PROC_IRON_BALL_RETURN) { + return; + } + + if (field_0x3018 == 1 || field_0x3018 == 2 || field_0x3018 == 3 || + ((field_0x3018 == 0 || field_0x3018 == 8) && !checkIronBallWaitAnime() && + !checkEquipAnime() && + (!i_checkModeFlg(4) || i_checkModeFlg(0x70C52) || !mLinkAcch.ChkGroundHit()))) { + deleteEquipItem(1, 0); + } } -#pragma pop /* 801126F8-80112768 10D038 0070+00 2/2 0/0 0/0 .text setIronBallReturn__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setIronBallReturn(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setIronBallReturn__9daAlink_cFi.s" +void daAlink_c::setIronBallReturn(int param_0) { + if (param_0 && field_0x301e != 0) { + field_0x301e--; + } else if (field_0x3018 != 7) { + field_0x3018 = 7; + field_0x301e = 0; + seStartOnlyReverb(Z2SE_AL_IB_PULLBACK); + } } -#pragma pop /* 80112768-801127F0 10D0A8 0088+00 2/2 0/0 0/0 .text setIronBallBgCheckPos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setIronBallBgCheckPos() { - nofralloc -#include "asm/d/a/d_a_alink/setIronBallBgCheckPos__9daAlink_cFv.s" +void daAlink_c::setIronBallBgCheckPos() { + cXyz sp8; + mDoMtx_stack_c::transS(*mIronBallChainPos); + mDoMtx_stack_c::ZXYrotM(*mIronBallChainAngle); + mDoMtx_stack_c::multVec(&l_ironBallCenterVec, &sp8); + + mIronBallBgChkPos.set(sp8.x, (sp8.y - lit_14621) - mSearchBallScale, sp8.z); + cLib_chaseF(&mSearchBallScale, FLOAT_LABEL(lit_6108), lit_7307); } -#pragma pop /* 801127F0-80112C80 10D130 0490+00 1/1 0/0 0/0 .text setIronBallModel__9daAlink_cFv */ #pragma push @@ -114,9 +105,7 @@ asm void daAlink_c::setIronBallModel() { #pragma pop /* 80112C80-80112C84 10D5C0 0004+00 2/2 2/2 0/0 .text __ct__5csXyzFv */ -extern "C" void __ct__5csXyzFv() { - /* empty function */ -} +extern "C" void __ct__5csXyzFv() {} /* 80112C84-80112E7C 10D5C4 01F8+00 1/1 0/0 0/0 .text * setIronBallGroundVec__9daAlink_cFPC4cXyzP4cXyz */ @@ -141,14 +130,18 @@ asm void daAlink_c::setIronBallChainPos() { #pragma pop /* 80113CA0-80113D58 10E5E0 00B8+00 1/1 0/0 0/0 .text checkIronBallReturnChange__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkIronBallReturnChange() { - nofralloc -#include "asm/d/a/d_a_alink/checkIronBallReturnChange__9daAlink_cFv.s" +BOOL daAlink_c::checkIronBallReturnChange() { + if (mProcID != PROC_IRON_BALL_THROW || + (!(mLookAngleY > 0x400) && mIronBallBgChkPos.y < (current.pos.y - lit_8472)) || + (mLookAngleY > 0x400 && mItemMode == 0x64) || + (field_0xFB8.ChkAtHit() && field_0xFB8.GetAtHitGObj() != NULL && + static_cast(field_0xFB8.GetAtHitGObj())->ChkTgIronBallRebound())) { + setIronBallReturn(0); + return true; + } + + return false; } -#pragma pop /* 80113D58-801150E4 10E698 138C+00 1/1 0/0 0/0 .text setIronBallPos__9daAlink_cFv */ #pragma push @@ -162,137 +155,277 @@ asm void daAlink_c::setIronBallPos() { /* 801150E4-8011510C 10FA24 0028+00 10/10 0/0 0/0 .text checkIronBallAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkIronBallAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkIronBallAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkIronBallAnime() const { + return checkIronBallPreSwingAnime() || checkIronBallSwingAnime(); } -#pragma pop /* 8011510C-801151E0 10FA4C 00D4+00 1/1 0/0 0/0 .text setIronBallReadyAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setIronBallReadyAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setIronBallReadyAnime__9daAlink_cFv.s" +void daAlink_c::setIronBallReadyAnime() { + resetUpperAnime(UPPER_2, lit_6041); + setSingleAnime(ANM_IRONBALL_ATTACK, daAlinkHIO_ironBall_c0::m.mPrepareAnmSpeed, FLOAT_LABEL(lit_6108), + 0x15, daAlinkHIO_ironBall_c0::m.mPrepareInterpolation); + setUpperAnimeBaseSpeed(0x19A, daAlinkHIO_ironBall_c0::m.mPrepareAnmSpeed, lit_6041); + mNowAnmPackUpper[2].setRatio(FLOAT_LABEL(lit_6108)); + voiceStart(Z2SE_AL_V_SWING_IB); + + field_0xFB8.OffAtSetBit(); + field_0xFB8.ResetAtHit(); + field_0xFB8.SetAtAtp(2); + + field_0x301e = 10; + field_0x3020 = 0; + field_0x3494 = lit_7808; + mSearchBallScale = FLOAT_LABEL(lit_6108); } -#pragma pop /* 801151E0-80115254 10FB20 0074+00 2/2 0/0 0/0 .text setIronBallBaseAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setIronBallBaseAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setIronBallBaseAnime__9daAlink_cFv.s" +void daAlink_c::setIronBallBaseAnime() { + if (checkIronBallSwingAnime() && !checkUnderMove0BckNoArc(ANM_IRONBALL_TURN)) { + setSingleAnimeBaseSpeed(ANM_IRONBALL_TURN, daAlinkHIO_ironBall_c0::m.mTurnAnmSpeed, daAlinkHIO_ironBall_c0::m.mTurnInterpolation); + mUnderFrameCtrl[0].setFrame(mUpperFrameCtrl[2].getFrame()); + getNowAnmPackUnder(UNDER_0)->setFrame(mUpperFrameCtrl[2].getFrame()); + } } -#pragma pop /* 80115254-801153F8 10FB94 01A4+00 1/1 0/0 0/0 .text checkUpperItemActionIronBall__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUpperItemActionIronBall() { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperItemActionIronBall__9daAlink_cFv.s" +BOOL daAlink_c::checkUpperItemActionIronBall() { + if (!itemButton() && checkReadyItem()) { + field_0x3020 = 1; + } + + if (checkIronBallPreSwingAnime()) { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + if (field_0x3020 != 0 && frameCtrl->checkPass(lit_10286)) { + return procIronBallThrowInit(); + } + + if (frameCtrl->checkAnmEnd()) { + if (i_checkModeFlg(1)) { + setSingleAnimeBaseSpeed(ANM_IRONBALL_TURN, daAlinkHIO_ironBall_c0::m.mTurnAnmSpeed, daAlinkHIO_ironBall_c0::m.mTurnInterpolation); + } + + u16 upperId = getMainBckData(ANM_IRONBALL_TURN)->m_upperID; + setUpperAnimeBaseSpeed(upperId, daAlinkHIO_ironBall_c0::m.mTurnAnmSpeed, daAlinkHIO_ironBall_c0::m.mTurnInterpolation); + field_0x3018 = 2; + seStartOnlyReverb(Z2SE_AL_IB_SWING); + return 1; + } + + if (frameCtrl->getFrame() > lit_8781) { + field_0x3018 = 1; + } + } else { + daPy_frameCtrl_c* frameCtrl = &mUpperFrameCtrl[2]; + + if (field_0x3020 != 0 && frameCtrl->checkPass(lit_10193)) { + return procIronBallThrowInit(); + } else if (frameCtrl->checkPass(FLOAT_LABEL(lit_6108))) { + seStartOnlyReverb(Z2SE_AL_IB_SWING); + } + } + + return cancelUpperItemReadyAnime(0); } -#pragma pop /* 801153F8-801154E4 10FD38 00EC+00 2/2 0/0 0/0 .text checkNextActionIronBall__9daAlink_cFv */ #pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionIronBall() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionIronBall__9daAlink_cFv.s" +#pragma optimization_level 2 +int daAlink_c::checkNextActionIronBall() { + if (mFastShotTime != 0) { + mFastShotTime--; + } + + if (!checkIronBallAnime()) { + setIronBallReadyAnime(); + setFastShotTimer(); + + if (!i_checkAttentionLock()) { + field_0x2fe4 = shape_angle.y; + } + } + + if (!i_checkAttentionLock() && mFastShotTime == 0) { + return procIronBallSubjectInit(); + } else { + return procIronBallMoveInit(); + } } #pragma pop /* 801154E4-80115564 10FE24 0080+00 1/1 0/0 0/0 .text procIronBallSubjectInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procIronBallSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procIronBallSubjectInit__9daAlink_cFv.s" +int daAlink_c::procIronBallSubjectInit() { + if (!commonProcInitNotSameProc(PROC_IRON_BALL_SUBJECT)) { + return 0; + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + + if (checkIronBallAnime()) { + setIronBallBaseAnime(); + } + + current.angle.y = shape_angle.y; + dComIfGp_setPlayerStatus0(0, 0x400); + return 1; } -#pragma pop /* 80115564-801155EC 10FEA4 0088+00 1/0 0/0 0/0 .text procIronBallSubject__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procIronBallSubject() { - nofralloc -#include "asm/d/a/d_a_alink/procIronBallSubject__9daAlink_cFv.s" +int daAlink_c::procIronBallSubject() { + if (checkIronBallAnime()) { + setDoStatus(0x12); + } + + setShapeAngleToAtnActor(0); + + if (!checkNextAction(0) && itemButton() && field_0x3018 == 2) { + setBodyAngleToCamera(); + } + + return 1; } -#pragma pop /* 801155EC-80115674 10FF2C 0088+00 1/1 0/0 0/0 .text procIronBallMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procIronBallMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procIronBallMoveInit__9daAlink_cFv.s" +int daAlink_c::procIronBallMoveInit() { + if (!commonProcInitNotSameProc(PROC_IRON_BALL_MOVE)) { + return 0; + } + + if (checkZeroSpeedF()) { + onModeFlg(1); + } + + if (checkIronBallPreSwingAnime()) { + mNormalSpeed = FLOAT_LABEL(lit_6108); + } + + dComIfGp_setPlayerStatus0(0, 0x400); + return 1; } -#pragma pop /* 80115674-8011577C 10FFB4 0108+00 1/0 0/0 0/0 .text procIronBallMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procIronBallMove() { - nofralloc -#include "asm/d/a/d_a_alink/procIronBallMove__9daAlink_cFv.s" +int daAlink_c::procIronBallMove() { + if (checkIronBallAnime()) { + setDoStatus(0x12); + } + + setShapeAngleToAtnActor(0); + + if (!checkNextAction(0)) { + f32 var_f31 = lit_6041; + + if (checkIronBallPreSwingAnime()) { + mNormalSpeed = FLOAT_LABEL(lit_6108); + } + + if (checkZeroSpeedF()) { + onModeFlg(1); + + if (field_0x2f98 != 2) { + field_0x2f98 = 2; + var_f31 = daAlinkHIO_basic_c0::m.mAnmBlendFactor; + } + } else { + offModeFlg(1); + } + + if (i_checkModeFlg(1)) { + setIronBallBaseAnime(); + } else { + setBlendAtnMoveAnime(var_f31); + } + + setBodyAngleXReadyAnime(0); + } + + return 1; } -#pragma pop /* 8011577C-80115860 1100BC 00E4+00 1/1 0/0 0/0 .text procIronBallThrowInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procIronBallThrowInit() { - nofralloc -#include "asm/d/a/d_a_alink/procIronBallThrowInit__9daAlink_cFv.s" +int daAlink_c::procIronBallThrowInit() { + commonProcInit(PROC_IRON_BALL_THROW); + setSingleAnime(ANM_IRONBALL_ATTACK, daAlinkHIO_ironBall_c0::m.mPreThrowAnmSpeed, lit_34957, 30, daAlinkHIO_ironBall_c0::m.mPreThrowAnmInterpolation); + field_0x2f99 = 12; + field_0x3588 = l_ironBallBaseAnime; + mNormalSpeed = FLOAT_LABEL(lit_6108); + current.angle.y = shape_angle.y; + mCommonCounter = 0; + field_0x3018 = 3; + field_0x3024 = 0; + field_0x3026 = 0; + + voiceStart(Z2SE_AL_V_THROW_IB); + seStartOnlyReverb(Z2SE_AL_IB_THROW); + field_0xFB8.SetAtAtp(3); + return 1; } -#pragma pop /* 80115860-801159F0 1101A0 0190+00 1/0 0/0 0/0 .text procIronBallThrow__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procIronBallThrow() { +asm int daAlink_c::procIronBallThrow() { nofralloc #include "asm/d/a/d_a_alink/procIronBallThrow__9daAlink_cFv.s" } #pragma pop /* 801159F0-80115AA0 110330 00B0+00 2/2 0/0 0/0 .text procIronBallReturnInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procIronBallReturnInit() { - nofralloc -#include "asm/d/a/d_a_alink/procIronBallReturnInit__9daAlink_cFv.s" +int daAlink_c::procIronBallReturnInit() { + commonProcInit(PROC_IRON_BALL_RETURN); + + if (field_0x3018 == 8) { + mCommonCounter = 1; + setSingleAnimeParam(ANM_IRONBALL_CATCH, &daAlinkHIO_ironBall_c0::m.mCatchAnm); + field_0x2f99 = 12; + } else { + setSingleAnimeBaseSpeed(ANM_IRONBALL_PULL, daAlinkHIO_ironBall_c0::m.mPullAnmSpeed, daAlinkHIO_ironBall_c0::m.mPullInterpolation); + field_0x2f99 = 12; + mCommonCounter = 0; + } + + field_0x3588 = l_ironBallBaseAnime; + return 1; } -#pragma pop /* 80115AA0-80115C20 1103E0 0180+00 1/0 0/0 0/0 .text procIronBallReturn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procIronBallReturn() { - nofralloc -#include "asm/d/a/d_a_alink/procIronBallReturn__9daAlink_cFv.s" -} -#pragma pop \ No newline at end of file +int daAlink_c::procIronBallReturn() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (mEquipItem != IRONBALL) { + return checkWaitAction(); + } + + field_0x2f99 = 4; + + if (field_0x3018 == 8 && mCommonCounter == 0) { + mCommonCounter = 1; + setSingleAnimeParam(ANM_IRONBALL_CATCH, &daAlinkHIO_ironBall_c0::m.mCatchAnm); + field_0x2f99 = 12; + seStartOnlyReverb(Z2SE_AL_IB_CATCH); + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + dComIfGp_getVibration().StartShock(3, 1, cXyz(tmp_0, lit_6040, tmp_0)); + } else if (frameCtrl->checkAnmEnd()) { + if (field_0x3018 == 8) { + field_0x3018 = 0; + setIronBallWaitUpperAnime(1); + checkNextAction(0); + } + } else if (field_0x3018 == 8 && frameCtrl->getFrame() > daAlinkHIO_ironBall_c0::m.mCatchAnm.mCheckFrame) { + field_0x3018 = 0; + setIronBallWaitUpperAnime(1); + + if (!checkNextAction(1)) { + field_0x3018 = 8; + resetUpperAnime(UPPER_2, FLOAT_LABEL(lit_6108)); + } + } + + return 1; +} \ No newline at end of file diff --git a/src/d/a/d_a_alink_kandelaar.inc b/src/d/a/d_a_alink_kandelaar.inc index c0bf0c42631..bd3bbfd90a1 100644 --- a/src/d/a/d_a_alink_kandelaar.inc +++ b/src/d/a/d_a_alink_kandelaar.inc @@ -1,88 +1,96 @@ /* 80110654-80110668 10AF94 0014+00 1/1 0/0 0/0 .text daAlink_searchTagKandelaar__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchTagKandelaar(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchTagKandelaar__FP10fopAc_ac_cPv.s" +static fopAc_ac_c* daAlink_searchTagKandelaar(fopAc_ac_c* i_actor, void* param_1) { + if (fopAcM_GetName(i_actor) == PROC_TAG_LANTERN) { + return i_actor; + } + + return NULL; } -#pragma pop /* 80110668-801106E8 10AFA8 0080+00 1/1 0/0 0/0 .text daAlink_searchTagKtOnFire__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchTagKtOnFire(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchTagKtOnFire__FP10fopAc_ac_cPv.s" +static fopAc_ac_c* daAlink_searchTagKtOnFire(fopAc_ac_c* i_actor, void* param_1) { + daAlink_c* link = daAlink_getAlinkActorClass(); + + if (fopAcM_GetName(i_actor) == PROC_Tag_KtOnFire && + i_actor->current.pos.abs2(link->current.pos) < lit_26816 && + fopAcM_seenActorAngleY(link, i_actor) < 0x3000) { + return i_actor; + } + + return NULL; } -#pragma pop /* 801106E8-8011078C 10B028 00A4+00 1/0 0/0 0/0 .text setKandelaarMtx__9daAlink_cFPA4_fii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setKandelaarMtx(f32 (*param_0)[4], int param_1, int param_2) { - nofralloc -#include "asm/d/a/d_a_alink/setKandelaarMtx__9daAlink_cFPA4_fii.s" +void daAlink_c::setKandelaarMtx(Mtx i_mtx, int param_1, int param_2) { + if (field_0x06fc != NULL) { + if (i_checkNoResetFlg2(FLG2_UNK_1)) { + deleteEquipItem(0, 1); + } + + i_onEndResetFlg1(ERFLG1_UNK_4); + + field_0x06fc->i_setBaseTRMtx(i_mtx); + if (param_1 == 0) { + i_onEndResetFlg1(ERFLG1_UNK_8); + } + + if (param_2 != 0) { + i_onEndResetFlg1(ERFLG1_UNK_10); + } + } } -#pragma pop /* 8011078C-801107BC 10B0CC 0030+00 2/2 0/0 0/0 .text checkWaterInKandelaarOffset__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWaterInKandelaarOffset(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkWaterInKandelaarOffset__9daAlink_cFf.s" +BOOL daAlink_c::checkWaterInKandelaarOffset(f32 param_0) { + f32 tmp_65 = lit_17593; // tmp can be removed with literals + f32 base_y_pos; + if (i_checkModeFlg(0x40)) { + base_y_pos = mRightFootPos.y; + } else { + base_y_pos = current.pos.y; + } + + return param_0 > tmp_65 + base_y_pos; } -#pragma pop /* 801107BC-80110840 10B0FC 0084+00 2/2 0/0 0/0 .text checkWaterInKandelaar__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWaterInKandelaar(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkWaterInKandelaar__9daAlink_cFf.s" +void daAlink_c::checkWaterInKandelaar(f32 param_0) { + if (i_checkNoResetFlg2(FLG2_UNK_1) && checkWaterInKandelaarOffset(param_0)) { + if (mEquipItem == KANTERA) { + deleteEquipItem(1, 1); + } else { + offKandelaarModel(); + seStartOnlyReverb(Z2SE_AL_ITEM_TAKEOUT); + } + } } -#pragma pop /* 80110840-8011087C 10B180 003C+00 13/13 0/0 0/0 .text offKandelaarModel__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::offKandelaarModel() { - nofralloc -#include "asm/d/a/d_a_alink/offKandelaarModel__9daAlink_cFv.s" +void daAlink_c::offKandelaarModel() { + i_offNoResetFlg2(0x10000001); + mZ2Link.setKanteraState(0); } -#pragma pop /* 8011087C-801108B4 10B1BC 0038+00 1/0 0/0 0/0 .text checkUseKandelaar__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkUseKandelaar(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkUseKandelaar__9daAlink_cFi.s" +bool daAlink_c::checkUseKandelaar(int param_0) { + return (param_0 == 0 && i_checkNoResetFlg2(FLG2_UNK_1)) || + (param_0 != 0 && mEquipItem == KANTERA); } -#pragma pop /* 801108B4-801108EC 10B1F4 0038+00 1/0 0/0 0/0 .text checkKandelaarSwing__9daAlink_cCFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkKandelaarSwing(int param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkKandelaarSwing__9daAlink_cCFi.s" +bool daAlink_c::checkKandelaarSwing(int param_0) const { + if ((checkKandelaarSwingAnime() || mProcID == PROC_KANDELAAR_SWING) && (dComIfGs_getOil() != 0 || param_0 == 0)) { + return true; + } + + return false; } -#pragma pop /* 801108EC-80110BEC 10B22C 0300+00 1/1 0/0 0/0 .text kandelaarModelCallBack__9daAlink_cFv */ #pragma push @@ -96,35 +104,30 @@ asm void daAlink_c::kandelaarModelCallBack() { /* 80110BEC-80110C28 10B52C 003C+00 1/1 0/0 0/0 .text daAlink_kandelaarModelCallBack__FP8J3DJointi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_kandelaarModelCallBack(J3DJoint* param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_kandelaarModelCallBack__FP8J3DJointi.s" +static int daAlink_kandelaarModelCallBack(J3DJoint* param_0, int param_1) { + daAlink_c* link = (daAlink_c*)j3dSys.getModel()->getUserArea(); + + if (param_1 == 0) { + link->kandelaarModelCallBack(); + } + + return 1; } -#pragma pop /* 80110C28-80110C6C 10B568 0044+00 1/0 0/0 0/0 .text getKandelaarFlamePos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::getKandelaarFlamePos() { - nofralloc -#include "asm/d/a/d_a_alink/getKandelaarFlamePos__9daAlink_cFv.s" +cXyz* daAlink_c::getKandelaarFlamePos() { + if ((!i_checkNoResetFlg2((daPy_FLG2)0x20001) && !i_checkEndResetFlg1(ERFLG1_UNK_4)) || i_checkWolf() || !i_checkNoResetFlg1(FLG1_UNK_80)) { + return NULL; + } + + return &mKandelaarFlamePos; } -#pragma pop /* 80110C6C-80110C94 10B5AC 0028+00 3/3 0/0 0/0 .text checkKandelaarEquipAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkKandelaarEquipAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkKandelaarEquipAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkKandelaarEquipAnime() const { + return checkUpperAnime(0x264) || checkUpperAnime(0x268); } -#pragma pop /* 80110C94-80110E80 10B5D4 01EC+00 1/1 0/0 0/0 .text preKandelaarDraw__9daAlink_cFv */ #pragma push @@ -138,9 +141,7 @@ asm void daAlink_c::preKandelaarDraw() { /* 80110E80-80110E84 10B7C0 0004+00 0/0 3/0 0/0 .text * setTevColor__11J3DTevBlockFUlPC13J3DGXColorS10 */ -void J3DTevBlock::setTevColor(u32 param_0, J3DGXColorS10 const* param_1) { - /* empty function */ -} +void J3DTevBlock::setTevColor(u32 param_0, J3DGXColorS10 const* param_1) {} /* 80110E84-80110F88 10B7C4 0104+00 4/4 0/0 0/0 .text setKandelaarModel__9daAlink_cFv */ #pragma push @@ -154,14 +155,16 @@ asm void daAlink_c::setKandelaarModel() { /* 80110F88-80110FE0 10B8C8 0058+00 3/3 0/0 0/0 .text resetOilBottleModel__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetOilBottleModel() { - nofralloc -#include "asm/d/a/d_a_alink/resetOilBottleModel__9daAlink_cFv.s" +void daAlink_c::resetOilBottleModel() { + deleteEquipItem(0, 1); + + if (field_0x300e != 0) { + setKandelaarModel(); + mEquipItem = KANTERA; + } + + returnKeepItemData(); } -#pragma pop /* 80110FE0-801110B8 10B920 00D8+00 3/3 0/0 0/0 .text commonKandelaarPourInit__9daAlink_cFv */ #pragma push @@ -198,39 +201,49 @@ asm void daAlink_c::initKandelaarSwing() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procKandelaarSwingInit() { +asm int daAlink_c::procKandelaarSwingInit() { nofralloc #include "asm/d/a/d_a_alink/procKandelaarSwingInit__9daAlink_cFv.s" } #pragma pop /* 801115CC-8011167C 10BF0C 00B0+00 1/0 0/0 0/0 .text procKandelaarSwing__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procKandelaarSwing() { - nofralloc -#include "asm/d/a/d_a_alink/procKandelaarSwing__9daAlink_cFv.s" +int daAlink_c::procKandelaarSwing() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (frameCtrl->checkAnmEnd()) { + if (mDemo.getDemoMode() == 0x27) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else { + checkNextAction(0); + } + } else if (frameCtrl->getFrame() > field_0x3478 && mDemo.getDemoMode() != 0x27) { + onModeFlg(4); + checkNextAction(1); + } + + return 1; } -#pragma pop /* 8011167C-80111724 10BFBC 00A8+00 1/1 0/0 0/0 .text procKandelaarPourInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procKandelaarPourInit() { - nofralloc -#include "asm/d/a/d_a_alink/procKandelaarPourInit__9daAlink_cFv.s" +int daAlink_c::procKandelaarPourInit() { + if (!dComIfGp_event_compulsory(this, 0, 0xFBFF)) { + return 0; + } + + mDemo.i_setSpecialDemoType(); + commonProcInit(PROC_KANDELAAR_POUR); + current.angle.y = shape_angle.y; + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x2f98 = 4; + setSingleAnimeParam(ANM_OIL_BOTTLE_POUR_START, &daAlinkHIO_kandelaar_c0::m.mBeginUnkAnm); + commonKandelaarPourInit(); + return 1; } -#pragma pop /* 80111724-8011174C 10C064 0028+00 1/0 0/0 0/0 .text procKandelaarPour__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procKandelaarPour() { - nofralloc -#include "asm/d/a/d_a_alink/procKandelaarPour__9daAlink_cFv.s" -} -#pragma pop \ No newline at end of file +int daAlink_c::procKandelaarPour() { + commonKandelaarPour(0); + return 1; +} \ No newline at end of file diff --git a/src/d/a/d_a_alink_link.inc b/src/d/a/d_a_alink_link.inc index 4d4b6e1097e..9368dbbacdc 100644 --- a/src/d/a/d_a_alink_link.inc +++ b/src/d/a/d_a_alink_link.inc @@ -1,53 +1,80 @@ /* 800C2DDC-800C2EAC 0BD71C 00D0+00 17/17 0/0 0/0 .text * procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c */ -#ifdef NONMATCHING int daAlink_c::procPreActionUnequipInit(int param_0, fopAc_ac_c* param_1) { - commonProcInit(ACT_PROC_PREACTION_UNEQUIP); - mNormalSpeed = 0.0f; - setBlendMoveAnime(4.0f); + commonProcInit(PROC_PREACTION_UNEQUIP); + mNormalSpeed = FLOAT_LABEL(lit_6108); + setBlendMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); allUnequip(0); field_0x3010 = 0; - if (param_1 == NULL) { - field_0x300e = 0; - } else { + if (param_1 != NULL) { field_0x280c.setData(param_1); field_0x300e = 1; - if (fopAcM_GetName(param_1) == 0x2cb) { + + if (fopAcM_GetName(param_1) == PROC_Tag_Lv8Gate) { if (mEquipItem == KANTERA) { field_0x3010 = 1; - } else { - if (i_checkNoResetFlg2(1) != 0) { - offKandelaarModel(); - } + } else if (i_checkNoResetFlg2(FLG2_UNK_1)) { + offKandelaarModel(); } } + } else { + field_0x300e = 0; } field_0x3198 = param_0; return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procPreActionUnequipInit(int param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c.s" -} -#pragma pop -#endif /* 800C2EAC-800C3098 0BD7EC 01EC+00 1/0 0/0 0/0 .text procPreActionUnequip__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procPreActionUnequip() { - nofralloc -#include "asm/d/a/d_a_alink/procPreActionUnequip__9daAlink_cFv.s" +int daAlink_c::procPreActionUnequip() { + if (checkNoUpperAnime()) { + if (field_0x300e != 0 && (field_0x27f4 == NULL || field_0x27f4 != field_0x280c.getActor())) { + checkWaitAction(); + } else if (field_0x3198 == PROC_PUSH_PULL_WAIT) { + procCoPushPullWaitInit(1); + } else if (field_0x3198 == PROC_LADDER_DOWN_START) { + procLadderDownStartInit(); + } else if (field_0x3198 == PROC_LADDER_UP_START) { + procLadderUpStartInit(); + } else if (field_0x3198 == PROC_GRAB_READY) { + procGrabReadyInit(); + } else if (field_0x3198 == PROC_GET_ITEM) { + procCoGetItemInit(); + } else if (field_0x3198 == PROC_GET_READY_SIT) { + procCoGetReadySitInit(); + } else if (field_0x3198 == PROC_CHAIN_UP) { + procFmChainUpInit(); + } else if (field_0x3198 == PROC_PICK_UP) { + procPickUpInit(); + } else if (field_0x3198 == PROC_CRAWL_START) { + procCrawlStartInit(); + } else if (field_0x3198 == PROC_GRASS_WHISTLE_GET) { + procGrassWhistleGetInit(); + } else if (field_0x3198 == PROC_GOAT_STROKE) { + procGoatStrokeInit(); + } else if (field_0x3198 == PROC_HANG_READY) { + procHangReadyInit(); + } else if (field_0x3198 == PROC_INSECT_CATCH) { + procInsectCatchInit(); + } else if (field_0x3198 == PROC_GORON_MOVE) { + procGoronMoveInit(); + } else if (field_0x3198 == PROC_BOTTLE_SWING) { + procBottleSwingInit(NULL, 0); + } else if (field_0x3198 == PROC_HANG_LEVER_DOWN) { + procHangLeverDownInit(); + } else if (field_0x3198 == PROC_PICK_PUT) { + procPickPutInit(1); + } else { + checkNextAction(0); + } + } else { + setBlendMoveAnime(lit_6041); + } + + return 1; } -#pragma pop /* 800C3098-800C30F0 0BD9D8 0058+00 1/1 0/0 0/0 .text procServiceWaitInit__9daAlink_cFv */ @@ -55,7 +82,7 @@ int daAlink_c::procServiceWaitInit() { commonProcInit(PROC_SERVICE_WAIT); setSingleAnimeBase(ANM_SERVICE_WAIT); mNormalSpeed = FLOAT_LABEL(lit_6108); - current.angle.y = mCollisionRot.y; + current.angle.y = shape_angle.y; field_0x2f98 = 4; return 1; } @@ -64,7 +91,7 @@ int daAlink_c::procServiceWaitInit() { int daAlink_c::procServiceWait() { J3DFrameCtrl* ctrl = &mUnderFrameCtrl[0]; if ((!checkNextAction(0) && !checkFrontWallTypeAction()) && - (checkEventRun() || checkGuardActionChange() || mCollisionRot.y != field_0x2fe6)) { + (checkEventRun() || checkGuardActionChange() || shape_angle.y != field_0x2fe6)) { ctrl->setRate(FLOAT_LABEL(lit_6108)); procWaitInit(); } else { @@ -80,18 +107,40 @@ int daAlink_c::procServiceWait() { } /* 800C3224-800C3338 0BDB64 0114+00 2/2 0/0 0/0 .text procTiredWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procTiredWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procTiredWaitInit__9daAlink_cFv.s" +int daAlink_c::procTiredWaitInit() { + BOOL no_upper_anm = checkNoSetUpperAnime(); + + if (!commonProcInitNotSameProc(PROC_TIRED_WAIT)) { + return 0; + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + BOOL tired_anm = checkUnderMove0BckNoArc(ANM_WAIT_TIRED); + + if (no_upper_anm && + ((tired_anm && mNowAnmPackUnder[0].getRatio() < lit_16641) || + checkUnderMove1BckNoArc(ANM_STEP_TURN) || checkUnderMove1BckNoArc(ANM_SMALL_GUARD))) { + f32 var_f31; + if (tired_anm) { + var_f31 = mUnderFrameCtrl[0].getFrame(); + } else { + var_f31 = mUpperFrameCtrl[1].getFrame(); + } + + setSingleAnimeBase(ANM_WAIT_TIRED); + mUnderFrameCtrl[0].setFrame(var_f31); + getNowAnmPackUnder(UNDER_0)->setFrame(var_f31); + } else { + setSingleAnimeBase(ANM_WAIT_TO_TIRED); + } + + return 1; } -#pragma pop /* 800C3338-800C33B8 0BDC78 0080+00 1/0 0/0 0/0 .text procTiredWait__9daAlink_cFv */ int daAlink_c::procTiredWait() { daPy_frameCtrl_c* ctrl = &mUnderFrameCtrl[0]; + if (!checkNextAction(0)) { if (ctrl->checkAnmEnd()) { setSingleAnimeBase(ANM_WAIT_TIRED); @@ -99,24 +148,56 @@ int daAlink_c::procTiredWait() { setTiredVoice(ctrl); } } + return 1; } /* 800C33B8-800C3504 0BDCF8 014C+00 26/26 0/0 0/0 .text procWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWaitInit__9daAlink_cFv.s" +int daAlink_c::procWaitInit() { + if (mProcID == PROC_TURN_BACK) { + i_onEndResetFlg0(ERFLG0_UNK_8000000); + } + + if (mProcID == PROC_WAIT) { + return 0; + } + + if (!checkEventRun() && mProcID == PROC_SERVICE_WAIT && !mUnderFrameCtrl[0].checkAnmEnd() && + checkNoUpperAnime()) { + return 0; + } + + BOOL var_r30; + if (mProcID == PROC_GUARD_ATTACK || mProcID == PROC_CUT_REVERSE) { + var_r30 = false; + } else { + var_r30 = true; + } + + commonProcInit(PROC_WAIT); + mNormalSpeed = FLOAT_LABEL(lit_6108); + setBlendMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + current.angle.y = shape_angle.y; + + if (var_r30) { + field_0x2f98 = 4; + } + + initServiceWaitTime(); + + if (i_checkEndResetFlg0(ERFLG0_UNK_8000000) && + (checkUnderMove0BckNoArc(ANM_WAIT) || checkUnderMove0BckNoArc(ANM_WAIT_TIRED))) { + setSingleAnimeBase(ANM_WAIT_B_TO_A); + } + + return 1; } -#pragma pop /* 800C3504-800C36CC 0BDE44 01C8+00 1/0 0/0 0/0 .text procWait__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWait() { +asm int daAlink_c::procWait() { nofralloc #include "asm/d/a/d_a_alink/procWait__9daAlink_cFv.s" } @@ -125,15 +206,16 @@ asm void daAlink_c::procWait() { /* 800C36CC-800C3730 0BE00C 0064+00 3/3 0/0 0/0 .text procMoveInit__9daAlink_cFv */ int daAlink_c::procMoveInit() { if (!commonProcInitNotSameProc(PROC_MOVE)) { - return false; + return 0; } + setBlendMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); setFootEffectProcType(3); return 1; } /* 800C3730-800C3810 0BE070 00E0+00 1/0 0/0 0/0 .text procMove__9daAlink_cFv */ -// results of cLib_minMaxLimit are put in r4 instead of r3 +// reg swap #ifdef NONMATCHING int daAlink_c::procMove() { setFootEffectProcType(3); @@ -142,6 +224,7 @@ int daAlink_c::procMove() { mNormalSpeed > field_0x594 * daAlinkHIO_move_c0::m.mWalkChangeRate) { mNormalSpeed = field_0x594 * daAlinkHIO_move_c0::m.mWalkChangeRate; } + setBlendMoveAnime(-1.0f); if (field_0x3174 != 8) { field_0x30a0 = @@ -167,6 +250,7 @@ int daAlink_c::procAtnMoveInit() { if (!commonProcInitNotSameProc(PROC_ATN_MOVE)) { return 0; } + setBlendAtnMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); return 1; } @@ -178,6 +262,7 @@ int daAlink_c::procAtnMove() { setBlendAtnMoveAnime(lit_6041); } } + return 1; } @@ -191,6 +276,7 @@ int daAlink_c::procAtnActorWaitInit() { if (mTargetedActor != NULL) { fopAcM_searchActorAngleY(this, mTargetedActor); } + mNormalSpeed = FLOAT_LABEL(lit_6108); if (field_0x2f98 != 2) { field_0x2f98 = 3; @@ -215,6 +301,7 @@ int daAlink_c::procAtnActorWait() { } checkSwordTwirlAction(); } + return 1; } @@ -224,6 +311,7 @@ int daAlink_c::procAtnActorMoveInit() { if (!commonProcInitNotSameProc(PROC_ATN_ACTOR_MOVE)) { return 0; } + setBlendAtnMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); return 1; } @@ -234,6 +322,7 @@ int daAlink_c::procAtnActorMove() { setBlendAtnMoveAnime(lit_6041); checkSwordTwirlAction(); } + return 1; } @@ -248,39 +337,39 @@ int daAlink_c::procWaitTurnInit() { if (checkEventRun()) { mNormalSpeed = FLOAT_LABEL(lit_6108); } + field_0x300e = field_0x2fe2; - current.angle.y = mCollisionRot.y; + current.angle.y = shape_angle.y; return 1; } /* 800C3B1C-800C3C3C 0BE45C 0120+00 1/0 0/0 0/0 .text procWaitTurn__9daAlink_cFv */ int daAlink_c::procWaitTurn() { cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), daAlinkHIO_move_c0::m.mDeceleration); + if (checkGroundSpecialMode()) { return 1; + } else if (i_checkEndResetFlg0(ERFLG0_UNK_100000)) { + return procFloorDownReboundInit(); } else { - if (i_checkEndResetFlg0(ERFLG0_UNK_100000)) { - return procFloorDownReboundInit(); - } else { - s16 angle = cLib_addCalcAngleS(&mCollisionRot.y, field_0x300e, 30, 0x3CDF, 8000); - current.angle.y = mCollisionRot.y; - if (checkNextActionFromButton()) { - return 1; - } else { - if (angle == 0) { - if (checkEventRun()) { - if (mDemo.getDemoMode() == 5) { - dComIfGp_evmng_cutEnd(field_0x3184); - } else if (!checkNextAction(0)) { - checkWaitAction(); - } - } else { - checkNextAction(0); - } + s16 angle = cLib_addCalcAngleS(&shape_angle.y, field_0x300e, 30, 0x3CDF, 8000); + current.angle.y = shape_angle.y; + + if (checkNextActionFromButton()) { + return 1; + } else if (angle == 0) { + if (checkEventRun()) { + if (mDemo.getDemoMode() == 5) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else if (!checkNextAction(0)) { + checkWaitAction(); } + } else { + checkNextAction(0); } } } + return 1; } @@ -294,17 +383,18 @@ int daAlink_c::procMoveTurnInit(int param_0) { dComIfGp_setPlayerStatus0(0, 0x800); if (param_0 != 0) { - field_0x300e = (daAlinkHIO_move_c0::m.mMaxTurnAngle << 2) + 19030; - field_0x3010 = daAlinkHIO_move_c0::m.mMaxTurnAngle << 1; + field_0x300e = (daAlinkHIO_move_c0::m.mMaxTurnAngle * 4) + 19030; + field_0x3010 = daAlinkHIO_move_c0::m.mMaxTurnAngle * 2; field_0x300a = 2; current.angle.y = field_0x2fe2; mNormalSpeed *= lit_5943; } else { - field_0x300e = daAlinkHIO_move_c0::m.mMaxTurnAngle << 1; + field_0x300e = daAlinkHIO_move_c0::m.mMaxTurnAngle * 2; field_0x3010 = daAlinkHIO_move_c0::m.mMaxTurnAngle; field_0x300a = 3; } - field_0x300e = daAlinkHIO_move_c0::m.mMaxTurnAngle << 1; + + field_0x300e = daAlinkHIO_move_c0::m.mMaxTurnAngle * 2; field_0x3010 = daAlinkHIO_move_c0::m.mMaxTurnAngle; return 1; } @@ -312,12 +402,12 @@ int daAlink_c::procMoveTurnInit(int param_0) { /* 800C3D38-800C3DA0 0BE678 0068+00 1/0 0/0 0/0 .text procMoveTurn__9daAlink_cFv */ int daAlink_c::procMoveTurn() { setSpeedAndAngleNormal(); - cLib_addCalcAngleS(&mCollisionRot.y, current.angle.y, field_0x300a, field_0x300e, - field_0x3010); + cLib_addCalcAngleS(&shape_angle.y, current.angle.y, field_0x300a, field_0x300e, field_0x3010); if (!checkNextAction(0)) { setBlendMoveAnime(lit_6041); } + return 1; } @@ -326,61 +416,66 @@ int daAlink_c::procSideStepInit(int jump_type) { if (jump_type == 1 && !checkHeavyStateOn(1, 1) && (checkNoUpperAnime() || checkEquipAnime() || field_0x2fcc != 0 && checkUpperGuardAnime())) { return procBackJumpInit(0); - } else { - commonProcInit(PROC_SIDESTEP); - field_0x2f98 = jump_type; - - if (field_0x2f98 == 1) { - current.angle.y = mCollisionRot.y + 0x8000; - setSingleAnimeParam(ANM_BACK_JUMP, &daAlinkHIO_sideStep_c0::m.mBackJumpAnm); - mNormalSpeed = daAlinkHIO_sideStep_c0::m.mBackJumpSpeedH; - mSpeed.y = daAlinkHIO_sideStep_c0::m.mBackJumpSpeedV; - field_0x300a = 0; - } else { - daAlink_ANM anm_id; - if (field_0x2f98 == 2) { - anm_id = ANM_SIDE_JUMP_LEFT; - current.angle.y = mCollisionRot.y + 0x4000; - } else { - anm_id = ANM_SIDE_JUMP_RIGHT; - current.angle.y = mCollisionRot.y - 0x4000; - } - setSingleAnimeParam(anm_id, &daAlinkHIO_sideStep_c0::m.mSideJumpAnm); - mNormalSpeed = daAlinkHIO_sideStep_c0::m.mSideJumpSpeedH; - mSpeed.y = daAlinkHIO_sideStep_c0::m.mSideJumpSpeedV; - field_0x300a = 1; - } - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { - mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; - mSpeed.y *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityY; - } - voiceStart(Z2SE_AL_V_JUMP_S); - mCommonCounter = 0; - field_0x300e = 0; - return 1; } + + commonProcInit(PROC_SIDESTEP); + field_0x2f98 = jump_type; + + if (field_0x2f98 == 1) { + current.angle.y = shape_angle.y + 0x8000; + setSingleAnimeParam(ANM_BACK_JUMP, &daAlinkHIO_sideStep_c0::m.mBackJumpAnm); + mNormalSpeed = daAlinkHIO_sideStep_c0::m.mBackJumpSpeedH; + mSpeed.y = daAlinkHIO_sideStep_c0::m.mBackJumpSpeedV; + field_0x300a = 0; + } else { + daAlink_ANM anm_id; + if (field_0x2f98 == 2) { + anm_id = ANM_SIDE_JUMP_LEFT; + current.angle.y = shape_angle.y + 0x4000; + } else { + anm_id = ANM_SIDE_JUMP_RIGHT; + current.angle.y = shape_angle.y - 0x4000; + } + + setSingleAnimeParam(anm_id, &daAlinkHIO_sideStep_c0::m.mSideJumpAnm); + mNormalSpeed = daAlinkHIO_sideStep_c0::m.mSideJumpSpeedH; + mSpeed.y = daAlinkHIO_sideStep_c0::m.mSideJumpSpeedV; + field_0x300a = 1; + } + + if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; + mSpeed.y *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityY; + } + + voiceStart(Z2SE_AL_V_JUMP_S); + mCommonCounter = 0; + field_0x300e = 0; + return 1; } /* 800C3F60-800C40F0 0BE8A0 0190+00 1/0 0/0 0/0 .text procSideStep__9daAlink_cFv */ int daAlink_c::procSideStep() { if (mTargetedActor != NULL && field_0x300a != 0) { s16 actor_angle = fopAcM_searchActorAngleY(this, mTargetedActor); - cLib_addCalcAngleS(&mCollisionRot.y, actor_angle, 5, 0x5E8, 0x13C); + cLib_addCalcAngleS(&shape_angle.y, actor_angle, 5, 0x5E8, 0x13C); + if (field_0x2f98 == 2) { - current.angle.y = mCollisionRot.y + 0x4000; + current.angle.y = shape_angle.y + 0x4000; } else { - current.angle.y = mCollisionRot.y - 0x4000; + current.angle.y = shape_angle.y - 0x4000; } } + if (doTrigger() && field_0x300a != 0) { mCommonCounter = 1; } if (checkUpperItemActionFly()) { - return true; + return 1; } else if (mLinkAcch.ChkGroundHit() && field_0x300e != 0) { if (mCommonCounter != 0 && checkSideRollAction(field_0x2f98)) { - return true; + return 1; } else { return procSideStepLandInit(); } @@ -400,10 +495,11 @@ int daAlink_c::procSideStep() { */ int daAlink_c::procSideStepLandInit() { commonProcInit(PROC_SIDESTEP_LAND); + if (field_0x2f98 == 1) { field_0x2f9d = 4; setSingleAnimeParam(ANM_BACK_JUMP_LAND, &daAlinkHIO_sideStep_c0::m.mBackLandAnm); - field_0x3478 = daAlinkHIO_sideStep_c0::m.mBackLandAnm.field_0x10; + field_0x3478 = daAlinkHIO_sideStep_c0::m.mBackLandAnm.mCheckFrame; field_0x2f98 = 2; field_0x300a = 0; field_0x2fb0 = 0; @@ -418,22 +514,25 @@ int daAlink_c::procSideStepLandInit() { anm_id = ANM_SIDE_JUMP_RIGHT_LAND; uvar3 = 0x40; } + setSingleAnimeParam(anm_id, &daAlinkHIO_sideStep_c0::m.mSideLandAnm); - field_0x3478 = daAlinkHIO_sideStep_c0::m.mSideLandAnm.field_0x10; + field_0x3478 = daAlinkHIO_sideStep_c0::m.mSideLandAnm.mCheckFrame; field_0x300a = 1; field_0x2fb0 = 8; field_0x2fcc = 0; + if (checkEnemyGroup(mTargetedActor) && mEquipItem == EQUIP_SWORD && checkNoUpperAnime()) { setUpperAnimeBaseSpeed(uvar3, daAlinkHIO_atnMove_c0::m.mWaitAnmSpeed, lit_6041); seStartSwordCut(Z2SE_AL_WAIT_SWORD_SWING); } } + field_0x2f9d = 4; setFootEffectProcType(2); i_onResetFlg1(0x30); mNormalSpeed = FLOAT_LABEL(lit_6108); mCommonCounter = 0; - current.angle.y = mCollisionRot.y; + current.angle.y = shape_angle.y; setStepLandVibration(); return 1; } @@ -442,6 +541,7 @@ int daAlink_c::procSideStepLandInit() { int daAlink_c::procSideStepLand() { daPy_frameCtrl_c* ctrl = &mUnderFrameCtrl[0]; i_onEndResetFlg0(ERFLG0_UNK_8000000); + if (field_0x2fcc != 0) { field_0x2fcc = 10; } @@ -474,13 +574,13 @@ int daAlink_c::procSlideInit(s16 param_0) { field_0x3090 = 8; current.angle.y = param_0; - if (getMoveBGActorName(mLinkAcch.m_gnd, 0) == 0xD4) { + if (getMoveBGActorName(mLinkAcch.m_gnd, 0) == PROC_Obj_Lv3R10Saka) { field_0x300e = 1; } else { field_0x300e = 0; } - if (cLib_distanceAngleS(param_0, mCollisionRot.y) < 0x3800 || field_0x300e != 0) { + if (cLib_distanceAngleS(param_0, shape_angle.y) < 0x3800 || field_0x300e != 0) { field_0x3198 = 1; setSingleAnimeParam(ANM_SLIDE_FORWARD, &daAlinkHIO_slide_c0::m.mForwardSlideAnm); dComIfGp_setPlayerStatus1(0, 0x100); @@ -499,6 +599,7 @@ int daAlink_c::procSlideInit(s16 param_0) { field_0x2f9d = 0x60; setFootEffectProcType(1); } + field_0x594 = daAlinkHIO_slide_c0::m.mMaxSpeed; field_0x33cc = FLOAT_LABEL(lit_6108); mCommonCounter = 0; @@ -514,7 +615,7 @@ SECTION_SDATA2 static f32 lit_73057 = -4096.0f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSlide() { +asm int daAlink_c::procSlide() { nofralloc #include "asm/d/a/d_a_alink/procSlide__9daAlink_cFv.s" } @@ -526,15 +627,16 @@ int daAlink_c::procSlideLandInit(int param_0) { if (param_0 != 0) { setSingleAnimeParam(ANM_SLIDE_FORWARD_END, &daAlinkHIO_slide_c0::m.mForwardLandAnm); - field_0x3478 = daAlinkHIO_slide_c0::m.mForwardLandAnm.field_0x10; + field_0x3478 = daAlinkHIO_slide_c0::m.mForwardLandAnm.mCheckFrame; field_0x3198 = 1; field_0x2f99 = 4; field_0x3588 = l_waitBaseAnime; } else { setSingleAnimeParam(ANM_SLIDE_BACKWARD_END, &daAlinkHIO_slide_c0::m.mBackwardLandAnm); - field_0x3478 = daAlinkHIO_slide_c0::m.mBackwardLandAnm.field_0x10; + field_0x3478 = daAlinkHIO_slide_c0::m.mBackwardLandAnm.mCheckFrame; field_0x3198 = 0; } + field_0x814.SetWeight(255); mNormalSpeed *= lit_5943; return 1; @@ -550,17 +652,17 @@ int daAlink_c::procSlideLand() { } if (ctrl->checkAnmEnd()) { - current.angle.y = mCollisionRot.y; + current.angle.y = shape_angle.y; checkNextAction(0); - } else { - if (ctrl->getFrame() > field_0x3478) { - s16 tmp_angle = current.angle.y; - current.angle.y = mCollisionRot.y; - if (!checkNextAction(1)) { - current.angle.y = tmp_angle; - } + } else if (ctrl->getFrame() > field_0x3478) { + s16 tmp_angle = current.angle.y; + current.angle.y = shape_angle.y; + + if (!checkNextAction(1)) { + current.angle.y = tmp_angle; } } + return 1; } @@ -599,7 +701,7 @@ int daAlink_c::procFrontRollInit() { } else { mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; } - current.angle.y = mCollisionRot.y; + current.angle.y = shape_angle.y; voiceStart(Z2SE_AL_V_BACKTEN); mCommonCounter = 0; setFootEffectProcType(0); @@ -634,68 +736,164 @@ asm int daAlink_c::procFrontRollInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procFrontRoll() { +asm int daAlink_c::procFrontRoll() { nofralloc #include "asm/d/a/d_a_alink/procFrontRoll__9daAlink_cFv.s" } #pragma pop /* 800C4F14-800C4FFC 0BF854 00E8+00 1/1 0/0 0/0 .text procFrontRollCrashInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFrontRollCrashInit() { - nofralloc -#include "asm/d/a/d_a_alink/procFrontRollCrashInit__9daAlink_cFv.s" +int daAlink_c::procFrontRollCrashInit() { + commonProcInit(PROC_FRONT_ROLL_CRASH); + setSingleAnime(ANM_ROLL_CRASH, FLOAT_LABEL(lit_6108), + daAlinkHIO_frontRoll_c0::m.mCrashAnm.mStartFrame, + daAlinkHIO_frontRoll_c0::m.mCrashAnm.mEndFrame, + daAlinkHIO_frontRoll_c0::m.mCrashAnm.mInterpolation); + + mNormalSpeed = daAlinkHIO_frontRoll_c0::m.mCrashSpeedH; + mSpeed.y = daAlinkHIO_frontRoll_c0::m.mCrashSpeedV; + + if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; + mSpeed.y *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityY; + } + + current.angle.y -= -0x8000; + setFrontRollCrashShock(mRollCrashFlg); + voiceStart(Z2SE_AL_V_ZENTEN_FAIL); + i_onResetFlg0(0x2000); + + return 1; } -#pragma pop /* 800C4FFC-800C5160 0BF93C 0164+00 1/0 0/0 0/0 .text procFrontRollCrash__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFrontRollCrash() { - nofralloc -#include "asm/d/a/d_a_alink/procFrontRollCrash__9daAlink_cFv.s" +int daAlink_c::procFrontRollCrash() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (!i_checkModeFlg(2)) { + if (frameCtrl->checkAnmEnd()) { + checkNextAction(0); + } else if (frameCtrl->getFrame() > daAlinkHIO_frontRoll_c0::m.mCrashAnm.mCheckFrame) { + onModeFlg(4); + checkNextAction(1); + } else if (frameCtrl->getFrame() >= lit_10193) { + field_0x2f92 = 4; + } else if (frameCtrl->getFrame() >= lit_8130) { + field_0x2f93 = 10; + } + } else if ((mLinkAcch.ChkGroundHit() || i_checkEndResetFlg2(ERFLG2_UNK_100) || + i_checkMagneBootsOn()) && + i_checkModeFlg(2)) { + mNormalSpeed = FLOAT_LABEL(lit_6108); + setWaterInAnmRate(frameCtrl, daAlinkHIO_frontRoll_c0::m.mCrashAnm.mSpeed); + frameCtrl->offEndFlg(); + current.angle.y = shape_angle.y; + voiceStart(Z2SE_AL_V_ZENTEN_FAIL_2); + offModeFlg(2); + onModeFlg(0x8001); + } + + return 1; } -#pragma pop /* 800C5160-800C5240 0BFAA0 00E0+00 3/3 0/0 0/0 .text procFrontRollSuccessInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFrontRollSuccessInit() { - nofralloc -#include "asm/d/a/d_a_alink/procFrontRollSuccessInit__9daAlink_cFv.s" +int daAlink_c::procFrontRollSuccessInit() { + BOOL dk_caught = mProcID == PROC_DK_CAUGHT; + + commonProcInit(PROC_FRONT_ROLL_SUCCESS); + setSingleAnimeParam(ANM_BARRIER_RECOIL, &daAlinkHIO_frontRoll_c0::m.mCrashHitAnm); + mNormalSpeed = FLOAT_LABEL(lit_6108); + + if (!dk_caught) { + setFrontRollCrashShock(mRollCrashFlg); + i_onResetFlg0(0x2000); + } else { + f32 tmp_3 = lit_6109; + mUnderFrameCtrl[0].setFrame(tmp_3); + getNowAnmPackUnder(UNDER_0)->setFrame(tmp_3); + } + + field_0x3588 = l_halfAtnWaitBaseAnime; + field_0x2f99 = 4; + setFootEffectProcType(1); + current.angle.y = shape_angle.y - -0x8000; + + return 1; } -#pragma pop /* 800C5240-800C5328 0BFB80 00E8+00 1/0 0/0 0/0 .text procFrontRollSuccess__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFrontRollSuccess() { - nofralloc -#include "asm/d/a/d_a_alink/procFrontRollSuccess__9daAlink_cFv.s" +int daAlink_c::procFrontRollSuccess() { + daPy_frameCtrl_c* frameCtrl = &mUnderFrameCtrl[0]; + + field_0x2f99 = 4; + i_onEndResetFlg0(0x8000000); + + if (frameCtrl->checkAnmEnd()) { + current.angle.y = shape_angle.y; + checkNextAction(0); + } else if (frameCtrl->getFrame() > daAlinkHIO_frontRoll_c0::m.mCrashHitAnm.mCheckFrame) { + onModeFlg(4); + current.angle.y = shape_angle.y; + checkNextAction(1); + } else if (frameCtrl->getFrame() >= lit_8130) { + field_0x2f92 = 1; + field_0x2f93 = 6; + } else if (frameCtrl->getFrame() > lit_7710) { + field_0x2f9d = 0x60; + } + + return 1; } -#pragma pop /* 800C5328-800C5484 0BFC68 015C+00 3/3 0/0 0/0 .text procSideRollInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procSideRollInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procSideRollInit__9daAlink_cFi.s" +int daAlink_c::procSideRollInit(int param_0) { + BOOL guard_anime = checkUpperGuardAnime(); + + if (!commonProcInitNotSameProc(PROC_SIDE_ROLL)) { + return 0; + } + + field_0x2f98 = param_0; + + daAlink_ANM anmID; + if (field_0x2f98 == 2) { + anmID = ANM_SIDE_ROLL_LEFT; + current.angle.y = shape_angle.y + 0x4000; + } else { + anmID = ANM_SIDE_ROLL_RIGHT; + current.angle.y = shape_angle.y + -0x4000; + } + + setSingleAnime(anmID, daAlinkHIO_turnMove_c0::m.mSideRollAnmSpeed, + daAlinkHIO_turnMove_c0::m.mTurnAnm.mStartFrame, + daAlinkHIO_turnMove_c0::m.mTurnAnm.mEndFrame, + daAlinkHIO_turnMove_c0::m.mTurnAnm.mInterpolation); + mNormalSpeed = daAlinkHIO_turnMove_c0::m.mSideRollSpeed; + + if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; + } else if (checkHeavyStateOn(1, 1)) { + mNormalSpeed *= mHeavySpeedMultiplier; + } + + setFootEffectProcType(0); + field_0x2f9d = 4; + voiceStart(Z2SE_AL_V_SOTOMO_ROLL); + + if (guard_anime) { + i_onNoResetFlg0(FLG0_UNK_2); + } + mCommonCounter = 0; + + return 1; } -#pragma pop /* 800C5484-800C5700 0BFDC4 027C+00 1/0 0/0 0/0 .text procSideRoll__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSideRoll() { +asm int daAlink_c::procSideRoll() { nofralloc #include "asm/d/a/d_a_alink/procSideRoll__9daAlink_cFv.s" } @@ -723,61 +921,146 @@ void daAlink_c::backJumpSpeedDec() { } /* 800C57A4-800C5964 0C00E4 01C0+00 6/6 0/0 0/0 .text procBackJumpInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procBackJumpInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procBackJumpInit__9daAlink_cFi.s" +int daAlink_c::procBackJumpInit(int param_0) { + u32 horse_ride = checkHorseRide(); + BOOL guard_anime = checkUpperGuardAnime(); + BOOL ganon_finish = mProcID == PROC_GANON_FINISH; + + commonProcInit(PROC_BACK_JUMP); + + if (param_0) { + setSingleAnimeParam(ANM_BACKFLIP, &daAlinkHIO_cutDown_c0::m.mRecoverAnm); + mNormalSpeed = daAlinkHIO_cutDown_c0::m.mRecoverSpeedV; + mSpeed.y = daAlinkHIO_cutDown_c0::m.mSpeedV; + voiceStart(Z2SE_AL_V_TODOME_RETURN); + } else { + setSingleAnimeParam(ANM_BACKFLIP, &daAlinkHIO_backJump_c0::m.mBackflipAnm); + mNormalSpeed = daAlinkHIO_backJump_c0::m.mBackflipSpeedH; + mSpeed.y = daAlinkHIO_backJump_c0::m.mBackflipSpeedV; + voiceStart(Z2SE_AL_V_BACKTEN); + } + + field_0x3478 = mNormalSpeed; + + if (horse_ride) { + onModeFlg(0x2000); + field_0x3008 = 5; + } else { + field_0x3008 = 0; + } + + if (ganon_finish) { + shape_angle.y -= -0x8000; + setOldRootQuaternion(0, -0x8000, 0); + field_0x2060->getOldFrameTransInfo(0)->mTranslate.z += lit_20991; + i_onNoResetFlg3(FLG3_UNK_4000000); + } + + current.angle.y = shape_angle.y - -0x8000; + field_0x3198 = 2; + + if (guard_anime) { + i_onNoResetFlg0(FLG0_UNK_2); + } + + return 1; } -#pragma pop /* 800C5964-800C5A54 0C02A4 00F0+00 1/0 0/0 0/0 .text procBackJump__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBackJump() { - nofralloc -#include "asm/d/a/d_a_alink/procBackJump__9daAlink_cFv.s" +int daAlink_c::procBackJump() { + if (field_0x3008 != 0) { + field_0x3008--; + } else { + offModeFlg(0x2000); + } + + if (checkCutTurnInput() && mEquipItem == 0x103) { + field_0x3198 = getCutTurnDirection(); + } + + backJumpSpeedDec(); + + if (mLinkAcch.ChkGroundHit() && mUnderFrameCtrl[0].checkAnmEnd()) { + procBackJumpLandInit(field_0x3198); + } else if (mDemo.getDemoMode() != 0x10 && + current.pos.y < mLastJumpPos.y - daAlinkHIO_backJump_c0::m.mFallHeight) { + procFallInit(2, daAlinkHIO_backJump_c0::m.mFallInterpolation); + } + + checkItemChangeFromButton(); + return 1; } -#pragma pop /* 800C5A54-800C5AF0 0C0394 009C+00 1/1 0/0 0/0 .text procBackJumpLandInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBackJumpLandInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procBackJumpLandInit__9daAlink_cFi.s" +int daAlink_c::procBackJumpLandInit(int i_cutDirection) { + commonProcInit(PROC_BACK_JUMP_LAND); + setSingleAnimeParam(ANM_BACKFLIP_LAND, &daAlinkHIO_backJump_c0::m.mLandAnm); + mNormalSpeed = FLOAT_LABEL(lit_6108); + + field_0x2f9d = 4; + setFootEffectProcType(2); + i_onResetFlg1(0x30); + + field_0x3198 = i_cutDirection; + current.angle.y = shape_angle.y; + field_0x2fcc = 10; + setStepLandVibration(); + + return 1; } -#pragma pop /* 800C5AF0-800C5C28 0C0430 0138+00 1/0 0/0 0/0 .text procBackJumpLand__9daAlink_cFv */ #pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBackJumpLand() { - nofralloc -#include "asm/d/a/d_a_alink/procBackJumpLand__9daAlink_cFv.s" +#pragma optimization_level 2 +int daAlink_c::procBackJumpLand() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (field_0x2fcc != 0) { + field_0x2fcc = 10; + } + + i_onEndResetFlg0(0x8000000); + + if (frameCtrl->checkAnmEnd()) { + if (mDemo.getDemoMode() == 0x10) { + dComIfGp_getPEvtManager()->cutEnd(field_0x3184); + } else { + if (!i_checkAttentionLock()) { + i_offNoResetFlg2(FLG2_UNK_8000000); + } + checkNextAction(0); + } + } else if (frameCtrl->getFrame() > daAlinkHIO_backJump_c0::m.mLandAnm.mCheckFrame) { + if (mEquipItem == 0x103 && (field_0x3198 != 2 || checkCutTurnInput())) { + return procCutTurnInit(1, field_0x3198); + } + + checkNextAction(1); + } + + return 1; } #pragma pop /* 800C5C28-800C5CA4 0C0568 007C+00 1/1 0/0 0/0 .text procSlipInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSlipInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSlipInit__9daAlink_cFv.s" +int daAlink_c::procSlipInit() { + commonProcInit(PROC_SLIP); + setSingleAnimeParam(ANM_SLIP, &daAlinkHIO_move_c0::m.mSlideAnm); + mNormalSpeed = mSpeedF * daAlinkHIO_move_c0::m.mSlideSpeed; + + field_0x2f9d = 0x40; + setFootEffectProcType(1); + field_0x3008 = 5; + + return 1; } -#pragma pop /* 800C5CA4-800C5E68 0C05E4 01C4+00 1/0 0/0 0/0 .text procSlip__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSlip() { +asm int daAlink_c::procSlip() { nofralloc #include "asm/d/a/d_a_alink/procSlip__9daAlink_cFv.s" } @@ -787,7 +1070,7 @@ asm void daAlink_c::procSlip() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procAutoJumpInit(int param_0) { +asm int daAlink_c::procAutoJumpInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procAutoJumpInit__9daAlink_cFi.s" } @@ -801,55 +1084,111 @@ SECTION_SDATA2 static f32 lit_73781 = 2.0f / 3.0f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procAutoJump() { +asm int daAlink_c::procAutoJump() { nofralloc #include "asm/d/a/d_a_alink/procAutoJump__9daAlink_cFv.s" } #pragma pop -/* ############################################################################################## */ -/* 804532E8-804532EC 0018E8 0004+00 1/1 0/0 0/0 .sdata2 @73790 */ -SECTION_SDATA2 static f32 lit_73790 = 92.0f; - /* 800C66DC-800C6798 0C101C 00BC+00 1/1 0/0 0/0 .text procDiveJumpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procDiveJumpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procDiveJumpInit__9daAlink_cFv.s" +int daAlink_c::procDiveJumpInit() { + commonProcInit(PROC_DIVE_JUMP); + setSingleAnimeParam(ANM_DIVE_START, &daAlinkHIO_autoJump_c0::m.mDiveAnm); + deleteEquipItem(TRUE, TRUE); + setHeavyBoots(0); + + mSpeed.y = daAlinkHIO_autoJump_c0::m.mDiveSpeedV; + mNormalSpeed = daAlinkHIO_autoJump_c0::m.mDiveSpeedH; + mGravity = daAlinkHIO_autoJump_c0::m.mDiveGravity; + + mCommonCounter = 0; + current.angle.y = shape_angle.y; + field_0x33b0 = 92.0f; + + voiceStart(Z2SE_AL_V_JUMP_DIVING); + return 1; } -#pragma pop /* 800C6798-800C6850 0C10D8 00B8+00 1/0 0/0 0/0 .text procDiveJump__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procDiveJump() { - nofralloc -#include "asm/d/a/d_a_alink/procDiveJump__9daAlink_cFv.s" +int daAlink_c::procDiveJump() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (mLinkAcch.ChkGroundHit()) { + return procFrontRollInit(); + } + + if (mCommonCounter == 0) { + if (frameCtrl->checkAnmEnd()) { + setSingleAnimeParam(ANM_DIVE, &daAlinkHIO_autoJump_c0::m.mDiveConnectAnm); + mCommonCounter = 1; + field_0x2f99 = 2; + } + } else { + field_0x2f99 = 2; + + if (frameCtrl->getFrame() >= lit_6109) { + cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), lit_5943); + } + } + + return 1; } -#pragma pop /* 800C6850-800C692C 0C1190 00DC+00 1/1 0/0 0/0 .text procRollJumpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procRollJumpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procRollJumpInit__9daAlink_cFv.s" +int daAlink_c::procRollJumpInit() { + commonProcInit(PROC_ROLL_JUMP); + setSingleAnimeBaseSpeed(ANM_ROLL_JUMP, FLOAT_LABEL(lit_6108), + daAlinkHIO_autoJump_c0::m.mSpinJumpInterpolation); + + field_0x3478 = field_0x3410; + mNormalSpeed = field_0x3410; + mSpeed.y = field_0x3414; + + field_0x2fe6 = field_0x30ee; + shape_angle.y = field_0x30ee; + current.angle.y = shape_angle.y; + + mLinkAcch.i_ClrGroundHit(); + field_0x347c = FLOAT_LABEL(lit_6108); + shape_angle.x = 1; + + voiceStart(Z2SE_AL_V_GORONJUMP); + seStartOnlyReverb(Z2SE_AL_GORON_JUMP_START); + mCommonCounter = 1; + + return 1; } -#pragma pop /* 800C692C-800C6A48 0C126C 011C+00 1/0 0/0 0/0 .text procRollJump__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procRollJump() { - nofralloc -#include "asm/d/a/d_a_alink/procRollJump__9daAlink_cFv.s" +int daAlink_c::procRollJump() { + if (mLinkAcch.ChkGroundHit()) { + return checkLandAction(0); + } + + if (mSpeed.y < FLOAT_LABEL(lit_6108)) { + procFallInit(3, daAlinkHIO_autoJump_c0::m.mSpinJumpFallInterpolation); + } else { + s16 old_angle = shape_angle.x; + shape_angle.x += daAlinkHIO_autoJump_c0::m.mSpinJumpRotateSpeed; + + if (shape_angle.x * old_angle <= 0) { + if (mCommonCounter != 0) { + seStartOnlyReverb(Z2SE_AL_GORON_JUMP_ROLLING); + mCommonCounter = 0; + } else { + mCommonCounter = 1; + } + } + + cLib_chaseF(&field_0x347c, + field_0x33a8 * cM_scos(field_0x2fe2 - shape_angle.y) * + daAlinkHIO_autoJump_c0::m.mSpinJumpAddSpeed, + daAlinkHIO_autoJump_c0::m.mSpinJumpAccel); + mNormalSpeed = field_0x3478 + field_0x347c; + } + + return 1; } -#pragma pop /* 800C6A48-800C6D20 0C1388 02D8+00 30/30 0/0 0/0 .text procFallInit__9daAlink_cFif */ #pragma push @@ -862,34 +1201,110 @@ asm int daAlink_c::procFallInit(int param_0, f32 param_1) { #pragma pop /* 800C6D20-800C6F18 0C1660 01F8+00 1/0 0/0 0/0 .text procFall__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFall() { - nofralloc -#include "asm/d/a/d_a_alink/procFall__9daAlink_cFv.s" +int daAlink_c::procFall() { + if (field_0x3012 == 0) { + cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), lit_9054); + } else if (field_0x3012 > 0) { + field_0x3012 = -1; + return 1; + } + + setLandPassiveData(); + if (checkUpperItemActionFly()) { + return 1; + } + + if (mLinkAcch.ChkGroundHit()) { + return checkLandAction(field_0x300e); + } + + if (i_dComIfGs_getLife() != 0) { + if (field_0x3008 == 1) { + if (field_0x300a > 0) { + field_0x300a--; + } else { + setFrontWallType(); + + if ((field_0x32cc != 0 || + ((checkInputOnR() && getDirectionFromShapeAngle() == 0) || doTrigger())) && + checkFrontWallTypeAction()) { + return 1; + } + } + } else if (field_0x3008 == 2 && checkFrontWallTypeAction()) { + return 1; + } + + setFallVoice(); + + f32 tmp_f1 = (mFallHeight - current.pos.y) * lit_8782; + if (mCommonCounter == 0 && tmp_f1 > daAlinkHIO_damFall_c0::m.mFallAnmTransitionHeight) { + setSingleAnimeBaseSpeed(ANM_DMG_FALL, FLOAT_LABEL(lit_6108), + daAlinkHIO_damFall_c0::m.mFallAnmMorf); + mCommonCounter = 1; + } + + if (current.angle.y == shape_angle.y && checkCutJumpInFly()) { + return 1; + } + } + + if (i_dComIfGs_getLife() != 0) { + checkItemChangeFromButton(); + } + + return 1; } -#pragma pop /* 800C6F18-800C6FE4 0C1858 00CC+00 6/6 0/0 0/0 .text procLandInit__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLandInit(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procLandInit__9daAlink_cFf.s" +int daAlink_c::procLandInit(f32 param_0) { + commonProcInit(PROC_LAND); + mNormalSpeed = FLOAT_LABEL(lit_6108); + + setSingleAnimeParam(ANM_JUMP_LAND, &daAlinkHIO_autoJump_c0::m.mLandAnm); + + if (checkGrabGlide()) { + mUnderFrameCtrl[0].setRate(lit_5943); + } else if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + f32 rate = mUnderFrameCtrl[0].getRate() * lit_28286; + mUnderFrameCtrl[0].setRate(rate); + } + + field_0x2f9d = 4; + setFootEffectProcType(4); + + i_onResetFlg1(0x30); + current.angle.y = shape_angle.y; + field_0x3478 = param_0; + + return 1; } -#pragma pop /* 800C6FE4-800C70F8 0C1924 0114+00 1/0 0/0 0/0 .text procLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLand() { - nofralloc -#include "asm/d/a/d_a_alink/procLand__9daAlink_cFv.s" +int daAlink_c::procLand() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (frameCtrl->checkAnmEnd()) { + checkNextAction(0); + } else if (frameCtrl->getFrame() > daAlinkHIO_autoJump_c0::m.mLandAnm.mCheckFrame) { + checkNextAction(1); + } else if (frameCtrl->checkPass(lit_7450)) { + int var_r4; + if (checkBootsOrArmorHeavy()) { + var_r4 = 3; + } else if (i_checkNoResetFlg0(FLG0_UNDERWATER) || + field_0x3478 < daAlinkHIO_damFall_c0::m.mMinRollHeight) { + var_r4 = 1; + } else { + var_r4 = 2; + } + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + dComIfGp_getVibration().StartShock(var_r4, 15, cXyz(tmp_0, lit_6040, tmp_0)); + } + + return 1; } -#pragma pop /* 800C70F8-800C72D4 0C1A38 01DC+00 3/3 0/0 0/0 .text procSmallJumpInit__9daAlink_cFi */ #pragma push @@ -905,53 +1320,97 @@ asm int daAlink_c::procSmallJumpInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSmallJump() { +asm int daAlink_c::procSmallJump() { nofralloc #include "asm/d/a/d_a_alink/procSmallJump__9daAlink_cFv.s" } #pragma pop /* 800C74D4-800C755C 0C1E14 0088+00 1/1 0/0 0/0 .text procStepMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procStepMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procStepMoveInit__9daAlink_cFv.s" +int daAlink_c::procStepMoveInit() { + commonProcInit(PROC_STEP_MOVE); + setSingleAnimeParam(ANM_S_JUMP_START, &daAlinkHIO_smallJump_c0::m.mStepClimbAnm); + field_0x3478 = lit_5943 * mNormalSpeed; + mNormalSpeed = FLOAT_LABEL(lit_6108); + + mCommonCounter = 0; + field_0x3588 = l_waitBaseAnime; + + return 1; } -#pragma pop /* 800C755C-800C7690 0C1E9C 0134+00 1/0 0/0 0/0 .text procStepMove__9daAlink_cFv */ +#ifdef NONMATCHING +int daAlink_c::procStepMove() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (mCommonCounter == 0) { + field_0x2f99 = 4; + + if (frameCtrl->checkAnmEnd()) { + return checkNextAction(0); + } + + if (frameCtrl->getFrame() > daAlinkHIO_smallJump_c0::m.mStepLandAnm.mCheckFrame) { + mNormalSpeed = field_0x3478; + + if (checkNextAction(1)) { + return 1; + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + } + } else if (frameCtrl->checkAnmEnd()) { + setSingleAnimeParam(ANM_S_JUMP_END, &daAlinkHIO_smallJump_c0::m.mStepLandAnm); + current.pos.set(field_0x34ec.x + cM_ssin(shape_angle.y) * 2.0f, field_0x34ec.y, + field_0x34ec.z + cM_scos(shape_angle.y) * 2.0f); + field_0x2f99 = 80; + mCommonCounter = 1; + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procStepMove() { +asm int daAlink_c::procStepMove() { nofralloc #include "asm/d/a/d_a_alink/procStepMove__9daAlink_cFv.s" } #pragma pop +#endif /* 800C7690-800C76F8 0C1FD0 0068+00 1/0 0/0 0/0 .text procCrouchInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCrouchInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCrouchInit__9daAlink_cFv.s" -} -#pragma pop +int daAlink_c::procCrouchInit() { + if (!commonProcInitNotSameProc(PROC_CROUCH)) { + return 0; + } -/* ############################################################################################## */ -/* 804532EC-804532F0 0018EC 0004+00 1/1 0/0 0/0 .sdata2 @74138 */ -SECTION_SDATA2 static f32 lit_74138 = -80.0f; + setSingleAnimeBaseSpeed(ANM_CROUCH, daAlinkHIO_crouch_c0::m.mCrouchAnmSpeed, + daAlinkHIO_crouch_c0::m.mCrouchInterpolation); + current.angle.y = shape_angle.y; + return 1; +} /* 800C76F8-800C77F4 0C2038 00FC+00 1/0 0/0 0/0 .text procCrouch__9daAlink_cFv */ #pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCrouch() { - nofralloc -#include "asm/d/a/d_a_alink/procCrouch__9daAlink_cFv.s" +#pragma optimization_level 2 +int daAlink_c::procCrouch() { + cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), daAlinkHIO_move_c0::m.mDeceleration); + + if (checkAttentionState()) { + setFaceBasicBck(0xE8); + } else { + setFaceBasicBck(0); + } + + if (mDemo.getDemoMode() != 0x29 && + (mSinkShapeOffset <= -80.0f || (i_checkAttentionLock() && checkGuardAccept()))) { + checkNextActionFromCrouch(0); + } + + return 1; } #pragma pop @@ -977,15 +1436,15 @@ static u8 lit_4420[12]; /* 8042561C-80425628 05233C 000C+00 37/39 0/0 0/0 .bss l_wolfBaseAnime */ static Vec l_wolfBaseAnime; -bool daMidna_c::checkMidnaRealBody() { +BOOL daMidna_c::checkMidnaRealBody() { return dKy_darkworld_check() == 1 || dComIfGs_isTransformLV(3); } /* 800C77F4-800C7C64 0C2134 0470+00 4/2 0/0 0/0 .text procCoMetamorphoseInit__9daAlink_cFv */ -// 1 missing instruction, lots of regalloc. maybe related +// small regalloc #ifdef NONMATCHING int daAlink_c::procCoMetamorphoseInit() { - int svar8 = 0; + int var_r29 = 0; if (i_dComIfGp_getEvent().i_isOrderOK()) { if (!dComIfGp_event_compulsory(this, NULL, 0xFFFF)) { @@ -993,14 +1452,14 @@ int daAlink_c::procCoMetamorphoseInit() { } mDemo.i_setSpecialDemoType(); mDamageTimer = 0; - svar8 = 1; + var_r29 = 1; } - if (!commonProcInitNotSameProc(METAMORPHOSE)) { + if (!commonProcInitNotSameProc(PROC_METAMORPHOSE)) { return 1; } - field_0x3198 = svar8; + field_0x3198 = var_r29; field_0x3008 = 0; field_0x300e = 0; field_0x3010 = 0; @@ -1012,8 +1471,9 @@ int daAlink_c::procCoMetamorphoseInit() { field_0x300a = 1; mSpeed.y = 0.0f; mNormalSpeed = 0.0f; + if (i_checkWolf()) { - mCommonCounter = mCollisionRot.x; + mCommonCounter = shape_angle.x; } } else { deleteEquipItem(FALSE, TRUE); @@ -1029,10 +1489,11 @@ int daAlink_c::procCoMetamorphoseInit() { field_0x3588 = l_wolfBaseAnime; field_0x347c = 0.5f; field_0x3480 = daAlinkHIO_basic_c0::m.mWolfLinkTransformSpeed; - mCommonCounter = mCollisionRot.x; + mCommonCounter = shape_angle.x; daMidna_c* midna = getMidnaActor(); - if (i_checkMidnaRide() && midna->checkMidnaRealBody() && midna->checkDemoTypeNone()) { + if (i_checkMidnaRide() && daMidna_c::checkMidnaRealBody() && + midna->checkDemoTypeNone()) { midna->changeOriginalDemo(); midna->changeDemoMode(15); } @@ -1041,46 +1502,46 @@ int daAlink_c::procCoMetamorphoseInit() { if (mDemo.getDemoMode() == 0x39 && mDemo.getParam1() == 1) { voiceStart(Z2SE_AL_V_TRANSFORM); } + setSingleAnimeBase(ANM_TRANSFORM_TO_WOLF); setMetamorphoseModel(1); field_0x3588 = l_waitBaseAnime; field_0x3480 = daAlinkHIO_basic_c0::m.mLinkWolfTransformSpeed; - cXyz pos(current.pos.x + (cM_ssin(mCollisionRot.y) * 100.0f), - current.pos.y + 300.0f, - current.pos.z + (cM_scos(mCollisionRot.y) * 100.0f)); + cXyz pos(current.pos.x + (cM_ssin(shape_angle.y) * 100.0f), current.pos.y + 300.0f, + current.pos.z + (cM_scos(shape_angle.y) * 100.0f)); mLinkGndChk.SetPos(&pos); f32 gnd_cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk); if (gnd_cross != -1000000000.0f) { - pos.y = -1000000000.0f; - cXyz tmp_4c = current.pos; - cXyz tmp_58 = pos; - BOOL check = false; + pos.y = gnd_cross; + + cXyz sp14 = current.pos; + cXyz sp8 = pos; + + BOOL var_r28 = false; for (int i = 0; i < 4; i++) { if (i == 3) { - tmp_4c.y = gnd_cross + 5.0f; + sp14.y = gnd_cross + 5.0f; } else { - tmp_4c.y = current.pos.y + field_0x18B0[i].GetWallH(); + sp14.y = current.pos.y + field_0x18B0[i].GetWallH(); } - tmp_58.y = tmp_4c.y; + sp8.y = sp14.y; - if (commonLineCheck(&tmp_4c, &tmp_58) && dBgS_CheckBWallPoly(mLinkLinChk)) { - if (dComIfG_Bgsp().GetWallCode(mLinkLinChk) != 7) { - check = true; - break; - } + if (commonLineCheck(&sp14, &sp8) && dBgS_CheckBWallPoly(mLinkLinChk) && + dComIfG_Bgsp().GetWallCode(mLinkLinChk) != 7) { + var_r28 = true; + break; } } - if (check) { + if (var_r28) { mCommonCounter = field_0x2ff0; } else { pos -= current.pos; - pos.atan2sY_XZ(); - mCommonCounter = svar8; + mCommonCounter = pos.atan2sY_XZ(); - if (cM_deg2s(70.0f) < abs(mCommonCounter)) { + if (abs(mCommonCounter) > cM_deg2s(70.0f)) { mCommonCounter = field_0x2ff0; } } @@ -1154,69 +1615,107 @@ SECTION_SDATA2 static f32 lit_74395 = 1.0f / 36.0f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoMetamorphose() { +asm int daAlink_c::procCoMetamorphose() { nofralloc #include "asm/d/a/d_a_alink/procCoMetamorphose__9daAlink_cFv.s" } #pragma pop /* 800C82E8-800C83A0 0C2C28 00B8+00 2/0 0/0 0/0 .text procCoMetamorphoseOnlyInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoMetamorphoseOnlyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoMetamorphoseOnlyInit__9daAlink_cFv.s" +int daAlink_c::procCoMetamorphoseOnlyInit() { + if (!commonProcInitNotSameProc(PROC_METAMORPHOSE_ONLY)) { + return 1; + } + + deleteEquipItem(0, 1); + if ((i_checkWolf() && mDemo.getDemoMode() == 0x46) || + (!i_checkWolf() && mDemo.getDemoMode() == 0x47)) { + mCommonCounter = 1; + field_0x300e = 1; + } else { + mCommonCounter = 0; + field_0x300e = 0; + } + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + mNormalSpeed = tmp_0; + mSpeed.y = tmp_0; + setSpecialGravity(tmp_0, mMaxFallSpeed, 0); + + return 1; } -#pragma pop /* 800C83A0-800C8460 0C2CE0 00C0+00 1/0 0/0 0/0 .text procCoMetamorphoseOnly__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoMetamorphoseOnly() { - nofralloc -#include "asm/d/a/d_a_alink/procCoMetamorphoseOnly__9daAlink_cFv.s" +int daAlink_c::procCoMetamorphoseOnly() { + if (mCommonCounter == 0) { + mClothesChangeWaitTimer = 4; + mCommonCounter = 1; + } else if (mClothesChangeWaitTimer == 0) { + if (field_0x300e == 0) { + field_0x300e = 1; + + if (i_checkWolf()) { + setSingleAnimeWolfBaseSpeed(WANM_WAIT, daAlinkHIO_wlMoveNoP_c0::m.field_0x14, + lit_6041); + } else { + setSingleAnimeBaseSpeed(ANM_WAIT, daAlinkHIO_move_c0::m.mWaitAnmSpeed, lit_6041); + } + } + + dComIfGp_evmng_cutEnd(field_0x3184); + } + + return 1; } -#pragma pop /* 800C8460-800C84D0 0C2DA0 0070+00 2/2 0/0 0/0 .text procFloorDownReboundInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::procFloorDownReboundInit() { - nofralloc -#include "asm/d/a/d_a_alink/procFloorDownReboundInit__9daAlink_cFv.s" +int daAlink_c::procFloorDownReboundInit() { + commonProcInit(PROC_FLOOR_DOWN_REBOUND); + setSingleAnime(ANM_JUMP_LAND, lit_9652, daAlinkHIO_autoJump_c0::m.mLandAnm.mStartFrame, + daAlinkHIO_autoJump_c0::m.mLandAnm.mEndFrame, lit_7625); + mNormalSpeed = FLOAT_LABEL(lit_6108); + current.angle.y = shape_angle.y; + field_0x2f98 = 4; + + return 1; } -#pragma pop /* 800C84D0-800C854C 0C2E10 007C+00 1/0 0/0 0/0 .text procFloorDownRebound__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFloorDownRebound() { - nofralloc -#include "asm/d/a/d_a_alink/procFloorDownRebound__9daAlink_cFv.s" +int daAlink_c::procFloorDownRebound() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (frameCtrl->checkAnmEnd()) { + checkNextAction(0); + } else if (frameCtrl->getFrame() > daAlinkHIO_autoJump_c0::m.mLandAnm.mCheckFrame) { + checkNextAction(1); + } + + return 1; } -#pragma pop /* 800C854C-800C85D8 0C2E8C 008C+00 1/1 0/0 0/0 .text * procGoronRideWaitInit__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGoronRideWaitInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procGoronRideWaitInit__9daAlink_cFP10fopAc_ac_c.s" +int daAlink_c::procGoronRideWaitInit(fopAc_ac_c* param_0) { + if (!commonProcInitNotSameProc(PROC_GORON_RIDE_WAIT)) { + return 0; + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + current.pos.x = param_0->current.pos.x; + current.pos.z = param_0->current.pos.z; + field_0x2f99 = 0x50; + current.angle.y = shape_angle.y; + setBlendMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + + return 1; } -#pragma pop /* 800C85D8-800C8700 0C2F18 0128+00 1/0 0/0 0/0 .text procGoronRideWait__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGoronRideWait() { +asm int daAlink_c::procGoronRideWait() { nofralloc #include "asm/d/a/d_a_alink/procGoronRideWait__9daAlink_cFv.s" } @@ -1236,7 +1735,9 @@ COMPILER_STRIP_GATE(0x8039207C, &lit_74748); #pragma push #pragma force_active on SECTION_RODATA static Vec const localBoomCatchPos = { - 18.7f, 146.3f, 69.2f, + 18.7f, + 146.3f, + 69.2f, }; COMPILER_STRIP_GATE(0x80392088, &localBoomCatchPos); #pragma pop @@ -1271,12 +1772,12 @@ int daAlink_c::execute() { } if (checkHorseRide() && checkBoarSingleBattle() && dComIfGp_getHorseActor() != NULL) { - mCollisionRot.y = dComIfGp_getHorseActor()->mCollisionRot.y; - current.angle.y = mCollisionRot.y; + shape_angle.y = dComIfGp_getHorseActor()->shape_angle.y; + current.angle.y = shape_angle.y; } else if (checkMagneBootsOn()) { - mCollisionRot.y = field_0x3118; + shape_angle.y = field_0x3118; } else if (checkModeFlg(MODE_VINE_CLIMB) || checkCargoCarry()) { - mCollisionRot.y = field_0x3108; + shape_angle.y = field_0x3108; } if (checkNoResetFlg2(FLG2_UNK_1) && mEquipItem != KANTERA && checkItemSetButton(KANTERA) == 2) { @@ -1302,15 +1803,17 @@ int daAlink_c::execute() { field_0x3510 = current.pos; if (checkMagneBootsOn()) { - if (checkNoResetFlg0(FLG0_UNK_2000) && dComIfG_Bgsp().ChkPolySafe(mMagneLineChk) && dComIfG_Bgsp().ChkMoveBG(mMagneLineChk)) { - s16 shape_angle_y = mCollisionRot.y; + if (checkNoResetFlg0(FLG0_UNK_2000) && dComIfG_Bgsp().ChkPolySafe(mMagneLineChk) && + dComIfG_Bgsp().ChkMoveBG(mMagneLineChk)) { + s16 shape_angle_y = shape_angle.y; s16 angle_y = current.angle.y; f32 pos_y = current.pos.y; - dComIfG_Bgsp().MoveBgCrrPos(mMagneLineChk, true, ¤t.pos, ¤t.angle, &mCollisionRot, false, false); - + dComIfG_Bgsp().MoveBgCrrPos(mMagneLineChk, true, ¤t.pos, ¤t.angle, + &shape_angle, false, false); + if (field_0x3114 > 0x6000 || field_0x3114 == -0x8000) { - mCollisionRot.y = shape_angle_y - (s16)(mCollisionRot.y - shape_angle_y); + shape_angle.y = shape_angle_y - (s16)(shape_angle.y - shape_angle_y); current.angle.y = angle_y - (s16)(current.angle.y - angle_y); } @@ -1318,13 +1821,14 @@ int daAlink_c::execute() { if (getMoveBGActorName(mMagneLineChk, 0) == PROC_Obj_MagneArm) { field_0x34c8.y += current.pos.y - pos_y; - } else { + } else { field_0x34c8.y += (current.pos.y - pos_y) * 0.1f; } } - } else if (mProcID != PROC_HOOKSHOT_FLY && !checkModeFlg(MODE_VINE_CLIMB | MODE_UNK_800) && mProcID != PROC_TOOL_DEMO && - mLinkAcch.GetGroundH() != -1000000000.0f && - dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) && dComIfG_Bgsp().ChkMoveBG(mLinkAcch.m_gnd)) { + } else if (mProcID != PROC_HOOKSHOT_FLY && !checkModeFlg(MODE_VINE_CLIMB | MODE_UNK_800) && + mProcID != PROC_TOOL_DEMO && mLinkAcch.GetGroundH() != -1000000000.0f && + dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) && + dComIfG_Bgsp().ChkMoveBG(mLinkAcch.m_gnd)) { bool uvar23; if (mProcID == PROC_SPINNER_READY) { uvar23 = true; @@ -1333,14 +1837,15 @@ int daAlink_c::execute() { } f32 pos_y = current.pos.y; - dComIfG_Bgsp().MoveBgCrrPos(mLinkAcch.m_gnd, uvar23, ¤t.pos, ¤t.angle, &mCollisionRot, false, false); + dComIfG_Bgsp().MoveBgCrrPos(mLinkAcch.m_gnd, uvar23, ¤t.pos, ¤t.angle, + &shape_angle, false, false); dComIfG_Bgsp().MoveBgCrrPos(mLinkAcch.m_gnd, uvar23, &next.pos, NULL, NULL, false, false); field_0x34c8.y += (current.pos.y - pos_y) * 0.1f; } field_0x3798 = next.pos; - field_0x2fe6 = mCollisionRot.y; - field_0x307c = mStickAngle; + field_0x2fe6 = shape_angle.y; + mPrevStickAngle = mStickAngle; field_0x33a4 = field_0x33ac; if (checkResetFlg0(RFLG0_UNK_8000000) && !checkCutDashAnime()) { @@ -1349,7 +1854,7 @@ int daAlink_c::execute() { mResetFlg0 = 0; mResetFlg1 = 0; - + daAlink_matAnm_c::decMorfFrame(); field_0x2180[0]->offSetFlg(); field_0x2180[1]->offSetFlg(); @@ -1493,17 +1998,18 @@ int daAlink_c::execute() { if (field_0x30d0 != 0) { field_0x30d0--; } else { - offNoResetFlg1(FLG1_UNK_400000); + offNoResetFlg1(FLG1_DASH_MODE); } if (field_0x2fd2 != 0) { field_0x2fd2--; } - if (field_0x2fd3 != 0 && mProcID != PROC_BOTTLE_DRINK && mProcID != PROC_CANOE_BOTTLE_DRINK && mProcID != PROC_HORSE_BOTTLE_DRINK) { + if (field_0x2fd3 != 0 && mProcID != PROC_BOTTLE_DRINK && mProcID != PROC_CANOE_BOTTLE_DRINK && + mProcID != PROC_HORSE_BOTTLE_DRINK) { field_0x2fd3--; } - + if (field_0x2fd4 != 0 && mProcID != PROC_GUARD_SLIP) { field_0x2fd4--; @@ -1524,22 +2030,26 @@ int daAlink_c::execute() { if (event_name != NULL) { if (!strcmp(event_name, "kiko_yami") || !strcmp(event_name, "fire_insect") || - (checkStageName("F_SP108") && (!strcmp(event_name, "MapToolCamera19") || !strcmp(event_name, "yami_mog"))) || - (checkStageName("R_SP109") && (!strcmp(event_name, "MapToolCamera1") || !strcmp(event_name, "MapToolCamera2") || !strcmp(event_name, "MapToolCamera19") || !strcmp(event_name, "fire_insect"))) || - (checkStageName("F_SP115") && !strcmp(event_name, "MapToolCamera23"))) { + (checkStageName("F_SP108") && + (!strcmp(event_name, "MapToolCamera19") || !strcmp(event_name, "yami_mog"))) || + (checkStageName("R_SP109") && + (!strcmp(event_name, "MapToolCamera1") || !strcmp(event_name, "MapToolCamera2") || + !strcmp(event_name, "MapToolCamera19") || !strcmp(event_name, "fire_insect"))) || + (checkStageName("F_SP115") && !strcmp(event_name, "MapToolCamera23"))) { mWolfEyeUp = daAlinkHIO_wolf_c0::m.mSensesLingerTime + 1; } } - + if (checkEndResetFlg1(ERFLG1_UNK_200) || (checkDungeon() && mEvtInfo.checkCommandDoor()) || - mProcID == PROC_WOLF_GET_SMELL || mProcID == PROC_WOLF_DIG || mProcID == PROC_WOLF_DIG_THROUGH || - checkNoResetFlg0(FLG0_UNK_4000) || dComIfGp_checkPlayerStatus1(0, 0x1000000) || + mProcID == PROC_WOLF_GET_SMELL || mProcID == PROC_WOLF_DIG || + mProcID == PROC_WOLF_DIG_THROUGH || checkNoResetFlg0(FLG0_UNK_4000) || + dComIfGp_checkPlayerStatus1(0, 0x1000000) || (checkEventRun() && partner != NULL && (partner->mAttentionInfo.mFlags & 0x400000)) || !strcmp(dComIfGp_getEventManager().getRunEventName(), l_defaultGetEventName)) { mWolfEyeUp = daAlinkHIO_wolf_c0::m.mSensesLingerTime; } else if (mTargetedActor != NULL || dComIfGp_checkPlayerStatus0(0, 0x2000)) { mWolfEyeUp = daAlinkHIO_wolf_c0::m.mSensesLingerTime - 1; - } else if (!dComIfGp_getEvent().isOrderOK() && mProcID != PROC_GET_ITEM && + } else if (!dComIfGp_getEvent().isOrderOK() && mProcID != PROC_GET_ITEM && mWolfEyeUp <= daAlinkHIO_wolf_c0::m.mSensesLingerTime) { offWolfEyeUp(); } else { @@ -1556,7 +2066,10 @@ int daAlink_c::execute() { } fopAc_ac_c* item_actor = mGrabItemAcKeep.getActor(); - if (item_actor != NULL && (!fopAcM_checkCarryNow(item_actor) || (checkNoResetFlg0(FLG0_UNDERWATER) && (checkGrabRooster() || fopAcM_GetName(item_actor) == PROC_E_NEST || checkGrabCarryActor())))) { + if (item_actor != NULL && (!fopAcM_checkCarryNow(item_actor) || + (checkNoResetFlg0(FLG0_UNDERWATER) && + (checkGrabRooster() || fopAcM_GetName(item_actor) == PROC_E_NEST || + checkGrabCarryActor())))) { freeGrabItem(); } @@ -1580,7 +2093,8 @@ int daAlink_c::execute() { checkWarpStart(); if (!checkSpecialDemoMode() && mClothesChangeWaitTimer == 0) { - if (!checkDemoAction() && !checkDeadAction(0) && !checkNoResetFlg0(FLG0_UNK_100000) && !checkAutoJumpAction()) { + if (!checkDemoAction() && !checkDeadAction(0) && !checkNoResetFlg0(FLG0_UNK_100000) && + !checkAutoJumpAction()) { checkSwimAction(0); } @@ -1607,14 +2121,17 @@ int daAlink_c::execute() { if (checkCutFastReady()) { if (checkNoUpperAnime()) { - setUpperAnime(0x255, UPPER_2, daAlinkHIO_cut_c0::m.mEquipAnm.mRate, 12.0f, daAlinkHIO_cut_c0::m.mEquipAnm.mEndF, daAlinkHIO_cut_c0::m.mEquipAnm.mInterpolation); + setUpperAnime(0x255, UPPER_2, daAlinkHIO_cut_c0::m.mEquipAnm.mSpeed, 12.0f, + daAlinkHIO_cut_c0::m.mEquipAnm.mEndFrame, + daAlinkHIO_cut_c0::m.mEquipAnm.mInterpolation); onNoResetFlg0(FLG0_UNK_1000000); } } else if (checkNoResetFlg0(FLG0_UNK_1000000)) { resetUpperAnime(UPPER_2, 5.0f); } - if (mEquipItem == KANTERA && checkNoUpperAnime() && !checkKandelaarEquipAnime() && (checkModeFlg(MODE_UNK_1000) || mProcID == PROC_CROUCH)) { + if (mEquipItem == KANTERA && checkNoUpperAnime() && !checkKandelaarEquipAnime() && + (checkModeFlg(MODE_UNK_1000) || mProcID == PROC_CROUCH)) { if (checkReinRide()) { setUpperAnimeBase(0x264); } else { @@ -1633,7 +2150,7 @@ int daAlink_c::execute() { } playFaceTextureAnime(); - + cXyz old_pos = current.pos; posMove(); @@ -1661,7 +2178,8 @@ int daAlink_c::execute() { setWaterY(); autoGroundHit(); - if (checkNoResetFlg0(FLG0_UNDERWATER) || (checkPossibleWaterInMode() && !checkNoResetFlg0(FLG0_UNK_100))) { + if (checkNoResetFlg0(FLG0_UNDERWATER) || + (checkPossibleWaterInMode() && !checkNoResetFlg0(FLG0_UNK_100))) { f32 var_f31; if (mProcID == PROC_HOOKSHOT_FLY) { var_f31 = current.pos.y - (field_0x598 * 0.5f); @@ -1671,7 +2189,8 @@ int daAlink_c::execute() { var_f31 = current.pos.y; } - if (!checkNoResetFlg0(FLG0_UNK_80) || mWaterY - var_f31 <= daAlinkHIO_swim_c0::m.mInitHeight) { + if (!checkNoResetFlg0(FLG0_UNK_80) || + mWaterY - var_f31 <= daAlinkHIO_swim_c0::m.mInitHeight) { swimOutAfter(0); } } @@ -1680,7 +2199,7 @@ int daAlink_c::execute() { J3DTransformInfo ti; field_0x1f20->getAnm(0)->getTransform(0, &ti); mDoMtx_stack_c::transS(old_pos); - mDoMtx_stack_c::YrotM(mCollisionRot.y); + mDoMtx_stack_c::YrotM(shape_angle.y); Vec tmp; mDoMtx_stack_c::multVec(&tmp, ¤t.pos); @@ -1691,7 +2210,10 @@ int daAlink_c::execute() { current.pos.y = mLinkAcch.GetGroundH(); } } - } else if (mProcID == PROC_HOOKSHOT_FLY || mProcID == PROC_MAGNE_BOOTS_FLY || (checkModeFlg(MODE_ROPE_WALK | MODE_VINE_CLIMB | MODE_UNK_800 | MODE_RIDING) && mProcID != PROC_HORSE_GETOFF && mProcID != PROC_WOLF_CHAIN_READY && !checkBoardRide())) { + } else if (mProcID == PROC_HOOKSHOT_FLY || mProcID == PROC_MAGNE_BOOTS_FLY || + (checkModeFlg(MODE_ROPE_WALK | MODE_VINE_CLIMB | MODE_UNK_800 | MODE_RIDING) && + mProcID != PROC_HORSE_GETOFF && mProcID != PROC_WOLF_CHAIN_READY && + !checkBoardRide())) { current.pos = pos; } else if (checkModeFlg(MODE_UNK_4000)) { if (mProcID == PROC_DOOR_OPEN || mProcID == PROC_HANG_LEVER_DOWN) { @@ -1710,7 +2232,9 @@ int daAlink_c::execute() { if (mLinkAcch.GetGroundH() != -1000000000.0f) { setRoomInfo(); - if (!checkModeFlg(MODE_PLAYER_FLY) && !checkMagneBootsOn() && mProcID != PROC_TOOL_DEMO && mProcID != PROC_GANON_FINISH && mProcID != PROC_DUNGEON_WARP && (field_0x2f8c == 1 || field_0x2f8c == 3)) { + if (!checkModeFlg(MODE_PLAYER_FLY) && !checkMagneBootsOn() && mProcID != PROC_TOOL_DEMO && + mProcID != PROC_GANON_FINISH && mProcID != PROC_DUNGEON_WARP && + (field_0x2f8c == 1 || field_0x2f8c == 3)) { setStepsOffset(); } else { field_0x2b9c = 0.0f; @@ -1732,7 +2256,8 @@ int daAlink_c::execute() { dComIfG_Bgsp().MoveBgTransPos(mLinkAcch.m_gnd, true, &field_0x34ec, NULL, NULL); } - if (checkNoResetFlg0(FLG0_UNK_80) && !checkNoResetFlg0(FLG0_UNDERWATER) && mWaterY >= mLinkAcch.GetGroundH()) { + if (checkNoResetFlg0(FLG0_UNK_80) && !checkNoResetFlg0(FLG0_UNDERWATER) && + mWaterY >= mLinkAcch.GetGroundH()) { mPolySound = dKy_pol_sound_get(&mLinkAcch.m_wtr); } else if (checkEndResetFlg0(ERFLG0_UNK_200000)) { mPolySound = 11; @@ -1740,7 +2265,7 @@ int daAlink_c::execute() { mPolySound = dKy_pol_sound_get(&mLinkAcch.m_gnd); } - field_0x2ff0 = getGroundAngle(&mLinkAcch.m_gnd, mCollisionRot.y); + field_0x2ff0 = getGroundAngle(&mLinkAcch.m_gnd, shape_angle.y); } else { if (mProcID == PROC_TOOL_DEMO || mProcID == PROC_GANON_FINISH) { if (checkNoResetFlg0(FLG0_UNK_80) && mWaterY >= mLinkAcch.GetGroundH()) { @@ -1811,7 +2336,8 @@ int daAlink_c::execute() { } } - if (checkModeFlg(MODE_VINE_CLIMB) && mCommonCounter != 0 && dComIfG_Bgsp().ChkPolySafe(mPolyInfo1)) { + if (checkModeFlg(MODE_VINE_CLIMB) && mCommonCounter != 0 && + dComIfG_Bgsp().ChkPolySafe(mPolyInfo1)) { mZ2Link.framework(dKy_pol_sound_get(&mPolyInfo1), mVoiceReverbIntensity); } else { mZ2Link.framework(mPolySound, mVoiceReverbIntensity); @@ -1864,7 +2390,7 @@ int daAlink_c::execute() { if (field_0x2fcb != 0) { if (checkWoodShieldEquip() && mWaterY < mShieldModel->getBaseTRMtx()[1][3]) { field_0x2fcb--; - + if (field_0x2fcb == 0) { dMeter2Info_setShield(NO_ITEM, true); stickArrowIncrement(1); @@ -1874,7 +2400,8 @@ int daAlink_c::execute() { dMeter2Info_setFloatingMessage(2047, 90, false); stage_stag_info_class* pstag = dComIfGp_getStage()->getStagInfo(); - if (dStage_stagInfo_GetSaveTbl(pstag) == 0x11 && !dComIfGs_isItemFirstBit(HYLIA_SHIELD)) { + if (dStage_stagInfo_GetSaveTbl(pstag) == 0x11 && + !dComIfGs_isItemFirstBit(HYLIA_SHIELD)) { fopAcM_onSwitch(this, 0x6F); } seStartOnlyReverb(Z2SE_AL_WOOD_SHIELD_BURN); @@ -1892,12 +2419,13 @@ int daAlink_c::execute() { daMidna_c* pmidna = getMidnaActor(); if (mClothesChangeWaitTimer == 0) { - if ((pmidna->checkMidnaTired() || pmidna->checkForceTiredColor()) && !pmidna->checkForceNormalColor()) { + if ((pmidna->checkMidnaTired() || pmidna->checkForceTiredColor()) && + !pmidna->checkForceNormalColor()) { field_0x79c->getModelData()->entryTevRegAnimator(field_0x7ac); mpWlMidnaHatModel->getModelData()->entryTevRegAnimator(field_0x7b0); field_0x7a4->getModelData()->entryTevRegAnimator(field_0x7b4); mpWlMidnaHairModel->getModelData()->entryTevRegAnimator(field_0x7b8); - } else { + } else { field_0x79c->getModelData()->removeTevRegAnimator(field_0x7ac); mpWlMidnaHatModel->getModelData()->removeTevRegAnimator(field_0x7b0); field_0x7a4->getModelData()->removeTevRegAnimator(field_0x7b4); @@ -1952,20 +2480,22 @@ int daAlink_c::execute() { mSight.mLockCursor.update(); setGrabItemPos(); - + checkRoofRestart(); mExitID = 0x3F; mpScnChg = NULL; cMtx_multVec(mpLinkModel->getAnmMtx(0), &localBoomCatchPos, &field_0x3534); - + if (checkResetFlg0(RFLG0_UNK_10)) { mZ2Link.setResumeAttack(true); } else { mZ2Link.setResumeAttack(false); } - if (!checkEventRun() && checkNoResetFlg0(FLG0_UNK_80) && (mWaterY > current.pos.y + 40.0f || checkModeFlg(MODE_SWIMMING)) && getMoveBGActorName(mLinkAcch.m_wtr, 1) == PROC_Obj_Onsen) { + if (!checkEventRun() && checkNoResetFlg0(FLG0_UNK_80) && + (mWaterY > current.pos.y + 40.0f || checkModeFlg(MODE_SWIMMING)) && + getMoveBGActorName(mLinkAcch.m_wtr, 1) == PROC_Obj_Onsen) { if (mHotspringRecoverTimer != 0) { mHotspringRecoverTimer--; } else { @@ -1976,7 +2506,8 @@ int daAlink_c::execute() { mHotspringRecoverTimer = daAlinkHIO_basic_c0::m.mHotspringRecoverTime; } - if ((checkAttentionLock() || !checkUpperReadyThrowAnime()) && mProcID != PROC_HOOKSHOT_WALL_SHOOT && mProcID != PROC_HOOKSHOT_ROOF_SHOOT) { + if ((checkAttentionLock() || !checkUpperReadyThrowAnime()) && + mProcID != PROC_HOOKSHOT_WALL_SHOOT && mProcID != PROC_HOOKSHOT_ROOF_SHOOT) { mFastShotTime = 0; } @@ -1995,8 +2526,8 @@ int daAlink_c::execute() { if (cBgW_CheckBGround(var_f31_2) && !checkModeFlg(MODE_PLAYER_FLY)) { mEvtInfo.onCondition(0x5D); } else if (checkModeFlg(MODE_SWIMMING) || mProcID == PROC_WOLF_ROPE_MOVE || - ((checkReinRide() || checkCanoeRide() || checkSpinnerRide()) && - !checkNoResetFlg3(FLG3_UNK_80000) && !checkModeFlg(MODE_JUMP))) { + ((checkReinRide() || checkCanoeRide() || checkSpinnerRide()) && + !checkNoResetFlg3(FLG3_UNK_80000) && !checkModeFlg(MODE_JUMP))) { mEvtInfo.onCondition(1); if (checkReinRide() || checkCanoeRide()) { mEvtInfo.onCondition(8); @@ -2038,7 +2569,8 @@ int daAlink_c::execute() { if (!checkWolf()) { for (int i = 0; i < 2; i++) { u8 tmp = (i + 1) & 1; - if (dComIfGp_getSelectItem(i) == EMPTY_BOTTLE && (field_0x2fae & (1 << i)) && dComIfGp_getSelectItem(tmp) == EMPTY_BOTTLE) { + if (dComIfGp_getSelectItem(i) == EMPTY_BOTTLE && (field_0x2fae & (1 << i)) && + dComIfGp_getSelectItem(tmp) == EMPTY_BOTTLE) { field_0x2fae |= (1 << tmp); } } @@ -2095,7 +2627,10 @@ int daAlink_c::execute() { } else if (dComIfGp_getDoStatus() == 0x99) { setDoStatusEmphasys(0x15); } else if (dComIfGp_getDoStatus() == 0x91) { - if (checkWolf() || (field_0x27f4 != NULL && (field_0x27f4->mSpeedF > 0.1f || (checkGoatCatchActor(field_0x27f4) && fopAcM_GetName(field_0x27f4) != PROC_COW)))) { + if (checkWolf() || + (field_0x27f4 != NULL && + (field_0x27f4->mSpeedF > 0.1f || (checkGoatCatchActor(field_0x27f4) && + fopAcM_GetName(field_0x27f4) != PROC_COW)))) { setDoStatusEmphasys(0x15); } else { setDoStatus(0); @@ -2106,9 +2641,12 @@ int daAlink_c::execute() { } else { setDoStatus(0); } - } else if (dComIfGp_getDoStatus() == 0x19 && dComIfGp_getHorseActor() != NULL && dComIfGp_getHorseActor()->getZeldaActor() != NULL) { + } else if (dComIfGp_getDoStatus() == 0x19 && dComIfGp_getHorseActor() != NULL && + dComIfGp_getHorseActor()->getZeldaActor() != NULL) { setDoStatus(0x19); - } else if (dComIfGp_getDoStatus() == 5 && field_0x27f4 != NULL && (fopAcM_GetName(field_0x27f4) == PROC_Obj_WindStone || fopAcM_GetName(field_0x27f4) == PROC_Obj_SmWStone)) { + } else if (dComIfGp_getDoStatus() == 5 && field_0x27f4 != NULL && + (fopAcM_GetName(field_0x27f4) == PROC_Obj_WindStone || + fopAcM_GetName(field_0x27f4) == PROC_Obj_SmWStone)) { setDoStatusEmphasys(0x3B); } else if (dComIfGp_getDoStatus() == 0x14) { if (checkEndResetFlg1(ERFLG1_UNK_4000000)) { @@ -2137,14 +2675,15 @@ int daAlink_c::execute() { } mDoAud_setLinkHp(dComIfGs_getLife(), dComIfGs_getMaxLifeGauge()); - + if (dComIfGp_att_getCatghTarget() != NULL && !checkWolf()) { - if (checkRideOn() && checkCastleTownUseItem(EMPTY_BOTTLE) ) { + if (checkRideOn() && checkCastleTownUseItem(EMPTY_BOTTLE)) { dComIfGp_setBottleStatus(0x6C, 0); } } - if (checkEndResetFlg2(ERFLG2_UNK_20) && dComIfGp_checkPlayerStatus0(0, 0x200000) && (field_0x310e != field_0x310a || field_0x3110 != field_0x310c)) { + if (checkEndResetFlg2(ERFLG2_UNK_20) && dComIfGp_checkPlayerStatus0(0, 0x200000) && + (field_0x310e != field_0x310a || field_0x3110 != field_0x310c)) { mDoAud_seStartLevel(Z2SE_AL_HAWK_EYE_PAN, NULL, 0, 0); } @@ -2161,23 +2700,23 @@ int daAlink_c::execute() { mEndResetFlg2 = 0; field_0x3540 = next.pos; - field_0x3108 = mCollisionRot.y; + field_0x3108 = shape_angle.y; if (checkHorseRide() && checkBoarSingleBattle()) { - if (abs(mCollisionRot.y) < 0x4000) { - mCollisionRot.y = 0; + if (abs(shape_angle.y) < 0x4000) { + shape_angle.y = 0; } else { - mCollisionRot.y = -0x8000; + shape_angle.y = -0x8000; } } else if (checkMagneBootsOn()) { - field_0x3118 = mCollisionRot.y; - mCollisionRot.y = getMagneBootsLocalAngleY(mCollisionRot.y, 0); + field_0x3118 = shape_angle.y; + shape_angle.y = getMagneBootsLocalAngleY(shape_angle.y, 0); } else if (checkModeFlg(MODE_VINE_CLIMB)) { - field_0x3108 = mCollisionRot.y; - mCollisionRot.y += field_0x308c; + field_0x3108 = shape_angle.y; + shape_angle.y += field_0x308c; } else if (checkCargoCarry() && mCargoCarryAcKeep.getActor() != NULL) { - field_0x3108 = mCollisionRot.y; - mCollisionRot.y = mCargoCarryAcKeep.getActor()->mCollisionRot.y; + field_0x3108 = shape_angle.y; + shape_angle.y = mCargoCarryAcKeep.getActor()->shape_angle.y; } return 1; @@ -2194,8 +2733,8 @@ asm int daAlink_c::execute() { #endif /* 800CAFA8-800CAFC8 0C58E8 0020+00 1/0 0/0 0/0 .text daAlink_Execute__FP9daAlink_c */ -static void daAlink_Execute(daAlink_c* pLinkPtr) { - pLinkPtr->execute(); +static int daAlink_Execute(daAlink_c* i_this) { + return i_this->execute(); } /* 800CAFC8-800CB480 0C5908 04B8+00 2/2 0/0 0/0 .text setDrawHand__9daAlink_cFv */ @@ -2281,42 +2820,83 @@ void daAlink_c::modelCalc(J3DModel* p_model) { } /* 800CC298-800CC2E0 0C6BD8 0048+00 2/2 0/0 0/0 .text basicModelDraw__9daAlink_cFP8J3DModel */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::basicModelDraw(J3DModel* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/basicModelDraw__9daAlink_cFP8J3DModel.s" +void daAlink_c::basicModelDraw(J3DModel* i_model) { + g_env_light.setLightTevColorType_MAJI(i_model, &mTevStr); + mDoExt_modelEntryDL(i_model); } -#pragma pop /* 800CC2E0-800CC364 0C6C20 0084+00 1/1 0/0 0/0 .text modelDraw__9daAlink_cFP8J3DModeli */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::modelDraw(J3DModel* param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/modelDraw__9daAlink_cFP8J3DModeli.s" +void daAlink_c::modelDraw(J3DModel* i_model, int param_1) { + g_env_light.setLightTevColorType_MAJI(i_model, &mTevStr); + + if (param_1 == 0) { + mDoExt_modelEntryDL(i_model); + } else { + i_model->calcMaterial(); + i_model->diff(); + } + + daMirror_c::entry(i_model); } -#pragma pop /* ############################################################################################## */ /* 8045333C-80453344 00193C 0008+00 1/1 0/0 0/0 .sdata2 notColor0$76211 */ -SECTION_SDATA2 static u8 notColor0[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, +SECTION_SDATA2 static GXColorS10 notColor0 = { + 0x0000, + 0x0000, + 0x0000, + 0x00FF, }; /* 800CC364-800CC7DC 0C6CA4 0478+00 2/2 0/0 0/0 .text * setWaterDropColor__9daAlink_cFPC13J3DGXColorS10 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWaterDropColor(J3DGXColorS10 const* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setWaterDropColor__9daAlink_cFPC13J3DGXColorS10.s" +void daAlink_c::setWaterDropColor(J3DGXColorS10 const* i_color) { + J3DGXColorS10* var_r31; + + if (&field_0x32a0[0] == i_color) { + if (i_checkNoResetFlg2(FLG2_UNK_80000) || checkZoraWearAbility() || + checkMagicArmorWearAbility()) { + var_r31 = (J3DGXColorS10*)¬Color0; + i_color = (J3DGXColorS10*)¬Color0; + } else { + var_r31 = (J3DGXColorS10*)&i_color[1]; + } + } else { + var_r31 = (J3DGXColorS10*)i_color; + } + + if (!i_checkNoResetFlg2(FLG2_UNK_80000)) { + if (checkZoraWearAbility()) { + field_0x064C->getMaterialNodePointer(13)->setTevColor(1, i_color); + field_0x064C->getMaterialNodePointer(0)->setTevColor(1, i_color); + field_0x064C->getMaterialNodePointer(1)->setTevColor(1, i_color); + mpLinkHatModel->getModelData()->getMaterialNodePointer(1)->setTevColor(1, i_color); + } else if (checkMagicArmorWearAbility()) { + field_0x064C->getMaterialNodePointer(11)->setTevColor(1, i_color); + field_0x064C->getMaterialNodePointer(10)->setTevColor(1, i_color); + field_0x064C->getMaterialNodePointer(9)->setTevColor(1, i_color); + field_0x064C->getMaterialNodePointer(8)->setTevColor(1, i_color); + field_0x064C->getMaterialNodePointer(6)->setTevColor(1, i_color); + mpLinkHatModel->getModelData()->getMaterialNodePointer(2)->setTevColor(1, i_color); + mpLinkHatModel->getModelData()->getMaterialNodePointer(1)->setTevColor(1, i_color); + } else if (checkCasualWearFlg()) { + field_0x064C->getMaterialNodePointer(7)->setTevColor(1, i_color); + mpLinkHatModel->getModelData()->getMaterialNodePointer(0)->setTevColor(1, i_color); + field_0x064C->getMaterialNodePointer(5)->setTevColor(1, var_r31); + } else { + field_0x064C->getMaterialNodePointer(17)->setTevColor(1, i_color); + field_0x064C->getMaterialNodePointer(9)->setTevColor(1, i_color); + field_0x064C->getMaterialNodePointer(0)->setTevColor(1, i_color); + field_0x064C->getMaterialNodePointer(1)->setTevColor(1, i_color); + field_0x064C->getMaterialNodePointer(2)->setTevColor(1, i_color); + mpLinkHatModel->getModelData()->getMaterialNodePointer(0)->setTevColor(1, i_color); + field_0x064C->getMaterialNodePointer(16)->setTevColor(1, var_r31); + field_0x064C->getMaterialNodePointer(15)->setTevColor(1, var_r31); + field_0x064C->getMaterialNodePointer(14)->setTevColor(1, var_r31); + } + } } -#pragma pop /* 800CC7DC-800CC7FC 0C711C 0020+00 2/2 0/0 0/0 .text initTevCustomColor__9daAlink_cFv */ void daAlink_c::initTevCustomColor() { @@ -2332,21 +2912,16 @@ void daAlink_c::initTevCustomColor() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::draw() { +asm int daAlink_c::draw() { nofralloc #include "asm/d/a/d_a_alink/draw__9daAlink_cFv.s" } #pragma pop /* 800CD78C-800CD7AC 0C80CC 0020+00 1/0 0/0 0/0 .text daAlink_Draw__FP9daAlink_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_Draw(daAlink_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_Draw__FP9daAlink_c.s" +static int daAlink_Draw(daAlink_c* i_this) { + return i_this->draw(); } -#pragma pop /* ############################################################################################## */ /* 803B3580-803B3590 0106A0 0010+00 3/3 0/0 0/0 .data __vt__15daAlink_sight_c */ @@ -2433,21 +3008,42 @@ asm void daAlink_c::checkNoSubjectModeCamera() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::acceptSubjectModeChange() { +asm bool daAlink_c::acceptSubjectModeChange() { nofralloc #include "asm/d/a/d_a_alink/acceptSubjectModeChange__9daAlink_cFv.s" } #pragma pop /* 800CE628-800CE728 0C8F68 0100+00 5/5 0/0 0/0 .text checkSubjectAction__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSubjectAction() { - nofralloc -#include "asm/d/a/d_a_alink/checkSubjectAction__9daAlink_cFv.s" +int daAlink_c::checkSubjectAction() { + if (acceptSubjectModeChange()) { + i_onResetFlg0(RFLG0_UNK_4000000); + + if (dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x1000)) { + if (i_checkModeFlg(0x400)) { + if (checkCanoeRide()) { + return procCanoeSubjectivityInit(); + } else if (checkBoardRide()) { + return procBoardSubjectivityInit(); + } else { + return procHorseSubjectivityInit(); + } + } + + if (i_checkModeFlg(0x20000)) { + return procWolfRopeSubjectivityInit(); + } + + if (i_checkModeFlg(0x40000)) { + return procCoSwimSubjectivityInit(); + } + + return procCoSubjectivityInit(); + } + } + + return 0; } -#pragma pop /* 800CE728-800CE8A0 0C9068 0178+00 1/1 0/0 0/0 .text checkBodyAngleX__9daAlink_cFs */ #pragma push @@ -2463,13 +3059,20 @@ asm void daAlink_c::checkBodyAngleX(s16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::setBodyAngleToCamera() { +asm BOOL daAlink_c::setBodyAngleToCamera() { nofralloc #include "asm/d/a/d_a_alink/setBodyAngleToCamera__9daAlink_cFv.s" } #pragma pop /* 800CEAF4-800CEB58 0C9434 0064+00 9/9 0/0 0/0 .text setSubjectMode__9daAlink_cFv */ +// matches with literals +#ifdef NONMATCHING +void daAlink_c::setSubjectMode() { + dComIfGp_setPlayerStatus0(0, 0x2000); + seStartSystem(Z2SE_SUBJ_VIEW_IN); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2478,23 +3081,24 @@ asm void daAlink_c::setSubjectMode() { #include "asm/d/a/d_a_alink/setSubjectMode__9daAlink_cFv.s" } #pragma pop +#endif /* 800CEB58-800CEBD8 0C9498 0080+00 2/2 0/0 0/0 .text subjectCancelTrigger__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::subjectCancelTrigger() { - nofralloc -#include "asm/d/a/d_a_alink/subjectCancelTrigger__9daAlink_cFv.s" +BOOL daAlink_c::subjectCancelTrigger() { + if (i_checkWolf() || checkNotBattleStage() || !i_checkSwordGet() || + (i_checkModeFlg(0x40000) && !i_checkEquipHeavyBoots())) { + return itemTriggerCheck(BTN_B); + } + + return false; } -#pragma pop /* 800CEBD8-800CECE4 0C9518 010C+00 9/9 0/0 0/0 .text checkSubjectEnd__9daAlink_cFi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkSubjectEnd(int param_0) { +asm int daAlink_c::checkSubjectEnd(int param_0) { nofralloc #include "asm/d/a/d_a_alink/checkSubjectEnd__9daAlink_cFi.s" } @@ -2511,74 +3115,108 @@ asm void daAlink_c::searchPeepObj(fopAc_ac_c* param_0, void* param_1) { #pragma pop /* 800CED48-800CED84 0C9688 003C+00 1/1 0/0 0/0 .text daAlink_searchPeepObj__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchPeepObj(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchPeepObj__FP10fopAc_ac_cPv.s" +static int daAlink_searchPeepObj(fopAc_ac_c* param_0, void* param_1) { + daAlink_getAlinkActorClass()->searchPeepObj(param_0, param_1); + return 0; } -#pragma pop /* 800CED84-800CEE08 0C96C4 0084+00 2/2 0/0 0/0 .text procCoSubjectivityInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoSubjectivityInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoSubjectivityInit__9daAlink_cFv.s" +int daAlink_c::procCoSubjectivityInit() { + commonProcInit(PROC_SUBJECTIVITY); + mNormalSpeed = FLOAT_LABEL(lit_6108); + + setSubjectMode(); + field_0x2fe6 = shape_angle.y; + + if (i_checkWolf()) { + setSingleAnimeWolfBaseSpeed(WANM_WAIT, FLOAT_LABEL(lit_6108), lit_6109); + } else { + setSingleAnimeBaseSpeed(ANM_WAIT, FLOAT_LABEL(lit_6108), lit_6109); + } + + return 1; } -#pragma pop /* 800CEE08-800CEF70 0C9748 0168+00 1/0 0/0 0/0 .text procCoSubjectivity__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoSubjectivity() { +asm int daAlink_c::procCoSubjectivity() { nofralloc #include "asm/d/a/d_a_alink/procCoSubjectivity__9daAlink_cFv.s" } #pragma pop /* 800CEF70-800CF018 0C98B0 00A8+00 1/1 0/0 0/0 .text procCoSwimSubjectivityInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoSwimSubjectivityInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoSwimSubjectivityInit__9daAlink_cFv.s" +int daAlink_c::procCoSwimSubjectivityInit() { + commonProcInit(PROC_SWIM_SUBJECTIVITY); + mNormalSpeed = FLOAT_LABEL(lit_6108); + + setSubjectMode(); + + if (i_checkWolf()) { + setSingleAnimeWolfBaseSpeed(WANM_SWIM_WAIT, daAlinkHIO_wlSwim_c0::m.field_0x88, + daAlinkHIO_wlSwim_c0::m.field_0x68); + } else { + setSingleAnimeBaseSpeed(ANM_SWIM_WAIT, daAlinkHIO_swim_c0::m.mWaitAnmSpeed, + daAlinkHIO_swim_c0::m.mWaitInterpolation); + } + + dComIfGp_setPlayerStatus0(0, 0x100000); + mCommonCounter = 0; + + return 1; } -#pragma pop /* 800CF018-800CF100 0C9958 00E8+00 1/0 0/0 0/0 .text procCoSwimSubjectivity__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoSwimSubjectivity() { +asm int daAlink_c::procCoSwimSubjectivity() { nofralloc #include "asm/d/a/d_a_alink/procCoSwimSubjectivity__9daAlink_cFv.s" } #pragma pop /* 800CF100-800CF1B8 0C9A40 00B8+00 1/1 0/0 0/0 .text procCoPeepSubjectivityInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoPeepSubjectivityInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoPeepSubjectivityInit__9daAlink_cFv.s" +int daAlink_c::procCoPeepSubjectivityInit() { + commonProcInit(PROC_PEEP_SUBJECTIVITY); + f32 tmp_0 = FLOAT_LABEL(lit_6108); + mNormalSpeed = tmp_0; + + if (i_checkWolf()) { + setSingleAnimeWolfBaseSpeed(WANM_WAIT, tmp_0, lit_6109); + } else { + setSingleAnimeBaseSpeed(ANM_WAIT, tmp_0, lit_6109); + } + + i_onPlayerNoDraw(); + setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + mSpeed.y = FLOAT_LABEL(lit_6108); + dComIfGp_setPlayerStatus0(0, 0x2000); + field_0x3478 = lit_6183; + mCommonCounter = shape_angle.y; + + return 1; } -#pragma pop /* 800CF1B8-800CF25C 0C9AF8 00A4+00 1/0 0/0 0/0 .text procCoPeepSubjectivity__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoPeepSubjectivity() { - nofralloc -#include "asm/d/a/d_a_alink/procCoPeepSubjectivity__9daAlink_cFv.s" +int daAlink_c::procCoPeepSubjectivity() { + if (doTrigger() || peepSubjectCancelTrigger()) { + kytag05_class* peep = NULL; + fopAcIt_Executor((fopAcIt_ExecutorFunc)daAlink_searchPeepObj, &peep); + + if (peep != NULL) { + mPeepExitID = peep->getSceneListID(); + } + + if (dComIfGp_event_compulsory(this, 0, 0xFFFF)) { + startPeepChange(); + } + } + + return 1; } -#pragma pop /* 800CF25C-800CF270 0C9B9C 0014+00 1/0 0/0 0/0 .text checkBoardRide__9daAlink_cCFv */ u32 daAlink_c::checkBoardRide() const { @@ -2741,11 +3379,9 @@ static u8 dComIfGp_getRStatus() { /* 800CFF4C-800CFFA4 0CA88C 0058+00 1/1 0/0 0/0 .text checkAttentionLock__9daAlink_cFv */ #pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkAttentionLock() { - nofralloc -#include "asm/d/a/d_a_alink/checkAttentionLock__9daAlink_cFv.s" +#pragma optimization_level 2 +BOOL daAlink_c::checkAttentionLock() { + return mAttention->Lockon(); } #pragma pop @@ -2828,8 +3464,7 @@ u32 daAlink_c::checkReinRide() const { /* 800D0110-800D0138 0CAA50 0028+00 1/1 0/0 0/0 .text checkWolfEnemyThrowAnime__9daAlink_cCFv */ BOOL daAlink_c::checkWolfEnemyThrowAnime() const { - return checkUpperAnime(0x2BD) || - checkUpperAnime(0x2BE); + return checkUpperAnime(0x2BD) || checkUpperAnime(0x2BE); } /* 800D0138-800D014C 0CAA78 0014+00 1/1 0/0 0/0 .text checkSpecialDemoMode__9daAlink_cCFv diff --git a/src/d/a/d_a_alink_spinner.inc b/src/d/a/d_a_alink_spinner.inc index b5f5632282a..2e2867833cc 100644 --- a/src/d/a/d_a_alink_spinner.inc +++ b/src/d/a/d_a_alink_spinner.inc @@ -112,20 +112,18 @@ void daAlink_c::setSpinnerSyncPos() { daSpinner_c* spinner = (daSpinner_c*)mRideAcKeep.getActor(); mDoMtx_multVecZero(spinner->getModelMtx(), ¤t.pos); - mDoMtx_stack_c::ZXYrotS(spinner->mCollisionRot); - mDoMtx_stack_c::YrotM(mCollisionRot.y - spinner->mCollisionRot.y); - mDoMtx_MtxToRot(mDoMtx_stack_c::get(), &mCollisionRot); + mDoMtx_stack_c::ZXYrotS(spinner->shape_angle); + mDoMtx_stack_c::YrotM(shape_angle.y - spinner->shape_angle.y); + mDoMtx_MtxToRot(mDoMtx_stack_c::get(), &shape_angle); field_0x37a4 = spinner->current.pos; } /* 8010DC64-8010DDCC 1085A4 0168+00 1/1 0/0 0/0 .text procSpinnerReadyInit__9daAlink_cFv */ -// matches with literals -#ifdef NONMATCHING int daAlink_c::procSpinnerReadyInit() { fopAc_ac_c* spinner = (fopAc_ac_c*)fopAcM_fastCreate( PROC_SPINNER, daSpinner_c::getWaitArg(), ¤t.pos, fopAcM_GetRoomNo(this), - &mCollisionRot, NULL, -1, NULL, NULL); + &shape_angle, NULL, -1, NULL, NULL); if (spinner == NULL) { return 0; @@ -133,20 +131,20 @@ int daAlink_c::procSpinnerReadyInit() { commonProcInit(PROC_SPINNER_READY); mRideAcKeep.setData(spinner); - setSingleAnime(ANM_VJUMP_START, daAlinkHIO_smallJump_c0::m.mSmallJumpAnm.mRate, 6.0f, - daAlinkHIO_smallJump_c0::m.mSmallJumpAnm.mEndF, + setSingleAnime(ANM_VJUMP_START, daAlinkHIO_smallJump_c0::m.mSmallJumpAnm.mSpeed, lit_7977, + daAlinkHIO_smallJump_c0::m.mSmallJumpAnm.mEndFrame, daAlinkHIO_smallJump_c0::m.mSmallJumpAnm.mInterpolation); - mNormalSpeed = 0.0f; + mNormalSpeed = FLOAT_LABEL(lit_6108); setHeavyBoots(0); - mSpeed.y = 26.0f; + mSpeed.y = lit_7451; voiceStart(Z2SE_AL_V_JUMP_S); seStartOnlyReverb(Z2SE_AL_SPINNER_START); field_0x2f99 = 15; deleteEquipItem(TRUE, TRUE); - current.angle.y = mCollisionRot.y; + current.angle.y = shape_angle.y; field_0x3588 = l_waitBaseAnime; field_0x33b0 = field_0x3588.y; field_0x34d4 = l_waitBaseAnime; @@ -154,16 +152,6 @@ int daAlink_c::procSpinnerReadyInit() { return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procSpinnerReadyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSpinnerReadyInit__9daAlink_cFv.s" -} -#pragma pop -#endif /* 8010DDCC-8010DE64 10870C 0098+00 1/0 0/0 0/0 .text procSpinnerReady__9daAlink_cFv */ int daAlink_c::procSpinnerReady() { @@ -211,7 +199,7 @@ int daAlink_c::procSpinnerWaitInit() { mNormalSpeed = 0.0f; mCommonCounter = 0; - field_0x300e = mCollisionRot.y; + field_0x300e = shape_angle.y; field_0x3010 = 0; field_0x3198 = ANM_RIDE_CROUCH; field_0x33b0 = 70.0f; @@ -259,13 +247,13 @@ int daAlink_c::procSpinnerWait() { s16 angle = field_0x33ac * 384.0f * field_0x33ac; if (direction == DIR_LEFT) { - mCollisionRot.y += angle; + shape_angle.y += angle; } else if (direction == DIR_RIGHT) { - mCollisionRot.y -= angle; + shape_angle.y -= angle; } - current.angle.y = mCollisionRot.y; - field_0x300e = mCollisionRot.y; + current.angle.y = shape_angle.y; + field_0x300e = shape_angle.y; } } else { if (checkSetItemTrigger(SPINNER) || swordSwingTrigger() || itemSetBtn == 2) { @@ -316,20 +304,20 @@ int daAlink_c::procSpinnerWait() { } } else if (spinner->getButtonJump() && field_0x3198 != ANM_RIDE_JUMP) { field_0x3198 = ANM_RIDE_JUMP; - setSingleAnime(ANM_RIDE_JUMP, 0.0f, daAlinkHIO_board_c0::m.mAirborneAnm.mStart, - daAlinkHIO_board_c0::m.mAirborneAnm.mEndF, + setSingleAnime(ANM_RIDE_JUMP, 0.0f, daAlinkHIO_board_c0::m.mAirborneAnm.mStartFrame, + daAlinkHIO_board_c0::m.mAirborneAnm.mEndFrame, daAlinkHIO_board_c0::m.mAirborneAnm.mInterpolation); field_0x3010 = 0; } else if (field_0x3198 == ANM_RIDE_JUMP) { if (!spinner->getJumpFlg()) { - setSingleAnime(ANM_RIDE_JUMP_LAND, daAlinkHIO_board_c0::m.mLandAnm.mRate, - daAlinkHIO_board_c0::m.mLandAnm.mStart, 16, + setSingleAnime(ANM_RIDE_JUMP_LAND, daAlinkHIO_board_c0::m.mLandAnm.mSpeed, + daAlinkHIO_board_c0::m.mLandAnm.mStartFrame, 16, daAlinkHIO_board_c0::m.mLandAnm.mInterpolation); field_0x3198 = ANM_RIDE_JUMP_LAND; } else if (field_0x3010 == 0 && field_0x2060->getOldFrameRate() < 0.01f) { - setSingleAnime(ANM_RIDE_JUMP, daAlinkHIO_board_c0::m.mAirborneAnm.mRate, - daAlinkHIO_board_c0::m.mAirborneAnm.mStart, - daAlinkHIO_board_c0::m.mAirborneAnm.mEndF, -1.0f); + setSingleAnime(ANM_RIDE_JUMP, daAlinkHIO_board_c0::m.mAirborneAnm.mSpeed, + daAlinkHIO_board_c0::m.mAirborneAnm.mStartFrame, + daAlinkHIO_board_c0::m.mAirborneAnm.mEndFrame, -1.0f); field_0x3010 = 1; } } else if ((field_0x3198 == ANM_RIDE_JUMP_LAND && frameCtrl->checkAnmEnd()) || @@ -341,7 +329,7 @@ int daAlink_c::procSpinnerWait() { } setSpinnerSyncPos(); - mCollisionRot.y = field_0x300e; + shape_angle.y = field_0x300e; return 1; } diff --git a/src/d/a/d_a_alink_sumou.inc b/src/d/a/d_a_alink_sumou.inc index 55e1e9a31a8..aa9da1facc9 100644 --- a/src/d/a/d_a_alink_sumou.inc +++ b/src/d/a/d_a_alink_sumou.inc @@ -1,12 +1,20 @@ /* 800EA844-800EA8D0 0E5184 008C+00 5/5 0/0 0/0 .text checkSumouVsActor__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSumouVsActor() { - nofralloc -#include "asm/d/a/d_a_alink/checkSumouVsActor__9daAlink_cFv.s" +BOOL daAlink_c::checkSumouVsActor() { + mCargoCarryAcKeep.setActor(); + + if (mCargoCarryAcKeep.getActor() == NULL) { + cancelSumouMode(); + procWaitInit(); + return false; + } + + if (mSpecialMode == 0xD || mSpecialMode == 0xB || mSpecialMode == 0xC || mSpecialMode == 0xE) { + procSumouWinLoseInit(); + return false; + } + + return true; } -#pragma pop /* 800EA8D0-800EA908 0E5210 0038+00 5/5 0/0 0/0 .text cancelSumouMode__9daAlink_cFv */ void daAlink_c::cancelSumouMode() { @@ -26,20 +34,34 @@ void daAlink_c::setSumouPunchStatus() { } /* 800EA950-800EAA28 0E5290 00D8+00 4/4 0/0 0/0 .text procSumouReadyInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouReadyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSumouReadyInit__9daAlink_cFv.s" +int daAlink_c::procSumouReadyInit() { + if (!commonProcInitNotSameProc(PROC_SUMOU_READY)) { + return 0; + } + + setSingleAnimeBaseMorf(ANM_SUMOU_MIAU, FLOAT_LABEL(lit_6108)); + mNormalSpeed = FLOAT_LABEL(lit_6108); + current.angle.y = shape_angle.y; + field_0x3588 = l_waitBaseAnime; + field_0x34d4 = field_0x3588; + field_0x2f99 = 4; + mSpecialMode = 1; + mCommonCounter = 0; + field_0x300e = 0; + deleteEquipItem(0, 1); + + if (mThrowBoomerangAcKeep.getActor() != NULL) { + static_cast(mThrowBoomerangAcKeep.getActor())->onForceDelete(); + } + + return 1; } -#pragma pop /* 800EAA28-800EAC4C 0E5368 0224+00 1/0 0/0 0/0 .text procSumouReady__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSumouReady() { +asm int daAlink_c::procSumouReady() { nofralloc #include "asm/d/a/d_a_alink/procSumouReady__9daAlink_cFv.s" } @@ -49,7 +71,7 @@ asm void daAlink_c::procSumouReady() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSumouMoveInit() { +asm int daAlink_c::procSumouMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procSumouMoveInit__9daAlink_cFv.s" } @@ -59,7 +81,7 @@ asm void daAlink_c::procSumouMoveInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSumouMove() { +asm int daAlink_c::procSumouMove() { nofralloc #include "asm/d/a/d_a_alink/procSumouMove__9daAlink_cFv.s" } @@ -67,20 +89,31 @@ asm void daAlink_c::procSumouMove() { /* 800EB208-800EB2BC 0E5B48 00B4+00 4/4 0/0 0/0 .text procSumouSideMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouSideMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSumouSideMoveInit__9daAlink_cFv.s" +int daAlink_c::procSumouSideMoveInit() { + commonProcInit(PROC_SUMOU_SIDE_MOVE); + mSpecialMode = 0x16; + field_0x2f98 = 3; + current.angle.y = shape_angle.y + -0x4000; + field_0x594 = daAlinkHIO_atnMove_c0::m.mMaxSpeed; + setSingleAnimeBase(ANM_SUMOU_FIGHT_WAIT); + + field_0x3198 = 0x141; + setSumouPunchStatus(); + setDoStatusEmphasys(0x15); + dComIfGp_setAdvanceDirection(5); + + field_0x2f99 = 12; + setFootEffectProcType(5); + field_0x3008 = 15; + + return 1; } -#pragma pop /* 800EB2BC-800EB624 0E5BFC 0368+00 1/0 0/0 0/0 .text procSumouSideMove__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSumouSideMove() { +asm int daAlink_c::procSumouSideMove() { nofralloc #include "asm/d/a/d_a_alink/procSumouSideMove__9daAlink_cFv.s" } @@ -91,7 +124,7 @@ asm void daAlink_c::procSumouSideMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSumouActionInit(int param_0, int param_1, int param_2) { +asm int daAlink_c::procSumouActionInit(int param_0, int param_1, int param_2) { nofralloc #include "asm/d/a/d_a_alink/procSumouActionInit__9daAlink_cFiii.s" } @@ -101,7 +134,7 @@ asm void daAlink_c::procSumouActionInit(int param_0, int param_1, int param_2) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSumouAction() { +asm int daAlink_c::procSumouAction() { nofralloc #include "asm/d/a/d_a_alink/procSumouAction__9daAlink_cFv.s" } @@ -109,31 +142,46 @@ asm void daAlink_c::procSumouAction() { /* 800EC0F8-800EC170 0E6A38 0078+00 1/1 0/0 0/0 .text procSumouStaggerInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouStaggerInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSumouStaggerInit__9daAlink_cFv.s" +int daAlink_c::procSumouStaggerInit() { + commonProcInit(PROC_SUMOU_STAGGER); + + if (mSpecialMode == 0x11) { + mSpecialMode = 0x20; + } else { + mSpecialMode = 0x1F; + } + + setSingleAnimeBase(ANM_SUMOU_STAGGER); + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x2f99 = 12; + field_0x3008 = 30; + return 1; } -#pragma pop /* 800EC170-800EC20C 0E6AB0 009C+00 1/0 0/0 0/0 .text procSumouStagger__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouStagger() { - nofralloc -#include "asm/d/a/d_a_alink/procSumouStagger__9daAlink_cFv.s" +int daAlink_c::procSumouStagger() { + field_0x2f99 = 4; + + if (!checkSumouVsActor()) { + return 1; + } + + field_0x3008--; + if (mSpecialMode == 0x1C || mSpecialMode == 0x21 || mSpecialMode == 0x1B) { + procSumouActionInit(0, 0, 0); + } else if (field_0x3008 == 0) { + procSumouSideMoveInit(); + } + + return 1; } -#pragma pop /* 800EC20C-800EC3D8 0E6B4C 01CC+00 1/1 0/0 0/0 .text procSumouWinLoseInit__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSumouWinLoseInit() { +asm int daAlink_c::procSumouWinLoseInit() { nofralloc #include "asm/d/a/d_a_alink/procSumouWinLoseInit__9daAlink_cFv.s" } @@ -143,27 +191,37 @@ asm void daAlink_c::procSumouWinLoseInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSumouWinLose() { +asm int daAlink_c::procSumouWinLose() { nofralloc #include "asm/d/a/d_a_alink/procSumouWinLose__9daAlink_cFv.s" } #pragma pop /* 800EC538-800EC5F4 0E6E78 00BC+00 1/0 0/0 0/0 .text procSumouShikoInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouShikoInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSumouShikoInit__9daAlink_cFv.s" +int daAlink_c::procSumouShikoInit() { + if (!commonProcInitNotSameProc(PROC_SUMOU_SHIKO)) { + return 0; + } + + setSingleAnimeBase(ANM_SUMOU_SHIKO); + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x3588 = l_waitBaseAnime; + field_0x34d4 = field_0x3588; + field_0x2f99 = 12; + mCommonCounter = 0; + mSpecialMode = 0; + + setFootEffectProcType(5); + deleteEquipItem(0, 1); + + return 1; } -#pragma pop /* 800EC5F4-800EC724 0E6F34 0130+00 1/0 0/0 0/0 .text procSumouShiko__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSumouShiko() { +asm int daAlink_c::procSumouShiko() { nofralloc #include "asm/d/a/d_a_alink/procSumouShiko__9daAlink_cFv.s" } diff --git a/src/d/a/d_a_alink_swim.inc b/src/d/a/d_a_alink_swim.inc index 271cd342330..81a3f682527 100644 --- a/src/d/a/d_a_alink_swim.inc +++ b/src/d/a/d_a_alink_swim.inc @@ -1,106 +1,120 @@ /* 80101890-801018E4 0FC1D0 0054+00 6/6 0/0 0/0 .text checkZoraWearMaskDraw__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkZoraWearMaskDraw() { - nofralloc -#include "asm/d/a/d_a_alink/checkZoraWearMaskDraw__9daAlink_cFv.s" +BOOL daAlink_c::checkZoraWearMaskDraw() { + return checkZoraWearAbility() && !i_checkNoResetFlg0(FLG0_UNK_100); } -#pragma pop /* 801018E4-80101934 0FC224 0050+00 1/1 0/0 0/0 .text checkAcceptUseItemInWater__9daAlink_cCFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkAcceptUseItemInWater(u16 param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkAcceptUseItemInWater__9daAlink_cCFUs.s" +BOOL daAlink_c::checkAcceptUseItemInWater(u16 i_itemNo) const { + return i_itemNo == HVY_BOOTS || i_itemNo == WATER_BOMB || checkHookshotItem(i_itemNo); } -#pragma pop /* 80101934-801019B8 0FC274 0084+00 4/4 0/0 0/0 .text swimDeleteItem__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::swimDeleteItem() { - nofralloc -#include "asm/d/a/d_a_alink/swimDeleteItem__9daAlink_cFv.s" +void daAlink_c::swimDeleteItem() { + if (!checkHookshotItem(mEquipItem) && (mEquipItem != 0x103 || !checkBootsOrArmorHeavy())) { + deleteEquipItem(1, 1); + } + + if (i_checkNoResetFlg2(FLG2_UNK_1)) { + offKandelaarModel(); + } } -#pragma pop /* 801019B8-80101A18 0FC2F8 0060+00 11/11 0/0 0/0 .text getZoraSwim__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::getZoraSwim() const { - nofralloc -#include "asm/d/a/d_a_alink/getZoraSwim__9daAlink_cCFv.s" +bool daAlink_c::getZoraSwim() const { + return checkUnderMove0BckNoArc(ANM_SWIM_C) || checkUnderMove0BckNoArc(ANM_SWIM_ZORA_START); } -#pragma pop /* 80101A18-80101AA8 0FC358 0090+00 6/6 0/0 0/0 .text getSwimFrontMaxSpeed__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getSwimFrontMaxSpeed() const { - nofralloc -#include "asm/d/a/d_a_alink/getSwimFrontMaxSpeed__9daAlink_cCFv.s" +f32 daAlink_c::getSwimFrontMaxSpeed() const { + if (checkBootsOrArmorHeavy()) { + return daAlinkHIO_swim_c0::m.mUnderwaterMaxSinkSpeed; + } else if (checkZoraWearAbility()) { + return lit_8130; + } else if (checkSwimDashMode()) { + return daAlinkHIO_swim_c0::m.mDMaxSpeed; + } else { + return daAlinkHIO_swim_c0::m.mMaxForwardSpeed; + } } -#pragma pop /* 80101AA8-80101B44 0FC3E8 009C+00 5/5 0/0 0/0 .text getSwimMaxFallSpeed__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getSwimMaxFallSpeed() const { - nofralloc -#include "asm/d/a/d_a_alink/getSwimMaxFallSpeed__9daAlink_cCFv.s" +f32 daAlink_c::getSwimMaxFallSpeed() const { + if (mProcID == PROC_DIVE_JUMP) { + return -daAlinkHIO_swim_c0::m.mMaxUnderwaterSpeed; + } else if (checkBootsOrArmorHeavy()) { + return daAlinkHIO_swim_c0::m.mBootsMaxSinkSpeed; + } else if (getZoraSwim()) { + return daAlinkHIO_swim_c0::m.mMaxSinkSpeed; + } else { + return daAlinkHIO_swim_c0::m.mInitMaxSinkSpeed; + } } -#pragma pop /* 80101B44-80101C94 0FC484 0150+00 1/1 0/0 0/0 .text checkOxygenTimer__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkOxygenTimer() { - nofralloc -#include "asm/d/a/d_a_alink/checkOxygenTimer__9daAlink_cFv.s" +void daAlink_c::checkOxygenTimer() { + BOOL hide_timer; + + if (!i_checkNoResetFlg0(FLG0_UNK_100) || (i_checkModeFlg(MODE_SWIMMING) && mWaterY > lit_7808 + current.pos.y)) { + hide_timer = false; + } else { + hide_timer = true; + } + + if (dComIfGp_getOxygenShowFlag()) { + if (checkZoraWearAbility()) { + offOxygenTimer(); + } else if (hide_timer) { + s32 max = dComIfGp_getMaxOxygen(); + dComIfGp_setOxygenCount(max); + + if (field_0x2fbe < 90) { + field_0x2fbe++; + } else { + offOxygenTimer(); + } + } else if (!checkEventRun()) { + dComIfGp_setOxygenCount(-1); + } + } else if (!hide_timer && !checkZoraWearAbility()) { + if (field_0x2fbe != 0) { + field_0x2fbe--; + } else { + dComIfGp_onOxygenShowFlag(); + dComIfGp_setOxygen(dComIfGp_getMaxOxygen()); + } + } } -#pragma pop /* 80101C94-80101CB8 0FC5D4 0024+00 3/3 0/0 0/0 .text offOxygenTimer__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::offOxygenTimer() { - nofralloc -#include "asm/d/a/d_a_alink/offOxygenTimer__9daAlink_cFv.s" +void daAlink_c::offOxygenTimer() { + dComIfGp_offOxygenShowFlag(); + s32 max = dComIfGp_getMaxOxygen(); + dComIfGp_setOxygen(max); + + field_0x2fbe = 90; } -#pragma pop /* 80101CB8-80101CF4 0FC5F8 003C+00 2/2 0/0 0/0 .text checkPossibleWaterInMode__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkPossibleWaterInMode() const { - nofralloc -#include "asm/d/a/d_a_alink/checkPossibleWaterInMode__9daAlink_cCFv.s" +BOOL daAlink_c::checkPossibleWaterInMode() const { + return i_checkModeFlg(MODE_VINE_CLIMB) || i_dComIfGp_checkPlayerStatus1(0, 0x2000000) || mProcID == PROC_HOOKSHOT_FLY; } -#pragma pop /* 80101CF4-80101D70 0FC634 007C+00 18/18 0/0 0/0 .text * setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWaterInAnmRate(daPy_frameCtrl_c* param_0, f32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf.s" +void daAlink_c::setWaterInAnmRate(daPy_frameCtrl_c* i_frameCtrl, f32 i_rate) { + if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (checkZoraWearAbility()) { + i_rate *= daAlinkHIO_magneBoots_c0::m.mZoraWaterAnmSpeed; + } else { + i_rate *= daAlinkHIO_magneBoots_c0::m.mWaterWalkAnmRate; + } + } + + i_frameCtrl->setRate(i_rate); } -#pragma pop /* 80101D70-801023E4 0FC6B0 0674+00 2/2 0/0 0/0 .text swimBgCheck__9daAlink_cFf */ #pragma push @@ -125,14 +139,36 @@ asm void daAlink_c::setSpeedAndAngleSwim() { /* 801029C8-80102B1C 0FD308 0154+00 3/3 0/0 0/0 .text checkNextActionSwim__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionSwim() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionSwim__9daAlink_cFv.s" +int daAlink_c::checkNextActionSwim() { + if (checkSwimButtonMove() && getZoraSwim()) { + field_0x3000 = 30; + } + + if ((checkZoraWearAbility() && !checkHeavyStateOn(1, 1)) || i_checkNoResetFlg0(FLG0_UNK_100)) { + setTalkStatus(); + } + + if (orderTalk(1)) { + return 1; + } + + if (mAttList != NULL && mAttList->mType == 7 && i_checkNoResetFlg0(FLG0_UNK_100) && fopAcM_GetName(field_0x27f4) == PROC_CANOE) { + setDoStatus(0x17); + + if (doTrigger()) { + return procCanoeRideInit(); + } + } else if (checkSwimButtonMove() && !checkZoraSwimMove()) { + if (checkSwimButtonAccept()) { + return procSwimDiveInit(); + } + + field_0x3000 = 30; + return procSwimMoveInit(); + } + + return checkNextActionFromButton(); } -#pragma pop /* 80102B1C-80103058 0FD45C 053C+00 3/3 0/0 0/0 .text checkSwimAction__9daAlink_cFi */ #pragma push @@ -148,13 +184,36 @@ asm void daAlink_c::checkSwimAction(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkSwimUpAction() { +asm int daAlink_c::checkSwimUpAction() { nofralloc #include "asm/d/a/d_a_alink/checkSwimUpAction__9daAlink_cFv.s" } #pragma pop /* 801032C8-80103398 0FDC08 00D0+00 8/8 0/0 0/0 .text swimOutAfter__9daAlink_cFi */ +// setInWater needs work +#ifdef NONMATCHING +void daAlink_c::swimOutAfter(int param_0) { + i_onNoResetFlg0(FLG0_UNK_100); + i_onEndResetFlg1(ERFLG1_UNK_100); + mZ2Link.setInWater(false); + + if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + i_offNoResetFlg0(FLG0_UNDERWATER); + } else { + field_0x2b98 = FLOAT_LABEL(lit_6108); + field_0x2f98 = 4; + } + + field_0x3750 = cXyz::Zero; + field_0x3000 = 0; + offOxygenTimer(); + + if (checkSwimMoveHandAnime() || checkZoraSwimDamageAnime()) { + resetUpperAnime(UPPER_2, lit_6109); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -163,16 +222,16 @@ asm void daAlink_c::swimOutAfter(int param_0) { #include "asm/d/a/d_a_alink/swimOutAfter__9daAlink_cFi.s" } #pragma pop +#endif /* 80103398-801033CC 0FDCD8 0034+00 1/1 0/0 0/0 .text checkSwimFall__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSwimFall() { - nofralloc -#include "asm/d/a/d_a_alink/checkSwimFall__9daAlink_cFv.s" +bool daAlink_c::checkSwimFall() { + if (!i_checkNoResetFlg0(FLG0_UNK_80) || current.pos.y > mWaterY + l_autoUpHeight) { + return true; + } + + return false; } -#pragma pop /* 801033CC-80103698 0FDD0C 02CC+00 1/1 0/0 0/0 .text checkSwimOutAction__9daAlink_cFv */ #pragma push @@ -196,73 +255,56 @@ asm void daAlink_c::setSwimMoveAnime() { /* 80103EE0-80103F08 0FE820 0028+00 5/5 0/0 0/0 .text checkSwimButtonAccept__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSwimButtonAccept() { - nofralloc -#include "asm/d/a/d_a_alink/checkSwimButtonAccept__9daAlink_cFv.s" +bool daAlink_c::checkSwimButtonAccept() { + return i_dComIfGp_getDoStatus() == 0x41 || i_dComIfGp_getDoStatus() == 0x4C; } -#pragma pop /* 80103F08-80103F24 0FE848 001C+00 4/4 0/0 0/0 .text checkUpSwimButtonAccept__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUpSwimButtonAccept() { - nofralloc -#include "asm/d/a/d_a_alink/checkUpSwimButtonAccept__9daAlink_cFv.s" +bool daAlink_c::checkUpSwimButtonAccept() { + return i_dComIfGp_getDoStatus() == 0x97; } -#pragma pop /* 80103F24-80103F94 0FE864 0070+00 2/2 0/0 0/0 .text checkSwimButtonMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSwimButtonMove() { - nofralloc -#include "asm/d/a/d_a_alink/checkSwimButtonMove__9daAlink_cFv.s" +BOOL daAlink_c::checkSwimButtonMove() { + return !i_checkNoResetFlg0(FLG0_UNK_100) && (checkSwimButtonAccept() || checkUpSwimButtonAccept()) && doButton(); } -#pragma pop /* 80103F94-80103FE8 0FE8D4 0054+00 3/3 0/0 0/0 .text checkZoraSwimMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkZoraSwimMove() { - nofralloc -#include "asm/d/a/d_a_alink/checkZoraSwimMove__9daAlink_cFv.s" +BOOL daAlink_c::checkZoraSwimMove() { + return checkSwimButtonMove() || field_0x3000 != 0; } -#pragma pop /* 80103FE8-80104034 0FE928 004C+00 2/2 0/0 0/0 .text checkSwimNeckUpDown__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSwimNeckUpDown() const { - nofralloc -#include "asm/d/a/d_a_alink/checkSwimNeckUpDown__9daAlink_cCFv.s" +BOOL daAlink_c::checkSwimNeckUpDown() const { + return !i_checkNoResetFlg0(FLG0_UNK_100) && checkUnderMove0BckNoArc(ANM_SWIM_WAIT); } -#pragma pop /* 80104034-801040F8 0FE974 00C4+00 3/3 0/0 0/0 .text setSwimUpDownOffset__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSwimUpDownOffset() { - nofralloc -#include "asm/d/a/d_a_alink/setSwimUpDownOffset__9daAlink_cFv.s" +void daAlink_c::setSwimUpDownOffset() { + mCommonCounter += (s16)((cM_rndF(lit_16570) + lit_27477) * lit_27476); + + f32 var_f1; + if (i_checkWolf()) { + if (checkHeavyStateOn(1, 1)) { + var_f1 = daAlinkHIO_wlSwim_c0::m.field_0x98; + } else { + var_f1 = daAlinkHIO_wlSwim_c0::m.field_0x6C; + } + } else { + var_f1 = daAlinkHIO_swim_c0::m.mWaitVibrationIntensity; + } + + field_0x2b98 = var_f1 * cM_ssin(mCommonCounter); } -#pragma pop /* 801040F8-801041E8 0FEA38 00F0+00 2/2 0/0 0/0 .text procSwimUpInit__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSwimUpInit() { +asm int daAlink_c::procSwimUpInit() { nofralloc #include "asm/d/a/d_a_alink/procSwimUpInit__9daAlink_cFv.s" } @@ -272,7 +314,7 @@ asm void daAlink_c::procSwimUpInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSwimUp() { +asm int daAlink_c::procSwimUp() { nofralloc #include "asm/d/a/d_a_alink/procSwimUp__9daAlink_cFv.s" } @@ -282,7 +324,7 @@ asm void daAlink_c::procSwimUp() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSwimWaitInit(int param_0) { +asm int daAlink_c::procSwimWaitInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procSwimWaitInit__9daAlink_cFi.s" } @@ -292,7 +334,7 @@ asm void daAlink_c::procSwimWaitInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSwimWait() { +asm int daAlink_c::procSwimWait() { nofralloc #include "asm/d/a/d_a_alink/procSwimWait__9daAlink_cFv.s" } @@ -302,7 +344,7 @@ asm void daAlink_c::procSwimWait() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSwimMoveInit() { +asm int daAlink_c::procSwimMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procSwimMoveInit__9daAlink_cFv.s" } @@ -312,7 +354,7 @@ asm void daAlink_c::procSwimMoveInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSwimMove() { +asm int daAlink_c::procSwimMove() { nofralloc #include "asm/d/a/d_a_alink/procSwimMove__9daAlink_cFv.s" } @@ -322,7 +364,7 @@ asm void daAlink_c::procSwimMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSwimDiveInit() { +asm int daAlink_c::procSwimDiveInit() { nofralloc #include "asm/d/a/d_a_alink/procSwimDiveInit__9daAlink_cFv.s" } @@ -332,7 +374,7 @@ asm void daAlink_c::procSwimDiveInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSwimDive() { +asm int daAlink_c::procSwimDive() { nofralloc #include "asm/d/a/d_a_alink/procSwimDive__9daAlink_cFv.s" } @@ -342,7 +384,7 @@ asm void daAlink_c::procSwimDive() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSwimHookshotSubjectInit() { +asm int daAlink_c::procSwimHookshotSubjectInit() { nofralloc #include "asm/d/a/d_a_alink/procSwimHookshotSubjectInit__9daAlink_cFv.s" } @@ -352,7 +394,7 @@ asm void daAlink_c::procSwimHookshotSubjectInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSwimHookshotSubject() { +asm int daAlink_c::procSwimHookshotSubject() { nofralloc #include "asm/d/a/d_a_alink/procSwimHookshotSubject__9daAlink_cFv.s" } @@ -362,7 +404,7 @@ asm void daAlink_c::procSwimHookshotSubject() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSwimHookshotMoveInit() { +asm int daAlink_c::procSwimHookshotMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procSwimHookshotMoveInit__9daAlink_cFv.s" } @@ -373,7 +415,7 @@ asm void daAlink_c::procSwimHookshotMoveInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSwimHookshotMove() { +asm int daAlink_c::procSwimHookshotMove() { nofralloc #include "asm/d/a/d_a_alink/procSwimHookshotMove__9daAlink_cFv.s" } @@ -384,7 +426,7 @@ asm void daAlink_c::procSwimHookshotMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSwimDamageInit(dCcD_GObjInf* param_0) { +asm int daAlink_c::procSwimDamageInit(dCcD_GObjInf* param_0) { nofralloc #include "asm/d/a/d_a_alink/procSwimDamageInit__9daAlink_cFP12dCcD_GObjInf.s" } @@ -394,7 +436,7 @@ asm void daAlink_c::procSwimDamageInit(dCcD_GObjInf* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSwimDamage() { +asm int daAlink_c::procSwimDamage() { nofralloc #include "asm/d/a/d_a_alink/procSwimDamage__9daAlink_cFv.s" } @@ -405,18 +447,24 @@ asm void daAlink_c::procSwimDamage() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procOctaIealSpitInit() { +asm int daAlink_c::procOctaIealSpitInit() { nofralloc #include "asm/d/a/d_a_alink/procOctaIealSpitInit__9daAlink_cFv.s" } #pragma pop /* 80105A00-80105A84 100340 0084+00 1/0 0/0 0/0 .text procOctaIealSpit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procOctaIealSpit() { - nofralloc -#include "asm/d/a/d_a_alink/procOctaIealSpit__9daAlink_cFv.s" -} -#pragma pop \ No newline at end of file +int daAlink_c::procOctaIealSpit() { + if (mDemo.getDemoMode() == 0x2E) { + i_cancelOriginalDemo(); + } + + cLib_addCalc(&mNormalSpeed, FLOAT_LABEL(lit_6108), lit_5943, field_0x3478, lit_9054); + field_0x2f99 = 7; + + if (mUnderFrameCtrl[0].checkAnmEnd()) { + procSwimWaitInit(0); + } + + return 1; +} \ No newline at end of file diff --git a/src/d/a/d_a_alink_swindow.inc b/src/d/a/d_a_alink_swindow.inc index f7214b8ffd9..283e6bc8bd3 100644 --- a/src/d/a/d_a_alink_swindow.inc +++ b/src/d/a/d_a_alink_swindow.inc @@ -1,4 +1,53 @@ /* 801406A8-80140888 13AFE8 01E0+00 0/0 1/1 0/0 .text initStatusWindow__9daAlink_cFv */ +// regalloc +#ifdef NONMATCHING +void daAlink_c::initStatusWindow() { + u16 var_r28; + u16 var_r30; + u16 var_r31; + + i_onNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); + + void* tmpBuffer = new (0x20) void*[0x500]; + + if (i_checkWolf()) { + var_r28 = 0x2FF; + var_r31 = 0x408; + var_r30 = 0x3A7; + changeModelDataDirectWolf(0); + } else { + var_r28 = 0x26A; + var_r31 = 0x3AF; + var_r30 = 0x32C; + + if (checkZoraWearAbility() && !checkZoraWearMaskDraw()) { + field_0x06f0->hide(); + } + changeModelDataDirect(0); + } + + dComIfGp_getAnmArchive()->readIdxResource(tmpBuffer, 0x1400, var_r28); + m_sWindowBck = new mDoExt_bckAnm(); + J3DAnmTransform* bck = (J3DAnmTransform*)J3DAnmLoaderDataBase::load(tmpBuffer, J3DLOADER_UNK_FLAG0); + m_sWindowBck->init(bck, 1, 2, 1.0f, 0, -1, false); + + tmpBuffer = new (0x20) void*[0x100]; + + dComIfGp_getAnmArchive()->readIdxResource(tmpBuffer, 0x400, var_r31); + J3DAnmTexPattern* btp = (J3DAnmTexPattern*)J3DAnmLoaderDataBase::load(tmpBuffer, J3DLOADER_UNK_FLAG0); + btp->setFrame(0.0f); + btp->searchUpdateMaterialID(field_0x06c0); + field_0x06c0->entryTexNoAnimator(btp); + + tmpBuffer = new (0x20) void*[0x100]; + + dComIfGp_getAnmArchive()->readIdxResource(tmpBuffer, 0x400, var_r30); + J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)J3DAnmLoaderDataBase::load(tmpBuffer, J3DLOADER_UNK_FLAG0); + btk->setFrame(0.0f); + btk->searchUpdateMaterialID(field_0x06c0); + field_0x06c0->entryTexMtxAnimator(btk); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -7,6 +56,7 @@ asm void daAlink_c::initStatusWindow() { #include "asm/d/a/d_a_alink/initStatusWindow__9daAlink_cFv.s" } #pragma pop +#endif /* 80140888-80140984 13B1C8 00FC+00 0/0 1/1 0/0 .text statusWindowExecute__9daAlink_cFPC4cXyzs */ void daAlink_c::statusWindowExecute(cXyz const* param_0, s16 param_1) { diff --git a/src/d/a/d_a_alink_whistle.inc b/src/d/a/d_a_alink_whistle.inc index 9a4692f698f..11d70969631 100644 --- a/src/d/a/d_a_alink_whistle.inc +++ b/src/d/a/d_a_alink_whistle.inc @@ -59,10 +59,10 @@ int daAlink_c::procGrassWhistleGetInit() { commonProcInit(PROC_GRASS_WHISTLE_GET); mNormalSpeed = 0.0f; - current.angle.y = mCollisionRot.y; + current.angle.y = shape_angle.y; field_0x2f98 = 4; - setSingleAnimeParam(ANM_BOTTLE_SWING_DOWN, &daAlinkHIO_bottle_c0::m.field_0x50); + setSingleAnimeParam(ANM_BOTTLE_SWING_DOWN, &daAlinkHIO_bottle_c0::m.mSwingDownAnm); field_0x2f92 = 0xFE; field_0x280c.setData(field_0x27f4); @@ -70,10 +70,10 @@ int daAlink_c::procGrassWhistleGetInit() { mCommonCounter = yobikusa->getType(); field_0x300e = yobikusa->getPathID(); field_0x3010 = yobikusa->isPlayerCorrect(); - field_0x3012 = yobikusa->mCollisionRot.y + 0x8000; - field_0x37c8.set(yobikusa->current.pos.x + cM_ssin(yobikusa->mCollisionRot.y) * 50.0f, + field_0x3012 = yobikusa->shape_angle.y + 0x8000; + field_0x37c8.set(yobikusa->current.pos.x + cM_ssin(yobikusa->shape_angle.y) * 50.0f, yobikusa->current.pos.y + 50.0f, - yobikusa->current.pos.z + cM_scos(yobikusa->mCollisionRot.y) * 50.0f); + yobikusa->current.pos.z + cM_scos(yobikusa->shape_angle.y) * 50.0f); voiceStart(Z2SE_AL_V_SWING_BOTTLE); return 1; } @@ -112,7 +112,7 @@ int daAlink_c::procGrassWhistleGet() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param_2, s16 param_3, +asm int daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param_2, s16 param_3, cXyz* param_4) { nofralloc #include "asm/d/a/d_a_alink/procGrassWhistleWaitInit__9daAlink_cFiiisP4cXyz.s" @@ -124,69 +124,92 @@ asm void daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procGrassWhistleWait() { +asm int daAlink_c::procGrassWhistleWait() { nofralloc #include "asm/d/a/d_a_alink/procGrassWhistleWait__9daAlink_cFv.s" } #pragma pop /* 80111FF0-801120C8 10C930 00D8+00 2/2 0/0 0/0 .text procCoHorseCallWaitInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoHorseCallWaitInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCoHorseCallWaitInit__9daAlink_cFi.s" +int daAlink_c::procCoHorseCallWaitInit(int param_0) { + commonProcInit(PROC_HORSE_CALL_WAIT); + + if (param_0 == 4) { + field_0x3010 = 2; + } else if (param_0 == 1) { + field_0x3010 = 0x3D; + } else { + field_0x3010 = 0x10; + } + + if (i_checkWolf()) { + setSingleAnimeWolfBaseSpeed(WANM_WAIT, daAlinkHIO_wlMove_c0::m.field_0x70, lit_6109); + } else { + setSingleAnimeBaseSpeed(ANM_WAIT, daAlinkHIO_move_c0::m.mWaitAnmSpeed, lit_6109); + } + + setGrassCancelStatus(0); + dComIfGp_setPlayerStatus1(0, 0x4000000); + return 1; } -#pragma pop /* 801120C8-801121B4 10CA08 00EC+00 1/0 0/0 0/0 .text procCoHorseCallWait__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoHorseCallWait() { +asm int daAlink_c::procCoHorseCallWait() { nofralloc #include "asm/d/a/d_a_alink/procCoHorseCallWait__9daAlink_cFv.s" } #pragma pop /* 801121B4-80112220 10CAF4 006C+00 1/0 0/0 0/0 .text procHawkCatchInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHawkCatchInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHawkCatchInit__9daAlink_cFv.s" +int daAlink_c::procHawkCatchInit() { + if (mProcID == PROC_HAWK_SUBJECT || !commonProcInitNotSameProc(PROC_HAWK_CATCH)) { + return 0; + } + + setSingleAnimeBase(ANM_HAWK_CATCH); + deleteEquipItem(0, 1); + return 1; } -#pragma pop /* 80112220-80112278 10CB60 0058+00 1/0 0/0 0/0 .text procHawkCatch__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHawkCatch() { - nofralloc -#include "asm/d/a/d_a_alink/procHawkCatch__9daAlink_cFv.s" +int daAlink_c::procHawkCatch() { + if (mUnderFrameCtrl[0].checkAnmEnd()) { + dComIfGp_evmng_cutEnd(field_0x3184); + procHawkSubjectInit(); + } + + return 1; } -#pragma pop /* 80112278-80112304 10CBB8 008C+00 2/2 0/0 0/0 .text procHawkSubjectInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHawkSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHawkSubjectInit__9daAlink_cFv.s" +int daAlink_c::procHawkSubjectInit() { + if (!commonProcInitNotSameProc(PROC_HAWK_SUBJECT)) { + return 0; + } + + setSingleAnimeBase(ANM_HAWK_WAIT); + + fopAc_ac_c* actor = (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchHawk, NULL); + if (actor != NULL) { + field_0x280c.setData(actor); + } + + mCommonCounter = 0; + field_0x59e = 0; + deleteEquipItem(0, 1); + return 1; } -#pragma pop /* 80112304-8011243C 10CC44 0138+00 1/0 0/0 0/0 .text procHawkSubject__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procHawkSubject() { +asm int daAlink_c::procHawkSubject() { nofralloc #include "asm/d/a/d_a_alink/procHawkSubject__9daAlink_cFv.s" } diff --git a/src/d/a/d_a_alink_wolf.inc b/src/d/a/d_a_alink_wolf.inc index 7beb3b7252e..46ef687f67c 100644 --- a/src/d/a/d_a_alink_wolf.inc +++ b/src/d/a/d_a_alink_wolf.inc @@ -68,20 +68,20 @@ void daAlink_c::setWolfDigStatus(u8 flag) { } /* 80127D68-80127DC4 1226A8 005C+00 4/4 0/0 0/0 .text checkWolfShapeReverse__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkWolfShapeReverse() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfShapeReverse__9daAlink_cCFv.s" +BOOL daAlink_c::checkWolfShapeReverse() const { + return ((mProcID == PROC_WOLF_SLIDE_READY || mProcID == PROC_WOLF_LOCK_ATTACK_TURN || + mProcID == PROC_WOLF_JUMP_AT_SLIDE_LAND) && + mCommonCounter != 0) || + mProcID == PROC_WOLF_SLIP_TURN_LAND || + (mProcID == PROC_WOLF_LARGE_DAMAGE_UP && field_0x3198 != 0) || + mProcID == PROC_WOLF_ROPE_TURN; } -#pragma pop /* 80127DC4-80127E08 122704 0044+00 1/1 0/0 0/0 .text checkWolfSideStep__9daAlink_cCFv */ BOOL daAlink_c::checkWolfSideStep() const { return field_0x2f98 != 0 && - ((mProcID == PROC_WOLF_ATN_AC_MOVE && !i_checkModeFlg(1)) || mProcID == PROC_WOLF_SIDESTEP_LAND || - mProcID == PROC_WOLF_BACKJUMP_LAND); + ((mProcID == PROC_WOLF_ATN_AC_MOVE && !i_checkModeFlg(1)) || + mProcID == PROC_WOLF_SIDESTEP_LAND || mProcID == PROC_WOLF_BACKJUMP_LAND); } /* 80127E08-80127F20 122748 0118+00 1/1 0/0 0/0 .text setWolfTailAngle__9daAlink_cFv */ @@ -124,7 +124,7 @@ asm void daAlink_c::setSpeedAndAngleWolfAtn() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfAtnWait() { +asm BOOL daAlink_c::checkWolfAtnWait() { nofralloc #include "asm/d/a/d_a_alink/checkWolfAtnWait__9daAlink_cFv.s" } @@ -154,14 +154,10 @@ asm void daAlink_c::setBlendWolfMoveAnime(f32 param_0) { /* 80128F0C-80128F5C 12384C 0050+00 2/2 0/0 0/0 .text checkWolfAtnMoveBack__9daAlink_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfAtnMoveBack(s16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfAtnMoveBack__9daAlink_cFs.s" +BOOL daAlink_c::checkWolfAtnMoveBack(s16 param_0) { + f32 cos = cM_scos(param_0); + return (field_0x2f98 != 1 && cos < lit_44003) || (field_0x2f98 == 1 && cos < lit_44004); } -#pragma pop /* 80128F5C-80129114 12389C 01B8+00 5/5 0/0 0/0 .text setWolfAtnMoveDirection__9daAlink_cFv */ #pragma push @@ -209,45 +205,29 @@ asm void daAlink_c::setDoubleAnimeWolf(f32 param_0, f32 param_1, f32 param_2, /* 80129678-801296A8 123FB8 0030+00 35/35 0/0 0/0 .text * setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSingleAnimeWolfBase(daAlink_c::daAlink_WANM param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM.s" +void daAlink_c::setSingleAnimeWolfBase(daAlink_c::daAlink_WANM i_anmID) { + setSingleAnimeWolf(i_anmID, lit_6040, FLOAT_LABEL(lit_6108), -1, lit_6109); } -#pragma pop /* 801296A8-801296D8 123FE8 0030+00 3/3 0/0 0/0 .text * setSingleAnimeWolfBaseMorf__9daAlink_cFQ29daAlink_c12daAlink_WANMf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSingleAnimeWolfBaseMorf(daAlink_c::daAlink_WANM param_0, f32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setSingleAnimeWolfBaseMorf__9daAlink_cFQ29daAlink_c12daAlink_WANMf.s" +void daAlink_c::setSingleAnimeWolfBaseMorf(daAlink_c::daAlink_WANM i_anmID, f32 i_morf) { + setSingleAnimeWolf(i_anmID, lit_6040, FLOAT_LABEL(lit_6108), -1, i_morf); } -#pragma pop /* 801296D8-80129704 124018 002C+00 44/44 0/0 0/0 .text * setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSingleAnimeWolfBaseSpeed(daAlink_c::daAlink_WANM param_0, f32 param_1, - f32 param_2) { - nofralloc -#include "asm/d/a/d_a_alink/setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff.s" +void daAlink_c::setSingleAnimeWolfBaseSpeed(daAlink_c::daAlink_WANM i_anmID, f32 i_speed, f32 i_morf) { + setSingleAnimeWolf(i_anmID, i_speed, FLOAT_LABEL(lit_6108), -1, i_morf); } -#pragma pop /* 80129704-80129848 124044 0144+00 29/29 0/0 0/0 .text * setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::setSingleAnimeWolf(daAlink_c::daAlink_WANM param_0, f32 param_1, f32 param_2, - s16 param_3, f32 param_4) { +asm void daAlink_c::setSingleAnimeWolf(daAlink_c::daAlink_WANM i_anmID, f32 i_speed, f32 i_start, + s16 i_endFrame, f32 i_morf) { nofralloc #include "asm/d/a/d_a_alink/setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf.s" } @@ -255,26 +235,37 @@ asm void daAlink_c::setSingleAnimeWolf(daAlink_c::daAlink_WANM param_0, f32 para /* 80129848-8012987C 124188 0034+00 53/53 0/0 0/0 .text * setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSingleAnimeWolfParam(daAlink_c::daAlink_WANM param_0, - daAlinkHIO_anm_c const* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c.s" +void daAlink_c::setSingleAnimeWolfParam(daAlink_c::daAlink_WANM i_anmID, + daAlinkHIO_anm_c const* i_anmData) { + setSingleAnimeWolf(i_anmID, i_anmData->mSpeed, i_anmData->mStartFrame, i_anmData->mEndFrame, i_anmData->mInterpolation); } -#pragma pop /* 8012987C-80129958 1241BC 00DC+00 5/5 0/0 0/0 .text checkWolfLandAction__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfLandAction(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfLandAction__9daAlink_cFi.s" +int daAlink_c::checkWolfLandAction(int param_0) { + f32 temp_f31 = lit_8782 * (mFallHeight - current.pos.y); + + if (checkNoLandDamageSlidePolygon() || temp_f31 < daAlinkHIO_wlDamFall_c0::m.field_0x2C) { + if (param_0 != 0) { + procWolfLandDamageInit(0); + } else if (mProcID == PROC_WOLF_JUMP_ATTACK || mProcID == PROC_WOLF_DASH_REVERSE) { + return 0; + } else { + procWolfLandInit(); + } + } else { + int var_r4; + if (temp_f31 < daAlinkHIO_wlDamFall_c0::m.field_0x30) { + var_r4 = 1; + } else { + var_r4 = 2; + } + + procWolfLandDamageInit(var_r4); + } + + return 1; } -#pragma pop /* 80129958-801299A8 124298 0050+00 1/1 0/0 1/1 .text checkMidnaUseAbility__9daAlink_cCFv */ @@ -292,6 +283,7 @@ void daAlink_c::checkWolfUseAbility() { if (checkMidnaLockJumpPoint() != NULL && !i_checkMidnaRide()) { offWolfEyeUp(); } else { + // event flag 0x4308: senses ability unlocked if (i_dComIfGs_isEventBit(0x4308) && field_0x2fd2 == 0 && !checkEventRun() && mWolfEyeUp < daAlinkHIO_wolf_c0::m.mSensesLingerTime && wolfSenseTrigger()) { if (mWolfEyeUp == 0) { @@ -326,7 +318,7 @@ int daAlink_c::checkWolfGroundSpecialMode() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkNextActionWolf(int param_0) { +asm int daAlink_c::checkNextActionWolf(int param_0) { nofralloc #include "asm/d/a/d_a_alink/checkNextActionWolf__9daAlink_cFi.s" } @@ -353,25 +345,41 @@ asm void daAlink_c::checkWolfAttackReverse(int param_0) { #pragma pop /* 8012A330-8012A41C 124C70 00EC+00 1/1 0/0 0/0 .text checkWolfBarrierHitReverse__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfBarrierHitReverse() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfBarrierHitReverse__9daAlink_cFv.s" +int daAlink_c::checkWolfBarrierHitReverse() { + if (field_0x3100 != 0 && mProcID != PROC_FRONT_ROLL_SUCCESS && mProcID != PROC_DAMAGE && + mProcID != PROC_WOLF_ATTACK_REVERSE && mProcID != PROC_WOLF_DASH_REVERSE) { + if (i_checkWolf()) { + return procWolfDashReverseInit(1); + } else if (mLinkAcch.ChkGroundHit()) { + if (cLib_distanceAngleS(shape_angle.y, field_0x3102) >= 0x4000) { + setFrontRollCrashShock(0); + return procDamageInit(NULL, 1); + } else { + return procFrontRollSuccessInit(); + } + } else { + setFrontRollCrashShock(0); + return procCoLargeDamageInit(-6, 1, 0, 0, NULL, 0); + } + } + + return 0; } -#pragma pop /* 8012A41C-8012A498 124D5C 007C+00 2/2 0/0 0/0 .text * checkWolfBarrierWallHit__9daAlink_cFR13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfBarrierWallHit(cBgS_PolyInfo& param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfBarrierWallHit__9daAlink_cFR13cBgS_PolyInfo.s" +bool daAlink_c::checkWolfBarrierWallHit(cBgS_PolyInfo& i_poly) { + if (field_0x3100 != 0 || checkZeroSpeedF()) { + return false; + } + + s16 bg_name = getMoveBGActorName(i_poly, 1); + if (bg_name == PROC_OBJ_TP || bg_name == PROC_OBJ_GB || bg_name == PROC_Obj_GanonWall2) { + return true; + } + + return false; } -#pragma pop /* 8012A498-8012ACCC 124DD8 0834+00 1/1 0/0 0/0 .text wolfBgCheck__9daAlink_cFv */ #pragma push @@ -385,14 +393,21 @@ asm void daAlink_c::wolfBgCheck() { /* 8012ACCC-8012AD1C 12560C 0050+00 1/1 0/0 0/0 .text changeWolfBlendRate__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::changeWolfBlendRate(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/changeWolfBlendRate__9daAlink_cFi.s" +void daAlink_c::changeWolfBlendRate(int param_0) { + if (checkWolfGrabAnime()) { + if (param_0 == 7) { + mNowAnmPackUpper[2].setRatio(FLOAT_LABEL(lit_6108)); + } else if (param_0 == 3) { + mNowAnmPackUpper[2].setRatio(lit_6040); + } + } else if (checkBarkAnime()) { + if (param_0 == 2) { + mNowAnmPackUpper[2].setRatio(FLOAT_LABEL(lit_6108)); + } else if (param_0 == 3) { + mNowAnmPackUpper[2].setRatio(lit_6040); + } + } } -#pragma pop /* 8012AD1C-8012B724 12565C 0A08+00 1/1 0/0 0/0 .text setWolfFootMatrix__9daAlink_cFv */ #pragma push @@ -418,7 +433,7 @@ asm void daAlink_c::wolfFootBgCheck() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfWaitSlipPolygon() { +asm BOOL daAlink_c::checkWolfWaitSlipPolygon() { nofralloc #include "asm/d/a/d_a_alink/checkWolfWaitSlipPolygon__9daAlink_cFv.s" } @@ -436,9 +451,7 @@ asm void daAlink_c::setWolfWaitSlip() { /* 8012C308-8012C30C 126C48 0004+00 4/4 0/0 0/0 .text checkWolfAtnDoCharge__9daAlink_cFv */ -void daAlink_c::checkWolfAtnDoCharge() { - /* empty function */ -} +void daAlink_c::checkWolfAtnDoCharge() {} /* 8012C30C-8012CB0C 126C4C 0800+00 1/1 0/0 0/0 .text setWolfChainPos__9daAlink_cFv */ #pragma push @@ -451,6 +464,23 @@ asm void daAlink_c::setWolfChainPos() { #pragma pop /* 8012CB0C-8012CBE4 12744C 00D8+00 1/1 0/0 0/0 .text setWolfAnmVoice__9daAlink_cFv */ +#ifdef NONMATCHING +void daAlink_c::setWolfAnmVoice() { + s8* var_r30 = field_0x2160; + + if (field_0x2fd8 >= 12 || field_0x215c == NULL) { + return; + } + + for (int i = 0; i < 4; i++) { + f32 temp_f31 = *var_r30; + if (*var_r30 != -1 && field_0x215c->checkPass(temp_f31)) { + voiceStart(label[field_0x2fd8]); + } + var_r30++; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -459,12 +489,13 @@ asm void daAlink_c::setWolfAnmVoice() { #include "asm/d/a/d_a_alink/setWolfAnmVoice__9daAlink_cFv.s" } #pragma pop +#endif /* 8012CBE4-8012CD28 127524 0144+00 4/4 0/0 0/0 .text procWolfServiceWaitInit__9daAlink_cFi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfServiceWaitInit(int param_0) { +asm int daAlink_c::procWolfServiceWaitInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfServiceWaitInit__9daAlink_cFi.s" } @@ -475,7 +506,7 @@ asm void daAlink_c::procWolfServiceWaitInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfServiceWait() { +asm int daAlink_c::procWolfServiceWait() { nofralloc #include "asm/d/a/d_a_alink/procWolfServiceWait__9daAlink_cFv.s" } @@ -483,90 +514,146 @@ asm void daAlink_c::procWolfServiceWait() { /* 8012CF68-8012CFEC 1278A8 0084+00 1/1 0/0 0/0 .text procWolfTiredWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfTiredWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfTiredWaitInit__9daAlink_cFv.s" +int daAlink_c::procWolfTiredWaitInit() { + if (checkWolfWaitSlipPolygon() && !checkInputOnR()) { + return procWolfWaitSlipInit(); + } + + if (!commonProcInitNotSameProc(PROC_WOLF_TIRED_WAIT)) { + return 0; + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + setSingleAnimeWolfBase(WANM_WAIT_TO_TIRED); + return 1; } -#pragma pop /* 8012CFEC-8012D050 12792C 0064+00 1/0 0/0 0/0 .text procWolfTiredWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfTiredWait() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfTiredWait__9daAlink_cFv.s" +int daAlink_c::procWolfTiredWait() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (!checkNextActionWolf(0) && frameCtrl->checkAnmEnd()) { + setSingleAnimeWolfBase(WANM_WAIT_TIRED); + } + + return 1; } -#pragma pop /* 8012D050-8012D104 127990 00B4+00 3/2 0/0 0/0 .text procWolfMidnaRideShockInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfMidnaRideShockInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfMidnaRideShockInit__9daAlink_cFv.s" +int daAlink_c::procWolfMidnaRideShockInit() { + if (!i_checkWolf()) { + dComIfGp_evmng_cutEnd(field_0x3184); + return procWaitInit(); + } + + if (!commonProcInitNotSameProc(PROC_WOLF_MIDNA_RIDE_SHOCK)) { + return 0; + } + + setSingleAnimeWolfBase(WANM_MIDNA_SHOCK); + setFaceBasicTexture(FTANM_UNK_9F); + + voiceStart(Z2SE_WL_V_MD_SHOCK); + mNormalSpeed = FLOAT_LABEL(lit_6108); + current.angle.y = shape_angle.y; + + return 1; } -#pragma pop /* 8012D104-8012D1A8 127A44 00A4+00 1/0 0/0 0/0 .text procWolfMidnaRideShock__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfMidnaRideShock() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfMidnaRideShock__9daAlink_cFv.s" +int daAlink_c::procWolfMidnaRideShock() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (frameCtrl->checkAnmEnd()) { + if (mDemo.getDemoMode() == 0x32) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else { + checkNextActionWolf(0); + } + } else if (frameCtrl->getFrame() > lit_17382 && mDemo.getDemoMode() != 0x32) { + checkNextActionWolf(1); + } + + return 1; } -#pragma pop /* 8012D1A8-8012D2A8 127AE8 0100+00 13/13 0/0 0/0 .text procWolfWaitInit__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfWaitInit() { +asm int daAlink_c::procWolfWaitInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfWaitInit__9daAlink_cFv.s" } #pragma pop /* 8012D2A8-8012D380 127BE8 00D8+00 1/0 0/0 0/0 .text procWolfWait__9daAlink_cFv */ +// matches with literals +#ifdef NONMATCHING +int daAlink_c::procWolfWait() { + s16 old_shapeangle = shape_angle.y; + + if (!checkNextActionWolf(0) && !checkFrontWallTypeAction()) { + field_0x33f0 = (s16)(shape_angle.y - old_shapeangle) * lit_15460; + setBlendWolfMoveAnime(lit_6041); + + if (checkServiceWaitMode()) { + field_0x30ca--; + + if (field_0x30ca == 0) { + procWolfServiceWaitInit(0); + } + } else { + initServiceWaitTime(); + } + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfWait() { +asm int daAlink_c::procWolfWait() { nofralloc #include "asm/d/a/d_a_alink/procWolfWait__9daAlink_cFv.s" } #pragma pop +#endif /* 8012D380-8012D3E4 127CC0 0064+00 2/2 0/0 0/0 .text procWolfMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfMoveInit__9daAlink_cFv.s" +int daAlink_c::procWolfMoveInit() { + if (!commonProcInitNotSameProc(PROC_WOLF_MOVE)) { + return 0; + } + + setBlendWolfMoveAnime(daAlinkHIO_wlMove_c0::m.field_0x94); + setFootEffectProcType(3); + + return 1; } -#pragma pop /* 8012D3E4-8012D474 127D24 0090+00 1/0 0/0 0/0 .text procWolfMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfMove() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfMove__9daAlink_cFv.s" +int daAlink_c::procWolfMove() { + if (!checkNextActionWolf(0) && !checkFrontWallTypeAction()) { + if (mDemo.getDemoMode() == 2) { + if (mNormalSpeed > field_0x594 * daAlinkHIO_wlMoveNoP_c0::m.field_0x28) { + mNormalSpeed = field_0x594 * daAlinkHIO_wlMoveNoP_c0::m.field_0x28; + } + } + + setBlendWolfMoveAnime(lit_6041); + field_0x30a2 = field_0x2fec; + } + + return 1; } -#pragma pop /* 8012D474-8012D590 127DB4 011C+00 1/1 0/0 0/0 .text procWolfDashInit__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfDashInit() { +asm int daAlink_c::procWolfDashInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfDashInit__9daAlink_cFv.s" } @@ -576,7 +663,7 @@ asm void daAlink_c::procWolfDashInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfDash() { +asm int daAlink_c::procWolfDash() { nofralloc #include "asm/d/a/d_a_alink/procWolfDash__9daAlink_cFv.s" } @@ -586,7 +673,7 @@ asm void daAlink_c::procWolfDash() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfDashReverseInit(int param_0) { +asm int daAlink_c::procWolfDashReverseInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfDashReverseInit__9daAlink_cFi.s" } @@ -597,49 +684,89 @@ asm void daAlink_c::procWolfDashReverseInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfDashReverse() { +asm int daAlink_c::procWolfDashReverse() { nofralloc #include "asm/d/a/d_a_alink/procWolfDashReverse__9daAlink_cFv.s" } #pragma pop /* 8012DBA8-8012DC44 1284E8 009C+00 1/1 0/0 0/0 .text procWolfAtnActorMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfAtnActorMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfAtnActorMoveInit__9daAlink_cFv.s" +int daAlink_c::procWolfAtnActorMoveInit() { + if (!commonProcInitNotSameProc(PROC_WOLF_ATN_AC_MOVE)) { + return 0; + } + + if (checkZeroSpeedF()) { + onModeFlg(1); + } + + setWolfAtnMoveDirection(); + setBlendWolfAtnMoveAnime(daAlinkHIO_wlMove_c0::m.field_0x94); + + if (checkWolfAtnWait()) { + voiceStartLevel(Z2SE_WL_V_ROAR); + } + + return 1; } -#pragma pop /* 8012DC44-8012DD08 128584 00C4+00 1/0 0/0 0/0 .text procWolfAtnActorMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfAtnActorMove() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfAtnActorMove__9daAlink_cFv.s" +int daAlink_c::procWolfAtnActorMove() { + setWolfAtnMoveDirection(); + + if (!checkNextActionWolf(0)) { + if (checkZeroSpeedF()) { + onModeFlg(1); + + if (checkWolfWaitSlipPolygon() && !checkInputOnR()) { + return procWolfWaitSlipInit(); + } + } else { + offModeFlg(1); + } + + setBlendWolfAtnMoveAnime(lit_6041); + + if (checkWolfAtnWait()) { + voiceStartLevel(Z2SE_WL_V_ROAR); + } + } + + return 1; } -#pragma pop /* 8012DD08-8012DDB4 128648 00AC+00 1/1 0/0 0/0 .text procWolfWaitTurnInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfWaitTurnInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfWaitTurnInit__9daAlink_cFv.s" +int daAlink_c::procWolfWaitTurnInit() { + if (!commonProcInitNotSameProc(PROC_WOLF_WAIT_TURN)) { + return 0; + } + + f32 var_f1; + if (checkWolfDashMode()) { + var_f1 = daAlinkHIO_wlMove_c0::m.field_0x74; + } else { + var_f1 = daAlinkHIO_wlMoveNoP_c0::m.field_0x18; + } + + setSingleAnimeWolfBaseSpeed(WANM_WALK_A, var_f1, daAlinkHIO_wlMove_c0::m.field_0x94); + + if (checkEventRun()) { + mNormalSpeed = FLOAT_LABEL(lit_6108); + } + + field_0x300e = field_0x2fe2; + current.angle.y = shape_angle.y; + + return 1; } -#pragma pop /* 8012DDB4-8012DEC8 1286F4 0114+00 1/0 0/0 0/0 .text procWolfWaitTurn__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfWaitTurn() { +asm int daAlink_c::procWolfWaitTurn() { nofralloc #include "asm/d/a/d_a_alink/procWolfWaitTurn__9daAlink_cFv.s" } @@ -650,7 +777,7 @@ asm void daAlink_c::procWolfWaitTurn() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfSideStepInit(int param_0) { +asm int daAlink_c::procWolfSideStepInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfSideStepInit__9daAlink_cFi.s" } @@ -660,90 +787,169 @@ asm void daAlink_c::procWolfSideStepInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfSideStep() { +asm int daAlink_c::procWolfSideStep() { nofralloc #include "asm/d/a/d_a_alink/procWolfSideStep__9daAlink_cFv.s" } #pragma pop /* 8012E1E8-8012E2DC 128B28 00F4+00 1/1 0/0 0/0 .text procWolfSideStepLandInit__9daAlink_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSideStepLandInit(s16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSideStepLandInit__9daAlink_cFs.s" +int daAlink_c::procWolfSideStepLandInit(s16 param_0) { + commonProcInit(PROC_WOLF_SIDESTEP_LAND); + + if (field_0x2f98 == 1) { + setSingleAnimeWolfParam(WANM_BACK_JUMP_END, &daAlinkHIO_wlSideStep_c0::m.field_0x3C); + field_0x3478 = daAlinkHIO_wlSideStep_c0::m.field_0x3C.mCheckFrame; + field_0x2fcc = 10; + } else { + field_0x2fcc = 0; + setSingleAnimeWolfParam(field_0x2f98 == 2 ? WANM_SIDE_JUMP_LEFT_END : WANM_SIDE_JUMP_RIGHT_END, &daAlinkHIO_wlSideStep_c0::m.field_0x14); + field_0x3478 = daAlinkHIO_wlSideStep_c0::m.field_0x14.mCheckFrame; + } + + field_0x3012 = param_0; + field_0x2f9d = 4; + setFootEffectProcType(2); + i_onResetFlg1(0xC); + mNormalSpeed = FLOAT_LABEL(lit_6108); + setStepLandVibration(); + + return 1; } -#pragma pop /* 8012E2DC-8012E398 128C1C 00BC+00 1/0 0/0 0/0 .text procWolfSideStepLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSideStepLand() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSideStepLand__9daAlink_cFv.s" +int daAlink_c::procWolfSideStepLand() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (field_0x2fcc != 0) { + field_0x2fcc = 10; + } + + setWolfAtnMoveDirection(); + checkWolfAtnDoCharge(); + + if (frameCtrl->checkAnmEnd()) { + if (mDemo.getDemoMode() == 0x10) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else { + checkNextActionWolf(0); + } + } else if (frameCtrl->getFrame() > field_0x3478) { + checkNextActionWolf(1); + } + + return 1; } -#pragma pop /* 8012E398-8012E508 128CD8 0170+00 3/3 0/0 0/0 .text procWolfBackJumpInit__9daAlink_cFi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfBackJumpInit(int param_0) { +asm int daAlink_c::procWolfBackJumpInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfBackJumpInit__9daAlink_cFi.s" } #pragma pop /* 8012E508-8012E5F4 128E48 00EC+00 1/0 0/0 0/0 .text procWolfBackJump__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfBackJump() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfBackJump__9daAlink_cFv.s" +int daAlink_c::procWolfBackJump() { + cLib_addCalcAngleS(&shape_angle.y, mCommonCounter, + daAlinkHIO_wlAtnMove_c0::m.field_0x4, + daAlinkHIO_wlAtnMove_c0::m.field_0x0, + daAlinkHIO_wlAtnMove_c0::m.field_0x2); + current.angle.y = shape_angle.y - -0x8000; + + if (field_0x3010 != 0) { + checkWolfAtnDoCharge(); + } + + backJumpSpeedDec(); + + if (mUnderFrameCtrl[0].checkAnmEnd() && mLinkAcch.ChkGroundHit()) { + procWolfBackJumpLandInit(field_0x3012, field_0x3010); + } else if (mDemo.getDemoMode() != 0x10 && current.pos.y < mLastJumpPos.y - daAlinkHIO_wlBackJump_c0::m.field_0x30) { + field_0x2f98 = 0; + procWolfFallInit(2, daAlinkHIO_wlBackJump_c0::m.field_0x34); + } + + return 1; } -#pragma pop /* 8012E5F4-8012E684 128F34 0090+00 1/1 0/0 0/0 .text procWolfBackJumpLandInit__9daAlink_cFss */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfBackJumpLandInit(s16 param_0, s16 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfBackJumpLandInit__9daAlink_cFss.s" +int daAlink_c::procWolfBackJumpLandInit(s16 param_0, s16 param_1) { + commonProcInit(PROC_WOLF_BACKJUMP_LAND); + setSingleAnimeWolfParam(WANM_BACKFLIP_END, &daAlinkHIO_wlBackJump_c0::m.field_0x14); + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x2f9d = 4; + setFootEffectProcType(2); + field_0x2fcc = 10; + field_0x3012 = param_0; + field_0x3010 = param_1; + setStepLandVibration(); + + return 1; } -#pragma pop /* 8012E684-8012E754 128FC4 00D0+00 1/0 0/0 0/0 .text procWolfBackJumpLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfBackJumpLand() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfBackJumpLand__9daAlink_cFv.s" +int daAlink_c::procWolfBackJumpLand() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (field_0x2fcc != 0) { + field_0x2fcc = 10; + } + + setWolfAtnMoveDirection(); + + if (field_0x3010 != 0) { + checkWolfAtnDoCharge(); + } + + if (frameCtrl->checkAnmEnd()) { + if (mDemo.getDemoMode() == 0x10) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else { + checkNextActionWolf(0); + } + } else if (frameCtrl->getFrame() > daAlinkHIO_wlBackJump_c0::m.field_0x14.mCheckFrame) { + checkNextActionWolf(1); + } + + return 1; } -#pragma pop /* 8012E754-8012E83C 129094 00E8+00 2/2 0/0 0/0 .text procWolfHowlInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfHowlInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfHowlInit__9daAlink_cFi.s" +int daAlink_c::procWolfHowlInit(int param_0) { + if (checkEventRun() && mProcID == PROC_WOLF_HOWL) { + return 0; + } + + commonProcInit(PROC_WOLF_HOWL); + + if (param_0 != 0) { + setSingleAnimeWolfParam(WANM_HOWL_SIT, &daAlinkHIO_wlHowl_c0::m.field_0x14); + onModeFlg(0x800000); + field_0x3478 = daAlinkHIO_wlHowl_c0::m.field_0x14.mCheckFrame; + field_0x300e = 1; + } else { + setSingleAnimeWolfParam(WANM_HOWL, &daAlinkHIO_wlHowl_c0::m.field_0x0); + field_0x3478 = daAlinkHIO_wlHowl_c0::m.field_0x0.mCheckFrame; + field_0x300e = 0; + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + mCommonCounter = 0; + + return 1; } -#pragma pop /* 8012E83C-8012E9C8 12917C 018C+00 1/0 0/0 0/0 .text procWolfHowl__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfHowl() { +asm int daAlink_c::procWolfHowl() { nofralloc #include "asm/d/a/d_a_alink/procWolfHowl__9daAlink_cFv.s" } @@ -754,7 +960,7 @@ asm void daAlink_c::procWolfHowl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfAutoJumpInit(int param_0) { +asm int daAlink_c::procWolfAutoJumpInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfAutoJumpInit__9daAlink_cFi.s" } @@ -764,7 +970,7 @@ asm void daAlink_c::procWolfAutoJumpInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfAutoJump() { +asm int daAlink_c::procWolfAutoJump() { nofralloc #include "asm/d/a/d_a_alink/procWolfAutoJump__9daAlink_cFv.s" } @@ -775,7 +981,7 @@ asm void daAlink_c::procWolfAutoJump() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfFallInit(int param_0, f32 param_1) { +asm int daAlink_c::procWolfFallInit(int param_0, f32 param_1) { nofralloc #include "asm/d/a/d_a_alink/procWolfFallInit__9daAlink_cFif.s" } @@ -785,88 +991,161 @@ asm void daAlink_c::procWolfFallInit(int param_0, f32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfFall() { +asm int daAlink_c::procWolfFall() { nofralloc #include "asm/d/a/d_a_alink/procWolfFall__9daAlink_cFv.s" } #pragma pop /* 8012F138-8012F1F0 129A78 00B8+00 2/2 0/0 0/0 .text procWolfLandInit__9daAlink_cFv */ +// matches with literals +#ifdef NONMATCHING +int daAlink_c::procWolfLandInit() { + commonProcInit(PROC_WOLF_LAND); + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_02f99 = 12; + + setSingleWolfAnimeParam(WANM_JUMP_ATTACK_END, &daAlinkHIO_wlAutoJump_c0::m.field_0x14); + field_0x3478 = daAlinkHIO_wlAutoJump_c0::m.field_0x14.mCheckFrame; + mCommonCounter = 1; + + field_0x2f9d = 4; + setFootEffectProcType(4); + + dComIfGp_getVibration().StartShock(cXyz(0.0f, 1.0f, 0.0f)); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfLandInit() { +asm int daAlink_c::procWolfLandInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfLandInit__9daAlink_cFv.s" } #pragma pop +#endif /* 8012F1F0-8012F278 129B30 0088+00 1/0 0/0 0/0 .text procWolfLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfLand() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfLand__9daAlink_cFv.s" +int daAlink_c::procWolfLand() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (mCommonCounter != 0) { + field_0x2f99 = 4; + } + + if (frameCtrl->checkAnmEnd()) { + checkNextActionWolf(0); + } else if (frameCtrl->getFrame() > field_0x3478) { + checkNextActionWolf(1); + } + + return 1; } -#pragma pop /* 8012F278-8012F358 129BB8 00E0+00 1/1 0/0 0/0 .text procWolfSitInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSitInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSitInit__9daAlink_cFi.s" +int daAlink_c::procWolfSitInit(int param_0) { + if (!commonProcInitNotSameProc(PROC_WOLF_SIT)) { + return 0; + } + + if (param_0 != 0 && !checkUnderMove0BckNoArcWolf(WANM_WAIT_SIT) && !checkUnderMove0BckNoArcWolf(WANM_HOWL_SIT)) { + setSingleAnimeWolfParam(WANM_SIT, &daAlinkHIO_wlLie_c0::m.field_0x0); + field_0x3198 = 0; + } else { + field_0x3198 = 1; + + if (!checkUnderMove0BckNoArcWolf(WANM_WAIT_SIT)) { + setSingleAnimeWolfBaseSpeed(WANM_WAIT_SIT, daAlinkHIO_wlLie_c0::m.field_0x44, daAlinkHIO_wlLie_c0::m.field_0x48); + } + } + + current.angle.y = shape_angle.y; + + return 1; } -#pragma pop /* 8012F358-8012F41C 129C98 00C4+00 1/0 0/0 0/0 .text procWolfSit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSit__9daAlink_cFv.s" +int daAlink_c::procWolfSit() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), checkWolfDashMode() ? + daAlinkHIO_wlMove_c0::m.field_0x6C : + daAlinkHIO_wlMoveNoP_c0::m.field_0x10); + + if (!spActionButton() && mDemo.getDemoMode() != 0xF) { + checkNextActionWolfFromLie(); + } else if (frameCtrl->checkAnmEnd()) { + setSingleAnimeWolfBaseSpeed(WANM_WAIT_SIT, daAlinkHIO_wlLie_c0::m.field_0x44, daAlinkHIO_wlLie_c0::m.field_0x48); + field_0x3198 = 1; + } + + return 1; } -#pragma pop /* 8012F41C-8012F500 129D5C 00E4+00 1/1 0/0 0/0 .text procWolfStepMoveInit__9daAlink_cFv */ +// matches with literals +#ifdef NONMATCHING +int daAlink_c::procWolfStepMoveInit() { + commonProcInit(PROC_WOLF_STEP_MOVE); + setSingleAnimeWolfParam(WANM_BUMP_START, &daAlinkHIO_wlWallHang_c0::m.field_0x50); + field_0x3478 = 0.5f * mNormalSpeed; + mNormalSpeed = 0.0f; + mCommonCounter = 0; + + field_0x3588 = l_wolfBaseAnime; + current.pos.x -= cM_ssin(shape_angle.y) * 10.0f; + current.pos.z -= cM_scos(shape_angle.y) * 10.0f; + + field_0x2060->getOldFrameTransInfo(0)->mTranslate.z += 10.0f; + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfStepMoveInit() { +asm int daAlink_c::procWolfStepMoveInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfStepMoveInit__9daAlink_cFv.s" } #pragma pop +#endif /* 8012F500-8012F634 129E40 0134+00 1/0 0/0 0/0 .text procWolfStepMove__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfStepMove() { +asm int daAlink_c::procWolfStepMove() { nofralloc #include "asm/d/a/d_a_alink/procWolfStepMove__9daAlink_cFv.s" } #pragma pop /* 8012F634-8012F6EC 129F74 00B8+00 1/1 0/0 0/0 .text procWolfSlipInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlipInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlipInit__9daAlink_cFv.s" +int daAlink_c::procWolfSlipInit() { + commonProcInit(PROC_WOLF_SLIP); + setSingleAnimeWolfParam(WANM_SLIP, &daAlinkHIO_wlMove_c0::m.field_0x0); + + if (checkWolfDashMode()) { + mNormalSpeed = mSpeedF * daAlinkHIO_wlMove_c0::m.field_0xA4; + } else { + mNormalSpeed = mSpeedF * daAlinkHIO_wlMoveNoP_c0::m.field_0x3C; + } + + current.angle.y = shape_angle.y; + field_0x3588 = l_wolfBaseAnime; + setFootEffectProcType(1); + + return 1; } -#pragma pop /* 8012F6EC-8012F840 12A02C 0154+00 1/0 0/0 0/0 .text procWolfSlip__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfSlip() { +asm int daAlink_c::procWolfSlip() { nofralloc #include "asm/d/a/d_a_alink/procWolfSlip__9daAlink_cFv.s" } @@ -877,7 +1156,7 @@ asm void daAlink_c::procWolfSlip() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfSlipTurnInit(int param_0) { +asm int daAlink_c::procWolfSlipTurnInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfSlipTurnInit__9daAlink_cFi.s" } @@ -887,38 +1166,52 @@ asm void daAlink_c::procWolfSlipTurnInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfSlipTurn() { +asm int daAlink_c::procWolfSlipTurn() { nofralloc #include "asm/d/a/d_a_alink/procWolfSlipTurn__9daAlink_cFv.s" } #pragma pop /* 8012FB18-8012FBB4 12A458 009C+00 1/1 0/0 0/0 .text procWolfSlipTurnLandInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlipTurnLandInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlipTurnLandInit__9daAlink_cFv.s" +int daAlink_c::procWolfSlipTurnLandInit() { + commonProcInit(PROC_WOLF_SLIP_TURN_LAND); + + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + setFrameCtrl(frameCtrl, 0, 0, + daAlinkHIO_wlMove_c0::m.field_0x14.mEndFrame, + daAlinkHIO_wlMove_c0::m.field_0x14.mSpeed, + frameCtrl->getFrame() + daAlinkHIO_wlMove_c0::m.field_0x14.mSpeed); + + mNormalSpeed = lit_19379 * daAlinkHIO_wlMoveNoP_c0::m.field_0x8; + field_0x2f99 = 5; + setFootEffectProcType(2); + field_0x2f9d = 8; + field_0x2f98 = 0; + + return 1; } -#pragma pop /* 8012FBB4-8012FC38 12A4F4 0084+00 1/0 0/0 0/0 .text procWolfSlipTurnLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlipTurnLand() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlipTurnLand__9daAlink_cFv.s" +int daAlink_c::procWolfSlipTurnLand() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + field_0x2f99 = 5; + + if (frameCtrl->checkAnmEnd()) { + checkNextActionWolf(0); + } else if (frameCtrl->getFrame() > daAlinkHIO_wlMove_c0::m.field_0x14.mCheckFrame) { + checkNextActionWolf(1); + } + + return 1; } -#pragma pop /* 8012FC38-8012FD2C 12A578 00F4+00 2/2 0/0 0/0 .text procWolfSlideReadyInit__9daAlink_cFsi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfSlideReadyInit(s16 param_0, int param_1) { +asm int daAlink_c::procWolfSlideReadyInit(s16 param_0, int param_1) { nofralloc #include "asm/d/a/d_a_alink/procWolfSlideReadyInit__9daAlink_cFsi.s" } @@ -928,7 +1221,7 @@ asm void daAlink_c::procWolfSlideReadyInit(s16 param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfSlideReady() { +asm int daAlink_c::procWolfSlideReady() { nofralloc #include "asm/d/a/d_a_alink/procWolfSlideReady__9daAlink_cFv.s" } @@ -938,7 +1231,7 @@ asm void daAlink_c::procWolfSlideReady() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfSlideInit(s16 param_0, int param_1) { +asm int daAlink_c::procWolfSlideInit(s16 param_0, int param_1) { nofralloc #include "asm/d/a/d_a_alink/procWolfSlideInit__9daAlink_cFsi.s" } @@ -948,7 +1241,7 @@ asm void daAlink_c::procWolfSlideInit(s16 param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfSlide() { +asm int daAlink_c::procWolfSlide() { nofralloc #include "asm/d/a/d_a_alink/procWolfSlide__9daAlink_cFv.s" } @@ -956,75 +1249,102 @@ asm void daAlink_c::procWolfSlide() { /* 801300D4-80130138 12AA14 0064+00 1/1 0/0 0/0 .text procWolfSlideLandInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlideLandInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlideLandInit__9daAlink_cFv.s" +int daAlink_c::procWolfSlideLandInit() { + commonProcInit(PROC_WOLF_SLIDE_LAND); + setSingleAnimeWolfParam(WANM_SLIDE_BACKWARD_END, &daAlinkHIO_wlSlide_c0::m.field_0x28); + mNormalSpeed *= lit_5943; + field_0x814.SetWeight(0xFF); + + return 1; } -#pragma pop /* 80130138-801301E4 12AA78 00AC+00 1/0 0/0 0/0 .text procWolfSlideLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlideLand() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlideLand__9daAlink_cFv.s" +int daAlink_c::procWolfSlideLand() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), lit_7450); + + if (frameCtrl->checkAnmEnd()) { + current.angle.y = shape_angle.y; + checkNextActionWolf(0); + } else if (frameCtrl->getFrame() > daAlinkHIO_wlSlide_c0::m.field_0x28.mCheckFrame) { + s16 old_angle = current.angle.y; + current.angle.y = shape_angle.y; + + if (!checkNextActionWolf(1)) { + current.angle.y = old_angle; + } + } + + return 1; } -#pragma pop /* 801301E4-80130268 12AB24 0084+00 3/3 0/0 0/0 .text procWolfWaitSlipInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfWaitSlipInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfWaitSlipInit__9daAlink_cFv.s" +int daAlink_c::procWolfWaitSlipInit() { + if (!commonProcInitNotSameProc(PROC_WOLF_WAIT_SLIP)) { + return 0; + } + + setSingleAnimeWolfBaseSpeed(WANM_ATN, daAlinkHIO_wlMove_c0::m.field_0xB8, daAlinkHIO_wlMove_c0::m.field_0xBC); + mNormalSpeed = FLOAT_LABEL(lit_6108); + setWolfWaitSlip(); + field_0x2f9d = 120; + setFootEffectProcType(1); + + return 1; } -#pragma pop /* 80130268-80130440 12ABA8 01D8+00 1/0 0/0 0/0 .text procWolfWaitSlip__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfWaitSlip() { +asm int daAlink_c::procWolfWaitSlip() { nofralloc #include "asm/d/a/d_a_alink/procWolfWaitSlip__9daAlink_cFv.s" } #pragma pop /* 80130440-801304D4 12AD80 0094+00 2/2 0/0 0/0 .text procWolfSlopeStartInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlopeStartInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlopeStartInit__9daAlink_cFi.s" +int daAlink_c::procWolfSlopeStartInit(int param_0) { + commonProcInit(PROC_WOLF_SLOPE_START); + setSingleAnimeWolfParam(WANM_SLIDE_W, &daAlinkHIO_wlSlide_c0::m.field_0x3C); + field_0x3588 = l_wolfBaseAnime; + mNormalSpeed = FLOAT_LABEL(lit_6108); + current.angle.y = shape_angle.y; + + if (param_0) { + field_0x2f99 = 13; + } + + return 1; } -#pragma pop /* 801304D4-8013056C 12AE14 0098+00 1/0 0/0 0/0 .text procWolfSlopeStart__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlopeStart() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlopeStart__9daAlink_cFv.s" +int daAlink_c::procWolfSlopeStart() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (frameCtrl->checkAnmEnd()) { + checkNextActionWolf(0); + } else if (frameCtrl->getFrame() > daAlinkHIO_wlSlide_c0::m.field_0x3C.mCheckFrame) { + if (!checkNextActionWolf(1)) { + field_0x2f99 = 5; + } + } else { + field_0x2f99 = 5; + } + + return 1; } -#pragma pop /* 8013056C-80130580 12AEAC 0014+00 1/1 0/0 0/0 .text daAlink_searchGoldWolf__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchGoldWolf(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchGoldWolf__FP10fopAc_ac_cPv.s" +static fopAc_ac_c* daAlink_searchGoldWolf(fopAc_ac_c* i_actor, void*) { + if (fopAcM_GetName(i_actor) == PROC_NPC_GWOLF) { + return i_actor; + } + + return NULL; } -#pragma pop /* 80130580-80130654 12AEC0 00D4+00 1/1 0/0 0/0 .text daAlink_searchWolfHowl__FP10fopAc_ac_cPv */ #pragma push @@ -1038,21 +1358,32 @@ static asm void daAlink_searchWolfHowl(fopAc_ac_c* param_0, void* param_1) { /* 80130654-80130700 12AF94 00AC+00 1/1 0/0 0/0 .text setWolfHowlNotHappen__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfHowlNotHappen(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setWolfHowlNotHappen__9daAlink_cFi.s" +void daAlink_c::setWolfHowlNotHappen(int param_0) { + mMsgClassID = -1; + + if (field_0x3198 == 0xEE) { + field_0x32cc = 0x532; + } else { + field_0x32cc = 0x535; + } + + mCommonCounter = 0; + + if (!checkUnderMove0BckNoArcWolf(WANM_HOWL_END)) { + if (param_0 != 0) { + setSingleAnimeWolfBaseSpeed(WANM_WAIT_SIT, daAlinkHIO_wlLie_c0::m.field_0x44, daAlinkHIO_wlLie_c0::m.field_0x48); + } else { + setSingleAnimeWolfBase(WANM_SERVICE_WAIT_D); + } + } } -#pragma pop /* 80130700-80130BC4 12B040 04C4+00 1/1 0/0 0/0 .text procWolfHowlDemoInit__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfHowlDemoInit() { +asm int daAlink_c::procWolfHowlDemoInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfHowlDemoInit__9daAlink_cFv.s" } @@ -1062,7 +1393,7 @@ asm void daAlink_c::procWolfHowlDemoInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfHowlDemo() { +asm int daAlink_c::procWolfHowlDemo() { nofralloc #include "asm/d/a/d_a_alink/procWolfHowlDemo__9daAlink_cFv.s" } @@ -1080,38 +1411,16 @@ asm void daObj_Sekizoa_c::setWolfHowling() { #pragma pop /* 80131408-80131450 12BD48 0048+00 1/0 0/0 0/0 .text checkWolfRope__9daAlink_cFv */ -#ifdef NONMATCHING -bool daAlink_c::checkWolfRope() { - bool ret = false; - bool bvar1 = false; - - if (i_checkModeFlg(MODE_UNK_20000) && field_0x280c.getActor() != NULL) { - bvar1 = true; - } - - // actor is Crope - if (bvar1 && fopAcM_GetName(field_0x280c.getActor()) == 0x2BE) { - ret = true; - } - return ret; +BOOL daAlink_c::checkWolfRope() { + return i_checkModeFlg(0x20000) && field_0x280c.getActor() != NULL && fopAcM_GetName(field_0x280c.getActor()) == PROC_Obj_Crope; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkWolfRope() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfRope__9daAlink_cFv.s" -} -#pragma pop -#endif /* 80131450-80131628 12BD90 01D8+00 2/2 0/0 0/0 .text * checkWolfRopeHit__9daAlink_cCFP12dCcD_GObjInfPC4cXyzi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfRopeHit(dCcD_GObjInf* param_0, cXyz const* param_1, +asm fopAc_ac_c* daAlink_c::checkWolfRopeHit(dCcD_GObjInf* param_0, cXyz const* param_1, int param_2) const { nofralloc #include "asm/d/a/d_a_alink/checkWolfRopeHit__9daAlink_cCFP12dCcD_GObjInfPC4cXyzi.s" @@ -1120,45 +1429,71 @@ asm void daAlink_c::checkWolfRopeHit(dCcD_GObjInf* param_0, cXyz const* param_1, /* 80131628-801316A4 12BF68 007C+00 2/2 0/0 0/0 .text checkWolfRopeJumpHang__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfRopeJumpHang() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfRopeJumpHang__9daAlink_cFv.s" +int daAlink_c::checkWolfRopeJumpHang() { + fopAc_ac_c* hit_actor = checkWolfRopeHit(&field_0x850[0], ¤t.pos, 1); + if (hit_actor == NULL) { + hit_actor = checkWolfRopeHit(&field_0xFB8, ¤t.pos, 1); + } + + if (hit_actor != NULL) { + field_0x280c.setData(hit_actor); + return procWolfRopeHangInit(4); + } + + return 0; } -#pragma pop /* 801316A4-80131718 12BFE4 0074+00 1/1 0/0 0/0 .text getWolfRopeMoveSpeed__9daAlink_cFv */ +// matches with literals +#ifdef NONMATCHING +f32 daAlink_c::getWolfRopeMoveSpeed() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + f32 frame = frameCtrl->getFrame(); + + if (frame >= 13.5f) { + frame -= 13.5f; + } + + return daAlinkHIO_wlRope_c0::m.field_0x24 * frameCtrl->getRate() * cM_fsin(0.2327106f * frame); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getWolfRopeMoveSpeed() { +asm f32 daAlink_c::getWolfRopeMoveSpeed() { nofralloc #include "asm/d/a/d_a_alink/getWolfRopeMoveSpeed__9daAlink_cFv.s" } #pragma pop +#endif /* 80131718-801319F0 12C058 02D8+00 6/6 0/0 0/0 .text setWolfRopePosY__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::setWolfRopePosY() { +asm int daAlink_c::setWolfRopePosY() { nofralloc #include "asm/d/a/d_a_alink/setWolfRopePosY__9daAlink_cFv.s" } #pragma pop /* 801319F0-80131A6C 12C330 007C+00 5/5 0/0 0/0 .text initWolfRopeShapeAngle__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initWolfRopeShapeAngle() { - nofralloc -#include "asm/d/a/d_a_alink/initWolfRopeShapeAngle__9daAlink_cFv.s" +s16 daAlink_c::initWolfRopeShapeAngle() { + fopAc_ac_c* actor = field_0x280c.getActor(); + int a = abs((s16)(actor->shape_angle.y - shape_angle.y)); + + s16 angle; + if (a < 0x4000) { + shape_angle.y = actor->shape_angle.y; + angle = actor->shape_angle.x; + } else { + shape_angle.y = actor->shape_angle.y - -0x8000; + angle = -actor->shape_angle.x; + } + + return angle; } -#pragma pop /* 80131A6C-80131AFC 12C3AC 0090+00 5/5 0/0 0/0 .text wolfRopeSwingInc__9daAlink_cFf */ #pragma push @@ -1182,21 +1517,30 @@ asm void daAlink_c::setWolfRopeOffsetY(int param_0) { /* 80131C00-80131C74 12C540 0074+00 2/2 0/0 0/0 .text getDirectionRopeMove__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getDirectionRopeMove() const { - nofralloc -#include "asm/d/a/d_a_alink/getDirectionRopeMove__9daAlink_cCFv.s" +int daAlink_c::getDirectionRopeMove() const { + s16 angle = field_0x2fe2 - shape_angle.y; + + if (abs(angle) > 0x5000) { + return DIR_BACKWARD; + } + + if (angle >= 0x3000) { + return DIR_LEFT; + } + + if (angle <= -0x3000) { + return DIR_RIGHT; + } + + return DIR_FORWARD; } -#pragma pop /* 80131C74-80131DA0 12C5B4 012C+00 5/5 0/0 0/0 .text procWolfRopeMoveInit__9daAlink_cFii */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfRopeMoveInit(int param_0, int param_1) { +asm int daAlink_c::procWolfRopeMoveInit(int param_0, int param_1) { nofralloc #include "asm/d/a/d_a_alink/procWolfRopeMoveInit__9daAlink_cFii.s" } @@ -1206,7 +1550,7 @@ asm void daAlink_c::procWolfRopeMoveInit(int param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfRopeMove() { +asm int daAlink_c::procWolfRopeMove() { nofralloc #include "asm/d/a/d_a_alink/procWolfRopeMove__9daAlink_cFv.s" } @@ -1217,7 +1561,7 @@ asm void daAlink_c::procWolfRopeMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfRopeHangInit(int param_0) { +asm int daAlink_c::procWolfRopeHangInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfRopeHangInit__9daAlink_cFi.s" } @@ -1227,7 +1571,7 @@ asm void daAlink_c::procWolfRopeHangInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfRopeHang() { +asm int daAlink_c::procWolfRopeHang() { nofralloc #include "asm/d/a/d_a_alink/procWolfRopeHang__9daAlink_cFv.s" } @@ -1238,7 +1582,7 @@ asm void daAlink_c::procWolfRopeHang() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfRopeTurnInit() { +asm int daAlink_c::procWolfRopeTurnInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfRopeTurnInit__9daAlink_cFv.s" } @@ -1248,7 +1592,7 @@ asm void daAlink_c::procWolfRopeTurnInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfRopeTurn() { +asm int daAlink_c::procWolfRopeTurn() { nofralloc #include "asm/d/a/d_a_alink/procWolfRopeTurn__9daAlink_cFv.s" } @@ -1258,7 +1602,7 @@ asm void daAlink_c::procWolfRopeTurn() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfRopeStaggerInit(int param_0) { +asm int daAlink_c::procWolfRopeStaggerInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfRopeStaggerInit__9daAlink_cFi.s" } @@ -1269,7 +1613,7 @@ asm void daAlink_c::procWolfRopeStaggerInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfRopeStagger() { +asm int daAlink_c::procWolfRopeStagger() { nofralloc #include "asm/d/a/d_a_alink/procWolfRopeStagger__9daAlink_cFv.s" } @@ -1277,20 +1621,37 @@ asm void daAlink_c::procWolfRopeStagger() { /* 8013384C-80133930 12E18C 00E4+00 1/1 0/0 0/0 .text procWolfRopeSubjectivityInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRopeSubjectivityInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRopeSubjectivityInit__9daAlink_cFv.s" +int daAlink_c::procWolfRopeSubjectivityInit() { + commonProcInit(PROC_WOLF_ROPE_SUBJECTIVITY); + + if (!checkUnderMove0BckNoArcWolf(WANM_ROPE_WALK)) { + setSingleAnimeWolfBaseSpeed(WANM_ROPE_WALK, FLOAT_LABEL(lit_6108), daAlinkHIO_wlRope_c0::m.field_0x20); + } + + mCommonCounter = initWolfRopeShapeAngle(); + current.angle.y = shape_angle.y; + + setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + mSpeed.y = tmp_0; + mNormalSpeed = tmp_0; + + setWolfRopeOffsetY(setWolfRopePosY()); + + if (checkWolfGrabAnime()) { + field_0x30a0 = -0x1800; + } + + setSubjectMode(); + return 1; } -#pragma pop /* 80133930-80133D6C 12E270 043C+00 1/0 0/0 0/0 .text procWolfRopeSubjectivity__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfRopeSubjectivity() { +asm int daAlink_c::procWolfRopeSubjectivity() { nofralloc #include "asm/d/a/d_a_alink/procWolfRopeSubjectivity__9daAlink_cFv.s" } @@ -1322,7 +1683,7 @@ asm cXyz* daAlink_c::checkMidnaLockJumpPoint() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfTagJumpInit(fopAc_ac_c* param_0) { +asm int daAlink_c::procWolfTagJumpInit(fopAc_ac_c* param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfTagJumpInit__9daAlink_cFP10fopAc_ac_c.s" } @@ -1332,7 +1693,7 @@ asm void daAlink_c::procWolfTagJumpInit(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfTagJump() { +asm int daAlink_c::procWolfTagJump() { nofralloc #include "asm/d/a/d_a_alink/procWolfTagJump__9daAlink_cFv.s" } @@ -1343,7 +1704,7 @@ asm void daAlink_c::procWolfTagJump() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfTagJumpLandInit(fopAc_ac_c* param_0) { +asm int daAlink_c::procWolfTagJumpLandInit(fopAc_ac_c* param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfTagJumpLandInit__9daAlink_cFP10fopAc_ac_c.s" } @@ -1354,21 +1715,22 @@ asm void daAlink_c::procWolfTagJumpLandInit(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfTagJumpLand() { +asm int daAlink_c::procWolfTagJumpLand() { nofralloc #include "asm/d/a/d_a_alink/procWolfTagJumpLand__9daAlink_cFv.s" } #pragma pop /* 80135050-801350A4 12F990 0054+00 1/1 0/0 0/0 .text daAlink_searchGiant__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchGiant(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchGiant__FP10fopAc_ac_cPv.s" +static fopAc_ac_c* daAlink_searchGiant(fopAc_ac_c* param_0, void* param_1) { + cXyz* tmp = static_cast(param_1); + + if (fopAcM_GetName(param_0) == PROC_OBJ_SEKIZOA && param_0->current.pos.abs2(*tmp) < lit_49124) { + return param_0; + } + + return NULL; } -#pragma pop /* 801350A4-80135160 12F9E4 00BC+00 1/1 0/0 0/0 .text daAlink_searchGiantTalk__FP10fopAc_ac_cPv */ #pragma push @@ -1381,35 +1743,43 @@ static asm void daAlink_searchGiantTalk(fopAc_ac_c* param_0, void* param_1) { #pragma pop /* 80135160-801351F8 12FAA0 0098+00 1/1 0/0 0/0 .text procWolfGiantPuzzleInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procWolfGiantPuzzleInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfGiantPuzzleInit__9daAlink_cFv.s" +int daAlink_c::procWolfGiantPuzzleInit() { + if (!commonProcInitNotSameProc(PROC_WOLF_GIANT_PUZZLE)) { + return 0; + } + + setBlendWolfMoveAnime(daAlinkHIO_wlMove_c0::m.field_0xBC); + current.angle.y = shape_angle.y; + + field_0x2f98 = 4; + mCommonCounter = shape_angle.y; + field_0x3478 = FLOAT_LABEL(lit_6108); + field_0x347c = daAlinkHIO_wlMoveNoP_c0::m.field_0x10; + field_0x594 = daAlinkHIO_wlMoveNoP_c0::m.field_0x8; + offWolfEyeUp(); + + return 1; } -#pragma pop /* 801351F8-80135458 12FB38 0260+00 1/0 0/0 0/0 .text procWolfGiantPuzzle__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfGiantPuzzle() { +asm int daAlink_c::procWolfGiantPuzzle() { nofralloc #include "asm/d/a/d_a_alink/procWolfGiantPuzzle__9daAlink_cFv.s" } #pragma pop /* 80135458-801354C8 12FD98 0070+00 2/2 0/0 0/0 .text setWolfHangGroundY__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfHangGroundY() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfHangGroundY__9daAlink_cFv.s" +void daAlink_c::setWolfHangGroundY() { + cXyz pos; + mDoMtx_multVecZero(mpLinkModel->i_getAnmMtx(0), &pos); + + mLinkGndChk.SetPos(&pos); + field_0x33d8 = dComIfG_Bgsp().GroundCross(&mLinkGndChk); } -#pragma pop /* 801354C8-801355EC 12FE08 0124+00 2/2 0/0 0/0 .text changeWolfHangEndProc__9daAlink_cFv */ @@ -1424,30 +1794,47 @@ asm void daAlink_c::changeWolfHangEndProc() { /* 801355EC-80135668 12FF2C 007C+00 2/2 0/0 0/0 .text procWolfHangReadyInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfHangReadyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfHangReadyInit__9daAlink_cFv.s" +int daAlink_c::procWolfHangReadyInit() { + commonProcInit(PROC_WOLF_HANG_READY); + setSingleAnimeWolf(WANM_VJMP_START, + daAlinkHIO_wlWallHang_c0::m.field_0x0.mSpeed, + daAlinkHIO_wlWallHang_c0::m.field_0x0.mStartFrame, + 12, + daAlinkHIO_wlWallHang_c0::m.field_0x0.mInterpolation); + field_0x3198 = field_0x2f91; + mCommonCounter = field_0x306e + 0x8000; + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + mNormalSpeed = tmp_0; + mSpeed.y = tmp_0; + + return 1; } -#pragma pop /* 80135668-801356F0 12FFA8 0088+00 1/0 0/0 0/0 .text procWolfHangReady__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfHangReady() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfHangReady__9daAlink_cFv.s" +int daAlink_c::procWolfHangReady() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + cLib_addCalcAngleS(&shape_angle.y, mCommonCounter, 2, 0x1000, 0x400); + current.angle.y = shape_angle.y; + + if (frameCtrl->checkAnmEnd()) { + shape_angle.y = mCommonCounter; + current.angle.y = shape_angle.y; + + if (!procWolfHangWallCatchInit(field_0x3198)) { + checkWaitAction(); + } + } + + return 1; } -#pragma pop /* 801356F0-80135AF4 130030 0404+00 3/3 0/0 0/0 .text procWolfHangWallCatchInit__9daAlink_cFi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfHangWallCatchInit(int param_0) { +asm int daAlink_c::procWolfHangWallCatchInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfHangWallCatchInit__9daAlink_cFi.s" } @@ -1458,7 +1845,7 @@ asm void daAlink_c::procWolfHangWallCatchInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfHangWallCatch() { +asm int daAlink_c::procWolfHangWallCatch() { nofralloc #include "asm/d/a/d_a_alink/procWolfHangWallCatch__9daAlink_cFv.s" } @@ -1469,7 +1856,7 @@ asm void daAlink_c::procWolfHangWallCatch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfHangFallStartInit(cM3dGPla* param_0) { +asm int daAlink_c::procWolfHangFallStartInit(cM3dGPla* param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfHangFallStartInit__9daAlink_cFP8cM3dGPla.s" } @@ -1480,28 +1867,27 @@ asm void daAlink_c::procWolfHangFallStartInit(cM3dGPla* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfHangFallStart() { +asm int daAlink_c::procWolfHangFallStart() { nofralloc #include "asm/d/a/d_a_alink/procWolfHangFallStart__9daAlink_cFv.s" } #pragma pop /* 80136064-801360EC 1309A4 0088+00 1/1 0/0 0/0 .text setWolfHeadDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfHeadDamage() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfHeadDamage__9daAlink_cFv.s" +void daAlink_c::setWolfHeadDamage() { + setUpperAnimeParam(0x2A7, UPPER_2, &daAlinkHIO_wlDamage_c0::m.field_0x0); + seStartOnlyReverb(Z2SE_AL_DAMAGE_NORMAL); + freeGrabItem(); + setFacePriTexture(FTANM_UNK_90); + voiceStart(Z2SE_WL_V_DAMAGE); } -#pragma pop /* 801360EC-80136508 130A2C 041C+00 1/1 0/0 0/0 .text * procWolfDamageInit__9daAlink_cFP12dCcD_GObjInf */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfDamageInit(dCcD_GObjInf* param_0) { +asm int daAlink_c::procWolfDamageInit(dCcD_GObjInf* param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfDamageInit__9daAlink_cFP12dCcD_GObjInf.s" } @@ -1511,7 +1897,7 @@ asm void daAlink_c::procWolfDamageInit(dCcD_GObjInf* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfDamage() { +asm int daAlink_c::procWolfDamage() { nofralloc #include "asm/d/a/d_a_alink/procWolfDamage__9daAlink_cFv.s" } @@ -1522,7 +1908,7 @@ asm void daAlink_c::procWolfDamage() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16 param_3) { +asm int daAlink_c::procWolfLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16 param_3) { nofralloc #include "asm/d/a/d_a_alink/procWolfLargeDamageUpInit__9daAlink_cFiiss.s" } @@ -1533,7 +1919,7 @@ asm void daAlink_c::procWolfLargeDamageUpInit(int param_0, int param_1, s16 para #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfLargeDamageUp() { +asm int daAlink_c::procWolfLargeDamageUp() { nofralloc #include "asm/d/a/d_a_alink/procWolfLargeDamageUp__9daAlink_cFv.s" } @@ -1543,21 +1929,34 @@ asm void daAlink_c::procWolfLargeDamageUp() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfLandDamageInit(int param_0) { +asm int daAlink_c::procWolfLandDamageInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfLandDamageInit__9daAlink_cFi.s" } #pragma pop /* 80136DE4-80136EC4 131724 00E0+00 1/0 0/0 0/0 .text procWolfLandDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfLandDamage() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfLandDamage__9daAlink_cFv.s" +int daAlink_c::procWolfLandDamage() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (field_0x3198 != 0) { + if (frameCtrl->checkAnmEnd()) { + checkNextActionWolf(0); + } else if (frameCtrl->getFrame() > daAlinkHIO_wlDamFall_c0::m.field_0x14.mCheckFrame) { + checkNextActionWolf(1); + } + } else if (frameCtrl->checkAnmEnd()) { + if (field_0x3008 > 0) { + field_0x3008--; + } else { + setSingleAnimeWolfParam(WANM_FALL_LAND_START, &daAlinkHIO_wlDamFall_c0::m.field_0x14); + setFaceBasicTexture(FTANM_UNK_96); + field_0x3198 = 1; + } + } + + return 1; } -#pragma pop /* 80136EC4-80136F54 131804 0090+00 2/2 0/0 0/0 .text setWolfScreamWaitAnime__9daAlink_cFv */ #pragma push @@ -1570,34 +1969,60 @@ asm void daAlink_c::setWolfScreamWaitAnime() { #pragma pop /* 80136F54-80136FF8 131894 00A4+00 1/1 0/0 0/0 .text procWolfScreamWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procWolfScreamWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfScreamWaitInit__9daAlink_cFv.s" +int daAlink_c::procWolfScreamWaitInit() { + commonProcInit(PROC_WOLF_SCREAM_WAIT); + if (i_checkEndResetFlg1(ERFLG1_UNK_2)) { + setWolfScreamWaitAnime(); + } else { + setSingleAnimeWolfBaseSpeed(WANM_WAIT, daAlinkHIO_wlMoveNoP_c0::m.field_0x14, daAlinkHIO_wlMove_c0::m.field_0xBC); + mCommonCounter = 0; + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x300e = 0; + field_0x3588 = l_wolfBaseAnime; + + return 1; } -#pragma pop /* 80136FF8-801370E4 131938 00EC+00 1/0 0/0 0/0 .text procWolfScreamWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfScreamWait() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfScreamWait__9daAlink_cFv.s" +int daAlink_c::procWolfScreamWait() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (!i_checkEndResetFlg1(ERFLG1_UNK_1)) { + if (field_0x300e != 0) { + field_0x2f99 = 5; + + if (frameCtrl->checkAnmEnd()) { + checkNextActionWolf(0); + } else if (frameCtrl->getFrame() > daAlinkHIO_wlDamLarge_c0::m.field_0x0.mCheckFrame) { + checkNextActionWolf(1); + } + } else { + field_0x300e = 1; + setSingleAnimeWolf(WANM_DMG_AIR_FRONT_GETUP, + daAlinkHIO_wlDamLarge_c0::m.field_0x0.mSpeed, + lit_8676, + daAlinkHIO_wlDamLarge_c0::m.field_0x0.mEndFrame, + daAlinkHIO_wlDamLarge_c0::m.field_0x0.mInterpolation); + field_0x2f99 = 13; + } + } else if (mCommonCounter == 0 && i_checkEndResetFlg1(ERFLG1_UNK_2)) { + setWolfScreamWaitAnime(); + } + + return 1; } -#pragma pop /* 801370E4-8013712C 131A24 0048+00 3/3 0/0 0/0 .text getWolfLieMoveAnmSpeed__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getWolfLieMoveAnmSpeed() { - nofralloc -#include "asm/d/a/d_a_alink/getWolfLieMoveAnmSpeed__9daAlink_cFv.s" +f32 daAlink_c::getWolfLieMoveAnmSpeed() { + if (field_0x3198 != 0) { + // return getAnmSpeedStickRate(lit_5943, lit_7624); inline doesnt match here? + return lit_5943 + (field_0x33a8 * lit_7624); + } + + return getAnmSpeedStickRate(daAlinkHIO_wlLie_c0::m.field_0x3C, daAlinkHIO_wlLie_c0::m.field_0x38); } -#pragma pop /* 8013712C-801371A0 131A6C 0074+00 3/3 0/0 0/0 .text getWolfLieMoveSpeed__9daAlink_cFv */ @@ -1611,14 +2036,12 @@ asm void daAlink_c::getWolfLieMoveSpeed() { #pragma pop /* 801371A0-801371FC 131AE0 005C+00 0/0 0/0 2/2 .text checkMidnaDisappearMode__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkMidnaDisappearMode() const { - nofralloc -#include "asm/d/a/d_a_alink/checkMidnaDisappearMode__9daAlink_cCFv.s" +BOOL daAlink_c::checkMidnaDisappearMode() const { + return mProcID == PROC_WOLF_DIG_THROUGH || + (i_checkWolf() && i_dComIfGp_checkPlayerStatus0(0, 0x8000000) && + !i_dComIfGp_checkPlayerStatus0(0, 0x10) && + (mTargetedActor == NULL || !(mTargetedActor->mAttentionInfo.mFlags & 0x800000))); } -#pragma pop /* 801371FC-801372B4 131B3C 00B8+00 3/3 0/0 0/0 .text checkWolfLieContinue__9daAlink_cFi */ @@ -1632,42 +2055,48 @@ asm void daAlink_c::checkWolfLieContinue(int param_0) { #pragma pop /* 801372B4-80137330 131BF4 007C+00 3/3 0/0 0/0 .text checkNextActionWolfFromLie__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionWolfFromLie() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionWolfFromLie__9daAlink_cFv.s" +int daAlink_c::checkNextActionWolfFromLie() { + if (checkNextActionWolf(0)) { + if (field_0x2f8c == 1 || field_0x2f8c == 2 || field_0x2f8c == 3) { + field_0x2060->initOldFrameMorf(daAlinkHIO_wlLie_c0::m.field_0x30, 0, 40); + } + return 1; + } + + return 0; } -#pragma pop /* 80137330-801373F8 131C70 00C8+00 3/3 0/0 0/0 .text setWolfLieMoveVoice__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfLieMoveVoice(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setWolfLieMoveVoice__9daAlink_cFi.s" +void daAlink_c::setWolfLieMoveVoice(int param_0) { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (frameCtrl->getRate() == FLOAT_LABEL(lit_6108) && field_0x3012 != 0) { + field_0x3012--; + } + + if ((param_0 != 0 && (frameCtrl->checkPass(lit_17382) || frameCtrl->checkPass(lit_7451))) || + (frameCtrl->getRate() == FLOAT_LABEL(lit_6108) && field_0x3012 == 0)) { + voiceStart(Z2SE_WL_V_BREATH_WALK); + field_0x3012 = 30; + } } -#pragma pop /* 801373F8-80137420 131D38 0028+00 2/2 0/0 0/0 .text checkWolfLieCode__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfLieCode() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfLieCode__9daAlink_cFv.s" +bool daAlink_c::checkWolfLieCode() { + if (mLinkAcch.ChkGroundHit() && field_0x2fa8 == 4) { + return true; + } + + return false; } -#pragma pop /* 80137420-8013753C 131D60 011C+00 2/2 0/0 0/0 .text procWolfLieStartInit__9daAlink_cFi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfLieStartInit(int param_0) { +asm int daAlink_c::procWolfLieStartInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfLieStartInit__9daAlink_cFi.s" } @@ -1677,7 +2106,7 @@ asm void daAlink_c::procWolfLieStartInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfLieStart() { +asm int daAlink_c::procWolfLieStart() { nofralloc #include "asm/d/a/d_a_alink/procWolfLieStart__9daAlink_cFv.s" } @@ -1688,7 +2117,7 @@ asm void daAlink_c::procWolfLieStart() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfLieMoveInit(int param_0) { +asm int daAlink_c::procWolfLieMoveInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfLieMoveInit__9daAlink_cFi.s" } @@ -1698,7 +2127,7 @@ asm void daAlink_c::procWolfLieMoveInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfLieMove() { +asm int daAlink_c::procWolfLieMove() { nofralloc #include "asm/d/a/d_a_alink/procWolfLieMove__9daAlink_cFv.s" } @@ -1709,7 +2138,7 @@ asm void daAlink_c::procWolfLieMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfLieAutoMoveInit(int param_0, cXyz* param_1) { +asm int daAlink_c::procWolfLieAutoMoveInit(int param_0, cXyz* param_1) { nofralloc #include "asm/d/a/d_a_alink/procWolfLieAutoMoveInit__9daAlink_cFiP4cXyz.s" } @@ -1720,7 +2149,7 @@ asm void daAlink_c::procWolfLieAutoMoveInit(int param_0, cXyz* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfLieAutoMove() { +asm int daAlink_c::procWolfLieAutoMove() { nofralloc #include "asm/d/a/d_a_alink/procWolfLieAutoMove__9daAlink_cFv.s" } @@ -1740,7 +2169,7 @@ asm void daAlink_c::setSpeedAndAngleSwimWolf() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getWolfSwimMoveAnmSpeed() { +asm f32 daAlink_c::getWolfSwimMoveAnmSpeed() { nofralloc #include "asm/d/a/d_a_alink/getWolfSwimMoveAnmSpeed__9daAlink_cFv.s" } @@ -1750,7 +2179,7 @@ asm void daAlink_c::getWolfSwimMoveAnmSpeed() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::decideDoStatusSwimWolf() { +asm int daAlink_c::decideDoStatusSwimWolf() { nofralloc #include "asm/d/a/d_a_alink/decideDoStatusSwimWolf__9daAlink_cFv.s" } @@ -1760,59 +2189,90 @@ asm void daAlink_c::decideDoStatusSwimWolf() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfSwimUpInit() { +asm int daAlink_c::procWolfSwimUpInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfSwimUpInit__9daAlink_cFv.s" } #pragma pop /* 80138484-8013852C 132DC4 00A8+00 1/0 0/0 0/0 .text procWolfSwimUp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSwimUp() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSwimUp__9daAlink_cFv.s" +int daAlink_c::procWolfSwimUp() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + setNormalSpeedF(FLOAT_LABEL(lit_6108), daAlinkHIO_wlSwim_c0::m.field_0x54); + + if (frameCtrl->checkAnmEnd()) { + procWolfSwimWaitInit(0); + } else if (checkInputOnR() && frameCtrl->getFrame() > daAlinkHIO_wlSwim_c0::m.field_0x0.mCheckFrame) { + procWolfSwimMoveInit(); + } else { + current.pos.y = mWaterY; + } + + return 1; } -#pragma pop /* 8013852C-80138644 132E6C 0118+00 7/7 0/0 0/0 .text procWolfSwimWaitInit__9daAlink_cFi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfSwimWaitInit(int param_0) { +asm int daAlink_c::procWolfSwimWaitInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfSwimWaitInit__9daAlink_cFi.s" } #pragma pop /* 80138644-8013871C 132F84 00D8+00 1/0 0/0 0/0 .text procWolfSwimWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSwimWait() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSwimWait__9daAlink_cFv.s" +int daAlink_c::procWolfSwimWait() { + if (mDemo.getDemoMode() == 6 || mDemo.getDemoMode() == 8) { + setShapeAngleToTalkActor(); + current.angle.y = shape_angle.y; + } + + setSpeedAndAngleSwimWolf(); + setSwimUpDownOffset(); + + if (checkWolfDashMode()) { + mUnderFrameCtrl[0].setRate(daAlinkHIO_wlSwim_c0::m.field_0x64); + } else { + mUnderFrameCtrl[0].setRate(daAlinkHIO_wlSwim_c0::m.field_0x88); + } + + if (checkSwimUpAction()) { + return 1; + } + + if (decideDoStatusSwimWolf()) { + return 1; + } + + if (checkInputOnR()) { + procWolfSwimMoveInit(); + } + + return 1; } -#pragma pop /* 8013871C-801387A0 13305C 0084+00 4/4 0/0 0/0 .text procWolfSwimMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSwimMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSwimMoveInit__9daAlink_cFv.s" +int daAlink_c::procWolfSwimMoveInit() { + commonProcInit(PROC_WOLF_SWIM_MOVE); + setSingleAnimeWolfBaseSpeed(WANM_SWIM, getWolfSwimMoveAnmSpeed(), daAlinkHIO_wlSwim_c0::m.field_0x78); + + if (i_checkNoResetFlg0(FLG0_UNK_100)) { + current.pos.y = mWaterY; + mSpeed.y = FLOAT_LABEL(lit_6108); + } + + dComIfGp_setPlayerStatus0(0, 0x100000); + return 1; } -#pragma pop /* 801387A0-8013890C 1330E0 016C+00 1/0 0/0 0/0 .text procWolfSwimMove__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfSwimMove() { +asm int daAlink_c::procWolfSwimMove() { nofralloc #include "asm/d/a/d_a_alink/procWolfSwimMove__9daAlink_cFv.s" } @@ -1822,7 +2282,7 @@ asm void daAlink_c::procWolfSwimMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfSwimEndWaitInit(int param_0) { +asm int daAlink_c::procWolfSwimEndWaitInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfSwimEndWaitInit__9daAlink_cFi.s" } @@ -1833,7 +2293,7 @@ asm void daAlink_c::procWolfSwimEndWaitInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfSwimEndWait() { +asm int daAlink_c::procWolfSwimEndWait() { nofralloc #include "asm/d/a/d_a_alink/procWolfSwimEndWait__9daAlink_cFv.s" } @@ -1841,35 +2301,42 @@ asm void daAlink_c::procWolfSwimEndWait() { /* 80138B6C-80138C04 1334AC 0098+00 1/0 0/0 0/0 .text * onWolfEnemyBiteAll__9daAlink_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::onWolfEnemyBiteAll(fopAc_ac_c* param_0, daPy_py_c::daPy_FLG2 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/onWolfEnemyBiteAll__9daAlink_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2.s" +bool daAlink_c::onWolfEnemyBiteAll(fopAc_ac_c* param_0, daPy_py_c::daPy_FLG2 param_1) { + if (field_0x281c.getActor() != NULL) { + return 0; + } + + if (param_1 == 8) { + if (mCutType != 0x2C && mCutType != 0x2D && mCutType != 0x31 && mCutType != 0x39 && mCutType != 0x32) { + return 0; + } + } else if (mCutType != 0x39) { + return 0; + } + + i_onNoResetFlg2(param_1); + field_0x281c.setData(param_0); + + return 1; } -#pragma pop /* 80138C04-80138C44 133544 0040+00 4/4 0/0 0/0 .text resetWolfEnemyBiteAll__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetWolfEnemyBiteAll() { - nofralloc -#include "asm/d/a/d_a_alink/resetWolfEnemyBiteAll__9daAlink_cFv.s" +void daAlink_c::resetWolfEnemyBiteAll() { + field_0x281c.clearData(); + i_offNoResetFlg2(0x58); } -#pragma pop /* 80138C44-80138CB8 133584 0074+00 1/1 0/0 0/0 .text checkWolfEnemyThrowAction__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfEnemyThrowAction() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfEnemyThrowAction__9daAlink_cFv.s" +void daAlink_c::checkWolfEnemyThrowAction() { + daPy_frameCtrl_c* frameCtrl = &mUpperFrameCtrl[2]; + + if (frameCtrl->checkAnmEnd()) { + resetUpperAnime(UPPER_2, lit_6109); + } else if (frameCtrl->checkPass(lit_16210)) { + resetWolfEnemyBiteAll(); + } } -#pragma pop /* 80138CB8-80138DC0 1335F8 0108+00 1/1 0/0 0/0 .text setWolfLockDomeModel__9daAlink_cFv */ @@ -1903,6 +2370,27 @@ asm void daAlink_c::resetWolfBallGrab() { #pragma pop /* 80139048-8013911C 133988 00D4+00 1/1 0/0 0/0 .text checkWolfLockData__9daAlink_cFv */ +#ifdef NONMATCHING +void daAlink_c::checkWolfLockData() { + for (int i = 0; i < 10; i++) { + mWolfLockAcKeep[i].setActor(); + } + + for (int i = 0; i < mWolfLockNum; i++) { + if (mWolfLockAcKeep[i].getActor() == NULL) { + int var_r29 = i; + + for (; var_r29 < mWolfLockNum - 1; var_r29++) { + mWolfLockAcKeep[i].setData(mWolfLockAcKeep[i + 1].getActor()); + } + + mWolfLockAcKeep[var_r29].clearData(); + mWolfLockNum--; + i--; + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1911,6 +2399,7 @@ asm void daAlink_c::checkWolfLockData() { #include "asm/d/a/d_a_alink/checkWolfLockData__9daAlink_cFv.s" } #pragma pop +#endif /* 8013911C-8013916C 133A5C 0050+00 1/0 0/0 0/0 .text checkWolfLock__9daAlink_cCFP10fopAc_ac_c */ bool daAlink_c::checkWolfLock(fopAc_ac_c* p_actor) const { @@ -1945,27 +2434,50 @@ fopAc_ac_c* daAlink_c::getWolfLockActorEnd() { /* 801391E4-801392A8 133B24 00C4+00 1/1 0/0 0/0 .text * searchWolfLockEnemy__9daAlink_cFP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::searchWolfLockEnemy(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/searchWolfLockEnemy__9daAlink_cFP10fopAc_ac_cPv.s" +void daAlink_c::searchWolfLockEnemy(fopAc_ac_c* param_0, void* param_1) { + fopAc_ac_c** tmp = (fopAc_ac_c**)param_1; + + for (int i = 0; i < mWolfLockNum; i++) { + if (mWolfLockAcKeep[i].getActor() == param_0) { + return; + } + } + + fopEn_enemy_c* enemy = static_cast(param_0); + if (fopAcM_GetGroup(enemy) == 2 && enemy->mAttentionInfo.mFlags & 5 && !enemy->checkWolfNoLock()) { + f32 d = current.pos.abs2(enemy->mEyePos); + + if (enemy->mEyePos.y >= current.pos.y - lit_6895 && d < field_0x3478) { + field_0x3478 = d; + *tmp = param_0; + } + } } -#pragma pop /* 801392A8-801392E4 133BE8 003C+00 1/1 0/0 0/0 .text * daAlink_searchWolfLockEnemy__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchWolfLockEnemy(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchWolfLockEnemy__FP10fopAc_ac_cPv.s" +static int daAlink_searchWolfLockEnemy(fopAc_ac_c* param_0, void* param_1) { + daAlink_getAlinkActorClass()->searchWolfLockEnemy(param_0, param_1); + return 0; } -#pragma pop /* 801392E4-801393A4 133C24 00C0+00 1/1 0/0 0/0 .text checkWolfComboCnt__9daAlink_cFv */ +// checkAttentionLock +#ifdef NONMATCHING +void daAlink_c::checkWolfComboCnt() { + if (!i_dComIfGp_checkPlayerStatus1(0, 0x1000000)) { + if (mComboCutCount == 2 && checkAttentionLock() && field_0x10f0.ChkAtHit()) { + i_onNoResetFlg0(FLG0_UNK_8000); + } + + if (field_0x307e > 0) { + field_0x307e--; + } else { + resetCombo(1); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1974,6 +2486,7 @@ asm void daAlink_c::checkWolfComboCnt() { #include "asm/d/a/d_a_alink/checkWolfComboCnt__9daAlink_cFv.s" } #pragma pop +#endif /* 801393A4-801395B4 133CE4 0210+00 4/4 0/0 0/0 .text checkWolfAttackAction__9daAlink_cFv */ @@ -1988,25 +2501,43 @@ asm void daAlink_c::checkWolfAttackAction() { /* 801395B4-80139600 133EF4 004C+00 2/2 0/0 0/0 .text * setWolfEnemyThrowUpperAnime__9daAlink_cFQ29daAlink_c12daAlink_WANMf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfEnemyThrowUpperAnime(daAlink_c::daAlink_WANM param_0, f32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setWolfEnemyThrowUpperAnime__9daAlink_cFQ29daAlink_c12daAlink_WANMf.s" +void daAlink_c::setWolfEnemyThrowUpperAnime(daAlink_c::daAlink_WANM i_anmID, f32 param_1) { + setUpperAnime(i_anmID == WANM_FLING_LEFT ? (u16)0x2BD : (u16)0x2BE, UPPER_2, daAlinkHIO_wlAtBite_c0::m.field_0x2C, param_1, -1, lit_6041); } -#pragma pop /* 80139600-801396F8 133F40 00F8+00 2/2 0/0 0/0 .text * setWolfEnemyHangBitePos__9daAlink_cFP13fopEn_enemy_c */ +// matches with literals +#ifdef NONMATCHING +BOOL daAlink_c::setWolfEnemyHangBitePos(fopEn_enemy_c* i_enemy) { + if (i_enemy != NULL) { + current.pos = i_enemy->getDownPos(); + cXyz old_pos = current.pos; + + current.pos.x -= 60.0f * cM_ssin(shape_angle.y); + current.pos.x -= 135.0f; + current.pos.x -= 60.0f * cM_scos(shape_angle.y); + + if (commonLineCheck(&field_0x3540, ¤t.pos)) { + current.pos = old_pos; + return 0; + } else { + return 1; + } + } + + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::setWolfEnemyHangBitePos(fopEn_enemy_c* param_0) { +asm BOOL daAlink_c::setWolfEnemyHangBitePos(fopEn_enemy_c* param_0) { nofralloc #include "asm/d/a/d_a_alink/setWolfEnemyHangBitePos__9daAlink_cFP13fopEn_enemy_c.s" } #pragma pop +#endif /* ############################################################################################## */ /* 804256EC-804256F8 05240C 000C+00 0/1 0/0 0/0 .bss @50952 */ @@ -2016,7 +2547,7 @@ static u8 lit_50952[12]; #pragma pop /* 804256F8-80425708 052418 000C+04 1/2 0/0 0/0 .bss l_wolfBiteHitMarkScale */ -static u8 l_wolfBiteHitMarkScale[12 + 4 /* padding */]; +static Vec l_wolfBiteHitMarkScale; /* 801396F8-801397A4 134038 00AC+00 1/1 0/0 0/0 .text * setWolfBiteDamage__9daAlink_cFP13fopEn_enemy_c */ @@ -2042,40 +2573,56 @@ asm void daAlink_c::checkWolfLockAttackChargeState() { /* 801398A8-80139908 1341E8 0060+00 1/1 0/0 0/0 .text procWolfRollAttackChargeInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRollAttackChargeInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRollAttackChargeInit__9daAlink_cFv.s" +int daAlink_c::procWolfRollAttackChargeInit() { + commonProcInit(PROC_WOLF_ROLL_ATTACK_CHARGE); + setSingleAnimeWolfBaseSpeed(WANM_CUT_TURN_CHARGE, FLOAT_LABEL(lit_6108), daAlinkHIO_wlAttack_c0::m.mReadyInterpolation); + voiceStartLevel(Z2SE_WL_V_ROAR); + return 1; } -#pragma pop /* 80139908-801399C4 134248 00BC+00 1/0 0/0 0/0 .text procWolfRollAttackCharge__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRollAttackCharge() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRollAttackCharge__9daAlink_cFv.s" +int daAlink_c::procWolfRollAttackCharge() { + if (checkWolfGroundSpecialMode()) { + return 1; + } + + if (!itemButtonCheck(BTN_B)) { + checkWolfAttackAction(); + } else if (field_0x2060->getOldFrameRate() < lit_9054) { + procWolfRollAttackMoveInit(); + } else { + cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), daAlinkHIO_wlMoveNoP_c0::m.field_0x10); + setShapeAngleToAtnActor(0); + current.angle.y = shape_angle.y; + voiceStartLevel(Z2SE_WL_V_ROAR); + } + + return 1; } -#pragma pop /* 801399C4-80139A70 134304 00AC+00 1/1 0/0 0/0 .text procWolfRollAttackMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRollAttackMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRollAttackMoveInit__9daAlink_cFv.s" +int daAlink_c::procWolfRollAttackMoveInit() { + commonProcInit(PROC_WOLF_ROLL_ATTACK_MOVE); + if (checkZeroSpeedF()) { + onModeFlg(1); + } + + field_0x3008 = daAlinkHIO_wlAttack_c0::m.mUnkTime; + field_0x300a = daAlinkHIO_wlAtLock_c0::m.field_0x28.mEndFrame; + field_0x3012 = 30; + field_0x3198 = 0; + field_0x2fe4 = shape_angle.y; + voiceStartLevel(Z2SE_WL_V_ROAR); + dComIfGp_setPlayerStatus0(0, 0x40000000); + + return 1; } -#pragma pop /* 80139A70-80139DE0 1343B0 0370+00 1/0 0/0 0/0 .text procWolfRollAttackMove__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfRollAttackMove() { +asm int daAlink_c::procWolfRollAttackMove() { nofralloc #include "asm/d/a/d_a_alink/procWolfRollAttackMove__9daAlink_cFv.s" } @@ -2085,7 +2632,7 @@ asm void daAlink_c::procWolfRollAttackMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfJumpAttackInit(int param_0) { +asm int daAlink_c::procWolfJumpAttackInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfJumpAttackInit__9daAlink_cFi.s" } @@ -2095,38 +2642,44 @@ asm void daAlink_c::procWolfJumpAttackInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfJumpAttack() { +asm int daAlink_c::procWolfJumpAttack() { nofralloc #include "asm/d/a/d_a_alink/procWolfJumpAttack__9daAlink_cFv.s" } #pragma pop /* 8013A7EC-8013A8A0 13512C 00B4+00 2/2 0/0 0/0 .text procWolfJumpAttackKickInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfJumpAttackKickInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfJumpAttackKickInit__9daAlink_cFv.s" +int daAlink_c::procWolfJumpAttackKickInit() { + commonProcInit(PROC_WOLF_JUMP_AT_KICK); + setSingleAnimeWolfParam(WANM_JUMP_KICK, &daAlinkHIO_wlAtCjump_c0::m.field_0x14); + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + mSpeed.y = tmp_0; + mNormalSpeed = tmp_0; + setSpecialGravity(tmp_0, mMaxFallSpeed, 0); + + voiceStart(Z2SE_WL_V_ATTACK_S); + seStartOnlyReverb(Z2SE_WOLFATTACK_WIND_S); + dComIfGp_setPlayerStatus1(0, 0x200000); + return 1; } -#pragma pop /* 8013A8A0-8013A8FC 1351E0 005C+00 1/0 0/0 0/0 .text procWolfJumpAttackKick__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfJumpAttackKick() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfJumpAttackKick__9daAlink_cFv.s" +int daAlink_c::procWolfJumpAttackKick() { + if (mUnderFrameCtrl[0].checkAnmEnd()) { + procWolfBackJumpInit(2); + dComIfGp_setPlayerStatus1(0, 0x200000); + } + + return 1; } -#pragma pop /* 8013A8FC-8013AAC4 13523C 01C8+00 2/2 0/0 0/0 .text * procWolfJumpAttackSlideLandInit__9daAlink_cFiii */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfJumpAttackSlideLandInit(int param_0, int param_1, int param_2) { +asm int daAlink_c::procWolfJumpAttackSlideLandInit(int param_0, int param_1, int param_2) { nofralloc #include "asm/d/a/d_a_alink/procWolfJumpAttackSlideLandInit__9daAlink_cFiii.s" } @@ -2136,7 +2689,7 @@ asm void daAlink_c::procWolfJumpAttackSlideLandInit(int param_0, int param_1, in #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfJumpAttackSlideLand() { +asm int daAlink_c::procWolfJumpAttackSlideLand() { nofralloc #include "asm/d/a/d_a_alink/procWolfJumpAttackSlideLand__9daAlink_cFv.s" } @@ -2144,31 +2697,60 @@ asm void daAlink_c::procWolfJumpAttackSlideLand() { /* 8013AC44-8013ACF4 135584 00B0+00 1/1 0/0 0/0 .text * procWolfJumpAttackNormalLandInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfJumpAttackNormalLandInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfJumpAttackNormalLandInit__9daAlink_cFi.s" +int daAlink_c::procWolfJumpAttackNormalLandInit(int param_0) { + commonProcInit(PROC_WOLF_JUMP_AT_NORMAL_LAND); + setSingleAnimeWolfParam(WANM_ATTACK_A_END, &daAlinkHIO_wlAtLand_c0::m.field_0x0); + + setFootEffectProcType(2); + field_0x2f9d = 0x18; + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x3012 = 0; + mCommonCounter = param_0; + field_0x2f99 = 12; + field_0x307e = daAlinkHIO_wlAttack_c0::m.mComboDuration; + + if (param_0 != 0) { + dComIfGp_setPlayerStatus1(0, 0x200000); + } + + return 1; } -#pragma pop /* 8013ACF4-8013ADF0 135634 00FC+00 1/0 0/0 0/0 .text procWolfJumpAttackNormalLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfJumpAttackNormalLand() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfJumpAttackNormalLand__9daAlink_cFv.s" +int daAlink_c::procWolfJumpAttackNormalLand() { + if (checkWolfGroundSpecialMode()) { + return 1; + } + + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + field_0x2f99 = 4; + cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), daAlinkHIO_wlMoveNoP_c0::m.field_0x10); + setComboReserb(); + checkCutTurnCharge(); + + if (frameCtrl->checkAnmEnd()) { + checkNextActionWolf(0); + } else if (frameCtrl->getFrame() > daAlinkHIO_wlAtLand_c0::m.field_0x0.mCheckFrame) { + if (mCommonCounter != 0) { + shape_angle.y -= -0x8000; + return procWolfJumpAttackInit(3); + } + + if (checkNextActionWolf(1)) { + return 1; + } + } + + return 1; } -#pragma pop /* 8013ADF0-8013AFC0 135730 01D0+00 2/2 0/0 0/0 .text procWolfWaitAttackInit__9daAlink_cFi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfWaitAttackInit(int param_0) { +asm int daAlink_c::procWolfWaitAttackInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfWaitAttackInit__9daAlink_cFi.s" } @@ -2178,7 +2760,7 @@ asm void daAlink_c::procWolfWaitAttackInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfWaitAttack() { +asm int daAlink_c::procWolfWaitAttack() { nofralloc #include "asm/d/a/d_a_alink/procWolfWaitAttack__9daAlink_cFv.s" } @@ -2188,7 +2770,7 @@ asm void daAlink_c::procWolfWaitAttack() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfRollAttackInit(int param_0, int param_1) { +asm int daAlink_c::procWolfRollAttackInit(int param_0, int param_1) { nofralloc #include "asm/d/a/d_a_alink/procWolfRollAttackInit__9daAlink_cFii.s" } @@ -2198,7 +2780,7 @@ asm void daAlink_c::procWolfRollAttackInit(int param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfRollAttack() { +asm int daAlink_c::procWolfRollAttack() { nofralloc #include "asm/d/a/d_a_alink/procWolfRollAttack__9daAlink_cFv.s" } @@ -2208,7 +2790,7 @@ asm void daAlink_c::procWolfRollAttack() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfDownAttackInit() { +asm int daAlink_c::procWolfDownAttackInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfDownAttackInit__9daAlink_cFv.s" } @@ -2218,7 +2800,7 @@ asm void daAlink_c::procWolfDownAttackInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfDownAttack() { +asm int daAlink_c::procWolfDownAttack() { nofralloc #include "asm/d/a/d_a_alink/procWolfDownAttack__9daAlink_cFv.s" } @@ -2229,7 +2811,7 @@ asm void daAlink_c::procWolfDownAttack() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfDownAtLandInit(fopEn_enemy_c* param_0) { +asm int daAlink_c::procWolfDownAtLandInit(fopEn_enemy_c* param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfDownAtLandInit__9daAlink_cFP13fopEn_enemy_c.s" } @@ -2239,7 +2821,7 @@ asm void daAlink_c::procWolfDownAtLandInit(fopEn_enemy_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfDownAtLand() { +asm int daAlink_c::procWolfDownAtLand() { nofralloc #include "asm/d/a/d_a_alink/procWolfDownAtLand__9daAlink_cFv.s" } @@ -2249,27 +2831,39 @@ asm void daAlink_c::procWolfDownAtLand() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfDownAtMissLandInit() { +asm int daAlink_c::procWolfDownAtMissLandInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfDownAtMissLandInit__9daAlink_cFv.s" } #pragma pop /* 8013BD54-8013BE24 136694 00D0+00 1/0 0/0 0/0 .text procWolfDownAtMissLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfDownAtMissLand() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfDownAtMissLand__9daAlink_cFv.s" +int daAlink_c::procWolfDownAtMissLand() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + if (checkWolfGroundSpecialMode()) { + return 1; + } + + field_0x2f99 = 4; + + if (frameCtrl->checkAnmEnd()) { + checkNextActionWolf(0); + } else if (frameCtrl->getFrame() > daAlinkHIO_wlAtDown_c0::m.field_0x64.mCheckFrame) { + checkNextActionWolf(1); + } else if (frameCtrl->getFrame() >= lit_6109 && frameCtrl->getFrame() < lit_8783) { + seStartMapInfoLevel(Z2SE_FN_WOLF_SLIP); + field_0x2f9d = 0x18; + } + + return 1; } -#pragma pop /* 8013BE24-8013C3E4 136764 05C0+00 2/2 0/0 0/0 .text procWolfLockAttackInit__9daAlink_cFi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfLockAttackInit(int param_0) { +asm int daAlink_c::procWolfLockAttackInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfLockAttackInit__9daAlink_cFi.s" } @@ -2279,7 +2873,7 @@ asm void daAlink_c::procWolfLockAttackInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfLockAttack() { +asm int daAlink_c::procWolfLockAttack() { nofralloc #include "asm/d/a/d_a_alink/procWolfLockAttack__9daAlink_cFv.s" } @@ -2289,7 +2883,7 @@ asm void daAlink_c::procWolfLockAttack() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfLockAttackTurnInit(int param_0) { +asm int daAlink_c::procWolfLockAttackTurnInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfLockAttackTurnInit__9daAlink_cFi.s" } @@ -2299,7 +2893,7 @@ asm void daAlink_c::procWolfLockAttackTurnInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfLockAttackTurn() { +asm int daAlink_c::procWolfLockAttackTurn() { nofralloc #include "asm/d/a/d_a_alink/procWolfLockAttackTurn__9daAlink_cFv.s" } @@ -2309,7 +2903,7 @@ asm void daAlink_c::procWolfLockAttackTurn() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfAttackReverseInit() { +asm int daAlink_c::procWolfAttackReverseInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfAttackReverseInit__9daAlink_cFv.s" } @@ -2320,7 +2914,7 @@ asm void daAlink_c::procWolfAttackReverseInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfAttackReverse() { +asm int daAlink_c::procWolfAttackReverse() { nofralloc #include "asm/d/a/d_a_alink/procWolfAttackReverse__9daAlink_cFv.s" } @@ -2330,38 +2924,64 @@ asm void daAlink_c::procWolfAttackReverse() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfEnemyThrowInit(int param_0) { +asm int daAlink_c::procWolfEnemyThrowInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfEnemyThrowInit__9daAlink_cFi.s" } #pragma pop /* 8013CC5C-8013CCF4 13759C 0098+00 1/0 0/0 0/0 .text procWolfEnemyThrow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfEnemyThrow() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfEnemyThrow__9daAlink_cFv.s" +int daAlink_c::procWolfEnemyThrow() { + if (checkWolfGroundSpecialMode()) { + return 1; + } + + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + field_0x2f99 = 5; + + if (frameCtrl->checkAnmEnd()) { + checkNextActionWolf(0); + } else if (frameCtrl->getFrame() > daAlinkHIO_wlAtBite_c0::m.field_0x34) { + checkNextActionWolf(1); + } + + return 1; } -#pragma pop /* 8013CCF4-8013CDEC 137634 00F8+00 1/1 0/0 0/0 .text procWolfEnemyHangBiteInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfEnemyHangBiteInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfEnemyHangBiteInit__9daAlink_cFv.s" +int daAlink_c::procWolfEnemyHangBiteInit() { + commonProcInit(PROC_WOLF_ENEMY_HANG_BITE); + setSingleAnimeWolfParam(WANM_CATCH_START, &daAlinkHIO_wlAtBite_c0::m.field_0x14); + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + mNormalSpeed = tmp_0; + mSpeed.y = tmp_0; + setSpecialGravity(tmp_0, mMaxFallSpeed, 0); + + if (!setWolfEnemyHangBitePos((fopEn_enemy_c*)field_0x281c.getActor())) { + return procWolfJumpAttackKickInit(); + } else { + current.angle.y = shape_angle.y; + field_0x2f99 = 0x50; + field_0x3008 = daAlinkHIO_wlAtBite_c0::m.field_0x28; + field_0x300a = 0; + mCommonCounter = 0; + field_0x300e = 0; + field_0x3478 = daAlinkHIO_wlAtBite_c0::m.field_0x40; + field_0x3010 = shape_angle.y; + voiceStart(Z2SE_WL_V_BITE_ATTACK); + dComIfGp_setPlayerStatus1(0, 0x200000); + } + + return 1; } -#pragma pop /* 8013CDEC-8013D0D4 13772C 02E8+00 1/0 0/0 0/0 .text procWolfEnemyHangBite__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfEnemyHangBite() { +asm int daAlink_c::procWolfEnemyHangBite() { nofralloc #include "asm/d/a/d_a_alink/procWolfEnemyHangBite__9daAlink_cFv.s" } @@ -2371,7 +2991,7 @@ asm void daAlink_c::procWolfEnemyHangBite() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfGrabUpInit() { +asm int daAlink_c::procWolfGrabUpInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfGrabUpInit__9daAlink_cFv.s" } @@ -2381,7 +3001,7 @@ asm void daAlink_c::procWolfGrabUpInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfGrabUp() { +asm int daAlink_c::procWolfGrabUp() { nofralloc #include "asm/d/a/d_a_alink/procWolfGrabUp__9daAlink_cFv.s" } @@ -2389,20 +3009,33 @@ asm void daAlink_c::procWolfGrabUp() { /* 8013D588-8013D65C 137EC8 00D4+00 2/2 0/0 0/0 .text procWolfGrabPutInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfGrabPutInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfGrabPutInit__9daAlink_cFv.s" +int daAlink_c::procWolfGrabPutInit() { + if (mProcID == PROC_WOLF_GRAB_PUT) { + return 0; + } + + BOOL grab_obj = checkWolfGrabAnimeObj(); + commonProcInit(PROC_WOLF_GRAB_PUT); + + if (grab_obj) { + setSingleAnimeWolfParam(WANM_PICKUP_A, &daAlinkHIO_wlGrab_c0::m.field_0x14); + field_0x3478 = lit_7625; + field_0x347c = daAlinkHIO_wlGrab_c0::m.field_0x14.mCheckFrame; + } else { + setSingleAnimeWolfParam(WANM_PICKUP_B, &daAlinkHIO_wlGrab_c0::m.field_0x3C); + field_0x3478 = lit_8502; + field_0x347c = daAlinkHIO_wlGrab_c0::m.field_0x3C.mCheckFrame; + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + return 1; } -#pragma pop /* 8013D65C-8013D818 137F9C 01BC+00 1/0 0/0 0/0 .text procWolfGrabPut__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfGrabPut() { +asm int daAlink_c::procWolfGrabPut() { nofralloc #include "asm/d/a/d_a_alink/procWolfGrabPut__9daAlink_cFv.s" } @@ -2410,71 +3043,118 @@ asm void daAlink_c::procWolfGrabPut() { /* 8013D818-8013D86C 138158 0054+00 1/1 0/0 0/0 .text procWolfGrabThrowInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfGrabThrowInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfGrabThrowInit__9daAlink_cFv.s" +int daAlink_c::procWolfGrabThrowInit() { + commonProcInit(PROC_WOLF_GRAB_THROW); + setSingleAnimeWolfParam(WANM_PICKUP_THROW, &daAlinkHIO_wlGrab_c0::m.field_0x50); + current.angle.y = shape_angle.y; + + return 1; } -#pragma pop /* 8013D86C-8013D930 1381AC 00C4+00 1/0 0/0 0/0 .text procWolfGrabThrow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfGrabThrow() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfGrabThrow__9daAlink_cFv.s" +int daAlink_c::procWolfGrabThrow() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), daAlinkHIO_wlMoveNoP_c0::m.field_0x10); + setShapeAngleToAtnActor(0); + current.angle.y = shape_angle.y; + + if (frameCtrl->checkPass(lit_7625)) { + setGrabItemThrow(); + } + + if (frameCtrl->checkAnmEnd()) { + checkNextActionWolf(0); + } else if (frameCtrl->getFrame() > daAlinkHIO_wlGrab_c0::m.field_0x50.mCheckFrame) { + checkNextActionWolf(1); + } + + return 1; } -#pragma pop /* 8013D930-8013DA8C 138270 015C+00 1/1 0/0 0/0 .text procWolfPushInit__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfPushInit() { +asm int daAlink_c::procWolfPushInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfPushInit__9daAlink_cFv.s" } #pragma pop /* 8013DA8C-8013DB58 1383CC 00CC+00 1/0 0/0 0/0 .text procWolfPush__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfPush() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfPush__9daAlink_cFv.s" +int daAlink_c::procWolfPush() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + field_0x2f99 = 4; + + if (frameCtrl->checkAnmEnd()) { + if (mCommonCounter != 0) { + setSingleAnimeWolf(WANM_PUSH_LIGHT, lit_6040, FLOAT_LABEL(lit_6108), field_0x300e, lit_6109); + mUnderFrameCtrl[0].setAttribute(0); + mCommonCounter = 0; + } else { + checkNextActionWolf(0); + } + } else if (mCommonCounter == 0 && frameCtrl->checkPass(lit_52470)) { + if (field_0x280c.getActor() != NULL) { + fopAcM_setCarryNow(field_0x280c.getActor(), 0); + } + } + + return 1; } -#pragma pop /* 8013DB58-8013DB6C 138498 0014+00 1/1 0/0 0/0 .text daAlink_searchEnemyCargo__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchEnemyCargo(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchEnemyCargo__FP10fopAc_ac_cPv.s" +static fopAc_ac_c* daAlink_searchEnemyCargo(fopAc_ac_c* param_0, void*) { + if (fopAcM_GetName(param_0) == PROC_E_YC) { + return param_0; + } + + return NULL; } -#pragma pop /* 8013DB6C-8013DC5C 1384AC 00F0+00 3/2 0/0 0/0 .text procWolfCargoCarryInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procWolfCargoCarryInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfCargoCarryInit__9daAlink_cFv.s" +int daAlink_c::procWolfCargoCarryInit() { + if (!commonProcInitNotSameProc(PROC_WOLF_CARGO_CARRY)) { + return 1; + } + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + mNormalSpeed = tmp_0; + mSpeed.y = tmp_0; + setSpecialGravity(tmp_0, mMaxFallSpeed, 0); + + daAlink_WANM wanm; + if (checkCargoCarry()) { + mCommonCounter = 1; + wanm = WANM_WAIT_KARGOROK; + } else { + mCommonCounter = 0; + + fopAc_ac_c* cargo_actor = (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchEnemyCargo, NULL); + if (cargo_actor != NULL) { + field_0x280c.setData(cargo_actor); + } + + wanm = WANM_CATCH_KARGOROK; + } + + if (!dComIfGp_evmng_checkStartDemo()) { + voiceStart(Z2SE_WL_V_CATCHED); + } + + setSingleAnimeWolfBase(wanm); + + return 1; } -#pragma pop /* 8013DC5C-8013DDF8 13859C 019C+00 1/0 0/0 0/0 .text procWolfCargoCarry__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfCargoCarry() { +asm int daAlink_c::procWolfCargoCarry() { nofralloc #include "asm/d/a/d_a_alink/procWolfCargoCarry__9daAlink_cFv.s" } @@ -2482,30 +3162,47 @@ asm void daAlink_c::procWolfCargoCarry() { /* 8013DDF8-8013DE70 138738 0078+00 1/1 0/0 0/0 .text procWolfChainUpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfChainUpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfChainUpInit__9daAlink_cFv.s" +int daAlink_c::procWolfChainUpInit() { + field_0x2fa3 = searchFmChainPos(); + + if (field_0x2fa3 == 0) { + return procWolfWaitInit(); + } + + commonProcInit(PROC_WOLF_CHAIN_UP); + setSingleAnimeWolfParam(WANM_PICKUP_B, &daAlinkHIO_wlGrab_c0::m.field_0x28); + mNormalSpeed = FLOAT_LABEL(lit_6108); + + return 1; } -#pragma pop /* 8013DE70-8013DF30 1387B0 00C0+00 1/0 0/0 0/0 .text procWolfChainUp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfChainUp() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfChainUp__9daAlink_cFv.s" +int daAlink_c::procWolfChainUp() { + daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; + + setWallGrabStatus(0x96, 2); + + if (frameCtrl->checkAnmEnd() || (checkInputOnR() && frameCtrl->getFrame() > daAlinkHIO_wlGrab_c0::m.field_0x28.mCheckFrame)) { + u8 old_2fa3 = field_0x2fa3; + fopAc_ac_c* old_actor = field_0x2844.getActor(); + + procWolfWaitInit(); + setUpperAnimeBaseSpeed(m_wlAnmDataTable[WANM_CHAIN_PULL].field_0x0, FLOAT_LABEL(lit_6108), lit_6109); + + if (old_actor != NULL) { + field_0x2fa3 = old_2fa3; + field_0x2844.setData(old_actor); + } + } + + return 1; } -#pragma pop /* 8013DF30-8013E034 138870 0104+00 1/1 0/0 0/0 .text procWolfGanonCatchInit__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfGanonCatchInit() { +asm int daAlink_c::procWolfGanonCatchInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfGanonCatchInit__9daAlink_cFv.s" } @@ -2515,27 +3212,29 @@ asm void daAlink_c::procWolfGanonCatchInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfGanonCatch() { +asm int daAlink_c::procWolfGanonCatch() { nofralloc #include "asm/d/a/d_a_alink/procWolfGanonCatch__9daAlink_cFv.s" } #pragma pop /* 8013E240-8013E2A8 138B80 0068+00 1/1 0/0 0/0 .text procWolfChainReadyInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfChainReadyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfChainReadyInit__9daAlink_cFv.s" +int daAlink_c::procWolfChainReadyInit() { + commonProcInit(PROC_WOLF_CHAIN_READY); + field_0x280c.setData(field_0x27f4); + setSingleAnimeWolfParam(WANM_ATTACK_A_START, &daAlinkHIO_wlAtNjump_c0::m.field_0x0); + mNormalSpeed = FLOAT_LABEL(lit_6108); + mCommonCounter = 0; + field_0x300e = 0; + + return 1; } -#pragma pop /* 8013E2A8-8013E6C0 138BE8 0418+00 1/0 0/0 0/0 .text procWolfChainReady__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfChainReady() { +asm int daAlink_c::procWolfChainReady() { nofralloc #include "asm/d/a/d_a_alink/procWolfChainReady__9daAlink_cFv.s" } @@ -2546,7 +3245,7 @@ asm void daAlink_c::procWolfChainReady() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfChainWaitInit() { +asm int daAlink_c::procWolfChainWaitInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfChainWaitInit__9daAlink_cFv.s" } @@ -2556,7 +3255,7 @@ asm void daAlink_c::procWolfChainWaitInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfChainWait() { +asm int daAlink_c::procWolfChainWait() { nofralloc #include "asm/d/a/d_a_alink/procWolfChainWait__9daAlink_cFv.s" } @@ -2566,7 +3265,7 @@ asm void daAlink_c::procWolfChainWait() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfDigInit() { +asm int daAlink_c::procWolfDigInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfDigInit__9daAlink_cFv.s" } @@ -2576,7 +3275,7 @@ asm void daAlink_c::procWolfDigInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfDig() { +asm int daAlink_c::procWolfDig() { nofralloc #include "asm/d/a/d_a_alink/procWolfDig__9daAlink_cFv.s" } @@ -2586,7 +3285,7 @@ asm void daAlink_c::procWolfDig() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfDigThroughInit(int param_0) { +asm int daAlink_c::procWolfDigThroughInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procWolfDigThroughInit__9daAlink_cFi.s" } @@ -2596,7 +3295,7 @@ asm void daAlink_c::procWolfDigThroughInit(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfDigThrough() { +asm int daAlink_c::procWolfDigThrough() { nofralloc #include "asm/d/a/d_a_alink/procWolfDigThrough__9daAlink_cFv.s" } @@ -2630,7 +3329,7 @@ void daAlink_c::setSmellSave() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfGetSmellInit() { +asm int daAlink_c::procWolfGetSmellInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfGetSmellInit__9daAlink_cFv.s" } @@ -2640,7 +3339,7 @@ asm void daAlink_c::procWolfGetSmellInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfGetSmell() { +asm int daAlink_c::procWolfGetSmell() { nofralloc #include "asm/d/a/d_a_alink/procWolfGetSmell__9daAlink_cFv.s" } diff --git a/src/d/a/d_a_itembase.cpp b/src/d/a/d_a_itembase.cpp index 9811545c172..aa00fad4830 100644 --- a/src/d/a/d_a_itembase.cpp +++ b/src/d/a/d_a_itembase.cpp @@ -143,7 +143,7 @@ int daItemBase_c::DrawBase() { /* 80144C30-80144C7C 13F570 004C+00 1/0 1/0 9/0 .text RotateYBase__12daItemBase_cFv */ void daItemBase_c::RotateYBase() { - mCollisionRot.y += (s16)(0xFFFF / getData().field_0x1c); + shape_angle.y += (s16)(0xFFFF / getData().field_0x1c); } /* 80144C7C-80144CA0 13F5BC 0024+00 1/0 1/0 5/0 .text setListStart__12daItemBase_cFv */ diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp index 7c37fc147fd..e585ffa84c9 100644 --- a/src/d/a/d_a_npc.cpp +++ b/src/d/a/d_a_npc.cpp @@ -2109,7 +2109,7 @@ void daNpcT_c::setPos(cXyz i_pos) { /* 8014A99C-8014AA18 1452DC 007C+00 0/0 0/0 29/29 .text setAngle__8daNpcT_cF5csXyz */ void daNpcT_c::setAngle(csXyz i_angle) { current.angle = i_angle; - mCollisionRot = current.angle; + shape_angle = current.angle; field_0xd78 = current.angle; field_0xd7e = field_0xd78; next.angle = current.angle; @@ -2118,7 +2118,7 @@ void daNpcT_c::setAngle(csXyz i_angle) { /* 8014AA18-8014AA40 145358 0028+00 0/0 0/0 138/138 .text setAngle__8daNpcT_cFs */ void daNpcT_c::setAngle(s16 i_angle) { current.angle.y = i_angle; - mCollisionRot.y = current.angle.y; + shape_angle.y = current.angle.y; field_0xd78.y = current.angle.y; field_0xd7e.y = field_0xd78.y; next.angle.y = current.angle.y; diff --git a/src/d/a/d_a_obj_item.cpp b/src/d/a/d_a_obj_item.cpp index f3ef351a001..94b766c4f9f 100644 --- a/src/d/a/d_a_obj_item.cpp +++ b/src/d/a/d_a_obj_item.cpp @@ -284,7 +284,7 @@ void daItem_c::setBaseMtx() { /* 8015B190-8015B1C8 155AD0 0038+00 1/1 0/0 0/0 .text setBaseMtx_0__8daItem_cFv */ void daItem_c::setBaseMtx_0() { mDoMtx_stack_c::transS(current.pos); - mDoMtx_stack_c::ZXYrotM(mCollisionRot); + mDoMtx_stack_c::ZXYrotM(shape_angle); } /* ############################################################################################## */ @@ -301,7 +301,7 @@ void daItem_c::setBaseMtx_1() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::transM(0.0f, y, 0.0f); - mDoMtx_stack_c::ZXYrotM(mCollisionRot); + mDoMtx_stack_c::ZXYrotM(shape_angle); mDoMtx_stack_c::transM(0.0f, -y, 0.0f); } #else @@ -647,8 +647,8 @@ int daItem_c::_daItem_create() { orig.angle.x = 0; current.angle.z = 0; current.angle.x = 0; - mCollisionRot.z = 0; - mCollisionRot.x = 0; + shape_angle.z = 0; + shape_angle.x = 0; field_0x95d = true; } @@ -744,7 +744,7 @@ int daItem_c::_daItem_execute() { } mDoMtx_stack_c::transS(current.pos); - mDoMtx_stack_c::ZXYrotM(mCollisionRot); + mDoMtx_stack_c::ZXYrotM(shape_angle); mDoMtx_stack_c::inverse(); mDoMtx_stack_c::multVec(&carry_pos, &carry_pos); daPy_getPlayerActorClass()->setHookshotCarryOffset(fopAcM_GetID(this), &carry_pos); @@ -865,8 +865,8 @@ SECTION_SDATA2 static f32 lit_4404 = 15.0f; void daItem_c::procInitSimpleGetDemo() { current.pos = daPy_getPlayerActorClass()->getItemPos(); current.pos.y += 15.0f; - mCollisionRot.z = 0; - mCollisionRot.x = 0; + shape_angle.z = 0; + shape_angle.x = 0; mScale = field_0x930; fopAcM_SetSpeed(this, 0, getData().field_0x2c, 0); fopAcM_SetGravity(this, getData().field_0x30); @@ -1076,8 +1076,8 @@ void daItem_c::mode_water_init() { f32 tmp_0 = FLOAT_LABEL(lit_3857); fopAcM_SetSpeed(this, tmp_0, tmp_0, tmp_0); fopAcM_SetSpeedF(this, tmp_0); - mCollisionRot.z = 0; - mCollisionRot.x = 0; + shape_angle.z = 0; + shape_angle.x = 0; field_0x940 = 0; mScale = field_0x930; } @@ -1361,9 +1361,9 @@ int daItem_c::itemActionForRupee() { } if (field_0x94b == 0) { - mCollisionRot.x += getData().field_0x1a; + shape_angle.x += getData().field_0x1a; } else { - mCollisionRot.x = 0; + shape_angle.x = 0; } return 1; @@ -1466,7 +1466,7 @@ int daItem_c::initAction() { if (isHeart(m_itemNo)) { mSpeedF = (cM_rndF(5.0f) + 20.0f) - 15.0f; - mCollisionRot.z = cM_rndFX(getData().field_0x2a); + shape_angle.z = cM_rndFX(getData().field_0x2a); } field_0x949 = 0; @@ -1530,8 +1530,8 @@ asm void daItem_c::initSpeed(int param_0) { void daItem_c::initAngle() { current.angle.z = 0; current.angle.x = 0; - mCollisionRot.z = 0; - mCollisionRot.x = 0; + shape_angle.z = 0; + shape_angle.x = 0; } /* 8015DE50-8015DE70 158790 0020+00 1/0 0/0 0/0 .text daItem_Draw__FP8daItem_c */ diff --git a/src/d/a/d_a_player.cpp b/src/d/a/d_a_player.cpp index f103a528fc4..87abd94b826 100644 --- a/src/d/a/d_a_player.cpp +++ b/src/d/a/d_a_player.cpp @@ -245,7 +245,7 @@ int daPy_boomerangMove_c::posMove(cXyz* param_0, s16* param_1, fopAc_ac_c* param daAlink_c* link = daAlink_getAlinkActorClass(); if ((param_2 == NULL || !link->checkBoomerangCarry(param_2)) && (m_eventKeepFlg == 0 || field_0x0 != 0)) { - s16 tmp = (m_dropAngleY + link->mCollisionRot.y) + cM_rndF(2048.0f); + s16 tmp = (m_dropAngleY + link->shape_angle.y) + cM_rndF(2048.0f); param_0->x = link->current.pos.x + field_0x8 * cM_ssin(tmp); param_0->z = link->current.pos.z + field_0x8 * cM_scos(tmp); @@ -472,7 +472,7 @@ void* daPy_anmHeap_c::loadData(u16 i_resId) { if (mArcNo == 0xFFFF) { dComIfGp_getAnmArchive()->readIdxResource(mBuffer, mBufferSize, i_resId); JKRHeap* heap = setAnimeHeap(); - void* data = J3DAnmLoaderDataBase::load(mBuffer, UNK_FLAG0); + void* data = J3DAnmLoaderDataBase::load(mBuffer, J3DLOADER_UNK_FLAG0); mDoExt_setCurrentHeap(heap); return data; } @@ -607,7 +607,7 @@ void daPy_sightPacket_c::setSight() { mDoLib_project(&mPos, &tmp); mDoMtx_stack_c::transS(tmp.x, tmp.y, tmp.z); mDoMtx_stack_c::scaleM(32.0f, 32.0f, 32.0f); - mDoMtx_stack_c::copy(field_0x14); + mDoMtx_copy(mDoMtx_stack_c::get(), field_0x14); dComIfGd_set2DXlu(this); } @@ -635,7 +635,7 @@ BOOL daPy_py_c::checkMasterSwordEquip() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool daPy_py_c::checkWoodShieldEquip() { +asm BOOL daPy_py_c::checkWoodShieldEquip() { nofralloc #include "asm/d/a/d_a_player/checkWoodShieldEquip__9daPy_py_cFv.s" } diff --git a/src/d/bg/d_bg_s.cpp b/src/d/bg/d_bg_s.cpp index 087a1ad5293..5c15f0b2963 100644 --- a/src/d/bg/d_bg_s.cpp +++ b/src/d/bg/d_bg_s.cpp @@ -448,7 +448,7 @@ void dBgS::Move() { cBgS_ChkElm* elm = m_chk_element; for (int i = 0; i < 0x100; i++) { if (elm->ChkUsed()) { - elm->m_bgw_base_ptr->CalcDiffShapeAngleY(elm->m_actor_ptr->mCollisionRot.y); + elm->m_bgw_base_ptr->CalcDiffShapeAngleY(elm->m_actor_ptr->shape_angle.y); } elm++; } @@ -462,7 +462,7 @@ bool dBgS::Regist(dBgW_Base* pbgw, fopAc_ac_c* p_actor) { } if (p_actor != NULL && pbgw->ChkMoveBg()) { - pbgw->SetOldShapeAngleY(p_actor->mCollisionRot.y); + pbgw->SetOldShapeAngleY(p_actor->shape_angle.y); pbgw->SetRoomId(fopAcM_GetRoomNo(p_actor)); } diff --git a/src/d/bg/d_bg_s_acch.cpp b/src/d/bg/d_bg_s_acch.cpp index 222ad58b753..25a23d5b76d 100644 --- a/src/d/bg/d_bg_s_acch.cpp +++ b/src/d/bg/d_bg_s_acch.cpp @@ -213,8 +213,8 @@ SECTION_SDATA2 static f32 lit_4092 = 1000.0f; // matches with literals #ifdef NONMATCHING dBgS_Acch::dBgS_Acch() { - SetPolyPassChk(&GetPolyPassChkInfo()); - SetGrpPassChk(&GetGrpPassChkInfo()); + SetPolyPassChk(GetPolyPassChkInfo()); + SetGrpPassChk(GetGrpPassChkInfo()); m_flags = 0; SetRoofNone(); @@ -309,17 +309,12 @@ void dBgS_Acch::GroundCheckInit(dBgS& param_0) { } } -/* ############################################################################################## */ -/* 80424B20-80424B2C 051840 000C+00 1/1 0/0 0/0 .bss @4166 */ -static u8 lit_4166[12]; - -/* 80424B2C-80424B80 05184C 0050+04 1/1 0/0 0/0 .bss tmpRoofChk$4165 */ -static u8 tmpRoofChk[80 + 4 /* padding */]; -// static dBgS_RoofChk tmpRoofChk; - /* 80076350-8007654C 070C90 01FC+00 2/2 0/0 0/0 .text GroundCheck__9dBgS_AcchFR4dBgS */ // issues with tmpRoofChk #ifdef NONMATCHING +/* 80424B2C-80424B80 05184C 0050+04 1/1 0/0 0/0 .bss tmpRoofChk$4165 */ +static dBgS_RoofChk tmpRoofChk; + void dBgS_Acch::GroundCheck(dBgS& param_0) { if (!(m_flags & GRND_NONE)) { cXyz grnd_pos; @@ -369,6 +364,13 @@ void dBgS_Acch::GroundCheck(dBgS& param_0) { } } #else +/* ############################################################################################## */ +/* 80424B20-80424B2C 051840 000C+00 1/1 0/0 0/0 .bss @4166 */ +static u8 lit_4166[12]; + +/* 80424B2C-80424B80 05184C 0050+04 1/1 0/0 0/0 .bss tmpRoofChk$4165 */ +static u8 tmpRoofChk[80 + 4 /* padding */]; + #pragma push #pragma optimization_level 0 #pragma optimizewithasm off diff --git a/src/d/bg/d_bg_s_movebg_actor.cpp b/src/d/bg/d_bg_s_movebg_actor.cpp index 9fed5c3f5f4..90ee3982d9f 100644 --- a/src/d/bg/d_bg_s_movebg_actor.cpp +++ b/src/d/bg/d_bg_s_movebg_actor.cpp @@ -170,7 +170,7 @@ int dBgS_MoveBgActor::MoveBGCreate(char const* p_name, int dzb_id, MoveBGActor_S u32 param_3, Mtx* param_4) { if (param_4 == NULL) { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); - mDoMtx_stack_c::YrotM(mCollisionRot.y); + mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::scaleM(mScale.x, mScale.y, mScale.z); PSMTXCopy(mDoMtx_stack_c::get(), field_0x56c); } else { @@ -220,7 +220,7 @@ bool dBgS_MoveBgActor::MoveBGExecute() { bool ret = Execute(&tmp); if (tmp == NULL) { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); - mDoMtx_stack_c::YrotM(mCollisionRot.y); + mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::scaleM(mScale.x, mScale.y, mScale.z); PSMTXCopy(mDoMtx_stack_c::get(), field_0x56c); } else { diff --git a/src/d/bg/d_bg_w.cpp b/src/d/bg/d_bg_w.cpp index 33648aa4615..9477aeb75f3 100644 --- a/src/d/bg/d_bg_w.cpp +++ b/src/d/bg/d_bg_w.cpp @@ -9,6 +9,7 @@ #include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/mtx/mtxvec.h" +#include "rel/d/a/d_a_horse/d_a_horse.h" // // Forward References: @@ -476,7 +477,7 @@ void cBgW::GlobalVtx() { /* 80079484-80079564 073DC4 00E0+00 1/1 0/0 0/0 .text SetVtx__4cBgWFv */ // matches with literals #ifdef NONMATCHING -int cBgW::SetVtx() { +bool cBgW::SetVtx() { if (field_0x88 & 0x10) { pm_vtx_tbl = NULL; } else if (field_0x88 & 0x1) { @@ -1136,7 +1137,7 @@ s32 cBgW::GetGrpRoomIndex(cBgS_PolyInfo const& poly) const { return 0xFF; } - int room_index = pm_bgd->m_g_tbl[tmp].field_0x2a; + room_index = pm_bgd->m_g_tbl[tmp].field_0x2a; if (room_index >= 0xFF) { room_index = 0xFF; } diff --git a/src/d/cc/d_cc_uty.cpp b/src/d/cc/d_cc_uty.cpp index 1c4307ec7e8..17667dd9d73 100644 --- a/src/d/cc/d_cc_uty.cpp +++ b/src/d/cc/d_cc_uty.cpp @@ -126,28 +126,28 @@ u16 cc_pl_cut_bit_get() { daPy_py_c* link = (daPy_py_c*)dComIfGp_getPlayer(0); u16 bit = 0; - if (link->getCutType() == daPy_py_c::TYPE_CUT_VERTICAL) { + if (link->getCutType() == daPy_py_c::CUT_TYPE_NM_VERTICAL) { bit = 0x1; - } else if (link->getCutType() == daPy_py_c::TYPE_CUT_STAB) { + } else if (link->getCutType() == daPy_py_c::CUT_TYPE_NM_STAB) { bit = 0x2; - } else if (link->getCutType() == daPy_py_c::TYPE_CUT_STAB_COMBO) { + } else if (link->getCutType() == daPy_py_c::CUT_TYPE_COMBO_STAB) { bit = 0x200; - } else if (link->getCutType() == daPy_py_c::TYPE_CUT_SWEEP) { + } else if (link->getCutType() == daPy_py_c::CUT_TYPE_NM_RIGHT) { bit = 0x4; - } else if (link->getCutType() == daPy_py_c::TYPE_CUT_HORIZONTAL) { + } else if (link->getCutType() == daPy_py_c::CUT_TYPE_NM_LEFT) { bit = 0x8; - } else if (link->getCutType() == daPy_py_c::TYPE_CUT_LEFT_SWEEP_FINISH) { + } else if (link->getCutType() == daPy_py_c::CUT_TYPE_FINISH_LEFT) { bit = 0x20; - } else if (link->getCutType() == daPy_py_c::TYPE_CUT_DOWN_FINISH) { + } else if (link->getCutType() == daPy_py_c::CUT_TYPE_FINISH_VERTICAL) { bit = 0x40; - } else if (link->getCutType() == daPy_py_c::TYPE_CUT_TURN_RIGHT || link->getCutType() == 9 || + } else if (link->getCutType() == daPy_py_c::CUT_TYPE_TURN_RIGHT || link->getCutType() == 9 || link->getCutType() == 43 || - link->getCutType() == daPy_py_c::TYPE_CUT_LARGE_TURN_RIGHT) { + link->getCutType() == daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT) { bit = 0x80; - } else if (link->getCutType() == daPy_py_c::TYPE_CUT_TURN_LEFT || - link->getCutType() == daPy_py_c::TYPE_CUT_LARGE_TURN_LEFT) { + } else if (link->getCutType() == daPy_py_c::CUT_TYPE_TURN_LEFT || + link->getCutType() == daPy_py_c::CUT_TYPE_LARGE_TURN_LEFT) { bit = 0x800; - } else if (link->getCutType() == daPy_py_c::TYPE_CUT_JUMP) { + } else if (link->getCutType() == daPy_py_c::CUT_TYPE_JUMP) { bit = 0x100; } else if (link->getCutType() == 40 || link->getCutType() == 41) { bit = 0x400; @@ -465,8 +465,8 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* p_enemy, dCcU_AtInfo* p_info) { } if (p_info->mHitType == HIT_TYPE_LINK_NORMAL_ATTACK && - link->getCutType() == daPy_py_c::TYPE_CUT_HEAD) { - p_info->mHitDirection = link->mCollisionRot.y; + link->getCutType() == daPy_py_c::CUT_TYPE_HEAD_JUMP) { + p_info->mHitDirection = link->shape_angle.y; } if (p_info->mpCollider->ChkAtType(AT_TYPE_HOOKSHOT) && diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index a50cf1985b0..d85e252e31a 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -424,23 +424,23 @@ void dComIfG_play_c::clearItemBombNumCount(u8 i_item) { mItemBombNumCount[i_item] = 0; } -void dComIfG_play_c::setNowVibration(u8 vib_status) { - mNowVibration = vib_status; +void dComIfG_play_c::setNowVibration(u8 i_vibration) { + mNowVibration = i_vibration; } u32 dComIfG_play_c::getNowVibration() { return mNowVibration; } -void dComIfG_play_c::setStartStage(dStage_startStage_c* p_startStage) { +void dComIfG_play_c::setStartStage(dStage_startStage_c* i_startStage) { mLayerOld = mStartStage.getLayer(); - mStartStage = *p_startStage; + mStartStage = *i_startStage; } /* 8002B3F4-8002B434 025D34 0040+00 1/1 0/0 0/0 .text dComIfG_get_timelayer__FPi */ -void dComIfG_get_timelayer(int* layer) { +void dComIfG_get_timelayer(int* i_layer) { if (dKy_daynight_check()) { - *layer += 1; + *i_layer += 1; } } @@ -1062,7 +1062,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* stageName, int roomId, // Stage is Fishing Pond or Hena's Hut else if (!strcmp(stageName, "F_SP127") || !strcmp(stageName, "R_SP127")) { - switch (g_env_light[0x12fe]) { + switch (g_env_light.field_0x12fe) { case 1: layer = 0; break; @@ -1189,8 +1189,8 @@ void dComIfG_play_c::drawSimpleModel() { /* 8002CAF0-8002CB30 027430 0040+00 0/0 0/0 16/16 .text * addSimpleModel__14dComIfG_play_cFP12J3DModelDataiUc */ -int dComIfG_play_c::addSimpleModel(J3DModelData* i_modelData, int roomNo, u8 drawBG) { - if (mSimpleModel != NULL && mSimpleModel->addModel(i_modelData, roomNo, drawBG)) { +int dComIfG_play_c::addSimpleModel(J3DModelData* i_modelData, int i_roomNo, u8 i_drawBG) { + if (mSimpleModel != NULL && mSimpleModel->addModel(i_modelData, i_roomNo, i_drawBG)) { return 1; } @@ -1199,9 +1199,9 @@ int dComIfG_play_c::addSimpleModel(J3DModelData* i_modelData, int roomNo, u8 dra /* 8002CB30-8002CB68 027470 0038+00 0/0 0/0 16/16 .text * removeSimpleModel__14dComIfG_play_cFP12J3DModelDatai */ -int dComIfG_play_c::removeSimpleModel(J3DModelData* i_modelData, int roomNo) { +int dComIfG_play_c::removeSimpleModel(J3DModelData* i_modelData, int i_roomNo) { if (mSimpleModel != NULL) { - mSimpleModel->removeModel(i_modelData, roomNo); + mSimpleModel->removeModel(i_modelData, i_roomNo); return 1; } @@ -1210,38 +1210,38 @@ int dComIfG_play_c::removeSimpleModel(J3DModelData* i_modelData, int roomNo) { /* 8002CB68-8002CB94 0274A8 002C+00 0/0 0/0 16/16 .text * entrySimpleModel__14dComIfG_play_cFP8J3DModeli */ -void dComIfG_play_c::entrySimpleModel(J3DModel* i_model, int roomNo) { +void dComIfG_play_c::entrySimpleModel(J3DModel* i_model, int i_roomNo) { if (mSimpleModel != NULL) { - mSimpleModel->entry(i_model, roomNo); + mSimpleModel->entry(i_model, i_roomNo); } } -void dComIfG_play_c::setTimerNowTimeMs(int time) { - mTimerInfo.mTimerNowTimeMs = time; +void dComIfG_play_c::setTimerNowTimeMs(int i_time) { + mTimerInfo.mTimerNowTimeMs = i_time; } int dComIfG_play_c::getTimerNowTimeMs() { return mTimerInfo.mTimerNowTimeMs; } -void dComIfG_play_c::setTimerLimitTimeMs(int time) { - mTimerInfo.mTimerLimitTimeMs = time; +void dComIfG_play_c::setTimerLimitTimeMs(int i_time) { + mTimerInfo.mTimerLimitTimeMs = i_time; } int dComIfG_play_c::getTimerLimitTimeMs() { return mTimerInfo.mTimerLimitTimeMs; } -void dComIfG_play_c::setTimerMode(int mode) { - mTimerInfo.mTimerMode = mode; +void dComIfG_play_c::setTimerMode(int i_mode) { + mTimerInfo.mTimerMode = i_mode; } int dComIfG_play_c::getTimerMode() { return mTimerInfo.mTimerMode; } -void dComIfG_play_c::setTimerType(u8 type) { - mTimerInfo.mTimerType = type; +void dComIfG_play_c::setTimerType(u8 i_type) { + mTimerInfo.mTimerType = i_type; } u8 dComIfG_play_c::getTimerType() { @@ -1249,8 +1249,8 @@ u8 dComIfG_play_c::getTimerType() { } /* 8002CBD4-8002CBDC -00001 0008+00 0/0 0/0 0/0 .text setTimerPtr__14dComIfG_play_cFP8dTimer_c */ -void dComIfG_play_c::setTimerPtr(dTimer_c* ptr) { - mTimerInfo.mTimerPtr = ptr; +void dComIfG_play_c::setTimerPtr(dTimer_c* i_ptr) { + mTimerInfo.mTimerPtr = i_ptr; } /* 8002CBDC-8002CBE4 02751C 0008+00 6/6 7/7 15/15 .text getTimerPtr__14dComIfG_play_cFv @@ -1281,7 +1281,7 @@ SECTION_SDATA extern GXColor g_blackColor = {0, 0, 0, 255}; /* 8002CC54-8002CD44 027594 00F0+00 1/1 1/1 0/0 .text dComIfG_changeOpeningScene__FP11scene_classs */ -int dComIfG_changeOpeningScene(scene_class* scene, s16 procName) { +int dComIfG_changeOpeningScene(scene_class* i_scene, s16 i_procName) { dComIfGp_offEnableNextStage(); dComIfGp_setNextStage("F_SP102", 100, 0, 10); mDoAud_setSceneName(dComIfGp_getNextStageName(), dComIfGp_getNextStageRoomNo(), @@ -1292,28 +1292,28 @@ int dComIfG_changeOpeningScene(scene_class* scene, s16 procName) { mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); } - fopScnM_ChangeReq(scene, procName, 0, 30); - fopScnM_ReRequest(procName, 0); + fopScnM_ChangeReq(i_scene, i_procName, 0, 30); + fopScnM_ReRequest(i_procName, 0); return 1; } /* 8002CD44-8002CDB8 027684 0074+00 0/0 2/2 0/0 .text dComIfG_resetToOpening__FP11scene_class */ -BOOL dComIfG_resetToOpening(scene_class* scene) { +BOOL dComIfG_resetToOpening(scene_class* i_scene) { if (mDoRst::isReturnToMenu() || !mDoRst::isReset() || mDoGph_gInf_c::getFader()->getStatus() == 2) { return 0; } - dComIfG_changeOpeningScene(scene, PROC_OPENING_SCENE); + dComIfG_changeOpeningScene(i_scene, PROC_OPENING_SCENE); mDoAud_bgmStop(30); mDoAud_resetProcess(); return 1; } -static int phase_1(char* arc_name) { - if (!dComIfG_setObjectRes(arc_name, 0, NULL)) { - OSReport_Error("%s.arc Read Error !!\n", arc_name); +static int phase_1(char* i_arcName) { + if (!dComIfG_setObjectRes(i_arcName, 0, NULL)) { + OSReport_Error("%s.arc Read Error !!\n", i_arcName); return cPhs_ERROR_e; } @@ -1321,11 +1321,11 @@ static int phase_1(char* arc_name) { } /* 8002CE38-8002CEB4 027778 007C+00 1/0 0/0 0/0 .text phase_2__FPc */ -static int phase_2(char* arc_name) { - int syncStatus = dComIfG_syncObjectRes(arc_name); +static int phase_2(char* i_arcName) { + int syncStatus = dComIfG_syncObjectRes(i_arcName); if (syncStatus < 0) { - OSReport_Error("%s.arc Sync Read Error !!\n", arc_name); + OSReport_Error("%s.arc Sync Read Error !!\n", i_arcName); return cPhs_ERROR_e; } else { return syncStatus > 0 ? 0 : 2; @@ -1339,7 +1339,7 @@ static int phase_3(char*) { /* 8002CEBC-8002CEFC 0277FC 0040+00 0/0 7/7 550/550 .text * dComIfG_resLoad__FP30request_of_phase_process_classPCc */ -int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* arc_name) { +int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_arcName) { static int (*l_method[3])(void*) = {(int (*)(void*))phase_1, (int (*)(void*))phase_2, (int (*)(void*))phase_3}; @@ -1347,12 +1347,12 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* arc_nam return cPhs_COMPLEATE_e; } - return dComLbG_PhaseHandler(i_phase, l_method, (void*)arc_name); + return dComLbG_PhaseHandler(i_phase, l_method, (void*)i_arcName); } /* 8002CEFC-8002CF5C 02783C 0060+00 1/0 0/0 0/0 .text phase_01__FP12phaseParam_c */ -static int phase_01(phaseParam_c* phase) { - if (dComIfG_setObjectRes(phase->mResName, 0, phase->mpHeap) == 0) { +static int phase_01(phaseParam_c* i_phasePrm) { + if (dComIfG_setObjectRes(i_phasePrm->mResName, 0, i_phasePrm->mpHeap) == 0) { return 5; } @@ -1360,8 +1360,8 @@ static int phase_01(phaseParam_c* phase) { } /* 8002CF5C-8002CFB8 02789C 005C+00 1/0 0/0 0/0 .text phase_02__FP12phaseParam_c */ -static int phase_02(phaseParam_c* phase) { - int syncStatus = dComIfG_syncObjectRes(phase->mResName); +static int phase_02(phaseParam_c* i_phasePrm) { + int syncStatus = dComIfG_syncObjectRes(i_phasePrm->mResName); if (syncStatus < 0) { return 5; } else { @@ -1371,12 +1371,12 @@ static int phase_02(phaseParam_c* phase) { /* 8002CFB8-8002CFC0 0278F8 0008+00 1/0 0/0 0/0 .text phase_03__FP12phaseParam_c */ static int phase_03(phaseParam_c*) { - return false; + return 0; } /* 8002CFC0-8002D008 027900 0048+00 1/1 3/3 0/0 .text * dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap */ -int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* resName, JKRHeap* heap) { +int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_resName, JKRHeap* i_heap) { static int (*l_method[3])(void*) = {(int (*)(void*))phase_01, (int (*)(void*))phase_02, (int (*)(void*))phase_03}; @@ -1384,42 +1384,42 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* resName return cPhs_COMPLEATE_e; } - phaseParam_c param(resName, heap); + phaseParam_c param(i_resName, i_heap); return dComLbG_PhaseHandler(i_phase, l_method, ¶m); } /* 8002D008-8002D06C 027948 0064+00 1/1 10/10 540/540 .text * dComIfG_resDelete__FP30request_of_phase_process_classPCc */ -int dComIfG_resDelete(request_of_phase_process_class* i_phase, char const* resName) { +int dComIfG_resDelete(request_of_phase_process_class* i_phase, char const* i_resName) { if (i_phase->id != cPhs_TWO_e) { return 0; } - dComIfG_deleteObjectResMain(resName); + dComIfG_deleteObjectResMain(i_resName); i_phase->id = cPhs_ZERO_e; return 1; } -s8 dComIfGp_getReverb(int roomNo) { - return dStage_roomRead_dt_c_GetReverbStage(*dComIfGp_getStageRoom(), roomNo); +s8 dComIfGp_getReverb(int i_roomNo) { + return dStage_roomRead_dt_c_GetReverbStage(*dComIfGp_getStageRoom(), i_roomNo); } /* 8002D0B4-8002D1AC 0279F4 00F8+00 0/0 3/3 34/34 .text * dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj */ -int dComIfGd_setSimpleShadow(cXyz* pos, f32 param_1, f32 param_2, cBgS_PolyInfo& param_3, s16 angle, - f32 param_5, _GXTexObj* tex) { +int dComIfGd_setSimpleShadow(cXyz* i_pos, f32 param_1, f32 param_2, cBgS_PolyInfo& param_3, s16 i_angle, + f32 param_5, GXTexObj* i_tex) { if (param_3.ChkSetInfo() && -1000000000.0f != param_1) { cM3dGPla plane; dComIfG_Bgsp().GetTriPla(param_3, &plane); - return dComIfGd_setSimpleShadow(pos, param_1, param_2, &plane.mNormal, angle, param_5, tex); + return dComIfGd_setSimpleShadow(i_pos, param_1, param_2, &plane.mNormal, i_angle, param_5, i_tex); } else { return 0; } } /* 8002D1AC-8002D25C 027AEC 00B0+00 0/0 0/0 1/1 .text dComIfGp_getMapTrans__FiPfPfPs */ -int dComIfGp_getMapTrans(int roomNo, f32* transX, f32* transY, s16* angle) { +int dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_angle) { dStage_Multi_c* multi = dComIfGp_getMulti(); if (multi == NULL) { return 0; @@ -1427,10 +1427,10 @@ int dComIfGp_getMapTrans(int roomNo, f32* transX, f32* transY, s16* angle) { dStage_Mult_info* info = multi->mInfo; for (int i = 0; i < multi->field_0x0; i++) { - if (roomNo == info->mRoomNo) { - *transX = info->mTransX; - *transY = info->mTransY; - *angle = info->mAngle; + if (i_roomNo == info->mRoomNo) { + *o_transX = info->mTransX; + *o_transY = info->mTransY; + *o_angle = info->mAngle; return 1; } info++; @@ -1440,8 +1440,8 @@ int dComIfGp_getMapTrans(int roomNo, f32* transX, f32* transY, s16* angle) { } /* 8002D25C-8002D2AC 027B9C 0050+00 0/0 3/3 3/3 .text dComIfGp_getRoomCamera__Fi */ -stage_camera_class* dComIfGp_getRoomCamera(int roomNo) { - dStage_roomStatus_c* status = dComIfGp_roomControl_getStatusRoomDt(roomNo); +stage_camera_class* dComIfGp_getRoomCamera(int i_roomNo) { + dStage_roomStatus_c* status = dComIfGp_roomControl_getStatusRoomDt(i_roomNo); if (status == NULL) { return NULL; @@ -1451,8 +1451,8 @@ stage_camera_class* dComIfGp_getRoomCamera(int roomNo) { } /* 8002D2AC-8002D2FC 027BEC 0050+00 0/0 3/3 3/3 .text dComIfGp_getRoomArrow__Fi */ -stage_arrow_class* dComIfGp_getRoomArrow(int roomNo) { - dStage_roomStatus_c* status = dComIfGp_roomControl_getStatusRoomDt(roomNo); +stage_arrow_class* dComIfGp_getRoomArrow(int i_roomNo) { + dStage_roomStatus_c* status = dComIfGp_roomControl_getStatusRoomDt(i_roomNo); if (status == NULL) { return NULL; @@ -1462,41 +1462,41 @@ stage_arrow_class* dComIfGp_getRoomArrow(int roomNo) { } /* 8002D2FC-8002D554 027C3C 0258+00 2/2 7/7 4/4 .text dComIfGp_setNextStage__FPCcsScScfUliScsii */ -void dComIfGp_setNextStage(char const* stage, s16 point, s8 roomNo, s8 layer, f32 lastSpeed, - u32 lastMode, int setPoint, s8 wipe, s16 lastAngle, int param_9, - int wipeSpeedT) { - if (layer >= 15) { - layer = -1; +void dComIfGp_setNextStage(char const* i_stage, s16 i_point, s8 i_roomNo, s8 i_layer, f32 i_lastSpeed, + u32 i_lastMode, int i_setPoint, s8 i_wipe, s16 i_lastAngle, int param_9, + int i_wipeSpeedT) { + if (i_layer >= 15) { + i_layer = -1; } if (dComIfGs_isPlayerFieldLastStayFieldDataExistFlag() && daPy_getLinkPlayerActorClass() != NULL) { s8 curPoint = (s8)daPy_getLinkPlayerActorClass()->current.mRoomNo; cXyz pos = dMapInfo_n::getMapPlayerPos(); - s16 angle = daPy_getLinkPlayerActorClass()->mCollisionRot.y; + s16 angle = daPy_getLinkPlayerActorClass()->shape_angle.y; u8 level = dComIfGp_getNowLevel(); dComIfGs_setPlayerFieldLastStayInfo(dComIfGp_getStartStageName(), pos, angle, curPoint, level); } // Set Key Num to 2 if loading Wagon Escort after King Bulblin 2 - if (!strcmp(stage, "F_SP121") && roomNo == 13 && (point == 99 || point == 98) && layer == 2) { + if (!strcmp(i_stage, "F_SP121") && i_roomNo == 13 && (i_point == 99 || i_point == 98) && i_layer == 2) { dComIfGs_setKeyNum(6, 2); } else { dComIfGs_setKeyNum(6, 0); } if (daAlink_getAlinkActorClass() != NULL) { - daAlink_getAlinkActorClass()->setLastSceneMode(&lastMode); + daAlink_getAlinkActorClass()->setLastSceneMode(&i_lastMode); } char* saveName = (char*)dMeter2Info_getSaveStageName(); - if (strcmp(saveName, "") && strcmp(stage, saveName)) { + if (strcmp(saveName, "") && strcmp(i_stage, saveName)) { dMeter2Info_setSaveStageName(""); } u8 wipe_speed; - switch (wipeSpeedT) { + switch (i_wipeSpeedT) { case 0: wipe_speed = 26; break; @@ -1514,15 +1514,15 @@ void dComIfGp_setNextStage(char const* stage, s16 point, s8 roomNo, s8 layer, f3 break; } - g_dComIfG_gameInfo.play.setNextStage(stage, roomNo, point, layer, wipe, wipe_speed); - g_dComIfG_gameInfo.info.getRestart().setLastSceneInfo(lastSpeed, lastMode, lastAngle); - if (setPoint) { - dComIfGs_setStartPoint(point); + g_dComIfG_gameInfo.play.setNextStage(i_stage, i_roomNo, i_point, i_layer, i_wipe, wipe_speed); + g_dComIfG_gameInfo.info.getRestart().setLastSceneInfo(i_lastSpeed, i_lastMode, i_lastAngle); + if (i_setPoint) { + dComIfGs_setStartPoint(i_point); } } -void dComIfGp_setNextStage(char const* stage, s16 point, s8 roomNo, s8 layer) { - dComIfGp_setNextStage(stage, point, roomNo, layer, 0.0f, 0, 1, 0, 0, 1, 0); +void dComIfGp_setNextStage(char const* i_stage, s16 i_point, s8 i_roomNo, s8 i_layer) { + dComIfGp_setNextStage(i_stage, i_point, i_roomNo, i_layer, 0.0f, 0, 1, 0, 0, 1, 0); } BOOL dComIfGs_isStageTbox(int i_stageNo, int i_no) { @@ -1705,29 +1705,29 @@ u16 dComIfGs_getMaxLifeGauge() { return (dComIfGs_getMaxLife() / 5) * 4; } -void dComIfGs_setSelectItemIndex(int i_no, u8 item_index) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectItemIndex(i_no, item_index); +void dComIfGs_setSelectItemIndex(int i_no, u8 i_slotNo) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectItemIndex(i_no, i_slotNo); dComIfGp_setSelectItem(i_no); } -void dComIfGs_setMixItemIndex(int i_no, u8 item_index) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMixItemIndex(i_no, item_index); +void dComIfGs_setMixItemIndex(int i_no, u8 i_slotNo) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMixItemIndex(i_no, i_slotNo); } /* 8002DD3C-8002DDC8 02867C 008C+00 3/3 1/1 0/0 .text dComIfGs_getSelectMixItemNoArrowIndex__Fi */ -u8 dComIfGs_getSelectMixItemNoArrowIndex(int index) { - u8 item_index = dComIfGs_getSelectItemIndex(index); - u8 mix_index = dComIfGs_getMixItemIndex(index); +u8 dComIfGs_getSelectMixItemNoArrowIndex(int i_selmixItemIdx) { + u8 sel_item_slotNo = dComIfGs_getSelectItemIndex(i_selmixItemIdx); + u8 mix_item_slotNo = dComIfGs_getMixItemIndex(i_selmixItemIdx); - if (item_index >= SLOT_15 && item_index < SLOT_18) { - return item_index; + if (sel_item_slotNo >= SLOT_15 && sel_item_slotNo < SLOT_18) { + return sel_item_slotNo; } - if (mix_index != NO_ITEM && mix_index >= SLOT_15 && mix_index < SLOT_18) { - return mix_index; + if (mix_item_slotNo != NO_ITEM && mix_item_slotNo >= SLOT_15 && mix_item_slotNo < SLOT_18) { + return mix_item_slotNo; } - return NO_ITEM; + return 0xFF; } u8 dComIfGs_getMixItemIndex(int i_no) { @@ -1735,37 +1735,37 @@ u8 dComIfGs_getMixItemIndex(int i_no) { } /* 8002DDF4-8002DF1C 028734 0128+00 1/1 13/13 0/0 .text dComIfGp_setSelectItem__Fi */ -void dComIfGp_setSelectItem(int index) { - if (index == SELECT_ITEM_DOWN) { - if (dComIfGs_getSelectItemIndex(index) != NO_ITEM) { - u8 selectItemIdx = dComIfGs_getSelectItemIndex(index); - g_dComIfG_gameInfo.play.setSelectItem(index, selectItemIdx); +void dComIfGp_setSelectItem(int i_selItemIdx) { + if (i_selItemIdx == SELECT_ITEM_DOWN) { + if (dComIfGs_getSelectItemIndex(i_selItemIdx) != 0xFF) { + u8 selItem_slotNo = dComIfGs_getSelectItemIndex(i_selItemIdx); + g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, selItem_slotNo); - if (selectItemIdx == NO_ITEM) { - dComIfGs_setSelectItemIndex(index, NO_ITEM); + if (selItem_slotNo == 0xFF) { + dComIfGs_setSelectItemIndex(i_selItemIdx, 0xFF); } } else { - g_dComIfG_gameInfo.play.setSelectItem(index, NO_ITEM); + g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, NO_ITEM); } - } else if (dComIfGs_getSelectItemIndex(index) != NO_ITEM) { - u8 item = dComIfGs_getItem(dComIfGs_getSelectItemIndex(index), false); - g_dComIfG_gameInfo.play.setSelectItem(index, item); + } else if (dComIfGs_getSelectItemIndex(i_selItemIdx) != 0xFF) { + u8 item = dComIfGs_getItem(dComIfGs_getSelectItemIndex(i_selItemIdx), false); + g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, item); if (item == NO_ITEM) { - dComIfGs_setSelectItemIndex(index, NO_ITEM); + dComIfGs_setSelectItemIndex(i_selItemIdx, 0xFF); } } else { - g_dComIfG_gameInfo.play.setSelectItem(index, NO_ITEM); + g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, NO_ITEM); } } /* 8002DF1C-8002E048 02885C 012C+00 4/4 19/19 0/0 .text dComIfGp_getSelectItem__Fi */ -u8 dComIfGp_getSelectItem(int index) { - u8 playItem = g_dComIfG_gameInfo.play.getSelectItem(index); +u8 dComIfGp_getSelectItem(int i_selItemIdx) { + u8 playItem = g_dComIfG_gameInfo.play.getSelectItem(i_selItemIdx); - if ((index == SELECT_ITEM_X || index == SELECT_ITEM_Y) && - dComIfGs_getMixItemIndex(index) != NO_ITEM) { - u8 saveItem = dComIfGs_getItem(dComIfGs_getMixItemIndex(index), false); + if ((i_selItemIdx == SELECT_ITEM_X || i_selItemIdx == SELECT_ITEM_Y) && + dComIfGs_getMixItemIndex(i_selItemIdx) != 0xFF) { + u8 saveItem = dComIfGs_getItem(dComIfGs_getMixItemIndex(i_selItemIdx), false); if (saveItem == BOW) { saveItem = playItem; @@ -1962,27 +1962,26 @@ u8 dComIfGs_getBottleMax() { } /* 8002E5C0-8002E688 028F00 00C8+00 0/0 11/11 0/0 .text dComIfGp_getSelectItemNum__Fi */ -int dComIfGp_getSelectItemNum(int index) { - u8 selectItem = dComIfGp_getSelectItem(index); - int itemNum = 0; +s16 dComIfGp_getSelectItemNum(int i_selItemIdx) { + u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx); + s16 itemNum = 0; if (selectItem == NORMAL_BOMB || selectItem == WATER_BOMB || selectItem == POKE_BOMB || selectItem == BOMB_ARROW) { - selectItem = dComIfGs_getSelectMixItemNoArrowIndex(index) - SLOT_15; + selectItem = dComIfGs_getSelectMixItemNoArrowIndex(i_selItemIdx) - SLOT_15; itemNum = dComIfGs_getBombNum(selectItem); } else if (selectItem == PACHINKO) { itemNum = dComIfGs_getPachinkoNum(); } else if (selectItem == BEE_CHILD) { - selectItem = dComIfGs_getSelectItemIndex(index); - itemNum = dComIfGs_getBottleNum(selectItem - SLOT_11); + itemNum = dComIfGs_getBottleNum(dComIfGs_getSelectItemIndex(i_selItemIdx) - SLOT_11); } return itemNum; } /* 8002E688-8002E714 028FC8 008C+00 0/0 5/5 0/0 .text dComIfGp_getSelectItemMaxNum__Fi */ -int dComIfGp_getSelectItemMaxNum(int index) { - u8 selectItem = dComIfGp_getSelectItem(index); +int dComIfGp_getSelectItemMaxNum(int i_selItemIdx) { + u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx); int itemNum = 0; if (selectItem == BOMB_BAG_LV1) { @@ -2000,42 +1999,41 @@ int dComIfGp_getSelectItemMaxNum(int index) { } /* 8002E714-8002E83C 029054 0128+00 0/0 2/2 0/0 .text dComIfGp_setSelectItemNum__Fis */ -void dComIfGp_setSelectItemNum(int index, s16 num) { - u8 selectItem = dComIfGp_getSelectItem(index); +void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num) { + u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx); if (selectItem == NORMAL_BOMB || selectItem == WATER_BOMB || selectItem == POKE_BOMB || selectItem == BOMB_ARROW) { - u8 mix_index = dComIfGs_getSelectMixItemNoArrowIndex(index) - SLOT_15; + u8 mix_slotNo = dComIfGs_getSelectMixItemNoArrowIndex(i_selItemIdx) - SLOT_15; - if (num > dComIfGs_getBombMax(selectItem)) { - num = dComIfGs_getBombMax(selectItem); + if (i_num > dComIfGs_getBombMax(selectItem)) { + i_num = dComIfGs_getBombMax(selectItem); } - dComIfGs_setBombNum(mix_index, num); + dComIfGs_setBombNum(mix_slotNo, i_num); } else if (selectItem == PACHINKO) { - dComIfGs_setPachinkoNum(num); + dComIfGs_setPachinkoNum(i_num); } else if (selectItem == BEE_CHILD) { - u8 bottle_idx = dComIfGs_getSelectItemIndex(index) - SLOT_11; + u8 bottle_slot_no = dComIfGs_getSelectItemIndex(i_selItemIdx) - SLOT_11; - if (num > dComIfGs_getBottleMax()) { - num = dComIfGs_getBottleMax(); + if (i_num > dComIfGs_getBottleMax()) { + i_num = dComIfGs_getBottleMax(); } - dComIfGs_setBottleNum(bottle_idx, num); + dComIfGs_setBottleNum(bottle_slot_no, i_num); } } /* 8002E83C-8002E910 02917C 00D4+00 0/0 5/5 0/0 .text dComIfGp_addSelectItemNum__Fis */ -void dComIfGp_addSelectItemNum(int index, s16 num) { - u8 selectItem = dComIfGp_getSelectItem(index); +void dComIfGp_addSelectItemNum(int i_selItemIdx, s16 i_num) { + u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx); if (selectItem == NORMAL_BOMB || selectItem == WATER_BOMB || selectItem == POKE_BOMB || selectItem == BOMB_ARROW) { - u8 mix_index = dComIfGs_getSelectMixItemNoArrowIndex(index) - SLOT_15; - dComIfGp_setItemBombNumCount(mix_index, num); + u8 slot_no = dComIfGs_getSelectMixItemNoArrowIndex(i_selItemIdx) - SLOT_15; + dComIfGp_setItemBombNumCount(slot_no, i_num); } else if (selectItem == PACHINKO) { - dComIfGp_setItemPachinkoNumCount(num); + dComIfGp_setItemPachinkoNumCount(i_num); } else if (selectItem == BEE_CHILD) { - selectItem = dComIfGs_getSelectItemIndex(index); - dComIfGs_addBottleNum(selectItem - SLOT_11, num); + dComIfGs_addBottleNum(dComIfGs_getSelectItemIndex(i_selItemIdx) - SLOT_11, i_num); } } @@ -2062,8 +2060,8 @@ void dComIfGs_gameStart() { dComIfGp_setNextStage(name, point, roomNo, -1, 0.0f, 0, 1, 0, 0, 0, 0); } -u32 dComIfG_getTrigA(u32 pad) { - return mDoCPd_c::getTrigA(pad); +u32 dComIfG_getTrigA(u32 i_padNo) { + return mDoCPd_c::getTrigA(i_padNo); } /* ############################################################################################## */ @@ -2093,7 +2091,7 @@ asm void dComIfGp_calcNowRegion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void dComIfG_getNowCalcRegion() { +static asm u8 dComIfG_getNowCalcRegion() { nofralloc #include "asm/d/com/d_com_inf_game/dComIfG_getNowCalcRegion__Fv.s" } @@ -2166,45 +2164,45 @@ void dComIfGs_setSelectEquipShield(u8 i_itemNo) { g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectEquip(COLLECT_SHIELD, i_itemNo); } -void dComIfGs_setKeyNum(int i_stageNo, u8 keyNum) { +void dComIfGs_setKeyNum(int i_stageNo, u8 i_keyNum) { if (dComIfGp_getStageStagInfo()) { stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); if (i_stageNo == i_dStage_stagInfo_GetSaveTbl(stag_info)) { - dComIfGs_setKeyNum(keyNum); + dComIfGs_setKeyNum(i_keyNum); } } - g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().setKeyNum(keyNum); + g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().setKeyNum(i_keyNum); } /* 8002F0E0-8002F128 029A20 0048+00 1/1 0/0 0/0 .text dComIfGs_setWarpItemData__FiPCc4cXyzsScUcUc */ -static void dComIfGs_setWarpItemData(int param_0, char const* stage, cXyz pos, s16 angle, s8 roomNo, +static void dComIfGs_setWarpItemData(int, char const* i_stage, cXyz i_pos, s16 i_angle, s8 i_roomNo, u8 param_5, u8 param_6) { - g_dComIfG_gameInfo.play.setWarpItemData(stage, pos, angle, roomNo, param_5, param_6); + g_dComIfG_gameInfo.play.setWarpItemData(i_stage, i_pos, i_angle, i_roomNo, param_5, param_6); } -void dComIfG_play_c::setWarpItemData(char const* stage, cXyz pos, s16 angle, s8 roomNo, u8 param_4, +void dComIfG_play_c::setWarpItemData(char const* i_stage, cXyz i_pos, s16 i_angle, s8 i_roomNo, u8 param_4, u8 param_5) { - strcpy(mWarpItemStage, stage); - mWarpItemPos.set(pos); - mWarpItemAngle = angle; - mWarpItemRoom = roomNo; + strcpy(mWarpItemStage, i_stage); + mWarpItemPos.set(i_pos); + mWarpItemAngle = i_angle; + mWarpItemRoom = i_roomNo; field_0x4fac = param_5; field_0x4fab = param_4; } -void dComIfGs_setWarpItemData(char const* stage, cXyz pos, s16 angle, s8 roomNo, u8 param_4, +void dComIfGs_setWarpItemData(char const* i_stage, cXyz i_pos, s16 i_angle, s8 i_roomNo, u8 param_4, u8 param_5) { - dComIfGs_setWarpItemData(0, stage, pos, angle, roomNo, param_4, param_5); - dComIfGs_setLastWarpMarkItemData(stage, pos, angle, roomNo, param_4, param_5); + dComIfGs_setWarpItemData(0, i_stage, i_pos, i_angle, i_roomNo, param_4, param_5); + dComIfGs_setLastWarpMarkItemData(i_stage, i_pos, i_angle, i_roomNo, param_4, param_5); } -void dComIfGs_setLastWarpMarkItemData(const char* stage, cXyz pos, s16 angle, s8 roomNo, u8 unk1, - u8 unk2) { - g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().setWarpItemData(stage, pos, angle, - roomNo, unk1, unk2); +void dComIfGs_setLastWarpMarkItemData(const char* i_stage, cXyz i_pos, s16 i_angle, s8 i_roomNo, + u8 param_4, u8 param_5) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().setWarpItemData( + i_stage, i_pos, i_angle, i_roomNo, param_4, param_5); } const char* dComIfGs_getWarpStageName() { @@ -2228,9 +2226,7 @@ BOOL dComIfGs_getWarpMarkFlag() { return dComIfGs_getLastWarpAcceptStage() >= 0; } -void dComIfGs_setWarpMarkFlag(u8) { - /* empty function */ -} +void dComIfGs_setWarpMarkFlag(u8) {} /* 8002F314-8002F328 029C54 0014+00 0/0 0/0 1/1 .text __ct__19dComIfG_resLoader_cFv */ dComIfG_resLoader_c::dComIfG_resLoader_c() { @@ -2250,10 +2246,10 @@ dComIfG_resLoader_c::~dComIfG_resLoader_c() { } /* 8002F3B4-8002F434 029CF4 0080+00 0/0 0/0 1/1 .text load__19dComIfG_resLoader_cFPPCcP7JKRHeap */ -int dComIfG_resLoader_c::load(char const** param_0, JKRHeap* heap) { - field_0x0 = param_0; +int dComIfG_resLoader_c::load(char const** i_resNameTbl, JKRHeap* i_heap) { + field_0x0 = i_resNameTbl; - int phase_state = dComIfG_resLoad(&field_0x4, field_0x0[field_0xc], heap); + int phase_state = dComIfG_resLoad(&field_0x4, field_0x0[field_0xc], i_heap); if (phase_state == cPhs_COMPLEATE_e) { if (field_0x0[field_0xc + 1][0] != 0) { field_0xc++; @@ -2266,25 +2262,23 @@ int dComIfG_resLoader_c::load(char const** param_0, JKRHeap* heap) { } /* 8002F434-8002F478 029D74 0044+00 0/0 12/12 12/12 .text dComIfG_getStageRes__FPCc */ -void* dComIfG_getStageRes(char const* resName) { - return dComIfG_getStageRes("Stg_00", resName); +void* dComIfG_getStageRes(char const* i_resName) { + return dComIfG_getStageRes("Stg_00", i_resName); } /* 8002F478-8002F4BC 029DB8 0044+00 0/0 1/1 0/0 .text dComIfG_getOldStageRes__FPCc */ -void* dComIfG_getOldStageRes(char const* resName) { - return dComIfG_getStageRes("Xtg_00", resName); +void* dComIfG_getOldStageRes(char const* i_resName) { + return dComIfG_getStageRes("Xtg_00", i_resName); } -char* dComIfG_getRoomArcName(int roomNo) { +char* dComIfG_getRoomArcName(int i_roomNo) { static char buf[32]; - sprintf(buf, "R%02d_00", roomNo); + sprintf(buf, "R%02d_00", i_roomNo); return buf; } /* 8002F500-8002F504 029E40 0004+00 0/0 1/1 0/0 .text dComIfGp_ret_wp_set__FSc */ -void dComIfGp_ret_wp_set(s8) { - /* empty function */ -} +void dComIfGp_ret_wp_set(s8) {} void dComIfGp_world_dark_set(u8 param_0) { g_dComIfG_gameInfo.mWorldDark = param_0; @@ -2294,14 +2288,14 @@ u8 dComIfGp_world_dark_get() { return g_dComIfG_gameInfo.mWorldDark; } -int dComIfG_TimerStart(int mode, s16 time) { - if (mode == dComIfG_getTimerMode()) { +int dComIfG_TimerStart(int i_mode, s16 i_time) { + if (i_mode == dComIfG_getTimerMode()) { dTimer_c* timer = dComIfG_getTimerPtr(); if (timer != NULL) { - if (time == 0) { - timer->start(mode); + if (i_time == 0) { + timer->start(i_mode); } else { - timer->start(mode, time); + timer->start(i_mode, i_time); } return 1; } else { @@ -2312,8 +2306,8 @@ int dComIfG_TimerStart(int mode, s16 time) { return 0; } -int dComIfG_TimerStop(int mode) { - if (mode == dComIfG_getTimerMode()) { +int dComIfG_TimerStop(int i_mode) { + if (i_mode == dComIfG_getTimerMode()) { dTimer_c* timer = dComIfG_getTimerPtr(); if (timer != NULL) { timer->stop(4); @@ -2326,8 +2320,8 @@ int dComIfG_TimerStop(int mode) { return 0; } -int dComIfG_TimerReStart(int mode) { - if (mode == dComIfG_getTimerMode()) { +int dComIfG_TimerReStart(int i_mode) { + if (i_mode == dComIfG_getTimerMode()) { dTimer_c* timer = dComIfG_getTimerPtr(); if (timer != NULL) { timer->restart(4); @@ -2340,8 +2334,8 @@ int dComIfG_TimerReStart(int mode) { return 0; } -int dComIfG_TimerEnd(int mode, int param_1) { - if (mode == dComIfG_getTimerMode()) { +int dComIfG_TimerEnd(int i_mode, int param_1) { + if (i_mode == dComIfG_getTimerMode()) { dTimer_c* timer = dComIfG_getTimerPtr(); if (timer != NULL) { timer->end(param_1); @@ -2355,8 +2349,8 @@ int dComIfG_TimerEnd(int mode, int param_1) { } /* 8002F72C-8002F79C 02A06C 0070+00 0/0 0/0 2/2 .text dComIfG_TimerDeleteCheck__Fi */ -int dComIfG_TimerDeleteCheck(int mode) { - if (mode == dComIfG_getTimerMode()) { +int dComIfG_TimerDeleteCheck(int i_mode) { + if (i_mode == dComIfG_getTimerMode()) { dTimer_c* timer = dComIfG_getTimerPtr(); if (timer != NULL) { return timer->deleteCheck(); @@ -2368,8 +2362,8 @@ int dComIfG_TimerDeleteCheck(int mode) { return 0; } -int dComIfG_TimerDeleteRequest(int mode) { - if (mode == dComIfG_getTimerMode()) { +int dComIfG_TimerDeleteRequest(int i_mode) { + if (i_mode == dComIfG_getTimerMode()) { dTimer_c* timer = dComIfG_getTimerPtr(); if (timer != NULL) { timer->deleteRequest(); @@ -2434,31 +2428,13 @@ bool dComIfGs_shake_kandelaar_check() { return check; } -/* ############################################################################################## */ -/* 80451D20-80451D28 000320 0008+00 1/1 0/0 0/0 .sdata2 @7580 */ -SECTION_SDATA2 static f64 lit_7580 = 0.6; - /* 8002FA54-8002FA84 02A394 0030+00 0/0 4/4 96/96 .text dComIfGs_wolfeye_effect_check__Fv */ -#ifdef NONMATCHING -int dComIfGs_wolfeye_effect_check() { - BOOL ret = 0; - if (g_env_light.field_0xf3d == 1 && g_env_light.field_0xf40 > 0.6) { - ret = 1; - } +bool dComIfGs_wolfeye_effect_check() { + dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); - return ret; + return env_light->field_0xf3d == 1 && env_light->field_0xf40 > 0.6; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dComIfGs_wolfeye_effect_check() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_wolfeye_effect_check__Fv.s" -} -#pragma pop -#endif void dComIfGs_Grass_hide_Set(s8 param_0) { g_dComIfG_gameInfo.field_0x1ddfc = param_0; @@ -2491,58 +2467,52 @@ BOOL dComIfGp_TransportWarp_check() { /* 8002FB20-8002FB80 02A460 0060+00 2/2 6/6 0/0 .text * dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv */ -int dComLbG_PhaseHandler(request_of_phase_process_class* param_0, cPhs__Handler* param_1, - void* param_2) { - int ret = cPhs_Handler(param_0, param_1, param_2); - switch (ret) { +int dComLbG_PhaseHandler(request_of_phase_process_class* i_phaseReq, cPhs__Handler* i_handler, + void* i_data) { + int phase = cPhs_Handler(i_phaseReq, i_handler, i_data); + switch (phase) { case 2: - ret = dComLbG_PhaseHandler(param_0, param_1, param_2); + phase = dComLbG_PhaseHandler(i_phaseReq, i_handler, i_data); break; case 1: case 3: break; } - return ret; + + return phase; } /* 8002FB80-8002FC3C 02A4C0 00BC+00 0/0 1/1 1/1 .text dComIfGs_onVisitedRoom__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_onVisitedRoom(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_onVisitedRoom__Fi.s" +void dComIfGs_onVisitedRoom(int i_roomNo) { + dStage_FileList2_dt_c* fileList = dStage_roomControl_c::getFileList2(i_roomNo); + + if (fileList != NULL && fileList->field_0x13 < 0x40) { + u8 region = dComIfG_getNowCalcRegion(); + if (region != 0xFF && !dComIfGs_isRegionBit(region)) { + dComIfGs_onRegionBit(region); + } + + s32 stayNo = dComIfGp_roomControl_getStayNo(); + dStage_FileList2_dt_c* list = dStage_roomControl_c::getFileList2(stayNo); + dComIfGs_onSaveVisitedRoom(list->field_0x13, i_roomNo); + } } -#pragma pop /* 8002FC3C-8002FC98 02A57C 005C+00 0/0 0/0 1/1 .text dComIfGs_offVisitedRoom__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_offVisitedRoom(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_offVisitedRoom__Fi.s" +void dComIfGs_offVisitedRoom(int i_roomNo) { + s32 stayNo = dComIfGp_roomControl_getStayNo(); + dStage_FileList2_dt_c* list = dStage_roomControl_c::getFileList2(stayNo); + + dComIfGs_offSaveVisitedRoom(list->field_0x13, i_roomNo); } -#pragma pop /* 8002FC98-8002FCF4 02A5D8 005C+00 0/0 1/1 0/0 .text dComIfGs_isVisitedRoom__Fi */ -// instructions swapped -#ifdef NONMATCHING BOOL dComIfGs_isVisitedRoom(int param_0) { - int stayNo = dComIfGp_roomControl_getStayNo(); + s32 stayNo = dComIfGp_roomControl_getStayNo(); dStage_FileList2_dt_c* fileList = dStage_roomControl_c::getFileList2(stayNo); + return dComIfGs_isSaveVisitedRoom(fileList->field_0x13, param_0); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL dComIfGs_isVisitedRoom(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_isVisitedRoom__Fi.s" -} -#pragma pop -#endif /* 8002FCF4-8002FD08 02A634 0014+00 0/0 1/1 0/0 .text dComIfGs_staffroll_next_go__Fv */ void dComIfGs_staffroll_next_go() { diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index f279e51cd16..d21038f7c31 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -1081,10 +1081,10 @@ bool dAttention_c::chaseAttention() { if (!chkFlag(0x4000)) { cSGlobe g1(actor->mAttentionInfo.mPosition - mOwnerAttnPos); - cSAngle a1(g1.U() - mpPlayer->mCollisionRot.y); + cSAngle a1(g1.U() - mpPlayer->shape_angle.y); cSGlobe g2(mOwnerAttnPos - actor->mAttentionInfo.mPosition); - cSAngle a2(g2.U() - actor->mCollisionRot.y); + cSAngle a2(g2.U() - actor->shape_angle.y); u32 type; f32 weight = calcWeight(0x4C, actor, g1.R(), a1.Val(), a2.Val(), &type); @@ -1850,7 +1850,7 @@ f32 dAttention_c::LockonReleaseDistanse() { int idx = mLockOnList[mLockOnOffset].mType + actor->mAttentionInfo.field_0x0[0]; cSGlobe tmp_g(actor->mAttentionInfo.mPosition - mOwnerAttnPos); - cSAngle tmp_a(tmp_g.U() - mpPlayer->mCollisionRot.y); + cSAngle tmp_a(tmp_g.U() - mpPlayer->shape_angle.y); return distace_angle_adjust(dist_table[idx].field_0x8, tmp_a, 1.0f) + dist_table[idx].field_0x4; } diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index dc01d590e01..bd0cec2e529 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -3553,7 +3553,7 @@ asm void dCam_getAngleX(camera_class* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dCam_getControledAngleY(camera_class* param_0) { +asm s16 dCam_getControledAngleY(camera_class* param_0) { nofralloc #include "asm/d/d_camera/dCam_getControledAngleY__FP12camera_class.s" } diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 370e64da471..5d6bcdf13e9 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -249,7 +249,7 @@ extern "C" extern void* __vt__Q214JStudio_JStage13TCreateObject[4]; extern "C" extern void* __vt__Q215JStudio_JAudio213TCreateObject[4]; extern "C" extern void* __vt__Q217JStudio_JParticle13TCreateObject[6]; extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; -extern "C" extern u8 data_80450B74[4]; +extern "C" extern Z2SoundStarter* data_80450B74; extern "C" u8 mEmitterMng__13dPa_control_c[4]; // @@ -790,7 +790,7 @@ int dDemo_setDemoData(fopAc_ac_c* param_0, u8 param_1, mDoExt_McaMorf* param_2, } if (flags & 8) { - param_0->mCollisionRot = demo_actor->getRatate(); + param_0->shape_angle = demo_actor->getRatate(); } if (flags & 4) { @@ -1427,6 +1427,10 @@ bool dDemo_system_c::JSGFindObject(JStage::TObject** p_TObj, char const* actorNa /* 80451DE0-80451DE8 0003E0 0008+00 1/1 0/0 0/0 .sdata2 @5123 */ SECTION_SDATA2 static f64 lit_5123 = 1.0 / 29.999998435378155; +inline Z2SoundStarter* Z2GetSoundStarter() { + return data_80450B74; +} + /* 80039678-80039910 033FB8 0298+00 0/0 1/1 0/0 .text create__7dDemo_cFv */ #ifdef NONMATCHING void dDemo_c::create() { @@ -1442,10 +1446,10 @@ void dDemo_c::create() { m_control->setSecondPerFrame(1.0 / 29.999998435378155); m_control->setFactory(m_factory); - m_control->appendCreateObject(m_stage); - m_control->appendCreateObject(m_audio); - m_control->appendCreateObject(m_particle); - m_control->appendCreateObject(m_message); + m_factory->appendCreateObject(m_stage); + m_factory->appendCreateObject(m_audio); + m_factory->appendCreateObject(m_particle); + m_factory->appendCreateObject(m_message); m_system->setObject(m_object); m_data = NULL; diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index faeab6a55de..dba0047cfad 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -1220,24 +1220,13 @@ void item_func_HAWK_EYE() { } /* 800986C4-80098718 093004 0054+00 1/0 0/0 0/0 .text item_func_WOOD_STICK__Fv */ -// load instructions are switched -#ifdef NONMATCHING void item_func_WOOD_STICK() { dComIfGs_setCollectSword(COLLECT_WOODEN_SWORD); dComIfGs_setSelectEquipSword(WOOD_STICK); - dComIfGs_onSwitch(28, dComIfGp_roomControl_getStayNo()); // wrong order + s32 roomNo = dComIfGp_roomControl_getStayNo(); + dComIfGs_onSwitch(28, roomNo); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void item_func_WOOD_STICK() { - nofralloc -#include "asm/d/d_item/item_func_WOOD_STICK__Fv.s" -} -#pragma pop -#endif void item_func_BOOMERANG() { dComIfGs_setItem(SLOT_0, BOOMERANG); diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 8289ca668c9..689dac49a66 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -367,7 +367,7 @@ SECTION_DATA static void* lit_4017[8] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dRes_info_c::loaderBasicBmd(u32 param_0, void* param_1) { +asm J3DModelData* dRes_info_c::loaderBasicBmd(u32 param_0, void* param_1) { nofralloc #include "asm/d/d_resorce/loaderBasicBmd__11dRes_info_cFUlPv.s" } @@ -686,8 +686,8 @@ void dRes_info_c::dump_long(dRes_info_c* param_0, int param_1) { "No Command Archive ArcHeader(size) SolidHeap(size) Resource Cnt ArchiveName\n"); for (int i = 0; i < param_1; i++) { - if (getCount() != 0) { - JKRArchive* archive = getArchive(); + if (param_0->getCount() != 0) { + JKRArchive* archive = param_0->getArchive(); header = NULL; blockSize1 = 0; @@ -696,15 +696,15 @@ void dRes_info_c::dump_long(dRes_info_c* param_0, int param_1) { blockSize1 = myGetMemBlockSize0(header); } - JKRSolidHeap* dataHeap = mDataHeap; + JKRSolidHeap* dataHeap = param_0->mDataHeap; blockSize2 = 0; if (dataHeap != NULL) { blockSize2 = myGetMemBlockSize0((void*)dataHeap); } - JUTReportConsole_f("%2d %08x %08x %08x(%6x) %08x(%5x) %08x %3d %s\n", i, getDMCommand(), - archive, header, blockSize1, &mDataHeap, blockSize2, mRes, - getArchiveName()); + JUTReportConsole_f("%2d %08x %08x %08x(%6x) %08x(%5x) %08x %3d %s\n", i, + param_0->getDMCommand(), archive, header, blockSize1, + ¶m_0->mDataHeap, blockSize2, param_0->mRes, param_0->getArchiveName()); } param_0++; } diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index 0b6e98cbfbc..66fad523ccf 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -382,13 +382,6 @@ asm int dEvt_control_c::talkCheck(dEvt_order_c* param_0) { #pragma pop #endif -/* ############################################################################################## */ -/* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80379DA3 = "DEFAULT_TALK_XY"; -#pragma pop - /* 80041B58-80041C90 03C498 0138+00 1/1 0/0 0/0 .text * talkXyCheck__14dEvt_control_cFP12dEvt_order_c */ int dEvt_control_c::talkXyCheck(dEvt_order_c* p_order) { diff --git a/src/d/event/d_event_data.cpp b/src/d/event/d_event_data.cpp index 91faacfcba2..982b3d06d90 100644 --- a/src/d/event/d_event_data.cpp +++ b/src/d/event/d_event_data.cpp @@ -805,6 +805,8 @@ SECTION_SDATA2 static f32 lit_4669 = -1.0f; #ifdef NONMATCHING // matches besides floats void dEvDtStaff_c::specialProcSound() { + SoundData* data = (SoundData*)&mData; + int staffId = i_dComIfGp_evmng_getMyStaffId("SOUND", NULL, 0); if (staffId == -1) { return; @@ -843,7 +845,7 @@ void dEvDtStaff_c::specialProcSound() { specialProc_WaitProc(staffId); break; case 'NOMS': - if (mSoundWait <= dDemo_c::getFrameNoMsg()) { + if (data->timer <= dDemo_c::getFrameNoMsg()) { dComIfGp_evmng_cutEnd(staffId); } break; @@ -876,9 +878,9 @@ SECTION_DEAD static char const* const stringBase_80379E65 = "SCALE"; /* 80044CB8-80044EE4 03F5F8 022C+00 1/1 0/0 0/0 .text specialProcCreate__12dEvDtStaff_cFv */ +// matches with literals #ifdef NONMATCHING void dEvDtStaff_c::specialProcCreate() { - // regalloc char* name; u32 arg; cXyz pos; @@ -1097,12 +1099,12 @@ void dEvDtStaff_c::specialProcDirector() { dStage_MapEvent_dt_c* mapEvent = dEvt_control_c::searchMapEventData(data->unk); if (mapEvent != NULL) { if (mapEvent->mType == 0) { - data->mSoundWait = mapEvent->field_0x14; + data->unk2 = mapEvent->field_0x14; } else { - data->mSoundWait = -1; + data->unk2 = -1; } } else { - data->mSoundWait = 0; + data->unk2 = 0; } break; case 'CAST': @@ -1176,9 +1178,9 @@ void dEvDtStaff_c::specialProcDirector() { case 'NEXT': break; case 'VIBR': - if (data->mSoundWait > 0) { - data->mSoundWait--; - if (data->mSoundWait == 0) { + if (data->unk2 > 0) { + data->unk2--; + if (data->unk2 == 0) { dComIfGp_getVibration().StopQuake(0x1F); } } else { @@ -1197,8 +1199,8 @@ void dEvDtStaff_c::specialProcDirector() { } break; case 'MAPT': - data->mSoundWait--; - if (data->mSoundWait <= 0) { + data->unk2--; + if (data->unk2 <= 0) { dComIfGp_evmng_cutEnd(staffId); } break; diff --git a/src/d/event/d_event_manager.cpp b/src/d/event/d_event_manager.cpp index 440264d86a5..2127d52404d 100644 --- a/src/d/event/d_event_manager.cpp +++ b/src/d/event/d_event_manager.cpp @@ -1044,7 +1044,7 @@ void dEvent_manager_c::cutEnd(int cutIndex) { return; } else if (cutIndex == -1) { return; - } else if (field_0x1aa == -1) { + } else if (mCurrentEventCompositId == -1) { return; } else { // instruction swap diff --git a/src/d/kankyo/d_kankyo_rain.cpp b/src/d/kankyo/d_kankyo_rain.cpp index f40ca4158d6..b803a409a93 100644 --- a/src/d/kankyo/d_kankyo_rain.cpp +++ b/src/d/kankyo/d_kankyo_rain.cpp @@ -745,10 +745,10 @@ asm void dKyr_rain_move() { static bool d_krain_cut_turn_check() { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - return player != NULL && (player->getCutType() == daPy_py_c::TYPE_CUT_TURN_RIGHT || - player->getCutType() == daPy_py_c::TYPE_CUT_TURN_LEFT || - player->getCutType() == daPy_py_c::TYPE_CUT_LARGE_TURN_LEFT || - player->getCutType() == daPy_py_c::TYPE_CUT_LARGE_TURN_RIGHT); + return player != NULL && (player->getCutType() == daPy_py_c::CUT_TYPE_TURN_RIGHT || + player->getCutType() == daPy_py_c::CUT_TYPE_TURN_LEFT || + player->getCutType() == daPy_py_c::CUT_TYPE_LARGE_TURN_LEFT || + player->getCutType() == daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT); } /* ############################################################################################## */ @@ -2027,8 +2027,8 @@ asm void dKyr_evil_draw(f32 (*param_0)[4], u8** param_1) { /* 8006F160-8006F168 069AA0 0008+00 0/0 1/0 0/0 .text getKandelaarFlamePos__9daPy_py_cFv */ -bool daPy_py_c::getKandelaarFlamePos() { - return false; +cXyz* daPy_py_c::getKandelaarFlamePos() { + return NULL; } /* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/kankyo/d_kankyo_wether.cpp b/src/d/kankyo/d_kankyo_wether.cpp index 49368d2616b..0665fb820c2 100644 --- a/src/d/kankyo/d_kankyo_wether.cpp +++ b/src/d/kankyo/d_kankyo_wether.cpp @@ -533,7 +533,7 @@ SECTION_SDATA2 static u8 lit_4378[4] = { SECTION_SDATA2 static f32 lit_4379 = 1.0f; // remove these once float data is fixed -inline u32 tmp_dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3, +inline JPABaseEmitter* tmp_dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3, const csXyz* param_4, const cXyz* param_5, u8 param_6, dPa_levelEcallBack* param_7, s8 param_8, const GXColor* param_9, const GXColor* param_10, @@ -543,7 +543,7 @@ inline u32 tmp_dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const dKy param_9, param_10, param_11, lit_4379); } -inline u32 tmp_dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const csXyz* param_2, +inline JPABaseEmitter* tmp_dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const csXyz* param_2, const cXyz* param_3) { return tmp_dComIfGp_particle_set(param_0, param_1, NULL, param_2, param_3, 0xFF, NULL, -1, NULL, NULL, NULL); @@ -920,7 +920,7 @@ static void wether_move_rain() { if (g_env_light.mSnowCount == 0 && cam != NULL) { // Stage is not Fishing Pond - if (strcmp(dComIfGp_getStartStageName(), "R_SP127") || cam->field_0xd8.y > 0.0f) { + if (strcmp(dComIfGp_getStartStageName(), "R_SP127") || cam->mLookat.mEye.y > 0.0f) { if (g_env_light.mRainCount < 125.0f) { mDoAud_rainPlay(FALSE); } else { @@ -1503,14 +1503,14 @@ void dKyw_wether_proc() { if (!strcmp(dComIfGp_getStartStageName(), "F_SP108") || !strcmp(dComIfGp_getStartStageName(), "F_SP127") || (!strcmp(dComIfGp_getStartStageName(), "F_SP121") && - FLOAT_LABEL(lit_4378) != g_env_light.field_0x11d8)) { + FLOAT_LABEL(lit_4378) != g_env_light.mDiceWeatherTime)) { if (!dKy_darkworld_check()) { // Stage is Hyrule Field if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") || g_env_light.mDaytime >= 75.0f || g_env_light.mDaytime <= 120.0f) { // Stage is Hyrule Field if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") && - g_env_light.field_0x12c9 >= 1 && g_env_light.field_0x12c9 < 6) { + g_env_light.mDiceWeatherMode >= 1 && g_env_light.mDiceWeatherMode < 6) { dKy_get_dayofweek(); cLib_addCalc(&g_env_light.field_0xebc, lit_4379, lit_5362, lit_5363, lit_4770); g_env_light.mMoyaMode = 7; diff --git a/src/d/meter/d_meter2.cpp b/src/d/meter/d_meter2.cpp index b613f96843c..aa60e21eb61 100644 --- a/src/d/meter/d_meter2.cpp +++ b/src/d/meter/d_meter2.cpp @@ -324,10 +324,10 @@ int dMeter2_c::_create() { mMaxMagic = dComIfGs_getMaxMagic(); - mNowOil = dComIfGs_getOil(); + mNowOil = (s16)dComIfGs_getOil(); dComIfGp_setItemNowOil(mNowOil); - mMaxOil = dComIfGs_getMaxOil(); + mMaxOil = (s16)dComIfGs_getMaxOil(); mNowOxygen = dComIfGp_getOxygen(); dComIfGp_setNowOxygen(mNowOxygen); diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp index befe696a0e4..a743aa39105 100644 --- a/src/d/particle/d_particle.cpp +++ b/src/d/particle/d_particle.cpp @@ -1812,7 +1812,7 @@ SECTION_SDATA2 static u32 lit_5199 = 0xFFFFFFFF; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm u32 dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* param_2, +asm JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* param_2, dKy_tevstr_c const* param_3, csXyz const* param_4, cXyz const* param_5, u8 param_6, dPa_levelEcallBack* param_7, s8 param_8, _GXColor const* param_9, _GXColor const* param_10, cXyz const* param_11, diff --git a/src/d/save/d_save.cpp b/src/d/save/d_save.cpp index 2f653a457d4..37014fdffc2 100644 --- a/src/d/save/d_save.cpp +++ b/src/d/save/d_save.cpp @@ -242,8 +242,8 @@ void dSv_player_status_a_c::init() { unk10 = 0; for (int i = 0; i < MAX_SELECT_ITEM; i++) { - mSelectItem[i] = NO_ITEM; - mMixItem[i] = NO_ITEM; + mSelectItem[i] = 0xFF; + mMixItem[i] = 0xFF; dComIfGp_setSelectItem(i); } @@ -268,9 +268,9 @@ void dSv_player_status_a_c::init() { } } -void dSv_player_status_a_c::setSelectItemIndex(int i_no, u8 item_index) { +void dSv_player_status_a_c::setSelectItemIndex(int i_no, u8 i_slotNo) { if (i_no < MAX_SELECT_ITEM) { - mSelectItem[i_no] = item_index; + mSelectItem[i_no] = i_slotNo; } } @@ -281,9 +281,9 @@ u8 dSv_player_status_a_c::getSelectItemIndex(int i_no) const { return 0; } -void dSv_player_status_a_c::setMixItemIndex(int i_no, u8 item_index) { +void dSv_player_status_a_c::setMixItemIndex(int i_no, u8 i_slotNo) { if (i_no < MAX_SELECT_ITEM) { - mMixItem[i_no] = item_index; + mMixItem[i_no] = i_slotNo; } } @@ -312,6 +312,7 @@ BOOL dSv_player_status_a_c::isMagicFlag(u8 i_magic) const { if (i_magic == 0) { return i_dComIfGs_isEventBit(0x2304); // Magic Unlocked } + return (mMagicFlag & (u8)(1 << i_magic)) ? TRUE : FALSE; } @@ -423,7 +424,7 @@ void dSv_player_last_mark_info_c::init() { } void dSv_player_last_mark_info_c::setWarpItemData(const char* i_name, const cXyz& i_pos, - s16 i_angle, s8 i_roomNo, u8 unk1, u8 unk2) { + s16 i_angle, s8 i_roomNo, u8, u8) { strcpy(mName, i_name); mPos.set(i_pos); mAngleY = i_angle; @@ -437,25 +438,25 @@ void dSv_player_item_c::init() { } } -void dSv_player_item_c::setItem(int item_slot, u8 i_itemNo) { - if (item_slot < MAX_ITEM_SLOTS) { - mItems[item_slot] = i_itemNo; +void dSv_player_item_c::setItem(int i_slotNo, u8 i_itemNo) { + if (i_slotNo < MAX_ITEM_SLOTS) { + mItems[i_slotNo] = i_itemNo; setLineUpItem(); } for (int i = DEFAULT_SELECT_ITEM_INDEX; i < MAX_SELECT_ITEM - 1; i++) { - if (item_slot == dComIfGs_getSelectItemIndex(i)) { + if (i_slotNo == dComIfGs_getSelectItemIndex(i)) { dComIfGp_setSelectItem(i); } } } -u8 dSv_player_item_c::getItem(int slot_no, bool check_combo) const { - if (slot_no < MAX_ITEM_SLOTS) { - if (check_combo) { +u8 dSv_player_item_c::getItem(int i_slotNo, bool i_checkCombo) const { + if (i_slotNo < MAX_ITEM_SLOTS) { + if (i_checkCombo) { for (int i = 0; i < SELECT_ITEM_NUM; i++) { - if ((slot_no == dComIfGs_getSelectItemIndex(i) || - slot_no == dComIfGs_getMixItemIndex(i)) && + if ((i_slotNo == dComIfGs_getSelectItemIndex(i) || + i_slotNo == dComIfGs_getMixItemIndex(i)) && dComIfGs_getMixItemIndex(i) != NO_ITEM) { u8 select_item = mItems[dComIfGs_getSelectItemIndex(i)]; u8 mix_item = mItems[dComIfGs_getMixItemIndex(i)]; @@ -516,14 +517,16 @@ u8 dSv_player_item_c::getItem(int slot_no, bool check_combo) const { } } } - return mItems[slot_no]; + return mItems[i_slotNo]; } return NO_ITEM; } -static u8 i_item_lst[23] = {0x0A, 0x08, 0x06, 0x02, 0x09, 0x04, 0x03, 0x00, 0x01, 0x17, 0x14, 0x05, - 0x0F, 0x10, 0x11, 0x0B, 0x0C, 0x0D, 0x0E, 0x13, 0x12, 0x16, 0x15}; +static u8 i_item_lst[23] = { + 0x0A, 0x08, 0x06, 0x02, 0x09, 0x04, 0x03, 0x00, 0x01, 0x17, 0x14, 0x05, + 0x0F, 0x10, 0x11, 0x0B, 0x0C, 0x0D, 0x0E, 0x13, 0x12, 0x16, 0x15, +}; /* 800332F8-80033354 02DC38 005C+00 2/2 0/0 0/0 .text setLineUpItem__17dSv_player_item_cFv */ // this is close @@ -554,10 +557,11 @@ asm void dSv_player_item_c::setLineUpItem() { #pragma pop #endif -u8 dSv_player_item_c::getLineUpItem(int slot_no) const { - if (slot_no < MAX_ITEM_SLOTS) { - return mItemSlots[slot_no]; +u8 dSv_player_item_c::getLineUpItem(int i_slotNo) const { + if (i_slotNo < MAX_ITEM_SLOTS) { + return mItemSlots[i_slotNo]; } + return NO_ITEM; } @@ -771,13 +775,13 @@ u8 dSv_player_item_c::checkEmptyBottle() { return bottleNum; } -void dSv_player_item_c::setBombBagItemIn(u8 curBomb, u8 newBomb, bool setNum) { +void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, bool i_setNum) { for (int i = 0; i < 3; i++) { - if (curBomb == mItems[i + SLOT_15]) { - setItem(i + SLOT_15, newBomb); + if (i_curBomb == mItems[i + SLOT_15]) { + setItem(i + SLOT_15, i_newBomb); - if (setNum == true && newBomb != BOMB_BAG_LV1) { - dComIfGs_setBombNum(i, dComIfGs_getBombMax(newBomb)); + if (i_setNum == true && i_newBomb != BOMB_BAG_LV1) { + dComIfGs_setBombNum(i, dComIfGs_getBombMax(i_newBomb)); } for (int j = 0; j < 3; j++) { @@ -790,16 +794,16 @@ void dSv_player_item_c::setBombBagItemIn(u8 curBomb, u8 newBomb, bool setNum) { } } -void dSv_player_item_c::setBombBagItemIn(u8 curBomb, u8 newBomb, u8 bombNum, bool setNum) { +void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, u8 i_bombNum, bool i_setNum) { for (int i = 0; i < 3; i++) { - if (curBomb == mItems[i + SLOT_15]) { - setItem(i + SLOT_15, newBomb); + if (i_curBomb == mItems[i + SLOT_15]) { + setItem(i + SLOT_15, i_newBomb); - if (setNum == 1 && newBomb != BOMB_BAG_LV1) { - if (bombNum > dComIfGs_getBombMax(newBomb)) { - bombNum = dComIfGs_getBombMax(newBomb); + if (i_setNum == 1 && i_newBomb != BOMB_BAG_LV1) { + if (i_bombNum > dComIfGs_getBombMax(i_newBomb)) { + i_bombNum = dComIfGs_getBombMax(i_newBomb); } - dComIfGs_setBombNum(i, bombNum); + dComIfGs_setBombNum(i, i_bombNum); } for (int j = 0; j < 3; j++) { @@ -812,12 +816,12 @@ void dSv_player_item_c::setBombBagItemIn(u8 curBomb, u8 newBomb, u8 bombNum, boo } } -void dSv_player_item_c::setEmptyBombBagItemIn(u8 newBomb, bool setNum) { - setBombBagItemIn(BOMB_BAG_LV1, newBomb, setNum); +void dSv_player_item_c::setEmptyBombBagItemIn(u8 i_newBomb, bool i_setNum) { + setBombBagItemIn(BOMB_BAG_LV1, i_newBomb, i_setNum); } -void dSv_player_item_c::setEmptyBombBagItemIn(u8 newBomb, u8 bombNum, bool setNum) { - setBombBagItemIn(BOMB_BAG_LV1, newBomb, bombNum, setNum); +void dSv_player_item_c::setEmptyBombBagItemIn(u8 i_newBomb, u8 i_bombNum, bool i_setNum) { + setBombBagItemIn(BOMB_BAG_LV1, i_newBomb, i_bombNum, i_setNum); } void dSv_player_item_c::setEmptyBombBag() { @@ -829,20 +833,20 @@ void dSv_player_item_c::setEmptyBombBag() { } } -void dSv_player_item_c::setEmptyBombBag(u8 newBomb, u8 bombNum) { +void dSv_player_item_c::setEmptyBombBag(u8 i_newBomb, u8 i_bombNum) { for (int i = 0; i < 3; i++) { if (dComIfGs_getItem((u8)(i + SLOT_15), true) == NO_ITEM) { - dComIfGs_setItem((u8)(i + SLOT_15), newBomb); + dComIfGs_setItem((u8)(i + SLOT_15), i_newBomb); - if (newBomb == BOMB_BAG_LV1) { + if (i_newBomb == BOMB_BAG_LV1) { return; } - if (bombNum > dComIfGs_getBombMax(newBomb)) { - bombNum = dComIfGs_getBombMax(newBomb); + if (i_bombNum > dComIfGs_getBombMax(i_newBomb)) { + i_bombNum = dComIfGs_getBombMax(i_newBomb); } - dComIfGs_setBombNum(i, bombNum); + dComIfGs_setBombNum(i, i_bombNum); return; } } @@ -895,17 +899,17 @@ void dSv_player_item_c::setBaitItem(u8 i_itemNo) { switch (i_itemNo) { case BEE_CHILD: { i_dComIfGs_isItemFirstBit(ZORAS_JEWEL) ? mItems[SLOT_20] = JEWEL_BEE_ROD : - mItems[SLOT_20] = BEE_ROD; + mItems[SLOT_20] = BEE_ROD; break; } case WORM: { i_dComIfGs_isItemFirstBit(ZORAS_JEWEL) ? mItems[SLOT_20] = JEWEL_WORM_ROD : - mItems[SLOT_20] = WORM_ROD; + mItems[SLOT_20] = WORM_ROD; break; } case NO_ITEM: { i_dComIfGs_isItemFirstBit(ZORAS_JEWEL) ? mItems[SLOT_20] = JEWEL_ROD : - mItems[SLOT_20] = FISHING_ROD_1; + mItems[SLOT_20] = FISHING_ROD_1; break; } } @@ -922,41 +926,19 @@ void dSv_player_get_item_c::init() { } /* 80033E60-80033E94 02E7A0 0034+00 0/0 3/3 1/1 .text onFirstBit__21dSv_player_get_item_cFUc */ -// this is a few instructions off -#ifdef NONMATCHING void dSv_player_get_item_c::onFirstBit(u8 i_itemNo) { - mItemFlags[i_itemNo >> 5] |= (1 << (i_itemNo & 0x1F)); + mItemFlags[i_itemNo / 32] |= (1 << (i_itemNo % 32)); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_player_get_item_c::onFirstBit(u8 i_itemNo) { - nofralloc -#include "asm/d/save/d_save/onFirstBit__21dSv_player_get_item_cFUc.s" -} -#pragma pop -#endif /* 80033E94-80033EC8 02E7D4 0034+00 0/0 7/7 1/1 .text offFirstBit__21dSv_player_get_item_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_player_get_item_c::offFirstBit(u8 i_itemNo) { - nofralloc -#include "asm/d/save/d_save/offFirstBit__21dSv_player_get_item_cFUc.s" +void dSv_player_get_item_c::offFirstBit(u8 i_itemNo) { + mItemFlags[i_itemNo / 32] &= ~(1 << (i_itemNo % 32)); } -#pragma pop /* 80033EC8-80033F00 02E808 0038+00 4/4 87/87 2/2 .text isFirstBit__21dSv_player_get_item_cCFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dSv_player_get_item_c::isFirstBit(u8 i_itemNo) const { - nofralloc -#include "asm/d/save/d_save/isFirstBit__21dSv_player_get_item_cCFUc.s" +int dSv_player_get_item_c::isFirstBit(u8 i_itemNo) const { + return mItemFlags[i_itemNo / 32] & (1 << (i_itemNo % 32)) ? TRUE : FALSE; } -#pragma pop void dSv_player_item_record_c::init() { mArrowNum = 0; @@ -976,20 +958,20 @@ void dSv_player_item_record_c::init() { } } -void dSv_player_item_record_c::setBombNum(u8 i_bagIdx, u8 bag_id) { - mBombNum[i_bagIdx] = bag_id; +void dSv_player_item_record_c::setBombNum(u8 i_bagIdx, u8 i_bombNum) { + mBombNum[i_bagIdx] = i_bombNum; } u8 dSv_player_item_record_c::getBombNum(u8 i_bagIdx) const { return mBombNum[i_bagIdx]; } -void dSv_player_item_record_c::setBottleNum(u8 i_bottleIdx, u8 bottle_num) { - mBottleNum[i_bottleIdx] = bottle_num; +void dSv_player_item_record_c::setBottleNum(u8 i_bottleIdx, u8 i_bottleNum) { + mBottleNum[i_bottleIdx] = i_bottleNum; } -u8 dSv_player_item_record_c::addBottleNum(u8 i_bottleIdx, s16 num) { - int bottleNum = mBottleNum[i_bottleIdx] + num; +u8 dSv_player_item_record_c::addBottleNum(u8 i_bottleIdx, s16 i_no) { + int bottleNum = mBottleNum[i_bottleIdx] + i_no; dComIfGs_getItem((u8)(i_bottleIdx + SLOT_11), true); @@ -1018,27 +1000,27 @@ void dSv_player_item_max_c::init() { mItemMax[7] = 0; } -void dSv_player_item_max_c::setBombNum(u8 bomb_id, u8 bomb_max) { - switch (bomb_id) { +void dSv_player_item_max_c::setBombNum(u8 i_bombType, u8 i_maxNum) { + switch (i_bombType) { case NORMAL_BOMB: - mItemMax[NORMAL_BOMB_MAX] = bomb_max; + mItemMax[NORMAL_BOMB_MAX] = i_maxNum; return; case WATER_BOMB: - mItemMax[WATER_BOMB_MAX] = bomb_max; + mItemMax[WATER_BOMB_MAX] = i_maxNum; return; case POKE_BOMB: - mItemMax[POKE_BOMB_MAX] = bomb_max; + mItemMax[POKE_BOMB_MAX] = i_maxNum; return; } } -u8 dSv_player_item_max_c::getBombNum(u8 bombId) const { +u8 dSv_player_item_max_c::getBombNum(u8 i_bombType) const { u8 lv_multiplier = 1; if (i_dComIfGs_isItemFirstBit(BOMB_BAG_LV2)) { lv_multiplier = 2; } - switch (bombId) { + switch (i_bombType) { case NORMAL_BOMB: return (u8)(mItemMax[NORMAL_BOMB_MAX] * lv_multiplier); case WATER_BOMB: @@ -1106,9 +1088,9 @@ void dSv_light_drop_c::init() { } } -void dSv_light_drop_c::setLightDropNum(u8 i_nowLevel, u8 dropNum) { +void dSv_light_drop_c::setLightDropNum(u8 i_nowLevel, u8 i_dropNum) { if (i_nowLevel < LIGHT_DROP_STAGE || i_nowLevel > 6) { - mLightDropNum[i_nowLevel] = dropNum; + mLightDropNum[i_nowLevel] = i_dropNum; } } @@ -1166,9 +1148,9 @@ void dSv_fishing_info_c::init() { } } -void dSv_fishing_info_c::addFishCount(u8 fish_index) { - if (mFishCount[fish_index] < 999) { - mFishCount[fish_index] += 1; +void dSv_fishing_info_c::addFishCount(u8 i_fishIdx) { + if (mFishCount[i_fishIdx] < 999) { + mFishCount[i_fishIdx] += 1; } } @@ -1319,7 +1301,7 @@ void dSv_memBit_c::onDungeonItem(int i_no) { } s32 dSv_memBit_c::isDungeonItem(int i_no) const { - return mDungeonItem & (u8)(1 << i_no) ? 1 : 0; + return mDungeonItem & (u8)(1 << i_no) ? TRUE : FALSE; } void dSv_event_c::init() { @@ -1384,15 +1366,15 @@ BOOL dSv_memory2_c::isVisitedRoom(int i_no) { return (1 << (i_no & 0x1F) & mVisitedRoom[i_no >> 5]) ? TRUE : FALSE; } -bool dSv_danBit_c::init(s8 i_stage) { - if (i_stage != mStageNo) { +bool dSv_danBit_c::init(s8 i_stageNo) { + if (i_stageNo != mStageNo) { mSwitch[0] = 0; mSwitch[1] = 0; mItem[0] = 0; mItem[1] = 0; mItem[2] = 0; mItem[3] = 0; - mStageNo = i_stage; + mStageNo = i_stageNo; unk1 = 0; for (int i = 0; i < 16; i++) { @@ -1921,8 +1903,7 @@ int dSv_info_c::initdata_to_card(char* card_ptr, int dataNum) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dSv_info_c::initdata_to_card(char* card_ptr, int dataNum) { - nofralloc +asm int dSv_info_c::initdata_to_card(char* card_ptr, int dataNum){nofralloc #include "asm/d/save/d_save/initdata_to_card__10dSv_info_cFPci.s" } #pragma pop diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 8da6d9f2dbb..cca5d654205 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -299,7 +299,7 @@ static int fopAc_Create(void* actor) { fopAcM_SetParam(ac, append->mParameter); ac->orig.pos = append->mPos; ac->orig.angle = append->mAngle; - ac->mCollisionRot = append->mAngle; + ac->shape_angle = append->mAngle; ac->mParentPcId = append->mParentPId; ac->mSubtype = append->mSubtype; ac->mScale.set(append->mScale[0] * 0.1f, append->mScale[1] * 0.1f, append->mScale[2] * 0.1f); diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 816a2a1f71a..24d07bdcb85 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -752,9 +752,14 @@ void fopAcM_calcSpeed(fopAc_ac_c* p_actor) { /* 8001A660-8001A6CC 014FA0 006C+00 1/1 1/1 17/17 .text fopAcM_posMove__FP10fopAc_ac_cPC4cXyz */ void fopAcM_posMove(fopAc_ac_c* p_actor, const cXyz* p_movePos) { - p_actor->current.pos += p_actor->mSpeed; + p_actor->current.pos.x += p_actor->mSpeed.x; + p_actor->current.pos.y += p_actor->mSpeed.y; + p_actor->current.pos.z += p_actor->mSpeed.z; + if (p_movePos != NULL) { - p_actor->current.pos += *p_movePos; + p_actor->current.pos.x += p_movePos->x; + p_actor->current.pos.y += p_movePos->y; + p_actor->current.pos.z += p_movePos->z; } } @@ -816,7 +821,7 @@ asm s16 fopAcM_searchActorAngleX(const fopAc_ac_c* p_actorA, const fopAc_ac_c* p s32 fopAcM_seenActorAngleY(const fopAc_ac_c* p_actorA, const fopAc_ac_c* p_actorB) { return abs(static_cast( cLib_targetAngleY(&p_actorA->current.pos, &p_actorB->current.pos) - - p_actorA->mCollisionRot.y)); + p_actorA->shape_angle.y)); } /* ############################################################################################## */ @@ -1747,7 +1752,7 @@ void* enemySearchJugge(void* p_actor, void* p_data) { /* 8001CA1C-8001CAD8 01735C 00BC+00 0/0 0/0 6/6 .text fopAcM_myRoomSearchEnemy__FSc */ #ifdef NONMATCHING -void fopAcM_myRoomSearchEnemy(s8 roomNo) { +fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) { int procID = dStage_roomControl_c::getStatusProcID(roomNo); scene_class* roomProc = fopScnM_SearchByID(procID); @@ -1807,8 +1812,8 @@ void fopAcM_cancelCarryNow(fopAc_ac_c* p_actor) { } } - p_actor->mCollisionRot.z = 0; - p_actor->mCollisionRot.x = 0; + p_actor->shape_angle.z = 0; + p_actor->shape_angle.x = 0; if (i_dComIfGp_event_runCheck() && fopAcM_GetGroup(p_actor) != 2) { p_actor->mStatus |= 0x800; @@ -1879,7 +1884,7 @@ s32 fopAcM_wayBgCheck(fopAc_ac_c const* param_0, f32 param_1, f32 param_2) { tmp0 = param_0->current.pos; tmp0.y += param_2; - mDoMtx_YrotS((MtxP)calc_mtx, param_0->mCollisionRot.y); + mDoMtx_YrotS((MtxP)calc_mtx, param_0->shape_angle.y); tmp1.x = FLOAT_LABEL(lit_4645); tmp1.y = 50.0f; @@ -1899,7 +1904,7 @@ s32 fopAcM_wayBgCheck(fopAc_ac_c const* param_0, f32 param_1, f32 param_2) { /* 8001CFD8-8001D020 017918 0048+00 0/0 0/0 2/2 .text fopAcM_plAngleCheck__FPC10fopAc_ac_cs */ s32 fopAcM_plAngleCheck(fopAc_ac_c const* p_actor, s16 i_angle) { - s16 angle = p_actor->mCollisionRot.y - dComIfGp_getPlayer(0)->mCollisionRot.y; + s16 angle = p_actor->shape_angle.y - dComIfGp_getPlayer(0)->shape_angle.y; if (angle <= i_angle && angle >= (s16)-i_angle) { return 0; } @@ -2021,7 +2026,7 @@ s32 fopAcM_carryOffRevise(fopAc_ac_c* param_0) { tmp0 = player->current.pos; tmp0.y = param_0->current.pos.y; - mDoMtx_YrotS((MtxP)calc_mtx, player->mCollisionRot.y); + mDoMtx_YrotS((MtxP)calc_mtx, player->shape_angle.y); tmp1.x = FLOAT_LABEL(lit_4645); tmp1.y = param_0->current.pos.y - player->current.pos.y; @@ -2150,7 +2155,7 @@ fopAc_ac_c* fopAcM_findObject4EventCB(fopAc_ac_c* p_actor, void* p_data) { #ifdef NONMATCHING fopAc_ac_c* fopAcM_searchFromName4Event(char const* name, s16 eventID) { fopAcM_search4ev_prm prm; - prm.field_0x1e = eventID; + prm.mEventID = eventID; strcpy(prm.mName, name); char* chr = strchr(prm.mName, ':'); @@ -2229,7 +2234,7 @@ asm s32 fopAcM_getWaterY(cXyz const* param_0, f32* param_1) { /* 8001D900-8001D9A8 018240 00A8+00 0/0 2/2 2/2 .text * fpoAcM_relativePos__FPC10fopAc_ac_cPC4cXyzP4cXyz */ void fpoAcM_relativePos(fopAc_ac_c const* actor, cXyz const* p_inPos, cXyz* p_outPos) { - s16 angle = -actor->mCollisionRot.y; + s16 angle = -actor->shape_angle.y; cXyz pos = *p_inPos - actor->current.pos; p_outPos->x = (pos.z * cM_ssin(angle)) + (pos.x * cM_scos(angle)); diff --git a/src/init.c b/src/init.c index aa86ff38d1d..f7e09b8a946 100644 --- a/src/init.c +++ b/src/init.c @@ -15,7 +15,7 @@ SECTION_INIT void __check_pad3(); SECTION_INIT void __set_debug_bba(); SECTION_INIT u8 __get_debug_bba(); SECTION_INIT void __start(); -SECTION_INIT void __init_registers(); +SECTION_INIT void __init_registers(void); SECTION_INIT void __init_data(); SECTION_INIT void __init_hardware(); SECTION_INIT void __flush_cache(); @@ -57,14 +57,48 @@ extern void* _SDA2_BASE_; extern void* _SDA_BASE_; /* 800032B0-80003340 0001B0 0090+00 1/1 0/0 0/0 .init __init_registers */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -SECTION_INIT asm void __init_registers() { +SECTION_INIT asm void __init_registers(void) { + // clang-format off nofralloc -#include "asm/init/__init_registers.s" + + li r0, 0 + li r3, 0 + li r4, 0 + li r5, 0 + li r6, 0 + li r7, 0 + li r8, 0 + li r9, 0 + li r10, 0 + li r11, 0 + li r12, 0 + li r14, 0 + li r15, 0 + li r16, 0 + li r17, 0 + li r18, 0 + li r19, 0 + li r20, 0 + li r21, 0 + li r22, 0 + li r23, 0 + li r24, 0 + li r25, 0 + li r26, 0 + li r27, 0 + li r28, 0 + li r29, 0 + li r30, 0 + li r31, 0 + lis r1, _stack_end+0x1000@h + ori r1, r1, _stack_end+0x1000@l + lis r2, _SDA2_BASE_@h + ori r2, r2, _SDA2_BASE_@l + lis r13, _SDA_BASE_@h + ori r13, r13, _SDA_BASE_@l + blr + // clang-format on } -#pragma pop /* 80003340-80003400 000240 00C0+00 1/1 0/0 1/1 .init __init_data */ #pragma push @@ -77,24 +111,45 @@ SECTION_INIT asm void __init_data() { #pragma pop /* 80003400-80003424 000300 0024+00 1/1 0/0 0/0 .init __init_hardware */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off SECTION_INIT asm void __init_hardware() { + // clang-format off nofralloc -#include "asm/init/__init_hardware.s" + + mfmsr r0 + ori r0, r0, 0x2000 + mtmsr r0 + mflr r31 + bl __OSPSInit + bl __OSFPRInit + bl __OSCacheInit + mtlr r31 + blr + // clang-format on } -#pragma pop /* 80003424-80003458 000324 0034+00 1/1 0/0 0/0 .init __flush_cache */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off SECTION_INIT asm void __flush_cache() { + // clang-format off nofralloc -#include "asm/init/__flush_cache.s" + + lis r5, 0xFFFF + ori r5, r5, 0xFFF1 + and r5, r5, r3 + subf r3, r5, r3 + add r4, r4, r3 + +lbl_80003438: + dcbst 0, r5 + sync + icbi 0, r5 + addic r5, r5, 8 + addic. r4, r4, -8 + bge lbl_80003438 + + isync + blr + // clang-format on } -#pragma pop /* 80003458-80003488 000358 0030+00 1/1 55/55 137/137 .init memset */ SECTION_INIT void* memset(void* dst, int val, size_t n) { diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp index c4b624f3f8f..5ebac9d7d87 100644 --- a/src/m_Do/m_Do_MemCardRWmng.cpp +++ b/src/m_Do/m_Do_MemCardRWmng.cpp @@ -45,7 +45,7 @@ static u8 sTmpBuf[0x4000]; /* 80017498-8001769C 011DD8 0204+00 0/0 1/1 0/0 .text mDoMemCdRWm_Store__FP12CARDFileInfoPvUl */ #ifdef NONMATCHING -void mDoMemCdRWm_Store(CARDFileInfo* file, void* data, u32 length) { +s32 mDoMemCdRWm_Store(CARDFileInfo* file, void* data, u32 length) { mDoMemCdRWm_BuildHeader((mDoMemCdRWm_HeaderData*)sTmpBuf); s32 card_state = CARDWrite(file, sTmpBuf, sizeof(sTmpBuf), 0); @@ -153,14 +153,15 @@ static asm BOOL mDoMemCdRWm_CheckCardStat(CARDFileInfo* param_0) { #pragma pop /* 80017C74-80017CB4 0125B4 0040+00 1/1 0/0 0/0 .text mDoMemCdRWm_CalcCheckSum__FPvUl */ -// matches except regalloc in the beginning -#ifdef NONMATCHING static u32 mDoMemCdRWm_CalcCheckSum(void* data, u32 size) { - u16 high = 0; - u16 low = 0; + u16 high; + u16 low; + low = 0; + high = 0; + u16* d = (u16*)data; - for (int i = 0; i < size / 2; i++) { + for (int i = 0; i < size / 2; i++) { high += *d; low += ~*d; d++; @@ -168,23 +169,14 @@ static u32 mDoMemCdRWm_CalcCheckSum(void* data, u32 size) { return high << 16 | low; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm u32 mDoMemCdRWm_CalcCheckSum(void* param_0, u32 param_1) { - nofralloc -#include "asm/m_Do/m_Do_MemCardRWmng/mDoMemCdRWm_CalcCheckSum__FPvUl.s" -} -#pragma pop -#endif /* 80017CB4-80017CEC 0125F4 0038+00 2/2 0/0 0/0 .text mDoMemCdRWm_CalcCheckSumGameData__FPvUl */ -// same beginning regalloc issue -#ifdef NONMATCHING static u64 mDoMemCdRWm_CalcCheckSumGameData(void* data, u32 size) { - u32 high = 0; - u32 low = 0; + u32 high; + u32 low; + + low = 0; + high = 0; u8* d = (u8*)data; for (int i = 0; i < size; i++) { @@ -195,16 +187,6 @@ static u64 mDoMemCdRWm_CalcCheckSumGameData(void* data, u32 size) { return (u64)high << 32 | low; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm u64 mDoMemCdRWm_CalcCheckSumGameData(void* param_0, u32 param_1) { - nofralloc -#include "asm/m_Do/m_Do_MemCardRWmng/mDoMemCdRWm_CalcCheckSumGameData__FPvUl.s" -} -#pragma pop -#endif /* 80017CEC-80017D38 01262C 004C+00 1/1 4/4 0/0 .text mDoMemCdRWm_TestCheckSumGameData__FPv */ BOOL mDoMemCdRWm_TestCheckSumGameData(void* data) { diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 598ee0a5ea7..f7df99c6e7f 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -462,7 +462,7 @@ int mDoGph_AfterOfDraw() { JUTDbPrint::getManager()->setVisible(true); } else { int sysConsole_visible = JFWSystem::getSystemConsole()->isVisible(); - int port3_connected = mDoCPd_c::isConnect(mDoCPd_c::PAD_2); + int port3_connected = mDoCPd_c::isConnect(PAD_3); BOOL procBar_visible = port3_connected && fapGmHIO_getMeter() && !sysConsole_visible; BOOL console_visible = port3_connected && fapGmHIO_isPrint(); @@ -487,7 +487,7 @@ int mDoGph_AfterOfDraw() { GXSetCoPlanar(GX_DISABLE); GXSetZTexture(GX_ZT_DISABLE, GX_TF_Z8, 0); GXSetDither(GX_ENABLE); - GXSetClipMode(GX_DISABLE); + GXSetClipMode(GX_CLIP_ENABLE); GXSetCullMode(GX_CULL_NONE); JUTVideo::getManager()->setRenderMode(mDoMch_render_c::getRenderModeObj()); mDoGph_gInf_c::endFrame(); diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp index 6c1d3df034f..7ea5a81a248 100644 --- a/src/m_Do/m_Do_machine.cpp +++ b/src/m_Do/m_Do_machine.cpp @@ -669,13 +669,13 @@ int mDoMch_Create() { JKRHeap::setDefaultDebugFill(mDebugFill); JFWSystem::setMaxStdHeap(1); - u32 arenaHi = OSGetArenaHi(); - u32 arenaLo = OSGetArenaLo(); + u32 arenaHi = (u32)OSGetArenaHi(); + u32 arenaLo = (u32)OSGetArenaLo(); if (arenaHi > 0x81800000 && arenaHi - 0x1800000 > arenaLo) { - OSSetArenaHi(arenaHi - 0x1800000); + OSSetArenaHi((void*)(arenaHi - 0x1800000)); } - u32 arenaSize = (OSGetArenaHi() - OSGetArenaLo()) - 0xF0; + u32 arenaSize = ((u32)OSGetArenaHi() - (u32)OSGetArenaLo()) - 0xF0; my_PrintHeap("アリーナ", arenaSize); if (mDoMain::memMargin != -1) { diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 844e00aeb18..5cd9a893aac 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -9,6 +9,7 @@ #include "JSystem/JKernel/JKRAram.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTReport.h" +#include "c/c_dylink.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -24,26 +25,7 @@ // Forward References: // -extern "C" void version_check__Fv(); -extern "C" void CheckHeap1__9HeapCheckFv(); -extern "C" static void CheckHeap__FUl(); -extern "C" static void countUsed__FP10JKRExpHeap(); -extern "C" void getUsedCount__9HeapCheckCFv(); -extern "C" void heapDisplay__9HeapCheckCFv(); -extern "C" static void debugDisplay__Fv(); -extern "C" static void Debug_console__FUl(); -extern "C" void* LOAD_COPYDATE__FPv(); -extern "C" static void debug__Fv(); -extern "C" static void main01__Fv(); -extern "C" void main(); -extern "C" bool dump_sort__7JKRHeapFv(); -extern "C" void __sinit_m_Do_main_cpp(); extern "C" extern char const* const m_Do_m_Do_main__stringBase0; -extern "C" u8 COPYDATE_STRING__7mDoMain[18 + 2 /* padding */]; -extern "C" u32 memMargin__7mDoMain; -extern "C" u8 sPowerOnTime__7mDoMain[4]; -extern "C" u8 sHungUpTime__7mDoMain[4]; -extern "C" s8 developmentMode__7mDoMain; extern "C" extern u8 data_80450B38[4]; extern "C" extern u8 data_80450B3C[4]; extern "C" extern u8 data_80450B40[4]; @@ -71,59 +53,8 @@ extern "C" extern u8 data_80450B90[4 + 4 /* padding */]; // External References: // -extern "C" void OSReportInit__Fv(); -extern "C" void mDoAud_Execute__Fv(); -extern "C" void create__8mDoCPd_cFv(); -extern "C" void read__8mDoCPd_cFv(); -extern "C" void mDoGph_Create__Fv(); -extern "C" void mDoMch_HeapCheckAll__Fv(); -extern "C" void mDoMch_Create__Fv(); -extern "C" void mDoExt_getGameHeap__Fv(); -extern "C" void mDoExt_getZeldaHeap__Fv(); -extern "C" void mDoExt_getCommandHeap__Fv(); -extern "C" void mDoExt_getArchiveHeap__Fv(); -extern "C" void mDoExt_getJ2dHeap__Fv(); -extern "C" void mDoExt_getHostIOHeap__Fv(); -extern "C" void create__20mDoDvdThd_callback_cFPFPv_PvPv(); -extern "C" void update__15mDoMemCd_Ctrl_cFv(); -extern "C" void cDyl_InitAsync__Fv(); -extern "C" void fapGm_Execute__Fv(); -extern "C" void fapGm_Create__Fv(); -extern "C" void fopAcM_initManager__Fv(); -extern "C" void ct__13dComIfG_inf_cFv(); extern "C" void dump__14dRes_control_cFv(); extern "C" void dump__24DynamicModuleControlBaseFv(); -extern "C" void getFreeSize__7JKRHeapFv(); -extern "C" void getTotalFreeSize__7JKRHeapFv(); -extern "C" void getTotalUsedSize__10JKRExpHeapCFv(); -extern "C" void create__12JKRSolidHeapFUlP7JKRHeapb(); -extern "C" void getFreeSize__11JKRAramHeapFv(); -extern "C" void getTotalFreeSize__11JKRAramHeapFv(); -extern "C" void dump__11JKRAramHeapFv(); -extern "C" void JUTReport__FiiPCce(); -extern "C" void JUTReport__FiiiPCce(); -extern "C" void setMessageCount__12JUTAssertionFi(); -extern "C" void clear__10JUTConsoleFv(); -extern "C" void dumpToTerminal__10JUTConsoleFUi(); -extern "C" void scroll__10JUTConsoleFi(); -extern "C" void getLineOffset__10JUTConsoleCFv(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" u8 m_gamePad__8mDoCPd_c[16]; -extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern JKRSolidHeap* g_mDoAud_audioHeap; -extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" u8 systemConsole__9JFWSystem[4]; -extern "C" u8 sSystemHeap__7JKRHeap[4]; -extern "C" u8 sCurrentHeap__7JKRHeap[4]; -extern "C" u8 sRootHeap__7JKRHeap[4]; -extern "C" u8 sAramObject__7JKRAram[4]; // // Declarations: @@ -299,7 +230,7 @@ OSTime mDoMain::sHungUpTime; /* 80450B18 0001+00 data_80450B18 None */ /* 80450B19 0001+00 data_80450B19 None */ /* 80450B1A 0002+00 data_80450B1A None */ -static bool mDisplayHeapSize; // sDisplayHeapDebug +static bool mDisplayHeapSize; static u8 sDisplayHeap; static bool sCheckHeap; @@ -477,40 +408,21 @@ bool Debug_console(u32 i_padNo) { return 0; } -/* ############################################################################################## */ -/* 803739A0-803739A0 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80373C23 = "/str/Final/Release/COPYDATE"; -#pragma pop - /* 8000614C-800061C8 000A8C 007C+00 1/1 0/0 0/0 .text LOAD_COPYDATE__FPv */ -#ifdef NONMATCHING s32 LOAD_COPYDATE(void*) { s32 status; - u8 buffer[32]; - u8 fileInfo[80]; - // DVDFileInfo fileInfo; - status = DVDOpen("/str/Final/Release/COPYDATE", (DVDFileInfo*)&fileInfo); + DVDFileInfo __attribute__((aligned(0x20))) fileInfo; + u8 buffer[0x20]; + status = DVDOpen("/str/Final/Release/COPYDATE", &fileInfo); if (status) { - DVDReadPrio((DVDFileInfo*)fileInfo, &buffer, 32, 0, 2); + DVDReadPrio(&fileInfo, &buffer, 32, 0, 2); memcpy(mDoMain::COPYDATE_STRING, buffer, 17); - status = DVDClose((DVDFileInfo*)fileInfo); + status = DVDClose(&fileInfo); } return status; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void* LOAD_COPYDATE(void* param_0) { - nofralloc -#include "asm/m_Do/m_Do_main/LOAD_COPYDATE__FPv.s" -} -#pragma pop -#endif static void debug() { if (mDoMain::developmentMode) { @@ -537,15 +449,11 @@ static void debug() { } } -/* ############################################################################################## */ -/* 80450B34-80450B38 000034 0004+00 1/1 0/0 0/0 .sbss frame$3939 */ -static u32 frame; - /* 8000628C-80006454 000BCC 01C8+00 1/1 0/0 0/0 .text main01__Fv */ -// only issue is output check section with weird code gen -#ifdef NONMATCHING void main01(void) { - mDoMch_Create__Fv(); + static u32 frame; + + mDoMch_Create(); mDoGph_Create(); mDoCPd_c::create(); @@ -590,26 +498,22 @@ void main01(void) { } JUTConsole* console = JFWSystem::getSystemConsole(); - s32 output = 0; - if (mDoMain::developmentMode != 0) { - output = JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE; - } - - console->setOutput(output); + console->setOutput(mDoMain::developmentMode ? JUTConsole::OUTPUT_OSR_AND_CONSOLE : + JUTConsole::OUTPUT_NONE); console->setPosition(32, 42); - mDoDvdThd_callback_c::create(LOAD_COPYDATE, NULL); - fapGm_Create__Fv(); - fopAcM_initManager__Fv(); + mDoDvdThd_callback_c::create((mDoDvdThd_callback_func)LOAD_COPYDATE, NULL); + fapGm_Create(); + fopAcM_initManager(); mDisplayHeapSize = 0; - cDyl_InitAsync__Fv(); + cDyl_InitAsync(); g_mDoAud_audioHeap = JKRSolidHeap::create(0x14D800, JKRHeap::getCurrentHeap(), false); do { frame++; if (fillcheck_check_frame != 0 && frame % fillcheck_check_frame == 0) { - mDoMch_HeapCheckAll__Fv(); + mDoMch_HeapCheckAll(); } if (SyncWidthSound) { @@ -617,21 +521,11 @@ void main01(void) { } mDoCPd_c::read(); - fapGm_Execute__Fv(); - mDoAud_Execute__Fv(); + fapGm_Execute(); + mDoAud_Execute(); debug(); } while (true); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void main01() { - nofralloc -#include "asm/m_Do/m_Do_main/main01__Fv.s" -} -#pragma pop -#endif /* ############################################################################################## */ /* 803D3420-803DB420 000140 8000+00 1/1 0/0 0/0 .bss mainThreadStack */ @@ -722,8 +616,7 @@ SECTION_DEAD static char const* const stringBase_80373CA7 = "コマンド"; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __sinit_m_Do_main_cpp() { - nofralloc +asm void __sinit_m_Do_main_cpp(){nofralloc #include "asm/m_Do/m_Do_main/__sinit_m_Do_main_cpp.s" } #pragma pop