falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_swLight OK (#2712) 

* checkpoint

* d_a_obj_swLight OK

* fixup symbols and splits

* put static assert back

* fixes for taka
This commit is contained in:
Howard Luck 2025-09-28 18:35:50 -06:00 committed by GitHub
parent 9a97d89256
commit 143f19636b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 502 additions and 556 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
config/GZ2E01/rels/d_a_obj_swLight/symbols.txt
View File

@ -19,16 +19,16 @@ checkHit__14daObjSwLight_cFv = .text:0x00000A58; // type:function size:0xF4 scop
setOnTimer__14daObjSwLight_cFv = .text:0x00000B4C; // type:function size:0x2C scope:global
Draw__14daObjSwLight_cFv = .text:0x00000B78; // type:function size:0x110 scope:global
Delete__14daObjSwLight_cFv = .text:0x00000C88; // type:function size:0x48 scope:global
daObjSwLight_create1st__FP14daObjSwLight_c = .text:0x00000CD0; // type:function size:0x19C scope:global
daObjSwLight_create1st__FP14daObjSwLight_c = .text:0x00000CD0; // type:function size:0x19C scope:local
__dt__8cM3dGCylFv = .text:0x00000E6C; // type:function size:0x48 scope:global
__ct__8dCcD_SphFv = .text:0x00000EB4; // type:function size:0x84 scope:global
__dt__8dCcD_SphFv = .text:0x00000F38; // type:function size:0xCC scope:global
__dt__8cM3dGSphFv = .text:0x00001004; // type:function size:0x48 scope:global
__dt__8cM3dGAabFv = .text:0x0000104C; // type:function size:0x48 scope:global
__dt__10dCcD_GSttsFv = .text:0x00001094; // type:function size:0x5C scope:global
daObjSwLight_MoveBGDelete__FP14daObjSwLight_c = .text:0x000010F0; // type:function size:0x20 scope:global
daObjSwLight_MoveBGExecute__FP14daObjSwLight_c = .text:0x00001110; // type:function size:0x20 scope:global
daObjSwLight_MoveBGDraw__FP14daObjSwLight_c = .text:0x00001130; // type:function size:0x2C scope:global
daObjSwLight_MoveBGDelete__FP14daObjSwLight_c = .text:0x000010F0; // type:function size:0x20 scope:local
daObjSwLight_MoveBGExecute__FP14daObjSwLight_c = .text:0x00001110; // type:function size:0x20 scope:local
daObjSwLight_MoveBGDraw__FP14daObjSwLight_c = .text:0x00001130; // type:function size:0x2C scope:local
__dt__10cCcD_GSttsFv = .text:0x0000115C; // type:function size:0x48 scope:global
__dt__17dEvLib_callback_cFv = .text:0x000011A4; // type:function size:0x48 scope:global
eventStart__17dEvLib_callback_cFv = .text:0x000011EC; // type:function size:0x8 scope:global
@ -37,7 +37,7 @@ eventEnd__17dEvLib_callback_cFv = .text:0x000011FC; // type:function size:0x8 sc
__dt__14daObjSwLight_cFv = .text:0x00001204; // type:function size:0x234 scope:global
cLib_calcTimer<Us>__FPUs = .text:0x00001438; // type:function size:0x1C scope:global
cLib_calcTimer<Uc>__FPUc = .text:0x00001454; // type:function size:0x1C scope:global
@1440@__dt__14daObjSwLight_cFv = .text:0x00001470; // type:function size:0x8 scope:local
@1440@__dt__14daObjSwLight_cFv = .text:0x00001470; // type:function size:0x8 scope:global
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
...rodata.0 = .rodata:0x00000000; // type:label scope:local
@ -56,12 +56,13 @@ l_sph_src_tg = .rodata:0x00000040; // type:object size:0x40 scope:global
@3844 = .rodata:0x000000B0; // type:object size:0x4 scope:local align:4 data:float
@stringBase0 = .rodata:0x000000B4; // type:object size:0x12 scope:local data:string_table
...data.0 = .data:0x00000000; // type:label scope:local
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
lbl_641_data_10 = .data:0x00000010; // type:object size:0x10
l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte
l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float
l_cyl_src = .data:0x0000003C; // type:object size:0x44 scope:global
_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8
_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8
l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte
l_cull_box = .data:0x00000024; // type:object size:0x18 scope:local align:4 data:float
l_cyl_src = .data:0x0000003C; // type:object size:0x44 scope:local
@3738 = .data:0x00000080; // type:object size:0xC scope:local
@3739 = .data:0x0000008C; // type:object size:0xC scope:local
@3740 = .data:0x00000098; // type:object size:0xC scope:local

1
config/GZ2J01/rels/d_a_obj_swLight/splits.txt
View File

@ -13,3 +13,4 @@ d/actor/d_a_obj_swLight.cpp:
.text start:0x00000078 end:0x00001478
.rodata start:0x00000000 end:0x000000C8
.data start:0x00000000 end:0x000001C8
.bss start:0x00000000 end:0x00000004

22
config/GZ2J01/rels/d_a_obj_swLight/symbols.txt
View File

@ -19,16 +19,16 @@ checkHit__14daObjSwLight_cFv = .text:0x00000A58; // type:function size:0xF4 scop
setOnTimer__14daObjSwLight_cFv = .text:0x00000B4C; // type:function size:0x2C scope:global
Draw__14daObjSwLight_cFv = .text:0x00000B78; // type:function size:0x110 scope:global
Delete__14daObjSwLight_cFv = .text:0x00000C88; // type:function size:0x48 scope:global
daObjSwLight_create1st__FP14daObjSwLight_c = .text:0x00000CD0; // type:function size:0x19C scope:global
daObjSwLight_create1st__FP14daObjSwLight_c = .text:0x00000CD0; // type:function size:0x19C scope:local
__dt__8cM3dGCylFv = .text:0x00000E6C; // type:function size:0x48 scope:global
__ct__8dCcD_SphFv = .text:0x00000EB4; // type:function size:0x84 scope:global
__dt__8dCcD_SphFv = .text:0x00000F38; // type:function size:0xCC scope:global
__dt__8cM3dGSphFv = .text:0x00001004; // type:function size:0x48 scope:global
__dt__8cM3dGAabFv = .text:0x0000104C; // type:function size:0x48 scope:global
__dt__10dCcD_GSttsFv = .text:0x00001094; // type:function size:0x5C scope:global
daObjSwLight_MoveBGDelete__FP14daObjSwLight_c = .text:0x000010F0; // type:function size:0x20 scope:global
daObjSwLight_MoveBGExecute__FP14daObjSwLight_c = .text:0x00001110; // type:function size:0x20 scope:global
daObjSwLight_MoveBGDraw__FP14daObjSwLight_c = .text:0x00001130; // type:function size:0x2C scope:global
daObjSwLight_MoveBGDelete__FP14daObjSwLight_c = .text:0x000010F0; // type:function size:0x20 scope:local
daObjSwLight_MoveBGExecute__FP14daObjSwLight_c = .text:0x00001110; // type:function size:0x20 scope:local
daObjSwLight_MoveBGDraw__FP14daObjSwLight_c = .text:0x00001130; // type:function size:0x2C scope:local
__dt__10cCcD_GSttsFv = .text:0x0000115C; // type:function size:0x48 scope:global
__dt__17dEvLib_callback_cFv = .text:0x000011A4; // type:function size:0x48 scope:global
eventStart__17dEvLib_callback_cFv = .text:0x000011EC; // type:function size:0x8 scope:global
@ -37,7 +37,7 @@ eventEnd__17dEvLib_callback_cFv = .text:0x000011FC; // type:function size:0x8 sc
__dt__14daObjSwLight_cFv = .text:0x00001204; // type:function size:0x234 scope:global
cLib_calcTimer<Us>__FPUs = .text:0x00001438; // type:function size:0x1C scope:global
cLib_calcTimer<Uc>__FPUc = .text:0x00001454; // type:function size:0x1C scope:global
@1440@__dt__14daObjSwLight_cFv = .text:0x00001470; // type:function size:0x8 scope:local
@1440@__dt__14daObjSwLight_cFv = .text:0x00001470; // type:function size:0x8 scope:global
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
...rodata.0 = .rodata:0x00000000; // type:label scope:local
@ -55,12 +55,14 @@ l_sph_src_tg = .rodata:0x00000040; // type:object size:0x40 scope:global
@3833 = .rodata:0x000000A8; // type:object size:0x8 scope:local
@3844 = .rodata:0x000000B0; // type:object size:0x4 scope:local align:4 data:float
@stringBase0 = .rodata:0x000000B4; // type:object size:0x12 scope:local data:string_table
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
...data.0 = .data:0x00000000; // type:label scope:local
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
lbl_641_data_10 = .data:0x00000010; // type:object size:0x10
l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte
l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float
l_cyl_src = .data:0x0000003C; // type:object size:0x44 scope:global
_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8
_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8
l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte
l_cull_box = .data:0x00000024; // type:object size:0x18 scope:local align:4 data:float
l_cyl_src = .data:0x0000003C; // type:object size:0x44 scope:local
@3738 = .data:0x00000080; // type:object size:0xC scope:local
@3739 = .data:0x0000008C; // type:object size:0xC scope:local
@3740 = .data:0x00000098; // type:object size:0xC scope:local

1
config/GZ2P01/rels/d_a_obj_swLight/splits.txt
View File

@ -13,3 +13,4 @@ d/actor/d_a_obj_swLight.cpp:
.text start:0x00000078 end:0x00001478
.rodata start:0x00000000 end:0x000000C8
.data start:0x00000000 end:0x000001C8
.bss start:0x00000000 end:0x00000004

22
config/GZ2P01/rels/d_a_obj_swLight/symbols.txt
View File

@ -19,16 +19,16 @@ checkHit__14daObjSwLight_cFv = .text:0x00000A58; // type:function size:0xF4 scop
setOnTimer__14daObjSwLight_cFv = .text:0x00000B4C; // type:function size:0x2C scope:global
Draw__14daObjSwLight_cFv = .text:0x00000B78; // type:function size:0x110 scope:global
Delete__14daObjSwLight_cFv = .text:0x00000C88; // type:function size:0x48 scope:global
daObjSwLight_create1st__FP14daObjSwLight_c = .text:0x00000CD0; // type:function size:0x19C scope:global
daObjSwLight_create1st__FP14daObjSwLight_c = .text:0x00000CD0; // type:function size:0x19C scope:local
__dt__8cM3dGCylFv = .text:0x00000E6C; // type:function size:0x48 scope:global
__ct__8dCcD_SphFv = .text:0x00000EB4; // type:function size:0x84 scope:global
__dt__8dCcD_SphFv = .text:0x00000F38; // type:function size:0xCC scope:global
__dt__8cM3dGSphFv = .text:0x00001004; // type:function size:0x48 scope:global
__dt__8cM3dGAabFv = .text:0x0000104C; // type:function size:0x48 scope:global
__dt__10dCcD_GSttsFv = .text:0x00001094; // type:function size:0x5C scope:global
daObjSwLight_MoveBGDelete__FP14daObjSwLight_c = .text:0x000010F0; // type:function size:0x20 scope:global
daObjSwLight_MoveBGExecute__FP14daObjSwLight_c = .text:0x00001110; // type:function size:0x20 scope:global
daObjSwLight_MoveBGDraw__FP14daObjSwLight_c = .text:0x00001130; // type:function size:0x2C scope:global
daObjSwLight_MoveBGDelete__FP14daObjSwLight_c = .text:0x000010F0; // type:function size:0x20 scope:local
daObjSwLight_MoveBGExecute__FP14daObjSwLight_c = .text:0x00001110; // type:function size:0x20 scope:local
daObjSwLight_MoveBGDraw__FP14daObjSwLight_c = .text:0x00001130; // type:function size:0x2C scope:local
__dt__10cCcD_GSttsFv = .text:0x0000115C; // type:function size:0x48 scope:global
__dt__17dEvLib_callback_cFv = .text:0x000011A4; // type:function size:0x48 scope:global
eventStart__17dEvLib_callback_cFv = .text:0x000011EC; // type:function size:0x8 scope:global
@ -37,7 +37,7 @@ eventEnd__17dEvLib_callback_cFv = .text:0x000011FC; // type:function size:0x8 sc
__dt__14daObjSwLight_cFv = .text:0x00001204; // type:function size:0x234 scope:global
cLib_calcTimer<Us>__FPUs = .text:0x00001438; // type:function size:0x1C scope:global
cLib_calcTimer<Uc>__FPUc = .text:0x00001454; // type:function size:0x1C scope:global
@1440@__dt__14daObjSwLight_cFv = .text:0x00001470; // type:function size:0x8 scope:local
@1440@__dt__14daObjSwLight_cFv = .text:0x00001470; // type:function size:0x8 scope:global
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
...rodata.0 = .rodata:0x00000000; // type:label scope:local
@ -55,12 +55,14 @@ l_sph_src_tg = .rodata:0x00000040; // type:object size:0x40 scope:global
@3833 = .rodata:0x000000A8; // type:object size:0x8 scope:local
@3844 = .rodata:0x000000B0; // type:object size:0x4 scope:local align:4 data:float
@stringBase0 = .rodata:0x000000B4; // type:object size:0x12 scope:local data:string_table
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
...data.0 = .data:0x00000000; // type:label scope:local
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
lbl_641_data_10 = .data:0x00000010; // type:object size:0x10
l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte
l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float
l_cyl_src = .data:0x0000003C; // type:object size:0x44 scope:global
_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8
_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8
l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte
l_cull_box = .data:0x00000024; // type:object size:0x18 scope:local align:4 data:float
l_cyl_src = .data:0x0000003C; // type:object size:0x44 scope:local
@3738 = .data:0x00000080; // type:object size:0xC scope:local
@3739 = .data:0x0000008C; // type:object size:0xC scope:local
@3740 = .data:0x00000098; // type:object size:0xC scope:local

2
configure.py
View File

@ -2168,7 +2168,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_swBallA"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_swBallB"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_swBallC"),
ActorRel(NonMatching, "d_a_obj_swLight"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_swLight"),
ActorRel(NonMatching, "d_a_obj_swchain"),
ActorRel(Equivalent, "d_a_obj_swhang"), # vtable order
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_sword"),

55
include/d/actor/d_a_obj_swLight.h
View File

@ -1,6 +1,10 @@
#ifndef D_A_OBJ_SWLIGHT_H
#define D_A_OBJ_SWLIGHT_H
#include "SSystem/SComponent/c_phase.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_cc_d.h"
#include "d/d_event_lib.h"
#include "f_op/f_op_actor_mng.h"
/**
@ -11,14 +15,13 @@
* @details
*
*/
class daObjSwLight_c : public fopAc_ac_c {
class daObjSwLight_c : public dBgS_MoveBgActor, public dEvLib_callback_c {
public:
typedef void (daObjSwLight_c::*modeFunc)();
/* 80CF6F98 */ void initBaseMtx();
/* 80CF6FD4 */ void setBaseMtx();
/* 80CF7038 */ void Create();
/* 80CF71F0 */ void CreateHeap();
/* 80CF7260 */ void create1st();
/* 80CF7320 */ void Execute(Mtx**);
/* 80CF7260 */ int create1st();
/* 80CF73E0 */ void action();
/* 80CF761C */ void init_modeSwOnWait();
/* 80CF766C */ void modeSwOnWait();
@ -27,17 +30,47 @@ public:
/* 80CF77D8 */ void init_modeSwOffWait();
/* 80CF7838 */ void modeSwOffWait();
/* 80CF7974 */ void modeDead();
/* 80CF7978 */ void checkHit();
/* 80CF7978 */ int checkHit();
/* 80CF7A6C */ void setOnTimer();
/* 80CF7A98 */ void Draw();
/* 80CF7BA8 */ void Delete();
/* 80CF8124 */ ~daObjSwLight_c();
/* 80CF7038 */ virtual int Create();
/* 80CF71F0 */ virtual int CreateHeap();
/* 80CF7320 */ virtual int Execute(Mtx**);
/* 80CF7A98 */ virtual int Draw();
/* 80CF7BA8 */ virtual int Delete();
/* 80CF8124 */ virtual ~daObjSwLight_c() {};
daObjSwLight_c() : dEvLib_callback_c(this) {};
u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getSwbit2() { return fopAcM_GetParamBit(this, 24, 8); }
u8 getOnTime() { return fopAcM_GetParamBit(this, 16, 8); }
u8 getEvent() { return (u8)field_0xb22; }
private:
/* 0x568 */ u8 field_0x568[0xb28 - 0x568];
/* 0x5B0 */ request_of_phase_process_class mPhase;
/* 0x5B8 */ J3DModel* mpModel;
/* 0x6F4 */ dCcD_Stts mStts;
/* 0x614 */ dCcD_Sph mAtSph;
/* 0x730 */ dCcD_Sph mTgSph[2];
/* 0x9BC */ dCcD_Cyl mCyl;
/* 0xADC */ f32 field_0xadc;
/* 0xAE0 */ u8 field_0xae0;
/* 0xAE1 */ u8 field_0xae1;
/* 0xAE2 */ u8 field_0xae2;
/* 0xAE3 */ u8 field_0xae3;
/* 0xAE0 */ u16 field_0xae4;
/* 0xAE0 */ u8 field_0xae6;
/* 0xAE0 */ u8 field_0xae7;
/* 0xAE8 */ u16 field_0xae8;
/* 0xAE8 */ u16 field_0xaea;
/* 0xAEC */ DALKMIST_INFLUENCE mInfluence;
/* 0xB00 */ Z2SoundObjSimple mSound;
/* 0xB20 */ u8 field_0xb20;
/* 0xB22 */ u16 field_0xb22;
/* 0xB24 */ u16 field_0xb24;
};
STATIC_ASSERT(sizeof(daObjSwLight_c) == 0xb28);
#endif /* D_A_OBJ_SWLIGHT_H */

934
src/d/actor/d_a_obj_swLight.cpp
View File

File diff suppressed because it is too large Load Diff