kytag8 done, kytag12/13 almost (#2146)

* kytag08 done

* kytag13 almost, cleanup other kytags

* dakytag12 mostly done

* remove asm

* kytag10 done

* kytag01 done

* kytag0 done

* kytag04 done
This commit is contained in:
TakaRikka
2024-05-05 19:34:37 +03:00
committed by GitHub
parent 5d87d0cfa2
commit c36da6a366
56 changed files with 2463 additions and 6307 deletions
+1
View File
@@ -829,6 +829,7 @@ public:
void offPlayerShadowNoDraw() { offNoResetFlg2(FLG2_PLAYER_SHADOW); }
void onLightSwordGetEffect() { onEndResetFlg2(ERFLG2_UNK_10); }
void onForceGameOver() { onNoResetFlg2(FLG2_FORCE_GAMEOVER); }
void onForceWolfChange() { onEndResetFlg0(ERFLG0_UNK_2); }
u32 checkBoarSingleBattle() const { return checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); }
u32 checkWolfDashAutoJump() const { return checkNoResetFlg2(FLG2_WOLF_DASH_AUTO_JUMP); }
+5
View File
@@ -385,6 +385,7 @@ public:
s16 getItemPachinkoNumCount() { return mItemPachinkoNumCount; }
void clearItemPachinkoNumCount() { mItemPachinkoNumCount = 0; }
u8 getNeedLightDropNum() { return mNeedLightDropNum; }
void setNeedLightDropNum(u8 i_num) { mNeedLightDropNum = i_num; }
u8 getWolfAbility(int i_idx) { return mWolfAbility[i_idx]; }
const char* getStartStageName() { return mStartStage.getName(); }
@@ -2698,6 +2699,10 @@ inline u8 dComIfGp_getNeedLightDropNum() {
return g_dComIfG_gameInfo.play.getNeedLightDropNum();
}
inline void dComIfGp_setNeedLightDropNum(u8 i_num) {
g_dComIfG_gameInfo.play.setNeedLightDropNum(i_num);
}
inline void dComIfGp_setItemNowOil(s32 oil) {
g_dComIfG_gameInfo.play.setItemNowOil(oil);
}
+13 -2
View File
@@ -32,6 +32,9 @@ void dKyw_get_AllWind_vec(cXyz* i_position, cXyz* i_direction, f32* i_power);
void dKyw_pntwind_cut(WIND_INFLUENCE* i_pntwind);
cXyz dKyw_pntwind_get_vecpow(cXyz* param_0);
void dKyw_pntwind_set(WIND_INFLUENCE* i_pntwind);
void dKyw_pntlight_collision_get_info(cXyz* param_0, cXyz* param_1, f32* param_2);
void dKyw_plight_collision_set(cXyz* param_0, s16 param_1, s16 param_2, f32 param_3, f32 param_4,
f32 param_5, f32 param_6, f32 param_7);
class dKankyo_sun_Packet : public J3DPacket {
public:
@@ -308,11 +311,19 @@ struct EF_EVIL_EFF {
/* 8005706C */ ~EF_EVIL_EFF();
/* 800570A8 */ EF_EVIL_EFF();
/* 0x00 */ u8 mStatus;
/* 0x00 */ s8 mStatus;
/* 0x04 */ cXyz mPosition;
/* 0x10 */ cXyz mBasePos;
/* 0x1C */ csXyz field_0x1c;
/* 0x22 */ u8 field_0x22[0x22];
/* 0x24 */ f32 field_0x24;
/* 0x28 */ f32 field_0x28;
/* 0x2C */ f32 field_0x2c;
/* 0x30 */ u8 field_0x30[0x38 - 0x30];
/* 0x38 */ f32 field_0x38;
/* 0x3C */ u16 field_0x3c;
/* 0x3E */ u16 field_0x3e;
/* 0x40 */ u16 field_0x40;
/* 0x42 */ u16 field_0x42;
}; // Size: 0x44
class dKankyo_evil_Packet : public J3DPacket {
+1
View File
@@ -100,6 +100,7 @@ void OSReportInit(void);
#define ASSERT(cond) ((cond) || (OSPanic(__FILE__, line, "Failed assertion " #cond), 0))
#else
#define OS_REPORT(...)
#define OS_WARNING(...)
#define OS_REPORT_ERROR(...)
#define OS_PANIC(...)
#define ASSERTMSG(exp, msg) ((void)0)
+4
View File
@@ -234,4 +234,8 @@ inline void mDoAud_setHyrulSewerOpen(bool i_close) {
g_mEnvSeMgr.setHyrulSewerOpen(i_close);
}
inline void mDoAud_startFogSe() {
g_mEnvSeMgr.startFogSe();
}
#endif /* M_DO_M_DO_AUDIO_H */
@@ -1,6 +1,22 @@
#ifndef D_A_KYTAG01_H
#define D_A_KYTAG01_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class kytag01_class : public fopAc_ac_c {
public:
/* 0x568 */ u8 field_0x568[0x588 - 0x568];
/* 0x588 */ f32 mNamiInnerRange;
/* 0x58C */ f32 mNamiOuterRange;
/* 0x590 */ f32 mNamiSize;
/* 0x594 */ f32 field_0x594;
/* 0x598 */ u8 mSwNo1;
/* 0x599 */ u8 mSwNo2;
/* 0x59A */ u8 field_0x59A[0x59C - 0x59A];
/* 0x59C */ u8 field_0x59c;
/* 0x59D */ u8 field_0x59d;
/* 0x59E */ u8 field_0x59e;
/* 0x59F */ u8 mStartPoint;
};
#endif /* D_A_KYTAG01_H */
@@ -1,13 +1,14 @@
#ifndef D_A_KYTAG04_H
#define D_A_KYTAG04_H
#include "f_op/f_op_actor_mng.h"
class kytag04_class : public fopAc_ac_c {
public:
/* 0x568 */ J3DModel* mpModel;
/* 0x56C */ mDoExt_btkAnm mBtk;
/* 0x584 */ mDoExt_brkAnm mBrk;
/* 0x59C */ request_of_phase_process_class mPhaseReq;
/* 0x59C */ request_of_phase_process_class mPhase;
/* 0x5A4 */ JPABaseEmitter* field_0x5a4;
/* 0x5A8 */ JPABaseEmitter* field_0x5a8;
/* 0x5AC */ JPABaseEmitter* field_0x5ac;
@@ -15,7 +16,7 @@ public:
/* 0x5B4 */ u8 field_0x5b4;
/* 0x5B5 */ u8 field_0x5b5;
/* 0x5B6 */ u8 field_0x5b6;
/* 0x5B7 */ u8 field_0x5b7;
/* 0x5B7 */ s8 field_0x5b7;
/* 0x5B8 */ u8 field_0x5b8;
/* 0x5B9 */ u8 field_0x5b9;
/* 0x5BC */ u32 mExitID;
@@ -11,11 +11,11 @@ public:
/* 0x59C */ JPABaseEmitter* mpEmitter1;
/* 0x5A0 */ JPABaseEmitter* mpEmitter2;
/* 0x5A4 */ request_of_phase_process_class mPhase;
/* 0x5AC */ cXyz field_0x5ac;
/* 0x5B8 */ cXyz field_0x5b8;
/* 0x5C4 */ cXyz field_0x5c4;
/* 0x5D0 */ f32 field_0x5d0;
/* 0x5D4 */ int field_0x5d4;
/* 0x5AC */ cXyz mSize;
/* 0x5B8 */ cXyz mAvoidPos;
/* 0x5C4 */ cXyz mTargetAvoidPos;
/* 0x5D0 */ f32 mSizeScale;
/* 0x5D4 */ int mSizeTimer;
/* 0x5D8 */ u8 field_0x5d8;
};
@@ -7,10 +7,10 @@ class kytag16_class : public fopAc_ac_c {
public:
/* 0x568 */ f32 field_0x568;
/* 0x56C */ u8 field_0x56c;
/* 0x56D */ GXColor field_0x56d;
/* 0x56D */ GXColor mColor;
/* 0x571 */ u8 field_0x571;
/* 0x572 */ u8 field_0x572;
/* 0x573 */ u8 field_0x573;
/* 0x573 */ u8 mSwitch;
/* 0x574 */ f32 field_0x574;
/* 0x578 */ f32 field_0x578;
/* 0x57C */ f32 field_0x57c;