Merge pull request #210 from robojumper/HIO-ify

HIO-ify names of likely HIO-related classes

config/SOUE01/splits.txt

@@ -459,7 +459,7 @@ d/lyt/d_window.cpp:
 	.data       start:0x80510820 end:0x805108B0
 	.sdata2     start:0x805797F0 end:0x805797F8
 
-d/d_textunk.cpp:
+d/d_lyt_hio.cpp:
 	.text       start:0x800B1820 end:0x800B20DC align:16
 	.ctors      start:0x804DB6D0 end:0x804DB6D4
 	.data       start:0x805108C8 end:0x805108D8
@@ -553,7 +553,7 @@ d/lyt/meter/d_lyt_meter.cpp:
 	.sdata2     start:0x80579AD0 end:0x80579AF0
 	.bss        start:0x805A9C98 end:0x805AA190
 
-d/lyt/meter/d_lyt_meter_unk.cpp:
+d/lyt/meter/d_lyt_meter_hio.cpp:
 	.text       start:0x800DF8B0 end:0x800DFCB8 align:16
 	.data       start:0x80513B60 end:0x80513B70
 	.sbss       start:0x80575450 end:0x80575458

config/SOUE01/symbols.txt

@@ -3330,10 +3330,10 @@ fn_80093870 = .text:0x80093870; // type:function size:0xA4
 fn_80093920 = .text:0x80093920; // type:function size:0xA4
 fn_800939D0 = .text:0x800939D0; // type:function size:0xA4
 getPosCopy3__FRC12dAcObjBase_c = .text:0x80093A80; // type:function size:0x1C
-__dt__12UnkAttnClassFv = .text:0x80093AA0; // type:function size:0x40
-init__12UnkAttnClassFv = .text:0x80093AE0; // type:function size:0x4
-remove__12UnkAttnClassFv = .text:0x80093AF0; // type:function size:0x4
-__ct__12UnkAttnClassFv = .text:0x80093B00; // type:function size:0x44
+__dt__16dAttention_HIO_cFv = .text:0x80093AA0; // type:function size:0x40
+init__16dAttention_HIO_cFv = .text:0x80093AE0; // type:function size:0x4
+remove__16dAttention_HIO_cFv = .text:0x80093AF0; // type:function size:0x4
+__ct__16dAttention_HIO_cFv = .text:0x80093B00; // type:function size:0x44
 __ct__16AttentionManagerFv = .text:0x80093B50; // type:function size:0x98
 __ct__14AttentionGroupFv = .text:0x80093BF0; // type:function size:0x48
 __ct__13AttentionPoolFv = .text:0x80093C40; // type:function size:0x68
@@ -3868,25 +3868,25 @@ UpdateSize__9dWindow_cFP10dTextBox_cf = .text:0x800B1670; // type:function size:
 GetRuntimeTypeInfo__Q34nw4r3lyt6WindowCFv = .text:0x800B17B0; // type:function size:0x8 scope:weak
 __dt__9dWindow_cFv = .text:0x800B17C0; // type:function size:0x58 scope:weak
 __dt__Q34nw4r3lyt19ArcResourceAccessorFv = .text:0x800B1820; // type:function size:0x6C scope:weak
-__dt__12UnkTextThingFv = .text:0x800B1890; // type:function size:0x40 scope:weak
-__ct__12UnkTextThingFv = .text:0x800B18D0; // type:function size:0x4D4
-destroy__12UnkTextThingFv = .text:0x800B1DB0; // type:function size:0x15C
-fn_800B1F10__12UnkTextThingFv = .text:0x800B1F10; // type:function size:0x34
-allocUnk__12UnkTextThingFUli = .text:0x800B1F50; // type:function size:0x8
-destroyUnk__12UnkTextThingFPv = .text:0x800B1F60; // type:function size:0x4
-fn_800B1F70__12UnkTextThingFv = .text:0x800B1F70; // type:function size:0x4C
-fn_800B1FC0__12UnkTextThingFv = .text:0x800B1FC0; // type:function size:0x8
-fn_800B1FD0__12UnkTextThingFv = .text:0x800B1FD0; // type:function size:0x8
-fn_800B1FE0__12UnkTextThingFv = .text:0x800B1FE0; // type:function size:0x8
-fn_800B1FF0__12UnkTextThingFv = .text:0x800B1FF0; // type:function size:0x8
-fn_800B2000__12UnkTextThingFv = .text:0x800B2000; // type:function size:0x8
-fn_800B2010__12UnkTextThingFv = .text:0x800B2010; // type:function size:0x8
-fn_800B2020__12UnkTextThingFv = .text:0x800B2020; // type:function size:0x8
-fn_800B2030__12UnkTextThingFv = .text:0x800B2030; // type:function size:0x8
-fn_800B2040__12UnkTextThingFv = .text:0x800B2040; // type:function size:0x8
-destroyMsg__12UnkTextThingFP8MsbtInfo = .text:0x800B2050; // type:function size:0x40
-destroyFlow__12UnkTextThingFP8MsbfInfo = .text:0x800B2090; // type:function size:0x40
-__sinit_\d_textunk_cpp = .text:0x800B20D0; // type:function size:0xC scope:local
+__dt__10dLyt_HIO_cFv = .text:0x800B1890; // type:function size:0x40 scope:weak
+__ct__10dLyt_HIO_cFv = .text:0x800B18D0; // type:function size:0x4D4
+destroy__10dLyt_HIO_cFv = .text:0x800B1DB0; // type:function size:0x15C
+fn_800B1F10__10dLyt_HIO_cFv = .text:0x800B1F10; // type:function size:0x34
+allocUnk__10dLyt_HIO_cFUli = .text:0x800B1F50; // type:function size:0x8
+destroyUnk__10dLyt_HIO_cFPv = .text:0x800B1F60; // type:function size:0x4
+fn_800B1F70__10dLyt_HIO_cFv = .text:0x800B1F70; // type:function size:0x4C
+fn_800B1FC0__10dLyt_HIO_cFv = .text:0x800B1FC0; // type:function size:0x8
+fn_800B1FD0__10dLyt_HIO_cFv = .text:0x800B1FD0; // type:function size:0x8
+fn_800B1FE0__10dLyt_HIO_cFv = .text:0x800B1FE0; // type:function size:0x8
+fn_800B1FF0__10dLyt_HIO_cFv = .text:0x800B1FF0; // type:function size:0x8
+fn_800B2000__10dLyt_HIO_cFv = .text:0x800B2000; // type:function size:0x8
+fn_800B2010__10dLyt_HIO_cFv = .text:0x800B2010; // type:function size:0x8
+fn_800B2020__10dLyt_HIO_cFv = .text:0x800B2020; // type:function size:0x8
+fn_800B2030__10dLyt_HIO_cFv = .text:0x800B2030; // type:function size:0x8
+fn_800B2040__10dLyt_HIO_cFv = .text:0x800B2040; // type:function size:0x8
+destroyMsg__10dLyt_HIO_cFP8MsbtInfo = .text:0x800B2050; // type:function size:0x40
+destroyFlow__10dLyt_HIO_cFP8MsbfInfo = .text:0x800B2090; // type:function size:0x40
+__sinit_\d_lyt_hio_cpp = .text:0x800B20D0; // type:function size:0xC scope:local
 __ct__13TextWindowUnkFP15dTagProcessor_c = .text:0x800B20E0; // type:function size:0x48
 fn_800B2130__13TextWindowUnkFPCcP10dTextBox_cP21dLytMsgWindowCharDatab = .text:0x800B2130; // type:function size:0x370
 textAdvancingRelated__13TextWindowUnkFbb = .text:0x800B24A0; // type:function size:0x5FC
@@ -5439,8 +5439,8 @@ __dt__31sFStateID_c<16dLytMeterParts_c>Fv = .text:0x800DF6A0; // type:function s
 isSameName__31sFStateID_c<16dLytMeterParts_c>CFPCc = .text:0x800DF700; // type:function size:0x88 scope:weak
 isSameName__33sFStateID_c<18dLytMeter2Button_c>CFPCc = .text:0x800DF790; // type:function size:0x88 scope:weak
 isSameName__33sFStateID_c<18dLytMeter1Button_c>CFPCc = .text:0x800DF820; // type:function size:0x88 scope:weak
-__ct__24dLytMeterConfiguration_cFv = .text:0x800DF8B0; // type:function size:0x3C0
-__dt__24dLytMeterConfiguration_cFv = .text:0x800DFC70; // type:function size:0x48
+__ct__15dLytMeter_HIO_cFv = .text:0x800DF8B0; // type:function size:0x3C0
+__dt__15dLytMeter_HIO_cFv = .text:0x800DFC70; // type:function size:0x48
 initializeState_InvisibleWait__15dLytMeterABtn_cFv = .text:0x800DFCC0; // type:function size:0x4
 executeState_InvisibleWait__15dLytMeterABtn_cFv = .text:0x800DFCD0; // type:function size:0x34
 finalizeState_InvisibleWait__15dLytMeterABtn_cFv = .text:0x800DFD10; // type:function size:0x4
@@ -6509,8 +6509,8 @@ getPane__22dLytMeterShieldGauge_cFv = .text:0x8010CB50; // type:function size:0x
 __sinit_\d_lyt_meter_shield_gauge_cpp = .text:0x8010CB60; // type:function size:0x27C scope:local
 __dt__37sFStateID_c<22dLytMeterShieldGauge_c>Fv = .text:0x8010CDE0; // type:function size:0x58 scope:weak
 isSameName__37sFStateID_c<22dLytMeterShieldGauge_c>CFPCc = .text:0x8010CE40; // type:function size:0x88 scope:weak
-__ct__13DoButtonClassFv = .text:0x8010CED0; // type:function size:0x50
-__dt__13DoButtonClassFv = .text:0x8010CF20; // type:function size:0x40
+__ct__18dLytDoButton_HIO_cFv = .text:0x8010CED0; // type:function size:0x50
+__dt__18dLytDoButton_HIO_cFv = .text:0x8010CF20; // type:function size:0x40
 initializeState_InvisibleWait__14dLytDobutton_cFv = .text:0x8010CF60; // type:function size:0x4
 executeState_InvisibleWait__14dLytDobutton_cFv = .text:0x8010CF70; // type:function size:0x60
 finalizeState_InvisibleWait__14dLytDobutton_cFv = .text:0x8010CFD0; // type:function size:0x4
@@ -6741,8 +6741,8 @@ draw__16dLytTargetBird_cFv = .text:0x80114280; // type:function size:0x44
 fn_801142D0 = .text:0x801142D0; // type:function size:0x168
 fn_80114440 = .text:0x80114440; // type:function size:0x248
 fn_80114690 = .text:0x80114690; // type:function size:0x25C
