Various Matches, J2DTextBoxEx and J2DTevs OK (#2025)

* Work on src/d/bg

* misc work

* J2dTextBoxEx OK

* J2DTevs OK

* Better return values for bool

2 files changed, 0 insertions, 238 deletions

diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/setStage__12J2DTextBoxExFP11J2DTevStageQ212J2DTextBoxEx10stage_enum.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/setStage__12J2DTextBoxExFP11J2DTevStageQ212J2DTextBoxEx10stage_enum.s
deleted file mode 100644
index 0f50504d04..0000000000
--- a/asm/JSystem/J2DGraph/J2DTextBoxEx/setStage__12J2DTextBoxExFP11J2DTevStageQ212J2DTextBoxEx10stage_enum.s
+++ /dev/null
@@ -1,175 +0,0 @@
-lbl_80307F94:
-/* 80307F94  94 21 FF C0 */	stwu r1, -0x40(r1)
-/* 80307F98  3C 60 80 3A */	lis r3, lit_1953@ha /* 0x803A1DB8@ha */
-/* 80307F9C  38 C3 1D B8 */	addi r6, r3, lit_1953@l /* 0x803A1DB8@l */
-/* 80307FA0  80 66 00 00 */	lwz r3, 0(r6)
-/* 80307FA4  80 06 00 04 */	lwz r0, 4(r6)
-/* 80307FA8  90 61 00 34 */	stw r3, 0x34(r1)
-/* 80307FAC  90 01 00 38 */	stw r0, 0x38(r1)
-/* 80307FB0  80 06 00 08 */	lwz r0, 8(r6)
-/* 80307FB4  90 01 00 3C */	stw r0, 0x3c(r1)
-/* 80307FB8  80 66 00 0C */	lwz r3, 0xc(r6)
-/* 80307FBC  80 06 00 10 */	lwz r0, 0x10(r6)
-/* 80307FC0  90 61 00 28 */	stw r3, 0x28(r1)
-/* 80307FC4  90 01 00 2C */	stw r0, 0x2c(r1)
-/* 80307FC8  80 06 00 14 */	lwz r0, 0x14(r6)
-/* 80307FCC  90 01 00 30 */	stw r0, 0x30(r1)
-/* 80307FD0  80 66 00 18 */	lwz r3, 0x18(r6)
-/* 80307FD4  80 06 00 1C */	lwz r0, 0x1c(r6)
-/* 80307FD8  90 61 00 18 */	stw r3, 0x18(r1)
-/* 80307FDC  90 01 00 1C */	stw r0, 0x1c(r1)
-/* 80307FE0  80 06 00 20 */	lwz r0, 0x20(r6)
-/* 80307FE4  90 01 00 20 */	stw r0, 0x20(r1)
-/* 80307FE8  A0 06 00 24 */	lhz r0, 0x24(r6)
-/* 80307FEC  B0 01 00 24 */	sth r0, 0x24(r1)
-/* 80307FF0  88 06 00 26 */	lbz r0, 0x26(r6)
-/* 80307FF4  98 01 00 26 */	stb r0, 0x26(r1)
-/* 80307FF8  80 66 00 28 */	lwz r3, 0x28(r6)
-/* 80307FFC  80 06 00 2C */	lwz r0, 0x2c(r6)
-/* 80308000  90 61 00 08 */	stw r3, 8(r1)
-/* 80308004  90 01 00 0C */	stw r0, 0xc(r1)
-/* 80308008  80 06 00 30 */	lwz r0, 0x30(r6)
-/* 8030800C  90 01 00 10 */	stw r0, 0x10(r1)
-/* 80308010  A0 06 00 34 */	lhz r0, 0x34(r6)
-/* 80308014  B0 01 00 14 */	sth r0, 0x14(r1)
-/* 80308018  88 06 00 36 */	lbz r0, 0x36(r6)
-/* 8030801C  98 01 00 16 */	stb r0, 0x16(r1)
-/* 80308020  54 A6 10 3A */	slwi r6, r5, 2
-/* 80308024  38 61 00 34 */	addi r3, r1, 0x34
-/* 80308028  7C 03 30 AE */	lbzx r0, r3, r6
-/* 8030802C  54 07 25 36 */	rlwinm r7, r0, 4, 0x14, 0x1b
-/* 80308030  38 61 00 35 */	addi r3, r1, 0x35
-/* 80308034  7C 03 30 AE */	lbzx r0, r3, r6
-/* 80308038  7C E0 03 78 */	or r0, r7, r0
-/* 8030803C  98 04 00 02 */	stb r0, 2(r4)
-/* 80308040  38 61 00 36 */	addi r3, r1, 0x36
-/* 80308044  7C 03 30 AE */	lbzx r0, r3, r6
-/* 80308048  54 07 25 36 */	rlwinm r7, r0, 4, 0x14, 0x1b
-/* 8030804C  38 61 00 37 */	addi r3, r1, 0x37
-/* 80308050  7C 03 30 AE */	lbzx r0, r3, r6
-/* 80308054  7C E0 03 78 */	or r0, r7, r0
-/* 80308058  98 04 00 03 */	stb r0, 3(r4)
-/* 8030805C  1C A5 00 05 */	mulli r5, r5, 5
-/* 80308060  38 61 00 1C */	addi r3, r1, 0x1c
-/* 80308064  7C 63 28 AE */	lbzx r3, r3, r5
-/* 80308068  38 E1 00 1B */	addi r7, r1, 0x1b
-/* 8030806C  7C 07 28 AE */	lbzx r0, r7, r5
-/* 80308070  38 E1 00 1A */	addi r7, r1, 0x1a
-/* 80308074  7D 67 28 AE */	lbzx r11, r7, r5
-/* 80308078  38 E1 00 19 */	addi r7, r1, 0x19
-/* 8030807C  7D 47 28 AE */	lbzx r10, r7, r5
-/* 80308080  38 E1 00 18 */	addi r7, r1, 0x18
-/* 80308084  7D 27 28 AE */	lbzx r9, r7, r5
-/* 80308088  88 E4 00 01 */	lbz r7, 1(r4)
-/* 8030808C  54 E8 07 B8 */	rlwinm r8, r7, 0, 0x1e, 0x1c
-/* 80308090  55 27 10 3A */	slwi r7, r9, 2
-/* 80308094  7D 07 3B 78 */	or r7, r8, r7
-/* 80308098  98 E4 00 01 */	stb r7, 1(r4)
-/* 8030809C  28 09 00 01 */	cmplwi r9, 1
-/* 803080A0  41 81 00 2C */	bgt lbl_803080CC
-/* 803080A4  88 E4 00 01 */	lbz r7, 1(r4)
-/* 803080A8  54 E8 07 32 */	rlwinm r8, r7, 0, 0x1c, 0x19
-/* 803080AC  55 67 25 36 */	rlwinm r7, r11, 4, 0x14, 0x1b
-/* 803080B0  7D 07 3B 78 */	or r7, r8, r7
-/* 803080B4  98 E4 00 01 */	stb r7, 1(r4)
-/* 803080B8  88 E4 00 01 */	lbz r7, 1(r4)
-/* 803080BC  54 E7 00 3A */	rlwinm r7, r7, 0, 0, 0x1d
-/* 803080C0  7C E7 53 78 */	or r7, r7, r10
-/* 803080C4  98 E4 00 01 */	stb r7, 1(r4)
-/* 803080C8  48 00 00 20 */	b lbl_803080E8
-lbl_803080CC:
-/* 803080CC  88 E4 00 01 */	lbz r7, 1(r4)
-/* 803080D0  51 27 1E B6 */	rlwimi r7, r9, 3, 0x1a, 0x1b
-/* 803080D4  98 E4 00 01 */	stb r7, 1(r4)
-/* 803080D8  88 E4 00 01 */	lbz r7, 1(r4)
-/* 803080DC  54 E7 00 3A */	rlwinm r7, r7, 0, 0, 0x1d
-/* 803080E0  60 E7 00 03 */	ori r7, r7, 3
-/* 803080E4  98 E4 00 01 */	stb r7, 1(r4)
-lbl_803080E8:
-/* 803080E8  88 E4 00 01 */	lbz r7, 1(r4)
-/* 803080EC  54 E7 07 76 */	rlwinm r7, r7, 0, 0x1d, 0x1b
-/* 803080F0  54 00 1D 78 */	rlwinm r0, r0, 3, 0x15, 0x1c
-/* 803080F4  7C E0 03 78 */	or r0, r7, r0
-/* 803080F8  98 04 00 01 */	stb r0, 1(r4)
-/* 803080FC  88 E4 00 01 */	lbz r7, 1(r4)
-/* 80308100  54 60 34 B2 */	rlwinm r0, r3, 6, 0x12, 0x19
-/* 80308104  50 E0 06 BE */	rlwimi r0, r7, 0, 0x1a, 0x1f
-/* 80308108  98 04 00 01 */	stb r0, 1(r4)
-/* 8030810C  38 61 00 2B */	addi r3, r1, 0x2b
-/* 80308110  7D 43 30 AE */	lbzx r10, r3, r6
-/* 80308114  38 61 00 2A */	addi r3, r1, 0x2a
-/* 80308118  7D 23 30 AE */	lbzx r9, r3, r6
-/* 8030811C  38 61 00 29 */	addi r3, r1, 0x29
-/* 80308120  7D 03 30 AE */	lbzx r8, r3, r6
-/* 80308124  88 E4 00 06 */	lbz r7, 6(r4)
-/* 80308128  38 61 00 28 */	addi r3, r1, 0x28
-/* 8030812C  7C 03 30 AE */	lbzx r0, r3, r6
-/* 80308130  54 00 2C F4 */	rlwinm r0, r0, 5, 0x13, 0x1a
-/* 80308134  50 E0 06 FE */	rlwimi r0, r7, 0, 0x1b, 0x1f
-/* 80308138  98 04 00 06 */	stb r0, 6(r4)
-/* 8030813C  88 04 00 06 */	lbz r0, 6(r4)
-/* 80308140  54 03 07 B4 */	rlwinm r3, r0, 0, 0x1e, 0x1a
-/* 80308144  55 00 10 3A */	slwi r0, r8, 2
-/* 80308148  7C 60 03 78 */	or r0, r3, r0
-/* 8030814C  98 04 00 06 */	stb r0, 6(r4)
-/* 80308150  88 04 00 06 */	lbz r0, 6(r4)
-/* 80308154  54 03 00 3A */	rlwinm r3, r0, 0, 0, 0x1d
-/* 80308158  7D 20 0E 70 */	srawi r0, r9, 1
-/* 8030815C  7C 60 03 78 */	or r0, r3, r0
-/* 80308160  98 04 00 06 */	stb r0, 6(r4)
-/* 80308164  88 64 00 07 */	lbz r3, 7(r4)
-/* 80308168  55 20 38 30 */	slwi r0, r9, 7
-/* 8030816C  50 60 06 7E */	rlwimi r0, r3, 0, 0x19, 0x1f
-/* 80308170  98 04 00 07 */	stb r0, 7(r4)
-/* 80308174  88 04 00 07 */	lbz r0, 7(r4)
-/* 80308178  54 03 07 30 */	rlwinm r3, r0, 0, 0x1c, 0x18
-/* 8030817C  55 40 20 36 */	slwi r0, r10, 4
-/* 80308180  7C 60 03 78 */	or r0, r3, r0
-/* 80308184  98 04 00 07 */	stb r0, 7(r4)
-/* 80308188  38 61 00 0C */	addi r3, r1, 0xc
-/* 8030818C  7C 03 28 AE */	lbzx r0, r3, r5
-/* 80308190  38 61 00 0B */	addi r3, r1, 0xb
-/* 80308194  7D 23 28 AE */	lbzx r9, r3, r5
-/* 80308198  38 61 00 0A */	addi r3, r1, 0xa
-/* 8030819C  7D 03 28 AE */	lbzx r8, r3, r5
-/* 803081A0  38 61 00 09 */	addi r3, r1, 9
-/* 803081A4  7C E3 28 AE */	lbzx r7, r3, r5
-/* 803081A8  38 61 00 08 */	addi r3, r1, 8
-/* 803081AC  7C C3 28 AE */	lbzx r6, r3, r5
-/* 803081B0  88 64 00 05 */	lbz r3, 5(r4)
-/* 803081B4  54 65 07 B8 */	rlwinm r5, r3, 0, 0x1e, 0x1c
-/* 803081B8  54 C3 10 3A */	slwi r3, r6, 2
-/* 803081BC  7C A3 1B 78 */	or r3, r5, r3
-/* 803081C0  98 64 00 05 */	stb r3, 5(r4)
-/* 803081C4  28 06 00 01 */	cmplwi r6, 1
-/* 803081C8  41 81 00 2C */	bgt lbl_803081F4
-/* 803081CC  88 64 00 05 */	lbz r3, 5(r4)
-/* 803081D0  54 63 00 3A */	rlwinm r3, r3, 0, 0, 0x1d
-/* 803081D4  7C 63 3B 78 */	or r3, r3, r7
-/* 803081D8  98 64 00 05 */	stb r3, 5(r4)
-/* 803081DC  88 64 00 05 */	lbz r3, 5(r4)
-/* 803081E0  54 65 07 32 */	rlwinm r5, r3, 0, 0x1c, 0x19
-/* 803081E4  55 03 25 36 */	rlwinm r3, r8, 4, 0x14, 0x1b
-/* 803081E8  7C A3 1B 78 */	or r3, r5, r3
-/* 803081EC  98 64 00 05 */	stb r3, 5(r4)
-/* 803081F0  48 00 00 20 */	b lbl_80308210
-lbl_803081F4:
-/* 803081F4  88 64 00 05 */	lbz r3, 5(r4)
-/* 803081F8  50 C3 1E B6 */	rlwimi r3, r6, 3, 0x1a, 0x1b
-/* 803081FC  98 64 00 05 */	stb r3, 5(r4)
-/* 80308200  88 64 00 05 */	lbz r3, 5(r4)
-/* 80308204  54 63 00 3A */	rlwinm r3, r3, 0, 0, 0x1d
-/* 80308208  60 63 00 03 */	ori r3, r3, 3
-/* 8030820C  98 64 00 05 */	stb r3, 5(r4)
-lbl_80308210:
-/* 80308210  88 64 00 05 */	lbz r3, 5(r4)
-/* 80308214  54 65 07 76 */	rlwinm r5, r3, 0, 0x1d, 0x1b
-/* 80308218  55 23 1D 78 */	rlwinm r3, r9, 3, 0x15, 0x1c
-/* 8030821C  7C A3 1B 78 */	or r3, r5, r3
-/* 80308220  98 64 00 05 */	stb r3, 5(r4)
-/* 80308224  88 64 00 05 */	lbz r3, 5(r4)
-/* 80308228  54 00 34 B2 */	rlwinm r0, r0, 6, 0x12, 0x19
-/* 8030822C  50 60 06 BE */	rlwimi r0, r3, 0, 0x1a, 0x1f
-/* 80308230  98 04 00 05 */	stb r0, 5(r4)
-/* 80308234  38 21 00 40 */	addi r1, r1, 0x40
-/* 80308238  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/setTevOrder__12J2DTextBoxExFb.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/setTevOrder__12J2DTextBoxExFb.s
deleted file mode 100644
index 7e8dafb9e8..0000000000
--- a/asm/JSystem/J2DGraph/J2DTextBoxEx/setTevOrder__12J2DTextBoxExFb.s
+++ /dev/null
@@ -1,63 +0,0 @@
-lbl_80307E0C:
-/* 80307E0C  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 80307E10  7C 08 02 A6 */	mflr r0
-/* 80307E14  90 01 00 24 */	stw r0, 0x24(r1)
-/* 80307E18  93 E1 00 1C */	stw r31, 0x1c(r1)
-/* 80307E1C  93 C1 00 18 */	stw r30, 0x18(r1)
-/* 80307E20  7C 7F 1B 78 */	mr r31, r3
-/* 80307E24  54 80 06 3F */	clrlwi. r0, r4, 0x18
-/* 80307E28  40 82 00 1C */	bne lbl_80307E44
-/* 80307E2C  38 00 00 04 */	li r0, 4
-/* 80307E30  B0 01 00 10 */	sth r0, 0x10(r1)
-/* 80307E34  3C 60 00 01 */	lis r3, 0x0001 /* 0x0000FFFF@ha */
-/* 80307E38  38 03 FF FF */	addi r0, r3, 0xFFFF /* 0x0000FFFF@l */
-/* 80307E3C  B0 01 00 12 */	sth r0, 0x12(r1)
-/* 80307E40  48 00 00 18 */	b lbl_80307E58
-lbl_80307E44:
-/* 80307E44  38 00 00 FF */	li r0, 0xff
-/* 80307E48  B0 01 00 10 */	sth r0, 0x10(r1)
-/* 80307E4C  3C 60 00 01 */	lis r3, 0x0001 /* 0x0000FF04@ha */
-/* 80307E50  38 03 FF 04 */	addi r0, r3, 0xFF04 /* 0x0000FF04@l */
-/* 80307E54  B0 01 00 12 */	sth r0, 0x12(r1)
-lbl_80307E58:
-/* 80307E58  3B C0 00 00 */	li r30, 0
-/* 80307E5C  48 00 00 70 */	b lbl_80307ECC
-lbl_80307E60:
-/* 80307E60  80 7F 01 38 */	lwz r3, 0x138(r31)
-/* 80307E64  80 63 00 70 */	lwz r3, 0x70(r3)
-/* 80307E68  81 83 00 00 */	lwz r12, 0(r3)
-/* 80307E6C  81 8C 00 18 */	lwz r12, 0x18(r12)
-/* 80307E70  7D 89 03 A6 */	mtctr r12
-/* 80307E74  4E 80 04 21 */	bctrl 
-/* 80307E78  54 60 06 3E */	clrlwi r0, r3, 0x18
-/* 80307E7C  57 C4 06 3E */	clrlwi r4, r30, 0x18
-/* 80307E80  7C 00 20 40 */	cmplw r0, r4
-/* 80307E84  40 81 00 44 */	ble lbl_80307EC8
-/* 80307E88  57 C0 0D FC */	rlwinm r0, r30, 1, 0x17, 0x1e
-/* 80307E8C  38 61 00 10 */	addi r3, r1, 0x10
-/* 80307E90  7C 63 02 2E */	lhzx r3, r3, r0
-/* 80307E94  7C 60 46 70 */	srawi r0, r3, 8
-/* 80307E98  98 01 00 0C */	stb r0, 0xc(r1)
-/* 80307E9C  98 01 00 0D */	stb r0, 0xd(r1)
-/* 80307EA0  98 61 00 0E */	stb r3, 0xe(r1)
-/* 80307EA4  80 01 00 0C */	lwz r0, 0xc(r1)
-/* 80307EA8  90 01 00 08 */	stw r0, 8(r1)
-/* 80307EAC  80 7F 01 38 */	lwz r3, 0x138(r31)
-/* 80307EB0  80 63 00 70 */	lwz r3, 0x70(r3)
-/* 80307EB4  38 A1 00 08 */	addi r5, r1, 8
-/* 80307EB8  81 83 00 00 */	lwz r12, 0(r3)
-/* 80307EBC  81 8C 00 2C */	lwz r12, 0x2c(r12)
-/* 80307EC0  7D 89 03 A6 */	mtctr r12
-/* 80307EC4  4E 80 04 21 */	bctrl 
-lbl_80307EC8:
-/* 80307EC8  3B DE 00 01 */	addi r30, r30, 1
-lbl_80307ECC:
-/* 80307ECC  57 C0 06 3E */	clrlwi r0, r30, 0x18
-/* 80307ED0  28 00 00 02 */	cmplwi r0, 2
-/* 80307ED4  41 80 FF 8C */	blt lbl_80307E60
-/* 80307ED8  83 E1 00 1C */	lwz r31, 0x1c(r1)
-/* 80307EDC  83 C1 00 18 */	lwz r30, 0x18(r1)
-/* 80307EE0  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 80307EE4  7C 08 03 A6 */	mtlr r0
-/* 80307EE8  38 21 00 20 */	addi r1, r1, 0x20
-/* 80307EEC  4E 80 00 20 */	blr