Merge remote-tracking branch 'upstream/master' into undecided

This commit is contained in:
Tal Hayon
2023-06-28 15:02:13 +03:00
95 changed files with 1009 additions and 3160 deletions
+4 -1
View File
@@ -29,7 +29,10 @@ jobs:
run_id: ${{ steps.get_run_id.outputs.run_id }}
name: artifact-${{ steps.get_run_id.outputs.run_id }}
workflow: ${{ env.WORKFLOW }}
- name: Install Python Deps
run: |
pip install GitPython rich
- name: Upload Progress to Frogress
env:
PROGRESS_API_KEY: ${{ secrets.FROGRESS_API_KEY }}
run: ./tools/upload-progress.py -b https://progress.deco.mp/ -p twilightprincess -v gcn_usa progress-${{ steps.get_run_id.outputs.run_id }}.json
run: ./tp upload-progress progress-${{ steps.get_run_id.outputs.run_id }}.json -b https://progress.deco.mp/ -p twilightprincess -v gcn_usa
+7 -7
View File
@@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes)
.init | 97.972973% | 9280 | 9472
.extab | 100.000000% | 96 | 96
.extabindex | 100.000000% | 96 | 96
.text | 27.769659% | 998748 | 3596544
.text | 28.003550% | 1007160 | 3596544
.ctors | 100.000000% | 448 | 448
.dtors | 100.000000% | 32 | 32
.rodata | 100.000000% | 193856 | 193856
.data | 100.000000% | 197632 | 197632
.sdata | 100.000000% | 1408 | 1408
.sdata2 | 100.000000% | 20832 | 20832
Total | 35.384234% | 1422684 | 4020672
Total | 35.593453% | 1431096 | 4020672
## Total
Section | Percentage | Decompiled (bytes) | Total (bytes)
---|---|---|---
main.dol | 35.384234% | 1422684 | 4020672
RELs | 33.657973% | 3870776 | 11500324
Total | 34.105157% | 5293460 | 15520996
main.dol | 35.593453% | 1431096 | 4020672
RELs | 33.662947% | 3871348 | 11500324
Total | 34.163040% | 5302444 | 15520996
## RELs
@@ -775,7 +775,7 @@ d_a_tag_watchge | 100.000000% | 1240 | 1240
d_a_tag_waterfall | 46.361502% | 1580 | 3408
d_a_tag_wljump | 45.248380% | 1676 | 3704
d_a_tag_yami | 42.650334% | 1532 | 3592
d_a_talk | 45.434783% | 836 | 1840
d_a_talk | 76.521739% | 1408 | 1840
d_a_tbox | 30.165503% | 9332 | 30936
d_a_tbox2 | 42.486445% | 4388 | 10328
d_a_tboxSw | 100.000000% | 1016 | 1016
@@ -785,4 +785,4 @@ d_a_vrbox2 | 34.977578% | 2184 | 6244
d_a_warp_bug | 54.940711% | 1112 | 2024
d_a_ykgr | 44.400631% | 2252 | 5072
f_pc_profile_lst | 100.000000% | 28156 | 28156
Total | 33.657973% | 3870776 | 11500324
Total | 33.662947% | 3871348 | 11500324
@@ -1,42 +0,0 @@
lbl_801B78C0:
/* 801B78C0 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 801B78C4 7C 08 02 A6 */ mflr r0
/* 801B78C8 90 01 00 24 */ stw r0, 0x24(r1)
/* 801B78CC 39 61 00 20 */ addi r11, r1, 0x20
/* 801B78D0 48 1A A9 09 */ bl _savegpr_28
/* 801B78D4 7C 7C 1B 78 */ mr r28, r3
/* 801B78D8 7C 9D 23 78 */ mr r29, r4
/* 801B78DC 7C BE 2B 78 */ mr r30, r5
/* 801B78E0 7C DF 33 78 */ mr r31, r6
/* 801B78E4 3C 60 80 3C */ lis r3, __vt__15dMenu_Collect_c@ha /* 0x803BC75C@ha */
/* 801B78E8 38 03 C7 5C */ addi r0, r3, __vt__15dMenu_Collect_c@l /* 0x803BC75C@l */
/* 801B78EC 90 1C 00 00 */ stw r0, 0(r28)
/* 801B78F0 38 60 02 64 */ li r3, 0x264
/* 801B78F4 48 11 73 59 */ bl __nw__FUl
/* 801B78F8 7C 60 1B 79 */ or. r0, r3, r3
/* 801B78FC 41 82 00 18 */ beq lbl_801B7914
/* 801B7900 7F A4 EB 78 */ mr r4, r29
/* 801B7904 7F C5 F3 78 */ mr r5, r30
/* 801B7908 7F E6 FB 78 */ mr r6, r31
/* 801B790C 4B FF 84 3D */ bl __ct__17dMenu_Collect2D_cFP10JKRExpHeapP9STControlP10CSTControl
/* 801B7910 7C 60 1B 78 */ mr r0, r3
lbl_801B7914:
/* 801B7914 90 1C 00 04 */ stw r0, 4(r28)
/* 801B7918 38 60 03 DC */ li r3, 0x3dc
/* 801B791C 48 11 73 31 */ bl __nw__FUl
/* 801B7920 7C 60 1B 79 */ or. r0, r3, r3
/* 801B7924 41 82 00 18 */ beq lbl_801B793C
/* 801B7928 7F A4 EB 78 */ mr r4, r29
/* 801B792C 80 BC 00 04 */ lwz r5, 4(r28)
/* 801B7930 7F E6 FB 78 */ mr r6, r31
/* 801B7934 4B FF EB 21 */ bl __ct__17dMenu_Collect3D_cFP10JKRExpHeapP17dMenu_Collect2D_cP10CSTControl
/* 801B7938 7C 60 1B 78 */ mr r0, r3
lbl_801B793C:
/* 801B793C 90 1C 00 08 */ stw r0, 8(r28)
/* 801B7940 7F 83 E3 78 */ mr r3, r28
/* 801B7944 39 61 00 20 */ addi r11, r1, 0x20
/* 801B7948 48 1A A8 DD */ bl _restgpr_28
/* 801B794C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 801B7950 7C 08 03 A6 */ mtlr r0
/* 801B7954 38 21 00 20 */ addi r1, r1, 0x20
/* 801B7958 4E 80 00 20 */ blr
@@ -1,31 +0,0 @@
lbl_801AFE34:
/* 801AFE34 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801AFE38 7C 08 02 A6 */ mflr r0
/* 801AFE3C 90 01 00 14 */ stw r0, 0x14(r1)
/* 801AFE40 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801AFE44 93 C1 00 08 */ stw r30, 8(r1)
/* 801AFE48 7C 7E 1B 79 */ or. r30, r3, r3
/* 801AFE4C 7C 9F 23 78 */ mr r31, r4
/* 801AFE50 41 82 00 38 */ beq lbl_801AFE88
/* 801AFE54 3C 60 80 3C */ lis r3, __vt__17dMenu_Collect2D_c@ha /* 0x803BC7C4@ha */
/* 801AFE58 38 03 C7 C4 */ addi r0, r3, __vt__17dMenu_Collect2D_c@l /* 0x803BC7C4@l */
/* 801AFE5C 90 1E 00 00 */ stw r0, 0(r30)
/* 801AFE60 80 7E 00 08 */ lwz r3, 8(r30)
/* 801AFE64 28 03 00 00 */ cmplwi r3, 0
/* 801AFE68 41 82 00 10 */ beq lbl_801AFE78
/* 801AFE6C 4B E5 F3 41 */ bl mDoExt_destroyExpHeap__FP10JKRExpHeap
/* 801AFE70 38 00 00 00 */ li r0, 0
/* 801AFE74 90 1E 00 08 */ stw r0, 8(r30)
lbl_801AFE78:
/* 801AFE78 7F E0 07 35 */ extsh. r0, r31
/* 801AFE7C 40 81 00 0C */ ble lbl_801AFE88
/* 801AFE80 7F C3 F3 78 */ mr r3, r30
/* 801AFE84 48 11 EE B9 */ bl __dl__FPv
lbl_801AFE88:
/* 801AFE88 7F C3 F3 78 */ mr r3, r30
/* 801AFE8C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801AFE90 83 C1 00 08 */ lwz r30, 8(r1)
/* 801AFE94 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801AFE98 7C 08 03 A6 */ mtlr r0
/* 801AFE9C 38 21 00 10 */ addi r1, r1, 0x10
/* 801AFEA0 4E 80 00 20 */ blr
@@ -1,15 +0,0 @@
lbl_801B7A0C:
/* 801B7A0C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B7A10 7C 08 02 A6 */ mflr r0
/* 801B7A14 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B7A18 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B7A1C 7C 7F 1B 78 */ mr r31, r3
/* 801B7A20 80 63 00 04 */ lwz r3, 4(r3)
/* 801B7A24 4B FF 84 81 */ bl _create__17dMenu_Collect2D_cFv
/* 801B7A28 80 7F 00 08 */ lwz r3, 8(r31)
/* 801B7A2C 4B FF EB 7D */ bl _create__17dMenu_Collect3D_cFv
/* 801B7A30 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B7A34 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B7A38 7C 08 03 A6 */ mtlr r0
/* 801B7A3C 38 21 00 10 */ addi r1, r1, 0x10
/* 801B7A40 4E 80 00 20 */ blr
@@ -1,159 +0,0 @@
lbl_801AFEA4:
/* 801AFEA4 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 801AFEA8 7C 08 02 A6 */ mflr r0
/* 801AFEAC 90 01 00 24 */ stw r0, 0x24(r1)
/* 801AFEB0 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 801AFEB4 93 C1 00 18 */ stw r30, 0x18(r1)
/* 801AFEB8 7C 7F 1B 78 */ mr r31, r3
/* 801AFEBC 80 63 00 04 */ lwz r3, 4(r3)
/* 801AFEC0 48 11 E8 C5 */ bl getTotalFreeSize__7JKRHeapFv
/* 801AFEC4 38 60 01 18 */ li r3, 0x118
/* 801AFEC8 48 11 ED 85 */ bl __nw__FUl
/* 801AFECC 7C 60 1B 79 */ or. r0, r3, r3
/* 801AFED0 41 82 00 0C */ beq lbl_801AFEDC
/* 801AFED4 48 14 85 C5 */ bl __ct__9J2DScreenFv
/* 801AFED8 7C 60 1B 78 */ mr r0, r3
lbl_801AFEDC:
/* 801AFEDC 90 1F 00 18 */ stw r0, 0x18(r31)
/* 801AFEE0 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801AFEE4 3C 80 80 39 */ lis r4, d_menu_d_menu_collect__stringBase0@ha /* 0x80395330@ha */
/* 801AFEE8 38 84 53 30 */ addi r4, r4, d_menu_d_menu_collect__stringBase0@l /* 0x80395330@l */
/* 801AFEEC 3C A0 01 02 */ lis r5, 0x102
/* 801AFEF0 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 801AFEF4 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 801AFEF8 80 DE 5C B8 */ lwz r6, 0x5cb8(r30)
/* 801AFEFC 48 14 87 4D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive
/* 801AFF00 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801AFF04 48 0A 51 E5 */ bl dPaneClass_showNullPane__FP9J2DScreen
/* 801AFF08 38 60 01 18 */ li r3, 0x118
/* 801AFF0C 48 11 ED 41 */ bl __nw__FUl
/* 801AFF10 7C 60 1B 79 */ or. r0, r3, r3
/* 801AFF14 41 82 00 0C */ beq lbl_801AFF20
/* 801AFF18 48 14 85 81 */ bl __ct__9J2DScreenFv
/* 801AFF1C 7C 60 1B 78 */ mr r0, r3
lbl_801AFF20:
/* 801AFF20 90 1F 00 1C */ stw r0, 0x1c(r31)
/* 801AFF24 80 7F 00 1C */ lwz r3, 0x1c(r31)
/* 801AFF28 3C 80 80 39 */ lis r4, d_menu_d_menu_collect__stringBase0@ha /* 0x80395330@ha */
/* 801AFF2C 38 84 53 30 */ addi r4, r4, d_menu_d_menu_collect__stringBase0@l /* 0x80395330@l */
/* 801AFF30 38 84 00 1F */ addi r4, r4, 0x1f
/* 801AFF34 3C A0 00 02 */ lis r5, 2
/* 801AFF38 80 DE 5C B8 */ lwz r6, 0x5cb8(r30)
/* 801AFF3C 48 14 87 0D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive
/* 801AFF40 38 60 00 00 */ li r3, 0
/* 801AFF44 7C 65 1B 78 */ mr r5, r3
/* 801AFF48 7C 64 1B 78 */ mr r4, r3
/* 801AFF4C 38 00 00 02 */ li r0, 2
/* 801AFF50 7C 09 03 A6 */ mtctr r0
lbl_801AFF54:
/* 801AFF54 7C DF 1A 14 */ add r6, r31, r3
/* 801AFF58 90 A6 01 6C */ stw r5, 0x16c(r6)
/* 801AFF5C 90 86 01 74 */ stw r4, 0x174(r6)
/* 801AFF60 38 63 00 04 */ addi r3, r3, 4
/* 801AFF64 42 00 FF F0 */ bdnz lbl_801AFF54
/* 801AFF68 80 7F 00 1C */ lwz r3, 0x1c(r31)
/* 801AFF6C 48 0A 51 7D */ bl dPaneClass_showNullPane__FP9J2DScreen
/* 801AFF70 38 60 00 08 */ li r3, 8
/* 801AFF74 48 11 EC D9 */ bl __nw__FUl
/* 801AFF78 28 03 00 00 */ cmplwi r3, 0
/* 801AFF7C 41 82 00 20 */ beq lbl_801AFF9C
/* 801AFF80 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */
/* 801AFF84 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */
/* 801AFF88 90 03 00 00 */ stw r0, 0(r3)
/* 801AFF8C 3C 80 80 3C */ lis r4, __vt__20dMenu_Collect2DTop_c@ha /* 0x803BC768@ha */
/* 801AFF90 38 04 C7 68 */ addi r0, r4, __vt__20dMenu_Collect2DTop_c@l /* 0x803BC768@l */
/* 801AFF94 90 03 00 00 */ stw r0, 0(r3)
/* 801AFF98 93 E3 00 04 */ stw r31, 4(r3)
lbl_801AFF9C:
/* 801AFF9C 90 7F 00 88 */ stw r3, 0x88(r31)
/* 801AFFA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 801AFFA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 801AFFA8 80 63 5D 30 */ lwz r3, 0x5d30(r3)
/* 801AFFAC 3C 80 54 49 */ lis r4, 0x5449 /* 0x54494D47@ha */
/* 801AFFB0 38 84 4D 47 */ addi r4, r4, 0x4D47 /* 0x54494D47@l */
/* 801AFFB4 3C A0 80 39 */ lis r5, d_menu_d_menu_collect__stringBase0@ha /* 0x80395330@ha */
/* 801AFFB8 38 A5 53 30 */ addi r5, r5, d_menu_d_menu_collect__stringBase0@l /* 0x80395330@l */
/* 801AFFBC 38 A5 00 45 */ addi r5, r5, 0x45
/* 801AFFC0 81 83 00 00 */ lwz r12, 0(r3)
/* 801AFFC4 81 8C 00 18 */ lwz r12, 0x18(r12)
/* 801AFFC8 7D 89 03 A6 */ mtctr r12
/* 801AFFCC 4E 80 04 21 */ bctrl
/* 801AFFD0 7C 7E 1B 78 */ mr r30, r3
/* 801AFFD4 38 60 01 50 */ li r3, 0x150
/* 801AFFD8 48 11 EC 75 */ bl __nw__FUl
/* 801AFFDC 7C 60 1B 79 */ or. r0, r3, r3
/* 801AFFE0 41 82 00 10 */ beq lbl_801AFFF0
/* 801AFFE4 7F C4 F3 78 */ mr r4, r30
/* 801AFFE8 48 14 C7 21 */ bl __ct__10J2DPictureFPC7ResTIMG
/* 801AFFEC 7C 60 1B 78 */ mr r0, r3
lbl_801AFFF0:
/* 801AFFF0 90 1F 00 8C */ stw r0, 0x8c(r31)
/* 801AFFF4 38 60 00 00 */ li r3, 0
/* 801AFFF8 98 61 00 08 */ stb r3, 8(r1)
/* 801AFFFC 98 61 00 09 */ stb r3, 9(r1)
/* 801B0000 98 61 00 0A */ stb r3, 0xa(r1)
/* 801B0004 38 00 00 FF */ li r0, 0xff
/* 801B0008 98 01 00 0B */ stb r0, 0xb(r1)
/* 801B000C 80 01 00 08 */ lwz r0, 8(r1)
/* 801B0010 90 01 00 0C */ stw r0, 0xc(r1)
/* 801B0014 98 61 00 10 */ stb r3, 0x10(r1)
/* 801B0018 98 61 00 11 */ stb r3, 0x11(r1)
/* 801B001C 98 61 00 12 */ stb r3, 0x12(r1)
/* 801B0020 98 61 00 13 */ stb r3, 0x13(r1)
/* 801B0024 80 01 00 10 */ lwz r0, 0x10(r1)
/* 801B0028 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B002C 80 7F 00 8C */ lwz r3, 0x8c(r31)
/* 801B0030 38 81 00 14 */ addi r4, r1, 0x14
/* 801B0034 38 A1 00 0C */ addi r5, r1, 0xc
/* 801B0038 81 83 00 00 */ lwz r12, 0(r3)
/* 801B003C 81 8C 01 30 */ lwz r12, 0x130(r12)
/* 801B0040 7D 89 03 A6 */ mtctr r12
/* 801B0044 4E 80 04 21 */ bctrl
/* 801B0048 80 7F 00 8C */ lwz r3, 0x8c(r31)
/* 801B004C 38 80 00 00 */ li r4, 0
/* 801B0050 81 83 00 00 */ lwz r12, 0(r3)
/* 801B0054 81 8C 00 24 */ lwz r12, 0x24(r12)
/* 801B0058 7D 89 03 A6 */ mtctr r12
/* 801B005C 4E 80 04 21 */ bctrl
/* 801B0060 38 60 00 B8 */ li r3, 0xb8
/* 801B0064 48 11 EB E9 */ bl __nw__FUl
/* 801B0068 7C 60 1B 79 */ or. r0, r3, r3
/* 801B006C 41 82 00 18 */ beq lbl_801B0084
/* 801B0070 38 80 00 02 */ li r4, 2
/* 801B0074 C0 22 A5 2C */ lfs f1, lit_4482(r2)
/* 801B0078 38 A0 00 00 */ li r5, 0
/* 801B007C 4B FE 41 A5 */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive
/* 801B0080 7C 60 1B 78 */ mr r0, r3
lbl_801B0084:
/* 801B0084 90 1F 00 20 */ stw r0, 0x20(r31)
/* 801B0088 38 60 00 2C */ li r3, 0x2c
/* 801B008C 48 11 EB C1 */ bl __nw__FUl
/* 801B0090 7C 60 1B 79 */ or. r0, r3, r3
/* 801B0094 41 82 00 0C */ beq lbl_801B00A0
/* 801B0098 48 09 9B 89 */ bl __ct__12dMsgString_cFv
/* 801B009C 7C 60 1B 78 */ mr r0, r3
lbl_801B00A0:
/* 801B00A0 90 1F 00 24 */ stw r0, 0x24(r31)
/* 801B00A4 38 00 00 00 */ li r0, 0
/* 801B00A8 90 1F 00 90 */ stw r0, 0x90(r31)
/* 801B00AC 90 1F 00 94 */ stw r0, 0x94(r31)
/* 801B00B0 90 1F 00 98 */ stw r0, 0x98(r31)
/* 801B00B4 90 1F 00 9C */ stw r0, 0x9c(r31)
/* 801B00B8 90 1F 00 A0 */ stw r0, 0xa0(r31)
/* 801B00BC 90 1F 00 A4 */ stw r0, 0xa4(r31)
/* 801B00C0 98 1F 02 2C */ stb r0, 0x22c(r31)
/* 801B00C4 7F E3 FB 78 */ mr r3, r31
/* 801B00C8 48 00 1B 75 */ bl animationSet__17dMenu_Collect2D_cFv
/* 801B00CC 7F E3 FB 78 */ mr r3, r31
/* 801B00D0 48 00 06 7D */ bl screenSet__17dMenu_Collect2D_cFv
/* 801B00D4 7F E3 FB 78 */ mr r3, r31
/* 801B00D8 48 00 04 99 */ bl initialize__17dMenu_Collect2D_cFv
/* 801B00DC 7F E3 FB 78 */ mr r3, r31
/* 801B00E0 38 80 00 01 */ li r4, 1
/* 801B00E4 48 00 41 F5 */ bl setHIO__17dMenu_Collect2D_cFb
/* 801B00E8 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 801B00EC 83 C1 00 18 */ lwz r30, 0x18(r1)
/* 801B00F0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 801B00F4 7C 08 03 A6 */ mtlr r0
/* 801B00F8 38 21 00 20 */ addi r1, r1, 0x20
/* 801B00FC 4E 80 00 20 */ blr
@@ -1,15 +0,0 @@
lbl_801B7A44:
/* 801B7A44 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B7A48 7C 08 02 A6 */ mflr r0
/* 801B7A4C 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B7A50 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B7A54 7C 7F 1B 78 */ mr r31, r3
/* 801B7A58 80 63 00 04 */ lwz r3, 4(r3)
/* 801B7A5C 4B FF 86 A5 */ bl _delete__17dMenu_Collect2D_cFv
/* 801B7A60 80 7F 00 08 */ lwz r3, 8(r31)
/* 801B7A64 4B FF EC 31 */ bl _delete__17dMenu_Collect3D_cFv
/* 801B7A68 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B7A6C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B7A70 7C 08 03 A6 */ mtlr r0
/* 801B7A74 38 21 00 10 */ addi r1, r1, 0x10
/* 801B7A78 4E 80 00 20 */ blr
@@ -1,317 +0,0 @@
lbl_801B0100:
/* 801B0100 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 801B0104 7C 08 02 A6 */ mflr r0
/* 801B0108 90 01 00 34 */ stw r0, 0x34(r1)
/* 801B010C 39 61 00 30 */ addi r11, r1, 0x30
/* 801B0110 48 1B 20 B9 */ bl _savegpr_24
/* 801B0114 7C 7F 1B 78 */ mr r31, r3
/* 801B0118 80 63 00 04 */ lwz r3, 4(r3)
/* 801B011C 48 11 E6 69 */ bl getTotalFreeSize__7JKRHeapFv
/* 801B0120 88 9F 02 58 */ lbz r4, 0x258(r31)
/* 801B0124 88 1F 02 57 */ lbz r0, 0x257(r31)
/* 801B0128 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
/* 801B012C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
/* 801B0130 98 03 00 DF */ stb r0, 0xdf(r3)
/* 801B0134 98 83 00 E0 */ stb r4, 0xe0(r3)
/* 801B0138 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B013C 28 03 00 00 */ cmplwi r3, 0
/* 801B0140 41 82 00 18 */ beq lbl_801B0158
/* 801B0144 38 80 00 01 */ li r4, 1
/* 801B0148 81 83 00 00 */ lwz r12, 0(r3)
/* 801B014C 81 8C 00 08 */ lwz r12, 8(r12)
/* 801B0150 7D 89 03 A6 */ mtctr r12
/* 801B0154 4E 80 04 21 */ bctrl
lbl_801B0158:
/* 801B0158 38 00 00 00 */ li r0, 0
/* 801B015C 90 1F 00 18 */ stw r0, 0x18(r31)
/* 801B0160 80 7F 00 1C */ lwz r3, 0x1c(r31)
/* 801B0164 28 03 00 00 */ cmplwi r3, 0
/* 801B0168 41 82 00 18 */ beq lbl_801B0180
/* 801B016C 38 80 00 01 */ li r4, 1
/* 801B0170 81 83 00 00 */ lwz r12, 0(r3)
/* 801B0174 81 8C 00 08 */ lwz r12, 8(r12)
/* 801B0178 7D 89 03 A6 */ mtctr r12
/* 801B017C 4E 80 04 21 */ bctrl
lbl_801B0180:
/* 801B0180 3B 80 00 00 */ li r28, 0
/* 801B0184 93 9F 00 1C */ stw r28, 0x1c(r31)
/* 801B0188 3B 40 00 00 */ li r26, 0
lbl_801B018C:
/* 801B018C 7F 7F E2 14 */ add r27, r31, r28
/* 801B0190 80 7B 01 6C */ lwz r3, 0x16c(r27)
/* 801B0194 28 03 00 00 */ cmplwi r3, 0
/* 801B0198 41 82 00 24 */ beq lbl_801B01BC
/* 801B019C 41 82 00 18 */ beq lbl_801B01B4
/* 801B01A0 38 80 00 01 */ li r4, 1
/* 801B01A4 81 83 00 00 */ lwz r12, 0(r3)
/* 801B01A8 81 8C 00 08 */ lwz r12, 8(r12)
/* 801B01AC 7D 89 03 A6 */ mtctr r12
/* 801B01B0 4E 80 04 21 */ bctrl
lbl_801B01B4:
/* 801B01B4 38 00 00 00 */ li r0, 0
/* 801B01B8 90 1B 01 6C */ stw r0, 0x16c(r27)
lbl_801B01BC:
/* 801B01BC 80 7B 01 74 */ lwz r3, 0x174(r27)
/* 801B01C0 28 03 00 00 */ cmplwi r3, 0
/* 801B01C4 41 82 00 24 */ beq lbl_801B01E8
/* 801B01C8 41 82 00 18 */ beq lbl_801B01E0
/* 801B01CC 38 80 00 01 */ li r4, 1
/* 801B01D0 81 83 00 00 */ lwz r12, 0(r3)
/* 801B01D4 81 8C 00 08 */ lwz r12, 8(r12)
/* 801B01D8 7D 89 03 A6 */ mtctr r12
/* 801B01DC 4E 80 04 21 */ bctrl
lbl_801B01E0:
/* 801B01E0 38 00 00 00 */ li r0, 0
/* 801B01E4 90 1B 01 74 */ stw r0, 0x174(r27)
lbl_801B01E8:
/* 801B01E8 3B 5A 00 01 */ addi r26, r26, 1
/* 801B01EC 2C 1A 00 02 */ cmpwi r26, 2
/* 801B01F0 3B 9C 00 04 */ addi r28, r28, 4
/* 801B01F4 41 80 FF 98 */ blt lbl_801B018C
/* 801B01F8 80 7F 00 88 */ lwz r3, 0x88(r31)
/* 801B01FC 28 03 00 00 */ cmplwi r3, 0
/* 801B0200 41 82 00 18 */ beq lbl_801B0218
/* 801B0204 38 80 00 01 */ li r4, 1
/* 801B0208 81 83 00 00 */ lwz r12, 0(r3)
/* 801B020C 81 8C 00 0C */ lwz r12, 0xc(r12)
/* 801B0210 7D 89 03 A6 */ mtctr r12
/* 801B0214 4E 80 04 21 */ bctrl
lbl_801B0218:
/* 801B0218 38 00 00 00 */ li r0, 0
/* 801B021C 90 1F 00 88 */ stw r0, 0x88(r31)
/* 801B0220 80 7F 00 8C */ lwz r3, 0x8c(r31)
/* 801B0224 28 03 00 00 */ cmplwi r3, 0
/* 801B0228 41 82 00 18 */ beq lbl_801B0240
/* 801B022C 38 80 00 01 */ li r4, 1
/* 801B0230 81 83 00 00 */ lwz r12, 0(r3)
/* 801B0234 81 8C 00 08 */ lwz r12, 8(r12)
/* 801B0238 7D 89 03 A6 */ mtctr r12
/* 801B023C 4E 80 04 21 */ bctrl
lbl_801B0240:
/* 801B0240 38 00 00 00 */ li r0, 0
/* 801B0244 90 1F 00 8C */ stw r0, 0x8c(r31)
/* 801B0248 80 7F 00 20 */ lwz r3, 0x20(r31)
/* 801B024C 28 03 00 00 */ cmplwi r3, 0
/* 801B0250 41 82 00 18 */ beq lbl_801B0268
/* 801B0254 38 80 00 01 */ li r4, 1
/* 801B0258 81 83 00 00 */ lwz r12, 0(r3)
/* 801B025C 81 8C 00 0C */ lwz r12, 0xc(r12)
/* 801B0260 7D 89 03 A6 */ mtctr r12
/* 801B0264 4E 80 04 21 */ bctrl
lbl_801B0268:
/* 801B0268 38 00 00 00 */ li r0, 0
/* 801B026C 90 1F 00 20 */ stw r0, 0x20(r31)
/* 801B0270 80 7F 00 24 */ lwz r3, 0x24(r31)
/* 801B0274 38 80 00 01 */ li r4, 1
/* 801B0278 48 09 9A B1 */ bl __dt__12dMsgString_cFv
/* 801B027C 38 00 00 00 */ li r0, 0
/* 801B0280 90 1F 00 24 */ stw r0, 0x24(r31)
/* 801B0284 80 7F 00 08 */ lwz r3, 8(r31)
/* 801B0288 4B E5 EF 45 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B028C 7C 7A 1B 78 */ mr r26, r3
/* 801B0290 80 7F 00 90 */ lwz r3, 0x90(r31)
/* 801B0294 28 03 00 00 */ cmplwi r3, 0
/* 801B0298 41 82 00 38 */ beq lbl_801B02D0
/* 801B029C 48 04 08 8D */ bl _delete__12dMenu_save_cFv
/* 801B02A0 80 7F 00 90 */ lwz r3, 0x90(r31)
/* 801B02A4 28 03 00 00 */ cmplwi r3, 0
/* 801B02A8 41 82 00 18 */ beq lbl_801B02C0
/* 801B02AC 38 80 00 01 */ li r4, 1
/* 801B02B0 81 83 00 00 */ lwz r12, 0(r3)
/* 801B02B4 81 8C 00 08 */ lwz r12, 8(r12)
/* 801B02B8 7D 89 03 A6 */ mtctr r12
/* 801B02BC 4E 80 04 21 */ bctrl
lbl_801B02C0:
/* 801B02C0 38 00 00 00 */ li r0, 0
/* 801B02C4 90 1F 00 90 */ stw r0, 0x90(r31)
/* 801B02C8 80 7F 00 08 */ lwz r3, 8(r31)
/* 801B02CC 48 11 E3 01 */ bl freeAll__7JKRHeapFv
lbl_801B02D0:
/* 801B02D0 80 7F 00 94 */ lwz r3, 0x94(r31)
/* 801B02D4 28 03 00 00 */ cmplwi r3, 0
/* 801B02D8 41 82 00 38 */ beq lbl_801B0310
/* 801B02DC 48 03 29 41 */ bl _delete__14dMenu_Option_cFv
/* 801B02E0 80 7F 00 94 */ lwz r3, 0x94(r31)
/* 801B02E4 28 03 00 00 */ cmplwi r3, 0
/* 801B02E8 41 82 00 18 */ beq lbl_801B0300
/* 801B02EC 38 80 00 01 */ li r4, 1
/* 801B02F0 81 83 00 00 */ lwz r12, 0(r3)
/* 801B02F4 81 8C 00 0C */ lwz r12, 0xc(r12)
/* 801B02F8 7D 89 03 A6 */ mtctr r12
/* 801B02FC 4E 80 04 21 */ bctrl
lbl_801B0300:
/* 801B0300 38 00 00 00 */ li r0, 0
/* 801B0304 90 1F 00 94 */ stw r0, 0x94(r31)
/* 801B0308 80 7F 00 08 */ lwz r3, 8(r31)
/* 801B030C 48 11 E2 C1 */ bl freeAll__7JKRHeapFv
lbl_801B0310:
/* 801B0310 80 7F 00 98 */ lwz r3, 0x98(r31)
/* 801B0314 28 03 00 00 */ cmplwi r3, 0
/* 801B0318 41 82 00 2C */ beq lbl_801B0344
/* 801B031C 41 82 00 18 */ beq lbl_801B0334
/* 801B0320 38 80 00 01 */ li r4, 1
/* 801B0324 81 83 00 00 */ lwz r12, 0(r3)
/* 801B0328 81 8C 00 0C */ lwz r12, 0xc(r12)
/* 801B032C 7D 89 03 A6 */ mtctr r12
/* 801B0330 4E 80 04 21 */ bctrl
lbl_801B0334:
/* 801B0334 38 00 00 00 */ li r0, 0
/* 801B0338 90 1F 00 98 */ stw r0, 0x98(r31)
/* 801B033C 80 7F 00 08 */ lwz r3, 8(r31)
/* 801B0340 48 11 E2 8D */ bl freeAll__7JKRHeapFv
lbl_801B0344:
/* 801B0344 80 7F 00 9C */ lwz r3, 0x9c(r31)
/* 801B0348 28 03 00 00 */ cmplwi r3, 0
/* 801B034C 41 82 00 2C */ beq lbl_801B0378
/* 801B0350 41 82 00 18 */ beq lbl_801B0368
/* 801B0354 38 80 00 01 */ li r4, 1
/* 801B0358 81 83 00 00 */ lwz r12, 0(r3)
/* 801B035C 81 8C 00 0C */ lwz r12, 0xc(r12)
/* 801B0360 7D 89 03 A6 */ mtctr r12
/* 801B0364 4E 80 04 21 */ bctrl
lbl_801B0368:
/* 801B0368 38 00 00 00 */ li r0, 0
/* 801B036C 90 1F 00 9C */ stw r0, 0x9c(r31)
/* 801B0370 80 7F 00 08 */ lwz r3, 8(r31)
/* 801B0374 48 11 E2 59 */ bl freeAll__7JKRHeapFv
lbl_801B0378:
/* 801B0378 80 7F 00 A0 */ lwz r3, 0xa0(r31)
/* 801B037C 28 03 00 00 */ cmplwi r3, 0
/* 801B0380 41 82 00 2C */ beq lbl_801B03AC
/* 801B0384 41 82 00 18 */ beq lbl_801B039C
/* 801B0388 38 80 00 01 */ li r4, 1
/* 801B038C 81 83 00 00 */ lwz r12, 0(r3)
/* 801B0390 81 8C 00 0C */ lwz r12, 0xc(r12)
/* 801B0394 7D 89 03 A6 */ mtctr r12
/* 801B0398 4E 80 04 21 */ bctrl
lbl_801B039C:
/* 801B039C 38 00 00 00 */ li r0, 0
/* 801B03A0 90 1F 00 A0 */ stw r0, 0xa0(r31)
/* 801B03A4 80 7F 00 08 */ lwz r3, 8(r31)
/* 801B03A8 48 11 E2 25 */ bl freeAll__7JKRHeapFv
lbl_801B03AC:
/* 801B03AC 80 7F 00 A4 */ lwz r3, 0xa4(r31)
/* 801B03B0 28 03 00 00 */ cmplwi r3, 0
/* 801B03B4 41 82 00 2C */ beq lbl_801B03E0
/* 801B03B8 41 82 00 18 */ beq lbl_801B03D0
/* 801B03BC 38 80 00 01 */ li r4, 1
/* 801B03C0 81 83 00 00 */ lwz r12, 0(r3)
/* 801B03C4 81 8C 00 0C */ lwz r12, 0xc(r12)
/* 801B03C8 7D 89 03 A6 */ mtctr r12
/* 801B03CC 4E 80 04 21 */ bctrl
lbl_801B03D0:
/* 801B03D0 38 00 00 00 */ li r0, 0
/* 801B03D4 90 1F 00 A4 */ stw r0, 0xa4(r31)
/* 801B03D8 80 7F 00 08 */ lwz r3, 8(r31)
/* 801B03DC 48 11 E1 F1 */ bl freeAll__7JKRHeapFv
lbl_801B03E0:
/* 801B03E0 7F 43 D3 78 */ mr r3, r26
/* 801B03E4 4B E5 ED E9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B03E8 80 7F 00 2C */ lwz r3, 0x2c(r31)
/* 801B03EC 28 03 00 00 */ cmplwi r3, 0
/* 801B03F0 41 82 00 18 */ beq lbl_801B0408
/* 801B03F4 38 80 00 01 */ li r4, 1
/* 801B03F8 81 83 00 00 */ lwz r12, 0(r3)
/* 801B03FC 81 8C 00 08 */ lwz r12, 8(r12)
/* 801B0400 7D 89 03 A6 */ mtctr r12
/* 801B0404 4E 80 04 21 */ bctrl
lbl_801B0408:
/* 801B0408 38 00 00 00 */ li r0, 0
/* 801B040C 90 1F 00 2C */ stw r0, 0x2c(r31)
/* 801B0410 3B 20 00 00 */ li r25, 0
/* 801B0414 3B C0 00 00 */ li r30, 0
lbl_801B0418:
/* 801B0418 3B 00 00 00 */ li r24, 0
/* 801B041C 3B A0 00 00 */ li r29, 0
/* 801B0420 7F 7F F2 14 */ add r27, r31, r30
/* 801B0424 3B 80 00 00 */ li r28, 0
lbl_801B0428:
/* 801B0428 3B 5D 00 B0 */ addi r26, r29, 0xb0
/* 801B042C 7C 7B D0 2E */ lwzx r3, r27, r26
/* 801B0430 28 03 00 00 */ cmplwi r3, 0
/* 801B0434 41 82 00 20 */ beq lbl_801B0454
/* 801B0438 41 82 00 18 */ beq lbl_801B0450
/* 801B043C 38 80 00 01 */ li r4, 1
/* 801B0440 81 83 00 00 */ lwz r12, 0(r3)
/* 801B0444 81 8C 00 08 */ lwz r12, 8(r12)
/* 801B0448 7D 89 03 A6 */ mtctr r12
/* 801B044C 4E 80 04 21 */ bctrl
lbl_801B0450:
/* 801B0450 7F 9B D1 2E */ stwx r28, r27, r26
lbl_801B0454:
/* 801B0454 3B 18 00 01 */ addi r24, r24, 1
/* 801B0458 2C 18 00 06 */ cmpwi r24, 6
/* 801B045C 3B BD 00 04 */ addi r29, r29, 4
/* 801B0460 41 80 FF C8 */ blt lbl_801B0428
/* 801B0464 3B 39 00 01 */ addi r25, r25, 1
/* 801B0468 2C 19 00 07 */ cmpwi r25, 7
/* 801B046C 3B DE 00 18 */ addi r30, r30, 0x18
/* 801B0470 41 80 FF A8 */ blt lbl_801B0418
/* 801B0474 80 7F 00 A8 */ lwz r3, 0xa8(r31)
/* 801B0478 28 03 00 00 */ cmplwi r3, 0
/* 801B047C 41 82 00 18 */ beq lbl_801B0494
/* 801B0480 38 80 00 01 */ li r4, 1
/* 801B0484 81 83 00 00 */ lwz r12, 0(r3)
/* 801B0488 81 8C 00 08 */ lwz r12, 8(r12)
/* 801B048C 7D 89 03 A6 */ mtctr r12
/* 801B0490 4E 80 04 21 */ bctrl
lbl_801B0494:
/* 801B0494 38 00 00 00 */ li r0, 0
/* 801B0498 90 1F 00 A8 */ stw r0, 0xa8(r31)
/* 801B049C 80 7F 00 AC */ lwz r3, 0xac(r31)
/* 801B04A0 28 03 00 00 */ cmplwi r3, 0
/* 801B04A4 41 82 00 18 */ beq lbl_801B04BC
/* 801B04A8 38 80 00 01 */ li r4, 1
/* 801B04AC 81 83 00 00 */ lwz r12, 0(r3)
/* 801B04B0 81 8C 00 08 */ lwz r12, 8(r12)
/* 801B04B4 7D 89 03 A6 */ mtctr r12
/* 801B04B8 4E 80 04 21 */ bctrl
lbl_801B04BC:
/* 801B04BC 38 00 00 00 */ li r0, 0
/* 801B04C0 90 1F 00 AC */ stw r0, 0xac(r31)
/* 801B04C4 80 7F 01 60 */ lwz r3, 0x160(r31)
/* 801B04C8 28 03 00 00 */ cmplwi r3, 0
/* 801B04CC 41 82 00 18 */ beq lbl_801B04E4
/* 801B04D0 38 80 00 01 */ li r4, 1
/* 801B04D4 81 83 00 00 */ lwz r12, 0(r3)
/* 801B04D8 81 8C 00 08 */ lwz r12, 8(r12)
/* 801B04DC 7D 89 03 A6 */ mtctr r12
/* 801B04E0 4E 80 04 21 */ bctrl
lbl_801B04E4:
/* 801B04E4 38 00 00 00 */ li r0, 0
/* 801B04E8 90 1F 01 60 */ stw r0, 0x160(r31)
/* 801B04EC 80 7F 01 64 */ lwz r3, 0x164(r31)
/* 801B04F0 28 03 00 00 */ cmplwi r3, 0
/* 801B04F4 41 82 00 18 */ beq lbl_801B050C
/* 801B04F8 38 80 00 01 */ li r4, 1
/* 801B04FC 81 83 00 00 */ lwz r12, 0(r3)
/* 801B0500 81 8C 00 08 */ lwz r12, 8(r12)
/* 801B0504 7D 89 03 A6 */ mtctr r12
/* 801B0508 4E 80 04 21 */ bctrl
lbl_801B050C:
/* 801B050C 38 00 00 00 */ li r0, 0
/* 801B0510 90 1F 01 64 */ stw r0, 0x164(r31)
/* 801B0514 80 7F 01 68 */ lwz r3, 0x168(r31)
/* 801B0518 28 03 00 00 */ cmplwi r3, 0
/* 801B051C 41 82 00 18 */ beq lbl_801B0534
/* 801B0520 38 80 00 01 */ li r4, 1
/* 801B0524 81 83 00 00 */ lwz r12, 0(r3)
/* 801B0528 81 8C 00 08 */ lwz r12, 8(r12)
/* 801B052C 7D 89 03 A6 */ mtctr r12
/* 801B0530 4E 80 04 21 */ bctrl
lbl_801B0534:
/* 801B0534 38 00 00 00 */ li r0, 0
/* 801B0538 90 1F 01 68 */ stw r0, 0x168(r31)
/* 801B053C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 801B0540 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 801B0544 80 63 5C B8 */ lwz r3, 0x5cb8(r3)
/* 801B0548 81 83 00 00 */ lwz r12, 0(r3)
/* 801B054C 81 8C 00 24 */ lwz r12, 0x24(r12)
/* 801B0550 7D 89 03 A6 */ mtctr r12
/* 801B0554 4E 80 04 21 */ bctrl
/* 801B0558 39 61 00 30 */ addi r11, r1, 0x30
/* 801B055C 48 1B 1C B9 */ bl _restgpr_24
/* 801B0560 80 01 00 34 */ lwz r0, 0x34(r1)
/* 801B0564 7C 08 03 A6 */ mtlr r0
/* 801B0568 38 21 00 30 */ addi r1, r1, 0x30
/* 801B056C 4E 80 00 20 */ blr
@@ -1,15 +0,0 @@
lbl_801B6694:
/* 801B6694 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B6698 7C 08 02 A6 */ mflr r0
/* 801B669C 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B66A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 801B66A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 801B66A8 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 801B66AC 28 03 00 00 */ cmplwi r3, 0
/* 801B66B0 41 82 00 08 */ beq lbl_801B66B8
/* 801B66B4 4B F8 A4 15 */ bl resetStatusWindow__9daAlink_cFv
lbl_801B66B8:
/* 801B66B8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B66BC 7C 08 03 A6 */ mtlr r0
/* 801B66C0 38 21 00 10 */ addi r1, r1, 0x10
/* 801B66C4 4E 80 00 20 */ blr
@@ -1,18 +0,0 @@
lbl_801B7A7C:
/* 801B7A7C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B7A80 7C 08 02 A6 */ mflr r0
/* 801B7A84 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B7A88 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B7A8C 7C 7F 1B 78 */ mr r31, r3
/* 801B7A90 80 63 00 04 */ lwz r3, 4(r3)
/* 801B7A94 4B FF E2 41 */ bl _move__17dMenu_Collect2D_cFv
/* 801B7A98 80 7F 00 04 */ lwz r3, 4(r31)
/* 801B7A9C 88 A3 02 58 */ lbz r5, 0x258(r3)
/* 801B7AA0 88 83 02 57 */ lbz r4, 0x257(r3)
/* 801B7AA4 80 7F 00 08 */ lwz r3, 8(r31)
/* 801B7AA8 4B FF EC 21 */ bl _move__17dMenu_Collect3D_cFUcUc
/* 801B7AAC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B7AB0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B7AB4 7C 08 03 A6 */ mtlr r0
/* 801B7AB8 38 21 00 10 */ addi r1, r1, 0x10
/* 801B7ABC 4E 80 00 20 */ blr
@@ -1,16 +0,0 @@
lbl_801B5F48:
/* 801B5F48 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5F4C 7C 08 02 A6 */ mflr r0
/* 801B5F50 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5F54 7C 66 1B 78 */ mr r6, r3
/* 801B5F58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 801B5F5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 801B5F60 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 801B5F64 38 83 00 AC */ addi r4, r3, 0xac
/* 801B5F68 38 A3 00 B0 */ addi r5, r3, 0xb0
/* 801B5F6C 80 C6 00 88 */ lwz r6, 0x88(r6)
/* 801B5F70 4B EA 08 25 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c
/* 801B5F74 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B5F78 7C 08 03 A6 */ mtlr r0
/* 801B5F7C 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5F80 4E 80 00 20 */ blr
@@ -1,22 +0,0 @@
lbl_801B7AC0:
/* 801B7AC0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B7AC4 7C 08 02 A6 */ mflr r0
/* 801B7AC8 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B7ACC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B7AD0 7C 7F 1B 78 */ mr r31, r3
/* 801B7AD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 801B7AD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 801B7ADC 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 801B7AE0 38 83 01 B4 */ addi r4, r3, 0x1b4
/* 801B7AE4 38 A3 01 B8 */ addi r5, r3, 0x1b8
/* 801B7AE8 80 DF 00 04 */ lwz r6, 4(r31)
/* 801B7AEC 4B E9 EC A9 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c
/* 801B7AF0 80 7F 00 08 */ lwz r3, 8(r31)
/* 801B7AF4 4B FF EE 79 */ bl draw__17dMenu_Collect3D_cFv
/* 801B7AF8 80 7F 00 04 */ lwz r3, 4(r31)
/* 801B7AFC 4B FF E4 4D */ bl drawTop__17dMenu_Collect2D_cFv
/* 801B7B00 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B7B04 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B7B08 7C 08 03 A6 */ mtlr r0
/* 801B7B0C 38 21 00 10 */ addi r1, r1, 0x10
/* 801B7B10 4E 80 00 20 */ blr
@@ -1,52 +0,0 @@
lbl_801B696C:
/* 801B696C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B6970 7C 08 02 A6 */ mflr r0
/* 801B6974 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B6978 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B697C 93 C1 00 08 */ stw r30, 8(r1)
/* 801B6980 7C 7E 1B 78 */ mr r30, r3
/* 801B6984 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 801B6988 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 801B698C 80 04 5F 98 */ lwz r0, 0x5f98(r4)
/* 801B6990 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
/* 801B6994 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */
/* 801B6998 90 1F 00 48 */ stw r0, 0x48(r31)
/* 801B699C 80 04 5F 9C */ lwz r0, 0x5f9c(r4)
/* 801B69A0 90 1F 00 4C */ stw r0, 0x4c(r31)
/* 801B69A4 80 64 5D B4 */ lwz r3, 0x5db4(r4)
/* 801B69A8 28 03 00 00 */ cmplwi r3, 0
/* 801B69AC 41 82 00 08 */ beq lbl_801B69B4
/* 801B69B0 4B F8 9F D5 */ bl statusWindowDraw__9daAlink_cFv
lbl_801B69B4:
/* 801B69B4 80 1E 00 18 */ lwz r0, 0x18(r30)
/* 801B69B8 28 00 00 00 */ cmplwi r0, 0
/* 801B69BC 41 82 00 44 */ beq lbl_801B6A00
/* 801B69C0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 801B69C4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 801B69C8 38 80 00 0D */ li r4, 0xd
/* 801B69CC 38 BE 03 B0 */ addi r5, r30, 0x3b0
/* 801B69D0 38 DE 00 28 */ addi r6, r30, 0x28
/* 801B69D4 4B FE CD F1 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c
/* 801B69D8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 801B69DC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 801B69E0 80 9E 00 18 */ lwz r4, 0x18(r30)
/* 801B69E4 80 84 00 04 */ lwz r4, 4(r4)
/* 801B69E8 38 BE 00 28 */ addi r5, r30, 0x28
/* 801B69EC 4B FE E3 B5 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c
/* 801B69F0 7F C3 F3 78 */ mr r3, r30
/* 801B69F4 48 00 05 BD */ bl animeEntry__17dMenu_Collect3D_cFv
/* 801B69F8 80 7E 00 18 */ lwz r3, 0x18(r30)
/* 801B69FC 4B E5 72 C9 */ bl mDoExt_modelUpdateDL__FP8J3DModel
lbl_801B6A00:
/* 801B6A00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 801B6A04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 801B6A08 80 03 5F 80 */ lwz r0, 0x5f80(r3)
/* 801B6A0C 90 1F 00 48 */ stw r0, 0x48(r31)
/* 801B6A10 80 03 5F 84 */ lwz r0, 0x5f84(r3)
/* 801B6A14 90 1F 00 4C */ stw r0, 0x4c(r31)
/* 801B6A18 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B6A1C 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B6A20 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B6A24 7C 08 03 A6 */ mtlr r0
/* 801B6A28 38 21 00 10 */ addi r1, r1, 0x10
/* 801B6A2C 4E 80 00 20 */ blr
@@ -1,16 +0,0 @@
lbl_801B5738:
/* 801B5738 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B573C 7C 08 02 A6 */ mflr r0
/* 801B5740 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5744 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B5748 7C 7F 1B 78 */ mr r31, r3
/* 801B574C 38 80 00 00 */ li r4, 0
/* 801B5750 48 00 08 65 */ bl setAButtonString__17dMenu_Collect2D_cFUs
/* 801B5754 7F E3 FB 78 */ mr r3, r31
/* 801B5758 38 80 00 00 */ li r4, 0
/* 801B575C 48 00 09 5D */ bl setBButtonString__17dMenu_Collect2D_cFUs
/* 801B5760 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5764 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B5768 7C 08 03 A6 */ mtlr r0
/* 801B576C 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5770 4E 80 00 20 */ blr
@@ -1,34 +0,0 @@
lbl_801B5774:
/* 801B5774 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5778 7C 08 02 A6 */ mflr r0
/* 801B577C 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5780 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B5784 93 C1 00 08 */ stw r30, 8(r1)
/* 801B5788 7C 7E 1B 78 */ mr r30, r3
/* 801B578C 80 63 00 08 */ lwz r3, 8(r3)
/* 801B5790 4B E5 9A 3D */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5794 7C 7F 1B 78 */ mr r31, r3
/* 801B5798 80 7E 00 9C */ lwz r3, 0x9c(r30)
/* 801B579C 88 03 01 FA */ lbz r0, 0x1fa(r3)
/* 801B57A0 28 00 00 03 */ cmplwi r0, 3
/* 801B57A4 40 82 00 08 */ bne lbl_801B57AC
/* 801B57A8 48 00 FC C9 */ bl _close__15dMenu_Fishing_cFv
lbl_801B57AC:
/* 801B57AC 80 7E 00 9C */ lwz r3, 0x9c(r30)
/* 801B57B0 88 03 01 FA */ lbz r0, 0x1fa(r3)
/* 801B57B4 28 00 00 00 */ cmplwi r0, 0
/* 801B57B8 40 82 00 18 */ bne lbl_801B57D0
/* 801B57BC 38 00 00 00 */ li r0, 0
/* 801B57C0 98 1E 02 2C */ stb r0, 0x22c(r30)
/* 801B57C4 38 00 00 FF */ li r0, 0xff
/* 801B57C8 80 7E 00 20 */ lwz r3, 0x20(r30)
/* 801B57CC 98 03 00 B4 */ stb r0, 0xb4(r3)
lbl_801B57D0:
/* 801B57D0 7F E3 FB 78 */ mr r3, r31
/* 801B57D4 4B E5 99 F9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B57D8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B57DC 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B57E0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B57E4 7C 08 03 A6 */ mtlr r0
/* 801B57E8 38 21 00 10 */ addi r1, r1, 0x10
/* 801B57EC 4E 80 00 20 */ blr
@@ -1,16 +0,0 @@
lbl_801B568C:
/* 801B568C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5690 7C 08 02 A6 */ mflr r0
/* 801B5694 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5698 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B569C 7C 7F 1B 78 */ mr r31, r3
/* 801B56A0 38 80 04 0C */ li r4, 0x40c
/* 801B56A4 48 00 09 11 */ bl setAButtonString__17dMenu_Collect2D_cFUs
/* 801B56A8 7F E3 FB 78 */ mr r3, r31
/* 801B56AC 38 80 03 F9 */ li r4, 0x3f9
/* 801B56B0 48 00 0A 09 */ bl setBButtonString__17dMenu_Collect2D_cFUs
/* 801B56B4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B56B8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B56BC 7C 08 03 A6 */ mtlr r0
/* 801B56C0 38 21 00 10 */ addi r1, r1, 0x10
/* 801B56C4 4E 80 00 20 */ blr
@@ -1,31 +0,0 @@
lbl_801B56C8:
/* 801B56C8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B56CC 7C 08 02 A6 */ mflr r0
/* 801B56D0 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B56D4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B56D8 93 C1 00 08 */ stw r30, 8(r1)
/* 801B56DC 7C 7E 1B 78 */ mr r30, r3
/* 801B56E0 80 63 00 08 */ lwz r3, 8(r3)
/* 801B56E4 4B E5 9A E9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B56E8 7C 7F 1B 78 */ mr r31, r3
/* 801B56EC 80 7E 00 9C */ lwz r3, 0x9c(r30)
/* 801B56F0 88 03 01 FA */ lbz r0, 0x1fa(r3)
/* 801B56F4 28 00 00 02 */ cmplwi r0, 2
/* 801B56F8 40 82 00 08 */ bne lbl_801B5700
/* 801B56FC 48 00 F9 B9 */ bl _move__15dMenu_Fishing_cFv
lbl_801B5700:
/* 801B5700 80 7E 00 9C */ lwz r3, 0x9c(r30)
/* 801B5704 88 03 01 FA */ lbz r0, 0x1fa(r3)
/* 801B5708 28 00 00 03 */ cmplwi r0, 3
/* 801B570C 40 82 00 0C */ bne lbl_801B5718
/* 801B5710 38 00 00 0C */ li r0, 0xc
/* 801B5714 98 1E 02 2C */ stb r0, 0x22c(r30)
lbl_801B5718:
/* 801B5718 7F E3 FB 78 */ mr r3, r31
/* 801B571C 4B E5 9A B1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5720 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5724 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B5728 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B572C 7C 08 03 A6 */ mtlr r0
/* 801B5730 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5734 4E 80 00 20 */ blr
@@ -1,42 +0,0 @@
lbl_801B5580:
/* 801B5580 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5584 7C 08 02 A6 */ mflr r0
/* 801B5588 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B558C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B5590 93 C1 00 08 */ stw r30, 8(r1)
/* 801B5594 7C 7E 1B 78 */ mr r30, r3
/* 801B5598 80 63 00 08 */ lwz r3, 8(r3)
/* 801B559C 4B E5 9C 31 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B55A0 7C 7F 1B 78 */ mr r31, r3
/* 801B55A4 80 1E 00 9C */ lwz r0, 0x9c(r30)
/* 801B55A8 28 00 00 00 */ cmplwi r0, 0
/* 801B55AC 40 82 00 2C */ bne lbl_801B55D8
/* 801B55B0 38 60 01 FC */ li r3, 0x1fc
/* 801B55B4 48 11 96 99 */ bl __nw__FUl
/* 801B55B8 7C 60 1B 79 */ or. r0, r3, r3
/* 801B55BC 41 82 00 18 */ beq lbl_801B55D4
/* 801B55C0 80 9E 00 08 */ lwz r4, 8(r30)
/* 801B55C4 80 BE 00 10 */ lwz r5, 0x10(r30)
/* 801B55C8 80 DE 00 14 */ lwz r6, 0x14(r30)
/* 801B55CC 48 00 F7 89 */ bl __ct__15dMenu_Fishing_cFP10JKRExpHeapP9STControlP10CSTControl
/* 801B55D0 7C 60 1B 78 */ mr r0, r3
lbl_801B55D4:
/* 801B55D4 90 1E 00 9C */ stw r0, 0x9c(r30)
lbl_801B55D8:
/* 801B55D8 7F C3 F3 78 */ mr r3, r30
/* 801B55DC 38 80 00 00 */ li r4, 0
/* 801B55E0 48 00 09 D5 */ bl setAButtonString__17dMenu_Collect2D_cFUs
/* 801B55E4 7F C3 F3 78 */ mr r3, r30
/* 801B55E8 38 80 00 00 */ li r4, 0
/* 801B55EC 48 00 0A CD */ bl setBButtonString__17dMenu_Collect2D_cFUs
/* 801B55F0 38 00 00 00 */ li r0, 0
/* 801B55F4 80 7E 00 20 */ lwz r3, 0x20(r30)
/* 801B55F8 98 03 00 B4 */ stb r0, 0xb4(r3)
/* 801B55FC 7F E3 FB 78 */ mr r3, r31
/* 801B5600 4B E5 9B CD */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5604 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5608 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B560C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B5610 7C 08 03 A6 */ mtlr r0
/* 801B5614 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5618 4E 80 00 20 */ blr
@@ -1,31 +0,0 @@
lbl_801B561C:
/* 801B561C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5620 7C 08 02 A6 */ mflr r0
/* 801B5624 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5628 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B562C 93 C1 00 08 */ stw r30, 8(r1)
/* 801B5630 7C 7E 1B 78 */ mr r30, r3
/* 801B5634 80 63 00 08 */ lwz r3, 8(r3)
/* 801B5638 4B E5 9B 95 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B563C 7C 7F 1B 78 */ mr r31, r3
/* 801B5640 80 7E 00 9C */ lwz r3, 0x9c(r30)
/* 801B5644 88 03 01 FA */ lbz r0, 0x1fa(r3)
/* 801B5648 28 00 00 01 */ cmplwi r0, 1
/* 801B564C 40 82 00 08 */ bne lbl_801B5654
/* 801B5650 48 00 FC 95 */ bl _open__15dMenu_Fishing_cFv
lbl_801B5654:
/* 801B5654 80 7E 00 9C */ lwz r3, 0x9c(r30)
/* 801B5658 88 03 01 FA */ lbz r0, 0x1fa(r3)
/* 801B565C 28 00 00 02 */ cmplwi r0, 2
/* 801B5660 40 82 00 0C */ bne lbl_801B566C
/* 801B5664 38 00 00 0B */ li r0, 0xb
/* 801B5668 98 1E 02 2C */ stb r0, 0x22c(r30)
lbl_801B566C:
/* 801B566C 7F E3 FB 78 */ mr r3, r31
/* 801B5670 4B E5 9B 5D */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5674 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5678 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B567C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B5680 7C 08 03 A6 */ mtlr r0
/* 801B5684 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5688 4E 80 00 20 */ blr
@@ -1,29 +0,0 @@
lbl_801B7434:
/* 801B7434 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 801B7438 7C 08 02 A6 */ mflr r0
/* 801B743C 90 01 00 24 */ stw r0, 0x24(r1)
/* 801B7440 39 61 00 20 */ addi r11, r1, 0x20
/* 801B7444 48 1A AD 99 */ bl _savegpr_29
/* 801B7448 3B C0 00 00 */ li r30, 0
/* 801B744C 3B A0 00 00 */ li r29, 0
/* 801B7450 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 801B7454 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 801B7458 3B E3 01 00 */ addi r31, r3, 0x100
lbl_801B745C:
/* 801B745C 7F E3 FB 78 */ mr r3, r31
/* 801B7460 57 A4 06 3E */ clrlwi r4, r29, 0x18
/* 801B7464 4B E7 CD E9 */ bl isCollectCrystal__20dSv_player_collect_cCFUc
/* 801B7468 2C 03 00 00 */ cmpwi r3, 0
/* 801B746C 41 82 00 14 */ beq lbl_801B7480
/* 801B7470 3B BD 00 01 */ addi r29, r29, 1
/* 801B7474 2C 1D 00 04 */ cmpwi r29, 4
/* 801B7478 3B DE 00 01 */ addi r30, r30, 1
/* 801B747C 41 80 FF E0 */ blt lbl_801B745C
lbl_801B7480:
/* 801B7480 7F C3 F3 78 */ mr r3, r30
/* 801B7484 39 61 00 20 */ addi r11, r1, 0x20
/* 801B7488 48 1A AD A1 */ bl _restgpr_29
/* 801B748C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 801B7490 7C 08 03 A6 */ mtlr r0
/* 801B7494 38 21 00 20 */ addi r1, r1, 0x20
/* 801B7498 4E 80 00 20 */ blr
@@ -1,29 +0,0 @@
lbl_801B749C:
/* 801B749C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 801B74A0 7C 08 02 A6 */ mflr r0
/* 801B74A4 90 01 00 24 */ stw r0, 0x24(r1)
/* 801B74A8 39 61 00 20 */ addi r11, r1, 0x20
/* 801B74AC 48 1A AD 31 */ bl _savegpr_29
/* 801B74B0 3B C0 00 00 */ li r30, 0
/* 801B74B4 3B A0 00 00 */ li r29, 0
/* 801B74B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 801B74BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 801B74C0 3B E3 01 00 */ addi r31, r3, 0x100
lbl_801B74C4:
/* 801B74C4 7F E3 FB 78 */ mr r3, r31
/* 801B74C8 57 A4 06 3E */ clrlwi r4, r29, 0x18
/* 801B74CC 4B E7 CD C5 */ bl isCollectMirror__20dSv_player_collect_cCFUc
/* 801B74D0 2C 03 00 00 */ cmpwi r3, 0
/* 801B74D4 41 82 00 14 */ beq lbl_801B74E8
/* 801B74D8 3B BD 00 01 */ addi r29, r29, 1
/* 801B74DC 2C 1D 00 04 */ cmpwi r29, 4
/* 801B74E0 3B DE 00 01 */ addi r30, r30, 1
/* 801B74E4 41 80 FF E0 */ blt lbl_801B74C4
lbl_801B74E8:
/* 801B74E8 7F C3 F3 78 */ mr r3, r30
/* 801B74EC 39 61 00 20 */ addi r11, r1, 0x20
/* 801B74F0 48 1A AD 39 */ bl _restgpr_29
/* 801B74F4 80 01 00 24 */ lwz r0, 0x24(r1)
/* 801B74F8 7C 08 03 A6 */ mtlr r0
/* 801B74FC 38 21 00 20 */ addi r1, r1, 0x20
/* 801B7500 4E 80 00 20 */ blr
@@ -1,16 +0,0 @@
lbl_801B5C1C:
/* 801B5C1C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5C20 7C 08 02 A6 */ mflr r0
/* 801B5C24 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5C28 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B5C2C 7C 7F 1B 78 */ mr r31, r3
/* 801B5C30 38 80 00 00 */ li r4, 0
/* 801B5C34 48 00 03 81 */ bl setAButtonString__17dMenu_Collect2D_cFUs
/* 801B5C38 7F E3 FB 78 */ mr r3, r31
/* 801B5C3C 38 80 00 00 */ li r4, 0
/* 801B5C40 48 00 04 79 */ bl setBButtonString__17dMenu_Collect2D_cFUs
/* 801B5C44 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5C48 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B5C4C 7C 08 03 A6 */ mtlr r0
/* 801B5C50 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5C54 4E 80 00 20 */ blr
@@ -1,34 +0,0 @@
lbl_801B5C58:
/* 801B5C58 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5C5C 7C 08 02 A6 */ mflr r0
/* 801B5C60 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5C64 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B5C68 93 C1 00 08 */ stw r30, 8(r1)
/* 801B5C6C 7C 7E 1B 78 */ mr r30, r3
/* 801B5C70 80 63 00 08 */ lwz r3, 8(r3)
/* 801B5C74 4B E5 95 59 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5C78 7C 7F 1B 78 */ mr r31, r3
/* 801B5C7C 80 7E 00 A4 */ lwz r3, 0xa4(r30)
/* 801B5C80 88 03 00 F2 */ lbz r0, 0xf2(r3)
/* 801B5C84 28 00 00 03 */ cmplwi r0, 3
/* 801B5C88 40 82 00 08 */ bne lbl_801B5C90
/* 801B5C8C 48 02 2E A1 */ bl _close__14dMenu_Insect_cFv
lbl_801B5C90:
/* 801B5C90 80 7E 00 A4 */ lwz r3, 0xa4(r30)
/* 801B5C94 88 03 00 F2 */ lbz r0, 0xf2(r3)
/* 801B5C98 28 00 00 00 */ cmplwi r0, 0
/* 801B5C9C 40 82 00 18 */ bne lbl_801B5CB4
/* 801B5CA0 38 00 00 00 */ li r0, 0
/* 801B5CA4 98 1E 02 2C */ stb r0, 0x22c(r30)
/* 801B5CA8 38 00 00 FF */ li r0, 0xff
/* 801B5CAC 80 7E 00 20 */ lwz r3, 0x20(r30)
/* 801B5CB0 98 03 00 B4 */ stb r0, 0xb4(r3)
lbl_801B5CB4:
/* 801B5CB4 7F E3 FB 78 */ mr r3, r31
/* 801B5CB8 4B E5 95 15 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5CBC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5CC0 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B5CC4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B5CC8 7C 08 03 A6 */ mtlr r0
/* 801B5CCC 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5CD0 4E 80 00 20 */ blr
@@ -1,16 +0,0 @@
lbl_801B5B70:
/* 801B5B70 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5B74 7C 08 02 A6 */ mflr r0
/* 801B5B78 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5B7C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B5B80 7C 7F 1B 78 */ mr r31, r3
/* 801B5B84 38 80 04 0C */ li r4, 0x40c
/* 801B5B88 48 00 04 2D */ bl setAButtonString__17dMenu_Collect2D_cFUs
/* 801B5B8C 7F E3 FB 78 */ mr r3, r31
/* 801B5B90 38 80 03 F9 */ li r4, 0x3f9
/* 801B5B94 48 00 05 25 */ bl setBButtonString__17dMenu_Collect2D_cFUs
/* 801B5B98 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5B9C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B5BA0 7C 08 03 A6 */ mtlr r0
/* 801B5BA4 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5BA8 4E 80 00 20 */ blr
@@ -1,31 +0,0 @@
lbl_801B5BAC:
/* 801B5BAC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5BB0 7C 08 02 A6 */ mflr r0
/* 801B5BB4 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5BB8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B5BBC 93 C1 00 08 */ stw r30, 8(r1)
/* 801B5BC0 7C 7E 1B 78 */ mr r30, r3
/* 801B5BC4 80 63 00 08 */ lwz r3, 8(r3)
/* 801B5BC8 4B E5 96 05 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5BCC 7C 7F 1B 78 */ mr r31, r3
/* 801B5BD0 80 7E 00 A4 */ lwz r3, 0xa4(r30)
/* 801B5BD4 88 03 00 F2 */ lbz r0, 0xf2(r3)
/* 801B5BD8 28 00 00 02 */ cmplwi r0, 2
/* 801B5BDC 40 82 00 08 */ bne lbl_801B5BE4
/* 801B5BE0 48 02 2A E9 */ bl _move__14dMenu_Insect_cFv
lbl_801B5BE4:
/* 801B5BE4 80 7E 00 A4 */ lwz r3, 0xa4(r30)
/* 801B5BE8 88 03 00 F2 */ lbz r0, 0xf2(r3)
/* 801B5BEC 28 00 00 03 */ cmplwi r0, 3
/* 801B5BF0 40 82 00 0C */ bne lbl_801B5BFC
/* 801B5BF4 38 00 00 12 */ li r0, 0x12
/* 801B5BF8 98 1E 02 2C */ stb r0, 0x22c(r30)
lbl_801B5BFC:
/* 801B5BFC 7F E3 FB 78 */ mr r3, r31
/* 801B5C00 4B E5 95 CD */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5C04 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5C08 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B5C0C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B5C10 7C 08 03 A6 */ mtlr r0
/* 801B5C14 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5C18 4E 80 00 20 */ blr
@@ -1,43 +0,0 @@
lbl_801B5A60:
/* 801B5A60 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5A64 7C 08 02 A6 */ mflr r0
/* 801B5A68 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5A6C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B5A70 93 C1 00 08 */ stw r30, 8(r1)
/* 801B5A74 7C 7E 1B 78 */ mr r30, r3
/* 801B5A78 80 63 00 08 */ lwz r3, 8(r3)
/* 801B5A7C 4B E5 97 51 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5A80 7C 7F 1B 78 */ mr r31, r3
/* 801B5A84 80 1E 00 A4 */ lwz r0, 0xa4(r30)
/* 801B5A88 28 00 00 00 */ cmplwi r0, 0
/* 801B5A8C 40 82 00 30 */ bne lbl_801B5ABC
/* 801B5A90 38 60 01 00 */ li r3, 0x100
/* 801B5A94 48 11 91 B9 */ bl __nw__FUl
/* 801B5A98 7C 60 1B 79 */ or. r0, r3, r3
/* 801B5A9C 41 82 00 1C */ beq lbl_801B5AB8
/* 801B5AA0 80 9E 00 08 */ lwz r4, 8(r30)
/* 801B5AA4 80 BE 00 10 */ lwz r5, 0x10(r30)
/* 801B5AA8 80 DE 00 14 */ lwz r6, 0x14(r30)
/* 801B5AAC 38 E0 00 00 */ li r7, 0
/* 801B5AB0 48 02 26 65 */ bl __ct__14dMenu_Insect_cFP10JKRExpHeapP9STControlP10CSTControlUc
/* 801B5AB4 7C 60 1B 78 */ mr r0, r3
lbl_801B5AB8:
/* 801B5AB8 90 1E 00 A4 */ stw r0, 0xa4(r30)
lbl_801B5ABC:
/* 801B5ABC 7F C3 F3 78 */ mr r3, r30
/* 801B5AC0 38 80 00 00 */ li r4, 0
/* 801B5AC4 48 00 04 F1 */ bl setAButtonString__17dMenu_Collect2D_cFUs
/* 801B5AC8 7F C3 F3 78 */ mr r3, r30
/* 801B5ACC 38 80 00 00 */ li r4, 0
/* 801B5AD0 48 00 05 E9 */ bl setBButtonString__17dMenu_Collect2D_cFUs
/* 801B5AD4 38 00 00 00 */ li r0, 0
/* 801B5AD8 80 7E 00 20 */ lwz r3, 0x20(r30)
/* 801B5ADC 98 03 00 B4 */ stb r0, 0xb4(r3)
/* 801B5AE0 7F E3 FB 78 */ mr r3, r31
/* 801B5AE4 4B E5 96 E9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5AE8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5AEC 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B5AF0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B5AF4 7C 08 03 A6 */ mtlr r0
/* 801B5AF8 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5AFC 4E 80 00 20 */ blr
@@ -1,31 +0,0 @@
lbl_801B5B00:
/* 801B5B00 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5B04 7C 08 02 A6 */ mflr r0
/* 801B5B08 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5B0C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B5B10 93 C1 00 08 */ stw r30, 8(r1)
/* 801B5B14 7C 7E 1B 78 */ mr r30, r3
/* 801B5B18 80 63 00 08 */ lwz r3, 8(r3)
/* 801B5B1C 4B E5 96 B1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5B20 7C 7F 1B 78 */ mr r31, r3
/* 801B5B24 80 7E 00 A4 */ lwz r3, 0xa4(r30)
/* 801B5B28 88 03 00 F2 */ lbz r0, 0xf2(r3)
/* 801B5B2C 28 00 00 01 */ cmplwi r0, 1
/* 801B5B30 40 82 00 08 */ bne lbl_801B5B38
/* 801B5B34 48 02 2E 19 */ bl _open__14dMenu_Insect_cFv
lbl_801B5B38:
/* 801B5B38 80 7E 00 A4 */ lwz r3, 0xa4(r30)
/* 801B5B3C 88 03 00 F2 */ lbz r0, 0xf2(r3)
/* 801B5B40 28 00 00 02 */ cmplwi r0, 2
/* 801B5B44 40 82 00 0C */ bne lbl_801B5B50
/* 801B5B48 38 00 00 11 */ li r0, 0x11
/* 801B5B4C 98 1E 02 2C */ stb r0, 0x22c(r30)
lbl_801B5B50:
/* 801B5B50 7F E3 FB 78 */ mr r3, r31
/* 801B5B54 4B E5 96 79 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5B58 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5B5C 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B5B60 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B5B64 7C 08 03 A6 */ mtlr r0
/* 801B5B68 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5B6C 4E 80 00 20 */ blr
@@ -1,32 +0,0 @@
lbl_801B05A8:
/* 801B05A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 801B05AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 801B05B0 A0 03 01 6C */ lhz r0, 0x16c(r3)
/* 801B05B4 28 00 00 00 */ cmplwi r0, 0
/* 801B05B8 40 82 00 54 */ bne lbl_801B060C
/* 801B05BC A0 03 01 6E */ lhz r0, 0x16e(r3)
/* 801B05C0 28 00 00 00 */ cmplwi r0, 0
/* 801B05C4 40 82 00 48 */ bne lbl_801B060C
/* 801B05C8 A0 03 01 70 */ lhz r0, 0x170(r3)
/* 801B05CC 28 00 00 00 */ cmplwi r0, 0
/* 801B05D0 40 82 00 3C */ bne lbl_801B060C
/* 801B05D4 A0 03 01 72 */ lhz r0, 0x172(r3)
/* 801B05D8 28 00 00 00 */ cmplwi r0, 0
/* 801B05DC 40 82 00 30 */ bne lbl_801B060C
/* 801B05E0 A0 03 01 74 */ lhz r0, 0x174(r3)
/* 801B05E4 28 00 00 00 */ cmplwi r0, 0
/* 801B05E8 40 82 00 24 */ bne lbl_801B060C
/* 801B05EC A0 03 01 76 */ lhz r0, 0x176(r3)
/* 801B05F0 28 00 00 00 */ cmplwi r0, 0
/* 801B05F4 40 82 00 18 */ bne lbl_801B060C
/* 801B05F8 3C 60 80 43 */ lis r3, g_drawHIO@ha /* 0x8042EBC8@ha */
/* 801B05FC 38 63 EB C8 */ addi r3, r3, g_drawHIO@l /* 0x8042EBC8@l */
/* 801B0600 88 03 09 D8 */ lbz r0, 0x9d8(r3)
/* 801B0604 28 00 00 00 */ cmplwi r0, 0
/* 801B0608 41 82 00 0C */ beq lbl_801B0614
lbl_801B060C:
/* 801B060C 38 60 00 01 */ li r3, 1
/* 801B0610 4E 80 00 20 */ blr
lbl_801B0614:
/* 801B0614 38 60 00 00 */ li r3, 0
/* 801B0618 4E 80 00 20 */ blr
@@ -1,13 +0,0 @@
lbl_801B071C:
/* 801B071C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B0720 7C 08 02 A6 */ mflr r0
/* 801B0724 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B0728 48 02 96 25 */ bl getGetInsectNum__14dMenu_Insect_cFv
/* 801B072C 54 63 06 3E */ clrlwi r3, r3, 0x18
/* 801B0730 30 03 FF FF */ addic r0, r3, -1
/* 801B0734 7C 00 19 10 */ subfe r0, r0, r3
/* 801B0738 54 03 06 3E */ clrlwi r3, r0, 0x18
/* 801B073C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B0740 7C 08 03 A6 */ mtlr r0
/* 801B0744 38 21 00 10 */ addi r1, r1, 0x10
/* 801B0748 4E 80 00 20 */ blr
@@ -1,13 +0,0 @@
lbl_801B5F84:
/* 801B5F84 88 03 02 2C */ lbz r0, 0x22c(r3)
/* 801B5F88 28 00 00 00 */ cmplwi r0, 0
/* 801B5F8C 40 82 00 10 */ bne lbl_801B5F9C
/* 801B5F90 88 03 02 5F */ lbz r0, 0x25f(r3)
/* 801B5F94 28 00 00 00 */ cmplwi r0, 0
/* 801B5F98 41 82 00 0C */ beq lbl_801B5FA4
lbl_801B5F9C:
/* 801B5F9C 38 60 00 01 */ li r3, 1
/* 801B5FA0 4E 80 00 20 */ blr
lbl_801B5FA4:
/* 801B5FA4 38 60 00 00 */ li r3, 0
/* 801B5FA8 4E 80 00 20 */ blr
@@ -1,68 +0,0 @@
lbl_801B061C:
/* 801B061C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B0620 7C 08 02 A6 */ mflr r0
/* 801B0624 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B0628 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B062C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 801B0630 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 801B0634 3B E3 07 F0 */ addi r31, r3, 0x7f0
/* 801B0638 7F E3 FB 78 */ mr r3, r31
/* 801B063C 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 801B0640 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 801B0644 A0 84 02 A4 */ lhz r4, 0x2a4(r4)
/* 801B0648 4B E8 43 75 */ bl isEventBit__11dSv_event_cCFUs
/* 801B064C 2C 03 00 00 */ cmpwi r3, 0
/* 801B0650 40 82 00 AC */ bne lbl_801B06FC
/* 801B0654 7F E3 FB 78 */ mr r3, r31
/* 801B0658 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 801B065C 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 801B0660 A0 84 02 A6 */ lhz r4, 0x2a6(r4)
/* 801B0664 4B E8 43 59 */ bl isEventBit__11dSv_event_cCFUs
/* 801B0668 2C 03 00 00 */ cmpwi r3, 0
/* 801B066C 40 82 00 90 */ bne lbl_801B06FC
/* 801B0670 7F E3 FB 78 */ mr r3, r31
/* 801B0674 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 801B0678 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 801B067C A0 84 02 A8 */ lhz r4, 0x2a8(r4)
/* 801B0680 4B E8 43 3D */ bl isEventBit__11dSv_event_cCFUs
/* 801B0684 2C 03 00 00 */ cmpwi r3, 0
/* 801B0688 40 82 00 74 */ bne lbl_801B06FC
/* 801B068C 7F E3 FB 78 */ mr r3, r31
/* 801B0690 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 801B0694 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 801B0698 A0 84 02 AA */ lhz r4, 0x2aa(r4)
/* 801B069C 4B E8 43 21 */ bl isEventBit__11dSv_event_cCFUs
/* 801B06A0 2C 03 00 00 */ cmpwi r3, 0
/* 801B06A4 40 82 00 58 */ bne lbl_801B06FC
/* 801B06A8 7F E3 FB 78 */ mr r3, r31
/* 801B06AC 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 801B06B0 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 801B06B4 A0 84 02 AC */ lhz r4, 0x2ac(r4)
/* 801B06B8 4B E8 43 05 */ bl isEventBit__11dSv_event_cCFUs
/* 801B06BC 2C 03 00 00 */ cmpwi r3, 0
/* 801B06C0 40 82 00 3C */ bne lbl_801B06FC
/* 801B06C4 7F E3 FB 78 */ mr r3, r31
/* 801B06C8 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 801B06CC 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 801B06D0 A0 84 02 AE */ lhz r4, 0x2ae(r4)
/* 801B06D4 4B E8 42 E9 */ bl isEventBit__11dSv_event_cCFUs
/* 801B06D8 2C 03 00 00 */ cmpwi r3, 0
/* 801B06DC 40 82 00 20 */ bne lbl_801B06FC
/* 801B06E0 7F E3 FB 78 */ mr r3, r31
/* 801B06E4 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 801B06E8 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 801B06EC A0 84 02 B0 */ lhz r4, 0x2b0(r4)
/* 801B06F0 4B E8 42 CD */ bl isEventBit__11dSv_event_cCFUs
/* 801B06F4 2C 03 00 00 */ cmpwi r3, 0
/* 801B06F8 41 82 00 0C */ beq lbl_801B0704
lbl_801B06FC:
/* 801B06FC 38 60 00 01 */ li r3, 1
/* 801B0700 48 00 00 08 */ b lbl_801B0708
lbl_801B0704:
/* 801B0704 38 60 00 00 */ li r3, 0
lbl_801B0708:
/* 801B0708 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B070C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B0710 7C 08 03 A6 */ mtlr r0
/* 801B0714 38 21 00 10 */ addi r1, r1, 0x10
/* 801B0718 4E 80 00 20 */ blr
@@ -1,16 +0,0 @@
lbl_801B54C8:
/* 801B54C8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B54CC 7C 08 02 A6 */ mflr r0
/* 801B54D0 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B54D4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B54D8 7C 7F 1B 78 */ mr r31, r3
/* 801B54DC 38 80 00 00 */ li r4, 0
/* 801B54E0 48 00 0A D5 */ bl setAButtonString__17dMenu_Collect2D_cFUs
/* 801B54E4 7F E3 FB 78 */ mr r3, r31
/* 801B54E8 38 80 00 00 */ li r4, 0
/* 801B54EC 48 00 0B CD */ bl setBButtonString__17dMenu_Collect2D_cFUs
/* 801B54F0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B54F4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B54F8 7C 08 03 A6 */ mtlr r0
/* 801B54FC 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5500 4E 80 00 20 */ blr
@@ -1,34 +0,0 @@
lbl_801B5504:
/* 801B5504 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5508 7C 08 02 A6 */ mflr r0
/* 801B550C 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5510 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B5514 93 C1 00 08 */ stw r30, 8(r1)
/* 801B5518 7C 7E 1B 78 */ mr r30, r3
/* 801B551C 80 63 00 08 */ lwz r3, 8(r3)
/* 801B5520 4B E5 9C AD */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5524 7C 7F 1B 78 */ mr r31, r3
/* 801B5528 80 7E 00 98 */ lwz r3, 0x98(r30)
/* 801B552C 88 03 03 6C */ lbz r0, 0x36c(r3)
/* 801B5530 28 00 00 03 */ cmplwi r0, 3
/* 801B5534 40 82 00 08 */ bne lbl_801B553C
/* 801B5538 48 02 87 61 */ bl _close__14dMenu_Letter_cFv
lbl_801B553C:
/* 801B553C 80 7E 00 98 */ lwz r3, 0x98(r30)
/* 801B5540 88 03 03 6C */ lbz r0, 0x36c(r3)
/* 801B5544 28 00 00 00 */ cmplwi r0, 0
/* 801B5548 40 82 00 18 */ bne lbl_801B5560
/* 801B554C 38 00 00 00 */ li r0, 0
/* 801B5550 98 1E 02 2C */ stb r0, 0x22c(r30)
/* 801B5554 38 00 00 FF */ li r0, 0xff
/* 801B5558 80 7E 00 20 */ lwz r3, 0x20(r30)
/* 801B555C 98 03 00 B4 */ stb r0, 0xb4(r3)
lbl_801B5560:
/* 801B5560 7F E3 FB 78 */ mr r3, r31
/* 801B5564 4B E5 9C 69 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5568 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B556C 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B5570 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B5574 7C 08 03 A6 */ mtlr r0
/* 801B5578 38 21 00 10 */ addi r1, r1, 0x10
/* 801B557C 4E 80 00 20 */ blr
@@ -1,16 +0,0 @@
lbl_801B541C:
/* 801B541C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5420 7C 08 02 A6 */ mflr r0
/* 801B5424 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5428 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B542C 7C 7F 1B 78 */ mr r31, r3
/* 801B5430 38 80 04 0C */ li r4, 0x40c
/* 801B5434 48 00 0B 81 */ bl setAButtonString__17dMenu_Collect2D_cFUs
/* 801B5438 7F E3 FB 78 */ mr r3, r31
/* 801B543C 38 80 03 F9 */ li r4, 0x3f9
/* 801B5440 48 00 0C 79 */ bl setBButtonString__17dMenu_Collect2D_cFUs
/* 801B5444 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5448 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B544C 7C 08 03 A6 */ mtlr r0
/* 801B5450 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5454 4E 80 00 20 */ blr
@@ -1,31 +0,0 @@
lbl_801B5458:
/* 801B5458 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B545C 7C 08 02 A6 */ mflr r0
/* 801B5460 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5464 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B5468 93 C1 00 08 */ stw r30, 8(r1)
/* 801B546C 7C 7E 1B 78 */ mr r30, r3
/* 801B5470 80 63 00 08 */ lwz r3, 8(r3)
/* 801B5474 4B E5 9D 59 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5478 7C 7F 1B 78 */ mr r31, r3
/* 801B547C 80 7E 00 98 */ lwz r3, 0x98(r30)
/* 801B5480 88 03 03 6C */ lbz r0, 0x36c(r3)
/* 801B5484 28 00 00 02 */ cmplwi r0, 2
/* 801B5488 40 82 00 08 */ bne lbl_801B5490
/* 801B548C 48 02 7F E9 */ bl _move__14dMenu_Letter_cFv
lbl_801B5490:
/* 801B5490 80 7E 00 98 */ lwz r3, 0x98(r30)
/* 801B5494 88 03 03 6C */ lbz r0, 0x36c(r3)
/* 801B5498 28 00 00 03 */ cmplwi r0, 3
/* 801B549C 40 82 00 0C */ bne lbl_801B54A8
/* 801B54A0 38 00 00 09 */ li r0, 9
/* 801B54A4 98 1E 02 2C */ stb r0, 0x22c(r30)
lbl_801B54A8:
/* 801B54A8 7F E3 FB 78 */ mr r3, r31
/* 801B54AC 4B E5 9D 21 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B54B0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B54B4 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B54B8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B54BC 7C 08 03 A6 */ mtlr r0
/* 801B54C0 38 21 00 10 */ addi r1, r1, 0x10
/* 801B54C4 4E 80 00 20 */ blr
@@ -1,42 +0,0 @@
lbl_801B5310:
/* 801B5310 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5314 7C 08 02 A6 */ mflr r0
/* 801B5318 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B531C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B5320 93 C1 00 08 */ stw r30, 8(r1)
/* 801B5324 7C 7E 1B 78 */ mr r30, r3
/* 801B5328 80 63 00 08 */ lwz r3, 8(r3)
/* 801B532C 4B E5 9E A1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5330 7C 7F 1B 78 */ mr r31, r3
/* 801B5334 80 1E 00 98 */ lwz r0, 0x98(r30)
/* 801B5338 28 00 00 00 */ cmplwi r0, 0
/* 801B533C 40 82 00 2C */ bne lbl_801B5368
/* 801B5340 38 60 03 E8 */ li r3, 0x3e8
/* 801B5344 48 11 99 09 */ bl __nw__FUl
/* 801B5348 7C 60 1B 79 */ or. r0, r3, r3
/* 801B534C 41 82 00 18 */ beq lbl_801B5364
/* 801B5350 80 9E 00 08 */ lwz r4, 8(r30)
/* 801B5354 80 BE 00 10 */ lwz r5, 0x10(r30)
/* 801B5358 80 DE 00 14 */ lwz r6, 0x14(r30)
/* 801B535C 48 02 7A 65 */ bl __ct__14dMenu_Letter_cFP10JKRExpHeapP9STControlP10CSTControl
/* 801B5360 7C 60 1B 78 */ mr r0, r3
lbl_801B5364:
/* 801B5364 90 1E 00 98 */ stw r0, 0x98(r30)
lbl_801B5368:
/* 801B5368 7F C3 F3 78 */ mr r3, r30
/* 801B536C 38 80 00 00 */ li r4, 0
/* 801B5370 48 00 0C 45 */ bl setAButtonString__17dMenu_Collect2D_cFUs
/* 801B5374 7F C3 F3 78 */ mr r3, r30
/* 801B5378 38 80 00 00 */ li r4, 0
/* 801B537C 48 00 0D 3D */ bl setBButtonString__17dMenu_Collect2D_cFUs
/* 801B5380 38 00 00 00 */ li r0, 0
/* 801B5384 80 7E 00 20 */ lwz r3, 0x20(r30)
/* 801B5388 98 03 00 B4 */ stb r0, 0xb4(r3)
/* 801B538C 7F E3 FB 78 */ mr r3, r31
/* 801B5390 4B E5 9E 3D */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5394 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5398 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B539C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B53A0 7C 08 03 A6 */ mtlr r0
/* 801B53A4 38 21 00 10 */ addi r1, r1, 0x10
/* 801B53A8 4E 80 00 20 */ blr
@@ -1,31 +0,0 @@
lbl_801B53AC:
/* 801B53AC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B53B0 7C 08 02 A6 */ mflr r0
/* 801B53B4 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B53B8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B53BC 93 C1 00 08 */ stw r30, 8(r1)
/* 801B53C0 7C 7E 1B 78 */ mr r30, r3
/* 801B53C4 80 63 00 08 */ lwz r3, 8(r3)
/* 801B53C8 4B E5 9E 05 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B53CC 7C 7F 1B 78 */ mr r31, r3
/* 801B53D0 80 7E 00 98 */ lwz r3, 0x98(r30)
/* 801B53D4 88 03 03 6C */ lbz r0, 0x36c(r3)
/* 801B53D8 28 00 00 01 */ cmplwi r0, 1
/* 801B53DC 40 82 00 08 */ bne lbl_801B53E4
/* 801B53E0 48 02 86 95 */ bl _open__14dMenu_Letter_cFv
lbl_801B53E4:
/* 801B53E4 80 7E 00 98 */ lwz r3, 0x98(r30)
/* 801B53E8 88 03 03 6C */ lbz r0, 0x36c(r3)
/* 801B53EC 28 00 00 02 */ cmplwi r0, 2
/* 801B53F0 40 82 00 0C */ bne lbl_801B53FC
/* 801B53F4 38 00 00 08 */ li r0, 8
/* 801B53F8 98 1E 02 2C */ stb r0, 0x22c(r30)
lbl_801B53FC:
/* 801B53FC 7F E3 FB 78 */ mr r3, r31
/* 801B5400 4B E5 9D CD */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5404 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5408 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B540C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B5410 7C 08 03 A6 */ mtlr r0
/* 801B5414 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5418 4E 80 00 20 */ blr
@@ -1,16 +0,0 @@
lbl_801B5258:
/* 801B5258 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B525C 7C 08 02 A6 */ mflr r0
/* 801B5260 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5264 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B5268 7C 7F 1B 78 */ mr r31, r3
/* 801B526C 38 80 00 00 */ li r4, 0
/* 801B5270 48 00 0D 45 */ bl setAButtonString__17dMenu_Collect2D_cFUs
/* 801B5274 7F E3 FB 78 */ mr r3, r31
/* 801B5278 38 80 00 00 */ li r4, 0
/* 801B527C 48 00 0E 3D */ bl setBButtonString__17dMenu_Collect2D_cFUs
/* 801B5280 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5284 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B5288 7C 08 03 A6 */ mtlr r0
/* 801B528C 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5290 4E 80 00 20 */ blr
@@ -1,34 +0,0 @@
lbl_801B5294:
/* 801B5294 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5298 7C 08 02 A6 */ mflr r0
/* 801B529C 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B52A0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B52A4 93 C1 00 08 */ stw r30, 8(r1)
/* 801B52A8 7C 7E 1B 78 */ mr r30, r3
/* 801B52AC 80 63 00 08 */ lwz r3, 8(r3)
/* 801B52B0 4B E5 9F 1D */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B52B4 7C 7F 1B 78 */ mr r31, r3
/* 801B52B8 80 7E 00 94 */ lwz r3, 0x94(r30)
/* 801B52BC 88 03 03 EC */ lbz r0, 0x3ec(r3)
/* 801B52C0 28 00 00 03 */ cmplwi r0, 3
/* 801B52C4 40 82 00 08 */ bne lbl_801B52CC
/* 801B52C8 48 02 EB 19 */ bl _close__14dMenu_Option_cFv
lbl_801B52CC:
/* 801B52CC 80 7E 00 94 */ lwz r3, 0x94(r30)
/* 801B52D0 88 03 03 EC */ lbz r0, 0x3ec(r3)
/* 801B52D4 28 00 00 00 */ cmplwi r0, 0
/* 801B52D8 40 82 00 18 */ bne lbl_801B52F0
/* 801B52DC 38 00 00 00 */ li r0, 0
/* 801B52E0 98 1E 02 2C */ stb r0, 0x22c(r30)
/* 801B52E4 38 00 00 FF */ li r0, 0xff
/* 801B52E8 80 7E 00 20 */ lwz r3, 0x20(r30)
/* 801B52EC 98 03 00 B4 */ stb r0, 0xb4(r3)
lbl_801B52F0:
/* 801B52F0 7F E3 FB 78 */ mr r3, r31
/* 801B52F4 4B E5 9E D9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B52F8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B52FC 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B5300 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B5304 7C 08 03 A6 */ mtlr r0
/* 801B5308 38 21 00 10 */ addi r1, r1, 0x10
/* 801B530C 4E 80 00 20 */ blr
@@ -1,16 +0,0 @@
lbl_801B51AC:
/* 801B51AC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B51B0 7C 08 02 A6 */ mflr r0
/* 801B51B4 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B51B8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B51BC 7C 7F 1B 78 */ mr r31, r3
/* 801B51C0 38 80 04 0C */ li r4, 0x40c
/* 801B51C4 48 00 0D F1 */ bl setAButtonString__17dMenu_Collect2D_cFUs
/* 801B51C8 7F E3 FB 78 */ mr r3, r31
/* 801B51CC 38 80 03 F9 */ li r4, 0x3f9
/* 801B51D0 48 00 0E E9 */ bl setBButtonString__17dMenu_Collect2D_cFUs
/* 801B51D4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B51D8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B51DC 7C 08 03 A6 */ mtlr r0
/* 801B51E0 38 21 00 10 */ addi r1, r1, 0x10
/* 801B51E4 4E 80 00 20 */ blr
@@ -1,31 +0,0 @@
lbl_801B51E8:
/* 801B51E8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B51EC 7C 08 02 A6 */ mflr r0
/* 801B51F0 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B51F4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B51F8 93 C1 00 08 */ stw r30, 8(r1)
/* 801B51FC 7C 7E 1B 78 */ mr r30, r3
/* 801B5200 80 63 00 08 */ lwz r3, 8(r3)
/* 801B5204 4B E5 9F C9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5208 7C 7F 1B 78 */ mr r31, r3
/* 801B520C 80 7E 00 94 */ lwz r3, 0x94(r30)
/* 801B5210 88 03 03 EC */ lbz r0, 0x3ec(r3)
/* 801B5214 28 00 00 02 */ cmplwi r0, 2
/* 801B5218 40 82 00 08 */ bne lbl_801B5220
/* 801B521C 48 02 E1 ED */ bl _move__14dMenu_Option_cFv
lbl_801B5220:
/* 801B5220 80 7E 00 94 */ lwz r3, 0x94(r30)
/* 801B5224 88 03 03 EC */ lbz r0, 0x3ec(r3)
/* 801B5228 28 00 00 03 */ cmplwi r0, 3
/* 801B522C 40 82 00 0C */ bne lbl_801B5238
/* 801B5230 38 00 00 06 */ li r0, 6
/* 801B5234 98 1E 02 2C */ stb r0, 0x22c(r30)
lbl_801B5238:
/* 801B5238 7F E3 FB 78 */ mr r3, r31
/* 801B523C 4B E5 9F 91 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5240 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5244 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B5248 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B524C 7C 08 03 A6 */ mtlr r0
/* 801B5250 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5254 4E 80 00 20 */ blr
@@ -1,45 +0,0 @@
lbl_801B5094:
/* 801B5094 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5098 7C 08 02 A6 */ mflr r0
/* 801B509C 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B50A0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B50A4 93 C1 00 08 */ stw r30, 8(r1)
/* 801B50A8 7C 7E 1B 78 */ mr r30, r3
/* 801B50AC 80 63 00 08 */ lwz r3, 8(r3)
/* 801B50B0 4B E5 A1 1D */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B50B4 7C 7F 1B 78 */ mr r31, r3
/* 801B50B8 80 1E 00 94 */ lwz r0, 0x94(r30)
/* 801B50BC 28 00 00 00 */ cmplwi r0, 0
/* 801B50C0 40 82 00 30 */ bne lbl_801B50F0
/* 801B50C4 38 60 04 0C */ li r3, 0x40c
/* 801B50C8 48 11 9B 85 */ bl __nw__FUl
/* 801B50CC 7C 60 1B 79 */ or. r0, r3, r3
/* 801B50D0 41 82 00 1C */ beq lbl_801B50EC
/* 801B50D4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 801B50D8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 801B50DC 80 84 5C B8 */ lwz r4, 0x5cb8(r4)
/* 801B50E0 80 BE 00 10 */ lwz r5, 0x10(r30)
/* 801B50E4 48 02 CE 2D */ bl __ct__14dMenu_Option_cFP10JKRArchiveP9STControl
/* 801B50E8 7C 60 1B 78 */ mr r0, r3
lbl_801B50EC:
/* 801B50EC 90 1E 00 94 */ stw r0, 0x94(r30)
lbl_801B50F0:
/* 801B50F0 80 7E 00 94 */ lwz r3, 0x94(r30)
/* 801B50F4 48 03 31 1D */ bl initialize__14dMenu_Option_cFv
/* 801B50F8 7F C3 F3 78 */ mr r3, r30
/* 801B50FC 38 80 00 00 */ li r4, 0
/* 801B5100 48 00 0E B5 */ bl setAButtonString__17dMenu_Collect2D_cFUs
/* 801B5104 7F C3 F3 78 */ mr r3, r30
/* 801B5108 38 80 00 00 */ li r4, 0
/* 801B510C 48 00 0F AD */ bl setBButtonString__17dMenu_Collect2D_cFUs
/* 801B5110 38 00 00 00 */ li r0, 0
/* 801B5114 80 7E 00 20 */ lwz r3, 0x20(r30)
/* 801B5118 98 03 00 B4 */ stb r0, 0xb4(r3)
/* 801B511C 7F E3 FB 78 */ mr r3, r31
/* 801B5120 4B E5 A0 AD */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5124 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5128 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B512C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B5130 7C 08 03 A6 */ mtlr r0
/* 801B5134 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5138 4E 80 00 20 */ blr
@@ -1,31 +0,0 @@
lbl_801B513C:
/* 801B513C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5140 7C 08 02 A6 */ mflr r0
/* 801B5144 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5148 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B514C 93 C1 00 08 */ stw r30, 8(r1)
/* 801B5150 7C 7E 1B 78 */ mr r30, r3
/* 801B5154 80 63 00 08 */ lwz r3, 8(r3)
/* 801B5158 4B E5 A0 75 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B515C 7C 7F 1B 78 */ mr r31, r3
/* 801B5160 80 7E 00 94 */ lwz r3, 0x94(r30)
/* 801B5164 88 03 03 EC */ lbz r0, 0x3ec(r3)
/* 801B5168 28 00 00 01 */ cmplwi r0, 1
/* 801B516C 40 82 00 08 */ bne lbl_801B5174
/* 801B5170 48 02 EA 29 */ bl _open__14dMenu_Option_cFv
lbl_801B5174:
/* 801B5174 80 7E 00 94 */ lwz r3, 0x94(r30)
/* 801B5178 88 03 03 EC */ lbz r0, 0x3ec(r3)
/* 801B517C 28 00 00 02 */ cmplwi r0, 2
/* 801B5180 40 82 00 0C */ bne lbl_801B518C
/* 801B5184 38 00 00 05 */ li r0, 5
/* 801B5188 98 1E 02 2C */ stb r0, 0x22c(r30)
lbl_801B518C:
/* 801B518C 7F E3 FB 78 */ mr r3, r31
/* 801B5190 4B E5 A0 3D */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5194 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5198 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B519C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B51A0 7C 08 03 A6 */ mtlr r0
/* 801B51A4 38 21 00 10 */ addi r1, r1, 0x10
/* 801B51A8 4E 80 00 20 */ blr
@@ -1,16 +0,0 @@
lbl_801B4FDC:
/* 801B4FDC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B4FE0 7C 08 02 A6 */ mflr r0
/* 801B4FE4 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B4FE8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B4FEC 7C 7F 1B 78 */ mr r31, r3
/* 801B4FF0 38 80 00 00 */ li r4, 0
/* 801B4FF4 48 00 0F C1 */ bl setAButtonString__17dMenu_Collect2D_cFUs
/* 801B4FF8 7F E3 FB 78 */ mr r3, r31
/* 801B4FFC 38 80 00 00 */ li r4, 0
/* 801B5000 48 00 10 B9 */ bl setBButtonString__17dMenu_Collect2D_cFUs
/* 801B5004 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5008 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B500C 7C 08 03 A6 */ mtlr r0
/* 801B5010 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5014 4E 80 00 20 */ blr
@@ -1,34 +0,0 @@
lbl_801B5018:
/* 801B5018 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B501C 7C 08 02 A6 */ mflr r0
/* 801B5020 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5024 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B5028 93 C1 00 08 */ stw r30, 8(r1)
/* 801B502C 7C 7E 1B 78 */ mr r30, r3
/* 801B5030 80 63 00 08 */ lwz r3, 8(r3)
/* 801B5034 4B E5 A1 99 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5038 7C 7F 1B 78 */ mr r31, r3
/* 801B503C 80 7E 00 90 */ lwz r3, 0x90(r30)
/* 801B5040 88 03 01 BA */ lbz r0, 0x1ba(r3)
/* 801B5044 28 00 00 03 */ cmplwi r0, 3
/* 801B5048 40 82 00 08 */ bne lbl_801B5050
/* 801B504C 48 03 BA C5 */ bl _close__12dMenu_save_cFv
lbl_801B5050:
/* 801B5050 80 7E 00 90 */ lwz r3, 0x90(r30)
/* 801B5054 88 03 01 BA */ lbz r0, 0x1ba(r3)
/* 801B5058 28 00 00 00 */ cmplwi r0, 0
/* 801B505C 40 82 00 18 */ bne lbl_801B5074
/* 801B5060 38 00 00 00 */ li r0, 0
/* 801B5064 98 1E 02 2C */ stb r0, 0x22c(r30)
/* 801B5068 38 00 00 FF */ li r0, 0xff
/* 801B506C 80 7E 00 20 */ lwz r3, 0x20(r30)
/* 801B5070 98 03 00 B4 */ stb r0, 0xb4(r3)
lbl_801B5074:
/* 801B5074 7F E3 FB 78 */ mr r3, r31
/* 801B5078 4B E5 A1 55 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B507C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5080 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B5084 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B5088 7C 08 03 A6 */ mtlr r0
/* 801B508C 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5090 4E 80 00 20 */ blr
@@ -1,16 +0,0 @@
lbl_801B4F30:
/* 801B4F30 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B4F34 7C 08 02 A6 */ mflr r0
/* 801B4F38 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B4F3C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B4F40 7C 7F 1B 78 */ mr r31, r3
/* 801B4F44 38 80 04 0C */ li r4, 0x40c
/* 801B4F48 48 00 10 6D */ bl setAButtonString__17dMenu_Collect2D_cFUs
/* 801B4F4C 7F E3 FB 78 */ mr r3, r31
/* 801B4F50 38 80 00 00 */ li r4, 0
/* 801B4F54 48 00 11 65 */ bl setBButtonString__17dMenu_Collect2D_cFUs
/* 801B4F58 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B4F5C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B4F60 7C 08 03 A6 */ mtlr r0
/* 801B4F64 38 21 00 10 */ addi r1, r1, 0x10
/* 801B4F68 4E 80 00 20 */ blr
@@ -1,31 +0,0 @@
lbl_801B4F6C:
/* 801B4F6C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B4F70 7C 08 02 A6 */ mflr r0
/* 801B4F74 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B4F78 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B4F7C 93 C1 00 08 */ stw r30, 8(r1)
/* 801B4F80 7C 7E 1B 78 */ mr r30, r3
/* 801B4F84 80 63 00 08 */ lwz r3, 8(r3)
/* 801B4F88 4B E5 A2 45 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B4F8C 7C 7F 1B 78 */ mr r31, r3
/* 801B4F90 80 7E 00 90 */ lwz r3, 0x90(r30)
/* 801B4F94 88 03 01 BA */ lbz r0, 0x1ba(r3)
/* 801B4F98 28 00 00 02 */ cmplwi r0, 2
/* 801B4F9C 40 82 00 08 */ bne lbl_801B4FA4
/* 801B4FA0 48 03 C0 A9 */ bl _move__12dMenu_save_cFv
lbl_801B4FA4:
/* 801B4FA4 80 7E 00 90 */ lwz r3, 0x90(r30)
/* 801B4FA8 88 03 01 BA */ lbz r0, 0x1ba(r3)
/* 801B4FAC 28 00 00 03 */ cmplwi r0, 3
/* 801B4FB0 40 82 00 0C */ bne lbl_801B4FBC
/* 801B4FB4 38 00 00 03 */ li r0, 3
/* 801B4FB8 98 1E 02 2C */ stb r0, 0x22c(r30)
lbl_801B4FBC:
/* 801B4FBC 7F E3 FB 78 */ mr r3, r31
/* 801B4FC0 4B E5 A2 0D */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B4FC4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B4FC8 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B4FCC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B4FD0 7C 08 03 A6 */ mtlr r0
/* 801B4FD4 38 21 00 10 */ addi r1, r1, 0x10
/* 801B4FD8 4E 80 00 20 */ blr
@@ -1,46 +0,0 @@
lbl_801B4E14:
/* 801B4E14 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B4E18 7C 08 02 A6 */ mflr r0
/* 801B4E1C 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B4E20 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B4E24 93 C1 00 08 */ stw r30, 8(r1)
/* 801B4E28 7C 7E 1B 78 */ mr r30, r3
/* 801B4E2C 80 63 00 08 */ lwz r3, 8(r3)
/* 801B4E30 4B E5 A3 9D */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B4E34 7C 7F 1B 78 */ mr r31, r3
/* 801B4E38 80 1E 00 90 */ lwz r0, 0x90(r30)
/* 801B4E3C 28 00 00 00 */ cmplwi r0, 0
/* 801B4E40 40 82 00 20 */ bne lbl_801B4E60
/* 801B4E44 38 60 21 A4 */ li r3, 0x21a4
/* 801B4E48 48 11 9E 05 */ bl __nw__FUl
/* 801B4E4C 7C 60 1B 79 */ or. r0, r3, r3
/* 801B4E50 41 82 00 0C */ beq lbl_801B4E5C
/* 801B4E54 48 03 A8 4D */ bl __ct__12dMenu_save_cFv
/* 801B4E58 7C 60 1B 78 */ mr r0, r3
lbl_801B4E5C:
/* 801B4E5C 90 1E 00 90 */ stw r0, 0x90(r30)
lbl_801B4E60:
/* 801B4E60 38 00 00 01 */ li r0, 1
/* 801B4E64 80 7E 00 90 */ lwz r3, 0x90(r30)
/* 801B4E68 98 03 01 BC */ stb r0, 0x1bc(r3)
/* 801B4E6C 80 7E 00 90 */ lwz r3, 0x90(r30)
/* 801B4E70 48 03 A9 3D */ bl _create__12dMenu_save_cFv
/* 801B4E74 80 7E 00 90 */ lwz r3, 0x90(r30)
/* 801B4E78 48 03 BA C1 */ bl initialize__12dMenu_save_cFv
/* 801B4E7C 7F C3 F3 78 */ mr r3, r30
/* 801B4E80 38 80 00 00 */ li r4, 0
/* 801B4E84 48 00 11 31 */ bl setAButtonString__17dMenu_Collect2D_cFUs
/* 801B4E88 7F C3 F3 78 */ mr r3, r30
/* 801B4E8C 38 80 00 00 */ li r4, 0
/* 801B4E90 48 00 12 29 */ bl setBButtonString__17dMenu_Collect2D_cFUs
/* 801B4E94 38 00 00 00 */ li r0, 0
/* 801B4E98 80 7E 00 20 */ lwz r3, 0x20(r30)
/* 801B4E9C 98 03 00 B4 */ stb r0, 0xb4(r3)
/* 801B4EA0 7F E3 FB 78 */ mr r3, r31
/* 801B4EA4 4B E5 A3 29 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B4EA8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B4EAC 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B4EB0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B4EB4 7C 08 03 A6 */ mtlr r0
/* 801B4EB8 38 21 00 10 */ addi r1, r1, 0x10
/* 801B4EBC 4E 80 00 20 */ blr
@@ -1,31 +0,0 @@
lbl_801B4EC0:
/* 801B4EC0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B4EC4 7C 08 02 A6 */ mflr r0
/* 801B4EC8 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B4ECC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B4ED0 93 C1 00 08 */ stw r30, 8(r1)
/* 801B4ED4 7C 7E 1B 78 */ mr r30, r3
/* 801B4ED8 80 63 00 08 */ lwz r3, 8(r3)
/* 801B4EDC 4B E5 A2 F1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B4EE0 7C 7F 1B 78 */ mr r31, r3
/* 801B4EE4 80 7E 00 90 */ lwz r3, 0x90(r30)
/* 801B4EE8 88 03 01 BA */ lbz r0, 0x1ba(r3)
/* 801B4EEC 28 00 00 01 */ cmplwi r0, 1
/* 801B4EF0 40 82 00 08 */ bne lbl_801B4EF8
/* 801B4EF4 48 03 BA B9 */ bl _open__12dMenu_save_cFv
lbl_801B4EF8:
/* 801B4EF8 80 7E 00 90 */ lwz r3, 0x90(r30)
/* 801B4EFC 88 03 01 BA */ lbz r0, 0x1ba(r3)
/* 801B4F00 28 00 00 02 */ cmplwi r0, 2
/* 801B4F04 40 82 00 0C */ bne lbl_801B4F10
/* 801B4F08 38 00 00 02 */ li r0, 2
/* 801B4F0C 98 1E 02 2C */ stb r0, 0x22c(r30)
lbl_801B4F10:
/* 801B4F10 7F E3 FB 78 */ mr r3, r31
/* 801B4F14 4B E5 A2 B9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B4F18 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B4F1C 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B4F20 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B4F24 7C 08 03 A6 */ mtlr r0
/* 801B4F28 38 21 00 10 */ addi r1, r1, 0x10
/* 801B4F2C 4E 80 00 20 */ blr
@@ -1,165 +0,0 @@
lbl_801B30C8:
/* 801B30C8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B30CC 7C 08 02 A6 */ mflr r0
/* 801B30D0 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B30D4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B30D8 7C 7F 1B 78 */ mr r31, r3
/* 801B30DC 54 80 06 3E */ clrlwi r0, r4, 0x18
/* 801B30E0 2C 00 00 3C */ cmpwi r0, 0x3c
/* 801B30E4 41 82 01 3C */ beq lbl_801B3220
/* 801B30E8 40 80 00 1C */ bge lbl_801B3104
/* 801B30EC 2C 00 00 1E */ cmpwi r0, 0x1e
/* 801B30F0 41 82 00 A8 */ beq lbl_801B3198
/* 801B30F4 40 80 02 38 */ bge lbl_801B332C
/* 801B30F8 2C 00 00 00 */ cmpwi r0, 0
/* 801B30FC 41 82 00 14 */ beq lbl_801B3110
/* 801B3100 48 00 02 2C */ b lbl_801B332C
lbl_801B3104:
/* 801B3104 2C 00 00 64 */ cmpwi r0, 0x64
/* 801B3108 41 82 01 A0 */ beq lbl_801B32A8
/* 801B310C 48 00 02 20 */ b lbl_801B332C
lbl_801B3110:
/* 801B3110 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B3114 3C 80 5F 30 */ lis r4, 0x5F30 /* 0x5F305F30@ha */
/* 801B3118 38 C4 5F 30 */ addi r6, r4, 0x5F30 /* 0x5F305F30@l */
/* 801B311C 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B3120 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B3124 81 83 00 00 */ lwz r12, 0(r3)
/* 801B3128 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B312C 7D 89 03 A6 */ mtctr r12
/* 801B3130 4E 80 04 21 */ bctrl
/* 801B3134 38 00 00 00 */ li r0, 0
/* 801B3138 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B313C 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B3140 3C 80 5F 30 */ lis r4, 0x5F30 /* 0x5F305F31@ha */
/* 801B3144 38 C4 5F 31 */ addi r6, r4, 0x5F31 /* 0x5F305F31@l */
/* 801B3148 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B314C 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B3150 81 83 00 00 */ lwz r12, 0(r3)
/* 801B3154 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B3158 7D 89 03 A6 */ mtctr r12
/* 801B315C 4E 80 04 21 */ bctrl
/* 801B3160 38 00 00 00 */ li r0, 0
/* 801B3164 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B3168 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B316C 3C 80 5F 30 */ lis r4, 0x5F30 /* 0x5F305F32@ha */
/* 801B3170 38 C4 5F 32 */ addi r6, r4, 0x5F32 /* 0x5F305F32@l */
/* 801B3174 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B3178 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B317C 81 83 00 00 */ lwz r12, 0(r3)
/* 801B3180 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B3184 7D 89 03 A6 */ mtctr r12
/* 801B3188 4E 80 04 21 */ bctrl
/* 801B318C 38 00 00 00 */ li r0, 0
/* 801B3190 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B3194 48 00 01 98 */ b lbl_801B332C
lbl_801B3198:
/* 801B3198 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B319C 3C 80 5F 30 */ lis r4, 0x5F30 /* 0x5F305F30@ha */
/* 801B31A0 38 C4 5F 30 */ addi r6, r4, 0x5F30 /* 0x5F305F30@l */
/* 801B31A4 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B31A8 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B31AC 81 83 00 00 */ lwz r12, 0(r3)
/* 801B31B0 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B31B4 7D 89 03 A6 */ mtctr r12
/* 801B31B8 4E 80 04 21 */ bctrl
/* 801B31BC 38 00 00 01 */ li r0, 1
/* 801B31C0 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B31C4 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B31C8 3C 80 5F 30 */ lis r4, 0x5F30 /* 0x5F305F31@ha */
/* 801B31CC 38 C4 5F 31 */ addi r6, r4, 0x5F31 /* 0x5F305F31@l */
/* 801B31D0 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B31D4 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B31D8 81 83 00 00 */ lwz r12, 0(r3)
/* 801B31DC 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B31E0 7D 89 03 A6 */ mtctr r12
/* 801B31E4 4E 80 04 21 */ bctrl
/* 801B31E8 38 00 00 00 */ li r0, 0
/* 801B31EC 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B31F0 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B31F4 3C 80 5F 30 */ lis r4, 0x5F30 /* 0x5F305F32@ha */
/* 801B31F8 38 C4 5F 32 */ addi r6, r4, 0x5F32 /* 0x5F305F32@l */
/* 801B31FC 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B3200 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B3204 81 83 00 00 */ lwz r12, 0(r3)
/* 801B3208 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B320C 7D 89 03 A6 */ mtctr r12
/* 801B3210 4E 80 04 21 */ bctrl
/* 801B3214 38 00 00 00 */ li r0, 0
/* 801B3218 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B321C 48 00 01 10 */ b lbl_801B332C
lbl_801B3220:
/* 801B3220 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B3224 3C 80 5F 30 */ lis r4, 0x5F30 /* 0x5F305F30@ha */
/* 801B3228 38 C4 5F 30 */ addi r6, r4, 0x5F30 /* 0x5F305F30@l */
/* 801B322C 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B3230 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B3234 81 83 00 00 */ lwz r12, 0(r3)
/* 801B3238 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B323C 7D 89 03 A6 */ mtctr r12
/* 801B3240 4E 80 04 21 */ bctrl
/* 801B3244 38 00 00 00 */ li r0, 0
/* 801B3248 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B324C 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B3250 3C 80 5F 30 */ lis r4, 0x5F30 /* 0x5F305F31@ha */
/* 801B3254 38 C4 5F 31 */ addi r6, r4, 0x5F31 /* 0x5F305F31@l */
/* 801B3258 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B325C 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B3260 81 83 00 00 */ lwz r12, 0(r3)
/* 801B3264 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B3268 7D 89 03 A6 */ mtctr r12
/* 801B326C 4E 80 04 21 */ bctrl
/* 801B3270 38 00 00 01 */ li r0, 1
/* 801B3274 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B3278 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B327C 3C 80 5F 30 */ lis r4, 0x5F30 /* 0x5F305F32@ha */
/* 801B3280 38 C4 5F 32 */ addi r6, r4, 0x5F32 /* 0x5F305F32@l */
/* 801B3284 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B3288 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B328C 81 83 00 00 */ lwz r12, 0(r3)
/* 801B3290 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B3294 7D 89 03 A6 */ mtctr r12
/* 801B3298 4E 80 04 21 */ bctrl
/* 801B329C 38 00 00 00 */ li r0, 0
/* 801B32A0 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B32A4 48 00 00 88 */ b lbl_801B332C
lbl_801B32A8:
/* 801B32A8 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B32AC 3C 80 5F 30 */ lis r4, 0x5F30 /* 0x5F305F30@ha */
/* 801B32B0 38 C4 5F 30 */ addi r6, r4, 0x5F30 /* 0x5F305F30@l */
/* 801B32B4 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B32B8 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B32BC 81 83 00 00 */ lwz r12, 0(r3)
/* 801B32C0 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B32C4 7D 89 03 A6 */ mtctr r12
/* 801B32C8 4E 80 04 21 */ bctrl
/* 801B32CC 38 00 00 00 */ li r0, 0
/* 801B32D0 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B32D4 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B32D8 3C 80 5F 30 */ lis r4, 0x5F30 /* 0x5F305F31@ha */
/* 801B32DC 38 C4 5F 31 */ addi r6, r4, 0x5F31 /* 0x5F305F31@l */
/* 801B32E0 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B32E4 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B32E8 81 83 00 00 */ lwz r12, 0(r3)
/* 801B32EC 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B32F0 7D 89 03 A6 */ mtctr r12
/* 801B32F4 4E 80 04 21 */ bctrl
/* 801B32F8 38 00 00 00 */ li r0, 0
/* 801B32FC 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B3300 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B3304 3C 80 5F 30 */ lis r4, 0x5F30 /* 0x5F305F32@ha */
/* 801B3308 38 C4 5F 32 */ addi r6, r4, 0x5F32 /* 0x5F305F32@l */
/* 801B330C 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B3310 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B3314 81 83 00 00 */ lwz r12, 0(r3)
/* 801B3318 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B331C 7D 89 03 A6 */ mtctr r12
/* 801B3320 4E 80 04 21 */ bctrl
/* 801B3324 38 00 00 01 */ li r0, 1
/* 801B3328 98 03 00 B0 */ stb r0, 0xb0(r3)
lbl_801B332C:
/* 801B332C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B3330 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B3334 7C 08 03 A6 */ mtlr r0
/* 801B3338 38 21 00 10 */ addi r1, r1, 0x10
/* 801B333C 4E 80 00 20 */ blr
@@ -1,69 +0,0 @@
lbl_801B6344:
/* 801B6344 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B6348 7C 08 02 A6 */ mflr r0
/* 801B634C 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B6350 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B6354 7C 7F 1B 78 */ mr r31, r3
/* 801B6358 38 00 00 00 */ li r0, 0
/* 801B635C B0 03 01 82 */ sth r0, 0x182(r3)
/* 801B6360 80 63 00 18 */ lwz r3, 0x18(r3)
/* 801B6364 3C 80 5F 6E */ lis r4, 0x5F6E /* 0x5F6E3034@ha */
/* 801B6368 38 C4 30 34 */ addi r6, r4, 0x3034 /* 0x5F6E3034@l */
/* 801B636C 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B6370 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B6374 81 83 00 00 */ lwz r12, 0(r3)
/* 801B6378 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B637C 7D 89 03 A6 */ mtctr r12
/* 801B6380 4E 80 04 21 */ bctrl
/* 801B6384 48 14 A2 D5 */ bl getStringPtr__10J2DTextBoxCFv
/* 801B6388 3C 80 80 39 */ lis r4, d_menu_d_menu_collect__stringBase0@ha /* 0x80395330@ha */
/* 801B638C 38 84 53 30 */ addi r4, r4, d_menu_d_menu_collect__stringBase0@l /* 0x80395330@l */
/* 801B6390 38 84 00 55 */ addi r4, r4, 0x55
/* 801B6394 48 1B 27 99 */ bl strcpy
/* 801B6398 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B639C 3C 80 5F 6E */ lis r4, 0x5F6E /* 0x5F6E3035@ha */
/* 801B63A0 38 C4 30 35 */ addi r6, r4, 0x3035 /* 0x5F6E3035@l */
/* 801B63A4 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B63A8 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B63AC 81 83 00 00 */ lwz r12, 0(r3)
/* 801B63B0 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B63B4 7D 89 03 A6 */ mtctr r12
/* 801B63B8 4E 80 04 21 */ bctrl
/* 801B63BC 48 14 A2 9D */ bl getStringPtr__10J2DTextBoxCFv
/* 801B63C0 3C 80 80 39 */ lis r4, d_menu_d_menu_collect__stringBase0@ha /* 0x80395330@ha */
/* 801B63C4 38 84 53 30 */ addi r4, r4, d_menu_d_menu_collect__stringBase0@l /* 0x80395330@l */
/* 801B63C8 38 84 00 55 */ addi r4, r4, 0x55
/* 801B63CC 48 1B 27 61 */ bl strcpy
/* 801B63D0 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B63D4 3C 80 5F 6E */ lis r4, 0x5F6E /* 0x5F6E3036@ha */
/* 801B63D8 38 C4 30 36 */ addi r6, r4, 0x3036 /* 0x5F6E3036@l */
/* 801B63DC 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B63E0 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B63E4 81 83 00 00 */ lwz r12, 0(r3)
/* 801B63E8 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B63EC 7D 89 03 A6 */ mtctr r12
/* 801B63F0 4E 80 04 21 */ bctrl
/* 801B63F4 48 14 A2 65 */ bl getStringPtr__10J2DTextBoxCFv
/* 801B63F8 3C 80 80 39 */ lis r4, d_menu_d_menu_collect__stringBase0@ha /* 0x80395330@ha */
/* 801B63FC 38 84 53 30 */ addi r4, r4, d_menu_d_menu_collect__stringBase0@l /* 0x80395330@l */
/* 801B6400 38 84 00 55 */ addi r4, r4, 0x55
/* 801B6404 48 1B 27 29 */ bl strcpy
/* 801B6408 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B640C 3C 80 5F 6E */ lis r4, 0x5F6E /* 0x5F6E3037@ha */
/* 801B6410 38 C4 30 37 */ addi r6, r4, 0x3037 /* 0x5F6E3037@l */
/* 801B6414 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B6418 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B641C 81 83 00 00 */ lwz r12, 0(r3)
/* 801B6420 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B6424 7D 89 03 A6 */ mtctr r12
/* 801B6428 4E 80 04 21 */ bctrl
/* 801B642C 48 14 A2 2D */ bl getStringPtr__10J2DTextBoxCFv
/* 801B6430 3C 80 80 39 */ lis r4, d_menu_d_menu_collect__stringBase0@ha /* 0x80395330@ha */
/* 801B6434 38 84 53 30 */ addi r4, r4, d_menu_d_menu_collect__stringBase0@l /* 0x80395330@l */
/* 801B6438 38 84 00 55 */ addi r4, r4, 0x55
/* 801B643C 48 1B 26 F1 */ bl strcpy
/* 801B6440 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B6444 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B6448 7C 08 03 A6 */ mtlr r0
/* 801B644C 38 21 00 10 */ addi r1, r1, 0x10
/* 801B6450 4E 80 00 20 */ blr
@@ -1,127 +0,0 @@
lbl_801B3340:
/* 801B3340 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B3344 7C 08 02 A6 */ mflr r0
/* 801B3348 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B334C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B3350 7C 7F 1B 78 */ mr r31, r3
/* 801B3354 54 80 04 3E */ clrlwi r0, r4, 0x10
/* 801B3358 2C 00 02 58 */ cmpwi r0, 0x258
/* 801B335C 41 82 00 A8 */ beq lbl_801B3404
/* 801B3360 40 80 00 10 */ bge lbl_801B3370
/* 801B3364 2C 00 01 2C */ cmpwi r0, 0x12c
/* 801B3368 41 82 00 14 */ beq lbl_801B337C
/* 801B336C 48 00 01 A4 */ b lbl_801B3510
lbl_801B3370:
/* 801B3370 2C 00 03 E8 */ cmpwi r0, 0x3e8
/* 801B3374 41 82 01 18 */ beq lbl_801B348C
/* 801B3378 48 00 01 98 */ b lbl_801B3510
lbl_801B337C:
/* 801B337C 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B3380 3C 80 5F 31 */ lis r4, 0x5F31 /* 0x5F315F30@ha */
/* 801B3384 38 C4 5F 30 */ addi r6, r4, 0x5F30 /* 0x5F315F30@l */
/* 801B3388 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B338C 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B3390 81 83 00 00 */ lwz r12, 0(r3)
/* 801B3394 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B3398 7D 89 03 A6 */ mtctr r12
/* 801B339C 4E 80 04 21 */ bctrl
/* 801B33A0 38 00 00 01 */ li r0, 1
/* 801B33A4 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B33A8 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B33AC 3C 80 5F 31 */ lis r4, 0x5F31 /* 0x5F315F31@ha */
/* 801B33B0 38 C4 5F 31 */ addi r6, r4, 0x5F31 /* 0x5F315F31@l */
/* 801B33B4 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B33B8 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B33BC 81 83 00 00 */ lwz r12, 0(r3)
/* 801B33C0 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B33C4 7D 89 03 A6 */ mtctr r12
/* 801B33C8 4E 80 04 21 */ bctrl
/* 801B33CC 38 00 00 00 */ li r0, 0
/* 801B33D0 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B33D4 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B33D8 3C 80 5F 31 */ lis r4, 0x5F31 /* 0x5F315F32@ha */
/* 801B33DC 38 C4 5F 32 */ addi r6, r4, 0x5F32 /* 0x5F315F32@l */
/* 801B33E0 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B33E4 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B33E8 81 83 00 00 */ lwz r12, 0(r3)
/* 801B33EC 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B33F0 7D 89 03 A6 */ mtctr r12
/* 801B33F4 4E 80 04 21 */ bctrl
/* 801B33F8 38 00 00 00 */ li r0, 0
/* 801B33FC 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B3400 48 00 01 10 */ b lbl_801B3510
lbl_801B3404:
/* 801B3404 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B3408 3C 80 5F 31 */ lis r4, 0x5F31 /* 0x5F315F30@ha */
/* 801B340C 38 C4 5F 30 */ addi r6, r4, 0x5F30 /* 0x5F315F30@l */
/* 801B3410 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B3414 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B3418 81 83 00 00 */ lwz r12, 0(r3)
/* 801B341C 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B3420 7D 89 03 A6 */ mtctr r12
/* 801B3424 4E 80 04 21 */ bctrl
/* 801B3428 38 00 00 00 */ li r0, 0
/* 801B342C 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B3430 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B3434 3C 80 5F 31 */ lis r4, 0x5F31 /* 0x5F315F31@ha */
/* 801B3438 38 C4 5F 31 */ addi r6, r4, 0x5F31 /* 0x5F315F31@l */
/* 801B343C 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B3440 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B3444 81 83 00 00 */ lwz r12, 0(r3)
/* 801B3448 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B344C 7D 89 03 A6 */ mtctr r12
/* 801B3450 4E 80 04 21 */ bctrl
/* 801B3454 38 00 00 01 */ li r0, 1
/* 801B3458 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B345C 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B3460 3C 80 5F 31 */ lis r4, 0x5F31 /* 0x5F315F32@ha */
/* 801B3464 38 C4 5F 32 */ addi r6, r4, 0x5F32 /* 0x5F315F32@l */
/* 801B3468 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B346C 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B3470 81 83 00 00 */ lwz r12, 0(r3)
/* 801B3474 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B3478 7D 89 03 A6 */ mtctr r12
/* 801B347C 4E 80 04 21 */ bctrl
/* 801B3480 38 00 00 00 */ li r0, 0
/* 801B3484 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B3488 48 00 00 88 */ b lbl_801B3510
lbl_801B348C:
/* 801B348C 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B3490 3C 80 5F 31 */ lis r4, 0x5F31 /* 0x5F315F30@ha */
/* 801B3494 38 C4 5F 30 */ addi r6, r4, 0x5F30 /* 0x5F315F30@l */
/* 801B3498 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B349C 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B34A0 81 83 00 00 */ lwz r12, 0(r3)
/* 801B34A4 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B34A8 7D 89 03 A6 */ mtctr r12
/* 801B34AC 4E 80 04 21 */ bctrl
/* 801B34B0 38 00 00 00 */ li r0, 0
/* 801B34B4 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B34B8 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B34BC 3C 80 5F 31 */ lis r4, 0x5F31 /* 0x5F315F31@ha */
/* 801B34C0 38 C4 5F 31 */ addi r6, r4, 0x5F31 /* 0x5F315F31@l */
/* 801B34C4 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B34C8 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B34CC 81 83 00 00 */ lwz r12, 0(r3)
/* 801B34D0 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B34D4 7D 89 03 A6 */ mtctr r12
/* 801B34D8 4E 80 04 21 */ bctrl
/* 801B34DC 38 00 00 00 */ li r0, 0
/* 801B34E0 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801B34E4 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801B34E8 3C 80 5F 31 */ lis r4, 0x5F31 /* 0x5F315F32@ha */
/* 801B34EC 38 C4 5F 32 */ addi r6, r4, 0x5F32 /* 0x5F315F32@l */
/* 801B34F0 3C 80 69 74 */ lis r4, 0x6974 /* 0x6974656D@ha */
/* 801B34F4 38 A4 65 6D */ addi r5, r4, 0x656D /* 0x6974656D@l */
/* 801B34F8 81 83 00 00 */ lwz r12, 0(r3)
/* 801B34FC 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 801B3500 7D 89 03 A6 */ mtctr r12
/* 801B3504 4E 80 04 21 */ bctrl
/* 801B3508 38 00 00 01 */ li r0, 1
/* 801B350C 98 03 00 B0 */ stb r0, 0xb0(r3)
lbl_801B3510:
/* 801B3510 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B3514 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B3518 7C 08 03 A6 */ mtlr r0
/* 801B351C 38 21 00 10 */ addi r1, r1, 0x10
/* 801B3520 4E 80 00 20 */ blr
@@ -1,16 +0,0 @@
lbl_801B59A8:
/* 801B59A8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B59AC 7C 08 02 A6 */ mflr r0
/* 801B59B0 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B59B4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B59B8 7C 7F 1B 78 */ mr r31, r3
/* 801B59BC 38 80 00 00 */ li r4, 0
/* 801B59C0 48 00 05 F5 */ bl setAButtonString__17dMenu_Collect2D_cFUs
/* 801B59C4 7F E3 FB 78 */ mr r3, r31
/* 801B59C8 38 80 00 00 */ li r4, 0
/* 801B59CC 48 00 06 ED */ bl setBButtonString__17dMenu_Collect2D_cFUs
/* 801B59D0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B59D4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B59D8 7C 08 03 A6 */ mtlr r0
/* 801B59DC 38 21 00 10 */ addi r1, r1, 0x10
/* 801B59E0 4E 80 00 20 */ blr
@@ -1,34 +0,0 @@
lbl_801B59E4:
/* 801B59E4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B59E8 7C 08 02 A6 */ mflr r0
/* 801B59EC 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B59F0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B59F4 93 C1 00 08 */ stw r30, 8(r1)
/* 801B59F8 7C 7E 1B 78 */ mr r30, r3
/* 801B59FC 80 63 00 08 */ lwz r3, 8(r3)
/* 801B5A00 4B E5 97 CD */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5A04 7C 7F 1B 78 */ mr r31, r3
/* 801B5A08 80 7E 00 A0 */ lwz r3, 0xa0(r30)
/* 801B5A0C 88 03 02 04 */ lbz r0, 0x204(r3)
/* 801B5A10 28 00 00 03 */ cmplwi r0, 3
/* 801B5A14 40 82 00 08 */ bne lbl_801B5A1C
/* 801B5A18 48 04 22 05 */ bl _close__13dMenu_Skill_cFv
lbl_801B5A1C:
/* 801B5A1C 80 7E 00 A0 */ lwz r3, 0xa0(r30)
/* 801B5A20 88 03 02 04 */ lbz r0, 0x204(r3)
/* 801B5A24 28 00 00 00 */ cmplwi r0, 0
/* 801B5A28 40 82 00 18 */ bne lbl_801B5A40
/* 801B5A2C 38 00 00 00 */ li r0, 0
/* 801B5A30 98 1E 02 2C */ stb r0, 0x22c(r30)
/* 801B5A34 38 00 00 FF */ li r0, 0xff
/* 801B5A38 80 7E 00 20 */ lwz r3, 0x20(r30)
/* 801B5A3C 98 03 00 B4 */ stb r0, 0xb4(r3)
lbl_801B5A40:
/* 801B5A40 7F E3 FB 78 */ mr r3, r31
/* 801B5A44 4B E5 97 89 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5A48 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5A4C 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B5A50 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B5A54 7C 08 03 A6 */ mtlr r0
/* 801B5A58 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5A5C 4E 80 00 20 */ blr
@@ -1,16 +0,0 @@
lbl_801B58FC:
/* 801B58FC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5900 7C 08 02 A6 */ mflr r0
/* 801B5904 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5908 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B590C 7C 7F 1B 78 */ mr r31, r3
/* 801B5910 38 80 04 0C */ li r4, 0x40c
/* 801B5914 48 00 06 A1 */ bl setAButtonString__17dMenu_Collect2D_cFUs
/* 801B5918 7F E3 FB 78 */ mr r3, r31
/* 801B591C 38 80 03 F9 */ li r4, 0x3f9
/* 801B5920 48 00 07 99 */ bl setBButtonString__17dMenu_Collect2D_cFUs
/* 801B5924 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5928 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B592C 7C 08 03 A6 */ mtlr r0
/* 801B5930 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5934 4E 80 00 20 */ blr
@@ -1,31 +0,0 @@
lbl_801B5938:
/* 801B5938 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B593C 7C 08 02 A6 */ mflr r0
/* 801B5940 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5944 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B5948 93 C1 00 08 */ stw r30, 8(r1)
/* 801B594C 7C 7E 1B 78 */ mr r30, r3
/* 801B5950 80 63 00 08 */ lwz r3, 8(r3)
/* 801B5954 4B E5 98 79 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5958 7C 7F 1B 78 */ mr r31, r3
/* 801B595C 80 7E 00 A0 */ lwz r3, 0xa0(r30)
/* 801B5960 88 03 02 04 */ lbz r0, 0x204(r3)
/* 801B5964 28 00 00 02 */ cmplwi r0, 2
/* 801B5968 40 82 00 08 */ bne lbl_801B5970
/* 801B596C 48 04 1D AD */ bl _move__13dMenu_Skill_cFv
lbl_801B5970:
/* 801B5970 80 7E 00 A0 */ lwz r3, 0xa0(r30)
/* 801B5974 88 03 02 04 */ lbz r0, 0x204(r3)
/* 801B5978 28 00 00 03 */ cmplwi r0, 3
/* 801B597C 40 82 00 0C */ bne lbl_801B5988
/* 801B5980 38 00 00 0F */ li r0, 0xf
/* 801B5984 98 1E 02 2C */ stb r0, 0x22c(r30)
lbl_801B5988:
/* 801B5988 7F E3 FB 78 */ mr r3, r31
/* 801B598C 4B E5 98 41 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5990 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5994 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B5998 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B599C 7C 08 03 A6 */ mtlr r0
/* 801B59A0 38 21 00 10 */ addi r1, r1, 0x10
/* 801B59A4 4E 80 00 20 */ blr
@@ -1,42 +0,0 @@
lbl_801B57F0:
/* 801B57F0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B57F4 7C 08 02 A6 */ mflr r0
/* 801B57F8 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B57FC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B5800 93 C1 00 08 */ stw r30, 8(r1)
/* 801B5804 7C 7E 1B 78 */ mr r30, r3
/* 801B5808 80 63 00 08 */ lwz r3, 8(r3)
/* 801B580C 4B E5 99 C1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5810 7C 7F 1B 78 */ mr r31, r3
/* 801B5814 80 1E 00 A0 */ lwz r0, 0xa0(r30)
/* 801B5818 28 00 00 00 */ cmplwi r0, 0
/* 801B581C 40 82 00 2C */ bne lbl_801B5848
/* 801B5820 38 60 02 0C */ li r3, 0x20c
/* 801B5824 48 11 94 29 */ bl __nw__FUl
/* 801B5828 7C 60 1B 79 */ or. r0, r3, r3
/* 801B582C 41 82 00 18 */ beq lbl_801B5844
/* 801B5830 80 9E 00 08 */ lwz r4, 8(r30)
/* 801B5834 80 BE 00 10 */ lwz r5, 0x10(r30)
/* 801B5838 80 DE 00 14 */ lwz r6, 0x14(r30)
/* 801B583C 48 04 19 E9 */ bl __ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl
/* 801B5840 7C 60 1B 78 */ mr r0, r3
lbl_801B5844:
/* 801B5844 90 1E 00 A0 */ stw r0, 0xa0(r30)
lbl_801B5848:
/* 801B5848 7F C3 F3 78 */ mr r3, r30
/* 801B584C 38 80 00 00 */ li r4, 0
/* 801B5850 48 00 07 65 */ bl setAButtonString__17dMenu_Collect2D_cFUs
/* 801B5854 7F C3 F3 78 */ mr r3, r30
/* 801B5858 38 80 00 00 */ li r4, 0
/* 801B585C 48 00 08 5D */ bl setBButtonString__17dMenu_Collect2D_cFUs
/* 801B5860 38 00 00 00 */ li r0, 0
/* 801B5864 80 7E 00 20 */ lwz r3, 0x20(r30)
/* 801B5868 98 03 00 B4 */ stb r0, 0xb4(r3)
/* 801B586C 7F E3 FB 78 */ mr r3, r31
/* 801B5870 4B E5 99 5D */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B5874 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B5878 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B587C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B5880 7C 08 03 A6 */ mtlr r0
/* 801B5884 38 21 00 10 */ addi r1, r1, 0x10
/* 801B5888 4E 80 00 20 */ blr
@@ -1,31 +0,0 @@
lbl_801B588C:
/* 801B588C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B5890 7C 08 02 A6 */ mflr r0
/* 801B5894 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5898 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B589C 93 C1 00 08 */ stw r30, 8(r1)
/* 801B58A0 7C 7E 1B 78 */ mr r30, r3
/* 801B58A4 80 63 00 08 */ lwz r3, 8(r3)
/* 801B58A8 4B E5 99 25 */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B58AC 7C 7F 1B 78 */ mr r31, r3
/* 801B58B0 80 7E 00 A0 */ lwz r3, 0xa0(r30)
/* 801B58B4 88 03 02 04 */ lbz r0, 0x204(r3)
/* 801B58B8 28 00 00 01 */ cmplwi r0, 1
/* 801B58BC 40 82 00 08 */ bne lbl_801B58C4
/* 801B58C0 48 04 21 81 */ bl _open__13dMenu_Skill_cFv
lbl_801B58C4:
/* 801B58C4 80 7E 00 A0 */ lwz r3, 0xa0(r30)
/* 801B58C8 88 03 02 04 */ lbz r0, 0x204(r3)
/* 801B58CC 28 00 00 02 */ cmplwi r0, 2
/* 801B58D0 40 82 00 0C */ bne lbl_801B58DC
/* 801B58D4 38 00 00 0E */ li r0, 0xe
/* 801B58D8 98 1E 02 2C */ stb r0, 0x22c(r30)
lbl_801B58DC:
/* 801B58DC 7F E3 FB 78 */ mr r3, r31
/* 801B58E0 4B E5 98 ED */ bl mDoExt_setCurrentHeap__FP7JKRHeap
/* 801B58E4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801B58E8 83 C1 00 08 */ lwz r30, 8(r1)
/* 801B58EC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801B58F0 7C 08 03 A6 */ mtlr r0
/* 801B58F4 38 21 00 10 */ addi r1, r1, 0x10
/* 801B58F8 4E 80 00 20 */ blr
@@ -1,29 +0,0 @@
lbl_80D66378:
/* 80D66378 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D6637C 7C 08 02 A6 */ mflr r0
/* 80D66380 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D66384 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D66388 93 C1 00 08 */ stw r30, 8(r1)
/* 80D6638C 7C 7E 1B 79 */ or. r30, r3, r3
/* 80D66390 7C 9F 23 78 */ mr r31, r4
/* 80D66394 41 82 00 34 */ beq lbl_80D663C8
/* 80D66398 38 60 FF FF */ li r3, -1
/* 80D6639C 4B 4D 1D ED */ bl setProcessID__12dMsgObject_cFUi
/* 80D663A0 38 7E 05 68 */ addi r3, r30, 0x568
/* 80D663A4 38 80 FF FF */ li r4, -1
/* 80D663A8 4B 4E 3B A1 */ bl __dt__10dMsgFlow_cFv
/* 80D663AC 7F C3 F3 78 */ mr r3, r30
/* 80D663B0 38 80 00 00 */ li r4, 0
/* 80D663B4 4B 2B 28 D9 */ bl __dt__10fopAc_ac_cFv
/* 80D663B8 7F E0 07 35 */ extsh. r0, r31
/* 80D663BC 40 81 00 0C */ ble lbl_80D663C8
/* 80D663C0 7F C3 F3 78 */ mr r3, r30
/* 80D663C4 4B 56 89 79 */ bl __dl__FPv
lbl_80D663C8:
/* 80D663C8 7F C3 F3 78 */ mr r3, r30
/* 80D663CC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D663D0 83 C1 00 08 */ lwz r30, 8(r1)
/* 80D663D4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D663D8 7C 08 03 A6 */ mtlr r0
/* 80D663DC 38 21 00 10 */ addi r1, r1, 0x10
/* 80D663E0 4E 80 00 20 */ blr
@@ -1,55 +0,0 @@
lbl_80D663E4:
/* 80D663E4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D663E8 7C 08 02 A6 */ mflr r0
/* 80D663EC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D663F0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D663F4 93 C1 00 08 */ stw r30, 8(r1)
/* 80D663F8 7C 7E 1B 78 */ mr r30, r3
/* 80D663FC 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 80D66400 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 80D66404 40 82 00 28 */ bne lbl_80D6642C
/* 80D66408 7F C0 F3 79 */ or. r0, r30, r30
/* 80D6640C 41 82 00 14 */ beq lbl_80D66420
/* 80D66410 7C 1F 03 78 */ mr r31, r0
/* 80D66414 4B 2B 27 51 */ bl __ct__10fopAc_ac_cFv
/* 80D66418 38 7F 05 68 */ addi r3, r31, 0x568
/* 80D6641C 4B 4E 3A E5 */ bl __ct__10dMsgFlow_cFv
lbl_80D66420:
/* 80D66420 80 1E 04 A0 */ lwz r0, 0x4a0(r30)
/* 80D66424 60 00 00 08 */ ori r0, r0, 8
/* 80D66428 90 1E 04 A0 */ stw r0, 0x4a0(r30)
lbl_80D6642C:
/* 80D6642C 7F C3 F3 78 */ mr r3, r30
/* 80D66430 48 00 02 59 */ bl getStatus__8daTalk_cFv
/* 80D66434 54 60 04 3E */ clrlwi r0, r3, 0x10
/* 80D66438 28 00 00 01 */ cmplwi r0, 1
/* 80D6643C 41 82 00 0C */ beq lbl_80D66448
/* 80D66440 38 60 00 05 */ li r3, 5
/* 80D66444 48 00 00 50 */ b lbl_80D66494
lbl_80D66448:
/* 80D66448 4B 4D 1D 79 */ bl getpTalkActor__12dMsgObject_cFv
/* 80D6644C 3B E3 05 44 */ addi r31, r3, 0x544
/* 80D66450 38 7E 05 44 */ addi r3, r30, 0x544
/* 80D66454 7F E4 FB 78 */ mr r4, r31
/* 80D66458 38 A0 00 09 */ li r5, 9
/* 80D6645C 4B 5F B7 E1 */ bl __copy
/* 80D66460 A8 1F 00 0A */ lha r0, 0xa(r31)
/* 80D66464 B0 1E 05 4E */ sth r0, 0x54e(r30)
/* 80D66468 C0 1F 00 0C */ lfs f0, 0xc(r31)
/* 80D6646C D0 1E 05 50 */ stfs f0, 0x550(r30)
/* 80D66470 C0 1F 00 10 */ lfs f0, 0x10(r31)
/* 80D66474 D0 1E 05 54 */ stfs f0, 0x554(r30)
/* 80D66478 C0 1F 00 14 */ lfs f0, 0x14(r31)
/* 80D6647C D0 1E 05 58 */ stfs f0, 0x558(r30)
/* 80D66480 80 1F 00 18 */ lwz r0, 0x18(r31)
/* 80D66484 90 1E 05 5C */ stw r0, 0x55c(r30)
/* 80D66488 38 00 FF FF */ li r0, -1
/* 80D6648C 90 1E 05 B4 */ stw r0, 0x5b4(r30)
/* 80D66490 38 60 00 04 */ li r3, 4
lbl_80D66494:
/* 80D66494 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D66498 83 C1 00 08 */ lwz r30, 8(r1)
/* 80D6649C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D664A0 7C 08 03 A6 */ mtlr r0
/* 80D664A4 38 21 00 10 */ addi r1, r1, 0x10
/* 80D664A8 4E 80 00 20 */ blr
@@ -1,9 +0,0 @@
lbl_80D666E4:
/* 80D666E4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D666E8 7C 08 02 A6 */ mflr r0
/* 80D666EC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D666F0 4B FF FC F5 */ bl create__8daTalk_cFv
/* 80D666F4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D666F8 7C 08 03 A6 */ mtlr r0
/* 80D666FC 38 21 00 10 */ addi r1, r1, 0x10
/* 80D66700 4E 80 00 20 */ blr
@@ -1,11 +0,0 @@
lbl_80D66704:
/* 80D66704 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D66708 7C 08 02 A6 */ mflr r0
/* 80D6670C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D66710 38 80 FF FF */ li r4, -1
/* 80D66714 4B FF FC 65 */ bl __dt__8daTalk_cFv
/* 80D66718 38 60 00 01 */ li r3, 1
/* 80D6671C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D66720 7C 08 03 A6 */ mtlr r0
/* 80D66724 38 21 00 10 */ addi r1, r1, 0x10
/* 80D66728 4E 80 00 20 */ blr
@@ -1,9 +0,0 @@
lbl_80D6674C:
/* 80D6674C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D66750 7C 08 02 A6 */ mflr r0
/* 80D66754 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D66758 4B FF FF 05 */ bl draw__8daTalk_cFv
/* 80D6675C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D66760 7C 08 03 A6 */ mtlr r0
/* 80D66764 38 21 00 10 */ addi r1, r1, 0x10
/* 80D66768 4E 80 00 20 */ blr
@@ -1,9 +0,0 @@
lbl_80D6672C:
/* 80D6672C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D66730 7C 08 02 A6 */ mflr r0
/* 80D66734 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D66738 4B FF FD 75 */ bl execute__8daTalk_cFv
/* 80D6673C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D66740 7C 08 03 A6 */ mtlr r0
/* 80D66744 38 21 00 10 */ addi r1, r1, 0x10
/* 80D66748 4E 80 00 20 */ blr
@@ -1,9 +0,0 @@
lbl_80D66688:
/* 80D66688 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D6668C 7C 08 02 A6 */ mflr r0
/* 80D66690 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D66694 4B 4D 1B 99 */ bl getStatus__12dMsgObject_cFv
/* 80D66698 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D6669C 7C 08 03 A6 */ mtlr r0
/* 80D666A0 38 21 00 10 */ addi r1, r1, 0x10
/* 80D666A4 4E 80 00 20 */ blr
@@ -1,16 +0,0 @@
lbl_80D666A8:
/* 80D666A8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D666AC 7C 08 02 A6 */ mflr r0
/* 80D666B0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D666B4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D666B8 4B 4D 1B 09 */ bl getpTalkActor__12dMsgObject_cFv
/* 80D666BC 7C 7F 1B 78 */ mr r31, r3
/* 80D666C0 4B 4D 1B 15 */ bl getIdx__12dMsgObject_cFv
/* 80D666C4 7F E4 FB 78 */ mr r4, r31
/* 80D666C8 38 A0 03 E8 */ li r5, 0x3e8
/* 80D666CC 4B 2B 96 69 */ bl fopMsgM_messageSet__FUlP10fopAc_ac_cUl
/* 80D666D0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D666D4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D666D8 7C 08 03 A6 */ mtlr r0
/* 80D666DC 38 21 00 10 */ addi r1, r1, 0x10
/* 80D666E0 4E 80 00 20 */ blr
@@ -1,10 +0,0 @@
lbl_80D66664:
/* 80D66664 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D66668 7C 08 02 A6 */ mflr r0
/* 80D6666C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D66670 7C 83 23 78 */ mr r3, r4
/* 80D66674 4B 4D 1B 89 */ bl setStatus__12dMsgObject_cFUs
/* 80D66678 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D6667C 7C 08 03 A6 */ mtlr r0
/* 80D66680 38 21 00 10 */ addi r1, r1, 0x10
/* 80D66684 4E 80 00 20 */ blr
+1 -1
View File
@@ -5,7 +5,7 @@
#include "dolphin/types.h"
struct J2DAnmLoaderDataBase {
/* 80308A6C */ static void* load(void const*);
/* 80308A6C */ static J2DAnmBase* load(void const*);
};
class J2DAnmLoader {
+4
View File
@@ -1702,6 +1702,10 @@ inline void dComIfGs_setOptCalibrateDist(u16 i_calibrateDist) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setCalibrateDist(i_calibrateDist);
}
inline u16 dComIfGs_getFishNum(u8 param_0) {
return g_dComIfG_gameInfo.info.getPlayer().getFishingInfo().getFishCount(param_0);
}
void dComIfGp_setSelectItem(int index);
s32 dComIfGp_offHeapLockFlag(int flag);
void dComIfGp_createSubExpHeap2D();
+2
View File
@@ -219,6 +219,8 @@ public:
return mZHintTarget.request(param_1, param_2);
}
static dist_entry& i_getDistTable(int i_no) { return dist_table[i_no]; }
static type_tbl_entry loc_type_tbl[3];
static type_tbl_entry act_type_tbl[5];
static dist_entry dist_table[234];
+2
View File
@@ -58,6 +58,8 @@ public:
void onPlayAnime(int i_flag) { field_0xb4 |= (1 << i_flag); }
void offPlayAnime(int i_flag) { field_0xb4 &= ~(1 << i_flag); }
bool chkPlayAnime(int i_flag) { return field_0xb4 & (1 << i_flag); }
void onPlayAllAnime() { field_0xb4 = 0xff; }
void offPlayAllAnime() { field_0xb4 = 0; }
private:
/* 0x04 */ J2DScreen* mpScreen;
+11 -8
View File
@@ -20,6 +20,7 @@ class dSelect_cursor_c;
class dMenu_Collect2D_c;
class dMenu_Collect2DTop_c : public dDlst_base_c {
public:
dMenu_Collect2DTop_c(dMenu_Collect2D_c* param_0) { mpCollect2D = param_0; }
/* 801B77A4 */ virtual void draw();
/* 801B7EB8 */ virtual ~dMenu_Collect2DTop_c();
@@ -32,9 +33,9 @@ public:
/* 801AFEA4 */ void _create();
/* 801B0100 */ void _delete();
/* 801B0570 */ void initialize();
/* 801B05A8 */ void isFishIconVisible();
/* 801B061C */ void isSkillIconVisible();
/* 801B071C */ void isInsectIconVisible();
/* 801B05A8 */ bool isFishIconVisible();
/* 801B061C */ bool isSkillIconVisible();
/* 801B071C */ bool isInsectIconVisible();
/* 801B074C */ void screenSet();
/* 801B1C3C */ void animationSet();
/* 801B1CE0 */ void btkAnimeLoop0(J2DAnmTextureSRTKey*);
@@ -105,6 +106,8 @@ public:
/* 801B7F00 */ virtual void draw();
/* 801AFE34 */ virtual ~dMenu_Collect2D_c();
u8 getCursorX() { return mCursorX; }
u8 getCursorY() { return mCursorY; }
u8 getSubWindowOpenCheck() { return mSubWindowOpenCheck; }
private:
@@ -311,12 +314,12 @@ public:
/* 801B6FB0 */ void animeEntry();
/* 801B7014 */ void createMaskModel();
/* 801B71C4 */ void createMirrorModel();
/* 801B7434 */ void getCrystalNum();
/* 801B749C */ void getMirrorNum();
/* 801B7434 */ int getCrystalNum();
/* 801B749C */ int getMirrorNum();
/* 801B7504 */ void getMaskMdlVisible();
/* 801B75E8 */ static void setupItem3D(f32 (*)[4]);
/* 801B75E8 */ static void setupItem3D(Mtx);
/* 801B7660 */ void toItem3Dpos(f32, f32, f32, cXyz*);
/* 801B774C */ void calcViewMtx(f32 (*)[4]);
/* 801B774C */ static void calcViewMtx(Mtx);
/* 801B6538 */ virtual ~dMenu_Collect3D_c();
@@ -331,7 +334,7 @@ private:
/* 0x018 */ J3DModel* mpModel;
/* 0x01C */ mDoExt_bckAnm* field_0x1c;
/* 0x020 */ mDoExt_brkAnm* field_0x20;
/* 0x024 */ u8 field_0x24[4];
/* 0x024 */ u32 field_0x24;
/* 0x028 */ dKy_tevstr_c field_0x28;
/* 0x3B0 */ cXyz field_0x3b0;
/* 0x3BC */ csXyz field_0x3bc;
+1 -1
View File
@@ -35,7 +35,7 @@ public:
/* 801D9644 */ void screenSetBase();
/* 801D98F0 */ void screenSetExplain();
/* 801D9BD0 */ void screenSetDoIcon();
/* 801D9D4C */ void getGetInsectNum();
/* 801D9D4C */ static u8 getGetInsectNum();
/* 801D9DCC */ void getInsectItemID(int, int);
/* 801D9DE4 */ void isGetInsect(int, int);
/* 801D9E20 */ void isGiveInsect(int, int);
+8
View File
@@ -151,6 +151,10 @@ public:
u8 getItemExplainWindowStatus() { return mItemExplainWindowStatus; }
void resetDirectUseItem() { mDirectUseItem = 0; }
u16 getFloatingFlowID() { return mFloatingFlowID; }
void setCollectCursorPosXY(u8 x, u8 y) {
mCollectCursorPosX = x;
mCollectCursorPosY = y;
}
public:
/* 0x04 */ u8 unk4[4];
@@ -550,6 +554,10 @@ inline u16 dMeter2Info_getFloatingFlowID() {
return g_meter2_info.getFloatingFlowID();
}
inline void dMeter2Info_setCollectCursorPosXY(u8 x, u8 y) {
g_meter2_info.setCollectCursorPosXY(x, y);
}
const char* dMeter2Info_getNumberTextureName(int pIndex);
void dMeter2Info_recieveLetter();
u8 dMeter2Info_getNewLetterNum();
+5 -5
View File
@@ -121,12 +121,12 @@ public:
/* 802380F4 */ void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, char*,
char*, char*, s16*);
/* 80238174 */ static u8* getMsgDtPtr();
/* 80238188 */ void setProcessID(unsigned int);
/* 80238188 */ static void setProcessID(unsigned int);
/* 8023819C */ static fopAc_ac_c* getActor();
/* 802381C0 */ void getpTalkActor();
/* 802381D4 */ void getIdx();
/* 802381E8 */ void getNodeIdx();
/* 802381FC */ void setStatus(u16);
/* 802381C0 */ static fopAc_ac_c* getpTalkActor();
/* 802381D4 */ static u32 getIdx();
/* 802381E8 */ static u16 getNodeIdx();
/* 802381FC */ static void setStatus(u16);
/* 8023822C */ static u16 getStatus();
/* 80238258 */ void getScrnDrawPtr();
/* 8023826C */ static void setTalkActor(fopAc_ac_c*);
+2
View File
@@ -678,6 +678,7 @@ class dSv_fishing_info_c {
public:
void init();
void addFishCount(u8 i_fishIndex);
u16 getFishCount(u8 i_fishIndex) { return mFishCount[i_fishIndex]; }
private:
/* 0x00 */ u16 mFishCount[16];
@@ -768,6 +769,7 @@ public:
dSv_player_get_item_c& getGetItem() { return mGetItem; }
dSv_player_config_c& getConfig() { return mConfig; }
dSv_letter_info_c& getLetterInfo() { return mLetterInfo; }
dSv_fishing_info_c& getFishingInfo() { return mFishingInfo; }
dSv_player_field_last_stay_info_c& getPlayerFieldLastStayInfo() {
return mPlayerFieldLastStayInfo;
}
+2 -4
View File
@@ -87,10 +87,8 @@ struct actor_place {
struct actor_attention_types {
void setFlag(u32 flags) { mFlags |= flags; }
/* 0x00 */ u8 field_0x0[4];
/* 0x04 */ u8 field_0x4[4];
/* 0x08 */ u8 field_0x8[2];
/* 0x0A */ u16 field_0xa;
/* 0x00 */ u8 field_0x0[9];
/* 0x0A */ s16 field_0xa;
/* 0x0C */ cXyz mPosition;
/* 0x18 */ u32 mFlags;
}; // Size = 0x1C
+1
View File
@@ -73,6 +73,7 @@ public:
static f32 getMinXF() { return 0.0f; }
static f32 getMaxYF() { return 448.0f; }
static f32 getMaxXF() { return 608.0f; }
static f32 getAspect() { return 1.3571428f; }
static int getMinY() { return 0; }
static int getMinX() { return 0; }
static int getMaxY() { return 448; }
+2 -2
View File
@@ -19,8 +19,8 @@ void mDoMtx_XrotM(Mtx, s16);
void mDoMtx_YrotM(Mtx, s16);
void mDoMtx_ZrotM(Mtx, s16);
void mDoMtx_MtxToRot(CMtxP, csXyz*);
void mDoMtx_lookAt(f32 (*param_0)[4], Vec const* param_1, Vec const* param_2, s16 param_3);
void mDoMtx_lookAt(f32 (*param_0)[4], Vec const* param_1, Vec const* param_2, Vec const* param_3,
void mDoMtx_lookAt(Mtx param_0, Vec const* param_1, Vec const* param_2, s16 param_3);
void mDoMtx_lookAt(Mtx param_0, Vec const* param_1, Vec const* param_2, Vec const* param_3,
s16 param_4);
void mDoMtx_concatProjView(f32 const (*param_0)[4], f32 const (*param_1)[4], f32 (*param_2)[4]);
void mDoMtx_ZrotM(Mtx mtx, s16 z);
+16 -1
View File
@@ -1,6 +1,21 @@
#ifndef D_A_TALK_H
#define D_A_TALK_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "d/msg/d_msg_flow.h"
class daTalk_c : public fopAc_ac_c {
public:
/* 80D66378 */ ~daTalk_c();
/* 80D663E4 */ int create();
/* 80D664AC */ int execute();
/* 80D6665C */ int draw();
/* 80D66664 */ void setStatus(u16);
/* 80D66688 */ u16 getStatus();
/* 80D666A8 */ u32 messageSet();
/* 0x568 */ dMsgFlow_c mMsgFlow;
/* 0x5B4 */ u32 mMessageID;
};
#endif /* D_A_TALK_H */
+102 -130
View File
@@ -4,51 +4,12 @@
//
#include "rel/d/a/d_a_talk/d_a_talk.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "d/com/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/msg/d_msg_object.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
/* 80018C8C */ ~fopAc_ac_c();
};
struct daTalk_c {
/* 80D66378 */ ~daTalk_c();
/* 80D663E4 */ void create();
/* 80D664AC */ void execute();
/* 80D6665C */ bool draw();
/* 80D66664 */ void setStatus(u16);
/* 80D66688 */ void getStatus();
/* 80D666A8 */ void messageSet();
};
struct dMsgObject_c {
/* 80238188 */ void setProcessID(unsigned int);
/* 802381C0 */ void getpTalkActor();
/* 802381D4 */ void getIdx();
/* 802381E8 */ void getNodeIdx();
/* 802381FC */ void setStatus(u16);
/* 8023822C */ void getStatus();
};
struct dMsgFlow_c {
/* 80249F00 */ dMsgFlow_c();
/* 80249F48 */ ~dMsgFlow_c();
/* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**);
/* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int);
};
struct dEvt_control_c {
/* 80042468 */ void reset();
};
struct dAttention_c {
static u8 dist_table[6552];
};
#include "f_op/f_op_msg_mng.h"
//
// Forward References:
@@ -65,7 +26,6 @@ extern "C" static void daTalk_Create__FP10fopAc_ac_c();
extern "C" static void daTalk_Delete__FP8daTalk_c();
extern "C" static void daTalk_Execute__FP8daTalk_c();
extern "C" static void daTalk_Draw__FP8daTalk_c();
extern "C" extern void* g_profile_TALK[12];
//
// External References:
@@ -91,139 +51,151 @@ extern "C" void __dl__FPv();
extern "C" void __copy();
extern "C" void _savegpr_29();
extern "C" void _restgpr_29();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" u8 dist_table__12dAttention_c[6552];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
//
// Declarations:
//
/* 80D66378-80D663E4 000078 006C+00 1/1 0/0 0/0 .text __dt__8daTalk_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm daTalk_c::~daTalk_c() {
nofralloc
#include "asm/rel/d/a/d_a_talk/d_a_talk/__dt__8daTalk_cFv.s"
daTalk_c::~daTalk_c() {
dMsgObject_getMsgObjectClass()->setProcessID(-1);
}
#pragma pop
/* 80D663E4-80D664AC 0000E4 00C8+00 1/1 0/0 0/0 .text create__8daTalk_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daTalk_c::create() {
nofralloc
#include "asm/rel/d/a/d_a_talk/d_a_talk/create__8daTalk_cFv.s"
int daTalk_c::create() {
if (!fopAcM_CheckCondition(this, 8)) {
new (this) daTalk_c();
fopAcM_OnCondition(this, 8);
}
if (getStatus() != 1) {
return cPhs_ERROR_e;
}
mAttentionInfo = dMsgObject_getMsgObjectClass()->getpTalkActor()->mAttentionInfo;
mMessageID = -1;
return cPhs_COMPLEATE_e;
}
#pragma pop
/* 80D664AC-80D6665C 0001AC 01B0+00 1/1 0/0 0/0 .text execute__8daTalk_cFv */
// g_dComIfG_gameInfo.play.mEvent being reloaded when it shouldnt be
#ifdef NONMATCHING
int daTalk_c::execute() {
if (i_dComIfGp_event_runCheck()) {
if (!mEvtInfo.checkCommandTalk()) {
fopAcM_delete(this);
}
} else {
if (fopAcM_searchPlayerDistanceXZ(this) >
dAttention_c::i_getDistTable(mAttentionInfo.field_0x0[1]).field_0x4)
{
mMessageID = -1;
fopAcM_delete(this);
} else {
mEvtInfo.i_onCondition(1);
}
}
if (mEvtInfo.checkCommandTalk()) {
if (dMsgObject_getMsgObjectClass()->getNodeIdx() == 0xFF) {
if (mMessageID == -1) {
mMessageID = messageSet();
} else if (getStatus() == 14) {
setStatus(16);
} else if (getStatus() == 18) {
i_dComIfGp_event_reset();
setStatus(19);
mMessageID = -1;
fopAcM_delete(this);
}
} else if (mMessageID == -1) {
mMsgFlow.init(this, dMsgObject_getMsgObjectClass()->getNodeIdx(), 0, NULL);
mMessageID = 2;
} else if (mMsgFlow.doFlow(dMsgObject_getMsgObjectClass()->getpTalkActor(), NULL, 0)) {
i_dComIfGp_event_reset();
mMessageID = -1;
fopAcM_delete(this);
}
}
return 1;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daTalk_c::execute() {
asm int daTalk_c::execute() {
nofralloc
#include "asm/rel/d/a/d_a_talk/d_a_talk/execute__8daTalk_cFv.s"
}
#pragma pop
#endif
/* 80D6665C-80D66664 00035C 0008+00 1/1 0/0 0/0 .text draw__8daTalk_cFv */
bool daTalk_c::draw() {
return true;
int daTalk_c::draw() {
return 1;
}
/* 80D66664-80D66688 000364 0024+00 1/1 0/0 0/0 .text setStatus__8daTalk_cFUs */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daTalk_c::setStatus(u16 param_0) {
nofralloc
#include "asm/rel/d/a/d_a_talk/d_a_talk/setStatus__8daTalk_cFUs.s"
void daTalk_c::setStatus(u16 i_status) {
dMsgObject_getMsgObjectClass()->setStatus(i_status);
}
#pragma pop
/* 80D66688-80D666A8 000388 0020+00 2/2 0/0 0/0 .text getStatus__8daTalk_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daTalk_c::getStatus() {
nofralloc
#include "asm/rel/d/a/d_a_talk/d_a_talk/getStatus__8daTalk_cFv.s"
u16 daTalk_c::getStatus() {
return dMsgObject_getMsgObjectClass()->getStatus();
}
#pragma pop
/* 80D666A8-80D666E4 0003A8 003C+00 1/1 0/0 0/0 .text messageSet__8daTalk_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daTalk_c::messageSet() {
nofralloc
#include "asm/rel/d/a/d_a_talk/d_a_talk/messageSet__8daTalk_cFv.s"
u32 daTalk_c::messageSet() {
return fopMsgM_messageSet(dMsgObject_getMsgObjectClass()->getIdx(),
dMsgObject_getMsgObjectClass()->getpTalkActor(), 1000);
}
#pragma pop
/* 80D666E4-80D66704 0003E4 0020+00 1/0 0/0 0/0 .text daTalk_Create__FP10fopAc_ac_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daTalk_Create(fopAc_ac_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Create__FP10fopAc_ac_c.s"
static int daTalk_Create(fopAc_ac_c* i_this) {
return static_cast<daTalk_c*>(i_this)->create();
}
#pragma pop
/* 80D66704-80D6672C 000404 0028+00 1/0 0/0 0/0 .text daTalk_Delete__FP8daTalk_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daTalk_Delete(daTalk_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Delete__FP8daTalk_c.s"
static int daTalk_Delete(daTalk_c* i_this) {
i_this->~daTalk_c();
return 1;
}
#pragma pop
/* 80D6672C-80D6674C 00042C 0020+00 1/0 0/0 0/0 .text daTalk_Execute__FP8daTalk_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daTalk_Execute(daTalk_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Execute__FP8daTalk_c.s"
static int daTalk_Execute(daTalk_c* i_this) {
return i_this->execute();
}
#pragma pop
/* 80D6674C-80D6676C 00044C 0020+00 1/0 0/0 0/0 .text daTalk_Draw__FP8daTalk_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daTalk_Draw(daTalk_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_talk/d_a_talk/daTalk_Draw__FP8daTalk_c.s"
static int daTalk_Draw(daTalk_c* i_this) {
return i_this->draw();
}
#pragma pop
/* ############################################################################################## */
/* 80D66774-80D66794 -00001 0020+00 1/0 0/0 0/0 .data l_daTalk_Method */
SECTION_DATA static void* l_daTalk_Method[8] = {
(void*)daTalk_Create__FP10fopAc_ac_c,
(void*)daTalk_Delete__FP8daTalk_c,
(void*)daTalk_Execute__FP8daTalk_c,
(void*)NULL,
(void*)daTalk_Draw__FP8daTalk_c,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daTalk_Method = {
(process_method_func)daTalk_Create, (process_method_func)daTalk_Delete,
(process_method_func)daTalk_Execute, (process_method_func)NULL,
(process_method_func)daTalk_Draw,
};
/* 80D66794-80D667C4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TALK */
SECTION_DATA extern void* g_profile_TALK[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x02BD0000, (void*)&g_fpcLf_Method,
(void*)0x000005B8, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x02FE0000, (void*)&l_daTalk_Method,
(void*)0x00044000, (void*)0x00060000,
extern actor_process_profile_definition g_profile_TALK = {
-3,
7,
-3,
PROC_TALK,
&g_fpcLf_Method.mBase,
sizeof(daTalk_c),
0,
0,
&g_fopAc_Method.base,
766,
&l_daTalk_Method,
0x44000,
0,
6,
};
+1 -1
View File
@@ -2218,7 +2218,7 @@ int daE_YM_c::create() {
mpPath = dPath_GetRoomPath(tmp0, fopAcM_GetRoomNo(this));
if (mpPath != NULL) {
mAttentionInfo.field_0x4[3] = 31;
mAttentionInfo.field_0x0[7] = 31;
field_0x6a6 = 4;
field_0x670 = current.pos;
setActionMode(ACT_WAIT);
+1 -1
View File
@@ -43,7 +43,7 @@ static int daKytag05_Create(fopAc_ac_c* i_this) {
tag->field_0x568 = 100.0f * tag->mScale.x;
if (!tag->field_0x56c) {
tag->mAttentionInfo.field_0x4[3] = 0x21;
tag->mAttentionInfo.field_0x0[7] = 0x21;
tag->mAttentionInfo.setFlag(0x80);
}
return 4;
@@ -30,7 +30,7 @@ int daObjDigholl_c::create() {
fopAcM_SetMax(this, 60.0f, 10.0f, 100.0f);
mAttentionInfo.mPosition = current.pos;
mEyePos = mAttentionInfo.mPosition;
mAttentionInfo.field_0x4[3] = 0x20;
mAttentionInfo.field_0x0[7] = 0x20;
return cPhs_COMPLEATE_e;
}
+1 -1
View File
@@ -761,7 +761,7 @@ int daObjStone_c::Create() {
fopAcM_setCullSizeSphere(this,0.0f,0.0f,0.0f,l_r[mStoneType]*1.2f);
cLib_onBit(mAttentionInfo.mFlags,16);
mAttentionInfo.field_0x4[0] = 0x2A;
mAttentionInfo.field_0x0[4] = 0x2A;
fopAcM_OnCarryType(this,fopAcM_CARRY_LIGHT);
cXyz other_pos = current.pos;
+1 -1
View File
@@ -31,7 +31,7 @@ int daTag_Howl_c::execute() {
this->mAttentionInfo.mFlags = 0;
if (isAreaCheck() != NULL) {
this->mAttentionInfo.mFlags |= 0x80;
this->mAttentionInfo.field_0x4[3] = 0x41;
this->mAttentionInfo.field_0x0[7] = 0x41;
}
return 1;
}
@@ -42,7 +42,7 @@ int daTagWrHowl_c::execute() {
if (chkWlfInTag()) {
mAttentionInfo.mFlags |= 0x80;
mAttentionInfo.field_0x4[3] = 65;
mAttentionInfo.field_0x0[7] = 65;
}
return 1;
@@ -76,7 +76,7 @@ int daTagWljump_c::create() {
}
mAttentionInfo.field_0x0[0] = 0x32;
mAttentionInfo.field_0x4[3] = 0x32;
mAttentionInfo.field_0x0[7] = 0x32;
shape_angle.z = 0;
field_0x568 = -1;
field_0x56c[0] = (fopAcM_GetParam(this) >> 16) & 0xf;
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -717,7 +717,7 @@ asm void dMenu_Insect_c::screenSetDoIcon() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Insect_c::getGetInsectNum() {
asm u8 dMenu_Insect_c::getGetInsectNum() {
nofralloc
#include "asm/d/menu/d_menu_insect/getGetInsectNum__14dMenu_Insect_cFv.s"
}
+3 -3
View File
@@ -1704,7 +1704,7 @@ asm fopAc_ac_c* dMsgObject_c::getActor() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgObject_c::getpTalkActor() {
asm fopAc_ac_c* dMsgObject_c::getpTalkActor() {
nofralloc
#include "asm/d/msg/d_msg_object/getpTalkActor__12dMsgObject_cFv.s"
}
@@ -1714,7 +1714,7 @@ asm void dMsgObject_c::getpTalkActor() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgObject_c::getIdx() {
asm u32 dMsgObject_c::getIdx() {
nofralloc
#include "asm/d/msg/d_msg_object/getIdx__12dMsgObject_cFv.s"
}
@@ -1724,7 +1724,7 @@ asm void dMsgObject_c::getIdx() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgObject_c::getNodeIdx() {
asm u16 dMsgObject_c::getNodeIdx() {
nofralloc
#include "asm/d/msg/d_msg_object/getNodeIdx__12dMsgObject_cFv.s"
}
+5 -5
View File
@@ -170,11 +170,11 @@ static int fopAc_Create(void* i_this) {
_this->mAttentionInfo.field_0x0[1] = 2;
_this->mAttentionInfo.field_0x0[2] = 3;
_this->mAttentionInfo.field_0x0[3] = 5;
_this->mAttentionInfo.field_0x4[0] = 6;
_this->mAttentionInfo.field_0x4[3] = 14;
_this->mAttentionInfo.field_0x4[1] = 15;
_this->mAttentionInfo.field_0x4[2] = 15;
_this->mAttentionInfo.field_0x8[0] = 51;
_this->mAttentionInfo.field_0x0[4] = 6;
_this->mAttentionInfo.field_0x0[7] = 14;
_this->mAttentionInfo.field_0x0[5] = 15;
_this->mAttentionInfo.field_0x0[6] = 15;
_this->mAttentionInfo.field_0x0[8] = 51;
_this->mAttentionInfo.mPosition = _this->orig.pos;
_this->mAttentionInfo.field_0xa = 30;
dKy_tevstr_init(&_this->mTevStr, _this->orig.roomNo, -1);
+1
View File
@@ -9,3 +9,4 @@ python-Levenshtein
cxxfilt
pyelftools
requests
GitPython
+181
View File
@@ -37,12 +37,15 @@ try:
import libdol
import libarc
import requests
import glob
import git
from rich.logging import RichHandler
from rich.console import Console
from rich.progress import Progress
from rich.text import Text
from rich.table import Table
from typing import Optional
except ImportError as ex:
_handle_import_error(ex)
@@ -1196,6 +1199,184 @@ def check_sha1(game_path: Path, build_path: Path, include_rels: bool):
return True
def copy_progress_script() -> None:
file_path = './tools/tp.py'
destination_path = './tools/tp_copy.py'
if not os.path.exists(destination_path):
shutil.copyfile(file_path, destination_path)
def make_progress_dir() -> None:
progress_dir = './progress'
if not os.path.exists(progress_dir):
os.mkdir(progress_dir)
def generate_progress(commit: str, wibo_path: Optional[str] = None) -> None:
git_show_output = subprocess.check_output(['git', 'show', '-s', '--format=%ct', commit]).decode('ascii').strip()
commit_timestamp = git_show_output
commit_string = f'progress/{commit_timestamp}_{commit}.json'
if os.path.exists(commit_string):
LOG.info(f"File {commit_string} already exists, skipping.")
return
process = subprocess.Popen(["make", "clean_all"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = process.communicate()
if process.returncode != 0:
LOG.error(f"Error during make clean_all: {stderr.decode()}")
return
LOG.debug(f"stdout: {stdout.decode()}")
make_command = ["make", "all", "rels", f"-j{os.cpu_count()}"]
if wibo_path:
make_command.append(f"WINE={wibo_path}")
process = subprocess.Popen(make_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = process.communicate()
if process.returncode != 0:
LOG.error(f"Error during make all rels: {stderr.decode()}")
return
LOG.debug(f"stdout: {stdout.decode()}")
command = ["python", "./tools/tp_copy.py", "progress", "-f", "JSON"]
with open(commit_string, 'w') as outfile:
process = subprocess.Popen(command, stdout=outfile, stderr=subprocess.PIPE)
stdout, stderr = process.communicate()
if process.returncode != 0:
LOG.error(f"Error: {stderr.decode()}")
LOG.debug(f"stdout: {stdout.decode()}")
def checkout_and_run(repo_path: str, start_commit_hash: str, wibo_path: Optional[str] = None) -> None:
repo = git.Repo(repo_path)
head_commit = repo.head.commit
copy_progress_script()
make_progress_dir()
try:
commits = list(repo.iter_commits(f'{start_commit_hash}..{head_commit.hexsha}'))
commits.append(repo.commit(start_commit_hash))
for commit in commits[::-1]:
LOG.info(f"Checking out commit {commit.hexsha}")
repo.git.checkout(commit.hexsha)
generate_progress(commit.hexsha, wibo_path)
except Exception as e:
LOG.error(f"Error occurred: {e}")
finally:
LOG.debug(f"Checking out origin head commit: {head_commit.hexsha}")
repo.git.checkout(head_commit.hexsha)
@tp.command(name="progress-history")
@click.option("--debug/--no-debug", default=False)
@click.option("--repo-path", default=".", required=False, help="Path to your git repository. Defaults to current directory.")
@click.option("--start-commit", default="bc428f7f65b97cc9035aed1dc1b71c54ff2e6c3d", required=False, help="Start commit hash. If none supplied, will start at the commit where Julgodis added the progress script.")
@click.option("--wibo-path", default=None, required=False, help="Path to wibo build. If none supplied, the default Wine will be used.")
def progress_history(debug, repo_path, start_commit, wibo_path):
if debug:
LOG.setLevel(logging.DEBUG)
LOG.warning(f"This command will generate the progress for every commit since {start_commit}. This could take many hours to complete. Are you sure you want to do this? (y/n)")
confirmation = input().lower()
if confirmation == 'y':
checkout_and_run(repo_path, start_commit, wibo_path)
else:
sys.exit(0)
def get_git_commit_timestamp() -> int:
return int(subprocess.check_output(['git', 'show', '-s', '--format=%ct']).decode('ascii').rstrip())
def get_git_commit_sha() -> str:
return subprocess.check_output(['git', 'rev-parse', 'HEAD']).decode('ascii').strip()
def generate_url(base_url: str, project: str, version: str) -> str:
url_components = [base_url.rstrip('/'), 'data']
for arg in [project, version.replace('.', '-')]:
if arg != "":
url_components.append(arg)
return str.join('/', url_components) + '/'
@tp.command(name="upload-progress")
@click.option("--debug/--no-debug")
@click.option('-b', '--base_url', required=True, help='API base URL')
@click.option('-a', '--api_key', required=False, default=os.environ.get('PROGRESS_API_KEY'), help='API key (env var PROGRESS_API_KEY)')
@click.option('-p', '--project', required=True, help='Project slug')
@click.option('-v', '--version', required=True, help='Version slug')
@click.argument('input', type=click.Path(exists=True))
def upload_progress(debug: bool, base_url: str, api_key: str, project: str, version: str, input: str) -> None:
if debug:
LOG.setLevel(logging.DEBUG)
if not api_key:
raise click.UsageError("API key required")
url = generate_url(base_url, project, version)
entries = []
# Check if input is a directory
if os.path.isdir(input):
LOG.debug(f'Loading all JSON files in directory {input}')
# Read all JSON files in the directory
json_files = glob.glob(os.path.join(input, "*.json"))
for json_file in json_files:
# Extract timestamp and commit SHA from filename
filename = Path(json_file).stem
parts = filename.split('_')
if len(parts) != 2 or not parts[0].isdigit() or len(parts[1]) != 40:
LOG.error(f"Filename '{filename}' is not in the correct format. When supplying an entire directory with JSON files in it, the filenames need to be in the format: '<unix_timestamp>_<git_sha>.json' in order for Frogress to properly understand the data.")
sys.exit(1)
timestamp, git_hash = parts
with open(json_file, "r") as f:
data = json.load(f)
entries.append({
"timestamp": int(timestamp),
"git_hash": git_hash,
"categories": {
"default": data,
},
})
else:
# Process a single JSON file
with open(input, "r") as f:
LOG.debug(f'Loading single JSON file {f.name}')
data = json.load(f)
entries.append({
"timestamp": get_git_commit_timestamp(),
"git_hash": get_git_commit_sha(),
"categories": {
"default": data,
},
})
for entry in entries:
LOG.info(f"Publishing entry to {url}")
LOG.debug(f"Entry: {entry}")
data = {
"api_key": api_key,
"entries": [entry], # only send current entry
}
try:
r = requests.post(url, json=data)
r.raise_for_status()
except requests.exceptions.HTTPError as err:
LOG.error(f"HTTP request failed: {err}")
exit(1)
if __name__ == "__main__":
tp()
-62
View File
@@ -1,62 +0,0 @@
#!/usr/bin/env python3
import argparse
import json
import os
import subprocess
from pprint import pprint
import requests
def get_git_commit_timestamp() -> int:
return int(subprocess.check_output(['git', 'show', '-s', '--format=%ct']).decode('ascii').rstrip())
def get_git_commit_sha() -> str:
return subprocess.check_output(['git', 'rev-parse', 'HEAD']).decode('ascii').strip()
def generate_url(args: argparse.Namespace) -> str:
url_components = [args.base_url.rstrip('/'), 'data']
for arg in [args.project, args.version.replace('.', '-')]:
if arg != "":
url_components.append(arg)
return str.join('/', url_components) + '/'
if __name__ == '__main__':
parser = argparse.ArgumentParser(description="Upload progress information.")
parser.add_argument("-b", "--base_url", help="API base URL", required=True)
parser.add_argument("-a", "--api_key", help="API key (env var PROGRESS_API_KEY)")
parser.add_argument("-p", "--project", help="Project slug", required=True)
parser.add_argument("-v", "--version", help="Version slug", required=True)
parser.add_argument("input", help="Progress JSON input")
args = parser.parse_args()
api_key = args.api_key or os.environ.get("PROGRESS_API_KEY")
if not api_key:
raise "API key required"
url = generate_url(args)
entries = []
with open(args.input, "r") as f:
data = json.load(f)
entries.append({
"timestamp": get_git_commit_timestamp(),
"git_hash": get_git_commit_sha(),
"categories": {
"default": data,
},
})
print("Publishing entries to", url)
pprint(entries)
data = {
"api_key": api_key,
"entries": entries,
}
r = requests.post(url, json=data)
r.raise_for_status()
print("Done!")