remove address markers from tp headers

This commit is contained in:
Jasper St. Pierre
2023-10-02 22:26:24 -07:00
parent b0bfe1c49e
commit 6ea08a5c37
31 changed files with 430 additions and 430 deletions
+1 -1
View File
@@ -107,7 +107,7 @@ public:
class dAttDraw_CallBack_c : public mDoExt_McaMorfCallBack1_c {
public:
/* 80070178 */ virtual void execute(u16, J3DTransformInfo*);
virtual void execute(u16, J3DTransformInfo*);
};
class daPy_lk_c;
+35 -35
View File
@@ -73,40 +73,40 @@ public:
/* 0x800000 */ LINE_DOWN = (1 << 23),
};
/* 800760A0 */ dBgS_Acch();
/* 800761CC */ void Init();
/* 80076288 */ void Set(fopAc_ac_c*, int, dBgS_AcchCir*);
/* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
/* 800762D8 */ void GroundCheckInit(dBgS&);
/* 80076350 */ void GroundCheck(dBgS&);
/* 8007654C */ void GroundRoofProc(dBgS&);
/* 80076624 */ void LineCheck(dBgS&);
/* 80076AAC */ void CrrPos(dBgS&);
/* 80076F84 */ f32 GetWallAllR();
/* 80076FC0 */ void SetWallCir();
/* 8007703C */ void CalcWallBmdCyl();
/* 80077114 */ void SetGroundUpY(f32);
/* 80077128 */ f32 GetWallAllLowH();
/* 80077178 */ f32 GetWallAllLowH_R();
/* 800771E4 */ f32 GetSpeedY();
/* 80077200 */ f32 GetWallAddY(Vec&);
/* 80077278 */ void SetNowActorInfo(int, void*, unsigned int);
/* 80077288 */ void SetWallPolyIndex(int, int);
/* 800772E8 */ void CalcMovePosWork();
/* 8007732C */ void CalcWallRR();
/* 80077388 */ void SetMoveBGOnly();
/* 800773A4 */ void ClrMoveBGOnly();
/* 800773C0 */ void SetGndThinCellingOff();
/* 800773D0 */ void ClrGndThinCellingOff();
/* 800773E0 */ bool ChkGndThinCellingOff();
/* 800773EC */ void OnWallSort();
/* 800773FC */ bool ChkWallSort();
/* 80077408 */ bool ChkLineDown();
/* 800D00D0 */ bool ChkRoofHit() const;
/* 800D00DC */ void ClrGroundHit();
/* 80141404 */ bool ChkGroundHit() const;
dBgS_Acch();
void Init();
void Set(fopAc_ac_c*, int, dBgS_AcchCir*);
void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
void GroundCheckInit(dBgS&);
void GroundCheck(dBgS&);
void GroundRoofProc(dBgS&);
void LineCheck(dBgS&);
void CrrPos(dBgS&);
f32 GetWallAllR();
void SetWallCir();
void CalcWallBmdCyl();
void SetGroundUpY(f32);
f32 GetWallAllLowH();
f32 GetWallAllLowH_R();
f32 GetSpeedY();
f32 GetWallAddY(Vec&);
void SetNowActorInfo(int, void*, unsigned int);
void SetWallPolyIndex(int, int);
void CalcMovePosWork();
void CalcWallRR();
void SetMoveBGOnly();
void ClrMoveBGOnly();
void SetGndThinCellingOff();
void ClrGndThinCellingOff();
bool ChkGndThinCellingOff();
void OnWallSort();
bool ChkWallSort();
bool ChkLineDown();
bool ChkRoofHit() const;
void ClrGroundHit();
bool ChkGroundHit() const;
/* 80075F94 */ virtual ~dBgS_Acch();
virtual ~dBgS_Acch();
cXyz* GetPos() { return pm_pos; }
cXyz* GetOldPos() { return pm_old_pos; }
@@ -196,7 +196,7 @@ class dBgS_LinkAcch : public dBgS_Acch {
public:
dBgS_LinkAcch() { SetLink(); }
/* 80140F30 */ virtual ~dBgS_LinkAcch() {}
virtual ~dBgS_LinkAcch() {}
};
class dBgS_ObjAcch : public dBgS_Acch {
@@ -205,7 +205,7 @@ public:
SetObj();
}
/* 80BB336C */ virtual ~dBgS_ObjAcch() {}
virtual ~dBgS_ObjAcch() {}
}; // Size: 0x1C4
#endif /* D_BG_D_BG_S_ACCH_H */
+12 -12
View File
@@ -6,11 +6,11 @@
class dBgS_GndChk : public cBgS_GndChk, public dBgS_Chk {
public:
/* 8007757C */ dBgS_GndChk() {
dBgS_GndChk() {
SetPolyPassChk(GetPolyPassChkInfo());
SetGrpPassChk(GetGrpPassChkInfo());
}
/* 800775F0 */ virtual ~dBgS_GndChk() {}
virtual ~dBgS_GndChk() {}
}; // Size: 0x54
STATIC_ASSERT(sizeof(dBgS_GndChk) == 0x54);
@@ -18,33 +18,33 @@ STATIC_ASSERT(sizeof(dBgS_GndChk) == 0x54);
class dBgS_LinkGndChk : public dBgS_GndChk {
public:
dBgS_LinkGndChk() { /* SetLink(); */ }
/* 80140EB8 */ virtual ~dBgS_LinkGndChk();
virtual ~dBgS_LinkGndChk();
};
class dBgS_ObjGndChk : public dBgS_GndChk {
public:
dBgS_ObjGndChk() { SetObj(); }
/* 8001E020 */ virtual ~dBgS_ObjGndChk() {}
virtual ~dBgS_ObjGndChk() {}
};
class dBgS_ObjGndChk_Wtr : public dBgS_ObjGndChk {
public:
/* 80077678 */ dBgS_ObjGndChk_Wtr();
dBgS_ObjGndChk_Wtr();
/* 80077710 */ virtual ~dBgS_ObjGndChk_Wtr();
virtual ~dBgS_ObjGndChk_Wtr();
};
class dBgS_ObjGndChk_Spl : public dBgS_ObjGndChk {
public:
/* 800777B0 */ dBgS_ObjGndChk_Spl();
dBgS_ObjGndChk_Spl();
/* 80077848 */ virtual ~dBgS_ObjGndChk_Spl();
virtual ~dBgS_ObjGndChk_Spl();
};
class dBgS_ObjGndChk_All : public dBgS_ObjGndChk {
public:
/* 800778E8 */ virtual ~dBgS_ObjGndChk_All() {}
virtual ~dBgS_ObjGndChk_All() {}
dBgS_ObjGndChk_All() { OnAll(); }
};
@@ -53,14 +53,14 @@ class dBgS_CamGndChk : public dBgS_GndChk {
public:
dBgS_CamGndChk() { /* SetCam(); */ }
/* 80077988 */ virtual ~dBgS_CamGndChk();
virtual ~dBgS_CamGndChk();
};
class dBgS_CamGndChk_Wtr : public dBgS_CamGndChk {
public:
/* 80077A00 */ dBgS_CamGndChk_Wtr();
dBgS_CamGndChk_Wtr();
/* 80077A98 */ virtual ~dBgS_CamGndChk_Wtr();
virtual ~dBgS_CamGndChk_Wtr();
};
#endif /* D_BG_D_BG_S_GND_CHK_H */
+2 -2
View File
@@ -15,9 +15,9 @@ public:
LIGHT_GRP = 0x10,
};
/* 80077BA0 */ dBgS_GrpPassChk() { mGrp = NORMAL_GRP; }
dBgS_GrpPassChk() { mGrp = NORMAL_GRP; }
/* 80077BC4 */ virtual ~dBgS_GrpPassChk() {}
virtual ~dBgS_GrpPassChk() {}
void OnNormalGrp() { mGrp |= NORMAL_GRP; }
void OnWaterGrp() { mGrp |= WATER_GRP; }
+19 -19
View File
@@ -8,13 +8,13 @@ class fopAc_ac_c;
class dBgS_LinChk : public cBgS_LinChk, public dBgS_Chk {
public:
/* 80077C68 */ dBgS_LinChk() {
dBgS_LinChk() {
SetPolyPassChk(GetPolyPassChkInfo());
SetGrpPassChk(GetGrpPassChkInfo());
}
/* 80077D64 */ void Set(cXyz* pi_start, cXyz* pi_end, fopAc_ac_c*);
void Set(cXyz* pi_start, cXyz* pi_end, fopAc_ac_c*);
/* 80077CDC */ virtual ~dBgS_LinChk() {}
virtual ~dBgS_LinChk() {}
/* 0x00 cBgS_LinChk */;
/* 0x58 dBgS_Chk */;
@@ -22,62 +22,62 @@ public:
class dBgS_LinkLinChk : public dBgS_LinChk {
public:
/* 80078030 */ dBgS_LinkLinChk();
dBgS_LinkLinChk();
/* 8007808C */ virtual ~dBgS_LinkLinChk();
virtual ~dBgS_LinkLinChk();
};
class dBgS_RopeLinChk : public dBgS_LinChk {
public:
/* 8007838C */ dBgS_RopeLinChk();
dBgS_RopeLinChk();
/* 800783E8 */ virtual ~dBgS_RopeLinChk();
virtual ~dBgS_RopeLinChk();
};
class dBgS_BoomerangLinChk : public dBgS_LinChk {
public:
/* 800782B8 */ dBgS_BoomerangLinChk();
dBgS_BoomerangLinChk();
/* 80078314 */ virtual ~dBgS_BoomerangLinChk();
virtual ~dBgS_BoomerangLinChk();
};
class dBgS_ArrowLinChk : public dBgS_LinChk {
public:
/* 800781D8 */ dBgS_ArrowLinChk() {
dBgS_ArrowLinChk() {
SetArrow(); // Don't check arrows
OnYoganGrp(); // Check lava
OnNormalGrp();
}
/* 80078240 */ virtual ~dBgS_ArrowLinChk() {}
virtual ~dBgS_ArrowLinChk() {}
};
class dBgS_ObjLinChk : public dBgS_LinChk {
public:
/* 80077F5C */ dBgS_ObjLinChk();
dBgS_ObjLinChk();
/* 80077FB8 */ virtual ~dBgS_ObjLinChk();
virtual ~dBgS_ObjLinChk();
};
class dBgS_BombLinChk : public dBgS_LinChk {
public:
/* 80078104 */ dBgS_BombLinChk();
dBgS_BombLinChk();
/* 80078160 */ virtual ~dBgS_BombLinChk();
virtual ~dBgS_BombLinChk();
};
class dBgS_CamLinChk : public dBgS_LinChk {
public:
/* 80077DA4 */ dBgS_CamLinChk();
dBgS_CamLinChk();
/* 80077E00 */ virtual ~dBgS_CamLinChk();
virtual ~dBgS_CamLinChk();
};
class dBgS_CamLinChk_NorWtr : public dBgS_CamLinChk {
public:
/* 80077E78 */ dBgS_CamLinChk_NorWtr();
dBgS_CamLinChk_NorWtr();
/* 80077EE4 */ virtual ~dBgS_CamLinChk_NorWtr();
virtual ~dBgS_CamLinChk_NorWtr();
};
class dBgS_MirLightLinChk : public dBgS_LinChk {
+5 -5
View File
@@ -7,11 +7,11 @@
class dBgS_RoofChk : public cBgS_PolyInfo, public cBgS_Chk, public dBgS_Chk {
public:
/* 80078FF4 */ dBgS_RoofChk();
/* 80079124 */ void Init();
/* 800B146C */ void SetPos(cXyz const&);
dBgS_RoofChk();
void Init();
void SetPos(cXyz const&);
/* 80079090 */ virtual ~dBgS_RoofChk();
virtual ~dBgS_RoofChk();
void i_SetPos(cXyz const& pos) { m_pos = pos; }
cXyz* GetPosP() { return &m_pos; }
@@ -25,7 +25,7 @@ STATIC_ASSERT(sizeof(dBgS_RoofChk) == 0x44);
class dBgS_LinkRoofChk : public dBgS_RoofChk {
public:
dBgS_LinkRoofChk() { /* SetLink(); */ }
/* 80140E40 */ virtual ~dBgS_LinkRoofChk();
virtual ~dBgS_LinkRoofChk();
};
#endif /* D_BG_D_BG_S_ROOF_CHK_H */
+4 -4
View File
@@ -13,11 +13,11 @@ public:
/* 0x4 */ MOVE_BG_ONLY = 4
};
/* 80078B90 */ void Set(cXyz&, f32);
/* 80078BB0 */ dBgS_SplGrpChk();
/* 80078D0C */ void Init();
void Set(cXyz&, f32);
dBgS_SplGrpChk();
void Init();
/* 80078C78 */ virtual ~dBgS_SplGrpChk();
virtual ~dBgS_SplGrpChk();
void OffFind() { m_flags &= ~FIND; }
void OffIn() { m_flags &= ~IN; }
+2 -2
View File
@@ -5,9 +5,9 @@
class dBgS_WtrChk : public dBgS_SplGrpChk {
public:
/* 80079164 */ dBgS_WtrChk();
dBgS_WtrChk();
/* 8001DF30 */ virtual ~dBgS_WtrChk();
virtual ~dBgS_WtrChk();
}; // Size: 0x50
STATIC_ASSERT(sizeof(dBgS_WtrChk) == 0x50);
+9 -9
View File
@@ -67,15 +67,15 @@ public:
public:
dCcMassS_Mng();
virtual ~dCcMassS_Mng() {}
/* 800855E4 */ void Ct();
/* 80085630 */ void SetAttr(f32 radius, f32 height, u8 param_2, u8 param_3);
/* 80085690 */ void Prepare();
/* 800858AC */ u32 Chk(cXyz* p_xyz, fopAc_ac_c** p_actor, dCcMassS_HitInf* p_hitInf);
/* 80085CF0 */ void Clear();
/* 80085D98 */ void Set(cCcD_Obj* p_obj, u8 priority);
/* 80085E6C */ void SetCam(cM3dGCps const& cps);
/* 80085EB0 */ u8 GetResultCam() const;
/* 80085EB8 */ void GetCamTopPos(Vec* p_out);
void Ct();
void SetAttr(f32 radius, f32 height, u8 param_2, u8 param_3);
void Prepare();
u32 Chk(cXyz* p_xyz, fopAc_ac_c** p_actor, dCcMassS_HitInf* p_hitInf);
void Clear();
void Set(cCcD_Obj* p_obj, u8 priority);
void SetCam(cM3dGCps const& cps);
u8 GetResultCam() const;
void GetCamTopPos(Vec* p_out);
};
STATIC_ASSERT(sizeof(dCcMassS_Mng) == 0x1A0);
+23 -23
View File
@@ -11,39 +11,39 @@ class dCcD_GStts;
class dCcS : public cCcS {
public:
dCcS() {}
/* 80085ED4 */ void Ct();
/* 80085F08 */ void Dt();
/* 80085F28 */ bool ChkShieldFrontRange(cCcD_Obj*, cCcD_Obj*, int, cXyz const*);
/* 800860F8 */ bool ChkShield(cCcD_Obj*, cCcD_Obj*, dCcD_GObjInf*, dCcD_GObjInf*, cXyz const*);
/* 800861B0 */ void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*);
/* 80086360 */ int GetRank(u8);
/* 8008685C */ void ProcAtTgHitmark(bool, bool, cCcD_Obj*, cCcD_Obj*, dCcD_GObjInf*,
void Ct();
void Dt();
bool ChkShieldFrontRange(cCcD_Obj*, cCcD_Obj*, int, cXyz const*);
bool ChkShield(cCcD_Obj*, cCcD_Obj*, dCcD_GObjInf*, dCcD_GObjInf*, cXyz const*);
void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*);
int GetRank(u8);
void ProcAtTgHitmark(bool, bool, cCcD_Obj*, cCcD_Obj*, dCcD_GObjInf*,
dCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, dCcD_GStts*,
dCcD_GStts*, cXyz*, bool);
/* 80086D8C */ bool ChkCamera(cXyz&, cXyz&, f32, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*);
/* 80086FBC */ bool chkCameraPoint(cXyz const&, cCcD_ShapeAttr::Shape*, fopAc_ac_c*,
bool ChkCamera(cXyz&, cXyz&, f32, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*);
bool chkCameraPoint(cXyz const&, cCcD_ShapeAttr::Shape*, fopAc_ac_c*,
fopAc_ac_c*);
/* 800872AC */ void DrawAfter();
/* 800872B0 */ void Move();
/* 800872D0 */ void Draw();
/* 8008730C */ void MassClear();
/* 80087330 */ int ChkAtTgMtrlHit(u8, u8);
void DrawAfter();
void Move();
void Draw();
void MassClear();
int ChkAtTgMtrlHit(u8, u8);
/* 8008640C */ virtual void SetPosCorrect(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32);
/* 80086240 */ virtual void SetCoGObjInf(bool, bool, cCcD_GObjInf*, cCcD_GObjInf*, cCcD_Stts*,
virtual void SetPosCorrect(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32);
virtual void SetCoGObjInf(bool, bool, cCcD_GObjInf*, cCcD_GObjInf*, cCcD_Stts*,
cCcD_Stts*, cCcD_GStts*, cCcD_GStts*);
/* 80086AC0 */ virtual void SetAtTgGObjInf(bool, bool, cCcD_Obj*, cCcD_Obj*, cCcD_GObjInf*,
virtual void SetAtTgGObjInf(bool, bool, cCcD_Obj*, cCcD_Obj*, cCcD_GObjInf*,
cCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, cCcD_GStts*,
cCcD_GStts*, cXyz*);
/* 8008734C */ virtual bool ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*, cCcD_GStts*,
virtual bool ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*, cCcD_GStts*,
cCcD_GStts*);
/* 800861B4 */ virtual bool ChkAtTgHitAfterCross(bool, bool, cCcD_GObjInf const*,
virtual bool ChkAtTgHitAfterCross(bool, bool, cCcD_GObjInf const*,
cCcD_GObjInf const*, cCcD_Stts*, cCcD_Stts*,
cCcD_GStts*, cCcD_GStts*);
/* 80086404 */ virtual bool ChkNoHitGCo(cCcD_Obj*, cCcD_Obj*);
/* 8002FF40 */ virtual ~dCcS() {}
/* 800872A8 */ virtual void MoveAfterCheck();
/* 80086754 */ virtual void CalcParticleAngle(dCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, csXyz*);
virtual bool ChkNoHitGCo(cCcD_Obj*, cCcD_Obj*);
virtual ~dCcS() {}
virtual void MoveAfterCheck();
virtual void CalcParticleAngle(dCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, csXyz*);
void SetMass(cCcD_Obj* i_obj, u8 i_priority) { mMass_Mng.Set(i_obj, i_priority); }
void PrepareMass() { mMass_Mng.Prepare(); }
+129 -129
View File
@@ -6,7 +6,7 @@
class dSv_player_status_a_c {
public:
/* 800589A8 */ void init();
void init();
u8 getSelectEquip(int i_no) { return mSelectEquip[i_no]; }
u8 getWalletSize() { return mWalletSize; }
@@ -77,16 +77,16 @@ STATIC_ASSERT(sizeof(dSv_player_return_place_c) == 0xC);
class dSv_player_item_c {
public:
/* 80058C60 */ void init();
/* 80058C7C */ void setBottleItemIn(u8, u8);
/* 80058E1C */ void setEmptyBottleItemIn(u8);
/* 80058E44 */ void setEmptyBottle();
/* 800591B0 */ void setEquipBottleItemIn(u8);
/* 80058F74 */ void setEquipBottleItemIn(u8, u8);
/* 80059408 */ void setEquipBottleItemEmpty();
/* 8005918C */ void setEquipBottleItemEmpty(u8);
/* 8005942C */ u8 checkBottle(u8);
/* 8005946C */ u8 checkEmptyBottle();
void init();
void setBottleItemIn(u8, u8);
void setEmptyBottleItemIn(u8);
void setEmptyBottle();
void setEquipBottleItemIn(u8);
void setEquipBottleItemIn(u8, u8);
void setEquipBottleItemEmpty();
void setEquipBottleItemEmpty(u8);
u8 checkBottle(u8);
u8 checkEmptyBottle();
u8 getItem(int i_idx) const { return mItems[i_idx]; }
@@ -97,11 +97,11 @@ STATIC_ASSERT(sizeof(dSv_player_item_c) == 0x15);
class dSv_player_get_item_c {
public:
/* 800594A8 */ void init();
/* 800594C4 */ void onItem(int, u8);
/* 8005955C */ BOOL isItem(int, u8);
/* 800595F8 */ void onBottleItem(u8);
/* 80059740 */ bool isBottleItem(u8);
void init();
void onItem(int, u8);
BOOL isItem(int, u8);
void onBottleItem(u8);
bool isBottleItem(u8);
/* 0x0 */ u8 mItemFlags[21];
}; // Size: 0x15
@@ -110,10 +110,10 @@ STATIC_ASSERT(sizeof(dSv_player_get_item_c) == 0x15);
class dSv_player_item_record_c {
public:
/* 80059848 */ void init();
/* 8005987C */ void resetTimer(u16);
/* 80059894 */ void decTimer();
/* 800598D0 */ u16 getTimer();
void init();
void resetTimer(u16);
void decTimer();
u16 getTimer();
u32 getArrowNum() const { return mArrowNum; }
u32 getBombNum() const { return mBombNum; }
@@ -129,7 +129,7 @@ STATIC_ASSERT(sizeof(dSv_player_item_record_c) == 0x8);
class dSv_player_item_max_c {
public:
/* 800598D8 */ void init();
void init();
u8 getArrowNum() const { return mArrowNum; }
u8 getBombNum() const { return mBombNum; }
@@ -144,24 +144,24 @@ STATIC_ASSERT(sizeof(dSv_player_item_max_c) == 0x8);
class dSv_player_bag_item_c {
public:
/* 80059908 */ void init();
/* 80059968 */ void setBeastItem(u8);
/* 800599D8 */ void setBeastItemEmpty(u8);
/* 80059C30 */ bool checkBeastItem(u8);
/* 80059C60 */ void setBaitItemChange(u8);
/* 80059EB0 */ void setBaitItemChange(u8, u8);
/* 8005A1A4 */ void setBaitItemEmpty(u8);
/* 8005A0C8 */ void setBaitItemEmpty();
/* 8005A248 */ void setBaitItem(u8);
/* 8005A2D0 */ u8 checkBaitItemEmpty();
/* 8005A2F4 */ u8 checkBaitItem(u8);
/* 8005A584 */ void setReserveItemChange(u8, u8);
/* 8005A334 */ void setReserveItemChange(u8);
/* 8005A7C0 */ void setReserveItemEmpty(u8);
/* 8005A79C */ void setReserveItemEmpty();
/* 8005A7E4 */ void setReserveItem(u8);
/* 8005A854 */ bool checkReserveItemEmpty();
/* 8005A878 */ bool checkReserveItem(u8);
void init();
void setBeastItem(u8);
void setBeastItemEmpty(u8);
bool checkBeastItem(u8);
void setBaitItemChange(u8);
void setBaitItemChange(u8, u8);
void setBaitItemEmpty(u8);
void setBaitItemEmpty();
void setBaitItem(u8);
u8 checkBaitItemEmpty();
u8 checkBaitItem(u8);
void setReserveItemChange(u8, u8);
void setReserveItemChange(u8);
void setReserveItemEmpty(u8);
void setReserveItemEmpty();
void setReserveItem(u8);
bool checkReserveItemEmpty();
bool checkReserveItem(u8);
u8 getBeast(int i_idx) const { return mBeast[i_idx]; }
u8 getBait(int i_idx) const { return mBait[i_idx]; }
@@ -176,13 +176,13 @@ STATIC_ASSERT(sizeof(dSv_player_bag_item_c) == 0x18);
class dSv_player_get_bag_item_c {
public:
/* 8005A8B8 */ void init();
/* 8005A8CC */ void onBeast(u8);
/* 8005A960 */ BOOL isBeast(u8);
/* 8005A9F8 */ void onBait(u8);
/* 8005AA8C */ BOOL isBait(u8);
/* 8005AB24 */ void onReserve(u8);
/* 8005ABB4 */ BOOL isReserve(u8);
void init();
void onBeast(u8);
BOOL isBeast(u8);
void onBait(u8);
BOOL isBait(u8);
void onReserve(u8);
BOOL isReserve(u8);
/* 0x0 */ u32 mReserveFlags;
/* 0x4 */ u8 mBeastFlags;
@@ -194,7 +194,7 @@ STATIC_ASSERT(sizeof(dSv_player_get_bag_item_c) == 0xC);
class dSv_player_bag_item_record_c {
public:
/* 8005AC48 */ void init();
void init();
u8 getBeastNum(int i_idx) const { return mBeastNum[i_idx]; }
u8 getBaitNum(int i_idx) const { return mBaitNum[i_idx]; }
@@ -209,17 +209,17 @@ STATIC_ASSERT(sizeof(dSv_player_bag_item_record_c) == 0x18);
class dSv_player_collect_c {
public:
/* 8005ACA8 */ void init();
/* 8005ACE0 */ void onCollect(int, u8);
/* 8005AD78 */ void offCollect(int, u8);
/* 8005AE10 */ BOOL isCollect(int, u8);
/* 8005AEAC */ void onTact(u8);
/* 8005AF40 */ BOOL isTact(u8);
/* 8005AFD8 */ void onTriforce(u8);
/* 8005B06C */ BOOL isTriforce(u8);
/* 8005B104 */ void onSymbol(u8);
/* 8005B198 */ BOOL isSymbol(u8);
/* 8005B230 */ int getTriforceNum();
void init();
void onCollect(int, u8);
void offCollect(int, u8);
BOOL isCollect(int, u8);
void onTact(u8);
BOOL isTact(u8);
void onTriforce(u8);
BOOL isTriforce(u8);
void onSymbol(u8);
BOOL isSymbol(u8);
int getTriforceNum();
/* 0x0 */ u8 field_0x0[8];
/* 0x8 */ u8 field_0x8;
@@ -233,25 +233,25 @@ STATIC_ASSERT(sizeof(dSv_player_collect_c) == 0xD);
class dSv_player_map_c {
public:
/* 8005B290 */ void init();
/* 8005B320 */ void onGetMap(int);
/* 8005B3CC */ BOOL isGetMap(int);
/* 8005B47C */ void onOpenMap(int);
/* 8005B528 */ void offOpenMap(int);
/* 8005B5D4 */ BOOL isOpenMap(int);
/* 8005B684 */ void onCompleteMap(int);
/* 8005B730 */ void offCompleteMap(int);
/* 8005B7DC */ BOOL isCompleteMap(int);
/* 8005B88C */ void onTriforce(int);
/* 8005B92C */ void offTriforce(int);
/* 8005B9CC */ BOOL isTriforce(int);
/* 8005BA70 */ int getCollectMapNum();
/* 8005BAE8 */ void onFmapBit(int, u8);
/* 8005BB84 */ BOOL isFmapBit(int, u8);
/* 8005BC24 */ void onSaveArriveGrid(int);
/* 8005BCBC */ BOOL isSaveArriveGrid(int);
/* 8005BD54 */ void onSaveArriveGridForAgb(int);
/* 8005BDEC */ BOOL isSaveArriveGridForAgb(int);
void init();
void onGetMap(int);
BOOL isGetMap(int);
void onOpenMap(int);
void offOpenMap(int);
BOOL isOpenMap(int);
void onCompleteMap(int);
void offCompleteMap(int);
BOOL isCompleteMap(int);
void onTriforce(int);
void offTriforce(int);
BOOL isTriforce(int);
int getCollectMapNum();
void onFmapBit(int, u8);
BOOL isFmapBit(int, u8);
void onSaveArriveGrid(int);
BOOL isSaveArriveGrid(int);
void onSaveArriveGridForAgb(int);
BOOL isSaveArriveGridForAgb(int);
/* 0x00 */ u32 field_0x0[4][4];
/* 0x40 */ u8 field_0x40[49];
@@ -264,7 +264,7 @@ STATIC_ASSERT(sizeof(dSv_player_map_c) == 0x84);
class dSv_player_info_c {
public:
/* 8005BE84 */ void init();
void init();
const char* getPlayerName() const { return mPlayerName; }
@@ -284,8 +284,8 @@ STATIC_ASSERT(sizeof(dSv_player_info_c) == 0x5C);
class dSv_player_config_c {
public:
/* 8005BF2C */ void init();
/* 8005BFA4 */ s32 checkVibration();
void init();
s32 checkVibration();
u8 getVibration() const { return mVibration; }
@@ -300,8 +300,8 @@ STATIC_ASSERT(sizeof(dSv_player_config_c) == 0x5);
class dSv_player_priest_c {
public:
/* 8005BFC8 */ void init();
/* 8005BFD4 */ void set(u8, cXyz&, s16, s8);
void init();
void set(u8, cXyz&, s16, s8);
/* 0x0 */ cXyz field_0x0;
/* 0xC */ s16 field_0xc;
@@ -313,7 +313,7 @@ STATIC_ASSERT(sizeof(dSv_player_priest_c) == 0x10);
class dSv_player_status_c_c {
public:
/* 8005BFFC */ void init();
void init();
/* 0x00 */ dSv_player_status_a_c mRecollectStatusA;
/* 0x18 */ dSv_player_item_c mRecollectItem;
@@ -328,7 +328,7 @@ STATIC_ASSERT(sizeof(dSv_player_status_c_c) == 0x70);
class dSv_player_c {
public:
/* 8005C000 */ void init();
void init();
dSv_player_status_a_c& getPlayerStatusA() { return mPlayerStatusA; }
dSv_player_status_a_c* getpPlayerStatusA() { return &mPlayerStatusA; }
@@ -409,19 +409,19 @@ public:
/* 0x7 */ STAGE_BOSS_ENEMY_2 = 7
};
/* 8005C094 */ void init();
/* 8005C0EC */ void onTbox(int);
/* 8005C188 */ BOOL isTbox(int);
/* 8005C228 */ void onSwitch(int);
/* 8005C2D4 */ void offSwitch(int);
/* 8005C380 */ BOOL isSwitch(int);
/* 8005C430 */ BOOL revSwitch(int);
/* 8005C4EC */ void onItem(int);
/* 8005C598 */ BOOL isItem(int);
/* 8005C648 */ void onVisitedRoom(int);
/* 8005C6F4 */ BOOL isVisitedRoom(int);
/* 8005C7A4 */ void onDungeonItem(int);
/* 8005C844 */ BOOL isDungeonItem(int);
void init();
void onTbox(int);
BOOL isTbox(int);
void onSwitch(int);
void offSwitch(int);
BOOL isSwitch(int);
BOOL revSwitch(int);
void onItem(int);
BOOL isItem(int);
void onVisitedRoom(int);
BOOL isVisitedRoom(int);
void onDungeonItem(int);
BOOL isDungeonItem(int);
u8 getKeyNum() { return mKeyNum; }
void setKeyNum(u8 i_keyNum) { mKeyNum = i_keyNum; }
@@ -449,9 +449,9 @@ STATIC_ASSERT(sizeof(dSv_memBit_c) == 0x24);
class dSv_ocean_c {
public:
/* 8005C8E8 */ void init();
/* 8005C908 */ void onOceanSvBit(u8 i_grid, u16 i_bit);
/* 8005C9E8 */ BOOL isOceanSvBit(u8 i_grid, u16 i_bit);
void init();
void onOceanSvBit(u8 i_grid, u16 i_bit);
BOOL isOceanSvBit(u8 i_grid, u16 i_bit);
/* 0x0 */ u16 field_0x0[50];
};
@@ -460,12 +460,12 @@ STATIC_ASSERT(sizeof(dSv_ocean_c) == 0x64);
class dSv_event_c {
public:
/* 8005CACC */ void init();
/* 8005CB04 */ void onEventBit(u16);
/* 8005CB1C */ void offEventBit(u16);
/* 8005CB34 */ BOOL isEventBit(u16);
/* 8005CB58 */ void setEventReg(u16, u8);
/* 8005CB7C */ u8 getEventReg(u16);
void init();
void onEventBit(u16);
void offEventBit(u16);
BOOL isEventBit(u16);
void setEventReg(u16, u8);
u8 getEventReg(u16);
/* 0x0 */ u8 mFlags[0x100];
}; // Size: 0x100
@@ -474,7 +474,7 @@ STATIC_ASSERT(sizeof(dSv_event_c) == 0x100);
class dSv_reserve_c {
public:
/* 8005CB94 */ void init();
void init();
/* 0x0 */ u8 mReserve[0x50];
}; // Size: 0x50
@@ -482,7 +482,7 @@ public:
class dSv_memory_c {
public:
dSv_memory_c() { init(); }
/* 8005CBB0 */ void init();
void init();
dSv_memBit_c& getBit() { return mMembit; }
const dSv_memBit_c& getBit() const { return mMembit; }
@@ -494,11 +494,11 @@ STATIC_ASSERT(sizeof(dSv_memory_c) == 0x24);
class dSv_danBit_c {
public:
/* 8005CBD0 */ int init(s8);
/* 8005CC08 */ void onSwitch(int);
/* 8005CCB4 */ void offSwitch(int);
/* 8005CD60 */ BOOL isSwitch(int);
/* 8005CE10 */ BOOL revSwitch(int);
int init(s8);
void onSwitch(int);
void offSwitch(int);
BOOL isSwitch(int);
BOOL revSwitch(int);
u8 getGbaRupeeCount() { return mGbaRupeeCount; }
void incGbaRupeeCount() { mGbaRupeeCount++; }
@@ -510,14 +510,14 @@ public:
class dSv_zoneBit_c {
public:
/* 8005CECC */ void init();
/* 8005CEF4 */ void clearRoomSwitch();
/* 8005CF00 */ void onSwitch(int);
/* 8005CFAC */ void offSwitch(int);
/* 8005D054 */ BOOL isSwitch(int);
/* 8005D100 */ BOOL revSwitch(int);
/* 8005D1B8 */ void onItem(int);
/* 8005D254 */ BOOL isItem(int);
void init();
void clearRoomSwitch();
void onSwitch(int);
void offSwitch(int);
BOOL isSwitch(int);
BOOL revSwitch(int);
void onItem(int);
BOOL isItem(int);
static const int SWITCH_MAX = 48;
@@ -527,9 +527,9 @@ public:
class dSv_zoneActor_c {
public:
/* 8005D2F4 */ void init();
/* 8005D314 */ void on(int);
/* 8005D3BC */ BOOL is(int);
void init();
void on(int);
BOOL is(int);
static const int ACTOR_MAX = 512;
@@ -539,7 +539,7 @@ public:
class dSv_zone_c {
public:
dSv_zone_c() { mRoomNo = -1; }
/* 8005D468 */ void init(int);
void init(int);
dSv_zoneBit_c& getZoneBit() { return mZoneBit; }
const dSv_zoneBit_c& getBit() const { return mZoneBit; }
@@ -555,9 +555,9 @@ public:
class dSv_restart_c {
public:
/* 8005D4A4 */ void setRoom(cXyz const&, s16, s8);
/* 8005D4C8 */ void setRestartOption(s8);
/* 8005D584 */ void setRestartOption(s8, cXyz*, s16, s8);
void setRoom(cXyz const&, s16, s8);
void setRestartOption(s8);
void setRestartOption(s8, cXyz*, s16, s8);
void setRoomParam(u32 param) { mRestartParam = param; }
void setStartPoint(s16 point) { mStartCode = point; }
@@ -612,7 +612,7 @@ public:
class dSv_save_c {
public:
/* 8005D860 */ void init();
void init();
dSv_player_c& getPlayer() { return mPlayer; }
dSv_ocean_c& getOcean() { return mOcean; }