wip

4 files changed, 364 insertions, 0 deletions

diff --git a/include/rel/d/a/d_a_boomerang/d_a_boomerang.h b/include/rel/d/a/d_a_boomerang/d_a_boomerang.h
index 6317a31575..111712b628 100644
--- a/include/rel/d/a/d_a_boomerang/d_a_boomerang.h
+++ b/include/rel/d/a/d_a_boomerang/d_a_boomerang.h
@@ -2,5 +2,127 @@
 #define D_A_BOOMERANG_H
 
 #include "dolphin/types.h"
+#include "f_op/f_op_actor.h"
+#include "JSystem/J2DGraph/J2DScreen.h"
+#include "d/bg/d_bg_s_acch.h"
+#include "d/particle/d_particle_copoly.h"
+#include "Z2AudioLib/Z2SoundObject.h"
+
+class daBoomerang_sight_c {
+public:
+    /* 8049E0B8 */ void createHeap();
+    /* 8049E36C */ void initialize();
+    /* 8049EB64 */ void playAnime(int, int);
+    /* 8049EDA8 */ void initFrame(int);
+    /* 8049EDE8 */ void copyNumData(int);
+    /* 8049EEC8 */ void setSight(cXyz const*, int);
+    /* 8049EF60 */ void draw();
+
+    /* 804A278C */ virtual ~daBoomerang_sight_c();
+
+private:
+    /* 0x04 */ J2DScreen* field_0x4;
+    /* 0x08 */ J2DPane* field_0x8;
+    /* 0x0C */ J2DPane* field_0xc;
+    /* 0x10 */ J2DPane* field_0x10;
+    /* 0x14 */ J2DPane* field_0x14;
+    /* 0x18 */ J2DAnmBase* field_0x18;
+    /* 0x1C */ J2DAnmBase* field_0x1c;
+    /* 0x20 */ J2DScreen* field_0x20;
+    /* 0x24 */ J2DPane* field_0x24;
+    /* 0x28 */ J2DPane* field_0x28;
+    /* 0x2C */ J2DPane* field_0x2c;
+    /* 0x30 */ J2DPane* field_0x30;
+    /* 0x34 */ J2DAnmBase* field_0x34;
+    /* 0x38 */ J2DAnmBase* field_0x38;
+    /* 0x3C */ J2DScreen* field_0x3c;
+    /* 0x40 */ J2DPane* field_0x40;
+    /* 0x44 */ J2DPane* field_0x44;
+    /* 0x48 */ J2DPane* field_0x48;
+    /* 0x4C */ J2DPane* field_0x4c;
+    /* 0x50 */ J2DAnmBase* field_0x50;
+    /* 0x54 */ J2DAnmBase* field_0x54;
+    /* 0x58 */ J2DAnmBase* field_0x58;
+    /* 0x5C */ J2DAnmBase* field_0x5c;
+    /* 0x60 */ bool mRedSight;
+    /* 0x61 */ u8 mReserve;
+    /* 0x62 */ u8 mAlpha[6];
+    /* 0x68 */ f32 field_0x68[6];
+    /* 0x80 */ f32 field_0x80[6];
+    /* 0x98 */ f32 field_0x98[6];
+    /* 0xB0 */ f32 field_0xb0[6];
+    /* 0xC8 */ cXyz field_0xc8[6];
+};  // Size: 0x110
+
+struct daMirror_c;
+class daAlink_c;
+
+class daBoomerang_c : public fopAc_ac_c {
+public:
+    enum daBoomerang_FLG0 {
+        /* 0x80 */ WIND_CATCH = 0x80,
+    };
+
+    /* 8049F280 */ void windModelCallBack();
+    /* 8049F39C */ void draw();
+    /* 8049F5F4 */ void lockLineCallback(fopAc_ac_c*);
+    /* 8049F660 */ void moveLineCallback(fopAc_ac_c*);
+    /* 8049F710 */ void pushLockList(int);
+    /* 8049F818 */ void cancelLockActorBase(fopAc_ac_c*);
+    /* 8049F874 */ void setAimActorBase(fopAc_ac_c*);
+    /* 8049F8B0 */ void setLockActor(fopAc_ac_c*, int);
+    /* 8049F9A4 */ void resetLockActor();
+    /* 8049F9F0 */ void setRoomInfo();
+    /* 8049FAA4 */ void setKeepMatrix();
+    /* 8049FBAC */ void setMoveMatrix();
+    /* 8049FCD0 */ void setRotAngle();
+    /* 8049FD6C */ void setAimPos();
+    /* 8049FE6C */ void checkBgHit(cXyz*, cXyz*);
+    /* 804A006C */ void setEffectTraceMatrix(u32*, u16);
+    /* 804A012C */ void setEffect();
+    /* 804A0874 */ void procWait();
+    /* 804A0F0C */ void procMove();
+    /* 804A1814 */ void execute();
+    /* 804A1BF4 */ ~daBoomerang_c();
+    /* 804A1EE4 */ void createHeap();
+    /* 804A2084 */ void create();
+    /* 804A230C */ daBoomerang_c();
+
+    void onStateFlg0(daBoomerang_FLG0 flag) { mStateFlg0 |= flag; }
+    void onWindCatch() { onStateFlg0(WIND_CATCH); }
+
+private:
+    /* 0x568 */ daMirror_c* field_0x568;
+    /* 0x56C */ J3DModel* field_0x56c;
+    /* 0x570 */ daAlink_c* field_0x570;
+    /* 0x574 */ u8 field_0x574[0x1C];
+    /* 0x590 */ J3DModel* field_0x590;
+    /* 0x594 */ void* field_0x594;
+    /* 0x598 */ daBoomerang_sight_c mSight;
+    /* 0x6A8 */ int field_0x6a8;
+    /* 0x6AC */ int field_0x6ac[5];
+    /* 0x6C0 */ fopAc_ac_c* field_0x6c0[5];
+    /* 0x6D4 */ u8 field_0x6d4[8];
+    /* 0x6DC */ cXyz field_0x6dc[5];
+    /* 0x718 */ u8 field_0x718[5];
+    /* 0x720 */ Z2SoundObjSimple field_0x720;
+    /* 0x740 */ dBgS_Acch field_0x740;
+    /* 0x918 */ dPaPo_c field_0x918;
+    /* 0x950 */ u8 field_0x950;
+    /* 0x951 */ u8 field_0x951;
+    /* 0x952 */ u8 field_0x952;
+    /* 0x953 */ u8 field_0x953;
+    /* 0x954 */ u8 field_0x954;
+    /* 0x955 */ u8 field_0x955;
+    /* 0x956 */ u8 field_0x956;
+    /* 0x957 */ u8 field_0x957;
+    /* 0x958 */ s16 field_0x958;
+    /* 0x95A */ s16 field_0x95a;
+    /* 0x95C */ s16 field_0x95c;
+    /* 0x95E */ s16 field_0x95e;
+    /* 0x960 */ s16 field_0x960;
+    /* 0x962 */ s16 field_0x962;
+    /* 0x964 */ u32 mStateFlg0;
+};
 
 #endif /* D_A_BOOMERANG_H */
