Add enums for msg icons and control codesHEADmain

6 files changed, 128 insertions, 43 deletions

diff --git a/src/d/d_auction_screen.cpp b/src/d/d_auction_screen.cpp
index 98e00d4a..617e68d0 100644
--- a/src/d/d_auction_screen.cpp
+++ b/src/d/d_auction_screen.cpp
@@ -263,7 +263,6 @@ void dAuction_screen_c::rupeeCountDown() {
 
 /* 8016013C-801604A0       .text slotShowAnime__17dAuction_screen_cFv */
 void dAuction_screen_c::slotShowAnime() {
-
     if (slotShow) {
         if (field_0xc.mUserArea <= 7) {
             field_0xc.mUserArea++;
diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp
index 054baa84..0e2b349c 100644
--- a/src/d/d_menu_option.cpp
+++ b/src/d/d_menu_option.cpp
@@ -704,14 +704,14 @@ void dMenu_Option_c::noteSet() {
         if(m0B0[i].mUserArea != -1) {
             continue;
         }
-        if (r6 == 0x16) {
+        if (r6 == fopMsgM_Icon_INPUT_e) {
             continue;
         }
         m0B0[i].mPosTopLeft.x = (f32)msgDataProc.getIconPosX(i);
         m0B0[i].mPosTopLeft.y = f30_2 + (f32)(msgDataProc.getIconPosY(i) * 2 * r31);
-        m0B0[i].mPosTopLeftOrig.y = (f32)r6;
+        m0B0[i].mPosTopLeftOrig.y = (f32)r6; // ?
 
-        fopMsgM_outFontSet((J2DPicture*)m0B0[i].pane, &m0B0[i].mUserArea, 0xFF, r6);
+        fopMsgM_outFontSet((J2DPicture*)m0B0[i].pane, &m0B0[i].mUserArea, 0x000000FF, r6);
     }
 }
 
diff --git a/src/d/d_message.cpp b/src/d/d_message.cpp
index 3758fa14..1d142033 100644
--- a/src/d/d_message.cpp
+++ b/src/d/d_message.cpp
@@ -406,17 +406,26 @@ void dMsg2_messageOut(sub_msg2_class* i_Msg, u8 i_index, int i_aimLine) {
     i_Msg->msgDataProc[i_index].stringSet();
 
     for (int i = 0; i < 8; i++) {
-        u8 var_r30 = i_Msg->msgDataProc[i_index].getIconNum(i);
-        u32 var_r29 = i_Msg->msgDataProc[i_index].getIconColor(i);
+        u8 iconNum = i_Msg->msgDataProc[i_index].getIconNum(i);
+        u32 iconColor = i_Msg->msgDataProc[i_index].getIconColor(i);
 
-        if (var_r30 != 0xFF && bbuttonTimer[i][i_index] == -1) {
+        if (iconNum != fopMsgM_Icon_NONE_e && bbuttonTimer[i][i_index] == -1) {
             JKRHeap* heap = mDoExt_setCurrentHeap(i_Msg->Heap);
 
-            if ((var_r30 == 10 || var_r30 == 11 || var_r30 == 12 || var_r30 == 13 || var_r30 == 0x15 || var_r30 == 0x17) && var_r29 == 0) {
-                var_r29 = -1;
+            if (
+                (
+                    iconNum == fopMsgM_Icon_ARROW_LEFT_e ||
+                    iconNum == fopMsgM_Icon_ARROW_RIGHT_e ||
+                    iconNum == fopMsgM_Icon_ARROW_UP_e ||
+                    iconNum == fopMsgM_Icon_ARROW_DOWN_e ||
+                    iconNum == fopMsgM_Icon_SELECT_YOKO_RIGHT_e ||
+                    iconNum == fopMsgM_Icon_FLASHING_A_BUTTON_e
+                ) && iconColor == 0
+            ) {
+                iconColor = 0xFFFFFFFF;
             }
 
-            fopMsgM_outFontSet(bbutton_icon[i][i_index], bbutton_kage[i][i_index], &bbuttonTimer[i][i_index], var_r29, var_r30);
+            fopMsgM_outFontSet(bbutton_icon[i][i_index], bbutton_kage[i][i_index], &bbuttonTimer[i][i_index], iconColor, iconNum);
 
             mDoExt_setCurrentHeap(heap);
         }
@@ -944,7 +953,7 @@ void dDlst_2DMSG2_c::outFontDraw() {
             int posY = actorP->msgDataProc[i].getIconPosY(j);
             int scale = actorP->msgDataProc[i].getIconScale(j);
 
-            if (iconNum != 0xFF) {
+            if (iconNum != fopMsgM_Icon_NONE_e) {
                 u8 r14;
                 J2DTextBox* scrn = (J2DTextBox*)actorP->text_pane[i].pane;
                 int r18 = (f32)posX + scrn->getGlbBounds().i.x;
diff --git a/src/d/d_msg.cpp b/src/d/d_msg.cpp
index a3dad21b..8ace07d9 100644
--- a/src/d/d_msg.cpp
+++ b/src/d/d_msg.cpp
@@ -124,7 +124,12 @@ void dDlst_2DMSG_c::outFontDraw() {
         int posX = mpMsg->mMsgDataProc.getIconPosX(i);
         int posY = mpMsg->mMsgDataProc.getIconPosY(i);
         int scale = mpMsg->mMsgDataProc.getIconScale(i);
-        if (iconNum != 0xFF && iconNum != 0x14 && iconNum != 0x15 && iconNum != 0x16) {
+        if (
+            iconNum != fopMsgM_Icon_NONE_e &&
+            iconNum != fopMsgM_Icon_SELECT_YOKO_LEFT_e &&
+            iconNum != fopMsgM_Icon_SELECT_YOKO_RIGHT_e &&
+            iconNum != fopMsgM_Icon_INPUT_e
+        ) {
             J2DScreen* scrn = (J2DScreen*)mpMsg->m0544[0].pane;
             int r5 = posX + scrn->mBounds.i.x;
             int r6;
@@ -1493,7 +1498,7 @@ void dMsg_numberInput(sub_msg_class* i_Msg) {
     static char* num_str[] = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9"};
 
     for (s32 i = 0; i < 8; i++) {
-        if (i_Msg->mMsgDataProc.getIconNum(i) == 0x16) {
+        if (i_Msg->mMsgDataProc.getIconNum(i) == fopMsgM_Icon_INPUT_e) {
             i_Msg->m10EC = ((i_Msg->m0544[0].pane)->mBounds.i.x + i_Msg->mMsgDataProc.getIconPosX(i));
             i_Msg->m10F0 = ((i_Msg->m0544[0].pane)->mBounds.i.y + (i_Msg->m1104 * (s32)((3 - i_Msg->m1108) + (i_Msg->mMsgDataProc.getIconPosY(i)) * 2)));
         }
@@ -1828,10 +1833,25 @@ void dMsg_messageShow(sub_msg_class* i_Msg) {
     for (s32 i = 0; i < 8; i++) {
         u8 iconNum = i_Msg->mMsgDataProc.getIconNum(i);
         u32 iconColor = i_Msg->mMsgDataProc.getIconColor(i);
-        if ((iconNum == 0xA || iconNum == 0xB || iconNum == 0xC || iconNum == 0xD || iconNum == 0x15 || iconNum == 0x17) && iconColor == 0) {
-            iconColor = -1;
-        }
-        if (((iconNum != 0xFF) && (buttonTimer[i] == -1)) && (iconNum != 0x14 && (iconNum != 0x15 && (iconNum != 0x16)))) {
+        if (
+            (
+                iconNum == fopMsgM_Icon_ARROW_LEFT_e ||
+                iconNum == fopMsgM_Icon_ARROW_RIGHT_e ||
+                iconNum == fopMsgM_Icon_ARROW_UP_e ||
+                iconNum == fopMsgM_Icon_ARROW_DOWN_e ||
+                iconNum == fopMsgM_Icon_SELECT_YOKO_RIGHT_e ||
+                iconNum == fopMsgM_Icon_FLASHING_A_BUTTON_e
+            ) && iconColor == 0
+        ) {
+            iconColor = 0xFFFFFFFF;
+        }
+        if (
+            iconNum != fopMsgM_Icon_NONE_e &&
+            buttonTimer[i] == -1 &&
+            iconNum != fopMsgM_Icon_SELECT_YOKO_LEFT_e &&
+            iconNum != fopMsgM_Icon_SELECT_YOKO_RIGHT_e &&
+            iconNum != fopMsgM_Icon_INPUT_e
+        ) {
             fopMsgM_outFontSet(button_icon[i], button_kage[i], &buttonTimer[i], iconColor, iconNum);
         }
     }
@@ -2027,10 +2047,10 @@ s32 dMsg_selectProc(sub_msg_class* i_Msg) {
         s32 var_r11 = 0;
         for (s32 i = 0; i < 8; i++) {
             u8 iconNum = i_Msg->mMsgDataProc.getIconNum(i);
-            if (iconNum == 0x14) {
+            if (iconNum == fopMsgM_Icon_SELECT_YOKO_LEFT_e) {
                 var_r5 = i_Msg->m0544[0].pane->mBounds.i.x + i_Msg->mMsgDataProc.getIconPosX(i);
                 var_r6 = i_Msg->m0544[0].pane->mBounds.i.y + i_Msg->m1104 * ((2 - i_Msg->m1108) + (i_Msg->mMsgDataProc.getIconPosY(i) * 2));
-            } else if (iconNum == 0x15) {
+            } else if (iconNum == fopMsgM_Icon_SELECT_YOKO_RIGHT_e) {
                 var_r11 = (i_Msg->m0544[0].pane->mBounds.i.x + (i_Msg->mMsgDataProc.getIconPosX(i)));
             }
         }
@@ -2151,12 +2171,27 @@ s32 dMsg_demoProc(sub_msg_class* i_Msg) {
                         i_Msg->mMsgDataProc.field_0x299 = 1;
                         i_Msg->mMsgDataProc.stringSet();
                         for (int j = 0; j < 8; j++) {
-                            u8 iconNum = i_Msg->mMsgDataProc.iconNum[j];
+                            u8 iconNum = i_Msg->mMsgDataProc.getIconNum(j);
                             u32 iconColor = i_Msg->mMsgDataProc.getIconColor(j);
-                            if ((iconNum == 0xA || iconNum == 0xB || iconNum == 0xC || iconNum == 0xD || iconNum == 0x15 || iconNum == 0x17) && iconColor == 0) {
-                                iconColor = -1;
+                            if (
+                                (
+                                    iconNum == fopMsgM_Icon_ARROW_LEFT_e ||
+                                    iconNum == fopMsgM_Icon_ARROW_RIGHT_e ||
+                                    iconNum == fopMsgM_Icon_ARROW_UP_e ||
+                                    iconNum == fopMsgM_Icon_ARROW_DOWN_e ||
+                                    iconNum == fopMsgM_Icon_SELECT_YOKO_RIGHT_e ||
+                                    iconNum == fopMsgM_Icon_FLASHING_A_BUTTON_e
+                                ) && iconColor == 0
+                            ) {
+                                iconColor = 0xFFFFFFFF;
                             }
-                            if (((iconNum != 0xFF) && (buttonTimer[j] == -1)) && (iconNum != 0x14 && (iconNum != 0x15 && (iconNum != 0x16)))) {
+                            if (
+                                iconNum != fopMsgM_Icon_NONE_e &&
+                                buttonTimer[j] == -1 &&
+                                iconNum != fopMsgM_Icon_SELECT_YOKO_LEFT_e &&
+                                iconNum != fopMsgM_Icon_SELECT_YOKO_RIGHT_e &&
+                                iconNum != fopMsgM_Icon_INPUT_e
+                            ) {
                                 fopMsgM_outFontSet(button_icon[j], button_kage[j], &buttonTimer[j], iconColor, iconNum);
                             }
                         }
@@ -2211,14 +2246,20 @@ s32 dMsg_continueProc(sub_msg_class* i_Msg) {
 
     iVar1 = (int)((J2DTextBox*)i_Msg->m0544[0].pane)->getCharSpace();
     iVar2 = (int)((J2DTextBox*)i_Msg->m0544[1].pane)->getCharSpace();
-    if (((((CPad_CHECK_TRIG_A(0)) || (CPad_CHECK_TRIG_B(0))) || (i_Msg->mMsgDataProc.getSelectFlag() != 0)) ||
-         (fopMsgM_checkMessageSend() || (i_Msg->mMsgNo == 0x5ac && (dComIfGp_checkMesgCancelButton())))) &&
-        (!dComIfGp_checkMesgBgm()))
-    {
+    if (
+        (
+            CPad_CHECK_TRIG_A(0) ||
+            CPad_CHECK_TRIG_B(0) ||
+            i_Msg->mMsgDataProc.getSelectFlag() != fopMsgM_msgDataProc_c::Select_OFF ||
+            fopMsgM_checkMessageSend() ||
+            (i_Msg->mMsgNo == 0x5ac && dComIfGp_checkMesgCancelButton())
+        ) &&
+        !dComIfGp_checkMesgBgm()
+    ) {
         i_Msg->mMsgDataProc.setSelectFlagOff();
         i_Msg->m1100 = 0;
         JKRFileLoader::removeResource(i_Msg->head_p, NULL);
-        if ((i_Msg->mMesgEntry.mTextboxType != 5) && (i_Msg->mMesgEntry.mTextboxType != 0xe)) {
+        if (i_Msg->mMesgEntry.mTextboxType != 5 && i_Msg->mMesgEntry.mTextboxType != 0xe) {
             dMsg_arrowInit(i_Msg);
         }
         if (CPad_CHECK_TRIG_B(0)) {
@@ -2405,10 +2446,16 @@ s32 dMsg_closewaitProc(sub_msg_class* i_Msg) {
 
 /* 80213830-80213960       .text dMsg_finishProc__FP13sub_msg_class */
 s32 dMsg_finishProc(sub_msg_class* i_Msg) {
-    if ((((((CPad_CHECK_TRIG_A(0)) || (CPad_CHECK_TRIG_B(0))) || (i_Msg->mMsgDataProc.getSelectFlag() != 0)) || (fopMsgM_checkMessageSend())) ||
-         (i_Msg->mMsgNo == 0x5ac && (dComIfGp_checkMesgCancelButton()))) &&
-        (!dComIfGp_checkMesgBgm()))
-    {
+    if (
+        (
+            CPad_CHECK_TRIG_A(0) ||
+            CPad_CHECK_TRIG_B(0) ||
+            i_Msg->mMsgDataProc.getSelectFlag() != fopMsgM_msgDataProc_c::Select_OFF ||
+            fopMsgM_checkMessageSend() ||
+            (i_Msg->mMsgNo == 0x5ac && dComIfGp_checkMesgCancelButton())
+        ) &&
+        !dComIfGp_checkMesgBgm()
+    ) {
         i_Msg->mMsgDataProc.setSelectFlagOff();
         i_Msg->mStatus = fopMsgStts_BOX_CLOSING_e;
         if ((i_Msg->mMesgEntry.mTextboxType != 5) && (i_Msg->mMesgEntry.mTextboxType != 0xe)) {
@@ -2516,10 +2563,25 @@ s32 dMsg_openTactProc(sub_msg_class* i_Msg) {
         for (s32 i = 0; i < 8; i++) {
             u8 iconNum = i_Msg->mMsgDataProc.getIconNum(i);
             u32 iconColor = i_Msg->mMsgDataProc.getIconColor(i);
-            if ((iconNum == 0xA || iconNum == 0xB || iconNum == 0xC || iconNum == 0xD || iconNum == 0x15 || iconNum == 0x17) && iconColor == 0) {
-                iconColor = -1;
+            if (
+                (
+                    iconNum == fopMsgM_Icon_ARROW_LEFT_e ||
+                    iconNum == fopMsgM_Icon_ARROW_RIGHT_e ||
+                    iconNum == fopMsgM_Icon_ARROW_UP_e ||
+                    iconNum == fopMsgM_Icon_ARROW_DOWN_e ||
+                    iconNum == fopMsgM_Icon_SELECT_YOKO_RIGHT_e ||
+                    iconNum == fopMsgM_Icon_FLASHING_A_BUTTON_e
+                ) && iconColor == 0
+            ) {
+                iconColor = 0xFFFFFFFF;
             }
-            if (((iconNum != 0xFF) && (buttonTimer[i] == -1)) && (iconNum != 0x14 && (iconNum != 0x15 && (iconNum != 0x16)))) {
+            if (
+                iconNum != fopMsgM_Icon_NONE_e &&
+                buttonTimer[i] == -1 &&
+                iconNum != fopMsgM_Icon_SELECT_YOKO_LEFT_e &&
+                iconNum != fopMsgM_Icon_SELECT_YOKO_RIGHT_e &&
+                iconNum != fopMsgM_Icon_INPUT_e
+            ) {
                 fopMsgM_outFontSet(button_icon[i], button_kage[i], &buttonTimer[i], iconColor, iconNum);
             }
         }
@@ -2649,10 +2711,25 @@ s32 dMsg_outnowProc(sub_msg_class* i_Msg) {
         for (s32 i = 0; i < 8; i++) {
             u8 iconNum = i_Msg->mMsgDataProc.getIconNum(i);
             u32 iconColor = i_Msg->mMsgDataProc.getIconColor(i);
-            if ((iconNum == 0xA || iconNum == 0xB || iconNum == 0xC || iconNum == 0xD || iconNum == 0x15 || iconNum == 0x15) && iconColor == 0) {
-                iconColor = -1;
+            if (
+                (
+                    iconNum == fopMsgM_Icon_ARROW_LEFT_e ||
+                    iconNum == fopMsgM_Icon_ARROW_RIGHT_e ||
+                    iconNum == fopMsgM_Icon_ARROW_UP_e ||
+                    iconNum == fopMsgM_Icon_ARROW_DOWN_e ||
+                    iconNum == fopMsgM_Icon_SELECT_YOKO_RIGHT_e ||
+                    iconNum == fopMsgM_Icon_SELECT_YOKO_RIGHT_e // !@bug: The same value is checked twice here
+                ) && iconColor == 0
+            ) {
+                iconColor = 0xFFFFFFFF;
             }
-            if (iconNum != 0xFF && buttonTimer[i] == -1 && iconNum != 0x14 && iconNum != 0x15 && iconNum != 0x16) {
+            if (
+                iconNum != fopMsgM_Icon_NONE_e &&
+                buttonTimer[i] == -1 &&
+                iconNum != fopMsgM_Icon_SELECT_YOKO_LEFT_e &&
+                iconNum != fopMsgM_Icon_SELECT_YOKO_RIGHT_e &&
+                iconNum != fopMsgM_Icon_INPUT_e
+            ) {
                 fopMsgM_outFontSet(button_icon[i], button_kage[i], &buttonTimer[i], iconColor, iconNum);
             }
         }
diff --git a/src/d/d_picture_box.cpp b/src/d/d_picture_box.cpp
index 9d99a346..974009b9 100644
--- a/src/d/d_picture_box.cpp
+++ b/src/d/d_picture_box.cpp
@@ -1722,7 +1722,7 @@ void dJle_Pb_c::messageSet(u32 msgNo) {
         u8 icon = mMsgDataProc.getIconNum(i);
         u32 fontColor = mMsgDataProc.getStringColor();
 
-        if (icon == 20) {
+        if (icon == fopMsgM_Icon_SELECT_YOKO_LEFT_e) {
             mChoiceCursorX0 = (int)(
                 ((J2DTextBox*)pane_tx[0].pane)->mBounds.i.x +
                 (f32)mMsgDataProc.getIconPosX(i)
@@ -1748,7 +1748,7 @@ void dJle_Pb_c::messageSet(u32 msgNo) {
                 firstChoiceSeen = 0;
                 mSelectedChoiceIndex = 0;
             }
-        } else if (icon == 0x15) {
+        } else if (icon == fopMsgM_Icon_SELECT_YOKO_RIGHT_e) {
             mChoiceCursorX1 = (int)(
                 ((J2DTextBox*)pane_tx[0].pane)->mBounds.i.x +
                 (f32)mMsgDataProc.getIconPosX(i)
@@ -2172,7 +2172,7 @@ void dJle_Pb_c::draw() {
             } else {
                 u8 iconNo = mMsgDataProc.getIconNum(idx);
             
-                if (iconNo != 0xFF && iconNo != 20 && iconNo != 0x15) {
+                if (iconNo != fopMsgM_Icon_NONE_e && iconNo != fopMsgM_Icon_SELECT_YOKO_LEFT_e && iconNo != fopMsgM_Icon_SELECT_YOKO_RIGHT_e) {
                     int posX = mMsgDataProc.getIconPosX(idx);
                     int posY = mMsgDataProc.getIconPosY(idx);
                     int scale = mMsgDataProc.getIconScale(idx);
@@ -2234,7 +2234,7 @@ void dJle_Pb_c::draw() {
             } else {
                 u8 iconNo = mMsgDataProc.getIconNum(idx);
             
-                if (iconNo != 0xFF && iconNo != 20 && iconNo != 0x15) {
+                if (iconNo != fopMsgM_Icon_NONE_e && iconNo != fopMsgM_Icon_SELECT_YOKO_LEFT_e && iconNo != fopMsgM_Icon_SELECT_YOKO_RIGHT_e) {
                     int posX = mMsgDataProc.getIconPosX(idx);
                     int posY = mMsgDataProc.getIconPosY(idx);
                     int scale = mMsgDataProc.getIconScale(idx);
diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp
index 7ab24e74..73af723d 100644
--- a/src/d/d_scope.cpp
+++ b/src/d/d_scope.cpp
@@ -938,7 +938,7 @@ BOOL dScp_outnowProc(sub_scp_class* i_Scp) {
 
 /* 8023A2AC-8023A354       .text dScp_continueProc__FP13sub_scp_class */
 BOOL dScp_continueProc(sub_scp_class* i_Scp) {
-    if (CPad_CHECK_TRIG_A(0) || CPad_CHECK_TRIG_B(0) || i_Scp->mMesgDataProc.getSelectFlag() != 0) {
+    if (CPad_CHECK_TRIG_A(0) || CPad_CHECK_TRIG_B(0) || i_Scp->mMesgDataProc.getSelectFlag() != fopMsgM_msgDataProc_c::Select_OFF) {
         i_Scp->mMesgDataProc.setSelectFlagOff();
         JKRFileLoader::removeResource(i_Scp->head_p, NULL);
         dScp_talkBeforeProc(i_Scp);