Skip to content

Commit 1aeb2a0

Browse files
hatal175hatal175
authored
d_a_e_wb equivalent (#2667)
* Some work d_a_e_wb * Match more in e_wb * d_a_e_wb equivalent
1 parent d912d85 commit 1aeb2a0

File tree

8 files changed

+3889
-1569
lines changed

8 files changed

+3889
-1569
lines changed

‎config/GZ2E01/rels/d_a_e_rd/symbols.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,24 +445,29 @@ S_find = .bss:0x000000AC; // type:object size:0x2 scope:global data:2byte
445445
lbl_70_bss_AE = .bss:0x000000AE; // type:object size:0x1 data:byte
446446
@4242 = .bss:0x000000B0; // type:object size:0xC scope:local
447447
S_find_pos = .bss:0x000000BC; // type:object size:0xC scope:global align:4 data:float
448-
lbl_70_bss_C8 = .bss:0x000000C8; // type:object size:0x1 data:byte
448+
data_80519200 = .bss:0x000000C8; // type:object size:0x1 data:byte
449+
data_80519201 = .bss:0x000000C9; // type:object size:0x1 data:byte
449450
target_info = .bss:0x000000CC; // type:object size:0x28 scope:global data:4byte
450451
target_info_count = .bss:0x000000F4; // type:object size:0x4 scope:global data:4byte
452+
data_80519230 = .bss:0x000000F8; // type:object size:0x1 scope:local data:byte
451453
check_index$5284 = .bss:0x000000FC; // type:object size:0xFF scope:local
452454
rd_count = .bss:0x000001FC; // type:object size:0x4 scope:global data:4byte
453455
lbl_70_bss_200 = .bss:0x00000200; // type:object size:0x1 data:byte
454456
c_start = .bss:0x00000204; // type:object size:0x4 scope:global
455457
@11269 = .bss:0x00000208; // type:object size:0xC scope:local
458+
init$8899 = .bss:0x00000214; // type:object size:0x1 scope:local
456459
@11272 = .bss:0x00000218; // type:object size:0xC scope:local
457460
@11273 = .bss:0x00000224; // type:object size:0xC scope:local
458461
@11274 = .bss:0x00000230; // type:object size:0xC scope:local
459462
@11275 = .bss:0x0000023C; // type:object size:0xC scope:local
460463
@11276 = .bss:0x00000248; // type:object size:0xC scope:local
461464
set_pos$11268 = .bss:0x00000254; // type:object size:0x48 scope:local
462465
@11412 = .bss:0x0000029C; // type:object size:0xC scope:local
466+
init$9041 = .bss:0x000002A8; // type:object size:0x1 scope:local
463467
@11415 = .bss:0x000002AC; // type:object size:0xC scope:local
464468
@11416 = .bss:0x000002B8; // type:object size:0xC scope:local
465469
set_pos$11411 = .bss:0x000002C4; // type:object size:0x24 scope:local
470+
instanceCount = .bss:0x000002E8; // type:object size:0x1 scope:local
466471
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000002EC; // type:object size:0x4 scope:global
467472
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000002F0; // type:object size:0x4 scope:global
468473
sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000002F4; // type:object size:0x4 scope:global

‎config/GZ2E01/rels/d_a_e_wb/symbols.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
542542
lbl_244_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
543543
lbl_244_bss_46 = .bss:0x00000046; // type:object size:0x1 data:byte
544544
lbl_244_bss_47 = .bss:0x00000047; // type:object size:0x1 data:byte
545-
lbl_244_bss_48 = .bss:0x00000048; // type:object size:0x1 data:byte
545+
l_HIOInit = .bss:0x00000048; // type:object size:0x1 data:byte
546546
@4435 = .bss:0x0000004C; // type:object size:0xC scope:local
547547
l_HIO = .bss:0x00000058; // type:object size:0x5C scope:global data:byte
548548
@4746 = .bss:0x000000B4; // type:object size:0xC scope:local
@@ -569,13 +569,16 @@ init$3883 = .bss:0x0000024C; // type:object size:0x1 scope:local
569569
@6615 = .bss:0x00000250; // type:object size:0xC scope:local
570570
ikki2_pos$6611 = .bss:0x0000025C; // type:object size:0x18 scope:local
571571
@7515 = .bss:0x00000274; // type:object size:0xC scope:local
572+
init$4754 = .bss:0x00000280; // type:object size:0x1 scope:local
572573
sc$7514 = .bss:0x00000284; // type:object size:0xC scope:local
573574
rd_count = .bss:0x00000290; // type:object size:0x4 scope:global data:4byte
574575
@7814 = .bss:0x00000294; // type:object size:0xC scope:local
576+
init$5045 = .bss:0x000002A0; // type:object size:0x1 scope:local
575577
@7817 = .bss:0x000002A4; // type:object size:0xC scope:local
576578
@7818 = .bss:0x000002B0; // type:object size:0xC scope:local
577579
sh_pos$7813 = .bss:0x000002BC; // type:object size:0x24 scope:local
578580
@7820 = .bss:0x000002E0; // type:object size:0xC scope:local
581+
init$5051 = .bss:0x000002EC; // type:object size:0x1 scope:local
579582
@7823 = .bss:0x000002F0; // type:object size:0xC scope:local
580583
@7824 = .bss:0x000002FC; // type:object size:0xC scope:local
581584
sh_posH$7819 = .bss:0x00000308; // type:object size:0x24 scope:local

‎include/d/actor/d_a_e_wb.h‎

Lines changed: 8 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,7 @@ class e_wb_class {
119119
/* 0x0690 */ s16 mActionID;
120120
/* 0x0692 */ s16 field_0x692;
121121
/* 0x0694 */ int mShadowKey;
122-
/* 0x0698 */ s16 field_0x698;
123-
/* 0x069A */ s16 field_0x69a;
124-
/* 0x069C */ s16 field_0x69c;
125-
/* 0x069E */ s16 field_0x69e;
122+
/* 0x0698 */ s16 field_0x698[4];
126123
/* 0x06A0 */ s16 field_0x6a0;
127124
/* 0x06A2 */ u8 field_0x6a2[0x6ae - 0x6a2];
128125
/* 0x06AE */ csXyz field_0x6ae;
@@ -131,7 +128,7 @@ class e_wb_class {
131128
/* 0x06B8 */ u8 field_0x6b8[0x6ba - 0x6b8];
132129
/* 0x06BA */ s16 field_0x6ba;
133130
/* 0x06BC */ u8 field_0x6bc;
134-
/* 0x06BD */ u8 field_0x6bd;
131+
/* 0x06BD */ s8 field_0x6bd;
135132
/* 0x06BE */ u16 field_0x6be;
136133
/* 0x06C0 */ s8 field_0x6c0;
137134
/* 0x06C4 */ f32 field_0x6c4;
@@ -147,7 +144,7 @@ class e_wb_class {
147144
/* 0x06DE */ s16 field_0x6de;
148145
/* 0x06E0 */ s16 field_0x6e0;
149146
/* 0x06E2 */ s16 field_0x6e2;
150-
/* 0x06E4 */ u8 field_0x6e4;
147+
/* 0x06E4 */ s8 field_0x6e4;
151148
/* 0x06E5 */ u8 field_0x6e5[0x6ec - 0x6e5];
152149
/* 0x06EC */ csXyz field_0x6ec[0x1d];
153150
/* 0x079A */ s16 field_0x79a;
@@ -163,21 +160,19 @@ class e_wb_class {
163160
/* 0x07A8 */ f32 field_0x7a8;
164161
/* 0x07AC */ dBgS_AcchCir field_0x7ac;
165162
/* 0x07EC */ dBgS_ObjAcch mAcch;
166-
/* 0x09C4 */ dCcD_Stts field_0x9c4;
163+
/* 0x09C4 */ dCcD_Stts mStts;
167164
/* 0x0A00 */ dCcD_Sph field_0xa00[7];
168165
/* 0x1288 */ dCcD_Sph field_0x1288;
169166
/* 0x13C0 */ dCcU_AtInfo field_0x13c0;
170167
/* 0x13E4 */ u8 field_0x13e4;
171-
/* 0x13E8 */ u32 field_0x13e8;
172-
/* 0x13EC */ u32 field_0x13ec;
168+
/* 0x13E8 */ u32 field_0x13e8[2];
173169
/* 0x13F0 */ u32 field_0x13f0;
174170
/* 0x13F4 */ u32 field_0x13f4;
175171
/* 0x13F8 */ u32 field_0x13f8;
176172
/* 0x13FC */ u32 field_0x13fc;
177173
/* 0x1400 */ u32 field_0x1400;
178174
/* 0x1404 */ u32 field_0x1404;
179-
/* 0x1408 */ u32 field_0x1408;
180-
/* 0x140C */ u32 field_0x140c;
175+
/* 0x1408 */ u32 field_0x1408[2];
181176
/* 0x1410 */ u32 field_0x1410;
182177
/* 0x1414 */ u32 field_0x1414;
183178
/* 0x1418 */ u32 field_0x1418;
@@ -196,7 +191,7 @@ class e_wb_class {
196191
/* 0x1648 */ mDoExt_3DlineMat1_c field_0x1648;
197192
/* 0x1684 */ f32 field_0x1684;
198193
/* 0x1688 */ s16 field_0x1688;
199-
/* 0x168A */ u16 field_0x168a;
194+
/* 0x168A */ s16 field_0x168a;
200195
/* 0x168C */ f32 field_0x168c;
201196
/* 0x1690 */ f32 field_0x1690;
202197
/* 0x1694 */ u8 field_0x1694[0x169e - 0x1694];
@@ -216,7 +211,7 @@ class e_wb_class {
216211
/* 0x1710 */ f32 field_0x1710;
217212
/* 0x1714 */ f32 field_0x1714;
218213
/* 0x1718 */ f32 field_0x1718;
219-
/* 0x171C */ u8 field_0x171c[0x1720 - 0x171c];
214+
/* 0x171C */ f32 field_0x171c;
220215
/* 0x1720 */ s8 field_0x1720;
221216
/* 0x1721 */ s8 field_0x1721;
222217
/* 0x1722 */ s8 field_0x1722;
@@ -233,40 +228,6 @@ class e_wb_class {
233228

234229
STATIC_ASSERT(sizeof(e_wb_class) == 0x17EC);
235230

236-
class daE_WB_HIO_c : public JORReflexible {
237-
public:
238-
/* 807D248C */ daE_WB_HIO_c();
239-
/* 807E20DC */ virtual ~daE_WB_HIO_c() {};
240-
void genMessage(JORMContext*);
241-
242-
/* イノシシ - Wild Boar */
243-
/* 0x00 */ // vtable
244-
/* 0x04 */ s8 mId;
245-
/* 0x08 */ f32 base_size; // 基本サイズ - Base Size
246-
/* 0x0C */ f32 leader_size_ratio; // リーダーサイズ比 - Leader Size Ratio
247-
/* 0x10 */ f32 movement_speed; // 移動速度 - Movement Speed
248-
/* 0x14 */ f32 max_speed; // 最速度 - Max Speed
249-
/* 0x18 */ f32 cavalry_battle_max_speed; // 騎馬戦最速 - Cavalry Battle Max Speed
250-
/* 0x1C */ f32 normal_speed_vi;
251-
/* 0x20 */ f32 medium_speed_vi;
252-
/* 0x24 */ f32 mMaxSpeedVi;
253-
/* 0x28 */ f32 leader_walking_speed; // 歩き速（リ）- Leader Walking Speed
254-
/* 0x2C */ f32 leader_max_speed; // 最速度（リ）- Leader Max Speed
255-
/* 0x30 */ f32 leader_cavalry_battle_max_speed; // 騎馬戦最（リ）- Leader Cavalry Battle Max Speed
256-
/* 0x34 */ f32 mSingleRiderSpeed;
257-
/* 0x38 */ f32 player_recognition_dist; // PL認識距離 - Player Recognition Distance
258-
/* 0x3C */ f32 mPlayerMountedMaxSpeed;
259-
/* 0x40 */ f32 mPlayerMountedMotionPlaybackSpeed;
260-
/* 0x44 */ s16 mPlayerMountedDashTime;
261-
/* 0x48 */ f32 mSearchIgnoreDistance1;
262-
/* 0x4C */ f32 mSearchIgnoreDistance2;
263-
/* 0x50 */ f32 mGuidanceDisplayDistance1;
264-
/* 0x54 */ f32 mGuidanceDisplayDistance2;
265-
/* 0x58 */ u8 field_0x58;
266-
/* 0x59 */ u8 mNoReins;
267-
};
268-
269-
STATIC_ASSERT(sizeof(daE_WB_HIO_c) == 0x5C);
270231

271232

272233
#endif /* D_A_E_WB_H */

‎include/d/actor/d_a_horse.h‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,17 @@ class daHorse_c : public fopAc_ac_c {
135135
m_demoMode = 1;
136136
}
137137

138-
/* 807E27F8 */ void onDemoJumpDistance(f32, f32);
139-
/* 807E28B8 */ void changeDemoPos0(cXyz const*);
138+
/* 807E27F8 */ void onDemoJumpDistance(f32 param_1, f32 param_2) {
139+
field_0x1768 = param_1;
140+
field_0x176c = param_2;
141+
field_0x1770 = param_1;
142+
143+
}
144+
145+
/* 807E28B8 */ void changeDemoPos0(cXyz const* pos) {
146+
m_demoPos0 = *pos;
147+
}
148+
140149
/* 80838498 */ void coHitCallbackBoarJump(fopAc_ac_c*);
141150
/* 80838798 */ void coHitCallbackBoarHit(fopAc_ac_c*, dCcD_GObjInf*);
142151
/* 80838904 */ void coHitCallbackCowHit(fopAc_ac_c*);

‎include/d/d_cc_d.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ enum dCcD_Material {
5050
enum dCcG_At_Spl {
5151
/* 0x0 */ dCcG_At_Spl_UNK_0,
5252
/* 0x1 */ dCcG_At_Spl_UNK_1,
53+
/* 0x7 */ dCcG_At_Spl_UNK_7 = 0x7,
5354
/* 0xD */ dCcG_At_Spl_UNK_D = 0xD,
5455
};
5556

0 commit comments

Comments
 (0)