From df653e1d34b91659b22344dcaae44d846ab4e7bd Mon Sep 17 00:00:00 2001 From: hatal175 Date: Sat, 10 Feb 2024 05:45:24 +0200 Subject: [PATCH] J2D work (#2068) --- .../J2DPrint/doCtrlCode__8J2DPrintFi.s | 76 --- .../doEscapeCode__8J2DPrintFPPCUcUc.s | 368 ------------- asm/JSystem/J2DGraph/J2DPrint/func_802F4468.s | 132 ----- .../getNumberF32__8J2DPrintFPPCUcffi.s | 85 --- ...8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb.s | 520 ------------------ ...DTextBoxHBinding18J2DTextBoxVBindingffUc.s | 213 ------- .../J2DPrint/setFontSize__8J2DPrintFv.s | 40 -- .../setTevStage__11J2DWindowExFb.s | 82 --- include/JSystem/J2DGraph/J2DAnimation.h | 2 +- include/JSystem/J2DGraph/J2DWindowEx.h | 8 +- libs/JSystem/J2DGraph/J2DPrint.cpp | 216 +------- libs/JSystem/J2DGraph/J2DScreen.cpp | 6 +- libs/JSystem/J2DGraph/J2DWindowEx.cpp | 226 +++++++- obj_files.mk | 1 + 14 files changed, 224 insertions(+), 1751 deletions(-) delete mode 100644 asm/JSystem/J2DGraph/J2DPrint/doCtrlCode__8J2DPrintFi.s delete mode 100644 asm/JSystem/J2DGraph/J2DPrint/doEscapeCode__8J2DPrintFPPCUcUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DPrint/func_802F4468.s delete mode 100644 asm/JSystem/J2DGraph/J2DPrint/getNumberF32__8J2DPrintFPPCUcffi.s delete mode 100644 asm/JSystem/J2DGraph/J2DPrint/parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb.s delete mode 100644 asm/JSystem/J2DGraph/J2DPrint/printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DPrint/setFontSize__8J2DPrintFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DWindowEx/setTevStage__11J2DWindowExFb.s diff --git a/asm/JSystem/J2DGraph/J2DPrint/doCtrlCode__8J2DPrintFi.s b/asm/JSystem/J2DGraph/J2DPrint/doCtrlCode__8J2DPrintFi.s deleted file mode 100644 index 27b631a281b..00000000000 --- a/asm/JSystem/J2DGraph/J2DPrint/doCtrlCode__8J2DPrintFi.s +++ /dev/null @@ -1,76 +0,0 @@ -lbl_802F52E8: -/* 802F52E8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F52EC 38 04 FF F8 */ addi r0, r4, -8 -/* 802F52F0 28 00 00 17 */ cmplwi r0, 0x17 -/* 802F52F4 41 81 01 14 */ bgt lbl_802F5408 -/* 802F52F8 3C 80 80 3D */ lis r4, lit_938@ha /* 0x803CCF40@ha */ -/* 802F52FC 38 84 CF 40 */ addi r4, r4, lit_938@l /* 0x803CCF40@l */ -/* 802F5300 54 00 10 3A */ slwi r0, r0, 2 -/* 802F5304 7C 04 00 2E */ lwzx r0, r4, r0 -/* 802F5308 7C 09 03 A6 */ mtctr r0 -/* 802F530C 4E 80 04 20 */ bctr -/* 802F5310 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 802F5314 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 802F5318 EC 01 00 28 */ fsubs f0, f1, f0 -/* 802F531C D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 802F5320 C0 02 C7 C8 */ lfs f0, lit_418(r2) -/* 802F5324 D0 03 00 34 */ stfs f0, 0x34(r3) -/* 802F5328 48 00 00 E0 */ b lbl_802F5408 -/* 802F532C A8 83 00 20 */ lha r4, 0x20(r3) -/* 802F5330 7C 80 07 35 */ extsh. r0, r4 -/* 802F5334 40 81 00 D4 */ ble lbl_802F5408 -/* 802F5338 C0 43 00 2C */ lfs f2, 0x2c(r3) -/* 802F533C FC 00 10 1E */ fctiwz f0, f2 -/* 802F5340 D8 01 00 08 */ stfd f0, 8(r1) -/* 802F5344 80 01 00 0C */ lwz r0, 0xc(r1) -/* 802F5348 7C 00 23 D6 */ divw r0, r0, r4 -/* 802F534C 7C 04 01 D6 */ mullw r0, r4, r0 -/* 802F5350 7C 04 02 14 */ add r0, r4, r0 -/* 802F5354 C8 22 C7 D0 */ lfd f1, lit_650(r2) -/* 802F5358 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802F535C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F5360 3C 00 43 30 */ lis r0, 0x4330 -/* 802F5364 90 01 00 10 */ stw r0, 0x10(r1) -/* 802F5368 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802F536C EC 00 08 28 */ fsubs f0, f0, f1 -/* 802F5370 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 802F5374 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 802F5378 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802F537C D0 03 00 34 */ stfs f0, 0x34(r3) -/* 802F5380 48 00 00 88 */ b lbl_802F5408 -/* 802F5384 C0 02 C7 C8 */ lfs f0, lit_418(r2) -/* 802F5388 D0 03 00 34 */ stfs f0, 0x34(r3) -/* 802F538C C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802F5390 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 802F5394 C0 23 00 30 */ lfs f1, 0x30(r3) -/* 802F5398 C0 03 00 14 */ lfs f0, 0x14(r3) -/* 802F539C EC 01 00 2A */ fadds f0, f1, f0 -/* 802F53A0 D0 03 00 30 */ stfs f0, 0x30(r3) -/* 802F53A4 48 00 00 64 */ b lbl_802F5408 -/* 802F53A8 C0 02 C7 C8 */ lfs f0, lit_418(r2) -/* 802F53AC D0 03 00 34 */ stfs f0, 0x34(r3) -/* 802F53B0 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802F53B4 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 802F53B8 48 00 00 50 */ b lbl_802F5408 -/* 802F53BC C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 802F53C0 C0 02 C7 EC */ lfs f0, lit_937(r2) -/* 802F53C4 EC 01 00 2A */ fadds f0, f1, f0 -/* 802F53C8 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 802F53CC 48 00 00 3C */ b lbl_802F5408 -/* 802F53D0 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 802F53D4 C0 02 C7 EC */ lfs f0, lit_937(r2) -/* 802F53D8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 802F53DC D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 802F53E0 48 00 00 28 */ b lbl_802F5408 -/* 802F53E4 C0 23 00 30 */ lfs f1, 0x30(r3) -/* 802F53E8 C0 02 C7 EC */ lfs f0, lit_937(r2) -/* 802F53EC EC 01 00 28 */ fsubs f0, f1, f0 -/* 802F53F0 D0 03 00 30 */ stfs f0, 0x30(r3) -/* 802F53F4 48 00 00 14 */ b lbl_802F5408 -/* 802F53F8 C0 23 00 30 */ lfs f1, 0x30(r3) -/* 802F53FC C0 02 C7 EC */ lfs f0, lit_937(r2) -/* 802F5400 EC 01 00 2A */ fadds f0, f1, f0 -/* 802F5404 D0 03 00 30 */ stfs f0, 0x30(r3) -lbl_802F5408: -/* 802F5408 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F540C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPrint/doEscapeCode__8J2DPrintFPPCUcUc.s b/asm/JSystem/J2DGraph/J2DPrint/doEscapeCode__8J2DPrintFPPCUcUc.s deleted file mode 100644 index 78341a010a5..00000000000 --- a/asm/JSystem/J2DGraph/J2DPrint/doEscapeCode__8J2DPrintFPPCUcUc.s +++ /dev/null @@ -1,368 +0,0 @@ -lbl_802F5410: -/* 802F5410 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 802F5414 7C 08 02 A6 */ mflr r0 -/* 802F5418 90 01 00 54 */ stw r0, 0x54(r1) -/* 802F541C 39 61 00 50 */ addi r11, r1, 0x50 -/* 802F5420 48 06 CD B1 */ bl _savegpr_26 -/* 802F5424 7C 7A 1B 78 */ mr r26, r3 -/* 802F5428 7C 9B 23 78 */ mr r27, r4 -/* 802F542C 7C BC 2B 78 */ mr r28, r5 -/* 802F5430 83 E4 00 00 */ lwz r31, 0(r4) -/* 802F5434 3B C0 00 00 */ li r30, 0 -/* 802F5438 3B A0 00 00 */ li r29, 0 -lbl_802F543C: -/* 802F543C 80 7A 00 04 */ lwz r3, 4(r26) -/* 802F5440 80 9B 00 00 */ lwz r4, 0(r27) -/* 802F5444 88 84 00 00 */ lbz r4, 0(r4) -/* 802F5448 81 83 00 00 */ lwz r12, 0(r3) -/* 802F544C 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 802F5450 7D 89 03 A6 */ mtctr r12 -/* 802F5454 4E 80 04 21 */ bctrl -/* 802F5458 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802F545C 41 82 00 24 */ beq lbl_802F5480 -/* 802F5460 80 9B 00 00 */ lwz r4, 0(r27) -/* 802F5464 88 64 00 00 */ lbz r3, 0(r4) -/* 802F5468 88 04 00 01 */ lbz r0, 1(r4) -/* 802F546C 50 60 44 2E */ rlwimi r0, r3, 8, 0x10, 0x17 -/* 802F5470 54 05 04 3E */ clrlwi r5, r0, 0x10 -/* 802F5474 38 04 00 02 */ addi r0, r4, 2 -/* 802F5478 90 1B 00 00 */ stw r0, 0(r27) -/* 802F547C 48 00 00 14 */ b lbl_802F5490 -lbl_802F5480: -/* 802F5480 80 7B 00 00 */ lwz r3, 0(r27) -/* 802F5484 88 A3 00 00 */ lbz r5, 0(r3) -/* 802F5488 38 03 00 01 */ addi r0, r3, 1 -/* 802F548C 90 1B 00 00 */ stw r0, 0(r27) -lbl_802F5490: -/* 802F5490 54 A0 04 3E */ clrlwi r0, r5, 0x10 -/* 802F5494 28 00 00 80 */ cmplwi r0, 0x80 -/* 802F5498 40 80 00 0C */ bge lbl_802F54A4 -/* 802F549C 28 00 00 20 */ cmplwi r0, 0x20 -/* 802F54A0 40 80 00 10 */ bge lbl_802F54B0 -lbl_802F54A4: -/* 802F54A4 93 FB 00 00 */ stw r31, 0(r27) -/* 802F54A8 38 60 00 00 */ li r3, 0 -/* 802F54AC 48 00 04 88 */ b lbl_802F5934 -lbl_802F54B0: -/* 802F54B0 57 C0 42 2E */ rlwinm r0, r30, 8, 8, 0x17 -/* 802F54B4 7C 00 2B 78 */ or r0, r0, r5 -/* 802F54B8 54 1E 04 3E */ clrlwi r30, r0, 0x10 -/* 802F54BC 3B BD 00 01 */ addi r29, r29, 1 -/* 802F54C0 2C 1D 00 02 */ cmpwi r29, 2 -/* 802F54C4 41 80 FF 78 */ blt lbl_802F543C -/* 802F54C8 80 1A 00 08 */ lwz r0, 8(r26) -/* 802F54CC 90 01 00 2C */ stw r0, 0x2c(r1) -/* 802F54D0 80 1A 00 0C */ lwz r0, 0xc(r26) -/* 802F54D4 90 01 00 28 */ stw r0, 0x28(r1) -/* 802F54D8 2C 1E 47 4D */ cmpwi r30, 0x474d -/* 802F54DC 41 82 03 BC */ beq lbl_802F5898 -/* 802F54E0 40 80 00 64 */ bge lbl_802F5544 -/* 802F54E4 2C 1E 43 55 */ cmpwi r30, 0x4355 -/* 802F54E8 41 82 00 B0 */ beq lbl_802F5598 -/* 802F54EC 40 80 00 34 */ bge lbl_802F5520 -/* 802F54F0 2C 1E 43 4C */ cmpwi r30, 0x434c -/* 802F54F4 41 82 00 F4 */ beq lbl_802F55E8 -/* 802F54F8 40 80 00 1C */ bge lbl_802F5514 -/* 802F54FC 2C 1E 43 44 */ cmpwi r30, 0x4344 -/* 802F5500 41 82 00 C0 */ beq lbl_802F55C0 -/* 802F5504 40 80 04 24 */ bge lbl_802F5928 -/* 802F5508 2C 1E 43 43 */ cmpwi r30, 0x4343 -/* 802F550C 40 80 01 7C */ bge lbl_802F5688 -/* 802F5510 48 00 04 18 */ b lbl_802F5928 -lbl_802F5514: -/* 802F5514 2C 1E 43 52 */ cmpwi r30, 0x4352 -/* 802F5518 41 82 00 F8 */ beq lbl_802F5610 -/* 802F551C 48 00 04 0C */ b lbl_802F5928 -lbl_802F5520: -/* 802F5520 2C 1E 46 59 */ cmpwi r30, 0x4659 -/* 802F5524 41 82 03 04 */ beq lbl_802F5828 -/* 802F5528 40 80 00 10 */ bge lbl_802F5538 -/* 802F552C 2C 1E 46 58 */ cmpwi r30, 0x4658 -/* 802F5530 40 80 02 C8 */ bge lbl_802F57F8 -/* 802F5534 48 00 03 F4 */ b lbl_802F5928 -lbl_802F5538: -/* 802F5538 2C 1E 47 43 */ cmpwi r30, 0x4743 -/* 802F553C 41 82 02 04 */ beq lbl_802F5740 -/* 802F5540 48 00 03 E8 */ b lbl_802F5928 -lbl_802F5544: -/* 802F5544 2C 1E 53 48 */ cmpwi r30, 0x5348 -/* 802F5548 41 82 03 10 */ beq lbl_802F5858 -/* 802F554C 40 80 00 28 */ bge lbl_802F5574 -/* 802F5550 2C 1E 4C 44 */ cmpwi r30, 0x4c44 -/* 802F5554 41 82 00 F8 */ beq lbl_802F564C -/* 802F5558 40 80 00 10 */ bge lbl_802F5568 -/* 802F555C 2C 1E 48 4D */ cmpwi r30, 0x484d -/* 802F5560 41 82 03 D0 */ beq lbl_802F5930 -/* 802F5564 48 00 03 C4 */ b lbl_802F5928 -lbl_802F5568: -/* 802F5568 2C 1E 4C 55 */ cmpwi r30, 0x4c55 -/* 802F556C 41 82 00 CC */ beq lbl_802F5638 -/* 802F5570 48 00 03 B8 */ b lbl_802F5928 -lbl_802F5574: -/* 802F5574 2C 1E 53 55 */ cmpwi r30, 0x5355 -/* 802F5578 41 82 03 B0 */ beq lbl_802F5928 -/* 802F557C 40 80 00 10 */ bge lbl_802F558C -/* 802F5580 2C 1E 53 54 */ cmpwi r30, 0x5354 -/* 802F5584 40 80 00 DC */ bge lbl_802F5660 -/* 802F5588 48 00 03 A0 */ b lbl_802F5928 -lbl_802F558C: -/* 802F558C 2C 1E 53 57 */ cmpwi r30, 0x5357 -/* 802F5590 40 80 03 98 */ bge lbl_802F5928 -/* 802F5594 48 00 02 E4 */ b lbl_802F5878 -lbl_802F5598: -/* 802F5598 7F 43 D3 78 */ mr r3, r26 -/* 802F559C 7F 64 DB 78 */ mr r4, r27 -/* 802F55A0 C0 22 C7 EC */ lfs f1, lit_937(r2) -/* 802F55A4 C0 42 C7 C8 */ lfs f2, lit_418(r2) -/* 802F55A8 38 A0 00 0A */ li r5, 0xa -/* 802F55AC 48 00 05 19 */ bl getNumberF32__8J2DPrintFPPCUcffi -/* 802F55B0 C0 1A 00 30 */ lfs f0, 0x30(r26) -/* 802F55B4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802F55B8 D0 1A 00 30 */ stfs f0, 0x30(r26) -/* 802F55BC 48 00 03 74 */ b lbl_802F5930 -lbl_802F55C0: -/* 802F55C0 7F 43 D3 78 */ mr r3, r26 -/* 802F55C4 7F 64 DB 78 */ mr r4, r27 -/* 802F55C8 C0 22 C7 EC */ lfs f1, lit_937(r2) -/* 802F55CC C0 42 C7 C8 */ lfs f2, lit_418(r2) -/* 802F55D0 38 A0 00 0A */ li r5, 0xa -/* 802F55D4 48 00 04 F1 */ bl getNumberF32__8J2DPrintFPPCUcffi -/* 802F55D8 C0 1A 00 30 */ lfs f0, 0x30(r26) -/* 802F55DC EC 00 08 2A */ fadds f0, f0, f1 -/* 802F55E0 D0 1A 00 30 */ stfs f0, 0x30(r26) -/* 802F55E4 48 00 03 4C */ b lbl_802F5930 -lbl_802F55E8: -/* 802F55E8 7F 43 D3 78 */ mr r3, r26 -/* 802F55EC 7F 64 DB 78 */ mr r4, r27 -/* 802F55F0 C0 22 C7 EC */ lfs f1, lit_937(r2) -/* 802F55F4 C0 42 C7 C8 */ lfs f2, lit_418(r2) -/* 802F55F8 38 A0 00 0A */ li r5, 0xa -/* 802F55FC 48 00 04 C9 */ bl getNumberF32__8J2DPrintFPPCUcffi -/* 802F5600 C0 1A 00 2C */ lfs f0, 0x2c(r26) -/* 802F5604 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802F5608 D0 1A 00 2C */ stfs f0, 0x2c(r26) -/* 802F560C 48 00 03 24 */ b lbl_802F5930 -lbl_802F5610: -/* 802F5610 7F 43 D3 78 */ mr r3, r26 -/* 802F5614 7F 64 DB 78 */ mr r4, r27 -/* 802F5618 C0 22 C7 EC */ lfs f1, lit_937(r2) -/* 802F561C C0 42 C7 C8 */ lfs f2, lit_418(r2) -/* 802F5620 38 A0 00 0A */ li r5, 0xa -/* 802F5624 48 00 04 A1 */ bl getNumberF32__8J2DPrintFPPCUcffi -/* 802F5628 C0 1A 00 2C */ lfs f0, 0x2c(r26) -/* 802F562C EC 00 08 2A */ fadds f0, f0, f1 -/* 802F5630 D0 1A 00 2C */ stfs f0, 0x2c(r26) -/* 802F5634 48 00 02 FC */ b lbl_802F5930 -lbl_802F5638: -/* 802F5638 C0 3A 00 30 */ lfs f1, 0x30(r26) -/* 802F563C C0 1A 00 14 */ lfs f0, 0x14(r26) -/* 802F5640 EC 01 00 28 */ fsubs f0, f1, f0 -/* 802F5644 D0 1A 00 30 */ stfs f0, 0x30(r26) -/* 802F5648 48 00 02 E8 */ b lbl_802F5930 -lbl_802F564C: -/* 802F564C C0 3A 00 30 */ lfs f1, 0x30(r26) -/* 802F5650 C0 1A 00 14 */ lfs f0, 0x14(r26) -/* 802F5654 EC 01 00 2A */ fadds f0, f1, f0 -/* 802F5658 D0 1A 00 30 */ stfs f0, 0x30(r26) -/* 802F565C 48 00 02 D4 */ b lbl_802F5930 -lbl_802F5660: -/* 802F5660 A8 BA 00 20 */ lha r5, 0x20(r26) -/* 802F5664 7F 43 D3 78 */ mr r3, r26 -/* 802F5668 7F 64 DB 78 */ mr r4, r27 -/* 802F566C 7C A6 2B 78 */ mr r6, r5 -/* 802F5670 38 E0 00 0A */ li r7, 0xa -/* 802F5674 48 00 03 4D */ bl getNumberS32__8J2DPrintFPPCUclli -/* 802F5678 2C 03 00 00 */ cmpwi r3, 0 -/* 802F567C 40 81 02 B4 */ ble lbl_802F5930 -/* 802F5680 B0 7A 00 20 */ sth r3, 0x20(r26) -/* 802F5684 48 00 02 AC */ b lbl_802F5930 -lbl_802F5688: -/* 802F5688 7F 43 D3 78 */ mr r3, r26 -/* 802F568C 7F 64 DB 78 */ mr r4, r27 -/* 802F5690 80 BA 00 40 */ lwz r5, 0x40(r26) -/* 802F5694 80 DA 00 08 */ lwz r6, 8(r26) -/* 802F5698 38 E0 00 10 */ li r7, 0x10 -/* 802F569C 48 00 03 25 */ bl getNumberS32__8J2DPrintFPPCUclli -/* 802F56A0 90 61 00 24 */ stw r3, 0x24(r1) -/* 802F56A4 88 01 00 24 */ lbz r0, 0x24(r1) -/* 802F56A8 98 1A 00 08 */ stb r0, 8(r26) -/* 802F56AC 88 01 00 25 */ lbz r0, 0x25(r1) -/* 802F56B0 98 1A 00 09 */ stb r0, 9(r26) -/* 802F56B4 88 01 00 26 */ lbz r0, 0x26(r1) -/* 802F56B8 98 1A 00 0A */ stb r0, 0xa(r26) -/* 802F56BC 88 01 00 27 */ lbz r0, 0x27(r1) -/* 802F56C0 98 1A 00 0B */ stb r0, 0xb(r26) -/* 802F56C4 88 1A 00 08 */ lbz r0, 8(r26) -/* 802F56C8 98 01 00 2C */ stb r0, 0x2c(r1) -/* 802F56CC 88 1A 00 09 */ lbz r0, 9(r26) -/* 802F56D0 98 01 00 2D */ stb r0, 0x2d(r1) -/* 802F56D4 88 1A 00 0A */ lbz r0, 0xa(r26) -/* 802F56D8 98 01 00 2E */ stb r0, 0x2e(r1) -/* 802F56DC 88 1A 00 0B */ lbz r0, 0xb(r26) -/* 802F56E0 98 01 00 2F */ stb r0, 0x2f(r1) -/* 802F56E4 57 84 06 3E */ clrlwi r4, r28, 0x18 -/* 802F56E8 7C 00 21 D6 */ mullw r0, r0, r4 -/* 802F56EC 38 60 00 FF */ li r3, 0xff -/* 802F56F0 7C 00 1B D6 */ divw r0, r0, r3 -/* 802F56F4 98 01 00 2F */ stb r0, 0x2f(r1) -/* 802F56F8 88 01 00 2B */ lbz r0, 0x2b(r1) -/* 802F56FC 7C 00 21 D6 */ mullw r0, r0, r4 -/* 802F5700 7C 00 1B D6 */ divw r0, r0, r3 -/* 802F5704 98 01 00 2B */ stb r0, 0x2b(r1) -/* 802F5708 88 1A 00 22 */ lbz r0, 0x22(r26) -/* 802F570C 28 00 00 00 */ cmplwi r0, 0 -/* 802F5710 38 61 00 2C */ addi r3, r1, 0x2c -/* 802F5714 41 82 00 08 */ beq lbl_802F571C -/* 802F5718 38 61 00 28 */ addi r3, r1, 0x28 -lbl_802F571C: -/* 802F571C 80 03 00 00 */ lwz r0, 0(r3) -/* 802F5720 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802F5724 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 802F5728 90 01 00 20 */ stw r0, 0x20(r1) -/* 802F572C 80 7A 00 04 */ lwz r3, 4(r26) -/* 802F5730 38 81 00 20 */ addi r4, r1, 0x20 -/* 802F5734 38 A1 00 1C */ addi r5, r1, 0x1c -/* 802F5738 4B FE 96 8D */ bl setGradColor__7JUTFontFQ28JUtility6TColorQ28JUtility6TColor -/* 802F573C 48 00 01 F4 */ b lbl_802F5930 -lbl_802F5740: -/* 802F5740 7F 43 D3 78 */ mr r3, r26 -/* 802F5744 7F 64 DB 78 */ mr r4, r27 -/* 802F5748 80 BA 00 44 */ lwz r5, 0x44(r26) -/* 802F574C 80 DA 00 0C */ lwz r6, 0xc(r26) -/* 802F5750 38 E0 00 10 */ li r7, 0x10 -/* 802F5754 48 00 02 6D */ bl getNumberS32__8J2DPrintFPPCUclli -/* 802F5758 90 61 00 18 */ stw r3, 0x18(r1) -/* 802F575C 88 01 00 18 */ lbz r0, 0x18(r1) -/* 802F5760 98 1A 00 0C */ stb r0, 0xc(r26) -/* 802F5764 88 01 00 19 */ lbz r0, 0x19(r1) -/* 802F5768 98 1A 00 0D */ stb r0, 0xd(r26) -/* 802F576C 88 01 00 1A */ lbz r0, 0x1a(r1) -/* 802F5770 98 1A 00 0E */ stb r0, 0xe(r26) -/* 802F5774 88 01 00 1B */ lbz r0, 0x1b(r1) -/* 802F5778 98 1A 00 0F */ stb r0, 0xf(r26) -/* 802F577C 88 1A 00 0C */ lbz r0, 0xc(r26) -/* 802F5780 98 01 00 28 */ stb r0, 0x28(r1) -/* 802F5784 88 1A 00 0D */ lbz r0, 0xd(r26) -/* 802F5788 98 01 00 29 */ stb r0, 0x29(r1) -/* 802F578C 88 1A 00 0E */ lbz r0, 0xe(r26) -/* 802F5790 98 01 00 2A */ stb r0, 0x2a(r1) -/* 802F5794 88 9A 00 0F */ lbz r4, 0xf(r26) -/* 802F5798 98 81 00 2B */ stb r4, 0x2b(r1) -/* 802F579C 88 01 00 2F */ lbz r0, 0x2f(r1) -/* 802F57A0 57 85 06 3E */ clrlwi r5, r28, 0x18 -/* 802F57A4 7C 00 29 D6 */ mullw r0, r0, r5 -/* 802F57A8 38 60 00 FF */ li r3, 0xff -/* 802F57AC 7C 00 1B D6 */ divw r0, r0, r3 -/* 802F57B0 98 01 00 2F */ stb r0, 0x2f(r1) -/* 802F57B4 7C 04 29 D6 */ mullw r0, r4, r5 -/* 802F57B8 7C 00 1B D6 */ divw r0, r0, r3 -/* 802F57BC 98 01 00 2B */ stb r0, 0x2b(r1) -/* 802F57C0 88 1A 00 22 */ lbz r0, 0x22(r26) -/* 802F57C4 28 00 00 00 */ cmplwi r0, 0 -/* 802F57C8 38 61 00 2C */ addi r3, r1, 0x2c -/* 802F57CC 41 82 00 08 */ beq lbl_802F57D4 -/* 802F57D0 38 61 00 28 */ addi r3, r1, 0x28 -lbl_802F57D4: -/* 802F57D4 80 03 00 00 */ lwz r0, 0(r3) -/* 802F57D8 90 01 00 10 */ stw r0, 0x10(r1) -/* 802F57DC 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 802F57E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F57E4 80 7A 00 04 */ lwz r3, 4(r26) -/* 802F57E8 38 81 00 14 */ addi r4, r1, 0x14 -/* 802F57EC 38 A1 00 10 */ addi r5, r1, 0x10 -/* 802F57F0 4B FE 95 D5 */ bl setGradColor__7JUTFontFQ28JUtility6TColorQ28JUtility6TColor -/* 802F57F4 48 00 01 3C */ b lbl_802F5930 -lbl_802F57F8: -/* 802F57F8 7F 43 D3 78 */ mr r3, r26 -/* 802F57FC 7F 64 DB 78 */ mr r4, r27 -/* 802F5800 C0 3A 00 50 */ lfs f1, 0x50(r26) -/* 802F5804 C0 5A 00 18 */ lfs f2, 0x18(r26) -/* 802F5808 38 A0 00 0A */ li r5, 0xa -/* 802F580C 48 00 02 B9 */ bl getNumberF32__8J2DPrintFPPCUcffi -/* 802F5810 C0 02 C7 C8 */ lfs f0, lit_418(r2) -/* 802F5814 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802F5818 4C 41 13 82 */ cror 2, 1, 2 -/* 802F581C 40 82 01 14 */ bne lbl_802F5930 -/* 802F5820 D0 3A 00 18 */ stfs f1, 0x18(r26) -/* 802F5824 48 00 01 0C */ b lbl_802F5930 -lbl_802F5828: -/* 802F5828 7F 43 D3 78 */ mr r3, r26 -/* 802F582C 7F 64 DB 78 */ mr r4, r27 -/* 802F5830 C0 3A 00 54 */ lfs f1, 0x54(r26) -/* 802F5834 C0 5A 00 1C */ lfs f2, 0x1c(r26) -/* 802F5838 38 A0 00 0A */ li r5, 0xa -/* 802F583C 48 00 02 89 */ bl getNumberF32__8J2DPrintFPPCUcffi -/* 802F5840 C0 02 C7 C8 */ lfs f0, lit_418(r2) -/* 802F5844 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802F5848 4C 41 13 82 */ cror 2, 1, 2 -/* 802F584C 40 82 00 E4 */ bne lbl_802F5930 -/* 802F5850 D0 3A 00 1C */ stfs f1, 0x1c(r26) -/* 802F5854 48 00 00 DC */ b lbl_802F5930 -lbl_802F5858: -/* 802F5858 7F 43 D3 78 */ mr r3, r26 -/* 802F585C 7F 64 DB 78 */ mr r4, r27 -/* 802F5860 C0 3A 00 48 */ lfs f1, 0x48(r26) -/* 802F5864 C0 5A 00 10 */ lfs f2, 0x10(r26) -/* 802F5868 38 A0 00 0A */ li r5, 0xa -/* 802F586C 48 00 02 59 */ bl getNumberF32__8J2DPrintFPPCUcffi -/* 802F5870 D0 3A 00 10 */ stfs f1, 0x10(r26) -/* 802F5874 48 00 00 BC */ b lbl_802F5930 -lbl_802F5878: -/* 802F5878 7F 43 D3 78 */ mr r3, r26 -/* 802F587C 7F 64 DB 78 */ mr r4, r27 -/* 802F5880 C0 3A 00 4C */ lfs f1, 0x4c(r26) -/* 802F5884 C0 5A 00 14 */ lfs f2, 0x14(r26) -/* 802F5888 38 A0 00 0A */ li r5, 0xa -/* 802F588C 48 00 02 39 */ bl getNumberF32__8J2DPrintFPPCUcffi -/* 802F5890 D0 3A 00 14 */ stfs f1, 0x14(r26) -/* 802F5894 48 00 00 9C */ b lbl_802F5930 -lbl_802F5898: -/* 802F5898 88 DA 00 22 */ lbz r6, 0x22(r26) -/* 802F589C 7F 43 D3 78 */ mr r3, r26 -/* 802F58A0 7F 64 DB 78 */ mr r4, r27 -/* 802F58A4 7C C0 00 34 */ cntlzw r0, r6 -/* 802F58A8 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 802F58AC 38 E0 00 0A */ li r7, 0xa -/* 802F58B0 48 00 01 11 */ bl getNumberS32__8J2DPrintFPPCUclli -/* 802F58B4 7C 60 00 34 */ cntlzw r0, r3 -/* 802F58B8 54 00 DE 3E */ rlwinm r0, r0, 0x1b, 0x18, 0x1f -/* 802F58BC 7C 00 00 34 */ cntlzw r0, r0 -/* 802F58C0 54 00 D9 7E */ srwi r0, r0, 5 -/* 802F58C4 98 1A 00 22 */ stb r0, 0x22(r26) -/* 802F58C8 88 01 00 2F */ lbz r0, 0x2f(r1) -/* 802F58CC 57 84 06 3E */ clrlwi r4, r28, 0x18 -/* 802F58D0 7C 00 21 D6 */ mullw r0, r0, r4 -/* 802F58D4 38 60 00 FF */ li r3, 0xff -/* 802F58D8 7C 00 1B D6 */ divw r0, r0, r3 -/* 802F58DC 98 01 00 2F */ stb r0, 0x2f(r1) -/* 802F58E0 88 01 00 2B */ lbz r0, 0x2b(r1) -/* 802F58E4 7C 00 21 D6 */ mullw r0, r0, r4 -/* 802F58E8 7C 00 1B D6 */ divw r0, r0, r3 -/* 802F58EC 98 01 00 2B */ stb r0, 0x2b(r1) -/* 802F58F0 88 1A 00 22 */ lbz r0, 0x22(r26) -/* 802F58F4 28 00 00 00 */ cmplwi r0, 0 -/* 802F58F8 38 61 00 2C */ addi r3, r1, 0x2c -/* 802F58FC 41 82 00 08 */ beq lbl_802F5904 -/* 802F5900 38 61 00 28 */ addi r3, r1, 0x28 -lbl_802F5904: -/* 802F5904 80 03 00 00 */ lwz r0, 0(r3) -/* 802F5908 90 01 00 08 */ stw r0, 8(r1) -/* 802F590C 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 802F5910 90 01 00 0C */ stw r0, 0xc(r1) -/* 802F5914 80 7A 00 04 */ lwz r3, 4(r26) -/* 802F5918 38 81 00 0C */ addi r4, r1, 0xc -/* 802F591C 38 A1 00 08 */ addi r5, r1, 8 -/* 802F5920 4B FE 94 A5 */ bl setGradColor__7JUTFontFQ28JUtility6TColorQ28JUtility6TColor -/* 802F5924 48 00 00 0C */ b lbl_802F5930 -lbl_802F5928: -/* 802F5928 93 FB 00 00 */ stw r31, 0(r27) -/* 802F592C 3B C0 00 00 */ li r30, 0 -lbl_802F5930: -/* 802F5930 7F C3 F3 78 */ mr r3, r30 -lbl_802F5934: -/* 802F5934 39 61 00 50 */ addi r11, r1, 0x50 -/* 802F5938 48 06 C8 E5 */ bl _restgpr_26 -/* 802F593C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 802F5940 7C 08 03 A6 */ mtlr r0 -/* 802F5944 38 21 00 50 */ addi r1, r1, 0x50 -/* 802F5948 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPrint/func_802F4468.s b/asm/JSystem/J2DGraph/J2DPrint/func_802F4468.s deleted file mode 100644 index 9fcc5f8021d..00000000000 --- a/asm/JSystem/J2DGraph/J2DPrint/func_802F4468.s +++ /dev/null @@ -1,132 +0,0 @@ -lbl_802F4468: -/* 802F4468 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 802F446C 7C 08 02 A6 */ mflr r0 -/* 802F4470 90 01 00 64 */ stw r0, 0x64(r1) -/* 802F4474 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 802F4478 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 802F447C DB C1 00 40 */ stfd f30, 0x40(r1) -/* 802F4480 F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 802F4484 39 61 00 40 */ addi r11, r1, 0x40 -/* 802F4488 48 06 DD 45 */ bl _savegpr_25 -/* 802F448C 7C 7C 1B 78 */ mr r28, r3 -/* 802F4490 7C 99 23 78 */ mr r25, r4 -/* 802F4494 FF C0 08 90 */ fmr f30, f1 -/* 802F4498 FF E0 10 90 */ fmr f31, f2 -/* 802F449C 7C BA 2B 78 */ mr r26, r5 -/* 802F44A0 7C DD 33 78 */ mr r29, r6 -/* 802F44A4 7C FE 3B 78 */ mr r30, r7 -/* 802F44A8 7D 1F 43 78 */ mr r31, r8 -/* 802F44AC 7D 3B 4B 78 */ mr r27, r9 -/* 802F44B0 80 0D 90 00 */ lwz r0, mStrBuff__8J2DPrint(r13) -/* 802F44B4 28 00 00 00 */ cmplwi r0, 0 -/* 802F44B8 40 82 00 0C */ bne lbl_802F44C4 -/* 802F44BC 38 60 04 00 */ li r3, 0x400 -/* 802F44C0 48 00 01 99 */ bl setBuffer__8J2DPrintFUl -lbl_802F44C4: -/* 802F44C4 93 3C 00 04 */ stw r25, 4(r28) -/* 802F44C8 D3 DC 00 48 */ stfs f30, 0x48(r28) -/* 802F44CC C0 02 C7 CC */ lfs f0, lit_644(r2) -/* 802F44D0 D0 1C 00 4C */ stfs f0, 0x4c(r28) -/* 802F44D4 80 7C 00 04 */ lwz r3, 4(r28) -/* 802F44D8 28 03 00 00 */ cmplwi r3, 0 -/* 802F44DC 41 82 00 44 */ beq lbl_802F4520 -/* 802F44E0 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 802F44E4 40 82 00 0C */ bne lbl_802F44F0 -/* 802F44E8 FC 00 F8 90 */ fmr f0, f31 -/* 802F44EC 48 00 00 30 */ b lbl_802F451C -lbl_802F44F0: -/* 802F44F0 81 83 00 00 */ lwz r12, 0(r3) -/* 802F44F4 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802F44F8 7D 89 03 A6 */ mtctr r12 -/* 802F44FC 4E 80 04 21 */ bctrl -/* 802F4500 C8 22 C7 D0 */ lfd f1, lit_650(r2) -/* 802F4504 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802F4508 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F450C 3C 00 43 30 */ lis r0, 0x4330 -/* 802F4510 90 01 00 10 */ stw r0, 0x10(r1) -/* 802F4514 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802F4518 EC 00 08 28 */ fsubs f0, f0, f1 -lbl_802F451C: -/* 802F451C D0 1C 00 4C */ stfs f0, 0x4c(r28) -lbl_802F4520: -/* 802F4520 38 00 00 01 */ li r0, 1 -/* 802F4524 98 1C 00 5A */ stb r0, 0x5a(r28) -/* 802F4528 7F 83 E3 78 */ mr r3, r28 -/* 802F452C C0 22 C7 C8 */ lfs f1, lit_418(r2) -/* 802F4530 FC 40 08 90 */ fmr f2, f1 -/* 802F4534 48 00 02 29 */ bl locate__8J2DPrintFff -/* 802F4538 88 1A 00 00 */ lbz r0, 0(r26) -/* 802F453C 98 1C 00 40 */ stb r0, 0x40(r28) -/* 802F4540 88 1A 00 01 */ lbz r0, 1(r26) -/* 802F4544 98 1C 00 41 */ stb r0, 0x41(r28) -/* 802F4548 88 1A 00 02 */ lbz r0, 2(r26) -/* 802F454C 98 1C 00 42 */ stb r0, 0x42(r28) -/* 802F4550 88 1A 00 03 */ lbz r0, 3(r26) -/* 802F4554 98 1C 00 43 */ stb r0, 0x43(r28) -/* 802F4558 88 1D 00 00 */ lbz r0, 0(r29) -/* 802F455C 98 1C 00 44 */ stb r0, 0x44(r28) -/* 802F4560 88 1D 00 01 */ lbz r0, 1(r29) -/* 802F4564 98 1C 00 45 */ stb r0, 0x45(r28) -/* 802F4568 88 1D 00 02 */ lbz r0, 2(r29) -/* 802F456C 98 1C 00 46 */ stb r0, 0x46(r28) -/* 802F4570 88 1D 00 03 */ lbz r0, 3(r29) -/* 802F4574 98 1C 00 47 */ stb r0, 0x47(r28) -/* 802F4578 88 1E 00 00 */ lbz r0, 0(r30) -/* 802F457C 98 1C 00 38 */ stb r0, 0x38(r28) -/* 802F4580 88 1E 00 01 */ lbz r0, 1(r30) -/* 802F4584 98 1C 00 39 */ stb r0, 0x39(r28) -/* 802F4588 88 1E 00 02 */ lbz r0, 2(r30) -/* 802F458C 98 1C 00 3A */ stb r0, 0x3a(r28) -/* 802F4590 88 1E 00 03 */ lbz r0, 3(r30) -/* 802F4594 98 1C 00 3B */ stb r0, 0x3b(r28) -/* 802F4598 88 1F 00 00 */ lbz r0, 0(r31) -/* 802F459C 98 1C 00 3C */ stb r0, 0x3c(r28) -/* 802F45A0 88 1F 00 01 */ lbz r0, 1(r31) -/* 802F45A4 98 1C 00 3D */ stb r0, 0x3d(r28) -/* 802F45A8 88 1F 00 02 */ lbz r0, 2(r31) -/* 802F45AC 98 1C 00 3E */ stb r0, 0x3e(r28) -/* 802F45B0 88 1F 00 03 */ lbz r0, 3(r31) -/* 802F45B4 98 1C 00 3F */ stb r0, 0x3f(r28) -/* 802F45B8 80 7C 00 04 */ lwz r3, 4(r28) -/* 802F45BC 28 03 00 00 */ cmplwi r3, 0 -/* 802F45C0 40 82 00 10 */ bne lbl_802F45D0 -/* 802F45C4 38 00 00 50 */ li r0, 0x50 -/* 802F45C8 B0 1C 00 58 */ sth r0, 0x58(r28) -/* 802F45CC 48 00 00 1C */ b lbl_802F45E8 -lbl_802F45D0: -/* 802F45D0 81 83 00 00 */ lwz r12, 0(r3) -/* 802F45D4 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 802F45D8 7D 89 03 A6 */ mtctr r12 -/* 802F45DC 4E 80 04 21 */ bctrl -/* 802F45E0 54 60 10 3A */ slwi r0, r3, 2 -/* 802F45E4 B0 1C 00 58 */ sth r0, 0x58(r28) -lbl_802F45E8: -/* 802F45E8 80 1C 00 04 */ lwz r0, 4(r28) -/* 802F45EC 28 00 00 00 */ cmplwi r0, 0 -/* 802F45F0 41 82 00 38 */ beq lbl_802F4628 -/* 802F45F4 7F 83 E3 78 */ mr r3, r28 -/* 802F45F8 48 00 00 CD */ bl setFontSize__8J2DPrintFv -/* 802F45FC 80 1C 00 3C */ lwz r0, 0x3c(r28) -/* 802F4600 90 01 00 08 */ stw r0, 8(r1) -/* 802F4604 80 1C 00 38 */ lwz r0, 0x38(r28) -/* 802F4608 90 01 00 0C */ stw r0, 0xc(r1) -/* 802F460C 80 7C 00 04 */ lwz r3, 4(r28) -/* 802F4610 38 81 00 0C */ addi r4, r1, 0xc -/* 802F4614 38 A1 00 08 */ addi r5, r1, 8 -/* 802F4618 81 83 00 00 */ lwz r12, 0(r3) -/* 802F461C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802F4620 7D 89 03 A6 */ mtctr r12 -/* 802F4624 4E 80 04 21 */ bctrl -lbl_802F4628: -/* 802F4628 7F 83 E3 78 */ mr r3, r28 -/* 802F462C 48 00 13 21 */ bl initchar__8J2DPrintFv -/* 802F4630 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 802F4634 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 802F4638 E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 802F463C CB C1 00 40 */ lfd f30, 0x40(r1) -/* 802F4640 39 61 00 40 */ addi r11, r1, 0x40 -/* 802F4644 48 06 DB D5 */ bl _restgpr_25 -/* 802F4648 80 01 00 64 */ lwz r0, 0x64(r1) -/* 802F464C 7C 08 03 A6 */ mtlr r0 -/* 802F4650 38 21 00 60 */ addi r1, r1, 0x60 -/* 802F4654 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPrint/getNumberF32__8J2DPrintFPPCUcffi.s b/asm/JSystem/J2DGraph/J2DPrint/getNumberF32__8J2DPrintFPPCUcffi.s deleted file mode 100644 index 127ac08e245..00000000000 --- a/asm/JSystem/J2DGraph/J2DPrint/getNumberF32__8J2DPrintFPPCUcffi.s +++ /dev/null @@ -1,85 +0,0 @@ -lbl_802F5AC4: -/* 802F5AC4 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802F5AC8 7C 08 02 A6 */ mflr r0 -/* 802F5ACC 90 01 00 44 */ stw r0, 0x44(r1) -/* 802F5AD0 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 802F5AD4 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 802F5AD8 DB C1 00 20 */ stfd f30, 0x20(r1) -/* 802F5ADC F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 802F5AE0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802F5AE4 93 C1 00 18 */ stw r30, 0x18(r1) -/* 802F5AE8 7C 9E 23 78 */ mr r30, r4 -/* 802F5AEC FF C0 08 90 */ fmr f30, f1 -/* 802F5AF0 FF E0 10 90 */ fmr f31, f2 -/* 802F5AF4 83 E4 00 00 */ lwz r31, 0(r4) -/* 802F5AF8 88 1F 00 00 */ lbz r0, 0(r31) -/* 802F5AFC 2C 00 00 5B */ cmpwi r0, 0x5b -/* 802F5B00 41 82 00 08 */ beq lbl_802F5B08 -/* 802F5B04 48 00 00 CC */ b lbl_802F5BD0 -lbl_802F5B08: -/* 802F5B08 38 1F 00 01 */ addi r0, r31, 1 -/* 802F5B0C 90 1E 00 00 */ stw r0, 0(r30) -/* 802F5B10 38 60 00 00 */ li r3, 0 -/* 802F5B14 2C 05 00 0A */ cmpwi r5, 0xa -/* 802F5B18 40 82 00 14 */ bne lbl_802F5B2C -/* 802F5B1C 80 7E 00 00 */ lwz r3, 0(r30) -/* 802F5B20 38 81 00 08 */ addi r4, r1, 8 -/* 802F5B24 48 07 30 DD */ bl strtol -/* 802F5B28 48 00 00 4C */ b lbl_802F5B74 -lbl_802F5B2C: -/* 802F5B2C 2C 05 00 10 */ cmpwi r5, 0x10 -/* 802F5B30 40 82 00 44 */ bne lbl_802F5B74 -/* 802F5B34 80 7E 00 00 */ lwz r3, 0(r30) -/* 802F5B38 38 81 00 08 */ addi r4, r1, 8 -/* 802F5B3C 48 07 31 B5 */ bl strtoul -/* 802F5B40 80 9E 00 00 */ lwz r4, 0(r30) -/* 802F5B44 80 01 00 08 */ lwz r0, 8(r1) -/* 802F5B48 7C 04 00 50 */ subf r0, r4, r0 -/* 802F5B4C 28 00 00 08 */ cmplwi r0, 8 -/* 802F5B50 41 82 00 24 */ beq lbl_802F5B74 -/* 802F5B54 28 00 00 06 */ cmplwi r0, 6 -/* 802F5B58 40 82 00 10 */ bne lbl_802F5B68 -/* 802F5B5C 54 60 40 2E */ slwi r0, r3, 8 -/* 802F5B60 60 03 00 FF */ ori r3, r0, 0xff -/* 802F5B64 48 00 00 10 */ b lbl_802F5B74 -lbl_802F5B68: -/* 802F5B68 93 FE 00 00 */ stw r31, 0(r30) -/* 802F5B6C FC 20 F8 90 */ fmr f1, f31 -/* 802F5B70 48 00 00 60 */ b lbl_802F5BD0 -lbl_802F5B74: -/* 802F5B74 80 81 00 08 */ lwz r4, 8(r1) -/* 802F5B78 88 04 00 00 */ lbz r0, 0(r4) -/* 802F5B7C 2C 00 00 5D */ cmpwi r0, 0x5d -/* 802F5B80 41 82 00 10 */ beq lbl_802F5B90 -/* 802F5B84 93 FE 00 00 */ stw r31, 0(r30) -/* 802F5B88 FC 20 F8 90 */ fmr f1, f31 -/* 802F5B8C 48 00 00 44 */ b lbl_802F5BD0 -lbl_802F5B90: -/* 802F5B90 80 1E 00 00 */ lwz r0, 0(r30) -/* 802F5B94 7C 00 20 40 */ cmplw r0, r4 -/* 802F5B98 40 82 00 14 */ bne lbl_802F5BAC -/* 802F5B9C 38 04 00 01 */ addi r0, r4, 1 -/* 802F5BA0 90 1E 00 00 */ stw r0, 0(r30) -/* 802F5BA4 FC 20 F0 90 */ fmr f1, f30 -/* 802F5BA8 48 00 00 28 */ b lbl_802F5BD0 -lbl_802F5BAC: -/* 802F5BAC 38 04 00 01 */ addi r0, r4, 1 -/* 802F5BB0 90 1E 00 00 */ stw r0, 0(r30) -/* 802F5BB4 C8 22 C7 D0 */ lfd f1, lit_650(r2) -/* 802F5BB8 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802F5BBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F5BC0 3C 00 43 30 */ lis r0, 0x4330 -/* 802F5BC4 90 01 00 10 */ stw r0, 0x10(r1) -/* 802F5BC8 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802F5BCC EC 20 08 28 */ fsubs f1, f0, f1 -lbl_802F5BD0: -/* 802F5BD0 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 802F5BD4 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 802F5BD8 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 802F5BDC CB C1 00 20 */ lfd f30, 0x20(r1) -/* 802F5BE0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802F5BE4 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 802F5BE8 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802F5BEC 7C 08 03 A6 */ mtlr r0 -/* 802F5BF0 38 21 00 40 */ addi r1, r1, 0x40 -/* 802F5BF4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPrint/parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb.s b/asm/JSystem/J2DGraph/J2DPrint/parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb.s deleted file mode 100644 index e4e81b222cc..00000000000 --- a/asm/JSystem/J2DGraph/J2DPrint/parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb.s +++ /dev/null @@ -1,520 +0,0 @@ -lbl_802F4B4C: -/* 802F4B4C 94 21 FE E0 */ stwu r1, -0x120(r1) -/* 802F4B50 7C 08 02 A6 */ mflr r0 -/* 802F4B54 90 01 01 24 */ stw r0, 0x124(r1) -/* 802F4B58 DB E1 01 10 */ stfd f31, 0x110(r1) -/* 802F4B5C F3 E1 01 18 */ psq_st f31, 280(r1), 0, 0 /* qr0 */ -/* 802F4B60 DB C1 01 00 */ stfd f30, 0x100(r1) -/* 802F4B64 F3 C1 01 08 */ psq_st f30, 264(r1), 0, 0 /* qr0 */ -/* 802F4B68 DB A1 00 F0 */ stfd f29, 0xf0(r1) -/* 802F4B6C F3 A1 00 F8 */ psq_st f29, 248(r1), 0, 0 /* qr0 */ -/* 802F4B70 DB 81 00 E0 */ stfd f28, 0xe0(r1) -/* 802F4B74 F3 81 00 E8 */ psq_st f28, 232(r1), 0, 0 /* qr0 */ -/* 802F4B78 DB 61 00 D0 */ stfd f27, 0xd0(r1) -/* 802F4B7C F3 61 00 D8 */ psq_st f27, 216(r1), 0, 0 /* qr0 */ -/* 802F4B80 DB 41 00 C0 */ stfd f26, 0xc0(r1) -/* 802F4B84 F3 41 00 C8 */ psq_st f26, 200(r1), 0, 0 /* qr0 */ -/* 802F4B88 DB 21 00 B0 */ stfd f25, 0xb0(r1) -/* 802F4B8C F3 21 00 B8 */ psq_st f25, 184(r1), 0, 0 /* qr0 */ -/* 802F4B90 DB 01 00 A0 */ stfd f24, 0xa0(r1) -/* 802F4B94 F3 01 00 A8 */ psq_st f24, 168(r1), 0, 0 /* qr0 */ -/* 802F4B98 DA E1 00 90 */ stfd f23, 0x90(r1) -/* 802F4B9C F2 E1 00 98 */ psq_st f23, 152(r1), 0, 0 /* qr0 */ -/* 802F4BA0 DA C1 00 80 */ stfd f22, 0x80(r1) -/* 802F4BA4 F2 C1 00 88 */ psq_st f22, 136(r1), 0, 0 /* qr0 */ -/* 802F4BA8 39 61 00 80 */ addi r11, r1, 0x80 -/* 802F4BAC 48 06 D6 0D */ bl _savegpr_20 -/* 802F4BB0 7C 74 1B 78 */ mr r20, r3 -/* 802F4BB4 90 81 00 08 */ stw r4, 8(r1) -/* 802F4BB8 7C B5 2B 78 */ mr r21, r5 -/* 802F4BBC 7C D6 33 78 */ mr r22, r6 -/* 802F4BC0 7C F7 3B 78 */ mr r23, r7 -/* 802F4BC4 7D 18 43 78 */ mr r24, r8 -/* 802F4BC8 7D 39 4B 78 */ mr r25, r9 -/* 802F4BCC 7D 5A 53 78 */ mr r26, r10 -/* 802F4BD0 80 03 00 04 */ lwz r0, 4(r3) -/* 802F4BD4 28 00 00 00 */ cmplwi r0, 0 -/* 802F4BD8 40 82 00 0C */ bne lbl_802F4BE4 -/* 802F4BDC C0 22 C7 C8 */ lfs f1, lit_418(r2) -/* 802F4BE0 48 00 06 A0 */ b lbl_802F5280 -lbl_802F4BE4: -/* 802F4BE4 7C 9F 23 78 */ mr r31, r4 -/* 802F4BE8 3B C0 00 00 */ li r30, 0 -/* 802F4BEC C3 F4 00 2C */ lfs f31, 0x2c(r20) -/* 802F4BF0 C3 D4 00 30 */ lfs f30, 0x30(r20) -/* 802F4BF4 FF A0 F8 90 */ fmr f29, f31 -/* 802F4BF8 FF 80 F0 90 */ fmr f28, f30 -/* 802F4BFC 38 04 00 01 */ addi r0, r4, 1 -/* 802F4C00 90 01 00 08 */ stw r0, 8(r1) -/* 802F4C04 8B A4 00 00 */ lbz r29, 0(r4) -/* 802F4C08 C0 14 00 2C */ lfs f0, 0x2c(r20) -/* 802F4C0C FF 60 00 90 */ fmr f27, f0 -/* 802F4C10 FF 40 00 90 */ fmr f26, f0 -/* 802F4C14 C0 14 00 30 */ lfs f0, 0x30(r20) -/* 802F4C18 FF 20 00 90 */ fmr f25, f0 -/* 802F4C1C FF 00 00 90 */ fmr f24, f0 -/* 802F4C20 80 14 00 08 */ lwz r0, 8(r20) -/* 802F4C24 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802F4C28 80 14 00 0C */ lwz r0, 0xc(r20) -/* 802F4C2C 90 01 00 18 */ stw r0, 0x18(r1) -/* 802F4C30 88 01 00 1F */ lbz r0, 0x1f(r1) -/* 802F4C34 57 24 06 3E */ clrlwi r4, r25, 0x18 -/* 802F4C38 7C 00 21 D6 */ mullw r0, r0, r4 -/* 802F4C3C 38 60 00 FF */ li r3, 0xff -/* 802F4C40 7C 00 1B D6 */ divw r0, r0, r3 -/* 802F4C44 98 01 00 1F */ stb r0, 0x1f(r1) -/* 802F4C48 88 01 00 1B */ lbz r0, 0x1b(r1) -/* 802F4C4C 7C 00 21 D6 */ mullw r0, r0, r4 -/* 802F4C50 7C 00 1B D6 */ divw r0, r0, r3 -/* 802F4C54 98 01 00 1B */ stb r0, 0x1b(r1) -/* 802F4C58 88 14 00 22 */ lbz r0, 0x22(r20) -/* 802F4C5C 28 00 00 00 */ cmplwi r0, 0 -/* 802F4C60 38 61 00 1C */ addi r3, r1, 0x1c -/* 802F4C64 41 82 00 08 */ beq lbl_802F4C6C -/* 802F4C68 38 61 00 18 */ addi r3, r1, 0x18 -lbl_802F4C6C: -/* 802F4C6C 80 03 00 00 */ lwz r0, 0(r3) -/* 802F4C70 90 01 00 10 */ stw r0, 0x10(r1) -/* 802F4C74 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 802F4C78 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F4C7C 80 74 00 04 */ lwz r3, 4(r20) -/* 802F4C80 38 81 00 14 */ addi r4, r1, 0x14 -/* 802F4C84 38 A1 00 10 */ addi r5, r1, 0x10 -/* 802F4C88 4B FE A1 3D */ bl setGradColor__7JUTFontFQ28JUtility6TColorQ28JUtility6TColor -lbl_802F4C8C: -/* 802F4C8C 3B 80 00 00 */ li r28, 0 -/* 802F4C90 80 74 00 04 */ lwz r3, 4(r20) -/* 802F4C94 7F A4 EB 78 */ mr r4, r29 -/* 802F4C98 81 83 00 00 */ lwz r12, 0(r3) -/* 802F4C9C 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 802F4CA0 7D 89 03 A6 */ mtctr r12 -/* 802F4CA4 4E 80 04 21 */ bctrl -/* 802F4CA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802F4CAC 41 82 00 20 */ beq lbl_802F4CCC -/* 802F4CB0 57 A4 40 2E */ slwi r4, r29, 8 -/* 802F4CB4 80 61 00 08 */ lwz r3, 8(r1) -/* 802F4CB8 38 03 00 01 */ addi r0, r3, 1 -/* 802F4CBC 90 01 00 08 */ stw r0, 8(r1) -/* 802F4CC0 88 03 00 00 */ lbz r0, 0(r3) -/* 802F4CC4 7C 9D 03 78 */ or r29, r4, r0 -/* 802F4CC8 3B 80 00 01 */ li r28, 1 -lbl_802F4CCC: -/* 802F4CCC 2C 1D 00 00 */ cmpwi r29, 0 -/* 802F4CD0 41 82 00 14 */ beq lbl_802F4CE4 -/* 802F4CD4 80 01 00 08 */ lwz r0, 8(r1) -/* 802F4CD8 7C 7F 00 50 */ subf r3, r31, r0 -/* 802F4CDC 7C 03 A8 40 */ cmplw r3, r21 -/* 802F4CE0 40 81 00 38 */ ble lbl_802F4D18 -lbl_802F4CE4: -/* 802F4CE4 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 802F4CE8 40 82 00 28 */ bne lbl_802F4D10 -/* 802F4CEC 28 17 00 00 */ cmplwi r23, 0 -/* 802F4CF0 41 82 00 20 */ beq lbl_802F4D10 -/* 802F4CF4 C0 02 C7 D8 */ lfs f0, lit_786(r2) -/* 802F4CF8 EC 00 E8 2A */ fadds f0, f0, f29 -/* 802F4CFC FC 00 00 1E */ fctiwz f0, f0 -/* 802F4D00 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 802F4D04 80 61 00 24 */ lwz r3, 0x24(r1) -/* 802F4D08 57 C0 0B FC */ rlwinm r0, r30, 1, 0xf, 0x1e -/* 802F4D0C 7C 77 03 2E */ sthx r3, r23, r0 -lbl_802F4D10: -/* 802F4D10 3B DE 00 01 */ addi r30, r30, 1 -/* 802F4D14 48 00 04 FC */ b lbl_802F5210 -lbl_802F4D18: -/* 802F4D18 3B 60 00 01 */ li r27, 1 -/* 802F4D1C C2 F4 00 2C */ lfs f23, 0x2c(r20) -/* 802F4D20 2C 1D 00 20 */ cmpwi r29, 0x20 -/* 802F4D24 40 80 00 DC */ bge lbl_802F4E00 -/* 802F4D28 2C 1D 00 1B */ cmpwi r29, 0x1b -/* 802F4D2C 40 82 00 78 */ bne lbl_802F4DA4 -/* 802F4D30 7E 83 A3 78 */ mr r3, r20 -/* 802F4D34 38 81 00 08 */ addi r4, r1, 8 -/* 802F4D38 7F 25 CB 78 */ mr r5, r25 -/* 802F4D3C 48 00 06 D5 */ bl doEscapeCode__8J2DPrintFPPCUcUc -/* 802F4D40 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 802F4D44 28 00 48 4D */ cmplwi r0, 0x484d -/* 802F4D48 40 82 00 4C */ bne lbl_802F4D94 -/* 802F4D4C 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 802F4D50 40 82 00 28 */ bne lbl_802F4D78 -/* 802F4D54 28 17 00 00 */ cmplwi r23, 0 -/* 802F4D58 41 82 00 20 */ beq lbl_802F4D78 -/* 802F4D5C C0 02 C7 D8 */ lfs f0, lit_786(r2) -/* 802F4D60 EC 00 E8 2A */ fadds f0, f0, f29 -/* 802F4D64 FC 00 00 1E */ fctiwz f0, f0 -/* 802F4D68 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 802F4D6C 80 81 00 24 */ lwz r4, 0x24(r1) -/* 802F4D70 57 C0 0B FC */ rlwinm r0, r30, 1, 0xf, 0x1e -/* 802F4D74 7C 97 03 2E */ sthx r4, r23, r0 -lbl_802F4D78: -/* 802F4D78 D3 F4 00 2C */ stfs f31, 0x2c(r20) -/* 802F4D7C D3 D4 00 30 */ stfs f30, 0x30(r20) -/* 802F4D80 3B DE 00 01 */ addi r30, r30, 1 -/* 802F4D84 57 C0 04 3E */ clrlwi r0, r30, 0x10 -/* 802F4D88 28 00 01 00 */ cmplwi r0, 0x100 -/* 802F4D8C 41 82 04 84 */ beq lbl_802F5210 -/* 802F4D90 C3 A2 C7 C8 */ lfs f29, lit_418(r2) -lbl_802F4D94: -/* 802F4D94 54 60 04 3F */ clrlwi. r0, r3, 0x10 -/* 802F4D98 41 82 03 68 */ beq lbl_802F5100 -/* 802F4D9C 3B 60 00 00 */ li r27, 0 -/* 802F4DA0 48 00 03 60 */ b lbl_802F5100 -lbl_802F4DA4: -/* 802F4DA4 7E 83 A3 78 */ mr r3, r20 -/* 802F4DA8 7F A4 EB 78 */ mr r4, r29 -/* 802F4DAC 48 00 05 3D */ bl doCtrlCode__8J2DPrintFi -/* 802F4DB0 3B 60 00 00 */ li r27, 0 -/* 802F4DB4 2C 1D 00 0A */ cmpwi r29, 0xa -/* 802F4DB8 40 82 03 48 */ bne lbl_802F5100 -/* 802F4DBC 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 802F4DC0 40 82 00 28 */ bne lbl_802F4DE8 -/* 802F4DC4 28 17 00 00 */ cmplwi r23, 0 -/* 802F4DC8 41 82 00 20 */ beq lbl_802F4DE8 -/* 802F4DCC C0 02 C7 D8 */ lfs f0, lit_786(r2) -/* 802F4DD0 EC 00 E8 2A */ fadds f0, f0, f29 -/* 802F4DD4 FC 00 00 1E */ fctiwz f0, f0 -/* 802F4DD8 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 802F4DDC 80 61 00 24 */ lwz r3, 0x24(r1) -/* 802F4DE0 57 C0 0B FC */ rlwinm r0, r30, 1, 0xf, 0x1e -/* 802F4DE4 7C 77 03 2E */ sthx r3, r23, r0 -lbl_802F4DE8: -/* 802F4DE8 3B DE 00 01 */ addi r30, r30, 1 -/* 802F4DEC 57 C0 04 3E */ clrlwi r0, r30, 0x10 -/* 802F4DF0 28 00 01 00 */ cmplwi r0, 0x100 -/* 802F4DF4 41 82 04 1C */ beq lbl_802F5210 -/* 802F4DF8 C3 A2 C7 C8 */ lfs f29, lit_418(r2) -/* 802F4DFC 48 00 03 04 */ b lbl_802F5100 -lbl_802F4E00: -/* 802F4E00 57 80 06 3F */ clrlwi. r0, r28, 0x18 -/* 802F4E04 41 82 00 40 */ beq lbl_802F4E44 -/* 802F4E08 7C 03 A8 40 */ cmplw r3, r21 -/* 802F4E0C 40 81 00 38 */ ble lbl_802F4E44 -/* 802F4E10 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 802F4E14 40 82 00 28 */ bne lbl_802F4E3C -/* 802F4E18 28 17 00 00 */ cmplwi r23, 0 -/* 802F4E1C 41 82 00 20 */ beq lbl_802F4E3C -/* 802F4E20 C0 02 C7 D8 */ lfs f0, lit_786(r2) -/* 802F4E24 EC 00 E8 2A */ fadds f0, f0, f29 -/* 802F4E28 FC 00 00 1E */ fctiwz f0, f0 -/* 802F4E2C D8 01 00 20 */ stfd f0, 0x20(r1) -/* 802F4E30 80 61 00 24 */ lwz r3, 0x24(r1) -/* 802F4E34 57 C0 0B FC */ rlwinm r0, r30, 1, 0xf, 0x1e -/* 802F4E38 7C 77 03 2E */ sthx r3, r23, r0 -lbl_802F4E3C: -/* 802F4E3C 3B DE 00 01 */ addi r30, r30, 1 -/* 802F4E40 48 00 03 D0 */ b lbl_802F5210 -lbl_802F4E44: -/* 802F4E44 80 74 00 04 */ lwz r3, 4(r20) -/* 802F4E48 88 03 00 05 */ lbz r0, 5(r3) -/* 802F4E4C 28 00 00 00 */ cmplwi r0, 0 -/* 802F4E50 41 82 00 2C */ beq lbl_802F4E7C -/* 802F4E54 80 03 00 08 */ lwz r0, 8(r3) -/* 802F4E58 C8 22 C7 D0 */ lfd f1, lit_650(r2) -/* 802F4E5C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802F4E60 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F4E64 3C 00 43 30 */ lis r0, 0x4330 -/* 802F4E68 90 01 00 20 */ stw r0, 0x20(r1) -/* 802F4E6C C8 01 00 20 */ lfd f0, 0x20(r1) -/* 802F4E70 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802F4E74 D0 14 00 34 */ stfs f0, 0x34(r20) -/* 802F4E78 48 00 00 3C */ b lbl_802F4EB4 -lbl_802F4E7C: -/* 802F4E7C 7F A4 EB 78 */ mr r4, r29 -/* 802F4E80 38 A1 00 0C */ addi r5, r1, 0xc -/* 802F4E84 81 83 00 00 */ lwz r12, 0(r3) -/* 802F4E88 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802F4E8C 7D 89 03 A6 */ mtctr r12 -/* 802F4E90 4E 80 04 21 */ bctrl -/* 802F4E94 88 01 00 0D */ lbz r0, 0xd(r1) -/* 802F4E98 C8 22 C7 E0 */ lfd f1, lit_791(r2) -/* 802F4E9C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F4EA0 3C 00 43 30 */ lis r0, 0x4330 -/* 802F4EA4 90 01 00 20 */ stw r0, 0x20(r1) -/* 802F4EA8 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 802F4EAC EC 00 08 28 */ fsubs f0, f0, f1 -/* 802F4EB0 D0 14 00 34 */ stfs f0, 0x34(r20) -lbl_802F4EB4: -/* 802F4EB4 80 74 00 04 */ lwz r3, 4(r20) -/* 802F4EB8 81 83 00 00 */ lwz r12, 0(r3) -/* 802F4EBC 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 802F4EC0 7D 89 03 A6 */ mtctr r12 -/* 802F4EC4 4E 80 04 21 */ bctrl -/* 802F4EC8 C8 62 C7 D0 */ lfd f3, lit_650(r2) -/* 802F4ECC 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802F4ED0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F4ED4 3C 60 43 30 */ lis r3, 0x4330 -/* 802F4ED8 90 61 00 20 */ stw r3, 0x20(r1) -/* 802F4EDC C8 01 00 20 */ lfd f0, 0x20(r1) -/* 802F4EE0 EC 20 18 28 */ fsubs f1, f0, f3 -/* 802F4EE4 C0 14 00 18 */ lfs f0, 0x18(r20) -/* 802F4EE8 EC 20 08 24 */ fdivs f1, f0, f1 -/* 802F4EEC C0 14 00 34 */ lfs f0, 0x34(r20) -/* 802F4EF0 EC 00 00 72 */ fmuls f0, f0, f1 -/* 802F4EF4 D0 14 00 34 */ stfs f0, 0x34(r20) -/* 802F4EF8 C0 34 00 2C */ lfs f1, 0x2c(r20) -/* 802F4EFC C0 14 00 34 */ lfs f0, 0x34(r20) -/* 802F4F00 EC 41 00 2A */ fadds f2, f1, f0 -/* 802F4F04 C0 14 00 24 */ lfs f0, 0x24(r20) -/* 802F4F08 EC 02 00 28 */ fsubs f0, f2, f0 -/* 802F4F0C C0 42 C7 E8 */ lfs f2, lit_913(r2) -/* 802F4F10 EC 02 00 32 */ fmuls f0, f2, f0 -/* 802F4F14 FC 00 00 1E */ fctiwz f0, f0 -/* 802F4F18 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 802F4F1C 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 802F4F20 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802F4F24 90 01 00 34 */ stw r0, 0x34(r1) -/* 802F4F28 90 61 00 30 */ stw r3, 0x30(r1) -/* 802F4F2C C8 01 00 30 */ lfd f0, 0x30(r1) -/* 802F4F30 EC 00 18 28 */ fsubs f0, f0, f3 -/* 802F4F34 EC 40 10 24 */ fdivs f2, f0, f2 -/* 802F4F38 6E C0 80 00 */ xoris r0, r22, 0x8000 -/* 802F4F3C 90 01 00 3C */ stw r0, 0x3c(r1) -/* 802F4F40 90 61 00 38 */ stw r3, 0x38(r1) -/* 802F4F44 C8 01 00 38 */ lfd f0, 0x38(r1) -/* 802F4F48 EC 00 18 28 */ fsubs f0, f0, f3 -/* 802F4F4C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 802F4F50 40 81 00 88 */ ble lbl_802F4FD8 -/* 802F4F54 FC 01 F8 40 */ fcmpo cr0, f1, f31 -/* 802F4F58 40 81 00 80 */ ble lbl_802F4FD8 -/* 802F4F5C 57 83 06 3E */ clrlwi r3, r28, 0x18 -/* 802F4F60 30 03 FF FF */ addic r0, r3, -1 -/* 802F4F64 7C 60 19 10 */ subfe r3, r0, r3 -/* 802F4F68 38 63 00 01 */ addi r3, r3, 1 -/* 802F4F6C 80 01 00 08 */ lwz r0, 8(r1) -/* 802F4F70 7C 03 00 50 */ subf r0, r3, r0 -/* 802F4F74 90 01 00 08 */ stw r0, 8(r1) -/* 802F4F78 C0 34 00 30 */ lfs f1, 0x30(r20) -/* 802F4F7C C0 14 00 14 */ lfs f0, 0x14(r20) -/* 802F4F80 EC 01 00 2A */ fadds f0, f1, f0 -/* 802F4F84 D0 14 00 30 */ stfs f0, 0x30(r20) -/* 802F4F88 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 802F4F8C 40 82 00 28 */ bne lbl_802F4FB4 -/* 802F4F90 28 17 00 00 */ cmplwi r23, 0 -/* 802F4F94 41 82 00 20 */ beq lbl_802F4FB4 -/* 802F4F98 C0 02 C7 D8 */ lfs f0, lit_786(r2) -/* 802F4F9C EC 00 E8 2A */ fadds f0, f0, f29 -/* 802F4FA0 FC 00 00 1E */ fctiwz f0, f0 -/* 802F4FA4 D8 01 00 38 */ stfd f0, 0x38(r1) -/* 802F4FA8 80 61 00 3C */ lwz r3, 0x3c(r1) -/* 802F4FAC 57 C0 0B FC */ rlwinm r0, r30, 1, 0xf, 0x1e -/* 802F4FB0 7C 77 03 2E */ sthx r3, r23, r0 -lbl_802F4FB4: -/* 802F4FB4 3B DE 00 01 */ addi r30, r30, 1 -/* 802F4FB8 57 C0 04 3E */ clrlwi r0, r30, 0x10 -/* 802F4FBC 28 00 01 00 */ cmplwi r0, 0x100 -/* 802F4FC0 41 82 02 50 */ beq lbl_802F5210 -/* 802F4FC4 C0 14 00 24 */ lfs f0, 0x24(r20) -/* 802F4FC8 D0 14 00 2C */ stfs f0, 0x2c(r20) -/* 802F4FCC C3 A2 C7 C8 */ lfs f29, lit_418(r2) -/* 802F4FD0 3B 60 00 00 */ li r27, 0 -/* 802F4FD4 48 00 01 2C */ b lbl_802F5100 -lbl_802F4FD8: -/* 802F4FD8 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 802F4FDC 41 82 01 14 */ beq lbl_802F50F0 -/* 802F4FE0 28 17 00 00 */ cmplwi r23, 0 -/* 802F4FE4 41 82 00 9C */ beq lbl_802F5080 -/* 802F4FE8 80 74 00 04 */ lwz r3, 4(r20) -/* 802F4FEC 57 C0 0B FC */ rlwinm r0, r30, 1, 0xf, 0x1e -/* 802F4FF0 7C 17 02 2E */ lhzx r0, r23, r0 -/* 802F4FF4 7C 00 07 34 */ extsh r0, r0 -/* 802F4FF8 C8 82 C7 D0 */ lfd f4, lit_650(r2) -/* 802F4FFC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802F5000 90 01 00 3C */ stw r0, 0x3c(r1) -/* 802F5004 3C 80 43 30 */ lis r4, 0x4330 -/* 802F5008 90 81 00 38 */ stw r4, 0x38(r1) -/* 802F500C C8 01 00 38 */ lfd f0, 0x38(r1) -/* 802F5010 EC 00 20 28 */ fsubs f0, f0, f4 -/* 802F5014 EC 21 00 2A */ fadds f1, f1, f0 -/* 802F5018 C0 54 00 30 */ lfs f2, 0x30(r20) -/* 802F501C C0 14 00 18 */ lfs f0, 0x18(r20) -/* 802F5020 FC 00 00 1E */ fctiwz f0, f0 -/* 802F5024 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 802F5028 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802F502C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802F5030 90 01 00 2C */ stw r0, 0x2c(r1) -/* 802F5034 90 81 00 28 */ stw r4, 0x28(r1) -/* 802F5038 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 802F503C EC 60 20 28 */ fsubs f3, f0, f4 -/* 802F5040 C0 14 00 1C */ lfs f0, 0x1c(r20) -/* 802F5044 FC 00 00 1E */ fctiwz f0, f0 -/* 802F5048 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 802F504C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F5050 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802F5054 90 01 00 44 */ stw r0, 0x44(r1) -/* 802F5058 90 81 00 40 */ stw r4, 0x40(r1) -/* 802F505C C8 01 00 40 */ lfd f0, 0x40(r1) -/* 802F5060 EC 80 20 28 */ fsubs f4, f0, f4 -/* 802F5064 7F A4 EB 78 */ mr r4, r29 -/* 802F5068 38 A0 00 01 */ li r5, 1 -/* 802F506C 81 83 00 00 */ lwz r12, 0(r3) -/* 802F5070 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802F5074 7D 89 03 A6 */ mtctr r12 -/* 802F5078 4E 80 04 21 */ bctrl -/* 802F507C 48 00 00 74 */ b lbl_802F50F0 -lbl_802F5080: -/* 802F5080 80 74 00 04 */ lwz r3, 4(r20) -/* 802F5084 C0 54 00 30 */ lfs f2, 0x30(r20) -/* 802F5088 C0 14 00 18 */ lfs f0, 0x18(r20) -/* 802F508C FC 00 00 1E */ fctiwz f0, f0 -/* 802F5090 D8 01 00 40 */ stfd f0, 0x40(r1) -/* 802F5094 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802F5098 C8 82 C7 D0 */ lfd f4, lit_650(r2) -/* 802F509C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802F50A0 90 01 00 3C */ stw r0, 0x3c(r1) -/* 802F50A4 3C 80 43 30 */ lis r4, 0x4330 -/* 802F50A8 90 81 00 38 */ stw r4, 0x38(r1) -/* 802F50AC C8 01 00 38 */ lfd f0, 0x38(r1) -/* 802F50B0 EC 60 20 28 */ fsubs f3, f0, f4 -/* 802F50B4 C0 14 00 1C */ lfs f0, 0x1c(r20) -/* 802F50B8 FC 00 00 1E */ fctiwz f0, f0 -/* 802F50BC D8 01 00 30 */ stfd f0, 0x30(r1) -/* 802F50C0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802F50C4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802F50C8 90 01 00 2C */ stw r0, 0x2c(r1) -/* 802F50CC 90 81 00 28 */ stw r4, 0x28(r1) -/* 802F50D0 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 802F50D4 EC 80 20 28 */ fsubs f4, f0, f4 -/* 802F50D8 7F A4 EB 78 */ mr r4, r29 -/* 802F50DC 38 A0 00 01 */ li r5, 1 -/* 802F50E0 81 83 00 00 */ lwz r12, 0(r3) -/* 802F50E4 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 802F50E8 7D 89 03 A6 */ mtctr r12 -/* 802F50EC 4E 80 04 21 */ bctrl -lbl_802F50F0: -/* 802F50F0 C0 34 00 2C */ lfs f1, 0x2c(r20) -/* 802F50F4 C0 14 00 34 */ lfs f0, 0x34(r20) -/* 802F50F8 EC 01 00 2A */ fadds f0, f1, f0 -/* 802F50FC D0 14 00 2C */ stfs f0, 0x2c(r20) -lbl_802F5100: -/* 802F5100 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 802F5104 41 82 00 F8 */ beq lbl_802F51FC -/* 802F5108 C0 14 00 2C */ lfs f0, 0x2c(r20) -/* 802F510C EC 00 F8 28 */ fsubs f0, f0, f31 -/* 802F5110 FC 00 E8 40 */ fcmpo cr0, f0, f29 -/* 802F5114 40 81 00 08 */ ble lbl_802F511C -/* 802F5118 FF A0 00 90 */ fmr f29, f0 -lbl_802F511C: -/* 802F511C C0 34 00 2C */ lfs f1, 0x2c(r20) -/* 802F5120 C0 14 00 10 */ lfs f0, 0x10(r20) -/* 802F5124 EC 01 00 2A */ fadds f0, f1, f0 -/* 802F5128 D0 14 00 2C */ stfs f0, 0x2c(r20) -/* 802F512C C0 34 00 34 */ lfs f1, 0x34(r20) -/* 802F5130 C0 14 00 10 */ lfs f0, 0x10(r20) -/* 802F5134 EC 01 00 2A */ fadds f0, f1, f0 -/* 802F5138 D0 14 00 34 */ stfs f0, 0x34(r20) -/* 802F513C 80 74 00 04 */ lwz r3, 4(r20) -/* 802F5140 81 83 00 00 */ lwz r12, 0(r3) -/* 802F5144 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 802F5148 7D 89 03 A6 */ mtctr r12 -/* 802F514C 4E 80 04 21 */ bctrl -/* 802F5150 C8 22 C7 D0 */ lfd f1, lit_650(r2) -/* 802F5154 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802F5158 90 01 00 44 */ stw r0, 0x44(r1) -/* 802F515C 3C 00 43 30 */ lis r0, 0x4330 -/* 802F5160 90 01 00 40 */ stw r0, 0x40(r1) -/* 802F5164 C8 01 00 40 */ lfd f0, 0x40(r1) -/* 802F5168 EE C0 08 28 */ fsubs f22, f0, f1 -/* 802F516C 80 74 00 04 */ lwz r3, 4(r20) -/* 802F5170 81 83 00 00 */ lwz r12, 0(r3) -/* 802F5174 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802F5178 7D 89 03 A6 */ mtctr r12 -/* 802F517C 4E 80 04 21 */ bctrl -/* 802F5180 C8 22 C7 D0 */ lfd f1, lit_650(r2) -/* 802F5184 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802F5188 90 01 00 3C */ stw r0, 0x3c(r1) -/* 802F518C 3C 00 43 30 */ lis r0, 0x4330 -/* 802F5190 90 01 00 38 */ stw r0, 0x38(r1) -/* 802F5194 C8 01 00 38 */ lfd f0, 0x38(r1) -/* 802F5198 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802F519C C0 14 00 1C */ lfs f0, 0x1c(r20) -/* 802F51A0 EC 00 08 24 */ fdivs f0, f0, f1 -/* 802F51A4 EC 00 05 B2 */ fmuls f0, f0, f22 -/* 802F51A8 C0 34 00 30 */ lfs f1, 0x30(r20) -/* 802F51AC EC 01 00 2A */ fadds f0, f1, f0 -/* 802F51B0 FC 1C 00 40 */ fcmpo cr0, f28, f0 -/* 802F51B4 40 80 00 08 */ bge lbl_802F51BC -/* 802F51B8 FF 80 00 90 */ fmr f28, f0 -lbl_802F51BC: -/* 802F51BC C0 14 00 2C */ lfs f0, 0x2c(r20) -/* 802F51C0 FC 00 D0 40 */ fcmpo cr0, f0, f26 -/* 802F51C4 40 81 00 08 */ ble lbl_802F51CC -/* 802F51C8 FF 40 00 90 */ fmr f26, f0 -lbl_802F51CC: -/* 802F51CC FC 00 D8 40 */ fcmpo cr0, f0, f27 -/* 802F51D0 40 80 00 08 */ bge lbl_802F51D8 -/* 802F51D4 FF 60 00 90 */ fmr f27, f0 -lbl_802F51D8: -/* 802F51D8 FC 17 D8 40 */ fcmpo cr0, f23, f27 -/* 802F51DC 40 80 00 08 */ bge lbl_802F51E4 -/* 802F51E0 FF 60 B8 90 */ fmr f27, f23 -lbl_802F51E4: -/* 802F51E4 FC 01 C0 40 */ fcmpo cr0, f1, f24 -/* 802F51E8 40 81 00 08 */ ble lbl_802F51F0 -/* 802F51EC FF 00 08 90 */ fmr f24, f1 -lbl_802F51F0: -/* 802F51F0 FC 01 C8 40 */ fcmpo cr0, f1, f25 -/* 802F51F4 40 80 00 08 */ bge lbl_802F51FC -/* 802F51F8 FF 20 08 90 */ fmr f25, f1 -lbl_802F51FC: -/* 802F51FC 80 61 00 08 */ lwz r3, 8(r1) -/* 802F5200 38 03 00 01 */ addi r0, r3, 1 -/* 802F5204 90 01 00 08 */ stw r0, 8(r1) -/* 802F5208 8B A3 00 00 */ lbz r29, 0(r3) -/* 802F520C 4B FF FA 80 */ b lbl_802F4C8C -lbl_802F5210: -/* 802F5210 28 17 00 00 */ cmplwi r23, 0 -/* 802F5214 41 82 00 14 */ beq lbl_802F5228 -/* 802F5218 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802F521C 38 63 FF FF */ addi r3, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802F5220 57 C0 0B FC */ rlwinm r0, r30, 1, 0xf, 0x1e -/* 802F5224 7C 77 03 2E */ sthx r3, r23, r0 -lbl_802F5228: -/* 802F5228 EC 1A D8 28 */ fsubs f0, f26, f27 -/* 802F522C D0 18 00 00 */ stfs f0, 0(r24) -/* 802F5230 80 74 00 04 */ lwz r3, 4(r20) -/* 802F5234 81 83 00 00 */ lwz r12, 0(r3) -/* 802F5238 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802F523C 7D 89 03 A6 */ mtctr r12 -/* 802F5240 4E 80 04 21 */ bctrl -/* 802F5244 C8 22 C7 D0 */ lfd f1, lit_650(r2) -/* 802F5248 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802F524C 90 01 00 44 */ stw r0, 0x44(r1) -/* 802F5250 3C 00 43 30 */ lis r0, 0x4330 -/* 802F5254 90 01 00 40 */ stw r0, 0x40(r1) -/* 802F5258 C8 01 00 40 */ lfd f0, 0x40(r1) -/* 802F525C EC 20 08 28 */ fsubs f1, f0, f1 -/* 802F5260 EC 18 C8 28 */ fsubs f0, f24, f25 -/* 802F5264 EC 00 08 2A */ fadds f0, f0, f1 -/* 802F5268 D0 18 00 04 */ stfs f0, 4(r24) -/* 802F526C 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 802F5270 40 82 00 0C */ bne lbl_802F527C -/* 802F5274 D3 F4 00 2C */ stfs f31, 0x2c(r20) -/* 802F5278 D3 D4 00 30 */ stfs f30, 0x30(r20) -lbl_802F527C: -/* 802F527C EC 3C F0 28 */ fsubs f1, f28, f30 -lbl_802F5280: -/* 802F5280 E3 E1 01 18 */ psq_l f31, 280(r1), 0, 0 /* qr0 */ -/* 802F5284 CB E1 01 10 */ lfd f31, 0x110(r1) -/* 802F5288 E3 C1 01 08 */ psq_l f30, 264(r1), 0, 0 /* qr0 */ -/* 802F528C CB C1 01 00 */ lfd f30, 0x100(r1) -/* 802F5290 E3 A1 00 F8 */ psq_l f29, 248(r1), 0, 0 /* qr0 */ -/* 802F5294 CB A1 00 F0 */ lfd f29, 0xf0(r1) -/* 802F5298 E3 81 00 E8 */ psq_l f28, 232(r1), 0, 0 /* qr0 */ -/* 802F529C CB 81 00 E0 */ lfd f28, 0xe0(r1) -/* 802F52A0 E3 61 00 D8 */ psq_l f27, 216(r1), 0, 0 /* qr0 */ -/* 802F52A4 CB 61 00 D0 */ lfd f27, 0xd0(r1) -/* 802F52A8 E3 41 00 C8 */ psq_l f26, 200(r1), 0, 0 /* qr0 */ -/* 802F52AC CB 41 00 C0 */ lfd f26, 0xc0(r1) -/* 802F52B0 E3 21 00 B8 */ psq_l f25, 184(r1), 0, 0 /* qr0 */ -/* 802F52B4 CB 21 00 B0 */ lfd f25, 0xb0(r1) -/* 802F52B8 E3 01 00 A8 */ psq_l f24, 168(r1), 0, 0 /* qr0 */ -/* 802F52BC CB 01 00 A0 */ lfd f24, 0xa0(r1) -/* 802F52C0 E2 E1 00 98 */ psq_l f23, 152(r1), 0, 0 /* qr0 */ -/* 802F52C4 CA E1 00 90 */ lfd f23, 0x90(r1) -/* 802F52C8 E2 C1 00 88 */ psq_l f22, 136(r1), 0, 0 /* qr0 */ -/* 802F52CC CA C1 00 80 */ lfd f22, 0x80(r1) -/* 802F52D0 39 61 00 80 */ addi r11, r1, 0x80 -/* 802F52D4 48 06 CF 31 */ bl _restgpr_20 -/* 802F52D8 80 01 01 24 */ lwz r0, 0x124(r1) -/* 802F52DC 7C 08 03 A6 */ mtlr r0 -/* 802F52E0 38 21 01 20 */ addi r1, r1, 0x120 -/* 802F52E4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPrint/printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc.s b/asm/JSystem/J2DGraph/J2DPrint/printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc.s deleted file mode 100644 index 887ab1a3e70..00000000000 --- a/asm/JSystem/J2DGraph/J2DPrint/printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc.s +++ /dev/null @@ -1,213 +0,0 @@ -lbl_802F4828: -/* 802F4828 94 21 FD 50 */ stwu r1, -0x2b0(r1) -/* 802F482C 7C 08 02 A6 */ mflr r0 -/* 802F4830 90 01 02 B4 */ stw r0, 0x2b4(r1) -/* 802F4834 DB E1 02 A0 */ stfd f31, 0x2a0(r1) -/* 802F4838 F3 E1 02 A8 */ psq_st f31, 680(r1), 0, 0 /* qr0 */ -/* 802F483C DB C1 02 90 */ stfd f30, 0x290(r1) -/* 802F4840 F3 C1 02 98 */ psq_st f30, 664(r1), 0, 0 /* qr0 */ -/* 802F4844 DB A1 02 80 */ stfd f29, 0x280(r1) -/* 802F4848 F3 A1 02 88 */ psq_st f29, 648(r1), 0, 0 /* qr0 */ -/* 802F484C DB 81 02 70 */ stfd f28, 0x270(r1) -/* 802F4850 F3 81 02 78 */ psq_st f28, 632(r1), 0, 0 /* qr0 */ -/* 802F4854 DB 61 02 60 */ stfd f27, 0x260(r1) -/* 802F4858 F3 61 02 68 */ psq_st f27, 616(r1), 0, 0 /* qr0 */ -/* 802F485C DB 41 02 50 */ stfd f26, 0x250(r1) -/* 802F4860 F3 41 02 58 */ psq_st f26, 600(r1), 0, 0 /* qr0 */ -/* 802F4864 39 61 02 50 */ addi r11, r1, 0x250 -/* 802F4868 48 06 D9 65 */ bl _savegpr_25 -/* 802F486C 7C 7A 1B 78 */ mr r26, r3 -/* 802F4870 7C 9B 23 78 */ mr r27, r4 -/* 802F4874 FF 80 08 90 */ fmr f28, f1 -/* 802F4878 FF 40 10 90 */ fmr f26, f2 -/* 802F487C 7C BC 2B 78 */ mr r28, r5 -/* 802F4880 7C D9 33 78 */ mr r25, r6 -/* 802F4884 FF A0 18 90 */ fmr f29, f3 -/* 802F4888 FF C0 20 90 */ fmr f30, f4 -/* 802F488C 7C FD 3B 78 */ mr r29, r7 -/* 802F4890 80 03 00 04 */ lwz r0, 4(r3) -/* 802F4894 28 00 00 00 */ cmplwi r0, 0 -/* 802F4898 41 82 02 6C */ beq lbl_802F4B04 -/* 802F489C 48 00 10 B1 */ bl initchar__8J2DPrintFv -/* 802F48A0 C0 1A 00 2C */ lfs f0, 0x2c(r26) -/* 802F48A4 D0 1A 00 24 */ stfs f0, 0x24(r26) -/* 802F48A8 C0 1A 00 30 */ lfs f0, 0x30(r26) -/* 802F48AC D0 1A 00 28 */ stfs f0, 0x28(r26) -/* 802F48B0 7F 63 DB 78 */ mr r3, r27 -/* 802F48B4 48 07 43 31 */ bl strlen -/* 802F48B8 7C 65 1B 78 */ mr r5, r3 -/* 802F48BC 80 6D 90 08 */ lwz r3, mStrBuffSize__8J2DPrint(r13) -/* 802F48C0 7C 05 18 40 */ cmplw r5, r3 -/* 802F48C4 41 80 00 10 */ blt lbl_802F48D4 -/* 802F48C8 38 A3 FF FF */ addi r5, r3, -1 -/* 802F48CC 38 00 00 01 */ li r0, 1 -/* 802F48D0 98 0D 90 0C */ stb r0, data_8045158C(r13) -lbl_802F48D4: -/* 802F48D4 7F 43 D3 78 */ mr r3, r26 -/* 802F48D8 7F 64 DB 78 */ mr r4, r27 -/* 802F48DC 7C BE 2B 78 */ mr r30, r5 -/* 802F48E0 FC 00 E0 1E */ fctiwz f0, f28 -/* 802F48E4 D8 01 02 18 */ stfd f0, 0x218(r1) -/* 802F48E8 83 E1 02 1C */ lwz r31, 0x21c(r1) -/* 802F48EC 7F E6 FB 78 */ mr r6, r31 -/* 802F48F0 38 E1 00 10 */ addi r7, r1, 0x10 -/* 802F48F4 39 01 00 08 */ addi r8, r1, 8 -/* 802F48F8 7F A9 EB 78 */ mr r9, r29 -/* 802F48FC 39 40 00 00 */ li r10, 0 -/* 802F4900 48 00 02 4D */ bl parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb -/* 802F4904 FF 60 08 90 */ fmr f27, f1 -/* 802F4908 80 7A 00 04 */ lwz r3, 4(r26) -/* 802F490C 81 83 00 00 */ lwz r12, 0(r3) -/* 802F4910 81 8C 00 34 */ lwz r12, 0x34(r12) -/* 802F4914 7D 89 03 A6 */ mtctr r12 -/* 802F4918 4E 80 04 21 */ bctrl -/* 802F491C C8 22 C7 D0 */ lfd f1, lit_650(r2) -/* 802F4920 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802F4924 90 01 02 24 */ stw r0, 0x224(r1) -/* 802F4928 3C 00 43 30 */ lis r0, 0x4330 -/* 802F492C 90 01 02 20 */ stw r0, 0x220(r1) -/* 802F4930 C8 01 02 20 */ lfd f0, 0x220(r1) -/* 802F4934 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802F4938 C0 1A 00 54 */ lfs f0, 0x54(r26) -/* 802F493C EF E0 08 24 */ fdivs f31, f0, f1 -/* 802F4940 80 7A 00 04 */ lwz r3, 4(r26) -/* 802F4944 81 83 00 00 */ lwz r12, 0(r3) -/* 802F4948 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802F494C 7D 89 03 A6 */ mtctr r12 -/* 802F4950 4E 80 04 21 */ bctrl -/* 802F4954 C8 42 C7 D0 */ lfd f2, lit_650(r2) -/* 802F4958 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802F495C 90 01 02 2C */ stw r0, 0x22c(r1) -/* 802F4960 3C 60 43 30 */ lis r3, 0x4330 -/* 802F4964 90 61 02 28 */ stw r3, 0x228(r1) -/* 802F4968 C8 01 02 28 */ lfd f0, 0x228(r1) -/* 802F496C EC 00 10 28 */ fsubs f0, f0, f2 -/* 802F4970 EF E0 07 F2 */ fmuls f31, f0, f31 -/* 802F4974 EC 1B F8 2A */ fadds f0, f27, f31 -/* 802F4978 2C 19 00 01 */ cmpwi r25, 1 -/* 802F497C 41 82 00 18 */ beq lbl_802F4994 -/* 802F4980 40 80 00 80 */ bge lbl_802F4A00 -/* 802F4984 2C 19 00 00 */ cmpwi r25, 0 -/* 802F4988 40 80 00 40 */ bge lbl_802F49C8 -/* 802F498C 48 00 00 74 */ b lbl_802F4A00 -/* 802F4990 48 00 00 70 */ b lbl_802F4A00 -lbl_802F4994: -/* 802F4994 EC 3A 00 28 */ fsubs f1, f26, f0 -/* 802F4998 C0 02 C7 D8 */ lfs f0, lit_786(r2) -/* 802F499C EC 01 00 28 */ fsubs f0, f1, f0 -/* 802F49A0 FC 00 00 1E */ fctiwz f0, f0 -/* 802F49A4 D8 01 02 28 */ stfd f0, 0x228(r1) -/* 802F49A8 80 01 02 2C */ lwz r0, 0x22c(r1) -/* 802F49AC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802F49B0 90 01 02 24 */ stw r0, 0x224(r1) -/* 802F49B4 90 61 02 20 */ stw r3, 0x220(r1) -/* 802F49B8 C8 01 02 20 */ lfd f0, 0x220(r1) -/* 802F49BC EC 00 10 28 */ fsubs f0, f0, f2 -/* 802F49C0 EF DE 00 2A */ fadds f30, f30, f0 -/* 802F49C4 48 00 00 3C */ b lbl_802F4A00 -lbl_802F49C8: -/* 802F49C8 EC 3A 00 28 */ fsubs f1, f26, f0 -/* 802F49CC C0 02 C7 D8 */ lfs f0, lit_786(r2) -/* 802F49D0 EC 01 00 28 */ fsubs f0, f1, f0 -/* 802F49D4 FC 00 00 1E */ fctiwz f0, f0 -/* 802F49D8 D8 01 02 28 */ stfd f0, 0x228(r1) -/* 802F49DC 80 01 02 2C */ lwz r0, 0x22c(r1) -/* 802F49E0 7C 00 0E 70 */ srawi r0, r0, 1 -/* 802F49E4 7C 00 01 94 */ addze r0, r0 -/* 802F49E8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802F49EC 90 01 02 24 */ stw r0, 0x224(r1) -/* 802F49F0 90 61 02 20 */ stw r3, 0x220(r1) -/* 802F49F4 C8 01 02 20 */ lfd f0, 0x220(r1) -/* 802F49F8 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802F49FC EF DE 00 2A */ fadds f30, f30, f0 -lbl_802F4A00: -/* 802F4A00 38 60 00 00 */ li r3, 0 -/* 802F4A04 38 81 00 10 */ addi r4, r1, 0x10 -/* 802F4A08 48 00 00 98 */ b lbl_802F4AA0 -lbl_802F4A0C: -/* 802F4A0C 2C 1C 00 01 */ cmpwi r28, 1 -/* 802F4A10 41 82 00 28 */ beq lbl_802F4A38 -/* 802F4A14 40 80 00 10 */ bge lbl_802F4A24 -/* 802F4A18 2C 1C 00 00 */ cmpwi r28, 0 -/* 802F4A1C 40 80 00 4C */ bge lbl_802F4A68 -/* 802F4A20 48 00 00 7C */ b lbl_802F4A9C -lbl_802F4A24: -/* 802F4A24 2C 1C 00 03 */ cmpwi r28, 3 -/* 802F4A28 40 80 00 74 */ bge lbl_802F4A9C -/* 802F4A2C 38 00 00 00 */ li r0, 0 -/* 802F4A30 7C 04 1B 2E */ sthx r0, r4, r3 -/* 802F4A34 48 00 00 68 */ b lbl_802F4A9C -lbl_802F4A38: -/* 802F4A38 C8 22 C7 E0 */ lfd f1, lit_791(r2) -/* 802F4A3C 90 01 02 2C */ stw r0, 0x22c(r1) -/* 802F4A40 3C 00 43 30 */ lis r0, 0x4330 -/* 802F4A44 90 01 02 28 */ stw r0, 0x228(r1) -/* 802F4A48 C8 01 02 28 */ lfd f0, 0x228(r1) -/* 802F4A4C EC 00 08 28 */ fsubs f0, f0, f1 -/* 802F4A50 EC 1C 00 28 */ fsubs f0, f28, f0 -/* 802F4A54 FC 00 00 1E */ fctiwz f0, f0 -/* 802F4A58 D8 01 02 20 */ stfd f0, 0x220(r1) -/* 802F4A5C 80 01 02 24 */ lwz r0, 0x224(r1) -/* 802F4A60 7C 04 1B 2E */ sthx r0, r4, r3 -/* 802F4A64 48 00 00 38 */ b lbl_802F4A9C -lbl_802F4A68: -/* 802F4A68 C8 22 C7 E0 */ lfd f1, lit_791(r2) -/* 802F4A6C 90 01 02 2C */ stw r0, 0x22c(r1) -/* 802F4A70 3C 00 43 30 */ lis r0, 0x4330 -/* 802F4A74 90 01 02 28 */ stw r0, 0x228(r1) -/* 802F4A78 C8 01 02 28 */ lfd f0, 0x228(r1) -/* 802F4A7C EC 00 08 28 */ fsubs f0, f0, f1 -/* 802F4A80 EC 3C 00 28 */ fsubs f1, f28, f0 -/* 802F4A84 C0 02 C7 D8 */ lfs f0, lit_786(r2) -/* 802F4A88 EC 01 00 32 */ fmuls f0, f1, f0 -/* 802F4A8C FC 00 00 1E */ fctiwz f0, f0 -/* 802F4A90 D8 01 02 20 */ stfd f0, 0x220(r1) -/* 802F4A94 80 01 02 24 */ lwz r0, 0x224(r1) -/* 802F4A98 7C 04 1B 2E */ sthx r0, r4, r3 -lbl_802F4A9C: -/* 802F4A9C 38 63 00 02 */ addi r3, r3, 2 -lbl_802F4AA0: -/* 802F4AA0 7C 04 1A 2E */ lhzx r0, r4, r3 -/* 802F4AA4 28 00 FF FF */ cmplwi r0, 0xffff -/* 802F4AA8 40 82 FF 64 */ bne lbl_802F4A0C -/* 802F4AAC 7F 43 D3 78 */ mr r3, r26 -/* 802F4AB0 48 00 0E 9D */ bl initchar__8J2DPrintFv -/* 802F4AB4 C0 1A 00 2C */ lfs f0, 0x2c(r26) -/* 802F4AB8 EC 00 E8 2A */ fadds f0, f0, f29 -/* 802F4ABC D0 1A 00 2C */ stfs f0, 0x2c(r26) -/* 802F4AC0 C0 3A 00 30 */ lfs f1, 0x30(r26) -/* 802F4AC4 EC 1E F8 2A */ fadds f0, f30, f31 -/* 802F4AC8 EC 01 00 2A */ fadds f0, f1, f0 -/* 802F4ACC D0 1A 00 30 */ stfs f0, 0x30(r26) -/* 802F4AD0 C0 1A 00 2C */ lfs f0, 0x2c(r26) -/* 802F4AD4 D0 1A 00 24 */ stfs f0, 0x24(r26) -/* 802F4AD8 C0 1A 00 30 */ lfs f0, 0x30(r26) -/* 802F4ADC D0 1A 00 28 */ stfs f0, 0x28(r26) -/* 802F4AE0 7F 43 D3 78 */ mr r3, r26 -/* 802F4AE4 7F 64 DB 78 */ mr r4, r27 -/* 802F4AE8 7F C5 F3 78 */ mr r5, r30 -/* 802F4AEC 7F E6 FB 78 */ mr r6, r31 -/* 802F4AF0 38 E1 00 10 */ addi r7, r1, 0x10 -/* 802F4AF4 39 01 00 08 */ addi r8, r1, 8 -/* 802F4AF8 7F A9 EB 78 */ mr r9, r29 -/* 802F4AFC 39 40 00 01 */ li r10, 1 -/* 802F4B00 48 00 00 4D */ bl parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb -lbl_802F4B04: -/* 802F4B04 E3 E1 02 A8 */ psq_l f31, 680(r1), 0, 0 /* qr0 */ -/* 802F4B08 CB E1 02 A0 */ lfd f31, 0x2a0(r1) -/* 802F4B0C E3 C1 02 98 */ psq_l f30, 664(r1), 0, 0 /* qr0 */ -/* 802F4B10 CB C1 02 90 */ lfd f30, 0x290(r1) -/* 802F4B14 E3 A1 02 88 */ psq_l f29, 648(r1), 0, 0 /* qr0 */ -/* 802F4B18 CB A1 02 80 */ lfd f29, 0x280(r1) -/* 802F4B1C E3 81 02 78 */ psq_l f28, 632(r1), 0, 0 /* qr0 */ -/* 802F4B20 CB 81 02 70 */ lfd f28, 0x270(r1) -/* 802F4B24 E3 61 02 68 */ psq_l f27, 616(r1), 0, 0 /* qr0 */ -/* 802F4B28 CB 61 02 60 */ lfd f27, 0x260(r1) -/* 802F4B2C E3 41 02 58 */ psq_l f26, 600(r1), 0, 0 /* qr0 */ -/* 802F4B30 CB 41 02 50 */ lfd f26, 0x250(r1) -/* 802F4B34 39 61 02 50 */ addi r11, r1, 0x250 -/* 802F4B38 48 06 D6 E1 */ bl _restgpr_25 -/* 802F4B3C 80 01 02 B4 */ lwz r0, 0x2b4(r1) -/* 802F4B40 7C 08 03 A6 */ mtlr r0 -/* 802F4B44 38 21 02 B0 */ addi r1, r1, 0x2b0 -/* 802F4B48 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPrint/setFontSize__8J2DPrintFv.s b/asm/JSystem/J2DGraph/J2DPrint/setFontSize__8J2DPrintFv.s deleted file mode 100644 index 42c0b0f58b1..00000000000 --- a/asm/JSystem/J2DGraph/J2DPrint/setFontSize__8J2DPrintFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_802F46C4: -/* 802F46C4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F46C8 7C 08 02 A6 */ mflr r0 -/* 802F46CC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F46D0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802F46D4 7C 7F 1B 78 */ mr r31, r3 -/* 802F46D8 80 63 00 04 */ lwz r3, 4(r3) -/* 802F46DC 28 03 00 00 */ cmplwi r3, 0 -/* 802F46E0 41 82 00 68 */ beq lbl_802F4748 -/* 802F46E4 81 83 00 00 */ lwz r12, 0(r3) -/* 802F46E8 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 802F46EC 7D 89 03 A6 */ mtctr r12 -/* 802F46F0 4E 80 04 21 */ bctrl -/* 802F46F4 C8 22 C7 D0 */ lfd f1, lit_650(r2) -/* 802F46F8 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802F46FC 90 01 00 0C */ stw r0, 0xc(r1) -/* 802F4700 3C 00 43 30 */ lis r0, 0x4330 -/* 802F4704 90 01 00 08 */ stw r0, 8(r1) -/* 802F4708 C8 01 00 08 */ lfd f0, 8(r1) -/* 802F470C EC 00 08 28 */ fsubs f0, f0, f1 -/* 802F4710 D0 1F 00 50 */ stfs f0, 0x50(r31) -/* 802F4714 80 7F 00 04 */ lwz r3, 4(r31) -/* 802F4718 81 83 00 00 */ lwz r12, 0(r3) -/* 802F471C 81 8C 00 34 */ lwz r12, 0x34(r12) -/* 802F4720 7D 89 03 A6 */ mtctr r12 -/* 802F4724 4E 80 04 21 */ bctrl -/* 802F4728 C8 22 C7 D0 */ lfd f1, lit_650(r2) -/* 802F472C 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802F4730 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F4734 3C 00 43 30 */ lis r0, 0x4330 -/* 802F4738 90 01 00 10 */ stw r0, 0x10(r1) -/* 802F473C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802F4740 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802F4744 D0 1F 00 54 */ stfs f0, 0x54(r31) -lbl_802F4748: -/* 802F4748 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802F474C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F4750 7C 08 03 A6 */ mtlr r0 -/* 802F4754 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F4758 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/setTevStage__11J2DWindowExFb.s b/asm/JSystem/J2DGraph/J2DWindowEx/setTevStage__11J2DWindowExFb.s deleted file mode 100644 index 056f9b19b3c..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/setTevStage__11J2DWindowExFb.s +++ /dev/null @@ -1,82 +0,0 @@ -lbl_80302388: -/* 80302388 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8030238C 7C 08 02 A6 */ mflr r0 -/* 80302390 90 01 00 24 */ stw r0, 0x24(r1) -/* 80302394 39 61 00 20 */ addi r11, r1, 0x20 -/* 80302398 48 05 FE 39 */ bl _savegpr_26 -/* 8030239C 7C 7E 1B 78 */ mr r30, r3 -/* 803023A0 3B E0 00 00 */ li r31, 0 -/* 803023A4 3B A0 00 00 */ li r29, 0 -/* 803023A8 54 9C 06 3E */ clrlwi r28, r4, 0x18 -lbl_803023AC: -/* 803023AC 3B 7D 01 48 */ addi r27, r29, 0x148 -/* 803023B0 7C 7E D8 2E */ lwzx r3, r30, r27 -/* 803023B4 80 63 00 70 */ lwz r3, 0x70(r3) -/* 803023B8 38 80 00 00 */ li r4, 0 -/* 803023BC 81 83 00 00 */ lwz r12, 0(r3) -/* 803023C0 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 803023C4 7D 89 03 A6 */ mtctr r12 -/* 803023C8 4E 80 04 21 */ bctrl -/* 803023CC 7C 7A 1B 78 */ mr r26, r3 -/* 803023D0 7C 7E D8 2E */ lwzx r3, r30, r27 -/* 803023D4 80 63 00 70 */ lwz r3, 0x70(r3) -/* 803023D8 38 80 00 00 */ li r4, 0 -/* 803023DC 81 83 00 00 */ lwz r12, 0(r3) -/* 803023E0 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 803023E4 7D 89 03 A6 */ mtctr r12 -/* 803023E8 4E 80 04 21 */ bctrl -/* 803023EC 38 A0 00 00 */ li r5, 0 -/* 803023F0 28 03 00 00 */ cmplwi r3, 0 -/* 803023F4 41 82 00 2C */ beq lbl_80302420 -/* 803023F8 80 63 00 20 */ lwz r3, 0x20(r3) -/* 803023FC 88 03 00 00 */ lbz r0, 0(r3) -/* 80302400 2C 00 00 00 */ cmpwi r0, 0 -/* 80302404 41 82 00 0C */ beq lbl_80302410 -/* 80302408 2C 00 00 01 */ cmpwi r0, 1 -/* 8030240C 40 82 00 14 */ bne lbl_80302420 -lbl_80302410: -/* 80302410 88 03 00 01 */ lbz r0, 1(r3) -/* 80302414 2C 00 00 00 */ cmpwi r0, 0 -/* 80302418 40 82 00 08 */ bne lbl_80302420 -/* 8030241C 38 A0 00 01 */ li r5, 1 -lbl_80302420: -/* 80302420 28 1C 00 00 */ cmplwi r28, 0 -/* 80302424 40 82 00 20 */ bne lbl_80302444 -/* 80302428 7F C3 F3 78 */ mr r3, r30 -/* 8030242C 7F 44 D3 78 */ mr r4, r26 -/* 80302430 54 A5 06 3E */ clrlwi r5, r5, 0x18 -/* 80302434 30 05 FF FF */ addic r0, r5, -1 -/* 80302438 7C A0 29 10 */ subfe r5, r0, r5 -/* 8030243C 48 00 00 79 */ bl setStage__11J2DWindowExFP11J2DTevStageQ211J2DWindowEx10stage_enum -/* 80302440 48 00 00 4C */ b lbl_8030248C -lbl_80302444: -/* 80302444 7F C3 F3 78 */ mr r3, r30 -/* 80302448 7F 44 D3 78 */ mr r4, r26 -/* 8030244C 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 80302450 38 A0 00 03 */ li r5, 3 -/* 80302454 41 82 00 08 */ beq lbl_8030245C -/* 80302458 38 A0 00 04 */ li r5, 4 -lbl_8030245C: -/* 8030245C 48 00 00 59 */ bl setStage__11J2DWindowExFP11J2DTevStageQ211J2DWindowEx10stage_enum -/* 80302460 7C 7E D8 2E */ lwzx r3, r30, r27 -/* 80302464 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80302468 38 80 00 01 */ li r4, 1 -/* 8030246C 81 83 00 00 */ lwz r12, 0(r3) -/* 80302470 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 80302474 7D 89 03 A6 */ mtctr r12 -/* 80302478 4E 80 04 21 */ bctrl -/* 8030247C 7C 64 1B 78 */ mr r4, r3 -/* 80302480 7F C3 F3 78 */ mr r3, r30 -/* 80302484 38 A0 00 02 */ li r5, 2 -/* 80302488 48 00 00 2D */ bl setStage__11J2DWindowExFP11J2DTevStageQ211J2DWindowEx10stage_enum -lbl_8030248C: -/* 8030248C 3B FF 00 01 */ addi r31, r31, 1 -/* 80302490 2C 1F 00 04 */ cmpwi r31, 4 -/* 80302494 3B BD 00 04 */ addi r29, r29, 4 -/* 80302498 41 80 FF 14 */ blt lbl_803023AC -/* 8030249C 39 61 00 20 */ addi r11, r1, 0x20 -/* 803024A0 48 05 FD 7D */ bl _restgpr_26 -/* 803024A4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 803024A8 7C 08 03 A6 */ mtlr r0 -/* 803024AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 803024B0 4E 80 00 20 */ blr diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h index b2ab398cee2..752fe5b068f 100644 --- a/include/JSystem/J2DGraph/J2DAnimation.h +++ b/include/JSystem/J2DGraph/J2DAnimation.h @@ -54,7 +54,7 @@ public: } } /* 8030A358 */ virtual ~J2DAnmVtxColor() {} - /* 8030363C */ virtual void getColor(u8, u16, _GXColor*) const; + /* 8030363C */ virtual void getColor(u8, u16, _GXColor*) const {} u16 getAnmTableNum(u8 param_0) const { return mAnmTableNum[param_0]; } J3DAnmVtxColorIndexData* getAnmVtxColorIndexData(u8 param_0, u16 param_1) const { return &mVtxColorIndexData[param_0][param_1]; } u16* getVtxColorIndexPointer(u8 param_0) const { return mVtxColorIndexPointer[param_0]; } diff --git a/include/JSystem/J2DGraph/J2DWindowEx.h b/include/JSystem/J2DGraph/J2DWindowEx.h index 566fe2aba67..a8453065811 100644 --- a/include/JSystem/J2DGraph/J2DWindowEx.h +++ b/include/JSystem/J2DGraph/J2DWindowEx.h @@ -6,7 +6,13 @@ class J2DWindowEx : public J2DWindow { public: - enum stage_enum {}; + enum stage_enum { + STAGE_ENUM_0, + STAGE_ENUM_1, + STAGE_ENUM_2, + STAGE_ENUM_3, + STAGE_ENUM_4, + }; /* 80300C94 */ J2DWindowEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*); /* 80300F80 */ void setMinSize(); diff --git a/libs/JSystem/J2DGraph/J2DPrint.cpp b/libs/JSystem/J2DGraph/J2DPrint.cpp index 6d187bc6cfd..d645043707a 100644 --- a/libs/JSystem/J2DGraph/J2DPrint.cpp +++ b/libs/JSystem/J2DGraph/J2DPrint.cpp @@ -9,56 +9,8 @@ #include "stdio.h" #include "stdlib.h" #include "string.h" -#include "dol2asm.h" #include "global.h" -// -// Forward References: -// - -extern "C" f32 J2DPrint_print_alpha_va(J2DPrint* pPrint, u8 param_1, const char* fmt, va_list args); -extern "C" void -__ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor(); -extern "C" void __dt__8J2DPrintFv(); -extern "C" void -private_initiate__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorb(); -extern "C" void setBuffer__8J2DPrintFUl(); -extern "C" void setFontSize__8J2DPrintFv(); -extern "C" void locate__8J2DPrintFff(); -extern "C" void print__8J2DPrintFffUcPCce(); -extern "C" void printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc(); -extern "C" void parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb(); -extern "C" void doCtrlCode__8J2DPrintFi(); -extern "C" void doEscapeCode__8J2DPrintFPPCUcUc(); -extern "C" void initchar__8J2DPrintFv(); -extern "C" void getNumberS32__8J2DPrintFPPCUclli(); -extern "C" void getNumberF32__8J2DPrintFPPCUcffi(); -extern "C" u8 mStrBuff__8J2DPrint[4]; -extern "C" u8 mStrBuffSize__8J2DPrint[4]; - -// -// External References: -// - -extern "C" void* __nwa__FUlP7JKRHeapi(); -extern "C" void __dl__FPv(); -extern "C" void setGradColor__7JUTFontFQ28JUtility6TColorQ28JUtility6TColor(); -extern "C" void _savegpr_20(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_20(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" u8 sSystemHeap__7JKRHeap[4]; - -// -// Declarations: -// - /* ############################################################################################## */ /* 80451580-80451584 000A80 0004+00 3/3 0/0 0/0 .sbss mStrBuff__8J2DPrint */ const u8* J2DPrint::mStrBuff; @@ -72,14 +24,6 @@ size_t J2DPrint::mStrBuffSize; /* 8045158C-80451590 000A8C 0004+00 2/2 0/0 0/0 .sbss None */ static u8 data_8045158C[4]; -/* 804561C8-804561CC 0047C8 0004+00 6/6 0/0 0/0 .sdata2 @418 */ -SECTION_SDATA2 static u8 lit_418[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - /* 802F42F0-802F4394 2EEC30 00A4+00 1/1 0/0 0/0 .text J2DPrint_print_alpha_va */ f32 J2DPrint_print_alpha_va(J2DPrint* pPrint, u8 param_1, const char* fmt, va_list args) { pPrint->initchar(); @@ -87,7 +31,7 @@ f32 J2DPrint_print_alpha_va(J2DPrint* pPrint, u8 param_1, const char* fmt, va_li J2DPrint::TSize size; if (tmp < 0) { - return FLOAT_LABEL(lit_418); + return 0.0f; } else if (tmp >= J2DPrint::mStrBuffSize) { tmp = J2DPrint::mStrBuffSize - 1; data_8045158C[0] = 1; @@ -96,44 +40,6 @@ f32 J2DPrint_print_alpha_va(J2DPrint* pPrint, u8 param_1, const char* fmt, va_li return size.field_0x0; } -/* ############################################################################################## */ -/* 803CCF40-803CCFA0 -00001 0060+00 1/1 0/0 0/0 .data @938 */ -SECTION_DATA static void* lit_938[24] = { - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x28), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x44), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x9C), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x120), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x120), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0xC0), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x120), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x120), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x120), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x120), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x120), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x120), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x120), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x120), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x120), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x120), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x120), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x120), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x120), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x120), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0xD4), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0xE8), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0xFC), - (void*)(((char*)doCtrlCode__8J2DPrintFi) + 0x110), -}; - -/* 803CCFA0-803CCFB0 02A0C0 000C+04 2/2 0/0 0/0 .data __vt__8J2DPrint */ -SECTION_DATA extern void* __vt__8J2DPrint[3 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8J2DPrintFv, - /* padding */ - NULL, -}; - /* 802F4394-802F4420 2EECD4 008C+00 0/0 6/6 0/0 .text * __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor */ @@ -145,18 +51,9 @@ J2DPrint::J2DPrint(JUTFont* pFont, f32 param_1, f32 param_2, JUtility::TColor pa /* 802F4420-802F4468 2EED60 0048+00 1/0 6/6 0/0 .text __dt__8J2DPrintFv */ J2DPrint::~J2DPrint() {} -/* ############################################################################################## */ -/* 804561CC-804561D0 0047CC 0004+00 1/1 0/0 0/0 .sdata2 @644 */ -SECTION_SDATA2 static f32 lit_644 = 32.0f; - -/* 804561D0-804561D8 0047D0 0008+00 6/6 0/0 0/0 .sdata2 @650 */ -SECTION_SDATA2 static f64 lit_650 = 4503601774854144.0 /* cast s32 to float */; - /* 802F4468-802F4658 2EEDA8 01F0+00 1/1 0/0 0/0 .text * private_initiate__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorb */ -// matches with float literals -#ifdef NONMATCHING void J2DPrint::private_initiate(JUTFont* pFont, f32 param_1, f32 param_2, JUtility::TColor param_3, JUtility::TColor param_4, JUtility::TColor param_5, JUtility::TColor param_6, bool param_7) { @@ -196,19 +93,6 @@ void J2DPrint::private_initiate(JUTFont* pFont, f32 param_1, f32 param_2, JUtili } initchar(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPrint::private_initiate(JUTFont* param_0, f32 param_1, f32 param_2, - JUtility::TColor param_3, JUtility::TColor param_4, - JUtility::TColor param_5, JUtility::TColor param_6, - bool param_7) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPrint/func_802F4468.s" -} -#pragma pop -#endif /* 802F4658-802F46C4 2EEF98 006C+00 1/1 1/1 0/0 .text setBuffer__8J2DPrintFUl */ u8* J2DPrint::setBuffer(size_t size) { @@ -224,24 +108,12 @@ u8* J2DPrint::setBuffer(size_t size) { } /* 802F46C4-802F475C 2EF004 0098+00 1/1 0/0 0/0 .text setFontSize__8J2DPrintFv */ -// matches with auto generated literal -#ifdef NONMATCHING void J2DPrint::setFontSize() { if (mFont) { mFontSizeX = mFont->getCellWidth(); mFontSizeY = mFont->getCellHeight(); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPrint::setFontSize() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPrint/setFontSize__8J2DPrintFv.s" -} -#pragma pop -#endif /* 802F475C-802F4778 2EF09C 001C+00 2/2 2/2 0/0 .text locate__8J2DPrintFff */ void J2DPrint::locate(f32 param_0, f32 param_1) { @@ -249,7 +121,7 @@ void J2DPrint::locate(f32 param_0, f32 param_1) { field_0x28 = param_1; field_0x2c = param_0; mCursorV = param_1; - field_0x34 = FLOAT_LABEL(lit_418); + field_0x34 = 0.0f; } /* 802F4778-802F4828 2EF0B8 00B0+00 0/0 2/2 0/0 .text print__8J2DPrintFffUcPCce */ @@ -262,21 +134,8 @@ void J2DPrint::print(f32 param_0, f32 param_1, u8 param_2, char const* fmt, ...) va_end(args); } -/* ############################################################################################## */ -/* 804561D8-804561E0 0047D8 0004+04 2/2 0/0 0/0 .sdata2 @786 */ -SECTION_SDATA2 static f32 lit_786[1 + 1 /* padding */] = { - 0.5f, - /* padding */ - 0.0f, -}; - -/* 804561E0-804561E8 0047E0 0008+00 2/2 0/0 0/0 .sdata2 @791 */ -SECTION_SDATA2 static f64 lit_791 = 4503599627370496.0 /* cast u32 to float */; - /* 802F4828-802F4B4C 2EF168 0324+00 0/0 4/4 0/0 .text * printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc */ -// Matches with literals -#ifdef NONMATCHING void J2DPrint::printReturn(char const* param_0, f32 param_1, f32 param_2, J2DTextBoxHBinding param_3, J2DTextBoxVBinding param_4, f32 param_5, f32 param_6, u8 param_7) { @@ -333,27 +192,9 @@ void J2DPrint::printReturn(char const* param_0, f32 param_1, f32 param_2, parse((const u8*)param_0, sVar6, param_1, local_2b0, aTStack_2b8, param_7, true); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPrint::printReturn(char const* param_0, f32 param_1, f32 param_2, - J2DTextBoxHBinding param_3, J2DTextBoxVBinding param_4, f32 param_5, - f32 param_6, u8 param_7) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPrint/printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 804561E8-804561EC 0047E8 0004+00 1/1 0/0 0/0 .sdata2 @913 */ -SECTION_SDATA2 static f32 lit_913 = 10000.0f; /* 802F4B4C-802F52E8 2EF48C 079C+00 2/2 0/0 0/0 .text * parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb */ -// regswap -#ifdef NONMATCHING f32 J2DPrint::parse(u8 const* param_0, int param_1, int param_2, u16* param_3, J2DPrint::TSize& param_4, u8 param_5, bool param_6) { if (mFont == NULL) { @@ -376,9 +217,9 @@ f32 J2DPrint::parse(u8 const* param_0, int param_1, int param_2, u16* param_3, local_b8.a = local_b8.a * param_5 / 0xff; local_bc.a = local_bc.a * param_5 / 0xff; mFont->setGradColor(local_b8, field_0x22 ? local_bc : local_b8); - bool r25; do { bool local_f0 = false; + bool r25; if (mFont->isLeadByte(r27)) { r27 = (r27 << 8) | (*(param_0++)); local_f0 = true; @@ -518,25 +359,8 @@ f32 J2DPrint::parse(u8 const* param_0, int param_1, int param_2, u16* param_3, } return local_a8 - f28; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 J2DPrint::parse(u8 const* param_0, int param_1, int param_2, u16* param_3, - J2DPrint::TSize& param_4, u8 param_5, bool param_6) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPrint/parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 804561EC-804561F0 0047EC 0004+00 2/2 0/0 0/0 .sdata2 @937 */ -SECTION_SDATA2 static f32 lit_937 = 1.0f; /* 802F52E8-802F5410 2EFC28 0128+00 2/1 0/0 0/0 .text doCtrlCode__8J2DPrintFi */ -// Matches with literals -#ifdef NONMATCHING void J2DPrint::doCtrlCode(int param_0) { switch (param_0) { case 8: @@ -572,20 +396,8 @@ void J2DPrint::doCtrlCode(int param_0) { mCursorV += + 1.0f; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPrint::doCtrlCode(int param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPrint/doCtrlCode__8J2DPrintFi.s" -} -#pragma pop -#endif /* 802F5410-802F594C 2EFD50 053C+00 1/1 0/0 0/0 .text doEscapeCode__8J2DPrintFPPCUcUc */ -// Matches with literals -#ifdef NONMATCHING u16 J2DPrint::doEscapeCode(u8 const** param_0, u8 param_1) { u8 const* puVar9 = *param_0; u16 uVar11 = 0; @@ -701,16 +513,6 @@ u16 J2DPrint::doEscapeCode(u8 const** param_0, u8 param_1) { } return uVar11; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u16 J2DPrint::doEscapeCode(u8 const** param_0, u8 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPrint/doEscapeCode__8J2DPrintFPPCUcUc.s" -} -#pragma pop -#endif /* 802F594C-802F59C0 2F028C 0074+00 3/3 0/0 0/0 .text initchar__8J2DPrintFv */ void J2DPrint::initchar() { @@ -762,8 +564,6 @@ s32 J2DPrint::getNumberS32(u8 const** param_0, s32 param_1, s32 param_2, int bas } /* 802F5AC4-802F5BF8 2F0404 0134+00 1/1 0/0 0/0 .text getNumberF32__8J2DPrintFPPCUcffi */ -// Matches with literals -#ifdef NONMATCHING f32 J2DPrint::getNumberF32(u8 const** param_0, f32 param_1, f32 param_2, int base) { const u8* puVar1 = *param_0; s32 uVar2 = param_1; @@ -799,13 +599,3 @@ f32 J2DPrint::getNumberF32(u8 const** param_0, f32 param_1, f32 param_2, int bas } return uVar2; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 J2DPrint::getNumberF32(u8 const** param_0, f32 param_1, f32 param_2, int param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPrint/getNumberF32__8J2DPrintFPPCUcffi.s" -} -#pragma pop -#endif \ No newline at end of file diff --git a/libs/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/J2DGraph/J2DScreen.cpp index 89884a5ab08..6cf4ec5e381 100644 --- a/libs/JSystem/J2DGraph/J2DScreen.cpp +++ b/libs/JSystem/J2DGraph/J2DScreen.cpp @@ -7,6 +7,8 @@ #include "JSystem/J2DGraph/J2DPictureEx.h" #include "JSystem/J2DGraph/J2DTextBoxEx.h" #include "JSystem/J2DGraph/J2DWindowEx.h" +#include "JSystem/J2DGraph/J2DOrthoGraph.h" +#include "JSystem/J2DGraph/J2DMaterialFactory.h" #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JSupport/JSUMemoryStream.h" @@ -205,10 +207,10 @@ SECTION_SDATA2 static f32 lit_1563[1 + 1 /* padding */] = { }; /* 802F8498-802F8540 2F2DD8 00A8+00 0/0 59/59 4/4 .text __ct__9J2DScreenFv */ -// almost +// Matches with literals #ifdef NONMATCHING J2DScreen::J2DScreen() - : J2DPane(NULL, true, 'root', JGeometry::TBox2(0.0f, 0.0f, 640.0f, 480.0f)), mColor() { + : J2DPane(NULL, true, 'root', JGeometry::TBox2(JGeometry::TVec2(0.0f, 0.0f), JGeometry::TVec2(640.0f, 480.0f))), mColor() { field_0x4 = -1; mScissor = false; mMaterialNum = 0; diff --git a/libs/JSystem/J2DGraph/J2DWindowEx.cpp b/libs/JSystem/J2DGraph/J2DWindowEx.cpp index 8a825f5b75a..a36531b5bb9 100644 --- a/libs/JSystem/J2DGraph/J2DWindowEx.cpp +++ b/libs/JSystem/J2DGraph/J2DWindowEx.cpp @@ -534,6 +534,85 @@ SECTION_SDATA2 static f32 lit_2257[1 + 1 /* padding */] = { /* 80301994-80301D74 2FC2D4 03E0+00 1/0 0/0 0/0 .text * drawContents__11J2DWindowExFRCQ29JGeometry8TBox2 */ +// Matches with literals +#ifdef NONMATCHING +void J2DWindowEx::drawContents(JGeometry::TBox2 const& param_1) { + if (!param_1.isValid() || mContentsMaterial == NULL) { + return; + } + if (!mContentsMaterial->isVisible()) { + return; + } + mContentsMaterial->setGX(); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT); + JUtility::TColor TStack_b4(field_0x128); + JUtility::TColor TStack_b8(field_0x130); + JUtility::TColor TStack_bc(field_0x12C); + JUtility::TColor TStack_c0(field_0x134); + if (mContentsMaterial->getColorBlock()->getColorChan(1)->getMatSrc() == 1) { + if (mContentsMaterial->getMaterialAlphaCalc() == 1) { + TStack_b4.a = (TStack_b4.a * mColorAlpha) / 0xff; + TStack_b8.a = (TStack_b8.a * mColorAlpha) / 0xff; + TStack_bc.a = (TStack_bc.a * mColorAlpha) / 0xff; + TStack_c0.a = (TStack_c0.a * mColorAlpha) / 0xff; + } + } else if (mIsInfluencedAlpha) { + GXSetChanMatColor(GX_ALPHA0, JUtility::TColor(mColorAlpha)); + } + bool bVar5 = false; + f32 in_f31; + f32 in_f30; + f32 in_f29; + f32 in_f28; + if (mContentsMaterial->getTevBlock() != NULL) { + if (mContentsMaterial->getTevBlock()->getTexture(0)) { + bVar5 = true; + GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); + f32 dVar15 = mContentsMaterial->getTevBlock()->getTexture(0)->getWidth(); + f32 dVar14 = mContentsMaterial->getTevBlock()->getTexture(0)->getHeight(); + + f32 dVar12 = param_1.getWidth(); + f32 dVar13 = param_1.getHeight(); + in_f31 = -(dVar12 / dVar15 - 1.0f) / 2; + in_f30 = -((dVar13 / dVar14) - 1.0f) / 2; + in_f29 = in_f31 + (dVar12 / dVar15); + in_f28 = in_f30 + (dVar13 / dVar14); + } + } + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_F32, 0); + GXBegin(GX_QUADS, GX_VTXFMT0, 4); + GXPosition3f32(param_1.i.x, param_1.i.y, + 0.0f); + GXColor1u32(TStack_b4); + if (bVar5) { + GXTexCoord2f32(in_f31, in_f30); + } + GXPosition3f32(param_1.f.x, param_1.i.y, + 0.0f); + GXColor1u32(TStack_bc); + if (bVar5) { + GXTexCoord2f32(in_f29, in_f30); + } + GXPosition3f32(param_1.f.x, param_1.f.y, + 0.0f); + GXColor1u32(TStack_c0); + if (bVar5) { + GXTexCoord2f32(in_f29, in_f28); + } + GXPosition3f32(param_1.i.x, param_1.f.y, + 0.0f); + GXColor1u32(TStack_b8); + if (bVar5) { + GXTexCoord2f32(in_f31, in_f28); + } + GXEnd(); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGBX8, 0xf); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_RGBA4, 0); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -542,9 +621,58 @@ asm void J2DWindowEx::drawContents(JGeometry::TBox2 const& param_0) { #include "asm/JSystem/J2DGraph/J2DWindowEx/func_80301994.s" } #pragma pop +#endif /* 80301D74-80301FC8 2FC6B4 0254+00 1/1 0/0 0/0 .text * drawFrameTexture__11J2DWindowExFffffUsUsUsUsP11J2DMaterialb */ +// Matches with literals +#ifdef NONMATCHING +void J2DWindowEx::drawFrameTexture(f32 param_1, f32 param_2, f32 param_3, f32 param_4, u16 param_5, + u16 param_6, u16 param_7, u16 param_8, J2DMaterial* param_9, + bool param_10) { + if (param_9 != NULL && param_9->isVisible()) { + f32 dVar15 = param_1 + param_3; + f32 dVar14 = param_2 + param_4; + if (param_10) { + param_9->setGX(); + } + JUtility::TColor aTStack_84(0xffffffff); + J2DPane* parentPane = getParentPane(); + if (param_9->getColorBlock()->getColorChan(1)->getMatSrc() == 1) { + if (param_9->getMaterialAlphaCalc() == 1) { + u8 uVar11 = 0xff; + if (param_9->getColorBlock()->getMatColor(0) != 0) { + uVar11 = param_9->getColorBlock()->getMatColor(0)->a; + } + if (parentPane != NULL && mIsInfluencedAlpha != 0) { + uVar11 = ((uVar11 * parentPane->mColorAlpha) / 0xff); + } + aTStack_84 = JUtility::TColor((u32)uVar11 | 0xffffff00); + } + } else if (parentPane != NULL && mIsInfluencedAlpha != 0 && param_10) { + s32 matColorAlpha = param_9->getColorBlock()->getMatColor(0)->a; + s32 colorAlpha = parentPane->mColorAlpha; + GXSetChanMatColor(GX_ALPHA0, JUtility::TColor((matColorAlpha * colorAlpha / 0xff) & 0xff)); + } + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0); + GXBegin(GX_QUADS, GX_VTXFMT0, 4); + GXPosition3f32(param_1, param_2, 0.0f); + GXColor1u32(aTStack_84); + GXTexCoord2u16(param_7, param_8); + GXPosition3f32(dVar15, param_2, 0.0f); + GXColor1u32(aTStack_84); + GXTexCoord2u16(param_5, param_8); + GXPosition3f32(dVar15, dVar14, 0.0f); + GXColor1u32(aTStack_84); + GXTexCoord2u16(param_5, param_6); + GXPosition3f32(param_1, dVar14, 0.0f); + GXColor1u32(aTStack_84); + GXTexCoord2u16(param_7, param_6); + GXEnd(); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_RGBA4, 0); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -555,9 +683,38 @@ asm void J2DWindowEx::drawFrameTexture(f32 param_0, f32 param_1, f32 param_2, f3 #include "asm/JSystem/J2DGraph/J2DWindowEx/drawFrameTexture__11J2DWindowExFffffUsUsUsUsP11J2DMaterialb.s" } #pragma pop +#endif /* 80301FC8-80302164 2FC908 019C+00 1/0 0/0 0/0 .text draw__11J2DWindowExFRCQ29JGeometry8TBox2 */ +// Matches with literals +#ifdef NONMATCHING +void J2DWindowEx::draw(JGeometry::TBox2 const& param_1) { + bool isMissingTexture = false; + JUTTexture* local_68[4]; + for (int i = 0; i < 4; i++) { + if (mFrameMaterial[i] == NULL) { + return; + } + if (mFrameMaterial[i]->getTevBlock() == NULL) { + return; + } + local_68[i] = mFrameMaterial[i]->getTevBlock()->getTexture(0); + if (local_68[i] == NULL) { + isMissingTexture = true; + } + } + JGeometry::TBox2 aTStack_78; + if (!isMissingTexture) { + aTStack_78.set(local_68[0]->getWidth(), local_68[0]->getHeight(), + param_1.getWidth() - local_68[1]->getWidth(), + param_1.getHeight() - local_68[2]->getHeight()); + } else { + aTStack_78.set(0.0f, 0.0f, param_1.getWidth(), param_1.getHeight()); + } + draw(param_1, aTStack_78); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -566,9 +723,32 @@ asm void J2DWindowEx::draw(JGeometry::TBox2 const& param_0) { #include "asm/JSystem/J2DGraph/J2DWindowEx/func_80301FC8.s" } #pragma pop +#endif /* 80302164-80302284 2FCAA4 0120+00 1/0 0/0 0/0 .text * draw__11J2DWindowExFRCQ29JGeometry8TBox2RCQ29JGeometry8TBox2 */ +// Matches with literals +#ifdef NONMATCHING +void J2DWindowEx::draw(JGeometry::TBox2 const& param_1, JGeometry::TBox2 const& param_2) { + rewriteAlpha(); + mColorAlpha = mAlpha; + makeMatrix(param_1.i.x, param_1.i.y, 0.0f, 0.0f); + GXLoadPosMtxImm(mPositionMtx, 0); + GXSetCurrentMtx(0); + JGeometry::TBox2 aTStack_70(0.0f, 0.0f, param_1.getWidth(), param_1.getHeight()); + draw_private(aTStack_70, param_2); + for (int i = GX_TEV_SWAP0; i < GX_MAX_TEVSWAP; i++) { + GXSetTevSwapModeTable((GXTevSwapSel)i, GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE, GX_CH_ALPHA); + } + GXSetNumIndStages(0); + for (int i = GX_TEVSTAGE0; i < GX_MAX_TEVSTAGE; i++) { + GXSetTevDirect((GXTevStageID)i); + } + Mtx auStack_60; + MTXIdentity(auStack_60); + GXLoadPosMtxImm(auStack_60, 0); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -578,6 +758,7 @@ asm void J2DWindowEx::draw(JGeometry::TBox2 const& param_0, #include "asm/JSystem/J2DGraph/J2DWindowEx/func_80302164.s" } #pragma pop +#endif /* 80302284-80302388 2FCBC4 0104+00 1/1 0/0 0/0 .text setTevOrder__11J2DWindowExFb */ void J2DWindowEx::setTevOrder(bool param_0) { @@ -605,29 +786,45 @@ void J2DWindowEx::setTevOrder(bool param_0) { } /* 80302388-803024B4 2FCCC8 012C+00 1/1 0/0 0/0 .text setTevStage__11J2DWindowExFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::setTevStage(bool param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/setTevStage__11J2DWindowExFb.s" +void J2DWindowEx::setTevStage(bool param_1) { + for (int i = 0; i < 4; i++) { + J2DTevStage* pJVar3 = mFrameMaterial[i]->getTevBlock()->getTevStage(0); + JUTTexture* this_00 = mFrameMaterial[i]->getTevBlock()->getTexture(0); + bool bVar1 = false; + if (this_00 != NULL && ((s32)this_00->getFormat() == 0 || (s32)this_00->getFormat() == 1) && + this_00->getTransparency() == 0) + { + bVar1 = true; + } + if (!param_1) { + setStage(pJVar3, bVar1 ? STAGE_ENUM_1 : STAGE_ENUM_0); + } else { + stage_enum sVar5; + if (bVar1) { + sVar5 = STAGE_ENUM_4; + } else { + sVar5 = STAGE_ENUM_3; + } + setStage(pJVar3, sVar5); + setStage(mFrameMaterial[i]->getTevBlock()->getTevStage(1), STAGE_ENUM_2); + } + } } -#pragma pop /* 803024B4-80302764 2FCDF4 02B0+00 1/1 0/0 0/0 .text * setStage__11J2DWindowExFP11J2DTevStageQ211J2DWindowEx10stage_enum */ -// rlwinm/slwi diffs + regalloc. Need to verify data arrays. +// Matches with literals. #ifdef NONMATCHING void J2DWindowEx::setStage(J2DTevStage* param_0, J2DWindowEx::stage_enum param_1) { - u8 local_30[6][4] = { + s8 local_30[6][4] = { {0x0f, 0x08, 0x0a, 0x0f}, {0x0f, 0x08, 0x0a, 0x0f}, {0x0f, 0x0a, 0x00, 0x0f}, {0x02, 0x04, 0x08, 0x0f}, {0x02, 0x04, 0x08, 0x0f}, {0x0f, 0x0f, 0x0f, 0x0a}, }; - u8 local_48[6][4] = { + s8 local_48[6][4] = { {0x07, 0x04, 0x05, 0x07}, {0x05, 0x07, 0x07, 0x07}, {0x07, 0x05, 0x00, 0x07}, {0x01, 0x02, 0x04, 0x07}, {0x07, 0x07, 0x07, 0x02}, {0x07, 0x07, 0x07, 0x05}, }; - u8 local_68[6][5] = { + s8 local_68[6][5] = { {1, 0, 0, 0, 0}, {0, 0, 0, 0, 0}, {0, 1, 0, 0, 1}, {0, 0, 1, 0, 0}, {1, 0, 0, 0, 0}, {0, 0, 0, 0, 1}, }; @@ -1211,10 +1408,3 @@ bool J2DWindowEx::isUsed(ResFONT const* param_0) { void J2DWindowEx::setAnimation(J2DAnmBase* param_0) { J2DPane::setAnimation(param_0); } - -/* 8030363C-80303640 2FDF7C 0004+00 0/0 1/0 0/0 .text getColor__14J2DAnmVtxColorCFUcUsP8_GXColor - */ -// void J2DAnmVtxColor::getColor(u8 param_0, u16 param_1, _GXColor* param_2) const { -extern "C" void getColor__14J2DAnmVtxColorCFUcUsP8_GXColor() { - /* empty function */ -} diff --git a/obj_files.mk b/obj_files.mk index a3bceb85fd9..1fbabdb2587 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -1054,6 +1054,7 @@ O_FILES_SYM_ON := \ $(BUILD_DIR)/libs/JSystem/J2DGraph/J2DAnmLoader.o \ $(BUILD_DIR)/libs/JSystem/J2DGraph/J2DPicture.o \ $(BUILD_DIR)/libs/JSystem/J2DGraph/J2DMaterialFactory.o \ + $(BUILD_DIR)/libs/JSystem/J2DGraph/J2DWindowEx.o \ $(BUILD_DIR)/libs/JSystem/JUtility/JUTProcBar.o \ $(BUILD_DIR)/libs/JSystem/JKernel/JKRAramArchive.o \ $(BUILD_DIR)/libs/JSystem/J3DGraphLoader/J3DClusterLoader.o \