diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-12-31 04:14:36 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-31 04:14:36 -0800 |
| commit | 2e2e08e78341a6a7f7a2847dd89235db07d72530 (patch) | |
| tree | 31016fd4b22508064c87c3fdc37d64277d13094b /include | |
| parent | 2ef41a019cd0a2f7a54708dff1c3715d4144e2c1 (diff) | |
| parent | 4394d5d0d74662c462b907e15a92d1e63670805b (diff) | |
Merge pull request #232 from tom-overton/d_a_tag_mmsg
d_a_tag_mmsg OK
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/com/d_com_inf_game.h | 2 | ||||
| -rw-r--r-- | include/d/d_stage.h | 7 | ||||
| -rw-r--r-- | include/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 93c1363063..2f74001e9d 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -2681,6 +2681,8 @@ inline u32 dComIfGp_particle_setPolyColor(u32 param_0, u16 param_1, cBgS_PolyInf int dComIfGd_setSimpleShadow(cXyz* pos, f32 param_1, f32 param_2, cBgS_PolyInfo& param_3, s16 angle, f32 param_5, _GXTexObj* tex); +stage_camera_class* dComIfGp_getRoomCamera(int i_roomNo); +stage_arrow_class* dComIfGp_getRoomArrow(int i_roomNo); int dComIfGd_setShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, f32 param_4, f32 param_5, f32 param_6, f32 param_7, cBgS_PolyInfo& param_8, dKy_tevstr_c* param_9, s16 param_10, f32 param_11, _GXTexObj* param_12); diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 4778e1932d..be7e187b07 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -151,9 +151,14 @@ struct stage_camera_class { /* 0x4 */ stage_camera2_data_class* field_0x4; }; -struct stage_arrow_class { +struct stage_arrow_data_class { /* 0x00 */ cXyz mPosition; /* 0x0C */ csXyz mAngle; +}; + +struct stage_arrow_class { + /* 0x00 */ int mNum; + /* 0x04 */ stage_arrow_data_class* mEntries; }; // Size: 0x14 class stage_actor_data_class { diff --git a/include/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h b/include/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h index 2a8b0fc4d0..675ce7214c 100644 --- a/include/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h +++ b/include/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h @@ -3,14 +3,15 @@ #include "d/a/d_a_player.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" class daTagMmsg_c : public fopAc_ac_c { public: daTagMmsg_c() {} - /* 80D5B918 */ void create(); + /* 80D5B918 */ int create(); /* 80D5BAB4 */ ~daTagMmsg_c(); - /* 80D5BB30 */ void execute(); + /* 80D5BB30 */ int execute(); void onUseFlg() { mUseFlg = true; } bool checkNoAttention() { return mAttention == 0xFF; } |
