falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_a_e_bee mostly done (#2112)

This commit is contained in:
Caroline Madsen 2024-03-30 13:04:34 -04:00 committed by GitHub
parent 483253ae43
commit 99facf7c94
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 1010 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Progress.md
View File

@ -21,8 +21,8 @@ Total | 53.029643% | 2132148 | 4020672
Section | Percentage | Decompiled (bytes) | Total (bytes)
---|---|---|---
main.dol | 53.029643% | 2132148 | 4020672
RELs | 36.975202% | 4252268 | 11500324
Total | 41.134061% | 6384416 | 15520996
RELs | 37.015931% | 4256952 | 11500324
Total | 41.164240% | 6389100 | 15520996
## RELs
@ -87,7 +87,7 @@ d_a_dshutter | 94.779772% | 4648 | 4904
d_a_e_ai | 28.308171% | 5100 | 18016
d_a_e_arrow | 100.000000% | 12904 | 12904
d_a_e_ba | 28.140394% | 5484 | 19488
d_a_e_bee | 30.316629% | 4864 | 16044
d_a_e_bee | 31.987036% | 5132 | 16044
d_a_e_bg | 27.665091% | 7256 | 26228
d_a_e_bi | 30.767563% | 5676 | 18448
d_a_e_bi_leaf | 100.000000% | 1792 | 1792
@ -398,7 +398,7 @@ d_a_obj_dust | 40.406977% | 2224 | 5504
d_a_obj_eff | 100.000000% | 936 | 936
d_a_obj_enemy_create | 100.000000% | 2828 | 2828
d_a_obj_fallobj | 31.929604% | 2032 | 6364
d_a_obj_fan | 39.173554% | 2844 | 7260
d_a_obj_fan | 100.000000% | 7260 | 7260
d_a_obj_fchain | 30.649490% | 2284 | 7452
d_a_obj_fireWood | 44.125561% | 1968 | 4460
d_a_obj_fireWood2 | 41.290323% | 2304 | 5580
@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244
d_a_warp_bug | 100.000000% | 2024 | 2024
d_a_ykgr | 44.400631% | 2252 | 5072
f_pc_profile_lst | 100.000000% | 28156 | 28156
Total | 36.975202% | 4252268 | 11500324
Total | 37.015931% | 4256952 | 11500324

74
asm/rel/d/a/e/d_a_e_bee/d_a_e_bee/daE_Bee_Draw__FP11e_bee_class.s
View File

@ -1,74 +0,0 @@
lbl_8068289C:
/* 8068289C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 806828A0 7C 08 02 A6 */ mflr r0
/* 806828A4 90 01 00 24 */ stw r0, 0x24(r1)
/* 806828A8 39 61 00 20 */ addi r11, r1, 0x20
/* 806828AC 4B CD F9 29 */ bl _savegpr_27
/* 806828B0 7C 7F 1B 78 */ mr r31, r3
/* 806828B4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 806828B8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 806828BC 38 80 00 00 */ li r4, 0
/* 806828C0 38 BF 04 D0 */ addi r5, r31, 0x4d0
/* 806828C4 38 DF 01 0C */ addi r6, r31, 0x10c
/* 806828C8 4B B2 0E FD */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c
/* 806828CC 3B BF 05 A0 */ addi r29, r31, 0x5a0
/* 806828D0 88 1F 04 E2 */ lbz r0, 0x4e2(r31)
/* 806828D4 7C 00 07 74 */ extsb r0, r0
/* 806828D8 7C 1C 03 78 */ mr r28, r0
/* 806828DC 3B 60 00 00 */ li r27, 0
/* 806828E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 806828E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 806828E8 3B C3 0F 38 */ addi r30, r3, 0xf38
/* 806828EC 48 00 00 94 */ b lbl_80682980
lbl_806828F0:
/* 806828F0 88 1D 00 4C */ lbz r0, 0x4c(r29)
/* 806828F4 7C 00 07 75 */ extsb. r0, r0
/* 806828F8 41 82 00 80 */ beq lbl_80682978
/* 806828FC 88 1D 00 50 */ lbz r0, 0x50(r29)
/* 80682900 28 00 00 00 */ cmplwi r0, 0
/* 80682904 40 82 00 74 */ bne lbl_80682978
/* 80682908 88 1D 00 4E */ lbz r0, 0x4e(r29)
/* 8068290C 7C 00 07 75 */ extsb. r0, r0
/* 80682910 40 82 00 38 */ bne lbl_80682948
/* 80682914 A8 1D 00 48 */ lha r0, 0x48(r29)
/* 80682918 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d
/* 8068291C 41 82 00 18 */ beq lbl_80682934
/* 80682920 7F C3 F3 78 */ mr r3, r30
/* 80682924 80 9D 00 08 */ lwz r4, 8(r29)
/* 80682928 7F 85 E3 78 */ mr r5, r28
/* 8068292C 4B 9A A2 3D */ bl entrySimpleModel__14dComIfG_play_cFP8J3DModeli
/* 80682930 48 00 00 48 */ b lbl_80682978
lbl_80682934:
/* 80682934 7F C3 F3 78 */ mr r3, r30
/* 80682938 80 9D 00 0C */ lwz r4, 0xc(r29)
/* 8068293C 7F 85 E3 78 */ mr r5, r28
/* 80682940 4B 9A A2 29 */ bl entrySimpleModel__14dComIfG_play_cFP8J3DModeli
/* 80682944 48 00 00 34 */ b lbl_80682978
lbl_80682948:
/* 80682948 A8 1D 00 48 */ lha r0, 0x48(r29)
/* 8068294C 54 00 07 FF */ clrlwi. r0, r0, 0x1f
/* 80682950 41 82 00 18 */ beq lbl_80682968
/* 80682954 7F C3 F3 78 */ mr r3, r30
/* 80682958 80 9D 00 00 */ lwz r4, 0(r29)
/* 8068295C 7F 85 E3 78 */ mr r5, r28
/* 80682960 4B 9A A2 09 */ bl entrySimpleModel__14dComIfG_play_cFP8J3DModeli
/* 80682964 48 00 00 14 */ b lbl_80682978
lbl_80682968:
/* 80682968 7F C3 F3 78 */ mr r3, r30
/* 8068296C 80 9D 00 04 */ lwz r4, 4(r29)
/* 80682970 7F 85 E3 78 */ mr r5, r28
/* 80682974 4B 9A A1 F5 */ bl entrySimpleModel__14dComIfG_play_cFP8J3DModeli
lbl_80682978:
/* 80682978 3B 7B 00 01 */ addi r27, r27, 1
/* 8068297C 3B BD 00 74 */ addi r29, r29, 0x74
lbl_80682980:
/* 80682980 80 1F 22 A0 */ lwz r0, 0x22a0(r31)
/* 80682984 7C 1B 00 00 */ cmpw r27, r0
/* 80682988 41 80 FF 68 */ blt lbl_806828F0
/* 8068298C 38 60 00 01 */ li r3, 1
/* 80682990 39 61 00 20 */ addi r11, r1, 0x20
/* 80682994 4B CD F8 8D */ bl _restgpr_27
/* 80682998 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8068299C 7C 08 03 A6 */ mtlr r0
/* 806829A0 38 21 00 20 */ addi r1, r1, 0x20
/* 806829A4 4E 80 00 20 */ blr

6
include/d/a/d_a_player.h
View File

@ -236,7 +236,7 @@ public:
FLG0_MAGNE_BOOTS_ON = 0x1000,
FLG0_PUSH_PULL_KEEP = 0x800,
FLG0_UNK_400 = 0x400,
FLG0_UNK_100 = 0x100,
FLG0_SWIM_UP = 0x100,
FLG0_UNK_80 = 0x80,
FLG0_UNK_40 = 0x40,
FLG0_UNK_20 = 0x20,
@ -346,7 +346,7 @@ public:
ERFLG0_BOSS_ROOM_WAIT = 0x2000000,
ERFLG0_UNK_1000000 = 0x1000000,
ERFLG0_UNK_800000 = 0x800000,
ERFLG0_UNK_400000 = 0x400000,
ERFLG0_BEE_FOLLOW = 0x400000,
ERFLG0_UNK_200000 = 0x200000,
ERFLG0_UNK_100000 = 0x100000,
ERFLG0_UNK_2000 = 0x2000,
@ -741,8 +741,10 @@ public:
bool checkWolfTagLockJumpReady() const { return checkResetFlg0(RFLG0_UNK_20000); }
bool getGrabUpEnd() const { return checkResetFlg0(RFLG0_GRAB_UP_END); }
bool getGrabPutStart() const { return checkResetFlg0(RFLG0_GRAB_PUT_START); }
bool checkSwimUp() const { return checkNoResetFlg0(FLG0_SWIM_UP); }
void onBossRoomWait() { onEndResetFlg0(ERFLG0_BOSS_ROOM_WAIT); }
void onBeeFollow() { onEndResetFlg0(ERFLG0_BEE_FOLLOW); }
void onForceAutoJump() { onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); }
void onNotAutoJump() { onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); }
void onNotHang() { onEndResetFlg0(ERFLG0_NOT_HANG); }

