d_a_coach_fire, d_a_obj_kiPot, d_a_obj_lv4prelvtr done (#2259)

config/GZ2E01/rels/d_a_coach_fire/symbols.txt

@@ -5,11 +5,11 @@ create_init__13daCoachFire_cFv = .text:0x00000078; // type:function size:0xD0 sc
 initBaseMtx__13daCoachFire_cFv = .text:0x00000148; // type:function size:0x60 scope:global
 setBaseMtx__13daCoachFire_cFv = .text:0x000001A8; // type:function size:0x84 scope:global
 initCcSphere__13daCoachFire_cFv = .text:0x0000022C; // type:function size:0x70 scope:global
-daCoachFire_Draw__FP13daCoachFire_c = .text:0x0000029C; // type:function size:0x104 scope:global
-daCoachFire_Execute__FP13daCoachFire_c = .text:0x000003A0; // type:function size:0x1F4 scope:global
-daCoachFire_IsDelete__FP13daCoachFire_c = .text:0x00000594; // type:function size:0x8 scope:global
-daCoachFire_Delete__FP13daCoachFire_c = .text:0x0000059C; // type:function size:0x124 scope:global
-daCoachFire_Create__FP10fopAc_ac_c = .text:0x000006C0; // type:function size:0xEC scope:global
+daCoachFire_Draw__FP13daCoachFire_c = .text:0x0000029C; // type:function size:0x104 scope:local
+daCoachFire_Execute__FP13daCoachFire_c = .text:0x000003A0; // type:function size:0x1F4 scope:local
+daCoachFire_IsDelete__FP13daCoachFire_c = .text:0x00000594; // type:function size:0x8 scope:local
+daCoachFire_Delete__FP13daCoachFire_c = .text:0x0000059C; // type:function size:0x124 scope:local
+daCoachFire_Create__FP10fopAc_ac_c = .text:0x000006C0; // type:function size:0xEC scope:local
 __dt__8cM3dGSphFv = .text:0x000007AC; // type:function size:0x48 scope:global
 __dt__8cM3dGAabFv = .text:0x000007F4; // type:function size:0x48 scope:global
 __dt__10dCcD_GSttsFv = .text:0x0000083C; // type:function size:0x5C scope:global
@@ -27,7 +27,7 @@ ccSphSrc$localstatic3$initCcSphere__13daCoachFire_cFv = .rodata:0x00000020; // t
 @3912 = .rodata:0x00000064; // type:object size:0x4 scope:local
 @3913 = .rodata:0x00000068; // type:object size:0x4 scope:local data:string
 @stringBase0 = .rodata:0x0000006C; // type:object size:0x6 scope:local data:string_table
-l_daCoachFire_Method = .data:0x00000000; // type:object size:0x20 scope:global
+l_daCoachFire_Method = .data:0x00000000; // type:object size:0x20 scope:local
 g_profile_COACH_FIRE = .data:0x00000020; // type:object size:0x30 scope:global
 __vt__10cCcD_GStts = .data:0x00000050; // type:object size:0xC scope:global
 __vt__10dCcD_GStts = .data:0x0000005C; // type:object size:0xC scope:global

config/GZ2E01/rels/d_a_obj_kiPot/symbols.txt

@@ -14,10 +14,10 @@ modeWait__9daKiPot_cFv = .text:0x00000360; // type:function size:0x88 scope:glob
 chkEvent__9daKiPot_cFv = .text:0x000003E8; // type:function size:0x50 scope:global
 Draw__9daKiPot_cFv = .text:0x00000438; // type:function size:0x8 scope:global
 Delete__9daKiPot_cFv = .text:0x00000440; // type:function size:0x8 scope:global
-daKiPot_Draw__FP9daKiPot_c = .text:0x00000448; // type:function size:0x20 scope:global
-daKiPot_Execute__FP9daKiPot_c = .text:0x00000468; // type:function size:0x20 scope:global
-daKiPot_Delete__FP9daKiPot_c = .text:0x00000488; // type:function size:0x20 scope:global
-daKiPot_Create__FP10fopAc_ac_c = .text:0x000004A8; // type:function size:0x20 scope:global
+daKiPot_Draw__FP9daKiPot_c = .text:0x00000448; // type:function size:0x20 scope:local
+daKiPot_Execute__FP9daKiPot_c = .text:0x00000468; // type:function size:0x20 scope:local
+daKiPot_Delete__FP9daKiPot_c = .text:0x00000488; // type:function size:0x20 scope:local
+daKiPot_Create__FP10fopAc_ac_c = .text:0x000004A8; // type:function size:0x20 scope:local
 __dt__13daKiPot_HIO_cFv = .text:0x000004C8; // type:function size:0x5C scope:global
 __sinit_d_a_obj_kiPot_cpp = .text:0x00000524; // type:function size:0x3C scope:local
 _ctors = .ctors:0x00000000; // type:label scope:global
@@ -28,14 +28,14 @@ _dtors = .dtors:0x00000000; // type:label scope:global
 @3711 = .rodata:0x00000004; // type:object size:0x4 scope:local
 @3712 = .rodata:0x00000008; // type:object size:0x4 scope:local
 @3713 = .rodata:0x0000000C; // type:object size:0x4 scope:local
-l_cull_box = .data:0x00000000; // type:object size:0x18 scope:global
+l_cull_box = .data:0x00000000; // type:object size:0x18 scope:local
 @3688 = .data:0x00000018; // type:object size:0xC scope:local data:4byte
 mode_proc$3687 = .data:0x00000024; // type:object size:0xC scope:local data:4byte
-l_daKiPot_Method = .data:0x00000030; // type:object size:0x20 scope:global
+l_daKiPot_Method = .data:0x00000030; // type:object size:0x20 scope:local
 g_profile_Obj_KiPot = .data:0x00000050; // type:object size:0x30 scope:global
 __vt__13daKiPot_HIO_c = .data:0x00000080; // type:object size:0xC scope:global
 __vt__14mDoHIO_entry_c = .data:0x0000008C; // type:object size:0xC scope:global
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
 @3620 = .bss:0x00000008; // type:object size:0xC scope:local
-l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global
+l_HIO = .bss:0x00000014; // type:object size:0x8 scope:local
 lbl_501_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte

config/GZ2E01/rels/d_a_obj_lv4prelvtr/symbols.txt

@@ -5,23 +5,23 @@ create1st__14daObjPRElvtr_cFv = .text:0x00000078; // type:function size:0x90 sco
 setMtx__14daObjPRElvtr_cFv = .text:0x00000108; // type:function size:0x70 scope:global
 CreateHeap__14daObjPRElvtr_cFv = .text:0x00000178; // type:function size:0x70 scope:global
 Create__14daObjPRElvtr_cFv = .text:0x000001E8; // type:function size:0x68 scope:global
-searchObjSwTurn__FPvPv = .text:0x00000250; // type:function size:0x74 scope:global
+searchObjSwTurn__FPvPv = .text:0x00000250; // type:function size:0x74 scope:local
 Execute__14daObjPRElvtr_cFPPA3_A4_f = .text:0x000002C4; // type:function size:0x100 scope:global
 Draw__14daObjPRElvtr_cFv = .text:0x000003C4; // type:function size:0xA4 scope:global
 Delete__14daObjPRElvtr_cFv = .text:0x00000468; // type:function size:0x3C scope:global
-daObjPRElvtr_create1st__FP14daObjPRElvtr_c = .text:0x000004A4; // type:function size:0x60 scope:global
-daObjPRElvtr_MoveBGDelete__FP14daObjPRElvtr_c = .text:0x00000504; // type:function size:0x20 scope:global
-daObjPRElvtr_MoveBGExecute__FP14daObjPRElvtr_c = .text:0x00000524; // type:function size:0x20 scope:global
-daObjPRElvtr_MoveBGDraw__FP14daObjPRElvtr_c = .text:0x00000544; // type:function size:0x2C scope:global
+daObjPRElvtr_create1st__FP14daObjPRElvtr_c = .text:0x000004A4; // type:function size:0x60 scope:local
+daObjPRElvtr_MoveBGDelete__FP14daObjPRElvtr_c = .text:0x00000504; // type:function size:0x20 scope:local
+daObjPRElvtr_MoveBGExecute__FP14daObjPRElvtr_c = .text:0x00000524; // type:function size:0x20 scope:local
+daObjPRElvtr_MoveBGDraw__FP14daObjPRElvtr_c = .text:0x00000544; // type:function size:0x2C scope:local
 __dt__14daObjPRElvtr_cFv = .text:0x00000570; // type:function size:0x70 scope:global
 _ctors = .ctors:0x00000000; // type:label scope:global
 _dtors = .dtors:0x00000000; // type:label scope:global
-l_cull_box = .rodata:0x00000000; // type:object size:0x18 scope:global
+l_cull_box = .rodata:0x00000000; // type:object size:0x18 scope:local
 @3694 = .rodata:0x00000018; // type:object size:0x4 scope:local data:float
 @3695 = .rodata:0x0000001C; // type:object size:0x4 scope:local data:float
 @3697 = .rodata:0x00000020; // type:object size:0x8 scope:local data:double
 @stringBase0 = .rodata:0x00000028; // type:object size:0x8 scope:local data:string_table
-l_arcName = .data:0x00000000; // type:object size:0x4 scope:global
-daObjPRElvtr_METHODS = .data:0x00000004; // type:object size:0x20 scope:global
+l_arcName = .data:0x00000000; // type:object size:0x4 scope:local
+daObjPRElvtr_METHODS = .data:0x00000004; // type:object size:0x20 scope:local
 g_profile_Obj_PRElvtr = .data:0x00000024; // type:object size:0x30 scope:global
 __vt__14daObjPRElvtr_c = .data:0x00000054; // type:object size:0x2C scope:global

configure.py

@@ -1527,7 +1527,7 @@ def MatchingFor(*versions):
     ActorRel(NonMatching, "d_a_balloon_2D"),
     ActorRel(NonMatching, "d_a_bullet"),
     ActorRel(NonMatching, "d_a_coach_2D"),
-    ActorRel(NonMatching, "d_a_coach_fire"),
+    ActorRel(Matching, "d_a_coach_fire"),
     ActorRel(NonMatching, "d_a_cow"),
     ActorRel(NonMatching, "d_a_cstatue"),
     ActorRel(Equivalent, "d_a_do"),
@@ -1866,7 +1866,7 @@ def MatchingFor(*versions):
     ActorRel(NonMatching, "d_a_obj_key"),
     ActorRel(NonMatching, "d_a_obj_keyhole"),
     ActorRel(Matching, "d_a_obj_ki"),
-    ActorRel(NonMatching, "d_a_obj_kiPot"),
+    ActorRel(Matching, "d_a_obj_kiPot"),
     ActorRel(NonMatching, "d_a_obj_kita"),
     ActorRel(Matching, "d_a_obj_kjgjs"),
     ActorRel(Matching, "d_a_obj_kkanban"),
@@ -1901,7 +1901,7 @@ def MatchingFor(*versions):
     ActorRel(Matching, "d_a_obj_lv4digsand"),
     ActorRel(Matching, "d_a_obj_lv4floor"),
     ActorRel(Matching, "d_a_obj_lv4gear"),
-    ActorRel(NonMatching, "d_a_obj_lv4prelvtr"),
+    ActorRel(Matching, "d_a_obj_lv4prelvtr"),
     ActorRel(NonMatching, "d_a_obj_lv4prwall"),
     ActorRel(NonMatching, "d_a_obj_lv4sand"),
     ActorRel(Matching, "d_a_obj_lv5FloorBoard"),

include/d/actor/d_a_coach_fire.h

@@ -1,9 +1,21 @@
 #ifndef D_A_COACH_FIRE_H
 #define D_A_COACH_FIRE_H
 
-#include "dolphin/types.h"
+#include "d/actor/d_a_npc_coach.h"
+#include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
+struct CoachFireAttr {
+    f32 radius;
+    f32 field_0x04;
+    u8 field_0x08;
+    // GXColorS10 color;
+    u8 colorR;
+    u8 colorG;
+    u8 colorB;
+    f32 pow;
+};
+
 /**
  * @ingroup actors-unsorted
  * @class daCoachFire_c
@@ -19,13 +31,27 @@ class daCoachFire_c : public fopAc_ac_c {
     /* 80657CA8 */ void setBaseMtx();
     /* 80657D2C */ void initCcSphere();
 
-    static u8 const M_attr[16];
+    const CoachFireAttr& attr() { return M_attr; }
+
+    static CoachFireAttr const M_attr;
+
+    inline ~daCoachFire_c();
+
+    inline int draw();
+    inline void setCcSphere();
+    inline void setNoHitTimer();
+    inline int execute();
 
 private:
-    /* 0x568 */ u8 field_0x568[0x714 - 0x568];
+    /* 0x568 */ LIGHT_INFLUENCE mLightInfluence;
+    /* 0x588 */ dCcD_Stts mStts;
+    /* 0x5C4 */ dCcD_Sph mSph;
+    /* 0x6FC */ Mtx* mpMtx;
+    /* 0x700 */ cXyz mPos;
+    /* 0x70C */ u32 mParticleKey;
+    /* 0x710 */ int noHitTimer;
 };
 
 STATIC_ASSERT(sizeof(daCoachFire_c) == 0x714);
 
