Fix some names

src/d/actor/d_a_bb.cpp

@@ -1,7 +1,7 @@
-//
-// Generated by dtk
-// Translation Unit: d_a_bb.cpp
-//
+/**
+ * d_a_bb.cpp
+ * Enemy - Kargaroc
+ */
 
 #include "d/actor/d_a_bb.h"
 #include "m_Do/m_Do_ext.h"

src/d/actor/d_a_bk.cpp

@@ -1,6 +1,6 @@
 /**
  * d_a_bk.cpp
- * Enemy - Bokoblin / ボコちゃん (Boko-chan)
+ * Enemy - Bokoblin
  */
 
 #include "d/actor/d_a_bk.h"
@@ -2467,7 +2467,7 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) {
         }
         
         if (!hio_set) {
-            l_bkHIO.mChildID = mDoHIO_root.mDoHIO_createChild("ボコちゃん", &l_bkHIO);
+            l_bkHIO.mChildID = mDoHIO_root.mDoHIO_createChild("ボコちゃん", &l_bkHIO); // "Boko-chan"
             i_this->m121D = 1;
             hio_set = 1;
         }

src/d/actor/d_a_bl.cpp

@@ -1,7 +1,7 @@
-//
-// Generated by dtk
-// Translation Unit: d_a_bl.cpp
-//
+/**
+ * d_a_bl.cpp
+ * Enemy - Bubble
+ */
 
 #include "d/actor/d_a_bl.h"
 #include "dolphin/types.h"

src/d/actor/d_a_fm.cpp

@@ -1,7 +1,7 @@
-//
-// Generated by dtk
-// Translation Unit: d_a_fm.cpp
-//
+/**
+ * d_a_fm.cpp
+ * Enemy - Floormaster
+ */
 
 #include "d/actor/d_a_fm.h"
 #include "dolphin/types.h"

src/d/actor/d_a_ki.cpp

@@ -1,6 +1,6 @@
 /**
  * d_a_ki.cpp
- * Enemy - Keese / キース (Kiisu)
+ * Enemy - Keese
  */
 
 #include "d/actor/d_a_ki.h"

src/d/actor/d_a_kytag06.cpp

