d_a_obj_tombo OK (#2537)

src/d/actor/d_a_obj_ari.cpp

@@ -24,7 +24,7 @@ daObj_AriHIO_c::daObj_AriHIO_c() {
 }
 
 /* 80BA5410-80BA5414 000008 0002+02 1/2 0/0 0/0 .rodata          l_ari_itemno */
-static u8 const l_ari_itemno[2] = {0xD4, 0xD5};
+static u8 const l_ari_itemno[2] = {fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT};
 
 /* 80BA26BC-80BA2728 00011C 006C+00 1/1 0/0 0/0 .text            InitCcSph__10daObjARI_cFv */
 void daObjARI_c::InitCcSph() {

src/d/actor/d_a_obj_cho.cpp

@@ -292,7 +292,7 @@ void daObjCHO_c::Insect_Release() {
 }
 
 /* 80BCC630-80BCC634 0000B8 0002+02 1/2 0/0 0/0 .rodata          l_cho_itemno */
-static u8 const l_cho_itemno[2] = {0xC2, 0xC3};
+static u8 const l_cho_itemno[2] = {fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY};
 
 // Some unused function went here.
 // This fake function is here in its place to make the literals match

src/d/actor/d_a_obj_dan.cpp

@@ -274,7 +274,7 @@ void daObjDAN_c::Insect_Release() {
 }
 
 /* 80BDC42C-80BDC430 00007C 0002+02 1/2 0/0 0/0 .rodata          l_dan_itemno */
-static u8 const l_dan_itemno[2] = {0xCA, 0xCB};
+static u8 const l_dan_itemno[2] = {fpcNm_ITEM_M_DANGOMUSHI, fpcNm_ITEM_F_DANGOMUSHI};
 
 /* 80BDB0E8-80BDB264 000C48 017C+00 1/1 0/0 0/0 .text            Z_BufferChk__10daObjDAN_cFv */
 void daObjDAN_c::Z_BufferChk() {

src/d/actor/d_a_obj_kabuto.cpp

@@ -512,7 +512,7 @@ void daObjKABUTO_c::Insect_Release() {
 }
 
 /* 80C2E1E0-80C2E1E4 0000D0 0002+02 1/2 0/0 0/0 .rodata          l_kab_itemno */
-static u8 const l_kab_itemno[2] = {0xC0, 0xC1};
+static u8 const l_kab_itemno[2] = {fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE};
 
 // Some unused function went here.
 // This fake function is here in its place to make the literals match

src/d/actor/d_a_obj_kamakiri.cpp

@@ -520,7 +520,7 @@ void daObjKAM_c::Insect_Release() {
     field_0x980 = 1;
 }
 
-static u8 const l_kam_itemno[2] = {0xCC, 0xCD};
+static u8 const l_kam_itemno[2] = {fpcNm_ITEM_M_MANTIS, fpcNm_ITEM_F_MANTIS};
 
 f32 floatDummy() {
     return -9.0f;

src/d/actor/d_a_obj_kuwagata.cpp

@@ -6,6 +6,7 @@
 #include "d/actor/d_a_obj_kuwagata.h"
 #include "d/d_cc_d.h"
 #include "dol2asm.h"
+#include "f_pc/f_pc_name.h"
 
 
 
@@ -550,12 +551,9 @@ void daObjKUW_c::Insect_Release() {
 
 /* ############################################################################################## */
 /* 80C4D548-80C4D54C 0000B8 0002+02 1/2 0/0 0/0 .rodata          l_kuw_itemno */
-SECTION_RODATA static u16 const l_kuw_itemno[1 + 1 /* padding */] = {
-    0xC4C5,
-    /* padding */
-    0x0000,
+static u8 const l_kuw_itemno[2] = {
+    fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE,
 };
-COMPILER_STRIP_GATE(0x80C4D548, &l_kuw_itemno);
 
 /* 80C4D54C-80C4D550 0000BC 0004+00 0/0 0/0 0/0 .rodata          @4438 */
 #pragma push

src/d/actor/d_a_obj_nan.cpp

@@ -552,7 +552,7 @@ void daObjNAN_c::action() {
 /* ############################################################################################## */
 /* 80CA3270-80CA3274 0000B4 0002+02 0/1 0/0 0/0 .rodata          l_nan_itemno */
 static u8 const l_nan_itemno[2] = {
-    0xC8, 0xC9,
+    fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI,
 };
 
 /* 80CA276C-80CA2904 0022AC 0198+00 1/1 0/0 0/0 .text            execute__10daObjNAN_cFv */