From e1069cecc5b9829c55500d45808351dcf464d84b Mon Sep 17 00:00:00 2001 From: Trueffel <106771418+Trueffeloot@users.noreply.github.com> Date: Wed, 19 Jul 2023 11:47:20 +0200 Subject: [PATCH] d_menu_fishing mostly done (#375) * d_menu_fishing mostly done * format the cpp --- Progress.md | 8 +- .../__dt__15dMenu_Fishing_cFv.s | 193 ------ .../__sinit_d_menu_fishing_cpp.s | 16 - .../_close__15dMenu_Fishing_cFv.s | 66 -- .../_draw__15dMenu_Fishing_cFv.s | 48 -- .../_move__15dMenu_Fishing_cFv.s | 40 -- .../_open__15dMenu_Fishing_cFv.s | 106 --- .../init__15dMenu_Fishing_cFv.s | 50 -- .../screenSetBase__15dMenu_Fishing_cFv.s | 488 -------------- .../screenSetDoIcon__15dMenu_Fishing_cFv.s | 99 --- .../setHIO__15dMenu_Fishing_cFb.s | 237 ------- include/d/com/d_com_inf_game.h | 9 + include/d/menu/d_menu_fishing.h | 12 +- include/d/meter/d_meter_HIO.h | 9 +- include/d/save/d_save.h | 4 +- src/d/menu/d_menu_fishing.cpp | 635 +++++++++++------- src/d/meter/d_meter_HIO.cpp | 12 +- 17 files changed, 406 insertions(+), 1626 deletions(-) delete mode 100644 asm/d/menu/d_menu_fishing/__dt__15dMenu_Fishing_cFv.s delete mode 100644 asm/d/menu/d_menu_fishing/__sinit_d_menu_fishing_cpp.s delete mode 100644 asm/d/menu/d_menu_fishing/_close__15dMenu_Fishing_cFv.s delete mode 100644 asm/d/menu/d_menu_fishing/_draw__15dMenu_Fishing_cFv.s delete mode 100644 asm/d/menu/d_menu_fishing/_move__15dMenu_Fishing_cFv.s delete mode 100644 asm/d/menu/d_menu_fishing/_open__15dMenu_Fishing_cFv.s delete mode 100644 asm/d/menu/d_menu_fishing/init__15dMenu_Fishing_cFv.s delete mode 100644 asm/d/menu/d_menu_fishing/screenSetBase__15dMenu_Fishing_cFv.s delete mode 100644 asm/d/menu/d_menu_fishing/screenSetDoIcon__15dMenu_Fishing_cFv.s delete mode 100644 asm/d/menu/d_menu_fishing/setHIO__15dMenu_Fishing_cFb.s diff --git a/Progress.md b/Progress.md index 326447716e..15c264c08b 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 | 28.956242% | 1041424 | 3596544 +.text | 29.098045% | 1046524 | 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 | 36.445649% | 1465360 | 4020672 +Total | 36.572493% | 1470460 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 36.445649% | 1465360 | 4020672 +main.dol | 36.572493% | 1470460 | 4020672 RELs | 33.847533% | 3892576 | 11500324 -Total | 34.520568% | 5357936 | 15520996 +Total | 34.553427% | 5363036 | 15520996 ## RELs diff --git a/asm/d/menu/d_menu_fishing/__dt__15dMenu_Fishing_cFv.s b/asm/d/menu/d_menu_fishing/__dt__15dMenu_Fishing_cFv.s deleted file mode 100644 index 29cc0b9ffd..0000000000 --- a/asm/d/menu/d_menu_fishing/__dt__15dMenu_Fishing_cFv.s +++ /dev/null @@ -1,193 +0,0 @@ -lbl_801C4D98: -/* 801C4D98 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801C4D9C 7C 08 02 A6 */ mflr r0 -/* 801C4DA0 90 01 00 34 */ stw r0, 0x34(r1) -/* 801C4DA4 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C4DA8 48 19 D4 1D */ bl _savegpr_23 -/* 801C4DAC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 801C4DB0 7C 9F 23 78 */ mr r31, r4 -/* 801C4DB4 41 82 02 7C */ beq lbl_801C5030 -/* 801C4DB8 3C 60 80 3C */ lis r3, __vt__15dMenu_Fishing_c@ha /* 0x803BD074@ha */ -/* 801C4DBC 38 03 D0 74 */ addi r0, r3, __vt__15dMenu_Fishing_c@l /* 0x803BD074@l */ -/* 801C4DC0 90 1E 00 00 */ stw r0, 0(r30) -/* 801C4DC4 80 7E 01 F4 */ lwz r3, 0x1f4(r30) -/* 801C4DC8 38 80 00 01 */ li r4, 1 -/* 801C4DCC 48 08 4F 5D */ bl __dt__12dMsgString_cFv -/* 801C4DD0 38 00 00 00 */ li r0, 0 -/* 801C4DD4 90 1E 01 F4 */ stw r0, 0x1f4(r30) -/* 801C4DD8 80 7E 01 F0 */ lwz r3, 0x1f0(r30) -/* 801C4DDC 28 03 00 00 */ cmplwi r3, 0 -/* 801C4DE0 41 82 00 18 */ beq lbl_801C4DF8 -/* 801C4DE4 38 80 00 01 */ li r4, 1 -/* 801C4DE8 81 83 00 00 */ lwz r12, 0(r3) -/* 801C4DEC 81 8C 00 08 */ lwz r12, 8(r12) -/* 801C4DF0 7D 89 03 A6 */ mtctr r12 -/* 801C4DF4 4E 80 04 21 */ bctrl -lbl_801C4DF8: -/* 801C4DF8 38 00 00 00 */ li r0, 0 -/* 801C4DFC 90 1E 01 F0 */ stw r0, 0x1f0(r30) -/* 801C4E00 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C4E04 28 03 00 00 */ cmplwi r3, 0 -/* 801C4E08 41 82 00 18 */ beq lbl_801C4E20 -/* 801C4E0C 38 80 00 01 */ li r4, 1 -/* 801C4E10 81 83 00 00 */ lwz r12, 0(r3) -/* 801C4E14 81 8C 00 08 */ lwz r12, 8(r12) -/* 801C4E18 7D 89 03 A6 */ mtctr r12 -/* 801C4E1C 4E 80 04 21 */ bctrl -lbl_801C4E20: -/* 801C4E20 38 00 00 00 */ li r0, 0 -/* 801C4E24 90 1E 00 18 */ stw r0, 0x18(r30) -/* 801C4E28 80 7E 00 48 */ lwz r3, 0x48(r30) -/* 801C4E2C 28 03 00 00 */ cmplwi r3, 0 -/* 801C4E30 41 82 00 18 */ beq lbl_801C4E48 -/* 801C4E34 38 80 00 01 */ li r4, 1 -/* 801C4E38 81 83 00 00 */ lwz r12, 0(r3) -/* 801C4E3C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801C4E40 7D 89 03 A6 */ mtctr r12 -/* 801C4E44 4E 80 04 21 */ bctrl -lbl_801C4E48: -/* 801C4E48 38 00 00 00 */ li r0, 0 -/* 801C4E4C 90 1E 00 48 */ stw r0, 0x48(r30) -/* 801C4E50 3B 00 00 00 */ li r24, 0 -/* 801C4E54 3B A0 00 00 */ li r29, 0 -lbl_801C4E58: -/* 801C4E58 7F 5E EA 14 */ add r26, r30, r29 -/* 801C4E5C 80 7A 00 4C */ lwz r3, 0x4c(r26) -/* 801C4E60 28 03 00 00 */ cmplwi r3, 0 -/* 801C4E64 41 82 00 18 */ beq lbl_801C4E7C -/* 801C4E68 38 80 00 01 */ li r4, 1 -/* 801C4E6C 81 83 00 00 */ lwz r12, 0(r3) -/* 801C4E70 81 8C 00 08 */ lwz r12, 8(r12) -/* 801C4E74 7D 89 03 A6 */ mtctr r12 -/* 801C4E78 4E 80 04 21 */ bctrl -lbl_801C4E7C: -/* 801C4E7C 3B 60 00 00 */ li r27, 0 -/* 801C4E80 93 7A 00 4C */ stw r27, 0x4c(r26) -/* 801C4E84 3A E0 00 00 */ li r23, 0 -/* 801C4E88 7F 7C DB 78 */ mr r28, r27 -lbl_801C4E8C: -/* 801C4E8C 3B 3C 00 64 */ addi r25, r28, 0x64 -/* 801C4E90 7C 7A C8 2E */ lwzx r3, r26, r25 -/* 801C4E94 28 03 00 00 */ cmplwi r3, 0 -/* 801C4E98 41 82 00 18 */ beq lbl_801C4EB0 -/* 801C4E9C 38 80 00 01 */ li r4, 1 -/* 801C4EA0 81 83 00 00 */ lwz r12, 0(r3) -/* 801C4EA4 81 8C 00 08 */ lwz r12, 8(r12) -/* 801C4EA8 7D 89 03 A6 */ mtctr r12 -/* 801C4EAC 4E 80 04 21 */ bctrl -lbl_801C4EB0: -/* 801C4EB0 7F 7A C9 2E */ stwx r27, r26, r25 -/* 801C4EB4 3A F7 00 01 */ addi r23, r23, 1 -/* 801C4EB8 2C 17 00 06 */ cmpwi r23, 6 -/* 801C4EBC 3B 9C 00 18 */ addi r28, r28, 0x18 -/* 801C4EC0 41 80 FF CC */ blt lbl_801C4E8C -/* 801C4EC4 3B 18 00 01 */ addi r24, r24, 1 -/* 801C4EC8 2C 18 00 06 */ cmpwi r24, 6 -/* 801C4ECC 3B BD 00 04 */ addi r29, r29, 4 -/* 801C4ED0 41 80 FF 88 */ blt lbl_801C4E58 -/* 801C4ED4 3A E0 00 00 */ li r23, 0 -/* 801C4ED8 3B A0 00 00 */ li r29, 0 -/* 801C4EDC 3B 80 00 00 */ li r28, 0 -lbl_801C4EE0: -/* 801C4EE0 3B 3D 00 F4 */ addi r25, r29, 0xf4 -/* 801C4EE4 7C 7E C8 2E */ lwzx r3, r30, r25 -/* 801C4EE8 28 03 00 00 */ cmplwi r3, 0 -/* 801C4EEC 41 82 00 18 */ beq lbl_801C4F04 -/* 801C4EF0 38 80 00 01 */ li r4, 1 -/* 801C4EF4 81 83 00 00 */ lwz r12, 0(r3) -/* 801C4EF8 81 8C 00 08 */ lwz r12, 8(r12) -/* 801C4EFC 7D 89 03 A6 */ mtctr r12 -/* 801C4F00 4E 80 04 21 */ bctrl -lbl_801C4F04: -/* 801C4F04 7F 9E C9 2E */ stwx r28, r30, r25 -/* 801C4F08 3A F7 00 01 */ addi r23, r23, 1 -/* 801C4F0C 2C 17 00 02 */ cmpwi r23, 2 -/* 801C4F10 3B BD 00 04 */ addi r29, r29, 4 -/* 801C4F14 41 80 FF CC */ blt lbl_801C4EE0 -/* 801C4F18 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 801C4F1C 28 03 00 00 */ cmplwi r3, 0 -/* 801C4F20 41 82 00 18 */ beq lbl_801C4F38 -/* 801C4F24 38 80 00 01 */ li r4, 1 -/* 801C4F28 81 83 00 00 */ lwz r12, 0(r3) -/* 801C4F2C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801C4F30 7D 89 03 A6 */ mtctr r12 -/* 801C4F34 4E 80 04 21 */ bctrl -lbl_801C4F38: -/* 801C4F38 38 00 00 00 */ li r0, 0 -/* 801C4F3C 90 1E 00 1C */ stw r0, 0x1c(r30) -/* 801C4F40 3A E0 00 00 */ li r23, 0 -/* 801C4F44 3B A0 00 00 */ li r29, 0 -lbl_801C4F48: -/* 801C4F48 7F 3E EA 14 */ add r25, r30, r29 -/* 801C4F4C 80 79 00 FC */ lwz r3, 0xfc(r25) -/* 801C4F50 28 03 00 00 */ cmplwi r3, 0 -/* 801C4F54 41 82 00 24 */ beq lbl_801C4F78 -/* 801C4F58 41 82 00 18 */ beq lbl_801C4F70 -/* 801C4F5C 38 80 00 01 */ li r4, 1 -/* 801C4F60 81 83 00 00 */ lwz r12, 0(r3) -/* 801C4F64 81 8C 00 08 */ lwz r12, 8(r12) -/* 801C4F68 7D 89 03 A6 */ mtctr r12 -/* 801C4F6C 4E 80 04 21 */ bctrl -lbl_801C4F70: -/* 801C4F70 38 00 00 00 */ li r0, 0 -/* 801C4F74 90 19 00 FC */ stw r0, 0xfc(r25) -lbl_801C4F78: -/* 801C4F78 80 79 01 04 */ lwz r3, 0x104(r25) -/* 801C4F7C 28 03 00 00 */ cmplwi r3, 0 -/* 801C4F80 41 82 00 24 */ beq lbl_801C4FA4 -/* 801C4F84 41 82 00 18 */ beq lbl_801C4F9C -/* 801C4F88 38 80 00 01 */ li r4, 1 -/* 801C4F8C 81 83 00 00 */ lwz r12, 0(r3) -/* 801C4F90 81 8C 00 08 */ lwz r12, 8(r12) -/* 801C4F94 7D 89 03 A6 */ mtctr r12 -/* 801C4F98 4E 80 04 21 */ bctrl -lbl_801C4F9C: -/* 801C4F9C 38 00 00 00 */ li r0, 0 -/* 801C4FA0 90 19 01 04 */ stw r0, 0x104(r25) -lbl_801C4FA4: -/* 801C4FA4 3A F7 00 01 */ addi r23, r23, 1 -/* 801C4FA8 2C 17 00 02 */ cmpwi r23, 2 -/* 801C4FAC 3B BD 00 04 */ addi r29, r29, 4 -/* 801C4FB0 41 80 FF 98 */ blt lbl_801C4F48 -/* 801C4FB4 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C4FB8 28 03 00 00 */ cmplwi r3, 0 -/* 801C4FBC 41 82 00 40 */ beq lbl_801C4FFC -/* 801C4FC0 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 801C4FC4 81 83 00 00 */ lwz r12, 0(r3) -/* 801C4FC8 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801C4FCC 7D 89 03 A6 */ mtctr r12 -/* 801C4FD0 4E 80 04 21 */ bctrl -/* 801C4FD4 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C4FD8 28 03 00 00 */ cmplwi r3, 0 -/* 801C4FDC 41 82 00 18 */ beq lbl_801C4FF4 -/* 801C4FE0 38 80 00 01 */ li r4, 1 -/* 801C4FE4 81 83 00 10 */ lwz r12, 0x10(r3) -/* 801C4FE8 81 8C 00 08 */ lwz r12, 8(r12) -/* 801C4FEC 7D 89 03 A6 */ mtctr r12 -/* 801C4FF0 4E 80 04 21 */ bctrl -lbl_801C4FF4: -/* 801C4FF4 38 00 00 00 */ li r0, 0 -/* 801C4FF8 90 1E 00 14 */ stw r0, 0x14(r30) -lbl_801C4FFC: -/* 801C4FFC 80 7E 00 08 */ lwz r3, 8(r30) -/* 801C5000 28 03 00 00 */ cmplwi r3, 0 -/* 801C5004 41 82 00 1C */ beq lbl_801C5020 -/* 801C5008 81 83 00 00 */ lwz r12, 0(r3) -/* 801C500C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801C5010 7D 89 03 A6 */ mtctr r12 -/* 801C5014 4E 80 04 21 */ bctrl -/* 801C5018 38 00 00 00 */ li r0, 0 -/* 801C501C 90 1E 00 08 */ stw r0, 8(r30) -lbl_801C5020: -/* 801C5020 7F E0 07 35 */ extsh. r0, r31 -/* 801C5024 40 81 00 0C */ ble lbl_801C5030 -/* 801C5028 7F C3 F3 78 */ mr r3, r30 -/* 801C502C 48 10 9D 11 */ bl __dl__FPv -lbl_801C5030: -/* 801C5030 7F C3 F3 78 */ mr r3, r30 -/* 801C5034 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C5038 48 19 D1 D9 */ bl _restgpr_23 -/* 801C503C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801C5040 7C 08 03 A6 */ mtlr r0 -/* 801C5044 38 21 00 30 */ addi r1, r1, 0x30 -/* 801C5048 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fishing/__sinit_d_menu_fishing_cpp.s b/asm/d/menu/d_menu_fishing/__sinit_d_menu_fishing_cpp.s deleted file mode 100644 index f738b25a17..0000000000 --- a/asm/d/menu/d_menu_fishing/__sinit_d_menu_fishing_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_801C65BC: -/* 801C65BC 3C 60 80 3C */ lis r3, cNullVec__6Z2Calc@ha /* 0x803BD038@ha */ -/* 801C65C0 38 83 D0 38 */ addi r4, r3, cNullVec__6Z2Calc@l /* 0x803BD038@l */ -/* 801C65C4 80 64 00 0C */ lwz r3, 0xc(r4) -/* 801C65C8 80 04 00 10 */ lwz r0, 0x10(r4) -/* 801C65CC 90 64 00 18 */ stw r3, 0x18(r4) -/* 801C65D0 90 04 00 1C */ stw r0, 0x1c(r4) -/* 801C65D4 80 04 00 14 */ lwz r0, 0x14(r4) -/* 801C65D8 90 04 00 20 */ stw r0, 0x20(r4) -/* 801C65DC 80 64 00 24 */ lwz r3, 0x24(r4) -/* 801C65E0 80 04 00 28 */ lwz r0, 0x28(r4) -/* 801C65E4 90 64 00 30 */ stw r3, 0x30(r4) -/* 801C65E8 90 04 00 34 */ stw r0, 0x34(r4) -/* 801C65EC 80 04 00 2C */ lwz r0, 0x2c(r4) -/* 801C65F0 90 04 00 38 */ stw r0, 0x38(r4) -/* 801C65F4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fishing/_close__15dMenu_Fishing_cFv.s b/asm/d/menu/d_menu_fishing/_close__15dMenu_Fishing_cFv.s deleted file mode 100644 index dc3902f835..0000000000 --- a/asm/d/menu/d_menu_fishing/_close__15dMenu_Fishing_cFv.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_801C5470: -/* 801C5470 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801C5474 7C 08 02 A6 */ mflr r0 -/* 801C5478 90 01 00 34 */ stw r0, 0x34(r1) -/* 801C547C DB E1 00 20 */ stfd f31, 0x20(r1) -/* 801C5480 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 801C5484 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801C5488 7C 7F 1B 78 */ mr r31, r3 -/* 801C548C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801C5490 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801C5494 A8 A3 09 A6 */ lha r5, 0x9a6(r3) -/* 801C5498 38 60 00 00 */ li r3, 0 -/* 801C549C B0 7F 01 F8 */ sth r3, 0x1f8(r31) -/* 801C54A0 A8 9F 01 F8 */ lha r4, 0x1f8(r31) -/* 801C54A4 7C 80 07 35 */ extsh. r0, r4 -/* 801C54A8 41 81 00 44 */ bgt lbl_801C54EC -/* 801C54AC B0 7F 01 F8 */ sth r3, 0x1f8(r31) -/* 801C54B0 98 7F 01 FA */ stb r3, 0x1fa(r31) -/* 801C54B4 80 7F 00 48 */ lwz r3, 0x48(r31) -/* 801C54B8 80 63 00 04 */ lwz r3, 4(r3) -/* 801C54BC C0 02 A7 08 */ lfs f0, lit_3904(r2) -/* 801C54C0 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801C54C4 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801C54C8 81 83 00 00 */ lwz r12, 0(r3) -/* 801C54CC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801C54D0 7D 89 03 A6 */ mtctr r12 -/* 801C54D4 4E 80 04 21 */ bctrl -/* 801C54D8 80 7F 00 48 */ lwz r3, 0x48(r31) -/* 801C54DC C0 22 A7 08 */ lfs f1, lit_3904(r2) -/* 801C54E0 48 09 02 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801C54E4 38 60 00 01 */ li r3, 1 -/* 801C54E8 48 00 00 68 */ b lbl_801C5550 -lbl_801C54EC: -/* 801C54EC C8 42 A7 18 */ lfd f2, lit_4012(r2) -/* 801C54F0 6C 80 80 00 */ xoris r0, r4, 0x8000 -/* 801C54F4 90 01 00 0C */ stw r0, 0xc(r1) -/* 801C54F8 3C 60 43 30 */ lis r3, 0x4330 -/* 801C54FC 90 61 00 08 */ stw r3, 8(r1) -/* 801C5500 C8 01 00 08 */ lfd f0, 8(r1) -/* 801C5504 EC 20 10 28 */ fsubs f1, f0, f2 -/* 801C5508 6C A0 80 00 */ xoris r0, r5, 0x8000 -/* 801C550C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C5510 90 61 00 10 */ stw r3, 0x10(r1) -/* 801C5514 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 801C5518 EC 00 10 28 */ fsubs f0, f0, f2 -/* 801C551C EF E1 00 24 */ fdivs f31, f1, f0 -/* 801C5520 80 7F 00 48 */ lwz r3, 0x48(r31) -/* 801C5524 80 63 00 04 */ lwz r3, 4(r3) -/* 801C5528 D3 E3 00 CC */ stfs f31, 0xcc(r3) -/* 801C552C D3 E3 00 D0 */ stfs f31, 0xd0(r3) -/* 801C5530 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5534 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801C5538 7D 89 03 A6 */ mtctr r12 -/* 801C553C 4E 80 04 21 */ bctrl -/* 801C5540 80 7F 00 48 */ lwz r3, 0x48(r31) -/* 801C5544 FC 20 F8 90 */ fmr f1, f31 -/* 801C5548 48 09 02 89 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801C554C 38 60 00 00 */ li r3, 0 -lbl_801C5550: -/* 801C5550 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 801C5554 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 801C5558 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801C555C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801C5560 7C 08 03 A6 */ mtlr r0 -/* 801C5564 38 21 00 30 */ addi r1, r1, 0x30 -/* 801C5568 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fishing/_draw__15dMenu_Fishing_cFv.s b/asm/d/menu/d_menu_fishing/_draw__15dMenu_Fishing_cFv.s deleted file mode 100644 index dccfd81b78..0000000000 --- a/asm/d/menu/d_menu_fishing/_draw__15dMenu_Fishing_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_801C514C: -/* 801C514C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801C5150 7C 08 02 A6 */ mflr r0 -/* 801C5154 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C5158 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801C515C 93 C1 00 08 */ stw r30, 8(r1) -/* 801C5160 7C 7E 1B 78 */ mr r30, r3 -/* 801C5164 80 03 00 08 */ lwz r0, 8(r3) -/* 801C5168 28 00 00 00 */ cmplwi r0, 0 -/* 801C516C 41 82 00 80 */ beq lbl_801C51EC -/* 801C5170 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801C5174 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801C5178 83 E3 5F 50 */ lwz r31, 0x5f50(r3) -/* 801C517C 80 7E 01 F0 */ lwz r3, 0x1f0(r30) -/* 801C5180 38 80 00 FF */ li r4, 0xff -/* 801C5184 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5188 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801C518C 7D 89 03 A6 */ mtctr r12 -/* 801C5190 4E 80 04 21 */ bctrl -/* 801C5194 80 7E 01 F0 */ lwz r3, 0x1f0(r30) -/* 801C5198 C0 22 A7 08 */ lfs f1, lit_3904(r2) -/* 801C519C FC 40 08 90 */ fmr f2, f1 -/* 801C51A0 C0 62 A7 0C */ lfs f3, lit_3905(r2) -/* 801C51A4 C0 82 A7 10 */ lfs f4, lit_3906(r2) -/* 801C51A8 38 80 00 00 */ li r4, 0 -/* 801C51AC 38 A0 00 00 */ li r5, 0 -/* 801C51B0 38 C0 00 00 */ li r6, 0 -/* 801C51B4 81 83 00 00 */ lwz r12, 0(r3) -/* 801C51B8 81 8C 00 EC */ lwz r12, 0xec(r12) -/* 801C51BC 7D 89 03 A6 */ mtctr r12 -/* 801C51C0 4E 80 04 21 */ bctrl -/* 801C51C4 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C51C8 C0 22 A7 08 */ lfs f1, lit_3904(r2) -/* 801C51CC FC 40 08 90 */ fmr f2, f1 -/* 801C51D0 7F E4 FB 78 */ mr r4, r31 -/* 801C51D4 48 13 3D 01 */ bl draw__9J2DScreenFffPC14J2DGrafContext -/* 801C51D8 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 801C51DC C0 22 A7 08 */ lfs f1, lit_3904(r2) -/* 801C51E0 FC 40 08 90 */ fmr f2, f1 -/* 801C51E4 7F E4 FB 78 */ mr r4, r31 -/* 801C51E8 48 13 3C ED */ bl draw__9J2DScreenFffPC14J2DGrafContext -lbl_801C51EC: -/* 801C51EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801C51F0 83 C1 00 08 */ lwz r30, 8(r1) -/* 801C51F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801C51F8 7C 08 03 A6 */ mtlr r0 -/* 801C51FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C5200 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fishing/_move__15dMenu_Fishing_cFv.s b/asm/d/menu/d_menu_fishing/_move__15dMenu_Fishing_cFv.s deleted file mode 100644 index bf93e09c80..0000000000 --- a/asm/d/menu/d_menu_fishing/_move__15dMenu_Fishing_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_801C50B4: -/* 801C50B4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801C50B8 7C 08 02 A6 */ mflr r0 -/* 801C50BC 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C50C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C50C4 48 19 D1 19 */ bl _savegpr_29 -/* 801C50C8 7C 7D 1B 78 */ mr r29, r3 -/* 801C50CC 80 63 00 04 */ lwz r3, 4(r3) -/* 801C50D0 4B E4 A0 FD */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801C50D4 7C 7E 1B 78 */ mr r30, r3 -/* 801C50D8 8B FD 01 FB */ lbz r31, 0x1fb(r29) -/* 801C50DC 7F A3 EB 78 */ mr r3, r29 -/* 801C50E0 1C BF 00 0C */ mulli r5, r31, 0xc -/* 801C50E4 3C 80 80 3C */ lis r4, map_move_process@ha /* 0x803BD068@ha */ -/* 801C50E8 38 04 D0 68 */ addi r0, r4, map_move_process@l /* 0x803BD068@l */ -/* 801C50EC 7D 80 2A 14 */ add r12, r0, r5 -/* 801C50F0 48 19 CF 95 */ bl __ptmf_scall -/* 801C50F4 60 00 00 00 */ nop -/* 801C50F8 88 1D 01 FB */ lbz r0, 0x1fb(r29) -/* 801C50FC 7C 1F 00 40 */ cmplw r31, r0 -/* 801C5100 41 82 00 20 */ beq lbl_801C5120 -/* 801C5104 7F A3 EB 78 */ mr r3, r29 -/* 801C5108 1C A0 00 0C */ mulli r5, r0, 0xc -/* 801C510C 3C 80 80 3C */ lis r4, map_init_process@ha /* 0x803BD050@ha */ -/* 801C5110 38 04 D0 50 */ addi r0, r4, map_init_process@l /* 0x803BD050@l */ -/* 801C5114 7D 80 2A 14 */ add r12, r0, r5 -/* 801C5118 48 19 CF 6D */ bl __ptmf_scall -/* 801C511C 60 00 00 00 */ nop -lbl_801C5120: -/* 801C5120 7F A3 EB 78 */ mr r3, r29 -/* 801C5124 38 80 00 00 */ li r4, 0 -/* 801C5128 48 00 10 E9 */ bl setHIO__15dMenu_Fishing_cFb -/* 801C512C 7F C3 F3 78 */ mr r3, r30 -/* 801C5130 4B E4 A0 9D */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801C5134 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C5138 48 19 D0 F1 */ bl _restgpr_29 -/* 801C513C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801C5140 7C 08 03 A6 */ mtlr r0 -/* 801C5144 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C5148 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fishing/_open__15dMenu_Fishing_cFv.s b/asm/d/menu/d_menu_fishing/_open__15dMenu_Fishing_cFv.s deleted file mode 100644 index 2f606a2c25..0000000000 --- a/asm/d/menu/d_menu_fishing/_open__15dMenu_Fishing_cFv.s +++ /dev/null @@ -1,106 +0,0 @@ -lbl_801C52E4: -/* 801C52E4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801C52E8 7C 08 02 A6 */ mflr r0 -/* 801C52EC 90 01 00 34 */ stw r0, 0x34(r1) -/* 801C52F0 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 801C52F4 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 801C52F8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801C52FC 7C 7F 1B 78 */ mr r31, r3 -/* 801C5300 80 03 00 14 */ lwz r0, 0x14(r3) -/* 801C5304 28 00 00 00 */ cmplwi r0, 0 -/* 801C5308 40 82 00 1C */ bne lbl_801C5324 -/* 801C530C 3C 60 80 39 */ lis r3, d_menu_d_menu_fishing__stringBase0@ha /* 0x80396068@ha */ -/* 801C5310 38 63 60 68 */ addi r3, r3, d_menu_d_menu_fishing__stringBase0@l /* 0x80396068@l */ -/* 801C5314 38 80 00 00 */ li r4, 0 -/* 801C5318 38 A0 00 00 */ li r5, 0 -/* 801C531C 4B E5 0A F9 */ bl create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap -/* 801C5320 90 7F 00 14 */ stw r3, 0x14(r31) -lbl_801C5324: -/* 801C5324 80 7F 00 08 */ lwz r3, 8(r31) -/* 801C5328 28 03 00 00 */ cmplwi r3, 0 -/* 801C532C 40 82 00 60 */ bne lbl_801C538C -/* 801C5330 80 9F 00 14 */ lwz r4, 0x14(r31) -/* 801C5334 88 04 00 0C */ lbz r0, 0xc(r4) -/* 801C5338 2C 00 00 00 */ cmpwi r0, 0 -/* 801C533C 41 82 00 48 */ beq lbl_801C5384 -/* 801C5340 28 03 00 00 */ cmplwi r3, 0 -/* 801C5344 40 82 00 48 */ bne lbl_801C538C -/* 801C5348 80 04 00 1C */ lwz r0, 0x1c(r4) -/* 801C534C 90 1F 00 08 */ stw r0, 8(r31) -/* 801C5350 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C5354 28 03 00 00 */ cmplwi r3, 0 -/* 801C5358 41 82 00 18 */ beq lbl_801C5370 -/* 801C535C 38 80 00 01 */ li r4, 1 -/* 801C5360 81 83 00 10 */ lwz r12, 0x10(r3) -/* 801C5364 81 8C 00 08 */ lwz r12, 8(r12) -/* 801C5368 7D 89 03 A6 */ mtctr r12 -/* 801C536C 4E 80 04 21 */ bctrl -lbl_801C5370: -/* 801C5370 38 00 00 00 */ li r0, 0 -/* 801C5374 90 1F 00 14 */ stw r0, 0x14(r31) -/* 801C5378 7F E3 FB 78 */ mr r3, r31 -/* 801C537C 4B FF FC D1 */ bl _create__15dMenu_Fishing_cFv -/* 801C5380 48 00 00 0C */ b lbl_801C538C -lbl_801C5384: -/* 801C5384 38 60 00 00 */ li r3, 0 -/* 801C5388 48 00 00 CC */ b lbl_801C5454 -lbl_801C538C: -/* 801C538C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801C5390 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801C5394 A8 83 09 A4 */ lha r4, 0x9a4(r3) -/* 801C5398 A8 63 09 A6 */ lha r3, 0x9a6(r3) -/* 801C539C B0 9F 01 F8 */ sth r4, 0x1f8(r31) -/* 801C53A0 A8 1F 01 F8 */ lha r0, 0x1f8(r31) -/* 801C53A4 7C 00 20 00 */ cmpw r0, r4 -/* 801C53A8 41 80 00 48 */ blt lbl_801C53F0 -/* 801C53AC B0 7F 01 F8 */ sth r3, 0x1f8(r31) -/* 801C53B0 38 00 00 02 */ li r0, 2 -/* 801C53B4 98 1F 01 FA */ stb r0, 0x1fa(r31) -/* 801C53B8 80 7F 00 48 */ lwz r3, 0x48(r31) -/* 801C53BC 80 63 00 04 */ lwz r3, 4(r3) -/* 801C53C0 C0 02 A7 14 */ lfs f0, lit_4010(r2) -/* 801C53C4 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801C53C8 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801C53CC 81 83 00 00 */ lwz r12, 0(r3) -/* 801C53D0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801C53D4 7D 89 03 A6 */ mtctr r12 -/* 801C53D8 4E 80 04 21 */ bctrl -/* 801C53DC 80 7F 00 48 */ lwz r3, 0x48(r31) -/* 801C53E0 C0 22 A7 14 */ lfs f1, lit_4010(r2) -/* 801C53E4 48 09 03 ED */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801C53E8 38 60 00 01 */ li r3, 1 -/* 801C53EC 48 00 00 68 */ b lbl_801C5454 -lbl_801C53F0: -/* 801C53F0 C8 42 A7 18 */ lfd f2, lit_4012(r2) -/* 801C53F4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 801C53F8 90 01 00 0C */ stw r0, 0xc(r1) -/* 801C53FC 3C 60 43 30 */ lis r3, 0x4330 -/* 801C5400 90 61 00 08 */ stw r3, 8(r1) -/* 801C5404 C8 01 00 08 */ lfd f0, 8(r1) -/* 801C5408 EC 20 10 28 */ fsubs f1, f0, f2 -/* 801C540C 6C 80 80 00 */ xoris r0, r4, 0x8000 -/* 801C5410 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C5414 90 61 00 10 */ stw r3, 0x10(r1) -/* 801C5418 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 801C541C EC 00 10 28 */ fsubs f0, f0, f2 -/* 801C5420 EF E1 00 24 */ fdivs f31, f1, f0 -/* 801C5424 80 7F 00 48 */ lwz r3, 0x48(r31) -/* 801C5428 80 63 00 04 */ lwz r3, 4(r3) -/* 801C542C D3 E3 00 CC */ stfs f31, 0xcc(r3) -/* 801C5430 D3 E3 00 D0 */ stfs f31, 0xd0(r3) -/* 801C5434 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5438 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801C543C 7D 89 03 A6 */ mtctr r12 -/* 801C5440 4E 80 04 21 */ bctrl -/* 801C5444 80 7F 00 48 */ lwz r3, 0x48(r31) -/* 801C5448 FC 20 F8 90 */ fmr f1, f31 -/* 801C544C 48 09 03 85 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801C5450 38 60 00 00 */ li r3, 0 -lbl_801C5454: -/* 801C5454 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 801C5458 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 801C545C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801C5460 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801C5464 7C 08 03 A6 */ mtlr r0 -/* 801C5468 38 21 00 30 */ addi r1, r1, 0x30 -/* 801C546C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fishing/init__15dMenu_Fishing_cFv.s b/asm/d/menu/d_menu_fishing/init__15dMenu_Fishing_cFv.s deleted file mode 100644 index cc6f910a7e..0000000000 --- a/asm/d/menu/d_menu_fishing/init__15dMenu_Fishing_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_801C522C: -/* 801C522C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801C5230 7C 08 02 A6 */ mflr r0 -/* 801C5234 90 01 00 24 */ stw r0, 0x24(r1) -/* 801C5238 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C523C 48 19 CF 9D */ bl _savegpr_28 -/* 801C5240 7C 7C 1B 78 */ mr r28, r3 -/* 801C5244 3B A0 00 00 */ li r29, 0 -/* 801C5248 3B E0 00 00 */ li r31, 0 -/* 801C524C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801C5250 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801C5254 3B C3 01 6C */ addi r30, r3, 0x16c -lbl_801C5258: -/* 801C5258 57 A3 06 3E */ clrlwi r3, r29, 0x18 -/* 801C525C 57 A0 0D FC */ rlwinm r0, r29, 1, 0x17, 0x1e -/* 801C5260 7C BE 02 2E */ lhzx r5, r30, r0 -/* 801C5264 54 A0 04 3F */ clrlwi. r0, r5, 0x10 -/* 801C5268 41 82 00 28 */ beq lbl_801C5290 -/* 801C526C 38 03 00 20 */ addi r0, r3, 0x20 -/* 801C5270 7C DE 00 AE */ lbzx r6, r30, r0 -/* 801C5274 7F 83 E3 78 */ mr r3, r28 -/* 801C5278 7F A4 EB 78 */ mr r4, r29 -/* 801C527C 48 00 0D E1 */ bl setFishParam__15dMenu_Fishing_cFiUsUc -/* 801C5280 38 1F 00 4C */ addi r0, r31, 0x4c -/* 801C5284 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 801C5288 48 09 03 41 */ bl show__13CPaneMgrAlphaFv -/* 801C528C 48 00 00 10 */ b lbl_801C529C -lbl_801C5290: -/* 801C5290 38 1F 00 4C */ addi r0, r31, 0x4c -/* 801C5294 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 801C5298 48 09 03 71 */ bl hide__13CPaneMgrAlphaFv -lbl_801C529C: -/* 801C529C 3B BD 00 01 */ addi r29, r29, 1 -/* 801C52A0 2C 1D 00 06 */ cmpwi r29, 6 -/* 801C52A4 3B FF 00 04 */ addi r31, r31, 4 -/* 801C52A8 41 80 FF B0 */ blt lbl_801C5258 -/* 801C52AC 7F 83 E3 78 */ mr r3, r28 -/* 801C52B0 88 1C 01 FB */ lbz r0, 0x1fb(r28) -/* 801C52B4 1C A0 00 0C */ mulli r5, r0, 0xc -/* 801C52B8 3C 80 80 3C */ lis r4, map_init_process@ha /* 0x803BD050@ha */ -/* 801C52BC 38 04 D0 50 */ addi r0, r4, map_init_process@l /* 0x803BD050@l */ -/* 801C52C0 7D 80 2A 14 */ add r12, r0, r5 -/* 801C52C4 48 19 CD C1 */ bl __ptmf_scall -/* 801C52C8 60 00 00 00 */ nop -/* 801C52CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C52D0 48 19 CF 55 */ bl _restgpr_28 -/* 801C52D4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801C52D8 7C 08 03 A6 */ mtlr r0 -/* 801C52DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C52E0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fishing/screenSetBase__15dMenu_Fishing_cFv.s b/asm/d/menu/d_menu_fishing/screenSetBase__15dMenu_Fishing_cFv.s deleted file mode 100644 index 04e1656c85..0000000000 --- a/asm/d/menu/d_menu_fishing/screenSetBase__15dMenu_Fishing_cFv.s +++ /dev/null @@ -1,488 +0,0 @@ -lbl_801C55D8: -/* 801C55D8 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 801C55DC 7C 08 02 A6 */ mflr r0 -/* 801C55E0 90 01 00 54 */ stw r0, 0x54(r1) -/* 801C55E4 39 61 00 50 */ addi r11, r1, 0x50 -/* 801C55E8 48 19 CB C9 */ bl _savegpr_18 -/* 801C55EC 7C 7F 1B 78 */ mr r31, r3 -/* 801C55F0 3C 60 80 39 */ lis r3, fish_n@ha /* 0x80395D90@ha */ -/* 801C55F4 3B C3 5D 90 */ addi r30, r3, fish_n@l /* 0x80395D90@l */ -/* 801C55F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801C55FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801C5600 80 63 5D 30 */ lwz r3, 0x5d30(r3) -/* 801C5604 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 801C5608 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 801C560C 3C A0 80 39 */ lis r5, d_menu_d_menu_fishing__stringBase0@ha /* 0x80396068@ha */ -/* 801C5610 38 A5 60 68 */ addi r5, r5, d_menu_d_menu_fishing__stringBase0@l /* 0x80396068@l */ -/* 801C5614 38 A5 00 18 */ addi r5, r5, 0x18 -/* 801C5618 81 83 00 00 */ lwz r12, 0(r3) -/* 801C561C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 801C5620 7D 89 03 A6 */ mtctr r12 -/* 801C5624 4E 80 04 21 */ bctrl -/* 801C5628 7C 72 1B 78 */ mr r18, r3 -/* 801C562C 38 60 01 50 */ li r3, 0x150 -/* 801C5630 48 10 96 1D */ bl __nw__FUl -/* 801C5634 7C 60 1B 79 */ or. r0, r3, r3 -/* 801C5638 41 82 00 10 */ beq lbl_801C5648 -/* 801C563C 7E 44 93 78 */ mr r4, r18 -/* 801C5640 48 13 70 C9 */ bl __ct__10J2DPictureFPC7ResTIMG -/* 801C5644 7C 60 1B 78 */ mr r0, r3 -lbl_801C5648: -/* 801C5648 90 1F 01 F0 */ stw r0, 0x1f0(r31) -/* 801C564C 38 60 00 00 */ li r3, 0 -/* 801C5650 98 61 00 08 */ stb r3, 8(r1) -/* 801C5654 98 61 00 09 */ stb r3, 9(r1) -/* 801C5658 98 61 00 0A */ stb r3, 0xa(r1) -/* 801C565C 38 00 00 FF */ li r0, 0xff -/* 801C5660 98 01 00 0B */ stb r0, 0xb(r1) -/* 801C5664 80 01 00 08 */ lwz r0, 8(r1) -/* 801C5668 90 01 00 0C */ stw r0, 0xc(r1) -/* 801C566C 98 61 00 10 */ stb r3, 0x10(r1) -/* 801C5670 98 61 00 11 */ stb r3, 0x11(r1) -/* 801C5674 98 61 00 12 */ stb r3, 0x12(r1) -/* 801C5678 98 61 00 13 */ stb r3, 0x13(r1) -/* 801C567C 80 01 00 10 */ lwz r0, 0x10(r1) -/* 801C5680 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C5684 80 7F 01 F0 */ lwz r3, 0x1f0(r31) -/* 801C5688 38 81 00 14 */ addi r4, r1, 0x14 -/* 801C568C 38 A1 00 0C */ addi r5, r1, 0xc -/* 801C5690 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5694 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801C5698 7D 89 03 A6 */ mtctr r12 -/* 801C569C 4E 80 04 21 */ bctrl -/* 801C56A0 38 60 01 18 */ li r3, 0x118 -/* 801C56A4 48 10 95 A9 */ bl __nw__FUl -/* 801C56A8 7C 60 1B 79 */ or. r0, r3, r3 -/* 801C56AC 41 82 00 0C */ beq lbl_801C56B8 -/* 801C56B0 48 13 2D E9 */ bl __ct__9J2DScreenFv -/* 801C56B4 7C 60 1B 78 */ mr r0, r3 -lbl_801C56B8: -/* 801C56B8 90 1F 00 18 */ stw r0, 0x18(r31) -/* 801C56BC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C56C0 3C 80 80 39 */ lis r4, d_menu_d_menu_fishing__stringBase0@ha /* 0x80396068@ha */ -/* 801C56C4 38 84 60 68 */ addi r4, r4, d_menu_d_menu_fishing__stringBase0@l /* 0x80396068@l */ -/* 801C56C8 38 84 00 28 */ addi r4, r4, 0x28 -/* 801C56CC 3C A0 00 02 */ lis r5, 2 -/* 801C56D0 80 DF 00 08 */ lwz r6, 8(r31) -/* 801C56D4 48 13 2F 75 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 801C56D8 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C56DC 48 08 FA 0D */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 801C56E0 38 60 00 6C */ li r3, 0x6c -/* 801C56E4 48 10 95 69 */ bl __nw__FUl -/* 801C56E8 7C 60 1B 79 */ or. r0, r3, r3 -/* 801C56EC 41 82 00 24 */ beq lbl_801C5710 -/* 801C56F0 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801C56F4 3C A0 5F 61 */ lis r5, 0x5F61 /* 0x5F616C6C@ha */ -/* 801C56F8 38 C5 6C 6C */ addi r6, r5, 0x6C6C /* 0x5F616C6C@l */ -/* 801C56FC 38 A0 00 6E */ li r5, 0x6e -/* 801C5700 38 E0 00 02 */ li r7, 2 -/* 801C5704 39 00 00 00 */ li r8, 0 -/* 801C5708 48 08 E2 7D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801C570C 7C 60 1B 78 */ mr r0, r3 -lbl_801C5710: -/* 801C5710 90 1F 00 48 */ stw r0, 0x48(r31) -/* 801C5714 80 7F 00 48 */ lwz r3, 0x48(r31) -/* 801C5718 C0 22 A7 08 */ lfs f1, lit_3904(r2) -/* 801C571C 48 09 00 B5 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 801C5720 3B 80 00 00 */ li r28, 0 -/* 801C5724 3B 60 00 00 */ li r27, 0 -/* 801C5728 3B A0 00 00 */ li r29, 0 -lbl_801C572C: -/* 801C572C 38 60 00 6C */ li r3, 0x6c -/* 801C5730 48 10 95 1D */ bl __nw__FUl -/* 801C5734 7C 60 1B 79 */ or. r0, r3, r3 -/* 801C5738 41 82 00 28 */ beq lbl_801C5760 -/* 801C573C 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801C5740 38 1E 00 00 */ addi r0, r30, 0 -/* 801C5744 7C C0 EA 14 */ add r6, r0, r29 -/* 801C5748 80 A6 00 00 */ lwz r5, 0(r6) -/* 801C574C 80 C6 00 04 */ lwz r6, 4(r6) -/* 801C5750 38 E0 00 00 */ li r7, 0 -/* 801C5754 39 00 00 00 */ li r8, 0 -/* 801C5758 48 08 E2 2D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801C575C 7C 60 1B 78 */ mr r0, r3 -lbl_801C5760: -/* 801C5760 7E 5F DA 14 */ add r18, r31, r27 -/* 801C5764 90 12 00 4C */ stw r0, 0x4c(r18) -/* 801C5768 38 60 00 6C */ li r3, 0x6c -/* 801C576C 48 10 94 E1 */ bl __nw__FUl -/* 801C5770 7C 60 1B 79 */ or. r0, r3, r3 -/* 801C5774 41 82 00 28 */ beq lbl_801C579C -/* 801C5778 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801C577C 38 1E 00 30 */ addi r0, r30, 0x30 -/* 801C5780 7C C0 EA 14 */ add r6, r0, r29 -/* 801C5784 80 A6 00 00 */ lwz r5, 0(r6) -/* 801C5788 80 C6 00 04 */ lwz r6, 4(r6) -/* 801C578C 38 E0 00 00 */ li r7, 0 -/* 801C5790 39 00 00 00 */ li r8, 0 -/* 801C5794 48 08 E1 F1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801C5798 7C 60 1B 78 */ mr r0, r3 -lbl_801C579C: -/* 801C579C 90 12 00 64 */ stw r0, 0x64(r18) -/* 801C57A0 38 60 00 6C */ li r3, 0x6c -/* 801C57A4 48 10 94 A9 */ bl __nw__FUl -/* 801C57A8 7C 60 1B 79 */ or. r0, r3, r3 -/* 801C57AC 41 82 00 28 */ beq lbl_801C57D4 -/* 801C57B0 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801C57B4 38 1E 00 60 */ addi r0, r30, 0x60 -/* 801C57B8 7C C0 EA 14 */ add r6, r0, r29 -/* 801C57BC 80 A6 00 00 */ lwz r5, 0(r6) -/* 801C57C0 80 C6 00 04 */ lwz r6, 4(r6) -/* 801C57C4 38 E0 00 00 */ li r7, 0 -/* 801C57C8 39 00 00 00 */ li r8, 0 -/* 801C57CC 48 08 E1 B9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801C57D0 7C 60 1B 78 */ mr r0, r3 -lbl_801C57D4: -/* 801C57D4 90 12 00 7C */ stw r0, 0x7c(r18) -/* 801C57D8 38 60 00 6C */ li r3, 0x6c -/* 801C57DC 48 10 94 71 */ bl __nw__FUl -/* 801C57E0 7C 60 1B 79 */ or. r0, r3, r3 -/* 801C57E4 41 82 00 28 */ beq lbl_801C580C -/* 801C57E8 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801C57EC 38 1E 00 90 */ addi r0, r30, 0x90 -/* 801C57F0 7C C0 EA 14 */ add r6, r0, r29 -/* 801C57F4 80 A6 00 00 */ lwz r5, 0(r6) -/* 801C57F8 80 C6 00 04 */ lwz r6, 4(r6) -/* 801C57FC 38 E0 00 00 */ li r7, 0 -/* 801C5800 39 00 00 00 */ li r8, 0 -/* 801C5804 48 08 E1 81 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801C5808 7C 60 1B 78 */ mr r0, r3 -lbl_801C580C: -/* 801C580C 90 12 00 94 */ stw r0, 0x94(r18) -/* 801C5810 38 60 00 6C */ li r3, 0x6c -/* 801C5814 48 10 94 39 */ bl __nw__FUl -/* 801C5818 7C 60 1B 79 */ or. r0, r3, r3 -/* 801C581C 41 82 00 28 */ beq lbl_801C5844 -/* 801C5820 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801C5824 38 1E 00 C0 */ addi r0, r30, 0xc0 -/* 801C5828 7C C0 EA 14 */ add r6, r0, r29 -/* 801C582C 80 A6 00 00 */ lwz r5, 0(r6) -/* 801C5830 80 C6 00 04 */ lwz r6, 4(r6) -/* 801C5834 38 E0 00 00 */ li r7, 0 -/* 801C5838 39 00 00 00 */ li r8, 0 -/* 801C583C 48 08 E1 49 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801C5840 7C 60 1B 78 */ mr r0, r3 -lbl_801C5844: -/* 801C5844 90 12 00 AC */ stw r0, 0xac(r18) -/* 801C5848 38 60 00 6C */ li r3, 0x6c -/* 801C584C 48 10 94 01 */ bl __nw__FUl -/* 801C5850 7C 60 1B 79 */ or. r0, r3, r3 -/* 801C5854 41 82 00 28 */ beq lbl_801C587C -/* 801C5858 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801C585C 38 1E 00 F0 */ addi r0, r30, 0xf0 -/* 801C5860 7C C0 EA 14 */ add r6, r0, r29 -/* 801C5864 80 A6 00 00 */ lwz r5, 0(r6) -/* 801C5868 80 C6 00 04 */ lwz r6, 4(r6) -/* 801C586C 38 E0 00 00 */ li r7, 0 -/* 801C5870 39 00 00 00 */ li r8, 0 -/* 801C5874 48 08 E1 11 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801C5878 7C 60 1B 78 */ mr r0, r3 -lbl_801C587C: -/* 801C587C 90 12 00 C4 */ stw r0, 0xc4(r18) -/* 801C5880 38 60 00 6C */ li r3, 0x6c -/* 801C5884 48 10 93 C9 */ bl __nw__FUl -/* 801C5888 7C 60 1B 79 */ or. r0, r3, r3 -/* 801C588C 41 82 00 28 */ beq lbl_801C58B4 -/* 801C5890 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801C5894 38 1E 01 20 */ addi r0, r30, 0x120 -/* 801C5898 7C C0 EA 14 */ add r6, r0, r29 -/* 801C589C 80 A6 00 00 */ lwz r5, 0(r6) -/* 801C58A0 80 C6 00 04 */ lwz r6, 4(r6) -/* 801C58A4 38 E0 00 00 */ li r7, 0 -/* 801C58A8 39 00 00 00 */ li r8, 0 -/* 801C58AC 48 08 E0 D9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801C58B0 7C 60 1B 78 */ mr r0, r3 -lbl_801C58B4: -/* 801C58B4 90 12 00 DC */ stw r0, 0xdc(r18) -/* 801C58B8 3B 9C 00 01 */ addi r28, r28, 1 -/* 801C58BC 2C 1C 00 06 */ cmpwi r28, 6 -/* 801C58C0 3B 7B 00 04 */ addi r27, r27, 4 -/* 801C58C4 3B BD 00 08 */ addi r29, r29, 8 -/* 801C58C8 41 80 FE 64 */ blt lbl_801C572C -/* 801C58CC 38 60 00 6C */ li r3, 0x6c -/* 801C58D0 48 10 93 7D */ bl __nw__FUl -/* 801C58D4 7C 60 1B 79 */ or. r0, r3, r3 -/* 801C58D8 41 82 00 28 */ beq lbl_801C5900 -/* 801C58DC 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801C58E0 3C A0 5F 62 */ lis r5, 0x5F62 /* 0x5F626C75@ha */ -/* 801C58E4 38 C5 6C 75 */ addi r6, r5, 0x6C75 /* 0x5F626C75@l */ -/* 801C58E8 3C A0 69 6E */ lis r5, 0x696E /* 0x696E666F@ha */ -/* 801C58EC 38 A5 66 6F */ addi r5, r5, 0x666F /* 0x696E666F@l */ -/* 801C58F0 38 E0 00 00 */ li r7, 0 -/* 801C58F4 39 00 00 00 */ li r8, 0 -/* 801C58F8 48 08 E0 8D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801C58FC 7C 60 1B 78 */ mr r0, r3 -lbl_801C5900: -/* 801C5900 90 1F 00 F4 */ stw r0, 0xf4(r31) -/* 801C5904 38 60 00 6C */ li r3, 0x6c -/* 801C5908 48 10 93 45 */ bl __nw__FUl -/* 801C590C 7C 60 1B 79 */ or. r0, r3, r3 -/* 801C5910 41 82 00 28 */ beq lbl_801C5938 -/* 801C5914 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801C5918 3C A0 5F 72 */ lis r5, 0x5F72 /* 0x5F726564@ha */ -/* 801C591C 38 C5 65 64 */ addi r6, r5, 0x6564 /* 0x5F726564@l */ -/* 801C5920 3C A0 69 6E */ lis r5, 0x696E /* 0x696E666F@ha */ -/* 801C5924 38 A5 66 6F */ addi r5, r5, 0x666F /* 0x696E666F@l */ -/* 801C5928 38 E0 00 00 */ li r7, 0 -/* 801C592C 39 00 00 00 */ li r8, 0 -/* 801C5930 48 08 E0 55 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801C5934 7C 60 1B 78 */ mr r0, r3 -lbl_801C5938: -/* 801C5938 90 1F 00 F8 */ stw r0, 0xf8(r31) -/* 801C593C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C5940 3C 80 5F 74 */ lis r4, 0x5F74 /* 0x5F743030@ha */ -/* 801C5944 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x5F743030@l */ -/* 801C5948 38 A0 00 66 */ li r5, 0x66 -/* 801C594C 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5950 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801C5954 7D 89 03 A6 */ mtctr r12 -/* 801C5958 4E 80 04 21 */ bctrl -/* 801C595C 7C 72 1B 78 */ mr r18, r3 -/* 801C5960 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C5964 3C 80 5F 74 */ lis r4, 0x5F74 /* 0x5F743030@ha */ -/* 801C5968 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x5F743030@l */ -/* 801C596C 38 A0 00 74 */ li r5, 0x74 -/* 801C5970 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5974 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801C5978 7D 89 03 A6 */ mtctr r12 -/* 801C597C 4E 80 04 21 */ bctrl -/* 801C5980 38 00 00 00 */ li r0, 0 -/* 801C5984 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801C5988 4B E4 F2 19 */ bl mDoExt_getSubFont__Fv -/* 801C598C 7C 64 1B 78 */ mr r4, r3 -/* 801C5990 7E 43 93 78 */ mr r3, r18 -/* 801C5994 81 92 00 00 */ lwz r12, 0(r18) -/* 801C5998 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801C599C 7D 89 03 A6 */ mtctr r12 -/* 801C59A0 4E 80 04 21 */ bctrl -/* 801C59A4 7E 43 93 78 */ mr r3, r18 -/* 801C59A8 38 80 02 00 */ li r4, 0x200 -/* 801C59AC 3C A0 80 39 */ lis r5, d_menu_d_menu_fishing__stringBase0@ha /* 0x80396068@ha */ -/* 801C59B0 38 A5 60 68 */ addi r5, r5, d_menu_d_menu_fishing__stringBase0@l /* 0x80396068@l */ -/* 801C59B4 38 A5 00 3E */ addi r5, r5, 0x3e -/* 801C59B8 4C C6 31 82 */ crclr 6 -/* 801C59BC 48 13 AD 91 */ bl setString__10J2DTextBoxFsPCce -/* 801C59C0 80 7F 01 F4 */ lwz r3, 0x1f4(r31) -/* 801C59C4 38 80 05 A1 */ li r4, 0x5a1 -/* 801C59C8 7E 45 93 78 */ mr r5, r18 -/* 801C59CC 38 C0 00 00 */ li r6, 0 -/* 801C59D0 38 E0 00 00 */ li r7, 0 -/* 801C59D4 39 00 00 00 */ li r8, 0 -/* 801C59D8 39 20 00 00 */ li r9, 0 -/* 801C59DC 81 83 00 00 */ lwz r12, 0(r3) -/* 801C59E0 81 8C 00 08 */ lwz r12, 8(r12) -/* 801C59E4 7D 89 03 A6 */ mtctr r12 -/* 801C59E8 4E 80 04 21 */ bctrl -/* 801C59EC 3A E0 00 00 */ li r23, 0 -/* 801C59F0 3A C0 00 00 */ li r22, 0 -/* 801C59F4 3A A0 00 00 */ li r21, 0 -/* 801C59F8 3B 1E 01 50 */ addi r24, r30, 0x150 -/* 801C59FC 3C 60 80 39 */ lis r3, d_menu_d_menu_fishing__stringBase0@ha /* 0x80396068@ha */ -/* 801C5A00 3B 23 60 68 */ addi r25, r3, d_menu_d_menu_fishing__stringBase0@l /* 0x80396068@l */ -/* 801C5A04 3B 5E 01 80 */ addi r26, r30, 0x180 -/* 801C5A08 3B BE 01 B0 */ addi r29, r30, 0x1b0 -/* 801C5A0C 3B 9E 01 E0 */ addi r28, r30, 0x1e0 -/* 801C5A10 3B 7E 02 10 */ addi r27, r30, 0x210 -/* 801C5A14 3A 9E 02 40 */ addi r20, r30, 0x240 -/* 801C5A18 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C5A1C 3A 43 01 88 */ addi r18, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C5A20 3B DE 02 70 */ addi r30, r30, 0x270 -lbl_801C5A24: -/* 801C5A24 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C5A28 7C D8 AA 14 */ add r6, r24, r21 -/* 801C5A2C 80 A6 00 00 */ lwz r5, 0(r6) -/* 801C5A30 80 C6 00 04 */ lwz r6, 4(r6) -/* 801C5A34 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5A38 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801C5A3C 7D 89 03 A6 */ mtctr r12 -/* 801C5A40 4E 80 04 21 */ bctrl -/* 801C5A44 7E 7F B2 14 */ add r19, r31, r22 -/* 801C5A48 90 73 01 24 */ stw r3, 0x124(r19) -/* 801C5A4C 4B E4 F1 55 */ bl mDoExt_getSubFont__Fv -/* 801C5A50 7C 64 1B 78 */ mr r4, r3 -/* 801C5A54 80 73 01 24 */ lwz r3, 0x124(r19) -/* 801C5A58 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5A5C 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801C5A60 7D 89 03 A6 */ mtctr r12 -/* 801C5A64 4E 80 04 21 */ bctrl -/* 801C5A68 80 73 01 24 */ lwz r3, 0x124(r19) -/* 801C5A6C 38 80 00 20 */ li r4, 0x20 -/* 801C5A70 38 B9 00 3E */ addi r5, r25, 0x3e -/* 801C5A74 4C C6 31 82 */ crclr 6 -/* 801C5A78 48 13 AC D5 */ bl setString__10J2DTextBoxFsPCce -/* 801C5A7C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C5A80 7C DA AA 14 */ add r6, r26, r21 -/* 801C5A84 80 A6 00 00 */ lwz r5, 0(r6) -/* 801C5A88 80 C6 00 04 */ lwz r6, 4(r6) -/* 801C5A8C 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5A90 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801C5A94 7D 89 03 A6 */ mtctr r12 -/* 801C5A98 4E 80 04 21 */ bctrl -/* 801C5A9C 90 73 01 84 */ stw r3, 0x184(r19) -/* 801C5AA0 4B E4 F1 01 */ bl mDoExt_getSubFont__Fv -/* 801C5AA4 7C 64 1B 78 */ mr r4, r3 -/* 801C5AA8 80 73 01 84 */ lwz r3, 0x184(r19) -/* 801C5AAC 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5AB0 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801C5AB4 7D 89 03 A6 */ mtctr r12 -/* 801C5AB8 4E 80 04 21 */ bctrl -/* 801C5ABC 80 73 01 84 */ lwz r3, 0x184(r19) -/* 801C5AC0 38 80 00 20 */ li r4, 0x20 -/* 801C5AC4 38 B9 00 3E */ addi r5, r25, 0x3e -/* 801C5AC8 4C C6 31 82 */ crclr 6 -/* 801C5ACC 48 13 AC 81 */ bl setString__10J2DTextBoxFsPCce -/* 801C5AD0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C5AD4 7C DD AA 14 */ add r6, r29, r21 -/* 801C5AD8 80 A6 00 00 */ lwz r5, 0(r6) -/* 801C5ADC 80 C6 00 04 */ lwz r6, 4(r6) -/* 801C5AE0 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5AE4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801C5AE8 7D 89 03 A6 */ mtctr r12 -/* 801C5AEC 4E 80 04 21 */ bctrl -/* 801C5AF0 90 73 01 54 */ stw r3, 0x154(r19) -/* 801C5AF4 4B E4 F0 AD */ bl mDoExt_getSubFont__Fv -/* 801C5AF8 7C 64 1B 78 */ mr r4, r3 -/* 801C5AFC 80 73 01 54 */ lwz r3, 0x154(r19) -/* 801C5B00 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5B04 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801C5B08 7D 89 03 A6 */ mtctr r12 -/* 801C5B0C 4E 80 04 21 */ bctrl -/* 801C5B10 80 73 01 54 */ lwz r3, 0x154(r19) -/* 801C5B14 38 80 00 20 */ li r4, 0x20 -/* 801C5B18 38 B9 00 3E */ addi r5, r25, 0x3e -/* 801C5B1C 4C C6 31 82 */ crclr 6 -/* 801C5B20 48 13 AC 2D */ bl setString__10J2DTextBoxFsPCce -/* 801C5B24 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C5B28 7C DC AA 14 */ add r6, r28, r21 -/* 801C5B2C 80 A6 00 00 */ lwz r5, 0(r6) -/* 801C5B30 80 C6 00 04 */ lwz r6, 4(r6) -/* 801C5B34 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5B38 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801C5B3C 7D 89 03 A6 */ mtctr r12 -/* 801C5B40 4E 80 04 21 */ bctrl -/* 801C5B44 90 73 01 B4 */ stw r3, 0x1b4(r19) -/* 801C5B48 4B E4 F0 59 */ bl mDoExt_getSubFont__Fv -/* 801C5B4C 7C 64 1B 78 */ mr r4, r3 -/* 801C5B50 80 73 01 B4 */ lwz r3, 0x1b4(r19) -/* 801C5B54 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5B58 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801C5B5C 7D 89 03 A6 */ mtctr r12 -/* 801C5B60 4E 80 04 21 */ bctrl -/* 801C5B64 80 73 01 B4 */ lwz r3, 0x1b4(r19) -/* 801C5B68 38 80 00 20 */ li r4, 0x20 -/* 801C5B6C 38 B9 00 3E */ addi r5, r25, 0x3e -/* 801C5B70 4C C6 31 82 */ crclr 6 -/* 801C5B74 48 13 AB D9 */ bl setString__10J2DTextBoxFsPCce -/* 801C5B78 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C5B7C 7C DB AA 14 */ add r6, r27, r21 -/* 801C5B80 80 A6 00 00 */ lwz r5, 0(r6) -/* 801C5B84 80 C6 00 04 */ lwz r6, 4(r6) -/* 801C5B88 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5B8C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801C5B90 7D 89 03 A6 */ mtctr r12 -/* 801C5B94 4E 80 04 21 */ bctrl -/* 801C5B98 90 73 01 CC */ stw r3, 0x1cc(r19) -/* 801C5B9C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C5BA0 7C D4 AA 14 */ add r6, r20, r21 -/* 801C5BA4 80 A6 00 00 */ lwz r5, 0(r6) -/* 801C5BA8 80 C6 00 04 */ lwz r6, 4(r6) -/* 801C5BAC 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5BB0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801C5BB4 7D 89 03 A6 */ mtctr r12 -/* 801C5BB8 4E 80 04 21 */ bctrl -/* 801C5BBC 38 00 00 00 */ li r0, 0 -/* 801C5BC0 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801C5BC4 4B E4 EF DD */ bl mDoExt_getSubFont__Fv -/* 801C5BC8 7C 64 1B 78 */ mr r4, r3 -/* 801C5BCC 80 73 01 CC */ lwz r3, 0x1cc(r19) -/* 801C5BD0 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5BD4 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801C5BD8 7D 89 03 A6 */ mtctr r12 -/* 801C5BDC 4E 80 04 21 */ bctrl -/* 801C5BE0 80 73 01 CC */ lwz r3, 0x1cc(r19) -/* 801C5BE4 38 80 00 20 */ li r4, 0x20 -/* 801C5BE8 38 B9 00 3E */ addi r5, r25, 0x3e -/* 801C5BEC 4C C6 31 82 */ crclr 6 -/* 801C5BF0 48 13 AB 5D */ bl setString__10J2DTextBoxFsPCce -/* 801C5BF4 80 73 01 CC */ lwz r3, 0x1cc(r19) -/* 801C5BF8 48 13 AA 61 */ bl getStringPtr__10J2DTextBoxCFv -/* 801C5BFC 7C 65 1B 78 */ mr r5, r3 -/* 801C5C00 7E 43 93 78 */ mr r3, r18 -/* 801C5C04 7C 9E B0 2E */ lwzx r4, r30, r22 -/* 801C5C08 38 C0 00 00 */ li r6, 0 -/* 801C5C0C 48 05 69 39 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 801C5C10 3A F7 00 01 */ addi r23, r23, 1 -/* 801C5C14 2C 17 00 06 */ cmpwi r23, 6 -/* 801C5C18 3A D6 00 04 */ addi r22, r22, 4 -/* 801C5C1C 3A B5 00 08 */ addi r21, r21, 8 -/* 801C5C20 41 80 FE 04 */ blt lbl_801C5A24 -/* 801C5C24 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C5C28 3C 80 73 69 */ lis r4, 0x7369 /* 0x73697A65@ha */ -/* 801C5C2C 38 C4 7A 65 */ addi r6, r4, 0x7A65 /* 0x73697A65@l */ -/* 801C5C30 3C 80 69 6E */ lis r4, 0x696E /* 0x696E665F@ha */ -/* 801C5C34 38 A4 66 5F */ addi r5, r4, 0x665F /* 0x696E665F@l */ -/* 801C5C38 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5C3C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801C5C40 7D 89 03 A6 */ mtctr r12 -/* 801C5C44 4E 80 04 21 */ bctrl -/* 801C5C48 90 7F 01 E4 */ stw r3, 0x1e4(r31) -/* 801C5C4C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C5C50 3C 80 5F 63 */ lis r4, 0x5F63 /* 0x5F636F75@ha */ -/* 801C5C54 38 C4 6F 75 */ addi r6, r4, 0x6F75 /* 0x5F636F75@l */ -/* 801C5C58 3C 80 00 69 */ lis r4, 0x0069 /* 0x00696E66@ha */ -/* 801C5C5C 38 A4 6E 66 */ addi r5, r4, 0x6E66 /* 0x00696E66@l */ -/* 801C5C60 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5C64 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801C5C68 7D 89 03 A6 */ mtctr r12 -/* 801C5C6C 4E 80 04 21 */ bctrl -/* 801C5C70 90 7F 01 E8 */ stw r3, 0x1e8(r31) -/* 801C5C74 4B E4 ED 7D */ bl mDoExt_getMesgFont__Fv -/* 801C5C78 7C 64 1B 78 */ mr r4, r3 -/* 801C5C7C 80 7F 01 E4 */ lwz r3, 0x1e4(r31) -/* 801C5C80 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5C84 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801C5C88 7D 89 03 A6 */ mtctr r12 -/* 801C5C8C 4E 80 04 21 */ bctrl -/* 801C5C90 4B E4 ED 61 */ bl mDoExt_getMesgFont__Fv -/* 801C5C94 7C 64 1B 78 */ mr r4, r3 -/* 801C5C98 80 7F 01 E8 */ lwz r3, 0x1e8(r31) -/* 801C5C9C 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5CA0 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801C5CA4 7D 89 03 A6 */ mtctr r12 -/* 801C5CA8 4E 80 04 21 */ bctrl -/* 801C5CAC 80 7F 01 E4 */ lwz r3, 0x1e4(r31) -/* 801C5CB0 38 80 00 20 */ li r4, 0x20 -/* 801C5CB4 3C A0 80 39 */ lis r5, d_menu_d_menu_fishing__stringBase0@ha /* 0x80396068@ha */ -/* 801C5CB8 38 A5 60 68 */ addi r5, r5, d_menu_d_menu_fishing__stringBase0@l /* 0x80396068@l */ -/* 801C5CBC 38 A5 00 3E */ addi r5, r5, 0x3e -/* 801C5CC0 4C C6 31 82 */ crclr 6 -/* 801C5CC4 48 13 AA 89 */ bl setString__10J2DTextBoxFsPCce -/* 801C5CC8 80 7F 01 E4 */ lwz r3, 0x1e4(r31) -/* 801C5CCC 48 13 A9 8D */ bl getStringPtr__10J2DTextBoxCFv -/* 801C5CD0 7C 65 1B 78 */ mr r5, r3 -/* 801C5CD4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C5CD8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C5CDC 38 80 05 9F */ li r4, 0x59f -/* 801C5CE0 38 C0 00 00 */ li r6, 0 -/* 801C5CE4 48 05 68 61 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 801C5CE8 80 7F 01 E8 */ lwz r3, 0x1e8(r31) -/* 801C5CEC 38 80 00 20 */ li r4, 0x20 -/* 801C5CF0 3C A0 80 39 */ lis r5, d_menu_d_menu_fishing__stringBase0@ha /* 0x80396068@ha */ -/* 801C5CF4 38 A5 60 68 */ addi r5, r5, d_menu_d_menu_fishing__stringBase0@l /* 0x80396068@l */ -/* 801C5CF8 38 A5 00 3E */ addi r5, r5, 0x3e -/* 801C5CFC 4C C6 31 82 */ crclr 6 -/* 801C5D00 48 13 AA 4D */ bl setString__10J2DTextBoxFsPCce -/* 801C5D04 80 7F 01 E8 */ lwz r3, 0x1e8(r31) -/* 801C5D08 48 13 A9 51 */ bl getStringPtr__10J2DTextBoxCFv -/* 801C5D0C 7C 65 1B 78 */ mr r5, r3 -/* 801C5D10 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801C5D14 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801C5D18 38 80 05 A0 */ li r4, 0x5a0 -/* 801C5D1C 38 C0 00 00 */ li r6, 0 -/* 801C5D20 48 05 68 25 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 801C5D24 39 61 00 50 */ addi r11, r1, 0x50 -/* 801C5D28 48 19 C4 D5 */ bl _restgpr_18 -/* 801C5D2C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 801C5D30 7C 08 03 A6 */ mtlr r0 -/* 801C5D34 38 21 00 50 */ addi r1, r1, 0x50 -/* 801C5D38 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fishing/screenSetDoIcon__15dMenu_Fishing_cFv.s b/asm/d/menu/d_menu_fishing/screenSetDoIcon__15dMenu_Fishing_cFv.s deleted file mode 100644 index d3d15a5285..0000000000 --- a/asm/d/menu/d_menu_fishing/screenSetDoIcon__15dMenu_Fishing_cFv.s +++ /dev/null @@ -1,99 +0,0 @@ -lbl_801C5D3C: -/* 801C5D3C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801C5D40 7C 08 02 A6 */ mflr r0 -/* 801C5D44 90 01 00 34 */ stw r0, 0x34(r1) -/* 801C5D48 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C5D4C 48 19 C4 7D */ bl _savegpr_24 -/* 801C5D50 7C 7F 1B 78 */ mr r31, r3 -/* 801C5D54 38 60 01 18 */ li r3, 0x118 -/* 801C5D58 48 10 8E F5 */ bl __nw__FUl -/* 801C5D5C 7C 60 1B 79 */ or. r0, r3, r3 -/* 801C5D60 41 82 00 0C */ beq lbl_801C5D6C -/* 801C5D64 48 13 27 35 */ bl __ct__9J2DScreenFv -/* 801C5D68 7C 60 1B 78 */ mr r0, r3 -lbl_801C5D6C: -/* 801C5D6C 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 801C5D70 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801C5D74 3C 80 80 39 */ lis r4, d_menu_d_menu_fishing__stringBase0@ha /* 0x80396068@ha */ -/* 801C5D78 38 84 60 68 */ addi r4, r4, d_menu_d_menu_fishing__stringBase0@l /* 0x80396068@l */ -/* 801C5D7C 38 84 00 3F */ addi r4, r4, 0x3f -/* 801C5D80 3C A0 00 02 */ lis r5, 2 -/* 801C5D84 80 DF 00 08 */ lwz r6, 8(r31) -/* 801C5D88 48 13 28 C1 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 801C5D8C 38 60 00 00 */ li r3, 0 -/* 801C5D90 7C 65 1B 78 */ mr r5, r3 -/* 801C5D94 7C 64 1B 78 */ mr r4, r3 -/* 801C5D98 38 00 00 02 */ li r0, 2 -/* 801C5D9C 7C 09 03 A6 */ mtctr r0 -lbl_801C5DA0: -/* 801C5DA0 7C DF 1A 14 */ add r6, r31, r3 -/* 801C5DA4 90 A6 00 FC */ stw r5, 0xfc(r6) -/* 801C5DA8 90 86 01 04 */ stw r4, 0x104(r6) -/* 801C5DAC 38 63 00 04 */ addi r3, r3, 4 -/* 801C5DB0 42 00 FF F0 */ bdnz lbl_801C5DA0 -/* 801C5DB4 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801C5DB8 48 08 F3 31 */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 801C5DBC 3B 00 00 00 */ li r24, 0 -/* 801C5DC0 3B C0 00 00 */ li r30, 0 -/* 801C5DC4 3B A0 00 00 */ li r29, 0 -/* 801C5DC8 3C 60 80 39 */ lis r3, text_a_tag@ha /* 0x80396018@ha */ -/* 801C5DCC 3B 43 60 18 */ addi r26, r3, text_a_tag@l /* 0x80396018@l */ -/* 801C5DD0 3C 60 80 39 */ lis r3, text_b_tag@ha /* 0x80396040@ha */ -/* 801C5DD4 3B 63 60 40 */ addi r27, r3, text_b_tag@l /* 0x80396040@l */ -/* 801C5DD8 3C 60 80 39 */ lis r3, d_menu_d_menu_fishing__stringBase0@ha /* 0x80396068@ha */ -/* 801C5DDC 3B 83 60 68 */ addi r28, r3, d_menu_d_menu_fishing__stringBase0@l /* 0x80396068@l */ -lbl_801C5DE0: -/* 801C5DE0 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801C5DE4 7C 9A EA 14 */ add r4, r26, r29 -/* 801C5DE8 80 A4 00 00 */ lwz r5, 0(r4) -/* 801C5DEC 80 C4 00 04 */ lwz r6, 4(r4) -/* 801C5DF0 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5DF4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801C5DF8 7D 89 03 A6 */ mtctr r12 -/* 801C5DFC 4E 80 04 21 */ bctrl -/* 801C5E00 7F 3F F2 14 */ add r25, r31, r30 -/* 801C5E04 90 79 00 20 */ stw r3, 0x20(r25) -/* 801C5E08 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801C5E0C 7C 9B EA 14 */ add r4, r27, r29 -/* 801C5E10 80 A4 00 00 */ lwz r5, 0(r4) -/* 801C5E14 80 C4 00 04 */ lwz r6, 4(r4) -/* 801C5E18 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5E1C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801C5E20 7D 89 03 A6 */ mtctr r12 -/* 801C5E24 4E 80 04 21 */ bctrl -/* 801C5E28 90 79 00 34 */ stw r3, 0x34(r25) -/* 801C5E2C 4B E4 EB C5 */ bl mDoExt_getMesgFont__Fv -/* 801C5E30 7C 64 1B 78 */ mr r4, r3 -/* 801C5E34 80 79 00 20 */ lwz r3, 0x20(r25) -/* 801C5E38 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5E3C 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801C5E40 7D 89 03 A6 */ mtctr r12 -/* 801C5E44 4E 80 04 21 */ bctrl -/* 801C5E48 4B E4 EB A9 */ bl mDoExt_getMesgFont__Fv -/* 801C5E4C 7C 64 1B 78 */ mr r4, r3 -/* 801C5E50 80 79 00 34 */ lwz r3, 0x34(r25) -/* 801C5E54 81 83 00 00 */ lwz r12, 0(r3) -/* 801C5E58 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801C5E5C 7D 89 03 A6 */ mtctr r12 -/* 801C5E60 4E 80 04 21 */ bctrl -/* 801C5E64 80 79 00 20 */ lwz r3, 0x20(r25) -/* 801C5E68 38 80 00 20 */ li r4, 0x20 -/* 801C5E6C 38 BC 00 3E */ addi r5, r28, 0x3e -/* 801C5E70 4C C6 31 82 */ crclr 6 -/* 801C5E74 48 13 A8 D9 */ bl setString__10J2DTextBoxFsPCce -/* 801C5E78 80 79 00 34 */ lwz r3, 0x34(r25) -/* 801C5E7C 38 80 00 20 */ li r4, 0x20 -/* 801C5E80 38 BC 00 3E */ addi r5, r28, 0x3e -/* 801C5E84 4C C6 31 82 */ crclr 6 -/* 801C5E88 48 13 A8 C5 */ bl setString__10J2DTextBoxFsPCce -/* 801C5E8C 3B 18 00 01 */ addi r24, r24, 1 -/* 801C5E90 2C 18 00 05 */ cmpwi r24, 5 -/* 801C5E94 3B DE 00 04 */ addi r30, r30, 4 -/* 801C5E98 3B BD 00 08 */ addi r29, r29, 8 -/* 801C5E9C 41 80 FF 44 */ blt lbl_801C5DE0 -/* 801C5EA0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C5EA4 48 19 C3 71 */ bl _restgpr_24 -/* 801C5EA8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801C5EAC 7C 08 03 A6 */ mtlr r0 -/* 801C5EB0 38 21 00 30 */ addi r1, r1, 0x30 -/* 801C5EB4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_fishing/setHIO__15dMenu_Fishing_cFb.s b/asm/d/menu/d_menu_fishing/setHIO__15dMenu_Fishing_cFb.s deleted file mode 100644 index a866aa6f0b..0000000000 --- a/asm/d/menu/d_menu_fishing/setHIO__15dMenu_Fishing_cFb.s +++ /dev/null @@ -1,237 +0,0 @@ -lbl_801C6210: -/* 801C6210 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801C6214 7C 08 02 A6 */ mflr r0 -/* 801C6218 90 01 00 34 */ stw r0, 0x34(r1) -/* 801C621C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C6220 48 19 BF AD */ bl _savegpr_25 -/* 801C6224 7C 7F 1B 78 */ mr r31, r3 -/* 801C6228 7C 9A 23 78 */ mr r26, r4 -/* 801C622C 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 801C6230 40 82 00 18 */ bne lbl_801C6248 -/* 801C6234 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801C6238 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801C623C 88 03 09 D8 */ lbz r0, 0x9d8(r3) -/* 801C6240 28 00 00 00 */ cmplwi r0, 0 -/* 801C6244 41 82 01 F4 */ beq lbl_801C6438 -lbl_801C6248: -/* 801C6248 3B 60 00 00 */ li r27, 0 -/* 801C624C 3B 20 00 00 */ li r25, 0 -/* 801C6250 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801C6254 3B C3 EB C8 */ addi r30, r3, g_drawHIO@l /* 0x8042EBC8@l */ -lbl_801C6258: -/* 801C6258 7F BE CA 14 */ add r29, r30, r25 -/* 801C625C 7F 9F CA 14 */ add r28, r31, r25 -/* 801C6260 80 7C 00 4C */ lwz r3, 0x4c(r28) -/* 801C6264 C0 3D 09 58 */ lfs f1, 0x958(r29) -/* 801C6268 C0 5D 09 70 */ lfs f2, 0x970(r29) -/* 801C626C 48 08 E3 45 */ bl paneTrans__8CPaneMgrFff -/* 801C6270 C0 1D 09 40 */ lfs f0, 0x940(r29) -/* 801C6274 80 7C 00 4C */ lwz r3, 0x4c(r28) -/* 801C6278 80 63 00 04 */ lwz r3, 4(r3) -/* 801C627C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801C6280 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801C6284 81 83 00 00 */ lwz r12, 0(r3) -/* 801C6288 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801C628C 7D 89 03 A6 */ mtctr r12 -/* 801C6290 4E 80 04 21 */ bctrl -/* 801C6294 80 7C 00 64 */ lwz r3, 0x64(r28) -/* 801C6298 C0 3D 07 A8 */ lfs f1, 0x7a8(r29) -/* 801C629C C0 5D 07 C0 */ lfs f2, 0x7c0(r29) -/* 801C62A0 48 08 E3 11 */ bl paneTrans__8CPaneMgrFff -/* 801C62A4 C0 1D 07 90 */ lfs f0, 0x790(r29) -/* 801C62A8 80 7C 00 64 */ lwz r3, 0x64(r28) -/* 801C62AC 80 63 00 04 */ lwz r3, 4(r3) -/* 801C62B0 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801C62B4 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801C62B8 81 83 00 00 */ lwz r12, 0(r3) -/* 801C62BC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801C62C0 7D 89 03 A6 */ mtctr r12 -/* 801C62C4 4E 80 04 21 */ bctrl -/* 801C62C8 80 7C 00 7C */ lwz r3, 0x7c(r28) -/* 801C62CC C0 3D 07 F0 */ lfs f1, 0x7f0(r29) -/* 801C62D0 C0 5D 08 08 */ lfs f2, 0x808(r29) -/* 801C62D4 48 08 E2 DD */ bl paneTrans__8CPaneMgrFff -/* 801C62D8 C0 1D 07 D8 */ lfs f0, 0x7d8(r29) -/* 801C62DC 80 7C 00 7C */ lwz r3, 0x7c(r28) -/* 801C62E0 80 63 00 04 */ lwz r3, 4(r3) -/* 801C62E4 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801C62E8 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801C62EC 81 83 00 00 */ lwz r12, 0(r3) -/* 801C62F0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801C62F4 7D 89 03 A6 */ mtctr r12 -/* 801C62F8 4E 80 04 21 */ bctrl -/* 801C62FC 80 7C 00 94 */ lwz r3, 0x94(r28) -/* 801C6300 C0 3D 08 38 */ lfs f1, 0x838(r29) -/* 801C6304 C0 5D 08 50 */ lfs f2, 0x850(r29) -/* 801C6308 48 08 E2 A9 */ bl paneTrans__8CPaneMgrFff -/* 801C630C C0 1D 08 20 */ lfs f0, 0x820(r29) -/* 801C6310 80 7C 00 94 */ lwz r3, 0x94(r28) -/* 801C6314 80 63 00 04 */ lwz r3, 4(r3) -/* 801C6318 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801C631C D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801C6320 81 83 00 00 */ lwz r12, 0(r3) -/* 801C6324 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801C6328 7D 89 03 A6 */ mtctr r12 -/* 801C632C 4E 80 04 21 */ bctrl -/* 801C6330 80 7C 00 AC */ lwz r3, 0xac(r28) -/* 801C6334 C0 3D 08 80 */ lfs f1, 0x880(r29) -/* 801C6338 C0 5D 08 98 */ lfs f2, 0x898(r29) -/* 801C633C 48 08 E2 75 */ bl paneTrans__8CPaneMgrFff -/* 801C6340 C0 1D 08 68 */ lfs f0, 0x868(r29) -/* 801C6344 80 7C 00 AC */ lwz r3, 0xac(r28) -/* 801C6348 80 63 00 04 */ lwz r3, 4(r3) -/* 801C634C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801C6350 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801C6354 81 83 00 00 */ lwz r12, 0(r3) -/* 801C6358 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801C635C 7D 89 03 A6 */ mtctr r12 -/* 801C6360 4E 80 04 21 */ bctrl -/* 801C6364 80 7C 00 C4 */ lwz r3, 0xc4(r28) -/* 801C6368 C0 3D 08 C8 */ lfs f1, 0x8c8(r29) -/* 801C636C C0 5D 08 E0 */ lfs f2, 0x8e0(r29) -/* 801C6370 48 08 E2 41 */ bl paneTrans__8CPaneMgrFff -/* 801C6374 C0 1D 08 B0 */ lfs f0, 0x8b0(r29) -/* 801C6378 80 7C 00 C4 */ lwz r3, 0xc4(r28) -/* 801C637C 80 63 00 04 */ lwz r3, 4(r3) -/* 801C6380 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801C6384 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801C6388 81 83 00 00 */ lwz r12, 0(r3) -/* 801C638C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801C6390 7D 89 03 A6 */ mtctr r12 -/* 801C6394 4E 80 04 21 */ bctrl -/* 801C6398 80 7C 00 DC */ lwz r3, 0xdc(r28) -/* 801C639C C0 3D 09 10 */ lfs f1, 0x910(r29) -/* 801C63A0 C0 5D 09 28 */ lfs f2, 0x928(r29) -/* 801C63A4 48 08 E2 0D */ bl paneTrans__8CPaneMgrFff -/* 801C63A8 C0 1D 08 F8 */ lfs f0, 0x8f8(r29) -/* 801C63AC 80 7C 00 DC */ lwz r3, 0xdc(r28) -/* 801C63B0 80 63 00 04 */ lwz r3, 4(r3) -/* 801C63B4 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801C63B8 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801C63BC 81 83 00 00 */ lwz r12, 0(r3) -/* 801C63C0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801C63C4 7D 89 03 A6 */ mtctr r12 -/* 801C63C8 4E 80 04 21 */ bctrl -/* 801C63CC 3B 7B 00 01 */ addi r27, r27, 1 -/* 801C63D0 2C 1B 00 06 */ cmpwi r27, 6 -/* 801C63D4 3B 39 00 04 */ addi r25, r25, 4 -/* 801C63D8 41 80 FE 80 */ blt lbl_801C6258 -/* 801C63DC 3B C0 00 00 */ li r30, 0 -/* 801C63E0 3B 60 00 00 */ li r27, 0 -/* 801C63E4 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801C63E8 3B 23 EB C8 */ addi r25, r3, g_drawHIO@l /* 0x8042EBC8@l */ -lbl_801C63EC: -/* 801C63EC 7F 99 DA 14 */ add r28, r25, r27 -/* 801C63F0 3B BB 00 F4 */ addi r29, r27, 0xf4 -/* 801C63F4 7C 7F E8 2E */ lwzx r3, r31, r29 -/* 801C63F8 C0 3C 09 90 */ lfs f1, 0x990(r28) -/* 801C63FC C0 5C 09 9C */ lfs f2, 0x99c(r28) -/* 801C6400 48 08 E1 B1 */ bl paneTrans__8CPaneMgrFff -/* 801C6404 C0 1C 09 88 */ lfs f0, 0x988(r28) -/* 801C6408 7C 7F E8 2E */ lwzx r3, r31, r29 -/* 801C640C 80 63 00 04 */ lwz r3, 4(r3) -/* 801C6410 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801C6414 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801C6418 81 83 00 00 */ lwz r12, 0(r3) -/* 801C641C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801C6420 7D 89 03 A6 */ mtctr r12 -/* 801C6424 4E 80 04 21 */ bctrl -/* 801C6428 3B DE 00 01 */ addi r30, r30, 1 -/* 801C642C 2C 1E 00 02 */ cmpwi r30, 2 -/* 801C6430 3B 7B 00 04 */ addi r27, r27, 4 -/* 801C6434 41 80 FF B8 */ blt lbl_801C63EC -lbl_801C6438: -/* 801C6438 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801C643C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801C6440 88 03 06 B4 */ lbz r0, 0x6b4(r3) -/* 801C6444 28 00 00 00 */ cmplwi r0, 0 -/* 801C6448 40 82 00 0C */ bne lbl_801C6454 -/* 801C644C 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 801C6450 41 82 01 34 */ beq lbl_801C6584 -lbl_801C6454: -/* 801C6454 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 801C6458 28 03 00 00 */ cmplwi r3, 0 -/* 801C645C 41 82 00 44 */ beq lbl_801C64A0 -/* 801C6460 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801C6464 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801C6468 C0 24 06 60 */ lfs f1, 0x660(r4) -/* 801C646C C0 44 06 64 */ lfs f2, 0x664(r4) -/* 801C6470 48 08 E1 41 */ bl paneTrans__8CPaneMgrFff -/* 801C6474 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801C6478 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801C647C C0 03 06 68 */ lfs f0, 0x668(r3) -/* 801C6480 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 801C6484 80 63 00 04 */ lwz r3, 4(r3) -/* 801C6488 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801C648C D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801C6490 81 83 00 00 */ lwz r12, 0(r3) -/* 801C6494 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801C6498 7D 89 03 A6 */ mtctr r12 -/* 801C649C 4E 80 04 21 */ bctrl -lbl_801C64A0: -/* 801C64A0 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 801C64A4 28 03 00 00 */ cmplwi r3, 0 -/* 801C64A8 41 82 00 44 */ beq lbl_801C64EC -/* 801C64AC 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801C64B0 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801C64B4 C0 24 06 6C */ lfs f1, 0x66c(r4) -/* 801C64B8 C0 44 06 70 */ lfs f2, 0x670(r4) -/* 801C64BC 48 08 E0 F5 */ bl paneTrans__8CPaneMgrFff -/* 801C64C0 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801C64C4 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801C64C8 C0 03 06 74 */ lfs f0, 0x674(r3) -/* 801C64CC 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 801C64D0 80 63 00 04 */ lwz r3, 4(r3) -/* 801C64D4 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801C64D8 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801C64DC 81 83 00 00 */ lwz r12, 0(r3) -/* 801C64E0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801C64E4 7D 89 03 A6 */ mtctr r12 -/* 801C64E8 4E 80 04 21 */ bctrl -lbl_801C64EC: -/* 801C64EC 80 7F 01 04 */ lwz r3, 0x104(r31) -/* 801C64F0 28 03 00 00 */ cmplwi r3, 0 -/* 801C64F4 41 82 00 44 */ beq lbl_801C6538 -/* 801C64F8 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801C64FC 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801C6500 C0 24 06 78 */ lfs f1, 0x678(r4) -/* 801C6504 C0 44 06 7C */ lfs f2, 0x67c(r4) -/* 801C6508 48 08 E0 A9 */ bl paneTrans__8CPaneMgrFff -/* 801C650C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801C6510 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801C6514 C0 03 06 80 */ lfs f0, 0x680(r3) -/* 801C6518 80 7F 01 04 */ lwz r3, 0x104(r31) -/* 801C651C 80 63 00 04 */ lwz r3, 4(r3) -/* 801C6520 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801C6524 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801C6528 81 83 00 00 */ lwz r12, 0(r3) -/* 801C652C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801C6530 7D 89 03 A6 */ mtctr r12 -/* 801C6534 4E 80 04 21 */ bctrl -lbl_801C6538: -/* 801C6538 80 7F 01 08 */ lwz r3, 0x108(r31) -/* 801C653C 28 03 00 00 */ cmplwi r3, 0 -/* 801C6540 41 82 00 44 */ beq lbl_801C6584 -/* 801C6544 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801C6548 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801C654C C0 24 06 84 */ lfs f1, 0x684(r4) -/* 801C6550 C0 44 06 88 */ lfs f2, 0x688(r4) -/* 801C6554 48 08 E0 5D */ bl paneTrans__8CPaneMgrFff -/* 801C6558 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801C655C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801C6560 C0 03 06 8C */ lfs f0, 0x68c(r3) -/* 801C6564 80 7F 01 08 */ lwz r3, 0x108(r31) -/* 801C6568 80 63 00 04 */ lwz r3, 4(r3) -/* 801C656C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801C6570 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801C6574 81 83 00 00 */ lwz r12, 0(r3) -/* 801C6578 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801C657C 7D 89 03 A6 */ mtctr r12 -/* 801C6580 4E 80 04 21 */ bctrl -lbl_801C6584: -/* 801C6584 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C6588 48 19 BC 91 */ bl _restgpr_25 -/* 801C658C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801C6590 7C 08 03 A6 */ mtlr r0 -/* 801C6594 38 21 00 30 */ addi r1, r1, 0x30 -/* 801C6598 4E 80 00 20 */ blr diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index d28b2f3090..c57fe0a3b6 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -512,6 +512,7 @@ public: void setMesgCancelButton(u8 button) { mMesgCancelButton = button; } void setMesgBgm(u8 param_0) { mMesgBgm = param_0; } int getMessageCountNumber() { return mMessageCountNum; } + void setMessageCountNumber(u32 number) { mMessageCountNum = number; } void setWindowNum(u8 num) { mWindowNum = num; } int getWindowNum() { return mWindowNum; } @@ -1702,6 +1703,10 @@ inline u16 dComIfGs_getFishNum(u8 param_0) { return g_dComIfG_gameInfo.info.getPlayer().getFishingInfo().getFishCount(param_0); } +inline u8 dComIfGs_getFishSize(u8 param_0) { + return g_dComIfG_gameInfo.info.getPlayer().getFishingInfo().getMaxSize(param_0); +} + void dComIfGp_setSelectItem(int index); s32 dComIfGp_offHeapLockFlag(int flag); void dComIfGp_createSubExpHeap2D(); @@ -2517,6 +2522,10 @@ inline void dComIfGp_setMesgBgmOn() { g_dComIfG_gameInfo.play.setMesgBgm(1); } +inline void dComIfGp_setMessageCountNumber(u32 number) { + g_dComIfG_gameInfo.play.setMessageCountNumber(number); +} + inline s32 dComIfGp_checkStatus(u16 flags) { return g_dComIfG_gameInfo.play.checkStatus(flags); } diff --git a/include/d/menu/d_menu_fishing.h b/include/d/menu/d_menu_fishing.h index 45e2d7057d..00edfd0c50 100644 --- a/include/d/menu/d_menu_fishing.h +++ b/include/d/menu/d_menu_fishing.h @@ -19,15 +19,15 @@ public: /* 801C514C */ void _draw(); /* 801C5204 */ bool isSync(); /* 801C522C */ void init(); - /* 801C52E4 */ void _open(); - /* 801C5470 */ void _close(); + /* 801C52E4 */ int _open(); + /* 801C5470 */ int _close(); /* 801C556C */ void wait_init(); /* 801C55A8 */ void wait_move(); /* 801C55D8 */ void screenSetBase(); /* 801C5D3C */ void screenSetDoIcon(); /* 801C5EB8 */ void setAButtonString(u16); /* 801C5F68 */ void setBButtonString(u16); - /* 801C6018 */ int getFigure(int); + /* 801C6018 */ u8 getFigure(int); /* 801C605C */ void setFishParam(int, u16, u8); /* 801C6210 */ void setHIO(bool); @@ -38,10 +38,10 @@ public: private: /* 0x004 */ JKRExpHeap* mpHeap; - /* 0x008 */ JKRArchive* field_0x8; + /* 0x008 */ JKRArchive* mpArchive; /* 0x00C */ STControl* mpStick; /* 0x010 */ CSTControl* mpCStick; - /* 0x014 */ mDoDvdThd_mountArchive_c* field_0x14; + /* 0x014 */ mDoDvdThd_mountArchive_c* mpMount; /* 0x018 */ J2DScreen* mpScreen; /* 0x01C */ J2DScreen* mpIconScreen; /* 0x020 */ J2DTextBox* mpAButtonString[5]; @@ -66,7 +66,7 @@ private: /* 0x1EC */ J2DTextBox* field_0x1ec; /* 0x1F0 */ J2DPicture* mpBlackTex; /* 0x1F4 */ dMsgString_c* mpString; - /* 0x1F8 */ u16 field_0x1f8; + /* 0x1F8 */ s16 field_0x1f8; /* 0x1FA */ u8 mStatus; /* 0x1FB */ u8 field_0x1fb; }; diff --git a/include/d/meter/d_meter_HIO.h b/include/d/meter/d_meter_HIO.h index 01b77684e7..33aeb5212c 100644 --- a/include/d/meter/d_meter_HIO.h +++ b/include/d/meter/d_meter_HIO.h @@ -184,13 +184,10 @@ public: /* 0x1B8 */ f32 mFishInfoScale[6]; /* 0x1D0 */ f32 mFishInfoPosX[6]; /* 0x1E8 */ f32 mFishInfoPosY[6]; - /* 0x200 */ f32 mMaxSizeScale; - /* 0x204 */ f32 mCaughtNumScale; - /* 0x208 */ f32 mMaxSizePosX; - /* 0x20C */ f32 mCaughtNumPosX; + /* 0x200 */ f32 mScale[2]; // 0: MaxSizeScale, 1: CaughtNumScale + /* 0x208 */ f32 mPosX[2]; // 0: MaxSizePosX, 1: CaughtNumPosX /* 0x210 */ f32 mCaughtNumPosX_4x3; - /* 0x214 */ f32 mMaxSizePosY; - /* 0x218 */ f32 mCaughtNumPosY; + /* 0x214 */ f32 mPosY[2]; // 0: MaxSizePosY, 1: CaughtNumPosY /* 0x21C */ s16 mOpenFrames; /* 0x21E */ s16 mCloseFrames; /* 0x220 */ s16 mFishNum[6]; diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index dc3880cf18..ded1227c7b 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -678,7 +678,9 @@ class dSv_fishing_info_c { public: void init(); void addFishCount(u8 i_fishIndex); - u16 getFishCount(u8 i_fishIndex) { return mFishCount[i_fishIndex]; } + u16 getFishCount(u8 i_fishIndex) const { return mFishCount[i_fishIndex]; } + u8 getMaxSize(s32 i_sizeIndex) { return mMaxSize[i_sizeIndex]; } + void setMaxSize(s32 i_sizeIndex, u8 i_size) { mMaxSize[i_sizeIndex] = i_size; } private: /* 0x00 */ u16 mFishCount[16]; diff --git a/src/d/menu/d_menu_fishing.cpp b/src/d/menu/d_menu_fishing.cpp index c143d87183..61ab3dd099 100644 --- a/src/d/menu/d_menu_fishing.cpp +++ b/src/d/menu/d_menu_fishing.cpp @@ -5,16 +5,19 @@ #include "d/menu/d_menu_fishing.h" #include "JSystem/J2DGraph/J2DTextBox.h" +#include "JSystem/JKernel/JKRMemArchive.h" +#include "JSystem/JUtility/TColor.h" #include "d/com/d_com_inf_game.h" #include "d/d_lib.h" +#include "d/menu/d_menu_dmap.h" #include "d/meter/d_meter2_info.h" +#include "d/meter/d_meter_HIO.h" #include "d/msg/d_msg_string.h" #include "dol2asm.h" #include "dolphin/types.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" - // // Forward References: // @@ -84,48 +87,23 @@ extern "C" void _restgpr_29(); extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_drawHIO[3880]; - extern "C" u8 mFader__13mDoGph_gInf_c[4]; -// -// Declarations: -// - -/* ############################################################################################## */ /* 803BD038-803BD044 01A158 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, }; -/* 803BD044-803BD050 -00001 000C+00 0/1 0/0 0/0 .data @3790 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3790[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)wait_init__15dMenu_Fishing_cFv, -}; -#pragma pop - /* 803BD050-803BD05C 01A170 000C+00 2/3 0/0 0/0 .data map_init_process */ -SECTION_DATA static u8 map_init_process[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +typedef void (dMenu_Fishing_c::*initFunc)(); +initFunc map_init_process[] = { + &dMenu_Fishing_c::wait_init, }; -/* 803BD05C-803BD068 -00001 000C+00 0/1 0/0 0/0 .data @3791 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3791[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)wait_move__15dMenu_Fishing_cFv, -}; -#pragma pop - /* 803BD068-803BD074 01A188 000C+00 1/2 0/0 0/0 .data map_move_process */ -SECTION_DATA static u8 map_move_process[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +typedef void (dMenu_Fishing_c::*moveFunc)(); +moveFunc map_move_process[] = { + &dMenu_Fishing_c::wait_move, }; /* 803BD074-803BD090 01A194 0010+0C 2/2 0/0 0/0 .data __vt__15dMenu_Fishing_c */ @@ -144,25 +122,69 @@ SECTION_DATA extern void* __vt__15dMenu_Fishing_c[4 + 3 /* padding */] = { * __ct__15dMenu_Fishing_cFP10JKRExpHeapP9STControlP10CSTControl */ dMenu_Fishing_c::dMenu_Fishing_c(JKRExpHeap* heap, STControl* stControl, CSTControl* cstControl) { mpHeap = heap; - field_0x8 = 0; - field_0x14 = 0; + mpArchive = 0; + mpMount = 0; mpStick = stControl; mpCStick = cstControl; mStatus = 1; field_0x1fb = 0; field_0x1f8 = 0; - } /* 801C4D98-801C504C 1BF6D8 02B4+00 1/0 0/0 0/0 .text __dt__15dMenu_Fishing_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMenu_Fishing_c::~dMenu_Fishing_c() { - nofralloc -#include "asm/d/menu/d_menu_fishing/__dt__15dMenu_Fishing_cFv.s" +dMenu_Fishing_c::~dMenu_Fishing_c() { + delete mpString; + mpString = NULL; + + delete mpBlackTex; + mpBlackTex = NULL; + + delete mpScreen; + mpScreen = NULL; + + delete mpParent; + mpParent = NULL; + + for (int i = 0; i < 6; i++) { + delete mpFishParent[i]; + mpFishParent[i] = NULL; + + for (int j = 0; j < 6; j++) { + delete mpFishParts[j][i]; + mpFishParts[j][i] = NULL; + } + } + + for (int i = 0; i < 2; i++) { + delete mpFishInfoParent[i]; + mpFishInfoParent[i] = NULL; + } + + delete mpIconScreen; + mpIconScreen = NULL; + + for (int i = 0; i < 2; i++) { + if (mpButtonAB[i]) { + delete mpButtonAB[i]; + mpButtonAB[i] = NULL; + } + if (mpButtonText[i]) { + delete mpButtonText[i]; + mpButtonText[i] = NULL; + } + } + + if (mpMount) { + mpMount->getArchive()->unmount(); + mpMount->destroy(); + mpMount = NULL; + } + + if (mpArchive) { + mpArchive->unmount(); + mpArchive = NULL; + } } -#pragma pop /* 801C504C-801C50B4 1BF98C 0068+00 1/1 0/0 0/0 .text _create__15dMenu_Fishing_cFv */ void dMenu_Fishing_c::_create() { @@ -174,103 +196,113 @@ void dMenu_Fishing_c::_create() { } /* 801C50B4-801C514C 1BF9F4 0098+00 0/0 2/2 0/0 .text _move__15dMenu_Fishing_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fishing_c::_move() { - nofralloc -#include "asm/d/menu/d_menu_fishing/_move__15dMenu_Fishing_cFv.s" +void dMenu_Fishing_c::_move() { + JKRHeap* heap = mDoExt_setCurrentHeap((JKRHeap*)mpHeap); + u8 uVar = field_0x1fb; + (this->*map_move_process[field_0x1fb])(); + if (uVar != field_0x1fb) { + (this->*map_init_process[field_0x1fb])(); + } + setHIO(false); + mDoExt_setCurrentHeap((JKRHeap*)heap); } -#pragma pop - -/* ############################################################################################## */ -/* 80454108-8045410C 002708 0004+00 3/3 0/0 0/0 .sdata2 @3904 */ -SECTION_SDATA2 static u8 lit_3904[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 8045410C-80454110 00270C 0004+00 1/1 0/0 0/0 .sdata2 @3905 */ -SECTION_SDATA2 static f32 lit_3905 = 608.0f; - -/* 80454110-80454114 002710 0004+00 1/1 0/0 0/0 .sdata2 @3906 */ -SECTION_SDATA2 static f32 lit_3906 = 448.0f; /* 801C514C-801C5204 1BFA8C 00B8+00 1/1 1/1 0/0 .text _draw__15dMenu_Fishing_cFv */ -#ifdef NONMATCHING -// u8 lit_3904 void dMenu_Fishing_c::_draw() { - if (field_0x8) { - J2DGrafContext* pJVar1 = dComIfGp_getCurrentGrafPort(); + if (mpArchive) { + J2DGrafContext* grafPort = dComIfGp_getCurrentGrafPort(); mpBlackTex->setAlpha(0xff); - mpBlackTex->draw(0,0,lit_3905,lit_3906,0,0,0); - mpScreen->draw(0,0,pJVar1); - mpIconScreen->draw(0,0,pJVar1); + mpBlackTex->draw(0.0f, 0.0f, 608.0f, 448.0f, 0, 0, 0); + mpScreen->draw(0.0f, 0.0f, grafPort); + mpIconScreen->draw(0.0f, 0.0f, grafPort); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fishing_c::_draw() { - nofralloc -#include "asm/d/menu/d_menu_fishing/_draw__15dMenu_Fishing_cFv.s" -} -#pragma pop -#endif /* 801C5204-801C522C 1BFB44 0028+00 0/0 2/2 0/0 .text isSync__15dMenu_Fishing_cFv */ bool dMenu_Fishing_c::isSync() { - if (field_0x14 && !field_0x14->sync()) { + if (mpMount && !mpMount->sync()) { return false; } return true; } /* 801C522C-801C52E4 1BFB6C 00B8+00 1/1 0/0 0/0 .text init__15dMenu_Fishing_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fishing_c::init() { - nofralloc -#include "asm/d/menu/d_menu_fishing/init__15dMenu_Fishing_cFv.s" +void dMenu_Fishing_c::init() { + for (int i = 0; i < 6; i++) { + if (dComIfGs_getFishNum(i) != 0) { + setFishParam(i, dComIfGs_getFishNum(i), dComIfGs_getFishSize(i)); + mpFishParent[i]->show(); + } else { + mpFishParent[i]->hide(); + } + } + (this->*map_init_process[field_0x1fb])(); } -#pragma pop - -/* ############################################################################################## */ -/* 80396068-80396068 0226C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80396068 = "/res/Layout/fishres.arc"; -#pragma pop - -/* 80454114-80454118 002714 0004+00 1/1 0/0 0/0 .sdata2 @4010 */ -SECTION_SDATA2 static f32 lit_4010 = 1.0f; - -/* 80454118-80454120 002718 0008+00 2/2 0/0 0/0 .sdata2 @4012 */ -SECTION_SDATA2 static f64 lit_4012 = 4503601774854144.0 /* cast s32 to float */; /* 801C52E4-801C5470 1BFC24 018C+00 0/0 2/2 0/0 .text _open__15dMenu_Fishing_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fishing_c::_open() { - nofralloc -#include "asm/d/menu/d_menu_fishing/_open__15dMenu_Fishing_cFv.s" +int dMenu_Fishing_c::_open() { + if (!mpMount) { + mpMount = mDoDvdThd_mountArchive_c::create("/res/Layout/fishres.arc", 0, NULL); + } + if (!mpArchive) { + if (mpMount->sync() != 0) { + if (!mpArchive) { + mpArchive = (JKRArchive*)mpMount->getArchive(); + delete mpMount; + mpMount = NULL; + _create(); + } + } else { + return 0; + } + } + s16 openFrames = g_drawHIO.mFishListScreen.mOpenFrames; + s16 closeFrames = g_drawHIO.mFishListScreen.mCloseFrames; + field_0x1f8 = g_drawHIO.mFishListScreen.mOpenFrames; + if (field_0x1f8 >= openFrames) { + field_0x1f8 = closeFrames; + mStatus = 2; + J2DPane* pane = mpParent->getPanePtr(); + pane->mScaleX = 1.0f; + pane->mScaleY = 1.0f; + pane->calcMtx(); + mpParent->setAlphaRate(1.0f); + return 1; + } else { + f32 div = field_0x1f8 / (f32)openFrames; + J2DPane* pane = mpParent->getPanePtr(); + pane->mScaleX = div; + pane->mScaleY = div; + pane->calcMtx(); + mpParent->setAlphaRate(div); + return 0; + } } -#pragma pop /* 801C5470-801C556C 1BFDB0 00FC+00 0/0 1/1 0/0 .text _close__15dMenu_Fishing_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fishing_c::_close() { - nofralloc -#include "asm/d/menu/d_menu_fishing/_close__15dMenu_Fishing_cFv.s" +int dMenu_Fishing_c::_close() { + s16 closeFrames = g_drawHIO.mFishListScreen.mCloseFrames; + field_0x1f8 = 0; + if (field_0x1f8 <= 0) { + field_0x1f8 = 0; + mStatus = 0; + J2DPane* pane = mpParent->getPanePtr(); + pane->mScaleX = 0.0f; + pane->mScaleY = 0.0f; + pane->calcMtx(); + mpParent->setAlphaRate(0.0f); + return 1; + } else { + f32 div = field_0x1f8 / (f32)closeFrames; + J2DPane* pane = mpParent->getPanePtr(); + pane->mScaleX = div; + pane->mScaleY = div; + pane->calcMtx(); + mpParent->setAlphaRate(div); + return 0; + } + return field_0x1f8 <= 0; } -#pragma pop /* 801C556C-801C55A8 1BFEAC 003C+00 1/0 0/0 0/0 .text wait_init__15dMenu_Fishing_cFv */ void dMenu_Fishing_c::wait_init() { @@ -281,214 +313,203 @@ void dMenu_Fishing_c::wait_init() { /* 801C55A8-801C55D8 1BFEE8 0030+00 1/0 0/0 0/0 .text wait_move__15dMenu_Fishing_cFv */ void dMenu_Fishing_c::wait_move() { if (mDoGph_gInf_c::getFader()->getStatus() == 1 && mDoCPd_c::getTrigB(0)) { - mStatus = 3; + mStatus = 3; } } -/* ############################################################################################## */ /* 80395D90-80395DC0 0223F0 0030+00 1/1 0/0 0/0 .rodata fish_n$4060 */ -SECTION_RODATA static u8 const fish_n[48] = { - 0x66, 0x69, 0x73, 0x68, 0x5F, 0x6E, 0x5F, 0x36, 0x66, 0x69, 0x73, 0x68, 0x5F, 0x6E, 0x5F, 0x35, - 0x66, 0x69, 0x73, 0x68, 0x5F, 0x6E, 0x5F, 0x33, 0x66, 0x69, 0x73, 0x68, 0x5F, 0x6E, 0x5F, 0x31, - 0x66, 0x69, 0x73, 0x68, 0x5F, 0x6E, 0x5F, 0x32, 0x66, 0x69, 0x73, 0x68, 0x5F, 0x6E, 0x5F, 0x34, +static const u64 fish_n[6] = { + 'fish_n_6', 'fish_n_5', 'fish_n_3', 'fish_n_1', 'fish_n_2', 'fish_n_4', }; -COMPILER_STRIP_GATE(0x80395D90, &fish_n); /* 80395DC0-80395DF0 022420 0030+00 0/1 0/0 0/0 .rodata fish_p0$4061 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const fish_p0[48] = { - 0x66, 0x69, 0x5F, 0x70, 0x61, 0x5F, 0x36, 0x6E, 0x66, 0x69, 0x5F, 0x70, 0x61, 0x5F, 0x35, 0x6E, - 0x66, 0x69, 0x5F, 0x70, 0x61, 0x5F, 0x33, 0x6E, 0x66, 0x69, 0x5F, 0x70, 0x61, 0x5F, 0x31, 0x6E, - 0x66, 0x69, 0x5F, 0x70, 0x61, 0x5F, 0x32, 0x6E, 0x66, 0x69, 0x5F, 0x70, 0x61, 0x5F, 0x34, 0x6E, +static const u64 fish_p0[6] = { + 'fi_pa_6n', 'fi_pa_5n', 'fi_pa_3n', 'fi_pa_1n', 'fi_pa_2n', 'fi_pa_4n', }; -COMPILER_STRIP_GATE(0x80395DC0, &fish_p0); #pragma pop /* 80395DF0-80395E20 022450 0030+00 0/1 0/0 0/0 .rodata fish_p1$4062 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const fish_p1[48] = { - 0x66, 0x69, 0x5F, 0x6E, 0x61, 0x5F, 0x36, 0x6E, 0x66, 0x69, 0x5F, 0x6E, 0x61, 0x5F, 0x35, 0x6E, - 0x66, 0x69, 0x5F, 0x6E, 0x61, 0x5F, 0x33, 0x6E, 0x66, 0x69, 0x5F, 0x6E, 0x61, 0x5F, 0x31, 0x6E, - 0x66, 0x69, 0x5F, 0x6E, 0x61, 0x5F, 0x32, 0x6E, 0x66, 0x69, 0x5F, 0x6E, 0x61, 0x5F, 0x34, 0x6E, +static const u64 fish_p1[6] = { + 'fi_na_6n', 'fi_na_5n', 'fi_na_3n', 'fi_na_1n', 'fi_na_2n', 'fi_na_4n', }; -COMPILER_STRIP_GATE(0x80395DF0, &fish_p1); #pragma pop /* 80395E20-80395E50 022480 0030+00 0/1 0/0 0/0 .rodata fish_p2$4063 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const fish_p2[48] = { - 0x66, 0x69, 0x5F, 0x6C, 0x69, 0x5F, 0x36, 0x6E, 0x66, 0x69, 0x5F, 0x6C, 0x69, 0x5F, 0x35, 0x6E, - 0x66, 0x69, 0x5F, 0x6C, 0x69, 0x5F, 0x33, 0x6E, 0x66, 0x69, 0x5F, 0x6C, 0x69, 0x5F, 0x31, 0x6E, - 0x66, 0x69, 0x5F, 0x6C, 0x69, 0x5F, 0x32, 0x6E, 0x66, 0x69, 0x5F, 0x6C, 0x69, 0x5F, 0x34, 0x6E, -}; -COMPILER_STRIP_GATE(0x80395E20, &fish_p2); +static const u64 fish_p2[6] = {'fi_li_6n', 'fi_li_5n', 'fi_li_3n', + 'fi_li_1n', 'fi_li_2n', 'fi_li_4n'}; #pragma pop /* 80395E50-80395E80 0224B0 0030+00 0/1 0/0 0/0 .rodata fish_p3$4064 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const fish_p3[48] = { - 0x62, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x36, 0x6E, 0x62, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x35, 0x6E, - 0x62, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x33, 0x6E, 0x62, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x31, 0x6E, - 0x62, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x32, 0x6E, 0x62, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x34, 0x6E, +static const u64 fish_p3[6] = { + 'b_box_6n', 'b_box_5n', 'b_box_3n', 'b_box_1n', 'b_box_2n', 'b_box_4n', }; -COMPILER_STRIP_GATE(0x80395E50, &fish_p3); #pragma pop /* 80395E80-80395EB0 0224E0 0030+00 0/1 0/0 0/0 .rodata fish_p4$4065 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const fish_p4[48] = { - 0x72, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x36, 0x6E, 0x72, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x35, 0x6E, - 0x72, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x33, 0x6E, 0x72, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x31, 0x6E, - 0x72, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x32, 0x6E, 0x72, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x34, 0x6E, +static const u64 fish_p4[6] = { + 'r_box_6n', 'r_box_5n', 'r_box_3n', 'r_box_1n', 'r_box_2n', 'r_box_4n', }; -COMPILER_STRIP_GATE(0x80395E80, &fish_p4); #pragma pop /* 80395EB0-80395EE0 022510 0030+00 0/1 0/0 0/0 .rodata fish_p5$4066 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const fish_p5[48] = { - 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x36, 0x5F, 0x6E, 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x35, 0x5F, 0x6E, - 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x33, 0x5F, 0x6E, 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x31, 0x5F, 0x6E, - 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x32, 0x5F, 0x6E, 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x34, 0x5F, 0x6E, +static const u64 fish_p5[6] = { + 'info_6_n', 'info_5_n', 'info_3_n', 'info_1_n', 'info_2_n', 'info_4_n', }; -COMPILER_STRIP_GATE(0x80395EB0, &fish_p5); #pragma pop /* 80395EE0-80395F10 022540 0030+00 0/1 0/0 0/0 .rodata size_1$4081 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const size_1[48] = { - 0x73, 0x69, 0x7A, 0x65, 0x5F, 0x74, 0x5F, 0x36, 0x73, 0x69, 0x7A, 0x65, 0x5F, 0x74, 0x5F, 0x35, - 0x73, 0x69, 0x7A, 0x65, 0x5F, 0x74, 0x5F, 0x33, 0x73, 0x69, 0x7A, 0x65, 0x5F, 0x74, 0x5F, 0x31, - 0x73, 0x69, 0x7A, 0x65, 0x5F, 0x74, 0x5F, 0x32, 0x73, 0x69, 0x7A, 0x65, 0x5F, 0x74, 0x5F, 0x34, +static const u64 size_1[6] = { + 'size_t_6', 'size_t_5', 'size_t_3', 'size_t_1', 'size_t_2', 'size_t_4', }; -COMPILER_STRIP_GATE(0x80395EE0, &size_1); #pragma pop /* 80395F10-80395F40 022570 0030+00 0/1 0/0 0/0 .rodata size_unit_1$4082 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const size_unit_1[48] = { - 0x00, 0x00, 0x63, 0x6D, 0x5F, 0x74, 0x5F, 0x36, 0x00, 0x00, 0x63, 0x6D, 0x5F, 0x74, 0x5F, 0x35, - 0x00, 0x00, 0x63, 0x6D, 0x5F, 0x74, 0x5F, 0x33, 0x00, 0x00, 0x63, 0x6D, 0x5F, 0x74, 0x5F, 0x31, - 0x00, 0x00, 0x63, 0x6D, 0x5F, 0x74, 0x5F, 0x32, 0x00, 0x00, 0x63, 0x6D, 0x5F, 0x74, 0x5F, 0x34, +static const u64 size_unit_1[6] = { + 'cm_t_6', 'cm_t_5', 'cm_t_3', 'cm_t_1', 'cm_t_2', 'cm_t_4', }; -COMPILER_STRIP_GATE(0x80395F10, &size_unit_1); #pragma pop /* 80395F40-80395F70 0225A0 0030+00 0/1 0/0 0/0 .rodata count_1$4083 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const count_1[48] = { - 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x5F, 0x74, 0x36, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x5F, 0x74, 0x35, - 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x5F, 0x74, 0x33, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x5F, 0x74, 0x31, - 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x5F, 0x74, 0x32, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x5F, 0x74, 0x34, +static const u64 count_1[6] = { + 'count_t6', 'count_t5', 'count_t3', 'count_t1', 'count_t2', 'count_t4', }; -COMPILER_STRIP_GATE(0x80395F40, &count_1); #pragma pop /* 80395F70-80395FA0 0225D0 0030+00 0/1 0/0 0/0 .rodata count_unit_1$4084 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const count_unit_1[48] = { - 0x00, 0x63, 0x6F, 0x75, 0x5F, 0x74, 0x5F, 0x36, 0x00, 0x63, 0x6F, 0x75, 0x5F, 0x74, 0x5F, 0x35, - 0x00, 0x63, 0x6F, 0x75, 0x5F, 0x74, 0x5F, 0x33, 0x00, 0x63, 0x6F, 0x75, 0x5F, 0x74, 0x5F, 0x31, - 0x00, 0x63, 0x6F, 0x75, 0x5F, 0x74, 0x5F, 0x32, 0x00, 0x63, 0x6F, 0x75, 0x5F, 0x74, 0x5F, 0x34, +static const u64 count_unit_1[6] = { + 'cou_t_6', 'cou_t_5', 'cou_t_3', 'cou_t_1', 'cou_t_2', 'cou_t_4', }; -COMPILER_STRIP_GATE(0x80395F70, &count_unit_1); #pragma pop /* 80395FA0-80395FD0 022600 0030+00 0/1 0/0 0/0 .rodata name_0$4085 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const name_0[48] = { - 0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x36, 0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x35, - 0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x33, 0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x31, - 0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x32, 0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x34, +static const u64 name_0[6] = { + 'name_6', 'name_5', 'name_3', 'name_1', 'name_2', 'name_4', }; -COMPILER_STRIP_GATE(0x80395FA0, &name_0); #pragma pop /* 80395FD0-80396000 022630 0030+00 0/1 0/0 0/0 .rodata fname_0$4086 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const fname_0[48] = { - 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x36, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x35, - 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x33, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x31, - 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x32, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x34, +static const u64 fname_0[6] = { + 'f_name_6', 'f_name_5', 'f_name_3', 'f_name_1', 'f_name_2', 'f_name_4', }; -COMPILER_STRIP_GATE(0x80395FD0, &fname_0); #pragma pop /* 80396000-80396018 022660 0018+00 0/1 0/0 0/0 .rodata name_id$4087 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const name_id[24] = { - 0x00, 0x00, 0x05, 0x9E, 0x00, 0x00, 0x05, 0x9D, 0x00, 0x00, 0x05, 0x9B, - 0x00, 0x00, 0x05, 0x99, 0x00, 0x00, 0x05, 0x9A, 0x00, 0x00, 0x05, 0x9C, +static const u32 name_id[6] = { + 0x59E, 0x59D, 0x59B, 0x599, 0x59A, 0x59C, }; -COMPILER_STRIP_GATE(0x80396000, &name_id); -#pragma pop - -/* 80396068-80396068 0226C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80396080 = "tt_block8x8.bti"; -SECTION_DEAD static char const* const stringBase_80396090 = "zelda_fish_window.blo"; -SECTION_DEAD static char const* const stringBase_803960A6 = ""; #pragma pop /* 801C55D8-801C5D3C 1BFF18 0764+00 1/1 0/0 0/0 .text screenSetBase__15dMenu_Fishing_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fishing_c::screenSetBase() { - nofralloc -#include "asm/d/menu/d_menu_fishing/screenSetBase__15dMenu_Fishing_cFv.s" -} -#pragma pop +void dMenu_Fishing_c::screenSetBase() { + ResTIMG* TIMG = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); + mpBlackTex = new J2DPicture(TIMG); + + mpBlackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 0xff)); + mpScreen = new J2DScreen(); + mpScreen->setPriority("zelda_fish_window.blo", 0x20000, mpArchive); + dPaneClass_showNullPane(mpScreen); + mpParent = new CPaneMgr(mpScreen, 'n_all', 2, NULL); + mpParent->setAlphaRate(0.0f); + for (int i = 0; i < 6; i++) { + mpFishParent[i] = new CPaneMgr(mpScreen, fish_n[i], 0, NULL); + mpFishParts[0][i] = new CPaneMgr(mpScreen, fish_p0[i], 0, NULL); + mpFishParts[1][i] = new CPaneMgr(mpScreen, fish_p1[i], 0, NULL); + mpFishParts[2][i] = new CPaneMgr(mpScreen, fish_p2[i], 0, NULL); + mpFishParts[3][i] = new CPaneMgr(mpScreen, fish_p3[i], 0, NULL); + mpFishParts[4][i] = new CPaneMgr(mpScreen, fish_p4[i], 0, NULL); + mpFishParts[5][i] = new CPaneMgr(mpScreen, fish_p5[i], 0, NULL); + } + mpFishInfoParent[0] = new CPaneMgr(mpScreen, 'info_blu', 0, NULL); + mpFishInfoParent[1] = new CPaneMgr(mpScreen, 'info_red', 0, NULL); + J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('f_t00'); + mpScreen->search('t_t00')->hide(); + textBox->setFont(mDoExt_getSubFont()); + textBox->setString(0x200, ""); + mpString->getString(0x5a1, textBox, NULL, NULL, NULL, 0); + for (int i = 0; i < 6; i++) { + field_0x124[i] = (J2DTextBox*)mpScreen->search(size_1[i]); + field_0x124[i]->setFont(mDoExt_getSubFont()); + field_0x124[i]->setString(0x20, ""); + + field_0x184[i] = (J2DTextBox*)mpScreen->search(size_unit_1[i]); + field_0x184[i]->setFont(mDoExt_getSubFont()); + field_0x184[i]->setString(0x20, ""); + + field_0x154[i] = (J2DTextBox*)mpScreen->search(count_1[i]); + field_0x154[i]->setFont(mDoExt_getSubFont()); + field_0x154[i]->setString(0x20, ""); + + field_0x1b4[i] = (J2DTextBox*)mpScreen->search(count_unit_1[i]); + field_0x1b4[i]->setFont(mDoExt_getSubFont()); + field_0x1b4[i]->setString(0x20, ""); + + field_0x1cc[i] = (J2DTextBox*)mpScreen->search(name_0[i]); + mpScreen->search(fname_0[i])->hide(); + field_0x1cc[i]->setFont(mDoExt_getSubFont()); + field_0x1cc[i]->setString(0x20, ""); + dMeter2Info_getStringKanji(name_id[i], field_0x1cc[i]->getStringPtr(), NULL); + } + field_0x1e4 = (J2DTextBox*)mpScreen->search('inf_size'); + field_0x1e8 = (J2DTextBox*)mpScreen->search('inf_cou'); + field_0x1e4->setFont(mDoExt_getMesgFont()); + field_0x1e8->setFont(mDoExt_getMesgFont()); + field_0x1e4->setString(0x20, ""); + dMeter2Info_getStringKanji(0x59f, field_0x1e4->getStringPtr(), NULL); + field_0x1e8->setString(0x20, ""); + dMeter2Info_getStringKanji(0x5a0, field_0x1e8->getStringPtr(), NULL); +} -/* ############################################################################################## */ /* 80396018-80396040 022678 0028+00 1/1 0/0 0/0 .rodata text_a_tag$4167 */ -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, -}; -COMPILER_STRIP_GATE(0x80396018, &text_a_tag); +static const u64 text_a_tag[5] = {'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5'}; /* 80396040-80396068 0226A0 0028+00 1/1 0/0 0/0 .rodata text_b_tag$4168 */ -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, -}; -COMPILER_STRIP_GATE(0x80396040, &text_b_tag); - -/* 80396068-80396068 0226C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803960A7 = "zelda_collect_soubi_do_icon_parts.blo"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803960CD = "\0\0"; -#pragma pop +static const u64 text_b_tag[5] = {'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5'}; /* 801C5D3C-801C5EB8 1C067C 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__15dMenu_Fishing_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fishing_c::screenSetDoIcon() { - nofralloc -#include "asm/d/menu/d_menu_fishing/screenSetDoIcon__15dMenu_Fishing_cFv.s" +void dMenu_Fishing_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] = NULL; + mpButtonText[i] = NULL; + } + 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 /* 801C5EB8-801C5F68 1C07F8 00B0+00 1/1 0/0 0/0 .text setAButtonString__15dMenu_Fishing_cFUs */ void dMenu_Fishing_c::setAButtonString(u16 i_stringID) { @@ -517,8 +538,7 @@ void dMenu_Fishing_c::setBButtonString(u16 i_stringID) { } /* 801C6018-801C605C 1C0958 0044+00 1/1 0/0 0/0 .text getFigure__15dMenu_Fishing_cFi */ -int dMenu_Fishing_c::getFigure(int param_0) { - +u8 dMenu_Fishing_c::getFigure(int param_0) { if (param_0 < 0) { param_0 *= -1; } @@ -528,10 +548,49 @@ int dMenu_Fishing_c::getFigure(int param_0) { if (100 <= param_0) { return 3; } - return (param_0 >= 10) ? 2 : 1; + if (param_0 >= 10) { + return 2; + } + return 1; } /* 801C605C-801C6210 1C099C 01B4+00 1/1 0/0 0/0 .text setFishParam__15dMenu_Fishing_cFiUsUc */ +#ifdef NONMATCHING +// regalloc +void dMenu_Fishing_c::setFishParam(int param_0, u16 param_1, u8 param_2) { + u8 figure1 = getFigure(param_1); + u8 figure2 = getFigure(param_2); + char strBuff1[32]; + char strBuff2[32]; + for (int j = 1; j < 2; j++) { + // part one, param_2 + dComIfGp_setMessageCountNumber(param_2); + mpString->getString(0x597, field_0x124[param_0], NULL, NULL, NULL, 0); + strcpy(strBuff1, field_0x124[param_0]->getStringPtr()); + int i; + for (i = 0; strBuff1[i + figure2] != 0; i++) { + strBuff2[i] = strBuff1[i + figure2]; + } + strBuff2[i] = 0; + strBuff1[figure2] = 0; + strcpy(field_0x124[param_0]->getStringPtr(), strBuff1); + strcpy(field_0x184[param_0]->getStringPtr(), strBuff2); + + // part two, param_1 + dComIfGp_setMessageCountNumber(param_1); + mpString->getString(0x598, field_0x154[param_0], NULL, NULL, NULL, 0); + strcpy(strBuff1, field_0x154[param_0]->getStringPtr()); + int k; + for (k = 0; strBuff1[k + figure1] != 0; k++) { + strBuff2[k] = strBuff1[k + figure1]; + } + strBuff2[k] = 0; + strBuff1[figure1] = 0; + strcpy(field_0x154[param_0]->getStringPtr(), strBuff1); + strcpy(field_0x1b4[param_0]->getStringPtr(), strBuff2); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -540,18 +599,90 @@ asm void dMenu_Fishing_c::setFishParam(int param_0, u16 param_1, u8 param_2) { #include "asm/d/menu/d_menu_fishing/setFishParam__15dMenu_Fishing_cFiUsUc.s" } #pragma pop +#endif /* 801C6210-801C659C 1C0B50 038C+00 2/2 0/0 0/0 .text setHIO__15dMenu_Fishing_cFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Fishing_c::setHIO(bool param_0) { - nofralloc -#include "asm/d/menu/d_menu_fishing/setHIO__15dMenu_Fishing_cFb.s" +void dMenu_Fishing_c::setHIO(bool param_0) { + if (param_0 || g_drawHIO.mFishListScreen.mDebug != 0) { + for (int i = 0; i < 6; i++) { + mpFishParent[i]->paneTrans(g_drawHIO.mFishListScreen.mFishInfoPosX[i], + g_drawHIO.mFishListScreen.mFishInfoPosY[i]); + mpFishParent[i]->scale(g_drawHIO.mFishListScreen.mFishInfoScale[i], + g_drawHIO.mFishListScreen.mFishInfoScale[i]); + + mpFishParts[0][i]->paneTrans(g_drawHIO.mFishListScreen.mFishIconPosX[i], + g_drawHIO.mFishListScreen.mFishIconPosY[i]); + mpFishParts[0][i]->scale(g_drawHIO.mFishListScreen.mFishIconScale[i], + g_drawHIO.mFishListScreen.mFishIconScale[i]); + + mpFishParts[1][i]->paneTrans(g_drawHIO.mFishListScreen.mFishNamePosX[i], + g_drawHIO.mFishListScreen.mFishNamePosY[i]); + mpFishParts[1][i]->scale(g_drawHIO.mFishListScreen.mFishNameScale[i], + g_drawHIO.mFishListScreen.mFishNameScale[i]); + + mpFishParts[2][i]->paneTrans(g_drawHIO.mFishListScreen.mFishLinePosX[i], + g_drawHIO.mFishListScreen.mFishLinePosY[i]); + mpFishParts[2][i]->scale(g_drawHIO.mFishListScreen.mFishLineScale[i], + g_drawHIO.mFishListScreen.mFishLineScale[i]); + + mpFishParts[3][i]->paneTrans(g_drawHIO.mFishListScreen.mFishSizePosX[i], + g_drawHIO.mFishListScreen.mFishSizePosY[i]); + mpFishParts[3][i]->scale(g_drawHIO.mFishListScreen.mFishSizeScale[i], + g_drawHIO.mFishListScreen.mFishSizeScale[i]); + + mpFishParts[4][i]->paneTrans(g_drawHIO.mFishListScreen.mFishCountPosX[i], + g_drawHIO.mFishListScreen.mFishCountPosY[i]); + mpFishParts[4][i]->scale(g_drawHIO.mFishListScreen.mFishCountScale[i], + g_drawHIO.mFishListScreen.mFishCountScale[i]); + + mpFishParts[5][i]->paneTrans(g_drawHIO.mFishListScreen.mFishCountSizePosX[i], + g_drawHIO.mFishListScreen.mFishCountSizePosY[i]); + mpFishParts[5][i]->scale(g_drawHIO.mFishListScreen.mFishCountSizeScale[i], + g_drawHIO.mFishListScreen.mFishCountSizeScale[i]); + } + for (int i = 0; i < 2; i++) { + mpFishInfoParent[i]->paneTrans(g_drawHIO.mFishListScreen.mPosX[i], + g_drawHIO.mFishListScreen.mPosY[i]); + mpFishInfoParent[i]->scale(g_drawHIO.mFishListScreen.mScale[i], + g_drawHIO.mFishListScreen.mScale[i]); + } + } + if (g_drawHIO.mCollectScreen.mButtonDebugON != false || param_0) { + if (mpButtonAB[0] != NULL) { + 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] != NULL) { + 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] != NULL) { + 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] != NULL) { + mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonTextPosX, + g_drawHIO.mCollectScreen.mBButtonTextPosY); + mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mBButtonTextScale, + g_drawHIO.mCollectScreen.mBButtonTextScale); + } + } } -#pragma pop /* 801C659C-801C65BC 1C0EDC 0020+00 1/0 0/0 0/0 .text draw__15dMenu_Fishing_cFv */ +#ifdef NONMATCHING +// Matches but TU has to be finished and +// cleaned up with every other function +void dMenu_Fishing_c::draw() { + _draw(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -560,21 +691,5 @@ extern "C" asm void draw__15dMenu_Fishing_cFv() { nofralloc #include "asm/d/menu/d_menu_fishing/draw__15dMenu_Fishing_cFv.s" } -#pragma pop - -/* 801C65BC-801C65F8 1C0EFC 003C+00 0/0 1/0 0/0 .text __sinit_d_menu_fishing_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_menu_fishing_cpp() { - nofralloc -#include "asm/d/menu/d_menu_fishing/__sinit_d_menu_fishing_cpp.s" -} #pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x801C65BC, __sinit_d_menu_fishing_cpp); -#pragma pop - -/* 80396068-80396068 0226C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#endif diff --git a/src/d/meter/d_meter_HIO.cpp b/src/d/meter/d_meter_HIO.cpp index a7ac6f9af4..cfc96fdcee 100644 --- a/src/d/meter/d_meter_HIO.cpp +++ b/src/d/meter/d_meter_HIO.cpp @@ -375,13 +375,13 @@ dMeter_drawFishingHIO_c::dMeter_drawFishingHIO_c() { mFishInfoPosX[i] = fishnPosX[i]; mFishInfoPosY[i] = fishnPosY[i]; } - mMaxSizeScale = 0.83f; - mMaxSizePosX = 5.0f; - mMaxSizePosY = -22.2f; + mScale[0] = 0.83f; + mPosX[0] = 5.0f; + mPosY[0] = -22.2f; - mCaughtNumScale = 0.83f; - mCaughtNumPosX = -189.5f; - mCaughtNumPosY = -3.95f; + mScale[1] = 0.83f; + mPosX[1] = -189.5f; + mPosY[1] = -3.95f; mCaughtNumPosX_4x3 = -188.0f; }