Skip to content

Miscellaneous TU fixes #2662

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
TakaRikka merged 1 commit into from
Sep 15, 2025
Merged

Miscellaneous TU fixes #2662

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
1 change: 1 addition & 0 deletions config/GZ2E01/rels/d_a_npc_moi/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@3839 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte
@5529 = .bss:0x00000058; // type:object size:0xC scope:local
init$5530 = .bss:0x00000064; // type:object size:0x1 scope:local
lightOffset$5528 = .bss:0x00000068; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global
Expand Down
1 change: 1 addition & 0 deletions config/GZ2E01/rels/d_a_npc_zrc/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@4021 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte
@4773 = .bss:0x00000058; // type:object size:0xC scope:local
init$4774 = .bss:0x00000064; // type:object size:0x1 scope:local
eyeOffset$4772 = .bss:0x00000068; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global
Expand Down
4 changes: 4 additions & 0 deletions config/GZ2E01/rels/d_a_obj_movebox/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,19 @@ M_wrt_work__Q212daObjMovebox5Bgc_c = .bss:0x000007EC; // type:object size:0x54 s
@3672 = .bss:0x00000840; // type:object size:0xC scope:local
M_wall_work__Q212daObjMovebox5Bgc_c = .bss:0x0000084C; // type:object size:0xA10 scope:global align:4 data:float
@3909 = .bss:0x0000125C; // type:object size:0xC scope:local
init$3910 = .bss:0x00001268; // type:object size:0x1 scope:local
touch_work$3908 = .bss:0x0000126C; // type:object size:0x70 scope:local
@4501 = .bss:0x000012DC; // type:object size:0xC scope:local
init$4502 = .bss:0x000012E8; // type:object size:0x1 scope:local
scl$4500 = .bss:0x000012EC; // type:object size:0xC scope:local
@4574 = .bss:0x000012F8; // type:object size:0xC scope:local
init$4575 = .bss:0x00001304; // type:object size:0x1 scope:local
@4577 = .bss:0x00001308; // type:object size:0xC scope:local
@4578 = .bss:0x00001314; // type:object size:0xC scope:local
@4579 = .bss:0x00001320; // type:object size:0xC scope:local
dir_vec$4573 = .bss:0x0000132C; // type:object size:0x30 scope:local
@4762 = .bss:0x0000135C; // type:object size:0xC scope:local
init$4763 = .bss:0x00001368; // type:object size:0x1 scope:local
particle_scale$4761 = .bss:0x0000136C; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00001378; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000137C; // type:object size:0x4 scope:global
Expand Down
1 change: 1 addition & 0 deletions config/GZ2J01/rels/d_a_npc_moi/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@3839 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte
@5529 = .bss:0x00000058; // type:object size:0xC scope:local
init$5530 = .bss:0x00000064; // type:object size:0x1 scope:local
lightOffset$5528 = .bss:0x00000068; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global
Expand Down
1 change: 1 addition & 0 deletions config/GZ2J01/rels/d_a_npc_zrc/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@4021 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte
@4773 = .bss:0x00000058; // type:object size:0xC scope:local
init$4774 = .bss:0x00000064; // type:object size:0x1 scope:local
eyeOffset$4772 = .bss:0x00000068; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global
Expand Down
1 change: 1 addition & 0 deletions config/GZ2J01/rels/d_a_obj_iceleaf/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_iceleaf.cpp:
.text start:0x00000078 end:0x000016BC
.rodata start:0x00000000 end:0x0000004C
.data start:0x00000000 end:0x000001E4
.bss start:0x00000000 end:0x00000004
4 changes: 4 additions & 0 deletions config/GZ2J01/rels/d_a_obj_movebox/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,19 @@ M_wrt_work__Q212daObjMovebox5Bgc_c = .bss:0x000007EC; // type:object size:0x54 s
@3672 = .bss:0x00000840; // type:object size:0xC scope:local
M_wall_work__Q212daObjMovebox5Bgc_c = .bss:0x0000084C; // type:object size:0xA10 scope:global align:4 data:float
@3909 = .bss:0x0000125C; // type:object size:0xC scope:local
init$3910 = .bss:0x00001268; // type:object size:0x1 scope:local
touch_work$3908 = .bss:0x0000126C; // type:object size:0x70 scope:local
@4501 = .bss:0x000012DC; // type:object size:0xC scope:local
init$4502 = .bss:0x000012E8; // type:object size:0x1 scope:local
scl$4500 = .bss:0x000012EC; // type:object size:0xC scope:local
@4574 = .bss:0x000012F8; // type:object size:0xC scope:local
init$4575 = .bss:0x00001304; // type:object size:0x1 scope:local
@4577 = .bss:0x00001308; // type:object size:0xC scope:local
@4578 = .bss:0x00001314; // type:object size:0xC scope:local
@4579 = .bss:0x00001320; // type:object size:0xC scope:local
dir_vec$4573 = .bss:0x0000132C; // type:object size:0x30 scope:local
@4762 = .bss:0x0000135C; // type:object size:0xC scope:local
init$4763 = .bss:0x00001368; // type:object size:0x1 scope:local
particle_scale$4761 = .bss:0x0000136C; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00001378; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000137C; // type:object size:0x4 scope:global
Expand Down
24 changes: 12 additions & 12 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,16 +1537,16 @@ def MatchingFor(*versions) -> bool:
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_door_shutter"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_door_spiral"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_dshutter"),
ActorRel(NonMatching, "d_a_ep"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_ep"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_hitobj"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_kytag00"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_kytag04"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_kytag17"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_brakeeff"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_burnbox"),
ActorRel(NonMatching, "d_a_obj_carry"),
ActorRel(NonMatching, "d_a_obj_ito"),
ActorRel(NonMatching, "d_a_obj_movebox"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_ito"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_movebox"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_swpush"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_timer"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_path_line"),
Expand Down Expand Up @@ -1592,7 +1592,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_demo_item"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_door_bossL1"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_dn"),
ActorRel(MatchingFor("GZ2E01"), "d_a_e_fm"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_fm"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_ga"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_hb"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_nest"),
Expand All @@ -1610,7 +1610,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_fish"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_henna"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_kakashi"),
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_kkri"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "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"),
Expand Down Expand Up @@ -1713,9 +1713,9 @@ def MatchingFor(*versions) -> bool:
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_dd"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_df"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_dk"),
ActorRel(MatchingFor("GZ2E01"), "d_a_e_dt"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_dt"),
ActorRel(NonMatching, "d_a_e_fb"),
ActorRel(MatchingFor("GZ2E01"), "d_a_e_fk"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_fk"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_fs"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_fz"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_gb"),
Expand All @@ -1728,7 +1728,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(NonMatching, "d_a_e_hm"),
ActorRel(NonMatching, "d_a_e_hp"),
ActorRel(NonMatching, "d_a_e_hz"),
ActorRel(MatchingFor("GZ2E01"), "d_a_e_hzelda"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_hzelda"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_is"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_kg"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_kk"),
Expand Down Expand Up @@ -1863,7 +1863,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(NonMatching, "d_a_npc_lud"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_midp"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_mk"),
ActorRel(NonMatching, "d_a_npc_moi"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_moi"),
ActorRel(NonMatching, "d_a_npc_moir", extra_cflags=[DANPCF_C_HACK]),
ActorRel(NonMatching, "d_a_npc_myna2"),
ActorRel(NonMatching, "d_a_npc_ne"),
Expand Down Expand Up @@ -1976,8 +1976,8 @@ def MatchingFor(*versions) -> bool:
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_firepillar"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_firepillar2"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_flag"),
ActorRel(Equivalent, "d_a_obj_flag2"), # weak function order
ActorRel(NonMatching, "d_a_obj_flag3"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_flag2"),
ActorRel(Equivalent, "d_a_obj_flag3"), # weak function order
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_food"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_fw"),
ActorRel(NonMatching, "d_a_obj_gadget"),
Expand Down Expand Up @@ -2158,7 +2158,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(NonMatching, "d_a_obj_spinLift"),
ActorRel(NonMatching, "d_a_obj_ss_drink"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_ss_item"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_stairBlock"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_stairBlock"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_stone"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_stopper"),
ActorRel(NonMatching, "d_a_obj_stopper2"),
Expand Down
2 changes: 1 addition & 1 deletion include/JSystem/J3DGraphAnimator/J3DJoint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class J3DJoint {
void setYounger(J3DJoint* pYounger) { mYounger = pYounger; }
void setCurrentMtxCalc(J3DMtxCalc* pMtxCalc) { mCurrentMtxCalc = pMtxCalc; }
J3DTransformInfo& getTransformInfo() { return mTransformInfo; }
void setTransformInfo(J3DTransformInfo& i_info) { mTransformInfo = i_info; }
void setTransformInfo(const J3DTransformInfo& i_info) { mTransformInfo = i_info; }
Vec* getMax() { return &mMax; }
Vec* getMin() { return &mMin; }
void setCallBack(J3DJointCallBack callback) { mCallBack = callback; }
Expand Down
1 change: 1 addition & 0 deletions include/d/actor/d_a_npc_kasi_mich.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ class daNpcKasiMich_c : public daNpcF_c {
/* 80A28F74 */ int escape(int);
/* 80A2908C */ int iyan_look(int);
/* 80A29164 */ int turn_hana(int);
void dummy();
/* 80A291E8 */ int wait_dummy(int);
/* 80A2926C */ int cheer(int);
/* 80A29458 */ BOOL _turn_to_link(s16);
Expand Down
2 changes: 0 additions & 2 deletions include/d/actor/d_a_obj_flag2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ class FlagCloth_c : public J3DPacket {
/* 80BEE0B8 */ cXyz getTargetPos() { return mPositions[4]; }

/* 80BECF30 */ void draw();
/* 80BED9C4 */ virtual ~FlagCloth_c() {}

cXyz* getPos() { return mPositions; }
cXyz* getNormal() { return mNormals; }
Expand Down Expand Up @@ -76,7 +75,6 @@ class daObjFlag2_c : public fopAc_ac_c {
/* 80BED44C */ void setCollision();
/* 80BED480 */ int createHeap();
/* 80BED6A0 */ int create();
/* 80BED7A4 */ daObjFlag2_c();
/* 80BEDCE0 */ int draw();
/* 80BEDEE0 */ ~daObjFlag2_c();
inline int execute();
Expand Down
20 changes: 10 additions & 10 deletions include/d/actor/d_a_obj_flag3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,20 @@ class FlagCloth2_c : public J3DPacket {
public:
/* 80BEEDE4 */ void execute();
/* 80BEEF74 */ inline void calcFlagNormal(cXyz*, int);
static void initCcSphere(fopAc_ac_c*);
/* 80BEF278 */ inline cXyz calcFlagFactor(cXyz*, cXyz*, cXyz*, int);
/* 80BEF790 */ virtual ~FlagCloth2_c();
/* 80BEFD08 */ void initFlagPos(cXyz*, fopAc_ac_c*);
/* 80BF00A0 */ virtual void draw();
/* 80BF0434 */ cXyz getTargetPos() { return mPositions[4]; }
/* 80BF0434 */ cXyz getTargetPos() { return mPositions[4]; }

inline void calcFlagNormalBack();
void calcFlagNormalBack() {
cXyz* pNormal = getNormal();
cXyz* pNormalBack = getNormalBack();
for (int i = 0; i < 36; pNormal++, pNormalBack++, i++) {
pNormalBack->set(-pNormal->x, -pNormal->y, -pNormal->z);
}
}
cXyz* getPos() { return mPositions; }
cXyz* getVec() { return mVecs; }
cXyz* getNormal() { return mNormals; }
Expand All @@ -43,14 +50,7 @@ class FlagCloth2_c : public J3DPacket {
}
}

void calcFlagFactorSub(cXyz* param_1, cXyz* param_2, cXyz* param_3, f32 param_4) {
cXyz acStack_2c = *param_2 - *param_1;
param_4 = acStack_2c.abs() - param_4;
cXyz cStack_38 = acStack_2c.normZC();
param_4 *= mSpringRate;
cStack_38 *= param_4;
*param_3 += cStack_38;
}
void calcFlagFactorSub(cXyz* param_1, cXyz* param_2, cXyz* param_3, f32 param_4);

/* 0x010 */ GXTexObj mTexObj;
/* 0x030 */ dKy_tevstr_c mTevStr;
Expand Down
2 changes: 1 addition & 1 deletion include/d/actor/d_a_obj_ito.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

struct ito_s {
/* 0x000 */ mDoExt_3DlineMat0_c mLineMat;
/* 0x01C */ f32 field_0x1c[120];
/* 0x01C */ f32 field_0x1c[6][20];
/* 0x1FC */ cXyz field_0x1fc[6];
/* 0x244 */ s16 field_0x244[6];
/* 0x250 */ f32 field_0x250;
Expand Down
2 changes: 0 additions & 2 deletions include/d/d_a_obj.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ int PrmAbstract(const fopAc_ac_c* i_actor, T i_prmA, T i_prmB) {
return ((1 << i_prmA) - 1) & (param >> i_prmB);
}

#ifdef DEBUG
class HioVarious_c {
public:
static void init(JORReflexible*, const char*);
static void clean(JORReflexible*);
};
#endif

}; // namespace daObj

Expand Down
26 changes: 13 additions & 13 deletions src/d/actor/d_a_ep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
#include "d/dolzel_rel.h"

#include "d/actor/d_a_ep.h"
#include "d/d_com_inf_game.h"
#include "m_Do/m_Do_lib.h"
#include "d/actor/d_a_player.h"
#include "d/d_a_obj.h"
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include "m_Do/m_Do_lib.h"

/* 804681F8-804682F8 000078 0100+00 1/1 0/0 0/0 .text hahen_draw__FP8ep_class */
static void hahen_draw(ep_class* i_this) {
Expand Down Expand Up @@ -280,22 +281,21 @@ static void hahen_cast(ep_class* i_this, ep_hahen_s* hahen_s) {

/* 804690F8-80469568 000F78 0470+00 1/1 0/0 0/0 .text hahen_move__FP8ep_class */
static void hahen_move(ep_class* i_this) {
// NONMATCHING - equivalent in debug....
fopAc_ac_c* a_this = i_this;
fopAc_ac_c* player = dComIfGp_getPlayer(0);
dBgS_LinChk dStack_cc;
ep_hahen_s* epHahenS;
daPy_py_c* player = static_cast<daPy_py_c*>(dComIfGp_getPlayer(0));
dBgS_LinChk dStack_cc;

if (!fopAcM_checkCarryNow(a_this)) {
f32 fVar1 = 50.0f;
s8 bVar2 = false;
cXyz local_d8;
for (int iters = 0; iters < 10; iters++) {
epHahenS = i_this->mHahen;
epHahenS = static_cast<ep_hahen_s*>(i_this->mHahen);
for (int j = 0; j < 6; j++, epHahenS++) {
local_d8 = player->current.pos - epHahenS->field_0x4;
if (local_d8.abs() < fVar1) {
cLib_onBit<u32>(a_this->attention_info.flags, fopAc_AttnFlag_ETC_e);
cLib_onBit<u32>(a_this->attention_info.flags, fopAc_AttnFlag_CARRY_e);
a_this->current.pos = epHahenS->field_0x4;
a_this->attention_info.position = a_this->eyePos = a_this->current.pos;
a_this->current.angle = a_this->shape_angle = epHahenS->field_0x28;
Expand All @@ -313,7 +313,7 @@ static void hahen_move(ep_class* i_this) {
fVar1 += 20.0f;
}
} else {
cLib_offBit<u32>(a_this->attention_info.flags, fopAc_AttnFlag_ETC_e);
cLib_offBit<u32>(a_this->attention_info.flags, fopAc_AttnFlag_CARRY_e);
i_this->mHahen[i_this->field_0xa78].field_0x97 = 3;
i_this->mHahen[i_this->field_0xa78].field_0x4 = a_this->current.pos;
i_this->mHahen[i_this->field_0xa78].field_0x28 = a_this->shape_angle;
Expand All @@ -325,7 +325,7 @@ static void hahen_move(ep_class* i_this) {
if (epHahenS->field_0x98) {
--epHahenS->field_0x98;
}

if (i_this->field_0xa79 == 3) {
if (epHahenS->field_0x97 == 1) {
hahen_normal(i_this, epHahenS);
Expand Down Expand Up @@ -819,22 +819,22 @@ static int daEp_CreateHeap(fopAc_ac_c* a_this) {
// NONMATCHING - equiv in debug
ep_class* i_this = (ep_class*)a_this;

J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Ep", model_d[i_this->field_0xa5a]);
void* modelData = dComIfG_getObjectRes("Ep", model_d[i_this->field_0xa5a]);
JUT_ASSERT(0x855, modelData != 0);

i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
i_this->mpModel = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084);
if (i_this->mpModel == NULL) {
return 0;
}

MtxScale(0.0f, 0.0f, 0.0f, 0);
i_this->mpModel->setBaseTRMtx(*calc_mtx);

modelData = (J3DModelData*)dComIfG_getObjectRes("Ep", 7);
modelData = dComIfG_getObjectRes("Ep", 7);
JUT_ASSERT(0x884, modelData != 0);

for (int i = 0; i < 6; i++) {
i_this->mHahen[i].mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
i_this->mHahen[i].mpModel = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084);
if (i_this->mHahen[i].mpModel == NULL) {
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/d/actor/d_a_npc_kasi_kyu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,7 +1354,7 @@ int daNpcKasiKyu_c::cheer(int param_1) {
fopAcM_SetSpeedF(this, 0.0f);
mpMorf->setPlaySpeed(0.0f);
mTalked = false;
field_0x1460 = 20;
field_0x1460 = 12;
mMode = 1;
break;

Expand Down
Loading