setFadeColor fix, some d_msg_flow functions (#339)

11 files changed, 0 insertions, 410 deletions

diff --git a/asm/d/menu/d_menu_window/dMw_fade_in__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_fade_in__5dMw_cFv.s
deleted file mode 100644
index 967ddd324a..0000000000
--- a/asm/d/menu/d_menu_window/dMw_fade_in__5dMw_cFv.s
+++ /dev/null
@@ -1,30 +0,0 @@
-lbl_801FCE78:
-/* 801FCE78  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 801FCE7C  7C 08 02 A6 */	mflr r0
-/* 801FCE80  90 01 00 14 */	stw r0, 0x14(r1)
-/* 801FCE84  80 6D 8C 40 */	lwz r3, sManager__10JFWDisplay(r13)
-/* 801FCE88  80 63 00 04 */	lwz r3, 4(r3)
-/* 801FCE8C  28 03 00 00 */	cmplwi r3, 0
-/* 801FCE90  41 82 00 18 */	beq lbl_801FCEA8
-/* 801FCE94  38 80 00 0D */	li r4, 0xd
-/* 801FCE98  81 83 00 00 */	lwz r12, 0(r3)
-/* 801FCE9C  81 8C 00 0C */	lwz r12, 0xc(r12)
-/* 801FCEA0  7D 89 03 A6 */	mtctr r12
-/* 801FCEA4  4E 80 04 21 */	bctrl 
-lbl_801FCEA8:
-/* 801FCEA8  80 0D 80 84 */	lwz r0, g_blackColor(r13)
-/* 801FCEAC  90 01 00 0C */	stw r0, 0xc(r1)
-/* 801FCEB0  90 01 00 08 */	stw r0, 8(r1)
-/* 801FCEB4  80 6D 86 48 */	lwz r3, mFader__13mDoGph_gInf_c(r13)
-/* 801FCEB8  88 01 00 08 */	lbz r0, 8(r1)
-/* 801FCEBC  98 03 00 0C */	stb r0, 0xc(r3)
-/* 801FCEC0  88 01 00 09 */	lbz r0, 9(r1)
-/* 801FCEC4  98 03 00 0D */	stb r0, 0xd(r3)
-/* 801FCEC8  88 01 00 0A */	lbz r0, 0xa(r1)
-/* 801FCECC  98 03 00 0E */	stb r0, 0xe(r3)
-/* 801FCED0  88 01 00 0B */	lbz r0, 0xb(r1)
-/* 801FCED4  98 03 00 0F */	stb r0, 0xf(r3)
-/* 801FCED8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 801FCEDC  7C 08 03 A6 */	mtlr r0
-/* 801FCEE0  38 21 00 10 */	addi r1, r1, 0x10
-/* 801FCEE4  4E 80 00 20 */	blr 
diff --git a/asm/d/menu/d_menu_window/dMw_fade_out__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_fade_out__5dMw_cFv.s
deleted file mode 100644
index f9efd592f0..0000000000
--- a/asm/d/menu/d_menu_window/dMw_fade_out__5dMw_cFv.s
+++ /dev/null
@@ -1,30 +0,0 @@
-lbl_801FCE08:
-/* 801FCE08  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 801FCE0C  7C 08 02 A6 */	mflr r0
-/* 801FCE10  90 01 00 14 */	stw r0, 0x14(r1)
-/* 801FCE14  80 6D 8C 40 */	lwz r3, sManager__10JFWDisplay(r13)
-/* 801FCE18  80 63 00 04 */	lwz r3, 4(r3)
-/* 801FCE1C  28 03 00 00 */	cmplwi r3, 0
-/* 801FCE20  41 82 00 18 */	beq lbl_801FCE38
-/* 801FCE24  38 80 00 0D */	li r4, 0xd
-/* 801FCE28  81 83 00 00 */	lwz r12, 0(r3)
-/* 801FCE2C  81 8C 00 10 */	lwz r12, 0x10(r12)
-/* 801FCE30  7D 89 03 A6 */	mtctr r12
-/* 801FCE34  4E 80 04 21 */	bctrl 
-lbl_801FCE38:
-/* 801FCE38  80 0D 80 84 */	lwz r0, g_blackColor(r13)
-/* 801FCE3C  90 01 00 0C */	stw r0, 0xc(r1)
-/* 801FCE40  90 01 00 08 */	stw r0, 8(r1)
-/* 801FCE44  80 6D 86 48 */	lwz r3, mFader__13mDoGph_gInf_c(r13)
-/* 801FCE48  88 01 00 08 */	lbz r0, 8(r1)
-/* 801FCE4C  98 03 00 0C */	stb r0, 0xc(r3)
-/* 801FCE50  88 01 00 09 */	lbz r0, 9(r1)
-/* 801FCE54  98 03 00 0D */	stb r0, 0xd(r3)
-/* 801FCE58  88 01 00 0A */	lbz r0, 0xa(r1)
-/* 801FCE5C  98 03 00 0E */	stb r0, 0xe(r3)
-/* 801FCE60  88 01 00 0B */	lbz r0, 0xb(r1)
-/* 801FCE64  98 03 00 0F */	stb r0, 0xf(r3)
-/* 801FCE68  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 801FCE6C  7C 08 03 A6 */	mtlr r0
-/* 801FCE70  38 21 00 10 */	addi r1, r1, 0x10
-/* 801FCE74  4E 80 00 20 */	blr 
diff --git a/asm/d/msg/d_msg_flow/func_8024DAB0.s b/asm/d/msg/d_msg_flow/func_8024DAB0.s
deleted file mode 100644
index e0a6da14f8..0000000000
--- a/asm/d/msg/d_msg_flow/func_8024DAB0.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_8024DAB0:
-/* 8024DAB0  80 83 00 00 */	lwz r4, 0(r3)
-/* 8024DAB4  2C 04 00 00 */	cmpwi r4, 0
-/* 8024DAB8  41 82 00 0C */	beq lbl_8024DAC4
-/* 8024DABC  38 04 FF FF */	addi r0, r4, -1
-/* 8024DAC0  90 03 00 00 */	stw r0, 0(r3)
-lbl_8024DAC4:
-/* 8024DAC4  80 63 00 00 */	lwz r3, 0(r3)
-/* 8024DAC8  4E 80 00 20 */	blr 
diff --git a/asm/d/msg/d_msg_flow/query039__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query039__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
deleted file mode 100644
index aca83101cc..0000000000
--- a/asm/d/msg/d_msg_flow/query039__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
+++ /dev/null
@@ -1,40 +0,0 @@
-lbl_8024BDB0:
-/* 8024BDB0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8024BDB4  7C 08 02 A6 */	mflr r0
-/* 8024BDB8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8024BDBC  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 8024BDC0  93 C1 00 08 */	stw r30, 8(r1)
-/* 8024BDC4  A3 C4 00 04 */	lhz r30, 4(r4)
-/* 8024BDC8  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8024BDCC  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8024BDD0  38 63 0D D8 */	addi r3, r3, 0xdd8
-/* 8024BDD4  3C 80 00 01 */	lis r4, 0x0001 /* 0x0000FBFF@ha */
-/* 8024BDD8  38 84 FB FF */	addi r4, r4, 0xFBFF /* 0x0000FBFF@l */
-/* 8024BDDC  4B DE 8C 29 */	bl getEventReg__11dSv_event_cCFUs
-/* 8024BDE0  7C 64 1B 78 */	mr r4, r3
-/* 8024BDE4  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8024BDE8  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8024BDEC  38 63 00 EC */	addi r3, r3, 0xec
-/* 8024BDF0  38 04 FF FF */	addi r0, r4, -1
-/* 8024BDF4  54 04 06 3E */	clrlwi r4, r0, 0x18
-/* 8024BDF8  4B DE 81 85 */	bl getBombNum__24dSv_player_item_record_cCFUc
-/* 8024BDFC  7C 7F 1B 78 */	mr r31, r3
-/* 8024BE00  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8024BE04  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8024BE08  38 63 00 F8 */	addi r3, r3, 0xf8
-/* 8024BE0C  38 80 00 70 */	li r4, 0x70
-/* 8024BE10  4B DE 82 E9 */	bl getBombNum__21dSv_player_item_max_cCFUc
-/* 8024BE14  54 65 06 3E */	clrlwi r5, r3, 0x18
-/* 8024BE18  57 E0 06 3E */	clrlwi r0, r31, 0x18
-/* 8024BE1C  7C 00 F2 14 */	add r0, r0, r30
-/* 8024BE20  7C A4 FE 70 */	srawi r4, r5, 0x1f
-/* 8024BE24  54 03 0F FE */	srwi r3, r0, 0x1f
-/* 8024BE28  7C 00 28 10 */	subfc r0, r0, r5
-/* 8024BE2C  7C 04 19 14 */	adde r0, r4, r3
-/* 8024BE30  54 03 06 3E */	clrlwi r3, r0, 0x18
-/* 8024BE34  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 8024BE38  83 C1 00 08 */	lwz r30, 8(r1)
-/* 8024BE3C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8024BE40  7C 08 03 A6 */	mtlr r0
-/* 8024BE44  38 21 00 10 */	addi r1, r1, 0x10
-/* 8024BE48  4E 80 00 20 */	blr 
diff --git a/asm/d/msg/d_msg_flow/query040__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query040__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
deleted file mode 100644
index 3f50c7ea65..0000000000
--- a/asm/d/msg/d_msg_flow/query040__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
+++ /dev/null
@@ -1,72 +0,0 @@
-lbl_8024BE4C:
-/* 8024BE4C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8024BE50  7C 08 02 A6 */	mflr r0
-/* 8024BE54  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8024BE58  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 8024BE5C  93 C1 00 08 */	stw r30, 8(r1)
-/* 8024BE60  A0 64 00 04 */	lhz r3, 4(r4)
-/* 8024BE64  2C 03 00 01 */	cmpwi r3, 1
-/* 8024BE68  41 80 00 18 */	blt lbl_8024BE80
-/* 8024BE6C  2C 03 00 04 */	cmpwi r3, 4
-/* 8024BE70  40 80 00 10 */	bge lbl_8024BE80
-/* 8024BE74  38 03 FF FF */	addi r0, r3, -1
-/* 8024BE78  54 1E 06 3E */	clrlwi r30, r0, 0x18
-/* 8024BE7C  48 00 00 48 */	b lbl_8024BEC4
-lbl_8024BE80:
-/* 8024BE80  2C 03 00 04 */	cmpwi r3, 4
-/* 8024BE84  40 82 00 20 */	bne lbl_8024BEA4
-/* 8024BE88  3C 60 80 43 */	lis r3, g_meter2_info@ha /* 0x80430188@ha */
-/* 8024BE8C  38 63 01 88 */	addi r3, r3, g_meter2_info@l /* 0x80430188@l */
-/* 8024BE90  88 03 00 DC */	lbz r0, 0xdc(r3)
-/* 8024BE94  28 00 00 FF */	cmplwi r0, 0xff
-/* 8024BE98  41 82 00 2C */	beq lbl_8024BEC4
-/* 8024BE9C  7C 1E 03 78 */	mr r30, r0
-/* 8024BEA0  48 00 00 24 */	b lbl_8024BEC4
-lbl_8024BEA4:
-/* 8024BEA4  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8024BEA8  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8024BEAC  38 63 0D D8 */	addi r3, r3, 0xdd8
-/* 8024BEB0  3C 80 00 01 */	lis r4, 0x0001 /* 0x0000FBFF@ha */
-/* 8024BEB4  38 84 FB FF */	addi r4, r4, 0xFBFF /* 0x0000FBFF@l */
-/* 8024BEB8  4B DE 8B 4D */	bl getEventReg__11dSv_event_cCFUs
-/* 8024BEBC  38 03 FF FF */	addi r0, r3, -1
-/* 8024BEC0  54 1E 06 3E */	clrlwi r30, r0, 0x18
-lbl_8024BEC4:
-/* 8024BEC4  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8024BEC8  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8024BECC  38 63 00 EC */	addi r3, r3, 0xec
-/* 8024BED0  7F C4 F3 78 */	mr r4, r30
-/* 8024BED4  4B DE 80 A9 */	bl getBombNum__24dSv_player_item_record_cCFUc
-/* 8024BED8  7C 7F 1B 78 */	mr r31, r3
-/* 8024BEDC  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8024BEE0  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8024BEE4  38 63 00 9C */	addi r3, r3, 0x9c
-/* 8024BEE8  38 1E 00 0F */	addi r0, r30, 0xf
-/* 8024BEEC  54 04 06 3E */	clrlwi r4, r0, 0x18
-/* 8024BEF0  38 A0 00 00 */	li r5, 0
-/* 8024BEF4  4B DE 71 3D */	bl getItem__17dSv_player_item_cCFib
-/* 8024BEF8  7C 64 1B 78 */	mr r4, r3
-/* 8024BEFC  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8024BF00  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8024BF04  38 63 00 F8 */	addi r3, r3, 0xf8
-/* 8024BF08  4B DE 81 F1 */	bl getBombNum__21dSv_player_item_max_cCFUc
-/* 8024BF0C  57 E4 06 3F */	clrlwi. r4, r31, 0x18
-/* 8024BF10  40 82 00 0C */	bne lbl_8024BF1C
-/* 8024BF14  38 00 00 00 */	li r0, 0
-/* 8024BF18  48 00 00 1C */	b lbl_8024BF34
-lbl_8024BF1C:
-/* 8024BF1C  54 60 06 3E */	clrlwi r0, r3, 0x18
-/* 8024BF20  7C 04 00 40 */	cmplw r4, r0
-/* 8024BF24  41 80 00 0C */	blt lbl_8024BF30
-/* 8024BF28  38 00 00 02 */	li r0, 2
-/* 8024BF2C  48 00 00 08 */	b lbl_8024BF34
-lbl_8024BF30:
-/* 8024BF30  38 00 00 01 */	li r0, 1
-lbl_8024BF34:
-/* 8024BF34  54 03 06 3E */	clrlwi r3, r0, 0x18
-/* 8024BF38  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 8024BF3C  83 C1 00 08 */	lwz r30, 8(r1)
-/* 8024BF40  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8024BF44  7C 08 03 A6 */	mtlr r0
-/* 8024BF48  38 21 00 10 */	addi r1, r1, 0x10
-/* 8024BF4C  4E 80 00 20 */	blr 
diff --git a/asm/d/msg/d_msg_flow/query041__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query041__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
deleted file mode 100644
index 7f2a6dbe09..0000000000
--- a/asm/d/msg/d_msg_flow/query041__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
+++ /dev/null
@@ -1,40 +0,0 @@
-lbl_8024BF50:
-/* 8024BF50  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8024BF54  7C 08 02 A6 */	mflr r0
-/* 8024BF58  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8024BF5C  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 8024BF60  93 C1 00 08 */	stw r30, 8(r1)
-/* 8024BF64  A3 C4 00 04 */	lhz r30, 4(r4)
-/* 8024BF68  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8024BF6C  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8024BF70  38 63 0D D8 */	addi r3, r3, 0xdd8
-/* 8024BF74  3C 80 00 01 */	lis r4, 0x0001 /* 0x0000FBFF@ha */
-/* 8024BF78  38 84 FB FF */	addi r4, r4, 0xFBFF /* 0x0000FBFF@l */
-/* 8024BF7C  4B DE 8A 89 */	bl getEventReg__11dSv_event_cCFUs
-/* 8024BF80  7C 64 1B 78 */	mr r4, r3
-/* 8024BF84  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8024BF88  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8024BF8C  38 63 00 EC */	addi r3, r3, 0xec
-/* 8024BF90  38 04 FF FF */	addi r0, r4, -1
-/* 8024BF94  54 04 06 3E */	clrlwi r4, r0, 0x18
-/* 8024BF98  4B DE 7F E5 */	bl getBombNum__24dSv_player_item_record_cCFUc
-/* 8024BF9C  7C 7F 1B 78 */	mr r31, r3
-/* 8024BFA0  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8024BFA4  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8024BFA8  38 63 00 F8 */	addi r3, r3, 0xf8
-/* 8024BFAC  38 80 00 71 */	li r4, 0x71
-/* 8024BFB0  4B DE 81 49 */	bl getBombNum__21dSv_player_item_max_cCFUc
-/* 8024BFB4  54 65 06 3E */	clrlwi r5, r3, 0x18
-/* 8024BFB8  57 E0 06 3E */	clrlwi r0, r31, 0x18
-/* 8024BFBC  7C 00 F2 14 */	add r0, r0, r30
-/* 8024BFC0  7C A4 FE 70 */	srawi r4, r5, 0x1f
-/* 8024BFC4  54 03 0F FE */	srwi r3, r0, 0x1f
-/* 8024BFC8  7C 00 28 10 */	subfc r0, r0, r5
-/* 8024BFCC  7C 04 19 14 */	adde r0, r4, r3
-/* 8024BFD0  54 03 06 3E */	clrlwi r3, r0, 0x18
-/* 8024BFD4  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 8024BFD8  83 C1 00 08 */	lwz r30, 8(r1)
-/* 8024BFDC  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8024BFE0  7C 08 03 A6 */	mtlr r0
-/* 8024BFE4  38 21 00 10 */	addi r1, r1, 0x10
-/* 8024BFE8  4E 80 00 20 */	blr 
diff --git a/asm/d/msg/d_msg_flow/query045__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query045__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
deleted file mode 100644
index 5baa0870ee..0000000000
--- a/asm/d/msg/d_msg_flow/query045__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
+++ /dev/null
@@ -1,41 +0,0 @@
-lbl_8024C18C:
-/* 8024C18C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8024C190  7C 08 02 A6 */	mflr r0
-/* 8024C194  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8024C198  4B DE 22 91 */	bl dComIfGs_checkGetInsectNum__Fv
-/* 8024C19C  38 80 00 00 */	li r4, 0
-/* 8024C1A0  54 60 06 3F */	clrlwi. r0, r3, 0x18
-/* 8024C1A4  40 82 00 0C */	bne lbl_8024C1B0
-/* 8024C1A8  38 80 00 00 */	li r4, 0
-/* 8024C1AC  48 00 00 58 */	b lbl_8024C204
-lbl_8024C1B0:
-/* 8024C1B0  28 00 00 01 */	cmplwi r0, 1
-/* 8024C1B4  41 80 00 14 */	blt lbl_8024C1C8
-/* 8024C1B8  28 00 00 0B */	cmplwi r0, 0xb
-/* 8024C1BC  41 81 00 0C */	bgt lbl_8024C1C8
-/* 8024C1C0  38 80 00 01 */	li r4, 1
-/* 8024C1C4  48 00 00 40 */	b lbl_8024C204
-lbl_8024C1C8:
-/* 8024C1C8  54 60 06 3E */	clrlwi r0, r3, 0x18
-/* 8024C1CC  28 00 00 0C */	cmplwi r0, 0xc
-/* 8024C1D0  41 80 00 14 */	blt lbl_8024C1E4
-/* 8024C1D4  28 00 00 16 */	cmplwi r0, 0x16
-/* 8024C1D8  41 81 00 0C */	bgt lbl_8024C1E4
-/* 8024C1DC  38 80 00 02 */	li r4, 2
-/* 8024C1E0  48 00 00 24 */	b lbl_8024C204
-lbl_8024C1E4:
-/* 8024C1E4  54 60 06 3E */	clrlwi r0, r3, 0x18
-/* 8024C1E8  28 00 00 17 */	cmplwi r0, 0x17
-/* 8024C1EC  40 82 00 0C */	bne lbl_8024C1F8
-/* 8024C1F0  38 80 00 03 */	li r4, 3
-/* 8024C1F4  48 00 00 10 */	b lbl_8024C204
-lbl_8024C1F8:
-/* 8024C1F8  28 00 00 18 */	cmplwi r0, 0x18
-/* 8024C1FC  40 82 00 08 */	bne lbl_8024C204
-/* 8024C200  38 80 00 04 */	li r4, 4
-lbl_8024C204:
-/* 8024C204  54 83 06 3E */	clrlwi r3, r4, 0x18
-/* 8024C208  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8024C20C  7C 08 03 A6 */	mtlr r0
-/* 8024C210  38 21 00 10 */	addi r1, r1, 0x10
-/* 8024C214  4E 80 00 20 */	blr 
diff --git a/asm/d/s/d_s_logo/dScnLogo_Create__FP11scene_class.s b/asm/d/s/d_s_logo/dScnLogo_Create__FP11scene_class.s
deleted file mode 100644
index 574982c32c..0000000000
--- a/asm/d/s/d_s_logo/dScnLogo_Create__FP11scene_class.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_80258420:
-/* 80258420  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80258424  7C 08 02 A6 */	mflr r0
-/* 80258428  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8025842C  28 03 00 00 */	cmplwi r3, 0
-/* 80258430  4B FF F6 B1 */	bl create__10dScnLogo_cFv
-/* 80258434  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80258438  7C 08 03 A6 */	mtlr r0
-/* 8025843C  38 21 00 10 */	addi r1, r1, 0x10
-/* 80258440  4E 80 00 20 */	blr 
diff --git a/asm/d/s/d_s_logo/phase_0__FP10dScnLogo_c.s b/asm/d/s/d_s_logo/phase_0__FP10dScnLogo_c.s
deleted file mode 100644
index b30a43354d..0000000000
--- a/asm/d/s/d_s_logo/phase_0__FP10dScnLogo_c.s
+++ /dev/null
@@ -1,44 +0,0 @@
-lbl_80257910:
-/* 80257910  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 80257914  7C 08 02 A6 */	mflr r0
-/* 80257918  90 01 00 24 */	stw r0, 0x24(r1)
-/* 8025791C  93 E1 00 1C */	stw r31, 0x1c(r1)
-/* 80257920  7C 7F 1B 78 */	mr r31, r3
-/* 80257924  80 0D 80 84 */	lwz r0, g_blackColor(r13)
-/* 80257928  90 01 00 0C */	stw r0, 0xc(r1)
-/* 8025792C  90 01 00 08 */	stw r0, 8(r1)
-/* 80257930  80 6D 86 48 */	lwz r3, mFader__13mDoGph_gInf_c(r13)
-/* 80257934  88 01 00 08 */	lbz r0, 8(r1)
-/* 80257938  98 03 00 0C */	stb r0, 0xc(r3)
-/* 8025793C  88 01 00 09 */	lbz r0, 9(r1)
-/* 80257940  98 03 00 0D */	stb r0, 0xd(r3)
-/* 80257944  88 01 00 0A */	lbz r0, 0xa(r1)
-/* 80257948  98 03 00 0E */	stb r0, 0xe(r3)
-/* 8025794C  88 01 00 0B */	lbz r0, 0xb(r1)
-/* 80257950  98 03 00 0F */	stb r0, 0xf(r3)
-/* 80257954  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80257958  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8025795C  38 63 0F 38 */	addi r3, r3, 0xf38
-/* 80257960  4B DD 50 79 */	bl createParticle__14dComIfG_play_cFv
-/* 80257964  4B DB 73 ED */	bl mDoExt_getGameHeap__Fv
-/* 80257968  3C 80 00 34 */	lis r4, 0x34
-/* 8025796C  38 A0 FF F0 */	li r5, -16
-/* 80257970  48 07 6B 65 */	bl alloc__7JKRHeapFUli
-/* 80257974  90 7F 02 1C */	stw r3, 0x21c(r31)
-/* 80257978  80 7F 02 1C */	lwz r3, 0x21c(r31)
-/* 8025797C  3C 80 00 34 */	lis r4, 0x34
-/* 80257980  38 A0 00 00 */	li r5, 0
-/* 80257984  38 C0 00 00 */	li r6, 0
-/* 80257988  48 07 75 79 */	bl create__10JKRExpHeapFPvUlP7JKRHeapb
-/* 8025798C  90 7F 01 D0 */	stw r3, 0x1d0(r31)
-/* 80257990  3C 60 00 13 */	lis r3, 0x13
-/* 80257994  80 9F 01 D0 */	lwz r4, 0x1d0(r31)
-/* 80257998  38 A0 00 00 */	li r5, 0
-/* 8025799C  48 07 74 91 */	bl create__10JKRExpHeapFUlP7JKRHeapb
-/* 802579A0  90 7F 01 D4 */	stw r3, 0x1d4(r31)
-/* 802579A4  38 60 00 02 */	li r3, 2
-/* 802579A8  83 E1 00 1C */	lwz r31, 0x1c(r1)
-/* 802579AC  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 802579B0  7C 08 03 A6 */	mtlr r0
-/* 802579B4  38 21 00 20 */	addi r1, r1, 0x20
-/* 802579B8  4E 80 00 20 */	blr 
diff --git a/asm/d/s/d_s_name/FileSelectClose__10dScnName_cFv.s b/asm/d/s/d_s_name/FileSelectClose__10dScnName_cFv.s
deleted file mode 100644
index 6cbea6c72e..0000000000
--- a/asm/d/s/d_s_name/FileSelectClose__10dScnName_cFv.s
+++ /dev/null
@@ -1,48 +0,0 @@
-lbl_80258F20:
-/* 80258F20  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 80258F24  7C 08 02 A6 */	mflr r0
-/* 80258F28  90 01 00 24 */	stw r0, 0x24(r1)
-/* 80258F2C  93 E1 00 1C */	stw r31, 0x1c(r1)
-/* 80258F30  7C 7F 1B 78 */	mr r31, r3
-/* 80258F34  88 63 04 1E */	lbz r3, 0x41e(r3)
-/* 80258F38  38 03 FF FF */	addi r0, r3, -1
-/* 80258F3C  98 1F 04 1E */	stb r0, 0x41e(r31)
-/* 80258F40  88 1F 04 1E */	lbz r0, 0x41e(r31)
-/* 80258F44  28 00 00 00 */	cmplwi r0, 0
-/* 80258F48  40 82 00 78 */	bne lbl_80258FC0
-/* 80258F4C  38 00 00 03 */	li r0, 3
-/* 80258F50  98 1F 04 1D */	stb r0, 0x41d(r31)
-/* 80258F54  38 00 00 0F */	li r0, 0xf
-/* 80258F58  98 1F 04 1E */	stb r0, 0x41e(r31)
-/* 80258F5C  38 00 00 01 */	li r0, 1
-/* 80258F60  98 1F 04 1C */	stb r0, 0x41c(r31)
-/* 80258F64  80 0D 80 84 */	lwz r0, g_blackColor(r13)
-/* 80258F68  90 01 00 0C */	stw r0, 0xc(r1)
-/* 80258F6C  90 01 00 08 */	stw r0, 8(r1)
-/* 80258F70  80 6D 86 48 */	lwz r3, mFader__13mDoGph_gInf_c(r13)
-/* 80258F74  88 01 00 08 */	lbz r0, 8(r1)
-/* 80258F78  98 03 00 0C */	stb r0, 0xc(r3)
-/* 80258F7C  88 01 00 09 */	lbz r0, 9(r1)
-/* 80258F80  98 03 00 0D */	stb r0, 0xd(r3)
-/* 80258F84  88 01 00 0A */	lbz r0, 0xa(r1)
-/* 80258F88  98 03 00 0E */	stb r0, 0xe(r3)
-/* 80258F8C  88 01 00 0B */	lbz r0, 0xb(r1)
-/* 80258F90  98 03 00 0F */	stb r0, 0xf(r3)
-/* 80258F94  80 6D 8C 40 */	lwz r3, sManager__10JFWDisplay(r13)
-/* 80258F98  80 63 00 04 */	lwz r3, 4(r3)
-/* 80258F9C  28 03 00 00 */	cmplwi r3, 0
-/* 80258FA0  41 82 00 18 */	beq lbl_80258FB8
-/* 80258FA4  38 80 00 0F */	li r4, 0xf
-/* 80258FA8  81 83 00 00 */	lwz r12, 0(r3)
-/* 80258FAC  81 8C 00 0C */	lwz r12, 0xc(r12)
-/* 80258FB0  7D 89 03 A6 */	mtctr r12
-/* 80258FB4  4E 80 04 21 */	bctrl 
-lbl_80258FB8:
-/* 80258FB8  38 00 00 00 */	li r0, 0
-/* 80258FBC  98 1F 04 20 */	stb r0, 0x420(r31)
-lbl_80258FC0:
-/* 80258FC0  83 E1 00 1C */	lwz r31, 0x1c(r1)
-/* 80258FC4  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 80258FC8  7C 08 03 A6 */	mtlr r0
-/* 80258FCC  38 21 00 20 */	addi r1, r1, 0x20
-/* 80258FD0  4E 80 00 20 */	blr 
diff --git a/asm/d/s/d_s_name/FileSelectMainNormal__10dScnName_cFv.s b/asm/d/s/d_s_name/FileSelectMainNormal__10dScnName_cFv.s
deleted file mode 100644
index d5ce69d591..0000000000
--- a/asm/d/s/d_s_name/FileSelectMainNormal__10dScnName_cFv.s
+++ /dev/null
@@ -1,46 +0,0 @@
-lbl_80258E78:
-/* 80258E78  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 80258E7C  7C 08 02 A6 */	mflr r0
-/* 80258E80  90 01 00 24 */	stw r0, 0x24(r1)
-/* 80258E84  93 E1 00 1C */	stw r31, 0x1c(r1)
-/* 80258E88  7C 7F 1B 78 */	mr r31, r3
-/* 80258E8C  80 63 04 14 */	lwz r3, 0x414(r3)
-/* 80258E90  88 03 02 70 */	lbz r0, 0x270(r3)
-/* 80258E94  2C 00 00 01 */	cmpwi r0, 1
-/* 80258E98  41 82 00 08 */	beq lbl_80258EA0
-/* 80258E9C  48 00 00 70 */	b lbl_80258F0C
-lbl_80258EA0:
-/* 80258EA0  38 00 00 0F */	li r0, 0xf
-/* 80258EA4  98 1F 04 1E */	stb r0, 0x41e(r31)
-/* 80258EA8  80 0D 80 84 */	lwz r0, g_blackColor(r13)
-/* 80258EAC  90 01 00 0C */	stw r0, 0xc(r1)
-/* 80258EB0  90 01 00 08 */	stw r0, 8(r1)
-/* 80258EB4  80 6D 86 48 */	lwz r3, mFader__13mDoGph_gInf_c(r13)
-/* 80258EB8  88 01 00 08 */	lbz r0, 8(r1)
-/* 80258EBC  98 03 00 0C */	stb r0, 0xc(r3)
-/* 80258EC0  88 01 00 09 */	lbz r0, 9(r1)
-/* 80258EC4  98 03 00 0D */	stb r0, 0xd(r3)
-/* 80258EC8  88 01 00 0A */	lbz r0, 0xa(r1)
-/* 80258ECC  98 03 00 0E */	stb r0, 0xe(r3)
-/* 80258ED0  88 01 00 0B */	lbz r0, 0xb(r1)
-/* 80258ED4  98 03 00 0F */	stb r0, 0xf(r3)
-/* 80258ED8  80 6D 8C 40 */	lwz r3, sManager__10JFWDisplay(r13)
-/* 80258EDC  80 63 00 04 */	lwz r3, 4(r3)
-/* 80258EE0  28 03 00 00 */	cmplwi r3, 0
-/* 80258EE4  41 82 00 18 */	beq lbl_80258EFC
-/* 80258EE8  38 80 00 0F */	li r4, 0xf
-/* 80258EEC  81 83 00 00 */	lwz r12, 0(r3)
-/* 80258EF0  81 8C 00 10 */	lwz r12, 0x10(r12)
-/* 80258EF4  7D 89 03 A6 */	mtctr r12
-/* 80258EF8  4E 80 04 21 */	bctrl 
-lbl_80258EFC:
-/* 80258EFC  38 00 00 02 */	li r0, 2
-/* 80258F00  98 1F 04 1D */	stb r0, 0x41d(r31)
-/* 80258F04  38 00 00 01 */	li r0, 1
-/* 80258F08  98 1F 04 20 */	stb r0, 0x420(r31)
-lbl_80258F0C:
-/* 80258F0C  83 E1 00 1C */	lwz r31, 0x1c(r1)
-/* 80258F10  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 80258F14  7C 08 03 A6 */	mtlr r0
-/* 80258F18  38 21 00 20 */	addi r1, r1, 0x20
-/* 80258F1C  4E 80 00 20 */	blr