diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2021-05-23 03:09:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-23 12:09:59 +0200 |
| commit | e915df66c806bdff65aa243649f7abfe6cc19227 (patch) | |
| tree | 226e708c0546c45f65420446382ba597ad773651 /src | |
| parent | 462d71cbef02ef119fc2aa480b98cfeedde46441 (diff) | |
move d_a_alink and some related stuff (#130)
* clean up d_a_player
* move some of daalink
* more daalink / daplayer
* setup some daalink members
* rest of daalink members setup
* remove comment
* few more matches
* remove asm
* more matches
* more matches + move e_wb_class
* fix some d_save classes
Co-authored-by: lepelog <lepelog@users.noreply.github.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/d/a/d_a_alink.cpp | 4595 | ||||
| -rw-r--r-- | src/d/a/d_a_horse_static.cpp | 141 | ||||
| -rw-r--r-- | src/d/a/d_a_player.cpp | 105 | ||||
| -rw-r--r-- | src/d/bg/d_bg_s_lin_chk.cpp | 59 | ||||
| -rw-r--r-- | src/d/com/d_com_inf_game.cpp | 3 | ||||
| -rw-r--r-- | src/d/d_attention.cpp | 4 | ||||
| -rw-r--r-- | src/d/d_drawlist.cpp | 4 | ||||
| -rw-r--r-- | src/d/d_eye_hl.cpp | 15 | ||||
| -rw-r--r-- | src/d/d_jnt_col.cpp | 46 | ||||
| -rw-r--r-- | src/d/d_resorce.cpp | 6 | ||||
| -rw-r--r-- | src/d/kankyo/d_kankyo.cpp | 20 | ||||
| -rw-r--r-- | src/d/msg/d_msg_flow.cpp | 141 | ||||
| -rw-r--r-- | src/d/particle/d_particle.cpp | 54 | ||||
| -rw-r--r-- | src/d/particle/d_particle_copoly.cpp | 22 | ||||
| -rw-r--r-- | src/d/save/d_save.cpp | 392 | ||||
| -rw-r--r-- | src/m_Do/m_Do_ext.cpp | 37 |
16 files changed, 946 insertions, 4698 deletions
diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 32290e0fec..a22a39077f 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -6,50 +6,12 @@ #include "d/a/d_a_alink.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" // // Types: // - -struct stage_stag_info_class {}; - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 80018BD0 */ ~csXyz(); - /* 80112C80 */ csXyz(); - /* 802673F4 */ csXyz(s16, s16, s16); - - static u8 Zero[4]; -}; - -struct Quaternion {}; - -struct Vec {}; - -struct cXyz { - /* 80009184 */ ~cXyz(); - /* 8014195C */ cXyz(f32, f32, f32); - /* 800125DC */ cXyz(); - /* 800977F4 */ cXyz(cXyz const&); - /* 8008E790 */ void abs() const; - /* 800977D8 */ void operator=(cXyz const&); - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; - /* 80266C18 */ void operator/(f32) const; - /* 80266CBC */ void outprod(Vec const&) const; - /* 80266D30 */ void normZP() const; - /* 80266EF4 */ void normalize(); - /* 80266F48 */ void normalizeZP(); - /* 80267128 */ void atan2sX_Z() const; - /* 80267150 */ void atan2sY_XZ() const; - - static f32 Zero[3]; - static u8 BaseX[12]; - static u8 BaseY[12]; - static u8 BaseZ[12]; -}; +// struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); @@ -65,26 +27,10 @@ struct mDoMtx_stack_c { struct J3DAnmCluster {}; -struct J3DDeformData {}; - struct mDoExt_blkAnm { /* 8000DA08 */ void init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16); }; -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - struct mDoExt_MtxCalcOldFrame { /* 8000F848 */ void initOldFrameMorf(f32, u16, u16); }; @@ -93,42 +39,12 @@ struct mDoExt_MtxCalcAnmBlendTbl { /* 800D00BC */ void getAnm(int); }; -struct mDoExt_AnmRatioPack { - /* 80140DF0 */ ~mDoExt_AnmRatioPack(); - /* 80140E2C */ mDoExt_AnmRatioPack(); -}; - struct mDoCPd_c { static u8 m_cpadInfo[256]; }; struct fopEn_enemy_c {}; -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct fopAcM_wt_c { - /* 8001DD84 */ void waterCheck(cXyz const*); - - static u8 mWaterCheck[84 + 4 /* padding */]; - static f32 mWaterY[1 + 1 /* padding */]; -}; - -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 e_wb_class { /* 80037C7C */ void checkWait(); /* 80037C90 */ void setPlayerRideNow(); @@ -143,13 +59,6 @@ struct daTagMist_c { /* 80031CF0 */ void getPlayerNo(); }; -struct cBgS_PolyInfo { - /* 80268074 */ cBgS_PolyInfo(); - /* 802680B0 */ ~cBgS_PolyInfo(); - /* 80268120 */ void ClearPi(); - /* 80268148 */ void SetPolyInfo(cBgS_PolyInfo const&); -}; - struct daTagMagne_c { /* 80031B50 */ void checkMagnetCode(cBgS_PolyInfo&); }; @@ -158,272 +67,6 @@ struct daTagHstop_c { static u8 m_top[4 + 4 /* padding */]; }; -struct ResTIMG {}; - -struct daPy_sightPacket_c { - /* 80140CDC */ ~daPy_sightPacket_c(); - /* 8015F1A0 */ void draw(); - /* 8015F2FC */ void setSight(); - /* 8015F384 */ void setSightImage(ResTIMG*); -}; - -struct daPy_py_c { - struct daPy_FLG2 {}; - - struct daPy_FLG0 {}; - - struct daPy_ERFLG2 {}; - - struct daPy_FLG3 {}; - - struct daPy_ERFLG1 {}; - - struct daPy_FLG1 {}; - - struct daPy_RFLG0 {}; - - struct daPy_ERFLG0 {}; - - /* 8000B1E4 */ s32 getAtnActorID() const; - /* 8001E11C */ void onFrollCrashFlg(u8, int); - /* 8001E120 */ bool checkWolfDash() const; - /* 8001E128 */ bool checkFrontRoll() const; - /* 8001E130 */ bool checkHorseRide() const; - /* 8001E138 */ s32 getGrabActorID() const; - /* 8006F160 */ bool getKandelaarFlamePos(); - /* 80077494 */ bool checkPlayerFly() const; - /* 80088134 */ bool checkCutJumpCancelTurn() const; - /* 800977B4 */ void checkMidnaRide() const; - /* 80097850 */ bool checkCanoeRide() const; - /* 80097858 */ bool checkBoardRide() const; - /* 80097860 */ bool checkSpinnerRide() const; - /* 80097868 */ bool checkBoarRide() const; - /* 8014111C */ void onNoResetFlg2(daPy_py_c::daPy_FLG2); - /* 8014112C */ void offNoResetFlg0(daPy_py_c::daPy_FLG0); - /* 80141190 */ void checkEndResetFlg2(daPy_py_c::daPy_ERFLG2) const; - /* 801411B0 */ void getSumouMode() const; - /* 801411D4 */ void checkNoResetFlg3(daPy_py_c::daPy_FLG3) const; - /* 80141210 */ void checkShieldGet(); - /* 801412B0 */ void checkEquipHeavyBoots() const; - /* 801412C4 */ void onNoResetFlg0(daPy_py_c::daPy_FLG0); - /* 80141340 */ void checkEndResetFlg1(daPy_py_c::daPy_ERFLG1) const; - /* 8014135C */ void offNoResetFlg1(daPy_py_c::daPy_FLG1); - /* 8014136C */ void offNoResetFlg2(daPy_py_c::daPy_FLG2); - /* 801413CC */ void checkWolf() const; - /* 801413D8 */ void checkSwordGet(); - /* 801413F8 */ void checkResetFlg0(daPy_py_c::daPy_RFLG0) const; - /* 80141410 */ void checkNoResetFlg0(daPy_py_c::daPy_FLG0) const; - /* 801414C0 */ void checkNoResetFlg2(daPy_py_c::daPy_FLG2) const; - /* 801414CC */ void checkMagneBootsOn() const; - /* 801414E8 */ void checkBoarSingleBattle() const; - /* 801414F4 */ void checkEndResetFlg0(daPy_py_c::daPy_ERFLG0) const; - /* 80141500 */ bool getMidnaAtnPos() const; - /* 80141508 */ void setMidnaMsgNum(fopAc_ac_c*, u16); - /* 8014150C */ void getModelMtx(); - /* 80141514 */ void getInvMtx(); - /* 8014151C */ void getShadowTalkAtnPos(); - /* 80141524 */ void getLeftItemMatrix(); - /* 8014152C */ void getRightItemMatrix(); - /* 80141534 */ void getLeftHandMatrix(); - /* 8014153C */ void getRightHandMatrix(); - /* 80141544 */ void getLinkBackBone1Matrix(); - /* 8014154C */ void getWolfMouthMatrix(); - /* 80141554 */ void getWolfBackbone2Matrix(); - /* 8014155C */ bool getBottleMtx(); - /* 80141564 */ bool checkPlayerGuard() const; - /* 8014156C */ bool checkAutoJump() const; - /* 80141574 */ bool checkSideStep() const; - /* 8014157C */ bool checkWolfTriggerJump() const; - /* 80141584 */ bool checkGuardBreakMode() const; - /* 8014158C */ bool checkLv3Slide() const; - /* 80141594 */ bool checkWolfHowlDemoMode() const; - /* 8014159C */ bool checkChainBlockPushPull(); - /* 801415A4 */ bool checkElecDamage() const; - /* 801415AC */ bool checkEmptyBottleSwing() const; - /* 801415B4 */ bool checkBottleSwingMode() const; - /* 801415BC */ bool checkHawkWait() const; - /* 801415C4 */ bool checkGoatThrow() const; - /* 801415CC */ bool checkGoatThrowAfter() const; - /* 801415D4 */ bool checkWolfTagLockJump() const; - /* 801415DC */ bool checkWolfTagLockJumpLand() const; - /* 801415E4 */ bool checkWolfRope(); - /* 801415EC */ bool checkWolfRopeHang() const; - /* 801415F4 */ bool checkRollJump() const; - /* 801415FC */ bool checkGoronRideWait() const; - /* 80141604 */ bool checkWolfChain() const; - /* 8014160C */ bool checkWolfWait() const; - /* 80141614 */ bool checkWolfJumpAttack() const; - /* 8014161C */ bool checkWolfRSit() const; - /* 80141624 */ bool checkBubbleFly() const; - /* 8014162C */ bool checkBottleDrinkEnd() const; - /* 80141634 */ bool checkWolfDig() const; - /* 8014163C */ bool checkCutCharge() const; - /* 80141644 */ bool checkCutTurnCharge() const; - /* 8014164C */ bool checkCutLargeJumpCharge() const; - /* 80141654 */ bool getBokoFlamePos(cXyz*); - /* 8014165C */ bool checkComboCutTurn() const; - /* 80141664 */ bool checkClimbMove() const; - /* 8014166C */ bool checkGrassWhistle() const; - /* 80141674 */ bool checkBoarRun() const; - /* 8014167C */ bool checkFmChainPut() const; - /* 80141684 */ bool checkHorseElecDamage() const; - /* 8014168C */ void getBaseAnimeFrameRate() const; - /* 80141694 */ void getBaseAnimeFrame() const; - /* 8014169C */ void setAnimeFrame(f32); - /* 801416A0 */ bool checkWolfLock(fopAc_ac_c*) const; - /* 801416A8 */ bool cancelWolfLock(fopAc_ac_c*); - /* 801416B0 */ s32 getItemID() const; - /* 801416B8 */ bool exchangeGrabActor(fopAc_ac_c*); - /* 801416C0 */ bool setForceGrab(fopAc_ac_c*, int, int); - /* 801416C8 */ void setForcePutPos(cXyz const&); - /* 801416CC */ bool checkPlayerNoDraw(); - /* 801416D4 */ bool checkRopeTag(); - /* 801416DC */ void voiceStart(u32); - /* 801416E0 */ void seStartOnlyReverb(u32); - /* 801416E4 */ void seStartOnlyReverbLevel(u32); - /* 801416E8 */ void setOutPower(f32, s16, int); - /* 801416EC */ void setGrabCollisionOffset(f32, f32, cBgS_PolyInfo*); - /* 801416F0 */ void onMagneGrab(f32, f32); - /* 801416F4 */ bool getModelJointMtx(u16); - /* 801416FC */ bool getHeadMtx(); - /* 80141704 */ bool setHookshotCarryOffset(unsigned int, cXyz const*); - /* 8014170C */ bool checkIronBallReturn() const; - /* 80141714 */ bool checkIronBallGroundStop() const; - /* 8014171C */ bool checkSingleBoarBattleSecondBowReady() const; - /* 80141724 */ bool checkPointSubWindowMode() const; - /* 8014172C */ void setClothesChange(int); - /* 80141730 */ void setPlayerPosAndAngle(f32 (*)[4]); - /* 80141734 */ void setPlayerPosAndAngle(cXyz const*, csXyz const*); - /* 80141738 */ void setPlayerPosAndAngle(cXyz const*, s16, int); - /* 8014173C */ bool setThrowDamage(s16, f32, f32, int, int, int); - /* 80141744 */ bool checkSetNpcTks(cXyz*, int, int); - /* 8014174C */ bool setRollJump(f32, f32, s16); - /* 80141754 */ void playerStartCollisionSE(u32, u32); - /* 80141758 */ void changeTextureAnime(u16, u16, int); - /* 8014175C */ void cancelChangeTextureAnime(); - /* 80141760 */ void cancelDungeonWarpReadyNeck(); - /* 80141764 */ void onSceneChangeArea(u8, u8, fopAc_ac_c*); - /* 80141768 */ void onSceneChangeAreaJump(u8, u8, fopAc_ac_c*); - /* 8014176C */ void onSceneChangeDead(u8, int); - /* 80141770 */ bool getSpinnerActor(); - /* 80141778 */ bool checkHorseRideNotReady() const; - /* 80141780 */ bool checkArrowChargeEnd() const; - /* 80141788 */ void getSearchBallScale() const; - /* 80141790 */ bool checkFastShotTime(); - /* 80141798 */ bool checkNoEquipItem() const; - /* 801417A0 */ bool checkFireMaterial() const; - /* 801417A8 */ bool checkKandelaarSwing(int) const; - /* 801417B0 */ bool getBoardCutTurnOffsetAngleY() const; - /* 801417B8 */ void getMagneHitPos(); - /* 801417C0 */ void getMagneBootsTopVec(); - /* 801417C8 */ bool checkUseKandelaar(int); - /* 801417D0 */ void setDkCaught(fopAc_ac_c*); - /* 801417D4 */ void onPressedDamage(cXyz const&, s16); - /* 801417D8 */ bool checkPriActorOwn(fopAc_ac_c const*) const; - /* 801417E0 */ bool onWolfEnemyBiteAll(fopAc_ac_c*, daPy_py_c::daPy_FLG2); - /* 801417E8 */ bool checkWolfEnemyBiteAllOwn(fopAc_ac_c const*) const; - /* 801417F0 */ void setWolfEnemyHangBiteAngle(s16); - /* 801417F4 */ void setKandelaarMtx(f32 (*)[4], int, int); - /* 801417F8 */ bool getStickAngleFromPlayerShape(s16*) const; - /* 80141800 */ bool checkSpinnerPathMove(); - /* 80141808 */ bool checkSpinnerTriggerAttack(); - /* 80141810 */ void onSpinnerPathForceRemove(); - /* 80141814 */ bool getIronBallBgHit() const; - /* 8014181C */ bool getIronBallCenterPos(); - /* 80141824 */ bool checkCanoeFishingGetLeft() const; - /* 8014182C */ bool checkCanoeFishingGetRight() const; - /* 80141834 */ bool checkBeeChildDrink() const; - /* 8014183C */ void skipPortalObjWarp(); - /* 80141840 */ bool checkTreasureRupeeReturn(int) const; - /* 80141848 */ void setSumouReady(fopAc_ac_c*); - /* 8014184C */ bool checkAcceptDungeonWarpAlink(int); - /* 80141854 */ bool getSumouCounter() const; - /* 8014185C */ bool checkSumouWithstand() const; - /* 80141864 */ void cancelGoronThrowEvent(); - /* 80141868 */ void setSumouGraspCancelCount(int); - /* 8014186C */ void setSumouPushBackDirection(s16); - /* 80141870 */ void setSumouLoseHeadUp(); - /* 80141874 */ void getGiantPuzzleAimAngle() const; - /* 8014187C */ void setGoronSideMove(fopAc_ac_c*); - /* 80141880 */ void setCargoCarry(fopAc_ac_c*); - /* 80141884 */ bool getDpdFarFlg() const; - /* 8014188C */ bool getHookshotTopPos(); - /* 80141894 */ bool checkHookshotReturnMode() const; - /* 8014189C */ bool checkHookshotShootReturnMode() const; - /* 801418A4 */ bool checkOctaIealHang() const; - /* 801418AC */ void cancelOctaIealHang(); - /* 801418B0 */ void cancelDragonHangBackJump(); - /* 801418B4 */ void setOctaIealWildHang(); - /* 801418B8 */ bool checkDragonHangRide() const; - /* 801418C0 */ void changeDragonActor(fopAc_ac_c*); - /* 801418C4 */ bool getClothesChangeWaitTimer() const; - /* 801418CC */ bool getShieldChangeWaitTimer() const; - /* 801418D4 */ bool getSwordChangeWaitTimer() const; - /* 801418DC */ bool checkMetamorphose() const; - /* 801418E4 */ bool checkWolfDownAttackPullOut() const; - /* 801418EC */ bool checkBootsOrArmorHeavy() const; - /* 801418F4 */ s32 getBottleOpenAppearItem() const; - /* 801418FC */ bool checkItemSwordEquip() const; - /* 80141904 */ void getSinkShapeOffset() const; - /* 8014190C */ bool checkSinkDead() const; - /* 80141914 */ bool checkHorseStart(); - /* 8014191C */ bool getWolfHowlMgrP(); - /* 80141924 */ bool checkWolfHowlSuccessAnime() const; - /* 8014192C */ bool checkCopyRodTopUse(); - /* 80141934 */ bool checkCopyRodEquip() const; - /* 8014193C */ bool checkCutJumpMode() const; - /* 8015EA0C */ void setParamData(int, int, int, int); - /* 8015EA20 */ void checkFishingRodItem(int); - /* 8015EA48 */ void checkBombItem(int); - /* 8015EA88 */ void checkBottleItem(int); - /* 8015EAD8 */ void checkDrinkBottleItem(int); - /* 8015EB40 */ void checkOilBottleItem(int); - /* 8015EB68 */ void checkOpenBottleItem(int); - /* 8015EB90 */ void checkBowItem(int); - /* 8015EBB8 */ void checkHookshotItem(int); - /* 8015EBD8 */ void checkTradeItem(int); - /* 8015EC28 */ void checkDungeonWarpItem(int); - /* 8015F398 */ void checkMasterSwordEquip(); - /* 8015F3C4 */ void checkWoodShieldEquip(); - /* 8015F698 */ void checkCarryStartLightBallA(); - /* 8015F730 */ void checkCarryStartLightBallB(); - - static u8 m_midnaActor[4]; -}; - -struct daPy_frameCtrl_c { - /* 80140D24 */ ~daPy_frameCtrl_c(); - /* 80140D80 */ daPy_frameCtrl_c(); - /* 8015E4CC */ void checkAnmEnd(); - /* 8015E510 */ void updateFrame(); - /* 8015E544 */ void setFrameCtrl(u8, s16, s16, f32, f32); -}; - -struct daPy_demo_c { - /* 8014137C */ void setSpecialDemoType(); -}; - -struct daPy_anmHeap_c { - struct daAlinkHEAP_TYPE {}; - - /* 80140DCC */ void __defctor(); - /* 8015ED10 */ daPy_anmHeap_c(u32); - /* 8015ED50 */ ~daPy_anmHeap_c(); - /* 8015EDC4 */ void mallocBuffer(); - /* 8015EE00 */ void createHeap(daPy_anmHeap_c::daAlinkHEAP_TYPE); - /* 8015F068 */ void loadDataIdx(u16); - /* 8015F0D0 */ void loadDataPriIdx(u16); - /* 8015F118 */ void loadDataDemoRID(u16, u16); - /* 8015F168 */ void setAnimeHeap(); -}; - -struct daPy_actorKeep_c { - /* 801410EC */ daPy_actorKeep_c(); - /* 8015EC48 */ void setActor(); - /* 8015ECB8 */ void setData(fopAc_ac_c*); - /* 8015ECFC */ void clearData(); -}; - struct daObj_Sekizoa_c { /* 801312C8 */ void setWolfHowling(); }; @@ -450,26 +93,10 @@ struct daNpcT_ActorMngr_c { /* 80145708 */ void getActorP(); }; -struct J3DModel { - /* 800CFFE0 */ void getAnmMtx(int); - /* 800CFFF4 */ void setBaseTRMtx(f32 (*)[4]); - /* 803279A0 */ void diff(); - /* 80327A2C */ void setDeformData(J3DDeformData*, u32); - /* 80327C58 */ void calcWeightEnvelopeMtx(); -}; - struct daMirror_c { /* 8003194C */ void entry(J3DModel*); }; -struct daMidna_c { - /* 801419F4 */ void onForcePanic(); - /* 80141A04 */ void checkForceNormalColor() const; - /* 80141A10 */ void checkForceTiredColor() const; - /* 80141A1C */ void checkMidnaTired(); - /* 80141A84 */ void onNoServiceWait(); -}; - struct daItemBase_c { /* 80037A5C */ void getItemNo(); /* 80037A64 */ void hide(); @@ -477,21 +104,10 @@ struct daItemBase_c { /* 80037AE4 */ void dead(); }; -struct daHorse_c { - /* 80141944 */ void getZeldaActor(); -}; - struct daCrod_c { /* 80141A94 */ void setControllActorData(); }; -struct daAlink_sight_c { - /* 800CFDF4 */ ~daAlink_sight_c(); - /* 80126650 */ void create(); - /* 801266C0 */ void draw(); - /* 80126710 */ void onLockFlg(); -}; - struct J3DMaterial {}; struct daAlink_matAnm_c { @@ -501,77 +117,6 @@ struct daAlink_matAnm_c { /* 800D0B8C */ ~daAlink_matAnm_c(); }; -struct daAlink_lockCursor_c { - /* 800CFE68 */ ~daAlink_lockCursor_c(); - /* 80125F14 */ void create(); - /* 80126358 */ void update(); - /* 80126424 */ void draw(); -}; - -struct daAlink_footData_c { - /* 800CFCB8 */ ~daAlink_footData_c(); - /* 800CFCF4 */ daAlink_footData_c(); -}; - -struct dBgW_Base { - struct PushPullLabel {}; -}; - -struct _GXColorS10 {}; - -struct J3DAnmTevRegKey { - /* 8032B1F8 */ void getTevColorReg(u16, _GXColorS10*) const; - /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 800842C0 */ void ChkAtHit(); - /* 80084318 */ void ResetAtHit(); - /* 800843A8 */ void GetAtHitGObj(); - /* 80084460 */ void ChkTgHit(); - /* 800844B8 */ void ResetTgHit(); - /* 80084548 */ void GetTgHitGObj(); - /* 8008457C */ void GetTgHitObjSe(); - /* 800845B0 */ void getHitSeID(u8, int); - /* 80084658 */ void ChkCoHit(); - /* 800846B0 */ void ResetCoHit(); -}; - -struct JKRHeap { - /* 802CE5CC */ void freeAll(); -}; - -struct JKRExpHeap { - /* 802CEE2C */ void create(u32, JKRHeap*, bool); -}; - -struct J3DAnmBase {}; - -struct J3DGXColorS10 { - /* 8000E460 */ J3DGXColorS10(); -}; - -struct daAlinkHIO_anm_c {}; - -struct dAttList_c { - /* 80073864 */ void getActor(); -}; - -struct cM3dGPla { - /* 8001DB90 */ ~cM3dGPla(); - /* 801411F0 */ cM3dGPla(); - /* 8026F3DC */ cM3dGPla(cXyz const*, f32); - /* 8026F408 */ void crossInfLin(cXyz const&, cXyz const&, cXyz&) const; -}; - -struct dBgS_LinChk { - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct JPABaseEmitter {}; - struct dCcG_At_Spl {}; struct dDemo_actor_c { @@ -579,1915 +124,6 @@ struct dDemo_actor_c { /* 80038338 */ void getDemoIDData(int*, int*, int*, u16*, u8*); }; -struct daAlink_c { - struct daAlink_ANM {}; - - struct daAlink_UPPER {}; - - struct daAlink_UNDER {}; - - struct daAlink_FTANM {}; - - struct daAlink_WARP_MAT_MODE {}; - - struct daAlink_PROC {}; - - struct firePointEff_c { - /* 800CFC3C */ ~firePointEff_c(); - /* 800CFC78 */ firePointEff_c(); - }; - - struct hsChainShape_c { - /* 800D0CDC */ ~hsChainShape_c(); - /* 80107900 */ void draw(); - }; - - struct daAlink_WANM {}; - - /* 80097870 */ void getShadowTalkAtnPos(); - /* 8009D87C */ bool getE3Zhint(); - /* 8009D884 */ void getAlinkArcName(); - /* 8009DA60 */ void checkStageName(char const*); - /* 8009DA98 */ void tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*); - /* 8009DB64 */ void coHitCallback(fopAc_ac_c*, dCcD_GObjInf*); - /* 8009DC6C */ void setMatrixWorldAxisRot(f32 (*)[4], s16, s16, s16, int, cXyz const*); - /* 8009DD90 */ void jointControll(int); - /* 8009E7B8 */ void setUpperFront(); - /* 8009E91C */ void changeBlendRate(int); - /* 8009EB18 */ void resetRootMtx(); - /* 8009EB58 */ void modelCallBack(int); - /* 8009ECA0 */ void headModelCallBack(int); - /* 8009EF7C */ void wolfModelCallBack(int); - /* 8009F034 */ void setHatAngle(); - /* 8009FFF8 */ void calcHairAngle(s16*); - /* 800A002C */ void setHairAngle(cXyz*, f32, f32); - /* 800A0744 */ void setLookPosFromOut(cXyz*); - /* 800A07D8 */ void checkAttentionPosAngle(cXyz*); - /* 800A0868 */ void checkActorPosAngle(fopAc_ac_c*, cXyz**); - /* 800A093C */ void getNeckAimPos(cXyz*, int*, int); - /* 800A142C */ void getNeckAimAngle(cXyz*, s16*, s16*, s16*, s16*); - /* 800A1AEC */ void setEyeMove(cXyz*, s16, s16); - /* 800A1F90 */ void setNeckAngle(); - /* 800A2160 */ void getStickAngleFromPlayerShape(s16*) const; - /* 800A2198 */ void commonLineCheck(cXyz*, cXyz*); - /* 800A21E0 */ void getMoveBGActorName(cBgS_PolyInfo&, int); - /* 800A2280 */ void checkGoronRide(); - /* 800A22E8 */ void setMoveSlantAngle(); - /* 800A2710 */ void setArmMatrix(); - /* 800A29DC */ void setFootMatrix(); - /* 800A2C24 */ void setMatrixOffset(f32*, f32); - /* 800A2CE0 */ void setLegAngle(f32, daAlink_footData_c*, s16*, s16*, int); - /* 800A3430 */ void footBgCheck(); - /* 800A39B8 */ void handBgCheck(); - /* 800A3C8C */ void setItemHeap(); - /* 800A3CE4 */ void setIdxMask(u16*, u16*); - /* 800A3D0C */ void getAnimeResource(daPy_anmHeap_c*, u16, u32); - /* 800A3D7C */ void initModel(J3DModelData*, u32, u32); - /* 800A3E30 */ void initModel(u16, u32); - /* 800A3E98 */ void initModelEnv(u16, u32); - /* 800A3F00 */ void initDemoModel(J3DModel**, char const*, u32); - /* 800A3F98 */ void initDemoBck(mDoExt_bckAnm**, char const*); - /* 800A4068 */ void createHeap(); - /* 800A4910 */ void setSelectEquipItem(int); - /* 800A4BC8 */ void checkBoarStart(); - /* 800A4C40 */ void checkCanoeStart(); - /* 800A4CB4 */ void playerInit(); - /* 800D01A8 */ void checkHorseStart(); - /* 800A54F4 */ void checkHorseStart(u32, int); - /* 800A551C */ void setStartProcInit(); - /* 800A5CC8 */ void create(); - /* 800A662C */ void setRoomInfo(); - /* 800A67E0 */ void setShapeAngleOnGround(); - /* 800A6B0C */ void setStepsOffset(); - /* 800A6DCC */ void iceSlipBgCheck(); - /* 800A7050 */ void setIceSlipSpeed(); - /* 800A7358 */ void setPolygonSpeed(); - /* 800A7950 */ void checkWindSpeedOnAngle() const; - /* 800A79EC */ void checkWindSpeedOnAngleAnime(int) const; - /* 800A7A5C */ void checkDashAnime() const; - /* 800A7ABC */ void checkWindWallRate(cXyz const&); - /* 800A7CB0 */ void setWindSpeed(); - /* 800A8310 */ void setBodyPartPos(); - /* 800A87D8 */ void setRollJump(f32, f32, s16); - /* 800A87F8 */ void setAttentionPos(); - /* 800A8CE4 */ void setMatrix(); - /* 800A9248 */ void simpleAnmPlay(J3DAnmBase*); - /* 800A92F0 */ void setSwordPos(); - /* 800A9450 */ void setItemMatrix(int); - /* 800A9F4C */ void setWolfItemMatrix(); - /* 800AA2BC */ void setHandIndex(daAlink_c::daAlink_ANM); - /* 800AA2E0 */ void setSwordAtCollision(int); - /* 800AA5E8 */ void checkNoCollisionCorret(); - /* 800AA6B4 */ void decSwordBlur(); - /* 800AA714 */ void resetWolfAtCollision(); - /* 800AA7EC */ void setWolfAtCollision(); - /* 800AA9DC */ void resetAtCollision(int); - /* 800AAABC */ void setAtCollision(); - /* 800AB878 */ void setWolfCollisionPos(); - /* 800ABAE0 */ void initLockAt(); - /* 800ABB28 */ void cancelLockAt(); - /* 800ABB84 */ void setCollisionPos(); - /* 800ABDB8 */ void setCollision(); - /* 800AC328 */ void getBaseAnimeFrame() const; - /* 800AC378 */ void setAnimeFrame(f32); - /* 800AC394 */ void setFrameCtrl(daPy_frameCtrl_c*, u8, s16, s16, f32, f32); - /* 800AC450 */ void getMainBckData(daAlink_c::daAlink_ANM) const; - /* 800AC558 */ void checkUnderMove0BckNoArc(daAlink_c::daAlink_ANM) const; - /* 800AC5B4 */ void checkUnderMove1BckNoArc(daAlink_c::daAlink_ANM) const; - /* 800AC610 */ void getUnderUpperAnime(daAlink_c::daAlink_ANM, J3DAnmTransform**, - J3DAnmTransform**, int, u32); - /* 800AC738 */ void setDoubleAnimeBlendRatio(f32); - /* 800AC754 */ void commonDoubleAnime(J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*, - J3DAnmTransform*, f32, f32, f32, int); - /* 800ACA14 */ void setDoubleAnime(f32, f32, f32, daAlink_c::daAlink_ANM, - daAlink_c::daAlink_ANM, int, f32); - /* 800ACD40 */ void commonSingleAnime(J3DAnmTransform*, J3DAnmTransform*, f32, f32, s16); - /* 800ACF80 */ void setSingleAnimeBase(daAlink_c::daAlink_ANM); - /* 800ACFB0 */ void setSingleAnimeBaseMorf(daAlink_c::daAlink_ANM, f32); - /* 800ACFE0 */ void setSingleAnimeBaseSpeed(daAlink_c::daAlink_ANM, f32, f32); - /* 800AD00C */ void setSingleAnime(daAlink_c::daAlink_ANM, f32, f32, s16, f32); - /* 800AD0F4 */ void setSingleAnimeParam(daAlink_c::daAlink_ANM, daAlinkHIO_anm_c const*); - /* 800AD128 */ void animePlay(J3DAnmTransform*, daPy_frameCtrl_c*); - /* 800AD170 */ void allAnimePlay(); - /* 800AD2D8 */ void setUpperAnimeMorf(f32); - /* 800AD340 */ void setUpperAnimeBase(u16); - /* 800AD374 */ void setUpperAnimeBaseMorf(u16, f32); - /* 800AD3A8 */ void setUpperAnimeBaseSpeed(u16, f32, f32); - /* 800AD3D8 */ void setUpperAnime(u16, daAlink_c::daAlink_UPPER, f32, f32, s16, f32); - /* 800AD6F0 */ void setUpperAnimeParam(u16, daAlink_c::daAlink_UPPER, daAlinkHIO_anm_c const*); - /* 800AD724 */ void resetUpperAnime(daAlink_c::daAlink_UPPER, f32); - /* 800AD8F4 */ void setUnderAnimeMorf(f32); - /* 800AD964 */ void setUnderAnime(u16, daAlink_c::daAlink_UNDER, f32, f32, s16, f32); - /* 800ADAB8 */ void setUnderAnimeParam(u16, daAlink_c::daAlink_UNDER, daAlinkHIO_anm_c const*); - /* 800ADAEC */ void resetUnderAnime(daAlink_c::daAlink_UNDER, f32); - /* 800ADB78 */ void setOldRootQuaternion(s16, s16, s16); - /* 800ADC50 */ void checkAtnLeftAnime(); - /* 800ADCEC */ void checkAtnRightAnime(); - /* 800ADD88 */ void getMoveGroundAngleSpeedRate(); - /* 800ADE14 */ void setBlendMoveAnime(f32); - /* 800AEA70 */ void setBlendAtnMoveAnime(f32); - /* 800AF11C */ void setBlendAtnBackMoveAnime(f32); - /* 800AF4B0 */ void setFaceBck(u16, int, u16); - /* 800AF61C */ void setFaceBtp(u16, int, u16); - /* 800AF7D0 */ void setFaceBtk(u16, int, u16); - /* 800AF8A0 */ void setFaceBasicTexture(daAlink_c::daAlink_FTANM); - /* 800AF9A8 */ void setFaceBasicAnime(daAlink_c::daAlink_ANM); - /* 800AFAA8 */ void setFacePriTexture(daAlink_c::daAlink_FTANM); - /* 800AFB14 */ void setFacePriAnime(daAlink_c::daAlink_ANM); - /* 800AFB74 */ void resetFacePriBck(); - /* 800AFBD0 */ void resetFacePriBtp(); - /* 800AFC2C */ void resetFacePriBtk(); - /* 800AFC88 */ void resetFacePriTexture(); - /* 800AFCBC */ void resetFacePriAnime(); - /* 800AFCF0 */ void playFaceTextureAnime(); - /* 800B0098 */ void getGroundAngle(cBgS_PolyInfo*, s16); - /* 800B0150 */ void getRoofAngle(cBgS_PolyInfo*, s16); - /* 800B01FC */ void getWallEdgePos(cXyz const&, cM3dGPla*, cM3dGPla*, cXyz*, int); - /* 800B02BC */ void setFrontWallType(); - /* 800B1488 */ void checkWaterPolygonUnder(); - /* 800B14B4 */ void setWaterY(); - /* 800B154C */ void setHangWaterY(); - /* 800B172C */ void setSandDownBgCheckWallH(); - /* 800B1770 */ void setBgCheckParam(); - /* 800B1B28 */ void checkNotJumpSinkLimit(); - /* 800B1B68 */ void checkNotItemSinkLimit(); - /* 800B1BAC */ void setSandShapeOffset(); - /* 800B1FB8 */ void checkLv2MiddleBossBgRide(s16); - /* 800B1FD8 */ void getSlidePolygon(cM3dGPla*); - /* 800B21EC */ void checkSlope() const; - /* 800B221C */ void setPlayerPosAndAngle(cXyz const*, s16, int); - /* 800B23FC */ void setPlayerPosAndAngle(cXyz const*, csXyz const*); - /* 800B24F4 */ void setPlayerPosAndAngle(f32 (*)[4]); - /* 800B25CC */ void itemTriggerCheck(u8); - /* 800B25E8 */ void itemButtonCheck(u8); - /* 800B2604 */ void itemButton(); - /* 800B2634 */ void itemTrigger(); - /* 800B2664 */ void spActionButton(); - /* 800B2688 */ void spActionTrigger(); - /* 800B26AC */ void midnaTalkTrigger() const; - /* 800B26B8 */ void swordSwingTrigger(); - /* 800B26DC */ void setItemActionButtonStatus(u8); - /* 800B26FC */ void itemActionTrigger(); - /* 800B271C */ void setStickData(); - /* 800B2EA4 */ void setAtnList(); - /* 800B3220 */ void setRStatus(u8); - /* 800B3238 */ void setRStatusEmphasys(u8); - /* 800B3250 */ void setDoStatus(u8); - /* 800B3268 */ void setDoStatusEmphasys(u8); - /* 800B3280 */ void setDoStatusContinuation(u8); - /* 800B3298 */ void setBStatus(u8); - /* 800B32B0 */ void checkAtnWaitAnime(); - /* 800B3358 */ void setTiredVoice(daPy_frameCtrl_c*); - /* 800B33E4 */ void checkRestHPAnime(); - /* 800B3494 */ void getDirectionFromAngle(s16); - /* 800B3500 */ void checkAttentionState(); - /* 800B3630 */ void getShapeAngleYAtnActor(); - /* 800B3734 */ void setShapeAngleToAtnActor(int); - /* 800B3844 */ void initServiceWaitTime(); - /* 800B3904 */ void checkZeroSpeedF() const; - /* 800B3924 */ void setNormalSpeedF(f32, f32); - /* 800B3F2C */ void getStickAngleDistanceRate(); - /* 800B3FD4 */ void setSpeedAndAngleNormal(); - /* 800B444C */ void setSpeedAndAngleAtn(); - /* 800B477C */ void checkRequestTalkActor(dAttList_c*, fopAc_ac_c*); - /* 800B47B4 */ void checkServiceWaitMode(); - /* 800B48D0 */ void setJumpMode(); - /* 800B4908 */ void getMetamorphoseNearDis() const; - /* 800B4918 */ void getMetamorphoseFarDis() const; - /* 800B4928 */ void getMetamorphoseFarAngle() const; - /* 800B4938 */ void setMidnaMsg(); - /* 800B4950 */ void notTalk(); - /* 800B4A08 */ void setTalkStatus(); - /* 800B4B2C */ void getFrontRollRate(); - /* 800B4B7C */ void decideCommonDoStatus(); - /* 800B5284 */ void decideDoStatus(); - /* 800B58EC */ void checkWaitAction(); - /* 800B5BC0 */ void setFallVoice(); - /* 800B5C34 */ void setLandPassiveData(); - /* 800B5C64 */ void setStepLandVibration(); - /* 800B5CCC */ void checkLandAction(int); - /* 800B5F6C */ void checkSlideAction(); - /* 800B607C */ void checkAutoJumpAction(); - /* 800B69CC */ void checkCutJumpInFly(); - /* 800B6A30 */ void checkFrontWallTypeAction(); - /* 800B6F28 */ void checkItemActionInitStart(); - /* 800B7090 */ void checkItemChangeAutoAction(); - /* 800B7168 */ void setFastShotTimer(); - /* 800B7190 */ void cancelItemUseQuake(int); - /* 800B71EC */ void cancelUpperItemReadyAnime(int); - /* 800B72E4 */ void checkItemActorPointer(); - /* 800B7390 */ void checkSwordTwirlAction(); - /* 800B74B4 */ void checkUpperItemActionFly(); - /* 800B7528 */ void checkItemButtonChange(); - /* 800B75EC */ void checkUpperItemAction(); - /* 800B7B7C */ void orderPeep(); - /* 800B7BF8 */ void orderTalk(int); - /* 800B80C4 */ void orderZTalk(); - /* 800B8374 */ void checkNormalAction(); - /* 800B8930 */ void checkReadyItem(); - /* 800B8988 */ void checkItemAction(); - /* 800B9010 */ bool checkRAction(); - /* 800B9018 */ void checkMoveDoAction(); - /* 800B9148 */ void checkSideRollAction(int); - /* 800B9254 */ void checkNoUpperAnime() const; - /* 800B92D0 */ void checkOneHandItemEquipAnime() const; - /* 800B92F8 */ void checkItemEquipAnime() const; - /* 800B9340 */ void checkEquipAnime() const; - /* 800B9398 */ void checkWindDashAnime() const; - /* 800B93CC */ void checkSwordTwirlAnime() const; - /* 800B93F4 */ void swordEquip(int); - /* 800B9580 */ void swordUnequip(); - /* 800B9640 */ void itemEquip(u16); - /* 800B96A4 */ void itemUnequip(u16, f32); - /* 800B97EC */ void checkFastUnequip(); - /* 800B983C */ void allUnequip(int); - /* 800B994C */ void checkItemChangeFromButton(); - /* 800B9D2C */ void checkNextActionFromButton(); - /* 800B9F50 */ void checkGroundSpecialMode(); - /* 800BA09C */ void commonCheckNextAction(int); - /* 800BA0D0 */ void checkNextAction(int); - /* 800BA6A0 */ void commonChangeItem(); - /* 800BA914 */ void setItemAction(); - /* 800BAF08 */ void checkNextActionFromCrouch(int); - /* 800BAF80 */ void checkUpperReadyThrowAnime() const; - /* 800BB020 */ void getBodyAngleXBasePos(cXyz*); - /* 800BB084 */ void getBodyAngleXAtnActor(int); - /* 800BB2B0 */ void setBodyAngleXReadyAnime(int); - /* 800BB324 */ void setMagicArmorBrk(int); - /* 800BB408 */ void checkMagicArmorHeavy() const; - /* 800BB458 */ void checkBootsOrArmorHeavy() const; - /* 800BB4B8 */ void checkHeavyStateOn(int, int); - /* 800BB560 */ void setOutPower(f32, s16, int); - /* 800BB644 */ void initGravity(); - /* 800BB770 */ void setSpecialGravity(f32, f32, int); - /* 800BB7A0 */ void transAnimeProc(cXyz*, f32, f32); - /* 800BBD40 */ void setFootSpeed(); - /* 800BBF68 */ void posMove(); - /* 800BD6FC */ void autoGroundHit(); - /* 800BDD70 */ void startPeepChange(); - /* 800BDE20 */ void setLastSceneDamage(int, u32*); - /* 800BDE48 */ void setLastSceneMode(u32*); - /* 800BDF60 */ void startRestartRoom(u32, int, int, int); - /* 800BE26C */ void checkCoachGuardGame(); - /* 800BE2C0 */ void checkRoofRestart(); - /* 800BE3E4 */ void checkRestartRoom(); - /* 800BE9D4 */ void getSceneExitMoveAngle(); - /* 800BEAF8 */ void checkSceneChange(int); - /* 800BF084 */ void voiceStart(u32); - /* 800BF0B8 */ void voiceStartLevel(u32); - /* 800BF0EC */ void seStartSwordCut(u32); - /* 800BF124 */ void seStartOnlyReverb(u32); - /* 800BF15C */ void seStartOnlyReverbLevel(u32); - /* 800BF194 */ void seStartMapInfo(u32); - /* 800BF1CC */ void seStartMapInfoLevel(u32); - /* 800BF204 */ void setBasAnime(daAlink_c::daAlink_UNDER); - /* 800BF37C */ void initBasAnime(); - /* 800BF4E0 */ void resetBasAnime(); - /* 800BF500 */ void checkSightLine(f32, cXyz*); - /* 800BF79C */ void setMetamorphoseModel(int); - /* 800BF854 */ void keepItemData(); - /* 800BF884 */ void returnKeepItemData(); - /* 800BF8D0 */ void setItemModel(); - /* 800BF9F0 */ void setItemActor(); - /* 800BFD74 */ void makeItemType(); - /* 800BFDB0 */ void checkZoraWearAbility() const; - /* 800BFDFC */ void checkMagicArmorWearAbility() const; - /* 800BFE48 */ void loadAramBmd(u16, u32); - /* 800BFF04 */ void loadAram(u16, u32); - /* 800BFF70 */ void loadAramItemBrk(u16, J3DModel*); - /* 800BFFCC */ void loadAramItemBtk(u16, J3DModel*); - /* 800C0028 */ void loadAramItemBtp(u16, J3DModel*); - /* 800C0084 */ void changeItemBck(u16, f32); - /* 800C0114 */ void checkGroupItem(int, int) const; - /* 800C0164 */ void checkSetItemTrigger(int); - /* 800C0208 */ void checkItemSetButton(int); - /* 800C0284 */ void checkField(); - /* 800C02C8 */ void checkBossRoom(); - /* 800C0310 */ void checkDungeon(); - /* 800C0358 */ void checkCastleTown(); - /* 800C03A0 */ void checkCloudSea(); - /* 800C03E8 */ void checkRoomOnly(); - /* 800C044C */ void checkLv2DungeonRoomSpecial(); - /* 800C04B4 */ void checkRoomSpecial(); - /* 800C0520 */ void checkRoom(); - /* 800C0594 */ void checkNotBattleStage(); - /* 800C05DC */ void checkNotHeavyBootsStage(); - /* 800C0630 */ void checkNotAutoJumpStage(); - /* 800C0678 */ void checkCastleTownUseItem(u16); - /* 800C077C */ void changeItemTriggerKeepProc(u8, int); - /* 800C0A9C */ void checkNewItemChange(u8); - /* 800C12DC */ void deleteEquipItem(int, int); - /* 800C1704 */ void setLight(); - /* 800C1CEC */ void setFrontRollCrashShock(u8); - /* 800C1DAC */ void getModelJointMtx(u16); - /* 800C1DE0 */ void onFrollCrashFlg(u8, int); - /* 800C1E0C */ void changeWarpMaterial(daAlink_c::daAlink_WARP_MAT_MODE); - /* 800C1F6C */ void commonProcInit(daAlink_c::daAlink_PROC); - /* 800C2DA4 */ void commonProcInitNotSameProc(daAlink_c::daAlink_PROC); - /* 800C2DDC */ void procPreActionUnequipInit(int, fopAc_ac_c*); - /* 800C2EAC */ void procPreActionUnequip(); - /* 800C3098 */ void procServiceWaitInit(); - /* 800C30F0 */ void procServiceWait(); - /* 800C3224 */ void procTiredWaitInit(); - /* 800C3338 */ void procTiredWait(); - /* 800C33B8 */ void procWaitInit(); - /* 800C3504 */ void procWait(); - /* 800C36CC */ void procMoveInit(); - /* 800C3730 */ void procMove(); - /* 800C3810 */ void procAtnMoveInit(); - /* 800C3868 */ void procAtnMove(); - /* 800C38CC */ void procAtnActorWaitInit(); - /* 800C397C */ void procAtnActorWait(); - /* 800C39EC */ void procAtnActorMoveInit(); - /* 800C3A44 */ void procAtnActorMove(); - /* 800C3A94 */ void procWaitTurnInit(); - /* 800C3B1C */ void procWaitTurn(); - /* 800C3C3C */ void procMoveTurnInit(int); - /* 800C3D38 */ void procMoveTurn(); - /* 800C3DA0 */ void procSideStepInit(int); - /* 800C3F60 */ void procSideStep(); - /* 800C40F0 */ void procSideStepLandInit(); - /* 800C4278 */ void procSideStepLand(); - /* 800C4378 */ void procSlideInit(s16); - /* 800C4514 */ void procSlide(); - /* 800C47AC */ void procSlideLandInit(int); - /* 800C4894 */ void procSlideLand(); - /* 800C494C */ void procFrontRollInit(); - /* 800C4B40 */ void procFrontRoll(); - /* 800C4F14 */ void procFrontRollCrashInit(); - /* 800C4FFC */ void procFrontRollCrash(); - /* 800C5160 */ void procFrontRollSuccessInit(); - /* 800C5240 */ void procFrontRollSuccess(); - /* 800C5328 */ void procSideRollInit(int); - /* 800C5484 */ void procSideRoll(); - /* 800C5700 */ void backJumpSpeedDec(); - /* 800C57A4 */ void 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(); - /* 800C6A48 */ void procFallInit(int, f32); - /* 800C6D20 */ void procFall(); - /* 800C6F18 */ void procLandInit(f32); - /* 800C6FE4 */ void procLand(); - /* 800C70F8 */ void procSmallJumpInit(int); - /* 800C72D4 */ void procSmallJump(); - /* 800C74D4 */ void procStepMoveInit(); - /* 800C755C */ void procStepMove(); - /* 800C7690 */ void procCrouchInit(); - /* 800C76F8 */ void procCrouch(); - /* 800C77F4 */ void procCoMetamorphoseInit(); - /* 800C7C64 */ void procCoMetamorphose(); - /* 800C82E8 */ void procCoMetamorphoseOnlyInit(); - /* 800C83A0 */ void procCoMetamorphoseOnly(); - /* 800C8460 */ void procFloorDownReboundInit(); - /* 800C84D0 */ void procFloorDownRebound(); - /* 800C854C */ void procGoronRideWaitInit(fopAc_ac_c*); - /* 800C85D8 */ void procGoronRideWait(); - /* 800C8700 */ void execute(); - /* 800CAFC8 */ void setDrawHand(); - /* 800CB480 */ void checkSwordDraw(); - /* 800CB53C */ void checkShieldDraw(); - /* 800CB5F8 */ void checkItemDraw(); - /* 800CB694 */ void initShadowScaleLight(); - /* 800CBA38 */ void moveShadowScaleLight(); - /* 800CBC18 */ void shadowDraw(); - /* 800CC25C */ void modelCalc(J3DModel*); - /* 800CC298 */ void basicModelDraw(J3DModel*); - /* 800CC2E0 */ void modelDraw(J3DModel*, int); - /* 800CC364 */ void setWaterDropColor(J3DGXColorS10 const*); - /* 800CC7DC */ void initTevCustomColor(); - /* 800CC7FC */ void draw(); - /* 800CD7AC */ ~daAlink_c(); - /* 800CE294 */ void checkNoSubjectModeCamera(); - /* 800CE468 */ void acceptSubjectModeChange(); - /* 800CE628 */ void checkSubjectAction(); - /* 800CE728 */ void checkBodyAngleX(s16); - /* 800CE8A0 */ void setBodyAngleToCamera(); - /* 800CEAF4 */ void setSubjectMode(); - /* 800CEB58 */ void subjectCancelTrigger(); - /* 800CEBD8 */ void 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(); - /* 800CF25C */ void checkBoardRide() const; - /* 800CF270 */ void checkCanoeRide() const; - /* 800CF284 */ void checkHorseRide() const; - /* 800CF298 */ void getLeftItemMatrix(); - /* 800CF2B4 */ void checkBoarRide() const; - /* 800CF2C8 */ void checkSpinnerRide() const; - /* 800CF2DC */ void getLeftHandMatrix(); - /* 800CF2F8 */ void getRightHandMatrix(); - /* 800CF314 */ void onSceneChangeArea(u8, u8, fopAc_ac_c*); - /* 800CF328 */ void getRightItemMatrix(); - /* 800CF344 */ void checkPlayerNoDraw(); - /* 800CF380 */ daAlink_c(); - /* 800CFEB0 */ void checkRideOn() const; - /* 800CFF4C */ void checkAttentionLock(); - /* 800D0020 */ void checkFmChainGrabAnime() const; - /* 800D0048 */ void checkSmallUpperGuardAnime() const; - /* 800D00EC */ void checkReinRide() const; - /* 800D0110 */ void checkWolfEnemyThrowAnime() const; - /* 800D0138 */ void checkSpecialDemoMode() const; - /* 800D014C */ void setMidnaTalkStatus(u8); - /* 800D0164 */ void set3DStatus(u8, u8); - /* 800D018C */ void checkModeFlg(u32) const; - /* 800D0198 */ void getShieldChangeWaitTimer() const; - /* 800D01A0 */ void getClothesChangeWaitTimer() const; - /* 800D01E0 */ void checkCutTurnCharge() const; - /* 800D2684 */ void checkCutTurnCharge(); - /* 800D0208 */ void checkAcceptDungeonWarpAlink(int); - /* 800D0228 */ void getSpinnerActor(); - /* 800D0274 */ void getSumouCounter() const; - /* 800D027C */ void checkSumouWithstand() const; - /* 800D0284 */ void setMidnaMsgNum(fopAc_ac_c*, u16); - /* 800D0290 */ void getModelMtx(); - /* 800D029C */ void getInvMtx(); - /* 800D02A4 */ void getLinkBackBone1Matrix(); - /* 800D02B8 */ void getWolfMouthMatrix(); - /* 800D02CC */ void getWolfBackbone2Matrix(); - /* 800D02E0 */ void getBottleMtx(); - /* 800D0334 */ void getHeadMtx(); - /* 800D0350 */ void getGroundY(); - /* 800D0358 */ void getBaseAnimeFrameRate() const; - /* 800D0360 */ void getAtnActorID() const; - /* 800D0368 */ void getItemID() const; - /* 800D0370 */ void getGrabActorID() const; - /* 800D038C */ void setForcePutPos(cXyz const&); - /* 800D03B4 */ void checkPlayerFly() const; - /* 800D03C8 */ void checkFrontRoll() const; - /* 800D03DC */ void checkWolfDash() const; - /* 800D03F0 */ void checkAutoJump() const; - /* 800D0414 */ void checkSideStep() const; - /* 800D0444 */ void checkWolfTriggerJump() const; - /* 800D0468 */ void checkGuardBreakMode() const; - /* 800D047C */ void checkLv3Slide() const; - /* 800D04A4 */ void checkWolfHowlDemoMode() const; - /* 800D04B8 */ void checkElecDamage() const; - /* 800D04CC */ void checkEmptyBottleSwing() const; - /* 800D04F4 */ void checkBottleSwingMode() const; - /* 800D0508 */ void checkHawkWait() const; - /* 800D051C */ void checkGoatThrow() const; - /* 800D0544 */ void checkGoatThrowAfter() const; - /* 800D0570 */ void checkWolfTagLockJump() const; - /* 800D0598 */ void checkWolfTagLockJumpLand() const; - /* 800D05AC */ void checkWolfRopeHang() const; - /* 800D05C0 */ void checkRollJump() const; - /* 800D05D4 */ void checkGoronRideWait() const; - /* 800D05E8 */ void checkWolfChain() const; - /* 800D05FC */ void checkWolfWait() const; - /* 800D0610 */ void checkWolfJumpAttack() const; - /* 800D0624 */ void checkWolfRSit() const; - /* 800D0638 */ void checkBottleDrinkEnd() const; - /* 800D0660 */ void checkWolfDig() const; - /* 800D0674 */ void checkCutCharge() const; - /* 800D0688 */ void checkCutLargeJumpCharge() const; - /* 800D06B0 */ void checkComboCutTurn() const; - /* 800D06D8 */ void checkClimbMove() const; - /* 800D0704 */ void checkGrassWhistle() const; - /* 800D0718 */ void checkBoarRun() const; - /* 800D072C */ void checkHorseRideNotReady() const; - /* 800D0794 */ void getSearchBallScale() const; - /* 800D079C */ void checkFastShotTime(); - /* 800D07A4 */ void checkCutJumpCancelTurn() const; - /* 800D07D4 */ void checkSingleBoarBattleSecondBowReady() const; - /* 800D07FC */ void cancelDungeonWarpReadyNeck(); - /* 800D0818 */ void onSceneChangeAreaJump(u8, u8, fopAc_ac_c*); - /* 800D0830 */ void onSceneChangeDead(u8, int); - /* 800D084C */ void checkNoEquipItem() const; - /* 800D0860 */ void getBoardCutTurnOffsetAngleY() const; - /* 800D087C */ void getMagneBootsTopVec(); - /* 800D0884 */ void setCargoCarry(fopAc_ac_c*); - /* 800D08B0 */ void setGoronSideMove(fopAc_ac_c*); - /* 800D08DC */ void setSumouReady(fopAc_ac_c*); - /* 800D091C */ void setSumouPushBackDirection(s16); - /* 800D0930 */ void setSumouLoseHeadUp(); - /* 800D0948 */ void checkPriActorOwn(fopAc_ac_c const*) const; - /* 800D095C */ void checkWolfEnemyBiteAllOwn(fopAc_ac_c const*) const; - /* 800D0970 */ void setWolfEnemyHangBiteAngle(s16); - /* 800D0984 */ void setSumouGraspCancelCount(int); - /* 800D0998 */ void checkItemSwordEquip() const; - /* 800D09AC */ void getSinkShapeOffset() const; - /* 800D09B4 */ void checkSinkDead() const; - /* 800D09C8 */ void checkCutJumpMode() const; - /* 800D09DC */ void getGiantPuzzleAimAngle() const; - /* 800D09E4 */ void getSwordChangeWaitTimer() const; - /* 800D09EC */ void checkMetamorphose() const; - /* 800D0A14 */ void checkWolfDownAttackPullOut() const; - /* 800D0A28 */ void getMidnaAtnPos() const; - /* 800D0A30 */ void checkCopyRodEquip() const; - /* 800D0A44 */ void checkCanoeFishingGetLeft() const; - /* 800D0A6C */ void checkCanoeFishingGetRight() const; - /* 800D0A94 */ void checkBeeChildDrink() const; - /* 800D0A9C */ void getWolfHowlMgrP(); - /* 800D0AA4 */ void checkWolfHowlSuccessAnime() const; - /* 800D0AC8 */ void checkOctaIealHang() const; - /* 800D0AF0 */ void cancelOctaIealHang(); - /* 800D0B08 */ void cancelDragonHangBackJump(); - /* 800D0B20 */ void setOctaIealWildHang(); - /* 800D0B38 */ void checkDragonHangRide() const; - /* 800D0B60 */ void playerStartCollisionSE(u32, u32); - /* 800D0E08 */ void checkLightSwordMtrl(); - /* 800D0E98 */ void checkSwordEquipAnime() const; - /* 800D0ECC */ void checkCutDashAnime() const; - /* 800D0EFC */ void checkCutDashEnemyHit(dCcD_GObjInf&); - /* 800D0F5C */ void getSwordAtType(); - /* 800D0F90 */ void initCutTurnAt(f32, int); - /* 800D102C */ void checkCutFinishJumpUp(); - /* 800D1088 */ void changeCutFast(); - /* 800D10E0 */ void checkCutFastReady(); - /* 800D1268 */ void setSwordModel(); - /* 800D1310 */ void offSwordModel(); - /* 800D13AC */ void checkCutTypeNoBlur() const; - /* 800D13E4 */ void checkCutTurnInput() const; - /* 800D1424 */ void getCutTurnDirection() const; - /* 800D1430 */ void resetCombo(int); - /* 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 */ void notSwordHitVibActor(fopAc_ac_c*); - /* 800D17EC */ void setSwordHitVibration(dCcD_GObjInf*); - /* 800D1920 */ void checkAtShieldHit(dCcD_GObjInf&); - /* 800D1978 */ void checkCutReverseAt(dCcD_GObjInf*); - /* 800D19C8 */ void changeCutReverseProc(daAlink_c::daAlink_ANM); - /* 800D1E1C */ void setCutDash(int, int); - /* 800D20B4 */ void checkForceSwordSwing(); - /* 800D20FC */ void setComboReserb(); - /* 800D2188 */ void checkComboReserb(); - /* 800D21D0 */ void commonCutAction(); - /* 800D2284 */ void setSwordVoiceSe(u32); - /* 800D22BC */ void setSwordChargeVoiceSe(); - /* 800D2304 */ void setSwordComboVoice(); - /* 800D2368 */ void checkCutTurnInputTrigger(); - /* 800D23C0 */ void checkCutAction(); - /* 800D26EC */ void getCutDirection(); - /* 800D2760 */ void checkCutCancelNextMode(int); - /* 800D27E4 */ void checkDoCutAction(); - /* 800D2890 */ void checkCutBackState(); - /* 800D28F4 */ void checkCutHeadState(); - /* 800D29D4 */ void checkDownAttackState(); - /* 800D2ABC */ void 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 */ void procCutJumpInit(int); - /* 800D43F8 */ void 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 */ void 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(); - /* 800D6DF0 */ void setDkCaught(fopAc_ac_c*); - /* 800D6E24 */ void freezeTimerDamage(); - /* 800D6F00 */ void onPressedDamage(cXyz const&, s16); - /* 800D6F2C */ void checkNoLandDamageSlidePolygon(); - /* 800D6FE0 */ void checkCutLandDamage(); - /* 800D70A0 */ void checkCaughtEscapeCutTurn(); - /* 800D7160 */ void setThrowDamage(s16, f32, f32, int, int, int); - /* 800D7208 */ void damageMagnification(int, int); - /* 800D72BC */ void setDamagePoint(int, int, int, int); - /* 800D7478 */ void setDamagePointNormal(int); - /* 800D74A4 */ void setLandDamagePoint(int); - /* 800D74F4 */ void getDamageVec(dCcD_GObjInf*); - /* 800D76C4 */ void setDashDamage(); - /* 800D7768 */ void checkIcePolygonDamage(cBgS_PolyInfo*); - /* 800D77C8 */ void 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; - /* 800D7C40 */ void 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(); - /* 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(); - /* 800DC548 */ void checkEnemyGroup(fopAc_ac_c*); - /* 800DC5A4 */ void checkSpecialNpc(fopAc_ac_c*); - /* 800DC5DC */ void checkShieldAttackEmphasys(); - /* 800DC678 */ void checkGuardActionChange(); - /* 800DC79C */ void stickArrowIncrement(int); - /* 800DC8C4 */ void setArrowShieldActor(fopAc_ac_c*, int); - /* 800DCA2C */ void checkWoodShieldEquipNotIronBall() const; - /* 800DCA80 */ void getArrowShieldOffset(cXyz const*, csXyz const*, cXyz*, cXyz*) const; - /* 800DCD74 */ void setArrowShieldPos(cXyz*, csXyz*, cXyz const*, cXyz const*) const; - /* 800DCDF0 */ void checkUpperGuardAnime() const; - /* 800DCE6C */ void checkPlayerGuard() const; - /* 800DCF04 */ void checkPlayerGuardAndAttack() const; - /* 800DCF64 */ void 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(); - /* 800DE008 */ void procTurnMoveInit(int); - /* 800DE380 */ void procTurnMove(); - /* 800DE64C */ void getArrowFlyData(f32*, f32*, int) const; - /* 800DE740 */ void getArrowIncAtR() const; - /* 800DE750 */ void getBombArrowFlyExplodeTime() const; - /* 800DE760 */ void getArrowIncAtMaxStart() const; - /* 800DE770 */ void getArrowIncAtMax() const; - /* 800DE780 */ void checkBowAndSlingItem(int); - /* 800DE7D4 */ void setSlingModel(); - /* 800DE884 */ void checkBowCameraArrowPosP(s16*, s16*); - /* 800DE990 */ void checkArrowChargeEnd() const; - /* 800DE9B8 */ void checkBowReadyAnime() const; - /* 800DE9E8 */ void checkBowAnime() const; - /* 800DEA3C */ void makeArrow(); - /* 800DEAE4 */ void deleteArrow(); - /* 800DEB8C */ void setBowOrSlingStatus(); - /* 800DEBC8 */ void changeArrowType(); - /* 800DED88 */ void cancelBowMoveRideNotAtn(); - /* 800DEE1C */ void cancelBowMove(); - /* 800DEEDC */ void setBowReadyAnime(); - /* 800DEFB8 */ void setBowReloadAnime(); - /* 800DF0BC */ void checkUpperItemActionBow(); - /* 800DF798 */ void checkUpperItemActionBowFly(); - /* 800DF814 */ void checkNextActionBow(); - /* 800DFAE8 */ void setBowModel(); - /* 800DFBC8 */ void checkBowGrabLeftHand() const; - /* 800DFC28 */ void setBowHangAnime(); - /* 800DFC70 */ void setBowNormalAnime(); - /* 800DFCD8 */ void setBowSight(); - /* 800DFD6C */ void procBowSubjectInit(); - /* 800DFDDC */ void procBowSubject(); - /* 800DFE3C */ void procBowMoveInit(); - /* 800DFEC0 */ void procBowMove(); - /* 800DFFE0 */ void checkBoomerangLockAccept(); - /* 800E0010 */ void getBoomSpeed(); - /* 800E00B0 */ void getBoomCatchSpeed() const; - /* 800E00C0 */ void getBoomFlyMax() const; - /* 800E011C */ void getBoomLockMax(); - /* 800E0190 */ void getBoomBgThroughTime() const; - /* 800E01A0 */ void checkBossBabaRoom(); - /* 800E01CC */ void cancelBoomerangLock(fopAc_ac_c*); - /* 800E0210 */ void getBoomerangActor(); - /* 800E0244 */ void checkBoomerangChargeEnd(); - /* 800E02B8 */ void checkBoomerangCarry(fopAc_ac_c*); - /* 800E03D0 */ void initBoomerangUpperAnimeSpeed(int); - /* 800E0440 */ void checkBoomerangAnime() const; - /* 800E04AC */ void checkBoomerangThrowAnime() const; - /* 800E04E8 */ void setBoomerangReadyQuake(); - /* 800E055C */ void setBoomerangReadyAnime(); - /* 800E05E8 */ void setThrowBoomerangAnime(); - /* 800E0630 */ void setBoomerangCatchAnime(); - /* 800E06B8 */ void throwBoomerang(); - /* 800E08C4 */ void returnBoomerang(int); - /* 800E0A9C */ void checkUpperItemActionBoomerang(); - /* 800E0B58 */ void checkUpperItemActionBoomerangFly(); - /* 800E0BE4 */ void checkNextActionBoomerang(); - /* 800E0D8C */ void checkBoomerangCatchAction(); - /* 800E0E64 */ void setBoomerangSight(); - /* 800E0F10 */ void procBoomerangSubjectInit(); - /* 800E0FA0 */ void procBoomerangSubject(); - /* 800E1060 */ void procBoomerangMoveInit(); - /* 800E10F4 */ void procBoomerangMove(); - /* 800E11D8 */ void procBoomerangCatchInit(); - /* 800E1248 */ void procBoomerangCatch(); - /* 800E12E0 */ void checkLv6BossRoom(); - /* 800E1310 */ void getCopyRodBallSpeed() const; - /* 800E1320 */ void getCopyRodBallReturnSpeed() const; - /* 800E1330 */ void getCopyRodBallDisMax() const; - /* 800E1374 */ void getCopyRodControllActor(); - /* 800E1390 */ void getCopyRodCameraActor(); - /* 800E13AC */ void initCopyRodUpperAnimeSpeed(int); - /* 800E1408 */ void checkForestOldCentury(); - /* 800E145C */ void checkCopyRodTopUse(); - /* 800E1530 */ void checkCopyRodAnime() const; - /* 800E158C */ void setCopyRodControllAnime(); - /* 800E15FC */ void setCopyRodControllUpperSpeedRate(); - /* 800E1748 */ void setCopyRodModel(); - /* 800E1840 */ void setCopyRodReadyAnime(); - /* 800E191C */ void throwCopyRod(); - /* 800E1A30 */ void returnCopyRod(); - /* 800E1ADC */ void checkUpperItemActionCopyRod(); - /* 800E1BB4 */ void checkUpperItemActionCopyRodFly(); - /* 800E1C44 */ void 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(); - /* 800E23FC */ void concatMagneBootMtx(); - /* 800E243C */ void concatMagneBootInvMtx(); - /* 800E247C */ void multVecMagneBootInvMtx(cXyz*); - /* 800E24B0 */ void commonMagneLineCheck(cXyz*, cXyz*); - /* 800E251C */ void checkBootsMoveAnime(int); - /* 800E2580 */ void setHeavyBoots(int); - /* 800E2738 */ void getMagneBootsLocalAngleY(s16, int); - /* 800E2808 */ void setMagneBootsMtx(cBgS_PolyInfo*, int); - /* 800E2DC4 */ void cancelMagneBootsOn(); - /* 800E2F88 */ void checkMagneBootsFly(); - /* 800E3048 */ void procBootsEquipInit(); - /* 800E30DC */ void procBootsEquip(); - /* 800E3218 */ void procMagneBootsFlyInit(); - /* 800E3454 */ void procMagneBootsFly(); - /* 800E3760 */ void getBombExplodeTime() const; - /* 800E3770 */ void getBombGravity() const; - /* 800E3780 */ void getBombMaxFallSpeed() const; - /* 800E3790 */ void getBombBoundRate() const; - /* 800E37A0 */ void getBombStopSpeedY() const; - /* 800E37B0 */ void getBombMaxSpeedY() const; - /* 800E37C0 */ void getBombEffScale() const; - /* 800E37D0 */ void getBombAtR() const; - /* 800E37E0 */ void getEnemyBombColorR() const; - /* 800E37F0 */ void getBombWaterGravity() const; - /* 800E3800 */ void getBombWaterMaxFallSpeed() const; - /* 800E3810 */ void getBombExplodeWaterEffectLimit() const; - /* 800E3820 */ void getBombInsectLimitAngle() const; - /* 800E38EC */ void checkGrabLineCheck(); - /* 800E3994 */ void setGrabCollisionOffset(f32, f32, cBgS_PolyInfo*); - /* 800E3A14 */ void exchangeGrabActor(fopAc_ac_c*); - /* 800E3A9C */ void setForceGrab(fopAc_ac_c*, int, int); - /* 800E3BCC */ void getGrabThrowRate(); - /* 800E3C1C */ void checkGrabThrowAnime() const; - /* 800E3C6C */ void checkGrabAnime() const; - /* 800E3C9C */ void checkGrabAnimeAndThrow() const; - /* 800E3CF4 */ void checkGrabCarryActor(); - /* 800E3D1C */ void checkGrabSlowMoveActor(); - /* 800E3D6C */ void checkGrabHeavyActor(); - /* 800E3D94 */ void checkGrabSideActor(); - /* 800E3DBC */ void setGrabUpperAnime(f32); - /* 800E3F20 */ void checkGrabRooster(); - /* 800E3F50 */ void setGrabItemPos(); - /* 800E4BD4 */ void freeGrabItem(); - /* 800E4DEC */ void setGrabUpperSpeedRate(); - /* 800E4FA8 */ void setCarryArmAngle(f32, f32); - /* 800E5150 */ void checkGrabNotThrow(); - /* 800E5170 */ void checkNextActionGrab(); - /* 800E53AC */ void initGrabNextMode(); - /* 800E53F8 */ void setGrabItemThrow(); - /* 800E57AC */ void checkUpperGrabItemThrow(f32); - /* 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(); - /* 800E70C0 */ void checkInsectActorName(fopAc_ac_c*); - /* 800E70FC */ void procInsectCatchInit(); - /* 800E71D4 */ void procInsectCatch(); - /* 800E7254 */ void procPickUpInit(); - /* 800E7460 */ void procPickUp(); - /* 800E75EC */ void procPickPutInit(int); - /* 800E76E0 */ void procPickPut(); - /* 800E7894 */ void checkSetChainPullAnime(s16); - /* 800E794C */ void getChainStickAngleY(s16) const; - /* 800E7994 */ void checkChainEmphasys(); - /* 800E79F8 */ void searchFmChainPos(); - /* 800E7AEC */ void setFmChainPosFromOut(fopAc_ac_c*, cXyz*, int); - /* 800E7BD0 */ void checkChainBlockPushPull(); - /* 800E7C30 */ void procFmChainUpInit(); - /* 800E7CC0 */ void procFmChainUp(); - /* 800E7DD8 */ void procFmChainStrongPullInit(); - /* 800E7E50 */ void procFmChainStrongPull(); - /* 800E7ED0 */ void setWallGrabStatus(u8, u8); - /* 800E7EE4 */ void getWallGrabStatus(); - /* 800E7EF4 */ void wallGrabTrigger(); - /* 800E7F18 */ void wallGrabButton(); - /* 800E7F3C */ void setPushPullKeepData(dBgW_Base::PushPullLabel, int); - /* 800E80A4 */ void checkPushPullTurnBlock(); - /* 800E8148 */ void checkPullBehindWall(); - /* 800E8298 */ void offGoatStopGame(); - /* 800E82B0 */ void checkGoatCatchActor(fopAc_ac_c*); - /* 800E8314 */ void 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(); - /* 800E91C4 */ void cancelGoronThrowEvent(); - /* 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(); - /* 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(); - /* 800EC76C */ void checkHorseZeldaBowMode(); - /* 800EC7B0 */ void setHorseZeldaDamage(); - /* 800EC7DC */ void checkHorseDashAccept(); - /* 800EC814 */ void checkCowGame(); - /* 800EC87C */ void 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; - /* 800ECE10 */ void getReinHandType() const; - /* 800ECF04 */ void checkHorseLieAnime() const; - /* 800ECF5C */ void checkHorseSubjectivity() const; - /* 800ECF9C */ void setHorseSwordUpAnime(); - /* 800ECFF4 */ void setHorseTurnUpperAnime(int); - /* 800ED074 */ void checkHorseNoUpperAnime() const; - /* 800ED0D4 */ void getHorseReinHandPos(cXyz*, cXyz*); - /* 800ED1F0 */ void checkHorseNotGrab() const; - /* 800ED310 */ void setHorseStirrup(); - /* 800ED4B8 */ void changeBoarRunRide(); - /* 800ED4DC */ void setSyncHorsePos(); - /* 800ED78C */ void setSyncBoarPos(); - /* 800ED90C */ void setSyncBoarRunPos(); - /* 800EDA24 */ void setSyncRidePos(); - /* 800EDA78 */ void setHorseTurnAnime(); - /* 800EDB48 */ void getBaseHorseAnime(daAlink_c::daAlink_ANM*); - /* 800EDD6C */ void checkHorseSpecialProc(); - /* 800EDE8C */ void checkHorseServiceWaitAnime(); - /* 800EDEEC */ void setSyncHorse(int); - /* 800EE64C */ void setSyncBoar(int); - /* 800EE918 */ void setSyncRide(int); - /* 800EEAE8 */ void setBaseHorseAnimeFrame(); - /* 800EEC98 */ void setBaseBoarAnime(); - /* 800EED98 */ void setBaseRideAnime(); - /* 800EEE30 */ void checkHorseSwordUpSpped(); - /* 800EEE5C */ void setHorseSwordUp(int); - /* 800EEF30 */ void setRideSubjectAngle(s16); - /* 800EF050 */ void setBodyAngleRideReadyAnime(); - /* 800EF0E8 */ void checkHorseGetOffWallCheck(cXyz*, cXyz*, s16); - /* 800EF198 */ void checkHorseGetOffDirection(); - /* 800EF35C */ void boarForceGetOff(); - /* 800EF394 */ void horseGetOffEnd(); - /* 800EF450 */ void checkNextActionHorse(); - /* 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(); - /* 800F3D58 */ void 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; - /* 800F3FC4 */ void initCanoeRide(); - /* 800F4008 */ void checkCanoeJumpRide(); - /* 800F40E4 */ void setArmReelAnime(); - /* 800F4140 */ void setFishingWaitAction(); - /* 800F4490 */ void setFishGetFace(); - /* 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(); - /* 800F7708 */ void setGroundFishingRodActor(); - /* 800F7760 */ void procFishingCastInit(); - /* 800F7814 */ void procFishingCast(); - /* 800F7988 */ void procFishingFoodInit(); - /* 800F7AA8 */ void procFishingFood(); - /* 800F7C50 */ void getCrawlMoveAnmSpeed(); - /* 800F7C74 */ void getCrawlMoveSpeed(); - /* 800F7CE8 */ void setCrawlMoveDirectionArrow(); - /* 800F7E48 */ void changeCrawlAutoMoveProc(cXyz*); - /* 800F81C0 */ void getCrawlMoveVec(cXyz*, cXyz*, cXyz*, int, int, u8*); - /* 800F85C0 */ void crawlBgCheck(cXyz*, cXyz*, int); - /* 800F8700 */ void checkCrawlSideWall(cXyz*, cXyz*, cXyz*, cXyz*, s16*, s16*); - /* 800F88F8 */ void decideCrawlDoStatus(); - /* 800F89E0 */ void checkNotCrawlStand(cXyz*); - /* 800F8A50 */ void checkNotCrawlStand(cXyz*, cXyz*); - /* 800F8B00 */ void checkCrawlInHoll(cXyz*, cXyz*, cXyz*, int); - /* 800F8D04 */ void setCrawlMoveHoll(); - /* 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(); - /* 800F9FDC */ void getHangMoveAnmSpeed(); - /* 800F9FFC */ void getHangDirectionFromAngle(); - /* 800FA070 */ void 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(); - /* 800FC568 */ void changeDragonActor(fopAc_ac_c*); - /* 800FC5A4 */ void setDragonHangPos(); - /* 800FC6B4 */ void setOctaIealHangPos(); - /* 800FC748 */ void setBossBodyHangPos(); - /* 800FC77C */ void procBossBodyHangInit(fopAc_ac_c*); - /* 800FC870 */ void procBossBodyHang(); - /* 800FCF58 */ void getLadderUnitCount() const; - /* 800FCF84 */ void setLadderInit(); - /* 800FD048 */ void setLadderPosInit(); - /* 800FD1F0 */ void setLadderPos(int); - /* 800FD288 */ void getLadderMoveAnmSpeed(); - /* 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(); - /* 800FE010 */ void getClimbMoveUpDownAnmSpeed(); - /* 800FE034 */ void getClimbMoveSideAnmSpeed(); - /* 800FE058 */ void checkClimbCode(cBgS_PolyInfo&); - /* 800FE114 */ void setClimbInit(); - /* 800FE174 */ void setClimbShapeOffset(); - /* 800FE3C4 */ void getClimbDirectionFromAngle(); - /* 800FE438 */ void changeClimbMoveProc(int); - /* 800FE5A0 */ void checkClimbMoveUpDownProc(int); - /* 800FE6E8 */ void checkClimbMoveSideProc(int); - /* 800FE868 */ void setMoveBGClimbCorrect(); - /* 800FEB90 */ void checkBgCorrectClimbMove(cXyz*, cXyz*); - /* 800FEC70 */ void checkClimbRoof(f32); - /* 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(); - /* 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(); - /* 8010163C */ void setRoofHangSwitch(); - /* 801016AC */ void procRoofSwitchHangInit(fopAc_ac_c*); - /* 801017AC */ void procRoofSwitchHang(); - /* 80101890 */ void checkZoraWearMaskDraw(); - /* 801018E4 */ void checkAcceptUseItemInWater(u16) const; - /* 80101934 */ void swimDeleteItem(); - /* 801019B8 */ void getZoraSwim() const; - /* 80101A18 */ void getSwimFrontMaxSpeed() const; - /* 80101AA8 */ void getSwimMaxFallSpeed() const; - /* 80101B44 */ void checkOxygenTimer(); - /* 80101C94 */ void offOxygenTimer(); - /* 80101CB8 */ void checkPossibleWaterInMode() const; - /* 80101CF4 */ void setWaterInAnmRate(daPy_frameCtrl_c*, f32); - /* 80101D70 */ void swimBgCheck(f32); - /* 801023E4 */ void setSpeedAndAngleSwim(); - /* 801029C8 */ void checkNextActionSwim(); - /* 80102B1C */ void checkSwimAction(int); - /* 80103058 */ void checkSwimUpAction(); - /* 801032C8 */ void swimOutAfter(int); - /* 80103398 */ void checkSwimFall(); - /* 801033CC */ void checkSwimOutAction(); - /* 80103698 */ void setSwimMoveAnime(); - /* 80103EE0 */ void checkSwimButtonAccept(); - /* 80103F08 */ void checkUpSwimButtonAccept(); - /* 80103F24 */ void checkSwimButtonMove(); - /* 80103F94 */ void checkZoraSwimMove(); - /* 80103FE8 */ void 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); - /* 80106534 */ void setCommonBoardAnime(int); - /* 8010658C */ void checkNextActionBoard(); - /* 80106618 */ void checkBoardSwordTriggerAction(); - /* 80106650 */ void commonProcBoardInit(daAlink_c::daAlink_PROC); - /* 801066B8 */ void 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(); - /* 801083C8 */ void hookshotAtHitCallBack(dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); - /* 801085BC */ void getHookshotTopPos(); - /* 80108600 */ void checkHookshotReturnMode() const; - /* 80108668 */ void checkHookshotShootReturnMode() const; - /* 801086DC */ void resetHookshotMode(); - /* 8010871C */ void setEnemyBombHookshot(fopAc_ac_c*); - /* 80108784 */ void checkLv7BossRoom(); - /* 801087B0 */ void checkHookshotStickBG(cBgS_PolyInfo&); - /* 80108828 */ void cancelHookshotCarry(); - /* 80108864 */ void changeHookshotDrawModel(); - /* 801088A0 */ void checkHookshotRoofLv7Boss(); - /* 801088C8 */ void checkChaseHookshot(); - /* 80108980 */ void checkOctaIealSpecialCollect(); - /* 801089E8 */ void checkBossOctaIealRoom(); - /* 80108A18 */ void checkHookshotWait() const; - /* 80108A3C */ void setHookshotCatchNow(); - /* 80108A90 */ void setHookshotCarryOffset(unsigned int, cXyz const*); - /* 80108B34 */ void setHookshotModel(); - /* 80108DB4 */ void setHookshotSight(); - /* 80108EEC */ void cancelHookshotShot(); - /* 80108F64 */ void cancelHookshotMove(); - /* 8010903C */ void checkHookshotReadyMaterialOffMode() const; - /* 80109070 */ void setHookshotReadyMaterial(); - /* 801090EC */ void initHookshotUpperAnimeSpeed(int); - /* 80109170 */ void initHookshotReady(); - /* 801091E4 */ void setHookshotReadyAnime(); - /* 80109284 */ void checkUpperItemActionHookshot(); - /* 801095C8 */ void checkNextActionHookshot(); - /* 801097A0 */ void setHookshotReturnEnd(); - /* 80109890 */ void setHookshotHangMoveBGCollect(); - /* 80109AAC */ void setHookshotTopPosFly(); - /* 80109BDC */ void setHookshotPos(); - /* 8010B2DC */ void setHookshotRoofWaitAnime(); - /* 8010B35C */ void setHookshotWallWaitAnime(); - /* 8010B3AC */ void hookshotRoofTurn(); - /* 8010B644 */ void initHookshotRoofWaitActor(fopAc_ac_c*); - /* 8010B720 */ void checkNextHookPoint(); - /* 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(); - /* 8010D93C */ void getSpinnerGravity() const; - /* 8010D94C */ void getSpinnerMaxFallSpeed() const; - /* 8010D95C */ void getSpinnerJumpRate() const; - /* 8010D96C */ void getSpinnerRideMoveTime(); - /* 8010D9B0 */ void getSpinnerRideSpeedF(); - /* 8010D9F4 */ void getSpinnerRideDecSpeedMax() const; - /* 8010DA04 */ void getSpinnerRideDecSpeedMin() const; - /* 8010DA14 */ void getSpinnerRideDecSpeedRate() const; - /* 8010DA24 */ void getSpinnerRideRotAngleMax() const; - /* 8010DA34 */ void getSpinnerRideRotAngleMin() const; - /* 8010DA44 */ void onSpinnerPathForceRemove(); - /* 8010DA98 */ void checkSpinnerPathMove(); - /* 8010DAFC */ void checkLv4BossRoom(); - /* 8010DB28 */ void checkSpinnerTriggerAttack(); - /* 8010DBC8 */ void setSpinnerSyncPos(); - /* 8010DC64 */ void procSpinnerReadyInit(); - /* 8010DDCC */ void procSpinnerReady(); - /* 8010DE64 */ void setSpinnerStatus(u8, u8); - /* 8010DE78 */ void procSpinnerWaitInit(); - /* 8010DF4C */ void procSpinnerWait(); - /* 8010E48C */ void bottleModelCallBack(); - /* 8010E568 */ void getBottleOpenAppearItem() const; - /* 8010E584 */ void 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(); - /* 801106E8 */ void setKandelaarMtx(f32 (*)[4], int, int); - /* 8011078C */ void checkWaterInKandelaarOffset(f32); - /* 801107BC */ void checkWaterInKandelaar(f32); - /* 80110840 */ void offKandelaarModel(); - /* 8011087C */ void checkUseKandelaar(int); - /* 801108B4 */ void checkKandelaarSwing(int) const; - /* 801108EC */ void kandelaarModelCallBack(); - /* 80110C28 */ void getKandelaarFlamePos(); - /* 80110C6C */ void checkKandelaarEquipAnime() const; - /* 80110C94 */ void preKandelaarDraw(); - /* 80110E84 */ void setKandelaarModel(); - /* 80110F88 */ void resetOilBottleModel(); - /* 80110FE0 */ void commonKandelaarPourInit(); - /* 801110B8 */ void commonKandelaarPour(int); - /* 8011130C */ void initKandelaarSwing(); - /* 80111440 */ void procKandelaarSwingInit(); - /* 801115CC */ void procKandelaarSwing(); - /* 8011167C */ void procKandelaarPourInit(); - /* 80111724 */ void procKandelaarPour(); - /* 80111784 */ void setGrassWhistleModel(int); - /* 8011181C */ void setHorseWhistleModel(); - /* 80111894 */ void procGrassWhistleGetInit(); - /* 801119D8 */ void 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(); - /* 8011243C */ void getIronBallCenterPos(); - /* 80112458 */ void getIronBallBgHit() const; - /* 80112474 */ void checkIronBallThrowMode() const; - /* 801124B4 */ void checkIronBallThrowReturnMode() const; - /* 801124FC */ void checkIronBallReturn() const; - /* 80112524 */ void checkIronBallGroundStop() const; - /* 80112568 */ void setIronBallWaitUpperAnime(int); - /* 80112628 */ void checkIronBallDelete(); - /* 801126F8 */ void setIronBallReturn(int); - /* 80112768 */ void setIronBallBgCheckPos(); - /* 801127F0 */ void setIronBallModel(); - /* 80112C84 */ void setIronBallGroundVec(cXyz const*, cXyz*); - /* 80112E7C */ void setIronBallChainPos(); - /* 80113CA0 */ void checkIronBallReturnChange(); - /* 80113D58 */ void setIronBallPos(); - /* 801150E4 */ void 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(); - /* 80115C20 */ void checkEventRun() const; - /* 80115C50 */ void createNpcTks(cXyz*, int, u32); - /* 80115D08 */ void checkSetNpcTks(cXyz*, int, int); - /* 80115EC0 */ void checkDemoAction(); - /* 80116E60 */ void checkDemoMoveMode(u32) const; - /* 80116E9C */ void setDemoMoveData(u32*, cXyz const*); - /* 80117064 */ void setNoDrawSwordShield(int, u16); - /* 801171F4 */ void setDemoData(); - /* 80117B90 */ void resetDemoBck(); - /* 80117C34 */ void endHighModel(); - /* 80117C90 */ void resetSpecialEvent(); - /* 80117CF8 */ void endDemoMode(); - /* 801180EC */ void getDemoLookActor(); - /* 80118170 */ void checkFlyAtnWait(); - /* 801181A0 */ void setGetItemFace(u16); - /* 801182D4 */ void checkGrabTalkActor(fopAc_ac_c*); - /* 80118308 */ void setTalkStartBack(cXyz*); - /* 8011856C */ void setShapeAngleToTalkActor(); - /* 80118654 */ void setTalkAnime(); - /* 801186D4 */ void setTradeItemAnime(); - /* 80118778 */ void setTradeItemOutHand(); - /* 801187B4 */ void checkEndMessage(u32); - /* 80118840 */ void setDemoRightHandIndex(u16); - /* 801188B0 */ void setDemoLeftHandIndex(u16); - /* 8011894C */ void setDemoRide(u16); - /* 801189F8 */ void setDemoBodyBck(dDemo_actor_c*, u16); - /* 80118AD0 */ void checkFinalBattle(); - /* 80118B34 */ void checkRestartDead(int, int); - /* 80118BF4 */ void setDeadRideSyncPos(); - /* 80118C98 */ void checkDeadHP(); - /* 80118D7C */ void checkDeadAction(int); - /* 80118FF8 */ void setHighModelBck(mDoExt_bckAnm*, u16); - /* 801190A4 */ void setHighModelFaceBtk(u16); - /* 80119134 */ void setDemoBrk(J3DAnmTevRegKey**, J3DModel*, u16); - /* 801191C4 */ void setStickAnmData(J3DAnmBase*, int, int, u16, int); - /* 801195C0 */ void 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(); - /* 8011A688 */ void setGetSubBgm(int); - /* 8011A6FC */ void checkTreasureRupeeReturn(int) const; - /* 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(); - /* 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(); - /* 8011D7D4 */ void 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(); - /* 8011E3D8 */ void checkLetterItem(int); - /* 8011E448 */ void procNotUseItemInit(int); - /* 8011E57C */ void procNotUseItem(); - /* 8011E6E0 */ void procSwordReadyInit(); - /* 8011E748 */ void procSwordReady(); - /* 8011E83C */ void setSwordPushAnime(); - /* 8011E8E0 */ void procSwordPushInit(); - /* 8011E960 */ void procSwordPush(); - /* 8011E9F8 */ void procGanonFinishInit(); - /* 8011EA78 */ void procGanonFinish(); - /* 8011EAE8 */ void procCutFastReadyInit(); - /* 8011EB8C */ void procCutFastReady(); - /* 8011EBDC */ void procMasterSwordStickInit(); - /* 8011EC60 */ void procMasterSwordStick(); - /* 8011ED18 */ void procMasterSwordPullInit(); - /* 8011ED8C */ void procMasterSwordPull(); - /* 8011EE40 */ void checkLv7DungeonShop(); - /* 8011EE94 */ void procDungeonWarpReadyInit(); - /* 8011EFB8 */ void procDungeonWarpReady(); - /* 8011F084 */ void procDungeonWarpInit(); - /* 8011F0F4 */ void procDungeonWarp(); - /* 8011F360 */ void procDungeonWarpSceneStartInit(); - /* 8011F460 */ void procDungeonWarpSceneStart(); - /* 8011F658 */ void checkAcceptWarp(); - /* 8011F7D8 */ void dungeonReturnWarp(); - /* 8011F8B8 */ void skipPortalObjWarp(); - /* 8011F9EC */ void checkWarpStart(); - /* 8011FBC0 */ void warpModelTexScroll(); - /* 8011FD4C */ void procCoWarpInit(int, int); - /* 80120124 */ void procCoWarp(); - /* 80120440 */ void commonWaitTurnInit(); - /* 80120474 */ void 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*); - /* 80120778 */ void stopDrawParticle(u32); - /* 801207BC */ void setEffectFrontRollParam(); - /* 80120880 */ void setEffectSlipParam(); - /* 80120B00 */ void setEffectRunParam(); - /* 80120DB0 */ void setEffectSmallLandParam(); - /* 80121000 */ void setEffectLandParam(); - /* 80121004 */ void setEffectSumouParam(); - /* 801211C0 */ void setFootEffectProcType(int); - /* 80121214 */ void setWolfFootOn(int); - /* 80121304 */ void setFootMark(cXyz*, u16, int); - /* 80121388 */ void setEffect(); - /* 801221F0 */ void setSumouEffect(); - /* 801225E8 */ void setWaterfallEffect(cXyz const*, u32*); - /* 80122654 */ void setWaterfallEffect(); - /* 8012277C */ void setMagneBootsEffect(); - /* 801228F4 */ void setSwordChargeEffect(); - /* 80122BBC */ void setElecDamageEffect(); - /* 80122F18 */ void clearCutTurnEffectID(); - /* 80122F78 */ void setCutTurnEffect(); - /* 801233A4 */ void setHorseCutTurnEffect(); - /* 80123434 */ void setCutLargeJumpLandEffect(); - /* 801236BC */ void setBootsLightEffect(); - /* 801237A8 */ void setLightningSwordEffect(); - /* 801238FC */ void setWolfRollAttackEffect(); - /* 801239B0 */ void setWolfDigEffect(); - /* 80123BF0 */ void setWolfSwimEndEffect(JPABaseEmitter**, JPABaseEmitter**); - /* 80123C8C */ void setWolfLockAttackEffect(); - /* 80123D88 */ void setWolfJumpAttackEffect(); - /* 80123ED0 */ void setWolfBarrierHitEffect(dBgS_LinChk&); - /* 80124144 */ void setCutWaterDropEffect(); - /* 801241E0 */ void setWaterDropEffect(); - /* 801244E4 */ void setSwordUpColorEffect(); - /* 801245EC */ void setSwordCutSplash(); - /* 80124738 */ void setMetamorphoseEffectStartLink(); - /* 801247A8 */ void setMetamorphoseEffect(); - /* 801248A8 */ void setRunSplash(); - /* 80124B68 */ void resetFairyEffect(); - /* 80124BA4 */ void setBottleEffect(); - /* 80124E28 */ void clearFirePointDamageEffect(int); - /* 80124EA8 */ void initFirePointDamageEffectAll(); - /* 80124FA4 */ void initFirePointDamageEffect(cXyz const*, dCcD_GObjInf*); - /* 80125128 */ void setFirePointDamageEffect(); - /* 80125338 */ void setFreezeEffect(); - /* 80125524 */ void setWoodShieldBurnEffect(); - /* 801255BC */ void clearWoodShieldBurnEffect(); - /* 80125628 */ void setWoodShieldBurnOutEffect(); - /* 80126740 */ void changeCommon(); - /* 80126928 */ void changeWolf(); - /* 80126F3C */ void changeLink(int); - /* 80127C54 */ void onWolfEyeUp(); - /* 80127CAC */ void offWolfEyeUp(); - /* 80127CF0 */ void wolfSenseTrigger(); - /* 80127D14 */ void setWolfSenceStatus(u8); - /* 80127D2C */ void wolfClawTrigger(); - /* 80127D50 */ void setWolfDigStatus(u8); - /* 80127D68 */ void checkWolfShapeReverse() const; - /* 80127DC4 */ void checkWolfSideStep() const; - /* 80127E08 */ void setWolfTailAngle(); - /* 80127F20 */ void checkWolfSlowDash(); - /* 80127F50 */ void setSpeedAndAngleWolf(); - /* 80128478 */ void setSpeedAndAngleWolfAtn(); - /* 80128798 */ void checkWolfAtnWait(); - /* 8012880C */ void checkUnderMove0BckNoArcWolf(daAlink_c::daAlink_WANM) const; - /* 80128844 */ void setBlendWolfMoveAnime(f32); - /* 80128F0C */ void checkWolfAtnMoveBack(s16); - /* 80128F5C */ void setWolfAtnMoveDirection(); - /* 80129114 */ void setBlendWolfAtnMoveAnime(f32); - /* 8012933C */ void setBlendWolfAtnBackMoveAnime(f32); - /* 8012948C */ void setDoubleAnimeWolf(f32, f32, f32, daAlink_c::daAlink_WANM, - daAlink_c::daAlink_WANM, int, f32); - /* 80129678 */ void setSingleAnimeWolfBase(daAlink_c::daAlink_WANM); - /* 801296A8 */ void setSingleAnimeWolfBaseMorf(daAlink_c::daAlink_WANM, f32); - /* 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); - /* 80129958 */ void checkMidnaUseAbility() const; - /* 801299A8 */ void checkWolfUseAbility(); - /* 80129A80 */ void checkWolfGroundSpecialMode(); - /* 80129B44 */ void checkNextActionWolf(int); - /* 8012A02C */ void wolfSideBgCheck(s16); - /* 8012A228 */ void checkWolfAttackReverse(int); - /* 8012A330 */ void checkWolfBarrierHitReverse(); - /* 8012A41C */ void checkWolfBarrierWallHit(cBgS_PolyInfo&); - /* 8012A498 */ void wolfBgCheck(); - /* 8012ACCC */ void changeWolfBlendRate(int); - /* 8012AD1C */ void setWolfFootMatrix(); - /* 8012B724 */ void wolfFootBgCheck(); - /* 8012BFA8 */ void 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(); - /* 80130654 */ void setWolfHowlNotHappen(int); - /* 80130700 */ void procWolfHowlDemoInit(); - /* 80130BC4 */ void procWolfHowlDemo(); - /* 80131408 */ void checkWolfRope(); - /* 80131450 */ void checkWolfRopeHit(dCcD_GObjInf*, cXyz const*, int) const; - /* 80131628 */ void checkWolfRopeJumpHang(); - /* 801316A4 */ void getWolfRopeMoveSpeed(); - /* 80131718 */ void setWolfRopePosY(); - /* 801319F0 */ void 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(); - /* 80133D6C */ void getWolfTagJumpTime() const; - /* 80133EF0 */ void checkMidnaLockJumpPoint() const; - /* 80134000 */ void procWolfTagJumpInit(fopAc_ac_c*); - /* 80134838 */ void procWolfTagJump(); - /* 80134DB8 */ void procWolfTagJumpLandInit(fopAc_ac_c*); - /* 80134EBC */ void procWolfTagJumpLand(); - /* 80135160 */ void procWolfGiantPuzzleInit(); - /* 801351F8 */ void 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(); - /* 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(); - /* 80136EC4 */ void setWolfScreamWaitAnime(); - /* 80136F54 */ void procWolfScreamWaitInit(); - /* 80136FF8 */ void procWolfScreamWait(); - /* 801370E4 */ void getWolfLieMoveAnmSpeed(); - /* 8013712C */ void getWolfLieMoveSpeed(); - /* 801371A0 */ void checkMidnaDisappearMode() const; - /* 801371FC */ void checkWolfLieContinue(int); - /* 801372B4 */ void 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(); - /* 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(); - /* 80138B6C */ void onWolfEnemyBiteAll(fopAc_ac_c*, daPy_py_c::daPy_FLG2); - /* 80138C04 */ void resetWolfEnemyBiteAll(); - /* 80138C44 */ void checkWolfEnemyThrowAction(); - /* 80138CB8 */ void setWolfLockDomeModel(); - /* 80138DC0 */ void setWolfBallModel(); - /* 80138F18 */ void resetWolfBallGrab(); - /* 80139048 */ void checkWolfLockData(); - /* 8013911C */ void checkWolfLock(fopAc_ac_c*) const; - /* 8013916C */ void cancelWolfLock(fopAc_ac_c*); - /* 801391DC */ void getWolfLockActorEnd(); - /* 801391E4 */ void searchWolfLockEnemy(fopAc_ac_c*, void*); - /* 801392E4 */ void checkWolfComboCnt(); - /* 801393A4 */ void checkWolfAttackAction(); - /* 801395B4 */ void setWolfEnemyThrowUpperAnime(daAlink_c::daAlink_WANM, f32); - /* 80139600 */ void 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(); - /* 8013DB6C */ void 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(); - /* 8013F90C */ void setSmellSave(); - /* 8013FA14 */ void procWolfGetSmellInit(); - /* 8013FC24 */ void procWolfGetSmell(); - /* 8013FF28 */ void setArcName(int); - /* 8013FF90 */ void setShieldArcName(); - /* 8013FFD8 */ void setOriginalHeap(JKRExpHeap**, u32); - /* 80140038 */ void setClothesChange(int); - /* 80140064 */ void setShieldChange(); - /* 80140070 */ void loadModelDVD(); - /* 801401F8 */ void setShieldModel(); - /* 80140274 */ void loadShieldModelDVD(); - /* 80140338 */ void changeModelDataDirect(int); - /* 80140550 */ void changeModelDataDirectWolf(int); - /* 801406A8 */ void initStatusWindow(); - /* 80140888 */ void statusWindowExecute(cXyz const*, s16); - /* 80140984 */ void statusWindowDraw(); - /* 80140AC8 */ void resetStatusWindow(); - - static u8 const m_mainBckShield[80]; - static u8 const m_mainBckSword[20]; - static u8 const m_mainBckFishing[112]; - static u8 const m_anmDataTable[4968]; - static void* const m_wlAnmDataTable[294]; - static u8 const m_faceTexDataTable[652]; - static u8 const m_handLeftOutSidePos[12]; - static u8 const m_handRightOutSidePos[12]; - static u8 const m_handLeftInSidePos[12]; - static u8 const m_handRightInSidePos[12]; - static u8 m_procInitTable[5632]; - static u8 m_demoInitTable[1140]; - static u8 m_fEffParamProc[72]; -}; - -struct daAlink_blur_c { - /* 800CFD58 */ ~daAlink_blur_c(); - /* 801256EC */ void initBlur(f32, int, cXyz const*, cXyz const*, cXyz const*); - /* 8012589C */ void copyBlur(cXyz const*, cXyz const*, cXyz const*); - /* 80125B0C */ void traceBlur(cXyz const*, cXyz const*, s16); - /* 80125BF4 */ void draw(); -}; - struct daAlinkHIO_zwLight_c0 { static u8 const m[28]; }; @@ -2588,10 +224,6 @@ struct daAlinkHIO_wlBackJump_c0 { static u8 const m[56]; }; -struct daAlinkHIO_wlAutoJump_c0 { - static u8 const m[124]; -}; - struct daAlinkHIO_wlAttack_c0 { static u8 const m[56]; }; @@ -2933,18 +565,10 @@ struct daAlinkHIO_board_c0 { static u8 const m[156]; }; -struct daAlinkHIO_basic_c0 { - static u8 const m[88]; -}; - struct daAlinkHIO_backJump_c0 { static u8 const m[56]; }; -struct daAlinkHIO_autoJump_c0 { - static u8 const m[180]; -}; - struct daAlinkHIO_atnMove_c0 { static u8 const m[84]; }; @@ -2955,85 +579,15 @@ struct dVibration_c { /* 8006FD94 */ void StopQuake(int); }; -struct dSv_turnRestart_c { - /* 80034FA4 */ void set(cXyz const&, s16, s8, u32); -}; - -struct dSv_restart_c { - /* 80034F80 */ void setRoom(cXyz const&, s16, s8); -}; - -struct dSv_player_status_b_c { - /* 80032BEC */ void isTransformLV(int) const; -}; - -struct dSv_player_status_a_c { - /* 80032AA8 */ void getRupeeMax() const; -}; - -struct dSv_player_item_c { - /* 80032FB8 */ void setItem(int, u8); - /* 80033370 */ void setBottleItemIn(u8, u8); - /* 80033598 */ void setEquipBottleItemIn(u8, u8); - /* 800336BC */ void setEquipBottleItemEmpty(u8); - /* 800336E0 */ void checkBottle(u8); - /* 80033D40 */ void setBaitItem(u8); -}; - -struct dSv_player_get_item_c { - /* 80033EC8 */ void isFirstBit(u8) const; -}; - -struct dSv_memBit_c { - /* 80034934 */ void isDungeonItem(int) const; -}; - -struct dSv_light_drop_c { - /* 80034340 */ void getLightDropNum(u8) const; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - struct dSv_event_tmp_flag_c { static u8 const tempBitLabels[370 + 2 /* padding */]; }; -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 8003498C */ void onEventBit(u16); - /* 800349A4 */ void offEventBit(u16); - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dSv_danBit_c { - /* 80034BE8 */ void isSwitch(int) const; -}; - -struct dStage_roomControl_c { - static u8 mDemoArcName[10 + 2 /* padding */]; -}; - -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 { - /* 8003AB30 */ void onWarpMaterial(J3DModelData*); - /* 8003AC1C */ void offWarpMaterial(J3DModelData*); - /* 8003AD08 */ void setWarpSRT(J3DModelData*, cXyz const&, f32, f32); - /* 8003AE14 */ void loaderBasicBmd(u32, void*); -}; - struct dRes_control_c { /* 8003C1E4 */ void getResInfo(char const*, dRes_info_c*, int); /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); @@ -3041,14 +595,6 @@ struct dRes_control_c { /* 8003C400 */ void getIDRes(char const*, u16, dRes_info_c*, int); }; -struct 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); @@ -3075,64 +621,6 @@ struct dPa_control_c { static u8 mParticleTracePCB[4 + 4 /* padding */]; }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F40 */ void SetWallR(f32); - /* 80075F58 */ void SetWall(f32, f32); - /* 80077414 */ ~dBgS_AcchCir(); -}; - -struct dBgS_RoofChk { - /* 80078FF4 */ dBgS_RoofChk(); - /* 80079090 */ ~dBgS_RoofChk(); - /* 800B146C */ void SetPos(cXyz const&); -}; - -struct dBgS { - /* 80074ABC */ void ChkMoveBG(cBgS_PolyInfo const&); - /* 80074B40 */ void ChkMoveBG_NoDABg(cBgS_PolyInfo const&); - /* 80074B98 */ void GetExitId(cBgS_PolyInfo const&); - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80074C6C */ void GetHorseNoEntry(cBgS_PolyInfo const&); - /* 80074CBC */ void GetSpecialCode(cBgS_PolyInfo const&); - /* 80074D0C */ void GetMagnetCode(cBgS_PolyInfo const&); - /* 80074D5C */ void GetMonkeyBarsCode(cBgS_PolyInfo const&); - /* 80074E00 */ void GetWallCode(cBgS_PolyInfo const&); - /* 80074E50 */ void GetPolyAtt0(cBgS_PolyInfo const&); - /* 80074EA0 */ void GetPolyAtt1(cBgS_PolyInfo const&); - /* 80074EF0 */ void GetGroundCode(cBgS_PolyInfo const&); - /* 80074FE0 */ void GetRoomPathId(cBgS_PolyInfo const&); - /* 80075080 */ void GetGrpSoundId(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); - /* 8007519C */ void GetPolyAttackThrough(cBgS_PolyInfo const&); - /* 800751F8 */ void ChkPolyHSStick(cBgS_PolyInfo const&); - /* 8007549C */ void RoofChk(dBgS_RoofChk*); - /* 80075774 */ void MoveBgCrrPos(cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*, bool, bool); - /* 80075880 */ void MoveBgTransPos(cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); - /* 80075C6C */ void PushPullCallBack(cBgS_PolyInfo const&, fopAc_ac_c*, s16, - dBgW_Base::PushPullLabel); -}; - -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&); - /* 800773C0 */ void SetGndThinCellingOff(); - /* 800773D0 */ void ClrGndThinCellingOff(); - /* 800773EC */ void OnWallSort(); - /* 800D00D0 */ void ChkRoofHit() const; - /* 800D00DC */ void ClrGroundHit(); - /* 80141404 */ void ChkGroundHit() const; -}; - -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 dPaPoF_c { /* 800512E8 */ void setEffectFour(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*, cXyz const*, cXyz const*, cXyz const*, cXyz const*, @@ -3143,46 +631,10 @@ struct dPaPoF_c { static u8 m_emitterFourData[60 + 28 /* padding */]; }; -struct dMsgObject_c { - /* 8023822C */ void getStatus(); - /* 80238320 */ void onMsgSend(); - /* 80238410 */ void setSmellType(u8); - /* 80238588 */ void isHowlHearingMode(); -}; - -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F48 */ ~dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); -}; - -struct dMeter2Info_c { - /* 8021C0E0 */ void setFloatingMessage(u16, s16, bool); - /* 8021C934 */ void onDirectUseItem(int); - /* 8021C9DC */ void resetWarpStatus(); - /* 8021CA04 */ void warpInProc(); - /* 8021CA70 */ void warpOutProc(); -}; - -struct dJntColData_c {}; - -struct dJntCol_c { - /* 80035C8C */ dJntCol_c(); - /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); - /* 80036C44 */ void getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const; -}; - struct dInsect_c { /* 80110648 */ void Insect_Release(); }; -struct dEyeHL_c { - /* 8009C964 */ void entry(J3DModelData*, char const*); - /* 8009CA28 */ void remove(); - /* 80140C80 */ ~dEyeHL_c(); -}; - struct dEvt_info_c { /* 801411E0 */ void onCondition(u16); /* 80141200 */ void offCondition(u16); @@ -3225,23 +677,6 @@ struct dDlst_shadowControl_c { static u8 mSimpleTexObj[32]; }; -struct dDlst_peekZ_c { - /* 80056018 */ void newData(s16, s16, u32*); -}; - -struct J3DDrawBuffer; -struct J3DPacket { - /* 80312750 */ bool entry(J3DDrawBuffer*); -}; - -struct J3DDrawBuffer { - /* 8032548C */ void entryImm(J3DPacket*, u16); -}; - -struct dDlst_list_c { - /* 800565EC */ void entryZSortXluDrawList(J3DDrawBuffer*, J3DPacket*, cXyz&); -}; - struct dDemo_object_c { /* 80039088 */ void getActor(u8); }; @@ -3257,51 +692,6 @@ struct dComIfG_play_c { /* 8002C97C */ void getLayerNo(int); }; -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_SrcCyl {}; - -struct dCcD_SrcCps {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); - /* 80084A78 */ void StartCAt(cXyz&); - /* 80084AC4 */ void MoveCAt(cXyz&); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); -}; - -struct dCcD_GAtTgCoCommonBase { - /* 80083688 */ void GetAc(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); - /* 80084908 */ void StartCAt(cXyz&); - /* 80084954 */ void MoveCAt(cXyz&); - /* 80084D60 */ ~dCcD_Cyl(); - /* 80141020 */ dCcD_Cyl(); -}; - -struct dCcD_Cps { - /* 800847D0 */ void Set(dCcD_SrcCps const&); - /* 8008506C */ ~dCcD_Cps(); - /* 80140FA0 */ dCcD_Cps(); -}; - struct dCamera_c { /* 80088A7C */ void StartEventCamera(int, int, ...); /* 80088BBC */ void EndEventCamera(int); @@ -3313,162 +703,18 @@ struct dCamera_c { /* 80181500 */ void GetForceLockOnActor(); }; -struct dBgS_RopeLinChk { - /* 8007838C */ dBgS_RopeLinChk(); - /* 800783E8 */ ~dBgS_RopeLinChk(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); - /* 80078E74 */ void ClrObj(); - /* 80078E98 */ void SetLink(); - /* 80078EA4 */ void ClrLink(); - /* 80078EBC */ void SetBomb(); - /* 80078EC8 */ void ClrBomb(); - /* 80078F7C */ void SetStatue(); - /* 80078F88 */ void ClrStatue(); - /* 80078F94 */ void SetIronBall(); -}; - -struct dBgS_ObjLinChk { - /* 80077F5C */ dBgS_ObjLinChk(); - /* 80077FB8 */ ~dBgS_ObjLinChk(); -}; - struct dBgS_ObjAcch { /* 800D0C6C */ ~dBgS_ObjAcch(); }; -struct dBgS_LinkRoofChk { - /* 80140E40 */ ~dBgS_LinkRoofChk(); -}; - -struct dBgS_LinkLinChk { - /* 80078030 */ dBgS_LinkLinChk(); - /* 8007808C */ ~dBgS_LinkLinChk(); -}; - -struct dBgS_LinkGndChk { - /* 80140EB8 */ ~dBgS_LinkGndChk(); -}; - -struct dBgS_LinkAcch { - /* 80140F30 */ ~dBgS_LinkAcch(); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_BoomerangLinChk { - /* 800782B8 */ dBgS_BoomerangLinChk(); - /* 80078314 */ ~dBgS_BoomerangLinChk(); -}; - -struct dBgS_ArrowLinChk { - /* 800781D8 */ dBgS_ArrowLinChk(); - /* 80078240 */ ~dBgS_ArrowLinChk(); -}; - -struct dAttention_c { - /* 80070844 */ void GetLockonList(s32); - /* 80070880 */ void getActionBtnB(); - /* 80070974 */ void getActionBtnXY(); - /* 8007353C */ void LockonTarget(s32); - /* 800737E4 */ void LockonTruth(); -}; - -struct dAttLook_c { - /* 80073CA4 */ void convPId(unsigned int); -}; - -struct dAttHint_c { - /* 800738CC */ void convPId(unsigned int); -}; - -struct dAttCatch_c { - /* 8007398C */ void convPId(unsigned int); -}; - -struct JPABaseParticle {}; - -struct dAlink_bottleWaterPcallBack_c { - /* 800CFCF8 */ ~dAlink_bottleWaterPcallBack_c(); - /* 80124A2C */ void execute(JPABaseEmitter*, JPABaseParticle*); -}; - struct camera_class {}; -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); -}; - -struct cM3dGLin { - /* 8026F2E8 */ void SetStartEnd(cXyz const&, cXyz const&); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); -}; - -struct cM3dGCps { - /* 8026EF88 */ cM3dGCps(); - /* 8026EFA4 */ ~cM3dGCps(); -}; - struct cCcS { /* 80264BA8 */ void Set(cCcD_Obj*); }; -struct cCcD_Stts { - /* 801410A4 */ ~cCcD_Stts(); - /* 8026395C */ void ClrCcMove(); -}; - -struct cCcD_ObjCo { - /* 80264900 */ void SetIGrp(u32); - /* 8026491C */ void SetVsGrp(u32); -}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); - /* 80074618 */ void GetActorPointer(int) const; - /* 80074628 */ void GetBgWBasePointer(cBgS_PolyInfo const&) const; - /* 80074660 */ void ChkPolySafe(cBgS_PolyInfo const&); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; - /* 800747F0 */ void GetTriPnt(cBgS_PolyInfo const&, cXyz*, cXyz*, cXyz*) const; -}; - struct _GXTexObj {}; -struct Z2WolfHowlData {}; - -struct Z2WolfHowlMgr { - /* 802CAAC0 */ Z2WolfHowlMgr(); - /* 802CAED4 */ void startWolfHowlSound(f32, f32, bool, f32); - /* 802CB100 */ void setCorrectData(s8, Z2WolfHowlData*); - /* 802CBB58 */ void skipCorrectDemo(); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); -}; - struct Z2SeqMgr { /* 802AF010 */ void bgmStart(u32, u32, s32); /* 802AF49C */ void subBgmStart(u32); @@ -3480,52 +726,15 @@ struct Z2SeqMgr { /* 802B5ED4 */ void taktModeMuteOff(); }; -struct JAISoundID {}; - struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; -struct Z2CreatureLink { - /* 80141988 */ void setLinkState(u8); - /* 802C321C */ void setLinkGroupInfo(u8); - /* 802C3228 */ void setLinkSwordType(s32, s32); - /* 802C328C */ void setLinkShieldType(s32, s32); - /* 802C32F0 */ void setLinkBootsType(s32); - /* 802C333C */ Z2CreatureLink(); - /* 802C3500 */ ~Z2CreatureLink(); - /* 802C3638 */ void init(Vec*, Vec*, Vec*); - /* 802C3710 */ void initKantera(Vec*); - /* 802C374C */ void deleteKantera(); - /* 802C3A6C */ void setRiding(bool); - /* 802C3AEC */ void setMagnetized(bool); - /* 802C3AFC */ void setWolfEyeOpen(bool); - /* 802C3BD4 */ void startLinkSound(JAISoundID, u32, s8); - /* 802C3E68 */ void startLinkSoundLevel(JAISoundID, u32, s8); - /* 802C4320 */ void startLinkVoice(JAISoundID, s8); - /* 802C45B0 */ void startLinkVoiceLevel(JAISoundID, s8); - /* 802C46F0 */ void startLinkSwordSound(JAISoundID, u32, s8); - /* 802C4814 */ void startHitItemSE(u32, u32, Z2SoundObjBase*, f32); - /* 802C48D8 */ void setResumeAttack(bool); - - static u8 mLinkPtr[4 + 4 /* padding */]; -}; - -struct Z2Creature { - /* 802C0628 */ void initAnime(void*, bool, f32, f32); - /* 802C06D0 */ void updateAnime(f32, f32); - /* 802C0BE8 */ void startCollisionSE(u32, u32); -}; - struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct LIGHT_INFLUENCE { - /* 800CFC7C */ ~LIGHT_INFLUENCE(); -}; - namespace JStudio { namespace stb { struct data { @@ -3540,15 +749,6 @@ struct data { }; // namespace JStudio -struct JPAParticleCallBack { - /* 800183D8 */ void draw(JPABaseEmitter*, JPABaseParticle*); - /* 8027EFA4 */ ~JPAParticleCallBack(); -}; - -struct JPAEmitterCallBack { - /* 8027E6A4 */ ~JPAEmitterCallBack(); -}; - struct JMath { static u8 sincosTable_[65536]; }; @@ -3557,17 +757,6 @@ struct JKRFileLoader { /* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*); }; -struct JKRArchive { - /* 802D5ECC */ void readIdxResource(void*, u32, u32); -}; - -struct JGeometry { - template <typename A1> - struct TVec3 {}; - /* TVec3<f32> */ - struct TVec3__template0 {}; -}; - struct JASKernel { /* 80290B08 */ void getAramHeap(); }; @@ -3577,10 +766,6 @@ struct JAISoundStrategyMgr {}; /* JAISoundStrategyMgr<JAISeq> */ struct JAISoundStrategyMgr__template1 {}; -struct JAISoundHandle { - /* 802A2184 */ void releaseSound(); -}; - struct JAISeqMgr {}; struct JAISeq { @@ -3623,22 +808,6 @@ struct J3DShape { static u8 sOldVcdVatCmd[4]; }; -struct J3DAnmTextureSRTKey { - /* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*); -}; - -struct J3DAnmTexPattern { - /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*); -}; - -struct J3DMaterialTable { - /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); - /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*); - /* 8032FBC8 */ void entryTexNoAnimator(J3DAnmTexPattern*); - /* 8032FCC4 */ void entryTexMtxAnimator(J3DAnmTextureSRTKey*); - /* 8032FE70 */ void entryTevRegAnimator(J3DAnmTevRegKey*); -}; - struct J3DMaterialAnm { /* 800A4820 */ ~J3DMaterialAnm(); /* 8032C320 */ void initialize(); @@ -3652,11 +821,6 @@ struct J3DMatColorAnm { struct J3DJoint {}; -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 8032842C */ void checkPass(f32); -}; - struct J3DAnmLoaderDataBaseFlag {}; struct J3DAnmLoaderDataBase { @@ -5858,7 +3022,7 @@ extern "C" bool checkCopyRodEquip__9daPy_py_cCFv(); extern "C" bool checkCutJumpMode__9daPy_py_cCFv(); extern "C" void getZeldaActor__9daHorse_cFv(); extern "C" static void dComIfGp_getDoStatus__Fv(); -extern "C" void __ct__4cXyzFfff(); +extern "C" void __ct__4cXyzFfff(f32, f32, f32); extern "C" static void dMeter2Info_offUseButton__Fi(); extern "C" void setLinkState__14Z2CreatureLinkFUc(); extern "C" static void dComIfGs_getRupee__Fv(); @@ -5872,7 +3036,7 @@ extern "C" void onNoServiceWait__9daMidna_cFv(); extern "C" void setControllActorData__8daCrod_cFv(); extern "C" void func_80141ACC(void* _this, fopAc_ac_c const*, daObjMovebox::Act_c::Prm_e, daObjMovebox::Act_c::Prm_e); -extern "C" void func_80141AE8(void* _this, u8*); +extern "C" int func_80141AE8(u8*); extern "C" void __sinit_d_a_alink_cpp(); extern "C" static void func_801446D4(); extern "C" static void func_801446DC(); @@ -6578,20 +3742,6 @@ extern "C" void entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey() extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); extern "C" void load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag(); extern "C" void JMAEulerToQuat__FsssP10Quaternion(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXInverse(); -extern "C" void PSMTXRotAxisRad(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXQuat(); -extern "C" void PSMTXMultVec(); -extern "C" void PSMTXMultVecSR(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSubtract(); -extern "C" void PSVECScale(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECDotProduct(); -extern "C" void PSVECSquareDistance(); extern "C" void GXSetVtxDesc(); extern "C" void GXClearVtxDesc(); extern "C" void GXSetVtxAttrFmt(); @@ -6654,9 +3804,6 @@ 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" void strcpy(); -extern "C" void strlen(); extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; extern "C" extern void* __vt__12J3DFrameCtrl[3]; @@ -6703,7 +3850,6 @@ extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* 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" u8 BaseX__4cXyz[12]; extern "C" u8 BaseY__4cXyz[12]; @@ -6737,6 +3883,10 @@ extern "C" u8 sOldVcdVatCmd__8J3DShape[4]; // Declarations: // +inline Z2CreatureLink* Z2GetLink() { + return Z2CreatureLink::mLinkPtr; +} + /* 8009D87C-8009D884 0981BC 0008+00 0/0 1/1 0/0 .text getE3Zhint__9daAlink_cFv */ bool daAlink_c::getE3Zhint() { return false; @@ -6744,131 +3894,36 @@ bool daAlink_c::getE3Zhint() { /* ############################################################################################## */ /* 80452C50-80452C58 001250 0005+03 2/2 0/0 0/0 .sdata2 l_wArcName */ -SECTION_SDATA2 static u8 l_wArcName[5 + 3 /* padding */] = { - 0x57, - 0x6D, - 0x64, - 0x6C, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; +SECTION_SDATA2 static char l_wArcName[8] = "Wmdl"; /* 80452C58-80452C60 001258 0005+03 2/2 0/0 0/0 .sdata2 l_bArcName */ -SECTION_SDATA2 static u8 l_bArcName[5 + 3 /* padding */] = { - 0x42, - 0x6D, - 0x64, - 0x6C, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; +SECTION_SDATA2 static char l_bArcName[8] = "Bmdl"; /* 80452C60-80452C68 001260 0005+03 2/2 0/0 0/0 .sdata2 l_kArcName */ -SECTION_SDATA2 static u8 l_kArcName[5 + 3 /* padding */] = { - 0x4B, - 0x6D, - 0x64, - 0x6C, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; +SECTION_SDATA2 static char l_kArcName[8] = "Kmdl"; /* 80452C68-80452C70 001268 0005+03 2/2 0/0 0/0 .sdata2 l_zArcName */ -SECTION_SDATA2 static u8 l_zArcName[5 + 3 /* padding */] = { - 0x5A, - 0x6D, - 0x64, - 0x6C, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; +SECTION_SDATA2 static char l_zArcName[8] = "Zmdl"; /* 80452C70-80452C78 001270 0005+03 3/3 0/0 0/0 .sdata2 l_mArcName */ -SECTION_SDATA2 static u8 l_mArcName[5 + 3 /* padding */] = { - 0x4D, - 0x6D, - 0x64, - 0x6C, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; +SECTION_SDATA2 static char l_mArcName[8] = "Mmdl"; /* 80452C78-80452C80 001278 0006+02 1/1 0/0 0/0 .sdata2 l_hyShdArcName */ -SECTION_SDATA2 static u8 l_hyShdArcName[6 + 2 /* padding */] = { - 0x48, - 0x79, - 0x53, - 0x68, - 0x64, - 0x00, - /* padding */ - 0x00, - 0x00, -}; +SECTION_SDATA2 static char l_hyShdArcName[8] = "HyShd"; /* 80452C80-80452C88 001280 0006+02 1/1 0/0 0/0 .sdata2 l_cWShdArcName */ -SECTION_SDATA2 static u8 l_cWShdArcName[6 + 2 /* padding */] = { - 0x43, - 0x57, - 0x53, - 0x68, - 0x64, - 0x00, - /* padding */ - 0x00, - 0x00, -}; +SECTION_SDATA2 static char l_cWShdArcName[8] = "CWShd"; /* 80452C88-80452C90 001288 0006+02 1/1 0/0 0/0 .sdata2 l_sWShdArcName */ -SECTION_SDATA2 static u8 l_sWShdArcName[6 + 2 /* padding */] = { - 0x53, - 0x57, - 0x53, - 0x68, - 0x64, - 0x00, - /* padding */ - 0x00, - 0x00, -}; +SECTION_SDATA2 static char l_sWShdArcName[8] = "SWShd"; /* 80452C90-80452C98 001290 0006+02 7/7 0/0 0/0 .sdata2 l_arcName */ -SECTION_SDATA2 static u8 l_arcName[6 + 2 /* padding */] = { - 0x41, - 0x6C, - 0x69, - 0x6E, - 0x6B, - 0x00, - /* padding */ - 0x00, - 0x00, -}; +SECTION_SDATA2 static char l_arcName[8] = "Alink"; /* 8009D884-8009D88C 0981C4 0008+00 0/0 0/0 13/13 .text getAlinkArcName__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getAlinkArcName() { - nofralloc -#include "asm/d/a/d_a_alink/getAlinkArcName__9daAlink_cFv.s" +char* daAlink_c::getAlinkArcName() { + return l_arcName; } -#pragma pop /* 8009D88C-8009D8B8 0981CC 002C+00 1/1 0/0 0/0 .text * daAlink_tgHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ @@ -6969,7 +4024,7 @@ asm void daAlink_matAnm_c::calc(J3DMaterial* param_0) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkStageName(char const* param_0) { +asm bool daAlink_c::checkStageName(char const* param_0) { nofralloc #include "asm/d/a/d_a_alink/checkStageName__9daAlink_cFPCc.s" } @@ -8271,15 +5326,9 @@ SECTION_RODATA static u8 const lit_3757[12] = { COMPILER_STRIP_GATE(0x8038D658, &lit_3757); /* 8038D664-8038D6BC 019CC4 0058+00 41/50 0/0 0/0 .rodata m__19daAlinkHIO_basic_c0 */ -SECTION_RODATA u8 const daAlinkHIO_basic_c0::m[88] = { - 0x00, 0x00, 0x4E, 0x20, 0xD8, 0xF0, 0x1F, 0x40, 0x00, 0x01, 0x00, 0x1E, 0x01, 0x90, 0x02, - 0x58, 0x40, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x3F, 0x33, - 0x33, 0x33, 0x40, 0x40, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x42, 0xAA, 0x00, 0x00, 0x43, - 0x96, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, - 0x41, 0xB8, 0x00, 0x00, 0x42, 0x24, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x00, 0x00, - 0x00, 0x3F, 0x33, 0x33, 0x33, 0x43, 0xC8, 0x00, 0x00, 0x45, 0x9C, 0x40, 0x00, -}; -COMPILER_STRIP_GATE(0x8038D664, &daAlinkHIO_basic_c0::m); +daAlinkHIO_basic_c1 const daAlinkHIO_basic_c0::m = { + 0, 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 */ SECTION_RODATA u8 const daAlinkHIO_move_c0::m[88] = { @@ -8696,21 +5745,37 @@ SECTION_RODATA u8 const daAlinkHIO_crouch_c0::m[76] = { COMPILER_STRIP_GATE(0x8038E01C, &daAlinkHIO_crouch_c0::m); /* 8038E068-8038E11C 01A6C8 00B4+00 26/32 0/0 0/0 .rodata m__22daAlinkHIO_autoJump_c0 */ -SECTION_RODATA u8 const daAlinkHIO_autoJump_c0::m[180] = { - 0x00, 0x06, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x40, 0x40, 0x00, 0x00, 0x40, 0xC0, 0x00, - 0x00, 0x40, 0xE0, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x80, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x3F, - 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, - 0x00, 0x0A, 0x00, 0x00, 0x3F, 0x19, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, - 0x00, 0x41, 0x30, 0x00, 0x00, 0x01, 0x00, 0x23, 0xC6, 0x2F, 0xFF, 0x00, 0x08, 0x40, 0x00, - 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, 0x40, - 0xA0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0xC0, 0x59, 0x99, 0x9A, - 0xC3, 0x48, 0x00, 0x00, 0x41, 0xD0, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0x80, 0x00, - 0x00, 0x41, 0x20, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x43, 0x2A, 0x00, 0x00, 0x42, 0xC8, - 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0xC0, - 0x59, 0x99, 0x9A, 0x41, 0x60, 0x00, 0x00, 0xC0, 0xA0, 0x00, 0x00, 0x41, 0xB8, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E068, &daAlinkHIO_autoJump_c0::m); +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}, + 1, + 9158, + 12287, + 8, + 16384, + 10.0f, + 10.0f, + 1.3f, + 5.0f, + 10.0f, + 3.0f, + -3.4f, + -200.0f, + 26.0f, + 3.0f, + 4.0f, + 10.0f, + 1.0f, + 170.0f, + 100.0f, + 20.0f, + 30.0f, + 20.0f, + -3.4f, + 14.0f, + -5.0f, + 23.0f}; /* 8038E11C-8038E164 01A77C 0048+00 7/7 0/0 0/0 .rodata m__23daAlinkHIO_smallJump_c0 */ SECTION_RODATA u8 const daAlinkHIO_smallJump_c0::m[72] = { @@ -9225,17 +6290,27 @@ SECTION_RODATA u8 const daAlinkHIO_wlHowl_c0::m[96] = { COMPILER_STRIP_GATE(0x8038F048, &daAlinkHIO_wlHowl_c0::m); /* 8038F0A8-8038F124 01B708 007C+00 8/13 0/0 0/0 .rodata m__24daAlinkHIO_wlAutoJump_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlAutoJump_c0::m[124] = { - 0x00, 0x03, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, - 0x40, 0x80, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, - 0x40, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x1D, 0x4C, 0x20, 0x08, 0x41, 0x20, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, - 0x41, 0x20, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0xC0, 0x66, 0x66, 0x66, 0xC2, 0xC8, 0x00, 0x00, - 0x3F, 0x99, 0x99, 0x9A, 0x41, 0x20, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x3F, 0x82, 0x8F, 0x5C, - 0x42, 0x18, 0x00, 0x00, 0x41, 0xF8, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038F0A8, &daAlinkHIO_wlAutoJump_c0::m); +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}, + 1, + 0, + 7500, + 8200, + 10.0f, + 10.0f, + 1.1f, + 10.0f, + 5.0f, + -3.6f, + -100.0f, + 1.2f, + 10.0f, + 10.0f, + 1.02f, + 38.0f, + 31.0f, + 100.0f}; /* 8038F124-8038F138 01B784 0014+00 4/4 0/0 0/0 .rodata m__20daAlinkHIO_wlPush_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlPush_c0::m[20] = { @@ -9602,7 +6677,7 @@ asm void daAlink_c::setNeckAngle() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getStickAngleFromPlayerShape(s16* param_0) const { +asm bool daAlink_c::getStickAngleFromPlayerShape(s16* param_0) const { nofralloc #include "asm/d/a/d_a_alink/getStickAngleFromPlayerShape__9daAlink_cCFPs.s" } @@ -9658,60 +6733,28 @@ asm void daAlink_c::setMoveSlantAngle() { /* 8038FA10-8038FA20 01C070 0010+00 0/0 0/0 0/0 .rodata l_worldChangeEventName */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const l_worldChangeEventName[16] = { - 0x57, 0x4F, 0x52, 0x4C, 0x44, 0x5F, 0x43, 0x48, 0x41, 0x4E, 0x47, 0x45, 0x5F, 0x49, 0x4E, 0x00, -}; +SECTION_RODATA static char const l_worldChangeEventName[16] = "WORLD_CHANGE_IN"; COMPILER_STRIP_GATE(0x8038FA10, &l_worldChangeEventName); #pragma pop /* 8038FA20-8038FA38 01C080 0015+03 0/0 0/0 0/0 .rodata l_wolfWorldChangeEventName */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const l_wolfWorldChangeEventName[21 + 3 /* padding */] = { - 0x57, - 0x4F, - 0x4C, - 0x46, - 0x5F, - 0x57, - 0x4F, - 0x52, - 0x4C, - 0x44, - 0x5F, - 0x43, - 0x48, - 0x41, - 0x4E, - 0x47, - 0x45, - 0x5F, - 0x49, - 0x4E, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; +SECTION_RODATA static char const l_wolfWorldChangeEventName[24] = "WOLF_WORLD_CHANGE_IN"; COMPILER_STRIP_GATE(0x8038FA20, &l_wolfWorldChangeEventName); #pragma pop /* 8038FA38-8038FA48 01C098 0010+00 0/1 0/0 0/0 .rodata l_defaultGetEventName */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const l_defaultGetEventName[16] = { - 0x44, 0x45, 0x46, 0x41, 0x55, 0x4C, 0x54, 0x5F, 0x47, 0x45, 0x54, 0x49, 0x54, 0x45, 0x4D, 0x00, -}; +SECTION_RODATA static char const l_defaultGetEventName[16] = "DEFAULT_GETITEM"; COMPILER_STRIP_GATE(0x8038FA38, &l_defaultGetEventName); #pragma pop /* 8038FA48-8038FA54 01C0A8 000C+00 0/0 0/0 0/0 .rodata l_crawlStartFrontOffset */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const l_crawlStartFrontOffset[12] = { - 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0xE0, 0x00, 0x00, -}; +SECTION_RODATA static float const l_crawlStartFrontOffset[3] = {0.0f, 30.0f, 112.0f}; COMPILER_STRIP_GATE(0x8038FA48, &l_crawlStartFrontOffset); #pragma pop @@ -9904,9 +6947,8 @@ SECTION_RODATA static u8 const l_wolfFootOnFrame[96] = { COMPILER_STRIP_GATE(0x8038FB5C, &l_wolfFootOnFrame); /* 8038FBBC-8038FBD4 01C21C 0018+00 1/1 0/0 0/0 .rodata l_insectNameList */ -SECTION_RODATA static u8 const l_insectNameList[24] = { - 0x01, 0x40, 0x01, 0x41, 0x01, 0x42, 0x01, 0x49, 0x01, 0x43, 0x01, 0x44, - 0x01, 0x45, 0x01, 0x46, 0x01, 0x4B, 0x01, 0x4A, 0x01, 0x47, 0x01, 0x48, +SECTION_RODATA static s16 const l_insectNameList[12] = { + 0x0140, 0x0141, 0x0142, 0x0149, 0x0143, 0x0144, 0x0145, 0x0146, 0x014B, 0x014A, 0x0147, 0x0148, }; COMPILER_STRIP_GATE(0x8038FBBC, &l_insectNameList); @@ -17605,14 +14647,15 @@ asm void daAlink_c::playerInit() { #pragma pop /* 800A54F4-800A551C 09FE34 0028+00 3/3 0/0 0/0 .text checkHorseStart__9daAlink_cFUli */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseStart(u32 param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseStart__9daAlink_cFUli.s" +BOOL daAlink_c::checkHorseStart(u32 pLastMode, int pStartMode) { + bool horseStart = false; + + if (pLastMode == 1 || pStartMode == 2 || pLastMode == 8) { + horseStart = true; + } + + return horseStart; } -#pragma pop /* 800A551C-800A5CC8 09FE5C 07AC+00 1/1 0/0 0/0 .text setStartProcInit__9daAlink_cFv */ #pragma push @@ -17885,7 +14928,7 @@ asm void daAlink_c::setBodyPartPos() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::setRollJump(f32 param_0, f32 param_1, s16 param_2) { +asm bool daAlink_c::setRollJump(f32 param_0, f32 param_1, s16 param_2) { nofralloc #include "asm/d/a/d_a_alink/setRollJump__9daAlink_cFffs.s" } @@ -18318,7 +15361,7 @@ asm void daAlink_c::setCollision() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getBaseAnimeFrame() const { +asm float daAlink_c::getBaseAnimeFrame() const { nofralloc #include "asm/d/a/d_a_alink/getBaseAnimeFrame__9daAlink_cCFv.s" } @@ -19032,14 +16075,27 @@ asm void daAlink_c::setSandShapeOffset() { #pragma pop /* 800B1FB8-800B1FD8 0AC8F8 0020+00 2/2 0/0 0/0 .text checkLv2MiddleBossBgRide__9daAlink_cFs */ +#ifdef NONMATCHING +bool daAlink_c::checkLv2MiddleBossBgRide(short param1) { + bool check = false; + + // beqlr needs to be beq + if (param1 != 0x7B && param1 == 0x7D) { + check = true; + } + + return check; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkLv2MiddleBossBgRide(s16 param_0) { +asm bool daAlink_c::checkLv2MiddleBossBgRide(s16 param_0) { nofralloc #include "asm/d/a/d_a_alink/checkLv2MiddleBossBgRide__9daAlink_cFs.s" } #pragma pop +#endif /* 800B1FD8-800B21EC 0AC918 0214+00 11/11 0/0 0/0 .text getSlidePolygon__9daAlink_cFP8cM3dGPla */ #pragma push @@ -19095,104 +16151,50 @@ asm void daAlink_c::setPlayerPosAndAngle(f32 (*param_0)[4]) { /* 800B25CC-800B25E8 0ACF0C 001C+00 16/16 0/0 0/0 .text itemTriggerCheck__9daAlink_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::itemTriggerCheck(u8 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/itemTriggerCheck__9daAlink_cFUc.s" +u32 daAlink_c::itemTriggerCheck(u8 pTrigger) { + field_0x2fae |= pTrigger; + return mItemTrigger & pTrigger; } -#pragma pop /* 800B25E8-800B2604 0ACF28 001C+00 11/11 0/0 0/0 .text itemButtonCheck__9daAlink_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::itemButtonCheck(u8 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/itemButtonCheck__9daAlink_cFUc.s" +u32 daAlink_c::itemButtonCheck(u8 pButton) { + field_0x2fae |= pButton; + return mItemButton & pButton; } -#pragma pop -/* 800B2604-800B2634 0ACF44 0030+00 13/13 0/0 0/0 .text itemButton__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::itemButton() { - nofralloc -#include "asm/d/a/d_a_alink/itemButton__9daAlink_cFv.s" +void daAlink_c::itemButton() { + itemButtonCheck(1 << mSelectItemId); } -#pragma pop -/* 800B2634-800B2664 0ACF74 0030+00 5/5 0/0 0/0 .text itemTrigger__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::itemTrigger() { - nofralloc -#include "asm/d/a/d_a_alink/itemTrigger__9daAlink_cFv.s" +void daAlink_c::itemTrigger() { + itemTriggerCheck(1 << mSelectItemId); } -#pragma pop -/* 800B2664-800B2688 0ACFA4 0024+00 5/5 0/0 0/0 .text spActionButton__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::spActionButton() { - nofralloc -#include "asm/d/a/d_a_alink/spActionButton__9daAlink_cFv.s" +void daAlink_c::spActionButton() { + itemButtonCheck(64); } -#pragma pop -/* 800B2688-800B26AC 0ACFC8 0024+00 2/2 0/0 0/0 .text spActionTrigger__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::spActionTrigger() { - nofralloc -#include "asm/d/a/d_a_alink/spActionTrigger__9daAlink_cFv.s" +void daAlink_c::spActionTrigger() { + itemTriggerCheck(64); } -#pragma pop -/* 800B26AC-800B26B8 0ACFEC 000C+00 1/1 0/0 0/0 .text midnaTalkTrigger__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::midnaTalkTrigger() const { - nofralloc -#include "asm/d/a/d_a_alink/midnaTalkTrigger__9daAlink_cCFv.s" +u32 daAlink_c::midnaTalkTrigger() const { + return mItemTrigger & 4; } -#pragma pop -/* 800B26B8-800B26DC 0ACFF8 0024+00 9/9 0/0 0/0 .text swordSwingTrigger__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::swordSwingTrigger() { - nofralloc -#include "asm/d/a/d_a_alink/swordSwingTrigger__9daAlink_cFv.s" +void daAlink_c::swordSwingTrigger() { + itemTriggerCheck(8); } -#pragma pop /* 800B26DC-800B26FC 0AD01C 0020+00 2/2 0/0 0/0 .text setItemActionButtonStatus__9daAlink_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setItemActionButtonStatus(u8 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setItemActionButtonStatus__9daAlink_cFUc.s" +void daAlink_c::setItemActionButtonStatus(u8 param_0) { + setRStatusEmphasys(param_0); } -#pragma pop /* 800B26FC-800B271C 0AD03C 0020+00 2/2 0/0 1/1 .text itemActionTrigger__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::itemActionTrigger() { - nofralloc -#include "asm/d/a/d_a_alink/itemActionTrigger__9daAlink_cFv.s" +void daAlink_c::itemActionTrigger() { + spActionTrigger(); } -#pragma pop /* 800B271C-800B2EA4 0AD05C 0788+00 1/1 0/0 0/0 .text setStickData__9daAlink_cFv */ #pragma push @@ -19442,34 +16444,19 @@ asm void daAlink_c::setJumpMode() { #pragma pop /* 800B4908-800B4918 0AF248 0010+00 0/0 0/0 1/1 .text getMetamorphoseNearDis__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getMetamorphoseNearDis() const { - nofralloc -#include "asm/d/a/d_a_alink/getMetamorphoseNearDis__9daAlink_cCFv.s" +float daAlink_c::getMetamorphoseNearDis() const { + return daAlinkHIO_basic_c0::m.mMetamorphoseNearDis; } -#pragma pop /* 800B4918-800B4928 0AF258 0010+00 0/0 0/0 1/1 .text getMetamorphoseFarDis__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getMetamorphoseFarDis() const { - nofralloc -#include "asm/d/a/d_a_alink/getMetamorphoseFarDis__9daAlink_cCFv.s" +float daAlink_c::getMetamorphoseFarDis() const { + return daAlinkHIO_basic_c0::m.mMetamorphoseFarDis; } -#pragma pop /* 800B4928-800B4938 0AF268 0010+00 0/0 0/0 1/1 .text getMetamorphoseFarAngle__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getMetamorphoseFarAngle() const { - nofralloc -#include "asm/d/a/d_a_alink/getMetamorphoseFarAngle__9daAlink_cCFv.s" +s16 daAlink_c::getMetamorphoseFarAngle() const { + return daAlinkHIO_basic_c0::m.mMetamorphoseFarAngle; } -#pragma pop /* 800B4938-800B4950 0AF278 0018+00 0/0 1/1 0/0 .text setMidnaMsg__9daAlink_cFv */ #pragma push @@ -19622,7 +16609,7 @@ SECTION_SDATA static f32 l_ladderAnmBaseTransY = 102.00054168701172f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkFrontWallTypeAction() { +asm BOOL daAlink_c::checkFrontWallTypeAction() { nofralloc #include "asm/d/a/d_a_alink/checkFrontWallTypeAction__9daAlink_cFv.s" } @@ -20024,7 +17011,7 @@ asm void daAlink_c::commonCheckNextAction(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkNextAction(int param_0) { +asm int daAlink_c::checkNextAction(int param_0) { nofralloc #include "asm/d/a/d_a_alink/checkNextAction__9daAlink_cFi.s" } @@ -20131,7 +17118,7 @@ asm void daAlink_c::checkMagicArmorHeavy() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkBootsOrArmorHeavy() const { +asm bool daAlink_c::checkBootsOrArmorHeavy() const { nofralloc #include "asm/d/a/d_a_alink/checkBootsOrArmorHeavy__9daAlink_cCFv.s" } @@ -20264,14 +17251,15 @@ asm void daAlink_c::startPeepChange() { /* 800BDE20-800BDE48 0B8760 0028+00 3/3 0/0 0/0 .text setLastSceneDamage__9daAlink_cFiPUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setLastSceneDamage(int param_0, u32* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setLastSceneDamage__9daAlink_cFiPUl.s" +void daAlink_c::setLastSceneDamage(int p1, u32* p2) { + if (p1 <= 0) { + return; + } + if (0x80 <= p1) { + p1 = 0x7f; + } + *p2 |= p1 << 4; } -#pragma pop /* 800BDE48-800BDF60 0B8788 0118+00 0/0 1/1 0/0 .text setLastSceneMode__9daAlink_cFPUl */ #pragma push @@ -20672,7 +17660,7 @@ asm void daAlink_c::checkDungeon() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkCastleTown() { +asm bool daAlink_c::checkCastleTown() { nofralloc #include "asm/d/a/d_a_alink/checkCastleTown__9daAlink_cFv.s" } @@ -20729,7 +17717,7 @@ asm void daAlink_c::checkRoomSpecial() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkRoom() { +asm bool daAlink_c::checkRoom() { nofralloc #include "asm/d/a/d_a_alink/checkRoom__9daAlink_cFv.s" } @@ -20737,14 +17725,26 @@ asm void daAlink_c::checkRoom() { /* 800C0594-800C05DC 0BAED4 0048+00 8/8 0/0 0/0 .text checkNotBattleStage__9daAlink_cFv */ +#ifdef NONMATCHING +bool daAlink_c::checkNotBattleStage(void) { + bool isNotBattleStage = false; + + if (checkRoom() || checkCastleTown()) { + isNotBattleStage = true; + } + + return isNotBattleStage; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkNotBattleStage() { +asm bool daAlink_c::checkNotBattleStage() { nofralloc #include "asm/d/a/d_a_alink/checkNotBattleStage__9daAlink_cFv.s" } #pragma pop +#endif /* 800C05DC-800C0630 0BAF1C 0054+00 2/2 0/0 0/0 .text checkNotHeavyBootsStage__9daAlink_cFv */ #pragma push @@ -20867,24 +17867,22 @@ asm void daAlink_c::setFrontRollCrashShock(u8 param_0) { #pragma pop /* 800C1DAC-800C1DE0 0BC6EC 0034+00 1/0 0/0 0/0 .text getModelJointMtx__9daAlink_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getModelJointMtx(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/getModelJointMtx__9daAlink_cFUs.s" +Mtx* daAlink_c::getModelJointMtx(u16 param_0) { + if (param_0 >= field_0x30c6) { + return &field_0x0650->mBaseTransformMtx; + } + return field_0x0650->i_getAnmMtx(param_0); } -#pragma pop /* 800C1DE0-800C1E0C 0BC720 002C+00 1/0 0/0 0/0 .text onFrollCrashFlg__9daAlink_cFUci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::onFrollCrashFlg(u8 param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/onFrollCrashFlg__9daAlink_cFUci.s" +void daAlink_c::onFrollCrashFlg(u8 param_0, int param_1) { + if (param_1 != 0) { + i_onNoResetFlg0(UnkFrollCrashFlg2); + } else { + i_onNoResetFlg0(UnkFrollCrashFlg1); + } + field_0x2fa4 = param_0; } -#pragma pop /* ############################################################################################## */ /* 804532D8-804532DC -00001 0004+00 1/1 0/0 0/0 .sdata2 @72043 */ @@ -20917,17 +17915,45 @@ asm void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC param_0) { /* 800C2DA4-800C2DDC 0BD6E4 0038+00 121/121 0/0 0/0 .text * commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::commonProcInitNotSameProc(daAlink_c::daAlink_PROC param_0) { - nofralloc -#include "asm/d/a/d_a_alink/commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC.s" +BOOL daAlink_c::commonProcInitNotSameProc(daAlink_PROC pProcAction) { + if (mActionID == pProcAction) { + return false; + } else { + commonProcInit(pProcAction); + return true; + } } -#pragma pop /* 800C2DDC-800C2EAC 0BD71C 00D0+00 17/17 0/0 0/0 .text * procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c */ +#ifdef NONMATCHING +void daAlink_c::procPreActionUnequipInit(int param_0, fopAc_ac_c* param_1) { + commonProcInit(ACT_PREACTION_UNEQUIP); + mNormalSpeed = 0.0f; + setBlendMoveAnime(4.0f); + allUnequip(0); + field_0x3010 = 0; + + if (param_1 == NULL) { + field_0x300e = 0; + } else { + field_0x280c.setData(param_1); + field_0x300e = 1; + if (fopAcM_GetName(param_1) == 0x2cb) { + if (field_0x2fdc == 0x48) { + field_0x3010 = 1; + } else { + if (i_checkNoResetFlg2(1) != 0) { + offKandelaarModel(); + } + } + } + } + + field_0x3198 = param_0; + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -20936,6 +17962,7 @@ asm void daAlink_c::procPreActionUnequipInit(int param_0, fopAc_ac_c* param_1) { #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 */ @@ -20950,14 +17977,25 @@ asm void daAlink_c::procPreActionUnequip() { /* 800C3098-800C30F0 0BD9D8 0058+00 1/1 0/0 0/0 .text procServiceWaitInit__9daAlink_cFv */ +#ifdef NONMATCHING +bool daAlink_c::procServiceWaitInit() { + commonProcInit(SERVICE_WAIT); + setSingleAnimeBase(0x90); + mNormalSpeed = 0.0f; + mNext.mAngle.mY = mCollisionRot.mY; + field_0x2f98 = 4; + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procServiceWaitInit() { +asm bool daAlink_c::procServiceWaitInit() { nofralloc #include "asm/d/a/d_a_alink/procServiceWaitInit__9daAlink_cFv.s" } #pragma pop +#endif /* 800C30F0-800C3224 0BDA30 0134+00 1/0 0/0 0/0 .text procServiceWait__9daAlink_cFv */ #pragma push @@ -21040,14 +18078,14 @@ asm void daAlink_c::procAtnMoveInit() { #pragma pop /* 800C3868-800C38CC 0BE1A8 0064+00 1/0 0/0 0/0 .text procAtnMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procAtnMove() { - nofralloc -#include "asm/d/a/d_a_alink/procAtnMove__9daAlink_cFv.s" +bool daAlink_c::procAtnMove() { + if (!checkNextAction(0)) { + if (field_0x2f98 != 0 || !checkFrontWallTypeAction()) { + setBlendAtnMoveAnime(lit_6041); + } + } + return true; } -#pragma pop /* 800C38CC-800C397C 0BE20C 00B0+00 4/4 0/0 0/0 .text procAtnActorWaitInit__9daAlink_cFv */ @@ -21733,14 +18771,9 @@ asm void daAlink_c::execute() { #pragma pop /* 800CAFA8-800CAFC8 0C58E8 0020+00 1/0 0/0 0/0 .text daAlink_Execute__FP9daAlink_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_Execute(daAlink_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_Execute__FP9daAlink_c.s" +static void daAlink_Execute(daAlink_c* pLinkPtr) { + pLinkPtr->execute(); } -#pragma pop /* 800CAFC8-800CB480 0C5908 04B8+00 2/2 0/0 0/0 .text setDrawHand__9daAlink_cFv */ #pragma push @@ -22113,70 +19146,45 @@ asm void daAlink_c::procCoPeepSubjectivity() { #pragma pop /* 800CF25C-800CF270 0C9B9C 0014+00 1/0 0/0 0/0 .text checkBoardRide__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBoardRide() const { - nofralloc -#include "asm/d/a/d_a_alink/checkBoardRide__9daAlink_cCFv.s" +u32 daAlink_c::checkBoardRide() const { + return mRideStatus == 4; } -#pragma pop /* 800CF270-800CF284 0C9BB0 0014+00 1/0 0/0 0/0 .text checkCanoeRide__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCanoeRide() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCanoeRide__9daAlink_cCFv.s" +u32 daAlink_c::checkCanoeRide() const { + return mRideStatus == 3; } -#pragma pop /* 800CF284-800CF298 0C9BC4 0014+00 1/0 0/0 0/0 .text checkHorseRide__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseRide() const { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseRide__9daAlink_cCFv.s" +u32 daAlink_c::checkHorseRide() const { + return mRideStatus == 1; } -#pragma pop /* 800CF298-800CF2B4 0C9BD8 001C+00 1/0 0/0 0/0 .text getLeftItemMatrix__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getLeftItemMatrix() { +asm Mtx* daAlink_c::getLeftItemMatrix() { nofralloc #include "asm/d/a/d_a_alink/getLeftItemMatrix__9daAlink_cFv.s" } #pragma pop /* 800CF2B4-800CF2C8 0C9BF4 0014+00 1/0 0/0 0/0 .text checkBoarRide__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBoarRide() const { - nofralloc -#include "asm/d/a/d_a_alink/checkBoarRide__9daAlink_cCFv.s" +u32 daAlink_c::checkBoarRide() const { + return mRideStatus == 2; } -#pragma pop /* 800CF2C8-800CF2DC 0C9C08 0014+00 1/0 0/0 0/0 .text checkSpinnerRide__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSpinnerRide() const { - nofralloc -#include "asm/d/a/d_a_alink/checkSpinnerRide__9daAlink_cCFv.s" +u32 daAlink_c::checkSpinnerRide() const { + return mRideStatus == 5; } -#pragma pop /* 800CF2DC-800CF2F8 0C9C1C 001C+00 1/0 0/0 0/0 .text getLeftHandMatrix__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getLeftHandMatrix() { +asm Mtx* daAlink_c::getLeftHandMatrix() { nofralloc #include "asm/d/a/d_a_alink/getLeftHandMatrix__9daAlink_cFv.s" } @@ -22186,7 +19194,7 @@ asm void daAlink_c::getLeftHandMatrix() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getRightHandMatrix() { +asm Mtx* daAlink_c::getRightHandMatrix() { nofralloc #include "asm/d/a/d_a_alink/getRightHandMatrix__9daAlink_cFv.s" } @@ -22207,7 +19215,7 @@ asm void daAlink_c::onSceneChangeArea(u8 param_0, u8 param_1, fopAc_ac_c* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getRightItemMatrix() { +asm Mtx* daAlink_c::getRightItemMatrix() { nofralloc #include "asm/d/a/d_a_alink/getRightItemMatrix__9daAlink_cFv.s" } @@ -22217,7 +19225,7 @@ asm void daAlink_c::getRightItemMatrix() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkPlayerNoDraw() { +asm bool daAlink_c::checkPlayerNoDraw() { nofralloc #include "asm/d/a/d_a_alink/checkPlayerNoDraw__9daAlink_cFv.s" } @@ -22234,14 +19242,7 @@ asm daAlink_c::daAlink_c() { #pragma pop /* 800CFC3C-800CFC78 0CA57C 003C+00 2/2 0/0 0/0 .text __dt__Q29daAlink_c14firePointEff_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daAlink_c::firePointEff_c::~firePointEff_c() { - nofralloc -#include "asm/d/a/d_a_alink/__dt__Q29daAlink_c14firePointEff_cFv.s" -} -#pragma pop +daAlink_c::firePointEff_c::~firePointEff_c() {} /* 800CFC78-800CFC7C 0CA5B8 0004+00 1/1 0/0 0/0 .text __ct__Q29daAlink_c14firePointEff_cFv */ daAlink_c::firePointEff_c::firePointEff_c() { @@ -22249,24 +19250,10 @@ daAlink_c::firePointEff_c::firePointEff_c() { } /* 800CFC7C-800CFCB8 0CA5BC 003C+00 0/0 2/2 0/0 .text __dt__15LIGHT_INFLUENCEFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm LIGHT_INFLUENCE::~LIGHT_INFLUENCE() { - nofralloc -#include "asm/d/a/d_a_alink/__dt__15LIGHT_INFLUENCEFv.s" -} -#pragma pop +LIGHT_INFLUENCE::~LIGHT_INFLUENCE() {} /* 800CFCB8-800CFCF4 0CA5F8 003C+00 2/2 0/0 0/0 .text __dt__18daAlink_footData_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daAlink_footData_c::~daAlink_footData_c() { - nofralloc -#include "asm/d/a/d_a_alink/__dt__18daAlink_footData_cFv.s" -} -#pragma pop +daAlink_footData_c::~daAlink_footData_c() {} /* 800CFCF4-800CFCF8 0CA634 0004+00 1/1 0/0 0/0 .text __ct__18daAlink_footData_cFv */ daAlink_footData_c::daAlink_footData_c() { @@ -22274,14 +19261,7 @@ daAlink_footData_c::daAlink_footData_c() { } /* 800CFCF8-800CFD58 0CA638 0060+00 1/0 0/0 0/0 .text __dt__29dAlink_bottleWaterPcallBack_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dAlink_bottleWaterPcallBack_c::~dAlink_bottleWaterPcallBack_c() { - nofralloc -#include "asm/d/a/d_a_alink/__dt__29dAlink_bottleWaterPcallBack_cFv.s" -} -#pragma pop +dAlink_bottleWaterPcallBack_c::~dAlink_bottleWaterPcallBack_c() {} /* 800CFD58-800CFDF4 0CA698 009C+00 1/0 0/0 0/0 .text __dt__14daAlink_blur_cFv */ #pragma push @@ -22304,24 +19284,12 @@ asm daAlink_sight_c::~daAlink_sight_c() { #pragma pop /* 800CFE68-800CFEB0 0CA7A8 0048+00 1/0 0/0 0/0 .text __dt__20daAlink_lockCursor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daAlink_lockCursor_c::~daAlink_lockCursor_c() { - nofralloc -#include "asm/d/a/d_a_alink/__dt__20daAlink_lockCursor_cFv.s" -} -#pragma pop +daAlink_lockCursor_c::~daAlink_lockCursor_c() {} /* 800CFEB0-800CFEC4 0CA7F0 0014+00 1/1 0/0 0/0 .text checkRideOn__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkRideOn() const { - nofralloc -#include "asm/d/a/d_a_alink/checkRideOn__9daAlink_cCFv.s" +BOOL daAlink_c::checkRideOn() const { + return mRideStatus != 0; } -#pragma pop /* 800CFEC4-800CFEF4 0CA804 0030+00 1/1 0/0 0/0 .text dComIfGp_att_getCatghTarget__Fv */ #pragma push @@ -22334,14 +19302,11 @@ static asm void dComIfGp_att_getCatghTarget() { #pragma pop /* 800CFEF4-800CFF2C 0CA834 0038+00 1/1 0/0 0/0 .text mDoAud_setLinkHp__Fll */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void mDoAud_setLinkHp(s32 param_0, s32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/mDoAud_setLinkHp__Fll.s" +static void mDoAud_setLinkHp(s32 param_0, s32 param_1) { + if (Z2GetLink() != NULL) { + Z2GetLink()->setLinkHp(param_0, param_1); + } } -#pragma pop /* 800CFF2C-800CFF3C 0CA86C 0010+00 1/1 0/0 0/0 .text dComIfGs_getLife__Fv */ #pragma push @@ -22367,7 +19332,7 @@ static asm void dComIfGp_getRStatus() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkAttentionLock() { +asm BOOL daAlink_c::checkAttentionLock() { nofralloc #include "asm/d/a/d_a_alink/checkAttentionLock__9daAlink_cFv.s" } @@ -22397,7 +19362,7 @@ static asm void cMtx_multVec(f32 const (*param_0)[4], Vec const* param_1, Vec* p #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DModel::getAnmMtx(int param_0) { +asm Mtx* J3DModel::getAnmMtx(int param_0) { nofralloc #include "asm/d/a/d_a_alink/getAnmMtx__8J3DModelFi.s" } @@ -22414,24 +19379,19 @@ asm void J3DModel::setBaseTRMtx(f32 (*param_0)[4]) { #pragma pop /* 800D0020-800D0048 0CA960 0028+00 1/1 0/0 0/0 .text checkFmChainGrabAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkFmChainGrabAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkFmChainGrabAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkFmChainGrabAnime() const { + bool fmChainGrab = false; + + if (checkUpperAnime(ANM_HUMAN_CHAIN_GRAB) || checkUpperAnime(ANM_WOLF_CHAIN_GRAB)) { + fmChainGrab = true; + } + return fmChainGrab; } -#pragma pop /* 800D0048-800D005C 0CA988 0014+00 1/1 0/0 0/0 .text checkSmallUpperGuardAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSmallUpperGuardAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkSmallUpperGuardAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkSmallUpperGuardAnime() const { + return checkUpperAnime(ANM_SMALL_GUARD); } -#pragma pop /* 800D005C-800D008C 0CA99C 0030+00 1/1 0/0 0/0 .text dComIfGp_evmng_startCheck__FPCc */ #pragma push @@ -22444,14 +19404,11 @@ static asm void dComIfGp_evmng_startCheck(char const* param_0) { #pragma pop /* 800D008C-800D00BC 0CA9CC 0030+00 1/1 0/0 0/0 .text mDoAud_setLinkGroupInfo__FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void mDoAud_setLinkGroupInfo(u8 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/mDoAud_setLinkGroupInfo__FUc.s" +static void mDoAud_setLinkGroupInfo(u8 param_0) { + if (Z2GetLink() != NULL) { + Z2GetLink()->setLinkGroupInfo(param_0); + } } -#pragma pop /* 800D00BC-800D00D0 0CA9FC 0014+00 1/1 0/0 0/0 .text getAnm__25mDoExt_MtxCalcAnmBlendTblFi */ #pragma push @@ -22484,35 +19441,42 @@ asm void dBgS_Acch::ClrGroundHit() { #pragma pop /* 800D00EC-800D0110 0CAA2C 0024+00 1/1 0/0 0/0 .text checkReinRide__9daAlink_cCFv */ +// regalloc +#ifdef NONMATCHING +BOOL daAlink_c::checkReinRide() const { + bool reinRide = false; + + if (mRideStatus == 1 || mRideStatus == 2) { + reinRide = true; + } + return reinRide; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkReinRide() const { +asm BOOL daAlink_c::checkReinRide() const { nofralloc #include "asm/d/a/d_a_alink/checkReinRide__9daAlink_cCFv.s" } #pragma pop +#endif /* 800D0110-800D0138 0CAA50 0028+00 1/1 0/0 0/0 .text checkWolfEnemyThrowAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfEnemyThrowAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfEnemyThrowAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkWolfEnemyThrowAnime() const { + bool wolfEnemyThrowAnime = false; + + if (checkUpperAnime(ANM_WOLF_ENEMY_THROW_LEFT) || checkUpperAnime(ANM_WOLF_ENEMY_THROW_RIGHT)) { + wolfEnemyThrowAnime = true; + } + return wolfEnemyThrowAnime; } -#pragma pop /* 800D0138-800D014C 0CAA78 0014+00 1/1 0/0 0/0 .text checkSpecialDemoMode__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSpecialDemoMode() const { - nofralloc -#include "asm/d/a/d_a_alink/checkSpecialDemoMode__9daAlink_cCFv.s" +u16 daAlink_c::checkSpecialDemoMode() const { + return mDemo.getDemoType() == 5; } -#pragma pop /* 800D014C-800D0164 0CAA8C 0018+00 1/1 0/0 0/0 .text setMidnaTalkStatus__9daAlink_cFUc */ @@ -22546,40 +19510,25 @@ asm void daAlink_matAnm_c::offSetFlg() { #pragma pop /* 800D018C-800D0198 0CAACC 000C+00 1/1 0/0 0/0 .text checkModeFlg__9daAlink_cCFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkModeFlg(u32 param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkModeFlg__9daAlink_cCFUl.s" +u32 daAlink_c::checkModeFlg(u32 pFlag) const { + return mModeFlg & pFlag; } -#pragma pop /* 800D0198-800D01A0 0CAAD8 0008+00 1/0 0/0 0/0 .text getShieldChangeWaitTimer__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getShieldChangeWaitTimer() const { - nofralloc -#include "asm/d/a/d_a_alink/getShieldChangeWaitTimer__9daAlink_cCFv.s" +u8 daAlink_c::getShieldChangeWaitTimer() const { + return mShieldChangeWaitTimer; } -#pragma pop /* 800D01A0-800D01A8 0CAAE0 0008+00 1/0 0/0 0/0 .text getClothesChangeWaitTimer__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getClothesChangeWaitTimer() const { - nofralloc -#include "asm/d/a/d_a_alink/getClothesChangeWaitTimer__9daAlink_cCFv.s" +u8 daAlink_c::getClothesChangeWaitTimer() const { + return mClothesChangeWaitTimer; } -#pragma pop /* 800D01A8-800D01E0 0CAAE8 0038+00 1/0 0/0 0/0 .text checkHorseStart__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkHorseStart() { +asm bool daAlink_c::checkHorseStart() { nofralloc #include "asm/d/a/d_a_alink/checkHorseStart__9daAlink_cFv.s" } @@ -22587,72 +19536,55 @@ asm void daAlink_c::checkHorseStart() { /* 800D01E0-800D0208 0CAB20 0028+00 1/0 0/0 0/0 .text checkCutTurnCharge__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutTurnCharge() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCutTurnCharge__9daAlink_cCFv.s" +BOOL daAlink_c::checkCutTurnCharge() const { + bool cutTurnCharge = false; + + if (mActionID == CUT_TURN_MOVE && mCommonCounter == 0) { + cutTurnCharge = true; + } + return cutTurnCharge; } -#pragma pop /* 800D0208-800D0228 0CAB48 0020+00 1/0 0/0 0/0 .text checkAcceptDungeonWarpAlink__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkAcceptDungeonWarpAlink(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkAcceptDungeonWarpAlink__9daAlink_cFi.s" +void daAlink_c::checkAcceptDungeonWarpAlink(int param_0) { + checkAcceptWarp(); } -#pragma pop /* 800D0228-800D0274 0CAB68 004C+00 1/0 0/0 0/0 .text getSpinnerActor__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getSpinnerActor() { - nofralloc -#include "asm/d/a/d_a_alink/getSpinnerActor__9daAlink_cFv.s" +fopAc_ac_c* daAlink_c::getSpinnerActor() { + fopAc_ac_c* spinnerActor; + + if (!checkSpinnerRide()) { + spinnerActor = NULL; + } else { + spinnerActor = mRideActor.getActor(); + } + return spinnerActor; } -#pragma pop /* 800D0274-800D027C 0CABB4 0008+00 1/0 0/0 0/0 .text getSumouCounter__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getSumouCounter() const { - nofralloc -#include "asm/d/a/d_a_alink/getSumouCounter__9daAlink_cCFv.s" +s16 daAlink_c::getSumouCounter() const { + return mCommonCounter; } -#pragma pop /* 800D027C-800D0284 0CABBC 0008+00 1/0 0/0 0/0 .text checkSumouWithstand__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSumouWithstand() const { - nofralloc -#include "asm/d/a/d_a_alink/checkSumouWithstand__9daAlink_cCFv.s" +s16 daAlink_c::checkSumouWithstand() const { + return field_0x300e; } -#pragma pop /* 800D0284-800D0290 0CABC4 000C+00 1/0 0/0 0/0 .text setMidnaMsgNum__9daAlink_cFP10fopAc_ac_cUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setMidnaMsgNum(fopAc_ac_c* param_0, u16 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setMidnaMsgNum__9daAlink_cFP10fopAc_ac_cUs.s" +void daAlink_c::setMidnaMsgNum(fopAc_ac_c* param_0, u16 pMsgNum) { + mMidnaMsgNum = pMsgNum; + field_0x2800 = param_0; } -#pragma pop /* 800D0290-800D029C 0CABD0 000C+00 1/0 0/0 0/0 .text getModelMtx__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getModelMtx() { +asm Mtx* daAlink_c::getModelMtx() { nofralloc #include "asm/d/a/d_a_alink/getModelMtx__9daAlink_cFv.s" } @@ -22662,7 +19594,7 @@ asm void daAlink_c::getModelMtx() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getInvMtx() { +asm Mtx* daAlink_c::getInvMtx() { nofralloc #include "asm/d/a/d_a_alink/getInvMtx__9daAlink_cFv.s" } @@ -22672,7 +19604,7 @@ asm void daAlink_c::getInvMtx() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getLinkBackBone1Matrix() { +asm Mtx* daAlink_c::getLinkBackBone1Matrix() { nofralloc #include "asm/d/a/d_a_alink/getLinkBackBone1Matrix__9daAlink_cFv.s" } @@ -22682,7 +19614,7 @@ asm void daAlink_c::getLinkBackBone1Matrix() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getWolfMouthMatrix() { +asm Mtx* daAlink_c::getWolfMouthMatrix() { nofralloc #include "asm/d/a/d_a_alink/getWolfMouthMatrix__9daAlink_cFv.s" } @@ -22692,7 +19624,7 @@ asm void daAlink_c::getWolfMouthMatrix() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getWolfBackbone2Matrix() { +asm Mtx* daAlink_c::getWolfBackbone2Matrix() { nofralloc #include "asm/d/a/d_a_alink/getWolfBackbone2Matrix__9daAlink_cFv.s" } @@ -22702,7 +19634,7 @@ asm void daAlink_c::getWolfBackbone2Matrix() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getBottleMtx() { +asm bool daAlink_c::getBottleMtx() { nofralloc #include "asm/d/a/d_a_alink/getBottleMtx__9daAlink_cFv.s" } @@ -22712,98 +19644,63 @@ asm void daAlink_c::getBottleMtx() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getHeadMtx() { +asm bool daAlink_c::getHeadMtx() { nofralloc #include "asm/d/a/d_a_alink/getHeadMtx__9daAlink_cFv.s" } #pragma pop /* 800D0350-800D0358 0CAC90 0008+00 1/0 0/0 0/0 .text getGroundY__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getGroundY() { - nofralloc -#include "asm/d/a/d_a_alink/getGroundY__9daAlink_cFv.s" +float daAlink_c::getGroundY() { + return mLinkAcch.GetGroundH(); } -#pragma pop /* 800D0358-800D0360 0CAC98 0008+00 1/0 0/0 0/0 .text getBaseAnimeFrameRate__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBaseAnimeFrameRate() const { - nofralloc -#include "asm/d/a/d_a_alink/getBaseAnimeFrameRate__9daAlink_cCFv.s" +float daAlink_c::getBaseAnimeFrameRate() const { + return mFrameCtrl1[0].getRate(); } -#pragma pop /* 800D0360-800D0368 0CACA0 0008+00 1/0 0/0 0/0 .text getAtnActorID__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getAtnActorID() const { - nofralloc -#include "asm/d/a/d_a_alink/getAtnActorID__9daAlink_cCFv.s" +s32 daAlink_c::getAtnActorID() const { + return mAtnActorID; } -#pragma pop /* 800D0368-800D0370 0CACA8 0008+00 1/0 0/0 0/0 .text getItemID__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getItemID() const { - nofralloc -#include "asm/d/a/d_a_alink/getItemID__9daAlink_cCFv.s" +s32 daAlink_c::getItemID() const { + return mItemActor.getID(); } -#pragma pop /* 800D0370-800D038C 0CACB0 001C+00 1/0 0/0 0/0 .text getGrabActorID__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getGrabActorID() const { - nofralloc -#include "asm/d/a/d_a_alink/getGrabActorID__9daAlink_cCFv.s" +s32 daAlink_c::getGrabActorID() const { + if (field_0x2fdc == 0x102) { + return mItemActor.getID(); + } else { + return field_0x282c.getID(); + } } -#pragma pop /* 800D038C-800D03B4 0CACCC 0028+00 1/0 0/0 0/0 .text setForcePutPos__9daAlink_cFRC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setForcePutPos(cXyz const& param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setForcePutPos__9daAlink_cFRC4cXyz.s" +void daAlink_c::setForcePutPos(cXyz const& pPutPos) { + mForcePutPos = pPutPos; + i_onEndResetFlg1(UnkForcePutPos); } -#pragma pop /* 800D03B4-800D03C8 0CACF4 0014+00 1/0 0/0 0/0 .text checkPlayerFly__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkPlayerFly() const { - nofralloc -#include "asm/d/a/d_a_alink/checkPlayerFly__9daAlink_cCFv.s" +u32 daAlink_c::checkPlayerFly() const { + return i_checkModeFlg(PLAYER_FLY); } -#pragma pop /* 800D03C8-800D03DC 0CAD08 0014+00 1/0 0/0 0/0 .text checkFrontRoll__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkFrontRoll() const { - nofralloc -#include "asm/d/a/d_a_alink/checkFrontRoll__9daAlink_cCFv.s" +BOOL daAlink_c::checkFrontRoll() const { + return mActionID == FRONT_ROLL; } -#pragma pop /* 800D03DC-800D03F0 0CAD1C 0014+00 1/0 0/0 0/0 .text checkWolfDash__9daAlink_cCFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfDash() const { +asm bool daAlink_c::checkWolfDash() const { nofralloc #include "asm/d/a/d_a_alink/checkWolfDash__9daAlink_cCFv.s" } @@ -22813,7 +19710,7 @@ asm void daAlink_c::checkWolfDash() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkAutoJump() const { +asm bool daAlink_c::checkAutoJump() const { nofralloc #include "asm/d/a/d_a_alink/checkAutoJump__9daAlink_cCFv.s" } @@ -22823,7 +19720,7 @@ asm void daAlink_c::checkAutoJump() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkSideStep() const { +asm bool daAlink_c::checkSideStep() const { nofralloc #include "asm/d/a/d_a_alink/checkSideStep__9daAlink_cCFv.s" } @@ -22834,7 +19731,7 @@ asm void daAlink_c::checkSideStep() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfTriggerJump() const { +asm bool daAlink_c::checkWolfTriggerJump() const { nofralloc #include "asm/d/a/d_a_alink/checkWolfTriggerJump__9daAlink_cCFv.s" } @@ -22845,7 +19742,7 @@ asm void daAlink_c::checkWolfTriggerJump() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkGuardBreakMode() const { +asm bool daAlink_c::checkGuardBreakMode() const { nofralloc #include "asm/d/a/d_a_alink/checkGuardBreakMode__9daAlink_cCFv.s" } @@ -22855,7 +19752,7 @@ asm void daAlink_c::checkGuardBreakMode() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkLv3Slide() const { +asm bool daAlink_c::checkLv3Slide() const { nofralloc #include "asm/d/a/d_a_alink/checkLv3Slide__9daAlink_cCFv.s" } @@ -22865,7 +19762,7 @@ asm void daAlink_c::checkLv3Slide() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfHowlDemoMode() const { +asm bool daAlink_c::checkWolfHowlDemoMode() const { nofralloc #include "asm/d/a/d_a_alink/checkWolfHowlDemoMode__9daAlink_cCFv.s" } @@ -22875,7 +19772,7 @@ asm void daAlink_c::checkWolfHowlDemoMode() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkElecDamage() const { +asm bool daAlink_c::checkElecDamage() const { nofralloc #include "asm/d/a/d_a_alink/checkElecDamage__9daAlink_cCFv.s" } @@ -22885,7 +19782,7 @@ asm void daAlink_c::checkElecDamage() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkEmptyBottleSwing() const { +asm bool daAlink_c::checkEmptyBottleSwing() const { nofralloc #include "asm/d/a/d_a_alink/checkEmptyBottleSwing__9daAlink_cCFv.s" } @@ -22896,7 +19793,7 @@ asm void daAlink_c::checkEmptyBottleSwing() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkBottleSwingMode() const { +asm bool daAlink_c::checkBottleSwingMode() const { nofralloc #include "asm/d/a/d_a_alink/checkBottleSwingMode__9daAlink_cCFv.s" } @@ -22906,7 +19803,7 @@ asm void daAlink_c::checkBottleSwingMode() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkHawkWait() const { +asm bool daAlink_c::checkHawkWait() const { nofralloc #include "asm/d/a/d_a_alink/checkHawkWait__9daAlink_cCFv.s" } @@ -22916,7 +19813,7 @@ asm void daAlink_c::checkHawkWait() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkGoatThrow() const { +asm bool daAlink_c::checkGoatThrow() const { nofralloc #include "asm/d/a/d_a_alink/checkGoatThrow__9daAlink_cCFv.s" } @@ -22927,7 +19824,7 @@ asm void daAlink_c::checkGoatThrow() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkGoatThrowAfter() const { +asm bool daAlink_c::checkGoatThrowAfter() const { nofralloc #include "asm/d/a/d_a_alink/checkGoatThrowAfter__9daAlink_cCFv.s" } @@ -22938,7 +19835,7 @@ asm void daAlink_c::checkGoatThrowAfter() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfTagLockJump() const { +asm bool daAlink_c::checkWolfTagLockJump() const { nofralloc #include "asm/d/a/d_a_alink/checkWolfTagLockJump__9daAlink_cCFv.s" } @@ -22948,7 +19845,7 @@ asm void daAlink_c::checkWolfTagLockJump() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfTagLockJumpLand() const { +asm bool daAlink_c::checkWolfTagLockJumpLand() const { nofralloc #include "asm/d/a/d_a_alink/checkWolfTagLockJumpLand__9daAlink_cCFv.s" } @@ -22958,7 +19855,7 @@ asm void daAlink_c::checkWolfTagLockJumpLand() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfRopeHang() const { +asm bool daAlink_c::checkWolfRopeHang() const { nofralloc #include "asm/d/a/d_a_alink/checkWolfRopeHang__9daAlink_cCFv.s" } @@ -22968,7 +19865,7 @@ asm void daAlink_c::checkWolfRopeHang() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkRollJump() const { +asm bool daAlink_c::checkRollJump() const { nofralloc #include "asm/d/a/d_a_alink/checkRollJump__9daAlink_cCFv.s" } @@ -22979,7 +19876,7 @@ asm void daAlink_c::checkRollJump() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkGoronRideWait() const { +asm bool daAlink_c::checkGoronRideWait() const { nofralloc #include "asm/d/a/d_a_alink/checkGoronRideWait__9daAlink_cCFv.s" } @@ -22989,7 +19886,7 @@ asm void daAlink_c::checkGoronRideWait() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfChain() const { +asm bool daAlink_c::checkWolfChain() const { nofralloc #include "asm/d/a/d_a_alink/checkWolfChain__9daAlink_cCFv.s" } @@ -22999,7 +19896,7 @@ asm void daAlink_c::checkWolfChain() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfWait() const { +asm bool daAlink_c::checkWolfWait() const { nofralloc #include "asm/d/a/d_a_alink/checkWolfWait__9daAlink_cCFv.s" } @@ -23010,7 +19907,7 @@ asm void daAlink_c::checkWolfWait() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfJumpAttack() const { +asm bool daAlink_c::checkWolfJumpAttack() const { nofralloc #include "asm/d/a/d_a_alink/checkWolfJumpAttack__9daAlink_cCFv.s" } @@ -23020,7 +19917,7 @@ asm void daAlink_c::checkWolfJumpAttack() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfRSit() const { +asm bool daAlink_c::checkWolfRSit() const { nofralloc #include "asm/d/a/d_a_alink/checkWolfRSit__9daAlink_cCFv.s" } @@ -23031,7 +19928,7 @@ asm void daAlink_c::checkWolfRSit() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkBottleDrinkEnd() const { +asm bool daAlink_c::checkBottleDrinkEnd() const { nofralloc #include "asm/d/a/d_a_alink/checkBottleDrinkEnd__9daAlink_cCFv.s" } @@ -23041,7 +19938,7 @@ asm void daAlink_c::checkBottleDrinkEnd() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfDig() const { +asm bool daAlink_c::checkWolfDig() const { nofralloc #include "asm/d/a/d_a_alink/checkWolfDig__9daAlink_cCFv.s" } @@ -23051,7 +19948,7 @@ asm void daAlink_c::checkWolfDig() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkCutCharge() const { +asm bool daAlink_c::checkCutCharge() const { nofralloc #include "asm/d/a/d_a_alink/checkCutCharge__9daAlink_cCFv.s" } @@ -23061,7 +19958,7 @@ asm void daAlink_c::checkCutCharge() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkCutLargeJumpCharge() const { +asm bool daAlink_c::checkCutLargeJumpCharge() const { nofralloc #include "asm/d/a/d_a_alink/checkCutLargeJumpCharge__9daAlink_cCFv.s" } @@ -23071,7 +19968,7 @@ asm void daAlink_c::checkCutLargeJumpCharge() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkComboCutTurn() const { +asm bool daAlink_c::checkComboCutTurn() const { nofralloc #include "asm/d/a/d_a_alink/checkComboCutTurn__9daAlink_cCFv.s" } @@ -23081,7 +19978,7 @@ asm void daAlink_c::checkComboCutTurn() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkClimbMove() const { +asm bool daAlink_c::checkClimbMove() const { nofralloc #include "asm/d/a/d_a_alink/checkClimbMove__9daAlink_cCFv.s" } @@ -23091,7 +19988,7 @@ asm void daAlink_c::checkClimbMove() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkGrassWhistle() const { +asm bool daAlink_c::checkGrassWhistle() const { nofralloc #include "asm/d/a/d_a_alink/checkGrassWhistle__9daAlink_cCFv.s" } @@ -23101,7 +19998,7 @@ asm void daAlink_c::checkGrassWhistle() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkBoarRun() const { +asm bool daAlink_c::checkBoarRun() const { nofralloc #include "asm/d/a/d_a_alink/checkBoarRun__9daAlink_cCFv.s" } @@ -23111,7 +20008,7 @@ asm void daAlink_c::checkBoarRun() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkHorseRideNotReady() const { +asm bool daAlink_c::checkHorseRideNotReady() const { nofralloc #include "asm/d/a/d_a_alink/checkHorseRideNotReady__9daAlink_cCFv.s" } @@ -23132,7 +20029,7 @@ asm void daAlink_c::getSearchBallScale() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkFastShotTime() { +asm bool daAlink_c::checkFastShotTime() { nofralloc #include "asm/d/a/d_a_alink/checkFastShotTime__9daAlink_cFv.s" } @@ -23153,7 +20050,7 @@ asm void daAlink_c::checkCutJumpCancelTurn() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkSingleBoarBattleSecondBowReady() const { +asm bool daAlink_c::checkSingleBoarBattleSecondBowReady() const { nofralloc #include "asm/d/a/d_a_alink/checkSingleBoarBattleSecondBowReady__9daAlink_cCFv.s" } @@ -23195,7 +20092,7 @@ asm void daAlink_c::onSceneChangeDead(u8 param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkNoEquipItem() const { +asm bool daAlink_c::checkNoEquipItem() const { nofralloc #include "asm/d/a/d_a_alink/checkNoEquipItem__9daAlink_cCFv.s" } @@ -23206,7 +20103,7 @@ asm void daAlink_c::checkNoEquipItem() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getBoardCutTurnOffsetAngleY() const { +asm bool daAlink_c::getBoardCutTurnOffsetAngleY() const { nofralloc #include "asm/d/a/d_a_alink/getBoardCutTurnOffsetAngleY__9daAlink_cCFv.s" } @@ -23217,7 +20114,7 @@ asm void daAlink_c::getBoardCutTurnOffsetAngleY() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getMagneBootsTopVec() { +asm cXyz* daAlink_c::getMagneBootsTopVec() { nofralloc #include "asm/d/a/d_a_alink/getMagneBootsTopVec__9daAlink_cFv.s" } @@ -23279,7 +20176,7 @@ asm void daAlink_c::setSumouLoseHeadUp() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkPriActorOwn(fopAc_ac_c const* param_0) const { +asm bool daAlink_c::checkPriActorOwn(fopAc_ac_c const* param_0) const { nofralloc #include "asm/d/a/d_a_alink/checkPriActorOwn__9daAlink_cCFPC10fopAc_ac_c.s" } @@ -23290,7 +20187,7 @@ asm void daAlink_c::checkPriActorOwn(fopAc_ac_c const* param_0) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfEnemyBiteAllOwn(fopAc_ac_c const* param_0) const { +asm bool daAlink_c::checkWolfEnemyBiteAllOwn(fopAc_ac_c const* param_0) const { nofralloc #include "asm/d/a/d_a_alink/checkWolfEnemyBiteAllOwn__9daAlink_cCFPC10fopAc_ac_c.s" } @@ -23321,7 +20218,7 @@ asm void daAlink_c::setSumouGraspCancelCount(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkItemSwordEquip() const { +asm bool daAlink_c::checkItemSwordEquip() const { nofralloc #include "asm/d/a/d_a_alink/checkItemSwordEquip__9daAlink_cCFv.s" } @@ -23332,7 +20229,7 @@ asm void daAlink_c::checkItemSwordEquip() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getSinkShapeOffset() const { +asm float daAlink_c::getSinkShapeOffset() const { nofralloc #include "asm/d/a/d_a_alink/getSinkShapeOffset__9daAlink_cCFv.s" } @@ -23342,7 +20239,7 @@ asm void daAlink_c::getSinkShapeOffset() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkSinkDead() const { +asm bool daAlink_c::checkSinkDead() const { nofralloc #include "asm/d/a/d_a_alink/checkSinkDead__9daAlink_cCFv.s" } @@ -23352,7 +20249,7 @@ asm void daAlink_c::checkSinkDead() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkCutJumpMode() const { +asm bool daAlink_c::checkCutJumpMode() const { nofralloc #include "asm/d/a/d_a_alink/checkCutJumpMode__9daAlink_cCFv.s" } @@ -23362,7 +20259,7 @@ asm void daAlink_c::checkCutJumpMode() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getGiantPuzzleAimAngle() const { +asm s16 daAlink_c::getGiantPuzzleAimAngle() const { nofralloc #include "asm/d/a/d_a_alink/getGiantPuzzleAimAngle__9daAlink_cCFv.s" } @@ -23372,7 +20269,7 @@ asm void daAlink_c::getGiantPuzzleAimAngle() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getSwordChangeWaitTimer() const { +asm bool daAlink_c::getSwordChangeWaitTimer() const { nofralloc #include "asm/d/a/d_a_alink/getSwordChangeWaitTimer__9daAlink_cCFv.s" } @@ -23382,7 +20279,7 @@ asm void daAlink_c::getSwordChangeWaitTimer() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkMetamorphose() const { +asm bool daAlink_c::checkMetamorphose() const { nofralloc #include "asm/d/a/d_a_alink/checkMetamorphose__9daAlink_cCFv.s" } @@ -23392,7 +20289,7 @@ asm void daAlink_c::checkMetamorphose() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfDownAttackPullOut() const { +asm bool daAlink_c::checkWolfDownAttackPullOut() const { nofralloc #include "asm/d/a/d_a_alink/checkWolfDownAttackPullOut__9daAlink_cCFv.s" } @@ -23402,7 +20299,7 @@ asm void daAlink_c::checkWolfDownAttackPullOut() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getMidnaAtnPos() const { +asm bool daAlink_c::getMidnaAtnPos() const { nofralloc #include "asm/d/a/d_a_alink/getMidnaAtnPos__9daAlink_cCFv.s" } @@ -23412,7 +20309,7 @@ asm void daAlink_c::getMidnaAtnPos() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkCopyRodEquip() const { +asm bool daAlink_c::checkCopyRodEquip() const { nofralloc #include "asm/d/a/d_a_alink/checkCopyRodEquip__9daAlink_cCFv.s" } @@ -23422,7 +20319,7 @@ asm void daAlink_c::checkCopyRodEquip() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkCanoeFishingGetLeft() const { +asm bool daAlink_c::checkCanoeFishingGetLeft() const { nofralloc #include "asm/d/a/d_a_alink/checkCanoeFishingGetLeft__9daAlink_cCFv.s" } @@ -23432,7 +20329,7 @@ asm void daAlink_c::checkCanoeFishingGetLeft() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkCanoeFishingGetRight() const { +asm bool daAlink_c::checkCanoeFishingGetRight() const { nofralloc #include "asm/d/a/d_a_alink/checkCanoeFishingGetRight__9daAlink_cCFv.s" } @@ -23443,7 +20340,7 @@ asm void daAlink_c::checkCanoeFishingGetRight() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkBeeChildDrink() const { +asm bool daAlink_c::checkBeeChildDrink() const { nofralloc #include "asm/d/a/d_a_alink/checkBeeChildDrink__9daAlink_cCFv.s" } @@ -23453,7 +20350,7 @@ asm void daAlink_c::checkBeeChildDrink() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getWolfHowlMgrP() { +asm bool daAlink_c::getWolfHowlMgrP() { nofralloc #include "asm/d/a/d_a_alink/getWolfHowlMgrP__9daAlink_cFv.s" } @@ -23463,7 +20360,7 @@ asm void daAlink_c::getWolfHowlMgrP() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfHowlSuccessAnime() const { +asm bool daAlink_c::checkWolfHowlSuccessAnime() const { nofralloc #include "asm/d/a/d_a_alink/checkWolfHowlSuccessAnime__9daAlink_cCFv.s" } @@ -23473,7 +20370,7 @@ asm void daAlink_c::checkWolfHowlSuccessAnime() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkOctaIealHang() const { +asm bool daAlink_c::checkOctaIealHang() const { nofralloc #include "asm/d/a/d_a_alink/checkOctaIealHang__9daAlink_cCFv.s" } @@ -23515,7 +20412,7 @@ asm void daAlink_c::setOctaIealWildHang() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkDragonHangRide() const { +asm bool daAlink_c::checkDragonHangRide() const { nofralloc #include "asm/d/a/d_a_alink/checkDragonHangRide__9daAlink_cCFv.s" } @@ -24556,7 +21453,7 @@ asm void daAlink_c::checkCaughtEscapeCutTurn() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::setThrowDamage(s16 param_0, f32 param_1, f32 param_2, int param_3, int param_4, +asm 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" @@ -25099,7 +21996,7 @@ asm void daAlink_c::checkUpperGuardAnime() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkPlayerGuard() const { +asm bool daAlink_c::checkPlayerGuard() const { nofralloc #include "asm/d/a/d_a_alink/checkPlayerGuard__9daAlink_cCFv.s" } @@ -25334,7 +22231,7 @@ asm void daAlink_c::checkBowCameraArrowPosP(s16* param_0, s16* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkArrowChargeEnd() const { +asm bool daAlink_c::checkArrowChargeEnd() const { nofralloc #include "asm/d/a/d_a_alink/checkArrowChargeEnd__9daAlink_cCFv.s" } @@ -25970,7 +22867,7 @@ asm void daAlink_c::checkForestOldCentury() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkCopyRodTopUse() { +asm bool daAlink_c::checkCopyRodTopUse() { nofralloc #include "asm/d/a/d_a_alink/checkCopyRodTopUse__9daAlink_cFv.s" } @@ -26508,7 +23405,7 @@ asm void daAlink_c::setGrabCollisionOffset(f32 param_0, f32 param_1, cBgS_PolyIn #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::exchangeGrabActor(fopAc_ac_c* param_0) { +asm bool daAlink_c::exchangeGrabActor(fopAc_ac_c* param_0) { nofralloc #include "asm/d/a/d_a_alink/exchangeGrabActor__9daAlink_cFP10fopAc_ac_c.s" } @@ -26518,7 +23415,7 @@ asm void daAlink_c::exchangeGrabActor(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::setForceGrab(fopAc_ac_c* param_0, int param_1, int param_2) { +asm bool daAlink_c::setForceGrab(fopAc_ac_c* param_0, int param_1, int param_2) { nofralloc #include "asm/d/a/d_a_alink/setForceGrab__9daAlink_cFP10fopAc_ac_cii.s" } @@ -26962,14 +23859,16 @@ asm void daAlink_c::procGrabStand() { /* 800E70C0-800E70FC 0E1A00 003C+00 1/1 0/0 0/0 .text * checkInsectActorName__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkInsectActorName(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkInsectActorName__9daAlink_cFP10fopAc_ac_c.s" +bool daAlink_c::checkInsectActorName(fopAc_ac_c* insectActor) { + s16 insectName = fopAcM_GetName(insectActor); + + for (int i = 0; i < 12; i++) { + if (insectName == l_insectNameList[i]) { + return true; + } + } + return false; } -#pragma pop /* 800E70FC-800E71D4 0E1A3C 00D8+00 2/2 0/0 0/0 .text procInsectCatchInit__9daAlink_cFv */ @@ -26983,14 +23882,21 @@ asm void daAlink_c::procInsectCatchInit() { #pragma pop /* 800E71D4-800E7254 0E1B14 0080+00 1/0 0/0 0/0 .text procInsectCatch__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procInsectCatch() { - nofralloc -#include "asm/d/a/d_a_alink/procInsectCatch__9daAlink_cFv.s" +bool daAlink_c::procInsectCatch() { + daPy_frameCtrl_c* tmp = &mFrameCtrl1[0]; + + if (tmp->checkAnmEnd()) { + checkNextAction(0); + } else { + if (tmp->checkPass(field_0x3478)) { + fopAc_ac_c* tmp2 = field_0x280c.getActor(); + if (tmp2 != NULL) { + fopAcM_setCarryNow(tmp2, 0); + } + } + } + return true; } -#pragma pop /* 800E7254-800E7460 0E1B94 020C+00 2/2 0/0 0/0 .text procPickUpInit__9daAlink_cFv */ #pragma push @@ -27044,14 +23950,28 @@ 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; + + if (tmp >= 14336 && tmp < 32640) { + return param_0 + 32640; + } else if (tmp <= -14336 && tmp <= -32640) { + return field_0x2fe2; + } + return param_0 - 32640; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getChainStickAngleY(s16 param_0) const { +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 @@ -27088,7 +24008,7 @@ asm void daAlink_c::setFmChainPosFromOut(fopAc_ac_c* param_0, cXyz* param_1, int #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkChainBlockPushPull() { +asm bool daAlink_c::checkChainBlockPushPull() { nofralloc #include "asm/d/a/d_a_alink/checkChainBlockPushPull__9daAlink_cFv.s" } @@ -27157,24 +24077,14 @@ asm void daAlink_c::getWallGrabStatus() { #pragma pop /* 800E7EF4-800E7F18 0E2834 0024+00 1/1 0/0 0/0 .text wallGrabTrigger__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::wallGrabTrigger() { - nofralloc -#include "asm/d/a/d_a_alink/wallGrabTrigger__9daAlink_cFv.s" +void daAlink_c::wallGrabTrigger() { + itemTriggerCheck(64); } -#pragma pop /* 800E7F18-800E7F3C 0E2858 0024+00 4/4 0/0 0/0 .text wallGrabButton__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::wallGrabButton() { - nofralloc -#include "asm/d/a/d_a_alink/wallGrabButton__9daAlink_cFv.s" +void daAlink_c::wallGrabButton() { + itemButtonCheck(64); } -#pragma pop /* 800E7F3C-800E80A4 0E287C 0168+00 4/4 0/0 0/0 .text * setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli */ @@ -27209,46 +24119,53 @@ asm void daAlink_c::checkPullBehindWall() { #pragma pop /* 800E8298-800E82B0 0E2BD8 0018+00 3/3 0/0 0/0 .text offGoatStopGame__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::offGoatStopGame() { - nofralloc -#include "asm/d/a/d_a_alink/offGoatStopGame__9daAlink_cFv.s" +void daAlink_c::offGoatStopGame() { + if (field_0x56a != 0x2a) { + return; + } else { + field_0x56a = 0; + } } -#pragma pop /* 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; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkGoatCatchActor(fopAc_ac_c* param_0) { +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 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getGoatCatchDistance2() { - nofralloc -#include "asm/d/a/d_a_alink/getGoatCatchDistance2__9daAlink_cFv.s" +float daAlink_c::getGoatCatchDistance2() { + if (field_0x27f4->mBase.mProcName == 0x216) { + return lit_16066; + } + return lit_16067; } -#pragma pop /* 800E8334-800E8354 0E2C74 0020+00 3/3 0/0 0/0 .text endPushPull__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::endPushPull() { - nofralloc -#include "asm/d/a/d_a_alink/endPushPull__9daAlink_cFv.s" +void daAlink_c::endPushPull() { + checkWaitAction(); } -#pragma pop /* 800E8354-800E8428 0E2C94 00D4+00 2/2 0/0 0/0 .text getPushPullAnimeSpeed__9daAlink_cFv */ @@ -27323,14 +24240,12 @@ asm void daAlink_c::procPullMove() { #pragma pop /* 800E91B0-800E91C4 0E3AF0 0014+00 1/1 0/0 0/0 .text daAlink_searchGoat__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchGoat(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchGoat__FP10fopAc_ac_cPv.s" +static fopAc_ac_c* daAlink_searchGoat(fopAc_ac_c* param_0, void* param_1) { + if (fopAcM_GetName(param_0) == 0x106) { + return param_0; + } + return NULL; } -#pragma pop /* 800E91C4-800E9210 0E3B04 004C+00 1/0 0/0 0/0 .text cancelGoronThrowEvent__9daAlink_cFv */ @@ -27446,35 +24361,21 @@ asm void daAlink_c::checkSumouVsActor() { #pragma pop /* 800EA8D0-800EA908 0E5210 0038+00 5/5 0/0 0/0 .text cancelSumouMode__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::cancelSumouMode() { - nofralloc -#include "asm/d/a/d_a_alink/cancelSumouMode__9daAlink_cFv.s" +void daAlink_c::cancelSumouMode() { + field_0x2854.clearData(); + field_0x56a = 0; } -#pragma pop /* 800EA908-800EA92C 0E5248 0024+00 2/2 0/0 0/0 .text sumouPunchTrigger__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::sumouPunchTrigger() { - nofralloc -#include "asm/d/a/d_a_alink/sumouPunchTrigger__9daAlink_cFv.s" +void daAlink_c::sumouPunchTrigger() { + itemTriggerCheck(8); } -#pragma pop /* 800EA92C-800EA950 0E526C 0024+00 5/5 0/0 0/0 .text setSumouPunchStatus__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSumouPunchStatus() { - nofralloc -#include "asm/d/a/d_a_alink/setSumouPunchStatus__9daAlink_cFv.s" +void daAlink_c::setSumouPunchStatus() { + setBStatus(0x44); } -#pragma pop /* 800EA950-800EAA28 0E5290 00D8+00 4/4 0/0 0/0 .text procSumouReadyInit__9daAlink_cFv */ #pragma push @@ -27666,7 +24567,7 @@ asm void daAlink_c::setHorseZeldaDamage() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkHorseDashAccept() { +asm bool daAlink_c::checkHorseDashAccept() { nofralloc #include "asm/d/a/d_a_alink/checkHorseDashAccept__9daAlink_cFv.s" } @@ -31408,7 +28309,7 @@ static asm void daAlink_hookshotAtHitCallBack(fopAc_ac_c* param_0, dCcD_GObjInf* #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getHookshotTopPos() { +asm bool daAlink_c::getHookshotTopPos() { nofralloc #include "asm/d/a/d_a_alink/getHookshotTopPos__9daAlink_cFv.s" } @@ -31418,7 +28319,7 @@ asm void daAlink_c::getHookshotTopPos() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkHookshotReturnMode() const { +asm bool daAlink_c::checkHookshotReturnMode() const { nofralloc #include "asm/d/a/d_a_alink/checkHookshotReturnMode__9daAlink_cCFv.s" } @@ -31429,7 +28330,7 @@ asm void daAlink_c::checkHookshotReturnMode() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkHookshotShootReturnMode() const { +asm bool daAlink_c::checkHookshotShootReturnMode() const { nofralloc #include "asm/d/a/d_a_alink/checkHookshotShootReturnMode__9daAlink_cCFv.s" } @@ -31566,7 +28467,7 @@ asm void daAlink_c::setHookshotCatchNow() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::setHookshotCarryOffset(unsigned int param_0, cXyz const* param_1) { +asm bool daAlink_c::setHookshotCarryOffset(unsigned int param_0, cXyz const* param_1) { nofralloc #include "asm/d/a/d_a_alink/setHookshotCarryOffset__9daAlink_cFUiPC4cXyz.s" } @@ -32108,7 +29009,7 @@ asm void daAlink_c::onSpinnerPathForceRemove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkSpinnerPathMove() { +asm bool daAlink_c::checkSpinnerPathMove() { nofralloc #include "asm/d/a/d_a_alink/checkSpinnerPathMove__9daAlink_cFv.s" } @@ -32128,7 +29029,7 @@ asm void daAlink_c::checkLv4BossRoom() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkSpinnerTriggerAttack() { +asm bool daAlink_c::checkSpinnerTriggerAttack() { nofralloc #include "asm/d/a/d_a_alink/checkSpinnerTriggerAttack__9daAlink_cFv.s" } @@ -32222,7 +29123,7 @@ static asm void daAlink_bottleModelCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getBottleOpenAppearItem() const { +asm s32 daAlink_c::getBottleOpenAppearItem() const { nofralloc #include "asm/d/a/d_a_alink/getBottleOpenAppearItem__9daAlink_cCFv.s" } @@ -32430,7 +29331,7 @@ asm void daAlink_c::offKandelaarModel() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkUseKandelaar(int param_0) { +asm bool daAlink_c::checkUseKandelaar(int param_0) { nofralloc #include "asm/d/a/d_a_alink/checkUseKandelaar__9daAlink_cFi.s" } @@ -32441,7 +29342,7 @@ asm void daAlink_c::checkUseKandelaar(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkKandelaarSwing(int param_0) const { +asm bool daAlink_c::checkKandelaarSwing(int param_0) const { nofralloc #include "asm/d/a/d_a_alink/checkKandelaarSwing__9daAlink_cCFi.s" } @@ -32473,7 +29374,7 @@ static asm void daAlink_kandelaarModelCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getKandelaarFlamePos() { +asm bool daAlink_c::getKandelaarFlamePos() { nofralloc #include "asm/d/a/d_a_alink/getKandelaarFlamePos__9daAlink_cFv.s" } @@ -32758,7 +29659,7 @@ asm void daAlink_c::procHawkSubject() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getIronBallCenterPos() { +asm bool daAlink_c::getIronBallCenterPos() { nofralloc #include "asm/d/a/d_a_alink/getIronBallCenterPos__9daAlink_cFv.s" } @@ -32768,7 +29669,7 @@ asm void daAlink_c::getIronBallCenterPos() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getIronBallBgHit() const { +asm bool daAlink_c::getIronBallBgHit() const { nofralloc #include "asm/d/a/d_a_alink/getIronBallBgHit__9daAlink_cCFv.s" } @@ -32800,7 +29701,7 @@ asm void daAlink_c::checkIronBallThrowReturnMode() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkIronBallReturn() const { +asm bool daAlink_c::checkIronBallReturn() const { nofralloc #include "asm/d/a/d_a_alink/checkIronBallReturn__9daAlink_cCFv.s" } @@ -32810,7 +29711,7 @@ asm void daAlink_c::checkIronBallReturn() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkIronBallGroundStop() const { +asm bool daAlink_c::checkIronBallGroundStop() const { nofralloc #include "asm/d/a/d_a_alink/checkIronBallGroundStop__9daAlink_cCFv.s" } @@ -32869,7 +29770,7 @@ asm void daAlink_c::setIronBallModel() { #pragma pop /* 80112C80-80112C84 10D5C0 0004+00 2/2 2/2 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { +extern "C" void __ct__5csXyzFv() { /* empty function */ } @@ -33078,7 +29979,7 @@ asm void daAlink_c::createNpcTks(cXyz* param_0, int param_1, u32 param_2) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkSetNpcTks(cXyz* param_0, int param_1, int param_2) { +asm bool daAlink_c::checkSetNpcTks(cXyz* param_0, int param_1, int param_2) { nofralloc #include "asm/d/a/d_a_alink/checkSetNpcTks__9daAlink_cFP4cXyzii.s" } @@ -33536,7 +30437,7 @@ asm void daAlink_c::setGetSubBgm(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkTreasureRupeeReturn(int param_0) const { +asm bool daAlink_c::checkTreasureRupeeReturn(int param_0) const { nofralloc #include "asm/d/a/d_a_alink/checkTreasureRupeeReturn__9daAlink_cCFi.s" } @@ -34142,14 +31043,14 @@ asm void daAlink_c::procGanonFinishInit() { #pragma pop /* 8011EA78-8011EAE8 1193B8 0070+00 1/0 0/0 0/0 .text procGanonFinish__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGanonFinish() { - nofralloc -#include "asm/d/a/d_a_alink/procGanonFinish__9daAlink_cFv.s" +bool daAlink_c::procGanonFinish() { + i_onEndResetFlg1(GanonFinish); + mCurrent.mPosition = field_0x37c8; + if (mFrameCtrl1[0].checkAnmEnd()) { + setSingleAnimeBaseMorf(GANON_FINISH, lit_6041); + } + return true; } -#pragma pop /* 8011EAE8-8011EB8C 119428 00A4+00 1/0 0/0 0/0 .text procCutFastReadyInit__9daAlink_cFv */ @@ -34197,7 +31098,7 @@ asm void daAlink_c::procMasterSwordStick() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procMasterSwordPullInit() { +asm bool daAlink_c::procMasterSwordPullInit() { nofralloc #include "asm/d/a/d_a_alink/procMasterSwordPullInit__9daAlink_cFv.s" } @@ -34248,6 +31149,17 @@ asm void daAlink_c::procDungeonWarpReady() { /* 8011F084-8011F0F4 1199C4 0070+00 1/0 0/0 0/0 .text procDungeonWarpInit__9daAlink_cFv */ +#ifdef NONMATCHING +bool daAlink_c::procDungeonWarpInit() { + if (!commonProcInitNotSameProc((daAlink_PROC)0xeb)) { + mCommonCounter = 0; + field_0x3012 = 0; + setSpecialGravity(0.0f, mMaxFallSpeed, 0); + field_0x300e = 0; + field_0x3010 = 0; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -34256,6 +31168,7 @@ asm void daAlink_c::procDungeonWarpInit() { #include "asm/d/a/d_a_alink/procDungeonWarpInit__9daAlink_cFv.s" } #pragma pop +#endif /* 8011F0F4-8011F360 119A34 026C+00 1/0 0/0 0/0 .text procDungeonWarp__9daAlink_cFv */ #pragma push @@ -34369,14 +31282,13 @@ asm void daAlink_c::procCoWarp() { #pragma pop /* 80120440-80120474 11AD80 0034+00 1/0 0/0 0/0 .text commonWaitTurnInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::commonWaitTurnInit() { - nofralloc -#include "asm/d/a/d_a_alink/commonWaitTurnInit__9daAlink_cFv.s" +void daAlink_c::commonWaitTurnInit() { + if (i_checkWolf()) { + procWolfWaitTurnInit(); + } else { + procWaitTurnInit(); + } } -#pragma pop /* 80120474-80120500 11ADB4 008C+00 2/1 0/0 0/0 .text commonGrabPutInit__9daAlink_cFv */ #pragma push @@ -34389,24 +31301,22 @@ asm void daAlink_c::commonGrabPutInit() { #pragma pop /* 80120500-80120534 11AE40 0034+00 3/3 0/0 0/0 .text commonLargeDamageUpInit__9daAlink_cFiiss */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::commonLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16 param_3) { - nofralloc -#include "asm/d/a/d_a_alink/commonLargeDamageUpInit__9daAlink_cFiiss.s" +void daAlink_c::commonLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16 param_3) { + if (i_checkWolf()) { + procWolfLargeDamageUpInit(param_0, param_1, param_2, param_3); + } else { + procLargeDamageUpInit(param_0, param_1, param_2, param_3); + } } -#pragma pop /* 80120534-80120580 11AE74 004C+00 4/4 0/0 0/0 .text commonFallInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::commonFallInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/commonFallInit__9daAlink_cFi.s" +void daAlink_c::commonFallInit(int param_0) { + if (i_checkWolf()) { + procWolfFallInit(param_0, daAlinkHIO_wlAutoJump_c0::m.field_0x54); + } else { + procFallInit(param_0, daAlinkHIO_autoJump_c0::m.field_0x70); + } } -#pragma pop /* 80120580-80120634 11AEC0 00B4+00 21/21 0/0 0/0 .text * setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz */ @@ -35115,14 +32025,9 @@ asm void daAlink_c::offWolfEyeUp() { #pragma pop /* 80127CF0-80127D14 122630 0024+00 1/1 0/0 0/0 .text wolfSenseTrigger__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::wolfSenseTrigger() { - nofralloc -#include "asm/d/a/d_a_alink/wolfSenseTrigger__9daAlink_cFv.s" +void daAlink_c::wolfSenseTrigger() { + itemTriggerCheck(1); } -#pragma pop /* 80127D14-80127D2C 122654 0018+00 1/1 0/0 0/0 .text setWolfSenceStatus__9daAlink_cFUc */ @@ -35136,14 +32041,9 @@ asm void daAlink_c::setWolfSenceStatus(u8 param_0) { #pragma pop /* 80127D2C-80127D50 12266C 0024+00 1/1 0/0 0/0 .text wolfClawTrigger__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::wolfClawTrigger() { - nofralloc -#include "asm/d/a/d_a_alink/wolfClawTrigger__9daAlink_cFv.s" +void daAlink_c::wolfClawTrigger() { + itemTriggerCheck(2); } -#pragma pop /* 80127D50-80127D68 122690 0018+00 2/2 0/0 0/0 .text setWolfDigStatus__9daAlink_cFUc */ #pragma push @@ -35159,7 +32059,7 @@ asm void daAlink_c::setWolfDigStatus(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfShapeReverse() const { +asm BOOL daAlink_c::checkWolfShapeReverse() const { nofralloc #include "asm/d/a/d_a_alink/checkWolfShapeReverse__9daAlink_cCFv.s" } @@ -36166,7 +33066,7 @@ asm void daObj_Sekizoa_c::setWolfHowling() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfRope() { +asm bool daAlink_c::checkWolfRope() { nofralloc #include "asm/d/a/d_a_alink/checkWolfRope__9daAlink_cFv.s" } @@ -36910,7 +33810,7 @@ asm void daAlink_c::procWolfSwimEndWait() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::onWolfEnemyBiteAll(fopAc_ac_c* param_0, daPy_py_c::daPy_FLG2 param_1) { +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" } @@ -36982,7 +33882,7 @@ asm void daAlink_c::checkWolfLockData() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWolfLock(fopAc_ac_c* param_0) const { +asm bool daAlink_c::checkWolfLock(fopAc_ac_c* param_0) const { nofralloc #include "asm/d/a/d_a_alink/checkWolfLock__9daAlink_cCFP10fopAc_ac_c.s" } @@ -36992,7 +33892,7 @@ asm void daAlink_c::checkWolfLock(fopAc_ac_c* param_0) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::cancelWolfLock(fopAc_ac_c* param_0) { +asm bool daAlink_c::cancelWolfLock(fopAc_ac_c* param_0) { nofralloc #include "asm/d/a/d_a_alink/cancelWolfLock__9daAlink_cFP10fopAc_ac_c.s" } @@ -38012,28 +34912,24 @@ asm cCcD_Stts::~cCcD_Stts() { #pragma pop /* 801410EC-8014111C 13BA2C 0030+00 1/1 0/0 0/0 .text __ct__16daPy_actorKeep_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daPy_actorKeep_c::daPy_actorKeep_c() { - nofralloc -#include "asm/d/a/d_a_alink/__ct__16daPy_actorKeep_cFv.s" +daPy_actorKeep_c::daPy_actorKeep_c() { + clearData(); } -#pragma pop /* 8014111C-8014112C 13BA5C 0010+00 1/1 0/0 0/0 .text * onNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::onNoResetFlg2(daPy_py_c::daPy_FLG2 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/onNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2.s" +void daPy_py_c::onNoResetFlg2(daPy_FLG2 pFlag) { + mNoResetFlg2 |= pFlag; } -#pragma pop /* 8014112C-8014113C 13BA6C 0010+00 1/1 0/0 0/0 .text * offNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0 */ +// weird regalloc +#ifdef NONMATCHING +void daPy_py_c::offNoResetFlg0(daPy_FLG0 pFlag) { + mNoResetFlg0 &= ~pFlag; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -38042,6 +34938,7 @@ asm void daPy_py_c::offNoResetFlg0(daPy_py_c::daPy_FLG0 param_0) { #include "asm/d/a/d_a_alink/offNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0.s" } #pragma pop +#endif /* 8014113C-80141190 13BA7C 0054+00 1/1 0/0 0/0 .text mDoAud_seStartLevel__FUlPC3VecUlSc */ @@ -38056,14 +34953,9 @@ static asm void mDoAud_seStartLevel(u32 param_0, Vec const* param_1, u32 param_2 /* 80141190-8014119C 13BAD0 000C+00 1/1 0/0 0/0 .text * checkEndResetFlg2__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::checkEndResetFlg2(daPy_py_c::daPy_ERFLG2 param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkEndResetFlg2__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG2.s" +int daPy_py_c::checkEndResetFlg2(daPy_ERFLG2 pFlag) const { + return mEndResetFlg2 & pFlag; } -#pragma pop /* 8014119C-801411B0 13BADC 0014+00 1/1 0/0 0/0 .text dComIfGp_setBottleStatus__FUcUc */ #pragma push @@ -38076,25 +34968,15 @@ static asm void dComIfGp_setBottleStatus(u8 param_0, u8 param_1) { #pragma pop /* 801411B0-801411D4 13BAF0 0024+00 1/1 0/0 0/0 .text getSumouMode__9daPy_py_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getSumouMode() const { - nofralloc -#include "asm/d/a/d_a_alink/getSumouMode__9daPy_py_cCFv.s" +bool daPy_py_c::getSumouMode() const { + return getSumouCameraMode(); } -#pragma pop /* 801411D4-801411E0 13BB14 000C+00 1/1 0/0 0/0 .text * checkNoResetFlg3__9daPy_py_cCFQ29daPy_py_c9daPy_FLG3 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::checkNoResetFlg3(daPy_py_c::daPy_FLG3 param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkNoResetFlg3__9daPy_py_cCFQ29daPy_py_c9daPy_FLG3.s" +int daPy_py_c::checkNoResetFlg3(daPy_FLG3 pFlag) const { + return mNoResetFlg3 & pFlag; } -#pragma pop /* 801411E0-801411F0 13BB20 0010+00 1/1 0/0 0/0 .text onCondition__11dEvt_info_cFUs */ #pragma push @@ -38180,14 +35062,9 @@ static asm void dComIfGp_getStage() { /* 801412B0-801412BC 13BBF0 000C+00 1/1 0/0 0/0 .text checkEquipHeavyBoots__9daPy_py_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::checkEquipHeavyBoots() const { - nofralloc -#include "asm/d/a/d_a_alink/checkEquipHeavyBoots__9daPy_py_cCFv.s" +BOOL daPy_py_c::checkEquipHeavyBoots() const { + return i_checkNoResetFlg0(EquipHeavyBoots); } -#pragma pop /* 801412BC-801412C4 13BBFC 0008+00 1/1 4/4 0/0 .text fopAcM_GetName__FPv */ #pragma push @@ -38201,14 +35078,9 @@ asm void fopAcM_GetName(void* param_0) { /* 801412C4-801412D4 13BC04 0010+00 1/1 0/0 0/0 .text * onNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::onNoResetFlg0(daPy_py_c::daPy_FLG0 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/onNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0.s" +void daPy_py_c::onNoResetFlg0(daPy_FLG0 pFlag) { + mNoResetFlg0 |= pFlag; } -#pragma pop /* 801412D4-801412F8 13BC14 0024+00 1/1 0/0 0/0 .text isOrderOK__14dEvt_control_cFv */ #pragma push @@ -38254,14 +35126,9 @@ static asm void dComIfGp_checkPlayerStatus1(int param_0, u32 param_1) { /* 80141340-8014134C 13BC80 000C+00 1/1 0/0 0/0 .text * checkEndResetFlg1__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG1 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::checkEndResetFlg1(daPy_py_c::daPy_ERFLG1 param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkEndResetFlg1__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG1.s" +int daPy_py_c::checkEndResetFlg1(daPy_ERFLG1 pFlag) const { + return mEndResetFlg1 & pFlag; } -#pragma pop /* 8014134C-8014135C 13BC8C 0010+00 1/1 0/0 0/0 .text dComIfGp_getEventManager__Fv */ #pragma push @@ -38286,6 +35153,12 @@ asm void daPy_py_c::offNoResetFlg1(daPy_py_c::daPy_FLG1 param_0) { /* 8014136C-8014137C 13BCAC 0010+00 1/1 0/0 0/0 .text * offNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2 */ +// regalloc +#ifdef NONMATCHING +void daPy_py_c::offNoResetFlg2(daPy_py_c::daPy_FLG2 param_0) { + mNoResetFlg2 &= ~param_0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -38294,17 +35167,13 @@ asm void daPy_py_c::offNoResetFlg2(daPy_py_c::daPy_FLG2 param_0) { #include "asm/d/a/d_a_alink/offNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2.s" } #pragma pop +#endif /* 8014137C-80141388 13BCBC 000C+00 1/1 0/0 0/0 .text setSpecialDemoType__11daPy_demo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_demo_c::setSpecialDemoType() { - nofralloc -#include "asm/d/a/d_a_alink/setSpecialDemoType__11daPy_demo_cFv.s" +void daPy_demo_c::setSpecialDemoType() { + setDemoType(5); } -#pragma pop /* 80141388-8014139C 13BCC8 0014+00 1/1 0/0 0/0 .text checkCommandCatch__11dEvt_info_cFv */ @@ -38328,14 +35197,9 @@ asm void dComIfGs_isEventBit(u16 param_0) { #pragma pop /* 801413CC-801413D8 13BD0C 000C+00 1/1 0/0 0/0 .text checkWolf__9daPy_py_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::checkWolf() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolf__9daPy_py_cCFv.s" +int daPy_py_c::checkWolf() const { + return i_checkNoResetFlg1(Wolf); } -#pragma pop /* 801413D8-801413F8 13BD18 0020+00 1/1 0/0 0/0 .text checkSwordGet__9daPy_py_cFv */ #pragma push @@ -38349,14 +35213,9 @@ asm void daPy_py_c::checkSwordGet() { /* 801413F8-80141404 13BD38 000C+00 1/1 0/0 0/0 .text * checkResetFlg0__9daPy_py_cCFQ29daPy_py_c10daPy_RFLG0 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::checkResetFlg0(daPy_py_c::daPy_RFLG0 param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkResetFlg0__9daPy_py_cCFQ29daPy_py_c10daPy_RFLG0.s" +int daPy_py_c::checkResetFlg0(daPy_RFLG0 pFlag) const { + return mResetFlg0 & pFlag; } -#pragma pop /* 80141404-80141410 13BD44 000C+00 1/1 0/0 0/0 .text ChkGroundHit__9dBgS_AcchCFv */ #pragma push @@ -38370,14 +35229,9 @@ asm void dBgS_Acch::ChkGroundHit() const { /* 80141410-8014141C 13BD50 000C+00 1/1 0/0 0/0 .text * checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::checkNoResetFlg0(daPy_py_c::daPy_FLG0 param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0.s" +int daPy_py_c::checkNoResetFlg0(daPy_FLG0 pFlag) const { + return mNoResetFlg0 & pFlag; } -#pragma pop /* 8014141C-80141438 13BD5C 001C+00 1/1 0/0 0/0 .text dComIfGp_getPlayerCameraID__Fi */ #pragma push @@ -38433,24 +35287,14 @@ static asm void dComIfGp_event_runCheck() { /* 801414C0-801414CC 13BE00 000C+00 1/1 0/0 0/0 .text * checkNoResetFlg2__9daPy_py_cCFQ29daPy_py_c9daPy_FLG2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::checkNoResetFlg2(daPy_py_c::daPy_FLG2 param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkNoResetFlg2__9daPy_py_cCFQ29daPy_py_c9daPy_FLG2.s" +int daPy_py_c::checkNoResetFlg2(daPy_FLG2 pFlag) const { + return mNoResetFlg2 & pFlag; } -#pragma pop /* 801414CC-801414D8 13BE0C 000C+00 1/1 2/2 0/0 .text checkMagneBootsOn__9daPy_py_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::checkMagneBootsOn() const { - nofralloc -#include "asm/d/a/d_a_alink/checkMagneBootsOn__9daPy_py_cCFv.s" +int daPy_py_c::checkMagneBootsOn() const { + return i_checkNoResetFlg0(MagneBootsOn); } -#pragma pop /* 801414D8-801414E8 13BE18 0010+00 1/1 2/2 0/0 .text dComIfGp_getHorseActor__Fv */ #pragma push @@ -38463,25 +35307,15 @@ asm void dComIfGp_getHorseActor() { #pragma pop /* 801414E8-801414F4 13BE28 000C+00 1/1 0/0 0/0 .text checkBoarSingleBattle__9daPy_py_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::checkBoarSingleBattle() const { - nofralloc -#include "asm/d/a/d_a_alink/checkBoarSingleBattle__9daPy_py_cCFv.s" +int daPy_py_c::checkBoarSingleBattle() const { + return i_checkNoResetFlg2(BoarSingleBattle); } -#pragma pop /* 801414F4-80141500 13BE34 000C+00 1/1 0/0 0/0 .text * checkEndResetFlg0__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG0 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::checkEndResetFlg0(daPy_py_c::daPy_ERFLG0 param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkEndResetFlg0__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG0.s" +int daPy_py_c::checkEndResetFlg0(daPy_ERFLG0 pFlag) const { + return mEndResetFlg0 & pFlag; } -#pragma pop /* 80141500-80141508 13BE40 0008+00 1/0 0/0 0/0 .text getMidnaAtnPos__9daPy_py_cCFv */ bool daPy_py_c::getMidnaAtnPos() const { @@ -38495,105 +35329,55 @@ void daPy_py_c::setMidnaMsgNum(fopAc_ac_c* param_0, u16 param_1) { } /* 8014150C-80141514 13BE4C 0008+00 1/0 0/0 0/0 .text getModelMtx__9daPy_py_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getModelMtx() { - nofralloc -#include "asm/d/a/d_a_alink/getModelMtx__9daPy_py_cFv.s" +Mtx* daPy_py_c::getModelMtx() { + return mCullMtx; } -#pragma pop /* 80141514-8014151C 13BE54 0008+00 1/0 0/0 0/0 .text getInvMtx__9daPy_py_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getInvMtx() { - nofralloc -#include "asm/d/a/d_a_alink/getInvMtx__9daPy_py_cFv.s" +Mtx* daPy_py_c::getInvMtx() { + return mCullMtx; } -#pragma pop /* 8014151C-80141524 13BE5C 0008+00 1/0 0/0 0/0 .text getShadowTalkAtnPos__9daPy_py_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getShadowTalkAtnPos() { - nofralloc -#include "asm/d/a/d_a_alink/getShadowTalkAtnPos__9daPy_py_cFv.s" +cXyz* daPy_py_c::getShadowTalkAtnPos() { + return &mCurrent.mPosition; } -#pragma pop /* 80141524-8014152C 13BE64 0008+00 1/0 0/0 0/0 .text getLeftItemMatrix__9daPy_py_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getLeftItemMatrix() { - nofralloc -#include "asm/d/a/d_a_alink/getLeftItemMatrix__9daPy_py_cFv.s" +Mtx* daPy_py_c::getLeftItemMatrix() { + return mCullMtx; } -#pragma pop /* 8014152C-80141534 13BE6C 0008+00 1/0 0/0 0/0 .text getRightItemMatrix__9daPy_py_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getRightItemMatrix() { - nofralloc -#include "asm/d/a/d_a_alink/getRightItemMatrix__9daPy_py_cFv.s" +Mtx* daPy_py_c::getRightItemMatrix() { + return mCullMtx; } -#pragma pop /* 80141534-8014153C 13BE74 0008+00 1/0 0/0 0/0 .text getLeftHandMatrix__9daPy_py_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getLeftHandMatrix() { - nofralloc -#include "asm/d/a/d_a_alink/getLeftHandMatrix__9daPy_py_cFv.s" +Mtx* daPy_py_c::getLeftHandMatrix() { + return mCullMtx; } -#pragma pop /* 8014153C-80141544 13BE7C 0008+00 1/0 0/0 0/0 .text getRightHandMatrix__9daPy_py_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getRightHandMatrix() { - nofralloc -#include "asm/d/a/d_a_alink/getRightHandMatrix__9daPy_py_cFv.s" +Mtx* daPy_py_c::getRightHandMatrix() { + return mCullMtx; } -#pragma pop /* 80141544-8014154C 13BE84 0008+00 1/0 0/0 0/0 .text getLinkBackBone1Matrix__9daPy_py_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getLinkBackBone1Matrix() { - nofralloc -#include "asm/d/a/d_a_alink/getLinkBackBone1Matrix__9daPy_py_cFv.s" +Mtx* daPy_py_c::getLinkBackBone1Matrix() { + return mCullMtx; } -#pragma pop /* 8014154C-80141554 13BE8C 0008+00 1/0 0/0 0/0 .text getWolfMouthMatrix__9daPy_py_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getWolfMouthMatrix() { - nofralloc -#include "asm/d/a/d_a_alink/getWolfMouthMatrix__9daPy_py_cFv.s" +Mtx* daPy_py_c::getWolfMouthMatrix() { + return mCullMtx; } -#pragma pop /* 80141554-8014155C 13BE94 0008+00 1/0 0/0 0/0 .text getWolfBackbone2Matrix__9daPy_py_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getWolfBackbone2Matrix() { - nofralloc -#include "asm/d/a/d_a_alink/getWolfBackbone2Matrix__9daPy_py_cFv.s" +Mtx* daPy_py_c::getWolfBackbone2Matrix() { + return mCullMtx; } -#pragma pop /* 8014155C-80141564 13BE9C 0008+00 1/0 0/0 0/0 .text getBottleMtx__9daPy_py_cFv */ bool daPy_py_c::getBottleMtx() { @@ -38797,20 +35581,15 @@ bool daPy_py_c::checkHorseElecDamage() const { } /* 8014168C-80141694 13BFCC 0008+00 1/0 0/0 0/0 .text getBaseAnimeFrameRate__9daPy_py_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getBaseAnimeFrameRate() const { - nofralloc -#include "asm/d/a/d_a_alink/getBaseAnimeFrameRate__9daPy_py_cCFv.s" +float daPy_py_c::getBaseAnimeFrameRate() const { + return lit_6040; } -#pragma pop /* 80141694-8014169C 13BFD4 0008+00 1/0 0/0 0/0 .text getBaseAnimeFrame__9daPy_py_cCFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::getBaseAnimeFrame() const { +asm float daPy_py_c::getBaseAnimeFrame() const { nofralloc #include "asm/d/a/d_a_alink/getBaseAnimeFrame__9daPy_py_cCFv.s" } @@ -39065,25 +35844,15 @@ bool daPy_py_c::getBoardCutTurnOffsetAngleY() const { } /* 801417B8-801417C0 13C0F8 0008+00 2/0 0/0 0/0 .text getMagneHitPos__9daPy_py_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getMagneHitPos() { - nofralloc -#include "asm/d/a/d_a_alink/getMagneHitPos__9daPy_py_cFv.s" +cXyz* daPy_py_c::getMagneHitPos() { + return &mSwordTopPos; } -#pragma pop /* 801417C0-801417C8 13C100 0008+00 1/0 0/0 0/0 .text getMagneBootsTopVec__9daPy_py_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getMagneBootsTopVec() { - nofralloc -#include "asm/d/a/d_a_alink/getMagneBootsTopVec__9daPy_py_cFv.s" +cXyz* daPy_py_c::getMagneBootsTopVec() { + return &mCurrent.mPosition; } -#pragma pop /* 801417C8-801417D0 13C108 0008+00 1/0 0/0 0/0 .text checkUseKandelaar__9daPy_py_cFi */ bool daPy_py_c::checkUseKandelaar(int param_0) { @@ -39231,14 +36000,9 @@ void daPy_py_c::setSumouLoseHeadUp() { } /* 80141874-8014187C 13C1B4 0008+00 1/0 0/0 0/0 .text getGiantPuzzleAimAngle__9daPy_py_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getGiantPuzzleAimAngle() const { - nofralloc -#include "asm/d/a/d_a_alink/getGiantPuzzleAimAngle__9daPy_py_cCFv.s" +s16 daPy_py_c::getGiantPuzzleAimAngle() const { + return mCollisionRot.mY; } -#pragma pop /* 8014187C-80141880 13C1BC 0004+00 1/0 0/0 0/0 .text setGoronSideMove__9daPy_py_cFP10fopAc_ac_c */ @@ -39351,7 +36115,7 @@ bool daPy_py_c::checkItemSwordEquip() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::getSinkShapeOffset() const { +asm float daPy_py_c::getSinkShapeOffset() const { nofralloc #include "asm/d/a/d_a_alink/getSinkShapeOffset__9daPy_py_cCFv.s" } @@ -39393,14 +36157,9 @@ bool daPy_py_c::checkCutJumpMode() const { } /* 80141944-8014194C 13C284 0008+00 1/1 0/0 0/0 .text getZeldaActor__9daHorse_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHorse_c::getZeldaActor() { - nofralloc -#include "asm/d/a/d_a_alink/getZeldaActor__9daHorse_cFv.s" +fopAc_ac_c* daHorse_c::getZeldaActor() { + return mZeldaActorKeep.getActor(); } -#pragma pop /* 8014194C-8014195C 13C28C 0010+00 1/1 0/0 0/0 .text dComIfGp_getDoStatus__Fv */ #pragma push @@ -39416,26 +36175,21 @@ static asm void dComIfGp_getDoStatus() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::cXyz(f32 param_0, f32 param_1, f32 param_2) { +extern "C" asm void __ct__4cXyzFfff(f32 param_0, f32 param_1, f32 param_2) { nofralloc #include "asm/d/a/d_a_alink/__ct__4cXyzFfff.s" } #pragma pop /* 8014196C-80141988 13C2AC 001C+00 1/1 0/0 0/0 .text dMeter2Info_offUseButton__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dMeter2Info_offUseButton(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/dMeter2Info_offUseButton__Fi.s" +static void dMeter2Info_offUseButton(int pButton) { + g_meter2_info.offUseButton(pButton); } -#pragma pop /* 80141988-80141990 -00001 0008+00 0/0 0/0 0/0 .text setLinkState__14Z2CreatureLinkFUc */ -void Z2CreatureLink::setLinkState(u8 param_0) { - *(u8*)(((u8*)this) + 192) /* this->field_0xc0 */ = (u8)(param_0); +void Z2CreatureLink::setLinkState(u8 pState) { + mLinkState = pState; } /* 80141990-801419A0 13C2D0 0010+00 1/1 0/0 0/0 .text dComIfGs_getRupee__Fv */ @@ -39459,65 +36213,40 @@ static asm void dComIfGp_setItemRupeeCount(s32 param_0) { #pragma pop /* 801419B8-801419F4 13C2F8 003C+00 1/1 0/0 0/0 .text dMeter2Info_setFloatingMessage__FUssb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dMeter2Info_setFloatingMessage(u16 param_0, s16 param_1, bool param_2) { - nofralloc -#include "asm/d/a/d_a_alink/dMeter2Info_setFloatingMessage__FUssb.s" +static void dMeter2Info_setFloatingMessage(u16 pMessageID, s16 pMessageTimer, bool pWakuVisible) { + g_meter2_info.setFloatingMessage(pMessageID, pMessageTimer, pWakuVisible); } -#pragma pop /* 801419F4-80141A04 13C334 0010+00 1/1 0/0 0/0 .text onForcePanic__9daMidna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMidna_c::onForcePanic() { - nofralloc -#include "asm/d/a/d_a_alink/onForcePanic__9daMidna_cFv.s" +void daMidna_c::onForcePanic() { + onEndResetStateFlg0(ForcePanic); } -#pragma pop /* 80141A04-80141A10 13C344 000C+00 1/1 0/0 0/0 .text checkForceNormalColor__9daMidna_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMidna_c::checkForceNormalColor() const { - nofralloc -#include "asm/d/a/d_a_alink/checkForceNormalColor__9daMidna_cCFv.s" +u32 daMidna_c::checkForceNormalColor() const { + return checkStateFlg1(ForceNormalColor); } -#pragma pop /* 80141A10-80141A1C 13C350 000C+00 1/1 0/0 0/0 .text checkForceTiredColor__9daMidna_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMidna_c::checkForceTiredColor() const { - nofralloc -#include "asm/d/a/d_a_alink/checkForceTiredColor__9daMidna_cCFv.s" +u32 daMidna_c::checkForceTiredColor() const { + return checkStateFlg1(ForceTiredColor); } -#pragma pop /* 80141A1C-80141A84 13C35C 0068+00 1/1 0/0 0/0 .text checkMidnaTired__9daMidna_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMidna_c::checkMidnaTired() { +asm bool daMidna_c::checkMidnaTired() { nofralloc #include "asm/d/a/d_a_alink/checkMidnaTired__9daMidna_cFv.s" } #pragma pop /* 80141A84-80141A94 13C3C4 0010+00 1/1 0/0 0/0 .text onNoServiceWait__9daMidna_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMidna_c::onNoServiceWait() { - nofralloc -#include "asm/d/a/d_a_alink/onNoServiceWait__9daMidna_cFv.s" +void daMidna_c::onNoServiceWait() { + onEndResetStateFlg0(NoServiceWait); } -#pragma pop /* 80141A94-80141ACC 13C3D4 0038+00 1/1 0/0 0/0 .text setControllActorData__8daCrod_cFv */ @@ -39545,14 +36274,12 @@ extern "C" asm void func_80141ACC(void* _this, fopAc_ac_c const* param_0, #pragma pop /* 80141AE8-80141B04 13C428 001C+00 1/1 4/4 0/0 .text cLib_calcTimer<Uc>__FPUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_80141AE8(void* _this, u8* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/func_80141AE8.s" +extern "C" int func_80141AE8(u8* pTimer) { + if (*pTimer != 0) { + *pTimer -= 1; + } + return *pTimer; } -#pragma pop /* ############################################################################################## */ /* 80453344-80453348 001944 0004+00 1/1 0/0 0/0 .sdata2 @77808 */ diff --git a/src/d/a/d_a_horse_static.cpp b/src/d/a/d_a_horse_static.cpp index 0c655b3b69..6b8db45607 100644 --- a/src/d/a/d_a_horse_static.cpp +++ b/src/d/a/d_a_horse_static.cpp @@ -7,117 +7,60 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct e_wb_class { - /* 80037C7C */ void checkWait(); - /* 80037C90 */ void setPlayerRideNow(); - /* 80037CB0 */ void setPlayerRide(); - /* 80037CF4 */ void getOff(); - /* 80037D68 */ void checkDownDamage(); - /* 80037D94 */ void checkNormalRideMode() const; - /* 80037DBC */ void setRunRideMode(); -}; - -struct daTagHstop_c { - static u8 m_top[4 + 4 /* padding */]; -}; - -// -// Forward References: -// - -extern "C" void checkWait__10e_wb_classFv(); -extern "C" void setPlayerRideNow__10e_wb_classFv(); -extern "C" void setPlayerRide__10e_wb_classFv(); -extern "C" void getOff__10e_wb_classFv(); -extern "C" void checkDownDamage__10e_wb_classFv(); -extern "C" void checkNormalRideMode__10e_wb_classCFv(); -extern "C" void setRunRideMode__10e_wb_classFv(); -extern "C" u8 m_top__12daTagHstop_c[4 + 4 /* padding */]; - -// -// External References: -// +BOOL e_wb_class::checkWait() { + return unk1460 == 0x2A; +} -extern "C" void setLinkRiding__14Z2CreatureRideFb(); +void e_wb_class::setPlayerRideNow() { + unk1680 = 0x67; + unk1460 = 0; + unk1726 |= 3; +} -// -// Declarations: -// +void e_wb_class::setPlayerRide() { + unk1680 = 0x65; + unk1460 = 0; + unk1726 |= 3; -/* 80037C7C-80037C90 0325BC 0014+00 0/0 1/1 0/0 .text checkWait__10e_wb_classFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void e_wb_class::checkWait() { - nofralloc -#include "asm/d/a/d_a_horse_static/checkWait__10e_wb_classFv.s" + mZ2Ride.setLinkRiding(true); } -#pragma pop -/* 80037C90-80037CB0 0325D0 0020+00 0/0 2/2 0/0 .text setPlayerRideNow__10e_wb_classFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void e_wb_class::setPlayerRideNow() { - nofralloc -#include "asm/d/a/d_a_horse_static/setPlayerRideNow__10e_wb_classFv.s" +void e_wb_class::getOff() { + if (!checkDownDamage() || unk1680 == 0x67) { + unk1680 = 0; + } else { + unk1682 = 0; + } + unk1460 = 0; + unk1726 &= 0xfffc; + mZ2Ride.setLinkRiding(false); } -#pragma pop -/* 80037CB0-80037CF4 0325F0 0044+00 0/0 3/3 0/0 .text setPlayerRide__10e_wb_classFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void e_wb_class::setPlayerRide() { - nofralloc -#include "asm/d/a/d_a_horse_static/setPlayerRide__10e_wb_classFv.s" -} -#pragma pop +BOOL e_wb_class::checkDownDamage() { + bool downDamage = false; + s16 tmp = unk1680; -/* 80037CF4-80037D68 032634 0074+00 0/0 1/1 0/0 .text getOff__10e_wb_classFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void e_wb_class::getOff() { - nofralloc -#include "asm/d/a/d_a_horse_static/getOff__10e_wb_classFv.s" + if (tmp != 0x65 && tmp != 0x66 && tmp != 0x15) { + downDamage = true; + } + return downDamage; } -#pragma pop -/* 80037D68-80037D94 0326A8 002C+00 1/1 2/2 0/0 .text checkDownDamage__10e_wb_classFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void e_wb_class::checkDownDamage() { - nofralloc -#include "asm/d/a/d_a_horse_static/checkDownDamage__10e_wb_classFv.s" -} -#pragma pop +u8 e_wb_class::checkNormalRideMode() const { + bool normalRideMode = false; -/* 80037D94-80037DBC 0326D4 0028+00 0/0 2/2 0/0 .text checkNormalRideMode__10e_wb_classCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void e_wb_class::checkNormalRideMode() const { - nofralloc -#include "asm/d/a/d_a_horse_static/checkNormalRideMode__10e_wb_classCFv.s" + if (unk1680 != 0x66 || unk1460 < 1) { + normalRideMode = 1; + } + return normalRideMode; } -#pragma pop -/* 80037DBC-80037DE4 0326FC 0028+00 0/0 1/1 0/0 .text setRunRideMode__10e_wb_classFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void e_wb_class::setRunRideMode() { - nofralloc -#include "asm/d/a/d_a_horse_static/setRunRideMode__10e_wb_classFv.s" +void e_wb_class::setRunRideMode() { + if (unk1680 == 0x65) { + unk1460 = 0; + unk1680 = 0x15; + unk1682 = 0x65; + } } -#pragma pop -/* ############################################################################################## */ -/* 80450DF8-80450E00 0002F8 0004+04 0/0 1/1 3/3 .sbss m_top__12daTagHstop_c */ -u8 daTagHstop_c::m_top[4 + 4 /* padding */]; +daTagHstop_c* daTagHstop_c::m_top; diff --git a/src/d/a/d_a_player.cpp b/src/d/a/d_a_player.cpp index 4da13e5864..85a9045b37 100644 --- a/src/d/a/d_a_player.cpp +++ b/src/d/a/d_a_player.cpp @@ -7,6 +7,7 @@ #include "dol2asm.h" #include "dolphin/mtx/mtx.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" // // Types: @@ -18,21 +19,6 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct ResTIMG {}; - -struct daPy_sightPacket_c { - /* 80140CDC */ ~daPy_sightPacket_c(); - /* 8015F1A0 */ void draw(); - /* 8015F2FC */ void setSight(); - /* 8015F384 */ void setSightImage(ResTIMG*); -}; - -struct daPy_boomerangMove_c { - /* 8015E5B0 */ void initOffset(cXyz const*); - /* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16); - /* 8015E87C */ void bgCheckAfterOffset(cXyz const*); -}; - struct daAlink_c { /* 800A0744 */ void setLookPosFromOut(cXyz*); /* 800BDF60 */ void startRestartRoom(u32, int, int, int); @@ -43,27 +29,15 @@ struct daAlink_c { /* 800E7AEC */ void setFmChainPosFromOut(fopAc_ac_c*, cXyz*, int); }; -struct dStage_roomControl_c { - static u8 mDemoArcName[10 + 2 /* padding */]; -}; - struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); /* 8003C400 */ void getIDRes(char const*, u16, dRes_info_c*, int); }; -struct dDlst_base_c {}; - -struct dDlst_list_c { - /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); -}; - struct JMath { static u8 sincosTable_[65536]; }; -struct JKRSolidHeap {}; - struct J3DSys { /* 8031073C */ void reinitGX(); }; @@ -373,7 +347,7 @@ BOOL daPy_py_c::checkFishingRodItem(int i_item_id) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::checkFishingRodItem(int param_0) { +asm BOOL daPy_py_c::checkFishingRodItem(int param_0) { nofralloc #include "asm/d/a/d_a_player/checkFishingRodItem__9daPy_py_cFi.s" } @@ -415,7 +389,7 @@ asm void daPy_py_c::checkDrinkBottleItem(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::checkOilBottleItem(int param_0) { +asm BOOL daPy_py_c::checkOilBottleItem(int param_0) { nofralloc #include "asm/d/a/d_a_player/checkOilBottleItem__9daPy_py_cFi.s" } @@ -497,14 +471,14 @@ asm void daPy_actorKeep_c::setActor() { /* 8015ECB8-8015ECFC 1595F8 0044+00 0/0 59/59 4/4 .text setData__16daPy_actorKeep_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_actorKeep_c::setData(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_player/setData__16daPy_actorKeep_cFP10fopAc_ac_c.s" +void daPy_actorKeep_c::setData(fopAc_ac_c* pActor) { + if (pActor != NULL) { + mActor = pActor; + mID = fopAcM_GetID(pActor); + } else { + clearData(); + } } -#pragma pop void daPy_actorKeep_c::clearData() { mID = 0xffffffff; @@ -680,42 +654,57 @@ SECTION_SDATA2 static u8 pigGanonArcName[6 + 2 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_anmHeap_c::loadData(u16 param_0) { +asm J3DAnmBase* daPy_anmHeap_c::loadData(u16 param_0) { nofralloc #include "asm/d/a/d_a_player/loadData__14daPy_anmHeap_cFUs.s" } #pragma pop /* 8015F068-8015F0D0 1599A8 0068+00 0/0 9/9 5/5 .text loadDataIdx__14daPy_anmHeap_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_anmHeap_c::loadDataIdx(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_player/loadDataIdx__14daPy_anmHeap_cFUs.s" +J3DAnmBase* daPy_anmHeap_c::loadDataIdx(u16 pID) { + J3DAnmBase* tmp; + + if (pID == mIdx && mArcNo == 0xffff) { + tmp = NULL; + } else { + mIdx = pID; + mArcNo = 0xffff; + if (mPriIdx == 0xffff) { + tmp = loadData(pID); + } else { + tmp = NULL; + } + } + return tmp; } -#pragma pop /* 8015F0D0-8015F118 159A10 0048+00 0/0 3/3 0/0 .text loadDataPriIdx__14daPy_anmHeap_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_anmHeap_c::loadDataPriIdx(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_player/loadDataPriIdx__14daPy_anmHeap_cFUs.s" +J3DAnmBase* daPy_anmHeap_c::loadDataPriIdx(u16 pID) { + J3DAnmBase* tmp; + + if (pID == mPriIdx || mArcNo != 0xffff) { + tmp = NULL; + } else { + mPriIdx = pID; + tmp = loadData(pID); + } + return tmp; } -#pragma pop /* 8015F118-8015F168 159A58 0050+00 0/0 5/5 5/5 .text loadDataDemoRID__14daPy_anmHeap_cFUsUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_anmHeap_c::loadDataDemoRID(u16 param_0, u16 param_1) { - nofralloc -#include "asm/d/a/d_a_player/loadDataDemoRID__14daPy_anmHeap_cFUsUs.s" +J3DAnmBase* daPy_anmHeap_c::loadDataDemoRID(u16 pID, u16 pArcNo) { + J3DAnmBase* tmp; + + if (pID == mIdx && pArcNo == mArcNo) { + tmp = NULL; + } else { + mIdx = pID; + mArcNo = pArcNo; + tmp = loadData(pID); + } + return tmp; } -#pragma pop /* 8015F168-8015F1A0 159AA8 0038+00 1/1 4/4 0/0 .text setAnimeHeap__14daPy_anmHeap_cFv */ #pragma push diff --git a/src/d/bg/d_bg_s_lin_chk.cpp b/src/d/bg/d_bg_s_lin_chk.cpp index d590bef067..c5a23ae34f 100644 --- a/src/d/bg/d_bg_s_lin_chk.cpp +++ b/src/d/bg/d_bg_s_lin_chk.cpp @@ -11,54 +11,11 @@ // Types: // -struct fopAc_ac_c {}; - -struct dBgS_RopeLinChk { - /* 8007838C */ dBgS_RopeLinChk(); - /* 800783E8 */ ~dBgS_RopeLinChk(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); - /* 80078E80 */ void SetCam(); - /* 80078E98 */ void SetLink(); - /* 80078EB0 */ void SetArrow(); - /* 80078EBC */ void SetBomb(); - /* 80078ED4 */ void SetBoomerang(); - /* 80078EE0 */ void SetRope(); - /* 80078EF8 */ void SetHorse(); -}; - -struct dBgS_ObjLinChk { - /* 80077F5C */ dBgS_ObjLinChk(); - /* 80077FB8 */ ~dBgS_ObjLinChk(); -}; - -struct dBgS_LinkLinChk { - /* 80078030 */ dBgS_LinkLinChk(); - /* 8007808C */ ~dBgS_LinkLinChk(); -}; - -struct cXyz {}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - struct dBgS_HorseLinChk { /* 80078460 */ dBgS_HorseLinChk(); /* 800784BC */ ~dBgS_HorseLinChk(); }; -struct dBgS_Chk { - /* 8007749C */ dBgS_Chk(); - /* 800774E8 */ ~dBgS_Chk(); - /* 80077560 */ void GetPolyPassChkInfo(); - /* 80077564 */ void GetGrpPassChkInfo(); -}; - struct dBgS_CamLinChk_NorWtr { /* 80077E78 */ dBgS_CamLinChk_NorWtr(); /* 80077EE4 */ ~dBgS_CamLinChk_NorWtr(); @@ -69,27 +26,11 @@ struct dBgS_CamLinChk { /* 80077E00 */ ~dBgS_CamLinChk(); }; -struct dBgS_BoomerangLinChk { - /* 800782B8 */ dBgS_BoomerangLinChk(); - /* 80078314 */ ~dBgS_BoomerangLinChk(); -}; - struct dBgS_BombLinChk { /* 80078104 */ dBgS_BombLinChk(); /* 80078160 */ ~dBgS_BombLinChk(); }; -struct dBgS_ArrowLinChk { - /* 800781D8 */ dBgS_ArrowLinChk(); - /* 80078240 */ ~dBgS_ArrowLinChk(); -}; - -struct cBgS_LinChk { - /* 80267D5C */ cBgS_LinChk(); - /* 80267DBC */ ~cBgS_LinChk(); - /* 80267ED0 */ void Set2(cXyz const*, cXyz const*, unsigned int); -}; - // // Forward References: // diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index 05d7740c05..2373150ef8 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -55,8 +55,6 @@ struct dMapInfo_n { /* 8003EE5C */ void getMapPlayerPos(); }; -struct dKy_tevstr_c {}; - struct _GXTexObj {}; struct dDlst_shadowControl_c { @@ -276,7 +274,6 @@ extern "C" extern u32 g_saftyWhiteColor; // External References: // -extern "C" void OSReport_Error(); extern "C" void mDoAud_setSceneName__FPCcll(); extern "C" void mDoAud_resetProcess__Fv(); extern "C" void mDoExt_destroyExpHeap__FP10JKRExpHeap(); diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index 428ae98753..a958077a0e 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -39,8 +39,6 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct JKRSolidHeap {}; - struct J3DGXColor {}; struct J3DTevBlock { @@ -136,7 +134,6 @@ extern "C" extern u8 data_80450688[8]; // External References: // -SECTION_INIT void memcpy(); extern "C" void play__14mDoExt_baseAnmFv(); extern "C" void init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss(); extern "C" void entry__13mDoExt_bpkAnmFP16J3DMaterialTablef(); @@ -190,7 +187,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); extern "C" void tan(); extern "C" extern void* __vt__25mDoExt_McaMorfCallBack1_c[3]; extern "C" u8 dist_table__12dAttention_c[6552]; diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 8c9799c156..ce391e069a 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -184,10 +184,6 @@ struct J3DSys { /* 8031073C */ void reinitGX(); }; -struct J3DShapePacket { - /* 80312FBC */ void drawFast(); -}; - struct J3DShape { /* 80315300 */ void loadPreDrawSetting() const; diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp index ba34ac4abf..12820dda0e 100644 --- a/src/d/d_eye_hl.cpp +++ b/src/d/d_eye_hl.cpp @@ -11,21 +11,6 @@ // Types: // -struct J3DModelData {}; - -struct dEyeHL_c { - /* 8009C964 */ void entry(J3DModelData*, char const*); - /* 8009CA28 */ void remove(); -}; - -struct dEyeHL_mng_c { - /* 8009CA48 */ void update(); - /* 8009CB14 */ void entry(dEyeHL_c*); - /* 8009CB34 */ void remove(dEyeHL_c*); - - static u8 m_obj[4 + 4 /* padding */]; -}; - struct JUTNameTab { /* 802DEAF8 */ void getName(u16) const; }; diff --git a/src/d/d_jnt_col.cpp b/src/d/d_jnt_col.cpp index 90bd03c472..9089295591 100644 --- a/src/d/d_jnt_col.cpp +++ b/src/d/d_jnt_col.cpp @@ -11,22 +11,6 @@ // Types: // -struct csXyz {}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; - /* 80266C18 */ void operator/(f32) const; - /* 80266F48 */ void normalizeZP(); - /* 80267128 */ void atan2sX_Z() const; - /* 80267150 */ void atan2sY_XZ() const; - - static u8 BaseZ[12]; -}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -35,27 +19,6 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct fopAc_ac_c {}; - -struct cM3dGLin { - /* 80036A5C */ ~cM3dGLin(); - /* 8026F2E8 */ void SetStartEnd(cXyz const&, cXyz const&); -}; - -struct dJntColData_c {}; - -struct J3DModel {}; - -struct dJntCol_c { - /* 80035C8C */ dJntCol_c(); - /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); - /* 80035CC8 */ void setNowLine(cM3dGLin*, cXyz const*, csXyz const*, cXyz*); - /* 80035DC8 */ void searchNearPos(cM3dGLin const*, cXyz const*, cXyz*, int) const; - /* 80036AEC */ void getArrowOffsetPosAndAngle(cXyz const*, csXyz const*, cXyz*, cXyz*) const; - /* 80036C44 */ void getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const; - /* 80036FA8 */ void setArrowPosAndAngle(cXyz const*, cXyz const*, int, cXyz*, csXyz*); -}; - struct cM3dGSph { /* 80036AA4 */ ~cM3dGSph(); /* 8026F664 */ void Set(cXyz const&, f32); @@ -113,13 +76,6 @@ extern "C" void crossInfLin__8cM3dGPlaCFRC4cXyzRC4cXyzR4cXyz(); extern "C" void SetupNP0__8cM3dGPlaFRC3VecRC3Vec(); extern "C" void Set__8cM3dGSphFRC4cXyzf(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXInverse(); -extern "C" void PSMTXMultVec(); -extern "C" void PSMTXMultVecSR(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECDotProduct(); -extern "C" void PSVECSquareDistance(); extern "C" void _savegpr_19(); extern "C" void _savegpr_27(); extern "C" void _savegpr_28(); @@ -241,7 +197,7 @@ asm void dJntCol_c::searchNearPos(cM3dGLin const* param_0, cXyz const* param_1, #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGLin::~cM3dGLin() { +extern "C" asm void __dt__8cM3dGLinFv() { nofralloc #include "asm/d/d_jnt_col/__dt__8cM3dGLinFv.s" } diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 080232bb49..40614e185b 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -63,8 +63,6 @@ struct JUTNameTab { /* 802DEAF8 */ void getName(u16) const; }; -struct JKRSolidHeap {}; - struct JKRMemBreakFlag {}; struct JKRMemArchive { @@ -216,8 +214,6 @@ extern "C" extern char const* const d_d_resorce__stringBase0; // External References: // -extern "C" void OSReport_Error(); -extern "C" void OSReport_Warning(); extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void setTevStageInfo__11J3DTevStageFRC15J3DTevStageInfo(); extern "C" void mDoExt_getGameHeap__Fv(); @@ -258,8 +254,6 @@ extern "C" void load__22J3DModelLoaderDataBaseFPCvUl(); extern "C" void load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag(); extern "C" void setResource__20J3DAnmLoaderDataBaseFP10J3DAnmBasePCv(); extern "C" void DCStoreRangeNoSync(); -extern "C" void OSLockMutex(); -extern "C" void OSUnlockMutex(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_20(); diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index 75e4d501bc..1fb2129d8b 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -79,17 +79,6 @@ struct J3DModelData { /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); }; -struct Vec {}; - -struct cXyz { - /* 80009184 */ ~cXyz(); - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; -}; - -struct _GXColorS10 {}; - struct dScnKy_env_light_c { /* 8019F2E8 */ dScnKy_env_light_c(); /* 8019F4FC */ void setDaytime(); @@ -128,8 +117,6 @@ struct dPa_levelEcallBack {}; struct csXyz {}; -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*, @@ -194,11 +181,6 @@ struct WIND_INF_ENTITY { /* 8019F4F4 */ WIND_INF_ENTITY(); }; -struct LIGHT_INFLUENCE { - /* 800CFC7C */ ~LIGHT_INFLUENCE(); - /* 8019F4F8 */ LIGHT_INFLUENCE(); -}; - struct JUTNameTab { /* 802DEAF8 */ void getName(u16) const; }; @@ -547,8 +529,6 @@ extern "C" void PSMTXConcat(); extern "C" void PSMTXTrans(); extern "C" void C_MTXLightPerspective(); extern "C" void PSMTXMultVec(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECSquareDistance(); extern "C" void GXInitLightAttn(); extern "C" void GXInitLightSpot(); extern "C" void GXInitLightDistAttn(); diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index 04f7a7da93..1495d0aa91 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -11,20 +11,12 @@ // Types: // -struct mesg_flow_node_event {}; - -struct mesg_flow_node_branch {}; - -struct mesg_flow_node {}; - struct _GXColor {}; struct mDoGph_gInf_c { /* 80007FD8 */ void fadeOut(f32, _GXColor&); }; -struct fopAc_ac_c {}; - struct daPy_py_c { /* 8015F3FC */ void getAttentionOffsetY(); /* 8015F954 */ void setMidnaMotionNum(int); @@ -130,133 +122,6 @@ struct dMsgObject_c { /* 8023864C */ void setSelectCancelPos(u8); }; -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F48 */ ~dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A13C */ void checkOpenDoor(fopAc_ac_c*, int*); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); - /* 8024A424 */ void checkEventRender(int*, int*, int*, int*); - /* 8024A4C4 */ void remove(); - /* 8024A528 */ void getEventId(int*); - /* 8024A538 */ void getMsgNo(); - /* 8024A540 */ void getNowMsgNo(); - /* 8024A548 */ void getMsg(); - /* 8024A580 */ void setInitValue(int); - /* 8024A618 */ void setInitValueGroupChange(int, fopAc_ac_c**); - /* 8024A6EC */ void getMsgDataBlock(char const*); - /* 8024A784 */ void getInitNodeIndex(u16); - /* 8024A7CC */ void setNodeIndex(u16, fopAc_ac_c**); - /* 8024A95C */ void setSelectMsg(mesg_flow_node*, mesg_flow_node*, fopAc_ac_c*); - /* 8024AA50 */ void setNormalMsg(mesg_flow_node*, fopAc_ac_c*); - /* 8024AB30 */ void messageNodeProc(fopAc_ac_c*, fopAc_ac_c**); - /* 8024AD54 */ void branchNodeProc(fopAc_ac_c*, fopAc_ac_c**); - /* 8024ADEC */ void eventNodeProc(fopAc_ac_c*, fopAc_ac_c**); - /* 8024AFF8 */ void nodeProc(fopAc_ac_c*, fopAc_ac_c**); - /* 8024B0F0 */ void getParam(u16*, u16*, u8*); - /* 8024B108 */ void getParam(u8*, u8*); - /* 8024B130 */ void getParam(u8*); - /* 8024B138 */ void query001(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B180 */ void query002(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B208 */ void query003(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B250 */ void query004(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B2C0 */ void query005(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B2F8 */ void query006(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B32C */ void query007(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B45C */ void query008(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B4A4 */ void query009(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B4D0 */ void query010(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B504 */ void query011(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B54C */ void query012(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B584 */ void query013(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B5BC */ void query014(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B5F4 */ void query015(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B62C */ void query016(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B664 */ void query017(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B6A8 */ void query018(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B6EC */ void query019(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B730 */ void query020(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B774 */ void query021(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B8E4 */ void query022(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B918 */ void query023(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B954 */ void query024(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B974 */ void query025(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B9BC */ void query026(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024B9E8 */ void query027(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BA4C */ void query028(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BAA0 */ void query029(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BAE0 */ void query030(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BB18 */ void query031(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BB74 */ void query032(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BB9C */ void query033(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BBE4 */ void query034(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BC14 */ void query035(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BC3C */ void query036(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BC80 */ void query037(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BCC4 */ void query038(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BDB0 */ void query039(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BE4C */ void query040(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BF50 */ void query041(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024BFEC */ void query042(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C0A8 */ void query043(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C144 */ void query044(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C18C */ void query045(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C218 */ void query046(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C248 */ bool query047(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C250 */ void query048(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C2A0 */ void query049(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C2FC */ void query050(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C340 */ void query051(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C3A0 */ void query052(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C3D4 */ void query053(mesg_flow_node_branch*, fopAc_ac_c*, int); - /* 8024C3FC */ void event000(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C488 */ void event001(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C514 */ void event002(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C550 */ void event003(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C590 */ void event004(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C5F0 */ void event005(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C654 */ void event006(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C694 */ void event007(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C6D8 */ void event008(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C744 */ void event009(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C76C */ void event010(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C7F8 */ void event011(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C884 */ bool event012(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C88C */ void event013(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C8CC */ void event014(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024C994 */ void event015(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CA5C */ void event016(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CA94 */ void event017(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CBB0 */ void event018(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CCA4 */ bool event019(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CCAC */ void event020(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CD84 */ void event021(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CDAC */ void event022(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CE40 */ void event023(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CF2C */ void event024(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CF54 */ void event025(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024CF9C */ void event026(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D004 */ void event027(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D3C4 */ void event028(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D500 */ void event029(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D544 */ void event030(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D5BC */ void event031(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D5EC */ void event032(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D6BC */ void event033(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D788 */ void event034(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D7C8 */ void event035(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D870 */ void event036(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D8C4 */ void event037(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D918 */ void event038(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D93C */ void event039(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024D970 */ void event040(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024DA78 */ void event041(mesg_flow_node_event*, fopAc_ac_c*); - /* 8024DAA8 */ bool event042(mesg_flow_node_event*, fopAc_ac_c*); - - static u8 mQueryList[636]; - static u8 mEventList[516]; -}; - struct dMeter2Info_c { /* 8021E0C4 */ void resetMiniGameItem(bool); }; @@ -265,12 +130,6 @@ struct dComIfG_play_c { /* 8002B36C */ void setItemBombNumCount(u8, s16); }; -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - struct dAttention_c { /* 80073838 */ void checkDistance(cXyz*, s16, cXyz*, f32, f32, f32, f32); /* 8014B010 */ void getDistTable(int); diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp index 3807c52278..b6fdcb30ab 100644 --- a/src/d/particle/d_particle.cpp +++ b/src/d/particle/d_particle.cpp @@ -27,13 +27,6 @@ struct mDoDvdThd_toMainRam_c { /* 80016394 */ void create(char const*, u8, JKRHeap*); }; -struct fopAc_ac_c {}; - -struct cXyz { - /* 80266B84 */ void operator*(f32) const; - /* 80267128 */ void atan2sX_Z() const; -}; - struct fopAcM_wt_c { /* 8001DD84 */ void waterCheck(cXyz const*); @@ -44,15 +37,6 @@ struct daPy_py_c { /* 8015F424 */ void checkNowWolfEyeUp(); }; -struct _GXTexMapID {}; - -struct JPABaseEmitter { - /* 8027EA40 */ void createParticle(); - /* 8027EF30 */ void getCurrentCreateNumber() const; - /* 8027EF40 */ void getDrawCount() const; - /* 8027EF50 */ void loadTexture(u8, _GXTexMapID); -}; - struct JPABaseParticle { /* 80280548 */ void getWidth(JPABaseEmitter const*) const; /* 80280568 */ void getHeight(JPABaseEmitter const*) const; @@ -68,22 +52,8 @@ struct dPa_wbPcallBack_c { /* 8004FECC */ ~dPa_wbPcallBack_c(); }; -struct JPAParticleCallBack { - /* 800183D4 */ void execute(JPABaseEmitter*, JPABaseParticle*); - /* 800183D8 */ void draw(JPABaseEmitter*, JPABaseParticle*); - /* 8027EFA4 */ ~JPAParticleCallBack(); -}; - struct JPADrawInfo {}; -struct JPAEmitterCallBack { - /* 80050368 */ void execute(JPABaseEmitter*); - /* 8005036C */ void draw(JPABaseEmitter*); - /* 80050370 */ void drawAfter(JPABaseEmitter*); - /* 80050374 */ void executeAfter(JPABaseEmitter*); - /* 8027E6A4 */ ~JPAEmitterCallBack(); -}; - struct ResTIMG {}; struct JPAResourceManager { @@ -131,8 +101,6 @@ struct dPa_simpleData_c { /* 8004B060 */ dPa_simpleData_c(); }; -struct csXyz {}; - struct dPa_setColorEcallBack { /* 800502B0 */ void draw(JPABaseEmitter*); /* 800502E0 */ void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8); @@ -208,18 +176,6 @@ struct dPa_light8EcallBack { /* 800501E0 */ void drawAfter(JPABaseEmitter*); }; -struct dPa_levelEcallBack { - /* 8004FB18 */ ~dPa_levelEcallBack(); - /* 8004FB8C */ void cleanup(); -}; - -struct dPa_hermiteEcallBack_c { - /* 8004F6B8 */ void setOldPosP(cXyz const*, cXyz const*); - /* 8004F6C4 */ void executeAfter(JPABaseEmitter*); - /* 8004FABC */ void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8); - /* 8004FCC8 */ ~dPa_hermiteEcallBack_c(); -}; - struct dPa_gen_d_light8PcallBack { /* 8004DD18 */ void execute(JPABaseEmitter*, JPABaseParticle*); /* 8004ED44 */ void draw(JPABaseEmitter*, JPABaseParticle*); @@ -355,8 +311,6 @@ struct cBgS { /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; }; -struct Vec {}; - struct JMath { static u8 sincosTable_[65536]; }; @@ -665,15 +619,7 @@ extern "C" void removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern(); extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); extern "C" void entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern(); extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); -extern "C" void PSMTXIdentity(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXRotRad(); -extern "C" void PSMTXRotAxisRad(); -extern "C" void PSMTXScale(); extern "C" void PSMTXMultVec(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECCrossProduct(); -extern "C" void PSVECSquareDistance(); extern "C" void GXSetVtxDesc(); extern "C" void GXClearVtxDesc(); extern "C" void GXSetVtxAttrFmt(); diff --git a/src/d/particle/d_particle_copoly.cpp b/src/d/particle/d_particle_copoly.cpp index 81ef854fcc..fe6fcbace0 100644 --- a/src/d/particle/d_particle_copoly.cpp +++ b/src/d/particle/d_particle_copoly.cpp @@ -11,14 +11,6 @@ // Types: // -struct dKy_tevstr_c {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct cXyz {}; - struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -31,20 +23,6 @@ struct dPa_control_c { dKy_tevstr_c const*, u32, u32, csXyz const*, cXyz const*, s8); }; -struct dBgS_Acch {}; - -struct dPaPo_c { - /* 80050C9C */ void init(dBgS_Acch*, f32, f32); - /* 80050CC4 */ void checkWaterIn(cXyz*, cXyz const*, dKy_tevstr_c const*, u32, s8, f32, f32); - /* 80050E7C */ void setEffect(u32*, int, dKy_tevstr_c const*, cXyz const*, u32, u32, - cXyz const*, csXyz const*, s8, u8*, u8*); - /* 80051008 */ void setEffectCenter(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*, - csXyz const*, cXyz const*, s8, f32, f32); - /* 8005113C */ void clearID(u32*, u8*); - /* 80051488 */ void getCenterEffType(int) const; - /* 80051524 */ void getCenterEmitter(int, int); -}; - struct dPaPoT_c { /* 8005115C */ void setEffectTwo(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*, cXyz const*, cXyz const*, csXyz const*, cXyz const*, s8, f32, diff --git a/src/d/save/d_save.cpp b/src/d/save/d_save.cpp index 479eccb951..8320826fb6 100644 --- a/src/d/save/d_save.cpp +++ b/src/d/save/d_save.cpp @@ -287,11 +287,11 @@ static u8 dSv_item_rename(u8 item_id) { } void dSv_player_status_a_c::init() { - mMaxHealth = 15; - mCurrentHealth = 12; - mCurrentRupees = 0; - mMaxLanternOil = 0; - mCurrentLanternOil = 0; + mMaxLife = 15; + mLife = 12; + mRupee = 0; + mMaxOil = 0; + mOil = 0; unk10 = 0; for (int i = 0; i < 4; i++) { @@ -301,20 +301,20 @@ void dSv_player_status_a_c::init() { } for (int i = 0; i < 6; i++) { - mEquipment[i] = 0; + mSelectEquip[i] = 0; } - mEquipment[0] = WEARS_CASUAL; - mEquipment[1] = NO_ITEM; - mEquipment[2] = NO_ITEM; - mEquipment[3] = NO_ITEM; - mEquipment[4] = NO_ITEM; - mCurrentWallet = WALLET; + mSelectEquip[COLLECT_CLOTHING] = WEARS_CASUAL; + mSelectEquip[COLLECT_SWORD] = NO_ITEM; + mSelectEquip[COLLECT_SHIELD] = NO_ITEM; + mSelectEquip[COLLECT_SMELL] = NO_ITEM; + mSelectEquip[B_BUTTON_ITEM] = NO_ITEM; + mWalletSize = WALLET; mMaxMagic = 0; - mCurrentMagic = 0; + mMagic = 0; mMagicFlag = 0; unk29 = 0; - unk30 = 0; + mTransformStatus = 0; for (int i = 0; i < 3; i++) { unk31[i] = 0; @@ -348,8 +348,8 @@ u8 dSv_player_status_a_c::getMixItemIndex(signed int i_no) const { } u16 dSv_player_status_a_c::getRupeeMax(void) const { - if (mCurrentWallet < 3) { // if you make this a default, it wont match. Compiler, pls. - switch (mCurrentWallet) { + if (mWalletSize < 3) { // if you make this a default, it wont match. Compiler, pls. + switch (mWalletSize) { case WALLET: return 300; case BIG_WALLET: @@ -381,13 +381,12 @@ asm BOOL dSv_player_status_a_c::isMagicFlag(u8 param_0) const { #endif void dSv_player_status_b_c::init() { - unk4 = 0; - unk0 = 0; + mDateIpl = 0; mTransformLevelFlag = 0; mDarkClearLevelFlag = 0; unk10 = 0; - mTimeOfDay = 255.0f; - unk16 = 0; + mTime = 255.0f; + mDate = 0; for (int i = 0; i < 3; i++) { unk18[i] = 0; @@ -481,17 +480,17 @@ void dSv_player_return_place_c::set(const char* i_name, s8 i_room_id, u8 i_spawn void dSv_player_field_last_stay_info_c::init() { f32 position_val; - strcpy(mLastStage, (char*)lbl_80379234); + strcpy(mName, (char*)lbl_80379234); position_val = lbl_80451D5C; - mLastPosition.x = lbl_80451D5C; - mLastPosition.y = position_val; - mLastPosition.z = position_val; - mLastAngle = 0; + mPos.x = lbl_80451D5C; + mPos.y = position_val; + mPos.z = position_val; + mAngleY = 0; mLastSpawnId = 0; - mLastRoomId = 1; - unk24 = 0; - mLastRegion = 0; + mRegionNo = 1; + mFieldDataExistFlag = false; + mRegion = 0; for (int i = 0; i < 2; i++) { unk26[i] = 0; @@ -511,12 +510,12 @@ asm void dSv_player_field_last_stay_info_c::init() { void dSv_player_field_last_stay_info_c::set(const char* i_name, const cXyz& i_last_position, s16 i_last_angle, signed char i_last_spawn_id, u8 i_last_room_id) { - strcpy(mLastStage, i_name); + strcpy(mName, i_name); - mLastPosition = i_last_position; - mLastAngle = i_last_angle; + mPos = i_last_position; + mAngleY = i_last_angle; mLastSpawnId = i_last_spawn_id; - mLastRoomId = i_last_room_id; + mRegionNo = i_last_room_id; } void dSv_player_field_last_stay_info_c::onRegionBit(int i_region_bit) { @@ -526,12 +525,12 @@ void dSv_player_field_last_stay_info_c::onRegionBit(int i_region_bit) { if (8 <= i_region_bit) { return; } - mLastRegion |= (u8)(1 << i_region_bit); + mRegion |= (u8)(1 << i_region_bit); } BOOL dSv_player_field_last_stay_info_c::isRegionBit(int param_1) const { if ((param_1 >= 0) && (param_1 < 8)) { - return (mLastRegion & (u8)(1 << param_1)) ? TRUE : FALSE; + return (mRegion & (u8)(1 << param_1)) ? TRUE : FALSE; } return false; } @@ -2778,17 +2777,17 @@ asm int dSv_player_get_item_c::isFirstBit(u8 param_0) const { #pragma pop void dSv_player_item_record_c::init(void) { - mBow = 0; + mArrowNum = 0; for (int i = 0; i < 3; i++) { - mBombBags[i] = 0; + mBombNum[i] = 0; } for (int i = 0; i < 4; i++) { - mBottles[i] = 0; + mBottleNum[i] = 0; } - mSlingshot = 0; + mPachinkoNum = 0; for (int i = 0; i < 3; i++) { unk5[i] = 0; @@ -2796,15 +2795,15 @@ void dSv_player_item_record_c::init(void) { } void dSv_player_item_record_c::setBombNum(u8 i_bagIdx, u8 bag_id) { - mBombBags[i_bagIdx] = bag_id; + mBombNum[i_bagIdx] = bag_id; } u8 dSv_player_item_record_c::getBombNum(u8 i_bagIdx) const { - return mBombBags[i_bagIdx]; + return mBombNum[i_bagIdx]; } void dSv_player_item_record_c::setBottleNum(u8 i_bottleIdx, u8 bottle_num) { - mBottles[i_bottleIdx] = bottle_num; + mBottleNum[i_bottleIdx] = bottle_num; } /* 80033F9C-80034030 02E8DC 0094+00 0/0 1/1 0/0 .text addBottleNum__24dSv_player_item_record_cFUcs @@ -2812,18 +2811,18 @@ void dSv_player_item_record_c::setBottleNum(u8 i_bottleIdx, u8 bottle_num) { // need gameinfo inline #ifdef NONMATCHING u8 dSv_player_item_record_c::addBottleNum(u8 i_bottleIdx, s16 param_2) { - int iVar3 = mBottles[i_bottleIdx] + param_2; + int iVar3 = mBottleNum[i_bottleIdx] + param_2; dComIfGs_getItem((u8)(i_bottleIdx + 0xB), true); if (iVar3 < 0) { - mBottles[i_bottleIdx] = 0; + mBottleNum[i_bottleIdx] = 0; } else if (iVar3 > dComIfGs_getBottleMax__Fv()) { - mBottles[i_bottleIdx] = dComIfGs_getBottleMax__Fv(); + mBottleNum[i_bottleIdx] = dComIfGs_getBottleMax__Fv(); } else { - mBottles[i_bottleIdx] = iVar3; + mBottleNum[i_bottleIdx] = iVar3; } - return mBottles[i_bottleIdx]; + return mBottleNum[i_bottleIdx]; } #else #pragma push @@ -2837,29 +2836,29 @@ asm u8 dSv_player_item_record_c::addBottleNum(u8 param_0, s16 param_1) { #endif u8 dSv_player_item_record_c::getBottleNum(u8 i_bottleIdx) const { - return mBottles[i_bottleIdx]; + return mBottleNum[i_bottleIdx]; } void dSv_player_item_max_c::init(void) { for (int i = 0; i < 7; i++) { - mItemCapacities[i] = 30; + mItemMax[i] = 30; } setBombNum(NORMAL_BOMB, 30); setBombNum(WATER_BOMB, 15); setBombNum(POKE_BOMB, 10); - mItemCapacities[7] = 0; + mItemMax[7] = 0; } void dSv_player_item_max_c::setBombNum(u8 bomb_id, u8 bomb_max) { switch (bomb_id) { case NORMAL_BOMB: - mItemCapacities[1] = bomb_max; + mItemMax[NORMAL_BOMB_MAX] = bomb_max; return; case WATER_BOMB: - mItemCapacities[2] = bomb_max; + mItemMax[WATER_BOMB_MAX] = bomb_max; return; case POKE_BOMB: - mItemCapacities[6] = bomb_max; + mItemMax[POKE_BOMB_MAX] = bomb_max; return; } } @@ -2877,11 +2876,11 @@ u8 dSv_player_item_max_c::getBombNum(u8 param_1) const { switch (param_1) { case NORMAL_BOMB: - return (u8)(mItemCapacities[0x1] * iVar3); + return (u8)(mItemMax[NORMAL_BOMB_MAX] * iVar3); case WATER_BOMB: - return (u8)(mItemCapacities[0x2] * iVar3); + return (u8)(mItemMax[WATER_BOMB_MAX] * iVar3); case POKE_BOMB: - return (u8)(mItemCapacities[0x6] * iVar3); + return (u8)(mItemMax[POKE_BOMB_MAX] * iVar3); default: return 0; } @@ -2899,22 +2898,22 @@ asm u8 dSv_player_item_max_c::getBombNum(u8 param_0) const { void dSv_player_collect_c::init(void) { for (int i = 0; i < 8; i++) { - unk0[i] = 0; + mItem[i] = 0; } unk8 = 0; mCrystal = 0; mMirror = 0; unk11 = 0xFF; - mPoeCount = 0; + mPohNum = 0; } -void dSv_player_collect_c::setCollect(int param_1, u8 i_item) { - unk0[param_1] |= (u8)(1 << i_item); +void dSv_player_collect_c::setCollect(int i_item_type, u8 i_item) { + mItem[i_item_type] |= (u8)(1 << i_item); } -BOOL dSv_player_collect_c::isCollect(int param_1, u8 i_item) const { - return unk0[param_1] & (u8)(1 << i_item) ? TRUE : FALSE; +BOOL dSv_player_collect_c::isCollect(int i_item_type, u8 i_item) const { + return mItem[i_item_type] & (u8)(1 << i_item) ? TRUE : FALSE; } void dSv_player_collect_c::onCollectCrystal(u8 i_item) { @@ -2943,7 +2942,7 @@ void dSv_player_wolf_c::init(void) { void dSv_light_drop_c::init(void) { for (int i = 0; i < 4; i++) { - mLightDropCounts[i] = 0; + mLightDropNum[i] = 0; } mLightDropGetFlag = 0; @@ -2955,7 +2954,7 @@ void dSv_light_drop_c::init(void) { void dSv_light_drop_c::setLightDropNum(u8 i_nowLevel, u8 param_2) { if ((i_nowLevel < LIGHT_DROP_STAGE) || (i_nowLevel > 6)) { - mLightDropCounts[i_nowLevel] = param_2; + mLightDropNum[i_nowLevel] = param_2; } } @@ -2963,7 +2962,7 @@ u8 dSv_light_drop_c::getLightDropNum(u8 i_nowLevel) const { if ((i_nowLevel >= LIGHT_DROP_STAGE) && (i_nowLevel <= 6)) { return 0; } - return mLightDropCounts[i_nowLevel]; + return mLightDropNum[i_nowLevel]; } void dSv_light_drop_c::onLightDropGetFlag(u8 i_nowLevel) { @@ -3009,7 +3008,7 @@ BOOL dSv_letter_info_c::isLetterReadFlag(int i_no) const { void dSv_fishing_info_c::init(void) { for (int i = 0; i < 16; i++) { mFishCount[i] = 0; - unk32[i] = 0; + mMaxSize[i] = 0; } } @@ -3031,16 +3030,15 @@ void dSv_player_info_c::init(void) { d_meter2_info::dMeter2Info_c ok; - ok.getString(a, (char*)link_name, c); - ok.getString(b, (char*)epona_name, d); + ok.getString(a, (char*)mPlayerName, c); + ok.getString(b, (char*)mHorseName, d); unk4 = 0; unk0 = 0; - unk12 = 0; - unk8 = 0; + mTotalTime = 0; unk16 = 0; - unk18 = 0; - unk54 = 0; + mDeathCount = 0; + mClearCount = 0; for (int i = 0; i < 5; i++) { unk55[i] = 0; @@ -3073,15 +3071,15 @@ void dSv_player_config_c::init(void) { lbl_80451368->setOutputMode(SOUND_MODE_STEREO); } - unk2 = 0; - mVibrationStatus = 1; + mAttentionType = 0; + mVibration = 1; unk4 = 0; unk5 = 0; - unk9 = 0; - unk6 = 0x15e; - unk8 = 0; - unk10 = 0; - unk11 = 1; + mShortCut = 0; + mCalibrateDist = 0x15e; + mCalValue = 0; + mCameraControl = 0; + mPointer = 1; } #else #pragma push @@ -3120,11 +3118,11 @@ void dSv_player_config_c::setSound(u8 i_mSoundMode) { } u8 dSv_player_config_c::getVibration(void) { - return mVibrationStatus; + return mVibration; } void dSv_player_config_c::setVibration(u8 i_mVibrationStatus) { - mVibrationStatus = i_mVibrationStatus; + mVibration = i_mVibrationStatus; } void dSv_player_c::init(void) { @@ -3149,39 +3147,39 @@ void dSv_player_c::init(void) { void dSv_memBit_c::init(void) { for (int i = 0; i < 2; i++) { - area_flags_bitfields1[i] = 0; + mTbox[i] = 0; } for (int i = 0; i < 4; i++) { - area_flags_bitfields2[i] = 0; + mSwitch[i] = 0; } - rupee_flags_bitfields = 0; - small_key_flags = 0; - dungeons_flags = 0; + mItem[0] = 0; + mKeyNum = 0; + mDungeonItem = 0; } void dSv_memBit_c::onTbox(int i_no) { - area_flags_bitfields1[i_no >> 5] |= 1 << (i_no & 0x1F); + mTbox[i_no >> 5] |= 1 << (i_no & 0x1F); } void dSv_memBit_c::offTbox(int i_no) { - area_flags_bitfields1[i_no >> 5] &= ~(1 << (i_no & 0x1F)); + mTbox[i_no >> 5] &= ~(1 << (i_no & 0x1F)); } BOOL dSv_memBit_c::isTbox(int i_no) const { - return 1 << (i_no & 0x1f) & area_flags_bitfields1[i_no >> 0x5] ? TRUE : FALSE; + return 1 << (i_no & 0x1f) & mTbox[i_no >> 0x5] ? TRUE : FALSE; } void dSv_memBit_c::onSwitch(int i_no) { - (area_flags_bitfields1 + (i_no >> 0x5))[0x2] |= 0x1 << (i_no & 0x1F); + mSwitch[i_no >> 5] |= 1 << (i_no & 0x1F); } void dSv_memBit_c::offSwitch(int i_no) { - (area_flags_bitfields1 + (i_no >> 0x5))[0x2] &= ~(0x1 << (i_no & 0x1F)); + mSwitch[i_no >> 5] &= ~(1 << (i_no & 0x1F)); } BOOL dSv_memBit_c::isSwitch(int i_no) const { - return (area_flags_bitfields2[i_no >> 0x5] & 0x1 << (i_no & 0x1F)) ? TRUE : FALSE; + return (mSwitch[i_no >> 0x5] & 0x1 << (i_no & 0x1F)) ? TRUE : FALSE; } /* 8003488C-800348C4 02F1CC 0038+00 1/1 0/0 0/0 .text revSwitch__12dSv_memBit_cFi */ @@ -3189,8 +3187,8 @@ BOOL dSv_memBit_c::isSwitch(int i_no) const { #ifdef NONMATCHING BOOL dSv_memBit_c::revSwitch(int i_no) { unsigned int tmp = 1 << (i_no & 0x1F); - (area_flags_bitfields1 + (i_no >> 0x5))[0x2] ^= tmp; - return (area_flags_bitfields1 + (i_no >> 0x5))[0x2] & tmp ? TRUE : FALSE; + (mTbox + (i_no >> 0x5))[0x2] ^= tmp; + return (mTbox + (i_no >> 0x5))[0x2] & tmp ? TRUE : FALSE; } #else #pragma push @@ -3204,48 +3202,48 @@ asm int dSv_memBit_c::revSwitch(int param_0) { #endif void dSv_memBit_c::onItem(int i_no) { - (area_flags_bitfields1 + (i_no >> 0x5))[0x6] |= 0x1 << (i_no & 0x1F); + mItem[i_no >> 5] |= 1 << (i_no & 0x1F); } BOOL dSv_memBit_c::isItem(int i_no) const { - return (&rupee_flags_bitfields)[i_no >> 0x5] & 0x1 << (i_no & 0x1F) ? TRUE : FALSE; + return (mItem[i_no >> 0x5] & 1 << (i_no & 0x1F)) ? TRUE : FALSE; } void dSv_memBit_c::onDungeonItem(int i_no) { - dungeons_flags |= (u8)(1 << i_no); + mDungeonItem |= (u8)(1 << i_no); } bool dSv_memBit_c::isDungeonItem(int i_no) const { - return dungeons_flags & (u8)(1 << i_no) ? true : false; + return mDungeonItem & (u8)(1 << i_no) ? true : false; } void dSv_event_c::init(void) { for (int i = 0; i < MAX_EVENTS; i++) { - events[i] = 0; + mEvent[i] = 0; } setInitEventBit__Fv(); } void dSv_event_c::onEventBit(u16 i_no) { - events[(i_no >> 8)] |= (u8)i_no; + mEvent[(i_no >> 8)] |= (u8)i_no; } void dSv_event_c::offEventBit(u16 i_no) { - events[(i_no >> 8)] &= ~(u8)i_no; + mEvent[(i_no >> 8)] &= ~(u8)i_no; } BOOL dSv_event_c::isEventBit(u16 i_no) const { - return events[(i_no >> 8)] & (i_no & 0xFF) ? TRUE : FALSE; + return mEvent[(i_no >> 8)] & (i_no & 0xFF) ? TRUE : FALSE; } void dSv_event_c::setEventReg(u16 param_1, u8 param_2) { u8 uVar1 = (param_1 >> 8); - events[uVar1] &= ~(u8)param_1; - events[uVar1] |= param_2; + mEvent[uVar1] &= ~(u8)param_1; + mEvent[uVar1] |= param_2; } u8 dSv_event_c::getEventReg(u16 param_1) const { - return (u8)param_1 & events[param_1 >> 8]; + return (u8)param_1 & mEvent[param_1 >> 8]; } void dSv_MiniGame_c::init(void) { @@ -3254,43 +3252,43 @@ void dSv_MiniGame_c::init(void) { unk1[i] = 0; } unk4 = 120000; - unk8 = 0; - unk12 = 0; + mBalloonScore = 0; + mRaceGameTime = 0; unk16 = 0; unk20 = 0; } void dSv_memory_c::init(void) { - temp_flags.init(); + mMemBit.init(); } void dSv_memory2_c::init(void) { for (int i = 0; i < 2; i++) { - unk0[i] = 0; + mVisitedRoom[i] = 0; } } void dSv_memory2_c::onVisitedRoom(int i_no) { - unk0[i_no >> 5] |= 1 << (i_no & 0x1F); + mVisitedRoom[i_no >> 5] |= 1 << (i_no & 0x1F); } void dSv_memory2_c::offVisitedRoom(int i_no) { - unk0[i_no >> 5] &= ~(1 << (i_no & 0x1F)); + mVisitedRoom[i_no >> 5] &= ~(1 << (i_no & 0x1F)); } BOOL dSv_memory2_c::isVisitedRoom(int param_1) { - return (1 << (param_1 & 0x1F) & unk0[param_1 >> 5]) ? TRUE : FALSE; + return (1 << (param_1 & 0x1F) & mVisitedRoom[param_1 >> 5]) ? TRUE : FALSE; } bool dSv_danBit_c::init(s8 i_stage) { - if (i_stage != mStageNum) { - switch_bitfield[0] = 0; - switch_bitfield[1] = 0; - item_bitfield[0] = 0; - item_bitfield[1] = 0; - item_bitfield[2] = 0; - item_bitfield[3] = 0; - mStageNum = i_stage; + if (i_stage != mStageNo) { + mSwitch[0] = 0; + mSwitch[1] = 0; + mItem[0] = 0; + mItem[1] = 0; + mItem[2] = 0; + mItem[3] = 0; + mStageNo = i_stage; unk1 = 0; for (int i = 0; i < 16; i++) { @@ -3307,62 +3305,62 @@ bool dSv_danBit_c::init(s8 i_stage) { } void dSv_danBit_c::onSwitch(int i_no) { - switch_bitfield[i_no >> 5] |= 1 << (i_no & 0x1F); + mSwitch[i_no >> 5] |= 1 << (i_no & 0x1F); } void dSv_danBit_c::offSwitch(int i_no) { - switch_bitfield[i_no >> 5] &= ~(1 << (i_no & 0x1F)); + mSwitch[i_no >> 5] &= ~(1 << (i_no & 0x1F)); } BOOL dSv_danBit_c::isSwitch(int i_no) const { - return switch_bitfield[i_no >> 0x5] & (0x1 << (i_no & 0x1F)) ? TRUE : FALSE; + return mSwitch[i_no >> 0x5] & (0x1 << (i_no & 0x1F)) ? TRUE : FALSE; } BOOL dSv_danBit_c::revSwitch(int i_no) { int uVar1 = 1 << (i_no & 0x1F); - switch_bitfield[i_no >> 5] ^= uVar1; - return switch_bitfield[i_no >> 5] & uVar1 ? TRUE : FALSE; + mSwitch[i_no >> 5] ^= uVar1; + return mSwitch[i_no >> 5] & uVar1 ? TRUE : FALSE; } void dSv_danBit_c::onItem(int i_no) { - item_bitfield[i_no >> 5] |= 1 << (i_no & 0x1F); + mItem[i_no >> 5] |= 1 << (i_no & 0x1F); } BOOL dSv_danBit_c::isItem(int i_no) const { - return item_bitfield[i_no >> 5] & 1 << (i_no & 0x1F) ? TRUE : FALSE; + return mItem[i_no >> 5] & 1 << (i_no & 0x1F) ? TRUE : FALSE; } void dSv_zoneBit_c::init(void) { for (int i = 0; i < 2; i++) { - switch_bitfield[i] = 0; + mSwitch[i] = 0; } for (int i = 0; i < 2; i++) { - item_bitfield[i] = 0; + mItem[i] = 0; } - room_switch = 0; - room_item = 0; + mRoomSwitch = 0; + mRoomItem = 0; } void dSv_zoneBit_c::clearRoomSwitch(void) { - room_switch = 0; + mRoomSwitch = 0; } void dSv_zoneBit_c::clearRoomItem(void) { - room_item = 0; + mRoomItem = 0; } void dSv_zoneBit_c::onSwitch(int i_no) { - switch_bitfield[i_no >> 4] |= (u16)(1 << (i_no & 0xF)); + mSwitch[i_no >> 4] |= (u16)(1 << (i_no & 0xF)); } void dSv_zoneBit_c::offSwitch(int i_no) { - switch_bitfield[i_no >> 4] &= ~(1 << (i_no & 0xF)); + mSwitch[i_no >> 4] &= ~(1 << (i_no & 0xF)); } BOOL dSv_zoneBit_c::isSwitch(int i_no) const { - return switch_bitfield[i_no >> 4] & 1 << (i_no & 0xF) ? TRUE : FALSE; + return mSwitch[i_no >> 4] & 1 << (i_no & 0xF) ? TRUE : FALSE; } /* 80034D78-80034DAC 02F6B8 0034+00 1/1 0/0 0/0 .text revSwitch__13dSv_zoneBit_cFi */ @@ -3385,37 +3383,37 @@ asm int dSv_zoneBit_c::revSwitch(int param_0) { #endif void dSv_zoneBit_c::onOneSwitch(int i_no) { - room_switch |= (u16)(1 << i_no); + mRoomSwitch |= (u16)(1 << i_no); } void dSv_zoneBit_c::offOneSwitch(int i_no) { - room_switch &= ~(1 << i_no); + mRoomSwitch &= ~(1 << i_no); } BOOL dSv_zoneBit_c::isOneSwitch(int i_no) const { - return room_switch & 1 << i_no ? TRUE : FALSE; + return mRoomSwitch & 1 << i_no ? TRUE : FALSE; } BOOL dSv_zoneBit_c::revOneSwitch(int i_no) { int iVar1 = 1 << i_no; - room_switch ^= iVar1; - return room_switch & iVar1 ? TRUE : FALSE; + mRoomSwitch ^= iVar1; + return mRoomSwitch & iVar1 ? TRUE : FALSE; } void dSv_zoneBit_c::onItem(int i_no) { - item_bitfield[i_no >> 4] |= (u16)(1 << (i_no & 0xF)); + mItem[i_no >> 4] |= (u16)(1 << (i_no & 0xF)); } BOOL dSv_zoneBit_c::isItem(int i_no) const { - return item_bitfield[i_no >> 4] & 1 << (i_no & 0xF) ? TRUE : FALSE; + return mItem[i_no >> 4] & 1 << (i_no & 0xF) ? TRUE : FALSE; } void dSv_zoneBit_c::onOneItem(int i_no) { - room_item |= (u16)(1 << i_no); + mRoomItem |= (u16)(1 << i_no); } BOOL dSv_zoneBit_c::isOneItem(int i_no) const { - return room_item & 1 << i_no ? TRUE : FALSE; + return mRoomItem & 1 << i_no ? TRUE : FALSE; } void dSv_zoneActor_c::init(void) { @@ -3436,49 +3434,49 @@ BOOL dSv_zoneActor_c::is(int i_id) const { return actor_bitfield[i_id >> 5] & 1 << (i_id & 0x1F) ? TRUE : FALSE; } -void dSv_zone_c::init(int param_1) { - unk0 = param_1; - zone_bit.init(); - zone_actor.init(); +void dSv_zone_c::init(int i_roomNo) { + mRoomNo = i_roomNo; + mBit.init(); + mActor.init(); } -void dSv_restart_c::setRoom(const cXyz& i_position, s16 i_x_rotation, s8 param_3) { - unk0 = param_3; - mPosition = i_position; - mXRotation = i_x_rotation; +void dSv_restart_c::setRoom(const cXyz& i_position, s16 i_angleY, s8 i_roomNo) { + mRoomNo = i_roomNo; + mRoomPos = i_position; + mRoomAngleY = i_angleY; } -void dSv_turnRestart_c::set(const cXyz& i_position, s16 i_x_rotation, s8 param_3, u32 param_4) { +void dSv_turnRestart_c::set(const cXyz& i_position, s16 i_angleY, s8 param_3, u32 i_param) { mPosition = i_position; - mXRotation = i_x_rotation; + mAngleY = i_angleY; unk18 = param_3; - unk12 = param_4; + mParam = i_param; } void dSv_info_c::init(void) { - save_file.init(); - memory.init(); - dungeon_bit.init(-1); + mSavedata.init(); + mMemory.init(); + mDan.init(-1); initZone(); - events.init(); + mTmp.init(); } void dSv_save_c::init(void) { - player.init(); - for (int i = 0; i < 0x20; i++) { - area_flags[i].init(); + mPlayer.init(); + for (int i = 0; i < STAGE_MAX; i++) { + mSave[i].init(); } - for (int i = 0; i < 0x40; i++) { - unk_flags[i].init(); + for (int i = 0; i < STAGE2_MAX; i++) { + mSave2[i].init(); } - event_flags.init(); - minigame_flags.init(); + mEvent.init(); + mMiniGame.init(); } dSv_memory2_c* dSv_save_c::getSave2(int i_stage2No) { - return unk_flags + i_stage2No; + return &mSave2[i_stage2No]; } /* 800350BC-800350F0 02F9FC 0034+00 0/0 1/1 0/0 .text getSave__10dSv_info_cFi */ @@ -3503,14 +3501,14 @@ asm void dSv_info_c::putSave(int param_0) { void dSv_info_c::initZone(void) { for (int i = 0; i < 0x20; i++) { - zones[i].init(-1); + mZone[i].init(-1); } } u32 dSv_info_c::createZone(int param_1) { - dSv_zone_c* zone = zones; + dSv_zone_c* zone = mZone; for (int i = 0; i < 0x20; zone++, i++) { - if (zone->getUnk0() < 0) { + if (zone->getRoomNo() < 0) { zone->init(param_1); return i; } @@ -3524,15 +3522,15 @@ void dSv_info_c::onSwitch(int i_no, int i_roomNo) { } if (i_no < 0x80) { - memory.getTempFlags().onSwitch(i_no); + mMemory.getMemBit().onSwitch(i_no); } else if (i_no < 0xc0) { - dungeon_bit.onSwitch(i_no - 0x80); + mDan.onSwitch(i_no - 0x80); } else { int zoneId = dStage_roomControl_c::getZoneNo(i_roomNo); if (i_no < 0xE0) { - zones[zoneId].getZoneBit().onSwitch(i_no - 0xC0); + mZone[zoneId].getZoneBit().onSwitch(i_no - 0xC0); } else { - zones[zoneId].getZoneBit().onOneSwitch(i_no - 0xE0); + mZone[zoneId].getZoneBit().onOneSwitch(i_no - 0xE0); } } } @@ -3543,15 +3541,15 @@ void dSv_info_c::offSwitch(int i_no, int i_roomNo) { } if (i_no < 0x80) { - memory.getTempFlags().offSwitch(i_no); + mMemory.getMemBit().offSwitch(i_no); } else if (i_no < 0xc0) { - dungeon_bit.offSwitch(i_no - 0x80); + mDan.offSwitch(i_no - 0x80); } else { int zoneId = dStage_roomControl_c::getZoneNo(i_roomNo); if (i_no < 0xE0) { - zones[zoneId].getZoneBit().offSwitch(i_no - 0xC0); + mZone[zoneId].getZoneBit().offSwitch(i_no - 0xC0); } else { - zones[zoneId].getZoneBit().offOneSwitch(i_no - 0xE0); + mZone[zoneId].getZoneBit().offOneSwitch(i_no - 0xE0); } } } @@ -3563,18 +3561,18 @@ BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) const { } if (i_no < 0x80) { - value = memory.getTempFlagsConst().isSwitch(i_no); + value = mMemory.getMemBitConst().isSwitch(i_no); } else if (i_no < 0xc0) { - value = dungeon_bit.isSwitch(i_no - 0x80); + value = mDan.isSwitch(i_no - 0x80); } else { int zoneId = dStage_roomControl_c::getZoneNo(i_roomNo); if ((zoneId < 0) || (zoneId >= 0x20)) { value = FALSE; } else { if (i_no < 0xE0) { - value = zones[zoneId].getZoneBitConst().isSwitch(i_no - 0xC0); + value = mZone[zoneId].getZoneBitConst().isSwitch(i_no - 0xC0); } else { - value = zones[zoneId].getZoneBitConst().isOneSwitch(i_no - 0xE0); + value = mZone[zoneId].getZoneBitConst().isOneSwitch(i_no - 0xE0); } } } @@ -3588,15 +3586,15 @@ BOOL dSv_info_c::revSwitch(int i_no, int i_roomNo) { } if (i_no < 0x80) { - value = memory.getTempFlags().revSwitch(i_no); + value = mMemory.getMemBit().revSwitch(i_no); } else if (i_no < 0xC0) { - value = dungeon_bit.revSwitch(i_no - 0x80); + value = mDan.revSwitch(i_no - 0x80); } else { int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo); if (i_no < 0xE0) { - value = zones[zoneNo].getZoneBit().revSwitch(i_no - 0xC0); + value = mZone[zoneNo].getZoneBit().revSwitch(i_no - 0xC0); } else { - value = zones[zoneNo].getZoneBit().revOneSwitch(i_no - 0xE0); + value = mZone[zoneNo].getZoneBit().revOneSwitch(i_no - 0xE0); } } @@ -3609,15 +3607,15 @@ void dSv_info_c::onItem(int i_no, int i_roomNo) { } if (i_no < 0x80) { - dungeon_bit.onItem(i_no); + mDan.onItem(i_no); } else if (i_no < 0xA0) { - memory.getTempFlags().onItem(i_no - 0x80); + mMemory.getMemBit().onItem(i_no - 0x80); } else { int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo); if (i_no < 0xC0) { - zones[zoneNo].getZoneBit().onItem(i_no - 0xA0); + mZone[zoneNo].getZoneBit().onItem(i_no - 0xA0); } else { - zones[zoneNo].getZoneBit().onOneItem(i_no - 0xC0); + mZone[zoneNo].getZoneBit().onOneItem(i_no - 0xC0); } } } @@ -3629,15 +3627,15 @@ BOOL dSv_info_c::isItem(int i_no, int i_roomNo) const { } if (i_no < 0x80) { - value = dungeon_bit.isItem(i_no); + value = mDan.isItem(i_no); } else if (i_no < 0xA0) { - value = memory.getTempFlagsConst().isItem(i_no - 0x80); + value = mMemory.getMemBitConst().isItem(i_no - 0x80); } else { int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo); if (i_no < 0xC0) { - value = zones[zoneNo].getZoneBitConst().isItem(i_no - 0xA0); + value = mZone[zoneNo].getZoneBitConst().isItem(i_no - 0xA0); } else { - value = zones[zoneNo].getZoneBitConst().isOneItem(i_no - 0xC0); + value = mZone[zoneNo].getZoneBitConst().isOneItem(i_no - 0xC0); } } @@ -3650,7 +3648,7 @@ void dSv_info_c::onActor(int i_id, int i_roomNo) { } int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo); - zones[zoneNo].getZoneActor().on(i_id); + mZone[zoneNo].getZoneActor().on(i_id); } void dSv_info_c::offActor(int i_id, int i_roomNo) { @@ -3659,7 +3657,7 @@ void dSv_info_c::offActor(int i_id, int i_roomNo) { } int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo); - zones[zoneNo].getZoneActor().off(i_id); + mZone[zoneNo].getZoneActor().off(i_id); } BOOL dSv_info_c::isActor(int i_id, int i_roomNo) const { @@ -3668,7 +3666,7 @@ BOOL dSv_info_c::isActor(int i_id, int i_roomNo) const { } int ActorZoneNo = dStage_roomControl_c::getZoneNo(i_roomNo); - return zones[ActorZoneNo].getZoneActorConst().is(i_id); + return mZone[ActorZoneNo].getZoneActorConst().is(i_id); } /* ############################################################################################## */ diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index a41f433bd1..67005d5af5 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -18,8 +18,6 @@ struct mDoExt_morf_c { /* 8000FBC0 */ void frameUpdate(); }; -struct Vec {}; - struct cXyz { /* 80009184 */ ~cXyz(); /* 800125DC */ cXyz(); @@ -49,10 +47,6 @@ struct mDoExt_btpAnm { struct J3DAnmCluster {}; -struct J3DDeformData { - /* 8032E364 */ void setAnm(J3DAnmCluster*); -}; - struct mDoExt_blkAnm { /* 8000DA08 */ void init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16); }; @@ -213,21 +207,10 @@ struct Z2SoundObjAnime { struct ResFONT {}; -struct Quaternion {}; - struct JUtility { struct TColor {}; }; -struct JKRHeap { - /* 802CE438 */ void becomeCurrentHeap(); - /* 802CE448 */ void destroy(); - /* 802CE500 */ void free(void*, JKRHeap*); - /* 802CEB78 */ void setErrorFlag(bool); - - static u8 sCurrentHeap[4]; -}; - struct JUTResFont { /* 802DEF94 */ JUTResFont(ResFONT const*, JKRHeap*); }; @@ -247,19 +230,10 @@ struct JUTCacheFont { /* 802DD188 */ JUTCacheFont(ResFONT const*, u32, JKRHeap*); }; -struct JKRSolidHeap { - /* 802D0A24 */ void create(u32, JKRHeap*, bool); - /* 802D0BF4 */ void adjustSize(); -}; - struct JKRFileLoader { /* 802D4308 */ void removeResource(void*, JKRFileLoader*); }; -struct JKRExpHeap { - /* 802CEE2C */ void create(u32, JKRHeap*, bool); -}; - struct JKRAssertHeap { /* 802D1368 */ void create(JKRHeap*); }; @@ -727,8 +701,6 @@ extern "C" extern char const* const m_Do_m_Do_ext__stringBase0; // External References: // -extern "C" void OSReport_FatalError(); -extern "C" void OSReport_Error(); extern "C" void __dt__4cXyzFv(); extern "C" void dComIfG_getStageRes__FPCc(); extern "C" void entryZSortXluDrawList__12dDlst_list_cFP13J3DDrawBufferP9J3DPacketR4cXyz(); @@ -806,15 +778,6 @@ extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); extern "C" void JMAEulerToQuat__FsssP10Quaternion(); extern "C" void JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion(); extern "C" void DCStoreRangeNoSync(); -extern "C" void OSDisableInterrupts(); -extern "C" void OSRestoreInterrupts(); -extern "C" void OSGetCurrentThread(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXQuat(); -extern "C" void PSVECAdd(); -extern "C" void PSVECScale(); -extern "C" void PSVECSquareMag(); extern "C" void GXSetVtxDesc(); extern "C" void GXClearVtxDesc(); extern "C" void GXSetVtxAttrFmt(); |
