diff --git a/asm/d/menu/d_menu_fishing/setFishParam__15dMenu_Fishing_cFiUsUc.s b/asm/d/menu/d_menu_fishing/setFishParam__15dMenu_Fishing_cFiUsUc.s
deleted file mode 100644
index e55f43c2d6f..00000000000
--- a/asm/d/menu/d_menu_fishing/setFishParam__15dMenu_Fishing_cFiUsUc.s
+++ /dev/null
@@ -1,114 +0,0 @@
-lbl_801C605C:
-/* 801C605C  94 21 FF 90 */	stwu r1, -0x70(r1)
-/* 801C6060  7C 08 02 A6 */	mflr r0
-/* 801C6064  90 01 00 74 */	stw r0, 0x74(r1)
-/* 801C6068  39 61 00 70 */	addi r11, r1, 0x70
-/* 801C606C  48 19 C1 5D */	bl _savegpr_24
-/* 801C6070  7C 7D 1B 78 */	mr r29, r3
-/* 801C6074  7C 9A 23 78 */	mr r26, r4
-/* 801C6078  7C BC 2B 78 */	mr r28, r5
-/* 801C607C  7C D8 33 78 */	mr r24, r6
-/* 801C6080  54 A4 04 3E */	clrlwi r4, r5, 0x10
-/* 801C6084  4B FF FF 95 */	bl getFigure__15dMenu_Fishing_cFi
-/* 801C6088  7C 7B 1B 78 */	mr r27, r3
-/* 801C608C  7F A3 EB 78 */	mr r3, r29
-/* 801C6090  57 04 06 3E */	clrlwi r4, r24, 0x18
-/* 801C6094  4B FF FF 85 */	bl getFigure__15dMenu_Fishing_cFi
-/* 801C6098  57 05 06 3E */	clrlwi r5, r24, 0x18
-/* 801C609C  3C 80 80 40 */	lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 801C60A0  3B 24 61 C0 */	addi r25, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 801C60A4  57 40 10 3A */	slwi r0, r26, 2
-/* 801C60A8  7F FD 02 14 */	add r31, r29, r0
-/* 801C60AC  54 7A 06 3E */	clrlwi r26, r3, 0x18
-/* 801C60B0  3B C1 00 28 */	addi r30, r1, 0x28
-/* 801C60B4  57 98 04 3E */	clrlwi r24, r28, 0x10
-/* 801C60B8  57 7B 06 3E */	clrlwi r27, r27, 0x18
-/* 801C60BC  3B 81 00 08 */	addi r28, r1, 8
-/* 801C60C0  90 B9 5E 0C */	stw r5, 0x5e0c(r25)
-/* 801C60C4  80 7D 01 F4 */	lwz r3, 0x1f4(r29)
-/* 801C60C8  38 80 05 97 */	li r4, 0x597
-/* 801C60CC  80 BF 01 24 */	lwz r5, 0x124(r31)
-/* 801C60D0  38 C0 00 00 */	li r6, 0
-/* 801C60D4  38 E0 00 00 */	li r7, 0
-/* 801C60D8  39 00 00 00 */	li r8, 0
-/* 801C60DC  39 20 00 00 */	li r9, 0
-/* 801C60E0  81 83 00 00 */	lwz r12, 0(r3)
-/* 801C60E4  81 8C 00 08 */	lwz r12, 8(r12)
-/* 801C60E8  7D 89 03 A6 */	mtctr r12
-/* 801C60EC  4E 80 04 21 */	bctrl 
-/* 801C60F0  80 7F 01 24 */	lwz r3, 0x124(r31)
-/* 801C60F4  48 13 A5 65 */	bl getStringPtr__10J2DTextBoxCFv
-/* 801C60F8  7C 64 1B 78 */	mr r4, r3
-/* 801C60FC  7F C3 F3 78 */	mr r3, r30
-/* 801C6100  48 1A 2A 2D */	bl strcpy
-/* 801C6104  38 C0 00 00 */	li r6, 0
-/* 801C6108  38 81 00 08 */	addi r4, r1, 8
-/* 801C610C  7C 7E D2 14 */	add r3, r30, r26
-/* 801C6110  48 00 00 14 */	b lbl_801C6124
-lbl_801C6114:
-/* 801C6114  98 A4 00 00 */	stb r5, 0(r4)
-/* 801C6118  38 C6 00 01 */	addi r6, r6, 1
-/* 801C611C  38 63 00 01 */	addi r3, r3, 1
-/* 801C6120  38 84 00 01 */	addi r4, r4, 1
-lbl_801C6124:
-/* 801C6124  88 A3 00 00 */	lbz r5, 0(r3)
-/* 801C6128  7C A0 07 75 */	extsb. r0, r5
-/* 801C612C  40 82 FF E8 */	bne lbl_801C6114
-/* 801C6130  38 00 00 00 */	li r0, 0
-/* 801C6134  7C 1C 31 AE */	stbx r0, r28, r6
-/* 801C6138  7C 1E D1 AE */	stbx r0, r30, r26
-/* 801C613C  80 7F 01 24 */	lwz r3, 0x124(r31)
-/* 801C6140  48 13 A5 19 */	bl getStringPtr__10J2DTextBoxCFv
-/* 801C6144  38 81 00 28 */	addi r4, r1, 0x28
-/* 801C6148  48 1A 29 E5 */	bl strcpy
-/* 801C614C  80 7F 01 84 */	lwz r3, 0x184(r31)
-/* 801C6150  48 13 A5 09 */	bl getStringPtr__10J2DTextBoxCFv
-/* 801C6154  38 81 00 08 */	addi r4, r1, 8
-/* 801C6158  48 1A 29 D5 */	bl strcpy
-/* 801C615C  93 19 5E 0C */	stw r24, 0x5e0c(r25)
-/* 801C6160  80 7D 01 F4 */	lwz r3, 0x1f4(r29)
-/* 801C6164  38 80 05 98 */	li r4, 0x598
-/* 801C6168  80 BF 01 54 */	lwz r5, 0x154(r31)
-/* 801C616C  38 C0 00 00 */	li r6, 0
-/* 801C6170  38 E0 00 00 */	li r7, 0
-/* 801C6174  39 00 00 00 */	li r8, 0
-/* 801C6178  39 20 00 00 */	li r9, 0
-/* 801C617C  81 83 00 00 */	lwz r12, 0(r3)
-/* 801C6180  81 8C 00 08 */	lwz r12, 8(r12)
-/* 801C6184  7D 89 03 A6 */	mtctr r12
-/* 801C6188  4E 80 04 21 */	bctrl 
-/* 801C618C  80 7F 01 54 */	lwz r3, 0x154(r31)
-/* 801C6190  48 13 A4 C9 */	bl getStringPtr__10J2DTextBoxCFv
-/* 801C6194  7C 64 1B 78 */	mr r4, r3
-/* 801C6198  38 61 00 28 */	addi r3, r1, 0x28
-/* 801C619C  48 1A 29 91 */	bl strcpy
-/* 801C61A0  38 C0 00 00 */	li r6, 0
-/* 801C61A4  38 81 00 08 */	addi r4, r1, 8
-/* 801C61A8  7C 7E DA 14 */	add r3, r30, r27
-/* 801C61AC  48 00 00 14 */	b lbl_801C61C0
-lbl_801C61B0:
-/* 801C61B0  98 A4 00 00 */	stb r5, 0(r4)
-/* 801C61B4  38 C6 00 01 */	addi r6, r6, 1
-/* 801C61B8  38 63 00 01 */	addi r3, r3, 1
-/* 801C61BC  38 84 00 01 */	addi r4, r4, 1
-lbl_801C61C0:
-/* 801C61C0  88 A3 00 00 */	lbz r5, 0(r3)
-/* 801C61C4  7C A0 07 75 */	extsb. r0, r5
-/* 801C61C8  40 82 FF E8 */	bne lbl_801C61B0
-/* 801C61CC  38 00 00 00 */	li r0, 0
-/* 801C61D0  7C 1C 31 AE */	stbx r0, r28, r6
-/* 801C61D4  7C 1E D9 AE */	stbx r0, r30, r27
-/* 801C61D8  80 7F 01 54 */	lwz r3, 0x154(r31)
-/* 801C61DC  48 13 A4 7D */	bl getStringPtr__10J2DTextBoxCFv
-/* 801C61E0  38 81 00 28 */	addi r4, r1, 0x28
-/* 801C61E4  48 1A 29 49 */	bl strcpy
-/* 801C61E8  80 7F 01 B4 */	lwz r3, 0x1b4(r31)
-/* 801C61EC  48 13 A4 6D */	bl getStringPtr__10J2DTextBoxCFv
-/* 801C61F0  38 81 00 08 */	addi r4, r1, 8
-/* 801C61F4  48 1A 29 39 */	bl strcpy
-/* 801C61F8  39 61 00 70 */	addi r11, r1, 0x70
-/* 801C61FC  48 19 C0 19 */	bl _restgpr_24
-/* 801C6200  80 01 00 74 */	lwz r0, 0x74(r1)
-/* 801C6204  7C 08 03 A6 */	mtlr r0
-/* 801C6208  38 21 00 70 */	addi r1, r1, 0x70
-/* 801C620C  4E 80 00 20 */	blr 
diff --git a/asm/d/meter/d_meter_HIO/__dt__16dMeter_drawHIO_cFv.s b/asm/d/meter/d_meter_HIO/__dt__16dMeter_drawHIO_cFv.s
deleted file mode 100644
index 17c3aec3b46..00000000000
--- a/asm/d/meter/d_meter_HIO/__dt__16dMeter_drawHIO_cFv.s
+++ /dev/null
@@ -1,81 +0,0 @@
-lbl_80201128:
-/* 80201128  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8020112C  7C 08 02 A6 */	mflr r0
-/* 80201130  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80201134  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80201138  7C 7F 1B 79 */	or. r31, r3, r3
-/* 8020113C  41 82 00 E8 */	beq lbl_80201224
-/* 80201140  3C 60 80 3C */	lis r3, __vt__16dMeter_drawHIO_c@ha /* 0x803BF118@ha */
-/* 80201144  38 03 F1 18 */	addi r0, r3, __vt__16dMeter_drawHIO_c@l /* 0x803BF118@l */
-/* 80201148  90 1F 00 00 */	stw r0, 0(r31)
-/* 8020114C  34 1F 0E 7C */	addic. r0, r31, 0xe7c
-/* 80201150  41 82 00 10 */	beq lbl_80201160
-/* 80201154  3C 60 80 3C */	lis r3, __vt__25dMeter_drawLightDropHIO_c@ha /* 0x803BF124@ha */
-/* 80201158  38 03 F1 24 */	addi r0, r3, __vt__25dMeter_drawLightDropHIO_c@l /* 0x803BF124@l */
-/* 8020115C  90 1F 0E 7C */	stw r0, 0xe7c(r31)
-lbl_80201160:
-/* 80201160  34 1F 0C 20 */	addic. r0, r31, 0xc20
-/* 80201164  41 82 00 10 */	beq lbl_80201174
-/* 80201168  3C 60 80 3C */	lis r3, __vt__25dMeter_drawEmpButtonHIO_c@ha /* 0x803BF13C@ha */
-/* 8020116C  38 03 F1 3C */	addi r0, r3, __vt__25dMeter_drawEmpButtonHIO_c@l /* 0x803BF13C@l */
-/* 80201170  90 1F 0C 20 */	stw r0, 0xc20(r31)
-lbl_80201174:
-/* 80201174  34 1F 0A 90 */	addic. r0, r31, 0xa90
-/* 80201178  41 82 00 10 */	beq lbl_80201188
-/* 8020117C  3C 60 80 3C */	lis r3, __vt__24dMeter_drawMiniGameHIO_c@ha /* 0x803BF130@ha */
-/* 80201180  38 03 F1 30 */	addi r0, r3, __vt__24dMeter_drawMiniGameHIO_c@l /* 0x803BF130@l */
-/* 80201184  90 1F 0A 90 */	stw r0, 0xa90(r31)
-lbl_80201188:
-/* 80201188  34 1F 0A 34 */	addic. r0, r31, 0xa34
-/* 8020118C  41 82 00 10 */	beq lbl_8020119C
-/* 80201190  3C 60 80 3C */	lis r3, __vt__21dMeter_drawSkillHIO_c@ha /* 0x803BF148@ha */
-/* 80201194  38 03 F1 48 */	addi r0, r3, __vt__21dMeter_drawSkillHIO_c@l /* 0x803BF148@l */
-/* 80201198  90 1F 0A 34 */	stw r0, 0xa34(r31)
-lbl_8020119C:
-/* 8020119C  34 1F 0A 1C */	addic. r0, r31, 0xa1c
-/* 802011A0  41 82 00 10 */	beq lbl_802011B0
-/* 802011A4  3C 60 80 3C */	lis r3, __vt__27dMeter_drawCalibrationHIO_c@ha /* 0x803BF154@ha */
-/* 802011A8  38 03 F1 54 */	addi r0, r3, __vt__27dMeter_drawCalibrationHIO_c@l /* 0x803BF154@l */
-/* 802011AC  90 1F 0A 1C */	stw r0, 0xa1c(r31)
-lbl_802011B0:
-/* 802011B0  34 1F 09 DC */	addic. r0, r31, 0x9dc
-/* 802011B4  41 82 00 10 */	beq lbl_802011C4
-/* 802011B8  3C 60 80 3C */	lis r3, __vt__22dMeter_drawInsectHIO_c@ha /* 0x803BF160@ha */
-/* 802011BC  38 03 F1 60 */	addi r0, r3, __vt__22dMeter_drawInsectHIO_c@l /* 0x803BF160@l */
-/* 802011C0  90 1F 09 DC */	stw r0, 0x9dc(r31)
-lbl_802011C4:
-/* 802011C4  34 1F 07 88 */	addic. r0, r31, 0x788
-/* 802011C8  41 82 00 10 */	beq lbl_802011D8
-/* 802011CC  3C 60 80 3C */	lis r3, __vt__23dMeter_drawFishingHIO_c@ha /* 0x803BF16C@ha */
-/* 802011D0  38 03 F1 6C */	addi r0, r3, __vt__23dMeter_drawFishingHIO_c@l /* 0x803BF16C@l */
-/* 802011D4  90 1F 07 88 */	stw r0, 0x788(r31)
-lbl_802011D8:
-/* 802011D8  34 1F 07 28 */	addic. r0, r31, 0x728
-/* 802011DC  41 82 00 10 */	beq lbl_802011EC
-/* 802011E0  3C 60 80 3C */	lis r3, __vt__22dMeter_drawLetterHIO_c@ha /* 0x803BF178@ha */
-/* 802011E4  38 03 F1 78 */	addi r0, r3, __vt__22dMeter_drawLetterHIO_c@l /* 0x803BF178@l */
-/* 802011E8  90 1F 07 28 */	stw r0, 0x728(r31)
-lbl_802011EC:
-/* 802011EC  34 1F 06 B8 */	addic. r0, r31, 0x6b8
-/* 802011F0  41 82 00 10 */	beq lbl_80201200
-/* 802011F4  3C 60 80 3C */	lis r3, __vt__22dMeter_drawOptionHIO_c@ha /* 0x803BF184@ha */
-/* 802011F8  38 03 F1 84 */	addi r0, r3, __vt__22dMeter_drawOptionHIO_c@l /* 0x803BF184@l */
-/* 802011FC  90 1F 06 B8 */	stw r0, 0x6b8(r31)
-lbl_80201200:
-/* 80201200  34 1F 06 18 */	addic. r0, r31, 0x618
-/* 80201204  41 82 00 10 */	beq lbl_80201214
-/* 80201208  3C 60 80 3C */	lis r3, __vt__23dMeter_drawCollectHIO_c@ha /* 0x803BF190@ha */
-/* 8020120C  38 03 F1 90 */	addi r0, r3, __vt__23dMeter_drawCollectHIO_c@l /* 0x803BF190@l */
-/* 80201210  90 1F 06 18 */	stw r0, 0x618(r31)
-lbl_80201214:
-/* 80201214  7C 80 07 35 */	extsh. r0, r4
-/* 80201218  40 81 00 0C */	ble lbl_80201224
-/* 8020121C  7F E3 FB 78 */	mr r3, r31
-/* 80201220  48 0C DB 1D */	bl __dl__FPv
-lbl_80201224:
-/* 80201224  7F E3 FB 78 */	mr r3, r31
-/* 80201228  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 8020122C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80201230  7C 08 03 A6 */	mtlr r0
-/* 80201234  38 21 00 10 */	addi r1, r1, 0x10
-/* 80201238  4E 80 00 20 */	blr 
diff --git a/asm/d/meter/d_meter_HIO/__dt__16dMeter_fmapHIO_cFv.s b/asm/d/meter/d_meter_HIO/__dt__16dMeter_fmapHIO_cFv.s
deleted file mode 100644
index 00102158b11..00000000000
--- a/asm/d/meter/d_meter_HIO/__dt__16dMeter_fmapHIO_cFv.s
+++ /dev/null
@@ -1,73 +0,0 @@
-lbl_80200BCC:
-/* 80200BCC  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 80200BD0  7C 08 02 A6 */	mflr r0
-/* 80200BD4  90 01 00 24 */	stw r0, 0x24(r1)
-/* 80200BD8  39 61 00 20 */	addi r11, r1, 0x20
-/* 80200BDC  48 16 16 01 */	bl _savegpr_29
-/* 80200BE0  7C 7D 1B 79 */	or. r29, r3, r3
-/* 80200BE4  7C 9E 23 78 */	mr r30, r4
-/* 80200BE8  41 82 00 D0 */	beq lbl_80200CB8
-/* 80200BEC  3C 60 80 3C */	lis r3, __vt__16dMeter_fmapHIO_c@ha /* 0x803BF0F4@ha */
-/* 80200BF0  38 03 F0 F4 */	addi r0, r3, __vt__16dMeter_fmapHIO_c@l /* 0x803BF0F4@l */
-/* 80200BF4  90 1D 00 00 */	stw r0, 0(r29)
-/* 80200BF8  83 FD 00 0C */	lwz r31, 0xc(r29)
-/* 80200BFC  28 1F 00 00 */	cmplwi r31, 0
-/* 80200C00  41 82 00 18 */	beq lbl_80200C18
-/* 80200C04  4B E0 E1 4D */	bl mDoExt_getGameHeap__Fv
-/* 80200C08  7F E4 FB 78 */	mr r4, r31
-/* 80200C0C  48 0C D9 3D */	bl free__7JKRHeapFPv
-/* 80200C10  38 00 00 00 */	li r0, 0
-/* 80200C14  90 1D 00 0C */	stw r0, 0xc(r29)
-lbl_80200C18:
-/* 80200C18  83 FD 00 10 */	lwz r31, 0x10(r29)
-/* 80200C1C  28 1F 00 00 */	cmplwi r31, 0
-/* 80200C20  41 82 00 18 */	beq lbl_80200C38
-/* 80200C24  4B E0 E1 2D */	bl mDoExt_getGameHeap__Fv
-/* 80200C28  7F E4 FB 78 */	mr r4, r31
-/* 80200C2C  48 0C D9 1D */	bl free__7JKRHeapFPv
-/* 80200C30  38 00 00 00 */	li r0, 0
-/* 80200C34  90 1D 00 10 */	stw r0, 0x10(r29)
-lbl_80200C38:
-/* 80200C38  80 7D 00 08 */	lwz r3, 8(r29)
-/* 80200C3C  28 03 00 00 */	cmplwi r3, 0
-/* 80200C40  41 82 00 3C */	beq lbl_80200C7C
-/* 80200C44  81 83 00 00 */	lwz r12, 0(r3)
-/* 80200C48  81 8C 00 0C */	lwz r12, 0xc(r12)
-/* 80200C4C  7D 89 03 A6 */	mtctr r12
-/* 80200C50  4E 80 04 21 */	bctrl 
-/* 80200C54  80 7D 00 08 */	lwz r3, 8(r29)
-/* 80200C58  28 03 00 00 */	cmplwi r3, 0
-/* 80200C5C  41 82 00 18 */	beq lbl_80200C74
-/* 80200C60  38 80 00 01 */	li r4, 1
-/* 80200C64  81 83 00 00 */	lwz r12, 0(r3)
-/* 80200C68  81 8C 00 08 */	lwz r12, 8(r12)
-/* 80200C6C  7D 89 03 A6 */	mtctr r12
-/* 80200C70  4E 80 04 21 */	bctrl 
-lbl_80200C74:
-/* 80200C74  38 00 00 00 */	li r0, 0
-/* 80200C78  90 1D 00 08 */	stw r0, 8(r29)
-lbl_80200C7C:
-/* 80200C7C  34 1D 03 14 */	addic. r0, r29, 0x314
-/* 80200C80  41 82 00 10 */	beq lbl_80200C90
-/* 80200C84  3C 60 80 3C */	lis r3, __vt__19dMeter_mapIconHIO_c@ha /* 0x803BF100@ha */
-/* 80200C88  38 03 F1 00 */	addi r0, r3, __vt__19dMeter_mapIconHIO_c@l /* 0x803BF100@l */
-/* 80200C8C  90 1D 03 14 */	stw r0, 0x314(r29)
-lbl_80200C90:
-/* 80200C90  38 7D 02 5C */	addi r3, r29, 0x25c
-/* 80200C94  3C 80 80 01 */	lis r4, __dt__4cXyzFv@ha /* 0x80009184@ha */
-/* 80200C98  38 84 91 84 */	addi r4, r4, __dt__4cXyzFv@l /* 0x80009184@l */
-/* 80200C9C  38 A0 00 0C */	li r5, 0xc
-/* 80200CA0  38 C0 00 0C */	li r6, 0xc
-/* 80200CA4  48 16 10 45 */	bl __destroy_arr
-/* 80200CA8  7F C0 07 35 */	extsh. r0, r30
-/* 80200CAC  40 81 00 0C */	ble lbl_80200CB8
-/* 80200CB0  7F A3 EB 78 */	mr r3, r29
-/* 80200CB4  48 0C E0 89 */	bl __dl__FPv
-lbl_80200CB8:
-/* 80200CB8  7F A3 EB 78 */	mr r3, r29
-/* 80200CBC  39 61 00 20 */	addi r11, r1, 0x20
-/* 80200CC0  48 16 15 69 */	bl _restgpr_29
-/* 80200CC4  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 80200CC8  7C 08 03 A6 */	mtlr r0
-/* 80200CCC  38 21 00 20 */	addi r1, r1, 0x20
-/* 80200CD0  4E 80 00 20 */	blr 
diff --git a/asm/d/meter/d_meter_HIO/__dt__16dMeter_ringHIO_cFv.s b/asm/d/meter/d_meter_HIO/__dt__16dMeter_ringHIO_cFv.s
deleted file mode 100644
index 5e8b0416396..00000000000
--- a/asm/d/meter/d_meter_HIO/__dt__16dMeter_ringHIO_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_802010E0:
-/* 802010E0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802010E4  7C 08 02 A6 */	mflr r0
-/* 802010E8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802010EC  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802010F0  7C 7F 1B 79 */	or. r31, r3, r3
-/* 802010F4  41 82 00 1C */	beq lbl_80201110
-/* 802010F8  3C A0 80 3C */	lis r5, __vt__16dMeter_ringHIO_c@ha /* 0x803BF10C@ha */
-/* 802010FC  38 05 F1 0C */	addi r0, r5, __vt__16dMeter_ringHIO_c@l /* 0x803BF10C@l */
-/* 80201100  90 1F 00 00 */	stw r0, 0(r31)
-/* 80201104  7C 80 07 35 */	extsh. r0, r4
-/* 80201108  40 81 00 08 */	ble lbl_80201110
-/* 8020110C  48 0C DC 31 */	bl __dl__FPv
-lbl_80201110:
-/* 80201110  7F E3 FB 78 */	mr r3, r31
-/* 80201114  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80201118  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8020111C  7C 08 03 A6 */	mtlr r0
-/* 80201120  38 21 00 10 */	addi r1, r1, 0x10
-/* 80201124  4E 80 00 20 */	blr 
diff --git a/asm/d/meter/d_meter_HIO/__dt__18dMeter_cursorHIO_cFv.s b/asm/d/meter/d_meter_HIO/__dt__18dMeter_cursorHIO_cFv.s
deleted file mode 100644
index 5aa77c76ef6..00000000000
--- a/asm/d/meter/d_meter_HIO/__dt__18dMeter_cursorHIO_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80201098:
-/* 80201098  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8020109C  7C 08 02 A6 */	mflr r0
-/* 802010A0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802010A4  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802010A8  7C 7F 1B 79 */	or. r31, r3, r3
-/* 802010AC  41 82 00 1C */	beq lbl_802010C8
-/* 802010B0  3C A0 80 3C */	lis r5, __vt__18dMeter_cursorHIO_c@ha /* 0x803BF0E8@ha */
-/* 802010B4  38 05 F0 E8 */	addi r0, r5, __vt__18dMeter_cursorHIO_c@l /* 0x803BF0E8@l */
-/* 802010B8  90 1F 00 00 */	stw r0, 0(r31)
-/* 802010BC  7C 80 07 35 */	extsh. r0, r4
-/* 802010C0  40 81 00 08 */	ble lbl_802010C8
-/* 802010C4  48 0C DC 79 */	bl __dl__FPv
-lbl_802010C8:
-/* 802010C8  7F E3 FB 78 */	mr r3, r31
-/* 802010CC  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802010D0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802010D4  7C 08 03 A6 */	mtlr r0
-/* 802010D8  38 21 00 10 */	addi r1, r1, 0x10
-/* 802010DC  4E 80 00 20 */	blr 
diff --git a/asm/d/meter/d_meter_HIO/__dt__19dMeter_mapIconHIO_cFv.s b/asm/d/meter/d_meter_HIO/__dt__19dMeter_mapIconHIO_cFv.s
deleted file mode 100644
index 6099ab588d4..00000000000
--- a/asm/d/meter/d_meter_HIO/__dt__19dMeter_mapIconHIO_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80201028:
-/* 80201028  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8020102C  7C 08 02 A6 */	mflr r0
-/* 80201030  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80201034  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80201038  7C 7F 1B 79 */	or. r31, r3, r3
-/* 8020103C  41 82 00 1C */	beq lbl_80201058
-/* 80201040  3C A0 80 3C */	lis r5, __vt__19dMeter_mapIconHIO_c@ha /* 0x803BF100@ha */
-/* 80201044  38 05 F1 00 */	addi r0, r5, __vt__19dMeter_mapIconHIO_c@l /* 0x803BF100@l */
-/* 80201048  90 1F 00 00 */	stw r0, 0(r31)
-/* 8020104C  7C 80 07 35 */	extsh. r0, r4
-/* 80201050  40 81 00 08 */	ble lbl_80201058
-/* 80201054  48 0C DC E9 */	bl __dl__FPv
-lbl_80201058:
-/* 80201058  7F E3 FB 78 */	mr r3, r31
-/* 8020105C  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80201060  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80201064  7C 08 03 A6 */	mtlr r0
-/* 80201068  38 21 00 10 */	addi r1, r1, 0x10
-/* 8020106C  4E 80 00 20 */	blr 
diff --git a/asm/d/meter/d_meter_HIO/__dt__21dMeter_drawSkillHIO_cFv.s b/asm/d/meter/d_meter_HIO/__dt__21dMeter_drawSkillHIO_cFv.s
deleted file mode 100644
index eff737a93d1..00000000000
--- a/asm/d/meter/d_meter_HIO/__dt__21dMeter_drawSkillHIO_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80200E30:
-/* 80200E30  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80200E34  7C 08 02 A6 */	mflr r0
-/* 80200E38  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80200E3C  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80200E40  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80200E44  41 82 00 1C */	beq lbl_80200E60
-/* 80200E48  3C A0 80 3C */	lis r5, __vt__21dMeter_drawSkillHIO_c@ha /* 0x803BF148@ha */
-/* 80200E4C  38 05 F1 48 */	addi r0, r5, __vt__21dMeter_drawSkillHIO_c@l /* 0x803BF148@l */
-/* 80200E50  90 1F 00 00 */	stw r0, 0(r31)
-/* 80200E54  7C 80 07 35 */	extsh. r0, r4
-/* 80200E58  40 81 00 08 */	ble lbl_80200E60
-/* 80200E5C  48 0C DE E1 */	bl __dl__FPv
-lbl_80200E60:
-/* 80200E60  7F E3 FB 78 */	mr r3, r31
-/* 80200E64  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80200E68  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80200E6C  7C 08 03 A6 */	mtlr r0
-/* 80200E70  38 21 00 10 */	addi r1, r1, 0x10
-/* 80200E74  4E 80 00 20 */	blr 
diff --git a/asm/d/meter/d_meter_HIO/__dt__22dMeter_drawInsectHIO_cFv.s b/asm/d/meter/d_meter_HIO/__dt__22dMeter_drawInsectHIO_cFv.s
deleted file mode 100644
index bc02eb3e184..00000000000
--- a/asm/d/meter/d_meter_HIO/__dt__22dMeter_drawInsectHIO_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80200EC0:
-/* 80200EC0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80200EC4  7C 08 02 A6 */	mflr r0
-/* 80200EC8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80200ECC  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80200ED0  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80200ED4  41 82 00 1C */	beq lbl_80200EF0
-/* 80200ED8  3C A0 80 3C */	lis r5, __vt__22dMeter_drawInsectHIO_c@ha /* 0x803BF160@ha */
-/* 80200EDC  38 05 F1 60 */	addi r0, r5, __vt__22dMeter_drawInsectHIO_c@l /* 0x803BF160@l */
-/* 80200EE0  90 1F 00 00 */	stw r0, 0(r31)
-/* 80200EE4  7C 80 07 35 */	extsh. r0, r4
-/* 80200EE8  40 81 00 08 */	ble lbl_80200EF0
-/* 80200EEC  48 0C DE 51 */	bl __dl__FPv
-lbl_80200EF0:
-/* 80200EF0  7F E3 FB 78 */	mr r3, r31
-/* 80200EF4  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80200EF8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80200EFC  7C 08 03 A6 */	mtlr r0
-/* 80200F00  38 21 00 10 */	addi r1, r1, 0x10
-/* 80200F04  4E 80 00 20 */	blr 
diff --git a/asm/d/meter/d_meter_HIO/__dt__22dMeter_drawLetterHIO_cFv.s b/asm/d/meter/d_meter_HIO/__dt__22dMeter_drawLetterHIO_cFv.s
deleted file mode 100644
index d2b953c51a2..00000000000
--- a/asm/d/meter/d_meter_HIO/__dt__22dMeter_drawLetterHIO_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80200F50:
-/* 80200F50  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80200F54  7C 08 02 A6 */	mflr r0
-/* 80200F58  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80200F5C  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80200F60  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80200F64  41 82 00 1C */	beq lbl_80200F80
-/* 80200F68  3C A0 80 3C */	lis r5, __vt__22dMeter_drawLetterHIO_c@ha /* 0x803BF178@ha */
-/* 80200F6C  38 05 F1 78 */	addi r0, r5, __vt__22dMeter_drawLetterHIO_c@l /* 0x803BF178@l */
-/* 80200F70  90 1F 00 00 */	stw r0, 0(r31)
-/* 80200F74  7C 80 07 35 */	extsh. r0, r4
-/* 80200F78  40 81 00 08 */	ble lbl_80200F80
-/* 80200F7C  48 0C DD C1 */	bl __dl__FPv
-lbl_80200F80:
-/* 80200F80  7F E3 FB 78 */	mr r3, r31
-/* 80200F84  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80200F88  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80200F8C  7C 08 03 A6 */	mtlr r0
-/* 80200F90  38 21 00 10 */	addi r1, r1, 0x10
-/* 80200F94  4E 80 00 20 */	blr 
diff --git a/asm/d/meter/d_meter_HIO/__dt__22dMeter_drawOptionHIO_cFv.s b/asm/d/meter/d_meter_HIO/__dt__22dMeter_drawOptionHIO_cFv.s
deleted file mode 100644
index bed46d177cb..00000000000
--- a/asm/d/meter/d_meter_HIO/__dt__22dMeter_drawOptionHIO_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80200F98:
-/* 80200F98  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80200F9C  7C 08 02 A6 */	mflr r0
-/* 80200FA0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80200FA4  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80200FA8  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80200FAC  41 82 00 1C */	beq lbl_80200FC8
-/* 80200FB0  3C A0 80 3C */	lis r5, __vt__22dMeter_drawOptionHIO_c@ha /* 0x803BF184@ha */
-/* 80200FB4  38 05 F1 84 */	addi r0, r5, __vt__22dMeter_drawOptionHIO_c@l /* 0x803BF184@l */
-/* 80200FB8  90 1F 00 00 */	stw r0, 0(r31)
-/* 80200FBC  7C 80 07 35 */	extsh. r0, r4
-/* 80200FC0  40 81 00 08 */	ble lbl_80200FC8
-/* 80200FC4  48 0C DD 79 */	bl __dl__FPv
-lbl_80200FC8:
-/* 80200FC8  7F E3 FB 78 */	mr r3, r31
-/* 80200FCC  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80200FD0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80200FD4  7C 08 03 A6 */	mtlr r0
-/* 80200FD8  38 21 00 10 */	addi r1, r1, 0x10
-/* 80200FDC  4E 80 00 20 */	blr 
diff --git a/asm/d/meter/d_meter_HIO/__dt__23dMeter_drawCollectHIO_cFv.s b/asm/d/meter/d_meter_HIO/__dt__23dMeter_drawCollectHIO_cFv.s
deleted file mode 100644
index 4613e489856..00000000000
--- a/asm/d/meter/d_meter_HIO/__dt__23dMeter_drawCollectHIO_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80200FE0:
-/* 80200FE0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80200FE4  7C 08 02 A6 */	mflr r0
-/* 80200FE8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80200FEC  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80200FF0  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80200FF4  41 82 00 1C */	beq lbl_80201010
-/* 80200FF8  3C A0 80 3C */	lis r5, __vt__23dMeter_drawCollectHIO_c@ha /* 0x803BF190@ha */
-/* 80200FFC  38 05 F1 90 */	addi r0, r5, __vt__23dMeter_drawCollectHIO_c@l /* 0x803BF190@l */
-/* 80201000  90 1F 00 00 */	stw r0, 0(r31)
-/* 80201004  7C 80 07 35 */	extsh. r0, r4
-/* 80201008  40 81 00 08 */	ble lbl_80201010
-/* 8020100C  48 0C DD 31 */	bl __dl__FPv
-lbl_80201010:
-/* 80201010  7F E3 FB 78 */	mr r3, r31
-/* 80201014  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80201018  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8020101C  7C 08 03 A6 */	mtlr r0
-/* 80201020  38 21 00 10 */	addi r1, r1, 0x10
-/* 80201024  4E 80 00 20 */	blr 
diff --git a/asm/d/meter/d_meter_HIO/__dt__23dMeter_drawFishingHIO_cFv.s b/asm/d/meter/d_meter_HIO/__dt__23dMeter_drawFishingHIO_cFv.s
deleted file mode 100644
index d93aba9ed4b..00000000000
--- a/asm/d/meter/d_meter_HIO/__dt__23dMeter_drawFishingHIO_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80200F08:
-/* 80200F08  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80200F0C  7C 08 02 A6 */	mflr r0
-/* 80200F10  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80200F14  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80200F18  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80200F1C  41 82 00 1C */	beq lbl_80200F38
-/* 80200F20  3C A0 80 3C */	lis r5, __vt__23dMeter_drawFishingHIO_c@ha /* 0x803BF16C@ha */
-/* 80200F24  38 05 F1 6C */	addi r0, r5, __vt__23dMeter_drawFishingHIO_c@l /* 0x803BF16C@l */
-/* 80200F28  90 1F 00 00 */	stw r0, 0(r31)
-/* 80200F2C  7C 80 07 35 */	extsh. r0, r4
-/* 80200F30  40 81 00 08 */	ble lbl_80200F38
-/* 80200F34  48 0C DE 09 */	bl __dl__FPv
-lbl_80200F38:
-/* 80200F38  7F E3 FB 78 */	mr r3, r31
-/* 80200F3C  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80200F40  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80200F44  7C 08 03 A6 */	mtlr r0
-/* 80200F48  38 21 00 10 */	addi r1, r1, 0x10
-/* 80200F4C  4E 80 00 20 */	blr 
diff --git a/asm/d/meter/d_meter_HIO/__dt__24dMeter_drawMiniGameHIO_cFv.s b/asm/d/meter/d_meter_HIO/__dt__24dMeter_drawMiniGameHIO_cFv.s
deleted file mode 100644
index 6028e81a9fb..00000000000
--- a/asm/d/meter/d_meter_HIO/__dt__24dMeter_drawMiniGameHIO_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80200DE8:
-/* 80200DE8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80200DEC  7C 08 02 A6 */	mflr r0
-/* 80200DF0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80200DF4  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80200DF8  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80200DFC  41 82 00 1C */	beq lbl_80200E18
-/* 80200E00  3C A0 80 3C */	lis r5, __vt__24dMeter_drawMiniGameHIO_c@ha /* 0x803BF130@ha */
-/* 80200E04  38 05 F1 30 */	addi r0, r5, __vt__24dMeter_drawMiniGameHIO_c@l /* 0x803BF130@l */
-/* 80200E08  90 1F 00 00 */	stw r0, 0(r31)
-/* 80200E0C  7C 80 07 35 */	extsh. r0, r4
-/* 80200E10  40 81 00 08 */	ble lbl_80200E18
-/* 80200E14  48 0C DF 29 */	bl __dl__FPv
-lbl_80200E18:
-/* 80200E18  7F E3 FB 78 */	mr r3, r31
-/* 80200E1C  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80200E20  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80200E24  7C 08 03 A6 */	mtlr r0
-/* 80200E28  38 21 00 10 */	addi r1, r1, 0x10
-/* 80200E2C  4E 80 00 20 */	blr 
diff --git a/asm/d/meter/d_meter_HIO/__dt__25dMeter_drawEmpButtonHIO_cFv.s b/asm/d/meter/d_meter_HIO/__dt__25dMeter_drawEmpButtonHIO_cFv.s
deleted file mode 100644
index 282c8a6a2c6..00000000000
--- a/asm/d/meter/d_meter_HIO/__dt__25dMeter_drawEmpButtonHIO_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80200DA0:
-/* 80200DA0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80200DA4  7C 08 02 A6 */	mflr r0
-/* 80200DA8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80200DAC  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80200DB0  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80200DB4  41 82 00 1C */	beq lbl_80200DD0
-/* 80200DB8  3C A0 80 3C */	lis r5, __vt__25dMeter_drawEmpButtonHIO_c@ha /* 0x803BF13C@ha */
-/* 80200DBC  38 05 F1 3C */	addi r0, r5, __vt__25dMeter_drawEmpButtonHIO_c@l /* 0x803BF13C@l */
-/* 80200DC0  90 1F 00 00 */	stw r0, 0(r31)
-/* 80200DC4  7C 80 07 35 */	extsh. r0, r4
-/* 80200DC8  40 81 00 08 */	ble lbl_80200DD0
-/* 80200DCC  48 0C DF 71 */	bl __dl__FPv
-lbl_80200DD0:
-/* 80200DD0  7F E3 FB 78 */	mr r3, r31
-/* 80200DD4  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80200DD8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80200DDC  7C 08 03 A6 */	mtlr r0
-/* 80200DE0  38 21 00 10 */	addi r1, r1, 0x10
-/* 80200DE4  4E 80 00 20 */	blr 
diff --git a/asm/d/meter/d_meter_HIO/__dt__25dMeter_drawLightDropHIO_cFv.s b/asm/d/meter/d_meter_HIO/__dt__25dMeter_drawLightDropHIO_cFv.s
deleted file mode 100644
index 10929b8c59d..00000000000
--- a/asm/d/meter/d_meter_HIO/__dt__25dMeter_drawLightDropHIO_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80200D58:
-/* 80200D58  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80200D5C  7C 08 02 A6 */	mflr r0
-/* 80200D60  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80200D64  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80200D68  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80200D6C  41 82 00 1C */	beq lbl_80200D88
-/* 80200D70  3C A0 80 3C */	lis r5, __vt__25dMeter_drawLightDropHIO_c@ha /* 0x803BF124@ha */
-/* 80200D74  38 05 F1 24 */	addi r0, r5, __vt__25dMeter_drawLightDropHIO_c@l /* 0x803BF124@l */
-/* 80200D78  90 1F 00 00 */	stw r0, 0(r31)
-/* 80200D7C  7C 80 07 35 */	extsh. r0, r4
-/* 80200D80  40 81 00 08 */	ble lbl_80200D88
-/* 80200D84  48 0C DF B9 */	bl __dl__FPv
-lbl_80200D88:
-/* 80200D88  7F E3 FB 78 */	mr r3, r31
-/* 80200D8C  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80200D90  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80200D94  7C 08 03 A6 */	mtlr r0
-/* 80200D98  38 21 00 10 */	addi r1, r1, 0x10
-/* 80200D9C  4E 80 00 20 */	blr 
diff --git a/asm/d/meter/d_meter_HIO/__dt__27dMeter_drawCalibrationHIO_cFv.s b/asm/d/meter/d_meter_HIO/__dt__27dMeter_drawCalibrationHIO_cFv.s
deleted file mode 100644
index dc636a3c5eb..00000000000
--- a/asm/d/meter/d_meter_HIO/__dt__27dMeter_drawCalibrationHIO_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80200E78:
-/* 80200E78  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80200E7C  7C 08 02 A6 */	mflr r0
-/* 80200E80  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80200E84  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80200E88  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80200E8C  41 82 00 1C */	beq lbl_80200EA8
-/* 80200E90  3C A0 80 3C */	lis r5, __vt__27dMeter_drawCalibrationHIO_c@ha /* 0x803BF154@ha */
-/* 80200E94  38 05 F1 54 */	addi r0, r5, __vt__27dMeter_drawCalibrationHIO_c@l /* 0x803BF154@l */
-/* 80200E98  90 1F 00 00 */	stw r0, 0(r31)
-/* 80200E9C  7C 80 07 35 */	extsh. r0, r4
-/* 80200EA0  40 81 00 08 */	ble lbl_80200EA8
-/* 80200EA4  48 0C DE 99 */	bl __dl__FPv
-lbl_80200EA8:
-/* 80200EA8  7F E3 FB 78 */	mr r3, r31
-/* 80200EAC  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80200EB0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80200EB4  7C 08 03 A6 */	mtlr r0
-/* 80200EB8  38 21 00 10 */	addi r1, r1, 0x10
-/* 80200EBC  4E 80 00 20 */	blr 
diff --git a/include/d/menu/d_menu_fishing.h b/include/d/menu/d_menu_fishing.h
index 39358f4aa6a..e40a4c1bb83 100644
--- a/include/d/menu/d_menu_fishing.h
+++ b/include/d/menu/d_menu_fishing.h
@@ -51,14 +51,10 @@ private:
     /* 0x0F4 */ CPaneMgr* mpFishInfoParent[2];
     /* 0x0FC */ CPaneMgr* mpButtonAB[2];
     /* 0x104 */ CPaneMgr* mpButtonText[2];
