d_menu_insect basically OK, optimizations, match one func in d_menu_ring (#1934)

* next d_menu_insect pass

* work on d_menu_ring & d_menu_insect

* d_menu_insect basically OK

* remove unused asm
This commit is contained in:
Trueffel 2023-09-18 06:39:57 +02:00 committed by GitHub
parent d1db2e48ea
commit 6726d1cf47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 323 additions and 1794 deletions

View File

@ -1,124 +0,0 @@
lbl_801D8114:
/* 801D8114 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 801D8118 7C 08 02 A6 */ mflr r0
/* 801D811C 90 01 00 24 */ stw r0, 0x24(r1)
/* 801D8120 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 801D8124 93 C1 00 18 */ stw r30, 0x18(r1)
/* 801D8128 7C 7F 1B 78 */ mr r31, r3
/* 801D812C 3C 60 80 3A */ lis r3, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */
/* 801D8130 38 03 6F 88 */ addi r0, r3, __vt__12dDlst_base_c@l /* 0x803A6F88@l */
/* 801D8134 90 1F 00 00 */ stw r0, 0(r31)
/* 801D8138 3C 60 80 3C */ lis r3, __vt__14dMenu_Insect_c@ha /* 0x803BD8AC@ha */
/* 801D813C 38 03 D8 AC */ addi r0, r3, __vt__14dMenu_Insect_c@l /* 0x803BD8AC@l */
/* 801D8140 90 1F 00 00 */ stw r0, 0(r31)
/* 801D8144 90 9F 00 04 */ stw r4, 4(r31)
/* 801D8148 38 00 00 00 */ li r0, 0
/* 801D814C 90 1F 00 08 */ stw r0, 8(r31)
/* 801D8150 90 1F 00 14 */ stw r0, 0x14(r31)
/* 801D8154 90 BF 00 0C */ stw r5, 0xc(r31)
/* 801D8158 90 DF 00 10 */ stw r6, 0x10(r31)
/* 801D815C 38 60 00 01 */ li r3, 1
/* 801D8160 98 7F 00 F2 */ stb r3, 0xf2(r31)
/* 801D8164 98 1F 00 F3 */ stb r0, 0xf3(r31)
/* 801D8168 B0 1F 00 F0 */ sth r0, 0xf0(r31)
/* 801D816C 98 1F 00 F4 */ stb r0, 0xf4(r31)
/* 801D8170 98 1F 00 F5 */ stb r0, 0xf5(r31)
/* 801D8174 98 FF 00 F6 */ stb r7, 0xf6(r31)
/* 801D8178 38 00 00 FF */ li r0, 0xff
/* 801D817C 98 1F 00 F8 */ stb r0, 0xf8(r31)
/* 801D8180 98 1F 00 F9 */ stb r0, 0xf9(r31)
/* 801D8184 98 1F 00 FA */ stb r0, 0xfa(r31)
/* 801D8188 98 1F 00 FB */ stb r0, 0xfb(r31)
/* 801D818C 98 7F 00 F7 */ stb r3, 0xf7(r31)
/* 801D8190 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 801D8194 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 801D8198 80 63 5D 30 */ lwz r3, 0x5d30(r3)
/* 801D819C 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */
/* 801D81A0 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */
/* 801D81A4 3C A0 80 39 */ lis r5, d_menu_d_menu_insect__stringBase0@ha /* 0x803968C0@ha */
/* 801D81A8 38 A5 68 C0 */ addi r5, r5, d_menu_d_menu_insect__stringBase0@l /* 0x803968C0@l */
/* 801D81AC 81 83 00 00 */ lwz r12, 0(r3)
/* 801D81B0 81 8C 00 18 */ lwz r12, 0x18(r12)
/* 801D81B4 7D 89 03 A6 */ mtctr r12
/* 801D81B8 4E 80 04 21 */ bctrl
/* 801D81BC 7C 7E 1B 78 */ mr r30, r3
/* 801D81C0 38 60 01 50 */ li r3, 0x150
/* 801D81C4 48 0F 6A 89 */ bl __nw__FUl
/* 801D81C8 7C 60 1B 79 */ or. r0, r3, r3
/* 801D81CC 41 82 00 10 */ beq lbl_801D81DC
/* 801D81D0 7F C4 F3 78 */ mr r4, r30
/* 801D81D4 48 12 45 35 */ bl __ct__10J2DPictureFPC7ResTIMG
/* 801D81D8 7C 60 1B 78 */ mr r0, r3
lbl_801D81DC:
/* 801D81DC 90 1F 00 60 */ stw r0, 0x60(r31)
/* 801D81E0 38 60 00 00 */ li r3, 0
/* 801D81E4 98 61 00 08 */ stb r3, 8(r1)
/* 801D81E8 98 61 00 09 */ stb r3, 9(r1)
/* 801D81EC 98 61 00 0A */ stb r3, 0xa(r1)
/* 801D81F0 38 00 00 FF */ li r0, 0xff
/* 801D81F4 98 01 00 0B */ stb r0, 0xb(r1)
/* 801D81F8 80 01 00 08 */ lwz r0, 8(r1)
/* 801D81FC 90 01 00 0C */ stw r0, 0xc(r1)
/* 801D8200 98 61 00 10 */ stb r3, 0x10(r1)
/* 801D8204 98 61 00 11 */ stb r3, 0x11(r1)
/* 801D8208 98 61 00 12 */ stb r3, 0x12(r1)
/* 801D820C 98 61 00 13 */ stb r3, 0x13(r1)
/* 801D8210 80 01 00 10 */ lwz r0, 0x10(r1)
/* 801D8214 90 01 00 14 */ stw r0, 0x14(r1)
/* 801D8218 80 7F 00 60 */ lwz r3, 0x60(r31)
/* 801D821C 38 81 00 14 */ addi r4, r1, 0x14
/* 801D8220 38 A1 00 0C */ addi r5, r1, 0xc
/* 801D8224 81 83 00 00 */ lwz r12, 0(r3)
/* 801D8228 81 8C 01 30 */ lwz r12, 0x130(r12)
/* 801D822C 7D 89 03 A6 */ mtctr r12
/* 801D8230 4E 80 04 21 */ bctrl
/* 801D8234 38 00 00 00 */ li r0, 0
/* 801D8238 98 1F 00 FC */ stb r0, 0xfc(r31)
/* 801D823C 38 60 00 B8 */ li r3, 0xb8
/* 801D8240 48 0F 6A 0D */ bl __nw__FUl
/* 801D8244 7C 60 1B 79 */ or. r0, r3, r3
/* 801D8248 41 82 00 18 */ beq lbl_801D8260
/* 801D824C 38 80 00 02 */ li r4, 2
/* 801D8250 C0 22 A8 38 */ lfs f1, lit_3834(r2)
/* 801D8254 38 A0 00 00 */ li r5, 0
/* 801D8258 4B FB BF C9 */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive
/* 801D825C 7C 60 1B 78 */ mr r0, r3
lbl_801D8260:
/* 801D8260 90 1F 00 18 */ stw r0, 0x18(r31)
/* 801D8264 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801D8268 C0 22 A8 38 */ lfs f1, lit_3834(r2)
/* 801D826C FC 40 08 90 */ fmr f2, f1
/* 801D8270 C0 62 A8 3C */ lfs f3, lit_3835(r2)
/* 801D8274 C0 82 A8 40 */ lfs f4, lit_3836(r2)
/* 801D8278 FC A0 20 90 */ fmr f5, f4
/* 801D827C 4B FB CF 35 */ bl setParam__16dSelect_cursor_cFfffff
/* 801D8280 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801D8284 C0 22 A8 44 */ lfs f1, lit_3837(r2)
/* 801D8288 4B FB D0 19 */ bl setAlphaRate__16dSelect_cursor_cFf
/* 801D828C 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801D8290 C0 22 A8 44 */ lfs f1, lit_3837(r2)
/* 801D8294 4B FB CF 35 */ bl setScale__16dSelect_cursor_cFf
/* 801D8298 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801D829C 88 03 00 B4 */ lbz r0, 0xb4(r3)
/* 801D82A0 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e
/* 801D82A4 98 03 00 B4 */ stb r0, 0xb4(r3)
/* 801D82A8 38 60 01 18 */ li r3, 0x118
/* 801D82AC 48 0F 69 A1 */ bl __nw__FUl
/* 801D82B0 7C 60 1B 79 */ or. r0, r3, r3
/* 801D82B4 41 82 00 0C */ beq lbl_801D82C0
/* 801D82B8 48 06 0D FD */ bl __ct__17dMsgScrn3Select_cFv
/* 801D82BC 7C 60 1B 78 */ mr r0, r3
lbl_801D82C0:
/* 801D82C0 90 1F 00 1C */ stw r0, 0x1c(r31)
/* 801D82C4 80 7F 00 04 */ lwz r3, 4(r31)
/* 801D82C8 38 80 0C 00 */ li r4, 0xc00
/* 801D82CC 38 A0 00 20 */ li r5, 0x20
/* 801D82D0 48 0F 62 05 */ bl alloc__7JKRHeapFUli
/* 801D82D4 90 7F 00 EC */ stw r3, 0xec(r31)
/* 801D82D8 7F E3 FB 78 */ mr r3, r31
/* 801D82DC 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 801D82E0 83 C1 00 18 */ lwz r30, 0x18(r1)
/* 801D82E4 80 01 00 24 */ lwz r0, 0x24(r1)
/* 801D82E8 7C 08 03 A6 */ mtlr r0
/* 801D82EC 38 21 00 20 */ addi r1, r1, 0x20
/* 801D82F0 4E 80 00 20 */ blr

View File

@ -1,82 +0,0 @@
lbl_801D8B2C:
/* 801D8B2C 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 801D8B30 7C 08 02 A6 */ mflr r0
/* 801D8B34 90 01 00 34 */ stw r0, 0x34(r1)
/* 801D8B38 DB E1 00 20 */ stfd f31, 0x20(r1)
/* 801D8B3C F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */
/* 801D8B40 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 801D8B44 7C 7F 1B 78 */ mr r31, r3
/* 801D8B48 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */
/* 801D8B4C 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */
/* 801D8B50 A8 A3 0A 16 */ lha r5, 0xa16(r3)
/* 801D8B54 38 60 00 00 */ li r3, 0
/* 801D8B58 B0 7F 00 F0 */ sth r3, 0xf0(r31)
/* 801D8B5C A8 9F 00 F0 */ lha r4, 0xf0(r31)
/* 801D8B60 7C 80 07 35 */ extsh. r0, r4
/* 801D8B64 41 81 00 64 */ bgt lbl_801D8BC8
/* 801D8B68 B0 7F 00 F0 */ sth r3, 0xf0(r31)
/* 801D8B6C 98 7F 00 F2 */ stb r3, 0xf2(r31)
/* 801D8B70 80 7F 00 64 */ lwz r3, 0x64(r31)
/* 801D8B74 80 63 00 04 */ lwz r3, 4(r3)
/* 801D8B78 C0 02 A8 44 */ lfs f0, lit_3837(r2)
/* 801D8B7C D0 03 00 CC */ stfs f0, 0xcc(r3)
/* 801D8B80 D0 03 00 D0 */ stfs f0, 0xd0(r3)
/* 801D8B84 81 83 00 00 */ lwz r12, 0(r3)
/* 801D8B88 81 8C 00 2C */ lwz r12, 0x2c(r12)
/* 801D8B8C 7D 89 03 A6 */ mtctr r12
/* 801D8B90 4E 80 04 21 */ bctrl
/* 801D8B94 80 7F 00 64 */ lwz r3, 0x64(r31)
/* 801D8B98 C0 22 A8 44 */ lfs f1, lit_3837(r2)
/* 801D8B9C 48 07 CC 35 */ bl setAlphaRate__13CPaneMgrAlphaFf
/* 801D8BA0 7F E3 FB 78 */ mr r3, r31
/* 801D8BA4 48 00 16 49 */ bl setCursorPos__14dMenu_Insect_cFv
/* 801D8BA8 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801D8BAC C0 22 A8 44 */ lfs f1, lit_3837(r2)
/* 801D8BB0 4B FB C6 F1 */ bl setAlphaRate__16dSelect_cursor_cFf
/* 801D8BB4 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801D8BB8 C0 22 A8 44 */ lfs f1, lit_3837(r2)
/* 801D8BBC 4B FB C6 0D */ bl setScale__16dSelect_cursor_cFf
/* 801D8BC0 38 60 00 01 */ li r3, 1
/* 801D8BC4 48 00 00 88 */ b lbl_801D8C4C
lbl_801D8BC8:
/* 801D8BC8 C8 42 A8 60 */ lfd f2, lit_4020(r2)
/* 801D8BCC 6C 80 80 00 */ xoris r0, r4, 0x8000
/* 801D8BD0 90 01 00 0C */ stw r0, 0xc(r1)
/* 801D8BD4 3C 60 43 30 */ lis r3, 0x4330
/* 801D8BD8 90 61 00 08 */ stw r3, 8(r1)
/* 801D8BDC C8 01 00 08 */ lfd f0, 8(r1)
/* 801D8BE0 EC 20 10 28 */ fsubs f1, f0, f2
/* 801D8BE4 6C A0 80 00 */ xoris r0, r5, 0x8000
/* 801D8BE8 90 01 00 14 */ stw r0, 0x14(r1)
/* 801D8BEC 90 61 00 10 */ stw r3, 0x10(r1)
/* 801D8BF0 C8 01 00 10 */ lfd f0, 0x10(r1)
/* 801D8BF4 EC 00 10 28 */ fsubs f0, f0, f2
/* 801D8BF8 EF E1 00 24 */ fdivs f31, f1, f0
/* 801D8BFC 80 7F 00 64 */ lwz r3, 0x64(r31)
/* 801D8C00 80 63 00 04 */ lwz r3, 4(r3)
/* 801D8C04 D3 E3 00 CC */ stfs f31, 0xcc(r3)
/* 801D8C08 D3 E3 00 D0 */ stfs f31, 0xd0(r3)
/* 801D8C0C 81 83 00 00 */ lwz r12, 0(r3)
/* 801D8C10 81 8C 00 2C */ lwz r12, 0x2c(r12)
/* 801D8C14 7D 89 03 A6 */ mtctr r12
/* 801D8C18 4E 80 04 21 */ bctrl
/* 801D8C1C 80 7F 00 64 */ lwz r3, 0x64(r31)
/* 801D8C20 FC 20 F8 90 */ fmr f1, f31
/* 801D8C24 48 07 CB AD */ bl setAlphaRate__13CPaneMgrAlphaFf
/* 801D8C28 7F E3 FB 78 */ mr r3, r31
/* 801D8C2C 48 00 15 C1 */ bl setCursorPos__14dMenu_Insect_cFv
/* 801D8C30 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801D8C34 FC 20 F8 90 */ fmr f1, f31
/* 801D8C38 4B FB C6 69 */ bl setAlphaRate__16dSelect_cursor_cFf
/* 801D8C3C 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801D8C40 FC 20 F8 90 */ fmr f1, f31
/* 801D8C44 4B FB C5 85 */ bl setScale__16dSelect_cursor_cFf
/* 801D8C48 38 60 00 00 */ li r3, 0
lbl_801D8C4C:
/* 801D8C4C E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */
/* 801D8C50 CB E1 00 20 */ lfd f31, 0x20(r1)
/* 801D8C54 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 801D8C58 80 01 00 34 */ lwz r0, 0x34(r1)
/* 801D8C5C 7C 08 03 A6 */ mtlr r0
/* 801D8C60 38 21 00 30 */ addi r1, r1, 0x30
/* 801D8C64 4E 80 00 20 */ blr

View File

@ -1,101 +0,0 @@
lbl_801D8760:
/* 801D8760 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 801D8764 7C 08 02 A6 */ mflr r0
/* 801D8768 90 01 00 24 */ stw r0, 0x24(r1)
/* 801D876C 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 801D8770 93 C1 00 18 */ stw r30, 0x18(r1)
/* 801D8774 7C 7E 1B 78 */ mr r30, r3
/* 801D8778 80 03 00 08 */ lwz r0, 8(r3)
/* 801D877C 28 00 00 00 */ cmplwi r0, 0
/* 801D8780 41 82 01 54 */ beq lbl_801D88D4
/* 801D8784 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 801D8788 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 801D878C 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 801D8790 80 7E 00 60 */ lwz r3, 0x60(r30)
/* 801D8794 38 80 00 FF */ li r4, 0xff
/* 801D8798 81 83 00 00 */ lwz r12, 0(r3)
/* 801D879C 81 8C 00 24 */ lwz r12, 0x24(r12)
/* 801D87A0 7D 89 03 A6 */ mtctr r12
/* 801D87A4 4E 80 04 21 */ bctrl
/* 801D87A8 80 7E 00 60 */ lwz r3, 0x60(r30)
/* 801D87AC C0 22 A8 44 */ lfs f1, lit_3837(r2)
/* 801D87B0 FC 40 08 90 */ fmr f2, f1
/* 801D87B4 C0 62 A8 48 */ lfs f3, lit_3961(r2)
/* 801D87B8 C0 82 A8 4C */ lfs f4, lit_3962(r2)
/* 801D87BC 38 80 00 00 */ li r4, 0
/* 801D87C0 38 A0 00 00 */ li r5, 0
/* 801D87C4 38 C0 00 00 */ li r6, 0
/* 801D87C8 81 83 00 00 */ lwz r12, 0(r3)
/* 801D87CC 81 8C 00 EC */ lwz r12, 0xec(r12)
/* 801D87D0 7D 89 03 A6 */ mtctr r12
/* 801D87D4 4E 80 04 21 */ bctrl
/* 801D87D8 80 7E 00 20 */ lwz r3, 0x20(r30)
/* 801D87DC C0 22 A8 44 */ lfs f1, lit_3837(r2)
/* 801D87E0 FC 40 08 90 */ fmr f2, f1
/* 801D87E4 7F E4 FB 78 */ mr r4, r31
/* 801D87E8 48 12 06 ED */ bl draw__9J2DScreenFffPC14J2DGrafContext
/* 801D87EC 80 7E 00 18 */ lwz r3, 0x18(r30)
/* 801D87F0 81 83 00 00 */ lwz r12, 0(r3)
/* 801D87F4 81 8C 00 08 */ lwz r12, 8(r12)
/* 801D87F8 7D 89 03 A6 */ mtctr r12
/* 801D87FC 4E 80 04 21 */ bctrl
/* 801D8800 80 7E 00 68 */ lwz r3, 0x68(r30)
/* 801D8804 48 07 D0 25 */ bl getAlphaRate__13CPaneMgrAlphaFv
/* 801D8808 C0 02 A8 50 */ lfs f0, lit_3963(r2)
/* 801D880C EC 00 00 72 */ fmuls f0, f0, f1
/* 801D8810 FC 00 00 1E */ fctiwz f0, f0
/* 801D8814 D8 01 00 08 */ stfd f0, 8(r1)
/* 801D8818 80 01 00 0C */ lwz r0, 0xc(r1)
/* 801D881C 98 1E 00 FC */ stb r0, 0xfc(r30)
/* 801D8820 80 7E 00 60 */ lwz r3, 0x60(r30)
/* 801D8824 88 9E 00 FC */ lbz r4, 0xfc(r30)
/* 801D8828 81 83 00 00 */ lwz r12, 0(r3)
/* 801D882C 81 8C 00 24 */ lwz r12, 0x24(r12)
/* 801D8830 7D 89 03 A6 */ mtctr r12
/* 801D8834 4E 80 04 21 */ bctrl
/* 801D8838 80 7E 00 60 */ lwz r3, 0x60(r30)
/* 801D883C C0 22 A8 44 */ lfs f1, lit_3837(r2)
/* 801D8840 FC 40 08 90 */ fmr f2, f1
/* 801D8844 C0 62 A8 48 */ lfs f3, lit_3961(r2)
/* 801D8848 C0 82 A8 4C */ lfs f4, lit_3962(r2)
/* 801D884C 38 80 00 00 */ li r4, 0
/* 801D8850 38 A0 00 00 */ li r5, 0
/* 801D8854 38 C0 00 00 */ li r6, 0
/* 801D8858 81 83 00 00 */ lwz r12, 0(r3)
/* 801D885C 81 8C 00 EC */ lwz r12, 0xec(r12)
/* 801D8860 7D 89 03 A6 */ mtctr r12
/* 801D8864 4E 80 04 21 */ bctrl
/* 801D8868 80 7E 00 24 */ lwz r3, 0x24(r30)
/* 801D886C C0 22 A8 44 */ lfs f1, lit_3837(r2)
/* 801D8870 FC 40 08 90 */ fmr f2, f1
/* 801D8874 7F E4 FB 78 */ mr r4, r31
/* 801D8878 48 12 06 5D */ bl draw__9J2DScreenFffPC14J2DGrafContext
/* 801D887C 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */
/* 801D8880 38 83 EB C8 */ addi r4, r3, g_drawHIO@l /* 0x8042EBC8@l */
/* 801D8884 C0 04 0A 04 */ lfs f0, 0xa04(r4)
/* 801D8888 80 7E 00 1C */ lwz r3, 0x1c(r30)
/* 801D888C D0 03 00 FC */ stfs f0, 0xfc(r3)
/* 801D8890 80 7E 00 1C */ lwz r3, 0x1c(r30)
/* 801D8894 C0 22 A8 54 */ lfs f1, lit_3964(r2)
/* 801D8898 C0 04 0A 04 */ lfs f0, 0xa04(r4)
/* 801D889C EC 21 00 2A */ fadds f1, f1, f0
/* 801D88A0 C0 42 A8 58 */ lfs f2, lit_3965(r2)
/* 801D88A4 C0 04 0A 0C */ lfs f0, 0xa0c(r4)
/* 801D88A8 EC 42 00 2A */ fadds f2, f2, f0
/* 801D88AC 48 06 14 ED */ bl translate__17dMsgScrn3Select_cFff
/* 801D88B0 80 7E 00 1C */ lwz r3, 0x1c(r30)
/* 801D88B4 C0 22 A8 44 */ lfs f1, lit_3837(r2)
/* 801D88B8 FC 40 08 90 */ fmr f2, f1
/* 801D88BC 48 06 15 19 */ bl draw__17dMsgScrn3Select_cFff
/* 801D88C0 80 7E 00 28 */ lwz r3, 0x28(r30)
/* 801D88C4 C0 22 A8 44 */ lfs f1, lit_3837(r2)
/* 801D88C8 FC 40 08 90 */ fmr f2, f1
/* 801D88CC 7F E4 FB 78 */ mr r4, r31
/* 801D88D0 48 12 06 05 */ bl draw__9J2DScreenFffPC14J2DGrafContext
lbl_801D88D4:
/* 801D88D4 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 801D88D8 83 C1 00 18 */ lwz r30, 0x18(r1)
/* 801D88DC 80 01 00 24 */ lwz r0, 0x24(r1)
/* 801D88E0 7C 08 03 A6 */ mtlr r0
/* 801D88E4 38 21 00 20 */ addi r1, r1, 0x20
/* 801D88E8 4E 80 00 20 */ blr

View File

@ -1,127 +0,0 @@
lbl_801D894C:
/* 801D894C 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 801D8950 7C 08 02 A6 */ mflr r0
/* 801D8954 90 01 00 34 */ stw r0, 0x34(r1)
/* 801D8958 DB E1 00 20 */ stfd f31, 0x20(r1)
/* 801D895C F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */
/* 801D8960 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 801D8964 7C 7F 1B 78 */ mr r31, r3
/* 801D8968 80 03 00 14 */ lwz r0, 0x14(r3)
/* 801D896C 28 00 00 00 */ cmplwi r0, 0
/* 801D8970 40 82 00 20 */ bne lbl_801D8990
/* 801D8974 3C 60 80 39 */ lis r3, d_menu_d_menu_insect__stringBase0@ha /* 0x803968C0@ha */
/* 801D8978 38 63 68 C0 */ addi r3, r3, d_menu_d_menu_insect__stringBase0@l /* 0x803968C0@l */
/* 801D897C 38 63 00 10 */ addi r3, r3, 0x10
/* 801D8980 38 80 00 00 */ li r4, 0
/* 801D8984 38 A0 00 00 */ li r5, 0
/* 801D8988 4B E3 D4 8D */ bl create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap
/* 801D898C 90 7F 00 14 */ stw r3, 0x14(r31)
lbl_801D8990:
/* 801D8990 80 7F 00 08 */ lwz r3, 8(r31)
/* 801D8994 28 03 00 00 */ cmplwi r3, 0
/* 801D8998 40 82 00 60 */ bne lbl_801D89F8
/* 801D899C 80 9F 00 14 */ lwz r4, 0x14(r31)
/* 801D89A0 88 04 00 0C */ lbz r0, 0xc(r4)
/* 801D89A4 2C 00 00 00 */ cmpwi r0, 0
/* 801D89A8 41 82 00 48 */ beq lbl_801D89F0
/* 801D89AC 28 03 00 00 */ cmplwi r3, 0
/* 801D89B0 40 82 00 48 */ bne lbl_801D89F8
/* 801D89B4 80 04 00 1C */ lwz r0, 0x1c(r4)
/* 801D89B8 90 1F 00 08 */ stw r0, 8(r31)
/* 801D89BC 80 7F 00 14 */ lwz r3, 0x14(r31)
/* 801D89C0 28 03 00 00 */ cmplwi r3, 0
/* 801D89C4 41 82 00 18 */ beq lbl_801D89DC
/* 801D89C8 38 80 00 01 */ li r4, 1
/* 801D89CC 81 83 00 10 */ lwz r12, 0x10(r3)
/* 801D89D0 81 8C 00 08 */ lwz r12, 8(r12)
/* 801D89D4 7D 89 03 A6 */ mtctr r12
/* 801D89D8 4E 80 04 21 */ bctrl
lbl_801D89DC:
/* 801D89DC 38 00 00 00 */ li r0, 0
/* 801D89E0 90 1F 00 14 */ stw r0, 0x14(r31)
/* 801D89E4 7F E3 FB 78 */ mr r3, r31
/* 801D89E8 4B FF FC 71 */ bl _create__14dMenu_Insect_cFv
/* 801D89EC 48 00 00 0C */ b lbl_801D89F8
lbl_801D89F0:
/* 801D89F0 38 60 00 00 */ li r3, 0
/* 801D89F4 48 00 01 1C */ b lbl_801D8B10
lbl_801D89F8:
/* 801D89F8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */
/* 801D89FC 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */
/* 801D8A00 A8 83 0A 14 */ lha r4, 0xa14(r3)
/* 801D8A04 A8 63 0A 16 */ lha r3, 0xa16(r3)
/* 801D8A08 B0 9F 00 F0 */ sth r4, 0xf0(r31)
/* 801D8A0C A8 1F 00 F0 */ lha r0, 0xf0(r31)
/* 801D8A10 7C 00 20 00 */ cmpw r0, r4
/* 801D8A14 41 80 00 78 */ blt lbl_801D8A8C
/* 801D8A18 B0 7F 00 F0 */ sth r3, 0xf0(r31)
/* 801D8A1C 38 00 00 02 */ li r0, 2
/* 801D8A20 98 1F 00 F2 */ stb r0, 0xf2(r31)
/* 801D8A24 80 7F 00 64 */ lwz r3, 0x64(r31)
/* 801D8A28 80 63 00 04 */ lwz r3, 4(r3)
/* 801D8A2C C0 02 A8 38 */ lfs f0, lit_3834(r2)
/* 801D8A30 D0 03 00 CC */ stfs f0, 0xcc(r3)
/* 801D8A34 D0 03 00 D0 */ stfs f0, 0xd0(r3)
/* 801D8A38 81 83 00 00 */ lwz r12, 0(r3)
/* 801D8A3C 81 8C 00 2C */ lwz r12, 0x2c(r12)
/* 801D8A40 7D 89 03 A6 */ mtctr r12
/* 801D8A44 4E 80 04 21 */ bctrl
/* 801D8A48 80 7F 00 64 */ lwz r3, 0x64(r31)
/* 801D8A4C C0 22 A8 38 */ lfs f1, lit_3834(r2)
/* 801D8A50 48 07 CD 81 */ bl setAlphaRate__13CPaneMgrAlphaFf
/* 801D8A54 7F E3 FB 78 */ mr r3, r31
/* 801D8A58 48 00 17 95 */ bl setCursorPos__14dMenu_Insect_cFv
/* 801D8A5C 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801D8A60 C0 22 A8 38 */ lfs f1, lit_3834(r2)
/* 801D8A64 4B FB C8 3D */ bl setAlphaRate__16dSelect_cursor_cFf
/* 801D8A68 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801D8A6C C0 22 A8 38 */ lfs f1, lit_3834(r2)
/* 801D8A70 4B FB C7 59 */ bl setScale__16dSelect_cursor_cFf
/* 801D8A74 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801D8A78 88 03 00 B4 */ lbz r0, 0xb4(r3)
/* 801D8A7C 60 00 00 01 */ ori r0, r0, 1
/* 801D8A80 98 03 00 B4 */ stb r0, 0xb4(r3)
/* 801D8A84 38 60 00 01 */ li r3, 1
/* 801D8A88 48 00 00 88 */ b lbl_801D8B10
lbl_801D8A8C:
/* 801D8A8C C8 42 A8 60 */ lfd f2, lit_4020(r2)
/* 801D8A90 6C 00 80 00 */ xoris r0, r0, 0x8000
/* 801D8A94 90 01 00 0C */ stw r0, 0xc(r1)
/* 801D8A98 3C 60 43 30 */ lis r3, 0x4330
/* 801D8A9C 90 61 00 08 */ stw r3, 8(r1)
/* 801D8AA0 C8 01 00 08 */ lfd f0, 8(r1)
/* 801D8AA4 EC 20 10 28 */ fsubs f1, f0, f2
/* 801D8AA8 6C 80 80 00 */ xoris r0, r4, 0x8000
/* 801D8AAC 90 01 00 14 */ stw r0, 0x14(r1)
/* 801D8AB0 90 61 00 10 */ stw r3, 0x10(r1)
/* 801D8AB4 C8 01 00 10 */ lfd f0, 0x10(r1)
/* 801D8AB8 EC 00 10 28 */ fsubs f0, f0, f2
/* 801D8ABC EF E1 00 24 */ fdivs f31, f1, f0
/* 801D8AC0 80 7F 00 64 */ lwz r3, 0x64(r31)
/* 801D8AC4 80 63 00 04 */ lwz r3, 4(r3)
/* 801D8AC8 D3 E3 00 CC */ stfs f31, 0xcc(r3)
/* 801D8ACC D3 E3 00 D0 */ stfs f31, 0xd0(r3)
/* 801D8AD0 81 83 00 00 */ lwz r12, 0(r3)
/* 801D8AD4 81 8C 00 2C */ lwz r12, 0x2c(r12)
/* 801D8AD8 7D 89 03 A6 */ mtctr r12
/* 801D8ADC 4E 80 04 21 */ bctrl
/* 801D8AE0 80 7F 00 64 */ lwz r3, 0x64(r31)
/* 801D8AE4 FC 20 F8 90 */ fmr f1, f31
/* 801D8AE8 48 07 CC E9 */ bl setAlphaRate__13CPaneMgrAlphaFf
/* 801D8AEC 7F E3 FB 78 */ mr r3, r31
/* 801D8AF0 48 00 16 FD */ bl setCursorPos__14dMenu_Insect_cFv
/* 801D8AF4 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801D8AF8 FC 20 F8 90 */ fmr f1, f31
/* 801D8AFC 4B FB C7 A5 */ bl setAlphaRate__16dSelect_cursor_cFf
/* 801D8B00 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801D8B04 FC 20 F8 90 */ fmr f1, f31
/* 801D8B08 4B FB C6 C1 */ bl setScale__16dSelect_cursor_cFf
/* 801D8B0C 38 60 00 00 */ li r3, 0
lbl_801D8B10:
/* 801D8B10 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */
/* 801D8B14 CB E1 00 20 */ lfd f31, 0x20(r1)
/* 801D8B18 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 801D8B1C 80 01 00 34 */ lwz r0, 0x34(r1)
/* 801D8B20 7C 08 03 A6 */ mtlr r0
/* 801D8B24 38 21 00 30 */ addi r1, r1, 0x30
/* 801D8B28 4E 80 00 20 */ blr

View File

@ -1,166 +0,0 @@
lbl_801D9F8C:
/* 801D9F8C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 801D9F90 7C 08 02 A6 */ mflr r0
/* 801D9F94 90 01 00 24 */ stw r0, 0x24(r1)
/* 801D9F98 39 61 00 20 */ addi r11, r1, 0x20
/* 801D9F9C 48 18 82 3D */ bl _savegpr_28
/* 801D9FA0 7C 7C 1B 78 */ mr r28, r3
/* 801D9FA4 8B E3 00 F4 */ lbz r31, 0xf4(r3)
/* 801D9FA8 8B C3 00 F5 */ lbz r30, 0xf5(r3)
/* 801D9FAC 3B A0 00 00 */ li r29, 0
/* 801D9FB0 80 63 00 0C */ lwz r3, 0xc(r3)
/* 801D9FB4 4B E5 81 E9 */ bl checkTrigger__9STControlFv
/* 801D9FB8 80 7C 00 0C */ lwz r3, 0xc(r28)
/* 801D9FBC 4B E5 84 ED */ bl checkRightTrigger__9STControlFv
/* 801D9FC0 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801D9FC4 41 82 00 1C */ beq lbl_801D9FE0
/* 801D9FC8 88 7C 00 F4 */ lbz r3, 0xf4(r28)
/* 801D9FCC 28 03 00 05 */ cmplwi r3, 5
/* 801D9FD0 40 80 00 34 */ bge lbl_801DA004
/* 801D9FD4 38 03 00 01 */ addi r0, r3, 1
/* 801D9FD8 98 1C 00 F4 */ stb r0, 0xf4(r28)
/* 801D9FDC 48 00 00 28 */ b lbl_801DA004
lbl_801D9FE0:
/* 801D9FE0 80 7C 00 0C */ lwz r3, 0xc(r28)
/* 801D9FE4 4B E5 84 49 */ bl checkLeftTrigger__9STControlFv
/* 801D9FE8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801D9FEC 41 82 00 18 */ beq lbl_801DA004
/* 801D9FF0 88 7C 00 F4 */ lbz r3, 0xf4(r28)
/* 801D9FF4 28 03 00 00 */ cmplwi r3, 0
/* 801D9FF8 41 82 00 0C */ beq lbl_801DA004
/* 801D9FFC 38 03 FF FF */ addi r0, r3, -1
/* 801DA000 98 1C 00 F4 */ stb r0, 0xf4(r28)
lbl_801DA004:
/* 801DA004 80 7C 00 0C */ lwz r3, 0xc(r28)
/* 801DA008 4B E5 85 1D */ bl checkUpTrigger__9STControlFv
/* 801DA00C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801DA010 41 82 00 1C */ beq lbl_801DA02C
/* 801DA014 88 7C 00 F5 */ lbz r3, 0xf5(r28)
/* 801DA018 28 03 00 00 */ cmplwi r3, 0
/* 801DA01C 41 82 00 34 */ beq lbl_801DA050
/* 801DA020 38 03 FF FF */ addi r0, r3, -1
/* 801DA024 98 1C 00 F5 */ stb r0, 0xf5(r28)
/* 801DA028 48 00 00 28 */ b lbl_801DA050
lbl_801DA02C:
/* 801DA02C 80 7C 00 0C */ lwz r3, 0xc(r28)
/* 801DA030 4B E5 85 71 */ bl checkDownTrigger__9STControlFv
/* 801DA034 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801DA038 41 82 00 18 */ beq lbl_801DA050
/* 801DA03C 88 7C 00 F5 */ lbz r3, 0xf5(r28)
/* 801DA040 28 03 00 03 */ cmplwi r3, 3
/* 801DA044 40 80 00 0C */ bge lbl_801DA050
/* 801DA048 38 03 00 01 */ addi r0, r3, 1
/* 801DA04C 98 1C 00 F5 */ stb r0, 0xf5(r28)
lbl_801DA050:
/* 801DA050 88 1C 00 F4 */ lbz r0, 0xf4(r28)
/* 801DA054 7C 1F 00 40 */ cmplw r31, r0
/* 801DA058 40 82 00 B0 */ bne lbl_801DA108
/* 801DA05C 88 1C 00 F5 */ lbz r0, 0xf5(r28)
/* 801DA060 7C 1E 00 40 */ cmplw r30, r0
/* 801DA064 40 82 00 A4 */ bne lbl_801DA108
/* 801DA068 38 00 00 FF */ li r0, 0xff
/* 801DA06C 98 1C 00 F8 */ stb r0, 0xf8(r28)
/* 801DA070 98 1C 00 F9 */ stb r0, 0xf9(r28)
/* 801DA074 80 7C 00 0C */ lwz r3, 0xc(r28)
/* 801DA078 81 83 00 00 */ lwz r12, 0(r3)
/* 801DA07C 81 8C 00 08 */ lwz r12, 8(r12)
/* 801DA080 7D 89 03 A6 */ mtctr r12
/* 801DA084 4E 80 04 21 */ bctrl
/* 801DA088 C0 02 A8 80 */ lfs f0, lit_4474(r2)
/* 801DA08C FC 01 00 40 */ fcmpo cr0, f1, f0
/* 801DA090 4C 40 13 82 */ cror 2, 0, 2
/* 801DA094 40 82 00 10 */ bne lbl_801DA0A4
/* 801DA098 7F 83 E3 78 */ mr r3, r28
/* 801DA09C 48 00 02 61 */ bl dpdMove__14dMenu_Insect_cFv
/* 801DA0A0 7C 7D 1B 78 */ mr r29, r3
lbl_801DA0A4:
/* 801DA0A4 88 7C 00 F8 */ lbz r3, 0xf8(r28)
/* 801DA0A8 28 03 00 FF */ cmplwi r3, 0xff
/* 801DA0AC 41 82 00 5C */ beq lbl_801DA108
/* 801DA0B0 88 9C 00 F9 */ lbz r4, 0xf9(r28)
/* 801DA0B4 28 04 00 FF */ cmplwi r4, 0xff
/* 801DA0B8 41 82 00 50 */ beq lbl_801DA108
/* 801DA0BC 88 1C 00 FA */ lbz r0, 0xfa(r28)
/* 801DA0C0 7C 03 00 40 */ cmplw r3, r0
/* 801DA0C4 40 82 00 10 */ bne lbl_801DA0D4
/* 801DA0C8 88 1C 00 FB */ lbz r0, 0xfb(r28)
/* 801DA0CC 7C 04 00 40 */ cmplw r4, r0
/* 801DA0D0 41 82 00 38 */ beq lbl_801DA108
lbl_801DA0D4:
/* 801DA0D4 88 1C 00 F4 */ lbz r0, 0xf4(r28)
/* 801DA0D8 7C 03 00 40 */ cmplw r3, r0
/* 801DA0DC 40 82 00 10 */ bne lbl_801DA0EC
/* 801DA0E0 88 1C 00 F5 */ lbz r0, 0xf5(r28)
/* 801DA0E4 7C 04 00 40 */ cmplw r4, r0
/* 801DA0E8 41 82 00 20 */ beq lbl_801DA108
lbl_801DA0EC:
/* 801DA0EC 98 7C 00 F4 */ stb r3, 0xf4(r28)
/* 801DA0F0 88 1C 00 F9 */ lbz r0, 0xf9(r28)
/* 801DA0F4 98 1C 00 F5 */ stb r0, 0xf5(r28)
/* 801DA0F8 88 1C 00 F8 */ lbz r0, 0xf8(r28)
/* 801DA0FC 98 1C 00 FA */ stb r0, 0xfa(r28)
/* 801DA100 88 1C 00 F9 */ lbz r0, 0xf9(r28)
/* 801DA104 98 1C 00 FB */ stb r0, 0xfb(r28)
lbl_801DA108:
/* 801DA108 88 1C 00 F4 */ lbz r0, 0xf4(r28)
/* 801DA10C 7C 1F 00 40 */ cmplw r31, r0
/* 801DA110 40 82 00 10 */ bne lbl_801DA120
/* 801DA114 88 1C 00 F5 */ lbz r0, 0xf5(r28)
/* 801DA118 7C 1E 00 40 */ cmplw r30, r0
/* 801DA11C 41 82 00 B8 */ beq lbl_801DA1D4
lbl_801DA120:
/* 801DA120 7F 83 E3 78 */ mr r3, r28
/* 801DA124 48 00 00 C9 */ bl setCursorPos__14dMenu_Insect_cFv
/* 801DA128 7F 83 E3 78 */ mr r3, r28
/* 801DA12C 88 9C 00 F4 */ lbz r4, 0xf4(r28)
/* 801DA130 88 BC 00 F5 */ lbz r5, 0xf5(r28)
/* 801DA134 4B FF FC B1 */ bl isGetInsect__14dMenu_Insect_cFii
/* 801DA138 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801DA13C 41 82 00 14 */ beq lbl_801DA150
/* 801DA140 7F 83 E3 78 */ mr r3, r28
/* 801DA144 38 80 03 68 */ li r4, 0x368
/* 801DA148 48 00 01 BD */ bl setAButtonString__14dMenu_Insect_cFUs
/* 801DA14C 48 00 00 10 */ b lbl_801DA15C
lbl_801DA150:
/* 801DA150 7F 83 E3 78 */ mr r3, r28
/* 801DA154 38 80 00 00 */ li r4, 0
/* 801DA158 48 00 01 AD */ bl setAButtonString__14dMenu_Insect_cFUs
lbl_801DA15C:
/* 801DA15C 57 A0 06 3F */ clrlwi. r0, r29, 0x18
/* 801DA160 41 82 00 40 */ beq lbl_801DA1A0
/* 801DA164 38 00 00 4D */ li r0, 0x4d
/* 801DA168 90 01 00 0C */ stw r0, 0xc(r1)
/* 801DA16C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13)
/* 801DA170 38 81 00 0C */ addi r4, r1, 0xc
/* 801DA174 38 A0 00 00 */ li r5, 0
/* 801DA178 38 C0 00 01 */ li r6, 1
/* 801DA17C 38 E0 00 00 */ li r7, 0
/* 801DA180 C0 22 A8 38 */ lfs f1, lit_3834(r2)
/* 801DA184 FC 40 08 90 */ fmr f2, f1
/* 801DA188 C0 62 A8 68 */ lfs f3, lit_4089(r2)
/* 801DA18C FC 80 18 90 */ fmr f4, f3
/* 801DA190 39 00 00 00 */ li r8, 0
/* 801DA194 48 0D 17 F1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 801DA198 48 04 48 39 */ bl dMeter2Info_set2DVibration__Fv
/* 801DA19C 48 00 00 38 */ b lbl_801DA1D4
lbl_801DA1A0:
/* 801DA1A0 38 00 00 4D */ li r0, 0x4d
/* 801DA1A4 90 01 00 08 */ stw r0, 8(r1)
/* 801DA1A8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13)
/* 801DA1AC 38 81 00 08 */ addi r4, r1, 8
/* 801DA1B0 38 A0 00 00 */ li r5, 0
/* 801DA1B4 38 C0 00 00 */ li r6, 0
/* 801DA1B8 38 E0 00 00 */ li r7, 0
/* 801DA1BC C0 22 A8 38 */ lfs f1, lit_3834(r2)
/* 801DA1C0 FC 40 08 90 */ fmr f2, f1
/* 801DA1C4 C0 62 A8 68 */ lfs f3, lit_4089(r2)
/* 801DA1C8 FC 80 18 90 */ fmr f4, f3
/* 801DA1CC 39 00 00 00 */ li r8, 0
/* 801DA1D0 48 0D 17 B5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
lbl_801DA1D4:
/* 801DA1D4 39 61 00 20 */ addi r11, r1, 0x20
/* 801DA1D8 48 18 80 4D */ bl _restgpr_28
/* 801DA1DC 80 01 00 24 */ lwz r0, 0x24(r1)
/* 801DA1E0 7C 08 03 A6 */ mtlr r0
/* 801DA1E4 38 21 00 20 */ addi r1, r1, 0x20
/* 801DA1E8 4E 80 00 20 */ blr

View File

@ -1,44 +0,0 @@
lbl_801D9504:
/* 801D9504 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 801D9508 7C 08 02 A6 */ mflr r0
/* 801D950C 90 01 00 24 */ stw r0, 0x24(r1)
/* 801D9510 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 801D9514 7C 7F 1B 78 */ mr r31, r3
/* 801D9518 38 80 00 00 */ li r4, 0
/* 801D951C 48 00 0D E9 */ bl setAButtonString__14dMenu_Insect_cFUs
/* 801D9520 7F E3 FB 78 */ mr r3, r31
/* 801D9524 38 80 03 F9 */ li r4, 0x3f9
/* 801D9528 48 00 0E 8D */ bl setBButtonString__14dMenu_Insect_cFUs
/* 801D952C 88 1F 00 F6 */ lbz r0, 0xf6(r31)
/* 801D9530 28 00 00 01 */ cmplwi r0, 1
/* 801D9534 40 82 00 20 */ bne lbl_801D9554
/* 801D9538 7F E3 FB 78 */ mr r3, r31
/* 801D953C 88 9F 00 F4 */ lbz r4, 0xf4(r31)
/* 801D9540 88 BF 00 F5 */ lbz r5, 0xf5(r31)
/* 801D9544 48 00 08 89 */ bl getInsectItemID__14dMenu_Insect_cFii
/* 801D9548 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */
/* 801D954C 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */
/* 801D9550 98 64 00 C3 */ stb r3, 0xc3(r4)
lbl_801D9554:
/* 801D9554 38 00 00 52 */ li r0, 0x52
/* 801D9558 90 01 00 08 */ stw r0, 8(r1)
/* 801D955C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13)
/* 801D9560 38 81 00 08 */ addi r4, r1, 8
/* 801D9564 38 A0 00 00 */ li r5, 0
/* 801D9568 38 C0 00 00 */ li r6, 0
/* 801D956C 38 E0 00 00 */ li r7, 0
/* 801D9570 C0 22 A8 38 */ lfs f1, lit_3834(r2)
/* 801D9574 FC 40 08 90 */ fmr f2, f1
/* 801D9578 C0 62 A8 68 */ lfs f3, lit_4089(r2)
/* 801D957C FC 80 18 90 */ fmr f4, f3
/* 801D9580 39 00 00 00 */ li r8, 0
/* 801D9584 48 0D 24 01 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 801D9588 48 04 54 49 */ bl dMeter2Info_set2DVibration__Fv
/* 801D958C 38 00 00 00 */ li r0, 0
/* 801D9590 80 7F 00 68 */ lwz r3, 0x68(r31)
/* 801D9594 B0 03 00 16 */ sth r0, 0x16(r3)
/* 801D9598 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 801D959C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 801D95A0 7C 08 03 A6 */ mtlr r0
/* 801D95A4 38 21 00 20 */ addi r1, r1, 0x20
/* 801D95A8 4E 80 00 20 */ blr

View File

@ -1,256 +0,0 @@
lbl_801D8E00:
/* 801D8E00 94 21 FF 10 */ stwu r1, -0xf0(r1)
/* 801D8E04 7C 08 02 A6 */ mflr r0
/* 801D8E08 90 01 00 F4 */ stw r0, 0xf4(r1)
/* 801D8E0C DB E1 00 E0 */ stfd f31, 0xe0(r1)
/* 801D8E10 F3 E1 00 E8 */ psq_st f31, 232(r1), 0, 0 /* qr0 */
/* 801D8E14 DB C1 00 D0 */ stfd f30, 0xd0(r1)
/* 801D8E18 F3 C1 00 D8 */ psq_st f30, 216(r1), 0, 0 /* qr0 */
/* 801D8E1C DB A1 00 C0 */ stfd f29, 0xc0(r1)
/* 801D8E20 F3 A1 00 C8 */ psq_st f29, 200(r1), 0, 0 /* qr0 */
/* 801D8E24 39 61 00 C0 */ addi r11, r1, 0xc0
/* 801D8E28 48 18 93 AD */ bl _savegpr_27
/* 801D8E2C 7C 7F 1B 78 */ mr r31, r3
/* 801D8E30 38 80 00 00 */ li r4, 0
/* 801D8E34 48 00 14 D1 */ bl setAButtonString__14dMenu_Insect_cFUs
/* 801D8E38 7F E3 FB 78 */ mr r3, r31
/* 801D8E3C 38 80 03 F9 */ li r4, 0x3f9
/* 801D8E40 48 00 15 75 */ bl setBButtonString__14dMenu_Insect_cFUs
/* 801D8E44 7F E3 FB 78 */ mr r3, r31
/* 801D8E48 88 9F 00 F4 */ lbz r4, 0xf4(r31)
/* 801D8E4C 88 BF 00 F5 */ lbz r5, 0xf5(r31)
/* 801D8E50 48 00 0F 7D */ bl getInsectItemID__14dMenu_Insect_cFii
/* 801D8E54 7C 7C 1B 78 */ mr r28, r3
/* 801D8E58 38 00 00 00 */ li r0, 0
/* 801D8E5C 90 01 00 08 */ stw r0, 8(r1)
/* 801D8E60 90 01 00 0C */ stw r0, 0xc(r1)
/* 801D8E64 38 00 FF FF */ li r0, -1
/* 801D8E68 90 01 00 10 */ stw r0, 0x10(r1)
/* 801D8E6C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
/* 801D8E70 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
/* 801D8E74 7F 84 E3 78 */ mr r4, r28
/* 801D8E78 80 BF 00 EC */ lwz r5, 0xec(r31)
/* 801D8E7C 38 C0 00 00 */ li r6, 0
/* 801D8E80 38 E0 00 00 */ li r7, 0
/* 801D8E84 39 00 00 00 */ li r8, 0
/* 801D8E88 39 20 00 00 */ li r9, 0
/* 801D8E8C 39 40 00 00 */ li r10, 0
/* 801D8E90 48 04 40 79 */ bl readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei
/* 801D8E94 80 9F 00 EC */ lwz r4, 0xec(r31)
/* 801D8E98 A0 04 00 02 */ lhz r0, 2(r4)
/* 801D8E9C C8 42 A8 78 */ lfd f2, lit_4138(r2)
/* 801D8EA0 90 01 00 9C */ stw r0, 0x9c(r1)
/* 801D8EA4 3C 60 43 30 */ lis r3, 0x4330
/* 801D8EA8 90 61 00 98 */ stw r3, 0x98(r1)
/* 801D8EAC C8 01 00 98 */ lfd f0, 0x98(r1)
/* 801D8EB0 EC 00 10 28 */ fsubs f0, f0, f2
/* 801D8EB4 C0 22 A8 6C */ lfs f1, lit_4135(r2)
/* 801D8EB8 EF A0 08 24 */ fdivs f29, f0, f1
/* 801D8EBC A0 04 00 04 */ lhz r0, 4(r4)
/* 801D8EC0 90 01 00 A4 */ stw r0, 0xa4(r1)
/* 801D8EC4 90 61 00 A0 */ stw r3, 0xa0(r1)
/* 801D8EC8 C8 01 00 A0 */ lfd f0, 0xa0(r1)
/* 801D8ECC EC 00 10 28 */ fsubs f0, f0, f2
/* 801D8ED0 EF C0 08 24 */ fdivs f30, f0, f1
/* 801D8ED4 3B 60 00 00 */ li r27, 0
/* 801D8ED8 3B C0 00 00 */ li r30, 0
lbl_801D8EDC:
/* 801D8EDC 3B BE 00 54 */ addi r29, r30, 0x54
/* 801D8EE0 7C 7F E8 2E */ lwzx r3, r31, r29
/* 801D8EE4 80 9F 00 EC */ lwz r4, 0xec(r31)
/* 801D8EE8 38 A0 00 00 */ li r5, 0
/* 801D8EEC 81 83 00 00 */ lwz r12, 0(r3)
/* 801D8EF0 81 8C 01 10 */ lwz r12, 0x110(r12)
/* 801D8EF4 7D 89 03 A6 */ mtctr r12
/* 801D8EF8 4E 80 04 21 */ bctrl
/* 801D8EFC 7C 7F E8 2E */ lwzx r3, r31, r29
/* 801D8F00 D3 A3 00 CC */ stfs f29, 0xcc(r3)
/* 801D8F04 D3 C3 00 D0 */ stfs f30, 0xd0(r3)
/* 801D8F08 81 83 00 00 */ lwz r12, 0(r3)
/* 801D8F0C 81 8C 00 2C */ lwz r12, 0x2c(r12)
/* 801D8F10 7D 89 03 A6 */ mtctr r12
/* 801D8F14 4E 80 04 21 */ bctrl
/* 801D8F18 3B 7B 00 01 */ addi r27, r27, 1
/* 801D8F1C 2C 1B 00 02 */ cmpwi r27, 2
/* 801D8F20 3B DE 00 04 */ addi r30, r30, 4
/* 801D8F24 41 80 FF B8 */ blt lbl_801D8EDC
/* 801D8F28 80 7F 00 CC */ lwz r3, 0xcc(r31)
/* 801D8F2C 80 A3 00 04 */ lwz r5, 4(r3)
/* 801D8F30 80 7F 00 E8 */ lwz r3, 0xe8(r31)
/* 801D8F34 57 84 06 3E */ clrlwi r4, r28, 0x18
/* 801D8F38 38 84 02 65 */ addi r4, r4, 0x265
/* 801D8F3C 38 C0 00 00 */ li r6, 0
/* 801D8F40 38 E0 00 00 */ li r7, 0
/* 801D8F44 39 00 00 00 */ li r8, 0
/* 801D8F48 39 20 00 00 */ li r9, 0
/* 801D8F4C 81 83 00 00 */ lwz r12, 0(r3)
/* 801D8F50 81 8C 00 08 */ lwz r12, 8(r12)
/* 801D8F54 7D 89 03 A6 */ mtctr r12
/* 801D8F58 4E 80 04 21 */ bctrl
/* 801D8F5C 88 1F 00 F6 */ lbz r0, 0xf6(r31)
/* 801D8F60 28 00 00 01 */ cmplwi r0, 1
/* 801D8F64 40 82 02 44 */ bne lbl_801D91A8
/* 801D8F68 7F E3 FB 78 */ mr r3, r31
/* 801D8F6C 88 9F 00 F4 */ lbz r4, 0xf4(r31)
/* 801D8F70 88 BF 00 F5 */ lbz r5, 0xf5(r31)
/* 801D8F74 48 00 0E AD */ bl isGiveInsect__14dMenu_Insect_cFii
/* 801D8F78 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801D8F7C 40 82 02 00 */ bne lbl_801D917C
/* 801D8F80 80 7F 00 E8 */ lwz r3, 0xe8(r31)
/* 801D8F84 38 80 05 BB */ li r4, 0x5bb
/* 801D8F88 80 BF 00 5C */ lwz r5, 0x5c(r31)
/* 801D8F8C 38 C0 00 00 */ li r6, 0
/* 801D8F90 38 E0 00 00 */ li r7, 0
/* 801D8F94 39 00 00 00 */ li r8, 0
/* 801D8F98 39 20 00 00 */ li r9, 0
/* 801D8F9C 81 83 00 00 */ lwz r12, 0(r3)
/* 801D8FA0 81 8C 00 08 */ lwz r12, 8(r12)
/* 801D8FA4 7D 89 03 A6 */ mtctr r12
/* 801D8FA8 4E 80 04 21 */ bctrl
/* 801D8FAC 38 00 00 00 */ li r0, 0
/* 801D8FB0 98 01 00 78 */ stb r0, 0x78(r1)
/* 801D8FB4 98 01 00 58 */ stb r0, 0x58(r1)
/* 801D8FB8 98 01 00 38 */ stb r0, 0x38(r1)
/* 801D8FBC 98 01 00 19 */ stb r0, 0x19(r1)
/* 801D8FC0 98 1F 00 F7 */ stb r0, 0xf7(r31)
/* 801D8FC4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
/* 801D8FC8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
/* 801D8FCC 38 80 04 BD */ li r4, 0x4bd
/* 801D8FD0 38 A1 00 78 */ addi r5, r1, 0x78
/* 801D8FD4 38 C0 00 00 */ li r6, 0
/* 801D8FD8 48 04 32 79 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
/* 801D8FDC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
/* 801D8FE0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
/* 801D8FE4 38 80 04 BE */ li r4, 0x4be
/* 801D8FE8 38 A1 00 58 */ addi r5, r1, 0x58
/* 801D8FEC 38 C0 00 00 */ li r6, 0
/* 801D8FF0 48 04 32 61 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
/* 801D8FF4 80 7F 00 1C */ lwz r3, 0x1c(r31)
/* 801D8FF8 48 06 19 85 */ bl getCharSpace__17dMsgScrn3Select_cFv
/* 801D8FFC FF C0 08 90 */ fmr f30, f1
/* 801D9000 80 7F 00 1C */ lwz r3, 0x1c(r31)
/* 801D9004 48 06 19 49 */ bl getFontSize__17dMsgScrn3Select_cFv
/* 801D9008 FF E0 08 90 */ fmr f31, f1
/* 801D900C 4B E3 B9 E5 */ bl mDoExt_getMesgFont__Fv
/* 801D9010 7C 64 1B 78 */ mr r4, r3
/* 801D9014 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
/* 801D9018 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
/* 801D901C FC 20 F8 90 */ fmr f1, f31
/* 801D9020 FC 40 F0 90 */ fmr f2, f30
/* 801D9024 38 A1 00 78 */ addi r5, r1, 0x78
/* 801D9028 48 04 37 D5 */ bl getStringLength__13dMeter2Info_cFP7JUTFontffPc
/* 801D902C FF A0 08 90 */ fmr f29, f1
/* 801D9030 80 7F 00 1C */ lwz r3, 0x1c(r31)
/* 801D9034 48 06 19 49 */ bl getCharSpace__17dMsgScrn3Select_cFv
/* 801D9038 FF E0 08 90 */ fmr f31, f1
/* 801D903C 80 7F 00 1C */ lwz r3, 0x1c(r31)
/* 801D9040 48 06 19 0D */ bl getFontSize__17dMsgScrn3Select_cFv
/* 801D9044 FF C0 08 90 */ fmr f30, f1
/* 801D9048 4B E3 B9 A9 */ bl mDoExt_getMesgFont__Fv
/* 801D904C 7C 64 1B 78 */ mr r4, r3
/* 801D9050 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
/* 801D9054 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
/* 801D9058 FC 20 F0 90 */ fmr f1, f30
/* 801D905C FC 40 F8 90 */ fmr f2, f31
/* 801D9060 38 A1 00 58 */ addi r5, r1, 0x58
/* 801D9064 48 04 37 99 */ bl getStringLength__13dMeter2Info_cFP7JUTFontffPc
/* 801D9068 FF C0 08 90 */ fmr f30, f1
/* 801D906C FC 1D F0 40 */ fcmpo cr0, f29, f30
/* 801D9070 40 80 00 0C */ bge lbl_801D907C
/* 801D9074 FF E0 F0 90 */ fmr f31, f30
/* 801D9078 48 00 00 08 */ b lbl_801D9080
lbl_801D907C:
/* 801D907C FF E0 E8 90 */ fmr f31, f29
lbl_801D9080:
/* 801D9080 80 7F 00 1C */ lwz r3, 0x1c(r31)
/* 801D9084 48 06 18 B1 */ bl getTextBoxWidth__17dMsgScrn3Select_cFv
/* 801D9088 FC 1F 08 40 */ fcmpo cr0, f31, f1
/* 801D908C 40 80 00 10 */ bge lbl_801D909C
/* 801D9090 80 7F 00 1C */ lwz r3, 0x1c(r31)
/* 801D9094 48 06 18 A1 */ bl getTextBoxWidth__17dMsgScrn3Select_cFv
/* 801D9098 FF E0 08 90 */ fmr f31, f1
lbl_801D909C:
/* 801D909C 38 61 00 38 */ addi r3, r1, 0x38
/* 801D90A0 38 80 00 20 */ li r4, 0x20
/* 801D90A4 3C A0 80 39 */ lis r5, d_menu_d_menu_insect__stringBase0@ha /* 0x803968C0@ha */
/* 801D90A8 38 A5 68 C0 */ addi r5, r5, d_menu_d_menu_insect__stringBase0@l /* 0x803968C0@l */
/* 801D90AC 38 A5 00 2A */ addi r5, r5, 0x2a
/* 801D90B0 C0 22 A8 70 */ lfs f1, lit_4136(r2)
/* 801D90B4 EC 1F E8 28 */ fsubs f0, f31, f29
/* 801D90B8 EC 01 00 32 */ fmuls f0, f1, f0
/* 801D90BC FC 00 00 1E */ fctiwz f0, f0
/* 801D90C0 D8 01 00 A0 */ stfd f0, 0xa0(r1)
/* 801D90C4 80 C1 00 A4 */ lwz r6, 0xa4(r1)
/* 801D90C8 4C C6 31 82 */ crclr 6
/* 801D90CC 48 18 D4 F1 */ bl snprintf
/* 801D90D0 38 61 00 38 */ addi r3, r1, 0x38
/* 801D90D4 38 81 00 78 */ addi r4, r1, 0x78
/* 801D90D8 48 18 F9 E5 */ bl strcat
/* 801D90DC 38 61 00 18 */ addi r3, r1, 0x18
/* 801D90E0 38 80 00 20 */ li r4, 0x20
/* 801D90E4 3C A0 80 39 */ lis r5, d_menu_d_menu_insect__stringBase0@ha /* 0x803968C0@ha */
/* 801D90E8 38 A5 68 C0 */ addi r5, r5, d_menu_d_menu_insect__stringBase0@l /* 0x803968C0@l */
/* 801D90EC 38 A5 00 2A */ addi r5, r5, 0x2a
/* 801D90F0 C0 22 A8 70 */ lfs f1, lit_4136(r2)
/* 801D90F4 EC 1F F0 28 */ fsubs f0, f31, f30
/* 801D90F8 EC 01 00 32 */ fmuls f0, f1, f0
/* 801D90FC FC 00 00 1E */ fctiwz f0, f0
/* 801D9100 D8 01 00 98 */ stfd f0, 0x98(r1)
/* 801D9104 80 C1 00 9C */ lwz r6, 0x9c(r1)
/* 801D9108 4C C6 31 82 */ crclr 6
/* 801D910C 48 18 D4 B1 */ bl snprintf
/* 801D9110 38 61 00 18 */ addi r3, r1, 0x18
/* 801D9114 38 81 00 58 */ addi r4, r1, 0x58
/* 801D9118 48 18 F9 A5 */ bl strcat
/* 801D911C 80 7F 00 1C */ lwz r3, 0x1c(r31)
/* 801D9120 3C 80 80 39 */ lis r4, d_menu_d_menu_insect__stringBase0@ha /* 0x803968C0@ha */
/* 801D9124 38 84 68 C0 */ addi r4, r4, d_menu_d_menu_insect__stringBase0@l /* 0x803968C0@l */
/* 801D9128 38 84 00 32 */ addi r4, r4, 0x32
/* 801D912C 38 A1 00 38 */ addi r5, r1, 0x38
/* 801D9130 38 C1 00 18 */ addi r6, r1, 0x18
/* 801D9134 48 06 0B 45 */ bl setString__17dMsgScrn3Select_cFPcPcPc
/* 801D9138 80 7F 00 1C */ lwz r3, 0x1c(r31)
/* 801D913C 3C 80 80 39 */ lis r4, d_menu_d_menu_insect__stringBase0@ha /* 0x803968C0@ha */
/* 801D9140 38 84 68 C0 */ addi r4, r4, d_menu_d_menu_insect__stringBase0@l /* 0x803968C0@l */
/* 801D9144 38 84 00 32 */ addi r4, r4, 0x32
/* 801D9148 7C 85 23 78 */ mr r5, r4
/* 801D914C 7C 86 23 78 */ mr r6, r4
/* 801D9150 48 06 0B B9 */ bl setRubyString__17dMsgScrn3Select_cFPcPcPc
/* 801D9154 80 7F 00 1C */ lwz r3, 0x1c(r31)
/* 801D9158 38 80 00 02 */ li r4, 2
/* 801D915C 88 BF 00 F7 */ lbz r5, 0xf7(r31)
/* 801D9160 38 05 00 01 */ addi r0, r5, 1
/* 801D9164 54 05 06 3E */ clrlwi r5, r0, 0x18
/* 801D9168 38 C0 00 00 */ li r6, 0
/* 801D916C FC 20 F8 90 */ fmr f1, f31
/* 801D9170 38 E0 00 00 */ li r7, 0
/* 801D9174 48 06 0F 21 */ bl selAnimeInit__17dMsgScrn3Select_cFUcUcUcfUc
/* 801D9178 48 00 00 30 */ b lbl_801D91A8
lbl_801D917C:
/* 801D917C 80 7F 00 E8 */ lwz r3, 0xe8(r31)
/* 801D9180 38 80 05 BC */ li r4, 0x5bc
/* 801D9184 80 BF 00 5C */ lwz r5, 0x5c(r31)
/* 801D9188 38 C0 00 00 */ li r6, 0
/* 801D918C 38 E0 00 00 */ li r7, 0
/* 801D9190 39 00 00 00 */ li r8, 0
/* 801D9194 39 20 00 00 */ li r9, 0
/* 801D9198 81 83 00 00 */ lwz r12, 0(r3)
/* 801D919C 81 8C 00 08 */ lwz r12, 8(r12)
/* 801D91A0 7D 89 03 A6 */ mtctr r12
/* 801D91A4 4E 80 04 21 */ bctrl
lbl_801D91A8:
/* 801D91A8 38 00 00 00 */ li r0, 0
/* 801D91AC 80 7F 00 68 */ lwz r3, 0x68(r31)
/* 801D91B0 B0 03 00 16 */ sth r0, 0x16(r3)
/* 801D91B4 E3 E1 00 E8 */ psq_l f31, 232(r1), 0, 0 /* qr0 */
/* 801D91B8 CB E1 00 E0 */ lfd f31, 0xe0(r1)
/* 801D91BC E3 C1 00 D8 */ psq_l f30, 216(r1), 0, 0 /* qr0 */
/* 801D91C0 CB C1 00 D0 */ lfd f30, 0xd0(r1)
/* 801D91C4 E3 A1 00 C8 */ psq_l f29, 200(r1), 0, 0 /* qr0 */
/* 801D91C8 CB A1 00 C0 */ lfd f29, 0xc0(r1)
/* 801D91CC 39 61 00 C0 */ addi r11, r1, 0xc0
/* 801D91D0 48 18 90 51 */ bl _restgpr_27
/* 801D91D4 80 01 00 F4 */ lwz r0, 0xf4(r1)
/* 801D91D8 7C 08 03 A6 */ mtlr r0
/* 801D91DC 38 21 00 F0 */ addi r1, r1, 0xf0
/* 801D91E0 4E 80 00 20 */ blr

View File

@ -1,182 +0,0 @@
lbl_801D9644:
/* 801D9644 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 801D9648 7C 08 02 A6 */ mflr r0
/* 801D964C 90 01 00 24 */ stw r0, 0x24(r1)
/* 801D9650 39 61 00 20 */ addi r11, r1, 0x20
/* 801D9654 48 18 8B 81 */ bl _savegpr_27
/* 801D9658 7C 7D 1B 78 */ mr r29, r3
/* 801D965C 38 60 01 18 */ li r3, 0x118
/* 801D9660 48 0F 55 ED */ bl __nw__FUl
/* 801D9664 7C 60 1B 79 */ or. r0, r3, r3
/* 801D9668 41 82 00 0C */ beq lbl_801D9674
/* 801D966C 48 11 EE 2D */ bl __ct__9J2DScreenFv
/* 801D9670 7C 60 1B 78 */ mr r0, r3
lbl_801D9674:
/* 801D9674 90 1D 00 20 */ stw r0, 0x20(r29)
/* 801D9678 80 7D 00 20 */ lwz r3, 0x20(r29)
/* 801D967C 3C 80 80 39 */ lis r4, d_menu_d_menu_insect__stringBase0@ha /* 0x803968C0@ha */
/* 801D9680 38 84 68 C0 */ addi r4, r4, d_menu_d_menu_insect__stringBase0@l /* 0x803968C0@l */
/* 801D9684 38 84 00 33 */ addi r4, r4, 0x33
/* 801D9688 3C A0 00 02 */ lis r5, 2
/* 801D968C 80 DD 00 08 */ lwz r6, 8(r29)
/* 801D9690 48 11 EF B9 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive
/* 801D9694 80 7D 00 20 */ lwz r3, 0x20(r29)
/* 801D9698 48 07 BA 51 */ bl dPaneClass_showNullPane__FP9J2DScreen
/* 801D969C 38 60 00 6C */ li r3, 0x6c
/* 801D96A0 48 0F 55 AD */ bl __nw__FUl
/* 801D96A4 7C 60 1B 79 */ or. r0, r3, r3
/* 801D96A8 41 82 00 24 */ beq lbl_801D96CC
/* 801D96AC 80 9D 00 20 */ lwz r4, 0x20(r29)
/* 801D96B0 3C A0 5F 61 */ lis r5, 0x5F61 /* 0x5F616C6C@ha */
/* 801D96B4 38 C5 6C 6C */ addi r6, r5, 0x6C6C /* 0x5F616C6C@l */
/* 801D96B8 38 A0 00 6E */ li r5, 0x6e
/* 801D96BC 38 E0 00 02 */ li r7, 2
/* 801D96C0 39 00 00 00 */ li r8, 0
/* 801D96C4 48 07 A2 C1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap
/* 801D96C8 7C 60 1B 78 */ mr r0, r3
lbl_801D96CC:
/* 801D96CC 90 1D 00 64 */ stw r0, 0x64(r29)
/* 801D96D0 80 7D 00 64 */ lwz r3, 0x64(r29)
/* 801D96D4 C0 22 A8 44 */ lfs f1, lit_3837(r2)
/* 801D96D8 48 07 C0 F9 */ bl setAlphaRate__13CPaneMgrAlphaFf
/* 801D96DC 3B 60 00 00 */ li r27, 0
/* 801D96E0 3B 80 00 00 */ li r28, 0
/* 801D96E4 3B C0 00 00 */ li r30, 0
/* 801D96E8 3C 60 80 39 */ lis r3, insect_tag@ha /* 0x80396690@ha */
/* 801D96EC 3B E3 66 90 */ addi r31, r3, insect_tag@l /* 0x80396690@l */
lbl_801D96F0:
/* 801D96F0 38 60 00 6C */ li r3, 0x6c
/* 801D96F4 48 0F 55 59 */ bl __nw__FUl
/* 801D96F8 7C 64 1B 79 */ or. r4, r3, r3
/* 801D96FC 41 82 00 24 */ beq lbl_801D9720
/* 801D9700 80 9D 00 20 */ lwz r4, 0x20(r29)
/* 801D9704 7C DF F2 14 */ add r6, r31, r30
/* 801D9708 80 A6 00 00 */ lwz r5, 0(r6)
/* 801D970C 80 C6 00 04 */ lwz r6, 4(r6)
/* 801D9710 38 E0 00 00 */ li r7, 0
/* 801D9714 39 00 00 00 */ li r8, 0
/* 801D9718 48 07 A2 6D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap
/* 801D971C 7C 64 1B 78 */ mr r4, r3
lbl_801D9720:
/* 801D9720 38 1C 00 6C */ addi r0, r28, 0x6c
/* 801D9724 7C 9D 01 2E */ stwx r4, r29, r0
/* 801D9728 3B 7B 00 01 */ addi r27, r27, 1
/* 801D972C 2C 1B 00 18 */ cmpwi r27, 0x18
/* 801D9730 3B 9C 00 04 */ addi r28, r28, 4
/* 801D9734 3B DE 00 08 */ addi r30, r30, 8
/* 801D9738 41 80 FF B8 */ blt lbl_801D96F0
/* 801D973C 3B E0 00 00 */ li r31, 0
lbl_801D9740:
/* 801D9740 3B C0 00 00 */ li r30, 0
/* 801D9744 3B 80 00 00 */ li r28, 0
lbl_801D9748:
/* 801D9748 7F 7F E2 14 */ add r27, r31, r28
/* 801D974C 7F A3 EB 78 */ mr r3, r29
/* 801D9750 7F E4 FB 78 */ mr r4, r31
/* 801D9754 7F C5 F3 78 */ mr r5, r30
/* 801D9758 48 00 06 8D */ bl isGetInsect__14dMenu_Insect_cFii
/* 801D975C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801D9760 41 82 00 18 */ beq lbl_801D9778
/* 801D9764 57 63 10 3A */ slwi r3, r27, 2
/* 801D9768 38 03 00 6C */ addi r0, r3, 0x6c
/* 801D976C 7C 7D 00 2E */ lwzx r3, r29, r0
/* 801D9770 48 07 BE 59 */ bl show__13CPaneMgrAlphaFv
/* 801D9774 48 00 00 14 */ b lbl_801D9788
lbl_801D9778:
/* 801D9778 57 63 10 3A */ slwi r3, r27, 2
/* 801D977C 38 03 00 6C */ addi r0, r3, 0x6c
/* 801D9780 7C 7D 00 2E */ lwzx r3, r29, r0
/* 801D9784 48 07 BE 85 */ bl hide__13CPaneMgrAlphaFv
lbl_801D9788:
/* 801D9788 7F A3 EB 78 */ mr r3, r29
/* 801D978C 7F E4 FB 78 */ mr r4, r31
/* 801D9790 7F C5 F3 78 */ mr r5, r30
/* 801D9794 48 00 06 8D */ bl isGiveInsect__14dMenu_Insect_cFii
/* 801D9798 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801D979C 41 82 00 3C */ beq lbl_801D97D8
/* 801D97A0 80 7D 00 20 */ lwz r3, 0x20(r29)
/* 801D97A4 57 65 18 38 */ slwi r5, r27, 3
/* 801D97A8 3C 80 80 39 */ lis r4, ageha_tag@ha /* 0x80396750@ha */
/* 801D97AC 38 04 67 50 */ addi r0, r4, ageha_tag@l /* 0x80396750@l */
/* 801D97B0 7C 80 2A 14 */ add r4, r0, r5
/* 801D97B4 80 A4 00 00 */ lwz r5, 0(r4)
/* 801D97B8 80 C4 00 04 */ lwz r6, 4(r4)
/* 801D97BC 81 83 00 00 */ lwz r12, 0(r3)
/* 801D97C0 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801D97C4 7D 89 03 A6 */ mtctr r12
/* 801D97C8 4E 80 04 21 */ bctrl
/* 801D97CC 38 00 00 01 */ li r0, 1
/* 801D97D0 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801D97D4 48 00 00 38 */ b lbl_801D980C
lbl_801D97D8:
/* 801D97D8 80 7D 00 20 */ lwz r3, 0x20(r29)
/* 801D97DC 57 65 18 38 */ slwi r5, r27, 3
/* 801D97E0 3C 80 80 39 */ lis r4, ageha_tag@ha /* 0x80396750@ha */
/* 801D97E4 38 04 67 50 */ addi r0, r4, ageha_tag@l /* 0x80396750@l */
/* 801D97E8 7C 80 2A 14 */ add r4, r0, r5
/* 801D97EC 80 A4 00 00 */ lwz r5, 0(r4)
/* 801D97F0 80 C4 00 04 */ lwz r6, 4(r4)
/* 801D97F4 81 83 00 00 */ lwz r12, 0(r3)
/* 801D97F8 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801D97FC 7D 89 03 A6 */ mtctr r12
/* 801D9800 4E 80 04 21 */ bctrl
/* 801D9804 38 00 00 00 */ li r0, 0
/* 801D9808 98 03 00 B0 */ stb r0, 0xb0(r3)
lbl_801D980C:
/* 801D980C 3B DE 00 01 */ addi r30, r30, 1
/* 801D9810 2C 1E 00 04 */ cmpwi r30, 4
/* 801D9814 3B 9C 00 06 */ addi r28, r28, 6
/* 801D9818 41 80 FF 30 */ blt lbl_801D9748
/* 801D981C 3B FF 00 01 */ addi r31, r31, 1
/* 801D9820 2C 1F 00 06 */ cmpwi r31, 6
/* 801D9824 41 80 FF 1C */ blt lbl_801D9740
/* 801D9828 80 7D 00 20 */ lwz r3, 0x20(r29)
/* 801D982C 3C 80 5F 74 */ lis r4, 0x5F74 /* 0x5F743030@ha */
/* 801D9830 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x5F743030@l */
/* 801D9834 38 A0 00 66 */ li r5, 0x66
/* 801D9838 81 83 00 00 */ lwz r12, 0(r3)
/* 801D983C 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801D9840 7D 89 03 A6 */ mtctr r12
/* 801D9844 4E 80 04 21 */ bctrl
/* 801D9848 7C 7B 1B 78 */ mr r27, r3
/* 801D984C 80 7D 00 20 */ lwz r3, 0x20(r29)
/* 801D9850 3C 80 5F 74 */ lis r4, 0x5F74 /* 0x5F743030@ha */
/* 801D9854 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x5F743030@l */
/* 801D9858 38 A0 00 74 */ li r5, 0x74
/* 801D985C 81 83 00 00 */ lwz r12, 0(r3)
/* 801D9860 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801D9864 7D 89 03 A6 */ mtctr r12
/* 801D9868 4E 80 04 21 */ bctrl
/* 801D986C 38 00 00 00 */ li r0, 0
/* 801D9870 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801D9874 4B E3 B3 2D */ bl mDoExt_getSubFont__Fv
/* 801D9878 7C 64 1B 78 */ mr r4, r3
/* 801D987C 7F 63 DB 78 */ mr r3, r27
/* 801D9880 81 9B 00 00 */ lwz r12, 0(r27)
/* 801D9884 81 8C 00 9C */ lwz r12, 0x9c(r12)
/* 801D9888 7D 89 03 A6 */ mtctr r12
/* 801D988C 4E 80 04 21 */ bctrl
/* 801D9890 7F 63 DB 78 */ mr r3, r27
/* 801D9894 38 80 02 00 */ li r4, 0x200
/* 801D9898 3C A0 80 39 */ lis r5, d_menu_d_menu_insect__stringBase0@ha /* 0x803968C0@ha */
/* 801D989C 38 A5 68 C0 */ addi r5, r5, d_menu_d_menu_insect__stringBase0@l /* 0x803968C0@l */
/* 801D98A0 38 A5 00 32 */ addi r5, r5, 0x32
/* 801D98A4 4C C6 31 82 */ crclr 6
/* 801D98A8 48 12 6E A5 */ bl setString__10J2DTextBoxFsPCce
/* 801D98AC 80 7D 00 E8 */ lwz r3, 0xe8(r29)
/* 801D98B0 38 80 05 BA */ li r4, 0x5ba
/* 801D98B4 7F 65 DB 78 */ mr r5, r27
/* 801D98B8 38 C0 00 00 */ li r6, 0
/* 801D98BC 38 E0 00 00 */ li r7, 0
/* 801D98C0 39 00 00 00 */ li r8, 0
/* 801D98C4 39 20 00 00 */ li r9, 0
/* 801D98C8 81 83 00 00 */ lwz r12, 0(r3)
/* 801D98CC 81 8C 00 08 */ lwz r12, 8(r12)
/* 801D98D0 7D 89 03 A6 */ mtctr r12
/* 801D98D4 4E 80 04 21 */ bctrl
/* 801D98D8 39 61 00 20 */ addi r11, r1, 0x20
/* 801D98DC 48 18 89 45 */ bl _restgpr_27
/* 801D98E0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 801D98E4 7C 08 03 A6 */ mtlr r0
/* 801D98E8 38 21 00 20 */ addi r1, r1, 0x20
/* 801D98EC 4E 80 00 20 */ blr

View File

@ -1,191 +0,0 @@
lbl_801D98F0:
/* 801D98F0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801D98F4 7C 08 02 A6 */ mflr r0
/* 801D98F8 90 01 00 14 */ stw r0, 0x14(r1)
/* 801D98FC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801D9900 93 C1 00 08 */ stw r30, 8(r1)
/* 801D9904 7C 7F 1B 78 */ mr r31, r3
/* 801D9908 38 60 01 18 */ li r3, 0x118
/* 801D990C 48 0F 53 41 */ bl __nw__FUl
/* 801D9910 7C 60 1B 79 */ or. r0, r3, r3
/* 801D9914 41 82 00 0C */ beq lbl_801D9920
/* 801D9918 48 11 EB 81 */ bl __ct__9J2DScreenFv
/* 801D991C 7C 60 1B 78 */ mr r0, r3
lbl_801D9920:
/* 801D9920 90 1F 00 24 */ stw r0, 0x24(r31)
/* 801D9924 80 7F 00 24 */ lwz r3, 0x24(r31)
/* 801D9928 3C 80 80 39 */ lis r4, d_menu_d_menu_insect__stringBase0@ha /* 0x803968C0@ha */
/* 801D992C 38 84 68 C0 */ addi r4, r4, d_menu_d_menu_insect__stringBase0@l /* 0x803968C0@l */
/* 801D9930 38 84 00 4A */ addi r4, r4, 0x4a
/* 801D9934 3C A0 00 02 */ lis r5, 2
/* 801D9938 80 DF 00 08 */ lwz r6, 8(r31)
/* 801D993C 48 11 ED 0D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive
/* 801D9940 80 7F 00 24 */ lwz r3, 0x24(r31)
/* 801D9944 48 07 B7 A5 */ bl dPaneClass_showNullPane__FP9J2DScreen
/* 801D9948 38 60 00 6C */ li r3, 0x6c
/* 801D994C 48 0F 53 01 */ bl __nw__FUl
/* 801D9950 7C 60 1B 79 */ or. r0, r3, r3
/* 801D9954 41 82 00 24 */ beq lbl_801D9978
/* 801D9958 80 9F 00 24 */ lwz r4, 0x24(r31)
/* 801D995C 3C A0 5F 61 */ lis r5, 0x5F61 /* 0x5F616C6C@ha */
/* 801D9960 38 C5 6C 6C */ addi r6, r5, 0x6C6C /* 0x5F616C6C@l */
/* 801D9964 38 A0 00 6E */ li r5, 0x6e
/* 801D9968 38 E0 00 02 */ li r7, 2
/* 801D996C 39 00 00 00 */ li r8, 0
/* 801D9970 48 07 A0 15 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap
/* 801D9974 7C 60 1B 78 */ mr r0, r3
lbl_801D9978:
/* 801D9978 90 1F 00 68 */ stw r0, 0x68(r31)
/* 801D997C 80 7F 00 68 */ lwz r3, 0x68(r31)
/* 801D9980 C0 22 A8 44 */ lfs f1, lit_3837(r2)
/* 801D9984 48 07 BE 4D */ bl setAlphaRate__13CPaneMgrAlphaFf
/* 801D9988 38 60 00 6C */ li r3, 0x6c
/* 801D998C 48 0F 52 C1 */ bl __nw__FUl
/* 801D9990 7C 60 1B 79 */ or. r0, r3, r3
/* 801D9994 41 82 00 24 */ beq lbl_801D99B8
/* 801D9998 80 9F 00 24 */ lwz r4, 0x24(r31)
/* 801D999C 3C A0 69 6E */ lis r5, 0x696E /* 0x696E5F6E@ha */
/* 801D99A0 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x696E5F6E@l */
/* 801D99A4 38 A5 5F 77 */ addi r5, r5, 0x5f77
/* 801D99A8 38 E0 00 00 */ li r7, 0
/* 801D99AC 39 00 00 00 */ li r8, 0
/* 801D99B0 48 07 9F D5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap
/* 801D99B4 7C 60 1B 78 */ mr r0, r3
lbl_801D99B8:
/* 801D99B8 90 1F 00 D0 */ stw r0, 0xd0(r31)
/* 801D99BC 38 60 00 6C */ li r3, 0x6c
/* 801D99C0 48 0F 52 8D */ bl __nw__FUl
/* 801D99C4 7C 60 1B 79 */ or. r0, r3, r3
/* 801D99C8 41 82 00 28 */ beq lbl_801D99F0
/* 801D99CC 80 9F 00 24 */ lwz r4, 0x24(r31)
/* 801D99D0 3C A0 6D 6F */ lis r5, 0x6D6F /* 0x6D6F5F6E@ha */
/* 801D99D4 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x6D6F5F6E@l */
/* 801D99D8 3C A0 77 5F */ lis r5, 0x775F /* 0x775F645F@ha */
/* 801D99DC 38 A5 64 5F */ addi r5, r5, 0x645F /* 0x775F645F@l */
/* 801D99E0 38 E0 00 00 */ li r7, 0
/* 801D99E4 39 00 00 00 */ li r8, 0
/* 801D99E8 48 07 9F 9D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap
/* 801D99EC 7C 60 1B 78 */ mr r0, r3
lbl_801D99F0:
/* 801D99F0 90 1F 00 D4 */ stw r0, 0xd4(r31)
/* 801D99F4 88 1F 00 F6 */ lbz r0, 0xf6(r31)
/* 801D99F8 28 00 00 00 */ cmplwi r0, 0
/* 801D99FC 40 82 00 0C */ bne lbl_801D9A08
/* 801D9A00 80 7F 00 D4 */ lwz r3, 0xd4(r31)
/* 801D9A04 48 07 BC 05 */ bl hide__13CPaneMgrAlphaFv
lbl_801D9A08:
/* 801D9A08 38 60 00 6C */ li r3, 0x6c
/* 801D9A0C 48 0F 52 41 */ bl __nw__FUl
/* 801D9A10 7C 60 1B 79 */ or. r0, r3, r3
/* 801D9A14 41 82 00 28 */ beq lbl_801D9A3C
/* 801D9A18 80 9F 00 24 */ lwz r4, 0x24(r31)
/* 801D9A1C 3C A0 34 6C */ lis r5, 0x346C /* 0x346C696E@ha */
/* 801D9A20 38 C5 69 6E */ addi r6, r5, 0x696E /* 0x346C696E@l */
/* 801D9A24 3C A0 6D 67 */ lis r5, 0x6D67 /* 0x6D675F65@ha */
/* 801D9A28 38 A5 5F 65 */ addi r5, r5, 0x5F65 /* 0x6D675F65@l */
/* 801D9A2C 38 E0 00 00 */ li r7, 0
/* 801D9A30 39 00 00 00 */ li r8, 0
/* 801D9A34 48 07 9F 51 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap
/* 801D9A38 7C 60 1B 78 */ mr r0, r3
lbl_801D9A3C:
/* 801D9A3C 90 1F 00 CC */ stw r0, 0xcc(r31)
/* 801D9A40 80 7F 00 24 */ lwz r3, 0x24(r31)
/* 801D9A44 3C 80 6C 69 */ lis r4, 0x6C69 /* 0x6C696E65@ha */
/* 801D9A48 38 C4 6E 65 */ addi r6, r4, 0x6E65 /* 0x6C696E65@l */
/* 801D9A4C 3C 80 00 6E */ lis r4, 0x006E /* 0x006E5F33@ha */
/* 801D9A50 38 A4 5F 33 */ addi r5, r4, 0x5F33 /* 0x006E5F33@l */
/* 801D9A54 81 83 00 00 */ lwz r12, 0(r3)
/* 801D9A58 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801D9A5C 7D 89 03 A6 */ mtctr r12
/* 801D9A60 4E 80 04 21 */ bctrl
/* 801D9A64 38 00 00 00 */ li r0, 0
/* 801D9A68 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801D9A6C 80 7F 00 24 */ lwz r3, 0x24(r31)
/* 801D9A70 3C 80 6F 72 */ lis r4, 0x6F72 /* 0x6F725F32@ha */
/* 801D9A74 38 C4 5F 32 */ addi r6, r4, 0x5F32 /* 0x6F725F32@l */
/* 801D9A78 3C 80 6D 73 */ lis r4, 0x6D73 /* 0x6D735F66@ha */
/* 801D9A7C 38 A4 5F 66 */ addi r5, r4, 0x5F66 /* 0x6D735F66@l */
/* 801D9A80 81 83 00 00 */ lwz r12, 0(r3)
/* 801D9A84 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801D9A88 7D 89 03 A6 */ mtctr r12
/* 801D9A8C 4E 80 04 21 */ bctrl
/* 801D9A90 90 7F 00 5C */ stw r3, 0x5c(r31)
/* 801D9A94 80 7F 00 24 */ lwz r3, 0x24(r31)
/* 801D9A98 3C 80 67 5F */ lis r4, 0x675F /* 0x675F6A70@ha */
/* 801D9A9C 38 C4 6A 70 */ addi r6, r4, 0x6A70 /* 0x675F6A70@l */
/* 801D9AA0 3C 80 77 5F */ lis r4, 0x775F /* 0x775F6D73@ha */
/* 801D9AA4 38 A4 6D 73 */ addi r5, r4, 0x6D73 /* 0x775F6D73@l */
/* 801D9AA8 81 83 00 00 */ lwz r12, 0(r3)
/* 801D9AAC 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801D9AB0 7D 89 03 A6 */ mtctr r12
/* 801D9AB4 4E 80 04 21 */ bctrl
/* 801D9AB8 38 00 00 00 */ li r0, 0
/* 801D9ABC 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801D9AC0 80 7F 00 24 */ lwz r3, 0x24(r31)
/* 801D9AC4 3C 80 6F 72 */ lis r4, 0x6F72 /* 0x6F725F33@ha */
/* 801D9AC8 38 C4 5F 33 */ addi r6, r4, 0x5F33 /* 0x6F725F33@l */
/* 801D9ACC 3C 80 6D 73 */ lis r4, 0x6D73 /* 0x6D735F66@ha */
/* 801D9AD0 38 A4 5F 66 */ addi r5, r4, 0x5F66 /* 0x6D735F66@l */
/* 801D9AD4 81 83 00 00 */ lwz r12, 0(r3)
/* 801D9AD8 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801D9ADC 7D 89 03 A6 */ mtctr r12
/* 801D9AE0 4E 80 04 21 */ bctrl
/* 801D9AE4 38 00 00 00 */ li r0, 0
/* 801D9AE8 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801D9AEC 80 7F 00 24 */ lwz r3, 0x24(r31)
/* 801D9AF0 3C 80 65 63 */ lis r4, 0x6563 /* 0x65637473@ha */
/* 801D9AF4 38 C4 74 73 */ addi r6, r4, 0x7473 /* 0x65637473@l */
/* 801D9AF8 3C 80 00 69 */ lis r4, 0x0069 /* 0x00696E73@ha */
/* 801D9AFC 38 A4 6E 73 */ addi r5, r4, 0x6E73 /* 0x00696E73@l */
/* 801D9B00 81 83 00 00 */ lwz r12, 0(r3)
/* 801D9B04 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801D9B08 7D 89 03 A6 */ mtctr r12
/* 801D9B0C 4E 80 04 21 */ bctrl
/* 801D9B10 90 7F 00 54 */ stw r3, 0x54(r31)
/* 801D9B14 80 7F 00 24 */ lwz r3, 0x24(r31)
/* 801D9B18 3C 80 63 74 */ lis r4, 0x6374 /* 0x63747373@ha */
/* 801D9B1C 38 C4 73 73 */ addi r6, r4, 0x7373 /* 0x63747373@l */
/* 801D9B20 3C 80 69 6E */ lis r4, 0x696E /* 0x696E7365@ha */
/* 801D9B24 38 A4 73 65 */ addi r5, r4, 0x7365 /* 0x696E7365@l */
/* 801D9B28 81 83 00 00 */ lwz r12, 0(r3)
/* 801D9B2C 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801D9B30 7D 89 03 A6 */ mtctr r12
/* 801D9B34 4E 80 04 21 */ bctrl
/* 801D9B38 90 7F 00 58 */ stw r3, 0x58(r31)
/* 801D9B3C 80 7F 00 CC */ lwz r3, 0xcc(r31)
/* 801D9B40 83 C3 00 04 */ lwz r30, 4(r3)
/* 801D9B44 4B E3 AE AD */ bl mDoExt_getMesgFont__Fv
/* 801D9B48 7C 64 1B 78 */ mr r4, r3
/* 801D9B4C 7F C3 F3 78 */ mr r3, r30
/* 801D9B50 81 9E 00 00 */ lwz r12, 0(r30)
/* 801D9B54 81 8C 00 9C */ lwz r12, 0x9c(r12)
/* 801D9B58 7D 89 03 A6 */ mtctr r12
/* 801D9B5C 4E 80 04 21 */ bctrl
/* 801D9B60 80 7F 00 CC */ lwz r3, 0xcc(r31)
/* 801D9B64 80 63 00 04 */ lwz r3, 4(r3)
/* 801D9B68 38 80 02 00 */ li r4, 0x200
/* 801D9B6C 3C A0 80 39 */ lis r5, d_menu_d_menu_insect__stringBase0@ha /* 0x803968C0@ha */
/* 801D9B70 38 A5 68 C0 */ addi r5, r5, d_menu_d_menu_insect__stringBase0@l /* 0x803968C0@l */
/* 801D9B74 38 A5 00 32 */ addi r5, r5, 0x32
/* 801D9B78 4C C6 31 82 */ crclr 6
/* 801D9B7C 48 12 6B D1 */ bl setString__10J2DTextBoxFsPCce
/* 801D9B80 4B E3 AE 71 */ bl mDoExt_getMesgFont__Fv
/* 801D9B84 7C 64 1B 78 */ mr r4, r3
/* 801D9B88 80 7F 00 5C */ lwz r3, 0x5c(r31)
/* 801D9B8C 81 83 00 00 */ lwz r12, 0(r3)
/* 801D9B90 81 8C 00 9C */ lwz r12, 0x9c(r12)
/* 801D9B94 7D 89 03 A6 */ mtctr r12
/* 801D9B98 4E 80 04 21 */ bctrl
/* 801D9B9C 80 7F 00 5C */ lwz r3, 0x5c(r31)
/* 801D9BA0 38 80 01 00 */ li r4, 0x100
/* 801D9BA4 3C A0 80 39 */ lis r5, d_menu_d_menu_insect__stringBase0@ha /* 0x803968C0@ha */
/* 801D9BA8 38 A5 68 C0 */ addi r5, r5, d_menu_d_menu_insect__stringBase0@l /* 0x803968C0@l */
/* 801D9BAC 38 A5 00 32 */ addi r5, r5, 0x32
/* 801D9BB0 4C C6 31 82 */ crclr 6
/* 801D9BB4 48 12 6B 99 */ bl setString__10J2DTextBoxFsPCce
/* 801D9BB8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801D9BBC 83 C1 00 08 */ lwz r30, 8(r1)
/* 801D9BC0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801D9BC4 7C 08 03 A6 */ mtlr r0
/* 801D9BC8 38 21 00 10 */ addi r1, r1, 0x10
/* 801D9BCC 4E 80 00 20 */ blr

View File

@ -1,146 +0,0 @@
lbl_801D92DC:
/* 801D92DC 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 801D92E0 7C 08 02 A6 */ mflr r0
/* 801D92E4 90 01 00 34 */ stw r0, 0x34(r1)
/* 801D92E8 93 E1 00 2C */ stw r31, 0x2c(r1)
/* 801D92EC 7C 7F 1B 78 */ mr r31, r3
/* 801D92F0 80 63 00 0C */ lwz r3, 0xc(r3)
/* 801D92F4 4B E5 8E A9 */ bl checkTrigger__9STControlFv
/* 801D92F8 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */
/* 801D92FC 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */
/* 801D9300 80 63 00 34 */ lwz r3, 0x34(r3)
/* 801D9304 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 801D9308 41 82 00 8C */ beq lbl_801D9394
/* 801D930C 38 00 00 04 */ li r0, 4
/* 801D9310 98 1F 00 F3 */ stb r0, 0xf3(r31)
/* 801D9314 88 1F 00 F7 */ lbz r0, 0xf7(r31)
/* 801D9318 28 00 00 00 */ cmplwi r0, 0
/* 801D931C 40 82 00 40 */ bne lbl_801D935C
/* 801D9320 38 00 00 6D */ li r0, 0x6d
/* 801D9324 90 01 00 18 */ stw r0, 0x18(r1)
/* 801D9328 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13)
/* 801D932C 38 81 00 18 */ addi r4, r1, 0x18
/* 801D9330 38 A0 00 00 */ li r5, 0
/* 801D9334 38 C0 00 00 */ li r6, 0
/* 801D9338 38 E0 00 00 */ li r7, 0
/* 801D933C C0 22 A8 38 */ lfs f1, lit_3834(r2)
/* 801D9340 FC 40 08 90 */ fmr f2, f1
/* 801D9344 C0 62 A8 68 */ lfs f3, lit_4089(r2)
/* 801D9348 FC 80 18 90 */ fmr f4, f3
/* 801D934C 39 00 00 00 */ li r8, 0
/* 801D9350 48 0D 26 35 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 801D9354 48 04 56 7D */ bl dMeter2Info_set2DVibration__Fv
/* 801D9358 48 00 01 64 */ b lbl_801D94BC
lbl_801D935C:
/* 801D935C 38 00 00 6E */ li r0, 0x6e
/* 801D9360 90 01 00 14 */ stw r0, 0x14(r1)
/* 801D9364 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13)
/* 801D9368 38 81 00 14 */ addi r4, r1, 0x14
/* 801D936C 38 A0 00 00 */ li r5, 0
/* 801D9370 38 C0 00 00 */ li r6, 0
/* 801D9374 38 E0 00 00 */ li r7, 0
/* 801D9378 C0 22 A8 38 */ lfs f1, lit_3834(r2)
/* 801D937C FC 40 08 90 */ fmr f2, f1
/* 801D9380 C0 62 A8 68 */ lfs f3, lit_4089(r2)
/* 801D9384 FC 80 18 90 */ fmr f4, f3
/* 801D9388 39 00 00 00 */ li r8, 0
/* 801D938C 48 0D 25 F9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 801D9390 48 00 01 2C */ b lbl_801D94BC
lbl_801D9394:
/* 801D9394 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16
/* 801D9398 41 82 00 50 */ beq lbl_801D93E8
/* 801D939C 38 00 00 04 */ li r0, 4
/* 801D93A0 98 1F 00 F3 */ stb r0, 0xf3(r31)
/* 801D93A4 38 00 00 01 */ li r0, 1
/* 801D93A8 98 1F 00 F7 */ stb r0, 0xf7(r31)
/* 801D93AC 38 00 00 6E */ li r0, 0x6e
/* 801D93B0 90 01 00 10 */ stw r0, 0x10(r1)
/* 801D93B4 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13)
/* 801D93B8 38 81 00 10 */ addi r4, r1, 0x10
/* 801D93BC 38 A0 00 00 */ li r5, 0
/* 801D93C0 38 C0 00 00 */ li r6, 0
/* 801D93C4 38 E0 00 00 */ li r7, 0
/* 801D93C8 C0 22 A8 38 */ lfs f1, lit_3834(r2)
/* 801D93CC FC 40 08 90 */ fmr f2, f1
/* 801D93D0 C0 62 A8 68 */ lfs f3, lit_4089(r2)
/* 801D93D4 FC 80 18 90 */ fmr f4, f3
/* 801D93D8 39 00 00 00 */ li r8, 0
/* 801D93DC 48 0D 25 A9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 801D93E0 48 04 55 F1 */ bl dMeter2Info_set2DVibration__Fv
/* 801D93E4 48 00 00 D8 */ b lbl_801D94BC
lbl_801D93E8:
/* 801D93E8 80 7F 00 1C */ lwz r3, 0x1c(r31)
/* 801D93EC 48 06 08 79 */ bl isSelect__17dMsgScrn3Select_cFv
/* 801D93F0 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801D93F4 41 82 00 60 */ beq lbl_801D9454
/* 801D93F8 80 7F 00 0C */ lwz r3, 0xc(r31)
/* 801D93FC 4B E5 91 29 */ bl checkUpTrigger__9STControlFv
/* 801D9400 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801D9404 41 82 00 50 */ beq lbl_801D9454
/* 801D9408 88 1F 00 F7 */ lbz r0, 0xf7(r31)
/* 801D940C 28 00 00 01 */ cmplwi r0, 1
/* 801D9410 40 82 00 AC */ bne lbl_801D94BC
/* 801D9414 38 00 00 00 */ li r0, 0
/* 801D9418 98 1F 00 F7 */ stb r0, 0xf7(r31)
/* 801D941C 38 00 00 A0 */ li r0, 0xa0
/* 801D9420 90 01 00 0C */ stw r0, 0xc(r1)
/* 801D9424 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13)
/* 801D9428 38 81 00 0C */ addi r4, r1, 0xc
/* 801D942C 38 A0 00 00 */ li r5, 0
/* 801D9430 38 C0 00 00 */ li r6, 0
/* 801D9434 38 E0 00 00 */ li r7, 0
/* 801D9438 C0 22 A8 38 */ lfs f1, lit_3834(r2)
/* 801D943C FC 40 08 90 */ fmr f2, f1
/* 801D9440 C0 62 A8 68 */ lfs f3, lit_4089(r2)
/* 801D9444 FC 80 18 90 */ fmr f4, f3
/* 801D9448 39 00 00 00 */ li r8, 0
/* 801D944C 48 0D 25 39 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 801D9450 48 00 00 6C */ b lbl_801D94BC
lbl_801D9454:
/* 801D9454 80 7F 00 1C */ lwz r3, 0x1c(r31)
/* 801D9458 48 06 08 0D */ bl isSelect__17dMsgScrn3Select_cFv
/* 801D945C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801D9460 41 82 00 5C */ beq lbl_801D94BC
/* 801D9464 80 7F 00 0C */ lwz r3, 0xc(r31)
/* 801D9468 4B E5 91 39 */ bl checkDownTrigger__9STControlFv
/* 801D946C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801D9470 41 82 00 4C */ beq lbl_801D94BC
/* 801D9474 88 1F 00 F7 */ lbz r0, 0xf7(r31)
/* 801D9478 28 00 00 00 */ cmplwi r0, 0
/* 801D947C 40 82 00 40 */ bne lbl_801D94BC
/* 801D9480 38 00 00 01 */ li r0, 1
/* 801D9484 98 1F 00 F7 */ stb r0, 0xf7(r31)
/* 801D9488 38 00 00 A0 */ li r0, 0xa0
/* 801D948C 90 01 00 08 */ stw r0, 8(r1)
/* 801D9490 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13)
/* 801D9494 38 81 00 08 */ addi r4, r1, 8
/* 801D9498 38 A0 00 00 */ li r5, 0
/* 801D949C 38 C0 00 00 */ li r6, 0
/* 801D94A0 38 E0 00 00 */ li r7, 0
/* 801D94A4 C0 22 A8 38 */ lfs f1, lit_3834(r2)
/* 801D94A8 FC 40 08 90 */ fmr f2, f1
/* 801D94AC C0 62 A8 68 */ lfs f3, lit_4089(r2)
/* 801D94B0 FC 80 18 90 */ fmr f4, f3
/* 801D94B4 39 00 00 00 */ li r8, 0
/* 801D94B8 48 0D 24 CD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
lbl_801D94BC:
/* 801D94BC 88 1F 00 F3 */ lbz r0, 0xf3(r31)
/* 801D94C0 28 00 00 03 */ cmplwi r0, 3
/* 801D94C4 40 82 00 24 */ bne lbl_801D94E8
/* 801D94C8 80 7F 00 1C */ lwz r3, 0x1c(r31)
/* 801D94CC 38 80 00 02 */ li r4, 2
/* 801D94D0 88 BF 00 F7 */ lbz r5, 0xf7(r31)
/* 801D94D4 38 05 00 01 */ addi r0, r5, 1
/* 801D94D8 54 05 06 3E */ clrlwi r5, r0, 0x18
/* 801D94DC 38 C0 00 00 */ li r6, 0
/* 801D94E0 48 06 0E B9 */ bl selAnimeMove__17dMsgScrn3Select_cFUcUcb
/* 801D94E4 48 00 00 0C */ b lbl_801D94F0
lbl_801D94E8:
/* 801D94E8 80 7F 00 1C */ lwz r3, 0x1c(r31)
/* 801D94EC 48 06 11 95 */ bl selAnimeEnd__17dMsgScrn3Select_cFv
lbl_801D94F0:
/* 801D94F0 83 E1 00 2C */ lwz r31, 0x2c(r1)
/* 801D94F4 80 01 00 34 */ lwz r0, 0x34(r1)
/* 801D94F8 7C 08 03 A6 */ mtlr r0
/* 801D94FC 38 21 00 30 */ addi r1, r1, 0x30
/* 801D9500 4E 80 00 20 */ blr

View File

@ -1,84 +0,0 @@
lbl_801D8CCC:
/* 801D8CCC 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 801D8CD0 7C 08 02 A6 */ mflr r0
/* 801D8CD4 90 01 00 24 */ stw r0, 0x24(r1)
/* 801D8CD8 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 801D8CDC 7C 7F 1B 78 */ mr r31, r3
/* 801D8CE0 80 8D 86 48 */ lwz r4, mFader__13mDoGph_gInf_c(r13)
/* 801D8CE4 80 04 00 04 */ lwz r0, 4(r4)
/* 801D8CE8 2C 00 00 01 */ cmpwi r0, 1
/* 801D8CEC 40 82 01 00 */ bne lbl_801D8DEC
/* 801D8CF0 3C 80 80 3E */ lis r4, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */
/* 801D8CF4 38 84 D2 E8 */ addi r4, r4, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */
/* 801D8CF8 80 A4 00 34 */ lwz r5, 0x34(r4)
/* 801D8CFC 54 A4 05 AD */ rlwinm. r4, r5, 0, 0x16, 0x16
/* 801D8D00 40 82 00 10 */ bne lbl_801D8D10
/* 801D8D04 88 1F 00 F7 */ lbz r0, 0xf7(r31)
/* 801D8D08 28 00 00 00 */ cmplwi r0, 0
/* 801D8D0C 40 82 00 44 */ bne lbl_801D8D50
lbl_801D8D10:
/* 801D8D10 28 04 00 00 */ cmplwi r4, 0
/* 801D8D14 41 82 00 20 */ beq lbl_801D8D34
/* 801D8D18 88 1F 00 F6 */ lbz r0, 0xf6(r31)
/* 801D8D1C 28 00 00 01 */ cmplwi r0, 1
/* 801D8D20 40 82 00 14 */ bne lbl_801D8D34
/* 801D8D24 38 00 00 00 */ li r0, 0
/* 801D8D28 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
/* 801D8D2C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
/* 801D8D30 98 03 00 C3 */ stb r0, 0xc3(r3)
lbl_801D8D34:
/* 801D8D34 38 00 00 03 */ li r0, 3
/* 801D8D38 98 1F 00 F2 */ stb r0, 0xf2(r31)
/* 801D8D3C 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801D8D40 88 03 00 B4 */ lbz r0, 0xb4(r3)
/* 801D8D44 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e
/* 801D8D48 98 03 00 B4 */ stb r0, 0xb4(r3)
/* 801D8D4C 48 00 00 A0 */ b lbl_801D8DEC
lbl_801D8D50:
/* 801D8D50 54 A0 05 EF */ rlwinm. r0, r5, 0, 0x17, 0x17
/* 801D8D54 41 82 00 94 */ beq lbl_801D8DE8
/* 801D8D58 88 9F 00 F4 */ lbz r4, 0xf4(r31)
/* 801D8D5C 88 BF 00 F5 */ lbz r5, 0xf5(r31)
/* 801D8D60 48 00 10 85 */ bl isGetInsect__14dMenu_Insect_cFii
/* 801D8D64 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801D8D68 41 82 00 48 */ beq lbl_801D8DB0
/* 801D8D6C 38 00 00 01 */ li r0, 1
/* 801D8D70 98 1F 00 F3 */ stb r0, 0xf3(r31)
/* 801D8D74 38 00 00 51 */ li r0, 0x51
/* 801D8D78 90 01 00 0C */ stw r0, 0xc(r1)
/* 801D8D7C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13)
/* 801D8D80 38 81 00 0C */ addi r4, r1, 0xc
/* 801D8D84 38 A0 00 00 */ li r5, 0
/* 801D8D88 38 C0 00 00 */ li r6, 0
/* 801D8D8C 38 E0 00 00 */ li r7, 0
/* 801D8D90 C0 22 A8 38 */ lfs f1, lit_3834(r2)
/* 801D8D94 FC 40 08 90 */ fmr f2, f1
/* 801D8D98 C0 62 A8 68 */ lfs f3, lit_4089(r2)
/* 801D8D9C FC 80 18 90 */ fmr f4, f3
/* 801D8DA0 39 00 00 00 */ li r8, 0
/* 801D8DA4 48 0D 2B E1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 801D8DA8 48 04 5C 29 */ bl dMeter2Info_set2DVibration__Fv
/* 801D8DAC 48 00 00 40 */ b lbl_801D8DEC
lbl_801D8DB0:
/* 801D8DB0 38 00 00 4A */ li r0, 0x4a
/* 801D8DB4 90 01 00 08 */ stw r0, 8(r1)
/* 801D8DB8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13)
/* 801D8DBC 38 81 00 08 */ addi r4, r1, 8
/* 801D8DC0 38 A0 00 00 */ li r5, 0
/* 801D8DC4 38 C0 00 00 */ li r6, 0
/* 801D8DC8 38 E0 00 00 */ li r7, 0
/* 801D8DCC C0 22 A8 38 */ lfs f1, lit_3834(r2)
/* 801D8DD0 FC 40 08 90 */ fmr f2, f1
/* 801D8DD4 C0 62 A8 68 */ lfs f3, lit_4089(r2)
/* 801D8DD8 FC 80 18 90 */ fmr f4, f3
/* 801D8DDC 39 00 00 00 */ li r8, 0
/* 801D8DE0 48 0D 2B A5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
/* 801D8DE4 48 00 00 08 */ b lbl_801D8DEC
lbl_801D8DE8:
/* 801D8DE8 48 00 11 A5 */ bl cursorMove__14dMenu_Insect_cFv
lbl_801D8DEC:
/* 801D8DEC 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 801D8DF0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 801D8DF4 7C 08 03 A6 */ mtlr r0
/* 801D8DF8 38 21 00 20 */ addi r1, r1, 0x20
/* 801D8DFC 4E 80 00 20 */ blr

View File

@ -1,6 +1,7 @@
#ifndef D_MENU_D_MENU_INSECT_H
#define D_MENU_D_MENU_INSECT_H
#include "d/com/d_com_inf_game.h"
#include "d/d_drawlist.h"
class CPaneMgr;
@ -68,19 +69,18 @@ private:
/* 0x28 */ J2DScreen* mpIconScreen;
/* 0x2C */ J2DTextBox* mpAButtonString[5];
/* 0x40 */ J2DTextBox* mpBButtonString[5];
/* 0x54 */ J2DTextBox* field_0x54;
/* 0x58 */ J2DTextBox* field_0x58;
/* 0x54 */ J2DPicture* field_0x54[2];
/* 0x5C */ J2DTextBox* field_0x5c;
/* 0x60 */ J2DPicture* mpBlackTex;
/* 0x64 */ CPaneMgr* mpParent;
/* 0x68 */ CPaneMgr* mpExpParent;
/* 0x6C */ CPaneMgr* mpINSParent[24];
/* 0x6C */ CPaneMgr* mpINSParent[MAX_INSECT_NUM];
/* 0xCC */ CPaneMgr* mpInfoText;
/* 0xD0 */ CPaneMgr* mpExpSubWin[2];
/* 0xD8 */ CPaneMgr* mpButtonAB[2];
/* 0xE0 */ CPaneMgr* mpButtonText[2];
/* 0xE8 */ dMsgString_c* mpString;
/* 0xEC */ void* mpExpItemTex;
/* 0xEC */ ResTIMG* mpExpItemTex;
/* 0xF0 */ s16 field_0xf0;
/* 0xF2 */ u8 mStatus;
/* 0xF3 */ u8 field_0xf3;

View File

@ -14,6 +14,7 @@
#define MAX_ITEM_SLOTS 24
#define LIGHT_DROP_STAGE 4
#define LETTER_INFO_BIT 64
#define MAX_INSECT_NUM 24
#define BOMB_BAG_MAX 3
#define BOTTLE_MAX 4
#define TBOX_MAX 64

View File

@ -1,7 +1,15 @@
#ifndef MSG_SCRN_D_MSG_SCRN_3SELECT_H
#define MSG_SCRN_D_MSG_SCRN_3SELECT_H
#include "dolphin/types.h"
#include "d/d_drawlist.h"
class J2DScreen;
class J2DAnmTransform;
class J2DAnmColor;
class J2DAnmTextureSRTKey;
class dSelect_cursor_c;
class CPaneMgr;
class J2DTextBox;
class dMsgScrn3Select_c {
public:
@ -32,7 +40,48 @@ public:
/* 8023B4AC */ void selectTrans();
/* 8023B870 */ void selectAnimeTransform(int);
u8 field_0x0[0x114];
};
void setOffsetX(f32 i_offsetX) { mOffsetX = i_offsetX; }
private:
/* 0x004 */ J2DScreen* mpScreen;
/* 0x008 */ J2DAnmTransform* mpAnmBck;
/* 0x00C */ J2DAnmColor* mpAnmBpk;
/* 0x010 */ J2DAnmTextureSRTKey* mpAnmBtk;
/* 0x014 */ dSelect_cursor_c* mpSelectCursor;
/* 0x018 */ CPaneMgr* mpParent;
/* 0x01C */ CPaneMgr* mpTouchArea[3];
/* 0x028 */ J2DTextBox* mpTmrSel_c[3];
/* 0x034 */ CPaneMgr* mpSel_c[3];
/* 0x040 */ CPaneMgr* mpSelCld_c[3];
/* 0x04C */ CPaneMgr* mpSelCldr_c[3];
/* 0x058 */ CPaneMgr* mpSelCldm_c[3];
/* 0x064 */ CPaneMgr* mpSelCldw_c[5][3];
/* 0x0A0 */ CPaneMgr* mpSelPo_c[3];
/* 0x0AC */ CPaneMgr* mpKahen_c[3];
/* 0x0B8 */ CPaneMgr* mpCursor_c[3];
/* 0x0C4 */ JUtility::TColor field_0xc4;
/* 0x0C8 */ JUtility::TColor field_0xc8;
/* 0x0CC */ u8 field_0xcc[0xF0 - 0xCC];
/* 0x0F0 */ f32 field_0xf0;
/* 0x0F4 */ f32 field_0xf4;
/* 0x0F8 */ f32 field_0xf8;
/* 0x0FC */ f32 mOffsetX;
/* 0x100 */ f32 field_0x100;
/* 0x104 */ f32 field_0x104;
/* 0x108 */ u8 field_0x108;
/* 0x109 */ u8 field_0x109[0x10A - 0x109];
/* 0x10A */ s16 field_0x10a;
/* 0x10C */ s16 field_0x10c;
/* 0x10E */ u8 field_0x10e;
/* 0x10F */ u8 field_0x10f;
/* 0x110 */ u8 field_0x110;
/* 0x111 */ u8 field_0x111;
/* 0x112 */ u8 field_0x112;
/* 0x113 */ u8 field_0x113;
/* 0x114 */ u8 field_0x114;
/* 0x115 */ u8 field_0x115;
/* 0x116 */ u8 field_0x116;
/* 0x117 */ u8 field_0x117;
}; // Size: 0x118
#endif /* MSG_SCRN_D_MSG_SCRN_3SELECT_H */

