msgStatus cleanup

include/d/d_npc.h

@@ -270,7 +270,7 @@ public:
 
     virtual u16 next_msgStatus(u32* pMsgNo) { return fopMsgStts_MSG_ENDS_e; }
     virtual u32 getMsg() { return 0; }
-    virtual void anmAtr(u16) {}
+    virtual void anmAtr(u16 i_msgStatus) {}
 
     void setCollision(float radius, float height);
     u16 talk(int);

src/d/actor/d_a_npc_bmsw.cpp

@@ -557,7 +557,7 @@ u32 daNpc_Bmsw_c::getMsg() {
 }
 
 /* 0000102C-000010C0       .text anmAtr__12daNpc_Bmsw_cFUs */
-void daNpc_Bmsw_c::anmAtr(unsigned short mesgNo) {
+void daNpc_Bmsw_c::anmAtr(u16 i_msgStatus) {
     switch (dComIfGp_getMesgAnimeAttrInfo()) {
         case 5:
             setAnm(1);

src/d/actor/d_a_npc_btsw.cpp

@@ -418,7 +418,7 @@ u32 daNpc_Btsw_c::getMsg() {
 }
 
 /* 00000DF0-00000F0C       .text anmAtr__12daNpc_Btsw_cFUs */
-void daNpc_Btsw_c::anmAtr(unsigned short mesgNo) {
+void daNpc_Btsw_c::anmAtr(u16 i_msgStatus) {
     switch (dComIfGp_getMesgAnimeAttrInfo()) {
         case 0:
             setAnm(0);

src/d/actor/d_a_npc_btsw2.cpp

@@ -257,7 +257,7 @@ void daNpc_Btsw2_c::checkOrder() {
 }
 
 /* 00000860-0000097C       .text anmAtr__13daNpc_Btsw2_cFUs */
-void daNpc_Btsw2_c::anmAtr(u16) {
+void daNpc_Btsw2_c::anmAtr(u16 i_msgStatus) {
     switch (dComIfGp_getMesgAnimeAttrInfo()) {
     case 0:
         setAnm(0);

src/d/actor/d_a_npc_hi1.cpp

@@ -371,9 +371,9 @@ void daNpc_Hi1_c::setAnm_ATR() {
 }
 
 /* 00000D1C-00000DD8       .text anmAtr__11daNpc_Hi1_cFUs */
-void daNpc_Hi1_c::anmAtr(u16 param_1) {
-    switch (param_1) {
-        case 6:
+void daNpc_Hi1_c::anmAtr(u16 i_msgStatus) {
+    switch (i_msgStatus) {
+        case fopMsgStts_MSG_TYPING_e: {
             if(field_0x7C8 == 0) {
                 chngAnmAtr(dComIfGp_getMesgAnimeAttrInfo());
                 field_0x7C8++;
@@ -385,7 +385,8 @@ void daNpc_Hi1_c::anmAtr(u16 param_1) {
                 chngAnmTag();
             }
             break;
-        case 0xe:
+        }
+        case fopMsgStts_MSG_DISPLAYED_e:
             field_0x7C8 = 0;
             break;
         default:
@@ -397,7 +398,7 @@ void daNpc_Hi1_c::anmAtr(u16 param_1) {
 
 /* 00000DD8-00000DE0       .text next_msgStatus__11daNpc_Hi1_cFPUl */
 u16 daNpc_Hi1_c::next_msgStatus(u32* pMsgNo) {
-    return 0x10;
+    return fopMsgStts_MSG_ENDS_e;
 }
 
 /* 00000DE0-00000DE8       .text getMsg_HI1_0__11daNpc_Hi1_cFv */

src/d/actor/d_a_npc_km1.cpp

@@ -298,8 +298,8 @@ void daNpc_Km1_c::setAnm_ATR(int param_1) {
 }
 
 /* 00000B50-00000C0C       .text anmAtr__11daNpc_Km1_cFUs */
-void daNpc_Km1_c::anmAtr(unsigned short param_1) {
-    if(param_1 == 6){
+void daNpc_Km1_c::anmAtr(u16 i_msgStatus) {
+    if(i_msgStatus == fopMsgStts_MSG_TYPING_e){
         if(field_0x7D6 == 0){
             field_0x7CC = 0xFF;
             chngAnmAtr(dComIfGp_getMesgAnimeAttrInfo());
@@ -311,7 +311,7 @@ void daNpc_Km1_c::anmAtr(unsigned short param_1) {
             field_0x7CC = uVar1;
             chngAnmTag();
         }
-    }else if(param_1 == 0xE){
+    }else if(i_msgStatus == fopMsgStts_MSG_DISPLAYED_e){
         field_0x7D6 = 0;
     }
     ctrlAnmAtr();

src/d/actor/d_a_npc_nz.cpp

@@ -726,7 +726,7 @@ u16 daNpc_Nz_c::next_msgStatus(u32* pMsgNo) {
 }
 
 /* 00002038-000022C0       .text anmAtr__10daNpc_Nz_cFUs */
-void daNpc_Nz_c::anmAtr(u16) {
+void daNpc_Nz_c::anmAtr(u16 i_msgStatus) {
     if(field_0x6D5 == 9 && mpMorf->checkFrame(mpMorf->getEndFrame() - 1.0f)) {
         setAnm(0, false);
     }

src/d/actor/d_a_pz.cpp

@@ -141,7 +141,7 @@ u16 daPz_c::next_msgStatus(unsigned long*) {
 }
 
 /* 00001208-00001288       .text anmAtr__6daPz_cFUs */
-void daPz_c::anmAtr(unsigned short) {
+void daPz_c::anmAtr(u16 i_msgStatus) {
     /* Nonmatching */
 }