Skip to content

Commit d4d7f18

Browse files
caseifcaseif
committed
d_a_mg_fish matching
1 parent 7544395 commit d4d7f18

File tree

9 files changed

+4101
-2485
lines changed

9 files changed

+4101
-2485
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ lbl_78_data_10 = .data:0x00000010; // type:object size:0x10
258258
check_kind = .data:0x00000020; // type:object size:0x8 scope:global
259259
vib_p$3694 = .data:0x00000028; // type:object size:0x10 scope:local
260260
learn_d$3913 = .data:0x00000038; // type:object size:0x5 scope:local
261-
swim_path127 = .data:0x00000040; // type:object size:0x2B0 scope:global
261+
swim_path = .data:0x00000040; // type:object size:0x2B0 scope:global
262262
joint_offset_LM$5310 = .data:0x000002F0; // type:object size:0xC scope:local
263263
joint_offset_BG$5311 = .data:0x000002FC; // type:object size:0x8 scope:local
264264
joint_offset_NP$5312 = .data:0x00000304; // type:object size:0x18 scope:local
@@ -303,12 +303,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
303303
@1014 = .bss:0x00000038; // type:object size:0x1 scope:local
304304
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
305305
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
306-
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
306+
@1007 = .bss:0x00000044; // type:object size:0x1 scope:local
307307
lbl_78_bss_46 = .bss:0x00000046; // type:object size:0x1 data:byte
308308
@3674 = .bss:0x00000048; // type:object size:0xC scope:local
309309
l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte
310310
s_fish_ct = .bss:0x00000070; // type:object size:0x4 scope:global data:4byte
311311
@7455 = .bss:0x00000074; // type:object size:0xC scope:local
312+
init$5256 = .bss:0x00000080; // type:object size:0x1 scope:local
312313
@7458 = .bss:0x00000084; // type:object size:0xC scope:local
313314
@7459 = .bss:0x00000090; // type:object size:0xC scope:local
314315
@7460 = .bss:0x0000009C; // type:object size:0xC scope:local

‎configure.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1541,7 +1541,7 @@ def MatchingFor(*versions) -> bool:
15411541
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag10"),
15421542
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag11"),
15431543
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag14"),
1544-
ActorRel(NonMatching, "d_a_mg_fish"),
1544+
ActorRel(MatchingFor("GZ2E01"), "d_a_mg_fish"),
15451545
ActorRel(NonMatching, "d_a_npc_besu"),
15461546
ActorRel(Equivalent, "d_a_npc_fairy_seirei"),
15471547
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_fish"),

‎include/d/actor/d_a_mg_fish.h‎

Lines changed: 79 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,16 @@
77
#include "d/d_bg_s_acch.h"
88
#include "d/d_cc_d.h"
99

10+
/**
11+
* @ingroup actors-unsorted
12+
* @class mf_ke_s
13+
* @brief Fishing line ("keburu")
14+
*
15+
* @details
16+
*/
1017
struct mf_ke_s {
11-
/* 80535F74 */ ~mf_ke_s();
12-
/* 80535FD4 */ mf_ke_s();
13-
14-
/* 0x00 */ u8 field_0x0[0x48];
18+
/* 0x00 */ cXyz mControlPoints[5];
19+
/* 0x3C */ cXyz mMovementDir;
1520
};
1621