View File

@ -330,7 +330,7 @@ SECTION_SDATA2 static f32 lit_3822[1 + 1 /* padding */] = {
/* 8019350C-80193594 18DE4C 0088+00 1/0 0/0 0/0 .text modeMove__14dBrightCheck_cFv */
void dBrightCheck_c::modeMove() {
if (mDoCPd_c::getTrigA(0) || mDoCPd_c::getTrigStart(0)) {
if (mDoCPd_c::getTrigA(PAD_1) || mDoCPd_c::getTrigStart(PAD_1)) {
mDoAud_seStart(1, 0, 0, 0);
field_0x19 = 1;
field_0x18 = 0;

View File

@ -474,7 +474,7 @@ void dName_c::_move() {
stick->checkTrigger();
(this->*SelProc[mSelProc])();
if (mDoCPd_c::getTrigRight(0)) {
if (mDoCPd_c::getTrigRight(PAD_1)) {
// BUG: this check only fails if the cursor is at exactly 7
// setMoji allows the cursor to reach 8, which is out of bounds here
if (mCurPos != 7) {
@ -483,14 +483,14 @@ void dName_c::_move() {
mCurPos++;
nameCursorMove();
}
} else if (mDoCPd_c::getTrigLeft(0)) {
} else if (mDoCPd_c::getTrigLeft(PAD_1)) {
if (mCurPos != 0) {
mDoAud_seStart(Z2SE_SY_DUMMY, 0, 0, 0);
mLastCurPos = mCurPos;
mCurPos--;
nameCursorMove();
}
} else if (mDoCPd_c::getTrigB(0)) {
} else if (mDoCPd_c::getTrigB(PAD_1)) {
if (mCurPos == 0) {
mDoAud_seStart(Z2SE_SY_MENU_BACK, 0, 0, 0);
field_0x2ac = mSelProc;
@ -500,7 +500,7 @@ void dName_c::_move() {
} else {
backSpace();
}
} else if (mDoCPd_c::getTrigStart(0)) {
} else if (mDoCPd_c::getTrigStart(PAD_1)) {
if ((mSelProc != PROC_MENU_SELECT || mSelMenu != MENU_END) &&
(mSelProc == PROC_MENU_SELECT || mSelProc == PROC_MOJI_SELECT)) {
mDoAud_seStart(Z2SE_SY_CURSOR_OPTION, 0, 0, 0);
@ -585,7 +585,7 @@ void dName_c::Wait() {
// matches with literals
#ifdef NONMATCHING
void dName_c::MojiSelect() {
if (mDoCPd_c::getTrigA(0)) {
if (mDoCPd_c::getTrigA(PAD_1)) {
selectMojiSet();
} else if (stick->checkRightTrigger()) {
mDoAud_seStart(Z2SE_SY_NAME_CURSOR, 0, 0, 0);
@ -951,7 +951,7 @@ void dName_c::MenuSelect() {
selectCursorPosSet(0);
MenuSelectAnmInit();
mSelProc = PROC_MENU_SEL_ANM2;
} else if (mDoCPd_c::getTrigA(0)) {
} else if (mDoCPd_c::getTrigA(PAD_1)) {
if (mSelMenu == MENU_END) {
if (nameCheck() != 0) {
mDoAud_seStart(Z2SE_SY_NAME_OK, NULL, 0, 0);
@ -962,7 +962,7 @@ void dName_c::MenuSelect() {
mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0);
}
menuAbtnSelect();
} else if (mDoCPd_c::getTrigStart(0)) {
} else if (mDoCPd_c::getTrigStart(PAD_1)) {
if (mSelMenu == MENU_END) {
if (nameCheck() != 0) {
mDoAud_seStart(Z2SE_SY_NAME_OK, NULL, 0, 0);

View File

@ -297,7 +297,7 @@ 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)) {
if (mDoGph_gInf_c::getFader()->getStatus() == 1 && mDoCPd_c::getTrigB(PAD_1)) {
mStatus = 3;
}
}

View File

@ -7,8 +7,9 @@
#include "JSystem/J2DGraph/J2DTextBox.h"
#include "JSystem/JKernel/JKRExpHeap.h"
#include "JSystem/JKernel/JKRMemArchive.h"
#include "JSystem/JUtility/JUTTexture.h"
#include "MSL_C/stdio.h"
#include "d/com/d_com_inf_game.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
#include "d/meter/d_meter2_info.h"
#include "d/meter/d_meter_HIO.h"
@ -139,17 +140,6 @@ extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 mFader__13mDoGph_gInf_c[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
//
/* ############################################################################################## */
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803968C0 = "tt_block8x8.bti";
#pragma pop
/* 803BD780-803BD78C 01A8A0 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@ -170,15 +160,19 @@ static moveFunc map_move_process[] = {
};
/* 803BD87C-803BD894 01A99C 0018+00 1/1 0/0 0/0 .data l_itemno$4346 */
static u8 l_itemno_4346[24] = {
0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB,
0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7,
static u8 l_itemno_4346[MAX_INSECT_NUM] = {
M_BEETLE, F_BEETLE, M_BUTTERFLY, F_BUTTERFLY, M_STAG_BEETLE, F_STAG_BEETLE,
M_GRASSHOPPER, F_GRASSHOPPER, M_NANAFUSHI, F_NANAFUSHI, M_DANGOMUSHI, F_DANGOMUSHI,
M_MANTIS, F_MANTIS, M_LADYBUG, F_LADYBUG, M_SNAIL, F_SNAIL,
M_DRAGONFLY, F_DRAGONFLY, M_ANT, F_ANT, M_MAYFLY, F_MAYFLY,
};
/* 803BD894-803BD8AC 01A9B4 0018+00 1/1 0/0 0/0 .data l_itemno$4364 */
static u8 l_itemno_4364[24] = {
0xD4, 0xD5, 0xD6, 0xD7, 0xC0, 0xC1, 0xCC, 0xCD, 0xC4, 0xC5, 0xCA, 0xCB,
0xC2, 0xC3, 0xCE, 0xCF, 0xD0, 0xD1, 0xC8, 0xC9, 0xC6, 0xC7, 0xD2, 0xD3,
static u8 l_itemno_4364[MAX_INSECT_NUM] = {
M_ANT, F_ANT, M_MAYFLY, F_MAYFLY, M_BEETLE, F_BEETLE,
M_MANTIS, F_MANTIS, M_STAG_BEETLE, F_STAG_BEETLE, M_DANGOMUSHI, F_DANGOMUSHI,
M_BUTTERFLY, F_BUTTERFLY, M_LADYBUG, F_LADYBUG, M_SNAIL, F_SNAIL,
M_NANAFUSHI, F_NANAFUSHI, M_GRASSHOPPER, F_GRASSHOPPER, M_DRAGONFLY, F_DRAGONFLY,
};
/* 803BD8AC-803BD8C8 01A9CC 0010+0C 2/2 0/0 0/0 .data __vt__14dMenu_Insect_c */
@ -193,27 +187,8 @@ SECTION_DATA extern void* __vt__14dMenu_Insect_c[4 + 3 /* padding */] = {
NULL,
};
/* 80454238-8045423C 002838 0004+00 6/6 0/0 0/0 .sdata2 @3834 */
SECTION_SDATA2 static f32 lit_3834 = 1.0f;
/* 8045423C-80454240 00283C 0004+00 1/1 0/0 0/0 .sdata2 @3835 */
SECTION_SDATA2 static f32 lit_3835 = 1.0f / 10.0f;
/* 80454240-80454244 002840 0004+00 1/1 0/0 0/0 .sdata2 @3836 */
SECTION_SDATA2 static f32 lit_3836 = 7.0f / 10.0f;
/* 80454244-80454248 002844 0004+00 5/5 0/0 0/0 .sdata2 @3837 */
SECTION_SDATA2 static u8 lit_3837[4] = {
0x00,
0x00,
0x00,
0x00,
};
/* 801D8114-801D82F4 1D2A54 01E0+00 0/0 2/2 0/0 .text
* __ct__14dMenu_Insect_cFP10JKRExpHeapP9STControlP10CSTControlUc */
#ifdef NONMATCHING
// Matches with literals
dMenu_Insect_c::dMenu_Insect_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i_cstick,
u8 param_3) {
mpHeap = i_heap;
@ -242,19 +217,8 @@ dMenu_Insect_c::dMenu_Insect_c(JKRExpHeap* i_heap, STControl* i_stick, CSTContro
mpDrawCursor->setScale(0.0f);
mpDrawCursor->offPlayAnime(0);
mpSelect_c = new dMsgScrn3Select_c();
mpExpItemTex = mpHeap->alloc(0xc00, 0x20);
mpExpItemTex = (ResTIMG*)mpHeap->alloc(0xc00, 0x20);
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dMenu_Insect_c::dMenu_Insect_c(JKRExpHeap* param_0, STControl* param_1, CSTControl* param_2,
u8 param_3) {
nofralloc
#include "asm/d/menu/d_menu_insect/__ct__14dMenu_Insect_cFP10JKRExpHeapP9STControlP10CSTControlUc.s"
}
#pragma pop
#endif
/* 801D82F4-801D8658 1D2C34 0364+00 1/0 0/0 0/0 .text __dt__14dMenu_Insect_cFv */
dMenu_Insect_c::~dMenu_Insect_c() {
@ -279,7 +243,7 @@ dMenu_Insect_c::~dMenu_Insect_c() {
delete mpParent;
mpParent = NULL;
for (int i = 0; i < 24; i++) {
for (int i = 0; i < MAX_INSECT_NUM; i++) {
delete mpINSParent[i];
mpINSParent[i] = NULL;
}
@ -349,35 +313,25 @@ void dMenu_Insect_c::_move() {
mDoExt_setCurrentHeap(heap);
}
/* ############################################################################################## */
/* 80454248-8045424C 002848 0004+00 1/1 0/0 0/0 .sdata2 @3961 */
SECTION_SDATA2 static f32 lit_3961 = 608.0f;
/* 8045424C-80454250 00284C 0004+00 1/1 0/0 0/0 .sdata2 @3962 */
SECTION_SDATA2 static f32 lit_3962 = 448.0f;
/* 80454250-80454254 002850 0004+00 1/1 0/0 0/0 .sdata2 @3963 */
SECTION_SDATA2 static f32 lit_3963 = 150.0f;
/* 80454254-80454258 002854 0004+00 1/1 0/0 0/0 .sdata2 @3964 */
SECTION_SDATA2 static f32 lit_3964 = 486.0f;
/* 80454258-80454260 002858 0004+04 1/1 0/0 0/0 .sdata2 @3965 */
SECTION_SDATA2 static f32 lit_3965[1 + 1 /* padding */] = {
209.0f,
/* padding */
0.0f,
};
/* 801D8760-801D88EC 1D30A0 018C+00 1/1 1/1 0/0 .text _draw__14dMenu_Insect_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Insect_c::_draw() {
nofralloc
#include "asm/d/menu/d_menu_insect/_draw__14dMenu_Insect_cFv.s"
void dMenu_Insect_c::_draw() {
if (mpArchive != NULL) {
J2DGrafContext* grafPort = dComIfGp_getCurrentGrafPort();
mpBlackTex->setAlpha(0xff);
mpBlackTex->draw(0.0f, 0.0f, 608.0f, 448.0f, 0, 0, 0);
mpScreen->draw(0.0f, 0.0f, grafPort);
mpDrawCursor->draw();
field_0xfc = mpExpParent->getAlphaRate() * 150.0f;
mpBlackTex->setAlpha(field_0xfc);
mpBlackTex->draw(0.0f, 0.0f, 608.0f, 448.0f, 0, 0, 0);
mpExpScreen->draw(0.0f, 0.0f, grafPort);
mpSelect_c->setOffsetX(g_drawHIO.mInsectListScreen.mConfirmOptionPosX_4x3);
mpSelect_c->translate(g_drawHIO.mInsectListScreen.mConfirmOptionPosX_4x3 + 486.0f,
g_drawHIO.mInsectListScreen.mConfirmOptionPosY_4x3 + 209.0f);
mpSelect_c->draw(0.0f, 0.0f);
mpIconScreen->draw(0.0f, 0.0f, grafPort);
}
}
#pragma pop
/* 801D88EC-801D8914 1D322C 0028+00 0/0 3/3 0/0 .text isSync__14dMenu_Insect_cFv */
bool dMenu_Insect_c::isSync() {
@ -392,19 +346,7 @@ void dMenu_Insect_c::init() {
(this->*map_init_process[field_0xf3])();
}
/* ############################################################################################## */
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803968D0 = "/res/Layout/insectRes.arc";
#pragma pop
/* 80454260-80454268 002860 0008+00 2/2 0/0 0/0 .sdata2 @4020 */
SECTION_SDATA2 static f64 lit_4020 = 4503601774854144.0 /* cast s32 to float */;
/* 801D894C-801D8B2C 1D328C 01E0+00 0/0 3/3 0/0 .text _open__14dMenu_Insect_cFv */
#ifdef NONMATCHING
// Matches with literals
int dMenu_Insect_c::_open() {
if (!mpMount) {
mpMount = mDoDvdThd_mountArchive_c::create("/res/Layout/insectRes.arc", 0, NULL);
@ -445,20 +387,8 @@ int dMenu_Insect_c::_open() {
return 0;
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int dMenu_Insect_c::_open() {
nofralloc
#include "asm/d/menu/d_menu_insect/_open__14dMenu_Insect_cFv.s"
}
#pragma pop
#endif
/* 801D8B2C-801D8C68 1D346C 013C+00 0/0 1/1 0/0 .text _close__14dMenu_Insect_cFv */
#ifdef NONMATCHING
// Matches with literals
int dMenu_Insect_c::_close() {
s16 closeFrame = g_drawHIO.mInsectListScreen.mCloseFrame;
field_0xf0 = 0;
@ -482,16 +412,6 @@ int dMenu_Insect_c::_close() {
}
return field_0xf0 <= 0;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int dMenu_Insect_c::_close() {
nofralloc
#include "asm/d/menu/d_menu_insect/_close__14dMenu_Insect_cFv.s"
}
#pragma pop
#endif
/* 801D8C68-801D8CCC 1D35A8 0064+00 1/0 0/0 0/0 .text wait_init__14dMenu_Insect_cFv */
void dMenu_Insect_c::wait_init() {
@ -503,52 +423,97 @@ void dMenu_Insect_c::wait_init() {
setBButtonString(0x3f9);
}
/* ############################################################################################## */
/* 80454268-8045426C 002868 0004+00 4/4 0/0 0/0 .sdata2 @4089 */
SECTION_SDATA2 static f32 lit_4089 = -1.0f;
/* 801D8CCC-801D8E00 1D360C 0134+00 1/0 0/0 0/0 .text wait_move__14dMenu_Insect_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Insect_c::wait_move() {
nofralloc
#include "asm/d/menu/d_menu_insect/wait_move__14dMenu_Insect_cFv.s"
void dMenu_Insect_c::wait_move() {
if (mDoGph_gInf_c::getFader()->getStatus() == 1) {
if (mDoCPd_c::getTrigB(PAD_1) || field_0xf7 == 0) {
if (mDoCPd_c::getTrigB(PAD_1) && field_0xf6 == 1) {
dMeter2Info_setInsectSelectType(0);
}
mStatus = 3;
mpDrawCursor->offPlayAnime(0);
} else if (mDoCPd_c::getTrigA(PAD_1)) {
if (isGetInsect(field_0xf4, field_0xf5)) {
field_0xf3 = 1;
Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_OPEN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
dMeter2Info_set2DVibration();
} else {
Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
} else {
cursorMove();
}
}
}
#pragma pop
/* ############################################################################################## */
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803968EA = ""
"\x1B"
"CR[%d]";
SECTION_DEAD static char const* const stringBase_803968F2 = "";
#pragma pop
/* 8045426C-80454270 00286C 0004+00 1/1 0/0 0/0 .sdata2 @4135 */
SECTION_SDATA2 static f32 lit_4135 = 48.0f;
/* 80454270-80454278 002870 0004+04 1/1 0/0 0/0 .sdata2 @4136 */
SECTION_SDATA2 static f32 lit_4136[1 + 1 /* padding */] = {
0.5f,
/* padding */
0.0f,
};
/* 80454278-80454280 002878 0008+00 1/1 0/0 0/0 .sdata2 @4138 */
SECTION_SDATA2 static f64 lit_4138 = 4503599627370496.0 /* cast u32 to float */;
/* 801D8E00-801D91E4 1D3740 03E4+00 1/0 0/0 0/0 .text explain_open_init__14dMenu_Insect_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Insect_c::explain_open_init() {
nofralloc
#include "asm/d/menu/d_menu_insect/explain_open_init__14dMenu_Insect_cFv.s"
void dMenu_Insect_c::explain_open_init() {
char local_78[32];
char local_98[32];
char local_b8[32];
char cStack_d8[32];
setAButtonString(0);
setBButtonString(0x3F9);
u8 insectItemId = getInsectItemID(field_0xf4, field_0xf5);
s32 i_textureNum = dMeter2Info_readItemTexture(insectItemId, mpExpItemTex, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, -1);
f32 tex = mpExpItemTex->width / 48.0f;
f32 tex2 = mpExpItemTex->height / 48.0f;
for (int i = 0; i < 2; i++) {
field_0x54[i]->changeTexture(mpExpItemTex, 0);
field_0x54[i]->scale(tex, tex2);
}
mpString->getString(insectItemId + 0x265, (J2DTextBox*)mpInfoText->getPanePtr(), NULL, NULL,
NULL, 0);
if (field_0xf6 == 1) {
if (!isGiveInsect(field_0xf4, field_0xf5)) {
mpString->getString(0x5BB, field_0x5c, NULL, NULL, NULL, 0);
local_78[0] = 0;
local_98[0] = 0;
local_b8[0] = 0;
cStack_d8[1] = 0;
field_0xf7 = 0;
dMeter2Info_getString(0x4BD, local_78, NULL);
dMeter2Info_getString(0x4BE, local_98, NULL);
f32 stringLength1 =
dMeter2Info_getStringLength(mDoExt_getMesgFont(), mpSelect_c->getFontSize(),
mpSelect_c->getCharSpace(), local_78);
f32 stringLength2 =
dMeter2Info_getStringLength(mDoExt_getMesgFont(), mpSelect_c->getFontSize(),
mpSelect_c->getCharSpace(), local_98);
f32 length;
if (stringLength1 < stringLength2) {
length = stringLength2;
} else {
length = stringLength1;
}
f32 textBoxWidth = mpSelect_c->getTextBoxWidth();
if (length < textBoxWidth) {
length = mpSelect_c->getTextBoxWidth();
}
snprintf(local_b8, 32,
"\x1B"
"CR[%d]",
(int)(0.5f * (length - stringLength1)));
strcat(local_b8, local_78);
snprintf(cStack_d8, 32,
"\x1B"
"CR[%d]",
(int)(0.5f * (length - stringLength2)));
strcat(cStack_d8, local_98);
mpSelect_c->setString("", local_b8, cStack_d8);
mpSelect_c->setRubyString("", "", "");
mpSelect_c->selAnimeInit(2, field_0xf7 + 1, 0, length, 0);
} else {
mpString->getString(0x5BC, field_0x5c, NULL, NULL, NULL, 0);
}
}
mpExpParent->alphaAnimeStart(0);
}
#pragma pop
/* 801D91E4-801D9264 1D3B24 0080+00 1/0 0/0 0/0 .text explain_open_move__14dMenu_Insect_cFv */
void dMenu_Insect_c::explain_open_move() {
@ -568,7 +533,7 @@ void dMenu_Insect_c::explain_move_init() {
/* 801D9268-801D9290 1D3BA8 0028+00 1/0 0/0 0/0 .text explain_move_move__14dMenu_Insect_cFv */
void dMenu_Insect_c::explain_move_move() {
if (mDoCPd_c::getTrigA(0) == 0 && (mDoCPd_c::getTrig(0) & 0x200) == 0) {
if (mDoCPd_c::getTrigA(PAD_1) == 0 && mDoCPd_c::getTrigB(PAD_1) == 0) {
return;
}
field_0xf3 = 4;
@ -582,18 +547,44 @@ void dMenu_Insect_c::select_move_init() {
}
/* 801D92DC-801D9504 1D3C1C 0228+00 1/0 0/0 0/0 .text select_move_move__14dMenu_Insect_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Insect_c::select_move_move() {
nofralloc
#include "asm/d/menu/d_menu_insect/select_move_move__14dMenu_Insect_cFv.s"
void dMenu_Insect_c::select_move_move() {
mpStick->checkTrigger();
if (mDoCPd_c::getTrigA(PAD_1)) {
field_0xf3 = 4;
if (field_0xf7 == 0) {
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
} else {
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
}
} else if (mDoCPd_c::getTrigB(PAD_1)) {
field_0xf3 = 4;
field_0xf7 = 1;
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
} else if (mpSelect_c->isSelect() && mpStick->checkUpTrigger()) {
if (field_0xf7 == 1) {
field_0xf7 = 0;
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
}
} else if (mpSelect_c->isSelect() && mpStick->checkDownTrigger()) {
if (field_0xf7 == 0) {
field_0xf7 = 1;
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
}
}
if (field_0xf3 == 3) {
mpSelect_c->selAnimeMove(2, field_0xf7 + 1, false);
} else {
mpSelect_c->selAnimeEnd();
}
}
#pragma pop
/* 801D9504-801D95AC 1D3E44 00A8+00 1/0 0/0 0/0 .text explain_close_init__14dMenu_Insect_cFv */
#ifdef NONMATCHING
// Matches with literals
void dMenu_Insect_c::explain_close_init() {
setAButtonString(0);
setBButtonString(0x3f9);
@ -604,16 +595,6 @@ void dMenu_Insect_c::explain_close_init() {
dMeter2Info_set2DVibration();
mpExpParent->alphaAnimeStart(0);
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Insect_c::explain_close_init() {
nofralloc
#include "asm/d/menu/d_menu_insect/explain_close_init__14dMenu_Insect_cFv.s"
}
#pragma pop
#endif
/* 801D95AC-801D9644 1D3EEC 0098+00 1/0 0/0 0/0 .text explain_close_move__14dMenu_Insect_cFv */
void dMenu_Insect_c::explain_close_move() {
@ -630,36 +611,28 @@ void dMenu_Insect_c::explain_close_move() {
}
/* 80396690-80396750 022CF0 00C0+00 1/1 0/0 0/0 .rodata insect_tag$4249 */
static const u64 insect_tag[24] = {
static const u64 insect_tag[MAX_INSECT_NUM] = {
'ari_os', 'ari_ms', 'kag_os', 'kag_ms', 'kab_os', 'kab_ms', 'kam_os', 'kam_mes',
'kuwa_os', 'kuwa_mes', 'dan_os', 'dan_mes', 'cho_os', 'cho_ms', 'tent_os', 'tent_mes',
'kata_os', 'kata_mes', 'nana_os', 'nana_mes', 'bat_os', 'bat_mes', 'tonb_os', 'tonb_mes',
};
/* 80396750-80396810 022DB0 00C0+00 1/1 0/0 0/0 .rodata ageha_tag$4250 */
static const u64 ageha_tag[24] = {
static const u64 ageha_tag[MAX_INSECT_NUM] = {
'ageha00', 'ageha01', 'ageha02', 'ageha03', 'ageha04', 'ageha05', 'ageha06', 'ageha07',
'ageha08', 'ageha09', 'ageha10', 'ageha11', 'ageha12', 'ageha13', 'ageha14', 'ageha15',
'ageha16', 'ageha17', 'ageha18', 'ageha19', 'ageha20', 'ageha21', 'ageha22', 'ageha23',
};
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803968F3 = "zelda_gold_insects.blo";
#pragma pop
/* 801D9644-801D98F0 1D3F84 02AC+00 1/1 0/0 0/0 .text screenSetBase__14dMenu_Insect_cFv
*/
#ifdef NONMATCHING
// Matches with literals
void dMenu_Insect_c::screenSetBase() {
mpScreen = new J2DScreen();
mpScreen->setPriority("zelda_gold_insects.blo", 0x20000, mpArchive);
dPaneClass_showNullPane(mpScreen);
mpParent = new CPaneMgr(mpScreen, 'n_all', 2, NULL);
mpParent->setAlphaRate(0.0f);
for (int i = 0; i < 24; i++) {
for (int i = 0; i < MAX_INSECT_NUM; i++) {
mpINSParent[i] = new CPaneMgr(mpScreen, insect_tag[i], 0, NULL);
}
for (int i = 0; i < 6; i++) {
@ -683,27 +656,8 @@ void dMenu_Insect_c::screenSetBase() {
textBox->setString(0x200, "");
mpString->getString(0x5ba, textBox, NULL, NULL, NULL, 0);
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Insect_c::screenSetBase() {
nofralloc
#include "asm/d/menu/d_menu_insect/screenSetBase__14dMenu_Insect_cFv.s"
}
#pragma pop
#endif
/* ############################################################################################## */
/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8039690A = "zelda_gold_insects_info.blo";
#pragma pop
/* 801D98F0-801D9BD0 1D4230 02E0+00 1/1 0/0 0/0 .text screenSetExplain__14dMenu_Insect_cFv */
#ifdef NONMATCHING
// Matches with literals
void dMenu_Insect_c::screenSetExplain() {
mpExpScreen = new J2DScreen();
mpExpScreen->setPriority("zelda_gold_insects_info.blo", 0x20000, mpArchive);
@ -720,8 +674,8 @@ void dMenu_Insect_c::screenSetExplain() {
field_0x5c = (J2DTextBox*)mpExpScreen->search('ms_for_2');
mpExpScreen->search('w_msg_jp')->hide();
mpExpScreen->search('ms_for_3')->hide();
field_0x54 = (J2DTextBox*)mpExpScreen->search('insects');
field_0x58 = (J2DTextBox*)mpExpScreen->search('insectss');
field_0x54[0] = (J2DPicture*)mpExpScreen->search('insects');
field_0x54[1] = (J2DPicture*)mpExpScreen->search('insectss');
J2DTextBox* textBox = (J2DTextBox*)mpInfoText->getPanePtr();
textBox->setFont(mDoExt_getMesgFont());
J2DTextBox* textBox2 = (J2DTextBox*)mpInfoText->getPanePtr();
@ -729,16 +683,6 @@ void dMenu_Insect_c::screenSetExplain() {
field_0x5c->setFont(mDoExt_getMesgFont());
field_0x5c->setString(0x100, "");
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Insect_c::screenSetExplain() {
nofralloc
#include "asm/d/menu/d_menu_insect/screenSetExplain__14dMenu_Insect_cFv.s"
}
#pragma pop
#endif
/* 80396810-80396838 022E70 0028+00 1/1 0/0 0/0 .rodata text_a_tag$4328 */
static const u64 text_a_tag[5] = {
@ -775,7 +719,7 @@ void dMenu_Insect_c::screenSetDoIcon() {
u8 dMenu_Insect_c::getGetInsectNum() {
u8 insectNum = 0;
u8* insectList = l_itemno_4346;
for (u32 i = 0; i < 24; i++) {
for (u32 i = 0; i < MAX_INSECT_NUM; i++) {
u8 insectId = *insectList;
insectList++;
@ -798,7 +742,7 @@ bool dMenu_Insect_c::isGetInsect(int param_0, int param_1) {
}
/* 80396860-803968C0 022EC0 0060+00 1/1 0/0 0/0 .rodata i_evtID$4383 */
static const u32 i_evtID[24] = {
static const u32 i_evtID[MAX_INSECT_NUM] = {
0x1A5, 0x1A6, 0x1A7, 0x1A8, 0x191, 0x192, 0x19D, 0x19E, 0x195, 0x196, 0x19B, 0x19C,
0x193, 0x194, 0x19F, 0x1A0, 0x1A1, 0x1A2, 0x199, 0x19A, 0x197, 0x198, 0x1A3, 0x1A4,
};
@ -838,17 +782,7 @@ u8 dMenu_Insect_c::isCatchNotGiveInsect(u8 param_0) {
return 0;
}
/* ############################################################################################## */
/* 80454280-80454288 002880 0004+04 1/1 0/0 0/0 .sdata2 @4474 */
SECTION_SDATA2 static f32 lit_4474[1 + 1 /* padding */] = {
0.75f,
/* padding */
0.0f,
};
/* 801D9F8C-801DA1EC 1D48CC 0260+00 1/1 0/0 0/0 .text cursorMove__14dMenu_Insect_cFv */
#ifdef NONMATCHING
// Matches with literals
void dMenu_Insect_c::cursorMove() {
u8 oldF4 = field_0xf4;
u8 oldF5 = field_0xf5;
@ -899,31 +833,19 @@ void dMenu_Insect_c::cursorMove() {
setAButtonString(0);
}
if (dpd != 0) {
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_ITEM, NULL, 1, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_ITEM, NULL, 1, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibration();
} else {
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_ITEM, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_ITEM, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Insect_c::cursorMove() {
nofralloc
#include "asm/d/menu/d_menu_insect/cursorMove__14dMenu_Insect_cFv.s"
}
#pragma pop
#endif
/* 801DA1EC-801DA2FC 1D4B2C 0110+00 3/3 0/0 0/0 .text setCursorPos__14dMenu_Insect_cFv */
void dMenu_Insect_c::setCursorPos() {
int index = field_0xf4 + field_0xf5 * 6;
Vec pos = mpINSParent[index]->getGlobalVtxCenter(false, 0);
mpDrawCursor->setPos(pos.x, pos.y, mpINSParent[index]->getPanePtr(), false);
for (int i = 0; i < 24; i++) {
for (int i = 0; i < MAX_INSECT_NUM; i++) {
if (i == index) {
mpINSParent[i]->scale(g_drawHIO.mInsectListScreen.mSelectInsectScale,
g_drawHIO.mInsectListScreen.mSelectInsectScale);
@ -1010,4 +932,4 @@ extern "C" asm void draw__14dMenu_Insect_cFv() {
nofralloc
#include "asm/d/menu/d_menu_insect/draw__14dMenu_Insect_cFv.s"
}
#pragma pop
#pragma pop

View File

@ -1123,13 +1123,13 @@ void dMenu_Option_c::_move() {
field_0x3ea = 0;
}
if (mDoGph_gInf_c::getFader()->getStatus() == 1) {
if (mDoCPd_c::getTrigA(0) != 0 && field_0x3ef != 3 && field_0x3f3 == 5) {
if (mDoCPd_c::getTrigA(PAD_1) != 0 && field_0x3ef != 3 && field_0x3f3 == 5) {
if (field_0x3f4 == 5 && field_0x3ef != 4 && field_0x3ef != 5 && field_0x3ef != 6 &&
field_0x3ef != 7)
{
if (mDoCPd_c::getTrigStart(0) == 0 && (mDoCPd_c::getTrig(0) & 0x200) == 0) {
if (mDoCPd_c::getTrigUp(0) == 0 && mDoCPd_c::getTrigDown(0) == 0 &&
mDoCPd_c::getTrigLeft(0) == 0 && mDoCPd_c::getTrigRight(0) == 0)
if (mDoCPd_c::getTrigStart(PAD_1) == 0 && mDoCPd_c::getTrigB(PAD_1) == 0) {
if (mDoCPd_c::getTrigUp(PAD_1) == 0 && mDoCPd_c::getTrigDown(PAD_1) == 0 &&
mDoCPd_c::getTrigLeft(PAD_1) == 0 && mDoCPd_c::getTrigRight(PAD_1) == 0)
{
field_0x3f7 = 1;
field_0x3f5 = field_0x3ef;
@ -1141,12 +1141,12 @@ void dMenu_Option_c::_move() {
}
}
}
if (mDoCPd_c::getTrigB(0) != 0 && field_0x3ef != 3 && field_0x3f3 == 5 &&
if (mDoCPd_c::getTrigB(PAD_1) != 0 && field_0x3ef != 3 && field_0x3f3 == 5 &&
field_0x3ef != 4 && field_0x3ef != 5 && field_0x3ef != 6 && field_0x3ef != 7)
{
if (field_0x3f4 == 5 && mDoCPd_c::getTrigStart(0) == 0 && mDoCPd_c::getTrigA(0) == 0 &&
mDoCPd_c::getTrigUp(0) == 0 && mDoCPd_c::getTrigDown(0) == 0 &&
mDoCPd_c::getTrigLeft(0) == 0 && mDoCPd_c::getTrigRight(0) == 0)
if (field_0x3f4 == 5 && mDoCPd_c::getTrigStart(PAD_1) == 0 && mDoCPd_c::getTrigA(PAD_1) == 0 &&
mDoCPd_c::getTrigUp(PAD_1) == 0 && mDoCPd_c::getTrigDown(PAD_1) == 0 &&
mDoCPd_c::getTrigLeft(PAD_1) == 0 && mDoCPd_c::getTrigRight(PAD_1) == 0)
{
field_0x3f7 = 0;
field_0x3f5 = field_0x3ef;
@ -1879,11 +1879,11 @@ void dMenu_Option_c::confirm_move_move() {
bool leftTrigger = checkLeftTrigger();
bool rightTrigger = checkRightTrigger();
if (mDoCPd_c::getTrigA(0) != 0) {
if (mDoCPd_c::getTrigA(PAD_1) != 0) {
yesNoSelectStart();
field_0x3ef = 7;
dMeter2Info_set2DVibrationM();
} else if ((mDoCPd_c::getTrig(0) & 0x200) != 0) {
} else if (mDoCPd_c::getTrigB(PAD_1) != 0) {
field_0x3f9 = 0;
yesnoCancelAnmSet();
field_0x3ef = 7;
@ -2063,7 +2063,7 @@ void dMenu_Option_c::tv_open2_move() {
#ifdef NONMATCHING
// Matches with literals
void dMenu_Option_c::tv_move_move() {
if (mDoCPd_c::getTrigZ(0) != 0 || mDoCPd_c::getTrigA(0) != 0) {
if (mDoCPd_c::getTrigZ(PAD_1) != 0 || mDoCPd_c::getTrigA(PAD_1) != 0) {
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_BACK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
field_0x3f3 = 3;
setAButtonString(0x40C);
@ -3084,7 +3084,7 @@ void dMenu_Option_c::setZButtonString(u16 i_stringID) {
#ifdef NONMATCHING
// Matches with literals
void dMenu_Option_c::changeTVCheck() {
if (mDoCPd_c::getTrigZ(0) != 0) {
if (mDoCPd_c::getTrigZ(PAD_1) != 0) {
Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_CHANGE_WINDOW, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
field_0x3f3 = 0;

View File

@ -1308,6 +1308,72 @@ asm void dMenu_Ring_c::setItem() {
#pragma pop
/* 801EBE58-801EC20C 1E6798 03B4+00 2/2 0/0 0/0 .text setJumpItem__12dMenu_Ring_cFb */
#ifdef NONMATCHING
// Matches with literals
void dMenu_Ring_c::setJumpItem(bool i_useVibrationM) {
for (int i = 0; i < 4; i++) {
if (i == 2) {
setSelectItem(i, field_0x6b4[i]);
} else if (i == field_0x6cd) {
setSelectItem(i, getItem(field_0x6cb, 0));
} else {
setSelectItem(i, getItem(field_0x6b4[i], field_0x6b8[i]));
}
}
if (field_0x6aa != 0xff) {
field_0x518[0] = field_0x38c[field_0x6aa];
field_0x528[0] = field_0x3ec[field_0x6aa];
}
if (field_0x6ab != 0xff) {
field_0x518[1] = field_0x38c[field_0x6ab];
field_0x528[1] = field_0x3ec[field_0x6ab];
}
if (field_0x6ac != 0xff) {
field_0x518[2] = field_0x38c[field_0x6ac];
field_0x528[2] = field_0x3ec[field_0x6ac];
}
if (field_0x6ad != 0xff) {
field_0x518[3] = field_0x38c[field_0x6ad];
field_0x528[3] = field_0x3ec[field_0x6ad];
}
if (field_0x6b3 == 0) {
field_0x538[0] = g_ringHIO.mSelectItemScale;
field_0x538[1] = g_ringHIO.mUnselectItemScale;
if (field_0x6b4[0] != dComIfGs_getSelectItemIndex(0) || field_0x6b8[0] != dComIfGs_getMixItemIndex(0)) {
field_0x674[0] = 1;
}
} else if (field_0x6b3 == 1) {
field_0x538[0] = g_ringHIO.mUnselectItemScale;
field_0x538[1] = g_ringHIO.mSelectItemScale;
if (field_0x6b4[1] != dComIfGs_getSelectItemIndex(1) || field_0x6b8[1] != dComIfGs_getMixItemIndex(1)) {
field_0x674[1] = 1;
}
}
if (field_0x674[0] == 1) {
if (i_useVibrationM) {
dMeter2Info_set2DVibrationM();
}
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
} else if (field_0x674[1] == 1) {
if (i_useVibrationM) {
dMeter2Info_set2DVibrationM();
}
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
} else if (field_0x674[2] == 1) {
if (i_useVibrationM) {
dMeter2Info_set2DVibrationM();
}
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
} else if (field_0x674[3] == 1) {
if (i_useVibrationM) {
dMeter2Info_set2DVibrationM();
}
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_B, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
} else {
Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@ -1316,6 +1382,7 @@ asm void dMenu_Ring_c::setJumpItem(bool param_0) {
#include "asm/d/menu/d_menu_ring/setJumpItem__12dMenu_Ring_cFb.s"
}
#pragma pop
#endif
/* 801EC20C-801EC3B0 1E6B4C 01A4+00 2/2 0/0 0/0 .text setScale__12dMenu_Ring_cFv */
#pragma push
@ -1715,7 +1782,7 @@ SECTION_SDATA2 static f32 lit_6143 = 16.0f;
/* 801EE648-801EEA84 1E8F88 043C+00 2/2 0/0 0/0 .text drawNumber__12dMenu_Ring_cFiiff */
#ifdef NONMATCHING
// regalloc
// Matches with literals
void dMenu_Ring_c::drawNumber(int param_0, int param_1, f32 param_2, f32 param_3) {
if (param_0 > 100) {
param_0 = 100;
@ -1748,12 +1815,12 @@ void dMenu_Ring_c::drawNumber(int param_0, int param_1, f32 param_2, f32 param_3
ResTIMG* texture = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource(
'TIMG', dMeter2Info_getNumberTextureName(param_0 / 100));
mpItemNumTex[0]->changeTexture(texture, 0);
u8 math = param_0 % 100;
param_0 = (u8)(param_0 % 100);
texture = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource(
'TIMG', dMeter2Info_getNumberTextureName(math / 10));
'TIMG', dMeter2Info_getNumberTextureName(param_0 / 10));
mpItemNumTex[1]->changeTexture(texture, 0);
texture = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource(
'TIMG', dMeter2Info_getNumberTextureName(math % 10));
'TIMG', dMeter2Info_getNumberTextureName(param_0 % 10));
mpItemNumTex[2]->changeTexture(texture, 0);
mpItemNumTex[2]->show();
}

View File

@ -13,7 +13,6 @@
#include "d/meter/d_meter_HIO.h"
#include "d/msg/d_msg_string.h"
#include "dol2asm.h"
#include "global.h"
#include "m_Do/m_Do_controller_pad.h"
#include "m_Do/m_Do_graphic.h"
@ -301,10 +300,10 @@ void dMenu_Skill_c::wait_init() {
void dMenu_Skill_c::wait_move() {
u8 oldIndex = mIndex;
if (mDoGph_gInf_c::getFader()->getStatus() == 1) {
if ((mDoCPd_c::getTrig(0) & 0x200) != 0) {
if (mDoCPd_c::getTrigB(PAD_1) != 0) {
mpDrawCursor->offPlayAnime(0);
mStatus = 3;
} else if (mDoCPd_c::getTrigA(0)) {
} else if (mDoCPd_c::getTrigA(PAD_1)) {
mProcess = PROC_WAIT_MOVE;
Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_OPEN, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
@ -377,13 +376,13 @@ void dMenu_Skill_c::read_move_init() {
/* 801F8150-801F8218 1F2A90 00C8+00 1/0 0/0 0/0 .text read_move_move__13dMenu_Skill_cFv
*/
void dMenu_Skill_c::read_move_move() {
if (mDoCPd_c::getTrigA(0) != 0) {
if (mDoCPd_c::getTrigA(PAD_1) != 0) {
Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
dMeter2Info_set2DVibration();
mProcess = PROC_MOVE_MOVE;
} else if ((mDoCPd_c::getTrig(0) & 0x200) != 0) {
} else if (mDoCPd_c::getTrigB(PAD_1) != 0) {
Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
dMeter2Info_set2DVibration();

View File

@ -604,7 +604,7 @@ void dMeterMap_c::ctrlShowMap() {
}
}
} else if (!mDoCPd_c::getTrigUp(0) && !mDoCPd_c::getTrigDown(0)) {
} else if (!mDoCPd_c::getTrigUp(PAD_1) && !mDoCPd_c::getTrigDown(PAD_1)) {
keyCheck();
}
}

View File

@ -158,7 +158,7 @@ void dScnLogo_c::progSelDraw() {
}
}
if (mDoCPd_c::getTrigA(0) || mTimer == 0) {
if (mDoCPd_c::getTrigA(PAD_1) || mTimer == 0) {
if (field_0x209 == 0) {
mProgressiveSel->getPicture()->changeTexture(mProgressivePro, 0);
setProgressiveMode(1);
@ -330,7 +330,7 @@ void dScnLogo_c::warningDispDraw() {
}
if (mTimer == 0 ||
mDoCPd_c::getTrig(0) & (CButton::A | CButton::B | CButton::X | CButton::Y | CButton::START |
mDoCPd_c::getTrig(PAD_1) & (CButton::A | CButton::B | CButton::X | CButton::Y | CButton::START |
CButton::Z | CButton::L | CButton::R | CButton::DPAD_LEFT |
CButton::DPAD_RIGHT | CButton::DPAD_DOWN | CButton::DPAD_UP)) {
mExecCommand = EXEC_WARNING_OUT;

View File

@ -812,7 +812,7 @@ BOOL dShopSystem_c::isSoldOutItemFlag(int flag) {
* checkController__13dShopSystem_cFUcP10dMsgFlow_c */
int dShopSystem_c::checkController(u8 seq, dMsgFlow_c* p_flow) {
if (mWaitTimer != 0) {
if (mDoCPd_c::getTrigA(0)) {
if (mDoCPd_c::getTrigA(PAD_1)) {
dMsgObject_setShopWaitTimer(1);
}
return 0;
@ -840,14 +840,14 @@ int dShopSystem_c::checkController(u8 seq, dMsgFlow_c* p_flow) {
return msg->getSelectPushFlag() == 2 ? 2 : 1;
}
if (mDoCPd_c::getTrigA(0)) {
if (mDoCPd_c::getTrigA(PAD_1)) {
if (msg->getStatus() != 6 && msg->getStatus() != 8 && msg->getStatus() != 9 &&
msg->getStatus() != 20 && seq != SEQ_WAIT) {
return 1;
}
}
if (mDoCPd_c::getTrigB(0)) {
if (mDoCPd_c::getTrigB(PAD_1)) {
if (seq != SEQ_SELECT_WAIT) {
mLastCursorPos = mCursorPos;
mCursorPos = 0;

View File

@ -10,11 +10,6 @@
// Types:
//
struct J2DPane {
/* 802F7100 */ void getBounds();
/* 802F7FCC */ void animationTransform();
};
struct JKRArchive {};
struct dSelect_cursor_c {
@ -143,7 +138,6 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void strcpy();
extern "C" extern void* __vt__10J2DAnmBase[4];
extern "C" extern void* __vt__10JUTNameTab[3];
extern "C" extern void* __vt__14J2DAnmColorKey[5];