Skip to content

Commit 5c86d6d

Browse files
authored
Minor d_a_alink fixes (#2534)
1 parent 70f0ed7 commit 5c86d6d

File tree

13 files changed

+287
-234
lines changed

13 files changed

+287
-234
lines changed

config/GZ2E01/symbols.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21908,11 +21908,17 @@ m_obj__12dEyeHL_mng_c = .sbss:0x80450FA8; // type:object size:0x4 scope:global a
2190821908
struct_80450FB0 = .sbss:0x80450FB0; // type:object size:0x1 scope:global align:8 data:byte
2190921909
lbl_80450FB1 = .sbss:0x80450FB1; // type:object size:0x1 data:byte
2191021910
lbl_80450FB2 = .sbss:0x80450FB2; // type:object size:0x1 data:byte
21911-
struct_80450FB8 = .sbss:0x80450FB8; // type:object size:0x4 scope:global align:4 data:byte
21911+
init$11203 = .sbss:0x80450FB8; // type:object size:0x1 scope:global align:1 data:byte
21912+
init$11207 = .sbss:0x80450FB9; // type:object size:0x1 scope:global align:1 data:byte
21913+
init$11211 = .sbss:0x80450FBA; // type:object size:0x1 scope:global align:1 data:byte
21914+
init$11215 = .sbss:0x80450FBB; // type:object size:0x1 scope:global align:1 data:byte
2191221915
init$33110 = .sbss:0x80450FBC; // type:object size:0x1 scope:local align:1 data:byte
2191321916
init$33113 = .sbss:0x80450FBD; // type:object size:0x1 scope:local align:1 data:byte
2191421917
it$36766 = .sbss:0x80450FC0; // type:object size:0x4 scope:local align:4 data:4byte
21915-
struct_80450FC4 = .sbss:0x80450FC4; // type:object size:0x4 scope:local align:4 data:byte
21918+
init$37466 = .sbss:0x80450FC4; // type:object size:0x1 scope:local align:4 data:byte
21919+
lbl_80450FC5 = .sbss:0x80450FC5; // type:object size:0x1 data:byte
21920+
lbl_80450FC6 = .sbss:0x80450FC6; // type:object size:0x1 data:byte
21921+
lbl_80450FC7 = .sbss:0x80450FC7; // type:object size:0x1 data:byte
2191621922
m_eye_move_flg = .sbss:0x80450FC8; // type:object size:0x1 scope:local align:1 data:byte
2191721923
m_morf_frame__16daAlink_matAnm_c = .sbss:0x80450FC9; // type:object size:0x1 scope:global align:1 data:byte
2191821924
bgWaitFlg = .sbss:0x80450FCC; // type:object size:0x4 scope:local align:4 data:4byte

include/JSystem/JHostIO/JORMContext.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,10 @@ class JORMContext {
151151
genNodeSub(label, obj, param_2, param_3);
152152
}
153153

154+
void endUpdateNode() {
155+
// empty function
156+
}
157+
154158
void startUpdateNode(JORReflexible* obj) {
155159
putNode(obj);
156160
}
@@ -240,6 +244,7 @@ class JORMContext {
240244

241245
void updateControl(u32 mode, u32 id, u32 param_2);
242246
void updateControl(u32 mode, u32 id, const char* param_2);
247+
void updateLabel(u32 mode, u32 id, const char* param_2) { updateControl(mode, id, param_2); }
243248
void updateSliderSub(u32 mode, u32 id, s32 value, s32 rangeMin, s32 rangeMax,
244249
u32 param_5);
245250
void updateCheckBoxSub(u32 mode, u32 id, u16 value, u16 mask, u32 param_4);

include/d/actor/d_a_alink.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
55
#include "JSystem/J3DGraphBase/J3DMatBlock.h"
6-
#include "JSystem/J3DGraphBase/J3DMaterial.h"
7-
#include "Z2AudioLib/Z2Creature.h"
86
#include "Z2AudioLib/Z2WolfHowlMgr.h"
97
#include "d/actor/d_a_player.h"
108
#include "d/actor/d_a_tag_mmsg.h"
@@ -228,6 +226,8 @@ class daAlinkHIO_c {
228226
/* 80140B88 */ daAlinkHIO_c();
229227
/* 80140C10 */ virtual ~daAlinkHIO_c();
230228

229+
void jumpStateUpdate(const cXyz*, const cXyz*, f32);
230+
231231
/* 0x04 */ u8 field_0x4[0xC - 0x4];
232232
/* 0x0C */ daAlinkHIO_cut_c mCut;
233233
/* 0x0D */ u8 field_0xD[0x4B - 0xD];

include/m_Do/m_Do_mtx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void mDoMtx_ZrotM(Mtx mtx, s16 z);
2424
bool mDoMtx_inverseTranspose(f32 const (*param_0)[4], f32 (*param_1)[4]);
2525
void mDoMtx_QuatConcat(Quaternion const* param_0, Quaternion const* param_1, Quaternion* param_2);
2626

27-
inline void mDoMtx_multVecSR(Mtx m, const Vec* src, Vec* dst) {
27+
inline void mDoMtx_multVecSR(const Mtx m, const Vec* src, Vec* dst) {
2828
MTXMultVecSR(m, src, dst);
2929
}
3030

0 commit comments

Comments
 (0)