diff options
Diffstat (limited to 'include/d')
| -rw-r--r-- | include/d/a/d_a_alink.h | 2 | ||||
| -rw-r--r-- | include/d/a/d_a_player.h | 5 | ||||
| -rw-r--r-- | include/d/com/d_com_inf_game.h | 4 | ||||
| -rw-r--r-- | include/d/d_camera.h | 2 | ||||
| -rw-r--r-- | include/d/d_tresure.h | 4 | ||||
| -rw-r--r-- | include/d/particle/d_particle.h | 3 |
6 files changed, 17 insertions, 3 deletions
diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index a409cb4df3..c9409869b5 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -2958,7 +2958,7 @@ public: /* 80140984 */ void statusWindowDraw(); /* 80140AC8 */ void resetStatusWindow(); /* 8018280C */ fopAc_ac_c* getChainGrabActor() { return field_0x2844.getActor(); } - /* 80182814 */ BOOL checkCokkoGlide() const { return mProcID == PROC_AUTO_JUMP && mProcVar2.field_0x300c != 0; } + /* 80182814 */ bool checkCokkoGlide() const { return mProcID == PROC_AUTO_JUMP && mProcVar2.field_0x300c != 0; } /* 8018283C */ BOOL checkCameraLargeDamage() const { return mProcID == PROC_LARGE_DAMAGE || mProcID == PROC_LARGE_DAMAGE_WALL || mProcID == PROC_LARGE_DAMAGE_UP || mProcID == PROC_WOLF_LARGE_DAMAGE_UP; } /* 80182870 */ const cXyz& getHsSubChainTopPos() const { return mIronBallBgChkPos; } /* 80182888 */ BOOL checkCutHeadProc() const { return mProcID == PROC_CUT_HEAD; } diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 7ccf682043..36e08f9b75 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -897,6 +897,11 @@ public: bool checkWolfEnemyHangBiteOwn(fopAc_ac_c* i_actorP) const { return checkWolfEnemyBiteAllOwn(i_actorP); } bool checkWolfEnemyLeftThrow() const { return checkNoResetFlg2(FLG2_WOLF_ENEMY_LEFT_THROW); } + void onWolfLightDropGet() { + onEndResetFlg0(ERFLG0_UNK_20000000); + onNoResetFlg3(FLG3_UNK_200000); + } + static daMidna_c* m_midnaActor; }; diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index ccf7b0d008..6bb1414eae 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -1927,6 +1927,10 @@ inline u8 dComIfGs_getPlayerFieldLastStayRegionNo() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().getRegionNo(); } +inline void dComIfGs_setLightDropNum(u8 i_level, u8 i_num) { + g_dComIfG_gameInfo.info.getPlayer().getLightDrop().setLightDropNum(i_level, i_num); +} + void dComIfGp_setSelectItem(int index); s32 dComIfGp_offHeapLockFlag(int flag); void dComIfGp_createSubExpHeap2D(); diff --git a/include/d/d_camera.h b/include/d/d_camera.h index 4cd581cdf9..530d49670f 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -383,6 +383,8 @@ public: void setFlag(u32 i_flag) { mEventFlags |= i_flag; } void clrFlag(u32 i_flag) { mEventFlags &= ~i_flag; } + bool CheckFlag(u32 i_flag) { return mEventFlags & i_flag; } + void ResetView() { setView(0.0f, 0.0f, 608.0f, 448.0f); } void clearInfo(dCamInfo_c* i_info, s16 param_1) { diff --git a/include/d/d_tresure.h b/include/d/d_tresure.h index 04650bc038..7e5f017d31 100644 --- a/include/d/d_tresure.h +++ b/include/d/d_tresure.h @@ -74,6 +74,10 @@ public: setPosition(i_tboxNo, 0, i_pos, -1); } + static void setLightDropPostion(int i_tboxNo, const Vec* i_pos) { + setPosition(i_tboxNo, 4, i_pos, -1); + } + static u8 const typeToTypeGroup[17][2]; static type_group_list mTypeGroupListAll[17]; static typeGroupData_c* mTypeGroupData; diff --git a/include/d/particle/d_particle.h b/include/d/particle/d_particle.h index 7a51ed45ab..8f0152cc8f 100644 --- a/include/d/particle/d_particle.h +++ b/include/d/particle/d_particle.h @@ -72,8 +72,7 @@ public: class dPa_followEcallBack : public dPa_levelEcallBack { public: - /* 80049580 */ dPa_followEcallBack(u8, u8); - /* 80D22230 */ void __defctor(); // compiler generated + /* 80049580 */ dPa_followEcallBack(u8 param_0 = 0, u8 param_1 = 0); /* 80050200 */ virtual ~dPa_followEcallBack(); /* 800495BC */ virtual void execute(JPABaseEmitter*); |