-    /* 0x10C */ J2DTextBox* field_0x10c[1][6];
-    /* 0x124 */ J2DTextBox* field_0x124[6];
-    /* 0x13C */ J2DTextBox* field_0x13c[1][6];
-    /* 0x154 */ J2DTextBox* field_0x154[6];
-    /* 0x16C */ J2DTextBox* field_0x16c[1][6];
-    /* 0x184 */ J2DTextBox* field_0x184[6];
-    /* 0x19C */ J2DTextBox* field_0x19c[1][6];
-    /* 0x1B4 */ J2DTextBox* field_0x1b4[6];
+    /* 0x10C */ J2DTextBox* field_0x10c[2][6];
+    /* 0x13C */ J2DTextBox* field_0x13c[2][6];
+    /* 0x16C */ J2DTextBox* field_0x16c[2][6];
+    /* 0x19C */ J2DTextBox* field_0x19c[2][6];
     /* 0x1CC */ J2DTextBox* field_0x1cc[6];
     /* 0x1E4 */ J2DTextBox* field_0x1e4;
     /* 0x1E8 */ J2DTextBox* field_0x1e8;
diff --git a/include/d/meter/d_meter_HIO.h b/include/d/meter/d_meter_HIO.h
index 6839177446f..5c522e748a2 100644
--- a/include/d/meter/d_meter_HIO.h
+++ b/include/d/meter/d_meter_HIO.h
@@ -11,7 +11,7 @@ class JKRArchive;
 class dMeter_menuHIO_c {
 public:
     /* 801FE330 */ dMeter_menuHIO_c();
-    /* 8020123C */ virtual ~dMeter_menuHIO_c();
+    /* 8020123C */ virtual ~dMeter_menuHIO_c() {}
 
     /* 0x0 */  // vtable
     /* 0x4 */ u8 field_0x4[2];
@@ -23,7 +23,7 @@ STATIC_ASSERT(sizeof(dMeter_menuHIO_c) == 8);
 class dMeter_drawCollectHIO_c {
 public:
     dMeter_drawCollectHIO_c();
-    virtual ~dMeter_drawCollectHIO_c();
+    virtual ~dMeter_drawCollectHIO_c() {}
 
     enum {
         /* 0x0 */ VESSEL_HEART,
@@ -72,7 +72,7 @@ public:
 class dMeter_drawOptionHIO_c {
 public:
     /* 801FE4EC */ dMeter_drawOptionHIO_c();
-    /* 80200F98 */ virtual ~dMeter_drawOptionHIO_c();
+    /* 80200F98 */ virtual ~dMeter_drawOptionHIO_c() {}
 
     enum OptionType {
         /* 0x0 */ ATTENTION,
@@ -108,7 +108,7 @@ public:
 class dMeter_drawLetterHIO_c {
 public:
     /* 801FE5CC */ dMeter_drawLetterHIO_c();
-    /* 80200F50 */ virtual ~dMeter_drawLetterHIO_c();
+    /* 80200F50 */ virtual ~dMeter_drawLetterHIO_c() {}
 
     enum {
         /* 0x0 */ WINDOW_FRAME,
@@ -148,7 +148,7 @@ public:
 class dMeter_drawFishingHIO_c {
 public:
     /* 801FE730 */ dMeter_drawFishingHIO_c();
-    /* 80200F08 */ virtual ~dMeter_drawFishingHIO_c();
+    /* 80200F08 */ virtual ~dMeter_drawFishingHIO_c() {}
 
     enum {
         /* 0x0 */ HYLIAN_BASS,
@@ -198,7 +198,7 @@ public:
 class dMeter_drawInsectHIO_c {
 public:
     /* 801FE8DC */ dMeter_drawInsectHIO_c();
-    /* 80200EC0 */ virtual ~dMeter_drawInsectHIO_c();
+    /* 80200EC0 */ virtual ~dMeter_drawInsectHIO_c() {}
 
     enum Type {
         /* 0x0 */ DEFAULT,
@@ -229,7 +229,7 @@ public:
 class dMeter_drawCalibrationHIO_c {
 public:
     /* 801FE954 */ dMeter_drawCalibrationHIO_c();
-    /* 80200E78 */ virtual ~dMeter_drawCalibrationHIO_c();
+    /* 80200E78 */ virtual ~dMeter_drawCalibrationHIO_c() {}
 
     /* 0x00 */  // vtable
     /* 0x04 */ u8 field_0x4[4];
@@ -244,7 +244,7 @@ public:
 class dMeter_drawSkillHIO_c {
 public:
     /* 801FE990 */ dMeter_drawSkillHIO_c();
-    /* 80200E30 */ virtual ~dMeter_drawSkillHIO_c();
+    /* 80200E30 */ virtual ~dMeter_drawSkillHIO_c() {}
 
     enum {
         /* 0x0 */ WINDOW,
@@ -282,7 +282,7 @@ public:
 class dMeter_drawEmpButtonHIO_c {
 public:
     /* 801FEAF0 */ dMeter_drawEmpButtonHIO_c();
-    /* 80200DA0 */ virtual ~dMeter_drawEmpButtonHIO_c();
+    /* 80200DA0 */ virtual ~dMeter_drawEmpButtonHIO_c() {}
 
     /* 0x000 */  // vtable
     /* 0x004 */ u8 field_0x4[4];
@@ -434,7 +434,7 @@ public:
 class dMeter_drawMiniGameHIO_c {
 public:
     /* 801FEFF0 */ dMeter_drawMiniGameHIO_c();
-    /* 80200DE8 */ virtual ~dMeter_drawMiniGameHIO_c();
+    /* 80200DE8 */ virtual ~dMeter_drawMiniGameHIO_c() {}
 
     /* 0x000 */  // vtable
     /* 0x004 */ u8 field_0x4[4];
@@ -546,7 +546,7 @@ public:
 class dMeter_drawLightDropHIO_c {
 public:
     /* 801FF31C */ dMeter_drawLightDropHIO_c();
-    /* 80200D58 */ virtual ~dMeter_drawLightDropHIO_c();
+    /* 80200D58 */ virtual ~dMeter_drawLightDropHIO_c() {}
 
     /* 0x00 */  // vtable
     /* 0x04 */ u8 field_0x4[4];
@@ -594,7 +594,7 @@ public:
 class dMeter_drawHIO_c {
 public:
     /* 801FF5B8 */ dMeter_drawHIO_c();
-    /* 80201128 */ virtual ~dMeter_drawHIO_c();
+    /* 80201128 */ virtual ~dMeter_drawHIO_c() {}
 
     /* 0x000 */  // vtable
     /* 0x004 */ s8 field_0x4;
@@ -962,7 +962,7 @@ STATIC_ASSERT(sizeof(dMeter_drawHIO_c) == 3880);
 class dMeter_ringHIO_c {
 public:
     /* 802001AC */ dMeter_ringHIO_c();
-    /* 802010E0 */ virtual ~dMeter_ringHIO_c();
+    /* 802010E0 */ virtual ~dMeter_ringHIO_c() {}
 
     enum {
         /* 0x0 */ SET_ITEM,
@@ -1053,7 +1053,7 @@ STATIC_ASSERT(sizeof(dMeter_ringHIO_c) == 344);
 class dMeter_mapIconHIO_c {
 public:
     /* 802004B4 */ dMeter_mapIconHIO_c();
-    /* 80201028 */ virtual ~dMeter_mapIconHIO_c();
+    /* 80201028 */ virtual ~dMeter_mapIconHIO_c() {}
 
     enum {
         /* 0x00 */ ICON_PORTAL,
@@ -1217,7 +1217,7 @@ public:
     };  // Size: 0xC
 
     struct MapBlinkAnime {
-        MapBlinkAnime();
+        MapBlinkAnime() {}
 
         /* 0x00 */ BlinkAnime mSelectedRegion;
         /* 0x0C */ BlinkAnime mUnselectedRegion;
@@ -1341,7 +1341,7 @@ STATIC_ASSERT(sizeof(dMeter_fmapHIO_c) == 1188);
 class dMeter_cursorHIO_c {
 public:
     /* 80200CD4 */ dMeter_cursorHIO_c();
-    /* 80201098 */ virtual ~dMeter_cursorHIO_c();
+    /* 80201098 */ virtual ~dMeter_cursorHIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ cXyz mSeraShopObjZoom;
diff --git a/include/d/msg/d_msg_out_font.h b/include/d/msg/d_msg_out_font.h
index 5f55372c142..0abd8710bd9 100644
--- a/include/d/msg/d_msg_out_font.h
+++ b/include/d/msg/d_msg_out_font.h
@@ -20,6 +20,7 @@ public:
     f32 getPosY() { return mPosY; }
     f32 getSizeX() { return mSizeX; }
     f32 getSizeY() { return mSizeY; }
+    u8 getAlpha() { return mAlpha; }
     J2DTextBox* getTextBoxPtr() { return mpTextBoxPtr; }
     void setTextBoxPtr(J2DTextBox* p_textBox) { mpTextBoxPtr = p_textBox; }
     void resetType() { mType = 0x47; }
diff --git a/include/d/msg/d_msg_unit.h b/include/d/msg/d_msg_unit.h
index 6466ea97f79..a3a687b06db 100644
--- a/include/d/msg/d_msg_unit.h
+++ b/include/d/msg/d_msg_unit.h
@@ -1,6 +1,48 @@
 #ifndef D_MSG_D_MSG_UNIT_H
 #define D_MSG_D_MSG_UNIT_H
 
+#include "global.h"
+
+// Struct definitions might be wrong
+typedef struct bmg_section_t {
+    u32 msgType;   // sectionType
+    u32 size;    // total size of the section
+    u8 data[0];  // section data
+} bmg_section_t;
+
+typedef struct bmg_header_t {
+    /* 0x00 */ char magic[8];             // = BMG_MAGIC
+    /* 0x08 */ u32 size;                  // total size of file
+    /* 0x0c */ u32 n_sections;            // number of sections
+    /* 0x10 */ u32 encoding;              // text encoding
+    /* 0x11 */ u8 unknown[12];            // unknown data
+    /* 0x20 */ bmg_section_t section[0];  // first section header
+} bmg_header_t;
+
+typedef struct inf1_entry_t {
+    u32 dat1EntryOffset;
+    u16 startFrame;
+    u16 endFrame;
+} inf1_entry_t;
+
+typedef struct inf1_section_t {
+    /* 0x00 */ u32 msgType;   // sectionType
+    /* 0x04 */ u32 size;    // total size of the section
+    /* 0x08 */ u16 entryCount;
+    /* 0x0A */ u16 entryLength;
+    /* 0x0C */ u16 msgArchiveId;
+    /* 0x0E */ inf1_entry_t entries[0];
+} inf1_section_t;
+
+typedef struct str1_entry_t {
+    char str[0];
+} str1_entry_t;
+
+typedef struct str1_section_t {
+    /* 0x00 */ u32 msgType;   // sectionType
+    /* 0x04 */ u32 size;    // total size of the section
+    /* 0x08 */ str1_entry_t entries[0];
+} str1_section_t;
 
 class dMsgUnit_c {
 public:
diff --git a/obj_files.mk b/obj_files.mk
index 8bd871cddf5..a86958ca8f8 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -1050,3 +1050,4 @@ O_FILES_SYM_ON := \
 	$(BUILD_DIR)/src/c/c_dylink.o \
 	$(BUILD_DIR)/src/d/a/d_a_alink.o \
 	$(BUILD_DIR)/src/DynamicLink.o \
+	$(BUILD_DIR)/src/d/meter/d_meter_HIO.o \
diff --git a/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp b/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp
index c51e50774d3..7f49edf0281 100644
--- a/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp
+++ b/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp
@@ -608,6 +608,12 @@ static int daObjMasterSword_Delete(daObjMasterSword_c* i_this) {
 }
 
 /* 80C91448-80C915E8 0009C8 01A0+00 1/1 0/0 0/0 .text            __dt__18daObjMasterSword_cFv */
+// vtables issues
+#ifdef NONMATCHING
+daObjMasterSword_c::~daObjMasterSword_c() {
+    dComIfG_resDelete(&mPhase, l_arcName);
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -616,6 +622,7 @@ asm daObjMasterSword_c::~daObjMasterSword_c() {
 #include "asm/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword/__dt__18daObjMasterSword_cFv.s"
 }
 #pragma pop
+#endif
 
 /* ############################################################################################## */
 /* 80C91960-80C91968 000020 0008+00 1/1 0/0 0/0 .rodata          @4030 */
@@ -680,7 +687,7 @@ COMPILER_STRIP_GATE(0x80C9196C, &lit_4092);
 #pragma pop
 
 /* 80C91714-80C91894 000C94 0180+00 1/1 0/0 0/0 .text            draw__18daObjMasterSword_cFv */
-// weird cXyz stuff
+// Matches with literals
 #ifdef NONMATCHING
 int daObjMasterSword_c::draw() {
     if (dComIfGs_isTmpBit(dSv_event_tmp_flag_c::tempBitLabels[73])) {
@@ -700,9 +707,9 @@ int daObjMasterSword_c::draw() {
     mBrk.remove(modelData);
     dComIfGd_setList();
 
-    cXyz sp14, sp8 = cXyz(current.pos.x, current.pos.y + 50.0f, current.pos.z);
+    cXyz sp8 = cXyz(current.pos.x, current.pos.y + 50.0f, current.pos.z);
     mShadowKey =
-        dComIfGd_setShadow(mShadowKey, 1, mpModel, &sp14, 200.0f, 10.0f, current.pos.y, field_0x738,
+        dComIfGd_setShadow(mShadowKey, 1, mpModel, &sp8, 200.0f, 10.0f, current.pos.y, field_0x738,
                            field_0x728, &mTevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
 
     return 1;
diff --git a/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.cpp b/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.cpp
index cfa87c9ec32..d2ef87da0b1 100644
--- a/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.cpp
+++ b/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.cpp
@@ -205,7 +205,7 @@ int daObjSMark_c::draw() {
                     l_shadow_size[fopAcM_GetParam(this) & 0xFF],
                     mObjAcch.m_gnd,
                     shape_angle.y,
-                    ((f32)-0.6 - g_env_light.field_0x1238 * (f32)0.4),
+                    (-0.6f - g_env_light.field_0x1238 * (0.7f - 0.3f)),
                     &this->mTexObj);
     return 1;
 }
diff --git a/src/d/menu/d_menu_fishing.cpp b/src/d/menu/d_menu_fishing.cpp
index 0ee079217c1..777af5ce771 100644
--- a/src/d/menu/d_menu_fishing.cpp
+++ b/src/d/menu/d_menu_fishing.cpp
@@ -439,21 +439,21 @@ void dMenu_Fishing_c::screenSetBase() {
     textBox->setString(0x200, "");
     mpString->getString(0x5a1, textBox, NULL, NULL, NULL, 0);
     for (int i = 0; i < 6; i++) {
-        field_0x124[i] = (J2DTextBox*)mpScreen->search(size_1[i]);
-        field_0x124[i]->setFont(mDoExt_getSubFont());
-        field_0x124[i]->setString(0x20, "");
+        field_0x10c[1][i] = (J2DTextBox*)mpScreen->search(size_1[i]);
+        field_0x10c[1][i]->setFont(mDoExt_getSubFont());
+        field_0x10c[1][i]->setString(0x20, "");
 
-        field_0x184[i] = (J2DTextBox*)mpScreen->search(size_unit_1[i]);
-        field_0x184[i]->setFont(mDoExt_getSubFont());
-        field_0x184[i]->setString(0x20, "");
+        field_0x16c[1][i] = (J2DTextBox*)mpScreen->search(size_unit_1[i]);
+        field_0x16c[1][i]->setFont(mDoExt_getSubFont());
+        field_0x16c[1][i]->setString(0x20, "");
 
-        field_0x154[i] = (J2DTextBox*)mpScreen->search(count_1[i]);
-        field_0x154[i]->setFont(mDoExt_getSubFont());
-        field_0x154[i]->setString(0x20, "");
+        field_0x13c[1][i] = (J2DTextBox*)mpScreen->search(count_1[i]);
+        field_0x13c[1][i]->setFont(mDoExt_getSubFont());
+        field_0x13c[1][i]->setString(0x20, "");
 
-        field_0x1b4[i] = (J2DTextBox*)mpScreen->search(count_unit_1[i]);
-        field_0x1b4[i]->setFont(mDoExt_getSubFont());
-        field_0x1b4[i]->setString(0x20, "");
+        field_0x19c[1][i] = (J2DTextBox*)mpScreen->search(count_unit_1[i]);
+        field_0x19c[1][i]->setFont(mDoExt_getSubFont());
+        field_0x19c[1][i]->setString(0x20, "");
 
         field_0x1cc[i] = (J2DTextBox*)mpScreen->search(name_0[i]);
         mpScreen->search(fname_0[i])->hide();
@@ -540,8 +540,6 @@ u8 dMenu_Fishing_c::getFigure(int param_0) {
 }
 
 /* 801C605C-801C6210 1C099C 01B4+00 1/1 0/0 0/0 .text setFishParam__15dMenu_Fishing_cFiUsUc */
-#ifdef NONMATCHING
-// regalloc
 void dMenu_Fishing_c::setFishParam(int param_0, u16 param_1, u8 param_2) {
     u8 figure1 = getFigure(param_1);
     u8 figure2 = getFigure(param_2);
@@ -550,41 +548,33 @@ void dMenu_Fishing_c::setFishParam(int param_0, u16 param_1, u8 param_2) {
     for (int j = 1; j < 2; j++) {
         // part one, param_2
         dComIfGp_setMessageCountNumber(param_2);
-        mpString->getString(0x597, field_0x124[param_0], NULL, NULL, NULL, 0);
-        strcpy(strBuff1, field_0x124[param_0]->getStringPtr());
+        mpString->getString(0x597, field_0x10c[j][param_0], NULL, NULL, NULL, 0);
+        char* x = field_0x10c[j][param_0]->getStringPtr();
+        strcpy(strBuff1, x);
         int i;
         for (i = 0; strBuff1[i + figure2] != 0; i++) {
             strBuff2[i] = strBuff1[i + figure2];
         }
         strBuff2[i] = 0;
         strBuff1[figure2] = 0;
-        strcpy(field_0x124[param_0]->getStringPtr(), strBuff1);
-        strcpy(field_0x184[param_0]->getStringPtr(), strBuff2);
+        strcpy(field_0x10c[j][param_0]->getStringPtr(), strBuff1);
+        strcpy(field_0x16c[j][param_0]->getStringPtr(), strBuff2);
 
         // part two, param_1
         dComIfGp_setMessageCountNumber(param_1);
-        mpString->getString(0x598, field_0x154[param_0], NULL, NULL, NULL, 0);
-        strcpy(strBuff1, field_0x154[param_0]->getStringPtr());
+        mpString->getString(0x598, field_0x13c[j][param_0], NULL, NULL, NULL, 0);
+        x = field_0x13c[j][param_0]->getStringPtr();
+        strcpy(strBuff1, x);
         int k;
         for (k = 0; strBuff1[k + figure1] != 0; k++) {
             strBuff2[k] = strBuff1[k + figure1];
         }
         strBuff2[k] = 0;
         strBuff1[figure1] = 0;
-        strcpy(field_0x154[param_0]->getStringPtr(), strBuff1);
-        strcpy(field_0x1b4[param_0]->getStringPtr(), strBuff2);
+        strcpy(field_0x13c[j][param_0]->getStringPtr(), strBuff1);
+        strcpy(field_0x19c[j][param_0]->getStringPtr(), strBuff2);
     }
 }
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dMenu_Fishing_c::setFishParam(int param_0, u16 param_1, u8 param_2) {
-    nofralloc
-#include "asm/d/menu/d_menu_fishing/setFishParam__15dMenu_Fishing_cFiUsUc.s"
-}
-#pragma pop
-#endif
 
 /* 801C6210-801C659C 1C0B50 038C+00 2/2 0/0 0/0 .text            setHIO__15dMenu_Fishing_cFb */
 void dMenu_Fishing_c::setHIO(bool param_0) {
diff --git a/src/d/meter/d_meter_HIO.cpp b/src/d/meter/d_meter_HIO.cpp
index c28130a1adb..ec8564bca9a 100644
--- a/src/d/meter/d_meter_HIO.cpp
+++ b/src/d/meter/d_meter_HIO.cpp
@@ -5,189 +5,11 @@
 
 #include "d/meter/d_meter_HIO.h"
 #include "d/save/d_save.h"
-#include "dol2asm.h"
 #include "JSystem/JKernel/JKRArchive.h"
-#include "m_Do/m_Do_ext.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
+#include "m_Do/m_Do_ext.h"
 #include "global.h"
 
-//
-// Forward References:
-//
-
-extern "C" void __ct__16dMeter_menuHIO_cFv();
-extern "C" void __ct__23dMeter_drawCollectHIO_cFv();
-extern "C" void __ct__22dMeter_drawOptionHIO_cFv();
-extern "C" void __ct__22dMeter_drawLetterHIO_cFv();
-extern "C" void __ct__23dMeter_drawFishingHIO_cFv();
-extern "C" void __ct__22dMeter_drawInsectHIO_cFv();
-extern "C" void __ct__27dMeter_drawCalibrationHIO_cFv();
-extern "C" void __ct__21dMeter_drawSkillHIO_cFv();
-extern "C" void __ct__25dMeter_drawEmpButtonHIO_cFv();
-extern "C" void __ct__24dMeter_drawMiniGameHIO_cFv();
-extern "C" void __ct__25dMeter_drawLightDropHIO_cFv();
-extern "C" void __ct__16dMeter_drawHIO_cFv();
-extern "C" void __ct__16dMeter_ringHIO_cFv();
-extern "C" void __ct__19dMeter_mapIconHIO_cFv();
-extern "C" void __ct__16dMeter_fmapHIO_cFv();
-extern "C" void __dt__16dMeter_fmapHIO_cFv();
-extern "C" void __ct__18dMeter_cursorHIO_cFv();
-extern "C" void __dt__25dMeter_drawLightDropHIO_cFv();
-extern "C" void __dt__25dMeter_drawEmpButtonHIO_cFv();
-extern "C" void __dt__24dMeter_drawMiniGameHIO_cFv();
-extern "C" void __dt__21dMeter_drawSkillHIO_cFv();
-extern "C" void __dt__27dMeter_drawCalibrationHIO_cFv();
-extern "C" void __dt__22dMeter_drawInsectHIO_cFv();
-extern "C" void __dt__23dMeter_drawFishingHIO_cFv();
-extern "C" void __dt__22dMeter_drawLetterHIO_cFv();
-extern "C" void __dt__22dMeter_drawOptionHIO_cFv();
-extern "C" void __dt__23dMeter_drawCollectHIO_cFv();
-extern "C" void __dt__19dMeter_mapIconHIO_cFv();
-extern "C" void __ct__Q216dMeter_fmapHIO_c13MapBlinkAnimeFv();
-extern "C" void __dt__18dMeter_cursorHIO_cFv();
-extern "C" void __dt__16dMeter_ringHIO_cFv();
-extern "C" void __dt__16dMeter_drawHIO_cFv();
-extern "C" void __dt__16dMeter_menuHIO_cFv();
-extern "C" void __sinit_d_meter_HIO_cpp();
-
-//
-// External References:
-//
-
-extern "C" void __dt__4cXyzFv();
-extern "C" void mDoExt_getGameHeap__Fv();
-extern "C" void __ct__4cXyzFv();
-extern "C" void __ct__Q28JUtility6TColorFv();
-extern "C" void free__7JKRHeapFPv();
-extern "C" void __dl__FPv();
-extern "C" void __register_global_object();
-extern "C" void __destroy_arr();
-extern "C" void __construct_array();
-extern "C" void _savegpr_18();
-extern "C" void _savegpr_29();
-extern "C" void _restgpr_18();
-extern "C" void _restgpr_29();
-
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-/* 803BF0E8-803BF0F4 01C208 000C+00 2/2 0/0 0/0 .data            __vt__18dMeter_cursorHIO_c */
-SECTION_DATA extern void* __vt__18dMeter_cursorHIO_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__18dMeter_cursorHIO_cFv,
-};
-
-/* 803BF0F4-803BF100 01C214 000C+00 2/2 0/0 0/0 .data            __vt__16dMeter_fmapHIO_c */
-SECTION_DATA extern void* __vt__16dMeter_fmapHIO_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__16dMeter_fmapHIO_cFv,
-};
-
-/* 803BF100-803BF10C 01C220 000C+00 3/3 0/0 0/0 .data            __vt__19dMeter_mapIconHIO_c */
-SECTION_DATA extern void* __vt__19dMeter_mapIconHIO_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__19dMeter_mapIconHIO_cFv,
-};
-
-/* 803BF10C-803BF118 01C22C 000C+00 2/2 0/0 0/0 .data            __vt__16dMeter_ringHIO_c */
-SECTION_DATA extern void* __vt__16dMeter_ringHIO_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__16dMeter_ringHIO_cFv,
-};
-
-/* 803BF118-803BF124 01C238 000C+00 2/2 0/0 0/0 .data            __vt__16dMeter_drawHIO_c */
-SECTION_DATA extern void* __vt__16dMeter_drawHIO_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__16dMeter_drawHIO_cFv,
-};
-
-/* 803BF124-803BF130 01C244 000C+00 3/3 0/0 0/0 .data            __vt__25dMeter_drawLightDropHIO_c
- */
-SECTION_DATA extern void* __vt__25dMeter_drawLightDropHIO_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__25dMeter_drawLightDropHIO_cFv,
-};
-
-/* 803BF130-803BF13C 01C250 000C+00 3/3 0/0 0/0 .data            __vt__24dMeter_drawMiniGameHIO_c */
-SECTION_DATA extern void* __vt__24dMeter_drawMiniGameHIO_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__24dMeter_drawMiniGameHIO_cFv,
-};
-
-/* 803BF13C-803BF148 01C25C 000C+00 3/3 0/0 0/0 .data            __vt__25dMeter_drawEmpButtonHIO_c
- */
-SECTION_DATA extern void* __vt__25dMeter_drawEmpButtonHIO_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__25dMeter_drawEmpButtonHIO_cFv,
-};
-
-/* 803BF148-803BF154 01C268 000C+00 3/3 0/0 0/0 .data            __vt__21dMeter_drawSkillHIO_c */
-SECTION_DATA extern void* __vt__21dMeter_drawSkillHIO_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__21dMeter_drawSkillHIO_cFv,
-};
-
-/* 803BF154-803BF160 01C274 000C+00 3/3 0/0 0/0 .data            __vt__27dMeter_drawCalibrationHIO_c
- */
-SECTION_DATA extern void* __vt__27dMeter_drawCalibrationHIO_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__27dMeter_drawCalibrationHIO_cFv,
-};
-
-/* 803BF160-803BF16C 01C280 000C+00 3/3 0/0 0/0 .data            __vt__22dMeter_drawInsectHIO_c */
-SECTION_DATA extern void* __vt__22dMeter_drawInsectHIO_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__22dMeter_drawInsectHIO_cFv,
-};
-
-/* 803BF16C-803BF178 01C28C 000C+00 3/3 0/0 0/0 .data            __vt__23dMeter_drawFishingHIO_c */
-SECTION_DATA extern void* __vt__23dMeter_drawFishingHIO_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__23dMeter_drawFishingHIO_cFv,
-};
-
-/* 803BF178-803BF184 01C298 000C+00 3/3 0/0 0/0 .data            __vt__22dMeter_drawLetterHIO_c */
-SECTION_DATA extern void* __vt__22dMeter_drawLetterHIO_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__22dMeter_drawLetterHIO_cFv,
-};
-
-/* 803BF184-803BF190 01C2A4 000C+00 3/3 0/0 0/0 .data            __vt__22dMeter_drawOptionHIO_c */
-SECTION_DATA extern void* __vt__22dMeter_drawOptionHIO_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__22dMeter_drawOptionHIO_cFv,
-};
-
-/* 803BF190-803BF19C 01C2B0 000C+00 3/3 0/0 0/0 .data            __vt__23dMeter_drawCollectHIO_c */
-SECTION_DATA extern void* __vt__23dMeter_drawCollectHIO_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__23dMeter_drawCollectHIO_cFv,
-};
-
-/* 803BF19C-803BF1A8 01C2BC 000C+00 2/2 0/0 0/0 .data            __vt__16dMeter_menuHIO_c */
-SECTION_DATA extern void* __vt__16dMeter_menuHIO_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__16dMeter_menuHIO_cFv,
-};
-
 /* 801FE330-801FE348 1F8C70 0018+00 1/1 0/0 0/0 .text            __ct__16dMeter_menuHIO_cFv */
 dMeter_menuHIO_c::dMeter_menuHIO_c() {
     mGameover = 70;
@@ -1688,8 +1510,6 @@ dMeter_fmapHIO_c::dMeter_fmapHIO_c() {
 }
 
 /* 80200BCC-80200CD4 1FB50C 0108+00 2/1 0/0 0/0 .text            __dt__16dMeter_fmapHIO_cFv */
-// Matches with dMeter_mapIconHIO_c dtor defined instead of declared in the header
-#ifdef NONMATCHING
 dMeter_fmapHIO_c::~dMeter_fmapHIO_c() {
     if (field_0xc != NULL) {
         mDoExt_getGameHeap()->free(field_0xc);
@@ -1707,17 +1527,6 @@ dMeter_fmapHIO_c::~dMeter_fmapHIO_c() {
         field_0x8 = NULL;
     }
 }
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-// asm dMeter_fmapHIO_c::~dMeter_fmapHIO_c() {
-extern "C" asm void __dt__16dMeter_fmapHIO_cFv() {
-    nofralloc
-#include "asm/d/meter/d_meter_HIO/__dt__16dMeter_fmapHIO_cFv.s"
-}
-#pragma pop
-#endif
 
 /* 80200CD4-80200D58 1FB614 0084+00 1/1 0/0 0/0 .text            __ct__18dMeter_cursorHIO_cFv */
 dMeter_cursorHIO_c::dMeter_cursorHIO_c() {
@@ -1733,172 +1542,6 @@ dMeter_cursorHIO_c::dMeter_cursorHIO_c() {
     mMagicArmorObjZoomAngleX = -500;
 }
 
-/* 80200D58-80200DA0 1FB698 0048+00 1/0 0/0 0/0 .text            __dt__25dMeter_drawLightDropHIO_cFv
- */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-// asm dMeter_drawLightDropHIO_c::~dMeter_drawLightDropHIO_c() {
-extern "C" asm void __dt__25dMeter_drawLightDropHIO_cFv() {
-    nofralloc
-#include "asm/d/meter/d_meter_HIO/__dt__25dMeter_drawLightDropHIO_cFv.s"
-}
-#pragma pop
-
-/* 80200DA0-80200DE8 1FB6E0 0048+00 1/0 0/0 0/0 .text            __dt__25dMeter_drawEmpButtonHIO_cFv
- */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-// asm dMeter_drawEmpButtonHIO_c::~dMeter_drawEmpButtonHIO_c() {
-extern "C" asm void __dt__25dMeter_drawEmpButtonHIO_cFv() {
-    nofralloc
-#include "asm/d/meter/d_meter_HIO/__dt__25dMeter_drawEmpButtonHIO_cFv.s"
-}
-#pragma pop
-
-/* 80200DE8-80200E30 1FB728 0048+00 1/0 0/0 0/0 .text            __dt__24dMeter_drawMiniGameHIO_cFv
- */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-// asm dMeter_drawMiniGameHIO_c::~dMeter_drawMiniGameHIO_c() {
-extern "C" asm void __dt__24dMeter_drawMiniGameHIO_cFv() {
-    nofralloc
-#include "asm/d/meter/d_meter_HIO/__dt__24dMeter_drawMiniGameHIO_cFv.s"
-}
-#pragma pop
-
-/* 80200E30-80200E78 1FB770 0048+00 1/0 0/0 0/0 .text            __dt__21dMeter_drawSkillHIO_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-// asm dMeter_drawSkillHIO_c::~dMeter_drawSkillHIO_c() {
-extern "C" asm void __dt__21dMeter_drawSkillHIO_cFv() {
-    nofralloc
-#include "asm/d/meter/d_meter_HIO/__dt__21dMeter_drawSkillHIO_cFv.s"
-}
-#pragma pop
-
-/* 80200E78-80200EC0 1FB7B8 0048+00 1/0 0/0 0/0 .text __dt__27dMeter_drawCalibrationHIO_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-// asm dMeter_drawCalibrationHIO_c::~dMeter_drawCalibrationHIO_c() {
-extern "C" asm void __dt__27dMeter_drawCalibrationHIO_cFv() {
-    nofralloc
-#include "asm/d/meter/d_meter_HIO/__dt__27dMeter_drawCalibrationHIO_cFv.s"
-}
-#pragma pop
-
-/* 80200EC0-80200F08 1FB800 0048+00 1/0 0/0 0/0 .text            __dt__22dMeter_drawInsectHIO_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-// asm dMeter_drawInsectHIO_c::~dMeter_drawInsectHIO_c() {
-extern "C" asm void __dt__22dMeter_drawInsectHIO_cFv() {
-    nofralloc
-#include "asm/d/meter/d_meter_HIO/__dt__22dMeter_drawInsectHIO_cFv.s"
-}
-#pragma pop
-
-/* 80200F08-80200F50 1FB848 0048+00 1/0 0/0 0/0 .text            __dt__23dMeter_drawFishingHIO_cFv
- */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-// asm dMeter_drawFishingHIO_c::~dMeter_drawFishingHIO_c() {
-extern "C" asm void __dt__23dMeter_drawFishingHIO_cFv() {
-    nofralloc
-#include "asm/d/meter/d_meter_HIO/__dt__23dMeter_drawFishingHIO_cFv.s"
-}
-#pragma pop
-
-/* 80200F50-80200F98 1FB890 0048+00 1/0 0/0 0/0 .text            __dt__22dMeter_drawLetterHIO_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-// asm dMeter_drawLetterHIO_c::~dMeter_drawLetterHIO_c() {
-extern "C" asm void __dt__22dMeter_drawLetterHIO_cFv() {
-    nofralloc
-#include "asm/d/meter/d_meter_HIO/__dt__22dMeter_drawLetterHIO_cFv.s"
-}
-#pragma pop
-
-/* 80200F98-80200FE0 1FB8D8 0048+00 1/0 0/0 0/0 .text            __dt__22dMeter_drawOptionHIO_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-// asm dMeter_drawOptionHIO_c::~dMeter_drawOptionHIO_c() {
-extern "C" asm void __dt__22dMeter_drawOptionHIO_cFv() {
-    nofralloc
-#include "asm/d/meter/d_meter_HIO/__dt__22dMeter_drawOptionHIO_cFv.s"
-}
-#pragma pop
-
-/* 80200FE0-80201028 1FB920 0048+00 1/0 0/0 0/0 .text            __dt__23dMeter_drawCollectHIO_cFv
- */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-// asm dMeter_drawCollectHIO_c::~dMeter_drawCollectHIO_c() {
-extern "C" asm void __dt__23dMeter_drawCollectHIO_cFv() {
-    nofralloc
-#include "asm/d/meter/d_meter_HIO/__dt__23dMeter_drawCollectHIO_cFv.s"
-}
-#pragma pop
-
-/* 80201028-80201070 1FB968 0048+00 1/0 0/0 0/0 .text            __dt__19dMeter_mapIconHIO_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-// asm dMeter_mapIconHIO_c::~dMeter_mapIconHIO_c() {
-extern "C" asm void __dt__19dMeter_mapIconHIO_cFv() {
-    nofralloc
-#include "asm/d/meter/d_meter_HIO/__dt__19dMeter_mapIconHIO_cFv.s"
-}
-#pragma pop
-
-/* 80201070-80201098 1FB9B0 0028+00 1/1 0/0 0/0 .text __ct__Q216dMeter_fmapHIO_c13MapBlinkAnimeFv
- */
-dMeter_fmapHIO_c::MapBlinkAnime::MapBlinkAnime() {}
-
-/* 80201098-802010E0 1FB9D8 0048+00 2/1 0/0 0/0 .text            __dt__18dMeter_cursorHIO_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-// asm dMeter_cursorHIO_c::~dMeter_cursorHIO_c() {
-extern "C" asm void __dt__18dMeter_cursorHIO_cFv() {
-    nofralloc
-#include "asm/d/meter/d_meter_HIO/__dt__18dMeter_cursorHIO_cFv.s"
-}
-#pragma pop
-
-/* 802010E0-80201128 1FBA20 0048+00 2/1 0/0 0/0 .text            __dt__16dMeter_ringHIO_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-// asm dMeter_ringHIO_c::~dMeter_ringHIO_c() {
-extern "C" asm void __dt__16dMeter_ringHIO_cFv() {
-    nofralloc
-#include "asm/d/meter/d_meter_HIO/__dt__16dMeter_ringHIO_cFv.s"
-}
-#pragma pop
-
-/* 80201128-8020123C 1FBA68 0114+00 2/1 0/0 0/0 .text            __dt__16dMeter_drawHIO_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-// asm dMeter_drawHIO_c::~dMeter_drawHIO_c() {
-extern "C" asm void __dt__16dMeter_drawHIO_cFv() {
-    nofralloc
-#include "asm/d/meter/d_meter_HIO/__dt__16dMeter_drawHIO_cFv.s"
-}
-#pragma pop
-
-/* 8020123C-80201284 1FBB7C 0048+00 2/1 0/0 0/0 .text            __dt__16dMeter_menuHIO_cFv */
-dMeter_menuHIO_c::~dMeter_menuHIO_c() {}
-
 /* 804510B0-804510B8 0005B0 0008+00 1/1 1/1 0/0 .sbss            g_menuHIO */
 dMeter_menuHIO_c g_menuHIO;
 
diff --git a/src/d/msg/d_msg_out_font.cpp b/src/d/msg/d_msg_out_font.cpp
index d9f1d68e9c7..bc5e150e0ba 100644
--- a/src/d/msg/d_msg_out_font.cpp
+++ b/src/d/msg/d_msg_out_font.cpp
@@ -9,6 +9,8 @@
 #include "dol2asm.h"
 #include "d/com/d_com_inf_game.h"
 #include "f_op/f_op_msg_mng.h"
+#include "JSystem/J2DGraph/J2DTextBox.h"
+#include "JSystem/JUtility/JUTTexture.h"
 
 //
 // Forward References:
@@ -359,6 +361,170 @@ void COutFont_c::setPane(J2DPicture* p_pic) {
 SECTION_SDATA2 static f64 lit_4397 = 4503599627370496.0 /* cast u32 to float */;
 
 /* 80225EA8-80226CF8 2207E8 0E50+00 2/0 0/0 0/0 .text            createPane__10COutFont_cFv */
+#ifdef NONMATCHING
+void COutFont_c::createPane() {
+    ResTIMG* local_30;
+    for (int iVar5 = 0; iVar5 < 70; iVar5++) {
+        if (iVar5 == 41) {
+            local_30 = (ResTIMG*)dComIfGp_getItemIconArchive()->getResource('TIMG', getBtiName(iVar5));
+        } else {
+            local_30 = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', getBtiName(iVar5));
+        }
+        mpPane[iVar5] = new J2DPicture(local_30);
+        switch (iVar5) {
+        case 0:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(255, 255, 255, 0), JUtility::TColor(98, 163, 46, 255));
+            break;
+        case 1:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(255, 255, 255, 0), JUtility::TColor(200, 39, 39, 255));
+            break;
+        case 2:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 200, 50, 255));
+            break;
+        case 3:
+        case 4:
+        case 5:
+        case 6:
+        case 8:
+            if (field_0x242 == 0x1) {
+                mpPane[iVar5]->setBlackWhite(JUtility::TColor(255, 255, 255, 0), JUtility::TColor(120, 120, 120, 255));
+            } else {
+                mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(200, 200, 200, 255));
+            }
+            break;
+        case 7:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(255, 255, 255, 0), JUtility::TColor(80, 70, 165, 255));
+            break;
+        case 9:
+        case 0xe:
+        case 0xf:
+        case 0x10:
+        case 0x11:
+        case 0x12:
+        case 0x13:
+            local_30 = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "font_07_02.bti");
+            mpPane[iVar5]->append(local_30, 1.0f);
+            mpPane[iVar5]->setBlendRatio(1.0f, 0.0f);
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(200, 200, 200, 255));
+            break;
+        case 0x14:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(220, 50, 50, 255));
+            break;
+        case 0x15:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 200, 50, 255));
+            break;
+        case 0x16:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 100, 0, 255));
+            break;
+        case 0x17:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 255, 180, 255));
+            break;
+        case 0x18:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 255, 255, 255));
+            break;
+        case 0x19:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(170, 255, 255, 255));
+            break;
+        case 0x1a:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 255, 0), JUtility::TColor(30, 50, 120, 255));
+            break;
+        case 0x1b:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 50, 50, 255));
+            break;
+        case 0x1c:
+        case 0x2b:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 255, 255, 255));
+            break;
+        case 0x1d:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 255));
+            break;
+        case 0x1f:
+        case 0x20:
+        case 0x21:
+        case 0x22:
+        case 0x23:
+        case 0x24:
+        case 0x25:
+        case 0x26:
+        case 0x27:
+        case 0x28:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 80, 80, 255));
+            break;
+        case 0x1e:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 255, 255, 255));
+            field_0x1ac = (f32)local_30->width / (f32)local_30->height;
+            field_0x1b0 = 1.0f;
+            break;
+        case 0x29:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 255, 255, 255));
+            break;
+        case 0x2a:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 255, 255, 255));
+            break;
+        case 0x2c:
+        case 0x2d:
+        case 0x2e:
+        case 0x2f:
+        case 0x37:
+        case 0x38:
+        case 0x39:
+        case 0x3a:
+        case 0x3d:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 255, 255, 255));
+            break;
+        case 0x30:
+            local_30 = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "font_20.bti");
+            mpPane[iVar5]->append(local_30, 1.0f);
+            mpPane[iVar5]->setBlendRatio(1.0f, 0.0f);
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 255, 255, 255));
+            break;
+        case 0x31:
+        case 0x32:
+        case 0x41:
+        case 0x42:
+        case 0x43:
+        case 0x44:
+            local_30 = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "font_21.bti");
+            mpPane[iVar5]->append(local_30, 1.0f);
+            mpPane[iVar5]->setBlendRatio(1.0f, 0.0f);
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 255, 255, 255));
+            break;
+        case 0x33:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(190, 190, 190, 255));
+            break;
+        case 0x34:
+        case 0x35:
+        case 0x36:
+        case 0x3f:
+        case 0x40:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 255, 255, 255));
+            break;
+        case 0x3b:
+            local_30 = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "font_30.bti");
+            mpPane[iVar5]->append(local_30, 1.0f);
+            mpPane[iVar5]->setBlendRatio(1.0f, 0.0f);
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 255, 255, 255));
+            break;
+        case 0x3c:
+            local_30 = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "font_31.bti");
+            mpPane[iVar5]->append(local_30, 1.0f);
+            mpPane[iVar5]->setBlendRatio(1.0f, 0.0f);
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 255, 255, 255));
+            break;
+        case 0x3e:
+            local_30 = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "font_34.bti");
+            mpPane[iVar5]->append(local_30, 1.0f);
+            mpPane[iVar5]->setBlendRatio(1.0f, 0.0f);
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 255, 255, 255));
+            break;
+        case 0x45:
+            mpPane[iVar5]->setBlackWhite(JUtility::TColor(166, 12, 0, 0), JUtility::TColor(255, 255, 255, 255));
+            break;
+        }
+    }
+    field_0x240 = true;
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -367,6 +533,7 @@ asm void COutFont_c::createPane() {
 #include "asm/d/msg/d_msg_out_font/createPane__10COutFont_cFv.s"
 }
 #pragma pop