-__ct__22MsgWindowUnkLocalClassFv = .text:0x801148F0; // type:function size:0x24
-__dt__22MsgWindowUnkLocalClassFv = .text:0x80114920; // type:function size:0x40
+__ct__19dLytMsgWindow_HIO_cFv = .text:0x801148F0; // type:function size:0x24
+__dt__19dLytMsgWindow_HIO_cFv = .text:0x80114920; // type:function size:0x40
 build__15dLytMsgWindow_cFv = .text:0x80114960; // type:function size:0x228
 changeState__84sStateMgr_c<15dLytMsgWindow_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x80114B90; // type:function size:0x10
 remove__15dLytMsgWindow_cFv = .text:0x80114BA0; // type:function size:0xB8
@@ -7500,8 +7500,8 @@ fn_8012D950 = .text:0x8012D950; // type:function size:0x30
 LytMapCapture__initStates = .text:0x8012D980; // type:function size:0x1C0
 LytMapCapture__dtor = .text:0x8012DB40; // type:function size:0x58
 fn_8012DBA0 = .text:0x8012DBA0; // type:function size:0x88
-__ct__17LytMapConfigMaybeFv = .text:0x8012DC30; // type:function size:0xEC
-__dt__17LytMapConfigMaybeFv = .text:0x8012DD20; // type:function size:0x40
+__ct__13dLytMap_HIO_cFv = .text:0x8012DC30; // type:function size:0xEC
+__dt__13dLytMap_HIO_cFv = .text:0x8012DD20; // type:function size:0x40
 fn_8012DD60 = .text:0x8012DD60; // type:function size:0x17C
 fn_8012DEE0 = .text:0x8012DEE0; // type:function size:0x70
 fn_8012DF50 = .text:0x8012DF50; // type:function size:0x20
@@ -11262,8 +11262,8 @@ getNewStateID__86sStateMgr_c<17dLytCursorStick_c,20sStateMethodUsr_FI_c,12sFStat
 getStateID__86sStateMgr_c<17dLytCursorStick_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801BD230; // type:function size:0x10
 getOldStateID__86sStateMgr_c<17dLytCursorStick_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801BD240; // type:function size:0x10
 dCsGame_c_classInit__Fv = .text:0x801BD250; // type:function size:0x30
-__ct__17CsGameConfigMaybeFv = .text:0x801BD280; // type:function size:0x8C
-__dt__17CsGameConfigMaybeFv = .text:0x801BD310; // type:function size:0x40
+__ct__13dCsGame_HIO_cFv = .text:0x801BD280; // type:function size:0x8C
+__dt__13dCsGame_HIO_cFv = .text:0x801BD310; // type:function size:0x40
 __ct__9dCsGame_cFv = .text:0x801BD350; // type:function size:0x4CC
 fn_801BD820 = .text:0x801BD820; // type:function size:0x40
 fn_801BD860 = .text:0x801BD860; // type:function size:0x40
@@ -30958,7 +30958,7 @@ lbl_8050F238 = .data:0x8050F238; // type:object size:0x80
 @LOCAL@addUnk7Target__16AttentionManagerFR12dAcObjBase_cUlffff@unk7Target = .data:0x8050F498; // type:object size:0x30
 @LOCAL@addReadTarget__16AttentionManagerFR12dAcObjBase_cUlffff@readTarget = .data:0x8050F4C8; // type:object size:0x30
 @LOCAL@addReadTarget2__16AttentionManagerFR12dAcObjBase_cUlfff@readTarget2 = .data:0x8050F4F8; // type:object size:0x30
-__vt__12UnkAttnClass = .data:0x8050F528; // type:object size:0xC
+__vt__16dAttention_HIO_c = .data:0x8050F528; // type:object size:0xC
 __vt__16AttentionManager = .data:0x8050F534; // type:object size:0xC
 lbl_8050F540 = .data:0x8050F540; // type:object size:0x10 data:4byte
 __vt__13DowsingTarget = .data:0x8050F550; // type:object size:0x10
@@ -31083,7 +31083,7 @@ lbl_8051074C = .data:0x8051074C; // type:object size:0x34
 __vt__10dTextBox_c = .data:0x80510798; // type:object size:0x84
 __vt__9dWindow_c = .data:0x80510820; // type:object size:0x8C scope:weak
 __vt__Q23d2d10ResAccIf_c = .data:0x805108B0; // type:object size:0x18
-__vt__12UnkTextThing = .data:0x805108C8; // type:object size:0xC scope:weak
+__vt__10dLyt_HIO_c = .data:0x805108C8; // type:object size:0xC scope:weak
 __vt__13TextWindowUnk = .data:0x805108D8; // type:object size:0x10
 @22737 = .data:0x805108E8; // type:object size:0xF scope:local data:string
 @22908 = .data:0x805108F8; // type:object size:0x14 scope:local data:string
@@ -32867,7 +32867,7 @@ sPaneNames = .data:0x8051A98C; // type:object size:0x94 scope:local data:4byte
 @22855 = .data:0x8051AA30; // type:object size:0xF scope:local data:string
 @26835 = .data:0x8051AA40; // type:object size:0x13 scope:local data:string
 @27086 = .data:0x8051AA54; // type:object size:0xC scope:local data:string
-__vt__13DoButtonClass = .data:0x8051AA60; // type:object size:0xC
+__vt__18dLytDoButton_HIO_c = .data:0x8051AA60; // type:object size:0xC
 @27214 = .data:0x8051AA6C; // type:object size:0xC scope:local
 @27215 = .data:0x8051AA78; // type:object size:0xC scope:local
 @27216 = .data:0x8051AA84; // type:object size:0xC scope:local
@@ -33019,7 +33019,7 @@ lbl_8051B6E8 = .data:0x8051B6E8; // type:object size:0xC
 lbl_8051B6F4 = .data:0x8051B6F4; // type:object size:0xC
 lbl_8051B700 = .data:0x8051B700; // type:object size:0xC data:string
 jumptable_8051B70C = .data:0x8051B70C; // type:object size:0x7C scope:local
-__vt__22MsgWindowUnkLocalClass = .data:0x8051B788; // type:object size:0xC
+__vt__19dLytMsgWindow_HIO_c = .data:0x8051B788; // type:object size:0xC
 __vt__56sFStateMgr_c<17dLytAutoCaption_c,20sStateMethodUsr_FI_c> = .data:0x8051B798; // type:object size:0x30
 __vt__86sStateMgr_c<17dLytAutoCaption_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x8051B7C8; // type:object size:0x30
 __vt__33sFStateFct_c<17dLytAutoCaption_c> = .data:0x8051B7F8; // type:object size:0x14
@@ -33778,7 +33778,7 @@ lbl_80520578 = .data:0x80520578; // type:object size:0x10 data:string
 lbl_80520588 = .data:0x80520588; // type:object size:0x10 data:string
 lbl_80520598 = .data:0x80520598; // type:object size:0x10 data:string
 lbl_805205A8 = .data:0x805205A8; // type:object size:0x10 data:string
-lbl_805205B8 = .data:0x805205B8; // type:object size:0xC
+__vt__13dLytMap_HIO_c = .data:0x805205B8; // type:object size:0xC
 __vt__13dLytMapMain_c = .data:0x805205C4; // type:object size:0x14
 __vt__52sFStateMgr_c<13dLytMapMain_c,20sStateMethodUsr_FI_c> = .data:0x805205D8; // type:object size:0x30
 __vt__82sStateMgr_c<13dLytMapMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x80520608; // type:object size:0x30
@@ -41487,7 +41487,7 @@ lbl_80575398 = .sbss:0x80575398; // type:object size:0x8 data:byte
 SCRAPPER_PICKUP_TARGET = .sbss:0x805753A0; // type:object size:0x8 data:4byte
 @GUARD@setupGX__10dTextBox_cCFv@sFogColor = .sbss:0x805753A8; // type:object size:0x1 scope:local data:byte
 @LOCAL@setupGX__10dTextBox_cCFv@sFogColor = .sbss:0x805753AC; // type:object size:0x4 scope:local data:4byte
-sInstance__12UnkTextThing = .sbss:0x805753B0; // type:object size:0x4 data:4byte
+sInstance__10dLyt_HIO_c = .sbss:0x805753B0; // type:object size:0x4 data:4byte
 @GUARD@SetupGXCommon__15dTagProcessor_cFv@fog = .sbss:0x805753B8; // type:object size:0x1 scope:local data:byte
 @LOCAL@SetupGXCommon__15dTagProcessor_cFv@fog = .sbss:0x805753BC; // type:object size:0x4 scope:local data:4byte
 sInstance__14dTimeAreaMgr_c = .sbss:0x805753C0; // type:object size:0x4 data:4byte
@@ -41512,7 +41512,7 @@ lbl_80575430 = .sbss:0x80575430; // type:object size:0x8 data:4byte
 sInstance__18SpecialItemDropMgr = .sbss:0x80575438; // type:object size:0x4 data:4byte
 sInstance__Q29dParticle5mgr_c = .sbss:0x80575440; // type:object size:0x4 data:4byte
 sInstance__11dLytMeter_c = .sbss:0x80575448; // type:object size:0x4 data:4byte
-sInstance__24dLytMeterConfiguration_c = .sbss:0x80575450; // type:object size:0x8 data:4byte
+sInstance__15dLytMeter_HIO_c = .sbss:0x80575450; // type:object size:0x8 data:4byte
 sInstance__20LytMeterTimerPart1_c = .sbss:0x80575458; // type:object size:0x4 data:4byte
 sInstance__20LytMeterTimerPart2_c = .sbss:0x8057545C; // type:object size:0x4 data:4byte
 sDoExit__16dLytMeterTimer_c = .sbss:0x80575460; // type:object size:0x1 data:byte
@@ -50518,7 +50518,7 @@ lbl_805A2E90 = .bss:0x805A2E90; // type:object size:0x88 data:byte
 lbl_805A2F18 = .bss:0x805A2F18; // type:object size:0x40
 lbl_805A2F58 = .bss:0x805A2F58; // type:object size:0x10
 attnVectors = .bss:0x805A2F68; // type:object size:0x30
-attnClass = .bss:0x805A2F98; // type:object size:0x18
+sHio = .bss:0x805A2F98; // type:object size:0x18 scope:local
 DOWSING_LISTS = .bss:0x805A2FB0; // type:object size:0x60
 lbl_805A3010 = .bss:0x805A3010; // type:object size:0x18
 MAIN_EVENT_RELOC_TABLE = .bss:0x805A3028; // type:object size:0xF78 data:byte
@@ -50555,7 +50555,7 @@ sSkipFlags__15SkipflagManager = .bss:0x805A9C68; // type:object size:0x20
 lbl_805A9C88 = .bss:0x805A9C88; // type:object size:0x10 data:4byte
 @28890 = .bss:0x805A9C98; // type:object size:0xC scope:local
 ...bss.0 = .bss:0x805A9C98; // type:label scope:local
-sConf = .bss:0x805A9CA8; // type:object size:0x1E8 scope:local
+sHio = .bss:0x805A9CA8; // type:object size:0x1E8 scope:local
 @28894 = .bss:0x805A9E90; // type:object size:0xC scope:local
 StateID_Wait__18dLytMeter1Button_c = .bss:0x805A9EA0; // type:object size:0x30 data:4byte
 @28898 = .bss:0x805A9ED0; // type:object size:0xC scope:local
