d_a_npc_btsw2 100%, weak order not matching

include/JSystem/J3DGraphAnimator/J3DAnimation.h

@@ -827,7 +827,7 @@ public:
     }
     s16 getEnd() const { return mEnd; }
     void setEnd(s16 end) { mEnd = end; }
-    s32 getLoop() { return mLoop; }
+    s32 getLoop() const { return mLoop; }
     void setLoop(s16 loop) { mLoop = loop; }
     f32 getRate() const { return mRate; }
     void setRate(f32 rate) { mRate = rate; }

include/d/actor/d_a_npc_btsw2.h

@@ -24,7 +24,7 @@ public:
     BOOL initTexPatternAnm(bool);
     void playTexPatternAnm();
     void setAnm(s8);
-    void chkAttention(cXyz, s16);
+    bool chkAttention(cXyz, s16);
     void eventOrder();
     void checkOrder();
     virtual void anmAtr(u16);
@@ -52,38 +52,34 @@ public:
     /* 0x6D4 */ J3DModel* m6D4;
     /* 0x6D8 */ J3DAnmTexPattern* m_btp;
     /* 0x6DC */ mDoExt_btpAnm mBtpAnm;
-    /* 0x6F0 */ s8 m6F0;
+    /* 0x6F0 */ u8 m6F0;
     /* 0x6F1 */ s8 m6F1;
     /* 0x6F2 */ s8 m6F2;
-    /* 0x6F3 */ u8 m6F3[0x6F4 - 0x6F3];
     /* 0x6F4 */ s16 m6F4;
     /* 0x6F6 */ u8 m6F6[0x704 - 0x6F6];
     /* 0x704 */ cXyz m704;
     /* 0x710 */ u8 m710[0x714 - 0x710];
     /* 0x714 */ csXyz m714;
     /* 0x71A */ u8 m71A[0x71D - 0x71A];
-    /* 0x71D */ u8 m71D;
+    /* 0x71D */ bool m71D;
     /* 0x71E */ bool m71E;
     /* 0x71F */ u8 m71F[0x724 - 0x71F];
     /* 0x724 */ u8 m724;
-    /* 0x725 */ u8 m725[0x728 - 0x725];
     /* 0x728 */ ActionFunc mCurrActionFunc;
     /* 0x734 */ s8 mPathNo;
     /* 0x735 */ u8 m735;
     /* 0x736 */ u8 m736;
-    /* 0x737 */ u8 m737[0x738 - 0x737];
     /* 0x738 */ dPath* mpPath;
     /* 0x73C */ s16 m73C;
     /* 0x73E */ s16 m73E;
     /* 0x740 */ s16 m740;
     /* 0x742 */ s16 m742;
     /* 0x744 */ s8 m744;
-    /* 0x745 */ u8 m745;
-    /* 0x746 */ u8 m746;
-    /* 0x747 */ u8 m747;
+    /* 0x745 */ s8 m745;
+    /* 0x746 */ s8 m746;
+    /* 0x747 */ s8 m747;
     /* 0x748 */ u8 m748[0x74A - 0x748];
     /* 0x74A */ s8 m74A;
-    /* 0x74B */ u8 m74B[0x74C - 0x74B];
 };
 
 class daNpc_Btsw2_HIO_c {

include/d/d_com_inf_game.h

@@ -560,6 +560,11 @@ public:
     u8 getMelodyNum() { return mMelodyNum; }
     void setMelodyNum(u8 melody) { mMelodyNum = melody; }
 
+    u8 getBaseAnimeID() { return mMesgAnime; }
+    void clearBaseAnimeID() { mMesgAnime = 0xFF; }
+    u8 getNowAnimeID() { return mMesgAnimeTagInfo; }
+    void clearNowAnimeID() { mMesgAnimeTagInfo = 0xFF; }
+
     /* 0x0000 */ dBgS mBgS;
     /* 0x1404 */ dCcS mCcS;
     /* 0x3DF8 */ dADM mADM;
@@ -2358,6 +2363,22 @@ inline void dComIfGp_setMelodyNum(u8 melody) {
     g_dComIfG_gameInfo.play.setMelodyNum(melody);
 }
 
+inline u8 dComIfGp_getMesgAnimeAttrInfo() {
+    return g_dComIfG_gameInfo.play.getBaseAnimeID();
+}
+
+inline void dComIfGp_clearMesgAnimeAttrInfo() {
+    g_dComIfG_gameInfo.play.clearBaseAnimeID();
+}
+
+inline u8 dComIfGp_getMesgAnimeTagInfo() {
+    return g_dComIfG_gameInfo.play.getNowAnimeID();
+}
+
+inline void dComIfGp_clearMesgAnimeTagInfo() {
+    g_dComIfG_gameInfo.play.clearNowAnimeID();
+}
+
 /**
  * === EVENT ===
  */

include/d/d_snap.h

@@ -157,7 +157,7 @@ enum {
     /* 0x95 */ DSNAP_TYPE_UNK95,
     /* 0x96 */ DSNAP_TYPE_UNK96,
     /* 0x97 */ DSNAP_TYPE_UNK97,
-    /* 0x98 */ DSNAP_TYPE_UNK98,
+    /* 0x98 */ DSNAP_TYPE_BTSW,
     /* 0x99 */ DSNAP_TYPE_DR,
     /* 0x9A */ DSNAP_TYPE_UNK9A,
     /* 0x9B */ DSNAP_TYPE_UNK9B,