Skip to content

Commit bd57a0e

Browse files
committed
d_a_e_ym 99% decompiled. All done except for 2 functions with regalloc issues. Cleanup of mSound funcs in d_a_e_ym.
1 parent dfc813a commit bd57a0e

File tree

3 files changed

+435
-176
lines changed

3 files changed

+435
-176
lines changed

include/d/actor/d_a_e_ym.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ class daE_YM_c : public fopEn_enemy_c {
127127
/* 80813EA4 */ u8 checkBeforeBg(s16);
128128
/* 808143A0 */ u8 checkBeforeGround();
129129
/* 808144D8 */ void checkInitialWall();
130-
/* 80814758 */ void checkWall();
130+
/* 80814758 */ u8 checkWall();
131131
/* 80814AF0 */ void setHideType();
132132
/* 80814BA4 */ int create();
133133

@@ -206,7 +206,7 @@ class daE_YM_c : public fopEn_enemy_c {
206206
/* 0x710 */ s16 field_0x710;
207207
/* 0x712 */ u8 field_0x712[0x714 - 0x712];
208208
/* 0x714 */ int field_0x714;
209-
/* 0x718 */ int field_0x718;
209+
/* 0x718 */ u32 field_0x718;
210210
/* 0x71C */ u8 field_0x71c;
211211
/* 0x71D */ u8 field_0x71d;
212212
/* 0x71E */ u8 field_0x71E[0x720 - 0x71E];

include/d/d_cc_d.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ class dCcD_GObjTg : public dCcD_GAtTgCoCommonBase {
244244
s16* GetShieldFrontRangeYAngle() { return mShieldFrontRangeYAngle; }
245245
s16 GetShieldRange() { return mShieldRange; }
246246
u8 GetSpl() { return mSpl; }
247+
void SetSpl(u8 tg_spl) { mSpl = tg_spl; }
247248
u8 GetHitMark() { return mHitMark; }
248249
void SetRVec(cXyz& vec) { mRVec = vec; }
249250
cXyz* GetVecP() { return &mVec; }
@@ -380,6 +381,7 @@ class dCcD_GObjInf : public cCcD_GObjInf {
380381
bool ChkTgHookShotNoHitMark() { return mGObjTg.ChkSPrm(0x400); }
381382
bool ChkTgArrowNoHitMark() { return mGObjTg.ChkSPrm(0x1000); }
382383
dCcG_Tg_Spl GetTgSpl() { return (dCcG_Tg_Spl)mGObjTg.GetSpl(); }
384+
void SetTgSpl(u8 tg_spl) { mGObjTg.SetSpl(tg_spl); }
383385
int GetTgHitMark() { return mGObjTg.GetHitMark(); }
384386
int GetAtHitMark() { return mGObjAt.GetHitMark(); }
385387
bool ChkAtEffCounter() { return mGObjAt.ChkEffCounter(); }

0 commit comments

Comments
 (0)