From 8ef6dd4285120d1b29865f4876a8651f4c4cd6a4 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Mon, 25 Mar 2024 18:49:19 -0400 Subject: [PATCH] Fix some names --- src/d/actor/d_a_bb.cpp | 8 ++++---- src/d/actor/d_a_bk.cpp | 4 ++-- src/d/actor/d_a_bl.cpp | 8 ++++---- src/d/actor/d_a_fm.cpp | 8 ++++---- src/d/actor/d_a_ki.cpp | 2 +- src/d/actor/d_a_kytag06.cpp | 6 +++--- src/d/actor/d_a_npc_kamome.cpp | 4 ++-- src/d/actor/d_a_npc_md.cpp | 4 ++-- src/d/actor/d_a_npc_os.cpp | 10 +++++----- src/d/actor/d_a_obj_movebox.cpp | 8 ++++---- src/d/actor/d_a_obj_pirateship.cpp | 8 ++++---- src/d/actor/d_a_ph.cpp | 8 ++++---- src/d/actor/d_a_player_main.cpp | 4 ++-- src/d/actor/d_a_pw.cpp | 8 ++++---- src/d/actor/d_a_rectangle.cpp | 4 ++++ src/d/actor/d_a_spotbox.cpp | 4 ++-- src/d/actor/d_a_swc00.cpp | 1 - src/d/actor/d_a_wz.cpp | 8 ++++---- src/d/d_meter.cpp | 10 +++++----- src/d/d_s_play.cpp | 4 ++-- src/d/d_snap.cpp | 6 +++--- src/f_ap/f_ap_game.cpp | 2 +- 22 files changed, 66 insertions(+), 63 deletions(-) diff --git a/src/d/actor/d_a_bb.cpp b/src/d/actor/d_a_bb.cpp index f9ef2b2b0..6597da272 100644 --- a/src/d/actor/d_a_bb.cpp +++ b/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" diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index 07503b972..2c51321f3 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/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; } diff --git a/src/d/actor/d_a_bl.cpp b/src/d/actor/d_a_bl.cpp index d6412763e..ccd46e7c9 100644 --- a/src/d/actor/d_a_bl.cpp +++ b/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" diff --git a/src/d/actor/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp index d42b1c597..7a4aee1bd 100644 --- a/src/d/actor/d_a_fm.cpp +++ b/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" diff --git a/src/d/actor/d_a_ki.cpp b/src/d/actor/d_a_ki.cpp index 66704888c..e7e9cb23e 100644 --- a/src/d/actor/d_a_ki.cpp +++ b/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" diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index 9dc20bc7b..9bf929f9c 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/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; } diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index f5362cc60..cfb5878e7 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/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; } diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index 6acfbee65..65f118cc6 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/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; } diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index aec132af9..c0fb73b2b 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/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; } diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 8d140cb17..177052870 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_pirateship.cpp b/src/d/actor/d_a_obj_pirateship.cpp index d67e07990..2ead5153d 100644 --- a/src/d/actor/d_a_obj_pirateship.cpp +++ b/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" diff --git a/src/d/actor/d_a_ph.cpp b/src/d/actor/d_a_ph.cpp index 0ec93346c..fa2d2ad5b 100644 --- a/src/d/actor/d_a_ph.cpp +++ b/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" diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index f67a0a3dd..749106877 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/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 */ diff --git a/src/d/actor/d_a_pw.cpp b/src/d/actor/d_a_pw.cpp index 29ab095f3..7c70f629a 100644 --- a/src/d/actor/d_a_pw.cpp +++ b/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" diff --git a/src/d/actor/d_a_rectangle.cpp b/src/d/actor/d_a_rectangle.cpp index de2ab4481..fe74a95c9 100644 --- a/src/d/actor/d_a_rectangle.cpp +++ b/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" diff --git a/src/d/actor/d_a_spotbox.cpp b/src/d/actor/d_a_spotbox.cpp index 9bfc3a4a7..c3837691f 100644 --- a/src/d/actor/d_a_spotbox.cpp +++ b/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 = { diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index f4f8e7b85..614048a87 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/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, diff --git a/src/d/actor/d_a_wz.cpp b/src/d/actor/d_a_wz.cpp index a9e8cbd5b..b074c51a6 100644 --- a/src/d/actor/d_a_wz.cpp +++ b/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" diff --git a/src/d/d_meter.cpp b/src/d/d_meter.cpp index 3c7e49db2..b2a37e3a1 100644 --- a/src/d/d_meter.cpp +++ b/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); diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 4c0ff8b64..44721754e 100644 --- a/src/d/d_s_play.cpp +++ b/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); diff --git a/src/d/d_snap.cpp b/src/d/d_snap.cpp index f7961a499..6220b1c90 100644 --- a/src/d/d_snap.cpp +++ b/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 */ diff --git a/src/f_ap/f_ap_game.cpp b/src/f_ap/f_ap_game.cpp index 9a6465958..70ee71ac8 100644 --- a/src/f_ap/f_ap_game.cpp +++ b/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 */