mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-06 19:01:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

move more of d_save / d_com_inf_game (#141)

Browse Source 
* some d_save matches / fixes

* more d_save cleanup

* fopAc_ac_c changes

* move a bunch of d_save / d_com_inf_game stuff

* format + remove asm

* move bit labels to correct header

* format

* move d_item

* fix check_itemno doc

* move

* fixes

* getLayerNo_common_common almost matching

just regalloc issues

* small fixes

* few more matches

* fix
This commit is contained in:
TakaRikka
2021-08-23 13:47:18 -07:00
committed by GitHub
parent f6df420a61
commit e14b04c54a
422 changed files with 4869 additions and 14588 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/d_a_alink.h
+6 -5
View File
@@ -545,7 +545,7 @@ public:
/* 800BB084 */ void getBodyAngleXAtnActor(int);
/* 800BB2B0 */ void setBodyAngleXReadyAnime(int);
/* 800BB324 */ void setMagicArmorBrk(int);
/* 800BB408 */ void checkMagicArmorHeavy() const;
/* 800BB408 */ BOOL checkMagicArmorHeavy() const;
/* 800BB4B8 */ void checkHeavyStateOn(int, int);
/* 800BB644 */ void initGravity();
/* 800BB770 */ void setSpecialGravity(f32, f32, int);
@@ -577,7 +577,7 @@ public:
/* 800BF9F0 */ void setItemActor();
/* 800BFD74 */ void makeItemType();
/* 800BFDB0 */ void checkZoraWearAbility() const;
/* 800BFDFC */ void checkMagicArmorWearAbility() const;
/* 800BFDFC */ BOOL checkMagicArmorWearAbility() const;
/* 800BFE48 */ void loadAramBmd(u16, u32);
/* 800BFF04 */ void loadAram(u16, u32);
/* 800BFF70 */ void loadAramItemBrk(u16, J3DModel*);
@@ -2156,7 +2156,7 @@ public:
virtual bool getSwordChangeWaitTimer(void) const;
virtual bool checkMetamorphose(void) const;
virtual bool checkWolfDownAttackPullOut(void) const;
virtual bool checkBootsOrArmorHeavy(void) const;
virtual BOOL checkBootsOrArmorHeavy(void) const;
virtual s32 getBottleOpenAppearItem(void) const;
virtual bool checkItemSwordEquip(void) const;
virtual float getSinkShapeOffset(void) const;
@@ -2171,6 +2171,7 @@ public:
// inlined version of checkModeFlg
u32 i_checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; }
bool checkUpperAnime(u16 pIdx) const { return mUpperAnime[UPPER_NOW].getIdx() == pIdx; }
bool checkIronBallWaitAnime() const { return checkUpperAnime(0x19C); }
static u8 const m_mainBckShield[80];
static u8 const m_mainBckSword[20];
@@ -2909,7 +2910,7 @@ public:
private:
/* 0x0000 */ fopAc_ac_c mActor;
/* 0x0570 */ u8 field_0x570[0xCE4];
/* 0x0568 */ u8 field_0x568[0xCEC];
/* 0x1254 */ daPy_actorKeep_c mZeldaActorKeep;
};
@@ -2932,7 +2933,7 @@ public:
private:
/* 0x0000 */ fopAc_ac_c mActor;
/* 0x0570 */ u8 field_0x570[0x324];
/* 0x0568 */ u8 field_0x568[0x32C];
/* 0x0894 */ u32 mStateFlg1;
/* 0x0898 */ u32 mEndResetStateFlg0;
};
include/d/a/d_a_itembase.h
+20
View File
@@ -36,6 +36,26 @@ public:
static u8 const m_data[56];
private:
#ifdef NONMATCHING
/* 0x568 */ void* field_0x568;
/* 0x56C */ request_of_phase_process_class* field_0x56c;
/* 0x570 */ u8 field_0x578[4];
/* 0x574 */ J3DModel* field_0x574;
/* 0x578 */ mDoExt_btkAnm* field_0x578;
/* 0x57C */ mDoExt_bpkAnm* field_0x57c;
/* 0x580 */ mDoExt_brkAnm* field_0x580;
/* 0x584 */ mDoExt_bckAnm* field_0x584;
/* 0x588 */ mDoExt_btpAnm* field_0x588;
/* 0x58C */ dBgS_ObjAcch field_0x58c;
/* 0x764 */ dBgS_AcchCir field_0x764;
/* 0x7A4 */ dCcD_Stts field_0x7a4;
/* 0x7E0 */ dCcD_Cyl field_0x7e0;
/* 0x91C */ u32 field_0x91c;
/* 0x920 */ u8 field_0x920[0xA];
/* 0x92A */ u8 m_itemNo;
/* 0x92B */ u8 field_0x92b;
#endif
u8 unk0[0x92a];
u8 mItemNo;
u8 unk2347;
include/d/a/d_a_player.h
+4
View File
@@ -126,6 +126,7 @@ private:
class daPy_py_c : public fopAc_ac_c {
public:
/* 0x0568 */ u8 field_0x568[8];
/* 0x0570 */ int mNoResetFlg0;
/* 0x0574 */ int mNoResetFlg1;
/* 0x0578 */ int mNoResetFlg2;
@@ -399,8 +400,11 @@ public:
int i_checkNoResetFlg1(daPy_FLG1 pFlag) const { return mNoResetFlg1 & pFlag; }
int i_checkNoResetFlg2(daPy_FLG2 pFlag) const { return mNoResetFlg2 & pFlag; }
void i_onNoResetFlg0(int pFlg) { mNoResetFlg0 |= pFlg; }
void i_onNoResetFlg3(int pFlg) { mNoResetFlg3 |= pFlg; }
void i_offNoResetFlg3(int pFlg) { mNoResetFlg3 &= ~pFlg; }
void i_onEndResetFlg1(daPy_ERFLG1 pFlg) { mEndResetFlg1 |= pFlg; }
int i_checkWolf() { return i_checkNoResetFlg1(Wolf); }
BOOL i_checkEquipHeavyBoots() const { return i_checkNoResetFlg0(EquipHeavyBoots); }
static u8 m_midnaActor[4];
};