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 09:34:37 -07:00
committed by GitHub
parent 5d87d0cfa2
commit c36da6a366
56 changed files with 2464 additions and 6308 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 {