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

d_a_obj_nagaisu OK (#2717)

This commit is contained in:
YunataSavior 2025-10-01 15:32:20 -07:00 committed by GitHub
parent c7703d1069
commit 6dee0f28a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/GZ2E01/rels/d_a_obj_nagaisu/symbols.txt
View File

@ -1,7 +1,7 @@
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x0000002C; // type:function size:0x2C scope:global
_unresolved = .text:0x00000058; // type:function size:0x20 scope:global
daObjNagaisu_c_createHeap__FP10fopAc_ac_c = .text:0x00000078; // type:function size:0x20 scope:global
daObjNagaisu_c_createHeap__FP10fopAc_ac_c = .text:0x00000078; // type:function size:0x20 scope:local
__ct__14daObjNagaisu_cFv = .text:0x00000098; // type:function size:0x84 scope:global
__dt__10dCcD_GSttsFv = .text:0x0000011C; // type:function size:0x5C scope:global
__dt__14daObjNagaisu_cFv = .text:0x00000178; // type:function size:0xF0 scope:global
@ -25,10 +25,10 @@ draw__15daObjIsuChild_cFP6dMdl_c = .text:0x00000CF4; // type:function size:0x84
Delete__15daObjIsuChild_cFv = .text:0x00000D78; // type:function size:0x60 scope:global
chkHit__15daObjIsuChild_cFv = .text:0x00000DD8; // type:function size:0x68 scope:global
callEmt__15daObjIsuChild_cFv = .text:0x00000E40; // type:function size:0xD8 scope:global
daObjNagaisu_create__FP14daObjNagaisu_c = .text:0x00000F18; // type:function size:0x54 scope:global
daObjNagaisu_Delete__FP14daObjNagaisu_c = .text:0x00000F6C; // type:function size:0x20 scope:global
daObjNagaisu_execute__FP14daObjNagaisu_c = .text:0x00000F8C; // type:function size:0x20 scope:global
daObjNagaisu_draw__FP14daObjNagaisu_c = .text:0x00000FAC; // type:function size:0x20 scope:global
daObjNagaisu_create__FP14daObjNagaisu_c = .text:0x00000F18; // type:function size:0x54 scope:local
daObjNagaisu_Delete__FP14daObjNagaisu_c = .text:0x00000F6C; // type:function size:0x20 scope:local
daObjNagaisu_execute__FP14daObjNagaisu_c = .text:0x00000F8C; // type:function size:0x20 scope:local
daObjNagaisu_draw__FP14daObjNagaisu_c = .text:0x00000FAC; // type:function size:0x20 scope:local
__dt__10cCcD_GSttsFv = .text:0x00000FCC; // type:function size:0x48 scope:global
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
@ -50,8 +50,8 @@ COL_OFFSET_X$3919 = .rodata:0x00000074; // type:object size:0x8 scope:local
PARTICLE_NAME$4004 = .rodata:0x00000098; // type:object size:0x8 scope:local
@4029 = .rodata:0x000000A0; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x000000A4; // type:object size:0x8 scope:local data:string_table
l_arcName = .data:0x00000000; // type:object size:0x4 scope:global
daObjNagaisu_METHODS = .data:0x00000004; // type:object size:0x20 scope:global
l_arcName = .data:0x00000000; // type:object size:0x4 scope:local
daObjNagaisu_METHODS = .data:0x00000004; // type:object size:0x20 scope:local
g_profile_Obj_Nagaisu = .data:0x00000024; // type:object size:0x30 scope:global
__vt__15daObjIsuChild_c = .data:0x00000054; // type:object size:0xC scope:global
__vt__8cM3dGAab = .data:0x00000060; // type:object size:0xC scope:global

2
configure.py
View File

@ -2107,7 +2107,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_msima"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_mvstair"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_myogan"),
ActorRel(NonMatching, "d_a_obj_nagaisu"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_nagaisu"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_nan"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_ndoor"),
ActorRel(NonMatching, "d_a_obj_nougu"),

2
include/d/actor/d_a_obj_nagaisu.h
View File

@ -16,7 +16,7 @@ public:
/* 80C9FE28 */ void create(daObjNagaisu_c*, dCcD_Stts*);
/* 80C9FF54 */ int execute();
/* 80CA0034 */ int draw(dMdl_c*);
/* 80CA00B8 */ int Delete();
/* 80CA00B8 */ void Delete();
/* 80CA0118 */ bool chkHit();
/* 80CA0180 */ void callEmt();

8
src/d/actor/d_a_obj_nagaisu.cpp
View File

@ -229,7 +229,6 @@ int daObjIsuChild_c::createHeap() {
/* 80C9FE28-80C9FF54 000AE8 012C+00 1/1 0/0 0/0 .text
* create__15daObjIsuChild_cFP14daObjNagaisu_cP9dCcD_Stts */
// NONMATCHING - missing instruction
void daObjIsuChild_c::create(daObjNagaisu_c* i_parent, dCcD_Stts* i_ccStts) {
static const int COL_OFFSET_X[] = {
60,
@ -247,7 +246,9 @@ void daObjIsuChild_c::create(daObjNagaisu_c* i_parent, dCcD_Stts* i_ccStts) {
mCcCyl[i].SetR(65.0f);
}
if (!dComIfG_Bgsp().Regist(mpBgW, i_parent)) {}
if (dComIfG_Bgsp().Regist(mpBgW, i_parent)) {
return;
}
}
}
@ -278,8 +279,7 @@ int daObjIsuChild_c::draw(dMdl_c* i_mdl) {
}
/* 80CA00B8-80CA0118 000D78 0060+00 2/2 0/0 0/0 .text Delete__15daObjIsuChild_cFv */
// NONMATCHING retail
int daObjIsuChild_c::Delete() {
void daObjIsuChild_c::Delete() {
if (!mIsDead) {
if (mpBgW != NULL && mpBgW->ChkUsed()) {
dComIfG_Bgsp().Release(mpBgW);