misc cleanup

14 files changed, 36 insertions, 32 deletions

diff --git a/include/d/actor/d_a_agb.h b/include/d/actor/d_a_agb.h
index 3e9c7fae..87d46ebb 100644
--- a/include/d/actor/d_a_agb.h
+++ b/include/d/actor/d_a_agb.h
@@ -108,10 +108,10 @@ public:
     BOOL isFree() { return mIsFree; }
     void offFree() { mIsFree = false; }
     BOOL isHold() { return mHold; }
-    s32 getFollowTarget() { return mFollowTarget; }
-    void setFollowTarget(bool) {}
-    void getTargetID() {}
-    void setTargetID(unsigned int) {}
+    BOOL getFollowTarget() { return mFollowTarget; }
+    void setFollowTarget(bool follow) { mFollowTarget = follow; }
+    unsigned int getTargetID() { return mTargetID; }
+    void setTargetID(unsigned int pid) { mTargetID = pid; }
 
     struct daAgb_ItemBuy {
         union {
@@ -247,7 +247,7 @@ public:
     /* 0x634 */ cXyz field_0x634;
     /* 0x640 */ int field_0x640;
     /* 0x648 */ u64 mPlayerName;
-    /* 0x650 */ u32 field_0x650;
+    /* 0x650 */ u32 mTargetID;
     /* 0x654 */ int field_0x654;
     /* 0x658 */ s16 field_0x658;
     /* 0x65A */ u16 mPrevButtons;
@@ -265,23 +265,23 @@ public:
     /* 0x66D */ u8 field_0x66d;
     /* 0x66E */ u8 field_0x66e;
     /* 0x66F */ s8 field_0x66f;
-    /* 0x670 */ u8 field_0x670;
+    /* 0x670 */ bool field_0x670;
     /* 0x671 */ bool mIsFree;
     /* 0x672 */ bool mIsActive;
-    /* 0x673 */ u8 field_0x673;
+    /* 0x673 */ bool field_0x673;
     /* 0x674 */ bool mHold;
-    /* 0x675 */ u8 field_0x675;
-    /* 0x676 */ u8 field_0x676;
-    /* 0x677 */ u8 mFollowTarget;
+    /* 0x675 */ bool field_0x675;
+    /* 0x676 */ bool field_0x676;
+    /* 0x677 */ bool mFollowTarget;
     /* 0x678 */ bool mIsMsgSend;
-    /* 0x679 */ u8 field_0x679;
+    /* 0x679 */ bool field_0x679;
     /* 0x67A */ bool field_0x67a;
-    /* 0x67B */ u8 field_0x67b;
+    /* 0x67B */ bool field_0x67b;
     /* 0x67C */ bool mBombDeny;
-    /* 0x67D */ u8 field_0x67d;
-    /* 0x67E */ u8 field_0x67e;
-    /* 0x67F */ u8 field_0x67f;
-    /* 0x680 */ u8 field_0x680;
+    /* 0x67D */ bool field_0x67d;
+    /* 0x67E */ bool field_0x67e;
+    /* 0x67F */ bool field_0x67f;
+    /* 0x680 */ bool field_0x680;
     /* 0x684 */ dPa_followEcallBack field_0x684;
 };
 
diff --git a/include/d/actor/d_a_am.h b/include/d/actor/d_a_am.h
index 1f097f4b..5162fc40 100644
--- a/include/d/actor/d_a_am.h
+++ b/include/d/actor/d_a_am.h
@@ -10,7 +10,7 @@
 
 class am_class : public fopEn_enemy_c {
 public:
-    /* 0x02AC */ request_of_phase_process_class mPhs;
+    /* 0x02AC */ request_of_phase_process_class mPhase;
     /* 0x02B4 */ JntHit_c* mEyeJntHit;
     /* 0x02B8 */ mDoExt_McaMorf* mpMorf;
     /* 0x02BC */ u8 m02BC[0x02C0 - 0x02BC];
diff --git a/include/d/actor/d_a_am2.h b/include/d/actor/d_a_am2.h
index e728aa66..0d863239 100644
--- a/include/d/actor/d_a_am2.h
+++ b/include/d/actor/d_a_am2.h
@@ -10,7 +10,7 @@
 
 class am2_class : public fopEn_enemy_c {
 public:
-    /* 0x2AC */ request_of_phase_process_class mPhs;
+    /* 0x2AC */ request_of_phase_process_class mPhase;
     /* 0x2B4 */ JntHit_c* mEyeJntHit;
     /* 0x2B8 */ mDoExt_McaMorf* mpMorf;
     /* 0x2BC */ u8 m2BC[0x2C0 - 0x2BC];
diff --git a/include/d/actor/d_a_bk.h b/include/d/actor/d_a_bk.h
index 5a0817ad..356f0c5d 100644
--- a/include/d/actor/d_a_bk.h
+++ b/include/d/actor/d_a_bk.h
@@ -10,7 +10,7 @@ class dPath;
 
 class bk_class : public fopEn_enemy_c {
 public:
-    /* 0x02AC */ request_of_phase_process_class mPhs;
+    /* 0x02AC */ request_of_phase_process_class mPhase;
     /* 0x02B4 */ u8 mType;
     /* 0x02B5 */ u8 m02B5;
     /* 0x02B6 */ u8 m02B6;
diff --git a/include/d/actor/d_a_bomb.h b/include/d/actor/d_a_bomb.h
index ac4fea91..295d53ef 100644
--- a/include/d/actor/d_a_bomb.h
+++ b/include/d/actor/d_a_bomb.h
@@ -168,7 +168,7 @@ public:
 
 private:
     /* 0x290 */ procFunc mFunc;
-    /* 0x29C */ request_of_phase_process_class mPhs;
+    /* 0x29C */ request_of_phase_process_class mPhase;
     /* 0x2A4 */ J3DModel* mpModel;
     /* 0x2A8 */ mDoExt_bckAnm mBck0;
     /* 0x2B8 */ mDoExt_bckAnm mBck1;
diff --git a/include/d/actor/d_a_bomb2.h b/include/d/actor/d_a_bomb2.h
index 097ae7d2..9a10abba 100644
--- a/include/d/actor/d_a_bomb2.h
+++ b/include/d/actor/d_a_bomb2.h
@@ -173,8 +173,7 @@ namespace daBomb2 {
         };
 
     private:
-        //some of these might need updating since i initially copied them from daBomb_c
-        /* 0x290 */ request_of_phase_process_class mPhs;
+        /* 0x290 */ request_of_phase_process_class mPhase;
         /* 0x298 */ J3DModel* mpModel;
         /* 0x29C */ mDoExt_bckAnm mBck0;
         /* 0x2AC */ mDoExt_brkAnm mBrk0;
diff --git a/include/d/actor/d_a_branch.h b/include/d/actor/d_a_branch.h
index 3d0b86a3..8f24dbc6 100644
--- a/include/d/actor/d_a_branch.h
+++ b/include/d/actor/d_a_branch.h
@@ -15,7 +15,7 @@ public:
             }
         }
 
-        dComIfG_resDelete(&mPhs, m_arcname);
+        dComIfG_resDelete(&mPhase, m_arcname);
     }
     inline s32 create();
     inline BOOL draw();
@@ -30,7 +30,7 @@ public:
     
     MtxP getJointMtx(const char*);
 
-    /* 0x0290 */ request_of_phase_process_class mPhs;
+    /* 0x0290 */ request_of_phase_process_class mPhase;
     /* 0x0298 */ J3DModel* mModel[2];
     /* 0x02A0 */ u8 dummy2[0x08];
     /* 0x02A8 */ mDoExt_McaMorf* mAnims[2];
diff --git a/include/d/actor/d_a_npc_md.h b/include/d/actor/d_a_npc_md.h
index d4de6db5..56f80d09 100644
--- a/include/d/actor/d_a_npc_md.h
+++ b/include/d/actor/d_a_npc_md.h
@@ -485,7 +485,7 @@ public:
     static void offPlayerRoom() { m_playerRoom = false; }
     
 public:
-    /* 0x04EC */ request_of_phase_process_class mPhs;
+    /* 0x04EC */ request_of_phase_process_class mPhase;
     /* 0x04F4 */ J3DModel* mpHarpModel;
     /* 0x04F8 */ J3DModel* mpHarpLightModel;
     /* 0x04FC */ mDoExt_McaMorf2* mpMorf;
diff --git a/include/d/actor/d_a_obj_Ygush00.h b/include/d/actor/d_a_obj_Ygush00.h
index 5458a2dd..c8345a00 100644
--- a/include/d/actor/d_a_obj_Ygush00.h
+++ b/include/d/actor/d_a_obj_Ygush00.h
@@ -23,7 +23,7 @@ public:
     static BOOL solidHeapCB(fopAc_ac_c*);
 
 public:
-    /* 0x290 */ request_of_phase_process_class mPhs;
+    /* 0x290 */ request_of_phase_process_class mPhase;
     /* 0x298 */ J3DModel * mpModel;
     /* 0x29C */ mDoExt_btkAnm mBtkAnm;
     /* 0x2B0 */ mDoExt_bckAnm mBckAnm;
diff --git a/include/d/actor/d_a_obj_mtest.h b/include/d/actor/d_a_obj_mtest.h
index 8eaa5031..fbf5fdb7 100644
--- a/include/d/actor/d_a_obj_mtest.h
+++ b/include/d/actor/d_a_obj_mtest.h
@@ -62,7 +62,7 @@ namespace daObjMtest {
     
     public:
         /* 0x2C8 */ Mtx mMtx;
-        /* 0x2F8 */ request_of_phase_process_class mPhs;
+        /* 0x2F8 */ request_of_phase_process_class mPhase;
         /* 0x300 */ J3DModel* mpModel;
         /* 0x304 */ dCcD_Stts mStts;
         /* 0x340 */ dCcD_Cyl mCyl;
diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h
index 5b2a182e..c3cdfcc0 100644
--- a/include/d/actor/d_a_player_main.h
+++ b/include/d/actor/d_a_player_main.h
@@ -1692,7 +1692,7 @@ public:
     void offModeFlg(u32 flag) { mModeFlg &= ~flag; }
     u32 checkModeFlg(u32 flag) const { return mModeFlg & flag; }
     
-    request_of_phase_process_class* getPhase() { return &mPhsLoad; }
+    request_of_phase_process_class* getPhase() { return &mPhase; }
     
     J3DAnmTransform* getNowAnmPackUnder(daPy_UNDER idx) { return mAnmRatioUnder[idx].getAnmTransform(); }
     J3DAnmTransform* getNowAnmPackUpper(daPy_UPPER idx) { return mAnmRatioUpper[idx].getAnmTransform(); }
@@ -1798,7 +1798,7 @@ public:
     virtual void cancelChangeTextureAnime() { resetDemoTextureAnime(); }
 
 public:
-    /* 0x0320 */ request_of_phase_process_class mPhsLoad;
+    /* 0x0320 */ request_of_phase_process_class mPhase;
     /* 0x0328 */ J3DModelData* mpCLModelData;
     /* 0x032C */ J3DModel* mpCLModel;
     /* 0x0330 */ J3DModel* mpKatsuraModel;
diff --git a/include/d/actor/d_a_spc_item01.h b/include/d/actor/d_a_spc_item01.h
index 9893502d..df4b873a 100644
--- a/include/d/actor/d_a_spc_item01.h
+++ b/include/d/actor/d_a_spc_item01.h
@@ -9,7 +9,7 @@ class daSpcItem01_c : public daItemBase_c {
 public:
     void set_mtx();
     BOOL _delete();
-    cPhs__Step _create();
+    s32 _create();
     BOOL CreateInit();
     BOOL _execute();
     void set_effect();
diff --git a/include/d/actor/d_a_tbox.h b/include/d/actor/d_a_tbox.h
index dc7ea445..8a0938de 100644
--- a/include/d/actor/d_a_tbox.h
+++ b/include/d/actor/d_a_tbox.h
@@ -30,7 +30,7 @@ public:
     void flagOff(u16 flag) { mFlags &= ~flag; }
     void flagClr() { mFlags = 0; }
     BOOL flagCheck(u16 flag) { return mFlags & flag; }
-    request_of_phase_process_class* getPhase() { return &mPhs; }
+    request_of_phase_process_class* getPhase() { return &mPhase; }
     bool action() { return (this->*mActionFunc)(); }
     void setAction(ActionFunc func) { mActionFunc = func; }
     void deleteProc() {} // Maybe only used in the demo
@@ -79,7 +79,7 @@ public:
 
 public:
     /* 0x290 */ s32 mRoomNo;
-    /* 0x294 */ request_of_phase_process_class mPhs;
+    /* 0x294 */ request_of_phase_process_class mPhase;
     /* 0x29C */ J3DModel* mpChestMdl;
     /* 0x2A0 */ mDoExt_bckAnm mOpenAnm;
     /* 0x2B0 */ mDoExt_btkAnm* mpAppearTexAnm;
diff --git a/include/d/d_save_event_bit.inc b/include/d/d_save_event_bit.inc
index 154a940d..d838553c 100644
--- a/include/d/d_save_event_bit.inc
+++ b/include/d/d_save_event_bit.inc
@@ -6,6 +6,11 @@ public:
         ENDLESS_NIGHT = 0x0A02,
         MEDLI_GAVE_FATHERS_LETTER = 0x0E02,
         MET_KORL = 0x0F80,
+        PLACED_NAYRUS_PEARL = 0x1410,
+        PLACED_FARORES_PEARL = 0x1440,
+        PLACED_DINS_PEARL = 0x1480,
+        UNLOCK_TING_DISCOUNT = 0x1A08,
+        UNLOCK_TINGLE_BALLOON_DISCOUNT = 0x1A10,
         RODE_KORL = 0x2A08,
         BARRIER_BREAK = 0x2C02,
         LITHOGRAPH_1 = 0x3508,