diff --git a/include/rel/d/a/d_a_crod/d_a_crod.h b/include/rel/d/a/d_a_crod/d_a_crod.h
index c357d01fc0..4ef24817a3 100644
--- a/include/rel/d/a/d_a_crod/d_a_crod.h
+++ b/include/rel/d/a/d_a_crod/d_a_crod.h
@@ -1,6 +1,28 @@
 #ifndef D_A_CROD_H
 #define D_A_CROD_H
 
+#include "f_op/f_op_actor.h"
+#include "f_op/f_op_actor_mng.h"
 #include "dolphin/types.h"
 
+class daCrod_c {
+public:
+    /* 80141A94 */ void setControllActorData();
+    /* 804A2E38 */ void createHeap();
+    /* 804A2F18 */ void create();
+    /* 804A3304 */ ~daCrod_c();
+    /* 804A34B0 */ void setRoomInfo();
+    /* 804A34B4 */ void setMatrix();
+    /* 804A3500 */ void posMove();
+    /* 804A3580 */ void setBckAnm(u16);
+    /* 804A35FC */ void setReturn();
+    /* 804A365C */ void setLightPower();
+    /* 804A36D8 */ void execute();
+    /* 804A3FD4 */ void draw();
+
+    static fopAc_ac_c* makeIronBallDummy(fopAc_ac_c* p_actor) {
+        return (fopAc_ac_c*)fopAcM_fastCreate(0x2F4, 6, &p_actor->mCurrent.mPosition, fopAcM_GetRoomNo(p_actor), NULL, NULL, -1, NULL, NULL);
+    }
+};
+
 #endif /* D_A_CROD_H */
