mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-09 04:30:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_e_bee mostly done (#2112)

Browse Source
This commit is contained in:
Caroline Madsen
2024-03-30 13:04:34 -04:00
committed by GitHub
parent 4de657439d
commit fcc2137da5
11 changed files with 1010 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/d_a_player.h
+4 -2
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); }
include/d/cc/d_cc_uty.h
+6 -1
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 */