encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

tbox/camera/d_bg_w_kcol work and cleanup (#2262)

Browse Source 
* some camera/tbox cleanup

* d_bg_w_kcol work

* make item name enum better
This commit is contained in:
TakaRikka
2024-12-10 18:46:19 +02:00
committed by GitHub
parent 3fa6b50e6a
commit 8d73439554
100 changed files with 4161 additions and 3958 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_alink.h
+6 -6
View File
@@ -1321,7 +1321,7 @@ public:
/* 800D0CDC */ virtual ~hsChainShape_c();
}; // Size: 0x10
/* 8009D87C */ bool getE3Zhint();
/* 8009D87C */ static BOOL getE3Zhint();
/* 8009D884 */ static const char* getAlinkArcName();
/* 8009DA60 */ static bool checkStageName(char const*);
/* 8009DA98 */ void tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*);
@@ -3215,10 +3215,10 @@ public:
return checkHookshotReadyAnime() || checkHookshotShootAnime();
}
BOOL checkBoomerangReadyAnime() const {
return (mEquipItem == BOOMERANG || mEquipItem == noentry71) && checkUpperAnime(0x54);
return (mEquipItem == fpcNm_ITEM_BOOMERANG || mEquipItem == 0x102) && checkUpperAnime(0x54);
}
bool checkDkCaught2Anime() const { return checkUpperAnime(0x262); }
BOOL checkCopyRodThrowAnime() const { return mEquipItem == COPY_ROD && checkUpperAnime(0x53); }
BOOL checkCopyRodThrowAnime() const { return mEquipItem == fpcNm_ITEM_COPY_ROD && checkUpperAnime(0x53); }
BOOL checkCutDashChargeAnime() const { return checkUpperAnime(0x83); }
BOOL checkBoomerangAnimeAndReturnWait() const { return checkBoomerangAnime(); }
BOOL checkTwoHandItemEquipAnime() const { return checkUpperAnime(0x245); }
@@ -3249,7 +3249,7 @@ public:
bool checkIronBallSwingAnime() const { return checkUpperAnime(0x19B); }
bool checkDashDamageAnime() const { return checkUpperAnime(0xAD); }
bool checkBoomerangCatchAnime() const { return checkUpperAnime(0x52); }
BOOL checkCopyRodReadyAnime() const { return mEquipItem == COPY_ROD && checkUpperAnime(0x54); }
BOOL checkCopyRodReadyAnime() const { return mEquipItem == fpcNm_ITEM_COPY_ROD && checkUpperAnime(0x54); }
BOOL checkCanoeFishingWaitAnime() const { return checkUpperAnime(0x5D) || checkUpperAnime(0x260); }
BOOL checkCopyRodControllAnime() const { return checkUpperAnime(0x202); }
BOOL checkWolfHeadDamageAnime() const { return checkUpperAnime(0x2A7); }
@@ -3262,7 +3262,7 @@ public:
bool swordButton() { return itemButtonCheck(8); }
daPy_actorKeep_c* getThrowBoomerangAcKeep() { return &mThrowBoomerangAcKeep; }
s32 getStartRoomNo() { return fopAcM_GetParam(this) & 0x3F; }
bool checkFisingRodLure() const { return mEquipItem == noentry73; }
bool checkFisingRodLure() const { return mEquipItem == 0x105; }
BOOL doTrigger() const { return mItemTrigger & BTN_A; }
bool swordTrigger() { return itemTriggerCheck(BTN_B); }
BOOL grassCancelTrigger() { return itemTriggerCheck(BTN_B); }
@@ -3439,7 +3439,7 @@ public:
void setGrassCancelStatus(u8 param_0) { setBStatus(param_0); }
void seStartSystem(u32 i_seID) { mDoAud_seStart(i_seID, NULL, 0, 0); }
bool checkIronBallEquip() const { return mEquipItem == IRONBALL; }
bool checkIronBallEquip() const { return mEquipItem == fpcNm_ITEM_IRONBALL; }
f32 getAnmSpeedStickRate(f32 param_0, f32 param_1) const {
return param_0 + (field_0x33a8 * (param_1 - param_0));
include/d/actor/d_a_midna.h
+1 -1
View File
@@ -363,7 +363,7 @@ public:
void resetRatBody() {}
bool checkFlyWaitAnime() {
bool checkFlyWaitAnime() const {
return mBckHeap[0].getIdx() == 0x1CB || mBckHeap[0].getIdx() == 0x1C7
|| mBckHeap[0].getIdx() == 0x1C8 || mBckHeap[0].getIdx() == 0x1C9;
}
include/d/actor/d_a_player.h
+97 -1
View File
@@ -140,7 +140,103 @@ class daBoomerang_c;
class daPy_demo_c {
public:
enum {
DEMO_LAST_e = 0x5F,
DEMO_UNK_0_e,
DEMO_UNK_1_e,
DEMO_UNK_2_e,
DEMO_UNK_3_e,
DEMO_UNK_4_e,
DEMO_WAIT_TURN_e,
DEMO_UNK_6_e,
DEMO_UNK_7_e,
DEMO_UNK_8_e,
DEMO_UNK_9_e,
DEMO_OPEN_TREASURE_e,
DEMO_GET_ITEM_e,
DEMO_UNEQUIP_e,
DEMO_GRAB_PUT_e,
DEMO_UNK_14_e,
DEMO_UNK_15_e,
DEMO_UNK_16_e,
DEMO_UNK_17_e,
DEMO_UNK_18_e,
DEMO_MONKEY_MOVE_e,
DEMO_LOOK_AROUND_e,
DEMO_UNK_21_e,
DEMO_UNK_22_e,
DEMO_UNK_23_e,
DEMO_UNK_24_e,
DEMO_TURN_BACK_e,
DEMO_UNK_26_e,
DEMO_UNK_27_e,
DEMO_BOOMERANG_CATCH_e,
DEMO_HAWK_CATCH_e,
DEMO_SWORD_UNEQUIP_SP_e,
DEMO_UNK_31_e,
DEMO_PUSH_PULL_WAIT_e,
DEMO_PUSH_MOVE_e,
DEMO_BOSS_ATN_WAIT_e,
DEMO_DOOR_OPEN_e,
DEMO_UNK_36_e,
DEMO_TRADE_ITEM_OUT_e,
DEMO_UNK_38_e,
DEMO_KANDELAAR_SWING_e,
DEMO_FRONT_ROLL_e,
DEMO_CROUCH_e,
DEMO_UNK_42_e,
DEMO_UNK_43_e,
DEMO_UNK_44_e,
DEMO_UNK_45_e,
DEMO_CAUGHT_e,
DEMO_LOOK_UP_e,
DEMO_LOOK_UP_TO_GET_ITEM_e,
DEMO_HAND_PAT_e,
DEMO_WOLF_MIDNA_RIDE_SHOCK_e,
DEMO_SUMOU_SHIKO_e,
DEMO_FOG_DEAD_e,
DEMO_WOLF_SMELL_WAIT_e,
DEMO_UNK_54_e,
DEMO_UNK_55_e,
DEMO_WOLF_CARGO_CARRY_e,
DEMO_METAMORPHOSE_UNK1_e,
DEMO_METAMORPHOSE_UNK2_e,
DEMO_HORSE_GET_KEY_e,
DEMO_NOD_e,
DEMO_GLARE_e,
DEMO_EYE_AWAY_e,
DEMO_GOAT_STOP_READY_e,
DEMO_GET_READY_SIT_e,
DEMO_UNK_65_e,
DEMO_TWGATE_e,
DEMO_FM_CHAIN_STRONG_PULL_e,
DEMO_WOLF_SNOW_ESCAPE_e,
DEMO_ZORA_MOVE_e,
DEMO_METAMORPHOSE_ONLY_UNK1_e,
DEMO_METAMORPHOSE_ONLY_UNK2_e,
DEMO_LOOK_AROUND_TURN_e,
DEMO_UNK_73_e,
DEMO_QUAKE_INIT_e,
DEMO_GUARD_ATTACK_e,
DEMO_SWORD_READY_e,
DEMO_DUNGEON_WARP_e,
DEMO_DUNGEON_WARP_SCENE_START_e,
DEMO_MASTER_SWORD_STICK_e,
DEMO_MASTER_SWORD_PULL_e,
DEMO_CUT_DOWN_e,
DEMO_UNK_82_e,
DEMO_CUT_HEAD_e,
DEMO_UNK_84_e,
DEMO_UNK_85_e,
DEMO_CUT_LARGE_JUMP_e,
DEMO_CUT_FAST_READY_e,
DEMO_COPY_ROD_REVIVE_e,
DEMO_SWORD_PUSH_e,
DEMO_GANON_FINISH_e,
DEMO_UNK_91_e,
DEMO_UNK_92_e,
DEMO_HORSE_LOOK_DOWN_e,
DEMO_UNK_94_e,
DEMO_LAST_e,
DEMO_NEW_ANM0_e = 0x200,
};
include/d/actor/d_a_tag_lantern.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
BOOL rt = false;
if (fopAcM_searchPlayerDistanceXZ(this) < scale.x && 0.0f <= var_f31 && var_f31 < scale.y) {
rt = dComIfGp_checkItemGet(KANTERA, 1) && dComIfGs_getOil() != 0;
rt = dComIfGp_checkItemGet(fpcNm_ITEM_KANTERA, 1) && dComIfGs_getOil() != 0;
field_0x5f8 = rt == true ? 0 : 1;
} else {
rt = true;
include/d/actor/d_a_tbox.h
+2 -2
View File
@@ -143,7 +143,7 @@ public:
void action() { (this->*mpActionFn)(); }
private:
/* 0x718 */ bool field_0x718;
/* 0x718 */ u8 field_0x718;
/* 0x71C */ request_of_phase_process_class mPhase;
/* 0x724 */ J3DModel* mpModel;
/* 0x728 */ J3DModel* mpSlimeModel;
@@ -151,7 +151,7 @@ private:
/* 0x730 */ J3DModel* mpEffectModel;
/* 0x734 */ mDoExt_brkAnm* mpEffectAnm;
/* 0x738 */ dBgW* mpOpenBgW;
/* 0x73C */ dBgW* mpBgCollider;
/* 0x73C */ dBgW* mpBgCollision;
/* 0x740 */ daTbox_actionFn mpActionFn;
/* 0x74C */ int mStaffId;
/* 0x750 */ f32 field_0x750;