Skip to content

Improve several almost-matching TUs #2653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hatal175 merged 1 commit into from
Sep 13, 2025
Merged

Improve several almost-matching TUs #2653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions config/GZ2E01/rels/d_a_grass/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,13 +230,18 @@ __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
data_8052790d = .bss:0x00000045; // type:object size:0x1 scope:local
@4293 = .bss:0x00000048; // type:object size:0xC scope:local
init$4294 = .bss:0x00000054; // type:object size:0x1 scope:local
ang$4292 = .bss:0x00000058; // type:object size:0x6 scope:local
exec_count_dammy$4868 = .bss:0x0000005E; // type:object size:0x2 scope:local
init$4869 = .bss:0x00000060; // type:object size:0x1 scope:local
exec_count_dammy2$4871 = .bss:0x00000062; // type:object size:0x2 scope:local
init$4872 = .bss:0x00000064; // type:object size:0x1 scope:local
mAngleZ$5046 = .bss:0x00000068; // type:object size:0xBB8 scope:local
lbl_73_bss_C20 = .bss:0x00000C20; // type:object size:0x1 data:byte
@5442 = .bss:0x00000C24; // type:object size:0xC scope:local
init$5443 = .bss:0x00000C30; // type:object size:0x1 scope:local
ang$5441 = .bss:0x00000C34; // type:object size:0x6 scope:local
@6340 = .bss:0x00000C3C; // type:object size:0xC scope:local
@6342 = .bss:0x00000C48; // type:object size:0xC scope:local
Expand Down Expand Up @@ -325,15 +330,15 @@ sInstance__32JASGlobalInstance<11Z2FxLineMgr> = .bss:0x00000F78; // type:object
sInstance__31JASGlobalInstance<10Z2EnvSeMgr> = .bss:0x00000F7C; // type:object size:0x4 scope:global
sInstance__32JASGlobalInstance<11Z2SpeechMgr> = .bss:0x00000F80; // type:object size:0x4 scope:global
sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> = .bss:0x00000F84; // type:object size:0x4 scope:global
lbl_73_bss_F88 = .bss:0x00000F88; // type:object size:0x1 data:byte
l_setType0$localstatic3$create__9daGrass_cFv = .bss:0x00000F8C; // type:object size:0x2A scope:local data:2byte
lbl_73_bss_FB6 = .bss:0x00000FB6; // type:object size:0x1 data:byte
l_setType1$localstatic5$create__9daGrass_cFv = .bss:0x00000FB8; // type:object size:0x7E scope:local data:2byte
lbl_73_bss_1036 = .bss:0x00001036; // type:object size:0x1 data:byte
l_setType2$localstatic7$create__9daGrass_cFv = .bss:0x00001038; // type:object size:0x12 scope:local data:2byte
lbl_73_bss_104A = .bss:0x0000104A; // type:object size:0x1 data:byte
l_setType3$localstatic9$create__9daGrass_cFv = .bss:0x0000104C; // type:object size:0x2A scope:local data:2byte
lbl_73_bss_1076 = .bss:0x00001076; // type:object size:0x1 data:byte
l_setType4$localstatic11$create__9daGrass_cFv = .bss:0x00001078; // type:object size:0x66 scope:local data:2byte
lbl_73_bss_10DE = .bss:0x000010DE; // type:object size:0x1 data:byte
l_setType5$localstatic13$create__9daGrass_cFv = .bss:0x000010E0; // type:object size:0x2A scope:local data:2byte
init$localstatic4$create__9daGrass_cFv = .bss:0x00000F88; // type:object size:0x1 scope:global data:byte
l_setType0$localstatic3$create__9daGrass_cFv = .bss:0x00000F8C; // type:object size:0x2A scope:global data:2byte
init$localstatic6$create__9daGrass_cFv = .bss:0x00000FB6; // type:object size:0x1 scope:global data:byte
l_setType1$localstatic5$create__9daGrass_cFv = .bss:0x00000FB8; // type:object size:0x7E scope:global data:2byte
init$localstatic8$create__9daGrass_cFv = .bss:0x00001036; // type:object size:0x1 scope:global data:byte
l_setType2$localstatic7$create__9daGrass_cFv = .bss:0x00001038; // type:object size:0x12 scope:global data:2byte
init$localstatic10$create__9daGrass_cFv = .bss:0x0000104A; // type:object size:0x1 scope:global data:byte
l_setType3$localstatic9$create__9daGrass_cFv = .bss:0x0000104C; // type:object size:0x2A scope:global data:2byte
init$localstatic12$create__9daGrass_cFv = .bss:0x00001076; // type:object size:0x1 scope:global data:byte
l_setType4$localstatic11$create__9daGrass_cFv = .bss:0x00001078; // type:object size:0x66 scope:global data:2byte
init$localstatic14$create__9daGrass_cFv = .bss:0x000010DE; // type:object size:0x1 scope:global data:byte
l_setType5$localstatic13$create__9daGrass_cFv = .bss:0x000010E0; // type:object size:0x2A scope:global data:2byte
1 change: 1 addition & 0 deletions config/GZ2J01/rels/d_a_obj_volcball/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ d/actor/d_a_obj_volcball.cpp:
.text start:0x00000078 end:0x00002324
.rodata start:0x00000000 end:0x000000C0
.data start:0x00000000 end:0x00000270
.bss start:0x00000000 end:0x00000004
12 changes: 6 additions & 6 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1599,7 +1599,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_rd"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_econt"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_fr"),
ActorRel(NonMatching, "d_a_grass"),
ActorRel(Equivalent, "d_a_grass"), # __sinit regalloc
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_kytag05"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_kytag10"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_kytag11"),
Expand All @@ -1609,12 +1609,12 @@ def MatchingFor(*versions) -> bool:
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_fairy_seirei"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_fish"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_henna"),
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_kakashi"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_kakashi"),
ActorRel(NonMatching, "d_a_npc_kkri"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_kolin"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_maro"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_taro"),
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_tkj"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_tkj"),
ActorRel(NonMatching, "d_a_obj_bhashi"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_bkdoor"),
ActorRel(NonMatching, "d_a_obj_bosswarp"),
Expand Down Expand Up @@ -1861,7 +1861,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(NonMatching, "d_a_npc_len"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_lf"),
ActorRel(NonMatching, "d_a_npc_lud"),
ActorRel(NonMatching, "d_a_npc_midp"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_midp"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_mk"),
ActorRel(NonMatching, "d_a_npc_moi"),
ActorRel(NonMatching, "d_a_npc_moir", extra_cflags=[DANPCF_C_HACK]),
Expand All @@ -1878,7 +1878,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_prayer", extra_cflags=[DANPCF_C_HACK]),
ActorRel(NonMatching, "d_a_npc_raca"),
ActorRel(NonMatching, "d_a_npc_rafrel"),
ActorRel(NonMatching, "d_a_npc_saru"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_saru"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_seib"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_seic"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_seid"),
Expand Down Expand Up @@ -2201,7 +2201,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_udoor"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_usaku"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_vground"),
ActorRel(NonMatching, "d_a_obj_volcball"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_volcball"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_volcbom"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_warp_kbrg"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_warp_obrg"),
Expand Down
16 changes: 11 additions & 5 deletions include/d/actor/d_a_grass.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ class dGrass_data_c {
/* 8051DF54 */ void Direction_Set(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, cCcD_Obj*, csXyz*);
/* 8051E1C8 */ void WorkAt(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, u16);
/* 8051EB88 */ void hitCheck(int, u16);
/* 80520940 */ ~dGrass_data_c();
/* 8052097C */ dGrass_data_c();
/* 80520940 */ ~dGrass_data_c() {}
/* 8052097C */ dGrass_data_c() {
m_state = 0;
}

/* 0x00 */ u8 m_state;
/* 0x01 */ u8 field_0x01;
Expand All @@ -33,7 +35,9 @@ class dGrass_room_c {
public:
/* 8051EDE0 */ void newData(dGrass_data_c*);
/* 8051EDF0 */ void deleteData();
/* 80520928 */ dGrass_room_c();
/* 80520928 */ dGrass_room_c() {
mp_data = NULL;
}

dGrass_data_c* getData() { return mp_data; }

Expand All @@ -42,7 +46,9 @@ class dGrass_room_c {

class dGrass_anm_c {
public:
/* 80520934 */ dGrass_anm_c();
/* 80520934 */ dGrass_anm_c() {
m_state = 0;
}

/* 0x00 */ u8 m_state;
/* 0x02 */ s16 m_angY;
Expand All @@ -62,7 +68,7 @@ class dGrass_packet_c : public J3DPacket {
/* 805208E4 */ void setAnm(int, s16);

/* 8051F03C */ virtual void draw();
/* 8051BFBC */ virtual ~dGrass_packet_c() {}
/* 8051BFBC */ virtual ~dGrass_packet_c();

typedef void (dGrass_packet_c::*deleteFunc)(int);
static deleteFunc m_deleteRoom;
Expand Down
18 changes: 8 additions & 10 deletions include/d/actor/d_a_npc_midp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ class daNpc_midP_c : public daNpcT_c {
TYPE_0,
TYPE_1,
};

/* 80A70C6C */ ~daNpc_midP_c();
/* 80A70D90 */ int create();
/* 80A71074 */ int CreateHeap();
Expand Down Expand Up @@ -55,13 +54,13 @@ class daNpc_midP_c : public daNpcT_c {
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
daNpcT_evtData_c const* param_7, char** param_8) :
daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
/* 80A7390C */ u16 getEyeballRMaterialNo();
/* 80A73914 */ u16 getEyeballLMaterialNo();
/* 80A7391C */ s32 getHeadJointNo();
/* 80A73924 */ s32 getNeckJointNo();
/* 80A7392C */ s32 getBackboneJointNo();
/* 80A73934 */ BOOL checkChangeJoint(int);
/* 80A73944 */ BOOL checkRemoveJoint(int);
/* 80A7390C */ u16 getEyeballRMaterialNo() { return 3; }
/* 80A73914 */ u16 getEyeballLMaterialNo() { return 2; }
/* 80A7391C */ s32 getHeadJointNo() { return 4; }
/* 80A73924 */ s32 getNeckJointNo() { return 3; }
/* 80A7392C */ s32 getBackboneJointNo() { return 2; }
/* 80A73934 */ BOOL checkChangeJoint(int param_0) { return param_0 == 4; }
/* 80A73944 */ BOOL checkRemoveJoint(int param_0) { return param_0 == 8; }

int getFlowNodeNo() {
u16 nodeNo = home.angle.x;
Expand All @@ -88,7 +87,7 @@ STATIC_ASSERT(sizeof(daNpc_midP_c) == 0xfa0);

class daNpc_midP_Param_c {
public:
/* 80A73954 */ ~daNpc_midP_Param_c();
/* 80A73954 */ virtual ~daNpc_midP_Param_c() {}

struct Data {
/* 0x00 */ f32 field_0x00;
Expand Down Expand Up @@ -134,5 +133,4 @@ class daNpc_midP_Param_c {
static const Data m;
};


#endif /* D_A_NPC_MIDP_H */
4 changes: 0 additions & 4 deletions include/d/actor/d_a_obj_volcball.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ class daObjVolcBall_c : public fopAc_ac_c, public dEvLib_callback_c {
};

struct vball_s {
/* 80D21FA8 */ ~vball_s() {}
/* 80D2214C */ vball_s() {}

/* 0x000 */ J3DModel* mpModel;
/* 0x004 */ cXyz field_0x4;
/* 0x010 */ cXyz field_0x10;
Expand Down Expand Up @@ -108,7 +105,6 @@ class daObjVolcBall_c : public fopAc_ac_c, public dEvLib_callback_c {
/* 80D23A0C */ int _delete();

/* 80D22DDC */ virtual bool eventStart();
/* 80D23B24 */ virtual ~daObjVolcBall_c() {}

u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); }
Expand Down
2 changes: 1 addition & 1 deletion include/d/actor/d_a_player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,7 +1043,7 @@ class daPy_py_c : public fopAc_ac_c {
cXyz* getRightHandPosP() { return &mRightHandPos; }
cXyz* getHeadTopPosP() { return &mHeadTopPos; }

const cXyz& getSwordTopPos() const { return mSwordTopPos; }
const cXyz getSwordTopPos() const { return mSwordTopPos; }

u32 checkWolf() const { return checkNoResetFlg1(FLG1_IS_WOLF); }
u32 checkEquipHeavyBoots() const { return checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); }
Expand Down
20 changes: 16 additions & 4 deletions include/d/d_kankyo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,12 +507,24 @@ inline dScnKy_env_light_c* dKy_getEnvlight() {

class dKankyo_HIO_c {
public:
/* 0x000 */ u8 pad[0xB4];
/* 0x0B4 */ u8 field_0xB4;
/* 0x0B8 */ f32 field_0xB8;
/* 0x0BC */ u8 field_0xBC[0x3F4 - 0xbc];
/* 0x000 */ u8 field_0x000[0x6d - 0x0];
/* 0x000 */ u8 field_0x06d;
/* 0x000 */ u8 field_0x06e[0xb4 - 0x6e];
/* 0x0B4 */ u8 field_0x0b4;
/* 0x0B8 */ f32 field_0x0b8;
/* 0x0BC */ u8 field_0x0bc[0x3f4 - 0xbc];
/* 0x3F4 */ f32 field_0x3f4;
/* 0x3F8 */ f32 field_0x3f8;
/* 0x3FC */ u8 field_0x3fc[0x694 - 0x3fc];
u8 field_0x694;
u8 field_0x695;
u8 field_0x696;
u8 field_0x697[0x698 - 0x697];
bool field_0x698;
u8 field_0x699[0x69c - 0x699];
f32 field_0x69c;
u8 field_0x6a0[0x79b - 0x6a0];
u8 field_0x79b;
};

extern dKankyo_HIO_c g_kankyoHIO;
Expand Down
8 changes: 4 additions & 4 deletions src/d/actor/d_a_grass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,10 @@
#include "SSystem/SComponent/c_counter.h"
#include "SSystem/SComponent/c_math.h"
#include "d/d_com_inf_game.h"
#include "dol2asm.h"
#include "m_Do/m_Do_lib.h"
#include "Z2AudioLib/Z2Instances.h"
#include <string.h>
#include <dolphin/gd.h>

#include "d/actor/d_grass.inc"
#include "d/actor/d_grass.inc" // IWYU pragma: keep
#include "d/actor/d_flower.inc"

/* 8051BD4C-8051BEFC 0000EC 01B0+00 1/1 0/0 0/0 .text randam_addcol_set__FPs */
Expand Down Expand Up @@ -86,6 +83,9 @@ void daGrass_c::deleteGrass() {
}
}

dGrass_packet_c::~dGrass_packet_c() {
}

/* 8051C040-8051C074 0003E0 0034+00 1/1 0/0 0/0 .text executeGrass__9daGrass_cFv */
void daGrass_c::executeGrass() {
if (m_grass != NULL) {
Expand Down
49 changes: 3 additions & 46 deletions src/d/actor/d_a_npc_midp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ void daNpc_midP_c::setAttnPos() {
daNpc_midP_Param_c::m.field_0x2c, daNpc_midP_Param_c::m.field_0x28,
daNpc_midP_Param_c::m.field_0x34, daNpc_midP_Param_c::m.field_0x30,
daNpc_midP_Param_c::m.field_0x3c, daNpc_midP_Param_c::m.field_0x38,
daNpc_midP_Param_c::m.field_0x40, dVar5, NULL);
daNpc_midP_Param_c::m.field_0x40, dVar5, &sp48);
mJntAnm.calcJntRad(0.2f, 1.0f, dVar5);
setMtx();

Expand Down Expand Up @@ -505,7 +505,7 @@ void daNpc_midP_c::drawGhost() {
/* 80A721E0-80A72228 001660 0048+00 1/1 0/0 0/0 .text selectAction__12daNpc_midP_cFv */
int daNpc_midP_c::selectAction() {
field_0xf84 = NULL;
field_0xf84 = &daNpc_midP_c::talk;
field_0xf84 = &daNpc_midP_c::wait;
return 1;
}

Expand Down Expand Up @@ -644,50 +644,7 @@ static int daNpc_midP_IsDelete(void* i_this) {
static u8 lit_3811[12];

/* 80A73D5C-80A73D60 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */
static u8 l_HIO[4];

/* 80A7390C-80A73914 002D8C 0008+00 1/0 0/0 0/0 .text getEyeballRMaterialNo__12daNpc_midP_cFv */
u16 daNpc_midP_c::getEyeballRMaterialNo() {
return 3;
}

/* 80A73914-80A7391C 002D94 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__12daNpc_midP_cFv */
u16 daNpc_midP_c::getEyeballLMaterialNo() {
return 2;
}

/* 80A7391C-80A73924 002D9C 0008+00 1/0 0/0 0/0 .text getHeadJointNo__12daNpc_midP_cFv */
s32 daNpc_midP_c::getHeadJointNo() {
return 4;
}

/* 80A73924-80A7392C 002DA4 0008+00 1/0 0/0 0/0 .text getNeckJointNo__12daNpc_midP_cFv */
s32 daNpc_midP_c::getNeckJointNo() {
return 3;
}

/* 80A7392C-80A73934 002DAC 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__12daNpc_midP_cFv */
s32 daNpc_midP_c::getBackboneJointNo() {
return 2;
}

/* 80A73934-80A73944 002DB4 0010+00 1/0 0/0 0/0 .text checkChangeJoint__12daNpc_midP_cFi */
BOOL daNpc_midP_c::checkChangeJoint(int param_1) {
// NONMATCHING
return (4 - param_1) >> 5 & 0xff;
}

/* 80A73944-80A73954 002DC4 0010+00 1/0 0/0 0/0 .text checkRemoveJoint__12daNpc_midP_cFi */
BOOL daNpc_midP_c::checkRemoveJoint(int param_1) {
// NONMATCHING
return (8 - param_1) >> 5 & 0xff;
}

/* 80A73954-80A7399C 002DD4 0048+00 2/1 0/0 0/0 .text __dt__18daNpc_midP_Param_cFv */
daNpc_midP_Param_c::~daNpc_midP_Param_c() {
// NONMATCHING

}
static daNpc_midP_Param_c l_HIO;

/* 80A73B8C-80A73BAC -00001 0020+00 1/0 0/0 0/0 .data daNpc_midP_MethodTable */
static actor_method_class daNpc_midP_MethodTable = {
Expand Down
21 changes: 12 additions & 9 deletions src/d/actor/d_a_npc_ne.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3107,7 +3107,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {

J3DModel* model = _this->mpMorf->getModel();
i_this->model = model;
model->setUserArea((uintptr_t)i_this);
model->setUserArea((uintptr_t)_this);

for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
if (i == 1 || i == 2 || i == 3 || i == 4 || i == 20 || i == 21) {
Expand All @@ -3119,28 +3119,31 @@ static int useHeapInit(fopAc_ac_c* i_this) {
if (_this->mpBtkAnm == NULL) {
return 0;
}
J3DAnmTextureSRTKey* btk =
static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(_this->mResName, 32));
if (!_this->mpBtkAnm->init(_this->mpMorf->getModel()->getModelData(), btk, 1, 0, 1.0f, 0, -1)) {
if (!_this->mpBtkAnm->init(_this->mpMorf->getModel()->getModelData(),
static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(_this->mResName, 32)), 1, 0, 1.0f, 0, -1)) {
return 0;
}

_this->mpBtpAnm = new mDoExt_btpAnm();
if (_this->mpBtpAnm == NULL) {
return 0;
}
J3DAnmTexPattern* btp =
static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes(_this->mResName, 35));
if (!_this->mpBtpAnm->init(_this->mpMorf->getModel()->getModelData(), btp, 1, 0, 1.0f, 0, -1)) {
if (!_this->mpBtpAnm->init(_this->mpMorf->getModel()->getModelData(),
static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes(_this->mResName, 35)), 1, 0, 1.0f, 0, -1)) {
return 0;
}

_this->mSound.init(&i_this->current.pos, 1);

if (_this->mBehavior == npc_ne_class::BHV_DISH) {
static int dish_bck[2] = {npc_ne_class::ANM_EMPTY_DISH, npc_ne_class::ANM_DRINK_DISH};
/* dSv_event_flag_c::F_0038 - Ordon Village - Opening (2nd day) cat returns home */
s32 dish_flag = dComIfGs_isEventBit(0x1001) ? 1 : 0;
s32 dish_flag;
if (dComIfGs_isEventBit(0x1001)) {
dish_flag = 1;
} else {
dish_flag = 0;
}
_this->mpDishMorf = new mDoExt_McaMorf(
static_cast<J3DModelData*>(dComIfG_getObjectRes(_this->mResName, 29)), NULL, NULL,
static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(_this->mResName,
Expand Down
Loading