Merge pull request #204 from lepelog/misc

misc and d_event

5 files changed, 20 insertions, 7 deletions

diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h
index 955cb4d060..b7bc9b5bd6 100644
--- a/include/d/a/d_a_alink.h
+++ b/include/d/a/d_a_alink.h
@@ -2572,11 +2572,12 @@ public:
     BOOL i_checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; }
 
     bool checkFishingCastMode() const {
+        bool var_r5;
         bool var_r4 = 1;
         bool var_r3 = 0;
         
         if (mProcID == PROC_FISHING_CAST) {
-            bool var_r5 = 0;
+            var_r5 = 0;
 
             if (mItemActor.getActor() != NULL && mItemActor.getActor()->mEvtInfo.i_checkCommandDemoAccrpt() != 0) {
                 var_r5 = 1;
@@ -4633,7 +4634,7 @@ public:
         FORCE_PANIC = 8,
     };
 
-    enum daMidna_FLG0 { NPC_NEAR = 0x100000, NPC_FAR = 0x40000 };
+    enum daMidna_FLG0 { NPC_NEAR = 0x100000, NPC_FAR = 0x40000, NO_DRAW = 0x2000 };
 
     enum daMidna_FLG1 { FORCE_NORMAL_COLOR = 8, FORCE_TIRED_COLOR = 4 };
 
@@ -4699,6 +4700,7 @@ public:
     void changeDemoMode(u32 mode) { mDemoMode = mode; }
     BOOL checkNpcNear() { return checkStateFlg0(NPC_NEAR); }
     BOOL checkNpcFar() { return checkStateFlg0(NPC_FAR); }
+    BOOL checkNoDraw() const { return checkStateFlg0(NO_DRAW); }
 
     inline bool checkMidnaRealBody();
 
diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h
index 7f70be553a..9043847a0f 100644
--- a/include/d/a/d_a_player.h
+++ b/include/d/a/d_a_player.h
@@ -157,6 +157,8 @@ private:
 };  // Size: 0x24
 
 class daMidna_c;
+class daPy_py_c;
+inline daPy_py_c* dComIfGp_getLinkPlayer();
 
 class daPy_py_c : public fopAc_ac_c {
 public:
@@ -351,7 +353,7 @@ public:
     /* 80182A10 */ void checkGoronSideMove() const;
     /* 80182AAC */ void getRightFootPosP();
     /* 80182AB4 */ void getLeftFootPosP();
-    /* 80182ABC */ u32 getMidnaActor();
+    /* 80182ABC */ //u32 getMidnaActor();
     /* 80182AC4 */ void checkCopyRodThrowAfter() const;
     /* 80182AD8 */ void checkRide() const;
     /* 80182B9C */ void getRightHandPos() const;
@@ -589,6 +591,9 @@ public:
     inline BOOL i_checkSwordGet();
     inline bool i_checkShieldGet() const;
     inline static BOOL checkNowWolf();
+    inline static BOOL i_checkNowWolf() {
+        return dComIfGp_getLinkPlayer()->i_checkWolf();
+    }
     inline bool checkZoraWearFlg() const;
     inline bool checkMagicArmorWearFlg() const;
 
diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h
index 9207fa790d..4165f2dd6a 100644
--- a/include/d/com/d_com_inf_game.h
+++ b/include/d/com/d_com_inf_game.h
@@ -1514,6 +1514,10 @@ inline dAttention_c& dComIfGp_getAttention() {
     return g_dComIfG_gameInfo.play.getAttention();
 }
 
+inline u8 dComIfGp_att_getCatchChgItem() {
+    return dComIfGp_getAttention().getCatchChgItem();
+}
+
 inline J2DGrafContext* dComIfGp_getCurrentGrafPort() {
     return g_dComIfG_gameInfo.play.getCurrentGrafPort();
 }
diff --git a/include/d/d_attention.h b/include/d/d_attention.h
index d288f00c3c..12b995f6ea 100644
--- a/include/d/d_attention.h
+++ b/include/d/d_attention.h
@@ -31,6 +31,7 @@ public:
     void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int);
 
     s32 getCatghTarget() { return convPId(field_0x10); }
+    u8 getChangeItem() { return mChangeItem; }
 
 private:
     void* field_0x0;
@@ -203,6 +204,7 @@ public:
     /* 8014B010 */ void getDistTable(int);
 
     dAttCatch_c& getCatghTarget() { return mCatghTarget; }
+    u8 getCatchChgItem() { return mCatghTarget.getChangeItem(); }
     BOOL chkFlag(u32 flag) { return mFlags & flag; }
     s8 Lockon() {
         /* s32 chk = true;
diff --git a/include/d/event/d_event.h b/include/d/event/d_event.h
index 7557d3cb3f..c8b7cc9c1d 100644
--- a/include/d/event/d_event.h
+++ b/include/d/event/d_event.h
@@ -32,8 +32,8 @@ class dEvt_control_c {
 public:
     dEvt_control_c();
     s32 orderOld(u16, u16, u16, u16, void*, void*, void const*);
-    s32 order(u16 eventType, u16 priority, u16 flag, u16 param_3, void* param_4,
-              void* param_5, s16 eventID, u8 infoIdx);
+    s32 order(u16 eventType, u16 priority, u16 flag, u16 param_3, void* param_4, void* param_5,
+              s16 eventID, u8 infoIdx);
     void setParam(dEvt_order_c*);
     s32 beforeFlagProc(dEvt_order_c*);
     void afterFlagProc(dEvt_order_c*);
@@ -41,9 +41,9 @@ public:
     int talkCheck(dEvt_order_c*);
     int talkXyCheck(dEvt_order_c*);
     int catchCheck(dEvt_order_c*);
-    void talkEnd();
+    int talkEnd();
     int demoCheck(dEvt_order_c*);
-    void demoEnd();
+    int demoEnd();
     int potentialCheck(dEvt_order_c*);
     int doorCheck(dEvt_order_c*);
     int itemCheck(dEvt_order_c*);