Various Matches, J2DTextBoxEx and J2DTevs OK (#2025)

* Work on src/d/bg

* misc work

* J2dTextBoxEx OK

* J2DTevs OK

* Better return values for bool
This commit is contained in:
hatal175
2024-01-08 12:10:05 +02:00
committed by GitHub
parent dea6243c35
commit a8a159ae2c
31 changed files with 328 additions and 1386 deletions
@@ -1,7 +0,0 @@
lbl_800740C4:
/* 800740C4 80 63 00 00 */ lwz r3, 0(r3)
/* 800740C8 38 63 00 08 */ addi r3, r3, 8
/* 800740CC 1C 04 00 14 */ mulli r0, r4, 0x14
/* 800740D0 7C 63 02 14 */ add r3, r3, r0
/* 800740D4 90 65 00 00 */ stw r3, 0(r5)
/* 800740D8 4E 80 00 20 */ blr
@@ -1,7 +0,0 @@
lbl_800740DC:
/* 800740DC 80 63 00 00 */ lwz r3, 0(r3)
/* 800740E0 38 63 00 08 */ addi r3, r3, 8
/* 800740E4 1C 04 00 14 */ mulli r0, r4, 0x14
/* 800740E8 7C 63 02 14 */ add r3, r3, r0
/* 800740EC 80 63 00 10 */ lwz r3, 0x10(r3)
/* 800740F0 4E 80 00 20 */ blr
@@ -1,26 +0,0 @@
lbl_80077BC4:
/* 80077BC4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80077BC8 7C 08 02 A6 */ mflr r0
/* 80077BCC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80077BD0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80077BD4 7C 7F 1B 79 */ or. r31, r3, r3
/* 80077BD8 41 82 00 30 */ beq lbl_80077C08
/* 80077BDC 3C 60 80 3B */ lis r3, __vt__15dBgS_GrpPassChk@ha /* 0x803AB7A8@ha */
/* 80077BE0 38 03 B7 A8 */ addi r0, r3, __vt__15dBgS_GrpPassChk@l /* 0x803AB7A8@l */
/* 80077BE4 90 1F 00 00 */ stw r0, 0(r31)
/* 80077BE8 41 82 00 10 */ beq lbl_80077BF8
/* 80077BEC 3C 60 80 3B */ lis r3, __vt__15cBgS_GrpPassChk@ha /* 0x803AB7B4@ha */
/* 80077BF0 38 03 B7 B4 */ addi r0, r3, __vt__15cBgS_GrpPassChk@l /* 0x803AB7B4@l */
/* 80077BF4 90 1F 00 00 */ stw r0, 0(r31)
lbl_80077BF8:
/* 80077BF8 7C 80 07 35 */ extsh. r0, r4
/* 80077BFC 40 81 00 0C */ ble lbl_80077C08
/* 80077C00 7F E3 FB 78 */ mr r3, r31
/* 80077C04 48 25 71 39 */ bl __dl__FPv
lbl_80077C08:
/* 80077C08 7F E3 FB 78 */ mr r3, r31
/* 80077C0C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80077C10 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80077C14 7C 08 03 A6 */ mtlr r0
/* 80077C18 38 21 00 10 */ addi r1, r1, 0x10
/* 80077C1C 4E 80 00 20 */ blr
@@ -1,89 +0,0 @@
lbl_8007E9D4:
/* 8007E9D4 94 21 FF C0 */ stwu r1, -0x40(r1)
/* 8007E9D8 7C 08 02 A6 */ mflr r0
/* 8007E9DC 90 01 00 44 */ stw r0, 0x44(r1)
/* 8007E9E0 39 61 00 40 */ addi r11, r1, 0x40
/* 8007E9E4 48 2E 37 E9 */ bl _savegpr_25
/* 8007E9E8 7C 9C 23 78 */ mr r28, r4
/* 8007E9EC 7C BD 2B 78 */ mr r29, r5
/* 8007E9F0 7C DE 33 78 */ mr r30, r6
/* 8007E9F4 7C FF 3B 78 */ mr r31, r7
/* 8007E9F8 80 83 00 18 */ lwz r4, 0x18(r3)
/* 8007E9FC 80 64 00 00 */ lwz r3, 0(r4)
/* 8007EA00 A0 1C 00 04 */ lhz r0, 4(r28)
/* 8007EA04 1C 00 00 0C */ mulli r0, r0, 0xc
/* 8007EA08 7C 63 02 14 */ add r3, r3, r0
/* 8007EA0C C0 03 00 00 */ lfs f0, 0(r3)
/* 8007EA10 D0 05 00 00 */ stfs f0, 0(r5)
/* 8007EA14 C0 03 00 04 */ lfs f0, 4(r3)
/* 8007EA18 D0 05 00 04 */ stfs f0, 4(r5)
/* 8007EA1C C0 03 00 08 */ lfs f0, 8(r3)
/* 8007EA20 D0 05 00 08 */ stfs f0, 8(r5)
/* 8007EA24 80 84 00 04 */ lwz r4, 4(r4)
/* 8007EA28 A0 1C 00 06 */ lhz r0, 6(r28)
/* 8007EA2C 1C 00 00 0C */ mulli r0, r0, 0xc
/* 8007EA30 7F 64 02 14 */ add r27, r4, r0
/* 8007EA34 A0 1C 00 0A */ lhz r0, 0xa(r28)
/* 8007EA38 1C 00 00 0C */ mulli r0, r0, 0xc
/* 8007EA3C 7F 44 02 14 */ add r26, r4, r0
/* 8007EA40 A0 1C 00 0C */ lhz r0, 0xc(r28)
/* 8007EA44 1C 00 00 0C */ mulli r0, r0, 0xc
/* 8007EA48 7F 24 02 14 */ add r25, r4, r0
/* 8007EA4C 7F 63 DB 78 */ mr r3, r27
/* 8007EA50 A0 1C 00 08 */ lhz r0, 8(r28)
/* 8007EA54 1C 00 00 0C */ mulli r0, r0, 0xc
/* 8007EA58 7C 84 02 14 */ add r4, r4, r0
/* 8007EA5C 38 A1 00 14 */ addi r5, r1, 0x14
/* 8007EA60 48 2C 87 55 */ bl PSVECCrossProduct
/* 8007EA64 7F 43 D3 78 */ mr r3, r26
/* 8007EA68 7F 64 DB 78 */ mr r4, r27
/* 8007EA6C 38 A1 00 08 */ addi r5, r1, 8
/* 8007EA70 48 2C 87 45 */ bl PSVECCrossProduct
/* 8007EA74 38 61 00 14 */ addi r3, r1, 0x14
/* 8007EA78 7F 24 CB 78 */ mr r4, r25
/* 8007EA7C 48 2C 87 19 */ bl PSVECDotProduct
/* 8007EA80 FC 00 0A 10 */ fabs f0, f1
/* 8007EA84 FC 40 00 18 */ frsp f2, f0
/* 8007EA88 C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13)
/* 8007EA8C FC 02 00 40 */ fcmpo cr0, f2, f0
/* 8007EA90 40 80 00 0C */ bge lbl_8007EA9C
/* 8007EA94 38 60 00 00 */ li r3, 0
/* 8007EA98 48 00 00 78 */ b lbl_8007EB10
lbl_8007EA9C:
/* 8007EA9C C0 1C 00 00 */ lfs f0, 0(r28)
/* 8007EAA0 EC 20 08 24 */ fdivs f1, f0, f1
/* 8007EAA4 38 61 00 14 */ addi r3, r1, 0x14
/* 8007EAA8 7C 64 1B 78 */ mr r4, r3
/* 8007EAAC 48 2C 86 2D */ bl PSVECScale
/* 8007EAB0 38 61 00 14 */ addi r3, r1, 0x14
/* 8007EAB4 7F A4 EB 78 */ mr r4, r29
/* 8007EAB8 7F E5 FB 78 */ mr r5, r31
/* 8007EABC 48 2C 85 D5 */ bl PSVECAdd
/* 8007EAC0 38 61 00 08 */ addi r3, r1, 8
/* 8007EAC4 7F 24 CB 78 */ mr r4, r25
/* 8007EAC8 48 2C 86 CD */ bl PSVECDotProduct
/* 8007EACC FC 00 0A 10 */ fabs f0, f1
/* 8007EAD0 FC 40 00 18 */ frsp f2, f0
/* 8007EAD4 C0 0D 8C 00 */ lfs f0, G_CM3D_F_ABS_MIN(r13)
/* 8007EAD8 FC 02 00 40 */ fcmpo cr0, f2, f0
/* 8007EADC 40 80 00 0C */ bge lbl_8007EAE8
/* 8007EAE0 38 60 00 00 */ li r3, 0
/* 8007EAE4 48 00 00 2C */ b lbl_8007EB10
lbl_8007EAE8:
/* 8007EAE8 C0 1C 00 00 */ lfs f0, 0(r28)
/* 8007EAEC EC 20 08 24 */ fdivs f1, f0, f1
/* 8007EAF0 38 61 00 08 */ addi r3, r1, 8
/* 8007EAF4 7C 64 1B 78 */ mr r4, r3
/* 8007EAF8 48 2C 85 E1 */ bl PSVECScale
/* 8007EAFC 38 61 00 08 */ addi r3, r1, 8
/* 8007EB00 7F A4 EB 78 */ mr r4, r29
/* 8007EB04 7F C5 F3 78 */ mr r5, r30
/* 8007EB08 48 2C 85 89 */ bl PSVECAdd
/* 8007EB0C 38 60 00 01 */ li r3, 1
lbl_8007EB10:
/* 8007EB10 39 61 00 40 */ addi r11, r1, 0x40
/* 8007EB14 48 2E 37 05 */ bl _restgpr_25
/* 8007EB18 80 01 00 44 */ lwz r0, 0x44(r1)
/* 8007EB1C 7C 08 03 A6 */ mtlr r0
/* 8007EB20 38 21 00 40 */ addi r1, r1, 0x40
/* 8007EB24 4E 80 00 20 */ blr
@@ -1,175 +0,0 @@
lbl_8007EBC4:
/* 8007EBC4 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8007EBC8 7C 08 02 A6 */ mflr r0
/* 8007EBCC 90 01 00 24 */ stw r0, 0x24(r1)
/* 8007EBD0 39 61 00 20 */ addi r11, r1, 0x20
/* 8007EBD4 48 2E 36 09 */ bl _savegpr_29
/* 8007EBD8 7C 9D 23 78 */ mr r29, r4
/* 8007EBDC 7C FE 3B 78 */ mr r30, r7
/* 8007EBE0 28 06 00 00 */ cmplwi r6, 0
/* 8007EBE4 41 82 00 3C */ beq lbl_8007EC20
/* 8007EBE8 80 1D 00 10 */ lwz r0, 0x10(r29)
/* 8007EBEC 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17
/* 8007EBF0 40 82 00 18 */ bne lbl_8007EC08
/* 8007EBF4 80 06 00 04 */ lwz r0, 4(r6)
/* 8007EBF8 54 00 07 FF */ clrlwi. r0, r0, 0x1f
/* 8007EBFC 40 82 00 24 */ bne lbl_8007EC20
/* 8007EC00 38 60 00 01 */ li r3, 1
/* 8007EC04 48 00 02 18 */ b lbl_8007EE1C
lbl_8007EC08:
/* 8007EC08 41 82 00 18 */ beq lbl_8007EC20
/* 8007EC0C 80 06 00 04 */ lwz r0, 4(r6)
/* 8007EC10 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e
/* 8007EC14 40 82 00 0C */ bne lbl_8007EC20
/* 8007EC18 38 60 00 01 */ li r3, 1
/* 8007EC1C 48 00 02 00 */ b lbl_8007EE1C
lbl_8007EC20:
/* 8007EC20 28 05 00 00 */ cmplwi r5, 0
/* 8007EC24 41 82 01 F4 */ beq lbl_8007EE18
/* 8007EC28 7C BF 2B 78 */ mr r31, r5
/* 8007EC2C 88 05 00 04 */ lbz r0, 4(r5)
/* 8007EC30 28 00 00 00 */ cmplwi r0, 0
/* 8007EC34 41 82 00 18 */ beq lbl_8007EC4C
/* 8007EC38 80 1D 00 00 */ lwz r0, 0(r29)
/* 8007EC3C 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11
/* 8007EC40 41 82 00 0C */ beq lbl_8007EC4C
/* 8007EC44 38 60 00 01 */ li r3, 1
/* 8007EC48 48 00 01 D4 */ b lbl_8007EE1C
lbl_8007EC4C:
/* 8007EC4C 88 1F 00 05 */ lbz r0, 5(r31)
/* 8007EC50 28 00 00 00 */ cmplwi r0, 0
/* 8007EC54 41 82 00 18 */ beq lbl_8007EC6C
/* 8007EC58 80 1D 00 00 */ lwz r0, 0(r29)
/* 8007EC5C 54 00 04 21 */ rlwinm. r0, r0, 0, 0x10, 0x10
/* 8007EC60 41 82 00 0C */ beq lbl_8007EC6C
/* 8007EC64 38 60 00 01 */ li r3, 1
/* 8007EC68 48 00 01 B4 */ b lbl_8007EE1C
lbl_8007EC6C:
/* 8007EC6C 88 1F 00 06 */ lbz r0, 6(r31)
/* 8007EC70 28 00 00 00 */ cmplwi r0, 0
/* 8007EC74 41 82 00 10 */ beq lbl_8007EC84
/* 8007EC78 80 1D 00 00 */ lwz r0, 0(r29)
/* 8007EC7C 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf
/* 8007EC80 40 82 00 1C */ bne lbl_8007EC9C
lbl_8007EC84:
/* 8007EC84 88 1F 00 0C */ lbz r0, 0xc(r31)
/* 8007EC88 28 00 00 00 */ cmplwi r0, 0
/* 8007EC8C 41 82 00 18 */ beq lbl_8007ECA4
/* 8007EC90 80 1D 00 00 */ lwz r0, 0(r29)
/* 8007EC94 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf
/* 8007EC98 41 82 00 0C */ beq lbl_8007ECA4
lbl_8007EC9C:
/* 8007EC9C 38 60 00 01 */ li r3, 1
/* 8007ECA0 48 00 01 7C */ b lbl_8007EE1C
lbl_8007ECA4:
/* 8007ECA4 88 1F 00 07 */ lbz r0, 7(r31)
/* 8007ECA8 28 00 00 00 */ cmplwi r0, 0
/* 8007ECAC 41 82 00 18 */ beq lbl_8007ECC4
/* 8007ECB0 80 1D 00 00 */ lwz r0, 0(r29)
/* 8007ECB4 54 00 03 9D */ rlwinm. r0, r0, 0, 0xe, 0xe
/* 8007ECB8 41 82 00 0C */ beq lbl_8007ECC4
/* 8007ECBC 38 60 00 01 */ li r3, 1
/* 8007ECC0 48 00 01 5C */ b lbl_8007EE1C
lbl_8007ECC4:
/* 8007ECC4 88 1F 00 08 */ lbz r0, 8(r31)
/* 8007ECC8 28 00 00 00 */ cmplwi r0, 0
/* 8007ECCC 41 82 00 18 */ beq lbl_8007ECE4
/* 8007ECD0 80 1D 00 00 */ lwz r0, 0(r29)
/* 8007ECD4 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8
/* 8007ECD8 41 82 00 0C */ beq lbl_8007ECE4
/* 8007ECDC 38 60 00 01 */ li r3, 1
/* 8007ECE0 48 00 01 3C */ b lbl_8007EE1C
lbl_8007ECE4:
/* 8007ECE4 88 1F 00 09 */ lbz r0, 9(r31)
/* 8007ECE8 28 00 00 00 */ cmplwi r0, 0
/* 8007ECEC 41 82 00 18 */ beq lbl_8007ED04
/* 8007ECF0 80 1D 00 00 */ lwz r0, 0(r29)
/* 8007ECF4 54 00 03 19 */ rlwinm. r0, r0, 0, 0xc, 0xc
/* 8007ECF8 41 82 00 0C */ beq lbl_8007ED04
/* 8007ECFC 38 60 00 01 */ li r3, 1
/* 8007ED00 48 00 01 1C */ b lbl_8007EE1C
lbl_8007ED04:
/* 8007ED04 88 1F 00 0A */ lbz r0, 0xa(r31)
/* 8007ED08 28 00 00 00 */ cmplwi r0, 0
/* 8007ED0C 41 82 00 18 */ beq lbl_8007ED24
/* 8007ED10 80 1D 00 00 */ lwz r0, 0(r29)
/* 8007ED14 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb
/* 8007ED18 41 82 00 0C */ beq lbl_8007ED24
/* 8007ED1C 38 60 00 01 */ li r3, 1
/* 8007ED20 48 00 00 FC */ b lbl_8007EE1C
lbl_8007ED24:
/* 8007ED24 88 1F 00 0B */ lbz r0, 0xb(r31)
/* 8007ED28 28 00 00 00 */ cmplwi r0, 0
/* 8007ED2C 41 82 00 18 */ beq lbl_8007ED44
/* 8007ED30 80 1D 00 00 */ lwz r0, 0(r29)
/* 8007ED34 54 00 00 43 */ rlwinm. r0, r0, 0, 1, 1
/* 8007ED38 41 82 00 0C */ beq lbl_8007ED44
/* 8007ED3C 38 60 00 01 */ li r3, 1
/* 8007ED40 48 00 00 DC */ b lbl_8007EE1C
lbl_8007ED44:
/* 8007ED44 80 1D 00 04 */ lwz r0, 4(r29)
/* 8007ED48 54 00 C7 3E */ rlwinm r0, r0, 0x18, 0x1c, 0x1f
/* 8007ED4C 2C 00 00 08 */ cmpwi r0, 8
/* 8007ED50 40 82 00 1C */ bne lbl_8007ED6C
/* 8007ED54 7F E3 FB 78 */ mr r3, r31
/* 8007ED58 4B FF A1 AD */ bl ChkNoHorse__16dBgS_PolyPassChkFv
/* 8007ED5C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8007ED60 41 82 00 0C */ beq lbl_8007ED6C
/* 8007ED64 38 60 00 01 */ li r3, 1
/* 8007ED68 48 00 00 B4 */ b lbl_8007EE1C
lbl_8007ED6C:
/* 8007ED6C 80 1D 00 04 */ lwz r0, 4(r29)
/* 8007ED70 54 00 C7 3E */ rlwinm r0, r0, 0x18, 0x1c, 0x1f
/* 8007ED74 2C 00 00 09 */ cmpwi r0, 9
/* 8007ED78 40 82 00 5C */ bne lbl_8007EDD4
/* 8007ED7C 7F E3 FB 78 */ mr r3, r31
/* 8007ED80 4B FF A1 85 */ bl ChkNoHorse__16dBgS_PolyPassChkFv
/* 8007ED84 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8007ED88 41 82 00 0C */ beq lbl_8007ED94
/* 8007ED8C 38 60 00 01 */ li r3, 1
/* 8007ED90 48 00 00 8C */ b lbl_8007EE1C
lbl_8007ED94:
/* 8007ED94 88 1F 00 0C */ lbz r0, 0xc(r31)
/* 8007ED98 28 00 00 00 */ cmplwi r0, 0
/* 8007ED9C 41 82 00 38 */ beq lbl_8007EDD4
/* 8007EDA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8007EDA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8007EDA8 80 63 5D B8 */ lwz r3, 0x5db8(r3)
/* 8007EDAC 28 03 00 00 */ cmplwi r3, 0
/* 8007EDB0 41 82 00 24 */ beq lbl_8007EDD4
/* 8007EDB4 7F C4 F3 78 */ mr r4, r30
/* 8007EDB8 39 83 18 B0 */ addi r12, r3, 0x18b0
/* 8007EDBC 48 2E 32 C9 */ bl __ptmf_scall
/* 8007EDC0 60 00 00 00 */ nop
/* 8007EDC4 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8007EDC8 40 82 00 0C */ bne lbl_8007EDD4
/* 8007EDCC 38 60 00 01 */ li r3, 1
/* 8007EDD0 48 00 00 4C */ b lbl_8007EE1C
lbl_8007EDD4:
/* 8007EDD4 88 1F 00 0D */ lbz r0, 0xd(r31)
/* 8007EDD8 28 00 00 00 */ cmplwi r0, 0
/* 8007EDDC 41 82 00 1C */ beq lbl_8007EDF8
/* 8007EDE0 80 1D 00 00 */ lwz r0, 0(r29)
/* 8007EDE4 54 00 47 3E */ rlwinm r0, r0, 8, 0x1c, 0x1f
/* 8007EDE8 2C 00 00 07 */ cmpwi r0, 7
/* 8007EDEC 40 82 00 0C */ bne lbl_8007EDF8
/* 8007EDF0 38 60 00 01 */ li r3, 1
/* 8007EDF4 48 00 00 28 */ b lbl_8007EE1C
lbl_8007EDF8:
/* 8007EDF8 88 1F 00 0E */ lbz r0, 0xe(r31)
/* 8007EDFC 28 00 00 00 */ cmplwi r0, 0
/* 8007EE00 41 82 00 18 */ beq lbl_8007EE18
/* 8007EE04 80 1D 00 04 */ lwz r0, 4(r29)
/* 8007EE08 54 00 01 CF */ rlwinm. r0, r0, 0, 7, 7
/* 8007EE0C 41 82 00 0C */ beq lbl_8007EE18
/* 8007EE10 38 60 00 01 */ li r3, 1
/* 8007EE14 48 00 00 08 */ b lbl_8007EE1C
lbl_8007EE18:
/* 8007EE18 38 60 00 00 */ li r3, 0
lbl_8007EE1C:
/* 8007EE1C 39 61 00 20 */ addi r11, r1, 0x20
/* 8007EE20 48 2E 34 09 */ bl _restgpr_29
/* 8007EE24 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8007EE28 7C 08 03 A6 */ mtlr r0
/* 8007EE2C 38 21 00 20 */ addi r1, r1, 0x20
/* 8007EE30 4E 80 00 20 */ blr