diff --git a/Progress.md b/Progress.md index f3f6b2f4199..c4d7b62a8c4 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 91.849662% | 8700 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 12.154891% | 437156 | 3596544 +.text | 12.590531% | 452824 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 21.402193% | 860512 | 4020672 +Total | 21.791880% | 876180 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 21.402193% | 860512 | 4020672 +main.dol | 21.791880% | 876180 | 4020672 RELs | 33.172039% | 3814892 | 11500324 -Total | 30.123093% | 4675404 | 15520996 +Total | 30.224040% | 4691072 | 15520996 ## RELs diff --git a/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__11J3DShapeMtxFv.s b/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__11J3DShapeMtxFv.s deleted file mode 100644 index 26510adff8b..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DShapeMtx/__dt__11J3DShapeMtxFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80314798: -/* 80314798 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031479C 7C 08 02 A6 */ mflr r0 -/* 803147A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 803147A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 803147A8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 803147AC 41 82 00 1C */ beq lbl_803147C8 -/* 803147B0 3C A0 80 3D */ lis r5, __vt__11J3DShapeMtx@ha /* 0x803CDC44@ha */ -/* 803147B4 38 05 DC 44 */ addi r0, r5, __vt__11J3DShapeMtx@l /* 0x803CDC44@l */ -/* 803147B8 90 1F 00 00 */ stw r0, 0(r31) -/* 803147BC 7C 80 07 35 */ extsh. r0, r4 -/* 803147C0 40 81 00 08 */ ble lbl_803147C8 -/* 803147C4 4B FB A5 79 */ bl __dl__FPv -lbl_803147C8: -/* 803147C8 7F E3 FB 78 */ mr r3, r31 -/* 803147CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 803147D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803147D4 7C 08 03 A6 */ mtlr r0 -/* 803147D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 803147DC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DTexture/addResTIMG__10J3DTextureFUsPC7ResTIMG.s b/asm/JSystem/J3DGraphBase/J3DTexture/addResTIMG__10J3DTextureFUsPC7ResTIMG.s deleted file mode 100644 index 48a4a27f3f5..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DTexture/addResTIMG__10J3DTextureFUsPC7ResTIMG.s +++ /dev/null @@ -1,161 +0,0 @@ -lbl_8031221C: -/* 8031221C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80312220 7C 08 02 A6 */ mflr r0 -/* 80312224 90 01 00 24 */ stw r0, 0x24(r1) -/* 80312228 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031222C 48 04 FF AD */ bl _savegpr_28 -/* 80312230 7C 7C 1B 78 */ mr r28, r3 -/* 80312234 7C BD 2B 78 */ mr r29, r5 -/* 80312238 54 80 04 3F */ clrlwi. r0, r4, 0x10 -/* 8031223C 41 82 02 34 */ beq lbl_80312470 -/* 80312240 A0 1C 00 00 */ lhz r0, 0(r28) -/* 80312244 7C 1F 03 78 */ mr r31, r0 -/* 80312248 83 DC 00 04 */ lwz r30, 4(r28) -/* 8031224C 7C 00 22 14 */ add r0, r0, r4 -/* 80312250 54 04 04 3E */ clrlwi r4, r0, 0x10 -/* 80312254 4B FF FF 51 */ bl entryNum__10J3DTextureFUs -/* 80312258 38 A0 00 00 */ li r5, 0 -/* 8031225C 57 E6 04 3E */ clrlwi r6, r31, 0x10 -/* 80312260 48 00 00 F8 */ b lbl_80312358 -lbl_80312264: -/* 80312264 80 7C 00 04 */ lwz r3, 4(r28) -/* 80312268 54 A0 2A F4 */ rlwinm r0, r5, 5, 0xb, 0x1a -/* 8031226C 7C 63 02 14 */ add r3, r3, r0 -/* 80312270 7C 9E 02 14 */ add r4, r30, r0 -/* 80312274 88 E4 00 00 */ lbz r7, 0(r4) -/* 80312278 98 E3 00 00 */ stb r7, 0(r3) -/* 8031227C 88 E4 00 01 */ lbz r7, 1(r4) -/* 80312280 98 E3 00 01 */ stb r7, 1(r3) -/* 80312284 A0 E4 00 02 */ lhz r7, 2(r4) -/* 80312288 B0 E3 00 02 */ sth r7, 2(r3) -/* 8031228C A0 E4 00 04 */ lhz r7, 4(r4) -/* 80312290 B0 E3 00 04 */ sth r7, 4(r3) -/* 80312294 88 E4 00 06 */ lbz r7, 6(r4) -/* 80312298 98 E3 00 06 */ stb r7, 6(r3) -/* 8031229C 88 E4 00 07 */ lbz r7, 7(r4) -/* 803122A0 98 E3 00 07 */ stb r7, 7(r3) -/* 803122A4 88 E4 00 08 */ lbz r7, 8(r4) -/* 803122A8 98 E3 00 08 */ stb r7, 8(r3) -/* 803122AC 88 E4 00 09 */ lbz r7, 9(r4) -/* 803122B0 98 E3 00 09 */ stb r7, 9(r3) -/* 803122B4 A0 E4 00 0A */ lhz r7, 0xa(r4) -/* 803122B8 B0 E3 00 0A */ sth r7, 0xa(r3) -/* 803122BC 80 E4 00 0C */ lwz r7, 0xc(r4) -/* 803122C0 90 E3 00 0C */ stw r7, 0xc(r3) -/* 803122C4 88 E4 00 10 */ lbz r7, 0x10(r4) -/* 803122C8 98 E3 00 10 */ stb r7, 0x10(r3) -/* 803122CC 88 E4 00 11 */ lbz r7, 0x11(r4) -/* 803122D0 98 E3 00 11 */ stb r7, 0x11(r3) -/* 803122D4 88 E4 00 12 */ lbz r7, 0x12(r4) -/* 803122D8 98 E3 00 12 */ stb r7, 0x12(r3) -/* 803122DC 88 E4 00 13 */ lbz r7, 0x13(r4) -/* 803122E0 98 E3 00 13 */ stb r7, 0x13(r3) -/* 803122E4 88 E4 00 14 */ lbz r7, 0x14(r4) -/* 803122E8 98 E3 00 14 */ stb r7, 0x14(r3) -/* 803122EC 88 E4 00 15 */ lbz r7, 0x15(r4) -/* 803122F0 98 E3 00 15 */ stb r7, 0x15(r3) -/* 803122F4 88 E4 00 16 */ lbz r7, 0x16(r4) -/* 803122F8 98 E3 00 16 */ stb r7, 0x16(r3) -/* 803122FC 88 E4 00 17 */ lbz r7, 0x17(r4) -/* 80312300 98 E3 00 17 */ stb r7, 0x17(r3) -/* 80312304 88 E4 00 18 */ lbz r7, 0x18(r4) -/* 80312308 98 E3 00 18 */ stb r7, 0x18(r3) -/* 8031230C 88 E4 00 19 */ lbz r7, 0x19(r4) -/* 80312310 98 E3 00 19 */ stb r7, 0x19(r3) -/* 80312314 A8 E4 00 1A */ lha r7, 0x1a(r4) -/* 80312318 B0 E3 00 1A */ sth r7, 0x1a(r3) -/* 8031231C 80 E4 00 1C */ lwz r7, 0x1c(r4) -/* 80312320 90 E3 00 1C */ stw r7, 0x1c(r3) -/* 80312324 80 7C 00 04 */ lwz r3, 4(r28) -/* 80312328 7C E3 02 14 */ add r7, r3, r0 -/* 8031232C 80 67 00 1C */ lwz r3, 0x1c(r7) -/* 80312330 7C 64 1A 14 */ add r3, r4, r3 -/* 80312334 7C 67 18 50 */ subf r3, r7, r3 -/* 80312338 90 67 00 1C */ stw r3, 0x1c(r7) -/* 8031233C 80 7C 00 04 */ lwz r3, 4(r28) -/* 80312340 7C 63 02 14 */ add r3, r3, r0 -/* 80312344 80 03 00 0C */ lwz r0, 0xc(r3) -/* 80312348 7C 04 02 14 */ add r0, r4, r0 -/* 8031234C 7C 03 00 50 */ subf r0, r3, r0 -/* 80312350 90 03 00 0C */ stw r0, 0xc(r3) -/* 80312354 38 A5 00 01 */ addi r5, r5, 1 -lbl_80312358: -/* 80312358 54 A0 04 3E */ clrlwi r0, r5, 0x10 -/* 8031235C 7C 00 30 40 */ cmplw r0, r6 -/* 80312360 41 80 FF 04 */ blt lbl_80312264 -/* 80312364 7F E4 FB 78 */ mr r4, r31 -/* 80312368 48 00 00 F8 */ b lbl_80312460 -lbl_8031236C: -/* 8031236C 80 7C 00 04 */ lwz r3, 4(r28) -/* 80312370 54 80 2A F4 */ rlwinm r0, r4, 5, 0xb, 0x1a -/* 80312374 7C C3 02 14 */ add r6, r3, r0 -/* 80312378 7C 7D 02 14 */ add r3, r29, r0 -/* 8031237C 88 A3 00 00 */ lbz r5, 0(r3) -/* 80312380 98 A6 00 00 */ stb r5, 0(r6) -/* 80312384 88 A3 00 01 */ lbz r5, 1(r3) -/* 80312388 98 A6 00 01 */ stb r5, 1(r6) -/* 8031238C A0 A3 00 02 */ lhz r5, 2(r3) -/* 80312390 B0 A6 00 02 */ sth r5, 2(r6) -/* 80312394 A0 A3 00 04 */ lhz r5, 4(r3) -/* 80312398 B0 A6 00 04 */ sth r5, 4(r6) -/* 8031239C 88 A3 00 06 */ lbz r5, 6(r3) -/* 803123A0 98 A6 00 06 */ stb r5, 6(r6) -/* 803123A4 88 A3 00 07 */ lbz r5, 7(r3) -/* 803123A8 98 A6 00 07 */ stb r5, 7(r6) -/* 803123AC 88 A3 00 08 */ lbz r5, 8(r3) -/* 803123B0 98 A6 00 08 */ stb r5, 8(r6) -/* 803123B4 88 A3 00 09 */ lbz r5, 9(r3) -/* 803123B8 98 A6 00 09 */ stb r5, 9(r6) -/* 803123BC A0 A3 00 0A */ lhz r5, 0xa(r3) -/* 803123C0 B0 A6 00 0A */ sth r5, 0xa(r6) -/* 803123C4 80 A3 00 0C */ lwz r5, 0xc(r3) -/* 803123C8 90 A6 00 0C */ stw r5, 0xc(r6) -/* 803123CC 88 A3 00 10 */ lbz r5, 0x10(r3) -/* 803123D0 98 A6 00 10 */ stb r5, 0x10(r6) -/* 803123D4 88 A3 00 11 */ lbz r5, 0x11(r3) -/* 803123D8 98 A6 00 11 */ stb r5, 0x11(r6) -/* 803123DC 88 A3 00 12 */ lbz r5, 0x12(r3) -/* 803123E0 98 A6 00 12 */ stb r5, 0x12(r6) -/* 803123E4 88 A3 00 13 */ lbz r5, 0x13(r3) -/* 803123E8 98 A6 00 13 */ stb r5, 0x13(r6) -/* 803123EC 88 A3 00 14 */ lbz r5, 0x14(r3) -/* 803123F0 98 A6 00 14 */ stb r5, 0x14(r6) -/* 803123F4 88 A3 00 15 */ lbz r5, 0x15(r3) -/* 803123F8 98 A6 00 15 */ stb r5, 0x15(r6) -/* 803123FC 88 A3 00 16 */ lbz r5, 0x16(r3) -/* 80312400 98 A6 00 16 */ stb r5, 0x16(r6) -/* 80312404 88 A3 00 17 */ lbz r5, 0x17(r3) -/* 80312408 98 A6 00 17 */ stb r5, 0x17(r6) -/* 8031240C 88 A3 00 18 */ lbz r5, 0x18(r3) -/* 80312410 98 A6 00 18 */ stb r5, 0x18(r6) -/* 80312414 88 A3 00 19 */ lbz r5, 0x19(r3) -/* 80312418 98 A6 00 19 */ stb r5, 0x19(r6) -/* 8031241C A8 A3 00 1A */ lha r5, 0x1a(r3) -/* 80312420 B0 A6 00 1A */ sth r5, 0x1a(r6) -/* 80312424 80 A3 00 1C */ lwz r5, 0x1c(r3) -/* 80312428 90 A6 00 1C */ stw r5, 0x1c(r6) -/* 8031242C 80 BC 00 04 */ lwz r5, 4(r28) -/* 80312430 7C C5 02 14 */ add r6, r5, r0 -/* 80312434 80 A6 00 1C */ lwz r5, 0x1c(r6) -/* 80312438 7C A3 2A 14 */ add r5, r3, r5 -/* 8031243C 7C A6 28 50 */ subf r5, r6, r5 -/* 80312440 90 A6 00 1C */ stw r5, 0x1c(r6) -/* 80312444 80 BC 00 04 */ lwz r5, 4(r28) -/* 80312448 7C A5 02 14 */ add r5, r5, r0 -/* 8031244C 80 05 00 0C */ lwz r0, 0xc(r5) -/* 80312450 7C 03 02 14 */ add r0, r3, r0 -/* 80312454 7C 05 00 50 */ subf r0, r5, r0 -/* 80312458 90 05 00 0C */ stw r0, 0xc(r5) -/* 8031245C 38 84 00 01 */ addi r4, r4, 1 -lbl_80312460: -/* 80312460 54 83 04 3E */ clrlwi r3, r4, 0x10 -/* 80312464 A0 1C 00 00 */ lhz r0, 0(r28) -/* 80312468 7C 03 00 40 */ cmplw r3, r0 -/* 8031246C 41 80 FF 00 */ blt lbl_8031236C -lbl_80312470: -/* 80312470 39 61 00 20 */ addi r11, r1, 0x20 -/* 80312474 48 04 FD B1 */ bl _restgpr_28 -/* 80312478 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031247C 7C 08 03 A6 */ mtlr r0 -/* 80312480 38 21 00 20 */ addi r1, r1, 0x20 -/* 80312484 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DTexture/entryNum__10J3DTextureFUs.s b/asm/JSystem/J3DGraphBase/J3DTexture/entryNum__10J3DTextureFUs.s deleted file mode 100644 index a1f53aeda00..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DTexture/entryNum__10J3DTextureFUs.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_803121A4: -/* 803121A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803121A8 7C 08 02 A6 */ mflr r0 -/* 803121AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 803121B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 803121B4 7C 7F 1B 78 */ mr r31, r3 -/* 803121B8 B0 83 00 00 */ sth r4, 0(r3) -/* 803121BC 54 83 2A F4 */ rlwinm r3, r4, 5, 0xb, 0x1a -/* 803121C0 4B FB CB 05 */ bl __nwa__FUl -/* 803121C4 90 7F 00 04 */ stw r3, 4(r31) -/* 803121C8 38 E0 00 00 */ li r7, 0 -/* 803121CC 38 60 00 00 */ li r3, 0 -/* 803121D0 7C 66 1B 78 */ mr r6, r3 -/* 803121D4 7C 65 1B 78 */ mr r5, r3 -/* 803121D8 48 00 00 24 */ b lbl_803121FC -lbl_803121DC: -/* 803121DC 80 9F 00 04 */ lwz r4, 4(r31) -/* 803121E0 38 03 00 0C */ addi r0, r3, 0xc -/* 803121E4 7C C4 01 2E */ stwx r6, r4, r0 -/* 803121E8 80 9F 00 04 */ lwz r4, 4(r31) -/* 803121EC 38 03 00 1C */ addi r0, r3, 0x1c -/* 803121F0 7C A4 01 2E */ stwx r5, r4, r0 -/* 803121F4 38 E7 00 01 */ addi r7, r7, 1 -/* 803121F8 38 63 00 20 */ addi r3, r3, 0x20 -lbl_803121FC: -/* 803121FC A0 1F 00 00 */ lhz r0, 0(r31) -/* 80312200 7C 07 00 00 */ cmpw r7, r0 -/* 80312204 41 80 FF D8 */ blt lbl_803121DC -/* 80312208 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8031220C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80312210 7C 08 03 A6 */ mtlr r0 -/* 80312214 38 21 00 10 */ addi r1, r1, 0x10 -/* 80312218 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DTexture/loadGX__10J3DTextureCFUs11_GXTexMapID.s b/asm/JSystem/J3DGraphBase/J3DTexture/loadGX__10J3DTextureCFUs11_GXTexMapID.s deleted file mode 100644 index 3cf50ad6e42..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DTexture/loadGX__10J3DTextureCFUs11_GXTexMapID.s +++ /dev/null @@ -1,89 +0,0 @@ -lbl_8031204C: -/* 8031204C 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80312050 7C 08 02 A6 */ mflr r0 -/* 80312054 90 01 00 64 */ stw r0, 0x64(r1) -/* 80312058 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 8031205C 93 C1 00 58 */ stw r30, 0x58(r1) -/* 80312060 7C BE 2B 78 */ mr r30, r5 -/* 80312064 80 63 00 04 */ lwz r3, 4(r3) -/* 80312068 54 80 2A F4 */ rlwinm r0, r4, 5, 0xb, 0x1a -/* 8031206C 7F E3 02 14 */ add r31, r3, r0 -/* 80312070 88 1F 00 08 */ lbz r0, 8(r31) -/* 80312074 28 00 00 00 */ cmplwi r0, 0 -/* 80312078 40 82 00 30 */ bne lbl_803120A8 -/* 8031207C 38 61 00 1C */ addi r3, r1, 0x1c -/* 80312080 80 1F 00 1C */ lwz r0, 0x1c(r31) -/* 80312084 7C 9F 02 14 */ add r4, r31, r0 -/* 80312088 A0 BF 00 02 */ lhz r5, 2(r31) -/* 8031208C A0 DF 00 04 */ lhz r6, 4(r31) -/* 80312090 88 FF 00 00 */ lbz r7, 0(r31) -/* 80312094 89 1F 00 06 */ lbz r8, 6(r31) -/* 80312098 89 3F 00 07 */ lbz r9, 7(r31) -/* 8031209C 89 5F 00 10 */ lbz r10, 0x10(r31) -/* 803120A0 48 04 BD A1 */ bl GXInitTexObj -/* 803120A4 48 00 00 54 */ b lbl_803120F8 -lbl_803120A8: -/* 803120A8 93 C1 00 08 */ stw r30, 8(r1) -/* 803120AC 38 61 00 1C */ addi r3, r1, 0x1c -/* 803120B0 80 1F 00 1C */ lwz r0, 0x1c(r31) -/* 803120B4 7C 9F 02 14 */ add r4, r31, r0 -/* 803120B8 A0 BF 00 02 */ lhz r5, 2(r31) -/* 803120BC A0 DF 00 04 */ lhz r6, 4(r31) -/* 803120C0 88 FF 00 00 */ lbz r7, 0(r31) -/* 803120C4 89 1F 00 06 */ lbz r8, 6(r31) -/* 803120C8 89 3F 00 07 */ lbz r9, 7(r31) -/* 803120CC 89 5F 00 10 */ lbz r10, 0x10(r31) -/* 803120D0 48 04 BF BD */ bl GXInitTexObjCI -/* 803120D4 38 61 00 10 */ addi r3, r1, 0x10 -/* 803120D8 80 1F 00 0C */ lwz r0, 0xc(r31) -/* 803120DC 7C 9F 02 14 */ add r4, r31, r0 -/* 803120E0 88 BF 00 09 */ lbz r5, 9(r31) -/* 803120E4 A0 DF 00 0A */ lhz r6, 0xa(r31) -/* 803120E8 48 04 C3 81 */ bl GXInitTlutObj -/* 803120EC 38 61 00 10 */ addi r3, r1, 0x10 -/* 803120F0 7F C4 F3 78 */ mr r4, r30 -/* 803120F4 48 04 C3 AD */ bl GXLoadTlut -lbl_803120F8: -/* 803120F8 38 61 00 1C */ addi r3, r1, 0x1c -/* 803120FC 88 9F 00 14 */ lbz r4, 0x14(r31) -/* 80312100 88 BF 00 15 */ lbz r5, 0x15(r31) -/* 80312104 C0 42 C9 88 */ lfs f2, lit_284(r2) -/* 80312108 88 1F 00 16 */ lbz r0, 0x16(r31) -/* 8031210C 7C 00 07 74 */ extsb r0, r0 -/* 80312110 C8 82 C9 90 */ lfd f4, lit_288(r2) -/* 80312114 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80312118 90 01 00 44 */ stw r0, 0x44(r1) -/* 8031211C 3C C0 43 30 */ lis r6, 0x4330 -/* 80312120 90 C1 00 40 */ stw r6, 0x40(r1) -/* 80312124 C8 01 00 40 */ lfd f0, 0x40(r1) -/* 80312128 EC 00 20 28 */ fsubs f0, f0, f4 -/* 8031212C EC 22 00 32 */ fmuls f1, f2, f0 -/* 80312130 88 1F 00 17 */ lbz r0, 0x17(r31) -/* 80312134 7C 00 07 74 */ extsb r0, r0 -/* 80312138 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8031213C 90 01 00 4C */ stw r0, 0x4c(r1) -/* 80312140 90 C1 00 48 */ stw r6, 0x48(r1) -/* 80312144 C8 01 00 48 */ lfd f0, 0x48(r1) -/* 80312148 EC 00 20 28 */ fsubs f0, f0, f4 -/* 8031214C EC 42 00 32 */ fmuls f2, f2, f0 -/* 80312150 C0 62 C9 8C */ lfs f3, lit_285(r2) -/* 80312154 A8 1F 00 1A */ lha r0, 0x1a(r31) -/* 80312158 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8031215C 90 01 00 54 */ stw r0, 0x54(r1) -/* 80312160 90 C1 00 50 */ stw r6, 0x50(r1) -/* 80312164 C8 01 00 50 */ lfd f0, 0x50(r1) -/* 80312168 EC 00 20 28 */ fsubs f0, f0, f4 -/* 8031216C EC 63 00 32 */ fmuls f3, f3, f0 -/* 80312170 88 DF 00 12 */ lbz r6, 0x12(r31) -/* 80312174 88 FF 00 11 */ lbz r7, 0x11(r31) -/* 80312178 89 1F 00 13 */ lbz r8, 0x13(r31) -/* 8031217C 48 04 BF 59 */ bl GXInitTexObjLOD -/* 80312180 38 61 00 1C */ addi r3, r1, 0x1c -/* 80312184 7F C4 F3 78 */ mr r4, r30 -/* 80312188 48 04 C2 8D */ bl GXLoadTexObj -/* 8031218C 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 80312190 83 C1 00 58 */ lwz r30, 0x58(r1) -/* 80312194 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80312198 7C 08 03 A6 */ mtlr r0 -/* 8031219C 38 21 00 60 */ addi r1, r1, 0x60 -/* 803121A0 4E 80 00 20 */ blr diff --git a/asm/d/d_name/MenuSelectAnm2__7dName_cFv.s b/asm/d/d_name/MenuSelectAnm2__7dName_cFv.s deleted file mode 100644 index e46f48ae146..00000000000 --- a/asm/d/d_name/MenuSelectAnm2__7dName_cFv.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_8024FEB4: -/* 8024FEB4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8024FEB8 7C 08 02 A6 */ mflr r0 -/* 8024FEBC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8024FEC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024FEC4 48 11 23 19 */ bl _savegpr_29 -/* 8024FEC8 7C 7D 1B 78 */ mr r29, r3 -/* 8024FECC 88 83 02 B0 */ lbz r4, 0x2b0(r3) -/* 8024FED0 48 00 11 79 */ bl getMenuPosIdx__7dName_cFUc -/* 8024FED4 7C 7E 1B 78 */ mr r30, r3 -/* 8024FED8 7F A3 EB 78 */ mr r3, r29 -/* 8024FEDC 88 9D 02 A9 */ lbz r4, 0x2a9(r29) -/* 8024FEE0 48 00 11 69 */ bl getMenuPosIdx__7dName_cFUc -/* 8024FEE4 7C 7F 1B 78 */ mr r31, r3 -/* 8024FEE8 38 60 00 01 */ li r3, 1 -/* 8024FEEC 7C 1E F8 00 */ cmpw r30, r31 -/* 8024FEF0 41 82 00 2C */ beq lbl_8024FF1C -/* 8024FEF4 57 C0 10 3A */ slwi r0, r30, 2 -/* 8024FEF8 7C 7D 02 14 */ add r3, r29, r0 -/* 8024FEFC 80 63 02 84 */ lwz r3, 0x284(r3) -/* 8024FF00 88 9D 02 A4 */ lbz r4, 0x2a4(r29) -/* 8024FF04 3C A0 80 43 */ lis r5, g_nmHIO@ha /* 0x80430734@ha */ -/* 8024FF08 38 A5 07 34 */ addi r5, r5, g_nmHIO@l /* 0x80430734@l */ -/* 8024FF0C C0 25 00 08 */ lfs f1, 8(r5) -/* 8024FF10 C0 42 B3 C0 */ lfs f2, lit_3820(r2) -/* 8024FF14 38 A0 00 00 */ li r5, 0 -/* 8024FF18 48 00 48 B5 */ bl scaleAnime__8CPaneMgrFsffUc -lbl_8024FF1C: -/* 8024FF1C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8024FF20 28 00 00 01 */ cmplwi r0, 1 -/* 8024FF24 40 82 00 64 */ bne lbl_8024FF88 -/* 8024FF28 7C 1E F8 00 */ cmpw r30, r31 -/* 8024FF2C 41 82 00 44 */ beq lbl_8024FF70 -/* 8024FF30 38 00 00 96 */ li r0, 0x96 -/* 8024FF34 98 01 00 08 */ stb r0, 8(r1) -/* 8024FF38 98 01 00 09 */ stb r0, 9(r1) -/* 8024FF3C 98 01 00 0A */ stb r0, 0xa(r1) -/* 8024FF40 38 00 00 FF */ li r0, 0xff -/* 8024FF44 98 01 00 0B */ stb r0, 0xb(r1) -/* 8024FF48 80 01 00 08 */ lwz r0, 8(r1) -/* 8024FF4C 90 01 00 0C */ stw r0, 0xc(r1) -/* 8024FF50 57 C0 10 3A */ slwi r0, r30, 2 -/* 8024FF54 7C 7D 02 14 */ add r3, r29, r0 -/* 8024FF58 80 63 02 94 */ lwz r3, 0x294(r3) -/* 8024FF5C 38 81 00 0C */ addi r4, r1, 0xc -/* 8024FF60 81 83 00 00 */ lwz r12, 0(r3) -/* 8024FF64 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 8024FF68 7D 89 03 A6 */ mtctr r12 -/* 8024FF6C 4E 80 04 21 */ bctrl -lbl_8024FF70: -/* 8024FF70 7F A3 EB 78 */ mr r3, r29 -/* 8024FF74 4B FF FA 21 */ bl selectCursorMove__7dName_cFv -/* 8024FF78 38 00 00 00 */ li r0, 0 -/* 8024FF7C 98 1D 02 AB */ stb r0, 0x2ab(r29) -/* 8024FF80 88 1D 02 AB */ lbz r0, 0x2ab(r29) -/* 8024FF84 98 1D 02 AD */ stb r0, 0x2ad(r29) -lbl_8024FF88: -/* 8024FF88 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024FF8C 48 11 22 9D */ bl _restgpr_29 -/* 8024FF90 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8024FF94 7C 08 03 A6 */ mtlr r0 -/* 8024FF98 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024FF9C 4E 80 00 20 */ blr diff --git a/asm/d/d_name/MenuSelectAnmInit__7dName_cFv.s b/asm/d/d_name/MenuSelectAnmInit__7dName_cFv.s deleted file mode 100644 index 28bcbc72c2c..00000000000 --- a/asm/d/d_name/MenuSelectAnmInit__7dName_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8024FDA0: -/* 8024FDA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024FDA4 7C 08 02 A6 */ mflr r0 -/* 8024FDA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024FDAC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024FDB0 7C 7F 1B 78 */ mr r31, r3 -/* 8024FDB4 80 63 00 20 */ lwz r3, 0x20(r3) -/* 8024FDB8 C0 22 B3 D0 */ lfs f1, lit_4009(r2) -/* 8024FDBC 4B F4 54 E5 */ bl setAlphaRate__16dSelect_cursor_cFf -/* 8024FDC0 7F E3 FB 78 */ mr r3, r31 -/* 8024FDC4 88 9F 02 B0 */ lbz r4, 0x2b0(r31) -/* 8024FDC8 48 00 12 81 */ bl getMenuPosIdx__7dName_cFUc -/* 8024FDCC 38 80 00 00 */ li r4, 0 -/* 8024FDD0 54 60 10 3A */ slwi r0, r3, 2 -/* 8024FDD4 7C 7F 02 14 */ add r3, r31, r0 -/* 8024FDD8 80 63 02 84 */ lwz r3, 0x284(r3) -/* 8024FDDC B0 83 00 64 */ sth r4, 0x64(r3) -/* 8024FDE0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024FDE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024FDE8 7C 08 03 A6 */ mtlr r0 -/* 8024FDEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024FDF0 4E 80 00 20 */ blr diff --git a/asm/d/d_name/MenuSelectAnm__7dName_cFv.s b/asm/d/d_name/MenuSelectAnm__7dName_cFv.s deleted file mode 100644 index 5b020390040..00000000000 --- a/asm/d/d_name/MenuSelectAnm__7dName_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_8024FDF4: -/* 8024FDF4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8024FDF8 7C 08 02 A6 */ mflr r0 -/* 8024FDFC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8024FE00 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8024FE04 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8024FE08 7C 7E 1B 78 */ mr r30, r3 -/* 8024FE0C 88 83 02 B0 */ lbz r4, 0x2b0(r3) -/* 8024FE10 48 00 12 39 */ bl getMenuPosIdx__7dName_cFUc -/* 8024FE14 54 7F 10 3A */ slwi r31, r3, 2 -/* 8024FE18 7C 7E FA 14 */ add r3, r30, r31 -/* 8024FE1C 80 63 02 84 */ lwz r3, 0x284(r3) -/* 8024FE20 88 9E 02 A4 */ lbz r4, 0x2a4(r30) -/* 8024FE24 3C A0 80 43 */ lis r5, g_nmHIO@ha /* 0x80430734@ha */ -/* 8024FE28 38 A5 07 34 */ addi r5, r5, g_nmHIO@l /* 0x80430734@l */ -/* 8024FE2C C0 25 00 08 */ lfs f1, 8(r5) -/* 8024FE30 C0 42 B3 C0 */ lfs f2, lit_3820(r2) -/* 8024FE34 38 A0 00 00 */ li r5, 0 -/* 8024FE38 48 00 49 95 */ bl scaleAnime__8CPaneMgrFsffUc -/* 8024FE3C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8024FE40 28 00 00 01 */ cmplwi r0, 1 -/* 8024FE44 40 82 00 58 */ bne lbl_8024FE9C -/* 8024FE48 38 00 00 96 */ li r0, 0x96 -/* 8024FE4C 98 01 00 08 */ stb r0, 8(r1) -/* 8024FE50 98 01 00 09 */ stb r0, 9(r1) -/* 8024FE54 98 01 00 0A */ stb r0, 0xa(r1) -/* 8024FE58 38 00 00 FF */ li r0, 0xff -/* 8024FE5C 98 01 00 0B */ stb r0, 0xb(r1) -/* 8024FE60 80 01 00 08 */ lwz r0, 8(r1) -/* 8024FE64 90 01 00 0C */ stw r0, 0xc(r1) -/* 8024FE68 7C 7E FA 14 */ add r3, r30, r31 -/* 8024FE6C 80 63 02 94 */ lwz r3, 0x294(r3) -/* 8024FE70 38 81 00 0C */ addi r4, r1, 0xc -/* 8024FE74 81 83 00 00 */ lwz r12, 0(r3) -/* 8024FE78 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 8024FE7C 7D 89 03 A6 */ mtctr r12 -/* 8024FE80 4E 80 04 21 */ bctrl -/* 8024FE84 7F C3 F3 78 */ mr r3, r30 -/* 8024FE88 48 00 03 FD */ bl menuCursorMove__7dName_cFv -/* 8024FE8C 38 00 00 04 */ li r0, 4 -/* 8024FE90 98 1E 02 AB */ stb r0, 0x2ab(r30) -/* 8024FE94 88 1E 02 AB */ lbz r0, 0x2ab(r30) -/* 8024FE98 98 1E 02 AD */ stb r0, 0x2ad(r30) -lbl_8024FE9C: -/* 8024FE9C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8024FEA0 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8024FEA4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8024FEA8 7C 08 03 A6 */ mtlr r0 -/* 8024FEAC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024FEB0 4E 80 00 20 */ blr diff --git a/asm/d/d_name/MojiSelectAnm2__7dName_cFv.s b/asm/d/d_name/MojiSelectAnm2__7dName_cFv.s deleted file mode 100644 index a549b37b14c..00000000000 --- a/asm/d/d_name/MojiSelectAnm2__7dName_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_8024F164: -/* 8024F164 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024F168 7C 08 02 A6 */ mflr r0 -/* 8024F16C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024F170 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024F174 7C 7F 1B 78 */ mr r31, r3 -/* 8024F178 88 63 02 A8 */ lbz r3, 0x2a8(r3) -/* 8024F17C 88 1F 02 A6 */ lbz r0, 0x2a6(r31) -/* 8024F180 1C 00 00 05 */ mulli r0, r0, 5 -/* 8024F184 7C 03 02 14 */ add r0, r3, r0 -/* 8024F188 54 00 10 3A */ slwi r0, r0, 2 -/* 8024F18C 7C 7F 02 14 */ add r3, r31, r0 -/* 8024F190 80 63 00 74 */ lwz r3, 0x74(r3) -/* 8024F194 88 9F 02 A4 */ lbz r4, 0x2a4(r31) -/* 8024F198 3C A0 80 43 */ lis r5, g_nmHIO@ha /* 0x80430734@ha */ -/* 8024F19C 38 A5 07 34 */ addi r5, r5, g_nmHIO@l /* 0x80430734@l */ -/* 8024F1A0 C0 25 00 0C */ lfs f1, 0xc(r5) -/* 8024F1A4 C0 42 B3 C0 */ lfs f2, lit_3820(r2) -/* 8024F1A8 38 A0 00 00 */ li r5, 0 -/* 8024F1AC 48 00 56 21 */ bl scaleAnime__8CPaneMgrFsffUc -/* 8024F1B0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8024F1B4 28 00 00 01 */ cmplwi r0, 1 -/* 8024F1B8 40 82 00 1C */ bne lbl_8024F1D4 -/* 8024F1BC 7F E3 FB 78 */ mr r3, r31 -/* 8024F1C0 48 00 11 C1 */ bl menuCursorMove2__7dName_cFv -/* 8024F1C4 38 00 00 04 */ li r0, 4 -/* 8024F1C8 98 1F 02 AB */ stb r0, 0x2ab(r31) -/* 8024F1CC 88 1F 02 AB */ lbz r0, 0x2ab(r31) -/* 8024F1D0 98 1F 02 AD */ stb r0, 0x2ad(r31) -lbl_8024F1D4: -/* 8024F1D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024F1D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024F1DC 7C 08 03 A6 */ mtlr r0 -/* 8024F1E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024F1E4 4E 80 00 20 */ blr diff --git a/asm/d/d_name/MojiSelectAnmInit__7dName_cFv.s b/asm/d/d_name/MojiSelectAnmInit__7dName_cFv.s deleted file mode 100644 index 8693b4379e2..00000000000 --- a/asm/d/d_name/MojiSelectAnmInit__7dName_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8024F034: -/* 8024F034 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8024F038 7C 08 02 A6 */ mflr r0 -/* 8024F03C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8024F040 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8024F044 7C 7F 1B 78 */ mr r31, r3 -/* 8024F048 80 63 00 20 */ lwz r3, 0x20(r3) -/* 8024F04C C0 22 B3 D0 */ lfs f1, lit_4009(r2) -/* 8024F050 4B F4 62 51 */ bl setAlphaRate__16dSelect_cursor_cFf -/* 8024F054 38 80 00 00 */ li r4, 0 -/* 8024F058 88 7F 02 A8 */ lbz r3, 0x2a8(r31) -/* 8024F05C 88 1F 02 A6 */ lbz r0, 0x2a6(r31) -/* 8024F060 1C 00 00 05 */ mulli r0, r0, 5 -/* 8024F064 7C 03 02 14 */ add r0, r3, r0 -/* 8024F068 54 00 10 3A */ slwi r0, r0, 2 -/* 8024F06C 7C 7F 02 14 */ add r3, r31, r0 -/* 8024F070 80 63 00 74 */ lwz r3, 0x74(r3) -/* 8024F074 B0 83 00 64 */ sth r4, 0x64(r3) -/* 8024F078 38 00 00 96 */ li r0, 0x96 -/* 8024F07C 98 01 00 08 */ stb r0, 8(r1) -/* 8024F080 98 01 00 09 */ stb r0, 9(r1) -/* 8024F084 98 01 00 0A */ stb r0, 0xa(r1) -/* 8024F088 38 00 00 FF */ li r0, 0xff -/* 8024F08C 98 01 00 0B */ stb r0, 0xb(r1) -/* 8024F090 80 01 00 08 */ lwz r0, 8(r1) -/* 8024F094 90 01 00 0C */ stw r0, 0xc(r1) -/* 8024F098 88 7F 02 A8 */ lbz r3, 0x2a8(r31) -/* 8024F09C 88 1F 02 A6 */ lbz r0, 0x2a6(r31) -/* 8024F0A0 1C 00 00 05 */ mulli r0, r0, 5 -/* 8024F0A4 7C 03 02 14 */ add r0, r3, r0 -/* 8024F0A8 54 00 10 3A */ slwi r0, r0, 2 -/* 8024F0AC 7C 7F 02 14 */ add r3, r31, r0 -/* 8024F0B0 80 63 00 74 */ lwz r3, 0x74(r3) -/* 8024F0B4 80 63 00 04 */ lwz r3, 4(r3) -/* 8024F0B8 38 81 00 0C */ addi r4, r1, 0xc -/* 8024F0BC 81 83 00 00 */ lwz r12, 0(r3) -/* 8024F0C0 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 8024F0C4 7D 89 03 A6 */ mtctr r12 -/* 8024F0C8 4E 80 04 21 */ bctrl -/* 8024F0CC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8024F0D0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8024F0D4 7C 08 03 A6 */ mtlr r0 -/* 8024F0D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024F0DC 4E 80 00 20 */ blr diff --git a/asm/d/d_name/MojiSelectAnm__7dName_cFv.s b/asm/d/d_name/MojiSelectAnm__7dName_cFv.s deleted file mode 100644 index 8de5a2e14bb..00000000000 --- a/asm/d/d_name/MojiSelectAnm__7dName_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_8024F0E0: -/* 8024F0E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024F0E4 7C 08 02 A6 */ mflr r0 -/* 8024F0E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024F0EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024F0F0 7C 7F 1B 78 */ mr r31, r3 -/* 8024F0F4 88 63 02 A8 */ lbz r3, 0x2a8(r3) -/* 8024F0F8 88 1F 02 A6 */ lbz r0, 0x2a6(r31) -/* 8024F0FC 1C 00 00 05 */ mulli r0, r0, 5 -/* 8024F100 7C 03 02 14 */ add r0, r3, r0 -/* 8024F104 54 00 10 3A */ slwi r0, r0, 2 -/* 8024F108 7C 7F 02 14 */ add r3, r31, r0 -/* 8024F10C 80 63 00 74 */ lwz r3, 0x74(r3) -/* 8024F110 88 9F 02 A4 */ lbz r4, 0x2a4(r31) -/* 8024F114 3C A0 80 43 */ lis r5, g_nmHIO@ha /* 0x80430734@ha */ -/* 8024F118 38 A5 07 34 */ addi r5, r5, g_nmHIO@l /* 0x80430734@l */ -/* 8024F11C C0 25 00 0C */ lfs f1, 0xc(r5) -/* 8024F120 C0 42 B3 C0 */ lfs f2, lit_3820(r2) -/* 8024F124 38 A0 00 00 */ li r5, 0 -/* 8024F128 48 00 56 A5 */ bl scaleAnime__8CPaneMgrFsffUc -/* 8024F12C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8024F130 28 00 00 01 */ cmplwi r0, 1 -/* 8024F134 40 82 00 1C */ bne lbl_8024F150 -/* 8024F138 7F E3 FB 78 */ mr r3, r31 -/* 8024F13C 48 00 08 59 */ bl selectCursorMove__7dName_cFv -/* 8024F140 38 00 00 00 */ li r0, 0 -/* 8024F144 98 1F 02 AB */ stb r0, 0x2ab(r31) -/* 8024F148 88 1F 02 AB */ lbz r0, 0x2ab(r31) -/* 8024F14C 98 1F 02 AD */ stb r0, 0x2ad(r31) -lbl_8024F150: -/* 8024F150 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024F154 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024F158 7C 08 03 A6 */ mtlr r0 -/* 8024F15C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024F160 4E 80 00 20 */ blr diff --git a/asm/d/d_name/NameStrSet__7dName_cFv.s b/asm/d/d_name/NameStrSet__7dName_cFv.s deleted file mode 100644 index 50e09ec8697..00000000000 --- a/asm/d/d_name/NameStrSet__7dName_cFv.s +++ /dev/null @@ -1,139 +0,0 @@ -lbl_80250E54: -/* 80250E54 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80250E58 7C 08 02 A6 */ mflr r0 -/* 80250E5C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80250E60 39 61 00 20 */ addi r11, r1, 0x20 -/* 80250E64 48 11 13 6D */ bl _savegpr_26 -/* 80250E68 7C 7F 1B 78 */ mr r31, r3 -/* 80250E6C 3C 60 80 3C */ lis r3, cNullVec__6Z2Calc@ha /* 0x803C1F50@ha */ -/* 80250E70 38 63 1F 50 */ addi r3, r3, cNullVec__6Z2Calc@l /* 0x803C1F50@l */ -/* 80250E74 38 BF 03 1C */ addi r5, r31, 0x31c -/* 80250E78 38 C0 00 00 */ li r6, 0 -/* 80250E7C 39 00 00 00 */ li r8, 0 -/* 80250E80 48 00 01 88 */ b lbl_80251008 -lbl_80250E84: -/* 80250E84 88 05 00 00 */ lbz r0, 0(r5) -/* 80250E88 7C 00 26 70 */ srawi r0, r0, 4 -/* 80250E8C 2C 00 00 08 */ cmpwi r0, 8 -/* 80250E90 41 82 00 0C */ beq lbl_80250E9C -/* 80250E94 2C 00 00 09 */ cmpwi r0, 9 -/* 80250E98 40 82 01 00 */ bne lbl_80250F98 -lbl_80250E9C: -/* 80250E9C A0 05 00 00 */ lhz r0, 0(r5) -/* 80250EA0 7C 9F 42 14 */ add r4, r31, r8 -/* 80250EA4 90 04 02 D0 */ stw r0, 0x2d0(r4) -/* 80250EA8 38 E0 00 00 */ li r7, 0 -/* 80250EAC 39 20 00 00 */ li r9, 0 -/* 80250EB0 3B 63 00 0C */ addi r27, r3, 0xc -/* 80250EB4 3B 83 01 10 */ addi r28, r3, 0x110 -/* 80250EB8 3B A3 02 14 */ addi r29, r3, 0x214 -/* 80250EBC 3B C3 03 18 */ addi r30, r3, 0x318 -/* 80250EC0 39 83 04 1C */ addi r12, r3, 0x41c -/* 80250EC4 39 63 05 20 */ addi r11, r3, 0x520 -/* 80250EC8 38 00 00 41 */ li r0, 0x41 -/* 80250ECC 7C 09 03 A6 */ mtctr r0 -lbl_80250ED0: -/* 80250ED0 83 44 02 D0 */ lwz r26, 0x2d0(r4) -/* 80250ED4 7D 5B 48 2E */ lwzx r10, r27, r9 -/* 80250ED8 A0 0A 00 00 */ lhz r0, 0(r10) -/* 80250EDC 7C 1A 00 00 */ cmpw r26, r0 -/* 80250EE0 41 82 00 24 */ beq lbl_80250F04 -/* 80250EE4 7D 5C 48 2E */ lwzx r10, r28, r9 -/* 80250EE8 A0 0A 00 00 */ lhz r0, 0(r10) -/* 80250EEC 7C 1A 00 00 */ cmpw r26, r0 -/* 80250EF0 41 82 00 14 */ beq lbl_80250F04 -/* 80250EF4 7D 5D 48 2E */ lwzx r10, r29, r9 -/* 80250EF8 A0 0A 00 00 */ lhz r0, 0(r10) -/* 80250EFC 7C 1A 00 00 */ cmpw r26, r0 -/* 80250F00 40 82 00 28 */ bne lbl_80250F28 -lbl_80250F04: -/* 80250F04 39 20 00 05 */ li r9, 5 -/* 80250F08 7C 07 4B D6 */ divw r0, r7, r9 -/* 80250F0C 98 04 02 CC */ stb r0, 0x2cc(r4) -/* 80250F10 7C 00 49 D6 */ mullw r0, r0, r9 -/* 80250F14 7C 00 38 50 */ subf r0, r0, r7 -/* 80250F18 98 04 02 CD */ stb r0, 0x2cd(r4) -/* 80250F1C 38 00 00 00 */ li r0, 0 -/* 80250F20 98 04 02 CE */ stb r0, 0x2ce(r4) -/* 80250F24 48 00 00 64 */ b lbl_80250F88 -lbl_80250F28: -/* 80250F28 7D 5E 48 2E */ lwzx r10, r30, r9 -/* 80250F2C A0 0A 00 00 */ lhz r0, 0(r10) -/* 80250F30 7C 1A 00 00 */ cmpw r26, r0 -/* 80250F34 41 82 00 24 */ beq lbl_80250F58 -/* 80250F38 7D 4C 48 2E */ lwzx r10, r12, r9 -/* 80250F3C A0 0A 00 00 */ lhz r0, 0(r10) -/* 80250F40 7C 1A 00 00 */ cmpw r26, r0 -/* 80250F44 41 82 00 14 */ beq lbl_80250F58 -/* 80250F48 7D 4B 48 2E */ lwzx r10, r11, r9 -/* 80250F4C A0 0A 00 00 */ lhz r0, 0(r10) -/* 80250F50 7C 1A 00 00 */ cmpw r26, r0 -/* 80250F54 40 82 00 28 */ bne lbl_80250F7C -lbl_80250F58: -/* 80250F58 39 20 00 05 */ li r9, 5 -/* 80250F5C 7C 07 4B D6 */ divw r0, r7, r9 -/* 80250F60 98 04 02 CC */ stb r0, 0x2cc(r4) -/* 80250F64 7C 00 49 D6 */ mullw r0, r0, r9 -/* 80250F68 7C 00 38 50 */ subf r0, r0, r7 -/* 80250F6C 98 04 02 CD */ stb r0, 0x2cd(r4) -/* 80250F70 38 00 00 01 */ li r0, 1 -/* 80250F74 98 04 02 CE */ stb r0, 0x2ce(r4) -/* 80250F78 48 00 00 10 */ b lbl_80250F88 -lbl_80250F7C: -/* 80250F7C 38 E7 00 01 */ addi r7, r7, 1 -/* 80250F80 39 29 00 04 */ addi r9, r9, 4 -/* 80250F84 42 00 FF 4C */ bdnz lbl_80250ED0 -lbl_80250F88: -/* 80250F88 38 A5 00 02 */ addi r5, r5, 2 -/* 80250F8C 38 C6 00 01 */ addi r6, r6, 1 -/* 80250F90 39 08 00 08 */ addi r8, r8, 8 -/* 80250F94 48 00 00 74 */ b lbl_80251008 -lbl_80250F98: -/* 80250F98 7C 80 07 74 */ extsb r0, r4 -/* 80250F9C 7D 7F 42 14 */ add r11, r31, r8 -/* 80250FA0 90 0B 02 D0 */ stw r0, 0x2d0(r11) -/* 80250FA4 39 80 00 00 */ li r12, 0 -/* 80250FA8 38 80 00 00 */ li r4, 0 -/* 80250FAC 39 23 06 24 */ addi r9, r3, 0x624 -/* 80250FB0 38 00 00 41 */ li r0, 0x41 -/* 80250FB4 7C 09 03 A6 */ mtctr r0 -lbl_80250FB8: -/* 80250FB8 81 4B 02 D0 */ lwz r10, 0x2d0(r11) -/* 80250FBC 7C E9 20 2E */ lwzx r7, r9, r4 -/* 80250FC0 88 07 00 00 */ lbz r0, 0(r7) -/* 80250FC4 7C 0A 00 00 */ cmpw r10, r0 -/* 80250FC8 40 82 00 28 */ bne lbl_80250FF0 -/* 80250FCC 38 80 00 05 */ li r4, 5 -/* 80250FD0 7C 0C 23 D6 */ divw r0, r12, r4 -/* 80250FD4 98 0B 02 CC */ stb r0, 0x2cc(r11) -/* 80250FD8 7C 00 21 D6 */ mullw r0, r0, r4 -/* 80250FDC 7C 00 60 50 */ subf r0, r0, r12 -/* 80250FE0 98 0B 02 CD */ stb r0, 0x2cd(r11) -/* 80250FE4 38 00 00 02 */ li r0, 2 -/* 80250FE8 98 0B 02 CE */ stb r0, 0x2ce(r11) -/* 80250FEC 48 00 00 10 */ b lbl_80250FFC -lbl_80250FF0: -/* 80250FF0 39 8C 00 01 */ addi r12, r12, 1 -/* 80250FF4 38 84 00 04 */ addi r4, r4, 4 -/* 80250FF8 42 00 FF C0 */ bdnz lbl_80250FB8 -lbl_80250FFC: -/* 80250FFC 38 A5 00 01 */ addi r5, r5, 1 -/* 80251000 38 C6 00 01 */ addi r6, r6, 1 -/* 80251004 39 08 00 08 */ addi r8, r8, 8 -lbl_80251008: -/* 80251008 88 85 00 00 */ lbz r4, 0(r5) -/* 8025100C 7C 80 07 75 */ extsb. r0, r4 -/* 80251010 40 82 FE 74 */ bne lbl_80250E84 -/* 80251014 88 1F 02 B1 */ lbz r0, 0x2b1(r31) -/* 80251018 98 1F 02 B2 */ stb r0, 0x2b2(r31) -/* 8025101C 98 DF 02 B1 */ stb r6, 0x2b1(r31) -/* 80251020 7F E3 FB 78 */ mr r3, r31 -/* 80251024 4B FF E8 69 */ bl setNameText__7dName_cFv -/* 80251028 7F E3 FB 78 */ mr r3, r31 -/* 8025102C 4B FF E8 E9 */ bl nameCursorMove__7dName_cFv -/* 80251030 39 61 00 20 */ addi r11, r1, 0x20 -/* 80251034 48 11 11 E9 */ bl _restgpr_26 -/* 80251038 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025103C 7C 08 03 A6 */ mtlr r0 -/* 80251040 38 21 00 20 */ addi r1, r1, 0x20 -/* 80251044 4E 80 00 20 */ blr diff --git a/asm/d/d_name/__ct__7dName_cFP7J2DPane.s b/asm/d/d_name/__ct__7dName_cFP7J2DPane.s deleted file mode 100644 index bdad9fdcd6d..00000000000 --- a/asm/d/d_name/__ct__7dName_cFP7J2DPane.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8024E408: -/* 8024E408 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024E40C 7C 08 02 A6 */ mflr r0 -/* 8024E410 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024E414 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024E418 7C 7F 1B 78 */ mr r31, r3 -/* 8024E41C 3C A0 80 3C */ lis r5, __vt__7dName_c@ha /* 0x803C2B64@ha */ -/* 8024E420 38 05 2B 64 */ addi r0, r5, __vt__7dName_c@l /* 0x803C2B64@l */ -/* 8024E424 90 03 00 00 */ stw r0, 0(r3) -/* 8024E428 3C A0 80 3A */ lis r5, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 8024E42C 38 05 6F 88 */ addi r0, r5, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 8024E430 90 03 00 0C */ stw r0, 0xc(r3) -/* 8024E434 3C A0 80 3C */ lis r5, __vt__14dDlst_NameIN_c@ha /* 0x803C2B38@ha */ -/* 8024E438 38 05 2B 38 */ addi r0, r5, __vt__14dDlst_NameIN_c@l /* 0x803C2B38@l */ -/* 8024E43C 90 03 00 0C */ stw r0, 0xc(r3) -/* 8024E440 90 83 00 18 */ stw r4, 0x18(r3) -/* 8024E444 48 00 01 E9 */ bl _create__7dName_cFv -/* 8024E448 7F E3 FB 78 */ mr r3, r31 -/* 8024E44C 48 00 02 89 */ bl init__7dName_cFv -/* 8024E450 7F E3 FB 78 */ mr r3, r31 -/* 8024E454 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024E458 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024E45C 7C 08 03 A6 */ mtlr r0 -/* 8024E460 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024E464 4E 80 00 20 */ blr diff --git a/asm/d/d_name/__ct__9dNm_HIO_cFv.s b/asm/d/d_name/__ct__9dNm_HIO_cFv.s deleted file mode 100644 index 7f9edf86f9e..00000000000 --- a/asm/d/d_name/__ct__9dNm_HIO_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_8024E3E0: -/* 8024E3E0 3C 80 80 3C */ lis r4, __vt__9dNm_HIO_c@ha /* 0x803C2B7C@ha */ -/* 8024E3E4 38 04 2B 7C */ addi r0, r4, __vt__9dNm_HIO_c@l /* 0x803C2B7C@l */ -/* 8024E3E8 90 03 00 00 */ stw r0, 0(r3) -/* 8024E3EC C0 02 B3 B0 */ lfs f0, lit_3665(r2) -/* 8024E3F0 D0 03 00 08 */ stfs f0, 8(r3) -/* 8024E3F4 C0 02 B3 B4 */ lfs f0, lit_3666(r2) -/* 8024E3F8 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8024E3FC 38 00 00 0A */ li r0, 0xa -/* 8024E400 98 03 00 10 */ stb r0, 0x10(r3) -/* 8024E404 4E 80 00 20 */ blr diff --git a/asm/d/d_name/__dt__14dDlst_NameIN_cFv.s b/asm/d/d_name/__dt__14dDlst_NameIN_cFv.s deleted file mode 100644 index 456656e3fbe..00000000000 --- a/asm/d/d_name/__dt__14dDlst_NameIN_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025115C: -/* 8025115C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80251160 7C 08 02 A6 */ mflr r0 -/* 80251164 90 01 00 14 */ stw r0, 0x14(r1) -/* 80251168 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025116C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80251170 41 82 00 1C */ beq lbl_8025118C -/* 80251174 3C A0 80 3C */ lis r5, __vt__14dDlst_NameIN_c@ha /* 0x803C2B38@ha */ -/* 80251178 38 05 2B 38 */ addi r0, r5, __vt__14dDlst_NameIN_c@l /* 0x803C2B38@l */ -/* 8025117C 90 1F 00 00 */ stw r0, 0(r31) -/* 80251180 7C 80 07 35 */ extsh. r0, r4 -/* 80251184 40 81 00 08 */ ble lbl_8025118C -/* 80251188 48 07 DB B5 */ bl __dl__FPv -lbl_8025118C: -/* 8025118C 7F E3 FB 78 */ mr r3, r31 -/* 80251190 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80251194 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80251198 7C 08 03 A6 */ mtlr r0 -/* 8025119C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802511A0 4E 80 00 20 */ blr diff --git a/asm/d/d_name/__dt__9dNm_HIO_cFv.s b/asm/d/d_name/__dt__9dNm_HIO_cFv.s deleted file mode 100644 index fa74c429e90..00000000000 --- a/asm/d/d_name/__dt__9dNm_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_802511A4: -/* 802511A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802511A8 7C 08 02 A6 */ mflr r0 -/* 802511AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802511B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802511B4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802511B8 41 82 00 1C */ beq lbl_802511D4 -/* 802511BC 3C A0 80 3C */ lis r5, __vt__9dNm_HIO_c@ha /* 0x803C2B7C@ha */ -/* 802511C0 38 05 2B 7C */ addi r0, r5, __vt__9dNm_HIO_c@l /* 0x803C2B7C@l */ -/* 802511C4 90 1F 00 00 */ stw r0, 0(r31) -/* 802511C8 7C 80 07 35 */ extsh. r0, r4 -/* 802511CC 40 81 00 08 */ ble lbl_802511D4 -/* 802511D0 48 07 DB 6D */ bl __dl__FPv -lbl_802511D4: -/* 802511D4 7F E3 FB 78 */ mr r3, r31 -/* 802511D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802511DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802511E0 7C 08 03 A6 */ mtlr r0 -/* 802511E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802511E8 4E 80 00 20 */ blr diff --git a/asm/d/d_name/__sinit_d_name_cpp.s b/asm/d/d_name/__sinit_d_name_cpp.s deleted file mode 100644 index a045b682c81..00000000000 --- a/asm/d/d_name/__sinit_d_name_cpp.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_802511EC: -/* 802511EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802511F0 7C 08 02 A6 */ mflr r0 -/* 802511F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802511F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802511FC 3C 60 80 3C */ lis r3, cNullVec__6Z2Calc@ha /* 0x803C1F50@ha */ -/* 80251200 3B E3 1F 50 */ addi r31, r3, cNullVec__6Z2Calc@l /* 0x803C1F50@l */ -/* 80251204 3C 60 80 43 */ lis r3, g_nmHIO@ha /* 0x80430734@ha */ -/* 80251208 38 63 07 34 */ addi r3, r3, g_nmHIO@l /* 0x80430734@l */ -/* 8025120C 4B FF D1 D5 */ bl __ct__9dNm_HIO_cFv -/* 80251210 3C 80 80 25 */ lis r4, __dt__9dNm_HIO_cFv@ha /* 0x802511A4@ha */ -/* 80251214 38 84 11 A4 */ addi r4, r4, __dt__9dNm_HIO_cFv@l /* 0x802511A4@l */ -/* 80251218 3C A0 80 43 */ lis r5, lit_3660@ha /* 0x80430728@ha */ -/* 8025121C 38 A5 07 28 */ addi r5, r5, lit_3660@l /* 0x80430728@l */ -/* 80251220 48 11 0A 05 */ bl __register_global_object -/* 80251224 80 7F 07 28 */ lwz r3, 0x728(r31) -/* 80251228 80 1F 07 2C */ lwz r0, 0x72c(r31) -/* 8025122C 90 7F 07 94 */ stw r3, 0x794(r31) -/* 80251230 90 1F 07 98 */ stw r0, 0x798(r31) -/* 80251234 80 1F 07 30 */ lwz r0, 0x730(r31) -/* 80251238 90 1F 07 9C */ stw r0, 0x79c(r31) -/* 8025123C 38 9F 07 94 */ addi r4, r31, 0x794 -/* 80251240 80 7F 07 34 */ lwz r3, 0x734(r31) -/* 80251244 80 1F 07 38 */ lwz r0, 0x738(r31) -/* 80251248 90 64 00 0C */ stw r3, 0xc(r4) -/* 8025124C 90 04 00 10 */ stw r0, 0x10(r4) -/* 80251250 80 1F 07 3C */ lwz r0, 0x73c(r31) -/* 80251254 90 04 00 14 */ stw r0, 0x14(r4) -/* 80251258 80 7F 07 40 */ lwz r3, 0x740(r31) -/* 8025125C 80 1F 07 44 */ lwz r0, 0x744(r31) -/* 80251260 90 64 00 18 */ stw r3, 0x18(r4) -/* 80251264 90 04 00 1C */ stw r0, 0x1c(r4) -/* 80251268 80 1F 07 48 */ lwz r0, 0x748(r31) -/* 8025126C 90 04 00 20 */ stw r0, 0x20(r4) -/* 80251270 80 7F 07 4C */ lwz r3, 0x74c(r31) -/* 80251274 80 1F 07 50 */ lwz r0, 0x750(r31) -/* 80251278 90 64 00 24 */ stw r3, 0x24(r4) -/* 8025127C 90 04 00 28 */ stw r0, 0x28(r4) -/* 80251280 80 1F 07 54 */ lwz r0, 0x754(r31) -/* 80251284 90 04 00 2C */ stw r0, 0x2c(r4) -/* 80251288 80 7F 07 58 */ lwz r3, 0x758(r31) -/* 8025128C 80 1F 07 5C */ lwz r0, 0x75c(r31) -/* 80251290 90 64 00 30 */ stw r3, 0x30(r4) -/* 80251294 90 04 00 34 */ stw r0, 0x34(r4) -/* 80251298 80 1F 07 60 */ lwz r0, 0x760(r31) -/* 8025129C 90 04 00 38 */ stw r0, 0x38(r4) -/* 802512A0 80 7F 07 64 */ lwz r3, 0x764(r31) -/* 802512A4 80 1F 07 68 */ lwz r0, 0x768(r31) -/* 802512A8 90 64 00 3C */ stw r3, 0x3c(r4) -/* 802512AC 90 04 00 40 */ stw r0, 0x40(r4) -/* 802512B0 80 1F 07 6C */ lwz r0, 0x76c(r31) -/* 802512B4 90 04 00 44 */ stw r0, 0x44(r4) -/* 802512B8 80 7F 07 70 */ lwz r3, 0x770(r31) -/* 802512BC 80 1F 07 74 */ lwz r0, 0x774(r31) -/* 802512C0 90 64 00 48 */ stw r3, 0x48(r4) -/* 802512C4 90 04 00 4C */ stw r0, 0x4c(r4) -/* 802512C8 80 1F 07 78 */ lwz r0, 0x778(r31) -/* 802512CC 90 04 00 50 */ stw r0, 0x50(r4) -/* 802512D0 80 7F 07 7C */ lwz r3, 0x77c(r31) -/* 802512D4 80 1F 07 80 */ lwz r0, 0x780(r31) -/* 802512D8 90 64 00 54 */ stw r3, 0x54(r4) -/* 802512DC 90 04 00 58 */ stw r0, 0x58(r4) -/* 802512E0 80 1F 07 84 */ lwz r0, 0x784(r31) -/* 802512E4 90 04 00 5C */ stw r0, 0x5c(r4) -/* 802512E8 80 7F 07 88 */ lwz r3, 0x788(r31) -/* 802512EC 80 1F 07 8C */ lwz r0, 0x78c(r31) -/* 802512F0 90 64 00 60 */ stw r3, 0x60(r4) -/* 802512F4 90 04 00 64 */ stw r0, 0x64(r4) -/* 802512F8 80 1F 07 90 */ lwz r0, 0x790(r31) -/* 802512FC 90 04 00 68 */ stw r0, 0x68(r4) -/* 80251300 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80251304 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80251308 7C 08 03 A6 */ mtlr r0 -/* 8025130C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80251310 4E 80 00 20 */ blr diff --git a/asm/d/d_name/_create__7dName_cFv.s b/asm/d/d_name/_create__7dName_cFv.s deleted file mode 100644 index ae412ef6028..00000000000 --- a/asm/d/d_name/_create__7dName_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8024E62C: -/* 8024E62C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024E630 7C 08 02 A6 */ mflr r0 -/* 8024E634 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024E638 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024E63C 7C 7F 1B 78 */ mr r31, r3 -/* 8024E640 38 60 00 30 */ li r3, 0x30 -/* 8024E644 48 08 06 09 */ bl __nw__FUl -/* 8024E648 7C 60 1B 79 */ or. r0, r3, r3 -/* 8024E64C 41 82 00 2C */ beq lbl_8024E678 -/* 8024E650 38 80 00 05 */ li r4, 5 -/* 8024E654 38 A0 00 02 */ li r5, 2 -/* 8024E658 38 C0 00 02 */ li r6, 2 -/* 8024E65C 38 E0 00 01 */ li r7, 1 -/* 8024E660 C0 22 B3 B8 */ lfs f1, lit_3755(r2) -/* 8024E664 C0 42 B3 BC */ lfs f2, lit_3756(r2) -/* 8024E668 39 00 00 00 */ li r8, 0 -/* 8024E66C 39 20 08 00 */ li r9, 0x800 -/* 8024E670 4B DE 39 D5 */ bl __ct__9STControlFssssffss -/* 8024E674 7C 60 1B 78 */ mr r0, r3 -lbl_8024E678: -/* 8024E678 90 1F 00 04 */ stw r0, 4(r31) -/* 8024E67C 38 00 00 05 */ li r0, 5 -/* 8024E680 80 7F 00 04 */ lwz r3, 4(r31) -/* 8024E684 B0 03 00 28 */ sth r0, 0x28(r3) -/* 8024E688 4B DC 63 69 */ bl mDoExt_getMesgFont__Fv -/* 8024E68C 90 7F 00 14 */ stw r3, 0x14(r31) -/* 8024E690 38 00 FF FF */ li r0, -1 -/* 8024E694 3C 60 80 43 */ lis r3, g_nmHIO@ha /* 0x80430734@ha */ -/* 8024E698 38 63 07 34 */ addi r3, r3, g_nmHIO@l /* 0x80430734@l */ -/* 8024E69C 98 03 00 04 */ stb r0, 4(r3) -/* 8024E6A0 7F E3 FB 78 */ mr r3, r31 -/* 8024E6A4 48 00 1F 29 */ bl screenSet__7dName_cFv -/* 8024E6A8 38 00 00 00 */ li r0, 0 -/* 8024E6AC 98 1F 03 1C */ stb r0, 0x31c(r31) -/* 8024E6B0 38 00 00 01 */ li r0, 1 -/* 8024E6B4 98 1F 02 A4 */ stb r0, 0x2a4(r31) -/* 8024E6B8 7F E3 FB 78 */ mr r3, r31 -/* 8024E6BC 48 00 26 31 */ bl displayInit__7dName_cFv -/* 8024E6C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024E6C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024E6C8 7C 08 03 A6 */ mtlr r0 -/* 8024E6CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024E6D0 4E 80 00 20 */ blr diff --git a/asm/d/d_name/_draw__7dName_cFv.s b/asm/d/d_name/_draw__7dName_cFv.s deleted file mode 100644 index 2a6a6503347..00000000000 --- a/asm/d/d_name/_draw__7dName_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80250560: -/* 80250560 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80250564 7C 08 02 A6 */ mflr r0 -/* 80250568 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025056C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80250570 48 11 1C 69 */ bl _savegpr_28 -/* 80250574 7C 7C 1B 78 */ mr r28, r3 -/* 80250578 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025057C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80250580 3B E3 5F 64 */ addi r31, r3, 0x5f64 -/* 80250584 7F E3 FB 78 */ mr r3, r31 -/* 80250588 3B BF 01 B4 */ addi r29, r31, 0x1b4 -/* 8025058C 7F A4 EB 78 */ mr r4, r29 -/* 80250590 3B DF 01 B8 */ addi r30, r31, 0x1b8 -/* 80250594 7F C5 F3 78 */ mr r5, r30 -/* 80250598 38 DC 00 0C */ addi r6, r28, 0xc -/* 8025059C 4B E0 61 F9 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 802505A0 7F E3 FB 78 */ mr r3, r31 -/* 802505A4 7F A4 EB 78 */ mr r4, r29 -/* 802505A8 7F C5 F3 78 */ mr r5, r30 -/* 802505AC 80 DC 00 20 */ lwz r6, 0x20(r28) -/* 802505B0 4B E0 61 E5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 802505B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802505B8 48 11 1C 6D */ bl _restgpr_28 -/* 802505BC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802505C0 7C 08 03 A6 */ mtlr r0 -/* 802505C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802505C8 4E 80 00 20 */ blr diff --git a/asm/d/d_name/cursorAnm__7dName_cFv.s b/asm/d/d_name/cursorAnm__7dName_cFv.s deleted file mode 100644 index 5f40a6ff94f..00000000000 --- a/asm/d/d_name/cursorAnm__7dName_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_8024EC84: -/* 8024EC84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024EC88 7C 08 02 A6 */ mflr r0 -/* 8024EC8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024EC90 80 83 00 28 */ lwz r4, 0x28(r3) -/* 8024EC94 38 04 00 02 */ addi r0, r4, 2 -/* 8024EC98 90 03 00 28 */ stw r0, 0x28(r3) -/* 8024EC9C 80 83 00 24 */ lwz r4, 0x24(r3) -/* 8024ECA0 A8 04 00 06 */ lha r0, 6(r4) -/* 8024ECA4 80 83 00 28 */ lwz r4, 0x28(r3) -/* 8024ECA8 7C 04 00 00 */ cmpw r4, r0 -/* 8024ECAC 41 80 00 0C */ blt lbl_8024ECB8 -/* 8024ECB0 7C 00 20 50 */ subf r0, r0, r4 -/* 8024ECB4 90 03 00 28 */ stw r0, 0x28(r3) -lbl_8024ECB8: -/* 8024ECB8 80 03 00 28 */ lwz r0, 0x28(r3) -/* 8024ECBC C8 22 B3 C8 */ lfd f1, lit_3936(r2) -/* 8024ECC0 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8024ECC4 90 01 00 0C */ stw r0, 0xc(r1) -/* 8024ECC8 3C 00 43 30 */ lis r0, 0x4330 -/* 8024ECCC 90 01 00 08 */ stw r0, 8(r1) -/* 8024ECD0 C8 01 00 08 */ lfd f0, 8(r1) -/* 8024ECD4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8024ECD8 80 83 00 24 */ lwz r4, 0x24(r3) -/* 8024ECDC D0 04 00 08 */ stfs f0, 8(r4) -/* 8024ECE0 80 83 00 30 */ lwz r4, 0x30(r3) -/* 8024ECE4 38 04 00 02 */ addi r0, r4, 2 -/* 8024ECE8 90 03 00 30 */ stw r0, 0x30(r3) -/* 8024ECEC 80 83 00 2C */ lwz r4, 0x2c(r3) -/* 8024ECF0 A8 04 00 06 */ lha r0, 6(r4) -/* 8024ECF4 80 83 00 30 */ lwz r4, 0x30(r3) -/* 8024ECF8 7C 04 00 00 */ cmpw r4, r0 -/* 8024ECFC 41 80 00 0C */ blt lbl_8024ED08 -/* 8024ED00 7C 00 20 50 */ subf r0, r0, r4 -/* 8024ED04 90 03 00 30 */ stw r0, 0x30(r3) -lbl_8024ED08: -/* 8024ED08 80 03 00 30 */ lwz r0, 0x30(r3) -/* 8024ED0C C8 22 B3 C8 */ lfd f1, lit_3936(r2) -/* 8024ED10 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8024ED14 90 01 00 0C */ stw r0, 0xc(r1) -/* 8024ED18 3C 00 43 30 */ lis r0, 0x4330 -/* 8024ED1C 90 01 00 08 */ stw r0, 8(r1) -/* 8024ED20 C8 01 00 08 */ lfd f0, 8(r1) -/* 8024ED24 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8024ED28 80 83 00 2C */ lwz r4, 0x2c(r3) -/* 8024ED2C D0 04 00 08 */ stfs f0, 8(r4) -/* 8024ED30 80 63 00 10 */ lwz r3, 0x10(r3) -/* 8024ED34 48 0A A9 5D */ bl animation__9J2DScreenFv -/* 8024ED38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024ED3C 7C 08 03 A6 */ mtlr r0 -/* 8024ED40 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024ED44 4E 80 00 20 */ blr diff --git a/asm/d/d_name/displayInit__7dName_cFv.s b/asm/d/d_name/displayInit__7dName_cFv.s deleted file mode 100644 index 163244feaa6..00000000000 --- a/asm/d/d_name/displayInit__7dName_cFv.s +++ /dev/null @@ -1,95 +0,0 @@ -lbl_80250CEC: -/* 80250CEC 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80250CF0 7C 08 02 A6 */ mflr r0 -/* 80250CF4 90 01 00 44 */ stw r0, 0x44(r1) -/* 80250CF8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80250CFC 48 11 14 CD */ bl _savegpr_24 -/* 80250D00 7C 7F 1B 78 */ mr r31, r3 -/* 80250D04 80 63 00 20 */ lwz r3, 0x20(r3) -/* 80250D08 C0 22 B3 D0 */ lfs f1, lit_4009(r2) -/* 80250D0C 4B F4 45 95 */ bl setAlphaRate__16dSelect_cursor_cFf -/* 80250D10 3B 60 00 00 */ li r27, 0 -/* 80250D14 93 7F 00 28 */ stw r27, 0x28(r31) -/* 80250D18 93 7F 00 30 */ stw r27, 0x30(r31) -/* 80250D1C 88 1F 02 AC */ lbz r0, 0x2ac(r31) -/* 80250D20 98 1F 02 AB */ stb r0, 0x2ab(r31) -/* 80250D24 88 1F 02 AE */ lbz r0, 0x2ae(r31) -/* 80250D28 98 1F 02 AD */ stb r0, 0x2ad(r31) -/* 80250D2C 3B 80 00 00 */ li r28, 0 -/* 80250D30 3B 40 00 96 */ li r26, 0x96 -/* 80250D34 3B 20 00 FF */ li r25, 0xff -lbl_80250D38: -/* 80250D38 9B 41 00 10 */ stb r26, 0x10(r1) -/* 80250D3C 9B 41 00 11 */ stb r26, 0x11(r1) -/* 80250D40 9B 41 00 12 */ stb r26, 0x12(r1) -/* 80250D44 9B 21 00 13 */ stb r25, 0x13(r1) -/* 80250D48 80 01 00 10 */ lwz r0, 0x10(r1) -/* 80250D4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80250D50 38 1B 00 74 */ addi r0, r27, 0x74 -/* 80250D54 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80250D58 80 63 00 04 */ lwz r3, 4(r3) -/* 80250D5C 38 81 00 14 */ addi r4, r1, 0x14 -/* 80250D60 81 83 00 00 */ lwz r12, 0(r3) -/* 80250D64 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 80250D68 7D 89 03 A6 */ mtctr r12 -/* 80250D6C 4E 80 04 21 */ bctrl -/* 80250D70 3B 9C 00 01 */ addi r28, r28, 1 -/* 80250D74 2C 1C 00 41 */ cmpwi r28, 0x41 -/* 80250D78 3B 7B 00 04 */ addi r27, r27, 4 -/* 80250D7C 41 80 FF BC */ blt lbl_80250D38 -/* 80250D80 3B 60 00 00 */ li r27, 0 -/* 80250D84 3B A0 00 00 */ li r29, 0 -/* 80250D88 3B 40 00 96 */ li r26, 0x96 -/* 80250D8C 3B 20 00 FF */ li r25, 0xff -lbl_80250D90: -/* 80250D90 38 7D 02 94 */ addi r3, r29, 0x294 -/* 80250D94 7C 1F 18 2E */ lwzx r0, r31, r3 -/* 80250D98 28 00 00 00 */ cmplwi r0, 0 -/* 80250D9C 41 82 00 34 */ beq lbl_80250DD0 -/* 80250DA0 9B 41 00 08 */ stb r26, 8(r1) -/* 80250DA4 9B 41 00 09 */ stb r26, 9(r1) -/* 80250DA8 9B 41 00 0A */ stb r26, 0xa(r1) -/* 80250DAC 9B 21 00 0B */ stb r25, 0xb(r1) -/* 80250DB0 80 01 00 08 */ lwz r0, 8(r1) -/* 80250DB4 90 01 00 0C */ stw r0, 0xc(r1) -/* 80250DB8 7C 7F 18 2E */ lwzx r3, r31, r3 -/* 80250DBC 38 81 00 0C */ addi r4, r1, 0xc -/* 80250DC0 81 83 00 00 */ lwz r12, 0(r3) -/* 80250DC4 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 80250DC8 7D 89 03 A6 */ mtctr r12 -/* 80250DCC 4E 80 04 21 */ bctrl -lbl_80250DD0: -/* 80250DD0 3B 7B 00 01 */ addi r27, r27, 1 -/* 80250DD4 2C 1B 00 04 */ cmpwi r27, 4 -/* 80250DD8 3B BD 00 04 */ addi r29, r29, 4 -/* 80250DDC 41 80 FF B4 */ blt lbl_80250D90 -/* 80250DE0 3B 00 00 00 */ li r24, 0 -/* 80250DE4 3B C0 00 00 */ li r30, 0 -/* 80250DE8 3B A0 00 00 */ li r29, 0 -/* 80250DEC 3B 20 00 07 */ li r25, 7 -/* 80250DF0 3B 40 00 01 */ li r26, 1 -/* 80250DF4 3B 60 00 02 */ li r27, 2 -/* 80250DF8 3B 80 00 20 */ li r28, 0x20 -lbl_80250DFC: -/* 80250DFC 38 1D 00 34 */ addi r0, r29, 0x34 -/* 80250E00 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80250E04 48 00 48 05 */ bl hide__13CPaneMgrAlphaFv -/* 80250E08 7C 7F F2 14 */ add r3, r31, r30 -/* 80250E0C 9B 23 02 CC */ stb r25, 0x2cc(r3) -/* 80250E10 9B 43 02 CD */ stb r26, 0x2cd(r3) -/* 80250E14 9B 63 02 CE */ stb r27, 0x2ce(r3) -/* 80250E18 9B 43 02 CF */ stb r26, 0x2cf(r3) -/* 80250E1C 93 83 02 D0 */ stw r28, 0x2d0(r3) -/* 80250E20 3B 18 00 01 */ addi r24, r24, 1 -/* 80250E24 2C 18 00 08 */ cmpwi r24, 8 -/* 80250E28 3B DE 00 08 */ addi r30, r30, 8 -/* 80250E2C 3B BD 00 04 */ addi r29, r29, 4 -/* 80250E30 41 80 FF CC */ blt lbl_80250DFC -/* 80250E34 38 00 00 00 */ li r0, 0 -/* 80250E38 98 1F 02 B4 */ stb r0, 0x2b4(r31) -/* 80250E3C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80250E40 48 11 13 D5 */ bl _restgpr_24 -/* 80250E44 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80250E48 7C 08 03 A6 */ mtlr r0 -/* 80250E4C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80250E50 4E 80 00 20 */ blr diff --git a/asm/d/d_name/getMenuPosIdx__7dName_cFUc.s b/asm/d/d_name/getMenuPosIdx__7dName_cFUc.s deleted file mode 100644 index 26ea3298d78..00000000000 --- a/asm/d/d_name/getMenuPosIdx__7dName_cFUc.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80251048: -/* 80251048 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 8025104C 2C 00 00 02 */ cmpwi r0, 2 -/* 80251050 41 82 00 34 */ beq lbl_80251084 -/* 80251054 40 80 00 14 */ bge lbl_80251068 -/* 80251058 2C 00 00 00 */ cmpwi r0, 0 -/* 8025105C 41 82 00 18 */ beq lbl_80251074 -/* 80251060 40 80 00 1C */ bge lbl_8025107C -/* 80251064 4E 80 00 20 */ blr -lbl_80251068: -/* 80251068 2C 00 00 04 */ cmpwi r0, 4 -/* 8025106C 4C 80 00 20 */ bgelr -/* 80251070 48 00 00 1C */ b lbl_8025108C -lbl_80251074: -/* 80251074 38 60 00 00 */ li r3, 0 -/* 80251078 4E 80 00 20 */ blr -lbl_8025107C: -/* 8025107C 38 60 00 01 */ li r3, 1 -/* 80251080 4E 80 00 20 */ blr -lbl_80251084: -/* 80251084 38 60 00 02 */ li r3, 2 -/* 80251088 4E 80 00 20 */ blr -lbl_8025108C: -/* 8025108C 38 60 00 03 */ li r3, 3 -/* 80251090 4E 80 00 20 */ blr diff --git a/asm/d/d_name/getMoji__7dName_cFv.s b/asm/d/d_name/getMoji__7dName_cFv.s deleted file mode 100644 index 2f250d5924e..00000000000 --- a/asm/d/d_name/getMoji__7dName_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8024F59C: -/* 8024F59C 3C 80 80 3C */ lis r4, cNullVec__6Z2Calc@ha /* 0x803C1F50@ha */ -/* 8024F5A0 38 A4 1F 50 */ addi r5, r4, cNullVec__6Z2Calc@l /* 0x803C1F50@l */ -/* 8024F5A4 88 03 02 A9 */ lbz r0, 0x2a9(r3) -/* 8024F5A8 2C 00 00 01 */ cmpwi r0, 1 -/* 8024F5AC 41 82 00 40 */ beq lbl_8024F5EC -/* 8024F5B0 40 80 00 10 */ bge lbl_8024F5C0 -/* 8024F5B4 2C 00 00 00 */ cmpwi r0, 0 -/* 8024F5B8 40 80 00 14 */ bge lbl_8024F5CC -/* 8024F5BC 48 00 00 6C */ b lbl_8024F628 -lbl_8024F5C0: -/* 8024F5C0 2C 00 00 03 */ cmpwi r0, 3 -/* 8024F5C4 40 80 00 64 */ bge lbl_8024F628 -/* 8024F5C8 48 00 00 44 */ b lbl_8024F60C -lbl_8024F5CC: -/* 8024F5CC 88 83 02 A7 */ lbz r4, 0x2a7(r3) -/* 8024F5D0 88 03 02 A5 */ lbz r0, 0x2a5(r3) -/* 8024F5D4 1C 00 00 05 */ mulli r0, r0, 5 -/* 8024F5D8 7C 04 02 14 */ add r0, r4, r0 -/* 8024F5DC 54 00 10 3A */ slwi r0, r0, 2 -/* 8024F5E0 38 65 00 0C */ addi r3, r5, 0xc -/* 8024F5E4 7C 63 00 2E */ lwzx r3, r3, r0 -/* 8024F5E8 48 00 00 40 */ b lbl_8024F628 -lbl_8024F5EC: -/* 8024F5EC 88 83 02 A7 */ lbz r4, 0x2a7(r3) -/* 8024F5F0 88 03 02 A5 */ lbz r0, 0x2a5(r3) -/* 8024F5F4 1C 00 00 05 */ mulli r0, r0, 5 -/* 8024F5F8 7C 04 02 14 */ add r0, r4, r0 -/* 8024F5FC 54 00 10 3A */ slwi r0, r0, 2 -/* 8024F600 38 65 03 18 */ addi r3, r5, 0x318 -/* 8024F604 7C 63 00 2E */ lwzx r3, r3, r0 -/* 8024F608 48 00 00 20 */ b lbl_8024F628 -lbl_8024F60C: -/* 8024F60C 88 83 02 A7 */ lbz r4, 0x2a7(r3) -/* 8024F610 88 03 02 A5 */ lbz r0, 0x2a5(r3) -/* 8024F614 1C 00 00 05 */ mulli r0, r0, 5 -/* 8024F618 7C 04 02 14 */ add r0, r4, r0 -/* 8024F61C 54 00 10 3A */ slwi r0, r0, 2 -/* 8024F620 38 65 06 24 */ addi r3, r5, 0x624 -/* 8024F624 7C 63 00 2E */ lwzx r3, r3, r0 -lbl_8024F628: -/* 8024F628 88 63 00 00 */ lbz r3, 0(r3) -/* 8024F62C 7C 63 07 74 */ extsb r3, r3 -/* 8024F630 4E 80 00 20 */ blr diff --git a/asm/d/d_name/init__7dName_cFv.s b/asm/d/d_name/init__7dName_cFv.s deleted file mode 100644 index 9e5a6bece7b..00000000000 --- a/asm/d/d_name/init__7dName_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_8024E6D4: -/* 8024E6D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024E6D8 7C 08 02 A6 */ mflr r0 -/* 8024E6DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024E6E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024E6E4 7C 7F 1B 78 */ mr r31, r3 -/* 8024E6E8 38 00 00 00 */ li r0, 0 -/* 8024E6EC 98 03 02 B1 */ stb r0, 0x2b1(r3) -/* 8024E6F0 98 03 02 B2 */ stb r0, 0x2b2(r3) -/* 8024E6F4 48 00 12 21 */ bl nameCursorMove__7dName_cFv -/* 8024E6F8 88 1F 02 B1 */ lbz r0, 0x2b1(r31) -/* 8024E6FC 98 1F 02 B2 */ stb r0, 0x2b2(r31) -/* 8024E700 38 60 00 00 */ li r3, 0 -/* 8024E704 7C 64 1B 78 */ mr r4, r3 -/* 8024E708 38 00 00 04 */ li r0, 4 -/* 8024E70C 7C 09 03 A6 */ mtctr r0 -lbl_8024E710: -/* 8024E710 38 03 03 0E */ addi r0, r3, 0x30e -/* 8024E714 7C 9F 01 AE */ stbx r4, r31, r0 -/* 8024E718 38 63 00 04 */ addi r3, r3, 4 -/* 8024E71C 42 00 FF F4 */ bdnz lbl_8024E710 -/* 8024E720 38 00 00 00 */ li r0, 0 -/* 8024E724 98 1F 02 A5 */ stb r0, 0x2a5(r31) -/* 8024E728 98 1F 02 A7 */ stb r0, 0x2a7(r31) -/* 8024E72C 98 1F 02 A6 */ stb r0, 0x2a6(r31) -/* 8024E730 98 1F 02 A8 */ stb r0, 0x2a8(r31) -/* 8024E734 98 1F 03 0C */ stb r0, 0x30c(r31) -/* 8024E738 98 1F 03 0D */ stb r0, 0x30d(r31) -/* 8024E73C 38 00 00 01 */ li r0, 1 -/* 8024E740 98 1F 03 0E */ stb r0, 0x30e(r31) -/* 8024E744 7F E3 FB 78 */ mr r3, r31 -/* 8024E748 48 00 12 4D */ bl selectCursorMove__7dName_cFv -/* 8024E74C 38 00 00 00 */ li r0, 0 -/* 8024E750 98 1F 02 AB */ stb r0, 0x2ab(r31) -/* 8024E754 88 1F 02 AB */ lbz r0, 0x2ab(r31) -/* 8024E758 98 1F 02 AC */ stb r0, 0x2ac(r31) -/* 8024E75C 88 1F 02 AB */ lbz r0, 0x2ab(r31) -/* 8024E760 98 1F 02 AD */ stb r0, 0x2ad(r31) -/* 8024E764 88 1F 02 AC */ lbz r0, 0x2ac(r31) -/* 8024E768 98 1F 02 AE */ stb r0, 0x2ae(r31) -/* 8024E76C 38 00 00 02 */ li r0, 2 -/* 8024E770 98 1F 02 A9 */ stb r0, 0x2a9(r31) -/* 8024E774 38 00 00 FF */ li r0, 0xff -/* 8024E778 98 1F 02 AA */ stb r0, 0x2aa(r31) -/* 8024E77C 38 00 00 03 */ li r0, 3 -/* 8024E780 98 1F 02 AF */ stb r0, 0x2af(r31) -/* 8024E784 98 1F 02 B0 */ stb r0, 0x2b0(r31) -/* 8024E788 7F E3 FB 78 */ mr r3, r31 -/* 8024E78C 48 00 1A 25 */ bl mojiListChange__7dName_cFv -/* 8024E790 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024E794 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024E798 7C 08 03 A6 */ mtlr r0 -/* 8024E79C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024E7A0 4E 80 00 20 */ blr diff --git a/asm/d/d_name/initial__7dName_cFv.s b/asm/d/d_name/initial__7dName_cFv.s deleted file mode 100644 index 60a000ceeb1..00000000000 --- a/asm/d/d_name/initial__7dName_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8024E7A4: -/* 8024E7A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024E7A8 7C 08 02 A6 */ mflr r0 -/* 8024E7AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024E7B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024E7B4 7C 7F 1B 78 */ mr r31, r3 -/* 8024E7B8 48 00 25 35 */ bl displayInit__7dName_cFv -/* 8024E7BC 88 1F 03 1C */ lbz r0, 0x31c(r31) -/* 8024E7C0 7C 00 07 75 */ extsb. r0, r0 -/* 8024E7C4 41 82 00 14 */ beq lbl_8024E7D8 -/* 8024E7C8 7F E3 FB 78 */ mr r3, r31 -/* 8024E7CC 48 00 26 89 */ bl NameStrSet__7dName_cFv -/* 8024E7D0 38 00 00 00 */ li r0, 0 -/* 8024E7D4 98 1F 03 1C */ stb r0, 0x31c(r31) -lbl_8024E7D8: -/* 8024E7D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024E7DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024E7E0 7C 08 03 A6 */ mtlr r0 -/* 8024E7E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024E7E8 4E 80 00 20 */ blr diff --git a/asm/d/d_name/menuCursorMove2__7dName_cFv.s b/asm/d/d_name/menuCursorMove2__7dName_cFv.s deleted file mode 100644 index 682ac71bbb5..00000000000 --- a/asm/d/d_name/menuCursorMove2__7dName_cFv.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_80250380: -/* 80250380 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80250384 7C 08 02 A6 */ mflr r0 -/* 80250388 90 01 00 44 */ stw r0, 0x44(r1) -/* 8025038C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80250390 48 11 1E 4D */ bl _savegpr_29 -/* 80250394 7C 7F 1B 78 */ mr r31, r3 -/* 80250398 88 83 02 AF */ lbz r4, 0x2af(r3) -/* 8025039C 48 00 0C AD */ bl getMenuPosIdx__7dName_cFUc -/* 802503A0 7C 7E 1B 78 */ mr r30, r3 -/* 802503A4 7F E3 FB 78 */ mr r3, r31 -/* 802503A8 88 9F 02 A9 */ lbz r4, 0x2a9(r31) -/* 802503AC 48 00 0C 9D */ bl getMenuPosIdx__7dName_cFUc -/* 802503B0 7C 1E 18 00 */ cmpw r30, r3 -/* 802503B4 41 82 00 74 */ beq lbl_80250428 -/* 802503B8 3C 60 80 43 */ lis r3, g_nmHIO@ha /* 0x80430734@ha */ -/* 802503BC 38 63 07 34 */ addi r3, r3, g_nmHIO@l /* 0x80430734@l */ -/* 802503C0 C0 03 00 08 */ lfs f0, 8(r3) -/* 802503C4 57 DD 10 3A */ slwi r29, r30, 2 -/* 802503C8 7C 7F EA 14 */ add r3, r31, r29 -/* 802503CC 80 63 02 84 */ lwz r3, 0x284(r3) -/* 802503D0 80 63 00 04 */ lwz r3, 4(r3) -/* 802503D4 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 802503D8 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 802503DC 81 83 00 00 */ lwz r12, 0(r3) -/* 802503E0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802503E4 7D 89 03 A6 */ mtctr r12 -/* 802503E8 4E 80 04 21 */ bctrl -/* 802503EC 38 00 00 C8 */ li r0, 0xc8 -/* 802503F0 98 01 00 08 */ stb r0, 8(r1) -/* 802503F4 98 01 00 09 */ stb r0, 9(r1) -/* 802503F8 98 01 00 0A */ stb r0, 0xa(r1) -/* 802503FC 38 00 00 FF */ li r0, 0xff -/* 80250400 98 01 00 0B */ stb r0, 0xb(r1) -/* 80250404 80 01 00 08 */ lwz r0, 8(r1) -/* 80250408 90 01 00 0C */ stw r0, 0xc(r1) -/* 8025040C 7C 7F EA 14 */ add r3, r31, r29 -/* 80250410 80 63 02 94 */ lwz r3, 0x294(r3) -/* 80250414 38 81 00 0C */ addi r4, r1, 0xc -/* 80250418 81 83 00 00 */ lwz r12, 0(r3) -/* 8025041C 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 80250420 7D 89 03 A6 */ mtctr r12 -/* 80250424 4E 80 04 21 */ bctrl -lbl_80250428: -/* 80250428 57 C0 10 3A */ slwi r0, r30, 2 -/* 8025042C 7F BF 02 14 */ add r29, r31, r0 -/* 80250430 80 9D 02 84 */ lwz r4, 0x284(r29) -/* 80250434 38 61 00 10 */ addi r3, r1, 0x10 -/* 80250438 80 A4 00 04 */ lwz r5, 4(r4) -/* 8025043C 38 C0 00 00 */ li r6, 0 -/* 80250440 38 E0 00 00 */ li r7, 0 -/* 80250444 48 00 4A 79 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs -/* 80250448 80 61 00 10 */ lwz r3, 0x10(r1) -/* 8025044C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80250450 90 61 00 1C */ stw r3, 0x1c(r1) -/* 80250454 90 01 00 20 */ stw r0, 0x20(r1) -/* 80250458 80 01 00 18 */ lwz r0, 0x18(r1) -/* 8025045C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80250460 80 7D 02 84 */ lwz r3, 0x284(r29) -/* 80250464 80 83 00 04 */ lwz r4, 4(r3) -/* 80250468 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 8025046C C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 80250470 C0 41 00 20 */ lfs f2, 0x20(r1) -/* 80250474 38 A0 00 01 */ li r5, 1 -/* 80250478 4B F4 4C 7D */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb -/* 8025047C 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 80250480 C0 22 B3 C0 */ lfs f1, lit_3820(r2) -/* 80250484 4B F4 4E 1D */ bl setAlphaRate__16dSelect_cursor_cFf -/* 80250488 39 61 00 40 */ addi r11, r1, 0x40 -/* 8025048C 48 11 1D 9D */ bl _restgpr_29 -/* 80250490 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80250494 7C 08 03 A6 */ mtlr r0 -/* 80250498 38 21 00 40 */ addi r1, r1, 0x40 -/* 8025049C 4E 80 00 20 */ blr diff --git a/asm/d/d_name/menuCursorMove__7dName_cFv.s b/asm/d/d_name/menuCursorMove__7dName_cFv.s deleted file mode 100644 index dc2bdd44da2..00000000000 --- a/asm/d/d_name/menuCursorMove__7dName_cFv.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_80250284: -/* 80250284 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80250288 7C 08 02 A6 */ mflr r0 -/* 8025028C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80250290 39 61 00 40 */ addi r11, r1, 0x40 -/* 80250294 48 11 1F 49 */ bl _savegpr_29 -/* 80250298 7C 7D 1B 78 */ mr r29, r3 -/* 8025029C 88 83 02 AF */ lbz r4, 0x2af(r3) -/* 802502A0 48 00 0D A9 */ bl getMenuPosIdx__7dName_cFUc -/* 802502A4 3C 80 80 43 */ lis r4, g_nmHIO@ha /* 0x80430734@ha */ -/* 802502A8 38 84 07 34 */ addi r4, r4, g_nmHIO@l /* 0x80430734@l */ -/* 802502AC C0 04 00 08 */ lfs f0, 8(r4) -/* 802502B0 54 7F 10 3A */ slwi r31, r3, 2 -/* 802502B4 7F DD FA 14 */ add r30, r29, r31 -/* 802502B8 80 7E 02 84 */ lwz r3, 0x284(r30) -/* 802502BC 80 63 00 04 */ lwz r3, 4(r3) -/* 802502C0 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 802502C4 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 802502C8 81 83 00 00 */ lwz r12, 0(r3) -/* 802502CC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802502D0 7D 89 03 A6 */ mtctr r12 -/* 802502D4 4E 80 04 21 */ bctrl -/* 802502D8 38 00 00 C8 */ li r0, 0xc8 -/* 802502DC 98 01 00 08 */ stb r0, 8(r1) -/* 802502E0 98 01 00 09 */ stb r0, 9(r1) -/* 802502E4 98 01 00 0A */ stb r0, 0xa(r1) -/* 802502E8 38 00 00 FF */ li r0, 0xff -/* 802502EC 98 01 00 0B */ stb r0, 0xb(r1) -/* 802502F0 80 01 00 08 */ lwz r0, 8(r1) -/* 802502F4 90 01 00 0C */ stw r0, 0xc(r1) -/* 802502F8 80 7E 02 94 */ lwz r3, 0x294(r30) -/* 802502FC 38 81 00 0C */ addi r4, r1, 0xc -/* 80250300 81 83 00 00 */ lwz r12, 0(r3) -/* 80250304 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 80250308 7D 89 03 A6 */ mtctr r12 -/* 8025030C 4E 80 04 21 */ bctrl -/* 80250310 80 9E 02 84 */ lwz r4, 0x284(r30) -/* 80250314 38 61 00 10 */ addi r3, r1, 0x10 -/* 80250318 80 A4 00 04 */ lwz r5, 4(r4) -/* 8025031C 38 C0 00 00 */ li r6, 0 -/* 80250320 38 E0 00 00 */ li r7, 0 -/* 80250324 48 00 4B 99 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs -/* 80250328 80 61 00 10 */ lwz r3, 0x10(r1) -/* 8025032C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80250330 90 61 00 1C */ stw r3, 0x1c(r1) -/* 80250334 90 01 00 20 */ stw r0, 0x20(r1) -/* 80250338 80 01 00 18 */ lwz r0, 0x18(r1) -/* 8025033C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80250340 80 7E 02 84 */ lwz r3, 0x284(r30) -/* 80250344 80 83 00 04 */ lwz r4, 4(r3) -/* 80250348 80 7D 00 20 */ lwz r3, 0x20(r29) -/* 8025034C C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 80250350 C0 41 00 20 */ lfs f2, 0x20(r1) -/* 80250354 38 A0 00 01 */ li r5, 1 -/* 80250358 4B F4 4D 9D */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb -/* 8025035C 80 7D 00 20 */ lwz r3, 0x20(r29) -/* 80250360 C0 22 B3 C0 */ lfs f1, lit_3820(r2) -/* 80250364 4B F4 4F 3D */ bl setAlphaRate__16dSelect_cursor_cFf -/* 80250368 39 61 00 40 */ addi r11, r1, 0x40 -/* 8025036C 48 11 1E BD */ bl _restgpr_29 -/* 80250370 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80250374 7C 08 03 A6 */ mtlr r0 -/* 80250378 38 21 00 40 */ addi r1, r1, 0x40 -/* 8025037C 4E 80 00 20 */ blr diff --git a/asm/d/d_name/menuCursorPosSet__7dName_cFv.s b/asm/d/d_name/menuCursorPosSet__7dName_cFv.s deleted file mode 100644 index dc080d79768..00000000000 --- a/asm/d/d_name/menuCursorPosSet__7dName_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8024FAF4: -/* 8024FAF4 88 03 02 AF */ lbz r0, 0x2af(r3) -/* 8024FAF8 98 03 02 B0 */ stb r0, 0x2b0(r3) -/* 8024FAFC 38 00 00 03 */ li r0, 3 -/* 8024FB00 98 03 02 AF */ stb r0, 0x2af(r3) -/* 8024FB04 4E 80 00 20 */ blr diff --git a/asm/d/d_name/mojiListChange__7dName_cFv.s b/asm/d/d_name/mojiListChange__7dName_cFv.s deleted file mode 100644 index 67baca58c15..00000000000 --- a/asm/d/d_name/mojiListChange__7dName_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_802501B0: -/* 802501B0 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 802501B4 7C 08 02 A6 */ mflr r0 -/* 802501B8 90 01 00 74 */ stw r0, 0x74(r1) -/* 802501BC 39 61 00 70 */ addi r11, r1, 0x70 -/* 802501C0 48 11 20 15 */ bl _savegpr_27 -/* 802501C4 7C 7B 1B 78 */ mr r27, r3 -/* 802501C8 3C 60 80 3C */ lis r3, cNullVec__6Z2Calc@ha /* 0x803C1F50@ha */ -/* 802501CC 38 63 1F 50 */ addi r3, r3, cNullVec__6Z2Calc@l /* 0x803C1F50@l */ -/* 802501D0 88 1B 02 A9 */ lbz r0, 0x2a9(r27) -/* 802501D4 2C 00 00 01 */ cmpwi r0, 1 -/* 802501D8 41 82 00 28 */ beq lbl_80250200 -/* 802501DC 40 80 00 10 */ bge lbl_802501EC -/* 802501E0 2C 00 00 00 */ cmpwi r0, 0 -/* 802501E4 40 80 00 14 */ bge lbl_802501F8 -/* 802501E8 48 00 00 24 */ b lbl_8025020C -lbl_802501EC: -/* 802501EC 2C 00 00 03 */ cmpwi r0, 3 -/* 802501F0 40 80 00 1C */ bge lbl_8025020C -/* 802501F4 48 00 00 14 */ b lbl_80250208 -lbl_802501F8: -/* 802501F8 3B A3 00 0C */ addi r29, r3, 0xc -/* 802501FC 48 00 00 10 */ b lbl_8025020C -lbl_80250200: -/* 80250200 3B A3 03 18 */ addi r29, r3, 0x318 -/* 80250204 48 00 00 08 */ b lbl_8025020C -lbl_80250208: -/* 80250208 3B A3 06 24 */ addi r29, r3, 0x624 -lbl_8025020C: -/* 8025020C 3B 80 00 00 */ li r28, 0 -/* 80250210 3B E0 00 00 */ li r31, 0 -/* 80250214 3C 60 80 3A */ lis r3, d_d_name__stringBase0@ha /* 0x80399CC8@ha */ -/* 80250218 3B C3 9C C8 */ addi r30, r3, d_d_name__stringBase0@l /* 0x80399CC8@l */ -lbl_8025021C: -/* 8025021C 38 61 00 08 */ addi r3, r1, 8 -/* 80250220 38 9E 02 A4 */ addi r4, r30, 0x2a4 -/* 80250224 48 11 89 09 */ bl strcpy -/* 80250228 38 61 00 08 */ addi r3, r1, 8 -/* 8025022C 7C 9D F8 2E */ lwzx r4, r29, r31 -/* 80250230 48 11 88 8D */ bl strcat -/* 80250234 38 61 00 08 */ addi r3, r1, 8 -/* 80250238 38 9E 02 BC */ addi r4, r30, 0x2bc -/* 8025023C 48 11 88 81 */ bl strcat -/* 80250240 38 61 00 08 */ addi r3, r1, 8 -/* 80250244 7C 9D F8 2E */ lwzx r4, r29, r31 -/* 80250248 48 11 88 75 */ bl strcat -/* 8025024C 38 1F 01 78 */ addi r0, r31, 0x178 -/* 80250250 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 80250254 38 81 00 08 */ addi r4, r1, 8 -/* 80250258 48 11 88 D5 */ bl strcpy -/* 8025025C 3B 9C 00 01 */ addi r28, r28, 1 -/* 80250260 2C 1C 00 41 */ cmpwi r28, 0x41 -/* 80250264 3B FF 00 04 */ addi r31, r31, 4 -/* 80250268 41 80 FF B4 */ blt lbl_8025021C -/* 8025026C 39 61 00 70 */ addi r11, r1, 0x70 -/* 80250270 48 11 1F B1 */ bl _restgpr_27 -/* 80250274 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80250278 7C 08 03 A6 */ mtlr r0 -/* 8025027C 38 21 00 70 */ addi r1, r1, 0x70 -/* 80250280 4E 80 00 20 */ blr diff --git a/asm/d/d_name/nameCheck__7dName_cFv.s b/asm/d/d_name/nameCheck__7dName_cFv.s deleted file mode 100644 index 1597968cccd..00000000000 --- a/asm/d/d_name/nameCheck__7dName_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8024EC10: -/* 8024EC10 38 A0 00 07 */ li r5, 7 -/* 8024EC14 38 80 00 38 */ li r4, 0x38 -/* 8024EC18 38 00 00 08 */ li r0, 8 -/* 8024EC1C 7C 09 03 A6 */ mtctr r0 -lbl_8024EC20: -/* 8024EC20 38 04 02 D0 */ addi r0, r4, 0x2d0 -/* 8024EC24 7C 03 00 2E */ lwzx r0, r3, r0 -/* 8024EC28 2C 00 00 20 */ cmpwi r0, 0x20 -/* 8024EC2C 41 82 00 0C */ beq lbl_8024EC38 -/* 8024EC30 38 65 00 01 */ addi r3, r5, 1 -/* 8024EC34 4E 80 00 20 */ blr -lbl_8024EC38: -/* 8024EC38 38 A5 FF FF */ addi r5, r5, -1 -/* 8024EC3C 38 84 FF F8 */ addi r4, r4, -8 -/* 8024EC40 42 00 FF E0 */ bdnz lbl_8024EC20 -/* 8024EC44 38 60 00 00 */ li r3, 0 -/* 8024EC48 4E 80 00 20 */ blr diff --git a/asm/d/d_name/nameCursorMove__7dName_cFv.s b/asm/d/d_name/nameCursorMove__7dName_cFv.s deleted file mode 100644 index 9ef2be4d168..00000000000 --- a/asm/d/d_name/nameCursorMove__7dName_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8024F914: -/* 8024F914 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024F918 7C 08 02 A6 */ mflr r0 -/* 8024F91C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024F920 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024F924 93 C1 00 08 */ stw r30, 8(r1) -/* 8024F928 7C 7E 1B 78 */ mr r30, r3 -/* 8024F92C 88 03 02 B1 */ lbz r0, 0x2b1(r3) -/* 8024F930 28 00 00 08 */ cmplwi r0, 8 -/* 8024F934 41 81 00 48 */ bgt lbl_8024F97C -/* 8024F938 7C 1F 03 78 */ mr r31, r0 -/* 8024F93C 28 00 00 07 */ cmplwi r0, 7 -/* 8024F940 40 81 00 08 */ ble lbl_8024F948 -/* 8024F944 3B E0 00 07 */ li r31, 7 -lbl_8024F948: -/* 8024F948 88 1E 02 B2 */ lbz r0, 0x2b2(r30) -/* 8024F94C 28 00 00 FF */ cmplwi r0, 0xff -/* 8024F950 41 82 00 1C */ beq lbl_8024F96C -/* 8024F954 28 00 00 08 */ cmplwi r0, 8 -/* 8024F958 40 80 00 14 */ bge lbl_8024F96C -/* 8024F95C 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d -/* 8024F960 7C 7E 02 14 */ add r3, r30, r0 -/* 8024F964 80 63 00 34 */ lwz r3, 0x34(r3) -/* 8024F968 48 00 5C A1 */ bl hide__13CPaneMgrAlphaFv -lbl_8024F96C: -/* 8024F96C 57 E0 15 BA */ rlwinm r0, r31, 2, 0x16, 0x1d -/* 8024F970 7C 7E 02 14 */ add r3, r30, r0 -/* 8024F974 80 63 00 34 */ lwz r3, 0x34(r3) -/* 8024F978 48 00 5C 51 */ bl show__13CPaneMgrAlphaFv -lbl_8024F97C: -/* 8024F97C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024F980 83 C1 00 08 */ lwz r30, 8(r1) -/* 8024F984 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024F988 7C 08 03 A6 */ mtlr r0 -/* 8024F98C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024F990 4E 80 00 20 */ blr diff --git a/asm/d/d_name/playNameSet__7dName_cFi.s b/asm/d/d_name/playNameSet__7dName_cFi.s deleted file mode 100644 index 338dc3c4457..00000000000 --- a/asm/d/d_name/playNameSet__7dName_cFi.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8024EC4C: -/* 8024EC4C 38 C3 02 B5 */ addi r6, r3, 0x2b5 -/* 8024EC50 38 A0 00 00 */ li r5, 0 -/* 8024EC54 7C 89 03 A6 */ mtctr r4 -/* 8024EC58 2C 04 00 00 */ cmpwi r4, 0 -/* 8024EC5C 40 81 00 1C */ ble lbl_8024EC78 -lbl_8024EC60: -/* 8024EC60 38 05 02 D0 */ addi r0, r5, 0x2d0 -/* 8024EC64 7C 03 00 2E */ lwzx r0, r3, r0 -/* 8024EC68 98 06 00 00 */ stb r0, 0(r6) -/* 8024EC6C 38 C6 00 01 */ addi r6, r6, 1 -/* 8024EC70 38 A5 00 08 */ addi r5, r5, 8 -/* 8024EC74 42 00 FF EC */ bdnz lbl_8024EC60 -lbl_8024EC78: -/* 8024EC78 38 00 00 00 */ li r0, 0 -/* 8024EC7C 98 06 00 00 */ stb r0, 0(r6) -/* 8024EC80 4E 80 00 20 */ blr diff --git a/asm/d/d_name/selectCursorMove__7dName_cFv.s b/asm/d/d_name/selectCursorMove__7dName_cFv.s deleted file mode 100644 index d99cc4807fc..00000000000 --- a/asm/d/d_name/selectCursorMove__7dName_cFv.s +++ /dev/null @@ -1,89 +0,0 @@ -lbl_8024F994: -/* 8024F994 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8024F998 7C 08 02 A6 */ mflr r0 -/* 8024F99C 90 01 00 34 */ stw r0, 0x34(r1) -/* 8024F9A0 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 8024F9A4 7C 7F 1B 78 */ mr r31, r3 -/* 8024F9A8 88 03 02 A5 */ lbz r0, 0x2a5(r3) -/* 8024F9AC 98 03 03 18 */ stb r0, 0x318(r3) -/* 8024F9B0 88 03 02 A7 */ lbz r0, 0x2a7(r3) -/* 8024F9B4 98 03 03 19 */ stb r0, 0x319(r3) -/* 8024F9B8 38 00 00 01 */ li r0, 1 -/* 8024F9BC 98 03 03 1A */ stb r0, 0x31a(r3) -/* 8024F9C0 3C 60 80 43 */ lis r3, g_nmHIO@ha /* 0x80430734@ha */ -/* 8024F9C4 38 63 07 34 */ addi r3, r3, g_nmHIO@l /* 0x80430734@l */ -/* 8024F9C8 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8024F9CC 88 7F 02 A7 */ lbz r3, 0x2a7(r31) -/* 8024F9D0 88 1F 02 A5 */ lbz r0, 0x2a5(r31) -/* 8024F9D4 1C 00 00 05 */ mulli r0, r0, 5 -/* 8024F9D8 7C 03 02 14 */ add r0, r3, r0 -/* 8024F9DC 54 00 10 3A */ slwi r0, r0, 2 -/* 8024F9E0 7C 7F 02 14 */ add r3, r31, r0 -/* 8024F9E4 80 63 00 74 */ lwz r3, 0x74(r3) -/* 8024F9E8 80 63 00 04 */ lwz r3, 4(r3) -/* 8024F9EC D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8024F9F0 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 8024F9F4 81 83 00 00 */ lwz r12, 0(r3) -/* 8024F9F8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8024F9FC 7D 89 03 A6 */ mtctr r12 -/* 8024FA00 4E 80 04 21 */ bctrl -/* 8024FA04 38 00 00 C8 */ li r0, 0xc8 -/* 8024FA08 98 01 00 08 */ stb r0, 8(r1) -/* 8024FA0C 98 01 00 09 */ stb r0, 9(r1) -/* 8024FA10 98 01 00 0A */ stb r0, 0xa(r1) -/* 8024FA14 38 00 00 FF */ li r0, 0xff -/* 8024FA18 98 01 00 0B */ stb r0, 0xb(r1) -/* 8024FA1C 80 01 00 08 */ lwz r0, 8(r1) -/* 8024FA20 90 01 00 0C */ stw r0, 0xc(r1) -/* 8024FA24 88 7F 02 A7 */ lbz r3, 0x2a7(r31) -/* 8024FA28 88 1F 02 A5 */ lbz r0, 0x2a5(r31) -/* 8024FA2C 1C 00 00 05 */ mulli r0, r0, 5 -/* 8024FA30 7C 03 02 14 */ add r0, r3, r0 -/* 8024FA34 54 00 10 3A */ slwi r0, r0, 2 -/* 8024FA38 7C 7F 02 14 */ add r3, r31, r0 -/* 8024FA3C 80 63 00 74 */ lwz r3, 0x74(r3) -/* 8024FA40 80 63 00 04 */ lwz r3, 4(r3) -/* 8024FA44 38 81 00 0C */ addi r4, r1, 0xc -/* 8024FA48 81 83 00 00 */ lwz r12, 0(r3) -/* 8024FA4C 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 8024FA50 7D 89 03 A6 */ mtctr r12 -/* 8024FA54 4E 80 04 21 */ bctrl -/* 8024FA58 88 7F 02 A7 */ lbz r3, 0x2a7(r31) -/* 8024FA5C 88 1F 02 A5 */ lbz r0, 0x2a5(r31) -/* 8024FA60 1C 00 00 05 */ mulli r0, r0, 5 -/* 8024FA64 7C 03 02 14 */ add r0, r3, r0 -/* 8024FA68 54 00 10 3A */ slwi r0, r0, 2 -/* 8024FA6C 7C 7F 02 14 */ add r3, r31, r0 -/* 8024FA70 80 83 00 74 */ lwz r4, 0x74(r3) -/* 8024FA74 38 61 00 10 */ addi r3, r1, 0x10 -/* 8024FA78 80 A4 00 04 */ lwz r5, 4(r4) -/* 8024FA7C 38 C0 00 00 */ li r6, 0 -/* 8024FA80 38 E0 00 00 */ li r7, 0 -/* 8024FA84 48 00 54 39 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs -/* 8024FA88 80 61 00 10 */ lwz r3, 0x10(r1) -/* 8024FA8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024FA90 90 61 00 1C */ stw r3, 0x1c(r1) -/* 8024FA94 90 01 00 20 */ stw r0, 0x20(r1) -/* 8024FA98 80 01 00 18 */ lwz r0, 0x18(r1) -/* 8024FA9C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8024FAA0 88 7F 02 A7 */ lbz r3, 0x2a7(r31) -/* 8024FAA4 88 1F 02 A5 */ lbz r0, 0x2a5(r31) -/* 8024FAA8 1C 00 00 05 */ mulli r0, r0, 5 -/* 8024FAAC 7C 03 02 14 */ add r0, r3, r0 -/* 8024FAB0 54 00 10 3A */ slwi r0, r0, 2 -/* 8024FAB4 7C 7F 02 14 */ add r3, r31, r0 -/* 8024FAB8 80 63 00 74 */ lwz r3, 0x74(r3) -/* 8024FABC 80 83 00 04 */ lwz r4, 4(r3) -/* 8024FAC0 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 8024FAC4 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 8024FAC8 C0 41 00 20 */ lfs f2, 0x20(r1) -/* 8024FACC 38 A0 00 01 */ li r5, 1 -/* 8024FAD0 4B F4 56 25 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb -/* 8024FAD4 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 8024FAD8 C0 22 B3 C0 */ lfs f1, lit_3820(r2) -/* 8024FADC 4B F4 57 C5 */ bl setAlphaRate__16dSelect_cursor_cFf -/* 8024FAE0 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 8024FAE4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8024FAE8 7C 08 03 A6 */ mtlr r0 -/* 8024FAEC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8024FAF0 4E 80 00 20 */ blr diff --git a/asm/d/d_name/selectCursorPosSet__7dName_cFi.s b/asm/d/d_name/selectCursorPosSet__7dName_cFi.s deleted file mode 100644 index 141670d3199..00000000000 --- a/asm/d/d_name/selectCursorPosSet__7dName_cFi.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_802504A0: -/* 802504A0 88 C3 02 AF */ lbz r6, 0x2af(r3) -/* 802504A4 54 C0 15 BA */ rlwinm r0, r6, 2, 0x16, 0x1d -/* 802504A8 7C A3 02 14 */ add r5, r3, r0 -/* 802504AC 88 05 03 0E */ lbz r0, 0x30e(r5) -/* 802504B0 28 00 00 01 */ cmplwi r0, 1 -/* 802504B4 40 82 00 14 */ bne lbl_802504C8 -/* 802504B8 88 05 03 0C */ lbz r0, 0x30c(r5) -/* 802504BC 98 03 02 A5 */ stb r0, 0x2a5(r3) -/* 802504C0 98 83 02 A7 */ stb r4, 0x2a7(r3) -/* 802504C4 4E 80 00 20 */ blr -lbl_802504C8: -/* 802504C8 2C 06 00 02 */ cmpwi r6, 2 -/* 802504CC 41 82 00 3C */ beq lbl_80250508 -/* 802504D0 40 80 00 14 */ bge lbl_802504E4 -/* 802504D4 2C 06 00 00 */ cmpwi r6, 0 -/* 802504D8 41 82 00 18 */ beq lbl_802504F0 -/* 802504DC 40 80 00 20 */ bge lbl_802504FC -/* 802504E0 48 00 00 3C */ b lbl_8025051C -lbl_802504E4: -/* 802504E4 2C 06 00 04 */ cmpwi r6, 4 -/* 802504E8 40 80 00 34 */ bge lbl_8025051C -/* 802504EC 48 00 00 28 */ b lbl_80250514 -lbl_802504F0: -/* 802504F0 38 00 00 00 */ li r0, 0 -/* 802504F4 98 03 02 A5 */ stb r0, 0x2a5(r3) -/* 802504F8 48 00 00 24 */ b lbl_8025051C -lbl_802504FC: -/* 802504FC 38 00 00 03 */ li r0, 3 -/* 80250500 98 03 02 A5 */ stb r0, 0x2a5(r3) -/* 80250504 48 00 00 18 */ b lbl_8025051C -lbl_80250508: -/* 80250508 38 00 00 06 */ li r0, 6 -/* 8025050C 98 03 02 A5 */ stb r0, 0x2a5(r3) -/* 80250510 48 00 00 0C */ b lbl_8025051C -lbl_80250514: -/* 80250514 38 00 00 08 */ li r0, 8 -/* 80250518 98 03 02 A5 */ stb r0, 0x2a5(r3) -lbl_8025051C: -/* 8025051C 98 83 02 A7 */ stb r4, 0x2a7(r3) -/* 80250520 88 A3 02 A5 */ lbz r5, 0x2a5(r3) -/* 80250524 88 03 02 AF */ lbz r0, 0x2af(r3) -/* 80250528 54 00 10 3A */ slwi r0, r0, 2 -/* 8025052C 7C 83 02 14 */ add r4, r3, r0 -/* 80250530 98 A4 03 0C */ stb r5, 0x30c(r4) -/* 80250534 88 A3 02 A7 */ lbz r5, 0x2a7(r3) -/* 80250538 88 03 02 AF */ lbz r0, 0x2af(r3) -/* 8025053C 54 00 10 3A */ slwi r0, r0, 2 -/* 80250540 7C 83 02 14 */ add r4, r3, r0 -/* 80250544 98 A4 03 0D */ stb r5, 0x30d(r4) -/* 80250548 38 80 00 01 */ li r4, 1 -/* 8025054C 88 03 02 AF */ lbz r0, 0x2af(r3) -/* 80250550 54 00 10 3A */ slwi r0, r0, 2 -/* 80250554 7C 63 02 14 */ add r3, r3, r0 -/* 80250558 98 83 03 0E */ stb r4, 0x30e(r3) -/* 8025055C 4E 80 00 20 */ blr diff --git a/asm/d/d_name/selectMojiSet__7dName_cFv.s b/asm/d/d_name/selectMojiSet__7dName_cFv.s deleted file mode 100644 index c656771f3a2..00000000000 --- a/asm/d/d_name/selectMojiSet__7dName_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8024F55C: -/* 8024F55C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024F560 7C 08 02 A6 */ mflr r0 -/* 8024F564 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024F568 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024F56C 7C 7F 1B 78 */ mr r31, r3 -/* 8024F570 48 00 00 2D */ bl getMoji__7dName_cFv -/* 8024F574 7C 64 1B 78 */ mr r4, r3 -/* 8024F578 7F E3 FB 78 */ mr r3, r31 -/* 8024F57C 48 00 00 B9 */ bl setMoji__7dName_cFi -/* 8024F580 7F E3 FB 78 */ mr r3, r31 -/* 8024F584 48 00 03 09 */ bl setNameText__7dName_cFv -/* 8024F588 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024F58C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024F590 7C 08 03 A6 */ mtlr r0 -/* 8024F594 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024F598 4E 80 00 20 */ blr diff --git a/asm/d/d_name/setNameText__7dName_cFv.s b/asm/d/d_name/setNameText__7dName_cFv.s deleted file mode 100644 index e28df9f25a5..00000000000 --- a/asm/d/d_name/setNameText__7dName_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8024F88C: -/* 8024F88C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8024F890 7C 08 02 A6 */ mflr r0 -/* 8024F894 90 01 00 24 */ stw r0, 0x24(r1) -/* 8024F898 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024F89C 48 11 29 39 */ bl _savegpr_27 -/* 8024F8A0 7C 7B 1B 78 */ mr r27, r3 -/* 8024F8A4 3B 80 00 00 */ li r28, 0 -/* 8024F8A8 3B E0 00 00 */ li r31, 0 -/* 8024F8AC 3B C0 00 00 */ li r30, 0 -/* 8024F8B0 3C 60 80 3A */ lis r3, d_d_name__stringBase0@ha /* 0x80399CC8@ha */ -/* 8024F8B4 3B A3 9C C8 */ addi r29, r3, d_d_name__stringBase0@l /* 0x80399CC8@l */ -lbl_8024F8B8: -/* 8024F8B8 7C 7B F2 14 */ add r3, r27, r30 -/* 8024F8BC 88 03 02 CF */ lbz r0, 0x2cf(r3) -/* 8024F8C0 28 00 00 00 */ cmplwi r0, 0 -/* 8024F8C4 41 82 00 24 */ beq lbl_8024F8E8 -/* 8024F8C8 80 03 02 D0 */ lwz r0, 0x2d0(r3) -/* 8024F8CC 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8024F8D0 38 1F 00 54 */ addi r0, r31, 0x54 -/* 8024F8D4 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 8024F8D8 38 9D 02 74 */ addi r4, r29, 0x274 -/* 8024F8DC 7C A6 2B 78 */ mr r6, r5 -/* 8024F8E0 4C C6 31 82 */ crclr 6 -/* 8024F8E4 48 11 6B F9 */ bl sprintf -lbl_8024F8E8: -/* 8024F8E8 3B 9C 00 01 */ addi r28, r28, 1 -/* 8024F8EC 2C 1C 00 08 */ cmpwi r28, 8 -/* 8024F8F0 3B FF 00 04 */ addi r31, r31, 4 -/* 8024F8F4 3B DE 00 08 */ addi r30, r30, 8 -/* 8024F8F8 41 80 FF C0 */ blt lbl_8024F8B8 -/* 8024F8FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024F900 48 11 29 21 */ bl _restgpr_27 -/* 8024F904 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8024F908 7C 08 03 A6 */ mtlr r0 -/* 8024F90C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024F910 4E 80 00 20 */ blr diff --git a/asm/d/d_name/showIcon__7dName_cFv.s b/asm/d/d_name/showIcon__7dName_cFv.s deleted file mode 100644 index 37c668db135..00000000000 --- a/asm/d/d_name/showIcon__7dName_cFv.s +++ /dev/null @@ -1,113 +0,0 @@ -lbl_8024E7EC: -/* 8024E7EC 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8024E7F0 7C 08 02 A6 */ mflr r0 -/* 8024E7F4 90 01 00 44 */ stw r0, 0x44(r1) -/* 8024E7F8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8024E7FC 48 11 39 E1 */ bl _savegpr_29 -/* 8024E800 7C 7F 1B 78 */ mr r31, r3 -/* 8024E804 88 03 02 AB */ lbz r0, 0x2ab(r3) -/* 8024E808 2C 00 00 04 */ cmpwi r0, 4 -/* 8024E80C 41 82 00 EC */ beq lbl_8024E8F8 -/* 8024E810 40 80 01 78 */ bge lbl_8024E988 -/* 8024E814 2C 00 00 00 */ cmpwi r0, 0 -/* 8024E818 41 82 00 08 */ beq lbl_8024E820 -/* 8024E81C 48 00 01 6C */ b lbl_8024E988 -lbl_8024E820: -/* 8024E820 88 1F 02 A5 */ lbz r0, 0x2a5(r31) -/* 8024E824 28 00 00 FF */ cmplwi r0, 0xff -/* 8024E828 41 82 01 60 */ beq lbl_8024E988 -/* 8024E82C 88 7F 02 A7 */ lbz r3, 0x2a7(r31) -/* 8024E830 28 03 00 FF */ cmplwi r3, 0xff -/* 8024E834 41 82 01 54 */ beq lbl_8024E988 -/* 8024E838 1C 00 00 05 */ mulli r0, r0, 5 -/* 8024E83C 7C 03 02 14 */ add r0, r3, r0 -/* 8024E840 54 00 10 3A */ slwi r0, r0, 2 -/* 8024E844 7C 7F 02 14 */ add r3, r31, r0 -/* 8024E848 80 83 00 74 */ lwz r4, 0x74(r3) -/* 8024E84C 38 61 00 24 */ addi r3, r1, 0x24 -/* 8024E850 80 A4 00 04 */ lwz r5, 4(r4) -/* 8024E854 38 C0 00 00 */ li r6, 0 -/* 8024E858 38 E0 00 00 */ li r7, 0 -/* 8024E85C 48 00 66 61 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs -/* 8024E860 C0 41 00 28 */ lfs f2, 0x28(r1) -/* 8024E864 88 7F 02 A7 */ lbz r3, 0x2a7(r31) -/* 8024E868 88 1F 02 A5 */ lbz r0, 0x2a5(r31) -/* 8024E86C 1C 00 00 05 */ mulli r0, r0, 5 -/* 8024E870 7C 03 02 14 */ add r0, r3, r0 -/* 8024E874 54 00 10 3A */ slwi r0, r0, 2 -/* 8024E878 7C 7F 02 14 */ add r3, r31, r0 -/* 8024E87C 80 63 00 74 */ lwz r3, 0x74(r3) -/* 8024E880 80 83 00 04 */ lwz r4, 4(r3) -/* 8024E884 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 8024E888 C0 21 00 24 */ lfs f1, 0x24(r1) -/* 8024E88C 38 A0 00 01 */ li r5, 1 -/* 8024E890 4B F4 68 65 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb -/* 8024E894 38 00 00 C8 */ li r0, 0xc8 -/* 8024E898 98 01 00 10 */ stb r0, 0x10(r1) -/* 8024E89C 98 01 00 11 */ stb r0, 0x11(r1) -/* 8024E8A0 98 01 00 12 */ stb r0, 0x12(r1) -/* 8024E8A4 38 00 00 FF */ li r0, 0xff -/* 8024E8A8 98 01 00 13 */ stb r0, 0x13(r1) -/* 8024E8AC 80 01 00 10 */ lwz r0, 0x10(r1) -/* 8024E8B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024E8B4 88 7F 02 A7 */ lbz r3, 0x2a7(r31) -/* 8024E8B8 88 1F 02 A5 */ lbz r0, 0x2a5(r31) -/* 8024E8BC 1C 00 00 05 */ mulli r0, r0, 5 -/* 8024E8C0 7C 03 02 14 */ add r0, r3, r0 -/* 8024E8C4 54 00 10 3A */ slwi r0, r0, 2 -/* 8024E8C8 7C 7F 02 14 */ add r3, r31, r0 -/* 8024E8CC 80 63 00 74 */ lwz r3, 0x74(r3) -/* 8024E8D0 80 63 00 04 */ lwz r3, 4(r3) -/* 8024E8D4 38 81 00 14 */ addi r4, r1, 0x14 -/* 8024E8D8 81 83 00 00 */ lwz r12, 0(r3) -/* 8024E8DC 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 8024E8E0 7D 89 03 A6 */ mtctr r12 -/* 8024E8E4 4E 80 04 21 */ bctrl -/* 8024E8E8 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 8024E8EC C0 22 B3 C0 */ lfs f1, lit_3820(r2) -/* 8024E8F0 4B F4 69 B1 */ bl setAlphaRate__16dSelect_cursor_cFf -/* 8024E8F4 48 00 00 94 */ b lbl_8024E988 -lbl_8024E8F8: -/* 8024E8F8 88 9F 02 AF */ lbz r4, 0x2af(r31) -/* 8024E8FC 28 04 00 FF */ cmplwi r4, 0xff -/* 8024E900 41 82 00 88 */ beq lbl_8024E988 -/* 8024E904 48 00 27 45 */ bl getMenuPosIdx__7dName_cFUc -/* 8024E908 54 7D 10 3A */ slwi r29, r3, 2 -/* 8024E90C 7F DF EA 14 */ add r30, r31, r29 -/* 8024E910 80 9E 02 84 */ lwz r4, 0x284(r30) -/* 8024E914 38 61 00 18 */ addi r3, r1, 0x18 -/* 8024E918 80 A4 00 04 */ lwz r5, 4(r4) -/* 8024E91C 38 C0 00 00 */ li r6, 0 -/* 8024E920 38 E0 00 00 */ li r7, 0 -/* 8024E924 48 00 65 99 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs -/* 8024E928 C0 41 00 1C */ lfs f2, 0x1c(r1) -/* 8024E92C 80 7E 02 84 */ lwz r3, 0x284(r30) -/* 8024E930 80 83 00 04 */ lwz r4, 4(r3) -/* 8024E934 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 8024E938 C0 21 00 18 */ lfs f1, 0x18(r1) -/* 8024E93C 38 A0 00 01 */ li r5, 1 -/* 8024E940 4B F4 67 B5 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb -/* 8024E944 38 00 00 C8 */ li r0, 0xc8 -/* 8024E948 98 01 00 08 */ stb r0, 8(r1) -/* 8024E94C 98 01 00 09 */ stb r0, 9(r1) -/* 8024E950 98 01 00 0A */ stb r0, 0xa(r1) -/* 8024E954 38 00 00 FF */ li r0, 0xff -/* 8024E958 98 01 00 0B */ stb r0, 0xb(r1) -/* 8024E95C 80 01 00 08 */ lwz r0, 8(r1) -/* 8024E960 90 01 00 0C */ stw r0, 0xc(r1) -/* 8024E964 80 7E 02 94 */ lwz r3, 0x294(r30) -/* 8024E968 38 81 00 0C */ addi r4, r1, 0xc -/* 8024E96C 81 83 00 00 */ lwz r12, 0(r3) -/* 8024E970 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 8024E974 7D 89 03 A6 */ mtctr r12 -/* 8024E978 4E 80 04 21 */ bctrl -/* 8024E97C 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 8024E980 C0 22 B3 C0 */ lfs f1, lit_3820(r2) -/* 8024E984 4B F4 69 1D */ bl setAlphaRate__16dSelect_cursor_cFf -lbl_8024E988: -/* 8024E988 39 61 00 40 */ addi r11, r1, 0x40 -/* 8024E98C 48 11 38 9D */ bl _restgpr_29 -/* 8024E990 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8024E994 7C 08 03 A6 */ mtlr r0 -/* 8024E998 38 21 00 40 */ addi r1, r1, 0x40 -/* 8024E99C 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/FileSelectMain__10dScnName_cFv.s b/asm/d/s/d_s_name/FileSelectMain__10dScnName_cFv.s deleted file mode 100644 index 668899bc606..00000000000 --- a/asm/d/s/d_s_name/FileSelectMain__10dScnName_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80258E34: -/* 80258E34 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80258E38 7C 08 02 A6 */ mflr r0 -/* 80258E3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80258E40 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80258E44 7C 7F 1B 78 */ mr r31, r3 -/* 80258E48 80 63 04 14 */ lwz r3, 0x414(r3) -/* 80258E4C 4B F2 B6 B1 */ bl _move__14dFile_select_cFv -/* 80258E50 A8 1F 00 08 */ lha r0, 8(r31) -/* 80258E54 2C 00 00 0D */ cmpwi r0, 0xd -/* 80258E58 40 82 00 0C */ bne lbl_80258E64 -/* 80258E5C 7F E3 FB 78 */ mr r3, r31 -/* 80258E60 48 00 00 19 */ bl FileSelectMainNormal__10dScnName_cFv -lbl_80258E64: -/* 80258E64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80258E68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80258E6C 7C 08 03 A6 */ mtlr r0 -/* 80258E70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80258E74 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/FileSelectOpen__10dScnName_cFv.s b/asm/d/s/d_s_name/FileSelectOpen__10dScnName_cFv.s deleted file mode 100644 index 23c0698c6ae..00000000000 --- a/asm/d/s/d_s_name/FileSelectOpen__10dScnName_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80258DD0: -/* 80258DD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80258DD4 7C 08 02 A6 */ mflr r0 -/* 80258DD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80258DDC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80258DE0 7C 7F 1B 78 */ mr r31, r3 -/* 80258DE4 88 63 04 1E */ lbz r3, 0x41e(r3) -/* 80258DE8 28 03 00 00 */ cmplwi r3, 0 -/* 80258DEC 41 82 00 10 */ beq lbl_80258DFC -/* 80258DF0 38 03 FF FF */ addi r0, r3, -1 -/* 80258DF4 98 1F 04 1E */ stb r0, 0x41e(r31) -/* 80258DF8 48 00 00 28 */ b lbl_80258E20 -lbl_80258DFC: -/* 80258DFC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80258E00 38 63 03 D0 */ addi r3, r3, 0x3d0 -/* 80258E04 3C 80 02 00 */ lis r4, 0x200 -/* 80258E08 48 05 6D 8D */ bl bgmStreamPrepare__8Z2SeqMgrFUl -/* 80258E0C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80258E10 38 63 03 D0 */ addi r3, r3, 0x3d0 -/* 80258E14 48 05 70 05 */ bl bgmStreamPlay__8Z2SeqMgrFv -/* 80258E18 38 00 00 01 */ li r0, 1 -/* 80258E1C 98 1F 04 1D */ stb r0, 0x41d(r31) -lbl_80258E20: -/* 80258E20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80258E24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80258E28 7C 08 03 A6 */ mtlr r0 -/* 80258E2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80258E30 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/__ct__9dSn_HIO_cFv.s b/asm/d/s/d_s_name/__ct__9dSn_HIO_cFv.s deleted file mode 100644 index 8246c66b431..00000000000 --- a/asm/d/s/d_s_name/__ct__9dSn_HIO_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_8025878C: -/* 8025878C 3C 80 80 3C */ lis r4, __vt__9dSn_HIO_c@ha /* 0x803C314C@ha */ -/* 80258790 38 04 31 4C */ addi r0, r4, __vt__9dSn_HIO_c@l /* 0x803C314C@l */ -/* 80258794 90 03 00 00 */ stw r0, 0(r3) -/* 80258798 38 00 00 0F */ li r0, 0xf -/* 8025879C 98 03 00 05 */ stb r0, 5(r3) -/* 802587A0 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/__dt__10dScnName_cFv.s b/asm/d/s/d_s_name/__dt__10dScnName_cFv.s deleted file mode 100644 index b5ef72ebbf2..00000000000 --- a/asm/d/s/d_s_name/__dt__10dScnName_cFv.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_80258CC8: -/* 80258CC8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80258CCC 7C 08 02 A6 */ mflr r0 -/* 80258CD0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80258CD4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80258CD8 48 10 95 01 */ bl _savegpr_28 -/* 80258CDC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80258CE0 7C 9C 23 78 */ mr r28, r4 -/* 80258CE4 41 82 00 D0 */ beq lbl_80258DB4 -/* 80258CE8 80 7F 04 14 */ lwz r3, 0x414(r31) -/* 80258CEC 28 03 00 00 */ cmplwi r3, 0 -/* 80258CF0 41 82 00 18 */ beq lbl_80258D08 -/* 80258CF4 38 80 00 01 */ li r4, 1 -/* 80258CF8 81 83 00 00 */ lwz r12, 0(r3) -/* 80258CFC 81 8C 00 08 */ lwz r12, 8(r12) -/* 80258D00 7D 89 03 A6 */ mtctr r12 -/* 80258D04 4E 80 04 21 */ bctrl -lbl_80258D08: -/* 80258D08 80 7F 04 18 */ lwz r3, 0x418(r31) -/* 80258D0C 28 03 00 00 */ cmplwi r3, 0 -/* 80258D10 41 82 00 18 */ beq lbl_80258D28 -/* 80258D14 38 80 00 01 */ li r4, 1 -/* 80258D18 81 83 00 00 */ lwz r12, 0(r3) -/* 80258D1C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80258D20 7D 89 03 A6 */ mtctr r12 -/* 80258D24 4E 80 04 21 */ bctrl -lbl_80258D28: -/* 80258D28 3C 60 80 3A */ lis r3, d_s_d_s_name__stringBase0@ha /* 0x8039A2A8@ha */ -/* 80258D2C 38 63 A2 A8 */ addi r3, r3, d_s_d_s_name__stringBase0@l /* 0x8039A2A8@l */ -/* 80258D30 38 63 00 0D */ addi r3, r3, 0xd -/* 80258D34 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80258D38 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80258D3C 3C 84 00 02 */ addis r4, r4, 2 -/* 80258D40 38 A0 00 80 */ li r5, 0x80 -/* 80258D44 38 84 C2 F8 */ addi r4, r4, -15624 -/* 80258D48 4B DE 34 4D */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci -/* 80258D4C 80 7F 01 CC */ lwz r3, 0x1cc(r31) -/* 80258D50 48 07 56 F9 */ bl destroy__7JKRHeapFv -/* 80258D54 3B A0 00 00 */ li r29, 0 -/* 80258D58 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80258D5C 3B C3 01 88 */ addi r30, r3, g_meter2_info@l /* 0x80430188@l */ -lbl_80258D60: -/* 80258D60 7F C3 F3 78 */ mr r3, r30 -/* 80258D64 38 1D 00 0B */ addi r0, r29, 0xb -/* 80258D68 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80258D6C 4B FC 4F F1 */ bl changeWater__13dMeter2Info_cFUc -/* 80258D70 3B BD 00 01 */ addi r29, r29, 1 -/* 80258D74 2C 1D 00 04 */ cmpwi r29, 4 -/* 80258D78 41 80 FF E8 */ blt lbl_80258D60 -/* 80258D7C 38 00 00 00 */ li r0, 0 -/* 80258D80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80258D84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80258D88 98 03 5D 44 */ stb r0, 0x5d44(r3) -/* 80258D8C 90 03 61 B0 */ stw r0, 0x61b0(r3) -/* 80258D90 34 1F 01 D4 */ addic. r0, r31, 0x1d4 -/* 80258D94 41 82 00 10 */ beq lbl_80258DA4 -/* 80258D98 3C 60 80 3C */ lis r3, __vt__17dScnName_camera_c@ha /* 0x803C3140@ha */ -/* 80258D9C 38 03 31 40 */ addi r0, r3, __vt__17dScnName_camera_c@l /* 0x803C3140@l */ -/* 80258DA0 90 1F 04 10 */ stw r0, 0x410(r31) -lbl_80258DA4: -/* 80258DA4 7F 80 07 35 */ extsh. r0, r28 -/* 80258DA8 40 81 00 0C */ ble lbl_80258DB4 -/* 80258DAC 7F E3 FB 78 */ mr r3, r31 -/* 80258DB0 48 07 5F 8D */ bl __dl__FPv -lbl_80258DB4: -/* 80258DB4 7F E3 FB 78 */ mr r3, r31 -/* 80258DB8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80258DBC 48 10 94 69 */ bl _restgpr_28 -/* 80258DC0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80258DC4 7C 08 03 A6 */ mtlr r0 -/* 80258DC8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80258DCC 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/__dt__17dScnName_camera_cFv.s b/asm/d/s/d_s_name/__dt__17dScnName_camera_cFv.s deleted file mode 100644 index d3ec1a797b4..00000000000 --- a/asm/d/s/d_s_name/__dt__17dScnName_camera_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80259294: -/* 80259294 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80259298 7C 08 02 A6 */ mflr r0 -/* 8025929C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802592A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802592A4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802592A8 41 82 00 1C */ beq lbl_802592C4 -/* 802592AC 3C A0 80 3C */ lis r5, __vt__17dScnName_camera_c@ha /* 0x803C3140@ha */ -/* 802592B0 38 05 31 40 */ addi r0, r5, __vt__17dScnName_camera_c@l /* 0x803C3140@l */ -/* 802592B4 90 1F 02 3C */ stw r0, 0x23c(r31) -/* 802592B8 7C 80 07 35 */ extsh. r0, r4 -/* 802592BC 40 81 00 08 */ ble lbl_802592C4 -/* 802592C0 48 07 5A 7D */ bl __dl__FPv -lbl_802592C4: -/* 802592C4 7F E3 FB 78 */ mr r3, r31 -/* 802592C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802592CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802592D0 7C 08 03 A6 */ mtlr r0 -/* 802592D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802592D8 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/__dt__9dSn_HIO_cFv.s b/asm/d/s/d_s_name/__dt__9dSn_HIO_cFv.s deleted file mode 100644 index eb3ede1ee67..00000000000 --- a/asm/d/s/d_s_name/__dt__9dSn_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_802592DC: -/* 802592DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802592E0 7C 08 02 A6 */ mflr r0 -/* 802592E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802592E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802592EC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802592F0 41 82 00 1C */ beq lbl_8025930C -/* 802592F4 3C A0 80 3C */ lis r5, __vt__9dSn_HIO_c@ha /* 0x803C314C@ha */ -/* 802592F8 38 05 31 4C */ addi r0, r5, __vt__9dSn_HIO_c@l /* 0x803C314C@l */ -/* 802592FC 90 1F 00 00 */ stw r0, 0(r31) -/* 80259300 7C 80 07 35 */ extsh. r0, r4 -/* 80259304 40 81 00 08 */ ble lbl_8025930C -/* 80259308 48 07 5A 35 */ bl __dl__FPv -lbl_8025930C: -/* 8025930C 7F E3 FB 78 */ mr r3, r31 -/* 80259310 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80259314 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80259318 7C 08 03 A6 */ mtlr r0 -/* 8025931C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80259320 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/__sinit_d_s_name_cpp.s b/asm/d/s/d_s_name/__sinit_d_s_name_cpp.s deleted file mode 100644 index b51c4922bfe..00000000000 --- a/asm/d/s/d_s_name/__sinit_d_s_name_cpp.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_80259324: -/* 80259324 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80259328 7C 08 02 A6 */ mflr r0 -/* 8025932C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80259330 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80259334 3C 60 80 3C */ lis r3, cNullVec__6Z2Calc@ha /* 0x803C3040@ha */ -/* 80259338 3B E3 30 40 */ addi r31, r3, cNullVec__6Z2Calc@l /* 0x803C3040@l */ -/* 8025933C 38 6D 8B 70 */ la r3, g_snHIO(r13) /* 804510F0-_SDA_BASE_ */ -/* 80259340 4B FF F4 4D */ bl __ct__9dSn_HIO_cFv -/* 80259344 3C 80 80 26 */ lis r4, __dt__9dSn_HIO_cFv@ha /* 0x802592DC@ha */ -/* 80259348 38 84 92 DC */ addi r4, r4, __dt__9dSn_HIO_cFv@l /* 0x802592DC@l */ -/* 8025934C 3C A0 80 43 */ lis r5, lit_3822@ha /* 0x80430768@ha */ -/* 80259350 38 A5 07 68 */ addi r5, r5, lit_3822@l /* 0x80430768@l */ -/* 80259354 48 10 88 D1 */ bl __register_global_object -/* 80259358 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8025935C 80 1F 00 10 */ lwz r0, 0x10(r31) -/* 80259360 90 7F 00 54 */ stw r3, 0x54(r31) -/* 80259364 90 1F 00 58 */ stw r0, 0x58(r31) -/* 80259368 80 1F 00 14 */ lwz r0, 0x14(r31) -/* 8025936C 90 1F 00 5C */ stw r0, 0x5c(r31) -/* 80259370 38 9F 00 54 */ addi r4, r31, 0x54 -/* 80259374 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 80259378 80 1F 00 1C */ lwz r0, 0x1c(r31) -/* 8025937C 90 64 00 0C */ stw r3, 0xc(r4) -/* 80259380 90 04 00 10 */ stw r0, 0x10(r4) -/* 80259384 80 1F 00 20 */ lwz r0, 0x20(r31) -/* 80259388 90 04 00 14 */ stw r0, 0x14(r4) -/* 8025938C 80 7F 00 24 */ lwz r3, 0x24(r31) -/* 80259390 80 1F 00 28 */ lwz r0, 0x28(r31) -/* 80259394 90 64 00 18 */ stw r3, 0x18(r4) -/* 80259398 90 04 00 1C */ stw r0, 0x1c(r4) -/* 8025939C 80 1F 00 2C */ lwz r0, 0x2c(r31) -/* 802593A0 90 04 00 20 */ stw r0, 0x20(r4) -/* 802593A4 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 802593A8 80 1F 00 34 */ lwz r0, 0x34(r31) -/* 802593AC 90 64 00 24 */ stw r3, 0x24(r4) -/* 802593B0 90 04 00 28 */ stw r0, 0x28(r4) -/* 802593B4 80 1F 00 38 */ lwz r0, 0x38(r31) -/* 802593B8 90 04 00 2C */ stw r0, 0x2c(r4) -/* 802593BC 80 7F 00 3C */ lwz r3, 0x3c(r31) -/* 802593C0 80 1F 00 40 */ lwz r0, 0x40(r31) -/* 802593C4 90 64 00 30 */ stw r3, 0x30(r4) -/* 802593C8 90 04 00 34 */ stw r0, 0x34(r4) -/* 802593CC 80 1F 00 44 */ lwz r0, 0x44(r31) -/* 802593D0 90 04 00 38 */ stw r0, 0x38(r4) -/* 802593D4 80 7F 00 48 */ lwz r3, 0x48(r31) -/* 802593D8 80 1F 00 4C */ lwz r0, 0x4c(r31) -/* 802593DC 90 64 00 3C */ stw r3, 0x3c(r4) -/* 802593E0 90 04 00 40 */ stw r0, 0x40(r4) -/* 802593E4 80 1F 00 50 */ lwz r0, 0x50(r31) -/* 802593E8 90 04 00 44 */ stw r0, 0x44(r4) -/* 802593EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802593F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802593F4 7C 08 03 A6 */ mtlr r0 -/* 802593F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802593FC 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/brightCheckOpen__10dScnName_cFv.s b/asm/d/s/d_s_name/brightCheckOpen__10dScnName_cFv.s deleted file mode 100644 index ee34976e83e..00000000000 --- a/asm/d/s/d_s_name/brightCheckOpen__10dScnName_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80258FD4: -/* 80258FD4 80 8D 86 F8 */ lwz r4, mResetData__6mDoRst(r13) -/* 80258FD8 80 04 00 00 */ lwz r0, 0(r4) -/* 80258FDC 2C 00 00 00 */ cmpwi r0, 0 -/* 80258FE0 4C 82 00 20 */ bnelr -/* 80258FE4 88 83 04 1E */ lbz r4, 0x41e(r3) -/* 80258FE8 38 04 FF FF */ addi r0, r4, -1 -/* 80258FEC 98 03 04 1E */ stb r0, 0x41e(r3) -/* 80258FF0 88 03 04 1E */ lbz r0, 0x41e(r3) -/* 80258FF4 28 00 00 00 */ cmplwi r0, 0 -/* 80258FF8 4C 82 00 20 */ bnelr -/* 80258FFC 38 00 00 04 */ li r0, 4 -/* 80259000 98 03 04 1D */ stb r0, 0x41d(r3) -/* 80259004 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/brightCheck__10dScnName_cFv.s b/asm/d/s/d_s_name/brightCheck__10dScnName_cFv.s deleted file mode 100644 index 7cb3138e2e0..00000000000 --- a/asm/d/s/d_s_name/brightCheck__10dScnName_cFv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_80259008: -/* 80259008 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025900C 7C 08 02 A6 */ mflr r0 -/* 80259010 90 01 00 14 */ stw r0, 0x14(r1) -/* 80259014 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80259018 7C 7F 1B 78 */ mr r31, r3 -/* 8025901C 80 63 04 18 */ lwz r3, 0x418(r3) -/* 80259020 4B F3 A4 B1 */ bl _move__14dBrightCheck_cFv -/* 80259024 80 7F 04 18 */ lwz r3, 0x418(r31) -/* 80259028 88 03 00 19 */ lbz r0, 0x19(r3) -/* 8025902C 28 00 00 00 */ cmplwi r0, 0 -/* 80259030 41 82 00 B4 */ beq lbl_802590E4 -/* 80259034 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80259038 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025903C 80 03 01 A8 */ lwz r0, 0x1a8(r3) -/* 80259040 80 83 01 AC */ lwz r4, 0x1ac(r3) -/* 80259044 90 83 0F 34 */ stw r4, 0xf34(r3) -/* 80259048 90 03 0F 30 */ stw r0, 0xf30(r3) -/* 8025904C 48 0E 96 B1 */ bl OSGetTime -/* 80259050 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80259054 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80259058 90 85 0F 2C */ stw r4, 0xf2c(r5) -/* 8025905C 90 65 0F 28 */ stw r3, 0xf28(r5) -/* 80259060 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80259064 38 63 03 D0 */ addi r3, r3, 0x3d0 -/* 80259068 38 80 00 2D */ li r4, 0x2d -/* 8025906C 38 A0 00 00 */ li r5, 0 -/* 80259070 48 05 63 99 */ bl bgmStop__8Z2SeqMgrFUll -/* 80259074 38 00 00 00 */ li r0, 0 -/* 80259078 98 1F 04 1F */ stb r0, 0x41f(r31) -/* 8025907C 38 00 00 05 */ li r0, 5 -/* 80259080 98 1F 04 1D */ stb r0, 0x41d(r31) -/* 80259084 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80259088 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025908C 3B E3 00 CC */ addi r31, r3, 0xcc -/* 80259090 7F E3 FB 78 */ mr r3, r31 -/* 80259094 38 80 00 01 */ li r4, 1 -/* 80259098 4B DD AD FD */ bl offFirstBit__21dSv_player_get_item_cFUc -/* 8025909C 7F E3 FB 78 */ mr r3, r31 -/* 802590A0 38 80 00 02 */ li r4, 2 -/* 802590A4 4B DD AD F1 */ bl offFirstBit__21dSv_player_get_item_cFUc -/* 802590A8 7F E3 FB 78 */ mr r3, r31 -/* 802590AC 38 80 00 03 */ li r4, 3 -/* 802590B0 4B DD AD E5 */ bl offFirstBit__21dSv_player_get_item_cFUc -/* 802590B4 7F E3 FB 78 */ mr r3, r31 -/* 802590B8 38 80 00 04 */ li r4, 4 -/* 802590BC 4B DD AD D9 */ bl offFirstBit__21dSv_player_get_item_cFUc -/* 802590C0 7F E3 FB 78 */ mr r3, r31 -/* 802590C4 38 80 00 05 */ li r4, 5 -/* 802590C8 4B DD AD CD */ bl offFirstBit__21dSv_player_get_item_cFUc -/* 802590CC 7F E3 FB 78 */ mr r3, r31 -/* 802590D0 38 80 00 06 */ li r4, 6 -/* 802590D4 4B DD AD C1 */ bl offFirstBit__21dSv_player_get_item_cFUc -/* 802590D8 7F E3 FB 78 */ mr r3, r31 -/* 802590DC 38 80 00 07 */ li r4, 7 -/* 802590E0 4B DD AD B5 */ bl offFirstBit__21dSv_player_get_item_cFUc -lbl_802590E4: -/* 802590E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802590E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802590EC 7C 08 03 A6 */ mtlr r0 -/* 802590F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802590F4 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/dScnName_Create__FP11scene_class.s b/asm/d/s/d_s_name/dScnName_Create__FP11scene_class.s deleted file mode 100644 index 75886466f3f..00000000000 --- a/asm/d/s/d_s_name/dScnName_Create__FP11scene_class.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80259258: -/* 80259258 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025925C 7C 08 02 A6 */ mflr r0 -/* 80259260 90 01 00 14 */ stw r0, 0x14(r1) -/* 80259264 28 03 00 00 */ cmplwi r3, 0 -/* 80259268 41 82 00 18 */ beq lbl_80259280 -/* 8025926C 3C 80 80 3C */ lis r4, __vt__17dScnName_camera_c@ha /* 0x803C3140@ha */ -/* 80259270 38 04 31 40 */ addi r0, r4, __vt__17dScnName_camera_c@l /* 0x803C3140@l */ -/* 80259274 90 03 04 10 */ stw r0, 0x410(r3) -/* 80259278 38 00 00 54 */ li r0, 0x54 -/* 8025927C 98 03 04 03 */ stb r0, 0x403(r3) -lbl_80259280: -/* 80259280 4B FF F6 21 */ bl create__10dScnName_cFv -/* 80259284 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80259288 7C 08 03 A6 */ mtlr r0 -/* 8025928C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80259290 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/dScnName_Delete__FP10dScnName_c.s b/asm/d/s/d_s_name/dScnName_Delete__FP10dScnName_c.s deleted file mode 100644 index 065aba6c420..00000000000 --- a/asm/d/s/d_s_name/dScnName_Delete__FP10dScnName_c.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80259230: -/* 80259230 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80259234 7C 08 02 A6 */ mflr r0 -/* 80259238 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025923C 38 80 FF FF */ li r4, -1 -/* 80259240 4B FF FA 89 */ bl __dt__10dScnName_cFv -/* 80259244 38 60 00 01 */ li r3, 1 -/* 80259248 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025924C 7C 08 03 A6 */ mtlr r0 -/* 80259250 38 21 00 10 */ addi r1, r1, 0x10 -/* 80259254 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/dScnName_Draw__FP10dScnName_c.s b/asm/d/s/d_s_name/dScnName_Draw__FP10dScnName_c.s deleted file mode 100644 index 503b6ea6e05..00000000000 --- a/asm/d/s/d_s_name/dScnName_Draw__FP10dScnName_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802591C0: -/* 802591C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802591C4 7C 08 02 A6 */ mflr r0 -/* 802591C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802591CC 4B FF FA 91 */ bl draw__10dScnName_cFv -/* 802591D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802591D4 7C 08 03 A6 */ mtlr r0 -/* 802591D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802591DC 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/dScnName_Execute__FP10dScnName_c.s b/asm/d/s/d_s_name/dScnName_Execute__FP10dScnName_c.s deleted file mode 100644 index 2d2c3edb8ff..00000000000 --- a/asm/d/s/d_s_name/dScnName_Execute__FP10dScnName_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802591E0: -/* 802591E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802591E4 7C 08 02 A6 */ mflr r0 -/* 802591E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802591EC 4B FF F9 DD */ bl execute__10dScnName_cFv -/* 802591F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802591F4 7C 08 03 A6 */ mtlr r0 -/* 802591F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802591FC 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/dScnName_IsDelete__FP10dScnName_c.s b/asm/d/s/d_s_name/dScnName_IsDelete__FP10dScnName_c.s deleted file mode 100644 index b7aeb235189..00000000000 --- a/asm/d/s/d_s_name/dScnName_IsDelete__FP10dScnName_c.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80259200: -/* 80259200 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80259204 7C 08 02 A6 */ mflr r0 -/* 80259208 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025920C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80259210 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80259214 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 80259218 4B DF 2E 3D */ bl cleanup__13dPa_control_cFv -/* 8025921C 38 60 00 01 */ li r3, 1 -/* 80259220 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80259224 7C 08 03 A6 */ mtlr r0 -/* 80259228 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025922C 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/draw__10dScnName_cFv.s b/asm/d/s/d_s_name/draw__10dScnName_cFv.s deleted file mode 100644 index d325e720e61..00000000000 --- a/asm/d/s/d_s_name/draw__10dScnName_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80258C5C: -/* 80258C5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80258C60 7C 08 02 A6 */ mflr r0 -/* 80258C64 90 01 00 14 */ stw r0, 0x14(r1) -/* 80258C68 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80258C6C 7C 7F 1B 78 */ mr r31, r3 -/* 80258C70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80258C74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80258C78 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 80258C7C 4B E1 65 ED */ bl Run__12dVibration_cFv -/* 80258C80 88 1F 04 1C */ lbz r0, 0x41c(r31) -/* 80258C84 2C 00 00 01 */ cmpwi r0, 1 -/* 80258C88 41 82 00 20 */ beq lbl_80258CA8 -/* 80258C8C 40 80 00 24 */ bge lbl_80258CB0 -/* 80258C90 2C 00 00 00 */ cmpwi r0, 0 -/* 80258C94 40 80 00 08 */ bge lbl_80258C9C -/* 80258C98 48 00 00 18 */ b lbl_80258CB0 -lbl_80258C9C: -/* 80258C9C 80 7F 04 14 */ lwz r3, 0x414(r31) -/* 80258CA0 4B F3 50 99 */ bl _draw__14dFile_select_cFv -/* 80258CA4 48 00 00 0C */ b lbl_80258CB0 -lbl_80258CA8: -/* 80258CA8 80 7F 04 18 */ lwz r3, 0x418(r31) -/* 80258CAC 4B F3 A8 E9 */ bl _draw__14dBrightCheck_cFv -lbl_80258CB0: -/* 80258CB0 38 60 00 01 */ li r3, 1 -/* 80258CB4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80258CB8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80258CBC 7C 08 03 A6 */ mtlr r0 -/* 80258CC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80258CC4 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/execute__10dScnName_cFv.s b/asm/d/s/d_s_name/execute__10dScnName_cFv.s deleted file mode 100644 index 23b00a1b650..00000000000 --- a/asm/d/s/d_s_name/execute__10dScnName_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80258BC8: -/* 80258BC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80258BCC 7C 08 02 A6 */ mflr r0 -/* 80258BD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80258BD4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80258BD8 7C 7F 1B 78 */ mr r31, r3 -/* 80258BDC 4B DC 59 7D */ bl fopOvlpM_IsPeek__Fv -/* 80258BE0 2C 03 00 00 */ cmpwi r3, 0 -/* 80258BE4 40 82 00 0C */ bne lbl_80258BF0 -/* 80258BE8 7F E3 FB 78 */ mr r3, r31 -/* 80258BEC 4B DD 41 59 */ bl dComIfG_resetToOpening__FP11scene_class -lbl_80258BF0: -/* 80258BF0 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 80258BF4 80 03 00 00 */ lwz r0, 0(r3) -/* 80258BF8 2C 00 00 00 */ cmpwi r0, 0 -/* 80258BFC 41 82 00 28 */ beq lbl_80258C24 -/* 80258C00 88 1F 04 20 */ lbz r0, 0x420(r31) -/* 80258C04 28 00 00 00 */ cmplwi r0, 0 -/* 80258C08 40 82 00 1C */ bne lbl_80258C24 -/* 80258C0C 80 7F 04 14 */ lwz r3, 0x414(r31) -/* 80258C10 88 03 23 74 */ lbz r0, 0x2374(r3) -/* 80258C14 28 00 00 00 */ cmplwi r0, 0 -/* 80258C18 40 82 00 0C */ bne lbl_80258C24 -/* 80258C1C 38 60 00 01 */ li r3, 1 -/* 80258C20 48 00 00 28 */ b lbl_80258C48 -lbl_80258C24: -/* 80258C24 7F E3 FB 78 */ mr r3, r31 -/* 80258C28 88 1F 04 1D */ lbz r0, 0x41d(r31) -/* 80258C2C 1C A0 00 0C */ mulli r5, r0, 0xc -/* 80258C30 3C 80 80 3C */ lis r4, MainProc@ha /* 0x803C3094@ha */ -/* 80258C34 38 04 30 94 */ addi r0, r4, MainProc@l /* 0x803C3094@l */ -/* 80258C38 7D 80 2A 14 */ add r12, r0, r5 -/* 80258C3C 48 10 94 49 */ bl __ptmf_scall -/* 80258C40 60 00 00 00 */ nop -/* 80258C44 38 60 00 01 */ li r3, 1 -lbl_80258C48: -/* 80258C48 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80258C4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80258C50 7C 08 03 A6 */ mtlr r0 -/* 80258C54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80258C58 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/phase_1__FPc.s b/asm/d/s/d_s_name/phase_1__FPc.s deleted file mode 100644 index f2d01e76489..00000000000 --- a/asm/d/s/d_s_name/phase_1__FPc.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_802587A4: -/* 802587A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802587A8 7C 08 02 A6 */ mflr r0 -/* 802587AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802587B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802587B4 7C 7F 1B 78 */ mr r31, r3 -/* 802587B8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 802587BC 38 63 03 D0 */ addi r3, r3, 0x3d0 -/* 802587C0 38 80 FF FF */ li r4, -1 -/* 802587C4 38 A0 00 00 */ li r5, 0 -/* 802587C8 38 C0 00 00 */ li r6, 0 -/* 802587CC 48 05 68 45 */ bl bgmStart__8Z2SeqMgrFUlUll -/* 802587D0 7F E3 FB 78 */ mr r3, r31 -/* 802587D4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802587D8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802587DC 3C 84 00 02 */ addis r4, r4, 2 -/* 802587E0 38 A0 00 80 */ li r5, 0x80 -/* 802587E4 3C C0 80 3A */ lis r6, d_s_d_s_name__stringBase0@ha /* 0x8039A2A8@ha */ -/* 802587E8 38 C6 A2 A8 */ addi r6, r6, d_s_d_s_name__stringBase0@l /* 0x8039A2A8@l */ -/* 802587EC 38 E0 00 00 */ li r7, 0 -/* 802587F0 39 00 00 00 */ li r8, 0 -/* 802587F4 38 84 C2 F8 */ addi r4, r4, -15624 -/* 802587F8 4B DE 38 81 */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap -/* 802587FC 2C 03 00 00 */ cmpwi r3, 0 -/* 80258800 38 60 00 02 */ li r3, 2 -/* 80258804 40 82 00 08 */ bne lbl_8025880C -/* 80258808 38 60 00 05 */ li r3, 5 -lbl_8025880C: -/* 8025880C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80258810 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80258814 7C 08 03 A6 */ mtlr r0 -/* 80258818 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025881C 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/phase_2__FPc.s b/asm/d/s/d_s_name/phase_2__FPc.s deleted file mode 100644 index 6dd71657369..00000000000 --- a/asm/d/s/d_s_name/phase_2__FPc.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80258820: -/* 80258820 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80258824 7C 08 02 A6 */ mflr r0 -/* 80258828 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025882C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80258830 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80258834 3C 84 00 02 */ addis r4, r4, 2 -/* 80258838 38 A0 00 80 */ li r5, 0x80 -/* 8025883C 38 84 C2 F8 */ addi r4, r4, -15624 -/* 80258840 4B DE 39 21 */ bl syncRes__14dRes_control_cFPCcP11dRes_info_ci -/* 80258844 2C 03 00 00 */ cmpwi r3, 0 -/* 80258848 40 80 00 0C */ bge lbl_80258854 -/* 8025884C 38 60 00 05 */ li r3, 5 -/* 80258850 48 00 00 18 */ b lbl_80258868 -lbl_80258854: -/* 80258854 7C 03 00 D0 */ neg r0, r3 -/* 80258858 7C 00 18 78 */ andc r0, r0, r3 -/* 8025885C 7C 03 FE 70 */ srawi r3, r0, 0x1f -/* 80258860 38 00 00 04 */ li r0, 4 -/* 80258864 7C 03 18 78 */ andc r3, r0, r3 -lbl_80258868: -/* 80258868 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025886C 7C 08 03 A6 */ mtlr r0 -/* 80258870 38 21 00 10 */ addi r1, r1, 0x10 -/* 80258874 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/resLoad__FP30request_of_phase_process_classPc.s b/asm/d/s/d_s_name/resLoad__FP30request_of_phase_process_classPc.s deleted file mode 100644 index 5adffeb388f..00000000000 --- a/asm/d/s/d_s_name/resLoad__FP30request_of_phase_process_classPc.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80258878: -/* 80258878 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025887C 7C 08 02 A6 */ mflr r0 -/* 80258880 90 01 00 14 */ stw r0, 0x14(r1) -/* 80258884 7C 85 23 78 */ mr r5, r4 -/* 80258888 38 8D 81 D8 */ la r4, l_method(r13) /* 80450758-_SDA_BASE_ */ -/* 8025888C 4B DD 72 95 */ bl dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv -/* 80258890 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80258894 7C 08 03 A6 */ mtlr r0 -/* 80258898 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025889C 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/setView__10dScnName_cFv.s b/asm/d/s/d_s_name/setView__10dScnName_cFv.s deleted file mode 100644 index b0da6429047..00000000000 --- a/asm/d/s/d_s_name/setView__10dScnName_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80258B2C: -/* 80258B2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80258B30 7C 08 02 A6 */ mflr r0 -/* 80258B34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80258B38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80258B3C 7C 7F 1B 78 */ mr r31, r3 -/* 80258B40 38 7F 02 D4 */ addi r3, r31, 0x2d4 -/* 80258B44 C0 3F 02 A4 */ lfs f1, 0x2a4(r31) -/* 80258B48 C0 5F 02 A8 */ lfs f2, 0x2a8(r31) -/* 80258B4C C0 7F 02 9C */ lfs f3, 0x29c(r31) -/* 80258B50 C0 9F 02 A0 */ lfs f4, 0x2a0(r31) -/* 80258B54 48 0E E3 D5 */ bl C_MTXPerspective -/* 80258B58 38 7F 03 14 */ addi r3, r31, 0x314 -/* 80258B5C 38 9F 02 AC */ addi r4, r31, 0x2ac -/* 80258B60 38 BF 02 B8 */ addi r5, r31, 0x2b8 -/* 80258B64 A8 DF 02 D0 */ lha r6, 0x2d0(r31) -/* 80258B68 4B DB 39 A5 */ bl mDoMtx_lookAt__FPA4_fPC3VecPC3Vecs -/* 80258B6C 38 7F 03 14 */ addi r3, r31, 0x314 -/* 80258B70 38 9F 03 44 */ addi r4, r31, 0x344 -/* 80258B74 48 0E DA 3D */ bl PSMTXInverse -/* 80258B78 38 7F 03 14 */ addi r3, r31, 0x314 -/* 80258B7C 38 9F 03 B4 */ addi r4, r31, 0x3b4 -/* 80258B80 48 0E D9 31 */ bl PSMTXCopy -/* 80258B84 C0 02 B4 F8 */ lfs f0, lit_3923(r2) -/* 80258B88 D0 1F 03 C0 */ stfs f0, 0x3c0(r31) -/* 80258B8C D0 1F 03 D0 */ stfs f0, 0x3d0(r31) -/* 80258B90 D0 1F 03 E0 */ stfs f0, 0x3e0(r31) -/* 80258B94 38 7F 03 14 */ addi r3, r31, 0x314 -/* 80258B98 3C 80 80 43 */ lis r4, j3dSys@ha /* 0x80434AC8@ha */ -/* 80258B9C 38 84 4A C8 */ addi r4, r4, j3dSys@l /* 0x80434AC8@l */ -/* 80258BA0 48 0E D9 11 */ bl PSMTXCopy -/* 80258BA4 38 7F 02 D4 */ addi r3, r31, 0x2d4 -/* 80258BA8 38 9F 03 14 */ addi r4, r31, 0x314 -/* 80258BAC 38 BF 03 74 */ addi r5, r31, 0x374 -/* 80258BB0 4B DB 3D 21 */ bl mDoMtx_concatProjView__FPA4_CfPA4_CfPA4_f -/* 80258BB4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80258BB8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80258BBC 7C 08 03 A6 */ mtlr r0 -/* 80258BC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80258BC4 4E 80 00 20 */ blr diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index bea6fd06c7c..115a7a4bf75 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -332,6 +332,7 @@ public: JKRArchive* getAnmArchive() { return mAnmArchive; } JKRArchive* getCollectResArchive() { return mCollectResArchive; } JKRArchive* getItemIconArchive() { return mItemIconArchive; } + JKRArchive* getNameResArchive() { return mNameResArchive; } JKRAramArchive* getFieldMapArchive2() { return (JKRAramArchive*)mFieldMapArchive2; } void setFieldMapArchive2(JKRArchive* arc) { mFieldMapArchive2 = arc; } @@ -355,12 +356,14 @@ public: void setMain2DArchive(JKRArchive* arc) { mMain2DArchive = arc; } void setItemTable(void* data) { mItemTable = data; } + void setPlayer(int i, fopAc_ac_c* player) { mPlayer[i] = (daAlink_c*)player; } void setPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[i] |= flag; } void clearPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[i] &= ~flag; } bool checkPlayerStatus(int param_0, int i, u32 flag) { return flag & mPlayerStatus[i]; } s8 getPlayerCameraID(int i) { return mPlayerCameraID[i]; } void setCameraParamFileName(int i, char* name) { mCameraInfo[i].mCameraParamFileName = name; } + void setCamera(int i, camera_class* cam) { mCameraInfo[i].mCamera = cam; } const char* getCameraParamFileName(int i) { return mCameraInfo[i].mCameraParamFileName; } BOOL checkCameraAttentionStatus(int i, u32 flag) { return mCameraInfo[i].mCameraAttentionStatus & flag; @@ -376,6 +379,16 @@ public: void setMesgCancelButton(u8 button) { mMesgCancelButton = button; } int getMessageCountNumber() { return mMessageCountNum; } + void setWindowNum(u8 num) { mWindowNum = num; } + dDlst_window_c* getWindow(int i) { return &mWindow[i]; } + void setWindow(int i, f32 param_1, f32 param_2, f32 param_3, f32 param_4, f32 param_5, + f32 param_6, int camID, int mode) { + mWindow[i].setViewPort(param_1, param_2, param_3, param_4, param_5, param_6); + mWindow[i].setScissor(param_1, param_2, param_3, param_4); + mWindow[i].setCameraID(camID); + mWindow[i].setMode(mode); + } + public: /* 0x00000 */ dBgS mBgs; /* 0x01404 */ dCcS mCcs; @@ -741,6 +754,7 @@ void dComIfGs_onOneZoneSwitch(int param_0, int param_1); void dComIfGs_offZoneSwitch(int param_0, int param_1); void dComIfGs_offOneZoneSwitch(int param_0, int param_1); s8 dComIfGp_getReverb(int roomNo); +void dComIfGs_gameStart(); inline void dComIfGs_onDungeonItemMap() { g_dComIfG_gameInfo.info.getMemory().getBit().onDungeonItemMap(); @@ -1289,6 +1303,10 @@ inline void dComIfGs_initDan(s8 i_stageNo) { g_dComIfG_gameInfo.info.initDan(i_stageNo); } +inline void dComIfGs_resetDan() { + g_dComIfG_gameInfo.info.resetDan(); +} + inline u16 dComIfGs_getRupeeMax() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getRupeeMax(); } @@ -1321,6 +1339,22 @@ inline u8 dComIfGs_checkBombBag(u8 i_itemNo) { return g_dComIfG_gameInfo.info.getPlayer().getItem().checkBombBag(i_itemNo); } +inline s64 dComIfGs_getTotalTime() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().getTotalTime(); +} + +inline void dComIfGs_setSaveTotalTime(s64 time) { + g_dComIfG_gameInfo.info.setSaveTotalTime(time); +} + +inline void dComIfGs_setSaveStartTime(s64 time) { + g_dComIfG_gameInfo.info.setStartTime(time); +} + +inline void dComIfGs_setNoFile(u8 file) { + g_dComIfG_gameInfo.info.setNoFile(file); +} + void dComIfGp_setItemLifeCount(f32 amount, u8 type); void dComIfGp_setItemRupeeCount(long amount); void dComIfGp_setSelectItem(int index); @@ -1400,6 +1434,10 @@ inline JKRArchive* dComIfGp_getItemIconArchive() { return g_dComIfG_gameInfo.play.getItemIconArchive(); } +inline JKRArchive* dComIfGp_getNameResArchive() { + return g_dComIfG_gameInfo.play.getNameResArchive(); +} + inline JKRArchive* dComIfGp_getMsgDtArchive(int idx) { return g_dComIfG_gameInfo.play.getMsgDtArchive(idx); } @@ -1772,6 +1810,10 @@ inline void dComIfGp_setStatus(u16 status) { g_dComIfG_gameInfo.play.setStatus(status); } +inline void dComIfGp_setPlayer(int i, fopAc_ac_c* player) { + g_dComIfG_gameInfo.play.setPlayer(i, player); +} + inline void dComIfGp_setPlayerStatus0(int param_0, u32 flag) { g_dComIfG_gameInfo.play.setPlayerStatus(param_0, 0, flag); } @@ -1908,10 +1950,28 @@ inline void dComIfGp_setCameraParamFileName(int i, char* name) { g_dComIfG_gameInfo.play.setCameraParamFileName(i, name); } +inline void dComIfGp_setCamera(int i, camera_class* cam) { + g_dComIfG_gameInfo.play.setCamera(i, cam); +} + inline const char* dComIfGp_getCameraParamFileName(int i) { return g_dComIfG_gameInfo.play.getCameraParamFileName(i); } +inline void dComIfGp_setWindowNum(int num) { + g_dComIfG_gameInfo.play.setWindowNum(num); +} + +inline dDlst_window_c* dComIfGp_getWindow(int i) { + return g_dComIfG_gameInfo.play.getWindow(i); +} + +inline void dComIfGp_setWindow(u8 i, f32 param_1, f32 param_2, f32 param_3, f32 param_4, + f32 param_5, f32 param_6, int camID, int mode) { + g_dComIfG_gameInfo.play.setWindow(i, param_1, param_2, param_3, param_4, param_5, param_6, + camID, mode); +} + inline s8 dComIfGp_getLayerOld() { return g_dComIfG_gameInfo.play.getLayerOld(); } @@ -2040,6 +2100,10 @@ inline void dComIfGp_particle_cleanup() { g_dComIfG_gameInfo.play.getParticle()->cleanup(); } +inline void dComIfGp_particle_removeScene(bool param_0) { + g_dComIfG_gameInfo.play.getParticle()->removeScene(param_0); +} + inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3, const csXyz* param_4, const cXyz* param_5, u8 param_6, dPa_levelEcallBack* param_7, @@ -2158,6 +2222,18 @@ inline void dComIfGd_peekZdata() { g_dComIfG_gameInfo.drawlist.peekZdata(); } +inline void dComIfGd_setView(view_class* view) { + g_dComIfG_gameInfo.drawlist.setView(view); +} + +inline void dComIfGd_setWindow(dDlst_window_c* window) { + g_dComIfG_gameInfo.drawlist.setWindow(window); +} + +inline void dComIfGd_setViewport(view_port_class* port) { + g_dComIfG_gameInfo.drawlist.setViewport(port); +} + inline daPy_py_c* daPy_getLinkPlayerActorClass() { return dComIfGp_getLinkPlayer(); } diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 54908ab78ea..93df763497b 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -191,6 +191,10 @@ public: /* 80051AC0 */ void setViewPort(f32, f32, f32, f32, f32, f32); /* 80051ADC */ void setScissor(f32, f32, f32, f32); + void setCameraID(int id) { mCameraID = id; } + void setMode(int mode) { mMode = mode; } + f32 getViewPort() { return mViewport; } + private: /* 0x00 */ f32 mViewport; /* 0x04 */ f32 field_0x04; @@ -208,15 +212,11 @@ private: STATIC_ASSERT(sizeof(dDlst_window_c) == 0x2C); -struct view_port_class {}; - -struct view_class { - /* 0x00 */ u8 field_0x0[0xD0]; - /* 0xD0 */ f32 field_0xd0; -}; - extern u8 data_80450ED0; // Wipe +struct view_port_class; +struct view_class; + class dDlst_list_c { public: /* 800560F0 */ dDlst_list_c(); @@ -237,6 +237,9 @@ public: void set2DOpa(dDlst_base_c* dlst) { set(field_0x1b4, field_0x1b8, dlst); } void set2DOpaTop(dDlst_base_c* dlst) { set(field_0xac, field_0xb0, dlst); } view_class* getView() { return mView; } + void setView(view_class* view) { mView = view; } + void setWindow(dDlst_window_c* window) { mWindow = window; } + void setViewport(view_port_class* port) { mViewport = port; } J3DDrawBuffer* getOpaListFilter() { return mListFilter; } J3DDrawBuffer* getOpaListP0() { return mListP0; } J3DDrawBuffer* getOpaListPacket() { return mOpaListPacket; } diff --git a/include/d/d_name.h b/include/d/d_name.h index aa8be77dd73..b2a4101efd9 100644 --- a/include/d/d_name.h +++ b/include/d/d_name.h @@ -1,6 +1,149 @@ #ifndef D_D_NAME_H #define D_D_NAME_H +#include "d/com/d_com_inf_game.h" #include "dolphin/types.h" +class dNm_HIO_c { +public: + /* 8024E3E0 */ dNm_HIO_c(); + /* 802511A4 */ virtual ~dNm_HIO_c(); + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 mMenuScale; + /* 0x0C */ f32 mSelCharScale; + /* 0x10 */ u8 field_0x10; +}; + +class dDlst_NameIN_c : public dDlst_base_c { +public: + dDlst_NameIN_c() {} + + /* 80251094 */ virtual void draw(); + /* 8025115C */ virtual ~dDlst_NameIN_c(); + + /* 0x04 */ J2DScreen* NameInScr; + /* 0x08 */ JUTFont* font; + /* 0x0C */ J2DPane* field_0xc; + /* 0x10 */ J2DPane* field_0x10; +}; + +class ChrInfo_c { +public: + /* 0x0 */ u8 mColumn; + /* 0x1 */ u8 mRow; + /* 0x2 */ u8 mMojiSet; + /* 0x3 */ u8 field_0x3; + /* 0x4 */ int mCharacter; +}; // Size: 0x8 + +class dName_c { +public: + enum { + PROC_MOJI_SELECT, + PROC_MOJI_SEL_ANM, + PROC_MOJI_SEL_ANM2, + PROC_MOJI_SEL_ANM3, + PROC_MENU_SELECT, + PROC_MENU_SEL_ANM, + PROC_MENU_SEL_ANM2, + PROC_MENU_SEL_ANM3, + PROC_WAIT + }; + + enum { + MOJI_HIRA, + MOJI_KATA, + MOJI_EIGO, + }; + + enum { + MENU_HIRA, + MENU_KATA, + MENU_EIGO, + MENU_END, + }; + + /* 8024E408 */ dName_c(J2DPane*); + /* 8024E62C */ void _create(); + /* 8024E6D4 */ void init(); + /* 8024E7A4 */ void initial(); + /* 8024E7EC */ void showIcon(); + /* 8024E9A0 */ void _move(); + /* 8024EC10 */ int nameCheck(); + /* 8024EC4C */ void playNameSet(int); + /* 8024EC84 */ void cursorAnm(); + /* 8024ED48 */ void Wait(); + /* 8024ED4C */ void MojiSelect(); + /* 8024F034 */ void MojiSelectAnmInit(); + /* 8024F0E0 */ void MojiSelectAnm(); + /* 8024F164 */ void MojiSelectAnm2(); + /* 8024F1E8 */ void MojiSelectAnm3(); + /* 8024F1EC */ int mojiChange(u8); + /* 8024F55C */ void selectMojiSet(); + /* 8024F59C */ int getMoji(); + /* 8024F634 */ void setMoji(int); + /* 8024F88C */ void setNameText(); + /* 8024F914 */ void nameCursorMove(); + /* 8024F994 */ void selectCursorMove(); + /* 8024FAF4 */ void menuCursorPosSet(); + /* 8024FB08 */ void MenuSelect(); + /* 8024FDA0 */ void MenuSelectAnmInit(); + /* 8024FDF4 */ void MenuSelectAnm(); + /* 8024FEB4 */ void MenuSelectAnm2(); + /* 8024FFA0 */ void MenuSelectAnm3(); + /* 8024FFA4 */ void menuAbtnSelect(); + /* 80250074 */ void backSpace(); + /* 802501B0 */ void mojiListChange(); + /* 80250284 */ void menuCursorMove(); + /* 80250380 */ void menuCursorMove2(); + /* 802504A0 */ void selectCursorPosSet(int); + /* 80250560 */ void _draw(); + /* 802505CC */ void screenSet(); + /* 80250CEC */ void displayInit(); + /* 80250E54 */ void NameStrSet(); + /* 80251048 */ s32 getMenuPosIdx(u8); + + /* 8024E468 */ virtual ~dName_c(); + +private: + /* 0x004 */ STControl* stick; + /* 0x008 */ JKRArchive* archive; + /* 0x00C */ dDlst_NameIN_c nameIn; + /* 0x020 */ dSelect_cursor_c* mSelIcon; + /* 0x024 */ J2DAnmColorKey* mCursorColorKey; + /* 0x028 */ int mCurColAnmF; + /* 0x02C */ J2DAnmTextureSRTKey* mCursorTexKey; + /* 0x030 */ int mCurTexAnmF; + /* 0x034 */ CPaneMgrAlpha* mNameCursor[8]; + /* 0x054 */ char* mNameText[8]; + /* 0x074 */ CPaneMgr* mMojiIcon[65]; + /* 0x178 */ char* mMojiText[65]; + /* 0x27C */ J2DPane* mMojiPane; + /* 0x280 */ J2DPane* mMenuPane; + /* 0x284 */ CPaneMgr* mMenuIcon[4]; + /* 0x294 */ J2DTextBox* mMenuText[4]; + /* 0x2A4 */ u8 mCursorDelay; + /* 0x2A5 */ u8 mCharColumn; + /* 0x2A6 */ u8 mPrevColumn; + /* 0x2A7 */ u8 mCharRow; + /* 0x2A8 */ u8 mPrevRow; + /* 0x2A9 */ u8 mMojiSet; + /* 0x2AA */ u8 mPrevMojiSet; + /* 0x2AB */ u8 mSelProc; + /* 0x2AC */ u8 field_0x2ac; + /* 0x2AD */ u8 field_0x2ad; + /* 0x2AE */ u8 field_0x2ae; + /* 0x2AF */ u8 mSelMenu; + /* 0x2B0 */ u8 mPrevSelMenu; + /* 0x2B1 */ u8 mCurPos; + /* 0x2B2 */ u8 mLastCurPos; + /* 0x2B3 */ u8 field_0x2b3; + /* 0x2B4 */ u8 mIsInputEnd; + /* 0x2B5 */ char mInputStr[23]; + /* 0x2CC */ ChrInfo_c mChrInfo[8]; + /* 0x30C */ u8 field_0x30c[4][4]; // ? + /* 0x31C */ char mNextNameStr[28]; +}; // Size: 0x338 + #endif /* D_D_NAME_H */ diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index 0adb1a27c1a..093709a7c22 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -18,6 +18,8 @@ BOOL dKy_darkworld_spot_check(char const* stageName, int roomNo); void dKy_darkworld_Area_set(char const* stageName, int roomNo); void dKy_FiveSenses_fullthrottle_dark(); s32 dKy_daynight_check(); +void dKy_clear_game_init(); +void dKy_setLight_init(); struct LIGHT_INFLUENCE { /* 800CFC7C */ ~LIGHT_INFLUENCE(); diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index 58d9bdff40f..0a052d2e5ad 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -454,6 +454,10 @@ inline void dMeter2Info_setTableMapRegionNo(u8 regionNo) { g_meter2_info.setTableMapRegionNo(regionNo); } +inline void dMeter2Info_changeWater(u8 bottleIdx) { + g_meter2_info.changeWater(bottleIdx); +} + char* dMeter2Info_getNumberTextureName(int pIndex); void dMeter2Info_recieveLetter(); u8 dMeter2Info_getNewLetterNum(); diff --git a/include/d/pane/d_pane_class.h b/include/d/pane/d_pane_class.h index f77aafc09bf..9b948d25889 100644 --- a/include/d/pane/d_pane_class.h +++ b/include/d/pane/d_pane_class.h @@ -28,12 +28,17 @@ public: /* 802548BC */ void colorAnime(s16, JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor, u8); /* 80254C90 */ void getGlobalVtx(J2DPane*, f32 (*)[3][4], u8, bool, s16); - /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); + /* 80254EBC */ Vec getGlobalVtxCenter(J2DPane*, bool, s16); /* 80254FB8 */ void getBounds(J2DPane*); + Vec getGlobalVtxCenter(bool param_0, s16 param_1) { + return getGlobalVtxCenter(getPanePtr(), param_0, param_1); + } + void translate(f32 x, f32 y) { getPanePtr()->translate(x, y); } void scale(f32 h, f32 v) { getPanePtr()->scale(h, v); } + void scaleAnimeStart(s16 v) { mScaleAnime = v; } f32 getPosX() { return getPanePtr()->getBounds().i.x; } f32 getPosY() { return getPanePtr()->getBounds().i.y; } diff --git a/include/d/s/d_s_logo.h b/include/d/s/d_s_logo.h index 6c8d2e1b918..086b2091153 100644 --- a/include/d/s/d_s_logo.h +++ b/include/d/s/d_s_logo.h @@ -62,6 +62,7 @@ public: /* 8025854C */ void setRenderMode(); public: + /* 0x1CC */ mDoDvdThd_toMainRam_c* sceneCommand; /* 0x1D0 */ JKRExpHeap* field_0x1d0; /* 0x1D4 */ JKRExpHeap* field_0x1d4; /* 0x1D8 */ JKRHeap* mpHeap; diff --git a/include/d/s/d_s_play.h b/include/d/s/d_s_play.h index fb812dbf8d1..e75bc46f51f 100644 --- a/include/d/s/d_s_play.h +++ b/include/d/s/d_s_play.h @@ -69,6 +69,7 @@ public: static bool isPause() { return struct_80451124 == 0; } static void setPauseTimer(s8 time) { data_80451125 = time; } + /* 0x1CC */ mDoDvdThd_toMainRam_c* sceneCommand; /* 0x1D0 */ mDoDvdThd_mountXArchive_c* field_0x1d0; /* 0x1D4 */ u8 field_0x1d4; }; diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index ea631aa5ef9..7cccd00ae66 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -888,6 +888,8 @@ public: void onItem(int i_no); BOOL isItem(int i_no) const; + void reset() { mStageNo = -1; } + private: /* 0x00 */ s8 mStageNo; /* 0x01 */ u8 unk1; @@ -1074,9 +1076,13 @@ public: dSv_danBit_c& getDan() { return mDan; } s64 getStartTime() const { return mStartTime; } s64 getSaveTotalTime() const { return mSaveTotalTime; } + void setStartTime(s64 time) { mStartTime = time; } + void setSaveTotalTime(s64 time) { mSaveTotalTime = time; } void initDan(s8 i_stage) { mDan.init(i_stage); } + void resetDan() { mDan.reset(); } u8 getDataNum() const { return mDataNum; } void removeZone(int zoneNo) { mZone[zoneNo].reset(); } + void setNoFile(u8 file) { mNoFile = file; } static const int MEMORY_SWITCH = 0x80; static const int DAN_SWITCH = 0x40; diff --git a/include/dolphin/gd/GDBase.h b/include/dolphin/gd/GDBase.h index 121f2f6ce94..31f61bf11a8 100644 --- a/include/dolphin/gd/GDBase.h +++ b/include/dolphin/gd/GDBase.h @@ -25,7 +25,6 @@ extern "C" { void GDInitGDLObj(GDLObj*, u8*, u32); void GDFlushCurrToMem(); void GDPadCurr32(); - } #endif /* GDBASE_H */ diff --git a/include/dolphin/gd/GDGeometry.h b/include/dolphin/gd/GDGeometry.h index e3f59751a23..2d09d0f2468 100644 --- a/include/dolphin/gd/GDGeometry.h +++ b/include/dolphin/gd/GDGeometry.h @@ -1,15 +1,14 @@ #ifndef GDGEOMETRY_H #define GDGEOMETRY_H -#include "dolphin/types.h" #include "dolphin/gx/GX.h" +#include "dolphin/types.h" extern "C" { void GDSetVtxDescv(GXVtxDescList*); void GDSetArray(GXAttr attr, const void* data, u8 stride); void GDSetArrayRaw(GXAttr attr, u32 data, u8 stride); - } #endif /* GDGEOMETRY_H */ diff --git a/include/dolphin/gx/GX.h b/include/dolphin/gx/GX.h index 1951f2bd430..19091b9b21a 100644 --- a/include/dolphin/gx/GX.h +++ b/include/dolphin/gx/GX.h @@ -83,7 +83,7 @@ typedef struct _GXFifoObj { typedef struct _GXTexRegion { /* 0x00 */ u8 dummy[0x10]; -} GXTexRegion; // Size: 0x10 +} GXTexRegion; // Size: 0x10 typedef enum _GXPrimitive { /* 0x80 */ GX_QUADS = 0x80, @@ -821,14 +821,14 @@ typedef enum _GXPTTexMtx { typedef struct _GXVtxDescList { /* 0x0 */ GXAttr attr; /* 0x4 */ GXAttrType type; -} GXVtxDescList; // Size: 0x08 +} GXVtxDescList; // Size: 0x08 typedef struct _GXVtxAttrFmtList { /* 0x00 */ GXAttr mAttrib; /* 0x04 */ GXCompCnt mCompCnt; /* 0x08 */ GXCompType mCompType; /* 0x0C */ u8 mCompShift; -} GXVtxAttrFmtList; // Size: 0x10 +} GXVtxAttrFmtList; // Size: 0x10 typedef enum _GXFBClamp { /* 0x0 */ GX_CLAMP_NONE, @@ -854,8 +854,7 @@ typedef enum _GXZFmt16 { /* 0x3 */ GX_ZC_FAR, } GXZFmt16; -typedef enum _GXCommand -{ +typedef enum _GXCommand { GX_CMD_LOAD_INDX_A = 0x20, GX_CMD_LOAD_INDX_B = 0x28, GX_CMD_LOAD_INDX_C = 0x30, @@ -978,7 +977,7 @@ void GXInitFifoBase(GXFifoObj*, void*, u32); void GXInitFifoPtrs(GXFifoObj*, void*, void*); void GXSaveCPUFifo(GXFifoObj*); void GXSetMisc(u32 opt, u32 val); -void GXInitTexCacheRegion(GXTexRegion *region, GXBool, u32, GXTexCacheSize, u32, GXTexCacheSize); +void GXInitTexCacheRegion(GXTexRegion* region, GXBool, u32, GXTexCacheSize, u32, GXTexCacheSize); #define GFX_FIFO(T) (*(volatile T*)0xCC008000) diff --git a/include/f_op/f_op_camera_mng.h b/include/f_op/f_op_camera_mng.h index 0822e21425b..4e488b58c3b 100644 --- a/include/f_op/f_op_camera_mng.h +++ b/include/f_op/f_op_camera_mng.h @@ -1,23 +1,59 @@ #ifndef F_F_OP_CAMERA_MNG_H_ #define F_F_OP_CAMERA_MNG_H_ +#include "SSystem/SComponent/c_phase.h" +#include "SSystem/SComponent/c_sxyz.h" #include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" #include "f_op/f_op_draw_tag.h" +#include "f_op/f_op_view.h" #include "f_pc/f_pc_leaf.h" -class camera_class { +class camera_class : public view_class { public: - /* 0x000 */ u8 field_0x00[0xB0]; - /* 0x0B0 */ u32 parameter; - /* 0x0B4 */ u8 field_0xB4[0x24]; - /* 0x0D8 */ cXyz field_0xd8; - /* 0x0E4 */ cXyz field_0xe4; - /* 0x0F0 */ u8 field_0xf0[0x120]; + /* 0x170 */ Mtx field_0x170; + /* 0x1A0 */ Mtx field_0x1a0; + /* 0x1D0 */ u8 field_0x1d0[0x10]; + /* 0x1E0 */ Mtx field_0x1e0; /* 0x210 */ create_tag_class pCreateTag; /* 0x224 */ leafdraw_method_class* pMthd; + /* 0x228 */ u8 field_0x228[4]; + /* 0x22C */ s8 mPrm1; + /* 0x22D */ s8 mPrm2; + /* 0x22E */ s8 mPrm3; + /* 0x22F */ u8 field_0x22f; + /* 0x230 */ csXyz mAngle; + /* 0x238 */ int field_0x238; }; +/* void fopCamM_SetNear(camera_class* cam, f32 near) { + cam->mNear = near; +} + +void fopCamM_SetFar(camera_class* cam, f32 far) { + cam->mFar = far; +} + +void fopCamM_SetFovy(camera_class* cam, f32 fovy) { + cam->mFovy = fovy; +} + +void fopCamM_SetAspect(camera_class* cam, f32 aspect) { + cam->mAspect = aspect; +} + +void fopCamM_SetEye(camera_class* cam, f32 x, f32 y, f32 z) { + cam->field_0xd8.mEye.set(x, y, z); +} + +void fopCamM_SetCenter(camera_class* cam, f32 x, f32 y, f32 z) { + cam->field_0xd8.mCenter.set(x, y, z); +} + +void fopCamM_SetBank(camera_class* cam, s16 bank) { + cam->mBank = bank; +} */ + u32 fopCamM_Create(int i_cameraIdx, s16 pProcName, void* param_3); void fopCamM_Management(void); u32 fopCamM_GetParam(camera_class* pCamera); diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h index d78edf381b7..85c00e2f5be 100644 --- a/include/f_op/f_op_msg_mng.h +++ b/include/f_op/f_op_msg_mng.h @@ -38,5 +38,6 @@ void fopMsgM_destroyExpHeap(JKRExpHeap*); s32 fopMsgM_setStageLayer(void*); void fopMsgM_messageSetDemo(u32 param_0); msg_class* fopMsgM_SearchByID(unsigned int param_0); +char* fopMsgM_messageGet(char* msg, u32 string_id); #endif \ No newline at end of file diff --git a/include/f_op/f_op_scene.h b/include/f_op/f_op_scene.h index 9efba5f2c1f..16bda2d5799 100644 --- a/include/f_op/f_op_scene.h +++ b/include/f_op/f_op_scene.h @@ -21,7 +21,6 @@ public: /* 0x1B0 */ scene_tag_class* field_0x1b0; /* 0x1B4 */ u8 field_0x1b4[0x10]; /* 0x1C4 */ request_of_phase_process_class field_0x1c4; - /* 0x1CC */ mDoDvdThd_toMainRam_c* sceneCommand; }; #endif \ No newline at end of file diff --git a/include/f_op/f_op_view.h b/include/f_op/f_op_view.h index 5ab7d8c7ee4..4efd9ee670a 100644 --- a/include/f_op/f_op_view.h +++ b/include/f_op/f_op_view.h @@ -1,15 +1,34 @@ #ifndef F_F_OP_VIEW_H_ #define F_F_OP_VIEW_H_ +#include "SSystem/SComponent/c_xyz.h" +#include "dolphin/mtx/mtx.h" #include "dolphin/types.h" #include "f_pc/f_pc_leaf.h" -class view_class { +class lookat_class { public: - /* 0x00 */ u8 field_0x00[0x10]; - /* 0x10 */ leafdraw_class* pLeafdraw; - /* 0x14 */ u8 field_0x14[0xac]; - /* 0xC0 */ process_method_class* pmProcessMtd; + /* 0x00 */ cXyz mEye; + /* 0x0C */ cXyz mCenter; + /* 0x18 */ cXyz mUp; +}; + +struct view_port_class { + f32 field_0x0; +}; + +struct view_class : public leafdraw_class { + /* 0x0C0 */ leafdraw_method_class* mpLeafdrawMtd; + /* 0x0C4 */ u8 field_0xc4[4]; + /* 0x0C8 */ f32 mNear; + /* 0x0CC */ f32 mFar; + /* 0x0D0 */ f32 mFovy; + /* 0x0D4 */ f32 mAspect; + /* 0x0D8 */ lookat_class field_0xd8; + /* 0x0FC */ s16 mBank; + /* 0x100 */ Mtx field_0x100; + /* 0x130 */ u8 field_0x130[0x10]; + /* 0x140 */ Mtx field_0x140; }; #endif \ No newline at end of file diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index c5ee806886c..c589030a833 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -44,6 +44,18 @@ inline void mDoAud_bgmSetSwordUsing(s32 id) { Z2AudioMgr::getInterface()->mSeqMgr.bgmSetSwordUsing(id); } +inline void mDoAud_bgmStart(u32 id) { + Z2AudioMgr::getInterface()->mSeqMgr.bgmStart(id, 0, 0); +} + +inline void mDoAud_bgmStreamPrepare(u32 param_0) { + Z2AudioMgr::getInterface()->mSeqMgr.bgmStreamPrepare(param_0); +} + +inline void mDoAud_bgmStreamPlay() { + Z2AudioMgr::getInterface()->mSeqMgr.bgmStreamPlay(); +} + inline void mDoAud_setHour(s32 hour) { Z2AudioMgr::getInterface()->mStatusMgr.setHour(hour); } diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h index dee9991aa0a..57222b1de91 100644 --- a/include/m_Do/m_Do_graphic.h +++ b/include/m_Do/m_Do_graphic.h @@ -10,6 +10,7 @@ int mDoGph_Create(); extern u8 struct_80450BE4; // Blure extern u8 data_80450BE6; // Fade +extern bool data_80450BE7; // AutoForcus struct ResTIMG; class mDoGph_gInf_c { @@ -47,8 +48,11 @@ public: static void endFrame() { JFWDisplay::getManager()->endFrame(); } static void offFade() { data_80450BE6 = 0; } static void offBlure() { struct_80450BE4 = 0; } + static void offAutoForcus() { data_80450BE7 = 0; } static void setTickRate(u32 rate) { JFWDisplay::getManager()->setTickRate(rate); } static void waitBlanking(int wait) { JFWDisplay::getManager()->waitBlanking(wait); } + static f32 getWidthF() { return 608.0f; } + static f32 getHeightF() { return 448.0f; } static GXTexObj mFrameBufferTexObj; static GXTexObj mZbufferTexObj; diff --git a/include/m_Do/m_Do_machine.h b/include/m_Do/m_Do_machine.h index 5871f47a9c1..8ea5888795f 100644 --- a/include/m_Do/m_Do_machine.h +++ b/include/m_Do/m_Do_machine.h @@ -21,6 +21,8 @@ class mDoMch_render_c { public: static void setRenderModeObj(GXRenderModeObj* obj) { mRenderModeObj = obj; } static void setProgressiveMode() { setRenderModeObj(&g_ntscZeldaProg); } + static u16 getEfbHeight() { return mRenderModeObj->efb_height; } + static u16 getFbWidth() { return mRenderModeObj->fb_width; } static GXRenderModeObj* getRenderModeObj() { return mRenderModeObj; } diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index df5699d1f54..1a238d69b38 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -16,6 +16,8 @@ void mDoMtx_YrotS(Mtx, s16); void mDoMtx_XrotS(Mtx, s16); void mDoMtx_YrotM(Mtx, s16); void mDoMtx_MtxToRot(CMtxP, csXyz*); +void mDoMtx_lookAt(f32 (*param_0)[4], Vec const* param_1, Vec const* param_2, s16 param_3); +void mDoMtx_concatProjView(f32 const (*param_0)[4], f32 const (*param_1)[4], f32 (*param_2)[4]); class mDoMtx_stack_c { public: diff --git a/libs/JSystem/J2DGraph/J2DAnimation.cpp b/libs/JSystem/J2DGraph/J2DAnimation.cpp index 4df28cd357c..25a2baa7f50 100644 --- a/libs/JSystem/J2DGraph/J2DAnimation.cpp +++ b/libs/JSystem/J2DGraph/J2DAnimation.cpp @@ -563,8 +563,8 @@ void J2DAnmTexPattern::searchUpdateMaterialID(J2DScreen* pScreen) { if (var1 != NULL) { var2 = (ResTIMG*)resRef.getResource(var1, 'TIMG', NULL); if (var2 == NULL && J2DScreen::getDataManage() != NULL) { - var2 = (ResTIMG*)J2DScreen::getDataManage()->get( - pScreen->mTexRes->getName(i)); + var2 = + (ResTIMG*)J2DScreen::getDataManage()->get(pScreen->mTexRes->getName(i)); } } mTIMGPtrArray[i].mRes = var2; diff --git a/libs/JSystem/J3DGraphBase/J3DPacket.cpp b/libs/JSystem/J3DGraphBase/J3DPacket.cpp index b829cb202e9..581f924969f 100644 --- a/libs/JSystem/J3DGraphBase/J3DPacket.cpp +++ b/libs/JSystem/J3DGraphBase/J3DPacket.cpp @@ -247,8 +247,7 @@ J3DDrawPacket::J3DDrawPacket() { } /* 803127B0-8031280C 30D0F0 005C+00 3/2 0/0 0/0 .text __dt__13J3DDrawPacketFv */ -J3DDrawPacket::~J3DDrawPacket() { -} +J3DDrawPacket::~J3DDrawPacket() {} /* 8031280C-80312898 30D14C 008C+00 1/1 1/1 0/0 .text newDisplayList__13J3DDrawPacketFUl */ diff --git a/libs/JSystem/J3DGraphBase/J3DShape.cpp b/libs/JSystem/J3DGraphBase/J3DShape.cpp index 154850d3e3a..efe817b6175 100644 --- a/libs/JSystem/J3DGraphBase/J3DShape.cpp +++ b/libs/JSystem/J3DGraphBase/J3DShape.cpp @@ -72,34 +72,34 @@ enum { kVcdVatDLSize = 0xC0, }; -void J3DShape::initialize() { - mMaterial = NULL; - mIndex = -1; - mMtxGroupNum = 0; - mFlags = 0; - mRadius = 0.0f; - mMin.x = 0.0f; - mMin.y = 0.0f; - mMin.z = 0.0f; - mMax.x = 0.0f; - mMax.y = 0.0f; - mMax.z = 0.0f; - mVtxDesc = NULL; - mShapeMtx = NULL; - mShapeDraw = NULL; - mVertexData = NULL; - mDrawMtxData = NULL; - mScaleFlagArray = NULL; - mDrawMtx = NULL; - mNrmMtx = NULL; - mCurrentViewNo = &j3dDefaultViewNo; - mHasNBT = false; - mHasPNMTXIdx = false; +void J3DShape::initialize() { + mMaterial = NULL; + mIndex = -1; + mMtxGroupNum = 0; + mFlags = 0; + mRadius = 0.0f; + mMin.x = 0.0f; + mMin.y = 0.0f; + mMin.z = 0.0f; + mMax.x = 0.0f; + mMax.y = 0.0f; + mMax.z = 0.0f; + mVtxDesc = NULL; + mShapeMtx = NULL; + mShapeDraw = NULL; + mVertexData = NULL; + mDrawMtxData = NULL; + mScaleFlagArray = NULL; + mDrawMtx = NULL; + mNrmMtx = NULL; + mCurrentViewNo = &j3dDefaultViewNo; + mHasNBT = false; + mHasPNMTXIdx = false; } /* 80314BB8-80314CBC 30F4F8 0104+00 0/0 1/1 0/0 .text addTexMtxIndexInDL__8J3DShapeF7_GXAttrUl */ void J3DShape::addTexMtxIndexInDL(GXAttr attr, u32 valueBase) { - u32 kSize[] = { 0, 1, 1, 2 }; + u32 kSize[] = {0, 1, 1, 2}; s32 pnmtxidxOffs = -1; s32 attrOffs = -1; @@ -200,8 +200,8 @@ void J3DShape::loadVtxArray() const { /* 80314F5C-80314F98 30F89C 003C+00 0/0 1/1 0/0 .text isSameVcdVatCmd__8J3DShapeFP8J3DShape */ bool J3DShape::isSameVcdVatCmd(J3DShape* other) { - u8 *a = other->mVcdVatCmd; - u8 *b = mVcdVatCmd; + u8* a = other->mVcdVatCmd; + u8* b = mVcdVatCmd; for (u32 i = 0; i < kVcdVatDLSize; i++) if (a[i] != b[i]) return false; @@ -210,7 +210,7 @@ bool J3DShape::isSameVcdVatCmd(J3DShape* other) { /* 80314F98-80315260 30F8D8 02C8+00 1/1 0/0 0/0 .text makeVtxArrayCmd__8J3DShapeFv */ void J3DShape::makeVtxArrayCmd() { - GXVtxAttrFmtList *vtxAttr = mVertexData->getVtxAttrFmtList(); + GXVtxAttrFmtList* vtxAttr = mVertexData->getVtxAttrFmtList(); u8 stride[0x0C]; void* array[0x0C]; @@ -221,35 +221,30 @@ void J3DShape::makeVtxArrayCmd() { for (; vtxAttr->mAttrib != GX_VA_NULL; vtxAttr++) { switch (vtxAttr->mAttrib) { - case GX_VA_POS: - { - if (vtxAttr->mCompType == GX_F32) - stride[vtxAttr->mAttrib - GX_VA_POS] = 0x0C; - else - stride[vtxAttr->mAttrib - GX_VA_POS] = 0x06; - array[vtxAttr->mAttrib - GX_VA_POS] = mVertexData->getVtxPosArray(); - mVertexData->setVtxPosFrac(vtxAttr->mCompShift); - mVertexData->setVtxPosType((GXCompType) vtxAttr->mCompType); - } - break; - case GX_VA_NRM: - { - if (vtxAttr->mCompType == GX_F32) - stride[vtxAttr->mAttrib - GX_VA_POS] = 0x0C; - else - stride[vtxAttr->mAttrib - GX_VA_POS] = 0x06; - array[vtxAttr->mAttrib - GX_VA_POS] = mVertexData->getVtxNrmArray(); - mVertexData->setVtxNrmFrac(vtxAttr->mCompShift); - mVertexData->setVtxNrmType((GXCompType) vtxAttr->mCompType); - } - break; + case GX_VA_POS: { + if (vtxAttr->mCompType == GX_F32) + stride[vtxAttr->mAttrib - GX_VA_POS] = 0x0C; + else + stride[vtxAttr->mAttrib - GX_VA_POS] = 0x06; + array[vtxAttr->mAttrib - GX_VA_POS] = mVertexData->getVtxPosArray(); + mVertexData->setVtxPosFrac(vtxAttr->mCompShift); + mVertexData->setVtxPosType((GXCompType)vtxAttr->mCompType); + } break; + case GX_VA_NRM: { + if (vtxAttr->mCompType == GX_F32) + stride[vtxAttr->mAttrib - GX_VA_POS] = 0x0C; + else + stride[vtxAttr->mAttrib - GX_VA_POS] = 0x06; + array[vtxAttr->mAttrib - GX_VA_POS] = mVertexData->getVtxNrmArray(); + mVertexData->setVtxNrmFrac(vtxAttr->mCompShift); + mVertexData->setVtxNrmType((GXCompType)vtxAttr->mCompType); + } break; case GX_VA_CLR0: - case GX_VA_CLR1: - { - stride[vtxAttr->mAttrib - GX_VA_POS] = 0x04; - array[vtxAttr->mAttrib - GX_VA_POS] = mVertexData->getVtxColorArray(vtxAttr->mAttrib - GX_VA_CLR0); - } - break; + case GX_VA_CLR1: { + stride[vtxAttr->mAttrib - GX_VA_POS] = 0x04; + array[vtxAttr->mAttrib - GX_VA_POS] = + mVertexData->getVtxColorArray(vtxAttr->mAttrib - GX_VA_CLR0); + } break; case GX_VA_TEX0: case GX_VA_TEX1: case GX_VA_TEX2: @@ -257,15 +252,14 @@ void J3DShape::makeVtxArrayCmd() { case GX_VA_TEX4: case GX_VA_TEX5: case GX_VA_TEX6: - case GX_VA_TEX7: - { - if (vtxAttr->mCompType == GX_F32) - stride[vtxAttr->mAttrib - GX_VA_POS] = 0x08; - else - stride[vtxAttr->mAttrib - GX_VA_POS] = 0x04; - array[vtxAttr->mAttrib - GX_VA_POS] = mVertexData->getVtxTexCoordArray(vtxAttr->mAttrib - GX_VA_TEX0); - } - break; + case GX_VA_TEX7: { + if (vtxAttr->mCompType == GX_F32) + stride[vtxAttr->mAttrib - GX_VA_POS] = 0x08; + else + stride[vtxAttr->mAttrib - GX_VA_POS] = 0x04; + array[vtxAttr->mAttrib - GX_VA_POS] = + mVertexData->getVtxTexCoordArray(vtxAttr->mAttrib - GX_VA_TEX0); + } break; default: break; } diff --git a/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp index 6da5f00bcd0..dc735608ca4 100644 --- a/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp +++ b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp @@ -5,11 +5,11 @@ #include "JSystem/J3DGraphBase/J3DShapeDraw.h" #include "JSystem/JKernel/JKRHeap.h" -#include "dol2asm.h" -#include "dolphin/os/OSCache.h" -#include "dolphin/gx/GX.h" -#include "dolphin/types.h" #include "MSL_C/MSL_Common/Src/string.h" +#include "dol2asm.h" +#include "dolphin/gx/GX.h" +#include "dolphin/os/OSCache.h" +#include "dolphin/types.h" // // External References: diff --git a/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp b/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp index 20b5ce966a9..63428b93a7e 100644 --- a/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp +++ b/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp @@ -778,8 +778,7 @@ u32 J3DShapeMtxConcatView::getType() const { } /* 80314798-803147E0 30F0D8 0048+00 1/0 0/0 0/0 .text __dt__11J3DShapeMtxFv */ -J3DShapeMtx::~J3DShapeMtx() { -} +J3DShapeMtx::~J3DShapeMtx() {} /* 803147E0-803147EC 30F120 000C+00 1/0 0/0 0/0 .text getType__11J3DShapeMtxCFv */ u32 J3DShapeMtx::getType() const { diff --git a/libs/JSystem/J3DGraphBase/J3DSys.cpp b/libs/JSystem/J3DGraphBase/J3DSys.cpp index 1a19fd9cd6d..482088b3c66 100644 --- a/libs/JSystem/J3DGraphBase/J3DSys.cpp +++ b/libs/JSystem/J3DGraphBase/J3DSys.cpp @@ -6,9 +6,9 @@ #include "JSystem/J3DGraphBase/J3DSys.h" #include "dol2asm.h" -#include "dolphin/types.h" #include "dolphin/gx/GXPixel.h" #include "dolphin/os/OS.h" +#include "dolphin/types.h" #include "JSystem/J3DGraphBase/J3DTevs.h" @@ -102,8 +102,13 @@ void J3DSys::loadNrmMtxIndx(int addr, u16 indx) const { /* 8030FF0C-803100BC 30A84C 01B0+00 1/1 0/0 0/0 .text setTexCacheRegion__6J3DSysF15_GXTexCacheSize */ void J3DSys::setTexCacheRegion(GXTexCacheSize size) { - const u32 kSize[] = { 0x00008000, 0x00020000, 0x00080000, 0x00000000, }; - const u32 kRegionNum[] = { 8, 4, 1, 0 }; + const u32 kSize[] = { + 0x00008000, + 0x00020000, + 0x00080000, + 0x00000000, + }; + const u32 kRegionNum[] = {8, 4, 1, 0}; u32 regionNum = kRegionNum[size]; mTexCacheRegionNum = regionNum; @@ -111,17 +116,23 @@ void J3DSys::setTexCacheRegion(GXTexCacheSize size) { if (!!(mFlags & 0x80000000)) { for (u32 i = 0; i < regionNum; i++) { if (!!(i & 1)) { - GXInitTexCacheRegion(&mTexCacheRegion[i], GX_FALSE, i * kSize[size] + 0x80000, size, i * kSize[size], size); - J3DFifoLoadTexCached((GXTexMapID) i, i * kSize[size] + 0x80000, size, i * kSize[size], size); + GXInitTexCacheRegion(&mTexCacheRegion[i], GX_FALSE, i * kSize[size] + 0x80000, size, + i * kSize[size], size); + J3DFifoLoadTexCached((GXTexMapID)i, i * kSize[size] + 0x80000, size, + i * kSize[size], size); } else { - GXInitTexCacheRegion(&mTexCacheRegion[i], GX_FALSE, i * kSize[size], size, i * kSize[size] + 0x80000, size); - J3DFifoLoadTexCached((GXTexMapID) i, i * kSize[size], size, i * kSize[size] + 0x80000, size); + GXInitTexCacheRegion(&mTexCacheRegion[i], GX_FALSE, i * kSize[size], size, + i * kSize[size] + 0x80000, size); + J3DFifoLoadTexCached((GXTexMapID)i, i * kSize[size], size, + i * kSize[size] + 0x80000, size); } } } else { for (u32 i = 0; i < regionNum; i++) { - GXInitTexCacheRegion(&mTexCacheRegion[i], GX_FALSE, i * kSize[size], size, i * kSize[size] + 0x80000, size); - J3DFifoLoadTexCached((GXTexMapID) i, i * kSize[size], size, i * kSize[size] + 0x80000, size); + GXInitTexCacheRegion(&mTexCacheRegion[i], GX_FALSE, i * kSize[size], size, + i * kSize[size] + 0x80000, size); + J3DFifoLoadTexCached((GXTexMapID)i, i * kSize[size], size, i * kSize[size] + 0x80000, + size); } } } @@ -133,9 +144,7 @@ SECTION_DATA static u8 NullTexData[16] = { /* 803CD8B0-803CD8E0 02A9D0 0030+00 1/1 0/0 0/0 .data j3dIdentityMtx */ SECTION_DATA static Mtx j3dIdentityMtx = { - 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, + 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, }; /* 803100BC-8031073C 30A9FC 0680+00 0/0 3/3 0/0 .text drawInit__6J3DSysFv */ @@ -188,8 +197,8 @@ void J3DSys::drawInit() { GXLoadTexMtxImm(j3dIdentityMtx, GX_TEXMTX0 + i * 3, GX_MTX3x4); Mtx23 indTexMtx = { - { 0.5f, 0.0f, 0.0f }, - { 0.0f, 0.5f, 0.0f }, + {0.5f, 0.0f, 0.0f}, + {0.0f, 0.5f, 0.0f}, }; u8 i; @@ -206,7 +215,9 @@ void J3DSys::drawInit() { GXSetChanCtrl(GX_COLOR1A1, GX_FALSE, GX_SRC_REG, GX_SRC_REG, 0, GX_DF_CLAMP, GX_AF_NONE); for (i = 0; i < GX_MAX_TEXMAP; i++) - GXSetTexCoordGen2((GXTexCoordID)i, (GXTexGenType) j3dDefaultTexCoordInfo[i].mTexGenType, (GXTexGenSrc) j3dDefaultTexCoordInfo[i].mTexGenSrc, j3dDefaultTexCoordInfo[i].mTexGenMtx, GX_FALSE, GX_PTIDENTITY); + GXSetTexCoordGen2((GXTexCoordID)i, (GXTexGenType)j3dDefaultTexCoordInfo[i].mTexGenType, + (GXTexGenSrc)j3dDefaultTexCoordInfo[i].mTexGenSrc, + j3dDefaultTexCoordInfo[i].mTexGenMtx, GX_FALSE, GX_PTIDENTITY); for (i = 0; i < GX_MAX_INDTEXSTAGE; i++) GXSetIndTexCoordScale((GXIndTexStageID)i, GX_ITS_1, GX_ITS_1); @@ -219,9 +230,11 @@ void J3DSys::drawInit() { for (i = 0; i < GX_MAX_TEVSTAGE; i++) { GXSetTevColorIn((GXTevStageID)i, GX_CC_RASC, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO); - GXSetTevColorOp((GXTevStageID)i, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetTevColorOp((GXTevStageID)i, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, + GX_TEVPREV); GXSetTevAlphaIn((GXTevStageID)i, GX_CA_RASA, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO); - GXSetTevAlphaOp((GXTevStageID)i, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetTevAlphaOp((GXTevStageID)i, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, + GX_TEVPREV); } for (i = 0; i < GX_MAX_TEVSTAGE; i++) @@ -233,7 +246,8 @@ void J3DSys::drawInit() { GXSetTevSwapModeTable(GX_TEV_SWAP3, GX_CH_BLUE, GX_CH_BLUE, GX_CH_BLUE, GX_CH_ALPHA); for (i = 0; i < GX_MAX_TEVSTAGE; i++) - GXSetTevIndirect((GXTevStageID)i, GX_INDTEXSTAGE0, GX_ITF_8, GX_ITB_NONE, GX_ITM_OFF, GX_ITW_OFF, GX_ITW_OFF, GX_FALSE, GX_FALSE, GX_ITBA_OFF); + GXSetTevIndirect((GXTevStageID)i, GX_INDTEXSTAGE0, GX_ITF_8, GX_ITB_NONE, GX_ITM_OFF, + GX_ITW_OFF, GX_ITW_OFF, GX_FALSE, GX_FALSE, GX_ITBA_OFF); OSInitFastCast(); setTexCacheRegion(GX_TEXCACHE_32K); diff --git a/libs/JSystem/J3DGraphBase/J3DTevs.cpp b/libs/JSystem/J3DGraphBase/J3DTevs.cpp index 6937f2988ea..b1c84c994e5 100644 --- a/libs/JSystem/J3DGraphBase/J3DTevs.cpp +++ b/libs/JSystem/J3DGraphBase/J3DTevs.cpp @@ -252,7 +252,7 @@ asm void loadTexNo(u32 param_0, u16 const& param_1) { /* 8032413C-80324160 31EA7C 0024+00 0/0 2/2 0/0 .text patchTexNo_PtrToIdx__FUlRCUs */ void patchTexNo_PtrToIdx(u32 texID, u16 const& idx) { - J3DGDSetTexImgPtrRaw((GXTexMapID) texID, idx); + J3DGDSetTexImgPtrRaw((GXTexMapID)texID, idx); } /* 80324160-80324194 31EAA0 0034+00 0/0 2/2 0/0 .text loadNBTScale__FR11J3DNBTScale */ @@ -277,14 +277,10 @@ COMPILER_STRIP_GATE(0x803A1EC8, &j3dDefaultLightInfo); /* 803A1EFC-803A1F1C 02E55C 0020+00 0/0 5/5 0/0 .rodata j3dDefaultTexCoordInfo */ SECTION_RODATA extern J3DDefaultTexCoordInfo const j3dDefaultTexCoordInfo[8] = { - { GX_MTX2x4, GX_TG_TEX0, GX_IDENTITY, 0 }, - { GX_MTX2x4, GX_TG_TEX1, GX_IDENTITY, 0 }, - { GX_MTX2x4, GX_TG_TEX2, GX_IDENTITY, 0 }, - { GX_MTX2x4, GX_TG_TEX3, GX_IDENTITY, 0 }, - { GX_MTX2x4, GX_TG_TEX4, GX_IDENTITY, 0 }, - { GX_MTX2x4, GX_TG_TEX5, GX_IDENTITY, 0 }, - { GX_MTX2x4, GX_TG_TEX6, GX_IDENTITY, 0 }, - { GX_MTX2x4, GX_TG_TEX7, GX_IDENTITY, 0 }, + {GX_MTX2x4, GX_TG_TEX0, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX1, GX_IDENTITY, 0}, + {GX_MTX2x4, GX_TG_TEX2, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX3, GX_IDENTITY, 0}, + {GX_MTX2x4, GX_TG_TEX4, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX5, GX_IDENTITY, 0}, + {GX_MTX2x4, GX_TG_TEX6, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX7, GX_IDENTITY, 0}, }; COMPILER_STRIP_GATE(0x803A1EFC, &j3dDefaultTexCoordInfo); @@ -456,7 +452,7 @@ static asm void J3DGDLoadPostTexMtxImm(f32 (*param_0)[4], u32 param_1) { /* ############################################################################################## */ /* 804563C0-804563C4 0049C0 0004+00 0/0 4/4 0/0 .sdata2 j3dDefaultColInfo */ -SECTION_SDATA2 extern GXColor j3dDefaultColInfo = { 0xFF, 0xFF, 0xFF, 0xFF }; +SECTION_SDATA2 extern GXColor j3dDefaultColInfo = {0xFF, 0xFF, 0xFF, 0xFF}; /* 804563C4-804563C8 0049C4 0004+00 0/0 2/2 0/0 .sdata2 j3dDefaultAmbInfo */ SECTION_SDATA2 extern u32 j3dDefaultAmbInfo = 0x32323232; @@ -471,7 +467,7 @@ SECTION_SDATA2 extern u32 j3dDefaultTevOrderInfoNull = 0xFFFFFF00; SECTION_SDATA2 extern u32 j3dDefaultIndTexOrderNull = 0xFFFF0000; /* 804563D4-804563D8 0049D4 0004+00 0/0 5/5 0/0 .sdata2 j3dDefaultTevColor */ -SECTION_SDATA2 extern GXColorS10 j3dDefaultTevColor = { 0xFF, 0xFF, 0xFF, 0xFF }; +SECTION_SDATA2 extern GXColorS10 j3dDefaultTevColor = {0xFF, 0xFF, 0xFF, 0xFF}; /* 804563DC-804563E0 0049DC 0004+00 0/0 2/2 0/0 .sdata2 j3dDefaultIndTexCoordScaleInfo */ SECTION_SDATA2 extern u8 j3dDefaultIndTexCoordScaleInfo[4] = { @@ -482,7 +478,7 @@ SECTION_SDATA2 extern u8 j3dDefaultIndTexCoordScaleInfo[4] = { }; /* 804563E0-804563E4 0049E0 0004+00 0/0 5/5 0/0 .sdata2 j3dDefaultTevKColor */ -SECTION_SDATA2 extern GXColor j3dDefaultTevKColor = { 0xFF, 0xFF, 0xFF, 0xFF }; +SECTION_SDATA2 extern GXColor j3dDefaultTevKColor = {0xFF, 0xFF, 0xFF, 0xFF}; /* 804563E4-804563E8 0049E4 0004+00 0/0 2/2 0/0 .sdata2 j3dDefaultTevSwapMode */ SECTION_SDATA2 extern u8 j3dDefaultTevSwapMode[4] = { diff --git a/libs/JSystem/J3DGraphBase/J3DTexture.cpp b/libs/JSystem/J3DGraphBase/J3DTexture.cpp index c82c307b8aa..634f17fc5d4 100644 --- a/libs/JSystem/J3DGraphBase/J3DTexture.cpp +++ b/libs/JSystem/J3DGraphBase/J3DTexture.cpp @@ -14,23 +14,25 @@ void J3DTexture::loadGX(u16 idx, GXTexMapID texMapID) const { if (!timg->palettesEnabled) { GXInitTexObj(&texObj, ((u8*)timg) + timg->texDataOffset, timg->width, timg->height, - (GXTexFmt)timg->format, (GXTexWrapMode)timg->wrapS, (GXTexWrapMode)timg->wrapT, - (GXBool)timg->mipmapEnabled); + (GXTexFmt)timg->format, (GXTexWrapMode)timg->wrapS, (GXTexWrapMode)timg->wrapT, + (GXBool)timg->mipmapEnabled); } else { GXTlutObj tlutObj; GXInitTexObjCI(&texObj, ((u8*)timg) + timg->texDataOffset, timg->width, timg->height, - (GXCITexFmt)timg->format, (GXTexWrapMode)timg->wrapS, (GXTexWrapMode)timg->wrapT, - (GXBool)timg->mipmapEnabled, (u32)texMapID); - GXInitTlutObj(&tlutObj, ((u8*)timg) + timg->paletteOffset, (GXTlutFmt)timg->paletteFormat, timg->paletteCount); + (GXCITexFmt)timg->format, (GXTexWrapMode)timg->wrapS, + (GXTexWrapMode)timg->wrapT, (GXBool)timg->mipmapEnabled, (u32)texMapID); + GXInitTlutObj(&tlutObj, ((u8*)timg) + timg->paletteOffset, (GXTlutFmt)timg->paletteFormat, + timg->paletteCount); GXLoadTlut(&tlutObj, texMapID); } const f32 kLODClampScale = 1.0f / 8.0f; const f32 kLODBiasScale = 1.0f / 100.0f; - GXInitTexObjLOD(&texObj, (GXTexFilter) timg->minFilter, (GXTexFilter) timg->magFilter, - timg->minLOD * kLODClampScale, timg->maxLOD * kLODClampScale, timg->LODBias * kLODBiasScale, - (GXBool) timg->biasClamp, (GXBool) timg->doEdgeLOD, (GXAnisotropy) timg->maxAnisotropy); + GXInitTexObjLOD(&texObj, (GXTexFilter)timg->minFilter, (GXTexFilter)timg->magFilter, + timg->minLOD * kLODClampScale, timg->maxLOD * kLODClampScale, + timg->LODBias * kLODBiasScale, (GXBool)timg->biasClamp, (GXBool)timg->doEdgeLOD, + (GXAnisotropy)timg->maxAnisotropy); GXLoadTexObj(&texObj, texMapID); } diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index 000db8ec11c..fa74ecb42d3 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -4,144 +4,11 @@ // #include "d/d_name.h" +#include "JSystem/J2DGraph/J2DAnmLoader.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Types: -// - -struct mDoCPd_c { - static u8 m_cpadInfo[256]; -}; - -struct J2DPane {}; - -struct JKRArchive {}; - -struct dSelect_cursor_c { - /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); - /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); - /* 801951B0 */ void setParam(f32, f32, f32, f32, f32); - /* 801952A0 */ void setAlphaRate(f32); -}; - -struct dNm_HIO_c { - /* 8024E3E0 */ dNm_HIO_c(); - /* 802511A4 */ ~dNm_HIO_c(); -}; - -struct dName_c { - /* 8024E408 */ dName_c(J2DPane*); - /* 8024E468 */ ~dName_c(); - /* 8024E62C */ void _create(); - /* 8024E6D4 */ void init(); - /* 8024E7A4 */ void initial(); - /* 8024E7EC */ void showIcon(); - /* 8024E9A0 */ void _move(); - /* 8024EC10 */ void nameCheck(); - /* 8024EC4C */ void playNameSet(int); - /* 8024EC84 */ void cursorAnm(); - /* 8024ED48 */ void Wait(); - /* 8024ED4C */ void MojiSelect(); - /* 8024F034 */ void MojiSelectAnmInit(); - /* 8024F0E0 */ void MojiSelectAnm(); - /* 8024F164 */ void MojiSelectAnm2(); - /* 8024F1E8 */ void MojiSelectAnm3(); - /* 8024F1EC */ void mojiChange(u8); - /* 8024F55C */ void selectMojiSet(); - /* 8024F59C */ void getMoji(); - /* 8024F634 */ void setMoji(int); - /* 8024F88C */ void setNameText(); - /* 8024F914 */ void nameCursorMove(); - /* 8024F994 */ void selectCursorMove(); - /* 8024FAF4 */ void menuCursorPosSet(); - /* 8024FB08 */ void MenuSelect(); - /* 8024FDA0 */ void MenuSelectAnmInit(); - /* 8024FDF4 */ void MenuSelectAnm(); - /* 8024FEB4 */ void MenuSelectAnm2(); - /* 8024FFA0 */ void MenuSelectAnm3(); - /* 8024FFA4 */ void menuAbtnSelect(); - /* 80250074 */ void backSpace(); - /* 802501B0 */ void mojiListChange(); - /* 80250284 */ void menuCursorMove(); - /* 80250380 */ void menuCursorMove2(); - /* 802504A0 */ void selectCursorPosSet(int); - /* 80250560 */ void _draw(); - /* 802505CC */ void screenSet(); - /* 80250CEC */ void displayInit(); - /* 80250E54 */ void NameStrSet(); - /* 80251048 */ void getMenuPosIdx(u8); -}; - -struct dDlst_base_c {}; - -struct dDlst_list_c { - /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); -}; - -struct dDlst_NameIN_c { - /* 80251094 */ void draw(); - /* 8025115C */ ~dDlst_NameIN_c(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct STControl { - /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16); - /* 8003219C */ void checkTrigger(); - /* 8003242C */ void checkLeftTrigger(); - /* 800324A8 */ void checkRightTrigger(); - /* 80032524 */ void checkUpTrigger(); - /* 800325A0 */ void checkDownTrigger(); -}; - -struct JKRFileLoader { - /* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*); -}; - -struct JKRExpHeap {}; - -struct J2DTextBox { - /* 80300658 */ void getStringPtr() const; - /* 80300660 */ void setString(char const*, ...); - /* 8030074C */ void setString(s16, char const*, ...); -}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); - /* 802F9690 */ void animation(); -}; - -struct J2DAnmLoaderDataBase { - /* 80308A6C */ void load(void const*); -}; - -struct CPaneMgrAlpha { - /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802555C8 */ void show(); - /* 80255608 */ void hide(); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802547CC */ void scaleAnime(s16, f32, f32, u8); - /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); -}; +#include "f_op/f_op_msg_mng.h" +#include "m_Do/m_Do_audio.h" // // Forward References: @@ -231,9 +98,6 @@ extern "C" void getStringPtr__10J2DTextBoxCFv(); extern "C" void setString__10J2DTextBoxFPCce(); extern "C" void setString__10J2DTextBoxFsPCce(); extern "C" void load__20J2DAnmLoaderDataBaseFPCv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXScale(); extern "C" void __register_global_object(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_19(); @@ -248,866 +112,90 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void sprintf(); -extern "C" void strcat(); -extern "C" void strcpy(); extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // // Declarations: // -/* ############################################################################################## */ -/* 80399CC8-80399CC8 026328 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399CC8 = "あ"; -SECTION_DEAD static char const* const stringBase_80399CCB = "い"; -SECTION_DEAD static char const* const stringBase_80399CCE = "う"; -SECTION_DEAD static char const* const stringBase_80399CD1 = "え"; -SECTION_DEAD static char const* const stringBase_80399CD4 = "お"; -SECTION_DEAD static char const* const stringBase_80399CD7 = "か"; -SECTION_DEAD static char const* const stringBase_80399CDA = "き"; -SECTION_DEAD static char const* const stringBase_80399CDD = "く"; -SECTION_DEAD static char const* const stringBase_80399CE0 = "け"; -SECTION_DEAD static char const* const stringBase_80399CE3 = "こ"; -SECTION_DEAD static char const* const stringBase_80399CE6 = "さ"; -SECTION_DEAD static char const* const stringBase_80399CE9 = "し"; -SECTION_DEAD static char const* const stringBase_80399CEC = "す"; -SECTION_DEAD static char const* const stringBase_80399CEF = "せ"; -SECTION_DEAD static char const* const stringBase_80399CF2 = "そ"; -SECTION_DEAD static char const* const stringBase_80399CF5 = "た"; -SECTION_DEAD static char const* const stringBase_80399CF8 = "ち"; -SECTION_DEAD static char const* const stringBase_80399CFB = "つ"; -SECTION_DEAD static char const* const stringBase_80399CFE = "て"; -SECTION_DEAD static char const* const stringBase_80399D01 = "と"; -SECTION_DEAD static char const* const stringBase_80399D04 = "な"; -SECTION_DEAD static char const* const stringBase_80399D07 = "に"; -SECTION_DEAD static char const* const stringBase_80399D0A = "ぬ"; -SECTION_DEAD static char const* const stringBase_80399D0D = "ね"; -SECTION_DEAD static char const* const stringBase_80399D10 = "の"; -SECTION_DEAD static char const* const stringBase_80399D13 = "は"; -SECTION_DEAD static char const* const stringBase_80399D16 = "ひ"; -SECTION_DEAD static char const* const stringBase_80399D19 = "ふ"; -SECTION_DEAD static char const* const stringBase_80399D1C = "へ"; -SECTION_DEAD static char const* const stringBase_80399D1F = "ほ"; -SECTION_DEAD static char const* const stringBase_80399D22 = "ま"; -SECTION_DEAD static char const* const stringBase_80399D25 = "み"; -SECTION_DEAD static char const* const stringBase_80399D28 = "む"; -SECTION_DEAD static char const* const stringBase_80399D2B = "め"; -SECTION_DEAD static char const* const stringBase_80399D2E = "も"; -SECTION_DEAD static char const* const stringBase_80399D31 = "や"; -SECTION_DEAD static char const* const stringBase_80399D34 = "　"; -SECTION_DEAD static char const* const stringBase_80399D37 = "ゆ"; -SECTION_DEAD static char const* const stringBase_80399D3A = "よ"; -SECTION_DEAD static char const* const stringBase_80399D3D = "ら"; -SECTION_DEAD static char const* const stringBase_80399D40 = "り"; -SECTION_DEAD static char const* const stringBase_80399D43 = "る"; -SECTION_DEAD static char const* const stringBase_80399D46 = "れ"; -SECTION_DEAD static char const* const stringBase_80399D49 = "ろ"; -SECTION_DEAD static char const* const stringBase_80399D4C = "わ"; -SECTION_DEAD static char const* const stringBase_80399D4F = "を"; -SECTION_DEAD static char const* const stringBase_80399D52 = "ん"; -SECTION_DEAD static char const* const stringBase_80399D55 = "ぁ"; -SECTION_DEAD static char const* const stringBase_80399D58 = "ぃ"; -SECTION_DEAD static char const* const stringBase_80399D5B = "ぅ"; -SECTION_DEAD static char const* const stringBase_80399D5E = "ぇ"; -SECTION_DEAD static char const* const stringBase_80399D61 = "ぉ"; -SECTION_DEAD static char const* const stringBase_80399D64 = "ゃ"; -SECTION_DEAD static char const* const stringBase_80399D67 = "ゅ"; -SECTION_DEAD static char const* const stringBase_80399D6A = "ょ"; -SECTION_DEAD static char const* const stringBase_80399D6D = "っ"; -SECTION_DEAD static char const* const stringBase_80399D70 = "ー"; -SECTION_DEAD static char const* const stringBase_80399D73 = "゛"; -SECTION_DEAD static char const* const stringBase_80399D76 = "゜"; -SECTION_DEAD static char const* const stringBase_80399D79 = "￥"; -SECTION_DEAD static char const* const stringBase_80399D7C = "が"; -SECTION_DEAD static char const* const stringBase_80399D7F = "ぎ"; -SECTION_DEAD static char const* const stringBase_80399D82 = "ぐ"; -SECTION_DEAD static char const* const stringBase_80399D85 = "げ"; -SECTION_DEAD static char const* const stringBase_80399D88 = "ご"; -SECTION_DEAD static char const* const stringBase_80399D8B = "ざ"; -SECTION_DEAD static char const* const stringBase_80399D8E = "じ"; -SECTION_DEAD static char const* const stringBase_80399D91 = "ず"; -SECTION_DEAD static char const* const stringBase_80399D94 = "ぜ"; -SECTION_DEAD static char const* const stringBase_80399D97 = "ぞ"; -SECTION_DEAD static char const* const stringBase_80399D9A = "だ"; -SECTION_DEAD static char const* const stringBase_80399D9D = "ぢ"; -SECTION_DEAD static char const* const stringBase_80399DA0 = "づ"; -SECTION_DEAD static char const* const stringBase_80399DA3 = "で"; -SECTION_DEAD static char const* const stringBase_80399DA6 = "ど"; -SECTION_DEAD static char const* const stringBase_80399DA9 = "ば"; -SECTION_DEAD static char const* const stringBase_80399DAC = "び"; -SECTION_DEAD static char const* const stringBase_80399DAF = "ぶ"; -SECTION_DEAD static char const* const stringBase_80399DB2 = "べ"; -SECTION_DEAD static char const* const stringBase_80399DB5 = "ぼ"; -SECTION_DEAD static char const* const stringBase_80399DB8 = "ぱ"; -SECTION_DEAD static char const* const stringBase_80399DBB = "ぴ"; -SECTION_DEAD static char const* const stringBase_80399DBE = "ぷ"; -SECTION_DEAD static char const* const stringBase_80399DC1 = "ぺ"; -SECTION_DEAD static char const* const stringBase_80399DC4 = "ぽ"; -SECTION_DEAD static char const* const stringBase_80399DC7 = "ア"; -SECTION_DEAD static char const* const stringBase_80399DCA = "イ"; -SECTION_DEAD static char const* const stringBase_80399DCD = "ウ"; -SECTION_DEAD static char const* const stringBase_80399DD0 = "エ"; -SECTION_DEAD static char const* const stringBase_80399DD3 = "オ"; -SECTION_DEAD static char const* const stringBase_80399DD6 = "カ"; -SECTION_DEAD static char const* const stringBase_80399DD9 = "キ"; -SECTION_DEAD static char const* const stringBase_80399DDC = "ク"; -SECTION_DEAD static char const* const stringBase_80399DDF = "ケ"; -SECTION_DEAD static char const* const stringBase_80399DE2 = "コ"; -SECTION_DEAD static char const* const stringBase_80399DE5 = "サ"; -SECTION_DEAD static char const* const stringBase_80399DE8 = "シ"; -SECTION_DEAD static char const* const stringBase_80399DEB = "ス"; -SECTION_DEAD static char const* const stringBase_80399DEE = "セ"; -// MWCC ignores mapping of some japanese characters using the -// byte 0x5C (ASCII '\'). This is why this string is hex-encoded. -SECTION_DEAD static char const* const stringBase_80399DF1 = "\x83\x5C"; -SECTION_DEAD static char const* const stringBase_80399DF4 = "タ"; -SECTION_DEAD static char const* const stringBase_80399DF7 = "チ"; -SECTION_DEAD static char const* const stringBase_80399DFA = "ツ"; -SECTION_DEAD static char const* const stringBase_80399DFD = "テ"; -SECTION_DEAD static char const* const stringBase_80399E00 = "ト"; -SECTION_DEAD static char const* const stringBase_80399E03 = "ナ"; -SECTION_DEAD static char const* const stringBase_80399E06 = "ニ"; -SECTION_DEAD static char const* const stringBase_80399E09 = "ヌ"; -SECTION_DEAD static char const* const stringBase_80399E0C = "ネ"; -SECTION_DEAD static char const* const stringBase_80399E0F = "ノ"; -SECTION_DEAD static char const* const stringBase_80399E12 = "ハ"; -SECTION_DEAD static char const* const stringBase_80399E15 = "ヒ"; -SECTION_DEAD static char const* const stringBase_80399E18 = "フ"; -SECTION_DEAD static char const* const stringBase_80399E1B = "ヘ"; -SECTION_DEAD static char const* const stringBase_80399E1E = "ホ"; -SECTION_DEAD static char const* const stringBase_80399E21 = "マ"; -SECTION_DEAD static char const* const stringBase_80399E24 = "ミ"; -SECTION_DEAD static char const* const stringBase_80399E27 = "ム"; -SECTION_DEAD static char const* const stringBase_80399E2A = "メ"; -SECTION_DEAD static char const* const stringBase_80399E2D = "モ"; -SECTION_DEAD static char const* const stringBase_80399E30 = "ヤ"; -SECTION_DEAD static char const* const stringBase_80399E33 = "ユ"; -SECTION_DEAD static char const* const stringBase_80399E36 = "ヨ"; -SECTION_DEAD static char const* const stringBase_80399E39 = "ラ"; -SECTION_DEAD static char const* const stringBase_80399E3C = "リ"; -SECTION_DEAD static char const* const stringBase_80399E3F = "ル"; -SECTION_DEAD static char const* const stringBase_80399E42 = "レ"; -SECTION_DEAD static char const* const stringBase_80399E45 = "ロ"; -SECTION_DEAD static char const* const stringBase_80399E48 = "ワ"; -SECTION_DEAD static char const* const stringBase_80399E4B = "ヲ"; -SECTION_DEAD static char const* const stringBase_80399E4E = "ン"; -SECTION_DEAD static char const* const stringBase_80399E51 = "ァ"; -SECTION_DEAD static char const* const stringBase_80399E54 = "ィ"; -SECTION_DEAD static char const* const stringBase_80399E57 = "ゥ"; -SECTION_DEAD static char const* const stringBase_80399E5A = "ェ"; -SECTION_DEAD static char const* const stringBase_80399E5D = "ォ"; -SECTION_DEAD static char const* const stringBase_80399E60 = "ャ"; -SECTION_DEAD static char const* const stringBase_80399E63 = "ュ"; -SECTION_DEAD static char const* const stringBase_80399E66 = "ョ"; -SECTION_DEAD static char const* const stringBase_80399E69 = "ッ"; -SECTION_DEAD static char const* const stringBase_80399E6C = "ヴ"; -SECTION_DEAD static char const* const stringBase_80399E6F = "ガ"; -SECTION_DEAD static char const* const stringBase_80399E72 = "ギ"; -SECTION_DEAD static char const* const stringBase_80399E75 = "グ"; -SECTION_DEAD static char const* const stringBase_80399E78 = "ゲ"; -SECTION_DEAD static char const* const stringBase_80399E7B = "ゴ"; -SECTION_DEAD static char const* const stringBase_80399E7E = "ザ"; -SECTION_DEAD static char const* const stringBase_80399E81 = "ジ"; -SECTION_DEAD static char const* const stringBase_80399E84 = "ズ"; -SECTION_DEAD static char const* const stringBase_80399E87 = "ゼ"; -SECTION_DEAD static char const* const stringBase_80399E8A = "ゾ"; -SECTION_DEAD static char const* const stringBase_80399E8D = "ダ"; -SECTION_DEAD static char const* const stringBase_80399E90 = "ヂ"; -SECTION_DEAD static char const* const stringBase_80399E93 = "ヅ"; -SECTION_DEAD static char const* const stringBase_80399E96 = "デ"; -SECTION_DEAD static char const* const stringBase_80399E99 = "ド"; -SECTION_DEAD static char const* const stringBase_80399E9C = "バ"; -SECTION_DEAD static char const* const stringBase_80399E9F = "ビ"; -SECTION_DEAD static char const* const stringBase_80399EA2 = "ブ"; -SECTION_DEAD static char const* const stringBase_80399EA5 = "ベ"; -SECTION_DEAD static char const* const stringBase_80399EA8 = "ボ"; -SECTION_DEAD static char const* const stringBase_80399EAB = "パ"; -SECTION_DEAD static char const* const stringBase_80399EAE = "ピ"; -SECTION_DEAD static char const* const stringBase_80399EB1 = "プ"; -SECTION_DEAD static char const* const stringBase_80399EB4 = "ペ"; -SECTION_DEAD static char const* const stringBase_80399EB7 = "ポ"; -SECTION_DEAD static char const* const stringBase_80399EBA = "A"; -SECTION_DEAD static char const* const stringBase_80399EBC = "N"; -SECTION_DEAD static char const* const stringBase_80399EBE = "a"; -SECTION_DEAD static char const* const stringBase_80399EC0 = "n"; -SECTION_DEAD static char const* const stringBase_80399EC2 = "1"; -SECTION_DEAD static char const* const stringBase_80399EC4 = "B"; -SECTION_DEAD static char const* const stringBase_80399EC6 = "O"; -SECTION_DEAD static char const* const stringBase_80399EC8 = "b"; -SECTION_DEAD static char const* const stringBase_80399ECA = "o"; -SECTION_DEAD static char const* const stringBase_80399ECC = "2"; -SECTION_DEAD static char const* const stringBase_80399ECE = "C"; -SECTION_DEAD static char const* const stringBase_80399ED0 = "P"; -SECTION_DEAD static char const* const stringBase_80399ED2 = "c"; -SECTION_DEAD static char const* const stringBase_80399ED4 = "p"; -SECTION_DEAD static char const* const stringBase_80399ED6 = "3"; -SECTION_DEAD static char const* const stringBase_80399ED8 = "D"; -SECTION_DEAD static char const* const stringBase_80399EDA = "Q"; -SECTION_DEAD static char const* const stringBase_80399EDC = "d"; -SECTION_DEAD static char const* const stringBase_80399EDE = "q"; -SECTION_DEAD static char const* const stringBase_80399EE0 = "4"; -SECTION_DEAD static char const* const stringBase_80399EE2 = "E"; -SECTION_DEAD static char const* const stringBase_80399EE4 = "R"; -SECTION_DEAD static char const* const stringBase_80399EE6 = "e"; -SECTION_DEAD static char const* const stringBase_80399EE8 = "r"; -SECTION_DEAD static char const* const stringBase_80399EEA = "5"; -SECTION_DEAD static char const* const stringBase_80399EEC = "F"; -SECTION_DEAD static char const* const stringBase_80399EEE = "S"; -SECTION_DEAD static char const* const stringBase_80399EF0 = "f"; -SECTION_DEAD static char const* const stringBase_80399EF2 = "s"; -SECTION_DEAD static char const* const stringBase_80399EF4 = "6"; -SECTION_DEAD static char const* const stringBase_80399EF6 = "G"; -SECTION_DEAD static char const* const stringBase_80399EF8 = "T"; -SECTION_DEAD static char const* const stringBase_80399EFA = "g"; -SECTION_DEAD static char const* const stringBase_80399EFC = "t"; -SECTION_DEAD static char const* const stringBase_80399EFE = "7"; -SECTION_DEAD static char const* const stringBase_80399F00 = "H"; -SECTION_DEAD static char const* const stringBase_80399F02 = "U"; -SECTION_DEAD static char const* const stringBase_80399F04 = "h"; -SECTION_DEAD static char const* const stringBase_80399F06 = "u"; -SECTION_DEAD static char const* const stringBase_80399F08 = "8"; -SECTION_DEAD static char const* const stringBase_80399F0A = "I"; -SECTION_DEAD static char const* const stringBase_80399F0C = "V"; -SECTION_DEAD static char const* const stringBase_80399F0E = "i"; -SECTION_DEAD static char const* const stringBase_80399F10 = "v"; -SECTION_DEAD static char const* const stringBase_80399F12 = "9"; -SECTION_DEAD static char const* const stringBase_80399F14 = "J"; -SECTION_DEAD static char const* const stringBase_80399F16 = "W"; -SECTION_DEAD static char const* const stringBase_80399F18 = "j"; -SECTION_DEAD static char const* const stringBase_80399F1A = "w"; -SECTION_DEAD static char const* const stringBase_80399F1C = "0"; -SECTION_DEAD static char const* const stringBase_80399F1E = "K"; -SECTION_DEAD static char const* const stringBase_80399F20 = "X"; -SECTION_DEAD static char const* const stringBase_80399F22 = "k"; -SECTION_DEAD static char const* const stringBase_80399F24 = "x"; -SECTION_DEAD static char const* const stringBase_80399F26 = ","; -SECTION_DEAD static char const* const stringBase_80399F28 = "L"; -SECTION_DEAD static char const* const stringBase_80399F2A = "Y"; -SECTION_DEAD static char const* const stringBase_80399F2C = "l"; -SECTION_DEAD static char const* const stringBase_80399F2E = "y"; -SECTION_DEAD static char const* const stringBase_80399F30 = "."; -SECTION_DEAD static char const* const stringBase_80399F32 = "M"; -SECTION_DEAD static char const* const stringBase_80399F34 = "Z"; -SECTION_DEAD static char const* const stringBase_80399F36 = "m"; -SECTION_DEAD static char const* const stringBase_80399F38 = "z"; -SECTION_DEAD static char const* const stringBase_80399F3A = " "; -#pragma pop - /* 803C1F50-803C1F5C 01F070 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 803C1F5C-803C2060 -00001 0104+00 0/3 0/0 0/0 .data l_mojiHira */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_mojiHira[65] = { - (void*)&d_d_name__stringBase0, - (void*)(((char*)&d_d_name__stringBase0) + 0x3), - (void*)(((char*)&d_d_name__stringBase0) + 0x6), - (void*)(((char*)&d_d_name__stringBase0) + 0x9), - (void*)(((char*)&d_d_name__stringBase0) + 0xC), - (void*)(((char*)&d_d_name__stringBase0) + 0xF), - (void*)(((char*)&d_d_name__stringBase0) + 0x12), - (void*)(((char*)&d_d_name__stringBase0) + 0x15), - (void*)(((char*)&d_d_name__stringBase0) + 0x18), - (void*)(((char*)&d_d_name__stringBase0) + 0x1B), - (void*)(((char*)&d_d_name__stringBase0) + 0x1E), - (void*)(((char*)&d_d_name__stringBase0) + 0x21), - (void*)(((char*)&d_d_name__stringBase0) + 0x24), - (void*)(((char*)&d_d_name__stringBase0) + 0x27), - (void*)(((char*)&d_d_name__stringBase0) + 0x2A), - (void*)(((char*)&d_d_name__stringBase0) + 0x2D), - (void*)(((char*)&d_d_name__stringBase0) + 0x30), - (void*)(((char*)&d_d_name__stringBase0) + 0x33), - (void*)(((char*)&d_d_name__stringBase0) + 0x36), - (void*)(((char*)&d_d_name__stringBase0) + 0x39), - (void*)(((char*)&d_d_name__stringBase0) + 0x3C), - (void*)(((char*)&d_d_name__stringBase0) + 0x3F), - (void*)(((char*)&d_d_name__stringBase0) + 0x42), - (void*)(((char*)&d_d_name__stringBase0) + 0x45), - (void*)(((char*)&d_d_name__stringBase0) + 0x48), - (void*)(((char*)&d_d_name__stringBase0) + 0x4B), - (void*)(((char*)&d_d_name__stringBase0) + 0x4E), - (void*)(((char*)&d_d_name__stringBase0) + 0x51), - (void*)(((char*)&d_d_name__stringBase0) + 0x54), - (void*)(((char*)&d_d_name__stringBase0) + 0x57), - (void*)(((char*)&d_d_name__stringBase0) + 0x5A), - (void*)(((char*)&d_d_name__stringBase0) + 0x5D), - (void*)(((char*)&d_d_name__stringBase0) + 0x60), - (void*)(((char*)&d_d_name__stringBase0) + 0x63), - (void*)(((char*)&d_d_name__stringBase0) + 0x66), - (void*)(((char*)&d_d_name__stringBase0) + 0x69), - (void*)(((char*)&d_d_name__stringBase0) + 0x6C), - (void*)(((char*)&d_d_name__stringBase0) + 0x6F), - (void*)(((char*)&d_d_name__stringBase0) + 0x6C), - (void*)(((char*)&d_d_name__stringBase0) + 0x72), - (void*)(((char*)&d_d_name__stringBase0) + 0x75), - (void*)(((char*)&d_d_name__stringBase0) + 0x78), - (void*)(((char*)&d_d_name__stringBase0) + 0x7B), - (void*)(((char*)&d_d_name__stringBase0) + 0x7E), - (void*)(((char*)&d_d_name__stringBase0) + 0x81), - (void*)(((char*)&d_d_name__stringBase0) + 0x84), - (void*)(((char*)&d_d_name__stringBase0) + 0x6C), - (void*)(((char*)&d_d_name__stringBase0) + 0x87), - (void*)(((char*)&d_d_name__stringBase0) + 0x6C), - (void*)(((char*)&d_d_name__stringBase0) + 0x8A), - (void*)(((char*)&d_d_name__stringBase0) + 0x8D), - (void*)(((char*)&d_d_name__stringBase0) + 0x90), - (void*)(((char*)&d_d_name__stringBase0) + 0x93), - (void*)(((char*)&d_d_name__stringBase0) + 0x96), - (void*)(((char*)&d_d_name__stringBase0) + 0x99), - (void*)(((char*)&d_d_name__stringBase0) + 0x9C), - (void*)(((char*)&d_d_name__stringBase0) + 0x6C), - (void*)(((char*)&d_d_name__stringBase0) + 0x9F), - (void*)(((char*)&d_d_name__stringBase0) + 0x6C), - (void*)(((char*)&d_d_name__stringBase0) + 0xA2), - (void*)(((char*)&d_d_name__stringBase0) + 0xA5), - (void*)(((char*)&d_d_name__stringBase0) + 0x6C), - (void*)(((char*)&d_d_name__stringBase0) + 0xA8), - (void*)(((char*)&d_d_name__stringBase0) + 0xAB), - (void*)(((char*)&d_d_name__stringBase0) + 0xAE), +SECTION_DATA static char* l_mojiHira[65] = { + "あ", "い", "う", "え", "お", "か", "き", "く", "け", "こ", "さ", "し", "す", + "せ", "そ", "た", "ち", "つ", "て", "と", "な", "に", "ぬ", "ね", "の", "は", + "ひ", "ふ", "へ", "ほ", "ま", "み", "む", "め", "も", "や", "　", "ゆ", "　", + "よ", "ら", "り", "る", "れ", "ろ", "わ", "　", "を", "　", "ん", "ぁ", "ぃ", + "ぅ", "ぇ", "ぉ", "ゃ", "　", "ゅ", "　", "ょ", "っ", "　", "ー", "゛", "゜", }; -#pragma pop /* 803C2060-803C2164 -00001 0104+00 0/1 0/0 0/0 .data l_mojiHira2 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_mojiHira2[65] = { - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB4), - (void*)(((char*)&d_d_name__stringBase0) + 0xB7), - (void*)(((char*)&d_d_name__stringBase0) + 0xBA), - (void*)(((char*)&d_d_name__stringBase0) + 0xBD), - (void*)(((char*)&d_d_name__stringBase0) + 0xC0), - (void*)(((char*)&d_d_name__stringBase0) + 0xC3), - (void*)(((char*)&d_d_name__stringBase0) + 0xC6), - (void*)(((char*)&d_d_name__stringBase0) + 0xC9), - (void*)(((char*)&d_d_name__stringBase0) + 0xCC), - (void*)(((char*)&d_d_name__stringBase0) + 0xCF), - (void*)(((char*)&d_d_name__stringBase0) + 0xD2), - (void*)(((char*)&d_d_name__stringBase0) + 0xD5), - (void*)(((char*)&d_d_name__stringBase0) + 0xD8), - (void*)(((char*)&d_d_name__stringBase0) + 0xDB), - (void*)(((char*)&d_d_name__stringBase0) + 0xDE), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xE1), - (void*)(((char*)&d_d_name__stringBase0) + 0xE4), - (void*)(((char*)&d_d_name__stringBase0) + 0xE7), - (void*)(((char*)&d_d_name__stringBase0) + 0xEA), - (void*)(((char*)&d_d_name__stringBase0) + 0xED), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), +SECTION_DATA static char* l_mojiHira2[65] = { + "￥", "￥", "￥", "￥", "￥", "が", "ぎ", "ぐ", "げ", "ご", "ざ", "じ", "ず", + "ぜ", "ぞ", "だ", "ぢ", "づ", "で", "ど", "￥", "￥", "￥", "￥", "￥", "ば", + "び", "ぶ", "べ", "ぼ", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", + "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", + "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", }; -#pragma pop /* 803C2164-803C2268 -00001 0104+00 0/1 0/0 0/0 .data l_mojiHira3 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_mojiHira3[65] = { - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xF0), - (void*)(((char*)&d_d_name__stringBase0) + 0xF3), - (void*)(((char*)&d_d_name__stringBase0) + 0xF6), - (void*)(((char*)&d_d_name__stringBase0) + 0xF9), - (void*)(((char*)&d_d_name__stringBase0) + 0xFC), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), +SECTION_DATA static char* l_mojiHira3[65] = { + "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", + "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "ぱ", + "ぴ", "ぷ", "ぺ", "ぽ", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", + "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", + "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", }; -#pragma pop /* 803C2268-803C236C -00001 0104+00 0/3 0/0 0/0 .data l_mojikata */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_mojikata[65] = { - (void*)(((char*)&d_d_name__stringBase0) + 0xFF), - (void*)(((char*)&d_d_name__stringBase0) + 0x102), - (void*)(((char*)&d_d_name__stringBase0) + 0x105), - (void*)(((char*)&d_d_name__stringBase0) + 0x108), - (void*)(((char*)&d_d_name__stringBase0) + 0x10B), - (void*)(((char*)&d_d_name__stringBase0) + 0x10E), - (void*)(((char*)&d_d_name__stringBase0) + 0x111), - (void*)(((char*)&d_d_name__stringBase0) + 0x114), - (void*)(((char*)&d_d_name__stringBase0) + 0x117), - (void*)(((char*)&d_d_name__stringBase0) + 0x11A), - (void*)(((char*)&d_d_name__stringBase0) + 0x11D), - (void*)(((char*)&d_d_name__stringBase0) + 0x120), - (void*)(((char*)&d_d_name__stringBase0) + 0x123), - (void*)(((char*)&d_d_name__stringBase0) + 0x126), - (void*)(((char*)&d_d_name__stringBase0) + 0x129), - (void*)(((char*)&d_d_name__stringBase0) + 0x12C), - (void*)(((char*)&d_d_name__stringBase0) + 0x12F), - (void*)(((char*)&d_d_name__stringBase0) + 0x132), - (void*)(((char*)&d_d_name__stringBase0) + 0x135), - (void*)(((char*)&d_d_name__stringBase0) + 0x138), - (void*)(((char*)&d_d_name__stringBase0) + 0x13B), - (void*)(((char*)&d_d_name__stringBase0) + 0x13E), - (void*)(((char*)&d_d_name__stringBase0) + 0x141), - (void*)(((char*)&d_d_name__stringBase0) + 0x144), - (void*)(((char*)&d_d_name__stringBase0) + 0x147), - (void*)(((char*)&d_d_name__stringBase0) + 0x14A), - (void*)(((char*)&d_d_name__stringBase0) + 0x14D), - (void*)(((char*)&d_d_name__stringBase0) + 0x150), - (void*)(((char*)&d_d_name__stringBase0) + 0x153), - (void*)(((char*)&d_d_name__stringBase0) + 0x156), - (void*)(((char*)&d_d_name__stringBase0) + 0x159), - (void*)(((char*)&d_d_name__stringBase0) + 0x15C), - (void*)(((char*)&d_d_name__stringBase0) + 0x15F), - (void*)(((char*)&d_d_name__stringBase0) + 0x162), - (void*)(((char*)&d_d_name__stringBase0) + 0x165), - (void*)(((char*)&d_d_name__stringBase0) + 0x168), - (void*)(((char*)&d_d_name__stringBase0) + 0x6C), - (void*)(((char*)&d_d_name__stringBase0) + 0x16B), - (void*)(((char*)&d_d_name__stringBase0) + 0x6C), - (void*)(((char*)&d_d_name__stringBase0) + 0x16E), - (void*)(((char*)&d_d_name__stringBase0) + 0x171), - (void*)(((char*)&d_d_name__stringBase0) + 0x174), - (void*)(((char*)&d_d_name__stringBase0) + 0x177), - (void*)(((char*)&d_d_name__stringBase0) + 0x17A), - (void*)(((char*)&d_d_name__stringBase0) + 0x17D), - (void*)(((char*)&d_d_name__stringBase0) + 0x180), - (void*)(((char*)&d_d_name__stringBase0) + 0x6C), - (void*)(((char*)&d_d_name__stringBase0) + 0x183), - (void*)(((char*)&d_d_name__stringBase0) + 0x6C), - (void*)(((char*)&d_d_name__stringBase0) + 0x186), - (void*)(((char*)&d_d_name__stringBase0) + 0x189), - (void*)(((char*)&d_d_name__stringBase0) + 0x18C), - (void*)(((char*)&d_d_name__stringBase0) + 0x18F), - (void*)(((char*)&d_d_name__stringBase0) + 0x192), - (void*)(((char*)&d_d_name__stringBase0) + 0x195), - (void*)(((char*)&d_d_name__stringBase0) + 0x198), - (void*)(((char*)&d_d_name__stringBase0) + 0x6C), - (void*)(((char*)&d_d_name__stringBase0) + 0x19B), - (void*)(((char*)&d_d_name__stringBase0) + 0x6C), - (void*)(((char*)&d_d_name__stringBase0) + 0x19E), - (void*)(((char*)&d_d_name__stringBase0) + 0x1A1), - (void*)(((char*)&d_d_name__stringBase0) + 0x6C), - (void*)(((char*)&d_d_name__stringBase0) + 0xA8), - (void*)(((char*)&d_d_name__stringBase0) + 0xAB), - (void*)(((char*)&d_d_name__stringBase0) + 0xAE), +SECTION_DATA static char* l_mojikata[65] = { + "ア", "イ", "ウ", "エ", "オ", "カ", "キ", "ク", "ケ", "コ", "サ", "シ", "ス", + "セ", "\x83\x5C", "タ", "チ", "ツ", "テ", "ト", "ナ", "ニ", "ヌ", "ネ", "ノ", "ハ", + "ヒ", "フ", "ヘ", "ホ", "マ", "ミ", "ム", "メ", "モ", "ヤ", "　", "ユ", "　", + "ヨ", "ラ", "リ", "ル", "レ", "ロ", "ワ", "　", "ヲ", "　", "ン", "ァ", "ィ", + "ゥ", "ェ", "ォ", "ャ", "　", "ュ", "　", "ョ", "ッ", "　", "ー", "゛", "゜", }; -#pragma pop /* 803C236C-803C2470 -00001 0104+00 0/1 0/0 0/0 .data l_mojikata2 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_mojikata2[65] = { - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0x1A4), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0x1A7), - (void*)(((char*)&d_d_name__stringBase0) + 0x1AA), - (void*)(((char*)&d_d_name__stringBase0) + 0x1AD), - (void*)(((char*)&d_d_name__stringBase0) + 0x1B0), - (void*)(((char*)&d_d_name__stringBase0) + 0x1B3), - (void*)(((char*)&d_d_name__stringBase0) + 0x1B6), - (void*)(((char*)&d_d_name__stringBase0) + 0x1B9), - (void*)(((char*)&d_d_name__stringBase0) + 0x1BC), - (void*)(((char*)&d_d_name__stringBase0) + 0x1BF), - (void*)(((char*)&d_d_name__stringBase0) + 0x1C2), - (void*)(((char*)&d_d_name__stringBase0) + 0x1C5), - (void*)(((char*)&d_d_name__stringBase0) + 0x1C8), - (void*)(((char*)&d_d_name__stringBase0) + 0x1CB), - (void*)(((char*)&d_d_name__stringBase0) + 0x1CE), - (void*)(((char*)&d_d_name__stringBase0) + 0x1D1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0x1D4), - (void*)(((char*)&d_d_name__stringBase0) + 0x1D7), - (void*)(((char*)&d_d_name__stringBase0) + 0x1DA), - (void*)(((char*)&d_d_name__stringBase0) + 0x1DD), - (void*)(((char*)&d_d_name__stringBase0) + 0x1E0), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), +SECTION_DATA static char* l_mojikata2[65] = { + "￥", "￥", "ヴ", "￥", "￥", "ガ", "ギ", "グ", "ゲ", "ゴ", "ザ", "ジ", "ズ", + "ゼ", "ゾ", "ダ", "ヂ", "ヅ", "デ", "ド", "￥", "￥", "￥", "￥", "￥", "バ", + "ビ", "ブ", "ベ", "ボ", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", + "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", + "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", }; -#pragma pop /* 803C2470-803C2574 -00001 0104+00 0/1 0/0 0/0 .data l_mojikata3 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_mojikata3[65] = { - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0x1E3), - (void*)(((char*)&d_d_name__stringBase0) + 0x1E6), - (void*)(((char*)&d_d_name__stringBase0) + 0x1E9), - (void*)(((char*)&d_d_name__stringBase0) + 0x1EC), - (void*)(((char*)&d_d_name__stringBase0) + 0x1EF), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), - (void*)(((char*)&d_d_name__stringBase0) + 0xB1), +SECTION_DATA static char* l_mojikata3[65] = { + "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", + "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "パ", + "ピ", "プ", "ペ", "ポ", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", + "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", + "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", }; -#pragma pop /* 803C2574-803C2678 -00001 0104+00 0/3 0/0 0/0 .data l_mojiEisu */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_mojiEisu[65] = { - (void*)(((char*)&d_d_name__stringBase0) + 0x1F2), - (void*)(((char*)&d_d_name__stringBase0) + 0x1F4), - (void*)(((char*)&d_d_name__stringBase0) + 0x1F6), - (void*)(((char*)&d_d_name__stringBase0) + 0x1F8), - (void*)(((char*)&d_d_name__stringBase0) + 0x1FA), - (void*)(((char*)&d_d_name__stringBase0) + 0x1FC), - (void*)(((char*)&d_d_name__stringBase0) + 0x1FE), - (void*)(((char*)&d_d_name__stringBase0) + 0x200), - (void*)(((char*)&d_d_name__stringBase0) + 0x202), - (void*)(((char*)&d_d_name__stringBase0) + 0x204), - (void*)(((char*)&d_d_name__stringBase0) + 0x206), - (void*)(((char*)&d_d_name__stringBase0) + 0x208), - (void*)(((char*)&d_d_name__stringBase0) + 0x20A), - (void*)(((char*)&d_d_name__stringBase0) + 0x20C), - (void*)(((char*)&d_d_name__stringBase0) + 0x20E), - (void*)(((char*)&d_d_name__stringBase0) + 0x210), - (void*)(((char*)&d_d_name__stringBase0) + 0x212), - (void*)(((char*)&d_d_name__stringBase0) + 0x214), - (void*)(((char*)&d_d_name__stringBase0) + 0x216), - (void*)(((char*)&d_d_name__stringBase0) + 0x218), - (void*)(((char*)&d_d_name__stringBase0) + 0x21A), - (void*)(((char*)&d_d_name__stringBase0) + 0x21C), - (void*)(((char*)&d_d_name__stringBase0) + 0x21E), - (void*)(((char*)&d_d_name__stringBase0) + 0x220), - (void*)(((char*)&d_d_name__stringBase0) + 0x222), - (void*)(((char*)&d_d_name__stringBase0) + 0x224), - (void*)(((char*)&d_d_name__stringBase0) + 0x226), - (void*)(((char*)&d_d_name__stringBase0) + 0x228), - (void*)(((char*)&d_d_name__stringBase0) + 0x22A), - (void*)(((char*)&d_d_name__stringBase0) + 0x22C), - (void*)(((char*)&d_d_name__stringBase0) + 0x22E), - (void*)(((char*)&d_d_name__stringBase0) + 0x230), - (void*)(((char*)&d_d_name__stringBase0) + 0x232), - (void*)(((char*)&d_d_name__stringBase0) + 0x234), - (void*)(((char*)&d_d_name__stringBase0) + 0x236), - (void*)(((char*)&d_d_name__stringBase0) + 0x238), - (void*)(((char*)&d_d_name__stringBase0) + 0x23A), - (void*)(((char*)&d_d_name__stringBase0) + 0x23C), - (void*)(((char*)&d_d_name__stringBase0) + 0x23E), - (void*)(((char*)&d_d_name__stringBase0) + 0x240), - (void*)(((char*)&d_d_name__stringBase0) + 0x242), - (void*)(((char*)&d_d_name__stringBase0) + 0x244), - (void*)(((char*)&d_d_name__stringBase0) + 0x246), - (void*)(((char*)&d_d_name__stringBase0) + 0x248), - (void*)(((char*)&d_d_name__stringBase0) + 0x24A), - (void*)(((char*)&d_d_name__stringBase0) + 0x24C), - (void*)(((char*)&d_d_name__stringBase0) + 0x24E), - (void*)(((char*)&d_d_name__stringBase0) + 0x250), - (void*)(((char*)&d_d_name__stringBase0) + 0x252), - (void*)(((char*)&d_d_name__stringBase0) + 0x254), - (void*)(((char*)&d_d_name__stringBase0) + 0x256), - (void*)(((char*)&d_d_name__stringBase0) + 0x258), - (void*)(((char*)&d_d_name__stringBase0) + 0x25A), - (void*)(((char*)&d_d_name__stringBase0) + 0x25C), - (void*)(((char*)&d_d_name__stringBase0) + 0x25E), - (void*)(((char*)&d_d_name__stringBase0) + 0x260), - (void*)(((char*)&d_d_name__stringBase0) + 0x262), - (void*)(((char*)&d_d_name__stringBase0) + 0x264), - (void*)(((char*)&d_d_name__stringBase0) + 0x266), - (void*)(((char*)&d_d_name__stringBase0) + 0x268), - (void*)(((char*)&d_d_name__stringBase0) + 0x26A), - (void*)(((char*)&d_d_name__stringBase0) + 0x26C), - (void*)(((char*)&d_d_name__stringBase0) + 0x26E), - (void*)(((char*)&d_d_name__stringBase0) + 0x270), - (void*)(((char*)&d_d_name__stringBase0) + 0x272), +SECTION_DATA static char* l_mojiEisu[65] = { + "A", "N", "a", "n", "1", "B", "O", "b", "o", "2", "C", "P", "c", "p", "3", "D", "Q", + "d", "q", "4", "E", "R", "e", "r", "5", "F", "S", "f", "s", "6", "G", "T", "g", "t", + "7", "H", "U", "h", "u", "8", "I", "V", "i", "v", "9", "J", "W", "j", "w", "0", "K", + "X", "k", "x", ",", "L", "Y", "l", "y", ".", "M", "Z", "m", "z", " ", }; -#pragma pop -/* 803C2678-803C2684 -00001 000C+00 0/1 0/0 0/0 .data @3825 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3825[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)MojiSelect__7dName_cFv, -}; -#pragma pop - -/* 803C2684-803C2690 -00001 000C+00 0/1 0/0 0/0 .data @3826 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3826[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)MojiSelectAnm__7dName_cFv, -}; -#pragma pop - -/* 803C2690-803C269C -00001 000C+00 0/1 0/0 0/0 .data @3827 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3827[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)MojiSelectAnm2__7dName_cFv, -}; -#pragma pop - -/* 803C269C-803C26A8 -00001 000C+00 0/1 0/0 0/0 .data @3828 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3828[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)MojiSelectAnm3__7dName_cFv, -}; -#pragma pop - -/* 803C26A8-803C26B4 -00001 000C+00 0/1 0/0 0/0 .data @3829 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3829[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)MenuSelect__7dName_cFv, -}; -#pragma pop - -/* 803C26B4-803C26C0 -00001 000C+00 0/1 0/0 0/0 .data @3830 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3830[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)MenuSelectAnm__7dName_cFv, -}; -#pragma pop - -/* 803C26C0-803C26CC -00001 000C+00 0/1 0/0 0/0 .data @3831 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3831[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)MenuSelectAnm2__7dName_cFv, -}; -#pragma pop - -/* 803C26CC-803C26D8 -00001 000C+00 0/1 0/0 0/0 .data @3832 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3832[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)MenuSelectAnm3__7dName_cFv, -}; -#pragma pop - -/* 803C26D8-803C26E4 -00001 000C+00 0/1 0/0 0/0 .data @3833 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3833[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)Wait__7dName_cFv, -}; -#pragma pop +/* 80430734-80430748 05D454 0014+00 9/9 0/0 0/0 .bss g_nmHIO */ +static dNm_HIO_c g_nmHIO; /* 803C26E4-803C2750 01F804 006C+00 1/2 0/0 0/0 .data SelProc */ -SECTION_DATA static u8 SelProc[108] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +typedef void (dName_c::*selProcFunc)(void); +SECTION_DATA static selProcFunc SelProc[9] = { + &dName_c::MojiSelect, &dName_c::MojiSelectAnm, &dName_c::MojiSelectAnm2, + &dName_c::MojiSelectAnm3, &dName_c::MenuSelect, &dName_c::MenuSelectAnm, + &dName_c::MenuSelectAnm2, &dName_c::MenuSelectAnm3, &dName_c::Wait}; /* 803C2750-803C2788 -00001 0034+04 1/1 0/0 0/0 .data @4121 */ SECTION_DATA static void* lit_4121[13 + 1 /* padding */] = { @@ -1131,116 +219,78 @@ SECTION_DATA static void* lit_4121[13 + 1 /* padding */] = { /* 803C2788-803C27C8 01F8A8 0040+00 0/1 0/0 0/0 .data l_cur0TagName$4610 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_cur0TagName[64] = { - 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x31, - 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x33, - 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x34, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x35, - 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x36, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x37, +SECTION_DATA static u64 l_cur0TagName[8] = { + 's_00', 's_01', 's_02', 's_03', 's_04', 's_05', 's_06', 's_07', }; #pragma pop /* 803C27C8-803C2808 01F8E8 0040+00 0/1 0/0 0/0 .data l_cur1TagName$4611 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_cur1TagName[64] = { - 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x72, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x31, 0x72, - 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x32, 0x72, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x33, 0x72, - 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x34, 0x72, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x35, 0x72, - 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x36, 0x72, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x30, 0x37, 0x72, +SECTION_DATA static u64 l_cur1TagName[8] = { + 's_0r', 's_01r', 's_02r', 's_03r', 's_04r', 's_05r', 's_06r', 's_07r', }; #pragma pop /* 803C2808-803C2828 01F928 0020+00 0/1 0/0 0/0 .data l_menu_icon_tag$4617 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_menu_icon_tag[32] = { - 0x00, 0x70, 0x5F, 0x41, 0x42, 0x43, 0x5F, 0x6E, 0x00, 0x70, 0x5F, 0x61, 0x62, 0x63, 0x5F, 0x6E, - 0x6A, 0x5F, 0x65, 0x69, 0x67, 0x6F, 0x5F, 0x6E, 0x00, 0x70, 0x5F, 0x65, 0x6E, 0x64, 0x5F, 0x6E, +SECTION_DATA static u64 l_menu_icon_tag[4] = { + 'p_ABC_n', + 'p_abc_n', + 'j_eigo_n', + 'p_end_n', }; #pragma pop /* 803C2828-803C28A0 01F948 0078+00 0/1 0/0 0/0 .data l_menu_tag$4618 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_menu_tag[120] = { - 0x00, 0x70, 0x5F, 0x41, 0x42, 0x43, 0x5F, 0x30, 0x00, 0x70, 0x5F, 0x41, 0x42, 0x43, 0x5F, - 0x31, 0x00, 0x70, 0x5F, 0x41, 0x42, 0x43, 0x5F, 0x32, 0x00, 0x70, 0x5F, 0x61, 0x62, 0x63, - 0x5F, 0x30, 0x00, 0x70, 0x5F, 0x61, 0x62, 0x63, 0x5F, 0x31, 0x00, 0x70, 0x5F, 0x61, 0x62, - 0x63, 0x5F, 0x32, 0x6D, 0x5F, 0x65, 0x69, 0x67, 0x6F, 0x5F, 0x30, 0x6D, 0x5F, 0x65, 0x69, - 0x67, 0x6F, 0x5F, 0x31, 0x6D, 0x5F, 0x65, 0x69, 0x67, 0x6F, 0x5F, 0x32, 0x00, 0x70, 0x5F, - 0x65, 0x6E, 0x64, 0x5F, 0x30, 0x00, 0x70, 0x5F, 0x65, 0x6E, 0x64, 0x5F, 0x31, 0x00, 0x70, - 0x5F, 0x65, 0x6E, 0x64, 0x5F, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +SECTION_DATA static u64 l_menu_tag[15] = { + 'p_ABC_0', 'p_ABC_1', 'p_ABC_2', 'p_abc_0', 'p_abc_1', 'p_abc_2', + 'm_eigo_0', 'm_eigo_1', 'm_eigo_2', 'p_end_0', 'p_end_1', 'p_end_2', }; #pragma pop /* 803C28A0-803C28B0 01F9C0 0010+00 0/1 0/0 0/0 .data l_menu_msg$4619 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_menu_msg[16] = { - 0x00, 0x00, 0x03, 0x8B, 0x00, 0x00, 0x03, 0x8C, 0x00, 0x00, 0x03, 0x88, 0x00, 0x00, 0x03, 0x8E, +SECTION_DATA static u32 l_menu_msg[4] = { + 0x38B, + 0x38C, + 0x388, + 0x38E, }; #pragma pop /* 803C28B0-803C2AB8 01F9D0 0208+00 0/1 0/0 0/0 .data l_tagName$4635 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName[520] = { - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x30, 0x5F, 0x30, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x30, 0x5F, 0x31, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x30, 0x5F, 0x32, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x30, 0x5F, 0x33, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x30, 0x5F, 0x34, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x31, 0x5F, 0x30, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x31, 0x5F, 0x31, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x31, 0x5F, 0x32, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x31, 0x5F, 0x33, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x31, 0x5F, 0x34, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x32, 0x5F, 0x30, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x32, 0x5F, 0x31, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x32, 0x5F, 0x32, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x32, 0x5F, 0x33, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x32, 0x5F, 0x34, 0x00, 0x00, 0x00, 0x6D, 0x30, 0x33, 0x5F, 0x30, - 0x00, 0x00, 0x00, 0x6D, 0x30, 0x33, 0x5F, 0x31, 0x00, 0x00, 0x00, 0x6D, 0x30, 0x33, 0x5F, 0x32, - 0x00, 0x00, 0x00, 0x6D, 0x30, 0x33, 0x5F, 0x33, 0x00, 0x00, 0x00, 0x6D, 0x30, 0x33, 0x5F, 0x34, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x34, 0x5F, 0x30, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x34, 0x5F, 0x31, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x34, 0x5F, 0x32, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x34, 0x5F, 0x33, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x34, 0x5F, 0x34, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x35, 0x5F, 0x30, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x35, 0x5F, 0x31, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x35, 0x5F, 0x32, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x35, 0x5F, 0x33, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x35, 0x5F, 0x34, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x36, 0x5F, 0x30, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x36, 0x5F, 0x31, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x36, 0x5F, 0x32, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x36, 0x5F, 0x33, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x36, 0x5F, 0x34, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x37, 0x5F, 0x30, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x37, 0x5F, 0x31, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x37, 0x5F, 0x32, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x37, 0x5F, 0x33, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x37, 0x5F, 0x34, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x38, 0x5F, 0x30, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x38, 0x5F, 0x31, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x38, 0x5F, 0x32, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x38, 0x5F, 0x33, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x38, 0x5F, 0x34, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x39, 0x5F, 0x30, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x39, 0x5F, 0x31, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x39, 0x5F, 0x32, - 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x39, 0x5F, 0x33, 0x00, 0x00, 0x6D, 0x5F, 0x30, 0x39, 0x5F, 0x34, - 0x00, 0x00, 0x6D, 0x5F, 0x31, 0x30, 0x5F, 0x30, 0x00, 0x00, 0x6D, 0x5F, 0x31, 0x30, 0x5F, 0x31, - 0x00, 0x00, 0x6D, 0x5F, 0x31, 0x30, 0x5F, 0x32, 0x00, 0x00, 0x6D, 0x5F, 0x31, 0x30, 0x5F, 0x33, - 0x00, 0x00, 0x6D, 0x5F, 0x31, 0x30, 0x5F, 0x34, 0x00, 0x00, 0x6D, 0x5F, 0x31, 0x31, 0x5F, 0x30, - 0x00, 0x00, 0x6D, 0x5F, 0x31, 0x31, 0x5F, 0x31, 0x00, 0x00, 0x6D, 0x5F, 0x31, 0x31, 0x5F, 0x32, - 0x00, 0x00, 0x6D, 0x5F, 0x31, 0x31, 0x5F, 0x33, 0x00, 0x00, 0x6D, 0x5F, 0x31, 0x31, 0x5F, 0x34, - 0x00, 0x00, 0x00, 0x6D, 0x31, 0x32, 0x5F, 0x30, 0x00, 0x00, 0x00, 0x6D, 0x31, 0x32, 0x5F, 0x31, - 0x00, 0x00, 0x00, 0x6D, 0x31, 0x32, 0x5F, 0x32, 0x00, 0x00, 0x00, 0x6D, 0x31, 0x32, 0x5F, 0x33, - 0x00, 0x00, 0x00, 0x6D, 0x31, 0x32, 0x5F, 0x34, +SECTION_DATA static u64 l_tagName[65] = { + 'm_00_0', 'm_00_1', 'm_00_2', 'm_00_3', 'm_00_4', 'm_01_0', 'm_01_1', 'm_01_2', 'm_01_3', + 'm_01_4', 'm_02_0', 'm_02_1', 'm_02_2', 'm_02_3', 'm_02_4', 'm03_0', 'm03_1', 'm03_2', + 'm03_3', 'm03_4', 'm_04_0', 'm_04_1', 'm_04_2', 'm_04_3', 'm_04_4', 'm_05_0', 'm_05_1', + 'm_05_2', 'm_05_3', 'm_05_4', 'm_06_0', 'm_06_1', 'm_06_2', 'm_06_3', 'm_06_4', 'm_07_0', + 'm_07_1', 'm_07_2', 'm_07_3', 'm_07_4', 'm_08_0', 'm_08_1', 'm_08_2', 'm_08_3', 'm_08_4', + 'm_09_0', 'm_09_1', 'm_09_2', 'm_09_3', 'm_09_4', 'm_10_0', 'm_10_1', 'm_10_2', 'm_10_3', + 'm_10_4', 'm_11_0', 'm_11_1', 'm_11_2', 'm_11_3', 'm_11_4', 'm12_0', 'm12_1', 'm12_2', + 'm12_3', 'm12_4', }; #pragma pop /* 803C2AB8-803C2AF8 01FBD8 0040+00 0/1 0/0 0/0 .data l_nameTagName$4642 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_nameTagName[64] = { - 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x30, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x31, - 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x32, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x33, - 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x34, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x35, - 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x36, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x37, +SECTION_DATA static u64 l_nameTagName[8] = { + 'name_00', 'name_01', 'name_02', 'name_03', 'name_04', 'name_05', 'name_06', 'name_07', }; #pragma pop /* 803C2AF8-803C2B38 01FC18 0040+00 0/1 0/0 0/0 .data l_nameCurTagName$4643 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_nameCurTagName[64] = { - 0x00, 0x73, 0x5F, 0x5F, 0x6E, 0x5F, 0x30, 0x30, 0x00, 0x73, 0x5F, 0x5F, 0x6E, 0x5F, 0x30, 0x31, - 0x00, 0x73, 0x5F, 0x5F, 0x6E, 0x5F, 0x30, 0x32, 0x00, 0x73, 0x5F, 0x5F, 0x6E, 0x5F, 0x30, 0x33, - 0x00, 0x73, 0x5F, 0x5F, 0x6E, 0x5F, 0x30, 0x34, 0x00, 0x73, 0x5F, 0x5F, 0x6E, 0x5F, 0x30, 0x35, - 0x00, 0x73, 0x5F, 0x5F, 0x6E, 0x5F, 0x30, 0x36, 0x00, 0x73, 0x5F, 0x5F, 0x6E, 0x5F, 0x30, 0x37, +SECTION_DATA static u64 l_nameCurTagName[8] = { + 's__n_00', 's__n_01', 's__n_02', 's__n_03', 's__n_04', 's__n_05', 's__n_06', 's__n_07', }; #pragma pop @@ -1271,111 +321,206 @@ SECTION_DATA extern void* __vt__7dName_c[3 + 3 /* padding */] = { NULL, }; -/* 803C2B7C-803C2B88 01FC9C 000C+00 2/2 0/0 0/0 .data __vt__9dNm_HIO_c */ -SECTION_DATA extern void* __vt__9dNm_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__9dNm_HIO_cFv, -}; - -/* 80454DB0-80454DB4 0033B0 0004+00 1/1 0/0 0/0 .sdata2 @3665 */ -SECTION_SDATA2 static f32 lit_3665 = 13.0f / 10.0f; - -/* 80454DB4-80454DB8 0033B4 0004+00 1/1 0/0 0/0 .sdata2 @3666 */ -SECTION_SDATA2 static f32 lit_3666 = 7.0f / 5.0f; - /* 8024E3E0-8024E408 248D20 0028+00 1/1 0/0 0/0 .text __ct__9dNm_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dNm_HIO_c::dNm_HIO_c() { - nofralloc -#include "asm/d/d_name/__ct__9dNm_HIO_cFv.s" +dNm_HIO_c::dNm_HIO_c() { + mMenuScale = 1.3f; + mSelCharScale = 1.4f; + field_0x10 = 10; } -#pragma pop /* 8024E408-8024E468 248D48 0060+00 0/0 1/1 0/0 .text __ct__7dName_cFP7J2DPane */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dName_c::dName_c(J2DPane* param_0) { - nofralloc -#include "asm/d/d_name/__ct__7dName_cFP7J2DPane.s" +dName_c::dName_c(J2DPane* pane) { + nameIn.field_0xc = pane; + _create(); + init(); } -#pragma pop /* 8024E468-8024E62C 248DA8 01C4+00 1/0 0/0 0/0 .text __dt__7dName_cFv */ +#ifdef NONMATCHING +dName_c::~dName_c() { + delete stick; + delete nameIn.NameInScr; + mDoExt_removeMesgFont(); + + for (int i = 0; i < 8; i++) { + delete mNameCursor[i]; + } + + for (int i = 0; i < 65; i++) { + delete mMojiIcon[i]; + } + + for (int i = 0; i < 4; i++) { + if (mMenuIcon[i] != NULL) { + delete mMenuIcon[i]; + } + } + + delete mCursorColorKey; + delete mCursorTexKey; + delete mSelIcon; + archive->removeResourceAll(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dName_c::~dName_c() { +// asm dName_c::~dName_c() { +extern "C" asm void __dt__7dName_cFv() { nofralloc #include "asm/d/d_name/__dt__7dName_cFv.s" } #pragma pop - -/* ############################################################################################## */ -/* 80430728-80430734 05D448 000C+00 1/1 0/0 0/0 .bss @3660 */ -static u8 lit_3660[12]; - -/* 80430734-80430748 05D454 0014+00 9/9 0/0 0/0 .bss g_nmHIO */ -static u8 g_nmHIO[20]; - -/* 80454DB8-80454DBC 0033B8 0004+00 1/1 0/0 0/0 .sdata2 @3755 */ -SECTION_SDATA2 static f32 lit_3755 = 9.0f / 10.0f; - -/* 80454DBC-80454DC0 0033BC 0004+00 1/1 0/0 0/0 .sdata2 @3756 */ -SECTION_SDATA2 static f32 lit_3756 = 0.5f; +#endif /* 8024E62C-8024E6D4 248F6C 00A8+00 1/1 0/0 0/0 .text _create__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::_create() { - nofralloc -#include "asm/d/d_name/_create__7dName_cFv.s" +void dName_c::_create() { + stick = new STControl(5, 2, 2, 1, 0.9f, 0.5f, 0, 0x800); + stick->setFirstWaitTime(5); + nameIn.font = mDoExt_getMesgFont(); + g_nmHIO.field_0x4 = -1; + screenSet(); + + mNextNameStr[0] = 0; + mCursorDelay = 1; + displayInit(); } -#pragma pop /* 8024E6D4-8024E7A4 249014 00D0+00 1/1 0/0 0/0 .text init__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::init() { - nofralloc -#include "asm/d/d_name/init__7dName_cFv.s" +void dName_c::init() { + mCurPos = 0; + mLastCurPos = 0; + nameCursorMove(); + mLastCurPos = mCurPos; + + for (int i = 0; i < 4; i++) { + field_0x30c[i][2] = 0; + } + + mCharColumn = 0; + mCharRow = 0; + mPrevColumn = 0; + mPrevRow = 0; + field_0x30c[0][0] = 0; + field_0x30c[0][1] = 0; + field_0x30c[0][2] = 1; + + selectCursorMove(); + mSelProc = PROC_MOJI_SELECT; + field_0x2ac = mSelProc; + field_0x2ad = mSelProc; + field_0x2ae = field_0x2ac; + mMojiSet = MOJI_EIGO; + mPrevMojiSet = 255; + mSelMenu = MENU_END; + mPrevSelMenu = MENU_END; + mojiListChange(); } -#pragma pop /* 8024E7A4-8024E7EC 2490E4 0048+00 0/0 4/4 0/0 .text initial__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::initial() { - nofralloc -#include "asm/d/d_name/initial__7dName_cFv.s" +void dName_c::initial() { + displayInit(); + + if (mNextNameStr[0] != 0) { + NameStrSet(); + mNextNameStr[0] = 0; + } } -#pragma pop /* ############################################################################################## */ /* 80454DC0-80454DC4 0033C0 0004+00 16/16 0/0 0/0 .sdata2 @3820 */ SECTION_SDATA2 static f32 lit_3820 = 1.0f; /* 8024E7EC-8024E9A0 24912C 01B4+00 0/0 2/2 0/0 .text showIcon__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::showIcon() { - nofralloc -#include "asm/d/d_name/showIcon__7dName_cFv.s" +void dName_c::showIcon() { + Vec pos; + + switch (mSelProc) { + case PROC_MOJI_SELECT: + if (mCharColumn != 255 && mCharRow != 255) { + pos = mMojiIcon[mCharRow + mCharColumn * 5]->getGlobalVtxCenter(false, 0); + mSelIcon->setPos(pos.x, pos.y, mMojiIcon[mCharRow + mCharColumn * 5]->getPanePtr(), + true); + ((J2DTextBox*)mMojiIcon[mCharRow + mCharColumn * 5]->getPanePtr()) + ->setWhite(JUtility::TColor(0xC8, 0xC8, 0xC8, 0xFF)); + mSelIcon->setAlphaRate(lit_3820); + } + break; + case PROC_MENU_SELECT: + if (mSelMenu != 255) { + int menu_i = getMenuPosIdx(mSelMenu); + + pos = mMenuIcon[menu_i]->getGlobalVtxCenter(false, 0); + mSelIcon->setPos(pos.x, pos.y, mMenuIcon[menu_i]->getPanePtr(), true); + mMenuText[menu_i]->setWhite(JUtility::TColor(0xC8, 0xC8, 0xC8, 0xFF)); + mSelIcon->setAlphaRate(lit_3820); + } + break; + } } -#pragma pop /* ############################################################################################## */ /* 80454DC4-80454DC8 0033C4 0004+00 6/6 0/0 0/0 .sdata2 @3886 */ SECTION_SDATA2 static f32 lit_3886 = -1.0f; /* 8024E9A0-8024EC10 2492E0 0270+00 0/0 2/2 0/0 .text _move__7dName_cFv */ +// matches with literals +#ifdef NONMATCHING +void dName_c::_move() { + stick->checkTrigger(); + (this->*SelProc[mSelProc])(); + + if (mDoCPd_c::getTrigRight(0)) { + // BUG: this check only fails if the cursor is at exactly 7 + // setMoji allows the cursor to reach 8, which is out of bounds here + if (mCurPos != 7) { + mDoAud_seStart(Z2SE_SY_DUMMY, 0, 0, 0); + mLastCurPos = mCurPos; + mCurPos++; + nameCursorMove(); + } + } else if (mDoCPd_c::getTrigLeft(0)) { + if (mCurPos != 0) { + mDoAud_seStart(Z2SE_SY_DUMMY, 0, 0, 0); + mLastCurPos = mCurPos; + mCurPos--; + nameCursorMove(); + } + } else if (mDoCPd_c::getTrigB(0)) { + if (mCurPos == 0) { + mDoAud_seStart(Z2SE_SY_MENU_BACK, 0, 0, 0); + field_0x2ac = mSelProc; + field_0x2ae = mSelProc; + mSelProc = PROC_WAIT; + mIsInputEnd = true; + } else { + backSpace(); + } + } else if (mDoCPd_c::getTrigStart(0)) { + if ((mSelProc != PROC_MENU_SELECT || mSelMenu != MENU_END) && + (mSelProc == PROC_MENU_SELECT || mSelProc == PROC_MOJI_SELECT)) { + mDoAud_seStart(Z2SE_SY_CURSOR_OPTION, 0, 0, 0); + mPrevSelMenu = mSelMenu; + mSelMenu = MENU_END; + + switch (mSelProc) { + case PROC_MOJI_SELECT: + mPrevColumn = mCharColumn; + mPrevRow = mCharRow; + MojiSelectAnmInit(); + mSelProc = PROC_MOJI_SEL_ANM2; + break; + case PROC_MENU_SELECT: + MenuSelectAnmInit(); + mSelProc = PROC_MENU_SEL_ANM; + break; + } + } + } + + cursorAnm(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1384,40 +529,48 @@ asm void dName_c::_move() { #include "asm/d/d_name/_move__7dName_cFv.s" } #pragma pop +#endif /* 8024EC10-8024EC4C 249550 003C+00 3/3 0/0 0/0 .text nameCheck__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::nameCheck() { - nofralloc -#include "asm/d/d_name/nameCheck__7dName_cFv.s" +int dName_c::nameCheck() { + for (int i = 8, len = 7; i > 0; i--) { + if (mChrInfo[len].mCharacter != ' ') { + return len + 1; + } + len--; + } + + return 0; } -#pragma pop /* 8024EC4C-8024EC84 24958C 0038+00 1/1 0/0 0/0 .text playNameSet__7dName_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::playNameSet(int param_0) { - nofralloc -#include "asm/d/d_name/playNameSet__7dName_cFi.s" -} -#pragma pop +void dName_c::playNameSet(int nameLength) { + char* str = mInputStr; -/* ############################################################################################## */ -/* 80454DC8-80454DD0 0033C8 0008+00 1/1 0/0 0/0 .sdata2 @3936 */ -SECTION_SDATA2 static f64 lit_3936 = 4503601774854144.0 /* cast s32 to float */; + for (int i = 0; i < nameLength; i++) { + *str = mChrInfo[i].mCharacter; + str++; + } + + *str = 0; +} /* 8024EC84-8024ED48 2495C4 00C4+00 1/1 0/0 0/0 .text cursorAnm__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::cursorAnm() { - nofralloc -#include "asm/d/d_name/cursorAnm__7dName_cFv.s" +void dName_c::cursorAnm() { + mCurColAnmF += 2; + if (mCurColAnmF >= mCursorColorKey->getFrameMax()) { + mCurColAnmF -= mCursorColorKey->getFrameMax(); + } + mCursorColorKey->setFrame(mCurColAnmF); + + mCurTexAnmF += 2; + if (mCurTexAnmF >= mCursorTexKey->getFrameMax()) { + mCurTexAnmF -= mCursorTexKey->getFrameMax(); + } + mCursorTexKey->setFrame(mCurTexAnmF); + + nameIn.NameInScr->animation(); } -#pragma pop /* 8024ED48-8024ED4C 249688 0004+00 1/0 0/0 0/0 .text Wait__7dName_cFv */ void dName_c::Wait() { @@ -1425,6 +578,66 @@ void dName_c::Wait() { } /* 8024ED4C-8024F034 24968C 02E8+00 1/0 0/0 0/0 .text MojiSelect__7dName_cFv */ +// matches with literals +#ifdef NONMATCHING +void dName_c::MojiSelect() { + if (mDoCPd_c::getTrigA(0)) { + selectMojiSet(); + } else if (stick->checkRightTrigger()) { + mDoAud_seStart(Z2SE_SY_NAME_CURSOR, 0, 0, 0); + mPrevColumn = mCharColumn; + mPrevRow = mCharRow; + mCharColumn++; + + if (mCharColumn > 12) { + mCharColumn = 0; + } + MojiSelectAnmInit(); + mSelProc = PROC_MOJI_SEL_ANM; + } else if (stick->checkLeftTrigger()) { + mDoAud_seStart(Z2SE_SY_NAME_CURSOR, 0, 0, 0); + mPrevColumn = mCharColumn; + mPrevRow = mCharRow; + + if (mCharColumn == 0) { + mCharColumn = 12; + } else { + mCharColumn--; + } + MojiSelectAnmInit(); + mSelProc = PROC_MOJI_SEL_ANM; + } else if (stick->checkUpTrigger()) { + mPrevColumn = mCharColumn; + mPrevRow = mCharRow; + MojiSelectAnmInit(); + + if (mCharRow == 0) { + mDoAud_seStart(Z2SE_SY_CURSOR_OPTION, 0, 0, 0); + menuCursorPosSet(); + mSelProc = PROC_MOJI_SEL_ANM2; + } else { + mDoAud_seStart(Z2SE_SY_NAME_CURSOR, 0, 0, 0); + mCharRow--; + mSelProc = PROC_MOJI_SEL_ANM; + } + } else if (stick->checkDownTrigger()) { + mPrevColumn = mCharColumn; + mPrevRow = mCharRow; + MojiSelectAnmInit(); + mCharRow++; + + if (mCharRow > 4) { + mCharRow = 4; + mDoAud_seStart(Z2SE_SY_CURSOR_OPTION, 0, 0, 0); + menuCursorPosSet(); + mSelProc = PROC_MOJI_SEL_ANM2; + } else { + mDoAud_seStart(Z2SE_SY_NAME_CURSOR, 0, 0, 0); + mSelProc = PROC_MOJI_SEL_ANM; + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1433,6 +646,7 @@ asm void dName_c::MojiSelect() { #include "asm/d/d_name/MojiSelect__7dName_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80454DD0-80454DD4 0033D0 0004+00 5/5 0/0 0/0 .sdata2 @4009 */ @@ -1444,34 +658,32 @@ SECTION_SDATA2 static u8 lit_4009[4] = { }; /* 8024F034-8024F0E0 249974 00AC+00 2/2 0/0 0/0 .text MojiSelectAnmInit__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::MojiSelectAnmInit() { - nofralloc -#include "asm/d/d_name/MojiSelectAnmInit__7dName_cFv.s" +void dName_c::MojiSelectAnmInit() { + mSelIcon->setAlphaRate(FLOAT_LABEL(lit_4009)); + mMojiIcon[mPrevRow + mPrevColumn * 5]->scaleAnimeStart(0); + ((J2DTextBox*)mMojiIcon[mPrevRow + mPrevColumn * 5]->getPanePtr()) + ->setWhite(JUtility::TColor(0x96, 0x96, 0x96, 0xFF)); } -#pragma pop /* 8024F0E0-8024F164 249A20 0084+00 1/0 0/0 0/0 .text MojiSelectAnm__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::MojiSelectAnm() { - nofralloc -#include "asm/d/d_name/MojiSelectAnm__7dName_cFv.s" +void dName_c::MojiSelectAnm() { + if (mMojiIcon[mPrevRow + mPrevColumn * 5]->scaleAnime(mCursorDelay, g_nmHIO.mSelCharScale, + lit_3820, 0) == 1) { + selectCursorMove(); + mSelProc = PROC_MOJI_SELECT; + field_0x2ad = mSelProc; + } } -#pragma pop /* 8024F164-8024F1E8 249AA4 0084+00 1/0 0/0 0/0 .text MojiSelectAnm2__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::MojiSelectAnm2() { - nofralloc -#include "asm/d/d_name/MojiSelectAnm2__7dName_cFv.s" +void dName_c::MojiSelectAnm2() { + if (mMojiIcon[mPrevRow + mPrevColumn * 5]->scaleAnime(mCursorDelay, g_nmHIO.mSelCharScale, + lit_3820, 0) == 1) { + menuCursorMove2(); + mSelProc = PROC_MENU_SELECT; + field_0x2ad = mSelProc; + } } -#pragma pop /* 8024F1E8-8024F1EC 249B28 0004+00 1/0 0/0 0/0 .text MojiSelectAnm3__7dName_cFv */ void dName_c::MojiSelectAnm3() { @@ -1479,36 +691,181 @@ void dName_c::MojiSelectAnm3() { } /* 8024F1EC-8024F55C 249B2C 0370+00 1/0 0/0 0/0 .text mojiChange__7dName_cFUc */ +// weird pattern +#ifdef NONMATCHING +int dName_c::mojiChange(u8 idx) { + if (mChrInfo[idx].field_0x3 == 0 || mChrInfo[idx].mMojiSet == MOJI_EIGO || + mChrInfo[idx].mCharacter == '　') { + return 0; + } + + if (mChrInfo[idx].mColumn == 4 || mChrInfo[idx].mColumn == 6 || mChrInfo[idx].mColumn == 8 || + mChrInfo[idx].mColumn == 9) { + return 0; + } + + switch (mChrInfo[idx].mColumn) { + case 0: + case 10: + if (mChrInfo[idx].mCharacter == 'ウ' || mChrInfo[idx].mCharacter == 'ゥ' || + mChrInfo[idx].mCharacter == 'ヴ') { + mChrInfo[idx].mCharacter++; + + if (mChrInfo[idx].mCharacter == 'ェ') { + mChrInfo[idx].mCharacter = 'ヴ'; + } + + if (mChrInfo[idx].mCharacter == 'ヵ') { + mChrInfo[idx].mCharacter = 'ゥ'; + } + } else { + int c = 'ァ'; + if (mChrInfo[idx].mMojiSet != MOJI_HIRA) { + c = 'ぁ'; + } + bool check = mChrInfo[idx].mCharacter - c == 0 ? 1 : 0; + + if (check) { + --mChrInfo[idx].mCharacter; + } else { + ++mChrInfo[idx].mCharacter; + } + } + break; + case 1: + int c = 'か'; + if (mChrInfo[idx].mMojiSet != MOJI_HIRA) { + c = 'カ'; + } + + mChrInfo[idx].mCharacter == c ? mChrInfo[idx].mCharacter++ : mChrInfo[idx].mCharacter--; + break; + case 2: + int c2 = 'さ'; + if (mChrInfo[idx].mMojiSet != MOJI_HIRA) { + c2 = 'サ'; + } + + mChrInfo[idx].mCharacter == c ? mChrInfo[idx].mCharacter++ : mChrInfo[idx].mCharacter--; + break; + case 3: + case 12: + if (mChrInfo[idx].mCharacter != 0x815b) { + int c = 'ぢ'; + if (mChrInfo[idx].mMojiSet != MOJI_HIRA) { + c = 'ヂ'; + } + + if (c < mChrInfo[idx].mCharacter) { + int c2 = 'ぢ'; + if (mChrInfo[idx].mMojiSet != MOJI_HIRA) { + c2 = 'ヂ'; + } + + mChrInfo[idx].mCharacter == c2 ? mChrInfo[idx].mCharacter++ : + mChrInfo[idx].mCharacter--; + } + } + break; + case 5: + + break; + case 7: + case 11: + + break; + } + + setNameText(); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dName_c::mojiChange(u8 param_0) { +asm int dName_c::mojiChange(u8 param_0) { nofralloc #include "asm/d/d_name/mojiChange__7dName_cFUc.s" } #pragma pop +#endif /* 8024F55C-8024F59C 249E9C 0040+00 1/1 0/0 0/0 .text selectMojiSet__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::selectMojiSet() { - nofralloc -#include "asm/d/d_name/selectMojiSet__7dName_cFv.s" +void dName_c::selectMojiSet() { + setMoji(getMoji()); + setNameText(); } -#pragma pop /* 8024F59C-8024F634 249EDC 0098+00 1/1 0/0 0/0 .text getMoji__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::getMoji() { - nofralloc -#include "asm/d/d_name/getMoji__7dName_cFv.s" +int dName_c::getMoji() { + char* moji; + + switch (mMojiSet) { + case MOJI_HIRA: + moji = l_mojiHira[mCharRow + mCharColumn * 5]; + break; + case MOJI_KATA: + moji = l_mojikata[mCharRow + mCharColumn * 5]; + break; + case MOJI_EIGO: + moji = l_mojiEisu[mCharRow + mCharColumn * 5]; + break; + } + + return *moji; } -#pragma pop /* 8024F634-8024F88C 249F74 0258+00 1/1 0/0 0/0 .text setMoji__7dName_cFi */ +// matches with literals +#ifdef NONMATCHING +void dName_c::setMoji(int moji) { + if (mCurPos == 8 || nameCheck() == 8) { + mDoAud_seStart(Z2SE_SYS_ERROR, NULL, 0, 0); + } else { + mDoAud_seStart(Z2SE_SY_NAME_INPUT, NULL, 0, 0); + + s32 notEmpty = false; + for (int i = mCurPos; i < 8; i++) { + if (mChrInfo[i].mCharacter != ' ') { + notEmpty = true; + break; + } + } + + if (notEmpty) { + if (mChrInfo[7].mCharacter == ' ') { + for (int i = 6; i >= mCurPos; i--) { + mChrInfo[i + 1] = mChrInfo[i]; + } + + mChrInfo[mCurPos].mColumn = mCharColumn; + mChrInfo[mCurPos].mRow = mCharRow; + mChrInfo[mCurPos].mMojiSet = mMojiSet; + mChrInfo[mCurPos].field_0x3 = 1; + mChrInfo[mCurPos].mCharacter = moji; + + if (mCurPos != 8) { + mLastCurPos = mCurPos; + mCurPos++; + nameCursorMove(); + } + } + } else { + mChrInfo[mCurPos].mColumn = mCharColumn; + mChrInfo[mCurPos].mRow = mCharRow; + mChrInfo[mCurPos].mMojiSet = mMojiSet; + mChrInfo[mCurPos].field_0x3 = 1; + mChrInfo[mCurPos].mCharacter = moji; + + if (mCurPos != 8) { + mLastCurPos = mCurPos; + mCurPos++; + nameCursorMove(); + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1517,69 +874,103 @@ asm void dName_c::setMoji(int param_0) { #include "asm/d/d_name/setMoji__7dName_cFi.s" } #pragma pop - -/* ############################################################################################## */ -/* 80399CC8-80399CC8 026328 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399F3C = "" - "\x1B" - "CD" - "\x1B" - "CR" - "\x1B" - "CC[000000]" - "\x1B" - "GM[0]%c" - "\x1B" - "HM" - "\x1B" - "CC[ffffff]" - "\x1B" - "GM[0]%c"; -#pragma pop +#endif /* 8024F88C-8024F914 24A1CC 0088+00 4/4 0/0 0/0 .text setNameText__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::setNameText() { - nofralloc -#include "asm/d/d_name/setNameText__7dName_cFv.s" +void dName_c::setNameText() { + for (int i = 0; i < 8; i++) { + if (mChrInfo[i].field_0x3 != 0) { + sprintf(mNameText[i], + "\x1b" + "CD\x1b" + "CR\x1b" + "CC[000000]\x1bGM[0]%c\x1bHM\x1b" + "CC[ffffff]\x1bGM[0]%c", + (u8)mChrInfo[i].mCharacter, (u8)mChrInfo[i].mCharacter); + } + } } -#pragma pop /* 8024F914-8024F994 24A254 0080+00 5/5 0/0 0/0 .text nameCursorMove__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::nameCursorMove() { - nofralloc -#include "asm/d/d_name/nameCursorMove__7dName_cFv.s" +void dName_c::nameCursorMove() { + if (mCurPos <= 8) { + u8 position = mCurPos; + + if (position > 7) { + position = 7; + } + + if (mLastCurPos != 255 && mLastCurPos < 8) { + mNameCursor[mLastCurPos]->hide(); + } + + mNameCursor[position]->show(); + } } -#pragma pop /* 8024F994-8024FAF4 24A2D4 0160+00 3/3 0/0 0/0 .text selectCursorMove__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::selectCursorMove() { - nofralloc -#include "asm/d/d_name/selectCursorMove__7dName_cFv.s" +void dName_c::selectCursorMove() { + field_0x30c[3][0] = mCharColumn; + field_0x30c[3][1] = mCharRow; + field_0x30c[3][2] = 1; + + mMojiIcon[mCharRow + mCharColumn * 5]->getPanePtr()->scale(g_nmHIO.mSelCharScale, + g_nmHIO.mSelCharScale); + ((J2DTextBox*)mMojiIcon[mCharRow + mCharColumn * 5]->getPanePtr()) + ->setWhite(JUtility::TColor(0xC8, 0xC8, 0xC8, 0xFF)); + + Vec pos = mMojiIcon[mCharRow + mCharColumn * 5]->getGlobalVtxCenter(false, 0); + mSelIcon->setPos(pos.x, pos.y, mMojiIcon[mCharRow + mCharColumn * 5]->getPanePtr(), true); + mSelIcon->setAlphaRate(lit_3820); } -#pragma pop /* 8024FAF4-8024FB08 24A434 0014+00 1/1 0/0 0/0 .text menuCursorPosSet__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::menuCursorPosSet() { - nofralloc -#include "asm/d/d_name/menuCursorPosSet__7dName_cFv.s" +void dName_c::menuCursorPosSet() { + mPrevSelMenu = mSelMenu; + mSelMenu = MENU_END; } -#pragma pop /* 8024FB08-8024FDA0 24A448 0298+00 1/0 0/0 0/0 .text MenuSelect__7dName_cFv */ +// matches with literals +#ifdef NONMATCHING +void dName_c::MenuSelect() { + if (!stick->checkRightTrigger() && !stick->checkLeftTrigger()) { + if (stick->checkUpTrigger()) { + mDoAud_seStart(Z2SE_SY_NAME_CURSOR, NULL, 0, 0); + mPrevSelMenu = mSelMenu; + selectCursorPosSet(4); + MenuSelectAnmInit(); + mSelProc = PROC_MENU_SEL_ANM2; + } else if (stick->checkDownTrigger()) { + mDoAud_seStart(Z2SE_SY_NAME_CURSOR, NULL, 0, 0); + mPrevSelMenu = mSelMenu; + selectCursorPosSet(0); + MenuSelectAnmInit(); + mSelProc = PROC_MENU_SEL_ANM2; + } else if (mDoCPd_c::getTrigA(0)) { + if (mSelMenu == MENU_END) { + if (nameCheck() != 0) { + mDoAud_seStart(Z2SE_SY_NAME_OK, NULL, 0, 0); + } else { + mDoAud_seStart(Z2SE_SYS_ERROR, NULL, 0, 0); + } + } else { + mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0); + } + menuAbtnSelect(); + } else if (mDoCPd_c::getTrigStart(0)) { + if (mSelMenu == MENU_END) { + if (nameCheck() != 0) { + mDoAud_seStart(Z2SE_SY_NAME_OK, NULL, 0, 0); + } else { + mDoAud_seStart(Z2SE_SYS_ERROR, NULL, 0, 0); + } + menuAbtnSelect(); + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1588,36 +979,47 @@ asm void dName_c::MenuSelect() { #include "asm/d/d_name/MenuSelect__7dName_cFv.s" } #pragma pop +#endif /* 8024FDA0-8024FDF4 24A6E0 0054+00 2/2 0/0 0/0 .text MenuSelectAnmInit__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::MenuSelectAnmInit() { - nofralloc -#include "asm/d/d_name/MenuSelectAnmInit__7dName_cFv.s" +void dName_c::MenuSelectAnmInit() { + mSelIcon->setAlphaRate(FLOAT_LABEL(lit_4009)); + + int prevMenu_i = getMenuPosIdx(mPrevSelMenu); + mMenuIcon[prevMenu_i]->scaleAnimeStart(0); } -#pragma pop /* 8024FDF4-8024FEB4 24A734 00C0+00 1/0 0/0 0/0 .text MenuSelectAnm__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::MenuSelectAnm() { - nofralloc -#include "asm/d/d_name/MenuSelectAnm__7dName_cFv.s" +void dName_c::MenuSelectAnm() { + int prevMenu_i = getMenuPosIdx(mPrevSelMenu); + + if (mMenuIcon[prevMenu_i]->scaleAnime(mCursorDelay, g_nmHIO.mMenuScale, lit_3820, 0) == 1) { + mMenuText[prevMenu_i]->setWhite(JUtility::TColor(0x96, 0x96, 0x96, 0xFF)); + menuCursorMove(); + mSelProc = PROC_MENU_SELECT; + field_0x2ad = mSelProc; + } } -#pragma pop /* 8024FEB4-8024FFA0 24A7F4 00EC+00 1/0 0/0 0/0 .text MenuSelectAnm2__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::MenuSelectAnm2() { - nofralloc -#include "asm/d/d_name/MenuSelectAnm2__7dName_cFv.s" +void dName_c::MenuSelectAnm2() { + int prevMenu_i = getMenuPosIdx(mPrevSelMenu); + int mojiSet_i = getMenuPosIdx(mMojiSet); + + bool canMove = true; + if (prevMenu_i != mojiSet_i) { + canMove = mMenuIcon[prevMenu_i]->scaleAnime(mCursorDelay, g_nmHIO.mMenuScale, lit_3820, 0); + } + + if (canMove == true) { + if (prevMenu_i != mojiSet_i) { + mMenuText[prevMenu_i]->setWhite(JUtility::TColor(0x96, 0x96, 0x96, 0xFF)); + } + selectCursorMove(); + mSelProc = PROC_MOJI_SELECT; + field_0x2ad = mSelProc; + } } -#pragma pop /* 8024FFA0-8024FFA4 24A8E0 0004+00 1/0 0/0 0/0 .text MenuSelectAnm3__7dName_cFv */ void dName_c::MenuSelectAnm3() { @@ -1625,6 +1027,34 @@ void dName_c::MenuSelectAnm3() { } /* 8024FFA4-80250074 24A8E4 00D0+00 1/1 0/0 0/0 .text menuAbtnSelect__7dName_cFv */ +// matches with literals +#ifdef NONMATCHING +void dName_c::menuAbtnSelect() { + switch (mSelMenu) { + case MENU_HIRA: + case MENU_KATA: + case MENU_EIGO: + if (mSelMenu != mMojiSet) { + mPrevMojiSet = mMojiSet; + mMojiSet = mSelMenu; + mojiListChange(); + } + break; + case MENU_END: + int nameNum = nameCheck(); + if (nameNum != 0) { + playNameSet(nameNum); + field_0x2ac = mSelProc; + field_0x2ae = mSelProc; + mSelProc = PROC_WAIT; + mIsInputEnd = 2; + } else { + mDoAud_seStart(Z2SE_SY_DUMMY, NULL, 0, 0); + } + break; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1633,8 +1063,39 @@ asm void dName_c::menuAbtnSelect() { #include "asm/d/d_name/menuAbtnSelect__7dName_cFv.s" } #pragma pop +#endif /* 80250074-802501B0 24A9B4 013C+00 1/1 0/0 0/0 .text backSpace__7dName_cFv */ +// matches with literals +#ifdef NONMATCHING +void dName_c::backSpace() { + if (mCurPos != 0) { + mDoAud_seStart(Z2SE_SY_NAME_DELETE, NULL, 0, 0); + + if (mCurPos == 8 && mChrInfo[7].mCharacter != ' ') { + mChrInfo[7].mColumn = 7; + mChrInfo[7].mRow = 1; + mChrInfo[7].mMojiSet = MOJI_EIGO; + mChrInfo[7].field_0x3 = 1; + mChrInfo[7].mCharacter = ' '; + } else { + for (int i = mCurPos - 1; i < 7; i++) { + mChrInfo[i] = mChrInfo[i + 1]; + } + mChrInfo[7].mColumn = 7; + mChrInfo[7].mRow = 1; + mChrInfo[7].mMojiSet = MOJI_EIGO; + mChrInfo[7].field_0x3 = 1; + mChrInfo[7].mCharacter = ' '; + } + + setNameText(); + mLastCurPos = mCurPos; + mCurPos--; + nameCursorMove(); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1643,78 +1104,105 @@ asm void dName_c::backSpace() { #include "asm/d/d_name/backSpace__7dName_cFv.s" } #pragma pop - -/* ############################################################################################## */ -/* 80399CC8-80399CC8 026328 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399F6C = "" - "\x1B" - "CD" - "\x1B" - "CR" - "\x1B" - "CC[000000]" - "\x1B" - "GM[0]"; -SECTION_DEAD static char const* const stringBase_80399F84 = "" - "\x1B" - "HM" - "\x1B" - "CC[ffffff]" - "\x1B" - "GM[0]"; -#pragma pop +#endif /* 802501B0-80250284 24AAF0 00D4+00 2/2 0/0 0/0 .text mojiListChange__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::mojiListChange() { - nofralloc -#include "asm/d/d_name/mojiListChange__7dName_cFv.s" +void dName_c::mojiListChange() { + char** mojiSet; + + switch (mMojiSet) { + case MOJI_HIRA: + mojiSet = l_mojiHira; + break; + case MOJI_KATA: + mojiSet = l_mojikata; + break; + case MOJI_EIGO: + mojiSet = l_mojiEisu; + break; + } + + char buf[74]; + for (int i = 0; i < 65; i++) { + strcpy(buf, "\x1B" + "CD" + "\x1B" + "CR" + "\x1B" + "CC[000000]" + "\x1B" + "GM[0]"); + strcat(buf, mojiSet[i]); + strcat(buf, "\x1B" + "HM" + "\x1B" + "CC[ffffff]" + "\x1B" + "GM[0]"); + strcat(buf, mojiSet[i]); + strcpy(mMojiText[i], buf); + } } -#pragma pop /* 80250284-80250380 24ABC4 00FC+00 1/1 0/0 0/0 .text menuCursorMove__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::menuCursorMove() { - nofralloc -#include "asm/d/d_name/menuCursorMove__7dName_cFv.s" +void dName_c::menuCursorMove() { + int menu_i = getMenuPosIdx(mSelMenu); + mMenuIcon[menu_i]->scale(g_nmHIO.mMenuScale, g_nmHIO.mMenuScale); + mMenuText[menu_i]->setWhite(JUtility::TColor(0xC8, 0xC8, 0xC8, 0xFF)); + + Vec pos = mMenuIcon[menu_i]->getGlobalVtxCenter(false, 0); + mSelIcon->setPos(pos.x, pos.y, mMenuIcon[menu_i]->getPanePtr(), true); + mSelIcon->setAlphaRate(lit_3820); } -#pragma pop /* 80250380-802504A0 24ACC0 0120+00 1/1 0/0 0/0 .text menuCursorMove2__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::menuCursorMove2() { - nofralloc -#include "asm/d/d_name/menuCursorMove2__7dName_cFv.s" +void dName_c::menuCursorMove2() { + int menu_i = getMenuPosIdx(mSelMenu); + int mojiSet_i = getMenuPosIdx(mMojiSet); + + if (menu_i != mojiSet_i) { + mMenuIcon[menu_i]->scale(g_nmHIO.mMenuScale, g_nmHIO.mMenuScale); + mMenuText[menu_i]->setWhite(JUtility::TColor(0xC8, 0xC8, 0xC8, 0xFF)); + } + + Vec pos = mMenuIcon[menu_i]->getGlobalVtxCenter(false, 0); + mSelIcon->setPos(pos.x, pos.y, mMenuIcon[menu_i]->getPanePtr(), true); + mSelIcon->setAlphaRate(lit_3820); } -#pragma pop /* 802504A0-80250560 24ADE0 00C0+00 1/1 0/0 0/0 .text selectCursorPosSet__7dName_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::selectCursorPosSet(int param_0) { - nofralloc -#include "asm/d/d_name/selectCursorPosSet__7dName_cFi.s" +void dName_c::selectCursorPosSet(int row) { + if (field_0x30c[mSelMenu][2] == 1) { + mCharColumn = field_0x30c[mSelMenu][0]; + mCharRow = row; + } else { + switch (mSelMenu) { + case MENU_HIRA: + mCharColumn = 0; + break; + case MENU_KATA: + mCharColumn = 3; + break; + case MENU_EIGO: + mCharColumn = 6; + break; + case MENU_END: + mCharColumn = 8; + break; + } + + mCharRow = row; + field_0x30c[mSelMenu][0] = mCharColumn; + field_0x30c[mSelMenu][1] = mCharRow; + field_0x30c[mSelMenu][2] = 1; + } } -#pragma pop /* 80250560-802505CC 24AEA0 006C+00 0/0 1/1 0/0 .text _draw__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::_draw() { - nofralloc -#include "asm/d/d_name/_draw__7dName_cFv.s" +void dName_c::_draw() { + dComIfGd_set2DOpa(&nameIn); + dComIfGd_set2DOpa(mSelIcon); } -#pragma pop /* ############################################################################################## */ /* 80399CC8-80399CC8 026328 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -1745,6 +1233,98 @@ SECTION_SDATA2 static f32 lit_4725[1 + 1 /* padding */] = { }; /* 802505CC-80250CEC 24AF0C 0720+00 1/1 0/0 0/0 .text screenSet__7dName_cFv */ +#ifdef NONMATCHING +void dName_c::screenSet() { + nameIn.NameInScr = new J2DScreen(); + archive = dComIfGp_getNameResArchive(); + nameIn.NameInScr->setPriority("zelda_player_name.blo", 0x100000, archive); + dPaneClass_showNullPane(nameIn.NameInScr); + nameIn.field_0x10 = nameIn.NameInScr->search('name_n'); + + void* bpk = JKRFileLoader::getGlbResource("zelda_player_name.bpk", archive); + mCursorColorKey = (J2DAnmColorKey*)J2DAnmLoaderDataBase::load(bpk); + mCursorColorKey->searchUpdateMaterialID(nameIn.NameInScr); + + void* btk = JKRFileLoader::getGlbResource("zelda_player_name.btk", archive); + mCursorTexKey = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk); + mCursorTexKey->searchUpdateMaterialID(nameIn.NameInScr); + + J2DPane* panes0[8]; + J2DPane* panes1[8]; + for (int i = 0; i < 8; i++) { + panes0[i] = nameIn.NameInScr->search(l_cur0TagName[i]); + panes1[i] = nameIn.NameInScr->search(l_cur1TagName[i]); + + panes0[i]->setAnimation(mCursorTexKey); + panes0[i]->setAnimation(mCursorColorKey); + panes1[i]->setAnimation(mCursorTexKey); + panes1[i]->setAnimation(mCursorColorKey); + } + + nameIn.NameInScr->search('jpn_n')->hide(); + mMenuPane = nameIn.NameInScr->search('pal_n'); + mMenuPane->show(); + + nameIn.NameInScr->search('j_hira_n')->scale(0.0f, 0.0f); + nameIn.NameInScr->search('j_kata_n')->scale(0.0f, 0.0f); + nameIn.NameInScr->search('j_eigo_n')->scale(0.0f, 0.0f); + nameIn.NameInScr->search('j_end_n')->scale(0.0f, 0.0f); + + J2DTextBox* menuPane[3]; + for (int i = 0; i < 4; i++) { + if (i == 2) { + mMenuIcon[i] = NULL; + mMenuText[i] = NULL; + } else { + mMenuIcon[i] = new CPaneMgr(nameIn.NameInScr, l_menu_icon_tag[i], 1, NULL); + + char buf[16]; + fopMsgM_messageGet(buf, l_menu_msg[i]); + + for (int j = 0; j < 3; j++) { + menuPane[j] = (J2DTextBox*)nameIn.NameInScr->search(l_menu_tag[j]); + + if (j == 0) { + mMenuText[i] = menuPane[j]; + } + + menuPane[j]->setFont(nameIn.font); + menuPane[j]->setString(buf); + } + } + } + + mMenuIcon[0]->hide(); + mMenuIcon[1]->hide(); + mMojiPane = nameIn.NameInScr->search('moji_n'); + + for (int i = 0; i < 65; i++) { + mMojiIcon[i] = new CPaneMgr(nameIn.NameInScr, l_tagName[i], 2, NULL); + ((J2DTextBox*)mMojiIcon[i]->getPanePtr())->setFont(nameIn.font); + ((J2DTextBox*)mMojiIcon[i]->getPanePtr())->setString(72, ""); + mMojiText[i] = ((J2DTextBox*)mMojiIcon[i]->getPanePtr())->getStringPtr(); + } + + J2DPane* nameTagPane[8]; + for (int i = 0; i < 8; i++) { + mNameCursor[i] = new CPaneMgrAlpha(nameIn.NameInScr, l_nameCurTagName[i], 2, NULL); + nameTagPane[i] = nameIn.NameInScr->search(l_nameTagName[i]); + ((J2DTextBox*)nameTagPane[i])->setFont(nameIn.font); + ((J2DTextBox*)nameTagPane[i])->setString(72, ""); + ((J2DTextBox*)nameTagPane[i])->setWhite(JUtility::TColor(0xC8, 0xC8, 0xC8, 0xFF)); + mNameText[i] = ((J2DTextBox*)nameTagPane[i])->getStringPtr(); + } + + mCharColumn = 0; + mCharRow = 0; + + mSelIcon = new dSelect_cursor_c(0, 1.0f, NULL); + mSelIcon->setParam(0.82f, 0.77f, 0.05f, 0.4f, 0.4f); + Vec pos = mMojiIcon[mCharRow + mCharColumn * 5]->getGlobalVtxCenter(false, 0); + mSelIcon->setPos(pos.x, pos.y, mMojiIcon[mCharRow + mCharColumn * 5]->getPanePtr(), true); + mSelIcon->setAlphaRate(0.0f); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1753,80 +1333,118 @@ asm void dName_c::screenSet() { #include "asm/d/d_name/screenSet__7dName_cFv.s" } #pragma pop +#endif /* 80250CEC-80250E54 24B62C 0168+00 2/2 0/0 0/0 .text displayInit__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::displayInit() { - nofralloc -#include "asm/d/d_name/displayInit__7dName_cFv.s" +void dName_c::displayInit() { + mSelIcon->setAlphaRate(FLOAT_LABEL(lit_4009)); + mCurColAnmF = 0; + mCurTexAnmF = 0; + mSelProc = field_0x2ac; + field_0x2ad = field_0x2ae; + + for (int i = 0; i < 65; i++) { + ((J2DTextBox*)mMojiIcon[i]->getPanePtr()) + ->setWhite(JUtility::TColor(0x96, 0x96, 0x96, 0xFF)); + } + + for (int i = 0; i < 4; i++) { + if (mMenuText[i] != NULL) { + mMenuText[i]->setWhite(JUtility::TColor(0x96, 0x96, 0x96, 0xFF)); + } + } + + for (int i = 0; i < 8; i++) { + mNameCursor[i]->hide(); + mChrInfo[i].mColumn = 7; + mChrInfo[i].mRow = 1; + mChrInfo[i].mMojiSet = MOJI_EIGO; + mChrInfo[i].field_0x3 = 1; + mChrInfo[i].mCharacter = ' '; + } + + mIsInputEnd = false; } -#pragma pop /* 80250E54-80251048 24B794 01F4+00 1/1 0/0 0/0 .text NameStrSet__7dName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::NameStrSet() { - nofralloc -#include "asm/d/d_name/NameStrSet__7dName_cFv.s" +void dName_c::NameStrSet() { + char* moji = mNextNameStr; + + int i = 0; + while (*moji != 0) { + if (*(u8*)moji >> 4 == 8 || *(u8*)moji >> 4 == 9) { + mChrInfo[i].mCharacter = *(u16*)moji; + + for (int j = 0; j < 65; j++) { + if (mChrInfo[i].mCharacter == *(u16*)l_mojiHira[j] || + mChrInfo[i].mCharacter == *(u16*)l_mojiHira2[j] || + mChrInfo[i].mCharacter == *(u16*)l_mojiHira3[j]) { + mChrInfo[i].mColumn = j / 5; + mChrInfo[i].mRow = j % 5; + mChrInfo[i].mMojiSet = MOJI_HIRA; + break; + } else if (mChrInfo[i].mCharacter == *(u16*)l_mojikata[j] || + mChrInfo[i].mCharacter == *(u16*)l_mojikata2[j] || + mChrInfo[i].mCharacter == *(u16*)l_mojikata3[j]) { + mChrInfo[i].mColumn = j / 5; + mChrInfo[i].mRow = j % 5; + mChrInfo[i].mMojiSet = MOJI_KATA; + break; + } + } + moji += 2; + i++; + } else { + mChrInfo[i].mCharacter = *moji; + + for (int j = 0; j < 65; j++) { + if (mChrInfo[i].mCharacter == *(u8*)l_mojiEisu[j]) { + mChrInfo[i].mColumn = j / 5; + mChrInfo[i].mRow = j % 5; + mChrInfo[i].mMojiSet = MOJI_EIGO; + break; + } + } + moji++; + i++; + } + } + + mLastCurPos = mCurPos; + mCurPos = i; + setNameText(); + nameCursorMove(); } -#pragma pop /* 80251048-80251094 24B988 004C+00 6/6 0/0 0/0 .text getMenuPosIdx__7dName_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dName_c::getMenuPosIdx(u8 param_0) { - nofralloc -#include "asm/d/d_name/getMenuPosIdx__7dName_cFUc.s" +s32 dName_c::getMenuPosIdx(u8 selPos) { + switch (selPos) { + case 0: + return 0; + case 1: + return 1; + case 2: + return 2; + case 3: + return 3; + } } -#pragma pop /* 80251094-8025115C 24B9D4 00C8+00 1/0 0/0 0/0 .text draw__14dDlst_NameIN_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDlst_NameIN_c::draw() { +// asm void dDlst_NameIN_c::draw() { +extern "C" asm void draw__14dDlst_NameIN_cFv() { nofralloc #include "asm/d/d_name/draw__14dDlst_NameIN_cFv.s" } #pragma pop /* 8025115C-802511A4 24BA9C 0048+00 1/0 0/0 0/0 .text __dt__14dDlst_NameIN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dDlst_NameIN_c::~dDlst_NameIN_c() { - nofralloc -#include "asm/d/d_name/__dt__14dDlst_NameIN_cFv.s" -} -#pragma pop +dDlst_NameIN_c::~dDlst_NameIN_c() {} /* 802511A4-802511EC 24BAE4 0048+00 2/1 0/0 0/0 .text __dt__9dNm_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dNm_HIO_c::~dNm_HIO_c() { - nofralloc -#include "asm/d/d_name/__dt__9dNm_HIO_cFv.s" -} -#pragma pop - -/* 802511EC-80251314 24BB2C 0128+00 0/0 1/0 0/0 .text __sinit_d_name_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_name_cpp() { - nofralloc -#include "asm/d/d_name/__sinit_d_name_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x802511EC, __sinit_d_name_cpp); -#pragma pop +dNm_HIO_c::~dNm_HIO_c() {} /* 80399CC8-80399CC8 026328 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/pane/d_pane_class.cpp b/src/d/pane/d_pane_class.cpp index 2a440437294..c16c6b5db54 100644 --- a/src/d/pane/d_pane_class.cpp +++ b/src/d/pane/d_pane_class.cpp @@ -504,7 +504,7 @@ asm void CPaneMgr::getGlobalVtx(J2DPane* param_0, f32 (*param_1)[3][4], u8 param #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void CPaneMgr::getGlobalVtxCenter(J2DPane* param_0, bool param_1, s16 param_2) { +asm Vec CPaneMgr::getGlobalVtxCenter(J2DPane* param_0, bool param_1, s16 param_2) { nofralloc #include "asm/d/pane/d_pane_class/getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs.s" } diff --git a/src/d/s/d_s_name.cpp b/src/d/s/d_s_name.cpp index 5f359a539ea..2b393e9a2ce 100644 --- a/src/d/s/d_s_name.cpp +++ b/src/d/s/d_s_name.cpp @@ -4,52 +4,83 @@ // #include "d/s/d_s_name.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_overlap_mng.h" +#include "m_Do/m_Do_audio.h" +#include "m_Do/m_Do_machine.h" +#include "m_Do/m_Do_mtx.h" // // Types: // -struct scene_class {}; - -struct request_of_phase_process_class {}; - -struct mDoRst { - static u8 mResetData[4 + 4 /* padding */]; -}; - -struct mDoMch_render_c { - static void* mRenderModeObj[1 + 1 /* padding */]; -}; - -struct mDoGph_gInf_c { - static u8 mFader[4]; -}; - -struct dVibration_c { - /* 8006F268 */ void Run(); - /* 8006FF04 */ void Init(); -}; - -struct dSv_player_get_item_c { - /* 80033E94 */ void offFirstBit(u8); -}; - -struct dSn_HIO_c { +class dSn_HIO_c { +public: /* 8025878C */ dSn_HIO_c(); - /* 802592DC */ ~dSn_HIO_c(); + /* 802592DC */ virtual ~dSn_HIO_c() {} + + /* 0x4 */ s8 field_0x4; + /* 0x5 */ u8 mFileSelWaitTime; }; -struct dScnName_camera_c { - /* 80259294 */ ~dScnName_camera_c(); +class dScnName_camera_c : public camera_class { +public: + dScnName_camera_c() { field_0x22f = 84; } + /* 80259294 */ virtual ~dScnName_camera_c() {} }; -struct dScnName_c { - /* 802588A0 */ void create(); +class dFile_select_c { +public: + /* 8018366C */ dFile_select_c(JKRArchive*); + /* 8018375C */ virtual ~dFile_select_c(); + /* 801843CC */ void _create(); + /* 801844FC */ void _move(); + /* 8018DD38 */ void _draw(); + + bool getFadeFlag() { return mFadeFlag; } + int isDataNew(u8 i) { return mDataNew[i]; } + int isSelectEnd() { return mSelectEnd; } + u8 getSelectNum() { return mSelectNum; } + void setUseType(u8 type) { mUseType = type; } + +private: + u8 field_0x4[0x254]; + /* 0x0258 */ u8 mDataNew[3]; + /* 0x025B */ u8 field_0x25b[0x265 - 0x25b]; + /* 0x0265 */ u8 mSelectNum; + /* 0x0266 */ u8 field_0x266[0x270 - 0x266]; + /* 0x0270 */ bool mSelectEnd; + /* 0x0271 */ u8 field_0x271[0x3b0 - 0x271]; + /* 0x03B0 */ u8 mUseType; + /* 0x03B1 */ u8 field_0x3b1[0x2374 - 0x3b1]; + /* 0x2374 */ bool mFadeFlag; + /* 0x2375 */ u8 field_0x2375[0x237c - 0x2375]; +}; + +class dBrightCheck_c { +public: + /* 80192F10 */ dBrightCheck_c(JKRArchive*); + /* 80192F98 */ virtual ~dBrightCheck_c(); + /* 801934D0 */ void _move(); + /* 80193594 */ void _draw(); + + bool isEnd() { return mEnd; } + + u8 field_0x4[0x15]; + /* 0x19 */ bool mEnd; +}; + +class dScnName_c : public scene_class { +public: + dScnName_c() {} + + /* 802588A0 */ s32 create(); /* 80258B2C */ void setView(); - /* 80258BC8 */ void execute(); - /* 80258C5C */ void draw(); + /* 80258BC8 */ s32 execute(); + /* 80258C5C */ s32 draw(); /* 80258CC8 */ ~dScnName_c(); /* 80258DD0 */ void FileSelectOpen(); /* 80258E34 */ void FileSelectMain(); @@ -58,69 +89,18 @@ struct dScnName_c { /* 80258FD4 */ void brightCheckOpen(); /* 80259008 */ void brightCheck(); /* 802590F8 */ void changeGameScene(); -}; -struct dRes_info_c {}; - -struct JKRHeap { - /* 802CE438 */ void becomeCurrentHeap(); - /* 802CE448 */ void destroy(); -}; - -struct dRes_control_c { - /* 8003C078 */ void setRes(char const*, dRes_info_c*, int, char const*, u8, JKRHeap*); - /* 8003C160 */ void syncRes(char const*, dRes_info_c*, int); - /* 8003C194 */ void deleteRes(char const*, dRes_info_c*, int); - /* 8003C1E4 */ void getResInfo(char const*, dRes_info_c*, int); -}; - -struct dPa_control_c { - /* 8004C054 */ void cleanup(); -}; - -struct dMeter2Info_c { - /* 8021DD5C */ void changeWater(u8); -}; - -struct JKRArchive {}; - -struct dFile_select_c { - /* 8018366C */ dFile_select_c(JKRArchive*); - /* 801843CC */ void _create(); - /* 801844FC */ void _move(); - /* 8018DD38 */ void _draw(); -}; - -struct dDlst_window_c { - /* 80051AC0 */ void setViewPort(f32, f32, f32, f32, f32, f32); - /* 80051ADC */ void setScissor(f32, f32, f32, f32); -}; - -struct dBrightCheck_c { - /* 80192F10 */ dBrightCheck_c(JKRArchive*); - /* 801934D0 */ void _move(); - /* 80193594 */ void _draw(); -}; - -struct Z2SeqMgr { - /* 802AF010 */ void bgmStart(u32, u32, s32); - /* 802AF408 */ void bgmStop(u32, s32); - /* 802AFB94 */ void bgmStreamPrepare(u32); - /* 802AFE18 */ void bgmStreamPlay(); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct Vec {}; - -struct JKRExpHeap { - /* 802CEE2C */ void create(u32, JKRHeap*, bool); -}; - -struct JFWDisplay { - static u8 sManager[4]; +private: + /* 0x1CC */ JKRExpHeap* mHeap; + /* 0x1D0 */ JKRExpHeap* field_0x1d0; + /* 0x1D4 */ dScnName_camera_c mCamera; + /* 0x414 */ dFile_select_c* dFs_c; + /* 0x418 */ dBrightCheck_c* mBrightCheck; + /* 0x41C */ u8 field_0x41c; + /* 0x41D */ u8 field_0x41d; + /* 0x41E */ u8 field_0x41e; + /* 0x41F */ u8 field_0x41f; + /* 0x420 */ u8 field_0x420; }; // @@ -196,23 +176,14 @@ extern "C" void destroy__7JKRHeapFv(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void create__10JKRExpHeapFUlP7JKRHeapb(); -extern "C" void OSGetTime(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXInverse(); -extern "C" void C_MTXPerspective(); extern "C" void __register_global_object(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_28(); extern "C" void _restgpr_28(); extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; extern "C" void* mRenderModeObj__15mDoMch_render_c[1 + 1 /* padding */]; -extern "C" extern u32 g_blackColor; extern "C" u8 mFader__13mDoGph_gInf_c[4]; -extern "C" extern u8 struct_80450BE4[4]; extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; extern "C" u8 sManager__10JFWDisplay[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -227,73 +198,14 @@ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -/* 803C304C-803C3058 -00001 000C+00 0/1 0/0 0/0 .data @3942 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3942[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)FileSelectOpen__10dScnName_cFv, -}; -#pragma pop - -/* 803C3058-803C3064 -00001 000C+00 0/1 0/0 0/0 .data @3943 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3943[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)FileSelectMain__10dScnName_cFv, -}; -#pragma pop - -/* 803C3064-803C3070 -00001 000C+00 0/1 0/0 0/0 .data @3944 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3944[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)FileSelectClose__10dScnName_cFv, -}; -#pragma pop - -/* 803C3070-803C307C -00001 000C+00 0/1 0/0 0/0 .data @3945 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3945[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)brightCheckOpen__10dScnName_cFv, -}; -#pragma pop - -/* 803C307C-803C3088 -00001 000C+00 0/1 0/0 0/0 .data @3946 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3946[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)brightCheck__10dScnName_cFv, -}; -#pragma pop - -/* 803C3088-803C3094 -00001 000C+00 0/1 0/0 0/0 .data @3947 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3947[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)changeGameScene__10dScnName_cFv, -}; -#pragma pop +/* 804510F0-804510F8 0005F0 0008+00 2/2 0/0 0/0 .sbss g_snHIO */ +static dSn_HIO_c g_snHIO; /* 803C3094-803C30DC 0201B4 0048+00 1/2 0/0 0/0 .data MainProc */ -SECTION_DATA static u8 MainProc[72] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +typedef void (dScnName_c::*mainProcFunc)(void); +SECTION_DATA static mainProcFunc MainProc[6] = { + &dScnName_c::FileSelectOpen, &dScnName_c::FileSelectMain, &dScnName_c::FileSelectClose, + &dScnName_c::brightCheckOpen, &dScnName_c::brightCheck, &dScnName_c::changeGameScene, }; /* 803C30DC-803C30F0 -00001 0014+00 2/0 0/0 0/0 .data l_dScnName_Method */ @@ -331,74 +243,39 @@ SECTION_DATA extern void* g_profile_NAMEEX_SCENE[10] = { (void*)NULL, }; -/* 803C3140-803C314C 020260 000C+00 3/3 0/0 0/0 .data __vt__17dScnName_camera_c */ -SECTION_DATA extern void* __vt__17dScnName_camera_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__17dScnName_camera_cFv, -}; - -/* 803C314C-803C3158 02026C 000C+00 2/2 0/0 0/0 .data __vt__9dSn_HIO_c */ -SECTION_DATA extern void* __vt__9dSn_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__9dSn_HIO_cFv, -}; - /* 8025878C-802587A4 2530CC 0018+00 1/1 0/0 0/0 .text __ct__9dSn_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSn_HIO_c::dSn_HIO_c() { - nofralloc -#include "asm/d/s/d_s_name/__ct__9dSn_HIO_cFv.s" +dSn_HIO_c::dSn_HIO_c() { + mFileSelWaitTime = 15; } -#pragma pop - -/* ############################################################################################## */ -/* 8039A2A8-8039A2A8 026908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039A2A8 = "/res/Object/"; -#pragma pop /* 802587A4-80258820 2530E4 007C+00 1/0 0/0 0/0 .text phase_1__FPc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void phase_1(char* param_0) { - nofralloc -#include "asm/d/s/d_s_name/phase_1__FPc.s" +static s32 phase_1(char* resName) { + mDoAud_bgmStart(-1); + if (dComIfG_setObjectRes(resName, 0, NULL) == 0) { + return 5; + } + + return 2; } -#pragma pop /* 80258820-80258878 253160 0058+00 1/0 0/0 0/0 .text phase_2__FPc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void phase_2(char* param_0) { - nofralloc -#include "asm/d/s/d_s_name/phase_2__FPc.s" -} -#pragma pop +static s32 phase_2(char* resName) { + int syncStatus = dComIfG_syncObjectRes(resName); -/* ############################################################################################## */ -/* 80450758-80450760 -00001 0008+00 1/1 0/0 0/0 .sdata l_method$3851 */ -SECTION_SDATA static void* l_method[2] = { - (void*)phase_1__FPc, - (void*)phase_2__FPc, -}; + if (syncStatus < 0) { + return 5; + } else { + return syncStatus > 0 ? 0 : 4; + } +} /* 80258878-802588A0 2531B8 0028+00 1/1 0/0 0/0 .text * resLoad__FP30request_of_phase_process_classPc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void resLoad(request_of_phase_process_class* param_0, char* param_1) { - nofralloc -#include "asm/d/s/d_s_name/resLoad__FP30request_of_phase_process_classPc.s" +static s32 resLoad(request_of_phase_process_class* i_phase, char* param_1) { + static s32 (*l_method[2])(char*) = {phase_1, phase_2}; + + return dComLbG_PhaseHandler(i_phase, (request_of_phase_process_fn)l_method, param_1); } -#pragma pop /* ############################################################################################## */ /* 8039A2A8-8039A2A8 026908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -407,9 +284,6 @@ static asm void resLoad(request_of_phase_process_class* param_0, char* param_1) SECTION_DEAD static char const* const stringBase_8039A2B5 = "fileSel"; #pragma pop -/* 804510F0-804510F8 0005F0 0008+00 2/2 0/0 0/0 .sbss g_snHIO */ -static u8 g_snHIO[8]; - /* 80454EF8-80454EFC 0034F8 0004+00 2/2 0/0 0/0 .sdata2 @3923 */ SECTION_SDATA2 static u8 lit_3923[4] = { 0x00, @@ -437,76 +311,172 @@ SECTION_SDATA2 static f32 lit_3928 = -1000.0f; SECTION_SDATA2 static f64 lit_3930 = 4503599627370496.0 /* cast u32 to float */; /* 802588A0-80258B2C 2531E0 028C+00 1/1 0/0 0/0 .text create__10dScnName_cFv */ +#ifdef NONMATCHING +s32 dScnName_c::create() { + int loadStat = resLoad(&field_0x1c4, "fileSel"); + if (loadStat == 4) { + mHeap = JKRExpHeap::create(0x180000, mDoExt_getGameHeap(), false); + JKRExpHeap* heap = mHeap; + mDoExt_setCurrentHeap(heap); + field_0x1d0 = heap; + + dRes_info_c* res = dComIfG_getObjectResInfo("fileSel"); + dFs_c = new dFile_select_c(res->getArchive()); + dFs_c->_create(); + + if (fpcM_GetName(this) == PROC_NAME_SCENE) { + dFs_c->setUseType(0); + dComIfGs_setNoFile(0); + } + + mBrightCheck = new dBrightCheck_c(res->getArchive()); + + field_0x420 = 0; + g_snHIO.field_0x4 = -1; + field_0x1d0->becomeCurrentHeap(); + + dComIfGp_setWindowNum(1); + dComIfGp_setWindow(0, 0.0f, 0.0f, mDoMch_render_c::getFbWidth(), + mDoMch_render_c::getEfbHeight(), 0.0f, 1.0f, 0, 2); + dComIfGp_setCamera(0, &mCamera); + // dDlst_window_c* window = &g_dComIfG_gameInfo.play.mWindow[0]; + + /* fopCamM_SetNear(&mCamera, 1.0f); + fopCamM_SetFar(&mCamera, 100000.0f); + fopCamM_SetFovy(&mCamera, 45.0f); + fopCamM_SetAspect(&mCamera, mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF()); + fopCamM_SetEye(&mCamera, 0.0f, 0.0f, -1000.0f); + fopCamM_SetCenter(&mCamera, 0.0f, 0.0f, 0.0f); + fopCamM_SetBank(&mCamera, 0); */ + + mCamera.mNear = 1.0f; + mCamera.mFar = 100000.0f; + mCamera.mFovy = 45.0f; + mCamera.mAspect = mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF(); + mCamera.field_0xd8.mEye.set(0.0f, 0.0f, -1000.0f); + mCamera.field_0xd8.mCenter.set(0.0f, 0.0f, 0.0f); + mCamera.mBank = 0; + + dComIfGp_setPlayer(0, NULL); + dComIfGd_setWindow(g_dComIfG_gameInfo.play.mWindow); + dComIfGd_setViewport(g_dComIfG_gameInfo.play.mWindow->getViewPort()); + dComIfGd_setView(&mCamera); + mDoGph_gInf_c::offAutoForcus(); + setView(); + + dKy_setLight_init(); + field_0x41e = g_snHIO.mFileSelWaitTime; + field_0x41c = 0; + field_0x41d = 0; + mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 30); + dComIfGp_getVibration().Init(); + } + return loadStat; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dScnName_c::create() { +asm s32 dScnName_c::create() { nofralloc #include "asm/d/s/d_s_name/create__10dScnName_cFv.s" } #pragma pop +#endif /* 80258B2C-80258BC8 25346C 009C+00 1/1 0/0 0/0 .text setView__10dScnName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnName_c::setView() { - nofralloc -#include "asm/d/s/d_s_name/setView__10dScnName_cFv.s" +void dScnName_c::setView() { + C_MTXPerspective(mCamera.field_0x100, mCamera.mFovy, mCamera.mAspect, mCamera.mNear, + mCamera.mFar); + mDoMtx_lookAt(mCamera.field_0x140, &mCamera.field_0xd8.mEye, &mCamera.field_0xd8.mCenter, + mCamera.mBank); + PSMTXInverse(mCamera.field_0x140, mCamera.field_0x170); + PSMTXCopy(mCamera.field_0x140, mCamera.field_0x1e0); + f32 tmp_0 = FLOAT_LABEL(lit_3923); + mCamera.field_0x1e0[0][3] = tmp_0; + mCamera.field_0x1e0[1][3] = tmp_0; + mCamera.field_0x1e0[2][3] = tmp_0; + PSMTXCopy(mCamera.field_0x140, j3dSys.mViewMtx); + mDoMtx_concatProjView(mCamera.field_0x100, mCamera.field_0x140, mCamera.field_0x1a0); } -#pragma pop /* 80258BC8-80258C5C 253508 0094+00 1/1 0/0 0/0 .text execute__10dScnName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnName_c::execute() { - nofralloc -#include "asm/d/s/d_s_name/execute__10dScnName_cFv.s" +s32 dScnName_c::execute() { + if (fopOvlpM_IsPeek() == 0) { + dComIfG_resetToOpening(this); + } + + if (mDoRst::isReset() && field_0x420 == 0 && !dFs_c->getFadeFlag()) { + return 1; + } + + (this->*MainProc[field_0x41d])(); + return 1; } -#pragma pop /* 80258C5C-80258CC8 25359C 006C+00 1/1 0/0 0/0 .text draw__10dScnName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnName_c::draw() { - nofralloc -#include "asm/d/s/d_s_name/draw__10dScnName_cFv.s" +s32 dScnName_c::draw() { + dComIfGp_getVibration().Run(); + + switch (field_0x41c) { + case 0: + dFs_c->_draw(); + break; + case 1: + mBrightCheck->_draw(); + break; + } + + return 1; } -#pragma pop /* 80258CC8-80258DD0 253608 0108+00 1/1 0/0 0/0 .text __dt__10dScnName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dScnName_c::~dScnName_c() { - nofralloc -#include "asm/d/s/d_s_name/__dt__10dScnName_cFv.s" +dScnName_c::~dScnName_c() { + delete dFs_c; + delete mBrightCheck; + dComIfG_deleteObjectResMain("fileSel"); + mHeap->destroy(); + + for (int i = 0; i < 4; i++) { + dMeter2Info_changeWater(i + SLOT_11); + } + + dComIfGp_setWindowNum(0); + dComIfGd_setView(NULL); } -#pragma pop /* 80258DD0-80258E34 253710 0064+00 1/0 0/0 0/0 .text FileSelectOpen__10dScnName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnName_c::FileSelectOpen() { - nofralloc -#include "asm/d/s/d_s_name/FileSelectOpen__10dScnName_cFv.s" +void dScnName_c::FileSelectOpen() { + if (field_0x41e != 0) { + field_0x41e--; + } else { + mDoAud_bgmStreamPrepare(0x2000000); + mDoAud_bgmStreamPlay(); + field_0x41d = 1; + } } -#pragma pop /* 80258E34-80258E78 253774 0044+00 1/0 0/0 0/0 .text FileSelectMain__10dScnName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnName_c::FileSelectMain() { - nofralloc -#include "asm/d/s/d_s_name/FileSelectMain__10dScnName_cFv.s" +void dScnName_c::FileSelectMain() { + dFs_c->_move(); + + if (fpcM_GetName(this) == PROC_NAME_SCENE) { + FileSelectMainNormal(); + } } -#pragma pop /* 80258E78-80258F20 2537B8 00A8+00 1/1 0/0 0/0 .text FileSelectMainNormal__10dScnName_cFv */ +#ifdef NONMATCHING +void dScnName_c::FileSelectMainNormal() { + if (dFs_c->isSelectEnd() == true) { + field_0x41e = 15; + mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); + mDoGph_gInf_c::startFadeOut(15); + field_0x41d = 2; + field_0x420 = 1; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -515,8 +485,23 @@ asm void dScnName_c::FileSelectMainNormal() { #include "asm/d/s/d_s_name/FileSelectMainNormal__10dScnName_cFv.s" } #pragma pop +#endif /* 80258F20-80258FD4 253860 00B4+00 1/0 0/0 0/0 .text FileSelectClose__10dScnName_cFv */ +#ifdef NONMATCHING +void dScnName_c::FileSelectClose() { + field_0x41e--; + + if (field_0x41e == 0) { + field_0x41d = 3; + field_0x41e = 15; + field_0x41c = 1; + mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); + mDoGph_gInf_c::startFadeIn(15); + field_0x420 = 0; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -525,26 +510,38 @@ asm void dScnName_c::FileSelectClose() { #include "asm/d/s/d_s_name/FileSelectClose__10dScnName_cFv.s" } #pragma pop +#endif /* 80258FD4-80259008 253914 0034+00 1/0 0/0 0/0 .text brightCheckOpen__10dScnName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnName_c::brightCheckOpen() { - nofralloc -#include "asm/d/s/d_s_name/brightCheckOpen__10dScnName_cFv.s" +void dScnName_c::brightCheckOpen() { + if (!mDoRst::isReset()) { + field_0x41e--; + if (field_0x41e == 0) { + field_0x41d = 4; + } + } } -#pragma pop /* 80259008-802590F8 253948 00F0+00 1/0 0/0 0/0 .text brightCheck__10dScnName_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnName_c::brightCheck() { - nofralloc -#include "asm/d/s/d_s_name/brightCheck__10dScnName_cFv.s" +void dScnName_c::brightCheck() { + mBrightCheck->_move(); + + if (mBrightCheck->isEnd()) { + dComIfGs_setSaveTotalTime(dComIfGs_getTotalTime()); + dComIfGs_setSaveStartTime(OSGetTime()); + + mDoAud_bgmStop(0x2D); + field_0x41f = 0; + field_0x41d = 5; + dComIfGs_offItemFirstBit(GREEN_RUPEE); + dComIfGs_offItemFirstBit(BLUE_RUPEE); + dComIfGs_offItemFirstBit(YELLOW_RUPEE); + dComIfGs_offItemFirstBit(RED_RUPEE); + dComIfGs_offItemFirstBit(PURPLE_RUPEE); + dComIfGs_offItemFirstBit(ORANGE_RUPEE); + dComIfGs_offItemFirstBit(SILVER_RUPEE); + } } -#pragma pop /* ############################################################################################## */ /* 8039A2A8-8039A2A8 026908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -556,6 +553,23 @@ SECTION_DEAD static char const* const pad_8039A2C5 = "\0\0"; #pragma pop /* 802590F8-802591C0 253A38 00C8+00 1/0 0/0 0/0 .text changeGameScene__10dScnName_cFv */ +// weird comparison in changeReq +#ifdef NONMATCHING +void dScnName_c::changeGameScene() { + if (!mDoRst::isReset() && !fopOvlpM_IsPeek()) { + dComIfGs_gameStart(); + fopScnM_ChangeReq(this, field_0x41f == 0 ? PROC_PLAY_SCENE : 10, 0, 5); + dComIfGp_offEnableNextStage(); + + if (dFs_c->isDataNew(dFs_c->getSelectNum())) { + dComIfGp_setNextStage("F_SP108", 21, 1, 13); + } + dKy_clear_game_init(); + dComIfGs_resetDan(); + dComIfGs_setRestartRoomParam(0); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -564,95 +578,35 @@ asm void dScnName_c::changeGameScene() { #include "asm/d/s/d_s_name/changeGameScene__10dScnName_cFv.s" } #pragma pop +#endif /* 802591C0-802591E0 253B00 0020+00 1/0 0/0 0/0 .text dScnName_Draw__FP10dScnName_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dScnName_Draw(dScnName_c* param_0) { - nofralloc -#include "asm/d/s/d_s_name/dScnName_Draw__FP10dScnName_c.s" +static void dScnName_Draw(dScnName_c* scn) { + scn->draw(); } -#pragma pop /* 802591E0-80259200 253B20 0020+00 1/0 0/0 0/0 .text dScnName_Execute__FP10dScnName_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dScnName_Execute(dScnName_c* param_0) { - nofralloc -#include "asm/d/s/d_s_name/dScnName_Execute__FP10dScnName_c.s" +static void dScnName_Execute(dScnName_c* scn) { + scn->execute(); } -#pragma pop /* 80259200-80259230 253B40 0030+00 1/0 0/0 0/0 .text dScnName_IsDelete__FP10dScnName_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dScnName_IsDelete(dScnName_c* param_0) { - nofralloc -#include "asm/d/s/d_s_name/dScnName_IsDelete__FP10dScnName_c.s" +static s32 dScnName_IsDelete(dScnName_c*) { + dComIfGp_particle_cleanup(); + return 1; } -#pragma pop /* 80259230-80259258 253B70 0028+00 1/0 0/0 0/0 .text dScnName_Delete__FP10dScnName_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dScnName_Delete(dScnName_c* param_0) { - nofralloc -#include "asm/d/s/d_s_name/dScnName_Delete__FP10dScnName_c.s" +static s32 dScnName_Delete(dScnName_c* scn) { + scn->~dScnName_c(); + return 1; } -#pragma pop /* 80259258-80259294 253B98 003C+00 1/0 0/0 0/0 .text dScnName_Create__FP11scene_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dScnName_Create(scene_class* param_0) { - nofralloc -#include "asm/d/s/d_s_name/dScnName_Create__FP11scene_class.s" +static void dScnName_Create(scene_class* scn) { + new (scn) dScnName_c(); + static_cast(scn)->create(); } -#pragma pop - -/* 80259294-802592DC 253BD4 0048+00 1/0 0/0 0/0 .text __dt__17dScnName_camera_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dScnName_camera_c::~dScnName_camera_c() { - nofralloc -#include "asm/d/s/d_s_name/__dt__17dScnName_camera_cFv.s" -} -#pragma pop - -/* 802592DC-80259324 253C1C 0048+00 2/1 0/0 0/0 .text __dt__9dSn_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSn_HIO_c::~dSn_HIO_c() { - nofralloc -#include "asm/d/s/d_s_name/__dt__9dSn_HIO_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80430768-80430778 05D488 000C+04 1/1 0/0 0/0 .bss @3822 */ -static u8 lit_3822[12 + 4 /* padding */]; - -/* 80259324-80259400 253C64 00DC+00 0/0 1/0 0/0 .text __sinit_d_s_name_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_s_name_cpp() { - nofralloc -#include "asm/d/s/d_s_name/__sinit_d_s_name_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80259324, __sinit_d_s_name_cpp); -#pragma pop /* 8039A2A8-8039A2A8 026908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/f_op/f_op_camera_mng.cpp b/src/f_op/f_op_camera_mng.cpp index 7c8f5d8d6e3..e38edf482bb 100644 --- a/src/f_op/f_op_camera_mng.cpp +++ b/src/f_op/f_op_camera_mng.cpp @@ -18,7 +18,7 @@ static u32 l_fopCamM_id[4]; /* 8001E308-8001E310 018C48 0008+00 0/0 12/12 2/2 .text fopCamM_GetParam__FP12camera_class */ u32 fopCamM_GetParam(camera_class* pCamera) { - return pCamera->parameter; + return pCamera->mBase.mParameters; } /* 8001E310-8001E374 018C50 0064+00 0/0 1/1 0/0 .text fopCamM_Create__FisPv */ diff --git a/src/f_op/f_op_view.cpp b/src/f_op/f_op_view.cpp index 1413019f213..1c6102a15dd 100644 --- a/src/f_op/f_op_view.cpp +++ b/src/f_op/f_op_view.cpp @@ -34,23 +34,23 @@ extern "C" void fpcMtd_Create__FP20process_method_classPv(); /* 8001F1A8-8001F1D0 019AE8 0028+00 1/0 0/0 0/0 .text fopVw_Draw__FP10view_class */ void fopVw_Draw(view_class* pView) { - fpcLf_DrawMethod((leafdraw_method_class*)pView->pmProcessMtd, pView); + fpcLf_DrawMethod(pView->mpLeafdrawMtd, pView); } /* 8001F1D0-8001F1F8 019B10 0028+00 1/0 0/0 0/0 .text fopVw_Execute__FP10view_class */ void fopVw_Execute(view_class* pView) { - fpcMtd_Execute(pView->pmProcessMtd, pView); + fpcMtd_Execute((process_method_class*)pView->mpLeafdrawMtd, pView); } /* 8001F1F8-8001F220 019B38 0028+00 1/0 0/0 0/0 .text fopVw_IsDelete__FPv */ s32 fopVw_IsDelete(void* param_1) { view_class* pView = (view_class*)param_1; - return fpcMtd_IsDelete(pView->pmProcessMtd, pView); + return fpcMtd_IsDelete((process_method_class*)pView->mpLeafdrawMtd, pView); } /* 8001F220-8001F248 019B60 0028+00 1/0 0/0 0/0 .text fopVw_Delete__FP10view_class */ s32 fopVw_Delete(view_class* pView) { - return fpcMtd_Delete(pView->pmProcessMtd, pView); + return fpcMtd_Delete((process_method_class*)pView->mpLeafdrawMtd, pView); } /* 8001F248-8001F284 019B88 003C+00 1/0 0/0 0/0 .text fopVw_Create__FPv */ diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 123db56641d..a4b1b4f12e3 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -239,7 +239,7 @@ static bool data_80450BE5; u8 data_80450BE6; -static bool data_80450BE7; +bool data_80450BE7; #pragma pop /* 80007E44-80007F90 002784 014C+00 1/1 0/0 0/0 .text create__13mDoGph_gInf_cFv */