@@ -50955,7 +50955,7 @@ StateID_Use__22dLytMeterShieldGauge_c = .bss:0x805ACDA0; // type:object size:0x3
 StateID_ToMax__22dLytMeterShieldGauge_c = .bss:0x805ACDE0; // type:object size:0x30 scope:global
 @22763 = .bss:0x805ACE10; // type:object size:0xC scope:local
 ...bss.0 = .bss:0x805ACE10; // type:label scope:local
-sDoButtonClass = .bss:0x805ACE20; // type:object size:0x18 scope:local
+sHio = .bss:0x805ACE20; // type:object size:0x18 scope:local
 @22778 = .bss:0x805ACE38; // type:object size:0xC scope:local
 StateID_InvisibleWait__14dLytDobutton_c = .bss:0x805ACE48; // type:object size:0x30 data:4byte
 @22782 = .bss:0x805ACE78; // type:object size:0xC scope:local
@@ -51091,7 +51091,7 @@ lbl_805AF3F0 = .bss:0x805AF3F0; // type:object size:0x10
 StateID_RenderingWait__16dLytMapCapture_c = .bss:0x805AF400; // type:object size:0x40 data:4byte
 StateID_RenderingWaitStep2__16dLytMapCapture_c = .bss:0x805AF440; // type:object size:0x30 data:4byte
 lbl_805AF470 = .bss:0x805AF470; // type:object size:0x10
-lbl_805AF480 = .bss:0x805AF480; // type:object size:0x40
+sHio = .bss:0x805AF480; // type:object size:0x40 scope:local
 StateID_Wait__16dLytMapPinIcon_c = .bss:0x805AF4C0; // type:object size:0x30 data:4byte
 StateID_ToSelect__16dLytMapPinIcon_c = .bss:0x805AF500; // type:object size:0x30 data:4byte
 StateID_Select__16dLytMapPinIcon_c = .bss:0x805AF540; // type:object size:0x30 data:4byte

configure.py