@@ -59,15 +59,15 @@ static BOOL daKytag06_Delete(kytag06_class*) {
 
 /* 000001A4-00000224       .text daKytag06_Create__FP10fopAc_ac_c */
 static int daKytag06_Create(fopAc_ac_c* i_this) {
-    kytag06_class* tag = (kytag06_class*)i_this;
+    kytag06_class* a_this = (kytag06_class*)i_this;
     int var;
 
-    fopAcM_SetupActor(tag, kytag06_class);
+    fopAcM_SetupActor(a_this, kytag06_class);
 
     if(dComIfGs_isSymbol(0) != 0) {
         var = 5;
     } else {
-        tag->field_0x294 = 0;
+        a_this->field_0x294 = 0;
         var = 4;
     }
 

src/d/actor/d_a_npc_kamome.cpp

@@ -1,6 +1,6 @@
 /**
  * d_a_npc_kamome.cpp
- * Player - Hyoi Seagull / かもめ (Kamome)
+ * Player - Hyoi Seagull
  */
 
 #include "d/actor/d_a_npc_kamome.h"
@@ -295,7 +295,7 @@ s32 daNpc_kam_c::create() {
         fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
         
         if (l_HIO.mChildID < 0) {
-            l_HIO.mChildID = mDoHIO_root.mDoHIO_createChild("かもめ", &l_HIO);
+            l_HIO.mChildID = mDoHIO_root.mDoHIO_createChild("かもめ", &l_HIO); // "Seagull" (kamome)
             l_HIO.mpActor = this;
         }
         

src/d/actor/d_a_npc_md.cpp

@@ -1,6 +1,6 @@
 /**
  * d_a_npc_md.cpp
- * Player - Medli / リト族（メドリ） (Ritozoku (Medli))
+ * Player - Medli
  */
 
 #include "d/actor/d_a_npc_md.h"
@@ -461,7 +461,7 @@ s32 daNpc_Md_c::create() {
         fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
         
         if (l_HIO.mChildID < 0) {
-            l_HIO.mChildID = mDoHIO_root.mDoHIO_createChild("リト族（メドリ）", &l_HIO);
+            l_HIO.mChildID = mDoHIO_root.mDoHIO_createChild("リト族（メドリ）", &l_HIO); // "Rito (Medli)" (Ritozoku (Medli))
             l_HIO.mpActor = this;
         }
         

src/d/actor/d_a_npc_os.cpp

@@ -1,7 +1,7 @@
-//
-// Generated by dtk
-// Translation Unit: d_a_npc_os.cpp
-//
+/**
+ * d_a_npc_os.cpp
+ * Player - Companion Statue / Servant of the Tower
+ */
 
 #include "d/actor/d_a_npc_os.h"
 #include "d/d_com_inf_game.h"
@@ -170,7 +170,7 @@ s32 daNpc_Os_c::create() {
         setBaseMtx();
         fopAcM_SetMtx(this, mpMorf->mpModel->getBaseTRMtx());
         if(l_HIO.field_0x04 < 0) {
-            l_HIO.field_0x04 = mDoHIO_root.mDoHIO_createChild("お供石像", &l_HIO);
+            l_HIO.field_0x04 = mDoHIO_root.mDoHIO_createChild("お供石像", &l_HIO); // "Companion Statue" (otomo sekizou)
             l_HIO.field_0x5C = this;
             l_hio_counter = 1;
         }

src/d/actor/d_a_obj_movebox.cpp

@@ -1,7 +1,7 @@
-//
-// Generated by dtk
-// Translation Unit: d_a_obj_movebox.cpp
-//
+/**
+ * d_a_obj_movebox.cpp
+ * Object - Pushable Box
+ */
 
 #include "global.h"
 

src/d/actor/d_a_obj_pirateship.cpp

@@ -1,7 +1,7 @@
-//
-// Generated by dtk
-// Translation Unit: d_a_obj_pirateship.cpp
-//
+/**
+ * d_a_obj_pirateship.cpp
+ * Object - Pirate Ship
+ */
 
 #include "d/actor/d_a_obj_pirateship.h"
 #include "dolphin/types.h"

src/d/actor/d_a_ph.cpp

@@ -1,7 +1,7 @@
-//
-// Generated by dtk
-// Translation Unit: d_a_ph.cpp
-//
+/**
+ * d_a_ph.cpp
+ * Enemy - Peahat
+ */
 
 #include "d/actor/d_a_ph.h"
 #include "dolphin/types.h"

src/d/actor/d_a_player_main.cpp

@@ -4311,9 +4311,9 @@ static s32 daPy_Create(fopAc_ac_c* i_this) {
         phase_3,
         NULL,
     };
-    daPy_lk_c* player_link = (daPy_lk_c*)i_this;
+    daPy_lk_c* a_this = (daPy_lk_c*)i_this;
 
-    return dComLbG_PhaseHandler(player_link->getPhase(), (cPhs__Handler*)l_method, player_link);
+    return dComLbG_PhaseHandler(a_this->getPhase(), (cPhs__Handler*)l_method, a_this);
 }
 
 /* 80127BA0-80127CC0       .text setSeAnime__9daPy_lk_cFPC14daPy_anmHeap_cP12J3DFrameCtrl */

src/d/actor/d_a_pw.cpp

@@ -1,7 +1,7 @@
-//
-// Generated by dtk
-// Translation Unit: d_a_pw.cpp
-//
+/**
+ * d_a_pw.cpp
+ * Enemy - Poe
+ */
 
 #include "d/actor/d_a_pw.h"
 #include "d/actor/d_a_player_main.h"

src/d/actor/d_a_rectangle.cpp

@@ -1,3 +1,7 @@
+/**
+ * d_a_rectangle.cpp
+ * Unused Dummy Actor
+ */
 
 #include "d/actor/d_a_rectangle.h"
 #include "f_op/f_op_actor.h"

src/d/actor/d_a_spotbox.cpp

@@ -61,8 +61,8 @@ static BOOL daSpotbox_Delete(daSpotbox_c* i_this) {
 
 /* 00000170-00000250       .text daSpotbox_Create__FP10fopAc_ac_c */
 static s32 daSpotbox_Create(fopAc_ac_c* i_this) {
-    daSpotbox_c* spotbox = (daSpotbox_c*)i_this;
-    return spotbox->create();
+    daSpotbox_c* a_this = (daSpotbox_c*)i_this;
+    return a_this->create();
 }
 
 static actor_method_class l_daSpotbox_Method = {

src/d/actor/d_a_swc00.cpp

@@ -66,7 +66,6 @@ static s32 daSwc00_Create(fopAc_ac_c* i_actor) {
     return cPhs_COMPLEATE_e;
 }
 
-
 static actor_method_class l_daSwc00_Method = {
     (process_method_func)daSwc00_Create,
     (process_method_func)daSwc00_Delete,

src/d/actor/d_a_wz.cpp

@@ -1,7 +1,7 @@
-//
-// Generated by dtk
-// Translation Unit: d_a_wz.cpp
-//
+/**
+ * d_a_wz.cpp
+ * Enemy - Wizzrobe
+ */
 
 #include "d/actor/d_a_wz.h"
 #include "m_Do/m_Do_ext.h"

src/d/d_meter.cpp

@@ -1883,11 +1883,11 @@ s32 dMeter_Create(msg_class* i_this) {
     g_dComIfG_gameInfo.play.field_0x4930 = 0;
     g_dComIfG_gameInfo.play.field_0x4931 = 0;
 
-    mDoHIO_root.mDoHIO_createChild("通常画面表示", &g_meterHIO);
-    mDoHIO_root.mDoHIO_createChild("メニュー画面", &g_menuHIO);
-    mDoHIO_root.mDoHIO_createChild("Message（会話）", &g_msgHIO);
-    mDoHIO_root.mDoHIO_createChild("Message（看板）", &g_messageHIO);
-    mDoHIO_root.mDoHIO_createChild("マップ２", &g_meter_mapHIO);
+    mDoHIO_root.mDoHIO_createChild("通常画面表示", &g_meterHIO); // "Normal Screen Display"
+    mDoHIO_root.mDoHIO_createChild("メニュー画面", &g_menuHIO); // "Menu Screen"
+    mDoHIO_root.mDoHIO_createChild("Message（会話）", &g_msgHIO); // "Message (Talk)"
+    mDoHIO_root.mDoHIO_createChild("Message（看板）", &g_messageHIO); // "Message (Sign)"
+    mDoHIO_root.mDoHIO_createChild("マップ２", &g_meter_mapHIO); // "Map 2"
 
     dMeter_screenDataSet(i_Meter);
     dMeter_screenDataArrowSet(i_Meter);

src/d/d_s_play.cpp

@@ -1326,8 +1326,8 @@ s32 phase_4(dScnPly_ply_c* i_this) {
     dStage_Create();
     mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 30);
 
-    g_darkHIO.mChildID = mDoHIO_root.mDoHIO_createChild("暗闇スポット", &g_darkHIO);
-    g_envHIO.mChildID = mDoHIO_root.mDoHIO_createChild("描画設定", &g_envHIO);
+    g_darkHIO.mChildID = mDoHIO_root.mDoHIO_createChild("暗闇スポット", &g_darkHIO); // "Darkness Spot"
+    g_envHIO.mChildID = mDoHIO_root.mDoHIO_createChild("描画設定", &g_envHIO); // "Draw Settings"
     g_msgDHIO.mChildID = mDoHIO_root.mDoHIO_createChild("Message Data", &g_msgDHIO);
 
     new(&dComIfGp_getAttention()) dAttention_c(dComIfGp_getPlayer(0), NULL);

src/d/d_snap.cpp

@@ -1446,11 +1446,11 @@ int dSnap_PhotoIndex2TableIndex(int photoIndex) {
 }
 
 /* 800CCFE4-800CD00C       .text dSnap_GetFigRoomId__Fi */
-u8 dSnap_GetFigRoomId(int r3) {
-    if (r3 >= 0x86) {
+u8 dSnap_GetFigRoomId(int tableIndex) {
+    if (tableIndex >= (int)ARRAY_SIZE(l_CharaData)) {
         return 0xFF;
     }
-    return l_CharaData[r3].figRoom;
+    return l_CharaData[tableIndex].figRoom;
 }
 
 /* 800CD00C-800CD068       .text __ct__9dSnap_ObjFv */

src/f_ap/f_ap_game.cpp

@@ -98,7 +98,7 @@ void fapGm_Create() {
     fopDwTg_CreateQueue();
     fopScnM_CreateReq(5, 0x7FFF, 0, 0);
     
-    g_HIO.mChildID = mDoHIO_root.mDoHIO_createChild("ゲームシステム", &g_HIO);
+    g_HIO.mChildID = mDoHIO_root.mDoHIO_createChild("ゲームシステム", &g_HIO); // "Game System"
 }
 
 /* 80023288-800232D0       .text __dt__11fapGm_HIO_cFv */