diff options
27 files changed, 588 insertions, 1521 deletions
diff --git a/Progress.md b/Progress.md index 13168fece6..31675d192d 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 | 29.838534% | 1073156 | 3596544 +.text | 29.950419% | 1077180 | 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 | 37.234870% | 1497092 | 4020672 +Total | 37.334953% | 1501116 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 37.234870% | 1497092 | 4020672 +main.dol | 37.334953% | 1501116 | 4020672 RELs | 34.025372% | 3913028 | 11500324 -Total | 34.856784% | 5410120 | 15520996 +Total | 34.882710% | 5414144 | 15520996 ## RELs diff --git a/asm/d/menu/d_menu_insect/__dt__14dMenu_Insect_cFv.s b/asm/d/menu/d_menu_insect/__dt__14dMenu_Insect_cFv.s deleted file mode 100644 index 9dfaea7b66..0000000000 --- a/asm/d/menu/d_menu_insect/__dt__14dMenu_Insect_cFv.s +++ /dev/null @@ -1,240 +0,0 @@ -lbl_801D82F4: -/* 801D82F4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D82F8 7C 08 02 A6 */ mflr r0 -/* 801D82FC 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D8300 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D8304 48 18 9E CD */ bl _savegpr_26 -/* 801D8308 7C 7E 1B 79 */ or. r30, r3, r3 -/* 801D830C 7C 9F 23 78 */ mr r31, r4 -/* 801D8310 41 82 03 2C */ beq lbl_801D863C -/* 801D8314 3C 60 80 3C */ lis r3, __vt__14dMenu_Insect_c@ha /* 0x803BD8AC@ha */ -/* 801D8318 38 03 D8 AC */ addi r0, r3, __vt__14dMenu_Insect_c@l /* 0x803BD8AC@l */ -/* 801D831C 90 1E 00 00 */ stw r0, 0(r30) -/* 801D8320 80 7E 00 60 */ lwz r3, 0x60(r30) -/* 801D8324 28 03 00 00 */ cmplwi r3, 0 -/* 801D8328 41 82 00 18 */ beq lbl_801D8340 -/* 801D832C 38 80 00 01 */ li r4, 1 -/* 801D8330 81 83 00 00 */ lwz r12, 0(r3) -/* 801D8334 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D8338 7D 89 03 A6 */ mtctr r12 -/* 801D833C 4E 80 04 21 */ bctrl -lbl_801D8340: -/* 801D8340 38 00 00 00 */ li r0, 0 -/* 801D8344 90 1E 00 60 */ stw r0, 0x60(r30) -/* 801D8348 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801D834C 28 03 00 00 */ cmplwi r3, 0 -/* 801D8350 41 82 00 18 */ beq lbl_801D8368 -/* 801D8354 38 80 00 01 */ li r4, 1 -/* 801D8358 81 83 00 00 */ lwz r12, 0(r3) -/* 801D835C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801D8360 7D 89 03 A6 */ mtctr r12 -/* 801D8364 4E 80 04 21 */ bctrl -lbl_801D8368: -/* 801D8368 38 00 00 00 */ li r0, 0 -/* 801D836C 90 1E 00 18 */ stw r0, 0x18(r30) -/* 801D8370 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 801D8374 28 03 00 00 */ cmplwi r3, 0 -/* 801D8378 41 82 00 18 */ beq lbl_801D8390 -/* 801D837C 38 80 00 01 */ li r4, 1 -/* 801D8380 81 83 00 00 */ lwz r12, 0(r3) -/* 801D8384 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D8388 7D 89 03 A6 */ mtctr r12 -/* 801D838C 4E 80 04 21 */ bctrl -lbl_801D8390: -/* 801D8390 38 00 00 00 */ li r0, 0 -/* 801D8394 90 1E 00 1C */ stw r0, 0x1c(r30) -/* 801D8398 80 7E 00 04 */ lwz r3, 4(r30) -/* 801D839C 80 9E 00 EC */ lwz r4, 0xec(r30) -/* 801D83A0 48 0F 61 A9 */ bl free__7JKRHeapFPv -/* 801D83A4 38 00 00 00 */ li r0, 0 -/* 801D83A8 90 1E 00 EC */ stw r0, 0xec(r30) -/* 801D83AC 80 7E 00 E8 */ lwz r3, 0xe8(r30) -/* 801D83B0 38 80 00 01 */ li r4, 1 -/* 801D83B4 48 07 19 75 */ bl __dt__12dMsgString_cFv -/* 801D83B8 38 00 00 00 */ li r0, 0 -/* 801D83BC 90 1E 00 E8 */ stw r0, 0xe8(r30) -/* 801D83C0 80 7E 00 20 */ lwz r3, 0x20(r30) -/* 801D83C4 28 03 00 00 */ cmplwi r3, 0 -/* 801D83C8 41 82 00 18 */ beq lbl_801D83E0 -/* 801D83CC 38 80 00 01 */ li r4, 1 -/* 801D83D0 81 83 00 00 */ lwz r12, 0(r3) -/* 801D83D4 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D83D8 7D 89 03 A6 */ mtctr r12 -/* 801D83DC 4E 80 04 21 */ bctrl -lbl_801D83E0: -/* 801D83E0 38 00 00 00 */ li r0, 0 -/* 801D83E4 90 1E 00 20 */ stw r0, 0x20(r30) -/* 801D83E8 80 7E 00 64 */ lwz r3, 0x64(r30) -/* 801D83EC 28 03 00 00 */ cmplwi r3, 0 -/* 801D83F0 41 82 00 18 */ beq lbl_801D8408 -/* 801D83F4 38 80 00 01 */ li r4, 1 -/* 801D83F8 81 83 00 00 */ lwz r12, 0(r3) -/* 801D83FC 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D8400 7D 89 03 A6 */ mtctr r12 -/* 801D8404 4E 80 04 21 */ bctrl -lbl_801D8408: -/* 801D8408 3B 80 00 00 */ li r28, 0 -/* 801D840C 93 9E 00 64 */ stw r28, 0x64(r30) -/* 801D8410 3B 40 00 00 */ li r26, 0 -/* 801D8414 7F 9D E3 78 */ mr r29, r28 -lbl_801D8418: -/* 801D8418 3B 7D 00 6C */ addi r27, r29, 0x6c -/* 801D841C 7C 7E D8 2E */ lwzx r3, r30, r27 -/* 801D8420 28 03 00 00 */ cmplwi r3, 0 -/* 801D8424 41 82 00 18 */ beq lbl_801D843C -/* 801D8428 38 80 00 01 */ li r4, 1 -/* 801D842C 81 83 00 00 */ lwz r12, 0(r3) -/* 801D8430 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D8434 7D 89 03 A6 */ mtctr r12 -/* 801D8438 4E 80 04 21 */ bctrl -lbl_801D843C: -/* 801D843C 7F 9E D9 2E */ stwx r28, r30, r27 -/* 801D8440 3B 5A 00 01 */ addi r26, r26, 1 -/* 801D8444 2C 1A 00 18 */ cmpwi r26, 0x18 -/* 801D8448 3B BD 00 04 */ addi r29, r29, 4 -/* 801D844C 41 80 FF CC */ blt lbl_801D8418 -/* 801D8450 80 7E 00 24 */ lwz r3, 0x24(r30) -/* 801D8454 28 03 00 00 */ cmplwi r3, 0 -/* 801D8458 41 82 00 18 */ beq lbl_801D8470 -/* 801D845C 38 80 00 01 */ li r4, 1 -/* 801D8460 81 83 00 00 */ lwz r12, 0(r3) -/* 801D8464 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D8468 7D 89 03 A6 */ mtctr r12 -/* 801D846C 4E 80 04 21 */ bctrl -lbl_801D8470: -/* 801D8470 38 00 00 00 */ li r0, 0 -/* 801D8474 90 1E 00 24 */ stw r0, 0x24(r30) -/* 801D8478 80 7E 00 68 */ lwz r3, 0x68(r30) -/* 801D847C 28 03 00 00 */ cmplwi r3, 0 -/* 801D8480 41 82 00 18 */ beq lbl_801D8498 -/* 801D8484 38 80 00 01 */ li r4, 1 -/* 801D8488 81 83 00 00 */ lwz r12, 0(r3) -/* 801D848C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D8490 7D 89 03 A6 */ mtctr r12 -/* 801D8494 4E 80 04 21 */ bctrl -lbl_801D8498: -/* 801D8498 3B 80 00 00 */ li r28, 0 -/* 801D849C 93 9E 00 68 */ stw r28, 0x68(r30) -/* 801D84A0 3B 40 00 00 */ li r26, 0 -/* 801D84A4 3B A0 00 00 */ li r29, 0 -lbl_801D84A8: -/* 801D84A8 3B 7D 00 D0 */ addi r27, r29, 0xd0 -/* 801D84AC 7C 7E D8 2E */ lwzx r3, r30, r27 -/* 801D84B0 28 03 00 00 */ cmplwi r3, 0 -/* 801D84B4 41 82 00 18 */ beq lbl_801D84CC -/* 801D84B8 38 80 00 01 */ li r4, 1 -/* 801D84BC 81 83 00 00 */ lwz r12, 0(r3) -/* 801D84C0 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D84C4 7D 89 03 A6 */ mtctr r12 -/* 801D84C8 4E 80 04 21 */ bctrl -lbl_801D84CC: -/* 801D84CC 7F 9E D9 2E */ stwx r28, r30, r27 -/* 801D84D0 3B 5A 00 01 */ addi r26, r26, 1 -/* 801D84D4 2C 1A 00 02 */ cmpwi r26, 2 -/* 801D84D8 3B BD 00 04 */ addi r29, r29, 4 -/* 801D84DC 41 80 FF CC */ blt lbl_801D84A8 -/* 801D84E0 80 7E 00 CC */ lwz r3, 0xcc(r30) -/* 801D84E4 28 03 00 00 */ cmplwi r3, 0 -/* 801D84E8 41 82 00 18 */ beq lbl_801D8500 -/* 801D84EC 38 80 00 01 */ li r4, 1 -/* 801D84F0 81 83 00 00 */ lwz r12, 0(r3) -/* 801D84F4 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D84F8 7D 89 03 A6 */ mtctr r12 -/* 801D84FC 4E 80 04 21 */ bctrl -lbl_801D8500: -/* 801D8500 38 00 00 00 */ li r0, 0 -/* 801D8504 90 1E 00 CC */ stw r0, 0xcc(r30) -/* 801D8508 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 801D850C 28 03 00 00 */ cmplwi r3, 0 -/* 801D8510 41 82 00 18 */ beq lbl_801D8528 -/* 801D8514 38 80 00 01 */ li r4, 1 -/* 801D8518 81 83 00 00 */ lwz r12, 0(r3) -/* 801D851C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D8520 7D 89 03 A6 */ mtctr r12 -/* 801D8524 4E 80 04 21 */ bctrl -lbl_801D8528: -/* 801D8528 38 00 00 00 */ li r0, 0 -/* 801D852C 90 1E 00 28 */ stw r0, 0x28(r30) -/* 801D8530 3B 40 00 00 */ li r26, 0 -/* 801D8534 3B A0 00 00 */ li r29, 0 -lbl_801D8538: -/* 801D8538 7F 7E EA 14 */ add r27, r30, r29 -/* 801D853C 80 7B 00 D8 */ lwz r3, 0xd8(r27) -/* 801D8540 28 03 00 00 */ cmplwi r3, 0 -/* 801D8544 41 82 00 24 */ beq lbl_801D8568 -/* 801D8548 41 82 00 18 */ beq lbl_801D8560 -/* 801D854C 38 80 00 01 */ li r4, 1 -/* 801D8550 81 83 00 00 */ lwz r12, 0(r3) -/* 801D8554 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D8558 7D 89 03 A6 */ mtctr r12 -/* 801D855C 4E 80 04 21 */ bctrl -lbl_801D8560: -/* 801D8560 38 00 00 00 */ li r0, 0 -/* 801D8564 90 1B 00 D8 */ stw r0, 0xd8(r27) -lbl_801D8568: -/* 801D8568 80 7B 00 E0 */ lwz r3, 0xe0(r27) -/* 801D856C 28 03 00 00 */ cmplwi r3, 0 -/* 801D8570 41 82 00 24 */ beq lbl_801D8594 -/* 801D8574 41 82 00 18 */ beq lbl_801D858C -/* 801D8578 38 80 00 01 */ li r4, 1 -/* 801D857C 81 83 00 00 */ lwz r12, 0(r3) -/* 801D8580 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D8584 7D 89 03 A6 */ mtctr r12 -/* 801D8588 4E 80 04 21 */ bctrl -lbl_801D858C: -/* 801D858C 38 00 00 00 */ li r0, 0 -/* 801D8590 90 1B 00 E0 */ stw r0, 0xe0(r27) -lbl_801D8594: -/* 801D8594 3B 5A 00 01 */ addi r26, r26, 1 -/* 801D8598 2C 1A 00 02 */ cmpwi r26, 2 -/* 801D859C 3B BD 00 04 */ addi r29, r29, 4 -/* 801D85A0 41 80 FF 98 */ blt lbl_801D8538 -/* 801D85A4 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801D85A8 28 03 00 00 */ cmplwi r3, 0 -/* 801D85AC 41 82 00 40 */ beq lbl_801D85EC -/* 801D85B0 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 801D85B4 81 83 00 00 */ lwz r12, 0(r3) -/* 801D85B8 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801D85BC 7D 89 03 A6 */ mtctr r12 -/* 801D85C0 4E 80 04 21 */ bctrl -/* 801D85C4 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801D85C8 28 03 00 00 */ cmplwi r3, 0 -/* 801D85CC 41 82 00 18 */ beq lbl_801D85E4 -/* 801D85D0 38 80 00 01 */ li r4, 1 -/* 801D85D4 81 83 00 10 */ lwz r12, 0x10(r3) -/* 801D85D8 81 8C 00 08 */ lwz r12, 8(r12) -/* 801D85DC 7D 89 03 A6 */ mtctr r12 -/* 801D85E0 4E 80 04 21 */ bctrl -lbl_801D85E4: -/* 801D85E4 38 00 00 00 */ li r0, 0 -/* 801D85E8 90 1E 00 14 */ stw r0, 0x14(r30) -lbl_801D85EC: -/* 801D85EC 80 7E 00 08 */ lwz r3, 8(r30) -/* 801D85F0 28 03 00 00 */ cmplwi r3, 0 -/* 801D85F4 41 82 00 1C */ beq lbl_801D8610 -/* 801D85F8 81 83 00 00 */ lwz r12, 0(r3) -/* 801D85FC 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801D8600 7D 89 03 A6 */ mtctr r12 -/* 801D8604 4E 80 04 21 */ bctrl -/* 801D8608 38 00 00 00 */ li r0, 0 -/* 801D860C 90 1E 00 08 */ stw r0, 8(r30) -lbl_801D8610: -/* 801D8610 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801D8614 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801D8618 80 63 5C 6C */ lwz r3, 0x5c6c(r3) -/* 801D861C 81 83 00 00 */ lwz r12, 0(r3) -/* 801D8620 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801D8624 7D 89 03 A6 */ mtctr r12 -/* 801D8628 4E 80 04 21 */ bctrl -/* 801D862C 7F E0 07 35 */ extsh. r0, r31 -/* 801D8630 40 81 00 0C */ ble lbl_801D863C -/* 801D8634 7F C3 F3 78 */ mr r3, r30 -/* 801D8638 48 0F 67 05 */ bl __dl__FPv -lbl_801D863C: -/* 801D863C 7F C3 F3 78 */ mr r3, r30 -/* 801D8640 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D8644 48 18 9B D9 */ bl _restgpr_26 -/* 801D8648 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D864C 7C 08 03 A6 */ mtlr r0 -/* 801D8650 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D8654 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/__sinit_d_menu_insect_cpp.s b/asm/d/menu/d_menu_insect/__sinit_d_menu_insect_cpp.s deleted file mode 100644 index 5558a6b2ef..0000000000 --- a/asm/d/menu/d_menu_insect/__sinit_d_menu_insect_cpp.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_801DA650: -/* 801DA650 3C 60 80 3C */ lis r3, cNullVec__6Z2Calc@ha /* 0x803BD780@ha */ -/* 801DA654 38 63 D7 80 */ addi r3, r3, cNullVec__6Z2Calc@l /* 0x803BD780@l */ -/* 801DA658 80 83 00 0C */ lwz r4, 0xc(r3) -/* 801DA65C 80 03 00 10 */ lwz r0, 0x10(r3) -/* 801DA660 90 83 00 48 */ stw r4, 0x48(r3) -/* 801DA664 90 03 00 4C */ stw r0, 0x4c(r3) -/* 801DA668 80 03 00 14 */ lwz r0, 0x14(r3) -/* 801DA66C 90 03 00 50 */ stw r0, 0x50(r3) -/* 801DA670 38 A3 00 48 */ addi r5, r3, 0x48 -/* 801DA674 80 83 00 18 */ lwz r4, 0x18(r3) -/* 801DA678 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 801DA67C 90 85 00 0C */ stw r4, 0xc(r5) -/* 801DA680 90 05 00 10 */ stw r0, 0x10(r5) -/* 801DA684 80 03 00 20 */ lwz r0, 0x20(r3) -/* 801DA688 90 05 00 14 */ stw r0, 0x14(r5) -/* 801DA68C 80 83 00 24 */ lwz r4, 0x24(r3) -/* 801DA690 80 03 00 28 */ lwz r0, 0x28(r3) -/* 801DA694 90 85 00 18 */ stw r4, 0x18(r5) -/* 801DA698 90 05 00 1C */ stw r0, 0x1c(r5) -/* 801DA69C 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 801DA6A0 90 05 00 20 */ stw r0, 0x20(r5) -/* 801DA6A4 80 83 00 30 */ lwz r4, 0x30(r3) -/* 801DA6A8 80 03 00 34 */ lwz r0, 0x34(r3) -/* 801DA6AC 90 85 00 24 */ stw r4, 0x24(r5) -/* 801DA6B0 90 05 00 28 */ stw r0, 0x28(r5) -/* 801DA6B4 80 03 00 38 */ lwz r0, 0x38(r3) -/* 801DA6B8 90 05 00 2C */ stw r0, 0x2c(r5) -/* 801DA6BC 80 83 00 3C */ lwz r4, 0x3c(r3) -/* 801DA6C0 80 03 00 40 */ lwz r0, 0x40(r3) -/* 801DA6C4 90 85 00 30 */ stw r4, 0x30(r5) -/* 801DA6C8 90 05 00 34 */ stw r0, 0x34(r5) -/* 801DA6CC 80 03 00 44 */ lwz r0, 0x44(r3) -/* 801DA6D0 90 05 00 38 */ stw r0, 0x38(r5) -/* 801DA6D4 80 83 00 84 */ lwz r4, 0x84(r3) -/* 801DA6D8 80 03 00 88 */ lwz r0, 0x88(r3) -/* 801DA6DC 90 83 00 C0 */ stw r4, 0xc0(r3) -/* 801DA6E0 90 03 00 C4 */ stw r0, 0xc4(r3) -/* 801DA6E4 80 03 00 8C */ lwz r0, 0x8c(r3) -/* 801DA6E8 90 03 00 C8 */ stw r0, 0xc8(r3) -/* 801DA6EC 38 A3 00 C0 */ addi r5, r3, 0xc0 -/* 801DA6F0 80 83 00 90 */ lwz r4, 0x90(r3) -/* 801DA6F4 80 03 00 94 */ lwz r0, 0x94(r3) -/* 801DA6F8 90 85 00 0C */ stw r4, 0xc(r5) -/* 801DA6FC 90 05 00 10 */ stw r0, 0x10(r5) -/* 801DA700 80 03 00 98 */ lwz r0, 0x98(r3) -/* 801DA704 90 05 00 14 */ stw r0, 0x14(r5) -/* 801DA708 80 83 00 9C */ lwz r4, 0x9c(r3) -/* 801DA70C 80 03 00 A0 */ lwz r0, 0xa0(r3) -/* 801DA710 90 85 00 18 */ stw r4, 0x18(r5) -/* 801DA714 90 05 00 1C */ stw r0, 0x1c(r5) -/* 801DA718 80 03 00 A4 */ lwz r0, 0xa4(r3) -/* 801DA71C 90 05 00 20 */ stw r0, 0x20(r5) -/* 801DA720 80 83 00 A8 */ lwz r4, 0xa8(r3) -/* 801DA724 80 03 00 AC */ lwz r0, 0xac(r3) -/* 801DA728 90 85 00 24 */ stw r4, 0x24(r5) -/* 801DA72C 90 05 00 28 */ stw r0, 0x28(r5) -/* 801DA730 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 801DA734 90 05 00 2C */ stw r0, 0x2c(r5) -/* 801DA738 80 83 00 B4 */ lwz r4, 0xb4(r3) -/* 801DA73C 80 03 00 B8 */ lwz r0, 0xb8(r3) -/* 801DA740 90 85 00 30 */ stw r4, 0x30(r5) -/* 801DA744 90 05 00 34 */ stw r0, 0x34(r5) -/* 801DA748 80 03 00 BC */ lwz r0, 0xbc(r3) -/* 801DA74C 90 05 00 38 */ stw r0, 0x38(r5) -/* 801DA750 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/_create__14dMenu_Insect_cFv.s b/asm/d/menu/d_menu_insect/_create__14dMenu_Insect_cFv.s deleted file mode 100644 index 3063165844..0000000000 --- a/asm/d/menu/d_menu_insect/_create__14dMenu_Insect_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_801D8658: -/* 801D8658 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D865C 7C 08 02 A6 */ mflr r0 -/* 801D8660 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D8664 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D8668 7C 7F 1B 78 */ mr r31, r3 -/* 801D866C 38 60 00 2C */ li r3, 0x2c -/* 801D8670 48 0F 65 DD */ bl __nw__FUl -/* 801D8674 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D8678 41 82 00 0C */ beq lbl_801D8684 -/* 801D867C 48 07 15 A5 */ bl __ct__12dMsgString_cFv -/* 801D8680 7C 60 1B 78 */ mr r0, r3 -lbl_801D8684: -/* 801D8684 90 1F 00 E8 */ stw r0, 0xe8(r31) -/* 801D8688 7F E3 FB 78 */ mr r3, r31 -/* 801D868C 48 00 0F B9 */ bl screenSetBase__14dMenu_Insect_cFv -/* 801D8690 7F E3 FB 78 */ mr r3, r31 -/* 801D8694 48 00 12 5D */ bl screenSetExplain__14dMenu_Insect_cFv -/* 801D8698 7F E3 FB 78 */ mr r3, r31 -/* 801D869C 48 00 15 35 */ bl screenSetDoIcon__14dMenu_Insect_cFv -/* 801D86A0 7F E3 FB 78 */ mr r3, r31 -/* 801D86A4 38 80 00 01 */ li r4, 1 -/* 801D86A8 48 00 1D BD */ bl setHIO__14dMenu_Insect_cFb -/* 801D86AC 7F E3 FB 78 */ mr r3, r31 -/* 801D86B0 48 00 02 65 */ bl init__14dMenu_Insect_cFv -/* 801D86B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801D86B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D86BC 7C 08 03 A6 */ mtlr r0 -/* 801D86C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D86C4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/_move__14dMenu_Insect_cFv.s b/asm/d/menu/d_menu_insect/_move__14dMenu_Insect_cFv.s deleted file mode 100644 index a04e6d6350..0000000000 --- a/asm/d/menu/d_menu_insect/_move__14dMenu_Insect_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_801D86C8: -/* 801D86C8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D86CC 7C 08 02 A6 */ mflr r0 -/* 801D86D0 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D86D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D86D8 48 18 9B 05 */ bl _savegpr_29 -/* 801D86DC 7C 7D 1B 78 */ mr r29, r3 -/* 801D86E0 80 63 00 04 */ lwz r3, 4(r3) -/* 801D86E4 4B E3 6A E9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801D86E8 7C 7E 1B 78 */ mr r30, r3 -/* 801D86EC 8B FD 00 F3 */ lbz r31, 0xf3(r29) -/* 801D86F0 7F A3 EB 78 */ mr r3, r29 -/* 801D86F4 1C BF 00 0C */ mulli r5, r31, 0xc -/* 801D86F8 3C 80 80 3C */ lis r4, map_move_process@ha /* 0x803BD840@ha */ -/* 801D86FC 38 04 D8 40 */ addi r0, r4, map_move_process@l /* 0x803BD840@l */ -/* 801D8700 7D 80 2A 14 */ add r12, r0, r5 -/* 801D8704 48 18 99 81 */ bl __ptmf_scall -/* 801D8708 60 00 00 00 */ nop -/* 801D870C 88 1D 00 F3 */ lbz r0, 0xf3(r29) -/* 801D8710 7C 1F 00 40 */ cmplw r31, r0 -/* 801D8714 41 82 00 20 */ beq lbl_801D8734 -/* 801D8718 7F A3 EB 78 */ mr r3, r29 -/* 801D871C 1C A0 00 0C */ mulli r5, r0, 0xc -/* 801D8720 3C 80 80 3C */ lis r4, map_init_process@ha /* 0x803BD7C8@ha */ -/* 801D8724 38 04 D7 C8 */ addi r0, r4, map_init_process@l /* 0x803BD7C8@l */ -/* 801D8728 7D 80 2A 14 */ add r12, r0, r5 -/* 801D872C 48 18 99 59 */ bl __ptmf_scall -/* 801D8730 60 00 00 00 */ nop -lbl_801D8734: -/* 801D8734 7F A3 EB 78 */ mr r3, r29 -/* 801D8738 38 80 00 00 */ li r4, 0 -/* 801D873C 48 00 1D 29 */ bl setHIO__14dMenu_Insect_cFb -/* 801D8740 7F C3 F3 78 */ mr r3, r30 -/* 801D8744 4B E3 6A 89 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801D8748 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D874C 48 18 9A DD */ bl _restgpr_29 -/* 801D8750 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D8754 7C 08 03 A6 */ mtlr r0 -/* 801D8758 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D875C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/explain_close_move__14dMenu_Insect_cFv.s b/asm/d/menu/d_menu_insect/explain_close_move__14dMenu_Insect_cFv.s deleted file mode 100644 index f4c7e92c12..0000000000 --- a/asm/d/menu/d_menu_insect/explain_close_move__14dMenu_Insect_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_801D95AC: -/* 801D95AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D95B0 7C 08 02 A6 */ mflr r0 -/* 801D95B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D95B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D95BC 93 C1 00 08 */ stw r30, 8(r1) -/* 801D95C0 7C 7E 1B 78 */ mr r30, r3 -/* 801D95C4 80 63 00 68 */ lwz r3, 0x68(r3) -/* 801D95C8 38 80 00 0A */ li r4, 0xa -/* 801D95CC 38 A0 00 FF */ li r5, 0xff -/* 801D95D0 38 C0 00 00 */ li r6, 0 -/* 801D95D4 38 E0 00 01 */ li r7, 1 -/* 801D95D8 48 07 C2 A1 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801D95DC 7C 7F 1B 78 */ mr r31, r3 -/* 801D95E0 88 1E 00 F6 */ lbz r0, 0xf6(r30) -/* 801D95E4 28 00 00 01 */ cmplwi r0, 1 -/* 801D95E8 40 82 00 28 */ bne lbl_801D9610 -/* 801D95EC 7F C3 F3 78 */ mr r3, r30 -/* 801D95F0 88 9E 00 F4 */ lbz r4, 0xf4(r30) -/* 801D95F4 88 BE 00 F5 */ lbz r5, 0xf5(r30) -/* 801D95F8 48 00 08 29 */ bl isGiveInsect__14dMenu_Insect_cFii -/* 801D95FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801D9600 40 82 00 10 */ bne lbl_801D9610 -/* 801D9604 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 801D9608 48 06 10 79 */ bl selAnimeEnd__17dMsgScrn3Select_cFv -/* 801D960C 48 00 00 08 */ b lbl_801D9614 -lbl_801D9610: -/* 801D9610 38 60 00 01 */ li r3, 1 -lbl_801D9614: -/* 801D9614 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 801D9618 41 82 00 14 */ beq lbl_801D962C -/* 801D961C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801D9620 41 82 00 0C */ beq lbl_801D962C -/* 801D9624 38 00 00 00 */ li r0, 0 -/* 801D9628 98 1E 00 F3 */ stb r0, 0xf3(r30) -lbl_801D962C: -/* 801D962C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801D9630 83 C1 00 08 */ lwz r30, 8(r1) -/* 801D9634 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D9638 7C 08 03 A6 */ mtlr r0 -/* 801D963C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D9640 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/explain_move_move__14dMenu_Insect_cFv.s b/asm/d/menu/d_menu_insect/explain_move_move__14dMenu_Insect_cFv.s deleted file mode 100644 index 1bfb0483a2..0000000000 --- a/asm/d/menu/d_menu_insect/explain_move_move__14dMenu_Insect_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_801D9268: -/* 801D9268 3C 80 80 3E */ lis r4, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 801D926C 38 84 D2 E8 */ addi r4, r4, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 801D9270 80 84 00 34 */ lwz r4, 0x34(r4) -/* 801D9274 54 80 05 EF */ rlwinm. r0, r4, 0, 0x17, 0x17 -/* 801D9278 40 82 00 0C */ bne lbl_801D9284 -/* 801D927C 54 80 05 AD */ rlwinm. r0, r4, 0, 0x16, 0x16 -/* 801D9280 4D 82 00 20 */ beqlr -lbl_801D9284: -/* 801D9284 38 00 00 04 */ li r0, 4 -/* 801D9288 98 03 00 F3 */ stb r0, 0xf3(r3) -/* 801D928C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/explain_open_move__14dMenu_Insect_cFv.s b/asm/d/menu/d_menu_insect/explain_open_move__14dMenu_Insect_cFv.s deleted file mode 100644 index 9899dc5458..0000000000 --- a/asm/d/menu/d_menu_insect/explain_open_move__14dMenu_Insect_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_801D91E4: -/* 801D91E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D91E8 7C 08 02 A6 */ mflr r0 -/* 801D91EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D91F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D91F4 7C 7F 1B 78 */ mr r31, r3 -/* 801D91F8 80 63 00 68 */ lwz r3, 0x68(r3) -/* 801D91FC 38 80 00 0A */ li r4, 0xa -/* 801D9200 38 A0 00 00 */ li r5, 0 -/* 801D9204 38 C0 00 FF */ li r6, 0xff -/* 801D9208 38 E0 00 01 */ li r7, 1 -/* 801D920C 48 07 C6 6D */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801D9210 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801D9214 41 82 00 3C */ beq lbl_801D9250 -/* 801D9218 88 1F 00 F6 */ lbz r0, 0xf6(r31) -/* 801D921C 28 00 00 01 */ cmplwi r0, 1 -/* 801D9220 40 82 00 28 */ bne lbl_801D9248 -/* 801D9224 7F E3 FB 78 */ mr r3, r31 -/* 801D9228 88 9F 00 F4 */ lbz r4, 0xf4(r31) -/* 801D922C 88 BF 00 F5 */ lbz r5, 0xf5(r31) -/* 801D9230 48 00 0B F1 */ bl isGiveInsect__14dMenu_Insect_cFii -/* 801D9234 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801D9238 40 82 00 10 */ bne lbl_801D9248 -/* 801D923C 38 00 00 03 */ li r0, 3 -/* 801D9240 98 1F 00 F3 */ stb r0, 0xf3(r31) -/* 801D9244 48 00 00 0C */ b lbl_801D9250 -lbl_801D9248: -/* 801D9248 38 00 00 02 */ li r0, 2 -/* 801D924C 98 1F 00 F3 */ stb r0, 0xf3(r31) -lbl_801D9250: -/* 801D9250 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801D9254 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D9258 7C 08 03 A6 */ mtlr r0 -/* 801D925C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D9260 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/getGetInsectNum__14dMenu_Insect_cFv.s b/asm/d/menu/d_menu_insect/getGetInsectNum__14dMenu_Insect_cFv.s deleted file mode 100644 index fd89fd459e..0000000000 --- a/asm/d/menu/d_menu_insect/getGetInsectNum__14dMenu_Insect_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_801D9D4C: -/* 801D9D4C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801D9D50 7C 08 02 A6 */ mflr r0 -/* 801D9D54 90 01 00 24 */ stw r0, 0x24(r1) -/* 801D9D58 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D9D5C 48 18 84 7D */ bl _savegpr_28 -/* 801D9D60 3B C0 00 00 */ li r30, 0 -/* 801D9D64 3C 60 80 3C */ lis r3, l_itemno_4346@ha /* 0x803BD87C@ha */ -/* 801D9D68 38 03 D8 7C */ addi r0, r3, l_itemno_4346@l /* 0x803BD87C@l */ -/* 801D9D6C 7C 1D 03 78 */ mr r29, r0 -/* 801D9D70 3B 80 00 00 */ li r28, 0 -/* 801D9D74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801D9D78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801D9D7C 3B E3 00 CC */ addi r31, r3, 0xcc -lbl_801D9D80: -/* 801D9D80 88 9D 00 00 */ lbz r4, 0(r29) -/* 801D9D84 7F E3 FB 78 */ mr r3, r31 -/* 801D9D88 3B BD 00 01 */ addi r29, r29, 1 -/* 801D9D8C 4B E5 A1 3D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 801D9D90 2C 03 00 00 */ cmpwi r3, 0 -/* 801D9D94 41 82 00 10 */ beq lbl_801D9DA4 -/* 801D9D98 57 C3 06 3E */ clrlwi r3, r30, 0x18 -/* 801D9D9C 38 03 00 01 */ addi r0, r3, 1 -/* 801D9DA0 54 1E 06 3E */ clrlwi r30, r0, 0x18 -lbl_801D9DA4: -/* 801D9DA4 3B 9C 00 01 */ addi r28, r28, 1 -/* 801D9DA8 28 1C 00 18 */ cmplwi r28, 0x18 -/* 801D9DAC 41 80 FF D4 */ blt lbl_801D9D80 -/* 801D9DB0 7F C3 F3 78 */ mr r3, r30 -/* 801D9DB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D9DB8 48 18 84 6D */ bl _restgpr_28 -/* 801D9DBC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801D9DC0 7C 08 03 A6 */ mtlr r0 -/* 801D9DC4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D9DC8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/getInsectItemID__14dMenu_Insect_cFii.s b/asm/d/menu/d_menu_insect/getInsectItemID__14dMenu_Insect_cFii.s deleted file mode 100644 index 22d6aaa8f9..0000000000 --- a/asm/d/menu/d_menu_insect/getInsectItemID__14dMenu_Insect_cFii.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_801D9DCC: -/* 801D9DCC 1C A5 00 06 */ mulli r5, r5, 6 -/* 801D9DD0 3C 60 80 3C */ lis r3, l_itemno_4364@ha /* 0x803BD894@ha */ -/* 801D9DD4 38 03 D8 94 */ addi r0, r3, l_itemno_4364@l /* 0x803BD894@l */ -/* 801D9DD8 7C 64 2A 14 */ add r3, r4, r5 -/* 801D9DDC 7C 63 00 AE */ lbzx r3, r3, r0 -/* 801D9DE0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/init__14dMenu_Insect_cFv.s b/asm/d/menu/d_menu_insect/init__14dMenu_Insect_cFv.s deleted file mode 100644 index de2c64efdd..0000000000 --- a/asm/d/menu/d_menu_insect/init__14dMenu_Insect_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_801D8914: -/* 801D8914 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D8918 7C 08 02 A6 */ mflr r0 -/* 801D891C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D8920 88 03 00 F3 */ lbz r0, 0xf3(r3) -/* 801D8924 1C A0 00 0C */ mulli r5, r0, 0xc -/* 801D8928 3C 80 80 3C */ lis r4, map_init_process@ha /* 0x803BD7C8@ha */ -/* 801D892C 38 04 D7 C8 */ addi r0, r4, map_init_process@l /* 0x803BD7C8@l */ -/* 801D8930 7D 80 2A 14 */ add r12, r0, r5 -/* 801D8934 48 18 97 51 */ bl __ptmf_scall -/* 801D8938 60 00 00 00 */ nop -/* 801D893C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D8940 7C 08 03 A6 */ mtlr r0 -/* 801D8944 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D8948 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/isCatchInsect__14dMenu_Insect_cFUc.s b/asm/d/menu/d_menu_insect/isCatchInsect__14dMenu_Insect_cFUc.s deleted file mode 100644 index 9b7a7ae394..0000000000 --- a/asm/d/menu/d_menu_insect/isCatchInsect__14dMenu_Insect_cFUc.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801D9E7C: -/* 801D9E7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D9E80 7C 08 02 A6 */ mflr r0 -/* 801D9E84 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D9E88 7C 64 1B 78 */ mr r4, r3 -/* 801D9E8C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801D9E90 28 00 00 C0 */ cmplwi r0, 0xc0 -/* 801D9E94 41 80 00 2C */ blt lbl_801D9EC0 -/* 801D9E98 28 00 00 D7 */ cmplwi r0, 0xd7 -/* 801D9E9C 41 81 00 24 */ bgt lbl_801D9EC0 -/* 801D9EA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801D9EA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801D9EA8 38 63 00 CC */ addi r3, r3, 0xcc -/* 801D9EAC 4B E5 A0 1D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 801D9EB0 30 03 FF FF */ addic r0, r3, -1 -/* 801D9EB4 7C 00 19 10 */ subfe r0, r0, r3 -/* 801D9EB8 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 801D9EBC 48 00 00 08 */ b lbl_801D9EC4 -lbl_801D9EC0: -/* 801D9EC0 38 60 00 00 */ li r3, 0 -lbl_801D9EC4: -/* 801D9EC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D9EC8 7C 08 03 A6 */ mtlr r0 -/* 801D9ECC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D9ED0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/isCatchNotGiveInsect__14dMenu_Insect_cFUc.s b/asm/d/menu/d_menu_insect/isCatchNotGiveInsect__14dMenu_Insect_cFUc.s deleted file mode 100644 index 2484048c2e..0000000000 --- a/asm/d/menu/d_menu_insect/isCatchNotGiveInsect__14dMenu_Insect_cFUc.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801D9F3C: -/* 801D9F3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D9F40 7C 08 02 A6 */ mflr r0 -/* 801D9F44 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D9F48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D9F4C 7C 7F 1B 78 */ mr r31, r3 -/* 801D9F50 4B FF FF 2D */ bl isCatchInsect__14dMenu_Insect_cFUc -/* 801D9F54 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801D9F58 41 82 00 1C */ beq lbl_801D9F74 -/* 801D9F5C 7F E3 FB 78 */ mr r3, r31 -/* 801D9F60 4B FF FF 75 */ bl isGiveInsect__14dMenu_Insect_cFUc -/* 801D9F64 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801D9F68 40 82 00 0C */ bne lbl_801D9F74 -/* 801D9F6C 38 60 00 01 */ li r3, 1 -/* 801D9F70 48 00 00 08 */ b lbl_801D9F78 -lbl_801D9F74: -/* 801D9F74 38 60 00 00 */ li r3, 0 -lbl_801D9F78: -/* 801D9F78 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801D9F7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D9F80 7C 08 03 A6 */ mtlr r0 -/* 801D9F84 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D9F88 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/isGetInsect__14dMenu_Insect_cFii.s b/asm/d/menu/d_menu_insect/isGetInsect__14dMenu_Insect_cFii.s deleted file mode 100644 index 9390f7f423..0000000000 --- a/asm/d/menu/d_menu_insect/isGetInsect__14dMenu_Insect_cFii.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_801D9DE4: -/* 801D9DE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D9DE8 7C 08 02 A6 */ mflr r0 -/* 801D9DEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D9DF0 4B FF FF DD */ bl getInsectItemID__14dMenu_Insect_cFii -/* 801D9DF4 7C 64 1B 78 */ mr r4, r3 -/* 801D9DF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801D9DFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801D9E00 38 63 00 CC */ addi r3, r3, 0xcc -/* 801D9E04 4B E5 A0 C5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 801D9E08 30 03 FF FF */ addic r0, r3, -1 -/* 801D9E0C 7C 60 19 10 */ subfe r3, r0, r3 -/* 801D9E10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D9E14 7C 08 03 A6 */ mtlr r0 -/* 801D9E18 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D9E1C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/isGiveInsect__14dMenu_Insect_cFUc.s b/asm/d/menu/d_menu_insect/isGiveInsect__14dMenu_Insect_cFUc.s deleted file mode 100644 index 5b71f5dac3..0000000000 --- a/asm/d/menu/d_menu_insect/isGiveInsect__14dMenu_Insect_cFUc.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_801D9ED4: -/* 801D9ED4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D9ED8 7C 08 02 A6 */ mflr r0 -/* 801D9EDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D9EE0 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 801D9EE4 28 04 00 C0 */ cmplwi r4, 0xc0 -/* 801D9EE8 41 80 00 40 */ blt lbl_801D9F28 -/* 801D9EEC 28 04 00 D7 */ cmplwi r4, 0xd7 -/* 801D9EF0 41 81 00 38 */ bgt lbl_801D9F28 -/* 801D9EF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801D9EF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801D9EFC 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 801D9F00 38 04 00 D1 */ addi r0, r4, 0xd1 -/* 801D9F04 54 00 08 3C */ slwi r0, r0, 1 -/* 801D9F08 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801D9F0C 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801D9F10 7C 84 02 2E */ lhzx r4, r4, r0 -/* 801D9F14 4B E5 AA A9 */ bl isEventBit__11dSv_event_cCFUs -/* 801D9F18 30 03 FF FF */ addic r0, r3, -1 -/* 801D9F1C 7C 00 19 10 */ subfe r0, r0, r3 -/* 801D9F20 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 801D9F24 48 00 00 08 */ b lbl_801D9F2C -lbl_801D9F28: -/* 801D9F28 38 60 00 00 */ li r3, 0 -lbl_801D9F2C: -/* 801D9F2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D9F30 7C 08 03 A6 */ mtlr r0 -/* 801D9F34 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D9F38 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/isGiveInsect__14dMenu_Insect_cFii.s b/asm/d/menu/d_menu_insect/isGiveInsect__14dMenu_Insect_cFii.s deleted file mode 100644 index f996aa73d9..0000000000 --- a/asm/d/menu/d_menu_insect/isGiveInsect__14dMenu_Insect_cFii.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801D9E20: -/* 801D9E20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D9E24 7C 08 02 A6 */ mflr r0 -/* 801D9E28 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D9E2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801D9E30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801D9E34 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 801D9E38 1C 05 00 06 */ mulli r0, r5, 6 -/* 801D9E3C 7C 04 02 14 */ add r0, r4, r0 -/* 801D9E40 54 00 10 3A */ slwi r0, r0, 2 -/* 801D9E44 3C 80 80 39 */ lis r4, i_evtID@ha /* 0x80396860@ha */ -/* 801D9E48 38 84 68 60 */ addi r4, r4, i_evtID@l /* 0x80396860@l */ -/* 801D9E4C 7C 04 00 2E */ lwzx r0, r4, r0 -/* 801D9E50 54 00 08 3C */ slwi r0, r0, 1 -/* 801D9E54 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801D9E58 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801D9E5C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 801D9E60 4B E5 AB 5D */ bl isEventBit__11dSv_event_cCFUs -/* 801D9E64 30 03 FF FF */ addic r0, r3, -1 -/* 801D9E68 7C 60 19 10 */ subfe r3, r0, r3 -/* 801D9E6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D9E70 7C 08 03 A6 */ mtlr r0 -/* 801D9E74 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D9E78 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/isSync__14dMenu_Insect_cFv.s b/asm/d/menu/d_menu_insect/isSync__14dMenu_Insect_cFv.s deleted file mode 100644 index 2a227842c7..0000000000 --- a/asm/d/menu/d_menu_insect/isSync__14dMenu_Insect_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_801D88EC: -/* 801D88EC 80 63 00 14 */ lwz r3, 0x14(r3) -/* 801D88F0 28 03 00 00 */ cmplwi r3, 0 -/* 801D88F4 41 82 00 18 */ beq lbl_801D890C -/* 801D88F8 88 03 00 0C */ lbz r0, 0xc(r3) -/* 801D88FC 2C 00 00 00 */ cmpwi r0, 0 -/* 801D8900 40 82 00 0C */ bne lbl_801D890C -/* 801D8904 38 60 00 00 */ li r3, 0 -/* 801D8908 4E 80 00 20 */ blr -lbl_801D890C: -/* 801D890C 38 60 00 01 */ li r3, 1 -/* 801D8910 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/screenSetDoIcon__14dMenu_Insect_cFv.s b/asm/d/menu/d_menu_insect/screenSetDoIcon__14dMenu_Insect_cFv.s deleted file mode 100644 index ccdba90582..0000000000 --- a/asm/d/menu/d_menu_insect/screenSetDoIcon__14dMenu_Insect_cFv.s +++ /dev/null @@ -1,99 +0,0 @@ -lbl_801D9BD0: -/* 801D9BD0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801D9BD4 7C 08 02 A6 */ mflr r0 -/* 801D9BD8 90 01 00 34 */ stw r0, 0x34(r1) -/* 801D9BDC 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D9BE0 48 18 85 E9 */ bl _savegpr_24 -/* 801D9BE4 7C 7F 1B 78 */ mr r31, r3 -/* 801D9BE8 38 60 01 18 */ li r3, 0x118 -/* 801D9BEC 48 0F 50 61 */ bl __nw__FUl -/* 801D9BF0 7C 60 1B 79 */ or. r0, r3, r3 -/* 801D9BF4 41 82 00 0C */ beq lbl_801D9C00 -/* 801D9BF8 48 11 E8 A1 */ bl __ct__9J2DScreenFv -/* 801D9BFC 7C 60 1B 78 */ mr r0, r3 -lbl_801D9C00: -/* 801D9C00 90 1F 00 28 */ stw r0, 0x28(r31) -/* 801D9C04 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 801D9C08 3C 80 80 39 */ lis r4, d_menu_d_menu_insect__stringBase0@ha /* 0x803968C0@ha */ -/* 801D9C0C 38 84 68 C0 */ addi r4, r4, d_menu_d_menu_insect__stringBase0@l /* 0x803968C0@l */ -/* 801D9C10 38 84 00 66 */ addi r4, r4, 0x66 -/* 801D9C14 3C A0 00 02 */ lis r5, 2 -/* 801D9C18 80 DF 00 08 */ lwz r6, 8(r31) -/* 801D9C1C 48 11 EA 2D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 801D9C20 38 60 00 00 */ li r3, 0 -/* 801D9C24 7C 65 1B 78 */ mr r5, r3 -/* 801D9C28 7C 64 1B 78 */ mr r4, r3 -/* 801D9C2C 38 00 00 02 */ li r0, 2 -/* 801D9C30 7C 09 03 A6 */ mtctr r0 -lbl_801D9C34: -/* 801D9C34 7C DF 1A 14 */ add r6, r31, r3 -/* 801D9C38 90 A6 00 D8 */ stw r5, 0xd8(r6) -/* 801D9C3C 90 86 00 E0 */ stw r4, 0xe0(r6) -/* 801D9C40 38 63 00 04 */ addi r3, r3, 4 -/* 801D9C44 42 00 FF F0 */ bdnz lbl_801D9C34 -/* 801D9C48 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 801D9C4C 48 07 B4 9D */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 801D9C50 3B 00 00 00 */ li r24, 0 -/* 801D9C54 3B C0 00 00 */ li r30, 0 -/* 801D9C58 3B A0 00 00 */ li r29, 0 -/* 801D9C5C 3C 60 80 39 */ lis r3, text_a_tag@ha /* 0x80396810@ha */ -/* 801D9C60 3B 43 68 10 */ addi r26, r3, text_a_tag@l /* 0x80396810@l */ -/* 801D9C64 3C 60 80 39 */ lis r3, text_b_tag@ha /* 0x80396838@ha */ -/* 801D9C68 3B 63 68 38 */ addi r27, r3, text_b_tag@l /* 0x80396838@l */ -/* 801D9C6C 3C 60 80 39 */ lis r3, d_menu_d_menu_insect__stringBase0@ha /* 0x803968C0@ha */ -/* 801D9C70 3B 83 68 C0 */ addi r28, r3, d_menu_d_menu_insect__stringBase0@l /* 0x803968C0@l */ -lbl_801D9C74: -/* 801D9C74 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 801D9C78 7C 9A EA 14 */ add r4, r26, r29 -/* 801D9C7C 80 A4 00 00 */ lwz r5, 0(r4) -/* 801D9C80 80 C4 00 04 */ lwz r6, 4(r4) -/* 801D9C84 81 83 00 00 */ lwz r12, 0(r3) -/* 801D9C88 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D9C8C 7D 89 03 A6 */ mtctr r12 -/* 801D9C90 4E 80 04 21 */ bctrl -/* 801D9C94 7F 3F F2 14 */ add r25, r31, r30 -/* 801D9C98 90 79 00 2C */ stw r3, 0x2c(r25) -/* 801D9C9C 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 801D9CA0 7C 9B EA 14 */ add r4, r27, r29 -/* 801D9CA4 80 A4 00 00 */ lwz r5, 0(r4) -/* 801D9CA8 80 C4 00 04 */ lwz r6, 4(r4) -/* 801D9CAC 81 83 00 00 */ lwz r12, 0(r3) -/* 801D9CB0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801D9CB4 7D 89 03 A6 */ mtctr r12 -/* 801D9CB8 4E 80 04 21 */ bctrl -/* 801D9CBC 90 79 00 40 */ stw r3, 0x40(r25) -/* 801D9CC0 4B E3 AD 31 */ bl mDoExt_getMesgFont__Fv -/* 801D9CC4 7C 64 1B 78 */ mr r4, r3 -/* 801D9CC8 80 79 00 2C */ lwz r3, 0x2c(r25) -/* 801D9CCC 81 83 00 00 */ lwz r12, 0(r3) -/* 801D9CD0 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801D9CD4 7D 89 03 A6 */ mtctr r12 -/* 801D9CD8 4E 80 04 21 */ bctrl -/* 801D9CDC 4B E3 AD 15 */ bl mDoExt_getMesgFont__Fv -/* 801D9CE0 7C 64 1B 78 */ mr r4, r3 -/* 801D9CE4 80 79 00 40 */ lwz r3, 0x40(r25) -/* 801D9CE8 81 83 00 00 */ lwz r12, 0(r3) -/* 801D9CEC 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801D9CF0 7D 89 03 A6 */ mtctr r12 -/* 801D9CF4 4E 80 04 21 */ bctrl -/* 801D9CF8 80 79 00 2C */ lwz r3, 0x2c(r25) -/* 801D9CFC 38 80 00 20 */ li r4, 0x20 -/* 801D9D00 38 BC 00 32 */ addi r5, r28, 0x32 -/* 801D9D04 4C C6 31 82 */ crclr 6 -/* 801D9D08 48 12 6A 45 */ bl setString__10J2DTextBoxFsPCce -/* 801D9D0C 80 79 00 40 */ lwz r3, 0x40(r25) -/* 801D9D10 38 80 00 20 */ li r4, 0x20 -/* 801D9D14 38 BC 00 32 */ addi r5, r28, 0x32 -/* 801D9D18 4C C6 31 82 */ crclr 6 -/* 801D9D1C 48 12 6A 31 */ bl setString__10J2DTextBoxFsPCce -/* 801D9D20 3B 18 00 01 */ addi r24, r24, 1 -/* 801D9D24 2C 18 00 05 */ cmpwi r24, 5 -/* 801D9D28 3B DE 00 04 */ addi r30, r30, 4 -/* 801D9D2C 3B BD 00 08 */ addi r29, r29, 8 -/* 801D9D30 41 80 FF 44 */ blt lbl_801D9C74 -/* 801D9D34 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D9D38 48 18 84 DD */ bl _restgpr_24 -/* 801D9D3C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801D9D40 7C 08 03 A6 */ mtlr r0 -/* 801D9D44 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D9D48 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/select_move_init__14dMenu_Insect_cFv.s b/asm/d/menu/d_menu_insect/select_move_init__14dMenu_Insect_cFv.s deleted file mode 100644 index 91c50c3f0a..0000000000 --- a/asm/d/menu/d_menu_insect/select_move_init__14dMenu_Insect_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_801D9290: -/* 801D9290 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D9294 7C 08 02 A6 */ mflr r0 -/* 801D9298 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D929C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D92A0 7C 7F 1B 78 */ mr r31, r3 -/* 801D92A4 38 00 00 FF */ li r0, 0xff -/* 801D92A8 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801D92AC 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801D92B0 98 04 00 C3 */ stb r0, 0xc3(r4) -/* 801D92B4 38 80 04 0C */ li r4, 0x40c -/* 801D92B8 48 00 10 4D */ bl setAButtonString__14dMenu_Insect_cFUs -/* 801D92BC 7F E3 FB 78 */ mr r3, r31 -/* 801D92C0 38 80 03 F9 */ li r4, 0x3f9 -/* 801D92C4 48 00 10 F1 */ bl setBButtonString__14dMenu_Insect_cFUs -/* 801D92C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801D92CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D92D0 7C 08 03 A6 */ mtlr r0 -/* 801D92D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D92D8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/setAButtonString__14dMenu_Insect_cFUs.s b/asm/d/menu/d_menu_insect/setAButtonString__14dMenu_Insect_cFUs.s deleted file mode 100644 index 37d8c6a6f8..0000000000 --- a/asm/d/menu/d_menu_insect/setAButtonString__14dMenu_Insect_cFUs.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_801DA304: -/* 801DA304 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801DA308 7C 08 02 A6 */ mflr r0 -/* 801DA30C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801DA310 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DA314 48 18 7E C1 */ bl _savegpr_27 -/* 801DA318 7C 7B 1B 78 */ mr r27, r3 -/* 801DA31C 54 9D 04 3F */ clrlwi. r29, r4, 0x10 -/* 801DA320 40 82 00 3C */ bne lbl_801DA35C -/* 801DA324 3B A0 00 00 */ li r29, 0 -/* 801DA328 3B E0 00 00 */ li r31, 0 -/* 801DA32C 3C 60 80 39 */ lis r3, d_menu_d_menu_insect__stringBase0@ha /* 0x803968C0@ha */ -/* 801DA330 3B C3 68 C0 */ addi r30, r3, d_menu_d_menu_insect__stringBase0@l /* 0x803968C0@l */ -lbl_801DA334: -/* 801DA334 38 1F 00 2C */ addi r0, r31, 0x2c -/* 801DA338 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801DA33C 48 12 63 1D */ bl getStringPtr__10J2DTextBoxCFv -/* 801DA340 38 9E 00 32 */ addi r4, r30, 0x32 -/* 801DA344 48 18 E7 E9 */ bl strcpy -/* 801DA348 3B BD 00 01 */ addi r29, r29, 1 -/* 801DA34C 2C 1D 00 05 */ cmpwi r29, 5 -/* 801DA350 3B FF 00 04 */ addi r31, r31, 4 -/* 801DA354 41 80 FF E0 */ blt lbl_801DA334 -/* 801DA358 48 00 00 44 */ b lbl_801DA39C -lbl_801DA35C: -/* 801DA35C 3B 80 00 00 */ li r28, 0 -/* 801DA360 3B E0 00 00 */ li r31, 0 -/* 801DA364 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801DA368 3B C3 01 88 */ addi r30, r3, g_meter2_info@l /* 0x80430188@l */ -lbl_801DA36C: -/* 801DA36C 38 1F 00 2C */ addi r0, r31, 0x2c -/* 801DA370 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801DA374 48 12 62 E5 */ bl getStringPtr__10J2DTextBoxCFv -/* 801DA378 7C 65 1B 78 */ mr r5, r3 -/* 801DA37C 7F C3 F3 78 */ mr r3, r30 -/* 801DA380 7F A4 EB 78 */ mr r4, r29 -/* 801DA384 38 C0 00 00 */ li r6, 0 -/* 801DA388 48 04 21 BD */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 801DA38C 3B 9C 00 01 */ addi r28, r28, 1 -/* 801DA390 2C 1C 00 05 */ cmpwi r28, 5 -/* 801DA394 3B FF 00 04 */ addi r31, r31, 4 -/* 801DA398 41 80 FF D4 */ blt lbl_801DA36C -lbl_801DA39C: -/* 801DA39C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DA3A0 48 18 7E 81 */ bl _restgpr_27 -/* 801DA3A4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801DA3A8 7C 08 03 A6 */ mtlr r0 -/* 801DA3AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DA3B0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/setBButtonString__14dMenu_Insect_cFUs.s b/asm/d/menu/d_menu_insect/setBButtonString__14dMenu_Insect_cFUs.s deleted file mode 100644 index 333670440b..0000000000 --- a/asm/d/menu/d_menu_insect/setBButtonString__14dMenu_Insect_cFUs.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_801DA3B4: -/* 801DA3B4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801DA3B8 7C 08 02 A6 */ mflr r0 -/* 801DA3BC 90 01 00 24 */ stw r0, 0x24(r1) -/* 801DA3C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DA3C4 48 18 7E 11 */ bl _savegpr_27 -/* 801DA3C8 7C 7B 1B 78 */ mr r27, r3 -/* 801DA3CC 54 9D 04 3F */ clrlwi. r29, r4, 0x10 -/* 801DA3D0 40 82 00 3C */ bne lbl_801DA40C -/* 801DA3D4 3B A0 00 00 */ li r29, 0 -/* 801DA3D8 3B E0 00 00 */ li r31, 0 -/* 801DA3DC 3C 60 80 39 */ lis r3, d_menu_d_menu_insect__stringBase0@ha /* 0x803968C0@ha */ -/* 801DA3E0 3B C3 68 C0 */ addi r30, r3, d_menu_d_menu_insect__stringBase0@l /* 0x803968C0@l */ -lbl_801DA3E4: -/* 801DA3E4 38 1F 00 40 */ addi r0, r31, 0x40 -/* 801DA3E8 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801DA3EC 48 12 62 6D */ bl getStringPtr__10J2DTextBoxCFv -/* 801DA3F0 38 9E 00 32 */ addi r4, r30, 0x32 -/* 801DA3F4 48 18 E7 39 */ bl strcpy -/* 801DA3F8 3B BD 00 01 */ addi r29, r29, 1 -/* 801DA3FC 2C 1D 00 05 */ cmpwi r29, 5 -/* 801DA400 3B FF 00 04 */ addi r31, r31, 4 -/* 801DA404 41 80 FF E0 */ blt lbl_801DA3E4 -/* 801DA408 48 00 00 44 */ b lbl_801DA44C -lbl_801DA40C: -/* 801DA40C 3B 80 00 00 */ li r28, 0 -/* 801DA410 3B E0 00 00 */ li r31, 0 -/* 801DA414 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801DA418 3B C3 01 88 */ addi r30, r3, g_meter2_info@l /* 0x80430188@l */ -lbl_801DA41C: -/* 801DA41C 38 1F 00 40 */ addi r0, r31, 0x40 -/* 801DA420 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801DA424 48 12 62 35 */ bl getStringPtr__10J2DTextBoxCFv -/* 801DA428 7C 65 1B 78 */ mr r5, r3 -/* 801DA42C 7F C3 F3 78 */ mr r3, r30 -/* 801DA430 7F A4 EB 78 */ mr r4, r29 -/* 801DA434 38 C0 00 00 */ li r6, 0 -/* 801DA438 48 04 21 0D */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 801DA43C 3B 9C 00 01 */ addi r28, r28, 1 -/* 801DA440 2C 1C 00 05 */ cmpwi r28, 5 -/* 801DA444 3B FF 00 04 */ addi r31, r31, 4 -/* 801DA448 41 80 FF D4 */ blt lbl_801DA41C -lbl_801DA44C: -/* 801DA44C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DA450 48 18 7D D1 */ bl _restgpr_27 -/* 801DA454 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801DA458 7C 08 03 A6 */ mtlr r0 -/* 801DA45C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DA460 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/setCursorPos__14dMenu_Insect_cFv.s b/asm/d/menu/d_menu_insect/setCursorPos__14dMenu_Insect_cFv.s deleted file mode 100644 index 7ba3a6177a..0000000000 --- a/asm/d/menu/d_menu_insect/setCursorPos__14dMenu_Insect_cFv.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_801DA1EC: -/* 801DA1EC 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 801DA1F0 7C 08 02 A6 */ mflr r0 -/* 801DA1F4 90 01 00 44 */ stw r0, 0x44(r1) -/* 801DA1F8 39 61 00 40 */ addi r11, r1, 0x40 -/* 801DA1FC 48 18 7F D9 */ bl _savegpr_27 -/* 801DA200 7C 7E 1B 78 */ mr r30, r3 -/* 801DA204 88 63 00 F4 */ lbz r3, 0xf4(r3) -/* 801DA208 88 1E 00 F5 */ lbz r0, 0xf5(r30) -/* 801DA20C 1C 00 00 06 */ mulli r0, r0, 6 -/* 801DA210 7F E3 02 14 */ add r31, r3, r0 -/* 801DA214 57 E0 10 3A */ slwi r0, r31, 2 -/* 801DA218 7F 9E 02 14 */ add r28, r30, r0 -/* 801DA21C 80 9C 00 6C */ lwz r4, 0x6c(r28) -/* 801DA220 38 61 00 08 */ addi r3, r1, 8 -/* 801DA224 80 A4 00 04 */ lwz r5, 4(r4) -/* 801DA228 38 C0 00 00 */ li r6, 0 -/* 801DA22C 38 E0 00 00 */ li r7, 0 -/* 801DA230 48 07 AC 8D */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs -/* 801DA234 80 61 00 08 */ lwz r3, 8(r1) -/* 801DA238 80 01 00 0C */ lwz r0, 0xc(r1) -/* 801DA23C 90 61 00 14 */ stw r3, 0x14(r1) -/* 801DA240 90 01 00 18 */ stw r0, 0x18(r1) -/* 801DA244 80 01 00 10 */ lwz r0, 0x10(r1) -/* 801DA248 90 01 00 1C */ stw r0, 0x1c(r1) -/* 801DA24C 80 7C 00 6C */ lwz r3, 0x6c(r28) -/* 801DA250 80 83 00 04 */ lwz r4, 4(r3) -/* 801DA254 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801DA258 C0 21 00 14 */ lfs f1, 0x14(r1) -/* 801DA25C C0 41 00 18 */ lfs f2, 0x18(r1) -/* 801DA260 38 A0 00 00 */ li r5, 0 -/* 801DA264 4B FB AE 91 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb -/* 801DA268 3B 60 00 00 */ li r27, 0 -/* 801DA26C 3B A0 00 00 */ li r29, 0 -/* 801DA270 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801DA274 3B 83 EB C8 */ addi r28, r3, g_drawHIO@l /* 0x8042EBC8@l */ -lbl_801DA278: -/* 801DA278 7C 1B F8 00 */ cmpw r27, r31 -/* 801DA27C 40 82 00 30 */ bne lbl_801DA2AC -/* 801DA280 C0 1C 09 E8 */ lfs f0, 0x9e8(r28) -/* 801DA284 38 1D 00 6C */ addi r0, r29, 0x6c -/* 801DA288 7C 7E 00 2E */ lwzx r3, r30, r0 -/* 801DA28C 80 63 00 04 */ lwz r3, 4(r3) -/* 801DA290 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801DA294 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801DA298 81 83 00 00 */ lwz r12, 0(r3) -/* 801DA29C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801DA2A0 7D 89 03 A6 */ mtctr r12 -/* 801DA2A4 4E 80 04 21 */ bctrl -/* 801DA2A8 48 00 00 2C */ b lbl_801DA2D4 -lbl_801DA2AC: -/* 801DA2AC C0 1C 09 E4 */ lfs f0, 0x9e4(r28) -/* 801DA2B0 38 1D 00 6C */ addi r0, r29, 0x6c -/* 801DA2B4 7C 7E 00 2E */ lwzx r3, r30, r0 -/* 801DA2B8 80 63 00 04 */ lwz r3, 4(r3) -/* 801DA2BC D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801DA2C0 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801DA2C4 81 83 00 00 */ lwz r12, 0(r3) -/* 801DA2C8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801DA2CC 7D 89 03 A6 */ mtctr r12 -/* 801DA2D0 4E 80 04 21 */ bctrl -lbl_801DA2D4: -/* 801DA2D4 3B 7B 00 01 */ addi r27, r27, 1 -/* 801DA2D8 2C 1B 00 18 */ cmpwi r27, 0x18 -/* 801DA2DC 3B BD 00 04 */ addi r29, r29, 4 -/* 801DA2E0 41 80 FF 98 */ blt lbl_801DA278 -/* 801DA2E4 39 61 00 40 */ addi r11, r1, 0x40 -/* 801DA2E8 48 18 7F 39 */ bl _restgpr_27 -/* 801DA2EC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 801DA2F0 7C 08 03 A6 */ mtlr r0 -/* 801DA2F4 38 21 00 40 */ addi r1, r1, 0x40 -/* 801DA2F8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/setHIO__14dMenu_Insect_cFb.s b/asm/d/menu/d_menu_insect/setHIO__14dMenu_Insect_cFb.s deleted file mode 100644 index 0fd59fb2a9..0000000000 --- a/asm/d/menu/d_menu_insect/setHIO__14dMenu_Insect_cFb.s +++ /dev/null @@ -1,123 +0,0 @@ -lbl_801DA464: -/* 801DA464 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801DA468 7C 08 02 A6 */ mflr r0 -/* 801DA46C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801DA470 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801DA474 93 C1 00 08 */ stw r30, 8(r1) -/* 801DA478 7C 7F 1B 78 */ mr r31, r3 -/* 801DA47C 7C 9E 23 78 */ mr r30, r4 -/* 801DA480 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 801DA484 40 82 00 18 */ bne lbl_801DA49C -/* 801DA488 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801DA48C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801DA490 88 03 0A 19 */ lbz r0, 0xa19(r3) -/* 801DA494 28 00 00 00 */ cmplwi r0, 0 -/* 801DA498 41 82 00 34 */ beq lbl_801DA4CC -lbl_801DA49C: -/* 801DA49C 80 7F 00 D0 */ lwz r3, 0xd0(r31) -/* 801DA4A0 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801DA4A4 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801DA4A8 C0 24 09 EC */ lfs f1, 0x9ec(r4) -/* 801DA4AC C0 44 09 F0 */ lfs f2, 0x9f0(r4) -/* 801DA4B0 48 07 A1 01 */ bl paneTrans__8CPaneMgrFff -/* 801DA4B4 80 7F 00 D4 */ lwz r3, 0xd4(r31) -/* 801DA4B8 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801DA4BC 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801DA4C0 C0 24 09 F4 */ lfs f1, 0x9f4(r4) -/* 801DA4C4 C0 44 09 FC */ lfs f2, 0x9fc(r4) -/* 801DA4C8 48 07 A0 E9 */ bl paneTrans__8CPaneMgrFff -lbl_801DA4CC: -/* 801DA4CC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801DA4D0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801DA4D4 88 03 06 B4 */ lbz r0, 0x6b4(r3) -/* 801DA4D8 28 00 00 00 */ cmplwi r0, 0 -/* 801DA4DC 40 82 00 0C */ bne lbl_801DA4E8 -/* 801DA4E0 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 801DA4E4 41 82 01 34 */ beq lbl_801DA618 -lbl_801DA4E8: -/* 801DA4E8 80 7F 00 D8 */ lwz r3, 0xd8(r31) -/* 801DA4EC 28 03 00 00 */ cmplwi r3, 0 -/* 801DA4F0 41 82 00 44 */ beq lbl_801DA534 -/* 801DA4F4 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801DA4F8 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801DA4FC C0 24 06 60 */ lfs f1, 0x660(r4) -/* 801DA500 C0 44 06 64 */ lfs f2, 0x664(r4) -/* 801DA504 48 07 A0 AD */ bl paneTrans__8CPaneMgrFff -/* 801DA508 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801DA50C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801DA510 C0 03 06 68 */ lfs f0, 0x668(r3) -/* 801DA514 80 7F 00 D8 */ lwz r3, 0xd8(r31) -/* 801DA518 80 63 00 04 */ lwz r3, 4(r3) -/* 801DA51C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801DA520 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801DA524 81 83 00 00 */ lwz r12, 0(r3) -/* 801DA528 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801DA52C 7D 89 03 A6 */ mtctr r12 -/* 801DA530 4E 80 04 21 */ bctrl -lbl_801DA534: -/* 801DA534 80 7F 00 DC */ lwz r3, 0xdc(r31) -/* 801DA538 28 03 00 00 */ cmplwi r3, 0 -/* 801DA53C 41 82 00 44 */ beq lbl_801DA580 -/* 801DA540 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801DA544 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801DA548 C0 24 06 6C */ lfs f1, 0x66c(r4) -/* 801DA54C C0 44 06 70 */ lfs f2, 0x670(r4) -/* 801DA550 48 07 A0 61 */ bl paneTrans__8CPaneMgrFff -/* 801DA554 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801DA558 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801DA55C C0 03 06 74 */ lfs f0, 0x674(r3) -/* 801DA560 80 7F 00 DC */ lwz r3, 0xdc(r31) -/* 801DA564 80 63 00 04 */ lwz r3, 4(r3) -/* 801DA568 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801DA56C D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801DA570 81 83 00 00 */ lwz r12, 0(r3) -/* 801DA574 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801DA578 7D 89 03 A6 */ mtctr r12 -/* 801DA57C 4E 80 04 21 */ bctrl -lbl_801DA580: -/* 801DA580 80 7F 00 E0 */ lwz r3, 0xe0(r31) -/* 801DA584 28 03 00 00 */ cmplwi r3, 0 -/* 801DA588 41 82 00 44 */ beq lbl_801DA5CC -/* 801DA58C 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801DA590 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801DA594 C0 24 06 78 */ lfs f1, 0x678(r4) -/* 801DA598 C0 44 06 7C */ lfs f2, 0x67c(r4) -/* 801DA59C 48 07 A0 15 */ bl paneTrans__8CPaneMgrFff -/* 801DA5A0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801DA5A4 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801DA5A8 C0 03 06 80 */ lfs f0, 0x680(r3) -/* 801DA5AC 80 7F 00 E0 */ lwz r3, 0xe0(r31) -/* 801DA5B0 80 63 00 04 */ lwz r3, 4(r3) -/* 801DA5B4 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801DA5B8 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801DA5BC 81 83 00 00 */ lwz r12, 0(r3) -/* 801DA5C0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801DA5C4 7D 89 03 A6 */ mtctr r12 -/* 801DA5C8 4E 80 04 21 */ bctrl -lbl_801DA5CC: -/* 801DA5CC 80 7F 00 E4 */ lwz r3, 0xe4(r31) -/* 801DA5D0 28 03 00 00 */ cmplwi r3, 0 -/* 801DA5D4 41 82 00 44 */ beq lbl_801DA618 -/* 801DA5D8 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801DA5DC 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801DA5E0 C0 24 06 84 */ lfs f1, 0x684(r4) -/* 801DA5E4 C0 44 06 88 */ lfs f2, 0x688(r4) -/* 801DA5E8 48 07 9F C9 */ bl paneTrans__8CPaneMgrFff -/* 801DA5EC 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801DA5F0 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801DA5F4 C0 03 06 8C */ lfs f0, 0x68c(r3) -/* 801DA5F8 80 7F 00 E4 */ lwz r3, 0xe4(r31) -/* 801DA5FC 80 63 00 04 */ lwz r3, 4(r3) -/* 801DA600 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801DA604 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801DA608 81 83 00 00 */ lwz r12, 0(r3) -/* 801DA60C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801DA610 7D 89 03 A6 */ mtctr r12 -/* 801DA614 4E 80 04 21 */ bctrl -lbl_801DA618: -/* 801DA618 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801DA61C 83 C1 00 08 */ lwz r30, 8(r1) -/* 801DA620 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801DA624 7C 08 03 A6 */ mtlr r0 -/* 801DA628 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DA62C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_insect/wait_init__14dMenu_Insect_cFv.s b/asm/d/menu/d_menu_insect/wait_init__14dMenu_Insect_cFv.s deleted file mode 100644 index 5c36dac1a2..0000000000 --- a/asm/d/menu/d_menu_insect/wait_init__14dMenu_Insect_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_801D8C68: -/* 801D8C68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801D8C6C 7C 08 02 A6 */ mflr r0 -/* 801D8C70 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D8C74 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801D8C78 7C 7F 1B 78 */ mr r31, r3 -/* 801D8C7C 88 83 00 F4 */ lbz r4, 0xf4(r3) -/* 801D8C80 88 A3 00 F5 */ lbz r5, 0xf5(r3) -/* 801D8C84 48 00 11 61 */ bl isGetInsect__14dMenu_Insect_cFii -/* 801D8C88 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801D8C8C 41 82 00 14 */ beq lbl_801D8CA0 -/* 801D8C90 7F E3 FB 78 */ mr r3, r31 -/* 801D8C94 38 80 03 68 */ li r4, 0x368 -/* 801D8C98 48 00 16 6D */ bl setAButtonString__14dMenu_Insect_cFUs -/* 801D8C9C 48 00 00 10 */ b lbl_801D8CAC -lbl_801D8CA0: -/* 801D8CA0 7F E3 FB 78 */ mr r3, r31 -/* 801D8CA4 38 80 00 00 */ li r4, 0 -/* 801D8CA8 48 00 16 5D */ bl setAButtonString__14dMenu_Insect_cFUs -lbl_801D8CAC: -/* 801D8CAC 7F E3 FB 78 */ mr r3, r31 -/* 801D8CB0 38 80 03 F9 */ li r4, 0x3f9 -/* 801D8CB4 48 00 17 01 */ bl setBButtonString__14dMenu_Insect_cFUs -/* 801D8CB8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801D8CBC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801D8CC0 7C 08 03 A6 */ mtlr r0 -/* 801D8CC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D8CC8 4E 80 00 20 */ blr diff --git a/include/d/menu/d_menu_insect.h b/include/d/menu/d_menu_insect.h index e394a8a4f2..e93af9b698 100644 --- a/include/d/menu/d_menu_insect.h +++ b/include/d/menu/d_menu_insect.h @@ -11,6 +11,8 @@ struct STControl; class dMsgScrn3Select_c; class dMsgString_c; class dSelect_cursor_c; +class mDoDvdThd_mountArchive_c; +class JKRArchive; class dMenu_Insect_c : public dDlst_base_c { public: @@ -20,8 +22,8 @@ public: /* 801D8760 */ void _draw(); /* 801D88EC */ bool isSync(); /* 801D8914 */ void init(); - /* 801D894C */ void _open(); - /* 801D8B2C */ void _close(); + /* 801D894C */ int _open(); + /* 801D8B2C */ int _close(); /* 801D8C68 */ void wait_init(); /* 801D8CCC */ void wait_move(); /* 801D8E00 */ void explain_open_init(); @@ -36,15 +38,15 @@ public: /* 801D98F0 */ void screenSetExplain(); /* 801D9BD0 */ void screenSetDoIcon(); /* 801D9D4C */ static u8 getGetInsectNum(); - /* 801D9DCC */ void getInsectItemID(int, int); - /* 801D9DE4 */ void isGetInsect(int, int); - /* 801D9E20 */ void isGiveInsect(int, int); - /* 801D9ED4 */ void isGiveInsect(u8); - /* 801D9E7C */ void isCatchInsect(u8); + /* 801D9DCC */ u8 getInsectItemID(int, int); + /* 801D9DE4 */ bool isGetInsect(int, int); + /* 801D9E20 */ bool isGiveInsect(int, int); + /* 801D9ED4 */ static bool isGiveInsect(u8); + /* 801D9E7C */ static bool isCatchInsect(u8); /* 801D9F3C */ static u8 isCatchNotGiveInsect(u8); /* 801D9F8C */ void cursorMove(); /* 801DA1EC */ void setCursorPos(); - /* 801DA2FC */ bool dpdMove(); + /* 801DA2FC */ u8 dpdMove(); /* 801DA304 */ void setAButtonString(u16); /* 801DA3B4 */ void setBButtonString(u16); /* 801DA464 */ void setHIO(bool); @@ -56,17 +58,17 @@ public: private: /* 0x04 */ JKRExpHeap* mpHeap; - /* 0x08 */ void* field_0x8; + /* 0x08 */ JKRArchive* mpArchive; /* 0x0C */ STControl* mpStick; /* 0x10 */ CSTControl* mpCStick; - /* 0x14 */ void* field_0x14; + /* 0x14 */ mDoDvdThd_mountArchive_c* mpMount; /* 0x18 */ dSelect_cursor_c* mpDrawCursor; /* 0x1C */ dMsgScrn3Select_c* mpSelect_c; /* 0x20 */ J2DScreen* mpScreen; /* 0x24 */ J2DScreen* mpExpScreen; /* 0x28 */ J2DScreen* mpIconScreen; - /* 0x2C */ J2DTextBox* field_0x2c[5]; - /* 0x40 */ J2DTextBox* field_0x40[5]; + /* 0x2C */ J2DTextBox* mpAButtonString[5]; + /* 0x40 */ J2DTextBox* mpBButtonString[5]; /* 0x54 */ J2DTextBox* field_0x54; /* 0x58 */ J2DTextBox* field_0x58; /* 0x5C */ J2DTextBox* field_0x5c; @@ -80,8 +82,7 @@ private: /* 0xE0 */ CPaneMgr* mpButtonText[2]; /* 0xE8 */ dMsgString_c* mpString; /* 0xEC */ void* mpExpItemTex; - /* 0xF0 */ u8 field_0xf0; - /* 0xF1 */ u8 field_0xf1; + /* 0xF0 */ s16 field_0xf0; /* 0xF2 */ u8 mStatus; /* 0xF3 */ u8 field_0xf3; /* 0xF4 */ u8 field_0xf4; diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index a055b1b6f0..9ad6a76758 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -96,6 +96,8 @@ public: dMw_c* getMenuWindowClass() { return mMenuWindowClass; } void offUseButton(int pButton) { mUseButton &= ~(u16)pButton; } u16 getOilGaugeBackUp() { return mOilGaugeBackUp; } + u8 getInsectSelectType() { return mInsectSelectType; } + void setInsectSelectType(u8 i_type) { mInsectSelectType = i_type; } u8 getWarpStatus() { return mWarpStatus; } void setWarpStatus(u8 status) { mWarpStatus = status; } u8 getWarpRoomNo() { return mWarpInfo.mRoomNo; } @@ -291,6 +293,14 @@ inline void dMeter2Info_setSaveStageName(const char* name) { g_meter2_info.setSaveStageName(name); } +inline u8 dMeter2Info_getInsectSelectType() { + return g_meter2_info.getInsectSelectType(); +} + +inline void dMeter2Info_setInsectSelectType(u8 i_type) { + g_meter2_info.setInsectSelectType(i_type); +} + inline u8 dMeter2Info_getWarpStatus() { return g_meter2_info.getWarpStatus(); } @@ -299,6 +309,14 @@ inline void dMeter2Info_setWarpStatus(u8 status) { return g_meter2_info.setWarpStatus(status); } +inline int dMeter2Info_readItemTexture(u8 i_itemNo, void* param_1, J2DPicture* param_2, + void* param_3, J2DPicture* param_4, void* param_5, + J2DPicture* param_6, void* param_7, J2DPicture* param_8, + int param_9) { + return g_meter2_info.readItemTexture(i_itemNo, param_1, param_2, param_3, param_4, param_5, + param_6, param_7, param_8, param_9); +} + inline u8 dMeter2Info_getWarpRoomNo() { return g_meter2_info.getWarpRoomNo(); } diff --git a/src/d/menu/d_menu_insect.cpp b/src/d/menu/d_menu_insect.cpp index 420f49057b..03a39fdbae 100644 --- a/src/d/menu/d_menu_insect.cpp +++ b/src/d/menu/d_menu_insect.cpp @@ -1,71 +1,28 @@ -// -// Generated By: dol2asm -// Translation Unit: d/menu/d_menu_insect -// +/** + * d_menu_insect.cpp + * Menu - Insect List + */ #include "d/menu/d_menu_insect.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JKernel/JKRMemArchive.h" +#include "JSystem/JUtility/TColor.h" #include "MSL_C/stdio.h" #include "MSL_C/string.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_lib.h" +#include "d/d_select_cursor.h" +#include "d/meter/d_meter2_info.h" +#include "d/meter/d_meter_HIO.h" +#include "d/msg/d_msg_class.h" +#include "d/msg/d_msg_string.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Types: -// - -struct mDoGph_gInf_c { - static u8 mFader[4]; -}; - -struct mDoDvdThd_mountArchive_c { - /* 80015E14 */ void create(char const*, u8, JKRHeap*); -}; - -struct mDoCPd_c { - static u8 m_cpadInfo[256]; -}; - -struct dSv_player_get_item_c { - /* 80033EC8 */ void isFirstBit(u8) const; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dMsgString_c { - /* 80249C20 */ dMsgString_c(); - /* 80249D28 */ ~dMsgString_c(); -}; - -struct dMsgScrn3Select_c { - /* 802390B4 */ dMsgScrn3Select_c(); - /* 80239C64 */ void isSelect(); - /* 80239C78 */ void setString(char*, char*, char*); - /* 80239D08 */ void setRubyString(char*, char*, char*); - /* 80239D98 */ void translate(f32, f32); - /* 80239DD4 */ void draw(f32, f32); - /* 8023A094 */ void selAnimeInit(u8, u8, u8, f32, u8); - /* 8023A398 */ void selAnimeMove(u8, u8, bool); - /* 8023A680 */ void selAnimeEnd(); - /* 8023A934 */ void getTextBoxWidth(); - /* 8023A94C */ void getFontSize(); - /* 8023A97C */ void getCharSpace(); -}; - -struct JMSMesgEntry_c {}; - -struct dMeter2Info_c { - /* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*); - /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); - /* 8021C7FC */ void getStringLength(JUTFont*, f32, f32, char*); - /* 8021CF08 */ void readItemTexture(u8, void*, J2DPicture*, void*, J2DPicture*, void*, - J2DPicture*, void*, J2DPicture*, int); -}; +#include "m_Do/m_Do_controller_pad.h" +#include "m_Do/m_Do_graphic.h" +#include "msg/scrn/d_msg_scrn_3select.h" // // Forward References: @@ -184,9 +141,6 @@ extern "C" void _restgpr_29(); extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_meter2_info[248]; extern "C" u8 mFader__13mDoGph_gInf_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -202,134 +156,32 @@ SECTION_DEAD static char const* const stringBase_803968C0 = "tt_block8x8.bti"; #pragma pop /* 803BD780-803BD78C 01A8A0 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, }; -/* 803BD78C-803BD798 -00001 000C+00 0/1 0/0 0/0 .data @3797 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3797[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)wait_init__14dMenu_Insect_cFv, -}; -#pragma pop - -/* 803BD798-803BD7A4 -00001 000C+00 0/1 0/0 0/0 .data @3798 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3798[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)explain_open_init__14dMenu_Insect_cFv, -}; -#pragma pop - -/* 803BD7A4-803BD7B0 -00001 000C+00 0/1 0/0 0/0 .data @3799 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3799[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)explain_move_init__14dMenu_Insect_cFv, -}; -#pragma pop - -/* 803BD7B0-803BD7BC -00001 000C+00 0/1 0/0 0/0 .data @3800 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3800[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)select_move_init__14dMenu_Insect_cFv, -}; -#pragma pop - -/* 803BD7BC-803BD7C8 -00001 000C+00 0/1 0/0 0/0 .data @3801 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3801[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)explain_close_init__14dMenu_Insect_cFv, -}; -#pragma pop - -/* 803BD7C8-803BD804 01A8E8 003C+00 2/3 0/0 0/0 .data map_init_process */ -SECTION_DATA static u8 map_init_process[60] = { - 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, -}; - -/* 803BD804-803BD810 -00001 000C+00 0/1 0/0 0/0 .data @3802 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3802[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)wait_move__14dMenu_Insect_cFv, -}; -#pragma pop - -/* 803BD810-803BD81C -00001 000C+00 0/1 0/0 0/0 .data @3803 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3803[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)explain_open_move__14dMenu_Insect_cFv, -}; -#pragma pop - -/* 803BD81C-803BD828 -00001 000C+00 0/1 0/0 0/0 .data @3804 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3804[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)explain_move_move__14dMenu_Insect_cFv, +typedef void (dMenu_Insect_c::*initFunc)(); +static initFunc map_init_process[] = { + &dMenu_Insect_c::wait_init, &dMenu_Insect_c::explain_open_init, + &dMenu_Insect_c::explain_move_init, &dMenu_Insect_c::select_move_init, + &dMenu_Insect_c::explain_close_init, }; -#pragma pop -/* 803BD828-803BD834 -00001 000C+00 0/1 0/0 0/0 .data @3805 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3805[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)select_move_move__14dMenu_Insect_cFv, -}; -#pragma pop - -/* 803BD834-803BD840 -00001 000C+00 0/1 0/0 0/0 .data @3806 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3806[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)explain_close_move__14dMenu_Insect_cFv, -}; -#pragma pop - -/* 803BD840-803BD87C 01A960 003C+00 1/2 0/0 0/0 .data map_move_process */ -SECTION_DATA static u8 map_move_process[60] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +typedef void (dMenu_Insect_c::*moveFunc)(); +static moveFunc map_move_process[] = { + &dMenu_Insect_c::wait_move, &dMenu_Insect_c::explain_open_move, + &dMenu_Insect_c::explain_move_move, &dMenu_Insect_c::select_move_move, + &dMenu_Insect_c::explain_close_move, }; /* 803BD87C-803BD894 01A99C 0018+00 1/1 0/0 0/0 .data l_itemno$4346 */ -SECTION_DATA static u8 l_itemno_4346[24] = { +static u8 l_itemno_4346[24] = { 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, }; /* 803BD894-803BD8AC 01A9B4 0018+00 1/1 0/0 0/0 .data l_itemno$4364 */ -SECTION_DATA static u8 l_itemno_4364[24] = { +static u8 l_itemno_4364[24] = { 0xD4, 0xD5, 0xD6, 0xD7, 0xC0, 0xC1, 0xCC, 0xCD, 0xC4, 0xC5, 0xCA, 0xCB, 0xC2, 0xC3, 0xCE, 0xCF, 0xD0, 0xD1, 0xC8, 0xC9, 0xC6, 0xC7, 0xD2, 0xD3, }; @@ -365,6 +217,39 @@ SECTION_SDATA2 static u8 lit_3837[4] = { /* 801D8114-801D82F4 1D2A54 01E0+00 0/0 2/2 0/0 .text * __ct__14dMenu_Insect_cFP10JKRExpHeapP9STControlP10CSTControlUc */ +#ifdef NONMATCHING +// Matches with literals +dMenu_Insect_c::dMenu_Insect_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i_cstick, + u8 param_3) { + mpHeap = i_heap; + mpArchive = NULL; + mpMount = NULL; + mpStick = i_stick; + mpCStick = i_cstick; + mStatus = 1; + field_0xf3 = 0; + field_0xf0 = 0; + field_0xf4 = 0; + field_0xf5 = 0; + field_0xf6 = param_3; + field_0xf8 = 0xff; + field_0xf9 = 0xff; + field_0xfa = 0xff; + field_0xfb = 0xff; + field_0xf7 = 1; + ResTIMG* image = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); + mpBlackTex = new J2DPicture(image); + mpBlackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 0xff)); + field_0xfc = 0; + mpDrawCursor = new dSelect_cursor_c(2, 1.0f, NULL); + mpDrawCursor->setParam(1.0f, 1.0f, 0.1f, 0.7f, 0.7f); + mpDrawCursor->setAlphaRate(0.0f); + mpDrawCursor->setScale(0.0f); + mpDrawCursor->offPlayAnime(0); + mpSelect_c = new dMsgScrn3Select_c(); + mpExpItemTex = mpHeap->alloc(0xc00, 0x20); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -374,36 +259,100 @@ asm dMenu_Insect_c::dMenu_Insect_c(JKRExpHeap* param_0, STControl* param_1, CSTC #include "asm/d/menu/d_menu_insect/__ct__14dMenu_Insect_cFP10JKRExpHeapP9STControlP10CSTControlUc.s" } #pragma pop +#endif /* 801D82F4-801D8658 1D2C34 0364+00 1/0 0/0 0/0 .text __dt__14dMenu_Insect_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMenu_Insect_c::~dMenu_Insect_c() { - nofralloc -#include "asm/d/menu/d_menu_insect/__dt__14dMenu_Insect_cFv.s" +dMenu_Insect_c::~dMenu_Insect_c() { + delete mpBlackTex; + mpBlackTex = NULL; + + delete mpDrawCursor; + mpDrawCursor = NULL; + + delete mpSelect_c; + mpSelect_c = NULL; + + mpHeap->free(mpExpItemTex); + mpExpItemTex = NULL; + + delete mpString; + mpString = NULL; + + delete mpScreen; + mpScreen = NULL; + + delete mpParent; + mpParent = NULL; + + for (int i = 0; i < 24; i++) { + delete mpINSParent[i]; + mpINSParent[i] = NULL; + } + + delete mpExpScreen; + mpExpScreen = NULL; + + delete mpExpParent; + mpExpParent = NULL; + + for (int i = 0; i < 2; i++) { + delete mpExpSubWin[i]; + mpExpSubWin[i] = NULL; + } + + delete mpInfoText; + mpInfoText = NULL; + + delete mpIconScreen; + mpIconScreen = NULL; + + for (int i = 0; i < 2; i++) { + if (mpButtonAB[i] != NULL) { + delete mpButtonAB[i]; + mpButtonAB[i] = NULL; + } + + if (mpButtonText[i] != NULL) { + delete mpButtonText[i]; + mpButtonText[i] = NULL; + } + } + + if (mpMount != NULL) { + mpMount->getArchive()->unmount(); + delete mpMount; + mpMount = NULL; + } + + if (mpArchive != NULL) { + mpArchive->unmount(); + mpArchive = NULL; + } + + dComIfGp_getMsgArchive(0)->removeResourceAll(); } -#pragma pop /* 801D8658-801D86C8 1D2F98 0070+00 1/1 0/0 0/0 .text _create__14dMenu_Insect_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Insect_c::_create() { - nofralloc -#include "asm/d/menu/d_menu_insect/_create__14dMenu_Insect_cFv.s" +void dMenu_Insect_c::_create() { + mpString = new dMsgString_c(); + screenSetBase(); + screenSetExplain(); + screenSetDoIcon(); + setHIO(true); + init(); } -#pragma pop /* 801D86C8-801D8760 1D3008 0098+00 0/0 3/3 0/0 .text _move__14dMenu_Insect_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Insect_c::_move() { - nofralloc -#include "asm/d/menu/d_menu_insect/_move__14dMenu_Insect_cFv.s" +void dMenu_Insect_c::_move() { + JKRHeap* heap = mDoExt_setCurrentHeap((JKRHeap*)mpHeap); + u8 process = field_0xf3; + (this->*map_move_process[field_0xf3])(); + if (process != field_0xf3) { + (this->*map_init_process[field_0xf3])(); + } + setHIO(false); + mDoExt_setCurrentHeap(heap); } -#pragma pop /* ############################################################################################## */ /* 80454248-8045424C 002848 0004+00 1/1 0/0 0/0 .sdata2 @3961 */ @@ -436,24 +385,17 @@ asm void dMenu_Insect_c::_draw() { #pragma pop /* 801D88EC-801D8914 1D322C 0028+00 0/0 3/3 0/0 .text isSync__14dMenu_Insect_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMenu_Insect_c::isSync() { - nofralloc -#include "asm/d/menu/d_menu_insect/isSync__14dMenu_Insect_cFv.s" +bool dMenu_Insect_c::isSync() { + if (mpMount != NULL && mpMount->sync() == false) { + return 0; + } + return 1; } -#pragma pop /* 801D8914-801D894C 1D3254 0038+00 1/1 0/0 0/0 .text init__14dMenu_Insect_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Insect_c::init() { - nofralloc -#include "asm/d/menu/d_menu_insect/init__14dMenu_Insect_cFv.s" +void dMenu_Insect_c::init() { + (this->*map_init_process[field_0xf3])(); } -#pragma pop /* ############################################################################################## */ /* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -466,34 +408,117 @@ SECTION_DEAD static char const* const stringBase_803968D0 = "/res/Layout/insectR SECTION_SDATA2 static f64 lit_4020 = 4503601774854144.0 /* cast s32 to float */; /* 801D894C-801D8B2C 1D328C 01E0+00 0/0 3/3 0/0 .text _open__14dMenu_Insect_cFv */ +#ifdef NONMATCHING +// Matches with literals +int dMenu_Insect_c::_open() { + if (!mpMount) { + mpMount = mDoDvdThd_mountArchive_c::create("/res/Layout/insectRes.arc", 0, NULL); + } + if (!mpArchive) { + if (mpMount->sync() != 0) { + if (!mpArchive) { + mpArchive = (JKRArchive*)mpMount->getArchive(); + delete mpMount; + mpMount = NULL; + _create(); + } + } else { + return 0; + } + } + + s16 openFrame = g_drawHIO.mInsectListScreen.mOpenFrame; + s16 closeFrame = g_drawHIO.mInsectListScreen.mCloseFrame; + field_0xf0 = g_drawHIO.mInsectListScreen.mOpenFrame; + if (field_0xf0 >= openFrame) { + field_0xf0 = closeFrame; + mStatus = 2; + J2DPane* pane = mpParent->getPanePtr(); + pane->mScaleX = 1.0f; + pane->mScaleY = 1.0f; + pane->calcMtx(); + mpParent->setAlphaRate(1.0f); + setCursorPos(); + mpDrawCursor->setAlphaRate(1.0f); + mpDrawCursor->setScale(1.0f); + mpDrawCursor->onPlayAnime(0); + return 1; + } else { + f32 div = (f32)field_0xf0 / (f32)openFrame; + J2DPane* pane = mpParent->getPanePtr(); + pane->mScaleX = div; + pane->mScaleY = div; + pane->calcMtx(); + mpParent->setAlphaRate(div); + setCursorPos(); + mpDrawCursor->setAlphaRate(div); + mpDrawCursor->setScale(div); + return 0; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Insect_c::_open() { +asm int dMenu_Insect_c::_open() { nofralloc #include "asm/d/menu/d_menu_insect/_open__14dMenu_Insect_cFv.s" } #pragma pop +#endif /* 801D8B2C-801D8C68 1D346C 013C+00 0/0 1/1 0/0 .text _close__14dMenu_Insect_cFv */ +#ifdef NONMATCHING +// Matches with literals +int dMenu_Insect_c::_close() { + s16 closeFrame = g_drawHIO.mInsectListScreen.mCloseFrame; + field_0xf0 = 0; + if (field_0xf0 <= 0) { + field_0xf0 = 0; + mStatus = 0; + J2DPane* pane = mpParent->getPanePtr(); + pane->mScaleX = 0.0f; + pane->mScaleY = 0.0f; + pane->calcMtx(); + mpParent->setAlphaRate(0.0f); + setCursorPos(); + mpDrawCursor->setAlphaRate(0.0f); + mpDrawCursor->setScale(0.0f); + return 1; + } else { + f32 div = (f32)field_0xf0 / (f32)closeFrame; + J2DPane* pane = mpParent->getPanePtr(); + pane->mScaleX = div; + pane->mScaleY = div; + pane->calcMtx(); + mpParent->setAlphaRate(div); + setCursorPos(); + mpDrawCursor->setAlphaRate(div); + mpDrawCursor->setScale(div); + return 0; + } + return field_0xf0 <= 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Insect_c::_close() { +asm int dMenu_Insect_c::_close() { nofralloc #include "asm/d/menu/d_menu_insect/_close__14dMenu_Insect_cFv.s" } #pragma pop +#endif /* 801D8C68-801D8CCC 1D35A8 0064+00 1/0 0/0 0/0 .text wait_init__14dMenu_Insect_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Insect_c::wait_init() { - nofralloc -#include "asm/d/menu/d_menu_insect/wait_init__14dMenu_Insect_cFv.s" +void dMenu_Insect_c::wait_init() { + if (isGetInsect(field_0xf4, field_0xf5) != 0) { + setAButtonString(0x368); + } else { + setAButtonString(0); + } + setBButtonString(0x3f9); } -#pragma pop /* ############################################################################################## */ /* 80454268-8045426C 002868 0004+00 4/4 0/0 0/0 .sdata2 @4089 */ @@ -543,14 +568,15 @@ asm void dMenu_Insect_c::explain_open_init() { #pragma pop /* 801D91E4-801D9264 1D3B24 0080+00 1/0 0/0 0/0 .text explain_open_move__14dMenu_Insect_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Insect_c::explain_open_move() { - nofralloc -#include "asm/d/menu/d_menu_insect/explain_open_move__14dMenu_Insect_cFv.s" +void dMenu_Insect_c::explain_open_move() { + if (mpExpParent->alphaAnime(10, 0, 0xff, 1)) { + if (field_0xf6 == 1 && isGiveInsect(field_0xf4, field_0xf5) == 0) { + field_0xf3 = 3; + } else { + field_0xf3 = 2; + } + } } -#pragma pop /* 801D9264-801D9268 1D3BA4 0004+00 1/0 0/0 0/0 .text explain_move_init__14dMenu_Insect_cFv */ void dMenu_Insect_c::explain_move_init() { @@ -558,24 +584,19 @@ void dMenu_Insect_c::explain_move_init() { } /* 801D9268-801D9290 1D3BA8 0028+00 1/0 0/0 0/0 .text explain_move_move__14dMenu_Insect_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Insect_c::explain_move_move() { - nofralloc -#include "asm/d/menu/d_menu_insect/explain_move_move__14dMenu_Insect_cFv.s" +void dMenu_Insect_c::explain_move_move() { + if (mDoCPd_c::getTrigA(0) == 0 && (mDoCPd_c::getTrig(0) & 0x200) == 0) { + return; + } + field_0xf3 = 4; } -#pragma pop /* 801D9290-801D92DC 1D3BD0 004C+00 1/0 0/0 0/0 .text select_move_init__14dMenu_Insect_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Insect_c::select_move_init() { - nofralloc -#include "asm/d/menu/d_menu_insect/select_move_init__14dMenu_Insect_cFv.s" +void dMenu_Insect_c::select_move_init() { + dMeter2Info_setInsectSelectType(0xff); + setAButtonString(0x40c); + setBButtonString(0x3f9); } -#pragma pop /* 801D92DC-801D9504 1D3C1C 0228+00 1/0 0/0 0/0 .text select_move_move__14dMenu_Insect_cFv */ #pragma push @@ -588,6 +609,19 @@ asm void dMenu_Insect_c::select_move_move() { #pragma pop /* 801D9504-801D95AC 1D3E44 00A8+00 1/0 0/0 0/0 .text explain_close_init__14dMenu_Insect_cFv */ +#ifdef NONMATCHING +// Matches with literals +void dMenu_Insect_c::explain_close_init() { + setAButtonString(0); + setBButtonString(0x3f9); + if (field_0xf6 == 1) { + dMeter2Info_setInsectSelectType(getInsectItemID(field_0xf4, field_0xf5)); + } + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + dMeter2Info_set2DVibration(); + mpExpParent->alphaAnimeStart(0); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -596,51 +630,35 @@ asm void dMenu_Insect_c::explain_close_init() { #include "asm/d/menu/d_menu_insect/explain_close_init__14dMenu_Insect_cFv.s" } #pragma pop +#endif /* 801D95AC-801D9644 1D3EEC 0098+00 1/0 0/0 0/0 .text explain_close_move__14dMenu_Insect_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Insect_c::explain_close_move() { - nofralloc -#include "asm/d/menu/d_menu_insect/explain_close_move__14dMenu_Insect_cFv.s" +void dMenu_Insect_c::explain_close_move() { + bool alphaAnime = mpExpParent->alphaAnime(10, 0xff, 0, 1); + bool cVar2; + if (field_0xf6 == 1 && isGiveInsect(field_0xf4, field_0xf5) == 0) { + cVar2 = mpSelect_c->selAnimeEnd(); + } else { + cVar2 = 1; + } + if (alphaAnime && cVar2 != 0) { + field_0xf3 = 0; + } } -#pragma pop -/* ############################################################################################## */ /* 80396690-80396750 022CF0 00C0+00 1/1 0/0 0/0 .rodata insect_tag$4249 */ -SECTION_RODATA static u8 const insect_tag[192] = { - 0x00, 0x00, 0x61, 0x72, 0x69, 0x5F, 0x6F, 0x73, 0x00, 0x00, 0x61, 0x72, 0x69, 0x5F, 0x6D, 0x73, - 0x00, 0x00, 0x6B, 0x61, 0x67, 0x5F, 0x6F, 0x73, 0x00, 0x00, 0x6B, 0x61, 0x67, 0x5F, 0x6D, 0x73, - 0x00, 0x00, 0x6B, 0x61, 0x62, 0x5F, 0x6F, 0x73, 0x00, 0x00, 0x6B, 0x61, 0x62, 0x5F, 0x6D, 0x73, - 0x00, 0x00, 0x6B, 0x61, 0x6D, 0x5F, 0x6F, 0x73, 0x00, 0x6B, 0x61, 0x6D, 0x5F, 0x6D, 0x65, 0x73, - 0x00, 0x6B, 0x75, 0x77, 0x61, 0x5F, 0x6F, 0x73, 0x6B, 0x75, 0x77, 0x61, 0x5F, 0x6D, 0x65, 0x73, - 0x00, 0x00, 0x64, 0x61, 0x6E, 0x5F, 0x6F, 0x73, 0x00, 0x64, 0x61, 0x6E, 0x5F, 0x6D, 0x65, 0x73, - 0x00, 0x00, 0x63, 0x68, 0x6F, 0x5F, 0x6F, 0x73, 0x00, 0x00, 0x63, 0x68, 0x6F, 0x5F, 0x6D, 0x73, - 0x00, 0x74, 0x65, 0x6E, 0x74, 0x5F, 0x6F, 0x73, 0x74, 0x65, 0x6E, 0x74, 0x5F, 0x6D, 0x65, 0x73, - 0x00, 0x6B, 0x61, 0x74, 0x61, 0x5F, 0x6F, 0x73, 0x6B, 0x61, 0x74, 0x61, 0x5F, 0x6D, 0x65, 0x73, - 0x00, 0x6E, 0x61, 0x6E, 0x61, 0x5F, 0x6F, 0x73, 0x6E, 0x61, 0x6E, 0x61, 0x5F, 0x6D, 0x65, 0x73, - 0x00, 0x00, 0x62, 0x61, 0x74, 0x5F, 0x6F, 0x73, 0x00, 0x62, 0x61, 0x74, 0x5F, 0x6D, 0x65, 0x73, - 0x00, 0x74, 0x6F, 0x6E, 0x62, 0x5F, 0x6F, 0x73, 0x74, 0x6F, 0x6E, 0x62, 0x5F, 0x6D, 0x65, 0x73, +static const u64 insect_tag[24] = { + 'ari_os', 'ari_ms', 'kag_os', 'kag_ms', 'kab_os', 'kab_ms', 'kam_os', 'kam_mes', + 'kuwa_os', 'kuwa_mes', 'dan_os', 'dan_mes', 'cho_os', 'cho_ms', 'tent_os', 'tent_mes', + 'kata_os', 'kata_mes', 'nana_os', 'nana_mes', 'bat_os', 'bat_mes', 'tonb_os', 'tonb_mes', }; -COMPILER_STRIP_GATE(0x80396690, &insect_tag); /* 80396750-80396810 022DB0 00C0+00 1/1 0/0 0/0 .rodata ageha_tag$4250 */ -SECTION_RODATA static u8 const ageha_tag[192] = { - 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x30, 0x30, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x30, 0x31, - 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x30, 0x32, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x30, 0x33, - 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x30, 0x34, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x30, 0x35, - 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x30, 0x36, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x30, 0x37, - 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x30, 0x38, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x30, 0x39, - 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x31, 0x30, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x31, 0x31, - 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x31, 0x32, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x31, 0x33, - 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x31, 0x34, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x31, 0x35, - 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x31, 0x36, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x31, 0x37, - 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x31, 0x38, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x31, 0x39, - 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x32, 0x30, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x32, 0x31, - 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x32, 0x32, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x32, 0x33, +static const u64 ageha_tag[24] = { + 'ageha00', 'ageha01', 'ageha02', 'ageha03', 'ageha04', 'ageha05', 'ageha06', 'ageha07', + 'ageha08', 'ageha09', 'ageha10', 'ageha11', 'ageha12', 'ageha13', 'ageha14', 'ageha15', + 'ageha16', 'ageha17', 'ageha18', 'ageha19', 'ageha20', 'ageha21', 'ageha22', 'ageha23', }; -COMPILER_STRIP_GATE(0x80396750, &ageha_tag); /* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ #pragma push @@ -650,6 +668,39 @@ SECTION_DEAD static char const* const stringBase_803968F3 = "zelda_gold_insects. /* 801D9644-801D98F0 1D3F84 02AC+00 1/1 0/0 0/0 .text screenSetBase__14dMenu_Insect_cFv */ +#ifdef NONMATCHING +// Matches with literals +void dMenu_Insect_c::screenSetBase() { + mpScreen = new J2DScreen(); + mpScreen->setPriority("zelda_gold_insects.blo", 0x20000, mpArchive); + dPaneClass_showNullPane(mpScreen); + mpParent = new CPaneMgr(mpScreen, 'n_all', 2, NULL); + mpParent->setAlphaRate(0.0f); + for (int i = 0; i < 24; i++) { + mpINSParent[i] = new CPaneMgr(mpScreen, insect_tag[i], 0, NULL); + } + for (int i = 0; i < 6; i++) { + for (int j = 0; j < 4; j++) { + int iterateSum = i + j * 6; + if (isGetInsect(i, j) != 0) { + mpINSParent[iterateSum]->show(); + } else { + mpINSParent[iterateSum]->hide(); + } + if (isGiveInsect(i, j) != 0) { + mpScreen->search(ageha_tag[iterateSum])->show(); + } else { + mpScreen->search(ageha_tag[iterateSum])->hide(); + } + } + } + J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('f_t00'); + mpScreen->search('t_t00')->hide(); + textBox->setFont(mDoExt_getSubFont()); + textBox->setString(0x200, ""); + mpString->getString(0x5ba, textBox, NULL, NULL, NULL, 0); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -658,6 +709,7 @@ asm void dMenu_Insect_c::screenSetBase() { #include "asm/d/menu/d_menu_insect/screenSetBase__14dMenu_Insect_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -667,6 +719,34 @@ SECTION_DEAD static char const* const stringBase_8039690A = "zelda_gold_insects_ #pragma pop /* 801D98F0-801D9BD0 1D4230 02E0+00 1/1 0/0 0/0 .text screenSetExplain__14dMenu_Insect_cFv */ +#ifdef NONMATCHING +// Matches with literals +void dMenu_Insect_c::screenSetExplain() { + mpExpScreen = new J2DScreen(); + mpExpScreen->setPriority("zelda_gold_insects_info.blo", 0x20000, mpArchive); + dPaneClass_showNullPane(mpExpScreen); + mpExpParent = new CPaneMgr(mpExpScreen, 'n_all', 2, NULL); + mpExpParent->setAlphaRate(0.0f); + mpExpSubWin[0] = new CPaneMgr(mpExpScreen, 'in_win_n', 0, NULL); + mpExpSubWin[1] = new CPaneMgr(mpExpScreen, 'w_d_mo_n', 0, NULL); + if (field_0xf6 == 0) { + mpExpSubWin[1]->hide(); + } + mpInfoText = new CPaneMgr(mpExpScreen, 'mg_e4lin', 0, NULL); + mpExpScreen->search('n_3line')->hide(); + field_0x5c = (J2DTextBox*)mpExpScreen->search('ms_for_2'); + mpExpScreen->search('w_msg_jp')->hide(); + mpExpScreen->search('ms_for_3')->hide(); + field_0x54 = (J2DTextBox*)mpExpScreen->search('insects'); + field_0x58 = (J2DTextBox*)mpExpScreen->search('insectss'); + J2DTextBox* textBox = (J2DTextBox*)mpInfoText->getPanePtr(); + textBox->setFont(mDoExt_getMesgFont()); + J2DTextBox* textBox2 = (J2DTextBox*)mpInfoText->getPanePtr(); + textBox2->setString(0x200, ""); + field_0x5c->setFont(mDoExt_getMesgFont()); + field_0x5c->setString(0x100, ""); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -675,129 +755,105 @@ asm void dMenu_Insect_c::screenSetExplain() { #include "asm/d/menu/d_menu_insect/screenSetExplain__14dMenu_Insect_cFv.s" } #pragma pop +#endif -/* ############################################################################################## */ /* 80396810-80396838 022E70 0028+00 1/1 0/0 0/0 .rodata text_a_tag$4328 */ -SECTION_RODATA static u8 const text_a_tag[40] = { - 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x31, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, - 0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78, - 0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, +static const u64 text_a_tag[5] = { + 'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5', }; -COMPILER_STRIP_GATE(0x80396810, &text_a_tag); /* 80396838-80396860 022E98 0028+00 1/1 0/0 0/0 .rodata text_b_tag$4329 */ -SECTION_RODATA static u8 const text_b_tag[40] = { - 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x31, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, - 0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78, - 0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, +static const u64 text_b_tag[5] = { + 'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5', }; -COMPILER_STRIP_GATE(0x80396838, &text_b_tag); - -/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80396926 = "zelda_collect_soubi_do_icon_parts.blo"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039694C = "\0\0\0"; -#pragma pop /* 801D9BD0-801D9D4C 1D4510 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__14dMenu_Insect_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Insect_c::screenSetDoIcon() { - nofralloc -#include "asm/d/menu/d_menu_insect/screenSetDoIcon__14dMenu_Insect_cFv.s" +void dMenu_Insect_c::screenSetDoIcon() { + mpIconScreen = new J2DScreen(); + mpIconScreen->setPriority("zelda_collect_soubi_do_icon_parts.blo", 0x20000, mpArchive); + for (int i = 0; i < 2; i++) { + mpButtonAB[i] = 0; + mpButtonText[i] = 0; + } + dPaneClass_showNullPane(mpIconScreen); + for (int i = 0; i < 5; i++) { + mpAButtonString[i] = (J2DTextBox*)mpIconScreen->search(text_a_tag[i]); + mpBButtonString[i] = (J2DTextBox*)mpIconScreen->search(text_b_tag[i]); + mpAButtonString[i]->setFont(mDoExt_getMesgFont()); + mpBButtonString[i]->setFont(mDoExt_getMesgFont()); + mpAButtonString[i]->setString(0x20, ""); + mpBButtonString[i]->setString(0x20, ""); + } } -#pragma pop /* 801D9D4C-801D9DCC 1D468C 0080+00 0/0 1/1 0/0 .text getGetInsectNum__14dMenu_Insect_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 dMenu_Insect_c::getGetInsectNum() { - nofralloc -#include "asm/d/menu/d_menu_insect/getGetInsectNum__14dMenu_Insect_cFv.s" +u8 dMenu_Insect_c::getGetInsectNum() { + u8 insectNum = 0; + u8* insectList = l_itemno_4346; + for (u32 i = 0; i < 24; i++) { + u8 insectId = *insectList; + insectList++; + + if (i_dComIfGs_isItemFirstBit(insectId) != 0) { + insectNum++; + } + } + return insectNum; } -#pragma pop /* 801D9DCC-801D9DE4 1D470C 0018+00 3/3 0/0 0/0 .text getInsectItemID__14dMenu_Insect_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Insect_c::getInsectItemID(int param_0, int param_1) { - nofralloc -#include "asm/d/menu/d_menu_insect/getInsectItemID__14dMenu_Insect_cFii.s" +u8 dMenu_Insect_c::getInsectItemID(int param_0, int param_1) { + int index = param_0 + param_1 * 6; + return l_itemno_4364[index]; } -#pragma pop /* 801D9DE4-801D9E20 1D4724 003C+00 4/4 0/0 0/0 .text isGetInsect__14dMenu_Insect_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Insect_c::isGetInsect(int param_0, int param_1) { - nofralloc -#include "asm/d/menu/d_menu_insect/isGetInsect__14dMenu_Insect_cFii.s" +bool dMenu_Insect_c::isGetInsect(int param_0, int param_1) { + return i_dComIfGs_isItemFirstBit(getInsectItemID(param_0, param_1)) != 0; } -#pragma pop -/* ############################################################################################## */ /* 80396860-803968C0 022EC0 0060+00 1/1 0/0 0/0 .rodata i_evtID$4383 */ -SECTION_RODATA static u8 const i_evtID[96] = { - 0x00, 0x00, 0x01, 0xA5, 0x00, 0x00, 0x01, 0xA6, 0x00, 0x00, 0x01, 0xA7, 0x00, 0x00, 0x01, 0xA8, - 0x00, 0x00, 0x01, 0x91, 0x00, 0x00, 0x01, 0x92, 0x00, 0x00, 0x01, 0x9D, 0x00, 0x00, 0x01, 0x9E, - 0x00, 0x00, 0x01, 0x95, 0x00, 0x00, 0x01, 0x96, 0x00, 0x00, 0x01, 0x9B, 0x00, 0x00, 0x01, 0x9C, - 0x00, 0x00, 0x01, 0x93, 0x00, 0x00, 0x01, 0x94, 0x00, 0x00, 0x01, 0x9F, 0x00, 0x00, 0x01, 0xA0, - 0x00, 0x00, 0x01, 0xA1, 0x00, 0x00, 0x01, 0xA2, 0x00, 0x00, 0x01, 0x99, 0x00, 0x00, 0x01, 0x9A, - 0x00, 0x00, 0x01, 0x97, 0x00, 0x00, 0x01, 0x98, 0x00, 0x00, 0x01, 0xA3, 0x00, 0x00, 0x01, 0xA4, +static const u32 i_evtID[24] = { + 0x1A5, 0x1A6, 0x1A7, 0x1A8, 0x191, 0x192, 0x19D, 0x19E, 0x195, 0x196, 0x19B, 0x19C, + 0x193, 0x194, 0x19F, 0x1A0, 0x1A1, 0x1A2, 0x199, 0x19A, 0x197, 0x198, 0x1A3, 0x1A4, }; -COMPILER_STRIP_GATE(0x80396860, &i_evtID); /* 801D9E20-801D9E7C 1D4760 005C+00 4/4 0/0 0/0 .text isGiveInsect__14dMenu_Insect_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Insect_c::isGiveInsect(int param_0, int param_1) { - nofralloc -#include "asm/d/menu/d_menu_insect/isGiveInsect__14dMenu_Insect_cFii.s" +bool dMenu_Insect_c::isGiveInsect(int param_0, int param_1) { + return i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_evtID[param_0 + param_1 * 6]]) != + 0; } -#pragma pop /* 801D9E7C-801D9ED4 1D47BC 0058+00 1/1 0/0 0/0 .text isCatchInsect__14dMenu_Insect_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Insect_c::isCatchInsect(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_insect/isCatchInsect__14dMenu_Insect_cFUc.s" +bool dMenu_Insect_c::isCatchInsect(u8 i_insectID) { + if (i_insectID >= M_BEETLE && i_insectID <= F_MAYFLY) { + return i_dComIfGs_isItemFirstBit(i_insectID); + } + return false; } -#pragma pop /* 801D9ED4-801D9F3C 1D4814 0068+00 1/1 0/0 0/0 .text isGiveInsect__14dMenu_Insect_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Insect_c::isGiveInsect(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_insect/isGiveInsect__14dMenu_Insect_cFUc.s" +bool dMenu_Insect_c::isGiveInsect(u8 i_insectID) { + if (i_insectID >= M_BEETLE && i_insectID <= F_MAYFLY) { + int label = i_insectID + 0xd1; + return i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[label]); + } + return false; } -#pragma pop /* 801D9F3C-801D9F8C 1D487C 0050+00 0/0 1/1 12/12 .text isCatchNotGiveInsect__14dMenu_Insect_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 dMenu_Insect_c::isCatchNotGiveInsect(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_insect/isCatchNotGiveInsect__14dMenu_Insect_cFUc.s" +u8 dMenu_Insect_c::isCatchNotGiveInsect(u8 param_0) { + if (isCatchInsect(param_0) != 0 && isGiveInsect(param_0) == 0) { + return 1; + } + return 0; } -#pragma pop /* ############################################################################################## */ /* 80454280-80454288 002880 0004+04 1/1 0/0 0/0 .sdata2 @4474 */ @@ -808,6 +864,67 @@ SECTION_SDATA2 static f32 lit_4474[1 + 1 /* padding */] = { }; /* 801D9F8C-801DA1EC 1D48CC 0260+00 1/1 0/0 0/0 .text cursorMove__14dMenu_Insect_cFv */ +#ifdef NONMATCHING +// Matches with literals +void dMenu_Insect_c::cursorMove() { + u8 oldF4 = field_0xf4; + u8 oldF5 = field_0xf5; + u8 dpd = 0; + mpStick->checkTrigger(); + if (mpStick->checkRightTrigger()) { + if (field_0xf4 < 5) { + field_0xf4++; + } + } else if (mpStick->checkLeftTrigger()) { + if (field_0xf4 != 0) { + field_0xf4--; + } + } + if (mpStick->checkUpTrigger()) { + if (field_0xf5 != 0) { + field_0xf5--; + } + } else if (mpStick->checkDownTrigger()) { + if (field_0xf5 < 3) { + field_0xf5++; + } + } + if (oldF4 == field_0xf4 && oldF5 == field_0xf5) { + field_0xf8 = 0xff; + field_0xf9 = 0xff; + if (mpStick->getValueStick() <= 0.75f) { + dpd = dpdMove(); + } + if (field_0xf8 != 0xff && field_0xf9 != 0xff) { + if (field_0xf8 != field_0xfa || field_0xf9 != field_0xfb) { + if (field_0xf8 != field_0xf4 || field_0xf9 != field_0xf5) { + field_0xf4 = field_0xf8; + field_0xf5 = field_0xf9; + field_0xfa = field_0xf8; + field_0xfb = field_0xf9; + } + } + } + } + if (oldF4 == field_0xf4 && oldF5 == field_0xf5) { + return; + } + setCursorPos(); + if (isGetInsect(field_0xf4, field_0xf5) != 0) { + setAButtonString(0x368); + } else { + setAButtonString(0); + } + if (dpd != 0) { + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_ITEM, NULL, 1, 0, 1.0f, 1.0f, -1.0f, -1.0f, + 0); + dMeter2Info_set2DVibration(); + } else { + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_ITEM, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, + 0); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -816,51 +933,90 @@ asm void dMenu_Insect_c::cursorMove() { #include "asm/d/menu/d_menu_insect/cursorMove__14dMenu_Insect_cFv.s" } #pragma pop +#endif /* 801DA1EC-801DA2FC 1D4B2C 0110+00 3/3 0/0 0/0 .text setCursorPos__14dMenu_Insect_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Insect_c::setCursorPos() { - nofralloc -#include "asm/d/menu/d_menu_insect/setCursorPos__14dMenu_Insect_cFv.s" +void dMenu_Insect_c::setCursorPos() { + int index = field_0xf4 + field_0xf5 * 6; + Vec pos = mpINSParent[index]->getGlobalVtxCenter(false, 0); + mpDrawCursor->setPos(pos.x, pos.y, mpINSParent[index]->getPanePtr(), false); + for (int i = 0; i < 24; i++) { + if (i == index) { + mpINSParent[i]->scale(g_drawHIO.mInsectListScreen.mSelectInsectScale, + g_drawHIO.mInsectListScreen.mSelectInsectScale); + } else { + mpINSParent[i]->scale(g_drawHIO.mInsectListScreen.mUnselectInsectScale, + g_drawHIO.mInsectListScreen.mUnselectInsectScale); + } + } } -#pragma pop /* 801DA2FC-801DA304 1D4C3C 0008+00 1/1 0/0 0/0 .text dpdMove__14dMenu_Insect_cFv */ -bool dMenu_Insect_c::dpdMove() { - return false; +u8 dMenu_Insect_c::dpdMove() { + return 0; } /* 801DA304-801DA3B4 1D4C44 00B0+00 5/5 0/0 0/0 .text setAButtonString__14dMenu_Insect_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Insect_c::setAButtonString(u16 param_0) { - nofralloc -#include "asm/d/menu/d_menu_insect/setAButtonString__14dMenu_Insect_cFUs.s" +void dMenu_Insect_c::setAButtonString(u16 i_stringID) { + if (i_stringID == 0) { + for (int i = 0; i < 5; i++) { + strcpy(mpAButtonString[i]->getStringPtr(), ""); + } + } else { + for (int i = 0; i < 5; i++) { + dMeter2Info_getStringKanji(i_stringID, mpAButtonString[i]->getStringPtr(), NULL); + } + } } -#pragma pop /* 801DA3B4-801DA464 1D4CF4 00B0+00 4/4 0/0 0/0 .text setBButtonString__14dMenu_Insect_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Insect_c::setBButtonString(u16 param_0) { - nofralloc -#include "asm/d/menu/d_menu_insect/setBButtonString__14dMenu_Insect_cFUs.s" +void dMenu_Insect_c::setBButtonString(u16 i_stringID) { + if (i_stringID == 0) { + for (int i = 0; i < 5; i++) { + strcpy(mpBButtonString[i]->getStringPtr(), ""); + } + } else { + for (int i = 0; i < 5; i++) { + dMeter2Info_getStringKanji(i_stringID, mpBButtonString[i]->getStringPtr(), NULL); + } + } } -#pragma pop /* 801DA464-801DA630 1D4DA4 01CC+00 2/2 0/0 0/0 .text setHIO__14dMenu_Insect_cFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Insect_c::setHIO(bool param_0) { - nofralloc -#include "asm/d/menu/d_menu_insect/setHIO__14dMenu_Insect_cFb.s" +void dMenu_Insect_c::setHIO(bool i_useHIO) { + if (i_useHIO || g_drawHIO.mInsectListScreen.mDebugON) { + mpExpSubWin[0]->paneTrans(g_drawHIO.mInsectListScreen.mDescWindowPosX, + g_drawHIO.mInsectListScreen.mDescWindowPosY); + mpExpSubWin[1]->paneTrans(g_drawHIO.mInsectListScreen.mGiveOptionPosX_4x3, + g_drawHIO.mInsectListScreen.mGiveOptionPosY_4x3); + } + if (g_drawHIO.mCollectScreen.mButtonDebugON != false || i_useHIO) { + if (mpButtonAB[0]) { + mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonPosX, + g_drawHIO.mCollectScreen.mAButtonPosY); + mpButtonAB[0]->scale(g_drawHIO.mCollectScreen.mAButtonScale, + g_drawHIO.mCollectScreen.mAButtonScale); + } + if (mpButtonAB[1]) { + mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonPosX, + g_drawHIO.mCollectScreen.mBButtonPosY); + mpButtonAB[1]->scale(g_drawHIO.mCollectScreen.mBButtonScale, + g_drawHIO.mCollectScreen.mBButtonScale); + } + if (mpButtonText[0]) { + mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonTextPosX, + g_drawHIO.mCollectScreen.mAButtonTextPosY); + mpButtonText[0]->scale(g_drawHIO.mCollectScreen.mAButtonTextScale, + g_drawHIO.mCollectScreen.mAButtonTextScale); + } + if (mpButtonText[1]) { + mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonTextPosX, + g_drawHIO.mCollectScreen.mBButtonTextPosY); + mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mBButtonTextScale, + g_drawHIO.mCollectScreen.mBButtonTextScale); + } + } } -#pragma pop /* 801DA630-801DA650 1D4F70 0020+00 1/0 0/0 0/0 .text draw__14dMenu_Insect_cFv */ #pragma push @@ -872,20 +1028,3 @@ extern "C" asm void draw__14dMenu_Insect_cFv() { #include "asm/d/menu/d_menu_insect/draw__14dMenu_Insect_cFv.s" } #pragma pop - -/* 801DA650-801DA754 1D4F90 0104+00 0/0 1/0 0/0 .text __sinit_d_menu_insect_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_menu_insect_cpp() { - nofralloc -#include "asm/d/menu/d_menu_insect/__sinit_d_menu_insect_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x801DA650, __sinit_d_menu_insect_cpp); -#pragma pop - -/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ |