diff --git a/Progress.md b/Progress.md index b80c5676696..0d92a58eed6 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 49.296436% | 1772968 | 3596544 +.text | 49.647439% | 1785592 | 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 | 54.640219% | 2196904 | 4020672 +Total | 54.954197% | 2209528 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 54.640219% | 2196904 | 4020672 +main.dol | 54.954197% | 2209528 | 4020672 RELs | 38.629138% | 4442476 | 11500324 -Total | 42.776765% | 6639380 | 15520996 +Total | 42.858100% | 6652004 | 15520996 ## RELs diff --git a/asm/msg/scrn/d_msg_scrn_3select/__ct__17dMsgScrn3Select_cFv.s b/asm/msg/scrn/d_msg_scrn_3select/__ct__17dMsgScrn3Select_cFv.s deleted file mode 100644 index fb11a1b02d8..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/__ct__17dMsgScrn3Select_cFv.s +++ /dev/null @@ -1,536 +0,0 @@ -lbl_802390B4: -/* 802390B4 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 802390B8 7C 08 02 A6 */ mflr r0 -/* 802390BC 90 01 00 64 */ stw r0, 0x64(r1) -/* 802390C0 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 802390C4 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 802390C8 39 61 00 50 */ addi r11, r1, 0x50 -/* 802390CC 48 12 90 ED */ bl _savegpr_20 -/* 802390D0 7C 7F 1B 78 */ mr r31, r3 -/* 802390D4 3C 80 80 3C */ lis r4, __vt__17dMsgScrn3Select_c@ha /* 0x803C0CE8@ha */ -/* 802390D8 38 04 0C E8 */ addi r0, r4, __vt__17dMsgScrn3Select_c@l /* 0x803C0CE8@l */ -/* 802390DC 90 03 00 00 */ stw r0, 0(r3) -/* 802390E0 38 00 FF FF */ li r0, -1 -/* 802390E4 90 03 00 C4 */ stw r0, 0xc4(r3) -/* 802390E8 90 03 00 C8 */ stw r0, 0xc8(r3) -/* 802390EC 38 60 01 18 */ li r3, 0x118 -/* 802390F0 48 09 5B 5D */ bl __nw__FUl -/* 802390F4 7C 60 1B 79 */ or. r0, r3, r3 -/* 802390F8 41 82 00 0C */ beq lbl_80239104 -/* 802390FC 48 0B F3 9D */ bl __ct__9J2DScreenFv -/* 80239100 7C 60 1B 78 */ mr r0, r3 -lbl_80239104: -/* 80239104 90 1F 00 04 */ stw r0, 4(r31) -/* 80239108 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023910C 3C 80 80 3A */ lis r4, msg_scrn_d_msg_scrn_3select__stringBase0@ha /* 0x80399840@ha */ -/* 80239110 38 84 98 40 */ addi r4, r4, msg_scrn_d_msg_scrn_3select__stringBase0@l /* 0x80399840@l */ -/* 80239114 3C A0 00 02 */ lis r5, 2 -/* 80239118 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8023911C 3A 86 61 C0 */ addi r20, r6, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80239120 80 D4 5C 6C */ lwz r6, 0x5c6c(r20) -/* 80239124 48 0B F5 25 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 80239128 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023912C 48 01 BF BD */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 80239130 38 60 00 04 */ li r3, 4 -/* 80239134 64 63 00 04 */ oris r3, r3, 4 -/* 80239138 7C 72 E3 A6 */ mtspr 0x392, r3 -/* 8023913C 38 60 00 05 */ li r3, 5 -/* 80239140 64 63 00 05 */ oris r3, r3, 5 -/* 80239144 7C 73 E3 A6 */ mtspr 0x393, r3 -/* 80239148 38 60 00 06 */ li r3, 6 -/* 8023914C 64 63 00 06 */ oris r3, r3, 6 -/* 80239150 7C 74 E3 A6 */ mtspr 0x394, r3 -/* 80239154 38 60 00 07 */ li r3, 7 -/* 80239158 64 63 00 07 */ oris r3, r3, 7 -/* 8023915C 7C 75 E3 A6 */ mtspr 0x395, r3 -/* 80239160 3C 80 80 3A */ lis r4, msg_scrn_d_msg_scrn_3select__stringBase0@ha /* 0x80399840@ha */ -/* 80239164 38 84 98 40 */ addi r4, r4, msg_scrn_d_msg_scrn_3select__stringBase0@l /* 0x80399840@l */ -/* 80239168 38 64 00 17 */ addi r3, r4, 0x17 -/* 8023916C 80 94 5C 6C */ lwz r4, 0x5c6c(r20) -/* 80239170 48 09 B1 01 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80239174 48 0C F8 F9 */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 80239178 90 7F 00 08 */ stw r3, 8(r31) -/* 8023917C C0 22 B1 58 */ lfs f1, lit_3909(r2) -/* 80239180 D0 3F 00 F0 */ stfs f1, 0xf0(r31) -/* 80239184 C0 02 B1 5C */ lfs f0, lit_3910(r2) -/* 80239188 D0 1F 00 F0 */ stfs f0, 0xf0(r31) -/* 8023918C D0 3F 00 FC */ stfs f1, 0xfc(r31) -/* 80239190 3C 80 80 3A */ lis r4, msg_scrn_d_msg_scrn_3select__stringBase0@ha /* 0x80399840@ha */ -/* 80239194 38 84 98 40 */ addi r4, r4, msg_scrn_d_msg_scrn_3select__stringBase0@l /* 0x80399840@l */ -/* 80239198 38 64 00 2E */ addi r3, r4, 0x2e -/* 8023919C 80 94 5C 6C */ lwz r4, 0x5c6c(r20) -/* 802391A0 48 09 B0 D1 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 802391A4 48 0C F8 C9 */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 802391A8 90 7F 00 0C */ stw r3, 0xc(r31) -/* 802391AC 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802391B0 80 9F 00 04 */ lwz r4, 4(r31) -/* 802391B4 81 83 00 00 */ lwz r12, 0(r3) -/* 802391B8 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802391BC 7D 89 03 A6 */ mtctr r12 -/* 802391C0 4E 80 04 21 */ bctrl -/* 802391C4 C0 02 B1 58 */ lfs f0, lit_3909(r2) -/* 802391C8 D0 1F 00 F4 */ stfs f0, 0xf4(r31) -/* 802391CC 3C 80 80 3A */ lis r4, msg_scrn_d_msg_scrn_3select__stringBase0@ha /* 0x80399840@ha */ -/* 802391D0 38 84 98 40 */ addi r4, r4, msg_scrn_d_msg_scrn_3select__stringBase0@l /* 0x80399840@l */ -/* 802391D4 38 64 00 45 */ addi r3, r4, 0x45 -/* 802391D8 80 94 5C 6C */ lwz r4, 0x5c6c(r20) -/* 802391DC 48 09 B0 95 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 802391E0 48 0C F8 8D */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 802391E4 90 7F 00 10 */ stw r3, 0x10(r31) -/* 802391E8 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 802391EC 80 9F 00 04 */ lwz r4, 4(r31) -/* 802391F0 81 83 00 00 */ lwz r12, 0(r3) -/* 802391F4 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802391F8 7D 89 03 A6 */ mtctr r12 -/* 802391FC 4E 80 04 21 */ bctrl -/* 80239200 C0 02 B1 58 */ lfs f0, lit_3909(r2) -/* 80239204 D0 1F 00 F8 */ stfs f0, 0xf8(r31) -/* 80239208 38 60 00 B8 */ li r3, 0xb8 -/* 8023920C 48 09 5A 41 */ bl __nw__FUl -/* 80239210 7C 60 1B 79 */ or. r0, r3, r3 -/* 80239214 41 82 00 18 */ beq lbl_8023922C -/* 80239218 38 80 00 00 */ li r4, 0 -/* 8023921C C0 22 B1 60 */ lfs f1, lit_3911(r2) -/* 80239220 38 A0 00 00 */ li r5, 0 -/* 80239224 4B F5 AF FD */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive -/* 80239228 7C 60 1B 78 */ mr r0, r3 -lbl_8023922C: -/* 8023922C 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80239230 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 80239234 C0 22 B1 58 */ lfs f1, lit_3909(r2) -/* 80239238 4B F5 C0 69 */ bl setAlphaRate__16dSelect_cursor_cFf -/* 8023923C 38 60 00 6C */ li r3, 0x6c -/* 80239240 48 09 5A 0D */ bl __nw__FUl -/* 80239244 7C 60 1B 79 */ or. r0, r3, r3 -/* 80239248 41 82 00 24 */ beq lbl_8023926C -/* 8023924C 80 9F 00 04 */ lwz r4, 4(r31) -/* 80239250 3C A0 62 63 */ lis r5, 0x6263 /* 0x62635F6E@ha */ -/* 80239254 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x62635F6E@l */ -/* 80239258 38 A0 00 61 */ li r5, 0x61 -/* 8023925C 38 E0 00 00 */ li r7, 0 -/* 80239260 39 00 00 00 */ li r8, 0 -/* 80239264 48 01 A7 21 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80239268 7C 60 1B 78 */ mr r0, r3 -lbl_8023926C: -/* 8023926C 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80239270 3B 60 00 00 */ li r27, 0 -/* 80239274 3B 20 00 00 */ li r25, 0 -/* 80239278 3B A0 00 00 */ li r29, 0 -/* 8023927C 3B 40 00 00 */ li r26, 0 -/* 80239280 C3 E2 B1 58 */ lfs f31, lit_3909(r2) -/* 80239284 3C 80 80 3A */ lis r4, tag_name@ha /* 0x80399708@ha */ -/* 80239288 3B 04 97 08 */ addi r24, r4, tag_name@l /* 0x80399708@l */ -lbl_8023928C: -/* 8023928C 7F 9F D2 14 */ add r28, r31, r26 -/* 80239290 D3 FC 00 CC */ stfs f31, 0xcc(r28) -/* 80239294 D3 FC 00 D0 */ stfs f31, 0xd0(r28) -/* 80239298 D3 FC 00 D4 */ stfs f31, 0xd4(r28) -/* 8023929C 38 60 00 6C */ li r3, 0x6c -/* 802392A0 48 09 59 AD */ bl __nw__FUl -/* 802392A4 7C 60 1B 79 */ or. r0, r3, r3 -/* 802392A8 41 82 00 2C */ beq lbl_802392D4 -/* 802392AC 80 9F 00 04 */ lwz r4, 4(r31) -/* 802392B0 3C A0 80 3A */ lis r5, tag_name@ha /* 0x80399708@ha */ -/* 802392B4 38 05 97 08 */ addi r0, r5, tag_name@l /* 0x80399708@l */ -/* 802392B8 7C C0 EA 14 */ add r6, r0, r29 -/* 802392BC 80 A6 00 00 */ lwz r5, 0(r6) -/* 802392C0 80 C6 00 04 */ lwz r6, 4(r6) -/* 802392C4 38 E0 00 00 */ li r7, 0 -/* 802392C8 39 00 00 00 */ li r8, 0 -/* 802392CC 48 01 A6 B9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 802392D0 7C 60 1B 78 */ mr r0, r3 -lbl_802392D4: -/* 802392D4 7F DF CA 14 */ add r30, r31, r25 -/* 802392D8 90 1E 00 34 */ stw r0, 0x34(r30) -/* 802392DC 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 802392E0 48 01 C3 29 */ bl hide__13CPaneMgrAlphaFv -/* 802392E4 38 60 00 6C */ li r3, 0x6c -/* 802392E8 48 09 59 65 */ bl __nw__FUl -/* 802392EC 7C 60 1B 79 */ or. r0, r3, r3 -/* 802392F0 41 82 00 2C */ beq lbl_8023931C -/* 802392F4 80 9F 00 04 */ lwz r4, 4(r31) -/* 802392F8 3C A0 80 3A */ lis r5, tag_name@ha /* 0x80399708@ha */ -/* 802392FC 38 05 97 08 */ addi r0, r5, tag_name@l /* 0x80399708@l */ -/* 80239300 7C C0 EA 14 */ add r6, r0, r29 -/* 80239304 80 A6 00 08 */ lwz r5, 8(r6) -/* 80239308 80 C6 00 0C */ lwz r6, 0xc(r6) -/* 8023930C 38 E0 00 00 */ li r7, 0 -/* 80239310 39 00 00 00 */ li r8, 0 -/* 80239314 48 01 A6 71 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80239318 7C 60 1B 78 */ mr r0, r3 -lbl_8023931C: -/* 8023931C 90 1E 00 40 */ stw r0, 0x40(r30) -/* 80239320 80 9E 00 40 */ lwz r4, 0x40(r30) -/* 80239324 80 64 00 04 */ lwz r3, 4(r4) -/* 80239328 80 9F 00 10 */ lwz r4, 0x10(r31) -/* 8023932C 81 83 00 00 */ lwz r12, 0(r3) -/* 80239330 81 8C 00 6C */ lwz r12, 0x6c(r12) -/* 80239334 7D 89 03 A6 */ mtctr r12 -/* 80239338 4E 80 04 21 */ bctrl -/* 8023933C 38 60 00 6C */ li r3, 0x6c -/* 80239340 48 09 59 0D */ bl __nw__FUl -/* 80239344 7C 60 1B 79 */ or. r0, r3, r3 -/* 80239348 41 82 00 2C */ beq lbl_80239374 -/* 8023934C 80 9F 00 04 */ lwz r4, 4(r31) -/* 80239350 3C A0 80 3A */ lis r5, tag_name@ha /* 0x80399708@ha */ -/* 80239354 38 05 97 08 */ addi r0, r5, tag_name@l /* 0x80399708@l */ -/* 80239358 7C C0 EA 14 */ add r6, r0, r29 -/* 8023935C 80 A6 00 10 */ lwz r5, 0x10(r6) -/* 80239360 80 C6 00 14 */ lwz r6, 0x14(r6) -/* 80239364 38 E0 00 00 */ li r7, 0 -/* 80239368 39 00 00 00 */ li r8, 0 -/* 8023936C 48 01 A6 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80239370 7C 60 1B 78 */ mr r0, r3 -lbl_80239374: -/* 80239374 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80239378 80 9E 00 4C */ lwz r4, 0x4c(r30) -/* 8023937C 80 64 00 04 */ lwz r3, 4(r4) -/* 80239380 80 9F 00 10 */ lwz r4, 0x10(r31) -/* 80239384 81 83 00 00 */ lwz r12, 0(r3) -/* 80239388 81 8C 00 6C */ lwz r12, 0x6c(r12) -/* 8023938C 7D 89 03 A6 */ mtctr r12 -/* 80239390 4E 80 04 21 */ bctrl -/* 80239394 38 60 00 6C */ li r3, 0x6c -/* 80239398 48 09 58 B5 */ bl __nw__FUl -/* 8023939C 7C 60 1B 79 */ or. r0, r3, r3 -/* 802393A0 41 82 00 2C */ beq lbl_802393CC -/* 802393A4 80 9F 00 04 */ lwz r4, 4(r31) -/* 802393A8 3C A0 80 3A */ lis r5, tag_name@ha /* 0x80399708@ha */ -/* 802393AC 38 05 97 08 */ addi r0, r5, tag_name@l /* 0x80399708@l */ -/* 802393B0 7C C0 EA 14 */ add r6, r0, r29 -/* 802393B4 80 A6 00 18 */ lwz r5, 0x18(r6) -/* 802393B8 80 C6 00 1C */ lwz r6, 0x1c(r6) -/* 802393BC 38 E0 00 00 */ li r7, 0 -/* 802393C0 39 00 00 00 */ li r8, 0 -/* 802393C4 48 01 A5 C1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 802393C8 7C 60 1B 78 */ mr r0, r3 -lbl_802393CC: -/* 802393CC 90 1E 00 58 */ stw r0, 0x58(r30) -/* 802393D0 80 9E 00 58 */ lwz r4, 0x58(r30) -/* 802393D4 80 64 00 04 */ lwz r3, 4(r4) -/* 802393D8 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 802393DC 81 83 00 00 */ lwz r12, 0(r3) -/* 802393E0 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 802393E4 7D 89 03 A6 */ mtctr r12 -/* 802393E8 4E 80 04 21 */ bctrl -/* 802393EC 3A C0 00 00 */ li r22, 0 -/* 802393F0 3A A0 00 00 */ li r21, 0 -/* 802393F4 3A 80 00 00 */ li r20, 0 -/* 802393F8 7E F8 EA 14 */ add r23, r24, r29 -lbl_802393FC: -/* 802393FC 38 60 00 6C */ li r3, 0x6c -/* 80239400 48 09 58 4D */ bl __nw__FUl -/* 80239404 7C 64 1B 79 */ or. r4, r3, r3 -/* 80239408 41 82 00 28 */ beq lbl_80239430 -/* 8023940C 80 9F 00 04 */ lwz r4, 4(r31) -/* 80239410 38 14 00 20 */ addi r0, r20, 0x20 -/* 80239414 7C D7 02 14 */ add r6, r23, r0 -/* 80239418 80 A6 00 00 */ lwz r5, 0(r6) -/* 8023941C 80 C6 00 04 */ lwz r6, 4(r6) -/* 80239420 38 E0 00 00 */ li r7, 0 -/* 80239424 39 00 00 00 */ li r8, 0 -/* 80239428 48 01 A5 5D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8023942C 7C 64 1B 78 */ mr r4, r3 -lbl_80239430: -/* 80239430 38 15 00 64 */ addi r0, r21, 0x64 -/* 80239434 7C 9E 01 2E */ stwx r4, r30, r0 -/* 80239438 3A D6 00 01 */ addi r22, r22, 1 -/* 8023943C 2C 16 00 05 */ cmpwi r22, 5 -/* 80239440 3A B5 00 0C */ addi r21, r21, 0xc -/* 80239444 3A 94 00 08 */ addi r20, r20, 8 -/* 80239448 41 80 FF B4 */ blt lbl_802393FC -/* 8023944C 38 60 00 6C */ li r3, 0x6c -/* 80239450 48 09 57 FD */ bl __nw__FUl -/* 80239454 7C 60 1B 79 */ or. r0, r3, r3 -/* 80239458 41 82 00 20 */ beq lbl_80239478 -/* 8023945C 80 9F 00 04 */ lwz r4, 4(r31) -/* 80239460 80 B7 00 48 */ lwz r5, 0x48(r23) -/* 80239464 80 D7 00 4C */ lwz r6, 0x4c(r23) -/* 80239468 38 E0 00 00 */ li r7, 0 -/* 8023946C 39 00 00 00 */ li r8, 0 -/* 80239470 48 01 A5 15 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80239474 7C 60 1B 78 */ mr r0, r3 -lbl_80239478: -/* 80239478 90 1E 00 A0 */ stw r0, 0xa0(r30) -/* 8023947C 80 7E 00 A0 */ lwz r3, 0xa0(r30) -/* 80239480 48 01 C1 89 */ bl hide__13CPaneMgrAlphaFv -/* 80239484 38 60 00 6C */ li r3, 0x6c -/* 80239488 48 09 57 C5 */ bl __nw__FUl -/* 8023948C 7C 60 1B 79 */ or. r0, r3, r3 -/* 80239490 41 82 00 20 */ beq lbl_802394B0 -/* 80239494 80 9F 00 04 */ lwz r4, 4(r31) -/* 80239498 80 B7 00 50 */ lwz r5, 0x50(r23) -/* 8023949C 80 D7 00 54 */ lwz r6, 0x54(r23) -/* 802394A0 38 E0 00 00 */ li r7, 0 -/* 802394A4 39 00 00 00 */ li r8, 0 -/* 802394A8 48 01 A4 DD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 802394AC 7C 60 1B 78 */ mr r0, r3 -lbl_802394B0: -/* 802394B0 90 1E 00 AC */ stw r0, 0xac(r30) -/* 802394B4 38 60 00 6C */ li r3, 0x6c -/* 802394B8 48 09 57 95 */ bl __nw__FUl -/* 802394BC 7C 60 1B 79 */ or. r0, r3, r3 -/* 802394C0 41 82 00 20 */ beq lbl_802394E0 -/* 802394C4 80 9F 00 04 */ lwz r4, 4(r31) -/* 802394C8 80 B7 00 58 */ lwz r5, 0x58(r23) -/* 802394CC 80 D7 00 5C */ lwz r6, 0x5c(r23) -/* 802394D0 38 E0 00 00 */ li r7, 0 -/* 802394D4 39 00 00 00 */ li r8, 0 -/* 802394D8 48 01 A4 AD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 802394DC 7C 60 1B 78 */ mr r0, r3 -lbl_802394E0: -/* 802394E0 90 1E 00 B8 */ stw r0, 0xb8(r30) -/* 802394E4 80 9E 00 B8 */ lwz r4, 0xb8(r30) -/* 802394E8 38 61 00 0C */ addi r3, r1, 0xc -/* 802394EC 80 A4 00 04 */ lwz r5, 4(r4) -/* 802394F0 38 C0 00 01 */ li r6, 1 -/* 802394F4 38 E0 00 00 */ li r7, 0 -/* 802394F8 48 01 B9 C5 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs -/* 802394FC C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80239500 D0 1C 00 CC */ stfs f0, 0xcc(r28) -/* 80239504 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80239508 D0 1C 00 D0 */ stfs f0, 0xd0(r28) -/* 8023950C C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80239510 D0 1C 00 D4 */ stfs f0, 0xd4(r28) -/* 80239514 3B 7B 00 01 */ addi r27, r27, 1 -/* 80239518 2C 1B 00 03 */ cmpwi r27, 3 -/* 8023951C 3B 39 00 04 */ addi r25, r25, 4 -/* 80239520 3B BD 00 60 */ addi r29, r29, 0x60 -/* 80239524 3B 5A 00 0C */ addi r26, r26, 0xc -/* 80239528 41 80 FD 64 */ blt lbl_8023928C -/* 8023952C 38 60 00 6C */ li r3, 0x6c -/* 80239530 48 09 57 1D */ bl __nw__FUl -/* 80239534 7C 60 1B 79 */ or. r0, r3, r3 -/* 80239538 41 82 00 24 */ beq lbl_8023955C -/* 8023953C 80 9F 00 04 */ lwz r4, 4(r31) -/* 80239540 3C A0 5F 74 */ lis r5, 0x5F74 /* 0x5F745F65@ha */ -/* 80239544 38 C5 5F 65 */ addi r6, r5, 0x5F65 /* 0x5F745F65@l */ -/* 80239548 38 A0 00 61 */ li r5, 0x61 -/* 8023954C 38 E0 00 00 */ li r7, 0 -/* 80239550 39 00 00 00 */ li r8, 0 -/* 80239554 48 01 A4 31 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80239558 7C 60 1B 78 */ mr r0, r3 -lbl_8023955C: -/* 8023955C 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 80239560 38 60 00 6C */ li r3, 0x6c -/* 80239564 48 09 56 E9 */ bl __nw__FUl -/* 80239568 7C 60 1B 79 */ or. r0, r3, r3 -/* 8023956C 41 82 00 24 */ beq lbl_80239590 -/* 80239570 80 9F 00 04 */ lwz r4, 4(r31) -/* 80239574 3C A0 5F 74 */ lis r5, 0x5F74 /* 0x5F745F65@ha */ -/* 80239578 38 C5 5F 65 */ addi r6, r5, 0x5F65 /* 0x5F745F65@l */ -/* 8023957C 38 A0 00 62 */ li r5, 0x62 -/* 80239580 38 E0 00 00 */ li r7, 0 -/* 80239584 39 00 00 00 */ li r8, 0 -/* 80239588 48 01 A3 FD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8023958C 7C 60 1B 78 */ mr r0, r3 -lbl_80239590: -/* 80239590 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80239594 38 60 00 6C */ li r3, 0x6c -/* 80239598 48 09 56 B5 */ bl __nw__FUl -/* 8023959C 7C 60 1B 79 */ or. r0, r3, r3 -/* 802395A0 41 82 00 24 */ beq lbl_802395C4 -/* 802395A4 80 9F 00 04 */ lwz r4, 4(r31) -/* 802395A8 3C A0 5F 74 */ lis r5, 0x5F74 /* 0x5F745F65@ha */ -/* 802395AC 38 C5 5F 65 */ addi r6, r5, 0x5F65 /* 0x5F745F65@l */ -/* 802395B0 38 A0 00 63 */ li r5, 0x63 -/* 802395B4 38 E0 00 00 */ li r7, 0 -/* 802395B8 39 00 00 00 */ li r8, 0 -/* 802395BC 48 01 A3 C9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 802395C0 7C 60 1B 78 */ mr r0, r3 -lbl_802395C4: -/* 802395C4 90 1F 00 24 */ stw r0, 0x24(r31) -/* 802395C8 3B 20 00 00 */ li r25, 0 -/* 802395CC 3A C0 00 00 */ li r22, 0 -/* 802395D0 3C 80 80 3A */ lis r4, msg_scrn_d_msg_scrn_3select__stringBase0@ha /* 0x80399840@ha */ -/* 802395D4 3A A4 98 40 */ addi r21, r4, msg_scrn_d_msg_scrn_3select__stringBase0@l /* 0x80399840@l */ -/* 802395D8 3A 80 00 00 */ li r20, 0 -lbl_802395DC: -/* 802395DC 7F 1F B2 14 */ add r24, r31, r22 -/* 802395E0 80 98 00 1C */ lwz r4, 0x1c(r24) -/* 802395E4 80 64 00 04 */ lwz r3, 4(r4) -/* 802395E8 38 80 00 40 */ li r4, 0x40 -/* 802395EC 38 B5 00 5C */ addi r5, r21, 0x5c -/* 802395F0 4C C6 31 82 */ crclr 6 -/* 802395F4 48 0C 71 59 */ bl setString__10J2DTextBoxFsPCce -/* 802395F8 80 98 00 1C */ lwz r4, 0x1c(r24) -/* 802395FC 82 E4 00 04 */ lwz r23, 4(r4) -/* 80239600 4B DD B3 F1 */ bl mDoExt_getMesgFont__Fv -/* 80239604 7C 64 1B 78 */ mr r4, r3 -/* 80239608 7E E3 BB 78 */ mr r3, r23 -/* 8023960C 81 97 00 00 */ lwz r12, 0(r23) -/* 80239610 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 80239614 7D 89 03 A6 */ mtctr r12 -/* 80239618 4E 80 04 21 */ bctrl -/* 8023961C 92 98 00 28 */ stw r20, 0x28(r24) -/* 80239620 3B 39 00 01 */ addi r25, r25, 1 -/* 80239624 2C 19 00 03 */ cmpwi r25, 3 -/* 80239628 3A D6 00 04 */ addi r22, r22, 4 -/* 8023962C 41 80 FF B0 */ blt lbl_802395DC -/* 80239630 80 7F 00 04 */ lwz r3, 4(r31) -/* 80239634 3C 80 5F 74 */ lis r4, 0x5F74 /* 0x5F745F65@ha */ -/* 80239638 38 C4 5F 65 */ addi r6, r4, 0x5F65 /* 0x5F745F65@l */ -/* 8023963C 38 A0 00 61 */ li r5, 0x61 -/* 80239640 81 83 00 00 */ lwz r12, 0(r3) -/* 80239644 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80239648 7D 89 03 A6 */ mtctr r12 -/* 8023964C 4E 80 04 21 */ bctrl -/* 80239650 38 00 00 01 */ li r0, 1 -/* 80239654 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80239658 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023965C 3C 80 5F 74 */ lis r4, 0x5F74 /* 0x5F745F65@ha */ -/* 80239660 38 C4 5F 65 */ addi r6, r4, 0x5F65 /* 0x5F745F65@l */ -/* 80239664 38 A0 00 62 */ li r5, 0x62 -/* 80239668 81 83 00 00 */ lwz r12, 0(r3) -/* 8023966C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80239670 7D 89 03 A6 */ mtctr r12 -/* 80239674 4E 80 04 21 */ bctrl -/* 80239678 38 00 00 01 */ li r0, 1 -/* 8023967C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80239680 80 7F 00 04 */ lwz r3, 4(r31) -/* 80239684 3C 80 5F 74 */ lis r4, 0x5F74 /* 0x5F745F65@ha */ -/* 80239688 38 C4 5F 65 */ addi r6, r4, 0x5F65 /* 0x5F745F65@l */ -/* 8023968C 38 A0 00 63 */ li r5, 0x63 -/* 80239690 81 83 00 00 */ lwz r12, 0(r3) -/* 80239694 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80239698 7D 89 03 A6 */ mtctr r12 -/* 8023969C 4E 80 04 21 */ bctrl -/* 802396A0 38 00 00 01 */ li r0, 1 -/* 802396A4 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 802396A8 80 7F 00 04 */ lwz r3, 4(r31) -/* 802396AC 3C 80 61 5F */ lis r4, 0x615F /* 0x615F7466@ha */ -/* 802396B0 38 C4 74 66 */ addi r6, r4, 0x7466 /* 0x615F7466@l */ -/* 802396B4 38 A0 00 00 */ li r5, 0 -/* 802396B8 81 83 00 00 */ lwz r12, 0(r3) -/* 802396BC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802396C0 7D 89 03 A6 */ mtctr r12 -/* 802396C4 4E 80 04 21 */ bctrl -/* 802396C8 38 00 00 00 */ li r0, 0 -/* 802396CC 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 802396D0 80 7F 00 04 */ lwz r3, 4(r31) -/* 802396D4 3C 80 62 5F */ lis r4, 0x625F /* 0x625F7466@ha */ -/* 802396D8 38 C4 74 66 */ addi r6, r4, 0x7466 /* 0x625F7466@l */ -/* 802396DC 38 A0 00 00 */ li r5, 0 -/* 802396E0 81 83 00 00 */ lwz r12, 0(r3) -/* 802396E4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802396E8 7D 89 03 A6 */ mtctr r12 -/* 802396EC 4E 80 04 21 */ bctrl -/* 802396F0 38 00 00 00 */ li r0, 0 -/* 802396F4 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 802396F8 80 7F 00 04 */ lwz r3, 4(r31) -/* 802396FC 3C 80 63 5F */ lis r4, 0x635F /* 0x635F7466@ha */ -/* 80239700 38 C4 74 66 */ addi r6, r4, 0x7466 /* 0x635F7466@l */ -/* 80239704 38 A0 00 00 */ li r5, 0 -/* 80239708 81 83 00 00 */ lwz r12, 0(r3) -/* 8023970C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80239710 7D 89 03 A6 */ mtctr r12 -/* 80239714 4E 80 04 21 */ bctrl -/* 80239718 38 00 00 00 */ li r0, 0 -/* 8023971C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80239720 80 7F 00 04 */ lwz r3, 4(r31) -/* 80239724 3C 80 74 66 */ lis r4, 0x7466 /* 0x74665F66@ha */ -/* 80239728 38 C4 5F 66 */ addi r6, r4, 0x5F66 /* 0x74665F66@l */ -/* 8023972C 38 A0 61 5F */ li r5, 0x615f -/* 80239730 81 83 00 00 */ lwz r12, 0(r3) -/* 80239734 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80239738 7D 89 03 A6 */ mtctr r12 -/* 8023973C 4E 80 04 21 */ bctrl -/* 80239740 38 00 00 00 */ li r0, 0 -/* 80239744 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80239748 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023974C 3C 80 74 66 */ lis r4, 0x7466 /* 0x74665F66@ha */ -/* 80239750 38 C4 5F 66 */ addi r6, r4, 0x5F66 /* 0x74665F66@l */ -/* 80239754 38 A0 62 5F */ li r5, 0x625f -/* 80239758 81 83 00 00 */ lwz r12, 0(r3) -/* 8023975C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80239760 7D 89 03 A6 */ mtctr r12 -/* 80239764 4E 80 04 21 */ bctrl -/* 80239768 38 00 00 00 */ li r0, 0 -/* 8023976C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80239770 80 7F 00 04 */ lwz r3, 4(r31) -/* 80239774 3C 80 74 66 */ lis r4, 0x7466 /* 0x74665F66@ha */ -/* 80239778 38 C4 5F 66 */ addi r6, r4, 0x5F66 /* 0x74665F66@l */ -/* 8023977C 38 A0 63 5F */ li r5, 0x635f -/* 80239780 81 83 00 00 */ lwz r12, 0(r3) -/* 80239784 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80239788 7D 89 03 A6 */ mtctr r12 -/* 8023978C 4E 80 04 21 */ bctrl -/* 80239790 38 00 00 00 */ li r0, 0 -/* 80239794 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80239798 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023979C 3C 80 00 61 */ lis r4, 0x0061 /* 0x00615F74@ha */ -/* 802397A0 38 C4 5F 74 */ addi r6, r4, 0x5F74 /* 0x00615F74@l */ -/* 802397A4 38 A0 00 00 */ li r5, 0 -/* 802397A8 81 83 00 00 */ lwz r12, 0(r3) -/* 802397AC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802397B0 7D 89 03 A6 */ mtctr r12 -/* 802397B4 4E 80 04 21 */ bctrl -/* 802397B8 38 00 00 00 */ li r0, 0 -/* 802397BC 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 802397C0 80 7F 00 04 */ lwz r3, 4(r31) -/* 802397C4 3C 80 00 62 */ lis r4, 0x0062 /* 0x00625F74@ha */ -/* 802397C8 38 C4 5F 74 */ addi r6, r4, 0x5F74 /* 0x00625F74@l */ -/* 802397CC 38 A0 00 00 */ li r5, 0 -/* 802397D0 81 83 00 00 */ lwz r12, 0(r3) -/* 802397D4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802397D8 7D 89 03 A6 */ mtctr r12 -/* 802397DC 4E 80 04 21 */ bctrl -/* 802397E0 38 00 00 00 */ li r0, 0 -/* 802397E4 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 802397E8 80 7F 00 04 */ lwz r3, 4(r31) -/* 802397EC 3C 80 00 63 */ lis r4, 0x0063 /* 0x00635F74@ha */ -/* 802397F0 38 C4 5F 74 */ addi r6, r4, 0x5F74 /* 0x00635F74@l */ -/* 802397F4 38 A0 00 00 */ li r5, 0 -/* 802397F8 81 83 00 00 */ lwz r12, 0(r3) -/* 802397FC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80239800 7D 89 03 A6 */ mtctr r12 -/* 80239804 4E 80 04 21 */ bctrl -/* 80239808 38 00 00 00 */ li r0, 0 -/* 8023980C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80239810 80 9F 00 1C */ lwz r4, 0x1c(r31) -/* 80239814 80 84 00 04 */ lwz r4, 4(r4) -/* 80239818 38 61 00 08 */ addi r3, r1, 8 -/* 8023981C 81 84 00 00 */ lwz r12, 0(r4) -/* 80239820 81 8C 00 B4 */ lwz r12, 0xb4(r12) -/* 80239824 7D 89 03 A6 */ mtctr r12 -/* 80239828 4E 80 04 21 */ bctrl -/* 8023982C 88 01 00 08 */ lbz r0, 8(r1) -/* 80239830 98 1F 00 C4 */ stb r0, 0xc4(r31) -/* 80239834 88 01 00 09 */ lbz r0, 9(r1) -/* 80239838 98 1F 00 C5 */ stb r0, 0xc5(r31) -/* 8023983C 88 01 00 0A */ lbz r0, 0xa(r1) -/* 80239840 98 1F 00 C6 */ stb r0, 0xc6(r31) -/* 80239844 88 01 00 0B */ lbz r0, 0xb(r1) -/* 80239848 98 1F 00 C7 */ stb r0, 0xc7(r31) -/* 8023984C C0 02 B1 58 */ lfs f0, lit_3909(r2) -/* 80239850 D0 1F 01 00 */ stfs f0, 0x100(r31) -/* 80239854 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 80239858 D0 1F 01 04 */ stfs f0, 0x104(r31) -/* 8023985C 38 80 00 00 */ li r4, 0 -/* 80239860 98 9F 01 08 */ stb r4, 0x108(r31) -/* 80239864 98 9F 01 0E */ stb r4, 0x10e(r31) -/* 80239868 98 9F 01 0F */ stb r4, 0x10f(r31) -/* 8023986C 98 9F 01 10 */ stb r4, 0x110(r31) -/* 80239870 98 9F 01 11 */ stb r4, 0x111(r31) -/* 80239874 B0 9F 01 0A */ sth r4, 0x10a(r31) -/* 80239878 B0 9F 01 0C */ sth r4, 0x10c(r31) -/* 8023987C 98 9F 01 12 */ stb r4, 0x112(r31) -/* 80239880 38 00 00 06 */ li r0, 6 -/* 80239884 98 1F 01 13 */ stb r0, 0x113(r31) -/* 80239888 38 00 00 FF */ li r0, 0xff -/* 8023988C 98 1F 01 15 */ stb r0, 0x115(r31) -/* 80239890 98 1F 01 16 */ stb r0, 0x116(r31) -/* 80239894 98 9F 01 17 */ stb r4, 0x117(r31) -/* 80239898 98 1F 00 C8 */ stb r0, 0xc8(r31) -/* 8023989C 98 1F 00 C9 */ stb r0, 0xc9(r31) -/* 802398A0 98 1F 00 CA */ stb r0, 0xca(r31) -/* 802398A4 98 1F 00 CB */ stb r0, 0xcb(r31) -/* 802398A8 7F E3 FB 78 */ mr r3, r31 -/* 802398AC E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 802398B0 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 802398B4 39 61 00 50 */ addi r11, r1, 0x50 -/* 802398B8 48 12 89 4D */ bl _restgpr_20 -/* 802398BC 80 01 00 64 */ lwz r0, 0x64(r1) -/* 802398C0 7C 08 03 A6 */ mtlr r0 -/* 802398C4 38 21 00 60 */ addi r1, r1, 0x60 -/* 802398C8 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/__dt__17dMsgScrn3Select_cFv.s b/asm/msg/scrn/d_msg_scrn_3select/__dt__17dMsgScrn3Select_cFv.s deleted file mode 100644 index 1558510750d..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/__dt__17dMsgScrn3Select_cFv.s +++ /dev/null @@ -1,218 +0,0 @@ -lbl_802398CC: -/* 802398CC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802398D0 7C 08 02 A6 */ mflr r0 -/* 802398D4 90 01 00 34 */ stw r0, 0x34(r1) -/* 802398D8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802398DC 48 12 88 E9 */ bl _savegpr_23 -/* 802398E0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802398E4 7C 9F 23 78 */ mr r31, r4 -/* 802398E8 41 82 02 DC */ beq lbl_80239BC4 -/* 802398EC 3C 60 80 3C */ lis r3, __vt__17dMsgScrn3Select_c@ha /* 0x803C0CE8@ha */ -/* 802398F0 38 03 0C E8 */ addi r0, r3, __vt__17dMsgScrn3Select_c@l /* 0x803C0CE8@l */ -/* 802398F4 90 1E 00 00 */ stw r0, 0(r30) -/* 802398F8 80 7E 00 04 */ lwz r3, 4(r30) -/* 802398FC 28 03 00 00 */ cmplwi r3, 0 -/* 80239900 41 82 00 18 */ beq lbl_80239918 -/* 80239904 38 80 00 01 */ li r4, 1 -/* 80239908 81 83 00 00 */ lwz r12, 0(r3) -/* 8023990C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80239910 7D 89 03 A6 */ mtctr r12 -/* 80239914 4E 80 04 21 */ bctrl -lbl_80239918: -/* 80239918 38 00 00 00 */ li r0, 0 -/* 8023991C 90 1E 00 04 */ stw r0, 4(r30) -/* 80239920 80 7E 00 08 */ lwz r3, 8(r30) -/* 80239924 28 03 00 00 */ cmplwi r3, 0 -/* 80239928 41 82 00 18 */ beq lbl_80239940 -/* 8023992C 38 80 00 01 */ li r4, 1 -/* 80239930 81 83 00 00 */ lwz r12, 0(r3) -/* 80239934 81 8C 00 08 */ lwz r12, 8(r12) -/* 80239938 7D 89 03 A6 */ mtctr r12 -/* 8023993C 4E 80 04 21 */ bctrl -lbl_80239940: -/* 80239940 38 00 00 00 */ li r0, 0 -/* 80239944 90 1E 00 08 */ stw r0, 8(r30) -/* 80239948 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 8023994C 28 03 00 00 */ cmplwi r3, 0 -/* 80239950 41 82 00 18 */ beq lbl_80239968 -/* 80239954 38 80 00 01 */ li r4, 1 -/* 80239958 81 83 00 00 */ lwz r12, 0(r3) -/* 8023995C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80239960 7D 89 03 A6 */ mtctr r12 -/* 80239964 4E 80 04 21 */ bctrl -lbl_80239968: -/* 80239968 38 00 00 00 */ li r0, 0 -/* 8023996C 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80239970 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80239974 28 03 00 00 */ cmplwi r3, 0 -/* 80239978 41 82 00 18 */ beq lbl_80239990 -/* 8023997C 38 80 00 01 */ li r4, 1 -/* 80239980 81 83 00 00 */ lwz r12, 0(r3) -/* 80239984 81 8C 00 08 */ lwz r12, 8(r12) -/* 80239988 7D 89 03 A6 */ mtctr r12 -/* 8023998C 4E 80 04 21 */ bctrl -lbl_80239990: -/* 80239990 38 00 00 00 */ li r0, 0 -/* 80239994 90 1E 00 10 */ stw r0, 0x10(r30) -/* 80239998 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 8023999C 28 03 00 00 */ cmplwi r3, 0 -/* 802399A0 41 82 00 18 */ beq lbl_802399B8 -/* 802399A4 38 80 00 01 */ li r4, 1 -/* 802399A8 81 83 00 00 */ lwz r12, 0(r3) -/* 802399AC 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802399B0 7D 89 03 A6 */ mtctr r12 -/* 802399B4 4E 80 04 21 */ bctrl -lbl_802399B8: -/* 802399B8 38 00 00 00 */ li r0, 0 -/* 802399BC 90 1E 00 14 */ stw r0, 0x14(r30) -/* 802399C0 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 802399C4 28 03 00 00 */ cmplwi r3, 0 -/* 802399C8 41 82 00 18 */ beq lbl_802399E0 -/* 802399CC 38 80 00 01 */ li r4, 1 -/* 802399D0 81 83 00 00 */ lwz r12, 0(r3) -/* 802399D4 81 8C 00 08 */ lwz r12, 8(r12) -/* 802399D8 7D 89 03 A6 */ mtctr r12 -/* 802399DC 4E 80 04 21 */ bctrl -lbl_802399E0: -/* 802399E0 38 00 00 00 */ li r0, 0 -/* 802399E4 90 1E 00 18 */ stw r0, 0x18(r30) -/* 802399E8 3B 80 00 00 */ li r28, 0 -/* 802399EC 3B 60 00 00 */ li r27, 0 -lbl_802399F0: -/* 802399F0 7F BE DA 14 */ add r29, r30, r27 -/* 802399F4 80 7D 00 34 */ lwz r3, 0x34(r29) -/* 802399F8 28 03 00 00 */ cmplwi r3, 0 -/* 802399FC 41 82 00 18 */ beq lbl_80239A14 -/* 80239A00 38 80 00 01 */ li r4, 1 -/* 80239A04 81 83 00 00 */ lwz r12, 0(r3) -/* 80239A08 81 8C 00 08 */ lwz r12, 8(r12) -/* 80239A0C 7D 89 03 A6 */ mtctr r12 -/* 80239A10 4E 80 04 21 */ bctrl -lbl_80239A14: -/* 80239A14 38 00 00 00 */ li r0, 0 -/* 80239A18 90 1D 00 34 */ stw r0, 0x34(r29) -/* 80239A1C 80 7D 00 40 */ lwz r3, 0x40(r29) -/* 80239A20 28 03 00 00 */ cmplwi r3, 0 -/* 80239A24 41 82 00 18 */ beq lbl_80239A3C -/* 80239A28 38 80 00 01 */ li r4, 1 -/* 80239A2C 81 83 00 00 */ lwz r12, 0(r3) -/* 80239A30 81 8C 00 08 */ lwz r12, 8(r12) -/* 80239A34 7D 89 03 A6 */ mtctr r12 -/* 80239A38 4E 80 04 21 */ bctrl -lbl_80239A3C: -/* 80239A3C 38 00 00 00 */ li r0, 0 -/* 80239A40 90 1D 00 40 */ stw r0, 0x40(r29) -/* 80239A44 80 7D 00 4C */ lwz r3, 0x4c(r29) -/* 80239A48 28 03 00 00 */ cmplwi r3, 0 -/* 80239A4C 41 82 00 18 */ beq lbl_80239A64 -/* 80239A50 38 80 00 01 */ li r4, 1 -/* 80239A54 81 83 00 00 */ lwz r12, 0(r3) -/* 80239A58 81 8C 00 08 */ lwz r12, 8(r12) -/* 80239A5C 7D 89 03 A6 */ mtctr r12 -/* 80239A60 4E 80 04 21 */ bctrl -lbl_80239A64: -/* 80239A64 38 00 00 00 */ li r0, 0 -/* 80239A68 90 1D 00 4C */ stw r0, 0x4c(r29) -/* 80239A6C 80 7D 00 58 */ lwz r3, 0x58(r29) -/* 80239A70 28 03 00 00 */ cmplwi r3, 0 -/* 80239A74 41 82 00 18 */ beq lbl_80239A8C -/* 80239A78 38 80 00 01 */ li r4, 1 -/* 80239A7C 81 83 00 00 */ lwz r12, 0(r3) -/* 80239A80 81 8C 00 08 */ lwz r12, 8(r12) -/* 80239A84 7D 89 03 A6 */ mtctr r12 -/* 80239A88 4E 80 04 21 */ bctrl -lbl_80239A8C: -/* 80239A8C 38 00 00 00 */ li r0, 0 -/* 80239A90 90 1D 00 58 */ stw r0, 0x58(r29) -/* 80239A94 80 7D 00 1C */ lwz r3, 0x1c(r29) -/* 80239A98 28 03 00 00 */ cmplwi r3, 0 -/* 80239A9C 41 82 00 18 */ beq lbl_80239AB4 -/* 80239AA0 38 80 00 01 */ li r4, 1 -/* 80239AA4 81 83 00 00 */ lwz r12, 0(r3) -/* 80239AA8 81 8C 00 08 */ lwz r12, 8(r12) -/* 80239AAC 7D 89 03 A6 */ mtctr r12 -/* 80239AB0 4E 80 04 21 */ bctrl -lbl_80239AB4: -/* 80239AB4 38 00 00 00 */ li r0, 0 -/* 80239AB8 90 1D 00 1C */ stw r0, 0x1c(r29) -/* 80239ABC 80 7D 00 AC */ lwz r3, 0xac(r29) -/* 80239AC0 28 03 00 00 */ cmplwi r3, 0 -/* 80239AC4 41 82 00 18 */ beq lbl_80239ADC -/* 80239AC8 38 80 00 01 */ li r4, 1 -/* 80239ACC 81 83 00 00 */ lwz r12, 0(r3) -/* 80239AD0 81 8C 00 08 */ lwz r12, 8(r12) -/* 80239AD4 7D 89 03 A6 */ mtctr r12 -/* 80239AD8 4E 80 04 21 */ bctrl -lbl_80239ADC: -/* 80239ADC 38 00 00 00 */ li r0, 0 -/* 80239AE0 90 1D 00 AC */ stw r0, 0xac(r29) -/* 80239AE4 80 7D 00 B8 */ lwz r3, 0xb8(r29) -/* 80239AE8 28 03 00 00 */ cmplwi r3, 0 -/* 80239AEC 41 82 00 18 */ beq lbl_80239B04 -/* 80239AF0 38 80 00 01 */ li r4, 1 -/* 80239AF4 81 83 00 00 */ lwz r12, 0(r3) -/* 80239AF8 81 8C 00 08 */ lwz r12, 8(r12) -/* 80239AFC 7D 89 03 A6 */ mtctr r12 -/* 80239B00 4E 80 04 21 */ bctrl -lbl_80239B04: -/* 80239B04 38 00 00 00 */ li r0, 0 -/* 80239B08 90 1D 00 B8 */ stw r0, 0xb8(r29) -/* 80239B0C 80 7D 00 28 */ lwz r3, 0x28(r29) -/* 80239B10 28 03 00 00 */ cmplwi r3, 0 -/* 80239B14 41 82 00 24 */ beq lbl_80239B38 -/* 80239B18 41 82 00 18 */ beq lbl_80239B30 -/* 80239B1C 38 80 00 01 */ li r4, 1 -/* 80239B20 81 83 00 00 */ lwz r12, 0(r3) -/* 80239B24 81 8C 00 08 */ lwz r12, 8(r12) -/* 80239B28 7D 89 03 A6 */ mtctr r12 -/* 80239B2C 4E 80 04 21 */ bctrl -lbl_80239B30: -/* 80239B30 38 00 00 00 */ li r0, 0 -/* 80239B34 90 1D 00 28 */ stw r0, 0x28(r29) -lbl_80239B38: -/* 80239B38 3A E0 00 00 */ li r23, 0 -/* 80239B3C 3B 40 00 00 */ li r26, 0 -/* 80239B40 7F 59 D3 78 */ mr r25, r26 -lbl_80239B44: -/* 80239B44 3B 1A 00 64 */ addi r24, r26, 0x64 -/* 80239B48 7C 7D C0 2E */ lwzx r3, r29, r24 -/* 80239B4C 28 03 00 00 */ cmplwi r3, 0 -/* 80239B50 41 82 00 18 */ beq lbl_80239B68 -/* 80239B54 38 80 00 01 */ li r4, 1 -/* 80239B58 81 83 00 00 */ lwz r12, 0(r3) -/* 80239B5C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80239B60 7D 89 03 A6 */ mtctr r12 -/* 80239B64 4E 80 04 21 */ bctrl -lbl_80239B68: -/* 80239B68 7F 3D C1 2E */ stwx r25, r29, r24 -/* 80239B6C 3A F7 00 01 */ addi r23, r23, 1 -/* 80239B70 2C 17 00 05 */ cmpwi r23, 5 -/* 80239B74 3B 5A 00 0C */ addi r26, r26, 0xc -/* 80239B78 41 80 FF CC */ blt lbl_80239B44 -/* 80239B7C 80 7D 00 A0 */ lwz r3, 0xa0(r29) -/* 80239B80 28 03 00 00 */ cmplwi r3, 0 -/* 80239B84 41 82 00 18 */ beq lbl_80239B9C -/* 80239B88 38 80 00 01 */ li r4, 1 -/* 80239B8C 81 83 00 00 */ lwz r12, 0(r3) -/* 80239B90 81 8C 00 08 */ lwz r12, 8(r12) -/* 80239B94 7D 89 03 A6 */ mtctr r12 -/* 80239B98 4E 80 04 21 */ bctrl -lbl_80239B9C: -/* 80239B9C 38 00 00 00 */ li r0, 0 -/* 80239BA0 90 1D 00 A0 */ stw r0, 0xa0(r29) -/* 80239BA4 3B 9C 00 01 */ addi r28, r28, 1 -/* 80239BA8 2C 1C 00 03 */ cmpwi r28, 3 -/* 80239BAC 3B 7B 00 04 */ addi r27, r27, 4 -/* 80239BB0 41 80 FE 40 */ blt lbl_802399F0 -/* 80239BB4 7F E0 07 35 */ extsh. r0, r31 -/* 80239BB8 40 81 00 0C */ ble lbl_80239BC4 -/* 80239BBC 7F C3 F3 78 */ mr r3, r30 -/* 80239BC0 48 09 51 7D */ bl __dl__FPv -lbl_80239BC4: -/* 80239BC4 7F C3 F3 78 */ mr r3, r30 -/* 80239BC8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80239BCC 48 12 86 45 */ bl _restgpr_23 -/* 80239BD0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80239BD4 7C 08 03 A6 */ mtlr r0 -/* 80239BD8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80239BDC 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/__sinit_d_msg_scrn_3select_cpp.s b/asm/msg/scrn/d_msg_scrn_3select/__sinit_d_msg_scrn_3select_cpp.s deleted file mode 100644 index 7320ff90e01..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/__sinit_d_msg_scrn_3select_cpp.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_8023B914: -/* 8023B914 3C 60 80 3C */ lis r3, cNullVec__6Z2Calc@ha /* 0x803C0C00@ha */ -/* 8023B918 38 A3 0C 00 */ addi r5, r3, cNullVec__6Z2Calc@l /* 0x803C0C00@l */ -/* 8023B91C 80 65 00 0C */ lwz r3, 0xc(r5) -/* 8023B920 80 05 00 10 */ lwz r0, 0x10(r5) -/* 8023B924 90 65 00 54 */ stw r3, 0x54(r5) -/* 8023B928 90 05 00 58 */ stw r0, 0x58(r5) -/* 8023B92C 80 05 00 14 */ lwz r0, 0x14(r5) -/* 8023B930 90 05 00 5C */ stw r0, 0x5c(r5) -/* 8023B934 38 85 00 54 */ addi r4, r5, 0x54 -/* 8023B938 80 65 00 18 */ lwz r3, 0x18(r5) -/* 8023B93C 80 05 00 1C */ lwz r0, 0x1c(r5) -/* 8023B940 90 64 00 0C */ stw r3, 0xc(r4) -/* 8023B944 90 04 00 10 */ stw r0, 0x10(r4) -/* 8023B948 80 05 00 20 */ lwz r0, 0x20(r5) -/* 8023B94C 90 04 00 14 */ stw r0, 0x14(r4) -/* 8023B950 80 65 00 24 */ lwz r3, 0x24(r5) -/* 8023B954 80 05 00 28 */ lwz r0, 0x28(r5) -/* 8023B958 90 64 00 18 */ stw r3, 0x18(r4) -/* 8023B95C 90 04 00 1C */ stw r0, 0x1c(r4) -/* 8023B960 80 05 00 2C */ lwz r0, 0x2c(r5) -/* 8023B964 90 04 00 20 */ stw r0, 0x20(r4) -/* 8023B968 80 65 00 30 */ lwz r3, 0x30(r5) -/* 8023B96C 80 05 00 34 */ lwz r0, 0x34(r5) -/* 8023B970 90 64 00 24 */ stw r3, 0x24(r4) -/* 8023B974 90 04 00 28 */ stw r0, 0x28(r4) -/* 8023B978 80 05 00 38 */ lwz r0, 0x38(r5) -/* 8023B97C 90 04 00 2C */ stw r0, 0x2c(r4) -/* 8023B980 80 65 00 3C */ lwz r3, 0x3c(r5) -/* 8023B984 80 05 00 40 */ lwz r0, 0x40(r5) -/* 8023B988 90 64 00 30 */ stw r3, 0x30(r4) -/* 8023B98C 90 04 00 34 */ stw r0, 0x34(r4) -/* 8023B990 80 05 00 44 */ lwz r0, 0x44(r5) -/* 8023B994 90 04 00 38 */ stw r0, 0x38(r4) -/* 8023B998 80 65 00 48 */ lwz r3, 0x48(r5) -/* 8023B99C 80 05 00 4C */ lwz r0, 0x4c(r5) -/* 8023B9A0 90 64 00 3C */ stw r3, 0x3c(r4) -/* 8023B9A4 90 04 00 40 */ stw r0, 0x40(r4) -/* 8023B9A8 80 05 00 50 */ lwz r0, 0x50(r5) -/* 8023B9AC 90 04 00 44 */ stw r0, 0x44(r4) -/* 8023B9B0 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/changeProc__17dMsgScrn3Select_cFv.s b/asm/msg/scrn/d_msg_scrn_3select/changeProc__17dMsgScrn3Select_cFv.s deleted file mode 100644 index 97b6278ae97..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/changeProc__17dMsgScrn3Select_cFv.s +++ /dev/null @@ -1,209 +0,0 @@ -lbl_8023AE68: -/* 8023AE68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8023AE6C 7C 08 02 A6 */ mflr r0 -/* 8023AE70 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023AE74 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8023AE78 7C 7F 1B 78 */ mr r31, r3 -/* 8023AE7C 88 83 01 0E */ lbz r4, 0x10e(r3) -/* 8023AE80 28 04 00 FF */ cmplwi r4, 0xff -/* 8023AE84 40 82 00 64 */ bne lbl_8023AEE8 -/* 8023AE88 88 1F 01 0F */ lbz r0, 0x10f(r31) -/* 8023AE8C 28 00 00 00 */ cmplwi r0, 0 -/* 8023AE90 40 82 00 18 */ bne lbl_8023AEA8 -/* 8023AE94 C0 02 B1 84 */ lfs f0, lit_4604(r2) -/* 8023AE98 D0 1F 00 F0 */ stfs f0, 0xf0(r31) -/* 8023AE9C 38 80 00 00 */ li r4, 0 -/* 8023AEA0 48 00 09 D1 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023AEA4 48 00 00 38 */ b lbl_8023AEDC -lbl_8023AEA8: -/* 8023AEA8 28 00 00 01 */ cmplwi r0, 1 -/* 8023AEAC 40 82 00 18 */ bne lbl_8023AEC4 -/* 8023AEB0 C0 02 B1 88 */ lfs f0, lit_4605(r2) -/* 8023AEB4 D0 1F 00 F0 */ stfs f0, 0xf0(r31) -/* 8023AEB8 38 80 00 01 */ li r4, 1 -/* 8023AEBC 48 00 09 B5 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023AEC0 48 00 00 1C */ b lbl_8023AEDC -lbl_8023AEC4: -/* 8023AEC4 28 00 00 02 */ cmplwi r0, 2 -/* 8023AEC8 40 82 00 14 */ bne lbl_8023AEDC -/* 8023AECC C0 02 B1 90 */ lfs f0, lit_4607(r2) -/* 8023AED0 D0 1F 00 F0 */ stfs f0, 0xf0(r31) -/* 8023AED4 38 80 00 02 */ li r4, 2 -/* 8023AED8 48 00 09 99 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -lbl_8023AEDC: -/* 8023AEDC 38 00 00 03 */ li r0, 3 -/* 8023AEE0 98 1F 01 13 */ stb r0, 0x113(r31) -/* 8023AEE4 48 00 02 50 */ b lbl_8023B134 -lbl_8023AEE8: -/* 8023AEE8 88 1F 01 0F */ lbz r0, 0x10f(r31) -/* 8023AEEC 2C 00 00 01 */ cmpwi r0, 1 -/* 8023AEF0 41 82 00 D8 */ beq lbl_8023AFC8 -/* 8023AEF4 40 80 00 10 */ bge lbl_8023AF04 -/* 8023AEF8 2C 00 00 00 */ cmpwi r0, 0 -/* 8023AEFC 40 80 00 14 */ bge lbl_8023AF10 -/* 8023AF00 48 00 02 34 */ b lbl_8023B134 -lbl_8023AF04: -/* 8023AF04 2C 00 00 03 */ cmpwi r0, 3 -/* 8023AF08 40 80 02 2C */ bge lbl_8023B134 -/* 8023AF0C 48 00 01 74 */ b lbl_8023B080 -lbl_8023AF10: -/* 8023AF10 28 04 00 01 */ cmplwi r4, 1 -/* 8023AF14 40 82 00 58 */ bne lbl_8023AF6C -/* 8023AF18 88 1F 01 08 */ lbz r0, 0x108(r31) -/* 8023AF1C 28 00 00 00 */ cmplwi r0, 0 -/* 8023AF20 41 82 00 10 */ beq lbl_8023AF30 -/* 8023AF24 C0 02 B1 84 */ lfs f0, lit_4604(r2) -/* 8023AF28 D0 1F 00 F0 */ stfs f0, 0xf0(r31) -/* 8023AF2C 48 00 00 14 */ b lbl_8023AF40 -lbl_8023AF30: -/* 8023AF30 C0 3F 00 F0 */ lfs f1, 0xf0(r31) -/* 8023AF34 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023AF38 EC 01 00 2A */ fadds f0, f1, f0 -/* 8023AF3C D0 1F 00 F0 */ stfs f0, 0xf0(r31) -lbl_8023AF40: -/* 8023AF40 7F E3 FB 78 */ mr r3, r31 -/* 8023AF44 38 80 00 00 */ li r4, 0 -/* 8023AF48 48 00 09 29 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023AF4C C0 3F 00 F0 */ lfs f1, 0xf0(r31) -/* 8023AF50 C0 02 B1 84 */ lfs f0, lit_4604(r2) -/* 8023AF54 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8023AF58 4C 41 13 82 */ cror 2, 1, 2 -/* 8023AF5C 40 82 01 D8 */ bne lbl_8023B134 -/* 8023AF60 38 00 00 03 */ li r0, 3 -/* 8023AF64 98 1F 01 13 */ stb r0, 0x113(r31) -/* 8023AF68 48 00 01 CC */ b lbl_8023B134 -lbl_8023AF6C: -/* 8023AF6C 28 04 00 02 */ cmplwi r4, 2 -/* 8023AF70 40 82 01 C4 */ bne lbl_8023B134 -/* 8023AF74 88 1F 01 08 */ lbz r0, 0x108(r31) -/* 8023AF78 28 00 00 00 */ cmplwi r0, 0 -/* 8023AF7C 41 82 00 10 */ beq lbl_8023AF8C -/* 8023AF80 C0 02 B1 8C */ lfs f0, lit_4606(r2) -/* 8023AF84 D0 1F 00 F0 */ stfs f0, 0xf0(r31) -/* 8023AF88 48 00 00 14 */ b lbl_8023AF9C -lbl_8023AF8C: -/* 8023AF8C C0 3F 00 F0 */ lfs f1, 0xf0(r31) -/* 8023AF90 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023AF94 EC 01 00 2A */ fadds f0, f1, f0 -/* 8023AF98 D0 1F 00 F0 */ stfs f0, 0xf0(r31) -lbl_8023AF9C: -/* 8023AF9C 7F E3 FB 78 */ mr r3, r31 -/* 8023AFA0 38 80 00 00 */ li r4, 0 -/* 8023AFA4 48 00 08 CD */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023AFA8 C0 3F 00 F0 */ lfs f1, 0xf0(r31) -/* 8023AFAC C0 02 B1 8C */ lfs f0, lit_4606(r2) -/* 8023AFB0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8023AFB4 4C 41 13 82 */ cror 2, 1, 2 -/* 8023AFB8 40 82 01 7C */ bne lbl_8023B134 -/* 8023AFBC 38 00 00 03 */ li r0, 3 -/* 8023AFC0 98 1F 01 13 */ stb r0, 0x113(r31) -/* 8023AFC4 48 00 01 70 */ b lbl_8023B134 -lbl_8023AFC8: -/* 8023AFC8 28 04 00 00 */ cmplwi r4, 0 -/* 8023AFCC 40 82 00 58 */ bne lbl_8023B024 -/* 8023AFD0 88 1F 01 08 */ lbz r0, 0x108(r31) -/* 8023AFD4 28 00 00 00 */ cmplwi r0, 0 -/* 8023AFD8 41 82 00 10 */ beq lbl_8023AFE8 -/* 8023AFDC C0 02 B1 88 */ lfs f0, lit_4605(r2) -/* 8023AFE0 D0 1F 00 F0 */ stfs f0, 0xf0(r31) -/* 8023AFE4 48 00 00 14 */ b lbl_8023AFF8 -lbl_8023AFE8: -/* 8023AFE8 C0 3F 00 F0 */ lfs f1, 0xf0(r31) -/* 8023AFEC C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023AFF0 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8023AFF4 D0 1F 00 F0 */ stfs f0, 0xf0(r31) -lbl_8023AFF8: -/* 8023AFF8 7F E3 FB 78 */ mr r3, r31 -/* 8023AFFC 38 80 00 01 */ li r4, 1 -/* 8023B000 48 00 08 71 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023B004 C0 3F 00 F0 */ lfs f1, 0xf0(r31) -/* 8023B008 C0 02 B1 88 */ lfs f0, lit_4605(r2) -/* 8023B00C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8023B010 4C 40 13 82 */ cror 2, 0, 2 -/* 8023B014 40 82 01 20 */ bne lbl_8023B134 -/* 8023B018 38 00 00 03 */ li r0, 3 -/* 8023B01C 98 1F 01 13 */ stb r0, 0x113(r31) -/* 8023B020 48 00 01 14 */ b lbl_8023B134 -lbl_8023B024: -/* 8023B024 28 04 00 02 */ cmplwi r4, 2 -/* 8023B028 40 82 01 0C */ bne lbl_8023B134 -/* 8023B02C 88 1F 01 08 */ lbz r0, 0x108(r31) -/* 8023B030 28 00 00 00 */ cmplwi r0, 0 -/* 8023B034 41 82 00 10 */ beq lbl_8023B044 -/* 8023B038 C0 02 B1 8C */ lfs f0, lit_4606(r2) -/* 8023B03C D0 1F 00 F0 */ stfs f0, 0xf0(r31) -/* 8023B040 48 00 00 14 */ b lbl_8023B054 -lbl_8023B044: -/* 8023B044 C0 3F 00 F0 */ lfs f1, 0xf0(r31) -/* 8023B048 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023B04C EC 01 00 2A */ fadds f0, f1, f0 -/* 8023B050 D0 1F 00 F0 */ stfs f0, 0xf0(r31) -lbl_8023B054: -/* 8023B054 7F E3 FB 78 */ mr r3, r31 -/* 8023B058 38 80 00 01 */ li r4, 1 -/* 8023B05C 48 00 08 15 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023B060 C0 3F 00 F0 */ lfs f1, 0xf0(r31) -/* 8023B064 C0 02 B1 8C */ lfs f0, lit_4606(r2) -/* 8023B068 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8023B06C 4C 41 13 82 */ cror 2, 1, 2 -/* 8023B070 40 82 00 C4 */ bne lbl_8023B134 -/* 8023B074 38 00 00 03 */ li r0, 3 -/* 8023B078 98 1F 01 13 */ stb r0, 0x113(r31) -/* 8023B07C 48 00 00 B8 */ b lbl_8023B134 -lbl_8023B080: -/* 8023B080 28 04 00 01 */ cmplwi r4, 1 -/* 8023B084 40 82 00 58 */ bne lbl_8023B0DC -/* 8023B088 88 1F 01 08 */ lbz r0, 0x108(r31) -/* 8023B08C 28 00 00 00 */ cmplwi r0, 0 -/* 8023B090 41 82 00 10 */ beq lbl_8023B0A0 -/* 8023B094 C0 02 B1 90 */ lfs f0, lit_4607(r2) -/* 8023B098 D0 1F 00 F0 */ stfs f0, 0xf0(r31) -/* 8023B09C 48 00 00 14 */ b lbl_8023B0B0 -lbl_8023B0A0: -/* 8023B0A0 C0 3F 00 F0 */ lfs f1, 0xf0(r31) -/* 8023B0A4 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023B0A8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8023B0AC D0 1F 00 F0 */ stfs f0, 0xf0(r31) -lbl_8023B0B0: -/* 8023B0B0 7F E3 FB 78 */ mr r3, r31 -/* 8023B0B4 38 80 00 02 */ li r4, 2 -/* 8023B0B8 48 00 07 B9 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023B0BC C0 3F 00 F0 */ lfs f1, 0xf0(r31) -/* 8023B0C0 C0 02 B1 90 */ lfs f0, lit_4607(r2) -/* 8023B0C4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8023B0C8 4C 40 13 82 */ cror 2, 0, 2 -/* 8023B0CC 40 82 00 68 */ bne lbl_8023B134 -/* 8023B0D0 38 00 00 03 */ li r0, 3 -/* 8023B0D4 98 1F 01 13 */ stb r0, 0x113(r31) -/* 8023B0D8 48 00 00 5C */ b lbl_8023B134 -lbl_8023B0DC: -/* 8023B0DC 28 04 00 00 */ cmplwi r4, 0 -/* 8023B0E0 40 82 00 54 */ bne lbl_8023B134 -/* 8023B0E4 88 1F 01 08 */ lbz r0, 0x108(r31) -/* 8023B0E8 28 00 00 00 */ cmplwi r0, 0 -/* 8023B0EC 41 82 00 10 */ beq lbl_8023B0FC -/* 8023B0F0 C0 02 B1 88 */ lfs f0, lit_4605(r2) -/* 8023B0F4 D0 1F 00 F0 */ stfs f0, 0xf0(r31) -/* 8023B0F8 48 00 00 14 */ b lbl_8023B10C -lbl_8023B0FC: -/* 8023B0FC C0 3F 00 F0 */ lfs f1, 0xf0(r31) -/* 8023B100 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023B104 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8023B108 D0 1F 00 F0 */ stfs f0, 0xf0(r31) -lbl_8023B10C: -/* 8023B10C 7F E3 FB 78 */ mr r3, r31 -/* 8023B110 38 80 00 02 */ li r4, 2 -/* 8023B114 48 00 07 5D */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023B118 C0 3F 00 F0 */ lfs f1, 0xf0(r31) -/* 8023B11C C0 02 B1 88 */ lfs f0, lit_4605(r2) -/* 8023B120 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8023B124 4C 40 13 82 */ cror 2, 0, 2 -/* 8023B128 40 82 00 0C */ bne lbl_8023B134 -/* 8023B12C 38 00 00 03 */ li r0, 3 -/* 8023B130 98 1F 01 13 */ stb r0, 0x113(r31) -lbl_8023B134: -/* 8023B134 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8023B138 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8023B13C 7C 08 03 A6 */ mtlr r0 -/* 8023B140 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023B144 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/closeProc__17dMsgScrn3Select_cFv.s b/asm/msg/scrn/d_msg_scrn_3select/closeProc__17dMsgScrn3Select_cFv.s deleted file mode 100644 index 3355111ef29..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/closeProc__17dMsgScrn3Select_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_8023B148: -/* 8023B148 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8023B14C 7C 08 02 A6 */ mflr r0 -/* 8023B150 90 01 00 44 */ stw r0, 0x44(r1) -/* 8023B154 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 8023B158 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 8023B15C DB C1 00 20 */ stfd f30, 0x20(r1) -/* 8023B160 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 8023B164 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023B168 48 12 70 71 */ bl _savegpr_28 -/* 8023B16C 7C 7C 1B 78 */ mr r28, r3 -/* 8023B170 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8023B174 C0 22 B1 58 */ lfs f1, lit_3909(r2) -/* 8023B178 4B F5 A1 29 */ bl setAlphaRate__16dSelect_cursor_cFf -/* 8023B17C C0 3C 00 F0 */ lfs f1, 0xf0(r28) -/* 8023B180 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023B184 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8023B188 D0 1C 00 F0 */ stfs f0, 0xf0(r28) -/* 8023B18C 3B A0 00 00 */ li r29, 0 -/* 8023B190 3B E0 00 00 */ li r31, 0 -lbl_8023B194: -/* 8023B194 3B DF 00 34 */ addi r30, r31, 0x34 -/* 8023B198 7C 7C F0 2E */ lwzx r3, r28, r30 -/* 8023B19C 80 63 00 04 */ lwz r3, 4(r3) -/* 8023B1A0 C3 E3 00 CC */ lfs f31, 0xcc(r3) -/* 8023B1A4 C3 C3 00 D0 */ lfs f30, 0xd0(r3) -/* 8023B1A8 7F 83 E3 78 */ mr r3, r28 -/* 8023B1AC 7F A4 EB 78 */ mr r4, r29 -/* 8023B1B0 48 00 06 C1 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023B1B4 7C 7C F0 2E */ lwzx r3, r28, r30 -/* 8023B1B8 80 63 00 04 */ lwz r3, 4(r3) -/* 8023B1BC D3 E3 00 CC */ stfs f31, 0xcc(r3) -/* 8023B1C0 D3 C3 00 D0 */ stfs f30, 0xd0(r3) -/* 8023B1C4 81 83 00 00 */ lwz r12, 0(r3) -/* 8023B1C8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8023B1CC 7D 89 03 A6 */ mtctr r12 -/* 8023B1D0 4E 80 04 21 */ bctrl -/* 8023B1D4 3B BD 00 01 */ addi r29, r29, 1 -/* 8023B1D8 2C 1D 00 03 */ cmpwi r29, 3 -/* 8023B1DC 3B FF 00 04 */ addi r31, r31, 4 -/* 8023B1E0 41 80 FF B4 */ blt lbl_8023B194 -/* 8023B1E4 C0 3C 00 F0 */ lfs f1, 0xf0(r28) -/* 8023B1E8 C0 02 B1 5C */ lfs f0, lit_3910(r2) -/* 8023B1EC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8023B1F0 4C 40 13 82 */ cror 2, 0, 2 -/* 8023B1F4 40 82 00 0C */ bne lbl_8023B200 -/* 8023B1F8 38 00 00 06 */ li r0, 6 -/* 8023B1FC 98 1C 01 13 */ stb r0, 0x113(r28) -lbl_8023B200: -/* 8023B200 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 8023B204 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 8023B208 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 8023B20C CB C1 00 20 */ lfd f30, 0x20(r1) -/* 8023B210 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023B214 48 12 70 11 */ bl _restgpr_28 -/* 8023B218 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8023B21C 7C 08 03 A6 */ mtlr r0 -/* 8023B220 38 21 00 40 */ addi r1, r1, 0x40 -/* 8023B224 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/draw__17dMsgScrn3Select_cFff.s b/asm/msg/scrn/d_msg_scrn_3select/draw__17dMsgScrn3Select_cFff.s deleted file mode 100644 index 0218a81719f..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/draw__17dMsgScrn3Select_cFff.s +++ /dev/null @@ -1,184 +0,0 @@ -lbl_80239DD4: -/* 80239DD4 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80239DD8 7C 08 02 A6 */ mflr r0 -/* 80239DDC 90 01 00 74 */ stw r0, 0x74(r1) -/* 80239DE0 DB E1 00 60 */ stfd f31, 0x60(r1) -/* 80239DE4 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 80239DE8 DB C1 00 50 */ stfd f30, 0x50(r1) -/* 80239DEC F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 80239DF0 39 61 00 50 */ addi r11, r1, 0x50 -/* 80239DF4 48 12 83 E1 */ bl _savegpr_27 -/* 80239DF8 7C 7D 1B 78 */ mr r29, r3 -/* 80239DFC FF C0 08 90 */ fmr f30, f1 -/* 80239E00 FF E0 10 90 */ fmr f31, f2 -/* 80239E04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80239E08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80239E0C 83 E3 5F 50 */ lwz r31, 0x5f50(r3) -/* 80239E10 7F E3 FB 78 */ mr r3, r31 -/* 80239E14 81 9F 00 00 */ lwz r12, 0(r31) -/* 80239E18 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80239E1C 7D 89 03 A6 */ mtctr r12 -/* 80239E20 4E 80 04 21 */ bctrl -/* 80239E24 88 1D 00 C8 */ lbz r0, 0xc8(r29) -/* 80239E28 3C 60 80 43 */ lis r3, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 80239E2C 38 83 02 8C */ addi r4, r3, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80239E30 88 A4 01 88 */ lbz r5, 0x188(r4) -/* 80239E34 7C 00 28 40 */ cmplw r0, r5 -/* 80239E38 40 82 00 24 */ bne lbl_80239E5C -/* 80239E3C 88 7D 00 C9 */ lbz r3, 0xc9(r29) -/* 80239E40 88 04 01 89 */ lbz r0, 0x189(r4) -/* 80239E44 7C 03 00 40 */ cmplw r3, r0 -/* 80239E48 40 82 00 14 */ bne lbl_80239E5C -/* 80239E4C 88 7D 00 CA */ lbz r3, 0xca(r29) -/* 80239E50 88 04 01 8A */ lbz r0, 0x18a(r4) -/* 80239E54 7C 03 00 40 */ cmplw r3, r0 -/* 80239E58 41 82 00 F8 */ beq lbl_80239F50 -lbl_80239E5C: -/* 80239E5C 98 BD 00 C8 */ stb r5, 0xc8(r29) -/* 80239E60 3C 60 80 43 */ lis r3, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 80239E64 38 63 02 8C */ addi r3, r3, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80239E68 88 03 01 89 */ lbz r0, 0x189(r3) -/* 80239E6C 98 1D 00 C9 */ stb r0, 0xc9(r29) -/* 80239E70 88 03 01 8A */ lbz r0, 0x18a(r3) -/* 80239E74 98 1D 00 CA */ stb r0, 0xca(r29) -/* 80239E78 3B C0 00 00 */ li r30, 0 -/* 80239E7C 3B 80 00 00 */ li r28, 0 -lbl_80239E80: -/* 80239E80 88 1D 01 0E */ lbz r0, 0x10e(r29) -/* 80239E84 7C 1E 00 00 */ cmpw r30, r0 -/* 80239E88 40 82 00 60 */ bne lbl_80239EE8 -/* 80239E8C 80 1D 00 C4 */ lwz r0, 0xc4(r29) -/* 80239E90 90 01 00 14 */ stw r0, 0x14(r1) -/* 80239E94 7F 7D E2 14 */ add r27, r29, r28 -/* 80239E98 80 7B 00 1C */ lwz r3, 0x1c(r27) -/* 80239E9C 80 63 00 04 */ lwz r3, 4(r3) -/* 80239EA0 38 81 00 14 */ addi r4, r1, 0x14 -/* 80239EA4 81 83 00 00 */ lwz r12, 0(r3) -/* 80239EA8 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 80239EAC 7D 89 03 A6 */ mtctr r12 -/* 80239EB0 4E 80 04 21 */ bctrl -/* 80239EB4 80 1B 00 28 */ lwz r0, 0x28(r27) -/* 80239EB8 28 00 00 00 */ cmplwi r0, 0 -/* 80239EBC 41 82 00 84 */ beq lbl_80239F40 -/* 80239EC0 80 1D 00 C4 */ lwz r0, 0xc4(r29) -/* 80239EC4 90 01 00 10 */ stw r0, 0x10(r1) -/* 80239EC8 80 7B 00 28 */ lwz r3, 0x28(r27) -/* 80239ECC 80 63 00 04 */ lwz r3, 4(r3) -/* 80239ED0 38 81 00 10 */ addi r4, r1, 0x10 -/* 80239ED4 81 83 00 00 */ lwz r12, 0(r3) -/* 80239ED8 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 80239EDC 7D 89 03 A6 */ mtctr r12 -/* 80239EE0 4E 80 04 21 */ bctrl -/* 80239EE4 48 00 00 5C */ b lbl_80239F40 -lbl_80239EE8: -/* 80239EE8 80 1D 00 C8 */ lwz r0, 0xc8(r29) -/* 80239EEC 90 01 00 0C */ stw r0, 0xc(r1) -/* 80239EF0 7F 7D E2 14 */ add r27, r29, r28 -/* 80239EF4 80 7B 00 1C */ lwz r3, 0x1c(r27) -/* 80239EF8 80 63 00 04 */ lwz r3, 4(r3) -/* 80239EFC 38 81 00 0C */ addi r4, r1, 0xc -/* 80239F00 81 83 00 00 */ lwz r12, 0(r3) -/* 80239F04 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 80239F08 7D 89 03 A6 */ mtctr r12 -/* 80239F0C 4E 80 04 21 */ bctrl -/* 80239F10 80 1B 00 28 */ lwz r0, 0x28(r27) -/* 80239F14 28 00 00 00 */ cmplwi r0, 0 -/* 80239F18 41 82 00 28 */ beq lbl_80239F40 -/* 80239F1C 80 1D 00 C8 */ lwz r0, 0xc8(r29) -/* 80239F20 90 01 00 08 */ stw r0, 8(r1) -/* 80239F24 80 7B 00 28 */ lwz r3, 0x28(r27) -/* 80239F28 80 63 00 04 */ lwz r3, 4(r3) -/* 80239F2C 38 81 00 08 */ addi r4, r1, 8 -/* 80239F30 81 83 00 00 */ lwz r12, 0(r3) -/* 80239F34 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 80239F38 7D 89 03 A6 */ mtctr r12 -/* 80239F3C 4E 80 04 21 */ bctrl -lbl_80239F40: -/* 80239F40 3B DE 00 01 */ addi r30, r30, 1 -/* 80239F44 2C 1E 00 03 */ cmpwi r30, 3 -/* 80239F48 3B 9C 00 04 */ addi r28, r28, 4 -/* 80239F4C 41 80 FF 34 */ blt lbl_80239E80 -lbl_80239F50: -/* 80239F50 80 7D 00 04 */ lwz r3, 4(r29) -/* 80239F54 FC 20 F0 90 */ fmr f1, f30 -/* 80239F58 FC 40 F8 90 */ fmr f2, f31 -/* 80239F5C 7F E4 FB 78 */ mr r4, r31 -/* 80239F60 48 0B EF 75 */ bl draw__9J2DScreenFffPC14J2DGrafContext -/* 80239F64 88 1D 01 10 */ lbz r0, 0x110(r29) -/* 80239F68 28 00 00 FF */ cmplwi r0, 0xff -/* 80239F6C 41 82 01 00 */ beq lbl_8023A06C -/* 80239F70 88 7D 01 0E */ lbz r3, 0x10e(r29) -/* 80239F74 28 03 00 FF */ cmplwi r3, 0xff -/* 80239F78 41 82 00 F4 */ beq lbl_8023A06C -/* 80239F7C 88 1D 01 17 */ lbz r0, 0x117(r29) -/* 80239F80 28 00 00 00 */ cmplwi r0, 0 -/* 80239F84 41 82 00 E8 */ beq lbl_8023A06C -/* 80239F88 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d -/* 80239F8C 7C 7D 02 14 */ add r3, r29, r0 -/* 80239F90 80 83 00 B8 */ lwz r4, 0xb8(r3) -/* 80239F94 C0 44 00 24 */ lfs f2, 0x24(r4) -/* 80239F98 C0 22 B1 64 */ lfs f1, lit_4154(r2) -/* 80239F9C C0 04 00 34 */ lfs f0, 0x34(r4) -/* 80239FA0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80239FA4 EC 02 00 2A */ fadds f0, f2, f0 -/* 80239FA8 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80239FAC C0 63 00 24 */ lfs f3, 0x24(r3) -/* 80239FB0 C0 9D 01 04 */ lfs f4, 0x104(r29) -/* 80239FB4 C0 42 B1 60 */ lfs f2, lit_3911(r2) -/* 80239FB8 EC 24 10 28 */ fsubs f1, f4, f2 -/* 80239FBC EC 00 18 28 */ fsubs f0, f0, f3 -/* 80239FC0 EF E1 00 32 */ fmuls f31, f1, f0 -/* 80239FC4 FC 02 20 00 */ fcmpu cr0, f2, f4 -/* 80239FC8 40 82 00 0C */ bne lbl_80239FD4 -/* 80239FCC C0 02 B1 68 */ lfs f0, lit_4155(r2) -/* 80239FD0 EF FF 00 28 */ fsubs f31, f31, f0 -lbl_80239FD4: -/* 80239FD4 38 61 00 18 */ addi r3, r1, 0x18 -/* 80239FD8 80 A4 00 04 */ lwz r5, 4(r4) -/* 80239FDC 38 C0 00 01 */ li r6, 1 -/* 80239FE0 38 E0 00 00 */ li r7, 0 -/* 80239FE4 48 01 AE D9 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs -/* 80239FE8 80 61 00 18 */ lwz r3, 0x18(r1) -/* 80239FEC 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80239FF0 90 61 00 24 */ stw r3, 0x24(r1) -/* 80239FF4 90 01 00 28 */ stw r0, 0x28(r1) -/* 80239FF8 80 01 00 20 */ lwz r0, 0x20(r1) -/* 80239FFC 90 01 00 2C */ stw r0, 0x2c(r1) -/* 8023A000 88 BD 01 0E */ lbz r5, 0x10e(r29) -/* 8023A004 54 A0 10 3A */ slwi r0, r5, 2 -/* 8023A008 7C 7D 02 14 */ add r3, r29, r0 -/* 8023A00C 80 63 00 B8 */ lwz r3, 0xb8(r3) -/* 8023A010 80 83 00 04 */ lwz r4, 4(r3) -/* 8023A014 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 8023A018 C0 3D 00 FC */ lfs f1, 0xfc(r29) -/* 8023A01C 1C 05 00 0C */ mulli r0, r5, 0xc -/* 8023A020 7C BD 02 14 */ add r5, r29, r0 -/* 8023A024 C0 05 00 CC */ lfs f0, 0xcc(r5) -/* 8023A028 EC 00 F8 2A */ fadds f0, f0, f31 -/* 8023A02C EC 21 00 2A */ fadds f1, f1, f0 -/* 8023A030 C0 41 00 28 */ lfs f2, 0x28(r1) -/* 8023A034 38 A0 00 01 */ li r5, 1 -/* 8023A038 4B F5 B0 BD */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb -/* 8023A03C 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 8023A040 C0 22 B1 6C */ lfs f1, lit_4156(r2) -/* 8023A044 C0 42 B1 70 */ lfs f2, lit_4157(r2) -/* 8023A048 C0 62 B1 74 */ lfs f3, lit_4158(r2) -/* 8023A04C C0 82 B1 64 */ lfs f4, lit_4154(r2) -/* 8023A050 FC A0 20 90 */ fmr f5, f4 -/* 8023A054 4B F5 B1 5D */ bl setParam__16dSelect_cursor_cFfffff -/* 8023A058 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 8023A05C 81 83 00 00 */ lwz r12, 0(r3) -/* 8023A060 81 8C 00 08 */ lwz r12, 8(r12) -/* 8023A064 7D 89 03 A6 */ mtctr r12 -/* 8023A068 4E 80 04 21 */ bctrl -lbl_8023A06C: -/* 8023A06C E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 8023A070 CB E1 00 60 */ lfd f31, 0x60(r1) -/* 8023A074 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 8023A078 CB C1 00 50 */ lfd f30, 0x50(r1) -/* 8023A07C 39 61 00 50 */ addi r11, r1, 0x50 -/* 8023A080 48 12 81 A1 */ bl _restgpr_27 -/* 8023A084 80 01 00 74 */ lwz r0, 0x74(r1) -/* 8023A088 7C 08 03 A6 */ mtlr r0 -/* 8023A08C 38 21 00 70 */ addi r1, r1, 0x70 -/* 8023A090 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/getCharSpace__17dMsgScrn3Select_cFv.s b/asm/msg/scrn/d_msg_scrn_3select/getCharSpace__17dMsgScrn3Select_cFv.s deleted file mode 100644 index 76deba5735d..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/getCharSpace__17dMsgScrn3Select_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8023A97C: -/* 8023A97C 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 8023A980 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A984 C0 23 01 14 */ lfs f1, 0x114(r3) -/* 8023A988 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/getFontSize__17dMsgScrn3Select_cFv.s b/asm/msg/scrn/d_msg_scrn_3select/getFontSize__17dMsgScrn3Select_cFv.s deleted file mode 100644 index fe76d618ede..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/getFontSize__17dMsgScrn3Select_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8023A94C: -/* 8023A94C 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 8023A950 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A954 C0 23 01 1C */ lfs f1, 0x11c(r3) -/* 8023A958 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/getRubyCharSpace__17dMsgScrn3Select_cFv.s b/asm/msg/scrn/d_msg_scrn_3select/getRubyCharSpace__17dMsgScrn3Select_cFv.s deleted file mode 100644 index 24340582cd7..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/getRubyCharSpace__17dMsgScrn3Select_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8023A98C: -/* 8023A98C 80 63 00 28 */ lwz r3, 0x28(r3) -/* 8023A990 28 03 00 00 */ cmplwi r3, 0 -/* 8023A994 41 82 00 10 */ beq lbl_8023A9A4 -/* 8023A998 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A99C C0 23 01 14 */ lfs f1, 0x114(r3) -/* 8023A9A0 4E 80 00 20 */ blr -lbl_8023A9A4: -/* 8023A9A4 C0 22 B1 58 */ lfs f1, lit_3909(r2) -/* 8023A9A8 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/getRubyFontSize__17dMsgScrn3Select_cFv.s b/asm/msg/scrn/d_msg_scrn_3select/getRubyFontSize__17dMsgScrn3Select_cFv.s deleted file mode 100644 index e44e0e71f50..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/getRubyFontSize__17dMsgScrn3Select_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8023A95C: -/* 8023A95C 80 63 00 28 */ lwz r3, 0x28(r3) -/* 8023A960 28 03 00 00 */ cmplwi r3, 0 -/* 8023A964 41 82 00 10 */ beq lbl_8023A974 -/* 8023A968 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A96C C0 23 01 1C */ lfs f1, 0x11c(r3) -/* 8023A970 4E 80 00 20 */ blr -lbl_8023A974: -/* 8023A974 C0 22 B1 58 */ lfs f1, lit_3909(r2) -/* 8023A978 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/getTextBoxGlobalPosX__17dMsgScrn3Select_cFi.s b/asm/msg/scrn/d_msg_scrn_3select/getTextBoxGlobalPosX__17dMsgScrn3Select_cFi.s deleted file mode 100644 index 7ebbba1cdae..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/getTextBoxGlobalPosX__17dMsgScrn3Select_cFi.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8023A9AC: -/* 8023A9AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8023A9B0 7C 08 02 A6 */ mflr r0 -/* 8023A9B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023A9B8 54 80 10 3A */ slwi r0, r4, 2 -/* 8023A9BC 7C 63 02 14 */ add r3, r3, r0 -/* 8023A9C0 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 8023A9C4 48 01 99 25 */ bl getGlobalPosX__8CPaneMgrFv -/* 8023A9C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8023A9CC 7C 08 03 A6 */ mtlr r0 -/* 8023A9D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023A9D4 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/getTextBoxGlobalPosY__17dMsgScrn3Select_cFi.s b/asm/msg/scrn/d_msg_scrn_3select/getTextBoxGlobalPosY__17dMsgScrn3Select_cFi.s deleted file mode 100644 index 14bff6a15da..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/getTextBoxGlobalPosY__17dMsgScrn3Select_cFi.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8023A9D8: -/* 8023A9D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8023A9DC 7C 08 02 A6 */ mflr r0 -/* 8023A9E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023A9E4 54 80 10 3A */ slwi r0, r4, 2 -/* 8023A9E8 7C 63 02 14 */ add r3, r3, r0 -/* 8023A9EC 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 8023A9F0 48 01 99 75 */ bl getGlobalPosY__8CPaneMgrFv -/* 8023A9F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8023A9F8 7C 08 03 A6 */ mtlr r0 -/* 8023A9FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023AA00 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/getTextBoxWidth__17dMsgScrn3Select_cFv.s b/asm/msg/scrn/d_msg_scrn_3select/getTextBoxWidth__17dMsgScrn3Select_cFv.s deleted file mode 100644 index f1260681911..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/getTextBoxWidth__17dMsgScrn3Select_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_8023A934: -/* 8023A934 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 8023A938 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A93C C0 23 00 28 */ lfs f1, 0x28(r3) -/* 8023A940 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 8023A944 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8023A948 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/isSelect__17dMsgScrn3Select_cFv.s b/asm/msg/scrn/d_msg_scrn_3select/isSelect__17dMsgScrn3Select_cFv.s deleted file mode 100644 index 32b7dfa881e..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/isSelect__17dMsgScrn3Select_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80239C64: -/* 80239C64 88 03 01 13 */ lbz r0, 0x113(r3) -/* 80239C68 20 00 00 03 */ subfic r0, r0, 3 -/* 80239C6C 7C 00 00 34 */ cntlzw r0, r0 -/* 80239C70 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 80239C74 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/open1Proc__17dMsgScrn3Select_cFv.s b/asm/msg/scrn/d_msg_scrn_3select/open1Proc__17dMsgScrn3Select_cFv.s deleted file mode 100644 index c5b4ce365a2..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/open1Proc__17dMsgScrn3Select_cFv.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_8023AA04: -/* 8023AA04 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8023AA08 7C 08 02 A6 */ mflr r0 -/* 8023AA0C 90 01 00 44 */ stw r0, 0x44(r1) -/* 8023AA10 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 8023AA14 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 8023AA18 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023AA1C 48 12 77 BD */ bl _savegpr_28 -/* 8023AA20 7C 7C 1B 78 */ mr r28, r3 -/* 8023AA24 3C 60 80 3A */ lis r3, lit_4497@ha /* 0x80399828@ha */ -/* 8023AA28 38 83 98 28 */ addi r4, r3, lit_4497@l /* 0x80399828@l */ -/* 8023AA2C 80 64 00 00 */ lwz r3, 0(r4) -/* 8023AA30 80 04 00 04 */ lwz r0, 4(r4) -/* 8023AA34 90 61 00 08 */ stw r3, 8(r1) -/* 8023AA38 90 01 00 0C */ stw r0, 0xc(r1) -/* 8023AA3C 80 04 00 08 */ lwz r0, 8(r4) -/* 8023AA40 90 01 00 10 */ stw r0, 0x10(r1) -/* 8023AA44 88 1C 01 0E */ lbz r0, 0x10e(r28) -/* 8023AA48 28 00 00 FF */ cmplwi r0, 0xff -/* 8023AA4C 41 82 00 78 */ beq lbl_8023AAC4 -/* 8023AA50 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d -/* 8023AA54 38 61 00 08 */ addi r3, r1, 8 -/* 8023AA58 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8023AA5C D0 1C 00 F0 */ stfs f0, 0xf0(r28) -/* 8023AA60 3B A0 00 00 */ li r29, 0 -/* 8023AA64 3B E0 00 00 */ li r31, 0 -lbl_8023AA68: -/* 8023AA68 3B DF 00 34 */ addi r30, r31, 0x34 -/* 8023AA6C 7C 7C F0 2E */ lwzx r3, r28, r30 -/* 8023AA70 80 63 00 04 */ lwz r3, 4(r3) -/* 8023AA74 48 0B C6 8D */ bl getBounds__7J2DPaneFv -/* 8023AA78 C3 E3 00 00 */ lfs f31, 0(r3) -/* 8023AA7C 7F 83 E3 78 */ mr r3, r28 -/* 8023AA80 7F A4 EB 78 */ mr r4, r29 -/* 8023AA84 48 00 0D ED */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023AA88 7C 7C F0 2E */ lwzx r3, r28, r30 -/* 8023AA8C 80 63 00 04 */ lwz r3, 4(r3) -/* 8023AA90 48 0B C6 71 */ bl getBounds__7J2DPaneFv -/* 8023AA94 C0 43 00 04 */ lfs f2, 4(r3) -/* 8023AA98 7C 7C F0 2E */ lwzx r3, r28, r30 -/* 8023AA9C 80 63 00 04 */ lwz r3, 4(r3) -/* 8023AAA0 FC 20 F8 90 */ fmr f1, f31 -/* 8023AAA4 81 83 00 00 */ lwz r12, 0(r3) -/* 8023AAA8 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 8023AAAC 7D 89 03 A6 */ mtctr r12 -/* 8023AAB0 4E 80 04 21 */ bctrl -/* 8023AAB4 3B BD 00 01 */ addi r29, r29, 1 -/* 8023AAB8 2C 1D 00 03 */ cmpwi r29, 3 -/* 8023AABC 3B FF 00 04 */ addi r31, r31, 4 -/* 8023AAC0 41 80 FF A8 */ blt lbl_8023AA68 -lbl_8023AAC4: -/* 8023AAC4 C0 02 B1 5C */ lfs f0, lit_3910(r2) -/* 8023AAC8 D0 1C 00 F0 */ stfs f0, 0xf0(r28) -/* 8023AACC 38 00 00 01 */ li r0, 1 -/* 8023AAD0 98 1C 01 13 */ stb r0, 0x113(r28) -/* 8023AAD4 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 8023AAD8 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 8023AADC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023AAE0 48 12 77 45 */ bl _restgpr_28 -/* 8023AAE4 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8023AAE8 7C 08 03 A6 */ mtlr r0 -/* 8023AAEC 38 21 00 40 */ addi r1, r1, 0x40 -/* 8023AAF0 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/open2Proc__17dMsgScrn3Select_cFv.s b/asm/msg/scrn/d_msg_scrn_3select/open2Proc__17dMsgScrn3Select_cFv.s deleted file mode 100644 index a3f366b93e9..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/open2Proc__17dMsgScrn3Select_cFv.s +++ /dev/null @@ -1,76 +0,0 @@ -lbl_8023AAF4: -/* 8023AAF4 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8023AAF8 7C 08 02 A6 */ mflr r0 -/* 8023AAFC 90 01 00 54 */ stw r0, 0x54(r1) -/* 8023AB00 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 8023AB04 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 8023AB08 DB C1 00 30 */ stfd f30, 0x30(r1) -/* 8023AB0C F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 8023AB10 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023AB14 48 12 76 C5 */ bl _savegpr_28 -/* 8023AB18 7C 7F 1B 78 */ mr r31, r3 -/* 8023AB1C 3C 60 80 3A */ lis r3, lit_4520@ha /* 0x80399834@ha */ -/* 8023AB20 38 83 98 34 */ addi r4, r3, lit_4520@l /* 0x80399834@l */ -/* 8023AB24 80 64 00 00 */ lwz r3, 0(r4) -/* 8023AB28 80 04 00 04 */ lwz r0, 4(r4) -/* 8023AB2C 90 61 00 08 */ stw r3, 8(r1) -/* 8023AB30 90 01 00 0C */ stw r0, 0xc(r1) -/* 8023AB34 80 04 00 08 */ lwz r0, 8(r4) -/* 8023AB38 90 01 00 10 */ stw r0, 0x10(r1) -/* 8023AB3C C0 1F 00 F0 */ lfs f0, 0xf0(r31) -/* 8023AB40 C0 22 B1 60 */ lfs f1, lit_3911(r2) -/* 8023AB44 EC 00 08 2A */ fadds f0, f0, f1 -/* 8023AB48 D0 1F 00 F0 */ stfs f0, 0xf0(r31) -/* 8023AB4C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8023AB50 4B F5 A7 51 */ bl setAlphaRate__16dSelect_cursor_cFf -/* 8023AB54 C0 3F 00 F0 */ lfs f1, 0xf0(r31) -/* 8023AB58 C0 02 B1 80 */ lfs f0, lit_4434(r2) -/* 8023AB5C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8023AB60 4C 41 13 82 */ cror 2, 1, 2 -/* 8023AB64 40 82 00 30 */ bne lbl_8023AB94 -/* 8023AB68 88 1F 01 0E */ lbz r0, 0x10e(r31) -/* 8023AB6C 28 00 00 FF */ cmplwi r0, 0xff -/* 8023AB70 41 82 00 14 */ beq lbl_8023AB84 -/* 8023AB74 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d -/* 8023AB78 38 61 00 08 */ addi r3, r1, 8 -/* 8023AB7C 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8023AB80 D0 1F 00 F0 */ stfs f0, 0xf0(r31) -lbl_8023AB84: -/* 8023AB84 38 00 00 01 */ li r0, 1 -/* 8023AB88 98 1F 01 17 */ stb r0, 0x117(r31) -/* 8023AB8C 38 00 00 02 */ li r0, 2 -/* 8023AB90 98 1F 01 13 */ stb r0, 0x113(r31) -lbl_8023AB94: -/* 8023AB94 3B 80 00 00 */ li r28, 0 -/* 8023AB98 3B C0 00 00 */ li r30, 0 -lbl_8023AB9C: -/* 8023AB9C 3B BE 00 34 */ addi r29, r30, 0x34 -/* 8023ABA0 7C 7F E8 2E */ lwzx r3, r31, r29 -/* 8023ABA4 80 63 00 04 */ lwz r3, 4(r3) -/* 8023ABA8 C3 E3 00 CC */ lfs f31, 0xcc(r3) -/* 8023ABAC C3 C3 00 D0 */ lfs f30, 0xd0(r3) -/* 8023ABB0 7F E3 FB 78 */ mr r3, r31 -/* 8023ABB4 7F 84 E3 78 */ mr r4, r28 -/* 8023ABB8 48 00 0C B9 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023ABBC 7C 7F E8 2E */ lwzx r3, r31, r29 -/* 8023ABC0 80 63 00 04 */ lwz r3, 4(r3) -/* 8023ABC4 D3 E3 00 CC */ stfs f31, 0xcc(r3) -/* 8023ABC8 D3 C3 00 D0 */ stfs f30, 0xd0(r3) -/* 8023ABCC 81 83 00 00 */ lwz r12, 0(r3) -/* 8023ABD0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8023ABD4 7D 89 03 A6 */ mtctr r12 -/* 8023ABD8 4E 80 04 21 */ bctrl -/* 8023ABDC 3B 9C 00 01 */ addi r28, r28, 1 -/* 8023ABE0 2C 1C 00 03 */ cmpwi r28, 3 -/* 8023ABE4 3B DE 00 04 */ addi r30, r30, 4 -/* 8023ABE8 41 80 FF B4 */ blt lbl_8023AB9C -/* 8023ABEC E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 8023ABF0 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 8023ABF4 E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 8023ABF8 CB C1 00 30 */ lfd f30, 0x30(r1) -/* 8023ABFC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023AC00 48 12 76 25 */ bl _restgpr_28 -/* 8023AC04 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8023AC08 7C 08 03 A6 */ mtlr r0 -/* 8023AC0C 38 21 00 50 */ addi r1, r1, 0x50 -/* 8023AC10 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/selAnimeEnd__17dMsgScrn3Select_cFv.s b/asm/msg/scrn/d_msg_scrn_3select/selAnimeEnd__17dMsgScrn3Select_cFv.s deleted file mode 100644 index a3f2b1d0949..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/selAnimeEnd__17dMsgScrn3Select_cFv.s +++ /dev/null @@ -1,183 +0,0 @@ -lbl_8023A680: -/* 8023A680 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8023A684 7C 08 02 A6 */ mflr r0 -/* 8023A688 90 01 00 44 */ stw r0, 0x44(r1) -/* 8023A68C DB E1 00 30 */ stfd f31, 0x30(r1) -/* 8023A690 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 8023A694 DB C1 00 20 */ stfd f30, 0x20(r1) -/* 8023A698 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 8023A69C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023A6A0 48 12 7B 39 */ bl _savegpr_28 -/* 8023A6A4 7C 7F 1B 78 */ mr r31, r3 -/* 8023A6A8 88 03 01 13 */ lbz r0, 0x113(r3) -/* 8023A6AC 28 00 00 06 */ cmplwi r0, 6 -/* 8023A6B0 40 82 00 0C */ bne lbl_8023A6BC -/* 8023A6B4 38 60 00 01 */ li r3, 1 -/* 8023A6B8 48 00 02 54 */ b lbl_8023A90C -lbl_8023A6BC: -/* 8023A6BC 3B C0 00 00 */ li r30, 0 -/* 8023A6C0 9B DF 01 14 */ stb r30, 0x114(r31) -/* 8023A6C4 88 1F 01 13 */ lbz r0, 0x113(r31) -/* 8023A6C8 28 00 00 05 */ cmplwi r0, 5 -/* 8023A6CC 41 82 00 70 */ beq lbl_8023A73C -/* 8023A6D0 C0 02 B1 80 */ lfs f0, lit_4434(r2) -/* 8023A6D4 D0 1F 00 F0 */ stfs f0, 0xf0(r31) -/* 8023A6D8 3B 80 00 00 */ li r28, 0 -lbl_8023A6DC: -/* 8023A6DC 3B BE 00 34 */ addi r29, r30, 0x34 -/* 8023A6E0 7C 7F E8 2E */ lwzx r3, r31, r29 -/* 8023A6E4 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A6E8 C3 E3 00 CC */ lfs f31, 0xcc(r3) -/* 8023A6EC C3 C3 00 D0 */ lfs f30, 0xd0(r3) -/* 8023A6F0 7F E3 FB 78 */ mr r3, r31 -/* 8023A6F4 7F 84 E3 78 */ mr r4, r28 -/* 8023A6F8 48 00 11 79 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023A6FC 7C 7F E8 2E */ lwzx r3, r31, r29 -/* 8023A700 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A704 D3 E3 00 CC */ stfs f31, 0xcc(r3) -/* 8023A708 D3 C3 00 D0 */ stfs f30, 0xd0(r3) -/* 8023A70C 81 83 00 00 */ lwz r12, 0(r3) -/* 8023A710 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8023A714 7D 89 03 A6 */ mtctr r12 -/* 8023A718 4E 80 04 21 */ bctrl -/* 8023A71C 3B 9C 00 01 */ addi r28, r28, 1 -/* 8023A720 2C 1C 00 03 */ cmpwi r28, 3 -/* 8023A724 3B DE 00 04 */ addi r30, r30, 4 -/* 8023A728 41 80 FF B4 */ blt lbl_8023A6DC -/* 8023A72C 38 00 00 05 */ li r0, 5 -/* 8023A730 98 1F 01 13 */ stb r0, 0x113(r31) -/* 8023A734 38 00 00 00 */ li r0, 0 -/* 8023A738 98 1F 01 17 */ stb r0, 0x117(r31) -lbl_8023A73C: -/* 8023A73C 7F E3 FB 78 */ mr r3, r31 -/* 8023A740 88 1F 01 13 */ lbz r0, 0x113(r31) -/* 8023A744 1C A0 00 0C */ mulli r5, r0, 0xc -/* 8023A748 3C 80 80 3C */ lis r4, process@ha /* 0x803C0C54@ha */ -/* 8023A74C 38 04 0C 54 */ addi r0, r4, process@l /* 0x803C0C54@l */ -/* 8023A750 7D 80 2A 14 */ add r12, r0, r5 -/* 8023A754 48 12 79 31 */ bl __ptmf_scall -/* 8023A758 60 00 00 00 */ nop -/* 8023A75C C0 3F 00 F4 */ lfs f1, 0xf4(r31) -/* 8023A760 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023A764 EC 01 00 2A */ fadds f0, f1, f0 -/* 8023A768 D0 1F 00 F4 */ stfs f0, 0xf4(r31) -/* 8023A76C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8023A770 A8 03 00 06 */ lha r0, 6(r3) -/* 8023A774 C0 5F 00 F4 */ lfs f2, 0xf4(r31) -/* 8023A778 C8 22 B1 78 */ lfd f1, lit_4345(r2) -/* 8023A77C 6C 03 80 00 */ xoris r3, r0, 0x8000 -/* 8023A780 90 61 00 0C */ stw r3, 0xc(r1) -/* 8023A784 3C 00 43 30 */ lis r0, 0x4330 -/* 8023A788 90 01 00 08 */ stw r0, 8(r1) -/* 8023A78C C8 01 00 08 */ lfd f0, 8(r1) -/* 8023A790 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8023A794 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8023A798 4C 41 13 82 */ cror 2, 1, 2 -/* 8023A79C 40 82 00 1C */ bne lbl_8023A7B8 -/* 8023A7A0 90 61 00 0C */ stw r3, 0xc(r1) -/* 8023A7A4 90 01 00 08 */ stw r0, 8(r1) -/* 8023A7A8 C8 01 00 08 */ lfd f0, 8(r1) -/* 8023A7AC EC 00 08 28 */ fsubs f0, f0, f1 -/* 8023A7B0 EC 02 00 28 */ fsubs f0, f2, f0 -/* 8023A7B4 D0 1F 00 F4 */ stfs f0, 0xf4(r31) -lbl_8023A7B8: -/* 8023A7B8 C0 1F 00 F4 */ lfs f0, 0xf4(r31) -/* 8023A7BC 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8023A7C0 D0 03 00 08 */ stfs f0, 8(r3) -/* 8023A7C4 C0 3F 00 F8 */ lfs f1, 0xf8(r31) -/* 8023A7C8 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023A7CC EC 01 00 2A */ fadds f0, f1, f0 -/* 8023A7D0 D0 1F 00 F8 */ stfs f0, 0xf8(r31) -/* 8023A7D4 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 8023A7D8 A8 03 00 06 */ lha r0, 6(r3) -/* 8023A7DC C0 5F 00 F8 */ lfs f2, 0xf8(r31) -/* 8023A7E0 C8 22 B1 78 */ lfd f1, lit_4345(r2) -/* 8023A7E4 6C 03 80 00 */ xoris r3, r0, 0x8000 -/* 8023A7E8 90 61 00 0C */ stw r3, 0xc(r1) -/* 8023A7EC 3C 00 43 30 */ lis r0, 0x4330 -/* 8023A7F0 90 01 00 08 */ stw r0, 8(r1) -/* 8023A7F4 C8 01 00 08 */ lfd f0, 8(r1) -/* 8023A7F8 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8023A7FC FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8023A800 4C 41 13 82 */ cror 2, 1, 2 -/* 8023A804 40 82 00 1C */ bne lbl_8023A820 -/* 8023A808 90 61 00 0C */ stw r3, 0xc(r1) -/* 8023A80C 90 01 00 08 */ stw r0, 8(r1) -/* 8023A810 C8 01 00 08 */ lfd f0, 8(r1) -/* 8023A814 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8023A818 EC 02 00 28 */ fsubs f0, f2, f0 -/* 8023A81C D0 1F 00 F8 */ stfs f0, 0xf8(r31) -lbl_8023A820: -/* 8023A820 C0 1F 00 F8 */ lfs f0, 0xf8(r31) -/* 8023A824 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 8023A828 D0 03 00 08 */ stfs f0, 8(r3) -/* 8023A82C 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023A830 48 0B EE 61 */ bl animation__9J2DScreenFv -/* 8023A834 3B 80 00 00 */ li r28, 0 -/* 8023A838 3B C0 00 00 */ li r30, 0 -lbl_8023A83C: -/* 8023A83C 88 1F 01 0E */ lbz r0, 0x10e(r31) -/* 8023A840 7C 1C 00 00 */ cmpw r28, r0 -/* 8023A844 40 82 00 54 */ bne lbl_8023A898 -/* 8023A848 7F BF F2 14 */ add r29, r31, r30 -/* 8023A84C 80 7D 00 40 */ lwz r3, 0x40(r29) -/* 8023A850 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A854 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023A858 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8023A85C D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 8023A860 81 83 00 00 */ lwz r12, 0(r3) -/* 8023A864 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8023A868 7D 89 03 A6 */ mtctr r12 -/* 8023A86C 4E 80 04 21 */ bctrl -/* 8023A870 80 7D 00 4C */ lwz r3, 0x4c(r29) -/* 8023A874 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A878 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023A87C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8023A880 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 8023A884 81 83 00 00 */ lwz r12, 0(r3) -/* 8023A888 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8023A88C 7D 89 03 A6 */ mtctr r12 -/* 8023A890 4E 80 04 21 */ bctrl -/* 8023A894 48 00 00 50 */ b lbl_8023A8E4 -lbl_8023A898: -/* 8023A898 7F BF F2 14 */ add r29, r31, r30 -/* 8023A89C 80 7D 00 40 */ lwz r3, 0x40(r29) -/* 8023A8A0 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A8A4 C0 02 B1 58 */ lfs f0, lit_3909(r2) -/* 8023A8A8 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8023A8AC D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 8023A8B0 81 83 00 00 */ lwz r12, 0(r3) -/* 8023A8B4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8023A8B8 7D 89 03 A6 */ mtctr r12 -/* 8023A8BC 4E 80 04 21 */ bctrl -/* 8023A8C0 80 7D 00 4C */ lwz r3, 0x4c(r29) -/* 8023A8C4 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A8C8 C0 02 B1 58 */ lfs f0, lit_3909(r2) -/* 8023A8CC D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8023A8D0 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 8023A8D4 81 83 00 00 */ lwz r12, 0(r3) -/* 8023A8D8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8023A8DC 7D 89 03 A6 */ mtctr r12 -/* 8023A8E0 4E 80 04 21 */ bctrl -lbl_8023A8E4: -/* 8023A8E4 3B 9C 00 01 */ addi r28, r28, 1 -/* 8023A8E8 2C 1C 00 03 */ cmpwi r28, 3 -/* 8023A8EC 3B DE 00 04 */ addi r30, r30, 4 -/* 8023A8F0 41 80 FF 4C */ blt lbl_8023A83C -/* 8023A8F4 7F E3 FB 78 */ mr r3, r31 -/* 8023A8F8 48 00 0B B5 */ bl selectTrans__17dMsgScrn3Select_cFv -/* 8023A8FC 88 1F 01 13 */ lbz r0, 0x113(r31) -/* 8023A900 20 00 00 06 */ subfic r0, r0, 6 -/* 8023A904 7C 00 00 34 */ cntlzw r0, r0 -/* 8023A908 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -lbl_8023A90C: -/* 8023A90C E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 8023A910 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 8023A914 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 8023A918 CB C1 00 20 */ lfd f30, 0x20(r1) -/* 8023A91C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023A920 48 12 79 05 */ bl _restgpr_28 -/* 8023A924 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8023A928 7C 08 03 A6 */ mtlr r0 -/* 8023A92C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8023A930 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/selAnimeInit__17dMsgScrn3Select_cFUcUcUcfUc.s b/asm/msg/scrn/d_msg_scrn_3select/selAnimeInit__17dMsgScrn3Select_cFUcUcUcfUc.s deleted file mode 100644 index df6d98a2794..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/selAnimeInit__17dMsgScrn3Select_cFUcUcUcfUc.s +++ /dev/null @@ -1,206 +0,0 @@ -lbl_8023A094: -/* 8023A094 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8023A098 7C 08 02 A6 */ mflr r0 -/* 8023A09C 90 01 00 44 */ stw r0, 0x44(r1) -/* 8023A0A0 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 8023A0A4 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 8023A0A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023A0AC 48 12 81 25 */ bl _savegpr_26 -/* 8023A0B0 7C 7E 1B 78 */ mr r30, r3 -/* 8023A0B4 7C 9A 23 78 */ mr r26, r4 -/* 8023A0B8 7C DB 33 78 */ mr r27, r6 -/* 8023A0BC FF E0 08 90 */ fmr f31, f1 -/* 8023A0C0 98 A3 01 0E */ stb r5, 0x10e(r3) -/* 8023A0C4 98 A3 01 10 */ stb r5, 0x110(r3) -/* 8023A0C8 9B 43 01 11 */ stb r26, 0x111(r3) -/* 8023A0CC 88 03 01 0E */ lbz r0, 0x10e(r3) -/* 8023A0D0 98 03 01 0F */ stb r0, 0x10f(r3) -/* 8023A0D4 3B A0 00 00 */ li r29, 0 -/* 8023A0D8 9B A3 01 14 */ stb r29, 0x114(r3) -/* 8023A0DC B3 A3 01 0A */ sth r29, 0x10a(r3) -/* 8023A0E0 B3 A3 01 0C */ sth r29, 0x10c(r3) -/* 8023A0E4 98 E3 01 12 */ stb r7, 0x112(r3) -/* 8023A0E8 3B 80 00 00 */ li r28, 0 -lbl_8023A0EC: -/* 8023A0EC 7F FE EA 14 */ add r31, r30, r29 -/* 8023A0F0 80 7F 00 AC */ lwz r3, 0xac(r31) -/* 8023A0F4 C0 22 B1 60 */ lfs f1, lit_3911(r2) -/* 8023A0F8 FC 40 08 90 */ fmr f2, f1 -/* 8023A0FC 48 01 A5 3D */ bl paneScale__8CPaneMgrFff -/* 8023A100 80 7F 00 B8 */ lwz r3, 0xb8(r31) -/* 8023A104 C0 22 B1 60 */ lfs f1, lit_3911(r2) -/* 8023A108 FC 40 08 90 */ fmr f2, f1 -/* 8023A10C 48 01 A5 2D */ bl paneScale__8CPaneMgrFff -/* 8023A110 80 7F 00 7C */ lwz r3, 0x7c(r31) -/* 8023A114 C0 22 B1 60 */ lfs f1, lit_3911(r2) -/* 8023A118 FC 40 08 90 */ fmr f2, f1 -/* 8023A11C 48 01 A5 1D */ bl paneScale__8CPaneMgrFff -/* 8023A120 80 7F 00 88 */ lwz r3, 0x88(r31) -/* 8023A124 C0 22 B1 60 */ lfs f1, lit_3911(r2) -/* 8023A128 FC 40 08 90 */ fmr f2, f1 -/* 8023A12C 48 01 A5 0D */ bl paneScale__8CPaneMgrFff -/* 8023A130 80 7F 00 40 */ lwz r3, 0x40(r31) -/* 8023A134 C0 22 B1 60 */ lfs f1, lit_3911(r2) -/* 8023A138 FC 40 08 90 */ fmr f2, f1 -/* 8023A13C 48 01 A4 FD */ bl paneScale__8CPaneMgrFff -/* 8023A140 80 7F 00 4C */ lwz r3, 0x4c(r31) -/* 8023A144 C0 22 B1 60 */ lfs f1, lit_3911(r2) -/* 8023A148 FC 40 08 90 */ fmr f2, f1 -/* 8023A14C 48 01 A4 ED */ bl paneScale__8CPaneMgrFff -/* 8023A150 80 7F 00 58 */ lwz r3, 0x58(r31) -/* 8023A154 C0 22 B1 60 */ lfs f1, lit_3911(r2) -/* 8023A158 FC 40 08 90 */ fmr f2, f1 -/* 8023A15C 48 01 A4 DD */ bl paneScale__8CPaneMgrFff -/* 8023A160 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 8023A164 C0 22 B1 60 */ lfs f1, lit_3911(r2) -/* 8023A168 FC 40 08 90 */ fmr f2, f1 -/* 8023A16C 48 01 A4 CD */ bl paneScale__8CPaneMgrFff -/* 8023A170 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 8023A174 28 03 00 00 */ cmplwi r3, 0 -/* 8023A178 41 82 00 10 */ beq lbl_8023A188 -/* 8023A17C C0 22 B1 60 */ lfs f1, lit_3911(r2) -/* 8023A180 FC 40 08 90 */ fmr f2, f1 -/* 8023A184 48 01 A4 B5 */ bl paneScale__8CPaneMgrFff -lbl_8023A188: -/* 8023A188 3B 9C 00 01 */ addi r28, r28, 1 -/* 8023A18C 2C 1C 00 03 */ cmpwi r28, 3 -/* 8023A190 3B BD 00 04 */ addi r29, r29, 4 -/* 8023A194 41 80 FF 58 */ blt lbl_8023A0EC -/* 8023A198 D3 FE 01 00 */ stfs f31, 0x100(r30) -/* 8023A19C 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 8023A1A0 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 8023A1A4 C0 3E 01 00 */ lfs f1, 0x100(r30) -/* 8023A1A8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8023A1AC 40 81 00 10 */ ble lbl_8023A1BC -/* 8023A1B0 EC 01 00 24 */ fdivs f0, f1, f0 -/* 8023A1B4 D0 1E 01 04 */ stfs f0, 0x104(r30) -/* 8023A1B8 48 00 00 0C */ b lbl_8023A1C4 -lbl_8023A1BC: -/* 8023A1BC C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023A1C0 D0 1E 01 04 */ stfs f0, 0x104(r30) -lbl_8023A1C4: -/* 8023A1C4 57 40 06 3E */ clrlwi r0, r26, 0x18 -/* 8023A1C8 2C 00 00 03 */ cmpwi r0, 3 -/* 8023A1CC 41 82 00 70 */ beq lbl_8023A23C -/* 8023A1D0 40 80 00 94 */ bge lbl_8023A264 -/* 8023A1D4 2C 00 00 02 */ cmpwi r0, 2 -/* 8023A1D8 40 80 00 08 */ bge lbl_8023A1E0 -/* 8023A1DC 48 00 00 88 */ b lbl_8023A264 -lbl_8023A1E0: -/* 8023A1E0 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 8023A1E4 48 01 B4 25 */ bl hide__13CPaneMgrAlphaFv -/* 8023A1E8 80 7E 00 38 */ lwz r3, 0x38(r30) -/* 8023A1EC 48 01 B3 DD */ bl show__13CPaneMgrAlphaFv -/* 8023A1F0 80 7E 00 3C */ lwz r3, 0x3c(r30) -/* 8023A1F4 48 01 B3 D5 */ bl show__13CPaneMgrAlphaFv -/* 8023A1F8 57 60 06 3E */ clrlwi r0, r27, 0x18 -/* 8023A1FC 28 00 00 01 */ cmplwi r0, 1 -/* 8023A200 40 82 00 28 */ bne lbl_8023A228 -/* 8023A204 80 7E 00 38 */ lwz r3, 0x38(r30) -/* 8023A208 C0 03 00 28 */ lfs f0, 0x28(r3) -/* 8023A20C 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 8023A210 C0 43 00 28 */ lfs f2, 0x28(r3) -/* 8023A214 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 8023A218 C0 22 B1 58 */ lfs f1, lit_3909(r2) -/* 8023A21C EC 42 00 28 */ fsubs f2, f2, f0 -/* 8023A220 48 01 A3 91 */ bl paneTrans__8CPaneMgrFff -/* 8023A224 48 00 00 40 */ b lbl_8023A264 -lbl_8023A228: -/* 8023A228 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 8023A22C C0 22 B1 58 */ lfs f1, lit_3909(r2) -/* 8023A230 FC 40 08 90 */ fmr f2, f1 -/* 8023A234 48 01 A3 7D */ bl paneTrans__8CPaneMgrFff -/* 8023A238 48 00 00 2C */ b lbl_8023A264 -lbl_8023A23C: -/* 8023A23C 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 8023A240 48 01 B3 89 */ bl show__13CPaneMgrAlphaFv -/* 8023A244 80 7E 00 38 */ lwz r3, 0x38(r30) -/* 8023A248 48 01 B3 81 */ bl show__13CPaneMgrAlphaFv -/* 8023A24C 80 7E 00 3C */ lwz r3, 0x3c(r30) -/* 8023A250 48 01 B3 79 */ bl show__13CPaneMgrAlphaFv -/* 8023A254 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 8023A258 C0 22 B1 58 */ lfs f1, lit_3909(r2) -/* 8023A25C FC 40 08 90 */ fmr f2, f1 -/* 8023A260 48 01 A3 51 */ bl paneTrans__8CPaneMgrFff -lbl_8023A264: -/* 8023A264 C0 02 B1 5C */ lfs f0, lit_3910(r2) -/* 8023A268 D0 1E 00 F0 */ stfs f0, 0xf0(r30) -/* 8023A26C 3B 80 00 00 */ li r28, 0 -lbl_8023A270: -/* 8023A270 7F C3 F3 78 */ mr r3, r30 -/* 8023A274 7F 84 E3 78 */ mr r4, r28 -/* 8023A278 48 00 15 F9 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023A27C 3B 9C 00 01 */ addi r28, r28, 1 -/* 8023A280 2C 1C 00 03 */ cmpwi r28, 3 -/* 8023A284 41 80 FF EC */ blt lbl_8023A270 -/* 8023A288 7F C3 F3 78 */ mr r3, r30 -/* 8023A28C 48 00 0F 9D */ bl selectScale__17dMsgScrn3Select_cFv -/* 8023A290 7F C3 F3 78 */ mr r3, r30 -/* 8023A294 48 00 12 19 */ bl selectTrans__17dMsgScrn3Select_cFv -/* 8023A298 3B E0 00 00 */ li r31, 0 -/* 8023A29C 3B A0 00 00 */ li r29, 0 -lbl_8023A2A0: -/* 8023A2A0 88 1E 01 0E */ lbz r0, 0x10e(r30) -/* 8023A2A4 7C 1F 00 00 */ cmpw r31, r0 -/* 8023A2A8 40 82 00 60 */ bne lbl_8023A308 -/* 8023A2AC 80 1E 00 C4 */ lwz r0, 0xc4(r30) -/* 8023A2B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023A2B4 7F 9E EA 14 */ add r28, r30, r29 -/* 8023A2B8 80 7C 00 1C */ lwz r3, 0x1c(r28) -/* 8023A2BC 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A2C0 38 81 00 14 */ addi r4, r1, 0x14 -/* 8023A2C4 81 83 00 00 */ lwz r12, 0(r3) -/* 8023A2C8 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 8023A2CC 7D 89 03 A6 */ mtctr r12 -/* 8023A2D0 4E 80 04 21 */ bctrl -/* 8023A2D4 80 1C 00 28 */ lwz r0, 0x28(r28) -/* 8023A2D8 28 00 00 00 */ cmplwi r0, 0 -/* 8023A2DC 41 82 00 84 */ beq lbl_8023A360 -/* 8023A2E0 80 1E 00 C4 */ lwz r0, 0xc4(r30) -/* 8023A2E4 90 01 00 10 */ stw r0, 0x10(r1) -/* 8023A2E8 80 7C 00 28 */ lwz r3, 0x28(r28) -/* 8023A2EC 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A2F0 38 81 00 10 */ addi r4, r1, 0x10 -/* 8023A2F4 81 83 00 00 */ lwz r12, 0(r3) -/* 8023A2F8 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 8023A2FC 7D 89 03 A6 */ mtctr r12 -/* 8023A300 4E 80 04 21 */ bctrl -/* 8023A304 48 00 00 5C */ b lbl_8023A360 -lbl_8023A308: -/* 8023A308 80 1E 00 C8 */ lwz r0, 0xc8(r30) -/* 8023A30C 90 01 00 0C */ stw r0, 0xc(r1) -/* 8023A310 7F 9E EA 14 */ add r28, r30, r29 -/* 8023A314 80 7C 00 1C */ lwz r3, 0x1c(r28) -/* 8023A318 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A31C 38 81 00 0C */ addi r4, r1, 0xc -/* 8023A320 81 83 00 00 */ lwz r12, 0(r3) -/* 8023A324 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 8023A328 7D 89 03 A6 */ mtctr r12 -/* 8023A32C 4E 80 04 21 */ bctrl -/* 8023A330 80 1C 00 28 */ lwz r0, 0x28(r28) -/* 8023A334 28 00 00 00 */ cmplwi r0, 0 -/* 8023A338 41 82 00 28 */ beq lbl_8023A360 -/* 8023A33C 80 1E 00 C8 */ lwz r0, 0xc8(r30) -/* 8023A340 90 01 00 08 */ stw r0, 8(r1) -/* 8023A344 80 7C 00 28 */ lwz r3, 0x28(r28) -/* 8023A348 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A34C 38 81 00 08 */ addi r4, r1, 8 -/* 8023A350 81 83 00 00 */ lwz r12, 0(r3) -/* 8023A354 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 8023A358 7D 89 03 A6 */ mtctr r12 -/* 8023A35C 4E 80 04 21 */ bctrl -lbl_8023A360: -/* 8023A360 3B FF 00 01 */ addi r31, r31, 1 -/* 8023A364 2C 1F 00 03 */ cmpwi r31, 3 -/* 8023A368 3B BD 00 04 */ addi r29, r29, 4 -/* 8023A36C 41 80 FF 34 */ blt lbl_8023A2A0 -/* 8023A370 38 00 00 00 */ li r0, 0 -/* 8023A374 98 1E 01 13 */ stb r0, 0x113(r30) -/* 8023A378 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 8023A37C CB E1 00 30 */ lfd f31, 0x30(r1) -/* 8023A380 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023A384 48 12 7E 99 */ bl _restgpr_26 -/* 8023A388 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8023A38C 7C 08 03 A6 */ mtlr r0 -/* 8023A390 38 21 00 40 */ addi r1, r1, 0x40 -/* 8023A394 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/selAnimeMove__17dMsgScrn3Select_cFUcUcb.s b/asm/msg/scrn/d_msg_scrn_3select/selAnimeMove__17dMsgScrn3Select_cFUcUcb.s deleted file mode 100644 index b025e8597a1..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/selAnimeMove__17dMsgScrn3Select_cFUcUcb.s +++ /dev/null @@ -1,195 +0,0 @@ -lbl_8023A398: -/* 8023A398 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8023A39C 7C 08 02 A6 */ mflr r0 -/* 8023A3A0 90 01 00 34 */ stw r0, 0x34(r1) -/* 8023A3A4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023A3A8 48 12 7E 31 */ bl _savegpr_28 -/* 8023A3AC 7C 7E 1B 78 */ mr r30, r3 -/* 8023A3B0 98 A3 01 10 */ stb r5, 0x110(r3) -/* 8023A3B4 98 83 01 11 */ stb r4, 0x111(r3) -/* 8023A3B8 38 00 00 00 */ li r0, 0 -/* 8023A3BC 98 03 01 14 */ stb r0, 0x114(r3) -/* 8023A3C0 98 C3 01 08 */ stb r6, 0x108(r3) -/* 8023A3C4 88 03 01 13 */ lbz r0, 0x113(r3) -/* 8023A3C8 1C A0 00 0C */ mulli r5, r0, 0xc -/* 8023A3CC 3C 80 80 3C */ lis r4, process@ha /* 0x803C0C54@ha */ -/* 8023A3D0 38 04 0C 54 */ addi r0, r4, process@l /* 0x803C0C54@l */ -/* 8023A3D4 7D 80 2A 14 */ add r12, r0, r5 -/* 8023A3D8 48 12 7C AD */ bl __ptmf_scall -/* 8023A3DC 60 00 00 00 */ nop -/* 8023A3E0 C0 3E 00 F4 */ lfs f1, 0xf4(r30) -/* 8023A3E4 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023A3E8 EC 01 00 2A */ fadds f0, f1, f0 -/* 8023A3EC D0 1E 00 F4 */ stfs f0, 0xf4(r30) -/* 8023A3F0 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 8023A3F4 A8 03 00 06 */ lha r0, 6(r3) -/* 8023A3F8 C0 5E 00 F4 */ lfs f2, 0xf4(r30) -/* 8023A3FC C8 22 B1 78 */ lfd f1, lit_4345(r2) -/* 8023A400 6C 03 80 00 */ xoris r3, r0, 0x8000 -/* 8023A404 90 61 00 1C */ stw r3, 0x1c(r1) -/* 8023A408 3C 00 43 30 */ lis r0, 0x4330 -/* 8023A40C 90 01 00 18 */ stw r0, 0x18(r1) -/* 8023A410 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 8023A414 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8023A418 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8023A41C 4C 41 13 82 */ cror 2, 1, 2 -/* 8023A420 40 82 00 1C */ bne lbl_8023A43C -/* 8023A424 90 61 00 1C */ stw r3, 0x1c(r1) -/* 8023A428 90 01 00 18 */ stw r0, 0x18(r1) -/* 8023A42C C8 01 00 18 */ lfd f0, 0x18(r1) -/* 8023A430 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8023A434 EC 02 00 28 */ fsubs f0, f2, f0 -/* 8023A438 D0 1E 00 F4 */ stfs f0, 0xf4(r30) -lbl_8023A43C: -/* 8023A43C C0 1E 00 F4 */ lfs f0, 0xf4(r30) -/* 8023A440 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 8023A444 D0 03 00 08 */ stfs f0, 8(r3) -/* 8023A448 C0 3E 00 F8 */ lfs f1, 0xf8(r30) -/* 8023A44C C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023A450 EC 01 00 2A */ fadds f0, f1, f0 -/* 8023A454 D0 1E 00 F8 */ stfs f0, 0xf8(r30) -/* 8023A458 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 8023A45C A8 03 00 06 */ lha r0, 6(r3) -/* 8023A460 C0 5E 00 F8 */ lfs f2, 0xf8(r30) -/* 8023A464 C8 22 B1 78 */ lfd f1, lit_4345(r2) -/* 8023A468 6C 03 80 00 */ xoris r3, r0, 0x8000 -/* 8023A46C 90 61 00 1C */ stw r3, 0x1c(r1) -/* 8023A470 3C 00 43 30 */ lis r0, 0x4330 -/* 8023A474 90 01 00 18 */ stw r0, 0x18(r1) -/* 8023A478 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 8023A47C EC 00 08 28 */ fsubs f0, f0, f1 -/* 8023A480 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8023A484 4C 41 13 82 */ cror 2, 1, 2 -/* 8023A488 40 82 00 1C */ bne lbl_8023A4A4 -/* 8023A48C 90 61 00 1C */ stw r3, 0x1c(r1) -/* 8023A490 90 01 00 18 */ stw r0, 0x18(r1) -/* 8023A494 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 8023A498 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8023A49C EC 02 00 28 */ fsubs f0, f2, f0 -/* 8023A4A0 D0 1E 00 F8 */ stfs f0, 0xf8(r30) -lbl_8023A4A4: -/* 8023A4A4 C0 1E 00 F8 */ lfs f0, 0xf8(r30) -/* 8023A4A8 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 8023A4AC D0 03 00 08 */ stfs f0, 8(r3) -/* 8023A4B0 80 7E 00 04 */ lwz r3, 4(r30) -/* 8023A4B4 48 0B F1 DD */ bl animation__9J2DScreenFv -/* 8023A4B8 3B 80 00 00 */ li r28, 0 -/* 8023A4BC 3B A0 00 00 */ li r29, 0 -lbl_8023A4C0: -/* 8023A4C0 88 1E 01 0E */ lbz r0, 0x10e(r30) -/* 8023A4C4 7C 1C 00 00 */ cmpw r28, r0 -/* 8023A4C8 40 82 00 54 */ bne lbl_8023A51C -/* 8023A4CC 7F FE EA 14 */ add r31, r30, r29 -/* 8023A4D0 80 7F 00 40 */ lwz r3, 0x40(r31) -/* 8023A4D4 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A4D8 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023A4DC D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8023A4E0 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 8023A4E4 81 83 00 00 */ lwz r12, 0(r3) -/* 8023A4E8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8023A4EC 7D 89 03 A6 */ mtctr r12 -/* 8023A4F0 4E 80 04 21 */ bctrl -/* 8023A4F4 80 7F 00 4C */ lwz r3, 0x4c(r31) -/* 8023A4F8 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A4FC C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023A500 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8023A504 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 8023A508 81 83 00 00 */ lwz r12, 0(r3) -/* 8023A50C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8023A510 7D 89 03 A6 */ mtctr r12 -/* 8023A514 4E 80 04 21 */ bctrl -/* 8023A518 48 00 00 50 */ b lbl_8023A568 -lbl_8023A51C: -/* 8023A51C 7F FE EA 14 */ add r31, r30, r29 -/* 8023A520 80 7F 00 40 */ lwz r3, 0x40(r31) -/* 8023A524 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A528 C0 02 B1 58 */ lfs f0, lit_3909(r2) -/* 8023A52C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8023A530 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 8023A534 81 83 00 00 */ lwz r12, 0(r3) -/* 8023A538 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8023A53C 7D 89 03 A6 */ mtctr r12 -/* 8023A540 4E 80 04 21 */ bctrl -/* 8023A544 80 7F 00 4C */ lwz r3, 0x4c(r31) -/* 8023A548 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A54C C0 02 B1 58 */ lfs f0, lit_3909(r2) -/* 8023A550 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8023A554 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 8023A558 81 83 00 00 */ lwz r12, 0(r3) -/* 8023A55C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8023A560 7D 89 03 A6 */ mtctr r12 -/* 8023A564 4E 80 04 21 */ bctrl -lbl_8023A568: -/* 8023A568 3B 9C 00 01 */ addi r28, r28, 1 -/* 8023A56C 2C 1C 00 03 */ cmpwi r28, 3 -/* 8023A570 3B BD 00 04 */ addi r29, r29, 4 -/* 8023A574 41 80 FF 4C */ blt lbl_8023A4C0 -/* 8023A578 7F C3 F3 78 */ mr r3, r30 -/* 8023A57C 48 00 0F 31 */ bl selectTrans__17dMsgScrn3Select_cFv -/* 8023A580 3B E0 00 00 */ li r31, 0 -/* 8023A584 3B A0 00 00 */ li r29, 0 -lbl_8023A588: -/* 8023A588 88 1E 01 0E */ lbz r0, 0x10e(r30) -/* 8023A58C 7C 1F 00 00 */ cmpw r31, r0 -/* 8023A590 40 82 00 60 */ bne lbl_8023A5F0 -/* 8023A594 80 1E 00 C4 */ lwz r0, 0xc4(r30) -/* 8023A598 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023A59C 7F 9E EA 14 */ add r28, r30, r29 -/* 8023A5A0 80 7C 00 1C */ lwz r3, 0x1c(r28) -/* 8023A5A4 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A5A8 38 81 00 14 */ addi r4, r1, 0x14 -/* 8023A5AC 81 83 00 00 */ lwz r12, 0(r3) -/* 8023A5B0 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 8023A5B4 7D 89 03 A6 */ mtctr r12 -/* 8023A5B8 4E 80 04 21 */ bctrl -/* 8023A5BC 80 1C 00 28 */ lwz r0, 0x28(r28) -/* 8023A5C0 28 00 00 00 */ cmplwi r0, 0 -/* 8023A5C4 41 82 00 84 */ beq lbl_8023A648 -/* 8023A5C8 80 1E 00 C4 */ lwz r0, 0xc4(r30) -/* 8023A5CC 90 01 00 10 */ stw r0, 0x10(r1) -/* 8023A5D0 80 7C 00 28 */ lwz r3, 0x28(r28) -/* 8023A5D4 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A5D8 38 81 00 10 */ addi r4, r1, 0x10 -/* 8023A5DC 81 83 00 00 */ lwz r12, 0(r3) -/* 8023A5E0 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 8023A5E4 7D 89 03 A6 */ mtctr r12 -/* 8023A5E8 4E 80 04 21 */ bctrl -/* 8023A5EC 48 00 00 5C */ b lbl_8023A648 -lbl_8023A5F0: -/* 8023A5F0 80 1E 00 C8 */ lwz r0, 0xc8(r30) -/* 8023A5F4 90 01 00 0C */ stw r0, 0xc(r1) -/* 8023A5F8 7F 9E EA 14 */ add r28, r30, r29 -/* 8023A5FC 80 7C 00 1C */ lwz r3, 0x1c(r28) -/* 8023A600 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A604 38 81 00 0C */ addi r4, r1, 0xc -/* 8023A608 81 83 00 00 */ lwz r12, 0(r3) -/* 8023A60C 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 8023A610 7D 89 03 A6 */ mtctr r12 -/* 8023A614 4E 80 04 21 */ bctrl -/* 8023A618 80 1C 00 28 */ lwz r0, 0x28(r28) -/* 8023A61C 28 00 00 00 */ cmplwi r0, 0 -/* 8023A620 41 82 00 28 */ beq lbl_8023A648 -/* 8023A624 80 1E 00 C8 */ lwz r0, 0xc8(r30) -/* 8023A628 90 01 00 08 */ stw r0, 8(r1) -/* 8023A62C 80 7C 00 28 */ lwz r3, 0x28(r28) -/* 8023A630 80 63 00 04 */ lwz r3, 4(r3) -/* 8023A634 38 81 00 08 */ addi r4, r1, 8 -/* 8023A638 81 83 00 00 */ lwz r12, 0(r3) -/* 8023A63C 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 8023A640 7D 89 03 A6 */ mtctr r12 -/* 8023A644 4E 80 04 21 */ bctrl -lbl_8023A648: -/* 8023A648 3B FF 00 01 */ addi r31, r31, 1 -/* 8023A64C 2C 1F 00 03 */ cmpwi r31, 3 -/* 8023A650 3B BD 00 04 */ addi r29, r29, 4 -/* 8023A654 41 80 FF 34 */ blt lbl_8023A588 -/* 8023A658 88 1E 01 13 */ lbz r0, 0x113(r30) -/* 8023A65C 20 00 00 03 */ subfic r0, r0, 3 -/* 8023A660 7C 00 00 34 */ cntlzw r0, r0 -/* 8023A664 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8023A668 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023A66C 48 12 7B B9 */ bl _restgpr_28 -/* 8023A670 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8023A674 7C 08 03 A6 */ mtlr r0 -/* 8023A678 38 21 00 30 */ addi r1, r1, 0x30 -/* 8023A67C 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/selectAnimeTransform__17dMsgScrn3Select_cFi.s b/asm/msg/scrn/d_msg_scrn_3select/selectAnimeTransform__17dMsgScrn3Select_cFi.s deleted file mode 100644 index 0fbce373d9e..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/selectAnimeTransform__17dMsgScrn3Select_cFi.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8023B870: -/* 8023B870 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8023B874 7C 08 02 A6 */ mflr r0 -/* 8023B878 90 01 00 24 */ stw r0, 0x24(r1) -/* 8023B87C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023B880 48 12 69 5D */ bl _savegpr_29 -/* 8023B884 7C 7D 1B 78 */ mr r29, r3 -/* 8023B888 7C 9E 23 78 */ mr r30, r4 -/* 8023B88C C0 03 00 F0 */ lfs f0, 0xf0(r3) -/* 8023B890 80 63 00 08 */ lwz r3, 8(r3) -/* 8023B894 D0 03 00 08 */ stfs f0, 8(r3) -/* 8023B898 54 80 10 3A */ slwi r0, r4, 2 -/* 8023B89C 7F FD 02 14 */ add r31, r29, r0 -/* 8023B8A0 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 8023B8A4 80 63 00 04 */ lwz r3, 4(r3) -/* 8023B8A8 80 9D 00 08 */ lwz r4, 8(r29) -/* 8023B8AC 81 83 00 00 */ lwz r12, 0(r3) -/* 8023B8B0 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 8023B8B4 7D 89 03 A6 */ mtctr r12 -/* 8023B8B8 4E 80 04 21 */ bctrl -/* 8023B8BC 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 8023B8C0 80 63 00 04 */ lwz r3, 4(r3) -/* 8023B8C4 48 0B C7 09 */ bl animationTransform__7J2DPaneFv -/* 8023B8C8 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 8023B8CC 80 63 00 04 */ lwz r3, 4(r3) -/* 8023B8D0 38 80 00 00 */ li r4, 0 -/* 8023B8D4 81 83 00 00 */ lwz r12, 0(r3) -/* 8023B8D8 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 8023B8DC 7D 89 03 A6 */ mtctr r12 -/* 8023B8E0 4E 80 04 21 */ bctrl -/* 8023B8E4 88 7D 01 14 */ lbz r3, 0x114(r29) -/* 8023B8E8 38 00 00 01 */ li r0, 1 -/* 8023B8EC 7C 00 F0 30 */ slw r0, r0, r30 -/* 8023B8F0 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8023B8F4 7C 60 03 78 */ or r0, r3, r0 -/* 8023B8F8 98 1D 01 14 */ stb r0, 0x114(r29) -/* 8023B8FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023B900 48 12 69 29 */ bl _restgpr_29 -/* 8023B904 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8023B908 7C 08 03 A6 */ mtlr r0 -/* 8023B90C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023B910 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/selectProc__17dMsgScrn3Select_cFv.s b/asm/msg/scrn/d_msg_scrn_3select/selectProc__17dMsgScrn3Select_cFv.s deleted file mode 100644 index 3aae5ce2bdb..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/selectProc__17dMsgScrn3Select_cFv.s +++ /dev/null @@ -1,153 +0,0 @@ -lbl_8023AC44: -/* 8023AC44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8023AC48 7C 08 02 A6 */ mflr r0 -/* 8023AC4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023AC50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8023AC54 93 C1 00 08 */ stw r30, 8(r1) -/* 8023AC58 7C 7E 1B 78 */ mr r30, r3 -/* 8023AC5C 88 83 01 0E */ lbz r4, 0x10e(r3) -/* 8023AC60 88 03 01 10 */ lbz r0, 0x110(r3) -/* 8023AC64 7C 04 00 40 */ cmplw r4, r0 -/* 8023AC68 41 82 01 E8 */ beq lbl_8023AE50 -/* 8023AC6C 98 9E 01 0F */ stb r4, 0x10f(r30) -/* 8023AC70 88 1E 01 10 */ lbz r0, 0x110(r30) -/* 8023AC74 98 1E 01 0E */ stb r0, 0x10e(r30) -/* 8023AC78 88 1E 01 0F */ lbz r0, 0x10f(r30) -/* 8023AC7C 2C 00 00 02 */ cmpwi r0, 2 -/* 8023AC80 41 82 00 EC */ beq lbl_8023AD6C -/* 8023AC84 40 80 00 14 */ bge lbl_8023AC98 -/* 8023AC88 2C 00 00 00 */ cmpwi r0, 0 -/* 8023AC8C 41 82 00 18 */ beq lbl_8023ACA4 -/* 8023AC90 40 80 00 78 */ bge lbl_8023AD08 -/* 8023AC94 48 00 01 94 */ b lbl_8023AE28 -lbl_8023AC98: -/* 8023AC98 2C 00 00 FF */ cmpwi r0, 0xff -/* 8023AC9C 41 82 01 34 */ beq lbl_8023ADD0 -/* 8023ACA0 48 00 01 88 */ b lbl_8023AE28 -lbl_8023ACA4: -/* 8023ACA4 88 1E 01 0E */ lbz r0, 0x10e(r30) -/* 8023ACA8 28 00 00 01 */ cmplwi r0, 1 -/* 8023ACAC 40 82 00 2C */ bne lbl_8023ACD8 -/* 8023ACB0 C0 02 B1 84 */ lfs f0, lit_4604(r2) -/* 8023ACB4 D0 1E 00 F0 */ stfs f0, 0xf0(r30) -/* 8023ACB8 38 80 00 01 */ li r4, 1 -/* 8023ACBC 48 00 0B B5 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023ACC0 C0 02 B1 88 */ lfs f0, lit_4605(r2) -/* 8023ACC4 D0 1E 00 F0 */ stfs f0, 0xf0(r30) -/* 8023ACC8 7F C3 F3 78 */ mr r3, r30 -/* 8023ACCC 38 80 00 00 */ li r4, 0 -/* 8023ACD0 48 00 0B A1 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023ACD4 48 00 01 54 */ b lbl_8023AE28 -lbl_8023ACD8: -/* 8023ACD8 28 00 00 02 */ cmplwi r0, 2 -/* 8023ACDC 40 82 01 4C */ bne lbl_8023AE28 -/* 8023ACE0 C0 02 B1 8C */ lfs f0, lit_4606(r2) -/* 8023ACE4 D0 1E 00 F0 */ stfs f0, 0xf0(r30) -/* 8023ACE8 38 80 00 02 */ li r4, 2 -/* 8023ACEC 48 00 0B 85 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023ACF0 C0 02 B1 90 */ lfs f0, lit_4607(r2) -/* 8023ACF4 D0 1E 00 F0 */ stfs f0, 0xf0(r30) -/* 8023ACF8 7F C3 F3 78 */ mr r3, r30 -/* 8023ACFC 38 80 00 00 */ li r4, 0 -/* 8023AD00 48 00 0B 71 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023AD04 48 00 01 24 */ b lbl_8023AE28 -lbl_8023AD08: -/* 8023AD08 88 1E 01 0E */ lbz r0, 0x10e(r30) -/* 8023AD0C 28 00 00 00 */ cmplwi r0, 0 -/* 8023AD10 40 82 00 2C */ bne lbl_8023AD3C -/* 8023AD14 C0 02 B1 88 */ lfs f0, lit_4605(r2) -/* 8023AD18 D0 1E 00 F0 */ stfs f0, 0xf0(r30) -/* 8023AD1C 38 80 00 00 */ li r4, 0 -/* 8023AD20 48 00 0B 51 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023AD24 C0 02 B1 84 */ lfs f0, lit_4604(r2) -/* 8023AD28 D0 1E 00 F0 */ stfs f0, 0xf0(r30) -/* 8023AD2C 7F C3 F3 78 */ mr r3, r30 -/* 8023AD30 38 80 00 01 */ li r4, 1 -/* 8023AD34 48 00 0B 3D */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023AD38 48 00 00 F0 */ b lbl_8023AE28 -lbl_8023AD3C: -/* 8023AD3C 28 00 00 02 */ cmplwi r0, 2 -/* 8023AD40 40 82 00 E8 */ bne lbl_8023AE28 -/* 8023AD44 C0 02 B1 8C */ lfs f0, lit_4606(r2) -/* 8023AD48 D0 1E 00 F0 */ stfs f0, 0xf0(r30) -/* 8023AD4C 38 80 00 02 */ li r4, 2 -/* 8023AD50 48 00 0B 21 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023AD54 C0 02 B1 90 */ lfs f0, lit_4607(r2) -/* 8023AD58 D0 1E 00 F0 */ stfs f0, 0xf0(r30) -/* 8023AD5C 7F C3 F3 78 */ mr r3, r30 -/* 8023AD60 38 80 00 01 */ li r4, 1 -/* 8023AD64 48 00 0B 0D */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023AD68 48 00 00 C0 */ b lbl_8023AE28 -lbl_8023AD6C: -/* 8023AD6C 88 1E 01 0E */ lbz r0, 0x10e(r30) -/* 8023AD70 28 00 00 01 */ cmplwi r0, 1 -/* 8023AD74 40 82 00 2C */ bne lbl_8023ADA0 -/* 8023AD78 C0 02 B1 90 */ lfs f0, lit_4607(r2) -/* 8023AD7C D0 1E 00 F0 */ stfs f0, 0xf0(r30) -/* 8023AD80 38 80 00 01 */ li r4, 1 -/* 8023AD84 48 00 0A ED */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023AD88 C0 02 B1 8C */ lfs f0, lit_4606(r2) -/* 8023AD8C D0 1E 00 F0 */ stfs f0, 0xf0(r30) -/* 8023AD90 7F C3 F3 78 */ mr r3, r30 -/* 8023AD94 38 80 00 02 */ li r4, 2 -/* 8023AD98 48 00 0A D9 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023AD9C 48 00 00 8C */ b lbl_8023AE28 -lbl_8023ADA0: -/* 8023ADA0 28 00 00 00 */ cmplwi r0, 0 -/* 8023ADA4 40 82 00 84 */ bne lbl_8023AE28 -/* 8023ADA8 C0 02 B1 88 */ lfs f0, lit_4605(r2) -/* 8023ADAC D0 1E 00 F0 */ stfs f0, 0xf0(r30) -/* 8023ADB0 38 80 00 00 */ li r4, 0 -/* 8023ADB4 48 00 0A BD */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023ADB8 C0 02 B1 84 */ lfs f0, lit_4604(r2) -/* 8023ADBC D0 1E 00 F0 */ stfs f0, 0xf0(r30) -/* 8023ADC0 7F C3 F3 78 */ mr r3, r30 -/* 8023ADC4 38 80 00 02 */ li r4, 2 -/* 8023ADC8 48 00 0A A9 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023ADCC 48 00 00 5C */ b lbl_8023AE28 -lbl_8023ADD0: -/* 8023ADD0 88 1E 01 0E */ lbz r0, 0x10e(r30) -/* 8023ADD4 28 00 00 00 */ cmplwi r0, 0 -/* 8023ADD8 40 82 00 10 */ bne lbl_8023ADE8 -/* 8023ADDC C0 02 B1 88 */ lfs f0, lit_4605(r2) -/* 8023ADE0 D0 1E 00 F0 */ stfs f0, 0xf0(r30) -/* 8023ADE4 48 00 00 28 */ b lbl_8023AE0C -lbl_8023ADE8: -/* 8023ADE8 28 00 00 01 */ cmplwi r0, 1 -/* 8023ADEC 40 82 00 10 */ bne lbl_8023ADFC -/* 8023ADF0 C0 02 B1 84 */ lfs f0, lit_4604(r2) -/* 8023ADF4 D0 1E 00 F0 */ stfs f0, 0xf0(r30) -/* 8023ADF8 48 00 00 14 */ b lbl_8023AE0C -lbl_8023ADFC: -/* 8023ADFC 28 00 00 02 */ cmplwi r0, 2 -/* 8023AE00 40 82 00 0C */ bne lbl_8023AE0C -/* 8023AE04 C0 02 B1 8C */ lfs f0, lit_4606(r2) -/* 8023AE08 D0 1E 00 F0 */ stfs f0, 0xf0(r30) -lbl_8023AE0C: -/* 8023AE0C 3B E0 00 00 */ li r31, 0 -lbl_8023AE10: -/* 8023AE10 7F C3 F3 78 */ mr r3, r30 -/* 8023AE14 7F E4 FB 78 */ mr r4, r31 -/* 8023AE18 48 00 0A 59 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi -/* 8023AE1C 3B FF 00 01 */ addi r31, r31, 1 -/* 8023AE20 2C 1F 00 03 */ cmpwi r31, 3 -/* 8023AE24 41 80 FF EC */ blt lbl_8023AE10 -lbl_8023AE28: -/* 8023AE28 88 1E 01 0F */ lbz r0, 0x10f(r30) -/* 8023AE2C 28 00 00 FF */ cmplwi r0, 0xff -/* 8023AE30 41 82 00 18 */ beq lbl_8023AE48 -/* 8023AE34 38 00 00 00 */ li r0, 0 -/* 8023AE38 B0 1E 01 0C */ sth r0, 0x10c(r30) -/* 8023AE3C 38 00 00 04 */ li r0, 4 -/* 8023AE40 98 1E 01 13 */ stb r0, 0x113(r30) -/* 8023AE44 48 00 00 0C */ b lbl_8023AE50 -lbl_8023AE48: -/* 8023AE48 38 00 00 03 */ li r0, 3 -/* 8023AE4C 98 1E 01 13 */ stb r0, 0x113(r30) -lbl_8023AE50: -/* 8023AE50 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8023AE54 83 C1 00 08 */ lwz r30, 8(r1) -/* 8023AE58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8023AE5C 7C 08 03 A6 */ mtlr r0 -/* 8023AE60 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023AE64 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/selectScale__17dMsgScrn3Select_cFv.s b/asm/msg/scrn/d_msg_scrn_3select/selectScale__17dMsgScrn3Select_cFv.s deleted file mode 100644 index 787889813c9..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/selectScale__17dMsgScrn3Select_cFv.s +++ /dev/null @@ -1,165 +0,0 @@ -lbl_8023B228: -/* 8023B228 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8023B22C 7C 08 02 A6 */ mflr r0 -/* 8023B230 90 01 00 34 */ stw r0, 0x34(r1) -/* 8023B234 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 8023B238 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 8023B23C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023B240 48 12 6F 99 */ bl _savegpr_28 -/* 8023B244 7C 7E 1B 78 */ mr r30, r3 -/* 8023B248 C3 E2 B1 60 */ lfs f31, lit_3911(r2) -/* 8023B24C C0 03 01 04 */ lfs f0, 0x104(r3) -/* 8023B250 FC 1F 00 00 */ fcmpu cr0, f31, f0 -/* 8023B254 41 82 02 38 */ beq lbl_8023B48C -/* 8023B258 3B E0 00 00 */ li r31, 0 -/* 8023B25C 3B A0 00 00 */ li r29, 0 -lbl_8023B260: -/* 8023B260 7F 9E EA 14 */ add r28, r30, r29 -/* 8023B264 80 7C 00 AC */ lwz r3, 0xac(r28) -/* 8023B268 C0 3E 01 04 */ lfs f1, 0x104(r30) -/* 8023B26C C0 42 B1 60 */ lfs f2, lit_3911(r2) -/* 8023B270 48 01 93 C9 */ bl paneScale__8CPaneMgrFff -/* 8023B274 80 7C 00 B8 */ lwz r3, 0xb8(r28) -/* 8023B278 80 83 00 04 */ lwz r4, 4(r3) -/* 8023B27C C0 24 00 28 */ lfs f1, 0x28(r4) -/* 8023B280 C0 04 00 20 */ lfs f0, 0x20(r4) -/* 8023B284 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8023B288 C0 43 00 34 */ lfs f2, 0x34(r3) -/* 8023B28C C0 1E 01 04 */ lfs f0, 0x104(r30) -/* 8023B290 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8023B294 EC 20 10 24 */ fdivs f1, f0, f2 -/* 8023B298 C0 44 00 2C */ lfs f2, 0x2c(r4) -/* 8023B29C C0 04 00 24 */ lfs f0, 0x24(r4) -/* 8023B2A0 EC 02 00 28 */ fsubs f0, f2, f0 -/* 8023B2A4 C0 43 00 38 */ lfs f2, 0x38(r3) -/* 8023B2A8 EC 40 10 24 */ fdivs f2, f0, f2 -/* 8023B2AC 48 01 93 8D */ bl paneScale__8CPaneMgrFff -/* 8023B2B0 80 7C 00 7C */ lwz r3, 0x7c(r28) -/* 8023B2B4 80 83 00 04 */ lwz r4, 4(r3) -/* 8023B2B8 C0 24 00 28 */ lfs f1, 0x28(r4) -/* 8023B2BC C0 04 00 20 */ lfs f0, 0x20(r4) -/* 8023B2C0 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8023B2C4 C0 43 00 34 */ lfs f2, 0x34(r3) -/* 8023B2C8 C0 1E 01 04 */ lfs f0, 0x104(r30) -/* 8023B2CC EC 00 00 72 */ fmuls f0, f0, f1 -/* 8023B2D0 EC 20 10 24 */ fdivs f1, f0, f2 -/* 8023B2D4 C0 44 00 2C */ lfs f2, 0x2c(r4) -/* 8023B2D8 C0 04 00 24 */ lfs f0, 0x24(r4) -/* 8023B2DC EC 02 00 28 */ fsubs f0, f2, f0 -/* 8023B2E0 C0 43 00 38 */ lfs f2, 0x38(r3) -/* 8023B2E4 EC 40 10 24 */ fdivs f2, f0, f2 -/* 8023B2E8 48 01 93 51 */ bl paneScale__8CPaneMgrFff -/* 8023B2EC 80 7C 00 70 */ lwz r3, 0x70(r28) -/* 8023B2F0 C0 63 00 34 */ lfs f3, 0x34(r3) -/* 8023B2F4 80 7C 00 64 */ lwz r3, 0x64(r28) -/* 8023B2F8 C0 83 00 34 */ lfs f4, 0x34(r3) -/* 8023B2FC 80 7C 00 88 */ lwz r3, 0x88(r28) -/* 8023B300 80 83 00 04 */ lwz r4, 4(r3) -/* 8023B304 C0 24 00 28 */ lfs f1, 0x28(r4) -/* 8023B308 C0 04 00 20 */ lfs f0, 0x20(r4) -/* 8023B30C EC 01 00 28 */ fsubs f0, f1, f0 -/* 8023B310 C0 A3 00 34 */ lfs f5, 0x34(r3) -/* 8023B314 C0 3E 01 04 */ lfs f1, 0x104(r30) -/* 8023B318 EC 41 00 32 */ fmuls f2, f1, f0 -/* 8023B31C EC 21 F8 28 */ fsubs f1, f1, f31 -/* 8023B320 EC 04 18 2A */ fadds f0, f4, f3 -/* 8023B324 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8023B328 EC 02 00 28 */ fsubs f0, f2, f0 -/* 8023B32C EC 20 28 24 */ fdivs f1, f0, f5 -/* 8023B330 C0 44 00 2C */ lfs f2, 0x2c(r4) -/* 8023B334 C0 04 00 24 */ lfs f0, 0x24(r4) -/* 8023B338 EC 02 00 28 */ fsubs f0, f2, f0 -/* 8023B33C C0 43 00 38 */ lfs f2, 0x38(r3) -/* 8023B340 EC 40 10 24 */ fdivs f2, f0, f2 -/* 8023B344 48 01 92 F5 */ bl paneScale__8CPaneMgrFff -/* 8023B348 80 7C 00 40 */ lwz r3, 0x40(r28) -/* 8023B34C 80 83 00 04 */ lwz r4, 4(r3) -/* 8023B350 C0 24 00 28 */ lfs f1, 0x28(r4) -/* 8023B354 C0 04 00 20 */ lfs f0, 0x20(r4) -/* 8023B358 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8023B35C C0 43 00 34 */ lfs f2, 0x34(r3) -/* 8023B360 C0 1E 01 04 */ lfs f0, 0x104(r30) -/* 8023B364 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8023B368 EC 20 10 24 */ fdivs f1, f0, f2 -/* 8023B36C C0 44 00 2C */ lfs f2, 0x2c(r4) -/* 8023B370 C0 04 00 24 */ lfs f0, 0x24(r4) -/* 8023B374 EC 02 00 28 */ fsubs f0, f2, f0 -/* 8023B378 C0 43 00 38 */ lfs f2, 0x38(r3) -/* 8023B37C EC 40 10 24 */ fdivs f2, f0, f2 -/* 8023B380 48 01 92 B9 */ bl paneScale__8CPaneMgrFff -/* 8023B384 80 7C 00 4C */ lwz r3, 0x4c(r28) -/* 8023B388 80 83 00 04 */ lwz r4, 4(r3) -/* 8023B38C C0 24 00 28 */ lfs f1, 0x28(r4) -/* 8023B390 C0 04 00 20 */ lfs f0, 0x20(r4) -/* 8023B394 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8023B398 C0 43 00 34 */ lfs f2, 0x34(r3) -/* 8023B39C C0 1E 01 04 */ lfs f0, 0x104(r30) -/* 8023B3A0 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8023B3A4 EC 20 10 24 */ fdivs f1, f0, f2 -/* 8023B3A8 C0 44 00 2C */ lfs f2, 0x2c(r4) -/* 8023B3AC C0 04 00 24 */ lfs f0, 0x24(r4) -/* 8023B3B0 EC 02 00 28 */ fsubs f0, f2, f0 -/* 8023B3B4 C0 43 00 38 */ lfs f2, 0x38(r3) -/* 8023B3B8 EC 40 10 24 */ fdivs f2, f0, f2 -/* 8023B3BC 48 01 92 7D */ bl paneScale__8CPaneMgrFff -/* 8023B3C0 80 7C 00 58 */ lwz r3, 0x58(r28) -/* 8023B3C4 80 83 00 04 */ lwz r4, 4(r3) -/* 8023B3C8 C0 24 00 28 */ lfs f1, 0x28(r4) -/* 8023B3CC C0 04 00 20 */ lfs f0, 0x20(r4) -/* 8023B3D0 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8023B3D4 C0 43 00 34 */ lfs f2, 0x34(r3) -/* 8023B3D8 C0 1E 01 04 */ lfs f0, 0x104(r30) -/* 8023B3DC EC 00 00 72 */ fmuls f0, f0, f1 -/* 8023B3E0 EC 20 10 24 */ fdivs f1, f0, f2 -/* 8023B3E4 C0 44 00 2C */ lfs f2, 0x2c(r4) -/* 8023B3E8 C0 04 00 24 */ lfs f0, 0x24(r4) -/* 8023B3EC EC 02 00 28 */ fsubs f0, f2, f0 -/* 8023B3F0 C0 43 00 38 */ lfs f2, 0x38(r3) -/* 8023B3F4 EC 40 10 24 */ fdivs f2, f0, f2 -/* 8023B3F8 48 01 92 41 */ bl paneScale__8CPaneMgrFff -/* 8023B3FC 80 7C 00 1C */ lwz r3, 0x1c(r28) -/* 8023B400 80 83 00 04 */ lwz r4, 4(r3) -/* 8023B404 C0 24 00 28 */ lfs f1, 0x28(r4) -/* 8023B408 C0 04 00 20 */ lfs f0, 0x20(r4) -/* 8023B40C EC 21 00 28 */ fsubs f1, f1, f0 -/* 8023B410 C0 43 00 34 */ lfs f2, 0x34(r3) -/* 8023B414 C0 1E 01 04 */ lfs f0, 0x104(r30) -/* 8023B418 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8023B41C EC 20 10 24 */ fdivs f1, f0, f2 -/* 8023B420 C0 44 00 2C */ lfs f2, 0x2c(r4) -/* 8023B424 C0 04 00 24 */ lfs f0, 0x24(r4) -/* 8023B428 EC 02 00 28 */ fsubs f0, f2, f0 -/* 8023B42C C0 43 00 38 */ lfs f2, 0x38(r3) -/* 8023B430 EC 40 10 24 */ fdivs f2, f0, f2 -/* 8023B434 48 01 92 05 */ bl paneScale__8CPaneMgrFff -/* 8023B438 80 7C 00 28 */ lwz r3, 0x28(r28) -/* 8023B43C 28 03 00 00 */ cmplwi r3, 0 -/* 8023B440 41 82 00 3C */ beq lbl_8023B47C -/* 8023B444 80 83 00 04 */ lwz r4, 4(r3) -/* 8023B448 C0 24 00 28 */ lfs f1, 0x28(r4) -/* 8023B44C C0 04 00 20 */ lfs f0, 0x20(r4) -/* 8023B450 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8023B454 C0 43 00 34 */ lfs f2, 0x34(r3) -/* 8023B458 C0 1E 01 04 */ lfs f0, 0x104(r30) -/* 8023B45C EC 00 00 72 */ fmuls f0, f0, f1 -/* 8023B460 EC 20 10 24 */ fdivs f1, f0, f2 -/* 8023B464 C0 44 00 2C */ lfs f2, 0x2c(r4) -/* 8023B468 C0 04 00 24 */ lfs f0, 0x24(r4) -/* 8023B46C EC 02 00 28 */ fsubs f0, f2, f0 -/* 8023B470 C0 43 00 38 */ lfs f2, 0x38(r3) -/* 8023B474 EC 40 10 24 */ fdivs f2, f0, f2 -/* 8023B478 48 01 91 C1 */ bl paneScale__8CPaneMgrFff -lbl_8023B47C: -/* 8023B47C 3B FF 00 01 */ addi r31, r31, 1 -/* 8023B480 2C 1F 00 03 */ cmpwi r31, 3 -/* 8023B484 3B BD 00 04 */ addi r29, r29, 4 -/* 8023B488 41 80 FD D8 */ blt lbl_8023B260 -lbl_8023B48C: -/* 8023B48C E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 8023B490 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 8023B494 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023B498 48 12 6D 8D */ bl _restgpr_28 -/* 8023B49C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8023B4A0 7C 08 03 A6 */ mtlr r0 -/* 8023B4A4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8023B4A8 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/selectTrans__17dMsgScrn3Select_cFv.s b/asm/msg/scrn/d_msg_scrn_3select/selectTrans__17dMsgScrn3Select_cFv.s deleted file mode 100644 index 1c1345adaee..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/selectTrans__17dMsgScrn3Select_cFv.s +++ /dev/null @@ -1,250 +0,0 @@ -lbl_8023B4AC: -/* 8023B4AC 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8023B4B0 7C 08 02 A6 */ mflr r0 -/* 8023B4B4 90 01 00 64 */ stw r0, 0x64(r1) -/* 8023B4B8 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 8023B4BC F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 8023B4C0 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 8023B4C4 F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 8023B4C8 DB A1 00 30 */ stfd f29, 0x30(r1) -/* 8023B4CC F3 A1 00 38 */ psq_st f29, 56(r1), 0, 0 /* qr0 */ -/* 8023B4D0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023B4D4 48 12 6C FD */ bl _savegpr_26 -/* 8023B4D8 7C 7C 1B 78 */ mr r28, r3 -/* 8023B4DC 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 8023B4E0 80 63 00 04 */ lwz r3, 4(r3) -/* 8023B4E4 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 8023B4E8 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 8023B4EC EC 41 00 28 */ fsubs f2, f1, f0 -/* 8023B4F0 C0 22 B1 64 */ lfs f1, lit_4154(r2) -/* 8023B4F4 C0 03 01 20 */ lfs f0, 0x120(r3) -/* 8023B4F8 EC 02 00 28 */ fsubs f0, f2, f0 -/* 8023B4FC EF E1 00 32 */ fmuls f31, f1, f0 -/* 8023B500 38 60 00 00 */ li r3, 0 -/* 8023B504 C0 02 B1 58 */ lfs f0, lit_3909(r2) -/* 8023B508 38 81 00 08 */ addi r4, r1, 8 -/* 8023B50C 38 00 00 03 */ li r0, 3 -/* 8023B510 7C 09 03 A6 */ mtctr r0 -lbl_8023B514: -/* 8023B514 7C 04 1D 2E */ stfsx f0, r4, r3 -/* 8023B518 38 63 00 04 */ addi r3, r3, 4 -/* 8023B51C 42 00 FF F8 */ bdnz lbl_8023B514 -/* 8023B520 C0 22 B1 60 */ lfs f1, lit_3911(r2) -/* 8023B524 C0 1C 01 04 */ lfs f0, 0x104(r28) -/* 8023B528 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 8023B52C 40 82 00 70 */ bne lbl_8023B59C -/* 8023B530 3B 40 00 00 */ li r26, 0 -/* 8023B534 3B 60 00 00 */ li r27, 0 -/* 8023B538 3B A1 00 08 */ addi r29, r1, 8 -/* 8023B53C 3B C0 00 01 */ li r30, 1 -lbl_8023B540: -/* 8023B540 88 7C 01 14 */ lbz r3, 0x114(r28) -/* 8023B544 7F C0 D0 30 */ slw r0, r30, r26 -/* 8023B548 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8023B54C 7C 60 00 39 */ and. r0, r3, r0 -/* 8023B550 41 82 00 38 */ beq lbl_8023B588 -/* 8023B554 7F FC DA 14 */ add r31, r28, r27 -/* 8023B558 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 8023B55C C0 22 B1 58 */ lfs f1, lit_3909(r2) -/* 8023B560 7C 1D DC 2E */ lfsx f0, r29, r27 -/* 8023B564 EF DF 00 2A */ fadds f30, f31, f0 -/* 8023B568 FC 40 F0 90 */ fmr f2, f30 -/* 8023B56C 48 01 90 45 */ bl paneTrans__8CPaneMgrFff -/* 8023B570 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 8023B574 28 03 00 00 */ cmplwi r3, 0 -/* 8023B578 41 82 00 10 */ beq lbl_8023B588 -/* 8023B57C C0 22 B1 58 */ lfs f1, lit_3909(r2) -/* 8023B580 FC 40 F0 90 */ fmr f2, f30 -/* 8023B584 48 01 90 2D */ bl paneTrans__8CPaneMgrFff -lbl_8023B588: -/* 8023B588 3B 5A 00 01 */ addi r26, r26, 1 -/* 8023B58C 2C 1A 00 03 */ cmpwi r26, 3 -/* 8023B590 3B 7B 00 04 */ addi r27, r27, 4 -/* 8023B594 41 80 FF AC */ blt lbl_8023B540 -/* 8023B598 48 00 02 A8 */ b lbl_8023B840 -lbl_8023B59C: -/* 8023B59C 3B A0 00 00 */ li r29, 0 -/* 8023B5A0 3B 60 00 00 */ li r27, 0 -lbl_8023B5A4: -/* 8023B5A4 88 7C 01 14 */ lbz r3, 0x114(r28) -/* 8023B5A8 38 00 00 01 */ li r0, 1 -/* 8023B5AC 7C 00 E8 30 */ slw r0, r0, r29 -/* 8023B5B0 54 1F 06 3E */ clrlwi r31, r0, 0x18 -/* 8023B5B4 7C 63 F8 38 */ and r3, r3, r31 -/* 8023B5B8 30 03 FF FF */ addic r0, r3, -1 -/* 8023B5BC 7C 00 19 11 */ subfe. r0, r0, r3 -/* 8023B5C0 41 82 02 70 */ beq lbl_8023B830 -/* 8023B5C4 7F DC DA 14 */ add r30, r28, r27 -/* 8023B5C8 80 7E 00 AC */ lwz r3, 0xac(r30) -/* 8023B5CC C0 43 00 34 */ lfs f2, 0x34(r3) -/* 8023B5D0 C0 22 B1 60 */ lfs f1, lit_3911(r2) -/* 8023B5D4 C0 1C 01 04 */ lfs f0, 0x104(r28) -/* 8023B5D8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8023B5DC EF C0 00 B2 */ fmuls f30, f0, f2 -/* 8023B5E0 C0 02 B1 64 */ lfs f0, lit_4154(r2) -/* 8023B5E4 EC 20 07 B2 */ fmuls f1, f0, f30 -/* 8023B5E8 C0 42 B1 58 */ lfs f2, lit_3909(r2) -/* 8023B5EC 48 01 8F C5 */ bl paneTrans__8CPaneMgrFff -/* 8023B5F0 80 7E 00 B8 */ lwz r3, 0xb8(r30) -/* 8023B5F4 C0 43 00 24 */ lfs f2, 0x24(r3) -/* 8023B5F8 C0 22 B1 64 */ lfs f1, lit_4154(r2) -/* 8023B5FC C0 03 00 34 */ lfs f0, 0x34(r3) -/* 8023B600 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8023B604 EC 42 00 2A */ fadds f2, f2, f0 -/* 8023B608 80 9E 00 70 */ lwz r4, 0x70(r30) -/* 8023B60C C0 64 00 24 */ lfs f3, 0x24(r4) -/* 8023B610 C0 3C 01 04 */ lfs f1, 0x104(r28) -/* 8023B614 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023B618 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8023B61C EC 02 18 28 */ fsubs f0, f2, f3 -/* 8023B620 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8023B624 EC 20 F0 28 */ fsubs f1, f0, f30 -/* 8023B628 C0 42 B1 58 */ lfs f2, lit_3909(r2) -/* 8023B62C 48 01 8F 85 */ bl paneTrans__8CPaneMgrFff -/* 8023B630 80 7E 00 70 */ lwz r3, 0x70(r30) -/* 8023B634 C0 43 00 24 */ lfs f2, 0x24(r3) -/* 8023B638 80 7E 00 7C */ lwz r3, 0x7c(r30) -/* 8023B63C C0 63 00 24 */ lfs f3, 0x24(r3) -/* 8023B640 C0 3C 01 04 */ lfs f1, 0x104(r28) -/* 8023B644 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023B648 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8023B64C EC 03 10 28 */ fsubs f0, f3, f2 -/* 8023B650 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8023B654 80 7E 00 64 */ lwz r3, 0x64(r30) -/* 8023B658 EC 20 F0 28 */ fsubs f1, f0, f30 -/* 8023B65C C0 42 B1 58 */ lfs f2, lit_3909(r2) -/* 8023B660 48 01 8F 51 */ bl paneTrans__8CPaneMgrFff -/* 8023B664 80 7E 00 7C */ lwz r3, 0x7c(r30) -/* 8023B668 C0 43 00 24 */ lfs f2, 0x24(r3) -/* 8023B66C C0 22 B1 64 */ lfs f1, lit_4154(r2) -/* 8023B670 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 8023B674 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8023B678 EC 42 00 2A */ fadds f2, f2, f0 -/* 8023B67C 80 9E 00 70 */ lwz r4, 0x70(r30) -/* 8023B680 C0 64 00 24 */ lfs f3, 0x24(r4) -/* 8023B684 C0 3C 01 04 */ lfs f1, 0x104(r28) -/* 8023B688 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023B68C EC 21 00 28 */ fsubs f1, f1, f0 -/* 8023B690 EC 02 18 28 */ fsubs f0, f2, f3 -/* 8023B694 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8023B698 EC 20 F0 28 */ fsubs f1, f0, f30 -/* 8023B69C C0 42 B1 58 */ lfs f2, lit_3909(r2) -/* 8023B6A0 48 01 8F 11 */ bl paneTrans__8CPaneMgrFff -/* 8023B6A4 80 7E 00 70 */ lwz r3, 0x70(r30) -/* 8023B6A8 C0 63 00 34 */ lfs f3, 0x34(r3) -/* 8023B6AC 80 7E 00 88 */ lwz r3, 0x88(r30) -/* 8023B6B0 C0 83 00 34 */ lfs f4, 0x34(r3) -/* 8023B6B4 C0 BC 01 04 */ lfs f5, 0x104(r28) -/* 8023B6B8 C0 42 B1 60 */ lfs f2, lit_3911(r2) -/* 8023B6BC EC 22 28 28 */ fsubs f1, f2, f5 -/* 8023B6C0 C0 02 B1 64 */ lfs f0, lit_4154(r2) -/* 8023B6C4 EC 00 01 32 */ fmuls f0, f0, f4 -/* 8023B6C8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8023B6CC EC 05 10 28 */ fsubs f0, f5, f2 -/* 8023B6D0 EC 00 00 F2 */ fmuls f0, f0, f3 -/* 8023B6D4 EC 01 00 2A */ fadds f0, f1, f0 -/* 8023B6D8 EC 20 F0 28 */ fsubs f1, f0, f30 -/* 8023B6DC C0 42 B1 58 */ lfs f2, lit_3909(r2) -/* 8023B6E0 48 01 8E D1 */ bl paneTrans__8CPaneMgrFff -/* 8023B6E4 80 7E 00 40 */ lwz r3, 0x40(r30) -/* 8023B6E8 C0 43 00 24 */ lfs f2, 0x24(r3) -/* 8023B6EC C0 22 B1 64 */ lfs f1, lit_4154(r2) -/* 8023B6F0 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 8023B6F4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8023B6F8 EC 42 00 2A */ fadds f2, f2, f0 -/* 8023B6FC 80 9E 00 70 */ lwz r4, 0x70(r30) -/* 8023B700 C0 64 00 24 */ lfs f3, 0x24(r4) -/* 8023B704 C0 3C 01 04 */ lfs f1, 0x104(r28) -/* 8023B708 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023B70C EC 21 00 28 */ fsubs f1, f1, f0 -/* 8023B710 EC 02 18 28 */ fsubs f0, f2, f3 -/* 8023B714 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8023B718 EC 20 F0 28 */ fsubs f1, f0, f30 -/* 8023B71C C0 42 B1 58 */ lfs f2, lit_3909(r2) -/* 8023B720 48 01 8E 91 */ bl paneTrans__8CPaneMgrFff -/* 8023B724 80 7E 00 58 */ lwz r3, 0x58(r30) -/* 8023B728 C0 43 00 24 */ lfs f2, 0x24(r3) -/* 8023B72C C0 22 B1 64 */ lfs f1, lit_4154(r2) -/* 8023B730 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 8023B734 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8023B738 EC 42 00 2A */ fadds f2, f2, f0 -/* 8023B73C 80 9E 00 70 */ lwz r4, 0x70(r30) -/* 8023B740 C0 64 00 24 */ lfs f3, 0x24(r4) -/* 8023B744 C0 3C 01 04 */ lfs f1, 0x104(r28) -/* 8023B748 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023B74C EC 21 00 28 */ fsubs f1, f1, f0 -/* 8023B750 EC 02 18 28 */ fsubs f0, f2, f3 -/* 8023B754 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8023B758 EC 20 F0 28 */ fsubs f1, f0, f30 -/* 8023B75C C0 42 B1 58 */ lfs f2, lit_3909(r2) -/* 8023B760 48 01 8E 51 */ bl paneTrans__8CPaneMgrFff -/* 8023B764 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 8023B768 C0 43 00 24 */ lfs f2, 0x24(r3) -/* 8023B76C C0 22 B1 64 */ lfs f1, lit_4154(r2) -/* 8023B770 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 8023B774 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8023B778 EC 42 00 2A */ fadds f2, f2, f0 -/* 8023B77C 80 9E 00 70 */ lwz r4, 0x70(r30) -/* 8023B780 C0 64 00 24 */ lfs f3, 0x24(r4) -/* 8023B784 C0 3C 01 04 */ lfs f1, 0x104(r28) -/* 8023B788 C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023B78C EC 21 00 28 */ fsubs f1, f1, f0 -/* 8023B790 EC 02 18 28 */ fsubs f0, f2, f3 -/* 8023B794 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8023B798 EC 20 F0 28 */ fsubs f1, f0, f30 -/* 8023B79C 38 81 00 08 */ addi r4, r1, 8 -/* 8023B7A0 7C 04 DC 2E */ lfsx f0, r4, r27 -/* 8023B7A4 EF BF 00 2A */ fadds f29, f31, f0 -/* 8023B7A8 FC 40 E8 90 */ fmr f2, f29 -/* 8023B7AC 48 01 8E 05 */ bl paneTrans__8CPaneMgrFff -/* 8023B7B0 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 8023B7B4 28 03 00 00 */ cmplwi r3, 0 -/* 8023B7B8 41 82 00 40 */ beq lbl_8023B7F8 -/* 8023B7BC C0 43 00 24 */ lfs f2, 0x24(r3) -/* 8023B7C0 C0 22 B1 64 */ lfs f1, lit_4154(r2) -/* 8023B7C4 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 8023B7C8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8023B7CC EC 42 00 2A */ fadds f2, f2, f0 -/* 8023B7D0 80 9E 00 70 */ lwz r4, 0x70(r30) -/* 8023B7D4 C0 64 00 24 */ lfs f3, 0x24(r4) -/* 8023B7D8 C0 3C 01 04 */ lfs f1, 0x104(r28) -/* 8023B7DC C0 02 B1 60 */ lfs f0, lit_3911(r2) -/* 8023B7E0 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8023B7E4 EC 02 18 28 */ fsubs f0, f2, f3 -/* 8023B7E8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8023B7EC EC 20 F0 28 */ fsubs f1, f0, f30 -/* 8023B7F0 FC 40 E8 90 */ fmr f2, f29 -/* 8023B7F4 48 01 8D BD */ bl paneTrans__8CPaneMgrFff -lbl_8023B7F8: -/* 8023B7F8 80 7E 00 64 */ lwz r3, 0x64(r30) -/* 8023B7FC 80 63 00 04 */ lwz r3, 4(r3) -/* 8023B800 48 0B B9 01 */ bl getBounds__7J2DPaneFv -/* 8023B804 C0 03 00 00 */ lfs f0, 0(r3) -/* 8023B808 80 7E 00 64 */ lwz r3, 0x64(r30) -/* 8023B80C C0 23 00 24 */ lfs f1, 0x24(r3) -/* 8023B810 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8023B814 80 7E 00 A0 */ lwz r3, 0xa0(r30) -/* 8023B818 EC 20 F0 28 */ fsubs f1, f0, f30 -/* 8023B81C C0 42 B1 58 */ lfs f2, lit_3909(r2) -/* 8023B820 48 01 8D 91 */ bl paneTrans__8CPaneMgrFff -/* 8023B824 88 1C 01 14 */ lbz r0, 0x114(r28) -/* 8023B828 7C 00 F8 78 */ andc r0, r0, r31 -/* 8023B82C 98 1C 01 14 */ stb r0, 0x114(r28) -lbl_8023B830: -/* 8023B830 3B BD 00 01 */ addi r29, r29, 1 -/* 8023B834 2C 1D 00 03 */ cmpwi r29, 3 -/* 8023B838 3B 7B 00 04 */ addi r27, r27, 4 -/* 8023B83C 41 80 FD 68 */ blt lbl_8023B5A4 -lbl_8023B840: -/* 8023B840 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 8023B844 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 8023B848 E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 8023B84C CB C1 00 40 */ lfd f30, 0x40(r1) -/* 8023B850 E3 A1 00 38 */ psq_l f29, 56(r1), 0, 0 /* qr0 */ -/* 8023B854 CB A1 00 30 */ lfd f29, 0x30(r1) -/* 8023B858 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023B85C 48 12 69 C1 */ bl _restgpr_26 -/* 8023B860 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8023B864 7C 08 03 A6 */ mtlr r0 -/* 8023B868 38 21 00 60 */ addi r1, r1, 0x60 -/* 8023B86C 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/setRubyString__17dMsgScrn3Select_cFPcPcPc.s b/asm/msg/scrn/d_msg_scrn_3select/setRubyString__17dMsgScrn3Select_cFPcPcPc.s deleted file mode 100644 index 5d3a15e39c3..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/setRubyString__17dMsgScrn3Select_cFPcPcPc.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80239D08: -/* 80239D08 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80239D0C 7C 08 02 A6 */ mflr r0 -/* 80239D10 90 01 00 24 */ stw r0, 0x24(r1) -/* 80239D14 39 61 00 20 */ addi r11, r1, 0x20 -/* 80239D18 48 12 84 C1 */ bl _savegpr_28 -/* 80239D1C 7C 7C 1B 78 */ mr r28, r3 -/* 80239D20 7C 9D 23 78 */ mr r29, r4 -/* 80239D24 7C BE 2B 78 */ mr r30, r5 -/* 80239D28 7C DF 33 78 */ mr r31, r6 -/* 80239D2C 80 63 00 28 */ lwz r3, 0x28(r3) -/* 80239D30 28 03 00 00 */ cmplwi r3, 0 -/* 80239D34 41 82 00 14 */ beq lbl_80239D48 -/* 80239D38 80 63 00 04 */ lwz r3, 4(r3) -/* 80239D3C 48 0C 69 1D */ bl getStringPtr__10J2DTextBoxCFv -/* 80239D40 7F A4 EB 78 */ mr r4, r29 -/* 80239D44 48 12 ED E9 */ bl strcpy -lbl_80239D48: -/* 80239D48 80 7C 00 2C */ lwz r3, 0x2c(r28) -/* 80239D4C 28 03 00 00 */ cmplwi r3, 0 -/* 80239D50 41 82 00 14 */ beq lbl_80239D64 -/* 80239D54 80 63 00 04 */ lwz r3, 4(r3) -/* 80239D58 48 0C 69 01 */ bl getStringPtr__10J2DTextBoxCFv -/* 80239D5C 7F C4 F3 78 */ mr r4, r30 -/* 80239D60 48 12 ED CD */ bl strcpy -lbl_80239D64: -/* 80239D64 80 7C 00 30 */ lwz r3, 0x30(r28) -/* 80239D68 28 03 00 00 */ cmplwi r3, 0 -/* 80239D6C 41 82 00 14 */ beq lbl_80239D80 -/* 80239D70 80 63 00 04 */ lwz r3, 4(r3) -/* 80239D74 48 0C 68 E5 */ bl getStringPtr__10J2DTextBoxCFv -/* 80239D78 7F E4 FB 78 */ mr r4, r31 -/* 80239D7C 48 12 ED B1 */ bl strcpy -lbl_80239D80: -/* 80239D80 39 61 00 20 */ addi r11, r1, 0x20 -/* 80239D84 48 12 84 A1 */ bl _restgpr_28 -/* 80239D88 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80239D8C 7C 08 03 A6 */ mtlr r0 -/* 80239D90 38 21 00 20 */ addi r1, r1, 0x20 -/* 80239D94 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/setString__17dMsgScrn3Select_cFPcPcPc.s b/asm/msg/scrn/d_msg_scrn_3select/setString__17dMsgScrn3Select_cFPcPcPc.s deleted file mode 100644 index 07eec2d3314..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/setString__17dMsgScrn3Select_cFPcPcPc.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80239C78: -/* 80239C78 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80239C7C 7C 08 02 A6 */ mflr r0 -/* 80239C80 90 01 00 24 */ stw r0, 0x24(r1) -/* 80239C84 39 61 00 20 */ addi r11, r1, 0x20 -/* 80239C88 48 12 85 51 */ bl _savegpr_28 -/* 80239C8C 7C 7C 1B 78 */ mr r28, r3 -/* 80239C90 7C 9D 23 78 */ mr r29, r4 -/* 80239C94 7C BE 2B 78 */ mr r30, r5 -/* 80239C98 7C DF 33 78 */ mr r31, r6 -/* 80239C9C 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 80239CA0 28 03 00 00 */ cmplwi r3, 0 -/* 80239CA4 41 82 00 14 */ beq lbl_80239CB8 -/* 80239CA8 80 63 00 04 */ lwz r3, 4(r3) -/* 80239CAC 48 0C 69 AD */ bl getStringPtr__10J2DTextBoxCFv -/* 80239CB0 7F A4 EB 78 */ mr r4, r29 -/* 80239CB4 48 12 EE 79 */ bl strcpy -lbl_80239CB8: -/* 80239CB8 80 7C 00 20 */ lwz r3, 0x20(r28) -/* 80239CBC 28 03 00 00 */ cmplwi r3, 0 -/* 80239CC0 41 82 00 14 */ beq lbl_80239CD4 -/* 80239CC4 80 63 00 04 */ lwz r3, 4(r3) -/* 80239CC8 48 0C 69 91 */ bl getStringPtr__10J2DTextBoxCFv -/* 80239CCC 7F C4 F3 78 */ mr r4, r30 -/* 80239CD0 48 12 EE 5D */ bl strcpy -lbl_80239CD4: -/* 80239CD4 80 7C 00 24 */ lwz r3, 0x24(r28) -/* 80239CD8 28 03 00 00 */ cmplwi r3, 0 -/* 80239CDC 41 82 00 14 */ beq lbl_80239CF0 -/* 80239CE0 80 63 00 04 */ lwz r3, 4(r3) -/* 80239CE4 48 0C 69 75 */ bl getStringPtr__10J2DTextBoxCFv -/* 80239CE8 7F E4 FB 78 */ mr r4, r31 -/* 80239CEC 48 12 EE 41 */ bl strcpy -lbl_80239CF0: -/* 80239CF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80239CF4 48 12 85 31 */ bl _restgpr_28 -/* 80239CF8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80239CFC 7C 08 03 A6 */ mtlr r0 -/* 80239D00 38 21 00 20 */ addi r1, r1, 0x20 -/* 80239D04 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/translate__17dMsgScrn3Select_cFff.s b/asm/msg/scrn/d_msg_scrn_3select/translate__17dMsgScrn3Select_cFff.s deleted file mode 100644 index 7d63c2fd4be..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/translate__17dMsgScrn3Select_cFff.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80239D98: -/* 80239D98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80239D9C 7C 08 02 A6 */ mflr r0 -/* 80239DA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80239DA4 80 63 00 18 */ lwz r3, 0x18(r3) -/* 80239DA8 80 63 00 04 */ lwz r3, 4(r3) -/* 80239DAC D0 23 00 D4 */ stfs f1, 0xd4(r3) -/* 80239DB0 D0 43 00 D8 */ stfs f2, 0xd8(r3) -/* 80239DB4 81 83 00 00 */ lwz r12, 0(r3) -/* 80239DB8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80239DBC 7D 89 03 A6 */ mtctr r12 -/* 80239DC0 4E 80 04 21 */ bctrl -/* 80239DC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80239DC8 7C 08 03 A6 */ mtlr r0 -/* 80239DCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80239DD0 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_3select/waitProc__17dMsgScrn3Select_cFv.s b/asm/msg/scrn/d_msg_scrn_3select/waitProc__17dMsgScrn3Select_cFv.s deleted file mode 100644 index a1d0933ca61..00000000000 --- a/asm/msg/scrn/d_msg_scrn_3select/waitProc__17dMsgScrn3Select_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8023AC14: -/* 8023AC14 A8 83 01 0A */ lha r4, 0x10a(r3) -/* 8023AC18 38 04 00 01 */ addi r0, r4, 1 -/* 8023AC1C B0 03 01 0A */ sth r0, 0x10a(r3) -/* 8023AC20 A8 A3 01 0A */ lha r5, 0x10a(r3) -/* 8023AC24 3C 80 80 43 */ lis r4, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 8023AC28 38 84 02 8C */ addi r4, r4, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 8023AC2C A8 04 02 FA */ lha r0, 0x2fa(r4) -/* 8023AC30 7C 05 00 00 */ cmpw r5, r0 -/* 8023AC34 4C 81 00 20 */ blelr -/* 8023AC38 38 00 00 03 */ li r0, 3 -/* 8023AC3C 98 03 01 13 */ stb r0, 0x113(r3) -/* 8023AC40 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_jimaku/__ct__16dMsgScrnJimaku_cFUcP10JKRExpHeap.s b/asm/msg/scrn/d_msg_scrn_jimaku/__ct__16dMsgScrnJimaku_cFUcP10JKRExpHeap.s deleted file mode 100644 index c147121d1c8..00000000000 --- a/asm/msg/scrn/d_msg_scrn_jimaku/__ct__16dMsgScrnJimaku_cFUcP10JKRExpHeap.s +++ /dev/null @@ -1,341 +0,0 @@ -lbl_80244558: -/* 80244558 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8024455C 7C 08 02 A6 */ mflr r0 -/* 80244560 90 01 00 54 */ stw r0, 0x54(r1) -/* 80244564 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 80244568 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 8024456C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80244570 48 11 DC 55 */ bl _savegpr_23 -/* 80244574 7C 7F 1B 78 */ mr r31, r3 -/* 80244578 7C 98 23 78 */ mr r24, r4 -/* 8024457C 7C B7 2B 78 */ mr r23, r5 -/* 80244580 4B FF 7B 5D */ bl __ct__14dMsgScrnBase_cFv -/* 80244584 3C 60 80 3C */ lis r3, __vt__16dMsgScrnJimaku_c@ha /* 0x803C11E8@ha */ -/* 80244588 38 03 11 E8 */ addi r0, r3, __vt__16dMsgScrnJimaku_c@l /* 0x803C11E8@l */ -/* 8024458C 90 1F 00 00 */ stw r0, 0(r31) -/* 80244590 28 17 00 00 */ cmplwi r23, 0 -/* 80244594 41 82 00 0C */ beq lbl_802445A0 -/* 80244598 92 FF 00 C8 */ stw r23, 0xc8(r31) -/* 8024459C 48 00 00 10 */ b lbl_802445AC -lbl_802445A0: -/* 802445A0 38 60 00 07 */ li r3, 7 -/* 802445A4 4B DE 9E 2D */ bl dComIfGp_getSubHeap2D__Fi -/* 802445A8 90 7F 00 C8 */ stw r3, 0xc8(r31) -lbl_802445AC: -/* 802445AC 7F E3 FB 78 */ mr r3, r31 -/* 802445B0 4B FF 7B BD */ bl init__14dMsgScrnBase_cFv -/* 802445B4 38 60 01 18 */ li r3, 0x118 -/* 802445B8 48 08 A6 95 */ bl __nw__FUl -/* 802445BC 7C 60 1B 79 */ or. r0, r3, r3 -/* 802445C0 41 82 00 0C */ beq lbl_802445CC -/* 802445C4 48 0B 3E D5 */ bl __ct__9J2DScreenFv -/* 802445C8 7C 60 1B 78 */ mr r0, r3 -lbl_802445CC: -/* 802445CC 90 1F 00 04 */ stw r0, 4(r31) -/* 802445D0 80 7F 00 04 */ lwz r3, 4(r31) -/* 802445D4 3C 80 80 3A */ lis r4, msg_scrn_d_msg_scrn_jimaku__stringBase0@ha /* 0x80399A80@ha */ -/* 802445D8 38 84 9A 80 */ addi r4, r4, msg_scrn_d_msg_scrn_jimaku__stringBase0@l /* 0x80399A80@l */ -/* 802445DC 3C A0 00 02 */ lis r5, 2 -/* 802445E0 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802445E4 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802445E8 80 C6 5C E4 */ lwz r6, 0x5ce4(r6) -/* 802445EC 48 0B 40 5D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 802445F0 80 7F 00 04 */ lwz r3, 4(r31) -/* 802445F4 48 01 0A F5 */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 802445F8 38 60 00 24 */ li r3, 0x24 -/* 802445FC 48 08 A6 51 */ bl __nw__FUl -/* 80244600 7C 60 1B 79 */ or. r0, r3, r3 -/* 80244604 41 82 00 14 */ beq lbl_80244618 -/* 80244608 38 80 00 00 */ li r4, 0 -/* 8024460C 7F 05 C3 78 */ mr r5, r24 -/* 80244610 48 00 13 25 */ bl __ct__15dMsgScrnLight_cFUcUc -/* 80244614 7C 60 1B 78 */ mr r0, r3 -lbl_80244618: -/* 80244618 90 1F 00 C4 */ stw r0, 0xc4(r31) -/* 8024461C 80 7F 00 C8 */ lwz r3, 0xc8(r31) -/* 80244620 38 80 10 6A */ li r4, 0x106a -/* 80244624 38 A0 00 20 */ li r5, 0x20 -/* 80244628 48 08 9E AD */ bl alloc__7JKRHeapFUli -/* 8024462C 7C 78 1B 78 */ mr r24, r3 -/* 80244630 38 80 00 00 */ li r4, 0 -/* 80244634 38 A0 10 6A */ li r5, 0x106a -/* 80244638 4B DB EE 21 */ bl memset -/* 8024463C 93 1F 00 50 */ stw r24, 0x50(r31) -/* 80244640 38 60 00 6C */ li r3, 0x6c -/* 80244644 48 08 A6 09 */ bl __nw__FUl -/* 80244648 7C 60 1B 79 */ or. r0, r3, r3 -/* 8024464C 41 82 00 28 */ beq lbl_80244674 -/* 80244650 80 9F 00 04 */ lwz r4, 4(r31) -/* 80244654 3C A0 6E 75 */ lis r5, 0x6E75 /* 0x6E756C6C@ha */ -/* 80244658 38 C5 6C 6C */ addi r6, r5, 0x6C6C /* 0x6E756C6C@l */ -/* 8024465C 3C A0 00 6D */ lis r5, 0x006D /* 0x006D675F@ha */ -/* 80244660 38 A5 67 5F */ addi r5, r5, 0x675F /* 0x006D675F@l */ -/* 80244664 38 E0 00 03 */ li r7, 3 -/* 80244668 39 00 00 00 */ li r8, 0 -/* 8024466C 48 00 F3 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80244670 7C 60 1B 78 */ mr r0, r3 -lbl_80244674: -/* 80244674 90 1F 00 08 */ stw r0, 8(r31) -/* 80244678 3C 60 80 43 */ lis r3, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 8024467C 38 83 02 8C */ addi r4, r3, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80244680 C0 24 00 C0 */ lfs f1, 0xc0(r4) -/* 80244684 80 7F 00 08 */ lwz r3, 8(r31) -/* 80244688 80 63 00 04 */ lwz r3, 4(r3) -/* 8024468C C0 04 00 94 */ lfs f0, 0x94(r4) -/* 80244690 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80244694 D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 80244698 81 83 00 00 */ lwz r12, 0(r3) -/* 8024469C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802446A0 7D 89 03 A6 */ mtctr r12 -/* 802446A4 4E 80 04 21 */ bctrl -/* 802446A8 3C 60 80 43 */ lis r3, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 802446AC 38 63 02 8C */ addi r3, r3, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 802446B0 C0 03 02 60 */ lfs f0, 0x260(r3) -/* 802446B4 D0 1F 00 CC */ stfs f0, 0xcc(r31) -/* 802446B8 80 7F 00 08 */ lwz r3, 8(r31) -/* 802446BC C0 22 B2 B0 */ lfs f1, lit_3941(r2) -/* 802446C0 C0 5F 00 CC */ lfs f2, 0xcc(r31) -/* 802446C4 48 00 FE ED */ bl paneTrans__8CPaneMgrFff -/* 802446C8 38 60 00 6C */ li r3, 0x6c -/* 802446CC 48 08 A5 81 */ bl __nw__FUl -/* 802446D0 7C 60 1B 79 */ or. r0, r3, r3 -/* 802446D4 41 82 00 28 */ beq lbl_802446FC -/* 802446D8 80 9F 00 04 */ lwz r4, 4(r31) -/* 802446DC 3C A0 34 6C */ lis r5, 0x346C /* 0x346C696E@ha */ -/* 802446E0 38 C5 69 6E */ addi r6, r5, 0x696E /* 0x346C696E@l */ -/* 802446E4 3C A0 6D 67 */ lis r5, 0x6D67 /* 0x6D675F65@ha */ -/* 802446E8 38 A5 5F 65 */ addi r5, r5, 0x5F65 /* 0x6D675F65@l */ -/* 802446EC 38 E0 00 00 */ li r7, 0 -/* 802446F0 39 00 00 00 */ li r8, 0 -/* 802446F4 48 00 F2 91 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 802446F8 7C 60 1B 78 */ mr r0, r3 -lbl_802446FC: -/* 802446FC 90 1F 00 0C */ stw r0, 0xc(r31) -/* 80244700 38 60 00 6C */ li r3, 0x6c -/* 80244704 48 08 A5 49 */ bl __nw__FUl -/* 80244708 7C 60 1B 79 */ or. r0, r3, r3 -/* 8024470C 41 82 00 24 */ beq lbl_80244730 -/* 80244710 80 9F 00 04 */ lwz r4, 4(r31) -/* 80244714 3C A0 74 34 */ lis r5, 0x7434 /* 0x74345F73@ha */ -/* 80244718 38 C5 5F 73 */ addi r6, r5, 0x5F73 /* 0x74345F73@l */ -/* 8024471C 38 A0 00 00 */ li r5, 0 -/* 80244720 38 E0 00 00 */ li r7, 0 -/* 80244724 39 00 00 00 */ li r8, 0 -/* 80244728 48 00 F2 5D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8024472C 7C 60 1B 78 */ mr r0, r3 -lbl_80244730: -/* 80244730 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80244734 80 7F 00 04 */ lwz r3, 4(r31) -/* 80244738 3C 80 6C 69 */ lis r4, 0x6C69 /* 0x6C696E65@ha */ -/* 8024473C 38 C4 6E 65 */ addi r6, r4, 0x6E65 /* 0x6C696E65@l */ -/* 80244740 3C 80 00 6E */ lis r4, 0x006E /* 0x006E5F33@ha */ -/* 80244744 38 A4 5F 33 */ addi r5, r4, 0x5F33 /* 0x006E5F33@l */ -/* 80244748 81 83 00 00 */ lwz r12, 0(r3) -/* 8024474C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80244750 7D 89 03 A6 */ mtctr r12 -/* 80244754 4E 80 04 21 */ bctrl -/* 80244758 38 00 00 00 */ li r0, 0 -/* 8024475C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80244760 80 7F 00 04 */ lwz r3, 4(r31) -/* 80244764 3C 80 6C 69 */ lis r4, 0x6C69 /* 0x6C696E65@ha */ -/* 80244768 38 C4 6E 65 */ addi r6, r4, 0x6E65 /* 0x6C696E65@l */ -/* 8024476C 3C 80 6E 5F */ lis r4, 0x6E5F /* 0x6E5F3366@ha */ -/* 80244770 38 A4 33 66 */ addi r5, r4, 0x3366 /* 0x6E5F3366@l */ -/* 80244774 81 83 00 00 */ lwz r12, 0(r3) -/* 80244778 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8024477C 7D 89 03 A6 */ mtctr r12 -/* 80244780 4E 80 04 21 */ bctrl -/* 80244784 38 00 00 00 */ li r0, 0 -/* 80244788 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 8024478C 80 7F 00 04 */ lwz r3, 4(r31) -/* 80244790 3C 80 6C 69 */ lis r4, 0x6C69 /* 0x6C696E65@ha */ -/* 80244794 38 C4 6E 65 */ addi r6, r4, 0x6E65 /* 0x6C696E65@l */ -/* 80244798 3C 80 6E 5F */ lis r4, 0x6E5F /* 0x6E5F6534@ha */ -/* 8024479C 38 A4 65 34 */ addi r5, r4, 0x6534 /* 0x6E5F6534@l */ -/* 802447A0 81 83 00 00 */ lwz r12, 0(r3) -/* 802447A4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802447A8 7D 89 03 A6 */ mtctr r12 -/* 802447AC 4E 80 04 21 */ bctrl -/* 802447B0 38 00 00 01 */ li r0, 1 -/* 802447B4 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 802447B8 3B 40 00 00 */ li r26, 0 -/* 802447BC 3B 20 00 00 */ li r25, 0 -/* 802447C0 3B 00 00 00 */ li r24, 0 -/* 802447C4 3C 60 80 3A */ lis r3, msg_scrn_d_msg_scrn_jimaku__stringBase0@ha /* 0x80399A80@ha */ -/* 802447C8 3B A3 9A 80 */ addi r29, r3, msg_scrn_d_msg_scrn_jimaku__stringBase0@l /* 0x80399A80@l */ -/* 802447CC 3C 60 80 43 */ lis r3, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 802447D0 3B C3 02 8C */ addi r30, r3, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -lbl_802447D4: -/* 802447D4 38 18 00 0C */ addi r0, r24, 0xc -/* 802447D8 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 802447DC 83 63 00 04 */ lwz r27, 4(r3) -/* 802447E0 4B DD 02 11 */ bl mDoExt_getMesgFont__Fv -/* 802447E4 7C 64 1B 78 */ mr r4, r3 -/* 802447E8 7F 63 DB 78 */ mr r3, r27 -/* 802447EC 81 9B 00 00 */ lwz r12, 0(r27) -/* 802447F0 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 802447F4 7D 89 03 A6 */ mtctr r12 -/* 802447F8 4E 80 04 21 */ bctrl -/* 802447FC 38 18 00 0C */ addi r0, r24, 0xc -/* 80244800 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80244804 80 63 00 04 */ lwz r3, 4(r3) -/* 80244808 38 80 02 00 */ li r4, 0x200 -/* 8024480C 38 BD 00 1E */ addi r5, r29, 0x1e -/* 80244810 4C C6 31 82 */ crclr 6 -/* 80244814 48 0B BF 39 */ bl setString__10J2DTextBoxFsPCce -/* 80244818 7C 7E CA 14 */ add r3, r30, r25 -/* 8024481C 3B 83 01 48 */ addi r28, r3, 0x148 -/* 80244820 80 03 01 48 */ lwz r0, 0x148(r3) -/* 80244824 90 01 00 10 */ stw r0, 0x10(r1) -/* 80244828 3B 63 00 F8 */ addi r27, r3, 0xf8 -/* 8024482C 80 03 00 F8 */ lwz r0, 0xf8(r3) -/* 80244830 90 01 00 14 */ stw r0, 0x14(r1) -/* 80244834 38 18 00 0C */ addi r0, r24, 0xc -/* 80244838 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 8024483C 38 81 00 14 */ addi r4, r1, 0x14 -/* 80244840 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80244844 48 00 FC 15 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -/* 80244848 38 18 00 28 */ addi r0, r24, 0x28 -/* 8024484C 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80244850 28 03 00 00 */ cmplwi r3, 0 -/* 80244854 41 82 00 6C */ beq lbl_802448C0 -/* 80244858 82 E3 00 04 */ lwz r23, 4(r3) -/* 8024485C 4B DD 01 95 */ bl mDoExt_getMesgFont__Fv -/* 80244860 7C 64 1B 78 */ mr r4, r3 -/* 80244864 7E E3 BB 78 */ mr r3, r23 -/* 80244868 81 97 00 00 */ lwz r12, 0(r23) -/* 8024486C 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 80244870 7D 89 03 A6 */ mtctr r12 -/* 80244874 4E 80 04 21 */ bctrl -/* 80244878 38 18 00 28 */ addi r0, r24, 0x28 -/* 8024487C 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80244880 80 63 00 04 */ lwz r3, 4(r3) -/* 80244884 38 80 02 00 */ li r4, 0x200 -/* 80244888 3C A0 80 3A */ lis r5, msg_scrn_d_msg_scrn_jimaku__stringBase0@ha /* 0x80399A80@ha */ -/* 8024488C 38 A5 9A 80 */ addi r5, r5, msg_scrn_d_msg_scrn_jimaku__stringBase0@l /* 0x80399A80@l */ -/* 80244890 38 A5 00 1E */ addi r5, r5, 0x1e -/* 80244894 4C C6 31 82 */ crclr 6 -/* 80244898 48 0B BE B5 */ bl setString__10J2DTextBoxFsPCce -/* 8024489C 80 1C 00 00 */ lwz r0, 0(r28) -/* 802448A0 90 01 00 08 */ stw r0, 8(r1) -/* 802448A4 80 1B 00 00 */ lwz r0, 0(r27) -/* 802448A8 90 01 00 0C */ stw r0, 0xc(r1) -/* 802448AC 38 18 00 28 */ addi r0, r24, 0x28 -/* 802448B0 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 802448B4 38 81 00 0C */ addi r4, r1, 0xc -/* 802448B8 38 A1 00 08 */ addi r5, r1, 8 -/* 802448BC 48 00 FB 9D */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -lbl_802448C0: -/* 802448C0 3B 5A 00 01 */ addi r26, r26, 1 -/* 802448C4 2C 1A 00 02 */ cmpwi r26, 2 -/* 802448C8 3B 39 00 28 */ addi r25, r25, 0x28 -/* 802448CC 3B 18 00 04 */ addi r24, r24, 4 -/* 802448D0 41 80 FF 04 */ blt lbl_802447D4 -/* 802448D4 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802448D8 80 63 00 04 */ lwz r3, 4(r3) -/* 802448DC C0 03 01 1C */ lfs f0, 0x11c(r3) -/* 802448E0 D0 1F 00 58 */ stfs f0, 0x58(r31) -/* 802448E4 C0 03 01 20 */ lfs f0, 0x120(r3) -/* 802448E8 D0 1F 00 5C */ stfs f0, 0x5c(r31) -/* 802448EC 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802448F0 80 63 00 04 */ lwz r3, 4(r3) -/* 802448F4 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 802448F8 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802448FC EC 01 00 28 */ fsubs f0, f1, f0 -/* 80244900 D0 1F 00 74 */ stfs f0, 0x74(r31) -/* 80244904 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80244908 80 63 00 04 */ lwz r3, 4(r3) -/* 8024490C C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 80244910 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 80244914 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80244918 D0 1F 00 78 */ stfs f0, 0x78(r31) -/* 8024491C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80244920 80 63 00 04 */ lwz r3, 4(r3) -/* 80244924 C0 03 01 18 */ lfs f0, 0x118(r3) -/* 80244928 D0 1F 00 7C */ stfs f0, 0x7c(r31) -/* 8024492C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80244930 80 63 00 04 */ lwz r3, 4(r3) -/* 80244934 C0 03 01 14 */ lfs f0, 0x114(r3) -/* 80244938 D0 1F 00 80 */ stfs f0, 0x80(r31) -/* 8024493C 3A E0 00 00 */ li r23, 0 -/* 80244940 3B 40 00 00 */ li r26, 0 -/* 80244944 C3 E2 B2 B4 */ lfs f31, lit_3942(r2) -lbl_80244948: -/* 80244948 38 1A 00 0C */ addi r0, r26, 0xc -/* 8024494C 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80244950 80 63 00 04 */ lwz r3, 4(r3) -/* 80244954 C0 1F 00 7C */ lfs f0, 0x7c(r31) -/* 80244958 D0 03 01 18 */ stfs f0, 0x118(r3) -/* 8024495C 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80244960 80 63 00 04 */ lwz r3, 4(r3) -/* 80244964 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 80244968 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 8024496C EC 41 00 28 */ fsubs f2, f1, f0 -/* 80244970 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 80244974 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80244978 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8024497C EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80244980 81 83 00 00 */ lwz r12, 0(r3) -/* 80244984 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80244988 7D 89 03 A6 */ mtctr r12 -/* 8024498C 4E 80 04 21 */ bctrl -/* 80244990 3A F7 00 01 */ addi r23, r23, 1 -/* 80244994 2C 17 00 02 */ cmpwi r23, 2 -/* 80244998 3B 5A 00 04 */ addi r26, r26, 4 -/* 8024499C 41 80 FF AC */ blt lbl_80244948 -/* 802449A0 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802449A4 48 00 F9 45 */ bl getGlobalPosX__8CPaneMgrFv -/* 802449A8 D0 3F 00 64 */ stfs f1, 0x64(r31) -/* 802449AC 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802449B0 48 00 F9 B5 */ bl getGlobalPosY__8CPaneMgrFv -/* 802449B4 D0 3F 00 68 */ stfs f1, 0x68(r31) -/* 802449B8 3A E0 00 00 */ li r23, 0 -/* 802449BC 3B 40 00 00 */ li r26, 0 -lbl_802449C0: -/* 802449C0 38 1A 00 28 */ addi r0, r26, 0x28 -/* 802449C4 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 802449C8 28 03 00 00 */ cmplwi r3, 0 -/* 802449CC 41 82 00 74 */ beq lbl_80244A40 -/* 802449D0 80 63 00 04 */ lwz r3, 4(r3) -/* 802449D4 C0 1F 00 7C */ lfs f0, 0x7c(r31) -/* 802449D8 D0 03 01 18 */ stfs f0, 0x118(r3) -/* 802449DC 2C 17 00 00 */ cmpwi r23, 0 -/* 802449E0 40 82 00 24 */ bne lbl_80244A04 -/* 802449E4 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 802449E8 80 63 00 04 */ lwz r3, 4(r3) -/* 802449EC C0 03 01 1C */ lfs f0, 0x11c(r3) -/* 802449F0 D0 1F 00 60 */ stfs f0, 0x60(r31) -/* 802449F4 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 802449F8 80 63 00 04 */ lwz r3, 4(r3) -/* 802449FC C0 03 01 14 */ lfs f0, 0x114(r3) -/* 80244A00 D0 1F 00 84 */ stfs f0, 0x84(r31) -lbl_80244A04: -/* 80244A04 38 1A 00 28 */ addi r0, r26, 0x28 -/* 80244A08 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80244A0C 80 63 00 04 */ lwz r3, 4(r3) -/* 80244A10 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 80244A14 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 80244A18 EC 41 00 28 */ fsubs f2, f1, f0 -/* 80244A1C C0 23 00 28 */ lfs f1, 0x28(r3) -/* 80244A20 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80244A24 EC 21 00 28 */ fsubs f1, f1, f0 -/* 80244A28 C0 02 B2 B4 */ lfs f0, lit_3942(r2) -/* 80244A2C EC 20 00 72 */ fmuls f1, f0, f1 -/* 80244A30 81 83 00 00 */ lwz r12, 0(r3) -/* 80244A34 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80244A38 7D 89 03 A6 */ mtctr r12 -/* 80244A3C 4E 80 04 21 */ bctrl -lbl_80244A40: -/* 80244A40 3A F7 00 01 */ addi r23, r23, 1 -/* 80244A44 2C 17 00 02 */ cmpwi r23, 2 -/* 80244A48 3B 5A 00 04 */ addi r26, r26, 4 -/* 80244A4C 41 80 FF 74 */ blt lbl_802449C0 -/* 80244A50 7F E3 FB 78 */ mr r3, r31 -/* 80244A54 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 80244A58 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 80244A5C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80244A60 48 11 D7 B1 */ bl _restgpr_23 -/* 80244A64 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80244A68 7C 08 03 A6 */ mtlr r0 -/* 80244A6C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80244A70 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_jimaku/__dt__16dMsgScrnJimaku_cFv.s b/asm/msg/scrn/d_msg_scrn_jimaku/__dt__16dMsgScrnJimaku_cFv.s deleted file mode 100644 index 5472050874d..00000000000 --- a/asm/msg/scrn/d_msg_scrn_jimaku/__dt__16dMsgScrnJimaku_cFv.s +++ /dev/null @@ -1,120 +0,0 @@ -lbl_80244A74: -/* 80244A74 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80244A78 7C 08 02 A6 */ mflr r0 -/* 80244A7C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80244A80 39 61 00 20 */ addi r11, r1, 0x20 -/* 80244A84 48 11 D7 51 */ bl _savegpr_27 -/* 80244A88 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80244A8C 7C 9F 23 78 */ mr r31, r4 -/* 80244A90 41 82 01 80 */ beq lbl_80244C10 -/* 80244A94 3C 60 80 3C */ lis r3, __vt__16dMsgScrnJimaku_c@ha /* 0x803C11E8@ha */ -/* 80244A98 38 03 11 E8 */ addi r0, r3, __vt__16dMsgScrnJimaku_c@l /* 0x803C11E8@l */ -/* 80244A9C 90 1E 00 00 */ stw r0, 0(r30) -/* 80244AA0 80 7E 00 04 */ lwz r3, 4(r30) -/* 80244AA4 28 03 00 00 */ cmplwi r3, 0 -/* 80244AA8 41 82 00 18 */ beq lbl_80244AC0 -/* 80244AAC 38 80 00 01 */ li r4, 1 -/* 80244AB0 81 83 00 00 */ lwz r12, 0(r3) -/* 80244AB4 81 8C 00 08 */ lwz r12, 8(r12) -/* 80244AB8 7D 89 03 A6 */ mtctr r12 -/* 80244ABC 4E 80 04 21 */ bctrl -lbl_80244AC0: -/* 80244AC0 38 00 00 00 */ li r0, 0 -/* 80244AC4 90 1E 00 04 */ stw r0, 4(r30) -/* 80244AC8 80 7E 00 C4 */ lwz r3, 0xc4(r30) -/* 80244ACC 28 03 00 00 */ cmplwi r3, 0 -/* 80244AD0 41 82 00 18 */ beq lbl_80244AE8 -/* 80244AD4 38 80 00 01 */ li r4, 1 -/* 80244AD8 81 83 00 00 */ lwz r12, 0(r3) -/* 80244ADC 81 8C 00 08 */ lwz r12, 8(r12) -/* 80244AE0 7D 89 03 A6 */ mtctr r12 -/* 80244AE4 4E 80 04 21 */ bctrl -lbl_80244AE8: -/* 80244AE8 38 00 00 00 */ li r0, 0 -/* 80244AEC 90 1E 00 C4 */ stw r0, 0xc4(r30) -/* 80244AF0 80 9E 00 50 */ lwz r4, 0x50(r30) -/* 80244AF4 28 04 00 00 */ cmplwi r4, 0 -/* 80244AF8 41 82 00 14 */ beq lbl_80244B0C -/* 80244AFC 80 7E 00 C8 */ lwz r3, 0xc8(r30) -/* 80244B00 48 08 9A 49 */ bl free__7JKRHeapFPv -/* 80244B04 38 00 00 00 */ li r0, 0 -/* 80244B08 90 1E 00 50 */ stw r0, 0x50(r30) -lbl_80244B0C: -/* 80244B0C 80 7E 00 08 */ lwz r3, 8(r30) -/* 80244B10 28 03 00 00 */ cmplwi r3, 0 -/* 80244B14 41 82 00 18 */ beq lbl_80244B2C -/* 80244B18 38 80 00 01 */ li r4, 1 -/* 80244B1C 81 83 00 00 */ lwz r12, 0(r3) -/* 80244B20 81 8C 00 08 */ lwz r12, 8(r12) -/* 80244B24 7D 89 03 A6 */ mtctr r12 -/* 80244B28 4E 80 04 21 */ bctrl -lbl_80244B2C: -/* 80244B2C 3B A0 00 00 */ li r29, 0 -/* 80244B30 93 BE 00 08 */ stw r29, 8(r30) -/* 80244B34 3B 60 00 00 */ li r27, 0 -lbl_80244B38: -/* 80244B38 7F 9E EA 14 */ add r28, r30, r29 -/* 80244B3C 80 7C 00 0C */ lwz r3, 0xc(r28) -/* 80244B40 28 03 00 00 */ cmplwi r3, 0 -/* 80244B44 41 82 00 18 */ beq lbl_80244B5C -/* 80244B48 38 80 00 01 */ li r4, 1 -/* 80244B4C 81 83 00 00 */ lwz r12, 0(r3) -/* 80244B50 81 8C 00 08 */ lwz r12, 8(r12) -/* 80244B54 7D 89 03 A6 */ mtctr r12 -/* 80244B58 4E 80 04 21 */ bctrl -lbl_80244B5C: -/* 80244B5C 38 00 00 00 */ li r0, 0 -/* 80244B60 90 1C 00 0C */ stw r0, 0xc(r28) -/* 80244B64 80 7C 00 28 */ lwz r3, 0x28(r28) -/* 80244B68 28 03 00 00 */ cmplwi r3, 0 -/* 80244B6C 41 82 00 24 */ beq lbl_80244B90 -/* 80244B70 41 82 00 18 */ beq lbl_80244B88 -/* 80244B74 38 80 00 01 */ li r4, 1 -/* 80244B78 81 83 00 00 */ lwz r12, 0(r3) -/* 80244B7C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80244B80 7D 89 03 A6 */ mtctr r12 -/* 80244B84 4E 80 04 21 */ bctrl -lbl_80244B88: -/* 80244B88 38 00 00 00 */ li r0, 0 -/* 80244B8C 90 1C 00 28 */ stw r0, 0x28(r28) -lbl_80244B90: -/* 80244B90 3B 7B 00 01 */ addi r27, r27, 1 -/* 80244B94 2C 1B 00 02 */ cmpwi r27, 2 -/* 80244B98 3B BD 00 04 */ addi r29, r29, 4 -/* 80244B9C 41 80 FF 9C */ blt lbl_80244B38 -/* 80244BA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80244BA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80244BA8 80 63 5C 6C */ lwz r3, 0x5c6c(r3) -/* 80244BAC 81 83 00 00 */ lwz r12, 0(r3) -/* 80244BB0 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80244BB4 7D 89 03 A6 */ mtctr r12 -/* 80244BB8 4E 80 04 21 */ bctrl -/* 80244BBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80244BC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80244BC4 80 63 5C 70 */ lwz r3, 0x5c70(r3) -/* 80244BC8 81 83 00 00 */ lwz r12, 0(r3) -/* 80244BCC 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80244BD0 7D 89 03 A6 */ mtctr r12 -/* 80244BD4 4E 80 04 21 */ bctrl -/* 80244BD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80244BDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80244BE0 80 63 5C E4 */ lwz r3, 0x5ce4(r3) -/* 80244BE4 81 83 00 00 */ lwz r12, 0(r3) -/* 80244BE8 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80244BEC 7D 89 03 A6 */ mtctr r12 -/* 80244BF0 4E 80 04 21 */ bctrl -/* 80244BF4 7F C3 F3 78 */ mr r3, r30 -/* 80244BF8 38 80 00 00 */ li r4, 0 -/* 80244BFC 4B FF 75 29 */ bl __dt__14dMsgScrnBase_cFv -/* 80244C00 7F E0 07 35 */ extsh. r0, r31 -/* 80244C04 40 81 00 0C */ ble lbl_80244C10 -/* 80244C08 7F C3 F3 78 */ mr r3, r30 -/* 80244C0C 48 08 A1 31 */ bl __dl__FPv -lbl_80244C10: -/* 80244C10 7F C3 F3 78 */ mr r3, r30 -/* 80244C14 39 61 00 20 */ addi r11, r1, 0x20 -/* 80244C18 48 11 D6 09 */ bl _restgpr_27 -/* 80244C1C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80244C20 7C 08 03 A6 */ mtlr r0 -/* 80244C24 38 21 00 20 */ addi r1, r1, 0x20 -/* 80244C28 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_jimaku/drawSelf__16dMsgScrnJimaku_cFv.s b/asm/msg/scrn/d_msg_scrn_jimaku/drawSelf__16dMsgScrnJimaku_cFv.s deleted file mode 100644 index fee0a839038..00000000000 --- a/asm/msg/scrn/d_msg_scrn_jimaku/drawSelf__16dMsgScrnJimaku_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80244D34: -/* 80244D34 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80244D38 7C 08 02 A6 */ mflr r0 -/* 80244D3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80244D40 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80244D44 7C 7F 1B 78 */ mr r31, r3 -/* 80244D48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80244D4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80244D50 80 63 5F 50 */ lwz r3, 0x5f50(r3) -/* 80244D54 81 83 00 00 */ lwz r12, 0(r3) -/* 80244D58 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80244D5C 7D 89 03 A6 */ mtctr r12 -/* 80244D60 4E 80 04 21 */ bctrl -/* 80244D64 7F E3 FB 78 */ mr r3, r31 -/* 80244D68 C0 22 B2 B0 */ lfs f1, lit_3941(r2) -/* 80244D6C FC 40 08 90 */ fmr f2, f1 -/* 80244D70 C0 62 B2 B8 */ lfs f3, lit_4021(r2) -/* 80244D74 4B FF 75 B9 */ bl drawOutFont__14dMsgScrnBase_cFfff -/* 80244D78 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80244D7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80244D80 7C 08 03 A6 */ mtlr r0 -/* 80244D84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80244D88 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_jimaku/exec__16dMsgScrnJimaku_cFv.s b/asm/msg/scrn/d_msg_scrn_jimaku/exec__16dMsgScrnJimaku_cFv.s deleted file mode 100644 index b5bf24c1621..00000000000 --- a/asm/msg/scrn/d_msg_scrn_jimaku/exec__16dMsgScrnJimaku_cFv.s +++ /dev/null @@ -1,70 +0,0 @@ -lbl_80244C2C: -/* 80244C2C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80244C30 7C 08 02 A6 */ mflr r0 -/* 80244C34 90 01 00 44 */ stw r0, 0x44(r1) -/* 80244C38 39 61 00 40 */ addi r11, r1, 0x40 -/* 80244C3C 48 11 D5 8D */ bl _savegpr_24 -/* 80244C40 7C 7F 1B 78 */ mr r31, r3 -/* 80244C44 4B FF 79 31 */ bl isTalkNow__14dMsgScrnBase_cFv -/* 80244C48 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80244C4C 41 82 00 1C */ beq lbl_80244C68 -/* 80244C50 7F E3 FB 78 */ mr r3, r31 -/* 80244C54 C0 22 B2 B8 */ lfs f1, lit_4021(r2) -/* 80244C58 81 9F 00 00 */ lwz r12, 0(r31) -/* 80244C5C 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 80244C60 7D 89 03 A6 */ mtctr r12 -/* 80244C64 4E 80 04 21 */ bctrl -lbl_80244C68: -/* 80244C68 3C 60 80 43 */ lis r3, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 80244C6C 38 83 02 8C */ addi r4, r3, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80244C70 C0 24 00 C0 */ lfs f1, 0xc0(r4) -/* 80244C74 80 7F 00 08 */ lwz r3, 8(r31) -/* 80244C78 80 63 00 04 */ lwz r3, 4(r3) -/* 80244C7C C0 04 00 94 */ lfs f0, 0x94(r4) -/* 80244C80 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80244C84 D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 80244C88 81 83 00 00 */ lwz r12, 0(r3) -/* 80244C8C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80244C90 7D 89 03 A6 */ mtctr r12 -/* 80244C94 4E 80 04 21 */ bctrl -/* 80244C98 3B 00 00 00 */ li r24, 0 -/* 80244C9C 3B C0 00 00 */ li r30, 0 -/* 80244CA0 3B A0 00 00 */ li r29, 0 -/* 80244CA4 3C 60 80 43 */ lis r3, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 80244CA8 3B 83 02 8C */ addi r28, r3, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -lbl_80244CAC: -/* 80244CAC 7C 7C EA 14 */ add r3, r28, r29 -/* 80244CB0 3B 43 01 48 */ addi r26, r3, 0x148 -/* 80244CB4 80 03 01 48 */ lwz r0, 0x148(r3) -/* 80244CB8 90 01 00 10 */ stw r0, 0x10(r1) -/* 80244CBC 3B 23 00 F8 */ addi r25, r3, 0xf8 -/* 80244CC0 80 03 00 F8 */ lwz r0, 0xf8(r3) -/* 80244CC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80244CC8 7F 7F F2 14 */ add r27, r31, r30 -/* 80244CCC 80 7B 00 0C */ lwz r3, 0xc(r27) -/* 80244CD0 38 81 00 14 */ addi r4, r1, 0x14 -/* 80244CD4 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80244CD8 48 00 F7 81 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -/* 80244CDC 80 1B 00 28 */ lwz r0, 0x28(r27) -/* 80244CE0 28 00 00 00 */ cmplwi r0, 0 -/* 80244CE4 41 82 00 24 */ beq lbl_80244D08 -/* 80244CE8 80 1A 00 00 */ lwz r0, 0(r26) -/* 80244CEC 90 01 00 08 */ stw r0, 8(r1) -/* 80244CF0 80 19 00 00 */ lwz r0, 0(r25) -/* 80244CF4 90 01 00 0C */ stw r0, 0xc(r1) -/* 80244CF8 80 7B 00 28 */ lwz r3, 0x28(r27) -/* 80244CFC 38 81 00 0C */ addi r4, r1, 0xc -/* 80244D00 38 A1 00 08 */ addi r5, r1, 8 -/* 80244D04 48 00 F7 55 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -lbl_80244D08: -/* 80244D08 3B 18 00 01 */ addi r24, r24, 1 -/* 80244D0C 2C 18 00 02 */ cmpwi r24, 2 -/* 80244D10 3B DE 00 04 */ addi r30, r30, 4 -/* 80244D14 3B BD 00 28 */ addi r29, r29, 0x28 -/* 80244D18 41 80 FF 94 */ blt lbl_80244CAC -/* 80244D1C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80244D20 48 11 D4 F5 */ bl _restgpr_24 -/* 80244D24 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80244D28 7C 08 03 A6 */ mtlr r0 -/* 80244D2C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80244D30 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_jimaku/fukiAlpha__16dMsgScrnJimaku_cFf.s b/asm/msg/scrn/d_msg_scrn_jimaku/fukiAlpha__16dMsgScrnJimaku_cFf.s deleted file mode 100644 index d6241a31b5f..00000000000 --- a/asm/msg/scrn/d_msg_scrn_jimaku/fukiAlpha__16dMsgScrnJimaku_cFf.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80244D8C: -/* 80244D8C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80244D90 7C 08 02 A6 */ mflr r0 -/* 80244D94 90 01 00 34 */ stw r0, 0x34(r1) -/* 80244D98 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 80244D9C F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 80244DA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80244DA4 48 11 D4 35 */ bl _savegpr_28 -/* 80244DA8 7C 7C 1B 78 */ mr r28, r3 -/* 80244DAC FF E0 08 90 */ fmr f31, f1 -/* 80244DB0 80 63 00 08 */ lwz r3, 8(r3) -/* 80244DB4 3C 80 80 43 */ lis r4, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 80244DB8 38 84 02 8C */ addi r4, r4, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80244DBC C0 04 00 38 */ lfs f0, 0x38(r4) -/* 80244DC0 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80244DC4 48 01 0A 0D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80244DC8 3B A0 00 00 */ li r29, 0 -/* 80244DCC 3B E0 00 00 */ li r31, 0 -lbl_80244DD0: -/* 80244DD0 7F DC FA 14 */ add r30, r28, r31 -/* 80244DD4 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80244DD8 C0 1C 00 BC */ lfs f0, 0xbc(r28) -/* 80244DDC EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80244DE0 48 01 09 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80244DE4 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 80244DE8 28 03 00 00 */ cmplwi r3, 0 -/* 80244DEC 41 82 00 10 */ beq lbl_80244DFC -/* 80244DF0 C0 1C 00 BC */ lfs f0, 0xbc(r28) -/* 80244DF4 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80244DF8 48 01 09 D9 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80244DFC: -/* 80244DFC 3B BD 00 01 */ addi r29, r29, 1 -/* 80244E00 2C 1D 00 02 */ cmpwi r29, 2 -/* 80244E04 3B FF 00 04 */ addi r31, r31, 4 -/* 80244E08 41 80 FF C8 */ blt lbl_80244DD0 -/* 80244E0C E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 80244E10 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 80244E14 39 61 00 20 */ addi r11, r1, 0x20 -/* 80244E18 48 11 D4 0D */ bl _restgpr_28 -/* 80244E1C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80244E20 7C 08 03 A6 */ mtlr r0 -/* 80244E24 38 21 00 30 */ addi r1, r1, 0x30 -/* 80244E28 4E 80 00 20 */ blr diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h index 2a64b834936..569c7a9b0f1 100644 --- a/include/JSystem/J2DGraph/J2DTextBox.h +++ b/include/JSystem/J2DGraph/J2DTextBox.h @@ -137,6 +137,7 @@ public: JUtility::TColor getCharColor() { return mCharColor; } JUtility::TColor getGradColor() { return mGradientColor; } + u16 getStringAllocByte() const { return mStringLength; } // private: /* 0x0100 */ JUTFont* mFont; @@ -153,7 +154,7 @@ public: /* 0x012C */ JUtility::TColor mBlackColor; /* 0x0130 */ u8 mFlags; /* 0x0131 */ bool mTextFontOwned; - /* 0x0132 */ s16 mStringLength; + /* 0x0132 */ u16 mStringLength; /* 0x0134 */ u8 field_0x134[4]; }; // Size: 0x138 diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h index 93c561b9db9..225f94ef3b1 100644 --- a/include/d/msg/d_msg_object.h +++ b/include/d/msg/d_msg_object.h @@ -558,7 +558,7 @@ public: /* 0x2F4 */ s16 mMsgIndex; /* 0x2F6 */ s16 mFlowIndex; /* 0x2F8 */ s16 mSaveSeqMsgIndex; - /* 0x2FA */ u16 mSelWeightFrame; + /* 0x2FA */ s16 mSelWaitFrame; /* 0x2FC */ u16 mBoxAppearBound; /* 0x2FE */ u16 mBoxAppearFrame; /* 0x300 */ u16 mWaitFrame; diff --git a/include/d/msg/d_msg_scrn_3select.h b/include/d/msg/d_msg_scrn_3select.h index 37b09d30477..6a3c37a285d 100644 --- a/include/d/msg/d_msg_scrn_3select.h +++ b/include/d/msg/d_msg_scrn_3select.h @@ -13,6 +13,16 @@ class J2DTextBox; class dMsgScrn3Select_c { public: + enum Process_e { + PROC_OPEN1_e, + PROC_OPEN2_e, + PROC_WAIT_e, + PROC_SELECT_e, + PROC_CHANGE_e, + PROC_CLOSE_e, + PROC_MAX_e, + }; + /* 802390B4 */ dMsgScrn3Select_c(); /* 802398CC */ virtual ~dMsgScrn3Select_c(); /* 80239C64 */ bool isSelect(); @@ -21,15 +31,15 @@ public: /* 80239D98 */ void translate(f32, f32); /* 80239DD4 */ void draw(f32, f32); /* 8023A094 */ void selAnimeInit(u8, u8, u8, f32, u8); - /* 8023A398 */ void selAnimeMove(u8, u8, bool); + /* 8023A398 */ BOOL selAnimeMove(u8, u8, bool); /* 8023A680 */ bool selAnimeEnd(); /* 8023A934 */ f32 getTextBoxWidth(); /* 8023A94C */ f32 getFontSize(); - /* 8023A95C */ void getRubyFontSize(); + /* 8023A95C */ f32 getRubyFontSize(); /* 8023A97C */ f32 getCharSpace(); - /* 8023A98C */ void getRubyCharSpace(); - /* 8023A9AC */ void getTextBoxGlobalPosX(int); - /* 8023A9D8 */ void getTextBoxGlobalPosY(int); + /* 8023A98C */ f32 getRubyCharSpace(); + /* 8023A9AC */ f32 getTextBoxGlobalPosX(int); + /* 8023A9D8 */ f32 getTextBoxGlobalPosY(int); /* 8023AA04 */ void open1Proc(); /* 8023AAF4 */ void open2Proc(); /* 8023AC14 */ void waitProc(); @@ -41,6 +51,9 @@ public: /* 8023B870 */ void selectAnimeTransform(int); void setOffsetX(f32 i_offsetX) { mOffsetX = i_offsetX; } + bool isAnimeUpdate(int param_0) { return (field_0x114 & (u8)(1 << param_0)) ? TRUE : FALSE; } + void onAnimeUpdate(int param_0) { field_0x114 |= (u8)(1 << param_0); } + void offAnimeUpdate(int param_0) { field_0x114 &= ~(u8)(1 << param_0); } private: /* 0x004 */ J2DScreen* mpScreen; @@ -49,8 +62,8 @@ private: /* 0x010 */ J2DAnmTextureSRTKey* mpAnmBtk; /* 0x014 */ dSelect_cursor_c* mpSelectCursor; /* 0x018 */ CPaneMgr* mpParent; - /* 0x01C */ CPaneMgr* mpTouchArea[3]; - /* 0x028 */ J2DTextBox* mpTmrSel_c[3]; + /* 0x01C */ CPaneMgr* mpTmSel_c[3]; + /* 0x028 */ CPaneMgr* mpTmrSel_c[3]; /* 0x034 */ CPaneMgr* mpSel_c[3]; /* 0x040 */ CPaneMgr* mpSelCld_c[3]; /* 0x04C */ CPaneMgr* mpSelCldr_c[3]; @@ -59,25 +72,24 @@ private: /* 0x0A0 */ CPaneMgr* mpSelPo_c[3]; /* 0x0AC */ CPaneMgr* mpKahen_c[3]; /* 0x0B8 */ CPaneMgr* mpCursor_c[3]; - /* 0x0C4 */ JUtility::TColor field_0xc4; - /* 0x0C8 */ JUtility::TColor field_0xc8; - /* 0x0CC */ u8 field_0xcc[0xF0 - 0xCC]; - /* 0x0F0 */ f32 field_0xf0; - /* 0x0F4 */ f32 field_0xf4; - /* 0x0F8 */ f32 field_0xf8; + /* 0x0C4 */ JUtility::TColor mSelMsgCol; + /* 0x0C8 */ JUtility::TColor mSelMsgInactiveCol; + /* 0x0CC */ Vec mCursorPos[3]; + /* 0x0F0 */ f32 mBckFrame; + /* 0x0F4 */ f32 mBpkFrame; + /* 0x0F8 */ f32 mBtkFrame; /* 0x0FC */ f32 mOffsetX; - /* 0x100 */ f32 field_0x100; - /* 0x104 */ f32 field_0x104; + /* 0x100 */ f32 mBaseWidth; + /* 0x104 */ f32 mWidth; /* 0x108 */ u8 field_0x108; - /* 0x109 */ u8 field_0x109[0x10A - 0x109]; - /* 0x10A */ s16 field_0x10a; + /* 0x10A */ s16 mSelWaitTimer; /* 0x10C */ s16 field_0x10c; - /* 0x10E */ u8 field_0x10e; - /* 0x10F */ u8 field_0x10f; + /* 0x10E */ u8 mSelNo; + /* 0x10F */ u8 mLastSelNo; /* 0x110 */ u8 field_0x110; - /* 0x111 */ u8 field_0x111; + /* 0x111 */ u8 mSelNum; /* 0x112 */ u8 field_0x112; - /* 0x113 */ u8 field_0x113; + /* 0x113 */ u8 mProcess; /* 0x114 */ u8 field_0x114; /* 0x115 */ u8 field_0x115; /* 0x116 */ u8 field_0x116; diff --git a/include/d/msg/d_msg_scrn_base.h b/include/d/msg/d_msg_scrn_base.h index 26ac0935238..fc9f0e56636 100644 --- a/include/d/msg/d_msg_scrn_base.h +++ b/include/d/msg/d_msg_scrn_base.h @@ -39,7 +39,7 @@ public: /* 80238C5C */ virtual void fukiPosCalc(u8); /* 0x04 */ J2DScreen* mpScreen; - /* 0x08 */ CPaneMgr* mpPmp_c; + /* 0x08 */ CPaneMgr* mpPmP_c; /* 0x0C */ CPaneMgr* mpTm_c[7]; /* 0x28 */ CPaneMgr* mpTmr_c[7]; /* 0x44 */ COutFont_c* mpOutFont; diff --git a/include/d/msg/d_msg_scrn_jimaku.h b/include/d/msg/d_msg_scrn_jimaku.h index 9f27ef04d31..6dd7947a935 100644 --- a/include/d/msg/d_msg_scrn_jimaku.h +++ b/include/d/msg/d_msg_scrn_jimaku.h @@ -1,6 +1,25 @@ #ifndef MSG_SCRN_D_MSG_SCRN_JIMAKU_H #define MSG_SCRN_D_MSG_SCRN_JIMAKU_H -#include "dolphin/types.h" +#include "d/msg/d_msg_scrn_base.h" +#include "JSystem/JKernel/JKRExpHeap.h" + +class dMsgScrnLight_c; + +class dMsgScrnJimaku_c : public dMsgScrnBase_c { +public: + /* 80244558 */ dMsgScrnJimaku_c(u8, JKRExpHeap*); + /* 80244A74 */ virtual ~dMsgScrnJimaku_c(); + /* 80244C2C */ virtual void exec(); + /* 80244D34 */ virtual void drawSelf(); + /* 80244E2C */ virtual void fukiScale(f32); + /* 80244D8C */ virtual void fukiAlpha(f32); + /* 80244E30 */ virtual void fukiTrans(f32, f32); + /* 80244E34 */ virtual void fontAlpha(f32); + + /* 0xC4 */ dMsgScrnLight_c* mpLight_c; + /* 0xC8 */ JKRExpHeap* heap; + /* 0xCC */ f32 field_0xcc; +}; #endif /* MSG_SCRN_D_MSG_SCRN_JIMAKU_H */ diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h new file mode 100644 index 00000000000..c8497d85589 --- /dev/null +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h @@ -0,0 +1,16 @@ +#ifndef STD_CMATH_H_ +#define STD_CMATH_H_ + +#include "string.h" + +namespace std { +inline size_t strlen(const char* str) { + return ::strlen(str); +} + +inline char* strcpy(char* dest, const char* src) { + return ::strcpy(dest, src); +} +} // namespace std + +#endif \ No newline at end of file diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h index 4c31c2e11ea..241ee62cd46 100644 --- a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h @@ -4,9 +4,6 @@ #include "stddef.h" #ifdef __cplusplus -// TODO: std namespace should be used for C++, but it breaks asm compatibility afaict. -// try to fix later -// namespace std { extern "C" { #endif @@ -26,7 +23,6 @@ char* strcpy(char* dst, const char* src); size_t strlen(const char* str); #ifdef __cplusplus -// } } #endif diff --git a/src/d/msg/d_msg_scrn_3select.cpp b/src/d/msg/d_msg_scrn_3select.cpp index 407a9cf919d..6c74083982d 100644 --- a/src/d/msg/d_msg_scrn_3select.cpp +++ b/src/d/msg/d_msg_scrn_3select.cpp @@ -1,790 +1,985 @@ -// -// Generated By: dol2asm -// Translation Unit: msg/scrn/d_msg_scrn_3select -// +/** + * d_msg_scrn_3select.cpp + * 3-way Select Message Screen + */ #include "d/msg/d_msg_scrn_3select.h" -#include "dol2asm.h" +#include "JSystem/J2DGraph/J2DAnmLoader.h" +#include "JSystem/J2DGraph/J2DGrafContext.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "cstring.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_select_cursor.h" +#include "d/msg/d_msg_object.h" +#include "d/pane/d_pane_class.h" -// -// Types: -// - -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 JKRFileLoader { - /* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*); -}; - -struct JKRExpHeap {}; - -struct J2DTextBox { - /* 80300658 */ void getStringPtr() 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 J2DAnmColorKey { - /* 80239BE0 */ ~J2DAnmColorKey(); -}; - -struct CPaneMgrAlpha { - /* 802555C8 */ void show(); - /* 80255608 */ void hide(); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802542E8 */ void getGlobalPosX(); - /* 80254364 */ void getGlobalPosY(); - /* 802545B0 */ void paneTrans(f32, f32); - /* 80254638 */ void paneScale(f32, f32); - /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); -}; - -// -// Forward References: -// - -extern "C" void __ct__17dMsgScrn3Select_cFv(); -extern "C" void __dt__17dMsgScrn3Select_cFv(); -extern "C" void __dt__14J2DAnmColorKeyFv(); -extern "C" void isSelect__17dMsgScrn3Select_cFv(); -extern "C" void setString__17dMsgScrn3Select_cFPcPcPc(); -extern "C" void setRubyString__17dMsgScrn3Select_cFPcPcPc(); -extern "C" void translate__17dMsgScrn3Select_cFff(); -extern "C" void draw__17dMsgScrn3Select_cFff(); -extern "C" void selAnimeInit__17dMsgScrn3Select_cFUcUcUcfUc(); -extern "C" void selAnimeMove__17dMsgScrn3Select_cFUcUcb(); -extern "C" void selAnimeEnd__17dMsgScrn3Select_cFv(); -extern "C" void getTextBoxWidth__17dMsgScrn3Select_cFv(); -extern "C" void getFontSize__17dMsgScrn3Select_cFv(); -extern "C" void getRubyFontSize__17dMsgScrn3Select_cFv(); -extern "C" void getCharSpace__17dMsgScrn3Select_cFv(); -extern "C" void getRubyCharSpace__17dMsgScrn3Select_cFv(); -extern "C" void getTextBoxGlobalPosX__17dMsgScrn3Select_cFi(); -extern "C" void getTextBoxGlobalPosY__17dMsgScrn3Select_cFi(); -extern "C" void open1Proc__17dMsgScrn3Select_cFv(); -extern "C" void open2Proc__17dMsgScrn3Select_cFv(); -extern "C" void waitProc__17dMsgScrn3Select_cFv(); -extern "C" void selectProc__17dMsgScrn3Select_cFv(); -extern "C" void changeProc__17dMsgScrn3Select_cFv(); -extern "C" void closeProc__17dMsgScrn3Select_cFv(); -extern "C" void selectScale__17dMsgScrn3Select_cFv(); -extern "C" void selectTrans__17dMsgScrn3Select_cFv(); -extern "C" void selectAnimeTransform__17dMsgScrn3Select_cFi(); -extern "C" void __sinit_d_msg_scrn_3select_cpp(); -extern "C" extern char const* const msg_scrn_d_msg_scrn_3select__stringBase0; - -// -// External References: -// - -extern "C" void mDoExt_getMesgFont__Fv(); -extern "C" void __ct__16dSelect_cursor_cFUcfP10JKRArchive(); -extern "C" void setPos__16dSelect_cursor_cFffP7J2DPaneb(); -extern "C" void setParam__16dSelect_cursor_cFfffff(); -extern "C" void setAlphaRate__16dSelect_cursor_cFf(); -extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void getGlobalPosX__8CPaneMgrFv(); -extern "C" void getGlobalPosY__8CPaneMgrFv(); -extern "C" void paneTrans__8CPaneMgrFff(); -extern "C" void paneScale__8CPaneMgrFff(); -extern "C" void getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs(); -extern "C" void dPaneClass_showNullPane__FP9J2DScreen(); -extern "C" void show__13CPaneMgrAlphaFv(); -extern "C" void hide__13CPaneMgrAlphaFv(); -extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(); -extern "C" void getBounds__7J2DPaneFv(); -extern "C" void animationTransform__7J2DPaneFv(); -extern "C" void __ct__9J2DScreenFv(); -extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive(); -extern "C" void draw__9J2DScreenFffPC14J2DGrafContext(); -extern "C" void animation__9J2DScreenFv(); -extern "C" void getStringPtr__10J2DTextBoxCFv(); -extern "C" void setString__10J2DTextBoxFsPCce(); -extern "C" void load__20J2DAnmLoaderDataBaseFPCv(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_20(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_20(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); extern "C" extern void* __vt__10J2DAnmBase[4]; extern "C" extern void* __vt__10JUTNameTab[3]; extern "C" extern void* __vt__14J2DAnmColorKey[5]; extern "C" extern void* __vt__11J2DAnmColor[5]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80399708-80399828 025D68 0120+00 1/1 0/0 0/0 .rodata tag_name$3763 */ -SECTION_RODATA static u8 const tag_name[288] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0x5F, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0x5F, 0x67, - 0x00, 0x00, 0x00, 0x00, 0x61, 0x5F, 0x67, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0x5F, 0x6D, - 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x30, 0x30, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x30, 0x31, - 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x30, 0x32, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x30, 0x33, - 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x30, 0x34, 0x73, 0x65, 0x6C, 0x5F, 0x70, 0x6F, 0x30, 0x30, - 0x00, 0x61, 0x5F, 0x6B, 0x61, 0x68, 0x65, 0x6E, 0x61, 0x5F, 0x63, 0x75, 0x72, 0x73, 0x6F, 0x72, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x5F, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x5F, 0x67, - 0x00, 0x00, 0x00, 0x00, 0x62, 0x5F, 0x67, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x5F, 0x6D, - 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x30, 0x37, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x30, 0x36, - 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x30, 0x35, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x30, 0x38, - 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x30, 0x39, 0x73, 0x65, 0x6C, 0x5F, 0x70, 0x6F, 0x30, 0x31, - 0x00, 0x62, 0x5F, 0x6B, 0x61, 0x68, 0x65, 0x6E, 0x62, 0x5F, 0x63, 0x75, 0x72, 0x73, 0x6F, 0x72, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5F, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5F, 0x67, - 0x00, 0x00, 0x00, 0x00, 0x63, 0x5F, 0x67, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5F, 0x6D, - 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x31, 0x32, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x31, 0x31, - 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x31, 0x30, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x31, 0x33, - 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x31, 0x34, 0x73, 0x65, 0x6C, 0x5F, 0x70, 0x6F, 0x30, 0x32, - 0x00, 0x63, 0x5F, 0x6B, 0x61, 0x68, 0x65, 0x6E, 0x63, 0x5F, 0x63, 0x75, 0x72, 0x73, 0x6F, 0x72, -}; -COMPILER_STRIP_GATE(0x80399708, &tag_name); - -/* 80399840-80399840 025EA0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399840 = "zelda_window_3menu.blo"; -SECTION_DEAD static char const* const stringBase_80399857 = "zelda_window_3menu.bck"; -SECTION_DEAD static char const* const stringBase_8039986E = "zelda_window_3menu.bpk"; -SECTION_DEAD static char const* const stringBase_80399885 = "zelda_window_3menu.btk"; -SECTION_DEAD static char const* const stringBase_8039989C = ""; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039989D = "\0\0"; -#pragma pop +extern "C" extern dMsgObject_HIO_c g_MsgObject_HIO_c; /* 803C0C00-803C0C0C 01DD20 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -/* 803C0C0C-803C0C18 -00001 000C+00 0/1 0/0 0/0 .data @3754 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3754[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)open1Proc__17dMsgScrn3Select_cFv, -}; -#pragma pop - -/* 803C0C18-803C0C24 -00001 000C+00 0/1 0/0 0/0 .data @3755 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3755[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)open2Proc__17dMsgScrn3Select_cFv, -}; -#pragma pop - -/* 803C0C24-803C0C30 -00001 000C+00 0/1 0/0 0/0 .data @3756 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3756[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)waitProc__17dMsgScrn3Select_cFv, -}; -#pragma pop - -/* 803C0C30-803C0C3C -00001 000C+00 0/1 0/0 0/0 .data @3757 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3757[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)selectProc__17dMsgScrn3Select_cFv, -}; -#pragma pop - -/* 803C0C3C-803C0C48 -00001 000C+00 0/1 0/0 0/0 .data @3758 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3758[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)changeProc__17dMsgScrn3Select_cFv, -}; -#pragma pop - -/* 803C0C48-803C0C54 -00001 000C+00 0/1 0/0 0/0 .data @3759 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3759[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)closeProc__17dMsgScrn3Select_cFv, -}; -#pragma pop - /* 803C0C54-803C0CA0 01DD74 0048+04 2/3 0/0 0/0 .data process */ -SECTION_DATA static u8 process[72 + 4 /* padding */] = { - 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, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, +typedef void (dMsgScrn3Select_c::*processFn)(); +processFn process[] = { + &dMsgScrn3Select_c::open1Proc, &dMsgScrn3Select_c::open2Proc, &dMsgScrn3Select_c::waitProc, + &dMsgScrn3Select_c::selectProc, &dMsgScrn3Select_c::changeProc, &dMsgScrn3Select_c::closeProc, }; -/* 803C0CA0-803C0CE8 01DDC0 0018+30 0/0 0/0 0/0 .data tag_n$4921 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 tag_n[24 + 48 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x61, - 0x5F, - 0x74, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x62, - 0x5F, - 0x74, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x63, - 0x5F, - 0x74, - /* padding */ - 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, -}; -#pragma pop - -/* 803C0CE8-803C0CF8 01DE08 000C+04 2/2 0/0 0/0 .data __vt__17dMsgScrn3Select_c */ -SECTION_DATA extern void* __vt__17dMsgScrn3Select_c[3 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__17dMsgScrn3Select_cFv, - /* padding */ - NULL, -}; - -/* 80454B58-80454B5C 003158 0004+00 8/8 0/0 0/0 .sdata2 @3909 */ -SECTION_SDATA2 static u8 lit_3909[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80454B5C-80454B60 00315C 0004+00 4/4 0/0 0/0 .sdata2 @3910 */ -SECTION_SDATA2 static f32 lit_3910 = 190.0f; - -/* 80454B60-80454B64 003160 0004+00 10/10 0/0 0/0 .sdata2 @3911 */ -SECTION_SDATA2 static f32 lit_3911 = 1.0f; - /* 802390B4-802398CC 2339F4 0818+00 0/0 4/4 0/0 .text __ct__17dMsgScrn3Select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgScrn3Select_c::dMsgScrn3Select_c() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/__ct__17dMsgScrn3Select_cFv.s" +dMsgScrn3Select_c::dMsgScrn3Select_c() { + static u64 const tag_name[3][12] = { + // A + 'a_n', 'a_g', 'a_gr', 'a_m', 'w_yes_00', 'w_yes_01', 'w_yes_02', 'w_yes_03', 'w_yes_04', + 'sel_po00', 'a_kahen', 'a_cursor', + + // B + 'b_n', 'b_g', 'b_gr', 'b_m', 'w_yes_07', 'w_yes_06', 'w_yes_05', 'w_yes_08', 'w_yes_09', + 'sel_po01', 'b_kahen', 'b_cursor', + + // C + 'c_n', 'c_g', 'c_gr', 'c_m', 'w_yes_12', 'w_yes_11', 'w_yes_10', 'w_yes_13', 'w_yes_14', + 'sel_po02', 'c_kahen', 'c_cursor' + }; + + // tag_n and following data are unused so unsure how this data is properly setup + static u64 tag_n[] = {'a_t', 'b_t', 'c_t'}; + static u32 unkdata[9] = {0}; + + mpScreen = new J2DScreen(); + JUT_ASSERT(mpScreen != 0); + + bool fg = mpScreen->setPriority("zelda_window_3menu.blo", 0x20000, dComIfGp_getMsgArchive(0)); + JUT_ASSERT(fg != false); + dPaneClass_showNullPane(mpScreen); + + OSInitFastCast(); + + mpAnmBck = (J2DAnmTransform*)J2DAnmLoaderDataBase::load( + JKRGetNameResource("zelda_window_3menu.bck", dComIfGp_getMsgArchive(0))); + mBckFrame = 0.0f; + mBckFrame = 190.0f; + mOffsetX = 0.0f; + + mpAnmBpk = (J2DAnmColor*)J2DAnmLoaderDataBase::load( + JKRGetNameResource("zelda_window_3menu.bpk", dComIfGp_getMsgArchive(0))); + mpAnmBpk->searchUpdateMaterialID(mpScreen); + mBpkFrame = 0.0f; + + mpAnmBtk = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load( + JKRGetNameResource("zelda_window_3menu.btk", dComIfGp_getMsgArchive(0))); + mpAnmBtk->searchUpdateMaterialID(mpScreen); + mBtkFrame = 0.0f; + + mpSelectCursor = new dSelect_cursor_c(0, 1.0f, NULL); + JUT_ASSERT(mpSelectCursor != 0); + mpSelectCursor->setAlphaRate(0.0f); + + mpParent = new CPaneMgr(mpScreen, 'abc_n', 0, NULL); + JUT_ASSERT(mpParent != 0); + + for (int i = 0; i < 3; i++) { + mCursorPos[i].x = 0.0f; + mCursorPos[i].y = 0.0f; + mCursorPos[i].z = 0.0f; + + mpSel_c[i] = new CPaneMgr(mpScreen, tag_name[i][0], 0, NULL); + JUT_ASSERT(mpSel_c[i] != 0); + mpSel_c[i]->hide(); + + mpSelCld_c[i] = new CPaneMgr(mpScreen, tag_name[i][1], 0, NULL); + JUT_ASSERT(mpSelCld_c[i] != 0); + mpSelCld_c[i]->getPanePtr()->setAnimation(mpAnmBtk); + + mpSelCldr_c[i] = new CPaneMgr(mpScreen, tag_name[i][2], 0, NULL); + JUT_ASSERT(mpSelCldr_c[i] != 0); + mpSelCldr_c[i]->getPanePtr()->setAnimation(mpAnmBtk); + + mpSelCldm_c[i] = new CPaneMgr(mpScreen, tag_name[i][3], 0, NULL); + JUT_ASSERT(mpSelCldm_c[i] != 0); + mpSelCldm_c[i]->getPanePtr()->setAnimation(mpAnmBpk); + + for (int j = 0; j < 5; j++) { + mpSelCldw_c[j][i] = new CPaneMgr(mpScreen, tag_name[i][4 + j], 0, NULL); + JUT_ASSERT(mpSelCldw_c[j][i] != 0); + } + + mpSelPo_c[i] = new CPaneMgr(mpScreen, tag_name[i][9], 0, NULL); + JUT_ASSERT(mpSelPo_c[i] != 0); + mpSelPo_c[i]->hide(); + + mpKahen_c[i] = new CPaneMgr(mpScreen, tag_name[i][10], 0, NULL); + JUT_ASSERT(mpKahen_c[i] != 0); + + mpCursor_c[i] = new CPaneMgr(mpScreen, tag_name[i][11], 0, NULL); + JUT_ASSERT(mpCursor_c[i] != 0); + mCursorPos[i] = mpCursor_c[i]->getGlobalVtxCenter(true, 0); + } + + mpTmSel_c[0] = new CPaneMgr(mpScreen, 'a_t_e', 0, NULL); + JUT_ASSERT(mpTmSel_c[0] != 0); + + mpTmSel_c[1] = new CPaneMgr(mpScreen, 'b_t_e', 0, NULL); + JUT_ASSERT(mpTmSel_c[1] != 0); + + mpTmSel_c[2] = new CPaneMgr(mpScreen, 'c_t_e', 0, NULL); + JUT_ASSERT(mpTmSel_c[2] != 0); + + for (int i = 0; i < 3; i++) { + ((J2DTextBox*)(mpTmSel_c[i]->getPanePtr()))->setString(64, ""); + ((J2DTextBox*)(mpTmSel_c[i]->getPanePtr()))->setFont(mDoExt_getMesgFont()); + mpTmrSel_c[i] = NULL; + } + + mpScreen->search('a_t_e')->show(); + mpScreen->search('b_t_e')->show(); + mpScreen->search('c_t_e')->show(); + mpScreen->search('a_tf')->hide(); + mpScreen->search('b_tf')->hide(); + mpScreen->search('c_tf')->hide(); + mpScreen->search('a_tf_f')->hide(); + mpScreen->search('b_tf_f')->hide(); + mpScreen->search('c_tf_f')->hide(); + mpScreen->search('a_t')->hide(); + mpScreen->search('b_t')->hide(); + mpScreen->search('c_t')->hide(); + + mSelMsgCol = static_cast(mpTmSel_c[0]->getPanePtr())->getWhite(); + + mBaseWidth = 0.0f; + mWidth = 1.0f; + field_0x108 = 0; + mSelNo = 0; + mLastSelNo = 0; + field_0x110 = 0; + mSelNum = 0; + mSelWaitTimer = 0; + field_0x10c = 0; + field_0x112 = 0; + mProcess = PROC_MAX_e; + field_0x115 = 0xFF; + field_0x116 = 0xFF; + field_0x117 = 0; + + mSelMsgInactiveCol.set(0xFF, 0xFF, 0xFF, 0xFF); } -#pragma pop /* 802398CC-80239BE0 23420C 0314+00 1/0 0/0 0/0 .text __dt__17dMsgScrn3Select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgScrn3Select_c::~dMsgScrn3Select_c() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/__dt__17dMsgScrn3Select_cFv.s" +dMsgScrn3Select_c::~dMsgScrn3Select_c() { + delete mpScreen; + mpScreen = NULL; + + delete mpAnmBck; + mpAnmBck = NULL; + + delete mpAnmBpk; + mpAnmBpk = NULL; + + delete mpAnmBtk; + mpAnmBtk = NULL; + + delete mpSelectCursor; + mpSelectCursor = NULL; + + delete mpParent; + mpParent = NULL; + + for (int i = 0; i < 3; i++) { + delete mpSel_c[i]; + mpSel_c[i] = NULL; + + delete mpSelCld_c[i]; + mpSelCld_c[i] = NULL; + + delete mpSelCldr_c[i]; + mpSelCldr_c[i] = NULL; + + delete mpSelCldm_c[i]; + mpSelCldm_c[i] = NULL; + + delete mpTmSel_c[i]; + mpTmSel_c[i] = NULL; + + delete mpKahen_c[i]; + mpKahen_c[i] = NULL; + + delete mpCursor_c[i]; + mpCursor_c[i] = NULL; + + if (mpTmrSel_c[i] != NULL) { + delete mpTmrSel_c[i]; + mpTmrSel_c[i] = NULL; + } + + for (int j = 0; j < 5; j++) { + delete mpSelCldw_c[j][i]; + mpSelCldw_c[j][i] = NULL; + } + + delete mpSelPo_c[i]; + mpSelPo_c[i] = NULL; + } } -#pragma pop /* 80239BE0-80239C64 234520 0084+00 0/0 1/0 0/0 .text __dt__14J2DAnmColorKeyFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J2DAnmColorKey::~J2DAnmColorKey() { +// asm J2DAnmColorKey::~J2DAnmColorKey() { +extern "C" asm void __dt__14J2DAnmColorKeyFv() { nofralloc #include "asm/msg/scrn/d_msg_scrn_3select/__dt__14J2DAnmColorKeyFv.s" } #pragma pop /* 80239C64-80239C78 2345A4 0014+00 0/0 5/5 0/0 .text isSelect__17dMsgScrn3Select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMsgScrn3Select_c::isSelect() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/isSelect__17dMsgScrn3Select_cFv.s" +bool dMsgScrn3Select_c::isSelect() { + return mProcess == PROC_SELECT_e ? TRUE : FALSE; } -#pragma pop /* 80239C78-80239D08 2345B8 0090+00 0/0 5/5 0/0 .text setString__17dMsgScrn3Select_cFPcPcPc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::setString(char* param_0, char* param_1, char* param_2) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/setString__17dMsgScrn3Select_cFPcPcPc.s" +void dMsgScrn3Select_c::setString(char* mpText0, char* mpText1, char* mpText2) { + if (mpTmSel_c[0] != NULL) { + JUT_ASSERT(((J2DTextBox*)(mpTmSel_c[0]->getPanePtr()))->getStringAllocByte() > + std::strlen(mpText0)); + } + + if (mpTmSel_c[1] != NULL) { + JUT_ASSERT(((J2DTextBox*)(mpTmSel_c[1]->getPanePtr()))->getStringAllocByte() > + std::strlen(mpText1)); + } + + if (mpTmSel_c[2] != NULL) { + JUT_ASSERT(((J2DTextBox*)(mpTmSel_c[2]->getPanePtr()))->getStringAllocByte() > + std::strlen(mpText2)); + } + + if (mpTmSel_c[0] != NULL) { + std::strcpy(((J2DTextBox*)(mpTmSel_c[0]->getPanePtr()))->getStringPtr(), mpText0); + } + + if (mpTmSel_c[1] != NULL) { + std::strcpy(((J2DTextBox*)(mpTmSel_c[1]->getPanePtr()))->getStringPtr(), mpText1); + } + + if (mpTmSel_c[2] != NULL) { + std::strcpy(((J2DTextBox*)(mpTmSel_c[2]->getPanePtr()))->getStringPtr(), mpText2); + } } -#pragma pop /* 80239D08-80239D98 234648 0090+00 0/0 5/5 0/0 .text setRubyString__17dMsgScrn3Select_cFPcPcPc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::setRubyString(char* param_0, char* param_1, char* param_2) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/setRubyString__17dMsgScrn3Select_cFPcPcPc.s" +void dMsgScrn3Select_c::setRubyString(char* pText0, char* pText1, char* pText2) { + if (mpTmrSel_c[0] != NULL) { + JUT_ASSERT(((J2DTextBox*)(mpTmrSel_c[0]->getPanePtr()))->getStringAllocByte() > + std::strlen(pText0)); + } + + if (mpTmrSel_c[1] != NULL) { + JUT_ASSERT(((J2DTextBox*)(mpTmrSel_c[1]->getPanePtr()))->getStringAllocByte() > + std::strlen(pText1)); + } + + if (mpTmrSel_c[2] != NULL) { + JUT_ASSERT(((J2DTextBox*)(mpTmrSel_c[2]->getPanePtr()))->getStringAllocByte() > + std::strlen(pText2)); + } + + if (mpTmrSel_c[0] != NULL) { + std::strcpy(((J2DTextBox*)(mpTmrSel_c[0]->getPanePtr()))->getStringPtr(), pText0); + } + + if (mpTmrSel_c[1] != NULL) { + std::strcpy(((J2DTextBox*)(mpTmrSel_c[1]->getPanePtr()))->getStringPtr(), pText1); + } + + if (mpTmrSel_c[2] != NULL) { + std::strcpy(((J2DTextBox*)(mpTmrSel_c[2]->getPanePtr()))->getStringPtr(), pText2); + } } -#pragma pop /* 80239D98-80239DD4 2346D8 003C+00 0/0 5/5 0/0 .text translate__17dMsgScrn3Select_cFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::translate(f32 param_0, f32 param_1) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/translate__17dMsgScrn3Select_cFff.s" +void dMsgScrn3Select_c::translate(f32 i_x, f32 i_y) { + mpParent->translate(i_x, i_y); } -#pragma pop - -/* ############################################################################################## */ -/* 80454B64-80454B68 003164 0004+00 2/2 0/0 0/0 .sdata2 @4154 */ -SECTION_SDATA2 static f32 lit_4154 = 0.5f; - -/* 80454B68-80454B6C 003168 0004+00 1/1 0/0 0/0 .sdata2 @4155 */ -SECTION_SDATA2 static f32 lit_4155 = 3.0f; - -/* 80454B6C-80454B70 00316C 0004+00 1/1 0/0 0/0 .sdata2 @4156 */ -SECTION_SDATA2 static f32 lit_4156 = 9.0f / 10.0f; - -/* 80454B70-80454B74 003170 0004+00 1/1 0/0 0/0 .sdata2 @4157 */ -SECTION_SDATA2 static f32 lit_4157 = 7.0f / 10.0f; - -/* 80454B74-80454B78 003174 0004+00 1/1 0/0 0/0 .sdata2 @4158 */ -SECTION_SDATA2 static f32 lit_4158 = 1.0f / 20.0f; /* 80239DD4-8023A094 234714 02C0+00 0/0 5/5 0/0 .text draw__17dMsgScrn3Select_cFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::draw(f32 param_0, f32 param_1) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/draw__17dMsgScrn3Select_cFff.s" +void dMsgScrn3Select_c::draw(f32 i_xPos, f32 i_yPos) { + J2DGrafContext* port = dComIfGp_getCurrentGrafPort(); + port->setup2D(); + + if (mSelMsgInactiveCol.r != g_MsgObject_HIO_c.mSelMsgInactiveCol.r || + mSelMsgInactiveCol.g != g_MsgObject_HIO_c.mSelMsgInactiveCol.g || + mSelMsgInactiveCol.b != g_MsgObject_HIO_c.mSelMsgInactiveCol.b) + { + mSelMsgInactiveCol.r = g_MsgObject_HIO_c.mSelMsgInactiveCol.r; + mSelMsgInactiveCol.g = g_MsgObject_HIO_c.mSelMsgInactiveCol.g; + mSelMsgInactiveCol.b = g_MsgObject_HIO_c.mSelMsgInactiveCol.b; + + for (int i = 0; i < 3; i++) { + if (i == mSelNo) { + ((J2DTextBox*)(mpTmSel_c[i]->getPanePtr()))->setWhite(mSelMsgCol); + + if (mpTmrSel_c[i] != NULL) { + ((J2DTextBox*)(mpTmrSel_c[i]->getPanePtr()))->setWhite(mSelMsgCol); + } + } else { + ((J2DTextBox*)(mpTmSel_c[i]->getPanePtr()))->setWhite(mSelMsgInactiveCol); + + if (mpTmrSel_c[i] != NULL) { + ((J2DTextBox*)(mpTmrSel_c[i]->getPanePtr()))->setWhite(mSelMsgInactiveCol); + } + } + } + } + + mpScreen->draw(i_xPos, i_yPos, port); + + if (field_0x110 != 0xFF && mSelNo != 0xFF && field_0x117 != 0) { + f32 var_f31 = (mWidth - 1.0f) * (mpCursor_c[mSelNo]->getInitCenterPosX() - + mpSelCldw_c[1][mSelNo]->getInitPosX()); + if (mWidth == 1.0f) { + var_f31 -= 3.0f; + } + + Vec center = mpCursor_c[mSelNo]->getGlobalVtxCenter(true, 0); + mpSelectCursor->setPos(mOffsetX + (mCursorPos[mSelNo].x + var_f31), center.y, + mpCursor_c[mSelNo]->getPanePtr(), true); + mpSelectCursor->setParam(0.9f, 0.7f, 0.05f, 0.5f, 0.5f); + mpSelectCursor->draw(); + } } -#pragma pop /* 8023A094-8023A398 2349D4 0304+00 0/0 5/5 0/0 .text selAnimeInit__17dMsgScrn3Select_cFUcUcUcfUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::selAnimeInit(u8 param_0, u8 param_1, u8 param_2, f32 param_3, - u8 param_4) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/selAnimeInit__17dMsgScrn3Select_cFUcUcUcfUc.s" -} -#pragma pop +void dMsgScrn3Select_c::selAnimeInit(u8 i_selNum, u8 i_selNo, u8 param_2, f32 i_width, u8 param_4) { + mSelNo = i_selNo; + field_0x110 = i_selNo; + mSelNum = i_selNum; + mLastSelNo = mSelNo; + field_0x114 = 0; + mSelWaitTimer = 0; + field_0x10c = 0; + field_0x112 = param_4; -/* ############################################################################################## */ -/* 80454B78-80454B80 003178 0008+00 2/2 0/0 0/0 .sdata2 @4345 */ -SECTION_SDATA2 static f64 lit_4345 = 4503601774854144.0 /* cast s32 to float */; + for (int i = 0; i < 3; i++) { + mpKahen_c[i]->paneScale(1.0f, 1.0f); + mpCursor_c[i]->paneScale(1.0f, 1.0f); + mpSelCldw_c[2][i]->paneScale(1.0f, 1.0f); + mpSelCldw_c[3][i]->paneScale(1.0f, 1.0f); + mpSelCld_c[i]->paneScale(1.0f, 1.0f); + mpSelCldr_c[i]->paneScale(1.0f, 1.0f); + mpSelCldm_c[i]->paneScale(1.0f, 1.0f); + mpTmSel_c[i]->paneScale(1.0f, 1.0f); + + if (mpTmrSel_c[i] != NULL) { + mpTmrSel_c[i]->paneScale(1.0f, 1.0f); + } + } + + mBaseWidth = i_width; + if (mBaseWidth > mpTmSel_c[0]->getInitSizeX()) { + mWidth = mBaseWidth / mpTmSel_c[0]->getInitSizeX(); + } else { + mWidth = 1.0f; + } + + switch (i_selNum) { + case 2: + mpSel_c[0]->hide(); + mpSel_c[1]->show(); + mpSel_c[2]->show(); + + if (param_2 == 1) { + mpParent->paneTrans(0.0f, mpSel_c[0]->getInitPosY() - mpSel_c[1]->getInitPosY()); + } else { + mpParent->paneTrans(0.0f, 0.0f); + } + break; + case 3: + mpSel_c[0]->show(); + mpSel_c[1]->show(); + mpSel_c[2]->show(); + mpParent->paneTrans(0.0f, 0.0f); + break; + } + + mBckFrame = 190.0f; + + for (int i = 0; i < 3; i++) { + selectAnimeTransform(i); + } + + selectScale(); + selectTrans(); + + for (int i = 0; i < 3; i++) { + if (i == mSelNo) { + ((J2DTextBox*)(mpTmSel_c[i]->getPanePtr()))->setWhite(mSelMsgCol); + + if (mpTmrSel_c[i] != NULL) { + ((J2DTextBox*)(mpTmrSel_c[i]->getPanePtr()))->setWhite(mSelMsgCol); + } + } else { + ((J2DTextBox*)(mpTmSel_c[i]->getPanePtr()))->setWhite(mSelMsgInactiveCol); + + if (mpTmrSel_c[i] != NULL) { + ((J2DTextBox*)(mpTmrSel_c[i]->getPanePtr()))->setWhite(mSelMsgInactiveCol); + } + } + } + + mProcess = PROC_OPEN1_e; +} /* 8023A398-8023A680 234CD8 02E8+00 0/0 5/5 0/0 .text selAnimeMove__17dMsgScrn3Select_cFUcUcb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::selAnimeMove(u8 param_0, u8 param_1, bool param_2) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/selAnimeMove__17dMsgScrn3Select_cFUcUcb.s" -} -#pragma pop +BOOL dMsgScrn3Select_c::selAnimeMove(u8 i_selNum, u8 param_1, bool param_2) { + field_0x110 = param_1; + mSelNum = i_selNum; + field_0x114 = 0; + field_0x108 = param_2; -/* ############################################################################################## */ -/* 80454B80-80454B84 003180 0004+00 2/2 0/0 0/0 .sdata2 @4434 */ -SECTION_SDATA2 static f32 lit_4434 = 199.0f; + (this->*process[mProcess])(); + + mBpkFrame++; + if (mBpkFrame >= mpAnmBpk->getFrameMax()) { + mBpkFrame -= mpAnmBpk->getFrameMax(); + } + mpAnmBpk->setFrame(mBpkFrame); + + mBtkFrame++; + if (mBtkFrame >= mpAnmBtk->getFrameMax()) { + mBtkFrame -= mpAnmBtk->getFrameMax(); + } + mpAnmBtk->setFrame(mBtkFrame); + + mpScreen->animation(); + + for (int i = 0; i < 3; i++) { + if (i == mSelNo) { + mpSelCld_c[i]->getPanePtr()->scale(1.0f, 1.0f); + mpSelCldr_c[i]->getPanePtr()->scale(1.0f, 1.0f); + } else { + mpSelCld_c[i]->getPanePtr()->scale(0.0f, 0.0f); + mpSelCldr_c[i]->getPanePtr()->scale(0.0f, 0.0f); + } + } + + selectTrans(); + + for (int i = 0; i < 3; i++) { + if (i == mSelNo) { + ((J2DTextBox*)(mpTmSel_c[i]->getPanePtr()))->setWhite(mSelMsgCol); + + if (mpTmrSel_c[i] != NULL) { + ((J2DTextBox*)(mpTmrSel_c[i]->getPanePtr()))->setWhite(mSelMsgCol); + } + } else { + ((J2DTextBox*)(mpTmSel_c[i]->getPanePtr()))->setWhite(mSelMsgInactiveCol); + + if (mpTmrSel_c[i] != NULL) { + ((J2DTextBox*)(mpTmrSel_c[i]->getPanePtr()))->setWhite(mSelMsgInactiveCol); + } + } + } + + return mProcess == PROC_SELECT_e; +} /* 8023A680-8023A934 234FC0 02B4+00 0/0 9/9 0/0 .text selAnimeEnd__17dMsgScrn3Select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMsgScrn3Select_c::selAnimeEnd() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/selAnimeEnd__17dMsgScrn3Select_cFv.s" +bool dMsgScrn3Select_c::selAnimeEnd() { + if (mProcess == PROC_MAX_e) { + return true; + } + + field_0x114 = 0; + + if (mProcess != PROC_CLOSE_e) { + mBckFrame = 199.0f; + + for (int i = 0; i < 3; i++) { + f32 scale_x = mpSel_c[i]->getPanePtr()->getScaleX(); + f32 scale_y = mpSel_c[i]->getPanePtr()->getScaleY(); + + selectAnimeTransform(i); + mpSel_c[i]->getPanePtr()->scale(scale_x, scale_y); + } + + mProcess = PROC_CLOSE_e; + field_0x117 = 0; + } + + (this->*process[mProcess])(); + + mBpkFrame++; + if (mBpkFrame >= mpAnmBpk->getFrameMax()) { + mBpkFrame -= mpAnmBpk->getFrameMax(); + } + mpAnmBpk->setFrame(mBpkFrame); + + mBtkFrame++; + if (mBtkFrame >= mpAnmBtk->getFrameMax()) { + mBtkFrame -= mpAnmBtk->getFrameMax(); + } + mpAnmBtk->setFrame(mBtkFrame); + + mpScreen->animation(); + + for (int i = 0; i < 3; i++) { + if (i == mSelNo) { + mpSelCld_c[i]->getPanePtr()->scale(1.0f, 1.0f); + mpSelCldr_c[i]->getPanePtr()->scale(1.0f, 1.0f); + } else { + mpSelCld_c[i]->getPanePtr()->scale(0.0f, 0.0f); + mpSelCldr_c[i]->getPanePtr()->scale(0.0f, 0.0f); + } + } + + selectTrans(); + return mProcess == PROC_MAX_e ? TRUE : FALSE; } -#pragma pop /* 8023A934-8023A94C 235274 0018+00 0/0 5/5 0/0 .text getTextBoxWidth__17dMsgScrn3Select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 dMsgScrn3Select_c::getTextBoxWidth() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/getTextBoxWidth__17dMsgScrn3Select_cFv.s" +f32 dMsgScrn3Select_c::getTextBoxWidth() { + return mpTmSel_c[0]->getSizeX(); } -#pragma pop /* 8023A94C-8023A95C 23528C 0010+00 0/0 5/5 0/0 .text getFontSize__17dMsgScrn3Select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 dMsgScrn3Select_c::getFontSize() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/getFontSize__17dMsgScrn3Select_cFv.s" +f32 dMsgScrn3Select_c::getFontSize() { + J2DTextBox::TFontSize font_size; + ((J2DTextBox*)mpTmSel_c[0]->getPanePtr())->getFontSize(font_size); + return font_size.mSizeX; } -#pragma pop /* 8023A95C-8023A97C 23529C 0020+00 0/0 2/2 0/0 .text getRubyFontSize__17dMsgScrn3Select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::getRubyFontSize() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/getRubyFontSize__17dMsgScrn3Select_cFv.s" +f32 dMsgScrn3Select_c::getRubyFontSize() { + if (mpTmrSel_c[0] != NULL) { + J2DTextBox::TFontSize font_size; + ((J2DTextBox*)mpTmrSel_c[0]->getPanePtr())->getFontSize(font_size); + return font_size.mSizeX; + } + + return 0.0f; } -#pragma pop /* 8023A97C-8023A98C 2352BC 0010+00 0/0 5/5 0/0 .text getCharSpace__17dMsgScrn3Select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 dMsgScrn3Select_c::getCharSpace() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/getCharSpace__17dMsgScrn3Select_cFv.s" +f32 dMsgScrn3Select_c::getCharSpace() { + return ((J2DTextBox*)mpTmSel_c[0]->getPanePtr())->getCharSpace(); } -#pragma pop /* 8023A98C-8023A9AC 2352CC 0020+00 0/0 2/2 0/0 .text getRubyCharSpace__17dMsgScrn3Select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::getRubyCharSpace() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/getRubyCharSpace__17dMsgScrn3Select_cFv.s" +f32 dMsgScrn3Select_c::getRubyCharSpace() { + if (mpTmrSel_c[0] != NULL) { + return ((J2DTextBox*)mpTmrSel_c[0]->getPanePtr())->getCharSpace(); + } + + return 0.0f; } -#pragma pop /* 8023A9AC-8023A9D8 2352EC 002C+00 0/0 2/2 0/0 .text getTextBoxGlobalPosX__17dMsgScrn3Select_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::getTextBoxGlobalPosX(int param_0) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/getTextBoxGlobalPosX__17dMsgScrn3Select_cFi.s" +f32 dMsgScrn3Select_c::getTextBoxGlobalPosX(int i_sel) { + return mpTmSel_c[i_sel]->getGlobalPosX(); } -#pragma pop /* 8023A9D8-8023AA04 235318 002C+00 0/0 2/2 0/0 .text getTextBoxGlobalPosY__17dMsgScrn3Select_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::getTextBoxGlobalPosY(int param_0) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/getTextBoxGlobalPosY__17dMsgScrn3Select_cFi.s" +f32 dMsgScrn3Select_c::getTextBoxGlobalPosY(int i_sel) { + return mpTmSel_c[i_sel]->getGlobalPosY(); } -#pragma pop - -/* ############################################################################################## */ -/* 80399828-80399834 025E88 000C+00 1/1 0/0 0/0 .rodata @4497 */ -SECTION_RODATA static u8 const lit_4497[12] = { - 0x43, 0x4C, 0x00, 0x00, 0x43, 0x98, 0x00, 0x00, 0x43, 0xCA, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80399828, &lit_4497); /* 8023AA04-8023AAF4 235344 00F0+00 1/0 0/0 0/0 .text open1Proc__17dMsgScrn3Select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::open1Proc() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/open1Proc__17dMsgScrn3Select_cFv.s" -} -#pragma pop +void dMsgScrn3Select_c::open1Proc() { + f32 sel_anm_frame[3] = {204.0f, 304.0f, 404.0f}; -/* ############################################################################################## */ -/* 80399834-80399840 025E94 000C+00 1/1 0/0 0/0 .rodata @4520 */ -SECTION_RODATA static u8 const lit_4520[12] = { - 0x43, 0x4C, 0x00, 0x00, 0x43, 0x98, 0x00, 0x00, 0x43, 0xCA, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80399834, &lit_4520); + if (mSelNo != 0xFF) { + mBckFrame = sel_anm_frame[mSelNo]; + + for (int i = 0; i < 3; i++) { + f32 x = mpSel_c[i]->getPosX(); + selectAnimeTransform(i); + + mpSel_c[i]->move(x, mpSel_c[i]->getPosY()); + } + } + + mBckFrame = 190.0f; + mProcess = PROC_OPEN2_e; +} /* 8023AAF4-8023AC14 235434 0120+00 1/0 0/0 0/0 .text open2Proc__17dMsgScrn3Select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::open2Proc() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/open2Proc__17dMsgScrn3Select_cFv.s" +void dMsgScrn3Select_c::open2Proc() { + f32 sel_anm_frame[3] = {204.0f, 304.0f, 404.0f}; + + mBckFrame++; + mpSelectCursor->setAlphaRate(1.0f); + + if (mBckFrame >= 199.0f) { + if (mSelNo != 0xFF) { + mBckFrame = sel_anm_frame[mSelNo]; + } + + field_0x117 = 1; + mProcess = PROC_WAIT_e; + } + + for (int i = 0; i < 3; i++) { + f32 scale_x = mpSel_c[i]->getPanePtr()->getScaleX(); + f32 scale_y = mpSel_c[i]->getPanePtr()->getScaleY(); + + selectAnimeTransform(i); + mpSel_c[i]->getPanePtr()->scale(scale_x, scale_y); + } } -#pragma pop /* 8023AC14-8023AC44 235554 0030+00 1/0 0/0 0/0 .text waitProc__17dMsgScrn3Select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::waitProc() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/waitProc__17dMsgScrn3Select_cFv.s" +void dMsgScrn3Select_c::waitProc() { + mSelWaitTimer++; + + if (mSelWaitTimer > g_MsgObject_HIO_c.mSelWaitFrame) { + mProcess = PROC_SELECT_e; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80454B84-80454B88 003184 0004+00 2/2 0/0 0/0 .sdata2 @4604 */ -SECTION_SDATA2 static f32 lit_4604 = 303.0f; - -/* 80454B88-80454B8C 003188 0004+00 2/2 0/0 0/0 .sdata2 @4605 */ -SECTION_SDATA2 static f32 lit_4605 = 300.0f; - -/* 80454B8C-80454B90 00318C 0004+00 2/2 0/0 0/0 .sdata2 @4606 */ -SECTION_SDATA2 static f32 lit_4606 = 403.0f; - -/* 80454B90-80454B98 003190 0004+04 2/2 0/0 0/0 .sdata2 @4607 */ -SECTION_SDATA2 static f32 lit_4607[1 + 1 /* padding */] = { - 400.0f, - /* padding */ - 0.0f, -}; /* 8023AC44-8023AE68 235584 0224+00 1/0 0/0 0/0 .text selectProc__17dMsgScrn3Select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::selectProc() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/selectProc__17dMsgScrn3Select_cFv.s" +void dMsgScrn3Select_c::selectProc() { + if (mSelNo != field_0x110) { + mLastSelNo = mSelNo; + mSelNo = field_0x110; + + switch (mLastSelNo) { + case 0: + if (mSelNo == 1) { + mBckFrame = 303.0f; + selectAnimeTransform(1); + + mBckFrame = 300.0f; + selectAnimeTransform(0); + } else if (mSelNo == 2) { + mBckFrame = 403.0f; + selectAnimeTransform(2); + + mBckFrame = 400.0f; + selectAnimeTransform(0); + } + break; + case 1: + if (mSelNo == 0) { + mBckFrame = 300.0f; + selectAnimeTransform(0); + + mBckFrame = 303.0f; + selectAnimeTransform(1); + } else if (mSelNo == 2) { + mBckFrame = 403.0f; + selectAnimeTransform(2); + + mBckFrame = 400.0f; + selectAnimeTransform(1); + } + break; + case 2: + if (mSelNo == 1) { + mBckFrame = 400.0f; + selectAnimeTransform(1); + + mBckFrame = 403.0f; + selectAnimeTransform(2); + } else if (mSelNo == 0) { + mBckFrame = 300.0f; + selectAnimeTransform(0); + + mBckFrame = 303.0f; + selectAnimeTransform(2); + } + break; + case 0xFF: + if (mSelNo == 0) { + mBckFrame = 300.0f; + } else if (mSelNo == 1) { + mBckFrame = 303.0f; + } else if (mSelNo == 2) { + mBckFrame = 403.0f; + } + + for (int i = 0; i < 3; i++) { + selectAnimeTransform(i); + } + break; + } + + if (mLastSelNo != 0xFF) { + field_0x10c = 0; + mProcess = PROC_CHANGE_e; + } else { + mProcess = PROC_SELECT_e; + } + } } -#pragma pop /* 8023AE68-8023B148 2357A8 02E0+00 1/0 0/0 0/0 .text changeProc__17dMsgScrn3Select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::changeProc() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/changeProc__17dMsgScrn3Select_cFv.s" +void dMsgScrn3Select_c::changeProc() { + if (mSelNo == 0xFF) { + if (mLastSelNo == 0) { + mBckFrame = 303.0f; + selectAnimeTransform(0); + } else if (mLastSelNo == 1) { + mBckFrame = 300.0f; + selectAnimeTransform(1); + } else if (mLastSelNo == 2) { + mBckFrame = 400.0f; + selectAnimeTransform(2); + } + + mProcess = PROC_SELECT_e; + } else { + switch (mLastSelNo) { + case 0: + if (mSelNo == 1) { + if (field_0x108 != 0) { + mBckFrame = 303.0f; + } else { + mBckFrame++; + } + + selectAnimeTransform(0); + + if (mBckFrame >= 303.0f) { + mProcess = PROC_SELECT_e; + } + } else if (mSelNo == 2) { + if (field_0x108 != 0) { + mBckFrame = 403.0f; + } else { + mBckFrame++; + } + + selectAnimeTransform(0); + + if (mBckFrame >= 403.0f) { + mProcess = PROC_SELECT_e; + } + } + break; + case 1: + if (mSelNo == 0) { + if (field_0x108 != 0) { + mBckFrame = 300.0f; + } else { + mBckFrame--; + } + + selectAnimeTransform(1); + + if (mBckFrame <= 300.0f) { + mProcess = PROC_SELECT_e; + } + } else if (mSelNo == 2) { + if (field_0x108 != 0) { + mBckFrame = 403.0f; + } else { + mBckFrame++; + } + + selectAnimeTransform(1); + + if (mBckFrame >= 403.0f) { + mProcess = PROC_SELECT_e; + } + } + break; + case 2: + if (mSelNo == 1) { + if (field_0x108 != 0) { + mBckFrame = 400.0f; + } else { + mBckFrame--; + } + + selectAnimeTransform(2); + + if (mBckFrame <= 400.0f) { + mProcess = PROC_SELECT_e; + } + } else if (mSelNo == 0) { + if (field_0x108 != 0) { + mBckFrame = 300.0f; + } else { + mBckFrame--; + } + + selectAnimeTransform(2); + + if (mBckFrame <= 300.0f) { + mProcess = PROC_SELECT_e; + } + } + break; + } + } } -#pragma pop /* 8023B148-8023B228 235A88 00E0+00 1/0 0/0 0/0 .text closeProc__17dMsgScrn3Select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::closeProc() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/closeProc__17dMsgScrn3Select_cFv.s" +void dMsgScrn3Select_c::closeProc() { + mpSelectCursor->setAlphaRate(0.0f); + mBckFrame--; + + for (int i = 0; i < 3; i++) { + f32 scale_x = mpSel_c[i]->getPanePtr()->getScaleX(); + f32 scale_y = mpSel_c[i]->getPanePtr()->getScaleY(); + + selectAnimeTransform(i); + mpSel_c[i]->getPanePtr()->scale(scale_x, scale_y); + } + + if (mBckFrame <= 190.0f) { + mProcess = PROC_MAX_e; + } } -#pragma pop /* 8023B228-8023B4AC 235B68 0284+00 1/1 0/0 0/0 .text selectScale__17dMsgScrn3Select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::selectScale() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/selectScale__17dMsgScrn3Select_cFv.s" +void dMsgScrn3Select_c::selectScale() { + if (mWidth != 1.0f) { + for (int i = 0; i < 3; i++) { + f32 x; + f32 y; + + mpKahen_c[i]->paneScale(mWidth, 1.0f); + + x = (mWidth * mpCursor_c[i]->getSizeX()) / mpCursor_c[i]->getInitSizeX(); + y = mpCursor_c[i]->getSizeY() / mpCursor_c[i]->getInitSizeY(); + mpCursor_c[i]->paneScale(x, y); + + x = (mWidth * mpSelCldw_c[2][i]->getSizeX()) / mpSelCldw_c[2][i]->getInitSizeX(); + y = mpSelCldw_c[2][i]->getSizeY() / mpSelCldw_c[2][i]->getInitSizeY(); + mpSelCldw_c[2][i]->paneScale(x, y); + + f32 temp = (mWidth - 1.0f) * + (mpSelCldw_c[0][i]->getInitSizeX() + mpSelCldw_c[1][i]->getInitSizeX()); + x = ((mWidth * mpSelCldw_c[3][i]->getSizeX()) - temp) / + mpSelCldw_c[3][i]->getInitSizeX(); + y = mpSelCldw_c[3][i]->getSizeY() / mpSelCldw_c[3][i]->getInitSizeY(); + mpSelCldw_c[3][i]->paneScale(x, y); + + x = (mWidth * mpSelCld_c[i]->getSizeX()) / mpSelCld_c[i]->getInitSizeX(); + y = mpSelCld_c[i]->getSizeY() / mpSelCld_c[i]->getInitSizeY(); + mpSelCld_c[i]->paneScale(x, y); + + x = (mWidth * mpSelCldr_c[i]->getSizeX()) / mpSelCldr_c[i]->getInitSizeX(); + y = mpSelCldr_c[i]->getSizeY() / mpSelCldr_c[i]->getInitSizeY(); + mpSelCldr_c[i]->paneScale(x, y); + + x = (mWidth * mpSelCldm_c[i]->getSizeX()) / mpSelCldm_c[i]->getInitSizeX(); + y = mpSelCldm_c[i]->getSizeY() / mpSelCldm_c[i]->getInitSizeY(); + mpSelCldm_c[i]->paneScale(x, y); + + x = (mWidth * mpTmSel_c[i]->getSizeX()) / mpTmSel_c[i]->getInitSizeX(); + y = mpTmSel_c[i]->getSizeY() / mpTmSel_c[i]->getInitSizeY(); + mpTmSel_c[i]->paneScale(x, y); + + if (mpTmrSel_c[i] != NULL) { + x = (mWidth * mpTmrSel_c[i]->getSizeX()) / mpTmrSel_c[i]->getInitSizeX(); + y = mpTmrSel_c[i]->getSizeY() / mpTmrSel_c[i]->getInitSizeY(); + mpTmrSel_c[i]->paneScale(x, y); + } + } + } } -#pragma pop /* 8023B4AC-8023B870 235DEC 03C4+00 3/3 0/0 0/0 .text selectTrans__17dMsgScrn3Select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::selectTrans() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/selectTrans__17dMsgScrn3Select_cFv.s" +void dMsgScrn3Select_c::selectTrans() { + J2DTextBox::TFontSize font_size; + ((J2DTextBox*)mpTmSel_c[0]->getPanePtr())->getFontSize(font_size); + f32 var_f31 = (mpTmSel_c[0]->getSizeY() - font_size.mSizeY) * 0.5f; + + f32 sp68[3]; + for (int i = 0; i < 3; i++) { + sp68[i] = 0.0f; + } + + if (mWidth == 1.0f) { + for (int i = 0; i < 3; i++) { + if (isAnimeUpdate(i)) { + mpTmSel_c[i]->paneTrans(0.0f, var_f31 + sp68[i]); + + if (mpTmrSel_c[i] != NULL) { + mpTmrSel_c[i]->paneTrans(0.0f, var_f31 + sp68[i]); + } + } + } + } else { + for (int i = 0; i < 3; i++) { + if (isAnimeUpdate(i)) { + f32 temp_f30 = (1.0f - mWidth) * mpKahen_c[i]->getInitSizeX(); + mpKahen_c[i]->paneTrans(0.5f * temp_f30, 0.0f); + + f32 temp_f28 = ((mWidth - 1.0f) * (mpCursor_c[i]->getInitCenterPosX() - + mpSelCldw_c[1][i]->getInitPosX())); + mpCursor_c[i]->paneTrans(temp_f28 - temp_f30, 0.0f); + + f32 temp_f28_2 = ((mWidth - 1.0f) * (mpSelCldw_c[2][i]->getInitPosX() - + mpSelCldw_c[1][i]->getInitPosX())); + temp_f28_2 = temp_f28_2; // probably fake, but fixes instruction order + mpSelCldw_c[0][i]->paneTrans(temp_f28_2 - temp_f30, 0.0f); + + f32 temp_f28_3 = ((mWidth - 1.0f) * (mpSelCldw_c[2][i]->getInitCenterPosX() - + mpSelCldw_c[1][i]->getInitPosX())); + mpSelCldw_c[2][i]->paneTrans(temp_f28_3 - temp_f30, 0.0f); + + f32 temp_f28_4 = + (((1.0f - mWidth) * (0.5f * mpSelCldw_c[3][i]->getInitSizeX())) + + ((mWidth - 1.0f) * mpSelCldw_c[1][i]->getInitSizeX())); + mpSelCldw_c[3][i]->paneTrans(temp_f28_4 - temp_f30, 0.0f); + + f32 temp_f28_5 = ((mWidth - 1.0f) * (mpSelCld_c[i]->getInitCenterPosX() - + mpSelCldw_c[1][i]->getInitPosX())); + mpSelCld_c[i]->paneTrans(temp_f28_5 - temp_f30, 0.0f); + + f32 temp_f28_6 = ((mWidth - 1.0f) * (mpSelCldm_c[i]->getInitCenterPosX() - + mpSelCldw_c[1][i]->getInitPosX())); + mpSelCldm_c[i]->paneTrans(temp_f28_6 - temp_f30, 0.0f); + + f32 temp_f28_7 = ((mWidth - 1.0f) * (mpTmSel_c[i]->getInitCenterPosX() - + mpSelCldw_c[1][i]->getInitPosX())); + mpTmSel_c[i]->paneTrans(temp_f28_7 - temp_f30, var_f31 + sp68[i]); + + if (mpTmrSel_c[i] != NULL) { + f32 temp_f28_8 = ((mWidth - 1.0f) * (mpTmrSel_c[i]->getInitCenterPosX() - + mpSelCldw_c[1][i]->getInitPosX())); + mpTmrSel_c[i]->paneTrans(temp_f28_8 - temp_f30, var_f31 + sp68[i]); + } + + f32 temp_f0 = mpSelCldw_c[0][i]->getPosX(); + temp_f0 -= mpSelCldw_c[0][i]->getInitPosX(); + mpSelPo_c[i]->paneTrans(temp_f0 - temp_f30, 0.0f); + + offAnimeUpdate(i); + } + } + } } -#pragma pop /* 8023B870-8023B914 2361B0 00A4+00 7/7 0/0 0/0 .text selectAnimeTransform__17dMsgScrn3Select_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrn3Select_c::selectAnimeTransform(int param_0) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/selectAnimeTransform__17dMsgScrn3Select_cFi.s" +void dMsgScrn3Select_c::selectAnimeTransform(int i_sel) { + mpAnmBck->setFrame(mBckFrame); + mpSel_c[i_sel]->getPanePtr()->setAnimation(mpAnmBck); + mpSel_c[i_sel]->getPanePtr()->animationTransform(); + mpSel_c[i_sel]->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); + + onAnimeUpdate(i_sel); } -#pragma pop - -/* 8023B914-8023B9B4 236254 00A0+00 0/0 1/0 0/0 .text __sinit_d_msg_scrn_3select_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_msg_scrn_3select_cpp() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_3select/__sinit_d_msg_scrn_3select_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8023B914, __sinit_d_msg_scrn_3select_cpp); -#pragma pop - -/* 80399840-80399840 025EA0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/msg/d_msg_scrn_base.cpp b/src/d/msg/d_msg_scrn_base.cpp index f6577ef6f42..b9de615a6b0 100644 --- a/src/d/msg/d_msg_scrn_base.cpp +++ b/src/d/msg/d_msg_scrn_base.cpp @@ -16,7 +16,7 @@ dMsgScrnBase_c::~dMsgScrnBase_c() {} /* 8023C16C-8023C234 236AAC 00C8+00 1/1 9/9 0/0 .text init__14dMsgScrnBase_cFv */ void dMsgScrnBase_c::init() { mpScreen = NULL; - mpPmp_c = NULL; + mpPmP_c = NULL; field_0x54 = 0; for (int i = 0; i < 7; i++) { @@ -110,18 +110,18 @@ void dMsgScrnBase_c::setRubyString(char* i_string) { /* 8023C458-8023C480 236D98 0028+00 1/0 0/0 0/0 .text fukiScale__14dMsgScrnBase_cFf */ void dMsgScrnBase_c::fukiScale(f32 i_scale) { - mpPmp_c->paneScale(i_scale, i_scale); + mpPmP_c->paneScale(i_scale, i_scale); } /* 8023C480-8023C4A4 236DC0 0024+00 1/0 0/0 0/0 .text fukiTrans__14dMsgScrnBase_cFff */ void dMsgScrnBase_c::fukiTrans(f32 i_posX, f32 i_posY) { - mpPmp_c->paneTrans(i_posX, i_posY); + mpPmP_c->paneTrans(i_posX, i_posY); } /* 8023C4A4-8023C4F4 236DE4 0050+00 1/0 0/0 0/0 .text fukiAlpha__14dMsgScrnBase_cFf */ void dMsgScrnBase_c::fukiAlpha(f32 i_alpha) { fontAlpha(i_alpha); - mpPmp_c->setAlphaRate(i_alpha); + mpPmP_c->setAlphaRate(i_alpha); } /* 8023C4F4-8023C574 236E34 0080+00 1/0 5/0 0/0 .text fontAlpha__14dMsgScrnBase_cFf */ diff --git a/src/d/msg/d_msg_scrn_boss.cpp b/src/d/msg/d_msg_scrn_boss.cpp index 5943da0524f..2fda0433b06 100644 --- a/src/d/msg/d_msg_scrn_boss.cpp +++ b/src/d/msg/d_msg_scrn_boss.cpp @@ -18,8 +18,8 @@ dMsgScrnBoss_c::dMsgScrnBoss_c() { mpScreen->setPriority("zelda_boss_name.blo", 0x20000, dComIfGp_getMsgArchive(4)); dPaneClass_showNullPane(mpScreen); - mpPmp_c = new CPaneMgr(mpScreen, 'n_all', 2, NULL); - mpPmp_c->scale(g_MsgObject_HIO_c.mBossNameScaleX, g_MsgObject_HIO_c.mBossNameScaleY); + mpPmP_c = new CPaneMgr(mpScreen, 'n_all', 2, NULL); + mpPmP_c->scale(g_MsgObject_HIO_c.mBossNameScaleX, g_MsgObject_HIO_c.mBossNameScaleY); mpFontParent = new CPaneMgr(mpScreen, 's_font_n', 0, NULL); mpFontParent->scale(g_MsgObject_HIO_c.mBossNameCharSizeX, g_MsgObject_HIO_c.mBossNameCharSizeY); @@ -57,8 +57,8 @@ dMsgScrnBoss_c::~dMsgScrnBoss_c() { delete mpScreen; mpScreen = NULL; - delete mpPmp_c; - mpPmp_c = NULL; + delete mpPmP_c; + mpPmP_c = NULL; delete mpFontParent; mpFontParent = NULL; @@ -76,7 +76,7 @@ dMsgScrnBoss_c::~dMsgScrnBoss_c() { /* 8023CA88-8023CB98 2373C8 0110+00 1/0 0/0 0/0 .text exec__14dMsgScrnBoss_cFv */ void dMsgScrnBoss_c::exec() { - mpPmp_c->scale(g_MsgObject_HIO_c.mBossNameScaleX, g_MsgObject_HIO_c.mBossNameScaleY); + mpPmP_c->scale(g_MsgObject_HIO_c.mBossNameScaleX, g_MsgObject_HIO_c.mBossNameScaleY); mpFontParent->scale(g_MsgObject_HIO_c.mBossNameCharSizeX, g_MsgObject_HIO_c.mBossNameCharSizeY); mpFontParent->paneTrans(g_MsgObject_HIO_c.mBossNameCharPosX, @@ -100,7 +100,7 @@ void dMsgScrnBoss_c::drawSelf() { /* 8023CBF0-8023CC7C 237530 008C+00 1/0 0/0 0/0 .text fukiAlpha__14dMsgScrnBoss_cFf */ void dMsgScrnBoss_c::fukiAlpha(f32 i_alpha) { - mpPmp_c->setAlphaRate(i_alpha); + mpPmP_c->setAlphaRate(i_alpha); mpBaseParent->setAlphaRate(i_alpha * g_MsgObject_HIO_c.mBossNameBaseAlpha); for (int i = 0; i < 7; i++) { diff --git a/src/d/msg/d_msg_scrn_howl.cpp b/src/d/msg/d_msg_scrn_howl.cpp index 48ea72b0d92..2b5cd4fe837 100644 --- a/src/d/msg/d_msg_scrn_howl.cpp +++ b/src/d/msg/d_msg_scrn_howl.cpp @@ -451,7 +451,7 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() { JUT_ASSERT(73, fg != false); dPaneClass_showNullPane(mpScreen); mpScreen->search('line00')->hide(); - mpPmp_c = new CPaneMgr(mpScreen, 'n_all', 3, NULL); + mpPmP_c = new CPaneMgr(mpScreen, 'n_all', 3, NULL); JUT_ASSERT(79, mpPmP_c != 0); mpScreen->search('ag_n')->hide(); field_0x1994 = 0.0f; @@ -618,8 +618,8 @@ dMsgScrnHowl_c::~dMsgScrnHowl_c() { delete mpScreen; mpScreen = NULL; - delete mpPmp_c; - mpPmp_c = NULL; + delete mpPmP_c; + mpPmP_c = NULL; for (int i = 0; i < 2; i++) { delete mpButtonIcon[i]; @@ -683,7 +683,7 @@ void dMsgScrnHowl_c::exec() { (this->*init_proc[field_0x2798])(); } - f32 dVar10 = mpPmp_c->getAlphaRate(); + f32 dVar10 = mpPmP_c->getAlphaRate(); f32 fVar1; f32 fVar2; if (field_0x2798 == 3) { @@ -869,12 +869,12 @@ void dMsgScrnHowl_c::fukiScale(f32 param_0) { /* 80242038-8024205C 23C978 0024+00 1/0 0/0 0/0 .text fukiTrans__14dMsgScrnHowl_cFff */ void dMsgScrnHowl_c::fukiTrans(f32 param_0, f32 param_1) { - mpPmp_c->paneTrans(param_0, param_1); + mpPmP_c->paneTrans(param_0, param_1); } /* 8024205C-80242080 23C99C 0024+00 1/0 0/0 0/0 .text fukiAlpha__14dMsgScrnHowl_cFf */ void dMsgScrnHowl_c::fukiAlpha(f32 param_0) { - mpPmp_c->setAlphaRate(param_0); + mpPmP_c->setAlphaRate(param_0); } /* 80242080-802420D4 23C9C0 0054+00 0/0 1/1 0/0 .text isKeyCheck__14dMsgScrnHowl_cFv */ diff --git a/src/d/msg/d_msg_scrn_jimaku.cpp b/src/d/msg/d_msg_scrn_jimaku.cpp index 7528519e195..25fd348428e 100644 --- a/src/d/msg/d_msg_scrn_jimaku.cpp +++ b/src/d/msg/d_msg_scrn_jimaku.cpp @@ -1,272 +1,179 @@ -// -// Generated By: dol2asm -// Translation Unit: msg/scrn/d_msg_scrn_jimaku -// +/** + * d_msg_scrn_jimaku.cpp + * + */ #include "d/msg/d_msg_scrn_jimaku.h" -#include "dol2asm.h" +#include "JSystem/J2DGraph/J2DGrafContext.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "d/com/d_com_inf_game.h" +#include "d/msg/d_msg_object.h" +#include "d/msg/d_msg_scrn_light.h" +#include "d/pane/d_pane_class.h" -// -// Types: -// - -struct dMsgScrnLight_c { - /* 80245934 */ dMsgScrnLight_c(u8, u8); -}; - -struct JKRExpHeap {}; - -struct dMsgScrnJimaku_c { - /* 80244558 */ dMsgScrnJimaku_c(u8, JKRExpHeap*); - /* 80244A74 */ ~dMsgScrnJimaku_c(); - /* 80244C2C */ void exec(); - /* 80244D34 */ void drawSelf(); - /* 80244D8C */ void fukiAlpha(f32); - /* 80244E2C */ void fukiScale(f32); - /* 80244E30 */ void fukiTrans(f32, f32); - /* 80244E34 */ void fontAlpha(f32); -}; - -struct dMsgScrnBase_c { - /* 80238C40 */ void setSelectRubyString(char*, char*, char*); - /* 80238C44 */ void setSelectString(char*, char*, char*); - /* 80238C48 */ bool selectAnimeMove(u8, u8, bool); - /* 80238C50 */ void selectAnimeInit(u8, u8, f32, u8); - /* 80238C54 */ void arwAnimeMove(); - /* 80238C58 */ void arwAnimeInit(); - /* 80238C5C */ void fukiPosCalc(u8); - /* 80238C60 */ bool isSelect(); - /* 80238C68 */ bool selectAnimeEnd(); - /* 80238C70 */ void dotAnimeMove(); - /* 80238C74 */ void dotAnimeInit(); - /* 8023C0DC */ dMsgScrnBase_c(); - /* 8023C124 */ ~dMsgScrnBase_c(); - /* 8023C16C */ void init(); - /* 8023C234 */ void multiDraw(); - /* 8023C274 */ void draw(); - /* 8023C32C */ void drawOutFont(f32, f32, f32); - /* 8023C574 */ void isTalkNow(); -}; - -struct JUtility { - struct TColor {}; -}; - -struct JKRHeap { - /* 802CE4D4 */ void alloc(u32, int); - /* 802CE548 */ void free(void*); -}; - -struct JKRArchive {}; - -struct J2DTextBox { - /* 8030074C */ void setString(s16, char const*, ...); -}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); -}; - -struct CPaneMgrAlpha { - /* 802557D0 */ void setAlphaRate(f32); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802542E8 */ void getGlobalPosX(); - /* 80254364 */ void getGlobalPosY(); - /* 80254458 */ void setBlackWhite(JUtility::TColor, JUtility::TColor); - /* 802545B0 */ void paneTrans(f32, f32); -}; - -// -// Forward References: -// - -extern "C" void __ct__16dMsgScrnJimaku_cFUcP10JKRExpHeap(); -extern "C" void __dt__16dMsgScrnJimaku_cFv(); -extern "C" void exec__16dMsgScrnJimaku_cFv(); -extern "C" void drawSelf__16dMsgScrnJimaku_cFv(); -extern "C" void fukiAlpha__16dMsgScrnJimaku_cFf(); -extern "C" void fukiScale__16dMsgScrnJimaku_cFf(); -extern "C" void fukiTrans__16dMsgScrnJimaku_cFff(); -extern "C" void fontAlpha__16dMsgScrnJimaku_cFf(); -extern "C" extern char const* const msg_scrn_d_msg_scrn_jimaku__stringBase0; - -// -// External References: -// - -SECTION_INIT void memset(); -extern "C" void mDoExt_getMesgFont__Fv(); -extern "C" void dComIfGp_getSubHeap2D__Fi(); -extern "C" void setSelectRubyString__14dMsgScrnBase_cFPcPcPc(); -extern "C" void setSelectString__14dMsgScrnBase_cFPcPcPc(); -extern "C" bool selectAnimeMove__14dMsgScrnBase_cFUcUcb(); -extern "C" void selectAnimeInit__14dMsgScrnBase_cFUcUcfUc(); -extern "C" void arwAnimeMove__14dMsgScrnBase_cFv(); -extern "C" void arwAnimeInit__14dMsgScrnBase_cFv(); -extern "C" void fukiPosCalc__14dMsgScrnBase_cFUc(); -extern "C" bool isSelect__14dMsgScrnBase_cFv(); -extern "C" bool selectAnimeEnd__14dMsgScrnBase_cFv(); -extern "C" void dotAnimeMove__14dMsgScrnBase_cFv(); -extern "C" void dotAnimeInit__14dMsgScrnBase_cFv(); -extern "C" void __ct__14dMsgScrnBase_cFv(); -extern "C" void __dt__14dMsgScrnBase_cFv(); -extern "C" void init__14dMsgScrnBase_cFv(); -extern "C" void multiDraw__14dMsgScrnBase_cFv(); -extern "C" void draw__14dMsgScrnBase_cFv(); -extern "C" void drawOutFont__14dMsgScrnBase_cFfff(); -extern "C" void isTalkNow__14dMsgScrnBase_cFv(); -extern "C" void __ct__15dMsgScrnLight_cFUcUc(); -extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void getGlobalPosX__8CPaneMgrFv(); -extern "C" void getGlobalPosY__8CPaneMgrFv(); -extern "C" void setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor(); -extern "C" void paneTrans__8CPaneMgrFff(); -extern "C" void dPaneClass_showNullPane__FP9J2DScreen(); -extern "C" void setAlphaRate__13CPaneMgrAlphaFf(); -extern "C" void alloc__7JKRHeapFUli(); -extern "C" void free__7JKRHeapFPv(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void __ct__9J2DScreenFv(); -extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive(); -extern "C" void setString__10J2DTextBoxFsPCce(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80399A80-80399A80 0260E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399A80 = "zelda_jimaku_message_text.blo"; -SECTION_DEAD static char const* const stringBase_80399A9E = ""; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80399A9F = ""; -#pragma pop - -/* 803C11E8-803C1240 01E308 0058+00 2/2 0/0 0/0 .data __vt__16dMsgScrnJimaku_c */ -SECTION_DATA extern void* __vt__16dMsgScrnJimaku_c[22] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__14dMsgScrnBase_cFv, - (void*)__dt__16dMsgScrnJimaku_cFv, - (void*)exec__16dMsgScrnJimaku_cFv, - (void*)multiDraw__14dMsgScrnBase_cFv, - (void*)drawSelf__16dMsgScrnJimaku_cFv, - (void*)setSelectString__14dMsgScrnBase_cFPcPcPc, - (void*)setSelectRubyString__14dMsgScrnBase_cFPcPcPc, - (void*)arwAnimeInit__14dMsgScrnBase_cFv, - (void*)arwAnimeMove__14dMsgScrnBase_cFv, - (void*)dotAnimeInit__14dMsgScrnBase_cFv, - (void*)dotAnimeMove__14dMsgScrnBase_cFv, - (void*)isSelect__14dMsgScrnBase_cFv, - (void*)selectAnimeInit__14dMsgScrnBase_cFUcUcfUc, - (void*)selectAnimeMove__14dMsgScrnBase_cFUcUcb, - (void*)selectAnimeEnd__14dMsgScrnBase_cFv, - (void*)fukiScale__16dMsgScrnJimaku_cFf, - (void*)fukiTrans__16dMsgScrnJimaku_cFff, - (void*)fukiAlpha__16dMsgScrnJimaku_cFf, - (void*)fontAlpha__16dMsgScrnJimaku_cFf, - (void*)fukiPosCalc__14dMsgScrnBase_cFUc, -}; - -/* 80454CB0-80454CB4 0032B0 0004+00 2/2 0/0 0/0 .sdata2 @3941 */ -SECTION_SDATA2 static u8 lit_3941[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80454CB4-80454CB8 0032B4 0004+00 1/1 0/0 0/0 .sdata2 @3942 */ -SECTION_SDATA2 static f32 lit_3942 = 6.0f / 5.0f; +extern "C" extern dMsgObject_HIO_c g_MsgObject_HIO_c; /* 80244558-80244A74 23EE98 051C+00 0/0 1/1 0/0 .text __ct__16dMsgScrnJimaku_cFUcP10JKRExpHeap */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* param_1) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_jimaku/__ct__16dMsgScrnJimaku_cFUcP10JKRExpHeap.s" +dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) { + if (i_heap != NULL) { + heap = i_heap; + } else { + heap = dComIfGp_getSubHeap2D(7); + } + + init(); + + mpScreen = new J2DScreen(); + JUT_ASSERT(mpScreen != 0); + + bool fg = mpScreen->setPriority("zelda_jimaku_message_text.blo", 0x20000, + dComIfGp_getMsgCommonArchive()); + JUT_ASSERT(fg != false); + dPaneClass_showNullPane(mpScreen); + + mpLight_c = new dMsgScrnLight_c(0, param_0); + JUT_ASSERT(mpLight_c != 0); + + void* mpBuf = heap->alloc(0x106A, 0x20); + JUT_ASSERT(mpBuf != 0); + memset(mpBuf, 0, 0x106A); + mCharInfoPtr = (CharInfo_c*)mpBuf; + + mpPmP_c = new CPaneMgr(mpScreen, 'mg_null', 3, NULL); + JUT_ASSERT(mpPmP_c != 0); + mpPmP_c->scale(g_MsgObject_HIO_c.mSubtitleScaleX, g_MsgObject_HIO_c.mSubtitleScaleY); + field_0xcc = g_MsgObject_HIO_c.mBoxPos[0][5]; + mpPmP_c->paneTrans(0.0f, field_0xcc); + + mpTm_c[0] = new CPaneMgr(mpScreen, 'mg_e4lin', 0, NULL); + JUT_ASSERT(mpTm_c[0] != 0); + + mpTm_c[1] = new CPaneMgr(mpScreen, 't4_s', 0, NULL); + JUT_ASSERT(mpTm_c[1] != 0); + + mpScreen->search('n_3line')->hide(); + mpScreen->search('n_3fline')->hide(); + mpScreen->search('n_e4line')->show(); + + for (int i = 0; i < 2; i++) { + ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setString(0x200, ""); + mpTm_c[i]->setBlackWhite(g_MsgObject_HIO_c.mBoxStartBlack[4 + (i * 10)], + g_MsgObject_HIO_c.mBoxStartWhite[4 + (i * 10)]); + + if (mpTmr_c[i] != NULL) { + ((J2DTextBox*)mpTmr_c[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpTmr_c[i]->getPanePtr())->setString(0x200, ""); + mpTmr_c[i]->setBlackWhite(g_MsgObject_HIO_c.mBoxStartBlack[4 + (i * 10)], + g_MsgObject_HIO_c.mBoxStartWhite[4 + (i * 10)]); + } + } + + ((J2DTextBox*)mpTm_c[0]->getPanePtr())->getFontSize(mFontSize); + mTBoxWidth = mpTm_c[0]->getSizeX(); + mTBoxHeight = mpTm_c[0]->getSizeY(); + mLineSpace = ((J2DTextBox*)mpTm_c[0]->getPanePtr())->getLineSpace(); + mCharSpace = ((J2DTextBox*)mpTm_c[0]->getPanePtr())->getCharSpace(); + + for (int i = 0; i < 2; i++) { + ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setLineSpace(mLineSpace); + mpTm_c[i]->resize(mpTm_c[i]->getSizeX() * 1.2f, mpTm_c[i]->getSizeY()); + } + + mTextBoxPosX = mpTm_c[0]->getGlobalPosX(); + mTextBoxPosY = mpTm_c[0]->getGlobalPosY(); + + for (int i = 0; i < 2; i++) { + if (mpTmr_c[i] != NULL) { + ((J2DTextBox*)mpTmr_c[i]->getPanePtr())->setLineSpace(mLineSpace); + + if (i == 0) { + J2DTextBox::TFontSize font_size; + ((J2DTextBox*)mpTmr_c[0]->getPanePtr())->getFontSize(font_size); + mRubySize = font_size.mSizeX; + mRubyCharSpace = ((J2DTextBox*)mpTmr_c[0]->getPanePtr())->getCharSpace(); + } + + mpTmr_c[i]->resize(mpTmr_c[i]->getSizeX() * 1.2f, mpTmr_c[i]->getSizeY()); + } + } } -#pragma pop /* 80244A74-80244C2C 23F3B4 01B8+00 1/0 0/0 0/0 .text __dt__16dMsgScrnJimaku_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgScrnJimaku_c::~dMsgScrnJimaku_c() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_jimaku/__dt__16dMsgScrnJimaku_cFv.s" -} -#pragma pop +dMsgScrnJimaku_c::~dMsgScrnJimaku_c() { + delete mpScreen; + mpScreen = NULL; -/* ############################################################################################## */ -/* 80454CB8-80454CC0 0032B8 0004+04 2/2 0/0 0/0 .sdata2 @4021 */ -SECTION_SDATA2 static f32 lit_4021[1 + 1 /* padding */] = { - 1.0f, - /* padding */ - 0.0f, -}; + delete mpLight_c; + mpLight_c = NULL; + + if (mCharInfoPtr != NULL) { + heap->free(mCharInfoPtr); + mCharInfoPtr = NULL; + } + + delete mpPmP_c; + mpPmP_c = NULL; + + for (int i = 0; i < 2; i++) { + delete mpTm_c[i]; + mpTm_c[i] = NULL; + + if (mpTmr_c[i] != NULL) { + delete mpTmr_c[i]; + mpTmr_c[i] = NULL; + } + } + + dComIfGp_getMsgArchive(0)->removeResourceAll(); + dComIfGp_getMsgArchive(1)->removeResourceAll(); + dComIfGp_getMsgCommonArchive()->removeResourceAll(); +} /* 80244C2C-80244D34 23F56C 0108+00 1/0 0/0 0/0 .text exec__16dMsgScrnJimaku_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnJimaku_c::exec() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_jimaku/exec__16dMsgScrnJimaku_cFv.s" +void dMsgScrnJimaku_c::exec() { + if (isTalkNow()) { + fukiAlpha(1.0f); + } + + mpPmP_c->scale(g_MsgObject_HIO_c.mSubtitleScaleX, g_MsgObject_HIO_c.mSubtitleScaleY); + + for (int i = 0; i < 2; i++) { + mpTm_c[i]->setBlackWhite(g_MsgObject_HIO_c.mBoxStartBlack[4 + (i * 10)], + g_MsgObject_HIO_c.mBoxStartWhite[4 + (i * 10)]); + + if (mpTmr_c[i] != NULL) { + mpTmr_c[i]->setBlackWhite(g_MsgObject_HIO_c.mBoxStartBlack[4 + (i * 10)], + g_MsgObject_HIO_c.mBoxStartWhite[4 + (i * 10)]); + } + } } -#pragma pop /* 80244D34-80244D8C 23F674 0058+00 1/0 0/0 0/0 .text drawSelf__16dMsgScrnJimaku_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnJimaku_c::drawSelf() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_jimaku/drawSelf__16dMsgScrnJimaku_cFv.s" +void dMsgScrnJimaku_c::drawSelf() { + dComIfGp_getCurrentGrafPort()->setup2D(); + drawOutFont(0.0f, 0.0f, 1.0f); } -#pragma pop /* 80244D8C-80244E2C 23F6CC 00A0+00 1/0 0/0 0/0 .text fukiAlpha__16dMsgScrnJimaku_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnJimaku_c::fukiAlpha(f32 param_0) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_jimaku/fukiAlpha__16dMsgScrnJimaku_cFf.s" +void dMsgScrnJimaku_c::fukiAlpha(f32 i_alpha) { + mpPmP_c->setAlphaRate(i_alpha * g_MsgObject_HIO_c.mSubtitleAlphaP); + + for (int i = 0; i < 2; i++) { + mpTm_c[i]->setAlphaRate(i_alpha * mCharAlphaRate); + + if (mpTmr_c[i] != NULL) { + mpTmr_c[i]->setAlphaRate(i_alpha * mCharAlphaRate); + } + } } -#pragma pop /* 80244E2C-80244E30 23F76C 0004+00 1/0 0/0 0/0 .text fukiScale__16dMsgScrnJimaku_cFf */ -void dMsgScrnJimaku_c::fukiScale(f32 param_0) { - /* empty function */ -} +void dMsgScrnJimaku_c::fukiScale(f32 i_scale) {} /* 80244E30-80244E34 23F770 0004+00 1/0 0/0 0/0 .text fukiTrans__16dMsgScrnJimaku_cFff */ -void dMsgScrnJimaku_c::fukiTrans(f32 param_0, f32 param_1) { - /* empty function */ -} +void dMsgScrnJimaku_c::fukiTrans(f32 i_posX, f32 i_posY) {} /* 80244E34-80244E38 23F774 0004+00 1/0 0/0 0/0 .text fontAlpha__16dMsgScrnJimaku_cFf */ -void dMsgScrnJimaku_c::fontAlpha(f32 param_0) { - /* empty function */ -} - -/* 80399A80-80399A80 0260E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +void dMsgScrnJimaku_c::fontAlpha(f32 i_alpha) {} diff --git a/src/d/msg/d_msg_scrn_kanban.cpp b/src/d/msg/d_msg_scrn_kanban.cpp index 1e216c7f6e5..fde7e7cee59 100644 --- a/src/d/msg/d_msg_scrn_kanban.cpp +++ b/src/d/msg/d_msg_scrn_kanban.cpp @@ -42,14 +42,14 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { field_0xd0->searchUpdateMaterialID(mpScreen); field_0xd8 = 0.0f; - mpPmp_c = new CPaneMgr(mpScreen, 'n_size', 2, NULL); - JUT_ASSERT(60, mpPmp_c != 0); - mpPmp_c->getPanePtr()->setAnimation(field_0xcc); + mpPmP_c = new CPaneMgr(mpScreen, 'n_size', 2, NULL); + JUT_ASSERT(60, mpPmP_c != 0); + mpPmP_c->getPanePtr()->setAnimation(field_0xcc); field_0xcc->setFrame(1.0f); - mpPmp_c->getPanePtr()->animationTransform(); - mpPmp_c->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); - mpPmp_c->scale(g_MsgObject_HIO_c.mBoxStoneScaleX, g_MsgObject_HIO_c.mBoxStoneScaleY); + mpPmP_c->getPanePtr()->animationTransform(); + mpPmP_c->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); + mpPmP_c->scale(g_MsgObject_HIO_c.mBoxStoneScaleX, g_MsgObject_HIO_c.mBoxStoneScaleY); mpBack_c = new CPaneMgr(mpScreen, 'back_b', 0, NULL); JUT_ASSERT(68, mpBack_c != 0); @@ -109,8 +109,8 @@ dMsgScrnKanban_c::~dMsgScrnKanban_c() { delete field_0xd0; field_0xd0 = NULL; - delete mpPmp_c; - mpPmp_c = NULL; + delete mpPmP_c; + mpPmP_c = NULL; delete mpBack_c; mpBack_c = NULL; @@ -144,7 +144,7 @@ void dMsgScrnKanban_c::exec() { fukiAlpha(1.0f); } - mpPmp_c->scale(g_MsgObject_HIO_c.mBoxStoneScaleX, g_MsgObject_HIO_c.mBoxStoneScaleY); + mpPmP_c->scale(g_MsgObject_HIO_c.mBoxStoneScaleX, g_MsgObject_HIO_c.mBoxStoneScaleY); } /* 80245618-802456A0 23FF58 0088+00 1/0 0/0 0/0 .text draw__16dMsgScrnKanban_cFv */ @@ -158,7 +158,7 @@ void dMsgScrnKanban_c::draw() { /* 802456A0-80245754 23FFE0 00B4+00 1/0 0/0 0/0 .text fukiAlpha__16dMsgScrnKanban_cFf */ void dMsgScrnKanban_c::fukiAlpha(f32 param_0) { mpBack_c->setAlphaRate(param_0); - mpPmp_c->setAlphaRate(param_0 * g_MsgObject_HIO_c.mBoxStoneAlphaP); + mpPmP_c->setAlphaRate(param_0 * g_MsgObject_HIO_c.mBoxStoneAlphaP); mpSpot_c->setAlphaRate(param_0); for (int i = 0; i < 3; i++) { diff --git a/src/d/msg/d_msg_scrn_place.cpp b/src/d/msg/d_msg_scrn_place.cpp index 678d589a0e4..e89984bf1eb 100644 --- a/src/d/msg/d_msg_scrn_place.cpp +++ b/src/d/msg/d_msg_scrn_place.cpp @@ -31,8 +31,8 @@ dMsgScrnPlace_c::dMsgScrnPlace_c() { mpScreen->setPriority("zelda_stage_title_foreign.blo", 0x20000, dComIfGp_getMsgArchive(4)); dPaneClass_showNullPane(mpScreen); - mpPmp_c = new CPaneMgr(mpScreen, 'n_all', 2, NULL); - mpPmp_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY); + mpPmP_c = new CPaneMgr(mpScreen, 'n_all', 2, NULL); + mpPmP_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY); mpFontParent = new CPaneMgr(mpScreen, 's_font_n', 0, NULL); mpFontParent->scale(g_MsgObject_HIO_c.mStageTitleCharSizeX, @@ -74,8 +74,8 @@ dMsgScrnPlace_c::~dMsgScrnPlace_c() { delete mpScreen; mpScreen = NULL; - delete mpPmp_c; - mpPmp_c = NULL; + delete mpPmP_c; + mpPmP_c = NULL; delete mpFontParent; mpFontParent = NULL; @@ -93,7 +93,7 @@ dMsgScrnPlace_c::~dMsgScrnPlace_c() { /* 80246924-80246A44 241264 0120+00 1/0 0/0 0/0 .text exec__15dMsgScrnPlace_cFv */ void dMsgScrnPlace_c::exec() { - mpPmp_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY); + mpPmP_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY); mpFontParent->scale(g_MsgObject_HIO_c.mStageTitleCharSizeX, g_MsgObject_HIO_c.mStageTitleCharSizeY); @@ -119,7 +119,7 @@ void dMsgScrnPlace_c::drawSelf() { /* 80246A9C-80246B28 2413DC 008C+00 1/0 0/0 0/0 .text fukiAlpha__15dMsgScrnPlace_cFf */ void dMsgScrnPlace_c::fukiAlpha(f32 i_rate) { - mpPmp_c->setAlphaRate(i_rate); + mpPmP_c->setAlphaRate(i_rate); mpBaseParent->setAlphaRate(i_rate * g_MsgObject_HIO_c.mStageTitleBaseAlpha); for (int i = 0; i < 7; i++) { diff --git a/src/d/msg/d_msg_scrn_staff.cpp b/src/d/msg/d_msg_scrn_staff.cpp index c60a413fcf3..d55141b3204 100644 --- a/src/d/msg/d_msg_scrn_staff.cpp +++ b/src/d/msg/d_msg_scrn_staff.cpp @@ -27,7 +27,7 @@ dMsgScrnStaff_c::dMsgScrnStaff_c(u8 unused) { mpScreen->setPriority("zelda_staff_roll.blo", 0x20000, dComIfGp_getMsgArchive(6)); dPaneClass_showNullPane(mpScreen); - mpPmp_c = new CPaneMgr(mpScreen, 'ROOT', 2, NULL); + mpPmP_c = new CPaneMgr(mpScreen, 'ROOT', 2, NULL); mpScreen->search('left_n')->hide(); mpScreen->search('right_n')->hide(); @@ -58,8 +58,8 @@ dMsgScrnStaff_c::~dMsgScrnStaff_c() { delete mpScreen; mpScreen = NULL; - delete mpPmp_c; - mpPmp_c = NULL; + delete mpPmP_c; + mpPmP_c = NULL; for (int i = 0; i < 6; i++) { delete mpTm_c[i]; @@ -71,7 +71,7 @@ dMsgScrnStaff_c::~dMsgScrnStaff_c() { /* 80246EE8-80246F68 241828 0080+00 1/0 0/0 0/0 .text exec__15dMsgScrnStaff_cFv */ void dMsgScrnStaff_c::exec() { - mpPmp_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY); + mpPmP_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY); if (isTalkNow()) { fukiAlpha(1.0f); } @@ -86,7 +86,7 @@ void dMsgScrnStaff_c::drawSelf() { /* 80246FC0-80246FE4 241900 0024+00 1/0 0/0 0/0 .text fukiAlpha__15dMsgScrnStaff_cFf */ void dMsgScrnStaff_c::fukiAlpha(f32 i_rate) { - mpPmp_c->setAlphaRate(i_rate); + mpPmP_c->setAlphaRate(i_rate); } /* 80246FE4-80246FE8 241924 0004+00 1/0 0/0 0/0 .text fukiScale__15dMsgScrnStaff_cFf */ diff --git a/src/d/msg/d_msg_scrn_tree.cpp b/src/d/msg/d_msg_scrn_tree.cpp index ac30d64282f..1982fbb82bc 100644 --- a/src/d/msg/d_msg_scrn_tree.cpp +++ b/src/d/msg/d_msg_scrn_tree.cpp @@ -46,12 +46,12 @@ dMsgScrnTree_c::dMsgScrnTree_c(JUTFont* param_0, JKRExpHeap* param_1) { field_0xd4->searchUpdateMaterialID(mpScreen); field_0xe0 = 0.0f; - mpPmp_c = new CPaneMgr(mpScreen, 'n_size', 2, NULL); - mpPmp_c->getPanePtr()->setAnimation(field_0xcc); + mpPmP_c = new CPaneMgr(mpScreen, 'n_size', 2, NULL); + mpPmP_c->getPanePtr()->setAnimation(field_0xcc); field_0xcc->setFrame(1.0f); - mpPmp_c->getPanePtr()->animationTransform(); - mpPmp_c->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); - mpPmp_c->scale(g_MsgObject_HIO_c.mBoxWoodScaleX, g_MsgObject_HIO_c.mBoxWoodScaleY); + mpPmP_c->getPanePtr()->animationTransform(); + mpPmP_c->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); + mpPmP_c->scale(g_MsgObject_HIO_c.mBoxWoodScaleX, g_MsgObject_HIO_c.mBoxWoodScaleY); field_0xc4 = new CPaneMgr(mpScreen, 'back_b', 0, NULL); field_0xc8 = new CPaneMgr(mpScreen, 'spot00', 0, NULL); @@ -112,8 +112,8 @@ dMsgScrnTree_c::~dMsgScrnTree_c() { delete field_0xd4; field_0xd4 = NULL; - delete mpPmp_c; - mpPmp_c = NULL; + delete mpPmP_c; + mpPmP_c = NULL; delete field_0xc4; field_0xc4 = NULL; @@ -152,7 +152,7 @@ void dMsgScrnTree_c::exec() { if (isTalkNow()) { fukiAlpha(1.0f); } - mpPmp_c->scale(g_MsgObject_HIO_c.mBoxWoodScaleX, g_MsgObject_HIO_c.mBoxWoodScaleY); + mpPmP_c->scale(g_MsgObject_HIO_c.mBoxWoodScaleX, g_MsgObject_HIO_c.mBoxWoodScaleY); } /* 80249270-802492F8 243BB0 0088+00 1/0 0/0 0/0 .text draw__14dMsgScrnTree_cFv */ @@ -166,7 +166,7 @@ void dMsgScrnTree_c::draw() { /* 802492F8-802493AC 243C38 00B4+00 1/0 0/0 0/0 .text fukiAlpha__14dMsgScrnTree_cFf */ void dMsgScrnTree_c::fukiAlpha(f32 param_0) { field_0xc4->setAlphaRate(param_0); - mpPmp_c->setAlphaRate(param_0 * g_MsgObject_HIO_c.mBoxWoodAlphaP); + mpPmP_c->setAlphaRate(param_0 * g_MsgObject_HIO_c.mBoxWoodAlphaP); field_0xc8->setAlphaRate(param_0); for (int i = 0; i < 3; i++) {