+#endif
 
 /* 80226CF8-80226D4C 221638 0054+00 0/0 2/2 0/0 .text            initialize__10COutFont_cFv */
 void COutFont_c::initialize() {
@@ -435,6 +602,7 @@ SECTION_SDATA2 static f64 lit_5001 = 4503601774854144.0 /* cast s32 to float */;
 
 /* 80226DB0-80228448 2216F0 1698+00 2/0 0/0 0/0 .text            draw__10COutFont_cFP10J2DTextBoxfff
  */
+// Matches with literals
 #ifdef NONMATCHING
 void COutFont_c::draw(J2DTextBox* p_textBox, f32 param_1, f32 param_2, f32 param_3) {
     s16 sp256[70];
@@ -464,7 +632,7 @@ void COutFont_c::draw(J2DTextBox* p_textBox, f32 param_1, f32 param_2, f32 param
             f32 sizeY = local_110 * mpOfs[i]->getSizeY();
 
             if (mpPane[type] != NULL) {
-                mpPane[type]->setAlpha(mAlphaRatio * mpPane[i]->getAlpha());
+                mpPane[type]->setAlpha(mAlphaRatio * mpOfs[i]->getAlpha());
                 
                 switch (type) {
                 case 10:
@@ -630,7 +798,7 @@ void COutFont_c::draw(J2DTextBox* p_textBox, f32 param_1, f32 param_2, f32 param
                         field_0x1b4[type] = 0;
                     }
 
-                    mpPane[type]->rotate(0.5f * posX, 0.5f * posY, ROTATE_Z, (360.0f * (f32)field_0x1b4[type]) / 28.0f);
+                    mpPane[type]->rotate(0.5f * sizeX, 0.5f * sizeY, ROTATE_Z, (360.0f * (f32)field_0x1b4[type]) / 28.0f);
                     mpPane[type]->draw(posX, posY, sizeX, sizeY, false, false, false);
                     break;
                 case 25:  // some issues in here, 2020
@@ -644,15 +812,17 @@ void COutFont_c::draw(J2DTextBox* p_textBox, f32 param_1, f32 param_2, f32 param
 
                     f32 alpha;
                     if (field_0x1b4[type] < 9) {
-                        alpha = field_0x1b4[type];
+                        alpha = 50.0f + 205.0f * (field_0x1b4[type] / 9.0f);
                     } else {
-                        alpha = 18.0f - field_0x1b4[type];
+                        alpha = 50.0f + 205.0f * ((18.0f - field_0x1b4[type]) / 9.0f);
                     }
 
-                    mpPane[26]->setAlpha(((alpha / 9.0f) * 205.0f + 50.0f) * mAlphaRatio);
-                    f32 tmpX = 0.5f * (g_MsgObject_HIO_c.mPortalIconScale - 1.0f) * sizeX;
-                    f32 tmpY = 0.5f * (g_MsgObject_HIO_c.mPortalIconScale - 1.0f) * sizeY;
-                    mpPane[26]->draw(posX - tmpX, posY - tmpY, g_MsgObject_HIO_c.mPortalIconScale * sizeX, g_MsgObject_HIO_c.mPortalIconScale * sizeY, false, false, false);
+                    mpPane[26]->setAlpha(alpha * mAlphaRatio);
+                    mpPane[26]->draw(
+                        posX - 0.5f * ((g_MsgObject_HIO_c.mPortalIconScale - 1.0f) * sizeX),
+                        posY - 0.5f * ((g_MsgObject_HIO_c.mPortalIconScale - 1.0f) * sizeY),
+                        sizeX * g_MsgObject_HIO_c.mPortalIconScale,
+                        sizeY * g_MsgObject_HIO_c.mPortalIconScale, false, false, false);
                     mpPane[type]->draw(posX, posY, sizeX, sizeY, false, false, false);
                     break;
                 case 26:
@@ -660,7 +830,7 @@ void COutFont_c::draw(J2DTextBox* p_textBox, f32 param_1, f32 param_2, f32 param
                     break;
                 case 30:
                     mpPane[type]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 255, 255, 255));
-                    mpPane[type]->draw(posX + (0.5f * (sizeX * (field_0x1ac - 1.0f))), posY + (0.5f * (sizeY * (field_0x1b0 - 1.0f))), sizeX * field_0x1ac, sizeY * field_0x1b0, false, false, false);
+                    mpPane[type]->draw(posX + (0.5f * (sizeX * (1.0f - field_0x1ac))), posY + (0.5f * (sizeY * (1.0f - field_0x1b0))), sizeX * field_0x1ac, sizeY * field_0x1b0, false, false, false);
                     break;
                 case 31:
                 case 32:
@@ -682,8 +852,8 @@ void COutFont_c::draw(J2DTextBox* p_textBox, f32 param_1, f32 param_2, f32 param
                     mpPane[type]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 255));
                     mpPane[type]->draw(2.0f + posX, 2.0f + ((posY + -3.0f) - 4.0f), sizeX, sizeY * 1.25f, false, false, false);
 
-                    mpPane[type]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), mpOfs[i]->getColor());
-                    mpPane[type]->draw(posX, posY, sizeX, sizeY, false, false, false);
+                    mpPane[type]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 255, 255, 255));
+                    mpPane[type]->draw(posX, (posY + -3.0f) - 4.0f, sizeX, sizeY * 1.25f, false, false, false);
                     break;
                 case 45:
                     mpPane[type]->draw(posX, (posY + -3.0f) - 4.0f, sizeX, sizeY * 1.25f, false, false, false);
