encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improve various partially matched TUs (#2526)

Browse Source
This commit is contained in:
hatal175
2025-07-11 01:11:21 -07:00
committed by GitHub
parent a11f8f6375
commit b83ff69589
25 changed files with 285 additions and 1140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/GZ2E01/rels/d_a_obj_hfuta/symbols.txt
+1 -2
View File
@@ -35,8 +35,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@stringBase0 = .rodata:0x00000020; // type:object size:0xA scope:local data:string_table
...data.0 = .data:0x00000000; // type:label scope:local
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
lbl_477_data_10 = .data:0x00000010; // type:object size:0x10
lit_1787 = .data:0x0000000C; // type:object size:0x14 scope:local
l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte
@3966 = .data:0x00000024; // type:object size:0xC scope:local
@3967 = .data:0x00000030; // type:object size:0xC scope:local
config/GZ2E01/rels/d_a_obj_ice_s/symbols.txt
+1 -1
View File
@@ -65,6 +65,6 @@ g_profile_Obj_Ice_s = .data:0x00000024; // type:object size:0x30 scope:global
__vt__12daObjIce_s_c = .data:0x00000054; // type:object size:0x28 scope:global
__vt__17daOBJ_ICE_S_HIO_c = .data:0x0000007C; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_480_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte
@3639 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float
config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt
+2 -3
View File
@@ -39,8 +39,7 @@ __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 sc
_dtors = .dtors:0x00000000; // type:label scope:global
...data.0 = .data:0x00000000; // type:label scope:local
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
lbl_523_data_10 = .data:0x00000010; // type:object size:0x10
lit_1787 = .data:0x0000000C; // type:object size:0x14 scope:local
@3702 = .data:0x00000020; // type:object size:0xC scope:local
@3703 = .data:0x0000002C; // type:object size:0xC scope:local
@3704 = .data:0x00000038; // type:object size:0xC scope:local
@@ -55,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
@3632 = .bss:0x00000008; // type:object size:0xC scope:local
l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:2byte
lbl_523_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte
l_HIOInit = .bss:0x0000001C; // type:object size:0x1 data:byte
config/GZ2J01/rels/d_a_obj_hfuta/symbols.txt
+1 -2
View File
@@ -34,8 +34,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@3998 = .rodata:0x0000001C; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x00000020; // type:object size:0xA scope:local data:string_table
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
lbl_477_data_10 = .data:0x00000010; // type:object size:0x10
lit_1787 = .data:0x0000000C; // type:object size:0x14 scope:local
l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte
@3966 = .data:0x00000024; // type:object size:0xC scope:local
@3967 = .data:0x00000030; // type:object size:0xC scope:local
config/GZ2J01/rels/d_a_obj_ice_s/symbols.txt
+1 -1
View File
@@ -65,6 +65,6 @@ g_profile_Obj_Ice_s = .data:0x00000024; // type:object size:0x30 scope:global
__vt__12daObjIce_s_c = .data:0x00000054; // type:object size:0x28 scope:global
__vt__17daOBJ_ICE_S_HIO_c = .data:0x0000007C; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_480_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte
@3639 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float
config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt
+2 -3
View File
@@ -38,8 +38,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global
__destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
lbl_523_data_10 = .data:0x00000010; // type:object size:0x10
lit_1787 = .data:0x0000000C; // type:object size:0x14 scope:local
@3702 = .data:0x00000020; // type:object size:0xC scope:local
@3703 = .data:0x0000002C; // type:object size:0xC scope:local
@3704 = .data:0x00000038; // type:object size:0xC scope:local
@@ -54,4 +53,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
@3632 = .bss:0x00000008; // type:object size:0xC scope:local
l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:2byte
lbl_523_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte
l_HIOInit = .bss:0x0000001C; // type:object size:0x1 data:byte
config/GZ2P01/rels/d_a_obj_hfuta/symbols.txt
+1 -2
View File
@@ -34,8 +34,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@3998 = .rodata:0x0000001C; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x00000020; // type:object size:0xA scope:local data:string_table
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
lbl_477_data_10 = .data:0x00000010; // type:object size:0x10
lit_1787 = .data:0x0000000C; // type:object size:0x14 scope:local
l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte
@3966 = .data:0x00000024; // type:object size:0xC scope:local
@3967 = .data:0x00000030; // type:object size:0xC scope:local
config/GZ2P01/rels/d_a_obj_ice_s/symbols.txt
+1 -1
View File
@@ -65,6 +65,6 @@ g_profile_Obj_Ice_s = .data:0x00000024; // type:object size:0x30 scope:global
__vt__12daObjIce_s_c = .data:0x00000054; // type:object size:0x28 scope:global
__vt__17daOBJ_ICE_S_HIO_c = .data:0x0000007C; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_480_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte
@3639 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float
config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt
+2 -3
View File
@@ -38,8 +38,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global
__destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
lbl_523_data_10 = .data:0x00000010; // type:object size:0x10
lit_1787 = .data:0x0000000C; // type:object size:0x14 scope:local
@3702 = .data:0x00000020; // type:object size:0xC scope:local
@3703 = .data:0x0000002C; // type:object size:0xC scope:local
@3704 = .data:0x00000038; // type:object size:0xC scope:local
@@ -54,4 +53,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
@3632 = .bss:0x00000008; // type:object size:0xC scope:local
l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:2byte
lbl_523_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte
l_HIOInit = .bss:0x0000001C; // type:object size:0x1 data:byte
config/RZDE01_00/rels/d_a_obj_ice_s/symbols.txt
+1 -1
View File
@@ -69,6 +69,6 @@ __RTTI__12daObjIce_s_c = .data:0x000000DC; // type:object size:0x8 scope:global
lbl_480_data_E4 = .data:0x000000E4; // type:object size:0xA data:string
lbl_480_data_EE = .data:0x000000EE; // type:object size:0xA data:string
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_480_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte
@91760 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float
configure.py
+8 -8
View File
@@ -1947,9 +1947,9 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_hasu2"),
ActorRel(NonMatching, "d_a_obj_hata"),
ActorRel(NonMatching, "d_a_obj_hb"),
ActorRel(NonMatching, "d_a_obj_hbombkoya"),
ActorRel(Equivalent, "d_a_obj_hbombkoya"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_heavySw"),
ActorRel(NonMatching, "d_a_obj_hfuta"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_hfuta"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_hsTarget"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ice_l"),
ActorRel(NonMatching, "d_a_obj_ice_s"),
@@ -1986,7 +1986,7 @@ config.libs = [
ActorRel(Equivalent, "d_a_obj_laundry"), # weak func order
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_laundry_rope"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lbox"),
ActorRel(NonMatching, "d_a_obj_lp"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lp"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv1Candle00"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv1Candle01"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv3Candle"),
@@ -1995,7 +1995,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv3WaterB"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv3saka00"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv3waterEff"),
ActorRel(NonMatching, "d_a_obj_lv4CandleDemoTag"),
ActorRel(Equivalent, "d_a_obj_lv4CandleDemoTag"), # weak function order
ActorRel(NonMatching, "d_a_obj_lv4CandleTag"),
ActorRel(NonMatching, "d_a_obj_lv4EdShutter"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv4Gate"),
@@ -2040,7 +2040,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_magLift"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_magLiftRot"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_maki"),
ActorRel(NonMatching, "d_a_obj_master_sword"),
ActorRel(Equivalent, "d_a_obj_master_sword"), #weak function and vtable order
ActorRel(NonMatching, "d_a_obj_mato"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_mhole"),
ActorRel(NonMatching, "d_a_obj_mie"),
@@ -2053,7 +2053,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_mvstair"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_myogan"),
ActorRel(NonMatching, "d_a_obj_nagaisu"),
ActorRel(Equivalent, "d_a_obj_nan"),
ActorRel(Equivalent, "d_a_obj_nan"), # weak function order
ActorRel(NonMatching, "d_a_obj_ndoor"),
ActorRel(NonMatching, "d_a_obj_nougu"),
ActorRel(Equivalent, "d_a_obj_octhashi"),
@@ -2073,7 +2073,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_prop"),
ActorRel(NonMatching, "d_a_obj_pumpkin"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_rcircle"),
ActorRel(NonMatching, "d_a_obj_rfHole"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_rfHole"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_rgate"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_riverrock"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_rock"),
@@ -2090,7 +2090,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_scannon_ten"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_sekidoor"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_sekizo"),
ActorRel(Equivalent, "d_a_obj_sekizoa"),
ActorRel(Equivalent, "d_a_obj_sekizoa"), # weak function order
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_shield"),
ActorRel(Equivalent, "d_a_obj_sm_door"), # vtable order
ActorRel(NonMatching, "d_a_obj_smallkey"),
include/SSystem/SComponent/c_m3d_g_aab.h
+2 -2
View File
@@ -26,9 +26,9 @@ public:
void CalcCenter(cXyz*) const;
void PlusR(f32);
const cXyz* GetMaxP(void) const { return &mMax; }
const cXyz* GetMaxP(void) { return &mMax; }
cXyz* GetMaxP(void) { return &mMax; }
const cXyz* GetMinP(void) const { return &mMin; }
const cXyz* GetMinP(void) { return &mMin; }
cXyz* GetMinP(void) { return &mMin; }
const f32 GetMaxX(void) const { return mMax.x; }
const f32 GetMaxY(void) const { return mMax.y; }
const f32 GetMaxZ(void) const { return mMax.z; }
include/d/actor/d_a_obj_hbombkoya.h
+1 -1
View File
@@ -28,7 +28,7 @@ public:
/* 80C1B878 */ int create1st();
/* 80C1BB7C */ bool setParticle(u16*, int, PSetTbl*, int, int);
/* 80C1C474 */ virtual ~daObjHBombkoya_c();
/* 80C1C474 */ virtual ~daObjHBombkoya_c() {}
/* 80C1B938 */ virtual int CreateHeap();
/* 80C1B9CC */ virtual int Create();
include/d/actor/d_a_obj_ice_s.h
+1 -1
View File
@@ -60,7 +60,7 @@ STATIC_ASSERT(sizeof(daObjIce_s_c) == 0x644);
class daOBJ_ICE_S_HIO_c {
public:
/* 80C209AC */ daOBJ_ICE_S_HIO_c();
/* 80C21A60 */ virtual ~daOBJ_ICE_S_HIO_c();
/* 80C21A60 */ virtual ~daOBJ_ICE_S_HIO_c() {}
/* 0x4 */ s8 field_0x4;
/* 0x8 */ f32 field_0x8;
include/d/actor/d_a_obj_lp.h
+5 -4
View File
@@ -14,8 +14,8 @@
struct wd_ss {
public:
/* 80C559C8 */ ~wd_ss() {};
/* 80C55A04 */ wd_ss() {};
/* 80C559C8 */ ~wd_ss() {}
/* 80C55A04 */ wd_ss() {}
/* 0x00 */ J3DModel* mpModel;
/* 0x04 */ cXyz field_0x4;
@@ -31,15 +31,16 @@ public:
/* 0x42 */ s16 field_0x42;
/* 0x44 */ s16 field_0x44;
/* 0x46 */ u8 field_0x46[0x4e - 0x46];
/* 0x4E */ u8 field_0x4e;
/* 0x4E */ s8 field_0x4e;
/* 0x4F */ u8 field_0x4f;
/* 0x50 */ int field_0x50;
};
STATIC_ASSERT(sizeof(wd_ss) == 0x54);
class obj_lp_class : public fopAc_ac_c {
class obj_lp_class {
public:
/* 0x0000 */ fopAc_ac_c mActor;
/* 0x0568 */ request_of_phase_process_class mPhase;
/* 0x0570 */ u8 field_0x570;
/* 0x0571 */ u8 field_0x571;
include/d/actor/d_a_obj_lv4CandleDemoTag.h
+3 -2
View File
@@ -15,6 +15,7 @@
*/
class dalv4CandleDemoTag_c : public fopAc_ac_c, public request_of_phase_process_class, public dEvLib_callback_c {
public:
typedef void (dalv4CandleDemoTag_c::*procFunc)();
dalv4CandleDemoTag_c() : dEvLib_callback_c(this) {}
/* 80C5CA58 */ void setBaseMtx();
@@ -39,7 +40,7 @@ public:
int getSwOK() { return shape_angle.x & 0xFF; }
int getEventID() { return fopAcM_GetParamBit(this, 0x18, 8); }
/* 80C5D184 */ virtual ~dalv4CandleDemoTag_c();
/* 80C5D184 */ virtual ~dalv4CandleDemoTag_c() {}
/* 80C5CF78 */ virtual bool eventStart();
private:
@@ -56,7 +57,7 @@ STATIC_ASSERT(sizeof(dalv4CandleDemoTag_c) == 0x590);
class dalv4CandleDemoTag_HIO_c : public mDoHIO_entry_c {
public:
/* 80C5C9EC */ dalv4CandleDemoTag_HIO_c();
/* 80C5D07C */ virtual ~dalv4CandleDemoTag_HIO_c();
/* 80C5D07C */ virtual ~dalv4CandleDemoTag_HIO_c() {}
void genMessage(JORMContext*);
include/d/actor/d_a_obj_rfHole.h
+1 -2
View File
@@ -28,7 +28,7 @@ public:
/* 80CB8FF8 */ int create();
/* 80CB9148 */ static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
/* 80CB9194 */ int playerAreaCheck();
/* 80CB940C */ int Execute(f32 (**)[3][4]);
/* 80CB940C */ int Execute(Mtx**);
/* 80CB9464 */ void holeProc();
/* 80CB9520 */ void init_modeWait();
/* 80CB952C */ void modeWait();
@@ -50,7 +50,6 @@ private:
/* 0x5AE */ u8 field_0x5ae;
/* 0x5AF */ u8 field_0x5af;
/* 0x5B0 */ s8 mRoofSoundOn;
/* 0x5B1 */ u8 field_0x5b1[0x5b4 - 0x5b1];
};
STATIC_ASSERT(sizeof(daRfHole_c) == 0x5b4);
src/d/actor/d_a_obj_hbombkoya.cpp
+8 -232
View File
@@ -6,98 +6,6 @@
#include "d/actor/d_a_obj_hbombkoya.h"
#include "d/d_com_inf_game.h"
#include "d/d_bg_w.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" void create1st__16daObjHBombkoya_cFv();
extern "C" void CreateHeap__16daObjHBombkoya_cFv();
extern "C" void Create__16daObjHBombkoya_cFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" void setParticle__16daObjHBombkoya_cFPUsiPQ216daObjHBombkoya_c7PSetTblii();
extern "C" void Execute__16daObjHBombkoya_cFPPA3_A4_f();
extern "C" void Draw__16daObjHBombkoya_cFv();
extern "C" void Delete__16daObjHBombkoya_cFv();
extern "C" static void daObjHBombkoya_create1st__FP16daObjHBombkoya_c();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__10dCcD_GSttsFv();
extern "C" static void daObjHBombkoya_MoveBGDelete__FP16daObjHBombkoya_c();
extern "C" static void daObjHBombkoya_MoveBGExecute__FP16daObjHBombkoya_c();
extern "C" static void daObjHBombkoya_MoveBGDraw__FP16daObjHBombkoya_c();
extern "C" void __dt__10cCcD_GSttsFv();
extern "C" void __dt__17dEvLib_callback_cFv();
extern "C" bool eventStart__17dEvLib_callback_cFv();
extern "C" bool eventRun__17dEvLib_callback_cFv();
extern "C" bool eventEnd__17dEvLib_callback_cFv();
extern "C" void __dt__16daObjHBombkoya_cFv();
extern "C" static void func_80C1C5E8();
extern "C" extern char const* const d_a_obj_hbombkoya__stringBase0;
//
// External References:
//
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void scaleM__14mDoMtx_stack_cFfff();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void __dt__10fopAc_ac_cFv();
extern "C" void fopAcM_delete__FP10fopAc_ac_c();
extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void onSwitch__10dSv_info_cFii();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void
set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" void
set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" void __ct__16dBgS_MoveBgActorFv();
extern "C" bool IsDelete__16dBgS_MoveBgActorFv();
extern "C" bool ToFore__16dBgS_MoveBgActorFv();
extern "C" bool ToBack__16dBgS_MoveBgActorFv();
extern "C" void
MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f();
extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv();
extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv();
extern "C" void __ct__10dCcD_GSttsFv();
extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
extern "C" void __ct__12dCcD_GObjInfFv();
extern "C" void __dt__12dCcD_GObjInfFv();
extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void Set__4cCcSFP8cCcD_Obj();
extern "C" void SetC__8cM3dGCylFRC4cXyz();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void __dl__FPv();
extern "C" void _savegpr_19();
extern "C" void _savegpr_24();
extern "C" void _restgpr_19();
extern "C" void _restgpr_24();
extern "C" extern void* __vt__16dBgS_MoveBgActor[10];
extern "C" extern void* __vt__8dCcD_Cyl[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* __vt__12cCcD_CylAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern void* __vt__10cCcD_GStts[3];
extern void* __vt__10dCcD_GStts[3];
extern void* __vt__8cM3dGCyl[3];
extern void* __vt__17dEvLib_callback_c[6];
extern void* __vt__8cM3dGAab[3];
extern void* __vt__16daObjHBombkoya_c[17];
//
// Declarations:
//
/* 80C1C734-80C1C738 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
static char* l_arcName = "H_Bombkoy";
@@ -137,11 +45,6 @@ int daObjHBombkoya_c::CreateHeap() {
return 1;
}
/* ############################################################################################## */
/* 80C1C5F8-80C1C5FC 000000 0004+00 2/2 0/0 0/0 .rodata @3699 */
SECTION_RODATA static f32 const lit_3699 = 200.0f;
COMPILER_STRIP_GATE(0x80C1C5F8, &lit_3699);
/* 80C1C738-80C1C77C 000004 0044+00 1/1 0/0 0/0 .data l_cc_cyl_src */
static dCcD_SrcCyl l_cc_cyl_src = {
{
@@ -163,8 +66,9 @@ int daObjHBombkoya_c::Create() {
fopAcM_SetMtx(this, NULL);
cM3dGAab aab(*mpBgW->GetBnd());
aab.GetMaxP()->y += 200.0f;
fopAcM_setCullSizeBox(this, aab.GetMinP()->x, aab.GetMinP()->y, aab.GetMinP()->z,
aab.GetMaxP()->x, aab.GetMaxP()->y + 200.0f, aab.GetMaxP()->z);
aab.GetMaxP()->x, aab.GetMaxP()->y, aab.GetMaxP()->z);
mTimer = 0;
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
@@ -176,20 +80,13 @@ int daObjHBombkoya_c::Create() {
mEmitterKeys[i] = 0;
}
mActive = false;
mActive = true;
mStts.Init(0xFF, 0, this);
mCyl.Set(l_cc_cyl_src);
mCyl.SetStts(&mStts);
return 1;
}
/* 80C1BB34-80C1BB7C 000334 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */
// cM3dGAab::~cM3dGAab() {
extern "C" void __dt__8cM3dGAabFv() {
// NONMATCHING
}
/* 80C1BB7C-80C1BCA0 00037C 0124+00 1/1 0/0 0/0 .text
* setParticle__16daObjHBombkoya_cFPUsiPQ216daObjHBombkoya_c7PSetTblii */
bool daObjHBombkoya_c::setParticle(u16* i_particleIDs, int i_particleMax,
@@ -355,8 +252,6 @@ int daObjHBombkoya_c::Delete() {
return 1;
}
/* ############################################################################################## */
/* 80C1C1A8-80C1C2BC 0009A8 0114+00 1/0 0/0 0/0 .text
* daObjHBombkoya_create1st__FP16daObjHBombkoya_c */
// NONMATCHING - vtable issues, read more below
@@ -366,18 +261,6 @@ static int daObjHBombkoya_create1st(daObjHBombkoya_c* i_this) {
return i_this->create1st();
}
/* 80C1C2BC-80C1C304 000ABC 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */
// cM3dGCyl::~cM3dGCyl() {
extern "C" void __dt__8cM3dGCylFv() {
// NONMATCHING
}
/* 80C1C304-80C1C360 000B04 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */
// dCcD_GStts::~dCcD_GStts() {
extern "C" void __dt__10dCcD_GSttsFv() {
// NONMATCHING
}
/* 80C1C360-80C1C380 000B60 0020+00 1/0 0/0 0/0 .text
* daObjHBombkoya_MoveBGDelete__FP16daObjHBombkoya_c */
static int daObjHBombkoya_MoveBGDelete(daObjHBombkoya_c* i_this) {
@@ -396,61 +279,13 @@ static int daObjHBombkoya_MoveBGDraw(daObjHBombkoya_c* i_this) {
return i_this->MoveBGDraw();
}
/**
* Vtables for daObjHBombkoya_c mostly match, but __dt__17dEvLib_callback_cFv keeps getting
* generated above after daObjHBombkoya_create1st instead of down here. If that can be fixed,
* it should fix all vtable issues for this TU
*/
/* 80C1C3CC-80C1C414 000BCC 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */
// cCcD_GStts::~cCcD_GStts() {
extern "C" void __dt__10cCcD_GSttsFv() {
// NONMATCHING
}
/* 80C1C414-80C1C45C 000C14 0048+00 1/0 0/0 0/0 .text __dt__17dEvLib_callback_cFv */
// dEvLib_callback_c::~dEvLib_callback_c() {
extern "C" void __dt__17dEvLib_callback_cFv() {
// NONMATCHING
}
/* 80C1C45C-80C1C464 000C5C 0008+00 2/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv
*/
// bool dEvLib_callback_c::eventStart()() {
extern "C" bool eventStart__17dEvLib_callback_cFv() {
return true;
}
/* 80C1C464-80C1C46C 000C64 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */
// bool dEvLib_callback_c::eventRun() {
extern "C" bool eventRun__17dEvLib_callback_cFv() {
return true;
}
/* 80C1C46C-80C1C474 000C6C 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */
// bool dEvLib_callback_c::eventEnd() {
extern "C" bool eventEnd__17dEvLib_callback_cFv() {
return true;
}
/* 80C1C474-80C1C5E8 000C74 0174+00 2/1 0/0 0/0 .text __dt__16daObjHBombkoya_cFv */
// daObjHBombkoya_c::~daObjHBombkoya_c() {
extern "C" void __dt__16daObjHBombkoya_cFv() {
// NONMATCHING
}
/* 80C1C5E8-80C1C5F0 000DE8 0008+00 1/0 0/0 0/0 .text @1448@__dt__16daObjHBombkoya_cFv */
static void func_80C1C5E8() {
// NONMATCHING
}
/* 80C1C910-80C1C930 -00001 0020+00 1/0 0/0 0/0 .data daObjHBombkoya_METHODS */
static actor_method_class daObjHBombkoya_METHODS = {
(process_method_func)daObjHBombkoya_create1st__FP16daObjHBombkoya_c,
(process_method_func)daObjHBombkoya_MoveBGDelete__FP16daObjHBombkoya_c,
(process_method_func)daObjHBombkoya_MoveBGExecute__FP16daObjHBombkoya_c,
0,
(process_method_func)daObjHBombkoya_MoveBGDraw__FP16daObjHBombkoya_c,
(process_method_func)daObjHBombkoya_create1st,
(process_method_func)daObjHBombkoya_MoveBGDelete,
(process_method_func)daObjHBombkoya_MoveBGExecute,
NULL,
(process_method_func)daObjHBombkoya_MoveBGDraw,
};
/* 80C1C930-80C1C960 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_HBombkoya */
@@ -470,62 +305,3 @@ extern actor_process_profile_definition g_profile_Obj_HBombkoya = {
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 80C1C960-80C1C96C 00022C 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */
SECTION_DATA extern void* __vt__10cCcD_GStts[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__10cCcD_GSttsFv,
};
/* 80C1C96C-80C1C978 000238 000C+00 2/2 0/0 0/0 .data __vt__10dCcD_GStts */
SECTION_DATA extern void* __vt__10dCcD_GStts[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__10dCcD_GSttsFv,
};
/* 80C1C978-80C1C984 000244 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGCyl */
SECTION_DATA extern void* __vt__8cM3dGCyl[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGCylFv,
};
/* 80C1C984-80C1C99C 000250 0018+00 3/3 0/0 0/0 .data __vt__17dEvLib_callback_c */
SECTION_DATA extern void* __vt__17dEvLib_callback_c[6] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__17dEvLib_callback_cFv,
(void*)eventStart__17dEvLib_callback_cFv,
(void*)eventRun__17dEvLib_callback_cFv,
(void*)eventEnd__17dEvLib_callback_cFv,
};
/* 80C1C99C-80C1C9A8 000268 000C+00 4/4 0/0 0/0 .data __vt__8cM3dGAab */
SECTION_DATA extern void* __vt__8cM3dGAab[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGAabFv,
};
/* 80C1C9A8-80C1C9EC 000274 0044+00 2/2 0/0 0/0 .data __vt__16daObjHBombkoya_c */
SECTION_DATA extern void* __vt__16daObjHBombkoya_c[17] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)CreateHeap__16daObjHBombkoya_cFv,
(void*)Create__16daObjHBombkoya_cFv,
(void*)Execute__16daObjHBombkoya_cFPPA3_A4_f,
(void*)Draw__16daObjHBombkoya_cFv,
(void*)Delete__16daObjHBombkoya_cFv,
(void*)IsDelete__16dBgS_MoveBgActorFv,
(void*)ToFore__16dBgS_MoveBgActorFv,
(void*)ToBack__16dBgS_MoveBgActorFv,
(void*)NULL,
(void*)NULL,
(void*)func_80C1C5E8,
(void*)eventStart__17dEvLib_callback_cFv,
(void*)eventRun__17dEvLib_callback_cFv,
(void*)eventEnd__17dEvLib_callback_cFv,
(void*)__dt__16daObjHBombkoya_cFv,
};
src/d/actor/d_a_obj_hfuta.cpp
+1 -21
View File
@@ -5,9 +5,6 @@
#include "d/actor/d_a_obj_hfuta.h"
#include "d/d_com_inf_game.h"
#include "Z2AudioLib/Z2WolfHowlMgr.h"
#include "JSystem/JAudio2/JASAudioThread.h"
#include "JSystem/JAudio2/JAUSoundTable.h"
#include "Z2AudioLib/Z2Instances.h"
/* 80C1DD8C-80C1DDC8 0000EC 003C+00 1/1 0/0 0/0 .text initBaseMtx__11daObjFuta_cFv */
@@ -17,7 +14,6 @@ void daObjFuta_c::initBaseMtx() {
}
/* 80C1DDC8-80C1DE94 000128 00CC+00 2/2 0/0 0/0 .text setBaseMtx__11daObjFuta_cFv */
// Matches with literals
void daObjFuta_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -44,23 +40,7 @@ int daObjFuta_c::Create() {
return 1;
}
/* 80C1EEA4-80C1EEB0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 80C1EEB0-80C1EEC4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */
#pragma push
#pragma force_active on
static u32 lit_1787[1 + 4 /* padding */] = {
0x02000201,
/* padding */
0x40080000,
0x00000000,
0x3FE00000,
0x00000000,
};
#pragma pop
UNK_REL_DATA
/* 80C1EEC4-80C1EEC8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
static char* l_arcName = "Obj_hfuta";
src/d/actor/d_a_obj_ice_s.cpp
+78 -437
View File
File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More