diff --git a/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h b/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h
index 04447c6feb..828cd41a1a 100644
--- a/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h
+++ b/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h
@@ -2,5 +2,203 @@
 #define D_A_OBJ_CARRY_H
 
 #include "dolphin/types.h"
+#include "SSystem/SComponent/c_xyz.h"
+#include "d/bg/d_bg_s_acch.h"
+#include "d/cc/d_cc_d.h"
+
+class daObjCarry_c : public fopAc_ac_c {
+public:
+    enum {
+        /* 0x0 */ TYPE_TSUBO,      // Small Blue Pot
+        /* 0x1 */ TYPE_OOTSUBO,    // Big Red Pot
+        /* 0x2 */ TYPE_KIBAKO,     // Box
+        /* 0x3 */ TYPE_IRON_BALL,  // Cannon Ball
+        /* 0x4 */ TYPE_TARU,       // Barrel
+        /* 0x5 */ TYPE_DOKURO,     // Skull
+        /* 0x6 */ TYPE_BOKKURI,    // Deku Nut
+        /* 0x7 */ TYPE_TSUBO_2,    // Small Red Pot
+        /* 0x8 */ TYPE_BALL_S,     // Light Ball A
+        /* 0x9 */ TYPE_BALL_S_2,   // Light Ball B
+        /* 0xA */ TYPE_AOTSUBO,    // Big Blue Pot
+        /* 0xB */ TYPE_LV8_BALL,
+        /* 0xC */ TYPE_TSUBO_S,    // Small pot - Twilight
+        /* 0xD */ TYPE_TSUBO_B,    // Big pot - Twilight
+    };
+
+    /* 80031CF8 */ static void clrSaveFlag();
+    /* 80031D04 */ static void setSaveFlag();
+    /* 80031D10 */ void chkSaveFlag();
+    /* 80031D24 */ void getPos(int);
+    /* 80031D38 */ void savePos(int, cXyz);
+    /* 80031D64 */ void onSttsFlag(int, u8);
+    /* 80031D78 */ void offSttsFlag(int, u8);
+    /* 80031D8C */ void chkSttsFlag(int, u8);
+    /* 80031DAC */ void setRoomNo(int, s8);
+    /* 80031DB8 */ void getRoomNo(int);
+    /* 8046F6A4 */ void data();
+    /* 8046F6BC */ void getArcName();
+    /* 8046F6D4 */ void getBmdName();
+    /* 8046F6EC */ void checkFlag(u8);
+    /* 8046F724 */ void initBaseMtx();
+    /* 8046F7AC */ void setBaseMtx();
+    /* 8046FACC */ void preInit();
+    /* 8046FB78 */ daObjCarry_c();
+    /* 8046FFA4 */ void checkBreakWolfAttack();
+    /* 8046FFF8 */ void checkCarryBoomerang();
+    /* 80470054 */ void checkCarryHookshot();
+    /* 80470080 */ void checkCarryWolf();
+    /* 804700B4 */ void checkCarryOneHand();
+    /* 804700F0 */ void Create();
+    /* 804705DC */ void CreateInit_tsubo();
+    /* 80470650 */ void CreateInit_ootubo();
+    /* 80470674 */ void CreateInit_kibako();
+    /* 804706D4 */ void CreateInit_ironball();
+    /* 804707E0 */ void CreateInit_taru();
+    /* 80470840 */ void CreateInit_dokuro();
+    /* 80470890 */ void CreateInit_bokkuri();
+    /* 804709DC */ void CreateInit_LightBall();
+    /* 80470AB4 */ void CreateInit_Lv8Ball();
+    /* 80470B5C */ void CreateHeap();
+    /* 80470BF4 */ void create();
+    /* 80470CF0 */ void checkCreate_LightBallA();
+    /* 8047114C */ void checkCreate_LightBallB();
+    /* 804715A8 */ void checkCreate_Lv8Ball();
+    /* 80471680 */ void resetIconPosForLightBallA();
+    /* 804716D4 */ void setIconPosForLightBallAAtR00();
+    /* 804717B4 */ void setIconPosForLightBallBAtR00();
+    /* 80471894 */ void resetIconPosForLightBallB();
+    /* 804718E8 */ void execute();
+    /* 8047233C */ void checkCulling();
+    /* 80472460 */ void draw();
+    /* 80472730 */ void debugDraw();
+    /* 80472734 */ void _delete();
+    /* 80472B54 */ void crr_pos();
+    /* 80472D8C */ void check_sink(f32*);
+    /* 80472E5C */ void calc_gravity();
+    /* 80472EF0 */ void checkRollAngle();
+    /* 80473050 */ void mode_proc_call();
+    /* 804733E8 */ void mode_init_wait();
+    /* 804734B0 */ void mode_proc_wait();
+    /* 80473718 */ void mode_init_walk(u8);
+    /* 804737CC */ void mode_proc_walk();
+    /* 80473ED8 */ void mode_init_carry();
+    /* 804741A8 */ void mode_proc_carry();
+    /* 80474448 */ void mode_init_drop(u8);
+    /* 80474540 */ void mode_proc_drop();
+    /* 80474618 */ void mode_init_float();
+    /* 80474734 */ void mode_proc_float();
+    /* 80474A08 */ void mode_init_sink();
+    /* 80474B8C */ void mode_proc_sink();
+    /* 80474D64 */ void mode_init_yogan();
+    /* 80474E08 */ void mode_proc_yogan();
+    /* 80474E98 */ bool mode_proc_magne();
+    /* 80474EA0 */ bool mode_proc_magneCarry();
+    /* 80474EA8 */ void mode_init_boomCarry();
+    /* 80474FA8 */ void mode_proc_boomCarry();
+    /* 80475014 */ void mode_init_growth();
+    /* 804750C8 */ void mode_proc_growth();
+    /* 8047515C */ bool mode_proc_end();
+    /* 80475164 */ void mode_init_dbDrop(u8);
+    /* 80475210 */ void mode_proc_dbDrop();
+    /* 80475238 */ void mode_init_hookCarry();
+    /* 80475354 */ void mode_proc_hookCarry();
+    /* 80475384 */ void mode_init_fit();
+    /* 80475450 */ void mode_proc_fit();
+    /* 80475478 */ void mode_proc_controled();
+    /* 804754D0 */ void mode_init_resetLightBall();
+    /* 80475598 */ void mode_proc_resetLightBall();
+    /* 80475618 */ void chkSinkAll();
+    /* 8047567C */ void chkWaterLineIn();
+    /* 804756D4 */ void chkSinkObj();
+    /* 8047573C */ void bg_check();
+    /* 80476618 */ void check_bg_damage_proc_base();
+    /* 80476764 */ void bg_damage_proc_kotubo();
+    /* 804767C4 */ void bg_damage_proc_ootubo();
+    /* 804767E4 */ void bg_damage_proc_kibako();
+    /* 80476804 */ bool bg_damage_proc_ironball();
+    /* 8047680C */ void bg_damage_proc_taru();
+    /* 8047682C */ void bg_damage_proc_dokuro();
+    /* 8047684C */ void bg_damage_proc_bokkuri();
+    /* 80476930 */ bool bg_damage_proc_LightBall();
+    /* 80476938 */ bool bg_damage_proc_Lv8Ball();
+    /* 80476940 */ void obj_break(bool, bool, bool);
+    /* 80476A5C */ void check_cc_damage_proc_base(bool);
+    /* 80476B04 */ void cc_damage_proc_kotubo();
+    /* 80476B68 */ void cc_damage_proc_ootubo();
+    /* 80476B88 */ void cc_damage_proc_kibako();
+    /* 80476CE4 */ void cc_damage_proc_ironball();
+    /* 80476E04 */ void cc_damage_proc_taru();
+    /* 80476F88 */ void cc_damage_proc_dokuro();
+    /* 80476FA8 */ void cc_damage_proc_bokkuri();
+    /* 804771B0 */ bool cc_damage_proc_LightBall();
+    /* 804771B8 */ bool cc_damage_proc_Lv8Ball();
+    /* 804771C0 */ void eff_break_tuboBmd(u16, cXyz);
+    /* 8047731C */ void eff_break_kibakoBmd(cXyz);
+    /* 8047747C */ void eff_break_tsubo();
+    /* 804774D4 */ void eff_break_ootubo();
+    /* 8047752C */ void eff_break_kibako();
+    /* 80477574 */ void eff_break_ironball();
+    /* 80477578 */ void eff_break_taru();
+    /* 804775BC */ void eff_break_dokuro();
+    /* 80477614 */ void eff_break_bokkuri();
+    /* 80477798 */ void eff_break_kotubo2();
+    /* 804777F0 */ void eff_break_LightBall();
+    /* 804777F4 */ void eff_break_ootubo2();
+    /* 8047784C */ void eff_break_Lv8Ball();
+    /* 80477850 */ void eff_break_tsuboL8();
+    /* 804778A8 */ void eff_break_ootuboL8();
+    /* 80477900 */ void se_break(cBgS_PolyInfo*);
+    /* 80477990 */ void se_put(cBgS_PolyInfo*);
+    /* 80477A14 */ void se_put_water();
+    /* 80477A98 */ void se_fall_water();
+    /* 80477B1C */ void calc_rot_axis_base(u8);
+    /* 80477FE0 */ void calc_rot_axis_tsubo();
+    /* 80478004 */ void calc_rot_axis_ootubo();
+    /* 80478028 */ void calc_rot_axis_kibako();
+    /* 8047814C */ void calc_rot_axis_ironball();
+    /* 80478170 */ void calc_rot_axis_taru();
+    /* 80478190 */ void calc_rot_axis_dokuro();
+    /* 804781B4 */ void calc_rot_axis_bokkuri();
+    /* 804783C0 */ void calc_rot_axis_kotubo2();
+    /* 804783E4 */ void calc_rot_axis_LightBall();
+    /* 80478408 */ void calc_rot_axis_Lv8Ball();
+    /* 8047842C */ void set_wind_power();
+    /* 80478808 */ void exec_proc_tsubo();
+    /* 80478828 */ void exec_proc_ootubo();
+    /* 80478848 */ void exec_proc_kibako();
+    /* 8047884C */ void exec_proc_ironball();
+    /* 804788C4 */ void exec_proc_taru();
+    /* 804788C8 */ void exec_proc_dokuro();
+    /* 804788CC */ void exec_proc_bokkuri();
+    /* 80478C18 */ void exec_proc_LightBall();
+    /* 80478CE4 */ void exec_proc_Lv8Ball();
+    /* 80478D78 */ void bg_damage_proc_call();
+    /* 80478F50 */ void cc_damage_proc_call();
+    /* 80479128 */ void eff_break_call();
+    /* 804792D4 */ void calc_rot_call();
+    /* 80479480 */ void obj_execute_proc_call();
+    /* 8047962C */ void setTgHitCallBack();
+    /* 80479648 */ void setCoHitCallBack();
+    /* 80479664 */ void CreateInitCall();
+
+    s32 getType() { return mType; }
+
+    static u8 const mData[2072];
+
+private:
+    /* 0x568 */ u8 field_0x568[8];
+    /* 0x570 */ J3DModel* field_0x570;
+    /* 0x574 */ dBgS_Acch field_0x574;
+    /* 0x74C */ dBgS_AcchCir field_0x74c;
+    /* 0x78C */ dCcD_Stts field_0x78c;
+    /* 0x7C8 */ dCcD_Cyl field_0x7c8;
+    /* 0x904 */ dCcD_Sph field_0x904;
+    /* 0xA3C */ dCcD_Cps field_0xa3c;
+    /* 0xB80 */ dCcD_Cyl field_0xb80;
+    /* 0xCBC */ u8 field_0xcbc[0x34];
+    /* 0xCF0 */ u8 mType;
+    /* 0xCF4 */ cXyz field_0xcf4;
+    /* 0xD00 */ 
+};
 
 #endif /* D_A_OBJ_CARRY_H */
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 940e95c355..08fe8b32b9 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
@@ -1,6 +1,28 @@
 #ifndef D_A_TAG_MMSG_H
 #define D_A_TAG_MMSG_H
 
+#include "d/a/d_a_player.h"
 #include "dolphin/types.h"
 
+class daTagMmsg_c : public fopAc_ac_c {
+public:
+    /* 80D5B918 */ void create();
+    /* 80D5BAB4 */ ~daTagMmsg_c();
+    /* 80D5BB30 */ void execute();
+
+    void onUseFlg() { mUseFlg = true; }
+
+private:
+    /* 0x568 */ u8 field_0x568;
+    /* 0x569 */ u8 field_0x569;
+    /* 0x56A */ u8 mAttention;
+    /* 0x56B */ u8 field_0x56b;
+    /* 0x56C */ bool mUseFlg;
+    /* 0x56D */ u8 field_0x56d[3];
+    /* 0x570 */ u16 field_0x570;
+    /* 0x572 */ u16 field_0x572;
+    /* 0x574 */ f32 field_0x574;
+    /* 0x578 */ f32 field_0x578;
+};
+
 #endif /* D_A_TAG_MMSG_H */