d_a_obj_brg matching (#2539)

Author: YunataSavior

config/GZ2E01/rels/d_a_obj_brg/symbols.txt

@@ -3,22 +3,22 @@ _epilog = .text:0x0000002C; // type:function size:0x2C scope:global
 _unresolved = .text:0x00000058; // type:function size:0x20 scope:global
 __register_global_object = .text:0x00000078; // type:function size:0x1C scope:global
 __destroy_global_chain = .text:0x00000094; // type:function size:0x58 scope:global
-ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c = .text:0x000000EC; // type:function size:0x3F0 scope:global
+ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c = .text:0x000000EC; // type:function size:0x3F0 scope:local
 __dt__4cXyzFv = .text:0x000004DC; // type:function size:0x3C scope:global
-daObj_Brg_Draw__FP13obj_brg_class = .text:0x00000518; // type:function size:0xA08 scope:global
+daObj_Brg_Draw__FP13obj_brg_class = .text:0x00000518; // type:function size:0xA08 scope:local
 control1__FP13obj_brg_classP4br_s = .text:0x00000F20; // type:function size:0x324 scope:global
 control2__FP13obj_brg_classP4br_s = .text:0x00001244; // type:function size:0x1C4 scope:global
 control3__FP13obj_brg_classP4br_s = .text:0x00001408; // type:function size:0xC0 scope:global
 cut_control1__FP13obj_brg_classP4br_s = .text:0x000014C8; // type:function size:0x320 scope:global
 cut_control2__FP13obj_brg_classP4br_s = .text:0x000017E8; // type:function size:0x330 scope:global
 himo_cut_control1__FP13obj_brg_classP4cXyzf = .text:0x00001B18; // type:function size:0x240 scope:global
 obj_brg_move__FP13obj_brg_class = .text:0x00001D58; // type:function size:0xCA4 scope:global
-daObj_Brg_Execute__FP13obj_brg_class = .text:0x000029FC; // type:function size:0x1618 scope:global
-daObj_Brg_IsDelete__FP13obj_brg_class = .text:0x00004014; // type:function size:0x20 scope:global
-daObj_Brg_Delete__FP13obj_brg_class = .text:0x00004034; // type:function size:0x5C scope:global
+daObj_Brg_Execute__FP13obj_brg_class = .text:0x000029FC; // type:function size:0x1618 scope:local
+daObj_Brg_IsDelete__FP13obj_brg_class = .text:0x00004014; // type:function size:0x20 scope:local
+daObj_Brg_Delete__FP13obj_brg_class = .text:0x00004034; // type:function size:0x5C scope:local
 CreateInit__FP10fopAc_ac_c = .text:0x00004090; // type:function size:0x190 scope:global
-CallbackCreateHeap__FP10fopAc_ac_c = .text:0x00004220; // type:function size:0x610 scope:global
-daObj_Brg_Create__FP10fopAc_ac_c = .text:0x00004830; // type:function size:0xD24 scope:global
+CallbackCreateHeap__FP10fopAc_ac_c = .text:0x00004220; // type:function size:0x610 scope:local
+daObj_Brg_Create__FP10fopAc_ac_c = .text:0x00004830; // type:function size:0xD24 scope:local
 __dt__8dCcD_CylFv = .text:0x00005554; // type:function size:0xCC scope:global
 __ct__8dCcD_CylFv = .text:0x00005620; // type:function size:0x84 scope:global
 __dt__8cM3dGCylFv = .text:0x000056A4; // type:function size:0x48 scope:global
@@ -173,10 +173,10 @@ obj_brg_bmd$5576 = .rodata:0x00000160; // type:object size:0xC scope:local
 @stringBase0 = .rodata:0x00000244; // type:object size:0x17 scope:local data:string_table
 l_color$4002 = .data:0x00000000; // type:object size:0x4 scope:local
 l_color$4042 = .data:0x00000004; // type:object size:0x4 scope:local
-ita_z_p = .data:0x00000008; // type:object size:0x2C scope:global align:4 data:float
+ita_z_p = .data:0x00000008; // type:object size:0x2C scope:local align:4 data:float
 himo_cyl_src$5532 = .data:0x00000034; // type:object size:0x44 scope:local
 wire_cyl_src$5533 = .data:0x00000078; // type:object size:0x44 scope:local
-l_daObj_Brg_Method = .data:0x000000BC; // type:object size:0x20 scope:global
+l_daObj_Brg_Method = .data:0x000000BC; // type:object size:0x20 scope:local
 g_profile_OBJ_BRG = .data:0x000000DC; // type:object size:0x30 scope:global
 __vt__8cM3dGAab = .data:0x0000010C; // type:object size:0xC scope:global
 __vt__8cM3dGCyl = .data:0x00000118; // type:object size:0xC scope:global
@@ -199,7 +199,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
 @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
 @1010 = .bss:0x00000040; // type:object size:0x1 scope:local
 @1009 = .bss:0x00000044; // type:object size:0x1 scope:local
-wy = .bss:0x00000046; // type:object size:0x2 scope:global data:2byte
+wy = .bss:0x00000046; // type:object size:0x2 scope:local data:2byte
 @5786 = .bss:0x00000048; // type:object size:0xC scope:local
 @5789 = .bss:0x00000058; // type:object size:0xC scope:local
 @5790 = .bss:0x00000064; // type:object size:0xC scope:local

configure.py

@@ -1891,7 +1891,7 @@ def MatchingFor(*versions) -> bool:
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_bmshutter"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_bombf"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_boumato"),
-    ActorRel(NonMatching, "d_a_obj_brg"),
+    ActorRel(MatchingFor("GZ2E01"), "d_a_obj_brg"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_bsGate"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_bubblePilar"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_catdoor"),

include/d/actor/d_a_obj_brg.h

@@ -89,8 +89,9 @@ class obj_brg_class : public fopAc_ac_c {
     /* 0xB1EE */ u8 field_0xB1EE[0xB1EF - 0xB1EE];
     /* 0xB1EF */ s8 field_0xb1ef;
     /* 0xB1F0 */ s8 field_0xb1f0;
-    /* 0xB1F1 */ u8 field_0xb1f1;
-    /* 0xB1F2 */ u8 field_0xb1f2[0xb1f8 - 0xB1F2];
+    /* 0xB1F1 */ s8 field_0xb1f1;
+    /* 0xB1F2 */ s8 field_0xb1f2[2];
+    /* 0xB1F4 */ u8 field_0xb1f4[0xb1f8 - 0xB1F4];
 };
 
 STATIC_ASSERT(sizeof(obj_brg_class) == 0xb1f8);

include/d/actor/d_a_player.h

@@ -757,7 +757,7 @@ class daPy_py_c : public fopAc_ac_c {
     virtual BOOL checkCutCharge() const { return FALSE; }
     virtual BOOL checkCutTurnCharge() const { return FALSE; }
     virtual BOOL checkCutLargeJumpCharge() const { return FALSE; }
-    virtual bool getBokoFlamePos(cXyz*) { return FALSE; }
+    virtual BOOL getBokoFlamePos(cXyz*) { return FALSE; }
     virtual BOOL checkComboCutTurn() const { return FALSE; }
     virtual BOOL checkClimbMove() const { return FALSE; }
     virtual BOOL checkGrassWhistle() const { return FALSE; }