1722
/**
@@ -22,67 +27,105 @@ struct mf_ke_s {
2227
* @details
2328
*
2429
*/
25-
class mg_fish_class : public fopEn_enemy_c {
30+
class mg_fish_class {
2631
public:
32+
/* 0x0 */ fopEn_enemy_c actor;
2733
/* 0x5AC */ request_of_phase_process_class mPhaseReq;
28-
/* 0x5B4 */ s16 field_0x5b4;
29-
/* 0x5B6 */ s16 field_0x5b6;
30-
/* 0x5B8 */ s16 field_0x5b8;
31-
/* 0x5BC */ f32 field_0x5bc;
32-
/* 0x5C0 */ cXyz field_0x5c0;
33-
/* 0x5CC */ u8 field_0x5cc[0xc];
34-
/* 0x5D8 */ f32 field_0x5d8;
35-
/* 0x5DC */ f32 field_0x5dc;
34+
/* 0x5B4 */ s16 mBobTimer;
35+
/* 0x5B6 */ s16 mCurAction;
36+
/* 0x5B8 */ s16 mActionPhase;
37+
/* 0x5BC */ f32 mJointScale;
38+
/* 0x5C0 */ cXyz mNextPos;
39+
/* 0x5CC */ s16 mMovementYaw;
40+
/* 0x5CE */ s16 mMovementPitch;
41+
/* 0x5D0 */ s16 mMaxStep;
42+
/* 0x5D2 */ s16 mCurSwimStep;
43+
/* 0x5D4 */ f32 field_0x5d4;
44+
/* 0x5D8 */ f32 mSurfaceY;
45+
/* 0x5DC */ f32 mGroundY;
3646
/* 0x5E0 */ cXyz field_0x5e0;
3747
/* 0x5EC */ f32 field_0x5ec;
38-
/* 0x5F0 */ f32 field_0x5f0;
39-
/* 0x5F4 */ u8 field_0x5f4[8];
48+
/* 0x5F0 */ f32 mDistToPlayer;
49+
/* 0x5F4 */ s16 mYawToPlayer;
50+
/* 0x5F6 */ s16 field_0x5f6;
51+
/* 0x5F8 */ s16 field_0x5f8;
4052
/* 0x5FC */ char* mResName;
4153
/* 0x600 */ mDoExt_McaMorf* mpMorf;
42-
/* 0x604 */ J3DAnmTransform* field_0x604;
43-
/* 0x608 */ u8 field_0x608[4];
54+
/* 0x604 */ J3DAnmTransform* mAnmTransform;
55+
/* 0x608 */ u32 mShadowId;
4456
/* 0x60C */ int mAnmID;
4557
/* 0x610 */ mDoExt_brkAnm* mpBrkAnm;
4658
/* 0x614 */ J3DModel* mpModel[3];
4759
/* 0x620 */ mDoExt_btpAnm* mpBtpAnm;
48-
/* 0x624 */ s16 field_0x624;
49-
/* 0x626 */ u8 field_0x626[2];
50-
/* 0x628 */ s16 field_0x628;
51-
/* 0x62A */ u8 field_0x62a[8];
52-
/* 0x632 */ u16 field_0x632;
60+
/* 0x624 */ s16 field_0x624[5];
61+
/* 0x62E */ s16 field_0x62e;
62+
/* 0x630 */ s16 mRemainingHookTime;
63+
/* 0x632 */ s16 field_0x632;
5364
/* 0x634 */ u8 mGedouKind;
5465
/* 0x635 */ u8 mKind2;
5566
/* 0x638 */ cXyz field_0x638;
56-
/* 0x644 */ u16 field_0x644;
57-
/* 0x646 */ u8 field_0x646[0x1e];
58-
/* 0x664 */ cXyz field_0x664[10];
59-
/* 0x6DC */ csXyz field_0x6dc[10];
60-
/* 0x718 */ s16 field_0x718[10];
61-
/* 0x72C */ int field_0x72c;
62-
/* 0x730 */ s16 field_0x730;
63-
/* 0x732 */ u8 field_0x732[0xe];
67+
/* 0x644 */ s16 mRotZ;
68+
/* 0x646 */ u8 field_0x646[2];
69+
/* 0x648 */ u32 mBaitId;
70+
/* 0x64C */ u32 mRodId;
71+
/* 0x650 */ f32 field_0x650;
72+
/* 0x654 */ f32 field_0x654;
73+
/* 0x658 */ s8 mHookedState;
74+
/* 0x659 */ s8 field_0x659;
75+
/* 0x65A */ s8 field_0x65a;
76+
/* 0x65B */ u8 field_0x65b;
77+
/* 0x65C */ u8 field_0x65c;
78+
/* 0x65D */ u8 field_0x65d;
79+
/* 0x660 */ f32 field_0x660;
80+
/* 0x664 */ cXyz mJointTranslations[10];
81+
/* 0x6DC */ csXyz mJointRotations[10];
82+
/* 0x718 */ s16 jointYaws1[10];
83+
/* 0x72C */ s32 mNumJoints;
84+
/* 0x730 */ s16 jointYaws2[6];
85+
/* 0x73C */ f32 field_0x73c;
6486
/* 0x740 */ f32 field_0x740;
65-
/* 0x744 */ u8 field_0x744[0x10];
87+
/* 0x744 */ f32 mBobAmp;
88+
/* 0x748 */ f32 field_0x748;
89+
/* 0x74C */ f32 field_0x74c;
90+
/* 0x750 */ u8 field_0x750;
6691
/* 0x754 */ mf_ke_s field_0x754[2];
67-
/* 0x7E4 */ mDoExt_3DlineMat0_c field_0x7e4;
92+
/* 0x7E4 */ mDoExt_3DlineMat0_c mLineMat;
6893
/* 0x800 */ Z2Creature mSound;
6994
/* 0x890 */ dBgS_AcchCir mAcchCir;
7095
/* 0x8D0 */ dBgS_ObjAcch mAcch;
7196
/* 0xAA8 */ dCcD_Stts mCcStatus;
7297
/* 0xAE4 */ dCcD_Cyl mCcCyl;
73-
/* 0xC20 */ u8 field_0xc20[0x1c];
98+
/* 0xC20 */ u32 field_0xc20;
99+
/* 0xC24 */ u8 field_0xc24[0xc28 - 0xc24];
100+
/* 0xC28 */ s32 mEmitterIds[3];
101+
/* 0xC34 */ u32 field_0xc34;
102+
/* 0xC38 */ u32 field_0xc38;
74103
/* 0xC3C */ u8 field_0xc3c;
75-
/* 0xC3D */ u8 field_0xc3d[0xb];
104+
/* 0xC3D */ u8 mCaughtType;
105+
/* 0xC3E */ u8 field_0xc3e;
106+
/* 0xC3F */ u8 field_0xc3f;
107+
/* 0xC40 */ f32 field_0xc40;
108+
/* 0xC44 */ u8 field_0xc44;
76109
/* 0xC48 */ J3DJointCallBack mNodeCallBack;
77-
/* 0xC4C */ u32 field_0xc4c;
110+
/* 0xC4C */ u32 mSkullfishId;
78111
};
79112

80113
STATIC_ASSERT(sizeof(mg_fish_class) == 0xC50);
81114

82115
class daMg_Fish_HIO_c {
83116
public:
84117
/* 80529D2C */ daMg_Fish_HIO_c();
85-
/* 805360A8 */ ~daMg_Fish_HIO_c();
118+
/* 805360A8 */ virtual ~daMg_Fish_HIO_c() {}
119+
120+
/* 0x4 */ s8 field_0x4;
121+
/* 0x8 */ f32 field_0x8;
122+
/* 0xC */ f32 field_0xc;
123+
/* 0x10 */ f32 field_0x10;
124+
/* 0x14 */ f32 field_0x14;
125+
/* 0x18 */ u8 field_0x18;
126+
/* 0x19 */ u8 field_0x19;
127+
/* 0x1A */ u8 field_0x1a;
128+
/* 0x1B */ u8 field_0x1b;
86129
};
87130

88131

‎include/d/actor/d_a_mg_rod.h‎

Lines changed: 87 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,14 @@
99
#include "f_op/f_op_actor_mng.h"
1010

1111
struct mg_rod_s {
12-
/* 0x0 */ cXyz field_0x0[16];
12+
/* 0x0 */ u8 field_0x0[0x14 - 0x0];
13+
/* 0x14 */ void* field_0x14;
14+
/* 0x18 */ u8 field_0x18[0x2E - 0x18];
15+
/* 0x2E */ s16 field_0x2e;
16+
/* 0x30 */ s16 field_0x30;
17+
/* 0x32 */ u8 field_0x32[0x54 - 0x32];
18+
/* 0x54 */ u32 field_0x54;
19+
/* 0x58 */ u8 field_0x58[0xC0 - 0x58];
1320
};
1421

1522
struct mg_line_s {
@@ -43,7 +50,14 @@ class dmg_rod_class : public fopAc_ac_c {
4350
bool checkRodEquipPermission() { return field_0x1514 == 0; }
4451
bool checkReelSpin() { return field_0x14f0 != 0; }
4552

46-
/* 0x0568 */ u8 field_0x568[0x590 - 0x568];
53+
/* 0x0568 */ u8 field_0x568[0x57A - 0x568];
54+
/* 0x057A */ s16 field_0x57a;
55+
/* 0x057C */ u8 field_0x57c[0x57E - 0x57C];
56+
/* 0x057E */ s16 field_0x57e;
57+
/* 0x0580 */ s16 field_0x580;
58+
/* 0x0582 */ u8 field_0x582[0x584 - 0x582];
59+
/* 0x0584 */ s16 field_0x584;
60+
/* 0x0586 */ u8 field_0x586[0x590 - 0x586];
4761
/* 0x0590 */ f32 field_0x590;
4862
/* 0x0594 */ u8 field_0x594[0x5A4 - 0x594];
4963
/* 0x05A4 */ mg_rod_s field_0x5a4;
@@ -53,46 +67,103 @@ class dmg_rod_class : public fopAc_ac_c {
5367
/* 0x06C4 */ u8 field_0x6c4[0x6C8 - 0x6C4];
5468
/* 0x06C8 */ cXyz field_0x6c8;
5569
/* 0x06D4 */ cXyz field_0x6d4;
56-
/* 0x06E0 */ u8 field_0x6e0[0x6EC - 0x6E0];
70+
/* 0x06E0 */ s16 field_0x6e0;
71+
/* 0x06E2 */ u8 field_0x6e2[0x6EC - 0x6E2];
5772
/* 0x06EC */ cXyz field_0x6ec;
58-
/* 0x06F8 */ u8 field_0x6f8[0x71C - 0x6F8];
73+
/* 0x06F8 */ f32 field_0x6f8;
74+
/* 0x06FC */ u8 field_0x6fc[0x71C - 0x6FC];
5975
/* 0x071C */ csXyz field_0x71c[6];
6076
/* 0x0740 */ u8 field_0x740[0x744 - 0x740];
6177
/* 0x0744 */ cXyz field_0x744;
6278
/* 0x0750 */ cXyz field_0x750;
6379
/* 0x075C */ u8 field_0x75c[0x764 - 0x75C];
6480
/* 0x0764 */ cXyz field_0x764;
6581
/* 0x0770 */ mg_line_s field_0x770;
66-
/* 0x0C20 */ u8 field_0xc20[0xF7C - 0xC20];
82+
/* 0x0C20 */ u8 field_0xc20[0xF5C - 0xC20];
83+
/* 0x0F5C */ f32 field_0xf5c;
84+
/* 0x0F60 */ f32 field_0xf60;
85+
/* 0x0F64 */ f32 field_0xf64;
86+
/* 0x0F68 */ u8 field_0xf68[0xF7C - 0xF68];
6787
/* 0x0F7C */ s16 field_0xf7c;
6888
/* 0x0F7E */ s16 field_0xf7e;
69-
/* 0x0F80 */ u8 field_0xf80[0xFAC - 0xF80];
89+
/* 0x0F80 */ s8 field_0xf80;
90+
/* 0x0F81 */ u8 field_0xf81[0xFAC - 0xF81];
7091
/* 0x0FAC */ mg_hook_s field_0xfac[2];
71-
/* 0x0FEC */ u8 field_0xfec[0x100D - 0xFEC];
92+
/* 0x0FEC */ u8 field_0xfec[0xFFC - 0xFEC];
93+
/* 0x0FFC */ s16 field_0xffc;
94+
/* 0x0FFE */ u8 field_0xffe[2];
95+
/* 0x1000 */ s16 field_0x1000;
96+
/* 0x1002 */ u8 field_0x1002[2];
97+
/* 0x1004 */ s16 field_0x1004;
98+
/* 0x1006 */ s16 field_0x1006;
99+
/* 0x1008 */ s8 field_0x1008;
100+
/* 0x1009 */ s8 field_0x1009;
101+
/* 0x100A */ s8 field_0x100a;
102+
/* 0x100B */ u8 field_0x100b[1];
103+
/* 0x100C */ u8 field_0x100c;
72104
/* 0x100D */ s8 field_0x100d;
73-
/* 0x100E */ u8 field_0x100e[0x1060 - 0x100E];
105+
/* 0x100E */ u8 field_0x100e[1];
106+
/* 0x100F */ s8 field_0x100f;
107+
/* 0x1010 */ u8 field_0x1010[0x102C - 0x1010];
108+
/* 0x102C */ s8 field_0x102c;
109+
/* 0x102D */ s8 field_0x102d;
110+
/* 0x102E */ u8 field_0x102e[0x1060 - 0x102E];
74111
/* 0x1060 */ cXyz mHookPosition;
75112
/* 0x106C */ cXyz field_0x106c;
76113
/* 0x1078 */ cXyz field_0x1078;
77114
/* 0x1084 */ csXyz field_0x1084;
78-
/* 0x108A */ u8 field_0x108a[0x10B4 - 0x108A];
115+
/* 0x108A */ u8 field_0x108a[0x1090 - 0x108A];
116+
/* 0x1090 */ f32 field_0x1090;
117+
/* 0x1094 */ u8 field_0x1094[0x10A4 - 0x1094];
118+
/* 0x10A4 */ s8 field_0x10a4;
119+
/* 0x10A5 */ s8 field_0x10a5;
120+
/* 0x10A6 */ s8 field_0x10a6;
121+
/* 0x10A7 */ s8 field_0x10a7;
122+
/* 0x10A8 */ s8 field_0x10a8;
123+
/* 0x10A9 */ s8 field_0x10a9;
124+
/* 0x10AA */ s8 field_0x10aa;
125+
/* 0x10AB */ u8 field_0x10ab;
126+
/* 0x10AC */ s32 mFishId;
127+
/* 0x10B0 */ s16 field_0x10b0;
128+
/* 0x10B2 */ u8 field_0x10b2[2];
79129
/* 0x10B4 */ Z2Creature field_0x10b4;
80-
/* 0x1144 */ u8 field_0x1144[0x1190 - 0x1144];
130+
/* 0x1144 */ u8 field_0x1144[0x114A - 0x1144];
131+
/* 0x114A */ s16 field_0x114a;
132+
/* 0x114C */ s16 field_0x114c;
133+
/* 0x114E */ u8 field_0x114e[0x1178 - 0x114E];
134+
/* 0x1178 */ u32 field_0x1178;
135+
/* 0x117C */ u8 field_0x117c[0x1190 - 0x117C];
81136
/* 0x1190 */ dBgS_AcchCir field_0x1190;
82137
/* 0x11D0 */ dBgS_ObjAcch field_0x11d0;
83138
/* 0x13A8 */ u8 field_0x13a8[0x13B4 - 0x13A8];
84139
/* 0x13B4 */ s16 field_0x13b4;
85140
/* 0x13B6 */ s16 field_0x13b6;
86-
/* 0x13B8 */ u8 field_0x13b8[0x1474 - 0x13B8];
141+
/* 0x13B8 */ u8 field_0x13b8[0x1408 - 0x13B8];
142+
/* 0x1408 */ f32 field_0x1408;
143+
/* 0x140C */ u8 field_0x140c[0x1410 - 0x140C];
144+
/* 0x1410 */ f32 field_0x1410;
145+
/* 0x1414 */ u8 field_0x1414[0x146D - 0x1414];
146+
/* 0x146D */ s8 field_0x146d;
147+
/* 0x146E */ u8 field_0x146e[0x1474 - 0x146E];
87148
/* 0x1474 */ dMsgFlow_c mMsgFlow;
88-
/* 0x14C0 */ u8 field_0x14c0[0x14C8 - 0x14C0];
149+
/* 0x14C0 */ u8 field_0x14c0[0x14C2 - 0x14C0];
150+
/* 0x14C2 */ s16 field_0x14c2;
151+
/* 0x14C4 */ u8 field_0x14c4[0x14C8 - 0x14C4];
89152
/* 0x14C8 */ f32 mRodStickX;
90153
/* 0x14CC */ f32 mRodStickY;
91-
/* 0x14D0 */ u8 field_0x14d0[0x14F0 - 0x14D0];
92-
/* 0x14F0 */ int field_0x14f0;
93-
/* 0x14F4 */ u8 field_0x14f4[0x1514 - 0x14F4];
154+
/* 0x14D0 */ u8 field_0x14d0[0x14D8 - 0x14D0];
155+
/* 0x14D8 */ f32 field_0x14d8;
156+
/* 0x14DC */ f32 field_0x14dc;
157+
/* 0x14E0 */ u8 field_0x14e0[0x14F0 - 0x14E0];
158+
/* 0x14F0 */ s32 field_0x14f0;
159+
/* 0x14F4 */ u8 field_0x14f4[0x14FC - 0x14F4];
160+
/* 0x14F4 */ s16 field_0x14fc;
161+
/* 0x14F4 */ u8 field_0x14fe[0x1508 - 0x14FE];
162+
/* 0x1508 */ f32 field_0x1508;
163+
/* 0x150C */ u8 field_0x150c[0x1514 - 0x150C];
94164
/* 0x1514 */ u8 field_0x1514;
95-
/* 0x1515 */ u8 field_0x1515[0x1518 - 0x1515];
165+
/* 0x1515 */ u8 field_0x1515;
166+
/* 0x1516 */ u8 field_0x1516[0x1518 - 0x1516];
96167
/* 0x1518 */ dCcD_Stts field_0x1518;
97168
/* 0x1554 */ dCcD_Sph field_0x1554;
98169
/* 0x168C */ u8 field_0x168c;

‎include/d/actor/d_a_player.h‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ class daPy_py_c : public fopAc_ac_c {
475475
ERFLG0_UNK_200000 = 0x200000,
476476
ERFLG0_UNK_100000 = 0x100000,
477477
ERFLG0_UNK_80000 = 0x80000,
478-
ERFLG0_UNK_40000 = 0x40000,
478+
ERFLG0_FISHING_ROD_GET_FISH = 0x40000,
479479
ERFLG0_UNK_20000 = 0x20000,
480480
ERFLG0_UNK_10000 = 0x10000,
481481
ERFLG0_UNK_4000 = 0x4000,
@@ -928,6 +928,7 @@ class daPy_py_c : public fopAc_ac_c {
928928
void onNotAutoJump() { onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); }
929929
void onNotHang() { onEndResetFlg0(ERFLG0_NOT_HANG); }
930930
void onWolfFchainPull() { onEndResetFlg0(ERFLG0_WOLF_FCHAIN_PULL); }
931+
void onFishingRodGetFish() { onEndResetFlg0(ERFLG0_FISHING_ROD_GET_FISH); }
931932
void onShieldBackBone() { onEndResetFlg1(ERFLG1_GANON_FINISH); }
932933
void onWolfEyeKeep() { onEndResetFlg1(ERFLG1_WOLF_EYE_KEEP); }
933934
void onPortalWarpMidnaAtnKeep() { onEndResetFlg2(ERFLG2_PORTAL_WARP_MIDNA_ATN_KEEP); }
@@ -1143,6 +1144,10 @@ class daPy_py_c : public fopAc_ac_c {
11431144
onEndResetFlg2(ERFLG2_UNK_2);
11441145
}
11451146

1147+
void onFishingRelease() {
1148+
this->mEndResetFlg0 |= 0x4000000;
1149+
}
1150+
11461151
static daMidna_c* m_midnaActor;
11471152

11481153
void setGiantPuzzle() { mSpecialMode = SMODE_WOLF_PUZZLE; }

‎include/f_op/f_op_actor_mng.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ dBgS& dComIfG_Bgsp();
106106

107107
class dKy_tevstr_c;
108108
class cBgS_PolyInfo;
109-
typedef int (*heapCallbackFunc)(fopAc_ac_c*);
110109
typedef int (*createFunc)(void*);
110+
typedef int (*heapCallbackFunc)(fopAc_ac_c*);
111111

112112
struct DOUBLE_POS {
113113
double x, y, z;
@@ -219,7 +219,7 @@ inline fopAc_ac_c* fopAcM_Search(fopAcIt_JudgeFunc i_judgeFunc, void* i_process)
219219
}
220220

221221
inline fopAc_ac_c* fopAcM_SearchByID(fpc_ProcID id) {
222-
return (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)fpcSch_JudgeByID, &id);
222+
return (fopAc_ac_c*)fopAcIt_Judge(fpcSch_JudgeByID, &id);
223223
}
224224

225225
inline fpc_ProcID fopAcM_GetLinkId(const fopAc_ac_c* i_actor) {

‎src/d/actor/d_a_alink_canoe.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1249,7 +1249,7 @@ int daAlink_c::procCanoeFishingReel() {
12491249

12501250
setFishGetFace();
12511251

1252-
if (checkEndResetFlg0(ERFLG0_UNK_40000)) {
1252+
if (checkEndResetFlg0(ERFLG0_FISHING_ROD_GET_FISH)) {
12531253
procCanoeFishingGetInit();
12541254
} else if (checkEndResetFlg0(ERFLG0_UNK_20000)) {
12551255
resetUpperAnime(UPPER_2, -1.0f);

0 commit comments

Comments
 (0)