e_arrow OK (#2072)

* e_arrow done

* remove asm
This commit is contained in:
TakaRikka
2024-02-15 23:51:12 -08:00
committed by GitHub
parent 9bc604134e
commit 0e05af5226
30 changed files with 791 additions and 3287 deletions
+2
View File
@@ -413,6 +413,7 @@ public:
RFLG0_UNK_10 = 0x10,
RFLG0_UNK_8 = 0x8,
RFLG0_UNK_2 = 0x2,
RFLG0_UNK_1 = 0x1,
};
enum daPy_RFLG1 {
@@ -761,6 +762,7 @@ public:
void onShieldBackBone() { i_onEndResetFlg1(ERFLG1_GANON_FINISH); }
void onWolfEyeKeep() { i_onEndResetFlg1(ERFLG1_WOLF_EYE_KEEP); }
void onFogFade() { i_onNoResetFlg2(FLG2_UNK_4000); }
BOOL checkStickArrowReset() const { return i_checkResetFlg0(RFLG0_UNK_1); }
void offCargoCarry() {
if (checkCargoCarry()) {
+8 -4
View File
@@ -41,12 +41,16 @@ public:
bool checkWaterBomb(fopAc_ac_c*);
bool checkInsectBombMove(fopAc_ac_c*);
static fopAc_ac_c* createNormalBombPlayer(cXyz* p_pos) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 8, p_pos, -1, NULL, NULL, -1, NULL, NULL);
static fopAc_ac_c* createNormalBombPlayer(cXyz* i_pos) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 8, i_pos, -1, NULL, NULL, -1, NULL, NULL);
}
static fopAc_ac_c* createWaterBombPlayer(cXyz* p_pos) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 9, p_pos, -1, NULL, NULL, -1, NULL, NULL);
static fopAc_ac_c* createNormalBombExplode(cXyz* i_pos) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 0, i_pos, -1, NULL, NULL, -1, NULL, NULL);
}
static fopAc_ac_c* createWaterBombPlayer(cXyz* i_pos) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 9, i_pos, -1, NULL, NULL, -1, NULL, NULL);
}
static fopAc_ac_c* createFlowerBomb(cXyz* i_pos, csXyz* i_angle, int param_2) {