tbox/camera/d_bg_w_kcol work and cleanup (#2262)

* some camera/tbox cleanup

* d_bg_w_kcol work

* make item name enum better

1 files changed, 53 insertions, 53 deletions

diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp
index c234885c7d..f3b12eeea4 100644
--- a/src/d/d_meter2_draw.cpp
+++ b/src/d/d_meter2_draw.cpp
@@ -1173,7 +1173,7 @@ void dMeter2Draw_c::initButton() {
         }
     }
 
-    mButtonBItem = SWORD;
+    mButtonBItem = fpcNm_ITEM_SWORD;
     changeTextureItemB(mButtonBItem);
 
     for (int i = 0; i < 2; i++) {
@@ -2362,10 +2362,10 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos
             mButtonBItem = dComIfGs_getSelectEquipSword();
 
             switch (dComIfGs_getSelectEquipSword()) {
-            case WOOD_STICK:
-            case SWORD:
-            case MASTER_SWORD:
-            case LIGHT_SWORD:
+            case fpcNm_ITEM_WOOD_STICK:
+            case fpcNm_ITEM_SWORD:
+            case fpcNm_ITEM_MASTER_SWORD:
+            case fpcNm_ITEM_LIGHT_SWORD:
                 changeTextureItemB(mButtonBItem);
                 break;
             default:
@@ -2375,8 +2375,8 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos
         }
     } else if (param_1 == true && i_action == 0x4F) {
         mpScreen->search('item_b_n')->show();
-        mButtonBItem = LURE_ROD;
-        changeTextureItemB(LURE_ROD);
+        mButtonBItem = fpcNm_ITEM_LURE_ROD;
+        changeTextureItemB(fpcNm_ITEM_LURE_ROD);
         var_r31 = 2;
     } else {
         mpScreen->search('item_b_n')->hide();
@@ -2483,7 +2483,7 @@ void dMeter2Draw_c::drawButtonS(u8 i_action) {
 void dMeter2Draw_c::drawButtonBin(u8 i_action) {
     int bottle_num = 0;
     for (int i = 0; i < 4; i++) {
-        if (dComIfGs_getItem((u8)(SLOT_11 + i), true) != NO_ITEM) {
+        if (dComIfGs_getItem((u8)(SLOT_11 + i), true) != fpcNm_ITEM_NONE) {
             bottle_num++;
         }
     }
@@ -2558,7 +2558,7 @@ void dMeter2Draw_c::drawButtonXY(int i_no, u8 i_itemNo, u8 i_action, bool param_
         mpTextXY[i_no]->hide();
 
         int var_r29;
-        if (i_itemNo == NO_ITEM || i_itemNo == 0) {
+        if (i_itemNo == fpcNm_ITEM_NONE || i_itemNo == 0) {
             mpScreen->search(tag[i_no])->hide();
             var_r29 = 1;
         } else {
@@ -3375,10 +3375,10 @@ char* dMeter2Draw_c::getActionString(u8 i_action, u8 i_type, u8* param_2) {
 /* 8021A468-8021A71C 214DA8 02B4+00 2/2 0/0 0/0 .text changeTextureItemB__13dMeter2Draw_cFUc */
 void dMeter2Draw_c::changeTextureItemB(u8 i_itemNo) {
     int var_r31 = 0;
-    if (i_itemNo == LURE_ROD) {
+    if (i_itemNo == fpcNm_ITEM_LURE_ROD) {
         var_r31 = 2;
-    } else if (i_itemNo == SWORD || i_itemNo == MASTER_SWORD || i_itemNo == WOOD_STICK ||
-               i_itemNo == LIGHT_SWORD)
+    } else if (i_itemNo == fpcNm_ITEM_SWORD || i_itemNo == fpcNm_ITEM_MASTER_SWORD || i_itemNo == fpcNm_ITEM_WOOD_STICK ||
+               i_itemNo == fpcNm_ITEM_LIGHT_SWORD)
     {
         var_r31 = 1;
     }
@@ -3421,8 +3421,8 @@ void dMeter2Draw_c::changeTextureItemB(u8 i_itemNo) {
 void dMeter2Draw_c::changeTextureItemXY(int i_no, u8 i_itemNo) {
     JUT_ASSERT(i_no < SELECT_MAX_e);
 
-    if (i_itemNo == LIGHT_ARROW) {
-        i_itemNo = BOW;
+    if (i_itemNo == fpcNm_ITEM_LIGHT_ARROW) {
+        i_itemNo = fpcNm_ITEM_BOW;
     }
 
     if (field_0x76c[i_no] == 0) {
@@ -3625,7 +3625,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) {
         mItemParams[SELECT_X_e].num_scale = g_drawHIO.mXItemNumScale;
     } else {
         switch (i_itemNo) {
-        case BOOMERANG:
+        case fpcNm_ITEM_BOOMERANG:
             mItemParams[SELECT_X_e].pos_x = 4.0f;
             mItemParams[SELECT_X_e].pos_y = -11.0f;
             mItemParams[SELECT_X_e].scale = 1.7f;
@@ -3634,7 +3634,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) {
             mItemParams[SELECT_X_e].num_pos_y = -9.2f;
             mItemParams[SELECT_X_e].num_scale = 0.95f;
             break;
-        case BOW:
+        case fpcNm_ITEM_BOW:
             mItemParams[SELECT_X_e].pos_x = 9.2f;
             mItemParams[SELECT_X_e].pos_y = -14.0f;
             mItemParams[SELECT_X_e].scale = 2.0f;
@@ -3643,7 +3643,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) {
             mItemParams[SELECT_X_e].num_pos_y = -9.2f;
             mItemParams[SELECT_X_e].num_scale = 0.95f;
             break;
-        case HVY_BOOTS:
+        case fpcNm_ITEM_HVY_BOOTS:
             mItemParams[SELECT_X_e].pos_x = 4.0f;
             mItemParams[SELECT_X_e].pos_y = -14.0f;
             mItemParams[SELECT_X_e].scale = 1.7f;
@@ -3652,7 +3652,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) {
             mItemParams[SELECT_X_e].num_pos_y = -9.2f;
             mItemParams[SELECT_X_e].num_scale = 0.95f;
             break;
-        case HOOKSHOT:
+        case fpcNm_ITEM_HOOKSHOT:
             mItemParams[SELECT_X_e].pos_x = 17.0f;
             mItemParams[SELECT_X_e].pos_y = -14.0f;
             mItemParams[SELECT_X_e].scale = 1.5f;
@@ -3661,7 +3661,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) {
             mItemParams[SELECT_X_e].num_pos_y = -9.2f;
             mItemParams[SELECT_X_e].num_scale = 0.95f;
             break;
-        case KANTERA:
+        case fpcNm_ITEM_KANTERA:
             mItemParams[SELECT_X_e].pos_x = -2.0f;
             mItemParams[SELECT_X_e].pos_y = -15.0f;
             mItemParams[SELECT_X_e].scale = g_drawHIO.mButtonXItemScale;
@@ -3706,7 +3706,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) {
         mItemParams[SELECT_Y_e].num_scale = g_drawHIO.mYItemNumScale;
     } else {
         switch (i_itemNo) {
-        case BOOMERANG:
+        case fpcNm_ITEM_BOOMERANG:
             mItemParams[SELECT_Y_e].pos_x = 14.0f;
             mItemParams[SELECT_Y_e].pos_y = 1.3f;
             mItemParams[SELECT_Y_e].scale = 1.7f;
@@ -3715,7 +3715,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) {
             mItemParams[SELECT_Y_e].num_pos_y = -9.2f;
             mItemParams[SELECT_Y_e].num_scale = 0.95f;
             break;
-        case BOW:
+        case fpcNm_ITEM_BOW:
             mItemParams[SELECT_Y_e].pos_x = -1.3f;
             mItemParams[SELECT_Y_e].pos_y = -6.6f;
             mItemParams[SELECT_Y_e].scale = 2.0f;
@@ -3724,7 +3724,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) {
             mItemParams[SELECT_Y_e].num_pos_y = -9.2f;
             mItemParams[SELECT_Y_e].num_scale = 0.95f;
             break;
-        case HVY_BOOTS:
+        case fpcNm_ITEM_HVY_BOOTS:
             mItemParams[SELECT_Y_e].pos_x = 1.3f;
             mItemParams[SELECT_Y_e].pos_y = 1.3f;
             mItemParams[SELECT_Y_e].scale = 1.7f;
@@ -3733,7 +3733,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) {
             mItemParams[SELECT_Y_e].num_pos_y = -9.2f;
             mItemParams[SELECT_Y_e].num_scale = 0.95f;
             break;
-        case HOOKSHOT:
+        case fpcNm_ITEM_HOOKSHOT:
             mItemParams[SELECT_Y_e].pos_x = 6.6f;
             mItemParams[SELECT_Y_e].pos_y = -4.0f;
             mItemParams[SELECT_Y_e].scale = 1.5f;
@@ -3742,7 +3742,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) {
             mItemParams[SELECT_Y_e].num_pos_y = -9.2f;
             mItemParams[SELECT_Y_e].num_scale = 0.95f;
             break;
-        case KANTERA:
+        case fpcNm_ITEM_KANTERA:
             mItemParams[SELECT_Y_e].pos_x = -1.8f;
             mItemParams[SELECT_Y_e].pos_y = g_drawHIO.mButtonYItemPosY;
             mItemParams[SELECT_Y_e].scale = g_drawHIO.mButtonYItemScale;
@@ -3787,7 +3787,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) {
         mItemParams[SELECT_Z_e].num_scale = g_drawHIO.field_0x218;
     } else {
         switch (i_itemNo) {
-        case BOOMERANG:
+        case fpcNm_ITEM_BOOMERANG:
             mItemParams[SELECT_Z_e].pos_x = 4.0f;
             mItemParams[SELECT_Z_e].pos_y = 1.3f;
             mItemParams[SELECT_Z_e].scale = 2.2f;
@@ -3796,7 +3796,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) {
             mItemParams[SELECT_Z_e].num_pos_y = -30.0f;
             mItemParams[SELECT_Z_e].num_scale = 0.75f;
             break;
-        case BOW:
+        case fpcNm_ITEM_BOW:
             mItemParams[SELECT_Z_e].pos_x = -1.3f;
             mItemParams[SELECT_Z_e].pos_y = 1.3f;
             mItemParams[SELECT_Z_e].scale = 2.2f;
@@ -3805,7 +3805,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) {
             mItemParams[SELECT_Z_e].num_pos_y = -30.0f;
             mItemParams[SELECT_Z_e].num_scale = 0.75f;
             break;
-        case HVY_BOOTS:
+        case fpcNm_ITEM_HVY_BOOTS:
             mItemParams[SELECT_Z_e].pos_x = -6.6f;
             mItemParams[SELECT_Z_e].pos_y = 9.2f;
             mItemParams[SELECT_Z_e].scale = 2.2f;
@@ -3814,7 +3814,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) {
             mItemParams[SELECT_Z_e].num_pos_y = -30.0f;
             mItemParams[SELECT_Z_e].num_scale = 0.8f;
             break;
-        case HOOKSHOT:
+        case fpcNm_ITEM_HOOKSHOT:
             mItemParams[SELECT_Z_e].pos_x = -4.0f;
             mItemParams[SELECT_Z_e].pos_y = 1.3f;
             mItemParams[SELECT_Z_e].scale = 1.7f;
@@ -3823,7 +3823,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) {
             mItemParams[SELECT_Z_e].num_pos_y = -30.0f;
             mItemParams[SELECT_Z_e].num_scale = 0.8f;
             break;
-        case KANTERA:
+        case fpcNm_ITEM_KANTERA:
             mItemParams[SELECT_Z_e].pos_x = -6.6f;
             mItemParams[SELECT_Z_e].pos_y = 6.6f;
             mItemParams[SELECT_Z_e].scale = g_drawHIO.field_0x1d4;
@@ -3877,13 +3877,13 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
             mItemParams[3].num_scale = 0.75f;
         } else {
             switch (i_itemNo) {
-            case LURE_ROD:
-            case BEE_ROD:
-            case JEWEL_ROD:
-            case JEWEL_BEE_ROD:
-            case JEWEL_WORM_ROD:
-            case HORSE_FLUTE:
-            case FISHING_ROD_1:
+            case fpcNm_ITEM_LURE_ROD:
+            case fpcNm_ITEM_BEE_ROD:
+            case fpcNm_ITEM_JEWEL_ROD:
+            case fpcNm_ITEM_JEWEL_BEE_ROD:
+            case fpcNm_ITEM_JEWEL_WORM_ROD:
+            case fpcNm_ITEM_HORSE_FLUTE:
+            case fpcNm_ITEM_FISHING_ROD_1:
                 mItemParams[3].pos_x = 17.3f;
                 mItemParams[3].pos_y = -46.8f;
                 mItemParams[3].scale = 1.7f;
@@ -3892,7 +3892,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
                 mItemParams[3].num_pos_y = -30.0f;
                 mItemParams[3].num_scale = 0.75f;
                 break;
-            case BOOMERANG:
+            case fpcNm_ITEM_BOOMERANG:
                 mItemParams[3].pos_x = 26.0f;
                 mItemParams[3].pos_y = -54.7f;
                 mItemParams[3].scale = 2.2f;
@@ -3901,7 +3901,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
                 mItemParams[3].num_pos_y = -30.0f;
                 mItemParams[3].num_scale = 0.75f;
                 break;
-            case BOW:
+            case fpcNm_ITEM_BOW:
                 mItemParams[3].pos_x = 20.7f;
                 mItemParams[3].pos_y = -55.7f;
                 mItemParams[3].scale = 2.2f;
@@ -3910,7 +3910,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
                 mItemParams[3].num_pos_y = -30.0f;
                 mItemParams[3].num_scale = 0.75f;
                 break;
-            case HVY_BOOTS:
+            case fpcNm_ITEM_HVY_BOOTS:
                 mItemParams[3].pos_x = 15.4f;
                 mItemParams[3].pos_y = -47.8f;
                 mItemParams[3].scale = 2.2f;
@@ -3919,8 +3919,8 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
                 mItemParams[3].num_pos_y = -30.0f;
                 mItemParams[3].num_scale = 0.8f;
                 break;
-            case SPINNER:
-            case HAWK_EYE:
+            case fpcNm_ITEM_SPINNER:
+            case fpcNm_ITEM_HAWK_EYE:
                 mItemParams[3].pos_x = 23.3f;
                 mItemParams[3].pos_y = -47.8f;
                 mItemParams[3].scale = 1.7f;
@@ -3929,9 +3929,9 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
                 mItemParams[3].num_pos_y = -30.0f;
                 mItemParams[3].num_scale = 0.8f;
                 break;
-            case COPY_ROD:
-            case W_HOOKSHOT:
-            case IRONBALL:
+            case fpcNm_ITEM_COPY_ROD:
+            case fpcNm_ITEM_W_HOOKSHOT:
+            case fpcNm_ITEM_IRONBALL:
                 mItemParams[3].pos_x = 29.3f;
                 mItemParams[3].pos_y = -47.8f;
                 mItemParams[3].scale = 1.7f;
@@ -3940,13 +3940,13 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
                 mItemParams[3].num_pos_y = -30.0f;
                 mItemParams[3].num_scale = 0.8f;
                 break;
-            case PACHINKO:
-            case BOMB_BAG_LV1:
-            case NORMAL_BOMB:
-            case WATER_BOMB:
-            case POKE_BOMB:
-            case RAFRELS_MEMO:
-            case TKS_LETTER:
+            case fpcNm_ITEM_PACHINKO:
+            case fpcNm_ITEM_BOMB_BAG_LV1:
+            case fpcNm_ITEM_NORMAL_BOMB:
+            case fpcNm_ITEM_WATER_BOMB:
+            case fpcNm_ITEM_POKE_BOMB:
+            case fpcNm_ITEM_RAFRELS_MEMO:
+            case fpcNm_ITEM_TKS_LETTER:
                 mItemParams[3].pos_x = 20.3f;
                 mItemParams[3].pos_y = -47.8f;
                 mItemParams[3].scale = 1.7f;
@@ -3955,7 +3955,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
                 mItemParams[3].num_pos_y = -22.0f;
                 mItemParams[3].num_scale = 0.8f;
                 break;
-            case HOOKSHOT:
+            case fpcNm_ITEM_HOOKSHOT:
                 mItemParams[3].pos_x = 21.0f;
                 mItemParams[3].pos_y = -46.7f;
                 mItemParams[3].scale = 1.7f;
@@ -3964,7 +3964,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
                 mItemParams[3].num_pos_y = -30.0f;
                 mItemParams[3].num_scale = 0.8f;
                 break;
-            case KANTERA:
+            case fpcNm_ITEM_KANTERA:
                 mItemParams[3].pos_x = 19.0f;
                 mItemParams[3].pos_y = -45.0f;
                 mItemParams[3].scale = g_drawHIO.mButtonBItemScale[0];