Work on d_menu_dmap (#2073)

* Move some J2DPicture inlines to header

* Work on d_menu_dmap

* JASBasicInst OK

* JASCalc cleanup
This commit is contained in:
hatal175
2024-02-16 18:22:01 -08:00
committed by GitHub
parent 672990a0b0
commit 8164c34142
36 changed files with 1789 additions and 1133 deletions
@@ -1,20 +0,0 @@
lbl_8029828C:
/* 8029828C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80298290 7C 08 02 A6 */ mflr r0
/* 80298294 90 01 00 14 */ stw r0, 0x14(r1)
/* 80298298 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8029829C 7C 7F 1B 79 */ or. r31, r3, r3
/* 802982A0 41 82 00 1C */ beq lbl_802982BC
/* 802982A4 3C A0 80 3C */ lis r5, __vt__7JASInst@ha /* 0x803C76FC@ha */
/* 802982A8 38 05 76 FC */ addi r0, r5, __vt__7JASInst@l /* 0x803C76FC@l */
/* 802982AC 90 1F 00 00 */ stw r0, 0(r31)
/* 802982B0 7C 80 07 35 */ extsh. r0, r4
/* 802982B4 40 81 00 08 */ ble lbl_802982BC
/* 802982B8 48 03 6A 85 */ bl __dl__FPv
lbl_802982BC:
/* 802982BC 7F E3 FB 78 */ mr r3, r31
/* 802982C0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802982C4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802982C8 7C 08 03 A6 */ mtlr r0
/* 802982CC 38 21 00 10 */ addi r1, r1, 0x10
/* 802982D0 4E 80 00 20 */ blr
@@ -1,36 +0,0 @@
lbl_801B90E0:
/* 801B90E0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B90E4 7C 08 02 A6 */ mflr r0
/* 801B90E8 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B90EC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B90F0 93 C1 00 08 */ stw r30, 8(r1)
/* 801B90F4 7C 7E 1B 78 */ mr r30, r3
/* 801B90F8 80 03 0D 18 */ lwz r0, 0xd18(r3)
/* 801B90FC 28 00 00 00 */ cmplwi r0, 0
/* 801B9100 40 82 00 4C */ bne lbl_801B914C
/* 801B9104 80 7E 0C 9C */ lwz r3, 0xc9c(r30)
/* 801B9108 4B E5 60 C5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B910C 7C 7F 1B 78 */ mr r31, r3
/* 801B9110 38 60 00 E8 */ li r3, 0xe8
/* 801B9114 48 11 5B 39 */ bl __nw__FUl
/* 801B9118 7C 60 1B 79 */ or. r0, r3, r3
/* 801B911C 41 82 00 24 */ beq lbl_801B9140
/* 801B9120 80 9E 0C 9C */ lwz r4, 0xc9c(r30)
/* 801B9124 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 801B9128 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 801B912C 80 A5 5C C0 */ lwz r5, 0x5cc0(r5)
/* 801B9130 80 DE 0C A0 */ lwz r6, 0xca0(r30)
/* 801B9134 38 E0 00 01 */ li r7, 1
/* 801B9138 48 02 16 1D */ bl __ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb
/* 801B913C 7C 60 1B 78 */ mr r0, r3
lbl_801B9140:
/* 801B9140 90 1E 0D 18 */ stw r0, 0xd18(r30)
/* 801B9144 7F E3 FB 78 */ mr r3, r31
/* 801B9148 4B E5 60 85 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
lbl_801B914C:
/* 801B914C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B9150 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B9154 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B9158 7C 08 03 A6 */ mtlr r0
/* 801B915C 38 21 00 10 */ addi r1, r1, 0x10
/* 801B9160 4E 80 00 20 */ blr
@@ -1,33 +0,0 @@
lbl_801B9164:
/* 801B9164 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B9168 7C 08 02 A6 */ mflr r0
/* 801B916C 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B9170 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B9174 93 C1 00 08 */ stw r30, 8(r1)
/* 801B9178 7C 7E 1B 78 */ mr r30, r3
/* 801B917C 80 03 0D 18 */ lwz r0, 0xd18(r3)
/* 801B9180 28 00 00 00 */ cmplwi r0, 0
/* 801B9184 41 82 00 40 */ beq lbl_801B91C4
/* 801B9188 80 7E 0C 9C */ lwz r3, 0xc9c(r30)
/* 801B918C 4B E5 60 41 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B9190 7C 7F 1B 78 */ mr r31, r3
/* 801B9194 80 7E 0D 18 */ lwz r3, 0xd18(r30)
/* 801B9198 28 03 00 00 */ cmplwi r3, 0
/* 801B919C 41 82 00 18 */ beq lbl_801B91B4
/* 801B91A0 38 80 00 01 */ li r4, 1
/* 801B91A4 81 83 00 00 */ lwz r12, 0(r3)
/* 801B91A8 81 8C 00 08 */ lwz r12, 8(r12)
/* 801B91AC 7D 89 03 A6 */ mtctr r12
/* 801B91B0 4E 80 04 21 */ bctrl
lbl_801B91B4:
/* 801B91B4 38 00 00 00 */ li r0, 0
/* 801B91B8 90 1E 0D 18 */ stw r0, 0xd18(r30)
/* 801B91BC 7F E3 FB 78 */ mr r3, r31
/* 801B91C0 4B E5 60 0D */ bl mDoExt_setCurrentHeap__FP7JKRHeap
lbl_801B91C4:
/* 801B91C4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B91C8 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B91CC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B91D0 7C 08 03 A6 */ mtlr r0
/* 801B91D4 38 21 00 10 */ addi r1, r1, 0x10
/* 801B91D8 4E 80 00 20 */ blr
@@ -1,13 +0,0 @@
lbl_801BB468:
/* 801BB468 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801BB46C 7C 08 02 A6 */ mflr r0
/* 801BB470 90 01 00 14 */ stw r0, 0x14(r1)
/* 801BB474 80 63 0C C0 */ lwz r3, 0xcc0(r3)
/* 801BB478 81 83 00 00 */ lwz r12, 0(r3)
/* 801BB47C 81 8C 00 08 */ lwz r12, 8(r12)
/* 801BB480 7D 89 03 A6 */ mtctr r12
/* 801BB484 4E 80 04 21 */ bctrl
/* 801BB488 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801BB48C 7C 08 03 A6 */ mtlr r0
/* 801BB490 38 21 00 10 */ addi r1, r1, 0x10
/* 801BB494 4E 80 00 20 */ blr
@@ -1,68 +0,0 @@
lbl_801BD6C4:
/* 801BD6C4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801BD6C8 7C 08 02 A6 */ mflr r0
/* 801BD6CC 90 01 00 14 */ stw r0, 0x14(r1)
/* 801BD6D0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801BD6D4 7C 7F 1B 78 */ mr r31, r3
/* 801BD6D8 88 03 01 6D */ lbz r0, 0x16d(r3)
/* 801BD6DC 7C 03 07 74 */ extsb r3, r0
/* 801BD6E0 88 9F 01 6C */ lbz r4, 0x16c(r31)
/* 801BD6E4 7C 80 07 74 */ extsb r0, r4
/* 801BD6E8 7C 03 00 00 */ cmpw r3, r0
/* 801BD6EC 40 81 00 40 */ ble lbl_801BD72C
/* 801BD6F0 98 9F 01 6E */ stb r4, 0x16e(r31)
/* 801BD6F4 80 7F 00 F0 */ lwz r3, 0xf0(r31)
/* 801BD6F8 A8 03 00 1A */ lha r0, 0x1a(r3)
/* 801BD6FC 98 1F 01 79 */ stb r0, 0x179(r31)
/* 801BD700 88 1F 01 6C */ lbz r0, 0x16c(r31)
/* 801BD704 88 7F 01 6D */ lbz r3, 0x16d(r31)
/* 801BD708 7C 00 18 50 */ subf r0, r0, r3
/* 801BD70C 7C 04 07 74 */ extsb r4, r0
/* 801BD710 98 7F 01 6C */ stb r3, 0x16c(r31)
/* 801BD714 80 7F 00 04 */ lwz r3, 4(r31)
/* 801BD718 88 BF 01 79 */ lbz r5, 0x179(r31)
/* 801BD71C 48 00 3B 8D */ bl setPlusNowStayFloorNo__20dMenu_StageMapCtrl_cFScUc
/* 801BD720 38 00 00 01 */ li r0, 1
/* 801BD724 98 1F 01 7D */ stb r0, 0x17d(r31)
/* 801BD728 48 00 00 3C */ b lbl_801BD764
lbl_801BD72C:
/* 801BD72C 98 9F 01 6E */ stb r4, 0x16e(r31)
/* 801BD730 80 7F 00 F0 */ lwz r3, 0xf0(r31)
/* 801BD734 A8 03 00 1A */ lha r0, 0x1a(r3)
/* 801BD738 98 1F 01 79 */ stb r0, 0x179(r31)
/* 801BD73C 38 00 00 01 */ li r0, 1
/* 801BD740 98 1F 01 7D */ stb r0, 0x17d(r31)
/* 801BD744 88 1F 01 6C */ lbz r0, 0x16c(r31)
/* 801BD748 88 7F 01 6D */ lbz r3, 0x16d(r31)
/* 801BD74C 7C 00 18 50 */ subf r0, r0, r3
/* 801BD750 7C 04 07 74 */ extsb r4, r0
/* 801BD754 98 7F 01 6C */ stb r3, 0x16c(r31)
/* 801BD758 80 7F 00 04 */ lwz r3, 4(r31)
/* 801BD75C 88 BF 01 79 */ lbz r5, 0x179(r31)
/* 801BD760 48 00 3B 49 */ bl setPlusNowStayFloorNo__20dMenu_StageMapCtrl_cFScUc
lbl_801BD764:
/* 801BD764 38 00 00 00 */ li r0, 0
/* 801BD768 98 1F 01 85 */ stb r0, 0x185(r31)
/* 801BD76C 88 1F 01 7F */ lbz r0, 0x17f(r31)
/* 801BD770 28 00 00 00 */ cmplwi r0, 0
/* 801BD774 41 82 00 20 */ beq lbl_801BD794
/* 801BD778 80 7F 00 08 */ lwz r3, 8(r31)
/* 801BD77C 38 80 00 00 */ li r4, 0
/* 801BD780 4B FF B6 65 */ bl setAButtonString__14dMenu_DmapBg_cFUl
/* 801BD784 80 7F 00 08 */ lwz r3, 8(r31)
/* 801BD788 38 80 05 22 */ li r4, 0x522
/* 801BD78C 4B FF B7 31 */ bl setBButtonString__14dMenu_DmapBg_cFUl
/* 801BD790 48 00 00 1C */ b lbl_801BD7AC
lbl_801BD794:
/* 801BD794 80 7F 00 08 */ lwz r3, 8(r31)
/* 801BD798 38 80 05 27 */ li r4, 0x527
/* 801BD79C 4B FF B6 49 */ bl setAButtonString__14dMenu_DmapBg_cFUl
/* 801BD7A0 80 7F 00 08 */ lwz r3, 8(r31)
/* 801BD7A4 38 80 03 F9 */ li r4, 0x3f9
/* 801BD7A8 4B FF B7 15 */ bl setBButtonString__14dMenu_DmapBg_cFUl
lbl_801BD7AC:
/* 801BD7AC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801BD7B0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801BD7B4 7C 08 03 A6 */ mtlr r0
/* 801BD7B8 38 21 00 10 */ addi r1, r1, 0x10
/* 801BD7BC 4E 80 00 20 */ blr
@@ -1,6 +0,0 @@
lbl_801BD1D4:
/* 801BD1D4 88 83 01 71 */ lbz r4, 0x171(r3)
/* 801BD1D8 88 03 01 6C */ lbz r0, 0x16c(r3)
/* 801BD1DC 7C 04 00 50 */ subf r0, r4, r0
/* 801BD1E0 7C 03 07 74 */ extsb r3, r0
/* 801BD1E4 4E 80 00 20 */ blr
@@ -1,9 +0,0 @@
lbl_801BD1E8:
/* 801BD1E8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801BD1EC 7C 08 02 A6 */ mflr r0
/* 801BD1F0 90 01 00 14 */ stw r0, 0x14(r1)
/* 801BD1F4 4B FF FF E1 */ bl getCurFloorPos__12dMenu_Dmap_cFv
/* 801BD1F8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801BD1FC 7C 08 03 A6 */ mtlr r0
/* 801BD200 38 21 00 10 */ addi r1, r1, 0x10
/* 801BD204 4E 80 00 20 */ blr
@@ -1,110 +0,0 @@
lbl_801BD208:
/* 801BD208 94 21 FF 90 */ stwu r1, -0x70(r1)
/* 801BD20C 7C 08 02 A6 */ mflr r0
/* 801BD210 90 01 00 74 */ stw r0, 0x74(r1)
/* 801BD214 DB E1 00 60 */ stfd f31, 0x60(r1)
/* 801BD218 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */
/* 801BD21C 93 E1 00 5C */ stw r31, 0x5c(r1)
/* 801BD220 93 C1 00 58 */ stw r30, 0x58(r1)
/* 801BD224 7C 7F 1B 78 */ mr r31, r3
/* 801BD228 88 03 01 71 */ lbz r0, 0x171(r3)
/* 801BD22C 7C 03 07 74 */ extsb r3, r0
/* 801BD230 88 1F 01 72 */ lbz r0, 0x172(r31)
/* 801BD234 7C 00 07 74 */ extsb r0, r0
/* 801BD238 7F C3 00 50 */ subf r30, r3, r0
/* 801BD23C 80 7F 00 74 */ lwz r3, 0x74(r31)
/* 801BD240 48 09 83 89 */ bl show__13CPaneMgrAlphaFv
/* 801BD244 80 7F 01 4C */ lwz r3, 0x14c(r31)
/* 801BD248 80 1F 01 50 */ lwz r0, 0x150(r31)
/* 801BD24C 90 61 00 44 */ stw r3, 0x44(r1)
/* 801BD250 90 01 00 48 */ stw r0, 0x48(r1)
/* 801BD254 80 1F 01 54 */ lwz r0, 0x154(r31)
/* 801BD258 90 01 00 4C */ stw r0, 0x4c(r1)
/* 801BD25C 57 DE 10 3A */ slwi r30, r30, 2
/* 801BD260 7C 7F F2 14 */ add r3, r31, r30
/* 801BD264 80 83 00 34 */ lwz r4, 0x34(r3)
/* 801BD268 38 61 00 14 */ addi r3, r1, 0x14
/* 801BD26C 80 A4 00 04 */ lwz r5, 4(r4)
/* 801BD270 38 C0 00 00 */ li r6, 0
/* 801BD274 38 E0 00 00 */ li r7, 0
/* 801BD278 48 09 7C 45 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs
/* 801BD27C 80 61 00 14 */ lwz r3, 0x14(r1)
/* 801BD280 80 01 00 18 */ lwz r0, 0x18(r1)
/* 801BD284 90 61 00 38 */ stw r3, 0x38(r1)
/* 801BD288 90 01 00 3C */ stw r0, 0x3c(r1)
/* 801BD28C 80 01 00 1C */ lwz r0, 0x1c(r1)
/* 801BD290 90 01 00 40 */ stw r0, 0x40(r1)
/* 801BD294 80 7F 00 74 */ lwz r3, 0x74(r31)
/* 801BD298 C0 21 00 38 */ lfs f1, 0x38(r1)
/* 801BD29C C0 01 00 44 */ lfs f0, 0x44(r1)
/* 801BD2A0 EC 21 00 28 */ fsubs f1, f1, f0
/* 801BD2A4 C0 41 00 3C */ lfs f2, 0x3c(r1)
/* 801BD2A8 C0 01 00 48 */ lfs f0, 0x48(r1)
/* 801BD2AC EC 42 00 28 */ fsubs f2, f2, f0
/* 801BD2B0 48 09 73 01 */ bl paneTrans__8CPaneMgrFff
/* 801BD2B4 7C 7F F2 14 */ add r3, r31, r30
/* 801BD2B8 80 63 00 14 */ lwz r3, 0x14(r3)
/* 801BD2BC 80 63 00 04 */ lwz r3, 4(r3)
/* 801BD2C0 C3 E3 00 CC */ lfs f31, 0xcc(r3)
/* 801BD2C4 80 7F 00 74 */ lwz r3, 0x74(r31)
/* 801BD2C8 80 63 00 04 */ lwz r3, 4(r3)
/* 801BD2CC D3 E3 00 CC */ stfs f31, 0xcc(r3)
/* 801BD2D0 D3 E3 00 D0 */ stfs f31, 0xd0(r3)
/* 801BD2D4 81 83 00 00 */ lwz r12, 0(r3)
/* 801BD2D8 81 8C 00 2C */ lwz r12, 0x2c(r12)
/* 801BD2DC 7D 89 03 A6 */ mtctr r12
/* 801BD2E0 4E 80 04 21 */ bctrl
/* 801BD2E4 88 1F 01 73 */ lbz r0, 0x173(r31)
/* 801BD2E8 7C 03 07 74 */ extsb r3, r0
/* 801BD2EC 2C 03 FF 9D */ cmpwi r3, -99
/* 801BD2F0 41 82 00 A8 */ beq lbl_801BD398
/* 801BD2F4 88 1F 01 71 */ lbz r0, 0x171(r31)
/* 801BD2F8 7C 00 07 74 */ extsb r0, r0
/* 801BD2FC 7F C0 18 50 */ subf r30, r0, r3
/* 801BD300 80 7F 00 78 */ lwz r3, 0x78(r31)
/* 801BD304 48 09 82 C5 */ bl show__13CPaneMgrAlphaFv
/* 801BD308 80 7F 01 58 */ lwz r3, 0x158(r31)
/* 801BD30C 80 1F 01 5C */ lwz r0, 0x15c(r31)
/* 801BD310 90 61 00 2C */ stw r3, 0x2c(r1)
/* 801BD314 90 01 00 30 */ stw r0, 0x30(r1)
/* 801BD318 80 1F 01 60 */ lwz r0, 0x160(r31)
/* 801BD31C 90 01 00 34 */ stw r0, 0x34(r1)
/* 801BD320 57 C0 10 3A */ slwi r0, r30, 2
/* 801BD324 7C 7F 02 14 */ add r3, r31, r0
/* 801BD328 80 83 00 54 */ lwz r4, 0x54(r3)
/* 801BD32C 38 61 00 08 */ addi r3, r1, 8
/* 801BD330 80 A4 00 04 */ lwz r5, 4(r4)
/* 801BD334 38 C0 00 00 */ li r6, 0
/* 801BD338 38 E0 00 00 */ li r7, 0
/* 801BD33C 48 09 7B 81 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs
/* 801BD340 80 61 00 08 */ lwz r3, 8(r1)
/* 801BD344 80 01 00 0C */ lwz r0, 0xc(r1)
/* 801BD348 90 61 00 20 */ stw r3, 0x20(r1)
/* 801BD34C 90 01 00 24 */ stw r0, 0x24(r1)
/* 801BD350 80 01 00 10 */ lwz r0, 0x10(r1)
/* 801BD354 90 01 00 28 */ stw r0, 0x28(r1)
/* 801BD358 80 7F 00 78 */ lwz r3, 0x78(r31)
/* 801BD35C C0 21 00 20 */ lfs f1, 0x20(r1)
/* 801BD360 C0 01 00 2C */ lfs f0, 0x2c(r1)
/* 801BD364 EC 21 00 28 */ fsubs f1, f1, f0
/* 801BD368 C0 41 00 24 */ lfs f2, 0x24(r1)
/* 801BD36C C0 01 00 30 */ lfs f0, 0x30(r1)
/* 801BD370 EC 42 00 28 */ fsubs f2, f2, f0
/* 801BD374 48 09 72 3D */ bl paneTrans__8CPaneMgrFff
/* 801BD378 80 7F 00 78 */ lwz r3, 0x78(r31)
/* 801BD37C 80 63 00 04 */ lwz r3, 4(r3)
/* 801BD380 D3 E3 00 CC */ stfs f31, 0xcc(r3)
/* 801BD384 D3 E3 00 D0 */ stfs f31, 0xd0(r3)
/* 801BD388 81 83 00 00 */ lwz r12, 0(r3)
/* 801BD38C 81 8C 00 2C */ lwz r12, 0x2c(r12)
/* 801BD390 7D 89 03 A6 */ mtctr r12
/* 801BD394 4E 80 04 21 */ bctrl
lbl_801BD398:
/* 801BD398 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */
/* 801BD39C CB E1 00 60 */ lfd f31, 0x60(r1)
/* 801BD3A0 83 E1 00 5C */ lwz r31, 0x5c(r1)
/* 801BD3A4 83 C1 00 58 */ lwz r30, 0x58(r1)
/* 801BD3A8 80 01 00 74 */ lwz r0, 0x74(r1)
/* 801BD3AC 7C 08 03 A6 */ mtlr r0
/* 801BD3B0 38 21 00 70 */ addi r1, r1, 0x70
/* 801BD3B4 4E 80 00 20 */ blr
@@ -1,7 +0,0 @@
lbl_801B893C:
/* 801B893C D0 23 0D AC */ stfs f1, 0xdac(r3)
/* 801B8940 D0 43 0D B0 */ stfs f2, 0xdb0(r3)
/* 801B8944 98 83 0D D1 */ stb r4, 0xdd1(r3)
/* 801B8948 38 00 00 00 */ li r0, 0
/* 801B894C 98 03 0D D2 */ stb r0, 0xdd2(r3)
/* 801B8950 4E 80 00 20 */ blr
@@ -1,4 +0,0 @@
lbl_801BF180:
/* 801BF180 38 00 00 03 */ li r0, 3
/* 801BF184 98 03 01 7C */ stb r0, 0x17c(r3)
/* 801BF188 4E 80 00 20 */ blr
@@ -1,10 +0,0 @@
lbl_801BDF48:
/* 801BDF48 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801BDF4C 7C 08 02 A6 */ mflr r0
/* 801BDF50 90 01 00 14 */ stw r0, 0x14(r1)
/* 801BDF54 80 63 00 08 */ lwz r3, 8(r3)
/* 801BDF58 4B FF A8 F5 */ bl mapScreenAnime__14dMenu_DmapBg_cFv
/* 801BDF5C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801BDF60 7C 08 03 A6 */ mtlr r0
/* 801BDF64 38 21 00 10 */ addi r1, r1, 0x10
/* 801BDF68 4E 80 00 20 */ blr
@@ -1,58 +0,0 @@
lbl_801B8DE4:
/* 801B8DE4 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 801B8DE8 7C 08 02 A6 */ mflr r0
/* 801B8DEC 90 01 00 24 */ stw r0, 0x24(r1)
/* 801B8DF0 39 61 00 20 */ addi r11, r1, 0x20
/* 801B8DF4 48 1A 93 E5 */ bl _savegpr_28
/* 801B8DF8 7C 7C 1B 78 */ mr r28, r3
/* 801B8DFC 7C 9D 23 78 */ mr r29, r4
/* 801B8E00 3B C0 00 00 */ li r30, 0
/* 801B8E04 3B E0 00 00 */ li r31, 0
lbl_801B8E08:
/* 801B8E08 28 1D 00 00 */ cmplwi r29, 0
/* 801B8E0C 40 82 00 44 */ bne lbl_801B8E50
/* 801B8E10 80 7C 0C B4 */ lwz r3, 0xcb4(r28)
/* 801B8E14 3C 80 80 39 */ lis r4, cont_at_4196@ha /* 0x803955C8@ha */
/* 801B8E18 38 04 55 C8 */ addi r0, r4, cont_at_4196@l /* 0x803955C8@l */
/* 801B8E1C 7C 80 FA 14 */ add r4, r0, r31
/* 801B8E20 80 A4 00 00 */ lwz r5, 0(r4)
/* 801B8E24 80 C4 00 04 */ lwz r6, 4(r4)
/* 801B8E28 81 83 00 00 */ lwz r12, 0(r3)
/* 801B8E2C 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B8E30 7D 89 03 A6 */ mtctr r12
/* 801B8E34 4E 80 04 21 */ bctrl
/* 801B8E38 48 14 78 21 */ bl getStringPtr__10J2DTextBoxCFv
/* 801B8E3C 3C 80 80 39 */ lis r4, d_menu_d_menu_dmap__stringBase0@ha /* 0x80395760@ha */
/* 801B8E40 38 84 57 60 */ addi r4, r4, d_menu_d_menu_dmap__stringBase0@l /* 0x80395760@l */
/* 801B8E44 38 84 00 6F */ addi r4, r4, 0x6f
/* 801B8E48 48 1A FC E5 */ bl strcpy
/* 801B8E4C 48 00 00 48 */ b lbl_801B8E94
lbl_801B8E50:
/* 801B8E50 80 7C 0C B4 */ lwz r3, 0xcb4(r28)
/* 801B8E54 3C 80 80 39 */ lis r4, cont_at_4196@ha /* 0x803955C8@ha */
/* 801B8E58 38 04 55 C8 */ addi r0, r4, cont_at_4196@l /* 0x803955C8@l */
/* 801B8E5C 7C 80 FA 14 */ add r4, r0, r31
/* 801B8E60 80 A4 00 00 */ lwz r5, 0(r4)
/* 801B8E64 80 C4 00 04 */ lwz r6, 4(r4)
/* 801B8E68 81 83 00 00 */ lwz r12, 0(r3)
/* 801B8E6C 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B8E70 7D 89 03 A6 */ mtctr r12
/* 801B8E74 4E 80 04 21 */ bctrl
/* 801B8E78 48 14 77 E1 */ bl getStringPtr__10J2DTextBoxCFv
/* 801B8E7C 7C 65 1B 78 */ mr r5, r3
/* 801B8E80 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
/* 801B8E84 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
/* 801B8E88 7F A4 EB 78 */ mr r4, r29
/* 801B8E8C 38 C0 00 00 */ li r6, 0
/* 801B8E90 48 06 36 B5 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
lbl_801B8E94:
/* 801B8E94 3B DE 00 01 */ addi r30, r30, 1
/* 801B8E98 2C 1E 00 05 */ cmpwi r30, 5
/* 801B8E9C 3B FF 00 08 */ addi r31, r31, 8
/* 801B8EA0 41 80 FF 68 */ blt lbl_801B8E08
/* 801B8EA4 39 61 00 20 */ addi r11, r1, 0x20
/* 801B8EA8 48 1A 93 7D */ bl _restgpr_28
/* 801B8EAC 80 01 00 24 */ lwz r0, 0x24(r1)
/* 801B8EB0 7C 08 03 A6 */ mtlr r0
/* 801B8EB4 38 21 00 20 */ addi r1, r1, 0x20
/* 801B8EB8 4E 80 00 20 */ blr
@@ -1,66 +0,0 @@
lbl_801BA60C:
/* 801BA60C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 801BA610 7C 08 02 A6 */ mflr r0
/* 801BA614 90 01 00 24 */ stw r0, 0x24(r1)
/* 801BA618 DB E1 00 18 */ stfd f31, 0x18(r1)
/* 801BA61C 39 61 00 18 */ addi r11, r1, 0x18
/* 801BA620 48 1A 7B BD */ bl _savegpr_29
/* 801BA624 7C 7D 1B 78 */ mr r29, r3
/* 801BA628 FF E0 08 90 */ fmr f31, f1
/* 801BA62C D3 E3 0D 9C */ stfs f31, 0xd9c(r3)
/* 801BA630 54 80 06 3F */ clrlwi. r0, r4, 0x18
/* 801BA634 41 82 00 50 */ beq lbl_801BA684
/* 801BA638 80 7D 0C CC */ lwz r3, 0xccc(r29)
/* 801BA63C 48 09 B7 95 */ bl setBackupAlpha__17CPaneMgrAlphaMorfFv
/* 801BA640 80 7D 0C E0 */ lwz r3, 0xce0(r29)
/* 801BA644 48 09 B7 8D */ bl setBackupAlpha__17CPaneMgrAlphaMorfFv
/* 801BA648 3B C0 00 00 */ li r30, 0
/* 801BA64C 3B E0 00 00 */ li r31, 0
lbl_801BA650:
/* 801BA650 38 1F 0C D0 */ addi r0, r31, 0xcd0
/* 801BA654 7C 7D 00 2E */ lwzx r3, r29, r0
/* 801BA658 48 09 B7 79 */ bl setBackupAlpha__17CPaneMgrAlphaMorfFv
/* 801BA65C 3B DE 00 01 */ addi r30, r30, 1
/* 801BA660 2C 1E 00 02 */ cmpwi r30, 2
/* 801BA664 3B FF 00 04 */ addi r31, r31, 4
/* 801BA668 41 80 FF E8 */ blt lbl_801BA650
/* 801BA66C 80 7D 0C D8 */ lwz r3, 0xcd8(r29)
/* 801BA670 48 09 B7 61 */ bl setBackupAlpha__17CPaneMgrAlphaMorfFv
/* 801BA674 80 7D 0C DC */ lwz r3, 0xcdc(r29)
/* 801BA678 28 03 00 00 */ cmplwi r3, 0
/* 801BA67C 41 82 00 08 */ beq lbl_801BA684
/* 801BA680 48 09 B7 51 */ bl setBackupAlpha__17CPaneMgrAlphaMorfFv
lbl_801BA684:
/* 801BA684 80 7D 0C CC */ lwz r3, 0xccc(r29)
/* 801BA688 FC 20 F8 90 */ fmr f1, f31
/* 801BA68C 48 09 B7 9D */ bl setAlphaMorfRate__17CPaneMgrAlphaMorfFf
/* 801BA690 80 7D 0C E0 */ lwz r3, 0xce0(r29)
/* 801BA694 FC 20 F8 90 */ fmr f1, f31
/* 801BA698 48 09 B7 91 */ bl setAlphaMorfRate__17CPaneMgrAlphaMorfFf
/* 801BA69C 3B C0 00 00 */ li r30, 0
/* 801BA6A0 3B E0 00 00 */ li r31, 0
lbl_801BA6A4:
/* 801BA6A4 38 1F 0C D0 */ addi r0, r31, 0xcd0
/* 801BA6A8 7C 7D 00 2E */ lwzx r3, r29, r0
/* 801BA6AC FC 20 F8 90 */ fmr f1, f31
/* 801BA6B0 48 09 B7 79 */ bl setAlphaMorfRate__17CPaneMgrAlphaMorfFf
/* 801BA6B4 3B DE 00 01 */ addi r30, r30, 1
/* 801BA6B8 2C 1E 00 02 */ cmpwi r30, 2
/* 801BA6BC 3B FF 00 04 */ addi r31, r31, 4
/* 801BA6C0 41 80 FF E4 */ blt lbl_801BA6A4
/* 801BA6C4 80 7D 0C D8 */ lwz r3, 0xcd8(r29)
/* 801BA6C8 FC 20 F8 90 */ fmr f1, f31
/* 801BA6CC 48 09 B7 5D */ bl setAlphaMorfRate__17CPaneMgrAlphaMorfFf
/* 801BA6D0 80 7D 0C DC */ lwz r3, 0xcdc(r29)
/* 801BA6D4 28 03 00 00 */ cmplwi r3, 0
/* 801BA6D8 41 82 00 0C */ beq lbl_801BA6E4
/* 801BA6DC FC 20 F8 90 */ fmr f1, f31
/* 801BA6E0 48 09 B7 49 */ bl setAlphaMorfRate__17CPaneMgrAlphaMorfFf
lbl_801BA6E4:
/* 801BA6E4 CB E1 00 18 */ lfd f31, 0x18(r1)
/* 801BA6E8 39 61 00 18 */ addi r11, r1, 0x18
/* 801BA6EC 48 1A 7B 3D */ bl _restgpr_29
/* 801BA6F0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 801BA6F4 7C 08 03 A6 */ mtlr r0
/* 801BA6F8 38 21 00 20 */ addi r1, r1, 0x20
/* 801BA6FC 4E 80 00 20 */ blr
@@ -1,58 +0,0 @@
lbl_801B8EBC:
/* 801B8EBC 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 801B8EC0 7C 08 02 A6 */ mflr r0
/* 801B8EC4 90 01 00 24 */ stw r0, 0x24(r1)
/* 801B8EC8 39 61 00 20 */ addi r11, r1, 0x20
/* 801B8ECC 48 1A 93 0D */ bl _savegpr_28
/* 801B8ED0 7C 7C 1B 78 */ mr r28, r3
/* 801B8ED4 7C 9D 23 78 */ mr r29, r4
/* 801B8ED8 3B C0 00 00 */ li r30, 0
/* 801B8EDC 3B E0 00 00 */ li r31, 0
lbl_801B8EE0:
/* 801B8EE0 28 1D 00 00 */ cmplwi r29, 0
/* 801B8EE4 40 82 00 44 */ bne lbl_801B8F28
/* 801B8EE8 80 7C 0C B4 */ lwz r3, 0xcb4(r28)
/* 801B8EEC 3C 80 80 39 */ lis r4, cont_bt_4211@ha /* 0x803955F0@ha */
/* 801B8EF0 38 04 55 F0 */ addi r0, r4, cont_bt_4211@l /* 0x803955F0@l */
/* 801B8EF4 7C 80 FA 14 */ add r4, r0, r31
/* 801B8EF8 80 A4 00 00 */ lwz r5, 0(r4)
/* 801B8EFC 80 C4 00 04 */ lwz r6, 4(r4)
/* 801B8F00 81 83 00 00 */ lwz r12, 0(r3)
/* 801B8F04 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B8F08 7D 89 03 A6 */ mtctr r12
/* 801B8F0C 4E 80 04 21 */ bctrl
/* 801B8F10 48 14 77 49 */ bl getStringPtr__10J2DTextBoxCFv
/* 801B8F14 3C 80 80 39 */ lis r4, d_menu_d_menu_dmap__stringBase0@ha /* 0x80395760@ha */
/* 801B8F18 38 84 57 60 */ addi r4, r4, d_menu_d_menu_dmap__stringBase0@l /* 0x80395760@l */
/* 801B8F1C 38 84 00 6F */ addi r4, r4, 0x6f
/* 801B8F20 48 1A FC 0D */ bl strcpy
/* 801B8F24 48 00 00 48 */ b lbl_801B8F6C
lbl_801B8F28:
/* 801B8F28 80 7C 0C B4 */ lwz r3, 0xcb4(r28)
/* 801B8F2C 3C 80 80 39 */ lis r4, cont_bt_4211@ha /* 0x803955F0@ha */
/* 801B8F30 38 04 55 F0 */ addi r0, r4, cont_bt_4211@l /* 0x803955F0@l */
/* 801B8F34 7C 80 FA 14 */ add r4, r0, r31
/* 801B8F38 80 A4 00 00 */ lwz r5, 0(r4)
/* 801B8F3C 80 C4 00 04 */ lwz r6, 4(r4)
/* 801B8F40 81 83 00 00 */ lwz r12, 0(r3)
/* 801B8F44 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B8F48 7D 89 03 A6 */ mtctr r12
/* 801B8F4C 4E 80 04 21 */ bctrl
/* 801B8F50 48 14 77 09 */ bl getStringPtr__10J2DTextBoxCFv
/* 801B8F54 7C 65 1B 78 */ mr r5, r3
/* 801B8F58 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
/* 801B8F5C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
/* 801B8F60 7F A4 EB 78 */ mr r4, r29
/* 801B8F64 38 C0 00 00 */ li r6, 0
/* 801B8F68 48 06 35 DD */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
lbl_801B8F6C:
/* 801B8F6C 3B DE 00 01 */ addi r30, r30, 1
/* 801B8F70 2C 1E 00 05 */ cmpwi r30, 5
/* 801B8F74 3B FF 00 08 */ addi r31, r31, 8
/* 801B8F78 41 80 FF 68 */ blt lbl_801B8EE0
/* 801B8F7C 39 61 00 20 */ addi r11, r1, 0x20
/* 801B8F80 48 1A 92 A5 */ bl _restgpr_28
/* 801B8F84 80 01 00 24 */ lwz r0, 0x24(r1)
/* 801B8F88 7C 08 03 A6 */ mtlr r0
/* 801B8F8C 38 21 00 20 */ addi r1, r1, 0x20
/* 801B8F90 4E 80 00 20 */ blr
@@ -1,63 +0,0 @@
lbl_801BA700:
/* 801BA700 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 801BA704 7C 08 02 A6 */ mflr r0
/* 801BA708 90 01 00 24 */ stw r0, 0x24(r1)
/* 801BA70C 39 61 00 20 */ addi r11, r1, 0x20
/* 801BA710 48 1A 7A C9 */ bl _savegpr_28
/* 801BA714 7C 7C 1B 78 */ mr r28, r3
/* 801BA718 7C 9D 23 78 */ mr r29, r4
/* 801BA71C 80 63 0C A8 */ lwz r3, 0xca8(r3)
/* 801BA720 3C 80 30 30 */ lis r4, 0x3030 /* 0x30305F30@ha */
/* 801BA724 38 C4 5F 30 */ addi r6, r4, 0x5F30 /* 0x30305F30@l */
/* 801BA728 3C 80 67 6F */ lis r4, 0x676F /* 0x676F6C64@ha */
/* 801BA72C 38 A4 6C 64 */ addi r5, r4, 0x6C64 /* 0x676F6C64@l */
/* 801BA730 81 83 00 00 */ lwz r12, 0(r3)
/* 801BA734 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801BA738 7D 89 03 A6 */ mtctr r12
/* 801BA73C 4E 80 04 21 */ bctrl
/* 801BA740 7C 7F 1B 78 */ mr r31, r3
/* 801BA744 80 7C 0C A8 */ lwz r3, 0xca8(r28)
/* 801BA748 3C 80 30 30 */ lis r4, 0x3030 /* 0x30305F31@ha */
/* 801BA74C 38 C4 5F 31 */ addi r6, r4, 0x5F31 /* 0x30305F31@l */
/* 801BA750 3C 80 67 6F */ lis r4, 0x676F /* 0x676F6C64@ha */
/* 801BA754 38 A4 6C 64 */ addi r5, r4, 0x6C64 /* 0x676F6C64@l */
/* 801BA758 81 83 00 00 */ lwz r12, 0(r3)
/* 801BA75C 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801BA760 7D 89 03 A6 */ mtctr r12
/* 801BA764 4E 80 04 21 */ bctrl
/* 801BA768 7C 7E 1B 78 */ mr r30, r3
/* 801BA76C 57 A0 06 3F */ clrlwi. r0, r29, 0x18
/* 801BA770 41 82 00 38 */ beq lbl_801BA7A8
/* 801BA774 7F E3 FB 78 */ mr r3, r31
/* 801BA778 80 9C 0D 28 */ lwz r4, 0xd28(r28)
/* 801BA77C 81 9F 00 00 */ lwz r12, 0(r31)
/* 801BA780 81 8C 00 6C */ lwz r12, 0x6c(r12)
/* 801BA784 7D 89 03 A6 */ mtctr r12
/* 801BA788 4E 80 04 21 */ bctrl
/* 801BA78C 7F C3 F3 78 */ mr r3, r30
/* 801BA790 80 9C 0D 28 */ lwz r4, 0xd28(r28)
/* 801BA794 81 9E 00 00 */ lwz r12, 0(r30)
/* 801BA798 81 8C 00 6C */ lwz r12, 0x6c(r12)
/* 801BA79C 7D 89 03 A6 */ mtctr r12
/* 801BA7A0 4E 80 04 21 */ bctrl
/* 801BA7A4 48 00 00 34 */ b lbl_801BA7D8
lbl_801BA7A8:
/* 801BA7A8 7F E3 FB 78 */ mr r3, r31
/* 801BA7AC 38 80 00 00 */ li r4, 0
/* 801BA7B0 81 9F 00 00 */ lwz r12, 0(r31)
/* 801BA7B4 81 8C 00 6C */ lwz r12, 0x6c(r12)
/* 801BA7B8 7D 89 03 A6 */ mtctr r12
/* 801BA7BC 4E 80 04 21 */ bctrl
/* 801BA7C0 7F C3 F3 78 */ mr r3, r30
/* 801BA7C4 38 80 00 00 */ li r4, 0
/* 801BA7C8 81 9E 00 00 */ lwz r12, 0(r30)
/* 801BA7CC 81 8C 00 6C */ lwz r12, 0x6c(r12)
/* 801BA7D0 7D 89 03 A6 */ mtctr r12
/* 801BA7D4 4E 80 04 21 */ bctrl
lbl_801BA7D8:
/* 801BA7D8 39 61 00 20 */ addi r11, r1, 0x20
/* 801BA7DC 48 1A 7A 49 */ bl _restgpr_28
/* 801BA7E0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 801BA7E4 7C 08 03 A6 */ mtlr r0
/* 801BA7E8 38 21 00 20 */ addi r1, r1, 0x20
/* 801BA7EC 4E 80 00 20 */ blr
@@ -1,10 +0,0 @@
lbl_801B90BC:
/* 801B90BC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B90C0 7C 08 02 A6 */ mflr r0
/* 801B90C4 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B90C8 80 6D 8B 00 */ lwz r3, myclass__12dMenu_Dmap_c(r13)
/* 801B90CC 48 00 45 C5 */ bl isMapMoveState__12dMenu_Dmap_cFv
/* 801B90D0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B90D4 7C 08 03 A6 */ mtlr r0
/* 801B90D8 38 21 00 10 */ addi r1, r1, 0x10
/* 801B90DC 4E 80 00 20 */ blr
+14 -3
View File
@@ -54,7 +54,10 @@ public:
/* 802FD098 */ virtual bool prepareTexture(u8);
/* 801BDD40 */ virtual bool append(ResTIMG const*, f32);
/* 802FF238 */ virtual bool append(ResTIMG const*, JUTPalette*, f32);
/* 80020338 */ virtual bool append(char const*, f32);
/* 80020338 */ virtual bool append(char const* param_0, f32 param_1) {
return insert(param_0, mTextureNum, param_1);
}
/* 802FF2F0 */ virtual bool append(char const*, JUTPalette*, f32);
/* 802FF208 */ virtual bool append(JUTTexture*, f32);
/* 802FF3E0 */ virtual void prepend(ResTIMG const*, f32);
@@ -64,7 +67,9 @@ public:
/* 802FF320 */ virtual void prepend(JUTTexture*, f32);
/* 801BDD70 */ virtual void insert(ResTIMG const*, u8, f32);
/* 802FD168 */ virtual bool insert(ResTIMG const*, JUTPalette*, u8, f32);
/* 80020368 */ virtual bool insert(char const*, u8, f32);
/* 80020368 */ virtual bool insert(char const* param_0, u8 param_1, f32 param_2) {
return insert(param_0, NULL, param_1, param_2);
}
/* 802FD4B4 */ virtual bool insert(char const*, JUTPalette*, u8, f32);
/* 802FD524 */ virtual bool insert(JUTTexture*, u8, f32);
/* 802FD6F4 */ virtual bool remove(u8);
@@ -78,7 +83,10 @@ public:
/* 802FDF88 */ virtual void drawOut(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
/* 802FF29C */ virtual void load(_GXTexMapID, u8);
/* 802FF268 */ virtual void load(u8);
/* 800202CC */ virtual void setBlendRatio(f32, f32);
/* 800202CC */ virtual void setBlendRatio(f32 param_0, f32 param_1) {
setBlendColorRatio(param_0, param_1);
setBlendAlphaRatio(param_0, param_1);
}
/* 802FEA74 */ virtual void setBlendColorRatio(f32, f32);
/* 802FEA9C */ virtual void setBlendAlphaRatio(f32, f32);
/* 802FD874 */ virtual const ResTIMG* changeTexture(ResTIMG const*, u8);
@@ -123,6 +131,9 @@ public:
mCornerColor[2] = c2;
mCornerColor[3] = c3;
}
void setCornerColor(JUtility::TColor c0) {
setCornerColor(c0, c0, c0, c0);
}
protected:
/* 0x100 */ JUTTexture* mTexture[2];
+1 -1
View File
@@ -32,7 +32,7 @@ struct JASInst {
struct JASBasicInst : public JASInst {
struct TKeymap {
/* 80298250 */ ~TKeymap();
/* 802982D4 */ TKeymap();
/* 802982D4 */ TKeymap() { field_0x0 = -1; }
s32 field_0x0;
u16 field_0x4;
+1
View File
@@ -822,6 +822,7 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* arc_nam
int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* resName, JKRHeap* heap);
int dComIfG_TimerDeleteRequest(int i_mode);
int dComIfG_TimerStart(int i_mode, s16 i_time);
bool dComIfGp_isLightDropMapVisible();
inline void dComIfG_setBrightness(u8 brightness) {
g_dComIfG_gameInfo.mFadeBrightness = brightness;
+1
View File
@@ -46,6 +46,7 @@ public:
/* 800325A0 */ bool checkDownTrigger();
void setFirstWaitTime(s16 time) { mFirstWaitTime = time; }
s16 getYwaitTimer() { return mYwaitTimer; }
/* 0x04 */ f32 mThreshold;
/* 0x08 */ f32 field_0x08;

Some files were not shown because too many files have changed in this diff Show More