diff --git a/asm/d/menu/d_menu_item_explain/__ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb.s b/asm/d/menu/d_menu_item_explain/__ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb.s deleted file mode 100644 index fbc68b18ff1..00000000000 --- a/asm/d/menu/d_menu_item_explain/__ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb.s +++ /dev/null @@ -1,577 +0,0 @@ -lbl_801DA754: -/* 801DA754 94 21 FF 10 */ stwu r1, -0xf0(r1) -/* 801DA758 7C 08 02 A6 */ mflr r0 -/* 801DA75C 90 01 00 F4 */ stw r0, 0xf4(r1) -/* 801DA760 DB E1 00 E0 */ stfd f31, 0xe0(r1) -/* 801DA764 F3 E1 00 E8 */ psq_st f31, 232(r1), 0, 0 /* qr0 */ -/* 801DA768 DB C1 00 D0 */ stfd f30, 0xd0(r1) -/* 801DA76C F3 C1 00 D8 */ psq_st f30, 216(r1), 0, 0 /* qr0 */ -/* 801DA770 DB A1 00 C0 */ stfd f29, 0xc0(r1) -/* 801DA774 F3 A1 00 C8 */ psq_st f29, 200(r1), 0, 0 /* qr0 */ -/* 801DA778 DB 81 00 B0 */ stfd f28, 0xb0(r1) -/* 801DA77C F3 81 00 B8 */ psq_st f28, 184(r1), 0, 0 /* qr0 */ -/* 801DA780 DB 61 00 A0 */ stfd f27, 0xa0(r1) -/* 801DA784 F3 61 00 A8 */ psq_st f27, 168(r1), 0, 0 /* qr0 */ -/* 801DA788 DB 41 00 90 */ stfd f26, 0x90(r1) -/* 801DA78C F3 41 00 98 */ psq_st f26, 152(r1), 0, 0 /* qr0 */ -/* 801DA790 DB 21 00 80 */ stfd f25, 0x80(r1) -/* 801DA794 F3 21 00 88 */ psq_st f25, 136(r1), 0, 0 /* qr0 */ -/* 801DA798 39 61 00 80 */ addi r11, r1, 0x80 -/* 801DA79C 48 18 7A 21 */ bl _savegpr_21 -/* 801DA7A0 7C 7F 1B 78 */ mr r31, r3 -/* 801DA7A4 7C B5 2B 78 */ mr r21, r5 -/* 801DA7A8 7C DE 33 78 */ mr r30, r6 -/* 801DA7AC 7C FD 3B 78 */ mr r29, r7 -/* 801DA7B0 3C 60 80 3C */ lis r3, __vt__19dMenu_ItemExplain_c@ha /* 0x803BD9F4@ha */ -/* 801DA7B4 38 03 D9 F4 */ addi r0, r3, __vt__19dMenu_ItemExplain_c@l /* 0x803BD9F4@l */ -/* 801DA7B8 90 1F 00 00 */ stw r0, 0(r31) -/* 801DA7BC 90 9F 00 04 */ stw r4, 4(r31) -/* 801DA7C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801DA7C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801DA7C8 80 03 5C 98 */ lwz r0, 0x5c98(r3) -/* 801DA7CC 90 1F 00 08 */ stw r0, 8(r31) -/* 801DA7D0 93 DF 00 B8 */ stw r30, 0xb8(r31) -/* 801DA7D4 80 7F 00 04 */ lwz r3, 4(r31) -/* 801DA7D8 48 0F 3F AD */ bl getTotalFreeSize__7JKRHeapFv -/* 801DA7DC 38 00 00 00 */ li r0, 0 -/* 801DA7E0 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 801DA7E4 90 1F 00 CC */ stw r0, 0xcc(r31) -/* 801DA7E8 90 1F 00 D0 */ stw r0, 0xd0(r31) -/* 801DA7EC 90 1F 00 C4 */ stw r0, 0xc4(r31) -/* 801DA7F0 98 1F 00 E1 */ stb r0, 0xe1(r31) -/* 801DA7F4 98 1F 00 E2 */ stb r0, 0xe2(r31) -/* 801DA7F8 98 1F 00 E0 */ stb r0, 0xe0(r31) -/* 801DA7FC 98 1F 00 E7 */ stb r0, 0xe7(r31) -/* 801DA800 98 1F 00 E3 */ stb r0, 0xe3(r31) -/* 801DA804 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801DA808 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801DA80C 80 03 5C C0 */ lwz r0, 0x5cc0(r3) -/* 801DA810 7C 15 00 40 */ cmplw r21, r0 -/* 801DA814 40 82 00 10 */ bne lbl_801DA824 -/* 801DA818 38 00 00 02 */ li r0, 2 -/* 801DA81C 98 1F 00 E5 */ stb r0, 0xe5(r31) -/* 801DA820 48 00 00 0C */ b lbl_801DA82C -lbl_801DA824: -/* 801DA824 38 00 00 01 */ li r0, 1 -/* 801DA828 98 1F 00 E5 */ stb r0, 0xe5(r31) -lbl_801DA82C: -/* 801DA82C 38 80 00 00 */ li r4, 0 -/* 801DA830 98 9F 00 E6 */ stb r4, 0xe6(r31) -/* 801DA834 98 9F 00 DF */ stb r4, 0xdf(r31) -/* 801DA838 98 9F 00 DE */ stb r4, 0xde(r31) -/* 801DA83C 98 9F 00 E4 */ stb r4, 0xe4(r31) -/* 801DA840 C0 02 A8 88 */ lfs f0, lit_4062(r2) -/* 801DA844 D0 1F 00 D4 */ stfs f0, 0xd4(r31) -/* 801DA848 D0 1F 00 D8 */ stfs f0, 0xd8(r31) -/* 801DA84C 90 9F 00 74 */ stw r4, 0x74(r31) -/* 801DA850 90 9F 00 14 */ stw r4, 0x14(r31) -/* 801DA854 7C 83 23 78 */ mr r3, r4 -/* 801DA858 38 00 00 04 */ li r0, 4 -/* 801DA85C 7C 09 03 A6 */ mtctr r0 -lbl_801DA860: -/* 801DA860 38 03 00 28 */ addi r0, r3, 0x28 -/* 801DA864 7C 9F 01 2E */ stwx r4, r31, r0 -/* 801DA868 38 63 00 04 */ addi r3, r3, 4 -/* 801DA86C 42 00 FF F4 */ bdnz lbl_801DA860 -/* 801DA870 38 60 00 00 */ li r3, 0 -/* 801DA874 38 80 00 00 */ li r4, 0 -/* 801DA878 38 00 00 02 */ li r0, 2 -/* 801DA87C 7C 09 03 A6 */ mtctr r0 -lbl_801DA880: -/* 801DA880 7C BF 1A 14 */ add r5, r31, r3 -/* 801DA884 90 85 00 44 */ stw r4, 0x44(r5) -/* 801DA888 90 85 00 A0 */ stw r4, 0xa0(r5) -/* 801DA88C 38 63 00 04 */ addi r3, r3, 4 -/* 801DA890 42 00 FF F0 */ bdnz lbl_801DA880 -/* 801DA894 38 80 00 00 */ li r4, 0 -/* 801DA898 90 9F 00 50 */ stw r4, 0x50(r31) -/* 801DA89C 90 9F 00 5C */ stw r4, 0x5c(r31) -/* 801DA8A0 38 60 00 00 */ li r3, 0 -/* 801DA8A4 38 00 00 03 */ li r0, 3 -/* 801DA8A8 7C 09 03 A6 */ mtctr r0 -lbl_801DA8AC: -/* 801DA8AC 38 03 00 60 */ addi r0, r3, 0x60 -/* 801DA8B0 7C 9F 01 2E */ stwx r4, r31, r0 -/* 801DA8B4 38 63 00 04 */ addi r3, r3, 4 -/* 801DA8B8 42 00 FF F4 */ bdnz lbl_801DA8AC -/* 801DA8BC 38 00 00 00 */ li r0, 0 -/* 801DA8C0 B0 1F 00 DC */ sth r0, 0xdc(r31) -/* 801DA8C4 38 60 00 2C */ li r3, 0x2c -/* 801DA8C8 48 0F 43 85 */ bl __nw__FUl -/* 801DA8CC 7C 60 1B 79 */ or. r0, r3, r3 -/* 801DA8D0 41 82 00 10 */ beq lbl_801DA8E0 -/* 801DA8D4 38 80 00 01 */ li r4, 1 -/* 801DA8D8 48 06 F3 C9 */ bl __ct__12dMsgString_cFUc -/* 801DA8DC 7C 60 1B 78 */ mr r0, r3 -lbl_801DA8E0: -/* 801DA8E0 90 1F 00 0C */ stw r0, 0xc(r31) -/* 801DA8E4 38 60 00 10 */ li r3, 0x10 -/* 801DA8E8 48 0F 43 65 */ bl __nw__FUl -/* 801DA8EC 7C 60 1B 79 */ or. r0, r3, r3 -/* 801DA8F0 41 82 00 0C */ beq lbl_801DA8FC -/* 801DA8F4 4B FD 40 45 */ bl __ct__15dKantera_icon_cFv -/* 801DA8F8 7C 60 1B 78 */ mr r0, r3 -lbl_801DA8FC: -/* 801DA8FC 90 1F 00 6C */ stw r0, 0x6c(r31) -/* 801DA900 38 60 01 18 */ li r3, 0x118 -/* 801DA904 48 0F 43 49 */ bl __nw__FUl -/* 801DA908 7C 60 1B 79 */ or. r0, r3, r3 -/* 801DA90C 41 82 00 0C */ beq lbl_801DA918 -/* 801DA910 48 11 DB 89 */ bl __ct__9J2DScreenFv -/* 801DA914 7C 60 1B 78 */ mr r0, r3 -lbl_801DA918: -/* 801DA918 90 1F 00 70 */ stw r0, 0x70(r31) -/* 801DA91C 80 7F 00 70 */ lwz r3, 0x70(r31) -/* 801DA920 3C 80 80 39 */ lis r4, d_menu_d_menu_item_explain__stringBase0@ha /* 0x80396990@ha */ -/* 801DA924 38 84 69 90 */ addi r4, r4, d_menu_d_menu_item_explain__stringBase0@l /* 0x80396990@l */ -/* 801DA928 3C A0 00 02 */ lis r5, 2 -/* 801DA92C 80 DF 00 08 */ lwz r6, 8(r31) -/* 801DA930 48 11 DD 19 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 801DA934 38 60 00 6C */ li r3, 0x6c -/* 801DA938 48 0F 43 15 */ bl __nw__FUl -/* 801DA93C 7C 60 1B 79 */ or. r0, r3, r3 -/* 801DA940 41 82 00 24 */ beq lbl_801DA964 -/* 801DA944 80 9F 00 70 */ lwz r4, 0x70(r31) -/* 801DA948 3C A0 5F 61 */ lis r5, 0x5F61 /* 0x5F616C6C@ha */ -/* 801DA94C 38 C5 6C 6C */ addi r6, r5, 0x6C6C /* 0x5F616C6C@l */ -/* 801DA950 38 A0 00 6E */ li r5, 0x6e -/* 801DA954 38 E0 00 02 */ li r7, 2 -/* 801DA958 39 00 00 00 */ li r8, 0 -/* 801DA95C 48 07 90 29 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801DA960 7C 60 1B 78 */ mr r0, r3 -lbl_801DA964: -/* 801DA964 90 1F 00 3C */ stw r0, 0x3c(r31) -/* 801DA968 38 00 00 00 */ li r0, 0 -/* 801DA96C 90 1F 00 40 */ stw r0, 0x40(r31) -/* 801DA970 38 60 00 6C */ li r3, 0x6c -/* 801DA974 48 0F 42 D9 */ bl __nw__FUl -/* 801DA978 7C 60 1B 79 */ or. r0, r3, r3 -/* 801DA97C 41 82 00 28 */ beq lbl_801DA9A4 -/* 801DA980 80 9F 00 70 */ lwz r4, 0x70(r31) -/* 801DA984 3C A0 65 6C */ lis r5, 0x656C /* 0x656C5F6E@ha */ -/* 801DA988 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x656C5F6E@l */ -/* 801DA98C 3C A0 00 6C */ lis r5, 0x006C /* 0x006C6162@ha */ -/* 801DA990 38 A5 61 62 */ addi r5, r5, 0x6162 /* 0x006C6162@l */ -/* 801DA994 38 E0 00 00 */ li r7, 0 -/* 801DA998 39 00 00 00 */ li r8, 0 -/* 801DA99C 48 07 8F E9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801DA9A0 7C 60 1B 78 */ mr r0, r3 -lbl_801DA9A4: -/* 801DA9A4 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 801DA9A8 C0 02 A8 88 */ lfs f0, lit_4062(r2) -/* 801DA9AC D0 1F 00 C0 */ stfs f0, 0xc0(r31) -/* 801DA9B0 38 00 00 00 */ li r0, 0 -/* 801DA9B4 90 1F 00 78 */ stw r0, 0x78(r31) -/* 801DA9B8 C0 02 A8 8C */ lfs f0, lit_4063(r2) -/* 801DA9BC D0 1F 00 BC */ stfs f0, 0xbc(r31) -/* 801DA9C0 38 60 00 6C */ li r3, 0x6c -/* 801DA9C4 48 0F 42 89 */ bl __nw__FUl -/* 801DA9C8 7C 60 1B 79 */ or. r0, r3, r3 -/* 801DA9CC 41 82 00 28 */ beq lbl_801DA9F4 -/* 801DA9D0 80 9F 00 70 */ lwz r4, 0x70(r31) -/* 801DA9D4 3C A0 65 78 */ lis r5, 0x6578 /* 0x65787431@ha */ -/* 801DA9D8 38 C5 74 31 */ addi r6, r5, 0x7431 /* 0x65787431@l */ -/* 801DA9DC 3C A0 00 69 */ lis r5, 0x0069 /* 0x00695F74@ha */ -/* 801DA9E0 38 A5 5F 74 */ addi r5, r5, 0x5F74 /* 0x00695F74@l */ -/* 801DA9E4 38 E0 00 00 */ li r7, 0 -/* 801DA9E8 39 00 00 00 */ li r8, 0 -/* 801DA9EC 48 07 8F 99 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801DA9F0 7C 60 1B 78 */ mr r0, r3 -lbl_801DA9F4: -/* 801DA9F4 90 1F 00 10 */ stw r0, 0x10(r31) -/* 801DA9F8 80 7F 00 70 */ lwz r3, 0x70(r31) -/* 801DA9FC 3C 80 65 78 */ lis r4, 0x6578 /* 0x65787434@ha */ -/* 801DAA00 38 C4 74 34 */ addi r6, r4, 0x7434 /* 0x65787434@l */ -/* 801DAA04 3C 80 00 69 */ lis r4, 0x0069 /* 0x00695F74@ha */ -/* 801DAA08 38 A4 5F 74 */ addi r5, r4, 0x5F74 /* 0x00695F74@l */ -/* 801DAA0C 81 83 00 00 */ lwz r12, 0(r3) -/* 801DAA10 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801DAA14 7D 89 03 A6 */ mtctr r12 -/* 801DAA18 4E 80 04 21 */ bctrl -/* 801DAA1C 38 00 00 00 */ li r0, 0 -/* 801DAA20 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801DAA24 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 801DAA28 82 C3 00 04 */ lwz r22, 4(r3) -/* 801DAA2C 4B E3 9F C5 */ bl mDoExt_getMesgFont__Fv -/* 801DAA30 7C 64 1B 78 */ mr r4, r3 -/* 801DAA34 7E C3 B3 78 */ mr r3, r22 -/* 801DAA38 81 96 00 00 */ lwz r12, 0(r22) -/* 801DAA3C 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801DAA40 7D 89 03 A6 */ mtctr r12 -/* 801DAA44 4E 80 04 21 */ bctrl -/* 801DAA48 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 801DAA4C 80 63 00 04 */ lwz r3, 4(r3) -/* 801DAA50 38 80 02 00 */ li r4, 0x200 -/* 801DAA54 3C A0 80 39 */ lis r5, d_menu_d_menu_item_explain__stringBase0@ha /* 0x80396990@ha */ -/* 801DAA58 38 A5 69 90 */ addi r5, r5, d_menu_d_menu_item_explain__stringBase0@l /* 0x80396990@l */ -/* 801DAA5C 38 A5 00 1B */ addi r5, r5, 0x1b -/* 801DAA60 4C C6 31 82 */ crclr 6 -/* 801DAA64 48 12 5C E9 */ bl setString__10J2DTextBoxFsPCce -/* 801DAA68 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 801DAA6C 48 07 AB 5D */ bl show__13CPaneMgrAlphaFv -/* 801DAA70 3B 80 00 00 */ li r28, 0 -/* 801DAA74 3B 20 00 00 */ li r25, 0 -/* 801DAA78 3B 40 00 00 */ li r26, 0 -/* 801DAA7C 3C 60 80 39 */ lis r3, name_tag@ha /* 0x80396950@ha */ -/* 801DAA80 3A E3 69 50 */ addi r23, r3, name_tag@l /* 0x80396950@l */ -/* 801DAA84 3C 60 80 39 */ lis r3, d_menu_d_menu_item_explain__stringBase0@ha /* 0x80396990@ha */ -/* 801DAA88 3A C3 69 90 */ addi r22, r3, d_menu_d_menu_item_explain__stringBase0@l /* 0x80396990@l */ -lbl_801DAA8C: -/* 801DAA8C 38 60 00 6C */ li r3, 0x6c -/* 801DAA90 48 0F 41 BD */ bl __nw__FUl -/* 801DAA94 7C 60 1B 79 */ or. r0, r3, r3 -/* 801DAA98 41 82 00 2C */ beq lbl_801DAAC4 -/* 801DAA9C 80 9F 00 70 */ lwz r4, 0x70(r31) -/* 801DAAA0 3C A0 80 39 */ lis r5, fame_tag@ha /* 0x80396970@ha */ -/* 801DAAA4 38 05 69 70 */ addi r0, r5, fame_tag@l /* 0x80396970@l */ -/* 801DAAA8 7C C0 D2 14 */ add r6, r0, r26 -/* 801DAAAC 80 A6 00 00 */ lwz r5, 0(r6) -/* 801DAAB0 80 C6 00 04 */ lwz r6, 4(r6) -/* 801DAAB4 38 E0 00 00 */ li r7, 0 -/* 801DAAB8 39 00 00 00 */ li r8, 0 -/* 801DAABC 48 07 8E C9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801DAAC0 7C 60 1B 78 */ mr r0, r3 -lbl_801DAAC4: -/* 801DAAC4 3B 79 00 18 */ addi r27, r25, 0x18 -/* 801DAAC8 7C 1F D9 2E */ stwx r0, r31, r27 -/* 801DAACC 80 7F 00 70 */ lwz r3, 0x70(r31) -/* 801DAAD0 7C 97 D2 14 */ add r4, r23, r26 -/* 801DAAD4 80 A4 00 00 */ lwz r5, 0(r4) -/* 801DAAD8 80 C4 00 04 */ lwz r6, 4(r4) -/* 801DAADC 81 83 00 00 */ lwz r12, 0(r3) -/* 801DAAE0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801DAAE4 7D 89 03 A6 */ mtctr r12 -/* 801DAAE8 4E 80 04 21 */ bctrl -/* 801DAAEC 38 00 00 00 */ li r0, 0 -/* 801DAAF0 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801DAAF4 7C 7F D8 2E */ lwzx r3, r31, r27 -/* 801DAAF8 83 03 00 04 */ lwz r24, 4(r3) -/* 801DAAFC 4B E3 9E F5 */ bl mDoExt_getMesgFont__Fv -/* 801DAB00 7C 64 1B 78 */ mr r4, r3 -/* 801DAB04 7F 03 C3 78 */ mr r3, r24 -/* 801DAB08 81 98 00 00 */ lwz r12, 0(r24) -/* 801DAB0C 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801DAB10 7D 89 03 A6 */ mtctr r12 -/* 801DAB14 4E 80 04 21 */ bctrl -/* 801DAB18 7C 7F D8 2E */ lwzx r3, r31, r27 -/* 801DAB1C 80 63 00 04 */ lwz r3, 4(r3) -/* 801DAB20 38 80 00 20 */ li r4, 0x20 -/* 801DAB24 38 B6 00 1B */ addi r5, r22, 0x1b -/* 801DAB28 4C C6 31 82 */ crclr 6 -/* 801DAB2C 48 12 5C 21 */ bl setString__10J2DTextBoxFsPCce -/* 801DAB30 3B 9C 00 01 */ addi r28, r28, 1 -/* 801DAB34 2C 1C 00 04 */ cmpwi r28, 4 -/* 801DAB38 3B 39 00 04 */ addi r25, r25, 4 -/* 801DAB3C 3B 5A 00 08 */ addi r26, r26, 8 -/* 801DAB40 41 80 FF 4C */ blt lbl_801DAA8C -/* 801DAB44 38 60 00 6C */ li r3, 0x6c -/* 801DAB48 48 0F 41 05 */ bl __nw__FUl -/* 801DAB4C 7C 60 1B 79 */ or. r0, r3, r3 -/* 801DAB50 41 82 00 28 */ beq lbl_801DAB78 -/* 801DAB54 80 9F 00 70 */ lwz r4, 0x70(r31) -/* 801DAB58 3C A0 6F 6E */ lis r5, 0x6F6E /* 0x6F6E5F70@ha */ -/* 801DAB5C 38 C5 5F 70 */ addi r6, r5, 0x5F70 /* 0x6F6E5F70@l */ -/* 801DAB60 3C A0 69 5F */ lis r5, 0x695F /* 0x695F6963@ha */ -/* 801DAB64 38 A5 69 63 */ addi r5, r5, 0x6963 /* 0x695F6963@l */ -/* 801DAB68 38 E0 00 00 */ li r7, 0 -/* 801DAB6C 39 00 00 00 */ li r8, 0 -/* 801DAB70 48 07 8E 15 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 801DAB74 7C 60 1B 78 */ mr r0, r3 -lbl_801DAB78: -/* 801DAB78 90 1F 00 38 */ stw r0, 0x38(r31) -/* 801DAB7C 3A A0 00 00 */ li r21, 0 -/* 801DAB80 3B 20 00 00 */ li r25, 0 -lbl_801DAB84: -/* 801DAB84 80 7F 00 04 */ lwz r3, 4(r31) -/* 801DAB88 38 80 0C 00 */ li r4, 0xc00 -/* 801DAB8C 38 A0 00 20 */ li r5, 0x20 -/* 801DAB90 48 0F 39 45 */ bl alloc__7JKRHeapFUli -/* 801DAB94 38 19 00 88 */ addi r0, r25, 0x88 -/* 801DAB98 7C 7F 01 2E */ stwx r3, r31, r0 -/* 801DAB9C 3A B5 00 01 */ addi r21, r21, 1 -/* 801DABA0 2C 15 00 04 */ cmpwi r21, 4 -/* 801DABA4 3B 39 00 04 */ addi r25, r25, 4 -/* 801DABA8 41 80 FF DC */ blt lbl_801DAB84 -/* 801DABAC 38 60 01 50 */ li r3, 0x150 -/* 801DABB0 48 0F 40 9D */ bl __nw__FUl -/* 801DABB4 7C 76 1B 79 */ or. r22, r3, r3 -/* 801DABB8 41 82 00 68 */ beq lbl_801DAC20 -/* 801DABBC 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DABC0 80 63 00 04 */ lwz r3, 4(r3) -/* 801DABC4 38 80 00 00 */ li r4, 0 -/* 801DABC8 81 83 00 00 */ lwz r12, 0(r3) -/* 801DABCC 81 8C 01 20 */ lwz r12, 0x120(r12) -/* 801DABD0 7D 89 03 A6 */ mtctr r12 -/* 801DABD4 4E 80 04 21 */ bctrl -/* 801DABD8 81 03 00 20 */ lwz r8, 0x20(r3) -/* 801DABDC 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DABE0 C0 23 00 38 */ lfs f1, 0x38(r3) -/* 801DABE4 C0 43 00 34 */ lfs f2, 0x34(r3) -/* 801DABE8 C0 02 A8 88 */ lfs f0, lit_4062(r2) -/* 801DABEC D0 01 00 38 */ stfs f0, 0x38(r1) -/* 801DABF0 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 801DABF4 D0 41 00 40 */ stfs f2, 0x40(r1) -/* 801DABF8 D0 21 00 44 */ stfs f1, 0x44(r1) -/* 801DABFC 7E C3 B3 78 */ mr r3, r22 -/* 801DAC00 3C 80 6F 6E */ lis r4, 0x6F6E /* 0x6F6E5F31@ha */ -/* 801DAC04 38 C4 5F 31 */ addi r6, r4, 0x5F31 /* 0x6F6E5F31@l */ -/* 801DAC08 3C 80 69 5F */ lis r4, 0x695F /* 0x695F6963@ha */ -/* 801DAC0C 38 A4 69 63 */ addi r5, r4, 0x6963 /* 0x695F6963@l */ -/* 801DAC10 38 E1 00 38 */ addi r7, r1, 0x38 -/* 801DAC14 39 20 00 00 */ li r9, 0 -/* 801DAC18 48 12 1B E9 */ bl func_802FC800 -/* 801DAC1C 7C 76 1B 78 */ mr r22, r3 -lbl_801DAC20: -/* 801DAC20 92 DF 00 7C */ stw r22, 0x7c(r31) -/* 801DAC24 80 7F 00 7C */ lwz r3, 0x7c(r31) -/* 801DAC28 38 80 00 04 */ li r4, 4 -/* 801DAC2C 48 11 CA CD */ bl setBasePosition__7J2DPaneF15J2DBasePosition -/* 801DAC30 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DAC34 80 63 00 04 */ lwz r3, 4(r3) -/* 801DAC38 80 9F 00 7C */ lwz r4, 0x7c(r31) -/* 801DAC3C 48 11 BA 31 */ bl appendChild__7J2DPaneFP7J2DPane -/* 801DAC40 38 60 01 50 */ li r3, 0x150 -/* 801DAC44 48 0F 40 09 */ bl __nw__FUl -/* 801DAC48 7C 76 1B 79 */ or. r22, r3, r3 -/* 801DAC4C 41 82 00 68 */ beq lbl_801DACB4 -/* 801DAC50 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DAC54 80 63 00 04 */ lwz r3, 4(r3) -/* 801DAC58 38 80 00 00 */ li r4, 0 -/* 801DAC5C 81 83 00 00 */ lwz r12, 0(r3) -/* 801DAC60 81 8C 01 20 */ lwz r12, 0x120(r12) -/* 801DAC64 7D 89 03 A6 */ mtctr r12 -/* 801DAC68 4E 80 04 21 */ bctrl -/* 801DAC6C 81 03 00 20 */ lwz r8, 0x20(r3) -/* 801DAC70 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DAC74 C0 23 00 38 */ lfs f1, 0x38(r3) -/* 801DAC78 C0 43 00 34 */ lfs f2, 0x34(r3) -/* 801DAC7C C0 02 A8 88 */ lfs f0, lit_4062(r2) -/* 801DAC80 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 801DAC84 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 801DAC88 D0 41 00 30 */ stfs f2, 0x30(r1) -/* 801DAC8C D0 21 00 34 */ stfs f1, 0x34(r1) -/* 801DAC90 7E C3 B3 78 */ mr r3, r22 -/* 801DAC94 3C 80 6F 6E */ lis r4, 0x6F6E /* 0x6F6E5F32@ha */ -/* 801DAC98 38 C4 5F 32 */ addi r6, r4, 0x5F32 /* 0x6F6E5F32@l */ -/* 801DAC9C 3C 80 69 5F */ lis r4, 0x695F /* 0x695F6963@ha */ -/* 801DACA0 38 A4 69 63 */ addi r5, r4, 0x6963 /* 0x695F6963@l */ -/* 801DACA4 38 E1 00 28 */ addi r7, r1, 0x28 -/* 801DACA8 39 20 00 00 */ li r9, 0 -/* 801DACAC 48 12 1B 55 */ bl func_802FC800 -/* 801DACB0 7C 76 1B 78 */ mr r22, r3 -lbl_801DACB4: -/* 801DACB4 92 DF 00 80 */ stw r22, 0x80(r31) -/* 801DACB8 80 7F 00 80 */ lwz r3, 0x80(r31) -/* 801DACBC 38 80 00 04 */ li r4, 4 -/* 801DACC0 48 11 CA 39 */ bl setBasePosition__7J2DPaneF15J2DBasePosition -/* 801DACC4 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DACC8 80 63 00 04 */ lwz r3, 4(r3) -/* 801DACCC 80 9F 00 80 */ lwz r4, 0x80(r31) -/* 801DACD0 48 11 B9 9D */ bl appendChild__7J2DPaneFP7J2DPane -/* 801DACD4 38 60 01 50 */ li r3, 0x150 -/* 801DACD8 48 0F 3F 75 */ bl __nw__FUl -/* 801DACDC 7C 76 1B 79 */ or. r22, r3, r3 -/* 801DACE0 41 82 00 68 */ beq lbl_801DAD48 -/* 801DACE4 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DACE8 80 63 00 04 */ lwz r3, 4(r3) -/* 801DACEC 38 80 00 00 */ li r4, 0 -/* 801DACF0 81 83 00 00 */ lwz r12, 0(r3) -/* 801DACF4 81 8C 01 20 */ lwz r12, 0x120(r12) -/* 801DACF8 7D 89 03 A6 */ mtctr r12 -/* 801DACFC 4E 80 04 21 */ bctrl -/* 801DAD00 81 03 00 20 */ lwz r8, 0x20(r3) -/* 801DAD04 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DAD08 C0 23 00 38 */ lfs f1, 0x38(r3) -/* 801DAD0C C0 43 00 34 */ lfs f2, 0x34(r3) -/* 801DAD10 C0 02 A8 88 */ lfs f0, lit_4062(r2) -/* 801DAD14 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 801DAD18 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 801DAD1C D0 41 00 20 */ stfs f2, 0x20(r1) -/* 801DAD20 D0 21 00 24 */ stfs f1, 0x24(r1) -/* 801DAD24 7E C3 B3 78 */ mr r3, r22 -/* 801DAD28 3C 80 6F 6E */ lis r4, 0x6F6E /* 0x6F6E5F33@ha */ -/* 801DAD2C 38 C4 5F 33 */ addi r6, r4, 0x5F33 /* 0x6F6E5F33@l */ -/* 801DAD30 3C 80 69 5F */ lis r4, 0x695F /* 0x695F6963@ha */ -/* 801DAD34 38 A4 69 63 */ addi r5, r4, 0x6963 /* 0x695F6963@l */ -/* 801DAD38 38 E1 00 18 */ addi r7, r1, 0x18 -/* 801DAD3C 39 20 00 00 */ li r9, 0 -/* 801DAD40 48 12 1A C1 */ bl func_802FC800 -/* 801DAD44 7C 76 1B 78 */ mr r22, r3 -lbl_801DAD48: -/* 801DAD48 92 DF 00 84 */ stw r22, 0x84(r31) -/* 801DAD4C 80 7F 00 84 */ lwz r3, 0x84(r31) -/* 801DAD50 38 80 00 04 */ li r4, 4 -/* 801DAD54 48 11 C9 A5 */ bl setBasePosition__7J2DPaneF15J2DBasePosition -/* 801DAD58 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DAD5C 80 63 00 04 */ lwz r3, 4(r3) -/* 801DAD60 80 9F 00 84 */ lwz r4, 0x84(r31) -/* 801DAD64 48 11 B9 09 */ bl appendChild__7J2DPaneFP7J2DPane -/* 801DAD68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801DAD6C 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801DAD70 82 DC 5D 30 */ lwz r22, 0x5d30(r28) -/* 801DAD74 38 60 00 00 */ li r3, 0 -/* 801DAD78 48 04 35 51 */ bl dMeter2Info_getNumberTextureName__Fi -/* 801DAD7C 7C 65 1B 78 */ mr r5, r3 -/* 801DAD80 7E C3 B3 78 */ mr r3, r22 -/* 801DAD84 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 801DAD88 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 801DAD8C 81 96 00 00 */ lwz r12, 0(r22) -/* 801DAD90 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 801DAD94 7D 89 03 A6 */ mtctr r12 -/* 801DAD98 4E 80 04 21 */ bctrl -/* 801DAD9C 7C 7B 1B 78 */ mr r27, r3 -/* 801DADA0 3B 40 00 00 */ li r26, 0 -/* 801DADA4 3B 20 00 00 */ li r25, 0 -/* 801DADA8 3E C0 6F 5F */ lis r22, 0x6f5f -/* 801DADAC 3E E0 00 69 */ lis r23, 0x69 -/* 801DADB0 C3 82 A8 90 */ lfs f28, lit_4064(r2) -/* 801DADB4 CB A2 A8 A0 */ lfd f29, lit_4068(r2) -/* 801DADB8 3F 00 43 30 */ lis r24, 0x4330 -/* 801DADBC C3 C2 A8 94 */ lfs f30, lit_4065(r2) -/* 801DADC0 C3 E2 A8 98 */ lfs f31, lit_4066(r2) -lbl_801DADC4: -/* 801DADC4 38 60 01 50 */ li r3, 0x150 -/* 801DADC8 48 0F 3E 85 */ bl __nw__FUl -/* 801DADCC 7C 60 1B 79 */ or. r0, r3, r3 -/* 801DADD0 41 82 00 10 */ beq lbl_801DADE0 -/* 801DADD4 7F 64 DB 78 */ mr r4, r27 -/* 801DADD8 48 12 19 31 */ bl __ct__10J2DPictureFPC7ResTIMG -/* 801DADDC 7C 60 1B 78 */ mr r0, r3 -lbl_801DADE0: -/* 801DADE0 3A B9 00 A8 */ addi r21, r25, 0xa8 -/* 801DADE4 7C 1F A9 2E */ stwx r0, r31, r21 -/* 801DADE8 80 7F 00 70 */ lwz r3, 0x70(r31) -/* 801DADEC 38 D6 6E 31 */ addi r6, r22, 0x6e31 -/* 801DADF0 38 B7 6E 66 */ addi r5, r23, 0x6e66 -/* 801DADF4 81 83 00 00 */ lwz r12, 0(r3) -/* 801DADF8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801DADFC 7D 89 03 A6 */ mtctr r12 -/* 801DAE00 4E 80 04 21 */ bctrl -/* 801DAE04 7C 9F A8 2E */ lwzx r4, r31, r21 -/* 801DAE08 48 11 B8 65 */ bl appendChild__7J2DPaneFP7J2DPane -/* 801DAE0C 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DAE10 80 63 00 04 */ lwz r3, 4(r3) -/* 801DAE14 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 801DAE18 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 801DAE1C EF 61 00 28 */ fsubs f27, f1, f0 -/* 801DAE20 48 11 C2 E1 */ bl getBounds__7J2DPaneFv -/* 801DAE24 C3 43 00 04 */ lfs f26, 4(r3) -/* 801DAE28 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DAE2C 80 63 00 04 */ lwz r3, 4(r3) -/* 801DAE30 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 801DAE34 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 801DAE38 EF 21 00 28 */ fsubs f25, f1, f0 -/* 801DAE3C 48 11 C2 C5 */ bl getBounds__7J2DPaneFv -/* 801DAE40 C0 43 00 00 */ lfs f2, 0(r3) -/* 801DAE44 7C 7F A8 2E */ lwzx r3, r31, r21 -/* 801DAE48 6F 40 80 00 */ xoris r0, r26, 0x8000 -/* 801DAE4C 90 01 00 4C */ stw r0, 0x4c(r1) -/* 801DAE50 93 01 00 48 */ stw r24, 0x48(r1) -/* 801DAE54 C8 01 00 48 */ lfd f0, 0x48(r1) -/* 801DAE58 EC 00 E8 28 */ fsubs f0, f0, f29 -/* 801DAE5C EC 3C 00 32 */ fmuls f1, f28, f0 -/* 801DAE60 EC 1E 06 72 */ fmuls f0, f30, f25 -/* 801DAE64 EC 02 00 2A */ fadds f0, f2, f0 -/* 801DAE68 EC 21 00 2A */ fadds f1, f1, f0 -/* 801DAE6C EC 1A D8 2A */ fadds f0, f26, f27 -/* 801DAE70 EC 40 F8 28 */ fsubs f2, f0, f31 -/* 801DAE74 81 83 00 00 */ lwz r12, 0(r3) -/* 801DAE78 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 801DAE7C 7D 89 03 A6 */ mtctr r12 -/* 801DAE80 4E 80 04 21 */ bctrl -/* 801DAE84 7C 7F A8 2E */ lwzx r3, r31, r21 -/* 801DAE88 C0 22 A8 90 */ lfs f1, lit_4064(r2) -/* 801DAE8C FC 40 08 90 */ fmr f2, f1 -/* 801DAE90 81 83 00 00 */ lwz r12, 0(r3) -/* 801DAE94 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 801DAE98 7D 89 03 A6 */ mtctr r12 -/* 801DAE9C 4E 80 04 21 */ bctrl -/* 801DAEA0 3B 5A 00 01 */ addi r26, r26, 1 -/* 801DAEA4 2C 1A 00 03 */ cmpwi r26, 3 -/* 801DAEA8 3B 39 00 04 */ addi r25, r25, 4 -/* 801DAEAC 41 80 FF 18 */ blt lbl_801DADC4 -/* 801DAEB0 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 801DAEB4 28 00 00 01 */ cmplwi r0, 1 -/* 801DAEB8 40 82 00 C0 */ bne lbl_801DAF78 -/* 801DAEBC 80 7C 5D 30 */ lwz r3, 0x5d30(r28) -/* 801DAEC0 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 801DAEC4 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 801DAEC8 3C A0 80 39 */ lis r5, d_menu_d_menu_item_explain__stringBase0@ha /* 0x80396990@ha */ -/* 801DAECC 38 A5 69 90 */ addi r5, r5, d_menu_d_menu_item_explain__stringBase0@l /* 0x80396990@l */ -/* 801DAED0 38 A5 00 1C */ addi r5, r5, 0x1c -/* 801DAED4 81 83 00 00 */ lwz r12, 0(r3) -/* 801DAED8 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 801DAEDC 7D 89 03 A6 */ mtctr r12 -/* 801DAEE0 4E 80 04 21 */ bctrl -/* 801DAEE4 7C 75 1B 78 */ mr r21, r3 -/* 801DAEE8 38 60 01 50 */ li r3, 0x150 -/* 801DAEEC 48 0F 3D 61 */ bl __nw__FUl -/* 801DAEF0 7C 60 1B 79 */ or. r0, r3, r3 -/* 801DAEF4 41 82 00 10 */ beq lbl_801DAF04 -/* 801DAEF8 7E A4 AB 78 */ mr r4, r21 -/* 801DAEFC 48 12 18 0D */ bl __ct__10J2DPictureFPC7ResTIMG -/* 801DAF00 7C 60 1B 78 */ mr r0, r3 -lbl_801DAF04: -/* 801DAF04 90 1F 00 B4 */ stw r0, 0xb4(r31) -/* 801DAF08 38 60 00 00 */ li r3, 0 -/* 801DAF0C 98 61 00 08 */ stb r3, 8(r1) -/* 801DAF10 98 61 00 09 */ stb r3, 9(r1) -/* 801DAF14 98 61 00 0A */ stb r3, 0xa(r1) -/* 801DAF18 38 00 00 FF */ li r0, 0xff -/* 801DAF1C 98 01 00 0B */ stb r0, 0xb(r1) -/* 801DAF20 80 01 00 08 */ lwz r0, 8(r1) -/* 801DAF24 90 01 00 0C */ stw r0, 0xc(r1) -/* 801DAF28 98 61 00 10 */ stb r3, 0x10(r1) -/* 801DAF2C 98 61 00 11 */ stb r3, 0x11(r1) -/* 801DAF30 98 61 00 12 */ stb r3, 0x12(r1) -/* 801DAF34 98 61 00 13 */ stb r3, 0x13(r1) -/* 801DAF38 80 01 00 10 */ lwz r0, 0x10(r1) -/* 801DAF3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801DAF40 80 7F 00 B4 */ lwz r3, 0xb4(r31) -/* 801DAF44 38 81 00 14 */ addi r4, r1, 0x14 -/* 801DAF48 38 A1 00 0C */ addi r5, r1, 0xc -/* 801DAF4C 81 83 00 00 */ lwz r12, 0(r3) -/* 801DAF50 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801DAF54 7D 89 03 A6 */ mtctr r12 -/* 801DAF58 4E 80 04 21 */ bctrl -/* 801DAF5C 80 7F 00 B4 */ lwz r3, 0xb4(r31) -/* 801DAF60 38 80 00 00 */ li r4, 0 -/* 801DAF64 81 83 00 00 */ lwz r12, 0(r3) -/* 801DAF68 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801DAF6C 7D 89 03 A6 */ mtctr r12 -/* 801DAF70 4E 80 04 21 */ bctrl -/* 801DAF74 48 00 00 0C */ b lbl_801DAF80 -lbl_801DAF78: -/* 801DAF78 38 00 00 00 */ li r0, 0 -/* 801DAF7C 90 1F 00 B4 */ stw r0, 0xb4(r31) -lbl_801DAF80: -/* 801DAF80 38 00 00 00 */ li r0, 0 -/* 801DAF84 90 1F 00 98 */ stw r0, 0x98(r31) -/* 801DAF88 28 1E 00 00 */ cmplwi r30, 0 -/* 801DAF8C 41 82 00 0C */ beq lbl_801DAF98 -/* 801DAF90 90 1F 00 9C */ stw r0, 0x9c(r31) -/* 801DAF94 48 00 00 08 */ b lbl_801DAF9C -lbl_801DAF98: -/* 801DAF98 90 1F 00 9C */ stw r0, 0x9c(r31) -lbl_801DAF9C: -/* 801DAF9C 7F E3 FB 78 */ mr r3, r31 -/* 801DAFA0 E3 E1 00 E8 */ psq_l f31, 232(r1), 0, 0 /* qr0 */ -/* 801DAFA4 CB E1 00 E0 */ lfd f31, 0xe0(r1) -/* 801DAFA8 E3 C1 00 D8 */ psq_l f30, 216(r1), 0, 0 /* qr0 */ -/* 801DAFAC CB C1 00 D0 */ lfd f30, 0xd0(r1) -/* 801DAFB0 E3 A1 00 C8 */ psq_l f29, 200(r1), 0, 0 /* qr0 */ -/* 801DAFB4 CB A1 00 C0 */ lfd f29, 0xc0(r1) -/* 801DAFB8 E3 81 00 B8 */ psq_l f28, 184(r1), 0, 0 /* qr0 */ -/* 801DAFBC CB 81 00 B0 */ lfd f28, 0xb0(r1) -/* 801DAFC0 E3 61 00 A8 */ psq_l f27, 168(r1), 0, 0 /* qr0 */ -/* 801DAFC4 CB 61 00 A0 */ lfd f27, 0xa0(r1) -/* 801DAFC8 E3 41 00 98 */ psq_l f26, 152(r1), 0, 0 /* qr0 */ -/* 801DAFCC CB 41 00 90 */ lfd f26, 0x90(r1) -/* 801DAFD0 E3 21 00 88 */ psq_l f25, 136(r1), 0, 0 /* qr0 */ -/* 801DAFD4 CB 21 00 80 */ lfd f25, 0x80(r1) -/* 801DAFD8 39 61 00 80 */ addi r11, r1, 0x80 -/* 801DAFDC 48 18 72 2D */ bl _restgpr_21 -/* 801DAFE0 80 01 00 F4 */ lwz r0, 0xf4(r1) -/* 801DAFE4 7C 08 03 A6 */ mtlr r0 -/* 801DAFE8 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 801DAFEC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/__dt__19dMenu_ItemExplain_cFv.s b/asm/d/menu/d_menu_item_explain/__dt__19dMenu_ItemExplain_cFv.s deleted file mode 100644 index d27593d50dc..00000000000 --- a/asm/d/menu/d_menu_item_explain/__dt__19dMenu_ItemExplain_cFv.s +++ /dev/null @@ -1,329 +0,0 @@ -lbl_801DAFF0: -/* 801DAFF0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801DAFF4 7C 08 02 A6 */ mflr r0 -/* 801DAFF8 90 01 00 24 */ stw r0, 0x24(r1) -/* 801DAFFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DB000 48 18 71 D1 */ bl _savegpr_26 -/* 801DB004 7C 7F 1B 79 */ or. r31, r3, r3 -/* 801DB008 7C 9E 23 78 */ mr r30, r4 -/* 801DB00C 41 82 04 48 */ beq lbl_801DB454 -/* 801DB010 3C 60 80 3C */ lis r3, __vt__19dMenu_ItemExplain_c@ha /* 0x803BD9F4@ha */ -/* 801DB014 38 03 D9 F4 */ addi r0, r3, __vt__19dMenu_ItemExplain_c@l /* 0x803BD9F4@l */ -/* 801DB018 90 1F 00 00 */ stw r0, 0(r31) -/* 801DB01C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801DB020 38 80 00 01 */ li r4, 1 -/* 801DB024 48 06 ED 05 */ bl __dt__12dMsgString_cFv -/* 801DB028 38 00 00 00 */ li r0, 0 -/* 801DB02C 90 1F 00 0C */ stw r0, 0xc(r31) -/* 801DB030 80 7F 00 70 */ lwz r3, 0x70(r31) -/* 801DB034 28 03 00 00 */ cmplwi r3, 0 -/* 801DB038 41 82 00 18 */ beq lbl_801DB050 -/* 801DB03C 38 80 00 01 */ li r4, 1 -/* 801DB040 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB044 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB048 7D 89 03 A6 */ mtctr r12 -/* 801DB04C 4E 80 04 21 */ bctrl -lbl_801DB050: -/* 801DB050 38 00 00 00 */ li r0, 0 -/* 801DB054 90 1F 00 70 */ stw r0, 0x70(r31) -/* 801DB058 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 801DB05C 28 03 00 00 */ cmplwi r3, 0 -/* 801DB060 41 82 00 18 */ beq lbl_801DB078 -/* 801DB064 38 80 00 01 */ li r4, 1 -/* 801DB068 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB06C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB070 7D 89 03 A6 */ mtctr r12 -/* 801DB074 4E 80 04 21 */ bctrl -lbl_801DB078: -/* 801DB078 3B 80 00 00 */ li r28, 0 -/* 801DB07C 93 9F 00 6C */ stw r28, 0x6c(r31) -/* 801DB080 3B 40 00 00 */ li r26, 0 -/* 801DB084 7F 9D E3 78 */ mr r29, r28 -lbl_801DB088: -/* 801DB088 3B 7D 00 3C */ addi r27, r29, 0x3c -/* 801DB08C 7C 7F D8 2E */ lwzx r3, r31, r27 -/* 801DB090 28 03 00 00 */ cmplwi r3, 0 -/* 801DB094 41 82 00 20 */ beq lbl_801DB0B4 -/* 801DB098 41 82 00 18 */ beq lbl_801DB0B0 -/* 801DB09C 38 80 00 01 */ li r4, 1 -/* 801DB0A0 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB0A4 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB0A8 7D 89 03 A6 */ mtctr r12 -/* 801DB0AC 4E 80 04 21 */ bctrl -lbl_801DB0B0: -/* 801DB0B0 7F 9F D9 2E */ stwx r28, r31, r27 -lbl_801DB0B4: -/* 801DB0B4 3B 5A 00 01 */ addi r26, r26, 1 -/* 801DB0B8 2C 1A 00 02 */ cmpwi r26, 2 -/* 801DB0BC 3B BD 00 04 */ addi r29, r29, 4 -/* 801DB0C0 41 80 FF C8 */ blt lbl_801DB088 -/* 801DB0C4 80 7F 00 4C */ lwz r3, 0x4c(r31) -/* 801DB0C8 28 03 00 00 */ cmplwi r3, 0 -/* 801DB0CC 41 82 00 18 */ beq lbl_801DB0E4 -/* 801DB0D0 38 80 00 01 */ li r4, 1 -/* 801DB0D4 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB0D8 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB0DC 7D 89 03 A6 */ mtctr r12 -/* 801DB0E0 4E 80 04 21 */ bctrl -lbl_801DB0E4: -/* 801DB0E4 38 00 00 00 */ li r0, 0 -/* 801DB0E8 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 801DB0EC 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 801DB0F0 28 03 00 00 */ cmplwi r3, 0 -/* 801DB0F4 41 82 00 18 */ beq lbl_801DB10C -/* 801DB0F8 38 80 00 01 */ li r4, 1 -/* 801DB0FC 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB100 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB104 7D 89 03 A6 */ mtctr r12 -/* 801DB108 4E 80 04 21 */ bctrl -lbl_801DB10C: -/* 801DB10C 3B 80 00 00 */ li r28, 0 -/* 801DB110 93 9F 00 10 */ stw r28, 0x10(r31) -/* 801DB114 3B 40 00 00 */ li r26, 0 -/* 801DB118 3B A0 00 00 */ li r29, 0 -lbl_801DB11C: -/* 801DB11C 3B 7D 00 18 */ addi r27, r29, 0x18 -/* 801DB120 7C 7F D8 2E */ lwzx r3, r31, r27 -/* 801DB124 28 03 00 00 */ cmplwi r3, 0 -/* 801DB128 41 82 00 18 */ beq lbl_801DB140 -/* 801DB12C 38 80 00 01 */ li r4, 1 -/* 801DB130 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB134 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB138 7D 89 03 A6 */ mtctr r12 -/* 801DB13C 4E 80 04 21 */ bctrl -lbl_801DB140: -/* 801DB140 7F 9F D9 2E */ stwx r28, r31, r27 -/* 801DB144 3B 5A 00 01 */ addi r26, r26, 1 -/* 801DB148 2C 1A 00 04 */ cmpwi r26, 4 -/* 801DB14C 3B BD 00 04 */ addi r29, r29, 4 -/* 801DB150 41 80 FF CC */ blt lbl_801DB11C -/* 801DB154 80 7F 00 74 */ lwz r3, 0x74(r31) -/* 801DB158 28 03 00 00 */ cmplwi r3, 0 -/* 801DB15C 41 82 00 24 */ beq lbl_801DB180 -/* 801DB160 41 82 00 18 */ beq lbl_801DB178 -/* 801DB164 38 80 00 01 */ li r4, 1 -/* 801DB168 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB16C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB170 7D 89 03 A6 */ mtctr r12 -/* 801DB174 4E 80 04 21 */ bctrl -lbl_801DB178: -/* 801DB178 38 00 00 00 */ li r0, 0 -/* 801DB17C 90 1F 00 74 */ stw r0, 0x74(r31) -lbl_801DB180: -/* 801DB180 3B 40 00 00 */ li r26, 0 -/* 801DB184 3B A0 00 00 */ li r29, 0 -/* 801DB188 3B 80 00 00 */ li r28, 0 -lbl_801DB18C: -/* 801DB18C 3B 7D 00 44 */ addi r27, r29, 0x44 -/* 801DB190 7C 7F D8 2E */ lwzx r3, r31, r27 -/* 801DB194 28 03 00 00 */ cmplwi r3, 0 -/* 801DB198 41 82 00 20 */ beq lbl_801DB1B8 -/* 801DB19C 41 82 00 18 */ beq lbl_801DB1B4 -/* 801DB1A0 38 80 00 01 */ li r4, 1 -/* 801DB1A4 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB1A8 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB1AC 7D 89 03 A6 */ mtctr r12 -/* 801DB1B0 4E 80 04 21 */ bctrl -lbl_801DB1B4: -/* 801DB1B4 7F 9F D9 2E */ stwx r28, r31, r27 -lbl_801DB1B8: -/* 801DB1B8 3B 5A 00 01 */ addi r26, r26, 1 -/* 801DB1BC 2C 1A 00 02 */ cmpwi r26, 2 -/* 801DB1C0 3B BD 00 04 */ addi r29, r29, 4 -/* 801DB1C4 41 80 FF C8 */ blt lbl_801DB18C -/* 801DB1C8 80 7F 00 50 */ lwz r3, 0x50(r31) -/* 801DB1CC 28 03 00 00 */ cmplwi r3, 0 -/* 801DB1D0 41 82 00 24 */ beq lbl_801DB1F4 -/* 801DB1D4 41 82 00 18 */ beq lbl_801DB1EC -/* 801DB1D8 38 80 00 01 */ li r4, 1 -/* 801DB1DC 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB1E0 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB1E4 7D 89 03 A6 */ mtctr r12 -/* 801DB1E8 4E 80 04 21 */ bctrl -lbl_801DB1EC: -/* 801DB1EC 38 00 00 00 */ li r0, 0 -/* 801DB1F0 90 1F 00 50 */ stw r0, 0x50(r31) -lbl_801DB1F4: -/* 801DB1F4 80 7F 00 5C */ lwz r3, 0x5c(r31) -/* 801DB1F8 28 03 00 00 */ cmplwi r3, 0 -/* 801DB1FC 41 82 00 24 */ beq lbl_801DB220 -/* 801DB200 41 82 00 18 */ beq lbl_801DB218 -/* 801DB204 38 80 00 01 */ li r4, 1 -/* 801DB208 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB20C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB210 7D 89 03 A6 */ mtctr r12 -/* 801DB214 4E 80 04 21 */ bctrl -lbl_801DB218: -/* 801DB218 38 00 00 00 */ li r0, 0 -/* 801DB21C 90 1F 00 5C */ stw r0, 0x5c(r31) -lbl_801DB220: -/* 801DB220 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801DB224 28 03 00 00 */ cmplwi r3, 0 -/* 801DB228 41 82 00 24 */ beq lbl_801DB24C -/* 801DB22C 41 82 00 18 */ beq lbl_801DB244 -/* 801DB230 38 80 00 01 */ li r4, 1 -/* 801DB234 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB238 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB23C 7D 89 03 A6 */ mtctr r12 -/* 801DB240 4E 80 04 21 */ bctrl -lbl_801DB244: -/* 801DB244 38 00 00 00 */ li r0, 0 -/* 801DB248 90 1F 00 14 */ stw r0, 0x14(r31) -lbl_801DB24C: -/* 801DB24C 3B 40 00 00 */ li r26, 0 -/* 801DB250 3B A0 00 00 */ li r29, 0 -/* 801DB254 3B 80 00 00 */ li r28, 0 -lbl_801DB258: -/* 801DB258 3B 7D 00 28 */ addi r27, r29, 0x28 -/* 801DB25C 7C 7F D8 2E */ lwzx r3, r31, r27 -/* 801DB260 28 03 00 00 */ cmplwi r3, 0 -/* 801DB264 41 82 00 20 */ beq lbl_801DB284 -/* 801DB268 41 82 00 18 */ beq lbl_801DB280 -/* 801DB26C 38 80 00 01 */ li r4, 1 -/* 801DB270 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB274 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB278 7D 89 03 A6 */ mtctr r12 -/* 801DB27C 4E 80 04 21 */ bctrl -lbl_801DB280: -/* 801DB280 7F 9F D9 2E */ stwx r28, r31, r27 -lbl_801DB284: -/* 801DB284 3B 5A 00 01 */ addi r26, r26, 1 -/* 801DB288 2C 1A 00 04 */ cmpwi r26, 4 -/* 801DB28C 3B BD 00 04 */ addi r29, r29, 4 -/* 801DB290 41 80 FF C8 */ blt lbl_801DB258 -/* 801DB294 3B 40 00 00 */ li r26, 0 -/* 801DB298 3B A0 00 00 */ li r29, 0 -/* 801DB29C 3B 80 00 00 */ li r28, 0 -lbl_801DB2A0: -/* 801DB2A0 3B 7D 00 60 */ addi r27, r29, 0x60 -/* 801DB2A4 7C 7F D8 2E */ lwzx r3, r31, r27 -/* 801DB2A8 28 03 00 00 */ cmplwi r3, 0 -/* 801DB2AC 41 82 00 20 */ beq lbl_801DB2CC -/* 801DB2B0 41 82 00 18 */ beq lbl_801DB2C8 -/* 801DB2B4 38 80 00 01 */ li r4, 1 -/* 801DB2B8 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB2BC 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB2C0 7D 89 03 A6 */ mtctr r12 -/* 801DB2C4 4E 80 04 21 */ bctrl -lbl_801DB2C8: -/* 801DB2C8 7F 9F D9 2E */ stwx r28, r31, r27 -lbl_801DB2CC: -/* 801DB2CC 3B 5A 00 01 */ addi r26, r26, 1 -/* 801DB2D0 2C 1A 00 03 */ cmpwi r26, 3 -/* 801DB2D4 3B BD 00 04 */ addi r29, r29, 4 -/* 801DB2D8 41 80 FF C8 */ blt lbl_801DB2A0 -/* 801DB2DC 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DB2E0 28 03 00 00 */ cmplwi r3, 0 -/* 801DB2E4 41 82 00 18 */ beq lbl_801DB2FC -/* 801DB2E8 38 80 00 01 */ li r4, 1 -/* 801DB2EC 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB2F0 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB2F4 7D 89 03 A6 */ mtctr r12 -/* 801DB2F8 4E 80 04 21 */ bctrl -lbl_801DB2FC: -/* 801DB2FC 3B 80 00 00 */ li r28, 0 -/* 801DB300 93 9F 00 38 */ stw r28, 0x38(r31) -/* 801DB304 3B 40 00 00 */ li r26, 0 -/* 801DB308 3B A0 00 00 */ li r29, 0 -lbl_801DB30C: -/* 801DB30C 3B 7D 00 88 */ addi r27, r29, 0x88 -/* 801DB310 7C 9F D8 2E */ lwzx r4, r31, r27 -/* 801DB314 28 04 00 00 */ cmplwi r4, 0 -/* 801DB318 41 82 00 10 */ beq lbl_801DB328 -/* 801DB31C 80 7F 00 04 */ lwz r3, 4(r31) -/* 801DB320 48 0F 32 29 */ bl free__7JKRHeapFPv -/* 801DB324 7F 9F D9 2E */ stwx r28, r31, r27 -lbl_801DB328: -/* 801DB328 3B 5A 00 01 */ addi r26, r26, 1 -/* 801DB32C 2C 1A 00 04 */ cmpwi r26, 4 -/* 801DB330 3B BD 00 04 */ addi r29, r29, 4 -/* 801DB334 41 80 FF D8 */ blt lbl_801DB30C -/* 801DB338 38 60 00 00 */ li r3, 0 -/* 801DB33C 38 80 00 00 */ li r4, 0 -/* 801DB340 38 00 00 03 */ li r0, 3 -/* 801DB344 7C 09 03 A6 */ mtctr r0 -lbl_801DB348: -/* 801DB348 38 A3 00 7C */ addi r5, r3, 0x7c -/* 801DB34C 7C 1F 28 2E */ lwzx r0, r31, r5 -/* 801DB350 28 00 00 00 */ cmplwi r0, 0 -/* 801DB354 41 82 00 08 */ beq lbl_801DB35C -/* 801DB358 7C 9F 29 2E */ stwx r4, r31, r5 -lbl_801DB35C: -/* 801DB35C 38 63 00 04 */ addi r3, r3, 4 -/* 801DB360 42 00 FF E8 */ bdnz lbl_801DB348 -/* 801DB364 38 60 00 00 */ li r3, 0 -/* 801DB368 38 80 00 00 */ li r4, 0 -/* 801DB36C 38 00 00 03 */ li r0, 3 -/* 801DB370 7C 09 03 A6 */ mtctr r0 -lbl_801DB374: -/* 801DB374 38 A3 00 A8 */ addi r5, r3, 0xa8 -/* 801DB378 7C 1F 28 2E */ lwzx r0, r31, r5 -/* 801DB37C 28 00 00 00 */ cmplwi r0, 0 -/* 801DB380 41 82 00 08 */ beq lbl_801DB388 -/* 801DB384 7C 9F 29 2E */ stwx r4, r31, r5 -lbl_801DB388: -/* 801DB388 38 63 00 04 */ addi r3, r3, 4 -/* 801DB38C 42 00 FF E8 */ bdnz lbl_801DB374 -/* 801DB390 80 7F 00 B4 */ lwz r3, 0xb4(r31) -/* 801DB394 28 03 00 00 */ cmplwi r3, 0 -/* 801DB398 41 82 00 24 */ beq lbl_801DB3BC -/* 801DB39C 41 82 00 18 */ beq lbl_801DB3B4 -/* 801DB3A0 38 80 00 01 */ li r4, 1 -/* 801DB3A4 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB3A8 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB3AC 7D 89 03 A6 */ mtctr r12 -/* 801DB3B0 4E 80 04 21 */ bctrl -lbl_801DB3B4: -/* 801DB3B4 38 00 00 00 */ li r0, 0 -/* 801DB3B8 90 1F 00 B4 */ stw r0, 0xb4(r31) -lbl_801DB3BC: -/* 801DB3BC 80 7F 00 98 */ lwz r3, 0x98(r31) -/* 801DB3C0 28 03 00 00 */ cmplwi r3, 0 -/* 801DB3C4 41 82 00 24 */ beq lbl_801DB3E8 -/* 801DB3C8 41 82 00 18 */ beq lbl_801DB3E0 -/* 801DB3CC 38 80 00 01 */ li r4, 1 -/* 801DB3D0 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB3D4 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB3D8 7D 89 03 A6 */ mtctr r12 -/* 801DB3DC 4E 80 04 21 */ bctrl -lbl_801DB3E0: -/* 801DB3E0 38 00 00 00 */ li r0, 0 -/* 801DB3E4 90 1F 00 98 */ stw r0, 0x98(r31) -lbl_801DB3E8: -/* 801DB3E8 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DB3EC 28 03 00 00 */ cmplwi r3, 0 -/* 801DB3F0 41 82 00 24 */ beq lbl_801DB414 -/* 801DB3F4 41 82 00 18 */ beq lbl_801DB40C -/* 801DB3F8 38 80 00 01 */ li r4, 1 -/* 801DB3FC 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB400 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB404 7D 89 03 A6 */ mtctr r12 -/* 801DB408 4E 80 04 21 */ bctrl -lbl_801DB40C: -/* 801DB40C 38 00 00 00 */ li r0, 0 -/* 801DB410 90 1F 00 9C */ stw r0, 0x9c(r31) -lbl_801DB414: -/* 801DB414 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801DB418 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801DB41C 80 63 5C 6C */ lwz r3, 0x5c6c(r3) -/* 801DB420 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB424 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801DB428 7D 89 03 A6 */ mtctr r12 -/* 801DB42C 4E 80 04 21 */ bctrl -/* 801DB430 80 7F 00 08 */ lwz r3, 8(r31) -/* 801DB434 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB438 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801DB43C 7D 89 03 A6 */ mtctr r12 -/* 801DB440 4E 80 04 21 */ bctrl -/* 801DB444 7F C0 07 35 */ extsh. r0, r30 -/* 801DB448 40 81 00 0C */ ble lbl_801DB454 -/* 801DB44C 7F E3 FB 78 */ mr r3, r31 -/* 801DB450 48 0F 38 ED */ bl __dl__FPv -lbl_801DB454: -/* 801DB454 7F E3 FB 78 */ mr r3, r31 -/* 801DB458 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DB45C 48 18 6D C1 */ bl _restgpr_26 -/* 801DB460 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801DB464 7C 08 03 A6 */ mtlr r0 -/* 801DB468 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DB46C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/__sinit_d_menu_item_explain_cpp.s b/asm/d/menu/d_menu_item_explain/__sinit_d_menu_item_explain_cpp.s deleted file mode 100644 index 462bf8ae8fc..00000000000 --- a/asm/d/menu/d_menu_item_explain/__sinit_d_menu_item_explain_cpp.s +++ /dev/null @@ -1,78 +0,0 @@ -lbl_801DCC8C: -/* 801DCC8C 3C 60 80 3C */ lis r3, cNullVec__6Z2Calc@ha /* 0x803BD8C8@ha */ -/* 801DCC90 38 63 D8 C8 */ addi r3, r3, cNullVec__6Z2Calc@l /* 0x803BD8C8@l */ -/* 801DCC94 80 83 00 0C */ lwz r4, 0xc(r3) -/* 801DCC98 80 03 00 10 */ lwz r0, 0x10(r3) -/* 801DCC9C 90 83 00 54 */ stw r4, 0x54(r3) -/* 801DCCA0 90 03 00 58 */ stw r0, 0x58(r3) -/* 801DCCA4 80 03 00 14 */ lwz r0, 0x14(r3) -/* 801DCCA8 90 03 00 5C */ stw r0, 0x5c(r3) -/* 801DCCAC 38 A3 00 54 */ addi r5, r3, 0x54 -/* 801DCCB0 80 83 00 18 */ lwz r4, 0x18(r3) -/* 801DCCB4 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 801DCCB8 90 85 00 0C */ stw r4, 0xc(r5) -/* 801DCCBC 90 05 00 10 */ stw r0, 0x10(r5) -/* 801DCCC0 80 03 00 20 */ lwz r0, 0x20(r3) -/* 801DCCC4 90 05 00 14 */ stw r0, 0x14(r5) -/* 801DCCC8 80 83 00 24 */ lwz r4, 0x24(r3) -/* 801DCCCC 80 03 00 28 */ lwz r0, 0x28(r3) -/* 801DCCD0 90 85 00 18 */ stw r4, 0x18(r5) -/* 801DCCD4 90 05 00 1C */ stw r0, 0x1c(r5) -/* 801DCCD8 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 801DCCDC 90 05 00 20 */ stw r0, 0x20(r5) -/* 801DCCE0 80 83 00 30 */ lwz r4, 0x30(r3) -/* 801DCCE4 80 03 00 34 */ lwz r0, 0x34(r3) -/* 801DCCE8 90 85 00 24 */ stw r4, 0x24(r5) -/* 801DCCEC 90 05 00 28 */ stw r0, 0x28(r5) -/* 801DCCF0 80 03 00 38 */ lwz r0, 0x38(r3) -/* 801DCCF4 90 05 00 2C */ stw r0, 0x2c(r5) -/* 801DCCF8 80 83 00 3C */ lwz r4, 0x3c(r3) -/* 801DCCFC 80 03 00 40 */ lwz r0, 0x40(r3) -/* 801DCD00 90 85 00 30 */ stw r4, 0x30(r5) -/* 801DCD04 90 05 00 34 */ stw r0, 0x34(r5) -/* 801DCD08 80 03 00 44 */ lwz r0, 0x44(r3) -/* 801DCD0C 90 05 00 38 */ stw r0, 0x38(r5) -/* 801DCD10 80 83 00 48 */ lwz r4, 0x48(r3) -/* 801DCD14 80 03 00 4C */ lwz r0, 0x4c(r3) -/* 801DCD18 90 85 00 3C */ stw r4, 0x3c(r5) -/* 801DCD1C 90 05 00 40 */ stw r0, 0x40(r5) -/* 801DCD20 80 03 00 50 */ lwz r0, 0x50(r3) -/* 801DCD24 90 05 00 44 */ stw r0, 0x44(r5) -/* 801DCD28 80 83 00 9C */ lwz r4, 0x9c(r3) -/* 801DCD2C 80 03 00 A0 */ lwz r0, 0xa0(r3) -/* 801DCD30 90 83 00 E4 */ stw r4, 0xe4(r3) -/* 801DCD34 90 03 00 E8 */ stw r0, 0xe8(r3) -/* 801DCD38 80 03 00 A4 */ lwz r0, 0xa4(r3) -/* 801DCD3C 90 03 00 EC */ stw r0, 0xec(r3) -/* 801DCD40 38 A3 00 E4 */ addi r5, r3, 0xe4 -/* 801DCD44 80 83 00 A8 */ lwz r4, 0xa8(r3) -/* 801DCD48 80 03 00 AC */ lwz r0, 0xac(r3) -/* 801DCD4C 90 85 00 0C */ stw r4, 0xc(r5) -/* 801DCD50 90 05 00 10 */ stw r0, 0x10(r5) -/* 801DCD54 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 801DCD58 90 05 00 14 */ stw r0, 0x14(r5) -/* 801DCD5C 80 83 00 B4 */ lwz r4, 0xb4(r3) -/* 801DCD60 80 03 00 B8 */ lwz r0, 0xb8(r3) -/* 801DCD64 90 85 00 18 */ stw r4, 0x18(r5) -/* 801DCD68 90 05 00 1C */ stw r0, 0x1c(r5) -/* 801DCD6C 80 03 00 BC */ lwz r0, 0xbc(r3) -/* 801DCD70 90 05 00 20 */ stw r0, 0x20(r5) -/* 801DCD74 80 83 00 C0 */ lwz r4, 0xc0(r3) -/* 801DCD78 80 03 00 C4 */ lwz r0, 0xc4(r3) -/* 801DCD7C 90 85 00 24 */ stw r4, 0x24(r5) -/* 801DCD80 90 05 00 28 */ stw r0, 0x28(r5) -/* 801DCD84 80 03 00 C8 */ lwz r0, 0xc8(r3) -/* 801DCD88 90 05 00 2C */ stw r0, 0x2c(r5) -/* 801DCD8C 80 83 00 CC */ lwz r4, 0xcc(r3) -/* 801DCD90 80 03 00 D0 */ lwz r0, 0xd0(r3) -/* 801DCD94 90 85 00 30 */ stw r4, 0x30(r5) -/* 801DCD98 90 05 00 34 */ stw r0, 0x34(r5) -/* 801DCD9C 80 03 00 D4 */ lwz r0, 0xd4(r3) -/* 801DCDA0 90 05 00 38 */ stw r0, 0x38(r5) -/* 801DCDA4 80 83 00 D8 */ lwz r4, 0xd8(r3) -/* 801DCDA8 80 03 00 DC */ lwz r0, 0xdc(r3) -/* 801DCDAC 90 85 00 3C */ stw r4, 0x3c(r5) -/* 801DCDB0 90 05 00 40 */ stw r0, 0x40(r5) -/* 801DCDB4 80 03 00 E0 */ lwz r0, 0xe0(r3) -/* 801DCDB8 90 05 00 44 */ stw r0, 0x44(r5) -/* 801DCDBC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/close_init__19dMenu_ItemExplain_cFv.s b/asm/d/menu/d_menu_item_explain/close_init__19dMenu_ItemExplain_cFv.s deleted file mode 100644 index e5ba84c755c..00000000000 --- a/asm/d/menu/d_menu_item_explain/close_init__19dMenu_ItemExplain_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_801DC2E4: -/* 801DC2E4 C0 02 A8 8C */ lfs f0, lit_4063(r2) -/* 801DC2E8 D0 03 00 BC */ stfs f0, 0xbc(r3) -/* 801DC2EC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/close_proc__19dMenu_ItemExplain_cFv.s b/asm/d/menu/d_menu_item_explain/close_proc__19dMenu_ItemExplain_cFv.s deleted file mode 100644 index 7d859be6781..00000000000 --- a/asm/d/menu/d_menu_item_explain/close_proc__19dMenu_ItemExplain_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801DC2F0: -/* 801DC2F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801DC2F4 7C 08 02 A6 */ mflr r0 -/* 801DC2F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801DC2FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801DC300 7C 7F 1B 78 */ mr r31, r3 -/* 801DC304 80 63 00 9C */ lwz r3, 0x9c(r3) -/* 801DC308 28 03 00 00 */ cmplwi r3, 0 -/* 801DC30C 41 82 00 0C */ beq lbl_801DC318 -/* 801DC310 48 05 E3 71 */ bl selAnimeEnd__17dMsgScrn3Select_cFv -/* 801DC314 48 00 00 08 */ b lbl_801DC31C -lbl_801DC318: -/* 801DC318 38 60 00 01 */ li r3, 1 -lbl_801DC31C: -/* 801DC31C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801DC320 41 82 00 0C */ beq lbl_801DC32C -/* 801DC324 38 00 00 00 */ li r0, 0 -/* 801DC328 98 1F 00 E0 */ stb r0, 0xe0(r31) -lbl_801DC32C: -/* 801DC32C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801DC330 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801DC334 7C 08 03 A6 */ mtlr r0 -/* 801DC338 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DC33C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/drawKantera__19dMenu_ItemExplain_cFv.s b/asm/d/menu/d_menu_item_explain/drawKantera__19dMenu_ItemExplain_cFv.s deleted file mode 100644 index 5486d6e35cb..00000000000 --- a/asm/d/menu/d_menu_item_explain/drawKantera__19dMenu_ItemExplain_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_801DB744: -/* 801DB744 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801DB748 7C 08 02 A6 */ mflr r0 -/* 801DB74C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801DB750 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 801DB754 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 801DB758 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801DB75C 7C 7F 1B 78 */ mr r31, r3 -/* 801DB760 88 03 00 E1 */ lbz r0, 0xe1(r3) -/* 801DB764 28 00 00 48 */ cmplwi r0, 0x48 -/* 801DB768 40 82 00 94 */ bne lbl_801DB7FC -/* 801DB76C 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DB770 80 83 00 04 */ lwz r4, 4(r3) -/* 801DB774 C0 24 00 2C */ lfs f1, 0x2c(r4) -/* 801DB778 C0 04 00 24 */ lfs f0, 0x24(r4) -/* 801DB77C EF E1 00 28 */ fsubs f31, f1, f0 -/* 801DB780 48 07 8B E5 */ bl getGlobalPosY__8CPaneMgrFv -/* 801DB784 EC 21 F8 2A */ fadds f1, f1, f31 -/* 801DB788 C0 02 A8 C0 */ lfs f0, lit_4347(r2) -/* 801DB78C EF E0 08 2A */ fadds f31, f0, f1 -/* 801DB790 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DB794 48 07 8B 55 */ bl getGlobalPosX__8CPaneMgrFv -/* 801DB798 C0 02 A8 BC */ lfs f0, lit_4346(r2) -/* 801DB79C EC 20 08 2A */ fadds f1, f0, f1 -/* 801DB7A0 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 801DB7A4 FC 40 F8 90 */ fmr f2, f31 -/* 801DB7A8 4B FD 33 F9 */ bl setPos__15dKantera_icon_cFff -/* 801DB7AC 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 801DB7B0 C0 22 A8 C4 */ lfs f1, lit_4348(r2) -/* 801DB7B4 FC 40 08 90 */ fmr f2, f1 -/* 801DB7B8 4B FD 34 3D */ bl setScale__15dKantera_icon_cFff -/* 801DB7BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801DB7C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801DB7C4 A0 A3 00 08 */ lhz r5, 8(r3) -/* 801DB7C8 A0 83 00 06 */ lhz r4, 6(r3) -/* 801DB7CC 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 801DB7D0 4B FD 34 75 */ bl setNowGauge__15dKantera_icon_cFUsUs -/* 801DB7D4 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DB7D8 48 07 A0 51 */ bl getAlphaRate__13CPaneMgrAlphaFv -/* 801DB7DC 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 801DB7E0 4B FD 33 9D */ bl setAlphaRate__15dKantera_icon_cFf -/* 801DB7E4 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 801DB7E8 80 63 00 04 */ lwz r3, 4(r3) -/* 801DB7EC 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB7F0 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB7F4 7D 89 03 A6 */ mtctr r12 -/* 801DB7F8 4E 80 04 21 */ bctrl -lbl_801DB7FC: -/* 801DB7FC E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 801DB800 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 801DB804 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801DB808 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801DB80C 7C 08 03 A6 */ mtlr r0 -/* 801DB810 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DB814 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/draw__19dMenu_ItemExplain_cFP13J2DOrthoGraph.s b/asm/d/menu/d_menu_item_explain/draw__19dMenu_ItemExplain_cFP13J2DOrthoGraph.s deleted file mode 100644 index 1d600c73b2a..00000000000 --- a/asm/d/menu/d_menu_item_explain/draw__19dMenu_ItemExplain_cFP13J2DOrthoGraph.s +++ /dev/null @@ -1,148 +0,0 @@ -lbl_801DB514: -/* 801DB514 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801DB518 7C 08 02 A6 */ mflr r0 -/* 801DB51C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801DB520 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DB524 48 18 6C AD */ bl _savegpr_26 -/* 801DB528 7C 7E 1B 78 */ mr r30, r3 -/* 801DB52C 7C 9F 23 78 */ mr r31, r4 -/* 801DB530 88 03 00 E0 */ lbz r0, 0xe0(r3) -/* 801DB534 28 00 00 00 */ cmplwi r0, 0 -/* 801DB538 41 82 01 F4 */ beq lbl_801DB72C -/* 801DB53C 3B 40 00 00 */ li r26, 0 -/* 801DB540 3B A0 00 00 */ li r29, 0 -/* 801DB544 3C 60 80 43 */ lis r3, g_ringHIO@ha /* 0x8042FAFC@ha */ -/* 801DB548 3B 83 FA FC */ addi r28, r3, g_ringHIO@l /* 0x8042FAFC@l */ -lbl_801DB54C: -/* 801DB54C 3B 7D 00 3C */ addi r27, r29, 0x3c -/* 801DB550 7C 7E D8 2E */ lwzx r3, r30, r27 -/* 801DB554 28 03 00 00 */ cmplwi r3, 0 -/* 801DB558 41 82 00 44 */ beq lbl_801DB59C -/* 801DB55C C0 1C 00 FC */ lfs f0, 0xfc(r28) -/* 801DB560 80 63 00 04 */ lwz r3, 4(r3) -/* 801DB564 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801DB568 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801DB56C 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB570 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801DB574 7D 89 03 A6 */ mtctr r12 -/* 801DB578 4E 80 04 21 */ bctrl -/* 801DB57C 7C 7E D8 2E */ lwzx r3, r30, r27 -/* 801DB580 C0 3E 00 D4 */ lfs f1, 0xd4(r30) -/* 801DB584 C0 1C 00 F4 */ lfs f0, 0xf4(r28) -/* 801DB588 EC 21 00 2A */ fadds f1, f1, f0 -/* 801DB58C C0 5E 00 D8 */ lfs f2, 0xd8(r30) -/* 801DB590 C0 1C 00 F8 */ lfs f0, 0xf8(r28) -/* 801DB594 EC 42 00 2A */ fadds f2, f2, f0 -/* 801DB598 48 07 90 19 */ bl paneTrans__8CPaneMgrFff -lbl_801DB59C: -/* 801DB59C 3B 5A 00 01 */ addi r26, r26, 1 -/* 801DB5A0 2C 1A 00 02 */ cmpwi r26, 2 -/* 801DB5A4 3B BD 00 04 */ addi r29, r29, 4 -/* 801DB5A8 41 80 FF A4 */ blt lbl_801DB54C -/* 801DB5AC 3C 60 80 43 */ lis r3, g_ringHIO@ha /* 0x8042FAFC@ha */ -/* 801DB5B0 38 63 FA FC */ addi r3, r3, g_ringHIO@l /* 0x8042FAFC@l */ -/* 801DB5B4 C0 03 01 0C */ lfs f0, 0x10c(r3) -/* 801DB5B8 80 7E 00 4C */ lwz r3, 0x4c(r30) -/* 801DB5BC 80 63 00 04 */ lwz r3, 4(r3) -/* 801DB5C0 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801DB5C4 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801DB5C8 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB5CC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801DB5D0 7D 89 03 A6 */ mtctr r12 -/* 801DB5D4 4E 80 04 21 */ bctrl -/* 801DB5D8 80 7E 00 4C */ lwz r3, 0x4c(r30) -/* 801DB5DC 3C 80 80 43 */ lis r4, g_ringHIO@ha /* 0x8042FAFC@ha */ -/* 801DB5E0 38 84 FA FC */ addi r4, r4, g_ringHIO@l /* 0x8042FAFC@l */ -/* 801DB5E4 C0 24 01 04 */ lfs f1, 0x104(r4) -/* 801DB5E8 C0 44 01 08 */ lfs f2, 0x108(r4) -/* 801DB5EC 48 07 8F C5 */ bl paneTrans__8CPaneMgrFff -/* 801DB5F0 80 7E 00 B4 */ lwz r3, 0xb4(r30) -/* 801DB5F4 28 03 00 00 */ cmplwi r3, 0 -/* 801DB5F8 41 82 00 30 */ beq lbl_801DB628 -/* 801DB5FC C0 22 A8 88 */ lfs f1, lit_4062(r2) -/* 801DB600 FC 40 08 90 */ fmr f2, f1 -/* 801DB604 C0 62 A8 A8 */ lfs f3, lit_4302(r2) -/* 801DB608 C0 82 A8 AC */ lfs f4, lit_4303(r2) -/* 801DB60C 38 80 00 00 */ li r4, 0 -/* 801DB610 38 A0 00 00 */ li r5, 0 -/* 801DB614 38 C0 00 00 */ li r6, 0 -/* 801DB618 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB61C 81 8C 00 EC */ lwz r12, 0xec(r12) -/* 801DB620 7D 89 03 A6 */ mtctr r12 -/* 801DB624 4E 80 04 21 */ bctrl -lbl_801DB628: -/* 801DB628 80 7E 00 C8 */ lwz r3, 0xc8(r30) -/* 801DB62C 80 1E 00 D0 */ lwz r0, 0xd0(r30) -/* 801DB630 7C 03 00 40 */ cmplw r3, r0 -/* 801DB634 41 82 00 84 */ beq lbl_801DB6B8 -/* 801DB638 90 7E 00 D0 */ stw r3, 0xd0(r30) -/* 801DB63C 3B 40 00 00 */ li r26, 0 -/* 801DB640 3B A0 00 00 */ li r29, 0 -lbl_801DB644: -/* 801DB644 38 1D 00 18 */ addi r0, r29, 0x18 -/* 801DB648 7C 7E 00 2E */ lwzx r3, r30, r0 -/* 801DB64C 80 A3 00 04 */ lwz r5, 4(r3) -/* 801DB650 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801DB654 80 9E 00 CC */ lwz r4, 0xcc(r30) -/* 801DB658 38 C0 00 00 */ li r6, 0 -/* 801DB65C 38 E0 00 00 */ li r7, 0 -/* 801DB660 39 00 00 00 */ li r8, 0 -/* 801DB664 39 20 00 00 */ li r9, 0 -/* 801DB668 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB66C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB670 7D 89 03 A6 */ mtctr r12 -/* 801DB674 4E 80 04 21 */ bctrl -/* 801DB678 3B 5A 00 01 */ addi r26, r26, 1 -/* 801DB67C 2C 1A 00 04 */ cmpwi r26, 4 -/* 801DB680 3B BD 00 04 */ addi r29, r29, 4 -/* 801DB684 41 80 FF C0 */ blt lbl_801DB644 -/* 801DB688 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 801DB68C 80 A3 00 04 */ lwz r5, 4(r3) -/* 801DB690 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801DB694 80 9E 00 C8 */ lwz r4, 0xc8(r30) -/* 801DB698 38 C0 00 00 */ li r6, 0 -/* 801DB69C 38 E0 00 00 */ li r7, 0 -/* 801DB6A0 39 00 00 00 */ li r8, 0 -/* 801DB6A4 39 20 00 00 */ li r9, 0 -/* 801DB6A8 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB6AC 81 8C 00 08 */ lwz r12, 8(r12) -/* 801DB6B0 7D 89 03 A6 */ mtctr r12 -/* 801DB6B4 4E 80 04 21 */ bctrl -lbl_801DB6B8: -/* 801DB6B8 80 7E 00 70 */ lwz r3, 0x70(r30) -/* 801DB6BC C0 22 A8 88 */ lfs f1, lit_4062(r2) -/* 801DB6C0 FC 40 08 90 */ fmr f2, f1 -/* 801DB6C4 7F E4 FB 78 */ mr r4, r31 -/* 801DB6C8 48 11 D8 0D */ bl draw__9J2DScreenFffPC14J2DGrafContext -/* 801DB6CC 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 801DB6D0 80 83 00 04 */ lwz r4, 4(r3) -/* 801DB6D4 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801DB6D8 C0 22 A8 B0 */ lfs f1, lit_4304(r2) -/* 801DB6DC 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB6E0 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 801DB6E4 7D 89 03 A6 */ mtctr r12 -/* 801DB6E8 4E 80 04 21 */ bctrl -/* 801DB6EC 7F C3 F3 78 */ mr r3, r30 -/* 801DB6F0 48 00 00 55 */ bl drawKantera__19dMenu_ItemExplain_cFv -/* 801DB6F4 80 7E 00 9C */ lwz r3, 0x9c(r30) -/* 801DB6F8 28 03 00 00 */ cmplwi r3, 0 -/* 801DB6FC 41 82 00 20 */ beq lbl_801DB71C -/* 801DB700 C0 22 A8 B4 */ lfs f1, lit_4305(r2) -/* 801DB704 C0 42 A8 B8 */ lfs f2, lit_4306(r2) -/* 801DB708 48 05 E6 91 */ bl translate__17dMsgScrn3Select_cFff -/* 801DB70C 80 7E 00 9C */ lwz r3, 0x9c(r30) -/* 801DB710 C0 22 A8 88 */ lfs f1, lit_4062(r2) -/* 801DB714 FC 40 08 90 */ fmr f2, f1 -/* 801DB718 48 05 E6 BD */ bl draw__17dMsgScrn3Select_cFff -lbl_801DB71C: -/* 801DB71C 80 7E 00 98 */ lwz r3, 0x98(r30) -/* 801DB720 28 03 00 00 */ cmplwi r3, 0 -/* 801DB724 41 82 00 08 */ beq lbl_801DB72C -/* 801DB728 48 06 06 99 */ bl draw__15dMsgScrnArrow_cFv -lbl_801DB72C: -/* 801DB72C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DB730 48 18 6A ED */ bl _restgpr_26 -/* 801DB734 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801DB738 7C 08 03 A6 */ mtlr r0 -/* 801DB73C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DB740 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/getAlphaRatio__19dMenu_ItemExplain_cFv.s b/asm/d/menu/d_menu_item_explain/getAlphaRatio__19dMenu_ItemExplain_cFv.s deleted file mode 100644 index 5efe40caa2d..00000000000 --- a/asm/d/menu/d_menu_item_explain/getAlphaRatio__19dMenu_ItemExplain_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801DC7AC: -/* 801DC7AC 88 03 00 E0 */ lbz r0, 0xe0(r3) -/* 801DC7B0 2C 00 00 01 */ cmpwi r0, 1 -/* 801DC7B4 41 82 00 20 */ beq lbl_801DC7D4 -/* 801DC7B8 40 80 00 10 */ bge lbl_801DC7C8 -/* 801DC7BC 2C 00 00 00 */ cmpwi r0, 0 -/* 801DC7C0 40 80 00 2C */ bge lbl_801DC7EC -/* 801DC7C4 48 00 00 30 */ b lbl_801DC7F4 -lbl_801DC7C8: -/* 801DC7C8 2C 00 00 05 */ cmpwi r0, 5 -/* 801DC7CC 41 82 00 08 */ beq lbl_801DC7D4 -/* 801DC7D0 48 00 00 24 */ b lbl_801DC7F4 -lbl_801DC7D4: -/* 801DC7D4 C0 22 A8 8C */ lfs f1, lit_4063(r2) -/* 801DC7D8 C0 03 00 BC */ lfs f0, 0xbc(r3) -/* 801DC7DC EC 21 00 28 */ fsubs f1, f1, f0 -/* 801DC7E0 C0 02 A8 D0 */ lfs f0, lit_4820(r2) -/* 801DC7E4 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801DC7E8 4E 80 00 20 */ blr -lbl_801DC7EC: -/* 801DC7EC C0 22 A8 C4 */ lfs f1, lit_4348(r2) -/* 801DC7F0 4E 80 00 20 */ blr -lbl_801DC7F4: -/* 801DC7F4 C0 22 A8 88 */ lfs f1, lit_4062(r2) -/* 801DC7F8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/getWarpMarkFlag__19dMenu_ItemExplain_cFv.s b/asm/d/menu/d_menu_item_explain/getWarpMarkFlag__19dMenu_ItemExplain_cFv.s deleted file mode 100644 index 37d0935e62d..00000000000 --- a/asm/d/menu/d_menu_item_explain/getWarpMarkFlag__19dMenu_ItemExplain_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_801DCB54: -/* 801DCB54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801DCB58 7C 08 02 A6 */ mflr r0 -/* 801DCB5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801DCB60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801DCB64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801DCB68 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 801DCB6C 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 801DCB70 7D 89 03 A6 */ mtctr r12 -/* 801DCB74 4E 80 04 21 */ bctrl -/* 801DCB78 A0 03 00 0A */ lhz r0, 0xa(r3) -/* 801DCB7C 54 00 07 7E */ clrlwi r0, r0, 0x1d -/* 801DCB80 2C 00 00 01 */ cmpwi r0, 1 -/* 801DCB84 40 82 00 0C */ bne lbl_801DCB90 -/* 801DCB88 4B E5 27 69 */ bl dComIfGs_getWarpMarkFlag__Fv -/* 801DCB8C 48 00 00 20 */ b lbl_801DCBAC -lbl_801DCB90: -/* 801DCB90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801DCB94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801DCB98 88 03 00 98 */ lbz r0, 0x98(r3) -/* 801DCB9C 7C 00 07 74 */ extsb r0, r0 -/* 801DCBA0 54 00 0F FE */ srwi r0, r0, 0x1f -/* 801DCBA4 68 00 00 01 */ xori r0, r0, 1 -/* 801DCBA8 54 03 06 3E */ clrlwi r3, r0, 0x18 -lbl_801DCBAC: -/* 801DCBAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801DCBB0 7C 08 03 A6 */ mtlr r0 -/* 801DCBB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DCBB8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/move__19dMenu_ItemExplain_cFv.s b/asm/d/menu/d_menu_item_explain/move__19dMenu_ItemExplain_cFv.s deleted file mode 100644 index dd56e350e4d..00000000000 --- a/asm/d/menu/d_menu_item_explain/move__19dMenu_ItemExplain_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_801DB470: -/* 801DB470 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801DB474 7C 08 02 A6 */ mflr r0 -/* 801DB478 90 01 00 14 */ stw r0, 0x14(r1) -/* 801DB47C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801DB480 93 C1 00 08 */ stw r30, 8(r1) -/* 801DB484 7C 7E 1B 78 */ mr r30, r3 -/* 801DB488 8B E3 00 E0 */ lbz r31, 0xe0(r3) -/* 801DB48C 1C BF 00 0C */ mulli r5, r31, 0xc -/* 801DB490 3C 80 80 3C */ lis r4, move_process@ha /* 0x803BD9AC@ha */ -/* 801DB494 38 04 D9 AC */ addi r0, r4, move_process@l /* 0x803BD9AC@l */ -/* 801DB498 7D 80 2A 14 */ add r12, r0, r5 -/* 801DB49C 48 18 6B E9 */ bl __ptmf_scall -/* 801DB4A0 60 00 00 00 */ nop -/* 801DB4A4 88 1E 00 E0 */ lbz r0, 0xe0(r30) -/* 801DB4A8 7C 1F 00 40 */ cmplw r31, r0 -/* 801DB4AC 41 82 00 20 */ beq lbl_801DB4CC -/* 801DB4B0 7F C3 F3 78 */ mr r3, r30 -/* 801DB4B4 1C A0 00 0C */ mulli r5, r0, 0xc -/* 801DB4B8 3C 80 80 3C */ lis r4, init_process@ha /* 0x803BD91C@ha */ -/* 801DB4BC 38 04 D9 1C */ addi r0, r4, init_process@l /* 0x803BD91C@l */ -/* 801DB4C0 7D 80 2A 14 */ add r12, r0, r5 -/* 801DB4C4 48 18 6B C1 */ bl __ptmf_scall -/* 801DB4C8 60 00 00 00 */ nop -lbl_801DB4CC: -/* 801DB4CC 88 1E 00 E0 */ lbz r0, 0xe0(r30) -/* 801DB4D0 28 00 00 00 */ cmplwi r0, 0 -/* 801DB4D4 41 82 00 0C */ beq lbl_801DB4E0 -/* 801DB4D8 80 7E 00 70 */ lwz r3, 0x70(r30) -/* 801DB4DC 48 11 E1 B5 */ bl animation__9J2DScreenFv -lbl_801DB4E0: -/* 801DB4E0 3C 60 80 43 */ lis r3, g_ringHIO@ha /* 0x8042FAFC@ha */ -/* 801DB4E4 38 63 FA FC */ addi r3, r3, g_ringHIO@l /* 0x8042FAFC@l */ -/* 801DB4E8 C0 23 01 00 */ lfs f1, 0x100(r3) -/* 801DB4EC C0 1E 00 C0 */ lfs f0, 0xc0(r30) -/* 801DB4F0 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 801DB4F4 41 82 00 08 */ beq lbl_801DB4FC -/* 801DB4F8 D0 3E 00 C0 */ stfs f1, 0xc0(r30) -lbl_801DB4FC: -/* 801DB4FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801DB500 83 C1 00 08 */ lwz r30, 8(r1) -/* 801DB504 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801DB508 7C 08 03 A6 */ mtlr r0 -/* 801DB50C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DB510 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/move_init__19dMenu_ItemExplain_cFv.s b/asm/d/menu/d_menu_item_explain/move_init__19dMenu_ItemExplain_cFv.s deleted file mode 100644 index 0c4d472262a..00000000000 --- a/asm/d/menu/d_menu_item_explain/move_init__19dMenu_ItemExplain_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_801DBB50: -/* 801DBB50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801DBB54 7C 08 02 A6 */ mflr r0 -/* 801DBB58 90 01 00 14 */ stw r0, 0x14(r1) -/* 801DBB5C 80 63 00 98 */ lwz r3, 0x98(r3) -/* 801DBB60 28 03 00 00 */ cmplwi r3, 0 -/* 801DBB64 41 82 00 08 */ beq lbl_801DBB6C -/* 801DBB68 48 06 02 CD */ bl arwAnimeInit__15dMsgScrnArrow_cFv -lbl_801DBB6C: -/* 801DBB6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801DBB70 7C 08 03 A6 */ mtlr r0 -/* 801DBB74 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DBB78 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/move_next_init__19dMenu_ItemExplain_cFv.s b/asm/d/menu/d_menu_item_explain/move_next_init__19dMenu_ItemExplain_cFv.s deleted file mode 100644 index efa699504b4..00000000000 --- a/asm/d/menu/d_menu_item_explain/move_next_init__19dMenu_ItemExplain_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_801DC1E0: -/* 801DC1E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801DC1E4 7C 08 02 A6 */ mflr r0 -/* 801DC1E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801DC1EC 38 00 05 1D */ li r0, 0x51d -/* 801DC1F0 90 03 00 C8 */ stw r0, 0xc8(r3) -/* 801DC1F4 80 63 00 98 */ lwz r3, 0x98(r3) -/* 801DC1F8 28 03 00 00 */ cmplwi r3, 0 -/* 801DC1FC 41 82 00 08 */ beq lbl_801DC204 -/* 801DC200 48 05 FC 35 */ bl arwAnimeInit__15dMsgScrnArrow_cFv -lbl_801DC204: -/* 801DC204 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801DC208 7C 08 03 A6 */ mtlr r0 -/* 801DC20C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DC210 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/move_next_proc__19dMenu_ItemExplain_cFv.s b/asm/d/menu/d_menu_item_explain/move_next_proc__19dMenu_ItemExplain_cFv.s deleted file mode 100644 index 8bc06b20a2f..00000000000 --- a/asm/d/menu/d_menu_item_explain/move_next_proc__19dMenu_ItemExplain_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_801DC214: -/* 801DC214 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801DC218 7C 08 02 A6 */ mflr r0 -/* 801DC21C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801DC220 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801DC224 7C 7F 1B 78 */ mr r31, r3 -/* 801DC228 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 801DC22C 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 801DC230 80 63 00 34 */ lwz r3, 0x34(r3) -/* 801DC234 54 64 05 EF */ rlwinm. r4, r3, 0, 0x17, 0x17 -/* 801DC238 40 82 00 0C */ bne lbl_801DC244 -/* 801DC23C 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 -/* 801DC240 41 82 00 90 */ beq lbl_801DC2D0 -lbl_801DC244: -/* 801DC244 28 04 00 00 */ cmplwi r4, 0 -/* 801DC248 41 82 00 10 */ beq lbl_801DC258 -/* 801DC24C 38 00 00 01 */ li r0, 1 -/* 801DC250 98 1F 00 E3 */ stb r0, 0xe3(r31) -/* 801DC254 48 00 00 14 */ b lbl_801DC268 -lbl_801DC258: -/* 801DC258 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 -/* 801DC25C 41 82 00 0C */ beq lbl_801DC268 -/* 801DC260 38 00 00 02 */ li r0, 2 -/* 801DC264 98 1F 00 E3 */ stb r0, 0xe3(r31) -lbl_801DC268: -/* 801DC268 88 1F 00 E5 */ lbz r0, 0xe5(r31) -/* 801DC26C 28 00 00 02 */ cmplwi r0, 2 -/* 801DC270 40 82 00 48 */ bne lbl_801DC2B8 -/* 801DC274 38 00 00 05 */ li r0, 5 -/* 801DC278 98 1F 00 E0 */ stb r0, 0xe0(r31) -/* 801DC27C 38 00 00 52 */ li r0, 0x52 -/* 801DC280 90 01 00 08 */ stw r0, 8(r1) -/* 801DC284 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801DC288 38 81 00 08 */ addi r4, r1, 8 -/* 801DC28C 38 A0 00 00 */ li r5, 0 -/* 801DC290 38 C0 00 00 */ li r6, 0 -/* 801DC294 38 E0 00 00 */ li r7, 0 -/* 801DC298 C0 22 A8 C4 */ lfs f1, lit_4348(r2) -/* 801DC29C FC 40 08 90 */ fmr f2, f1 -/* 801DC2A0 C0 62 A8 B0 */ lfs f3, lit_4304(r2) -/* 801DC2A4 FC 80 18 90 */ fmr f4, f3 -/* 801DC2A8 39 00 00 00 */ li r8, 0 -/* 801DC2AC 48 0C F6 D9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801DC2B0 48 04 27 21 */ bl dMeter2Info_set2DVibration__Fv -/* 801DC2B4 48 00 00 14 */ b lbl_801DC2C8 -lbl_801DC2B8: -/* 801DC2B8 38 00 00 02 */ li r0, 2 -/* 801DC2BC 98 1F 00 E0 */ stb r0, 0xe0(r31) -/* 801DC2C0 80 1F 00 C4 */ lwz r0, 0xc4(r31) -/* 801DC2C4 90 1F 00 C8 */ stw r0, 0xc8(r31) -lbl_801DC2C8: -/* 801DC2C8 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DC2CC 48 05 E3 B5 */ bl selAnimeEnd__17dMsgScrn3Select_cFv -lbl_801DC2D0: -/* 801DC2D0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801DC2D4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801DC2D8 7C 08 03 A6 */ mtlr r0 -/* 801DC2DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DC2E0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/move_proc__19dMenu_ItemExplain_cFv.s b/asm/d/menu/d_menu_item_explain/move_proc__19dMenu_ItemExplain_cFv.s deleted file mode 100644 index 39d73d903a3..00000000000 --- a/asm/d/menu/d_menu_item_explain/move_proc__19dMenu_ItemExplain_cFv.s +++ /dev/null @@ -1,87 +0,0 @@ -lbl_801DBB7C: -/* 801DBB7C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801DBB80 7C 08 02 A6 */ mflr r0 -/* 801DBB84 90 01 00 24 */ stw r0, 0x24(r1) -/* 801DBB88 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801DBB8C 7C 7F 1B 78 */ mr r31, r3 -/* 801DBB90 88 03 00 E1 */ lbz r0, 0xe1(r3) -/* 801DBB94 28 00 00 25 */ cmplwi r0, 0x25 -/* 801DBB98 40 82 00 20 */ bne lbl_801DBBB8 -/* 801DBB9C 88 1F 00 E5 */ lbz r0, 0xe5(r31) -/* 801DBBA0 28 00 00 02 */ cmplwi r0, 2 -/* 801DBBA4 40 82 00 14 */ bne lbl_801DBBB8 -/* 801DBBA8 80 7F 00 98 */ lwz r3, 0x98(r31) -/* 801DBBAC 28 03 00 00 */ cmplwi r3, 0 -/* 801DBBB0 41 82 00 08 */ beq lbl_801DBBB8 -/* 801DBBB4 48 06 02 DD */ bl arwAnimeMove__15dMsgScrnArrow_cFv -lbl_801DBBB8: -/* 801DBBB8 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 801DBBBC 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 801DBBC0 80 63 00 34 */ lwz r3, 0x34(r3) -/* 801DBBC4 54 64 05 EF */ rlwinm. r4, r3, 0, 0x17, 0x17 -/* 801DBBC8 40 82 00 34 */ bne lbl_801DBBFC -/* 801DBBCC 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 -/* 801DBBD0 40 82 00 2C */ bne lbl_801DBBFC -/* 801DBBD4 88 1F 00 E4 */ lbz r0, 0xe4(r31) -/* 801DBBD8 28 00 00 00 */ cmplwi r0, 0 -/* 801DBBDC 40 82 00 20 */ bne lbl_801DBBFC -/* 801DBBE0 88 1F 00 E7 */ lbz r0, 0xe7(r31) -/* 801DBBE4 28 00 00 00 */ cmplwi r0, 0 -/* 801DBBE8 41 82 00 B8 */ beq lbl_801DBCA0 -/* 801DBBEC 54 60 05 6B */ rlwinm. r0, r3, 0, 0x15, 0x15 -/* 801DBBF0 40 82 00 0C */ bne lbl_801DBBFC -/* 801DBBF4 54 60 05 29 */ rlwinm. r0, r3, 0, 0x14, 0x14 -/* 801DBBF8 41 82 00 A8 */ beq lbl_801DBCA0 -lbl_801DBBFC: -/* 801DBBFC 88 1F 00 E4 */ lbz r0, 0xe4(r31) -/* 801DBC00 28 00 00 00 */ cmplwi r0, 0 -/* 801DBC04 41 82 00 10 */ beq lbl_801DBC14 -/* 801DBC08 38 00 00 06 */ li r0, 6 -/* 801DBC0C 98 1F 00 E3 */ stb r0, 0xe3(r31) -/* 801DBC10 48 00 00 50 */ b lbl_801DBC60 -lbl_801DBC14: -/* 801DBC14 28 04 00 00 */ cmplwi r4, 0 -/* 801DBC18 41 82 00 10 */ beq lbl_801DBC28 -/* 801DBC1C 38 00 00 01 */ li r0, 1 -/* 801DBC20 98 1F 00 E3 */ stb r0, 0xe3(r31) -/* 801DBC24 48 00 00 3C */ b lbl_801DBC60 -lbl_801DBC28: -/* 801DBC28 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 -/* 801DBC2C 41 82 00 10 */ beq lbl_801DBC3C -/* 801DBC30 38 00 00 02 */ li r0, 2 -/* 801DBC34 98 1F 00 E3 */ stb r0, 0xe3(r31) -/* 801DBC38 48 00 00 28 */ b lbl_801DBC60 -lbl_801DBC3C: -/* 801DBC3C 54 60 05 6B */ rlwinm. r0, r3, 0, 0x15, 0x15 -/* 801DBC40 41 82 00 10 */ beq lbl_801DBC50 -/* 801DBC44 38 00 00 03 */ li r0, 3 -/* 801DBC48 98 1F 00 E3 */ stb r0, 0xe3(r31) -/* 801DBC4C 48 00 00 14 */ b lbl_801DBC60 -lbl_801DBC50: -/* 801DBC50 54 60 05 29 */ rlwinm. r0, r3, 0, 0x14, 0x14 -/* 801DBC54 41 82 00 0C */ beq lbl_801DBC60 -/* 801DBC58 38 00 00 04 */ li r0, 4 -/* 801DBC5C 98 1F 00 E3 */ stb r0, 0xe3(r31) -lbl_801DBC60: -/* 801DBC60 38 00 00 05 */ li r0, 5 -/* 801DBC64 98 1F 00 E0 */ stb r0, 0xe0(r31) -/* 801DBC68 38 00 00 52 */ li r0, 0x52 -/* 801DBC6C 90 01 00 08 */ stw r0, 8(r1) -/* 801DBC70 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801DBC74 38 81 00 08 */ addi r4, r1, 8 -/* 801DBC78 38 A0 00 00 */ li r5, 0 -/* 801DBC7C 38 C0 00 00 */ li r6, 0 -/* 801DBC80 38 E0 00 00 */ li r7, 0 -/* 801DBC84 C0 22 A8 C4 */ lfs f1, lit_4348(r2) -/* 801DBC88 FC 40 08 90 */ fmr f2, f1 -/* 801DBC8C C0 62 A8 B0 */ lfs f3, lit_4304(r2) -/* 801DBC90 FC 80 18 90 */ fmr f4, f3 -/* 801DBC94 39 00 00 00 */ li r8, 0 -/* 801DBC98 48 0C FC ED */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801DBC9C 48 04 2D 35 */ bl dMeter2Info_set2DVibration__Fv -lbl_801DBCA0: -/* 801DBCA0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801DBCA4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801DBCA8 7C 08 03 A6 */ mtlr r0 -/* 801DBCAC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DBCB0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/move_select_init__19dMenu_ItemExplain_cFv.s b/asm/d/menu/d_menu_item_explain/move_select_init__19dMenu_ItemExplain_cFv.s deleted file mode 100644 index c503ae0d3fc..00000000000 --- a/asm/d/menu/d_menu_item_explain/move_select_init__19dMenu_ItemExplain_cFv.s +++ /dev/null @@ -1,171 +0,0 @@ -lbl_801DBCB4: -/* 801DBCB4 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 801DBCB8 7C 08 02 A6 */ mflr r0 -/* 801DBCBC 90 01 00 94 */ stw r0, 0x94(r1) -/* 801DBCC0 DB E1 00 80 */ stfd f31, 0x80(r1) -/* 801DBCC4 F3 E1 00 88 */ psq_st f31, 136(r1), 0, 0 /* qr0 */ -/* 801DBCC8 DB C1 00 70 */ stfd f30, 0x70(r1) -/* 801DBCCC F3 C1 00 78 */ psq_st f30, 120(r1), 0, 0 /* qr0 */ -/* 801DBCD0 DB A1 00 60 */ stfd f29, 0x60(r1) -/* 801DBCD4 F3 A1 00 68 */ psq_st f29, 104(r1), 0, 0 /* qr0 */ -/* 801DBCD8 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 801DBCDC 7C 7F 1B 78 */ mr r31, r3 -/* 801DBCE0 38 00 00 00 */ li r0, 0 -/* 801DBCE4 98 01 00 10 */ stb r0, 0x10(r1) -/* 801DBCE8 98 01 00 08 */ stb r0, 8(r1) -/* 801DBCEC 98 01 00 2C */ stb r0, 0x2c(r1) -/* 801DBCF0 98 01 00 19 */ stb r0, 0x19(r1) -/* 801DBCF4 48 00 0E 61 */ bl getWarpMarkFlag__19dMenu_ItemExplain_cFv -/* 801DBCF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801DBCFC 40 82 00 48 */ bne lbl_801DBD44 -/* 801DBD00 38 00 05 17 */ li r0, 0x517 -/* 801DBD04 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 801DBD08 38 00 00 00 */ li r0, 0 -/* 801DBD0C 98 1F 00 E2 */ stb r0, 0xe2(r31) -/* 801DBD10 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801DBD14 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801DBD18 38 80 05 18 */ li r4, 0x518 -/* 801DBD1C 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801DBD20 38 C0 00 00 */ li r6, 0 -/* 801DBD24 48 04 05 2D */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 801DBD28 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801DBD2C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801DBD30 38 80 05 19 */ li r4, 0x519 -/* 801DBD34 38 A1 00 08 */ addi r5, r1, 8 -/* 801DBD38 38 C0 00 00 */ li r6, 0 -/* 801DBD3C 48 04 05 15 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 801DBD40 48 00 00 44 */ b lbl_801DBD84 -lbl_801DBD44: -/* 801DBD44 38 00 05 1A */ li r0, 0x51a -/* 801DBD48 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 801DBD4C 38 00 00 00 */ li r0, 0 -/* 801DBD50 98 1F 00 E2 */ stb r0, 0xe2(r31) -/* 801DBD54 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801DBD58 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801DBD5C 38 80 05 1B */ li r4, 0x51b -/* 801DBD60 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801DBD64 38 C0 00 00 */ li r6, 0 -/* 801DBD68 48 04 04 E9 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 801DBD6C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801DBD70 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801DBD74 38 80 05 1C */ li r4, 0x51c -/* 801DBD78 38 A1 00 08 */ addi r5, r1, 8 -/* 801DBD7C 38 C0 00 00 */ li r6, 0 -/* 801DBD80 48 04 04 D1 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -lbl_801DBD84: -/* 801DBD84 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DBD88 48 05 EB F5 */ bl getCharSpace__17dMsgScrn3Select_cFv -/* 801DBD8C FF C0 08 90 */ fmr f30, f1 -/* 801DBD90 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DBD94 48 05 EB B9 */ bl getFontSize__17dMsgScrn3Select_cFv -/* 801DBD98 FF E0 08 90 */ fmr f31, f1 -/* 801DBD9C 4B E3 8C 55 */ bl mDoExt_getMesgFont__Fv -/* 801DBDA0 7C 64 1B 78 */ mr r4, r3 -/* 801DBDA4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801DBDA8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801DBDAC FC 20 F8 90 */ fmr f1, f31 -/* 801DBDB0 FC 40 F0 90 */ fmr f2, f30 -/* 801DBDB4 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801DBDB8 48 04 0A 45 */ bl getStringLength__13dMeter2Info_cFP7JUTFontffPc -/* 801DBDBC FF A0 08 90 */ fmr f29, f1 -/* 801DBDC0 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DBDC4 48 05 EB B9 */ bl getCharSpace__17dMsgScrn3Select_cFv -/* 801DBDC8 FF E0 08 90 */ fmr f31, f1 -/* 801DBDCC 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DBDD0 48 05 EB 7D */ bl getFontSize__17dMsgScrn3Select_cFv -/* 801DBDD4 FF C0 08 90 */ fmr f30, f1 -/* 801DBDD8 4B E3 8C 19 */ bl mDoExt_getMesgFont__Fv -/* 801DBDDC 7C 64 1B 78 */ mr r4, r3 -/* 801DBDE0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801DBDE4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801DBDE8 FC 20 F0 90 */ fmr f1, f30 -/* 801DBDEC FC 40 F8 90 */ fmr f2, f31 -/* 801DBDF0 38 A1 00 08 */ addi r5, r1, 8 -/* 801DBDF4 48 04 0A 09 */ bl getStringLength__13dMeter2Info_cFP7JUTFontffPc -/* 801DBDF8 FF C0 08 90 */ fmr f30, f1 -/* 801DBDFC FC 1D F0 40 */ fcmpo cr0, f29, f30 -/* 801DBE00 40 80 00 0C */ bge lbl_801DBE0C -/* 801DBE04 FF E0 F0 90 */ fmr f31, f30 -/* 801DBE08 48 00 00 08 */ b lbl_801DBE10 -lbl_801DBE0C: -/* 801DBE0C FF E0 E8 90 */ fmr f31, f29 -lbl_801DBE10: -/* 801DBE10 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DBE14 48 05 EB 21 */ bl getTextBoxWidth__17dMsgScrn3Select_cFv -/* 801DBE18 FC 1F 08 40 */ fcmpo cr0, f31, f1 -/* 801DBE1C 40 80 00 10 */ bge lbl_801DBE2C -/* 801DBE20 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DBE24 48 05 EB 11 */ bl getTextBoxWidth__17dMsgScrn3Select_cFv -/* 801DBE28 FF E0 08 90 */ fmr f31, f1 -lbl_801DBE2C: -/* 801DBE2C 38 61 00 2C */ addi r3, r1, 0x2c -/* 801DBE30 38 80 00 14 */ li r4, 0x14 -/* 801DBE34 3C A0 80 39 */ lis r5, d_menu_d_menu_item_explain__stringBase0@ha /* 0x80396990@ha */ -/* 801DBE38 38 A5 69 90 */ addi r5, r5, d_menu_d_menu_item_explain__stringBase0@l /* 0x80396990@l */ -/* 801DBE3C 38 A5 00 2C */ addi r5, r5, 0x2c -/* 801DBE40 C0 22 A8 94 */ lfs f1, lit_4065(r2) -/* 801DBE44 EC 1F E8 28 */ fsubs f0, f31, f29 -/* 801DBE48 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801DBE4C FC 00 00 1E */ fctiwz f0, f0 -/* 801DBE50 D8 01 00 40 */ stfd f0, 0x40(r1) -/* 801DBE54 80 C1 00 44 */ lwz r6, 0x44(r1) -/* 801DBE58 4C C6 31 82 */ crclr 6 -/* 801DBE5C 48 18 A7 61 */ bl snprintf -/* 801DBE60 38 61 00 2C */ addi r3, r1, 0x2c -/* 801DBE64 38 81 00 10 */ addi r4, r1, 0x10 -/* 801DBE68 48 18 CC 55 */ bl strcat -/* 801DBE6C 38 61 00 18 */ addi r3, r1, 0x18 -/* 801DBE70 38 80 00 14 */ li r4, 0x14 -/* 801DBE74 3C A0 80 39 */ lis r5, d_menu_d_menu_item_explain__stringBase0@ha /* 0x80396990@ha */ -/* 801DBE78 38 A5 69 90 */ addi r5, r5, d_menu_d_menu_item_explain__stringBase0@l /* 0x80396990@l */ -/* 801DBE7C 38 A5 00 2C */ addi r5, r5, 0x2c -/* 801DBE80 C0 22 A8 94 */ lfs f1, lit_4065(r2) -/* 801DBE84 EC 1F F0 28 */ fsubs f0, f31, f30 -/* 801DBE88 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801DBE8C FC 00 00 1E */ fctiwz f0, f0 -/* 801DBE90 D8 01 00 48 */ stfd f0, 0x48(r1) -/* 801DBE94 80 C1 00 4C */ lwz r6, 0x4c(r1) -/* 801DBE98 4C C6 31 82 */ crclr 6 -/* 801DBE9C 48 18 A7 21 */ bl snprintf -/* 801DBEA0 38 61 00 18 */ addi r3, r1, 0x18 -/* 801DBEA4 38 81 00 08 */ addi r4, r1, 8 -/* 801DBEA8 48 18 CC 15 */ bl strcat -/* 801DBEAC 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DBEB0 3C 80 80 39 */ lis r4, d_menu_d_menu_item_explain__stringBase0@ha /* 0x80396990@ha */ -/* 801DBEB4 38 84 69 90 */ addi r4, r4, d_menu_d_menu_item_explain__stringBase0@l /* 0x80396990@l */ -/* 801DBEB8 38 84 00 1B */ addi r4, r4, 0x1b -/* 801DBEBC 38 A1 00 2C */ addi r5, r1, 0x2c -/* 801DBEC0 38 C1 00 18 */ addi r6, r1, 0x18 -/* 801DBEC4 48 05 DD B5 */ bl setString__17dMsgScrn3Select_cFPcPcPc -/* 801DBEC8 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DBECC 3C 80 80 39 */ lis r4, d_menu_d_menu_item_explain__stringBase0@ha /* 0x80396990@ha */ -/* 801DBED0 38 84 69 90 */ addi r4, r4, d_menu_d_menu_item_explain__stringBase0@l /* 0x80396990@l */ -/* 801DBED4 38 84 00 1B */ addi r4, r4, 0x1b -/* 801DBED8 7C 85 23 78 */ mr r5, r4 -/* 801DBEDC 7C 86 23 78 */ mr r6, r4 -/* 801DBEE0 48 05 DE 29 */ bl setRubyString__17dMsgScrn3Select_cFPcPcPc -/* 801DBEE4 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DBEE8 38 80 00 02 */ li r4, 2 -/* 801DBEEC 88 BF 00 E2 */ lbz r5, 0xe2(r31) -/* 801DBEF0 38 05 00 01 */ addi r0, r5, 1 -/* 801DBEF4 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 801DBEF8 38 C0 00 00 */ li r6, 0 -/* 801DBEFC FC 20 F8 90 */ fmr f1, f31 -/* 801DBF00 38 E0 00 00 */ li r7, 0 -/* 801DBF04 48 05 E1 91 */ bl selAnimeInit__17dMsgScrn3Select_cFUcUcUcfUc -/* 801DBF08 80 7F 00 98 */ lwz r3, 0x98(r31) -/* 801DBF0C 28 03 00 00 */ cmplwi r3, 0 -/* 801DBF10 41 82 00 08 */ beq lbl_801DBF18 -/* 801DBF14 48 05 FF 21 */ bl arwAnimeInit__15dMsgScrnArrow_cFv -lbl_801DBF18: -/* 801DBF18 E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 /* qr0 */ -/* 801DBF1C CB E1 00 80 */ lfd f31, 0x80(r1) -/* 801DBF20 E3 C1 00 78 */ psq_l f30, 120(r1), 0, 0 /* qr0 */ -/* 801DBF24 CB C1 00 70 */ lfd f30, 0x70(r1) -/* 801DBF28 E3 A1 00 68 */ psq_l f29, 104(r1), 0, 0 /* qr0 */ -/* 801DBF2C CB A1 00 60 */ lfd f29, 0x60(r1) -/* 801DBF30 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 801DBF34 80 01 00 94 */ lwz r0, 0x94(r1) -/* 801DBF38 7C 08 03 A6 */ mtlr r0 -/* 801DBF3C 38 21 00 90 */ addi r1, r1, 0x90 -/* 801DBF40 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/move_select_proc__19dMenu_ItemExplain_cFv.s b/asm/d/menu/d_menu_item_explain/move_select_proc__19dMenu_ItemExplain_cFv.s deleted file mode 100644 index 531867ee9e1..00000000000 --- a/asm/d/menu/d_menu_item_explain/move_select_proc__19dMenu_ItemExplain_cFv.s +++ /dev/null @@ -1,179 +0,0 @@ -lbl_801DBF44: -/* 801DBF44 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801DBF48 7C 08 02 A6 */ mflr r0 -/* 801DBF4C 90 01 00 34 */ stw r0, 0x34(r1) -/* 801DBF50 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 801DBF54 7C 7F 1B 78 */ mr r31, r3 -/* 801DBF58 80 63 00 B8 */ lwz r3, 0xb8(r3) -/* 801DBF5C 4B E5 62 41 */ bl checkTrigger__9STControlFv -/* 801DBF60 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 801DBF64 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 801DBF68 80 63 00 34 */ lwz r3, 0x34(r3) -/* 801DBF6C 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 -/* 801DBF70 41 82 00 E4 */ beq lbl_801DC054 -/* 801DBF74 38 00 00 01 */ li r0, 1 -/* 801DBF78 98 1F 00 E3 */ stb r0, 0xe3(r31) -/* 801DBF7C 88 1F 00 E2 */ lbz r0, 0xe2(r31) -/* 801DBF80 28 00 00 00 */ cmplwi r0, 0 -/* 801DBF84 40 82 00 38 */ bne lbl_801DBFBC -/* 801DBF88 7F E3 FB 78 */ mr r3, r31 -/* 801DBF8C 48 00 0B C9 */ bl getWarpMarkFlag__19dMenu_ItemExplain_cFv -/* 801DBF90 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801DBF94 40 82 00 18 */ bne lbl_801DBFAC -/* 801DBF98 38 00 00 01 */ li r0, 1 -/* 801DBF9C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801DBFA0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801DBFA4 98 03 00 C0 */ stb r0, 0xc0(r3) -/* 801DBFA8 48 00 00 14 */ b lbl_801DBFBC -lbl_801DBFAC: -/* 801DBFAC 38 00 00 02 */ li r0, 2 -/* 801DBFB0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801DBFB4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801DBFB8 98 03 00 C0 */ stb r0, 0xc0(r3) -lbl_801DBFBC: -/* 801DBFBC 88 1F 00 E5 */ lbz r0, 0xe5(r31) -/* 801DBFC0 28 00 00 02 */ cmplwi r0, 2 -/* 801DBFC4 40 82 00 48 */ bne lbl_801DC00C -/* 801DBFC8 38 00 00 05 */ li r0, 5 -/* 801DBFCC 98 1F 00 E0 */ stb r0, 0xe0(r31) -/* 801DBFD0 38 00 00 52 */ li r0, 0x52 -/* 801DBFD4 90 01 00 18 */ stw r0, 0x18(r1) -/* 801DBFD8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801DBFDC 38 81 00 18 */ addi r4, r1, 0x18 -/* 801DBFE0 38 A0 00 00 */ li r5, 0 -/* 801DBFE4 38 C0 00 00 */ li r6, 0 -/* 801DBFE8 38 E0 00 00 */ li r7, 0 -/* 801DBFEC C0 22 A8 C4 */ lfs f1, lit_4348(r2) -/* 801DBFF0 FC 40 08 90 */ fmr f2, f1 -/* 801DBFF4 C0 62 A8 B0 */ lfs f3, lit_4304(r2) -/* 801DBFF8 FC 80 18 90 */ fmr f4, f3 -/* 801DBFFC 39 00 00 00 */ li r8, 0 -/* 801DC000 48 0C F9 85 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801DC004 48 04 29 CD */ bl dMeter2Info_set2DVibration__Fv -/* 801DC008 48 00 00 14 */ b lbl_801DC01C -lbl_801DC00C: -/* 801DC00C 38 00 00 02 */ li r0, 2 -/* 801DC010 98 1F 00 E0 */ stb r0, 0xe0(r31) -/* 801DC014 80 1F 00 C4 */ lwz r0, 0xc4(r31) -/* 801DC018 90 1F 00 C8 */ stw r0, 0xc8(r31) -lbl_801DC01C: -/* 801DC01C 38 00 00 63 */ li r0, 0x63 -/* 801DC020 90 01 00 14 */ stw r0, 0x14(r1) -/* 801DC024 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801DC028 38 81 00 14 */ addi r4, r1, 0x14 -/* 801DC02C 38 A0 00 00 */ li r5, 0 -/* 801DC030 38 C0 00 00 */ li r6, 0 -/* 801DC034 38 E0 00 00 */ li r7, 0 -/* 801DC038 C0 22 A8 C4 */ lfs f1, lit_4348(r2) -/* 801DC03C FC 40 08 90 */ fmr f2, f1 -/* 801DC040 C0 62 A8 B0 */ lfs f3, lit_4304(r2) -/* 801DC044 FC 80 18 90 */ fmr f4, f3 -/* 801DC048 39 00 00 00 */ li r8, 0 -/* 801DC04C 48 0C F9 39 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801DC050 48 00 01 48 */ b lbl_801DC198 -lbl_801DC054: -/* 801DC054 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 -/* 801DC058 41 82 00 6C */ beq lbl_801DC0C4 -/* 801DC05C 38 60 00 02 */ li r3, 2 -/* 801DC060 98 7F 00 E3 */ stb r3, 0xe3(r31) -/* 801DC064 88 1F 00 E5 */ lbz r0, 0xe5(r31) -/* 801DC068 28 00 00 02 */ cmplwi r0, 2 -/* 801DC06C 40 82 00 48 */ bne lbl_801DC0B4 -/* 801DC070 38 00 00 05 */ li r0, 5 -/* 801DC074 98 1F 00 E0 */ stb r0, 0xe0(r31) -/* 801DC078 38 00 00 52 */ li r0, 0x52 -/* 801DC07C 90 01 00 10 */ stw r0, 0x10(r1) -/* 801DC080 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801DC084 38 81 00 10 */ addi r4, r1, 0x10 -/* 801DC088 38 A0 00 00 */ li r5, 0 -/* 801DC08C 38 C0 00 00 */ li r6, 0 -/* 801DC090 38 E0 00 00 */ li r7, 0 -/* 801DC094 C0 22 A8 C4 */ lfs f1, lit_4348(r2) -/* 801DC098 FC 40 08 90 */ fmr f2, f1 -/* 801DC09C C0 62 A8 B0 */ lfs f3, lit_4304(r2) -/* 801DC0A0 FC 80 18 90 */ fmr f4, f3 -/* 801DC0A4 39 00 00 00 */ li r8, 0 -/* 801DC0A8 48 0C F8 DD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801DC0AC 48 04 29 25 */ bl dMeter2Info_set2DVibration__Fv -/* 801DC0B0 48 00 00 E8 */ b lbl_801DC198 -lbl_801DC0B4: -/* 801DC0B4 98 7F 00 E0 */ stb r3, 0xe0(r31) -/* 801DC0B8 80 1F 00 C4 */ lwz r0, 0xc4(r31) -/* 801DC0BC 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 801DC0C0 48 00 00 D8 */ b lbl_801DC198 -lbl_801DC0C4: -/* 801DC0C4 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DC0C8 48 05 DB 9D */ bl isSelect__17dMsgScrn3Select_cFv -/* 801DC0CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801DC0D0 41 82 00 60 */ beq lbl_801DC130 -/* 801DC0D4 80 7F 00 B8 */ lwz r3, 0xb8(r31) -/* 801DC0D8 4B E5 64 4D */ bl checkUpTrigger__9STControlFv -/* 801DC0DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801DC0E0 41 82 00 50 */ beq lbl_801DC130 -/* 801DC0E4 88 1F 00 E2 */ lbz r0, 0xe2(r31) -/* 801DC0E8 28 00 00 01 */ cmplwi r0, 1 -/* 801DC0EC 40 82 00 AC */ bne lbl_801DC198 -/* 801DC0F0 38 00 00 00 */ li r0, 0 -/* 801DC0F4 98 1F 00 E2 */ stb r0, 0xe2(r31) -/* 801DC0F8 38 00 00 63 */ li r0, 0x63 -/* 801DC0FC 90 01 00 0C */ stw r0, 0xc(r1) -/* 801DC100 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801DC104 38 81 00 0C */ addi r4, r1, 0xc -/* 801DC108 38 A0 00 00 */ li r5, 0 -/* 801DC10C 38 C0 00 00 */ li r6, 0 -/* 801DC110 38 E0 00 00 */ li r7, 0 -/* 801DC114 C0 22 A8 C4 */ lfs f1, lit_4348(r2) -/* 801DC118 FC 40 08 90 */ fmr f2, f1 -/* 801DC11C C0 62 A8 B0 */ lfs f3, lit_4304(r2) -/* 801DC120 FC 80 18 90 */ fmr f4, f3 -/* 801DC124 39 00 00 00 */ li r8, 0 -/* 801DC128 48 0C F8 5D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801DC12C 48 00 00 6C */ b lbl_801DC198 -lbl_801DC130: -/* 801DC130 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DC134 48 05 DB 31 */ bl isSelect__17dMsgScrn3Select_cFv -/* 801DC138 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801DC13C 41 82 00 5C */ beq lbl_801DC198 -/* 801DC140 80 7F 00 B8 */ lwz r3, 0xb8(r31) -/* 801DC144 4B E5 64 5D */ bl checkDownTrigger__9STControlFv -/* 801DC148 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801DC14C 41 82 00 4C */ beq lbl_801DC198 -/* 801DC150 88 1F 00 E2 */ lbz r0, 0xe2(r31) -/* 801DC154 28 00 00 00 */ cmplwi r0, 0 -/* 801DC158 40 82 00 40 */ bne lbl_801DC198 -/* 801DC15C 38 00 00 01 */ li r0, 1 -/* 801DC160 98 1F 00 E2 */ stb r0, 0xe2(r31) -/* 801DC164 38 00 00 63 */ li r0, 0x63 -/* 801DC168 90 01 00 08 */ stw r0, 8(r1) -/* 801DC16C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801DC170 38 81 00 08 */ addi r4, r1, 8 -/* 801DC174 38 A0 00 00 */ li r5, 0 -/* 801DC178 38 C0 00 00 */ li r6, 0 -/* 801DC17C 38 E0 00 00 */ li r7, 0 -/* 801DC180 C0 22 A8 C4 */ lfs f1, lit_4348(r2) -/* 801DC184 FC 40 08 90 */ fmr f2, f1 -/* 801DC188 C0 62 A8 B0 */ lfs f3, lit_4304(r2) -/* 801DC18C FC 80 18 90 */ fmr f4, f3 -/* 801DC190 39 00 00 00 */ li r8, 0 -/* 801DC194 48 0C F7 F1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_801DC198: -/* 801DC198 88 1F 00 E0 */ lbz r0, 0xe0(r31) -/* 801DC19C 28 00 00 03 */ cmplwi r0, 3 -/* 801DC1A0 40 82 00 24 */ bne lbl_801DC1C4 -/* 801DC1A4 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DC1A8 38 80 00 02 */ li r4, 2 -/* 801DC1AC 88 BF 00 E2 */ lbz r5, 0xe2(r31) -/* 801DC1B0 38 05 00 01 */ addi r0, r5, 1 -/* 801DC1B4 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 801DC1B8 38 C0 00 00 */ li r6, 0 -/* 801DC1BC 48 05 E1 DD */ bl selAnimeMove__17dMsgScrn3Select_cFUcUcb -/* 801DC1C0 48 00 00 0C */ b lbl_801DC1CC -lbl_801DC1C4: -/* 801DC1C4 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DC1C8 48 05 E4 B9 */ bl selAnimeEnd__17dMsgScrn3Select_cFv -lbl_801DC1CC: -/* 801DC1CC 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 801DC1D0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801DC1D4 7C 08 03 A6 */ mtlr r0 -/* 801DC1D8 38 21 00 30 */ addi r1, r1, 0x30 -/* 801DC1DC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/openExplainDmap__19dMenu_ItemExplain_cFUcUcUcbUc.s b/asm/d/menu/d_menu_item_explain/openExplainDmap__19dMenu_ItemExplain_cFUcUcUcbUc.s deleted file mode 100644 index b4bd557f17b..00000000000 --- a/asm/d/menu/d_menu_item_explain/openExplainDmap__19dMenu_ItemExplain_cFUcUcUcbUc.s +++ /dev/null @@ -1,240 +0,0 @@ -lbl_801DC3C8: -/* 801DC3C8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801DC3CC 7C 08 02 A6 */ mflr r0 -/* 801DC3D0 90 01 00 34 */ stw r0, 0x34(r1) -/* 801DC3D4 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DC3D8 48 18 5D E9 */ bl _savegpr_22 -/* 801DC3DC 7C 77 1B 78 */ mr r23, r3 -/* 801DC3E0 7C 98 23 78 */ mr r24, r4 -/* 801DC3E4 7C B9 2B 78 */ mr r25, r5 -/* 801DC3E8 7C DA 33 78 */ mr r26, r6 -/* 801DC3EC 7C FB 3B 78 */ mr r27, r7 -/* 801DC3F0 7D 1C 43 78 */ mr r28, r8 -/* 801DC3F4 7F 1E C3 78 */ mr r30, r24 -/* 801DC3F8 3B A0 00 00 */ li r29, 0 -/* 801DC3FC 3A C0 00 00 */ li r22, 0 -/* 801DC400 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801DC404 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801DC408 3B E3 4E 20 */ addi r31, r3, 0x4e20 -/* 801DC40C 7F E3 FB 78 */ mr r3, r31 -/* 801DC410 81 9F 00 00 */ lwz r12, 0(r31) -/* 801DC414 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 801DC418 7D 89 03 A6 */ mtctr r12 -/* 801DC41C 4E 80 04 21 */ bctrl -/* 801DC420 88 03 00 09 */ lbz r0, 9(r3) -/* 801DC424 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f -/* 801DC428 2C 00 00 11 */ cmpwi r0, 0x11 -/* 801DC42C 40 82 00 60 */ bne lbl_801DC48C -/* 801DC430 57 00 06 3E */ clrlwi r0, r24, 0x18 -/* 801DC434 28 00 00 26 */ cmplwi r0, 0x26 -/* 801DC438 40 82 00 54 */ bne lbl_801DC48C -/* 801DC43C 3B C0 00 00 */ li r30, 0 -lbl_801DC440: -/* 801DC440 38 1E 00 F9 */ addi r0, r30, 0xf9 -/* 801DC444 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 801DC448 38 80 00 01 */ li r4, 1 -/* 801DC44C 4B EB BA 95 */ bl checkItemGet__FUci -/* 801DC450 2C 03 00 00 */ cmpwi r3, 0 -/* 801DC454 41 82 00 08 */ beq lbl_801DC45C -/* 801DC458 3A D6 00 01 */ addi r22, r22, 1 -lbl_801DC45C: -/* 801DC45C 3B DE 00 01 */ addi r30, r30, 1 -/* 801DC460 2C 1E 00 03 */ cmpwi r30, 3 -/* 801DC464 41 80 FF DC */ blt lbl_801DC440 -/* 801DC468 2C 16 00 01 */ cmpwi r22, 1 -/* 801DC46C 41 81 00 0C */ bgt lbl_801DC478 -/* 801DC470 3B C0 00 F9 */ li r30, 0xf9 -/* 801DC474 48 00 00 18 */ b lbl_801DC48C -lbl_801DC478: -/* 801DC478 2C 16 00 02 */ cmpwi r22, 2 -/* 801DC47C 41 81 00 0C */ bgt lbl_801DC488 -/* 801DC480 3B C0 00 FA */ li r30, 0xfa -/* 801DC484 48 00 00 08 */ b lbl_801DC48C -lbl_801DC488: -/* 801DC488 3B C0 00 FD */ li r30, 0xfd -lbl_801DC48C: -/* 801DC48C 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801DC490 28 00 00 50 */ cmplwi r0, 0x50 -/* 801DC494 40 82 00 38 */ bne lbl_801DC4CC -/* 801DC498 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801DC49C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801DC4A0 38 63 00 CC */ addi r3, r3, 0xcc -/* 801DC4A4 38 80 00 4F */ li r4, 0x4f -/* 801DC4A8 4B E5 7A 21 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 801DC4AC 2C 03 00 00 */ cmpwi r3, 0 -/* 801DC4B0 41 82 00 1C */ beq lbl_801DC4CC -/* 801DC4B4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801DC4B8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801DC4BC 88 03 00 DC */ lbz r0, 0xdc(r3) -/* 801DC4C0 28 00 00 FF */ cmplwi r0, 0xff -/* 801DC4C4 40 82 00 08 */ bne lbl_801DC4CC -/* 801DC4C8 3B C0 00 4F */ li r30, 0x4f -lbl_801DC4CC: -/* 801DC4CC 88 77 00 E0 */ lbz r3, 0xe0(r23) -/* 801DC4D0 28 03 00 00 */ cmplwi r3, 0 -/* 801DC4D4 40 82 01 60 */ bne lbl_801DC634 -/* 801DC4D8 38 00 00 01 */ li r0, 1 -/* 801DC4DC 98 17 00 E0 */ stb r0, 0xe0(r23) -/* 801DC4E0 9B 17 00 E1 */ stb r24, 0xe1(r23) -/* 801DC4E4 57 D8 06 3E */ clrlwi r24, r30, 0x18 -/* 801DC4E8 38 18 01 65 */ addi r0, r24, 0x165 -/* 801DC4EC 90 17 00 CC */ stw r0, 0xcc(r23) -/* 801DC4F0 7F E3 FB 78 */ mr r3, r31 -/* 801DC4F4 81 9F 00 00 */ lwz r12, 0(r31) -/* 801DC4F8 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 801DC4FC 7D 89 03 A6 */ mtctr r12 -/* 801DC500 4E 80 04 21 */ bctrl -/* 801DC504 88 03 00 09 */ lbz r0, 9(r3) -/* 801DC508 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f -/* 801DC50C 2C 00 00 14 */ cmpwi r0, 0x14 -/* 801DC510 40 82 00 18 */ bne lbl_801DC528 -/* 801DC514 7F 00 C3 78 */ mr r0, r24 -/* 801DC518 28 00 00 23 */ cmplwi r0, 0x23 -/* 801DC51C 40 82 00 0C */ bne lbl_801DC528 -/* 801DC520 38 00 05 BF */ li r0, 0x5bf -/* 801DC524 90 17 00 CC */ stw r0, 0xcc(r23) -lbl_801DC528: -/* 801DC528 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801DC52C 28 00 00 25 */ cmplwi r0, 0x25 -/* 801DC530 40 82 00 1C */ bne lbl_801DC54C -/* 801DC534 38 60 00 16 */ li r3, 0x16 -/* 801DC538 4B E5 13 41 */ bl dComIfGs_isDungeonItemWarp__Fi -/* 801DC53C 2C 03 00 00 */ cmpwi r3, 0 -/* 801DC540 41 82 00 0C */ beq lbl_801DC54C -/* 801DC544 38 00 02 51 */ li r0, 0x251 -/* 801DC548 90 17 00 CC */ stw r0, 0xcc(r23) -lbl_801DC54C: -/* 801DC54C 38 18 02 65 */ addi r0, r24, 0x265 -/* 801DC550 90 17 00 C8 */ stw r0, 0xc8(r23) -/* 801DC554 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801DC558 38 83 01 88 */ addi r4, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801DC55C 88 A4 00 DC */ lbz r5, 0xdc(r4) -/* 801DC560 28 05 00 FF */ cmplwi r5, 0xff -/* 801DC564 41 82 00 4C */ beq lbl_801DC5B0 -/* 801DC568 57 83 06 3E */ clrlwi r3, r28, 0x18 -/* 801DC56C 38 05 00 0F */ addi r0, r5, 0xf -/* 801DC570 7C 03 00 00 */ cmpw r3, r0 -/* 801DC574 40 82 00 3C */ bne lbl_801DC5B0 -/* 801DC578 38 00 01 6D */ li r0, 0x16d -/* 801DC57C 90 17 00 CC */ stw r0, 0xcc(r23) -/* 801DC580 88 84 00 DC */ lbz r4, 0xdc(r4) -/* 801DC584 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801DC588 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801DC58C 38 63 00 EC */ addi r3, r3, 0xec -/* 801DC590 4B E5 79 ED */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 801DC594 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801DC598 41 82 00 10 */ beq lbl_801DC5A8 -/* 801DC59C 38 00 02 6D */ li r0, 0x26d -/* 801DC5A0 90 17 00 C8 */ stw r0, 0xc8(r23) -/* 801DC5A4 48 00 00 0C */ b lbl_801DC5B0 -lbl_801DC5A8: -/* 801DC5A8 38 00 02 6E */ li r0, 0x26e -/* 801DC5AC 90 17 00 C8 */ stw r0, 0xc8(r23) -lbl_801DC5B0: -/* 801DC5B0 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801DC5B4 28 00 00 46 */ cmplwi r0, 0x46 -/* 801DC5B8 40 82 00 30 */ bne lbl_801DC5E8 -/* 801DC5BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801DC5C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801DC5C4 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 801DC5C8 81 83 06 28 */ lwz r12, 0x628(r3) -/* 801DC5CC 81 8C 02 A0 */ lwz r12, 0x2a0(r12) -/* 801DC5D0 7D 89 03 A6 */ mtctr r12 -/* 801DC5D4 4E 80 04 21 */ bctrl -/* 801DC5D8 2C 03 00 00 */ cmpwi r3, 0 -/* 801DC5DC 40 82 00 0C */ bne lbl_801DC5E8 -/* 801DC5E0 38 00 02 B2 */ li r0, 0x2b2 -/* 801DC5E4 90 17 00 C8 */ stw r0, 0xc8(r23) -lbl_801DC5E8: -/* 801DC5E8 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801DC5EC 28 00 00 25 */ cmplwi r0, 0x25 -/* 801DC5F0 40 82 00 1C */ bne lbl_801DC60C -/* 801DC5F4 38 60 00 16 */ li r3, 0x16 -/* 801DC5F8 4B E5 12 81 */ bl dComIfGs_isDungeonItemWarp__Fi -/* 801DC5FC 2C 03 00 00 */ cmpwi r3, 0 -/* 801DC600 41 82 00 0C */ beq lbl_801DC60C -/* 801DC604 38 00 03 51 */ li r0, 0x351 -/* 801DC608 90 17 00 C8 */ stw r0, 0xc8(r23) -lbl_801DC60C: -/* 801DC60C 38 00 00 00 */ li r0, 0 -/* 801DC610 98 17 00 E7 */ stb r0, 0xe7(r23) -/* 801DC614 9B 37 00 DE */ stb r25, 0xde(r23) -/* 801DC618 9B 57 00 DF */ stb r26, 0xdf(r23) -/* 801DC61C 7E E3 BB 78 */ mr r3, r23 -/* 801DC620 4B FF F2 01 */ bl open_init__19dMenu_ItemExplain_cFv -/* 801DC624 7E E3 BB 78 */ mr r3, r23 -/* 801DC628 48 00 05 95 */ bl setScale__19dMenu_ItemExplain_cFv -/* 801DC62C 3B A0 00 01 */ li r29, 1 -/* 801DC630 48 00 00 EC */ b lbl_801DC71C -lbl_801DC634: -/* 801DC634 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 801DC638 41 82 00 E4 */ beq lbl_801DC71C -/* 801DC63C 28 03 00 01 */ cmplwi r3, 1 -/* 801DC640 41 82 00 0C */ beq lbl_801DC64C -/* 801DC644 28 03 00 02 */ cmplwi r3, 2 -/* 801DC648 40 82 00 D4 */ bne lbl_801DC71C -lbl_801DC64C: -/* 801DC64C 9B 17 00 E1 */ stb r24, 0xe1(r23) -/* 801DC650 57 D8 06 3E */ clrlwi r24, r30, 0x18 -/* 801DC654 38 18 01 65 */ addi r0, r24, 0x165 -/* 801DC658 90 17 00 CC */ stw r0, 0xcc(r23) -/* 801DC65C 28 18 00 25 */ cmplwi r24, 0x25 -/* 801DC660 40 82 00 1C */ bne lbl_801DC67C -/* 801DC664 38 60 00 16 */ li r3, 0x16 -/* 801DC668 4B E5 12 11 */ bl dComIfGs_isDungeonItemWarp__Fi -/* 801DC66C 2C 03 00 00 */ cmpwi r3, 0 -/* 801DC670 41 82 00 0C */ beq lbl_801DC67C -/* 801DC674 38 00 02 51 */ li r0, 0x251 -/* 801DC678 90 17 00 CC */ stw r0, 0xcc(r23) -lbl_801DC67C: -/* 801DC67C 38 18 02 65 */ addi r0, r24, 0x265 -/* 801DC680 90 17 00 C8 */ stw r0, 0xc8(r23) -/* 801DC684 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801DC688 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801DC68C 88 83 00 DC */ lbz r4, 0xdc(r3) -/* 801DC690 28 04 00 FF */ cmplwi r4, 0xff -/* 801DC694 41 82 00 40 */ beq lbl_801DC6D4 -/* 801DC698 57 83 06 3E */ clrlwi r3, r28, 0x18 -/* 801DC69C 38 04 00 0F */ addi r0, r4, 0xf -/* 801DC6A0 7C 03 00 00 */ cmpw r3, r0 -/* 801DC6A4 40 82 00 30 */ bne lbl_801DC6D4 -/* 801DC6A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801DC6AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801DC6B0 38 63 00 EC */ addi r3, r3, 0xec -/* 801DC6B4 4B E5 78 C9 */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 801DC6B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801DC6BC 41 82 00 10 */ beq lbl_801DC6CC -/* 801DC6C0 38 00 02 6D */ li r0, 0x26d -/* 801DC6C4 90 17 00 C8 */ stw r0, 0xc8(r23) -/* 801DC6C8 48 00 00 0C */ b lbl_801DC6D4 -lbl_801DC6CC: -/* 801DC6CC 38 00 02 6E */ li r0, 0x26e -/* 801DC6D0 90 17 00 C8 */ stw r0, 0xc8(r23) -lbl_801DC6D4: -/* 801DC6D4 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801DC6D8 28 00 00 25 */ cmplwi r0, 0x25 -/* 801DC6DC 40 82 00 1C */ bne lbl_801DC6F8 -/* 801DC6E0 38 60 00 16 */ li r3, 0x16 -/* 801DC6E4 4B E5 11 95 */ bl dComIfGs_isDungeonItemWarp__Fi -/* 801DC6E8 2C 03 00 00 */ cmpwi r3, 0 -/* 801DC6EC 41 82 00 0C */ beq lbl_801DC6F8 -/* 801DC6F0 38 00 03 51 */ li r0, 0x351 -/* 801DC6F4 90 17 00 C8 */ stw r0, 0xc8(r23) -lbl_801DC6F8: -/* 801DC6F8 38 00 00 00 */ li r0, 0 -/* 801DC6FC 98 17 00 E7 */ stb r0, 0xe7(r23) -/* 801DC700 9B 37 00 DE */ stb r25, 0xde(r23) -/* 801DC704 9B 57 00 DF */ stb r26, 0xdf(r23) -/* 801DC708 7E E3 BB 78 */ mr r3, r23 -/* 801DC70C 4B FF F1 15 */ bl open_init__19dMenu_ItemExplain_cFv -/* 801DC710 7E E3 BB 78 */ mr r3, r23 -/* 801DC714 48 00 04 A9 */ bl setScale__19dMenu_ItemExplain_cFv -/* 801DC718 3B A0 00 01 */ li r29, 1 -lbl_801DC71C: -/* 801DC71C 7F A3 EB 78 */ mr r3, r29 -/* 801DC720 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DC724 48 18 5A E9 */ bl _restgpr_22 -/* 801DC728 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801DC72C 7C 08 03 A6 */ mtlr r0 -/* 801DC730 38 21 00 30 */ addi r1, r1, 0x30 -/* 801DC734 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/openExplainTx__19dMenu_ItemExplain_cFUlUl.s b/asm/d/menu/d_menu_item_explain/openExplainTx__19dMenu_ItemExplain_cFUlUl.s deleted file mode 100644 index 01b4ccf18dd..00000000000 --- a/asm/d/menu/d_menu_item_explain/openExplainTx__19dMenu_ItemExplain_cFUlUl.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_801DC738: -/* 801DC738 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801DC73C 7C 08 02 A6 */ mflr r0 -/* 801DC740 90 01 00 14 */ stw r0, 0x14(r1) -/* 801DC744 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801DC748 7C 7F 1B 78 */ mr r31, r3 -/* 801DC74C 38 C0 00 00 */ li r6, 0 -/* 801DC750 88 03 00 E0 */ lbz r0, 0xe0(r3) -/* 801DC754 28 00 00 00 */ cmplwi r0, 0 -/* 801DC758 40 82 00 3C */ bne lbl_801DC794 -/* 801DC75C 38 00 00 01 */ li r0, 1 -/* 801DC760 98 1F 00 E0 */ stb r0, 0xe0(r31) -/* 801DC764 38 00 00 FF */ li r0, 0xff -/* 801DC768 98 1F 00 E1 */ stb r0, 0xe1(r31) -/* 801DC76C 90 9F 00 CC */ stw r4, 0xcc(r31) -/* 801DC770 90 BF 00 C8 */ stw r5, 0xc8(r31) -/* 801DC774 38 00 00 00 */ li r0, 0 -/* 801DC778 98 1F 00 E7 */ stb r0, 0xe7(r31) -/* 801DC77C 98 1F 00 DE */ stb r0, 0xde(r31) -/* 801DC780 98 1F 00 DF */ stb r0, 0xdf(r31) -/* 801DC784 4B FF F0 9D */ bl open_init__19dMenu_ItemExplain_cFv -/* 801DC788 7F E3 FB 78 */ mr r3, r31 -/* 801DC78C 48 00 04 31 */ bl setScale__19dMenu_ItemExplain_cFv -/* 801DC790 38 C0 00 01 */ li r6, 1 -lbl_801DC794: -/* 801DC794 7C C3 33 78 */ mr r3, r6 -/* 801DC798 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801DC79C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801DC7A0 7C 08 03 A6 */ mtlr r0 -/* 801DC7A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DC7A8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/openExplain__19dMenu_ItemExplain_cFUcUcUcb.s b/asm/d/menu/d_menu_item_explain/openExplain__19dMenu_ItemExplain_cFUcUcUcb.s deleted file mode 100644 index d412c68a972..00000000000 --- a/asm/d/menu/d_menu_item_explain/openExplain__19dMenu_ItemExplain_cFUcUcUcb.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_801DC340: -/* 801DC340 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801DC344 7C 08 02 A6 */ mflr r0 -/* 801DC348 90 01 00 24 */ stw r0, 0x24(r1) -/* 801DC34C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DC350 48 18 5E 85 */ bl _savegpr_27 -/* 801DC354 7C 7B 1B 78 */ mr r27, r3 -/* 801DC358 7C 9C 23 78 */ mr r28, r4 -/* 801DC35C 7C BD 2B 78 */ mr r29, r5 -/* 801DC360 7C DE 33 78 */ mr r30, r6 -/* 801DC364 7C FF 3B 78 */ mr r31, r7 -/* 801DC368 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801DC36C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801DC370 38 63 00 9C */ addi r3, r3, 0x9c -/* 801DC374 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 801DC378 38 A0 00 00 */ li r5, 0 -/* 801DC37C 4B E5 6C B5 */ bl getItem__17dSv_player_item_cCFib -/* 801DC380 7C 64 1B 78 */ mr r4, r3 -/* 801DC384 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801DC388 28 00 00 FF */ cmplwi r0, 0xff -/* 801DC38C 40 82 00 0C */ bne lbl_801DC398 -/* 801DC390 38 60 00 00 */ li r3, 0 -/* 801DC394 48 00 00 1C */ b lbl_801DC3B0 -lbl_801DC398: -/* 801DC398 7F 63 DB 78 */ mr r3, r27 -/* 801DC39C 7F A5 EB 78 */ mr r5, r29 -/* 801DC3A0 7F C6 F3 78 */ mr r6, r30 -/* 801DC3A4 7F E7 FB 78 */ mr r7, r31 -/* 801DC3A8 7F 88 E3 78 */ mr r8, r28 -/* 801DC3AC 48 00 00 1D */ bl openExplainDmap__19dMenu_ItemExplain_cFUcUcUcbUc -lbl_801DC3B0: -/* 801DC3B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DC3B4 48 18 5E 6D */ bl _restgpr_27 -/* 801DC3B8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801DC3BC 7C 08 03 A6 */ mtlr r0 -/* 801DC3C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DC3C4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/open_init__19dMenu_ItemExplain_cFv.s b/asm/d/menu/d_menu_item_explain/open_init__19dMenu_ItemExplain_cFv.s deleted file mode 100644 index b176c9e6251..00000000000 --- a/asm/d/menu/d_menu_item_explain/open_init__19dMenu_ItemExplain_cFv.s +++ /dev/null @@ -1,179 +0,0 @@ -lbl_801DB820: -/* 801DB820 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801DB824 7C 08 02 A6 */ mflr r0 -/* 801DB828 90 01 00 34 */ stw r0, 0x34(r1) -/* 801DB82C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DB830 48 18 69 A9 */ bl _savegpr_28 -/* 801DB834 7C 7F 1B 78 */ mr r31, r3 -/* 801DB838 80 03 00 C8 */ lwz r0, 0xc8(r3) -/* 801DB83C 90 03 00 C4 */ stw r0, 0xc4(r3) -/* 801DB840 38 00 00 00 */ li r0, 0 -/* 801DB844 98 03 00 E3 */ stb r0, 0xe3(r3) -/* 801DB848 98 03 00 E4 */ stb r0, 0xe4(r3) -/* 801DB84C 88 03 00 E1 */ lbz r0, 0xe1(r3) -/* 801DB850 28 00 00 FF */ cmplwi r0, 0xff -/* 801DB854 41 82 01 9C */ beq lbl_801DB9F0 -/* 801DB858 7C 1D 03 78 */ mr r29, r0 -/* 801DB85C 3B 80 FF FF */ li r28, -1 -/* 801DB860 28 00 00 26 */ cmplwi r0, 0x26 -/* 801DB864 40 82 00 B4 */ bne lbl_801DB918 -/* 801DB868 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801DB86C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801DB870 3B C3 4E 20 */ addi r30, r3, 0x4e20 -/* 801DB874 7F C3 F3 78 */ mr r3, r30 -/* 801DB878 81 9E 00 00 */ lwz r12, 0(r30) -/* 801DB87C 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 801DB880 7D 89 03 A6 */ mtctr r12 -/* 801DB884 4E 80 04 21 */ bctrl -/* 801DB888 88 03 00 09 */ lbz r0, 9(r3) -/* 801DB88C 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f -/* 801DB890 2C 00 00 11 */ cmpwi r0, 0x11 -/* 801DB894 40 82 00 5C */ bne lbl_801DB8F0 -/* 801DB898 3B A0 00 00 */ li r29, 0 -/* 801DB89C 3B C0 00 00 */ li r30, 0 -lbl_801DB8A0: -/* 801DB8A0 38 1E 00 F9 */ addi r0, r30, 0xf9 -/* 801DB8A4 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 801DB8A8 38 80 00 01 */ li r4, 1 -/* 801DB8AC 4B EB C6 35 */ bl checkItemGet__FUci -/* 801DB8B0 2C 03 00 00 */ cmpwi r3, 0 -/* 801DB8B4 41 82 00 08 */ beq lbl_801DB8BC -/* 801DB8B8 3B BD 00 01 */ addi r29, r29, 1 -lbl_801DB8BC: -/* 801DB8BC 3B DE 00 01 */ addi r30, r30, 1 -/* 801DB8C0 2C 1E 00 03 */ cmpwi r30, 3 -/* 801DB8C4 41 80 FF DC */ blt lbl_801DB8A0 -/* 801DB8C8 2C 1D 00 01 */ cmpwi r29, 1 -/* 801DB8CC 40 82 00 08 */ bne lbl_801DB8D4 -/* 801DB8D0 3B 80 00 43 */ li r28, 0x43 -lbl_801DB8D4: -/* 801DB8D4 2C 1D 00 02 */ cmpwi r29, 2 -/* 801DB8D8 40 82 00 10 */ bne lbl_801DB8E8 -/* 801DB8DC 3B A0 00 FA */ li r29, 0xfa -/* 801DB8E0 3B 80 00 44 */ li r28, 0x44 -/* 801DB8E4 48 00 00 34 */ b lbl_801DB918 -lbl_801DB8E8: -/* 801DB8E8 3B A0 00 FD */ li r29, 0xfd -/* 801DB8EC 48 00 00 2C */ b lbl_801DB918 -lbl_801DB8F0: -/* 801DB8F0 7F C3 F3 78 */ mr r3, r30 -/* 801DB8F4 81 9E 00 00 */ lwz r12, 0(r30) -/* 801DB8F8 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 801DB8FC 7D 89 03 A6 */ mtctr r12 -/* 801DB900 4E 80 04 21 */ bctrl -/* 801DB904 88 03 00 09 */ lbz r0, 9(r3) -/* 801DB908 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f -/* 801DB90C 2C 00 00 14 */ cmpwi r0, 0x14 -/* 801DB910 40 82 00 08 */ bne lbl_801DB918 -/* 801DB914 3B A0 00 F6 */ li r29, 0xf6 -lbl_801DB918: -/* 801DB918 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DB91C 80 C3 00 04 */ lwz r6, 4(r3) -/* 801DB920 80 BF 00 88 */ lwz r5, 0x88(r31) -/* 801DB924 80 1F 00 94 */ lwz r0, 0x94(r31) -/* 801DB928 90 01 00 08 */ stw r0, 8(r1) -/* 801DB92C 80 1F 00 84 */ lwz r0, 0x84(r31) -/* 801DB930 90 01 00 0C */ stw r0, 0xc(r1) -/* 801DB934 93 81 00 10 */ stw r28, 0x10(r1) -/* 801DB938 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801DB93C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801DB940 7F A4 EB 78 */ mr r4, r29 -/* 801DB944 80 FF 00 8C */ lwz r7, 0x8c(r31) -/* 801DB948 81 1F 00 7C */ lwz r8, 0x7c(r31) -/* 801DB94C 81 3F 00 90 */ lwz r9, 0x90(r31) -/* 801DB950 81 5F 00 80 */ lwz r10, 0x80(r31) -/* 801DB954 48 04 15 B5 */ bl readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei -/* 801DB958 7C 7E 1B 78 */ mr r30, r3 -/* 801DB95C 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DB960 48 07 9C 69 */ bl show__13CPaneMgrAlphaFv -/* 801DB964 39 00 00 00 */ li r8, 0 -/* 801DB968 38 60 00 00 */ li r3, 0 -/* 801DB96C 38 FE FF FF */ addi r7, r30, -1 -/* 801DB970 38 C0 00 01 */ li r6, 1 -/* 801DB974 7C 65 1B 78 */ mr r5, r3 -/* 801DB978 38 00 00 03 */ li r0, 3 -/* 801DB97C 7C 09 03 A6 */ mtctr r0 -lbl_801DB980: -/* 801DB980 7C 08 38 00 */ cmpw r8, r7 -/* 801DB984 40 80 00 14 */ bge lbl_801DB998 -/* 801DB988 38 03 00 7C */ addi r0, r3, 0x7c -/* 801DB98C 7C 9F 00 2E */ lwzx r4, r31, r0 -/* 801DB990 98 C4 00 B0 */ stb r6, 0xb0(r4) -/* 801DB994 48 00 00 10 */ b lbl_801DB9A4 -lbl_801DB998: -/* 801DB998 38 03 00 7C */ addi r0, r3, 0x7c -/* 801DB99C 7C 9F 00 2E */ lwzx r4, r31, r0 -/* 801DB9A0 98 A4 00 B0 */ stb r5, 0xb0(r4) -lbl_801DB9A4: -/* 801DB9A4 39 08 00 01 */ addi r8, r8, 1 -/* 801DB9A8 38 63 00 04 */ addi r3, r3, 4 -/* 801DB9AC 42 00 FF D4 */ bdnz lbl_801DB980 -/* 801DB9B0 7F E3 FB 78 */ mr r3, r31 -/* 801DB9B4 48 00 0E 49 */ bl setNumber__19dMenu_ItemExplain_cFv -/* 801DB9B8 80 7F 00 70 */ lwz r3, 0x70(r31) -/* 801DB9BC 3C 80 62 61 */ lis r4, 0x6261 /* 0x6261636B@ha */ -/* 801DB9C0 38 C4 63 6B */ addi r6, r4, 0x636B /* 0x6261636B@l */ -/* 801DB9C4 3C 80 69 5F */ lis r4, 0x695F /* 0x695F695F@ha */ -/* 801DB9C8 38 A4 69 5F */ addi r5, r4, 0x695F /* 0x695F695F@l */ -/* 801DB9CC 81 83 00 00 */ lwz r12, 0(r3) -/* 801DB9D0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801DB9D4 7D 89 03 A6 */ mtctr r12 -/* 801DB9D8 4E 80 04 21 */ bctrl -/* 801DB9DC 38 00 00 01 */ li r0, 1 -/* 801DB9E0 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801DB9E4 38 00 00 00 */ li r0, 0 -/* 801DB9E8 98 1F 00 E6 */ stb r0, 0xe6(r31) -/* 801DB9EC 48 00 00 6C */ b lbl_801DBA58 -lbl_801DB9F0: -/* 801DB9F0 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DB9F4 48 07 9C 15 */ bl hide__13CPaneMgrAlphaFv -/* 801DB9F8 38 60 00 00 */ li r3, 0 -/* 801DB9FC 38 A0 00 00 */ li r5, 0 -/* 801DBA00 38 00 00 03 */ li r0, 3 -/* 801DBA04 7C 09 03 A6 */ mtctr r0 -lbl_801DBA08: -/* 801DBA08 38 03 00 7C */ addi r0, r3, 0x7c -/* 801DBA0C 7C 9F 00 2E */ lwzx r4, r31, r0 -/* 801DBA10 98 A4 00 B0 */ stb r5, 0xb0(r4) -/* 801DBA14 38 63 00 04 */ addi r3, r3, 4 -/* 801DBA18 42 00 FF F0 */ bdnz lbl_801DBA08 -/* 801DBA1C 7F E3 FB 78 */ mr r3, r31 -/* 801DBA20 48 00 0D DD */ bl setNumber__19dMenu_ItemExplain_cFv -/* 801DBA24 80 7F 00 70 */ lwz r3, 0x70(r31) -/* 801DBA28 3C 80 62 61 */ lis r4, 0x6261 /* 0x6261636B@ha */ -/* 801DBA2C 38 C4 63 6B */ addi r6, r4, 0x636B /* 0x6261636B@l */ -/* 801DBA30 3C 80 69 5F */ lis r4, 0x695F /* 0x695F695F@ha */ -/* 801DBA34 38 A4 69 5F */ addi r5, r4, 0x695F /* 0x695F695F@l */ -/* 801DBA38 81 83 00 00 */ lwz r12, 0(r3) -/* 801DBA3C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801DBA40 7D 89 03 A6 */ mtctr r12 -/* 801DBA44 4E 80 04 21 */ bctrl -/* 801DBA48 38 00 00 00 */ li r0, 0 -/* 801DBA4C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801DBA50 38 00 00 01 */ li r0, 1 -/* 801DBA54 98 1F 00 E6 */ stb r0, 0xe6(r31) -lbl_801DBA58: -/* 801DBA58 80 7F 00 98 */ lwz r3, 0x98(r31) -/* 801DBA5C 28 03 00 00 */ cmplwi r3, 0 -/* 801DBA60 41 82 00 08 */ beq lbl_801DBA68 -/* 801DBA64 48 06 03 D1 */ bl arwAnimeInit__15dMsgScrnArrow_cFv -lbl_801DBA68: -/* 801DBA68 38 00 00 51 */ li r0, 0x51 -/* 801DBA6C 90 01 00 18 */ stw r0, 0x18(r1) -/* 801DBA70 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801DBA74 38 81 00 18 */ addi r4, r1, 0x18 -/* 801DBA78 38 A0 00 00 */ li r5, 0 -/* 801DBA7C 38 C0 00 00 */ li r6, 0 -/* 801DBA80 38 E0 00 00 */ li r7, 0 -/* 801DBA84 C0 22 A8 C4 */ lfs f1, lit_4348(r2) -/* 801DBA88 FC 40 08 90 */ fmr f2, f1 -/* 801DBA8C C0 62 A8 B0 */ lfs f3, lit_4304(r2) -/* 801DBA90 FC 80 18 90 */ fmr f4, f3 -/* 801DBA94 39 00 00 00 */ li r8, 0 -/* 801DBA98 48 0C FE ED */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801DBA9C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DBAA0 48 18 67 85 */ bl _restgpr_28 -/* 801DBAA4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801DBAA8 7C 08 03 A6 */ mtlr r0 -/* 801DBAAC 38 21 00 30 */ addi r1, r1, 0x30 -/* 801DBAB0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/open_proc__19dMenu_ItemExplain_cFv.s b/asm/d/menu/d_menu_item_explain/open_proc__19dMenu_ItemExplain_cFv.s deleted file mode 100644 index b968ed8c36c..00000000000 --- a/asm/d/menu/d_menu_item_explain/open_proc__19dMenu_ItemExplain_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_801DBAB4: -/* 801DBAB4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801DBAB8 7C 08 02 A6 */ mflr r0 -/* 801DBABC 90 01 00 24 */ stw r0, 0x24(r1) -/* 801DBAC0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801DBAC4 7C 7F 1B 78 */ mr r31, r3 -/* 801DBAC8 C0 23 00 BC */ lfs f1, 0xbc(r3) -/* 801DBACC C0 02 A8 C8 */ lfs f0, lit_4452(r2) -/* 801DBAD0 EC 01 00 2A */ fadds f0, f1, f0 -/* 801DBAD4 D0 03 00 BC */ stfs f0, 0xbc(r3) -/* 801DBAD8 C0 23 00 BC */ lfs f1, 0xbc(r3) -/* 801DBADC C0 02 A8 8C */ lfs f0, lit_4063(r2) -/* 801DBAE0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801DBAE4 4C 41 13 82 */ cror 2, 1, 2 -/* 801DBAE8 40 82 00 10 */ bne lbl_801DBAF8 -/* 801DBAEC D0 1F 00 BC */ stfs f0, 0xbc(r31) -/* 801DBAF0 38 00 00 02 */ li r0, 2 -/* 801DBAF4 98 1F 00 E0 */ stb r0, 0xe0(r31) -lbl_801DBAF8: -/* 801DBAF8 80 1F 00 B4 */ lwz r0, 0xb4(r31) -/* 801DBAFC 28 00 00 00 */ cmplwi r0, 0 -/* 801DBB00 41 82 00 3C */ beq lbl_801DBB3C -/* 801DBB04 7F E3 FB 78 */ mr r3, r31 -/* 801DBB08 48 00 0C A5 */ bl getAlphaRatio__19dMenu_ItemExplain_cFv -/* 801DBB0C C0 02 A8 C4 */ lfs f0, lit_4348(r2) -/* 801DBB10 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801DBB14 C0 02 A8 CC */ lfs f0, lit_4453(r2) -/* 801DBB18 EC 00 00 72 */ fmuls f0, f0, f1 -/* 801DBB1C FC 00 00 1E */ fctiwz f0, f0 -/* 801DBB20 D8 01 00 08 */ stfd f0, 8(r1) -/* 801DBB24 80 81 00 0C */ lwz r4, 0xc(r1) -/* 801DBB28 80 7F 00 B4 */ lwz r3, 0xb4(r31) -/* 801DBB2C 81 83 00 00 */ lwz r12, 0(r3) -/* 801DBB30 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801DBB34 7D 89 03 A6 */ mtctr r12 -/* 801DBB38 4E 80 04 21 */ bctrl -lbl_801DBB3C: -/* 801DBB3C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801DBB40 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801DBB44 7C 08 03 A6 */ mtlr r0 -/* 801DBB48 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DBB4C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/setNumber__19dMenu_ItemExplain_cFv.s b/asm/d/menu/d_menu_item_explain/setNumber__19dMenu_ItemExplain_cFv.s deleted file mode 100644 index 328a69445fd..00000000000 --- a/asm/d/menu/d_menu_item_explain/setNumber__19dMenu_ItemExplain_cFv.s +++ /dev/null @@ -1,225 +0,0 @@ -lbl_801DC7FC: -/* 801DC7FC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801DC800 7C 08 02 A6 */ mflr r0 -/* 801DC804 90 01 00 34 */ stw r0, 0x34(r1) -/* 801DC808 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DC80C 48 18 59 C5 */ bl _savegpr_26 -/* 801DC810 7C 7E 1B 78 */ mr r30, r3 -/* 801DC814 88 C3 00 DF */ lbz r6, 0xdf(r3) -/* 801DC818 28 06 00 00 */ cmplwi r6, 0 -/* 801DC81C 40 82 00 2C */ bne lbl_801DC848 -/* 801DC820 38 60 00 00 */ li r3, 0 -/* 801DC824 7C 65 1B 78 */ mr r5, r3 -/* 801DC828 38 00 00 03 */ li r0, 3 -/* 801DC82C 7C 09 03 A6 */ mtctr r0 -lbl_801DC830: -/* 801DC830 38 03 00 A8 */ addi r0, r3, 0xa8 -/* 801DC834 7C 9E 00 2E */ lwzx r4, r30, r0 -/* 801DC838 98 A4 00 B0 */ stb r5, 0xb0(r4) -/* 801DC83C 38 63 00 04 */ addi r3, r3, 4 -/* 801DC840 42 00 FF F0 */ bdnz lbl_801DC830 -/* 801DC844 48 00 02 F8 */ b lbl_801DCB3C -lbl_801DC848: -/* 801DC848 8B FE 00 DE */ lbz r31, 0xde(r30) -/* 801DC84C 38 60 00 00 */ li r3, 0 -/* 801DC850 38 A0 00 01 */ li r5, 1 -/* 801DC854 38 00 00 03 */ li r0, 3 -/* 801DC858 7C 09 03 A6 */ mtctr r0 -lbl_801DC85C: -/* 801DC85C 38 03 00 A8 */ addi r0, r3, 0xa8 -/* 801DC860 7C 9E 00 2E */ lwzx r4, r30, r0 -/* 801DC864 98 A4 00 B0 */ stb r5, 0xb0(r4) -/* 801DC868 38 63 00 04 */ addi r3, r3, 4 -/* 801DC86C 42 00 FF F0 */ bdnz lbl_801DC85C -/* 801DC870 2C 1F 00 64 */ cmpwi r31, 0x64 -/* 801DC874 40 81 00 08 */ ble lbl_801DC87C -/* 801DC878 3B E0 00 64 */ li r31, 0x64 -lbl_801DC87C: -/* 801DC87C 38 00 FF FF */ li r0, -1 -/* 801DC880 90 01 00 14 */ stw r0, 0x14(r1) -/* 801DC884 90 01 00 10 */ stw r0, 0x10(r1) -/* 801DC888 7C 1F 30 00 */ cmpw r31, r6 -/* 801DC88C 40 82 00 3C */ bne lbl_801DC8C8 -/* 801DC890 38 00 00 1E */ li r0, 0x1e -/* 801DC894 98 01 00 14 */ stb r0, 0x14(r1) -/* 801DC898 98 01 00 15 */ stb r0, 0x15(r1) -/* 801DC89C 98 01 00 16 */ stb r0, 0x16(r1) -/* 801DC8A0 38 00 00 00 */ li r0, 0 -/* 801DC8A4 98 01 00 17 */ stb r0, 0x17(r1) -/* 801DC8A8 38 60 00 FF */ li r3, 0xff -/* 801DC8AC 98 61 00 10 */ stb r3, 0x10(r1) -/* 801DC8B0 38 00 00 C8 */ li r0, 0xc8 -/* 801DC8B4 98 01 00 11 */ stb r0, 0x11(r1) -/* 801DC8B8 38 00 00 32 */ li r0, 0x32 -/* 801DC8BC 98 01 00 12 */ stb r0, 0x12(r1) -/* 801DC8C0 98 61 00 13 */ stb r3, 0x13(r1) -/* 801DC8C4 48 00 00 68 */ b lbl_801DC92C -lbl_801DC8C8: -/* 801DC8C8 2C 1F 00 00 */ cmpwi r31, 0 -/* 801DC8CC 40 82 00 38 */ bne lbl_801DC904 -/* 801DC8D0 38 00 00 1E */ li r0, 0x1e -/* 801DC8D4 98 01 00 14 */ stb r0, 0x14(r1) -/* 801DC8D8 98 01 00 15 */ stb r0, 0x15(r1) -/* 801DC8DC 98 01 00 16 */ stb r0, 0x16(r1) -/* 801DC8E0 38 00 00 00 */ li r0, 0 -/* 801DC8E4 98 01 00 17 */ stb r0, 0x17(r1) -/* 801DC8E8 38 00 00 B4 */ li r0, 0xb4 -/* 801DC8EC 98 01 00 10 */ stb r0, 0x10(r1) -/* 801DC8F0 98 01 00 11 */ stb r0, 0x11(r1) -/* 801DC8F4 98 01 00 12 */ stb r0, 0x12(r1) -/* 801DC8F8 38 00 00 FF */ li r0, 0xff -/* 801DC8FC 98 01 00 13 */ stb r0, 0x13(r1) -/* 801DC900 48 00 00 2C */ b lbl_801DC92C -lbl_801DC904: -/* 801DC904 38 00 00 00 */ li r0, 0 -/* 801DC908 98 01 00 14 */ stb r0, 0x14(r1) -/* 801DC90C 98 01 00 15 */ stb r0, 0x15(r1) -/* 801DC910 98 01 00 16 */ stb r0, 0x16(r1) -/* 801DC914 98 01 00 17 */ stb r0, 0x17(r1) -/* 801DC918 38 00 00 FF */ li r0, 0xff -/* 801DC91C 98 01 00 10 */ stb r0, 0x10(r1) -/* 801DC920 98 01 00 11 */ stb r0, 0x11(r1) -/* 801DC924 98 01 00 12 */ stb r0, 0x12(r1) -/* 801DC928 98 01 00 13 */ stb r0, 0x13(r1) -lbl_801DC92C: -/* 801DC92C 3B 40 00 00 */ li r26, 0 -/* 801DC930 3B A0 00 00 */ li r29, 0 -/* 801DC934 83 61 00 10 */ lwz r27, 0x10(r1) -/* 801DC938 83 81 00 14 */ lwz r28, 0x14(r1) -lbl_801DC93C: -/* 801DC93C 93 61 00 08 */ stw r27, 8(r1) -/* 801DC940 93 81 00 0C */ stw r28, 0xc(r1) -/* 801DC944 38 1D 00 A8 */ addi r0, r29, 0xa8 -/* 801DC948 7C 7E 00 2E */ lwzx r3, r30, r0 -/* 801DC94C 38 81 00 0C */ addi r4, r1, 0xc -/* 801DC950 38 A1 00 08 */ addi r5, r1, 8 -/* 801DC954 81 83 00 00 */ lwz r12, 0(r3) -/* 801DC958 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 801DC95C 7D 89 03 A6 */ mtctr r12 -/* 801DC960 4E 80 04 21 */ bctrl -/* 801DC964 3B 5A 00 01 */ addi r26, r26, 1 -/* 801DC968 2C 1A 00 03 */ cmpwi r26, 3 -/* 801DC96C 3B BD 00 04 */ addi r29, r29, 4 -/* 801DC970 41 80 FF CC */ blt lbl_801DC93C -/* 801DC974 2C 1F 00 64 */ cmpwi r31, 0x64 -/* 801DC978 40 80 00 BC */ bge lbl_801DCA34 -/* 801DC97C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801DC980 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801DC984 83 7C 5D 30 */ lwz r27, 0x5d30(r28) -/* 801DC988 38 00 00 0A */ li r0, 0xa -/* 801DC98C 7C 7F 03 D6 */ divw r3, r31, r0 -/* 801DC990 48 04 19 39 */ bl dMeter2Info_getNumberTextureName__Fi -/* 801DC994 7C 65 1B 78 */ mr r5, r3 -/* 801DC998 7F 63 DB 78 */ mr r3, r27 -/* 801DC99C 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 801DC9A0 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 801DC9A4 81 9B 00 00 */ lwz r12, 0(r27) -/* 801DC9A8 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 801DC9AC 7D 89 03 A6 */ mtctr r12 -/* 801DC9B0 4E 80 04 21 */ bctrl -/* 801DC9B4 7C 64 1B 78 */ mr r4, r3 -/* 801DC9B8 80 7E 00 A8 */ lwz r3, 0xa8(r30) -/* 801DC9BC 38 A0 00 00 */ li r5, 0 -/* 801DC9C0 81 83 00 00 */ lwz r12, 0(r3) -/* 801DC9C4 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 801DC9C8 7D 89 03 A6 */ mtctr r12 -/* 801DC9CC 4E 80 04 21 */ bctrl -/* 801DC9D0 83 7C 5D 30 */ lwz r27, 0x5d30(r28) -/* 801DC9D4 38 60 00 0A */ li r3, 0xa -/* 801DC9D8 7C 1F 1B D6 */ divw r0, r31, r3 -/* 801DC9DC 7C 00 19 D6 */ mullw r0, r0, r3 -/* 801DC9E0 7C 60 F8 50 */ subf r3, r0, r31 -/* 801DC9E4 48 04 18 E5 */ bl dMeter2Info_getNumberTextureName__Fi -/* 801DC9E8 7C 65 1B 78 */ mr r5, r3 -/* 801DC9EC 7F 63 DB 78 */ mr r3, r27 -/* 801DC9F0 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 801DC9F4 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 801DC9F8 81 9B 00 00 */ lwz r12, 0(r27) -/* 801DC9FC 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 801DCA00 7D 89 03 A6 */ mtctr r12 -/* 801DCA04 4E 80 04 21 */ bctrl -/* 801DCA08 7C 64 1B 78 */ mr r4, r3 -/* 801DCA0C 80 7E 00 AC */ lwz r3, 0xac(r30) -/* 801DCA10 38 A0 00 00 */ li r5, 0 -/* 801DCA14 81 83 00 00 */ lwz r12, 0(r3) -/* 801DCA18 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 801DCA1C 7D 89 03 A6 */ mtctr r12 -/* 801DCA20 4E 80 04 21 */ bctrl -/* 801DCA24 38 00 00 00 */ li r0, 0 -/* 801DCA28 80 7E 00 B0 */ lwz r3, 0xb0(r30) -/* 801DCA2C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801DCA30 48 00 01 0C */ b lbl_801DCB3C -lbl_801DCA34: -/* 801DCA34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801DCA38 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801DCA3C 83 7C 5D 30 */ lwz r27, 0x5d30(r28) -/* 801DCA40 38 00 00 64 */ li r0, 0x64 -/* 801DCA44 7C 7F 03 D6 */ divw r3, r31, r0 -/* 801DCA48 48 04 18 81 */ bl dMeter2Info_getNumberTextureName__Fi -/* 801DCA4C 7C 65 1B 78 */ mr r5, r3 -/* 801DCA50 7F 63 DB 78 */ mr r3, r27 -/* 801DCA54 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 801DCA58 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 801DCA5C 81 9B 00 00 */ lwz r12, 0(r27) -/* 801DCA60 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 801DCA64 7D 89 03 A6 */ mtctr r12 -/* 801DCA68 4E 80 04 21 */ bctrl -/* 801DCA6C 7C 64 1B 78 */ mr r4, r3 -/* 801DCA70 80 7E 00 A8 */ lwz r3, 0xa8(r30) -/* 801DCA74 38 A0 00 00 */ li r5, 0 -/* 801DCA78 81 83 00 00 */ lwz r12, 0(r3) -/* 801DCA7C 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 801DCA80 7D 89 03 A6 */ mtctr r12 -/* 801DCA84 4E 80 04 21 */ bctrl -/* 801DCA88 38 60 00 64 */ li r3, 0x64 -/* 801DCA8C 7C 1F 1B D6 */ divw r0, r31, r3 -/* 801DCA90 7C 00 19 D6 */ mullw r0, r0, r3 -/* 801DCA94 7C 00 F8 50 */ subf r0, r0, r31 -/* 801DCA98 54 1D 06 3E */ clrlwi r29, r0, 0x18 -/* 801DCA9C 83 7C 5D 30 */ lwz r27, 0x5d30(r28) -/* 801DCAA0 38 00 00 0A */ li r0, 0xa -/* 801DCAA4 7C 7D 03 D6 */ divw r3, r29, r0 -/* 801DCAA8 48 04 18 21 */ bl dMeter2Info_getNumberTextureName__Fi -/* 801DCAAC 7C 65 1B 78 */ mr r5, r3 -/* 801DCAB0 7F 63 DB 78 */ mr r3, r27 -/* 801DCAB4 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 801DCAB8 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 801DCABC 81 9B 00 00 */ lwz r12, 0(r27) -/* 801DCAC0 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 801DCAC4 7D 89 03 A6 */ mtctr r12 -/* 801DCAC8 4E 80 04 21 */ bctrl -/* 801DCACC 7C 64 1B 78 */ mr r4, r3 -/* 801DCAD0 80 7E 00 AC */ lwz r3, 0xac(r30) -/* 801DCAD4 38 A0 00 00 */ li r5, 0 -/* 801DCAD8 81 83 00 00 */ lwz r12, 0(r3) -/* 801DCADC 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 801DCAE0 7D 89 03 A6 */ mtctr r12 -/* 801DCAE4 4E 80 04 21 */ bctrl -/* 801DCAE8 83 7C 5D 30 */ lwz r27, 0x5d30(r28) -/* 801DCAEC 38 60 00 0A */ li r3, 0xa -/* 801DCAF0 7C 1D 1B D6 */ divw r0, r29, r3 -/* 801DCAF4 7C 00 19 D6 */ mullw r0, r0, r3 -/* 801DCAF8 7C 60 E8 50 */ subf r3, r0, r29 -/* 801DCAFC 48 04 17 CD */ bl dMeter2Info_getNumberTextureName__Fi -/* 801DCB00 7C 65 1B 78 */ mr r5, r3 -/* 801DCB04 7F 63 DB 78 */ mr r3, r27 -/* 801DCB08 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */ -/* 801DCB0C 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */ -/* 801DCB10 81 9B 00 00 */ lwz r12, 0(r27) -/* 801DCB14 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 801DCB18 7D 89 03 A6 */ mtctr r12 -/* 801DCB1C 4E 80 04 21 */ bctrl -/* 801DCB20 7C 64 1B 78 */ mr r4, r3 -/* 801DCB24 80 7E 00 B0 */ lwz r3, 0xb0(r30) -/* 801DCB28 38 A0 00 00 */ li r5, 0 -/* 801DCB2C 81 83 00 00 */ lwz r12, 0(r3) -/* 801DCB30 81 8C 01 10 */ lwz r12, 0x110(r12) -/* 801DCB34 7D 89 03 A6 */ mtctr r12 -/* 801DCB38 4E 80 04 21 */ bctrl -lbl_801DCB3C: -/* 801DCB3C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DCB40 48 18 56 DD */ bl _restgpr_26 -/* 801DCB44 80 01 00 34 */ lwz r0, 0x34(r1) -/* 801DCB48 7C 08 03 A6 */ mtlr r0 -/* 801DCB4C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801DCB50 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_item_explain/setScale__19dMenu_ItemExplain_cFv.s b/asm/d/menu/d_menu_item_explain/setScale__19dMenu_ItemExplain_cFv.s deleted file mode 100644 index a99cafdd444..00000000000 --- a/asm/d/menu/d_menu_item_explain/setScale__19dMenu_ItemExplain_cFv.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_801DCBBC: -/* 801DCBBC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801DCBC0 7C 08 02 A6 */ mflr r0 -/* 801DCBC4 90 01 00 24 */ stw r0, 0x24(r1) -/* 801DCBC8 88 03 00 E1 */ lbz r0, 0xe1(r3) -/* 801DCBCC 28 00 00 FF */ cmplwi r0, 0xff -/* 801DCBD0 41 82 00 AC */ beq lbl_801DCC7C -/* 801DCBD4 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801DCBD8 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801DCBDC 88 04 05 68 */ lbz r0, 0x568(r4) -/* 801DCBE0 28 00 00 01 */ cmplwi r0, 1 -/* 801DCBE4 40 82 00 2C */ bne lbl_801DCC10 -/* 801DCBE8 88 04 05 69 */ lbz r0, 0x569(r4) -/* 801DCBEC C8 22 A8 D8 */ lfd f1, lit_4950(r2) -/* 801DCBF0 90 01 00 0C */ stw r0, 0xc(r1) -/* 801DCBF4 3C 00 43 30 */ lis r0, 0x4330 -/* 801DCBF8 90 01 00 08 */ stw r0, 8(r1) -/* 801DCBFC C8 01 00 08 */ lfd f0, 8(r1) -/* 801DCC00 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801DCC04 C0 02 A8 D4 */ lfs f0, lit_4948(r2) -/* 801DCC08 EC 61 00 24 */ fdivs f3, f1, f0 -/* 801DCC0C 48 00 00 08 */ b lbl_801DCC14 -lbl_801DCC10: -/* 801DCC10 C0 62 A8 C4 */ lfs f3, lit_4348(r2) -lbl_801DCC14: -/* 801DCC14 80 A3 00 88 */ lwz r5, 0x88(r3) -/* 801DCC18 A0 05 00 04 */ lhz r0, 4(r5) -/* 801DCC1C C8 42 A8 D8 */ lfd f2, lit_4950(r2) -/* 801DCC20 90 01 00 14 */ stw r0, 0x14(r1) -/* 801DCC24 3C 80 43 30 */ lis r4, 0x4330 -/* 801DCC28 90 81 00 10 */ stw r4, 0x10(r1) -/* 801DCC2C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 801DCC30 EC 00 10 28 */ fsubs f0, f0, f2 -/* 801DCC34 C0 22 A8 BC */ lfs f1, lit_4346(r2) -/* 801DCC38 EC 00 08 24 */ fdivs f0, f0, f1 -/* 801DCC3C EC 80 00 F2 */ fmuls f4, f0, f3 -/* 801DCC40 80 63 00 38 */ lwz r3, 0x38(r3) -/* 801DCC44 80 63 00 04 */ lwz r3, 4(r3) -/* 801DCC48 A0 05 00 02 */ lhz r0, 2(r5) -/* 801DCC4C 90 01 00 1C */ stw r0, 0x1c(r1) -/* 801DCC50 90 81 00 18 */ stw r4, 0x18(r1) -/* 801DCC54 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 801DCC58 EC 00 10 28 */ fsubs f0, f0, f2 -/* 801DCC5C EC 00 08 24 */ fdivs f0, f0, f1 -/* 801DCC60 EC 00 00 F2 */ fmuls f0, f0, f3 -/* 801DCC64 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801DCC68 D0 83 00 D0 */ stfs f4, 0xd0(r3) -/* 801DCC6C 81 83 00 00 */ lwz r12, 0(r3) -/* 801DCC70 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801DCC74 7D 89 03 A6 */ mtctr r12 -/* 801DCC78 4E 80 04 21 */ bctrl -lbl_801DCC7C: -/* 801DCC7C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801DCC80 7C 08 03 A6 */ mtlr r0 -/* 801DCC84 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DCC88 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_ring/__dt__12dMenu_Ring_cFv.s b/asm/d/menu/d_menu_ring/__dt__12dMenu_Ring_cFv.s deleted file mode 100644 index 3b38b5781d6..00000000000 --- a/asm/d/menu/d_menu_ring/__dt__12dMenu_Ring_cFv.s +++ /dev/null @@ -1,317 +0,0 @@ -lbl_801EA708: -/* 801EA708 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 801EA70C 7C 08 02 A6 */ mflr r0 -/* 801EA710 90 01 00 54 */ stw r0, 0x54(r1) -/* 801EA714 39 61 00 50 */ addi r11, r1, 0x50 -/* 801EA718 48 17 7A 95 */ bl _savegpr_17 -/* 801EA71C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 801EA720 7C 9E 23 78 */ mr r30, r4 -/* 801EA724 41 82 04 3C */ beq lbl_801EAB60 -/* 801EA728 3C 60 80 3C */ lis r3, __vt__12dMenu_Ring_c@ha /* 0x803BDF5C@ha */ -/* 801EA72C 38 03 DF 5C */ addi r0, r3, __vt__12dMenu_Ring_c@l /* 0x803BDF5C@l */ -/* 801EA730 90 1F 00 00 */ stw r0, 0(r31) -/* 801EA734 80 7F 00 04 */ lwz r3, 4(r31) -/* 801EA738 48 0E 40 4D */ bl getTotalFreeSize__7JKRHeapFv -/* 801EA73C 38 00 00 00 */ li r0, 0 -/* 801EA740 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801EA744 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801EA748 98 03 00 E8 */ stb r0, 0xe8(r3) -/* 801EA74C 3A 60 00 00 */ li r19, 0 -/* 801EA750 3B 80 00 00 */ li r28, 0 -/* 801EA754 3B A0 00 00 */ li r29, 0 -lbl_801EA758: -/* 801EA758 3A 40 00 00 */ li r18, 0 -/* 801EA75C 3B 60 00 00 */ li r27, 0 -/* 801EA760 3B 40 00 00 */ li r26, 0 -/* 801EA764 7E DF EA 14 */ add r22, r31, r29 -/* 801EA768 7E BF E2 14 */ add r21, r31, r28 -lbl_801EA76C: -/* 801EA76C 3A 20 00 00 */ li r17, 0 -/* 801EA770 3B 20 00 00 */ li r25, 0 -/* 801EA774 7E F6 D2 14 */ add r23, r22, r26 -/* 801EA778 7F 38 CB 78 */ mr r24, r25 -lbl_801EA77C: -/* 801EA77C 80 7F 00 04 */ lwz r3, 4(r31) -/* 801EA780 3A 99 01 F0 */ addi r20, r25, 0x1f0 -/* 801EA784 7C 97 A0 2E */ lwzx r4, r23, r20 -/* 801EA788 48 0E 3D C1 */ bl free__7JKRHeapFPv -/* 801EA78C 7F 17 A1 2E */ stwx r24, r23, r20 -/* 801EA790 3A 31 00 01 */ addi r17, r17, 1 -/* 801EA794 2C 11 00 02 */ cmpwi r17, 2 -/* 801EA798 3B 39 00 04 */ addi r25, r25, 4 -/* 801EA79C 41 80 FF E0 */ blt lbl_801EA77C -/* 801EA7A0 3A 9B 00 68 */ addi r20, r27, 0x68 -/* 801EA7A4 7C 75 A0 2E */ lwzx r3, r21, r20 -/* 801EA7A8 28 03 00 00 */ cmplwi r3, 0 -/* 801EA7AC 41 82 00 24 */ beq lbl_801EA7D0 -/* 801EA7B0 41 82 00 18 */ beq lbl_801EA7C8 -/* 801EA7B4 38 80 00 01 */ li r4, 1 -/* 801EA7B8 81 83 00 00 */ lwz r12, 0(r3) -/* 801EA7BC 81 8C 00 08 */ lwz r12, 8(r12) -/* 801EA7C0 7D 89 03 A6 */ mtctr r12 -/* 801EA7C4 4E 80 04 21 */ bctrl -lbl_801EA7C8: -/* 801EA7C8 38 00 00 00 */ li r0, 0 -/* 801EA7CC 7C 15 A1 2E */ stwx r0, r21, r20 -lbl_801EA7D0: -/* 801EA7D0 3A 52 00 01 */ addi r18, r18, 1 -/* 801EA7D4 2C 12 00 03 */ cmpwi r18, 3 -/* 801EA7D8 3B 7B 00 04 */ addi r27, r27, 4 -/* 801EA7DC 3B 5A 00 08 */ addi r26, r26, 8 -/* 801EA7E0 41 80 FF 8C */ blt lbl_801EA76C -/* 801EA7E4 3A 73 00 01 */ addi r19, r19, 1 -/* 801EA7E8 2C 13 00 04 */ cmpwi r19, 4 -/* 801EA7EC 3B 9C 00 0C */ addi r28, r28, 0xc -/* 801EA7F0 3B BD 00 18 */ addi r29, r29, 0x18 -/* 801EA7F4 41 80 FF 64 */ blt lbl_801EA758 -/* 801EA7F8 3A 20 00 00 */ li r17, 0 -/* 801EA7FC 3B 80 00 00 */ li r28, 0 -/* 801EA800 3B 20 00 00 */ li r25, 0 -lbl_801EA804: -/* 801EA804 3A 9C 01 BC */ addi r20, r28, 0x1bc -/* 801EA808 7C 7F A0 2E */ lwzx r3, r31, r20 -/* 801EA80C 28 03 00 00 */ cmplwi r3, 0 -/* 801EA810 41 82 00 20 */ beq lbl_801EA830 -/* 801EA814 41 82 00 18 */ beq lbl_801EA82C -/* 801EA818 38 80 00 01 */ li r4, 1 -/* 801EA81C 81 83 00 00 */ lwz r12, 0(r3) -/* 801EA820 81 8C 00 08 */ lwz r12, 8(r12) -/* 801EA824 7D 89 03 A6 */ mtctr r12 -/* 801EA828 4E 80 04 21 */ bctrl -lbl_801EA82C: -/* 801EA82C 7F 3F A1 2E */ stwx r25, r31, r20 -lbl_801EA830: -/* 801EA830 3A 31 00 01 */ addi r17, r17, 1 -/* 801EA834 2C 11 00 03 */ cmpwi r17, 3 -/* 801EA838 3B 9C 00 04 */ addi r28, r28, 4 -/* 801EA83C 41 80 FF C8 */ blt lbl_801EA804 -/* 801EA840 80 7F 00 54 */ lwz r3, 0x54(r31) -/* 801EA844 28 03 00 00 */ cmplwi r3, 0 -/* 801EA848 41 82 00 18 */ beq lbl_801EA860 -/* 801EA84C 38 80 00 01 */ li r4, 1 -/* 801EA850 81 83 00 00 */ lwz r12, 0(r3) -/* 801EA854 81 8C 00 08 */ lwz r12, 8(r12) -/* 801EA858 7D 89 03 A6 */ mtctr r12 -/* 801EA85C 4E 80 04 21 */ bctrl -lbl_801EA860: -/* 801EA860 38 00 00 00 */ li r0, 0 -/* 801EA864 90 1F 00 54 */ stw r0, 0x54(r31) -/* 801EA868 80 7F 00 58 */ lwz r3, 0x58(r31) -/* 801EA86C 28 03 00 00 */ cmplwi r3, 0 -/* 801EA870 41 82 00 18 */ beq lbl_801EA888 -/* 801EA874 38 80 00 01 */ li r4, 1 -/* 801EA878 81 83 00 00 */ lwz r12, 0(r3) -/* 801EA87C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801EA880 7D 89 03 A6 */ mtctr r12 -/* 801EA884 4E 80 04 21 */ bctrl -lbl_801EA888: -/* 801EA888 38 00 00 00 */ li r0, 0 -/* 801EA88C 90 1F 00 58 */ stw r0, 0x58(r31) -/* 801EA890 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801EA894 28 03 00 00 */ cmplwi r3, 0 -/* 801EA898 41 82 00 18 */ beq lbl_801EA8B0 -/* 801EA89C 38 80 00 01 */ li r4, 1 -/* 801EA8A0 81 83 00 00 */ lwz r12, 0(r3) -/* 801EA8A4 81 8C 00 08 */ lwz r12, 8(r12) -/* 801EA8A8 7D 89 03 A6 */ mtctr r12 -/* 801EA8AC 4E 80 04 21 */ bctrl -lbl_801EA8B0: -/* 801EA8B0 3B 20 00 00 */ li r25, 0 -/* 801EA8B4 93 3F 00 18 */ stw r25, 0x18(r31) -/* 801EA8B8 3A 20 00 00 */ li r17, 0 -/* 801EA8BC 3B 80 00 00 */ li r28, 0 -lbl_801EA8C0: -/* 801EA8C0 3A 9C 00 24 */ addi r20, r28, 0x24 -/* 801EA8C4 7C 7F A0 2E */ lwzx r3, r31, r20 -/* 801EA8C8 28 03 00 00 */ cmplwi r3, 0 -/* 801EA8CC 41 82 00 20 */ beq lbl_801EA8EC -/* 801EA8D0 41 82 00 18 */ beq lbl_801EA8E8 -/* 801EA8D4 38 80 00 01 */ li r4, 1 -/* 801EA8D8 81 83 00 00 */ lwz r12, 0(r3) -/* 801EA8DC 81 8C 00 08 */ lwz r12, 8(r12) -/* 801EA8E0 7D 89 03 A6 */ mtctr r12 -/* 801EA8E4 4E 80 04 21 */ bctrl -lbl_801EA8E8: -/* 801EA8E8 7F 3F A1 2E */ stwx r25, r31, r20 -lbl_801EA8EC: -/* 801EA8EC 3A 31 00 01 */ addi r17, r17, 1 -/* 801EA8F0 2C 11 00 0A */ cmpwi r17, 0xa -/* 801EA8F4 3B 9C 00 04 */ addi r28, r28, 4 -/* 801EA8F8 41 80 FF C8 */ blt lbl_801EA8C0 -/* 801EA8FC 3A 20 00 00 */ li r17, 0 -/* 801EA900 3B A0 00 00 */ li r29, 0 -lbl_801EA904: -/* 801EA904 3A 40 00 00 */ li r18, 0 -/* 801EA908 3B 80 00 00 */ li r28, 0 -/* 801EA90C 7E BF EA 14 */ add r21, r31, r29 -lbl_801EA910: -/* 801EA910 7E 95 E2 14 */ add r20, r21, r28 -/* 801EA914 80 74 00 98 */ lwz r3, 0x98(r20) -/* 801EA918 28 03 00 00 */ cmplwi r3, 0 -/* 801EA91C 41 82 00 24 */ beq lbl_801EA940 -/* 801EA920 41 82 00 18 */ beq lbl_801EA938 -/* 801EA924 38 80 00 01 */ li r4, 1 -/* 801EA928 81 83 00 00 */ lwz r12, 0(r3) -/* 801EA92C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801EA930 7D 89 03 A6 */ mtctr r12 -/* 801EA934 4E 80 04 21 */ bctrl -lbl_801EA938: -/* 801EA938 38 00 00 00 */ li r0, 0 -/* 801EA93C 90 14 00 98 */ stw r0, 0x98(r20) -lbl_801EA940: -/* 801EA940 80 94 02 50 */ lwz r4, 0x250(r20) -/* 801EA944 28 04 00 00 */ cmplwi r4, 0 -/* 801EA948 41 82 00 14 */ beq lbl_801EA95C -/* 801EA94C 80 7F 00 04 */ lwz r3, 4(r31) -/* 801EA950 48 0E 3B F9 */ bl free__7JKRHeapFPv -/* 801EA954 38 00 00 00 */ li r0, 0 -/* 801EA958 90 14 02 50 */ stw r0, 0x250(r20) -lbl_801EA95C: -/* 801EA95C 3A 52 00 01 */ addi r18, r18, 1 -/* 801EA960 2C 12 00 03 */ cmpwi r18, 3 -/* 801EA964 3B 9C 00 04 */ addi r28, r28, 4 -/* 801EA968 41 80 FF A8 */ blt lbl_801EA910 -/* 801EA96C 3A 31 00 01 */ addi r17, r17, 1 -/* 801EA970 2C 11 00 18 */ cmpwi r17, 0x18 -/* 801EA974 3B BD 00 0C */ addi r29, r29, 0xc -/* 801EA978 41 80 FF 8C */ blt lbl_801EA904 -/* 801EA97C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801EA980 38 80 00 01 */ li r4, 1 -/* 801EA984 48 05 F3 A5 */ bl __dt__12dMsgString_cFv -/* 801EA988 38 00 00 00 */ li r0, 0 -/* 801EA98C 90 1F 00 14 */ stw r0, 0x14(r31) -/* 801EA990 80 7F 00 04 */ lwz r3, 4(r31) -/* 801EA994 48 0E 3D F1 */ bl getTotalFreeSize__7JKRHeapFv -/* 801EA998 80 7F 01 B8 */ lwz r3, 0x1b8(r31) -/* 801EA99C 28 03 00 00 */ cmplwi r3, 0 -/* 801EA9A0 41 82 00 18 */ beq lbl_801EA9B8 -/* 801EA9A4 38 80 00 01 */ li r4, 1 -/* 801EA9A8 81 83 00 00 */ lwz r12, 0(r3) -/* 801EA9AC 81 8C 00 08 */ lwz r12, 8(r12) -/* 801EA9B0 7D 89 03 A6 */ mtctr r12 -/* 801EA9B4 4E 80 04 21 */ bctrl -lbl_801EA9B8: -/* 801EA9B8 38 00 00 00 */ li r0, 0 -/* 801EA9BC 90 1F 01 B8 */ stw r0, 0x1b8(r31) -/* 801EA9C0 80 7F 00 5C */ lwz r3, 0x5c(r31) -/* 801EA9C4 28 03 00 00 */ cmplwi r3, 0 -/* 801EA9C8 41 82 00 18 */ beq lbl_801EA9E0 -/* 801EA9CC 38 80 00 01 */ li r4, 1 -/* 801EA9D0 81 83 00 00 */ lwz r12, 0(r3) -/* 801EA9D4 81 8C 00 08 */ lwz r12, 8(r12) -/* 801EA9D8 7D 89 03 A6 */ mtctr r12 -/* 801EA9DC 4E 80 04 21 */ bctrl -lbl_801EA9E0: -/* 801EA9E0 38 00 00 00 */ li r0, 0 -/* 801EA9E4 90 1F 00 5C */ stw r0, 0x5c(r31) -/* 801EA9E8 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 801EA9EC 28 03 00 00 */ cmplwi r3, 0 -/* 801EA9F0 41 82 00 18 */ beq lbl_801EAA08 -/* 801EA9F4 38 80 00 01 */ li r4, 1 -/* 801EA9F8 81 83 00 00 */ lwz r12, 0(r3) -/* 801EA9FC 81 8C 00 08 */ lwz r12, 8(r12) -/* 801EAA00 7D 89 03 A6 */ mtctr r12 -/* 801EAA04 4E 80 04 21 */ bctrl -lbl_801EAA08: -/* 801EAA08 38 00 00 00 */ li r0, 0 -/* 801EAA0C 90 1F 00 20 */ stw r0, 0x20(r31) -/* 801EAA10 80 7F 00 64 */ lwz r3, 0x64(r31) -/* 801EAA14 28 03 00 00 */ cmplwi r3, 0 -/* 801EAA18 41 82 00 18 */ beq lbl_801EAA30 -/* 801EAA1C 38 80 00 01 */ li r4, 1 -/* 801EAA20 81 83 00 00 */ lwz r12, 0(r3) -/* 801EAA24 81 8C 00 08 */ lwz r12, 8(r12) -/* 801EAA28 7D 89 03 A6 */ mtctr r12 -/* 801EAA2C 4E 80 04 21 */ bctrl -lbl_801EAA30: -/* 801EAA30 3B 20 00 00 */ li r25, 0 -/* 801EAA34 93 3F 00 64 */ stw r25, 0x64(r31) -/* 801EAA38 3A 20 00 00 */ li r17, 0 -/* 801EAA3C 3B A0 00 00 */ li r29, 0 -lbl_801EAA40: -/* 801EAA40 3A 9D 03 74 */ addi r20, r29, 0x374 -/* 801EAA44 7C 9F A0 2E */ lwzx r4, r31, r20 -/* 801EAA48 28 04 00 00 */ cmplwi r4, 0 -/* 801EAA4C 41 82 00 10 */ beq lbl_801EAA5C -/* 801EAA50 80 7F 00 04 */ lwz r3, 4(r31) -/* 801EAA54 48 0E 3A F5 */ bl free__7JKRHeapFPv -/* 801EAA58 7F 3F A1 2E */ stwx r25, r31, r20 -lbl_801EAA5C: -/* 801EAA5C 3A 31 00 01 */ addi r17, r17, 1 -/* 801EAA60 2C 11 00 03 */ cmpwi r17, 3 -/* 801EAA64 3B BD 00 04 */ addi r29, r29, 4 -/* 801EAA68 41 80 FF D8 */ blt lbl_801EAA40 -/* 801EAA6C 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801EAA70 28 03 00 00 */ cmplwi r3, 0 -/* 801EAA74 41 82 00 18 */ beq lbl_801EAA8C -/* 801EAA78 38 80 00 01 */ li r4, 1 -/* 801EAA7C 81 83 00 00 */ lwz r12, 0(r3) -/* 801EAA80 81 8C 00 08 */ lwz r12, 8(r12) -/* 801EAA84 7D 89 03 A6 */ mtctr r12 -/* 801EAA88 4E 80 04 21 */ bctrl -lbl_801EAA8C: -/* 801EAA8C 38 00 00 00 */ li r0, 0 -/* 801EAA90 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 801EAA94 80 7F 00 4C */ lwz r3, 0x4c(r31) -/* 801EAA98 28 03 00 00 */ cmplwi r3, 0 -/* 801EAA9C 41 82 00 18 */ beq lbl_801EAAB4 -/* 801EAAA0 38 80 00 01 */ li r4, 1 -/* 801EAAA4 81 83 00 00 */ lwz r12, 0(r3) -/* 801EAAA8 81 8C 00 08 */ lwz r12, 8(r12) -/* 801EAAAC 7D 89 03 A6 */ mtctr r12 -/* 801EAAB0 4E 80 04 21 */ bctrl -lbl_801EAAB4: -/* 801EAAB4 38 00 00 00 */ li r0, 0 -/* 801EAAB8 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 801EAABC 80 7F 00 50 */ lwz r3, 0x50(r31) -/* 801EAAC0 28 03 00 00 */ cmplwi r3, 0 -/* 801EAAC4 41 82 00 18 */ beq lbl_801EAADC -/* 801EAAC8 38 80 00 01 */ li r4, 1 -/* 801EAACC 81 83 00 00 */ lwz r12, 0(r3) -/* 801EAAD0 81 8C 00 08 */ lwz r12, 8(r12) -/* 801EAAD4 7D 89 03 A6 */ mtctr r12 -/* 801EAAD8 4E 80 04 21 */ bctrl -lbl_801EAADC: -/* 801EAADC 38 00 00 00 */ li r0, 0 -/* 801EAAE0 90 1F 00 50 */ stw r0, 0x50(r31) -/* 801EAAE4 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 801EAAE8 28 03 00 00 */ cmplwi r3, 0 -/* 801EAAEC 41 82 00 18 */ beq lbl_801EAB04 -/* 801EAAF0 38 80 00 01 */ li r4, 1 -/* 801EAAF4 81 83 00 00 */ lwz r12, 0(r3) -/* 801EAAF8 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801EAAFC 7D 89 03 A6 */ mtctr r12 -/* 801EAB00 4E 80 04 21 */ bctrl -lbl_801EAB04: -/* 801EAB04 38 00 00 00 */ li r0, 0 -/* 801EAB08 90 1F 00 10 */ stw r0, 0x10(r31) -/* 801EAB0C 80 7F 03 70 */ lwz r3, 0x370(r31) -/* 801EAB10 28 03 00 00 */ cmplwi r3, 0 -/* 801EAB14 41 82 00 18 */ beq lbl_801EAB2C -/* 801EAB18 38 80 00 01 */ li r4, 1 -/* 801EAB1C 81 83 00 00 */ lwz r12, 0(r3) -/* 801EAB20 81 8C 00 08 */ lwz r12, 8(r12) -/* 801EAB24 7D 89 03 A6 */ mtctr r12 -/* 801EAB28 4E 80 04 21 */ bctrl -lbl_801EAB2C: -/* 801EAB2C 38 00 00 00 */ li r0, 0 -/* 801EAB30 90 1F 03 70 */ stw r0, 0x370(r31) -/* 801EAB34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801EAB38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801EAB3C 80 63 5C E8 */ lwz r3, 0x5ce8(r3) -/* 801EAB40 81 83 00 00 */ lwz r12, 0(r3) -/* 801EAB44 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 801EAB48 7D 89 03 A6 */ mtctr r12 -/* 801EAB4C 4E 80 04 21 */ bctrl -/* 801EAB50 7F C0 07 35 */ extsh. r0, r30 -/* 801EAB54 40 81 00 0C */ ble lbl_801EAB60 -/* 801EAB58 7F E3 FB 78 */ mr r3, r31 -/* 801EAB5C 48 0E 41 E1 */ bl __dl__FPv -lbl_801EAB60: -/* 801EAB60 7F E3 FB 78 */ mr r3, r31 -/* 801EAB64 39 61 00 50 */ addi r11, r1, 0x50 -/* 801EAB68 48 17 76 91 */ bl _restgpr_17 -/* 801EAB6C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 801EAB70 7C 08 03 A6 */ mtlr r0 -/* 801EAB74 38 21 00 50 */ addi r1, r1, 0x50 -/* 801EAB78 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_ring/getCursorPos__12dMenu_Ring_cFUc.s b/asm/d/menu/d_menu_ring/getCursorPos__12dMenu_Ring_cFUc.s deleted file mode 100644 index 2bd1ce57449..00000000000 --- a/asm/d/menu/d_menu_ring/getCursorPos__12dMenu_Ring_cFUc.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_801EDFDC: -/* 801EDFDC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801EDFE0 7C 08 02 A6 */ mflr r0 -/* 801EDFE4 90 01 00 24 */ stw r0, 0x24(r1) -/* 801EDFE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801EDFEC 48 17 41 ED */ bl _savegpr_28 -/* 801EDFF0 7C 7C 1B 78 */ mr r28, r3 -/* 801EDFF4 3B A0 00 00 */ li r29, 0 -/* 801EDFF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801EDFFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801EE000 3B C3 00 9C */ addi r30, r3, 0x9c -/* 801EE004 54 9F 06 3E */ clrlwi r31, r4, 0x18 -/* 801EE008 48 00 00 28 */ b lbl_801EE030 -lbl_801EE00C: -/* 801EE00C 7F C3 F3 78 */ mr r3, r30 -/* 801EE010 7F A4 EB 78 */ mr r4, r29 -/* 801EE014 4B E4 53 41 */ bl getLineUpItem__17dSv_player_item_cCFi -/* 801EE018 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801EE01C 7C 1F 00 40 */ cmplw r31, r0 -/* 801EE020 40 82 00 0C */ bne lbl_801EE02C -/* 801EE024 57 A3 06 3E */ clrlwi r3, r29, 0x18 -/* 801EE028 48 00 00 18 */ b lbl_801EE040 -lbl_801EE02C: -/* 801EE02C 3B BD 00 01 */ addi r29, r29, 1 -lbl_801EE030: -/* 801EE030 88 1C 06 AE */ lbz r0, 0x6ae(r28) -/* 801EE034 7C 1D 00 00 */ cmpw r29, r0 -/* 801EE038 41 80 FF D4 */ blt lbl_801EE00C -/* 801EE03C 38 60 00 FF */ li r3, 0xff -lbl_801EE040: -/* 801EE040 39 61 00 20 */ addi r11, r1, 0x20 -/* 801EE044 48 17 41 E1 */ bl _restgpr_28 -/* 801EE048 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801EE04C 7C 08 03 A6 */ mtlr r0 -/* 801EE050 38 21 00 20 */ addi r1, r1, 0x20 -/* 801EE054 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_ring/getItem__12dMenu_Ring_cFiUc.s b/asm/d/menu/d_menu_ring/getItem__12dMenu_Ring_cFiUc.s deleted file mode 100644 index 23f285b770c..00000000000 --- a/asm/d/menu/d_menu_ring/getItem__12dMenu_Ring_cFiUc.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801EEA84: -/* 801EEA84 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801EEA88 7C 08 02 A6 */ mflr r0 -/* 801EEA8C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801EEA90 39 61 00 20 */ addi r11, r1, 0x20 -/* 801EEA94 48 17 37 49 */ bl _savegpr_29 -/* 801EEA98 7C BD 2B 78 */ mr r29, r5 -/* 801EEA9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801EEAA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801EEAA4 3B C3 00 9C */ addi r30, r3, 0x9c -/* 801EEAA8 7F C3 F3 78 */ mr r3, r30 -/* 801EEAAC 38 A0 00 00 */ li r5, 0 -/* 801EEAB0 4B E4 45 81 */ bl getItem__17dSv_player_item_cCFib -/* 801EEAB4 7C 7F 1B 78 */ mr r31, r3 -/* 801EEAB8 7F C3 F3 78 */ mr r3, r30 -/* 801EEABC 57 A4 06 3E */ clrlwi r4, r29, 0x18 -/* 801EEAC0 38 A0 00 00 */ li r5, 0 -/* 801EEAC4 4B E4 45 6D */ bl getItem__17dSv_player_item_cCFib -/* 801EEAC8 7F E3 FB 78 */ mr r3, r31 -/* 801EEACC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801EEAD0 48 17 37 59 */ bl _restgpr_29 -/* 801EEAD4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801EEAD8 7C 08 03 A6 */ mtlr r0 -/* 801EEADC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801EEAE0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_ring/isMixItemOff__12dMenu_Ring_cFv.s b/asm/d/menu/d_menu_ring/isMixItemOff__12dMenu_Ring_cFv.s deleted file mode 100644 index 2da2882d726..00000000000 --- a/asm/d/menu/d_menu_ring/isMixItemOff__12dMenu_Ring_cFv.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_801EEC98: -/* 801EEC98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801EEC9C 7C 08 02 A6 */ mflr r0 -/* 801EECA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801EECA4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801EECA8 7C 7F 1B 78 */ mr r31, r3 -/* 801EECAC 80 03 06 2C */ lwz r0, 0x62c(r3) -/* 801EECB0 28 00 00 00 */ cmplwi r0, 0 -/* 801EECB4 40 82 00 B8 */ bne lbl_801EED6C -/* 801EECB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801EECBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801EECC0 38 63 00 9C */ addi r3, r3, 0x9c -/* 801EECC4 88 1F 06 A8 */ lbz r0, 0x6a8(r31) -/* 801EECC8 7C 9F 02 14 */ add r4, r31, r0 -/* 801EECCC 88 84 06 90 */ lbz r4, 0x690(r4) -/* 801EECD0 38 A0 00 00 */ li r5, 0 -/* 801EECD4 4B E4 43 5D */ bl getItem__17dSv_player_item_cCFib -/* 801EECD8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801EECDC 28 00 00 FF */ cmplwi r0, 0xff -/* 801EECE0 41 82 00 8C */ beq lbl_801EED6C -/* 801EECE4 38 60 00 00 */ li r3, 0 -/* 801EECE8 4B E3 F0 E1 */ bl dComIfGs_getMixItemIndex__Fi -/* 801EECEC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801EECF0 28 00 00 04 */ cmplwi r0, 4 -/* 801EECF4 40 82 00 34 */ bne lbl_801EED28 -/* 801EECF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801EECFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801EED00 38 80 00 00 */ li r4, 0 -/* 801EED04 4B E4 3D 59 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 801EED08 88 1F 06 A8 */ lbz r0, 0x6a8(r31) -/* 801EED0C 7C 9F 02 14 */ add r4, r31, r0 -/* 801EED10 88 84 06 90 */ lbz r4, 0x690(r4) -/* 801EED14 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801EED18 7C 04 00 40 */ cmplw r4, r0 -/* 801EED1C 40 82 00 0C */ bne lbl_801EED28 -/* 801EED20 38 60 00 01 */ li r3, 1 -/* 801EED24 48 00 00 4C */ b lbl_801EED70 -lbl_801EED28: -/* 801EED28 38 60 00 01 */ li r3, 1 -/* 801EED2C 4B E3 F0 9D */ bl dComIfGs_getMixItemIndex__Fi -/* 801EED30 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801EED34 28 00 00 04 */ cmplwi r0, 4 -/* 801EED38 40 82 00 34 */ bne lbl_801EED6C -/* 801EED3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801EED40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801EED44 38 80 00 01 */ li r4, 1 -/* 801EED48 4B E4 3D 15 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 801EED4C 88 1F 06 A8 */ lbz r0, 0x6a8(r31) -/* 801EED50 7C 9F 02 14 */ add r4, r31, r0 -/* 801EED54 88 84 06 90 */ lbz r4, 0x690(r4) -/* 801EED58 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801EED5C 7C 04 00 40 */ cmplw r4, r0 -/* 801EED60 40 82 00 0C */ bne lbl_801EED6C -/* 801EED64 38 60 00 01 */ li r3, 1 -/* 801EED68 48 00 00 08 */ b lbl_801EED70 -lbl_801EED6C: -/* 801EED6C 38 60 00 00 */ li r3, 0 -lbl_801EED70: -/* 801EED70 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801EED74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801EED78 7C 08 03 A6 */ mtlr r0 -/* 801EED7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801EED80 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_ring/isMixItemOn__12dMenu_Ring_cFv.s b/asm/d/menu/d_menu_ring/isMixItemOn__12dMenu_Ring_cFv.s deleted file mode 100644 index 2d904456110..00000000000 --- a/asm/d/menu/d_menu_ring/isMixItemOn__12dMenu_Ring_cFv.s +++ /dev/null @@ -1,90 +0,0 @@ -lbl_801EEB58: -/* 801EEB58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801EEB5C 7C 08 02 A6 */ mflr r0 -/* 801EEB60 90 01 00 14 */ stw r0, 0x14(r1) -/* 801EEB64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801EEB68 93 C1 00 08 */ stw r30, 8(r1) -/* 801EEB6C 7C 7E 1B 78 */ mr r30, r3 -/* 801EEB70 80 03 06 2C */ lwz r0, 0x62c(r3) -/* 801EEB74 28 00 00 00 */ cmplwi r0, 0 -/* 801EEB78 40 82 01 04 */ bne lbl_801EEC7C -/* 801EEB7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801EEB80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801EEB84 3B E3 00 9C */ addi r31, r3, 0x9c -/* 801EEB88 7F E3 FB 78 */ mr r3, r31 -/* 801EEB8C 88 1E 06 A8 */ lbz r0, 0x6a8(r30) -/* 801EEB90 7C 9E 02 14 */ add r4, r30, r0 -/* 801EEB94 88 84 06 90 */ lbz r4, 0x690(r4) -/* 801EEB98 38 A0 00 00 */ li r5, 0 -/* 801EEB9C 4B E4 44 95 */ bl getItem__17dSv_player_item_cCFib -/* 801EEBA0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801EEBA4 28 00 00 FF */ cmplwi r0, 0xff -/* 801EEBA8 41 82 00 D4 */ beq lbl_801EEC7C -/* 801EEBAC 7F E3 FB 78 */ mr r3, r31 -/* 801EEBB0 88 1E 06 A8 */ lbz r0, 0x6a8(r30) -/* 801EEBB4 7C 9E 02 14 */ add r4, r30, r0 -/* 801EEBB8 88 84 06 90 */ lbz r4, 0x690(r4) -/* 801EEBBC 38 A0 00 00 */ li r5, 0 -/* 801EEBC0 4B E4 44 71 */ bl getItem__17dSv_player_item_cCFib -/* 801EEBC4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801EEBC8 2C 00 00 70 */ cmpwi r0, 0x70 -/* 801EEBCC 40 80 00 10 */ bge lbl_801EEBDC -/* 801EEBD0 2C 00 00 3E */ cmpwi r0, 0x3e -/* 801EEBD4 41 82 00 10 */ beq lbl_801EEBE4 -/* 801EEBD8 48 00 00 A4 */ b lbl_801EEC7C -lbl_801EEBDC: -/* 801EEBDC 2C 00 00 73 */ cmpwi r0, 0x73 -/* 801EEBE0 40 80 00 9C */ bge lbl_801EEC7C -lbl_801EEBE4: -/* 801EEBE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801EEBE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801EEBEC 38 80 00 00 */ li r4, 0 -/* 801EEBF0 4B E4 3E 6D */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 801EEBF4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801EEBF8 28 00 00 04 */ cmplwi r0, 4 -/* 801EEBFC 40 82 00 18 */ bne lbl_801EEC14 -/* 801EEC00 38 60 00 00 */ li r3, 0 -/* 801EEC04 4B E3 F1 C5 */ bl dComIfGs_getMixItemIndex__Fi -/* 801EEC08 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801EEC0C 28 00 00 FF */ cmplwi r0, 0xff -/* 801EEC10 41 82 00 18 */ beq lbl_801EEC28 -lbl_801EEC14: -/* 801EEC14 38 60 00 00 */ li r3, 0 -/* 801EEC18 4B E3 F1 B1 */ bl dComIfGs_getMixItemIndex__Fi -/* 801EEC1C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801EEC20 28 00 00 04 */ cmplwi r0, 4 -/* 801EEC24 40 82 00 0C */ bne lbl_801EEC30 -lbl_801EEC28: -/* 801EEC28 38 60 00 01 */ li r3, 1 -/* 801EEC2C 48 00 00 54 */ b lbl_801EEC80 -lbl_801EEC30: -/* 801EEC30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801EEC34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801EEC38 38 80 00 01 */ li r4, 1 -/* 801EEC3C 4B E4 3E 21 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 801EEC40 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801EEC44 28 00 00 04 */ cmplwi r0, 4 -/* 801EEC48 40 82 00 18 */ bne lbl_801EEC60 -/* 801EEC4C 38 60 00 01 */ li r3, 1 -/* 801EEC50 4B E3 F1 79 */ bl dComIfGs_getMixItemIndex__Fi -/* 801EEC54 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801EEC58 28 00 00 FF */ cmplwi r0, 0xff -/* 801EEC5C 41 82 00 18 */ beq lbl_801EEC74 -lbl_801EEC60: -/* 801EEC60 38 60 00 01 */ li r3, 1 -/* 801EEC64 4B E3 F1 65 */ bl dComIfGs_getMixItemIndex__Fi -/* 801EEC68 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801EEC6C 28 00 00 04 */ cmplwi r0, 4 -/* 801EEC70 40 82 00 0C */ bne lbl_801EEC7C -lbl_801EEC74: -/* 801EEC74 38 60 00 01 */ li r3, 1 -/* 801EEC78 48 00 00 08 */ b lbl_801EEC80 -lbl_801EEC7C: -/* 801EEC7C 38 60 00 00 */ li r3, 0 -lbl_801EEC80: -/* 801EEC80 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801EEC84 83 C1 00 08 */ lwz r30, 8(r1) -/* 801EEC88 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801EEC8C 7C 08 03 A6 */ mtlr r0 -/* 801EEC90 38 21 00 10 */ addi r1, r1, 0x10 -/* 801EEC94 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_ring/openExplain__12dMenu_Ring_cFUc.s b/asm/d/menu/d_menu_ring/openExplain__12dMenu_Ring_cFUc.s deleted file mode 100644 index 8c47dd03aed..00000000000 --- a/asm/d/menu/d_menu_ring/openExplain__12dMenu_Ring_cFUc.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_801EF48C: -/* 801EF48C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801EF490 7C 08 02 A6 */ mflr r0 -/* 801EF494 90 01 00 14 */ stw r0, 0x14(r1) -/* 801EF498 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801EF49C 93 C1 00 08 */ stw r30, 8(r1) -/* 801EF4A0 7C 7E 1B 78 */ mr r30, r3 -/* 801EF4A4 88 A3 06 CF */ lbz r5, 0x6cf(r3) -/* 801EF4A8 28 05 00 FF */ cmplwi r5, 0xff -/* 801EF4AC 40 82 00 70 */ bne lbl_801EF51C -/* 801EF4B0 88 1E 06 D0 */ lbz r0, 0x6d0(r30) -/* 801EF4B4 28 00 00 FF */ cmplwi r0, 0xff -/* 801EF4B8 40 82 00 64 */ bne lbl_801EF51C -/* 801EF4BC 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 801EF4C0 28 00 00 FF */ cmplwi r0, 0xff -/* 801EF4C4 41 82 00 50 */ beq lbl_801EF514 -/* 801EF4C8 88 1E 06 A8 */ lbz r0, 0x6a8(r30) -/* 801EF4CC 7C 9E 02 14 */ add r4, r30, r0 -/* 801EF4D0 88 84 06 90 */ lbz r4, 0x690(r4) -/* 801EF4D4 4B FF EC 89 */ bl getItemMaxNum__12dMenu_Ring_cFUc -/* 801EF4D8 7C 7F 1B 78 */ mr r31, r3 -/* 801EF4DC 7F C3 F3 78 */ mr r3, r30 -/* 801EF4E0 88 1E 06 A8 */ lbz r0, 0x6a8(r30) -/* 801EF4E4 7C 9E 02 14 */ add r4, r30, r0 -/* 801EF4E8 88 84 06 90 */ lbz r4, 0x690(r4) -/* 801EF4EC 4B FF EB 6D */ bl getItemNum__12dMenu_Ring_cFUc -/* 801EF4F0 7C 65 1B 78 */ mr r5, r3 -/* 801EF4F4 80 7E 03 70 */ lwz r3, 0x370(r30) -/* 801EF4F8 88 1E 06 A8 */ lbz r0, 0x6a8(r30) -/* 801EF4FC 7C 9E 02 14 */ add r4, r30, r0 -/* 801EF500 88 84 06 90 */ lbz r4, 0x690(r4) -/* 801EF504 7F E6 FB 78 */ mr r6, r31 -/* 801EF508 38 E0 00 00 */ li r7, 0 -/* 801EF50C 4B FE CE 35 */ bl openExplain__19dMenu_ItemExplain_cFUcUcUcb -/* 801EF510 48 00 00 38 */ b lbl_801EF548 -lbl_801EF514: -/* 801EF514 38 60 00 00 */ li r3, 0 -/* 801EF518 48 00 00 30 */ b lbl_801EF548 -lbl_801EF51C: -/* 801EF51C 88 1E 06 D0 */ lbz r0, 0x6d0(r30) -/* 801EF520 28 00 00 FF */ cmplwi r0, 0xff -/* 801EF524 41 82 00 08 */ beq lbl_801EF52C -/* 801EF528 7C 05 03 78 */ mr r5, r0 -lbl_801EF52C: -/* 801EF52C 54 A0 15 BA */ rlwinm r0, r5, 2, 0x16, 0x1d -/* 801EF530 80 7E 03 70 */ lwz r3, 0x370(r30) -/* 801EF534 38 82 AA 24 */ la r4, i_nameID(r2) /* 80454424-_SDA2_BASE_ */ -/* 801EF538 7C 84 00 2E */ lwzx r4, r4, r0 -/* 801EF53C 38 A2 AA 2C */ la r5, i_expID(r2) /* 8045442C-_SDA2_BASE_ */ -/* 801EF540 7C A5 00 2E */ lwzx r5, r5, r0 -/* 801EF544 4B FE D1 F5 */ bl openExplainTx__19dMenu_ItemExplain_cFUlUl -lbl_801EF548: -/* 801EF548 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801EF54C 83 C1 00 08 */ lwz r30, 8(r1) -/* 801EF550 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801EF554 7C 08 03 A6 */ mtlr r0 -/* 801EF558 38 21 00 10 */ addi r1, r1, 0x10 -/* 801EF55C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_ring/setButtonScale__12dMenu_Ring_cFif.s b/asm/d/menu/d_menu_ring/setButtonScale__12dMenu_Ring_cFif.s deleted file mode 100644 index 62955c00fbf..00000000000 --- a/asm/d/menu/d_menu_ring/setButtonScale__12dMenu_Ring_cFif.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801EBAB8: -/* 801EBAB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801EBABC 7C 08 02 A6 */ mflr r0 -/* 801EBAC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801EBAC4 38 04 00 08 */ addi r0, r4, 8 -/* 801EBAC8 54 00 10 3A */ slwi r0, r0, 2 -/* 801EBACC 7C 63 02 14 */ add r3, r3, r0 -/* 801EBAD0 80 83 00 24 */ lwz r4, 0x24(r3) -/* 801EBAD4 28 04 00 00 */ cmplwi r4, 0 -/* 801EBAD8 41 82 00 28 */ beq lbl_801EBB00 -/* 801EBADC C0 03 05 E8 */ lfs f0, 0x5e8(r3) -/* 801EBAE0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801EBAE4 80 64 00 04 */ lwz r3, 4(r4) -/* 801EBAE8 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801EBAEC D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801EBAF0 81 83 00 00 */ lwz r12, 0(r3) -/* 801EBAF4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801EBAF8 7D 89 03 A6 */ mtctr r12 -/* 801EBAFC 4E 80 04 21 */ bctrl -lbl_801EBB00: -/* 801EBB00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801EBB04 7C 08 03 A6 */ mtlr r0 -/* 801EBB08 38 21 00 10 */ addi r1, r1, 0x10 -/* 801EBB0C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_ring/setDoStatus__12dMenu_Ring_cFUc.s b/asm/d/menu/d_menu_ring/setDoStatus__12dMenu_Ring_cFUc.s deleted file mode 100644 index 7c21a325c0a..00000000000 --- a/asm/d/menu/d_menu_ring/setDoStatus__12dMenu_Ring_cFUc.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_801EEAE4: -/* 801EEAE4 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 801EEAE8 40 82 00 48 */ bne lbl_801EEB30 -/* 801EEAEC 88 03 06 CC */ lbz r0, 0x6cc(r3) -/* 801EEAF0 28 00 00 24 */ cmplwi r0, 0x24 -/* 801EEAF4 40 82 00 3C */ bne lbl_801EEB30 -/* 801EEAF8 A8 83 06 8E */ lha r4, 0x68e(r3) -/* 801EEAFC 2C 04 00 00 */ cmpwi r4, 0 -/* 801EEB00 40 81 00 24 */ ble lbl_801EEB24 -/* 801EEB04 38 04 FF FF */ addi r0, r4, -1 -/* 801EEB08 B0 03 06 8E */ sth r0, 0x68e(r3) -/* 801EEB0C A8 03 06 8E */ lha r0, 0x68e(r3) -/* 801EEB10 2C 00 00 00 */ cmpwi r0, 0 -/* 801EEB14 40 82 00 28 */ bne lbl_801EEB3C -/* 801EEB18 38 00 00 00 */ li r0, 0 -/* 801EEB1C 98 03 06 CC */ stb r0, 0x6cc(r3) -/* 801EEB20 48 00 00 1C */ b lbl_801EEB3C -lbl_801EEB24: -/* 801EEB24 38 00 00 0A */ li r0, 0xa -/* 801EEB28 B0 03 06 8E */ sth r0, 0x68e(r3) -/* 801EEB2C 48 00 00 10 */ b lbl_801EEB3C -lbl_801EEB30: -/* 801EEB30 98 83 06 CC */ stb r4, 0x6cc(r3) -/* 801EEB34 38 00 00 00 */ li r0, 0 -/* 801EEB38 B0 03 06 8E */ sth r0, 0x68e(r3) -lbl_801EEB3C: -/* 801EEB3C 88 03 06 CC */ lbz r0, 0x6cc(r3) -/* 801EEB40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801EEB44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801EEB48 98 03 5E 3C */ stb r0, 0x5e3c(r3) -/* 801EEB4C 38 00 00 00 */ li r0, 0 -/* 801EEB50 98 03 5E 57 */ stb r0, 0x5e57(r3) -/* 801EEB54 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_ring/setItemScale__12dMenu_Ring_cFif.s b/asm/d/menu/d_menu_ring/setItemScale__12dMenu_Ring_cFif.s deleted file mode 100644 index d8e08f3765a..00000000000 --- a/asm/d/menu/d_menu_ring/setItemScale__12dMenu_Ring_cFif.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_801EBA38: -/* 801EBA38 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801EBA3C 7C 08 02 A6 */ mflr r0 -/* 801EBA40 90 01 00 24 */ stw r0, 0x24(r1) -/* 801EBA44 DB E1 00 18 */ stfd f31, 0x18(r1) -/* 801EBA48 39 61 00 18 */ addi r11, r1, 0x18 -/* 801EBA4C 48 17 67 91 */ bl _savegpr_29 -/* 801EBA50 FF E0 08 90 */ fmr f31, f1 -/* 801EBA54 3B A0 00 00 */ li r29, 0 -/* 801EBA58 3B E0 00 00 */ li r31, 0 -/* 801EBA5C 1C 04 00 0C */ mulli r0, r4, 0xc -/* 801EBA60 7F C3 02 14 */ add r30, r3, r0 -lbl_801EBA64: -/* 801EBA64 38 1F 00 98 */ addi r0, r31, 0x98 -/* 801EBA68 7C 7E 00 2E */ lwzx r3, r30, r0 -/* 801EBA6C 28 03 00 00 */ cmplwi r3, 0 -/* 801EBA70 41 82 00 1C */ beq lbl_801EBA8C -/* 801EBA74 D3 E3 00 CC */ stfs f31, 0xcc(r3) -/* 801EBA78 D3 E3 00 D0 */ stfs f31, 0xd0(r3) -/* 801EBA7C 81 83 00 00 */ lwz r12, 0(r3) -/* 801EBA80 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801EBA84 7D 89 03 A6 */ mtctr r12 -/* 801EBA88 4E 80 04 21 */ bctrl -lbl_801EBA8C: -/* 801EBA8C 3B BD 00 01 */ addi r29, r29, 1 -/* 801EBA90 2C 1D 00 03 */ cmpwi r29, 3 -/* 801EBA94 3B FF 00 04 */ addi r31, r31, 4 -/* 801EBA98 41 80 FF CC */ blt lbl_801EBA64 -/* 801EBA9C CB E1 00 18 */ lfd f31, 0x18(r1) -/* 801EBAA0 39 61 00 18 */ addi r11, r1, 0x18 -/* 801EBAA4 48 17 67 85 */ bl _restgpr_29 -/* 801EBAA8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801EBAAC 7C 08 03 A6 */ mtlr r0 -/* 801EBAB0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801EBAB4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_ring/setKanteraPos__12dMenu_Ring_cFff.s b/asm/d/menu/d_menu_ring/setKanteraPos__12dMenu_Ring_cFff.s deleted file mode 100644 index 20cc2853e98..00000000000 --- a/asm/d/menu/d_menu_ring/setKanteraPos__12dMenu_Ring_cFff.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_801EB080: -/* 801EB080 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801EB084 7C 08 02 A6 */ mflr r0 -/* 801EB088 90 01 00 14 */ stw r0, 0x14(r1) -/* 801EB08C 80 63 00 54 */ lwz r3, 0x54(r3) -/* 801EB090 4B FC 3B 11 */ bl setPos__15dKantera_icon_cFff -/* 801EB094 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801EB098 7C 08 03 A6 */ mtlr r0 -/* 801EB09C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801EB0A0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_ring/setSelectItemForce__12dMenu_Ring_cFi.s b/asm/d/menu/d_menu_ring/setSelectItemForce__12dMenu_Ring_cFi.s deleted file mode 100644 index 6a18a617868..00000000000 --- a/asm/d/menu/d_menu_ring/setSelectItemForce__12dMenu_Ring_cFi.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_801EDF2C: -/* 801EDF2C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801EDF30 7C 08 02 A6 */ mflr r0 -/* 801EDF34 90 01 00 24 */ stw r0, 0x24(r1) -/* 801EDF38 39 61 00 20 */ addi r11, r1, 0x20 -/* 801EDF3C 48 17 42 9D */ bl _savegpr_28 -/* 801EDF40 7C 7C 1B 78 */ mr r28, r3 -/* 801EDF44 2C 04 00 02 */ cmpwi r4, 2 -/* 801EDF48 40 82 00 34 */ bne lbl_801EDF7C -/* 801EDF4C 54 80 08 3C */ slwi r0, r4, 1 -/* 801EDF50 7F FC 02 14 */ add r31, r28, r0 -/* 801EDF54 A8 1F 06 74 */ lha r0, 0x674(r31) -/* 801EDF58 2C 00 00 00 */ cmpwi r0, 0 -/* 801EDF5C 41 82 00 68 */ beq lbl_801EDFC4 -/* 801EDF60 7C 83 23 78 */ mr r3, r4 -/* 801EDF64 7C 9C 22 14 */ add r4, r28, r4 -/* 801EDF68 88 84 06 B4 */ lbz r4, 0x6b4(r4) -/* 801EDF6C 4B E3 FD 59 */ bl dComIfGs_setSelectItemIndex__FiUc -/* 801EDF70 38 00 00 00 */ li r0, 0 -/* 801EDF74 B0 1F 06 74 */ sth r0, 0x674(r31) -/* 801EDF78 48 00 00 4C */ b lbl_801EDFC4 -lbl_801EDF7C: -/* 801EDF7C 54 80 08 3C */ slwi r0, r4, 1 -/* 801EDF80 7F DC 02 14 */ add r30, r28, r0 -/* 801EDF84 A8 1E 06 74 */ lha r0, 0x674(r30) -/* 801EDF88 2C 00 00 00 */ cmpwi r0, 0 -/* 801EDF8C 41 82 00 38 */ beq lbl_801EDFC4 -/* 801EDF90 3B A0 00 00 */ li r29, 0 -lbl_801EDF94: -/* 801EDF94 7F A3 EB 78 */ mr r3, r29 -/* 801EDF98 7F FC EA 14 */ add r31, r28, r29 -/* 801EDF9C 88 9F 06 B8 */ lbz r4, 0x6b8(r31) -/* 801EDFA0 4B E3 FD 69 */ bl dComIfGs_setMixItemIndex__FiUc -/* 801EDFA4 7F A3 EB 78 */ mr r3, r29 -/* 801EDFA8 88 9F 06 B4 */ lbz r4, 0x6b4(r31) -/* 801EDFAC 4B E3 FD 19 */ bl dComIfGs_setSelectItemIndex__FiUc -/* 801EDFB0 3B BD 00 01 */ addi r29, r29, 1 -/* 801EDFB4 2C 1D 00 02 */ cmpwi r29, 2 -/* 801EDFB8 41 80 FF DC */ blt lbl_801EDF94 -/* 801EDFBC 38 00 00 00 */ li r0, 0 -/* 801EDFC0 B0 1E 06 74 */ sth r0, 0x674(r30) -lbl_801EDFC4: -/* 801EDFC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801EDFC8 48 17 42 5D */ bl _restgpr_28 -/* 801EDFCC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801EDFD0 7C 08 03 A6 */ mtlr r0 -/* 801EDFD4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801EDFD8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_ring/stick_wait_init__12dMenu_Ring_cFv.s b/asm/d/menu/d_menu_ring/stick_wait_init__12dMenu_Ring_cFv.s deleted file mode 100644 index ab370f61426..00000000000 --- a/asm/d/menu/d_menu_ring/stick_wait_init__12dMenu_Ring_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_801ED2BC: -/* 801ED2BC 3C 80 80 3E */ lis r4, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 801ED2C0 38 84 D2 E8 */ addi r4, r4, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 801ED2C4 80 04 00 30 */ lwz r0, 0x30(r4) -/* 801ED2C8 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 801ED2CC 41 82 00 30 */ beq lbl_801ED2FC -/* 801ED2D0 88 03 06 CE */ lbz r0, 0x6ce(r3) -/* 801ED2D4 28 00 00 00 */ cmplwi r0, 0 -/* 801ED2D8 41 82 00 18 */ beq lbl_801ED2F0 -/* 801ED2DC 3C 80 80 43 */ lis r4, g_ringHIO@ha /* 0x8042FAFC@ha */ -/* 801ED2E0 38 84 FA FC */ addi r4, r4, g_ringHIO@l /* 0x8042FAFC@l */ -/* 801ED2E4 A8 04 01 4C */ lha r0, 0x14c(r4) -/* 801ED2E8 B0 03 06 72 */ sth r0, 0x672(r3) -/* 801ED2EC 48 00 00 20 */ b lbl_801ED30C -lbl_801ED2F0: -/* 801ED2F0 38 00 00 00 */ li r0, 0 -/* 801ED2F4 B0 03 06 72 */ sth r0, 0x672(r3) -/* 801ED2F8 48 00 00 14 */ b lbl_801ED30C -lbl_801ED2FC: -/* 801ED2FC 3C 80 80 43 */ lis r4, g_ringHIO@ha /* 0x8042FAFC@ha */ -/* 801ED300 38 84 FA FC */ addi r4, r4, g_ringHIO@l /* 0x8042FAFC@l */ -/* 801ED304 A8 04 01 4A */ lha r0, 0x14a(r4) -/* 801ED308 B0 03 06 72 */ sth r0, 0x672(r3) -lbl_801ED30C: -/* 801ED30C 38 00 00 00 */ li r0, 0 -/* 801ED310 B0 03 06 3A */ sth r0, 0x63a(r3) -/* 801ED314 98 03 06 CE */ stb r0, 0x6ce(r3) -/* 801ED318 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_ring/textCentering__12dMenu_Ring_cFv.s b/asm/d/menu/d_menu_ring/textCentering__12dMenu_Ring_cFv.s deleted file mode 100644 index 999ff997c3e..00000000000 --- a/asm/d/menu/d_menu_ring/textCentering__12dMenu_Ring_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_801EF11C: -/* 801EF11C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801EF120 7C 08 02 A6 */ mflr r0 -/* 801EF124 90 01 00 14 */ stw r0, 0x14(r1) -/* 801EF128 4B FF FD ED */ bl textScaleHIO__12dMenu_Ring_cFv -/* 801EF12C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801EF130 7C 08 03 A6 */ mtlr r0 -/* 801EF134 38 21 00 10 */ addi r1, r1, 0x10 -/* 801EF138 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_ring/textScaleHIO__12dMenu_Ring_cFv.s b/asm/d/menu/d_menu_ring/textScaleHIO__12dMenu_Ring_cFv.s deleted file mode 100644 index 92755542766..00000000000 --- a/asm/d/menu/d_menu_ring/textScaleHIO__12dMenu_Ring_cFv.s +++ /dev/null @@ -1,144 +0,0 @@ -lbl_801EEF14: -/* 801EEF14 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801EEF18 7C 08 02 A6 */ mflr r0 -/* 801EEF1C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801EEF20 39 61 00 20 */ addi r11, r1, 0x20 -/* 801EEF24 48 17 32 AD */ bl _savegpr_26 -/* 801EEF28 7C 7E 1B 78 */ mr r30, r3 -/* 801EEF2C 3B E0 00 00 */ li r31, 0 -/* 801EEF30 3B A0 00 00 */ li r29, 0 -/* 801EEF34 3C 60 80 43 */ lis r3, g_ringHIO@ha /* 0x8042FAFC@ha */ -/* 801EEF38 3B 83 FA FC */ addi r28, r3, g_ringHIO@l /* 0x8042FAFC@l */ -lbl_801EEF3C: -/* 801EEF3C 7F 7E EA 14 */ add r27, r30, r29 -/* 801EEF40 80 1B 00 24 */ lwz r0, 0x24(r27) -/* 801EEF44 28 00 00 00 */ cmplwi r0, 0 -/* 801EEF48 41 82 01 AC */ beq lbl_801EF0F4 -/* 801EEF4C 2C 1F 00 02 */ cmpwi r31, 2 -/* 801EEF50 41 82 01 A4 */ beq lbl_801EF0F4 -/* 801EEF54 C0 1B 05 98 */ lfs f0, 0x598(r27) -/* 801EEF58 3C 60 80 43 */ lis r3, g_ringHIO@ha /* 0x8042FAFC@ha */ -/* 801EEF5C 38 03 FA FC */ addi r0, r3, g_ringHIO@l /* 0x8042FAFC@l */ -/* 801EEF60 7F 40 EA 14 */ add r26, r0, r29 -/* 801EEF64 C0 5A 00 54 */ lfs f2, 0x54(r26) -/* 801EEF68 FC 00 10 00 */ fcmpu cr0, f0, f2 -/* 801EEF6C 40 82 00 14 */ bne lbl_801EEF80 -/* 801EEF70 C0 3B 05 C0 */ lfs f1, 0x5c0(r27) -/* 801EEF74 C0 1A 00 7C */ lfs f0, 0x7c(r26) -/* 801EEF78 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 801EEF7C 41 82 00 88 */ beq lbl_801EF004 -lbl_801EEF80: -/* 801EEF80 D0 5B 05 98 */ stfs f2, 0x598(r27) -/* 801EEF84 C0 1A 00 7C */ lfs f0, 0x7c(r26) -/* 801EEF88 D0 1B 05 C0 */ stfs f0, 0x5c0(r27) -/* 801EEF8C 2C 1F 00 08 */ cmpwi r31, 8 -/* 801EEF90 40 82 00 20 */ bne lbl_801EEFB0 -/* 801EEF94 80 7B 00 24 */ lwz r3, 0x24(r27) -/* 801EEF98 C0 3B 05 98 */ lfs f1, 0x598(r27) -/* 801EEF9C C0 1E 05 74 */ lfs f0, 0x574(r30) -/* 801EEFA0 EC 21 00 2A */ fadds f1, f1, f0 -/* 801EEFA4 C0 5B 05 C0 */ lfs f2, 0x5c0(r27) -/* 801EEFA8 48 06 56 09 */ bl paneTrans__8CPaneMgrFff -/* 801EEFAC 48 00 00 38 */ b lbl_801EEFE4 -lbl_801EEFB0: -/* 801EEFB0 2C 1F 00 09 */ cmpwi r31, 9 -/* 801EEFB4 40 82 00 20 */ bne lbl_801EEFD4 -/* 801EEFB8 80 7B 00 24 */ lwz r3, 0x24(r27) -/* 801EEFBC C0 3B 05 98 */ lfs f1, 0x598(r27) -/* 801EEFC0 C0 1E 05 78 */ lfs f0, 0x578(r30) -/* 801EEFC4 EC 21 00 2A */ fadds f1, f1, f0 -/* 801EEFC8 C0 5B 05 C0 */ lfs f2, 0x5c0(r27) -/* 801EEFCC 48 06 55 E5 */ bl paneTrans__8CPaneMgrFff -/* 801EEFD0 48 00 00 14 */ b lbl_801EEFE4 -lbl_801EEFD4: -/* 801EEFD4 80 7B 00 24 */ lwz r3, 0x24(r27) -/* 801EEFD8 C0 3B 05 98 */ lfs f1, 0x598(r27) -/* 801EEFDC C0 5B 05 C0 */ lfs f2, 0x5c0(r27) -/* 801EEFE0 48 06 55 D1 */ bl paneTrans__8CPaneMgrFff -lbl_801EEFE4: -/* 801EEFE4 80 7E 00 2C */ lwz r3, 0x2c(r30) -/* 801EEFE8 28 03 00 00 */ cmplwi r3, 0 -/* 801EEFEC 41 82 00 18 */ beq lbl_801EF004 -/* 801EEFF0 2C 1F 00 01 */ cmpwi r31, 1 -/* 801EEFF4 40 82 00 10 */ bne lbl_801EF004 -/* 801EEFF8 C0 3B 05 98 */ lfs f1, 0x598(r27) -/* 801EEFFC C0 5B 05 C0 */ lfs f2, 0x5c0(r27) -/* 801EF000 48 06 55 B1 */ bl paneTrans__8CPaneMgrFff -lbl_801EF004: -/* 801EF004 C0 1B 05 E8 */ lfs f0, 0x5e8(r27) -/* 801EF008 C0 3A 00 A4 */ lfs f1, 0xa4(r26) -/* 801EF00C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 801EF010 41 82 00 E4 */ beq lbl_801EF0F4 -/* 801EF014 D0 3B 05 E8 */ stfs f1, 0x5e8(r27) -/* 801EF018 2C 1F 00 08 */ cmpwi r31, 8 -/* 801EF01C 41 82 00 0C */ beq lbl_801EF028 -/* 801EF020 2C 1F 00 09 */ cmpwi r31, 9 -/* 801EF024 40 82 00 34 */ bne lbl_801EF058 -lbl_801EF028: -/* 801EF028 88 1E 06 CF */ lbz r0, 0x6cf(r30) -/* 801EF02C 38 9F FF F8 */ addi r4, r31, -8 -/* 801EF030 7C 00 20 00 */ cmpw r0, r4 -/* 801EF034 40 82 00 14 */ bne lbl_801EF048 -/* 801EF038 7F C3 F3 78 */ mr r3, r30 -/* 801EF03C C0 3C 00 18 */ lfs f1, 0x18(r28) -/* 801EF040 4B FF CA 79 */ bl setButtonScale__12dMenu_Ring_cFif -/* 801EF044 48 00 00 48 */ b lbl_801EF08C -lbl_801EF048: -/* 801EF048 7F C3 F3 78 */ mr r3, r30 -/* 801EF04C C0 3C 00 20 */ lfs f1, 0x20(r28) -/* 801EF050 4B FF CA 69 */ bl setButtonScale__12dMenu_Ring_cFif -/* 801EF054 48 00 00 38 */ b lbl_801EF08C -lbl_801EF058: -/* 801EF058 2C 1F 00 05 */ cmpwi r31, 5 -/* 801EF05C 41 82 00 0C */ beq lbl_801EF068 -/* 801EF060 2C 1F 00 07 */ cmpwi r31, 7 -/* 801EF064 40 82 00 28 */ bne lbl_801EF08C -lbl_801EF068: -/* 801EF068 C0 1B 05 E8 */ lfs f0, 0x5e8(r27) -/* 801EF06C 80 7B 00 24 */ lwz r3, 0x24(r27) -/* 801EF070 80 63 00 04 */ lwz r3, 4(r3) -/* 801EF074 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801EF078 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801EF07C 81 83 00 00 */ lwz r12, 0(r3) -/* 801EF080 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801EF084 7D 89 03 A6 */ mtctr r12 -/* 801EF088 4E 80 04 21 */ bctrl -lbl_801EF08C: -/* 801EF08C 80 7E 00 2C */ lwz r3, 0x2c(r30) -/* 801EF090 28 03 00 00 */ cmplwi r3, 0 -/* 801EF094 41 82 00 2C */ beq lbl_801EF0C0 -/* 801EF098 2C 1F 00 01 */ cmpwi r31, 1 -/* 801EF09C 40 82 00 24 */ bne lbl_801EF0C0 -/* 801EF0A0 C0 1B 05 E8 */ lfs f0, 0x5e8(r27) -/* 801EF0A4 80 63 00 04 */ lwz r3, 4(r3) -/* 801EF0A8 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801EF0AC D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801EF0B0 81 83 00 00 */ lwz r12, 0(r3) -/* 801EF0B4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801EF0B8 7D 89 03 A6 */ mtctr r12 -/* 801EF0BC 4E 80 04 21 */ bctrl -lbl_801EF0C0: -/* 801EF0C0 2C 1F 00 05 */ cmpwi r31, 5 -/* 801EF0C4 40 80 00 30 */ bge lbl_801EF0F4 -/* 801EF0C8 80 7B 00 24 */ lwz r3, 0x24(r27) -/* 801EF0CC 28 03 00 00 */ cmplwi r3, 0 -/* 801EF0D0 41 82 00 24 */ beq lbl_801EF0F4 -/* 801EF0D4 C0 1B 05 E8 */ lfs f0, 0x5e8(r27) -/* 801EF0D8 80 63 00 04 */ lwz r3, 4(r3) -/* 801EF0DC D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801EF0E0 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 801EF0E4 81 83 00 00 */ lwz r12, 0(r3) -/* 801EF0E8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801EF0EC 7D 89 03 A6 */ mtctr r12 -/* 801EF0F0 4E 80 04 21 */ bctrl -lbl_801EF0F4: -/* 801EF0F4 3B FF 00 01 */ addi r31, r31, 1 -/* 801EF0F8 2C 1F 00 0A */ cmpwi r31, 0xa -/* 801EF0FC 3B BD 00 04 */ addi r29, r29, 4 -/* 801EF100 41 80 FE 3C */ blt lbl_801EEF3C -/* 801EF104 39 61 00 20 */ addi r11, r1, 0x20 -/* 801EF108 48 17 31 15 */ bl _restgpr_26 -/* 801EF10C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801EF110 7C 08 03 A6 */ mtlr r0 -/* 801EF114 38 21 00 20 */ addi r1, r1, 0x20 -/* 801EF118 4E 80 00 20 */ blr diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 4b0ca4b2e98..348717fc17f 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -415,9 +415,12 @@ public: JKRArchive* getCollectResArchive() { return mCollectResArchive; } JKRArchive* getItemIconArchive() { return mItemIconArchive; } JKRArchive* getNameResArchive() { return mNameResArchive; } + JKRArchive* getDemoMsgArchive() { return mDemoMsgArchive; } JKRArchive* getFmapResArchive() { return mFmapResArchive; } + JKRArchive* getDmapResArchive() { return mDmapResArchive; } JKRAramArchive* getFieldMapArchive2() { return (JKRAramArchive*)mFieldMapArchive2; } JKRArchive* getOptionResArchive() { return mOptionResArchive; } + JKRArchive* getRingResArchive() { return mRingResArchive; } void setFieldMapArchive2(JKRArchive* arc) { mFieldMapArchive2 = arc; } void setAnmArchive(JKRArchive* arc) { mAnmArchive = arc; } @@ -902,12 +905,14 @@ u8 dComIfGs_getBottleMax(); u8 dComIfGs_checkGetItem(u8 i_itemNo); void dComIfGs_setSelectEquipClothes(u8 i_itemNo); void dComIfGs_setKeyNum(int i_stageNo, u8 i_keyNum); +s32 dComIfGs_isDungeonItemWarp(int i_stageNo); void dComIfGs_BossLife_public_Set(s8); s8 dComIfGs_sense_type_change_Get(); cXyz& dComIfGs_getWarpPlayerPos(); const char* dComIfGs_getWarpStageName(); s16 dComIfGs_getWarpPlayerAngleY(); s8 dComIfGs_getWarpRoomNo(); +bool dComIfGs_getWarpMarkFlag(); BOOL dComIfGs_isOneZoneSwitch(int i_swBit, int i_roomNo); BOOL dComIfGs_isOneZoneItem(int i_swBit, int i_roomNo); BOOL dComIfGs_isZoneSwitch(int, int); @@ -1126,6 +1131,10 @@ inline u8 dComIfGs_getItem(int i_slotNo, bool i_checkCombo) { return g_dComIfG_gameInfo.info.getPlayer().getItem().getItem(i_slotNo, i_checkCombo); } +inline u8 dComIfGs_getLineUpItem(int i_slotNo) { + return g_dComIfG_gameInfo.info.getPlayer().getItem().getLineUpItem(i_slotNo); +} + inline BOOL dComIfGs_isCollectSword(u8 i_swordNo) { return g_dComIfG_gameInfo.info.getPlayer().getCollect().isCollect(COLLECT_SWORD, i_swordNo); } @@ -1195,7 +1204,7 @@ inline u8 dComIfGs_getLastWarpMarkRoomNo() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().getRoomNo(); } -inline char dComIfGs_getLastWarpAcceptStage() { +inline s8 dComIfGs_getLastWarpAcceptStage() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().getWarpAcceptStage(); } @@ -1899,6 +1908,10 @@ inline JKRArchive* dComIfGp_getNameResArchive() { return g_dComIfG_gameInfo.play.getNameResArchive(); } +inline JKRArchive* dComIfGp_getDemoMsgArchive() { + return g_dComIfG_gameInfo.play.getDemoMsgArchive(); +} + inline JKRArchive* dComIfGp_getMsgDtArchive(int idx) { return g_dComIfG_gameInfo.play.getMsgDtArchive(idx); } @@ -2774,6 +2787,10 @@ inline JKRArchive* dComIfGp_getOptionResArchive() { return g_dComIfG_gameInfo.play.getOptionResArchive(); } +inline JKRArchive* dComIfGp_getRingResArchive() { + return g_dComIfG_gameInfo.play.getRingResArchive(); +} + inline void dComIfGp_onPauseFlag() { g_dComIfG_gameInfo.play.onPauseFlag(); } @@ -2792,6 +2809,10 @@ inline JKRArchive* dComIfGp_getFmapResArchive() { return g_dComIfG_gameInfo.play.getFmapResArchive(); } +inline JKRArchive* dComIfGp_getDmapResArchive() { + return g_dComIfG_gameInfo.play.getDmapResArchive(); +} + inline u8 dComIfGp_getMesgStatus() { return g_dComIfG_gameInfo.play.getMesgStatus(); } diff --git a/include/d/d_item_data.h b/include/d/d_item_data.h index 8e33cd72876..d8cd66b4349 100644 --- a/include/d/d_item_data.h +++ b/include/d/d_item_data.h @@ -56,6 +56,8 @@ struct dItem_data { static s16 getTexture(u8 index) { return item_resource[index].mTexture; } + static u8 getTexScale (u8 index) { return item_resource[index].mTexScale; } + static const char* getFieldArc(u8 index) { return field_item_res[index].mFieldArc; } static s16 getItemBmdName(u8 index) { return field_item_res[index].mItemBmdName; } diff --git a/include/d/menu/d_menu_item_explain.h b/include/d/menu/d_menu_item_explain.h index d51f6f8b7ec..b03a0ce7494 100644 --- a/include/d/menu/d_menu_item_explain.h +++ b/include/d/menu/d_menu_item_explain.h @@ -1,6 +1,103 @@ #ifndef D_MENU_D_MENU_ITEM_EXPLAIN_H #define D_MENU_D_MENU_ITEM_EXPLAIN_H -#include "dolphin/types.h" +#include "d/d_drawlist.h" + +class CPaneMgr; +class J2DTextBox; +class STControl; +class dKantera_icon_c; +class dMsgString_c; +class dMenu_ItemExplain_c; +class dSelect_cursor_c; +class dMsgScrnArrow_c; +class dMsgScrn3Select_c; +class J2DOrthoGraph; + +class dMenu_ItemExplain_c { +public: + /* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool); + /* 801DAFF0 */ virtual ~dMenu_ItemExplain_c(); + /* 801DB470 */ void move(); + /* 801DB514 */ void draw(J2DOrthoGraph*); + /* 801DB744 */ void drawKantera(); + /* 801DB818 */ void wait_init(); + /* 801DB81C */ void wait_proc(); + /* 801DB820 */ void open_init(); + /* 801DBAB4 */ void open_proc(); + /* 801DBB50 */ void move_init(); + /* 801DBB7C */ void move_proc(); + /* 801DBCB4 */ void move_select_init(); + /* 801DBF44 */ void move_select_proc(); + /* 801DC1E0 */ void move_next_init(); + /* 801DC214 */ void move_next_proc(); + /* 801DC2E4 */ void close_init(); + /* 801DC2F0 */ void close_proc(); + /* 801DC340 */ u8 openExplain(u8, u8, u8, bool); + /* 801DC3C8 */ u8 openExplainDmap(u8, u8, u8, bool, u8); + /* 801DC738 */ u8 openExplainTx(u32, u32); + /* 801DC7AC */ f32 getAlphaRatio(); + /* 801DC7FC */ void setNumber(); + /* 801DCB54 */ bool getWarpMarkFlag(); + /* 801DCBBC */ void setScale(); + + u8 getStatus() { return mStatus; } + void offForceButton() { mForceButton = 0; } + u8 getForceButton() { return mForceButton; } + u8 checkEndButton() { return mEndButton; } + + void trans(f32 x, f32 y) { + field_0xd4 = x; + field_0xd8 = y; + } + +private: + /* 0x04 */ JKRExpHeap* mpHeap; + /* 0x08 */ JKRArchive* mpArchive; + /* 0x0C */ dMsgString_c* mpInfoString; + /* 0x10 */ CPaneMgr* mpInfoText; + /* 0x14 */ J2DPane* field_0x14; // actual data type not known + /* 0x18 */ CPaneMgr* mpNameText[4]; + /* 0x28 */ J2DPane* field_0x28[4]; // actual data type not known + /* 0x38 */ CPaneMgr* mpInfoIcon; + /* 0x3C */ CPaneMgr* mpParent[2]; + /* 0x44 */ J2DPane* field_0x44[2]; // actual data type not known + /* 0x4C */ CPaneMgr* mpLabel; + /* 0x50 */ J2DPane* field_0x50; // actual data type not known + /* 0x54 */ u8 field_0x54[0x5C - 0x54]; + /* 0x5C */ J2DPane* field_0x5c; // actual data type not known + /* 0x60 */ J2DPane* field_0x60[3]; // actual data type not known + /* 0x6C */ dKantera_icon_c* mpKanteraMeter; + /* 0x70 */ J2DScreen* mpInfoScreen; + /* 0x74 */ J2DPane* field_0x74; // actual data type not known + /* 0x78 */ int field_0x78; + /* 0x7C */ J2DPicture* mpExpItemPane[3]; + /* 0x88 */ ResTIMG* mpExpItemTex[4]; + /* 0x98 */ dMsgScrnArrow_c* mpArrow; + /* 0x9C */ dMsgScrn3Select_c* mpSelect_c; + /* 0xA0 */ int field_0xa0[2]; + /* 0xA8 */ J2DPicture* mpItemNumTex[3]; + /* 0xB4 */ J2DPicture* mpBackTex; + /* 0xB8 */ STControl* mpStick; + /* 0xBC */ f32 mAlphaRatio; + /* 0xC0 */ f32 mDescAlpha; + /* 0xC4 */ u32 field_0xc4; + /* 0xC8 */ u32 field_0xc8; + /* 0xCC */ u32 field_0xcc; + /* 0xD0 */ u32 field_0xd0; + /* 0xD4 */ f32 field_0xd4; + /* 0xD8 */ f32 field_0xd8; + /* 0xDC */ u16 field_0xdc; + /* 0xDE */ u8 field_0xde; + /* 0xDF */ u8 field_0xdf; + /* 0xE0 */ u8 mStatus; + /* 0xE1 */ u8 field_0xe1; + /* 0xE2 */ u8 field_0xe2; + /* 0xE3 */ u8 mEndButton; + /* 0xE4 */ u8 mForceButton; + /* 0xE5 */ u8 field_0xe5; + /* 0xE6 */ u8 field_0xe6; + /* 0xE7 */ u8 field_0xe7; +}; #endif /* D_MENU_D_MENU_ITEM_EXPLAIN_H */ diff --git a/include/d/menu/d_menu_ring.h b/include/d/menu/d_menu_ring.h index 1aee04f30e5..1cd9cad5fad 100644 --- a/include/d/menu/d_menu_ring.h +++ b/include/d/menu/d_menu_ring.h @@ -1,9 +1,11 @@ #ifndef D_MENU_D_MENU_RING_H #define D_MENU_D_MENU_RING_H +#include "d/com/d_com_inf_game.h" #include "d/d_drawlist.h" class CPaneMgr; +class CPaneMgrAlpha; struct CSTControl; class J2DTextBox; class STControl; @@ -23,8 +25,8 @@ public: /* 801EB0A4 */ bool isOpen(); /* 801EB2B4 */ bool isMoveEnd(); /* 801EB3CC */ bool isClose(); - /* 801EB624 */ void getStickInfo(STControl*); - /* 801EB8C0 */ void calcStickAngle(STControl*, u8); + /* 801EB624 */ u8 getStickInfo(STControl*); + /* 801EB8C0 */ s16 calcStickAngle(STControl*, u8); /* 801EB960 */ void setRotate(); /* 801EBA38 */ void setItemScale(int, f32); /* 801EBAB8 */ void setButtonScale(int, f32); @@ -47,30 +49,31 @@ public: /* 801EDB14 */ void setSelectItem(int, u8); /* 801EDC98 */ void drawSelectItem(); /* 801EDF2C */ void setSelectItemForce(int); - /* 801EDFDC */ void getCursorPos(u8); - /* 801EE058 */ void getItemNum(u8); - /* 801EE15C */ void getItemMaxNum(u8); + /* 801EDFDC */ s32 getCursorPos(u8); + /* 801EE058 */ u8 getItemNum(u8); + /* 801EE15C */ u8 getItemMaxNum(u8); /* 801EE228 */ void checkExplainForce(); /* 801EE63C */ bool checkCombineBomb(int); /* 801EE644 */ void setCombineBomb(int); /* 801EE648 */ void drawNumber(int, int, f32, f32); - /* 801EEA84 */ void getItem(int, u8); + /* 801EEA84 */ u8 getItem(int, u8); /* 801EEAE4 */ void setDoStatus(u8); - /* 801EEB58 */ void isMixItemOn(); - /* 801EEC98 */ void isMixItemOff(); + /* 801EEB58 */ bool isMixItemOn(); + /* 801EEC98 */ bool isMixItemOff(); /* 801EED84 */ void setMixMessage(); /* 801EEF14 */ void textScaleHIO(); /* 801EF11C */ void textCentering(); - /* 801EF13C */ void clacEllipseFunction(f32, f32, f32); - /* 801EF174 */ void calcDistance(f32, f32, f32, f32); + /* 801EF13C */ f32 clacEllipseFunction(f32, f32, f32); + /* 801EF174 */ f32 calcDistance(f32, f32, f32, f32); /* 801EF1A0 */ void clacEllipsePlotAverage(int, f32, f32); /* 801EF484 */ bool dpdMove(); - /* 801EF48C */ void openExplain(u8); + /* 801EF48C */ u8 openExplain(u8); /* 801EF560 */ virtual void draw(); /* 801EA708 */ virtual ~dMenu_Ring_c(); void drawFlag0() { mDrawFlag = 0; } + void setStatus(u8 i_status) { mStatus = i_status; } private: /* 0x004 */ JKRExpHeap* mpHeap; @@ -78,34 +81,32 @@ private: /* 0x00C */ CSTControl* mpCStick; /* 0x010 */ dSelect_cursor_c* mpDrawCursor; /* 0x014 */ dMsgString_c* mpString; - /* 0x018 */ CPaneMgr* mpMessageParent; - /* 0x01C */ CPaneMgr* mpCenterParent; - /* 0x020 */ CPaneMgr* mpSpotParent; + /* 0x018 */ CPaneMgrAlpha* mpMessageParent; + /* 0x01C */ CPaneMgrAlpha* mpCenterParent; + /* 0x020 */ CPaneMgrAlpha* mpSpotParent; /* 0x024 */ CPaneMgr* mpTextParent[10]; /* 0x04C */ CPaneMgr* mpNameParent; /* 0x050 */ CPaneMgr* mpCircle; /* 0x054 */ dKantera_icon_c* mpKanteraMeter; /* 0x058 */ J2DScreen* mpScreen; /* 0x05C */ J2DScreen* mpSpotScreen; - /* 0x060 */ u8 field_0x60[4]; + /* 0x060 */ u8 field_0x060[0x064 - 0x060]; /* 0x064 */ J2DScreen* mpCenterScreen; /* 0x068 */ J2DPicture* mpSelectItemTex[4][3]; - /* 0x098 */ J2DPicture* mpItemTex[4][3]; - /* 0x0C8 */ u8 field_0xc8[0xF0]; + /* 0x098 */ J2DPicture* mpItemTex[MAX_ITEM_SLOTS][3]; /* 0x1B8 */ J2DPicture* mpBlackTex; /* 0x1BC */ J2DPicture* mpItemNumTex[3]; /* 0x1C8 */ J2DTextBox* field_0x1c8[5]; /* 0x1DC */ J2DTextBox* field_0x1dc[5]; /* 0x1F0 */ ResTIMG* mpSelectItemTexBuf[4][3][2]; - /* 0x250 */ ResTIMG* mpItemBuf[4][3]; - /* 0x280 */ u8 field_0x280[0xF0]; + /* 0x250 */ ResTIMG* mpItemBuf[MAX_ITEM_SLOTS][3]; /* 0x370 */ dMenu_ItemExplain_c* mpItemExplain; /* 0x374 */ void* field_0x374[3]; /* 0x380 */ cXyz field_0x380; - /* 0x38C */ f32 field_0x38c[24]; - /* 0x3EC */ f32 field_0x3ec[24]; - /* 0x44C */ f32 field_0x44c[24]; - /* 0x4AC */ f32 field_0x4ac[24]; + /* 0x38C */ f32 field_0x38c[MAX_ITEM_SLOTS]; + /* 0x3EC */ f32 field_0x3ec[MAX_ITEM_SLOTS]; + /* 0x44C */ f32 field_0x44c[MAX_ITEM_SLOTS]; + /* 0x4AC */ f32 field_0x4ac[MAX_ITEM_SLOTS]; /* 0x50C */ f32 field_0x50c; /* 0x510 */ f32 field_0x510; /* 0x514 */ f32 field_0x514; @@ -117,71 +118,63 @@ private: /* 0x568 */ f32 field_0x568; /* 0x56C */ f32 field_0x56c; /* 0x570 */ f32 field_0x570; - /* 0x574 */ f32 field_0x574[2]; - /* 0x57C */ f32 field_0x57c[2]; - /* 0x584 */ f32 field_0x584; - /* 0x588 */ f32 field_0x588; + /* 0x574 */ f32 field_0x574[3]; + /* 0x580 */ f32 field_0x580[3]; /* 0x58C */ f32 field_0x58c; - /* 0x590 */ f32 field_0x590[10]; - /* 0x5B8 */ f32 field_0x5b8[10]; - /* 0x5E0 */ f32 field_0x5e0[10]; - /* 0x608 */ f32 field_0x608; - /* 0x60C */ f32 field_0x60c; + /* 0x590 */ f32 field_0x590; + /* 0x594 */ f32 field_0x594; + /* 0x598 */ f32 field_0x598[10]; + /* 0x5C0 */ f32 field_0x5c0[10]; + /* 0x5E8 */ f32 field_0x5e8[10]; /* 0x610 */ f32 field_0x610; /* 0x614 */ f32 field_0x614; /* 0x618 */ f32 field_0x618; /* 0x61C */ f32 field_0x61c; - /* 0x620 */ u8 field_0x620[4]; - /* 0x624 */ int field_0x624; + /* 0x620 */ f32 field_0x620; + /* 0x624 */ f32 field_0x624; /* 0x628 */ u32 field_0x628; - /* 0x62C */ int field_0x62c; - /* 0x630 */ u16 field_0x630; - /* 0x632 */ u16 field_0x632; - /* 0x634 */ u16 field_0x634; - /* 0x636 */ u16 field_0x636[24]; - /* 0x666 */ u16 field_0x666; - /* 0x668 */ u16 field_0x668; - /* 0x66A */ u16 field_0x66a; - /* 0x66C */ u16 field_0x66c[4]; - /* 0x674 */ u16 field_0x674; - /* 0x676 */ u16 field_0x676; - /* 0x678 */ u16 field_0x678; - /* 0x67A */ u16 field_0x67a; + /* 0x62C */ u32 field_0x62c; + /* 0x630 */ u32 field_0x630; + /* 0x634 */ u32 field_0x634; + /* 0x638 */ s16 field_0x638; + /* 0x63A */ s16 field_0x63a; + /* 0x63C */ s16 field_0x63c; + /* 0x63E */ s16 field_0x63e[MAX_ITEM_SLOTS]; + /* 0x66E */ s16 field_0x66e; + /* 0x670 */ s16 field_0x670; + /* 0x672 */ s16 field_0x672; + /* 0x674 */ s16 field_0x674[4]; /* 0x67C */ u16 field_0x67c; - /* 0x67E */ u16 field_0x67e[4]; - /* 0x686 */ u16 field_0x686; - /* 0x688 */ u8 field_0x688[24]; - /* 0x6A0 */ u8 field_0x6a0; - /* 0x6A1 */ u8 field_0x6a1; - /* 0x6A2 */ u8 field_0x6a2; - /* 0x6A3 */ u8 field_0x6a3; - /* 0x6A4 */ u8 field_0x6a4; - /* 0x6A5 */ u8 field_0x6a5; - /* 0x6A6 */ u8 field_0x6a6; - /* 0x6A7 */ u8 field_0x6a7; + /* 0x67E */ s16 field_0x67e; + /* 0x680 */ s16 field_0x680; + /* 0x682 */ s16 field_0x682; + /* 0x684 */ s16 field_0x684; + /* 0x686 */ s16 field_0x686[4]; + /* 0x68E */ s16 field_0x68e; + /* 0x690 */ u8 field_0x690[MAX_ITEM_SLOTS]; /* 0x6A8 */ u8 mStatus; /* 0x6A9 */ u8 field_0x6a9; /* 0x6AA */ u8 field_0x6aa; /* 0x6AB */ u8 field_0x6ab; - /* 0x6AC */ u8 field_0x6ac[4]; - /* 0x6B0 */ u8 field_0x6b0[4]; - /* 0x6B4 */ u8 field_0x6b4; - /* 0x6B5 */ u8 field_0x6b5; - /* 0x6B6 */ u8 field_0x6b6[4]; - /* 0x6BA */ u8 field_0x6ba; - /* 0x6BB */ u8 field_0x6bb; + /* 0x6AC */ u8 field_0x6ac; + /* 0x6AD */ u8 field_0x6ad; + /* 0x6AE */ u8 field_0x6ae; + /* 0x6AF */ u8 field_0x6af; + /* 0x6B0 */ u8 field_0x6b0; + /* 0x6B1 */ u8 field_0x6b1; + /* 0x6B2 */ u8 field_0x6b2; + /* 0x6B3 */ u8 field_0x6b3; + /* 0x6B4 */ u8 field_0x6b4[4]; + /* 0x6B8 */ u8 field_0x6b8[4]; /* 0x6BC */ u8 field_0x6bc; /* 0x6BD */ u8 mDrawFlag; - /* 0x6BE */ u8 field_0x6be; - /* 0x6BF */ u8 field_0x6bf[4]; + /* 0x6BE */ u8 field_0x6be[4]; + /* 0x6C2 */ u8 field_0x6c2; /* 0x6C3 */ u8 field_0x6c3; /* 0x6C4 */ u8 field_0x6c4; /* 0x6C5 */ u8 field_0x6c5; /* 0x6C6 */ u8 field_0x6c6; - /* 0x6C7 */ u8 field_0x6c7; - /* 0x6C8 */ u8 field_0x6c8; - /* 0x6C9 */ u8 field_0x6c9; - /* 0x6CA */ u8 field_0x6ca; + /* 0x6C7 */ u8 field_0x6c7[4]; /* 0x6CB */ u8 field_0x6cb; /* 0x6CC */ u8 field_0x6cc; /* 0x6CD */ u8 field_0x6cd; diff --git a/include/d/menu/d_menu_window.h b/include/d/menu/d_menu_window.h index 2cccc6d8681..394d3ddee85 100644 --- a/include/d/menu/d_menu_window.h +++ b/include/d/menu/d_menu_window.h @@ -18,6 +18,15 @@ class dMenu_Ring_c; class dMenu_Skill_c; class dMenu_save_c; +BOOL dMw_UP_TRIGGER(); +BOOL dMw_DOWN_TRIGGER(); +BOOL dMw_LEFT_TRIGGER(); +BOOL dMw_RIGHT_TRIGGER(); +BOOL dMw_A_TRIGGER(); +BOOL dMw_B_TRIGGER(); +BOOL dMw_Z_TRIGGER(); +BOOL dMw_START_TRIGGER(); + class dDlst_MENU_CAPTURE_c : public dDlst_base_c { public: /* 801FDFCC */ virtual void draw();/* { diff --git a/include/d/meter/d_meter2.h b/include/d/meter/d_meter2.h index 6db2fb01e83..4c9049784bb 100644 --- a/include/d/meter/d_meter2.h +++ b/include/d/meter/d_meter2.h @@ -243,6 +243,7 @@ public: void onRupeeSoundBit(int bit) { mRupeeSound |= (1 << bit); } void offRupeeSoundBit(int bit) { mRupeeSound &= ~(1 << bit); } bool isRupeeSoundBit(int bit) { return mRupeeSound & (1 << bit); } + dMeter2Draw_c* getMeterDrawPtr() { return mpMeterDraw; } s16 getNowLifeGauge() { return mNowLifeGauge; } u8 getSubContents() { return mSubContentType; } u16 getSubContentsStringType() { return mSubContentsStringType; } diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index 57803288f4f..50689ce936d 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -94,6 +94,7 @@ public: dMeterMap_c* getMeterMapClass() { return mMeterMap; } void setMenuWindowClass(dMw_c* p_menu) { mMenuWindowClass = p_menu; } dMw_c* getMenuWindowClass() { return mMenuWindowClass; } + CPaneMgr* getMeterItemPanePtr(s32 i_idx) { return mMeterItemPanePtr[i_idx]; } void offUseButton(int pButton) { mUseButton &= ~(u16)pButton; } u16 getOilGaugeBackUp() { return mOilGaugeBackUp; } u8 getInsectSelectType() { return mInsectSelectType; } @@ -116,6 +117,7 @@ public: void resetPauseStatus() { mPauseStatus = 0; } u8 getPauseStatus() { return mPauseStatus; } bool isGameStatus(int status) { return mGameStatus & status; } + bool isTouchKeyCheck(int i_status) { return mTouchKeyCheck & i_status; } void setMapKeyDirection(u16 direction) { mMapKeyDirection = direction; } bool isSub2DStatus(int flag) { return mSub2DStatus & (1 << flag); } void offMenuInForce(int flag) { unk152 &= ~(1 << flag); } @@ -152,6 +154,7 @@ public: u8 getNowCount() { return mNowCount; } void setScopeZoomPointer(u8 param_0) { mScopeZoomPointer = param_0; } u8 getItemExplainWindowStatus() { return mItemExplainWindowStatus; } + void setItemExplainWindowStatus(u8 i_value) { mItemExplainWindowStatus = i_value; } void resetDirectUseItem() { mDirectUseItem = 0; } u16 getFloatingFlowID() { return mFloatingFlowID; } void setCollectCursorPosXY(u8 x, u8 y) { @@ -269,6 +272,10 @@ inline void dMeter2Info_setWindowStatus(u8 status) { g_meter2_info.setWindowStatus(status); } +inline CPaneMgr* dMeter2Info_getMeterItemPanePtr(s32 i_idx) { + return g_meter2_info.getMeterItemPanePtr(i_idx); +} + inline void dMeter2Info_getString(u32 param_0, char* param_1, JMSMesgEntry_c* param_2) { g_meter2_info.getString(param_0, param_1, param_2); } @@ -317,6 +324,11 @@ inline int dMeter2Info_readItemTexture(u8 i_itemNo, void* param_1, J2DPicture* p param_6, param_7, param_8, param_9); } +inline void dMeter2Info_setItemColor(u8 param_0, J2DPicture* param_1, J2DPicture* param_2, + J2DPicture* param_3, J2DPicture* param_4) { + g_meter2_info.setItemColor(param_0, param_1, param_2, param_3, param_4); +} + inline u8 dMeter2Info_getWarpRoomNo() { return g_meter2_info.getWarpRoomNo(); } @@ -393,6 +405,10 @@ inline bool dMeter2Info_isGameStatus(int status) { return g_meter2_info.isGameStatus(status); } +inline bool dMeter2Info_isTouchKeyCheck(int i_status) { + return g_meter2_info.isTouchKeyCheck(i_status); +} + inline void dMeter2Info_setMapKeyDirection(u16 direction) { g_meter2_info.setMapKeyDirection(direction); } @@ -569,7 +585,6 @@ inline void dMeter2Info_decMsgKeyWaitTimer() { g_meter2_info.decMsgKeyWaitTimer(); } -const char* dMeter2Info_getNumberTextureName(int pIndex); inline bool dMeter2Info_isFloatingMessageVisible() { return g_meter2_info.isFloatingMessageVisible(); } @@ -578,6 +593,10 @@ inline u8 dMeter2Info_getItemExplainWindowStatus() { return g_meter2_info.getItemExplainWindowStatus(); } +inline void dMeter2Info_setItemExplainWindowStatus(u8 i_value) { + g_meter2_info.setItemExplainWindowStatus(i_value); +} + inline void dMeter2Info_resetDirectUseItem() { g_meter2_info.resetDirectUseItem(); } diff --git a/include/d/msg/d_msg_string.h b/include/d/msg/d_msg_string.h index 708d25cc956..ce9504ca690 100644 --- a/include/d/msg/d_msg_string.h +++ b/include/d/msg/d_msg_string.h @@ -12,7 +12,7 @@ public: /* 80249CA0 */ dMsgString_c(u8); /* 80249D28 */ ~dMsgString_c(); - /* 80191B6C */ virtual void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); + /* 80191B6C */ virtual f32 getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); /* 801E1D10 */ virtual void getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); /* 80249DB4 */ virtual void resetStringLocal(J2DTextBox*); diff --git a/include/d/msg/d_msg_string_base.h b/include/d/msg/d_msg_string_base.h index 838a7dbe668..1a6c2ad9a2c 100644 --- a/include/d/msg/d_msg_string_base.h +++ b/include/d/msg/d_msg_string_base.h @@ -22,7 +22,7 @@ public: /* 80249A48 */ void getPageMax(int); /* 80249A70 */ void getMessageLocal(u32, char*); - /* 80249BB0 */ virtual void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); + /* 80249BB0 */ virtual f32 getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); /* 80249BD0 */ virtual void getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); /* 80249BF8 */ virtual void getMessage(u32, char*); diff --git a/include/d/pane/d_pane_class.h b/include/d/pane/d_pane_class.h index 7fa26c77df1..922e4de555e 100644 --- a/include/d/pane/d_pane_class.h +++ b/include/d/pane/d_pane_class.h @@ -4,8 +4,11 @@ #include "JSystem/JUtility/TColor.h" #include "d/pane/d_pane_class_alpha.h" +class JKRHeap; + void dPaneClass_showNullPane(J2DScreen*); void dPaneClass_showNullPane(J2DPane*); +bool dPaneClass_setPriority(void**, JKRHeap*, J2DScreen*, char const*, u32, JKRArchive*); class CPaneMgr : public CPaneMgrAlpha { public: @@ -54,18 +57,21 @@ public: f32 getInitCenterPosY() { return mInitPos.y + mInitSize.y * 0.5f; } - f32 getInitSizeX() { return mInitSize.x; } - f32 getInitSizeY() { return mInitSize.y; } - f32 getInitPosX() { return mInitPos.x; } f32 getInitPosY() { return mInitPos.y; } - JUtility::TColor getInitBlack() { return mInitBlack; } - JUtility::TColor getInitWhite() { return mInitWhite; } - f32 getInitGlobalPosX() { return mGlobalPos.x; } f32 getInitGlobalPosY() { return mGlobalPos.y; } + f32 getInitSizeX() { return mInitSize.x; } + f32 getInitSizeY() { return mInitSize.y; } + + f32 getInitScaleX() { return mInitScale.x; } + f32 getInitScaleY() { return mInitScale.y; } + + JUtility::TColor getInitBlack() { return mInitBlack; } + JUtility::TColor getInitWhite() { return mInitWhite; } + private: /* 0x1C */ void* mpFirstStackSize; /* 0x20 */ s16* field_0x20; diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index ea53f5d455b..73cd4464afa 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -522,7 +522,7 @@ public: cXyz& getPos() { return mPos; } s16 getAngleY() { return mAngleY; } s8 getRoomNo() { return mRoomNo; } - char getWarpAcceptStage() { return mWarpAcceptStage; } + s8 getWarpAcceptStage() { return mWarpAcceptStage; } void resetWarpAcceptStage() { mWarpAcceptStage = -1; } void setWarpAcceptStage(s8 accept) { mWarpAcceptStage = accept; } diff --git a/include/msg/scrn/d_msg_scrn_3select.h b/include/msg/scrn/d_msg_scrn_3select.h index 7af3604da4a..107f3b95947 100644 --- a/include/msg/scrn/d_msg_scrn_3select.h +++ b/include/msg/scrn/d_msg_scrn_3select.h @@ -3,7 +3,8 @@ #include "dolphin/types.h" -struct dMsgScrn3Select_c { +class dMsgScrn3Select_c { +public: /* 802390B4 */ dMsgScrn3Select_c(); /* 802398CC */ virtual ~dMsgScrn3Select_c(); /* 80239C64 */ bool isSelect(); diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index 94759a22f95..d57620473be 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -2175,8 +2175,8 @@ s8 dComIfGs_getWarpRoomNo() { return dComIfGs_getLastWarpMarkRoomNo(); } -BOOL dComIfGs_getWarpMarkFlag() { - return dComIfGs_getLastWarpAcceptStage() >= 0; +bool dComIfGs_getWarpMarkFlag() { + return dComIfGs_getLastWarpAcceptStage() >= 0 ? 1 : 0; } void dComIfGs_setWarpMarkFlag(u8) {} diff --git a/src/d/menu/d_menu_item_explain.cpp b/src/d/menu/d_menu_item_explain.cpp index 8e7e1a76627..8565f3953b4 100644 --- a/src/d/menu/d_menu_item_explain.cpp +++ b/src/d/menu/d_menu_item_explain.cpp @@ -1,579 +1,355 @@ -// -// Generated By: dol2asm -// Translation Unit: d/menu/d_menu_item_explain -// +/** + * d_menu_item_explain.cpp + * Menu - Item Explain + */ #include "d/menu/d_menu_item_explain.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "JSystem/JGeometry.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JKernel/JKRMemArchive.h" +#include "JSystem/JUtility/JUTPalette.h" +#include "JSystem/JUtility/JUTTexture.h" +#include "MSL_C/stdio.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_item.h" +#include "d/d_kantera_icon_meter.h" +#include "d/d_lib.h" +#include "d/d_select_cursor.h" +#include "d/meter/d_meter2_info.h" +#include "d/meter/d_meter_HIO.h" +#include "d/msg/d_msg_class.h" +#include "d/msg/d_msg_string.h" #include "dol2asm.h" +#include "m_Do/m_Do_controller_pad.h" +#include "m_Do/m_Do_graphic.h" +#include "msg/scrn/d_msg_scrn_3select.h" +#include "msg/scrn/d_msg_scrn_arrow.h" -// -// Types: -// - -struct mDoCPd_c { - static u8 m_cpadInfo[256]; -}; - -struct dSv_player_item_record_c { - /* 80033F7C */ void getBombNum(u8) const; -}; - -struct dSv_player_item_c { - /* 80033030 */ void getItem(int, bool) const; -}; - -struct dSv_player_get_item_c { - /* 80033EC8 */ void isFirstBit(u8) const; -}; - -struct dMsgString_c { - /* 80249CA0 */ dMsgString_c(u8); - /* 80249D28 */ ~dMsgString_c(); -}; - -struct dMsgScrnArrow_c { - /* 8023BDC0 */ void draw(); - /* 8023BE34 */ void arwAnimeInit(); - /* 8023BE90 */ void arwAnimeMove(); -}; - -struct dMsgScrn3Select_c { - /* 80239C64 */ void isSelect(); - /* 80239C78 */ void setString(char*, char*, char*); - /* 80239D08 */ void setRubyString(char*, char*, char*); - /* 80239D98 */ void translate(f32, f32); - /* 80239DD4 */ void draw(f32, f32); - /* 8023A094 */ void selAnimeInit(u8, u8, u8, f32, u8); - /* 8023A398 */ void selAnimeMove(u8, u8, bool); - /* 8023A680 */ void selAnimeEnd(); - /* 8023A934 */ void getTextBoxWidth(); - /* 8023A94C */ void getFontSize(); - /* 8023A97C */ void getCharSpace(); -}; - -struct ResTIMG {}; - -struct ResTLUT {}; - -struct JGeometry { - template - struct TBox2 {}; - /* TBox2 */ - struct TBox2__template0 {}; -}; - -struct J2DPicture { - /* 802FC708 */ J2DPicture(ResTIMG const*); - /* 802FC800 */ J2DPicture(u64, JGeometry::TBox2 const&, ResTIMG const*, ResTLUT const*); -}; - -struct JUTFont {}; - -struct JMSMesgEntry_c {}; - -struct dMeter2Info_c { - /* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*); - /* 8021C7FC */ void getStringLength(JUTFont*, f32, f32, char*); - /* 8021CF08 */ void readItemTexture(u8, void*, J2DPicture*, void*, J2DPicture*, void*, - J2DPicture*, void*, J2DPicture*, int); -}; - -struct STControl { - /* 8003219C */ void checkTrigger(); - /* 80032524 */ void checkUpTrigger(); - /* 800325A0 */ void checkDownTrigger(); -}; - -struct JKRArchive {}; - -struct J2DOrthoGraph {}; - -struct JKRExpHeap {}; - -struct dMenu_ItemExplain_c { - /* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool); - /* 801DAFF0 */ ~dMenu_ItemExplain_c(); - /* 801DB470 */ void move(); - /* 801DB514 */ void draw(J2DOrthoGraph*); - /* 801DB744 */ void drawKantera(); - /* 801DB818 */ void wait_init(); - /* 801DB81C */ void wait_proc(); - /* 801DB820 */ void open_init(); - /* 801DBAB4 */ void open_proc(); - /* 801DBB50 */ void move_init(); - /* 801DBB7C */ void move_proc(); - /* 801DBCB4 */ void move_select_init(); - /* 801DBF44 */ void move_select_proc(); - /* 801DC1E0 */ void move_next_init(); - /* 801DC214 */ void move_next_proc(); - /* 801DC2E4 */ void close_init(); - /* 801DC2F0 */ void close_proc(); - /* 801DC340 */ void openExplain(u8, u8, u8, bool); - /* 801DC3C8 */ void openExplainDmap(u8, u8, u8, bool, u8); - /* 801DC738 */ void openExplainTx(u32, u32); - /* 801DC7AC */ void getAlphaRatio(); - /* 801DC7FC */ void setNumber(); - /* 801DCB54 */ void getWarpMarkFlag(); - /* 801DCBBC */ void setScale(); -}; - -struct dKantera_icon_c { - /* 801AE938 */ dKantera_icon_c(); - /* 801AEB7C */ void setAlphaRate(f32); - /* 801AEBA0 */ void setPos(f32, f32); - /* 801AEBF4 */ void setScale(f32, f32); - /* 801AEC44 */ void setNowGauge(u16, u16); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JKRHeap { - /* 802CE4D4 */ void alloc(u32, int); - /* 802CE548 */ void free(void*); - /* 802CE784 */ void getTotalFreeSize(); -}; - -struct J2DTextBox { - /* 8030074C */ void setString(s16, char const*, ...); -}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); - /* 802F9690 */ void animation(); -}; - -struct J2DBasePosition {}; - -struct J2DPane { - /* 802F666C */ void appendChild(J2DPane*); - /* 802F7100 */ void getBounds(); - /* 802F76F8 */ void setBasePosition(J2DBasePosition); -}; - -struct CPaneMgrAlpha { - /* 802555C8 */ void show(); - /* 80255608 */ void hide(); - /* 80255828 */ void getAlphaRate(); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802542E8 */ void getGlobalPosX(); - /* 80254364 */ void getGlobalPosY(); - /* 802545B0 */ void paneTrans(f32, f32); -}; - -// -// Forward References: -// - -extern "C" void __ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb(); -extern "C" void __dt__19dMenu_ItemExplain_cFv(); -extern "C" void move__19dMenu_ItemExplain_cFv(); -extern "C" void draw__19dMenu_ItemExplain_cFP13J2DOrthoGraph(); -extern "C" void drawKantera__19dMenu_ItemExplain_cFv(); -extern "C" void wait_init__19dMenu_ItemExplain_cFv(); -extern "C" void wait_proc__19dMenu_ItemExplain_cFv(); -extern "C" void open_init__19dMenu_ItemExplain_cFv(); -extern "C" void open_proc__19dMenu_ItemExplain_cFv(); -extern "C" void move_init__19dMenu_ItemExplain_cFv(); -extern "C" void move_proc__19dMenu_ItemExplain_cFv(); -extern "C" void move_select_init__19dMenu_ItemExplain_cFv(); -extern "C" void move_select_proc__19dMenu_ItemExplain_cFv(); -extern "C" void move_next_init__19dMenu_ItemExplain_cFv(); -extern "C" void move_next_proc__19dMenu_ItemExplain_cFv(); -extern "C" void close_init__19dMenu_ItemExplain_cFv(); -extern "C" void close_proc__19dMenu_ItemExplain_cFv(); -extern "C" void openExplain__19dMenu_ItemExplain_cFUcUcUcb(); -extern "C" void openExplainDmap__19dMenu_ItemExplain_cFUcUcUcbUc(); -extern "C" void openExplainTx__19dMenu_ItemExplain_cFUlUl(); -extern "C" void getAlphaRatio__19dMenu_ItemExplain_cFv(); -extern "C" void setNumber__19dMenu_ItemExplain_cFv(); -extern "C" void getWarpMarkFlag__19dMenu_ItemExplain_cFv(); -extern "C" void setScale__19dMenu_ItemExplain_cFv(); -extern "C" void __sinit_d_menu_item_explain_cpp(); -extern "C" extern char const* const d_menu_d_menu_item_explain__stringBase0; - -// -// External References: -// - -extern "C" void mDoExt_getMesgFont__Fv(); -extern "C" void dComIfGs_isDungeonItemWarp__Fi(); -extern "C" void dComIfGs_getWarpMarkFlag__Fv(); -extern "C" void checkTrigger__9STControlFv(); -extern "C" void checkUpTrigger__9STControlFv(); -extern "C" void checkDownTrigger__9STControlFv(); -extern "C" void getItem__17dSv_player_item_cCFib(); -extern "C" void isFirstBit__21dSv_player_get_item_cCFUc(); -extern "C" void getBombNum__24dSv_player_item_record_cCFUc(); -extern "C" void checkItemGet__FUci(); -extern "C" void __ct__15dKantera_icon_cFv(); -extern "C" void setAlphaRate__15dKantera_icon_cFf(); -extern "C" void setPos__15dKantera_icon_cFff(); -extern "C" void setScale__15dKantera_icon_cFff(); -extern "C" void setNowGauge__15dKantera_icon_cFUsUs(); -extern "C" void getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(); -extern "C" void getStringLength__13dMeter2Info_cFP7JUTFontffPc(); -extern "C" void -readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei(); -extern "C" void dMeter2Info_getNumberTextureName__Fi(); -extern "C" void dMeter2Info_set2DVibration__Fv(); -extern "C" void isSelect__17dMsgScrn3Select_cFv(); -extern "C" void setString__17dMsgScrn3Select_cFPcPcPc(); -extern "C" void setRubyString__17dMsgScrn3Select_cFPcPcPc(); -extern "C" void translate__17dMsgScrn3Select_cFff(); -extern "C" void draw__17dMsgScrn3Select_cFff(); -extern "C" void selAnimeInit__17dMsgScrn3Select_cFUcUcUcfUc(); -extern "C" void selAnimeMove__17dMsgScrn3Select_cFUcUcb(); -extern "C" void selAnimeEnd__17dMsgScrn3Select_cFv(); -extern "C" void getTextBoxWidth__17dMsgScrn3Select_cFv(); -extern "C" void getFontSize__17dMsgScrn3Select_cFv(); -extern "C" void getCharSpace__17dMsgScrn3Select_cFv(); -extern "C" void draw__15dMsgScrnArrow_cFv(); -extern "C" void arwAnimeInit__15dMsgScrnArrow_cFv(); -extern "C" void arwAnimeMove__15dMsgScrnArrow_cFv(); -extern "C" void __ct__12dMsgString_cFUc(); -extern "C" void __dt__12dMsgString_cFv(); -extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void getGlobalPosX__8CPaneMgrFv(); -extern "C" void getGlobalPosY__8CPaneMgrFv(); -extern "C" void paneTrans__8CPaneMgrFff(); -extern "C" void show__13CPaneMgrAlphaFv(); -extern "C" void hide__13CPaneMgrAlphaFv(); -extern "C" void getAlphaRate__13CPaneMgrAlphaFv(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void alloc__7JKRHeapFUli(); -extern "C" void free__7JKRHeapFPv(); -extern "C" void getTotalFreeSize__7JKRHeapFv(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void appendChild__7J2DPaneFP7J2DPane(); -extern "C" void getBounds__7J2DPaneFv(); -extern "C" void setBasePosition__7J2DPaneF15J2DBasePosition(); -extern "C" void __ct__9J2DScreenFv(); -extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive(); -extern "C" void draw__9J2DScreenFffPC14J2DGrafContext(); -extern "C" void animation__9J2DScreenFv(); -extern "C" void __ct__10J2DPictureFPC7ResTIMG(); -extern "C" void func_802FC800(); -extern "C" void setString__10J2DTextBoxFsPCce(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_21(); -extern "C" void _savegpr_22(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_21(); -extern "C" void _restgpr_22(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void snprintf(); -extern "C" void strcat(); -extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_ringHIO[344]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ /* 80396950-80396970 022FB0 0020+00 1/1 0/0 0/0 .rodata name_tag$3883 */ -SECTION_RODATA static u8 const name_tag[32] = { - 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x34, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x35, - 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x36, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x37, +static const u64 name_tag[4] = { + 'item_n04', + 'item_n05', + 'item_n06', + 'item_n07', }; -COMPILER_STRIP_GATE(0x80396950, &name_tag); /* 80396970-80396990 022FD0 0020+00 1/1 0/0 0/0 .rodata fame_tag$3884 */ -SECTION_RODATA static u8 const fame_tag[32] = { - 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x31, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x32, - 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x33, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x34, +static const u64 fame_tag[4] = { + 'f_item_1', + 'f_item_2', + 'f_item_3', + 'f_item_4', }; -COMPILER_STRIP_GATE(0x80396970, &fame_tag); - -/* 80396990-80396990 022FF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80396990 = "zelda_item_screen_info.blo"; -SECTION_DEAD static char const* const stringBase_803969AB = ""; -SECTION_DEAD static char const* const stringBase_803969AC = "tt_block8x8.bti"; -#pragma pop /* 803BD8C8-803BD8D4 01A9E8 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -/* 803BD8D4-803BD8E0 -00001 000C+00 0/1 0/0 0/0 .data @3844 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3844[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)wait_init__19dMenu_ItemExplain_cFv, -}; -#pragma pop - -/* 803BD8E0-803BD8EC -00001 000C+00 0/1 0/0 0/0 .data @3845 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3845[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)open_init__19dMenu_ItemExplain_cFv, -}; -#pragma pop - -/* 803BD8EC-803BD8F8 -00001 000C+00 0/1 0/0 0/0 .data @3846 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3846[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)move_init__19dMenu_ItemExplain_cFv, -}; -#pragma pop - -/* 803BD8F8-803BD904 -00001 000C+00 0/1 0/0 0/0 .data @3847 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3847[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)move_select_init__19dMenu_ItemExplain_cFv, -}; -#pragma pop - -/* 803BD904-803BD910 -00001 000C+00 0/1 0/0 0/0 .data @3848 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3848[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)move_next_init__19dMenu_ItemExplain_cFv, -}; -#pragma pop - -/* 803BD910-803BD91C -00001 000C+00 0/1 0/0 0/0 .data @3849 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3849[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)close_init__19dMenu_ItemExplain_cFv, -}; -#pragma pop - -/* 803BD91C-803BD964 01AA3C 0048+00 1/2 0/0 0/0 .data init_process */ -SECTION_DATA static u8 init_process[72] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +typedef void (dMenu_ItemExplain_c::*initFunc)(); +static initFunc init_process[] = { + &dMenu_ItemExplain_c::wait_init, &dMenu_ItemExplain_c::open_init, + &dMenu_ItemExplain_c::move_init, &dMenu_ItemExplain_c::move_select_init, + &dMenu_ItemExplain_c::move_next_init, &dMenu_ItemExplain_c::close_init, }; -/* 803BD964-803BD970 -00001 000C+00 0/1 0/0 0/0 .data @3850 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3850[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)wait_proc__19dMenu_ItemExplain_cFv, +typedef void (dMenu_ItemExplain_c::*moveFunc)(); +static moveFunc move_process[] = { + &dMenu_ItemExplain_c::wait_proc, &dMenu_ItemExplain_c::open_proc, + &dMenu_ItemExplain_c::move_proc, &dMenu_ItemExplain_c::move_select_proc, + &dMenu_ItemExplain_c::move_next_proc, &dMenu_ItemExplain_c::close_proc, }; -#pragma pop - -/* 803BD970-803BD97C -00001 000C+00 0/1 0/0 0/0 .data @3851 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3851[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)open_proc__19dMenu_ItemExplain_cFv, -}; -#pragma pop - -/* 803BD97C-803BD988 -00001 000C+00 0/1 0/0 0/0 .data @3852 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3852[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)move_proc__19dMenu_ItemExplain_cFv, -}; -#pragma pop - -/* 803BD988-803BD994 -00001 000C+00 0/1 0/0 0/0 .data @3853 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3853[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)move_select_proc__19dMenu_ItemExplain_cFv, -}; -#pragma pop - -/* 803BD994-803BD9A0 -00001 000C+00 0/1 0/0 0/0 .data @3854 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3854[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)move_next_proc__19dMenu_ItemExplain_cFv, -}; -#pragma pop - -/* 803BD9A0-803BD9AC -00001 000C+00 0/1 0/0 0/0 .data @3855 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3855[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)close_proc__19dMenu_ItemExplain_cFv, -}; -#pragma pop - -/* 803BD9AC-803BD9F4 01AACC 0048+00 1/2 0/0 0/0 .data move_process */ -SECTION_DATA static u8 move_process[72] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 803BD9F4-803BDA00 01AB14 000C+00 2/2 0/0 0/0 .data __vt__19dMenu_ItemExplain_c */ -SECTION_DATA extern void* __vt__19dMenu_ItemExplain_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__19dMenu_ItemExplain_cFv, -}; - -/* 80454288-8045428C 002888 0004+00 3/3 0/0 0/0 .sdata2 @4062 */ -SECTION_SDATA2 static u8 lit_4062[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 8045428C-80454290 00288C 0004+00 4/4 0/0 0/0 .sdata2 @4063 */ -SECTION_SDATA2 static f32 lit_4063 = 201.0f; - -/* 80454290-80454294 002890 0004+00 1/1 0/0 0/0 .sdata2 @4064 */ -SECTION_SDATA2 static f32 lit_4064 = 16.0f; - -/* 80454294-80454298 002894 0004+00 2/2 0/0 0/0 .sdata2 @4065 */ -SECTION_SDATA2 static f32 lit_4065 = 0.5f; - -/* 80454298-804542A0 002898 0004+04 1/1 0/0 0/0 .sdata2 @4066 */ -SECTION_SDATA2 static f32 lit_4066[1 + 1 /* padding */] = { - 3.0f, - /* padding */ - 0.0f, -}; - -/* 804542A0-804542A8 0028A0 0008+00 1/1 0/0 0/0 .sdata2 @4068 */ -SECTION_SDATA2 static f64 lit_4068 = 4503601774854144.0 /* cast s32 to float */; /* 801DA754-801DAFF0 1D5094 089C+00 0/0 2/2 0/0 .text * __ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMenu_ItemExplain_c::dMenu_ItemExplain_c(JKRExpHeap* param_0, JKRArchive* param_1, - STControl* param_2, bool param_3) { - nofralloc -#include "asm/d/menu/d_menu_item_explain/__ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb.s" +dMenu_ItemExplain_c::dMenu_ItemExplain_c(JKRExpHeap* i_heap, JKRArchive* i_archive, + STControl* i_stick, bool param_3) { + mpHeap = i_heap; + mpArchive = dComIfGp_getDemoMsgArchive(); + mpStick = i_stick; + mpHeap->getTotalFreeSize(); + field_0xc8 = 0; + field_0xcc = 0; + field_0xd0 = 0; + field_0xc4 = 0; + field_0xe1 = 0; + field_0xe2 = 0; + mStatus = 0; + field_0xe7 = 0; + mEndButton = 0; + if (i_archive == dComIfGp_getDmapResArchive()) { + field_0xe5 = 2; + } else { + field_0xe5 = 1; + } + field_0xe6 = 0; + field_0xdf = 0; + field_0xde = 0; + offForceButton(); + trans(0.0f, 0.0f); + field_0x74 = 0; + field_0x14 = 0; + for (int i = 0; i < 4; i++) { + field_0x28[i] = 0; + } + for (int i = 0; i < 2; i++) { + field_0x44[i] = 0; + field_0xa0[i] = 0; + } + field_0x50 = 0; + field_0x5c = 0; + for (int i = 0; i < 3; i++) { + field_0x60[i] = 0; + } + field_0xdc = 0; + mpInfoString = new dMsgString_c(1); + mpKanteraMeter = new dKantera_icon_c(); + mpInfoScreen = new J2DScreen(); + mpInfoScreen->setPriority("zelda_item_screen_info.blo", 0x20000, mpArchive); + mpParent[0] = new CPaneMgr(mpInfoScreen, 'n_all', 2, NULL); + mpParent[1] = NULL; + mpLabel = new CPaneMgr(mpInfoScreen, 'label_n', 0, NULL); + mDescAlpha = 0.0f; + field_0x78 = 0; + mAlphaRatio = 201.0f; + mpInfoText = new CPaneMgr(mpInfoScreen, 'i_text1', 0, NULL); + mpInfoScreen->search('i_text4')->hide(); + ((J2DTextBox*)(mpInfoText->getPanePtr()))->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)(mpInfoText->getPanePtr()))->setString(0x200, ""); + mpInfoText->show(); + for (int i = 0; i < 4; i++) { + mpNameText[i] = new CPaneMgr(mpInfoScreen, fame_tag[i], 0, NULL); + mpInfoScreen->search(name_tag[i])->hide(); + ((J2DTextBox*)(mpNameText[i]->getPanePtr()))->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)(mpNameText[i]->getPanePtr()))->setString(0x20, ""); + } + mpInfoIcon = new CPaneMgr(mpInfoScreen, 'i_icon_p', 0, NULL); + for (int i = 0; i < 4; i++) { + mpExpItemTex[i] = (ResTIMG*)mpHeap->alloc(0xC00, 0x20); + } + + mpExpItemPane[0] = new J2DPicture( + 'i_icon_1', + JGeometry::TBox2(0.0f, 0.0f, mpInfoIcon->getInitSizeX(), mpInfoIcon->getInitSizeY()), + ((J2DPicture*)(mpInfoIcon->getPanePtr()))->getTexture(0)->getTexInfo(), NULL); + mpExpItemPane[0]->setBasePosition(J2DBasePosition_4); + mpInfoIcon->getPanePtr()->appendChild(mpExpItemPane[0]); + mpExpItemPane[1] = new J2DPicture( + 'i_icon_2', + JGeometry::TBox2(0.0f, 0.0f, mpInfoIcon->getInitSizeX(), mpInfoIcon->getInitSizeY()), + ((J2DPicture*)(mpInfoIcon->getPanePtr()))->getTexture(0)->getTexInfo(), NULL); + mpExpItemPane[1]->setBasePosition(J2DBasePosition_4); + mpInfoIcon->getPanePtr()->appendChild(mpExpItemPane[1]); + mpExpItemPane[2] = new J2DPicture( + 'i_icon_3', + JGeometry::TBox2(0.0f, 0.0f, mpInfoIcon->getInitSizeX(), mpInfoIcon->getInitSizeY()), + ((J2DPicture*)(mpInfoIcon->getPanePtr()))->getTexture(0)->getTexInfo(), NULL); + mpExpItemPane[2]->setBasePosition(J2DBasePosition_4); + mpInfoIcon->getPanePtr()->appendChild(mpExpItemPane[2]); + + ResTIMG* texResource = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( + 'TIMG', dMeter2Info_getNumberTextureName(0)); + for (int i = 0; i < 3; i++) { + mpItemNumTex[i] = new J2DPicture(texResource); + mpInfoScreen->search('info_n1')->appendChild(mpItemNumTex[i]); + mpItemNumTex[i]->move(i * 16.0f + (mpInfoIcon->getPosX() + mpInfoIcon->getSizeX() * 0.5f), + mpInfoIcon->getPosY() + mpInfoIcon->getSizeY() - 3.0f); + mpItemNumTex[i]->resize(16.0f, 16.0f); + } + + if (param_3 == 1) { + texResource = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); + mpBackTex = new J2DPicture(texResource); + mpBackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 0xff)); + mpBackTex->setAlpha(0); + } else { + mpBackTex = NULL; + } + mpArrow = NULL; + if (i_stick != NULL) { + mpSelect_c = NULL; + } else { + mpSelect_c = NULL; + } } -#pragma pop /* 801DAFF0-801DB470 1D5930 0480+00 1/0 0/0 0/0 .text __dt__19dMenu_ItemExplain_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMenu_ItemExplain_c::~dMenu_ItemExplain_c() { - nofralloc -#include "asm/d/menu/d_menu_item_explain/__dt__19dMenu_ItemExplain_cFv.s" +dMenu_ItemExplain_c::~dMenu_ItemExplain_c() { + delete mpInfoString; + mpInfoString = NULL; + + delete mpInfoScreen; + mpInfoScreen = NULL; + + delete mpKanteraMeter; + mpKanteraMeter = NULL; + + for (int i = 0; i < 2; i++) { + if (mpParent[i] != NULL) { + delete mpParent[i]; + mpParent[i] = NULL; + } + } + + delete mpLabel; + mpLabel = NULL; + + delete mpInfoText; + mpInfoText = NULL; + + for (int i = 0; i < 4; i++) { + delete mpNameText[i]; + mpNameText[i] = NULL; + } + + if (field_0x74 != NULL) { + delete field_0x74; + field_0x74 = NULL; + } + + for (int i = 0; i < 2; i++) { + if (field_0x44[i] != NULL) { + delete field_0x44[i]; + field_0x44[i] = NULL; + } + } + + if (field_0x50 != NULL) { + delete field_0x50; + field_0x50 = NULL; + } + + if (field_0x5c != NULL) { + delete field_0x5c; + field_0x5c = NULL; + } + + if (field_0x14 != NULL) { + delete field_0x14; + field_0x14 = NULL; + } + + for (int i = 0; i < 4; i++) { + if (field_0x28[i] != NULL) { + delete field_0x28[i]; + field_0x28[i] = NULL; + } + } + + for (int i = 0; i < 3; i++) { + if (field_0x60[i] != NULL) { + delete field_0x60[i]; + field_0x60[i] = NULL; + } + } + + delete mpInfoIcon; + mpInfoIcon = NULL; + + for (int i = 0; i < 4; i++) { + if (mpExpItemTex[i] != NULL) { + mpHeap->free(mpExpItemTex[i]); + mpExpItemTex[i] = NULL; + } + } + + for (int i = 0; i < 3; i++) { + if (mpExpItemPane[i] != NULL) { + mpExpItemPane[i] = NULL; + } + } + + for (int i = 0; i < 3; i++) { + if (mpItemNumTex[i] != NULL) { + mpItemNumTex[i] = NULL; + } + } + + if (mpBackTex != NULL) { + delete mpBackTex; + mpBackTex = NULL; + } + + if (mpArrow != NULL) { + delete mpArrow; + mpArrow = NULL; + } + + if (mpSelect_c != NULL) { + delete mpSelect_c; + mpSelect_c = NULL; + } + + dComIfGp_getMsgArchive(0)->removeResourceAll(); + mpArchive->removeResourceAll(); } -#pragma pop /* 801DB470-801DB514 1D5DB0 00A4+00 0/0 5/5 0/0 .text move__19dMenu_ItemExplain_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::move() { - nofralloc -#include "asm/d/menu/d_menu_item_explain/move__19dMenu_ItemExplain_cFv.s" +void dMenu_ItemExplain_c::move() { + u8 status = mStatus; + (this->*move_process[status])(); + if (status != mStatus) { + (this->*init_process[mStatus])(); + } + if (mStatus != NULL) { + mpInfoScreen->animation(); + } + if (g_ringHIO.mItemDescAlpha != mDescAlpha) { + mDescAlpha = g_ringHIO.mItemDescAlpha; + } } -#pragma pop - -/* ############################################################################################## */ -/* 804542A8-804542AC 0028A8 0004+00 1/1 0/0 0/0 .sdata2 @4302 */ -SECTION_SDATA2 static f32 lit_4302 = 608.0f; - -/* 804542AC-804542B0 0028AC 0004+00 1/1 0/0 0/0 .sdata2 @4303 */ -SECTION_SDATA2 static f32 lit_4303 = 448.0f; - -/* 804542B0-804542B4 0028B0 0004+00 5/5 0/0 0/0 .sdata2 @4304 */ -SECTION_SDATA2 static f32 lit_4304 = -1.0f; - -/* 804542B4-804542B8 0028B4 0004+00 1/1 0/0 0/0 .sdata2 @4305 */ -SECTION_SDATA2 static f32 lit_4305 = 486.0f; - -/* 804542B8-804542BC 0028B8 0004+00 1/1 0/0 0/0 .sdata2 @4306 */ -SECTION_SDATA2 static f32 lit_4306 = 209.0f; /* 801DB514-801DB744 1D5E54 0230+00 0/0 2/2 0/0 .text draw__19dMenu_ItemExplain_cFP13J2DOrthoGraph */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::draw(J2DOrthoGraph* param_0) { - nofralloc -#include "asm/d/menu/d_menu_item_explain/draw__19dMenu_ItemExplain_cFP13J2DOrthoGraph.s" +void dMenu_ItemExplain_c::draw(J2DOrthoGraph* i_graph) { + if (mStatus != 0) { + for (int i = 0; i < 2; i++) { + if (mpParent[i] != NULL) { + mpParent[i]->scale(g_ringHIO.mItemDescScale, g_ringHIO.mItemDescScale); + mpParent[i]->paneTrans(field_0xd4 + g_ringHIO.mItemDescPosX, + field_0xd8 + g_ringHIO.mItemDescPosY); + } + } + mpLabel->scale(g_ringHIO.mItemDescTitleScale, g_ringHIO.mItemDescTitleScale); + mpLabel->paneTrans(g_ringHIO.mItemDescTitlePosX, g_ringHIO.mItemDescTitlePosY); + if (mpBackTex != NULL) { + mpBackTex->draw(0.0f, 0.0f, 608.0f, 448.0f, false, false, false); + } + if (field_0xc8 != field_0xd0) { + field_0xd0 = field_0xc8; + for (int i = 0; i < 4; i++) { + mpInfoString->getString(field_0xcc, (J2DTextBox*)mpNameText[i]->getPanePtr(), NULL, + NULL, NULL, 0); + } + mpInfoString->getString(field_0xc8, (J2DTextBox*)mpInfoText->getPanePtr(), NULL, NULL, + NULL, 0); + } + mpInfoScreen->draw(0.0f, 0.0f, (J2DGrafContext*)i_graph); + mpInfoString->drawOutFontLocal((J2DTextBox*)mpInfoText->getPanePtr(), -1.0f); + drawKantera(); + if (mpSelect_c != NULL) { + mpSelect_c->translate(486.0f, 209.0f); + mpSelect_c->draw(0.0f, 0.0f); + } + if (mpArrow != NULL) { + mpArrow->draw(); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 804542BC-804542C0 0028BC 0004+00 2/2 0/0 0/0 .sdata2 @4346 */ -SECTION_SDATA2 static f32 lit_4346 = 48.0f; - -/* 804542C0-804542C4 0028C0 0004+00 1/1 0/0 0/0 .sdata2 @4347 */ -SECTION_SDATA2 static f32 lit_4347 = 5.0f; - -/* 804542C4-804542C8 0028C4 0004+00 8/8 0/0 0/0 .sdata2 @4348 */ -SECTION_SDATA2 static f32 lit_4348 = 1.0f; /* 801DB744-801DB818 1D6084 00D4+00 1/1 0/0 0/0 .text drawKantera__19dMenu_ItemExplain_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::drawKantera() { - nofralloc -#include "asm/d/menu/d_menu_item_explain/drawKantera__19dMenu_ItemExplain_cFv.s" +void dMenu_ItemExplain_c::drawKantera() { + if (field_0xe1 == 0x48) { + mpKanteraMeter->setPos(mpInfoIcon->getGlobalPosX() + 48.0f, + mpInfoIcon->getGlobalPosY() + mpInfoIcon->getSizeY() + 5.0f); + mpKanteraMeter->setScale(1.0f, 1.0f); + mpKanteraMeter->setNowGauge(dComIfGs_getMaxOil(), dComIfGs_getOil()); + mpKanteraMeter->setAlphaRate(mpInfoIcon->getAlphaRate()); + mpKanteraMeter->drawSelf(); + } } -#pragma pop /* 801DB818-801DB81C 1D6158 0004+00 1/0 0/0 0/0 .text wait_init__19dMenu_ItemExplain_cFv */ @@ -589,227 +365,476 @@ void dMenu_ItemExplain_c::wait_proc() { /* 801DB820-801DBAB4 1D6160 0294+00 3/2 0/0 0/0 .text open_init__19dMenu_ItemExplain_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::open_init() { - nofralloc -#include "asm/d/menu/d_menu_item_explain/open_init__19dMenu_ItemExplain_cFv.s" +void dMenu_ItemExplain_c::open_init() { + field_0xc4 = field_0xc8; + mEndButton = 0; + offForceButton(); + if (field_0xe1 != 0xff) { + u8 itemNo = field_0xe1; + s32 iVar = -1; + if (itemNo == 0x26) { + if (i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x11) { + s32 itemsObtained = 0; + for (int i = 0; i < 3; i++) { + if (checkItemGet(i + L2_KEY_PIECES1, 1) != 0) { + itemsObtained++; + } + } + if (itemsObtained == 1) { + iVar = 0x43; + } + if (itemsObtained == 2) { + itemNo = 0xfa; + iVar = 0x44; + } else { + itemNo = 0xfd; + } + } else { + if (i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x14) { + itemNo = 0xf6; + } + } + } + s32 texture = dMeter2Info_readItemTexture( + itemNo, mpExpItemTex[0], (J2DPicture*)mpInfoIcon->getPanePtr(), mpExpItemTex[1], + mpExpItemPane[0], mpExpItemTex[2], mpExpItemPane[1], mpExpItemTex[3], mpExpItemPane[2], + iVar); + mpInfoIcon->show(); + for (int i = 0; i < 3; i++) { + if (i < texture - 1) { + mpExpItemPane[i]->show(); + } else { + mpExpItemPane[i]->hide(); + } + } + setNumber(); + mpInfoScreen->search('i_i_back')->show(); + field_0xe6 = 0; + } else { + mpInfoIcon->hide(); + for (int i = 0; i < 3; i++) { + mpExpItemPane[i]->hide(); + } + setNumber(); + mpInfoScreen->search('i_i_back')->hide(); + field_0xe6 = 1; + } + if (mpArrow != NULL) { + mpArrow->arwAnimeInit(); + } + Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_OPEN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } -#pragma pop - -/* ############################################################################################## */ -/* 804542C8-804542CC 0028C8 0004+00 1/1 0/0 0/0 .sdata2 @4452 */ -SECTION_SDATA2 static f32 lit_4452 = 2.0f; - -/* 804542CC-804542D0 0028CC 0004+00 1/1 0/0 0/0 .sdata2 @4453 */ -SECTION_SDATA2 static f32 lit_4453 = 150.0f; /* 801DBAB4-801DBB50 1D63F4 009C+00 1/0 0/0 0/0 .text open_proc__19dMenu_ItemExplain_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::open_proc() { - nofralloc -#include "asm/d/menu/d_menu_item_explain/open_proc__19dMenu_ItemExplain_cFv.s" +void dMenu_ItemExplain_c::open_proc() { + mAlphaRatio += 2.0f; + if (mAlphaRatio >= 201.0f) { + mAlphaRatio = 201.0f; + mStatus = 2; + } + if (mpBackTex != NULL) { + mpBackTex->setAlpha((1.0f - getAlphaRatio()) * 150.0f); + } } -#pragma pop /* 801DBB50-801DBB7C 1D6490 002C+00 1/0 0/0 0/0 .text move_init__19dMenu_ItemExplain_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::move_init() { - nofralloc -#include "asm/d/menu/d_menu_item_explain/move_init__19dMenu_ItemExplain_cFv.s" +void dMenu_ItemExplain_c::move_init() { + if (mpArrow != NULL) { + mpArrow->arwAnimeInit(); + } } -#pragma pop /* 801DBB7C-801DBCB4 1D64BC 0138+00 1/0 0/0 0/0 .text move_proc__19dMenu_ItemExplain_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::move_proc() { - nofralloc -#include "asm/d/menu/d_menu_item_explain/move_proc__19dMenu_ItemExplain_cFv.s" +void dMenu_ItemExplain_c::move_proc() { + if (field_0xe1 == 0x25 && field_0xe5 == 2 && mpArrow != NULL) { + mpArrow->arwAnimeMove(); + } + if (!mDoCPd_c::getTrigA(PAD_1) && !mDoCPd_c::getTrigB(PAD_1) && mForceButton == 0) { + if (field_0xe7 == 0) { + return; + } + if (!mDoCPd_c::getTrigX(PAD_1) && !mDoCPd_c::getTrigY(PAD_1)) { + return; + } + } + if (mForceButton != 0) { + mEndButton = 6; + } else if (mDoCPd_c::getTrigA(PAD_1)) { + mEndButton = 1; + } else if (mDoCPd_c::getTrigB(PAD_1)) { + mEndButton = 2; + } else if (mDoCPd_c::getTrigX(PAD_1)) { + mEndButton = 3; + } else if (mDoCPd_c::getTrigY(PAD_1)) { + mEndButton = 4; + } + mStatus = 5; + Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + dMeter2Info_set2DVibration(); } -#pragma pop - -/* ############################################################################################## */ -/* 80396990-80396990 022FF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803969BC = "" - "\x1B" - "CR[%d]"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803969C4 = "\0\0\0"; -#pragma pop /* 801DBCB4-801DBF44 1D65F4 0290+00 1/0 0/0 0/0 .text move_select_init__19dMenu_ItemExplain_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::move_select_init() { - nofralloc -#include "asm/d/menu/d_menu_item_explain/move_select_init__19dMenu_ItemExplain_cFv.s" +void dMenu_ItemExplain_c::move_select_init() { + char local_88[8]; + char local_80[8]; + char local_64[20]; + char cStack78[20]; + + local_88[0] = 0; + local_80[0] = 0; + local_64[0] = 0; + cStack78[1] = 0; + + if (getWarpMarkFlag() == 0) { + field_0xc8 = 0x517; + field_0xe2 = 0; + dMeter2Info_getString(0x518, local_88, NULL); + dMeter2Info_getString(0x519, local_80, NULL); + } else { + field_0xc8 = 0x51A; + field_0xe2 = 0; + dMeter2Info_getString(0x51B, local_88, NULL); + dMeter2Info_getString(0x51C, local_80, NULL); + } + + f32 stringLength1 = dMeter2Info_getStringLength(mDoExt_getMesgFont(), mpSelect_c->getFontSize(), + mpSelect_c->getCharSpace(), local_88); + f32 stringLength2 = dMeter2Info_getStringLength(mDoExt_getMesgFont(), mpSelect_c->getFontSize(), + mpSelect_c->getCharSpace(), local_80); + f32 length; + if (stringLength1 < stringLength2) { + length = stringLength2; + } else { + length = stringLength1; + } + f32 textBoxWidth = mpSelect_c->getTextBoxWidth(); + if (length < textBoxWidth) { + length = mpSelect_c->getTextBoxWidth(); + } + + snprintf(local_64, 20, + "\x1B" + "CR[%d]", + (int)(0.5f * (length - stringLength1))); + strcat(local_64, local_88); + snprintf(cStack78, 20, + "\x1B" + "CR[%d]", + (int)(0.5f * (length - stringLength2))); + strcat(cStack78, local_80); + mpSelect_c->setString("", local_64, cStack78); + mpSelect_c->setRubyString("", "", ""); + mpSelect_c->selAnimeInit(2, field_0xe2 + 1, 0, length, 0); + if (mpArrow != NULL) { + mpArrow->arwAnimeInit(); + } } -#pragma pop /* 801DBF44-801DC1E0 1D6884 029C+00 1/0 0/0 0/0 .text move_select_proc__19dMenu_ItemExplain_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::move_select_proc() { - nofralloc -#include "asm/d/menu/d_menu_item_explain/move_select_proc__19dMenu_ItemExplain_cFv.s" +void dMenu_ItemExplain_c::move_select_proc() { + mpStick->checkTrigger(); + if (mDoCPd_c::getTrigA(PAD_1)) { + mEndButton = 1; + if (field_0xe2 == 0) { + if (getWarpMarkFlag() == 0) { + dMeter2Info_setWarpStatus(1); + } else { + dMeter2Info_setWarpStatus(2); + } + } + if (field_0xe5 == 2) { + mStatus = 5; + Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, + 0); + dMeter2Info_set2DVibration(); + } else { + mStatus = 2; + field_0xc8 = field_0xc4; + } + Z2GetAudioMgr()->seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } else if (mDoCPd_c::getTrigB(PAD_1)) { + mEndButton = 2; + if (field_0xe5 == 2) { + mStatus = 5; + Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, + 0); + dMeter2Info_set2DVibration(); + } else { + mStatus = 2; + field_0xc8 = field_0xc4; + } + } else if (mpSelect_c->isSelect() && mpStick->checkUpTrigger()) { + if (field_0xe2 == 1) { + field_0xe2 = 0; + Z2GetAudioMgr()->seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + } else if (mpSelect_c->isSelect() && mpStick->checkDownTrigger()) { + if (field_0xe2 == 0) { + field_0xe2 = 1; + Z2GetAudioMgr()->seStart(Z2SE_SY_TALK_CURSOR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + } + if (mStatus == 3) { + mpSelect_c->selAnimeMove(2, field_0xe2 + 1, false); + } else { + mpSelect_c->selAnimeEnd(); + } } -#pragma pop /* 801DC1E0-801DC214 1D6B20 0034+00 1/0 0/0 0/0 .text move_next_init__19dMenu_ItemExplain_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::move_next_init() { - nofralloc -#include "asm/d/menu/d_menu_item_explain/move_next_init__19dMenu_ItemExplain_cFv.s" +void dMenu_ItemExplain_c::move_next_init() { + field_0xc8 = 0x51d; + if (mpArrow != NULL) { + mpArrow->arwAnimeInit(); + } } -#pragma pop /* 801DC214-801DC2E4 1D6B54 00D0+00 1/0 0/0 0/0 .text move_next_proc__19dMenu_ItemExplain_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::move_next_proc() { - nofralloc -#include "asm/d/menu/d_menu_item_explain/move_next_proc__19dMenu_ItemExplain_cFv.s" +void dMenu_ItemExplain_c::move_next_proc() { + if (mDoCPd_c::getTrigA(PAD_1) || mDoCPd_c::getTrigB(PAD_1)) { + if (mDoCPd_c::getTrigA(PAD_1)) { + mEndButton = 1; + } else if (mDoCPd_c::getTrigB(PAD_1)) { + mEndButton = 2; + } + + if (field_0xe5 == 2) { + mStatus = 5; + Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, + 0); + dMeter2Info_set2DVibration(); + } else { + mStatus = 2; + field_0xc8 = field_0xc4; + } + mpSelect_c->selAnimeEnd(); + } } -#pragma pop /* 801DC2E4-801DC2F0 1D6C24 000C+00 1/0 0/0 0/0 .text close_init__19dMenu_ItemExplain_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::close_init() { - nofralloc -#include "asm/d/menu/d_menu_item_explain/close_init__19dMenu_ItemExplain_cFv.s" +void dMenu_ItemExplain_c::close_init() { + mAlphaRatio = 201.0f; } -#pragma pop /* 801DC2F0-801DC340 1D6C30 0050+00 1/0 0/0 0/0 .text close_proc__19dMenu_ItemExplain_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::close_proc() { - nofralloc -#include "asm/d/menu/d_menu_item_explain/close_proc__19dMenu_ItemExplain_cFv.s" +void dMenu_ItemExplain_c::close_proc() { + bool check; + if (mpSelect_c != NULL) { + check = mpSelect_c->selAnimeEnd(); + } else { + check = 1; + } + if (check != 0) { + mStatus = 0; + } } -#pragma pop /* 801DC340-801DC3C8 1D6C80 0088+00 0/0 2/2 0/0 .text openExplain__19dMenu_ItemExplain_cFUcUcUcb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::openExplain(u8 param_0, u8 param_1, u8 param_2, bool param_3) { - nofralloc -#include "asm/d/menu/d_menu_item_explain/openExplain__19dMenu_ItemExplain_cFUcUcUcb.s" +u8 dMenu_ItemExplain_c::openExplain(u8 i_slotNo, u8 param_1, u8 param_2, bool param_3) { + u8 item = dComIfGs_getItem(i_slotNo, false); + if (item == 0xff) { + return 0; + } else { + return openExplainDmap(item, param_1, param_2, param_3, i_slotNo); + } } -#pragma pop /* 801DC3C8-801DC738 1D6D08 0370+00 1/1 1/1 0/0 .text * openExplainDmap__19dMenu_ItemExplain_cFUcUcUcbUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::openExplainDmap(u8 param_0, u8 param_1, u8 param_2, bool param_3, - u8 param_4) { - nofralloc -#include "asm/d/menu/d_menu_item_explain/openExplainDmap__19dMenu_ItemExplain_cFUcUcUcbUc.s" +u8 dMenu_ItemExplain_c::openExplainDmap(u8 param_0, u8 param_1, u8 param_2, bool param_3, + u8 param_4) { + u8 itemNo = param_0; + u8 ret = 0; + s32 itemsObtained = 0; + + if (i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x11 && param_0 == 0x26) { + for (int i = 0; i < 3; i++) { + if (checkItemGet(i + L2_KEY_PIECES1, 1) != 0) { + itemsObtained++; + } + } + if (itemsObtained <= 1) { + itemNo = 0xf9; + } else if (itemsObtained <= 2) { + itemNo = 0xfa; + } else { + itemNo = 0xfd; + } + } + if (itemNo == 0x50 && i_dComIfGs_isItemFirstBit(0x4f) && dMeter2Info_getRentalBombBag() == 0xff) + { + itemNo = 0x4f; + } + if (mStatus == 0) { + mStatus = 1; + field_0xe1 = param_0; + field_0xcc = itemNo + 0x165; + if (i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x14 && itemNo == 0x23) { + field_0xcc = 0x5bf; + } + if (itemNo == 0x25 && dComIfGs_isDungeonItemWarp(0x16)) { + field_0xcc = 0x251; + } + field_0xc8 = itemNo + 0x265; + if (dMeter2Info_getRentalBombBag() != 0xff) { + if (param_4 == dMeter2Info_getRentalBombBag() + 0xf) { + field_0xcc = 0x16d; + if (dComIfGs_getBombNum(dMeter2Info_getRentalBombBag()) != 0) { + field_0xc8 = 0x26d; + } else { + field_0xc8 = 0x26e; + } + } + } + if (itemNo == 0x46 && daPy_getPlayerActorClass()->checkCopyRodTopUse() == 0) { + field_0xc8 = 0x2b2; + } + if (itemNo == 0x25 && dComIfGs_isDungeonItemWarp(0x16)) { + field_0xc8 = 0x351; + } + field_0xe7 = 0; + field_0xde = param_1; + field_0xdf = param_2; + open_init(); + setScale(); + ret = 1; + } else if (param_3 && (mStatus == 1 || mStatus == 2)) { + field_0xe1 = param_0; + field_0xcc = itemNo + 0x165; + if (itemNo == 0x25 && dComIfGs_isDungeonItemWarp(0x16)) { + field_0xcc = 0x251; + } + field_0xc8 = itemNo + 0x265; + if (dMeter2Info_getRentalBombBag() != 0xff) { + if (param_4 == dMeter2Info_getRentalBombBag() + 0xf) { + if (dComIfGs_getBombNum(dMeter2Info_getRentalBombBag()) != 0) { + field_0xc8 = 0x26d; + } else { + field_0xc8 = 0x26e; + } + } + } + if (itemNo == 0x25 && dComIfGs_isDungeonItemWarp(0x16)) { + field_0xc8 = 0x351; + } + field_0xe7 = 0; + field_0xde = param_1; + field_0xdf = param_2; + open_init(); + setScale(); + ret = 1; + ; + } + return ret; } -#pragma pop /* 801DC738-801DC7AC 1D7078 0074+00 0/0 1/1 0/0 .text openExplainTx__19dMenu_ItemExplain_cFUlUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::openExplainTx(u32 param_0, u32 param_1) { - nofralloc -#include "asm/d/menu/d_menu_item_explain/openExplainTx__19dMenu_ItemExplain_cFUlUl.s" +u8 dMenu_ItemExplain_c::openExplainTx(u32 param_0, u32 param_1) { + u8 ret = 0; + if (mStatus == 0) { + mStatus = 1; + field_0xe1 = 0xff; + field_0xcc = param_0; + field_0xc8 = param_1; + field_0xe7 = 0; + field_0xde = 0; + field_0xdf = 0; + open_init(); + setScale(); + ret = 1; + } + return ret; } -#pragma pop - -/* ############################################################################################## */ -/* 804542D0-804542D4 0028D0 0004+00 1/1 0/0 0/0 .sdata2 @4820 */ -SECTION_SDATA2 static f32 lit_4820 = 7.0f; /* 801DC7AC-801DC7FC 1D70EC 0050+00 1/1 2/2 0/0 .text getAlphaRatio__19dMenu_ItemExplain_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::getAlphaRatio() { - nofralloc -#include "asm/d/menu/d_menu_item_explain/getAlphaRatio__19dMenu_ItemExplain_cFv.s" +f32 dMenu_ItemExplain_c::getAlphaRatio() { + switch (mStatus) { + case 1: + case 5: + return (201.0f - mAlphaRatio) / 7.0f; + case 0: + return 1.0f; + default: + return 0.0f; + } } -#pragma pop /* 801DC7FC-801DCB54 1D713C 0358+00 1/1 0/0 0/0 .text setNumber__19dMenu_ItemExplain_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::setNumber() { - nofralloc -#include "asm/d/menu/d_menu_item_explain/setNumber__19dMenu_ItemExplain_cFv.s" +void dMenu_ItemExplain_c::setNumber() { + u8 temp = field_0xdf; + if (temp == 0) { + for (int i = 0; i < 3; i++) { + mpItemNumTex[i]->hide(); + } + } else { + s32 temp2 = field_0xde; + for (int i = 0; i < 3; i++) { + mpItemNumTex[i]->show(); + } + if (temp2 > 100) { + temp2 = 100; + } + JUtility::TColor colorBlack; + JUtility::TColor colorWhite; + if (temp2 == temp) { + colorBlack.set(30, 30, 30, 0); + colorWhite.set(0xff, 200, 50, 0xff); + } else if (temp2 == 0) { + colorBlack.set(30, 30, 30, 0); + colorWhite.set(180, 180, 180, 0xff); + } else { + colorBlack.set(0, 0, 0, 0); + colorWhite.set(0xff, 0xff, 0xff, 0xff); + } + for (int i = 0; i < 3; i++) { + mpItemNumTex[i]->setBlackWhite(colorBlack, colorWhite); + } + if (temp2 < 100) { + ResTIMG* texture = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( + 'TIMG', dMeter2Info_getNumberTextureName(temp2 / 10)); + mpItemNumTex[0]->changeTexture(texture, 0); + texture = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( + 'TIMG', dMeter2Info_getNumberTextureName(temp2 % 10)); + mpItemNumTex[1]->changeTexture(texture, 0); + mpItemNumTex[2]->hide(); + } else { + ResTIMG* texture = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( + 'TIMG', dMeter2Info_getNumberTextureName(temp2 / 100)); + mpItemNumTex[0]->changeTexture(texture, 0); + temp2 = (u8)(temp2 % 100); + texture = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( + 'TIMG', dMeter2Info_getNumberTextureName(temp2 / 10)); + mpItemNumTex[1]->changeTexture(texture, 0); + texture = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( + 'TIMG', dMeter2Info_getNumberTextureName(temp2 % 10)); + mpItemNumTex[2]->changeTexture(texture, 0); + } + } } -#pragma pop /* 801DCB54-801DCBBC 1D7494 0068+00 2/2 0/0 0/0 .text getWarpMarkFlag__19dMenu_ItemExplain_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::getWarpMarkFlag() { - nofralloc -#include "asm/d/menu/d_menu_item_explain/getWarpMarkFlag__19dMenu_ItemExplain_cFv.s" +bool dMenu_ItemExplain_c::getWarpMarkFlag() { + if (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1) { + return dComIfGs_getWarpMarkFlag(); + } + return dComIfGs_getLastWarpAcceptStage() < 0 ? 0 : 1; } -#pragma pop - -/* ############################################################################################## */ -/* 804542D4-804542D8 0028D4 0004+00 1/1 0/0 0/0 .sdata2 @4948 */ -SECTION_SDATA2 static f32 lit_4948 = 100.0f; - -/* 804542D8-804542E0 0028D8 0008+00 1/1 0/0 0/0 .sdata2 @4950 */ -SECTION_SDATA2 static f64 lit_4950 = 4503599627370496.0 /* cast u32 to float */; /* 801DCBBC-801DCC8C 1D74FC 00D0+00 2/2 0/0 0/0 .text setScale__19dMenu_ItemExplain_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_ItemExplain_c::setScale() { - nofralloc -#include "asm/d/menu/d_menu_item_explain/setScale__19dMenu_ItemExplain_cFv.s" -} -#pragma pop - -/* 801DCC8C-801DCDC0 1D75CC 0134+00 0/0 1/0 0/0 .text __sinit_d_menu_item_explain_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_menu_item_explain_cpp() { - nofralloc -#include "asm/d/menu/d_menu_item_explain/__sinit_d_menu_item_explain_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x801DCC8C, __sinit_d_menu_item_explain_cpp); -#pragma pop - -/* 80396990-80396990 022FF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +void dMenu_ItemExplain_c::setScale() { + if (field_0xe1 != 0xff) { + f32 scale = + g_drawHIO.mItemScaleAdjustON == true ? g_drawHIO.mItemScalePercent / 100.0f : 1.0f; + f32 w = mpExpItemTex[0]->width / 48.0f * scale; + f32 h = mpExpItemTex[0]->height / 48.0f * scale; + mpInfoIcon->scale(w, h); + } +} \ No newline at end of file diff --git a/src/d/menu/d_menu_ring.cpp b/src/d/menu/d_menu_ring.cpp index dc3744f8f48..7e4f9e8b024 100644 --- a/src/d/menu/d_menu_ring.cpp +++ b/src/d/menu/d_menu_ring.cpp @@ -1,77 +1,31 @@ -// -// Generated By: dol2asm -// Translation Unit: d/menu/d_menu_ring -// +/** + * d_menu_ring.cpp + * Menu - Item Wheel + */ #include "d/menu/d_menu_ring.h" +#include "JSystem/J2DGraph/J2DOrthoGraph.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "MSL_C/string.h" +#include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_alink.h" +#include "d/d_item_data.h" +#include "d/d_kantera_icon_meter.h" +#include "d/d_lib.h" +#include "d/d_select_cursor.h" +#include "d/menu/d_menu_item_explain.h" +#include "d/menu/d_menu_window.h" +#include "d/meter/d_meter2.h" +#include "d/meter/d_meter2_draw.h" +#include "d/meter/d_meter2_info.h" +#include "d/meter/d_meter_HIO.h" +#include "d/msg/d_msg_string.h" +#include "d/pane/d_pane_class.h" #include "dol2asm.h" - -// -// Types: -// - -struct mDoCPd_c { - static u8 m_cpadInfo[256]; -}; - -struct dSv_player_status_a_c { - /* 80032A5C */ void getSelectItemIndex(int) const; -}; - -struct dSv_player_item_record_c { - /* 80033F7C */ void getBombNum(u8) const; - /* 80034030 */ void getBottleNum(u8) const; -}; - -struct dSv_player_item_max_c { - /* 800340F8 */ void getBombNum(u8) const; -}; - -struct dSv_player_item_c { - /* 80033030 */ void getItem(int, bool) const; - /* 80033354 */ void getLineUpItem(int) const; -}; - -struct dMsgString_c { - /* 80249C20 */ dMsgString_c(); - /* 80249D28 */ ~dMsgString_c(); -}; - -struct dMeter2Info_c { - /* 8021CA04 */ void warpInProc(); - /* 8021CF08 */ void readItemTexture(u8, void*, J2DPicture*, void*, J2DPicture*, void*, - J2DPicture*, void*, J2DPicture*, int); - /* 8021D36C */ void setItemColor(u8, J2DPicture*, J2DPicture*, J2DPicture*, J2DPicture*); -}; - -struct dMeter2Draw_c { - /* 802140DC */ void drawPikari(f32, f32, f32*, f32, JUtility::TColor, JUtility::TColor, - JUtility::TColor, JUtility::TColor, f32, u8); -}; - -struct J2DOrthoGraph {}; - -struct dMenu_ItemExplain_c { - /* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool); - /* 801DB470 */ void move(); - /* 801DB514 */ void draw(J2DOrthoGraph*); - /* 801DC340 */ void openExplain(u8, u8, u8, bool); - /* 801DC738 */ void openExplainTx(u32, u32); - /* 801DC7AC */ void getAlphaRatio(); -}; - -struct dKantera_icon_c { - /* 801AE938 */ dKantera_icon_c(); - /* 801AEB7C */ void setAlphaRate(f32); - /* 801AEBA0 */ void setPos(f32, f32); - /* 801AEBF4 */ void setScale(f32, f32); - /* 801AEC44 */ void setNowGauge(u16, u16); -}; - -struct dItem_data { - static void* item_resource[1530]; -}; +#include "m_Do/m_Do_controller_pad.h" +#include "m_Do/m_Do_graphic.h" // // Forward References: @@ -236,9 +190,6 @@ extern "C" void _restgpr_29(); extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" void* item_resource__10dItem_data[1530]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_ringHIO[344]; -extern "C" extern u8 g_meter2_info[248]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -246,112 +197,81 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // Declarations: // -/* ############################################################################################## */ /* 80397738-80397760 023D98 0028+00 1/1 0/0 0/0 .rodata xy_text$4015 */ -SECTION_RODATA static u8 const xy_text[40] = { - 0x00, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x78, 0x74, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, - 0x73, 0x31, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x32, 0x79, 0x78, 0x5F, 0x74, - 0x65, 0x5F, 0x73, 0x33, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x34, +static const u64 xy_text[5] = { + 'yx_text', 'yx_te_s1', 'yx_te_s2', 'yx_te_s3', 'yx_te_s4', }; -COMPILER_STRIP_GATE(0x80397738, &xy_text); /* 80397760-80397788 023DC0 0028+00 0/1 0/0 0/0 .rodata fxy_text$4016 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const fxy_text[40] = { - 0x00, 0x66, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x78, 0x66, 0x79, 0x78, 0x5F, 0x74, 0x65, - 0x5F, 0x31, 0x66, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, 0x32, 0x66, 0x79, 0x78, 0x5F, - 0x74, 0x65, 0x5F, 0x33, 0x66, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, 0x34, +static const u64 fxy_text[5] = { + 'fyx_tex', 'fyx_te_1', 'fyx_te_2', 'fyx_te_3', 'fyx_te_4', }; -COMPILER_STRIP_GATE(0x80397760, &fxy_text); #pragma pop /* 80397788-803977B0 023DE8 0028+00 0/1 0/0 0/0 .rodata c_text$4022 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const c_text[40] = { - 0x00, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x74, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x5F, - 0x73, 0x31, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x32, 0x00, 0x63, 0x5F, 0x74, - 0x65, 0x5F, 0x73, 0x33, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x34, +static const u64 c_text[5] = { + 'c_text', 'c_te_s1', 'c_te_s2', 'c_te_s3', 'c_te_s4', }; -COMPILER_STRIP_GATE(0x80397788, &c_text); #pragma pop /* 803977B0-803977D8 023E10 0028+00 0/1 0/0 0/0 .rodata fc_text$4023 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const fc_text[40] = { - 0x00, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x74, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x5F, - 0x73, 0x31, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x32, 0x66, 0x63, 0x5F, 0x74, - 0x65, 0x5F, 0x73, 0x33, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x34, +static const u64 fc_text[5] = { + 'fc_text', 'fc_te_s1', 'fc_te_s2', 'fc_te_s3', 'fc_te_s4', }; -COMPILER_STRIP_GATE(0x803977B0, &fc_text); #pragma pop /* 803977D8-80397800 023E38 0028+00 0/1 0/0 0/0 .rodata c_text1$4029 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const c_text1[40] = { - 0x00, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x74, 0x31, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x78, - 0x73, 0x31, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x73, 0x32, 0x00, 0x63, 0x5F, 0x74, - 0x65, 0x78, 0x73, 0x33, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x73, 0x34, +static const u64 c_text1[5] = { + 'c_text1', 'c_texs1', 'c_texs2', 'c_texs3', 'c_texs4', }; -COMPILER_STRIP_GATE(0x803977D8, &c_text1); #pragma pop /* 80397800-80397828 023E60 0028+00 0/1 0/0 0/0 .rodata fc_text1$4030 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const fc_text1[40] = { - 0x66, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x74, 0x31, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x78, - 0x73, 0x31, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x73, 0x32, 0x66, 0x63, 0x5F, 0x74, - 0x65, 0x78, 0x73, 0x33, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x73, 0x34, +static const u64 fc_text1[5] = { + 'fc_text1', 'fc_texs1', 'fc_texs2', 'fc_texs3', 'fc_texs4', }; -COMPILER_STRIP_GATE(0x80397800, &fc_text1); #pragma pop /* 80397828-80397850 023E88 0028+00 0/1 0/0 0/0 .rodata t_on$4036 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const t_on[40] = { - 0x00, 0x67, 0x72, 0x5F, 0x74, 0x5F, 0x6F, 0x6E, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, - 0x73, 0x35, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x36, 0x67, 0x5F, 0x74, 0x6F, - 0x66, 0x5F, 0x73, 0x37, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x38, +static const u64 t_on[5] = { + 'gr_t_on', 'g_tof_s5', 'g_tof_s6', 'g_tof_s7', 'g_tof_s8', }; -COMPILER_STRIP_GATE(0x80397828, &t_on); #pragma pop /* 80397850-80397878 023EB0 0028+00 0/1 0/0 0/0 .rodata ft_on$4037 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const ft_on[40] = { - 0x00, 0x66, 0x72, 0x5F, 0x74, 0x5F, 0x6F, 0x6E, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, - 0x73, 0x35, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x36, 0x66, 0x5F, 0x74, 0x6F, - 0x66, 0x5F, 0x73, 0x37, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x38, +static const u64 ft_on[5] = { + 'fr_t_on', 'f_tof_s5', 'f_tof_s6', 'f_tof_s7', 'f_tof_s8', }; -COMPILER_STRIP_GATE(0x80397850, &ft_on); #pragma pop /* 80397878-803978A0 023ED8 0028+00 0/1 0/0 0/0 .rodata t_off$4043 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const t_off[40] = { - 0x00, 0x67, 0x72, 0x5F, 0x74, 0x5F, 0x6F, 0x66, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, - 0x73, 0x31, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x32, 0x67, 0x5F, 0x74, 0x6F, - 0x66, 0x5F, 0x73, 0x33, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x34, +static const u64 t_off[5] = { + 'gr_t_of', 'g_tof_s1', 'g_tof_s2', 'g_tof_s3', 'g_tof_s4', }; -COMPILER_STRIP_GATE(0x80397878, &t_off); #pragma pop /* 803978A0-803978C8 023F00 0028+00 0/1 0/0 0/0 .rodata ft_off$4044 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const ft_off[40] = { - 0x00, 0x66, 0x72, 0x5F, 0x74, 0x5F, 0x6F, 0x66, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, - 0x73, 0x31, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x32, 0x66, 0x5F, 0x74, 0x6F, - 0x66, 0x5F, 0x73, 0x33, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x34, +static const u64 ft_off[5] = { + 'fr_t_of', 'f_tof_s1', 'f_tof_s2', 'f_tof_s3', 'f_tof_s4', }; -COMPILER_STRIP_GATE(0x803978A0, &ft_off); #pragma pop /* 803978C8-803978C8 023F28 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -369,10 +289,27 @@ SECTION_DEAD static char const* const pad_8039795A = "\0\0\0\0\0"; #pragma pop /* 803BDE70-803BDE7C 01AF90 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +#ifdef NONMATCHING +typedef void (dMenu_Ring_c::*initFunc)(); +static initFunc stick_init[] = { + &dMenu_Ring_c::stick_wait_init, + &dMenu_Ring_c::stick_move_init, + &dMenu_Ring_c::stick_explain_init, + &dMenu_Ring_c::stick_explain_force_init, +}; + +typedef void (dMenu_Ring_c::*procFunc)(); +static procFunc stick_proc[] = { + &dMenu_Ring_c::stick_wait_proc, + &dMenu_Ring_c::stick_move_proc, + &dMenu_Ring_c::stick_explain_proc, + &dMenu_Ring_c::stick_explain_force_proc, +}; +#else /* 803BDE7C-803BDE88 -00001 000C+00 0/1 0/0 0/0 .data @3862 */ #pragma push #pragma force_active on @@ -466,6 +403,7 @@ SECTION_DATA static u8 stick_proc[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +#endif /* 803BDF3C-803BDF5C -00001 0020+00 1/1 0/0 0/0 .data @4795 */ SECTION_DATA static void* lit_4795[8] = { @@ -538,6 +476,329 @@ SECTION_SDATA2 static f64 lit_4312 = 4503599627370496.0 /* cast u32 to float */; /* 801E9118-801EA708 1E3A58 15F0+00 0/0 1/1 0/0 .text * __ct__12dMenu_Ring_cFP10JKRExpHeapP9STControlP10CSTControlUc */ +#ifdef NONMATCHING +// clrlwi instruction instead of mr +dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i_cstick, + u8 param_3) { + mpHeap = i_heap; + mpStick = i_stick; + mpCStick = i_cstick; + field_0x6bc = param_3; + dMeter2Info_setItemExplainWindowStatus(0); + mpHeap->getTotalFreeSize(); + field_0x570 = 0.0f; + if (field_0x6bc == 0) { + field_0x568 = 0.0f; + field_0x56c = 448.0f; + } else if (field_0x6bc == 2) { + field_0x568 = 0.0f; + field_0x56c = -448.0f; + } + if (field_0x6bc == 3) { + field_0x568 = 608.0f; + field_0x56c = 0.0f; + } else if (field_0x6bc == 1) { + field_0x568 = -608.0f; + field_0x56c = 0.0f; + } else { + field_0x568 = 0.0f; + field_0x56c = 0.0f; + } + field_0x58c = 0.0f; + field_0x590 = 0.0f; + field_0x594 = 1.0f; + for (int i = 0; i < 10; i++) { + field_0x598[i] = 0.0f; + field_0x5c0[i] = 0.0f; + field_0x5e8[i] = 1.0f; + } + field_0x610 = 1.0f; + field_0x614 = 0.0f; + field_0x618 = 0.0f; + field_0x61c = 1.0f; + field_0x620 = 1.0f; + field_0x624 = 1.0f; + field_0x62c = daPy_py_c::i_checkNowWolf(); + field_0x630 = 0; + field_0x63a = 0; + field_0x63c = 0; + field_0x638 = 0; + field_0x6b0 = 0; + field_0x6b1 = 0; + field_0x6b2 = 0; + field_0x672 = 0; + field_0x380.set(0.0f, 0.0f, 0.0f); + setStatus(0); + field_0x6a9 = 0; + field_0x6aa = 0xff; + field_0x6ab = 0xff; + field_0x6ac = 0xff; + field_0x6ad = 0xff; + field_0x670 = 0; + field_0x67e = 0; + field_0x6b3 = 0; + field_0x514 = 0.0f; + mDrawFlag = 0; + field_0x6af = 0; + field_0x67c = 4; + field_0x6c5 = 0; + field_0x680 = 0; + field_0x684 = 0; + field_0x6c6 = 0; + field_0x6c4 = 0xff; + field_0x6cc = 0; + field_0x6cb = 0xff; + field_0x6cd = 0xff; + field_0x6ce = 0; + field_0x68e = 0; + field_0x6cf = 0xff; + field_0x6d0 = 0xff; + field_0x6d1 = 0xff; + field_0x6d2 = 0xff; + field_0x6d3 = 0xff; + int i; + for (int i = 0; i < 3; i++) { + field_0x580[i] = 0.0f; + field_0x574[i] = 0.0f; + } + field_0x6c3 = 0xff; + field_0x6c2 = 0; + for (int i = 0; i < 3; i++) { + field_0x374[i] = NULL; + } + for (int i = 0; i < 4; i++) { + field_0x6c7[i] = 0xff; + } + switch (field_0x6bc) { + case 0: + field_0x682 = 0x8000; + break; + case 1: + field_0x682 = 0x4000; + break; + case 2: + field_0x682 = 0; + break; + default: + field_0x682 = 0xc000; + break; + } + for (int i = 0; i < 4; i++) { + field_0x674[i] = 0; + field_0x518[i] = 0.0f; + field_0x528[i] = 0.0f; + field_0x538[i] = 0.0f; + field_0x6b4[i] = 0; + field_0x6b8[i] = 0xff; + mpSelectItemTex[i][0] = NULL; + mpSelectItemTex[i][1] = NULL; + mpSelectItemTex[i][2] = NULL; + field_0x686[i] = 0; + } + for (int i = 0; i < MAX_ITEM_SLOTS; i++) { + field_0x3ec[i] = 0.0f; + field_0x38c[i] = 0.0f; + for (int j = 0; j < 3; j++) { + mpItemTex[i][j] = NULL; + mpItemBuf[i][j] = NULL; + } + field_0x690[i] = 0; + field_0x63e[i] = 0; + field_0x4ac[i] = 0.0f; + field_0x44c[i] = 0.0f; + } + for (int i = 0; i < MAX_ITEM_SLOTS; i++) { + if (dComIfGs_getLineUpItem(i) != 0xff) { + field_0x6af++; + } + } + if (field_0x6af < 1) { + field_0x6ae = 1; + } else { + field_0x6ae = field_0x6af; + } + for (int i = 0; i < MAX_ITEM_SLOTS; i++) { + field_0x690[i] = dComIfGs_getLineUpItem(i); + } + for (int i = 0; i < field_0x6ae; i++) { + field_0x690[i] = dComIfGs_getLineUpItem(i); + if (dComIfGs_getSelectItemIndex(0) == dComIfGs_getLineUpItem(i)) { + field_0x6aa = i; + } + if (dComIfGs_getSelectItemIndex(1) == dComIfGs_getLineUpItem(i)) { + field_0x6ab = i; + } + if (dComIfGs_getSelectItemIndex(2) == dComIfGp_getSubHeapLockFlag(i + 5)) { + field_0x6ac = i; + } + } + field_0x50c = g_ringHIO.mRingRadiusH; + field_0x510 = g_ringHIO.mRingRadiusV; + field_0x66e = 0x8000; + field_0x634 = 0x10000 / field_0x6ae; + for (int i = 0; i < MAX_SELECT_ITEM; i++) { + for (int j = 0; j < 3; j++) { + for (int k = 0; k < SELECT_ITEM_NUM; k++) { + mpSelectItemTexBuf[i][j][k] = (ResTIMG*)mpHeap->alloc(0xC00, 0x20); + } + } + field_0x6be[i] = 0; + if (i == 2) { + setSelectItem(i, 0); + } else { + setSelectItem(i, 0x43); + } + for (int j = 0; j < 3; j++) { + mpSelectItemTex[i][j] = new J2DPicture(mpSelectItemTexBuf[i][field_0x6be[i]][0]); + mpSelectItemTex[i][j]->setBasePosition(J2DBasePosition_4); + } + field_0x548[i] = 0.0f; + field_0x558[i] = 0.0f; + } + ResTIMG* timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( + 'TIMG', dMeter2Info_getNumberTextureName(0)); + for (int i = 0; i < 3; i++) { + mpItemNumTex[i] = new J2DPicture(timg); + } + mpKanteraMeter = new dKantera_icon_c(); + mpScreen = new J2DScreen(); + dPaneClass_setPriority(&field_0x374[0], mpHeap, mpScreen, + "SCRN/zelda_item_select_icon_message_ver2.blo", 0x20000, + dComIfGp_getRingResArchive()); + dPaneClass_showNullPane(mpScreen); + mpMessageParent = new CPaneMgrAlpha(mpScreen, 'n_all', 2, NULL); + mpTextParent[0] = new CPaneMgr(mpScreen, 'r_n', 0, NULL); + mpTextParent[1] = new CPaneMgr(mpScreen, 'c_n', 2, NULL); + mpTextParent[1]->setAlphaRate(1.0f); + mpTextParent[2] = NULL; + mpTextParent[3] = new CPaneMgr(mpScreen, 'c_sen_n', 2, NULL); + mpTextParent[4] = new CPaneMgr(mpScreen, 'gr_n', 2, NULL); + mpTextParent[4]->hide(); + for (int i = 5; i < 10; i++) { + mpTextParent[i] = NULL; + } + for (int i = 0; i < field_0x6af; i++) { + for (int j = 0; j < 3; j++) { + mpItemBuf[i][j] = (ResTIMG*)mpHeap->alloc(0xC00, 0x20); + } + u8 item = dComIfGs_getItem(field_0x690[i], false); + if (item != 0xff) { + if (item == 0x53) { + item = 0x43; + } + s32 i_textureNum = + dMeter2Info_readItemTexture(item, mpItemBuf[i][0], NULL, mpItemBuf[i][1], NULL, + mpItemBuf[i][2], NULL, NULL, NULL, -1); + for (int k = 0; k < i_textureNum; k++) { + mpItemTex[i][k] = new J2DPicture(mpItemBuf[i][k]); + mpItemTex[i][k]->setBasePosition(J2DBasePosition_4); + } + dMeter2Info_setItemColor(i_textureNum, mpItemTex[i][0], mpItemTex[i][1], + mpItemTex[i][2], NULL); + u8 texScale = dItem_data::getTexScale(item); + f32 fVar1 = (texScale / 100.0f); + f32 fVar2 = (mpItemBuf[i][0]->width / 48.0f); + fVar1 = fVar2 * fVar1; + field_0x44c[i] = fVar1; + field_0x4ac[i] = (mpItemBuf[i][0]->height / 48.0f * (texScale / 100.0f)); + } + } + mpScreen->search('r_btn_n')->hide(); + if (field_0x62c != 0) { + mpScreen->search('yx_te_s1')->hide(); + mpScreen->search('yx_te_s2')->hide(); + mpScreen->search('yx_te_s3')->hide(); + mpScreen->search('yx_te_s4')->hide(); + mpScreen->search('yx_text')->hide(); + mpScreen->search('fyx_te_1')->hide(); + mpScreen->search('fyx_te_2')->hide(); + mpScreen->search('fyx_te_3')->hide(); + mpScreen->search('fyx_te_4')->hide(); + mpScreen->search('fyx_tex')->hide(); + mpScreen->search('x_btn_n')->hide(); + mpScreen->search('y_btn_n')->hide(); + } + mpString = new dMsgString_c(); + for (i = 0; i < 5; i++) { + J2DTextBox* fxy_TextBox = (J2DTextBox*)mpScreen->search(fxy_text[i]); + mpScreen->search(xy_text[i])->hide(); + fxy_TextBox->setFont(mDoExt_getMesgFont()); + fxy_TextBox->setString(0x40, ""); + field_0x580[0] = mpString->getString(0x380, fxy_TextBox, NULL, NULL, NULL, 0); + } + for (i = 0; i < 5; i++) { + J2DTextBox* fc_TextBox = (J2DTextBox*)mpScreen->search(fc_text[i]); + mpScreen->search(c_text[i])->hide(); + fc_TextBox->setFont(mDoExt_getMesgFont()); + fc_TextBox->setString(0x40, ""); + field_0x580[1] = mpString->getString(0x37F, fc_TextBox, NULL, NULL, NULL, 0); + } + for (i = 0; i < 5; i++) { + J2DTextBox* fc1_TextBox = (J2DTextBox*)mpScreen->search(fc_text1[i]); + mpScreen->search(c_text1[i])->hide(); + fc1_TextBox->setFont(mDoExt_getMesgFont()); + fc1_TextBox->setString(0x40, ""); + field_0x580[2] = mpString->getString(0x4CD, fc1_TextBox, NULL, NULL, NULL, 0); + } + for (int i = 0; i < 5; i++) { + field_0x1c8[i] = (J2DTextBox*)mpScreen->search(ft_on[i]); + mpScreen->search(t_on[i])->hide(); + field_0x1c8[i]->setString(0x40, ""); + field_0x1c8[i]->setFont(mDoExt_getMesgFont()); + mpString->getString(0x4D2, field_0x1c8[i], NULL, NULL, NULL, 0); + } + for (int i = 0; i < 5; i++) { + field_0x1dc[i] = (J2DTextBox*)mpScreen->search(ft_off[i]); + mpScreen->search(t_off[i])->hide(); + field_0x1dc[i]->setString(0x40, ""); + field_0x1dc[i]->setFont(mDoExt_getMesgFont()); + mpString->getString(0x4D3, field_0x1dc[i], NULL, NULL, NULL, 0); + } + mpHeap->getTotalFreeSize(); + timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); + mpBlackTex = new J2DPicture(timg); + mpBlackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 0xff)); + mpBlackTex->setAlpha(0); + mpSpotScreen = new J2DScreen(); + dPaneClass_setPriority(&field_0x374[1], mpHeap, mpSpotScreen, + "SCRN/zelda_item_select_icon3_spot.blo", 0x20000, + dComIfGp_getRingResArchive()); + dPaneClass_showNullPane(mpSpotScreen); + mpSpotParent = new CPaneMgrAlpha(mpSpotScreen, 'n_all', 2, NULL); + mpCenterScreen = new J2DScreen(); + dPaneClass_setPriority(&field_0x374[2], mpHeap, mpCenterScreen, + "SCRN/zelda_item_select_icon3_center_parts.blo", 0x20000, + dComIfGp_getRingResArchive()); + dPaneClass_showNullPane(mpCenterScreen); + mpCenterParent = new CPaneMgrAlpha(mpCenterScreen, 'center_n', 2, NULL); + mpNameParent = new CPaneMgr(mpCenterScreen, 'label_n', 1, NULL); + mpCircle = new CPaneMgr(mpCenterScreen, 'circle_n', 2, NULL); + J2DTextBox* textBox[4]; + textBox[0] = (J2DTextBox*)mpCenterScreen->search('fitem_n1'); + textBox[1] = (J2DTextBox*)mpCenterScreen->search('fitem_n2'); + textBox[2] = (J2DTextBox*)mpCenterScreen->search('fitem_n3'); + textBox[3] = (J2DTextBox*)mpCenterScreen->search('fitem_n4'); + mpCenterScreen->search('item_n04'); + mpCenterScreen->search('item_n05'); + mpCenterScreen->search('item_n06'); + mpCenterScreen->search('item_n07'); + for (int i = 0; i < 4; i++) { + textBox[i]->setFont(mDoExt_getMesgFont()); + textBox[i]->setString(0x40, ""); + } + textCentering(); + mpDrawCursor = new dSelect_cursor_c(2, g_ringHIO.mCursorScale, dComIfGp_getMain2DArchive()); + mpDrawCursor->setAlphaRate(1.0f); + mpItemExplain = new dMenu_ItemExplain_c(mpHeap, dComIfGp_getRingResArchive(), i_stick, true); + setRotate(); + mpDrawCursor->setPos(field_0x38c[0] + field_0x568, field_0x3ec[0] + field_0x56c); + if (dComIfGs_getItem(field_0x690[0], false) != 0xff) { + mpDrawCursor->setParam(field_0x44c[0], field_0x4ac[0], 0.1f, 0.6f, 0.5f); + } else { + mpDrawCursor->setParam(1.0f, 1.0f, 0.1f, 0.6f, 0.5f); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -547,16 +808,103 @@ asm dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* param_0, STControl* param_1, CSTContr #include "asm/d/menu/d_menu_ring/__ct__12dMenu_Ring_cFP10JKRExpHeapP9STControlP10CSTControlUc.s" } #pragma pop +#endif /* 801EA708-801EAB7C 1E5048 0474+00 1/0 0/0 0/0 .text __dt__12dMenu_Ring_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMenu_Ring_c::~dMenu_Ring_c() { - nofralloc -#include "asm/d/menu/d_menu_ring/__dt__12dMenu_Ring_cFv.s" +dMenu_Ring_c::~dMenu_Ring_c() { + mpHeap->getTotalFreeSize(); + dMeter2Info_setItemExplainWindowStatus(0); + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 3; j++) { + for (int k = 0; k < 2; k++) { + mpHeap->free(mpSelectItemTexBuf[i][j][k]); + mpSelectItemTexBuf[i][j][k] = NULL; + } + if (mpSelectItemTex[i][j] != NULL) { + delete mpSelectItemTex[i][j]; + mpSelectItemTex[i][j] = NULL; + } + } + } + + for (int i = 0; i < 3; i++) { + if (mpItemNumTex[i] != NULL) { + delete mpItemNumTex[i]; + mpItemNumTex[i] = NULL; + } + } + + delete mpKanteraMeter; + mpKanteraMeter = NULL; + + delete mpScreen; + mpScreen = NULL; + + delete mpMessageParent; + mpMessageParent = NULL; + + for (int i = 0; i < 10; i++) { + if (mpTextParent[i] != NULL) { + delete mpTextParent[i]; + mpTextParent[i] = NULL; + } + } + + for (int i = 0; i < MAX_ITEM_SLOTS; i++) { + for (int j = 0; j < 3; j++) { + if (mpItemTex[i][j] != NULL) { + delete mpItemTex[i][j]; + mpItemTex[i][j] = NULL; + } + + if (mpItemBuf[i][j] != NULL) { + mpHeap->free(mpItemBuf[i][j]); + mpItemBuf[i][j] = NULL; + } + } + } + + delete mpString; + mpString = NULL; + + mpHeap->getTotalFreeSize(); + + delete mpBlackTex; + mpBlackTex = NULL; + + delete mpSpotScreen; + mpSpotScreen = NULL; + + delete mpSpotParent; + mpSpotParent = NULL; + + delete mpCenterScreen; + mpCenterScreen = NULL; + + for (int i = 0; i < 3; i++) { + if (field_0x374[i] != NULL) { + mpHeap->free(field_0x374[i]); + field_0x374[i] = NULL; + } + } + + delete mpCenterParent; + mpCenterParent = NULL; + + delete mpNameParent; + mpNameParent = NULL; + + delete mpCircle; + mpCircle = NULL; + + delete mpDrawCursor; + mpDrawCursor = NULL; + + delete mpItemExplain; + mpItemExplain = NULL; + + dComIfGp_getRingResArchive()->removeResourceAll(); } -#pragma pop /* ############################################################################################## */ /* 804543C0-804543C8 0029C0 0004+04 8/8 0/0 0/0 .sdata2 @4465 */ @@ -567,6 +915,13 @@ SECTION_SDATA2 static f32 lit_4465[1 + 1 /* padding */] = { }; /* 801EAB7C-801EABE8 1E54BC 006C+00 0/0 1/1 0/0 .text _create__12dMenu_Ring_cFv */ +#ifdef NONMATCHING +// Matches with sinit and literals +void dMenu_Ring_c::_create() { + (this->*stick_init[field_0x6b0])(); + Z2GetAudioMgr()->seStart(Z2SE_ITEM_RING_IN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -575,6 +930,7 @@ asm void dMenu_Ring_c::_create() { #include "asm/d/menu/d_menu_ring/_create__12dMenu_Ring_cFv.s" } #pragma pop +#endif /* 801EABE8-801EABEC 1E5528 0004+00 0/0 1/1 0/0 .text _delete__12dMenu_Ring_cFv */ void dMenu_Ring_c::_delete() { @@ -582,6 +938,26 @@ void dMenu_Ring_c::_delete() { } /* 801EABEC-801EACC8 1E552C 00DC+00 0/0 1/1 0/0 .text _move__12dMenu_Ring_cFv */ +#ifdef NONMATCHING +// Matches with sinit +void dMenu_Ring_c::_move() { + field_0x50c = g_ringHIO.mRingRadiusH; + field_0x510 = g_ringHIO.mRingRadiusV; + field_0x6b1 = field_0x6b0; + mpItemExplain->move(); + (this->*stick_proc[field_0x6b0])(); + if (field_0x6b0 != field_0x6b1) { + (this->*stick_init[field_0x6b0])(); + } + setScale(); + setActiveCursor(); + setMixMessage(); + if (field_0x610 != g_ringHIO.mCursorScale) { + field_0x610 = g_ringHIO.mCursorScale; + mpDrawCursor->setScale(g_ringHIO.mCursorScale); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -590,8 +966,72 @@ asm void dMenu_Ring_c::_move() { #include "asm/d/menu/d_menu_ring/_move__12dMenu_Ring_cFv.s" } #pragma pop +#endif /* 801EACC8-801EB080 1E5608 03B8+00 1/1 0/0 0/0 .text _draw__12dMenu_Ring_cFv */ +#ifdef NONMATCHING +// Matches with literals +void dMenu_Ring_c::_draw() { + J2DGrafContext* grafPort = dComIfGp_getCurrentGrafPort(); + grafPort->setup2D(); + if (mDrawFlag == 0) { + mpSpotParent->setAlphaRate(field_0x514 * g_ringHIO.mOverlayAlpha); + mpSpotScreen->draw(0.0f, 0.0f, grafPort); + if (field_0x594 != g_ringHIO.mItemNameScale) { + field_0x594 = g_ringHIO.mItemNameScale; + mpNameParent->scale(field_0x594, field_0x594); + } + if (field_0x58c != g_ringHIO.mItemNamePosX || field_0x590 != g_ringHIO.mItemNamePosY) { + field_0x58c = g_ringHIO.mItemNamePosX; + field_0x590 = g_ringHIO.mItemNamePosY; + mpNameParent->paneTrans(field_0x58c, field_0x590); + } + if (field_0x614 != g_ringHIO.mRingPosX || field_0x618 != g_ringHIO.mRingPosY) { + field_0x614 = g_ringHIO.mRingPosX; + field_0x618 = g_ringHIO.mRingPosY; + mpCircle->paneTrans(field_0x614, field_0x618); + } + if (field_0x61c != g_ringHIO.mRingScaleH || field_0x620 != g_ringHIO.mRingScaleV) { + field_0x61c = g_ringHIO.mRingScaleH; + field_0x620 = g_ringHIO.mRingScaleV; + mpCircle->scale(field_0x61c, field_0x620); + } + f32 ringAlpha = field_0x62c != 0 ? g_ringHIO.mRingAlpha_Wolf : g_ringHIO.mRingAlpha; + if (field_0x624 != ringAlpha) { + field_0x624 = ringAlpha; + mpCircle->setAlphaRate(field_0x624); + } + mpCenterParent->setAlphaRate(field_0x514); + mpCenterScreen->draw(field_0x568, field_0x56c, grafPort); + drawItem(); + textScaleHIO(); + f32 alphaRate = mpTextParent[1]->getAlphaRate(); + mpMessageParent->setAlphaRate(field_0x514); + if (field_0x6b0 == 2) { + mpTextParent[1]->setAlphaRate(alphaRate * field_0x514); + } + mpScreen->draw(field_0x568, field_0x56c, grafPort); + if (field_0x6b0 != 2 && field_0x570 > 0.0f) { + Vec pos; + CPaneMgr paneMgr; + pos = paneMgr.getGlobalVtxCenter(mpScreen->search('gr_btn'), true, 0); + dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari( + pos.x, pos.y, &field_0x570, g_ringHIO.mHighlightScale, + g_ringHIO.mHighlightFrontOuter, g_ringHIO.mHighlightFrontInner, + g_ringHIO.mHighlightBackOuter, g_ringHIO.mHighlightBackInner, + g_ringHIO.mHighlightAnimSpeed, 2); + } + mDrawFlag = 1; + } else { + drawSelectItem(); + drawItem2(); + mpDrawCursor->draw(); + mpItemExplain->trans(field_0x568, field_0x56c); + mpItemExplain->draw((J2DOrthoGraph*)grafPort); + drawFlag0(); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -600,22 +1040,57 @@ asm void dMenu_Ring_c::_draw() { #include "asm/d/menu/d_menu_ring/_draw__12dMenu_Ring_cFv.s" } #pragma pop +#endif /* 801EB080-801EB0A4 1E59C0 0024+00 2/2 0/0 0/0 .text setKanteraPos__12dMenu_Ring_cFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Ring_c::setKanteraPos(f32 param_0, f32 param_1) { - nofralloc -#include "asm/d/menu/d_menu_ring/setKanteraPos__12dMenu_Ring_cFff.s" +void dMenu_Ring_c::setKanteraPos(f32 i_posX, f32 i_posY) { + mpKanteraMeter->setPos(i_posX, i_posY); } -#pragma pop /* ############################################################################################## */ /* 804543C8-804543D0 0029C8 0008+00 6/6 0/0 0/0 .sdata2 @4596 */ SECTION_SDATA2 static f64 lit_4596 = 4503601774854144.0 /* cast s32 to float */; /* 801EB0A4-801EB2B4 1E59E4 0210+00 0/0 1/1 0/0 .text isOpen__12dMenu_Ring_cFv */ +#ifdef NONMATCHING +// Matches with literals +bool dMenu_Ring_c::isOpen() { + bool opened = 0; + if (field_0x638 == 0) { + dMeter2Info_set2DVibrationM(); + } + field_0x638++; + field_0x514 = (f32)field_0x638 / (f32)g_ringHIO.mOpenFrames; + if (field_0x6bc == 0) { + field_0x568 = 0.0f; + field_0x56c = (1.0f - field_0x514) * -448.0f; + } else if (field_0x6bc == 2) { + field_0x568 = 0.0f; + field_0x56c = (1.0f - field_0x514) * 448.0f; + } else if (field_0x6bc == 3) { + field_0x568 = (1.0f - field_0x514) * -608.0f; + field_0x56c = 0.0f; + } else if (field_0x6bc == 1) { + field_0x568 = (1.0f - field_0x514) * 608.0f; + field_0x56c = 0.0f; + } + if (field_0x638 >= g_ringHIO.mOpenFrames) { + field_0x638 = g_ringHIO.mCloseFrames; + field_0x514 = 1.0f; + field_0x568 = 0.0f; + field_0x56c = 0.0f; + opened = 1; + } + setScale(); + mpDrawCursor->setPos(field_0x38c[0] + field_0x568, field_0x3ec[0] + field_0x56c); + if (dComIfGs_getItem(field_0x690[0], false) != 0xff) { + mpDrawCursor->setParam(field_0x44c[0], field_0x4ac[0], 0.1f, 0.6f, 0.5f); + } else { + mpDrawCursor->setParam(1.0f, 1.0f, 0.1f, 0.6f, 0.5f); + } + return opened; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -624,8 +1099,34 @@ asm bool dMenu_Ring_c::isOpen() { #include "asm/d/menu/d_menu_ring/isOpen__12dMenu_Ring_cFv.s" } #pragma pop +#endif /* 801EB2B4-801EB3CC 1E5BF4 0118+00 0/0 1/1 0/0 .text isMoveEnd__12dMenu_Ring_cFv */ +#ifdef NONMATCHING +// Matches with literals +bool dMenu_Ring_c::isMoveEnd() { + bool ret = 0; + if (field_0x6b0 == 0 && field_0x6b1 != 3 && field_0x6b1 != 2) { + if (dMw_UP_TRIGGER() || dMw_DOWN_TRIGGER() || dMw_B_TRIGGER() || + dMeter2Info_getWarpStatus() == 2 || dMeter2Info_getWarpStatus() == 1 || + dMeter2Info_isTouchKeyCheck(0x4000) != 0) + { + if (dMw_UP_TRIGGER()) { + field_0x6bc = 0; + } else if (dMw_DOWN_TRIGGER()) { + field_0x6bc = 2; + } else { + field_0x6bc = 0xff; + } + Z2GetAudioMgr()->seStart(Z2SE_ITEM_RING_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); + dMeter2Info_set2DVibrationM(); + ret = 1; + } + } + return ret; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -634,8 +1135,50 @@ asm bool dMenu_Ring_c::isMoveEnd() { #include "asm/d/menu/d_menu_ring/isMoveEnd__12dMenu_Ring_cFv.s" } #pragma pop +#endif /* 801EB3CC-801EB624 1E5D0C 0258+00 0/0 1/1 0/0 .text isClose__12dMenu_Ring_cFv */ +#ifdef NONMATCHING +// Matches with literals +bool dMenu_Ring_c::isClose() { + bool closed = 1; + if (field_0x674[0] != 0 || field_0x674[1] != 0 || field_0x674[2] != 0 || field_0x674[3] != 0) { + return 0; + } + field_0x638--; + field_0x514 = (f32)field_0x638 / (f32)g_ringHIO.mCloseFrames; + if (field_0x638 <= 0) { + for (int i = 0; i < 4; i++) { + setSelectItemForce(i); + } + field_0x638 = 0; + field_0x514 = 0.0f; + } else { + closed = 0; + } + if (field_0x6bc == 0) { + field_0x568 = 0.0f; + field_0x56c = (1.0f - field_0x514) * -448.0f; + } else if (field_0x6bc == 2) { + field_0x568 = 0.0f; + field_0x56c = (1.0f - field_0x514) * 448.0f; + } else if (field_0x6bc == 3) { + field_0x568 = (1.0f - field_0x514) * -608.0f; + field_0x56c = 0.0f; + } else if (field_0x6bc == 1) { + field_0x568 = (1.0f - field_0x514) * 608.0f; + field_0x56c = 0.0f; + } + mpDrawCursor->setPos(field_0x38c[mStatus] + field_0x568, field_0x3ec[mStatus] + field_0x56c); + if (dComIfGs_getItem(field_0x690[mStatus], false) != 0xff) { + mpDrawCursor->setParam(field_0x44c[mStatus], field_0x4ac[mStatus], 0.1f, 0.6f, 0.5f); + } else { + mpDrawCursor->setParam(1.0f, 1.0f, 0.1f, 0.6f, 0.5f); + } + + return closed; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -644,6 +1187,7 @@ asm bool dMenu_Ring_c::isClose() { #include "asm/d/menu/d_menu_ring/isClose__12dMenu_Ring_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 804543D0-804543D4 0029D0 0004+00 1/1 0/0 0/0 .sdata2 @4739 */ @@ -653,7 +1197,7 @@ SECTION_SDATA2 static f32 lit_4739 = 0.75f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Ring_c::getStickInfo(STControl* param_0) { +asm u8 dMenu_Ring_c::getStickInfo(STControl* param_0) { nofralloc #include "asm/d/menu/d_menu_ring/getStickInfo__12dMenu_Ring_cFP9STControl.s" } @@ -661,14 +1205,49 @@ asm void dMenu_Ring_c::getStickInfo(STControl* param_0) { /* 801EB8C0-801EB960 1E6200 00A0+00 1/0 0/0 0/0 .text calcStickAngle__12dMenu_Ring_cFP9STControlUc */ +#ifdef NONMATCHING +// Matches with literals (lit_4795) +s16 dMenu_Ring_c::calcStickAngle(STControl* i_stick, u8 param_1) { + s16 directionTrig = i_stick->getAngleStick(); + switch (param_1) { + case 0: + directionTrig += 0x8000; + break; + case 1: + directionTrig -= 0x6000; + break; + case 2: + break; + case 3: + directionTrig -= 0x4000; + break; + case 4: + directionTrig -= 0x2000; + break; + case 5: + directionTrig += 0x2000; + break; + case 6: + directionTrig += 0x4000; + break; + case 7: + directionTrig += 0x6000; + break; + default: + directionTrig += 0x4000; + } + return directionTrig; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Ring_c::calcStickAngle(STControl* param_0, u8 param_1) { +asm s16 dMenu_Ring_c::calcStickAngle(STControl* param_0, u8 param_1) { nofralloc #include "asm/d/menu/d_menu_ring/calcStickAngle__12dMenu_Ring_cFP9STControlUc.s" } #pragma pop +#endif /* ############################################################################################## */ /* 804543D4-804543D8 0029D4 0004+00 2/2 0/0 0/0 .sdata2 @4810 */ @@ -678,6 +1257,17 @@ SECTION_SDATA2 static f32 lit_4810 = 304.0f; SECTION_SDATA2 static f32 lit_4811 = 224.0f; /* 801EB960-801EBA38 1E62A0 00D8+00 1/1 0/0 0/0 .text setRotate__12dMenu_Ring_cFv */ +#ifdef NONMATCHING +// Matches with literals +void dMenu_Ring_c::setRotate() { + clacEllipsePlotAverage(field_0x6ae, g_ringHIO.mItemRingPosX + 304.0f, + g_ringHIO.mItemRingPosY + 224.0f); + for (int i = 0; i < field_0x6ae; i++) { + field_0x63e[i] = cM_atan2s(field_0x38c[i] - (304.0f + g_ringHIO.mItemRingPosX), + field_0x3ec[i] - (224.0f + g_ringHIO.mItemRingPosY)); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -686,27 +1276,26 @@ asm void dMenu_Ring_c::setRotate() { #include "asm/d/menu/d_menu_ring/setRotate__12dMenu_Ring_cFv.s" } #pragma pop +#endif /* 801EBA38-801EBAB8 1E6378 0080+00 1/1 0/0 0/0 .text setItemScale__12dMenu_Ring_cFif */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Ring_c::setItemScale(int param_0, f32 param_1) { - nofralloc -#include "asm/d/menu/d_menu_ring/setItemScale__12dMenu_Ring_cFif.s" +void dMenu_Ring_c::setItemScale(int i_idx, f32 i_scale) { + for (int i = 0; i < 3; i++) { + if (mpItemTex[i_idx][i] != NULL) { + mpItemTex[i_idx][i]->scale(i_scale, i_scale); + } + } } -#pragma pop /* 801EBAB8-801EBB10 1E63F8 0058+00 2/2 0/0 0/0 .text setButtonScale__12dMenu_Ring_cFif */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Ring_c::setButtonScale(int param_0, f32 param_1) { - nofralloc -#include "asm/d/menu/d_menu_ring/setButtonScale__12dMenu_Ring_cFif.s" +void dMenu_Ring_c::setButtonScale(int i_idx, f32 i_value) { + i_idx += 8; + if (mpTextParent[i_idx] != NULL) { + f32 buttonScale = i_value * field_0x5e8[i_idx]; + mpTextParent[i_idx]->scale(buttonScale, buttonScale); + } } -#pragma pop /* 801EBB10-801EBE58 1E6450 0348+00 1/1 0/0 0/0 .text setItem__12dMenu_Ring_cFv */ #pragma push @@ -739,6 +1328,26 @@ asm void dMenu_Ring_c::setScale() { #pragma pop /* 801EC3B0-801EC504 1E6CF0 0154+00 1/1 0/0 0/0 .text setNameString__12dMenu_Ring_cFUl */ +#ifdef NONMATCHING +// Matches with literals +void dMenu_Ring_c::setNameString(u32 i_stringID) { + J2DTextBox* textBox[4]; + textBox[0] = (J2DTextBox*)mpCenterScreen->search('fitem_n1'); + textBox[1] = (J2DTextBox*)mpCenterScreen->search('fitem_n2'); + textBox[2] = (J2DTextBox*)mpCenterScreen->search('fitem_n3'); + textBox[3] = (J2DTextBox*)mpCenterScreen->search('fitem_n4'); + if (field_0x630 != i_stringID) { + for (int i = 0; i < 4; i++) { + if (i_stringID == 0) { + strcpy(textBox[i]->getStringPtr(), ""); + } else { + mpString->getString(i_stringID, textBox[i], NULL, NULL, NULL, 0); + } + } + field_0x630 = i_stringID; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -747,9 +1356,52 @@ asm void dMenu_Ring_c::setNameString(u32 param_0) { #include "asm/d/menu/d_menu_ring/setNameString__12dMenu_Ring_cFUl.s" } #pragma pop +#endif /* 801EC504-801EC754 1E6E44 0250+00 1/1 0/0 0/0 .text setActiveCursor__12dMenu_Ring_cFv */ +#ifdef NONMATCHING +// Matches with sinit and literals +void dMenu_Ring_c::setActiveCursor() { + u8 item = dComIfGs_getItem(field_0x690[mStatus], false); + if (field_0x6b0 == 0 && field_0x6b1 != 3 && field_0x6b1 != 2 && mpItemExplain->getStatus() == 0) + { + if (mDoCPd_c::getTrigR(PAD_1) && field_0x62c == 0 && item != 0xff) { + for (int i = 0; i < MAX_SELECT_ITEM; i++) { + setSelectItemForce(i); + } + setMixItem(); + } else if (mDoCPd_c::getTrigX(PAD_1) && field_0x62c == 0 && item != 0xff) { + for (int i = 0; i < MAX_SELECT_ITEM; i++) { + setSelectItemForce(i); + } + field_0x6b3 = 0; + if (!checkCombineBomb(field_0x6b3)) { + setItem(); + if (mpItemExplain->getStatus() == 0) { + field_0x6b0 = 0; + (this->*stick_init[field_0x6b0])(); + } + } + } else if (mDoCPd_c::getTrigY(PAD_1) && field_0x62c == 0 && item != 0xff) { + for (int i = 0; i < MAX_SELECT_ITEM; i++) { + setSelectItemForce(i); + } + field_0x6b3 = 1; + if (!checkCombineBomb(field_0x6b3)) { + setItem(); + if (mpItemExplain->getStatus() == 0) { + field_0x6b0 = 0; + (this->*stick_init[field_0x6b0])(); + } + } + } else if (mDoCPd_c::getTrigX(PAD_1) || mDoCPd_c::getTrigY(PAD_1)) { + 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 @@ -758,6 +1410,7 @@ asm void dMenu_Ring_c::setActiveCursor() { #include "asm/d/menu/d_menu_ring/setActiveCursor__12dMenu_Ring_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 804543DC-804543E0 0029DC 0004+00 1/1 0/0 0/0 .sdata2 @5171 */ @@ -811,14 +1464,19 @@ asm void dMenu_Ring_c::drawItem2() { /* 801ED2BC-801ED31C 1E7BFC 0060+00 1/0 0/0 0/0 .text stick_wait_init__12dMenu_Ring_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Ring_c::stick_wait_init() { - nofralloc -#include "asm/d/menu/d_menu_ring/stick_wait_init__12dMenu_Ring_cFv.s" +void dMenu_Ring_c::stick_wait_init() { + if (mDoCPd_c::getHoldL(PAD_1) != 0) { + if (field_0x6ce != 0) { + field_0x672 = g_ringHIO.mDirectSelectWaitFrames; + } else { + field_0x672 = 0; + } + } else { + field_0x672 = g_ringHIO.mCursorChangeWaitFrames; + } + field_0x63a = 0; + field_0x6ce = 0; } -#pragma pop /* 801ED31C-801ED490 1E7C5C 0174+00 1/0 0/0 0/0 .text stick_wait_proc__12dMenu_Ring_cFv */ @@ -833,6 +1491,21 @@ asm void dMenu_Ring_c::stick_wait_proc() { /* 801ED490-801ED53C 1E7DD0 00AC+00 1/0 0/0 0/0 .text stick_move_init__12dMenu_Ring_cFv */ +#ifdef NONMATCHING +// Matches with literals +void dMenu_Ring_c::stick_move_init() { + if (field_0x680 == 0) { + field_0x680 = g_ringHIO.mCursorInitSpeed; + } else if (field_0x680 < g_ringHIO.mCursorMax) { + field_0x680 += g_ringHIO.mCursorAccel; + if (field_0x680 > g_ringHIO.mCursorMax) { + field_0x680 = g_ringHIO.mCursorMax; + } + } + field_0x63a = 0; + Z2GetAudioMgr()->seStart(Z2SE_ITEM_RING_ROLL, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -841,6 +1514,7 @@ asm void dMenu_Ring_c::stick_move_init() { #include "asm/d/menu/d_menu_ring/stick_move_init__12dMenu_Ring_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 804543F4-804543F8 0029F4 0004+00 1/1 0/0 0/0 .sdata2 @5648 */ @@ -884,6 +1558,24 @@ void dMenu_Ring_c::stick_explain_force_init() { SECTION_SDATA2 static f32 lit_5683 = 150.0f; /* 801ED93C-801EDA0C 1E827C 00D0+00 1/0 0/0 0/0 .text stick_explain_proc__12dMenu_Ring_cFv */ +#ifdef NONMATCHING +// Matches with literals +void dMenu_Ring_c::stick_explain_proc() { + mpItemExplain->move(); + if (mpItemExplain->getStatus() == 0) { + if (dMeter2Info_getWarpStatus() == 1) { + dMeter2Info_warpInProc(); + } else if (dMeter2Info_getWarpStatus() == 2) { + dMeter2Info_warpInProc(); + } + dMeter2Info_setItemExplainWindowStatus(0); + field_0x6b0 = 0; + } + f32 alphaRatio = mpItemExplain->getAlphaRatio(); + mpTextParent[1]->setAlphaRate(alphaRatio); + mpBlackTex->setAlpha((1.0f - alphaRatio) * 150.0f); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -892,9 +1584,28 @@ asm void dMenu_Ring_c::stick_explain_proc() { #include "asm/d/menu/d_menu_ring/stick_explain_proc__12dMenu_Ring_cFv.s" } #pragma pop +#endif /* 801EDA0C-801EDB14 1E834C 0108+00 1/0 0/0 0/0 .text stick_explain_force_proc__12dMenu_Ring_cFv */ +#ifdef NONMATCHING +// Matches with literals +void dMenu_Ring_c::stick_explain_force_proc() { + mpItemExplain->move(); + u8 endButton = mpItemExplain->checkEndButton(); + if (endButton == 1) { + setCombineBomb(field_0x6b3); + } else if (endButton == 2) { + u8 itemMaxNum = getItemMaxNum(field_0x690[mStatus]); + u8 itemNum = getItemNum(field_0x690[mStatus]); + mpItemExplain->openExplain(field_0x690[mStatus], itemNum, itemMaxNum, true); + field_0x6b0 = 0; + } + f32 alphaRatio = mpItemExplain->getAlphaRatio(); + mpTextParent[1]->setAlphaRate(alphaRatio); + mpBlackTex->setAlpha((1.0f - alphaRatio) * 150.0f); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -903,6 +1614,7 @@ asm void dMenu_Ring_c::stick_explain_force_proc() { #include "asm/d/menu/d_menu_ring/stick_explain_force_proc__12dMenu_Ring_cFv.s" } #pragma pop +#endif /* 801EDB14-801EDC98 1E8454 0184+00 2/2 0/0 0/0 .text setSelectItem__12dMenu_Ring_cFiUc */ @@ -930,30 +1642,36 @@ asm void dMenu_Ring_c::drawSelectItem() { #pragma pop /* 801EDF2C-801EDFDC 1E886C 00B0+00 4/4 0/0 0/0 .text setSelectItemForce__12dMenu_Ring_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Ring_c::setSelectItemForce(int param_0) { - nofralloc -#include "asm/d/menu/d_menu_ring/setSelectItemForce__12dMenu_Ring_cFi.s" +void dMenu_Ring_c::setSelectItemForce(int param_0) { + if (param_0 == 2) { + if (field_0x674[param_0] != 0) { + dComIfGs_setSelectItemIndex(param_0, field_0x6b4[param_0]); + field_0x674[param_0] = 0; + } + } else if (field_0x674[param_0] != 0) { + for (int i = 0; i < 2; i++) { + dComIfGs_setMixItemIndex(i, field_0x6b8[i]); + dComIfGs_setSelectItemIndex(i, field_0x6b4[i]); + } + field_0x674[param_0] = 0; + } } -#pragma pop /* 801EDFDC-801EE058 1E891C 007C+00 1/1 0/0 0/0 .text getCursorPos__12dMenu_Ring_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Ring_c::getCursorPos(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_ring/getCursorPos__12dMenu_Ring_cFUc.s" +s32 dMenu_Ring_c::getCursorPos(u8 param_0) { + for (s32 i = 0; i < field_0x6ae; i++) { + if (param_0 == dComIfGs_getLineUpItem(i)) { + return i & 0xff; + } + } + return 0xff; } -#pragma pop /* 801EE058-801EE15C 1E8998 0104+00 4/4 0/0 0/0 .text getItemNum__12dMenu_Ring_cFUc */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Ring_c::getItemNum(u8 param_0) { +asm u8 dMenu_Ring_c::getItemNum(u8 param_0) { nofralloc #include "asm/d/menu/d_menu_ring/getItemNum__12dMenu_Ring_cFUc.s" } @@ -963,7 +1681,7 @@ asm void dMenu_Ring_c::getItemNum(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Ring_c::getItemMaxNum(u8 param_0) { +asm u8 dMenu_Ring_c::getItemMaxNum(u8 param_0) { nofralloc #include "asm/d/menu/d_menu_ring/getItemMaxNum__12dMenu_Ring_cFUc.s" } @@ -996,6 +1714,56 @@ void dMenu_Ring_c::setCombineBomb(int param_0) { 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 +void dMenu_Ring_c::drawNumber(int param_0, int param_1, f32 param_2, f32 param_3) { + if (param_0 > 100) { + param_0 = 100; + } + + JUtility::TColor colorBlack; + JUtility::TColor colorWhite; + if (param_0 == param_1) { + colorBlack.set(30, 30, 30, 0); + colorWhite.set(0xff, 200, 50, 0xff); + } else if (param_0 == 0) { + colorBlack.set(30, 30, 30, 0); + colorWhite.set(180, 180, 180, 0xff); + } else { + colorBlack.set(0, 0, 0, 0); + colorWhite.set(0xff, 0xff, 0xff, 0xff); + } + for (int i = 0; i < 3; i++) { + mpItemNumTex[i]->setBlackWhite(colorBlack, colorWhite); + } + if (param_0 < 100) { + ResTIMG* texture = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( + 'TIMG', dMeter2Info_getNumberTextureName(param_0 / 10)); + mpItemNumTex[0]->changeTexture(texture, 0); + texture = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( + 'TIMG', dMeter2Info_getNumberTextureName(param_0 % 10)); + mpItemNumTex[1]->changeTexture(texture, 0); + mpItemNumTex[2]->hide(); + } else { + ResTIMG* texture = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( + 'TIMG', dMeter2Info_getNumberTextureName(param_0 / 100)); + mpItemNumTex[0]->changeTexture(texture, 0); + u8 math = param_0 % 100; + texture = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( + 'TIMG', dMeter2Info_getNumberTextureName(math / 10)); + mpItemNumTex[1]->changeTexture(texture, 0); + texture = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( + 'TIMG', dMeter2Info_getNumberTextureName(math % 10)); + mpItemNumTex[2]->changeTexture(texture, 0); + mpItemNumTex[2]->show(); + } + u8 itemIconAlpha = field_0x62c != 0 ? g_ringHIO.mItemIconAlpha_Wolf : g_ringHIO.mItemIconAlpha; + for (int i = 0; i < 3; i++) { + mpItemNumTex[i]->setAlpha(itemIconAlpha * field_0x514); + mpItemNumTex[i]->draw(param_2 + i * 16.0f, param_3 - 16.0f, 16.0f, 16.0f, 0, 0, 0); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1004,52 +1772,113 @@ asm void dMenu_Ring_c::drawNumber(int param_0, int param_1, f32 param_2, f32 par #include "asm/d/menu/d_menu_ring/drawNumber__12dMenu_Ring_cFiiff.s" } #pragma pop +#endif /* 801EEA84-801EEAE4 1E93C4 0060+00 1/1 0/0 0/0 .text getItem__12dMenu_Ring_cFiUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Ring_c::getItem(int param_0, u8 param_1) { - nofralloc -#include "asm/d/menu/d_menu_ring/getItem__12dMenu_Ring_cFiUc.s" +u8 dMenu_Ring_c::getItem(int i_slot_no, u8 i_slot_no2) { + u8 item = dComIfGs_getItem(i_slot_no, 0); + dComIfGs_getItem(i_slot_no2, 0); + return item; } -#pragma pop /* 801EEAE4-801EEB58 1E9424 0074+00 2/2 0/0 0/0 .text setDoStatus__12dMenu_Ring_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Ring_c::setDoStatus(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_ring/setDoStatus__12dMenu_Ring_cFUc.s" +void dMenu_Ring_c::setDoStatus(u8 param_0) { + if (param_0 == 0 && field_0x6cc == 0x24) { + if (field_0x68e > 0) { + field_0x68e--; + if (field_0x68e == 0) { + field_0x6cc = 0; + } + } else { + field_0x68e = 10; + } + } else { + field_0x6cc = param_0; + field_0x68e = 0; + } + dComIfGp_setDoStatusForce(field_0x6cc, 0); } -#pragma pop /* 801EEB58-801EEC98 1E9498 0140+00 1/1 0/0 0/0 .text isMixItemOn__12dMenu_Ring_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Ring_c::isMixItemOn() { - nofralloc -#include "asm/d/menu/d_menu_ring/isMixItemOn__12dMenu_Ring_cFv.s" +bool dMenu_Ring_c::isMixItemOn() { + if ((!field_0x62c) && (dComIfGs_getItem(field_0x690[mStatus], 0) != 0xff)) { + s32 item = dComIfGs_getItem(field_0x690[mStatus], 0); + switch (item) { + case 0x3E: + case 0x70: + case 0x71: + case 0x72: + if ((dComIfGs_getSelectItemIndex(0) == 4) && (dComIfGs_getMixItemIndex(0) == 0xff) || + (dComIfGs_getMixItemIndex(0) == 4)) + { + return 1; + } + if ((dComIfGs_getSelectItemIndex(1) == 4) && (dComIfGs_getMixItemIndex(1) == 0xff) || + (dComIfGs_getMixItemIndex(1) == 4)) + { + return 1; + } + break; + } + } + return 0; } -#pragma pop /* 801EEC98-801EED84 1E95D8 00EC+00 1/1 0/0 0/0 .text isMixItemOff__12dMenu_Ring_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Ring_c::isMixItemOff() { - nofralloc -#include "asm/d/menu/d_menu_ring/isMixItemOff__12dMenu_Ring_cFv.s" +bool dMenu_Ring_c::isMixItemOff() { + if ((!field_0x62c) && (dComIfGs_getItem(field_0x690[mStatus], 0) != 0xff)) { + if ((dComIfGs_getMixItemIndex(0) == 4) && + (field_0x690[mStatus] == dComIfGs_getSelectItemIndex(0))) + { + return 1; + } + if ((dComIfGs_getMixItemIndex(1) == 4) && + (field_0x690[mStatus] == dComIfGs_getSelectItemIndex(1))) + { + return 1; + } + } + return 0; } -#pragma pop /* ############################################################################################## */ /* 8045441C-80454420 002A1C 0004+00 1/1 0/0 0/0 .sdata2 @6308 */ SECTION_SDATA2 static f32 lit_6308 = 18.0f; /* 801EED84-801EEF14 1E96C4 0190+00 1/1 0/0 0/0 .text setMixMessage__12dMenu_Ring_cFv */ +#ifdef NONMATCHING +// Matches with literals +void dMenu_Ring_c::setMixMessage() { + if (mpTextParent[4] != NULL) { + if (isMixItemOff()) { + for (int i = 0; i < 5; i++) { + field_0x1c8[i]->hide(); + field_0x1dc[i]->show(); + } + if (!mpTextParent[4]->isVisible()) { + field_0x570 = 18.0f - g_ringHIO.mHighlightAnimSpeed; + Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_COMBINE_ICON, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); + } + mpTextParent[4]->show(); + } else if (isMixItemOn()) { + for (int i = 0; i < 5; i++) { + field_0x1c8[i]->show(); + field_0x1dc[i]->hide(); + } + if (!mpTextParent[4]->isVisible()) { + field_0x570 = 18.0f - g_ringHIO.mHighlightAnimSpeed; + Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_COMBINE_ICON, NULL, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); + } + mpTextParent[4]->show(); + } else { + mpTextParent[4]->hide(); + field_0x570 = 0.0f; + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1058,47 +1887,90 @@ asm void dMenu_Ring_c::setMixMessage() { #include "asm/d/menu/d_menu_ring/setMixMessage__12dMenu_Ring_cFv.s" } #pragma pop +#endif /* 801EEF14-801EF11C 1E9854 0208+00 2/2 0/0 0/0 .text textScaleHIO__12dMenu_Ring_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Ring_c::textScaleHIO() { - nofralloc -#include "asm/d/menu/d_menu_ring/textScaleHIO__12dMenu_Ring_cFv.s" +void dMenu_Ring_c::textScaleHIO() { + for (int i = 0; i < 10; i++) { + if (mpTextParent[i] != NULL && i != 2) { + if (field_0x598[i] != g_ringHIO.mGuidePosX[i] || + field_0x5c0[i] != g_ringHIO.mGuidePosY[i]) + { + field_0x598[i] = g_ringHIO.mGuidePosX[i]; + field_0x5c0[i] = g_ringHIO.mGuidePosY[i]; + if (i == 8) { + mpTextParent[i]->paneTrans(field_0x598[i] + field_0x574[0], field_0x5c0[i]); + } else if (i == 9) { + mpTextParent[i]->paneTrans(field_0x598[i] + field_0x574[1], field_0x5c0[i]); + } else { + mpTextParent[i]->paneTrans(field_0x598[i], field_0x5c0[i]); + } + if (mpTextParent[2] != NULL && i == 1) { + mpTextParent[2]->paneTrans(field_0x598[i], field_0x5c0[i]); + } + } + if (field_0x5e8[i] != g_ringHIO.mGuideScale[i]) { + field_0x5e8[i] = g_ringHIO.mGuideScale[i]; + if (i == 8 || i == 9) { + if (field_0x6cf == i - 8) { + setButtonScale(i - 8, g_ringHIO.mSelectButtonScale); + } else { + setButtonScale(i - 8, g_ringHIO.mUnselectButtonScale); + } + } else if (i == 5 || i == 7) { + mpTextParent[i]->scale(field_0x5e8[i], field_0x5e8[i]); + } + if (mpTextParent[2] != NULL && i == 1) { + mpTextParent[2]->scale(field_0x5e8[i], field_0x5e8[i]); + } + if (i < 5 && mpTextParent[i] != NULL) { + mpTextParent[i]->scale(field_0x5e8[i], field_0x5e8[i]); + } + } + } + } } -#pragma pop /* 801EF11C-801EF13C 1E9A5C 0020+00 1/1 0/0 0/0 .text textCentering__12dMenu_Ring_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Ring_c::textCentering() { - nofralloc -#include "asm/d/menu/d_menu_ring/textCentering__12dMenu_Ring_cFv.s" +void dMenu_Ring_c::textCentering() { + textScaleHIO(); } -#pragma pop /* 801EF13C-801EF174 1E9A7C 0038+00 1/1 0/0 0/0 .text clacEllipseFunction__12dMenu_Ring_cFfff */ +#ifdef NONMATCHING +// Matches with literals +f32 dMenu_Ring_c::clacEllipseFunction(f32 param_0, f32 param_1, f32 param_2) { + return -JMAFastSqrt(param_2 * param_2 * (1.0f - (param_0 * param_0) / (param_1 * param_1))); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Ring_c::clacEllipseFunction(f32 param_0, f32 param_1, f32 param_2) { +asm f32 dMenu_Ring_c::clacEllipseFunction(f32 param_0, f32 param_1, f32 param_2) { nofralloc #include "asm/d/menu/d_menu_ring/clacEllipseFunction__12dMenu_Ring_cFfff.s" } #pragma pop +#endif /* 801EF174-801EF1A0 1E9AB4 002C+00 1/1 0/0 0/0 .text calcDistance__12dMenu_Ring_cFffff */ +#ifdef NONMATCHING +// Matches with literals +f32 dMenu_Ring_c::calcDistance(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { + return JMAFastSqrt((param_2 - param_0) * (param_2 - param_0) + + (param_3 - param_1) * (param_3 - param_1)); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Ring_c::calcDistance(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { +asm f32 dMenu_Ring_c::calcDistance(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { nofralloc #include "asm/d/menu/d_menu_ring/calcDistance__12dMenu_Ring_cFffff.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80454420-80454424 002A20 0004+00 1/1 0/0 0/0 .sdata2 @6454 */ @@ -1120,26 +1992,25 @@ bool dMenu_Ring_c::dpdMove() { return false; } -/* ############################################################################################## */ /* 80454424-8045442C 002A24 0008+00 1/1 0/0 0/0 .sdata2 i_nameID$6472 */ -SECTION_SDATA2 static u8 i_nameID[8] = { - 0x00, 0x00, 0x04, 0xDE, 0x00, 0x00, 0x04, 0xE0, -}; +SECTION_SDATA2 static u32 i_nameID[2] = {0x4DE, 0x4E0}; /* 8045442C-80454434 002A2C 0008+00 1/1 0/0 0/0 .sdata2 i_expID$6473 */ -SECTION_SDATA2 static u8 i_expID[8] = { - 0x00, 0x00, 0x04, 0xDF, 0x00, 0x00, 0x04, 0xE1, -}; +SECTION_SDATA2 static u32 i_expID[2] = {0x4DF, 0x4E1}; /* 801EF48C-801EF560 1E9DCC 00D4+00 1/1 0/0 0/0 .text openExplain__12dMenu_Ring_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Ring_c::openExplain(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_ring/openExplain__12dMenu_Ring_cFUc.s" +u8 dMenu_Ring_c::openExplain(u8 param_0) { + if (field_0x6cf == 0xff && field_0x6d0 == 0xff) { + if (param_0 != 0xff) { + return mpItemExplain->openExplain(field_0x690[mStatus], + getItemNum(field_0x690[mStatus]), + getItemMaxNum(field_0x690[mStatus]), false); + } + return 0; + } + u8 idx = field_0x6d0 != 0xff ? field_0x6d0 : field_0x6cf; + return mpItemExplain->openExplainTx(i_nameID[idx], i_expID[idx]); } -#pragma pop /* 801EF560-801EF580 1E9EA0 0020+00 1/0 0/0 0/0 .text draw__12dMenu_Ring_cFv */ #pragma push @@ -1153,11 +2024,12 @@ extern "C" asm void draw__12dMenu_Ring_cFv() { #pragma pop /* 801EF580-801EF654 1E9EC0 00D4+00 0/0 1/0 0/0 .text __sinit_d_menu_ring_cpp */ +#ifdef NONMATCHING +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __sinit_d_menu_ring_cpp() { - nofralloc +asm void __sinit_d_menu_ring_cpp(){nofralloc #include "asm/d/menu/d_menu_ring/__sinit_d_menu_ring_cpp.s" } #pragma pop @@ -1166,6 +2038,7 @@ asm void __sinit_d_menu_ring_cpp() { #pragma force_active on REGISTER_CTORS(0x801EF580, __sinit_d_menu_ring_cpp); #pragma pop +#endif /* ############################################################################################## */ /* 80454434-80454438 -00001 0004+00 0/0 0/0 0/0 .sdata2 None */ @@ -1178,5 +2051,3 @@ SECTION_SDATA2 static u8 pad_80454434[4] = { 0x00, }; #pragma pop - -/* 803978C8-803978C8 023F28 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp index b4816388ee1..1a7e1bbfb51 100644 --- a/src/d/menu/d_menu_window.cpp +++ b/src/d/menu/d_menu_window.cpp @@ -279,8 +279,8 @@ BOOL dMw_UP_TRIGGER() { return (bool)mDoCPd_c::getTrigUp(PAD_1); } -bool dMw_DOWN_TRIGGER() { - return mDoCPd_c::getTrigDown(PAD_1); +BOOL dMw_DOWN_TRIGGER() { + return (bool)mDoCPd_c::getTrigDown(PAD_1); } BOOL dMw_LEFT_TRIGGER() { @@ -299,16 +299,16 @@ BOOL dMw_RIGHT_TRIGGER() { } } -bool dMw_A_TRIGGER() { - return mDoCPd_c::getTrigA(PAD_1); +BOOL dMw_A_TRIGGER() { + return (bool)mDoCPd_c::getTrigA(PAD_1); } BOOL dMw_B_TRIGGER() { return (bool)mDoCPd_c::getTrigB(PAD_1); } -bool dMw_Z_TRIGGER() { - return mDoCPd_c::getTrigZ(PAD_1); +BOOL dMw_Z_TRIGGER() { + return (bool)mDoCPd_c::getTrigZ(PAD_1); } BOOL dMw_START_TRIGGER() { diff --git a/src/d/msg/d_msg_string_base.cpp b/src/d/msg/d_msg_string_base.cpp index cbdfef56ffe..0b3937331aa 100644 --- a/src/d/msg/d_msg_string_base.cpp +++ b/src/d/msg/d_msg_string_base.cpp @@ -187,7 +187,7 @@ void dMsgStringBase_c::drawFontLocal(J2DTextBox* param_0, u8 param_1, f32 param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgStringBase_c::getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2, +asm f32 dMsgStringBase_c::getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2, JUTFont* param_3, COutFont_c* param_4, u8 param_5) { nofralloc #include "asm/d/msg/d_msg_string_base/getString__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc.s"