7
include/d/cc/d_cc_uty.h
View File

@ -29,8 +29,13 @@ struct dCcU_AtInfo {
/* 0x20 */ u8 mHitType;
};
fopAc_ac_c* cc_at_check(fopAc_ac_c*,dCcU_AtInfo*);
u16 cc_pl_cut_bit_get();
fopAc_ac_c* cc_at_check(fopAc_ac_c*, dCcU_AtInfo*);
fopAc_ac_c* at_power_check(dCcU_AtInfo* i_AtInfo);
void def_se_set(Z2Creature* p_sound, cCcD_Obj* p_collider, u32 map_info, fopAc_ac_c* p_actor);
inline fopAc_ac_c* dCc_GetAc(void* i_actor) {
return static_cast<fopAc_ac_c*>(i_actor);
}
#endif /* D_CC_D_CC_UTY_H */

79
include/rel/d/a/e/d_a_e_bee/d_a_e_bee.h
View File

@ -1,6 +1,85 @@
#ifndef D_A_E_BEE_H
#define D_A_E_BEE_H
#include "f_op/f_op_actor.h"
#include "SSystem/SComponent/c_phase.h"
#include "Z2AudioLib/Z2Creature.h"
#include "d/cc/d_cc_d.h"
#include "dolphin/types.h"
struct bee_s {
enum Action {
/* 0x0 */ ACT_DEAD,
/* 0x1 */ ACT_FLY,
/* 0x2 */ ACT_FLY_HOME_A,
/* 0x3 */ ACT_FLY_HOME_B,
/* 0x4 */ ACT_FAIL,
/* 0x5 */ ACT_START,
/* 0xA */ ACT_HOME = 10,
};
/* 80685368 */ bee_s() {}
/* 806852FC */ ~bee_s() {}
/* 0x00 */ J3DModel* mpModel1;
/* 0x04 */ J3DModel* mpModel2;
/* 0x08 */ J3DModel* mpModel3;
/* 0x0C */ J3DModel* mpModel4;
/* 0x10 */ cXyz mPos;
/* 0x1C */ cXyz mTarget;
/* 0x28 */ cXyz mSpeed;
/* 0x34 */ csXyz mAngle;
/* 0x3C */ f32 mSpeedF;
/* 0x40 */ f32 mScale;
/* 0x44 */ f32 mStartDistance;
/* 0x48 */ s16 mCounter;
/* 0x4A */ s16 mHomeTimer;
/* 0x4C */ s8 mAction;
/* 0x4D */ s8 mMode;
/* 0x4E */ s8 mIsFlying;
/* 0x4F */ u8 mTimer;
/* 0x50 */ bool mNoDraw;
/* 0x54 */ Z2SoundObjSimple mSound;
};
STATIC_ASSERT(sizeof(bee_s) == 0x74);
class e_bee_class : public fopAc_ac_c {
public:
/* 0x0568 */ request_of_phase_process_class mPhase;
/* 0x0570 */ u8 mParam0;
/* 0x0571 */ u8 mParam1;
/* 0x0572 */ u8 mParam2;
/* 0x0574 */ Z2SoundObjBeeGroup mSound;
/* 0x0594 */ s16 mCounter;
/* 0x0596 */ u8 unused_0x596[4];
/* 0x059A */ s16 mTimers[2];
/* 0x059E */ u8 mCcSetTimer;
/* 0x059F */ u8 mHomeTimer;
/* 0x05A0 */ bee_s mBees[0x40];
/* 0x22A0 */ int mNumBees;
/* 0x22A4 */ u8 unused_0x22a4[0x30];
/* 0x22D4 */ dCcD_Stts mCcStts;
/* 0x2310 */ dCcD_Cyl mCcCyl;
/* 0x244C */ dCcD_Sph mCcSph;
/* 0x2584 */ s16 mBoomerangAngle;
/* 0x2586 */ bool mHIOInit;
/* 0x2587 */ bool mResLoaded;
};
STATIC_ASSERT(sizeof(e_bee_class) == 0x2588);
class daE_Bee_HIO_c {
public:
/* 8068286C */ daE_Bee_HIO_c();
/* 8068539C */ virtual ~daE_Bee_HIO_c() {}
/* 0x4 */ s8 field_0x4;
/* 0x8 */ f32 mScale;
/* 0xC */ bool mDelete;
/* 0xD */ bool mNoKill;
};
STATIC_ASSERT(sizeof(daE_Bee_HIO_c) == 0x10);
#endif /* D_A_E_BEE_H */

