From 785effa0c38773eb5c13fa357a3e6189a686d06a Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sun, 19 Nov 2023 04:05:07 -0500 Subject: [PATCH] d_a_player_food start --- include/d/actor/d_a_player_main.h | 118 ++++++++++++++------------- include/f_op/f_op_camera.h | 1 + src/d/actor/d_a_player_boomerang.inc | 8 +- src/d/actor/d_a_player_bow.inc | 8 +- src/d/actor/d_a_player_climb.inc | 4 +- src/d/actor/d_a_player_crawl.inc | 6 +- src/d/actor/d_a_player_dproc.inc | 4 +- src/d/actor/d_a_player_fan.inc | 2 +- src/d/actor/d_a_player_food.inc | 90 +++++++++++++++++++- src/d/actor/d_a_player_grab.inc | 2 +- src/d/actor/d_a_player_hook.inc | 6 +- src/d/actor/d_a_player_main.cpp | 32 ++++---- src/d/actor/d_a_player_rope.inc | 14 ++-- src/d/actor/d_a_player_ship.inc | 6 +- src/d/actor/d_a_player_swim.inc | 4 +- src/d/actor/d_a_player_sword.inc | 8 +- src/d/actor/d_a_player_tact.inc | 4 +- src/d/actor/d_a_player_vomit.inc | 2 +- src/d/actor/d_a_player_whide.inc | 6 +- 19 files changed, 207 insertions(+), 118 deletions(-) diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h index 1e86591a5..103c17d50 100644 --- a/include/d/actor/d_a_player_main.h +++ b/include/d/actor/d_a_player_main.h @@ -1203,7 +1203,9 @@ public: HEAP_TYPE_UNK3_e = 3, }; - enum daPy_ANM {}; + enum daPy_ANM { + ANM_UNK_C4 = 0xC4, + }; enum daPy_UPPER { UPPER_UNK2 = 2, @@ -1236,8 +1238,8 @@ public: BOOL jointAfterCB(int, J3DTransformInfo*, Quaternion*); void jointCB0(int); void jointCB1(); - void setAnimeHeap(JKRSolidHeap*); - void setItemHeap(); + JKRHeap* setAnimeHeap(JKRSolidHeap*); + JKRHeap* setItemHeap(); void setBlurPosResource(u16); J3DAnmTransform* getItemAnimeResource(u16); void getAnimeResource(daPy_anmHeap_c*, u16, u32); @@ -1255,7 +1257,7 @@ public: void setTextureScrollResource(J3DAnmTextureSRTKey*, int); void loadTextureScrollResource(u32, int); void playTextureAnime(); - void checkSightLine(f32, cXyz*); + BOOL checkSightLine(f32, cXyz*); void setBootsModel(J3DModel**); void setItemModel(); BOOL checkUpperReadyAnime() const; @@ -1332,18 +1334,18 @@ public: void changeWaitProc(); void changeLandProc(f32); void setDamagePoint(f32); - void checkNormalDamage(int); + BOOL checkNormalDamage(int); void setDashDamage(); - void checkAtHitEnemy(dCcD_GObjInf*); - void checkElecReturnDamage(dCcD_GObjInf*, cXyz*); - void checkWallAtributeDamage(dBgS_AcchCir*); + BOOL checkAtHitEnemy(dCcD_GObjInf*); + BOOL checkElecReturnDamage(dCcD_GObjInf*, cXyz*); + BOOL checkWallAtributeDamage(dBgS_AcchCir*); void changeDamageProc(); void changeAutoJumpProc(); void changeDemoProc(); void changeDeadProc(); void getDamageVec(dCcD_GObjInf*); void setOldRootQuaternion(s16, s16, s16); - void checkRestHPAnime(); + BOOL checkRestHPAnime(); BOOL checkHeavyStateOn(); BOOL checkBottleItem(int) const; BOOL checkDrinkBottleItem(int) const; @@ -1460,16 +1462,16 @@ public: void footBgCheck(); void setWaterY(); void autoGroundHit(); - void checkAttentionPosAngle(fopAc_ac_c*, cXyz**); + BOOL checkAttentionPosAngle(fopAc_ac_c*, cXyz**); void setNeckAngle(); - void checkOriginalHatAnimation(); + BOOL checkOriginalHatAnimation(); void setHatAngle(); void setMoveSlantAngle(); void setWaistAngle(); void setWorldMatrix(); void setAtParam(u32, int, dCcG_At_Spl, u8, u8, u8, f32); void resetCurse(); - void checkLightHit(); + BOOL checkLightHit(); void setSwordAtCollision(); void getBlurTopRate(); void setCollision(); @@ -1480,14 +1482,14 @@ public: void setBgCheckParam(); u32 setParamData(int, int, int, int); BOOL checkLavaFace(cXyz*, int); - void checkFallCode(); + BOOL checkFallCode(); BOOL startRestartRoom(u32, int, f32, int); - void checkSuccessGuard(int); + BOOL checkSuccessGuard(int); void setShapeAngleOnGround(); void setStepsOffset(); void setBeltConveyerPower(); void setWindAtPower(); - void checkRoofRestart(); + BOOL checkRoofRestart(); BOOL execute(); BOOL playerDelete(); void initTextureAnime(); @@ -1534,9 +1536,9 @@ public: void setTinkleCeiverModel(); void setTalismanModel(); void setLetterModel(); - void checkCaughtShapeHide(); + BOOL checkCaughtShapeHide(); void setShapeAngleToTalkActor(); - void checkEndMessage(u32); + BOOL checkEndMessage(u32); void setTalkStartBack(); BOOL dProcTool_init(); BOOL dProcTool(); @@ -1685,8 +1687,8 @@ public: void getClimbDirectionFromAngle(); void changeClimbMoveProc(int); void setMoveBGCorrectClimb(); - void checkBgCorrectClimbMove(cXyz*, cXyz*); - void checkBgClimbMove(); + BOOL checkBgCorrectClimbMove(cXyz*, cXyz*); + BOOL checkBgClimbMove(); void procClimbUpStart_init_sub(); BOOL procClimbUpStart_init(); BOOL procClimbUpStart(); @@ -1700,9 +1702,9 @@ public: void getWHideModePolygon(cXyz*, cXyz*, cXyz*, int); void getWHideBasePos(cXyz*); void getWHideNextPos(cXyz*, cXyz*); - void checkWHideBackWall(cXyz*); - void checkWHideFrontFloor(cXyz*); - void checkWHideModeChange(cXyz*); + BOOL checkWHideBackWall(cXyz*); + BOOL checkWHideFrontFloor(cXyz*); + BOOL checkWHideModeChange(cXyz*); void changeWHideEndProc(cXyz*); BOOL procWHideReady_init(cM3dGPla*, cXyz*); BOOL procWHideReady(); @@ -1718,12 +1720,12 @@ public: void changeCrawlAutoMoveProc(cXyz*); void getCrawlMoveVec(cXyz*, cXyz*, cXyz*); void crawlBgCheck(cXyz*, cXyz*); - void checkCrawlSideWall(cXyz*, cXyz*, cXyz*, cXyz*, s16*, s16*); + BOOL checkCrawlSideWall(cXyz*, cXyz*, cXyz*, cXyz*, s16*, s16*); void setDoStatusCrawl(); BOOL procCrawlStart_init(); BOOL procCrawlStart(); - void checkNotCrawlStand(cXyz*); - void checkNotCrawlStand(cXyz*, cXyz*); + BOOL checkNotCrawlStand(cXyz*); + BOOL checkNotCrawlStand(cXyz*, cXyz*); BOOL procCrawlMove_init(s16, s16); BOOL procCrawlMove(); BOOL procCrawlAutoMove_init(int, cXyz*); @@ -1735,7 +1737,7 @@ public: BOOL checkGrabBarrelSearch(int); void setGrabItemPos(); void freeGrabItem(); - void checkNextActionGrab(); + BOOL checkNextActionGrab(); void initGrabNextMode(); BOOL procGrabReady_init(); BOOL procGrabReady(); @@ -1754,11 +1756,11 @@ public: BOOL procGrabRebound_init(); BOOL procGrabRebound(); void setSpeedAndAngleSwim(); - void checkNextModeSwim(); + BOOL checkNextModeSwim(); void changeSwimProc(); void changeSwimUpProc(); void swimOutAfter(int); - void checkSwimFallCheck(); + BOOL checkSwimFallCheck(); void changeSwimOutProc(); void setSwimMoveAnime(daPy_lk_c::daPy_ANM); void getSwimTimerRate(); @@ -1787,10 +1789,10 @@ public: BOOL procBtVerticalJumpLand_init(); BOOL procBtVerticalJumpLand(); void shipSpecialDemoStart(); - void checkJumpRideShip(); - void checkShipNotNormalMode(); + BOOL checkJumpRideShip(); + BOOL checkShipNotNormalMode(); void setShipRideArmAngle(int, J3DTransformInfo*); - void checkShipRideUseItem(int); + int checkShipRideUseItem(int); void initShipRideUseItem(int, int); void setShipRidePosUseItem(); void setShipRidePos(int); @@ -1823,19 +1825,19 @@ public: BOOL procShipGetOff(); BOOL procShipRestart_init(); BOOL procShipRestart(); - void checkRopeAnime() const; + BOOL checkRopeAnime() const; void freeRopeItem(); - void checkRopeRoofHit(s16); + BOOL checkRopeRoofHit(s16); void changeRopeSwingProc(); void changeRopeEndProc(int); - void checkSpecialRope(); + BOOL checkSpecialRope(); void changeRopeToHangProc(); - void checkRopeSwingWall(cXyz*, cXyz*, s16*, f32*); + BOOL checkRopeSwingWall(cXyz*, cXyz*, s16*, f32*); void setBlendRopeMoveAnime(int); void throwRope(); - void checkNextActionRopeReady(); - void checkNextRopeMode(); - void checkHangRopeActorNull(); + BOOL checkNextActionRopeReady(); + BOOL checkNextRopeMode(); + BOOL checkHangRopeActorNull(); BOOL procRopeSubject_init(); BOOL procRopeSubject(); BOOL procRopeReady_init(); @@ -1857,12 +1859,12 @@ public: BOOL procRopeThrowCatch(); BOOL procRopeUpHang_init(); BOOL procRopeUpHang(); - void checkBoomerangAnime() const; + BOOL checkBoomerangAnime() const; void throwBoomerang(); void returnBoomerang(); - void checkNextActionBoomerangReady(); - void checkNextActionBoomerangFly(); - void checkNextBoomerangMode(); + BOOL checkNextActionBoomerangReady(); + BOOL checkNextActionBoomerangFly(); + BOOL checkNextBoomerangMode(); void changeBoomerangCatchProc(); BOOL procBoomerangSubject_init(); BOOL procBoomerangSubject(); @@ -1872,26 +1874,26 @@ public: BOOL procBoomerangCatch(); void bowJointCB(int); void bowButton() const; - void checkBowReadyAnime() const; + BOOL checkBowReadyAnime() const; BOOL checkBowAnime() const; void makeArrow(); void deleteArrow(); void setBowReadyAnime(); void setBowReloadAnime(); - void checkNextActionBowReady(); - void checkNextActionBowFly(); - void checkNextBowMode(); + BOOL checkNextActionBowReady(); + BOOL checkNextActionBowFly(); + BOOL checkNextBowMode(); void setBowModel(); BOOL procBowSubject_init(); BOOL procBowSubject(); BOOL procBowMove_init(); BOOL procBowMove(); - void checkHookshotReturn(); + BOOL checkHookshotReturn(); void setHookshotModel(); void setHookshotSight(); void freeHookshotItem(); - void checkNextActionHookshotReady(); - void checkNextHookshotMode(); + BOOL checkNextActionHookshotReady(); + BOOL checkNextHookshotMode(); BOOL procHookshotSubject_init(); BOOL procHookshotSubject(); BOOL procHookshotMove_init(); @@ -1903,7 +1905,7 @@ public: void fanJointCB(int); void parachuteJointCB(int); void setShapeFanLeaf(); - void checkFanGlideProc(int); + BOOL checkFanGlideProc(int); void setFanModel(); void setSmallFanModel(); void setParachuteFanModel(f32); @@ -1913,10 +1915,10 @@ public: BOOL procFanGlide(); u32 getDayNightParamData(); void setTactModel(); - void checkNpcStatus(); + BOOL checkNpcStatus(); void getTactPlayRightArmAnm(s32); void getTactPlayLeftArmAnm(s32); - void checkEndTactMusic() const; + BOOL checkEndTactMusic() const; f32 getTactMetronomeRate(); BOOL checkTactLastInput(); BOOL getTactTopPos(cXyz*); @@ -1931,7 +1933,7 @@ public: BOOL procTactPlayEnd(); BOOL procTactPlayOriginal_init(); BOOL procTactPlayOriginal(); - void checkJumpFlower(); + BOOL checkJumpFlower(); BOOL procVomitReady_init(s16, f32); BOOL procVomitReady(); BOOL procVomitWait_init(); @@ -1989,10 +1991,10 @@ public: BOOL procFoodSet(); void setSwordModel(int); void setLightSaver(); - void checkDemoShieldNoDraw(); - void checkDemoSwordNoDraw(int); - void checkChanceMode(); - void checkCutRollChange() const; + BOOL checkDemoShieldNoDraw(); + BOOL checkDemoSwordNoDraw(int); + BOOL checkChanceMode(); + BOOL checkCutRollChange() const; void getSwordBlurColor(); void setNormalCutAtParam(u8); void setFinishCutAtParam(u8); @@ -2400,7 +2402,7 @@ public: /* 0x3624 */ int m3624; /* 0x3628 */ int m3628; /* 0x362C */ int m362C; - /* 0x3630 */ int m3630; + /* 0x3630 */ u32 m3630; /* 0x3634 */ int m3634; /* 0x3638 */ int mMsgId; /* 0x363C */ J3DFrameCtrl* mpSeAnmFrameCtrl; diff --git a/include/f_op/f_op_camera.h b/include/f_op/f_op_camera.h index 82ce79d6a..1b1889794 100644 --- a/include/f_op/f_op_camera.h +++ b/include/f_op/f_op_camera.h @@ -244,6 +244,7 @@ public: void Set(cXyz, cXyz, f32, s16); void Stay(); void SetTrimSize(s32); + void StartEventCamera(int, int, ...); void CStickUse() {} void CStickUseless() {} diff --git a/src/d/actor/d_a_player_boomerang.inc b/src/d/actor/d_a_player_boomerang.inc index 6e4c26054..5b9e87663 100644 --- a/src/d/actor/d_a_player_boomerang.inc +++ b/src/d/actor/d_a_player_boomerang.inc @@ -13,7 +13,7 @@ #include "d/actor/d_a_player_main.h" /* 8014956C-80149590 .text checkBoomerangAnime__9daPy_lk_cCFv */ -void daPy_lk_c::checkBoomerangAnime() const { +BOOL daPy_lk_c::checkBoomerangAnime() const { /* Nonmatching */ } @@ -28,17 +28,17 @@ void daPy_lk_c::returnBoomerang() { } /* 801497A4-8014984C .text checkNextActionBoomerangReady__9daPy_lk_cFv */ -void daPy_lk_c::checkNextActionBoomerangReady() { +BOOL daPy_lk_c::checkNextActionBoomerangReady() { /* Nonmatching */ } /* 8014984C-801498D8 .text checkNextActionBoomerangFly__9daPy_lk_cFv */ -void daPy_lk_c::checkNextActionBoomerangFly() { +BOOL daPy_lk_c::checkNextActionBoomerangFly() { /* Nonmatching */ } /* 801498D8-80149964 .text checkNextBoomerangMode__9daPy_lk_cFv */ -void daPy_lk_c::checkNextBoomerangMode() { +BOOL daPy_lk_c::checkNextBoomerangMode() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_player_bow.inc b/src/d/actor/d_a_player_bow.inc index fe326feb3..27cfca84f 100644 --- a/src/d/actor/d_a_player_bow.inc +++ b/src/d/actor/d_a_player_bow.inc @@ -28,7 +28,7 @@ void daPy_lk_c::bowButton() const { } /* 8014A008-8014A02C .text checkBowReadyAnime__9daPy_lk_cCFv */ -void daPy_lk_c::checkBowReadyAnime() const { +BOOL daPy_lk_c::checkBowReadyAnime() const { /* Nonmatching */ } @@ -58,17 +58,17 @@ void daPy_lk_c::setBowReloadAnime() { } /* 8014A328-8014A60C .text checkNextActionBowReady__9daPy_lk_cFv */ -void daPy_lk_c::checkNextActionBowReady() { +BOOL daPy_lk_c::checkNextActionBowReady() { /* Nonmatching */ } /* 8014A60C-8014A680 .text checkNextActionBowFly__9daPy_lk_cFv */ -void daPy_lk_c::checkNextActionBowFly() { +BOOL daPy_lk_c::checkNextActionBowFly() { /* Nonmatching */ } /* 8014A680-8014A6F4 .text checkNextBowMode__9daPy_lk_cFv */ -void daPy_lk_c::checkNextBowMode() { +BOOL daPy_lk_c::checkNextBowMode() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_player_climb.inc b/src/d/actor/d_a_player_climb.inc index 19e02e4f5..b94635c15 100644 --- a/src/d/actor/d_a_player_climb.inc +++ b/src/d/actor/d_a_player_climb.inc @@ -38,12 +38,12 @@ void daPy_lk_c::setMoveBGCorrectClimb() { } /* 80136154-80136200 .text checkBgCorrectClimbMove__9daPy_lk_cFP4cXyzP4cXyz */ -void daPy_lk_c::checkBgCorrectClimbMove(cXyz*, cXyz*) { +BOOL daPy_lk_c::checkBgCorrectClimbMove(cXyz*, cXyz*) { /* Nonmatching */ } /* 80136200-80136588 .text checkBgClimbMove__9daPy_lk_cFv */ -void daPy_lk_c::checkBgClimbMove() { +BOOL daPy_lk_c::checkBgClimbMove() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_player_crawl.inc b/src/d/actor/d_a_player_crawl.inc index 7ea008dd5..ecc299e6b 100644 --- a/src/d/actor/d_a_player_crawl.inc +++ b/src/d/actor/d_a_player_crawl.inc @@ -43,7 +43,7 @@ void daPy_lk_c::crawlBgCheck(cXyz*, cXyz*) { } /* 801390B8-801392BC .text checkCrawlSideWall__9daPy_lk_cFP4cXyzP4cXyzP4cXyzP4cXyzPsPs */ -void daPy_lk_c::checkCrawlSideWall(cXyz*, cXyz*, cXyz*, cXyz*, s16*, s16*) { +BOOL daPy_lk_c::checkCrawlSideWall(cXyz*, cXyz*, cXyz*, cXyz*, s16*, s16*) { /* Nonmatching */ } @@ -63,12 +63,12 @@ BOOL daPy_lk_c::procCrawlStart() { } /* 80139640-801396B0 .text checkNotCrawlStand__9daPy_lk_cFP4cXyz */ -void daPy_lk_c::checkNotCrawlStand(cXyz*) { +BOOL daPy_lk_c::checkNotCrawlStand(cXyz*) { /* Nonmatching */ } /* 801396B0-80139760 .text checkNotCrawlStand__9daPy_lk_cFP4cXyzP4cXyz */ -void daPy_lk_c::checkNotCrawlStand(cXyz*, cXyz*) { +BOOL daPy_lk_c::checkNotCrawlStand(cXyz*, cXyz*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_player_dproc.inc b/src/d/actor/d_a_player_dproc.inc index d3608494a..396ef70f7 100644 --- a/src/d/actor/d_a_player_dproc.inc +++ b/src/d/actor/d_a_player_dproc.inc @@ -33,7 +33,7 @@ void daPy_lk_c::setLetterModel() { } /* 8012CFE8-8012D010 .text checkCaughtShapeHide__9daPy_lk_cFv */ -void daPy_lk_c::checkCaughtShapeHide() { +BOOL daPy_lk_c::checkCaughtShapeHide() { /* Nonmatching */ } @@ -43,7 +43,7 @@ void daPy_lk_c::setShapeAngleToTalkActor() { } /* 8012D08C-8012D134 .text checkEndMessage__9daPy_lk_cFUl */ -void daPy_lk_c::checkEndMessage(u32) { +BOOL daPy_lk_c::checkEndMessage(u32) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc index 6033e1779..eaf4b3e0c 100644 --- a/src/d/actor/d_a_player_fan.inc +++ b/src/d/actor/d_a_player_fan.inc @@ -48,7 +48,7 @@ void daPy_lk_c::setShapeFanLeaf() { } /* 8014BE50-8014BEEC .text checkFanGlideProc__9daPy_lk_cFi */ -void daPy_lk_c::checkFanGlideProc(int) { +BOOL daPy_lk_c::checkFanGlideProc(int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_player_food.inc b/src/d/actor/d_a_player_food.inc index 369cda007..29a5d5cf0 100644 --- a/src/d/actor/d_a_player_food.inc +++ b/src/d/actor/d_a_player_food.inc @@ -11,15 +11,101 @@ */ #include "d/actor/d_a_player_main.h" +#include "f_op/f_op_camera.h" /* 80154334-801543A0 .text setHyoiModel__9daPy_lk_cFv */ void daPy_lk_c::setHyoiModel() { - /* Nonmatching */ + if (mHeldItemType == ANIMAL_ESA) { + return; + } + JKRHeap* oldHeap = setItemHeap(); + initModel(&mpHeldItemModel, LINK_BDL_HYOINOMI, 0x13000022); + mDoExt_setCurrentHeap(oldHeap); + mHeldItemType = ANIMAL_ESA; } /* 801543A0-801546F4 .text procFoodThrow_init__9daPy_lk_cFv */ BOOL daPy_lk_c::procFoodThrow_init() { - /* Nonmatching */ + if (mCurProcID == PROC_FOOD_THROW_e) { + return TRUE; + } + if (m3630 != -1) { + mDoAud_seStart(JA_SE_ITEM_TARGET_OUT, NULL, 0, 0); + return FALSE; + } + + dBgS* bgs = dComIfG_Bgsp(); // This is kinda weird, maybe fakematch + + if (!dComIfGp_event_runCheck()) { + if (!dComIfGp_event_compulsory(this, NULL, -1)) { + return FALSE; + } else { + mDemo.setSpecialDemoType(); + } + } else { + deleteEquipItem(0); + } + + int temp = checkShipRideUseItem(1); + + commonProcInit(PROC_FOOD_THROW_e); + + if (temp == 0) { + f32 offset1 = cM_ssin(shape_angle.y) * 150.0f; + f32 offset2 = cM_scos(shape_angle.y) * 150.0f; + cXyz start; + start.set( + mAttentionInfo.mPosition.x, + mAttentionInfo.mPosition.y - 50.0f, + mAttentionInfo.mPosition.z + ); + cXyz end; + end.set( + start.x + offset1, + start.y, + start.z + offset2 + ); + mLinkLinChk.Set(&start, &end, this); + if (bgs->LineCross(&mLinkLinChk)) { + end.x = start.x - offset1; + end.z = start.z - offset2; + mLinkLinChk.Set(&start, &end, this); + if (!dComIfG_Bgsp()->LineCross(&mLinkLinChk)) { + shape_angle.y += 0x8000; + } else { + end.x = start.x + offset2; + end.z = start.z - offset1; + mLinkLinChk.Set(&start, &end, this); + if (!dComIfG_Bgsp()->LineCross(&mLinkLinChk)) { + shape_angle.y += 0x4000; + } else { + end.x = start.x - offset2; + end.z = start.z + offset1; + mLinkLinChk.Set(&start, &end, this); + if (!dComIfG_Bgsp()->LineCross(&mLinkLinChk)) { + shape_angle.y -= 0x4000; + } + } + } + } + } + current.angle.y = shape_angle.y; + mVelocity = 0.0f; + + daPy_matAnm_c::m_maba_flg = 0; + daPy_matAnm_c::m_maba_timer = 1; + setSingleMoveAnime(ANM_UNK_C4, daPy_HIO_food_c0::m.field_0x4, daPy_HIO_food_c0::m.field_0x8, daPy_HIO_food_c0::m.field_0x0, daPy_HIO_food_c0::m.field_0xC); + keepItemData(); + + if (mDemo.getDemoType() == 5) { + m3570 = 6; + dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", &m3570, 0); + } + + initShipRideUseItem(temp, 2); + m3630 = -1; + + return TRUE; } /* 801546F4-80154880 .text procFoodThrow__9daPy_lk_cFv */ diff --git a/src/d/actor/d_a_player_grab.inc b/src/d/actor/d_a_player_grab.inc index 7eae1b99c..16df6dc1b 100644 --- a/src/d/actor/d_a_player_grab.inc +++ b/src/d/actor/d_a_player_grab.inc @@ -43,7 +43,7 @@ void daPy_lk_c::freeGrabItem() { } /* 8013B05C-8013B458 .text checkNextActionGrab__9daPy_lk_cFv */ -void daPy_lk_c::checkNextActionGrab() { +BOOL daPy_lk_c::checkNextActionGrab() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_player_hook.inc b/src/d/actor/d_a_player_hook.inc index 3519f885e..d9d2502ce 100644 --- a/src/d/actor/d_a_player_hook.inc +++ b/src/d/actor/d_a_player_hook.inc @@ -13,7 +13,7 @@ #include "d/actor/d_a_player_main.h" /* 8014AB5C-8014ABA0 .text checkHookshotReturn__9daPy_lk_cFv */ -void daPy_lk_c::checkHookshotReturn() { +BOOL daPy_lk_c::checkHookshotReturn() { /* Nonmatching */ } @@ -38,12 +38,12 @@ void daPy_lk_c::freeHookshotItem() { } /* 8014B05C-8014B2B8 .text checkNextActionHookshotReady__9daPy_lk_cFv */ -void daPy_lk_c::checkNextActionHookshotReady() { +BOOL daPy_lk_c::checkNextActionHookshotReady() { /* Nonmatching */ } /* 8014B2B8-8014B350 .text checkNextHookshotMode__9daPy_lk_cFv */ -void daPy_lk_c::checkNextHookshotMode() { +BOOL daPy_lk_c::checkNextHookshotMode() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index a5f6d564f..8e7408f71 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -2517,18 +2517,18 @@ static BOOL daPy_jointCallback1(J3DNode*, int) { } /* 801041B4-801041EC .text setAnimeHeap__9daPy_lk_cFP12JKRSolidHeap */ -void daPy_lk_c::setAnimeHeap(JKRSolidHeap* animeHeap) { +JKRHeap* daPy_lk_c::setAnimeHeap(JKRSolidHeap* animeHeap) { animeHeap->freeAll(); - mDoExt_setCurrentHeap(animeHeap); + return mDoExt_setCurrentHeap(animeHeap); } /* 801041EC-80104240 .text setItemHeap__9daPy_lk_cFv */ -void daPy_lk_c::setItemHeap() { +JKRHeap* daPy_lk_c::setItemHeap() { if (!checkResetFlg0(daPyRFlg0_UNK4000)) { mCurrItemHeapIdx ^= 1; onResetFlg0(daPyRFlg0_UNK4000); } - setAnimeHeap(mpItemHeaps[mCurrItemHeapIdx]); + return setAnimeHeap(mpItemHeaps[mCurrItemHeapIdx]); } /* 80104240-80104280 .text setBlurPosResource__9daPy_lk_cFUs */ @@ -2630,7 +2630,7 @@ void daPy_lk_c::setOutPower(f32, s16, int) { } /* 801056E4-80105814 .text checkSightLine__9daPy_lk_cFfP4cXyz */ -void daPy_lk_c::checkSightLine(f32, cXyz*) { +BOOL daPy_lk_c::checkSightLine(f32, cXyz*) { /* Nonmatching */ } @@ -3064,7 +3064,7 @@ void daPy_lk_c::setDamagePoint(f32) { } /* 80110338-80110448 .text checkNormalDamage__9daPy_lk_cFi */ -void daPy_lk_c::checkNormalDamage(int) { +BOOL daPy_lk_c::checkNormalDamage(int) { /* Nonmatching */ } @@ -3074,17 +3074,17 @@ void daPy_lk_c::setDashDamage() { } /* 801104E4-8011054C .text checkAtHitEnemy__9daPy_lk_cFP12dCcD_GObjInf */ -void daPy_lk_c::checkAtHitEnemy(dCcD_GObjInf*) { +BOOL daPy_lk_c::checkAtHitEnemy(dCcD_GObjInf*) { /* Nonmatching */ } /* 8011054C-801105D8 .text checkElecReturnDamage__9daPy_lk_cFP12dCcD_GObjInfP4cXyz */ -void daPy_lk_c::checkElecReturnDamage(dCcD_GObjInf*, cXyz*) { +BOOL daPy_lk_c::checkElecReturnDamage(dCcD_GObjInf*, cXyz*) { /* Nonmatching */ } /* 801105D8-80110654 .text checkWallAtributeDamage__9daPy_lk_cFP12dBgS_AcchCir */ -void daPy_lk_c::checkWallAtributeDamage(dBgS_AcchCir*) { +BOOL daPy_lk_c::checkWallAtributeDamage(dBgS_AcchCir*) { /* Nonmatching */ } @@ -3119,7 +3119,7 @@ void daPy_lk_c::setOldRootQuaternion(s16, s16, s16) { } /* 80111E54-80111EFC .text checkRestHPAnime__9daPy_lk_cFv */ -void daPy_lk_c::checkRestHPAnime() { +BOOL daPy_lk_c::checkRestHPAnime() { /* Nonmatching */ } @@ -3887,7 +3887,7 @@ void daPy_lk_c::autoGroundHit() { } /* 8011AD9C-8011AE20 .text checkAttentionPosAngle__9daPy_lk_cFP10fopAc_ac_cPP4cXyz */ -void daPy_lk_c::checkAttentionPosAngle(fopAc_ac_c*, cXyz**) { +BOOL daPy_lk_c::checkAttentionPosAngle(fopAc_ac_c*, cXyz**) { /* Nonmatching */ } @@ -3897,7 +3897,7 @@ void daPy_lk_c::setNeckAngle() { } /* 8011BE08-8011BEA4 .text checkOriginalHatAnimation__9daPy_lk_cFv */ -void daPy_lk_c::checkOriginalHatAnimation() { +BOOL daPy_lk_c::checkOriginalHatAnimation() { /* Nonmatching */ } @@ -3932,7 +3932,7 @@ void daPy_lk_c::resetCurse() { } /* 8011D110-8011D4D0 .text checkLightHit__9daPy_lk_cFv */ -void daPy_lk_c::checkLightHit() { +BOOL daPy_lk_c::checkLightHit() { /* Nonmatching */ } @@ -4057,7 +4057,7 @@ BOOL daPy_lk_c::checkLavaFace(cXyz* param_1, int attributeCode) { } /* 8012024C-80120724 .text checkFallCode__9daPy_lk_cFv */ -void daPy_lk_c::checkFallCode() { +BOOL daPy_lk_c::checkFallCode() { /* Nonmatching */ } @@ -4161,7 +4161,7 @@ BOOL daPy_lk_c::startRestartRoom(u32 param_1, int eventInfoIdx, f32 param_3, int } /* 80120BBC-80120BE0 .text checkSuccessGuard__9daPy_lk_cFi */ -void daPy_lk_c::checkSuccessGuard(int) { +BOOL daPy_lk_c::checkSuccessGuard(int) { /* Nonmatching */ } @@ -4186,7 +4186,7 @@ void daPy_lk_c::setWindAtPower() { } /* 801216A8-80121870 .text checkRoofRestart__9daPy_lk_cFv */ -void daPy_lk_c::checkRoofRestart() { +BOOL daPy_lk_c::checkRoofRestart() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_player_rope.inc b/src/d/actor/d_a_player_rope.inc index c1e92e8f8..ba28a12df 100644 --- a/src/d/actor/d_a_player_rope.inc +++ b/src/d/actor/d_a_player_rope.inc @@ -13,7 +13,7 @@ #include "d/actor/d_a_player_main.h" /* 80142D08-80142D68 .text checkRopeAnime__9daPy_lk_cCFv */ -void daPy_lk_c::checkRopeAnime() const { +BOOL daPy_lk_c::checkRopeAnime() const { /* Nonmatching */ } @@ -23,7 +23,7 @@ void daPy_lk_c::freeRopeItem() { } /* 80142E0C-80142E98 .text checkRopeRoofHit__9daPy_lk_cFs */ -void daPy_lk_c::checkRopeRoofHit(s16) { +BOOL daPy_lk_c::checkRopeRoofHit(s16) { /* Nonmatching */ } @@ -38,7 +38,7 @@ void daPy_lk_c::changeRopeEndProc(int) { } /* 801430D4-80143138 .text checkSpecialRope__9daPy_lk_cFv */ -void daPy_lk_c::checkSpecialRope() { +BOOL daPy_lk_c::checkSpecialRope() { /* Nonmatching */ } @@ -48,7 +48,7 @@ void daPy_lk_c::changeRopeToHangProc() { } /* 8014327C-80143694 .text checkRopeSwingWall__9daPy_lk_cFP4cXyzP4cXyzPsPf */ -void daPy_lk_c::checkRopeSwingWall(cXyz*, cXyz*, s16*, f32*) { +BOOL daPy_lk_c::checkRopeSwingWall(cXyz*, cXyz*, s16*, f32*) { /* Nonmatching */ } @@ -63,17 +63,17 @@ void daPy_lk_c::throwRope() { } /* 80143C5C-80143DF4 .text checkNextActionRopeReady__9daPy_lk_cFv */ -void daPy_lk_c::checkNextActionRopeReady() { +BOOL daPy_lk_c::checkNextActionRopeReady() { /* Nonmatching */ } /* 80143DF4-80143EAC .text checkNextRopeMode__9daPy_lk_cFv */ -void daPy_lk_c::checkNextRopeMode() { +BOOL daPy_lk_c::checkNextRopeMode() { /* Nonmatching */ } /* 80143EAC-80143F3C .text checkHangRopeActorNull__9daPy_lk_cFv */ -void daPy_lk_c::checkHangRopeActorNull() { +BOOL daPy_lk_c::checkHangRopeActorNull() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_player_ship.inc b/src/d/actor/d_a_player_ship.inc index acb3f7d07..91fbc7264 100644 --- a/src/d/actor/d_a_player_ship.inc +++ b/src/d/actor/d_a_player_ship.inc @@ -18,12 +18,12 @@ void daPy_lk_c::shipSpecialDemoStart() { } /* 8013F8AC-8013F984 .text checkJumpRideShip__9daPy_lk_cFv */ -void daPy_lk_c::checkJumpRideShip() { +BOOL daPy_lk_c::checkJumpRideShip() { /* Nonmatching */ } /* 8013F984-8013F9B0 .text checkShipNotNormalMode__9daPy_lk_cFv */ -void daPy_lk_c::checkShipNotNormalMode() { +BOOL daPy_lk_c::checkShipNotNormalMode() { /* Nonmatching */ } @@ -33,7 +33,7 @@ void daPy_lk_c::setShipRideArmAngle(int, J3DTransformInfo*) { } /* 8013FE78-8013FEF4 .text checkShipRideUseItem__9daPy_lk_cFi */ -void daPy_lk_c::checkShipRideUseItem(int) { +int daPy_lk_c::checkShipRideUseItem(int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_player_swim.inc b/src/d/actor/d_a_player_swim.inc index dc0af0c91..a3e4e268c 100644 --- a/src/d/actor/d_a_player_swim.inc +++ b/src/d/actor/d_a_player_swim.inc @@ -18,7 +18,7 @@ void daPy_lk_c::setSpeedAndAngleSwim() { } /* 8013CF2C-8013CFC0 .text checkNextModeSwim__9daPy_lk_cFv */ -void daPy_lk_c::checkNextModeSwim() { +BOOL daPy_lk_c::checkNextModeSwim() { /* Nonmatching */ } @@ -38,7 +38,7 @@ void daPy_lk_c::swimOutAfter(int) { } /* 8013D314-8013D354 .text checkSwimFallCheck__9daPy_lk_cFv */ -void daPy_lk_c::checkSwimFallCheck() { +BOOL daPy_lk_c::checkSwimFallCheck() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc index d8d0552f8..6ce02ba21 100644 --- a/src/d/actor/d_a_player_sword.inc +++ b/src/d/actor/d_a_player_sword.inc @@ -23,22 +23,22 @@ void daPy_lk_c::setLightSaver() { } /* 80155490-801554C8 .text checkDemoShieldNoDraw__9daPy_lk_cFv */ -void daPy_lk_c::checkDemoShieldNoDraw() { +BOOL daPy_lk_c::checkDemoShieldNoDraw() { /* Nonmatching */ } /* 801554C8-80155544 .text checkDemoSwordNoDraw__9daPy_lk_cFi */ -void daPy_lk_c::checkDemoSwordNoDraw(int) { +BOOL daPy_lk_c::checkDemoSwordNoDraw(int) { /* Nonmatching */ } /* 80155544-80155574 .text checkChanceMode__9daPy_lk_cFv */ -void daPy_lk_c::checkChanceMode() { +BOOL daPy_lk_c::checkChanceMode() { /* Nonmatching */ } /* 80155574-8015559C .text checkCutRollChange__9daPy_lk_cCFv */ -void daPy_lk_c::checkCutRollChange() const { +BOOL daPy_lk_c::checkCutRollChange() const { /* Nonmatching */ } diff --git a/src/d/actor/d_a_player_tact.inc b/src/d/actor/d_a_player_tact.inc index 13062c36f..3b20cc1e7 100644 --- a/src/d/actor/d_a_player_tact.inc +++ b/src/d/actor/d_a_player_tact.inc @@ -23,7 +23,7 @@ void daPy_lk_c::setTactModel() { } /* 8014D8AC-8014D8F4 .text checkNpcStatus__9daPy_lk_cFv */ -void daPy_lk_c::checkNpcStatus() { +BOOL daPy_lk_c::checkNpcStatus() { /* Nonmatching */ } @@ -38,7 +38,7 @@ void daPy_lk_c::getTactPlayLeftArmAnm(s32) { } /* 8014D97C-8014D9A4 .text checkEndTactMusic__9daPy_lk_cCFv */ -void daPy_lk_c::checkEndTactMusic() const { +BOOL daPy_lk_c::checkEndTactMusic() const { /* Nonmatching */ } diff --git a/src/d/actor/d_a_player_vomit.inc b/src/d/actor/d_a_player_vomit.inc index 8ae501832..c7752470a 100644 --- a/src/d/actor/d_a_player_vomit.inc +++ b/src/d/actor/d_a_player_vomit.inc @@ -13,7 +13,7 @@ #include "d/actor/d_a_player_main.h" /* 8014F8A0-8014F994 .text checkJumpFlower__9daPy_lk_cFv */ -void daPy_lk_c::checkJumpFlower() { +BOOL daPy_lk_c::checkJumpFlower() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_player_whide.inc b/src/d/actor/d_a_player_whide.inc index 03a1c2f48..0bced3fab 100644 --- a/src/d/actor/d_a_player_whide.inc +++ b/src/d/actor/d_a_player_whide.inc @@ -33,17 +33,17 @@ void daPy_lk_c::getWHideNextPos(cXyz*, cXyz*) { } /* 8013769C-80137754 .text checkWHideBackWall__9daPy_lk_cFP4cXyz */ -void daPy_lk_c::checkWHideBackWall(cXyz*) { +BOOL daPy_lk_c::checkWHideBackWall(cXyz*) { /* Nonmatching */ } /* 80137754-80137828 .text checkWHideFrontFloor__9daPy_lk_cFP4cXyz */ -void daPy_lk_c::checkWHideFrontFloor(cXyz*) { +BOOL daPy_lk_c::checkWHideFrontFloor(cXyz*) { /* Nonmatching */ } /* 80137828-80137914 .text checkWHideModeChange__9daPy_lk_cFP4cXyz */ -void daPy_lk_c::checkWHideModeChange(cXyz*) { +BOOL daPy_lk_c::checkWHideModeChange(cXyz*) { /* Nonmatching */ }