diff --git a/src/d/msg/d_msg_unit.cpp b/src/d/msg/d_msg_unit.cpp
index b79380fb020..14b45033b5d 100644
--- a/src/d/msg/d_msg_unit.cpp
+++ b/src/d/msg/d_msg_unit.cpp
@@ -72,6 +72,85 @@ SECTION_SDATA2 static f32 lit_3704[1 + 1 /* padding */] = {
 SECTION_SDATA2 static f64 lit_3707 = 4503601774854144.0 /* cast s32 to float */;
 
 /* 80238CEC-8023907C 23362C 0390+00 0/0 5/5 0/0 .text            setTag__10dMsgUnit_cFiiPcb */
+// regalloc + mulli issue
+#ifdef NONMATCHING
+void dMsgUnit_c::setTag(int param_1, int param_2, char* param_3, bool param_4) {
+    *param_3 = 0;
+    if (param_1 == 0x10000) {
+        sprintf(param_3, "%d", param_2);
+    } else if (param_1 == 0x10001) {
+        sprintf(param_3, "%d-%d", param_2 / 10, param_2 % 10);
+    } else if (param_1 == 4 && param_4 == true) {
+        int r6 = param_2 / 1000;
+        int r5 = r6 / 60;
+        r6 %= 60;
+        if (r5 > 99) {
+            r5 = 99;
+            r6 = 59;
+        }
+        if (r5 != 0 || r6 != 0) {
+            sprintf(param_3, "%d:%02d", r5, r6);
+        }
+    } else if (param_1 == 3 && param_4 == true) {
+        f32 dayTime = g_env_light.getDaytime();
+        f32 iVar8 = 1000000.0f * dayTime;
+        iVar8 = ((s32)iVar8 % 15000000) / 1000000.0f;
+        iVar8 = 60.0f * (iVar8 / 15.0f);
+        sprintf(param_3, "%d:%02d", (s32)(dayTime / 15.0f), (s32)iVar8);
+    } else {
+        if (param_1 == 9 && param_4 == true) {
+            sprintf(param_3, "%d", param_2);
+        }
+        bmg_header_t* iVar9 = (bmg_header_t*)dMeter2Info_getMsgUnitResource();
+        inf1_section_t* inf1 = NULL;
+        str1_section_t* str1 = NULL;
+        int local_114 = sizeof(bmg_header_t);
+        u32 size = iVar9->size;
+        bmg_section_t* piVar12 = iVar9->section;
+        for (; local_114 < size; local_114 += piVar12->size) {
+            switch(piVar12->msgType) {
+                case 'FLW1':
+                    break;
+                case 'FLI1':
+                    break;
+                case 'DAT1':
+                    break;
+                case 'INF1':
+                    inf1 = (inf1_section_t*)piVar12;
+                    break;
+                case 'STR1':
+                    str1 = (str1_section_t*)piVar12;
+                    break;
+            }
+            piVar12 = (bmg_section_t*)((u8*)piVar12 + piVar12->size);
+        }
+        
+        u32 uVar1 = inf1->entries[param_1].startFrame;
+        u32 uVar2 = inf1->entries[param_1].endFrame;
+        const char* uVar5;
+        if (param_2 == 1) {
+            uVar5 = str1->entries->str + uVar1;
+        } else {
+            uVar5 = str1->entries->str + uVar2;
+        }
+        if (strcmp(uVar5, "") == 0) {
+            sprintf(param_3, "%d%s", param_2, uVar5);
+        } else {
+            sprintf(param_3, "%d %s", param_2, uVar5);
+        }
+        if (param_1 == 3 && param_4 == true) {
+            char acStack_d8[20];
+            setTag(4, 0, acStack_d8, false);
+            strcat(param_3, acStack_d8);
+        }
+        if (param_1 == 4 && param_4 == true) {
+            char acStack_ec[20];
+            setTag(5, param_2, acStack_ec, false);
+            strcat(param_3, acStack_ec);
+        }
+    }
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -80,6 +159,7 @@ asm void dMsgUnit_c::setTag(int param_0, int param_1, char* param_2, bool param_
 #include "asm/d/msg/d_msg_unit/setTag__10dMsgUnit_cFiiPcb.s"
 }
 #pragma pop
+#endif
 
 /* 804510D0-804510D8 0005D0 0004+04 1/1 5/5 0/0 .sbss            g_msg_unit */
 dMsgUnit_c g_msg_unit;