1074
rel/d/a/e/d_a_e_bee/d_a_e_bee.cpp
View File

File diff suppressed because it is too large Load Diff

8
src/d/a/d_a_alink.cpp
View File

@ -12732,7 +12732,7 @@ void daAlink_c::playerInit() {
field_0x3184 = -1;
mExitID = 0x3F;
onNoResetFlg0(FLG0_UNK_100);
onNoResetFlg0(FLG0_SWIM_UP);
offOxygenTimer();
int startMode = getStartMode();
@ -15674,7 +15674,7 @@ BOOL daAlink_c::notTalk() {
/* 800B4A08-800B4B2C 0AF348 0124+00 11/11 0/0 0/0 .text setTalkStatus__9daAlink_cFv */
BOOL daAlink_c::setTalkStatus() {
if (checkEndResetFlg0(ERFLG0_UNK_400000) || field_0x27f4 == NULL) {
if (checkEndResetFlg0(ERFLG0_BEE_FOLLOW) || field_0x27f4 == NULL) {
return 0;
}
@ -17481,7 +17481,7 @@ void daAlink_c::posMove() {
cLib_chasePos(&field_0x3750, cXyz::Zero, daAlinkHIO_damSwim_c0::m.field_0x84);
current.pos += field_0x3750;
if (checkNoResetFlg0(FLG0_UNK_100) && mProcID != PROC_SWIM_DIVE) {
if (checkNoResetFlg0(FLG0_SWIM_UP) && mProcID != PROC_SWIM_DIVE) {
current.pos.y = mWaterY;
} else if (mDemo.getDemoType() == 4 || mProcID == PROC_ELEC_DAMAGE ||
dComIfGp_checkPlayerStatus0(0, 0x10))
@ -17658,7 +17658,7 @@ void daAlink_c::posMove() {
}
}
if (checkModeFlg(MODE_SWIMMING) && checkNoResetFlg0(FLG0_UNK_100)) {
if (checkModeFlg(MODE_SWIMMING) && checkNoResetFlg0(FLG0_SWIM_UP)) {
cXyz sp84 = current.pos - field_0x3798;
f32 temp_f3 = sp84.absXZ();

2
src/d/a/d_a_alink_damage.inc
View File

@ -685,7 +685,7 @@ int daAlink_c::procCoSwimFreezeReturnInit() {
return 1;
}
onNoResetFlg0(FLG0_UNK_100);
onNoResetFlg0(FLG0_SWIM_UP);
J3DTransformInfo* transInfo = field_0x2060->getOldFrameTransInfo(0);
f32 var_f31;

2
src/d/a/d_a_alink_hook.inc
View File

@ -1403,7 +1403,7 @@ int daAlink_c::procHookshotMove() {
int daAlink_c::procHookshotFlyInit() {
commonProcInit(PROC_HOOKSHOT_FLY);
if (!checkNoResetFlg0(FLG0_UNK_100)) {
if (!checkNoResetFlg0(FLG0_SWIM_UP)) {
onNoResetFlg0(FLG0_UNDERWATER);
}

34
src/d/a/d_a_alink_swim.inc
View File

@ -10,7 +10,7 @@
/* 80101890-801018E4 0FC1D0 0054+00 6/6 0/0 0/0 .text checkZoraWearMaskDraw__9daAlink_cFv
*/
BOOL daAlink_c::checkZoraWearMaskDraw() {
return checkZoraWearAbility() && !checkNoResetFlg0(FLG0_UNK_100);
return checkZoraWearAbility() && !checkNoResetFlg0(FLG0_SWIM_UP);
}
/* 801018E4-80101934 0FC224 0050+00 1/1 0/0 0/0 .text checkAcceptUseItemInWater__9daAlink_cCFUs */
@ -66,7 +66,7 @@ f32 daAlink_c::getSwimMaxFallSpeed() const {
void daAlink_c::checkOxygenTimer() {
BOOL hide_timer;
if (!checkNoResetFlg0(FLG0_UNK_100) ||
if (!checkNoResetFlg0(FLG0_SWIM_UP) ||
(checkModeFlg(MODE_SWIMMING) && mWaterY > lit_7808 + current.pos.y))
{
hide_timer = false;
@ -234,7 +234,7 @@ int daAlink_c::checkNextActionSwim() {
field_0x3000 = 30;
}
if ((checkZoraWearAbility() && !checkHeavyStateOn(1, 1)) || checkNoResetFlg0(FLG0_UNK_100)) {
if ((checkZoraWearAbility() && !checkHeavyStateOn(1, 1)) || checkNoResetFlg0(FLG0_SWIM_UP)) {
setTalkStatus();
}
@ -242,7 +242,7 @@ int daAlink_c::checkNextActionSwim() {
return 1;
}
if (mAttList != NULL && mAttList->mType == 7 && checkNoResetFlg0(FLG0_UNK_100) &&
if (mAttList != NULL && mAttList->mType == 7 && checkNoResetFlg0(FLG0_SWIM_UP) &&
fopAcM_GetName(field_0x27f4) == PROC_CANOE)
{
setDoStatus(0x17);
@ -284,7 +284,7 @@ asm int daAlink_c::checkSwimUpAction() {
/* 801032C8-80103398 0FDC08 00D0+00 8/8 0/0 0/0 .text swimOutAfter__9daAlink_cFi */
void daAlink_c::swimOutAfter(int param_0) {
onNoResetFlg0(FLG0_UNK_100);
onNoResetFlg0(FLG0_SWIM_UP);
onEndResetFlg1(ERFLG1_UNK_100);
mZ2Link.setInWater(false);
@ -347,7 +347,7 @@ bool daAlink_c::checkUpSwimButtonAccept() {
/* 80103F24-80103F94 0FE864 0070+00 2/2 0/0 0/0 .text checkSwimButtonMove__9daAlink_cFv
*/
BOOL daAlink_c::checkSwimButtonMove() {
return !checkNoResetFlg0(FLG0_UNK_100) &&
return !checkNoResetFlg0(FLG0_SWIM_UP) &&
(checkSwimButtonAccept() || checkUpSwimButtonAccept()) && doButton();
}
@ -359,7 +359,7 @@ BOOL daAlink_c::checkZoraSwimMove() {
/* 80103FE8-80104034 0FE928 004C+00 2/2 0/0 0/0 .text checkSwimNeckUpDown__9daAlink_cCFv
*/
BOOL daAlink_c::checkSwimNeckUpDown() const {
return !checkNoResetFlg0(FLG0_UNK_100) && checkUnderMove0BckNoArc(ANM_SWIM_WAIT);
return !checkNoResetFlg0(FLG0_SWIM_UP) && checkUnderMove0BckNoArc(ANM_SWIM_WAIT);
}
/* 80104034-801040F8 0FE974 00C4+00 3/3 0/0 0/0 .text setSwimUpDownOffset__9daAlink_cFv
@ -392,7 +392,7 @@ int daAlink_c::procSwimUpInit() {
speed.y = FLOAT_LABEL(lit_6108);
current.pos.y = mWaterY;
field_0x3080 = 0;
onNoResetFlg0(FLG0_UNK_100);
onNoResetFlg0(FLG0_SWIM_UP);
mZ2Link.setInWater(false);
setSingleAnimeParam(ANM_SWIM_RESURFACE, &daAlinkHIO_swim_c0::m.mResurfaceAnm);
dComIfGp_setPlayerStatus0(0, 0x100000);
@ -477,7 +477,7 @@ int daAlink_c::procSwimWaitInit(int param_0) {
dComIfGp_setPlayerStatus0(0, 0x100000);
if (checkNoResetFlg0(FLG0_UNK_100)) {
if (checkNoResetFlg0(FLG0_SWIM_UP)) {
current.pos.y = mWaterY;
speed.y = FLOAT_LABEL(lit_6108);
}
@ -573,7 +573,7 @@ int daAlink_c::procSwimMoveInit() {
field_0x2f98 = 5;
setSwimMoveAnime();
if (checkNoResetFlg0(FLG0_UNK_100)) {
if (checkNoResetFlg0(FLG0_SWIM_UP)) {
current.pos.y = mWaterY;
speed.y = FLOAT_LABEL(lit_6108);
}
@ -631,7 +631,7 @@ int daAlink_c::procSwimDiveInit() {
setSpecialGravity(0.0f, maxFallSpeed, 0);
speed.y = 0.0f;
if (checkNoResetFlg0(FLG0_UNK_100)) {
if (checkNoResetFlg0(FLG0_SWIM_UP)) {
mProcVar2.field_0x300c = 1;
setSingleAnimeParam(ANM_SWIM_DIVE, &daAlinkHIO_swim_c0::m.mDiveAnm);
voiceStart(Z2SE_AL_V_DIVING);
@ -670,8 +670,8 @@ int daAlink_c::procSwimDive() {
if (mProcVar2.field_0x300c == 0) {
setDoStatus(0x4C);
} else if (checkNoResetFlg0(FLG0_UNK_100) && frame_ctrl->getFrame() > 20.0f) {
offNoResetFlg0(FLG0_UNK_100);
} else if (checkNoResetFlg0(FLG0_SWIM_UP) && frame_ctrl->getFrame() > 20.0f) {
offNoResetFlg0(FLG0_SWIM_UP);
mZ2Link.setInWater(true);
}
@ -740,7 +740,7 @@ int daAlink_c::procSwimHookshotSubjectInit() {
field_0x3080 = 0;
}
if (checkNoResetFlg0(FLG0_UNK_100)) {
if (checkNoResetFlg0(FLG0_SWIM_UP)) {
current.pos.y = mWaterY;
speed.y = FLOAT_LABEL(lit_6108);
}
@ -815,7 +815,7 @@ int daAlink_c::procSwimHookshotMoveInit() {
setSwimMoveAnime();
}
if (checkNoResetFlg0(FLG0_UNK_100)) {
if (checkNoResetFlg0(FLG0_SWIM_UP)) {
current.pos.y = mWaterY;
speed.y = FLOAT_LABEL(lit_6108);
}
@ -898,7 +898,7 @@ int daAlink_c::procSwimDamageInit(dCcD_GObjInf* param_0) {
dComIfGp_getVibration().StartShock(2, 31, cXyz(0.0f, 1.0f, 0.0f));
BOOL bvar4 =
checkNoResetFlg0(FLG0_UNK_100) || ((param_0 != NULL && param_0->GetTgHitAc() != NULL) &&
checkNoResetFlg0(FLG0_SWIM_UP) || ((param_0 != NULL && param_0->GetTgHitAc() != NULL) &&
fopAcM_GetName(param_0->GetTgHitAc()) == PROC_E_SG);
if (!getZoraSwim() && bvar4 && mProcID != PROC_SWIM_WAIT) {
@ -1057,7 +1057,7 @@ int daAlink_c::procOctaIealSpitInit() {
}
field_0x3588 = l_waitBaseAnime;
offNoResetFlg0(FLG0_UNK_100);
offNoResetFlg0(FLG0_SWIM_UP);
current.angle.y = field_0x2ffe;
if (mNormalSpeed > 0.0f) {

4
src/d/a/d_a_alink_wolf.inc
View File

@ -5207,7 +5207,7 @@ int daAlink_c::procWolfSwimUpInit() {
commonProcInit(PROC_WOLF_SWIM_UP);
speed.y = FLOAT_LABEL(lit_6108);
current.pos.y = mWaterY;
onNoResetFlg0(FLG0_UNK_100);
onNoResetFlg0(FLG0_SWIM_UP);
mZ2Link.setInWater(false);
setSingleAnimeWolfParam(WANM_SWIM_RESURFACE, &daAlinkHIO_wlSwim_c0::m.field_0x0);
@ -5325,7 +5325,7 @@ int daAlink_c::procWolfSwimMoveInit() {
setSingleAnimeWolfBaseSpeed(WANM_SWIM, getWolfSwimMoveAnmSpeed(),
daAlinkHIO_wlSwim_c0::m.field_0x78);
if (checkNoResetFlg0(FLG0_UNK_100)) {
if (checkNoResetFlg0(FLG0_SWIM_UP)) {
current.pos.y = mWaterY;
speed.y = FLOAT_LABEL(lit_6108);
}