-
 #endif /* D_A_COACH_FIRE_H */

include/d/actor/d_a_npc_coach.h

@@ -15,7 +15,7 @@ class daNpcCoach_c : public fopAc_ac_c {
 public:
     /* 8099DA60 */ void hitFireArrow(cXyz);
     /* 8099DBA4 */ void deleteFireArrow(unsigned int);
-    /* 8099DCE8 */ void deleteFireArrowFromList(unsigned int);
+    /* 8099DCE8 */ bool deleteFireArrowFromList(unsigned int);
     /* 8099DD28 */ void setPosAngle(cXyz&, csXyz&);
     /* 8099DD7C */ void ctrlJointHorse(J3DJoint*, J3DModel*);
     /* 8099DE18 */ void initCoachPosition(Vec&, SVec&);
@@ -43,9 +43,18 @@ class daNpcCoach_c : public fopAc_ac_c {
     /* 809A46C4 */ void initCoachBlazing();
     /* 809A48A8 */ daNpcCoach_c();
 
+    bool checkCoachBlazing() { return field_0x1dc4; }
+    Mtx* getCoachMtx() { return &field_0x2490; }
+
     static u8 const M_attr[160];
 private:
-    /* 0x568 */ u8 field_0x568[0x2570 - 0x568];
+    /* 0x568 */ u8 field_0x568[0x1dc4 - 0x568];
+    /* 0x1DC4 */ bool field_0x1dc4;
+    /* 0x1DC5 */ u8 field_0x1dc5[0x247c - 0x1dc5];
+    /* 0x247C */ u32 field_0x247c[4];
+    /* 0x248C */ u8 field_0x248c[0x2490 - 0x248c];
+    /* 0x2490 */ Mtx field_0x2490;
+    /* 0x24C0 */ u8 field_0x254c[0x2570 - 0x24c0];
 };
 
 STATIC_ASSERT(sizeof(daNpcCoach_c) == 0x2570);

include/d/actor/d_a_obj_kiPot.h

@@ -14,26 +14,32 @@
 class daKiPot_c : public fopAc_ac_c {
 public:
     /* 80C44D78 */ void setBaseMtx();
-    /* 80C44DD0 */ void create();
-    /* 80C44E7C */ void Execute();
+    /* 80C44DD0 */ int create();
+    /* 80C44E7C */ int Execute();
     /* 80C44EF8 */ void procMain();
     /* 80C44F74 */ void init_modeWait();
     /* 80C44F80 */ void modeWait();
-    /* 80C45008 */ void chkEvent();
-    /* 80C45058 */ bool Draw();
-    /* 80C45060 */ bool Delete();
+    /* 80C45008 */ s32 chkEvent();
+    /* 80C45058 */ int Draw();
+    /* 80C45060 */ int Delete();
 
 private:
-    /* 0x568 */ u8 field_0x568[0x578 - 0x568];
+    /* 0x568 */ u8 field_0x568[0x574 - 0x568];
+    /* 0x574 */ u8 mMode;
+    /* 0x575 */ u8 field_0x575;
+    /* 0x576 */ u8 field_0x576[0x578 - 0x576];
 };
 
 STATIC_ASSERT(sizeof(daKiPot_c) == 0x578);
 
-class daKiPot_HIO_c {
+class daKiPot_HIO_c : public mDoHIO_entry_c {
 public:
     /* 80C44D0C */ daKiPot_HIO_c();
-    /* 80C450E8 */ ~daKiPot_HIO_c();
-};
+    /* 80C450E8 */ virtual ~daKiPot_HIO_c() {};
+
+    /* 0x00 */ /* vtable */
 
+    /* 0x06 */ u8 field_0x06;
+};
 
 #endif /* D_A_OBJ_KIPOT_H */

include/d/actor/d_a_obj_lv4prelvtr.h

@@ -1,6 +1,8 @@
 #ifndef D_A_OBJ_LV4PRELVTR_H
 #define D_A_OBJ_LV4PRELVTR_H
 
+#include "d/actor/d_a_obj_swturn.h"
+#include "d/d_bg_s_movebg_actor.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**
@@ -11,22 +13,26 @@
  * @details
  *
  */
-class daObjPRElvtr_c : public fopAc_ac_c {
+class daObjPRElvtr_c : public dBgS_MoveBgActor, public request_of_phase_process_class {
 public:
-    /* 80C685F8 */ void create1st();
+    /* 80C685F8 */ int create1st();
     /* 80C68688 */ void setMtx();
-    /* 80C686F8 */ void CreateHeap();
-    /* 80C68768 */ void Create();
-    /* 80C68844 */ void Execute(f32 (**)[3][4]);
-    /* 80C68944 */ void Draw();
-    /* 80C689E8 */ void Delete();
-    /* 80C68AF0 */ ~daObjPRElvtr_c();
+    /* 80C686F8 */ int CreateHeap();
+    /* 80C68768 */ int Create();
+    /* 80C68844 */ int Execute(Mtx**);
+    /* 80C68944 */ int Draw();
+    /* 80C689E8 */ int Delete();
+    /* 80C68AF0 */ virtual ~daObjPRElvtr_c() {}
+
+    int getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
 
 private:
-    /* 0x568 */ u8 field_0x568[0x610 - 0x568];
+    /* 0x5A8 */ Mtx mMtx1;
+    /* 0x5D8 */ Mtx mMtx2;
+    /* 0x608 */ J3DModel* mpModel;
+    /* 0x60C */ int field_0x60c;
 };
 
 STATIC_ASSERT(sizeof(daObjPRElvtr_c) == 0x610);
 
-
 #endif /* D_A_OBJ_LV4PRELVTR_H */

include/d/actor/d_a_obj_swturn.h

@@ -29,11 +29,23 @@ class daObjSwTurn_c : public fopAc_ac_c {
     /* 80D01EB0 */ void Draw();
     /* 80D01F58 */ void Delete();
 
+    int getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
+    int getSwNo2() { return fopAcM_GetParamBit(this, 0x14, 8); }
+    int getRotateAngle() {
+        return (field_0x5ad == NULL) ? field_0x5ba + field_0x5c4 * 0x4000 :
+                                       field_0x5ba + (field_0x5c4 << 0xe) / 3;
+    }
+
 private:
-    /* 0x568 */ u8 field_0x568[0x5e0 - 0x568];
+    /* 0x568 */ u8 field_0x568[0x5ad - 0x568];
+    /* 0x5AD */ bool field_0x5ad;
+    /* 0x5AE */ u8 field_0x5ae[0x5ba - 0x5ae];
+    /* 0x5BA */ s16 field_0x5ba;
+    /* 0x5BC */ u8 field_0x5bc[0x5c4 - 0x5bc];
+    /* 0x5C4 */ s16 field_0x5c4;
+    /* 0x5C6 */ u8 field_0x5c6[0x5e0 - 0x5c6];
 };
 
 STATIC_ASSERT(sizeof(daObjSwTurn_c) == 0x5e0);
 
-
 #endif /* D_A_OBJ_SWTURN_H */