format

121 files changed, 1936 insertions, 4957 deletions

diff --git a/asm/JSystem/JUtility/JUTGamePad/__ct__10JUTGamePadFQ210JUTGamePad8EPadPort.s b/asm/JSystem/JUtility/JUTGamePad/__ct__10JUTGamePadFQ210JUTGamePad8EPadPort.s
deleted file mode 100644
index 84acf2f0a1..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/__ct__10JUTGamePadFQ210JUTGamePad8EPadPort.s
+++ /dev/null
@@ -1,55 +0,0 @@
-lbl_802E06DC:
-/* 802E06DC  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802E06E0  7C 08 02 A6 */	mflr r0
-/* 802E06E4  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802E06E8  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802E06EC  93 C1 00 08 */	stw r30, 8(r1)
-/* 802E06F0  7C 7E 1B 78 */	mr r30, r3
-/* 802E06F4  7C 9F 23 78 */	mr r31, r4
-/* 802E06F8  4B FF 0D 85 */	bl __ct__11JKRDisposerFv
-/* 802E06FC  3C 60 80 3D */	lis r3, __vt__10JUTGamePad@ha /* 0x803CC610@ha */
-/* 802E0700  38 03 C6 10 */	addi r0, r3, __vt__10JUTGamePad@l /* 0x803CC610@l */
-/* 802E0704  90 1E 00 00 */	stw r0, 0(r30)
-/* 802E0708  38 7E 00 18 */	addi r3, r30, 0x18
-/* 802E070C  48 00 09 45 */	bl clear__Q210JUTGamePad7CButtonFv
-/* 802E0710  38 7E 00 48 */	addi r3, r30, 0x48
-/* 802E0714  48 00 0B 09 */	bl clear__Q210JUTGamePad6CStickFv
-/* 802E0718  38 7E 00 58 */	addi r3, r30, 0x58
-/* 802E071C  48 00 0B 01 */	bl clear__Q210JUTGamePad6CStickFv
-/* 802E0720  38 7E 00 68 */	addi r3, r30, 0x68
-/* 802E0724  7F C4 F3 78 */	mr r4, r30
-/* 802E0728  48 00 0E B1 */	bl clear__Q210JUTGamePad7CRumbleFP10JUTGamePad
-/* 802E072C  38 7E 00 80 */	addi r3, r30, 0x80
-/* 802E0730  7F C4 F3 78 */	mr r4, r30
-/* 802E0734  4B FF B6 C9 */	bl __ct__10JSUPtrLinkFPv
-/* 802E0738  38 00 00 00 */	li r0, 0
-/* 802E073C  98 1E 00 98 */	stb r0, 0x98(r30)
-/* 802E0740  B3 FE 00 7C */	sth r31, 0x7c(r30)
-/* 802E0744  7F C3 F3 78 */	mr r3, r30
-/* 802E0748  A8 1E 00 7C */	lha r0, 0x7c(r30)
-/* 802E074C  2C 00 00 00 */	cmpwi r0, 0
-/* 802E0750  41 80 00 14 */	blt lbl_802E0764
-/* 802E0754  38 AD 8F 54 */	la r5, mPadAssign__10JUTGamePad(r13) /* 804514D4-_SDA_BASE_ */
-/* 802E0758  7C 85 F8 AE */	lbzx r4, r5, r31
-/* 802E075C  38 04 00 01 */	addi r0, r4, 1
-/* 802E0760  7C 05 F9 AE */	stbx r0, r5, r31
-lbl_802E0764:
-/* 802E0764  48 00 00 F9 */	bl initList__10JUTGamePadFv
-/* 802E0768  3C 60 80 43 */	lis r3, mPadList__10JUTGamePad@ha /* 0x804343E4@ha */
-/* 802E076C  38 63 43 E4 */	addi r3, r3, mPadList__10JUTGamePad@l /* 0x804343E4@l */
-/* 802E0770  38 9E 00 80 */	addi r4, r30, 0x80
-/* 802E0774  4B FF B7 D9 */	bl append__10JSUPtrListFP10JSUPtrLink
-/* 802E0778  7F C3 F3 78 */	mr r3, r30
-/* 802E077C  48 00 05 5D */	bl update__10JUTGamePadFv
-/* 802E0780  38 00 00 00 */	li r0, 0
-/* 802E0784  90 1E 00 90 */	stw r0, 0x90(r30)
-/* 802E0788  90 1E 00 94 */	stw r0, 0x94(r30)
-/* 802E078C  7F C3 F3 78 */	mr r3, r30
-/* 802E0790  48 00 01 41 */	bl clear__10JUTGamePadFv
-/* 802E0794  7F C3 F3 78 */	mr r3, r30
-/* 802E0798  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802E079C  83 C1 00 08 */	lwz r30, 8(r1)
-/* 802E07A0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802E07A4  7C 08 03 A6 */	mtlr r0
-/* 802E07A8  38 21 00 10 */	addi r1, r1, 0x10
-/* 802E07AC  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/__ct__Q210JUTGamePad6CStickFv.s b/asm/JSystem/JUtility/JUTGamePad/__ct__Q210JUTGamePad6CStickFv.s
deleted file mode 100644
index 81ec36be9b..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/__ct__Q210JUTGamePad6CStickFv.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_802E1CA8:
-/* 802E1CA8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802E1CAC  7C 08 02 A6 */	mflr r0
-/* 802E1CB0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802E1CB4  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802E1CB8  7C 7F 1B 78 */	mr r31, r3
-/* 802E1CBC  4B FF F5 61 */	bl clear__Q210JUTGamePad6CStickFv
-/* 802E1CC0  7F E3 FB 78 */	mr r3, r31
-/* 802E1CC4  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802E1CC8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802E1CCC  7C 08 03 A6 */	mtlr r0
-/* 802E1CD0  38 21 00 10 */	addi r1, r1, 0x10
-/* 802E1CD4  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/__ct__Q210JUTGamePad7CButtonFv.s b/asm/JSystem/JUtility/JUTGamePad/__ct__Q210JUTGamePad7CButtonFv.s
deleted file mode 100644
index fbbd700367..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/__ct__Q210JUTGamePad7CButtonFv.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_802E1CD8:
-/* 802E1CD8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802E1CDC  7C 08 02 A6 */	mflr r0
-/* 802E1CE0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802E1CE4  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802E1CE8  7C 7F 1B 78 */	mr r31, r3
-/* 802E1CEC  4B FF F3 65 */	bl clear__Q210JUTGamePad7CButtonFv
-/* 802E1CF0  7F E3 FB 78 */	mr r3, r31
-/* 802E1CF4  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802E1CF8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802E1CFC  7C 08 03 A6 */	mtlr r0
-/* 802E1D00  38 21 00 10 */	addi r1, r1, 0x10
-/* 802E1D04  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/__dt__10JUTGamePadFv.s b/asm/JSystem/JUtility/JUTGamePad/__dt__10JUTGamePadFv.s
deleted file mode 100644
index bea6f7e66e..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/__dt__10JUTGamePadFv.s
+++ /dev/null
@@ -1,47 +0,0 @@
-lbl_802E07B0:
-/* 802E07B0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802E07B4  7C 08 02 A6 */	mflr r0
-/* 802E07B8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802E07BC  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802E07C0  93 C1 00 08 */	stw r30, 8(r1)
-/* 802E07C4  7C 7E 1B 79 */	or. r30, r3, r3
-/* 802E07C8  7C 9F 23 78 */	mr r31, r4
-/* 802E07CC  41 82 00 74 */	beq lbl_802E0840
-/* 802E07D0  3C 60 80 3D */	lis r3, __vt__10JUTGamePad@ha /* 0x803CC610@ha */
-/* 802E07D4  38 03 C6 10 */	addi r0, r3, __vt__10JUTGamePad@l /* 0x803CC610@l */
-/* 802E07D8  90 1E 00 00 */	stw r0, 0(r30)
-/* 802E07DC  A8 BE 00 7C */	lha r5, 0x7c(r30)
-/* 802E07E0  7C A0 07 35 */	extsh. r0, r5
-/* 802E07E4  41 80 00 1C */	blt lbl_802E0800
-/* 802E07E8  38 8D 8F 54 */	la r4, mPadAssign__10JUTGamePad(r13) /* 804514D4-_SDA_BASE_ */
-/* 802E07EC  7C 64 28 AE */	lbzx r3, r4, r5
-/* 802E07F0  38 03 FF FF */	addi r0, r3, -1
-/* 802E07F4  7C 04 29 AE */	stbx r0, r4, r5
-/* 802E07F8  38 00 FF FF */	li r0, -1
-/* 802E07FC  B0 1E 00 7C */	sth r0, 0x7c(r30)
-lbl_802E0800:
-/* 802E0800  3C 60 80 43 */	lis r3, mPadList__10JUTGamePad@ha /* 0x804343E4@ha */
-/* 802E0804  38 63 43 E4 */	addi r3, r3, mPadList__10JUTGamePad@l /* 0x804343E4@l */
-/* 802E0808  38 9E 00 80 */	addi r4, r30, 0x80
-/* 802E080C  4B FF B9 51 */	bl remove__10JSUPtrListFP10JSUPtrLink
-/* 802E0810  34 1E 00 80 */	addic. r0, r30, 0x80
-/* 802E0814  41 82 00 10 */	beq lbl_802E0824
-/* 802E0818  38 7E 00 80 */	addi r3, r30, 0x80
-/* 802E081C  38 80 00 00 */	li r4, 0
-/* 802E0820  4B FF B5 F5 */	bl __dt__10JSUPtrLinkFv
-lbl_802E0824:
-/* 802E0824  7F C3 F3 78 */	mr r3, r30
-/* 802E0828  38 80 00 00 */	li r4, 0
-/* 802E082C  4B FF 0C B9 */	bl __dt__11JKRDisposerFv
-/* 802E0830  7F E0 07 35 */	extsh. r0, r31
-/* 802E0834  40 81 00 0C */	ble lbl_802E0840
-/* 802E0838  7F C3 F3 78 */	mr r3, r30
-/* 802E083C  4B FE E5 01 */	bl __dl__FPv
-lbl_802E0840:
-/* 802E0840  7F C3 F3 78 */	mr r3, r30
-/* 802E0844  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802E0848  83 C1 00 08 */	lwz r30, 8(r1)
-/* 802E084C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802E0850  7C 08 03 A6 */	mtlr r0
-/* 802E0854  38 21 00 10 */	addi r1, r1, 0x10
-/* 802E0858  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/__sinit_JUTGamePad_cpp.s b/asm/JSystem/JUtility/JUTGamePad/__sinit_JUTGamePad_cpp.s
deleted file mode 100644
index 6f7f120359..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/__sinit_JUTGamePad_cpp.s
+++ /dev/null
@@ -1,62 +0,0 @@
-lbl_802E1B60:
-/* 802E1B60  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802E1B64  7C 08 02 A6 */	mflr r0
-/* 802E1B68  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802E1B6C  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802E1B70  3C 60 80 43 */	lis r3, lit_525@ha /* 0x804343D8@ha */
-/* 802E1B74  3B E3 43 D8 */	addi r31, r3, lit_525@l /* 0x804343D8@l */
-/* 802E1B78  38 7F 00 0C */	addi r3, r31, 0xc
-/* 802E1B7C  38 80 00 00 */	li r4, 0
-/* 802E1B80  4B FF A2 F5 */	bl __ct__10JSUPtrListFb
-/* 802E1B84  38 7F 00 0C */	addi r3, r31, 0xc
-/* 802E1B88  3C 80 80 2E */	lis r4, func_802E1D08@ha /* 0x802E1D08@ha */
-/* 802E1B8C  38 84 1D 08 */	addi r4, r4, func_802E1D08@l /* 0x802E1D08@l */
-/* 802E1B90  38 BF 00 00 */	addi r5, r31, 0
-/* 802E1B94  48 08 00 91 */	bl __register_global_object
-/* 802E1B98  38 7F 00 48 */	addi r3, r31, 0x48
-/* 802E1B9C  3C 80 80 2E */	lis r4, __ct__Q210JUTGamePad7CButtonFv@ha /* 0x802E1CD8@ha */
-/* 802E1BA0  38 84 1C D8 */	addi r4, r4, __ct__Q210JUTGamePad7CButtonFv@l /* 0x802E1CD8@l */
-/* 802E1BA4  38 A0 00 00 */	li r5, 0
-/* 802E1BA8  38 C0 00 30 */	li r6, 0x30
-/* 802E1BAC  38 E0 00 04 */	li r7, 4
-/* 802E1BB0  48 08 01 B1 */	bl __construct_array
-/* 802E1BB4  38 7F 01 08 */	addi r3, r31, 0x108
-/* 802E1BB8  3C 80 80 2E */	lis r4, __ct__Q210JUTGamePad6CStickFv@ha /* 0x802E1CA8@ha */
-/* 802E1BBC  38 84 1C A8 */	addi r4, r4, __ct__Q210JUTGamePad6CStickFv@l /* 0x802E1CA8@l */
-/* 802E1BC0  38 A0 00 00 */	li r5, 0
-/* 802E1BC4  38 C0 00 10 */	li r6, 0x10
-/* 802E1BC8  38 E0 00 04 */	li r7, 4
-/* 802E1BCC  48 08 01 95 */	bl __construct_array
-/* 802E1BD0  38 7F 01 48 */	addi r3, r31, 0x148
-/* 802E1BD4  3C 80 80 2E */	lis r4, __ct__Q210JUTGamePad6CStickFv@ha /* 0x802E1CA8@ha */
-/* 802E1BD8  38 84 1C A8 */	addi r4, r4, __ct__Q210JUTGamePad6CStickFv@l /* 0x802E1CA8@l */
-/* 802E1BDC  38 A0 00 00 */	li r5, 0
-/* 802E1BE0  38 C0 00 10 */	li r6, 0x10
-/* 802E1BE4  38 E0 00 04 */	li r7, 4
-/* 802E1BE8  48 08 01 79 */	bl __construct_array
-/* 802E1BEC  3C 60 80 00 */	lis r3, 0x8000 /* 0x800000F8@ha */
-/* 802E1BF0  80 03 00 F8 */	lwz r0, 0x00F8(r3)  /* 0x800000F8@l */
-/* 802E1BF4  54 03 F0 BE */	srwi r3, r0, 2
-/* 802E1BF8  38 00 00 3C */	li r0, 0x3c
-/* 802E1BFC  7C A3 03 96 */	divwu r5, r3, r0
-/* 802E1C00  38 80 00 00 */	li r4, 0
-/* 802E1C04  38 60 00 1E */	li r3, 0x1e
-/* 802E1C08  7C 05 18 16 */	mulhwu r0, r5, r3
-/* 802E1C0C  7C 64 19 D6 */	mullw r3, r4, r3
-/* 802E1C10  1C 85 00 1E */	mulli r4, r5, 0x1e
-/* 802E1C14  7C 00 1A 14 */	add r0, r0, r3
-/* 802E1C18  90 8D 8F 7C */	stw r4, sThreshold__Q210JUTGamePad13C3ButtonReset+4(r13)
-/* 802E1C1C  90 0D 8F 78 */	stw r0, sThreshold__Q210JUTGamePad13C3ButtonReset(r13)
-/* 802E1C20  38 7F 01 94 */	addi r3, r31, 0x194
-/* 802E1C24  38 80 00 00 */	li r4, 0
-/* 802E1C28  4B FF A2 4D */	bl __ct__10JSUPtrListFb
-/* 802E1C2C  38 7F 01 94 */	addi r3, r31, 0x194
-/* 802E1C30  3C 80 80 2E */	lis r4, func_802E1C54@ha /* 0x802E1C54@ha */
-/* 802E1C34  38 84 1C 54 */	addi r4, r4, func_802E1C54@l /* 0x802E1C54@l */
-/* 802E1C38  38 BF 01 88 */	addi r5, r31, 0x188
-/* 802E1C3C  48 07 FF E9 */	bl __register_global_object
-/* 802E1C40  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802E1C44  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802E1C48  7C 08 03 A6 */	mtlr r0
-/* 802E1C4C  38 21 00 10 */	addi r1, r1, 0x10
-/* 802E1C50  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/assign__10JUTGamePadFv.s b/asm/JSystem/JUtility/JUTGamePad/assign__10JUTGamePadFv.s
deleted file mode 100644
index 9f2340af7c..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/assign__10JUTGamePadFv.s
+++ /dev/null
@@ -1,48 +0,0 @@
-lbl_802E0BBC:
-/* 802E0BBC  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802E0BC0  7C 08 02 A6 */	mflr r0
-/* 802E0BC4  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802E0BC8  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802E0BCC  7C 7F 1B 78 */	mr r31, r3
-/* 802E0BD0  39 00 00 00 */	li r8, 0
-/* 802E0BD4  38 80 00 00 */	li r4, 0
-/* 802E0BD8  3C 60 80 43 */	lis r3, mPadStatus__10JUTGamePad@ha /* 0x804343F0@ha */
-/* 802E0BDC  38 C3 43 F0 */	addi r6, r3, mPadStatus__10JUTGamePad@l /* 0x804343F0@l */
-/* 802E0BE0  38 ED 8F 54 */	la r7, mPadAssign__10JUTGamePad(r13) /* 804514D4-_SDA_BASE_ */
-/* 802E0BE4  7C E3 3B 78 */	mr r3, r7
-/* 802E0BE8  38 00 00 04 */	li r0, 4
-/* 802E0BEC  7C 09 03 A6 */	mtctr r0
-lbl_802E0BF0:
-/* 802E0BF0  7C A6 22 14 */	add r5, r6, r4
-/* 802E0BF4  88 05 00 0A */	lbz r0, 0xa(r5)
-/* 802E0BF8  7C 00 07 75 */	extsb. r0, r0
-/* 802E0BFC  40 82 00 4C */	bne lbl_802E0C48
-/* 802E0C00  88 03 00 00 */	lbz r0, 0(r3)
-/* 802E0C04  28 00 00 00 */	cmplwi r0, 0
-/* 802E0C08  40 82 00 40 */	bne lbl_802E0C48
-/* 802E0C0C  B1 1F 00 7C */	sth r8, 0x7c(r31)
-/* 802E0C10  38 00 00 01 */	li r0, 1
-/* 802E0C14  7C 07 41 AE */	stbx r0, r7, r8
-/* 802E0C18  1C 88 00 30 */	mulli r4, r8, 0x30
-/* 802E0C1C  3C 60 80 43 */	lis r3, mPadButton__10JUTGamePad@ha /* 0x80434420@ha */
-/* 802E0C20  38 03 44 20 */	addi r0, r3, mPadButton__10JUTGamePad@l /* 0x80434420@l */
-/* 802E0C24  7C 60 22 14 */	add r3, r0, r4
-/* 802E0C28  80 9F 00 3C */	lwz r4, 0x3c(r31)
-/* 802E0C2C  80 BF 00 40 */	lwz r5, 0x40(r31)
-/* 802E0C30  80 DF 00 44 */	lwz r6, 0x44(r31)
-/* 802E0C34  48 00 0E 49 */	bl setRepeat__Q210JUTGamePad7CButtonFUlUlUl
-/* 802E0C38  38 7F 00 68 */	addi r3, r31, 0x68
-/* 802E0C3C  7F E4 FB 78 */	mr r4, r31
-/* 802E0C40  48 00 09 99 */	bl clear__Q210JUTGamePad7CRumbleFP10JUTGamePad
-/* 802E0C44  48 00 00 14 */	b lbl_802E0C58
-lbl_802E0C48:
-/* 802E0C48  39 08 00 01 */	addi r8, r8, 1
-/* 802E0C4C  38 63 00 01 */	addi r3, r3, 1
-/* 802E0C50  38 84 00 0C */	addi r4, r4, 0xc
-/* 802E0C54  42 00 FF 9C */	bdnz lbl_802E0BF0
-lbl_802E0C58:
-/* 802E0C58  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802E0C5C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802E0C60  7C 08 03 A6 */	mtlr r0
-/* 802E0C64  38 21 00 10 */	addi r1, r1, 0x10
-/* 802E0C68  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/checkCallback__19JUTGamePadLongPressFiUl.s b/asm/JSystem/JUtility/JUTGamePad/checkCallback__19JUTGamePadLongPressFiUl.s
deleted file mode 100644
index 16e25b0689..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/checkCallback__19JUTGamePadLongPressFiUl.s
+++ /dev/null
@@ -1,27 +0,0 @@
-lbl_802E1AFC:
-/* 802E1AFC  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802E1B00  7C 08 02 A6 */	mflr r0
-/* 802E1B04  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802E1B08  7C 66 1B 78 */	mr r6, r3
-/* 802E1B0C  2C 04 00 00 */	cmpwi r4, 0
-/* 802E1B10  41 80 00 40 */	blt lbl_802E1B50
-/* 802E1B14  80 06 00 1C */	lwz r0, 0x1c(r6)
-/* 802E1B18  7C 05 00 40 */	cmplw r5, r0
-/* 802E1B1C  41 80 00 34 */	blt lbl_802E1B50
-/* 802E1B20  38 00 00 01 */	li r0, 1
-/* 802E1B24  98 06 00 11 */	stb r0, 0x11(r6)
-/* 802E1B28  7C 66 22 14 */	add r3, r6, r4
-/* 802E1B2C  98 03 00 48 */	stb r0, 0x48(r3)
-/* 802E1B30  81 86 00 4C */	lwz r12, 0x4c(r6)
-/* 802E1B34  28 0C 00 00 */	cmplwi r12, 0
-/* 802E1B38  41 82 00 18 */	beq lbl_802E1B50
-/* 802E1B3C  7C 83 23 78 */	mr r3, r4
-/* 802E1B40  7C C4 33 78 */	mr r4, r6
-/* 802E1B44  80 A6 00 50 */	lwz r5, 0x50(r6)
-/* 802E1B48  7D 89 03 A6 */	mtctr r12
-/* 802E1B4C  4E 80 04 21 */	bctrl 
-lbl_802E1B50:
-/* 802E1B50  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802E1B54  7C 08 03 A6 */	mtlr r0
-/* 802E1B58  38 21 00 10 */	addi r1, r1, 0x10
-/* 802E1B5C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/checkResetSwitch__10JUTGamePadFv.s b/asm/JSystem/JUtility/JUTGamePad/checkResetSwitch__10JUTGamePadFv.s
deleted file mode 100644
index 04a83bd926..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/checkResetSwitch__10JUTGamePadFv.s
+++ /dev/null
@@ -1,36 +0,0 @@
-lbl_802E0FA4:
-/* 802E0FA4  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802E0FA8  7C 08 02 A6 */	mflr r0
-/* 802E0FAC  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802E0FB0  88 0D 8F 81 */	lbz r0, struct_80451500+0x1(r13)
-/* 802E0FB4  28 00 00 00 */	cmplwi r0, 0
-/* 802E0FB8  40 82 00 5C */	bne lbl_802E1014
-/* 802E0FBC  48 05 EE B5 */	bl OSGetResetSwitchState
-/* 802E0FC0  2C 03 00 00 */	cmpwi r3, 0
-/* 802E0FC4  41 82 00 10 */	beq lbl_802E0FD4
-/* 802E0FC8  38 00 00 01 */	li r0, 1
-/* 802E0FCC  98 0D 8F 80 */	stb r0, struct_80451500+0x0(r13)
-/* 802E0FD0  48 00 00 44 */	b lbl_802E1014
-lbl_802E0FD4:
-/* 802E0FD4  88 0D 8F 80 */	lbz r0, struct_80451500+0x0(r13)
-/* 802E0FD8  28 00 00 01 */	cmplwi r0, 1
-/* 802E0FDC  40 82 00 30 */	bne lbl_802E100C
-/* 802E0FE0  38 00 00 01 */	li r0, 1
-/* 802E0FE4  98 0D 8F 81 */	stb r0, struct_80451500+0x1(r13)
-/* 802E0FE8  38 00 FF FF */	li r0, -1
-/* 802E0FEC  90 0D 8F 84 */	stw r0, sResetOccurredPort__Q210JUTGamePad13C3ButtonReset(r13)
-/* 802E0FF0  81 8D 8F 6C */	lwz r12, sCallback__Q210JUTGamePad13C3ButtonReset(r13)
-/* 802E0FF4  28 0C 00 00 */	cmplwi r12, 0
-/* 802E0FF8  41 82 00 14 */	beq lbl_802E100C
-/* 802E0FFC  38 60 FF FF */	li r3, -1
-/* 802E1000  80 8D 8F 70 */	lwz r4, sCallbackArg__Q210JUTGamePad13C3ButtonReset(r13)
-/* 802E1004  7D 89 03 A6 */	mtctr r12
-/* 802E1008  4E 80 04 21 */	bctrl 
-lbl_802E100C:
-/* 802E100C  38 00 00 00 */	li r0, 0
-/* 802E1010  98 0D 8F 80 */	stb r0, struct_80451500+0x0(r13)
-lbl_802E1014:
-/* 802E1014  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802E1018  7C 08 03 A6 */	mtlr r0
-/* 802E101C  38 21 00 10 */	addi r1, r1, 0x10
-/* 802E1020  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/clearForReset__10JUTGamePadFv.s b/asm/JSystem/JUtility/JUTGamePad/clearForReset__10JUTGamePadFv.s
deleted file mode 100644
index c14b911099..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/clearForReset__10JUTGamePadFv.s
+++ /dev/null
@@ -1,12 +0,0 @@
-lbl_802E1024:
-/* 802E1024  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802E1028  7C 08 02 A6 */	mflr r0
-/* 802E102C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802E1030  38 60 00 00 */	li r3, 0
-/* 802E1034  48 00 09 A5 */	bl setEnabled__Q210JUTGamePad7CRumbleFUl
-/* 802E1038  3C 60 F0 00 */	lis r3, 0xf000
-/* 802E103C  48 00 0A 5D */	bl recalibrate__10JUTGamePadFUl
-/* 802E1040  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802E1044  7C 08 03 A6 */	mtlr r0
-/* 802E1048  38 21 00 10 */	addi r1, r1, 0x10
-/* 802E104C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/clear__Q210JUTGamePad6CStickFv.s b/asm/JSystem/JUtility/JUTGamePad/clear__Q210JUTGamePad6CStickFv.s
deleted file mode 100644
index dcf2eda337..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/clear__Q210JUTGamePad6CStickFv.s
+++ /dev/null
@@ -1,8 +0,0 @@
-lbl_802E121C:
-/* 802E121C  C0 02 C6 28 */	lfs f0, lit_1056(r2)
-/* 802E1220  D0 03 00 00 */	stfs f0, 0(r3)
-/* 802E1224  D0 03 00 04 */	stfs f0, 4(r3)
-/* 802E1228  D0 03 00 08 */	stfs f0, 8(r3)
-/* 802E122C  38 00 00 00 */	li r0, 0
-/* 802E1230  B0 03 00 0C */	sth r0, 0xc(r3)
-/* 802E1234  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/clear__Q210JUTGamePad7CButtonFv.s b/asm/JSystem/JUtility/JUTGamePad/clear__Q210JUTGamePad7CButtonFv.s
deleted file mode 100644
index b64ee906e7..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/clear__Q210JUTGamePad7CButtonFv.s
+++ /dev/null
@@ -1,16 +0,0 @@
-lbl_802E1050:
-/* 802E1050  38 00 00 00 */	li r0, 0
-/* 802E1054  90 03 00 00 */	stw r0, 0(r3)
-/* 802E1058  90 03 00 04 */	stw r0, 4(r3)
-/* 802E105C  90 03 00 08 */	stw r0, 8(r3)
-/* 802E1060  90 03 00 18 */	stw r0, 0x18(r3)
-/* 802E1064  98 03 00 0C */	stb r0, 0xc(r3)
-/* 802E1068  98 03 00 0D */	stb r0, 0xd(r3)
-/* 802E106C  98 03 00 0E */	stb r0, 0xe(r3)
-/* 802E1070  98 03 00 0F */	stb r0, 0xf(r3)
-/* 802E1074  90 03 00 1C */	stw r0, 0x1c(r3)
-/* 802E1078  90 03 00 20 */	stw r0, 0x20(r3)
-/* 802E107C  90 03 00 24 */	stw r0, 0x24(r3)
-/* 802E1080  90 03 00 28 */	stw r0, 0x28(r3)
-/* 802E1084  90 03 00 2C */	stw r0, 0x2c(r3)
-/* 802E1088  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/clear__Q210JUTGamePad7CRumbleFP10JUTGamePad.s b/asm/JSystem/JUtility/JUTGamePad/clear__Q210JUTGamePad7CRumbleFP10JUTGamePad.s
deleted file mode 100644
index a708db816a..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/clear__Q210JUTGamePad7CRumbleFP10JUTGamePad.s
+++ /dev/null
@@ -1,25 +0,0 @@
-lbl_802E15D8:
-/* 802E15D8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802E15DC  7C 08 02 A6 */	mflr r0
-/* 802E15E0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802E15E4  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802E15E8  7C 7F 1B 78 */	mr r31, r3
-/* 802E15EC  A8 04 00 7C */	lha r0, 0x7c(r4)
-/* 802E15F0  7C 05 07 35 */	extsh. r5, r0
-/* 802E15F4  41 80 00 24 */	blt lbl_802E1618
-/* 802E15F8  2C 05 00 04 */	cmpwi r5, 4
-/* 802E15FC  40 80 00 1C */	bge lbl_802E1618
-/* 802E1600  38 00 00 00 */	li r0, 0
-/* 802E1604  38 6D 8F 64 */	la r3, mStatus__Q210JUTGamePad7CRumble(r13) /* 804514E4-_SDA_BASE_ */
-/* 802E1608  7C 03 29 AE */	stbx r0, r3, r5
-/* 802E160C  A8 64 00 7C */	lha r3, 0x7c(r4)
-/* 802E1610  38 80 00 01 */	li r4, 1
-/* 802E1614  48 00 00 79 */	bl stopMotor__Q210JUTGamePad7CRumbleFib
-lbl_802E1618:
-/* 802E1618  7F E3 FB 78 */	mr r3, r31
-/* 802E161C  4B FF FF 99 */	bl clear__Q210JUTGamePad7CRumbleFv
-/* 802E1620  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802E1624  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802E1628  7C 08 03 A6 */	mtlr r0
-/* 802E162C  38 21 00 10 */	addi r1, r1, 0x10
-/* 802E1630  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/clear__Q210JUTGamePad7CRumbleFv.s b/asm/JSystem/JUtility/JUTGamePad/clear__Q210JUTGamePad7CRumbleFv.s
deleted file mode 100644
index b885cde244..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/clear__Q210JUTGamePad7CRumbleFv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_802E15B4:
-/* 802E15B4  38 00 00 00 */	li r0, 0
-/* 802E15B8  90 03 00 00 */	stw r0, 0(r3)
-/* 802E15BC  90 03 00 04 */	stw r0, 4(r3)
-/* 802E15C0  90 03 00 08 */	stw r0, 8(r3)
-/* 802E15C4  90 03 00 0C */	stw r0, 0xc(r3)
-/* 802E15C8  90 03 00 10 */	stw r0, 0x10(r3)
-/* 802E15CC  3C 00 F0 00 */	lis r0, 0xf000
-/* 802E15D0  90 0D 8F 68 */	stw r0, mEnabled__Q210JUTGamePad7CRumble(r13)
-/* 802E15D4  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/func_802E1238.s b/asm/JSystem/JUtility/JUTGamePad/func_802E1238.s
deleted file mode 100644
index 94bb2e9271..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/func_802E1238.s
+++ /dev/null
@@ -1,201 +0,0 @@
-lbl_802E1238:
-/* 802E1238  94 21 FF C0 */	stwu r1, -0x40(r1)
-/* 802E123C  7C 08 02 A6 */	mflr r0
-/* 802E1240  90 01 00 44 */	stw r0, 0x44(r1)
-/* 802E1244  39 61 00 40 */	addi r11, r1, 0x40
-/* 802E1248  48 08 0F 95 */	bl _savegpr_29
-/* 802E124C  7C 7D 1B 78 */	mr r29, r3
-/* 802E1250  7C FE 3B 78 */	mr r30, r7
-/* 802E1254  7D 1F 43 78 */	mr r31, r8
-/* 802E1258  80 0D 83 5C */	lwz r0, sClampMode__10JUTGamePad(r13)
-/* 802E125C  2C 00 00 02 */	cmpwi r0, 2
-/* 802E1260  41 82 00 2C */	beq lbl_802E128C
-/* 802E1264  40 80 00 40 */	bge lbl_802E12A4
-/* 802E1268  2C 00 00 01 */	cmpwi r0, 1
-/* 802E126C  40 80 00 08 */	bge lbl_802E1274
-/* 802E1270  48 00 00 34 */	b lbl_802E12A4
-lbl_802E1274:
-/* 802E1274  2C 1E 00 00 */	cmpwi r30, 0
-/* 802E1278  38 00 00 2A */	li r0, 0x2a
-/* 802E127C  40 82 00 08 */	bne lbl_802E1284
-/* 802E1280  38 00 00 36 */	li r0, 0x36
-lbl_802E1284:
-/* 802E1284  7C 03 03 78 */	mr r3, r0
-/* 802E1288  48 00 00 30 */	b lbl_802E12B8
-lbl_802E128C:
-/* 802E128C  2C 1E 00 00 */	cmpwi r30, 0
-/* 802E1290  38 00 00 1D */	li r0, 0x1d
-/* 802E1294  40 82 00 08 */	bne lbl_802E129C
-/* 802E1298  38 00 00 26 */	li r0, 0x26
-lbl_802E129C:
-/* 802E129C  7C 03 03 78 */	mr r3, r0
-/* 802E12A0  48 00 00 18 */	b lbl_802E12B8
-lbl_802E12A4:
-/* 802E12A4  2C 1E 00 00 */	cmpwi r30, 0
-/* 802E12A8  38 00 00 39 */	li r0, 0x39
-/* 802E12AC  40 82 00 08 */	bne lbl_802E12B4
-/* 802E12B0  38 00 00 45 */	li r0, 0x45
-lbl_802E12B4:
-/* 802E12B4  7C 03 03 78 */	mr r3, r0
-lbl_802E12B8:
-/* 802E12B8  98 9D 00 0E */	stb r4, 0xe(r29)
-/* 802E12BC  98 BD 00 0F */	stb r5, 0xf(r29)
-/* 802E12C0  7C 80 07 74 */	extsb r0, r4
-/* 802E12C4  C8 42 C6 20 */	lfd f2, lit_1050(r2)
-/* 802E12C8  6C 00 80 00 */	xoris r0, r0, 0x8000
-/* 802E12CC  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802E12D0  3C 80 43 30 */	lis r4, 0x4330
-/* 802E12D4  90 81 00 10 */	stw r4, 0x10(r1)
-/* 802E12D8  C8 01 00 10 */	lfd f0, 0x10(r1)
-/* 802E12DC  EC 20 10 28 */	fsubs f1, f0, f2
-/* 802E12E0  6C 63 80 00 */	xoris r3, r3, 0x8000
-/* 802E12E4  90 61 00 1C */	stw r3, 0x1c(r1)
-/* 802E12E8  90 81 00 18 */	stw r4, 0x18(r1)
-/* 802E12EC  C8 01 00 18 */	lfd f0, 0x18(r1)
-/* 802E12F0  EC 00 10 28 */	fsubs f0, f0, f2
-/* 802E12F4  EC 01 00 24 */	fdivs f0, f1, f0
-/* 802E12F8  D0 1D 00 00 */	stfs f0, 0(r29)
-/* 802E12FC  7C A0 07 74 */	extsb r0, r5
-/* 802E1300  6C 00 80 00 */	xoris r0, r0, 0x8000
-/* 802E1304  90 01 00 24 */	stw r0, 0x24(r1)
-/* 802E1308  90 81 00 20 */	stw r4, 0x20(r1)
-/* 802E130C  C8 01 00 20 */	lfd f0, 0x20(r1)
-/* 802E1310  EC 20 10 28 */	fsubs f1, f0, f2
-/* 802E1314  90 61 00 2C */	stw r3, 0x2c(r1)
-/* 802E1318  90 81 00 28 */	stw r4, 0x28(r1)
-/* 802E131C  C8 01 00 28 */	lfd f0, 0x28(r1)
-/* 802E1320  EC 00 10 28 */	fsubs f0, f0, f2
-/* 802E1324  EC 01 00 24 */	fdivs f0, f1, f0
-/* 802E1328  D0 1D 00 04 */	stfs f0, 4(r29)
-/* 802E132C  C0 1D 00 00 */	lfs f0, 0(r29)
-/* 802E1330  EC 20 00 32 */	fmuls f1, f0, f0
-/* 802E1334  C0 1D 00 04 */	lfs f0, 4(r29)
-/* 802E1338  EC 00 00 32 */	fmuls f0, f0, f0
-/* 802E133C  EC 81 00 2A */	fadds f4, f1, f0
-/* 802E1340  C0 02 C6 28 */	lfs f0, lit_1056(r2)
-/* 802E1344  FC 04 00 40 */	fcmpo cr0, f4, f0
-/* 802E1348  40 81 00 58 */	ble lbl_802E13A0
-/* 802E134C  FC 00 20 34 */	frsqrte f0, f4
-/* 802E1350  C8 62 C6 30 */	lfd f3, lit_1117(r2)
-/* 802E1354  FC 23 00 32 */	fmul f1, f3, f0
-/* 802E1358  C8 42 C6 38 */	lfd f2, lit_1118(r2)
-/* 802E135C  FC 00 00 32 */	fmul f0, f0, f0
-/* 802E1360  FC 04 00 32 */	fmul f0, f4, f0
-/* 802E1364  FC 02 00 28 */	fsub f0, f2, f0
-/* 802E1368  FC 01 00 32 */	fmul f0, f1, f0
-/* 802E136C  FC 23 00 32 */	fmul f1, f3, f0
-/* 802E1370  FC 00 00 32 */	fmul f0, f0, f0
-/* 802E1374  FC 04 00 32 */	fmul f0, f4, f0
-/* 802E1378  FC 02 00 28 */	fsub f0, f2, f0
-/* 802E137C  FC 01 00 32 */	fmul f0, f1, f0
-/* 802E1380  FC 23 00 32 */	fmul f1, f3, f0
-/* 802E1384  FC 00 00 32 */	fmul f0, f0, f0
-/* 802E1388  FC 04 00 32 */	fmul f0, f4, f0
-/* 802E138C  FC 02 00 28 */	fsub f0, f2, f0
-/* 802E1390  FC 01 00 32 */	fmul f0, f1, f0
-/* 802E1394  FC 84 00 32 */	fmul f4, f4, f0
-/* 802E1398  FC 80 20 18 */	frsp f4, f4
-/* 802E139C  48 00 00 88 */	b lbl_802E1424
-lbl_802E13A0:
-/* 802E13A0  C8 02 C6 40 */	lfd f0, lit_1119(r2)
-/* 802E13A4  FC 04 00 40 */	fcmpo cr0, f4, f0
-/* 802E13A8  40 80 00 10 */	bge lbl_802E13B8
-/* 802E13AC  3C 60 80 45 */	lis r3, __float_nan@ha /* 0x80450AE0@ha */
-/* 802E13B0  C0 83 0A E0 */	lfs f4, __float_nan@l(r3)  /* 0x80450AE0@l */
-/* 802E13B4  48 00 00 70 */	b lbl_802E1424
-lbl_802E13B8:
-/* 802E13B8  D0 81 00 08 */	stfs f4, 8(r1)
-/* 802E13BC  80 81 00 08 */	lwz r4, 8(r1)
-/* 802E13C0  54 83 00 50 */	rlwinm r3, r4, 0, 1, 8
-/* 802E13C4  3C 00 7F 80 */	lis r0, 0x7f80
-/* 802E13C8  7C 03 00 00 */	cmpw r3, r0
-/* 802E13CC  41 82 00 14 */	beq lbl_802E13E0
-/* 802E13D0  40 80 00 40 */	bge lbl_802E1410
-/* 802E13D4  2C 03 00 00 */	cmpwi r3, 0
-/* 802E13D8  41 82 00 20 */	beq lbl_802E13F8
-/* 802E13DC  48 00 00 34 */	b lbl_802E1410
-lbl_802E13E0:
-/* 802E13E0  54 80 02 7F */	clrlwi. r0, r4, 9
-/* 802E13E4  41 82 00 0C */	beq lbl_802E13F0
-/* 802E13E8  38 00 00 01 */	li r0, 1
-/* 802E13EC  48 00 00 28 */	b lbl_802E1414
-lbl_802E13F0:
-/* 802E13F0  38 00 00 02 */	li r0, 2
-/* 802E13F4  48 00 00 20 */	b lbl_802E1414
-lbl_802E13F8:
-/* 802E13F8  54 80 02 7F */	clrlwi. r0, r4, 9
-/* 802E13FC  41 82 00 0C */	beq lbl_802E1408
-/* 802E1400  38 00 00 05 */	li r0, 5
-/* 802E1404  48 00 00 10 */	b lbl_802E1414
-lbl_802E1408:
-/* 802E1408  38 00 00 03 */	li r0, 3
-/* 802E140C  48 00 00 08 */	b lbl_802E1414
-lbl_802E1410:
-/* 802E1410  38 00 00 04 */	li r0, 4
-lbl_802E1414:
-/* 802E1414  2C 00 00 01 */	cmpwi r0, 1
-/* 802E1418  40 82 00 0C */	bne lbl_802E1424
-/* 802E141C  3C 60 80 45 */	lis r3, __float_nan@ha /* 0x80450AE0@ha */
-/* 802E1420  C0 83 0A E0 */	lfs f4, __float_nan@l(r3)  /* 0x80450AE0@l */
-lbl_802E1424:
-/* 802E1424  D0 9D 00 08 */	stfs f4, 8(r29)
-/* 802E1428  C0 3D 00 08 */	lfs f1, 8(r29)
-/* 802E142C  C0 02 C6 48 */	lfs f0, lit_1120(r2)
-/* 802E1430  FC 01 00 40 */	fcmpo cr0, f1, f0
-/* 802E1434  40 81 00 30 */	ble lbl_802E1464
-/* 802E1438  2C 06 00 01 */	cmpwi r6, 1
-/* 802E143C  40 82 00 20 */	bne lbl_802E145C
-/* 802E1440  C0 1D 00 00 */	lfs f0, 0(r29)
-/* 802E1444  EC 00 08 24 */	fdivs f0, f0, f1
-/* 802E1448  D0 1D 00 00 */	stfs f0, 0(r29)
-/* 802E144C  C0 3D 00 04 */	lfs f1, 4(r29)
-/* 802E1450  C0 1D 00 08 */	lfs f0, 8(r29)
-/* 802E1454  EC 01 00 24 */	fdivs f0, f1, f0
-/* 802E1458  D0 1D 00 04 */	stfs f0, 4(r29)
-lbl_802E145C:
-/* 802E145C  C0 02 C6 48 */	lfs f0, lit_1120(r2)
-/* 802E1460  D0 1D 00 08 */	stfs f0, 8(r29)
-lbl_802E1464:
-/* 802E1464  C0 1D 00 08 */	lfs f0, 8(r29)
-/* 802E1468  C0 22 C6 28 */	lfs f1, lit_1056(r2)
-/* 802E146C  FC 00 08 40 */	fcmpo cr0, f0, f1
-/* 802E1470  40 81 00 5C */	ble lbl_802E14CC
-/* 802E1474  C0 1D 00 04 */	lfs f0, 4(r29)
-/* 802E1478  FC 01 00 00 */	fcmpu cr0, f1, f0
-/* 802E147C  40 82 00 28 */	bne lbl_802E14A4
-/* 802E1480  C0 1D 00 00 */	lfs f0, 0(r29)
-/* 802E1484  FC 00 08 40 */	fcmpo cr0, f0, f1
-/* 802E1488  40 81 00 10 */	ble lbl_802E1498
-/* 802E148C  38 00 40 00 */	li r0, 0x4000
-/* 802E1490  B0 1D 00 0C */	sth r0, 0xc(r29)
-/* 802E1494  48 00 00 38 */	b lbl_802E14CC
-lbl_802E1498:
-/* 802E1498  38 00 C0 00 */	li r0, -16384
-/* 802E149C  B0 1D 00 0C */	sth r0, 0xc(r29)
-/* 802E14A0  48 00 00 2C */	b lbl_802E14CC
-lbl_802E14A4:
-/* 802E14A4  C0 3D 00 00 */	lfs f1, 0(r29)
-/* 802E14A8  FC 40 00 50 */	fneg f2, f0
-/* 802E14AC  48 08 B2 75 */	bl atan2
-/* 802E14B0  FC 20 08 18 */	frsp f1, f1
-/* 802E14B4  C0 02 C6 4C */	lfs f0, lit_1121(r2)
-/* 802E14B8  EC 00 00 72 */	fmuls f0, f0, f1
-/* 802E14BC  FC 00 00 1E */	fctiwz f0, f0
-/* 802E14C0  D8 01 00 28 */	stfd f0, 0x28(r1)
-/* 802E14C4  80 01 00 2C */	lwz r0, 0x2c(r1)
-/* 802E14C8  B0 1D 00 0C */	sth r0, 0xc(r29)
-lbl_802E14CC:
-/* 802E14CC  7F A3 EB 78 */	mr r3, r29
-/* 802E14D0  2C 1E 00 00 */	cmpwi r30, 0
-/* 802E14D4  38 00 00 10 */	li r0, 0x10
-/* 802E14D8  40 82 00 08 */	bne lbl_802E14E0
-/* 802E14DC  38 00 00 18 */	li r0, 0x18
-lbl_802E14E0:
-/* 802E14E0  7F E4 04 30 */	srw r4, r31, r0
-/* 802E14E4  48 00 00 1D */	bl getButton__Q210JUTGamePad6CStickFUl
-/* 802E14E8  39 61 00 40 */	addi r11, r1, 0x40
-/* 802E14EC  48 08 0D 3D */	bl _restgpr_29
-/* 802E14F0  80 01 00 44 */	lwz r0, 0x44(r1)
-/* 802E14F4  7C 08 03 A6 */	mtlr r0
-/* 802E14F8  38 21 00 40 */	addi r1, r1, 0x40
-/* 802E14FC  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/func_802E1C54.s b/asm/JSystem/JUtility/JUTGamePad/func_802E1C54.s
deleted file mode 100644
index 62add8fc7a..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/func_802E1C54.s
+++ /dev/null
@@ -1,23 +0,0 @@
-lbl_802E1C54:
-/* 802E1C54  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802E1C58  7C 08 02 A6 */	mflr r0
-/* 802E1C5C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802E1C60  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802E1C64  93 C1 00 08 */	stw r30, 8(r1)
-/* 802E1C68  7C 7E 1B 79 */	or. r30, r3, r3
-/* 802E1C6C  7C 9F 23 78 */	mr r31, r4
-/* 802E1C70  41 82 00 1C */	beq lbl_802E1C8C
-/* 802E1C74  38 80 00 00 */	li r4, 0
-/* 802E1C78  4B FF A2 35 */	bl __dt__10JSUPtrListFv
-/* 802E1C7C  7F E0 07 35 */	extsh. r0, r31
-/* 802E1C80  40 81 00 0C */	ble lbl_802E1C8C
-/* 802E1C84  7F C3 F3 78 */	mr r3, r30
-/* 802E1C88  4B FE D0 B5 */	bl __dl__FPv
-lbl_802E1C8C:
-/* 802E1C8C  7F C3 F3 78 */	mr r3, r30
-/* 802E1C90  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802E1C94  83 C1 00 08 */	lwz r30, 8(r1)
-/* 802E1C98  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802E1C9C  7C 08 03 A6 */	mtlr r0
-/* 802E1CA0  38 21 00 10 */	addi r1, r1, 0x10
-/* 802E1CA4  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/func_802E1D08.s b/asm/JSystem/JUtility/JUTGamePad/func_802E1D08.s
deleted file mode 100644
index debc5c06ef..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/func_802E1D08.s
+++ /dev/null
@@ -1,23 +0,0 @@
-lbl_802E1D08:
-/* 802E1D08  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802E1D0C  7C 08 02 A6 */	mflr r0
-/* 802E1D10  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802E1D14  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802E1D18  93 C1 00 08 */	stw r30, 8(r1)
-/* 802E1D1C  7C 7E 1B 79 */	or. r30, r3, r3
-/* 802E1D20  7C 9F 23 78 */	mr r31, r4
-/* 802E1D24  41 82 00 1C */	beq lbl_802E1D40
-/* 802E1D28  38 80 00 00 */	li r4, 0
-/* 802E1D2C  4B FF A1 81 */	bl __dt__10JSUPtrListFv
-/* 802E1D30  7F E0 07 35 */	extsh. r0, r31
-/* 802E1D34  40 81 00 0C */	ble lbl_802E1D40
-/* 802E1D38  7F C3 F3 78 */	mr r3, r30
-/* 802E1D3C  4B FE D0 01 */	bl __dl__FPv
-lbl_802E1D40:
-/* 802E1D40  7F C3 F3 78 */	mr r3, r30
-/* 802E1D44  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802E1D48  83 C1 00 08 */	lwz r30, 8(r1)
-/* 802E1D4C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802E1D50  7C 08 03 A6 */	mtlr r0
-/* 802E1D54  38 21 00 10 */	addi r1, r1, 0x10
-/* 802E1D58  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/getButton__Q210JUTGamePad6CStickFUl.s b/asm/JSystem/JUtility/JUTGamePad/getButton__Q210JUTGamePad6CStickFUl.s
deleted file mode 100644
index 4bf09a972c..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/getButton__Q210JUTGamePad6CStickFUl.s
+++ /dev/null
@@ -1,52 +0,0 @@
-lbl_802E1500:
-/* 802E1500  54 80 07 3E */	clrlwi r0, r4, 0x1c
-/* 802E1504  C0 2D 83 64 */	lfs f1, sReleasePoint__Q210JUTGamePad6CStick(r13)
-/* 802E1508  FC 80 08 50 */	fneg f4, f1
-/* 802E150C  C0 43 00 00 */	lfs f2, 0(r3)
-/* 802E1510  FC 04 10 40 */	fcmpo cr0, f4, f2
-/* 802E1514  40 80 00 14 */	bge lbl_802E1528
-/* 802E1518  FC 02 08 40 */	fcmpo cr0, f2, f1
-/* 802E151C  40 80 00 0C */	bge lbl_802E1528
-/* 802E1520  54 00 00 3A */	rlwinm r0, r0, 0, 0, 0x1d
-/* 802E1524  48 00 00 38 */	b lbl_802E155C
-lbl_802E1528:
-/* 802E1528  C0 6D 83 60 */	lfs f3, sPressPoint__Q210JUTGamePad6CStick(r13)
-/* 802E152C  FC 00 18 50 */	fneg f0, f3
-/* 802E1530  FC 02 00 40 */	fcmpo cr0, f2, f0
-/* 802E1534  4C 40 13 82 */	cror 2, 0, 2
-/* 802E1538  40 82 00 10 */	bne lbl_802E1548
-/* 802E153C  54 00 07 FA */	rlwinm r0, r0, 0, 0x1f, 0x1d
-/* 802E1540  60 00 00 01 */	ori r0, r0, 1
-/* 802E1544  48 00 00 18 */	b lbl_802E155C
-lbl_802E1548:
-/* 802E1548  FC 02 18 40 */	fcmpo cr0, f2, f3
-/* 802E154C  4C 41 13 82 */	cror 2, 1, 2
-/* 802E1550  40 82 00 0C */	bne lbl_802E155C
-/* 802E1554  54 00 00 3C */	rlwinm r0, r0, 0, 0, 0x1e
-/* 802E1558  60 00 00 02 */	ori r0, r0, 2
-lbl_802E155C:
-/* 802E155C  C0 43 00 04 */	lfs f2, 4(r3)
-/* 802E1560  FC 04 10 40 */	fcmpo cr0, f4, f2
-/* 802E1564  40 80 00 14 */	bge lbl_802E1578
-/* 802E1568  FC 02 08 40 */	fcmpo cr0, f2, f1
-/* 802E156C  40 80 00 0C */	bge lbl_802E1578
-/* 802E1570  54 00 07 B6 */	rlwinm r0, r0, 0, 0x1e, 0x1b
-/* 802E1574  48 00 00 38 */	b lbl_802E15AC
-lbl_802E1578:
-/* 802E1578  C0 2D 83 60 */	lfs f1, sPressPoint__Q210JUTGamePad6CStick(r13)
-/* 802E157C  FC 00 08 50 */	fneg f0, f1
-/* 802E1580  FC 02 00 40 */	fcmpo cr0, f2, f0
-/* 802E1584  4C 40 13 82 */	cror 2, 0, 2
-/* 802E1588  40 82 00 10 */	bne lbl_802E1598
-/* 802E158C  54 00 07 76 */	rlwinm r0, r0, 0, 0x1d, 0x1b
-/* 802E1590  60 00 00 04 */	ori r0, r0, 4
-/* 802E1594  48 00 00 18 */	b lbl_802E15AC
-lbl_802E1598:
-/* 802E1598  FC 02 08 40 */	fcmpo cr0, f2, f1
-/* 802E159C  4C 41 13 82 */	cror 2, 1, 2
-/* 802E15A0  40 82 00 0C */	bne lbl_802E15AC
-/* 802E15A4  54 00 07 B8 */	rlwinm r0, r0, 0, 0x1e, 0x1c
-/* 802E15A8  60 00 00 08 */	ori r0, r0, 8
-lbl_802E15AC:
-/* 802E15AC  7C 03 03 78 */	mr r3, r0
-/* 802E15B0  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/getGamePad__10JUTGamePadFi.s b/asm/JSystem/JUtility/JUTGamePad/getGamePad__10JUTGamePadFi.s
deleted file mode 100644
index cf91b67fd3..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/getGamePad__10JUTGamePadFi.s
+++ /dev/null
@@ -1,19 +0,0 @@
-lbl_802E199C:
-/* 802E199C  3C 80 80 43 */	lis r4, mPadList__10JUTGamePad@ha /* 0x804343E4@ha */
-/* 802E19A0  38 84 43 E4 */	addi r4, r4, mPadList__10JUTGamePad@l /* 0x804343E4@l */
-/* 802E19A4  80 84 00 00 */	lwz r4, 0(r4)
-/* 802E19A8  48 00 00 20 */	b lbl_802E19C8
-lbl_802E19AC:
-/* 802E19AC  80 A4 00 00 */	lwz r5, 0(r4)
-/* 802E19B0  A8 05 00 7C */	lha r0, 0x7c(r5)
-/* 802E19B4  7C 03 00 00 */	cmpw r3, r0
-/* 802E19B8  40 82 00 0C */	bne lbl_802E19C4
-/* 802E19BC  7C A3 2B 78 */	mr r3, r5
-/* 802E19C0  4E 80 00 20 */	blr 
-lbl_802E19C4:
-/* 802E19C4  80 84 00 0C */	lwz r4, 0xc(r4)
-lbl_802E19C8:
-/* 802E19C8  28 04 00 00 */	cmplwi r4, 0
-/* 802E19CC  40 82 FF E0 */	bne lbl_802E19AC
-/* 802E19D0  38 60 00 00 */	li r3, 0
-/* 802E19D4  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/recalibrate__10JUTGamePadFUl.s b/asm/JSystem/JUtility/JUTGamePad/recalibrate__10JUTGamePadFUl.s
deleted file mode 100644
index 1a615feda4..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/recalibrate__10JUTGamePadFUl.s
+++ /dev/null
@@ -1,28 +0,0 @@
-lbl_802E1A98:
-/* 802E1A98  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802E1A9C  7C 08 02 A6 */	mflr r0
-/* 802E1AA0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802E1AA4  38 80 00 00 */	li r4, 0
-/* 802E1AA8  80 ED 8F 58 */	lwz r7, sSuppressPadReset__10JUTGamePad(r13)
-/* 802E1AAC  3C A0 80 3D */	lis r5, channel_mask@ha /* 0x803CC600@ha */
-/* 802E1AB0  38 C5 C6 00 */	addi r6, r5, channel_mask@l /* 0x803CC600@l */
-/* 802E1AB4  38 A0 FF FF */	li r5, -1
-/* 802E1AB8  38 00 00 04 */	li r0, 4
-/* 802E1ABC  7C 09 03 A6 */	mtctr r0
-lbl_802E1AC0:
-/* 802E1AC0  7D 06 20 2E */	lwzx r8, r6, r4
-/* 802E1AC4  7C E0 40 39 */	and. r0, r7, r8
-/* 802E1AC8  41 82 00 0C */	beq lbl_802E1AD4
-/* 802E1ACC  7D 00 2A 78 */	xor r0, r8, r5
-/* 802E1AD0  7C 63 00 38 */	and r3, r3, r0
-lbl_802E1AD4:
-/* 802E1AD4  38 84 00 04 */	addi r4, r4, 4
-/* 802E1AD8  42 00 FF E8 */	bdnz lbl_802E1AC0
-/* 802E1ADC  48 06 D1 61 */	bl PADRecalibrate
-/* 802E1AE0  30 03 FF FF */	addic r0, r3, -1
-/* 802E1AE4  7C 00 19 10 */	subfe r0, r0, r3
-/* 802E1AE8  54 03 06 3E */	clrlwi r3, r0, 0x18
-/* 802E1AEC  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802E1AF0  7C 08 03 A6 */	mtlr r0
-/* 802E1AF4  38 21 00 10 */	addi r1, r1, 0x10
-/* 802E1AF8  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/setEnabled__Q210JUTGamePad7CRumbleFUl.s b/asm/JSystem/JUtility/JUTGamePad/setEnabled__Q210JUTGamePad7CRumbleFUl.s
deleted file mode 100644
index c45a70142a..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/setEnabled__Q210JUTGamePad7CRumbleFUl.s
+++ /dev/null
@@ -1,45 +0,0 @@
-lbl_802E19D8:
-/* 802E19D8  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 802E19DC  7C 08 02 A6 */	mflr r0
-/* 802E19E0  90 01 00 24 */	stw r0, 0x24(r1)
-/* 802E19E4  39 61 00 20 */	addi r11, r1, 0x20
-/* 802E19E8  48 08 07 ED */	bl _savegpr_27
-/* 802E19EC  7C 7B 1B 78 */	mr r27, r3
-/* 802E19F0  3B 80 00 00 */	li r28, 0
-/* 802E19F4  3B C0 00 00 */	li r30, 0
-/* 802E19F8  3C 60 80 3D */	lis r3, channel_mask@ha /* 0x803CC600@ha */
-/* 802E19FC  3B A3 C6 00 */	addi r29, r3, channel_mask@l /* 0x803CC600@l */
-/* 802E1A00  3B ED 8F 64 */	la r31, mStatus__Q210JUTGamePad7CRumble(r13) /* 804514E4-_SDA_BASE_ */
-lbl_802E1A04:
-/* 802E1A04  80 6D 8F 68 */	lwz r3, mEnabled__Q210JUTGamePad7CRumble(r13)
-/* 802E1A08  7C 1D F0 2E */	lwzx r0, r29, r30
-/* 802E1A0C  7C 60 00 39 */	and. r0, r3, r0
-/* 802E1A10  40 82 00 38 */	bne lbl_802E1A48
-/* 802E1A14  88 1F 00 00 */	lbz r0, 0(r31)
-/* 802E1A18  28 00 00 00 */	cmplwi r0, 0
-/* 802E1A1C  41 82 00 10 */	beq lbl_802E1A2C
-/* 802E1A20  7F 83 E3 78 */	mr r3, r28
-/* 802E1A24  38 80 00 00 */	li r4, 0
-/* 802E1A28  4B FF FC 65 */	bl stopMotor__Q210JUTGamePad7CRumbleFib
-lbl_802E1A2C:
-/* 802E1A2C  7F 83 E3 78 */	mr r3, r28
-/* 802E1A30  4B FF FF 6D */	bl getGamePad__10JUTGamePadFi
-/* 802E1A34  7C 64 1B 79 */	or. r4, r3, r3
-/* 802E1A38  41 82 00 10 */	beq lbl_802E1A48
-/* 802E1A3C  38 64 00 68 */	addi r3, r4, 0x68
-/* 802E1A40  A8 84 00 7C */	lha r4, 0x7c(r4)
-/* 802E1A44  4B FF FF 05 */	bl stopPatternedRumble__Q210JUTGamePad7CRumbleFs
-lbl_802E1A48:
-/* 802E1A48  3B 9C 00 01 */	addi r28, r28, 1
-/* 802E1A4C  2C 1C 00 04 */	cmpwi r28, 4
-/* 802E1A50  3B FF 00 01 */	addi r31, r31, 1
-/* 802E1A54  3B DE 00 04 */	addi r30, r30, 4
-/* 802E1A58  41 80 FF AC */	blt lbl_802E1A04
-/* 802E1A5C  57 60 00 06 */	rlwinm r0, r27, 0, 0, 3
-/* 802E1A60  90 0D 8F 68 */	stw r0, mEnabled__Q210JUTGamePad7CRumble(r13)
-/* 802E1A64  39 61 00 20 */	addi r11, r1, 0x20
-/* 802E1A68  48 08 07 B9 */	bl _restgpr_27
-/* 802E1A6C  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 802E1A70  7C 08 03 A6 */	mtlr r0
-/* 802E1A74  38 21 00 20 */	addi r1, r1, 0x20
-/* 802E1A78  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/setRepeat__Q210JUTGamePad7CButtonFUlUlUl.s b/asm/JSystem/JUtility/JUTGamePad/setRepeat__Q210JUTGamePad7CButtonFUlUlUl.s
deleted file mode 100644
index a66d7617ac..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/setRepeat__Q210JUTGamePad7CButtonFUlUlUl.s
+++ /dev/null
@@ -1,8 +0,0 @@
-lbl_802E1A7C:
-/* 802E1A7C  38 00 00 00 */	li r0, 0
-/* 802E1A80  90 03 00 20 */	stw r0, 0x20(r3)
-/* 802E1A84  90 03 00 1C */	stw r0, 0x1c(r3)
-/* 802E1A88  90 83 00 24 */	stw r4, 0x24(r3)
-/* 802E1A8C  90 A3 00 28 */	stw r5, 0x28(r3)
-/* 802E1A90  90 C3 00 2C */	stw r6, 0x2c(r3)
-/* 802E1A94  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/startMotor__Q210JUTGamePad7CRumbleFi.s b/asm/JSystem/JUtility/JUTGamePad/startMotor__Q210JUTGamePad7CRumbleFi.s
deleted file mode 100644
index 6084a77137..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/startMotor__Q210JUTGamePad7CRumbleFi.s
+++ /dev/null
@@ -1,24 +0,0 @@
-lbl_802E1634:
-/* 802E1634  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802E1638  7C 08 02 A6 */	mflr r0
-/* 802E163C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802E1640  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802E1644  7C 7F 1B 78 */	mr r31, r3
-/* 802E1648  80 AD 8F 68 */	lwz r5, mEnabled__Q210JUTGamePad7CRumble(r13)
-/* 802E164C  54 60 10 3A */	slwi r0, r3, 2
-/* 802E1650  3C 80 80 3D */	lis r4, sChannelMask__Q210JUTGamePad7CRumble@ha /* 0x803CC5F0@ha */
-/* 802E1654  38 84 C5 F0 */	addi r4, r4, sChannelMask__Q210JUTGamePad7CRumble@l /* 0x803CC5F0@l */
-/* 802E1658  7C 04 00 2E */	lwzx r0, r4, r0
-/* 802E165C  7C A0 00 39 */	and. r0, r5, r0
-/* 802E1660  41 82 00 18 */	beq lbl_802E1678
-/* 802E1664  38 80 00 01 */	li r4, 1
-/* 802E1668  48 06 DB 39 */	bl PADControlMotor
-/* 802E166C  38 00 00 01 */	li r0, 1
-/* 802E1670  38 6D 8F 64 */	la r3, mStatus__Q210JUTGamePad7CRumble(r13) /* 804514E4-_SDA_BASE_ */
-/* 802E1674  7C 03 F9 AE */	stbx r0, r3, r31
-lbl_802E1678:
-/* 802E1678  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802E167C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802E1680  7C 08 03 A6 */	mtlr r0
-/* 802E1684  38 21 00 10 */	addi r1, r1, 0x10
-/* 802E1688  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/stopMotor__Q210JUTGamePad7CRumbleFib.s b/asm/JSystem/JUtility/JUTGamePad/stopMotor__Q210JUTGamePad7CRumbleFib.s
deleted file mode 100644
index ce8248e888..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/stopMotor__Q210JUTGamePad7CRumbleFib.s
+++ /dev/null
@@ -1,29 +0,0 @@
-lbl_802E168C:
-/* 802E168C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802E1690  7C 08 02 A6 */	mflr r0
-/* 802E1694  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802E1698  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802E169C  7C 7F 1B 78 */	mr r31, r3
-/* 802E16A0  80 CD 8F 68 */	lwz r6, mEnabled__Q210JUTGamePad7CRumble(r13)
-/* 802E16A4  54 60 10 3A */	slwi r0, r3, 2
-/* 802E16A8  3C A0 80 3D */	lis r5, sChannelMask__Q210JUTGamePad7CRumble@ha /* 0x803CC5F0@ha */
-/* 802E16AC  38 A5 C5 F0 */	addi r5, r5, sChannelMask__Q210JUTGamePad7CRumble@l /* 0x803CC5F0@l */
-/* 802E16B0  7C 05 00 2E */	lwzx r0, r5, r0
-/* 802E16B4  7C C0 00 39 */	and. r0, r6, r0
-/* 802E16B8  41 82 00 2C */	beq lbl_802E16E4
-/* 802E16BC  54 80 06 3E */	clrlwi r0, r4, 0x18
-/* 802E16C0  20 00 00 00 */	subfic r0, r0, 0
-/* 802E16C4  7C 80 01 10 */	subfe r4, r0, r0
-/* 802E16C8  38 00 00 02 */	li r0, 2
-/* 802E16CC  7C 00 20 38 */	and r0, r0, r4
-/* 802E16D0  54 04 06 3E */	clrlwi r4, r0, 0x18
-/* 802E16D4  48 06 DA CD */	bl PADControlMotor
-/* 802E16D8  38 00 00 00 */	li r0, 0
-/* 802E16DC  38 6D 8F 64 */	la r3, mStatus__Q210JUTGamePad7CRumble(r13) /* 804514E4-_SDA_BASE_ */
-/* 802E16E0  7C 03 F9 AE */	stbx r0, r3, r31
-lbl_802E16E4:
-/* 802E16E4  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802E16E8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802E16EC  7C 08 03 A6 */	mtlr r0
-/* 802E16F0  38 21 00 10 */	addi r1, r1, 0x10
-/* 802E16F4  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/stopPatternedRumble__Q210JUTGamePad7CRumbleFs.s b/asm/JSystem/JUtility/JUTGamePad/stopPatternedRumble__Q210JUTGamePad7CRumbleFs.s
deleted file mode 100644
index 5fb61d0d0e..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/stopPatternedRumble__Q210JUTGamePad7CRumbleFs.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_802E1948:
-/* 802E1948  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802E194C  7C 08 02 A6 */	mflr r0
-/* 802E1950  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802E1954  38 00 00 00 */	li r0, 0
-/* 802E1958  90 03 00 04 */	stw r0, 4(r3)
-/* 802E195C  7C 83 07 34 */	extsh r3, r4
-/* 802E1960  38 80 00 01 */	li r4, 1
-/* 802E1964  4B FF FD 29 */	bl stopMotor__Q210JUTGamePad7CRumbleFib
-/* 802E1968  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802E196C  7C 08 03 A6 */	mtlr r0
-/* 802E1970  38 21 00 10 */	addi r1, r1, 0x10
-/* 802E1974  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/triggerPatternedRumble__Q210JUTGamePad7CRumbleFUl.s b/asm/JSystem/JUtility/JUTGamePad/triggerPatternedRumble__Q210JUTGamePad7CRumbleFUl.s
deleted file mode 100644
index 20e7d69edf..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/triggerPatternedRumble__Q210JUTGamePad7CRumbleFUl.s
+++ /dev/null
@@ -1,11 +0,0 @@
-lbl_802E18A4:
-/* 802E18A4  80 03 00 08 */	lwz r0, 8(r3)
-/* 802E18A8  28 00 00 00 */	cmplwi r0, 0
-/* 802E18AC  4D 82 00 20 */	beqlr 
-/* 802E18B0  80 03 00 0C */	lwz r0, 0xc(r3)
-/* 802E18B4  28 00 00 00 */	cmplwi r0, 0
-/* 802E18B8  4D 82 00 20 */	beqlr 
-/* 802E18BC  90 83 00 04 */	stw r4, 4(r3)
-/* 802E18C0  38 00 00 00 */	li r0, 0
-/* 802E18C4  90 03 00 00 */	stw r0, 0(r3)
-/* 802E18C8  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/JUtility/JUTGamePad/update__Q210JUTGamePad7CButtonFPC9PADStatusUl.s b/asm/JSystem/JUtility/JUTGamePad/update__Q210JUTGamePad7CButtonFPC9PADStatusUl.s
deleted file mode 100644
index efd68e2e7d..0000000000
--- a/asm/JSystem/JUtility/JUTGamePad/update__Q210JUTGamePad7CButtonFPC9PADStatusUl.s
+++ /dev/null
@@ -1,109 +0,0 @@
-lbl_802E108C:
-/* 802E108C  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 802E1090  28 04 00 00 */	cmplwi r4, 0
-/* 802E1094  41 82 00 0C */	beq lbl_802E10A0
-/* 802E1098  A0 04 00 00 */	lhz r0, 0(r4)
-/* 802E109C  48 00 00 08 */	b lbl_802E10A4
-lbl_802E10A0:
-/* 802E10A0  38 00 00 00 */	li r0, 0
-lbl_802E10A4:
-/* 802E10A4  7C A7 03 78 */	or r7, r5, r0
-/* 802E10A8  38 A0 00 00 */	li r5, 0
-/* 802E10AC  90 A3 00 18 */	stw r5, 0x18(r3)
-/* 802E10B0  80 03 00 28 */	lwz r0, 0x28(r3)
-/* 802E10B4  28 00 00 00 */	cmplwi r0, 0
-/* 802E10B8  41 82 00 8C */	beq lbl_802E1144
-/* 802E10BC  80 03 00 24 */	lwz r0, 0x24(r3)
-/* 802E10C0  28 00 00 00 */	cmplwi r0, 0
-/* 802E10C4  41 82 00 80 */	beq lbl_802E1144
-/* 802E10C8  7C E8 00 39 */	and. r8, r7, r0
-/* 802E10CC  90 A3 00 18 */	stw r5, 0x18(r3)
-/* 802E10D0  40 82 00 10 */	bne lbl_802E10E0
-/* 802E10D4  90 A3 00 20 */	stw r5, 0x20(r3)
-/* 802E10D8  90 A3 00 1C */	stw r5, 0x1c(r3)
-/* 802E10DC  48 00 00 68 */	b lbl_802E1144
-lbl_802E10E0:
-/* 802E10E0  80 C3 00 20 */	lwz r6, 0x20(r3)
-/* 802E10E4  7C 06 40 40 */	cmplw r6, r8
-/* 802E10E8  40 82 00 44 */	bne lbl_802E112C
-/* 802E10EC  80 A3 00 1C */	lwz r5, 0x1c(r3)
-/* 802E10F0  38 05 00 01 */	addi r0, r5, 1
-/* 802E10F4  90 03 00 1C */	stw r0, 0x1c(r3)
-/* 802E10F8  80 A3 00 1C */	lwz r5, 0x1c(r3)
-/* 802E10FC  80 03 00 28 */	lwz r0, 0x28(r3)
-/* 802E1100  7C 05 00 40 */	cmplw r5, r0
-/* 802E1104  41 82 00 20 */	beq lbl_802E1124
-/* 802E1108  40 81 00 3C */	ble lbl_802E1144
-/* 802E110C  7C C0 28 50 */	subf r6, r0, r5
-/* 802E1110  80 A3 00 2C */	lwz r5, 0x2c(r3)
-/* 802E1114  7C 06 2B 96 */	divwu r0, r6, r5
-/* 802E1118  7C 00 29 D6 */	mullw r0, r0, r5
-/* 802E111C  7C 00 30 51 */	subf. r0, r0, r6
-/* 802E1120  40 82 00 24 */	bne lbl_802E1144
-lbl_802E1124:
-/* 802E1124  91 03 00 18 */	stw r8, 0x18(r3)
-/* 802E1128  48 00 00 1C */	b lbl_802E1144
-lbl_802E112C:
-/* 802E112C  38 00 FF FF */	li r0, -1
-/* 802E1130  7C C0 02 78 */	xor r0, r6, r0
-/* 802E1134  7D 00 00 38 */	and r0, r8, r0
-/* 802E1138  90 03 00 18 */	stw r0, 0x18(r3)
-/* 802E113C  91 03 00 20 */	stw r8, 0x20(r3)
-/* 802E1140  90 A3 00 1C */	stw r5, 0x1c(r3)
-lbl_802E1144:
-/* 802E1144  80 03 00 00 */	lwz r0, 0(r3)
-/* 802E1148  7C E0 02 78 */	xor r0, r7, r0
-/* 802E114C  7C E0 00 38 */	and r0, r7, r0
-/* 802E1150  90 03 00 04 */	stw r0, 4(r3)
-/* 802E1154  80 A3 00 00 */	lwz r5, 0(r3)
-/* 802E1158  7C E0 2A 78 */	xor r0, r7, r5
-/* 802E115C  7C A0 00 38 */	and r0, r5, r0
-/* 802E1160  90 03 00 08 */	stw r0, 8(r3)
-/* 802E1164  90 E3 00 00 */	stw r7, 0(r3)
-/* 802E1168  80 C3 00 18 */	lwz r6, 0x18(r3)
-/* 802E116C  80 A3 00 24 */	lwz r5, 0x24(r3)
-/* 802E1170  38 00 FF FF */	li r0, -1
-/* 802E1174  7C A5 02 78 */	xor r5, r5, r0
-/* 802E1178  80 03 00 04 */	lwz r0, 4(r3)
-/* 802E117C  7C A0 00 38 */	and r0, r5, r0
-/* 802E1180  7C C0 03 78 */	or r0, r6, r0
-/* 802E1184  90 03 00 18 */	stw r0, 0x18(r3)
-/* 802E1188  28 04 00 00 */	cmplwi r4, 0
-/* 802E118C  41 82 00 28 */	beq lbl_802E11B4
-/* 802E1190  88 04 00 08 */	lbz r0, 8(r4)
-/* 802E1194  98 03 00 0C */	stb r0, 0xc(r3)
-/* 802E1198  88 04 00 09 */	lbz r0, 9(r4)
-/* 802E119C  98 03 00 0D */	stb r0, 0xd(r3)
-/* 802E11A0  88 04 00 06 */	lbz r0, 6(r4)
-/* 802E11A4  98 03 00 0E */	stb r0, 0xe(r3)
-/* 802E11A8  88 04 00 07 */	lbz r0, 7(r4)
-/* 802E11AC  98 03 00 0F */	stb r0, 0xf(r3)
-/* 802E11B0  48 00 00 18 */	b lbl_802E11C8
-lbl_802E11B4:
-/* 802E11B4  38 00 00 00 */	li r0, 0
-/* 802E11B8  98 03 00 0C */	stb r0, 0xc(r3)
-/* 802E11BC  98 03 00 0D */	stb r0, 0xd(r3)
-/* 802E11C0  98 03 00 0E */	stb r0, 0xe(r3)
-/* 802E11C4  98 03 00 0F */	stb r0, 0xf(r3)
-lbl_802E11C8:
-/* 802E11C8  88 03 00 0E */	lbz r0, 0xe(r3)
-/* 802E11CC  C8 42 C6 20 */	lfd f2, lit_1050(r2)
-/* 802E11D0  6C 00 80 00 */	xoris r0, r0, 0x8000
-/* 802E11D4  90 01 00 0C */	stw r0, 0xc(r1)
-/* 802E11D8  3C 80 43 30 */	lis r4, 0x4330
-/* 802E11DC  90 81 00 08 */	stw r4, 8(r1)
-/* 802E11E0  C8 01 00 08 */	lfd f0, 8(r1)
-/* 802E11E4  EC 00 10 28 */	fsubs f0, f0, f2
-/* 802E11E8  C0 22 C6 18 */	lfs f1, lit_1047(r2)
-/* 802E11EC  EC 00 08 24 */	fdivs f0, f0, f1
-/* 802E11F0  D0 03 00 10 */	stfs f0, 0x10(r3)
-/* 802E11F4  88 03 00 0F */	lbz r0, 0xf(r3)
-/* 802E11F8  6C 00 80 00 */	xoris r0, r0, 0x8000
-/* 802E11FC  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802E1200  90 81 00 10 */	stw r4, 0x10(r1)
-/* 802E1204  C8 01 00 10 */	lfd f0, 0x10(r1)
-/* 802E1208  EC 00 10 28 */	fsubs f0, f0, f2
-/* 802E120C  EC 00 08 24 */	fdivs f0, f0, f1
-/* 802E1210  D0 03 00 14 */	stfs f0, 0x14(r3)
-/* 802E1214  38 21 00 20 */	addi r1, r1, 0x20
-/* 802E1218  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_alink/cancelHookshotCarry__9daAlink_cFv.s b/asm/d/a/d_a_alink/cancelHookshotCarry__9daAlink_cFv.s
deleted file mode 100644
index 4978cf8221..0000000000
--- a/asm/d/a/d_a_alink/cancelHookshotCarry__9daAlink_cFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_80108828:
-/* 80108828  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8010882C  7C 08 02 A6 */	mflr r0
-/* 80108830  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80108834  80 83 28 50 */	lwz r4, 0x2850(r3)
-/* 80108838  28 04 00 00 */	cmplwi r4, 0
-/* 8010883C  41 82 00 18 */	beq lbl_80108854
-/* 80108840  80 04 04 9C */	lwz r0, 0x49c(r4)
-/* 80108844  54 00 03 14 */	rlwinm r0, r0, 0, 0xc, 0xa
-/* 80108848  90 04 04 9C */	stw r0, 0x49c(r4)
-/* 8010884C  38 63 28 4C */	addi r3, r3, 0x284c
-/* 80108850  48 05 64 AD */	bl clearData__16daPy_actorKeep_cFv
-lbl_80108854:
-/* 80108854  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80108858  7C 08 03 A6 */	mtlr r0
-/* 8010885C  38 21 00 10 */	addi r1, r1, 0x10
-/* 80108860  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_alink/cancelHookshotShot__9daAlink_cFv.s b/asm/d/a/d_a_alink/cancelHookshotShot__9daAlink_cFv.s
deleted file mode 100644
index d706720e0e..0000000000
--- a/asm/d/a/d_a_alink/cancelHookshotShot__9daAlink_cFv.s
+++ /dev/null
@@ -1,33 +0,0 @@
-lbl_80108EEC:
-/* 80108EEC  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80108EF0  7C 08 02 A6 */	mflr r0
-/* 80108EF4  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80108EF8  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80108EFC  7C 7F 1B 78 */	mr r31, r3
-/* 80108F00  A0 63 2F DC */	lhz r3, 0x2fdc(r3)
-/* 80108F04  48 05 5C B5 */	bl checkHookshotItem__9daPy_py_cFi
-/* 80108F08  2C 03 00 00 */	cmpwi r3, 0
-/* 80108F0C  41 82 00 44 */	beq lbl_80108F50
-/* 80108F10  A8 1F 30 1A */	lha r0, 0x301a(r31)
-/* 80108F14  2C 00 00 03 */	cmpwi r0, 3
-/* 80108F18  41 82 00 14 */	beq lbl_80108F2C
-/* 80108F1C  2C 00 00 05 */	cmpwi r0, 5
-/* 80108F20  41 82 00 0C */	beq lbl_80108F2C
-/* 80108F24  2C 00 00 04 */	cmpwi r0, 4
-/* 80108F28  40 82 00 28 */	bne lbl_80108F50
-lbl_80108F2C:
-/* 80108F2C  A0 1F 2F E8 */	lhz r0, 0x2fe8(r31)
-/* 80108F30  28 00 00 C5 */	cmplwi r0, 0xc5
-/* 80108F34  41 82 00 1C */	beq lbl_80108F50
-/* 80108F38  28 00 00 C6 */	cmplwi r0, 0xc6
-/* 80108F3C  41 82 00 14 */	beq lbl_80108F50
-/* 80108F40  28 00 00 C4 */	cmplwi r0, 0xc4
-/* 80108F44  41 82 00 0C */	beq lbl_80108F50
-/* 80108F48  38 00 00 06 */	li r0, 6
-/* 80108F4C  B0 1F 30 1A */	sth r0, 0x301a(r31)
-lbl_80108F50:
-/* 80108F50  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80108F54  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80108F58  7C 08 03 A6 */	mtlr r0
-/* 80108F5C  38 21 00 10 */	addi r1, r1, 0x10
-/* 80108F60  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_alink/changeHookshotDrawModel__9daAlink_cFv.s b/asm/d/a/d_a_alink/changeHookshotDrawModel__9daAlink_cFv.s
deleted file mode 100644
index e45da4f175..0000000000
--- a/asm/d/a/d_a_alink/changeHookshotDrawModel__9daAlink_cFv.s
+++ /dev/null
@@ -1,16 +0,0 @@
-lbl_80108864:
-/* 80108864  A0 03 2F DC */	lhz r0, 0x2fdc(r3)
-/* 80108868  28 00 00 44 */	cmplwi r0, 0x44
-/* 8010886C  4C 82 00 20 */	bnelr 
-/* 80108870  A8 03 30 20 */	lha r0, 0x3020(r3)
-/* 80108874  2C 00 00 01 */	cmpwi r0, 1
-/* 80108878  4C 82 00 20 */	bnelr 
-/* 8010887C  80 83 07 08 */	lwz r4, 0x708(r3)
-/* 80108880  80 03 07 10 */	lwz r0, 0x710(r3)
-/* 80108884  90 03 07 08 */	stw r0, 0x708(r3)
-/* 80108888  90 83 07 10 */	stw r4, 0x710(r3)
-/* 8010888C  80 83 07 0C */	lwz r4, 0x70c(r3)
-/* 80108890  80 03 07 14 */	lwz r0, 0x714(r3)
-/* 80108894  90 03 07 0C */	stw r0, 0x70c(r3)
-/* 80108898  90 83 07 14 */	stw r4, 0x714(r3)
-/* 8010889C  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_alink/checkBossOctaIealRoom__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkBossOctaIealRoom__9daAlink_cFv.s
deleted file mode 100644
index ff023d0745..0000000000
--- a/asm/d/a/d_a_alink/checkBossOctaIealRoom__9daAlink_cFv.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_801089E8:
-/* 801089E8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 801089EC  7C 08 02 A6 */	mflr r0
-/* 801089F0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 801089F4  3C 60 80 39 */	lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */
-/* 801089F8  38 63 20 94 */	addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */
-/* 801089FC  38 63 00 8E */	addi r3, r3, 0x8e
-/* 80108A00  4B F9 50 61 */	bl checkStageName__9daAlink_cFPCc
-/* 80108A04  54 63 06 3E */	clrlwi r3, r3, 0x18
-/* 80108A08  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80108A0C  7C 08 03 A6 */	mtlr r0
-/* 80108A10  38 21 00 10 */	addi r1, r1, 0x10
-/* 80108A14  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_alink/checkChaseHookshot__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkChaseHookshot__9daAlink_cFv.s
deleted file mode 100644
index 068f6e2442..0000000000
--- a/asm/d/a/d_a_alink/checkChaseHookshot__9daAlink_cFv.s
+++ /dev/null
@@ -1,54 +0,0 @@
-lbl_801088C8:
-/* 801088C8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 801088CC  7C 08 02 A6 */	mflr r0
-/* 801088D0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 801088D4  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 801088D8  93 C1 00 08 */	stw r30, 8(r1)
-/* 801088DC  80 83 28 04 */	lwz r4, 0x2804(r3)
-/* 801088E0  28 04 00 00 */	cmplwi r4, 0
-/* 801088E4  40 82 00 20 */	bne lbl_80108904
-/* 801088E8  80 03 27 EC */	lwz r0, 0x27ec(r3)
-/* 801088EC  28 00 00 00 */	cmplwi r0, 0
-/* 801088F0  41 82 00 0C */	beq lbl_801088FC
-/* 801088F4  90 03 28 04 */	stw r0, 0x2804(r3)
-/* 801088F8  48 00 00 1C */	b lbl_80108914
-lbl_801088FC:
-/* 801088FC  90 63 28 04 */	stw r3, 0x2804(r3)
-/* 80108900  48 00 00 14 */	b lbl_80108914
-lbl_80108904:
-/* 80108904  80 03 27 EC */	lwz r0, 0x27ec(r3)
-/* 80108908  7C 04 00 40 */	cmplw r4, r0
-/* 8010890C  41 82 00 08 */	beq lbl_80108914
-/* 80108910  90 63 28 04 */	stw r3, 0x2804(r3)
-lbl_80108914:
-/* 80108914  80 83 27 EC */	lwz r4, 0x27ec(r3)
-/* 80108918  28 04 00 00 */	cmplwi r4, 0
-/* 8010891C  41 82 00 48 */	beq lbl_80108964
-/* 80108920  AB C4 00 08 */	lha r30, 8(r4)
-/* 80108924  3B E0 00 00 */	li r31, 0
-/* 80108928  80 03 28 04 */	lwz r0, 0x2804(r3)
-/* 8010892C  7C 00 20 40 */	cmplw r0, r4
-/* 80108930  40 82 00 2C */	bne lbl_8010895C
-/* 80108934  48 00 00 B5 */	bl checkBossOctaIealRoom__9daAlink_cFv
-/* 80108938  2C 03 00 00 */	cmpwi r3, 0
-/* 8010893C  40 82 00 1C */	bne lbl_80108958
-/* 80108940  2C 1E 00 AA */	cmpwi r30, 0xaa
-/* 80108944  41 82 00 14 */	beq lbl_80108958
-/* 80108948  2C 1E 00 F7 */	cmpwi r30, 0xf7
-/* 8010894C  41 82 00 0C */	beq lbl_80108958
-/* 80108950  2C 1E 00 E4 */	cmpwi r30, 0xe4
-/* 80108954  40 82 00 08 */	bne lbl_8010895C
-lbl_80108958:
-/* 80108958  3B E0 00 01 */	li r31, 1
-lbl_8010895C:
-/* 8010895C  57 E3 06 3E */	clrlwi r3, r31, 0x18
-/* 80108960  48 00 00 08 */	b lbl_80108968
-lbl_80108964:
-/* 80108964  38 60 00 00 */	li r3, 0
-lbl_80108968:
-/* 80108968  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 8010896C  83 C1 00 08 */	lwz r30, 8(r1)
-/* 80108970  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80108974  7C 08 03 A6 */	mtlr r0
-/* 80108978  38 21 00 10 */	addi r1, r1, 0x10
-/* 8010897C  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_alink/checkHookshotReturnMode__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkHookshotReturnMode__9daAlink_cCFv.s
deleted file mode 100644
index 0e27d93410..0000000000
--- a/asm/d/a/d_a_alink/checkHookshotReturnMode__9daAlink_cCFv.s
+++ /dev/null
@@ -1,29 +0,0 @@
-lbl_80108600:
-/* 80108600  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80108604  7C 08 02 A6 */	mflr r0
-/* 80108608  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8010860C  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80108610  93 C1 00 08 */	stw r30, 8(r1)
-/* 80108614  7C 7E 1B 78 */	mr r30, r3
-/* 80108618  3B E0 00 00 */	li r31, 0
-/* 8010861C  A0 63 2F DC */	lhz r3, 0x2fdc(r3)
-/* 80108620  48 05 65 99 */	bl checkHookshotItem__9daPy_py_cFi
-/* 80108624  2C 03 00 00 */	cmpwi r3, 0
-/* 80108628  41 82 00 24 */	beq lbl_8010864C
-/* 8010862C  A8 1E 30 1A */	lha r0, 0x301a(r30)
-/* 80108630  2C 00 00 04 */	cmpwi r0, 4
-/* 80108634  41 82 00 14 */	beq lbl_80108648
-/* 80108638  2C 00 00 05 */	cmpwi r0, 5
-/* 8010863C  41 82 00 0C */	beq lbl_80108648
-/* 80108640  2C 00 00 06 */	cmpwi r0, 6
-/* 80108644  40 82 00 08 */	bne lbl_8010864C
-lbl_80108648:
-/* 80108648  3B E0 00 01 */	li r31, 1
-lbl_8010864C:
-/* 8010864C  7F E3 FB 78 */	mr r3, r31
-/* 80108650  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80108654  83 C1 00 08 */	lwz r30, 8(r1)
-/* 80108658  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8010865C  7C 08 03 A6 */	mtlr r0
-/* 80108660  38 21 00 10 */	addi r1, r1, 0x10
-/* 80108664  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_alink/checkHookshotRoofLv7Boss__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkHookshotRoofLv7Boss__9daAlink_cFv.s
deleted file mode 100644
index dc2ff44379..0000000000
--- a/asm/d/a/d_a_alink/checkHookshotRoofLv7Boss__9daAlink_cFv.s
+++ /dev/null
@@ -1,12 +0,0 @@
-lbl_801088A0:
-/* 801088A0  38 00 00 00 */	li r0, 0
-/* 801088A4  80 63 28 58 */	lwz r3, 0x2858(r3)
-/* 801088A8  28 03 00 00 */	cmplwi r3, 0
-/* 801088AC  41 82 00 14 */	beq lbl_801088C0
-/* 801088B0  A8 63 00 08 */	lha r3, 8(r3)
-/* 801088B4  2C 03 00 F7 */	cmpwi r3, 0xf7
-/* 801088B8  40 82 00 08 */	bne lbl_801088C0
-/* 801088BC  38 00 00 01 */	li r0, 1
-lbl_801088C0:
-/* 801088C0  54 03 06 3E */	clrlwi r3, r0, 0x18
-/* 801088C4  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_alink/checkHookshotShootReturnMode__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkHookshotShootReturnMode__9daAlink_cCFv.s
deleted file mode 100644
index e800900b8e..0000000000
--- a/asm/d/a/d_a_alink/checkHookshotShootReturnMode__9daAlink_cCFv.s
+++ /dev/null
@@ -1,33 +0,0 @@
-lbl_80108668:
-/* 80108668  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8010866C  7C 08 02 A6 */	mflr r0
-/* 80108670  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80108674  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80108678  93 C1 00 08 */	stw r30, 8(r1)
-/* 8010867C  7C 7E 1B 78 */	mr r30, r3
-/* 80108680  3B E0 00 00 */	li r31, 0
-/* 80108684  A0 63 2F DC */	lhz r3, 0x2fdc(r3)
-/* 80108688  48 05 65 31 */	bl checkHookshotItem__9daPy_py_cFi
-/* 8010868C  2C 03 00 00 */	cmpwi r3, 0
-/* 80108690  41 82 00 10 */	beq lbl_801086A0
-/* 80108694  A8 1E 30 1A */	lha r0, 0x301a(r30)
-/* 80108698  2C 00 00 03 */	cmpwi r0, 3
-/* 8010869C  41 82 00 20 */	beq lbl_801086BC
-lbl_801086A0:
-/* 801086A0  7F C3 F3 78 */	mr r3, r30
-/* 801086A4  81 9E 06 28 */	lwz r12, 0x628(r30)
-/* 801086A8  81 8C 02 4C */	lwz r12, 0x24c(r12)
-/* 801086AC  7D 89 03 A6 */	mtctr r12
-/* 801086B0  4E 80 04 21 */	bctrl 
-/* 801086B4  54 60 06 3F */	clrlwi. r0, r3, 0x18
-/* 801086B8  41 82 00 08 */	beq lbl_801086C0
-lbl_801086BC:
-/* 801086BC  3B E0 00 01 */	li r31, 1
-lbl_801086C0:
-/* 801086C0  7F E3 FB 78 */	mr r3, r31
-/* 801086C4  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 801086C8  83 C1 00 08 */	lwz r30, 8(r1)
-/* 801086CC  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 801086D0  7C 08 03 A6 */	mtlr r0
-/* 801086D4  38 21 00 10 */	addi r1, r1, 0x10
-/* 801086D8  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_alink/checkHookshotStickBG__9daAlink_cFR13cBgS_PolyInfo.s b/asm/d/a/d_a_alink/checkHookshotStickBG__9daAlink_cFR13cBgS_PolyInfo.s
deleted file mode 100644
index c3919084f8..0000000000
--- a/asm/d/a/d_a_alink/checkHookshotStickBG__9daAlink_cFR13cBgS_PolyInfo.s
+++ /dev/null
@@ -1,33 +0,0 @@
-lbl_801087B0:
-/* 801087B0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 801087B4  7C 08 02 A6 */	mflr r0
-/* 801087B8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 801087BC  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 801087C0  93 C1 00 08 */	stw r30, 8(r1)
-/* 801087C4  7C 9E 23 78 */	mr r30, r4
-/* 801087C8  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 801087CC  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 801087D0  3B E3 0F 38 */	addi r31, r3, 0xf38
-/* 801087D4  7F E3 FB 78 */	mr r3, r31
-/* 801087D8  4B F6 CA 21 */	bl ChkPolyHSStick__4dBgSFRC13cBgS_PolyInfo
-/* 801087DC  28 03 00 00 */	cmplwi r3, 0
-/* 801087E0  41 82 00 2C */	beq lbl_8010880C
-/* 801087E4  7F E3 FB 78 */	mr r3, r31
-/* 801087E8  7F C4 F3 78 */	mr r4, r30
-/* 801087EC  4B F6 BE 3D */	bl GetBgWBasePointer__4cBgSCFRC13cBgS_PolyInfo
-/* 801087F0  28 03 00 00 */	cmplwi r3, 0
-/* 801087F4  41 82 00 18 */	beq lbl_8010880C
-/* 801087F8  88 03 00 14 */	lbz r0, 0x14(r3)
-/* 801087FC  28 00 00 00 */	cmplwi r0, 0
-/* 80108800  41 82 00 0C */	beq lbl_8010880C
-/* 80108804  38 60 00 01 */	li r3, 1
-/* 80108808  48 00 00 08 */	b lbl_80108810
-lbl_8010880C:
-/* 8010880C  38 60 00 00 */	li r3, 0
-lbl_80108810:
-/* 80108810  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80108814  83 C1 00 08 */	lwz r30, 8(r1)
-/* 80108818  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8010881C  7C 08 03 A6 */	mtlr r0
-/* 80108820  38 21 00 10 */	addi r1, r1, 0x10
-/* 80108824  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_alink/checkHookshotWait__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkHookshotWait__9daAlink_cCFv.s
deleted file mode 100644
index ff15c25db1..0000000000
--- a/asm/d/a/d_a_alink/checkHookshotWait__9daAlink_cCFv.s
+++ /dev/null
@@ -1,12 +0,0 @@
-lbl_80108A18:
-/* 80108A18  38 80 00 00 */	li r4, 0
-/* 80108A1C  A8 63 30 1A */	lha r3, 0x301a(r3)
-/* 80108A20  7C 60 07 35 */	extsh. r0, r3
-/* 80108A24  41 82 00 0C */	beq lbl_80108A30
-/* 80108A28  2C 03 00 01 */	cmpwi r3, 1
-/* 80108A2C  40 82 00 08 */	bne lbl_80108A34
-lbl_80108A30:
-/* 80108A30  38 80 00 01 */	li r4, 1
-lbl_80108A34:
-/* 80108A34  54 83 06 3E */	clrlwi r3, r4, 0x18
-/* 80108A38  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_alink/checkLv7BossRoom__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkLv7BossRoom__9daAlink_cFv.s
deleted file mode 100644
index 3a5eab469d..0000000000
--- a/asm/d/a/d_a_alink/checkLv7BossRoom__9daAlink_cFv.s
+++ /dev/null
@@ -1,12 +0,0 @@
-lbl_80108784:
-/* 80108784  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80108788  7C 08 02 A6 */	mflr r0
-/* 8010878C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80108790  3C 60 80 39 */	lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */
-/* 80108794  38 63 20 94 */	addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */
-/* 80108798  38 63 00 86 */	addi r3, r3, 0x86
-/* 8010879C  4B F9 52 C5 */	bl checkStageName__9daAlink_cFPCc
-/* 801087A0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 801087A4  7C 08 03 A6 */	mtlr r0
-/* 801087A8  38 21 00 10 */	addi r1, r1, 0x10
-/* 801087AC  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_alink/checkOctaIealSpecialCollect__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkOctaIealSpecialCollect__9daAlink_cFv.s
deleted file mode 100644
index 9f5a8b26fc..0000000000
--- a/asm/d/a/d_a_alink/checkOctaIealSpecialCollect__9daAlink_cFv.s
+++ /dev/null
@@ -1,28 +0,0 @@
-lbl_80108980:
-/* 80108980  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80108984  7C 08 02 A6 */	mflr r0
-/* 80108988  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8010898C  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80108990  93 C1 00 08 */	stw r30, 8(r1)
-/* 80108994  7C 7E 1B 78 */	mr r30, r3
-/* 80108998  3B E0 00 00 */	li r31, 0
-/* 8010899C  A0 03 2F E8 */	lhz r0, 0x2fe8(r3)
-/* 801089A0  28 00 00 C6 */	cmplwi r0, 0xc6
-/* 801089A4  40 82 00 28 */	bne lbl_801089CC
-/* 801089A8  A0 7E 2F DC */	lhz r3, 0x2fdc(r30)
-/* 801089AC  48 05 62 0D */	bl checkHookshotItem__9daPy_py_cFi
-/* 801089B0  2C 03 00 00 */	cmpwi r3, 0
-/* 801089B4  41 82 00 18 */	beq lbl_801089CC
-/* 801089B8  7F C3 F3 78 */	mr r3, r30
-/* 801089BC  48 00 00 2D */	bl checkBossOctaIealRoom__9daAlink_cFv
-/* 801089C0  2C 03 00 00 */	cmpwi r3, 0
-/* 801089C4  41 82 00 08 */	beq lbl_801089CC
-/* 801089C8  3B E0 00 01 */	li r31, 1
-lbl_801089CC:
-/* 801089CC  57 E3 06 3E */	clrlwi r3, r31, 0x18
-/* 801089D0  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 801089D4  83 C1 00 08 */	lwz r30, 8(r1)
-/* 801089D8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 801089DC  7C 08 03 A6 */	mtlr r0
-/* 801089E0  38 21 00 10 */	addi r1, r1, 0x10
-/* 801089E4  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_alink/daAlink_hookshotAtHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf.s b/asm/d/a/d_a_alink/daAlink_hookshotAtHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf.s
deleted file mode 100644
index b593690f4c..0000000000
--- a/asm/d/a/d_a_alink/daAlink_hookshotAtHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_8010859C:
-/* 8010859C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 801085A0  7C 08 02 A6 */	mflr r0
-/* 801085A4  90 01 00 14 */	stw r0, 0x14(r1)
-/* 801085A8  4B FF FE 21 */	bl hookshotAtHitCallBack__9daAlink_cFP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf
-/* 801085AC  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 801085B0  7C 08 03 A6 */	mtlr r0
-/* 801085B4  38 21 00 10 */	addi r1, r1, 0x10
-/* 801085B8  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_alink/getHookshotTopPos__9daAlink_cFv.s b/asm/d/a/d_a_alink/getHookshotTopPos__9daAlink_cFv.s
deleted file mode 100644
index 01e9493591..0000000000
--- a/asm/d/a/d_a_alink/getHookshotTopPos__9daAlink_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_801085BC:
-/* 801085BC  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 801085C0  7C 08 02 A6 */	mflr r0
-/* 801085C4  90 01 00 14 */	stw r0, 0x14(r1)
-/* 801085C8  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 801085CC  7C 7F 1B 78 */	mr r31, r3
-/* 801085D0  A0 63 2F DC */	lhz r3, 0x2fdc(r3)
-/* 801085D4  48 05 65 E5 */	bl checkHookshotItem__9daPy_py_cFi
-/* 801085D8  2C 03 00 00 */	cmpwi r3, 0
-/* 801085DC  41 82 00 0C */	beq lbl_801085E8
-/* 801085E0  38 7F 37 EC */	addi r3, r31, 0x37ec
-/* 801085E4  48 00 00 08 */	b lbl_801085EC
-lbl_801085E8:
-/* 801085E8  38 60 00 00 */	li r3, 0
-lbl_801085EC:
-/* 801085EC  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 801085F0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 801085F4  7C 08 03 A6 */	mtlr r0
-/* 801085F8  38 21 00 10 */	addi r1, r1, 0x10
-/* 801085FC  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_alink/resetHookshotMode__9daAlink_cFv.s b/asm/d/a/d_a_alink/resetHookshotMode__9daAlink_cFv.s
deleted file mode 100644
index de44699524..0000000000
--- a/asm/d/a/d_a_alink/resetHookshotMode__9daAlink_cFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_801086DC:
-/* 801086DC  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 801086E0  7C 08 02 A6 */	mflr r0
-/* 801086E4  90 01 00 14 */	stw r0, 0x14(r1)
-/* 801086E8  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 801086EC  7C 7F 1B 78 */	mr r31, r3
-/* 801086F0  38 00 00 00 */	li r0, 0
-/* 801086F4  B0 03 30 1A */	sth r0, 0x301a(r3)
-/* 801086F8  4B FA 33 E9 */	bl initLockAt__9daAlink_cFv
-/* 801086FC  3C 60 80 45 */	lis r3, __float_max@ha /* 0x80450AE8@ha */
-/* 80108700  C0 03 0A E8 */	lfs f0, __float_max@l(r3)  /* 0x80450AE8@l */
-/* 80108704  D0 1F 34 90 */	stfs f0, 0x3490(r31)
-/* 80108708  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 8010870C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80108710  7C 08 03 A6 */	mtlr r0
-/* 80108714  38 21 00 10 */	addi r1, r1, 0x10
-/* 80108718  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_alink/setEnemyBombHookshot__9daAlink_cFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/setEnemyBombHookshot__9daAlink_cFP10fopAc_ac_c.s
deleted file mode 100644
index e918eb1374..0000000000
--- a/asm/d/a/d_a_alink/setEnemyBombHookshot__9daAlink_cFP10fopAc_ac_c.s
+++ /dev/null
@@ -1,29 +0,0 @@
-lbl_8010871C:
-/* 8010871C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80108720  7C 08 02 A6 */	mflr r0
-/* 80108724  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80108728  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 8010872C  93 C1 00 08 */	stw r30, 8(r1)
-/* 80108730  7C 7E 1B 78 */	mr r30, r3
-/* 80108734  7C 9F 23 78 */	mr r31, r4
-/* 80108738  80 03 28 50 */	lwz r0, 0x2850(r3)
-/* 8010873C  28 00 00 00 */	cmplwi r0, 0
-/* 80108740  41 82 00 28 */	beq lbl_80108768
-/* 80108744  48 00 00 E5 */	bl cancelHookshotCarry__9daAlink_cFv
-/* 80108748  38 7E 28 4C */	addi r3, r30, 0x284c
-/* 8010874C  7F E4 FB 78 */	mr r4, r31
-/* 80108750  48 05 65 69 */	bl setData__16daPy_actorKeep_cFP10fopAc_ac_c
-/* 80108754  80 1F 04 9C */	lwz r0, 0x49c(r31)
-/* 80108758  64 00 00 10 */	oris r0, r0, 0x10
-/* 8010875C  90 1F 04 9C */	stw r0, 0x49c(r31)
-/* 80108760  38 60 00 01 */	li r3, 1
-/* 80108764  48 00 00 08 */	b lbl_8010876C
-lbl_80108768:
-/* 80108768  38 60 00 00 */	li r3, 0
-lbl_8010876C:
-/* 8010876C  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80108770  83 C1 00 08 */	lwz r30, 8(r1)
-/* 80108774  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80108778  7C 08 03 A6 */	mtlr r0
-/* 8010877C  38 21 00 10 */	addi r1, r1, 0x10
-/* 80108780  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_alink/setHookshotCarryOffset__9daAlink_cFUiPC4cXyz.s b/asm/d/a/d_a_alink/setHookshotCarryOffset__9daAlink_cFUiPC4cXyz.s
deleted file mode 100644
index 6bec931f9a..0000000000
--- a/asm/d/a/d_a_alink/setHookshotCarryOffset__9daAlink_cFUiPC4cXyz.s
+++ /dev/null
@@ -1,44 +0,0 @@
-lbl_80108A90:
-/* 80108A90  3C C0 80 40 */	lis r6, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80108A94  38 C6 61 C0 */	addi r6, r6, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80108A98  80 06 5F 1C */	lwz r0, 0x5f1c(r6)
-/* 80108A9C  54 00 03 DF */	rlwinm. r0, r0, 0, 0xf, 0xf
-/* 80108AA0  41 82 00 48 */	beq lbl_80108AE8
-/* 80108AA4  80 C3 28 58 */	lwz r6, 0x2858(r3)
-/* 80108AA8  28 06 00 00 */	cmplwi r6, 0
-/* 80108AAC  41 82 00 3C */	beq lbl_80108AE8
-/* 80108AB0  80 06 04 9C */	lwz r0, 0x49c(r6)
-/* 80108AB4  54 00 02 D7 */	rlwinm. r0, r0, 0, 0xb, 0xb
-/* 80108AB8  41 82 00 30 */	beq lbl_80108AE8
-/* 80108ABC  80 03 28 54 */	lwz r0, 0x2854(r3)
-/* 80108AC0  7C 04 00 40 */	cmplw r4, r0
-/* 80108AC4  40 82 00 24 */	bne lbl_80108AE8
-/* 80108AC8  C0 05 00 00 */	lfs f0, 0(r5)
-/* 80108ACC  D0 03 37 C8 */	stfs f0, 0x37c8(r3)
-/* 80108AD0  C0 05 00 04 */	lfs f0, 4(r5)
-/* 80108AD4  D0 03 37 CC */	stfs f0, 0x37cc(r3)
-/* 80108AD8  C0 05 00 08 */	lfs f0, 8(r5)
-/* 80108ADC  D0 03 37 D0 */	stfs f0, 0x37d0(r3)
-/* 80108AE0  38 60 00 01 */	li r3, 1
-/* 80108AE4  4E 80 00 20 */	blr 
-lbl_80108AE8:
-/* 80108AE8  80 C3 28 50 */	lwz r6, 0x2850(r3)
-/* 80108AEC  28 06 00 00 */	cmplwi r6, 0
-/* 80108AF0  41 82 00 3C */	beq lbl_80108B2C
-/* 80108AF4  80 06 04 9C */	lwz r0, 0x49c(r6)
-/* 80108AF8  54 00 02 D7 */	rlwinm. r0, r0, 0, 0xb, 0xb
-/* 80108AFC  41 82 00 30 */	beq lbl_80108B2C
-/* 80108B00  80 03 28 4C */	lwz r0, 0x284c(r3)
-/* 80108B04  7C 04 00 40 */	cmplw r4, r0
-/* 80108B08  40 82 00 24 */	bne lbl_80108B2C
-/* 80108B0C  C0 05 00 00 */	lfs f0, 0(r5)
-/* 80108B10  D0 03 37 F8 */	stfs f0, 0x37f8(r3)
-/* 80108B14  C0 05 00 04 */	lfs f0, 4(r5)
-/* 80108B18  D0 03 37 FC */	stfs f0, 0x37fc(r3)
-/* 80108B1C  C0 05 00 08 */	lfs f0, 8(r5)
-/* 80108B20  D0 03 38 00 */	stfs f0, 0x3800(r3)
-/* 80108B24  38 60 00 01 */	li r3, 1
-/* 80108B28  4E 80 00 20 */	blr 
-lbl_80108B2C:
-/* 80108B2C  38 60 00 00 */	li r3, 0
-/* 80108B30  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_alink/setHookshotModel__9daAlink_cFv.s b/asm/d/a/d_a_alink/setHookshotModel__9daAlink_cFv.s
deleted file mode 100644
index 1b205891af..0000000000
--- a/asm/d/a/d_a_alink/setHookshotModel__9daAlink_cFv.s
+++ /dev/null
@@ -1,165 +0,0 @@
-lbl_80108B34:
-/* 80108B34  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 80108B38  7C 08 02 A6 */	mflr r0
-/* 80108B3C  90 01 00 24 */	stw r0, 0x24(r1)
-/* 80108B40  39 61 00 20 */	addi r11, r1, 0x20
-/* 80108B44  48 25 96 99 */	bl _savegpr_29
-/* 80108B48  7C 7E 1B 78 */	mr r30, r3
-/* 80108B4C  38 7E 21 D8 */	addi r3, r30, 0x21d8
-/* 80108B50  38 80 01 7E */	li r4, 0x17e
-/* 80108B54  48 05 65 15 */	bl loadDataIdx__14daPy_anmHeap_cFUs
-/* 80108B58  7C 7D 1B 78 */	mr r29, r3
-/* 80108B5C  7F C3 F3 78 */	mr r3, r30
-/* 80108B60  4B F9 B1 2D */	bl setItemHeap__9daAlink_cFv
-/* 80108B64  7C 7F 1B 78 */	mr r31, r3
-/* 80108B68  38 7E 07 30 */	addi r3, r30, 0x730
-/* 80108B6C  7F A4 EB 78 */	mr r4, r29
-/* 80108B70  38 A0 00 00 */	li r5, 0
-/* 80108B74  38 C0 00 02 */	li r6, 2
-/* 80108B78  C0 22 92 B8 */	lfs f1, lit_6040(r2)
-/* 80108B7C  38 E0 00 00 */	li r7, 0
-/* 80108B80  39 00 FF FF */	li r8, -1
-/* 80108B84  39 20 00 00 */	li r9, 0
-/* 80108B88  4B F0 4C 55 */	bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb
-/* 80108B8C  7F C3 F3 78 */	mr r3, r30
-/* 80108B90  38 80 03 16 */	li r4, 0x316
-/* 80108B94  38 A0 5C 00 */	li r5, 0x5c00
-/* 80108B98  4B FB 72 B1 */	bl loadAramBmd__9daAlink_cFUsUl
-/* 80108B9C  7C 64 1B 78 */	mr r4, r3
-/* 80108BA0  7F C3 F3 78 */	mr r3, r30
-/* 80108BA4  3C A0 00 08 */	lis r5, 8
-/* 80108BA8  38 C0 00 00 */	li r6, 0
-/* 80108BAC  4B F9 B1 D1 */	bl initModel__9daAlink_cFP12J3DModelDataUlUl
-/* 80108BB0  90 7E 07 08 */	stw r3, 0x708(r30)
-/* 80108BB4  7F C3 F3 78 */	mr r3, r30
-/* 80108BB8  38 80 03 18 */	li r4, 0x318
-/* 80108BBC  38 A0 38 00 */	li r5, 0x3800
-/* 80108BC0  4B FB 72 89 */	bl loadAramBmd__9daAlink_cFUsUl
-/* 80108BC4  7C 64 1B 78 */	mr r4, r3
-/* 80108BC8  7F C3 F3 78 */	mr r3, r30
-/* 80108BCC  3C A0 00 08 */	lis r5, 8
-/* 80108BD0  38 C0 00 00 */	li r6, 0
-/* 80108BD4  4B F9 B1 A9 */	bl initModel__9daAlink_cFP12J3DModelDataUlUl
-/* 80108BD8  90 7E 07 0C */	stw r3, 0x70c(r30)
-/* 80108BDC  80 7E 07 08 */	lwz r3, 0x708(r30)
-/* 80108BE0  80 83 00 04 */	lwz r4, 4(r3)
-/* 80108BE4  7F C3 F3 78 */	mr r3, r30
-/* 80108BE8  3C A0 00 08 */	lis r5, 8
-/* 80108BEC  38 C0 00 00 */	li r6, 0
-/* 80108BF0  4B F9 B1 8D */	bl initModel__9daAlink_cFP12J3DModelDataUlUl
-/* 80108BF4  90 7E 07 10 */	stw r3, 0x710(r30)
-/* 80108BF8  80 7E 07 0C */	lwz r3, 0x70c(r30)
-/* 80108BFC  80 83 00 04 */	lwz r4, 4(r3)
-/* 80108C00  7F C3 F3 78 */	mr r3, r30
-/* 80108C04  3C A0 00 08 */	lis r5, 8
-/* 80108C08  38 C0 00 00 */	li r6, 0
-/* 80108C0C  4B F9 B1 71 */	bl initModel__9daAlink_cFP12J3DModelDataUlUl
-/* 80108C10  90 7E 07 14 */	stw r3, 0x714(r30)
-/* 80108C14  7F C3 F3 78 */	mr r3, r30
-/* 80108C18  38 80 03 17 */	li r4, 0x317
-/* 80108C1C  38 A0 10 00 */	li r5, 0x1000
-/* 80108C20  4B FB 72 29 */	bl loadAramBmd__9daAlink_cFUsUl
-/* 80108C24  90 7E 07 68 */	stw r3, 0x768(r30)
-/* 80108C28  38 60 00 10 */	li r3, 0x10
-/* 80108C2C  48 1C 60 21 */	bl __nw__FUl
-/* 80108C30  28 03 00 00 */	cmplwi r3, 0
-/* 80108C34  41 82 00 2C */	beq lbl_80108C60
-/* 80108C38  3C 80 80 3D */	lis r4, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 80108C3C  38 04 D9 7C */	addi r0, r4, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 80108C40  90 03 00 00 */	stw r0, 0(r3)
-/* 80108C44  38 00 00 00 */	li r0, 0
-/* 80108C48  90 03 00 04 */	stw r0, 4(r3)
-/* 80108C4C  90 03 00 08 */	stw r0, 8(r3)
-/* 80108C50  90 03 00 0C */	stw r0, 0xc(r3)
-/* 80108C54  3C 80 80 3B */	lis r4, __vt__Q29daAlink_c14hsChainShape_c@ha /* 0x803B35EC@ha */
-/* 80108C58  38 04 35 EC */	addi r0, r4, __vt__Q29daAlink_c14hsChainShape_c@l /* 0x803B35EC@l */
-/* 80108C5C  90 03 00 00 */	stw r0, 0(r3)
-lbl_80108C60:
-/* 80108C60  90 7E 07 70 */	stw r3, 0x770(r30)
-/* 80108C64  38 60 00 20 */	li r3, 0x20
-/* 80108C68  48 1C 5F E5 */	bl __nw__FUl
-/* 80108C6C  7C 60 1B 79 */	or. r0, r3, r3
-/* 80108C70  41 82 00 0C */	beq lbl_80108C7C
-/* 80108C74  48 1B 5B D1 */	bl __ct__16Z2SoundObjSimpleFv
-/* 80108C78  7C 60 1B 78 */	mr r0, r3
-lbl_80108C7C:
-/* 80108C7C  90 1E 07 6C */	stw r0, 0x76c(r30)
-/* 80108C80  38 60 00 70 */	li r3, 0x70
-/* 80108C84  48 1C 5F C9 */	bl __nw__FUl
-/* 80108C88  7C 60 1B 79 */	or. r0, r3, r3
-/* 80108C8C  41 82 00 0C */	beq lbl_80108C98
-/* 80108C90  4B F6 F2 CD */	bl __ct__14dBgS_ObjLinChkFv
-/* 80108C94  7C 60 1B 78 */	mr r0, r3
-lbl_80108C98:
-/* 80108C98  90 1E 07 7C */	stw r0, 0x77c(r30)
-/* 80108C9C  80 7E 07 7C */	lwz r3, 0x77c(r30)
-/* 80108CA0  80 03 00 6C */	lwz r0, 0x6c(r3)
-/* 80108CA4  54 00 00 3A */	rlwinm r0, r0, 0, 0, 0x1d
-/* 80108CA8  90 03 00 6C */	stw r0, 0x6c(r3)
-/* 80108CAC  80 7E 07 7C */	lwz r3, 0x77c(r30)
-/* 80108CB0  80 03 00 6C */	lwz r0, 0x6c(r3)
-/* 80108CB4  60 00 00 02 */	ori r0, r0, 2
-/* 80108CB8  90 03 00 6C */	stw r0, 0x6c(r3)
-/* 80108CBC  7F C3 F3 78 */	mr r3, r30
-/* 80108CC0  38 80 01 7F */	li r4, 0x17f
-/* 80108CC4  38 A0 08 00 */	li r5, 0x800
-/* 80108CC8  4B FB 72 3D */	bl loadAram__9daAlink_cFUsUl
-/* 80108CCC  7C 64 1B 78 */	mr r4, r3
-/* 80108CD0  38 7E 07 4C */	addi r3, r30, 0x74c
-/* 80108CD4  38 A0 00 00 */	li r5, 0
-/* 80108CD8  38 C0 00 02 */	li r6, 2
-/* 80108CDC  C0 22 92 B8 */	lfs f1, lit_6040(r2)
-/* 80108CE0  38 E0 00 00 */	li r7, 0
-/* 80108CE4  39 00 FF FF */	li r8, -1
-/* 80108CE8  39 20 00 00 */	li r9, 0
-/* 80108CEC  4B F0 4A F1 */	bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb
-/* 80108CF0  7F E3 FB 78 */	mr r3, r31
-/* 80108CF4  4B F0 64 D9 */	bl mDoExt_setCurrentHeap__FP7JKRHeap
-/* 80108CF8  7F C3 F3 78 */	mr r3, r30
-/* 80108CFC  4B FF F9 E1 */	bl resetHookshotMode__9daAlink_cFv
-/* 80108D00  80 7E 07 70 */	lwz r3, 0x770(r30)
-/* 80108D04  93 C3 00 0C */	stw r30, 0xc(r3)
-/* 80108D08  38 00 00 01 */	li r0, 1
-/* 80108D0C  98 1E 2F 94 */	stb r0, 0x2f94(r30)
-/* 80108D10  A0 1E 2F DC */	lhz r0, 0x2fdc(r30)
-/* 80108D14  28 00 00 47 */	cmplwi r0, 0x47
-/* 80108D18  40 82 00 0C */	bne lbl_80108D24
-/* 80108D1C  38 00 00 06 */	li r0, 6
-/* 80108D20  98 1E 2F 95 */	stb r0, 0x2f95(r30)
-lbl_80108D24:
-/* 80108D24  38 80 00 00 */	li r4, 0
-/* 80108D28  B0 9E 30 20 */	sth r4, 0x3020(r30)
-/* 80108D2C  B0 9E 30 24 */	sth r4, 0x3024(r30)
-/* 80108D30  98 9E 12 A3 */	stb r4, 0x12a3(r30)
-/* 80108D34  80 1E 12 84 */	lwz r0, 0x1284(r30)
-/* 80108D38  54 00 07 FA */	rlwinm r0, r0, 0, 0x1f, 0x1d
-/* 80108D3C  90 1E 12 84 */	stw r0, 0x1284(r30)
-/* 80108D40  98 9E 12 40 */	stb r4, 0x1240(r30)
-/* 80108D44  C0 02 93 3C */	lfs f0, lit_7808(r2)
-/* 80108D48  D0 1E 13 6C */	stfs f0, 0x136c(r30)
-/* 80108D4C  38 00 00 08 */	li r0, 8
-/* 80108D50  98 1E 12 A0 */	stb r0, 0x12a0(r30)
-/* 80108D54  38 00 40 00 */	li r0, 0x4000
-/* 80108D58  90 1E 12 3C */	stw r0, 0x123c(r30)
-/* 80108D5C  38 00 00 01 */	li r0, 1
-/* 80108D60  98 1E 12 A2 */	stb r0, 0x12a2(r30)
-/* 80108D64  80 1E 12 2C */	lwz r0, 0x122c(r30)
-/* 80108D68  60 00 00 01 */	ori r0, r0, 1
-/* 80108D6C  90 1E 12 2C */	stw r0, 0x122c(r30)
-/* 80108D70  3C 60 80 11 */	lis r3, daAlink_hookshotAtHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf@ha /* 0x8010859C@ha */
-/* 80108D74  38 03 85 9C */	addi r0, r3, daAlink_hookshotAtHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf@l /* 0x8010859C@l */
-/* 80108D78  90 1E 12 8C */	stw r0, 0x128c(r30)
-/* 80108D7C  98 9E 12 A1 */	stb r4, 0x12a1(r30)
-/* 80108D80  80 7E 07 6C */	lwz r3, 0x76c(r30)
-/* 80108D84  38 9E 37 EC */	addi r4, r30, 0x37ec
-/* 80108D88  38 A0 00 01 */	li r5, 1
-/* 80108D8C  81 83 00 10 */	lwz r12, 0x10(r3)
-/* 80108D90  81 8C 00 14 */	lwz r12, 0x14(r12)
-/* 80108D94  7D 89 03 A6 */	mtctr r12
-/* 80108D98  4E 80 04 21 */	bctrl 
-/* 80108D9C  39 61 00 20 */	addi r11, r1, 0x20
-/* 80108DA0  48 25 94 89 */	bl _restgpr_29
-/* 80108DA4  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 80108DA8  7C 08 03 A6 */	mtlr r0
-/* 80108DAC  38 21 00 20 */	addi r1, r1, 0x20
-/* 80108DB0  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/checkEndSequence__22daNpcT_MotionSeqMngr_cFv.s b/asm/d/a/d_a_npc/checkEndSequence__22daNpcT_MotionSeqMngr_cFv.s
deleted file mode 100644
index d98e6a0d3d..0000000000
--- a/asm/d/a/d_a_npc/checkEndSequence__22daNpcT_MotionSeqMngr_cFv.s
+++ /dev/null
@@ -1,6 +0,0 @@
-lbl_80145A24:
-/* 80145A24  88 03 00 1C */	lbz r0, 0x1c(r3)
-/* 80145A28  20 00 00 01 */	subfic r0, r0, 1
-/* 80145A2C  7C 00 00 34 */	cntlzw r0, r0
-/* 80145A30  54 03 DE 3E */	rlwinm r3, r0, 0x1b, 0x18, 0x1f
-/* 80145A34  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/clrParam__8daNpcT_cFv.s b/asm/d/a/d_a_npc/clrParam__8daNpcT_cFv.s
deleted file mode 100644
index 123d3cb6ac..0000000000
--- a/asm/d/a/d_a_npc/clrParam__8daNpcT_cFv.s
+++ /dev/null
@@ -1,26 +0,0 @@
-lbl_8014A324:
-/* 8014A324  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8014A328  7C 08 02 A6 */	mflr r0
-/* 8014A32C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8014A330  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 8014A334  7C 7F 1B 78 */	mr r31, r3
-/* 8014A338  A8 03 0D 78 */	lha r0, 0xd78(r3)
-/* 8014A33C  B0 03 0D 7E */	sth r0, 0xd7e(r3)
-/* 8014A340  A8 03 0D 7A */	lha r0, 0xd7a(r3)
-/* 8014A344  B0 03 0D 80 */	sth r0, 0xd80(r3)
-/* 8014A348  A8 03 0D 7C */	lha r0, 0xd7c(r3)
-/* 8014A34C  B0 03 0D 82 */	sth r0, 0xd82(r3)
-/* 8014A350  38 00 00 00 */	li r0, 0
-/* 8014A354  90 03 0D B0 */	stw r0, 0xdb0(r3)
-/* 8014A358  38 7F 0E 30 */	addi r3, r31, 0xe30
-/* 8014A35C  38 80 00 00 */	li r4, 0
-/* 8014A360  38 1F 0E 38 */	addi r0, r31, 0xe38
-/* 8014A364  7C A3 00 50 */	subf r5, r3, r0
-/* 8014A368  4B EB 90 F1 */	bl memset
-/* 8014A36C  38 00 00 00 */	li r0, 0
-/* 8014A370  98 1F 0C FF */	stb r0, 0xcff(r31)
-/* 8014A374  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 8014A378  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8014A37C  7C 08 03 A6 */	mtlr r0
-/* 8014A380  38 21 00 10 */	addi r1, r1, 0x10
-/* 8014A384  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/decTmr__8daNpcT_cFv.s b/asm/d/a/d_a_npc/decTmr__8daNpcT_cFv.s
deleted file mode 100644
index f6a64e5c99..0000000000
--- a/asm/d/a/d_a_npc/decTmr__8daNpcT_cFv.s
+++ /dev/null
@@ -1,7 +0,0 @@
-lbl_8014CBF4:
-/* 8014CBF4  80 83 0D BC */	lwz r4, 0xdbc(r3)
-/* 8014CBF8  2C 04 00 00 */	cmpwi r4, 0
-/* 8014CBFC  4D 82 00 20 */	beqlr 
-/* 8014CC00  38 04 FF FF */	addi r0, r4, -1
-/* 8014CC04  90 03 0D BC */	stw r0, 0xdbc(r3)
-/* 8014CC08  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/deleteRes__8daNpcT_cFPCScPPCc.s b/asm/d/a/d_a_npc/deleteRes__8daNpcT_cFPCScPPCc.s
deleted file mode 100644
index 065d28e20f..0000000000
--- a/asm/d/a/d_a_npc/deleteRes__8daNpcT_cFPCScPPCc.s
+++ /dev/null
@@ -1,36 +0,0 @@
-lbl_801484AC:
-/* 801484AC  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 801484B0  7C 08 02 A6 */	mflr r0
-/* 801484B4  90 01 00 24 */	stw r0, 0x24(r1)
-/* 801484B8  39 61 00 20 */	addi r11, r1, 0x20
-/* 801484BC  48 21 9D 19 */	bl _savegpr_27
-/* 801484C0  7C 7B 1B 78 */	mr r27, r3
-/* 801484C4  7C BC 2B 78 */	mr r28, r5
-/* 801484C8  3B A0 00 00 */	li r29, 0
-/* 801484CC  3B C0 00 00 */	li r30, 0
-/* 801484D0  7C 9F 23 78 */	mr r31, r4
-/* 801484D4  48 00 00 28 */	b lbl_801484FC
-lbl_801484D8:
-/* 801484D8  38 7E 08 E0 */	addi r3, r30, 0x8e0
-/* 801484DC  7C 7B 1A 14 */	add r3, r27, r3
-/* 801484E0  7C 80 07 74 */	extsb r0, r4
-/* 801484E4  54 00 10 3A */	slwi r0, r0, 2
-/* 801484E8  7C 9C 00 2E */	lwzx r4, r28, r0
-/* 801484EC  4B EE 4B 1D */	bl dComIfG_resDelete__FP30request_of_phase_process_classPCc
-/* 801484F0  3B BD 00 01 */	addi r29, r29, 1
-/* 801484F4  3B FF 00 01 */	addi r31, r31, 1
-/* 801484F8  3B DE 00 08 */	addi r30, r30, 8
-lbl_801484FC:
-/* 801484FC  2C 1D 00 0A */	cmpwi r29, 0xa
-/* 80148500  40 80 00 14 */	bge lbl_80148514
-/* 80148504  88 9F 00 00 */	lbz r4, 0(r31)
-/* 80148508  7C 80 07 74 */	extsb r0, r4
-/* 8014850C  2C 00 FF FF */	cmpwi r0, -1
-/* 80148510  40 82 FF C8 */	bne lbl_801484D8
-lbl_80148514:
-/* 80148514  39 61 00 20 */	addi r11, r1, 0x20
-/* 80148518  48 21 9D 09 */	bl _restgpr_27
-/* 8014851C  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 80148520  7C 08 03 A6 */	mtlr r0
-/* 80148524  38 21 00 20 */	addi r1, r1, 0x20
-/* 80148528  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/entry__18daNpcT_ActorMngr_cFP10fopAc_ac_c.s b/asm/d/a/d_a_npc/entry__18daNpcT_ActorMngr_cFP10fopAc_ac_c.s
deleted file mode 100644
index cb21398054..0000000000
--- a/asm/d/a/d_a_npc/entry__18daNpcT_ActorMngr_cFP10fopAc_ac_c.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_801456E0:
-/* 801456E0  28 04 00 00 */	cmplwi r4, 0
-/* 801456E4  41 82 00 0C */	beq lbl_801456F0
-/* 801456E8  80 04 00 04 */	lwz r0, 4(r4)
-/* 801456EC  48 00 00 08 */	b lbl_801456F4
-lbl_801456F0:
-/* 801456F0  38 00 FF FF */	li r0, -1
-lbl_801456F4:
-/* 801456F4  90 03 00 00 */	stw r0, 0(r3)
-/* 801456F8  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/getActorP__18daNpcT_ActorMngr_cFv.s b/asm/d/a/d_a_npc/getActorP__18daNpcT_ActorMngr_cFv.s
deleted file mode 100644
index 6b632adace..0000000000
--- a/asm/d/a/d_a_npc/getActorP__18daNpcT_ActorMngr_cFv.s
+++ /dev/null
@@ -1,26 +0,0 @@
-lbl_80145708:
-/* 80145708  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8014570C  7C 08 02 A6 */	mflr r0
-/* 80145710  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80145714  38 00 00 00 */	li r0, 0
-/* 80145718  90 01 00 08 */	stw r0, 8(r1)
-/* 8014571C  80 63 00 00 */	lwz r3, 0(r3)
-/* 80145720  38 81 00 08 */	addi r4, r1, 8
-/* 80145724  4B ED 42 99 */	bl fopAcM_SearchByID__FUiPP10fopAc_ac_c
-/* 80145728  2C 03 00 01 */	cmpwi r3, 1
-/* 8014572C  40 82 00 24 */	bne lbl_80145750
-/* 80145730  80 61 00 08 */	lwz r3, 8(r1)
-/* 80145734  28 03 00 00 */	cmplwi r3, 0
-/* 80145738  41 82 00 18 */	beq lbl_80145750
-/* 8014573C  4B ED 35 A5 */	bl fopAc_IsActor__FPv
-/* 80145740  2C 03 00 00 */	cmpwi r3, 0
-/* 80145744  41 82 00 0C */	beq lbl_80145750
-/* 80145748  80 61 00 08 */	lwz r3, 8(r1)
-/* 8014574C  48 00 00 08 */	b lbl_80145754
-lbl_80145750:
-/* 80145750  38 60 00 00 */	li r3, 0
-lbl_80145754:
-/* 80145754  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80145758  7C 08 03 A6 */	mtlr r0
-/* 8014575C  38 21 00 10 */	addi r1, r1, 0x10
-/* 80145760  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/getColorAnmP__8daNpcT_cFPCci.s b/asm/d/a/d_a_npc/getColorAnmP__8daNpcT_cFPCci.s
deleted file mode 100644
index a7c59ac2ea..0000000000
--- a/asm/d/a/d_a_npc/getColorAnmP__8daNpcT_cFPCci.s
+++ /dev/null
@@ -1,16 +0,0 @@
-lbl_80148184:
-/* 80148184  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80148188  7C 08 02 A6 */	mflr r0
-/* 8014818C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80148190  7C 83 23 78 */	mr r3, r4
-/* 80148194  7C A4 2B 78 */	mr r4, r5
-/* 80148198  3C A0 80 40 */	lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8014819C  38 A5 61 C0 */	addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 801481A0  3C A5 00 02 */	addis r5, r5, 2
-/* 801481A4  38 C0 00 80 */	li r6, 0x80
-/* 801481A8  38 A5 C2 F8 */	addi r5, r5, -15624
-/* 801481AC  4B EF 41 41 */	bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 801481B0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 801481B4  7C 08 03 A6 */	mtlr r0
-/* 801481B8  38 21 00 10 */	addi r1, r1, 0x10
-/* 801481BC  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/getTevRegKeyAnmP__8daNpcT_cFPCci.s b/asm/d/a/d_a_npc/getTevRegKeyAnmP__8daNpcT_cFPCci.s
deleted file mode 100644
index 24ea5aa0db..0000000000
--- a/asm/d/a/d_a_npc/getTevRegKeyAnmP__8daNpcT_cFPCci.s
+++ /dev/null
@@ -1,16 +0,0 @@
-lbl_80148148:
-/* 80148148  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8014814C  7C 08 02 A6 */	mflr r0
-/* 80148150  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80148154  7C 83 23 78 */	mr r3, r4
-/* 80148158  7C A4 2B 78 */	mr r4, r5
-/* 8014815C  3C A0 80 40 */	lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80148160  38 A5 61 C0 */	addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80148164  3C A5 00 02 */	addis r5, r5, 2
-/* 80148168  38 C0 00 80 */	li r6, 0x80
-/* 8014816C  38 A5 C2 F8 */	addi r5, r5, -15624
-/* 80148170  4B EF 41 7D */	bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 80148174  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80148178  7C 08 03 A6 */	mtlr r0
-/* 8014817C  38 21 00 10 */	addi r1, r1, 0x10
-/* 80148180  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/getTexPtrnAnmP__8daNpcT_cFPCci.s b/asm/d/a/d_a_npc/getTexPtrnAnmP__8daNpcT_cFPCci.s
deleted file mode 100644
index 49577993e4..0000000000
--- a/asm/d/a/d_a_npc/getTexPtrnAnmP__8daNpcT_cFPCci.s
+++ /dev/null
@@ -1,16 +0,0 @@
-lbl_801480D0:
-/* 801480D0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 801480D4  7C 08 02 A6 */	mflr r0
-/* 801480D8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 801480DC  7C 83 23 78 */	mr r3, r4
-/* 801480E0  7C A4 2B 78 */	mr r4, r5
-/* 801480E4  3C A0 80 40 */	lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 801480E8  38 A5 61 C0 */	addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 801480EC  3C A5 00 02 */	addis r5, r5, 2
-/* 801480F0  38 C0 00 80 */	li r6, 0x80
-/* 801480F4  38 A5 C2 F8 */	addi r5, r5, -15624
-/* 801480F8  4B EF 41 F5 */	bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 801480FC  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80148100  7C 08 03 A6 */	mtlr r0
-/* 80148104  38 21 00 10 */	addi r1, r1, 0x10
-/* 80148108  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/getTexSRTKeyAnmP__8daNpcT_cFPCci.s b/asm/d/a/d_a_npc/getTexSRTKeyAnmP__8daNpcT_cFPCci.s
deleted file mode 100644
index 46411d3c64..0000000000
--- a/asm/d/a/d_a_npc/getTexSRTKeyAnmP__8daNpcT_cFPCci.s
+++ /dev/null
@@ -1,16 +0,0 @@
-lbl_8014810C:
-/* 8014810C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80148110  7C 08 02 A6 */	mflr r0
-/* 80148114  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80148118  7C 83 23 78 */	mr r3, r4
-/* 8014811C  7C A4 2B 78 */	mr r4, r5
-/* 80148120  3C A0 80 40 */	lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80148124  38 A5 61 C0 */	addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80148128  3C A5 00 02 */	addis r5, r5, 2
-/* 8014812C  38 C0 00 80 */	li r6, 0x80
-/* 80148130  38 A5 C2 F8 */	addi r5, r5, -15624
-/* 80148134  4B EF 41 B9 */	bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 80148138  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8014813C  7C 08 03 A6 */	mtlr r0
-/* 80148140  38 21 00 10 */	addi r1, r1, 0x10
-/* 80148144  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/getTrnsfrmAnmP__8daNpcT_cFPCci.s b/asm/d/a/d_a_npc/getTrnsfrmAnmP__8daNpcT_cFPCci.s
deleted file mode 100644
index 545755c153..0000000000
--- a/asm/d/a/d_a_npc/getTrnsfrmAnmP__8daNpcT_cFPCci.s
+++ /dev/null
@@ -1,16 +0,0 @@
-lbl_80148058:
-/* 80148058  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8014805C  7C 08 02 A6 */	mflr r0
-/* 80148060  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80148064  7C 83 23 78 */	mr r3, r4
-/* 80148068  7C A4 2B 78 */	mr r4, r5
-/* 8014806C  3C A0 80 40 */	lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80148070  38 A5 61 C0 */	addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80148074  3C A5 00 02 */	addis r5, r5, 2
-/* 80148078  38 C0 00 80 */	li r6, 0x80
-/* 8014807C  38 A5 C2 F8 */	addi r5, r5, -15624
-/* 80148080  4B EF 42 6D */	bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 80148084  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80148088  7C 08 03 A6 */	mtlr r0
-/* 8014808C  38 21 00 10 */	addi r1, r1, 0x10
-/* 80148090  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/getTrnsfrmKeyAnmP__8daNpcT_cFPCci.s b/asm/d/a/d_a_npc/getTrnsfrmKeyAnmP__8daNpcT_cFPCci.s
deleted file mode 100644
index 57a3282ecd..0000000000
--- a/asm/d/a/d_a_npc/getTrnsfrmKeyAnmP__8daNpcT_cFPCci.s
+++ /dev/null
@@ -1,16 +0,0 @@
-lbl_80148094:
-/* 80148094  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80148098  7C 08 02 A6 */	mflr r0
-/* 8014809C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 801480A0  7C 83 23 78 */	mr r3, r4
-/* 801480A4  7C A4 2B 78 */	mr r4, r5
-/* 801480A8  3C A0 80 40 */	lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 801480AC  38 A5 61 C0 */	addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 801480B0  3C A5 00 02 */	addis r5, r5, 2
-/* 801480B4  38 C0 00 80 */	li r6, 0x80
-/* 801480B8  38 A5 C2 F8 */	addi r5, r5, -15624
-/* 801480BC  4B EF 42 31 */	bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 801480C0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 801480C4  7C 08 03 A6 */	mtlr r0
-/* 801480C8  38 21 00 10 */	addi r1, r1, 0x10
-/* 801480CC  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/hitChk__8daNpcT_cFP12dCcD_GObjInfUl.s b/asm/d/a/d_a_npc/hitChk__8daNpcT_cFP12dCcD_GObjInfUl.s
deleted file mode 100644
index 4c1ce713bb..0000000000
--- a/asm/d/a/d_a_npc/hitChk__8daNpcT_cFP12dCcD_GObjInfUl.s
+++ /dev/null
@@ -1,40 +0,0 @@
-lbl_8014AA40:
-/* 8014AA40  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 8014AA44  7C 08 02 A6 */	mflr r0
-/* 8014AA48  90 01 00 24 */	stw r0, 0x24(r1)
-/* 8014AA4C  39 61 00 20 */	addi r11, r1, 0x20
-/* 8014AA50  48 21 77 8D */	bl _savegpr_29
-/* 8014AA54  7C 7D 1B 78 */	mr r29, r3
-/* 8014AA58  7C 9E 23 78 */	mr r30, r4
-/* 8014AA5C  7C BF 2B 78 */	mr r31, r5
-/* 8014AA60  80 64 00 44 */	lwz r3, 0x44(r4)
-/* 8014AA64  38 63 00 1C */	addi r3, r3, 0x1c
-/* 8014AA68  4B F3 8D C9 */	bl Move__10dCcD_GSttsFv
-/* 8014AA6C  80 1D 0D BC */	lwz r0, 0xdbc(r29)
-/* 8014AA70  2C 00 00 00 */	cmpwi r0, 0
-/* 8014AA74  40 82 00 40 */	bne lbl_8014AAB4
-/* 8014AA78  38 7E 00 9C */	addi r3, r30, 0x9c
-/* 8014AA7C  4B F3 8C 0D */	bl GetAc__22dCcD_GAtTgCoCommonBaseFv
-/* 8014AA80  7C 64 1B 79 */	or. r4, r3, r3
-/* 8014AA84  41 82 00 30 */	beq lbl_8014AAB4
-/* 8014AA88  A8 04 00 08 */	lha r0, 8(r4)
-/* 8014AA8C  2C 00 01 00 */	cmpwi r0, 0x100
-/* 8014AA90  40 82 00 1C */	bne lbl_8014AAAC
-/* 8014AA94  57 E0 07 FF */	clrlwi. r0, r31, 0x1f
-/* 8014AA98  41 82 00 14 */	beq lbl_8014AAAC
-/* 8014AA9C  A0 04 06 BE */	lhz r0, 0x6be(r4)
-/* 8014AAA0  60 00 00 04 */	ori r0, r0, 4
-/* 8014AAA4  B0 04 06 BE */	sth r0, 0x6be(r4)
-/* 8014AAA8  48 00 00 10 */	b lbl_8014AAB8
-lbl_8014AAAC:
-/* 8014AAAC  7C 83 23 78 */	mr r3, r4
-/* 8014AAB0  48 00 00 08 */	b lbl_8014AAB8
-lbl_8014AAB4:
-/* 8014AAB4  38 60 00 00 */	li r3, 0
-lbl_8014AAB8:
-/* 8014AAB8  39 61 00 20 */	addi r11, r1, 0x20
-/* 8014AABC  48 21 77 6D */	bl _restgpr_29
-/* 8014AAC0  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 8014AAC4  7C 08 03 A6 */	mtlr r0
-/* 8014AAC8  38 21 00 20 */	addi r1, r1, 0x20
-/* 8014AACC  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/initialize__15daNpcT_JntAnm_cFv.s b/asm/d/a/d_a_npc/initialize__15daNpcT_JntAnm_cFv.s
deleted file mode 100644
index 05b26bf8d7..0000000000
--- a/asm/d/a/d_a_npc/initialize__15daNpcT_JntAnm_cFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_80146C98:
-/* 80146C98  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80146C9C  7C 08 02 A6 */	mflr r0
-/* 80146CA0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80146CA4  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80146CA8  7C 7F 1B 78 */	mr r31, r3
-/* 80146CAC  4B FF EA 29 */	bl initialize__18daNpcT_ActorMngr_cFv
-/* 80146CB0  38 7F 00 14 */	addi r3, r31, 0x14
-/* 80146CB4  38 80 00 00 */	li r4, 0
-/* 80146CB8  38 1F 01 58 */	addi r0, r31, 0x158
-/* 80146CBC  7C A3 00 50 */	subf r5, r3, r0
-/* 80146CC0  4B EB C7 99 */	bl memset
-/* 80146CC4  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80146CC8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80146CCC  7C 08 03 A6 */	mtlr r0
-/* 80146CD0  38 21 00 10 */	addi r1, r1, 0x10
-/* 80146CD4  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/initialize__18daNpcT_ActorMngr_cFv.s b/asm/d/a/d_a_npc/initialize__18daNpcT_ActorMngr_cFv.s
deleted file mode 100644
index 7bcd20e123..0000000000
--- a/asm/d/a/d_a_npc/initialize__18daNpcT_ActorMngr_cFv.s
+++ /dev/null
@@ -1,4 +0,0 @@
-lbl_801456D4:
-/* 801456D4  38 00 FF FF */	li r0, -1
-/* 801456D8  90 03 00 00 */	stw r0, 0(r3)
-/* 801456DC  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/initialize__22daNpcT_MotionSeqMngr_cFv.s b/asm/d/a/d_a_npc/initialize__22daNpcT_MotionSeqMngr_cFv.s
deleted file mode 100644
index 19c51f19a6..0000000000
--- a/asm/d/a/d_a_npc/initialize__22daNpcT_MotionSeqMngr_cFv.s
+++ /dev/null
@@ -1,11 +0,0 @@
-lbl_80145898:
-/* 80145898  38 80 00 00 */	li r4, 0
-/* 8014589C  90 83 00 08 */	stw r4, 8(r3)
-/* 801458A0  90 83 00 0C */	stw r4, 0xc(r3)
-/* 801458A4  90 83 00 10 */	stw r4, 0x10(r3)
-/* 801458A8  38 00 FF FF */	li r0, -1
-/* 801458AC  90 03 00 14 */	stw r0, 0x14(r3)
-/* 801458B0  C0 02 99 E8 */	lfs f0, lit_4148(r2)
-/* 801458B4  D0 03 00 18 */	stfs f0, 0x18(r3)
-/* 801458B8  98 83 00 1C */	stb r4, 0x1c(r3)
-/* 801458BC  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/loadRes__8daNpcT_cFPCScPPCc.s b/asm/d/a/d_a_npc/loadRes__8daNpcT_cFPCScPPCc.s
deleted file mode 100644
index 2715ae61da..0000000000
--- a/asm/d/a/d_a_npc/loadRes__8daNpcT_cFPCScPPCc.s
+++ /dev/null
@@ -1,53 +0,0 @@
-lbl_801483F8:
-/* 801483F8  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 801483FC  7C 08 02 A6 */	mflr r0
-/* 80148400  90 01 00 24 */	stw r0, 0x24(r1)
-/* 80148404  39 61 00 20 */	addi r11, r1, 0x20
-/* 80148408  48 21 9D C9 */	bl _savegpr_26
-/* 8014840C  7C 7A 1B 78 */	mr r26, r3
-/* 80148410  7C BB 2B 78 */	mr r27, r5
-/* 80148414  3B A0 00 00 */	li r29, 0
-/* 80148418  3B 80 00 00 */	li r28, 0
-/* 8014841C  3B E0 00 00 */	li r31, 0
-/* 80148420  7C 9E 23 78 */	mr r30, r4
-lbl_80148424:
-/* 80148424  88 1E 00 00 */	lbz r0, 0(r30)
-/* 80148428  7C 00 07 74 */	extsb r0, r0
-/* 8014842C  2C 00 FF FF */	cmpwi r0, -1
-/* 80148430  40 82 00 14 */	bne lbl_80148444
-/* 80148434  7C 1C E8 00 */	cmpw r28, r29
-/* 80148438  40 82 00 58 */	bne lbl_80148490
-/* 8014843C  38 60 00 04 */	li r3, 4
-/* 80148440  48 00 00 54 */	b lbl_80148494
-lbl_80148444:
-/* 80148444  38 7F 08 E0 */	addi r3, r31, 0x8e0
-/* 80148448  7C 7A 1A 14 */	add r3, r26, r3
-/* 8014844C  54 00 10 3A */	slwi r0, r0, 2
-/* 80148450  7C 9B 00 2E */	lwzx r4, r27, r0
-/* 80148454  4B EE 4A 69 */	bl dComIfG_resLoad__FP30request_of_phase_process_classPCc
-/* 80148458  2C 03 00 04 */	cmpwi r3, 4
-/* 8014845C  40 82 00 08 */	bne lbl_80148464
-/* 80148460  3B BD 00 01 */	addi r29, r29, 1
-lbl_80148464:
-/* 80148464  2C 03 00 05 */	cmpwi r3, 5
-/* 80148468  41 82 00 0C */	beq lbl_80148474
-/* 8014846C  2C 03 00 03 */	cmpwi r3, 3
-/* 80148470  40 82 00 0C */	bne lbl_8014847C
-lbl_80148474:
-/* 80148474  38 60 00 05 */	li r3, 5
-/* 80148478  48 00 00 1C */	b lbl_80148494
-lbl_8014847C:
-/* 8014847C  3B 9C 00 01 */	addi r28, r28, 1
-/* 80148480  2C 1C 00 0A */	cmpwi r28, 0xa
-/* 80148484  3B FF 00 08 */	addi r31, r31, 8
-/* 80148488  3B DE 00 01 */	addi r30, r30, 1
-/* 8014848C  41 80 FF 98 */	blt lbl_80148424
-lbl_80148490:
-/* 80148490  38 60 00 00 */	li r3, 0
-lbl_80148494:
-/* 80148494  39 61 00 20 */	addi r11, r1, 0x20
-/* 80148498  48 21 9D 85 */	bl _restgpr_26
-/* 8014849C  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 801484A0  7C 08 03 A6 */	mtlr r0
-/* 801484A4  38 21 00 20 */	addi r1, r1, 0x20
-/* 801484A8  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/remove__18daNpcT_ActorMngr_cFv.s b/asm/d/a/d_a_npc/remove__18daNpcT_ActorMngr_cFv.s
deleted file mode 100644
index e306639073..0000000000
--- a/asm/d/a/d_a_npc/remove__18daNpcT_ActorMngr_cFv.s
+++ /dev/null
@@ -1,4 +0,0 @@
-lbl_801456FC:
-/* 801456FC  38 00 FF FF */	li r0, -1
-/* 80145700  90 03 00 00 */	stw r0, 0(r3)
-/* 80145704  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/setAngle__8daNpcT_cF5csXyz.s b/asm/d/a/d_a_npc/setAngle__8daNpcT_cF5csXyz.s
deleted file mode 100644
index 66ee9e5a49..0000000000
--- a/asm/d/a/d_a_npc/setAngle__8daNpcT_cF5csXyz.s
+++ /dev/null
@@ -1,32 +0,0 @@
-lbl_8014A99C:
-/* 8014A99C  A8 04 00 00 */	lha r0, 0(r4)
-/* 8014A9A0  B0 03 04 DC */	sth r0, 0x4dc(r3)
-/* 8014A9A4  A8 04 00 02 */	lha r0, 2(r4)
-/* 8014A9A8  B0 03 04 DE */	sth r0, 0x4de(r3)
-/* 8014A9AC  A8 04 00 04 */	lha r0, 4(r4)
-/* 8014A9B0  B0 03 04 E0 */	sth r0, 0x4e0(r3)
-/* 8014A9B4  A8 03 04 DC */	lha r0, 0x4dc(r3)
-/* 8014A9B8  B0 03 04 E4 */	sth r0, 0x4e4(r3)
-/* 8014A9BC  A8 03 04 DE */	lha r0, 0x4de(r3)
-/* 8014A9C0  B0 03 04 E6 */	sth r0, 0x4e6(r3)
-/* 8014A9C4  A8 03 04 E0 */	lha r0, 0x4e0(r3)
-/* 8014A9C8  B0 03 04 E8 */	sth r0, 0x4e8(r3)
-/* 8014A9CC  A8 03 04 DC */	lha r0, 0x4dc(r3)
-/* 8014A9D0  B0 03 0D 78 */	sth r0, 0xd78(r3)
-/* 8014A9D4  A8 03 04 DE */	lha r0, 0x4de(r3)
-/* 8014A9D8  B0 03 0D 7A */	sth r0, 0xd7a(r3)
-/* 8014A9DC  A8 03 04 E0 */	lha r0, 0x4e0(r3)
-/* 8014A9E0  B0 03 0D 7C */	sth r0, 0xd7c(r3)
-/* 8014A9E4  A8 03 0D 78 */	lha r0, 0xd78(r3)
-/* 8014A9E8  B0 03 0D 7E */	sth r0, 0xd7e(r3)
-/* 8014A9EC  A8 03 0D 7A */	lha r0, 0xd7a(r3)
-/* 8014A9F0  B0 03 0D 80 */	sth r0, 0xd80(r3)
-/* 8014A9F4  A8 03 0D 7C */	lha r0, 0xd7c(r3)
-/* 8014A9F8  B0 03 0D 82 */	sth r0, 0xd82(r3)
-/* 8014A9FC  A8 03 04 DC */	lha r0, 0x4dc(r3)
-/* 8014AA00  B0 03 04 C8 */	sth r0, 0x4c8(r3)
-/* 8014AA04  A8 03 04 DE */	lha r0, 0x4de(r3)
-/* 8014AA08  B0 03 04 CA */	sth r0, 0x4ca(r3)
-/* 8014AA0C  A8 03 04 E0 */	lha r0, 0x4e0(r3)
-/* 8014AA10  B0 03 04 CC */	sth r0, 0x4cc(r3)
-/* 8014AA14  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/setAngle__8daNpcT_cFs.s b/asm/d/a/d_a_npc/setAngle__8daNpcT_cFs.s
deleted file mode 100644
index 7d15d3468f..0000000000
--- a/asm/d/a/d_a_npc/setAngle__8daNpcT_cFs.s
+++ /dev/null
@@ -1,11 +0,0 @@
-lbl_8014AA18:
-/* 8014AA18  B0 83 04 DE */	sth r4, 0x4de(r3)
-/* 8014AA1C  A8 03 04 DE */	lha r0, 0x4de(r3)
-/* 8014AA20  B0 03 04 E6 */	sth r0, 0x4e6(r3)
-/* 8014AA24  A8 03 04 DE */	lha r0, 0x4de(r3)
-/* 8014AA28  B0 03 0D 7A */	sth r0, 0xd7a(r3)
-/* 8014AA2C  A8 03 0D 7A */	lha r0, 0xd7a(r3)
-/* 8014AA30  B0 03 0D 80 */	sth r0, 0xd80(r3)
-/* 8014AA34  A8 03 04 DE */	lha r0, 0x4de(r3)
-/* 8014AA38  B0 03 04 CA */	sth r0, 0x4ca(r3)
-/* 8014AA3C  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/setBckAnm__8daNpcT_cFP15J3DAnmTransformfiiib.s b/asm/d/a/d_a_npc/setBckAnm__8daNpcT_cFP15J3DAnmTransformfiiib.s
deleted file mode 100644
index 1d66048b37..0000000000
--- a/asm/d/a/d_a_npc/setBckAnm__8daNpcT_cFP15J3DAnmTransformfiiib.s
+++ /dev/null
@@ -1,18 +0,0 @@
-lbl_801481C0:
-/* 801481C0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 801481C4  7C 08 02 A6 */	mflr r0
-/* 801481C8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 801481CC  7C AB 2B 78 */	mr r11, r5
-/* 801481D0  7C CA 33 78 */	mr r10, r6
-/* 801481D4  7C E0 3B 78 */	mr r0, r7
-/* 801481D8  7D 09 43 78 */	mr r9, r8
-/* 801481DC  38 A0 00 01 */	li r5, 1
-/* 801481E0  7D 66 5B 78 */	mr r6, r11
-/* 801481E4  7D 47 07 34 */	extsh r7, r10
-/* 801481E8  7C 08 07 34 */	extsh r8, r0
-/* 801481EC  38 63 06 10 */	addi r3, r3, 0x610
-/* 801481F0  4B EC 55 ED */	bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb
-/* 801481F4  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 801481F8  7C 08 03 A6 */	mtlr r0
-/* 801481FC  38 21 00 10 */	addi r1, r1, 0x10
-/* 80148200  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/setBpkAnm__8daNpcT_cFP11J3DAnmColorP12J3DModelDatafi.s b/asm/d/a/d_a_npc/setBpkAnm__8daNpcT_cFP11J3DAnmColorP12J3DModelDatafi.s
deleted file mode 100644
index fe3f184851..0000000000
--- a/asm/d/a/d_a_npc/setBpkAnm__8daNpcT_cFP11J3DAnmColorP12J3DModelDatafi.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_801483B8:
-/* 801483B8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 801483BC  7C 08 02 A6 */	mflr r0
-/* 801483C0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 801483C4  7C 80 23 78 */	mr r0, r4
-/* 801483C8  7C C7 33 78 */	mr r7, r6
-/* 801483CC  38 85 00 58 */	addi r4, r5, 0x58
-/* 801483D0  7C 05 03 78 */	mr r5, r0
-/* 801483D4  38 C0 00 01 */	li r6, 1
-/* 801483D8  39 00 00 00 */	li r8, 0
-/* 801483DC  39 20 FF FF */	li r9, -1
-/* 801483E0  38 63 06 74 */	addi r3, r3, 0x674
-/* 801483E4  4B EC 50 99 */	bl init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss
-/* 801483E8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 801483EC  7C 08 03 A6 */	mtlr r0
-/* 801483F0  38 21 00 10 */	addi r1, r1, 0x10
-/* 801483F4  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/setBrkAnm__8daNpcT_cFP15J3DAnmTevRegKeyP12J3DModelDatafi.s b/asm/d/a/d_a_npc/setBrkAnm__8daNpcT_cFP15J3DAnmTevRegKeyP12J3DModelDatafi.s
deleted file mode 100644
index f9d6e1baf8..0000000000
--- a/asm/d/a/d_a_npc/setBrkAnm__8daNpcT_cFP15J3DAnmTevRegKeyP12J3DModelDatafi.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_80148378:
-/* 80148378  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8014837C  7C 08 02 A6 */	mflr r0
-/* 80148380  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80148384  7C 80 23 78 */	mr r0, r4
-/* 80148388  7C C7 33 78 */	mr r7, r6
-/* 8014838C  38 85 00 58 */	addi r4, r5, 0x58
-/* 80148390  7C 05 03 78 */	mr r5, r0
-/* 80148394  38 C0 00 01 */	li r6, 1
-/* 80148398  39 00 00 00 */	li r8, 0
-/* 8014839C  39 20 FF FF */	li r9, -1
-/* 801483A0  38 63 06 5C */	addi r3, r3, 0x65c
-/* 801483A4  4B EC 53 69 */	bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss
-/* 801483A8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 801483AC  7C 08 03 A6 */	mtlr r0
-/* 801483B0  38 21 00 10 */	addi r1, r1, 0x10
-/* 801483B4  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/setBtkAnm__8daNpcT_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi.s b/asm/d/a/d_a_npc/setBtkAnm__8daNpcT_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi.s
deleted file mode 100644
index 9c48ba38bb..0000000000
--- a/asm/d/a/d_a_npc/setBtkAnm__8daNpcT_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_80148338:
-/* 80148338  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8014833C  7C 08 02 A6 */	mflr r0
-/* 80148340  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80148344  7C 80 23 78 */	mr r0, r4
-/* 80148348  7C C7 33 78 */	mr r7, r6
-/* 8014834C  38 85 00 58 */	addi r4, r5, 0x58
-/* 80148350  7C 05 03 78 */	mr r5, r0
-/* 80148354  38 C0 00 01 */	li r6, 1
-/* 80148358  39 00 00 00 */	li r8, 0
-/* 8014835C  39 20 FF FF */	li r9, -1
-/* 80148360  38 63 06 44 */	addi r3, r3, 0x644
-/* 80148364  4B EC 52 D9 */	bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss
-/* 80148368  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8014836C  7C 08 03 A6 */	mtlr r0
-/* 80148370  38 21 00 10 */	addi r1, r1, 0x10
-/* 80148374  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/setBtpAnm__8daNpcT_cFP16J3DAnmTexPatternP12J3DModelDatafi.s b/asm/d/a/d_a_npc/setBtpAnm__8daNpcT_cFP16J3DAnmTexPatternP12J3DModelDatafi.s
deleted file mode 100644
index afd72a934b..0000000000
--- a/asm/d/a/d_a_npc/setBtpAnm__8daNpcT_cFP16J3DAnmTexPatternP12J3DModelDatafi.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_801482F8:
-/* 801482F8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 801482FC  7C 08 02 A6 */	mflr r0
-/* 80148300  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80148304  7C 80 23 78 */	mr r0, r4
-/* 80148308  7C C7 33 78 */	mr r7, r6
-/* 8014830C  38 85 00 58 */	addi r4, r5, 0x58
-/* 80148310  7C 05 03 78 */	mr r5, r0
-/* 80148314  38 C0 00 01 */	li r6, 1
-/* 80148318  39 00 00 00 */	li r8, 0
-/* 8014831C  39 20 FF FF */	li r9, -1
-/* 80148320  38 63 06 2C */	addi r3, r3, 0x62c
-/* 80148324  4B EC 52 29 */	bl init__13mDoExt_btpAnmFP16J3DMaterialTableP16J3DAnmTexPatterniifss
-/* 80148328  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8014832C  7C 08 03 A6 */	mtlr r0
-/* 80148330  38 21 00 10 */	addi r1, r1, 0x10
-/* 80148334  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/setEnvTevColor__8daNpcT_cFv.s b/asm/d/a/d_a_npc/setEnvTevColor__8daNpcT_cFv.s
deleted file mode 100644
index a4d75d4c38..0000000000
--- a/asm/d/a/d_a_npc/setEnvTevColor__8daNpcT_cFv.s
+++ /dev/null
@@ -1,24 +0,0 @@
-lbl_80148C70:
-/* 80148C70  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80148C74  7C 08 02 A6 */	mflr r0
-/* 80148C78  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80148C7C  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80148C80  93 C1 00 08 */	stw r30, 8(r1)
-/* 80148C84  7C 7E 1B 78 */	mr r30, r3
-/* 80148C88  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80148C8C  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80148C90  3B E3 0F 38 */	addi r31, r3, 0xf38
-/* 80148C94  7F E3 FB 78 */	mr r3, r31
-/* 80148C98  38 9E 09 44 */	addi r4, r30, 0x944
-/* 80148C9C  4B F2 BF 4D */	bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo
-/* 80148CA0  98 7E 04 8D */	stb r3, 0x48d(r30)
-/* 80148CA4  7F E3 FB 78 */	mr r3, r31
-/* 80148CA8  38 9E 09 44 */	addi r4, r30, 0x944
-/* 80148CAC  4B F2 C4 55 */	bl GetRoomId__4dBgSFRC13cBgS_PolyInfo
-/* 80148CB0  98 7E 04 8C */	stb r3, 0x48c(r30)
-/* 80148CB4  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80148CB8  83 C1 00 08 */	lwz r30, 8(r1)
-/* 80148CBC  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80148CC0  7C 08 03 A6 */	mtlr r0
-/* 80148CC4  38 21 00 10 */	addi r1, r1, 0x10
-/* 80148CC8  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/setMtx__8daNpcT_cFv.s b/asm/d/a/d_a_npc/setMtx__8daNpcT_cFv.s
deleted file mode 100644
index 20f03a1f90..0000000000
--- a/asm/d/a/d_a_npc/setMtx__8daNpcT_cFv.s
+++ /dev/null
@@ -1,50 +0,0 @@
-lbl_80149190:
-/* 80149190  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80149194  7C 08 02 A6 */	mflr r0
-/* 80149198  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8014919C  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 801491A0  93 C1 00 08 */	stw r30, 8(r1)
-/* 801491A4  7C 7E 1B 78 */	mr r30, r3
-/* 801491A8  80 63 05 78 */	lwz r3, 0x578(r3)
-/* 801491AC  83 E3 00 04 */	lwz r31, 4(r3)
-/* 801491B0  38 7E 04 D0 */	addi r3, r30, 0x4d0
-/* 801491B4  4B EC 3B B1 */	bl transS__14mDoMtx_stack_cFRC4cXyz
-/* 801491B8  38 7E 0D 78 */	addi r3, r30, 0xd78
-/* 801491BC  4B EC 3D 89 */	bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz
-/* 801491C0  38 7E 04 EC */	addi r3, r30, 0x4ec
-/* 801491C4  4B EC 3C AD */	bl scaleM__14mDoMtx_stack_cFRC4cXyz
-/* 801491C8  3C 60 80 3E */	lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
-/* 801491CC  38 63 D4 70 */	addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
-/* 801491D0  38 9F 00 24 */	addi r4, r31, 0x24
-/* 801491D4  48 1F D2 DD */	bl PSMTXCopy
-/* 801491D8  93 DF 00 14 */	stw r30, 0x14(r31)
-/* 801491DC  38 00 00 01 */	li r0, 1
-/* 801491E0  80 7E 05 78 */	lwz r3, 0x578(r30)
-/* 801491E4  98 03 00 55 */	stb r0, 0x55(r3)
-/* 801491E8  C0 1E 0D FC */	lfs f0, 0xdfc(r30)
-/* 801491EC  FC 00 02 10 */	fabs f0, f0
-/* 801491F0  FC 20 00 18 */	frsp f1, f0
-/* 801491F4  C0 0D 8C 00 */	lfs f0, G_CM3D_F_ABS_MIN(r13)
-/* 801491F8  FC 01 00 40 */	fcmpo cr0, f1, f0
-/* 801491FC  7C 00 00 26 */	mfcr r0
-/* 80149200  54 00 0F FF */	rlwinm. r0, r0, 1, 0x1f, 0x1f
-/* 80149204  41 82 00 10 */	beq lbl_80149214
-/* 80149208  38 00 00 00 */	li r0, 0
-/* 8014920C  80 7E 05 78 */	lwz r3, 0x578(r30)
-/* 80149210  98 03 00 55 */	stb r0, 0x55(r3)
-lbl_80149214:
-/* 80149214  80 1E 0D 98 */	lwz r0, 0xd98(r30)
-/* 80149218  54 00 05 6B */	rlwinm. r0, r0, 0, 0x15, 0x15
-/* 8014921C  41 82 00 10 */	beq lbl_8014922C
-/* 80149220  C0 1E 06 20 */	lfs f0, 0x620(r30)
-/* 80149224  80 7E 06 24 */	lwz r3, 0x624(r30)
-/* 80149228  D0 03 00 08 */	stfs f0, 8(r3)
-lbl_8014922C:
-/* 8014922C  80 7E 05 78 */	lwz r3, 0x578(r30)
-/* 80149230  4B EC 7F BD */	bl modelCalc__16mDoExt_McaMorfSOFv
-/* 80149234  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80149238  83 C1 00 08 */	lwz r30, 8(r1)
-/* 8014923C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80149240  7C 08 03 A6 */	mtlr r0
-/* 80149244  38 21 00 10 */	addi r1, r1, 0x10
-/* 80149248  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/setPos__8daNpcT_cF4cXyz.s b/asm/d/a/d_a_npc/setPos__8daNpcT_cF4cXyz.s
deleted file mode 100644
index 7c8556ca10..0000000000
--- a/asm/d/a/d_a_npc/setPos__8daNpcT_cF4cXyz.s
+++ /dev/null
@@ -1,38 +0,0 @@
-lbl_8014A908:
-/* 8014A908  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8014A90C  7C 08 02 A6 */	mflr r0
-/* 8014A910  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8014A914  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 8014A918  93 C1 00 08 */	stw r30, 8(r1)
-/* 8014A91C  7C 7E 1B 78 */	mr r30, r3
-/* 8014A920  7C 9F 23 78 */	mr r31, r4
-/* 8014A924  C0 24 00 04 */	lfs f1, 4(r4)
-/* 8014A928  C0 02 9A 48 */	lfs f0, lit_6667(r2)
-/* 8014A92C  EC 01 00 2A */	fadds f0, f1, f0
-/* 8014A930  D0 04 00 04 */	stfs f0, 4(r4)
-/* 8014A934  38 7E 09 30 */	addi r3, r30, 0x930
-/* 8014A938  48 11 D3 F1 */	bl SetPos__11cBgS_GndChkFPC4cXyz
-/* 8014A93C  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8014A940  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8014A944  38 63 0F 38 */	addi r3, r3, 0xf38
-/* 8014A948  38 9E 09 30 */	addi r4, r30, 0x930
-/* 8014A94C  4B F2 9B 55 */	bl GroundCross__4cBgSFP11cBgS_GndChk
-/* 8014A950  D0 3F 00 04 */	stfs f1, 4(r31)
-/* 8014A954  C0 1F 00 00 */	lfs f0, 0(r31)
-/* 8014A958  D0 1E 04 D0 */	stfs f0, 0x4d0(r30)
-/* 8014A95C  C0 1F 00 04 */	lfs f0, 4(r31)
-/* 8014A960  D0 1E 04 D4 */	stfs f0, 0x4d4(r30)
-/* 8014A964  C0 1F 00 08 */	lfs f0, 8(r31)
-/* 8014A968  D0 1E 04 D8 */	stfs f0, 0x4d8(r30)
-/* 8014A96C  C0 1E 04 D0 */	lfs f0, 0x4d0(r30)
-/* 8014A970  D0 1E 04 BC */	stfs f0, 0x4bc(r30)
-/* 8014A974  C0 1E 04 D4 */	lfs f0, 0x4d4(r30)
-/* 8014A978  D0 1E 04 C0 */	stfs f0, 0x4c0(r30)
-/* 8014A97C  C0 1E 04 D8 */	lfs f0, 0x4d8(r30)
-/* 8014A980  D0 1E 04 C4 */	stfs f0, 0x4c4(r30)
-/* 8014A984  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 8014A988  83 C1 00 08 */	lwz r30, 8(r1)
-/* 8014A98C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8014A990  7C 08 03 A6 */	mtlr r0
-/* 8014A994  38 21 00 10 */	addi r1, r1, 0x10
-/* 8014A998  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/setRoomNo__8daNpcT_cFv.s b/asm/d/a/d_a_npc/setRoomNo__8daNpcT_cFv.s
deleted file mode 100644
index 801ae3a36f..0000000000
--- a/asm/d/a/d_a_npc/setRoomNo__8daNpcT_cFv.s
+++ /dev/null
@@ -1,18 +0,0 @@
-lbl_80148CCC:
-/* 80148CCC  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80148CD0  7C 08 02 A6 */	mflr r0
-/* 80148CD4  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80148CD8  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80148CDC  7C 7F 1B 78 */	mr r31, r3
-/* 80148CE0  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80148CE4  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80148CE8  38 63 0F 38 */	addi r3, r3, 0xf38
-/* 80148CEC  38 9F 09 44 */	addi r4, r31, 0x944
-/* 80148CF0  4B F2 C4 11 */	bl GetRoomId__4dBgSFRC13cBgS_PolyInfo
-/* 80148CF4  98 7F 04 E2 */	stb r3, 0x4e2(r31)
-/* 80148CF8  98 7F 08 86 */	stb r3, 0x886(r31)
-/* 80148CFC  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80148D00  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80148D04  7C 08 03 A6 */	mtlr r0
-/* 80148D08  38 21 00 10 */	addi r1, r1, 0x10
-/* 80148D0C  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/srchActor__8daNpcT_cFPvPv.s b/asm/d/a/d_a_npc/srchActor__8daNpcT_cFPvPv.s
deleted file mode 100644
index f4d62522c6..0000000000
--- a/asm/d/a/d_a_npc/srchActor__8daNpcT_cFPvPv.s
+++ /dev/null
@@ -1,35 +0,0 @@
-lbl_80147FD4:
-/* 80147FD4  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80147FD8  7C 08 02 A6 */	mflr r0
-/* 80147FDC  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80147FE0  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80147FE4  93 C1 00 08 */	stw r30, 8(r1)
-/* 80147FE8  7C 7E 1B 78 */	mr r30, r3
-/* 80147FEC  7C 9F 23 78 */	mr r31, r4
-/* 80147FF0  80 0D 8A 5C */	lwz r0, mFindCount__8daNpcT_c(r13)
-/* 80147FF4  2C 00 00 32 */	cmpwi r0, 0x32
-/* 80147FF8  40 80 00 44 */	bge lbl_8014803C
-/* 80147FFC  4B ED 0C E5 */	bl fopAc_IsActor__FPv
-/* 80148000  2C 03 00 00 */	cmpwi r3, 0
-/* 80148004  41 82 00 38 */	beq lbl_8014803C
-/* 80148008  7C 1E F8 40 */	cmplw r30, r31
-/* 8014800C  41 82 00 30 */	beq lbl_8014803C
-/* 80148010  A8 6D 8A 58 */	lha r3, mSrchName__8daNpcT_c(r13)
-/* 80148014  A8 1E 00 08 */	lha r0, 8(r30)
-/* 80148018  7C 03 00 00 */	cmpw r3, r0
-/* 8014801C  40 82 00 20 */	bne lbl_8014803C
-/* 80148020  80 8D 8A 5C */	lwz r4, mFindCount__8daNpcT_c(r13)
-/* 80148024  54 80 10 3A */	slwi r0, r4, 2
-/* 80148028  3C 60 80 42 */	lis r3, mFindActorPtrs__8daNpcT_c@ha /* 0x80425708@ha */
-/* 8014802C  38 63 57 08 */	addi r3, r3, mFindActorPtrs__8daNpcT_c@l /* 0x80425708@l */
-/* 80148030  7F C3 01 2E */	stwx r30, r3, r0
-/* 80148034  38 04 00 01 */	addi r0, r4, 1
-/* 80148038  90 0D 8A 5C */	stw r0, mFindCount__8daNpcT_c(r13)
-lbl_8014803C:
-/* 8014803C  38 60 00 00 */	li r3, 0
-/* 80148040  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80148044  83 C1 00 08 */	lwz r30, 8(r1)
-/* 80148048  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8014804C  7C 08 03 A6 */	mtlr r0
-/* 80148050  38 21 00 10 */	addi r1, r1, 0x10
-/* 80148054  4E 80 00 20 */	blr 
diff --git a/asm/d/a/d_a_npc/twilight__8daNpcT_cFv.s b/asm/d/a/d_a_npc/twilight__8daNpcT_cFv.s
deleted file mode 100644
index 8dcaaaac39..0000000000
--- a/asm/d/a/d_a_npc/twilight__8daNpcT_cFv.s
+++ /dev/null
@@ -1,21 +0,0 @@
-lbl_8014A064:
-/* 8014A064  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8014A068  7C 08 02 A6 */	mflr r0
-/* 8014A06C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8014A070  88 03 0A 89 */	lbz r0, 0xa89(r3)
-/* 8014A074  28 00 00 00 */	cmplwi r0, 0
-/* 8014A078  41 82 00 28 */	beq lbl_8014A0A0
-/* 8014A07C  80 03 05 5C */	lwz r0, 0x55c(r3)
-/* 8014A080  64 00 00 40 */	oris r0, r0, 0x40
-/* 8014A084  90 03 05 5C */	stw r0, 0x55c(r3)
-/* 8014A088  38 00 00 00 */	li r0, 0
-/* 8014A08C  98 03 0E 2B */	stb r0, 0xe2b(r3)
-/* 8014A090  80 03 05 5C */	lwz r0, 0x55c(r3)
-/* 8014A094  64 00 00 80 */	oris r0, r0, 0x80
-/* 8014A098  90 03 05 5C */	stw r0, 0x55c(r3)
-/* 8014A09C  48 00 1F 95 */	bl setHitodamaPrtcl__8daNpcT_cFv
-lbl_8014A0A0:
-/* 8014A0A0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8014A0A4  7C 08 03 A6 */	mtlr r0
-/* 8014A0A8  38 21 00 10 */	addi r1, r1, 0x10
-/* 8014A0AC  4E 80 00 20 */	blr 
diff --git a/asm/d/kankyo/d_kankyo/__sinit_d_kankyo_cpp.s b/asm/d/kankyo/d_kankyo/__sinit_d_kankyo_cpp.s
deleted file mode 100644
index 51f4c77f61..0000000000
--- a/asm/d/kankyo/d_kankyo/__sinit_d_kankyo_cpp.s
+++ /dev/null
@@ -1,24 +0,0 @@
-lbl_801ADCA4:
-/* 801ADCA4  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 801ADCA8  7C 08 02 A6 */	mflr r0
-/* 801ADCAC  90 01 00 14 */	stw r0, 0x14(r1)
-/* 801ADCB0  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 801ADCB4  3C 60 80 43 */	lis r3, lit_4112@ha /* 0x8042CA48@ha */
-/* 801ADCB8  3B E3 CA 48 */	addi r31, r3, lit_4112@l /* 0x8042CA48@l */
-/* 801ADCBC  38 7F 00 0C */	addi r3, r31, 0xc
-/* 801ADCC0  4B FF 16 29 */	bl __ct__18dScnKy_env_light_cFv
-/* 801ADCC4  3C 80 80 1B */	lis r4, __dt__18dScnKy_env_light_cFv@ha /* 0x801ADBBC@ha */
-/* 801ADCC8  38 84 DB BC */	addi r4, r4, __dt__18dScnKy_env_light_cFv@l /* 0x801ADBBC@l */
-/* 801ADCCC  38 BF 00 00 */	addi r5, r31, 0
-/* 801ADCD0  48 1B 3F 55 */	bl __register_global_object
-/* 801ADCD4  38 7F 13 28 */	addi r3, r31, 0x1328
-/* 801ADCD8  48 11 84 45 */	bl __ct__10Z2EnvSeMgrFv
-/* 801ADCDC  3C 80 80 2C */	lis r4, __dt__10Z2EnvSeMgrFv@ha /* 0x802C6540@ha */
-/* 801ADCE0  38 84 65 40 */	addi r4, r4, __dt__10Z2EnvSeMgrFv@l /* 0x802C6540@l */
-/* 801ADCE4  38 BF 13 1C */	addi r5, r31, 0x131c
-/* 801ADCE8  48 1B 3F 3D */	bl __register_global_object
-/* 801ADCEC  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 801ADCF0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 801ADCF4  7C 08 03 A6 */	mtlr r0
-/* 801ADCF8  38 21 00 10 */	addi r1, r1, 0x10
-/* 801ADCFC  4E 80 00 20 */	blr 
diff --git a/asm/m_Do/m_Do_DVDError/AlarmHandler__FP7OSAlarmP9OSContext.s b/asm/m_Do/m_Do_DVDError/AlarmHandler__FP7OSAlarmP9OSContext.s
deleted file mode 100644
index 5a83584567..0000000000
--- a/asm/m_Do/m_Do_DVDError/AlarmHandler__FP7OSAlarmP9OSContext.s
+++ /dev/null
@@ -1,11 +0,0 @@
-lbl_80016704:
-/* 80016704  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80016708  7C 08 02 A6 */	mflr r0
-/* 8001670C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80016710  3C 60 80 3E */	lis r3, DvdErr_thread@ha /* 0x803DECC0@ha */
-/* 80016714  38 63 EC C0 */	addi r3, r3, DvdErr_thread@l /* 0x803DECC0@l */
-/* 80016718  48 32 B0 9D */	bl OSResumeThread
-/* 8001671C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80016720  7C 08 03 A6 */	mtlr r0
-/* 80016724  38 21 00 10 */	addi r1, r1, 0x10
-/* 80016728  4E 80 00 20 */	blr 
diff --git a/asm/m_Do/m_Do_DVDError/mDoDvdErr_ThdCleanup__Fv.s b/asm/m_Do/m_Do_DVDError/mDoDvdErr_ThdCleanup__Fv.s
deleted file mode 100644
index d8985f8eb8..0000000000
--- a/asm/m_Do/m_Do_DVDError/mDoDvdErr_ThdCleanup__Fv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_8001665C:
-/* 8001665C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80016660  7C 08 02 A6 */	mflr r0
-/* 80016664  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80016668  88 0D 87 08 */	lbz r0, data_80450C88(r13)
-/* 8001666C  28 00 00 00 */	cmplwi r0, 0
-/* 80016670  41 82 00 24 */	beq lbl_80016694
-/* 80016674  3C 60 80 3E */	lis r3, DvdErr_thread@ha /* 0x803DECC0@ha */
-/* 80016678  38 63 EC C0 */	addi r3, r3, DvdErr_thread@l /* 0x803DECC0@l */
-/* 8001667C  48 32 AE DD */	bl OSCancelThread
-/* 80016680  3C 60 80 3E */	lis r3, Alarm@ha /* 0x803DFBE0@ha */
-/* 80016684  38 63 FB E0 */	addi r3, r3, Alarm@l /* 0x803DFBE0@l */
-/* 80016688  48 32 45 B5 */	bl OSCancelAlarm
-/* 8001668C  38 00 00 00 */	li r0, 0
-/* 80016690  98 0D 87 08 */	stb r0, data_80450C88(r13)
-lbl_80016694:
-/* 80016694  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80016698  7C 08 03 A6 */	mtlr r0
-/* 8001669C  38 21 00 10 */	addi r1, r1, 0x10
-/* 800166A0  4E 80 00 20 */	blr 
diff --git a/asm/m_Do/m_Do_DVDError/mDoDvdErr_ThdInit__Fv.s b/asm/m_Do/m_Do_DVDError/mDoDvdErr_ThdInit__Fv.s
deleted file mode 100644
index eceae7759e..0000000000
--- a/asm/m_Do/m_Do_DVDError/mDoDvdErr_ThdInit__Fv.s
+++ /dev/null
@@ -1,50 +0,0 @@
-lbl_8001659C:
-/* 8001659C  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 800165A0  7C 08 02 A6 */	mflr r0
-/* 800165A4  90 01 00 24 */	stw r0, 0x24(r1)
-/* 800165A8  39 61 00 20 */	addi r11, r1, 0x20
-/* 800165AC  48 34 BC 31 */	bl _savegpr_29
-/* 800165B0  3C 60 80 3E */	lis r3, DvdErr_thread@ha /* 0x803DECC0@ha */
-/* 800165B4  3B E3 EC C0 */	addi r31, r3, DvdErr_thread@l /* 0x803DECC0@l */
-/* 800165B8  88 0D 87 08 */	lbz r0, data_80450C88(r13)
-/* 800165BC  28 00 00 00 */	cmplwi r0, 0
-/* 800165C0  40 82 00 84 */	bne lbl_80016644
-/* 800165C4  48 32 C1 39 */	bl OSGetTime
-/* 800165C8  7C 9D 23 78 */	mr r29, r4
-/* 800165CC  7C 7E 1B 78 */	mr r30, r3
-/* 800165D0  48 32 A6 B5 */	bl OSGetCurrentThread
-/* 800165D4  48 32 B8 89 */	bl OSGetThreadPriority
-/* 800165D8  7C 68 1B 78 */	mr r8, r3
-/* 800165DC  38 7F 00 00 */	addi r3, r31, 0
-/* 800165E0  3C 80 80 01 */	lis r4, mDoDvdErr_Watch__FPv@ha /* 0x800166A4@ha */
-/* 800165E4  38 84 66 A4 */	addi r4, r4, mDoDvdErr_Watch__FPv@l /* 0x800166A4@l */
-/* 800165E8  38 A0 00 00 */	li r5, 0
-/* 800165EC  38 DF 03 20 */	addi r6, r31, 0x320
-/* 800165F0  38 E0 0C 00 */	li r7, 0xc00
-/* 800165F4  39 08 FF FD */	addi r8, r8, -3
-/* 800165F8  39 20 00 01 */	li r9, 1
-/* 800165FC  38 C6 0C 00 */	addi r6, r6, 0xc00
-/* 80016600  48 32 AC 8D */	bl OSCreateThread
-/* 80016604  38 7F 00 00 */	addi r3, r31, 0
-/* 80016608  48 32 B1 AD */	bl OSResumeThread
-/* 8001660C  38 7F 0F 20 */	addi r3, r31, 0xf20
-/* 80016610  48 32 42 E9 */	bl OSCreateAlarm
-/* 80016614  38 7F 0F 20 */	addi r3, r31, 0xf20
-/* 80016618  7F A6 EB 78 */	mr r6, r29
-/* 8001661C  7F C5 F3 78 */	mr r5, r30
-/* 80016620  3C 80 80 00 */	lis r4, 0x8000 /* 0x800000F8@ha */
-/* 80016624  80 04 00 F8 */	lwz r0, 0x00F8(r4)  /* 0x800000F8@l */
-/* 80016628  54 08 F0 BE */	srwi r8, r0, 2
-/* 8001662C  38 E0 00 00 */	li r7, 0
-/* 80016630  3C 80 80 01 */	lis r4, AlarmHandler__FP7OSAlarmP9OSContext@ha /* 0x80016704@ha */
-/* 80016634  39 24 67 04 */	addi r9, r4, AlarmHandler__FP7OSAlarmP9OSContext@l /* 0x80016704@l */
-/* 80016638  48 32 45 89 */	bl OSSetPeriodicAlarm
-/* 8001663C  38 00 00 01 */	li r0, 1
-/* 80016640  98 0D 87 08 */	stb r0, data_80450C88(r13)
-lbl_80016644:
-/* 80016644  39 61 00 20 */	addi r11, r1, 0x20
-/* 80016648  48 34 BB E1 */	bl _restgpr_29
-/* 8001664C  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 80016650  7C 08 03 A6 */	mtlr r0
-/* 80016654  38 21 00 20 */	addi r1, r1, 0x20
-/* 80016658  4E 80 00 20 */	blr 
diff --git a/asm/m_Do/m_Do_DVDError/mDoDvdErr_Watch__FPv.s b/asm/m_Do/m_Do_DVDError/mDoDvdErr_Watch__FPv.s
deleted file mode 100644
index 53304e6951..0000000000
--- a/asm/m_Do/m_Do_DVDError/mDoDvdErr_Watch__FPv.s
+++ /dev/null
@@ -1,27 +0,0 @@
-lbl_800166A4:
-/* 800166A4  94 21 FF 70 */	stwu r1, -0x90(r1)
-/* 800166A8  7C 08 02 A6 */	mflr r0
-/* 800166AC  90 01 00 94 */	stw r0, 0x94(r1)
-/* 800166B0  93 E1 00 8C */	stw r31, 0x8c(r1)
-/* 800166B4  48 32 70 41 */	bl OSDisableInterrupts
-/* 800166B8  48 32 A5 CD */	bl OSGetCurrentThread
-/* 800166BC  7C 64 1B 78 */	mr r4, r3
-/* 800166C0  38 61 00 08 */	addi r3, r1, 8
-/* 800166C4  38 A0 00 00 */	li r5, 0
-/* 800166C8  48 2B AF F1 */	bl __ct__9JKRThreadFP8OSThreadi
-/* 800166CC  38 61 00 08 */	addi r3, r1, 8
-/* 800166D0  38 80 FF FF */	li r4, -1
-/* 800166D4  48 2B B0 85 */	bl __dt__9JKRThreadFv
-/* 800166D8  4B FF 86 0D */	bl mDoExt_getAssertHeap__Fv
-/* 800166DC  48 2B 7D 5D */	bl becomeCurrentHeap__7JKRHeapFv
-/* 800166E0  3C 60 80 3E */	lis r3, DvdErr_thread@ha /* 0x803DECC0@ha */
-/* 800166E4  3B E3 EC C0 */	addi r31, r3, DvdErr_thread@l /* 0x803DECC0@l */
-lbl_800166E8:
-/* 800166E8  48 33 4A E1 */	bl DVDGetDriveStatus
-/* 800166EC  2C 03 FF FF */	cmpwi r3, -1
-/* 800166F0  40 82 00 08 */	bne lbl_800166F8
-/* 800166F4  4B FF F1 C1 */	bl suspend__9mDoDvdThdFv
-lbl_800166F8:
-/* 800166F8  7F E3 FB 78 */	mr r3, r31
-/* 800166FC  48 32 B3 41 */	bl OSSuspendThread
-/* 80016700  4B FF FF E8 */	b lbl_800166E8
diff --git a/asm/m_Do/m_Do_Reset/mDoRst_resetCallBack__FiPv.s b/asm/m_Do/m_Do_Reset/mDoRst_resetCallBack__FiPv.s
deleted file mode 100644
index a93d0550cb..0000000000
--- a/asm/m_Do/m_Do_Reset/mDoRst_resetCallBack__FiPv.s
+++ /dev/null
@@ -1,48 +0,0 @@
-lbl_8001574C:
-/* 8001574C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80015750  7C 08 02 A6 */	mflr r0
-/* 80015754  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80015758  80 8D 86 F8 */	lwz r4, mResetData__6mDoRst(r13)
-/* 8001575C  80 04 00 00 */	lwz r0, 0(r4)
-/* 80015760  2C 00 00 00 */	cmpwi r0, 0
-/* 80015764  40 82 00 80 */	bne lbl_800157E4
-/* 80015768  2C 03 FF FF */	cmpwi r3, -1
-/* 8001576C  40 82 00 0C */	bne lbl_80015778
-/* 80015770  48 24 DB 1D */	bl cAPICPad_recalibrate__Fv
-/* 80015774  48 00 00 40 */	b lbl_800157B4
-lbl_80015778:
-/* 80015778  80 04 00 08 */	lwz r0, 8(r4)
-/* 8001577C  2C 00 00 00 */	cmpwi r0, 0
-/* 80015780  41 82 00 20 */	beq lbl_800157A0
-/* 80015784  38 80 00 00 */	li r4, 0
-/* 80015788  98 8D 8F 81 */	stb r4, struct_80451500+0x1(r13)
-/* 8001578C  3C 60 80 01 */	lis r3, mDoRst_resetCallBack__FiPv@ha /* 0x8001574C@ha */
-/* 80015790  38 03 57 4C */	addi r0, r3, mDoRst_resetCallBack__FiPv@l /* 0x8001574C@l */
-/* 80015794  90 0D 8F 6C */	stw r0, sCallback__Q210JUTGamePad13C3ButtonReset(r13)
-/* 80015798  90 8D 8F 70 */	stw r4, sCallbackArg__Q210JUTGamePad13C3ButtonReset(r13)
-/* 8001579C  48 00 00 48 */	b lbl_800157E4
-lbl_800157A0:
-/* 800157A0  38 00 00 01 */	li r0, 1
-/* 800157A4  90 04 00 08 */	stw r0, 8(r4)
-/* 800157A8  80 8D 86 F8 */	lwz r4, mResetData__6mDoRst(r13)
-/* 800157AC  90 64 00 0C */	stw r3, 0xc(r4)
-/* 800157B0  48 24 DA DD */	bl cAPICPad_recalibrate__Fv
-lbl_800157B4:
-/* 800157B4  48 33 5E 75 */	bl DVDCheckDisk
-/* 800157B8  2C 03 00 00 */	cmpwi r3, 0
-/* 800157BC  40 82 00 1C */	bne lbl_800157D8
-/* 800157C0  48 33 5A 09 */	bl DVDGetDriveStatus
-/* 800157C4  2C 03 FF FF */	cmpwi r3, -1
-/* 800157C8  41 82 00 10 */	beq lbl_800157D8
-/* 800157CC  38 00 00 01 */	li r0, 1
-/* 800157D0  80 6D 86 F8 */	lwz r3, mResetData__6mDoRst(r13)
-/* 800157D4  98 03 00 11 */	stb r0, 0x11(r3)
-lbl_800157D8:
-/* 800157D8  38 00 00 01 */	li r0, 1
-/* 800157DC  80 6D 86 F8 */	lwz r3, mResetData__6mDoRst(r13)
-/* 800157E0  90 03 00 00 */	stw r0, 0(r3)
-lbl_800157E4:
-/* 800157E4  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 800157E8  7C 08 03 A6 */	mtlr r0
-/* 800157EC  38 21 00 10 */	addi r1, r1, 0x10
-/* 800157F0  4E 80 00 20 */	blr 
diff --git a/asm/m_Do/m_Do_Reset/mDoRst_reset__FiUli.s b/asm/m_Do/m_Do_Reset/mDoRst_reset__FiUli.s
deleted file mode 100644
index 1810cc7ed8..0000000000
--- a/asm/m_Do/m_Do_Reset/mDoRst_reset__FiUli.s
+++ /dev/null
@@ -1,87 +0,0 @@
-lbl_80015614:
-/* 80015614  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 80015618  7C 08 02 A6 */	mflr r0
-/* 8001561C  90 01 00 24 */	stw r0, 0x24(r1)
-/* 80015620  39 61 00 20 */	addi r11, r1, 0x20
-/* 80015624  48 34 CB B1 */	bl _savegpr_27
-/* 80015628  7C 7B 1B 78 */	mr r27, r3
-/* 8001562C  7C 9C 23 78 */	mr r28, r4
-/* 80015630  7C BD 2B 78 */	mr r29, r5
-/* 80015634  80 6D 8F D0 */	lwz r3, sManager__6JUTXfb(r13)
-/* 80015638  48 2C FB DD */	bl clearIndex__6JUTXfbFv
-/* 8001563C  48 00 10 21 */	bl mDoDvdErr_ThdCleanup__Fv
-/* 80015640  48 24 DC 4D */	bl cAPICPad_recalibrate__Fv
-/* 80015644  88 0D 86 38 */	lbz r0, struct_80450BB8+0x0(r13)
-/* 80015648  28 00 00 00 */	cmplwi r0, 0
-/* 8001564C  41 82 00 14 */	beq lbl_80015660
-lbl_80015650:
-/* 80015650  80 6D 8D E8 */	lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13)
-/* 80015654  48 2B 84 19 */	bl hasReset__10Z2AudioMgrCFv
-/* 80015658  54 60 06 3F */	clrlwi. r0, r3, 0x18
-/* 8001565C  41 82 FF F4 */	beq lbl_80015650
-lbl_80015660:
-/* 80015660  48 33 5B 69 */	bl DVDGetDriveStatus
-/* 80015664  2C 03 00 01 */	cmpwi r3, 1
-/* 80015668  40 82 00 14 */	bne lbl_8001567C
-/* 8001566C  3C 60 80 37 */	lis r3, m_Do_m_Do_Reset__stringBase0@ha /* 0x80374198@ha */
-/* 80015670  38 63 41 98 */	addi r3, r3, m_Do_m_Do_Reset__stringBase0@l /* 0x80374198@l */
-/* 80015674  4C C6 31 82 */	crclr 6
-/* 80015678  4B FF 11 9D */	bl OSAttention
-lbl_8001567C:
-/* 8001567C  48 27 A8 81 */	bl getThreadPointer__6JASDvdFv
-/* 80015680  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80015684  41 82 00 30 */	beq lbl_800156B4
-/* 80015688  38 80 00 01 */	li r4, 1
-/* 8001568C  48 27 A7 FD */	bl pause__13JASTaskThreadFb
-/* 80015690  83 FF 00 2C */	lwz r31, 0x2c(r31)
-/* 80015694  28 1F 00 00 */	cmplwi r31, 0
-/* 80015698  41 82 00 1C */	beq lbl_800156B4
-/* 8001569C  7F E3 FB 78 */	mr r3, r31
-/* 800156A0  48 32 C3 9D */	bl OSSuspendThread
-/* 800156A4  7F E3 FB 78 */	mr r3, r31
-/* 800156A8  48 32 C0 6D */	bl OSDetachThread
-/* 800156AC  7F E3 FB 78 */	mr r3, r31
-/* 800156B0  48 32 BE A9 */	bl OSCancelThread
-lbl_800156B4:
-/* 800156B4  48 33 73 11 */	bl VIWaitForRetrace
-/* 800156B8  48 33 73 0D */	bl VIWaitForRetrace
-/* 800156BC  48 34 57 E5 */	bl GXGetCurrentGXThread
-/* 800156C0  7C 7F 1B 78 */	mr r31, r3
-/* 800156C4  48 32 80 31 */	bl OSDisableInterrupts
-/* 800156C8  7C 7E 1B 78 */	mr r30, r3
-/* 800156CC  48 32 B5 B9 */	bl OSGetCurrentThread
-/* 800156D0  7C 1F 18 40 */	cmplw r31, r3
-/* 800156D4  41 82 00 10 */	beq lbl_800156E4
-/* 800156D8  7F E3 FB 78 */	mr r3, r31
-/* 800156DC  48 32 BE 7D */	bl OSCancelThread
-/* 800156E0  48 34 57 75 */	bl GXSetCurrentGXThread
-lbl_800156E4:
-/* 800156E4  48 34 67 E9 */	bl GXFlush
-/* 800156E8  48 34 69 AD */	bl GXAbortFrame
-/* 800156EC  48 34 6C 09 */	bl GXDrawDone
-/* 800156F0  7F C3 F3 78 */	mr r3, r30
-/* 800156F4  48 32 80 29 */	bl OSRestoreInterrupts
-/* 800156F8  4B FF FE E5 */	bl destroyVideo__Fv
-/* 800156FC  3C 60 80 3F */	lis r3, g_mDoMemCd_control@ha /* 0x803EAF40@ha */
-/* 80015700  3B E3 AF 40 */	addi r31, r3, g_mDoMemCd_control@l /* 0x803EAF40@l */
-/* 80015704  48 00 00 08 */	b lbl_8001570C
-lbl_80015708:
-/* 80015708  48 33 72 BD */	bl VIWaitForRetrace
-lbl_8001570C:
-/* 8001570C  80 1F 1F C0 */	lwz r0, 0x1fc0(r31)
-/* 80015710  2C 00 00 00 */	cmpwi r0, 0
-/* 80015714  40 82 FF F4 */	bne lbl_80015708
-/* 80015718  4B FF FE C1 */	bl my_OSCancelAlarmAll__Fv
-/* 8001571C  48 32 60 D1 */	bl LCDisable
-/* 80015720  80 6D 86 F8 */	lwz r3, mResetData__6mDoRst(r13)
-/* 80015724  3C 80 80 01 */	lis r4, getResetData__6mDoRstFv@ha /* 0x800157F4@ha */
-/* 80015728  38 84 57 F4 */	addi r4, r4, getResetData__6mDoRstFv@l /* 0x800157F4@l */
-/* 8001572C  38 84 00 18 */	addi r4, r4, 0x18
-/* 80015730  48 32 9F 11 */	bl OSSetSaveRegion
-/* 80015734  7F 63 DB 78 */	mr r3, r27
-/* 80015738  7F 84 E3 78 */	mr r4, r28
-/* 8001573C  7F A5 EB 78 */	mr r5, r29
-/* 80015740  48 32 A1 6D */	bl OSResetSystem
-lbl_80015744:
-/* 80015744  48 33 72 81 */	bl VIWaitForRetrace
-/* 80015748  4B FF FF FC */	b lbl_80015744
diff --git a/asm/m_Do/m_Do_audio/mDoAud_Create__Fv.s b/asm/m_Do/m_Do_audio/mDoAud_Create__Fv.s
deleted file mode 100644
index b9bdf69bca..0000000000
--- a/asm/m_Do/m_Do_audio/mDoAud_Create__Fv.s
+++ /dev/null
@@ -1,113 +0,0 @@
-lbl_80006FC0:
-/* 80006FC0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80006FC4  7C 08 02 A6 */	mflr r0
-/* 80006FC8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80006FCC  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80006FD0  80 0D 86 40 */	lwz r0, l_affCommand(r13)
-/* 80006FD4  28 00 00 00 */	cmplwi r0, 0
-/* 80006FD8  40 82 00 24 */	bne lbl_80006FFC
-/* 80006FDC  3C 60 80 37 */	lis r3, m_Do_m_Do_audio__stringBase0@ha /* 0x80373D68@ha */
-/* 80006FE0  38 63 3D 68 */	addi r3, r3, m_Do_m_Do_audio__stringBase0@l /* 0x80373D68@l */
-/* 80006FE4  38 80 00 02 */	li r4, 2
-/* 80006FE8  38 A0 00 00 */	li r5, 0
-/* 80006FEC  48 00 F3 A9 */	bl create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap
-/* 80006FF0  90 6D 86 40 */	stw r3, l_affCommand(r13)
-/* 80006FF4  28 03 00 00 */	cmplwi r3, 0
-/* 80006FF8  41 82 01 58 */	beq lbl_80007150
-lbl_80006FFC:
-/* 80006FFC  80 0D 86 44 */	lwz r0, l_arcCommand(r13)
-/* 80007000  28 00 00 00 */	cmplwi r0, 0
-/* 80007004  40 82 00 2C */	bne lbl_80007030
-/* 80007008  3C 60 80 37 */	lis r3, m_Do_m_Do_audio__stringBase0@ha /* 0x80373D68@ha */
-/* 8000700C  38 63 3D 68 */	addi r3, r3, m_Do_m_Do_audio__stringBase0@l /* 0x80373D68@l */
-/* 80007010  38 63 00 16 */	addi r3, r3, 0x16
-/* 80007014  38 80 00 00 */	li r4, 0
-/* 80007018  38 A0 00 03 */	li r5, 3
-/* 8000701C  38 C0 00 00 */	li r6, 0
-/* 80007020  48 00 F1 C1 */	bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap
-/* 80007024  90 6D 86 44 */	stw r3, l_arcCommand(r13)
-/* 80007028  28 03 00 00 */	cmplwi r3, 0
-/* 8000702C  41 82 01 24 */	beq lbl_80007150
-lbl_80007030:
-/* 80007030  80 6D 86 40 */	lwz r3, l_affCommand(r13)
-/* 80007034  88 03 00 0C */	lbz r0, 0xc(r3)
-/* 80007038  2C 00 00 00 */	cmpwi r0, 0
-/* 8000703C  41 82 01 14 */	beq lbl_80007150
-/* 80007040  80 6D 86 44 */	lwz r3, l_arcCommand(r13)
-/* 80007044  88 03 00 0C */	lbz r0, 0xc(r3)
-/* 80007048  2C 00 00 00 */	cmpwi r0, 0
-/* 8000704C  41 82 01 04 */	beq lbl_80007150
-/* 80007050  80 0D 86 3C */	lwz r0, g_mDoAud_audioHeap(r13)
-/* 80007054  28 00 00 00 */	cmplwi r0, 0
-/* 80007058  41 82 00 50 */	beq lbl_800070A8
-/* 8000705C  80 6D 8D F4 */	lwz r3, sCurrentHeap__7JKRHeap(r13)
-/* 80007060  38 80 00 05 */	li r4, 5
-/* 80007064  48 2C 77 4D */	bl changeGroupID__7JKRHeapFUc
-/* 80007068  7C 7F 1B 78 */	mr r31, r3
-/* 8000706C  80 6D 86 44 */	lwz r3, l_arcCommand(r13)
-/* 80007070  80 E3 00 1C */	lwz r7, 0x1c(r3)
-/* 80007074  80 6D 86 40 */	lwz r3, l_affCommand(r13)
-/* 80007078  80 C3 00 1C */	lwz r6, 0x1c(r3)
-/* 8000707C  3C 60 80 3E */	lis r3, g_mDoAud_zelAudio@ha /* 0x803DBF4C@ha */
-/* 80007080  38 63 BF 4C */	addi r3, r3, g_mDoAud_zelAudio@l /* 0x803DBF4C@l */
-/* 80007084  80 8D 86 3C */	lwz r4, g_mDoAud_audioHeap(r13)
-/* 80007088  3C A0 00 A0 */	lis r5, 0xa0
-/* 8000708C  48 2C 62 C1 */	bl init__10Z2AudioMgrFP12JKRSolidHeapUlPvP10JKRArchive
-/* 80007090  80 6D 8D F4 */	lwz r3, sCurrentHeap__7JKRHeap(r13)
-/* 80007094  57 E4 06 3E */	clrlwi r4, r31, 0x18
-/* 80007098  48 2C 77 19 */	bl changeGroupID__7JKRHeapFUc
-/* 8000709C  80 6D 86 3C */	lwz r3, g_mDoAud_audioHeap(r13)
-/* 800070A0  48 2C 9B 55 */	bl adjustSize__12JKRSolidHeapFv
-/* 800070A4  48 00 00 18 */	b lbl_800070BC
-lbl_800070A8:
-/* 800070A8  3C 60 80 37 */	lis r3, m_Do_m_Do_audio__stringBase0@ha /* 0x80373D68@ha */
-/* 800070AC  38 63 3D 68 */	addi r3, r3, m_Do_m_Do_audio__stringBase0@l /* 0x80373D68@l */
-/* 800070B0  38 63 00 35 */	addi r3, r3, 0x35
-/* 800070B4  4C C6 31 82 */	crclr 6
-/* 800070B8  4B FF FB 55 */	bl OSReport_Error
-lbl_800070BC:
-/* 800070BC  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 800070C0  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 800070C4  38 83 07 F0 */	addi r4, r3, 0x7f0
-/* 800070C8  3C 60 80 3E */	lis r3, g_mDoAud_zelAudio@ha /* 0x803DBF4C@ha */
-/* 800070CC  38 63 BF 4C */	addi r3, r3, g_mDoAud_zelAudio@l /* 0x803DBF4C@l */
-/* 800070D0  38 63 04 C4 */	addi r3, r3, 0x4c4
-/* 800070D4  48 2A F6 85 */	bl setEventBit__11Z2StatusMgrFPv
-/* 800070D8  3C 60 80 3E */	lis r3, g_mDoAud_zelAudio@ha /* 0x803DBF4C@ha */
-/* 800070DC  38 63 BF 4C */	addi r3, r3, g_mDoAud_zelAudio@l /* 0x803DBF4C@l */
-/* 800070E0  4B FF FE D5 */	bl reset__17mDoAud_zelAudio_cFv
-/* 800070E4  48 33 94 AD */	bl OSGetSoundMode
-/* 800070E8  7C 64 1B 78 */	mr r4, r3
-/* 800070EC  80 6D 8D E8 */	lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13)
-/* 800070F0  48 2C 67 99 */	bl setOutputMode__10Z2AudioMgrFUl
-/* 800070F4  80 6D 86 40 */	lwz r3, l_affCommand(r13)
-/* 800070F8  80 63 00 1C */	lwz r3, 0x1c(r3)
-/* 800070FC  38 80 00 00 */	li r4, 0
-/* 80007100  48 2C 74 01 */	bl free__7JKRHeapFPvP7JKRHeap
-/* 80007104  80 6D 86 40 */	lwz r3, l_affCommand(r13)
-/* 80007108  28 03 00 00 */	cmplwi r3, 0
-/* 8000710C  41 82 00 18 */	beq lbl_80007124
-/* 80007110  38 80 00 01 */	li r4, 1
-/* 80007114  81 83 00 10 */	lwz r12, 0x10(r3)
-/* 80007118  81 8C 00 08 */	lwz r12, 8(r12)
-/* 8000711C  7D 89 03 A6 */	mtctr r12
-/* 80007120  4E 80 04 21 */	bctrl 
-lbl_80007124:
-/* 80007124  80 6D 86 44 */	lwz r3, l_arcCommand(r13)
-/* 80007128  28 03 00 00 */	cmplwi r3, 0
-/* 8000712C  41 82 00 18 */	beq lbl_80007144
-/* 80007130  38 80 00 01 */	li r4, 1
-/* 80007134  81 83 00 10 */	lwz r12, 0x10(r3)
-/* 80007138  81 8C 00 08 */	lwz r12, 8(r12)
-/* 8000713C  7D 89 03 A6 */	mtctr r12
-/* 80007140  4E 80 04 21 */	bctrl 
-lbl_80007144:
-/* 80007144  38 00 00 01 */	li r0, 1
-/* 80007148  98 0D 86 38 */	stb r0, struct_80450BB8+0x0(r13)
-/* 8000714C  98 0D 87 00 */	stb r0, struct_80450C80+0x0(r13)
-lbl_80007150:
-/* 80007150  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80007154  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80007158  7C 08 03 A6 */	mtlr r0
-/* 8000715C  38 21 00 10 */	addi r1, r1, 0x10
-/* 80007160  4E 80 00 20 */	blr 
diff --git a/asm/m_Do/m_Do_audio/mDoAud_Execute__Fv.s b/asm/m_Do/m_Do_audio/mDoAud_Execute__Fv.s
deleted file mode 100644
index 49b53541de..0000000000
--- a/asm/m_Do/m_Do_audio/mDoAud_Execute__Fv.s
+++ /dev/null
@@ -1,25 +0,0 @@
-lbl_80007164:
-/* 80007164  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80007168  7C 08 02 A6 */	mflr r0
-/* 8000716C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80007170  88 0D 86 38 */	lbz r0, struct_80450BB8+0x0(r13)
-/* 80007174  28 00 00 00 */	cmplwi r0, 0
-/* 80007178  40 82 00 28 */	bne lbl_800071A0
-/* 8000717C  80 6D 86 F8 */	lwz r3, mResetData__6mDoRst(r13)
-/* 80007180  88 03 00 10 */	lbz r0, 0x10(r3)
-/* 80007184  2C 00 00 00 */	cmpwi r0, 0
-/* 80007188  40 82 00 24 */	bne lbl_800071AC
-/* 8000718C  88 03 00 11 */	lbz r0, 0x11(r3)
-/* 80007190  2C 00 00 00 */	cmpwi r0, 0
-/* 80007194  40 82 00 18 */	bne lbl_800071AC
-/* 80007198  4B FF FE 29 */	bl mDoAud_Create__Fv
-/* 8000719C  48 00 00 10 */	b lbl_800071AC
-lbl_800071A0:
-/* 800071A0  3C 60 80 3E */	lis r3, g_mDoAud_zelAudio@ha /* 0x803DBF4C@ha */
-/* 800071A4  38 63 BF 4C */	addi r3, r3, g_mDoAud_zelAudio@l /* 0x803DBF4C@l */
-/* 800071A8  48 2C 67 5D */	bl gframeProcess__10Z2AudioMgrFv
-lbl_800071AC:
-/* 800071AC  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 800071B0  7C 08 03 A6 */	mtlr r0
-/* 800071B4  38 21 00 10 */	addi r1, r1, 0x10
-/* 800071B8  4E 80 00 20 */	blr 
diff --git a/asm/m_Do/m_Do_ext/func_8001505C.s b/asm/m_Do/m_Do_ext/func_8001505C.s
deleted file mode 100644
index 388b3cae08..0000000000
--- a/asm/m_Do/m_Do_ext/func_8001505C.s
+++ /dev/null
@@ -1,11 +0,0 @@
-lbl_8001505C:
-/* 8001505C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80015060  7C 08 02 A6 */	mflr r0
-/* 80015064  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80015068  7C 83 23 78 */	mr r3, r4
-/* 8001506C  7C A4 2B 78 */	mr r4, r5
-/* 80015070  48 31 9C 3D */	bl init__24J3DMtxCalcJ3DSysInitMayaFRC3VecRA3_A4_Cf
-/* 80015074  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80015078  7C 08 03 A6 */	mtlr r0
-/* 8001507C  38 21 00 10 */	addi r1, r1, 0x10
-/* 80015080  4E 80 00 20 */	blr 
diff --git a/asm/m_Do/m_Do_ext/func_80015084.s b/asm/m_Do/m_Do_ext/func_80015084.s
deleted file mode 100644
index ada0bb1292..0000000000
--- a/asm/m_Do/m_Do_ext/func_80015084.s
+++ /dev/null
@@ -1,11 +0,0 @@
-lbl_80015084:
-/* 80015084  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80015088  7C 08 02 A6 */	mflr r0
-/* 8001508C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80015090  80 6D 90 74 */	lwz r3, mJoint__10J3DMtxCalc(r13)
-/* 80015094  38 63 00 18 */	addi r3, r3, 0x18
-/* 80015098  48 31 9F 25 */	bl calcTransform__27J3DMtxCalcCalcTransformMayaFRC16J3DTransformInfo
-/* 8001509C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 800150A0  7C 08 03 A6 */	mtlr r0
-/* 800150A4  38 21 00 10 */	addi r1, r1, 0x10
-/* 800150A8  4E 80 00 20 */	blr 
diff --git a/asm/m_Do/m_Do_main/Debug_console__FUl.s b/asm/m_Do/m_Do_main/Debug_console__FUl.s
deleted file mode 100644
index e49dccdc7c..0000000000
--- a/asm/m_Do/m_Do_main/Debug_console__FUl.s
+++ /dev/null
@@ -1,280 +0,0 @@
-lbl_80005D4C:
-/* 80005D4C  94 21 FF B0 */	stwu r1, -0x50(r1)
-/* 80005D50  7C 08 02 A6 */	mflr r0
-/* 80005D54  90 01 00 54 */	stw r0, 0x54(r1)
-/* 80005D58  DB E1 00 40 */	stfd f31, 0x40(r1)
-/* 80005D5C  F3 E1 00 48 */	psq_st f31, 72(r1), 0, 0 /* qr0 */
-/* 80005D60  DB C1 00 30 */	stfd f30, 0x30(r1)
-/* 80005D64  F3 C1 00 38 */	psq_st f30, 56(r1), 0, 0 /* qr0 */
-/* 80005D68  39 61 00 30 */	addi r11, r1, 0x30
-/* 80005D6C  48 35 C4 6D */	bl _savegpr_28
-/* 80005D70  83 ED 8C 38 */	lwz r31, systemConsole__9JFWSystem(r13)
-/* 80005D74  28 1F 00 00 */	cmplwi r31, 0
-/* 80005D78  41 82 03 A8 */	beq lbl_80006120
-/* 80005D7C  88 0D 85 A0 */	lbz r0, data_80450B20(r13)
-/* 80005D80  7C 00 07 75 */	extsb. r0, r0
-/* 80005D84  40 82 00 14 */	bne lbl_80005D98
-/* 80005D88  C0 02 80 00 */	lfs f0, lit_3884(r2)
-/* 80005D8C  D0 0D 85 9C */	stfs f0, console_position_x(r13)
-/* 80005D90  38 00 00 01 */	li r0, 1
-/* 80005D94  98 0D 85 A0 */	stb r0, data_80450B20(r13)
-lbl_80005D98:
-/* 80005D98  88 0D 85 A8 */	lbz r0, data_80450B28(r13)
-/* 80005D9C  7C 00 07 75 */	extsb. r0, r0
-/* 80005DA0  40 82 00 14 */	bne lbl_80005DB4
-/* 80005DA4  C0 02 80 04 */	lfs f0, lit_3885(r2)
-/* 80005DA8  D0 0D 85 A4 */	stfs f0, console_position_y(r13)
-/* 80005DAC  38 00 00 01 */	li r0, 1
-/* 80005DB0  98 0D 85 A8 */	stb r0, data_80450B28(r13)
-lbl_80005DB4:
-/* 80005DB4  88 0D 85 B0 */	lbz r0, data_80450B30(r13)
-/* 80005DB8  7C 00 07 75 */	extsb. r0, r0
-/* 80005DBC  40 82 00 14 */	bne lbl_80005DD0
-/* 80005DC0  C0 02 80 08 */	lfs f0, lit_3886(r2)
-/* 80005DC4  D0 0D 85 AC */	stfs f0, console_scroll(r13)
-/* 80005DC8  38 00 00 01 */	li r0, 1
-/* 80005DCC  98 0D 85 B0 */	stb r0, data_80450B30(r13)
-lbl_80005DD0:
-/* 80005DD0  54 64 30 32 */	slwi r4, r3, 6
-/* 80005DD4  3C 60 80 3E */	lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */
-/* 80005DD8  38 03 D2 E8 */	addi r0, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */
-/* 80005DDC  7F A0 22 14 */	add r29, r0, r4
-/* 80005DE0  3B DD 00 34 */	addi r30, r29, 0x34
-/* 80005DE4  80 1D 00 34 */	lwz r0, 0x34(r29)
-/* 80005DE8  54 00 06 F7 */	rlwinm. r0, r0, 0, 0x1b, 0x1b
-/* 80005DEC  41 82 00 28 */	beq lbl_80005E14
-/* 80005DF0  80 1D 00 30 */	lwz r0, 0x30(r29)
-/* 80005DF4  54 00 07 35 */	rlwinm. r0, r0, 0, 0x1c, 0x1a
-/* 80005DF8  40 82 00 1C */	bne lbl_80005E14
-/* 80005DFC  88 1F 00 68 */	lbz r0, 0x68(r31)
-/* 80005E00  7C 00 00 34 */	cntlzw r0, r0
-/* 80005E04  54 00 D9 7E */	srwi r0, r0, 5
-/* 80005E08  98 1F 00 68 */	stb r0, 0x68(r31)
-/* 80005E0C  38 60 00 00 */	li r3, 0
-/* 80005E10  48 2D EE 2D */	bl setMessageCount__12JUTAssertionFi
-lbl_80005E14:
-/* 80005E14  88 1F 00 68 */	lbz r0, 0x68(r31)
-/* 80005E18  28 00 00 00 */	cmplwi r0, 0
-/* 80005E1C  41 82 03 04 */	beq lbl_80006120
-/* 80005E20  3B 9D 00 30 */	addi r28, r29, 0x30
-/* 80005E24  80 7D 00 30 */	lwz r3, 0x30(r29)
-/* 80005E28  54 60 06 73 */	rlwinm. r0, r3, 0, 0x19, 0x19
-/* 80005E2C  41 82 00 0C */	beq lbl_80005E38
-/* 80005E30  54 60 06 B5 */	rlwinm. r0, r3, 0, 0x1a, 0x1a
-/* 80005E34  40 82 00 20 */	bne lbl_80005E54
-lbl_80005E38:
-/* 80005E38  C0 1D 00 28 */	lfs f0, 0x28(r29)
-/* 80005E3C  C0 22 80 08 */	lfs f1, lit_3886(r2)
-/* 80005E40  FC 00 08 40 */	fcmpo cr0, f0, f1
-/* 80005E44  40 81 01 B0 */	ble lbl_80005FF4
-/* 80005E48  C0 1D 00 2C */	lfs f0, 0x2c(r29)
-/* 80005E4C  FC 00 08 40 */	fcmpo cr0, f0, f1
-/* 80005E50  40 81 01 A4 */	ble lbl_80005FF4
-lbl_80005E54:
-/* 80005E54  C3 FD 00 00 */	lfs f31, 0(r29)
-/* 80005E58  C3 DD 00 04 */	lfs f30, 4(r29)
-/* 80005E5C  54 60 05 2B */	rlwinm. r0, r3, 0, 0x14, 0x15
-/* 80005E60  41 82 00 18 */	beq lbl_80005E78
-/* 80005E64  80 1E 00 00 */	lwz r0, 0(r30)
-/* 80005E68  54 00 04 E7 */	rlwinm. r0, r0, 0, 0x13, 0x13
-/* 80005E6C  41 82 00 0C */	beq lbl_80005E78
-/* 80005E70  7F E3 FB 78 */	mr r3, r31
-/* 80005E74  48 2E 17 79 */	bl clear__10JUTConsoleFv
-lbl_80005E78:
-/* 80005E78  80 7C 00 00 */	lwz r3, 0(r28)
-/* 80005E7C  54 60 05 2B */	rlwinm. r0, r3, 0, 0x14, 0x15
-/* 80005E80  40 82 00 90 */	bne lbl_80005F10
-/* 80005E84  C0 0D 85 AC */	lfs f0, console_scroll(r13)
-/* 80005E88  EC 20 F0 28 */	fsubs f1, f0, f30
-/* 80005E8C  D0 2D 85 AC */	stfs f1, console_scroll(r13)
-/* 80005E90  C0 02 80 0C */	lfs f0, lit_3887(r2)
-/* 80005E94  FC 01 00 40 */	fcmpo cr0, f1, f0
-/* 80005E98  40 81 00 14 */	ble lbl_80005EAC
-/* 80005E9C  FC 00 08 1E */	fctiwz f0, f1
-/* 80005EA0  D8 01 00 08 */	stfd f0, 8(r1)
-/* 80005EA4  80 81 00 0C */	lwz r4, 0xc(r1)
-/* 80005EA8  48 00 00 2C */	b lbl_80005ED4
-lbl_80005EAC:
-/* 80005EAC  C0 02 80 10 */	lfs f0, lit_3888(r2)
-/* 80005EB0  FC 01 00 40 */	fcmpo cr0, f1, f0
-/* 80005EB4  40 80 00 1C */	bge lbl_80005ED0
-/* 80005EB8  FC 00 08 50 */	fneg f0, f1
-/* 80005EBC  FC 00 00 1E */	fctiwz f0, f0
-/* 80005EC0  D8 01 00 08 */	stfd f0, 8(r1)
-/* 80005EC4  80 01 00 0C */	lwz r0, 0xc(r1)
-/* 80005EC8  7C 80 00 D0 */	neg r4, r0
-/* 80005ECC  48 00 00 08 */	b lbl_80005ED4
-lbl_80005ED0:
-/* 80005ED0  38 80 00 00 */	li r4, 0
-lbl_80005ED4:
-/* 80005ED4  2C 04 00 00 */	cmpwi r4, 0
-/* 80005ED8  41 82 00 60 */	beq lbl_80005F38
-/* 80005EDC  C0 4D 85 AC */	lfs f2, console_scroll(r13)
-/* 80005EE0  C8 22 80 18 */	lfd f1, lit_3890(r2)
-/* 80005EE4  6C 80 80 00 */	xoris r0, r4, 0x8000
-/* 80005EE8  90 01 00 0C */	stw r0, 0xc(r1)
-/* 80005EEC  3C 00 43 30 */	lis r0, 0x4330
-/* 80005EF0  90 01 00 08 */	stw r0, 8(r1)
-/* 80005EF4  C8 01 00 08 */	lfd f0, 8(r1)
-/* 80005EF8  EC 00 08 28 */	fsubs f0, f0, f1
-/* 80005EFC  EC 02 00 28 */	fsubs f0, f2, f0
-/* 80005F00  D0 0D 85 AC */	stfs f0, console_scroll(r13)
-/* 80005F04  7F E3 FB 78 */	mr r3, r31
-/* 80005F08  48 2E 21 A1 */	bl scroll__10JUTConsoleFi
-/* 80005F0C  48 00 00 2C */	b lbl_80005F38
-lbl_80005F10:
-/* 80005F10  54 60 05 6B */	rlwinm. r0, r3, 0, 0x15, 0x15
-/* 80005F14  41 82 00 10 */	beq lbl_80005F24
-/* 80005F18  C0 0D 85 9C */	lfs f0, console_position_x(r13)
-/* 80005F1C  EC 00 F8 2A */	fadds f0, f0, f31
-/* 80005F20  D0 0D 85 9C */	stfs f0, console_position_x(r13)
-lbl_80005F24:
-/* 80005F24  54 60 05 29 */	rlwinm. r0, r3, 0, 0x14, 0x14
-/* 80005F28  41 82 00 10 */	beq lbl_80005F38
-/* 80005F2C  C0 0D 85 A4 */	lfs f0, console_position_y(r13)
-/* 80005F30  EC 00 F0 28 */	fsubs f0, f0, f30
-/* 80005F34  D0 0D 85 A4 */	stfs f0, console_position_y(r13)
-lbl_80005F38:
-/* 80005F38  80 1E 00 00 */	lwz r0, 0(r30)
-/* 80005F3C  54 00 05 EF */	rlwinm. r0, r0, 0, 0x17, 0x17
-/* 80005F40  41 82 00 18 */	beq lbl_80005F58
-/* 80005F44  7F E3 FB 78 */	mr r3, r31
-/* 80005F48  38 80 FF FF */	li r4, -1
-/* 80005F4C  48 2E 20 31 */	bl dumpToTerminal__10JUTConsoleFUi
-/* 80005F50  38 00 00 03 */	li r0, 3
-/* 80005F54  90 1F 00 58 */	stw r0, 0x58(r31)
-lbl_80005F58:
-/* 80005F58  38 60 00 1E */	li r3, 0x1e
-/* 80005F5C  38 80 01 86 */	li r4, 0x186
-/* 80005F60  38 A0 00 01 */	li r5, 1
-/* 80005F64  3C C0 80 37 */	lis r6, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
-/* 80005F68  38 C6 39 A0 */	addi r6, r6, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
-/* 80005F6C  38 C6 01 B1 */	addi r6, r6, 0x1b1
-/* 80005F70  4C C6 31 82 */	crclr 6
-/* 80005F74  48 2D A6 8D */	bl JUTReport__FiiiPCce
-/* 80005F78  38 60 00 1E */	li r3, 0x1e
-/* 80005F7C  38 80 01 90 */	li r4, 0x190
-/* 80005F80  38 A0 00 01 */	li r5, 1
-/* 80005F84  3C C0 80 37 */	lis r6, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
-/* 80005F88  38 C6 39 A0 */	addi r6, r6, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
-/* 80005F8C  38 C6 01 D3 */	addi r6, r6, 0x1d3
-/* 80005F90  4C C6 31 82 */	crclr 6
-/* 80005F94  48 2D A6 6D */	bl JUTReport__FiiiPCce
-/* 80005F98  38 60 00 1E */	li r3, 0x1e
-/* 80005F9C  38 80 01 9A */	li r4, 0x19a
-/* 80005FA0  38 A0 00 01 */	li r5, 1
-/* 80005FA4  3C C0 80 37 */	lis r6, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
-/* 80005FA8  38 C6 39 A0 */	addi r6, r6, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
-/* 80005FAC  38 C6 01 ED */	addi r6, r6, 0x1ed
-/* 80005FB0  4C C6 31 82 */	crclr 6
-/* 80005FB4  48 2D A6 4D */	bl JUTReport__FiiiPCce
-/* 80005FB8  7F E3 FB 78 */	mr r3, r31
-/* 80005FBC  48 2E 21 ED */	bl getLineOffset__10JUTConsoleCFv
-/* 80005FC0  7C 67 1B 78 */	mr r7, r3
-/* 80005FC4  38 60 00 1E */	li r3, 0x1e
-/* 80005FC8  38 80 01 A4 */	li r4, 0x1a4
-/* 80005FCC  38 A0 00 01 */	li r5, 1
-/* 80005FD0  3C C0 80 37 */	lis r6, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
-/* 80005FD4  38 C6 39 A0 */	addi r6, r6, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
-/* 80005FD8  38 C6 02 16 */	addi r6, r6, 0x216
-/* 80005FDC  81 1F 00 40 */	lwz r8, 0x40(r31)
-/* 80005FE0  81 3F 00 44 */	lwz r9, 0x44(r31)
-/* 80005FE4  81 5F 00 58 */	lwz r10, 0x58(r31)
-/* 80005FE8  4C C6 31 82 */	crclr 6
-/* 80005FEC  48 2D A6 15 */	bl JUTReport__FiiiPCce
-/* 80005FF0  48 00 01 00 */	b lbl_800060F0
-lbl_80005FF4:
-/* 80005FF4  80 9E 00 00 */	lwz r4, 0(r30)
-/* 80005FF8  54 80 07 7B */	rlwinm. r0, r4, 0, 0x1d, 0x1d
-/* 80005FFC  41 82 00 18 */	beq lbl_80006014
-/* 80006000  3C 60 80 3F */	lis r3, g_HIO@ha /* 0x803F1BBC@ha */
-/* 80006004  38 63 1B BC */	addi r3, r3, g_HIO@l /* 0x803F1BBC@l */
-/* 80006008  88 03 00 15 */	lbz r0, 0x15(r3)
-/* 8000600C  68 00 00 01 */	xori r0, r0, 1
-/* 80006010  98 03 00 15 */	stb r0, 0x15(r3)
-lbl_80006014:
-/* 80006014  54 80 07 FF */	clrlwi. r0, r4, 0x1f
-/* 80006018  41 82 00 30 */	beq lbl_80006048
-/* 8000601C  80 6D 8E 48 */	lwz r3, sAramObject__7JKRAram(r13)
-/* 80006020  80 63 00 94 */	lwz r3, 0x94(r3)
-/* 80006024  28 03 00 00 */	cmplwi r3, 0
-/* 80006028  41 82 00 08 */	beq lbl_80006030
-/* 8000602C  48 2C D1 ED */	bl dump__11JKRAramHeapFv
-lbl_80006030:
-/* 80006030  48 25 C4 41 */	bl dump__24DynamicModuleControlBaseFv
-/* 80006034  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80006038  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8000603C  3C 63 00 02 */	addis r3, r3, 2
-/* 80006040  38 63 C2 F8 */	addi r3, r3, -15624
-/* 80006044  48 03 65 F5 */	bl dump__14dRes_control_cFv
-lbl_80006048:
-/* 80006048  80 1E 00 00 */	lwz r0, 0(r30)
-/* 8000604C  54 00 07 BD */	rlwinm. r0, r0, 0, 0x1e, 0x1e
-/* 80006050  41 82 00 18 */	beq lbl_80006068
-/* 80006054  80 6D 8D F0 */	lwz r3, sSystemHeap__7JKRHeap(r13)
-/* 80006058  81 83 00 00 */	lwz r12, 0(r3)
-/* 8000605C  81 8C 00 18 */	lwz r12, 0x18(r12)
-/* 80006060  7D 89 03 A6 */	mtctr r12
-/* 80006064  4E 80 04 21 */	bctrl 
-lbl_80006068:
-/* 80006068  80 1E 00 00 */	lwz r0, 0(r30)
-/* 8000606C  54 00 07 39 */	rlwinm. r0, r0, 0, 0x1c, 0x1c
-/* 80006070  41 82 00 40 */	beq lbl_800060B0
-/* 80006074  80 6D 86 AC */	lwz r3, zeldaHeap(r13)
-/* 80006078  81 83 00 00 */	lwz r12, 0(r3)
-/* 8000607C  81 8C 00 18 */	lwz r12, 0x18(r12)
-/* 80006080  7D 89 03 A6 */	mtctr r12
-/* 80006084  4E 80 04 21 */	bctrl 
-/* 80006088  80 6D 86 A8 */	lwz r3, gameHeap(r13)
-/* 8000608C  81 83 00 00 */	lwz r12, 0(r3)
-/* 80006090  81 8C 00 18 */	lwz r12, 0x18(r12)
-/* 80006094  7D 89 03 A6 */	mtctr r12
-/* 80006098  4E 80 04 21 */	bctrl 
-/* 8000609C  80 6D 86 B4 */	lwz r3, archiveHeap(r13)
-/* 800060A0  81 83 00 00 */	lwz r12, 0(r3)
-/* 800060A4  81 8C 00 18 */	lwz r12, 0x18(r12)
-/* 800060A8  7D 89 03 A6 */	mtctr r12
-/* 800060AC  4E 80 04 21 */	bctrl 
-lbl_800060B0:
-/* 800060B0  38 60 00 1E */	li r3, 0x1e
-/* 800060B4  38 80 01 B8 */	li r4, 0x1b8
-/* 800060B8  38 A0 00 01 */	li r5, 1
-/* 800060BC  3C C0 80 37 */	lis r6, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
-/* 800060C0  38 C6 39 A0 */	addi r6, r6, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
-/* 800060C4  38 C6 02 35 */	addi r6, r6, 0x235
-/* 800060C8  4C C6 31 82 */	crclr 6
-/* 800060CC  48 2D A5 35 */	bl JUTReport__FiiiPCce
-/* 800060D0  38 60 00 1E */	li r3, 0x1e
-/* 800060D4  38 80 01 C2 */	li r4, 0x1c2
-/* 800060D8  38 A0 00 01 */	li r5, 1
-/* 800060DC  3C C0 80 37 */	lis r6, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
-/* 800060E0  38 C6 39 A0 */	addi r6, r6, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
-/* 800060E4  38 C6 02 5B */	addi r6, r6, 0x25b
-/* 800060E8  4C C6 31 82 */	crclr 6
-/* 800060EC  48 2D A5 15 */	bl JUTReport__FiiiPCce
-lbl_800060F0:
-/* 800060F0  C0 0D 85 A4 */	lfs f0, console_position_y(r13)
-/* 800060F4  FC 00 00 1E */	fctiwz f0, f0
-/* 800060F8  D8 01 00 08 */	stfd f0, 8(r1)
-/* 800060FC  80 61 00 0C */	lwz r3, 0xc(r1)
-/* 80006100  C0 0D 85 9C */	lfs f0, console_position_x(r13)
-/* 80006104  FC 00 00 1E */	fctiwz f0, f0
-/* 80006108  D8 01 00 10 */	stfd f0, 0x10(r1)
-/* 8000610C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80006110  90 1F 00 40 */	stw r0, 0x40(r31)
-/* 80006114  90 7F 00 44 */	stw r3, 0x44(r31)
-/* 80006118  38 60 00 01 */	li r3, 1
-/* 8000611C  48 00 00 08 */	b lbl_80006124
-lbl_80006120:
-/* 80006120  38 60 00 00 */	li r3, 0
-lbl_80006124:
-/* 80006124  E3 E1 00 48 */	psq_l f31, 72(r1), 0, 0 /* qr0 */
-/* 80006128  CB E1 00 40 */	lfd f31, 0x40(r1)
-/* 8000612C  E3 C1 00 38 */	psq_l f30, 56(r1), 0, 0 /* qr0 */
-/* 80006130  CB C1 00 30 */	lfd f30, 0x30(r1)
-/* 80006134  39 61 00 30 */	addi r11, r1, 0x30
-/* 80006138  48 35 C0 ED */	bl _restgpr_28
-/* 8000613C  80 01 00 54 */	lwz r0, 0x54(r1)
-/* 80006140  7C 08 03 A6 */	mtlr r0
-/* 80006144  38 21 00 50 */	addi r1, r1, 0x50
-/* 80006148  4E 80 00 20 */	blr 
diff --git a/asm/m_Do/m_Do_main/debugDisplay__Fv.s b/asm/m_Do/m_Do_main/debugDisplay__Fv.s
deleted file mode 100644
index 03a2896234..0000000000
--- a/asm/m_Do/m_Do_main/debugDisplay__Fv.s
+++ /dev/null
@@ -1,168 +0,0 @@
-lbl_80005AD8:
-/* 80005AD8  94 21 FF D0 */	stwu r1, -0x30(r1)
-/* 80005ADC  7C 08 02 A6 */	mflr r0
-/* 80005AE0  90 01 00 34 */	stw r0, 0x34(r1)
-/* 80005AE4  39 61 00 30 */	addi r11, r1, 0x30
-/* 80005AE8  48 35 C6 DD */	bl _savegpr_23
-/* 80005AEC  3C 60 80 3A */	lis r3, COPYDATE_STRING__7mDoMain@ha /* 0x803A2EE0@ha */
-/* 80005AF0  3B 23 2E E0 */	addi r25, r3, COPYDATE_STRING__7mDoMain@l /* 0x803A2EE0@l */
-/* 80005AF4  88 0D 85 99 */	lbz r0, struct_80450B18+0x1(r13)
-/* 80005AF8  28 00 00 01 */	cmplwi r0, 1
-/* 80005AFC  41 80 00 20 */	blt lbl_80005B1C
-/* 80005B00  28 00 00 06 */	cmplwi r0, 6
-/* 80005B04  41 81 00 18 */	bgt lbl_80005B1C
-/* 80005B08  38 79 00 14 */	addi r3, r25, 0x14
-/* 80005B0C  54 00 15 BA */	rlwinm r0, r0, 2, 0x16, 0x1d
-/* 80005B10  7C 63 02 14 */	add r3, r3, r0
-/* 80005B14  80 63 FF FC */	lwz r3, -4(r3)
-/* 80005B18  4B FF FD AD */	bl heapDisplay__9HeapCheckCFv
-lbl_80005B1C:
-/* 80005B1C  88 0D 80 08 */	lbz r0, data_80450588(r13)
-/* 80005B20  28 00 00 05 */	cmplwi r0, 5
-/* 80005B24  40 82 00 A0 */	bne lbl_80005BC4
-/* 80005B28  80 6D 8E 48 */	lwz r3, sAramObject__7JKRAram(r13)
-/* 80005B2C  83 23 00 94 */	lwz r25, 0x94(r3)
-/* 80005B30  28 19 00 00 */	cmplwi r25, 0
-/* 80005B34  41 82 02 00 */	beq lbl_80005D34
-/* 80005B38  38 60 01 DB */	li r3, 0x1db
-/* 80005B3C  38 80 00 64 */	li r4, 0x64
-/* 80005B40  3C A0 80 37 */	lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
-/* 80005B44  38 A5 39 A0 */	addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
-/* 80005B48  38 A5 01 96 */	addi r5, r5, 0x196
-/* 80005B4C  4C C6 31 82 */	crclr 6
-/* 80005B50  48 2D A9 E1 */	bl JUTReport__FiiPCce
-/* 80005B54  7F 23 CB 78 */	mr r3, r25
-/* 80005B58  48 2C D5 DD */	bl getFreeSize__11JKRAramHeapFv
-/* 80005B5C  7C 66 1B 78 */	mr r6, r3
-/* 80005B60  38 60 01 DB */	li r3, 0x1db
-/* 80005B64  38 80 00 72 */	li r4, 0x72
-/* 80005B68  3C A0 80 37 */	lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
-/* 80005B6C  38 A5 39 A0 */	addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
-/* 80005B70  38 A5 01 A0 */	addi r5, r5, 0x1a0
-/* 80005B74  4C C6 31 82 */	crclr 6
-/* 80005B78  48 2D A9 B9 */	bl JUTReport__FiiPCce
-/* 80005B7C  38 60 01 DB */	li r3, 0x1db
-/* 80005B80  38 80 00 80 */	li r4, 0x80
-/* 80005B84  3C A0 80 37 */	lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
-/* 80005B88  38 A5 39 A0 */	addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
-/* 80005B8C  38 A5 01 50 */	addi r5, r5, 0x150
-/* 80005B90  4C C6 31 82 */	crclr 6
-/* 80005B94  48 2D A9 9D */	bl JUTReport__FiiPCce
-/* 80005B98  7F 23 CB 78 */	mr r3, r25
-/* 80005B9C  48 2C D6 11 */	bl getTotalFreeSize__11JKRAramHeapFv
-/* 80005BA0  7C 66 1B 78 */	mr r6, r3
-/* 80005BA4  38 60 01 DB */	li r3, 0x1db
-/* 80005BA8  38 80 00 8E */	li r4, 0x8e
-/* 80005BAC  3C A0 80 37 */	lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
-/* 80005BB0  38 A5 39 A0 */	addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
-/* 80005BB4  38 A5 01 A0 */	addi r5, r5, 0x1a0
-/* 80005BB8  4C C6 31 82 */	crclr 6
-/* 80005BBC  48 2D A9 75 */	bl JUTReport__FiiPCce
-/* 80005BC0  48 00 01 74 */	b lbl_80005D34
-lbl_80005BC4:
-/* 80005BC4  28 00 00 00 */	cmplwi r0, 0
-/* 80005BC8  41 82 01 6C */	beq lbl_80005D34
-/* 80005BCC  38 60 01 DB */	li r3, 0x1db
-/* 80005BD0  38 80 00 64 */	li r4, 0x64
-/* 80005BD4  3C A0 80 37 */	lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
-/* 80005BD8  38 A5 39 A0 */	addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
-/* 80005BDC  38 A5 01 A3 */	addi r5, r5, 0x1a3
-/* 80005BE0  54 00 15 BA */	rlwinm r0, r0, 2, 0x16, 0x1d
-/* 80005BE4  38 D9 00 34 */	addi r6, r25, 0x34
-/* 80005BE8  7C C6 00 2E */	lwzx r6, r6, r0
-/* 80005BEC  4C C6 31 82 */	crclr 6
-/* 80005BF0  48 2D A9 41 */	bl JUTReport__FiiPCce
-/* 80005BF4  38 60 01 DB */	li r3, 0x1db
-/* 80005BF8  38 80 00 72 */	li r4, 0x72
-/* 80005BFC  3C A0 80 37 */	lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
-/* 80005C00  38 A5 39 A0 */	addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
-/* 80005C04  38 A5 01 A3 */	addi r5, r5, 0x1a3
-/* 80005C08  88 0D 80 08 */	lbz r0, data_80450588(r13)
-/* 80005C0C  54 00 10 3A */	slwi r0, r0, 2
-/* 80005C10  38 D9 00 48 */	addi r6, r25, 0x48
-/* 80005C14  7C C6 00 2E */	lwzx r6, r6, r0
-/* 80005C18  4C C6 31 82 */	crclr 6
-/* 80005C1C  48 2D A9 15 */	bl JUTReport__FiiPCce
-/* 80005C20  3B E0 00 00 */	li r31, 0
-/* 80005C24  3B 80 00 00 */	li r28, 0
-/* 80005C28  3B 60 00 00 */	li r27, 0
-/* 80005C2C  3B 39 00 14 */	addi r25, r25, 0x14
-/* 80005C30  3C 60 80 37 */	lis r3, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
-/* 80005C34  3B 43 39 A0 */	addi r26, r3, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
-lbl_80005C38:
-/* 80005C38  7E F9 D8 2E */	lwzx r23, r25, r27
-/* 80005C3C  83 17 00 08 */	lwz r24, 8(r23)
-/* 80005C40  88 0D 80 08 */	lbz r0, data_80450588(r13)
-/* 80005C44  2C 00 00 03 */	cmpwi r0, 3
-/* 80005C48  41 82 00 4C */	beq lbl_80005C94
-/* 80005C4C  40 80 00 14 */	bge lbl_80005C60
-/* 80005C50  2C 00 00 01 */	cmpwi r0, 1
-/* 80005C54  41 82 00 18 */	beq lbl_80005C6C
-/* 80005C58  40 80 00 30 */	bge lbl_80005C88
-/* 80005C5C  48 00 00 7C */	b lbl_80005CD8
-lbl_80005C60:
-/* 80005C60  2C 00 00 05 */	cmpwi r0, 5
-/* 80005C64  40 80 00 74 */	bge lbl_80005CD8
-/* 80005C68  48 00 00 48 */	b lbl_80005CB0
-lbl_80005C6C:
-/* 80005C6C  7F 03 C3 78 */	mr r3, r24
-/* 80005C70  48 2C 8B 15 */	bl getTotalFreeSize__7JKRHeapFv
-/* 80005C74  7C 7E 1B 78 */	mr r30, r3
-/* 80005C78  7F 03 C3 78 */	mr r3, r24
-/* 80005C7C  48 2C 8A B1 */	bl getFreeSize__7JKRHeapFv
-/* 80005C80  7C 7D 1B 78 */	mr r29, r3
-/* 80005C84  48 00 00 54 */	b lbl_80005CD8
-lbl_80005C88:
-/* 80005C88  83 D7 00 0C */	lwz r30, 0xc(r23)
-/* 80005C8C  83 B8 00 38 */	lwz r29, 0x38(r24)
-/* 80005C90  48 00 00 48 */	b lbl_80005CD8
-lbl_80005C94:
-/* 80005C94  7E E3 BB 78 */	mr r3, r23
-/* 80005C98  4B FF FC 09 */	bl getUsedCount__9HeapCheckCFv
-/* 80005C9C  7C 7E 1B 78 */	mr r30, r3
-/* 80005CA0  7F 03 C3 78 */	mr r3, r24
-/* 80005CA4  48 2C A0 C1 */	bl getTotalUsedSize__10JKRExpHeapCFv
-/* 80005CA8  7C 7D 1B 78 */	mr r29, r3
-/* 80005CAC  48 00 00 2C */	b lbl_80005CD8
-lbl_80005CB0:
-/* 80005CB0  7E E3 BB 78 */	mr r3, r23
-/* 80005CB4  4B FF FB ED */	bl getUsedCount__9HeapCheckCFv
-/* 80005CB8  80 17 00 20 */	lwz r0, 0x20(r23)
-/* 80005CBC  7C 00 18 50 */	subf r0, r0, r3
-/* 80005CC0  7C 1E 03 78 */	mr r30, r0
-/* 80005CC4  80 77 00 08 */	lwz r3, 8(r23)
-/* 80005CC8  48 2C A0 9D */	bl getTotalUsedSize__10JKRExpHeapCFv
-/* 80005CCC  80 17 00 24 */	lwz r0, 0x24(r23)
-/* 80005CD0  7C 00 18 50 */	subf r0, r0, r3
-/* 80005CD4  7C 1D 03 78 */	mr r29, r0
-lbl_80005CD8:
-/* 80005CD8  38 60 01 DB */	li r3, 0x1db
-/* 80005CDC  38 9C 00 96 */	addi r4, r28, 0x96
-/* 80005CE0  38 BA 01 A6 */	addi r5, r26, 0x1a6
-/* 80005CE4  80 D7 00 00 */	lwz r6, 0(r23)
-/* 80005CE8  4C C6 31 82 */	crclr 6
-/* 80005CEC  48 2D A8 45 */	bl JUTReport__FiiPCce
-/* 80005CF0  38 60 01 DB */	li r3, 0x1db
-/* 80005CF4  38 9C 00 A4 */	addi r4, r28, 0xa4
-/* 80005CF8  38 BA 01 AC */	addi r5, r26, 0x1ac
-/* 80005CFC  7F C6 F3 78 */	mr r6, r30
-/* 80005D00  4C C6 31 82 */	crclr 6
-/* 80005D04  48 2D A8 2D */	bl JUTReport__FiiPCce
-/* 80005D08  38 60 01 DB */	li r3, 0x1db
-/* 80005D0C  38 9C 00 B2 */	addi r4, r28, 0xb2
-/* 80005D10  38 BA 01 AC */	addi r5, r26, 0x1ac
-/* 80005D14  7F A6 EB 78 */	mr r6, r29
-/* 80005D18  4C C6 31 82 */	crclr 6
-/* 80005D1C  48 2D A8 15 */	bl JUTReport__FiiPCce
-/* 80005D20  3B FF 00 01 */	addi r31, r31, 1
-/* 80005D24  2C 1F 00 08 */	cmpwi r31, 8
-/* 80005D28  3B 9C 00 2C */	addi r28, r28, 0x2c
-/* 80005D2C  3B 7B 00 04 */	addi r27, r27, 4
-/* 80005D30  41 80 FF 08 */	blt lbl_80005C38
-lbl_80005D34:
-/* 80005D34  39 61 00 30 */	addi r11, r1, 0x30
-/* 80005D38  48 35 C4 D9 */	bl _restgpr_23
-/* 80005D3C  80 01 00 34 */	lwz r0, 0x34(r1)
-/* 80005D40  7C 08 03 A6 */	mtlr r0
-/* 80005D44  38 21 00 30 */	addi r1, r1, 0x30
-/* 80005D48  4E 80 00 20 */	blr 
diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h
index 3a99422819..5974961dac 100644
--- a/include/JSystem/J2DGraph/J2DAnimation.h
+++ b/include/JSystem/J2DGraph/J2DAnimation.h
@@ -11,13 +11,13 @@
 class J2DScreen;
 
 enum J2DAnmKind {
-    KIND_TRANSFORM   = 0,
-    KIND_COLOR       = 1,
+    KIND_TRANSFORM = 0,
+    KIND_COLOR = 1,
     KIND_TEX_PATTERN = 2,
     KIND_TEXTURE_SRT = 4,
-    KIND_TEV_REG     = 5,
-    KIND_VISIBILITY  = 6,
-    KIND_VTX_COLOR   = 7
+    KIND_TEV_REG = 5,
+    KIND_VISIBILITY = 6,
+    KIND_VTX_COLOR = 7
 };
 
 class J2DAnmBase {
diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h
index 1bca78e0bf..59203403b1 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModelData.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h
@@ -43,10 +43,18 @@ public:
     bool checkFlag(u32 flag) const { return !!(mFlags & flag); }
     bool checkBumpFlag() const { return mbHasBumpArray; }
     bool checkBBoardFlag() const { return mbHasBillboard == 1; }
-    int removeTexNoAnimator(J3DAnmTexPattern* anm) { return mMaterialTable.removeTexNoAnimator(anm); }
-    int removeTexMtxAnimator(J3DAnmTextureSRTKey* anm) { return mMaterialTable.removeTexMtxAnimator(anm); }
-    int removeTevRegAnimator(J3DAnmTevRegKey* anm) { return mMaterialTable.removeTevRegAnimator(anm); }
-    int removeMatColorAnimator(J3DAnmColor* anm) { return mMaterialTable.removeMatColorAnimator(anm); }
+    int removeTexNoAnimator(J3DAnmTexPattern* anm) {
+        return mMaterialTable.removeTexNoAnimator(anm);
+    }
+    int removeTexMtxAnimator(J3DAnmTextureSRTKey* anm) {
+        return mMaterialTable.removeTexMtxAnimator(anm);
+    }
+    int removeTevRegAnimator(J3DAnmTevRegKey* anm) {
+        return mMaterialTable.removeTevRegAnimator(anm);
+    }
+    int removeMatColorAnimator(J3DAnmColor* anm) {
+        return mMaterialTable.removeMatColorAnimator(anm);
+    }
 
 private:
     /* 0x04 */ void* mpRawData;
diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h
index 866dbe34e5..f18551d7ed 100644
--- a/include/JSystem/J3DGraphBase/J3DShape.h
+++ b/include/JSystem/J3DGraphBase/J3DShape.h
@@ -31,8 +31,8 @@ public:
     u32 getMtxIdxRegB() const { return mMtxIdxRegB; }
 
     inline void load() const {
-        J3DFifoWriteCPCmd(0x30, getMtxIdxRegA()); // CP_MATINDEX_A
-        J3DFifoWriteCPCmd(0x40, getMtxIdxRegB()); // CP_MATINDEX_B
+        J3DFifoWriteCPCmd(0x30, getMtxIdxRegA());  // CP_MATINDEX_A
+        J3DFifoWriteCPCmd(0x40, getMtxIdxRegB());  // CP_MATINDEX_B
         J3DFifoWriteXFCmd(0x1018, 2);
         GFX_FIFO(u32) = getMtxIdxRegA();
         GFX_FIFO(u32) = getMtxIdxRegB();
@@ -44,12 +44,12 @@ class J3DVertexData;
 class J3DDrawMtxData;
 
 enum J3DShpFlag {
-    J3DShpFlag_Visible     = 0x0001,
-    J3DShpFlag_SkinPosCpu  = 0x0004,
-    J3DShpFlag_SkinNrmCpu  = 0x0008,
-    J3DShpFlag_Hidden      = 0x0010,
-    J3DShpFlag_EnableLod   = 0x0100,
-    J3DShpFlag_NoMtx       = 0x0200,
+    J3DShpFlag_Visible = 0x0001,
+    J3DShpFlag_SkinPosCpu = 0x0004,
+    J3DShpFlag_SkinNrmCpu = 0x0008,
+    J3DShpFlag_Hidden = 0x0010,
+    J3DShpFlag_EnableLod = 0x0100,
+    J3DShpFlag_NoMtx = 0x0200,
 };
 
 class J3DShape {
diff --git a/include/JSystem/JAudio2/JASDvdThread.h b/include/JSystem/JAudio2/JASDvdThread.h
index 779461a72f..0e05c452d9 100644
--- a/include/JSystem/JAudio2/JASDvdThread.h
+++ b/include/JSystem/JAudio2/JASDvdThread.h
@@ -1,8 +1,8 @@
 #ifndef JASDVDTHREAD_H
 #define JASDVDTHREAD_H
 
-#include "dolphin/types.h"
 #include "JSystem/JAudio2/JASTaskThread.h"
+#include "dolphin/types.h"
 
 class JASDvd {
 public:
diff --git a/include/JSystem/JAudio2/JASTaskThread.h b/include/JSystem/JAudio2/JASTaskThread.h
index 82f9a9f2ac..d98f9bb450 100644
--- a/include/JSystem/JAudio2/JASTaskThread.h
+++ b/include/JSystem/JAudio2/JASTaskThread.h
@@ -1,8 +1,8 @@
 #ifndef JASTASKTHREAD_H
 #define JASTASKTHREAD_H
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRThread.h"
+#include "dolphin/types.h"
 
 class JASTaskThread : public JKRThread {
 public:
diff --git a/include/JSystem/JKernel/JKRAssertHeap.h b/include/JSystem/JKernel/JKRAssertHeap.h
index 58c4345d5c..3d8693ea6e 100644
--- a/include/JSystem/JKernel/JKRAssertHeap.h
+++ b/include/JSystem/JKernel/JKRAssertHeap.h
@@ -10,23 +10,23 @@ protected:
     virtual ~JKRAssertHeap();
 
 public:
-    /* vt[04] */ virtual u32 getHeapType(void);           /* override */
-    /* vt[05] */ virtual bool check(void);                /* override */
-    /* vt[06] */ virtual bool dump_sort(void);            /* override */
-    /* vt[07] */ virtual bool dump(void);                 /* override */
-    /* vt[08] */ virtual void do_destroy(void);           /* override */
-    /* vt[09] */ virtual void* do_alloc(u32, int);        /* override */
-    /* vt[10] */ virtual void do_free(void*);             /* override */
-    /* vt[11] */ virtual void do_freeAll(void);           /* override */
-    /* vt[12] */ virtual void do_freeTail(void);          /* override */
-    /* vt[13] */ virtual void do_fillFreeArea(void);      /* override */
-    /* vt[14] */ virtual s32 do_resize(void*, u32);       /* override */
-    /* vt[15] */ virtual s32 do_getSize(void*);           /* override */
-    /* vt[16] */ virtual s32 do_getFreeSize(void);        /* override */
-    /* vt[17] */ virtual void* do_getMaxFreeBlock(void);  /* override */
-    /* vt[18] */ virtual s32 do_getTotalFreeSize(void);   /* override */
+    /* vt[04] */ virtual u32 getHeapType(void);            /* override */
+    /* vt[05] */ virtual bool check(void);                 /* override */
+    /* vt[06] */ virtual bool dump_sort(void);             /* override */
+    /* vt[07] */ virtual bool dump(void);                  /* override */
+    /* vt[08] */ virtual void do_destroy(void);            /* override */
+    /* vt[09] */ virtual void* do_alloc(u32, int);         /* override */
+    /* vt[10] */ virtual void do_free(void*);              /* override */
+    /* vt[11] */ virtual void do_freeAll(void);            /* override */
+    /* vt[12] */ virtual void do_freeTail(void);           /* override */
+    /* vt[13] */ virtual void do_fillFreeArea(void);       /* override */
+    /* vt[14] */ virtual s32 do_resize(void*, u32);        /* override */
+    /* vt[15] */ virtual s32 do_getSize(void*);            /* override */
+    /* vt[16] */ virtual s32 do_getFreeSize(void);         /* override */
+    /* vt[17] */ virtual void* do_getMaxFreeBlock(void);   /* override */
+    /* vt[18] */ virtual s32 do_getTotalFreeSize(void);    /* override */
     /* vt[19] */ virtual s32 do_changeGroupID(u8 param_1); /* override */
-    /* vt[20] */ virtual u8 do_getCurrentGroupId(void);   /* override */
+    /* vt[20] */ virtual u8 do_getCurrentGroupId(void);    /* override */
 
 public:
     static JKRAssertHeap* create(JKRHeap*);
diff --git a/include/JSystem/JKernel/JKRDvdAramRipper.h b/include/JSystem/JKernel/JKRDvdAramRipper.h
index 040015d0d7..fa9f33357c 100644
--- a/include/JSystem/JKernel/JKRDvdAramRipper.h
+++ b/include/JSystem/JKernel/JKRDvdAramRipper.h
@@ -37,7 +37,8 @@ class JKRDvdAramRipper {
 public:
     static JKRAramBlock* loadToAram(long, u32, JKRExpandSwitch, u32, u32, u32*);
     static JKRAramBlock* loadToAram(JKRDvdFile*, u32, JKRExpandSwitch, u32, u32, u32*);
-    static JKRADCommand* loadToAram_Async(JKRDvdFile*, u32, JKRExpandSwitch, void (*)(u32), u32, u32, u32*);
+    static JKRADCommand* loadToAram_Async(JKRDvdFile*, u32, JKRExpandSwitch, void (*)(u32), u32,
+                                          u32, u32*);
     static JKRADCommand* callCommand_Async(JKRADCommand*);
     static bool syncAram(JKRADCommand*, int);
 
diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h
index 257e0bfc4b..8ee16b87f0 100644
--- a/include/JSystem/JKernel/JKRExpHeap.h
+++ b/include/JSystem/JKernel/JKRExpHeap.h
@@ -73,7 +73,7 @@ public:
     /* vt[16] */ virtual s32 do_getFreeSize();                             /* override */
     /* vt[17] */ virtual void* do_getMaxFreeBlock();                       /* override */
     /* vt[18] */ virtual s32 do_getTotalFreeSize();                        /* override */
-    /* vt[19] */ virtual s32 do_changeGroupID(u8 newGroupID);               /* override */
+    /* vt[19] */ virtual s32 do_changeGroupID(u8 newGroupID);              /* override */
     /* vt[20] */ virtual u8 do_getCurrentGroupId();                        /* override */
     /* vt[21] */ virtual void state_register(JKRHeap::TState*, u32) const; /* override */
     /* vt[22] */ virtual bool state_compare(JKRHeap::TState const&,
diff --git a/include/JSystem/JParticle/JPADynamicsBlock.h b/include/JSystem/JParticle/JPADynamicsBlock.h
index 8b3e441c19..9519972e5f 100644
--- a/include/JSystem/JParticle/JPADynamicsBlock.h
+++ b/include/JSystem/JParticle/JPADynamicsBlock.h
@@ -43,10 +43,10 @@ struct JPADynamicsBlockData {
 typedef void (*JPADynamicsCalcVolumeFunc)(JPAEmitterWorkData*);
 
 enum {
-    JPADynFlag_FixedDensity   = 0x01,
-    JPADynFlag_FixedInterval  = 0x02,
-    JPADynFlag_InheritScale   = 0x04,
-    JPADynFlag_FollowEmtr     = 0x08,
+    JPADynFlag_FixedDensity = 0x01,
+    JPADynFlag_FixedInterval = 0x02,
+    JPADynFlag_InheritScale = 0x04,
+    JPADynFlag_FollowEmtr = 0x08,
     JPADynFlag_FollowEmtrChld = 0x10,
 };
 
diff --git a/include/JSystem/JParticle/JPAParticle.h b/include/JSystem/JParticle/JPAParticle.h
index 2c50176b8a..0c009f21b4 100644
--- a/include/JSystem/JParticle/JPAParticle.h
+++ b/include/JSystem/JParticle/JPAParticle.h
@@ -34,12 +34,13 @@ public:
     JPARandom() { mSeed = 0; }
     void set_seed(u32 seed) { mSeed = seed; }
 
-    u32 get_rndm_u() {
-        return mSeed = mSeed * 0x19660du + 0x3c6ef35fu;
-    }
+    u32 get_rndm_u() { return mSeed = mSeed * 0x19660du + 0x3c6ef35fu; }
 
     f32 get_rndm_f() {
-        union { u32 u; f32 f; } a;
+        union {
+            u32 u;
+            f32 f;
+        } a;
         a.u = ((get_rndm_u() >> 9) | 0x3f800000);
         return a.f - 1.0f;
     }
@@ -54,9 +55,7 @@ public:
         return f - 1.0f;
     }
 
-    s16 get_rndm_ss() {
-        return ((s16)get_rndm_u()) >> 16;
-    }
+    s16 get_rndm_ss() { return ((s16)get_rndm_u()) >> 16; }
 
 public:
     u32 mSeed;
@@ -203,9 +202,9 @@ public:
 };
 
 enum {
-    JPAEmtrStts_StopEmit     = 0x01,
-    JPAEmtrStts_StopCalc     = 0x02,
-    JPAEmtrStts_FirstEmit    = 0x10,
+    JPAEmtrStts_StopEmit = 0x01,
+    JPAEmtrStts_StopCalc = 0x02,
+    JPAEmtrStts_FirstEmit = 0x10,
     JPAEmtrStts_RateStepEmit = 0x20,
 };
 
diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h
index b25321d731..49a5a0315e 100644
--- a/include/JSystem/JUtility/JUTGamePad.h
+++ b/include/JSystem/JUtility/JUTGamePad.h
@@ -111,7 +111,7 @@ public:
     u8 getAnalogR() const { return mButton.mAnalogR; }
 
     s8 getErrorStatus() const { return mErrorStatus; }
-    
+
     s16 getPortNum() const { return mPortNum; }
 
     JUTGamePadRecordBase* getPadReplay() const { return mPadReplay; }
@@ -215,7 +215,7 @@ public:
         static void setEnabled(u32 pad_mask);
 
         void stopMotorHard(int portNo) { stopMotor(portNo, true); }
-        
+
         static bool isEnabled(u32 mask) { return mEnabled & mask; }
         static bool isEnabledPort(int port) { return isEnabled(sChannelMask[port]); }
 
diff --git a/include/Z2AudioLib/Z2WolfHowlMgr.h b/include/Z2AudioLib/Z2WolfHowlMgr.h
index 0efc431339..ba41b0539e 100644
--- a/include/Z2AudioLib/Z2WolfHowlMgr.h
+++ b/include/Z2AudioLib/Z2WolfHowlMgr.h
@@ -8,7 +8,7 @@
  * Z2WolfHowlData
  * mLineNum: Number of lines/points within the song
  * mSongData: u16 array which corresponds to each line/point
- * 
+ *
  * The high byte of each u16 line corresponds to bar type (low, middle, high)
  * The low byte of each u16 line corresponds to length of note
  */
diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h
index a1dc780d0f..1513caf469 100644
--- a/include/d/a/d_a_alink.h
+++ b/include/d/a/d_a_alink.h
@@ -2485,7 +2485,7 @@ private:
     /* 0x02118 */ daPy_anmHeap_c mAnmHeap5;
     /* 0x0212C */ daPy_anmHeap_c mAnmHeap6;
     /* 0x02140 */ daPy_anmHeap_c mAnmHeap7;
-    /* 0x02154 */ mDoExt_bckAnm field_0x2154;  // issue here?
+    /* 0x02154 */ mDoExt_bckAnm field_0x2154;
     /* 0x02170 */ u8 field_0x2170[0x18];
     /* 0x02188 */ dEyeHL_c mEyeHL1;
     /* 0x0219C */ dEyeHL_c mEyeHL2;
diff --git a/include/d/a/d_a_npc.h b/include/d/a/d_a_npc.h
index 18b6946743..ab76ef43d1 100644
--- a/include/d/a/d_a_npc.h
+++ b/include/d/a/d_a_npc.h
@@ -18,9 +18,7 @@ public:
     /* 801458C0 */ int play(u16, int*, f32*);
     /* 80145A24 */ s32 checkEndSequence();
 
-    bool checkEntryNewMotion() {
-        return mStepNo == 0 && field_0x14 == -1;
-    }
+    bool checkEntryNewMotion() { return mStepNo == 0 && field_0x14 == -1; }
 
 private:
     /* 0x00 */ sequenceStepData_c* mpSeqData;
@@ -318,9 +316,7 @@ public:
     /* 8014CCE8 */ virtual void changeBtk(int*, int*);
     /* 8014A628 */ virtual void setMotionAnm(int, f32, int);
 
-    bool checkHide() {
-        return !field_0xe25 && (!dComIfGs_wolfeye_effect_check() && field_0xa89);
-    }
+    bool checkHide() { return !field_0xe25 && (!dComIfGs_wolfeye_effect_check() && field_0xa89); }
 
     static u8 const mCcDObjData[48];
     static u8 mCcDCyl[68];
@@ -448,7 +444,7 @@ public:
     /* 80152614 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
     /* 80152654 */ void srchAttnActor1(void*, void*);
     /* 801526E8 */ void srchActor(void*, void*);
-    
+
     /* 801528C8 */ void initialize();
     /* 80152B2C */ void getTrnsfrmKeyAnmP(char*, int);
     /* 80152B68 */ void getTexPtrnAnmP(char*, int);
diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h
index 491c90d572..64b84b96de 100644
--- a/include/d/a/d_a_player.h
+++ b/include/d/a/d_a_player.h
@@ -48,10 +48,7 @@ class daPy_anmHeap_c {
 public:
     enum daAlinkHEAP_TYPE {};
 
-    /* 80140DCC */ void __defctor();
-    daPy_anmHeap_c() {
-        __defctor();
-    }
+    /* 80140DCC */ void __defctor();  // supposed to be the ctor?
 
     daPy_anmHeap_c(u32);
     ~daPy_anmHeap_c();
diff --git a/include/d/d_procname.h b/include/d/d_procname.h
index f47e472e7f..dca2e44141 100644
--- a/include/d/d_procname.h
+++ b/include/d/d_procname.h
@@ -1,798 +1,797 @@
 
 #pragma once
 
-enum
-{
-    PROC_OVERLAP0          = 0x0000,
-    PROC_OVERLAP1          = 0x0001,
-    PROC_OVERLAP3          = 0x0002,
-    PROC_OVERLAP6          = 0x0003,
-    PROC_OVERLAP7          = 0x0004,
-    PROC_OVERLAP8          = 0x0005,
-    PROC_OVERLAP9          = 0x0006,
-    PROC_OVERLAP10         = 0x0007,
-    PROC_OVERLAP11         = 0x0008,
-    PROC_LOGO_SCENE        = 0x0009,
-    PROC_MENU_SCENE        = 0x000A,
-    PROC_PLAY_SCENE        = 0x000B,
-    PROC_OPENING_SCENE     = 0x000C,
-    PROC_NAME_SCENE        = 0x000D,
-    PROC_NAMEEX_SCENE      = 0x000E,
-    PROC_WARNING_SCENE     = 0x000F,
-    PROC_WARNING2_SCENE    = 0x0010,
-    PROC_OVERLAP2          = 0x0011,
-    PROC_ROOM_SCENE        = 0x0012,
-    PROC_KANKYO            = 0x0013,
-    PROC_ALLDIE            = 0x0014,
-    PROC_ENVSE             = 0x0015,
-    PROC_Obj_Swpush        = 0x0016,
-    PROC_Obj_Swpush2       = 0x0017,
-    PROC_Obj_Swpush5       = 0x0018,
-    PROC_Tag_Gstart        = 0x0019,
-    PROC_NO_CHG_ROOM       = 0x001A,
-    PROC_Obj_Lv6ElevtA     = 0x001B,
-    PROC_OBJ_SO            = 0x001C,
-    PROC_Obj_Movebox       = 0x001D,
-    PROC_Obj_SwTurn        = 0x001E,
-    PROC_Obj_Lv6SwTurn     = 0x001F,
-    PROC_OBJ_SEKIZOA       = 0x0020,
-    PROC_OBJ_GRA           = 0x0021,
-    PROC_TAG_GRA           = 0x0022,
-    PROC_TAG_YAMI          = 0x0023,
-    PROC_Obj_Ladder        = 0x0024,
-    PROC_OBJ_BEF           = 0x0025,
-    PROC_OBJ_FMOBJ         = 0x0026,
-    PROC_OBJ_LBOX          = 0x0027,
-    PROC_OBJ_WEB0          = 0x0028,
-    PROC_OBJ_WEB1          = 0x0029,
-    PROC_OBJ_CB            = 0x002A,
-    PROC_OBJ_MAKI          = 0x002B,
-    PROC_OBJ_BRG           = 0x002C,
-    PROC_OBJ_GB            = 0x002D,
-    PROC_OBJ_GM            = 0x002E,
-    PROC_OBJ_TOBY          = 0x002F,
-    PROC_OBJ_TP            = 0x0030,
-    PROC_TREESH            = 0x0031,
-    PROC_Obj_ZDoor         = 0x0032,
-    PROC_Obj_Pillar        = 0x0033,
-    PROC_Obj_Cdoor         = 0x0034,
-    PROC_GRDWATER          = 0x0035,
-    PROC_Obj_RotBridge     = 0x0036,
-    PROC_Obj_MagLift       = 0x0037,
-    PROC_Obj_MagLiftRot    = 0x0038,
-    PROC_Obj_Lv1Cdl00      = 0x0039,
-    PROC_Obj_Lv1Cdl01      = 0x003A,
-    PROC_Obj_TvCdlst       = 0x003B,
-    PROC_Obj_HsTarget      = 0x003C,
-    PROC_Obj_HeavySw       = 0x003D,
-    PROC_Obj_GoGate        = 0x003E,
-    PROC_Obj_TaFence       = 0x003F,
-    PROC_Obj_Saidan        = 0x0040,
-    PROC_Obj_SpinLift      = 0x0041,
-    PROC_Obj_BmWindow      = 0x0042,
-    PROC_Obj_RfHole        = 0x0043,
-    PROC_Obj_WaterPillar   = 0x0044,
-    PROC_Obj_SyRock        = 0x0045,
-    PROC_Obj_BsGate        = 0x0046,
-    PROC_Obj_AmiShutter    = 0x0047,
-    PROC_Obj_WtGate        = 0x0048,
-    PROC_Obj_Lv2Candle     = 0x0049,
-    PROC_Obj_TogeTrap      = 0x004A,
-    PROC_Obj_RotTrap       = 0x004B,
-    PROC_Obj_SwallShutter  = 0x004C,
-    PROC_Obj_IceWall       = 0x004D,
-    PROC_Obj_Lv5SwIce      = 0x004E,
-    PROC_Obj_Lv5FBoard     = 0x004F,
-    PROC_Obj_Turara        = 0x0050,
-    PROC_Obj_TwGate        = 0x0051,
-    PROC_Obj_Digholl       = 0x0052,
-    PROC_Obj_Digpl         = 0x0053,
-    PROC_Obj_TestCube      = 0x0054,
-    PROC_Obj_Kshutter      = 0x0055,
-    PROC_NPC_COACH         = 0x0056,
-    PROC_NPC_THEB          = 0x0057,
-    PROC_COACH_FIRE        = 0x0058,
-    PROC_COACH2D           = 0x0059,
-    PROC_BALLOON2D         = 0x005A,
-    PROC_SKIP2D            = 0x005B,
-    PROC_Obj_MvStair       = 0x005C,
-    PROC_Obj_Cowdoor       = 0x005D,
-    PROC_Obj_Swpropeller   = 0x005E,
-    PROC_Obj_BoomShutter   = 0x005F,
-    PROC_NPC_KS            = 0x0060,
-    PROC_Obj_Hfuta         = 0x0061,
-    PROC_Obj_BkDoor        = 0x0062,
-    PROC_Obj_Cboard        = 0x0063,
-    PROC_Obj_MGate         = 0x0064,
-    PROC_Obj_Ikada         = 0x0065,
-    PROC_Obj_Ice_l         = 0x0066,
-    PROC_Obj_Ice_s         = 0x0067,
-    PROC_Obj_E_CREATE      = 0x0068,
-    PROC_Obj_Bhbridge      = 0x0069,
-    PROC_Obj_Kaisou        = 0x006A,
-    PROC_Obj_HHASHI        = 0x006B,
-    PROC_Obj_BHASHI        = 0x006C,
-    PROC_OCTHASHI          = 0x006D,
-    PROC_Obj_THASHI        = 0x006E,
-    PROC_Obj_CRVGATE       = 0x006F,
-    PROC_Obj_CRVFENCE      = 0x0070,
-    PROC_Obj_CRVHAHEN      = 0x0071,
-    PROC_Obj_CRVSTEEL      = 0x0072,
-    PROC_Obj_CRVLH_UP      = 0x0073,
-    PROC_Obj_CRVLH_DW      = 0x0074,
-    PROC_Obj_RIVERROCK     = 0x0075,
-    PROC_Obj_DUST          = 0x0076,
-    PROC_Obj_ITA           = 0x0077,
-    PROC_Obj_Window        = 0x0078,
-    PROC_Obj_MetalBox      = 0x0079,
-    PROC_Obj_BBox          = 0x007A,
-    PROC_OBJ_MSIMA         = 0x007B,
-    PROC_OBJ_MYOGAN        = 0x007C,
-    PROC_B_ZANTS           = 0x007D,
-    PROC_Obj_ChainBlock    = 0x007E,
-    PROC_Obj_ChainWall     = 0x007F,
-    PROC_Obj_KkrGate       = 0x0080,
-    PROC_Obj_RiderGate     = 0x0081,
-    PROC_Obj_Onsen         = 0x0082,
-    PROC_Obj_Chest         = 0x0083,
-    PROC_Obj_Bemos         = 0x0084,
-    PROC_Obj_RopeBridge    = 0x0085,
-    PROC_Obj_WellCover     = 0x0086,
-    PROC_Obj_GraveStone    = 0x0087,
-    PROC_Obj_ZraRock       = 0x0088,
-    PROC_Obj_GraRock       = 0x0089,
-    PROC_Obj_GrzRock       = 0x008A,
-    PROC_GRA_WALL          = 0x008B,
-    PROC_OBJ_ONSEN_FIRE    = 0x008C,
-    PROC_Obj_Lv6bemos      = 0x008D,
-    PROC_Obj_Lv6bemos2     = 0x008E,
-    PROC_Obj_BarDesk       = 0x008F,
-    PROC_Obj_DigSnow       = 0x0090,
-    PROC_Obj_Ytaihou       = 0x0091,
-    PROC_Obj_Elevator      = 0x0092,
-    PROC_Obj_Lv6TogeRoll   = 0x0093,
-    PROC_Obj_Lv6TogeTrap   = 0x0094,
-    PROC_Obj_Lv6Tenbin     = 0x0095,
-    PROC_Obj_Lv6SwGate     = 0x0096,
-    PROC_Obj_Lv6Lblock     = 0x0097,
-    PROC_Obj_Lv6ChgGate    = 0x0098,
-    PROC_Obj_Lv6FuriTrap   = 0x0099,
-    PROC_Obj_Lv6SzGate     = 0x009A,
-    PROC_Obj_Lv4EdShutter  = 0x009B,
-    PROC_Obj_Lv4Gate       = 0x009C,
-    PROC_Obj_Lv4PoGate     = 0x009D,
-    PROC_Obj_Lv4SlideWall  = 0x009E,
-    PROC_Obj_Lv4HsTarget   = 0x009F,
-    PROC_Obj_Lv7PropY      = 0x00A0,
-    PROC_Obj_Lv7BsGate     = 0x00A1,
-    PROC_Obj_Lv8OptiLift   = 0x00A2,
+enum {
+    PROC_OVERLAP0 = 0x0000,
+    PROC_OVERLAP1 = 0x0001,
+    PROC_OVERLAP3 = 0x0002,
+    PROC_OVERLAP6 = 0x0003,
+    PROC_OVERLAP7 = 0x0004,
+    PROC_OVERLAP8 = 0x0005,
+    PROC_OVERLAP9 = 0x0006,
+    PROC_OVERLAP10 = 0x0007,
+    PROC_OVERLAP11 = 0x0008,
+    PROC_LOGO_SCENE = 0x0009,
+    PROC_MENU_SCENE = 0x000A,
+    PROC_PLAY_SCENE = 0x000B,
+    PROC_OPENING_SCENE = 0x000C,
+    PROC_NAME_SCENE = 0x000D,
+    PROC_NAMEEX_SCENE = 0x000E,
+    PROC_WARNING_SCENE = 0x000F,
+    PROC_WARNING2_SCENE = 0x0010,
+    PROC_OVERLAP2 = 0x0011,
+    PROC_ROOM_SCENE = 0x0012,
+    PROC_KANKYO = 0x0013,
+    PROC_ALLDIE = 0x0014,
+    PROC_ENVSE = 0x0015,
+    PROC_Obj_Swpush = 0x0016,
+    PROC_Obj_Swpush2 = 0x0017,
+    PROC_Obj_Swpush5 = 0x0018,
+    PROC_Tag_Gstart = 0x0019,
+    PROC_NO_CHG_ROOM = 0x001A,
+    PROC_Obj_Lv6ElevtA = 0x001B,
+    PROC_OBJ_SO = 0x001C,
+    PROC_Obj_Movebox = 0x001D,
+    PROC_Obj_SwTurn = 0x001E,
+    PROC_Obj_Lv6SwTurn = 0x001F,
+    PROC_OBJ_SEKIZOA = 0x0020,
+    PROC_OBJ_GRA = 0x0021,
+    PROC_TAG_GRA = 0x0022,
+    PROC_TAG_YAMI = 0x0023,
+    PROC_Obj_Ladder = 0x0024,
+    PROC_OBJ_BEF = 0x0025,
+    PROC_OBJ_FMOBJ = 0x0026,
+    PROC_OBJ_LBOX = 0x0027,
+    PROC_OBJ_WEB0 = 0x0028,
+    PROC_OBJ_WEB1 = 0x0029,
+    PROC_OBJ_CB = 0x002A,
+    PROC_OBJ_MAKI = 0x002B,
+    PROC_OBJ_BRG = 0x002C,
+    PROC_OBJ_GB = 0x002D,
+    PROC_OBJ_GM = 0x002E,
+    PROC_OBJ_TOBY = 0x002F,
+    PROC_OBJ_TP = 0x0030,
+    PROC_TREESH = 0x0031,
+    PROC_Obj_ZDoor = 0x0032,
+    PROC_Obj_Pillar = 0x0033,
+    PROC_Obj_Cdoor = 0x0034,
+    PROC_GRDWATER = 0x0035,
+    PROC_Obj_RotBridge = 0x0036,
+    PROC_Obj_MagLift = 0x0037,
+    PROC_Obj_MagLiftRot = 0x0038,
+    PROC_Obj_Lv1Cdl00 = 0x0039,
+    PROC_Obj_Lv1Cdl01 = 0x003A,
+    PROC_Obj_TvCdlst = 0x003B,
+    PROC_Obj_HsTarget = 0x003C,
+    PROC_Obj_HeavySw = 0x003D,
+    PROC_Obj_GoGate = 0x003E,
+    PROC_Obj_TaFence = 0x003F,
+    PROC_Obj_Saidan = 0x0040,
+    PROC_Obj_SpinLift = 0x0041,
+    PROC_Obj_BmWindow = 0x0042,
+    PROC_Obj_RfHole = 0x0043,
+    PROC_Obj_WaterPillar = 0x0044,
+    PROC_Obj_SyRock = 0x0045,
+    PROC_Obj_BsGate = 0x0046,
+    PROC_Obj_AmiShutter = 0x0047,
+    PROC_Obj_WtGate = 0x0048,
+    PROC_Obj_Lv2Candle = 0x0049,
+    PROC_Obj_TogeTrap = 0x004A,
+    PROC_Obj_RotTrap = 0x004B,
+    PROC_Obj_SwallShutter = 0x004C,
+    PROC_Obj_IceWall = 0x004D,
+    PROC_Obj_Lv5SwIce = 0x004E,
+    PROC_Obj_Lv5FBoard = 0x004F,
+    PROC_Obj_Turara = 0x0050,
+    PROC_Obj_TwGate = 0x0051,
+    PROC_Obj_Digholl = 0x0052,
+    PROC_Obj_Digpl = 0x0053,
+    PROC_Obj_TestCube = 0x0054,
+    PROC_Obj_Kshutter = 0x0055,
+    PROC_NPC_COACH = 0x0056,
+    PROC_NPC_THEB = 0x0057,
+    PROC_COACH_FIRE = 0x0058,
+    PROC_COACH2D = 0x0059,
+    PROC_BALLOON2D = 0x005A,
+    PROC_SKIP2D = 0x005B,
+    PROC_Obj_MvStair = 0x005C,
+    PROC_Obj_Cowdoor = 0x005D,
+    PROC_Obj_Swpropeller = 0x005E,
+    PROC_Obj_BoomShutter = 0x005F,
+    PROC_NPC_KS = 0x0060,
+    PROC_Obj_Hfuta = 0x0061,
+    PROC_Obj_BkDoor = 0x0062,
+    PROC_Obj_Cboard = 0x0063,
+    PROC_Obj_MGate = 0x0064,
+    PROC_Obj_Ikada = 0x0065,
+    PROC_Obj_Ice_l = 0x0066,
+    PROC_Obj_Ice_s = 0x0067,
+    PROC_Obj_E_CREATE = 0x0068,
+    PROC_Obj_Bhbridge = 0x0069,
+    PROC_Obj_Kaisou = 0x006A,
+    PROC_Obj_HHASHI = 0x006B,
+    PROC_Obj_BHASHI = 0x006C,
+    PROC_OCTHASHI = 0x006D,
+    PROC_Obj_THASHI = 0x006E,
+    PROC_Obj_CRVGATE = 0x006F,
+    PROC_Obj_CRVFENCE = 0x0070,
+    PROC_Obj_CRVHAHEN = 0x0071,
+    PROC_Obj_CRVSTEEL = 0x0072,
+    PROC_Obj_CRVLH_UP = 0x0073,
+    PROC_Obj_CRVLH_DW = 0x0074,
+    PROC_Obj_RIVERROCK = 0x0075,
+    PROC_Obj_DUST = 0x0076,
+    PROC_Obj_ITA = 0x0077,
+    PROC_Obj_Window = 0x0078,
+    PROC_Obj_MetalBox = 0x0079,
+    PROC_Obj_BBox = 0x007A,
+    PROC_OBJ_MSIMA = 0x007B,
+    PROC_OBJ_MYOGAN = 0x007C,
+    PROC_B_ZANTS = 0x007D,
+    PROC_Obj_ChainBlock = 0x007E,
+    PROC_Obj_ChainWall = 0x007F,
+    PROC_Obj_KkrGate = 0x0080,
+    PROC_Obj_RiderGate = 0x0081,
+    PROC_Obj_Onsen = 0x0082,
+    PROC_Obj_Chest = 0x0083,
+    PROC_Obj_Bemos = 0x0084,
+    PROC_Obj_RopeBridge = 0x0085,
+    PROC_Obj_WellCover = 0x0086,
+    PROC_Obj_GraveStone = 0x0087,
+    PROC_Obj_ZraRock = 0x0088,
+    PROC_Obj_GraRock = 0x0089,
+    PROC_Obj_GrzRock = 0x008A,
+    PROC_GRA_WALL = 0x008B,
+    PROC_OBJ_ONSEN_FIRE = 0x008C,
+    PROC_Obj_Lv6bemos = 0x008D,
+    PROC_Obj_Lv6bemos2 = 0x008E,
+    PROC_Obj_BarDesk = 0x008F,
+    PROC_Obj_DigSnow = 0x0090,
+    PROC_Obj_Ytaihou = 0x0091,
+    PROC_Obj_Elevator = 0x0092,
+    PROC_Obj_Lv6TogeRoll = 0x0093,
+    PROC_Obj_Lv6TogeTrap = 0x0094,
+    PROC_Obj_Lv6Tenbin = 0x0095,
+    PROC_Obj_Lv6SwGate = 0x0096,
+    PROC_Obj_Lv6Lblock = 0x0097,
+    PROC_Obj_Lv6ChgGate = 0x0098,
+    PROC_Obj_Lv6FuriTrap = 0x0099,
+    PROC_Obj_Lv6SzGate = 0x009A,
+    PROC_Obj_Lv4EdShutter = 0x009B,
+    PROC_Obj_Lv4Gate = 0x009C,
+    PROC_Obj_Lv4PoGate = 0x009D,
+    PROC_Obj_Lv4SlideWall = 0x009E,
+    PROC_Obj_Lv4HsTarget = 0x009F,
+    PROC_Obj_Lv7PropY = 0x00A0,
+    PROC_Obj_Lv7BsGate = 0x00A1,
+    PROC_Obj_Lv8OptiLift = 0x00A2,
     PROC_Obj_Lv8KekkaiTrap = 0x00A3,
-    PROC_Obj_Lv8Lift       = 0x00A4,
-    PROC_Obj_Lv8UdFloor    = 0x00A5,
-    PROC_Obj_Lv9SwShutter  = 0x00A6,
-    PROC_Obj_TobyHouse     = 0x00A7,
-    PROC_Obj_poCandle      = 0x00A8,
-    PROC_Obj_Lv4DigSand    = 0x00A9,
-    PROC_Obj_FallObj       = 0x00AA,
-    PROC_Obj_SmgDoor       = 0x00AB,
-    PROC_Obj_SwLight       = 0x00AC,
-    PROC_Obj_Avalanche     = 0x00AD,
-    PROC_Obj_MirrorScrew   = 0x00AE,
-    PROC_Obj_MirrorSand    = 0x00AF,
-    PROC_Obj_MirrorTable   = 0x00B0,
-    PROC_Obj_MirrorChain   = 0x00B1,
-    PROC_Obj_Mirror6Pole   = 0x00B2,
-    PROC_Obj_SwSpinner     = 0x00B3,
-    PROC_Obj_TDoor         = 0x00B4,
-    PROC_Obj_Lv7Bridge     = 0x00B5,
-    PROC_Obj_zrTurara      = 0x00B6,
-    PROC_Obj_TakaraDai     = 0x00B7,
-    PROC_Obj_Table         = 0x00B8,
-    PROC_Obj_CatDoor       = 0x00B9,
-    PROC_Obj_Gake          = 0x00BA,
-    PROC_CSTAF             = 0x00BB,
-    PROC_Obj_Lv4RailWall   = 0x00BC,
-    PROC_Obj_Lv4Sand       = 0x00BD,
-    PROC_Obj_PushDoor      = 0x00BE,
-    PROC_PushDoor          = 0x00BF,
-    PROC_Obj_GanonWall2    = 0x00C0,
-    PROC_Obj_Lv4Bridge     = 0x00C1,
-    PROC_Obj_Lv4Floor      = 0x00C2,
-    PROC_Tag_Spinner       = 0x00C3,
-    PROC_Obj_SwHang        = 0x00C4,
-    PROC_Obj_RotStair      = 0x00C5,
-    PROC_Obj_MagneArm      = 0x00C6,
-    PROC_Obj_KWheel00      = 0x00C7,
-    PROC_Obj_KWheel01      = 0x00C8,
-    PROC_Obj_Ychndlr       = 0x00C9,
-    PROC_Obj_PRElvtr       = 0x00CA,
-    PROC_Obj_MHasu         = 0x00CB,
-    PROC_Obj_YIblltray     = 0x00CC,
-    PROC_Obj_Lv6EGate      = 0x00CD,
-    PROC_Obj_PDtile        = 0x00CE,
-    PROC_Obj_PDwall        = 0x00CF,
-    PROC_Obj_Lv4PRwall     = 0x00D0,
-    PROC_Obj_KLift00       = 0x00D1,
-    PROC_B_OH              = 0x00D2,
-    PROC_Obj_Lv4Chan       = 0x00D3,
-    PROC_Obj_Lv3R10Saka    = 0x00D4,
-    PROC_Obj_Lv3Water      = 0x00D5,
-    PROC_Obj_Lv3Water2     = 0x00D6,
-    PROC_OBJ_LV3WATERB     = 0x00D7,
-    PROC_Obj_HBombkoya     = 0x00D8,
-    PROC_Obj_SZbridge      = 0x00D9,
-    PROC_Obj_KakarikoBrg   = 0x00DA,
-    PROC_Obj_OrdinBrg      = 0x00DB,
-    PROC_Obj_BurnBox       = 0x00DC,
-    PROC_Obj_KJgjs         = 0x00DD,
-    PROC_OBJ_IHASI         = 0x00DE,
-    PROC_Obj_IceBlock      = 0x00DF,
-    PROC_Obj_VolcanicBall  = 0x00E0,
-    PROC_Obj_VolcanicBomb  = 0x00E1,
-    PROC_Obj_VolcGnd       = 0x00E2,
-    PROC_Obj_KKanban       = 0x00E3,
-    PROC_E_PH              = 0x00E4,
-    PROC_NPC_ZRA           = 0x00E5,
-    PROC_Obj_Chandelier    = 0x00E6,
-    PROC_Obj_Stopper2      = 0x00E7,
-    PROC_DOOR20            = 0x00E8,
-    PROC_Tag_Hinit         = 0x00E9,
-    PROC_Tag_Hjump         = 0x00EA,
-    PROC_Tag_AJnot         = 0x00EB,
-    PROC_Tag_Hstop         = 0x00EC,
-    PROC_CANOE             = 0x00ED,
-    PROC_HORSE             = 0x00EE,
-    PROC_E_WB              = 0x00EF,
-    PROC_OBJ_ITO           = 0x00F0,
-    PROC_OBJ_SW            = 0x00F1,
-    PROC_SPINNER           = 0x00F2,
-    PROC_B_OB              = 0x00F3,
-    PROC_KAGO              = 0x00F4,
-    PROC_E_YC              = 0x00F5,
-    PROC_B_DS              = 0x00F6,
-    PROC_B_DR              = 0x00F7,
-    PROC_B_ZANTZ           = 0x00F8,
-    PROC_B_ZANT            = 0x00F9,
-    PROC_B_ZANTM           = 0x00FA,
-    PROC_TBOX              = 0x00FB,
-    PROC_TBOX2             = 0x00FC,
-    PROC_ALINK             = 0x00FD,
-    PROC_BOOMERANG         = 0x00FE,
-    PROC_MIDNA             = 0x00FF,
-    PROC_NPC_TK            = 0x0100,
-    PROC_NPC_WORM          = 0x0101,
-    PROC_PPolamp           = 0x0102,
-    PROC_BkyRock           = 0x0103,
-    PROC_HITOBJ            = 0x0104,
-    PROC_EP                = 0x0105,
-    PROC_COW               = 0x0106,
-    PROC_PERU              = 0x0107,
-    PROC_NI                = 0x0108,
-    PROC_NPC_TKJ2          = 0x0109,
-    PROC_SQ                = 0x010A,
-    PROC_NPC_SQ            = 0x010B,
-    PROC_DO                = 0x010C,
-    PROC_NPC_NE            = 0x010D,
-    PROC_NPC_TR            = 0x010E,
-    PROC_NPC_LF            = 0x010F,
-    PROC_OBJ_FOOD          = 0x0110,
-    PROC_OBJ_KI            = 0x0111,
-    PROC_OBJ_KITA          = 0x0112,
-    PROC_OBJ_KEY           = 0x0113,
-    PROC_OBJ_KEYHOLE       = 0x0114,
-    PROC_Obj_Lv5Key        = 0x0115,
-    PROC_OBJ_LP            = 0x0116,
-    PROC_OBJ_TATIGI        = 0x0117,
-    PROC_OBJ_ROCK          = 0x0118,
-    PROC_OBJ_WFLAG         = 0x0119,
-    PROC_OBJ_KAGE          = 0x011A,
-    PROC_OBJ_KANBAN2       = 0x011B,
-    PROC_OBJ_BALLOON       = 0x011C,
-    PROC_OBJ_SUISYA        = 0x011D,
-    PROC_OBJ_OILTUBO       = 0x011E,
-    PROC_OBJ_ROTEN         = 0x011F,
-    PROC_OBJ_SSDRINK       = 0x0120,
-    PROC_OBJ_SSITEM        = 0x0121,
-    PROC_TAG_SSDRINK       = 0x0122,
-    PROC_TAG_BTLITM        = 0x0123,
-    PROC_TAG_LV5SOUP       = 0x0124,
-    PROC_TAG_MNLIGHT       = 0x0125,
-    PROC_TAG_SHOPCAM       = 0x0126,
-    PROC_TAG_SHOPITM       = 0x0127,
-    PROC_OBJ_NDOOR         = 0x0128,
-    PROC_OBJ_UDOOR         = 0x0129,
-    PROC_OBJ_USAKU         = 0x012A,
-    PROC_Obj_SM_DOOR       = 0x012B,
-    PROC_OBJ_BED           = 0x012C,
-    PROC_OBJ_BOUMATO       = 0x012D,
-    PROC_OBJ_ITAMATO       = 0x012E,
-    PROC_OBJ_NOUGU         = 0x012F,
-    PROC_OBJ_STICK         = 0x0130,
-    PROC_OBJ_MIE           = 0x0131,
-    PROC_OBJ_SEKIDOOR      = 0x0132,
-    PROC_OBJ_SEKIZO        = 0x0133,
-    PROC_OBJ_SMTILE        = 0x0134,
-    PROC_NPC_FISH          = 0x0135,
-    PROC_MG_FISH           = 0x0136,
-    PROC_FSHOP             = 0x0137,
-    PROC_NPC_DU            = 0x0138,
-    PROC_DISAPPEAR         = 0x0139,
-    PROC_Obj_Mato          = 0x013A,
-    PROC_Obj_Flag          = 0x013B,
-    PROC_Obj_Flag2         = 0x013C,
-    PROC_Obj_Flag3         = 0x013D,
-    PROC_Obj_GOMIKABE      = 0x013E,
-    PROC_Obj_Yousei        = 0x013F,
-    PROC_Obj_Kabuto        = 0x0140,
-    PROC_Obj_Cho           = 0x0141,
-    PROC_Obj_Kuw           = 0x0142,
-    PROC_Obj_Nan           = 0x0143,
-    PROC_Obj_Dan           = 0x0144,
-    PROC_Obj_Kam           = 0x0145,
-    PROC_Obj_Ten           = 0x0146,
-    PROC_Obj_Ari           = 0x0147,
-    PROC_Obj_Kag           = 0x0148,
-    PROC_Obj_Batta         = 0x0149,
-    PROC_Obj_Tombo         = 0x014A,
-    PROC_Obj_Kat           = 0x014B,
-    PROC_Obj_H_Saku        = 0x014C,
-    PROC_Obj_Yobikusa      = 0x014D,
-    PROC_Obj_KazeNeko      = 0x014E,
-    PROC_Obj_KznkArm       = 0x014F,
-    PROC_Obj_NamePlate     = 0x0150,
-    PROC_Obj_OnCloth       = 0x0151,
-    PROC_Obj_LndRope       = 0x0152,
-    PROC_Obj_ItaRope       = 0x0153,
-    PROC_Obj_Sakuita       = 0x0154,
-    PROC_Obj_Laundry       = 0x0155,
-    PROC_WarpBug           = 0x0156,
-    PROC_Izumi_Gate        = 0x0157,
-    PROC_Obj_Fchain        = 0x0158,
-    PROC_Obj_Wchain        = 0x0159,
-    PROC_Tag_Attp          = 0x015A,
-    PROC_Obj_Tornado       = 0x015B,
-    PROC_Obj_Tornado2      = 0x015C,
-    PROC_Obj_FirePillar    = 0x015D,
-    PROC_Obj_FirePillar2   = 0x015E,
-    PROC_Obj_InoBone       = 0x015F,
-    PROC_Obj_Stopper       = 0x0160,
-    PROC_Obj_MHole         = 0x0161,
-    PROC_Tag_Magne         = 0x0162,
-    PROC_Obj_BossWarp      = 0x0163,
-    PROC_Obj_WoodPendulum  = 0x0164,
-    PROC_Obj_WdStick       = 0x0165,
-    PROC_Obj_StairBlock    = 0x0166,
-    PROC_Obj_Geyser        = 0x0167,
-    PROC_Tag_KtOnFire      = 0x0168,
-    PROC_Obj_FireWood      = 0x0169,
-    PROC_Obj_FireWood2     = 0x016A,
-    PROC_Obj_GpTaru        = 0x016B,
-    PROC_Obj_OnsenTaru     = 0x016C,
-    PROC_Obj_KiPot         = 0x016D,
-    PROC_TBOX_SW           = 0x016E,
-    PROC_Obj_SwChain       = 0x016F,
-    PROC_Obj_WoodenSword   = 0x0170,
-    PROC_Obj_StoneMark     = 0x0171,
-    PROC_Obj_Lv3Candle     = 0x0172,
-    PROC_Tag_Lv4Candle     = 0x0173,
-    PROC_Tag_Lv4CandleDm   = 0x0174,
-    PROC_Obj_DamCps        = 0x0175,
-    PROC_Obj_Smoke         = 0x0176,
-    PROC_Obj_WaterFall     = 0x0177,
-    PROC_Obj_ZoraCloth     = 0x0178,
-    PROC_Obj_poFire        = 0x0179,
-    PROC_Tag_poFire        = 0x017A,
-    PROC_Obj_glowSphere    = 0x017B,
-    PROC_Tag_LightBall     = 0x017C,
-    PROC_SwLBall           = 0x017D,
-    PROC_SwBall            = 0x017E,
-    PROC_Obj_WaterEff      = 0x017F,
-    PROC_Tag_RiverBack     = 0x0180,
-    PROC_Tag_KagoFall      = 0x0181,
-    PROC_Tag_Lv2PrChk      = 0x0182,
-    PROC_Obj_Lv4Gear       = 0x0183,
-    PROC_Obj_MasterSword   = 0x0184,
-    PROC_Obj_WoodStatue    = 0x0185,
-    PROC_Obj_Fan           = 0x0186,
-    PROC_Obj_IceLeaf       = 0x0187,
-    PROC_Obj_zrTuraraRc    = 0x0188,
-    PROC_Tag_RetRoom       = 0x0189,
-    PROC_Obj_WindStone     = 0x018A,
-    PROC_Tag_WaraHowl      = 0x018B,
-    PROC_Obj_SCannon       = 0x018C,
-    PROC_Obj_SmWStone      = 0x018D,
-    PROC_Obj_SCannonCrs    = 0x018E,
-    PROC_Tag_SnowEff       = 0x018F,
-    PROC_Tag_CstaSw        = 0x0190,
-    PROC_Tag_Lv6CstaSw     = 0x0191,
-    PROC_Obj_awaPlar       = 0x0192,
-    PROC_Obj_poTbox        = 0x0193,
-    PROC_Obj_TimeFire      = 0x0194,
-    PROC_Obj_TMoon         = 0x0195,
-    PROC_Obj_GanonWall     = 0x0196,
-    PROC_Obj_Prop          = 0x0197,
-    PROC_CSTATUE           = 0x0198,
-    PROC_Obj_SwBallA       = 0x0199,
-    PROC_Obj_SwBallB       = 0x019A,
-    PROC_Obj_SnowSoup      = 0x019B,
-    PROC_Obj_Nagaisu       = 0x019C,
-    PROC_Obj_RCircle       = 0x019D,
-    PROC_Obj_Picture       = 0x019E,
-    PROC_Tag_SetBall       = 0x019F,
-    PROC_Tag_SmkEmt        = 0x01A0,
-    PROC_SwTime            = 0x01A1,
-    PROC_Obj_HFtr          = 0x01A2,
-    PROC_Obj_HBarrel       = 0x01A3,
-    PROC_Obj_Crystal       = 0x01A4,
-    PROC_Obj_SCannonTen    = 0x01A5,
-    PROC_Obj_SwBallC       = 0x01A6,
-    PROC_SCENE_EXIT2       = 0x01A7,
-    PROC_Obj_Hata          = 0x01A8,
-    PROC_Obj_ToaruMaki     = 0x01A9,
-    PROC_Tag_AttackItem    = 0x01AA,
-    PROC_Tag_RmbitSw       = 0x01AB,
-    PROC_Obj_Sword         = 0x01AC,
-    PROC_Tag_Spring        = 0x01AD,
-    PROC_Tag_Statue        = 0x01AE,
-    PROC_E_AI              = 0x01AF,
-    PROC_E_GS              = 0x01B0,
-    PROC_E_GOB             = 0x01B1,
-    PROC_E_DD              = 0x01B2,
-    PROC_E_DN              = 0x01B3,
-    PROC_E_S1              = 0x01B4,
-    PROC_E_MF              = 0x01B5,
-    PROC_E_SG              = 0x01B6,
-    PROC_E_BS              = 0x01B7,
-    PROC_E_SF              = 0x01B8,
-    PROC_E_SH              = 0x01B9,
-    PROC_E_DF              = 0x01BA,
-    PROC_E_GM              = 0x01BB,
-    PROC_E_MD              = 0x01BC,
-    PROC_E_SM              = 0x01BD,
-    PROC_E_SM2             = 0x01BE,
-    PROC_E_ST              = 0x01BF,
-    PROC_E_ST_LINE         = 0x01C0,
-    PROC_E_SB              = 0x01C1,
-    PROC_E_TH              = 0x01C2,
-    PROC_E_CR              = 0x01C3,
-    PROC_E_CR_EGG          = 0x01C4,
-    PROC_E_DB              = 0x01C5,
-    PROC_E_DB_LEAF         = 0x01C6,
-    PROC_E_GA              = 0x01C7,
-    PROC_E_GB              = 0x01C8,
-    PROC_E_HB              = 0x01C9,
-    PROC_E_HB_LEAF         = 0x01CA,
-    PROC_E_HZELDA          = 0x01CB,
-    PROC_E_YD              = 0x01CC,
-    PROC_E_YH              = 0x01CD,
-    PROC_E_YD_LEAF         = 0x01CE,
-    PROC_E_HM              = 0x01CF,
-    PROC_E_TK              = 0x01D0,
-    PROC_E_TK2             = 0x01D1,
-    PROC_E_TK_BALL         = 0x01D2,
-    PROC_E_RB              = 0x01D3,
-    PROC_E_RD              = 0x01D4,
-    PROC_E_RDB             = 0x01D5,
-    PROC_E_RDY             = 0x01D6,
-    PROC_E_FM              = 0x01D7,
-    PROC_E_FS              = 0x01D8,
-    PROC_E_PM              = 0x01D9,
-    PROC_E_PO              = 0x01DA,
-    PROC_E_MB              = 0x01DB,
-    PROC_E_MK              = 0x01DC,
-    PROC_E_MM              = 0x01DD,
-    PROC_E_FZ              = 0x01DE,
-    PROC_E_ZS              = 0x01DF,
-    PROC_E_KK              = 0x01E0,
-    PROC_E_HP              = 0x01E1,
-    PROC_E_ZH              = 0x01E2,
-    PROC_E_ZM              = 0x01E3,
-    PROC_E_PZ              = 0x01E4,
-    PROC_E_FB              = 0x01E5,
-    PROC_E_FK              = 0x01E6,
-    PROC_E_MS              = 0x01E7,
-    PROC_E_NEST            = 0x01E8,
-    PROC_E_NZ              = 0x01E9,
-    PROC_E_BA              = 0x01EA,
-    PROC_E_BU              = 0x01EB,
-    PROC_E_BUG             = 0x01EC,
-    PROC_E_BEE             = 0x01ED,
-    PROC_E_IS              = 0x01EE,
-    PROC_E_KG              = 0x01EF,
-    PROC_E_KR              = 0x01F0,
-    PROC_E_SW              = 0x01F1,
-    PROC_E_GE              = 0x01F2,
-    PROC_Tag_WatchGe       = 0x01F3,
-    PROC_E_YM              = 0x01F4,
-    PROC_E_YM_TAG          = 0x01F5,
-    PROC_E_YMB             = 0x01F6,
-    PROC_Tag_FWall         = 0x01F7,
-    PROC_Tag_WaterFall     = 0x01F8,
-    PROC_E_YK              = 0x01F9,
-    PROC_E_YR              = 0x01FA,
-    PROC_E_YG              = 0x01FB,
-    PROC_E_HZ              = 0x01FC,
-    PROC_E_WS              = 0x01FD,
-    PROC_E_OC              = 0x01FE,
-    PROC_E_OT              = 0x01FF,
-    PROC_E_DT              = 0x0200,
-    PROC_E_BG              = 0x0201,
-    PROC_E_OctBg           = 0x0202,
-    PROC_DR                = 0x0203,
-    PROC_L7lowDr           = 0x0204,
-    PROC_L7ODR             = 0x0205,
-    PROC_E_TT              = 0x0206,
-    PROC_E_DK              = 0x0207,
-    PROC_E_VT              = 0x0208,
-    PROC_E_WW              = 0x0209,
-    PROC_E_GI              = 0x020A,
-    PROC_B_BH              = 0x020B,
-    PROC_B_BQ              = 0x020C,
-    PROC_B_GM              = 0x020D,
-    PROC_B_GND             = 0x020E,
-    PROC_B_GO              = 0x020F,
-    PROC_B_OH2             = 0x0210,
-    PROC_B_YO              = 0x0211,
-    PROC_B_YOI             = 0x0212,
-    PROC_B_TN              = 0x0213,
-    PROC_B_GG              = 0x0214,
-    PROC_B_DRE             = 0x0215,
-    PROC_B_MGN             = 0x0216,
-    PROC_E_WAP             = 0x0217,
-    PROC_ITEM              = 0x0218,
-    PROC_Obj_SmallKey      = 0x0219,
-    PROC_Obj_Kantera       = 0x021A,
+    PROC_Obj_Lv8Lift = 0x00A4,
+    PROC_Obj_Lv8UdFloor = 0x00A5,
+    PROC_Obj_Lv9SwShutter = 0x00A6,
+    PROC_Obj_TobyHouse = 0x00A7,
+    PROC_Obj_poCandle = 0x00A8,
+    PROC_Obj_Lv4DigSand = 0x00A9,
+    PROC_Obj_FallObj = 0x00AA,
+    PROC_Obj_SmgDoor = 0x00AB,
+    PROC_Obj_SwLight = 0x00AC,
+    PROC_Obj_Avalanche = 0x00AD,
+    PROC_Obj_MirrorScrew = 0x00AE,
+    PROC_Obj_MirrorSand = 0x00AF,
+    PROC_Obj_MirrorTable = 0x00B0,
+    PROC_Obj_MirrorChain = 0x00B1,
+    PROC_Obj_Mirror6Pole = 0x00B2,
+    PROC_Obj_SwSpinner = 0x00B3,
+    PROC_Obj_TDoor = 0x00B4,
+    PROC_Obj_Lv7Bridge = 0x00B5,
+    PROC_Obj_zrTurara = 0x00B6,
+    PROC_Obj_TakaraDai = 0x00B7,
+    PROC_Obj_Table = 0x00B8,
+    PROC_Obj_CatDoor = 0x00B9,
+    PROC_Obj_Gake = 0x00BA,
+    PROC_CSTAF = 0x00BB,
+    PROC_Obj_Lv4RailWall = 0x00BC,
+    PROC_Obj_Lv4Sand = 0x00BD,
+    PROC_Obj_PushDoor = 0x00BE,
+    PROC_PushDoor = 0x00BF,
+    PROC_Obj_GanonWall2 = 0x00C0,
+    PROC_Obj_Lv4Bridge = 0x00C1,
+    PROC_Obj_Lv4Floor = 0x00C2,
+    PROC_Tag_Spinner = 0x00C3,
+    PROC_Obj_SwHang = 0x00C4,
+    PROC_Obj_RotStair = 0x00C5,
+    PROC_Obj_MagneArm = 0x00C6,
+    PROC_Obj_KWheel00 = 0x00C7,
+    PROC_Obj_KWheel01 = 0x00C8,
+    PROC_Obj_Ychndlr = 0x00C9,
+    PROC_Obj_PRElvtr = 0x00CA,
+    PROC_Obj_MHasu = 0x00CB,
+    PROC_Obj_YIblltray = 0x00CC,
+    PROC_Obj_Lv6EGate = 0x00CD,
+    PROC_Obj_PDtile = 0x00CE,
+    PROC_Obj_PDwall = 0x00CF,
+    PROC_Obj_Lv4PRwall = 0x00D0,
+    PROC_Obj_KLift00 = 0x00D1,
+    PROC_B_OH = 0x00D2,
+    PROC_Obj_Lv4Chan = 0x00D3,
+    PROC_Obj_Lv3R10Saka = 0x00D4,
+    PROC_Obj_Lv3Water = 0x00D5,
+    PROC_Obj_Lv3Water2 = 0x00D6,
+    PROC_OBJ_LV3WATERB = 0x00D7,
+    PROC_Obj_HBombkoya = 0x00D8,
+    PROC_Obj_SZbridge = 0x00D9,
+    PROC_Obj_KakarikoBrg = 0x00DA,
+    PROC_Obj_OrdinBrg = 0x00DB,
+    PROC_Obj_BurnBox = 0x00DC,
+    PROC_Obj_KJgjs = 0x00DD,
+    PROC_OBJ_IHASI = 0x00DE,
+    PROC_Obj_IceBlock = 0x00DF,
+    PROC_Obj_VolcanicBall = 0x00E0,
+    PROC_Obj_VolcanicBomb = 0x00E1,
+    PROC_Obj_VolcGnd = 0x00E2,
+    PROC_Obj_KKanban = 0x00E3,
+    PROC_E_PH = 0x00E4,
+    PROC_NPC_ZRA = 0x00E5,
+    PROC_Obj_Chandelier = 0x00E6,
+    PROC_Obj_Stopper2 = 0x00E7,
+    PROC_DOOR20 = 0x00E8,
+    PROC_Tag_Hinit = 0x00E9,
+    PROC_Tag_Hjump = 0x00EA,
+    PROC_Tag_AJnot = 0x00EB,
+    PROC_Tag_Hstop = 0x00EC,
+    PROC_CANOE = 0x00ED,
+    PROC_HORSE = 0x00EE,
+    PROC_E_WB = 0x00EF,
+    PROC_OBJ_ITO = 0x00F0,
+    PROC_OBJ_SW = 0x00F1,
+    PROC_SPINNER = 0x00F2,
+    PROC_B_OB = 0x00F3,
+    PROC_KAGO = 0x00F4,
+    PROC_E_YC = 0x00F5,
+    PROC_B_DS = 0x00F6,
+    PROC_B_DR = 0x00F7,
+    PROC_B_ZANTZ = 0x00F8,
+    PROC_B_ZANT = 0x00F9,
+    PROC_B_ZANTM = 0x00FA,
+    PROC_TBOX = 0x00FB,
+    PROC_TBOX2 = 0x00FC,
+    PROC_ALINK = 0x00FD,
+    PROC_BOOMERANG = 0x00FE,
+    PROC_MIDNA = 0x00FF,
+    PROC_NPC_TK = 0x0100,
+    PROC_NPC_WORM = 0x0101,
+    PROC_PPolamp = 0x0102,
+    PROC_BkyRock = 0x0103,
+    PROC_HITOBJ = 0x0104,
+    PROC_EP = 0x0105,
+    PROC_COW = 0x0106,
+    PROC_PERU = 0x0107,
+    PROC_NI = 0x0108,
+    PROC_NPC_TKJ2 = 0x0109,
+    PROC_SQ = 0x010A,
+    PROC_NPC_SQ = 0x010B,
+    PROC_DO = 0x010C,
+    PROC_NPC_NE = 0x010D,
+    PROC_NPC_TR = 0x010E,
+    PROC_NPC_LF = 0x010F,
+    PROC_OBJ_FOOD = 0x0110,
+    PROC_OBJ_KI = 0x0111,
+    PROC_OBJ_KITA = 0x0112,
+    PROC_OBJ_KEY = 0x0113,
+    PROC_OBJ_KEYHOLE = 0x0114,
+    PROC_Obj_Lv5Key = 0x0115,
+    PROC_OBJ_LP = 0x0116,
+    PROC_OBJ_TATIGI = 0x0117,
+    PROC_OBJ_ROCK = 0x0118,
+    PROC_OBJ_WFLAG = 0x0119,
+    PROC_OBJ_KAGE = 0x011A,
+    PROC_OBJ_KANBAN2 = 0x011B,
+    PROC_OBJ_BALLOON = 0x011C,
+    PROC_OBJ_SUISYA = 0x011D,
+    PROC_OBJ_OILTUBO = 0x011E,
+    PROC_OBJ_ROTEN = 0x011F,
+    PROC_OBJ_SSDRINK = 0x0120,
+    PROC_OBJ_SSITEM = 0x0121,
+    PROC_TAG_SSDRINK = 0x0122,
+    PROC_TAG_BTLITM = 0x0123,
+    PROC_TAG_LV5SOUP = 0x0124,
+    PROC_TAG_MNLIGHT = 0x0125,
+    PROC_TAG_SHOPCAM = 0x0126,
+    PROC_TAG_SHOPITM = 0x0127,
+    PROC_OBJ_NDOOR = 0x0128,
+    PROC_OBJ_UDOOR = 0x0129,
+    PROC_OBJ_USAKU = 0x012A,
+    PROC_Obj_SM_DOOR = 0x012B,
+    PROC_OBJ_BED = 0x012C,
+    PROC_OBJ_BOUMATO = 0x012D,
+    PROC_OBJ_ITAMATO = 0x012E,
+    PROC_OBJ_NOUGU = 0x012F,
+    PROC_OBJ_STICK = 0x0130,
+    PROC_OBJ_MIE = 0x0131,
+    PROC_OBJ_SEKIDOOR = 0x0132,
+    PROC_OBJ_SEKIZO = 0x0133,
+    PROC_OBJ_SMTILE = 0x0134,
+    PROC_NPC_FISH = 0x0135,
+    PROC_MG_FISH = 0x0136,
+    PROC_FSHOP = 0x0137,
+    PROC_NPC_DU = 0x0138,
+    PROC_DISAPPEAR = 0x0139,
+    PROC_Obj_Mato = 0x013A,
+    PROC_Obj_Flag = 0x013B,
+    PROC_Obj_Flag2 = 0x013C,
+    PROC_Obj_Flag3 = 0x013D,
+    PROC_Obj_GOMIKABE = 0x013E,
+    PROC_Obj_Yousei = 0x013F,
+    PROC_Obj_Kabuto = 0x0140,
+    PROC_Obj_Cho = 0x0141,
+    PROC_Obj_Kuw = 0x0142,
+    PROC_Obj_Nan = 0x0143,
+    PROC_Obj_Dan = 0x0144,
+    PROC_Obj_Kam = 0x0145,
+    PROC_Obj_Ten = 0x0146,
+    PROC_Obj_Ari = 0x0147,
+    PROC_Obj_Kag = 0x0148,
+    PROC_Obj_Batta = 0x0149,
+    PROC_Obj_Tombo = 0x014A,
+    PROC_Obj_Kat = 0x014B,
+    PROC_Obj_H_Saku = 0x014C,
+    PROC_Obj_Yobikusa = 0x014D,
+    PROC_Obj_KazeNeko = 0x014E,
+    PROC_Obj_KznkArm = 0x014F,
+    PROC_Obj_NamePlate = 0x0150,
+    PROC_Obj_OnCloth = 0x0151,
+    PROC_Obj_LndRope = 0x0152,
+    PROC_Obj_ItaRope = 0x0153,
+    PROC_Obj_Sakuita = 0x0154,
+    PROC_Obj_Laundry = 0x0155,
+    PROC_WarpBug = 0x0156,
+    PROC_Izumi_Gate = 0x0157,
+    PROC_Obj_Fchain = 0x0158,
+    PROC_Obj_Wchain = 0x0159,
+    PROC_Tag_Attp = 0x015A,
+    PROC_Obj_Tornado = 0x015B,
+    PROC_Obj_Tornado2 = 0x015C,
+    PROC_Obj_FirePillar = 0x015D,
+    PROC_Obj_FirePillar2 = 0x015E,
+    PROC_Obj_InoBone = 0x015F,
+    PROC_Obj_Stopper = 0x0160,
+    PROC_Obj_MHole = 0x0161,
+    PROC_Tag_Magne = 0x0162,
+    PROC_Obj_BossWarp = 0x0163,
+    PROC_Obj_WoodPendulum = 0x0164,
+    PROC_Obj_WdStick = 0x0165,
+    PROC_Obj_StairBlock = 0x0166,
+    PROC_Obj_Geyser = 0x0167,
+    PROC_Tag_KtOnFire = 0x0168,
+    PROC_Obj_FireWood = 0x0169,
+    PROC_Obj_FireWood2 = 0x016A,
+    PROC_Obj_GpTaru = 0x016B,
+    PROC_Obj_OnsenTaru = 0x016C,
+    PROC_Obj_KiPot = 0x016D,
+    PROC_TBOX_SW = 0x016E,
+    PROC_Obj_SwChain = 0x016F,
+    PROC_Obj_WoodenSword = 0x0170,
+    PROC_Obj_StoneMark = 0x0171,
+    PROC_Obj_Lv3Candle = 0x0172,
+    PROC_Tag_Lv4Candle = 0x0173,
+    PROC_Tag_Lv4CandleDm = 0x0174,
+    PROC_Obj_DamCps = 0x0175,
+    PROC_Obj_Smoke = 0x0176,
+    PROC_Obj_WaterFall = 0x0177,
+    PROC_Obj_ZoraCloth = 0x0178,
+    PROC_Obj_poFire = 0x0179,
+    PROC_Tag_poFire = 0x017A,
+    PROC_Obj_glowSphere = 0x017B,
+    PROC_Tag_LightBall = 0x017C,
+    PROC_SwLBall = 0x017D,
+    PROC_SwBall = 0x017E,
+    PROC_Obj_WaterEff = 0x017F,
+    PROC_Tag_RiverBack = 0x0180,
+    PROC_Tag_KagoFall = 0x0181,
+    PROC_Tag_Lv2PrChk = 0x0182,
+    PROC_Obj_Lv4Gear = 0x0183,
+    PROC_Obj_MasterSword = 0x0184,
+    PROC_Obj_WoodStatue = 0x0185,
+    PROC_Obj_Fan = 0x0186,
+    PROC_Obj_IceLeaf = 0x0187,
+    PROC_Obj_zrTuraraRc = 0x0188,
+    PROC_Tag_RetRoom = 0x0189,
+    PROC_Obj_WindStone = 0x018A,
+    PROC_Tag_WaraHowl = 0x018B,
+    PROC_Obj_SCannon = 0x018C,
+    PROC_Obj_SmWStone = 0x018D,
+    PROC_Obj_SCannonCrs = 0x018E,
+    PROC_Tag_SnowEff = 0x018F,
+    PROC_Tag_CstaSw = 0x0190,
+    PROC_Tag_Lv6CstaSw = 0x0191,
+    PROC_Obj_awaPlar = 0x0192,
+    PROC_Obj_poTbox = 0x0193,
+    PROC_Obj_TimeFire = 0x0194,
+    PROC_Obj_TMoon = 0x0195,
+    PROC_Obj_GanonWall = 0x0196,
+    PROC_Obj_Prop = 0x0197,
+    PROC_CSTATUE = 0x0198,
+    PROC_Obj_SwBallA = 0x0199,
+    PROC_Obj_SwBallB = 0x019A,
+    PROC_Obj_SnowSoup = 0x019B,
+    PROC_Obj_Nagaisu = 0x019C,
+    PROC_Obj_RCircle = 0x019D,
+    PROC_Obj_Picture = 0x019E,
+    PROC_Tag_SetBall = 0x019F,
+    PROC_Tag_SmkEmt = 0x01A0,
+    PROC_SwTime = 0x01A1,
+    PROC_Obj_HFtr = 0x01A2,
+    PROC_Obj_HBarrel = 0x01A3,
+    PROC_Obj_Crystal = 0x01A4,
+    PROC_Obj_SCannonTen = 0x01A5,
+    PROC_Obj_SwBallC = 0x01A6,
+    PROC_SCENE_EXIT2 = 0x01A7,
+    PROC_Obj_Hata = 0x01A8,
+    PROC_Obj_ToaruMaki = 0x01A9,
+    PROC_Tag_AttackItem = 0x01AA,
+    PROC_Tag_RmbitSw = 0x01AB,
+    PROC_Obj_Sword = 0x01AC,
+    PROC_Tag_Spring = 0x01AD,
+    PROC_Tag_Statue = 0x01AE,
+    PROC_E_AI = 0x01AF,
+    PROC_E_GS = 0x01B0,
+    PROC_E_GOB = 0x01B1,
+    PROC_E_DD = 0x01B2,
+    PROC_E_DN = 0x01B3,
+    PROC_E_S1 = 0x01B4,
+    PROC_E_MF = 0x01B5,
+    PROC_E_SG = 0x01B6,
+    PROC_E_BS = 0x01B7,
+    PROC_E_SF = 0x01B8,
+    PROC_E_SH = 0x01B9,
+    PROC_E_DF = 0x01BA,
+    PROC_E_GM = 0x01BB,
+    PROC_E_MD = 0x01BC,
+    PROC_E_SM = 0x01BD,
+    PROC_E_SM2 = 0x01BE,
+    PROC_E_ST = 0x01BF,
+    PROC_E_ST_LINE = 0x01C0,
+    PROC_E_SB = 0x01C1,
+    PROC_E_TH = 0x01C2,
+    PROC_E_CR = 0x01C3,
+    PROC_E_CR_EGG = 0x01C4,
+    PROC_E_DB = 0x01C5,
+    PROC_E_DB_LEAF = 0x01C6,
+    PROC_E_GA = 0x01C7,
+    PROC_E_GB = 0x01C8,
+    PROC_E_HB = 0x01C9,
+    PROC_E_HB_LEAF = 0x01CA,
+    PROC_E_HZELDA = 0x01CB,
+    PROC_E_YD = 0x01CC,
+    PROC_E_YH = 0x01CD,
+    PROC_E_YD_LEAF = 0x01CE,
+    PROC_E_HM = 0x01CF,
+    PROC_E_TK = 0x01D0,
+    PROC_E_TK2 = 0x01D1,
+    PROC_E_TK_BALL = 0x01D2,
+    PROC_E_RB = 0x01D3,
+    PROC_E_RD = 0x01D4,
+    PROC_E_RDB = 0x01D5,
+    PROC_E_RDY = 0x01D6,
+    PROC_E_FM = 0x01D7,
+    PROC_E_FS = 0x01D8,
+    PROC_E_PM = 0x01D9,
+    PROC_E_PO = 0x01DA,
+    PROC_E_MB = 0x01DB,
+    PROC_E_MK = 0x01DC,
+    PROC_E_MM = 0x01DD,
+    PROC_E_FZ = 0x01DE,
+    PROC_E_ZS = 0x01DF,
+    PROC_E_KK = 0x01E0,
+    PROC_E_HP = 0x01E1,
+    PROC_E_ZH = 0x01E2,
+    PROC_E_ZM = 0x01E3,
+    PROC_E_PZ = 0x01E4,
+    PROC_E_FB = 0x01E5,
+    PROC_E_FK = 0x01E6,
+    PROC_E_MS = 0x01E7,
+    PROC_E_NEST = 0x01E8,
+    PROC_E_NZ = 0x01E9,
+    PROC_E_BA = 0x01EA,
+    PROC_E_BU = 0x01EB,
+    PROC_E_BUG = 0x01EC,
+    PROC_E_BEE = 0x01ED,
+    PROC_E_IS = 0x01EE,
+    PROC_E_KG = 0x01EF,
+    PROC_E_KR = 0x01F0,
+    PROC_E_SW = 0x01F1,
+    PROC_E_GE = 0x01F2,
+    PROC_Tag_WatchGe = 0x01F3,
+    PROC_E_YM = 0x01F4,
+    PROC_E_YM_TAG = 0x01F5,
+    PROC_E_YMB = 0x01F6,
+    PROC_Tag_FWall = 0x01F7,
+    PROC_Tag_WaterFall = 0x01F8,
+    PROC_E_YK = 0x01F9,
+    PROC_E_YR = 0x01FA,
+    PROC_E_YG = 0x01FB,
+    PROC_E_HZ = 0x01FC,
+    PROC_E_WS = 0x01FD,
+    PROC_E_OC = 0x01FE,
+    PROC_E_OT = 0x01FF,
+    PROC_E_DT = 0x0200,
+    PROC_E_BG = 0x0201,
+    PROC_E_OctBg = 0x0202,
+    PROC_DR = 0x0203,
+    PROC_L7lowDr = 0x0204,
+    PROC_L7ODR = 0x0205,
+    PROC_E_TT = 0x0206,
+    PROC_E_DK = 0x0207,
+    PROC_E_VT = 0x0208,
+    PROC_E_WW = 0x0209,
+    PROC_E_GI = 0x020A,
+    PROC_B_BH = 0x020B,
+    PROC_B_BQ = 0x020C,
+    PROC_B_GM = 0x020D,
+    PROC_B_GND = 0x020E,
+    PROC_B_GO = 0x020F,
+    PROC_B_OH2 = 0x0210,
+    PROC_B_YO = 0x0211,
+    PROC_B_YOI = 0x0212,
+    PROC_B_TN = 0x0213,
+    PROC_B_GG = 0x0214,
+    PROC_B_DRE = 0x0215,
+    PROC_B_MGN = 0x0216,
+    PROC_E_WAP = 0x0217,
+    PROC_ITEM = 0x0218,
+    PROC_Obj_SmallKey = 0x0219,
+    PROC_Obj_Kantera = 0x021A,
     PROC_Obj_LifeContainer = 0x021B,
-    PROC_Obj_Shield        = 0x021C,
-    PROC_Demo_Item         = 0x021D,
-    PROC_ShopItem          = 0x021E,
-    PROC_Obj_Drop          = 0x021F,
-    PROC_OBJ_RW            = 0x0220,
-    PROC_NBOMB             = 0x0221,
-    PROC_TAG_CSW           = 0x0222,
-    PROC_TAG_QS            = 0x0223,
-    PROC_HOZELDA           = 0x0224,
-    PROC_SWC00             = 0x0225,
-    PROC_KNOB20            = 0x0226,
-    PROC_DBDOOR            = 0x0227,
-    PROC_BOSS_DOOR         = 0x0228,
-    PROC_L1BOSS_DOOR       = 0x0229,
-    PROC_L1MBOSS_DOOR      = 0x022A,
-    PROC_L5BOSS_DOOR       = 0x022B,
-    PROC_DSHUTTER          = 0x022C,
-    PROC_SPIRAL_DOOR       = 0x022D,
-    PROC_Tag_ChgRestart    = 0x022E,
-    PROC_Tag_Restart       = 0x022F,
-    PROC_ANDSW             = 0x0230,
-    PROC_ANDSW2            = 0x0231,
-    PROC_MYNA              = 0x0232,
-    PROC_NPC_GND           = 0x0233,
-    PROC_NPC_GRA           = 0x0234,
-    PROC_NPC_GRC           = 0x0235,
-    PROC_NPC_GRD           = 0x0236,
-    PROC_NPC_GRM           = 0x0237,
-    PROC_NPC_GRMC          = 0x0238,
-    PROC_NPC_GRO           = 0x0239,
-    PROC_NPC_GRR           = 0x023A,
-    PROC_NPC_GRS           = 0x023B,
-    PROC_NPC_GRZ           = 0x023C,
-    PROC_NPC_YAMID         = 0x023D,
-    PROC_NPC_YAMIT         = 0x023E,
-    PROC_NPC_YAMIS         = 0x023F,
-    PROC_NPC_BLUENS        = 0x0240,
-    PROC_NPC_KAKASHI       = 0x0241,
-    PROC_NPC_KDK           = 0x0242,
-    PROC_NPC_ARU           = 0x0243,
-    PROC_NPC_BANS          = 0x0244,
-    PROC_NPC_BESU          = 0x0245,
-    PROC_NPC_BOU           = 0x0246,
-    PROC_NPC_BOU_S         = 0x0247,
-    PROC_NPC_CLERKA        = 0x0248,
-    PROC_NPC_CLERKB        = 0x0249,
-    PROC_NPC_CLERKT        = 0x024A,
-    PROC_NPC_WRESTLER      = 0x024B,
-    PROC_Tag_Arena         = 0x024C,
-    PROC_Tag_Instruction   = 0x024D,
-    PROC_NPC_DOC           = 0x024E,
-    PROC_NPC_GWOLF         = 0x024F,
-    PROC_NPC_LEN           = 0x0250,
-    PROC_NPC_LUD           = 0x0251,
-    PROC_NPC_FAIRY_SEIREI  = 0x0252,
-    PROC_NPC_FAIRY         = 0x0253,
-    PROC_NPC_HANJO         = 0x0254,
-    PROC_NPC_HENNA         = 0x0255,
-    PROC_NPC_HENNA0        = 0x0256,
-    PROC_NPC_HOZ           = 0x0257,
-    PROC_NPC_JAGAR         = 0x0258,
-    PROC_NPC_KKRI          = 0x0259,
-    PROC_NPC_KN            = 0x025A,
-    PROC_KN_BULLET         = 0x025B,
-    PROC_NPC_KNJ           = 0x025C,
-    PROC_NPC_KOLIN         = 0x025D,
-    PROC_NPC_KOLINB        = 0x025E,
-    PROC_NPC_KYURY         = 0x025F,
-    PROC_NPC_MARO          = 0x0260,
-    PROC_NPC_MIDP          = 0x0261,
-    PROC_NPC_MOI           = 0x0262,
-    PROC_NPC_RACA          = 0x0263,
-    PROC_NPC_SARU          = 0x0264,
-    PROC_NPC_SEIB          = 0x0265,
-    PROC_NPC_SEIC          = 0x0266,
-    PROC_NPC_SEID          = 0x0267,
-    PROC_NPC_SEIRA         = 0x0268,
-    PROC_NPC_SERA2         = 0x0269,
-    PROC_NPC_SEIREI        = 0x026A,
-    PROC_NPC_SHAMAN        = 0x026B,
-    PROC_NPC_SMARO         = 0x026C,
-    PROC_NPC_SOLA          = 0x026D,
-    PROC_NPC_TARO          = 0x026E,
-    PROC_NPC_PACHI_BESU    = 0x026F,
-    PROC_NPC_PACHI_TARO    = 0x0270,
-    PROC_NPC_PACHI_MARO    = 0x0271,
-    PROC_TAG_PATI          = 0x0272,
-    PROC_NPC_THE           = 0x0273,
-    PROC_NPC_TKJ           = 0x0274,
-    PROC_NPC_TKS           = 0x0275,
-    PROC_NPC_TKC           = 0x0276,
-    PROC_OBJ_TKS           = 0x0277,
-    PROC_NPC_TOBY          = 0x0278,
-    PROC_NPC_URI           = 0x0279,
-    PROC_NPC_YELIA         = 0x027A,
-    PROC_NPC_YKM           = 0x027B,
-    PROC_NPC_YKW           = 0x027C,
-    PROC_NPC_ZANB          = 0x027D,
-    PROC_NPC_ZANT          = 0x027E,
-    PROC_NPC_ZELDA         = 0x027F,
-    PROC_NPC_ZELR          = 0x0280,
-    PROC_NPC_ZELRO         = 0x0281,
-    PROC_OBJ_ZRAFREEZE     = 0x0282,
-    PROC_NPC_ZRC           = 0x0283,
-    PROC_NPC_ZRZ           = 0x0284,
-    PROC_ZRA_MARK          = 0x0285,
-    PROC_MYNA2             = 0x0286,
-    PROC_TAG_MYNA2         = 0x0287,
-    PROC_NPC_CD3           = 0x0288,
-    PROC_Tag_Schedule      = 0x0289,
-    PROC_Tag_Escape        = 0x028A,
-    PROC_NPC_CHAT          = 0x028B,
-    PROC_NPC_SOLDIERa      = 0x028C,
-    PROC_NPC_SOLDIERb      = 0x028D,
-    PROC_PASSER_MNG        = 0x028E,
-    PROC_NPC_PASSER        = 0x028F,
-    PROC_NPC_PASSER2       = 0x0290,
-    PROC_NPC_POST          = 0x0291,
-    PROC_NPC_POUYA         = 0x0292,
-    PROC_FORMATION_MNG     = 0x0293,
-    PROC_NPC_FGUARD        = 0x0294,
-    PROC_GUARD_MNG         = 0x0295,
-    PROC_TAG_GUARD         = 0x0296,
-    PROC_NPC_GUARD         = 0x0297,
-    PROC_NPC_ASH           = 0x0298,
-    PROC_NPC_ASHB          = 0x0299,
-    PROC_NPC_SHAD          = 0x029A,
-    PROC_NPC_RAFREL        = 0x029B,
-    PROC_NPC_MOIR          = 0x029C,
-    PROC_NPC_IMPAL         = 0x029D,
-    PROC_NPC_SHOE          = 0x029E,
-    PROC_NPC_DOORBOY       = 0x029F,
-    PROC_NPC_PRAYER        = 0x02A0,
-    PROC_NPC_KASIHANA      = 0x02A1,
-    PROC_NPC_KASIKYU       = 0x02A2,
-    PROC_NPC_KASIMICH      = 0x02A3,
-    PROC_NPC_DRSOL         = 0x02A4,
-    PROC_NPC_CHIN          = 0x02A5,
-    PROC_NPC_INS           = 0x02A6,
-    PROC_NPC_SHOP0         = 0x02A7,
-    PROC_NPC_MK            = 0x02A8,
-    PROC_NPC_P2            = 0x02A9,
-    PROC_KYTAG00           = 0x02AA,
-    PROC_KYTAG01           = 0x02AB,
-    PROC_KYTAG02           = 0x02AC,
-    PROC_KYTAG03           = 0x02AD,
-    PROC_KYTAG04           = 0x02AE,
-    PROC_KYTAG05           = 0x02AF,
-    PROC_KYTAG06           = 0x02B0,
-    PROC_KYTAG07           = 0x02B1,
-    PROC_KYTAG08           = 0x02B2,
-    PROC_KYTAG09           = 0x02B3,
-    PROC_KYTAG10           = 0x02B4,
-    PROC_KYTAG11           = 0x02B5,
-    PROC_KYTAG12           = 0x02B6,
-    PROC_KYTAG13           = 0x02B7,
-    PROC_KYTAG14           = 0x02B8,
-    PROC_KYTAG15           = 0x02B9,
-    PROC_KYTAG16           = 0x02BA,
-    PROC_KYTAG17           = 0x02BB,
-    PROC_Ykgr              = 0x02BC,
-    PROC_TALK              = 0x02BD,
-    PROC_Obj_Crope         = 0x02BE,
-    PROC_Obj_Bombf         = 0x02BF,
-    PROC_Obj_BkLeaf        = 0x02C0,
-    PROC_Tag_Mhint         = 0x02C1,
-    PROC_Tag_Mmsg          = 0x02C2,
-    PROC_Tag_Mwait         = 0x02C3,
-    PROC_Tag_Mstop         = 0x02C4,
-    PROC_Tag_Stream        = 0x02C5,
-    PROC_Tag_Sppath        = 0x02C6,
-    PROC_Tag_Wljump        = 0x02C7,
-    PROC_Tag_TWGate        = 0x02C8,
-    PROC_Tag_Lv6Gate       = 0x02C9,
-    PROC_Tag_Lv7Gate       = 0x02CA,
-    PROC_Tag_Lv8Gate       = 0x02CB,
-    PROC_Tag_TheBHint      = 0x02CC,
-    PROC_Tag_Assist        = 0x02CD,
-    PROC_DEMO00            = 0x02CE,
-    PROC_TAG_CAMERA        = 0x02CF,
-    PROC_TAG_CHKPOINT      = 0x02D0,
-    PROC_TAG_EVENT         = 0x02D1,
-    PROC_TAG_EVT           = 0x02D2,
-    PROC_TAG_TELOP         = 0x02D3,
-    PROC_TAG_HOWL          = 0x02D4,
-    PROC_TAG_MSG           = 0x02D5,
-    PROC_TAG_LANTERN       = 0x02D6,
-    PROC_Tag_Mist          = 0x02D7,
-    PROC_DMIDNA            = 0x02D8,
-    PROC_KY_THUNDER        = 0x02D9,
-    PROC_VRBOX             = 0x02DA,
-    PROC_VRBOX2            = 0x02DB,
-    PROC_BG                = 0x02DC,
-    PROC_SET_BG_OBJ        = 0x02DD,
-    PROC_BG_OBJ            = 0x02DE,
-    PROC_MIRROR            = 0x02DF,
-    PROC_MOVIE_PLAYER      = 0x02E0,
-    PROC_TITLE             = 0x02E1,
-    PROC_FR                = 0x02E2,
-    PROC_ECONT             = 0x02E3,
-    PROC_MG_ROD            = 0x02E4,
-    PROC_E_ARROW           = 0x02E5,
-    PROC_BULLET            = 0x02E6,
-    PROC_SWHIT0            = 0x02E7,
-    PROC_E_TH_BALL         = 0x02E8,
-    PROC_TAG_EVTAREA       = 0x02E9,
-    PROC_TAG_EVTMSG        = 0x02EA,
-    PROC_TAG_KMSG          = 0x02EB,
-    PROC_TAG_PUSH          = 0x02EC,
-    PROC_E_MK_BO           = 0x02ED,
-    PROC_E_MM_MT           = 0x02EE,
-    PROC_OBJ_KBOX          = 0x02EF,
-    PROC_OBJ_FW            = 0x02F0,
-    PROC_B_GOS             = 0x02F1,
-    PROC_OBJ_YSTONE        = 0x02F2,
-    PROC_MANT              = 0x02F3,
-    PROC_CROD              = 0x02F4,
-    PROC_OBJ_PLEAF         = 0x02F5,
-    PROC_OBJ_KBACKET       = 0x02F6,
-    PROC_OBJ_YBAG          = 0x02F7,
-    PROC_OBJ_PUMPKIN       = 0x02F8,
-    PROC_OBJ_AUTOMATA      = 0x02F9,
-    PROC_OBJ_GADGET        = 0x02FA,
-    PROC_OBJ_KAGO          = 0x02FB,
-    PROC_Obj_Carry         = 0x02FC,
-    PROC_Obj_Stone         = 0x02FD,
-    PROC_OBJ_HB            = 0x02FE,
-    PROC_NPC_INKO          = 0x02FF,
-    PROC_BD                = 0x0300,
-    PROC_Obj_Eff           = 0x0301,
-    PROC_WPILLAR           = 0x0302,
-    PROC_WMARK             = 0x0303,
-    PROC_E_BI              = 0x0304,
-    PROC_E_BI_LEAF         = 0x0305,
-    PROC_START_AND_GOAL    = 0x0306,
-    PROC_NPC_DF            = 0x0307,
-    PROC_ARROW             = 0x0308,
-    PROC_PATH_LINE         = 0x0309,
-    PROC_TAG_ALLMATO       = 0x030A,
-    PROC_Obj_Timer         = 0x030B,
-    PROC_SCENE_EXIT        = 0x030C,
-    PROC_CAMERA            = 0x030D,
-    PROC_CAMERA2           = 0x030E,
-    PROC_SUSPEND           = 0x030F,
-    PROC_GRASS             = 0x0310,
-    PROC_KYEFF             = 0x0311,
-    PROC_KYEFF2            = 0x0312,
-    PROC_MSG_OBJECT        = 0x0313,
-    PROC_MENUWINDOW        = 0x0314,
-    PROC_TIMER             = 0x0315,
-    PROC_METER2            = 0x0316,
-    PROC_GAMEOVER          = 0x0317,
+    PROC_Obj_Shield = 0x021C,
+    PROC_Demo_Item = 0x021D,
+    PROC_ShopItem = 0x021E,
+    PROC_Obj_Drop = 0x021F,
+    PROC_OBJ_RW = 0x0220,
+    PROC_NBOMB = 0x0221,
+    PROC_TAG_CSW = 0x0222,
+    PROC_TAG_QS = 0x0223,
+    PROC_HOZELDA = 0x0224,
+    PROC_SWC00 = 0x0225,
+    PROC_KNOB20 = 0x0226,
+    PROC_DBDOOR = 0x0227,
+    PROC_BOSS_DOOR = 0x0228,
+    PROC_L1BOSS_DOOR = 0x0229,
+    PROC_L1MBOSS_DOOR = 0x022A,
+    PROC_L5BOSS_DOOR = 0x022B,
+    PROC_DSHUTTER = 0x022C,
+    PROC_SPIRAL_DOOR = 0x022D,
+    PROC_Tag_ChgRestart = 0x022E,
+    PROC_Tag_Restart = 0x022F,
+    PROC_ANDSW = 0x0230,
+    PROC_ANDSW2 = 0x0231,
+    PROC_MYNA = 0x0232,
+    PROC_NPC_GND = 0x0233,
+    PROC_NPC_GRA = 0x0234,
+    PROC_NPC_GRC = 0x0235,
+    PROC_NPC_GRD = 0x0236,
+    PROC_NPC_GRM = 0x0237,
+    PROC_NPC_GRMC = 0x0238,
+    PROC_NPC_GRO = 0x0239,
+    PROC_NPC_GRR = 0x023A,
+    PROC_NPC_GRS = 0x023B,
+    PROC_NPC_GRZ = 0x023C,
+    PROC_NPC_YAMID = 0x023D,
+    PROC_NPC_YAMIT = 0x023E,
+    PROC_NPC_YAMIS = 0x023F,
+    PROC_NPC_BLUENS = 0x0240,
+    PROC_NPC_KAKASHI = 0x0241,
+    PROC_NPC_KDK = 0x0242,
+    PROC_NPC_ARU = 0x0243,
+    PROC_NPC_BANS = 0x0244,
+    PROC_NPC_BESU = 0x0245,
+    PROC_NPC_BOU = 0x0246,
+    PROC_NPC_BOU_S = 0x0247,
+    PROC_NPC_CLERKA = 0x0248,
+    PROC_NPC_CLERKB = 0x0249,
+    PROC_NPC_CLERKT = 0x024A,
+    PROC_NPC_WRESTLER = 0x024B,
+    PROC_Tag_Arena = 0x024C,
+    PROC_Tag_Instruction = 0x024D,
+    PROC_NPC_DOC = 0x024E,
+    PROC_NPC_GWOLF = 0x024F,
+    PROC_NPC_LEN = 0x0250,
+    PROC_NPC_LUD = 0x0251,
+    PROC_NPC_FAIRY_SEIREI = 0x0252,
+    PROC_NPC_FAIRY = 0x0253,
+    PROC_NPC_HANJO = 0x0254,
+    PROC_NPC_HENNA = 0x0255,
+    PROC_NPC_HENNA0 = 0x0256,
+    PROC_NPC_HOZ = 0x0257,
+    PROC_NPC_JAGAR = 0x0258,
+    PROC_NPC_KKRI = 0x0259,
+    PROC_NPC_KN = 0x025A,
+    PROC_KN_BULLET = 0x025B,
+    PROC_NPC_KNJ = 0x025C,
+    PROC_NPC_KOLIN = 0x025D,
+    PROC_NPC_KOLINB = 0x025E,
+    PROC_NPC_KYURY = 0x025F,
+    PROC_NPC_MARO = 0x0260,
+    PROC_NPC_MIDP = 0x0261,
+    PROC_NPC_MOI = 0x0262,
+    PROC_NPC_RACA = 0x0263,
+    PROC_NPC_SARU = 0x0264,
+    PROC_NPC_SEIB = 0x0265,
+    PROC_NPC_SEIC = 0x0266,
+    PROC_NPC_SEID = 0x0267,
+    PROC_NPC_SEIRA = 0x0268,
+    PROC_NPC_SERA2 = 0x0269,
+    PROC_NPC_SEIREI = 0x026A,
+    PROC_NPC_SHAMAN = 0x026B,
+    PROC_NPC_SMARO = 0x026C,
+    PROC_NPC_SOLA = 0x026D,
+    PROC_NPC_TARO = 0x026E,
+    PROC_NPC_PACHI_BESU = 0x026F,
+    PROC_NPC_PACHI_TARO = 0x0270,
+    PROC_NPC_PACHI_MARO = 0x0271,
+    PROC_TAG_PATI = 0x0272,
+    PROC_NPC_THE = 0x0273,
+    PROC_NPC_TKJ = 0x0274,
+    PROC_NPC_TKS = 0x0275,
+    PROC_NPC_TKC = 0x0276,
+    PROC_OBJ_TKS = 0x0277,
+    PROC_NPC_TOBY = 0x0278,
+    PROC_NPC_URI = 0x0279,
+    PROC_NPC_YELIA = 0x027A,
+    PROC_NPC_YKM = 0x027B,
+    PROC_NPC_YKW = 0x027C,
+    PROC_NPC_ZANB = 0x027D,
+    PROC_NPC_ZANT = 0x027E,
+    PROC_NPC_ZELDA = 0x027F,
+    PROC_NPC_ZELR = 0x0280,
+    PROC_NPC_ZELRO = 0x0281,
+    PROC_OBJ_ZRAFREEZE = 0x0282,
+    PROC_NPC_ZRC = 0x0283,
+    PROC_NPC_ZRZ = 0x0284,
+    PROC_ZRA_MARK = 0x0285,
+    PROC_MYNA2 = 0x0286,
+    PROC_TAG_MYNA2 = 0x0287,
+    PROC_NPC_CD3 = 0x0288,
+    PROC_Tag_Schedule = 0x0289,
+    PROC_Tag_Escape = 0x028A,
+    PROC_NPC_CHAT = 0x028B,
+    PROC_NPC_SOLDIERa = 0x028C,
+    PROC_NPC_SOLDIERb = 0x028D,
+    PROC_PASSER_MNG = 0x028E,
+    PROC_NPC_PASSER = 0x028F,
+    PROC_NPC_PASSER2 = 0x0290,
+    PROC_NPC_POST = 0x0291,
+    PROC_NPC_POUYA = 0x0292,
+    PROC_FORMATION_MNG = 0x0293,
+    PROC_NPC_FGUARD = 0x0294,
+    PROC_GUARD_MNG = 0x0295,
+    PROC_TAG_GUARD = 0x0296,
+    PROC_NPC_GUARD = 0x0297,
+    PROC_NPC_ASH = 0x0298,
+    PROC_NPC_ASHB = 0x0299,
+    PROC_NPC_SHAD = 0x029A,
+    PROC_NPC_RAFREL = 0x029B,
+    PROC_NPC_MOIR = 0x029C,
+    PROC_NPC_IMPAL = 0x029D,
+    PROC_NPC_SHOE = 0x029E,
+    PROC_NPC_DOORBOY = 0x029F,
+    PROC_NPC_PRAYER = 0x02A0,
+    PROC_NPC_KASIHANA = 0x02A1,
+    PROC_NPC_KASIKYU = 0x02A2,
+    PROC_NPC_KASIMICH = 0x02A3,
+    PROC_NPC_DRSOL = 0x02A4,
+    PROC_NPC_CHIN = 0x02A5,
+    PROC_NPC_INS = 0x02A6,
+    PROC_NPC_SHOP0 = 0x02A7,
+    PROC_NPC_MK = 0x02A8,
+    PROC_NPC_P2 = 0x02A9,
+    PROC_KYTAG00 = 0x02AA,
+    PROC_KYTAG01 = 0x02AB,
+    PROC_KYTAG02 = 0x02AC,
+    PROC_KYTAG03 = 0x02AD,
+    PROC_KYTAG04 = 0x02AE,
+    PROC_KYTAG05 = 0x02AF,
+    PROC_KYTAG06 = 0x02B0,
+    PROC_KYTAG07 = 0x02B1,
+    PROC_KYTAG08 = 0x02B2,
+    PROC_KYTAG09 = 0x02B3,
+    PROC_KYTAG10 = 0x02B4,
+    PROC_KYTAG11 = 0x02B5,
+    PROC_KYTAG12 = 0x02B6,
+    PROC_KYTAG13 = 0x02B7,
+    PROC_KYTAG14 = 0x02B8,
+    PROC_KYTAG15 = 0x02B9,
+    PROC_KYTAG16 = 0x02BA,
+    PROC_KYTAG17 = 0x02BB,
+    PROC_Ykgr = 0x02BC,
+    PROC_TALK = 0x02BD,
+    PROC_Obj_Crope = 0x02BE,
+    PROC_Obj_Bombf = 0x02BF,
+    PROC_Obj_BkLeaf = 0x02C0,
+    PROC_Tag_Mhint = 0x02C1,
+    PROC_Tag_Mmsg = 0x02C2,
+    PROC_Tag_Mwait = 0x02C3,
+    PROC_Tag_Mstop = 0x02C4,
+    PROC_Tag_Stream = 0x02C5,
+    PROC_Tag_Sppath = 0x02C6,
+    PROC_Tag_Wljump = 0x02C7,
+    PROC_Tag_TWGate = 0x02C8,
+    PROC_Tag_Lv6Gate = 0x02C9,
+    PROC_Tag_Lv7Gate = 0x02CA,
+    PROC_Tag_Lv8Gate = 0x02CB,
+    PROC_Tag_TheBHint = 0x02CC,
+    PROC_Tag_Assist = 0x02CD,
+    PROC_DEMO00 = 0x02CE,
+    PROC_TAG_CAMERA = 0x02CF,
+    PROC_TAG_CHKPOINT = 0x02D0,
+    PROC_TAG_EVENT = 0x02D1,
+    PROC_TAG_EVT = 0x02D2,
+    PROC_TAG_TELOP = 0x02D3,
+    PROC_TAG_HOWL = 0x02D4,
+    PROC_TAG_MSG = 0x02D5,
+    PROC_TAG_LANTERN = 0x02D6,
+    PROC_Tag_Mist = 0x02D7,
+    PROC_DMIDNA = 0x02D8,
+    PROC_KY_THUNDER = 0x02D9,
+    PROC_VRBOX = 0x02DA,
+    PROC_VRBOX2 = 0x02DB,
+    PROC_BG = 0x02DC,
+    PROC_SET_BG_OBJ = 0x02DD,
+    PROC_BG_OBJ = 0x02DE,
+    PROC_MIRROR = 0x02DF,
+    PROC_MOVIE_PLAYER = 0x02E0,
+    PROC_TITLE = 0x02E1,
+    PROC_FR = 0x02E2,
+    PROC_ECONT = 0x02E3,
+    PROC_MG_ROD = 0x02E4,
+    PROC_E_ARROW = 0x02E5,
+    PROC_BULLET = 0x02E6,
+    PROC_SWHIT0 = 0x02E7,
+    PROC_E_TH_BALL = 0x02E8,
+    PROC_TAG_EVTAREA = 0x02E9,
+    PROC_TAG_EVTMSG = 0x02EA,
+    PROC_TAG_KMSG = 0x02EB,
+    PROC_TAG_PUSH = 0x02EC,
+    PROC_E_MK_BO = 0x02ED,
+    PROC_E_MM_MT = 0x02EE,
+    PROC_OBJ_KBOX = 0x02EF,
+    PROC_OBJ_FW = 0x02F0,
+    PROC_B_GOS = 0x02F1,
+    PROC_OBJ_YSTONE = 0x02F2,
+    PROC_MANT = 0x02F3,
+    PROC_CROD = 0x02F4,
+    PROC_OBJ_PLEAF = 0x02F5,
+    PROC_OBJ_KBACKET = 0x02F6,
+    PROC_OBJ_YBAG = 0x02F7,
+    PROC_OBJ_PUMPKIN = 0x02F8,
+    PROC_OBJ_AUTOMATA = 0x02F9,
+    PROC_OBJ_GADGET = 0x02FA,
+    PROC_OBJ_KAGO = 0x02FB,
+    PROC_Obj_Carry = 0x02FC,
+    PROC_Obj_Stone = 0x02FD,
+    PROC_OBJ_HB = 0x02FE,
+    PROC_NPC_INKO = 0x02FF,
+    PROC_BD = 0x0300,
+    PROC_Obj_Eff = 0x0301,
+    PROC_WPILLAR = 0x0302,
+    PROC_WMARK = 0x0303,
+    PROC_E_BI = 0x0304,
+    PROC_E_BI_LEAF = 0x0305,
+    PROC_START_AND_GOAL = 0x0306,
+    PROC_NPC_DF = 0x0307,
+    PROC_ARROW = 0x0308,
+    PROC_PATH_LINE = 0x0309,
+    PROC_TAG_ALLMATO = 0x030A,
+    PROC_Obj_Timer = 0x030B,
+    PROC_SCENE_EXIT = 0x030C,
+    PROC_CAMERA = 0x030D,
+    PROC_CAMERA2 = 0x030E,
+    PROC_SUSPEND = 0x030F,
+    PROC_GRASS = 0x0310,
+    PROC_KYEFF = 0x0311,
+    PROC_KYEFF2 = 0x0312,
+    PROC_MSG_OBJECT = 0x0313,
+    PROC_MENUWINDOW = 0x0314,
+    PROC_TIMER = 0x0315,
+    PROC_METER2 = 0x0316,
+    PROC_GAMEOVER = 0x0317,
 };
diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h
index 28008e68ec..11b0607e4c 100644
--- a/include/d/kankyo/d_kankyo.h
+++ b/include/d/kankyo/d_kankyo.h
@@ -6,11 +6,11 @@
 #include "JSystem/JParticle/JPAParticle.h"
 #include "SSystem/SComponent/c_sxyz.h"
 #include "SSystem/SComponent/c_xyz.h"
+#include "Z2AudioLib/Z2EnvSeMgr.h"
 #include "d/kankyo/d_kankyo_wether.h"
 #include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_ext.h"
-#include "Z2AudioLib/Z2EnvSeMgr.h"
 
 class cBgS_PolyInfo;
 
diff --git a/include/dolphin/card/card.h b/include/dolphin/card/card.h
index 04fa0f03eb..447b4cd644 100644
--- a/include/dolphin/card/card.h
+++ b/include/dolphin/card/card.h
@@ -3,23 +3,23 @@
 
 #include "dolphin/types.h"
 
-#define CARD_ERROR_UNLOCKED			1
-#define CARD_ERROR_READY            0
-#define CARD_ERROR_BUSY            -1
-#define CARD_ERROR_WRONGDEVICE     -2
-#define CARD_ERROR_NOCARD          -3
-#define CARD_ERROR_NOFILE          -4
-#define CARD_ERROR_IOERROR         -5
-#define CARD_ERROR_BROKEN          -6
-#define CARD_ERROR_EXIST           -7
-#define CARD_ERROR_NOENT           -8
-#define CARD_ERROR_INSSPACE        -9
-#define CARD_ERROR_NOPERM          -10
-#define CARD_ERROR_LIMIT           -11
-#define CARD_ERROR_NAMETOOLONG     -12
-#define CARD_ERROR_ENCODING        -13
-#define CARD_ERROR_CANCELED        -14
-#define CARD_ERROR_FATAL_ERROR     -128
+#define CARD_ERROR_UNLOCKED 1
+#define CARD_ERROR_READY 0
+#define CARD_ERROR_BUSY -1
+#define CARD_ERROR_WRONGDEVICE -2
+#define CARD_ERROR_NOCARD -3
+#define CARD_ERROR_NOFILE -4
+#define CARD_ERROR_IOERROR -5
+#define CARD_ERROR_BROKEN -6
+#define CARD_ERROR_EXIST -7
+#define CARD_ERROR_NOENT -8
+#define CARD_ERROR_INSSPACE -9
+#define CARD_ERROR_NOPERM -10
+#define CARD_ERROR_LIMIT -11
+#define CARD_ERROR_NAMETOOLONG -12
+#define CARD_ERROR_ENCODING -13
+#define CARD_ERROR_CANCELED -14
+#define CARD_ERROR_FATAL_ERROR -128
 
 struct CARDFileInfo {
     /* 0x00 */ s32 channel;
@@ -70,5 +70,4 @@ s32 CARDSetStatus(s32 channel, s32 fileNo, CARDStat* stat);
 s32 CARDGetSerialNo(s32 channel, u32* serial1, u32* serial2);
 };
 
-
 #endif /* CARD_H */
diff --git a/include/m_Do/m_Do_DVDError.h b/include/m_Do/m_Do_DVDError.h
index d4d162a959..f8bbcb3b37 100644
--- a/include/m_Do/m_Do_DVDError.h
+++ b/include/m_Do/m_Do_DVDError.h
@@ -1,8 +1,8 @@
 #ifndef M_DO_M_DO_DVDERROR_H
 #define M_DO_M_DO_DVDERROR_H
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRThread.h"
+#include "dolphin/types.h"
 
 void mDoDvdErr_ThdCleanup();
 static void mDoDvdErr_Watch(void*);
diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h
index 7c4da190d8..7868e7274d 100644
--- a/include/m_Do/m_Do_ext.h
+++ b/include/m_Do/m_Do_ext.h
@@ -6,8 +6,8 @@
 #include "JSystem/JKernel/JKRAssertHeap.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
-#include "m_Do/m_Do_audio.h"
 #include "global.h"
+#include "m_Do/m_Do_audio.h"
 
 class mDoExt_baseAnm {
 public:
@@ -193,8 +193,8 @@ public:
 class mDoExt_McaMorfCallBack2_c {};
 
 class mDoExt_morf_c {
-// : public J3DMtxCalcNoAnm<J3DMtxCalcCalcTransformMaya, J3DMtxCalcJ3DSysInitMaya>
-// inheritance causing issues, fix later
+    // : public J3DMtxCalcNoAnm<J3DMtxCalcCalcTransformMaya, J3DMtxCalcJ3DSysInitMaya>
+    // inheritance causing issues, fix later
 public:
     /* 8000F950 */ mDoExt_morf_c();
     /* 8000FB7C */ void setMorf(f32);
diff --git a/libs/JSystem/JParticle/JPADynamicsBlock.cpp b/libs/JSystem/JParticle/JPADynamicsBlock.cpp
index a4576e4903..8a6129ba55 100644
--- a/libs/JSystem/JParticle/JPADynamicsBlock.cpp
+++ b/libs/JSystem/JParticle/JPADynamicsBlock.cpp
@@ -4,8 +4,8 @@
 //
 
 #include "JSystem/JParticle/JPADynamicsBlock.h"
-#include "JSystem/JParticle/JPAParticle.h"
 #include "JSystem/JMath/JMATrigonometric.h"
+#include "JSystem/JParticle/JPAParticle.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
@@ -64,7 +64,8 @@ SECTION_SDATA2 static f32 lit_2289[1 + 1 /* padding */] = {
 // bug in diff.py preventing me from seeing what's wrong
 void JPAVolumePoint(JPAEmitterWorkData* work) {
     work->mVolumePos.zero();
-    work->mVelOmni.set(work->mpEmtr->get_r_zh(), work->mpEmtr->get_r_zh(), work->mpEmtr->get_r_zh());
+    work->mVelOmni.set(work->mpEmtr->get_r_zh(), work->mpEmtr->get_r_zh(),
+                       work->mpEmtr->get_r_zh());
     work->mVelAxis.set(work->mVelOmni.x, 0.0f, work->mVelOmni.z);
 }
 
@@ -91,7 +92,9 @@ SECTION_SDATA2 static f64 lit_2321 = 4503601774854144.0 /* cast s32 to float */;
 // bug in diff.py preventing me from seeing what's wrong
 void JPAVolumeLine(JPAEmitterWorkData* work) {
     if (work->mpEmtr->checkFlag(JPADynFlag_FixedInterval)) {
-        work->mVolumePos.set(0.0f, 0.0f, work->mVolumeSize * (s32)((work->mVolumeEmitIdx / (work->mEmitCount - 1.0f) - 0.5f)));
+        work->mVolumePos.set(0.0f, 0.0f,
+                             work->mVolumeSize *
+                                 (s32)((work->mVolumeEmitIdx / (work->mEmitCount - 1.0f) - 0.5f)));
         work->mVolumeEmitIdx++;
     } else {
         work->mVolumePos.set(0.0f, 0.0f, work->mVolumeSize * work->mpEmtr->get_r_zh());
@@ -158,7 +161,8 @@ static asm void JPAVolumeCircle(JPAEmitterWorkData* param_0) {
 // bug in diff.py preventing me from seeing what's wrong
 void JPAVolumeCube(JPAEmitterWorkData* work) {
     f32 size = work->mVolumeSize;
-    work->mVolumePos.set(size * work->mpEmtr->get_r_zh(), size * work->mpEmtr->get_r_zh(), size * work->mpEmtr->get_r_zh());
+    work->mVolumePos.set(size * work->mpEmtr->get_r_zh(), size * work->mpEmtr->get_r_zh(),
+                         size * work->mpEmtr->get_r_zh());
     work->mVelOmni.mul(work->mVolumePos, work->mGlobalScl);
     work->mVelAxis.set(work->mVolumePos.x, 0.0f, work->mVolumePos.z);
 }
@@ -224,25 +228,39 @@ JPADynamicsBlock::JPADynamicsBlock(u8 const* data) {
 }
 
 enum {
-    VOL_Cube     = 0x00,
-    VOL_Sphere   = 0x01,
+    VOL_Cube = 0x00,
+    VOL_Sphere = 0x01,
     VOL_Cylinder = 0x02,
-    VOL_Torus    = 0x03,
-    VOL_Point    = 0x04,
-    VOL_Circle   = 0x05,
-    VOL_Line     = 0x06,
+    VOL_Torus = 0x03,
+    VOL_Point = 0x04,
+    VOL_Circle = 0x05,
+    VOL_Line = 0x06,
 };
 
 /* 8027BB4C-8027BBE8 27648C 009C+00 2/1 0/0 0/0 .text            init__16JPADynamicsBlockFv */
 void JPADynamicsBlock::init() {
     switch (getVolumeType()) {
-    case VOL_Cube:     mpCalcVolumeFunc = &JPAVolumeCube;     break;
-    case VOL_Sphere:   mpCalcVolumeFunc = &JPAVolumeSphere;   break;
-    case VOL_Cylinder: mpCalcVolumeFunc = &JPAVolumeCylinder; break;
-    case VOL_Torus:    mpCalcVolumeFunc = &JPAVolumeTorus;    break;
-    case VOL_Point:    mpCalcVolumeFunc = &JPAVolumePoint;    break;
-    case VOL_Circle:   mpCalcVolumeFunc = &JPAVolumeCircle;   break;
-    case VOL_Line:     mpCalcVolumeFunc = &JPAVolumeLine;     break;
+    case VOL_Cube:
+        mpCalcVolumeFunc = &JPAVolumeCube;
+        break;
+    case VOL_Sphere:
+        mpCalcVolumeFunc = &JPAVolumeSphere;
+        break;
+    case VOL_Cylinder:
+        mpCalcVolumeFunc = &JPAVolumeCylinder;
+        break;
+    case VOL_Torus:
+        mpCalcVolumeFunc = &JPAVolumeTorus;
+        break;
+    case VOL_Point:
+        mpCalcVolumeFunc = &JPAVolumePoint;
+        break;
+    case VOL_Circle:
+        mpCalcVolumeFunc = &JPAVolumeCircle;
+        break;
+    case VOL_Line:
+        mpCalcVolumeFunc = &JPAVolumeLine;
+        break;
     }
 }
 
@@ -269,13 +287,15 @@ void JPADynamicsBlock::create(JPAEmitterWorkData* work) {
 
             work->mVolumeEmitIdx = 0;
         } else {
-            f32 newPtclCount = work->mpEmtr->mRate * (getRateRndm() * work->mpEmtr->get_r_zp() + 1.0f);
+            f32 newPtclCount =
+                work->mpEmtr->mRate * (getRateRndm() * work->mpEmtr->get_r_zp() + 1.0f);
             f32 newEmitCount = work->mpEmtr->mEmitCount + newPtclCount;
             work->mpEmtr->mEmitCount = newEmitCount;
             emitCount = (s32)newEmitCount;
             work->mpEmtr->mEmitCount -= emitCount;
 
-            if (work->mpEmtr->checkStatus(JPAEmtrStts_FirstEmit) && 0.0f < newPtclCount && newPtclCount < 1.0f)
+            if (work->mpEmtr->checkStatus(JPAEmtrStts_FirstEmit) && 0.0f < newPtclCount &&
+                newPtclCount < 1.0f)
                 emitCount = 1;
         }
 
diff --git a/libs/JSystem/JUtility/JUTGamePad.cpp b/libs/JSystem/JUtility/JUTGamePad.cpp
index a92a50544d..92d6f91cc3 100644
--- a/libs/JSystem/JUtility/JUTGamePad.cpp
+++ b/libs/JSystem/JUtility/JUTGamePad.cpp
@@ -4,9 +4,9 @@
 //
 
 #include "JSystem/JUtility/JUTGamePad.h"
+#include "MSL_C/math.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
-#include "MSL_C/math.h"
 
 //
 // Forward References:
@@ -129,7 +129,7 @@ u8 JUTGamePad::mPadAssign[4];
 JUTGamePad::JUTGamePad(EPadPort port) : mRumble(this), mLink(this) {
     mPortNum = port;
     if (mPortNum >= 0) {
-        mPadAssign[port]++; 
+        mPadAssign[port]++;
     }
 
     initList();
@@ -224,8 +224,12 @@ u32 JUTGamePad::read() {
     for (int i = 0; i < 4; i++) {
         u32 mask_tmp = 0x80000000 >> i;
         if (mPadStatus[i].error == 0) {
-            u32 m_stick = mPadMStick[i].update(mPadStatus[i].stick_x, mPadStatus[i].stick_y, sStickMode, WS_MAIN_STICK, mPadButton[i].mButton) << 0x18;
-            u32 s_stick = mPadSStick[i].update(mPadStatus[i].substick_x, mPadStatus[i].substick_y, sStickMode, WS_SUB_STICK, mPadButton[i].mButton) << 0x10;
+            u32 m_stick = mPadMStick[i].update(mPadStatus[i].stick_x, mPadStatus[i].stick_y,
+                                               sStickMode, WS_MAIN_STICK, mPadButton[i].mButton)
+                          << 0x18;
+            u32 s_stick = mPadSStick[i].update(mPadStatus[i].substick_x, mPadStatus[i].substick_y,
+                                               sStickMode, WS_SUB_STICK, mPadButton[i].mButton)
+                          << 0x10;
             u32 tmp = m_stick | s_stick;
             mPadButton[i].update(&mPadStatus[i], tmp);
         } else if (mPadStatus[i].error == -1) {
@@ -248,8 +252,12 @@ u32 JUTGamePad::read() {
         if (pad->getPadReplay() && pad->getPadReplay()->mActive) {
             PADStatus status;
             pad->getPadReplay()->unk1(&status);
-            u32 m_stick = pad->mMainStick.update(status.stick_x, status.stick_y, sStickMode, WS_MAIN_STICK, pad->mButton.mButton) << 0x18;
-            u32 s_stick = pad->mSubStick.update(status.substick_x, status.substick_y, sStickMode, WS_SUB_STICK, pad->mButton.mButton) << 0x10;
+            u32 m_stick = pad->mMainStick.update(status.stick_x, status.stick_y, sStickMode,
+                                                 WS_MAIN_STICK, pad->mButton.mButton)
+                          << 0x18;
+            u32 s_stick = pad->mSubStick.update(status.substick_x, status.substick_y, sStickMode,
+                                                WS_SUB_STICK, pad->mButton.mButton)
+                          << 0x10;
             pad->mButton.update(&status, m_stick | s_stick);
         } else {
             if (pad->mPortNum == -1) {
@@ -369,7 +377,8 @@ void JUTGamePad::update() {
             mErrorStatus = mPadStatus[mPortNum].error;
         }
 
-        if (field_0xa8 == 0 || (mButton.mButton & C3ButtonReset::sResetMaskPattern) != C3ButtonReset::sResetPattern) {
+        if (field_0xa8 == 0 ||
+            (mButton.mButton & C3ButtonReset::sResetMaskPattern) != C3ButtonReset::sResetPattern) {
             mButtonReset.mReset = false;
         } else if (!struct_80451501) {
             if (mButtonReset.mReset == true) {
@@ -423,7 +432,7 @@ void JUTGamePad::checkResetSwitch() {
             if (struct_80451500 == true) {
                 struct_80451501 = true;
                 C3ButtonReset::sResetOccurredPort = -1;
-                
+
                 if (C3ButtonReset::sCallback != NULL) {
                     C3ButtonReset::sCallback(-1, C3ButtonReset::sCallbackArg);
                 }
@@ -465,21 +474,22 @@ void JUTGamePad::CButton::update(PADStatus const* padStatus, u32 stickStatus) {
     } else {
         buttons = 0;
     }
-    
+
     buttons = stickStatus | buttons;
     mRepeat = 0;
-    
+
     if (field_0x28 != 0 && field_0x24 != 0) {
         u32 repeatButton = buttons & field_0x24;
         mRepeat = 0;
-        
+
         if (repeatButton == 0) {
             field_0x20 = 0;
             field_0x1c = 0;
         } else if (field_0x20 == repeatButton) {
             field_0x1c++;
-            
-            if (field_0x1c == field_0x28 || (field_0x1c > field_0x28 && (field_0x1c - field_0x28) % field_0x2c == 0)) {
+
+            if (field_0x1c == field_0x28 ||
+                (field_0x1c > field_0x28 && (field_0x1c - field_0x28) % field_0x2c == 0)) {
                 mRepeat = repeatButton;
             }
         } else {
@@ -521,7 +531,7 @@ void JUTGamePad::CStick::clear() {
 /* 802E1238-802E1500 2DBB78 02C8+00 1/1 0/0 0/0 .text
  * update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl */
 u32 JUTGamePad::CStick::update(s8 x_val, s8 y_val, JUTGamePad::EStickMode mode,
-                                   JUTGamePad::EWhichStick stick, u32 buttons) {
+                               JUTGamePad::EWhichStick stick, u32 buttons) {
     s32 clamp;
     switch (sClampMode) {
     case 1:
@@ -689,7 +699,7 @@ asm void JUTGamePad::CRumble::stopPatternedRumbleAtThePeriod() {
 /* 802E199C-802E19D8 2DC2DC 003C+00 1/1 1/1 0/0 .text            getGamePad__10JUTGamePadFi */
 JUTGamePad* JUTGamePad::getGamePad(int padNo) {
     JSUListIterator<JUTGamePad> pad(mPadList.getFirst());
-    
+
     for (; pad != mPadList.getEnd(); pad++) {
         if (padNo == pad->mPortNum) {
             return pad.getObject();
@@ -736,7 +746,6 @@ bool JUTGamePad::recalibrate(u32 mask) {
     return PADRecalibrate((PADMask)mask);
 }
 
-
 /* 802E1AFC-802E1B60 2DC43C 0064+00 1/1 0/0 0/0 .text checkCallback__19JUTGamePadLongPressFiUl */
 void JUTGamePadLongPress::checkCallback(int port, u32 timer) {
     if (port >= 0 && timer >= field_0x1c) {
diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp
index f79fda6e72..b6424a7e29 100644
--- a/libs/Z2AudioLib/Z2AudioMgr.cpp
+++ b/libs/Z2AudioLib/Z2AudioMgr.cpp
@@ -409,7 +409,7 @@ asm bool Z2AudioMgr::hasReset() const {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-//asm void Z2AudioMgr::startSound(JAISoundID param_0, JAISoundHandle* param_1,
+// asm void Z2AudioMgr::startSound(JAISoundID param_0, JAISoundHandle* param_1,
 //                                JGeometry::TVec3<f32> const* param_2) {
 extern "C" asm void func_802CDB1C() {
     nofralloc
diff --git a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp
index 64a40bbf2d..e99da12893 100644
--- a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp
+++ b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp
@@ -130,15 +130,9 @@ SECTION_DATA static u16 sNewSong3[9] = {
 
 /* 803CBCC0-803CBD08 -00001 0048+00 1/1 0/0 0/0 .data            sGuideData */
 SECTION_DATA static Z2WolfHowlData sGuideData[9] = {
-    {4, sHowlTobikusa},
-    {6, sHowlUmakusa},
-    {6, sHowlZeldaSong},
-    {6, sHealingSong},
-    {6, sHowlSoulRequiem},
-    {6, sHowlLightPrelude},
-    {7, sNewSong1},
-    {8, sNewSong2},
-    {9, sNewSong3},
+    {4, sHowlTobikusa}, {6, sHowlUmakusa},     {6, sHowlZeldaSong},
+    {6, sHealingSong},  {6, sHowlSoulRequiem}, {6, sHowlLightPrelude},
+    {7, sNewSong1},     {8, sNewSong2},        {9, sNewSong3},
 };
 
 /* 80450880-80450884 000300 0004+00 2/2 0/0 0/0 .sdata           cPitchDown */
@@ -182,7 +176,10 @@ SECTION_SDATA static f32 sStickCenter = 1.0f / 5.0f;
 
 /* 804508A0-804508A8 000320 0008+00 1/0 0/0 0/0 .sdata           sHowlTobikusa */
 SECTION_SDATA static u16 sHowlTobikusa[4] = {
-    0x011E, 0x031E, 0x011E, 0x031E,
+    0x011E,
+    0x031E,
+    0x011E,
+    0x031E,
 };
 
 /* 80455E60-80455E64 004460 0004+00 8/8 0/0 0/0 .sdata2          @3485 */
diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp
index 0846767685..df0a1b555d 100644
--- a/src/d/a/d_a_alink.cpp
+++ b/src/d/a/d_a_alink.cpp
@@ -28036,7 +28036,7 @@ asm void daAlink_c::hookshotAtHitCallBack(dCcD_GObjInf* param_0, fopAc_ac_c* par
 /* 8010859C-801085BC 102EDC 0020+00 1/1 0/0 0/0 .text
  * daAlink_hookshotAtHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void daAlink_hookshotAtHitCallBack(fopAc_ac_c* player, dCcD_GObjInf* param_1,
-                                              fopAc_ac_c* param_2, dCcD_GObjInf* param_3) {
+                                          fopAc_ac_c* param_2, dCcD_GObjInf* param_3) {
     ((daAlink_c*)player)->hookshotAtHitCallBack(param_1, param_2, param_3);
 }
 
@@ -28051,7 +28051,8 @@ cXyz* daAlink_c::getHookshotTopPos() {
 
 /* 80108600-80108668 102F40 0068+00 1/0 0/0 0/0 .text checkHookshotReturnMode__9daAlink_cCFv */
 bool daAlink_c::checkHookshotReturnMode() const {
-    return checkHookshotItem(mEquipItem) && (mHookshotMode == 4 || mHookshotMode == 5 || mHookshotMode == 6);
+    return checkHookshotItem(mEquipItem) &&
+           (mHookshotMode == 4 || mHookshotMode == 5 || mHookshotMode == 6);
 }
 
 /* 80108668-801086DC 102FA8 0074+00 1/0 0/0 0/0 .text checkHookshotShootReturnMode__9daAlink_cCFv
@@ -28121,7 +28122,8 @@ void daAlink_c::changeHookshotDrawModel() {
 
 /* 801088A0-801088C8 1031E0 0028+00 6/6 0/0 0/0 .text checkHookshotRoofLv7Boss__9daAlink_cFv */
 BOOL daAlink_c::checkHookshotRoofLv7Boss() {
-    return mCargoCarryActor.getActor() != NULL && fopAcM_GetName(mCargoCarryActor.getActor()) == PROC_B_DR;
+    return mCargoCarryActor.getActor() != NULL &&
+           fopAcM_GetName(mCargoCarryActor.getActor()) == PROC_B_DR;
 }
 
 /* 801088C8-80108980 103208 00B8+00 2/2 0/0 0/0 .text            checkChaseHookshot__9daAlink_cFv */
@@ -28138,7 +28140,9 @@ BOOL daAlink_c::checkChaseHookshot() {
 
     if (mTargetedActor != NULL) {
         s16 actorName = fopAcM_GetName(mTargetedActor);
-        return field_0x2804 == mTargetedActor && (checkBossOctaIealRoom() || actorName == PROC_Obj_FallObj || actorName == PROC_B_DR || actorName == PROC_E_PH);
+        return field_0x2804 == mTargetedActor &&
+               (checkBossOctaIealRoom() || actorName == PROC_Obj_FallObj ||
+                actorName == PROC_B_DR || actorName == PROC_E_PH);
     }
 
     return false;
@@ -28186,7 +28190,8 @@ bool daAlink_c::setHookshotCarryOffset(unsigned int actorID, cXyz const* offset)
     if (i_dComIfGp_checkPlayerStatus1(0, 0x10000)) {
         fopAc_ac_c* carryActor = mCargoCarryActor.getActor();
 
-        if (carryActor != NULL && fopAcM_checkHookCarryNow(carryActor) && actorID == mCargoCarryActor.getID()) {
+        if (carryActor != NULL && fopAcM_checkHookCarryNow(carryActor) &&
+            actorID == mCargoCarryActor.getID()) {
             field_0x37c8 = *offset;
             return true;
         }
@@ -28204,7 +28209,7 @@ bool daAlink_c::setHookshotCarryOffset(unsigned int actorID, cXyz const* offset)
 /* 80108B34-80108DB4 103474 0280+00 1/1 0/0 0/0 .text            setHookshotModel__9daAlink_cFv */
 void daAlink_c::setHookshotModel() {
     J3DAnmTransform* bck = (J3DAnmTransform*)mAnmHeap9.loadDataIdx(0x17E);
-    
+
     JKRHeap* heap = setItemHeap();
     field_0x730.init(bck, 0, 2, lit_6040, 0, -1, false);
 
@@ -28263,7 +28268,8 @@ asm void daAlink_c::setHookshotSight() {
 
 /* 80108EEC-80108F64 10382C 0078+00 1/1 0/0 0/0 .text            cancelHookshotShot__9daAlink_cFv */
 void daAlink_c::cancelHookshotShot() {
-    if (checkHookshotItem(mEquipItem) && (mHookshotMode == 3 || mHookshotMode == 5 || mHookshotMode == 4)) {
+    if (checkHookshotItem(mEquipItem) &&
+        (mHookshotMode == 3 || mHookshotMode == 5 || mHookshotMode == 4)) {
         if (mActionID != 0xC5 && mActionID != 0xC6 && mActionID != 0xC4) {
             mHookshotMode = 6;
         }
@@ -28275,7 +28281,8 @@ void daAlink_c::cancelHookshotShot() {
 #ifdef NONMATCHING
 bool daAlink_c::cancelHookshotMove() {
     if (mFastShotTime == 0 && mHookshotMode == 0) {
-        if (checkHookshotAnime() && (mTargetedActor == NULL && !i_checkAttentionLock() || !itemButton())) {
+        if (checkHookshotAnime() &&
+            (mTargetedActor == NULL && !i_checkAttentionLock() || !itemButton())) {
             resetUpperAnime(UPPER_NOW, -1.0f);
             return 1;
         }
diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp
index 54088d85d9..f447131223 100644
--- a/src/d/a/d_a_npc.cpp
+++ b/src/d/a/d_a_npc.cpp
@@ -4,11 +4,11 @@
 //
 
 #include "d/a/d_a_npc.h"
+#include "d/d_procname.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_mtx.h"
 #include "rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.h"
-#include "d/d_procname.h"
 
 //
 // Types:
@@ -1594,8 +1594,8 @@ J3DAnmColor* daNpcT_c::getColorAnmP(char const* arcName, int fileIdx) {
 
 /* 801481C0-80148204 142B00 0044+00 1/1 0/0 0/0 .text setBckAnm__8daNpcT_cFP15J3DAnmTransformfiiib
  */
-void daNpcT_c::setBckAnm(J3DAnmTransform* bck, f32 rate, int attr, int startF,
-                             int endF, bool modify) {
+void daNpcT_c::setBckAnm(J3DAnmTransform* bck, f32 rate, int attr, int startF, int endF,
+                         bool modify) {
     mBckAnm.init(bck, TRUE, attr, rate, startF, endF, modify);
 }
 
@@ -1603,13 +1603,13 @@ void daNpcT_c::setBckAnm(J3DAnmTransform* bck, f32 rate, int attr, int startF,
  * setMcaMorfAnm__8daNpcT_cFP18J3DAnmTransformKeyffiii          */
 // matches with literals
 #ifdef NONMATCHING
-int daNpcT_c::setMcaMorfAnm(J3DAnmTransformKey* bck, f32 morf, f32 frame, int mode,
-                                 int startF, int endF) {
+int daNpcT_c::setMcaMorfAnm(J3DAnmTransformKey* bck, f32 morf, f32 frame, int mode, int startF,
+                            int endF) {
     f32 start = startF;
     f32 end = endF;
 
     mMcaMorfAnm[0]->setAnm(bck, mode, frame, morf, start, end);
-    
+
     if (mMcaMorfAnm[1] != NULL) {
         mMcaMorfAnm[1]->setAnm(bck, mode, frame, morf, start, end);
     }
@@ -1621,7 +1621,7 @@ int daNpcT_c::setMcaMorfAnm(J3DAnmTransformKey* bck, f32 morf, f32 frame, int mo
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm int daNpcT_c::setMcaMorfAnm(J3DAnmTransformKey* param_0, f32 param_1, f32 param_2, int param_3,
-                                 int param_4, int param_5) {
+                                int param_4, int param_5) {
     nofralloc
 #include "asm/d/a/d_a_npc/setMcaMorfAnm__8daNpcT_cFP18J3DAnmTransformKeyffiii.s"
 }
@@ -1631,28 +1631,27 @@ asm int daNpcT_c::setMcaMorfAnm(J3DAnmTransformKey* param_0, f32 param_1, f32 pa
 /* 801482F8-80148338 142C38 0040+00 1/1 0/0 1/1 .text
  * setBtpAnm__8daNpcT_cFP16J3DAnmTexPatternP12J3DModelDatafi    */
 void daNpcT_c::setBtpAnm(J3DAnmTexPattern* param_0, J3DModelData* modelData, f32 param_2,
-                             int param_3) {
+                         int param_3) {
     mBtpAnm.init(modelData, param_0, 1, param_3, param_2, 0, -1);
 }
 
 /* 80148338-80148378 142C78 0040+00 1/1 0/0 6/6 .text
  * setBtkAnm__8daNpcT_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi */
 void daNpcT_c::setBtkAnm(J3DAnmTextureSRTKey* param_0, J3DModelData* modelData, f32 param_2,
-                             int param_3) {
+                         int param_3) {
     mBtkAnm.init(modelData, param_0, 1, param_3, param_2, 0, -1);
 }
 
 /* 80148378-801483B8 142CB8 0040+00 0/0 0/0 9/9 .text
  * setBrkAnm__8daNpcT_cFP15J3DAnmTevRegKeyP12J3DModelDatafi     */
 void daNpcT_c::setBrkAnm(J3DAnmTevRegKey* param_0, J3DModelData* modelData, f32 param_2,
-                             int param_3) {
+                         int param_3) {
     mBrkAnm.init(modelData, param_0, 1, param_3, param_2, 0, -1);
 }
 
 /* 801483B8-801483F8 142CF8 0040+00 0/0 0/0 2/2 .text
  * setBpkAnm__8daNpcT_cFP11J3DAnmColorP12J3DModelDatafi         */
-void daNpcT_c::setBpkAnm(J3DAnmColor* param_0, J3DModelData* modelData, f32 param_2,
-                             int param_3) {
+void daNpcT_c::setBpkAnm(J3DAnmColor* param_0, J3DModelData* modelData, f32 param_2, int param_3) {
     mBpkAnm.init(modelData, param_0, 1, param_3, param_2, 0, -1);
 }
 
@@ -1670,7 +1669,7 @@ int daNpcT_c::loadRes(s8 const* resNoList, char const** resNameList) {
         if (status == cPhs_COMPLEATE_e) {
             resLoad_cnt++;
         }
-        
+
         if (status == cPhs_ERROR_e || status == 3) {
             return cPhs_ERROR_e;
         }
@@ -1706,7 +1705,7 @@ int daNpcT_c::execute() {
     if (!evtProc()) {
         action();
     }
-    
+
     beforeMove();
     fopAcM_posMoveF(this, field_0x864.GetCCMoveP());
     field_0x68c.CrrPos(dComIfG_Bgsp());
@@ -1775,11 +1774,11 @@ SECTION_SDATA2 static f32 lit_5794 = 20.0f;
 // close. literals + few wrong areas
 #ifdef NONMATCHING
 int daNpcT_c::draw(int param_0, int param_1, f32 param_2, GXColorS10* color, f32 param_4,
-                        int param_5, int param_6, int param_7) {
+                   int param_5, int param_6, int param_7) {
     J3DModel* model = mMcaMorfAnm[0]->getModel();
     J3DModelData* modelData = model->getModelData();
     field_0xe34 = 1;
-    
+
     if (drawDbgInfo() || checkHide() || field_0xe2b) {
         return 1;
     }
@@ -1857,9 +1856,12 @@ int daNpcT_c::draw(int param_0, int param_1, f32 param_2, GXColorS10* color, f32
 
     if (param_6 == 0) {
         if (param_7 == 0) {
-            field_0xd94 = dComIfGd_setShadow(field_0xd94, 1, model, &mCurrent.mPosition, param_2, param_4, mCurrent.mPosition.y, field_0xdf4, field_0x930, &mTevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
+            field_0xd94 = dComIfGd_setShadow(
+                field_0xd94, 1, model, &mCurrent.mPosition, param_2, param_4, mCurrent.mPosition.y,
+                field_0xdf4, field_0x930, &mTevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
         } else {
-            dComIfGd_setSimpleShadow(&mCurrent.mPosition, field_0xdf4, param_4, field_0x930, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
+            dComIfGd_setSimpleShadow(&mCurrent.mPosition, field_0xdf4, param_4, field_0x930, 0,
+                                     1.0f, dDlst_shadowControl_c::getSimpleTex());
         }
     }
 
@@ -1871,7 +1873,7 @@ int daNpcT_c::draw(int param_0, int param_1, f32 param_2, GXColorS10* color, f32
 #pragma optimization_level 0
 #pragma optimizewithasm off
 asm int daNpcT_c::draw(int param_0, int param_1, f32 param_2, _GXColorS10* param_3, f32 param_4,
-                        int param_5, int param_6, int param_7) {
+                       int param_5, int param_6, int param_7) {
     nofralloc
 #include "asm/d/a/d_a_npc/draw__8daNpcT_cFiifP11_GXColorS10fiii.s"
 }
@@ -2107,7 +2109,7 @@ void daNpcT_c::setPos(cXyz i_pos) {
     i_pos.y += 300.0f;
     field_0x930.SetPos(&i_pos);
     i_pos.y = dComIfG_Bgsp().GroundCross(&field_0x930);
-    
+
     mCurrent.mPosition = i_pos;
     mNext.mPosition = mCurrent.mPosition;
 }
@@ -2137,7 +2139,7 @@ fopAc_ac_c* daNpcT_c::hitChk(dCcD_GObjInf* i_objInf, u32 param_1) {
 
     if (mTimer == 0) {
         fopAc_ac_c* hitAc = i_objInf->GetTgHitAc();
-        
+
         if (hitAc != NULL) {
             if (fopAcM_GetName(hitAc) == PROC_NPC_TK && param_1 & 1) {
                 ((daNPC_TK_c*)hitAc)->setBump();
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index a7d546d29e..20f1710dc4 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -14,8 +14,8 @@
 #include "dolphin/types.h"
 #include "f_op/f_op_kankyo_mng.h"
 #include "f_op/f_op_msg_mng.h"
-#include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_Reset.h"
+#include "m_Do/m_Do_ext.h"
 
 //
 // Forward References:
@@ -597,922 +597,923 @@ dStage_roomStatus_c* dStage_roomControl_c::getStatusRoomDt(int i_statusIdx) {
     return &mStatus[i_statusIdx];
 }
 
-#define OBJNAME(name, proc, sub) { name, proc, sub }
+#define OBJNAME(name, proc, sub)                                                                   \
+    { name, proc, sub }
 
 /* ############################################################################################## */
 /* 803A3B18-803A65CC 000C38 2AB4+00 2/2 0/0 0/0 .data            l_objectName */
 static dStage_objectNameInf l_objectName[0x38F] = {
-    OBJNAME("Grass",   PROC_GRASS,             0xFF),
-    OBJNAME("kusax1",  PROC_GRASS,             0xFF),
-    OBJNAME("kusax7",  PROC_GRASS,             0xFF),
-    OBJNAME("kusax21", PROC_GRASS,             0xFF),
-    OBJNAME("flower",  PROC_GRASS,             0xFF),
-    OBJNAME("flwr7",   PROC_GRASS,             0xFF),
-    OBJNAME("flwr17",  PROC_GRASS,             0xFF),
-    OBJNAME("pflower", PROC_GRASS,             0xFF),
-    OBJNAME("pflwrx7", PROC_GRASS,             0xFF),
-    OBJNAME("door",    PROC_DOOR20,            0xFF),
-    OBJNAME("kdoor",   PROC_KNOB20,            0xFF),
-    OBJNAME("ddoor",   PROC_DBDOOR,            0xFF),
-    OBJNAME("bdoor",   PROC_BOSS_DOOR,         0xFF),
-    OBJNAME("ndoor",   PROC_DOOR20,            0xFF),
-    OBJNAME("tadoor",  PROC_DOOR20,            0xFF),
-    OBJNAME("yodoor",  PROC_DOOR20,            0xFF),
-    OBJNAME("nadoor",  PROC_DOOR20,            0xFF),
-    OBJNAME("l9door",  PROC_DOOR20,            0xFF),
-    OBJNAME("l7door",  PROC_DOOR20,            0xFF),
-    OBJNAME("pdoor",   PROC_PushDoor,          0xFF),
-    OBJNAME("bigdoor", PROC_DOOR20,            0xFF),
-    OBJNAME("kshtr00", PROC_Obj_Kshutter,      0xFF),
-    OBJNAME("vshuter", PROC_Obj_Kshutter,      0xFF),
-    OBJNAME("IzmGate", PROC_Izumi_Gate,        0xFF),
-    OBJNAME("NoneCam", PROC_CAMERA,            0xFF),
-    OBJNAME("NormCam", PROC_CAMERA,            0xFF),
-    OBJNAME("Link",    PROC_ALINK,             0xFF),
-    OBJNAME("carry00", PROC_Obj_Carry,         0xFF),
-    OBJNAME("carry01", PROC_Obj_Carry,         0xFF),
-    OBJNAME("carry02", PROC_Obj_Carry,         0xFF),
-    OBJNAME("carry04", PROC_Obj_Carry,         0xFF),
-    OBJNAME("carry05", PROC_Obj_Carry,         0xFF),
-    OBJNAME("carry06", PROC_Obj_Carry,         0xFF),
-    OBJNAME("carry07", PROC_Obj_Carry,         0xFF),
-    OBJNAME("carry08", PROC_Obj_Carry,         0xFF),
-    OBJNAME("carry09", PROC_Obj_Carry,         0xFF),
-    OBJNAME("ball1",   PROC_Obj_Carry,         0xFF),
-    OBJNAME("ball2",   PROC_Obj_Carry,         0xFF),
-    OBJNAME("ball3",   PROC_Obj_Carry,         0xFF),
-    OBJNAME("carry12", PROC_Obj_Carry,         0xFF),
-    OBJNAME("carry13", PROC_Obj_Carry,         0xFF),
-    OBJNAME("TagLite", PROC_Tag_LightBall,     0xFF),
-    OBJNAME("InoBone", PROC_Obj_InoBone,       0xFF),
-    OBJNAME("osiBLK0", PROC_Obj_Movebox,       0x00),
-    OBJNAME("dmblk",   PROC_Obj_Movebox,       0x00),
-    OBJNAME("Kkiba",   PROC_Obj_Movebox,       0x02),
-    OBJNAME("smblk",   PROC_Obj_Movebox,       0x02),
-    OBJNAME("Lv4blk",  PROC_Obj_Movebox,       0xFF),
-    OBJNAME("Lv4blk2", PROC_Obj_Movebox,       0xFF),
-    OBJNAME("gstone",  PROC_Obj_Movebox,       0xFF),
-    OBJNAME("TagAtt",  PROC_Tag_Attp,          0xFF),
-    OBJNAME("mmvbg",   PROC_SET_BG_OBJ,        0xFF),
-    OBJNAME("Drop",    PROC_Obj_Drop,          0xFF),
-    OBJNAME("BkLeaf",  PROC_Obj_BkLeaf,        0xFF),
-    OBJNAME("cylwind", PROC_Obj_Tornado,       0xFF),
-    OBJNAME("TagTrnd", PROC_Obj_Tornado2,      0xFF),
-    OBJNAME("mvstair", PROC_Obj_MvStair,       0xFF),
-    OBJNAME("UHDoor",  PROC_Obj_Cowdoor,       0xFF),
-    OBJNAME("SwBoom",  PROC_Obj_Swpropeller,   0xFF),
-    OBJNAME("Swboom",  PROC_Obj_Swpropeller,   0xFF),
-    OBJNAME("BoomSht", PROC_Obj_BoomShutter,   0xFF),
-    OBJNAME("haihai",  PROC_Obj_Hfuta,         0xFF),
-    OBJNAME("stopper", PROC_Obj_Stopper,       0xFF),
-    OBJNAME("dstop",   PROC_Obj_Stopper2,      0xFF),
-    OBJNAME("mhole",   PROC_Obj_MHole,         0xFF),
-    OBJNAME("mhole2",  PROC_Obj_MHole,         0xFF),
-    OBJNAME("TagMag",  PROC_Tag_Magne,         0xFF),
-    OBJNAME("P_Warp",  PROC_Obj_BossWarp,      0xFF),
-    OBJNAME("fpillar", PROC_Obj_FirePillar,    0xFF),
-    OBJNAME("yfire",   PROC_Obj_FirePillar2,   0xFF),
-    OBJNAME("pfire",   PROC_Obj_FirePillar2,   0xFF),
-    OBJNAME("Huriko1", PROC_Obj_WoodPendulum,  0xFF),
-    OBJNAME("VolBall", PROC_Obj_VolcanicBall,  0xFF),
-    OBJNAME("VolBom",  PROC_Obj_VolcanicBall,  0xFF),
-    OBJNAME("BigVolc", PROC_Obj_VolcanicBomb,  0xFF),
-    OBJNAME("geyser",  PROC_Obj_Geyser,        0xFF),
-    OBJNAME("Cwall",   PROC_Obj_ChainWall,     0xFF),
-    OBJNAME("Tansu",   PROC_Obj_Chest,         0xFF),
-    OBJNAME("Onsen",   PROC_Obj_Onsen,         0xFF),
-    OBJNAME("Obj_bm",  PROC_Obj_Bemos,         0xFF),
-    OBJNAME("lv6bm",   PROC_Obj_Lv6bemos,      0xFF),
-    OBJNAME("E_bm6",   PROC_Obj_Lv6bemos2,     0xFF),
-    OBJNAME("stone",   PROC_Obj_Stone,         0xFF),
-    OBJNAME("stoneB",  PROC_Obj_Stone,         0xFF),
-    OBJNAME("TagSpin", PROC_Tag_Spinner,       0xFF),
-    OBJNAME("L_RopeS", PROC_Obj_RopeBridge,    0xFF),
-    OBJNAME("L_RopeB", PROC_Obj_RopeBridge,    0xFF),
-    OBJNAME("wcover",  PROC_Obj_WellCover,     0xFF),
-    OBJNAME("rstair",  PROC_Obj_RotStair,      0xFF),
-    OBJNAME("marm",    PROC_Obj_MagneArm,      0xFF),
-    OBJNAME("turnSw",  PROC_Obj_SwTurn,        0xFF),
-    OBJNAME("chainSw", PROC_Obj_SwChain,       0xFF),
-    OBJNAME("wsword",  PROC_Obj_WoodenSword,   0xFF),
-    OBJNAME("iceblk",  PROC_Obj_IceBlock,      0xFF),
-    OBJNAME("KkrSmk",  PROC_Obj_Smoke,         0xFF),
-    OBJNAME("dmele",   PROC_Obj_Elevator,      0xFF),
-    OBJNAME("wfall",   PROC_Obj_WaterFall,     0xFF),
-    OBJNAME("izora",   PROC_Obj_ZoraCloth,     0xFF),
-    OBJNAME("smgdoor", PROC_Obj_SmgDoor,       0xFF),
-    OBJNAME("smkdoor", PROC_Obj_SmgDoor,       0xFF),
-    OBJNAME("Obj_ava", PROC_Obj_Avalanche,     0xFF),
-    OBJNAME("thdoor",  PROC_Obj_TDoor,         0xFF),
-    OBJNAME("mstrsrd", PROC_Obj_MasterSword,   0xFF),
-    OBJNAME("wimage",  PROC_Obj_WoodStatue,    0xFF),
-    OBJNAME("sword",   PROC_Obj_Sword,         0xFF),
-    OBJNAME("spring",  PROC_Tag_Spring,        0xFF),
-    OBJNAME("BkDoorL", PROC_Obj_BkDoor,        0xFF),
-    OBJNAME("BkDoorR", PROC_Obj_BkDoor,        0xFF),
-    OBJNAME("IGateL",  PROC_Obj_MGate,         0xFF),
-    OBJNAME("IGateR",  PROC_Obj_MGate,         0xFF),
-    OBJNAME("HGateL",  PROC_Obj_MGate,         0xFF),
-    OBJNAME("HGateR",  PROC_Obj_MGate,         0xFF),
-    OBJNAME("K_Gate",  PROC_Obj_KkrGate,       0xFF),
-    OBJNAME("R_Gate",  PROC_Obj_RiderGate,     0xFF),
-    OBJNAME("kkanban", PROC_Obj_KKanban,       0xFF),
-    OBJNAME("Mhsg6",   PROC_Obj_Ladder,        0x00),
-    OBJNAME("Mhsg9",   PROC_Obj_Ladder,        0x01),
-    OBJNAME("Mhsg12",  PROC_Obj_Ladder,        0x02),
-    OBJNAME("Mhsg15",  PROC_Obj_Ladder,        0x03),
-    OBJNAME("Mhsg4h",  PROC_Obj_Ladder,        0x04),
-    OBJNAME("Mhsg3",   PROC_Obj_Ladder,        0x05),
-    OBJNAME("bonbori", PROC_EP,                0xFF),
-    OBJNAME("Cow",     PROC_COW,               0xFF),
-    OBJNAME("Peru",    PROC_PERU,              0xFF),
-    OBJNAME("Kago",    PROC_KAGO,              0xFF),
-    OBJNAME("TagFall", PROC_Tag_WaterFall,     0xFF),
-    OBJNAME("Kbota_A", PROC_Obj_Swpush,        0x00),
-    OBJNAME("Kbota_B", PROC_Obj_Swpush,        0x01),
-    OBJNAME("KbotaC",  PROC_Obj_Swpush,        0x02),
-    OBJNAME("Swpush",  PROC_Obj_Swpush,        0x00),
-    OBJNAME("Lv3bota", PROC_Obj_Swpush,        0x00),
-    OBJNAME("Ksw00_C", PROC_Obj_Swpush2,       0x02),
-    OBJNAME("hvySw",   PROC_Obj_Swpush5,       0x00),
-    OBJNAME("buraA",   PROC_Obj_SwHang,        0x00),
-    OBJNAME("buraB",   PROC_Obj_SwHang,        0x00),
-    OBJNAME("buraA2",  PROC_Obj_SwHang,        0x00),
-    OBJNAME("buraB2",  PROC_Obj_SwHang,        0x00),
-    OBJNAME("bura7A",  PROC_Obj_SwHang,        0x00),
-    OBJNAME("bura7B",  PROC_Obj_SwHang,        0x00),
-    OBJNAME("bura7C",  PROC_Obj_SwHang,        0x00),
-    OBJNAME("bura7D",  PROC_Obj_SwHang,        0x00),
-    OBJNAME("bura7E",  PROC_Obj_SwHang,        0x00),
-    OBJNAME("tbox_sw", PROC_TBOX_SW,           0x00),
-    OBJNAME("swLight", PROC_Obj_SwLight,       0x00),
-    OBJNAME("iceleaf", PROC_Obj_IceLeaf,       0x00),
-    OBJNAME("swHit",   PROC_SWHIT0,            0x00),
-    OBJNAME("swHit2",  PROC_SWHIT0,            0x01),
-    OBJNAME("ObjTime", PROC_Obj_Timer,         0xFF),
-    OBJNAME("AND_SW",  PROC_ANDSW,             0xFF),
-    OBJNAME("AND_SW2", PROC_ANDSW2,            0xFF),
-    OBJNAME("ALLdie",  PROC_ALLDIE,            0xFF),
-    OBJNAME("rvback",  PROC_Tag_RiverBack,     0xFF),
-    OBJNAME("kagoFal", PROC_Tag_KagoFall,      0xFF),
-    OBJNAME("CrvGate", PROC_Obj_CRVGATE,       0xFF),
-    OBJNAME("CrvSaku", PROC_Obj_CRVFENCE,      0xFF),
-    OBJNAME("CrvWood", PROC_Obj_CRVHAHEN,      0xFF),
-    OBJNAME("CrvStel", PROC_Obj_CRVSTEEL,      0xFF),
-    OBJNAME("CrvLH",   PROC_Obj_CRVLH_DW,      0xFF),
-    OBJNAME("RvRock",  PROC_Obj_RIVERROCK,     0xFF),
-    OBJNAME("P2a",     PROC_NPC_P2,            0x00),
-    OBJNAME("P2b",     PROC_NPC_P2,            0x01),
-    OBJNAME("P2c",     PROC_NPC_P2,            0x02),
-    OBJNAME("Gnd",     PROC_NPC_GND,           0xFF),
-    OBJNAME("grA",     PROC_NPC_GRA,           0xFF),
-    OBJNAME("Obj_grA", PROC_OBJ_GRA,           0xFF),
-    OBJNAME("Tag_grA", PROC_TAG_GRA,           0xFF),
-    OBJNAME("TagYami", PROC_TAG_YAMI,          0xFF),
-    OBJNAME("grC",     PROC_NPC_GRC,           0xFF),
-    OBJNAME("grM",     PROC_NPC_GRM,           0xFF),
-    OBJNAME("grMC",    PROC_NPC_GRMC,          0xFF),
-    OBJNAME("grS",     PROC_NPC_GRS,           0xFF),
-    OBJNAME("grD1",    PROC_NPC_GRD,           0xFF),
-    OBJNAME("grD",     PROC_NPC_WRESTLER,      0x01),
-    OBJNAME("grR",     PROC_NPC_GRR,           0xFF),
-    OBJNAME("grO",     PROC_NPC_GRO,           0xFF),
-    OBJNAME("grZ",     PROC_NPC_GRZ,           0xFF),
-    OBJNAME("grARock", PROC_Obj_GraRock,       0xFF),
-    OBJNAME("grZRock", PROC_Obj_GrzRock,       0xFF),
-    OBJNAME("osnFire", PROC_OBJ_ONSEN_FIRE,    0xFF),
-    OBJNAME("yamiD",   PROC_NPC_YAMID,         0xFF),
-    OBJNAME("yamiT",   PROC_NPC_YAMIT,         0xFF),
-    OBJNAME("yamiS",   PROC_NPC_YAMIS,         0xFF),
-    OBJNAME("Blue_NS", PROC_NPC_BLUENS,        0xFF),
-    OBJNAME("Kakashi", PROC_NPC_KAKASHI,       0x00),
-    OBJNAME("Kdk",     PROC_NPC_KDK,           0xFF),
-    OBJNAME("Aru",     PROC_NPC_ARU,           0xFF),
-    OBJNAME("Bans",    PROC_NPC_BANS,          0xFF),
-    OBJNAME("Besu",    PROC_NPC_BESU,          0xFF),
-    OBJNAME("Bou",     PROC_NPC_BOU,           0xFF),
-    OBJNAME("BouS",    PROC_NPC_BOU_S,         0x00),
-    OBJNAME("clerkA",  PROC_NPC_CLERKA,        0x00),
-    OBJNAME("clerkB",  PROC_NPC_CLERKB,        0x00),
-    OBJNAME("clerkT",  PROC_NPC_CLERKT,        0x00),
-    OBJNAME("Ash",     PROC_NPC_ASH,           0xFF),
-    OBJNAME("AshB",    PROC_NPC_ASHB,          0xFF),
-    OBJNAME("Shad",    PROC_NPC_SHAD,          0xFF),
-    OBJNAME("Rafrel",  PROC_NPC_RAFREL,        0xFF),
-    OBJNAME("MoiR",    PROC_NPC_MOIR,          0xFF),
-    OBJNAME("impal",   PROC_NPC_IMPAL,         0xFF),
-    OBJNAME("Coach",   PROC_NPC_COACH,         0xFF),
-    OBJNAME("TheB",    PROC_NPC_THEB,          0xFF),
-    OBJNAME("TgArena", PROC_Tag_Arena,         0xFF),
-    OBJNAME("TagInst", PROC_Tag_Instruction,   0xFF),
-    OBJNAME("GWolf",   PROC_NPC_GWOLF,         0xFF),
-    OBJNAME("Len",     PROC_NPC_LEN,           0xFF),
-    OBJNAME("Lud",     PROC_NPC_LUD,           0xFF),
-    OBJNAME("Doc",     PROC_NPC_DOC,           0xFF),
-    OBJNAME("FSeirei", PROC_NPC_FAIRY_SEIREI,  0xFF),
-    OBJNAME("Fairy",   PROC_NPC_FAIRY,         0xFF),
-    OBJNAME("Hanjo",   PROC_NPC_HANJO,         0xFF),
-    OBJNAME("Hoz",     PROC_NPC_HOZ,           0xFF),
-    OBJNAME("Jagar",   PROC_NPC_JAGAR,         0xFF),
-    OBJNAME("Kkri",    PROC_NPC_KKRI,          0xFF),
-    OBJNAME("Kn",      PROC_NPC_KN,            0xFF),
-    OBJNAME("KnBlt",   PROC_KN_BULLET,         0xFF),
-    OBJNAME("Knj",     PROC_NPC_KNJ,           0xFF),
-    OBJNAME("Kolin",   PROC_NPC_KOLIN,         0xFF),
-    OBJNAME("Kolinb",  PROC_NPC_KOLINB,        0xFF),
-    OBJNAME("Kyury",   PROC_NPC_KYURY,         0xFF),
-    OBJNAME("Maro",    PROC_NPC_MARO,          0xFF),
-    OBJNAME("midP",    PROC_NPC_MIDP,          0xFF),
-    OBJNAME("Moi",     PROC_NPC_MOI,           0xFF),
-    OBJNAME("Raca",    PROC_NPC_RACA,          0xFF),
-    OBJNAME("Post",    PROC_NPC_POST,          0xFF),
-    OBJNAME("Pouya",   PROC_NPC_POUYA,         0xFF),
-    OBJNAME("Saru",    PROC_NPC_SARU,          0xFF),
-    OBJNAME("seiB",    PROC_NPC_SEIB,          0xFF),
-    OBJNAME("seiC",    PROC_NPC_SEIC,          0xFF),
-    OBJNAME("seiD",    PROC_NPC_SEID,          0xFF),
-    OBJNAME("Seira",   PROC_NPC_SEIRA,         0xFF),
-    OBJNAME("Seira2",  PROC_NPC_SERA2,         0xFF),
-    OBJNAME("Seirei",  PROC_NPC_SEIREI,        0xFF),
-    OBJNAME("Sha",     PROC_NPC_SHAMAN,        0xFF),
-    OBJNAME("sMaro",   PROC_NPC_SMARO,         0xFF),
-    OBJNAME("solA",    PROC_NPC_SOLA,          0xFF),
-    OBJNAME("Taro",    PROC_NPC_TARO,          0xFF),
-    OBJNAME("PA_Besu", PROC_NPC_PACHI_BESU,    0xFF),
-    OBJNAME("PA_Taro", PROC_NPC_PACHI_TARO,    0xFF),
-    OBJNAME("PA_Maro", PROC_NPC_PACHI_MARO,    0xFF),
-    OBJNAME("TagPati", PROC_TAG_PATI,          0xFF),
-    OBJNAME("The",     PROC_NPC_THE,           0xFF),
-    OBJNAME("Tkj",     PROC_NPC_TKJ,           0xFF),
-    OBJNAME("Tks",     PROC_NPC_TKS,           0xFF),
-    OBJNAME("ObjTks",  PROC_OBJ_TKS,           0xFF),
-    OBJNAME("Tkc",     PROC_NPC_TKC,           0xFF),
-    OBJNAME("Tkj2",    PROC_NPC_TKJ2,          0xFF),
-    OBJNAME("Toby",    PROC_NPC_TOBY,          0xFF),
-    OBJNAME("Uri",     PROC_NPC_URI,           0xFF),
-    OBJNAME("Yelia",   PROC_NPC_YELIA,         0xFF),
-    OBJNAME("ykM",     PROC_NPC_YKM,           0xFF),
-    OBJNAME("ykW",     PROC_NPC_YKW,           0xFF),
-    OBJNAME("zanB",    PROC_NPC_ZANB,          0xFF),
-    OBJNAME("Zant",    PROC_NPC_ZANT,          0xFF),
-    OBJNAME("Zelda",   PROC_NPC_ZELDA,         0xFF),
-    OBJNAME("ZelR",    PROC_NPC_ZELR,          0xFF),
-    OBJNAME("ZelRo",   PROC_NPC_ZELRO,         0xFF),
-    OBJNAME("zrA",     PROC_NPC_ZRA,           0x00),
-    OBJNAME("zrS",     PROC_NPC_ZRA,           0x01),
-    OBJNAME("zrWF",    PROC_NPC_ZRA,           0x02),
-    OBJNAME("zrR",     PROC_NPC_ZRA,           0x03),
-    OBJNAME("zrD",     PROC_NPC_ZRA,           0x04),
-    OBJNAME("zrSP",    PROC_NPC_ZRA,           0x05),
-    OBJNAME("zrSPA",   PROC_NPC_ZRA,           0x06),
-    OBJNAME("zrF",     PROC_OBJ_ZRAFREEZE,     0x00),
-    OBJNAME("zrF2",    PROC_OBJ_ZRAFREEZE,     0x01),
-    OBJNAME("zrF3",    PROC_OBJ_ZRAFREEZE,     0x02),
-    OBJNAME("zrC",     PROC_NPC_ZRC,           0xFF),
-    OBJNAME("zrZ",     PROC_NPC_ZRZ,           0xFF),
-    OBJNAME("GrvStn",  PROC_Obj_GraveStone,    0xFF),
-    OBJNAME("zrARock", PROC_Obj_ZraRock,       0xFF),
-    OBJNAME("StAndGl", PROC_START_AND_GOAL,    0xFF),
-    OBJNAME("zrAMark", PROC_ZRA_MARK,          0xFF),
-    OBJNAME("myna2",   PROC_MYNA2,             0xFF),
-    OBJNAME("myn2tag", PROC_TAG_MYNA2,         0xFF),
-    OBJNAME("MAN_a",   PROC_NPC_CD3,           0x00),
-    OBJNAME("MAD_a",   PROC_NPC_CD3,           0x01),
-    OBJNAME("MCN_a",   PROC_NPC_CD3,           0x02),
-    OBJNAME("MON_a",   PROC_NPC_CD3,           0x03),
-    OBJNAME("MAN_b",   PROC_NPC_CD3,           0x04),
-    OBJNAME("MAN_c",   PROC_NPC_CD3,           0x05),
-    OBJNAME("MAS_a",   PROC_NPC_CD3,           0x06),
-    OBJNAME("MBN_a",   PROC_NPC_CD3,           0x07),
-    OBJNAME("MAN_a2",  PROC_NPC_CD3,           0x08),
-    OBJNAME("MAD_a2",  PROC_NPC_CD3,           0x09),
-    OBJNAME("MCN_a2",  PROC_NPC_CD3,           0x0A),
-    OBJNAME("MON_a2",  PROC_NPC_CD3,           0x0B),
-    OBJNAME("MAN_b2",  PROC_NPC_CD3,           0x0C),
-    OBJNAME("MAN_c2",  PROC_NPC_CD3,           0x0D),
-    OBJNAME("MAS_a2",  PROC_NPC_CD3,           0x0E),
-    OBJNAME("MBN_a2",  PROC_NPC_CD3,           0x0F),
-    OBJNAME("WAN_a",   PROC_NPC_CD3,           0x10),
-    OBJNAME("WAD_a",   PROC_NPC_CD3,           0x11),
-    OBJNAME("MAT_a",   PROC_NPC_CD3,           0x12),
-    OBJNAME("WCN_a",   PROC_NPC_CD3,           0x13),
-    OBJNAME("WON_a",   PROC_NPC_CD3,           0x14),
-    OBJNAME("WGN_a",   PROC_NPC_CD3,           0x15),
-    OBJNAME("WAN_b",   PROC_NPC_CD3,           0x16),
-    OBJNAME("WAN_a2",  PROC_NPC_CD3,           0x17),
-    OBJNAME("WAD_a2",  PROC_NPC_CD3,           0x18),
-    OBJNAME("MAT_a2",  PROC_NPC_CD3,           0x19),
-    OBJNAME("WCN_a2",  PROC_NPC_CD3,           0x1A),
-    OBJNAME("WON_a2",  PROC_NPC_CD3,           0x1B),
-    OBJNAME("WGN_a2",  PROC_NPC_CD3,           0x1C),
-    OBJNAME("WAN_b2",  PROC_NPC_CD3,           0x1D),
-    OBJNAME("shoe",    PROC_NPC_SHOE,          0xFF),
-    OBJNAME("DoorBoy", PROC_NPC_DOORBOY,       0xFF),
-    OBJNAME("prayer",  PROC_NPC_PRAYER,        0xFF),
-    OBJNAME("km_Hana", PROC_NPC_KASIHANA,      0xFF),
-    OBJNAME("km_Kyu",  PROC_NPC_KASIKYU,       0xFF),
-    OBJNAME("km_Mich", PROC_NPC_KASIMICH,      0xFF),
-    OBJNAME("NpcChat", PROC_NPC_CHAT,          0xFF),
-    OBJNAME("chtSolA", PROC_NPC_SOLDIERa,      0xFF),
-    OBJNAME("chtSolB", PROC_NPC_SOLDIERb,      0xFF),
-    OBJNAME("DrSol1",  PROC_NPC_DRSOL,         0x00),
-    OBJNAME("DrSol2",  PROC_NPC_DRSOL,         0x01),
-    OBJNAME("chin",    PROC_NPC_CHIN,          0xFF),
-    OBJNAME("ins",     PROC_NPC_INS,           0xFF),
-    OBJNAME("Shop0",   PROC_NPC_SHOP0,         0xFF),
-    OBJNAME("TagSch",  PROC_Tag_Schedule,      0xFF),
-    OBJNAME("TagEsc",  PROC_Tag_Escape,        0xFF),
-    OBJNAME("passer",  PROC_PASSER_MNG,        0x00),
-    OBJNAME("passerL", PROC_PASSER_MNG,        0x01),
-    OBJNAME("fmtion",  PROC_FORMATION_MNG,     0x00),
-    OBJNAME("fmtionL", PROC_FORMATION_MNG,     0x01),
-    OBJNAME("guard",   PROC_GUARD_MNG,         0xFF),
-    OBJNAME("TgGuard", PROC_TAG_GUARD,         0xFF),
-    OBJNAME("Mk",      PROC_NPC_MK,            0xFF),
-    OBJNAME("Obj_Tbi", PROC_Obj_Yobikusa,      0x00),
-    OBJNAME("Obj_Uma", PROC_Obj_Yobikusa,      0x01),
-    OBJNAME("Obj_knk", PROC_Obj_KazeNeko,      0xFF),
-    OBJNAME("Obj_nmp", PROC_Obj_NamePlate,     0xFF),
-    OBJNAME("Obj_Tie", PROC_Obj_OnCloth,       0xFF),
-    OBJNAME("Obj_Lrp", PROC_Obj_LndRope,       0xFF),
-    OBJNAME("Obj_Sit", PROC_Obj_ItaRope,       0xFF),
-    OBJNAME("Ikada",   PROC_Obj_Ikada,         0xFF),
-    OBJNAME("Dust",    PROC_Obj_DUST,          0xFF),
-    OBJNAME("Obj_Ita", PROC_Obj_ITA,           0xFF),
-    OBJNAME("Ice_l",   PROC_Obj_Ice_l,         0xFF),
-    OBJNAME("Ice_s",   PROC_Obj_Ice_s,         0xFF),
-    OBJNAME("E_Make",  PROC_Obj_E_CREATE,      0xFF),
-    OBJNAME("Bhhashi", PROC_Obj_Bhbridge,      0xFF),
-    OBJNAME("Yousei",  PROC_Obj_Yousei,        0xFF),
-    OBJNAME("G_Kabe",  PROC_Obj_GOMIKABE,      0xFF),
-    OBJNAME("B_ling",  PROC_Obj_Mato,          0xFF),
-    OBJNAME("kab_o",   PROC_Obj_Kabuto,        0xFF),
-    OBJNAME("I_Cho",   PROC_Obj_Cho,           0xFF),
-    OBJNAME("I_Kuw",   PROC_Obj_Kuw,           0xFF),
-    OBJNAME("I_Nan",   PROC_Obj_Nan,           0xFF),
-    OBJNAME("I_Dan",   PROC_Obj_Dan,           0xFF),
-    OBJNAME("I_Kam",   PROC_Obj_Kam,           0xFF),
-    OBJNAME("I_Ten",   PROC_Obj_Ten,           0xFF),
-    OBJNAME("I_Ari",   PROC_Obj_Ari,           0xFF),
-    OBJNAME("I_Kag",   PROC_Obj_Kag,           0xFF),
-    OBJNAME("I_Tom",   PROC_Obj_Tombo,         0xFF),
-    OBJNAME("I_Bat",   PROC_Obj_Batta,         0xFF),
-    OBJNAME("I_Kat",   PROC_Obj_Kat,           0xFF),
-    OBJNAME("H_Saku",  PROC_Obj_H_Saku,        0xFF),
-    OBJNAME("sm_door", PROC_Obj_SM_DOOR,       0xFF),
-    OBJNAME("Kaisou",  PROC_Obj_Kaisou,        0xFF),
-    OBJNAME("Ni",      PROC_NI,                0xFF),
-    OBJNAME("Fr",      PROC_FR,                0xFF),
-    OBJNAME("Sq",      PROC_SQ,                0xFF),
-    OBJNAME("Bd",      PROC_BD,                0xFF),
-    OBJNAME("Obj_ki",  PROC_OBJ_KI,            0xFF),
-    OBJNAME("Do",      PROC_DO,                0xFF),
-    OBJNAME("Lm",      PROC_NPC_FISH,          0x00),
-    OBJNAME("Tr",      PROC_NPC_FISH,          0x05),
-    OBJNAME("Npc_tr",  PROC_NPC_TR,            0xFF),
-    OBJNAME("Npc_lf",  PROC_NPC_LF,            0xFF),
-    OBJNAME("Fish",    PROC_MG_FISH,           0xFF),
-    OBJNAME("NPC_TK",  PROC_NPC_TK,            0xFF),
-    OBJNAME("Obj_fd",  PROC_OBJ_FOOD,          0xFF),
-    OBJNAME("MYNA",    PROC_MYNA,              0xFF),
-    OBJNAME("SSITEM",  PROC_OBJ_SSITEM,        0xFF),
-    OBJNAME("SSDRINK", PROC_OBJ_SSDRINK,       0xFF),
-    OBJNAME("TGDRINK", PROC_TAG_SSDRINK,       0xFF),
-    OBJNAME("Tag_Btl", PROC_TAG_BTLITM,        0xFF),
-    OBJNAME("lv5soup", PROC_TAG_LV5SOUP,       0xFF),
-    OBJNAME("TGMNLIG", PROC_TAG_MNLIGHT,       0xFF),
-    OBJNAME("TGSPCAM", PROC_TAG_SHOPCAM,       0xFF),
-    OBJNAME("TGSPITM", PROC_TAG_SHOPITM,       0xFF),
-    OBJNAME("OilTubo", PROC_OBJ_OILTUBO,       0xFF),
-    OBJNAME("Roten",   PROC_OBJ_ROTEN,         0xFF),
-    OBJNAME("Pleaf",   PROC_OBJ_PLEAF,         0xFF),
-    OBJNAME("KBacket", PROC_OBJ_KBACKET,       0xFF),
-    OBJNAME("YBag",    PROC_OBJ_YBAG,          0xFF),
-    OBJNAME("Pumpkin", PROC_OBJ_PUMPKIN,       0xFF),
-    OBJNAME("Obj_kg",  PROC_OBJ_KAGO,          0xFF),
-    OBJNAME("BbKago",  PROC_OBJ_KAGO,          0x00),
-    OBJNAME("OnKago",  PROC_OBJ_KAGO,          0x01),
-    OBJNAME("ObjHasi", PROC_Obj_HHASHI,        0xFF),
-    OBJNAME("Thashi",  PROC_Obj_THASHI,        0xFF),
-    OBJNAME("B_Hashi", PROC_Obj_BHASHI,        0xFF),
-    OBJNAME("E_MD",    PROC_E_MD,              0xFF),
-    OBJNAME("E_s1",    PROC_E_S1,              0xFF),
-    OBJNAME("E_wb",    PROC_E_WB,              0xFF),
-    OBJNAME("E_rd",    PROC_E_RD,              0xFF),
-    OBJNAME("E_rdb",   PROC_E_RDB,             0xFF),
-    OBJNAME("E_rdy",   PROC_E_RDY,             0xFF),
-    OBJNAME("E_fm",    PROC_E_FM,              0xFF),
-    OBJNAME("E_dn",    PROC_E_DN,              0xFF),
-    OBJNAME("E_mf",    PROC_E_MF,              0xFF),
-    OBJNAME("TreeSh",  PROC_TREESH,            0xFF),
-    OBJNAME("E_bug",   PROC_E_BUG,             0xFF),
-    OBJNAME("E_bee",   PROC_E_BEE,             0xFF),
-    OBJNAME("E_nest",  PROC_E_NEST,            0xFF),
-    OBJNAME("E_kr",    PROC_E_KR,              0xFF),
-    OBJNAME("E_st",    PROC_E_ST,              0xFF),
-    OBJNAME("E_tk",    PROC_E_TK,              0xFF),
-    OBJNAME("E_tk2",   PROC_E_TK2,             0xFF),
-    OBJNAME("E_th",    PROC_E_TH,              0xFF),
-    OBJNAME("E_cr",    PROC_E_CR,              0xFF),
-    OBJNAME("E_df",    PROC_E_DF,              0xFF),
-    OBJNAME("E_ph",    PROC_E_PH,              0xFF),
-    OBJNAME("E_fs",    PROC_E_FS,              0xFF),
-    OBJNAME("E_SB",    PROC_E_SB,              0xFF),
-    OBJNAME("E_HM",    PROC_E_HM,              0xFF),
-    OBJNAME("E_fk",    PROC_E_FK,              0xFF),
-    OBJNAME("E_pm",    PROC_E_PM,              0xFF),
-    OBJNAME("Npc_ne",  PROC_NPC_NE,            0xFF),
-    OBJNAME("E_db",    PROC_E_DB,              0xFF),
-    OBJNAME("E_kg",    PROC_E_KG,              0xFF),
-    OBJNAME("E_sh",    PROC_E_SH,              0xFF),
-    OBJNAME("E_sf",    PROC_E_SF,              0xFF),
-    OBJNAME("Obj_lb",  PROC_OBJ_LBOX,          0xFF),
-    OBJNAME("Obj_kb",  PROC_OBJ_KBOX,          0xFF),
-    OBJNAME("E_bs",    PROC_E_BS,              0xFF),
-    OBJNAME("Sekizoa", PROC_OBJ_SEKIZOA,       0x00),
-    OBJNAME("Sekizob", PROC_OBJ_SEKIZOA,       0x01),
-    OBJNAME("E_sm",    PROC_E_SM,              0xFF),
-    OBJNAME("E_sm2",   PROC_E_SM2,             0xFF),
-    OBJNAME("ky_tag0", PROC_KYTAG00,           0xFF),
-    OBJNAME("ky_tag1", PROC_KYTAG01,           0x00),
-    OBJNAME("ky_tag2", PROC_KYTAG02,           0xFF),
-    OBJNAME("ky_tag3", PROC_KYTAG01,           0x01),
-    OBJNAME("kytag3",  PROC_KYTAG03,           0xFF),
-    OBJNAME("DK_tag",  PROC_KYTAG04,           0xFF),
-    OBJNAME("PPHole",  PROC_KYTAG05,           0xFF),
-    OBJNAME("KY_chg",  PROC_KYTAG06,           0xFF),
-    OBJNAME("Plight",  PROC_KYTAG07,           0xFF),
-    OBJNAME("KY_mk",   PROC_KYTAG08,           0xFF),
-    OBJNAME("Bound",   PROC_KYTAG09,           0xFF),
-    OBJNAME("WC_tag",  PROC_KYTAG01,           0x02),
-    OBJNAME("Sparks",  PROC_KYTAG10,           0xFF),
-    OBJNAME("Tcntrl",  PROC_KYTAG11,           0xFF),
-    OBJNAME("Drkmst",  PROC_KYTAG12,           0xFF),
-    OBJNAME("Blsnow",  PROC_KYTAG13,           0xFF),
-    OBJNAME("Savmem",  PROC_KYTAG14,           0xFF),
-    OBJNAME("Zshake",  PROC_KYTAG15,           0xFF),
-    OBJNAME("Pikari",  PROC_KYTAG16,           0xFF),
-    OBJNAME("Lmask",   PROC_KYTAG17,           0xFF),
-    OBJNAME("E_is",    PROC_E_IS,              0xFF),
-    OBJNAME("E_ai",    PROC_E_AI,              0xFF),
-    OBJNAME("E_ba",    PROC_E_BA,              0xFF),
-    OBJNAME("E_bu",    PROC_E_BU,              0xFF),
-    OBJNAME("E_sw",    PROC_E_SW,              0xFF),
-    OBJNAME("E_ge",    PROC_E_GE,              0xFF),
-    OBJNAME("TagGe",   PROC_Tag_WatchGe,       0xFF),
-    OBJNAME("E_ym",    PROC_E_YM,              0xFF),
-    OBJNAME("E_ymt",   PROC_E_YM_TAG,          0xFF),
-    OBJNAME("E_ymb",   PROC_E_YMB,             0xFF),
-    OBJNAME("Fwall",   PROC_Tag_FWall,         0xFF),
-    OBJNAME("E_hz",    PROC_E_HZ,              0xFF),
-    OBJNAME("E_ws",    PROC_E_WS,              0xFF),
-    OBJNAME("E_oc",    PROC_E_OC,              0xFF),
-    OBJNAME("E_dt",    PROC_E_DT,              0xFF),
-    OBJNAME("E_bg",    PROC_E_BG,              0xFF),
-    OBJNAME("E_octbg", PROC_E_OctBg,           0xFF),
-    OBJNAME("E_tt",    PROC_E_TT,              0xFF),
-    OBJNAME("E_dk",    PROC_E_DK,              0xFF),
-    OBJNAME("E_vt",    PROC_E_VT,              0xFF),
-    OBJNAME("E_ww",    PROC_E_WW,              0xFF),
-    OBJNAME("E_gi",    PROC_E_GI,              0xFF),
-    OBJNAME("E_mk",    PROC_E_MK,              0xFF),
-    OBJNAME("B_gm",    PROC_B_GM,              0xFF),
-    OBJNAME("E_gm",    PROC_E_GM,              0xFF),
-    OBJNAME("E_gs",    PROC_E_GS,              0xFF),
-    OBJNAME("Npc_ne",  PROC_NPC_NE,            0xFF),
-    OBJNAME("Obj_gm",  PROC_OBJ_GM,            0xFF),
-    OBJNAME("E_mm",    PROC_E_MM,              0xFF),
-    OBJNAME("E_mm2",   PROC_E_MM,              0x01),
-    OBJNAME("E_fz",    PROC_E_FZ,              0xFF),
-    OBJNAME("E_fb",    PROC_E_FB,              0xFF),
-    OBJNAME("E_Zs",    PROC_E_ZS,              0xFF),
-    OBJNAME("E_kk",    PROC_E_KK,              0xFF),
-    OBJNAME("E_hp",    PROC_E_HP,              0xFF),
-    OBJNAME("E_zh",    PROC_E_ZH,              0xFF),
-    OBJNAME("E_zm",    PROC_E_ZM,              0xFF),
-    OBJNAME("E_zm2",   PROC_E_ZM,              0x01),
-    OBJNAME("E_pz",    PROC_E_PZ,              0xFF),
-    OBJNAME("Kita",    PROC_OBJ_KITA,          0xFF),
-    OBJNAME("E_nz",    PROC_E_NZ,              0xFF),
-    OBJNAME("E_po",    PROC_E_PO,              0xFF),
-    OBJNAME("Obj_w0",  PROC_OBJ_WEB0,          0xFF),
-    OBJNAME("Obj_w1",  PROC_OBJ_WEB1,          0xFF),
-    OBJNAME("Obj_cb",  PROC_OBJ_CB,            0xFF),
-    OBJNAME("Obj_mak", PROC_OBJ_MAKI,          0xFF),
-    OBJNAME("Obj_brg", PROC_OBJ_BRG,           0xFF),
-    OBJNAME("E_rb",    PROC_E_RB,              0xFF),
-    OBJNAME("E_sg",    PROC_E_SG,              0xFF),
-    OBJNAME("Obj_tby", PROC_OBJ_TOBY,          0xFF),
-    OBJNAME("Obj_sw",  PROC_OBJ_SW,            0xFF),
-    OBJNAME("Npc_ks",  PROC_NPC_KS,            0xFF),
-    OBJNAME("Obj_so",  PROC_OBJ_SO,            0xFF),
-    OBJNAME("E_bi",    PROC_E_BI,              0xFF),
-    OBJNAME("Obj_key", PROC_OBJ_KEY,           0xFF),
-    OBJNAME("E_hb",    PROC_E_HB,              0xFF),
-    OBJNAME("Obj_hb",  PROC_OBJ_HB,            0xFF),
-    OBJNAME("B_bq",    PROC_B_BQ,              0xFF),
-    OBJNAME("B_bh",    PROC_B_BH,              0xFF),
-    OBJNAME("B_go",    PROC_B_GO,              0xFF),
-    OBJNAME("Obj_fw",  PROC_OBJ_FW,            0xFF),
-    OBJNAME("E_ga",    PROC_E_GA,              0xFF),
-    OBJNAME("E_gb",    PROC_E_GB,              0xFF),
-    OBJNAME("E_wap",   PROC_E_WAP,             0xFF),
-    OBJNAME("Obj_sui", PROC_OBJ_SUISYA,        0xFF),
-    OBJNAME("Obj_bal", PROC_OBJ_BALLOON,       0xFF),
-    OBJNAME("Obj_lp",  PROC_OBJ_LP,            0xFF),
-    OBJNAME("Obj_nd",  PROC_OBJ_NDOOR,         0xFF),
-    OBJNAME("Obj_ud",  PROC_OBJ_UDOOR,         0xFF),
-    OBJNAME("Obj_us",  PROC_OBJ_USAKU,         0xFF),
-    OBJNAME("Obj_kn2", PROC_OBJ_KANBAN2,       0xFF),
-    OBJNAME("Obj_kyh", PROC_OBJ_KEYHOLE,       0xFF),
-    OBJNAME("Bed",     PROC_OBJ_BED,           0xFF),
-    OBJNAME("BouMato", PROC_OBJ_BOUMATO,       0xFF),
-    OBJNAME("AutoMt",  PROC_OBJ_AUTOMATA,      0xFF),
-    OBJNAME("Gadget",  PROC_OBJ_GADGET,        0xFF),
-    OBJNAME("ItaMato", PROC_OBJ_ITAMATO,       0xFF),
-    OBJNAME("Nougu",   PROC_OBJ_NOUGU,         0xFF),
-    OBJNAME("Stick",   PROC_OBJ_STICK,         0xFF),
-    OBJNAME("Mie",     PROC_OBJ_MIE,           0xFF),
-    OBJNAME("SkDoor",  PROC_OBJ_SEKIDOOR,      0xFF),
-    OBJNAME("Sekizo",  PROC_OBJ_SEKIZO,        0xFF),
-    OBJNAME("SMTile",  PROC_OBJ_SMTILE,        0xFF),
-    OBJNAME("H_kage",  PROC_OBJ_KAGE,          0xFF),
-    OBJNAME("E_ms",    PROC_E_MS,              0xFF),
-    OBJNAME("Obj_tp",  PROC_OBJ_TP,            0xFF),
-    OBJNAME("Obj_ms",  PROC_OBJ_MSIMA,         0xFF),
-    OBJNAME("E_gob",   PROC_E_GOB,             0xFF),
-    OBJNAME("E_yk",    PROC_E_YK,              0xFF),
-    OBJNAME("E_yr",    PROC_E_YR,              0xFF),
-    OBJNAME("E_yg",    PROC_E_YG,              0xFF),
-    OBJNAME("Obj_fm",  PROC_OBJ_FMOBJ,         0xFF),
-    OBJNAME("B_ob",    PROC_B_OB,              0xFF),
-    OBJNAME("OcHashi", PROC_OCTHASHI,          0xFF),
-    OBJNAME("E_dd",    PROC_E_DD,              0xFF),
-    OBJNAME("Obj_rw",  PROC_OBJ_RW,            0xFF),
-    OBJNAME("Obj_ih",  PROC_OBJ_IHASI,         0xFF),
-    OBJNAME("E_yc",    PROC_E_YC,              0xFF),
-    OBJNAME("B_ds",    PROC_B_DS,              0xFF),
-    OBJNAME("B_dr",    PROC_B_DR,              0xFF),
-    OBJNAME("B_gg",    PROC_B_GG,              0xFF),
-    OBJNAME("B_yo",    PROC_B_YO,              0xFF),
-    OBJNAME("B_tn",    PROC_B_TN,              0xFF),
-    OBJNAME("B_zant",  PROC_B_ZANT,            0xFF),
-    OBJNAME("B_zntm",  PROC_B_ZANTZ,           0xFF),
-    OBJNAME("B_znts",  PROC_B_ZANTS,           0xFF),
-    OBJNAME("E_yd",    PROC_E_YD,              0xFF),
-    OBJNAME("E_yh",    PROC_E_YH,              0xFF),
-    OBJNAME("Henna",   PROC_NPC_HENNA,         0xFF),
-    OBJNAME("Henna0",  PROC_NPC_HENNA0,        0xFF),
-    OBJNAME("Npc_du",  PROC_NPC_DU,            0x00),
-    OBJNAME("Econt",   PROC_ECONT,             0xFF),
-    OBJNAME("B_mgn",   PROC_B_MGN,             0xFF),
-    OBJNAME("Hzelda",  PROC_E_HZELDA,          0xFF),
-    OBJNAME("Worm",    PROC_NPC_WORM,          0xFF),
-    OBJNAME("B_gnd",   PROC_B_GND,             0xFF),
-    OBJNAME("Obj_gb",  PROC_OBJ_GB,            0xFF),
-    OBJNAME("tboxA0",  PROC_TBOX,              0xFF),
-    OBJNAME("tboxA1",  PROC_TBOX,              0xFF),
-    OBJNAME("tboxA2",  PROC_TBOX,              0xFF),
-    OBJNAME("tboxB0",  PROC_TBOX,              0xFF),
-    OBJNAME("tboxB1",  PROC_TBOX,              0xFF),
-    OBJNAME("tboxB2",  PROC_TBOX,              0xFF),
-    OBJNAME("tboxJ0",  PROC_TBOX,              0xFF),
-    OBJNAME("tboxP0",  PROC_TBOX,              0xFF),
-    OBJNAME("tboxB00", PROC_TBOX,              0xFF),
-    OBJNAME("tboxB01", PROC_TBOX,              0xFF),
-    OBJNAME("tboxW0",  PROC_TBOX,              0xFF),
-    OBJNAME("tboxEL0", PROC_TBOX2,             0xFF),
-    OBJNAME("tboxEL1", PROC_TBOX2,             0xFF),
-    OBJNAME("l8warp",  PROC_Obj_BossWarp,      0xFF),
-    OBJNAME("L1Bdoor", PROC_L1BOSS_DOOR,       0xFF),
-    OBJNAME("L2Bdoor", PROC_L1BOSS_DOOR,       0xFF),
-    OBJNAME("L3Bdoor", PROC_Obj_Kshutter,      0xFF),
-    OBJNAME("L4Bdoor", PROC_L1BOSS_DOOR,       0xFF),
-    OBJNAME("L5Bdoor", PROC_L5BOSS_DOOR,       0xFF),
-    OBJNAME("L6Bdoor", PROC_L1BOSS_DOOR,       0xFF),
-    OBJNAME("L7Bdoor", PROC_L1BOSS_DOOR,       0xFF),
-    OBJNAME("L8Bdoor", PROC_L1BOSS_DOOR,       0xFF),
-    OBJNAME("L9Bdoor", PROC_L1BOSS_DOOR,       0xFF),
-    OBJNAME("L1Mdoor", PROC_L1MBOSS_DOOR,      0x01),
-    OBJNAME("L2Mdoor", PROC_L1MBOSS_DOOR,      0x02),
-    OBJNAME("L3Mdoor", PROC_L1MBOSS_DOOR,      0x03),
-    OBJNAME("L4Mdoor", PROC_L1MBOSS_DOOR,      0x04),
-    OBJNAME("L5Mdoor", PROC_L1MBOSS_DOOR,      0x05),
-    OBJNAME("L6Mdoor", PROC_L1MBOSS_DOOR,      0x06),
-    OBJNAME("L7Mdoor", PROC_L1MBOSS_DOOR,      0x07),
-    OBJNAME("L8Mdoor", PROC_L1MBOSS_DOOR,      0x08),
-    OBJNAME("L7door",  PROC_L1MBOSS_DOOR,      0x0A),
-    OBJNAME("L5door",  PROC_L1MBOSS_DOOR,      0x0B),
-    OBJNAME("Horse",   PROC_HORSE,             0xFF),
-    OBJNAME("Canoe",   PROC_CANOE,             0xFF),
-    OBJNAME("Crope",   PROC_Obj_Crope,         0xFF),
-    OBJNAME("Cstatue", PROC_CSTATUE,           0xFF),
-    OBJNAME("CstaF",   PROC_CSTAF,             0xFF),
-    OBJNAME("HoZelda", PROC_HOZELDA,           0xFF),
-    OBJNAME("Mhint",   PROC_Tag_Mhint,         0xFF),
-    OBJNAME("Mmsg",    PROC_Tag_Mmsg,          0xFF),
-    OBJNAME("Mwait",   PROC_Tag_Mwait,         0xFF),
-    OBJNAME("Mstop",   PROC_Tag_Mstop,         0xFF),
-    OBJNAME("MstopE",  PROC_Tag_Mstop,         0xFF),
-    OBJNAME("Hinit",   PROC_Tag_Hinit,         0xFF),
-    OBJNAME("Hjump",   PROC_Tag_Hjump,         0xFF),
-    OBJNAME("Hstop",   PROC_Tag_Hstop,         0xFF),
-    OBJNAME("AJnot",   PROC_Tag_AJnot,         0xFF),
-    OBJNAME("Wljump",  PROC_Tag_Wljump,        0xFF),
-    OBJNAME("Sppath",  PROC_Tag_Sppath,        0xFF),
-    OBJNAME("Stream",  PROC_Tag_Stream,        0xFF),
-    OBJNAME("Gstart",  PROC_Tag_Gstart,        0xFF),
-    OBJNAME("TgTGate", PROC_Tag_TWGate,        0xFF),
-    OBJNAME("Lv6Gate", PROC_Tag_Lv6Gate,       0xFF),
-    OBJNAME("Lv7Gate", PROC_Tag_Lv7Gate,       0xFF),
-    OBJNAME("Lv8Gate", PROC_Tag_Lv8Gate,       0xFF),
-    OBJNAME("TgTHint", PROC_Tag_TheBHint,      0xFF),
-    OBJNAME("TagAsst", PROC_Tag_Assist,        0xFF),
-    OBJNAME("Dmidna",  PROC_DMIDNA,            0xFF),
-    OBJNAME("Fchain",  PROC_Obj_Fchain,        0xFF),
-    OBJNAME("Wchain",  PROC_Obj_Wchain,        0xFF),
-    OBJNAME("Cdoor",   PROC_Obj_Cdoor,         0xFF),
-    OBJNAME("Cgate",   PROC_Obj_Cdoor,         0xFF),
-    OBJNAME("Water00", PROC_GRDWATER,          0xFF),
-    OBJNAME("Digpl",   PROC_Obj_Digpl,         0xFF),
-    OBJNAME("Digholl", PROC_Obj_Digholl,       0xFF),
-    OBJNAME("Bombf",   PROC_Obj_Bombf,         0xFF),
-    OBJNAME("hider",   PROC_SUSPEND,           0xFF),
-    OBJNAME("SwAreaC", PROC_SWC00,             0xFF),
-    OBJNAME("SwAreaS", PROC_SWC00,             0xFF),
-    OBJNAME("SwLBall", PROC_SwLBall,           0xFF),
-    OBJNAME("SwBall",  PROC_SwBall,            0xFF),
-    OBJNAME("thouse",  PROC_Obj_TobyHouse,     0xFF),
-    OBJNAME("ironbox", PROC_Obj_MetalBox,      0xFF),
-    OBJNAME("l6swtrn", PROC_Obj_Lv6SwTurn,     0xFF),
-    OBJNAME("l2bmtag", PROC_Tag_Lv2PrChk,      0xFF),
-    OBJNAME("swspin",  PROC_Obj_SwSpinner,     0xFF),
-    OBJNAME("spnGear", PROC_Obj_Lv4Gear,       0xFF),
-    OBJNAME("fan",     PROC_Obj_Fan,           0xFF),
-    OBJNAME("tgake",   PROC_Obj_Gake,          0xFF),
-    OBJNAME("tmoon",   PROC_Obj_TMoon,         0xFF),
-    OBJNAME("gwall",   PROC_Obj_GanonWall,     0xFF),
-    OBJNAME("gwall2",  PROC_Obj_GanonWall2,    0xFF),
-    OBJNAME("scnChg",  PROC_SCENE_EXIT,        0xFF),
-    OBJNAME("scnChg2", PROC_SCENE_EXIT2,       0xFF),
-    OBJNAME("noChgRm", PROC_NO_CHG_ROOM,       0xFF),
-    OBJNAME("readRm",  PROC_NO_CHG_ROOM,       0x00),
-    OBJNAME("Tetd",    PROC_DSHUTTER,          0xFF),
-    OBJNAME("fence",   PROC_DSHUTTER,          0xFF),
-    OBJNAME("lv7saku", PROC_DSHUTTER,          0xFF),
-    OBJNAME("YkgrON",  PROC_Ykgr,              0xFF),
-    OBJNAME("YkgrOFF", PROC_Ykgr,              0xFF),
-    OBJNAME("TagEv",   PROC_TAG_EVENT,         0xFF),
-    OBJNAME("TagEvC",  PROC_TAG_EVENT,         0xFF),
-    OBJNAME("TagEvt",  PROC_TAG_EVT,           0x00),
-    OBJNAME("TagEvt1", PROC_TAG_EVT,           0x01),
-    OBJNAME("TagHowl", PROC_TAG_HOWL,          0x01),
-    OBJNAME("Tag_ms",  PROC_TAG_MSG,           0x00),
-    OBJNAME("LntnTag", PROC_TAG_LANTERN,       0xFF),
-    OBJNAME("EvtArea", PROC_TAG_EVTAREA,       0xFF),
-    OBJNAME("AllMato", PROC_TAG_ALLMATO,       0xFF),
-    OBJNAME("EvtMsg",  PROC_TAG_EVTMSG,        0xFF),
-    OBJNAME("KMsg",    PROC_TAG_KMSG,          0xFF),
-    OBJNAME("Push",    PROC_TAG_PUSH,          0xFF),
-    OBJNAME("Teloper", PROC_TAG_TELOP,         0xFF),
-    OBJNAME("CamChg",  PROC_TAG_CAMERA,        0xFF),
-    OBJNAME("CamArea", PROC_TAG_CAMERA,        0xFF),
-    OBJNAME("CamAreC", PROC_TAG_CAMERA,        0xFF),
-    OBJNAME("ChkPntS", PROC_TAG_CHKPOINT,      0xFF),
-    OBJNAME("ChkPntC", PROC_TAG_CHKPOINT,      0xFF),
-    OBJNAME("setball", PROC_Tag_SetBall,       0xFF),
-    OBJNAME("atkItem", PROC_Tag_AttackItem,    0xFF),
-    OBJNAME("TagStat", PROC_Tag_Statue,        0xFF),
-    OBJNAME("zdoor",   PROC_Obj_ZDoor,         0xFF),
-    OBJNAME("rdoor",   PROC_Obj_ZDoor,         0xFF),
-    OBJNAME("STDoa",   PROC_Obj_ZDoor,         0xFF),
-    OBJNAME("hasi00",  PROC_Obj_Pillar,        0xFF),
-    OBJNAME("hasi01",  PROC_Obj_Pillar,        0xFF),
-    OBJNAME("window",  PROC_Obj_Window,        0xFF),
-    OBJNAME("bbox",    PROC_Obj_BBox,          0xFF),
-    OBJNAME("spiralC", PROC_Obj_Lv3R10Saka,    0xFF),
-    OBJNAME("spiral2", PROC_Obj_Lv3R10Saka,    0xFF),
-    OBJNAME("digsnow", PROC_Obj_DigSnow,       0xFF),
-    OBJNAME("digsand", PROC_Obj_Lv4DigSand,    0xFF),
-    OBJNAME("fallobj", PROC_Obj_FallObj,       0xFF),
-    OBJNAME("l7brg",   PROC_Obj_Lv7Bridge,     0xFF),
-    OBJNAME("dr",      PROC_DR,                0xFF),
-    OBJNAME("L7lowDr", PROC_L7lowDr,           0xFF),
-    OBJNAME("swTime",  PROC_SwTime,            0xFF),
-    OBJNAME("pdrobj",  PROC_Obj_PushDoor,      0xFF),
-    OBJNAME("crystal", PROC_Obj_Crystal,       0xFF),
-    OBJNAME("WarpBrg", PROC_Obj_KakarikoBrg,   0xFF),
-    OBJNAME("WarpB2",  PROC_Obj_KakarikoBrg,   0xFF),
-    OBJNAME("WarpOB1", PROC_Obj_OrdinBrg,      0x00),
-    OBJNAME("WarpOB2", PROC_Obj_OrdinBrg,      0x01),
-    OBJNAME("VolcGnd", PROC_Obj_VolcGnd,       0xFF),
-    OBJNAME("r09wtr",  PROC_Obj_WaterEff,      0xFF),
-    OBJNAME("ballSw",  PROC_Obj_SwBallA,       0xFF),
-    OBJNAME("lballSw", PROC_Obj_SwBallB,       0xFF),
-    OBJNAME("lbsw",    PROC_Obj_SwBallC,       0xFF),
-    OBJNAME("R50Sand", PROC_Obj_Lv4Sand,       0xFF),
-    OBJNAME("rwall",   PROC_Obj_Lv4RailWall,   0xFF),
-    OBJNAME("l4brg",   PROC_Obj_Lv4Bridge,     0xFF),
-    OBJNAME("l4floor", PROC_Obj_Lv4Floor,      0xFF),
-    OBJNAME("item",    PROC_ITEM,              0xFF),
-    OBJNAME("itemKey", PROC_Obj_SmallKey,      0xFF),
-    OBJNAME("kantera", PROC_Obj_Kantera,       0xFF),
-    OBJNAME("witem",   PROC_ITEM,              0xFF),
-    OBJNAME("wshield", PROC_Obj_Shield,        0xFF),
+    OBJNAME("Grass", PROC_GRASS, 0xFF),
+    OBJNAME("kusax1", PROC_GRASS, 0xFF),
+    OBJNAME("kusax7", PROC_GRASS, 0xFF),
+    OBJNAME("kusax21", PROC_GRASS, 0xFF),
+    OBJNAME("flower", PROC_GRASS, 0xFF),
+    OBJNAME("flwr7", PROC_GRASS, 0xFF),
+    OBJNAME("flwr17", PROC_GRASS, 0xFF),
+    OBJNAME("pflower", PROC_GRASS, 0xFF),
+    OBJNAME("pflwrx7", PROC_GRASS, 0xFF),
+    OBJNAME("door", PROC_DOOR20, 0xFF),
+    OBJNAME("kdoor", PROC_KNOB20, 0xFF),
+    OBJNAME("ddoor", PROC_DBDOOR, 0xFF),
+    OBJNAME("bdoor", PROC_BOSS_DOOR, 0xFF),
+    OBJNAME("ndoor", PROC_DOOR20, 0xFF),
+    OBJNAME("tadoor", PROC_DOOR20, 0xFF),
+    OBJNAME("yodoor", PROC_DOOR20, 0xFF),
+    OBJNAME("nadoor", PROC_DOOR20, 0xFF),
+    OBJNAME("l9door", PROC_DOOR20, 0xFF),
+    OBJNAME("l7door", PROC_DOOR20, 0xFF),
+    OBJNAME("pdoor", PROC_PushDoor, 0xFF),
+    OBJNAME("bigdoor", PROC_DOOR20, 0xFF),
+    OBJNAME("kshtr00", PROC_Obj_Kshutter, 0xFF),
+    OBJNAME("vshuter", PROC_Obj_Kshutter, 0xFF),
+    OBJNAME("IzmGate", PROC_Izumi_Gate, 0xFF),
+    OBJNAME("NoneCam", PROC_CAMERA, 0xFF),
+    OBJNAME("NormCam", PROC_CAMERA, 0xFF),
+    OBJNAME("Link", PROC_ALINK, 0xFF),
+    OBJNAME("carry00", PROC_Obj_Carry, 0xFF),
+    OBJNAME("carry01", PROC_Obj_Carry, 0xFF),
+    OBJNAME("carry02", PROC_Obj_Carry, 0xFF),
+    OBJNAME("carry04", PROC_Obj_Carry, 0xFF),
+    OBJNAME("carry05", PROC_Obj_Carry, 0xFF),
+    OBJNAME("carry06", PROC_Obj_Carry, 0xFF),
+    OBJNAME("carry07", PROC_Obj_Carry, 0xFF),
+    OBJNAME("carry08", PROC_Obj_Carry, 0xFF),
+    OBJNAME("carry09", PROC_Obj_Carry, 0xFF),
+    OBJNAME("ball1", PROC_Obj_Carry, 0xFF),
+    OBJNAME("ball2", PROC_Obj_Carry, 0xFF),
+    OBJNAME("ball3", PROC_Obj_Carry, 0xFF),
+    OBJNAME("carry12", PROC_Obj_Carry, 0xFF),
+    OBJNAME("carry13", PROC_Obj_Carry, 0xFF),
+    OBJNAME("TagLite", PROC_Tag_LightBall, 0xFF),
+    OBJNAME("InoBone", PROC_Obj_InoBone, 0xFF),
+    OBJNAME("osiBLK0", PROC_Obj_Movebox, 0x00),
+    OBJNAME("dmblk", PROC_Obj_Movebox, 0x00),
+    OBJNAME("Kkiba", PROC_Obj_Movebox, 0x02),
+    OBJNAME("smblk", PROC_Obj_Movebox, 0x02),
+    OBJNAME("Lv4blk", PROC_Obj_Movebox, 0xFF),
+    OBJNAME("Lv4blk2", PROC_Obj_Movebox, 0xFF),
+    OBJNAME("gstone", PROC_Obj_Movebox, 0xFF),
+    OBJNAME("TagAtt", PROC_Tag_Attp, 0xFF),
+    OBJNAME("mmvbg", PROC_SET_BG_OBJ, 0xFF),
+    OBJNAME("Drop", PROC_Obj_Drop, 0xFF),
+    OBJNAME("BkLeaf", PROC_Obj_BkLeaf, 0xFF),
+    OBJNAME("cylwind", PROC_Obj_Tornado, 0xFF),
+    OBJNAME("TagTrnd", PROC_Obj_Tornado2, 0xFF),
+    OBJNAME("mvstair", PROC_Obj_MvStair, 0xFF),
+    OBJNAME("UHDoor", PROC_Obj_Cowdoor, 0xFF),
+    OBJNAME("SwBoom", PROC_Obj_Swpropeller, 0xFF),
+    OBJNAME("Swboom", PROC_Obj_Swpropeller, 0xFF),
+    OBJNAME("BoomSht", PROC_Obj_BoomShutter, 0xFF),
+    OBJNAME("haihai", PROC_Obj_Hfuta, 0xFF),
+    OBJNAME("stopper", PROC_Obj_Stopper, 0xFF),
+    OBJNAME("dstop", PROC_Obj_Stopper2, 0xFF),
+    OBJNAME("mhole", PROC_Obj_MHole, 0xFF),
+    OBJNAME("mhole2", PROC_Obj_MHole, 0xFF),
+    OBJNAME("TagMag", PROC_Tag_Magne, 0xFF),
+    OBJNAME("P_Warp", PROC_Obj_BossWarp, 0xFF),
+    OBJNAME("fpillar", PROC_Obj_FirePillar, 0xFF),
+    OBJNAME("yfire", PROC_Obj_FirePillar2, 0xFF),
+    OBJNAME("pfire", PROC_Obj_FirePillar2, 0xFF),
+    OBJNAME("Huriko1", PROC_Obj_WoodPendulum, 0xFF),
+    OBJNAME("VolBall", PROC_Obj_VolcanicBall, 0xFF),
+    OBJNAME("VolBom", PROC_Obj_VolcanicBall, 0xFF),
+    OBJNAME("BigVolc", PROC_Obj_VolcanicBomb, 0xFF),
+    OBJNAME("geyser", PROC_Obj_Geyser, 0xFF),
+    OBJNAME("Cwall", PROC_Obj_ChainWall, 0xFF),
+    OBJNAME("Tansu", PROC_Obj_Chest, 0xFF),
+    OBJNAME("Onsen", PROC_Obj_Onsen, 0xFF),
+    OBJNAME("Obj_bm", PROC_Obj_Bemos, 0xFF),
+    OBJNAME("lv6bm", PROC_Obj_Lv6bemos, 0xFF),
+    OBJNAME("E_bm6", PROC_Obj_Lv6bemos2, 0xFF),
+    OBJNAME("stone", PROC_Obj_Stone, 0xFF),
+    OBJNAME("stoneB", PROC_Obj_Stone, 0xFF),
+    OBJNAME("TagSpin", PROC_Tag_Spinner, 0xFF),
+    OBJNAME("L_RopeS", PROC_Obj_RopeBridge, 0xFF),
+    OBJNAME("L_RopeB", PROC_Obj_RopeBridge, 0xFF),
+    OBJNAME("wcover", PROC_Obj_WellCover, 0xFF),
+    OBJNAME("rstair", PROC_Obj_RotStair, 0xFF),
+    OBJNAME("marm", PROC_Obj_MagneArm, 0xFF),
+    OBJNAME("turnSw", PROC_Obj_SwTurn, 0xFF),
+    OBJNAME("chainSw", PROC_Obj_SwChain, 0xFF),
+    OBJNAME("wsword", PROC_Obj_WoodenSword, 0xFF),
+    OBJNAME("iceblk", PROC_Obj_IceBlock, 0xFF),
+    OBJNAME("KkrSmk", PROC_Obj_Smoke, 0xFF),
+    OBJNAME("dmele", PROC_Obj_Elevator, 0xFF),
+    OBJNAME("wfall", PROC_Obj_WaterFall, 0xFF),
+    OBJNAME("izora", PROC_Obj_ZoraCloth, 0xFF),
+    OBJNAME("smgdoor", PROC_Obj_SmgDoor, 0xFF),
+    OBJNAME("smkdoor", PROC_Obj_SmgDoor, 0xFF),
+    OBJNAME("Obj_ava", PROC_Obj_Avalanche, 0xFF),
+    OBJNAME("thdoor", PROC_Obj_TDoor, 0xFF),
+    OBJNAME("mstrsrd", PROC_Obj_MasterSword, 0xFF),
+    OBJNAME("wimage", PROC_Obj_WoodStatue, 0xFF),
+    OBJNAME("sword", PROC_Obj_Sword, 0xFF),
+    OBJNAME("spring", PROC_Tag_Spring, 0xFF),
+    OBJNAME("BkDoorL", PROC_Obj_BkDoor, 0xFF),
+    OBJNAME("BkDoorR", PROC_Obj_BkDoor, 0xFF),
+    OBJNAME("IGateL", PROC_Obj_MGate, 0xFF),
+    OBJNAME("IGateR", PROC_Obj_MGate, 0xFF),
+    OBJNAME("HGateL", PROC_Obj_MGate, 0xFF),
+    OBJNAME("HGateR", PROC_Obj_MGate, 0xFF),
+    OBJNAME("K_Gate", PROC_Obj_KkrGate, 0xFF),
+    OBJNAME("R_Gate", PROC_Obj_RiderGate, 0xFF),
+    OBJNAME("kkanban", PROC_Obj_KKanban, 0xFF),
+    OBJNAME("Mhsg6", PROC_Obj_Ladder, 0x00),
+    OBJNAME("Mhsg9", PROC_Obj_Ladder, 0x01),
+    OBJNAME("Mhsg12", PROC_Obj_Ladder, 0x02),
+    OBJNAME("Mhsg15", PROC_Obj_Ladder, 0x03),
+    OBJNAME("Mhsg4h", PROC_Obj_Ladder, 0x04),
+    OBJNAME("Mhsg3", PROC_Obj_Ladder, 0x05),
+    OBJNAME("bonbori", PROC_EP, 0xFF),
+    OBJNAME("Cow", PROC_COW, 0xFF),
+    OBJNAME("Peru", PROC_PERU, 0xFF),
+    OBJNAME("Kago", PROC_KAGO, 0xFF),
+    OBJNAME("TagFall", PROC_Tag_WaterFall, 0xFF),
+    OBJNAME("Kbota_A", PROC_Obj_Swpush, 0x00),
+    OBJNAME("Kbota_B", PROC_Obj_Swpush, 0x01),
+    OBJNAME("KbotaC", PROC_Obj_Swpush, 0x02),
+    OBJNAME("Swpush", PROC_Obj_Swpush, 0x00),
+    OBJNAME("Lv3bota", PROC_Obj_Swpush, 0x00),
+    OBJNAME("Ksw00_C", PROC_Obj_Swpush2, 0x02),
+    OBJNAME("hvySw", PROC_Obj_Swpush5, 0x00),
+    OBJNAME("buraA", PROC_Obj_SwHang, 0x00),
+    OBJNAME("buraB", PROC_Obj_SwHang, 0x00),
+    OBJNAME("buraA2", PROC_Obj_SwHang, 0x00),
+    OBJNAME("buraB2", PROC_Obj_SwHang, 0x00),
+    OBJNAME("bura7A", PROC_Obj_SwHang, 0x00),
+    OBJNAME("bura7B", PROC_Obj_SwHang, 0x00),
+    OBJNAME("bura7C", PROC_Obj_SwHang, 0x00),
+    OBJNAME("bura7D", PROC_Obj_SwHang, 0x00),
+    OBJNAME("bura7E", PROC_Obj_SwHang, 0x00),
+    OBJNAME("tbox_sw", PROC_TBOX_SW, 0x00),
+    OBJNAME("swLight", PROC_Obj_SwLight, 0x00),
+    OBJNAME("iceleaf", PROC_Obj_IceLeaf, 0x00),
+    OBJNAME("swHit", PROC_SWHIT0, 0x00),
+    OBJNAME("swHit2", PROC_SWHIT0, 0x01),
+    OBJNAME("ObjTime", PROC_Obj_Timer, 0xFF),
+    OBJNAME("AND_SW", PROC_ANDSW, 0xFF),
+    OBJNAME("AND_SW2", PROC_ANDSW2, 0xFF),
+    OBJNAME("ALLdie", PROC_ALLDIE, 0xFF),
+    OBJNAME("rvback", PROC_Tag_RiverBack, 0xFF),
+    OBJNAME("kagoFal", PROC_Tag_KagoFall, 0xFF),
+    OBJNAME("CrvGate", PROC_Obj_CRVGATE, 0xFF),
+    OBJNAME("CrvSaku", PROC_Obj_CRVFENCE, 0xFF),
+    OBJNAME("CrvWood", PROC_Obj_CRVHAHEN, 0xFF),
+    OBJNAME("CrvStel", PROC_Obj_CRVSTEEL, 0xFF),
+    OBJNAME("CrvLH", PROC_Obj_CRVLH_DW, 0xFF),
+    OBJNAME("RvRock", PROC_Obj_RIVERROCK, 0xFF),
+    OBJNAME("P2a", PROC_NPC_P2, 0x00),
+    OBJNAME("P2b", PROC_NPC_P2, 0x01),
+    OBJNAME("P2c", PROC_NPC_P2, 0x02),
+    OBJNAME("Gnd", PROC_NPC_GND, 0xFF),
+    OBJNAME("grA", PROC_NPC_GRA, 0xFF),
+    OBJNAME("Obj_grA", PROC_OBJ_GRA, 0xFF),
+    OBJNAME("Tag_grA", PROC_TAG_GRA, 0xFF),
+    OBJNAME("TagYami", PROC_TAG_YAMI, 0xFF),
+    OBJNAME("grC", PROC_NPC_GRC, 0xFF),
+    OBJNAME("grM", PROC_NPC_GRM, 0xFF),
+    OBJNAME("grMC", PROC_NPC_GRMC, 0xFF),
+    OBJNAME("grS", PROC_NPC_GRS, 0xFF),
+    OBJNAME("grD1", PROC_NPC_GRD, 0xFF),
+    OBJNAME("grD", PROC_NPC_WRESTLER, 0x01),
+    OBJNAME("grR", PROC_NPC_GRR, 0xFF),
+    OBJNAME("grO", PROC_NPC_GRO, 0xFF),
+    OBJNAME("grZ", PROC_NPC_GRZ, 0xFF),
+    OBJNAME("grARock", PROC_Obj_GraRock, 0xFF),
+    OBJNAME("grZRock", PROC_Obj_GrzRock, 0xFF),
+    OBJNAME("osnFire", PROC_OBJ_ONSEN_FIRE, 0xFF),
+    OBJNAME("yamiD", PROC_NPC_YAMID, 0xFF),
+    OBJNAME("yamiT", PROC_NPC_YAMIT, 0xFF),
+    OBJNAME("yamiS", PROC_NPC_YAMIS, 0xFF),
+    OBJNAME("Blue_NS", PROC_NPC_BLUENS, 0xFF),
+    OBJNAME("Kakashi", PROC_NPC_KAKASHI, 0x00),
+    OBJNAME("Kdk", PROC_NPC_KDK, 0xFF),
+    OBJNAME("Aru", PROC_NPC_ARU, 0xFF),
+    OBJNAME("Bans", PROC_NPC_BANS, 0xFF),
+    OBJNAME("Besu", PROC_NPC_BESU, 0xFF),
+    OBJNAME("Bou", PROC_NPC_BOU, 0xFF),
+    OBJNAME("BouS", PROC_NPC_BOU_S, 0x00),
+    OBJNAME("clerkA", PROC_NPC_CLERKA, 0x00),
+    OBJNAME("clerkB", PROC_NPC_CLERKB, 0x00),
+    OBJNAME("clerkT", PROC_NPC_CLERKT, 0x00),
+    OBJNAME("Ash", PROC_NPC_ASH, 0xFF),
+    OBJNAME("AshB", PROC_NPC_ASHB, 0xFF),
+    OBJNAME("Shad", PROC_NPC_SHAD, 0xFF),
+    OBJNAME("Rafrel", PROC_NPC_RAFREL, 0xFF),
+    OBJNAME("MoiR", PROC_NPC_MOIR, 0xFF),
+    OBJNAME("impal", PROC_NPC_IMPAL, 0xFF),
+    OBJNAME("Coach", PROC_NPC_COACH, 0xFF),
+    OBJNAME("TheB", PROC_NPC_THEB, 0xFF),
+    OBJNAME("TgArena", PROC_Tag_Arena, 0xFF),
+    OBJNAME("TagInst", PROC_Tag_Instruction, 0xFF),
+    OBJNAME("GWolf", PROC_NPC_GWOLF, 0xFF),
+    OBJNAME("Len", PROC_NPC_LEN, 0xFF),
+    OBJNAME("Lud", PROC_NPC_LUD, 0xFF),
+    OBJNAME("Doc", PROC_NPC_DOC, 0xFF),
+    OBJNAME("FSeirei", PROC_NPC_FAIRY_SEIREI, 0xFF),
+    OBJNAME("Fairy", PROC_NPC_FAIRY, 0xFF),
+    OBJNAME("Hanjo", PROC_NPC_HANJO, 0xFF),
+    OBJNAME("Hoz", PROC_NPC_HOZ, 0xFF),
+    OBJNAME("Jagar", PROC_NPC_JAGAR, 0xFF),
+    OBJNAME("Kkri", PROC_NPC_KKRI, 0xFF),
+    OBJNAME("Kn", PROC_NPC_KN, 0xFF),
+    OBJNAME("KnBlt", PROC_KN_BULLET, 0xFF),
+    OBJNAME("Knj", PROC_NPC_KNJ, 0xFF),
+    OBJNAME("Kolin", PROC_NPC_KOLIN, 0xFF),
+    OBJNAME("Kolinb", PROC_NPC_KOLINB, 0xFF),
+    OBJNAME("Kyury", PROC_NPC_KYURY, 0xFF),
+    OBJNAME("Maro", PROC_NPC_MARO, 0xFF),
+    OBJNAME("midP", PROC_NPC_MIDP, 0xFF),
+    OBJNAME("Moi", PROC_NPC_MOI, 0xFF),
+    OBJNAME("Raca", PROC_NPC_RACA, 0xFF),
+    OBJNAME("Post", PROC_NPC_POST, 0xFF),
+    OBJNAME("Pouya", PROC_NPC_POUYA, 0xFF),
+    OBJNAME("Saru", PROC_NPC_SARU, 0xFF),
+    OBJNAME("seiB", PROC_NPC_SEIB, 0xFF),
+    OBJNAME("seiC", PROC_NPC_SEIC, 0xFF),
+    OBJNAME("seiD", PROC_NPC_SEID, 0xFF),
+    OBJNAME("Seira", PROC_NPC_SEIRA, 0xFF),
+    OBJNAME("Seira2", PROC_NPC_SERA2, 0xFF),
+    OBJNAME("Seirei", PROC_NPC_SEIREI, 0xFF),
+    OBJNAME("Sha", PROC_NPC_SHAMAN, 0xFF),
+    OBJNAME("sMaro", PROC_NPC_SMARO, 0xFF),
+    OBJNAME("solA", PROC_NPC_SOLA, 0xFF),
+    OBJNAME("Taro", PROC_NPC_TARO, 0xFF),
+    OBJNAME("PA_Besu", PROC_NPC_PACHI_BESU, 0xFF),
+    OBJNAME("PA_Taro", PROC_NPC_PACHI_TARO, 0xFF),
+    OBJNAME("PA_Maro", PROC_NPC_PACHI_MARO, 0xFF),
+    OBJNAME("TagPati", PROC_TAG_PATI, 0xFF),
+    OBJNAME("The", PROC_NPC_THE, 0xFF),
+    OBJNAME("Tkj", PROC_NPC_TKJ, 0xFF),
+    OBJNAME("Tks", PROC_NPC_TKS, 0xFF),
+    OBJNAME("ObjTks", PROC_OBJ_TKS, 0xFF),
+    OBJNAME("Tkc", PROC_NPC_TKC, 0xFF),
+    OBJNAME("Tkj2", PROC_NPC_TKJ2, 0xFF),
+    OBJNAME("Toby", PROC_NPC_TOBY, 0xFF),
+    OBJNAME("Uri", PROC_NPC_URI, 0xFF),
+    OBJNAME("Yelia", PROC_NPC_YELIA, 0xFF),
+    OBJNAME("ykM", PROC_NPC_YKM, 0xFF),
+    OBJNAME("ykW", PROC_NPC_YKW, 0xFF),
+    OBJNAME("zanB", PROC_NPC_ZANB, 0xFF),
+    OBJNAME("Zant", PROC_NPC_ZANT, 0xFF),
+    OBJNAME("Zelda", PROC_NPC_ZELDA, 0xFF),
+    OBJNAME("ZelR", PROC_NPC_ZELR, 0xFF),
+    OBJNAME("ZelRo", PROC_NPC_ZELRO, 0xFF),
+    OBJNAME("zrA", PROC_NPC_ZRA, 0x00),
+    OBJNAME("zrS", PROC_NPC_ZRA, 0x01),
+    OBJNAME("zrWF", PROC_NPC_ZRA, 0x02),
+    OBJNAME("zrR", PROC_NPC_ZRA, 0x03),
+    OBJNAME("zrD", PROC_NPC_ZRA, 0x04),
+    OBJNAME("zrSP", PROC_NPC_ZRA, 0x05),
+    OBJNAME("zrSPA", PROC_NPC_ZRA, 0x06),
+    OBJNAME("zrF", PROC_OBJ_ZRAFREEZE, 0x00),
+    OBJNAME("zrF2", PROC_OBJ_ZRAFREEZE, 0x01),
+    OBJNAME("zrF3", PROC_OBJ_ZRAFREEZE, 0x02),
+    OBJNAME("zrC", PROC_NPC_ZRC, 0xFF),
+    OBJNAME("zrZ", PROC_NPC_ZRZ, 0xFF),
+    OBJNAME("GrvStn", PROC_Obj_GraveStone, 0xFF),
+    OBJNAME("zrARock", PROC_Obj_ZraRock, 0xFF),
+    OBJNAME("StAndGl", PROC_START_AND_GOAL, 0xFF),
+    OBJNAME("zrAMark", PROC_ZRA_MARK, 0xFF),
+    OBJNAME("myna2", PROC_MYNA2, 0xFF),
+    OBJNAME("myn2tag", PROC_TAG_MYNA2, 0xFF),
+    OBJNAME("MAN_a", PROC_NPC_CD3, 0x00),
+    OBJNAME("MAD_a", PROC_NPC_CD3, 0x01),
+    OBJNAME("MCN_a", PROC_NPC_CD3, 0x02),
+    OBJNAME("MON_a", PROC_NPC_CD3, 0x03),
+    OBJNAME("MAN_b", PROC_NPC_CD3, 0x04),
+    OBJNAME("MAN_c", PROC_NPC_CD3, 0x05),
+    OBJNAME("MAS_a", PROC_NPC_CD3, 0x06),
+    OBJNAME("MBN_a", PROC_NPC_CD3, 0x07),
+    OBJNAME("MAN_a2", PROC_NPC_CD3, 0x08),
+    OBJNAME("MAD_a2", PROC_NPC_CD3, 0x09),
+    OBJNAME("MCN_a2", PROC_NPC_CD3, 0x0A),
+    OBJNAME("MON_a2", PROC_NPC_CD3, 0x0B),
+    OBJNAME("MAN_b2", PROC_NPC_CD3, 0x0C),
+    OBJNAME("MAN_c2", PROC_NPC_CD3, 0x0D),
+    OBJNAME("MAS_a2", PROC_NPC_CD3, 0x0E),
+    OBJNAME("MBN_a2", PROC_NPC_CD3, 0x0F),
+    OBJNAME("WAN_a", PROC_NPC_CD3, 0x10),
+    OBJNAME("WAD_a", PROC_NPC_CD3, 0x11),
+    OBJNAME("MAT_a", PROC_NPC_CD3, 0x12),
+    OBJNAME("WCN_a", PROC_NPC_CD3, 0x13),
+    OBJNAME("WON_a", PROC_NPC_CD3, 0x14),
+    OBJNAME("WGN_a", PROC_NPC_CD3, 0x15),
+    OBJNAME("WAN_b", PROC_NPC_CD3, 0x16),
+    OBJNAME("WAN_a2", PROC_NPC_CD3, 0x17),
+    OBJNAME("WAD_a2", PROC_NPC_CD3, 0x18),
+    OBJNAME("MAT_a2", PROC_NPC_CD3, 0x19),
+    OBJNAME("WCN_a2", PROC_NPC_CD3, 0x1A),
+    OBJNAME("WON_a2", PROC_NPC_CD3, 0x1B),
+    OBJNAME("WGN_a2", PROC_NPC_CD3, 0x1C),
+    OBJNAME("WAN_b2", PROC_NPC_CD3, 0x1D),
+    OBJNAME("shoe", PROC_NPC_SHOE, 0xFF),
+    OBJNAME("DoorBoy", PROC_NPC_DOORBOY, 0xFF),
+    OBJNAME("prayer", PROC_NPC_PRAYER, 0xFF),
+    OBJNAME("km_Hana", PROC_NPC_KASIHANA, 0xFF),
+    OBJNAME("km_Kyu", PROC_NPC_KASIKYU, 0xFF),
+    OBJNAME("km_Mich", PROC_NPC_KASIMICH, 0xFF),
+    OBJNAME("NpcChat", PROC_NPC_CHAT, 0xFF),
+    OBJNAME("chtSolA", PROC_NPC_SOLDIERa, 0xFF),
+    OBJNAME("chtSolB", PROC_NPC_SOLDIERb, 0xFF),
+    OBJNAME("DrSol1", PROC_NPC_DRSOL, 0x00),
+    OBJNAME("DrSol2", PROC_NPC_DRSOL, 0x01),
+    OBJNAME("chin", PROC_NPC_CHIN, 0xFF),
+    OBJNAME("ins", PROC_NPC_INS, 0xFF),
+    OBJNAME("Shop0", PROC_NPC_SHOP0, 0xFF),
+    OBJNAME("TagSch", PROC_Tag_Schedule, 0xFF),
+    OBJNAME("TagEsc", PROC_Tag_Escape, 0xFF),
+    OBJNAME("passer", PROC_PASSER_MNG, 0x00),
+    OBJNAME("passerL", PROC_PASSER_MNG, 0x01),
+    OBJNAME("fmtion", PROC_FORMATION_MNG, 0x00),
+    OBJNAME("fmtionL", PROC_FORMATION_MNG, 0x01),
+    OBJNAME("guard", PROC_GUARD_MNG, 0xFF),
+    OBJNAME("TgGuard", PROC_TAG_GUARD, 0xFF),
+    OBJNAME("Mk", PROC_NPC_MK, 0xFF),
+    OBJNAME("Obj_Tbi", PROC_Obj_Yobikusa, 0x00),
+    OBJNAME("Obj_Uma", PROC_Obj_Yobikusa, 0x01),
+    OBJNAME("Obj_knk", PROC_Obj_KazeNeko, 0xFF),
+    OBJNAME("Obj_nmp", PROC_Obj_NamePlate, 0xFF),
+    OBJNAME("Obj_Tie", PROC_Obj_OnCloth, 0xFF),
+    OBJNAME("Obj_Lrp", PROC_Obj_LndRope, 0xFF),
+    OBJNAME("Obj_Sit", PROC_Obj_ItaRope, 0xFF),
+    OBJNAME("Ikada", PROC_Obj_Ikada, 0xFF),
+    OBJNAME("Dust", PROC_Obj_DUST, 0xFF),
+    OBJNAME("Obj_Ita", PROC_Obj_ITA, 0xFF),
+    OBJNAME("Ice_l", PROC_Obj_Ice_l, 0xFF),
+    OBJNAME("Ice_s", PROC_Obj_Ice_s, 0xFF),
+    OBJNAME("E_Make", PROC_Obj_E_CREATE, 0xFF),
+    OBJNAME("Bhhashi", PROC_Obj_Bhbridge, 0xFF),
+    OBJNAME("Yousei", PROC_Obj_Yousei, 0xFF),
+    OBJNAME("G_Kabe", PROC_Obj_GOMIKABE, 0xFF),
+    OBJNAME("B_ling", PROC_Obj_Mato, 0xFF),
+    OBJNAME("kab_o", PROC_Obj_Kabuto, 0xFF),
+    OBJNAME("I_Cho", PROC_Obj_Cho, 0xFF),
+    OBJNAME("I_Kuw", PROC_Obj_Kuw, 0xFF),
+    OBJNAME("I_Nan", PROC_Obj_Nan, 0xFF),
+    OBJNAME("I_Dan", PROC_Obj_Dan, 0xFF),
+    OBJNAME("I_Kam", PROC_Obj_Kam, 0xFF),
+    OBJNAME("I_Ten", PROC_Obj_Ten, 0xFF),
+    OBJNAME("I_Ari", PROC_Obj_Ari, 0xFF),
+    OBJNAME("I_Kag", PROC_Obj_Kag, 0xFF),
+    OBJNAME("I_Tom", PROC_Obj_Tombo, 0xFF),
+    OBJNAME("I_Bat", PROC_Obj_Batta, 0xFF),
+    OBJNAME("I_Kat", PROC_Obj_Kat, 0xFF),
+    OBJNAME("H_Saku", PROC_Obj_H_Saku, 0xFF),
+    OBJNAME("sm_door", PROC_Obj_SM_DOOR, 0xFF),
+    OBJNAME("Kaisou", PROC_Obj_Kaisou, 0xFF),
+    OBJNAME("Ni", PROC_NI, 0xFF),
+    OBJNAME("Fr", PROC_FR, 0xFF),
+    OBJNAME("Sq", PROC_SQ, 0xFF),
+    OBJNAME("Bd", PROC_BD, 0xFF),
+    OBJNAME("Obj_ki", PROC_OBJ_KI, 0xFF),
+    OBJNAME("Do", PROC_DO, 0xFF),
+    OBJNAME("Lm", PROC_NPC_FISH, 0x00),
+    OBJNAME("Tr", PROC_NPC_FISH, 0x05),
+    OBJNAME("Npc_tr", PROC_NPC_TR, 0xFF),
+    OBJNAME("Npc_lf", PROC_NPC_LF, 0xFF),
+    OBJNAME("Fish", PROC_MG_FISH, 0xFF),
+    OBJNAME("NPC_TK", PROC_NPC_TK, 0xFF),
+    OBJNAME("Obj_fd", PROC_OBJ_FOOD, 0xFF),
+    OBJNAME("MYNA", PROC_MYNA, 0xFF),
+    OBJNAME("SSITEM", PROC_OBJ_SSITEM, 0xFF),
+    OBJNAME("SSDRINK", PROC_OBJ_SSDRINK, 0xFF),
+    OBJNAME("TGDRINK", PROC_TAG_SSDRINK, 0xFF),
+    OBJNAME("Tag_Btl", PROC_TAG_BTLITM, 0xFF),
+    OBJNAME("lv5soup", PROC_TAG_LV5SOUP, 0xFF),
+    OBJNAME("TGMNLIG", PROC_TAG_MNLIGHT, 0xFF),
+    OBJNAME("TGSPCAM", PROC_TAG_SHOPCAM, 0xFF),
+    OBJNAME("TGSPITM", PROC_TAG_SHOPITM, 0xFF),
+    OBJNAME("OilTubo", PROC_OBJ_OILTUBO, 0xFF),
+    OBJNAME("Roten", PROC_OBJ_ROTEN, 0xFF),
+    OBJNAME("Pleaf", PROC_OBJ_PLEAF, 0xFF),
+    OBJNAME("KBacket", PROC_OBJ_KBACKET, 0xFF),
+    OBJNAME("YBag", PROC_OBJ_YBAG, 0xFF),
+    OBJNAME("Pumpkin", PROC_OBJ_PUMPKIN, 0xFF),
+    OBJNAME("Obj_kg", PROC_OBJ_KAGO, 0xFF),
+    OBJNAME("BbKago", PROC_OBJ_KAGO, 0x00),
+    OBJNAME("OnKago", PROC_OBJ_KAGO, 0x01),
+    OBJNAME("ObjHasi", PROC_Obj_HHASHI, 0xFF),
+    OBJNAME("Thashi", PROC_Obj_THASHI, 0xFF),
+    OBJNAME("B_Hashi", PROC_Obj_BHASHI, 0xFF),
+    OBJNAME("E_MD", PROC_E_MD, 0xFF),
+    OBJNAME("E_s1", PROC_E_S1, 0xFF),
+    OBJNAME("E_wb", PROC_E_WB, 0xFF),
+    OBJNAME("E_rd", PROC_E_RD, 0xFF),
+    OBJNAME("E_rdb", PROC_E_RDB, 0xFF),
+    OBJNAME("E_rdy", PROC_E_RDY, 0xFF),
+    OBJNAME("E_fm", PROC_E_FM, 0xFF),
+    OBJNAME("E_dn", PROC_E_DN, 0xFF),
+    OBJNAME("E_mf", PROC_E_MF, 0xFF),
+    OBJNAME("TreeSh", PROC_TREESH, 0xFF),
+    OBJNAME("E_bug", PROC_E_BUG, 0xFF),
+    OBJNAME("E_bee", PROC_E_BEE, 0xFF),
+    OBJNAME("E_nest", PROC_E_NEST, 0xFF),
+    OBJNAME("E_kr", PROC_E_KR, 0xFF),
+    OBJNAME("E_st", PROC_E_ST, 0xFF),
+    OBJNAME("E_tk", PROC_E_TK, 0xFF),
+    OBJNAME("E_tk2", PROC_E_TK2, 0xFF),
+    OBJNAME("E_th", PROC_E_TH, 0xFF),
+    OBJNAME("E_cr", PROC_E_CR, 0xFF),
+    OBJNAME("E_df", PROC_E_DF, 0xFF),
+    OBJNAME("E_ph", PROC_E_PH, 0xFF),
+    OBJNAME("E_fs", PROC_E_FS, 0xFF),
+    OBJNAME("E_SB", PROC_E_SB, 0xFF),
+    OBJNAME("E_HM", PROC_E_HM, 0xFF),
+    OBJNAME("E_fk", PROC_E_FK, 0xFF),
+    OBJNAME("E_pm", PROC_E_PM, 0xFF),
+    OBJNAME("Npc_ne", PROC_NPC_NE, 0xFF),
+    OBJNAME("E_db", PROC_E_DB, 0xFF),
+    OBJNAME("E_kg", PROC_E_KG, 0xFF),
+    OBJNAME("E_sh", PROC_E_SH, 0xFF),
+    OBJNAME("E_sf", PROC_E_SF, 0xFF),
+    OBJNAME("Obj_lb", PROC_OBJ_LBOX, 0xFF),
+    OBJNAME("Obj_kb", PROC_OBJ_KBOX, 0xFF),
+    OBJNAME("E_bs", PROC_E_BS, 0xFF),
+    OBJNAME("Sekizoa", PROC_OBJ_SEKIZOA, 0x00),
+    OBJNAME("Sekizob", PROC_OBJ_SEKIZOA, 0x01),
+    OBJNAME("E_sm", PROC_E_SM, 0xFF),
+    OBJNAME("E_sm2", PROC_E_SM2, 0xFF),
+    OBJNAME("ky_tag0", PROC_KYTAG00, 0xFF),
+    OBJNAME("ky_tag1", PROC_KYTAG01, 0x00),
+    OBJNAME("ky_tag2", PROC_KYTAG02, 0xFF),
+    OBJNAME("ky_tag3", PROC_KYTAG01, 0x01),
+    OBJNAME("kytag3", PROC_KYTAG03, 0xFF),
+    OBJNAME("DK_tag", PROC_KYTAG04, 0xFF),
+    OBJNAME("PPHole", PROC_KYTAG05, 0xFF),
+    OBJNAME("KY_chg", PROC_KYTAG06, 0xFF),
+    OBJNAME("Plight", PROC_KYTAG07, 0xFF),
+    OBJNAME("KY_mk", PROC_KYTAG08, 0xFF),
+    OBJNAME("Bound", PROC_KYTAG09, 0xFF),
+    OBJNAME("WC_tag", PROC_KYTAG01, 0x02),
+    OBJNAME("Sparks", PROC_KYTAG10, 0xFF),
+    OBJNAME("Tcntrl", PROC_KYTAG11, 0xFF),
+    OBJNAME("Drkmst", PROC_KYTAG12, 0xFF),
+    OBJNAME("Blsnow", PROC_KYTAG13, 0xFF),
+    OBJNAME("Savmem", PROC_KYTAG14, 0xFF),
+    OBJNAME("Zshake", PROC_KYTAG15, 0xFF),
+    OBJNAME("Pikari", PROC_KYTAG16, 0xFF),
+    OBJNAME("Lmask", PROC_KYTAG17, 0xFF),
+    OBJNAME("E_is", PROC_E_IS, 0xFF),
+    OBJNAME("E_ai", PROC_E_AI, 0xFF),
+    OBJNAME("E_ba", PROC_E_BA, 0xFF),
+    OBJNAME("E_bu", PROC_E_BU, 0xFF),
+    OBJNAME("E_sw", PROC_E_SW, 0xFF),
+    OBJNAME("E_ge", PROC_E_GE, 0xFF),
+    OBJNAME("TagGe", PROC_Tag_WatchGe, 0xFF),
+    OBJNAME("E_ym", PROC_E_YM, 0xFF),
+    OBJNAME("E_ymt", PROC_E_YM_TAG, 0xFF),
+    OBJNAME("E_ymb", PROC_E_YMB, 0xFF),
+    OBJNAME("Fwall", PROC_Tag_FWall, 0xFF),
+    OBJNAME("E_hz", PROC_E_HZ, 0xFF),
+    OBJNAME("E_ws", PROC_E_WS, 0xFF),
+    OBJNAME("E_oc", PROC_E_OC, 0xFF),
+    OBJNAME("E_dt", PROC_E_DT, 0xFF),
+    OBJNAME("E_bg", PROC_E_BG, 0xFF),
+    OBJNAME("E_octbg", PROC_E_OctBg, 0xFF),
+    OBJNAME("E_tt", PROC_E_TT, 0xFF),
+    OBJNAME("E_dk", PROC_E_DK, 0xFF),
+    OBJNAME("E_vt", PROC_E_VT, 0xFF),
+    OBJNAME("E_ww", PROC_E_WW, 0xFF),
+    OBJNAME("E_gi", PROC_E_GI, 0xFF),
+    OBJNAME("E_mk", PROC_E_MK, 0xFF),
+    OBJNAME("B_gm", PROC_B_GM, 0xFF),
+    OBJNAME("E_gm", PROC_E_GM, 0xFF),
+    OBJNAME("E_gs", PROC_E_GS, 0xFF),
+    OBJNAME("Npc_ne", PROC_NPC_NE, 0xFF),
+    OBJNAME("Obj_gm", PROC_OBJ_GM, 0xFF),
+    OBJNAME("E_mm", PROC_E_MM, 0xFF),
+    OBJNAME("E_mm2", PROC_E_MM, 0x01),
+    OBJNAME("E_fz", PROC_E_FZ, 0xFF),
+    OBJNAME("E_fb", PROC_E_FB, 0xFF),
+    OBJNAME("E_Zs", PROC_E_ZS, 0xFF),
+    OBJNAME("E_kk", PROC_E_KK, 0xFF),
+    OBJNAME("E_hp", PROC_E_HP, 0xFF),
+    OBJNAME("E_zh", PROC_E_ZH, 0xFF),
+    OBJNAME("E_zm", PROC_E_ZM, 0xFF),
+    OBJNAME("E_zm2", PROC_E_ZM, 0x01),
+    OBJNAME("E_pz", PROC_E_PZ, 0xFF),
+    OBJNAME("Kita", PROC_OBJ_KITA, 0xFF),
+    OBJNAME("E_nz", PROC_E_NZ, 0xFF),
+    OBJNAME("E_po", PROC_E_PO, 0xFF),
+    OBJNAME("Obj_w0", PROC_OBJ_WEB0, 0xFF),
+    OBJNAME("Obj_w1", PROC_OBJ_WEB1, 0xFF),
+    OBJNAME("Obj_cb", PROC_OBJ_CB, 0xFF),
+    OBJNAME("Obj_mak", PROC_OBJ_MAKI, 0xFF),
+    OBJNAME("Obj_brg", PROC_OBJ_BRG, 0xFF),
+    OBJNAME("E_rb", PROC_E_RB, 0xFF),
+    OBJNAME("E_sg", PROC_E_SG, 0xFF),
+    OBJNAME("Obj_tby", PROC_OBJ_TOBY, 0xFF),
+    OBJNAME("Obj_sw", PROC_OBJ_SW, 0xFF),
+    OBJNAME("Npc_ks", PROC_NPC_KS, 0xFF),
+    OBJNAME("Obj_so", PROC_OBJ_SO, 0xFF),
+    OBJNAME("E_bi", PROC_E_BI, 0xFF),
+    OBJNAME("Obj_key", PROC_OBJ_KEY, 0xFF),
+    OBJNAME("E_hb", PROC_E_HB, 0xFF),
+    OBJNAME("Obj_hb", PROC_OBJ_HB, 0xFF),
+    OBJNAME("B_bq", PROC_B_BQ, 0xFF),
+    OBJNAME("B_bh", PROC_B_BH, 0xFF),
+    OBJNAME("B_go", PROC_B_GO, 0xFF),
+    OBJNAME("Obj_fw", PROC_OBJ_FW, 0xFF),
+    OBJNAME("E_ga", PROC_E_GA, 0xFF),
+    OBJNAME("E_gb", PROC_E_GB, 0xFF),
+    OBJNAME("E_wap", PROC_E_WAP, 0xFF),
+    OBJNAME("Obj_sui", PROC_OBJ_SUISYA, 0xFF),
+    OBJNAME("Obj_bal", PROC_OBJ_BALLOON, 0xFF),
+    OBJNAME("Obj_lp", PROC_OBJ_LP, 0xFF),
+    OBJNAME("Obj_nd", PROC_OBJ_NDOOR, 0xFF),
+    OBJNAME("Obj_ud", PROC_OBJ_UDOOR, 0xFF),
+    OBJNAME("Obj_us", PROC_OBJ_USAKU, 0xFF),
+    OBJNAME("Obj_kn2", PROC_OBJ_KANBAN2, 0xFF),
+    OBJNAME("Obj_kyh", PROC_OBJ_KEYHOLE, 0xFF),
+    OBJNAME("Bed", PROC_OBJ_BED, 0xFF),
+    OBJNAME("BouMato", PROC_OBJ_BOUMATO, 0xFF),
+    OBJNAME("AutoMt", PROC_OBJ_AUTOMATA, 0xFF),
+    OBJNAME("Gadget", PROC_OBJ_GADGET, 0xFF),
+    OBJNAME("ItaMato", PROC_OBJ_ITAMATO, 0xFF),
+    OBJNAME("Nougu", PROC_OBJ_NOUGU, 0xFF),
+    OBJNAME("Stick", PROC_OBJ_STICK, 0xFF),
+    OBJNAME("Mie", PROC_OBJ_MIE, 0xFF),
+    OBJNAME("SkDoor", PROC_OBJ_SEKIDOOR, 0xFF),
+    OBJNAME("Sekizo", PROC_OBJ_SEKIZO, 0xFF),
+    OBJNAME("SMTile", PROC_OBJ_SMTILE, 0xFF),
+    OBJNAME("H_kage", PROC_OBJ_KAGE, 0xFF),
+    OBJNAME("E_ms", PROC_E_MS, 0xFF),
+    OBJNAME("Obj_tp", PROC_OBJ_TP, 0xFF),
+    OBJNAME("Obj_ms", PROC_OBJ_MSIMA, 0xFF),
+    OBJNAME("E_gob", PROC_E_GOB, 0xFF),
+    OBJNAME("E_yk", PROC_E_YK, 0xFF),
+    OBJNAME("E_yr", PROC_E_YR, 0xFF),
+    OBJNAME("E_yg", PROC_E_YG, 0xFF),
+    OBJNAME("Obj_fm", PROC_OBJ_FMOBJ, 0xFF),
+    OBJNAME("B_ob", PROC_B_OB, 0xFF),
+    OBJNAME("OcHashi", PROC_OCTHASHI, 0xFF),
+    OBJNAME("E_dd", PROC_E_DD, 0xFF),
+    OBJNAME("Obj_rw", PROC_OBJ_RW, 0xFF),
+    OBJNAME("Obj_ih", PROC_OBJ_IHASI, 0xFF),
+    OBJNAME("E_yc", PROC_E_YC, 0xFF),
+    OBJNAME("B_ds", PROC_B_DS, 0xFF),
+    OBJNAME("B_dr", PROC_B_DR, 0xFF),
+    OBJNAME("B_gg", PROC_B_GG, 0xFF),
+    OBJNAME("B_yo", PROC_B_YO, 0xFF),
+    OBJNAME("B_tn", PROC_B_TN, 0xFF),
+    OBJNAME("B_zant", PROC_B_ZANT, 0xFF),
+    OBJNAME("B_zntm", PROC_B_ZANTZ, 0xFF),
+    OBJNAME("B_znts", PROC_B_ZANTS, 0xFF),
+    OBJNAME("E_yd", PROC_E_YD, 0xFF),
+    OBJNAME("E_yh", PROC_E_YH, 0xFF),
+    OBJNAME("Henna", PROC_NPC_HENNA, 0xFF),
+    OBJNAME("Henna0", PROC_NPC_HENNA0, 0xFF),
+    OBJNAME("Npc_du", PROC_NPC_DU, 0x00),
+    OBJNAME("Econt", PROC_ECONT, 0xFF),
+    OBJNAME("B_mgn", PROC_B_MGN, 0xFF),
+    OBJNAME("Hzelda", PROC_E_HZELDA, 0xFF),
+    OBJNAME("Worm", PROC_NPC_WORM, 0xFF),
+    OBJNAME("B_gnd", PROC_B_GND, 0xFF),
+    OBJNAME("Obj_gb", PROC_OBJ_GB, 0xFF),
+    OBJNAME("tboxA0", PROC_TBOX, 0xFF),
+    OBJNAME("tboxA1", PROC_TBOX, 0xFF),
+    OBJNAME("tboxA2", PROC_TBOX, 0xFF),
+    OBJNAME("tboxB0", PROC_TBOX, 0xFF),
+    OBJNAME("tboxB1", PROC_TBOX, 0xFF),
+    OBJNAME("tboxB2", PROC_TBOX, 0xFF),
+    OBJNAME("tboxJ0", PROC_TBOX, 0xFF),
+    OBJNAME("tboxP0", PROC_TBOX, 0xFF),
+    OBJNAME("tboxB00", PROC_TBOX, 0xFF),
+    OBJNAME("tboxB01", PROC_TBOX, 0xFF),
+    OBJNAME("tboxW0", PROC_TBOX, 0xFF),
+    OBJNAME("tboxEL0", PROC_TBOX2, 0xFF),
+    OBJNAME("tboxEL1", PROC_TBOX2, 0xFF),
+    OBJNAME("l8warp", PROC_Obj_BossWarp, 0xFF),
+    OBJNAME("L1Bdoor", PROC_L1BOSS_DOOR, 0xFF),
+    OBJNAME("L2Bdoor", PROC_L1BOSS_DOOR, 0xFF),
+    OBJNAME("L3Bdoor", PROC_Obj_Kshutter, 0xFF),
+    OBJNAME("L4Bdoor", PROC_L1BOSS_DOOR, 0xFF),
+    OBJNAME("L5Bdoor", PROC_L5BOSS_DOOR, 0xFF),
+    OBJNAME("L6Bdoor", PROC_L1BOSS_DOOR, 0xFF),
+    OBJNAME("L7Bdoor", PROC_L1BOSS_DOOR, 0xFF),
+    OBJNAME("L8Bdoor", PROC_L1BOSS_DOOR, 0xFF),
+    OBJNAME("L9Bdoor", PROC_L1BOSS_DOOR, 0xFF),
+    OBJNAME("L1Mdoor", PROC_L1MBOSS_DOOR, 0x01),
+    OBJNAME("L2Mdoor", PROC_L1MBOSS_DOOR, 0x02),
+    OBJNAME("L3Mdoor", PROC_L1MBOSS_DOOR, 0x03),
+    OBJNAME("L4Mdoor", PROC_L1MBOSS_DOOR, 0x04),
+    OBJNAME("L5Mdoor", PROC_L1MBOSS_DOOR, 0x05),
+    OBJNAME("L6Mdoor", PROC_L1MBOSS_DOOR, 0x06),
+    OBJNAME("L7Mdoor", PROC_L1MBOSS_DOOR, 0x07),
+    OBJNAME("L8Mdoor", PROC_L1MBOSS_DOOR, 0x08),
+    OBJNAME("L7door", PROC_L1MBOSS_DOOR, 0x0A),
+    OBJNAME("L5door", PROC_L1MBOSS_DOOR, 0x0B),
+    OBJNAME("Horse", PROC_HORSE, 0xFF),
+    OBJNAME("Canoe", PROC_CANOE, 0xFF),
+    OBJNAME("Crope", PROC_Obj_Crope, 0xFF),
+    OBJNAME("Cstatue", PROC_CSTATUE, 0xFF),
+    OBJNAME("CstaF", PROC_CSTAF, 0xFF),
+    OBJNAME("HoZelda", PROC_HOZELDA, 0xFF),
+    OBJNAME("Mhint", PROC_Tag_Mhint, 0xFF),
+    OBJNAME("Mmsg", PROC_Tag_Mmsg, 0xFF),
+    OBJNAME("Mwait", PROC_Tag_Mwait, 0xFF),
+    OBJNAME("Mstop", PROC_Tag_Mstop, 0xFF),
+    OBJNAME("MstopE", PROC_Tag_Mstop, 0xFF),
+    OBJNAME("Hinit", PROC_Tag_Hinit, 0xFF),
+    OBJNAME("Hjump", PROC_Tag_Hjump, 0xFF),
+    OBJNAME("Hstop", PROC_Tag_Hstop, 0xFF),
+    OBJNAME("AJnot", PROC_Tag_AJnot, 0xFF),
+    OBJNAME("Wljump", PROC_Tag_Wljump, 0xFF),
+    OBJNAME("Sppath", PROC_Tag_Sppath, 0xFF),
+    OBJNAME("Stream", PROC_Tag_Stream, 0xFF),
+    OBJNAME("Gstart", PROC_Tag_Gstart, 0xFF),
+    OBJNAME("TgTGate", PROC_Tag_TWGate, 0xFF),
+    OBJNAME("Lv6Gate", PROC_Tag_Lv6Gate, 0xFF),
+    OBJNAME("Lv7Gate", PROC_Tag_Lv7Gate, 0xFF),
+    OBJNAME("Lv8Gate", PROC_Tag_Lv8Gate, 0xFF),
+    OBJNAME("TgTHint", PROC_Tag_TheBHint, 0xFF),
+    OBJNAME("TagAsst", PROC_Tag_Assist, 0xFF),
+    OBJNAME("Dmidna", PROC_DMIDNA, 0xFF),
+    OBJNAME("Fchain", PROC_Obj_Fchain, 0xFF),
+    OBJNAME("Wchain", PROC_Obj_Wchain, 0xFF),
+    OBJNAME("Cdoor", PROC_Obj_Cdoor, 0xFF),
+    OBJNAME("Cgate", PROC_Obj_Cdoor, 0xFF),
+    OBJNAME("Water00", PROC_GRDWATER, 0xFF),
+    OBJNAME("Digpl", PROC_Obj_Digpl, 0xFF),
+    OBJNAME("Digholl", PROC_Obj_Digholl, 0xFF),
+    OBJNAME("Bombf", PROC_Obj_Bombf, 0xFF),
+    OBJNAME("hider", PROC_SUSPEND, 0xFF),
+    OBJNAME("SwAreaC", PROC_SWC00, 0xFF),
+    OBJNAME("SwAreaS", PROC_SWC00, 0xFF),
+    OBJNAME("SwLBall", PROC_SwLBall, 0xFF),
+    OBJNAME("SwBall", PROC_SwBall, 0xFF),
+    OBJNAME("thouse", PROC_Obj_TobyHouse, 0xFF),
+    OBJNAME("ironbox", PROC_Obj_MetalBox, 0xFF),
+    OBJNAME("l6swtrn", PROC_Obj_Lv6SwTurn, 0xFF),
+    OBJNAME("l2bmtag", PROC_Tag_Lv2PrChk, 0xFF),
+    OBJNAME("swspin", PROC_Obj_SwSpinner, 0xFF),
+    OBJNAME("spnGear", PROC_Obj_Lv4Gear, 0xFF),
+    OBJNAME("fan", PROC_Obj_Fan, 0xFF),
+    OBJNAME("tgake", PROC_Obj_Gake, 0xFF),
+    OBJNAME("tmoon", PROC_Obj_TMoon, 0xFF),
+    OBJNAME("gwall", PROC_Obj_GanonWall, 0xFF),
+    OBJNAME("gwall2", PROC_Obj_GanonWall2, 0xFF),
+    OBJNAME("scnChg", PROC_SCENE_EXIT, 0xFF),
+    OBJNAME("scnChg2", PROC_SCENE_EXIT2, 0xFF),
+    OBJNAME("noChgRm", PROC_NO_CHG_ROOM, 0xFF),
+    OBJNAME("readRm", PROC_NO_CHG_ROOM, 0x00),
+    OBJNAME("Tetd", PROC_DSHUTTER, 0xFF),
+    OBJNAME("fence", PROC_DSHUTTER, 0xFF),
+    OBJNAME("lv7saku", PROC_DSHUTTER, 0xFF),
+    OBJNAME("YkgrON", PROC_Ykgr, 0xFF),
+    OBJNAME("YkgrOFF", PROC_Ykgr, 0xFF),
+    OBJNAME("TagEv", PROC_TAG_EVENT, 0xFF),
+    OBJNAME("TagEvC", PROC_TAG_EVENT, 0xFF),
+    OBJNAME("TagEvt", PROC_TAG_EVT, 0x00),
+    OBJNAME("TagEvt1", PROC_TAG_EVT, 0x01),
+    OBJNAME("TagHowl", PROC_TAG_HOWL, 0x01),
+    OBJNAME("Tag_ms", PROC_TAG_MSG, 0x00),
+    OBJNAME("LntnTag", PROC_TAG_LANTERN, 0xFF),
+    OBJNAME("EvtArea", PROC_TAG_EVTAREA, 0xFF),
+    OBJNAME("AllMato", PROC_TAG_ALLMATO, 0xFF),
+    OBJNAME("EvtMsg", PROC_TAG_EVTMSG, 0xFF),
+    OBJNAME("KMsg", PROC_TAG_KMSG, 0xFF),
+    OBJNAME("Push", PROC_TAG_PUSH, 0xFF),
+    OBJNAME("Teloper", PROC_TAG_TELOP, 0xFF),
+    OBJNAME("CamChg", PROC_TAG_CAMERA, 0xFF),
+    OBJNAME("CamArea", PROC_TAG_CAMERA, 0xFF),
+    OBJNAME("CamAreC", PROC_TAG_CAMERA, 0xFF),
+    OBJNAME("ChkPntS", PROC_TAG_CHKPOINT, 0xFF),
+    OBJNAME("ChkPntC", PROC_TAG_CHKPOINT, 0xFF),
+    OBJNAME("setball", PROC_Tag_SetBall, 0xFF),
+    OBJNAME("atkItem", PROC_Tag_AttackItem, 0xFF),
+    OBJNAME("TagStat", PROC_Tag_Statue, 0xFF),
+    OBJNAME("zdoor", PROC_Obj_ZDoor, 0xFF),
+    OBJNAME("rdoor", PROC_Obj_ZDoor, 0xFF),
+    OBJNAME("STDoa", PROC_Obj_ZDoor, 0xFF),
+    OBJNAME("hasi00", PROC_Obj_Pillar, 0xFF),
+    OBJNAME("hasi01", PROC_Obj_Pillar, 0xFF),
+    OBJNAME("window", PROC_Obj_Window, 0xFF),
+    OBJNAME("bbox", PROC_Obj_BBox, 0xFF),
+    OBJNAME("spiralC", PROC_Obj_Lv3R10Saka, 0xFF),
+    OBJNAME("spiral2", PROC_Obj_Lv3R10Saka, 0xFF),
+    OBJNAME("digsnow", PROC_Obj_DigSnow, 0xFF),
+    OBJNAME("digsand", PROC_Obj_Lv4DigSand, 0xFF),
+    OBJNAME("fallobj", PROC_Obj_FallObj, 0xFF),
+    OBJNAME("l7brg", PROC_Obj_Lv7Bridge, 0xFF),
+    OBJNAME("dr", PROC_DR, 0xFF),
+    OBJNAME("L7lowDr", PROC_L7lowDr, 0xFF),
+    OBJNAME("swTime", PROC_SwTime, 0xFF),
+    OBJNAME("pdrobj", PROC_Obj_PushDoor, 0xFF),
+    OBJNAME("crystal", PROC_Obj_Crystal, 0xFF),
+    OBJNAME("WarpBrg", PROC_Obj_KakarikoBrg, 0xFF),
+    OBJNAME("WarpB2", PROC_Obj_KakarikoBrg, 0xFF),
+    OBJNAME("WarpOB1", PROC_Obj_OrdinBrg, 0x00),
+    OBJNAME("WarpOB2", PROC_Obj_OrdinBrg, 0x01),
+    OBJNAME("VolcGnd", PROC_Obj_VolcGnd, 0xFF),
+    OBJNAME("r09wtr", PROC_Obj_WaterEff, 0xFF),
+    OBJNAME("ballSw", PROC_Obj_SwBallA, 0xFF),
+    OBJNAME("lballSw", PROC_Obj_SwBallB, 0xFF),
+    OBJNAME("lbsw", PROC_Obj_SwBallC, 0xFF),
+    OBJNAME("R50Sand", PROC_Obj_Lv4Sand, 0xFF),
+    OBJNAME("rwall", PROC_Obj_Lv4RailWall, 0xFF),
+    OBJNAME("l4brg", PROC_Obj_Lv4Bridge, 0xFF),
+    OBJNAME("l4floor", PROC_Obj_Lv4Floor, 0xFF),
+    OBJNAME("item", PROC_ITEM, 0xFF),
+    OBJNAME("itemKey", PROC_Obj_SmallKey, 0xFF),
+    OBJNAME("kantera", PROC_Obj_Kantera, 0xFF),
+    OBJNAME("witem", PROC_ITEM, 0xFF),
+    OBJNAME("wshield", PROC_Obj_Shield, 0xFF),
     OBJNAME("htPiece", PROC_Obj_LifeContainer, 0xFF),
-    OBJNAME("htCase",  PROC_Obj_LifeContainer, 0xFF),
-    OBJNAME("Mbrid15", PROC_Obj_RotBridge,     0xFF),
-    OBJNAME("Mbrid9",  PROC_Obj_RotBridge,     0xFF),
-    OBJNAME("maglift", PROC_Obj_MagLift,       0xFF),
-    OBJNAME("Cldst00", PROC_Obj_Lv1Cdl00,      0xFF),
-    OBJNAME("Cldst01", PROC_Obj_Lv1Cdl01,      0xFF),
-    OBJNAME("RMback0", PROC_Tag_Restart,       0xFF),
-    OBJNAME("RMback1", PROC_Tag_ChgRestart,    0xFF),
-    OBJNAME("Mist",    PROC_Tag_Mist,          0xFF),
-    OBJNAME("magLifR", PROC_Obj_MagLiftRot,    0xFF),
-    OBJNAME("TCdlst",  PROC_Obj_TvCdlst,       0xFF),
-    OBJNAME("wdstick", PROC_Obj_WdStick,       0xFF),
-    OBJNAME("stBlock", PROC_Obj_StairBlock,    0xFF),
-    OBJNAME("hsMato",  PROC_Obj_HsTarget,      0xFF),
-    OBJNAME("ktFire",  PROC_Tag_KtOnFire,      0xFF),
-    OBJNAME("hswitch", PROC_Obj_HeavySw,       0xFF),
-    OBJNAME("goGate",  PROC_Obj_GoGate,        0xFF),
-    OBJNAME("taAmi",   PROC_Obj_TaFence,       0xFF),
-    OBJNAME("fireWd",  PROC_Obj_FireWood,      0xFF),
-    OBJNAME("fireWd2", PROC_Obj_FireWood2,     0xFF),
-    OBJNAME("altar",   PROC_Obj_Saidan,        0xFF),
-    OBJNAME("gpTaru",  PROC_Obj_GpTaru,        0xFF),
-    OBJNAME("spinLf",  PROC_Obj_SpinLift,      0xFF),
-    OBJNAME("bmWin",   PROC_Obj_BmWindow,      0xFF),
-    OBJNAME("roofHl",  PROC_Obj_RfHole,        0xFF),
-    OBJNAME("syRock",  PROC_Obj_SyRock,        0xFF),
-    OBJNAME("wColumn", PROC_Obj_WaterPillar,   0xFF),
-    OBJNAME("kpot",    PROC_Obj_KiPot,         0xFF),
-    OBJNAME("bsGate",  PROC_Obj_BsGate,        0xFF),
-    OBJNAME("amiShut", PROC_Obj_AmiShutter,    0xFF),
-    OBJNAME("kwhel00", PROC_Obj_KWheel00,      0xFF),
-    OBJNAME("kwhel01", PROC_Obj_KWheel01,      0xFF),
-    OBJNAME("PRElvtr", PROC_Obj_PRElvtr,       0xFF),
-    OBJNAME("swhel00", PROC_Obj_KWheel00,      0xFF),
-    OBJNAME("M_hasu",  PROC_Obj_MHasu,         0xFF),
-    OBJNAME("yiblltr", PROC_Obj_YIblltray,     0xFF),
-    OBJNAME("l6egate", PROC_Obj_Lv6EGate,      0xFF),
-    OBJNAME("l6eleva", PROC_Obj_Lv6ElevtA,     0xFF),
-    OBJNAME("wtGate",  PROC_Obj_WtGate,        0xFF),
-    OBJNAME("candlL2", PROC_Obj_Lv2Candle,     0xFF),
-    OBJNAME("togeTp",  PROC_Obj_TogeTrap,      0xFF),
-    OBJNAME("rotTrap", PROC_Obj_RotTrap,       0xFF),
-    OBJNAME("klift00", PROC_Obj_KLift00,       0xFF),
-    OBJNAME("l4chand", PROC_Obj_Lv4Chan,       0xFF),
-    OBJNAME("Ychndlr", PROC_Obj_Ychndlr,       0xFF),
-    OBJNAME("hbmbkoy", PROC_Obj_HBombkoya,     0xFF),
-    OBJNAME("TagCsw",  PROC_TAG_CSW,           0xFF),
-    OBJNAME("TagCswO", PROC_TAG_CSW,           0xFF),
-    OBJNAME("P_Rwall", PROC_Obj_Lv4PRwall,     0xFF),
-    OBJNAME("PDtile",  PROC_Obj_PDtile,        0xFF),
-    OBJNAME("PDwall",  PROC_Obj_PDwall,        0xFF),
-    OBJNAME("Qs",      PROC_TAG_QS,            0xFF),
-    OBJNAME("mirror",  PROC_MIRROR,            0xFF),
-    OBJNAME("rGate",   PROC_Obj_SwallShutter,  0xFF),
-    OBJNAME("l3water", PROC_Obj_Lv3Water,      0xFF),
-    OBJNAME("l3wat02", PROC_Obj_Lv3Water2,     0xFF),
-    OBJNAME("l3watB",  PROC_OBJ_LV3WATERB,     0xFF),
-    OBJNAME("szbridg", PROC_Obj_SZbridge,      0xFF),
-    OBJNAME("kjgjs",   PROC_Obj_KJgjs,         0xFF),
-    OBJNAME("kjs",     PROC_Obj_KJgjs,         0xFF),
-    OBJNAME("candlL3", PROC_Obj_Lv3Candle,     0xFF),
-    OBJNAME("l5icewl", PROC_Obj_IceWall,       0xFF),
-    OBJNAME("Turara",  PROC_Obj_Turara,        0xFF),
-    OBJNAME("twGate",  PROC_Obj_TwGate,        0xFF),
-    OBJNAME("L4cdlTg", PROC_Tag_Lv4Candle,     0xFF),
-    OBJNAME("L4cddTg", PROC_Tag_Lv4CandleDm,   0xFF),
-    OBJNAME("togeRol", PROC_Obj_Lv6TogeRoll,   0xFF),
-    OBJNAME("l6TogeT", PROC_Obj_Lv6TogeTrap,   0xFF),
-    OBJNAME("Tenbin",  PROC_Obj_Lv6Tenbin,     0xFF),
-    OBJNAME("l6Lblk",  PROC_Obj_Lv6Lblock,     0xFF),
-    OBJNAME("l6SwGt",  PROC_Obj_Lv6SwGate,     0xFF),
-    OBJNAME("l6ChBlk", PROC_Obj_Lv6ChgGate,    0xFF),
-    OBJNAME("l6FuriT", PROC_Obj_Lv6FuriTrap,   0xFF),
-    OBJNAME("KHdesk",  PROC_Obj_BarDesk,       0xFF),
-    OBJNAME("Ytaihou", PROC_Obj_Ytaihou,       0xFF),
-    OBJNAME("L4eShut", PROC_Obj_Lv4EdShutter,  0xFF),
-    OBJNAME("pofire",  PROC_Obj_poFire,        0xFF),
-    OBJNAME("pofiTg",  PROC_Tag_poFire,        0xFF),
-    OBJNAME("poCandl", PROC_Obj_poCandle,      0xFF),
-    OBJNAME("L4Gate",  PROC_Obj_Lv4Gate,       0xFF),
-    OBJNAME("L4Pgate", PROC_Obj_Lv4PoGate,     0xFF),
-    OBJNAME("L4SWall", PROC_Obj_Lv4SlideWall,  0xFF),
-    OBJNAME("L4hmato", PROC_Obj_Lv4HsTarget,   0xFF),
-    OBJNAME("propy",   PROC_Obj_Lv7PropY,      0xFF),
-    OBJNAME("L7BsGt",  PROC_Obj_Lv7BsGate,     0xFF),
-    OBJNAME("optLift", PROC_Obj_Lv8OptiLift,   0xFF),
+    OBJNAME("htCase", PROC_Obj_LifeContainer, 0xFF),
+    OBJNAME("Mbrid15", PROC_Obj_RotBridge, 0xFF),
+    OBJNAME("Mbrid9", PROC_Obj_RotBridge, 0xFF),
+    OBJNAME("maglift", PROC_Obj_MagLift, 0xFF),
+    OBJNAME("Cldst00", PROC_Obj_Lv1Cdl00, 0xFF),
+    OBJNAME("Cldst01", PROC_Obj_Lv1Cdl01, 0xFF),
+    OBJNAME("RMback0", PROC_Tag_Restart, 0xFF),
+    OBJNAME("RMback1", PROC_Tag_ChgRestart, 0xFF),
+    OBJNAME("Mist", PROC_Tag_Mist, 0xFF),
+    OBJNAME("magLifR", PROC_Obj_MagLiftRot, 0xFF),
+    OBJNAME("TCdlst", PROC_Obj_TvCdlst, 0xFF),
+    OBJNAME("wdstick", PROC_Obj_WdStick, 0xFF),
+    OBJNAME("stBlock", PROC_Obj_StairBlock, 0xFF),
+    OBJNAME("hsMato", PROC_Obj_HsTarget, 0xFF),
+    OBJNAME("ktFire", PROC_Tag_KtOnFire, 0xFF),
+    OBJNAME("hswitch", PROC_Obj_HeavySw, 0xFF),
+    OBJNAME("goGate", PROC_Obj_GoGate, 0xFF),
+    OBJNAME("taAmi", PROC_Obj_TaFence, 0xFF),
+    OBJNAME("fireWd", PROC_Obj_FireWood, 0xFF),
+    OBJNAME("fireWd2", PROC_Obj_FireWood2, 0xFF),
+    OBJNAME("altar", PROC_Obj_Saidan, 0xFF),
+    OBJNAME("gpTaru", PROC_Obj_GpTaru, 0xFF),
+    OBJNAME("spinLf", PROC_Obj_SpinLift, 0xFF),
+    OBJNAME("bmWin", PROC_Obj_BmWindow, 0xFF),
+    OBJNAME("roofHl", PROC_Obj_RfHole, 0xFF),
+    OBJNAME("syRock", PROC_Obj_SyRock, 0xFF),
+    OBJNAME("wColumn", PROC_Obj_WaterPillar, 0xFF),
+    OBJNAME("kpot", PROC_Obj_KiPot, 0xFF),
+    OBJNAME("bsGate", PROC_Obj_BsGate, 0xFF),
+    OBJNAME("amiShut", PROC_Obj_AmiShutter, 0xFF),
+    OBJNAME("kwhel00", PROC_Obj_KWheel00, 0xFF),
+    OBJNAME("kwhel01", PROC_Obj_KWheel01, 0xFF),
+    OBJNAME("PRElvtr", PROC_Obj_PRElvtr, 0xFF),
+    OBJNAME("swhel00", PROC_Obj_KWheel00, 0xFF),
+    OBJNAME("M_hasu", PROC_Obj_MHasu, 0xFF),
+    OBJNAME("yiblltr", PROC_Obj_YIblltray, 0xFF),
+    OBJNAME("l6egate", PROC_Obj_Lv6EGate, 0xFF),
+    OBJNAME("l6eleva", PROC_Obj_Lv6ElevtA, 0xFF),
+    OBJNAME("wtGate", PROC_Obj_WtGate, 0xFF),
+    OBJNAME("candlL2", PROC_Obj_Lv2Candle, 0xFF),
+    OBJNAME("togeTp", PROC_Obj_TogeTrap, 0xFF),
+    OBJNAME("rotTrap", PROC_Obj_RotTrap, 0xFF),
+    OBJNAME("klift00", PROC_Obj_KLift00, 0xFF),
+    OBJNAME("l4chand", PROC_Obj_Lv4Chan, 0xFF),
+    OBJNAME("Ychndlr", PROC_Obj_Ychndlr, 0xFF),
+    OBJNAME("hbmbkoy", PROC_Obj_HBombkoya, 0xFF),
+    OBJNAME("TagCsw", PROC_TAG_CSW, 0xFF),
+    OBJNAME("TagCswO", PROC_TAG_CSW, 0xFF),
+    OBJNAME("P_Rwall", PROC_Obj_Lv4PRwall, 0xFF),
+    OBJNAME("PDtile", PROC_Obj_PDtile, 0xFF),
+    OBJNAME("PDwall", PROC_Obj_PDwall, 0xFF),
+    OBJNAME("Qs", PROC_TAG_QS, 0xFF),
+    OBJNAME("mirror", PROC_MIRROR, 0xFF),
+    OBJNAME("rGate", PROC_Obj_SwallShutter, 0xFF),
+    OBJNAME("l3water", PROC_Obj_Lv3Water, 0xFF),
+    OBJNAME("l3wat02", PROC_Obj_Lv3Water2, 0xFF),
+    OBJNAME("l3watB", PROC_OBJ_LV3WATERB, 0xFF),
+    OBJNAME("szbridg", PROC_Obj_SZbridge, 0xFF),
+    OBJNAME("kjgjs", PROC_Obj_KJgjs, 0xFF),
+    OBJNAME("kjs", PROC_Obj_KJgjs, 0xFF),
+    OBJNAME("candlL3", PROC_Obj_Lv3Candle, 0xFF),
+    OBJNAME("l5icewl", PROC_Obj_IceWall, 0xFF),
+    OBJNAME("Turara", PROC_Obj_Turara, 0xFF),
+    OBJNAME("twGate", PROC_Obj_TwGate, 0xFF),
+    OBJNAME("L4cdlTg", PROC_Tag_Lv4Candle, 0xFF),
+    OBJNAME("L4cddTg", PROC_Tag_Lv4CandleDm, 0xFF),
+    OBJNAME("togeRol", PROC_Obj_Lv6TogeRoll, 0xFF),
+    OBJNAME("l6TogeT", PROC_Obj_Lv6TogeTrap, 0xFF),
+    OBJNAME("Tenbin", PROC_Obj_Lv6Tenbin, 0xFF),
+    OBJNAME("l6Lblk", PROC_Obj_Lv6Lblock, 0xFF),
+    OBJNAME("l6SwGt", PROC_Obj_Lv6SwGate, 0xFF),
+    OBJNAME("l6ChBlk", PROC_Obj_Lv6ChgGate, 0xFF),
+    OBJNAME("l6FuriT", PROC_Obj_Lv6FuriTrap, 0xFF),
+    OBJNAME("KHdesk", PROC_Obj_BarDesk, 0xFF),
+    OBJNAME("Ytaihou", PROC_Obj_Ytaihou, 0xFF),
+    OBJNAME("L4eShut", PROC_Obj_Lv4EdShutter, 0xFF),
+    OBJNAME("pofire", PROC_Obj_poFire, 0xFF),
+    OBJNAME("pofiTg", PROC_Tag_poFire, 0xFF),
+    OBJNAME("poCandl", PROC_Obj_poCandle, 0xFF),
+    OBJNAME("L4Gate", PROC_Obj_Lv4Gate, 0xFF),
+    OBJNAME("L4Pgate", PROC_Obj_Lv4PoGate, 0xFF),
+    OBJNAME("L4SWall", PROC_Obj_Lv4SlideWall, 0xFF),
+    OBJNAME("L4hmato", PROC_Obj_Lv4HsTarget, 0xFF),
+    OBJNAME("propy", PROC_Obj_Lv7PropY, 0xFF),
+    OBJNAME("L7BsGt", PROC_Obj_Lv7BsGate, 0xFF),
+    OBJNAME("optLift", PROC_Obj_Lv8OptiLift, 0xFF),
     OBJNAME("kkiTrap", PROC_Obj_Lv8KekkaiTrap, 0xFF),
-    OBJNAME("L8LiftX", PROC_Obj_Lv8Lift,       0xFF),
-    OBJNAME("swStep",  PROC_Obj_Lv8UdFloor,    0xFF),
-    OBJNAME("L9SwSht", PROC_Obj_Lv9SwShutter,  0xFF),
-    OBJNAME("L5SwIce", PROC_Obj_Lv5SwIce,      0xFF),
-    OBJNAME("glwSph",  PROC_Obj_glowSphere,    0xFF),
-    OBJNAME("MR_Scrw", PROC_Obj_MirrorScrew,   0xFF),
-    OBJNAME("MR_Sand", PROC_Obj_MirrorSand,    0xFF),
-    OBJNAME("MR_Tble", PROC_Obj_MirrorTable,   0xFF),
-    OBJNAME("MR_Chin", PROC_Obj_MirrorChain,   0xFF),
-    OBJNAME("MR_Pole", PROC_Obj_Mirror6Pole,   0xFF),
-    OBJNAME("PPolamp", PROC_PPolamp,           0xFF),
-    OBJNAME("l5hYuka", PROC_Obj_Lv5FBoard,     0xFF),
-    OBJNAME("BYRock",  PROC_BkyRock,           0xFF),
-    OBJNAME("zrDrock", PROC_Obj_zrTurara,      0xFF),
-    OBJNAME("tkrDai",  PROC_Obj_TakaraDai,     0xFF),
-    OBJNAME("Table",   PROC_Obj_Table,         0xFF),
-    OBJNAME("CatDoor", PROC_Obj_CatDoor,       0xFF),
-    OBJNAME("RetTag",  PROC_Tag_RetRoom,       0xFF),
-    OBJNAME("WdStone", PROC_Obj_WindStone,     0xFF),
-    OBJNAME("HwlWara", PROC_Tag_WaraHowl,      0xFF),
-    OBJNAME("SCannon", PROC_Obj_SCannon,       0xFF),
-    OBJNAME("szGate",  PROC_Obj_Lv6SzGate,     0xFF),
-    OBJNAME("onsTaru", PROC_Obj_OnsenTaru,     0xFF),
-    OBJNAME("WStoneF", PROC_Obj_SmWStone,      0xFF),
-    OBJNAME("SCanCrs", PROC_Obj_SCannonCrs,    0xFF),
-    OBJNAME("snwEfTg", PROC_Tag_SnowEff,       0xFF),
-    OBJNAME("tmFire",  PROC_Obj_TimeFire,      0xFF),
-    OBJNAME("L7Prop",  PROC_Obj_Prop,          0xFF),
-    OBJNAME("awaPlar", PROC_Obj_awaPlar,       0xFF),
-    OBJNAME("poTbox",  PROC_Obj_poTbox,        0xFF),
-    OBJNAME("SnwSoup", PROC_Obj_SnowSoup,      0xFF),
-    OBJNAME("Nagaisu", PROC_Obj_Nagaisu,       0xFF),
-    OBJNAME("RCircle", PROC_Obj_RCircle,       0xFF),
-    OBJNAME("L9Chand", PROC_Obj_Chandelier,    0xFF),
-    OBJNAME("L9Pictr", PROC_Obj_Picture,       0xFF),
-    OBJNAME("SmkEmt",  PROC_Tag_SmkEmt,        0xFF),
-    OBJNAME("HFtr",    PROC_Obj_HFtr,          0xFF),
-    OBJNAME("HBarrel", PROC_Obj_HBarrel,       0xFF),
-    OBJNAME("SCanTen", PROC_Obj_SCannonTen,    0xFF),
-    OBJNAME("cstaSw",  PROC_Tag_CstaSw,        0xFF),
-    OBJNAME("l6cstSw", PROC_Tag_Lv6CstaSw,     0xFF),
-    OBJNAME("Hata",    PROC_Obj_Hata,          0xFF),
-    OBJNAME("RmbitSw", PROC_Tag_RmbitSw,       0xFF),
-    OBJNAME("T_Maki",  PROC_Obj_ToaruMaki,     0xFF),
-    OBJNAME("d_act",   PROC_DEMO00,            0xFF),
-    OBJNAME("d_act0",  PROC_DEMO00,            0x00),
-    OBJNAME("d_act1",  PROC_DEMO00,            0x01),
-    OBJNAME("d_act2",  PROC_DEMO00,            0x02),
-    OBJNAME("d_act3",  PROC_DEMO00,            0x03),
-    OBJNAME("d_act4",  PROC_DEMO00,            0x04),
-    OBJNAME("d_act5",  PROC_DEMO00,            0x05),
-    OBJNAME("d_act6",  PROC_DEMO00,            0x06),
-    OBJNAME("d_act7",  PROC_DEMO00,            0x07),
-    OBJNAME("d_act8",  PROC_DEMO00,            0x08),
-    OBJNAME("d_act9",  PROC_DEMO00,            0x09),
-    OBJNAME("d_act10", PROC_DEMO00,            0x0A),
-    OBJNAME("d_act11", PROC_DEMO00,            0x0B),
-    OBJNAME("d_act12", PROC_DEMO00,            0x0C),
-    OBJNAME("d_act13", PROC_DEMO00,            0x0D),
-    OBJNAME("d_act14", PROC_DEMO00,            0x0E),
-    OBJNAME("d_act15", PROC_DEMO00,            0x0F),
-    OBJNAME("d_act16", PROC_DEMO00,            0x10),
-    OBJNAME("d_act17", PROC_DEMO00,            0x11),
-    OBJNAME("d_act18", PROC_DEMO00,            0x12),
-    OBJNAME("d_act19", PROC_DEMO00,            0x13),
-    OBJNAME("d_act20", PROC_DEMO00,            0x14),
-    OBJNAME("d_act21", PROC_DEMO00,            0x15),
-    OBJNAME("d_act22", PROC_DEMO00,            0x16),
-    OBJNAME("d_act23", PROC_DEMO00,            0x17),
-    OBJNAME("d_act24", PROC_DEMO00,            0x18),
-    OBJNAME("d_act25", PROC_DEMO00,            0x19),
-    OBJNAME("d_act26", PROC_DEMO00,            0x1A),
-    OBJNAME("d_act27", PROC_DEMO00,            0x1B),
-    OBJNAME("d_act28", PROC_DEMO00,            0x1C),
-    OBJNAME("d_act29", PROC_DEMO00,            0x1D),
-    OBJNAME("d_act30", PROC_DEMO00,            0x1E),
-    OBJNAME("d_act31", PROC_DEMO00,            0x1F),
-    OBJNAME("TLogo",   PROC_TITLE,             0xFF),
-    OBJNAME("ClearB",  PROC_Obj_Cboard,        0xFF),
-    OBJNAME("Bg",      PROC_BG,                0xFF),
-    OBJNAME("Boom",    PROC_BOOMERANG,         0xFF),
-    OBJNAME("Nbomb",   PROC_NBOMB,             0xFF),
-    OBJNAME("Arrow",   PROC_ARROW,             0xFF),
-    OBJNAME("E_Arrow", PROC_E_ARROW,           0xFF),
-    OBJNAME("Spinner", PROC_SPINNER,           0xFF),
-    OBJNAME("Crod",    PROC_CROD,              0xFF),
-    OBJNAME("Midna",   PROC_MIDNA,             0xFF),
-    OBJNAME("Vrbox",   PROC_VRBOX,             0xFF),
-    OBJNAME("Vrbox2",  PROC_VRBOX2,            0xFF),
-    OBJNAME("mvbg_a",  PROC_BG_OBJ,            0xFF),
-    OBJNAME("burnBox", PROC_Obj_BurnBox,       0xFF),
-    OBJNAME("stnMark", PROC_Obj_StoneMark,     0xFF),
-    OBJNAME("Passer",  PROC_NPC_PASSER,        0xFF),
-    OBJNAME("Passer2", PROC_NPC_PASSER2,       0xFF),
-    OBJNAME("ShopItm", PROC_ShopItem,          0xFF),
-    OBJNAME("E_yd_lf", PROC_E_YD_LEAF,         0xFF),
-    OBJNAME("E_db_lf", PROC_E_DB_LEAF,         0xFF),
-    OBJNAME("E_hb_lf", PROC_E_HB_LEAF,         0xFF),
-    OBJNAME("E_bi_lf", PROC_E_BI_LEAF,         0xFF),
-    OBJNAME("O_Mato",  PROC_Obj_Mato,          0xFF),
-    OBJNAME("O_Flag",  PROC_Obj_Flag,          0xFF),
-    OBJNAME("O_Flag2", PROC_Obj_Flag2,         0xFF),
-    OBJNAME("O_Flag3", PROC_Obj_Flag3,         0xFF),
-    OBJNAME("CRVLH_U", PROC_Obj_CRVLH_UP,      0xFF),
-    OBJNAME("DemoItm", PROC_Demo_Item,         0xFF),
-    OBJNAME("EndCode", PROC_PLAY_SCENE,        0xFF),
+    OBJNAME("L8LiftX", PROC_Obj_Lv8Lift, 0xFF),
+    OBJNAME("swStep", PROC_Obj_Lv8UdFloor, 0xFF),
+    OBJNAME("L9SwSht", PROC_Obj_Lv9SwShutter, 0xFF),
+    OBJNAME("L5SwIce", PROC_Obj_Lv5SwIce, 0xFF),
+    OBJNAME("glwSph", PROC_Obj_glowSphere, 0xFF),
+    OBJNAME("MR_Scrw", PROC_Obj_MirrorScrew, 0xFF),
+    OBJNAME("MR_Sand", PROC_Obj_MirrorSand, 0xFF),
+    OBJNAME("MR_Tble", PROC_Obj_MirrorTable, 0xFF),
+    OBJNAME("MR_Chin", PROC_Obj_MirrorChain, 0xFF),
+    OBJNAME("MR_Pole", PROC_Obj_Mirror6Pole, 0xFF),
+    OBJNAME("PPolamp", PROC_PPolamp, 0xFF),
+    OBJNAME("l5hYuka", PROC_Obj_Lv5FBoard, 0xFF),
+    OBJNAME("BYRock", PROC_BkyRock, 0xFF),
+    OBJNAME("zrDrock", PROC_Obj_zrTurara, 0xFF),
+    OBJNAME("tkrDai", PROC_Obj_TakaraDai, 0xFF),
+    OBJNAME("Table", PROC_Obj_Table, 0xFF),
+    OBJNAME("CatDoor", PROC_Obj_CatDoor, 0xFF),
+    OBJNAME("RetTag", PROC_Tag_RetRoom, 0xFF),
+    OBJNAME("WdStone", PROC_Obj_WindStone, 0xFF),
+    OBJNAME("HwlWara", PROC_Tag_WaraHowl, 0xFF),
+    OBJNAME("SCannon", PROC_Obj_SCannon, 0xFF),
+    OBJNAME("szGate", PROC_Obj_Lv6SzGate, 0xFF),
+    OBJNAME("onsTaru", PROC_Obj_OnsenTaru, 0xFF),
+    OBJNAME("WStoneF", PROC_Obj_SmWStone, 0xFF),
+    OBJNAME("SCanCrs", PROC_Obj_SCannonCrs, 0xFF),
+    OBJNAME("snwEfTg", PROC_Tag_SnowEff, 0xFF),
+    OBJNAME("tmFire", PROC_Obj_TimeFire, 0xFF),
+    OBJNAME("L7Prop", PROC_Obj_Prop, 0xFF),
+    OBJNAME("awaPlar", PROC_Obj_awaPlar, 0xFF),
+    OBJNAME("poTbox", PROC_Obj_poTbox, 0xFF),
+    OBJNAME("SnwSoup", PROC_Obj_SnowSoup, 0xFF),
+    OBJNAME("Nagaisu", PROC_Obj_Nagaisu, 0xFF),
+    OBJNAME("RCircle", PROC_Obj_RCircle, 0xFF),
+    OBJNAME("L9Chand", PROC_Obj_Chandelier, 0xFF),
+    OBJNAME("L9Pictr", PROC_Obj_Picture, 0xFF),
+    OBJNAME("SmkEmt", PROC_Tag_SmkEmt, 0xFF),
+    OBJNAME("HFtr", PROC_Obj_HFtr, 0xFF),
+    OBJNAME("HBarrel", PROC_Obj_HBarrel, 0xFF),
+    OBJNAME("SCanTen", PROC_Obj_SCannonTen, 0xFF),
+    OBJNAME("cstaSw", PROC_Tag_CstaSw, 0xFF),
+    OBJNAME("l6cstSw", PROC_Tag_Lv6CstaSw, 0xFF),
+    OBJNAME("Hata", PROC_Obj_Hata, 0xFF),
+    OBJNAME("RmbitSw", PROC_Tag_RmbitSw, 0xFF),
+    OBJNAME("T_Maki", PROC_Obj_ToaruMaki, 0xFF),
+    OBJNAME("d_act", PROC_DEMO00, 0xFF),
+    OBJNAME("d_act0", PROC_DEMO00, 0x00),
+    OBJNAME("d_act1", PROC_DEMO00, 0x01),
+    OBJNAME("d_act2", PROC_DEMO00, 0x02),
+    OBJNAME("d_act3", PROC_DEMO00, 0x03),
+    OBJNAME("d_act4", PROC_DEMO00, 0x04),
+    OBJNAME("d_act5", PROC_DEMO00, 0x05),
+    OBJNAME("d_act6", PROC_DEMO00, 0x06),
+    OBJNAME("d_act7", PROC_DEMO00, 0x07),
+    OBJNAME("d_act8", PROC_DEMO00, 0x08),
+    OBJNAME("d_act9", PROC_DEMO00, 0x09),
+    OBJNAME("d_act10", PROC_DEMO00, 0x0A),
+    OBJNAME("d_act11", PROC_DEMO00, 0x0B),
+    OBJNAME("d_act12", PROC_DEMO00, 0x0C),
+    OBJNAME("d_act13", PROC_DEMO00, 0x0D),
+    OBJNAME("d_act14", PROC_DEMO00, 0x0E),
+    OBJNAME("d_act15", PROC_DEMO00, 0x0F),
+    OBJNAME("d_act16", PROC_DEMO00, 0x10),
+    OBJNAME("d_act17", PROC_DEMO00, 0x11),
+    OBJNAME("d_act18", PROC_DEMO00, 0x12),
+    OBJNAME("d_act19", PROC_DEMO00, 0x13),
+    OBJNAME("d_act20", PROC_DEMO00, 0x14),
+    OBJNAME("d_act21", PROC_DEMO00, 0x15),
+    OBJNAME("d_act22", PROC_DEMO00, 0x16),
+    OBJNAME("d_act23", PROC_DEMO00, 0x17),
+    OBJNAME("d_act24", PROC_DEMO00, 0x18),
+    OBJNAME("d_act25", PROC_DEMO00, 0x19),
+    OBJNAME("d_act26", PROC_DEMO00, 0x1A),
+    OBJNAME("d_act27", PROC_DEMO00, 0x1B),
+    OBJNAME("d_act28", PROC_DEMO00, 0x1C),
+    OBJNAME("d_act29", PROC_DEMO00, 0x1D),
+    OBJNAME("d_act30", PROC_DEMO00, 0x1E),
+    OBJNAME("d_act31", PROC_DEMO00, 0x1F),
+    OBJNAME("TLogo", PROC_TITLE, 0xFF),
+    OBJNAME("ClearB", PROC_Obj_Cboard, 0xFF),
+    OBJNAME("Bg", PROC_BG, 0xFF),
+    OBJNAME("Boom", PROC_BOOMERANG, 0xFF),
+    OBJNAME("Nbomb", PROC_NBOMB, 0xFF),
+    OBJNAME("Arrow", PROC_ARROW, 0xFF),
+    OBJNAME("E_Arrow", PROC_E_ARROW, 0xFF),
+    OBJNAME("Spinner", PROC_SPINNER, 0xFF),
+    OBJNAME("Crod", PROC_CROD, 0xFF),
+    OBJNAME("Midna", PROC_MIDNA, 0xFF),
+    OBJNAME("Vrbox", PROC_VRBOX, 0xFF),
+    OBJNAME("Vrbox2", PROC_VRBOX2, 0xFF),
+    OBJNAME("mvbg_a", PROC_BG_OBJ, 0xFF),
+    OBJNAME("burnBox", PROC_Obj_BurnBox, 0xFF),
+    OBJNAME("stnMark", PROC_Obj_StoneMark, 0xFF),
+    OBJNAME("Passer", PROC_NPC_PASSER, 0xFF),
+    OBJNAME("Passer2", PROC_NPC_PASSER2, 0xFF),
+    OBJNAME("ShopItm", PROC_ShopItem, 0xFF),
+    OBJNAME("E_yd_lf", PROC_E_YD_LEAF, 0xFF),
+    OBJNAME("E_db_lf", PROC_E_DB_LEAF, 0xFF),
+    OBJNAME("E_hb_lf", PROC_E_HB_LEAF, 0xFF),
+    OBJNAME("E_bi_lf", PROC_E_BI_LEAF, 0xFF),
+    OBJNAME("O_Mato", PROC_Obj_Mato, 0xFF),
+    OBJNAME("O_Flag", PROC_Obj_Flag, 0xFF),
+    OBJNAME("O_Flag2", PROC_Obj_Flag2, 0xFF),
+    OBJNAME("O_Flag3", PROC_Obj_Flag3, 0xFF),
+    OBJNAME("CRVLH_U", PROC_Obj_CRVLH_UP, 0xFF),
+    OBJNAME("DemoItm", PROC_Demo_Item, 0xFF),
+    OBJNAME("EndCode", PROC_PLAY_SCENE, 0xFF),
 };
 
 /* 803A65CC-803A65FC -00001 0030+00 1/1 0/0 0/0 .data            l_roomFuncTable$5052 */
@@ -2272,11 +2273,10 @@ asm u8 dStage_stagInfo_GetParticleNo(stage_stag_info_class* p_info, int layer) {
 #endif
 
 /* 80025744-8002582C 020084 00E8+00 1/0 0/0 0/0 .text dStage_stagInfoInit__FP11dStage_dt_cPviPv */
-static int dStage_stagInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum,
-                                   void* param_3) {
+static int dStage_stagInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, void* param_3) {
     dStage_nodeHeader* stag_info = (dStage_nodeHeader*)(i_data);
     stageDt->setStagInfo((stage_stag_info_class*)stag_info->m_offset);
-    
+
     if (!dStage_isBossStage(stageDt)) {
         dComIfG_deleteStageRes("Xtg_00");
         dComIfGp_resetOldMulti();
diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp
index bcf72b3f7a..25cf1ff6b8 100644
--- a/src/d/kankyo/d_kankyo.cpp
+++ b/src/d/kankyo/d_kankyo.cpp
@@ -1147,12 +1147,10 @@ static asm void dungeonlight_init() {
 /* 8019EAA0-8019EBD0 1993E0 0130+00 1/1 0/0 0/0 .text            undwater_init__Fv */
 static void undwater_init() {
     J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes("Always", 0x1D);
-    g_env_light.field_0xf38 =
-        mDoExt_createSolidHeapFromGameToCurrent(0x600, 0x20);
+    g_env_light.field_0xf38 = mDoExt_createSolidHeapFromGameToCurrent(0x600, 0x20);
 
     if (g_env_light.field_0xf38 != NULL) {
-        g_env_light.field_0xf30 =
-            mDoExt_J3DModel__create(modelData2, 0x80000, 0x11020202);
+        g_env_light.field_0xf30 = mDoExt_J3DModel__create(modelData2, 0x80000, 0x11020202);
 
         if (g_env_light.field_0xf30 != NULL) {
             g_env_light.field_0x105c = new mDoExt_btkAnm();
@@ -1160,8 +1158,7 @@ static void undwater_init() {
             if (g_env_light.field_0x105c != NULL) {
                 J3DAnmTextureSRTKey* key =
                     (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", 0x3C);
-                g_env_light
-                    .field_0x105c->init(modelData2, key, 1, 2, lit_4505, 0, -1);
+                g_env_light.field_0x105c->init(modelData2, key, 1, 2, lit_4505, 0, -1);
             }
         }
         mDoExt_restoreCurrentHeap();
diff --git a/src/m_Do/m_Do_DVDError.cpp b/src/m_Do/m_Do_DVDError.cpp
index 64b2811856..63ae92cb55 100644
--- a/src/m_Do/m_Do_DVDError.cpp
+++ b/src/m_Do/m_Do_DVDError.cpp
@@ -4,11 +4,11 @@
 //
 
 #include "m_Do/m_Do_DVDError.h"
-#include "m_Do/m_Do_dvd_thread.h"
-#include "m_Do/m_Do_reset.h"
-#include "m_Do/m_Do_ext.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "m_Do/m_Do_dvd_thread.h"
+#include "m_Do/m_Do_ext.h"
+#include "m_Do/m_Do_reset.h"
 
 //
 // Declarations:
@@ -34,7 +34,8 @@ void mDoDvdErr_ThdInit() {
         OSThread* curThread = OSGetCurrentThread();
         s32 priority = OSGetThreadPriority(curThread);
 
-        OSCreateThread(&DvdErr_thread, mDoDvdErr_Watch, NULL, DvdErr_stack + sizeof(DvdErr_stack), sizeof(DvdErr_stack), priority - 3, 1);
+        OSCreateThread(&DvdErr_thread, mDoDvdErr_Watch, NULL, DvdErr_stack + sizeof(DvdErr_stack),
+                       sizeof(DvdErr_stack), priority - 3, 1);
         OSResumeThread(&DvdErr_thread);
         OSCreateAlarm(&Alarm);
         OSSetPeriodicAlarm(&Alarm, time, OS_BUS_CLOCK / 4, AlarmHandler);
diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp
index e1996726ef..7b4c12c94b 100644
--- a/src/m_Do/m_Do_Reset.cpp
+++ b/src/m_Do/m_Do_Reset.cpp
@@ -4,17 +4,17 @@
 //
 
 #include "m_Do/m_Do_Reset.h"
-#include "m_Do/m_Do_DVDError.h"
-#include "m_Do/m_Do_Audio.h"
-#include "m_Do/m_Do_MemCard.h"
-#include "dol2asm.h"
-#include "dolphin/gx/GX.h"
-#include "dolphin/types.h"
+#include "JSystem/JAudio2/JASDvdThread.h"
 #include "JSystem/JUtility/JUTGamePad.h"
 #include "JSystem/JUtility/JUTVideo.h"
 #include "JSystem/JUtility/JUTXfb.h"
-#include "JSystem/JAudio2/JASDvdThread.h"
 #include "SSystem/SComponent/c_API_controller_pad.h"
+#include "dol2asm.h"
+#include "dolphin/gx/GX.h"
+#include "dolphin/types.h"
+#include "m_Do/m_Do_Audio.h"
+#include "m_Do/m_Do_DVDError.h"
+#include "m_Do/m_Do_MemCard.h"
 
 //
 // Forward References:
diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp
index 2ae9e42e30..d2a678d2ac 100644
--- a/src/m_Do/m_Do_audio.cpp
+++ b/src/m_Do/m_Do_audio.cpp
@@ -4,11 +4,11 @@
 //
 
 #include "m_Do/m_Do_audio.h"
+#include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_Reset.h"
 #include "m_Do/m_Do_dvd_thread.h"
-#include "d/com/d_com_inf_game.h"
 
 //
 // Types:
@@ -156,7 +156,8 @@ static void mDoAud_Create() {
     }
 
     if (l_arcCommand == NULL) {
-        l_arcCommand = mDoDvdThd_mountXArchive_c::create("/Audiores/Seqs/Z2SoundSeqs.arc", 0, JKRArchive::MOUNT_DVD, NULL);
+        l_arcCommand = mDoDvdThd_mountXArchive_c::create("/Audiores/Seqs/Z2SoundSeqs.arc", 0,
+                                                         JKRArchive::MOUNT_DVD, NULL);
 
         if (l_arcCommand == NULL) {
             return;
@@ -166,7 +167,9 @@ static void mDoAud_Create() {
     if (l_affCommand->sync() && l_arcCommand->sync()) {
         if (g_mDoAud_audioHeap != NULL) {
             s32 groupID = JKRHeap::sCurrentHeap->changeGroupID(5);
-            (*(mDoAud_zelAudio_c*)g_mDoAud_zelAudio).mAudioMgr.init(g_mDoAud_audioHeap, 0xA00000, l_affCommand->getMemAddress(), l_arcCommand->getArchive());
+            (*(mDoAud_zelAudio_c*)g_mDoAud_zelAudio)
+                .mAudioMgr.init(g_mDoAud_audioHeap, 0xA00000, l_affCommand->getMemAddress(),
+                                l_arcCommand->getArchive());
             JKRHeap::sCurrentHeap->changeGroupID(groupID);
             g_mDoAud_audioHeap->adjustSize();
         } else {
@@ -174,7 +177,8 @@ static void mDoAud_Create() {
             OSReport_Error("ヒープ確保失敗につきオーディオ初期化できません\n");
         }
 
-        (*(mDoAud_zelAudio_c*)g_mDoAud_zelAudio).mAudioMgr.mStatusMgr.setEventBit(dComIfGs_getPEventBit());
+        (*(mDoAud_zelAudio_c*)g_mDoAud_zelAudio)
+            .mAudioMgr.mStatusMgr.setEventBit(dComIfGs_getPEventBit());
         (*(mDoAud_zelAudio_c*)g_mDoAud_zelAudio).reset();
 
         u32 soundMode = OSGetSoundMode();
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index 5751726721..0bb3866ef9 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -3337,7 +3337,8 @@ extern "C" asm void func_80015034(void* _this, Vec const& param_0, f32 const (&p
 /* 8001505C-80015084 00F99C 0028+00 7/0 0/0 0/0 .text
  * init__73J3DMtxCalcNoAnm<27J3DMtxCalcCalcTransformMaya,24J3DMtxCalcJ3DSysInitMaya>FRC3VecRA3_A4_Cf
  */
-void J3DMtxCalcNoAnm<J3DMtxCalcCalcTransformMaya, J3DMtxCalcJ3DSysInitMaya>::init(Vec const& param_0, f32 const (&param_1)[3][4]) {
+void J3DMtxCalcNoAnm<J3DMtxCalcCalcTransformMaya, J3DMtxCalcJ3DSysInitMaya>::init(
+    Vec const& param_0, f32 const (&param_1)[3][4]) {
     J3DMtxCalcJ3DSysInitMaya::init(param_0, param_1);
 }
 
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index 86f291d94c..46981db166 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "m_Do/m_Do_main.h"
+#include "DynamicLink.h"
 #include "JSystem/JFramework/JFWSystem.h"
 #include "JSystem/JKernel/JKRAram.h"
 #include "JSystem/JUtility/JUTAssert.h"
@@ -18,7 +19,6 @@
 #include "m_Do/m_Do_dvd_thread.h"
 #include "m_Do/m_Do_graphic.h"
 #include "m_Do/m_Do_machine.h"
-#include "DynamicLink.h"
 
 //
 // Forward References:
@@ -389,7 +389,8 @@ bool Debug_console(u32 i_padNo) {
             console_scroll_init = 1;
         }
 
-        if (mDoCPd_c::getTrig(i_padNo) & CButton::Z && !(mDoCPd_c::getHold(i_padNo) & ~CButton::Z)) {
+        if (mDoCPd_c::getTrig(i_padNo) & CButton::Z &&
+            !(mDoCPd_c::getHold(i_padNo) & ~CButton::Z)) {
             console->setVisible(console->isVisible() == false);
             JUTAssertion::setMessageCount(0);
         }
@@ -440,9 +441,8 @@ bool Debug_console(u32 i_padNo) {
                 JUTReport(30, 390, 1, "Press X+Y+START to CLEAR console.");
                 JUTReport(30, 400, 1, "3DStick UP/Down to scroll");
                 JUTReport(30, 410, 1, "Press A to output terminal from console.");
-                JUTReport(30, 420, 1, "SCROLL：%3d %3d %3d Output=%1x",
-                          console->getLineOffset(), console->getPositionX(),
-                          console->getPositionY(), console->getOutput());
+                JUTReport(30, 420, 1, "SCROLL：%3d %3d %3d Output=%1x", console->getLineOffset(),
+                          console->getPositionX(), console->getPositionY(), console->getOutput());
             } else {
                 u32 pressButtons = mDoCPd_c::getTrig(i_padNo);
 
@@ -527,7 +527,8 @@ static void debug() {
         if (struct_80450B18) {
             if ((mDoCPd_c::getGamePad(PAD_3)->getButton() & ~CButton::Z) == CButton::L &&
                 mDoCPd_c::getGamePad(PAD_3)->testTrigger(CButton::Z)) {
-                mDoMain::mHeapBriefType < 5 ? mDoMain::mHeapBriefType++ : mDoMain::mHeapBriefType = 1;
+                mDoMain::mHeapBriefType < 5 ? mDoMain::mHeapBriefType++ :
+                                              mDoMain::mHeapBriefType = 1;
             }
 
             debugDisplay();