@@ -455,7 +455,7 @@ config.libs = [
             Object(NonMatching, "d/lyt/d_lyt_draw_mark.cpp"),
             Object(Matching, "d/lyt/d_textbox.cpp"),
             Object(Matching, "d/lyt/d_window.cpp"),
-            Object(Matching, "d/d_textunk.cpp"),
+            Object(Matching, "d/d_lyt_hio.cpp"),
             Object(NonMatching, "d/d_textwindow_unk.cpp"),
             Object(Matching, "d/d_tag_processor.cpp"),
             Object(NonMatching, "toBeSorted/time_area_mgr.cpp"),
@@ -472,7 +472,7 @@ config.libs = [
             Object(NonMatching, "toBeSorted/special_item_drop_mgr.cpp"),
             Object(Matching, "toBeSorted/d_particle.cpp"),
             Object(Matching, "d/lyt/meter/d_lyt_meter.cpp"),
-            Object(NonMatching, "d/lyt/meter/d_lyt_meter_unk.cpp"),
+            Object(NonMatching, "d/lyt/meter/d_lyt_meter_hio.cpp"),
             Object(Matching, "d/lyt/meter/d_lyt_meter_a_btn.cpp"),
             Object(Matching, "d/lyt/meter/d_lyt_meter_z_btn.cpp"),
             Object(Matching, "d/lyt/meter/d_lyt_meter_key.cpp"),

include/d/d_cs_game.h

@@ -11,9 +11,9 @@
 #include "s/s_StateID.hpp"
 #include "toBeSorted/d_emitter.h"
 
-struct CsGameConfigMaybe {
-    CsGameConfigMaybe();
-    virtual ~CsGameConfigMaybe() {}
+struct dCsGame_HIO_c {
+    dCsGame_HIO_c();
+    virtual ~dCsGame_HIO_c() {}
 
     /* 0x04 */ f32 field_0x04;
     /* 0x08 */ f32 field_0x08;

include/d/d_lyt_hio.h

@@ -1,5 +1,5 @@
-#ifndef D_TEXTUNK_H
-#define D_TEXTUNK_H
+#ifndef D_LYT_HIO_H
+#define D_LYT_HIO_H
 
 #include "common.h"
 #include "libms/flowfile.h"
@@ -14,10 +14,10 @@
  * for overriding the text and flow files being accessed. The actual
  * implementation appears to have been stripped out though.
  */
-class UnkTextThing {
+class dLyt_HIO_c {
 public:
-    UnkTextThing();
-    virtual ~UnkTextThing() {}
+    dLyt_HIO_c();
+    virtual ~dLyt_HIO_c() {}
 
     void destroy();
 
@@ -149,7 +149,7 @@ public:
         return 0;
     }
 
-    static UnkTextThing *getInstance() {
+    static dLyt_HIO_c *getInstance() {
         return sInstance;
     }
 
@@ -209,7 +209,7 @@ public:
     void destroyUnk(void *thing);
 
 private:
-    static UnkTextThing *sInstance;
+    static dLyt_HIO_c *sInstance;
 
     void destroyFlow(MsbfInfo *flow);
     void destroyMsg(MsbtInfo *msg);

include/d/lyt/d_lyt_meter_hio.h

@@ -1,14 +1,14 @@
-#ifndef D_LYT_METER_CONFIGURATION
-#define D_LYT_METER_CONFIGURATION
+#ifndef D_LYT_METER_HIO_H
+#define D_LYT_METER_HIO_H
 
 #include "common.h"
 
-class dLytMeterConfiguration_c {
+class dLytMeter_HIO_c {
 public:
-    dLytMeterConfiguration_c();
-    virtual ~dLytMeterConfiguration_c();
+    dLytMeter_HIO_c();
+    virtual ~dLytMeter_HIO_c();
 
-    static const dLytMeterConfiguration_c *GetInstance() {
+    static const dLytMeter_HIO_c *GetInstance() {
         return sInstance;
     }
 
@@ -45,7 +45,7 @@ public:
     }
 
 
-    static dLytMeterConfiguration_c *sInstance;
+    static dLytMeter_HIO_c *sInstance;
 
     /* 0x004 */ u8 field_0x004;
     /* 0x005 */ u8 field_0x005;

src/d/d_cs_game.cpp

@@ -9,9 +9,9 @@
 
 SPECIAL_BASE_PROFILE(C_GAME, dCsGame_c, fProfile::C_GAME, 0x2BF, 0x06F9);
 
-CsGameConfigMaybe sConfig;
+dCsGame_HIO_c sConfig;
 
-CsGameConfigMaybe::CsGameConfigMaybe() {
+dCsGame_HIO_c::dCsGame_HIO_c() {
     field_0x04 = 0.0f;
     field_0x08 = 0.0f;
     field_0x0C = 0.0f;
@@ -31,7 +31,6 @@ CsGameConfigMaybe::CsGameConfigMaybe() {
     field_0x3C = 1.0f;
     field_0x40 = 5;
 }
-// CsGameConfigMaybe::~CsGameConfigMaybe() {}
 
 STATE_DEFINE(dCsGame_c::lytItemCursor_c, Invisible);
 STATE_DEFINE(dCsGame_c::lytItemCursor_c, Bow);

src/d/d_dvd_drive_error.cpp

@@ -1,7 +1,7 @@
 #include "d/d_dvd_drive_error.h"
 
 #include "d/d_dvd_unk.h"
-#include "d/d_textunk.h"
+#include "d/d_lyt_hio.h"
 #include "egg/gfx/eggDrawGX.h"
 #include "egg/gfx/eggScreen.h"
 #include "m/m_mtx.h"
@@ -120,8 +120,8 @@ void dDvdDriveError_c::draw() {
     textWriter.SetFont(dDvdUnk::FontUnk::GetInstance()->getFont());
 
     textWriter.SetScale(
-        UnkTextThing::getFn800B1F70() * UnkTextThing::getFn800B1FD0(),
-        UnkTextThing::getFn800B1F70() * UnkTextThing::getFn800B1FD0()
+        dLyt_HIO_c::getFn800B1F70() * dLyt_HIO_c::getFn800B1FD0(),
+        dLyt_HIO_c::getFn800B1F70() * dLyt_HIO_c::getFn800B1FD0()
     );
 
     textWriter.SetupGX();

src/d/d_lyt_hio.cpp

@@ -1,4 +1,4 @@
-#include "d/d_textunk.h"
+#include "d/d_lyt_hio.h"
 
 #include "common.h"
 #include "nw4r/lyt/lyt_arcResourceAccessor.h"
@@ -9,11 +9,11 @@ void dummy_ArcResourceAccessor(nw4r::lyt::ArcResourceAccessor *arg) {
     delete arg;
 }
 
-UnkTextThing textThing;
-UnkTextThing *UnkTextThing::sInstance;
+dLyt_HIO_c textThing;
+dLyt_HIO_c *dLyt_HIO_c::sInstance;
 
-// UnkTextThing::~UnkTextThing() {}
-UnkTextThing::UnkTextThing() {
+// dLyt_HIO_c::~dLyt_HIO_c() {}
+dLyt_HIO_c::dLyt_HIO_c() {
     sInstance = this;
 
     field_0x754 = 0.0f;
@@ -85,7 +85,7 @@ UnkTextThing::UnkTextThing() {
     field_0x794 = 100.0f;
 }
 
-void UnkTextThing::destroy() {
+void dLyt_HIO_c::destroy() {
     for (int i = 0; i < 82; i++) {
         if (field_buf0[i] != nullptr) {
             destroyUnk(field_buf0[i]);
@@ -133,55 +133,55 @@ void UnkTextThing::destroy() {
     }
 }
 
-f32 UnkTextThing::fn_800B1F10() {
+f32 dLyt_HIO_c::fn_800B1F10() {
     return field_0x794 / 100.0f;
 }
 
-void *UnkTextThing::allocUnk(size_t size, int align) {
+void *dLyt_HIO_c::allocUnk(size_t size, int align) {
     return nullptr;
 }
-void UnkTextThing::destroyUnk(void *_thing) {}
+void dLyt_HIO_c::destroyUnk(void *_thing) {}
 
-f32 UnkTextThing::fn_800B1F70() {
+f32 dLyt_HIO_c::fn_800B1F70() {
     f32 v = fn_800B1FC0();
     v *= fn_800B1FE0();
     return v;
 }
-f32 UnkTextThing::fn_800B1FC0() {
+f32 dLyt_HIO_c::fn_800B1FC0() {
     return 1.0f;
 }
-f32 UnkTextThing::fn_800B1FD0() {
+f32 dLyt_HIO_c::fn_800B1FD0() {
     return 0.9f;
 }
-f32 UnkTextThing::fn_800B1FE0() {
+f32 dLyt_HIO_c::fn_800B1FE0() {
     return 1.0f;
 }
-f32 UnkTextThing::fn_800B1FF0() {
+f32 dLyt_HIO_c::fn_800B1FF0() {
     return 0.0f;
 }
-f32 UnkTextThing::fn_800B2000() {
+f32 dLyt_HIO_c::fn_800B2000() {
     return 0.0f;
 }
-f32 UnkTextThing::fn_800B2010() {
+f32 dLyt_HIO_c::fn_800B2010() {
     return -1.0f;
 }
-f32 UnkTextThing::fn_800B2020() {
+f32 dLyt_HIO_c::fn_800B2020() {
     return 0.0f;
 }
-f32 UnkTextThing::fn_800B2030() {
+f32 dLyt_HIO_c::fn_800B2030() {
     return 0.0f;
 }
-f32 UnkTextThing::fn_800B2040() {
+f32 dLyt_HIO_c::fn_800B2040() {
     return 0.0f;
 }
 
-void UnkTextThing::destroyMsg(MsbtInfo *msg) {
+void dLyt_HIO_c::destroyMsg(MsbtInfo *msg) {
     mShouldHookAllocations = true;
     LMS_CloseMessage(msg);
     mShouldHookAllocations = false;
 }
 
-void UnkTextThing::destroyFlow(MsbfInfo *flow) {
+void dLyt_HIO_c::destroyFlow(MsbfInfo *flow) {
     mShouldHookAllocations = true;
     LMS_CloseFlow(flow);
     mShouldHookAllocations = false;

src/d/d_message.cpp

@@ -13,7 +13,7 @@
 #include "d/d_stage.h"
 #include "d/d_stage_mgr.h"
 #include "d/d_tag_processor.h"
-#include "d/d_textunk.h"
+#include "d/d_lyt_hio.h"
 #include "d/flag/itemflag_manager.h"
 #include "d/flag/sceneflag_manager.h"
 #include "d/flag/storyflag_manager.h"
@@ -1418,18 +1418,18 @@ dMessage_c *dMessage_c::sInstance;
 dTagProcessor_c *dMessage_c::sTagProcessor;
 
 static void *msbAlloc(size_t size) {
-    if (UnkTextThing::getInstance()->getShouldHookAllocations() == false) {
+    if (dLyt_HIO_c::getInstance()->getShouldHookAllocations() == false) {
         return EGG::Heap::alloc(size, 0x20, nullptr);
     } else {
-        return UnkTextThing::getInstance()->allocUnk(size, 0x20);
+        return dLyt_HIO_c::getInstance()->allocUnk(size, 0x20);
     }
 }
 
 static void msbFree(void *ptr) {
-    if (UnkTextThing::getInstance()->getShouldHookAllocations() == false) {
+    if (dLyt_HIO_c::getInstance()->getShouldHookAllocations() == false) {
         EGG::Heap::free(ptr, nullptr);
     } else {
-        UnkTextThing::getInstance()->destroyUnk(ptr);
+        dLyt_HIO_c::getInstance()->destroyUnk(ptr);
     }
 }
 
@@ -1475,7 +1475,7 @@ int dMessage_c::create() {
 }
 
 int dMessage_c::doDelete() {
-    UnkTextThing::getInstance()->destroy();
+    dLyt_HIO_c::getInstance()->destroy();
     if (sTagProcessor != nullptr) {
         delete sTagProcessor;
         sTagProcessor = nullptr;
@@ -1688,7 +1688,7 @@ MsbtInfo *dMessage_c::getMsbtInfoForIndex(s32 index) {
 }
 
 MsbtInfo *dMessage_c::getMsbtInfoForIndexInternal(s32 index) {
-    UnkTextThing *thing = UnkTextThing::getInstance();
+    dLyt_HIO_c *thing = dLyt_HIO_c::getInstance();
     MsbtInfo *overrideMsbt = thing->getOverrideMsbtInfo(index);
     if (overrideMsbt != nullptr && thing->getShouldOverrideData() == true) {
         return overrideMsbt;
@@ -1701,7 +1701,7 @@ MsbfInfo *dMessage_c::getMsbfInfoForIndex(s32 index) {
 }
 
 MsbfInfo *dMessage_c::getMsbfInfoForIndexInternal(s32 index) {
-    UnkTextThing *thing = UnkTextThing::getInstance();
+    dLyt_HIO_c *thing = dLyt_HIO_c::getInstance();
     MsbfInfo *overrideMsbf = thing->getOverrideMsbfInfo(index);
     if (overrideMsbf != nullptr && thing->getShouldOverrideData() == true) {
         return overrideMsbf;
@@ -1865,7 +1865,7 @@ void *dMessage_c::sZev0;
 void *dMessage_c::sZevStage;
 
 void *dMessage_c::getZev0Internal() {
-    UnkTextThing *thing = UnkTextThing::getInstance();
+    dLyt_HIO_c *thing = dLyt_HIO_c::getInstance();
     void *overrideZev = thing->getOverrideZev0();
     if (overrideZev != nullptr && thing->getShouldOverrideData() == true) {
         return overrideZev;
@@ -1874,7 +1874,7 @@ void *dMessage_c::getZev0Internal() {
 }
 
 void *dMessage_c::getZevStageInternal() {
-    UnkTextThing *thing = UnkTextThing::getInstance();
+    dLyt_HIO_c *thing = dLyt_HIO_c::getInstance();
     void *overrideZev = thing->getOverrideStageZev();
     if (overrideZev != nullptr && thing->getShouldOverrideData() == true) {
         return overrideZev;

src/d/d_tag_processor.cpp

@@ -4,7 +4,7 @@
 #include "d/a/d_a_base.h"
 #include "d/d_font_manager.h"
 #include "d/d_message.h"
-#include "d/d_textunk.h"
+#include "d/d_lyt_hio.h"
 #include "d/d_textwindow_unk.h"
 #include "d/lyt/d_lyt_util_items.h"
 #include "d/lyt/d_textbox.h"
@@ -485,7 +485,7 @@ void dTagProcessor_c::formatV(
                 case 0x30000: {
                     if (textBox != nullptr) {
                         backupScale = currScale;
-                        currScale *= UnkTextThing::getField0x768();
+                        currScale *= dLyt_HIO_c::getField0x768();
                         currScale *= textBox->getMyScale();
                     }
                     writePtr = writeTextNormal(src, writePtr, &local_b4, cmdLen, state4);
@@ -672,7 +672,7 @@ beginning:
                         if (currScale != newScale) {
                             nw4r::lyt::Size fontSize = mpTextBox->GetFontSize();
                             posY -= (fontSize.height * ((currScale - newScale) / baseScale) / 2.0f) *
-                                    UnkTextThing::getField0x788();
+                                    dLyt_HIO_c::getField0x788();
                             currScale = newScale;
                         }
                     }
@@ -680,7 +680,7 @@ beginning:
                 case 0x30000: {
                     if (b2) {
                         backupScale = currScale;
-                        f32 tmp = backupScale * UnkTextThing::getField0x768();
+                        f32 tmp = backupScale * dLyt_HIO_c::getField0x768();
                         if (textBox != nullptr) {
                             tmp *= textBox->getMyScale();
                         }
@@ -695,7 +695,7 @@ beginning:
                         *writePtr = -1;
                         const nw4r::ut::Font *fnt = dFontMng_c::getFont(dFontMng_c::PICTURE);
                         s8 c = getAnimatedIconReplacement(READ_U8(endPtr, 0));
-                        f32 tmp = UnkTextThing::getField0x764();
+                        f32 tmp = dLyt_HIO_c::getField0x764();
                         f32 wid = tmp / fnt->GetWidth() * currScale;
                         f32 charSpace = textBox->GetCharSpace();
                         f32 charWidth = wid * fnt->GetCharWidth(c);
@@ -962,14 +962,14 @@ void dTagProcessor_c::fn_800B4FF0(nw4r::ut::Rect *rect, nw4r::ut::PrintContext<w
                 // the tmp vars, but control flow from the inlines remains
                 f32 w1 = fontSize.width * 0.5f;
                 f32 h1 = fontSize.height * 0.5f;
-                if (w1 < UnkTextThing::getField0x758() || h1 < UnkTextThing::getField0x758()) {
+                if (w1 < dLyt_HIO_c::getField0x758() || h1 < dLyt_HIO_c::getField0x758()) {
                     if (w1 < h1) {
-                        f32 tmp = UnkTextThing::getField0x758();
+                        f32 tmp = dLyt_HIO_c::getField0x758();
                     } else {
-                        f32 tmp2 = UnkTextThing::getField0x758();
+                        f32 tmp2 = dLyt_HIO_c::getField0x758();
                     }
                 }
-                f32 tmp3 = UnkTextThing::getField0x758();
+                f32 tmp3 = dLyt_HIO_c::getField0x758();
                 // End unused code
 
                 f32 f7 = (fontSize.height + getTextBox()->GetLineSpace()) / 2.0f;
@@ -1391,8 +1391,8 @@ void dTagProcessor_c::changeScale(nw4r::ut::Rect *rect, nw4r::ut::PrintContext<w
     } else {
         field_0x904 = ctx->writer->GetScaleV();
         field_0x908 = ctx->writer->GetCursorY();
-        scale = field_0x904 * UnkTextThing::getField0x768();
-        posY = field_0x908 - ctx->writer->GetFontAscent() * UnkTextThing::getField0x76C();
+        scale = field_0x904 * dLyt_HIO_c::getField0x768();
+        posY = field_0x908 - ctx->writer->GetFontAscent() * dLyt_HIO_c::getField0x76C();
     }
 
     ctx->writer->SetCursorY(posY);
@@ -1402,7 +1402,7 @@ void dTagProcessor_c::changeScale(nw4r::ut::Rect *rect, nw4r::ut::PrintContext<w
 void dTagProcessor_c::saveIconWidth(dTextBox_c *textBox, wchar_t *cmd, f32 arg) {
     nw4r::ut::Font *f = dFontMng_c::getFont(dFontMng_c::PICTURE);
     s8 c3 = getAnimatedIconReplacement(READ_U8(cmd, 0));
-    arg = UnkTextThing::getField0x764() / f->GetWidth() * arg;
+    arg = dLyt_HIO_c::getField0x764() / f->GetWidth() * arg;
 
     mLineData.mLineWidths[mLineData.mNumLines] += arg * f->GetCharWidth(c3) + textBox->GetCharSpace();
 }
@@ -1435,10 +1435,10 @@ void dTagProcessor_c::drawPicture(
 ) {
     nw4r::ut::Font *font = dFontMng_c::getFont(dFontMng_c::PICTURE);
 
-    f32 f1 = UnkTextThing::getField0x764() * w->GetScaleV() / UnkTextThing::getFn800B1FC0();
-    f32 f3 = UnkTextThing::getFn800B1FC0();
-    f32 f4 = UnkTextThing::getField0x764();
-    f32 f5 = UnkTextThing::getFn800B1FC0();
+    f32 f1 = dLyt_HIO_c::getField0x764() * w->GetScaleV() / dLyt_HIO_c::getFn800B1FC0();
+    f32 f3 = dLyt_HIO_c::getFn800B1FC0();
+    f32 f4 = dLyt_HIO_c::getField0x764();
+    f32 f5 = dLyt_HIO_c::getFn800B1FC0();
     f32 scaleY2 = w->GetScaleV();
 
     s32 fontHeight = w->GetFont()->GetHeight();
@@ -1528,7 +1528,7 @@ void dTagProcessor_c::configureWriterForIcon(
 ) {
     nw4r::ut::Font *font = dFontMng_c::getFont(dFontMng_c::PICTURE);
 
-    f32 f1 = UnkTextThing::getField0x764() * ctx->writer->GetScaleV() / UnkTextThing::getFn800B1FC0();
+    f32 f1 = dLyt_HIO_c::getField0x764() * ctx->writer->GetScaleV() / dLyt_HIO_c::getFn800B1FC0();
     w->SetFont(*font);
     w->SetFontSize(f1);
     w->SetGradationMode(nw4r::ut::CharWriter::GRADMODE_V);
@@ -1656,39 +1656,39 @@ u8 dTagProcessor_c::symbolToFontIdx(s32 s) {
 
 u8 dTagProcessor_c::getAnimatedIconReplacement(u8 arg) {
     if (arg >= FONT_BTN_NUN_STK_UP && arg <= FONT_BTN_NUN_STK_RIGHT) {
-        if (mButtonPressAnimTimer >= UnkTextThing::getAnimBtnTotalDuration()) {
+        if (mButtonPressAnimTimer >= dLyt_HIO_c::getAnimBtnTotalDuration()) {
             // Show base instead
             return symbolToFontIdx(FONT_BTN_NUN_STK);
         }
     } else if (arg >= FONT_BTN_CROSS_UP && arg <= FONT_BTN_CROSS_RIGHT) {
-        if (mButtonPressAnimTimer >= UnkTextThing::getAnimBtnTotalDuration()) {
+        if (mButtonPressAnimTimer >= dLyt_HIO_c::getAnimBtnTotalDuration()) {
             // Show base instead
             // Empty Cross Btn
             return '.';
         }
     } else if (arg == FONT_BTN_NUN_STK_WIGGLE_VERTICAL) {
-        if (mButtonWiggleAnimTimer < UnkTextThing::getAnimBtnTotalDuration()) {
+        if (mButtonWiggleAnimTimer < dLyt_HIO_c::getAnimBtnTotalDuration()) {
             return symbolToFontIdx(FONT_BTN_NUN_STK_UP);
         }
 
-        if (mButtonWiggleAnimTimer < UnkTextThing::getAnimBtnTotalDuration() * 2) {
+        if (mButtonWiggleAnimTimer < dLyt_HIO_c::getAnimBtnTotalDuration() * 2) {
             return symbolToFontIdx(FONT_BTN_NUN_STK);
         }
 
-        if (mButtonWiggleAnimTimer < UnkTextThing::getAnimBtnTotalDuration() * 3) {
+        if (mButtonWiggleAnimTimer < dLyt_HIO_c::getAnimBtnTotalDuration() * 3) {
             return symbolToFontIdx(FONT_BTN_NUN_STK_DOWN);
         }
         return symbolToFontIdx(FONT_BTN_NUN_STK);
     } else if (arg == FONT_BTN_NUN_STK_WIGGLE_HORIZONTAL) {
-        if (mButtonWiggleAnimTimer < UnkTextThing::getAnimBtnTotalDuration()) {
+        if (mButtonWiggleAnimTimer < dLyt_HIO_c::getAnimBtnTotalDuration()) {
             return symbolToFontIdx(FONT_BTN_NUN_STK_LEFT);
         }
 
-        if (mButtonWiggleAnimTimer < UnkTextThing::getAnimBtnTotalDuration() * 2) {
+        if (mButtonWiggleAnimTimer < dLyt_HIO_c::getAnimBtnTotalDuration() * 2) {
             return symbolToFontIdx(FONT_BTN_NUN_STK);
         }
 
-        if (mButtonWiggleAnimTimer < UnkTextThing::getAnimBtnTotalDuration() * 3) {
+        if (mButtonWiggleAnimTimer < dLyt_HIO_c::getAnimBtnTotalDuration() * 3) {
             return symbolToFontIdx(FONT_BTN_NUN_STK_RIGHT);
         }
         return symbolToFontIdx(FONT_BTN_NUN_STK);
@@ -1699,13 +1699,13 @@ u8 dTagProcessor_c::getAnimatedIconReplacement(u8 arg) {
 
 u8 dTagProcessor_c::getAnimatedWiggleIconReplacement(u8 arg) {
     if (arg == FONT_BTN_NUN_STK_WIGGLE_VERTICAL) {
-        if (mButtonWiggleAnimTimer < UnkTextThing::getAnimBtnTotalDuration() * 2) {
+        if (mButtonWiggleAnimTimer < dLyt_HIO_c::getAnimBtnTotalDuration() * 2) {
             return symbolToFontIdx(FONT_BTN_NUN_STK_UP);
         } else {
             return symbolToFontIdx(FONT_BTN_NUN_STK_DOWN);
         }
     } else if (arg == FONT_BTN_NUN_STK_WIGGLE_HORIZONTAL) {
-        if (mButtonWiggleAnimTimer < UnkTextThing::getAnimBtnTotalDuration() * 2) {
+        if (mButtonWiggleAnimTimer < dLyt_HIO_c::getAnimBtnTotalDuration() * 2) {
             return symbolToFontIdx(FONT_BTN_NUN_STK_LEFT);
         } else {
             return symbolToFontIdx(FONT_BTN_NUN_STK_RIGHT);
@@ -1716,18 +1716,18 @@ u8 dTagProcessor_c::getAnimatedWiggleIconReplacement(u8 arg) {
 
 u8 dTagProcessor_c::getAlphaForAnimatedIcon(u8 arg) {
     f32 ret = 255.0f;
-    f32 duration = UnkTextThing::getAnimBtnTransitionDuration();
+    f32 duration = dLyt_HIO_c::getAnimBtnTransitionDuration();
     if (arg >= FONT_BTN_NUN_STK_UP && arg <= FONT_BTN_NUN_STK_RIGHT) {
-        if (mButtonPressAnimTimer < UnkTextThing::getAnimBtnTransitionDuration()) {
+        if (mButtonPressAnimTimer < dLyt_HIO_c::getAnimBtnTransitionDuration()) {
             // Ramp-up, become visible
             ret = (mButtonPressAnimTimer / duration) * ret;
-        } else if (mButtonPressAnimTimer < UnkTextThing::getAnimBtnTotalDuration()) {
+        } else if (mButtonPressAnimTimer < dLyt_HIO_c::getAnimBtnTotalDuration()) {
             // Fully visible
             ret = 255.0f;
         } else if (mButtonPressAnimTimer <
-                   UnkTextThing::getAnimBtnTotalDuration() + UnkTextThing::getAnimBtnTransitionDuration()) {
+                   dLyt_HIO_c::getAnimBtnTotalDuration() + dLyt_HIO_c::getAnimBtnTransitionDuration()) {
             // Ramp-down, become invisible
-            ret = (UnkTextThing::getAnimBtnTotalDuration() + UnkTextThing::getAnimBtnTransitionDuration() -
+            ret = (dLyt_HIO_c::getAnimBtnTotalDuration() + dLyt_HIO_c::getAnimBtnTransitionDuration() -
                    mButtonPressAnimTimer) /
                   duration * ret;
         } else {
@@ -1735,32 +1735,32 @@ u8 dTagProcessor_c::getAlphaForAnimatedIcon(u8 arg) {
             ret = 0.0f;
         }
     } else if (arg >= FONT_BTN_NUN_STK_WIGGLE_VERTICAL && arg <= FONT_BTN_NUN_STK_WIGGLE_HORIZONTAL) {
-        if (mButtonWiggleAnimTimer < UnkTextThing::getAnimBtnTransitionDuration()) {
+        if (mButtonWiggleAnimTimer < dLyt_HIO_c::getAnimBtnTransitionDuration()) {
             // Ramp-up direction variant, become visible
             ret = (mButtonWiggleAnimTimer / duration) * ret;
-        } else if (mButtonWiggleAnimTimer < UnkTextThing::getAnimBtnTotalDuration()) {
+        } else if (mButtonWiggleAnimTimer < dLyt_HIO_c::getAnimBtnTotalDuration()) {
             // Direction fully visible
             ret = 255.0f;
         } else if (mButtonWiggleAnimTimer <
-                   UnkTextThing::getAnimBtnTotalDuration() + UnkTextThing::getAnimBtnTransitionDuration()) {
+                   dLyt_HIO_c::getAnimBtnTotalDuration() + dLyt_HIO_c::getAnimBtnTransitionDuration()) {
             // Ramp-down direction variant, become invisible
-            ret = (UnkTextThing::getAnimBtnTotalDuration() + UnkTextThing::getAnimBtnTransitionDuration() -
+            ret = (dLyt_HIO_c::getAnimBtnTotalDuration() + dLyt_HIO_c::getAnimBtnTransitionDuration() -
                    mButtonWiggleAnimTimer) /
                   duration * ret;
-        } else if (mButtonWiggleAnimTimer < UnkTextThing::getAnimBtnTotalDuration() * 2) {
+        } else if (mButtonWiggleAnimTimer < dLyt_HIO_c::getAnimBtnTotalDuration() * 2) {
             // Invisible
             ret = 0.0f;
         } else if (mButtonWiggleAnimTimer <
-                   UnkTextThing::getAnimBtnTransitionDuration() + UnkTextThing::getAnimBtnTotalDuration() * 2) {
+                   dLyt_HIO_c::getAnimBtnTransitionDuration() + dLyt_HIO_c::getAnimBtnTotalDuration() * 2) {
             // Ramp-up base variant, become visible
-            ret = (mButtonWiggleAnimTimer - 2 * UnkTextThing::getAnimBtnTotalDuration()) / duration * ret;
-        } else if (mButtonWiggleAnimTimer < UnkTextThing::getAnimBtnTotalDuration() * 3) {
+            ret = (mButtonWiggleAnimTimer - 2 * dLyt_HIO_c::getAnimBtnTotalDuration()) / duration * ret;
+        } else if (mButtonWiggleAnimTimer < dLyt_HIO_c::getAnimBtnTotalDuration() * 3) {
             // Base variant fully visible
             ret = 255.0f;
         } else if (mButtonWiggleAnimTimer <
-                   UnkTextThing::getAnimBtnTransitionDuration() + UnkTextThing::getAnimBtnTotalDuration() * 3) {
+                   dLyt_HIO_c::getAnimBtnTransitionDuration() + dLyt_HIO_c::getAnimBtnTotalDuration() * 3) {
             // Ramp-down base variant, become invisible
-            ret = ((UnkTextThing::getAnimBtnTransitionDuration() + 3 * UnkTextThing::getAnimBtnTotalDuration()) -
+            ret = ((dLyt_HIO_c::getAnimBtnTransitionDuration() + 3 * dLyt_HIO_c::getAnimBtnTotalDuration()) -
                    mButtonWiggleAnimTimer) /
                   duration * ret;
         } else {
@@ -1780,7 +1780,7 @@ void dTagProcessor_c::setStringArg(const wchar_t *arg, s32 index) {
 
 f32 dTagProcessor_c::fn_800B8040(s8 factor, u32 windowType) {
     // Fun little recursion here
-    f32 f1 = UnkTextThing::getFn800B1F70();
+    f32 f1 = dLyt_HIO_c::getFn800B1F70();
     if (windowType == dLytMsgWindow_c::MSG_WINDOW_WOOD) {
         f32 f2 = fn_800B8040(0, 0);
         f32 f3 = fn_800B8040(factor, 0);
@@ -1810,7 +1810,7 @@ f32 dTagProcessor_c::fn_800B8040(s8 factor, u32 windowType) {
             case 1:  x = 0.95f; break;
             case 2:  x = 1.1f; break;
         }
-        x *= UnkTextThing::getFn800B1F10();
+        x *= dLyt_HIO_c::getFn800B1F10();
         return x * f1;
     }
 }
@@ -1910,14 +1910,14 @@ f32 dTagProcessor_c::fn_800B85C0(s32 lineIdx) {
         // the tmp vars, but control flow from the inlines remains
         f32 w1 = fontSize.width * 0.5f;
         f32 h1 = fontSize.height * 0.5f;
-        if (w1 < UnkTextThing::getField0x758() || h1 < UnkTextThing::getField0x758()) {
+        if (w1 < dLyt_HIO_c::getField0x758() || h1 < dLyt_HIO_c::getField0x758()) {
             if (w1 < h1) {
-                f32 tmp = UnkTextThing::getField0x758();
+                f32 tmp = dLyt_HIO_c::getField0x758();
             } else {
-                f32 tmp2 = UnkTextThing::getField0x758();
+                f32 tmp2 = dLyt_HIO_c::getField0x758();
             }
         }
-        f32 tmp3 = UnkTextThing::getField0x758();
+        f32 tmp3 = dLyt_HIO_c::getField0x758();
         // End unused code
 
         f32 f7 = (fontSize.height + getTextBox()->GetLineSpace()) / 2.0f;
@@ -2016,14 +2016,14 @@ void dTagProcessor_c::setNumericArgs(const s32 *args, s32 numArgs) {
 
 void dTagProcessor_c::executeBtnPressTimer() {
     mButtonPressAnimTimer++;
-    if (mButtonPressAnimTimer >= UnkTextThing::getAnimBtnTotalDuration() * 2) {
+    if (mButtonPressAnimTimer >= dLyt_HIO_c::getAnimBtnTotalDuration() * 2) {
         mButtonPressAnimTimer = 0;
     }
 }
 
 void dTagProcessor_c::executeBtnWiggleTimer() {
     mButtonWiggleAnimTimer++;
-    if (mButtonWiggleAnimTimer >= UnkTextThing::getAnimBtnTotalDuration() * 4) {
+    if (mButtonWiggleAnimTimer >= dLyt_HIO_c::getAnimBtnTotalDuration() * 4) {
         mButtonWiggleAnimTimer = 0;
     }
 }

src/d/d_textwindow_unk.cpp

@@ -5,7 +5,7 @@
 #include "common.h"
 #include "d/d_message.h"
 #include "d/d_tag_processor.h"
-#include "d/d_textunk.h"
+#include "d/d_lyt_hio.h"
 #include "d/lyt/d_textbox.h"
 #include "d/lyt/msg_window/d_lyt_msg_window.h"
 #include "m/m_vec.h"
@@ -49,13 +49,13 @@ bool TextWindowUnk::fn_800B2130(const char *label, dTextBox_c *textBox, dLytMsgW
         }
     }
 
-    UnkTextThing::getInstance()->setStr1(label);
+    dLyt_HIO_c::getInstance()->setStr1(label);
     if (dLytMsgWindow_c::getInstance()->fn_80117390(true) != nullptr) {
         // Regswap
-        UnkTextThing::getInstance()->setStr2(dLytMsgWindow_c::getInstance()->fn_80117390(true));
+        dLyt_HIO_c::getInstance()->setStr2(dLytMsgWindow_c::getInstance()->fn_80117390(true));
         s32 idx = dMessage_c::getMsbtIndexForLabel(label);
         if (idx >= 0) {
-            UnkTextThing::getInstance()->setStr3(dMessage_c::getMsbtFileName(idx));
+            dLyt_HIO_c::getInstance()->setStr3(dMessage_c::getMsbtFileName(idx));
         }
     }
     return true;

src/d/lyt/d2d.cpp

@@ -2,7 +2,7 @@
 
 #include "d/d_font_manager.h"
 #include "d/d_message.h"
-#include "d/d_textunk.h"
+#include "d/d_lyt_hio.h"
 #include "d/lyt/d_textbox.h"
 #include "d/lyt/d_window.h"
 #include "egg/gfx/eggScreen.h"
@@ -467,8 +467,8 @@ void LytBase_c::setProperties(nw4r::lyt::Pane *pane, f32 posX, f32 posY, f32 sca
     }
 
     nw4r::math::VEC3 t2 = textBox->GetTranslate();
-    t2.x += UnkTextThing::getFn800B2030();
-    t2.y += UnkTextThing::getFn800B2040();
+    t2.x += dLyt_HIO_c::getFn800B2030();
+    t2.y += dLyt_HIO_c::getFn800B2040();
     textBox->SetTranslate(t2);
 
     if (scale != -9999.0f) {
@@ -480,7 +480,7 @@ void LytBase_c::setProperties(nw4r::lyt::Pane *pane, f32 posX, f32 posY, f32 sca
     } else {
         const nw4r::ut::Font *f = textBox->GetFont();
         if (f != nullptr) {
-            textBox->SetScale(UnkTextThing::getFn800B1FD0());
+            textBox->SetScale(dLyt_HIO_c::getFn800B1FD0());
         }
     }
 
@@ -490,17 +490,17 @@ void LytBase_c::setProperties(nw4r::lyt::Pane *pane, f32 posX, f32 posY, f32 sca
     if (spaceX != -9999.0f) {
         textBox->SetCharSpace(spaceX);
     } else {
-        f6 = UnkTextThing::getFn800B2010();
+        f6 = dLyt_HIO_c::getFn800B2010();
     }
 
     if (spaceY != -9999.0f) {
         textBox->SetLineSpace(spaceY);
     } else {
-        f4 = UnkTextThing::getFn800B1FF0();
+        f4 = dLyt_HIO_c::getFn800B1FF0();
     }
 
-    textBox->SetCharSpace(textBox->GetCharSpace() + UnkTextThing::getFn800B2020() + f6);
-    textBox->SetLineSpace(textBox->GetLineSpace() + UnkTextThing::getFn800B2000() + f4);
+    textBox->SetCharSpace(textBox->GetCharSpace() + dLyt_HIO_c::getFn800B2020() + f6);
+    textBox->SetLineSpace(textBox->GetLineSpace() + dLyt_HIO_c::getFn800B2000() + f4);
     fn_800AB930(textBox);
 }
 

src/d/lyt/d_lyt_do_button.cpp

@@ -10,9 +10,9 @@
 #include "sized_string.h"
 #include "toBeSorted/event_manager.h"
 
-struct DoButtonClass {
-    DoButtonClass();
-    virtual ~DoButtonClass();
+struct dLytDoButton_HIO_c {
+    dLytDoButton_HIO_c();
+    virtual ~dLytDoButton_HIO_c();
 
     u8 field_0x04;
     u8 field_0x05;
@@ -26,9 +26,9 @@ struct DoButtonClass {
     u8 field_0x16;
 };
 
-static DoButtonClass sDoButtonClass;
+static dLytDoButton_HIO_c sHio;
 
-DoButtonClass::DoButtonClass() {
+dLytDoButton_HIO_c::dLytDoButton_HIO_c() {
     field_0x04 = 0;
     field_0x05 = 0x29;
     field_0x06 = 0x5E;
@@ -40,7 +40,7 @@ DoButtonClass::DoButtonClass() {
     field_0x15 = 0;
     field_0x16 = 0;
 }
-DoButtonClass::~DoButtonClass() {}
+dLytDoButton_HIO_c::~dLytDoButton_HIO_c() {}
 
 dLytDobutton_c *dLytDobutton_c::sInstance;
 
@@ -172,7 +172,7 @@ void dLytDobutton_c::executeState_InvisibleTimeCnt() {
             field_0x48C = 0;
         }
     } else {
-        if (field_0x48C < sDoButtonClass.field_0x15) {
+        if (field_0x48C < sHio.field_0x15) {
             field_0x48C++;
         } else {
             realize();
@@ -777,7 +777,7 @@ void dLytDobutton_c::fn_8010E3D0(bool b) {
         f32 tmp = (xBase - left);
         w1 = mpTextBoxes[0]->GetLineWidth(nullptr) + tmp;
     }
-    f32 w = w1 + sDoButtonClass.field_0x10;
+    f32 w = w1 + sHio.field_0x10;
     sz3.width = w;
     sz4.width = w;
     mpPanes[3]->SetSize(sz3);

src/d/lyt/d_lyt_do_button_related.cpp

@@ -5,6 +5,7 @@
 #include "d/lyt/meter/d_lyt_meter.h"
 #include "toBeSorted/misc_actor.h"
 
+// TODO: Rename _HIO_c when LytDoButtonRelated gets a better name?
 class LytDoButtonRelatedClass {
 public:
     LytDoButtonRelatedClass();

src/d/lyt/d_lyt_map.cpp

@@ -8,9 +8,9 @@
 #include "sized_string.h"
 #include "toBeSorted/arc_managers/layout_arc_manager.h"
 
-struct LytMapConfigMaybe {
-    LytMapConfigMaybe();
-    virtual ~LytMapConfigMaybe();
+struct dLytMap_HIO_c {
+    dLytMap_HIO_c();
+    virtual ~dLytMap_HIO_c();
 
     /* 0x04 */ f32 field_0x04;
     /* 0x08 */ f32 field_0x08;
@@ -40,9 +40,9 @@ struct LytMapConfigMaybe {
     /* 0x2C */ f32 field_0x2C;
 };
 
-LytMapConfigMaybe sLytMapConfig;
+dLytMap_HIO_c sHio;
 
-LytMapConfigMaybe::LytMapConfigMaybe() {
+dLytMap_HIO_c::dLytMap_HIO_c() {
     field_0x04 = -10.0f;
     field_0x10 = 14.0f;
     field_0x14 = 32.0f;
@@ -71,7 +71,7 @@ LytMapConfigMaybe::LytMapConfigMaybe() {
     field_0x2B = 10;
 }
 
-LytMapConfigMaybe::~LytMapConfigMaybe() {}
+dLytMap_HIO_c::~dLytMap_HIO_c() {}
 
 STATE_DEFINE(dLytMapPinIcon_c, Wait);
 STATE_DEFINE(dLytMapPinIcon_c, ToSelect);

src/d/lyt/d_textbox.cpp

@@ -4,7 +4,7 @@
 #include "d/d_font_manager.h"
 #include "d/d_message.h"
 #include "d/d_tag_processor.h"
-#include "d/d_textunk.h"
+#include "d/d_lyt_hio.h"
 #include "d/lyt/msg_window/d_lyt_msg_window.h"
 #include "libms/msgfile.h"
 #include "m/m_color.h"
@@ -405,7 +405,7 @@ f32 dTextBox_c::GetLinesHeight() const {
 
     f32 assumedDefaultSize = 35.0f;
 
-    f32 f3 = UnkTextThing::getFn800B1F70();
+    f32 f3 = dLyt_HIO_c::getFn800B1F70();
     nw4r::lyt::Size size = mMyFontSize;
     int fontHeight = f->GetHeight();
     f3 *= (size.height / assumedDefaultSize) * fontHeight;
@@ -493,7 +493,7 @@ void dTextBox_c::init() {
     }
 
     nw4r::lyt::Size sz = GetFontSize();
-    f32 scale = UnkTextThing::getFn800B1F70();
+    f32 scale = dLyt_HIO_c::getFn800B1F70();
 
     f32 height = sz.height / f1;
     sz.width = GetFont()->GetWidth() * height * scale;
@@ -625,11 +625,11 @@ void dTextBox_c::DrawSelf(const nw4r::lyt::DrawInfo &drawInfo) {
         unk1 = field_0x1F8 == 1;
     }
     if (field_0x1F7 == 1 || (field_0x1F7 == 2 && unk1)) {
-        f32 f = GetFontSize().height * UnkTextThing::getField0x75C();
+        f32 f = GetFontSize().height * dLyt_HIO_c::getField0x75C();
         textRect.top -= f;
         textRect.bottom -= f;
     } else if (field_0x1F7 == 3 && unk1) {
-        f32 f = GetFontSize().height * UnkTextThing::getField0x760();
+        f32 f = GetFontSize().height * dLyt_HIO_c::getField0x760();
         textRect.top -= f;
         textRect.bottom -= f;
     }

src/d/lyt/meter/d_lyt_meter.cpp

@@ -18,7 +18,7 @@
 #include "d/lyt/d_lyt_control_game.h"
 #include "d/lyt/d_lyt_do_button.h"
 #include "d/lyt/d_lyt_map.h"
-#include "d/lyt/d_lyt_meter_configuration.h"
+#include "d/lyt/d_lyt_meter_hio.h"
 #include "d/lyt/d_lyt_save_mgr.h"
 #include "d/lyt/d_lyt_unknowns.h"
 #include "d/lyt/d_window.h"
@@ -43,7 +43,7 @@
 #include "toBeSorted/misc_actor.h"
 // clang-format on
 
-static dLytMeterConfiguration_c sConf;
+static dLytMeter_HIO_c sHio;
 dLytMeter_c *dLytMeter_c::sInstance;
 
 STATE_DEFINE(dLytMeter1Button_c, Wait);

src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp

@@ -4,7 +4,7 @@
 #include "d/a/d_a_player.h"
 #include "d/d_camera.h"
 #include "d/d_sc_game.h"
-#include "d/lyt/d_lyt_meter_configuration.h"
+#include "d/lyt/d_lyt_meter_hio.h"
 #include "m/m_vec.h"
 #include "toBeSorted/d_d3d.h"
 #include "toBeSorted/event_manager.h"
@@ -329,7 +329,7 @@ bool dLytMeterGanbariGauge_c::build(d2d::ResAccIf_c *resAcc) {
     field_0x54C = 1.0f;
     field_0x550 = 1.0f;
 
-    field_0x548 = dLytMeterConfiguration_c::sInstance->field_0x1C8;
+    field_0x548 = dLytMeter_HIO_c::sInstance->field_0x1C8;
 
     field_0x558 = 0;
     field_0x559 = 0;
@@ -343,7 +343,7 @@ bool dLytMeterGanbariGauge_c::build(d2d::ResAccIf_c *resAcc) {
     field_0x540 = 0;
     field_0x534 = 0;
 
-    if (dLytMeterConfiguration_c::sInstance->field_0x13C != 0) {
+    if (dLytMeter_HIO_c::sInstance->field_0x13C != 0) {
         field_0x534 = 0;
     } else {
         field_0x534 = 1;
@@ -395,7 +395,7 @@ bool dLytMeterGanbariGauge_c::execute() {
 
     if (fn_80104710(false) || (isCrawling() && !fn_801047B0())) {
         field_0x534 = 1;
-    } else if (dLytMeterConfiguration_c::GetInstance()->field_0x13C) {
+    } else if (dLytMeter_HIO_c::GetInstance()->field_0x13C) {
         field_0x534 = 0;
     } else {
         field_0x534 = 1;
@@ -503,7 +503,7 @@ bool dLytMeterGanbariGauge_c::execute() {
     mVec2_c scaleV(scale, scale);
     mLyt.getLayout()->GetRootPane()->SetScale(scaleV);
 
-    if (!field_0x534 && len <= dLytMeterConfiguration_c::GetInstance()->field_0x138 && !fn_80104710(false) &&
+    if (!field_0x534 && len <= dLytMeter_HIO_c::GetInstance()->field_0x138 && !fn_80104710(false) &&
         !isCrawling()) {
         field_0x530 = 1;
     } else {
@@ -526,8 +526,8 @@ bool dLytMeterGanbariGauge_c::execute() {
 
     if (field_0x544 != 0) {
         if (mStaminaPercent < field_0x550 &&
-            mStaminaPercent < field_0x51C - dLytMeterConfiguration_c::GetInstance()->getField_0x1CC()) {
-            field_0x548 = dLytMeterConfiguration_c::GetInstance()->getField_0x1C8();
+            mStaminaPercent < field_0x51C - dLytMeter_HIO_c::GetInstance()->getField_0x1CC()) {
+            field_0x548 = dLytMeter_HIO_c::GetInstance()->getField_0x1C8();
             field_0x54C = field_0x51C;
             field_0x550 = mStaminaPercent;
             mAnm[GANBARI_ANIM_UPDOWN_1].setFrame(field_0x54C * 100.0f);
@@ -537,7 +537,7 @@ bool dLytMeterGanbariGauge_c::execute() {
                 field_0x548--;
             }
             if (field_0x548 == 0) {
-                field_0x54C -= dLytMeterConfiguration_c::GetInstance()->getField_0x1D0();
+                field_0x54C -= dLytMeter_HIO_c::GetInstance()->getField_0x1D0();
                 if (field_0x54C < mStaminaPercent) {
                     field_0x544 = 0;
                     mAnm[GANBARI_ANIM_UPDOWN_1].setAnimEnable(true);
@@ -552,11 +552,11 @@ bool dLytMeterGanbariGauge_c::execute() {
             }
         }
     } else {
-        if (mStaminaPercent < field_0x51C - dLytMeterConfiguration_c::GetInstance()->getField_0x1C4()) {
+        if (mStaminaPercent < field_0x51C - dLytMeter_HIO_c::GetInstance()->getField_0x1C4()) {
             field_0x544 = 1;
             field_0x54C = field_0x51C;
             field_0x550 = mStaminaPercent;
-            field_0x548 = dLytMeterConfiguration_c::GetInstance()->getField_0x1C8();
+            field_0x548 = dLytMeter_HIO_c::GetInstance()->getField_0x1C8();
             mAnm[GANBARI_ANIM_UPDOWN_1].setFrame(field_0x54C * 100.0f);
             mAnm[GANBARI_ANIM_UPDOWN_1].setAnimEnable(true);
         } else {

src/d/lyt/meter/d_lyt_meter_rupy.cpp

@@ -3,7 +3,7 @@
 #include "c/c_math.h"
 #include "d/a/d_a_item.h"
 #include "d/lyt/d2d.h"
-#include "d/lyt/d_lyt_meter_configuration.h"
+#include "d/lyt/d_lyt_meter_hio.h"
 #include "d/snd/d_snd_small_effect_mgr.h"
 #include "nw4r/math/math_types.h"
 
@@ -416,10 +416,10 @@ bool dLytMeterRupy_c::updateDisplayedAmount(bool suppressSound) {
     if (amount != mDisplayedRupeeCount || suppressSound) {
         bool b = false;
         if (amount < mDisplayedRupeeCount) {
-            if (mDisplayedRupeeCount - amount >= dLytMeterConfiguration_c::sInstance->getField_0x1DC()) {
-                newNumDisplayed = mDisplayedRupeeCount - dLytMeterConfiguration_c::sInstance->getField_0x1E4();
-            } else if (mDisplayedRupeeCount - amount >= dLytMeterConfiguration_c::sInstance->getField_0x1D8()) {
-                newNumDisplayed = mDisplayedRupeeCount - dLytMeterConfiguration_c::sInstance->getField_0x1E0();
+            if (mDisplayedRupeeCount - amount >= dLytMeter_HIO_c::sInstance->getField_0x1DC()) {
+                newNumDisplayed = mDisplayedRupeeCount - dLytMeter_HIO_c::sInstance->getField_0x1E4();
+            } else if (mDisplayedRupeeCount - amount >= dLytMeter_HIO_c::sInstance->getField_0x1D8()) {
+                newNumDisplayed = mDisplayedRupeeCount - dLytMeter_HIO_c::sInstance->getField_0x1E0();
             } else {
                 newNumDisplayed = mDisplayedRupeeCount - 1;
             }
@@ -435,10 +435,10 @@ bool dLytMeterRupy_c::updateDisplayedAmount(bool suppressSound) {
                 field_0x8AD = 0;
             }
         } else if (amount > mDisplayedRupeeCount) {
-            if (amount - mDisplayedRupeeCount >= dLytMeterConfiguration_c::sInstance->getField_0x1DC()) {
-                newNumDisplayed = mDisplayedRupeeCount + dLytMeterConfiguration_c::sInstance->getField_0x1E4();
-            } else if (amount - mDisplayedRupeeCount >= dLytMeterConfiguration_c::sInstance->getField_0x1D8()) {
-                newNumDisplayed = mDisplayedRupeeCount + dLytMeterConfiguration_c::sInstance->getField_0x1E0();
+            if (amount - mDisplayedRupeeCount >= dLytMeter_HIO_c::sInstance->getField_0x1DC()) {
+                newNumDisplayed = mDisplayedRupeeCount + dLytMeter_HIO_c::sInstance->getField_0x1E4();
+            } else if (amount - mDisplayedRupeeCount >= dLytMeter_HIO_c::sInstance->getField_0x1D8()) {
+                newNumDisplayed = mDisplayedRupeeCount + dLytMeter_HIO_c::sInstance->getField_0x1E0();
             } else {
                 newNumDisplayed = mDisplayedRupeeCount + 1;
             }

src/d/lyt/meter/d_lyt_meter_shield_gauge.cpp

@@ -4,7 +4,7 @@
 #include "d/a/d_a_itembase.h"
 #include "d/d_pouch.h"
 #include "d/lyt/d2d.h"
-#include "d/lyt/d_lyt_meter_configuration.h"
+#include "d/lyt/d_lyt_meter_hio.h"
 #include "d/snd/d_snd_small_effect_mgr.h"
 #include "toBeSorted/file_manager.h"
 
@@ -67,7 +67,7 @@ bool dLytMeterShieldGauge_c::build(d2d::ResAccIf_c *resAcc) {
     mCurrentShieldPouchSlot = convertFilePouchSlot(FileManager::GetInstance()->getShieldPouchSlot());
     field_0x300 = mAnimatingDurability;
     field_0x304 = mCurrentDurability;
-    field_0x2FC = dLytMeterConfiguration_c::GetInstance()->getField_0x1C8();
+    field_0x2FC = dLytMeter_HIO_c::GetInstance()->getField_0x1C8();
     mMaxDurability = 80.0f;
     field_0x2F4 = 80.0f;
 
@@ -229,15 +229,15 @@ bool dLytMeterShieldGauge_c::execute() {
         }
     }
 
-    f32 f1 = dLytMeterConfiguration_c::GetInstance()->getField_0x1CC() * 40.0f / 4.0f;
-    f32 f2 = dLytMeterConfiguration_c::GetInstance()->getField_0x1D0() * 40.0f / 4.0f;
-    f32 f3 = dLytMeterConfiguration_c::GetInstance()->getField_0x1C4() * 40.0f / 4.0f;
+    f32 f1 = dLytMeter_HIO_c::GetInstance()->getField_0x1CC() * 40.0f / 4.0f;
+    f32 f2 = dLytMeter_HIO_c::GetInstance()->getField_0x1D0() * 40.0f / 4.0f;
+    f32 f3 = dLytMeter_HIO_c::GetInstance()->getField_0x1C4() * 40.0f / 4.0f;
 
     (void)calcUpdownRatio(mCurrentDurability);
 
     if (field_0x31F) {
         if (mCurrentDurability < field_0x304 && mCurrentDurability < mAnimatingDurability - f1) {
-            field_0x2FC = dLytMeterConfiguration_c::GetInstance()->getField_0x1C8();
+            field_0x2FC = dLytMeter_HIO_c::GetInstance()->getField_0x1C8();
             field_0x300 = mAnimatingDurability;
             field_0x304 = mCurrentDurability;
             field_0x2E4 = calcUpdownRatio(mAnimatingDurability);
@@ -262,7 +262,7 @@ bool dLytMeterShieldGauge_c::execute() {
         field_0x31F = 1;
         field_0x300 = mAnimatingDurability;
         field_0x304 = mCurrentDurability;
-        field_0x2FC = dLytMeterConfiguration_c::GetInstance()->getField_0x1C8();
+        field_0x2FC = dLytMeter_HIO_c::GetInstance()->getField_0x1C8();
         field_0x2E4 = calcUpdownRatio(mAnimatingDurability);
         mAnm[SHIELD_ANIM_USE].setFrame(field_0x2F8 - field_0x2E4);
         mAnm[SHIELD_ANIM_USE].setAnimEnable(true);

src/d/lyt/msg_window/d_lyt_msg_window.cpp

@@ -6,7 +6,7 @@
 #include "d/d_pad.h"
 #include "d/d_stage_mgr.h"
 #include "d/d_tag_processor.h"
-#include "d/d_textunk.h"
+#include "d/d_lyt_hio.h"
 #include "d/d_textwindow_unk.h"
 #include "d/lyt/d_lyt_control_game.h"
 #include "d/lyt/d_lyt_map.h"
@@ -42,10 +42,10 @@
 
 #include <cstring>
 
-class MsgWindowUnkLocalClass {
+class dLytMsgWindow_HIO_c {
 public:
-    MsgWindowUnkLocalClass();
-    virtual ~MsgWindowUnkLocalClass();
+    dLytMsgWindow_HIO_c();
+    virtual ~dLytMsgWindow_HIO_c();
 
 private:
     /* 0x04 */ u32 field_0x04;
@@ -53,14 +53,14 @@ private:
     /* 0x09 */ u8 field_0x09;
 };
 
-MsgWindowUnkLocalClass mUnk;
+dLytMsgWindow_HIO_c sHio;
 
-MsgWindowUnkLocalClass::MsgWindowUnkLocalClass() {
+dLytMsgWindow_HIO_c::dLytMsgWindow_HIO_c() {
     field_0x04 = 8;
     field_0x08 = 0;
     field_0x09 = 0;
 }
-MsgWindowUnkLocalClass::~MsgWindowUnkLocalClass() {}
+dLytMsgWindow_HIO_c::~dLytMsgWindow_HIO_c() {}
 
 STATE_DEFINE(dLytMsgWindow_c, Invisible);
 STATE_DEFINE(dLytMsgWindow_c, In);
@@ -855,7 +855,7 @@ void dLytMsgWindow_c::removeSubMsgManagers() {
     mpCurrentSubtype = nullptr;
     field_0x1220 = 0;
 
-    UnkTextThing::getInstance()->setStr2("");
-    UnkTextThing::getInstance()->setStr1("");
-    UnkTextThing::getInstance()->setStr3("");
+    dLyt_HIO_c::getInstance()->setStr2("");
+    dLyt_HIO_c::getInstance()->setStr1("");
+    dLyt_HIO_c::getInstance()->setStr3("");
 }

src/d/lyt/msg_window/d_lyt_msg_window_link.cpp

@@ -2,7 +2,7 @@
 
 #include "common.h"
 #include "d/d_tag_processor.h"
-#include "d/d_textunk.h"
+#include "d/d_lyt_hio.h"
 #include "d/lyt/d2d.h"
 #include "d/lyt/d_textbox.h"
 #include "d/lyt/msg_window/d_lyt_msg_window_common.h"
@@ -172,7 +172,7 @@ void dLytMsgWindowLink_c::executeState_In() {
 void dLytMsgWindowLink_c::finalizeState_In() {}
 
 void dLytMsgWindowLink_c::initializeState_Wait() {
-    mWaitDelay = UnkTextThing::getInstance()->getMsgWindowWaitDelay();
+    mWaitDelay = dLyt_HIO_c::getInstance()->getMsgWindowWaitDelay();
 }
 void dLytMsgWindowLink_c::executeState_Wait() {
     if (--mWaitDelay > 0) {

src/d/lyt/msg_window/d_lyt_msg_window_sword.cpp

@@ -2,7 +2,7 @@
 
 #include "common.h"
 #include "d/d_tag_processor.h"
-#include "d/d_textunk.h"
+#include "d/d_lyt_hio.h"
 #include "d/lyt/d2d.h"
 #include "d/lyt/d_textbox.h"
 #include "m/m_vec.h"
@@ -195,7 +195,7 @@ void dLytMsgWindowSword_c::executeState_In() {
 void dLytMsgWindowSword_c::finalizeState_In() {}
 
 void dLytMsgWindowSword_c::initializeState_Wait() {
-    mWaitDelay = UnkTextThing::getInstance()->getMsgWindowWaitDelay();
+    mWaitDelay = dLyt_HIO_c::getInstance()->getMsgWindowWaitDelay();
 }
 void dLytMsgWindowSword_c::executeState_Wait() {
     if (--mWaitDelay > 0) {

src/d/lyt/msg_window/d_lyt_msg_window_talk.cpp

@@ -2,7 +2,7 @@
 
 #include "common.h"
 #include "d/d_tag_processor.h"
-#include "d/d_textunk.h"
+#include "d/d_lyt_hio.h"
 #include "d/lyt/d2d.h"
 #include "d/lyt/d_textbox.h"
 #include "d/lyt/msg_window/d_lyt_msg_window_common.h"
@@ -172,7 +172,7 @@ void dLytMsgWindowTalk_c::executeState_In() {
 void dLytMsgWindowTalk_c::finalizeState_In() {}
 
 void dLytMsgWindowTalk_c::initializeState_Wait() {
-    mWaitDelay = UnkTextThing::getInstance()->getMsgWindowWaitDelay();
+    mWaitDelay = dLyt_HIO_c::getInstance()->getMsgWindowWaitDelay();
 }
 void dLytMsgWindowTalk_c::executeState_Wait() {
     if (--mWaitDelay > 0) {

src/toBeSorted/attention.cpp

@@ -15,11 +15,11 @@ mVec3_c getPosCopy3(const dAcObjBase_c &actor) {
     return actor.poscopy3;
 }
 
-class UnkAttnClass {
+class dAttention_HIO_c {
 public:
     u8 field_0x00;
-    UnkAttnClass();
-    virtual ~UnkAttnClass() {}
+    dAttention_HIO_c();
+    virtual ~dAttention_HIO_c() {}
 
     void init();
     void remove();
@@ -33,11 +33,11 @@ public:
     f32 field_0x14;
 };
 
-void UnkAttnClass::init() {}
+void dAttention_HIO_c::init() {}
 
-void UnkAttnClass::remove() {}
+void dAttention_HIO_c::remove() {}
 
-UnkAttnClass::UnkAttnClass()
+dAttention_HIO_c::dAttention_HIO_c()
     : field_0x00(0),
       field_0x08(field_0x00 | 8),
       field_0x0A(300),
@@ -46,14 +46,14 @@ UnkAttnClass::UnkAttnClass()
       field_0x12(10),
       field_0x14(1.0f) {}
 
-UnkAttnClass attnClass;
+dAttention_HIO_c sHio;
 
 AttentionManager::AttentionManager() {
     sInstance = this;
 }
 
 AttentionManager::~AttentionManager() {
-    attnClass.remove();
+    sHio.remove();
     sInstance = nullptr;
 }
 
@@ -76,7 +76,7 @@ bool AttentionManager::create() {
     mModels.mState = NONE;
     mTargeted = false;
     field_0xB68 = 0;
-    attnClass.init();
+    sHio.init();
     field_0xBDC = 0;
     field_0xBD5 = 0;
     field_0xBD4 = 0;
@@ -200,7 +200,7 @@ bool AttentionManager::switchTarget(s32 idx) {
             mHoldingZ = checkZButtonHeld();
             AttentionPool *left = mGroups[idx].getPool();
             AttentionPool *right = mGroups[idx].getOtherPool();
-            if ((attnClass.field_0x08 & 8) != 0 && (mModels.mState == OFF || mModels.mState == NONE) && checkLink2() &&
+            if ((sHio.field_0x08 & 8) != 0 && (mModels.mState == OFF || mModels.mState == NONE) && checkLink2() &&
                 right->mNumUsedRefs != 0) {
                 zPressed = true;
             }
@@ -252,7 +252,7 @@ bool AttentionManager::playTargetAnim(s32 idx) {
         PSMTXTrans(mtx, v.x, v.y, v.z);
 
         mModels.mMdls->mMdl.setLocalMtx(mtx);
-        mModels.mMdls->mMdl.setScale(attnClass.field_0x14, attnClass.field_0x14, attnClass.field_0x14);
+        mModels.mMdls->mMdl.setScale(sHio.field_0x14, sHio.field_0x14, sHio.field_0x14);
         doSomething = true;
     }