diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml new file mode 100644 index 00000000000..f1c45f0a377 --- /dev/null +++ b/.github/workflows/cd.yml @@ -0,0 +1,38 @@ +name: CD + +on: + push: + branches: + - master + +env: + WORKFLOW: "ci.yml" + +jobs: + download: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Get latest workflow run ID + id: get_run_id + run: | + RUN_ID=$(curl --request GET \ + --url https://api.github.com/repos/${{ github.repository }}/actions/workflows/${{ env.WORKFLOW }}/runs \ + --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \ + --header 'content-type: application/json' | jq '.workflow_runs[0].id') + echo "run_id=$RUN_ID" >> $GITHUB_OUTPUT + - name: Download artifact + uses: dawidd6/action-download-artifact@v2.27.0 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + 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: ./tp upload-progress progress-${{ steps.get_run_id.outputs.run_id }}.json -b https://progress.deco.mp/ -p twilightprincess -v gcn_usa \ No newline at end of file diff --git a/.github/workflows/ok-check.yml b/.github/workflows/ci.yml similarity index 56% rename from .github/workflows/ok-check.yml rename to .github/workflows/ci.yml index f2c34464762..09ae82e4935 100644 --- a/.github/workflows/ok-check.yml +++ b/.github/workflows/ci.yml @@ -1,20 +1,27 @@ -name: OK Check +name: CI -on: pull_request +on: + pull_request: + branches: + - master jobs: build: - runs-on: ubuntu-latest container: image: ghcr.io/pheenoh/zeldaret-tp:latest - steps: - name: Checkout - uses: actions/checkout@v1 - with: - token: ${{secrets.MY_REPO_PAT}} + uses: actions/checkout@v3 - name: Copy in dol and compilers run: cp /tmp/baserom.dol ./baserom.dol && cp -r /tmp/mwcc_compiler/ tools/mwcc_compiler && cp tools/mwcc_compiler/2.7/mwcceppc.exe tools/mwcc_compiler/2.7/mwcceppc_modded.exe && chown root /github/home/ - name: Run Make (OK) run: make all rels && ./tp check --rels + - name: Create JSON for Progress + run: ./tp progress -f JSON > progress-${{ github.run_id }}.json + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: artifact-${{ github.run_id }} + path: ./progress-${{ github.run_id }}.json + \ No newline at end of file diff --git a/Progress.md b/Progress.md index bad404fea82..0d034c14263 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 26.824641% | 964760 | 3596544 +.text | 27.931926% | 1004584 | 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 | 34.538903% | 1388696 | 4020672 +Total | 35.529384% | 1428520 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 34.538903% | 1388696 | 4020672 -RELs | 33.578532% | 3861640 | 11500324 -Total | 33.827314% | 5250336 | 15520996 +main.dol | 35.529384% | 1428520 | 4020672 +RELs | 33.657973% | 3870776 | 11500324 +Total | 34.142757% | 5299296 | 15520996 ## RELs @@ -220,7 +220,7 @@ d_a_myna | 30.876570% | 9736 | 31532 d_a_nbomb | 28.739233% | 8808 | 30648 d_a_ni | 27.299309% | 8216 | 30096 d_a_npc_aru | 34.812103% | 12932 | 37148 -d_a_npc_ash | 31.737680% | 9892 | 31168 +d_a_npc_ash | 42.736140% | 13320 | 31168 d_a_npc_ashB | 32.906995% | 8336 | 25332 d_a_npc_bans | 34.954955% | 11640 | 33300 d_a_npc_besu | 38.726854% | 19492 | 50332 @@ -389,7 +389,7 @@ d_a_obj_crystal | 44.482173% | 1048 | 2356 d_a_obj_cwall | 30.455195% | 5968 | 19596 d_a_obj_damCps | 100.000000% | 504 | 504 d_a_obj_dan | 35.198921% | 4176 | 11864 -d_a_obj_digholl | 42.781690% | 972 | 2272 +d_a_obj_digholl | 100.000000% | 2272 | 2272 d_a_obj_digplace | 35.129068% | 1252 | 3564 d_a_obj_digsnow | 44.813278% | 2160 | 4820 d_a_obj_dmelevator | 35.600390% | 4376 | 12292 @@ -465,7 +465,7 @@ d_a_obj_kgate | 35.192216% | 5932 | 16856 d_a_obj_ki | 41.573034% | 2220 | 5340 d_a_obj_kiPot | 53.782895% | 1308 | 2432 d_a_obj_kita | 40.112090% | 2004 | 4996 -d_a_obj_kjgjs | 52.250804% | 1300 | 2488 +d_a_obj_kjgjs | 100.000000% | 2488 | 2488 d_a_obj_kkanban | 47.103514% | 1984 | 4212 d_a_obj_klift00 | 37.650457% | 3128 | 8308 d_a_obj_knBullet | 43.076923% | 1568 | 3640 @@ -707,7 +707,7 @@ d_a_tag_CstaSw | 100.000000% | 2560 | 2560 d_a_tag_Lv6Gate | 39.281576% | 2712 | 6904 d_a_tag_Lv7Gate | 34.752224% | 2188 | 6296 d_a_tag_Lv8Gate | 43.347193% | 1668 | 3848 -d_a_tag_TWgate | 53.384834% | 10504 | 19676 +d_a_tag_TWgate | 55.682049% | 10956 | 19676 d_a_tag_ajnot | 100.000000% | 1232 | 1232 d_a_tag_allmato | 30.234070% | 3720 | 12304 d_a_tag_arena | 100.000000% | 712 | 712 @@ -722,7 +722,7 @@ d_a_tag_csw | 35.869565% | 3696 | 10304 d_a_tag_escape | 100.000000% | 712 | 712 d_a_tag_event | 31.075697% | 1248 | 4016 d_a_tag_evt | 37.815126% | 1620 | 4284 -d_a_tag_evtarea | 37.091319% | 1316 | 3548 +d_a_tag_evtarea | 100.000000% | 3548 | 3548 d_a_tag_evtmsg | 39.491150% | 1428 | 3616 d_a_tag_firewall | 35.325132% | 1608 | 4552 d_a_tag_gra | 100.000000% | 800 | 800 @@ -773,7 +773,7 @@ d_a_tag_theB_hint | 100.000000% | 1136 | 1136 d_a_tag_wara_howl | 100.000000% | 1420 | 1420 d_a_tag_watchge | 100.000000% | 1240 | 1240 d_a_tag_waterfall | 46.361502% | 1580 | 3408 -d_a_tag_wljump | 30.777538% | 1140 | 3704 +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_tbox | 30.165503% | 9332 | 30936 @@ -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.578532% | 3861640 | 11500324 +Total | 33.657973% | 3870776 | 11500324 diff --git a/asm/JSystem/JAudio2/JASAudioThread/DMACallback__14JASAudioThreadFv.s b/asm/JSystem/JAudio2/JASAudioThread/DMACallback__14JASAudioThreadFv.s deleted file mode 100644 index 877675f557f..00000000000 --- a/asm/JSystem/JAudio2/JASAudioThread/DMACallback__14JASAudioThreadFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8029CF68: -/* 8029CF68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8029CF6C 7C 08 02 A6 */ mflr r0 -/* 8029CF70 90 01 00 14 */ stw r0, 0x14(r1) -/* 8029CF74 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8029CF78 83 ED 86 0C */ lwz r31, __OSReport_disable-0xC(r13) -/* 8029CF7C 38 60 00 04 */ li r3, 4 -/* 8029CF80 4B FF 3F A5 */ bl stop__8JASProbeFl -/* 8029CF84 38 60 00 04 */ li r3, 4 -/* 8029CF88 3C 80 80 3A */ lis r4, JASAudioThread__stringBase0@ha /* 0x8039B338@ha */ -/* 8029CF8C 38 84 B3 38 */ addi r4, r4, JASAudioThread__stringBase0@l /* 0x8039B338@l */ -/* 8029CF90 38 84 00 08 */ addi r4, r4, 8 -/* 8029CF94 4B FF 3F 51 */ bl start__8JASProbeFlPCc -/* 8029CF98 38 7F 00 30 */ addi r3, r31, 0x30 -/* 8029CF9C 38 80 00 00 */ li r4, 0 -/* 8029CFA0 38 A0 00 00 */ li r5, 0 -/* 8029CFA4 48 0A 1A 51 */ bl OSSendMessage -/* 8029CFA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8029CFAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8029CFB0 7C 08 03 A6 */ mtlr r0 -/* 8029CFB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029CFB8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASAudioThread/DSPCallback__14JASAudioThreadFPv.s b/asm/JSystem/JAudio2/JASAudioThread/DSPCallback__14JASAudioThreadFPv.s deleted file mode 100644 index 5c7d4588962..00000000000 --- a/asm/JSystem/JAudio2/JASAudioThread/DSPCallback__14JASAudioThreadFPv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8029CFBC: -/* 8029CFBC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8029CFC0 7C 08 02 A6 */ mflr r0 -/* 8029CFC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8029CFC8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8029CFCC 83 ED 86 0C */ lwz r31, __OSReport_disable-0xC(r13) -lbl_8029CFD0: -/* 8029CFD0 48 0B 54 71 */ bl DSPCheckMailFromDSP -/* 8029CFD4 28 03 00 00 */ cmplwi r3, 0 -/* 8029CFD8 41 82 FF F8 */ beq lbl_8029CFD0 -/* 8029CFDC 48 0B 54 75 */ bl DSPReadMailFromDSP -/* 8029CFE0 54 60 84 3E */ srwi r0, r3, 0x10 -/* 8029CFE4 28 00 F3 55 */ cmplwi r0, 0xf355 -/* 8029CFE8 40 82 00 2C */ bne lbl_8029D014 -/* 8029CFEC 54 60 04 2E */ rlwinm r0, r3, 0, 0x10, 0x17 -/* 8029CFF0 28 00 FF 00 */ cmplwi r0, 0xff00 -/* 8029CFF4 40 82 00 18 */ bne lbl_8029D00C -/* 8029CFF8 38 7F 00 30 */ addi r3, r31, 0x30 -/* 8029CFFC 38 80 00 01 */ li r4, 1 -/* 8029D000 38 A0 00 00 */ li r5, 0 -/* 8029D004 48 0A 19 F1 */ bl OSSendMessage -/* 8029D008 48 00 00 0C */ b lbl_8029D014 -lbl_8029D00C: -/* 8029D00C 54 63 04 3E */ clrlwi r3, r3, 0x10 -/* 8029D010 48 00 09 B5 */ bl finishWork__6JASDspFUs -lbl_8029D014: -/* 8029D014 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8029D018 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8029D01C 7C 08 03 A6 */ mtlr r0 -/* 8029D020 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029D024 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASAudioThread/__ct__14JASAudioThreadFiiUl.s b/asm/JSystem/JAudio2/JASAudioThread/__ct__14JASAudioThreadFiiUl.s deleted file mode 100644 index 0e5da428f24..00000000000 --- a/asm/JSystem/JAudio2/JASAudioThread/__ct__14JASAudioThreadFiiUl.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8029CCDC: -/* 8029CCDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8029CCE0 7C 08 02 A6 */ mflr r0 -/* 8029CCE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8029CCE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8029CCEC 7C 7F 1B 78 */ mr r31, r3 -/* 8029CCF0 7C 87 23 78 */ mr r7, r4 -/* 8029CCF4 7C A0 2B 78 */ mr r0, r5 -/* 8029CCF8 80 8D 8C 90 */ lwz r4, JASDram(r13) -/* 8029CCFC 7C C5 33 78 */ mr r5, r6 -/* 8029CD00 7C 06 03 78 */ mr r6, r0 -/* 8029CD04 48 03 49 0D */ bl __ct__9JKRThreadFP7JKRHeapUlii -/* 8029CD08 34 7F 00 7C */ addic. r3, r31, 0x7c -/* 8029CD0C 41 82 00 08 */ beq lbl_8029CD14 -/* 8029CD10 38 63 FF 84 */ addi r3, r3, -124 -lbl_8029CD14: -/* 8029CD14 90 6D 86 0C */ stw r3, __OSReport_disable-0xC(r13) -/* 8029CD18 3C 60 80 3C */ lis r3, __vt__14JASAudioThread@ha /* 0x803C78E0@ha */ -/* 8029CD1C 38 03 78 E0 */ addi r0, r3, __vt__14JASAudioThread@l /* 0x803C78E0@l */ -/* 8029CD20 90 1F 00 00 */ stw r0, 0(r31) -/* 8029CD24 38 00 00 00 */ li r0, 0 -/* 8029CD28 98 1F 00 84 */ stb r0, 0x84(r31) -/* 8029CD2C 38 7F 00 7C */ addi r3, r31, 0x7c -/* 8029CD30 48 0A 3F 45 */ bl OSInitThreadQueue -/* 8029CD34 7F E3 FB 78 */ mr r3, r31 -/* 8029CD38 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8029CD3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8029CD40 7C 08 03 A6 */ mtlr r0 -/* 8029CD44 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029CD48 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASAudioThread/__dt__14JASAudioThreadFv.s b/asm/JSystem/JAudio2/JASAudioThread/__dt__14JASAudioThreadFv.s deleted file mode 100644 index c1373fd019f..00000000000 --- a/asm/JSystem/JAudio2/JASAudioThread/__dt__14JASAudioThreadFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8029D028: -/* 8029D028 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8029D02C 7C 08 02 A6 */ mflr r0 -/* 8029D030 90 01 00 14 */ stw r0, 0x14(r1) -/* 8029D034 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8029D038 93 C1 00 08 */ stw r30, 8(r1) -/* 8029D03C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8029D040 7C 9F 23 78 */ mr r31, r4 -/* 8029D044 41 82 00 54 */ beq lbl_8029D098 -/* 8029D048 3C 60 80 3C */ lis r3, __vt__14JASAudioThread@ha /* 0x803C78E0@ha */ -/* 8029D04C 38 03 78 E0 */ addi r0, r3, __vt__14JASAudioThread@l /* 0x803C78E0@l */ -/* 8029D050 90 1E 00 00 */ stw r0, 0(r30) -/* 8029D054 34 1E 00 7C */ addic. r0, r30, 0x7c -/* 8029D058 41 82 00 24 */ beq lbl_8029D07C -/* 8029D05C 34 7E 00 7C */ addic. r3, r30, 0x7c -/* 8029D060 41 82 00 08 */ beq lbl_8029D068 -/* 8029D064 38 63 FF 84 */ addi r3, r3, -124 -lbl_8029D068: -/* 8029D068 80 0D 86 0C */ lwz r0, __OSReport_disable-0xC(r13) -/* 8029D06C 7C 00 18 40 */ cmplw r0, r3 -/* 8029D070 40 82 00 0C */ bne lbl_8029D07C -/* 8029D074 38 00 00 00 */ li r0, 0 -/* 8029D078 90 0D 86 0C */ stw r0, __OSReport_disable-0xC(r13) -lbl_8029D07C: -/* 8029D07C 7F C3 F3 78 */ mr r3, r30 -/* 8029D080 38 80 00 00 */ li r4, 0 -/* 8029D084 48 03 46 D5 */ bl __dt__9JKRThreadFv -/* 8029D088 7F E0 07 35 */ extsh. r0, r31 -/* 8029D08C 40 81 00 0C */ ble lbl_8029D098 -/* 8029D090 7F C3 F3 78 */ mr r3, r30 -/* 8029D094 48 03 1C A9 */ bl __dl__FPv -lbl_8029D098: -/* 8029D098 7F C3 F3 78 */ mr r3, r30 -/* 8029D09C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8029D0A0 83 C1 00 08 */ lwz r30, 8(r1) -/* 8029D0A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8029D0A8 7C 08 03 A6 */ mtlr r0 -/* 8029D0AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029D0B0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASAudioThread/create__14JASAudioThreadFl.s b/asm/JSystem/JAudio2/JASAudioThread/create__14JASAudioThreadFl.s deleted file mode 100644 index ecae5c9772e..00000000000 --- a/asm/JSystem/JAudio2/JASAudioThread/create__14JASAudioThreadFl.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8029CD4C: -/* 8029CD4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8029CD50 7C 08 02 A6 */ mflr r0 -/* 8029CD54 90 01 00 14 */ stw r0, 0x14(r1) -/* 8029CD58 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8029CD5C 7C 7F 1B 78 */ mr r31, r3 -/* 8029CD60 38 60 00 88 */ li r3, 0x88 -/* 8029CD64 80 8D 8C 90 */ lwz r4, JASDram(r13) -/* 8029CD68 38 A0 00 00 */ li r5, 0 -/* 8029CD6C 48 03 1F 2D */ bl __nw__FUlP7JKRHeapi -/* 8029CD70 7C 64 1B 79 */ or. r4, r3, r3 -/* 8029CD74 41 82 00 18 */ beq lbl_8029CD8C -/* 8029CD78 7F E4 FB 78 */ mr r4, r31 -/* 8029CD7C 38 A0 00 10 */ li r5, 0x10 -/* 8029CD80 38 C0 14 00 */ li r6, 0x1400 -/* 8029CD84 4B FF FF 59 */ bl __ct__14JASAudioThreadFiiUl -/* 8029CD88 7C 64 1B 78 */ mr r4, r3 -lbl_8029CD8C: -/* 8029CD8C 80 0D 8D F0 */ lwz r0, sSystemHeap__7JKRHeap(r13) -/* 8029CD90 28 00 00 00 */ cmplwi r0, 0 -/* 8029CD94 41 82 00 08 */ beq lbl_8029CD9C -/* 8029CD98 48 00 00 08 */ b lbl_8029CDA0 -lbl_8029CD9C: -/* 8029CD9C 80 0D 8D F4 */ lwz r0, sCurrentHeap__7JKRHeap(r13) -lbl_8029CDA0: -/* 8029CDA0 90 04 00 74 */ stw r0, 0x74(r4) -/* 8029CDA4 80 64 00 2C */ lwz r3, 0x2c(r4) -/* 8029CDA8 48 0A 4A 0D */ bl OSResumeThread -/* 8029CDAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8029CDB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8029CDB4 7C 08 03 A6 */ mtlr r0 -/* 8029CDB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029CDBC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASAudioThread/stop__14JASAudioThreadFv.s b/asm/JSystem/JAudio2/JASAudioThread/stop__14JASAudioThreadFv.s deleted file mode 100644 index 3fd438cfb56..00000000000 --- a/asm/JSystem/JAudio2/JASAudioThread/stop__14JASAudioThreadFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8029CDC0: -/* 8029CDC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8029CDC4 7C 08 02 A6 */ mflr r0 -/* 8029CDC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8029CDCC 38 80 00 02 */ li r4, 2 -/* 8029CDD0 38 A0 00 01 */ li r5, 1 -/* 8029CDD4 38 63 00 30 */ addi r3, r3, 0x30 -/* 8029CDD8 48 0A 1D C1 */ bl OSJamMessage -/* 8029CDDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8029CDE0 7C 08 03 A6 */ mtlr r0 -/* 8029CDE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029CDE8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASSeqCtrl/__ct__10JASSeqCtrlFv.s b/asm/JSystem/JAudio2/JASSeqCtrl/__ct__10JASSeqCtrlFv.s deleted file mode 100644 index de71c596dcb..00000000000 --- a/asm/JSystem/JAudio2/JASSeqCtrl/__ct__10JASSeqCtrlFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_802938BC: -/* 802938BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802938C0 7C 08 02 A6 */ mflr r0 -/* 802938C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802938C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802938CC 7C 7F 1B 78 */ mr r31, r3 -/* 802938D0 48 00 28 39 */ bl init__12JASSeqReaderFv -/* 802938D4 38 0D 8C B8 */ la r0, sDefaultParser__10JASSeqCtrl(r13) /* 80451238-_SDA_BASE_ */ -/* 802938D8 90 1F 00 3C */ stw r0, 0x3c(r31) -/* 802938DC 38 00 00 00 */ li r0, 0 -/* 802938E0 90 1F 00 40 */ stw r0, 0x40(r31) -/* 802938E4 90 1F 00 44 */ stw r0, 0x44(r31) -/* 802938E8 90 1F 00 48 */ stw r0, 0x48(r31) -/* 802938EC B0 1F 00 4C */ sth r0, 0x4c(r31) -/* 802938F0 B0 1F 00 4E */ sth r0, 0x4e(r31) -/* 802938F4 98 1F 00 50 */ stb r0, 0x50(r31) -/* 802938F8 98 1F 00 51 */ stb r0, 0x51(r31) -/* 802938FC 90 1F 00 54 */ stw r0, 0x54(r31) -/* 80293900 90 1F 00 58 */ stw r0, 0x58(r31) -/* 80293904 7F E3 FB 78 */ mr r3, r31 -/* 80293908 48 00 28 01 */ bl init__12JASSeqReaderFv -/* 8029390C 7F E3 FB 78 */ mr r3, r31 -/* 80293910 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80293914 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80293918 7C 08 03 A6 */ mtlr r0 -/* 8029391C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80293920 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASSeqCtrl/__dt__12JASSeqParserFv.s b/asm/JSystem/JAudio2/JASSeqCtrl/__dt__12JASSeqParserFv.s deleted file mode 100644 index 9c5ed30ed9e..00000000000 --- a/asm/JSystem/JAudio2/JASSeqCtrl/__dt__12JASSeqParserFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80293CAC: -/* 80293CAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80293CB0 7C 08 02 A6 */ mflr r0 -/* 80293CB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80293CB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80293CBC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80293CC0 41 82 00 1C */ beq lbl_80293CDC -/* 80293CC4 3C A0 80 3C */ lis r5, __vt__12JASSeqParser@ha /* 0x803C7650@ha */ -/* 80293CC8 38 05 76 50 */ addi r0, r5, __vt__12JASSeqParser@l /* 0x803C7650@l */ -/* 80293CCC 90 1F 00 00 */ stw r0, 0(r31) -/* 80293CD0 7C 80 07 35 */ extsh. r0, r4 -/* 80293CD4 40 81 00 08 */ ble lbl_80293CDC -/* 80293CD8 48 03 B0 65 */ bl __dl__FPv -lbl_80293CDC: -/* 80293CDC 7F E3 FB 78 */ mr r3, r31 -/* 80293CE0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80293CE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80293CE8 7C 08 03 A6 */ mtlr r0 -/* 80293CEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80293CF0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASSeqCtrl/__sinit_JASSeqCtrl_cpp.s b/asm/JSystem/JAudio2/JASSeqCtrl/__sinit_JASSeqCtrl_cpp.s deleted file mode 100644 index ad5b27dc410..00000000000 --- a/asm/JSystem/JAudio2/JASSeqCtrl/__sinit_JASSeqCtrl_cpp.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80293C6C: -/* 80293C6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80293C70 7C 08 02 A6 */ mflr r0 -/* 80293C74 90 01 00 14 */ stw r0, 0x14(r1) -/* 80293C78 3C 60 80 3C */ lis r3, __vt__12JASSeqParser@ha /* 0x803C7650@ha */ -/* 80293C7C 38 03 76 50 */ addi r0, r3, __vt__12JASSeqParser@l /* 0x803C7650@l */ -/* 80293C80 90 0D 8C B8 */ stw r0, sDefaultParser__10JASSeqCtrl(r13) -/* 80293C84 38 6D 8C B8 */ la r3, sDefaultParser__10JASSeqCtrl(r13) /* 80451238-_SDA_BASE_ */ -/* 80293C88 3C 80 80 29 */ lis r4, __dt__12JASSeqParserFv@ha /* 0x80293CAC@ha */ -/* 80293C8C 38 84 3C AC */ addi r4, r4, __dt__12JASSeqParserFv@l /* 0x80293CAC@l */ -/* 80293C90 3C A0 80 43 */ lis r5, lit_433@ha /* 0x80431B18@ha */ -/* 80293C94 38 A5 1B 18 */ addi r5, r5, lit_433@l /* 0x80431B18@l */ -/* 80293C98 48 0C DF 8D */ bl __register_global_object -/* 80293C9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80293CA0 7C 08 03 A6 */ mtlr r0 -/* 80293CA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80293CA8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASSeqCtrl/checkIntr__10JASSeqCtrlFv.s b/asm/JSystem/JAudio2/JASSeqCtrl/checkIntr__10JASSeqCtrlFv.s deleted file mode 100644 index cf35f6977fe..00000000000 --- a/asm/JSystem/JAudio2/JASSeqCtrl/checkIntr__10JASSeqCtrlFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80293B78: -/* 80293B78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80293B7C 7C 08 02 A6 */ mflr r0 -/* 80293B80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80293B84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80293B88 7C 7F 1B 78 */ mr r31, r3 -/* 80293B8C 80 03 00 44 */ lwz r0, 0x44(r3) -/* 80293B90 28 00 00 00 */ cmplwi r0, 0 -/* 80293B94 40 82 00 40 */ bne lbl_80293BD4 -/* 80293B98 4B FF FF 91 */ bl findIntr__10JASSeqCtrlFv -/* 80293B9C 2C 03 00 00 */ cmpwi r3, 0 -/* 80293BA0 41 80 00 34 */ blt lbl_80293BD4 -/* 80293BA4 80 9F 00 48 */ lwz r4, 0x48(r31) -/* 80293BA8 1C 03 00 03 */ mulli r0, r3, 3 -/* 80293BAC 7C 84 02 14 */ add r4, r4, r0 -/* 80293BB0 80 7F 00 00 */ lwz r3, 0(r31) -/* 80293BB4 38 04 FF FF */ addi r0, r4, -1 -/* 80293BB8 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80293BBC 54 03 02 3E */ clrlwi r3, r0, 8 -/* 80293BC0 80 1F 00 04 */ lwz r0, 4(r31) -/* 80293BC4 90 1F 00 44 */ stw r0, 0x44(r31) -/* 80293BC8 80 1F 00 00 */ lwz r0, 0(r31) -/* 80293BCC 7C 00 1A 14 */ add r0, r0, r3 -/* 80293BD0 90 1F 00 04 */ stw r0, 4(r31) -lbl_80293BD4: -/* 80293BD4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80293BD8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80293BDC 7C 08 03 A6 */ mtlr r0 -/* 80293BE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80293BE4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASSeqCtrl/clrIntrMask__10JASSeqCtrlFUl.s b/asm/JSystem/JAudio2/JASSeqCtrl/clrIntrMask__10JASSeqCtrlFUl.s deleted file mode 100644 index 38c89c7990a..00000000000 --- a/asm/JSystem/JAudio2/JASSeqCtrl/clrIntrMask__10JASSeqCtrlFUl.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80293AF0: -/* 80293AF0 A0 03 00 4E */ lhz r0, 0x4e(r3) -/* 80293AF4 7C 00 20 78 */ andc r0, r0, r4 -/* 80293AF8 B0 03 00 4E */ sth r0, 0x4e(r3) -/* 80293AFC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASSeqCtrl/findIntr__10JASSeqCtrlFv.s b/asm/JSystem/JAudio2/JASSeqCtrl/findIntr__10JASSeqCtrlFv.s deleted file mode 100644 index 69f4a104830..00000000000 --- a/asm/JSystem/JAudio2/JASSeqCtrl/findIntr__10JASSeqCtrlFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80293B28: -/* 80293B28 A0 83 00 4E */ lhz r4, 0x4e(r3) -/* 80293B2C A0 03 00 4C */ lhz r0, 0x4c(r3) -/* 80293B30 7C 84 00 38 */ and r4, r4, r0 -/* 80293B34 38 A0 00 00 */ li r5, 0 -/* 80293B38 48 00 00 30 */ b lbl_80293B68 -lbl_80293B3C: -/* 80293B3C 54 80 07 FF */ clrlwi. r0, r4, 0x1f -/* 80293B40 41 82 00 20 */ beq lbl_80293B60 -/* 80293B44 A0 83 00 4C */ lhz r4, 0x4c(r3) -/* 80293B48 38 00 00 01 */ li r0, 1 -/* 80293B4C 7C 00 28 30 */ slw r0, r0, r5 -/* 80293B50 7C 80 00 78 */ andc r0, r4, r0 -/* 80293B54 B0 03 00 4C */ sth r0, 0x4c(r3) -/* 80293B58 7C A3 2B 78 */ mr r3, r5 -/* 80293B5C 4E 80 00 20 */ blr -lbl_80293B60: -/* 80293B60 54 84 F8 7E */ srwi r4, r4, 1 -/* 80293B64 38 A5 00 01 */ addi r5, r5, 1 -lbl_80293B68: -/* 80293B68 28 04 00 00 */ cmplwi r4, 0 -/* 80293B6C 40 82 FF D0 */ bne lbl_80293B3C -/* 80293B70 38 60 FF FF */ li r3, -1 -/* 80293B74 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASSeqCtrl/init__10JASSeqCtrlFv.s b/asm/JSystem/JAudio2/JASSeqCtrl/init__10JASSeqCtrlFv.s deleted file mode 100644 index 47f5bdc912e..00000000000 --- a/asm/JSystem/JAudio2/JASSeqCtrl/init__10JASSeqCtrlFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80293924: -/* 80293924 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80293928 7C 08 02 A6 */ mflr r0 -/* 8029392C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80293930 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80293934 7C 7F 1B 78 */ mr r31, r3 -/* 80293938 48 00 27 D1 */ bl init__12JASSeqReaderFv -/* 8029393C 38 0D 8C B8 */ la r0, sDefaultParser__10JASSeqCtrl(r13) /* 80451238-_SDA_BASE_ */ -/* 80293940 90 1F 00 3C */ stw r0, 0x3c(r31) -/* 80293944 38 00 00 00 */ li r0, 0 -/* 80293948 90 1F 00 40 */ stw r0, 0x40(r31) -/* 8029394C 90 1F 00 44 */ stw r0, 0x44(r31) -/* 80293950 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80293954 B0 1F 00 4C */ sth r0, 0x4c(r31) -/* 80293958 B0 1F 00 4E */ sth r0, 0x4e(r31) -/* 8029395C 98 1F 00 50 */ stb r0, 0x50(r31) -/* 80293960 90 1F 00 54 */ stw r0, 0x54(r31) -/* 80293964 90 1F 00 58 */ stw r0, 0x58(r31) -/* 80293968 98 1F 00 51 */ stb r0, 0x51(r31) -/* 8029396C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80293970 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80293974 7C 08 03 A6 */ mtlr r0 -/* 80293978 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029397C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASSeqCtrl/interrupt__10JASSeqCtrlFQ210JASSeqCtrl8IntrType.s b/asm/JSystem/JAudio2/JASSeqCtrl/interrupt__10JASSeqCtrlFQ210JASSeqCtrl8IntrType.s deleted file mode 100644 index 5d37ba1c01f..00000000000 --- a/asm/JSystem/JAudio2/JASSeqCtrl/interrupt__10JASSeqCtrlFQ210JASSeqCtrl8IntrType.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80293ABC: -/* 80293ABC A0 A3 00 4E */ lhz r5, 0x4e(r3) -/* 80293AC0 38 00 00 01 */ li r0, 1 -/* 80293AC4 7C 04 20 30 */ slw r4, r0, r4 -/* 80293AC8 7C A0 20 39 */ and. r0, r5, r4 -/* 80293ACC 4D 82 00 20 */ beqlr -/* 80293AD0 A0 03 00 4C */ lhz r0, 0x4c(r3) -/* 80293AD4 7C 00 23 78 */ or r0, r0, r4 -/* 80293AD8 B0 03 00 4C */ sth r0, 0x4c(r3) -/* 80293ADC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASSeqCtrl/retIntr__10JASSeqCtrlFv.s b/asm/JSystem/JAudio2/JASSeqCtrl/retIntr__10JASSeqCtrlFv.s deleted file mode 100644 index a9aa74cc58e..00000000000 --- a/asm/JSystem/JAudio2/JASSeqCtrl/retIntr__10JASSeqCtrlFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80293B00: -/* 80293B00 80 03 00 44 */ lwz r0, 0x44(r3) -/* 80293B04 28 00 00 00 */ cmplwi r0, 0 -/* 80293B08 40 82 00 0C */ bne lbl_80293B14 -/* 80293B0C 38 60 00 00 */ li r3, 0 -/* 80293B10 4E 80 00 20 */ blr -lbl_80293B14: -/* 80293B14 90 03 00 04 */ stw r0, 4(r3) -/* 80293B18 38 00 00 00 */ li r0, 0 -/* 80293B1C 90 03 00 44 */ stw r0, 0x44(r3) -/* 80293B20 38 60 00 01 */ li r3, 1 -/* 80293B24 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASSeqCtrl/setIntrMask__10JASSeqCtrlFUl.s b/asm/JSystem/JAudio2/JASSeqCtrl/setIntrMask__10JASSeqCtrlFUl.s deleted file mode 100644 index 7983738ca39..00000000000 --- a/asm/JSystem/JAudio2/JASSeqCtrl/setIntrMask__10JASSeqCtrlFUl.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80293AE0: -/* 80293AE0 A0 03 00 4E */ lhz r0, 0x4e(r3) -/* 80293AE4 7C 00 23 78 */ or r0, r0, r4 -/* 80293AE8 B0 03 00 4E */ sth r0, 0x4e(r3) -/* 80293AEC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASSeqCtrl/start__10JASSeqCtrlFPvUl.s b/asm/JSystem/JAudio2/JASSeqCtrl/start__10JASSeqCtrlFPvUl.s deleted file mode 100644 index 6b3351e2db3..00000000000 --- a/asm/JSystem/JAudio2/JASSeqCtrl/start__10JASSeqCtrlFPvUl.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80293980: -/* 80293980 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80293984 7C 08 02 A6 */ mflr r0 -/* 80293988 90 01 00 14 */ stw r0, 0x14(r1) -/* 8029398C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80293990 93 C1 00 08 */ stw r30, 8(r1) -/* 80293994 7C 7E 1B 78 */ mr r30, r3 -/* 80293998 7C BF 2B 78 */ mr r31, r5 -/* 8029399C 48 00 27 AD */ bl init__12JASSeqReaderFPv -/* 802939A0 80 1E 00 00 */ lwz r0, 0(r30) -/* 802939A4 7C 00 FA 14 */ add r0, r0, r31 -/* 802939A8 90 1E 00 04 */ stw r0, 4(r30) -/* 802939AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802939B0 83 C1 00 08 */ lwz r30, 8(r1) -/* 802939B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802939B8 7C 08 03 A6 */ mtlr r0 -/* 802939BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802939C0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASSeqCtrl/tickProc__10JASSeqCtrlFP8JASTrack.s b/asm/JSystem/JAudio2/JASSeqCtrl/tickProc__10JASSeqCtrlFP8JASTrack.s deleted file mode 100644 index 712a376f88d..00000000000 --- a/asm/JSystem/JAudio2/JASSeqCtrl/tickProc__10JASSeqCtrlFP8JASTrack.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_802939C4: -/* 802939C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802939C8 7C 08 02 A6 */ mflr r0 -/* 802939CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802939D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802939D4 93 C1 00 08 */ stw r30, 8(r1) -/* 802939D8 7C 7E 1B 78 */ mr r30, r3 -/* 802939DC 7C 9F 23 78 */ mr r31, r4 -/* 802939E0 80 03 00 00 */ lwz r0, 0(r3) -/* 802939E4 28 00 00 00 */ cmplwi r0, 0 -/* 802939E8 40 82 00 0C */ bne lbl_802939F4 -/* 802939EC 38 60 00 00 */ li r3, 0 -/* 802939F0 48 00 00 B4 */ b lbl_80293AA4 -lbl_802939F4: -/* 802939F4 38 80 00 06 */ li r4, 6 -/* 802939F8 48 00 00 C5 */ bl interrupt__10JASSeqCtrlFQ210JASSeqCtrl8IntrType -/* 802939FC 7F C3 F3 78 */ mr r3, r30 -/* 80293A00 48 00 01 E9 */ bl timerProcess__10JASSeqCtrlFv -/* 80293A04 88 1E 00 51 */ lbz r0, 0x51(r30) -/* 80293A08 28 00 00 00 */ cmplwi r0, 0 -/* 80293A0C 41 82 00 28 */ beq lbl_80293A34 -/* 80293A10 7F E3 FB 78 */ mr r3, r31 -/* 80293A14 38 80 00 00 */ li r4, 0 -/* 80293A18 4B FF E8 09 */ bl checkNoteStop__8JASTrackCFUl -/* 80293A1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80293A20 40 82 00 0C */ bne lbl_80293A2C -/* 80293A24 38 60 00 00 */ li r3, 0 -/* 80293A28 48 00 00 7C */ b lbl_80293AA4 -lbl_80293A2C: -/* 80293A2C 38 00 00 00 */ li r0, 0 -/* 80293A30 98 1E 00 51 */ stb r0, 0x51(r30) -lbl_80293A34: -/* 80293A34 80 7E 00 40 */ lwz r3, 0x40(r30) -/* 80293A38 2C 03 00 00 */ cmpwi r3, 0 -/* 80293A3C 40 81 00 0C */ ble lbl_80293A48 -/* 80293A40 38 03 FF FF */ addi r0, r3, -1 -/* 80293A44 90 1E 00 40 */ stw r0, 0x40(r30) -lbl_80293A48: -/* 80293A48 7F C3 F3 78 */ mr r3, r30 -/* 80293A4C 48 00 01 2D */ bl checkIntr__10JASSeqCtrlFv -/* 80293A50 48 00 00 2C */ b lbl_80293A7C -lbl_80293A54: -/* 80293A54 80 7E 00 3C */ lwz r3, 0x3c(r30) -/* 80293A58 7F E4 FB 78 */ mr r4, r31 -/* 80293A5C 81 83 00 00 */ lwz r12, 0(r3) -/* 80293A60 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80293A64 7D 89 03 A6 */ mtctr r12 -/* 80293A68 4E 80 04 21 */ bctrl -/* 80293A6C 2C 03 00 00 */ cmpwi r3, 0 -/* 80293A70 40 80 00 0C */ bge lbl_80293A7C -/* 80293A74 38 60 FF FF */ li r3, -1 -/* 80293A78 48 00 00 2C */ b lbl_80293AA4 -lbl_80293A7C: -/* 80293A7C 80 1E 00 40 */ lwz r0, 0x40(r30) -/* 80293A80 2C 00 00 00 */ cmpwi r0, 0 -/* 80293A84 41 82 00 10 */ beq lbl_80293A94 -/* 80293A88 80 1E 00 44 */ lwz r0, 0x44(r30) -/* 80293A8C 28 00 00 00 */ cmplwi r0, 0 -/* 80293A90 41 82 00 10 */ beq lbl_80293AA0 -lbl_80293A94: -/* 80293A94 88 1E 00 51 */ lbz r0, 0x51(r30) -/* 80293A98 28 00 00 00 */ cmplwi r0, 0 -/* 80293A9C 41 82 FF B8 */ beq lbl_80293A54 -lbl_80293AA0: -/* 80293AA0 38 60 00 00 */ li r3, 0 -lbl_80293AA4: -/* 80293AA4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80293AA8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80293AAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80293AB0 7C 08 03 A6 */ mtlr r0 -/* 80293AB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80293AB8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASSeqCtrl/timerProcess__10JASSeqCtrlFv.s b/asm/JSystem/JAudio2/JASSeqCtrl/timerProcess__10JASSeqCtrlFv.s deleted file mode 100644 index 3e9e5fc774c..00000000000 --- a/asm/JSystem/JAudio2/JASSeqCtrl/timerProcess__10JASSeqCtrlFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80293BE8: -/* 80293BE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80293BEC 7C 08 02 A6 */ mflr r0 -/* 80293BF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80293BF4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80293BF8 7C 7F 1B 78 */ mr r31, r3 -/* 80293BFC 80 83 00 54 */ lwz r4, 0x54(r3) -/* 80293C00 28 04 00 00 */ cmplwi r4, 0 -/* 80293C04 41 82 00 54 */ beq lbl_80293C58 -/* 80293C08 38 04 FF FF */ addi r0, r4, -1 -/* 80293C0C 90 1F 00 54 */ stw r0, 0x54(r31) -/* 80293C10 80 1F 00 54 */ lwz r0, 0x54(r31) -/* 80293C14 28 00 00 00 */ cmplwi r0, 0 -/* 80293C18 40 82 00 40 */ bne lbl_80293C58 -/* 80293C1C 38 80 00 05 */ li r4, 5 -/* 80293C20 4B FF FE 9D */ bl interrupt__10JASSeqCtrlFQ210JASSeqCtrl8IntrType -/* 80293C24 88 7F 00 50 */ lbz r3, 0x50(r31) -/* 80293C28 28 03 00 00 */ cmplwi r3, 0 -/* 80293C2C 41 82 00 24 */ beq lbl_80293C50 -/* 80293C30 38 03 FF FF */ addi r0, r3, -1 -/* 80293C34 98 1F 00 50 */ stb r0, 0x50(r31) -/* 80293C38 88 1F 00 50 */ lbz r0, 0x50(r31) -/* 80293C3C 28 00 00 00 */ cmplwi r0, 0 -/* 80293C40 41 82 00 18 */ beq lbl_80293C58 -/* 80293C44 80 1F 00 58 */ lwz r0, 0x58(r31) -/* 80293C48 90 1F 00 54 */ stw r0, 0x54(r31) -/* 80293C4C 48 00 00 0C */ b lbl_80293C58 -lbl_80293C50: -/* 80293C50 80 1F 00 58 */ lwz r0, 0x58(r31) -/* 80293C54 90 1F 00 54 */ stw r0, 0x54(r31) -lbl_80293C58: -/* 80293C58 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80293C5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80293C60 7C 08 03 A6 */ mtlr r0 -/* 80293C64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80293C68 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_initinterrupts.s b/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_initinterrupts.s deleted file mode 100644 index 0ec6b8480b4..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_initinterrupts.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8037235C: -/* 8037235C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80372360 7C 08 02 A6 */ mflr r0 -/* 80372364 90 01 00 14 */ stw r0, 0x14(r1) -/* 80372368 48 00 09 99 */ bl EXI2_EnableInterrupts -/* 8037236C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80372370 38 60 00 00 */ li r3, 0 -/* 80372374 7C 08 03 A6 */ mtlr r0 -/* 80372378 38 21 00 10 */ addi r1, r1, 0x10 -/* 8037237C 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_open.s b/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_open.s deleted file mode 100644 index ce34737546c..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_open.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_803725EC: -/* 803725EC 80 0D 94 40 */ lwz r0, gIsInitialized(r13) -/* 803725F0 2C 00 00 00 */ cmpwi r0, 0 -/* 803725F4 41 82 00 0C */ beq lbl_80372600 -/* 803725F8 38 60 D8 EB */ li r3, -10005 -/* 803725FC 4E 80 00 20 */ blr -lbl_80372600: -/* 80372600 38 00 00 01 */ li r0, 1 -/* 80372604 38 60 00 00 */ li r3, 0 -/* 80372608 90 0D 94 40 */ stw r0, gIsInitialized(r13) -/* 8037260C 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_post_stop.s b/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_post_stop.s deleted file mode 100644 index 2835a699f69..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_post_stop.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_803723F0: -/* 803723F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803723F4 7C 08 02 A6 */ mflr r0 -/* 803723F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 803723FC 48 00 09 21 */ bl EXI2_Reserve -/* 80372400 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80372404 38 60 00 00 */ li r3, 0 -/* 80372408 7C 08 03 A6 */ mtlr r0 -/* 8037240C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80372410 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_pre_continue.s b/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_pre_continue.s deleted file mode 100644 index 00e7074f3c2..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_pre_continue.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80372414: -/* 80372414 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80372418 7C 08 02 A6 */ mflr r0 -/* 8037241C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80372420 48 00 09 01 */ bl EXI2_Unreserve -/* 80372424 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80372428 38 60 00 00 */ li r3, 0 -/* 8037242C 7C 08 03 A6 */ mtlr r0 -/* 80372430 38 21 00 10 */ addi r1, r1, 0x10 -/* 80372434 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_initinterrupts.s b/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_initinterrupts.s deleted file mode 100644 index b48643919e0..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_initinterrupts.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80372908: -/* 80372908 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8037290C 7C 08 02 A6 */ mflr r0 -/* 80372910 90 01 00 14 */ stw r0, 0x14(r1) -/* 80372914 48 00 07 A9 */ bl DBInitInterrupts -/* 80372918 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8037291C 38 60 00 00 */ li r3, 0 -/* 80372920 7C 08 03 A6 */ mtlr r0 -/* 80372924 38 21 00 10 */ addi r1, r1, 0x10 -/* 80372928 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_open.s b/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_open.s deleted file mode 100644 index d579d3a4d41..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_open.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80372BA0: -/* 80372BA0 80 0D 94 48 */ lwz r0, gIsInitialized(r13) -/* 80372BA4 2C 00 00 00 */ cmpwi r0, 0 -/* 80372BA8 41 82 00 0C */ beq lbl_80372BB4 -/* 80372BAC 38 60 D8 EB */ li r3, -10005 -/* 80372BB0 4E 80 00 20 */ blr -lbl_80372BB4: -/* 80372BB4 38 00 00 01 */ li r0, 1 -/* 80372BB8 38 60 00 00 */ li r3, 0 -/* 80372BBC 90 0D 94 48 */ stw r0, gIsInitialized(r13) -/* 80372BC0 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_post_stop.s b/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_post_stop.s deleted file mode 100644 index b6ed4dda904..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_post_stop.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8037299C: -/* 8037299C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803729A0 7C 08 02 A6 */ mflr r0 -/* 803729A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 803729A8 48 00 03 89 */ bl DBOpen -/* 803729AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803729B0 38 60 00 00 */ li r3, 0 -/* 803729B4 7C 08 03 A6 */ mtlr r0 -/* 803729B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 803729BC 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_pre_continue.s b/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_pre_continue.s deleted file mode 100644 index 2385f625069..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_pre_continue.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_803729C0: -/* 803729C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803729C4 7C 08 02 A6 */ mflr r0 -/* 803729C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 803729CC 48 00 03 61 */ bl DBClose -/* 803729D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803729D4 38 60 00 00 */ li r3, 0 -/* 803729D8 7C 08 03 A6 */ mtlr r0 -/* 803729DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 803729E0 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr/GetTRKConnected.s b/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr/GetTRKConnected.s deleted file mode 100644 index 0632f8eedf7..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr/GetTRKConnected.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8036ECCC: -/* 8036ECCC 3C 60 80 45 */ lis r3, IsTRKConnected@ha /* 0x8044F288@ha */ -/* 8036ECD0 38 63 F2 88 */ addi r3, r3, IsTRKConnected@l /* 0x8044F288@l */ -/* 8036ECD4 80 63 00 00 */ lwz r3, 0(r3) -/* 8036ECD8 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr/SetTRKConnected.s b/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr/SetTRKConnected.s deleted file mode 100644 index 54617bf884f..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr/SetTRKConnected.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8036ECC0: -/* 8036ECC0 3C 80 80 45 */ lis r4, IsTRKConnected@ha /* 0x8044F288@ha */ -/* 8036ECC4 90 64 F2 88 */ stw r3, IsTRKConnected@l(r4) /* 0x8044F288@l */ -/* 8036ECC8 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent/TRKDestructEvent.s b/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent/TRKDestructEvent.s deleted file mode 100644 index 9c85ccc3526..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent/TRKDestructEvent.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8036CC18: -/* 8036CC18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8036CC1C 7C 08 02 A6 */ mflr r0 -/* 8036CC20 90 01 00 14 */ stw r0, 0x14(r1) -/* 8036CC24 80 63 00 08 */ lwz r3, 8(r3) -/* 8036CC28 48 00 0A 65 */ bl TRKReleaseBuffer -/* 8036CC2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8036CC30 7C 08 03 A6 */ mtlr r0 -/* 8036CC34 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036CC38 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent/TRKInitializeEventQueue.s b/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent/TRKInitializeEventQueue.s deleted file mode 100644 index 9508ad76584..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent/TRKInitializeEventQueue.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8036CDE8: -/* 8036CDE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8036CDEC 7C 08 02 A6 */ mflr r0 -/* 8036CDF0 3C 60 80 45 */ lis r3, gTRKEventQueue@ha /* 0x8044D890@ha */ -/* 8036CDF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8036CDF8 38 63 D8 90 */ addi r3, r3, gTRKEventQueue@l /* 0x8044D890@l */ -/* 8036CDFC 48 00 26 AD */ bl TRKInitializeMutex -/* 8036CE00 3C 60 80 45 */ lis r3, gTRKEventQueue@ha /* 0x8044D890@ha */ -/* 8036CE04 38 63 D8 90 */ addi r3, r3, gTRKEventQueue@l /* 0x8044D890@l */ -/* 8036CE08 48 00 26 99 */ bl TRKAcquireMutex -/* 8036CE0C 3C 60 80 45 */ lis r3, gTRKEventQueue@ha /* 0x8044D890@ha */ -/* 8036CE10 38 80 00 00 */ li r4, 0 -/* 8036CE14 38 63 D8 90 */ addi r3, r3, gTRKEventQueue@l /* 0x8044D890@l */ -/* 8036CE18 38 00 01 00 */ li r0, 0x100 -/* 8036CE1C 90 83 00 04 */ stw r4, 4(r3) -/* 8036CE20 90 83 00 08 */ stw r4, 8(r3) -/* 8036CE24 90 03 00 24 */ stw r0, 0x24(r3) -/* 8036CE28 48 00 26 71 */ bl TRKReleaseMutex -/* 8036CE2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8036CE30 38 60 00 00 */ li r3, 0 -/* 8036CE34 7C 08 03 A6 */ mtlr r0 -/* 8036CE38 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036CE3C 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit/TRKTerminateNub.s b/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit/TRKTerminateNub.s deleted file mode 100644 index a599ff252bf..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit/TRKTerminateNub.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8036CE68: -/* 8036CE68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8036CE6C 7C 08 02 A6 */ mflr r0 -/* 8036CE70 90 01 00 14 */ stw r0, 0x14(r1) -/* 8036CE74 48 00 09 E5 */ bl TRKTerminateSerialHandler -/* 8036CE78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8036CE7C 38 60 00 00 */ li r3, 0 -/* 8036CE80 7C 08 03 A6 */ mtlr r0 -/* 8036CE84 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036CE88 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/EnableMetroTRKInterrupts.s b/asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/EnableMetroTRKInterrupts.s deleted file mode 100644 index 60f5d6f9cf8..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/EnableMetroTRKInterrupts.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80371B7C: -/* 80371B7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80371B80 7C 08 02 A6 */ mflr r0 -/* 80371B84 90 01 00 14 */ stw r0, 0x14(r1) -/* 80371B88 48 00 02 89 */ bl EnableEXI2Interrupts -/* 80371B8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80371B90 7C 08 03 A6 */ mtlr r0 -/* 80371B94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80371B98 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/TRKInitializeTarget.s b/asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/TRKInitializeTarget.s deleted file mode 100644 index 6e4b9e9b9cd..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/TRKInitializeTarget.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_803719AC: -/* 803719AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803719B0 7C 08 02 A6 */ mflr r0 -/* 803719B4 3C 60 80 45 */ lis r3, gTRKState@ha /* 0x8044F294@ha */ -/* 803719B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 803719BC 38 00 00 01 */ li r0, 1 -/* 803719C0 38 63 F2 94 */ addi r3, r3, gTRKState@l /* 0x8044F294@l */ -/* 803719C4 90 03 00 98 */ stw r0, 0x98(r3) -/* 803719C8 4B FF DC 71 */ bl __TRK_get_MSR -/* 803719CC 3C A0 80 45 */ lis r5, gTRKState@ha /* 0x8044F294@ha */ -/* 803719D0 3C 80 80 45 */ lis r4, lc_base@ha /* 0x8044F810@ha */ -/* 803719D4 38 A5 F2 94 */ addi r5, r5, gTRKState@l /* 0x8044F294@l */ -/* 803719D8 3C 00 E0 00 */ lis r0, 0xe000 -/* 803719DC 90 65 00 8C */ stw r3, 0x8c(r5) -/* 803719E0 38 60 00 00 */ li r3, 0 -/* 803719E4 90 04 F8 10 */ stw r0, lc_base@l(r4) /* 0x8044F810@l */ -/* 803719E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803719EC 7C 08 03 A6 */ mtlr r0 -/* 803719F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 803719F4 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/TRKTargetTranslate.s b/asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/TRKTargetTranslate.s deleted file mode 100644 index 0df6d57f9fe..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/TRKTargetTranslate.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80371B24: -/* 80371B24 3C 80 80 45 */ lis r4, lc_base@ha /* 0x8044F810@ha */ -/* 80371B28 38 84 F8 10 */ addi r4, r4, lc_base@l /* 0x8044F810@l */ -/* 80371B2C 80 84 00 00 */ lwz r4, 0(r4) -/* 80371B30 7C 03 20 40 */ cmplw r3, r4 -/* 80371B34 41 80 00 24 */ blt lbl_80371B58 -/* 80371B38 38 04 40 00 */ addi r0, r4, 0x4000 -/* 80371B3C 7C 03 00 40 */ cmplw r3, r0 -/* 80371B40 40 80 00 18 */ bge lbl_80371B58 -/* 80371B44 3C 80 80 45 */ lis r4, gTRKCPUState@ha /* 0x8044F338@ha */ -/* 80371B48 38 84 F3 38 */ addi r4, r4, gTRKCPUState@l /* 0x8044F338@l */ -/* 80371B4C 80 04 02 38 */ lwz r0, 0x238(r4) -/* 80371B50 54 00 07 BF */ clrlwi. r0, r0, 0x1e -/* 80371B54 4C 82 00 20 */ bnelr -lbl_80371B58: -/* 80371B58 3C 00 7E 00 */ lis r0, 0x7e00 -/* 80371B5C 7C 03 00 40 */ cmplw r3, r0 -/* 80371B60 41 80 00 10 */ blt lbl_80371B70 -/* 80371B64 3C 00 80 00 */ lis r0, 0x8000 -/* 80371B68 7C 03 00 40 */ cmplw r3, r0 -/* 80371B6C 4C 81 00 20 */ blelr -lbl_80371B70: -/* 80371B70 54 60 00 BE */ clrlwi r0, r3, 2 -/* 80371B74 64 03 80 00 */ oris r3, r0, 0x8000 -/* 80371B78 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CBGetBytesAvailableForRead.s b/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CBGetBytesAvailableForRead.s deleted file mode 100644 index 554fb3750fe..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CBGetBytesAvailableForRead.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80372900: -/* 80372900 80 63 00 10 */ lwz r3, 0x10(r3) -/* 80372904 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferInitialize.s b/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferInitialize.s deleted file mode 100644 index f4adbcbd9d9..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferInitialize.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_803728B0: -/* 803728B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803728B4 7C 08 02 A6 */ mflr r0 -/* 803728B8 7C 66 1B 78 */ mr r6, r3 -/* 803728BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 803728C0 38 00 00 00 */ li r0, 0 -/* 803728C4 90 83 00 08 */ stw r4, 8(r3) -/* 803728C8 38 66 00 18 */ addi r3, r6, 0x18 -/* 803728CC 90 A6 00 0C */ stw r5, 0xc(r6) -/* 803728D0 80 86 00 08 */ lwz r4, 8(r6) -/* 803728D4 90 86 00 00 */ stw r4, 0(r6) -/* 803728D8 80 86 00 08 */ lwz r4, 8(r6) -/* 803728DC 90 86 00 04 */ stw r4, 4(r6) -/* 803728E0 90 06 00 10 */ stw r0, 0x10(r6) -/* 803728E4 80 06 00 0C */ lwz r0, 0xc(r6) -/* 803728E8 90 06 00 14 */ stw r0, 0x14(r6) -/* 803728EC 48 00 04 0D */ bl MWInitializeCriticalSection -/* 803728F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803728F4 7C 08 03 A6 */ mtlr r0 -/* 803728F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 803728FC 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferReadBytes.s b/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferReadBytes.s deleted file mode 100644 index 542fdc5a645..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferReadBytes.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_803726A0: -/* 803726A0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 803726A4 7C 08 02 A6 */ mflr r0 -/* 803726A8 90 01 00 24 */ stw r0, 0x24(r1) -/* 803726AC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 803726B0 7C BF 2B 78 */ mr r31, r5 -/* 803726B4 93 C1 00 18 */ stw r30, 0x18(r1) -/* 803726B8 7C 7E 1B 78 */ mr r30, r3 -/* 803726BC 93 A1 00 14 */ stw r29, 0x14(r1) -/* 803726C0 93 81 00 10 */ stw r28, 0x10(r1) -/* 803726C4 7C 9C 23 78 */ mr r28, r4 -/* 803726C8 80 03 00 10 */ lwz r0, 0x10(r3) -/* 803726CC 7C 1F 00 40 */ cmplw r31, r0 -/* 803726D0 40 81 00 0C */ ble lbl_803726DC -/* 803726D4 38 60 FF FF */ li r3, -1 -/* 803726D8 48 00 00 B0 */ b lbl_80372788 -lbl_803726DC: -/* 803726DC 38 7E 00 18 */ addi r3, r30, 0x18 -/* 803726E0 48 00 05 E9 */ bl MWEnterCriticalSection -/* 803726E4 80 7E 00 08 */ lwz r3, 8(r30) -/* 803726E8 80 9E 00 00 */ lwz r4, 0(r30) -/* 803726EC 80 1E 00 0C */ lwz r0, 0xc(r30) -/* 803726F0 7C 63 20 50 */ subf r3, r3, r4 -/* 803726F4 7F A3 00 50 */ subf r29, r3, r0 -/* 803726F8 7C 1F E8 40 */ cmplw r31, r29 -/* 803726FC 40 80 00 20 */ bge lbl_8037271C -/* 80372700 7F 83 E3 78 */ mr r3, r28 -/* 80372704 7F E5 FB 78 */ mr r5, r31 -/* 80372708 4B C9 0E 39 */ bl memcpy -/* 8037270C 80 1E 00 00 */ lwz r0, 0(r30) -/* 80372710 7C 00 FA 14 */ add r0, r0, r31 -/* 80372714 90 1E 00 00 */ stw r0, 0(r30) -/* 80372718 48 00 00 30 */ b lbl_80372748 -lbl_8037271C: -/* 8037271C 7F 83 E3 78 */ mr r3, r28 -/* 80372720 7F A5 EB 78 */ mr r5, r29 -/* 80372724 4B C9 0E 1D */ bl memcpy -/* 80372728 80 9E 00 08 */ lwz r4, 8(r30) -/* 8037272C 7C 7C EA 14 */ add r3, r28, r29 -/* 80372730 7C BD F8 50 */ subf r5, r29, r31 -/* 80372734 4B C9 0E 0D */ bl memcpy -/* 80372738 80 1E 00 08 */ lwz r0, 8(r30) -/* 8037273C 7C 00 FA 14 */ add r0, r0, r31 -/* 80372740 7C 1D 00 50 */ subf r0, r29, r0 -/* 80372744 90 1E 00 00 */ stw r0, 0(r30) -lbl_80372748: -/* 80372748 80 9E 00 08 */ lwz r4, 8(r30) -/* 8037274C 80 1E 00 00 */ lwz r0, 0(r30) -/* 80372750 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80372754 7C 04 00 50 */ subf r0, r4, r0 -/* 80372758 7C 03 00 40 */ cmplw r3, r0 -/* 8037275C 40 82 00 08 */ bne lbl_80372764 -/* 80372760 90 9E 00 00 */ stw r4, 0(r30) -lbl_80372764: -/* 80372764 80 1E 00 14 */ lwz r0, 0x14(r30) -/* 80372768 38 7E 00 18 */ addi r3, r30, 0x18 -/* 8037276C 7C 00 FA 14 */ add r0, r0, r31 -/* 80372770 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80372774 80 1E 00 10 */ lwz r0, 0x10(r30) -/* 80372778 7C 1F 00 50 */ subf r0, r31, r0 -/* 8037277C 90 1E 00 10 */ stw r0, 0x10(r30) -/* 80372780 48 00 05 25 */ bl MWExitCriticalSection -/* 80372784 38 60 00 00 */ li r3, 0 -lbl_80372788: -/* 80372788 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8037278C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80372790 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80372794 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 80372798 83 81 00 10 */ lwz r28, 0x10(r1) -/* 8037279C 7C 08 03 A6 */ mtlr r0 -/* 803727A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 803727A4 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferWriteBytes.s b/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferWriteBytes.s deleted file mode 100644 index 8aba9630c0f..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferWriteBytes.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_803727A8: -/* 803727A8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 803727AC 7C 08 02 A6 */ mflr r0 -/* 803727B0 90 01 00 24 */ stw r0, 0x24(r1) -/* 803727B4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 803727B8 7C BF 2B 78 */ mr r31, r5 -/* 803727BC 93 C1 00 18 */ stw r30, 0x18(r1) -/* 803727C0 7C 7E 1B 78 */ mr r30, r3 -/* 803727C4 93 A1 00 14 */ stw r29, 0x14(r1) -/* 803727C8 93 81 00 10 */ stw r28, 0x10(r1) -/* 803727CC 7C 9C 23 78 */ mr r28, r4 -/* 803727D0 80 03 00 14 */ lwz r0, 0x14(r3) -/* 803727D4 7C 1F 00 40 */ cmplw r31, r0 -/* 803727D8 40 81 00 0C */ ble lbl_803727E4 -/* 803727DC 38 60 FF FF */ li r3, -1 -/* 803727E0 48 00 00 B0 */ b lbl_80372890 -lbl_803727E4: -/* 803727E4 38 7E 00 18 */ addi r3, r30, 0x18 -/* 803727E8 48 00 04 E1 */ bl MWEnterCriticalSection -/* 803727EC 80 9E 00 08 */ lwz r4, 8(r30) -/* 803727F0 80 7E 00 04 */ lwz r3, 4(r30) -/* 803727F4 80 1E 00 0C */ lwz r0, 0xc(r30) -/* 803727F8 7C 84 18 50 */ subf r4, r4, r3 -/* 803727FC 7F A4 00 50 */ subf r29, r4, r0 -/* 80372800 7C 1D F8 40 */ cmplw r29, r31 -/* 80372804 41 80 00 20 */ blt lbl_80372824 -/* 80372808 7F 84 E3 78 */ mr r4, r28 -/* 8037280C 7F E5 FB 78 */ mr r5, r31 -/* 80372810 4B C9 0D 31 */ bl memcpy -/* 80372814 80 1E 00 04 */ lwz r0, 4(r30) -/* 80372818 7C 00 FA 14 */ add r0, r0, r31 -/* 8037281C 90 1E 00 04 */ stw r0, 4(r30) -/* 80372820 48 00 00 30 */ b lbl_80372850 -lbl_80372824: -/* 80372824 7F 84 E3 78 */ mr r4, r28 -/* 80372828 7F A5 EB 78 */ mr r5, r29 -/* 8037282C 4B C9 0D 15 */ bl memcpy -/* 80372830 80 7E 00 08 */ lwz r3, 8(r30) -/* 80372834 7C 9C EA 14 */ add r4, r28, r29 -/* 80372838 7C BD F8 50 */ subf r5, r29, r31 -/* 8037283C 4B C9 0D 05 */ bl memcpy -/* 80372840 80 1E 00 08 */ lwz r0, 8(r30) -/* 80372844 7C 00 FA 14 */ add r0, r0, r31 -/* 80372848 7C 1D 00 50 */ subf r0, r29, r0 -/* 8037284C 90 1E 00 04 */ stw r0, 4(r30) -lbl_80372850: -/* 80372850 80 9E 00 08 */ lwz r4, 8(r30) -/* 80372854 80 1E 00 04 */ lwz r0, 4(r30) -/* 80372858 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 8037285C 7C 04 00 50 */ subf r0, r4, r0 -/* 80372860 7C 03 00 40 */ cmplw r3, r0 -/* 80372864 40 82 00 08 */ bne lbl_8037286C -/* 80372868 90 9E 00 04 */ stw r4, 4(r30) -lbl_8037286C: -/* 8037286C 80 1E 00 14 */ lwz r0, 0x14(r30) -/* 80372870 38 7E 00 18 */ addi r3, r30, 0x18 -/* 80372874 7C 1F 00 50 */ subf r0, r31, r0 -/* 80372878 90 1E 00 14 */ stw r0, 0x14(r30) -/* 8037287C 80 1E 00 10 */ lwz r0, 0x10(r30) -/* 80372880 7C 00 FA 14 */ add r0, r0, r31 -/* 80372884 90 1E 00 10 */ stw r0, 0x10(r30) -/* 80372888 48 00 04 1D */ bl MWExitCriticalSection -/* 8037288C 38 60 00 00 */ li r3, 0 -lbl_80372890: -/* 80372890 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80372894 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80372898 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8037289C 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 803728A0 83 81 00 10 */ lwz r28, 0x10(r1) -/* 803728A4 7C 08 03 A6 */ mtlr r0 -/* 803728A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 803728AC 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc/MWEnterCriticalSection.s b/asm/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc/MWEnterCriticalSection.s deleted file mode 100644 index ccf0f17aec5..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc/MWEnterCriticalSection.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80372CC8: -/* 80372CC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80372CCC 7C 08 02 A6 */ mflr r0 -/* 80372CD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80372CD4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80372CD8 7C 7F 1B 78 */ mr r31, r3 -/* 80372CDC 4B FC AA 19 */ bl OSDisableInterrupts -/* 80372CE0 90 7F 00 00 */ stw r3, 0(r31) -/* 80372CE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80372CE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80372CEC 7C 08 03 A6 */ mtlr r0 -/* 80372CF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80372CF4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/chkPnt__16daBaseNpc_path_cF4cXyz.s b/asm/d/a/d_a_npc/chkPnt__16daBaseNpc_path_cF4cXyz.s deleted file mode 100644 index 86851a5c6ca..00000000000 --- a/asm/d/a/d_a_npc/chkPnt__16daBaseNpc_path_cF4cXyz.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8014DA64: -/* 8014DA64 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8014DA68 7C 08 02 A6 */ mflr r0 -/* 8014DA6C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8014DA70 7C 68 1B 78 */ mr r8, r3 -/* 8014DA74 C0 04 00 00 */ lfs f0, 0(r4) -/* 8014DA78 D0 01 00 08 */ stfs f0, 8(r1) -/* 8014DA7C C0 04 00 04 */ lfs f0, 4(r4) -/* 8014DA80 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8014DA84 C0 04 00 08 */ lfs f0, 8(r4) -/* 8014DA88 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8014DA8C 80 C3 00 04 */ lwz r6, 4(r3) -/* 8014DA90 88 06 00 05 */ lbz r0, 5(r6) -/* 8014DA94 54 07 07 FE */ clrlwi r7, r0, 0x1f -/* 8014DA98 38 61 00 08 */ addi r3, r1, 8 -/* 8014DA9C 80 86 00 08 */ lwz r4, 8(r6) -/* 8014DAA0 A0 A8 0A 10 */ lhz r5, 0xa10(r8) -/* 8014DAA4 A0 C6 00 00 */ lhz r6, 0(r6) -/* 8014DAA8 89 08 0A 12 */ lbz r8, 0xa12(r8) -/* 8014DAAC 7D 08 07 74 */ extsb r8, r8 -/* 8014DAB0 48 00 20 79 */ bl daBaseNpc_chkPnt__F4cXyzP4dPntUsUsii -/* 8014DAB4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8014DAB8 7C 08 03 A6 */ mtlr r0 -/* 8014DABC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8014DAC0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/ctrlMsgAnm__8daNpcT_cFPiPiP10fopAc_ac_ci.s b/asm/d/a/d_a_npc/ctrlMsgAnm__8daNpcT_cFPiPiP10fopAc_ac_ci.s deleted file mode 100644 index cb4e0ad137a..00000000000 --- a/asm/d/a/d_a_npc/ctrlMsgAnm__8daNpcT_cFPiPiP10fopAc_ac_ci.s +++ /dev/null @@ -1,101 +0,0 @@ -lbl_801493B8: -/* 801493B8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801493BC 7C 08 02 A6 */ mflr r0 -/* 801493C0 90 01 00 24 */ stw r0, 0x24(r1) -/* 801493C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801493C8 48 21 8E 0D */ bl _savegpr_27 -/* 801493CC 7C 7E 1B 78 */ mr r30, r3 -/* 801493D0 7C 9B 23 78 */ mr r27, r4 -/* 801493D4 7C BC 2B 78 */ mr r28, r5 -/* 801493D8 7C DD 33 78 */ mr r29, r6 -/* 801493DC 7C FF 3B 79 */ or. r31, r7, r7 -/* 801493E0 38 00 FF FF */ li r0, -1 -/* 801493E4 90 04 00 00 */ stw r0, 0(r4) -/* 801493E8 90 05 00 00 */ stw r0, 0(r5) -/* 801493EC 40 82 00 1C */ bne lbl_80149408 -/* 801493F0 A0 1E 00 F8 */ lhz r0, 0xf8(r30) -/* 801493F4 28 00 00 01 */ cmplwi r0, 1 -/* 801493F8 41 82 00 10 */ beq lbl_80149408 -/* 801493FC 80 1E 0D AC */ lwz r0, 0xdac(r30) -/* 80149400 2C 00 FF FF */ cmpwi r0, -1 -/* 80149404 41 82 00 EC */ beq lbl_801494F0 -lbl_80149408: -/* 80149408 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8014940C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80149410 38 64 4E C8 */ addi r3, r4, 0x4ec8 -/* 80149414 80 84 4F 94 */ lwz r4, 0x4f94(r4) -/* 80149418 4B EF 9E D5 */ bl convPId__14dEvt_control_cFUi -/* 8014941C 7C 03 E8 40 */ cmplw r3, r29 -/* 80149420 40 82 00 B4 */ bne lbl_801494D4 -/* 80149424 48 0E ED 79 */ bl getActor__12dMsgObject_cFv -/* 80149428 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 8014942C 28 00 00 02 */ cmplwi r0, 2 -/* 80149430 41 82 00 0C */ beq lbl_8014943C -/* 80149434 28 00 00 03 */ cmplwi r0, 3 -/* 80149438 40 82 00 10 */ bne lbl_80149448 -lbl_8014943C: -/* 8014943C 38 00 FF FF */ li r0, -1 -/* 80149440 90 1E 0D 9C */ stw r0, 0xd9c(r30) -/* 80149444 48 00 00 AC */ b lbl_801494F0 -lbl_80149448: -/* 80149448 28 00 00 06 */ cmplwi r0, 6 -/* 8014944C 40 82 00 68 */ bne lbl_801494B4 -/* 80149450 80 83 00 EC */ lwz r4, 0xec(r3) -/* 80149454 80 1E 0D 9C */ lwz r0, 0xd9c(r30) -/* 80149458 7C 04 00 40 */ cmplw r4, r0 -/* 8014945C 41 82 00 24 */ beq lbl_80149480 -/* 80149460 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80149464 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80149468 88 04 5E 7B */ lbz r0, 0x5e7b(r4) -/* 8014946C 90 1B 00 00 */ stw r0, 0(r27) -/* 80149470 88 04 5E 7A */ lbz r0, 0x5e7a(r4) -/* 80149474 90 1C 00 00 */ stw r0, 0(r28) -/* 80149478 80 03 00 EC */ lwz r0, 0xec(r3) -/* 8014947C 90 1E 0D 9C */ stw r0, 0xd9c(r30) -lbl_80149480: -/* 80149480 48 0E EF 25 */ bl isMouthCheck__12dMsgObject_cFv -/* 80149484 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80149488 41 82 00 14 */ beq lbl_8014949C -/* 8014948C 80 1E 0D 98 */ lwz r0, 0xd98(r30) -/* 80149490 54 00 04 A0 */ rlwinm r0, r0, 0, 0x12, 0x10 -/* 80149494 90 1E 0D 98 */ stw r0, 0xd98(r30) -/* 80149498 48 00 00 10 */ b lbl_801494A8 -lbl_8014949C: -/* 8014949C 80 1E 0D 98 */ lwz r0, 0xd98(r30) -/* 801494A0 60 00 40 00 */ ori r0, r0, 0x4000 -/* 801494A4 90 1E 0D 98 */ stw r0, 0xd98(r30) -lbl_801494A8: -/* 801494A8 38 00 00 14 */ li r0, 0x14 -/* 801494AC 90 1E 0D B4 */ stw r0, 0xdb4(r30) -/* 801494B0 48 00 00 40 */ b lbl_801494F0 -lbl_801494B4: -/* 801494B4 80 7E 0D 98 */ lwz r3, 0xd98(r30) -/* 801494B8 54 60 04 63 */ rlwinm. r0, r3, 0, 0x11, 0x11 -/* 801494BC 41 82 00 0C */ beq lbl_801494C8 -/* 801494C0 54 60 04 A0 */ rlwinm r0, r3, 0, 0x12, 0x10 -/* 801494C4 90 1E 0D 98 */ stw r0, 0xd98(r30) -lbl_801494C8: -/* 801494C8 38 00 FF FF */ li r0, -1 -/* 801494CC 90 1E 0D 9C */ stw r0, 0xd9c(r30) -/* 801494D0 48 00 00 20 */ b lbl_801494F0 -lbl_801494D4: -/* 801494D4 38 00 FF FF */ li r0, -1 -/* 801494D8 90 1E 0D 9C */ stw r0, 0xd9c(r30) -/* 801494DC 80 1E 0D B4 */ lwz r0, 0xdb4(r30) -/* 801494E0 2C 00 00 00 */ cmpwi r0, 0 -/* 801494E4 41 82 00 0C */ beq lbl_801494F0 -/* 801494E8 38 00 00 01 */ li r0, 1 -/* 801494EC 90 1E 0D B4 */ stw r0, 0xdb4(r30) -lbl_801494F0: -/* 801494F0 2C 1F 00 00 */ cmpwi r31, 0 -/* 801494F4 40 82 00 0C */ bne lbl_80149500 -/* 801494F8 38 7E 0D B4 */ addi r3, r30, 0xdb4 -/* 801494FC 48 00 3E 4D */ bl func_8014D348 -lbl_80149500: -/* 80149500 80 7E 0D B4 */ lwz r3, 0xdb4(r30) -/* 80149504 39 61 00 20 */ addi r11, r1, 0x20 -/* 80149508 48 21 8D 19 */ bl _restgpr_27 -/* 8014950C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80149510 7C 08 03 A6 */ mtlr r0 -/* 80149514 38 21 00 20 */ addi r1, r1, 0x20 -/* 80149518 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daBaseNpc_addIdx__FiiPUsi.s b/asm/d/a/d_a_npc/daBaseNpc_addIdx__FiiPUsi.s deleted file mode 100644 index 7b0eabc21e7..00000000000 --- a/asm/d/a/d_a_npc/daBaseNpc_addIdx__FiiPUsi.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8014D538: -/* 8014D538 A0 E5 00 00 */ lhz r7, 0(r5) -/* 8014D53C 39 00 00 00 */ li r8, 0 -/* 8014D540 7C E7 1A 14 */ add r7, r7, r3 -/* 8014D544 7C 04 38 00 */ cmpw r4, r7 -/* 8014D548 41 81 00 30 */ bgt lbl_8014D578 -/* 8014D54C 2C 06 00 00 */ cmpwi r6, 0 -/* 8014D550 41 82 00 14 */ beq lbl_8014D564 -/* 8014D554 7C 07 23 D6 */ divw r0, r7, r4 -/* 8014D558 7C 04 01 D6 */ mullw r0, r4, r0 -/* 8014D55C 7C E0 38 50 */ subf r7, r0, r7 -/* 8014D560 48 00 00 18 */ b lbl_8014D578 -lbl_8014D564: -/* 8014D564 20 04 00 00 */ subfic r0, r4, 0 -/* 8014D568 7C 60 01 10 */ subfe r3, r0, r0 -/* 8014D56C 38 04 FF FF */ addi r0, r4, -1 -/* 8014D570 7C 07 18 38 */ and r7, r0, r3 -/* 8014D574 39 00 00 01 */ li r8, 1 -lbl_8014D578: -/* 8014D578 B0 E5 00 00 */ sth r7, 0(r5) -/* 8014D57C 7D 03 43 78 */ mr r3, r8 -/* 8014D580 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daBaseNpc_subIdx__FiiPUsi.s b/asm/d/a/d_a_npc/daBaseNpc_subIdx__FiiPUsi.s deleted file mode 100644 index f2afc697de9..00000000000 --- a/asm/d/a/d_a_npc/daBaseNpc_subIdx__FiiPUsi.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8014D584: -/* 8014D584 A0 E5 00 00 */ lhz r7, 0(r5) -/* 8014D588 39 00 00 00 */ li r8, 0 -/* 8014D58C 7C E3 38 51 */ subf. r7, r3, r7 -/* 8014D590 41 81 00 28 */ bgt lbl_8014D5B8 -/* 8014D594 2C 06 00 00 */ cmpwi r6, 0 -/* 8014D598 41 82 00 18 */ beq lbl_8014D5B0 -/* 8014D59C 7C 67 23 D6 */ divw r3, r7, r4 -/* 8014D5A0 38 03 00 01 */ addi r0, r3, 1 -/* 8014D5A4 7C 04 01 D6 */ mullw r0, r4, r0 -/* 8014D5A8 7C E7 02 14 */ add r7, r7, r0 -/* 8014D5AC 48 00 00 0C */ b lbl_8014D5B8 -lbl_8014D5B0: -/* 8014D5B0 38 E0 00 00 */ li r7, 0 -/* 8014D5B4 39 00 00 01 */ li r8, 1 -lbl_8014D5B8: -/* 8014D5B8 B0 E5 00 00 */ sth r7, 0(r5) -/* 8014D5BC 7D 03 43 78 */ mr r3, r8 -/* 8014D5C0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcF_getGroundAngle__FP13cBgS_PolyInfos.s b/asm/d/a/d_a_npc/daNpcF_getGroundAngle__FP13cBgS_PolyInfos.s deleted file mode 100644 index 05c30fbc97f..00000000000 --- a/asm/d/a/d_a_npc/daNpcF_getGroundAngle__FP13cBgS_PolyInfos.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_8015556C: -/* 8015556C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80155570 7C 08 02 A6 */ mflr r0 -/* 80155574 90 01 00 34 */ stw r0, 0x34(r1) -/* 80155578 39 61 00 30 */ addi r11, r1, 0x30 -/* 8015557C 48 20 CC 61 */ bl _savegpr_29 -/* 80155580 7C 7D 1B 78 */ mr r29, r3 -/* 80155584 7C 9E 23 78 */ mr r30, r4 -/* 80155588 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 8015558C 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80155590 90 01 00 18 */ stw r0, 0x18(r1) -/* 80155594 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80155598 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015559C 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 801555A0 7F E3 FB 78 */ mr r3, r31 -/* 801555A4 7F A4 EB 78 */ mr r4, r29 -/* 801555A8 4B F1 F0 B9 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo -/* 801555AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801555B0 41 82 00 5C */ beq lbl_8015560C -/* 801555B4 7F E3 FB 78 */ mr r3, r31 -/* 801555B8 7F A4 EB 78 */ mr r4, r29 -/* 801555BC 38 A1 00 08 */ addi r5, r1, 8 -/* 801555C0 4B F1 F1 85 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla -/* 801555C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801555C8 41 82 00 14 */ beq lbl_801555DC -/* 801555CC C0 21 00 0C */ lfs f1, 0xc(r1) -/* 801555D0 48 11 2C 15 */ bl cBgW_CheckBGround__Ff -/* 801555D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801555D8 40 82 00 18 */ bne lbl_801555F0 -lbl_801555DC: -/* 801555DC 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 801555E0 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 801555E4 90 01 00 18 */ stw r0, 0x18(r1) -/* 801555E8 38 60 00 00 */ li r3, 0 -/* 801555EC 48 00 00 30 */ b lbl_8015561C -lbl_801555F0: -/* 801555F0 38 61 00 08 */ addi r3, r1, 8 -/* 801555F4 7F C4 F3 78 */ mr r4, r30 -/* 801555F8 4B EC 85 E1 */ bl fopAcM_getPolygonAngle__FPC8cM3dGPlas -/* 801555FC 3C 80 80 3A */ lis r4, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80155600 38 04 37 C0 */ addi r0, r4, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80155604 90 01 00 18 */ stw r0, 0x18(r1) -/* 80155608 48 00 00 14 */ b lbl_8015561C -lbl_8015560C: -/* 8015560C 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80155610 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80155614 90 01 00 18 */ stw r0, 0x18(r1) -/* 80155618 38 60 00 00 */ li r3, 0 -lbl_8015561C: -/* 8015561C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80155620 48 20 CC 09 */ bl _restgpr_29 -/* 80155624 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80155628 7C 08 03 A6 */ mtlr r0 -/* 8015562C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80155630 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcF_getPlayerInfoFromPlayerList__FiiR4cXyzR5csXyz.s b/asm/d/a/d_a_npc/daNpcF_getPlayerInfoFromPlayerList__FiiR4cXyzR5csXyz.s deleted file mode 100644 index bd7cc71c384..00000000000 --- a/asm/d/a/d_a_npc/daNpcF_getPlayerInfoFromPlayerList__FiiR4cXyzR5csXyz.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_80155774: -/* 80155774 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80155778 7C 08 02 A6 */ mflr r0 -/* 8015577C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80155780 39 61 00 30 */ addi r11, r1, 0x30 -/* 80155784 48 20 CA 49 */ bl _savegpr_25 -/* 80155788 7C 79 1B 78 */ mr r25, r3 -/* 8015578C 7C BA 2B 78 */ mr r26, r5 -/* 80155790 7C DB 33 78 */ mr r27, r6 -/* 80155794 3B C0 00 00 */ li r30, 0 -/* 80155798 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015579C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801557A0 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 801557A4 4B EC EB E1 */ bl getStatusRoomDt__20dStage_roomControl_cFi -/* 801557A8 7C 7F 1B 78 */ mr r31, r3 -/* 801557AC 81 83 00 00 */ lwz r12, 0(r3) -/* 801557B0 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 801557B4 7D 89 03 A6 */ mtctr r12 -/* 801557B8 4E 80 04 21 */ bctrl -/* 801557BC 83 A3 00 04 */ lwz r29, 4(r3) -/* 801557C0 3B 80 00 00 */ li r28, 0 -/* 801557C4 48 00 00 54 */ b lbl_80155818 -lbl_801557C8: -/* 801557C8 A8 1D 00 1C */ lha r0, 0x1c(r29) -/* 801557CC 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 801557D0 7C 19 00 00 */ cmpw r25, r0 -/* 801557D4 40 82 00 3C */ bne lbl_80155810 -/* 801557D8 C0 1D 00 0C */ lfs f0, 0xc(r29) -/* 801557DC D0 1A 00 00 */ stfs f0, 0(r26) -/* 801557E0 C0 1D 00 10 */ lfs f0, 0x10(r29) -/* 801557E4 D0 1A 00 04 */ stfs f0, 4(r26) -/* 801557E8 C0 1D 00 14 */ lfs f0, 0x14(r29) -/* 801557EC D0 1A 00 08 */ stfs f0, 8(r26) -/* 801557F0 A8 1D 00 18 */ lha r0, 0x18(r29) -/* 801557F4 B0 1B 00 00 */ sth r0, 0(r27) -/* 801557F8 A8 1D 00 1A */ lha r0, 0x1a(r29) -/* 801557FC B0 1B 00 02 */ sth r0, 2(r27) -/* 80155800 A8 1D 00 1C */ lha r0, 0x1c(r29) -/* 80155804 B0 1B 00 04 */ sth r0, 4(r27) -/* 80155808 3B C0 00 01 */ li r30, 1 -/* 8015580C 48 00 00 2C */ b lbl_80155838 -lbl_80155810: -/* 80155810 3B BD 00 20 */ addi r29, r29, 0x20 -/* 80155814 3B 9C 00 01 */ addi r28, r28, 1 -lbl_80155818: -/* 80155818 7F E3 FB 78 */ mr r3, r31 -/* 8015581C 81 9F 00 00 */ lwz r12, 0(r31) -/* 80155820 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 80155824 7D 89 03 A6 */ mtctr r12 -/* 80155828 4E 80 04 21 */ bctrl -/* 8015582C 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80155830 7C 1C 00 00 */ cmpw r28, r0 -/* 80155834 41 80 FF 94 */ blt lbl_801557C8 -lbl_80155838: -/* 80155838 7F C3 F3 78 */ mr r3, r30 -/* 8015583C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80155840 48 20 C9 D9 */ bl _restgpr_25 -/* 80155844 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80155848 7C 08 03 A6 */ mtlr r0 -/* 8015584C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80155850 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcT_chkPointInArea__F4cXyz4cXyz4cXyzsi.s b/asm/d/a/d_a_npc/daNpcT_chkPointInArea__F4cXyz4cXyz4cXyzsi.s deleted file mode 100644 index 952c31e81b5..00000000000 --- a/asm/d/a/d_a_npc/daNpcT_chkPointInArea__F4cXyz4cXyz4cXyzsi.s +++ /dev/null @@ -1,100 +0,0 @@ -lbl_8014C384: -/* 8014C384 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 8014C388 7C 08 02 A6 */ mflr r0 -/* 8014C38C 90 01 00 84 */ stw r0, 0x84(r1) -/* 8014C390 DB E1 00 70 */ stfd f31, 0x70(r1) -/* 8014C394 F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* qr0 */ -/* 8014C398 DB C1 00 60 */ stfd f30, 0x60(r1) -/* 8014C39C F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* qr0 */ -/* 8014C3A0 DB A1 00 50 */ stfd f29, 0x50(r1) -/* 8014C3A4 F3 A1 00 58 */ psq_st f29, 88(r1), 0, 0 /* qr0 */ -/* 8014C3A8 DB 81 00 40 */ stfd f28, 0x40(r1) -/* 8014C3AC F3 81 00 48 */ psq_st f28, 72(r1), 0, 0 /* qr0 */ -/* 8014C3B0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8014C3B4 48 21 5E 25 */ bl _savegpr_28 -/* 8014C3B8 7C 7C 1B 78 */ mr r28, r3 -/* 8014C3BC 7C 9D 23 78 */ mr r29, r4 -/* 8014C3C0 7C BE 2B 78 */ mr r30, r5 -/* 8014C3C4 7C FF 3B 78 */ mr r31, r7 -/* 8014C3C8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8014C3CC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8014C3D0 7C 06 00 D0 */ neg r0, r6 -/* 8014C3D4 7C 04 07 34 */ extsh r4, r0 -/* 8014C3D8 4B EC 00 05 */ bl mDoMtx_YrotS__FPA4_fs -/* 8014C3DC C0 1D 00 00 */ lfs f0, 0(r29) -/* 8014C3E0 FC 20 00 50 */ fneg f1, f0 -/* 8014C3E4 C0 1D 00 04 */ lfs f0, 4(r29) -/* 8014C3E8 FC 40 00 50 */ fneg f2, f0 -/* 8014C3EC C0 1D 00 08 */ lfs f0, 8(r29) -/* 8014C3F0 FC 60 00 50 */ fneg f3, f0 -/* 8014C3F4 4B EC 09 A9 */ bl transM__14mDoMtx_stack_cFfff -/* 8014C3F8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8014C3FC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8014C400 7F 84 E3 78 */ mr r4, r28 -/* 8014C404 38 A1 00 20 */ addi r5, r1, 0x20 -/* 8014C408 48 1F A9 65 */ bl PSMTXMultVec -/* 8014C40C C0 1E 00 00 */ lfs f0, 0(r30) -/* 8014C410 FC 00 02 10 */ fabs f0, f0 -/* 8014C414 FF E0 00 18 */ frsp f31, f0 -/* 8014C418 C0 1E 00 08 */ lfs f0, 8(r30) -/* 8014C41C FC 00 02 10 */ fabs f0, f0 -/* 8014C420 FF C0 00 18 */ frsp f30, f0 -/* 8014C424 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 8014C428 FC 00 02 10 */ fabs f0, f0 -/* 8014C42C FF A0 00 18 */ frsp f29, f0 -/* 8014C430 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 8014C434 FC 00 02 10 */ fabs f0, f0 -/* 8014C438 FF 80 00 18 */ frsp f28, f0 -/* 8014C43C 2C 1F 00 00 */ cmpwi r31, 0 -/* 8014C440 41 82 00 50 */ beq lbl_8014C490 -/* 8014C444 38 61 00 08 */ addi r3, r1, 8 -/* 8014C448 7F 84 E3 78 */ mr r4, r28 -/* 8014C44C 7F A5 EB 78 */ mr r5, r29 -/* 8014C450 48 11 A6 E5 */ bl __mi__4cXyzCFRC3Vec -/* 8014C454 C0 01 00 08 */ lfs f0, 8(r1) -/* 8014C458 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8014C45C C0 21 00 0C */ lfs f1, 0xc(r1) -/* 8014C460 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 8014C464 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 8014C468 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8014C46C C0 02 99 D8 */ lfs f0, lit_4116(r2) -/* 8014C470 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8014C474 4C 40 13 82 */ cror 2, 0, 2 -/* 8014C478 40 82 00 10 */ bne lbl_8014C488 -/* 8014C47C C0 1E 00 04 */ lfs f0, 4(r30) -/* 8014C480 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8014C484 41 80 00 0C */ blt lbl_8014C490 -lbl_8014C488: -/* 8014C488 38 60 00 00 */ li r3, 0 -/* 8014C48C 48 00 00 3C */ b lbl_8014C4C8 -lbl_8014C490: -/* 8014C490 EC 3D 07 72 */ fmuls f1, f29, f29 -/* 8014C494 EC 1F 07 F2 */ fmuls f0, f31, f31 -/* 8014C498 EC 41 00 24 */ fdivs f2, f1, f0 -/* 8014C49C EC 3C 07 32 */ fmuls f1, f28, f28 -/* 8014C4A0 EC 1E 07 B2 */ fmuls f0, f30, f30 -/* 8014C4A4 EC 01 00 24 */ fdivs f0, f1, f0 -/* 8014C4A8 EC 22 00 2A */ fadds f1, f2, f0 -/* 8014C4AC C0 02 99 DC */ lfs f0, lit_4140(r2) -/* 8014C4B0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8014C4B4 4C 40 13 82 */ cror 2, 0, 2 -/* 8014C4B8 40 82 00 0C */ bne lbl_8014C4C4 -/* 8014C4BC 38 60 00 01 */ li r3, 1 -/* 8014C4C0 48 00 00 08 */ b lbl_8014C4C8 -lbl_8014C4C4: -/* 8014C4C4 38 60 00 00 */ li r3, 0 -lbl_8014C4C8: -/* 8014C4C8 E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* qr0 */ -/* 8014C4CC CB E1 00 70 */ lfd f31, 0x70(r1) -/* 8014C4D0 E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* qr0 */ -/* 8014C4D4 CB C1 00 60 */ lfd f30, 0x60(r1) -/* 8014C4D8 E3 A1 00 58 */ psq_l f29, 88(r1), 0, 0 /* qr0 */ -/* 8014C4DC CB A1 00 50 */ lfd f29, 0x50(r1) -/* 8014C4E0 E3 81 00 48 */ psq_l f28, 72(r1), 0, 0 /* qr0 */ -/* 8014C4E4 CB 81 00 40 */ lfd f28, 0x40(r1) -/* 8014C4E8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8014C4EC 48 21 5D 39 */ bl _restgpr_28 -/* 8014C4F0 80 01 00 84 */ lwz r0, 0x84(r1) -/* 8014C4F4 7C 08 03 A6 */ mtlr r0 -/* 8014C4F8 38 21 00 80 */ addi r1, r1, 0x80 -/* 8014C4FC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/entry__18daBaseNpc_acMngr_cFP10fopAc_ac_c.s b/asm/d/a/d_a_npc/entry__18daBaseNpc_acMngr_cFP10fopAc_ac_c.s deleted file mode 100644 index d18b5795078..00000000000 --- a/asm/d/a/d_a_npc/entry__18daBaseNpc_acMngr_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8014D81C: -/* 8014D81C 28 04 00 00 */ cmplwi r4, 0 -/* 8014D820 41 82 00 0C */ beq lbl_8014D82C -/* 8014D824 80 04 00 04 */ lwz r0, 4(r4) -/* 8014D828 48 00 00 08 */ b lbl_8014D830 -lbl_8014D82C: -/* 8014D82C 38 00 FF FF */ li r0, -1 -lbl_8014D830: -/* 8014D830 90 03 00 04 */ stw r0, 4(r3) -/* 8014D834 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getActor__18daBaseNpc_acMngr_cFv.s b/asm/d/a/d_a_npc/getActor__18daBaseNpc_acMngr_cFv.s deleted file mode 100644 index d521e29b394..00000000000 --- a/asm/d/a/d_a_npc/getActor__18daBaseNpc_acMngr_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8014D838: -/* 8014D838 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014D83C 7C 08 02 A6 */ mflr r0 -/* 8014D840 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014D844 38 00 00 00 */ li r0, 0 -/* 8014D848 90 01 00 08 */ stw r0, 8(r1) -/* 8014D84C 80 63 00 04 */ lwz r3, 4(r3) -/* 8014D850 38 81 00 08 */ addi r4, r1, 8 -/* 8014D854 4B EC C1 69 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 8014D858 2C 03 00 00 */ cmpwi r3, 0 -/* 8014D85C 41 82 00 14 */ beq lbl_8014D870 -/* 8014D860 80 61 00 08 */ lwz r3, 8(r1) -/* 8014D864 28 03 00 00 */ cmplwi r3, 0 -/* 8014D868 41 82 00 08 */ beq lbl_8014D870 -/* 8014D86C 48 00 00 08 */ b lbl_8014D874 -lbl_8014D870: -/* 8014D870 38 60 00 00 */ li r3, 0 -lbl_8014D874: -/* 8014D874 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014D878 7C 08 03 A6 */ mtlr r0 -/* 8014D87C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014D880 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getBeforeIdx__13daNpcF_Path_cFv.s b/asm/d/a/d_a_npc/getBeforeIdx__13daNpcF_Path_cFv.s deleted file mode 100644 index 3f32de49710..00000000000 --- a/asm/d/a/d_a_npc/getBeforeIdx__13daNpcF_Path_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80150C60: -/* 80150C60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80150C64 7C 08 02 A6 */ mflr r0 -/* 80150C68 90 01 00 14 */ stw r0, 0x14(r1) -/* 80150C6C 7C 66 1B 78 */ mr r6, r3 -/* 80150C70 A0 03 00 00 */ lhz r0, 0(r3) -/* 80150C74 B0 01 00 08 */ sth r0, 8(r1) -/* 80150C78 80 63 00 04 */ lwz r3, 4(r3) -/* 80150C7C 88 03 00 05 */ lbz r0, 5(r3) -/* 80150C80 54 05 07 FE */ clrlwi r5, r0, 0x1f -/* 80150C84 A0 63 00 00 */ lhz r3, 0(r3) -/* 80150C88 38 81 00 08 */ addi r4, r1, 8 -/* 80150C8C 88 C6 00 02 */ lbz r6, 2(r6) -/* 80150C90 4B FF F9 C5 */ bl daNpcF_decIdx__FiRUsii -/* 80150C94 A0 61 00 08 */ lhz r3, 8(r1) -/* 80150C98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80150C9C 7C 08 03 A6 */ mtlr r0 -/* 80150CA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80150CA4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getBeforePos__13daNpcF_Path_cFR4cXyz.s b/asm/d/a/d_a_npc/getBeforePos__13daNpcF_Path_cFR4cXyz.s deleted file mode 100644 index 00b61fadf79..00000000000 --- a/asm/d/a/d_a_npc/getBeforePos__13daNpcF_Path_cFR4cXyz.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80150CA8: -/* 80150CA8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80150CAC 7C 08 02 A6 */ mflr r0 -/* 80150CB0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80150CB4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80150CB8 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80150CBC 7C 7E 1B 78 */ mr r30, r3 -/* 80150CC0 7C 9F 23 78 */ mr r31, r4 -/* 80150CC4 A0 03 00 00 */ lhz r0, 0(r3) -/* 80150CC8 B0 01 00 08 */ sth r0, 8(r1) -/* 80150CCC 80 63 00 04 */ lwz r3, 4(r3) -/* 80150CD0 88 03 00 05 */ lbz r0, 5(r3) -/* 80150CD4 54 05 07 FE */ clrlwi r5, r0, 0x1f -/* 80150CD8 A0 63 00 00 */ lhz r3, 0(r3) -/* 80150CDC 38 81 00 08 */ addi r4, r1, 8 -/* 80150CE0 88 DE 00 02 */ lbz r6, 2(r30) -/* 80150CE4 4B FF F9 71 */ bl daNpcF_decIdx__FiRUsii -/* 80150CE8 80 9E 00 04 */ lwz r4, 4(r30) -/* 80150CEC 80 84 00 08 */ lwz r4, 8(r4) -/* 80150CF0 A0 01 00 08 */ lhz r0, 8(r1) -/* 80150CF4 54 00 20 36 */ slwi r0, r0, 4 -/* 80150CF8 7C A4 02 14 */ add r5, r4, r0 -/* 80150CFC 80 85 00 04 */ lwz r4, 4(r5) -/* 80150D00 80 05 00 08 */ lwz r0, 8(r5) -/* 80150D04 90 81 00 0C */ stw r4, 0xc(r1) -/* 80150D08 90 01 00 10 */ stw r0, 0x10(r1) -/* 80150D0C 80 05 00 0C */ lwz r0, 0xc(r5) -/* 80150D10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80150D14 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80150D18 D0 1F 00 00 */ stfs f0, 0(r31) -/* 80150D1C C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80150D20 D0 1F 00 04 */ stfs f0, 4(r31) -/* 80150D24 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80150D28 D0 1F 00 08 */ stfs f0, 8(r31) -/* 80150D2C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80150D30 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80150D34 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80150D38 7C 08 03 A6 */ mtlr r0 -/* 80150D3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80150D40 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getDstPosH__13daNpcT_Path_cF4cXyzP4cXyzii.s b/asm/d/a/d_a_npc/getDstPosH__13daNpcT_Path_cF4cXyzP4cXyzii.s deleted file mode 100644 index 4915c9e8755..00000000000 --- a/asm/d/a/d_a_npc/getDstPosH__13daNpcT_Path_cF4cXyzP4cXyzii.s +++ /dev/null @@ -1,124 +0,0 @@ -lbl_80145FB4: -/* 80145FB4 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80145FB8 7C 08 02 A6 */ mflr r0 -/* 80145FBC 90 01 00 64 */ stw r0, 0x64(r1) -/* 80145FC0 39 61 00 60 */ addi r11, r1, 0x60 -/* 80145FC4 48 21 C2 0D */ bl _savegpr_26 -/* 80145FC8 7C 7A 1B 78 */ mr r26, r3 -/* 80145FCC 7C 9B 23 78 */ mr r27, r4 -/* 80145FD0 7C BF 2B 78 */ mr r31, r5 -/* 80145FD4 7C DC 33 78 */ mr r28, r6 -/* 80145FD8 7C FD 3B 78 */ mr r29, r7 -/* 80145FDC A0 83 00 1C */ lhz r4, 0x1c(r3) -/* 80145FE0 7C 1C 20 00 */ cmpw r28, r4 -/* 80145FE4 40 82 00 50 */ bne lbl_80146034 -/* 80145FE8 80 7A 00 00 */ lwz r3, 0(r26) -/* 80145FEC 80 63 00 08 */ lwz r3, 8(r3) -/* 80145FF0 38 04 FF FF */ addi r0, r4, -1 -/* 80145FF4 54 00 20 36 */ slwi r0, r0, 4 -/* 80145FF8 7C 83 02 14 */ add r4, r3, r0 -/* 80145FFC 80 64 00 04 */ lwz r3, 4(r4) -/* 80146000 80 04 00 08 */ lwz r0, 8(r4) -/* 80146004 90 61 00 38 */ stw r3, 0x38(r1) -/* 80146008 90 01 00 3C */ stw r0, 0x3c(r1) -/* 8014600C 80 04 00 0C */ lwz r0, 0xc(r4) -/* 80146010 90 01 00 40 */ stw r0, 0x40(r1) -/* 80146014 C0 01 00 38 */ lfs f0, 0x38(r1) -/* 80146018 D0 1F 00 00 */ stfs f0, 0(r31) -/* 8014601C C0 01 00 3C */ lfs f0, 0x3c(r1) -/* 80146020 D0 1F 00 04 */ stfs f0, 4(r31) -/* 80146024 C0 01 00 40 */ lfs f0, 0x40(r1) -/* 80146028 D0 1F 00 08 */ stfs f0, 8(r31) -/* 8014602C 38 60 00 01 */ li r3, 1 -/* 80146030 48 00 01 40 */ b lbl_80146170 -lbl_80146034: -/* 80146034 3B C0 00 01 */ li r30, 1 -lbl_80146038: -/* 80146038 C0 1B 00 00 */ lfs f0, 0(r27) -/* 8014603C D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80146040 C0 1B 00 04 */ lfs f0, 4(r27) -/* 80146044 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80146048 C0 1B 00 08 */ lfs f0, 8(r27) -/* 8014604C D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80146050 7F 43 D3 78 */ mr r3, r26 -/* 80146054 38 81 00 2C */ addi r4, r1, 0x2c -/* 80146058 7F 85 E3 78 */ mr r5, r28 -/* 8014605C 48 00 01 2D */ bl chkPassed1__13daNpcT_Path_cF4cXyzi -/* 80146060 2C 03 00 00 */ cmpwi r3, 0 -/* 80146064 41 82 00 70 */ beq lbl_801460D4 -/* 80146068 B3 DA 00 1E */ sth r30, 0x1e(r26) -/* 8014606C 7F 43 D3 78 */ mr r3, r26 -/* 80146070 7F 84 E3 78 */ mr r4, r28 -/* 80146074 4B FF FD 5D */ bl setNextIdx__13daNpcT_Path_cFi -/* 80146078 2C 03 00 00 */ cmpwi r3, 0 -/* 8014607C 41 82 FF BC */ beq lbl_80146038 -/* 80146080 B3 9A 00 1C */ sth r28, 0x1c(r26) -/* 80146084 80 7A 00 00 */ lwz r3, 0(r26) -/* 80146088 80 83 00 08 */ lwz r4, 8(r3) -/* 8014608C A0 7A 00 1C */ lhz r3, 0x1c(r26) -/* 80146090 38 03 FF FF */ addi r0, r3, -1 -/* 80146094 54 00 20 36 */ slwi r0, r0, 4 -/* 80146098 7C 84 02 14 */ add r4, r4, r0 -/* 8014609C 80 64 00 04 */ lwz r3, 4(r4) -/* 801460A0 80 04 00 08 */ lwz r0, 8(r4) -/* 801460A4 90 61 00 20 */ stw r3, 0x20(r1) -/* 801460A8 90 01 00 24 */ stw r0, 0x24(r1) -/* 801460AC 80 04 00 0C */ lwz r0, 0xc(r4) -/* 801460B0 90 01 00 28 */ stw r0, 0x28(r1) -/* 801460B4 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 801460B8 D0 1F 00 00 */ stfs f0, 0(r31) -/* 801460BC C0 01 00 24 */ lfs f0, 0x24(r1) -/* 801460C0 D0 1F 00 04 */ stfs f0, 4(r31) -/* 801460C4 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 801460C8 D0 1F 00 08 */ stfs f0, 8(r31) -/* 801460CC 38 60 00 01 */ li r3, 1 -/* 801460D0 48 00 00 A0 */ b lbl_80146170 -lbl_801460D4: -/* 801460D4 A0 1A 00 1E */ lhz r0, 0x1e(r26) -/* 801460D8 7C 00 E8 00 */ cmpw r0, r29 -/* 801460DC 40 80 00 4C */ bge lbl_80146128 -/* 801460E0 C0 1B 00 00 */ lfs f0, 0(r27) -/* 801460E4 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 801460E8 C0 1B 00 04 */ lfs f0, 4(r27) -/* 801460EC D0 01 00 18 */ stfs f0, 0x18(r1) -/* 801460F0 C0 1B 00 08 */ lfs f0, 8(r27) -/* 801460F4 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 801460F8 7F 43 D3 78 */ mr r3, r26 -/* 801460FC 38 81 00 14 */ addi r4, r1, 0x14 -/* 80146100 7F E5 FB 78 */ mr r5, r31 -/* 80146104 7F 86 E3 78 */ mr r6, r28 -/* 80146108 7F A7 EB 78 */ mr r7, r29 -/* 8014610C 48 00 03 CD */ bl chkPassed2__13daNpcT_Path_cF4cXyzP4cXyzii -/* 80146110 2C 03 00 00 */ cmpwi r3, 0 -/* 80146114 41 82 00 58 */ beq lbl_8014616C -/* 80146118 A0 7A 00 1E */ lhz r3, 0x1e(r26) -/* 8014611C 38 03 00 01 */ addi r0, r3, 1 -/* 80146120 B0 1A 00 1E */ sth r0, 0x1e(r26) -/* 80146124 4B FF FF B0 */ b lbl_801460D4 -lbl_80146128: -/* 80146128 A0 1A 00 1C */ lhz r0, 0x1c(r26) -/* 8014612C 80 7A 00 00 */ lwz r3, 0(r26) -/* 80146130 80 63 00 08 */ lwz r3, 8(r3) -/* 80146134 54 00 20 36 */ slwi r0, r0, 4 -/* 80146138 7C 83 02 14 */ add r4, r3, r0 -/* 8014613C 80 64 00 04 */ lwz r3, 4(r4) -/* 80146140 80 04 00 08 */ lwz r0, 8(r4) -/* 80146144 90 61 00 08 */ stw r3, 8(r1) -/* 80146148 90 01 00 0C */ stw r0, 0xc(r1) -/* 8014614C 80 04 00 0C */ lwz r0, 0xc(r4) -/* 80146150 90 01 00 10 */ stw r0, 0x10(r1) -/* 80146154 C0 01 00 08 */ lfs f0, 8(r1) -/* 80146158 D0 1F 00 00 */ stfs f0, 0(r31) -/* 8014615C C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80146160 D0 1F 00 04 */ stfs f0, 4(r31) -/* 80146164 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80146168 D0 1F 00 08 */ stfs f0, 8(r31) -lbl_8014616C: -/* 8014616C 38 60 00 00 */ li r3, 0 -lbl_80146170: -/* 80146170 39 61 00 60 */ addi r11, r1, 0x60 -/* 80146174 48 21 C0 A9 */ bl _restgpr_26 -/* 80146178 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8014617C 7C 08 03 A6 */ mtlr r0 -/* 80146180 38 21 00 60 */ addi r1, r1, 0x60 -/* 80146184 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getDstPos__13daNpcF_Path_cF4cXyzR4cXyz.s b/asm/d/a/d_a_npc/getDstPos__13daNpcF_Path_cF4cXyzR4cXyz.s deleted file mode 100644 index 6c235256ef2..00000000000 --- a/asm/d/a/d_a_npc/getDstPos__13daNpcF_Path_cF4cXyzR4cXyz.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_80150DE0: -/* 80150DE0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80150DE4 7C 08 02 A6 */ mflr r0 -/* 80150DE8 90 01 00 34 */ stw r0, 0x34(r1) -/* 80150DEC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80150DF0 48 21 13 E9 */ bl _savegpr_28 -/* 80150DF4 7C 7C 1B 78 */ mr r28, r3 -/* 80150DF8 7C 9D 23 78 */ mr r29, r4 -/* 80150DFC 7C BE 2B 78 */ mr r30, r5 -/* 80150E00 3B E0 00 00 */ li r31, 0 -/* 80150E04 48 00 00 8C */ b lbl_80150E90 -lbl_80150E08: -/* 80150E08 A0 1C 00 00 */ lhz r0, 0(r28) -/* 80150E0C 80 7C 00 04 */ lwz r3, 4(r28) -/* 80150E10 80 83 00 08 */ lwz r4, 8(r3) -/* 80150E14 54 03 20 36 */ slwi r3, r0, 4 -/* 80150E18 38 03 00 04 */ addi r0, r3, 4 -/* 80150E1C 7C 84 02 14 */ add r4, r4, r0 -/* 80150E20 80 64 00 00 */ lwz r3, 0(r4) -/* 80150E24 80 04 00 04 */ lwz r0, 4(r4) -/* 80150E28 90 61 00 14 */ stw r3, 0x14(r1) -/* 80150E2C 90 01 00 18 */ stw r0, 0x18(r1) -/* 80150E30 80 04 00 08 */ lwz r0, 8(r4) -/* 80150E34 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80150E38 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80150E3C D0 1E 00 00 */ stfs f0, 0(r30) -/* 80150E40 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80150E44 D0 1E 00 04 */ stfs f0, 4(r30) -/* 80150E48 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80150E4C D0 1E 00 08 */ stfs f0, 8(r30) -/* 80150E50 C0 1D 00 00 */ lfs f0, 0(r29) -/* 80150E54 D0 01 00 08 */ stfs f0, 8(r1) -/* 80150E58 C0 1D 00 04 */ lfs f0, 4(r29) -/* 80150E5C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80150E60 C0 1D 00 08 */ lfs f0, 8(r29) -/* 80150E64 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80150E68 7F 83 E3 78 */ mr r3, r28 -/* 80150E6C 38 81 00 08 */ addi r4, r1, 8 -/* 80150E70 4B FF FB B5 */ bl chkPassed__13daNpcF_Path_cF4cXyz -/* 80150E74 2C 03 00 00 */ cmpwi r3, 0 -/* 80150E78 41 82 00 20 */ beq lbl_80150E98 -/* 80150E7C 7F 83 E3 78 */ mr r3, r28 -/* 80150E80 4B FF FD 61 */ bl setNextIdx__13daNpcF_Path_cFv -/* 80150E84 2C 03 00 00 */ cmpwi r3, 0 -/* 80150E88 41 82 00 08 */ beq lbl_80150E90 -/* 80150E8C 3B E0 00 01 */ li r31, 1 -lbl_80150E90: -/* 80150E90 2C 1F 00 00 */ cmpwi r31, 0 -/* 80150E94 41 82 FF 74 */ beq lbl_80150E08 -lbl_80150E98: -/* 80150E98 7F E3 FB 78 */ mr r3, r31 -/* 80150E9C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80150EA0 48 21 13 85 */ bl _restgpr_28 -/* 80150EA4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80150EA8 7C 08 03 A6 */ mtlr r0 -/* 80150EAC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80150EB0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getDstPos__13daNpcT_Path_cF4cXyzP4cXyzi.s b/asm/d/a/d_a_npc/getDstPos__13daNpcT_Path_cF4cXyzP4cXyzi.s deleted file mode 100644 index 029bf07e9eb..00000000000 --- a/asm/d/a/d_a_npc/getDstPos__13daNpcT_Path_cF4cXyzP4cXyzi.s +++ /dev/null @@ -1,100 +0,0 @@ -lbl_80145E38: -/* 80145E38 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80145E3C 7C 08 02 A6 */ mflr r0 -/* 80145E40 90 01 00 54 */ stw r0, 0x54(r1) -/* 80145E44 39 61 00 50 */ addi r11, r1, 0x50 -/* 80145E48 48 21 C3 8D */ bl _savegpr_27 -/* 80145E4C 7C 7B 1B 78 */ mr r27, r3 -/* 80145E50 7C 9C 23 78 */ mr r28, r4 -/* 80145E54 7C BF 2B 78 */ mr r31, r5 -/* 80145E58 7C DD 33 78 */ mr r29, r6 -/* 80145E5C A0 83 00 1C */ lhz r4, 0x1c(r3) -/* 80145E60 7C 1D 20 00 */ cmpw r29, r4 -/* 80145E64 40 82 00 50 */ bne lbl_80145EB4 -/* 80145E68 80 7B 00 00 */ lwz r3, 0(r27) -/* 80145E6C 80 63 00 08 */ lwz r3, 8(r3) -/* 80145E70 38 04 FF FF */ addi r0, r4, -1 -/* 80145E74 54 00 20 36 */ slwi r0, r0, 4 -/* 80145E78 7C 83 02 14 */ add r4, r3, r0 -/* 80145E7C 80 64 00 04 */ lwz r3, 4(r4) -/* 80145E80 80 04 00 08 */ lwz r0, 8(r4) -/* 80145E84 90 61 00 2C */ stw r3, 0x2c(r1) -/* 80145E88 90 01 00 30 */ stw r0, 0x30(r1) -/* 80145E8C 80 04 00 0C */ lwz r0, 0xc(r4) -/* 80145E90 90 01 00 34 */ stw r0, 0x34(r1) -/* 80145E94 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 80145E98 D0 1F 00 00 */ stfs f0, 0(r31) -/* 80145E9C C0 01 00 30 */ lfs f0, 0x30(r1) -/* 80145EA0 D0 1F 00 04 */ stfs f0, 4(r31) -/* 80145EA4 C0 01 00 34 */ lfs f0, 0x34(r1) -/* 80145EA8 D0 1F 00 08 */ stfs f0, 8(r31) -/* 80145EAC 38 60 00 01 */ li r3, 1 -/* 80145EB0 48 00 00 EC */ b lbl_80145F9C -lbl_80145EB4: -/* 80145EB4 3B C0 00 01 */ li r30, 1 -lbl_80145EB8: -/* 80145EB8 C0 1C 00 00 */ lfs f0, 0(r28) -/* 80145EBC D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80145EC0 C0 1C 00 04 */ lfs f0, 4(r28) -/* 80145EC4 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80145EC8 C0 1C 00 08 */ lfs f0, 8(r28) -/* 80145ECC D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80145ED0 7F 63 DB 78 */ mr r3, r27 -/* 80145ED4 38 81 00 20 */ addi r4, r1, 0x20 -/* 80145ED8 7F A5 EB 78 */ mr r5, r29 -/* 80145EDC 48 00 02 AD */ bl chkPassed1__13daNpcT_Path_cF4cXyzi -/* 80145EE0 2C 03 00 00 */ cmpwi r3, 0 -/* 80145EE4 41 82 00 70 */ beq lbl_80145F54 -/* 80145EE8 B3 DB 00 1E */ sth r30, 0x1e(r27) -/* 80145EEC 7F 63 DB 78 */ mr r3, r27 -/* 80145EF0 7F A4 EB 78 */ mr r4, r29 -/* 80145EF4 4B FF FE DD */ bl setNextIdx__13daNpcT_Path_cFi -/* 80145EF8 2C 03 00 00 */ cmpwi r3, 0 -/* 80145EFC 41 82 FF BC */ beq lbl_80145EB8 -/* 80145F00 B3 BB 00 1C */ sth r29, 0x1c(r27) -/* 80145F04 80 7B 00 00 */ lwz r3, 0(r27) -/* 80145F08 80 83 00 08 */ lwz r4, 8(r3) -/* 80145F0C A0 7B 00 1C */ lhz r3, 0x1c(r27) -/* 80145F10 38 03 FF FF */ addi r0, r3, -1 -/* 80145F14 54 00 20 36 */ slwi r0, r0, 4 -/* 80145F18 7C 84 02 14 */ add r4, r4, r0 -/* 80145F1C 80 64 00 04 */ lwz r3, 4(r4) -/* 80145F20 80 04 00 08 */ lwz r0, 8(r4) -/* 80145F24 90 61 00 14 */ stw r3, 0x14(r1) -/* 80145F28 90 01 00 18 */ stw r0, 0x18(r1) -/* 80145F2C 80 04 00 0C */ lwz r0, 0xc(r4) -/* 80145F30 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80145F34 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80145F38 D0 1F 00 00 */ stfs f0, 0(r31) -/* 80145F3C C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80145F40 D0 1F 00 04 */ stfs f0, 4(r31) -/* 80145F44 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80145F48 D0 1F 00 08 */ stfs f0, 8(r31) -/* 80145F4C 38 60 00 01 */ li r3, 1 -/* 80145F50 48 00 00 4C */ b lbl_80145F9C -lbl_80145F54: -/* 80145F54 A0 1B 00 1C */ lhz r0, 0x1c(r27) -/* 80145F58 80 7B 00 00 */ lwz r3, 0(r27) -/* 80145F5C 80 63 00 08 */ lwz r3, 8(r3) -/* 80145F60 54 00 20 36 */ slwi r0, r0, 4 -/* 80145F64 7C 83 02 14 */ add r4, r3, r0 -/* 80145F68 80 64 00 04 */ lwz r3, 4(r4) -/* 80145F6C 80 04 00 08 */ lwz r0, 8(r4) -/* 80145F70 90 61 00 08 */ stw r3, 8(r1) -/* 80145F74 90 01 00 0C */ stw r0, 0xc(r1) -/* 80145F78 80 04 00 0C */ lwz r0, 0xc(r4) -/* 80145F7C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80145F80 C0 01 00 08 */ lfs f0, 8(r1) -/* 80145F84 D0 1F 00 00 */ stfs f0, 0(r31) -/* 80145F88 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80145F8C D0 1F 00 04 */ stfs f0, 4(r31) -/* 80145F90 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80145F94 D0 1F 00 08 */ stfs f0, 8(r31) -/* 80145F98 38 60 00 00 */ li r3, 0 -lbl_80145F9C: -/* 80145F9C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80145FA0 48 21 C2 81 */ bl _restgpr_27 -/* 80145FA4 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80145FA8 7C 08 03 A6 */ mtlr r0 -/* 80145FAC 38 21 00 50 */ addi r1, r1, 0x50 -/* 80145FB0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getNextIdx__13daNpcF_Path_cFv.s b/asm/d/a/d_a_npc/getNextIdx__13daNpcF_Path_cFv.s deleted file mode 100644 index ed8b389dbf7..00000000000 --- a/asm/d/a/d_a_npc/getNextIdx__13daNpcF_Path_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80150C18: -/* 80150C18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80150C1C 7C 08 02 A6 */ mflr r0 -/* 80150C20 90 01 00 14 */ stw r0, 0x14(r1) -/* 80150C24 7C 66 1B 78 */ mr r6, r3 -/* 80150C28 A0 03 00 00 */ lhz r0, 0(r3) -/* 80150C2C B0 01 00 08 */ sth r0, 8(r1) -/* 80150C30 80 63 00 04 */ lwz r3, 4(r3) -/* 80150C34 88 03 00 05 */ lbz r0, 5(r3) -/* 80150C38 54 05 07 FE */ clrlwi r5, r0, 0x1f -/* 80150C3C A0 63 00 00 */ lhz r3, 0(r3) -/* 80150C40 38 81 00 08 */ addi r4, r1, 8 -/* 80150C44 88 C6 00 02 */ lbz r6, 2(r6) -/* 80150C48 4B FF F9 B1 */ bl daNpcF_incIdx__FiRUsii -/* 80150C4C A0 61 00 08 */ lhz r3, 8(r1) -/* 80150C50 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80150C54 7C 08 03 A6 */ mtlr r0 -/* 80150C58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80150C5C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getNextPos__13daNpcF_Path_cFR4cXyz.s b/asm/d/a/d_a_npc/getNextPos__13daNpcF_Path_cFR4cXyz.s deleted file mode 100644 index a67c74a63d5..00000000000 --- a/asm/d/a/d_a_npc/getNextPos__13daNpcF_Path_cFR4cXyz.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80150D44: -/* 80150D44 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80150D48 7C 08 02 A6 */ mflr r0 -/* 80150D4C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80150D50 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80150D54 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80150D58 7C 7E 1B 78 */ mr r30, r3 -/* 80150D5C 7C 9F 23 78 */ mr r31, r4 -/* 80150D60 A0 03 00 00 */ lhz r0, 0(r3) -/* 80150D64 B0 01 00 08 */ sth r0, 8(r1) -/* 80150D68 80 63 00 04 */ lwz r3, 4(r3) -/* 80150D6C 88 03 00 05 */ lbz r0, 5(r3) -/* 80150D70 54 05 07 FE */ clrlwi r5, r0, 0x1f -/* 80150D74 A0 63 00 00 */ lhz r3, 0(r3) -/* 80150D78 38 81 00 08 */ addi r4, r1, 8 -/* 80150D7C 88 DE 00 02 */ lbz r6, 2(r30) -/* 80150D80 4B FF F8 79 */ bl daNpcF_incIdx__FiRUsii -/* 80150D84 80 9E 00 04 */ lwz r4, 4(r30) -/* 80150D88 80 84 00 08 */ lwz r4, 8(r4) -/* 80150D8C A0 01 00 08 */ lhz r0, 8(r1) -/* 80150D90 54 00 20 36 */ slwi r0, r0, 4 -/* 80150D94 7C A4 02 14 */ add r5, r4, r0 -/* 80150D98 80 85 00 04 */ lwz r4, 4(r5) -/* 80150D9C 80 05 00 08 */ lwz r0, 8(r5) -/* 80150DA0 90 81 00 0C */ stw r4, 0xc(r1) -/* 80150DA4 90 01 00 10 */ stw r0, 0x10(r1) -/* 80150DA8 80 05 00 0C */ lwz r0, 0xc(r5) -/* 80150DAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80150DB0 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80150DB4 D0 1F 00 00 */ stfs f0, 0(r31) -/* 80150DB8 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80150DBC D0 1F 00 04 */ stfs f0, 4(r31) -/* 80150DC0 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80150DC4 D0 1F 00 08 */ stfs f0, 8(r31) -/* 80150DC8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80150DCC 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80150DD0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80150DD4 7C 08 03 A6 */ mtlr r0 -/* 80150DD8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80150DDC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getPntPos__16daBaseNpc_path_cFUs.s b/asm/d/a/d_a_npc/getPntPos__16daBaseNpc_path_cFUs.s deleted file mode 100644 index ccc16c1c608..00000000000 --- a/asm/d/a/d_a_npc/getPntPos__16daBaseNpc_path_cFUs.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8014DB14: -/* 8014DB14 80 84 00 04 */ lwz r4, 4(r4) -/* 8014DB18 80 84 00 08 */ lwz r4, 8(r4) -/* 8014DB1C 54 A0 23 36 */ rlwinm r0, r5, 4, 0xc, 0x1b -/* 8014DB20 7C A4 02 14 */ add r5, r4, r0 -/* 8014DB24 80 85 00 04 */ lwz r4, 4(r5) -/* 8014DB28 80 05 00 08 */ lwz r0, 8(r5) -/* 8014DB2C 90 83 00 00 */ stw r4, 0(r3) -/* 8014DB30 90 03 00 04 */ stw r0, 4(r3) -/* 8014DB34 80 05 00 0C */ lwz r0, 0xc(r5) -/* 8014DB38 90 03 00 08 */ stw r0, 8(r3) -/* 8014DB3C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getRot__18daBaseNpc_lookat_cFi.s b/asm/d/a/d_a_npc/getRot__18daBaseNpc_lookat_cFi.s deleted file mode 100644 index eca687e4d9e..00000000000 --- a/asm/d/a/d_a_npc/getRot__18daBaseNpc_lookat_cFi.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8014E6AC: -/* 8014E6AC 1C 05 00 06 */ mulli r0, r5, 6 -/* 8014E6B0 7C 84 02 14 */ add r4, r4, r0 -/* 8014E6B4 80 04 00 7C */ lwz r0, 0x7c(r4) -/* 8014E6B8 90 03 00 00 */ stw r0, 0(r3) -/* 8014E6BC A0 04 00 80 */ lhz r0, 0x80(r4) -/* 8014E6C0 B0 03 00 04 */ sth r0, 4(r3) -/* 8014E6C4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getShopItemTagP__8daNpcT_cFv.s b/asm/d/a/d_a_npc/getShopItemTagP__8daNpcT_cFv.s deleted file mode 100644 index 0978c0be4b1..00000000000 --- a/asm/d/a/d_a_npc/getShopItemTagP__8daNpcT_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8014BFB0: -/* 8014BFB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014BFB4 7C 08 02 A6 */ mflr r0 -/* 8014BFB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014BFBC 7C 64 1B 78 */ mr r4, r3 -/* 8014BFC0 38 00 00 00 */ li r0, 0 -/* 8014BFC4 90 0D 8A 5C */ stw r0, mFindCount__8daNpcT_c(r13) -/* 8014BFC8 38 00 01 27 */ li r0, 0x127 -/* 8014BFCC B0 0D 8A 58 */ sth r0, mSrchName__8daNpcT_c(r13) -/* 8014BFD0 3C 60 80 14 */ lis r3, srchActor__8daNpcT_cFPvPv@ha /* 0x80147FD4@ha */ -/* 8014BFD4 38 63 7F D4 */ addi r3, r3, srchActor__8daNpcT_cFPvPv@l /* 0x80147FD4@l */ -/* 8014BFD8 4B ED 53 61 */ bl fpcEx_Search__FPFPvPv_PvPv -/* 8014BFDC 38 80 00 00 */ li r4, 0 -/* 8014BFE0 80 0D 8A 5C */ lwz r0, mFindCount__8daNpcT_c(r13) -/* 8014BFE4 3C 60 80 42 */ lis r3, mFindActorPtrs__8daNpcT_c@ha /* 0x80425708@ha */ -/* 8014BFE8 38 C3 57 08 */ addi r6, r3, mFindActorPtrs__8daNpcT_c@l /* 0x80425708@l */ -/* 8014BFEC 7C 09 03 A6 */ mtctr r0 -/* 8014BFF0 2C 00 00 00 */ cmpwi r0, 0 -/* 8014BFF4 40 81 00 28 */ ble lbl_8014C01C -lbl_8014BFF8: -/* 8014BFF8 7C 66 20 2E */ lwzx r3, r6, r4 -/* 8014BFFC 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8014C000 54 05 00 06 */ rlwinm r5, r0, 0, 0, 3 -/* 8014C004 3C 05 10 00 */ addis r0, r5, 0x1000 -/* 8014C008 28 00 00 00 */ cmplwi r0, 0 -/* 8014C00C 40 82 00 08 */ bne lbl_8014C014 -/* 8014C010 48 00 00 10 */ b lbl_8014C020 -lbl_8014C014: -/* 8014C014 38 84 00 04 */ addi r4, r4, 4 -/* 8014C018 42 00 FF E0 */ bdnz lbl_8014BFF8 -lbl_8014C01C: -/* 8014C01C 38 60 00 00 */ li r3, 0 -lbl_8014C020: -/* 8014C020 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014C024 7C 08 03 A6 */ mtlr r0 -/* 8014C028 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014C02C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getTevRegKeyAnmP__8daNpcF_cFPci.s b/asm/d/a/d_a_npc/getTevRegKeyAnmP__8daNpcF_cFPci.s deleted file mode 100644 index 23d06830dae..00000000000 --- a/asm/d/a/d_a_npc/getTevRegKeyAnmP__8daNpcF_cFPci.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80152BE0: -/* 80152BE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80152BE4 7C 08 02 A6 */ mflr r0 -/* 80152BE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80152BEC 7C 83 23 78 */ mr r3, r4 -/* 80152BF0 7C A4 2B 78 */ mr r4, r5 -/* 80152BF4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80152BF8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80152BFC 3C A5 00 02 */ addis r5, r5, 2 -/* 80152C00 38 C0 00 80 */ li r6, 0x80 -/* 80152C04 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80152C08 4B EE 96 E5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80152C0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80152C10 7C 08 03 A6 */ mtlr r0 -/* 80152C14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80152C18 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getTexPtrnAnmP__8daNpcF_cFPci.s b/asm/d/a/d_a_npc/getTexPtrnAnmP__8daNpcF_cFPci.s deleted file mode 100644 index 6b579d24afd..00000000000 --- a/asm/d/a/d_a_npc/getTexPtrnAnmP__8daNpcF_cFPci.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80152B68: -/* 80152B68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80152B6C 7C 08 02 A6 */ mflr r0 -/* 80152B70 90 01 00 14 */ stw r0, 0x14(r1) -/* 80152B74 7C 83 23 78 */ mr r3, r4 -/* 80152B78 7C A4 2B 78 */ mr r4, r5 -/* 80152B7C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80152B80 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80152B84 3C A5 00 02 */ addis r5, r5, 2 -/* 80152B88 38 C0 00 80 */ li r6, 0x80 -/* 80152B8C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80152B90 4B EE 97 5D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80152B94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80152B98 7C 08 03 A6 */ mtlr r0 -/* 80152B9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80152BA0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getTexSRTKeyAnmP__8daNpcF_cFPci.s b/asm/d/a/d_a_npc/getTexSRTKeyAnmP__8daNpcF_cFPci.s deleted file mode 100644 index ca7c53d93dd..00000000000 --- a/asm/d/a/d_a_npc/getTexSRTKeyAnmP__8daNpcF_cFPci.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80152BA4: -/* 80152BA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80152BA8 7C 08 02 A6 */ mflr r0 -/* 80152BAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80152BB0 7C 83 23 78 */ mr r3, r4 -/* 80152BB4 7C A4 2B 78 */ mr r4, r5 -/* 80152BB8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80152BBC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80152BC0 3C A5 00 02 */ addis r5, r5, 2 -/* 80152BC4 38 C0 00 80 */ li r6, 0x80 -/* 80152BC8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80152BCC 4B EE 97 21 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80152BD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80152BD4 7C 08 03 A6 */ mtlr r0 -/* 80152BD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80152BDC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getTrnsfrmKeyAnmP__8daNpcF_cFPci.s b/asm/d/a/d_a_npc/getTrnsfrmKeyAnmP__8daNpcF_cFPci.s deleted file mode 100644 index d504b471732..00000000000 --- a/asm/d/a/d_a_npc/getTrnsfrmKeyAnmP__8daNpcF_cFPci.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80152B2C: -/* 80152B2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80152B30 7C 08 02 A6 */ mflr r0 -/* 80152B34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80152B38 7C 83 23 78 */ mr r3, r4 -/* 80152B3C 7C A4 2B 78 */ mr r4, r5 -/* 80152B40 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80152B44 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80152B48 3C A5 00 02 */ addis r5, r5, 2 -/* 80152B4C 38 C0 00 80 */ li r6, 0x80 -/* 80152B50 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80152B54 4B EE 97 99 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80152B58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80152B5C 7C 08 03 A6 */ mtlr r0 -/* 80152B60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80152B64 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setBckAnm__8daNpcF_cFP15J3DAnmTransformfiiib.s b/asm/d/a/d_a_npc/setBckAnm__8daNpcF_cFP15J3DAnmTransformfiiib.s deleted file mode 100644 index cd9cc6c6a0a..00000000000 --- a/asm/d/a/d_a_npc/setBckAnm__8daNpcF_cFP15J3DAnmTransformfiiib.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80152C80: -/* 80152C80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80152C84 7C 08 02 A6 */ mflr r0 -/* 80152C88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80152C8C 7C AB 2B 78 */ mr r11, r5 -/* 80152C90 7C CA 33 78 */ mr r10, r6 -/* 80152C94 7C E0 3B 78 */ mr r0, r7 -/* 80152C98 7D 09 43 78 */ mr r9, r8 -/* 80152C9C 38 A0 00 01 */ li r5, 1 -/* 80152CA0 7D 66 5B 78 */ mr r6, r11 -/* 80152CA4 7D 47 07 34 */ extsh r7, r10 -/* 80152CA8 7C 08 07 34 */ extsh r8, r0 -/* 80152CAC 38 63 05 6C */ addi r3, r3, 0x56c -/* 80152CB0 4B EB AB 2D */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 80152CB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80152CB8 7C 08 03 A6 */ mtlr r0 -/* 80152CBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80152CC0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setBrkAnm__8daNpcF_cFP15J3DAnmTevRegKeyP12J3DModelDatafi.s b/asm/d/a/d_a_npc/setBrkAnm__8daNpcF_cFP15J3DAnmTevRegKeyP12J3DModelDatafi.s deleted file mode 100644 index 95618a73528..00000000000 --- a/asm/d/a/d_a_npc/setBrkAnm__8daNpcF_cFP15J3DAnmTevRegKeyP12J3DModelDatafi.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80152D44: -/* 80152D44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80152D48 7C 08 02 A6 */ mflr r0 -/* 80152D4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80152D50 7C 80 23 78 */ mr r0, r4 -/* 80152D54 7C C7 33 78 */ mr r7, r6 -/* 80152D58 38 85 00 58 */ addi r4, r5, 0x58 -/* 80152D5C 7C 05 03 78 */ mr r5, r0 -/* 80152D60 38 C0 00 01 */ li r6, 1 -/* 80152D64 39 00 00 00 */ li r8, 0 -/* 80152D68 39 20 FF FF */ li r9, -1 -/* 80152D6C 38 63 05 B8 */ addi r3, r3, 0x5b8 -/* 80152D70 4B EB A9 9D */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 80152D74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80152D78 7C 08 03 A6 */ mtlr r0 -/* 80152D7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80152D80 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setBtkAnm__8daNpcF_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi.s b/asm/d/a/d_a_npc/setBtkAnm__8daNpcF_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi.s deleted file mode 100644 index 9acbf9f0fa8..00000000000 --- a/asm/d/a/d_a_npc/setBtkAnm__8daNpcF_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80152D04: -/* 80152D04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80152D08 7C 08 02 A6 */ mflr r0 -/* 80152D0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80152D10 7C 80 23 78 */ mr r0, r4 -/* 80152D14 7C C7 33 78 */ mr r7, r6 -/* 80152D18 38 85 00 58 */ addi r4, r5, 0x58 -/* 80152D1C 7C 05 03 78 */ mr r5, r0 -/* 80152D20 38 C0 00 01 */ li r6, 1 -/* 80152D24 39 00 00 00 */ li r8, 0 -/* 80152D28 39 20 FF FF */ li r9, -1 -/* 80152D2C 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 80152D30 4B EB A9 0D */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 80152D34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80152D38 7C 08 03 A6 */ mtlr r0 -/* 80152D3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80152D40 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setBtpAnm__8daNpcF_cFP16J3DAnmTexPatternP12J3DModelDatafi.s b/asm/d/a/d_a_npc/setBtpAnm__8daNpcF_cFP16J3DAnmTexPatternP12J3DModelDatafi.s deleted file mode 100644 index b0af4b4de8f..00000000000 --- a/asm/d/a/d_a_npc/setBtpAnm__8daNpcF_cFP16J3DAnmTexPatternP12J3DModelDatafi.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80152CC4: -/* 80152CC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80152CC8 7C 08 02 A6 */ mflr r0 -/* 80152CCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80152CD0 7C 80 23 78 */ mr r0, r4 -/* 80152CD4 7C C7 33 78 */ mr r7, r6 -/* 80152CD8 38 85 00 58 */ addi r4, r5, 0x58 -/* 80152CDC 7C 05 03 78 */ mr r5, r0 -/* 80152CE0 38 C0 00 01 */ li r6, 1 -/* 80152CE4 39 00 00 00 */ li r8, 0 -/* 80152CE8 39 20 FF FF */ li r9, -1 -/* 80152CEC 38 63 05 88 */ addi r3, r3, 0x588 -/* 80152CF0 4B EB A8 5D */ bl init__13mDoExt_btpAnmFP16J3DMaterialTableP16J3DAnmTexPatterniifss -/* 80152CF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80152CF8 7C 08 03 A6 */ mtlr r0 -/* 80152CFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80152D00 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setNextIdx__13daNpcF_Path_cFv.s b/asm/d/a/d_a_npc/setNextIdx__13daNpcF_Path_cFv.s deleted file mode 100644 index 3284e924e69..00000000000 --- a/asm/d/a/d_a_npc/setNextIdx__13daNpcF_Path_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80150BE0: -/* 80150BE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80150BE4 7C 08 02 A6 */ mflr r0 -/* 80150BE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80150BEC 7C 64 1B 78 */ mr r4, r3 -/* 80150BF0 80 63 00 04 */ lwz r3, 4(r3) -/* 80150BF4 88 03 00 05 */ lbz r0, 5(r3) -/* 80150BF8 54 05 07 FE */ clrlwi r5, r0, 0x1f -/* 80150BFC A0 63 00 00 */ lhz r3, 0(r3) -/* 80150C00 88 C4 00 02 */ lbz r6, 2(r4) -/* 80150C04 4B FF F9 F5 */ bl daNpcF_incIdx__FiRUsii -/* 80150C08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80150C0C 7C 08 03 A6 */ mtlr r0 -/* 80150C10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80150C14 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setNextPnt__16daBaseNpc_path_cFv.s b/asm/d/a/d_a_npc/setNextPnt__16daBaseNpc_path_cFv.s deleted file mode 100644 index 3ef3f999147..00000000000 --- a/asm/d/a/d_a_npc/setNextPnt__16daBaseNpc_path_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8014DAC4: -/* 8014DAC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014DAC8 7C 08 02 A6 */ mflr r0 -/* 8014DACC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014DAD0 7C 66 1B 78 */ mr r6, r3 -/* 8014DAD4 80 63 00 04 */ lwz r3, 4(r3) -/* 8014DAD8 88 03 00 05 */ lbz r0, 5(r3) -/* 8014DADC 54 05 07 FE */ clrlwi r5, r0, 0x1f -/* 8014DAE0 A0 63 00 00 */ lhz r3, 0(r3) -/* 8014DAE4 38 86 0A 10 */ addi r4, r6, 0xa10 -/* 8014DAE8 88 C6 0A 12 */ lbz r6, 0xa12(r6) -/* 8014DAEC 7C C6 07 74 */ extsb r6, r6 -/* 8014DAF0 4B FF FA D5 */ bl daBaseNpc_incIdx__FiPUsii -/* 8014DAF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014DAF8 7C 08 03 A6 */ mtlr r0 -/* 8014DAFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014DB00 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setPathInfo__13daNpcF_Path_cFUcScUc.s b/asm/d/a/d_a_npc/setPathInfo__13daNpcF_Path_cFUcScUc.s deleted file mode 100644 index ba088a88aa2..00000000000 --- a/asm/d/a/d_a_npc/setPathInfo__13daNpcF_Path_cFUcScUc.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_8015095C: -/* 8015095C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80150960 7C 08 02 A6 */ mflr r0 -/* 80150964 90 01 00 24 */ stw r0, 0x24(r1) -/* 80150968 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8015096C 7C 7F 1B 78 */ mr r31, r3 -/* 80150970 38 00 00 00 */ li r0, 0 -/* 80150974 90 03 00 04 */ stw r0, 4(r3) -/* 80150978 B0 03 00 00 */ sth r0, 0(r3) -/* 8015097C 98 C3 00 02 */ stb r6, 2(r3) -/* 80150980 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 80150984 28 03 00 FF */ cmplwi r3, 0xff -/* 80150988 41 82 00 84 */ beq lbl_80150A0C -/* 8015098C 7C A4 07 74 */ extsb r4, r5 -/* 80150990 4B F0 0E 5D */ bl dPath_GetRoomPath__Fii -/* 80150994 90 7F 00 04 */ stw r3, 4(r31) -/* 80150998 80 9F 00 04 */ lwz r4, 4(r31) -/* 8015099C 28 04 00 00 */ cmplwi r4, 0 -/* 801509A0 40 82 00 0C */ bne lbl_801509AC -/* 801509A4 38 60 00 00 */ li r3, 0 -/* 801509A8 48 00 00 68 */ b lbl_80150A10 -lbl_801509AC: -/* 801509AC 38 7F 00 20 */ addi r3, r31, 0x20 -/* 801509B0 88 BF 00 02 */ lbz r5, 2(r31) -/* 801509B4 4B FF FE BD */ bl initialize__16daNpcF_SPCurve_cFP5dPathi -/* 801509B8 80 7F 00 04 */ lwz r3, 4(r31) -/* 801509BC 88 03 00 05 */ lbz r0, 5(r3) -/* 801509C0 54 00 07 FE */ clrlwi r0, r0, 0x1f -/* 801509C4 98 1F 00 03 */ stb r0, 3(r31) -/* 801509C8 A0 1F 00 00 */ lhz r0, 0(r31) -/* 801509CC 80 7F 00 04 */ lwz r3, 4(r31) -/* 801509D0 80 63 00 08 */ lwz r3, 8(r3) -/* 801509D4 54 00 20 36 */ slwi r0, r0, 4 -/* 801509D8 7C 83 02 14 */ add r4, r3, r0 -/* 801509DC 80 64 00 04 */ lwz r3, 4(r4) -/* 801509E0 80 04 00 08 */ lwz r0, 8(r4) -/* 801509E4 90 61 00 08 */ stw r3, 8(r1) -/* 801509E8 90 01 00 0C */ stw r0, 0xc(r1) -/* 801509EC 80 04 00 0C */ lwz r0, 0xc(r4) -/* 801509F0 90 01 00 10 */ stw r0, 0x10(r1) -/* 801509F4 C0 01 00 08 */ lfs f0, 8(r1) -/* 801509F8 D0 1F 00 14 */ stfs f0, 0x14(r31) -/* 801509FC C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80150A00 D0 1F 00 18 */ stfs f0, 0x18(r31) -/* 80150A04 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80150A08 D0 1F 00 1C */ stfs f0, 0x1c(r31) -lbl_80150A0C: -/* 80150A0C 38 60 00 01 */ li r3, 1 -lbl_80150A10: -/* 80150A10 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80150A14 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80150A18 7C 08 03 A6 */ mtlr r0 -/* 80150A1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80150A20 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setPathInfo__13daNpcT_Path_cFUcScUc.s b/asm/d/a/d_a_npc/setPathInfo__13daNpcT_Path_cFUcScUc.s deleted file mode 100644 index e59334b5585..00000000000 --- a/asm/d/a/d_a_npc/setPathInfo__13daNpcT_Path_cFUcScUc.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_80145C74: -/* 80145C74 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80145C78 7C 08 02 A6 */ mflr r0 -/* 80145C7C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80145C80 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80145C84 7C 7F 1B 78 */ mr r31, r3 -/* 80145C88 38 00 00 00 */ li r0, 0 -/* 80145C8C 90 03 00 00 */ stw r0, 0(r3) -/* 80145C90 B0 03 00 1C */ sth r0, 0x1c(r3) -/* 80145C94 98 C3 00 20 */ stb r6, 0x20(r3) -/* 80145C98 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 80145C9C 28 03 00 FF */ cmplwi r3, 0xff -/* 80145CA0 41 82 00 74 */ beq lbl_80145D14 -/* 80145CA4 7C A4 07 74 */ extsb r4, r5 -/* 80145CA8 4B F0 BB 45 */ bl dPath_GetRoomPath__Fii -/* 80145CAC 90 7F 00 00 */ stw r3, 0(r31) -/* 80145CB0 80 7F 00 00 */ lwz r3, 0(r31) -/* 80145CB4 28 03 00 00 */ cmplwi r3, 0 -/* 80145CB8 40 82 00 0C */ bne lbl_80145CC4 -/* 80145CBC 38 60 00 00 */ li r3, 0 -/* 80145CC0 48 00 00 58 */ b lbl_80145D18 -lbl_80145CC4: -/* 80145CC4 88 03 00 05 */ lbz r0, 5(r3) -/* 80145CC8 54 00 07 FE */ clrlwi r0, r0, 0x1f -/* 80145CCC 98 1F 00 21 */ stb r0, 0x21(r31) -/* 80145CD0 A0 1F 00 1C */ lhz r0, 0x1c(r31) -/* 80145CD4 80 7F 00 00 */ lwz r3, 0(r31) -/* 80145CD8 80 63 00 08 */ lwz r3, 8(r3) -/* 80145CDC 54 00 20 36 */ slwi r0, r0, 4 -/* 80145CE0 7C 83 02 14 */ add r4, r3, r0 -/* 80145CE4 80 64 00 04 */ lwz r3, 4(r4) -/* 80145CE8 80 04 00 08 */ lwz r0, 8(r4) -/* 80145CEC 90 61 00 08 */ stw r3, 8(r1) -/* 80145CF0 90 01 00 0C */ stw r0, 0xc(r1) -/* 80145CF4 80 04 00 0C */ lwz r0, 0xc(r4) -/* 80145CF8 90 01 00 10 */ stw r0, 0x10(r1) -/* 80145CFC C0 01 00 08 */ lfs f0, 8(r1) -/* 80145D00 D0 1F 00 04 */ stfs f0, 4(r31) -/* 80145D04 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80145D08 D0 1F 00 08 */ stfs f0, 8(r31) -/* 80145D0C C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80145D10 D0 1F 00 0C */ stfs f0, 0xc(r31) -lbl_80145D14: -/* 80145D14 38 60 00 01 */ li r3, 1 -lbl_80145D18: -/* 80145D18 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80145D1C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80145D20 7C 08 03 A6 */ mtlr r0 -/* 80145D24 38 21 00 20 */ addi r1, r1, 0x20 -/* 80145D28 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setPathInfo__16daBaseNpc_path_cFUcScSc.s b/asm/d/a/d_a_npc/setPathInfo__16daBaseNpc_path_cFUcScSc.s deleted file mode 100644 index 793e02a253f..00000000000 --- a/asm/d/a/d_a_npc/setPathInfo__16daBaseNpc_path_cFUcScSc.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8014D9BC: -/* 8014D9BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014D9C0 7C 08 02 A6 */ mflr r0 -/* 8014D9C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014D9C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8014D9CC 7C 7F 1B 78 */ mr r31, r3 -/* 8014D9D0 38 00 00 00 */ li r0, 0 -/* 8014D9D4 90 03 00 04 */ stw r0, 4(r3) -/* 8014D9D8 B0 03 0A 10 */ sth r0, 0xa10(r3) -/* 8014D9DC 98 C3 0A 12 */ stb r6, 0xa12(r3) -/* 8014D9E0 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 8014D9E4 28 03 00 FF */ cmplwi r3, 0xff -/* 8014D9E8 41 82 00 44 */ beq lbl_8014DA2C -/* 8014D9EC 7C A4 07 74 */ extsb r4, r5 -/* 8014D9F0 4B F0 3D FD */ bl dPath_GetRoomPath__Fii -/* 8014D9F4 90 7F 00 04 */ stw r3, 4(r31) -/* 8014D9F8 80 9F 00 04 */ lwz r4, 4(r31) -/* 8014D9FC 28 04 00 00 */ cmplwi r4, 0 -/* 8014DA00 40 82 00 0C */ bne lbl_8014DA0C -/* 8014DA04 38 60 00 00 */ li r3, 0 -/* 8014DA08 48 00 00 2C */ b lbl_8014DA34 -lbl_8014DA0C: -/* 8014DA0C 88 04 00 05 */ lbz r0, 5(r4) -/* 8014DA10 54 07 07 FE */ clrlwi r7, r0, 0x1f -/* 8014DA14 80 64 00 08 */ lwz r3, 8(r4) -/* 8014DA18 A0 84 00 00 */ lhz r4, 0(r4) -/* 8014DA1C 38 A0 00 A0 */ li r5, 0xa0 -/* 8014DA20 38 DF 00 0C */ addi r6, r31, 0xc -/* 8014DA24 48 00 1E A1 */ bl daBaseNpc_putNurbs__FP4dPntiiP4dPnti -/* 8014DA28 B0 7F 0A 0E */ sth r3, 0xa0e(r31) -lbl_8014DA2C: -/* 8014DA2C 7F E3 FB 78 */ mr r3, r31 -/* 8014DA30 4B FF FF 79 */ bl isPath__16daBaseNpc_path_cFv -lbl_8014DA34: -/* 8014DA34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8014DA38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014DA3C 7C 08 03 A6 */ mtlr r0 -/* 8014DA40 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014DA44 4E 80 00 20 */ blr diff --git a/asm/d/d_bright_check/_move__14dBrightCheck_cFv.s b/asm/d/d_bright_check/_move__14dBrightCheck_cFv.s deleted file mode 100644 index dd9f95d1914..00000000000 --- a/asm/d/d_bright_check/_move__14dBrightCheck_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_801934D0: -/* 801934D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801934D4 7C 08 02 A6 */ mflr r0 -/* 801934D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801934DC 88 03 00 18 */ lbz r0, 0x18(r3) -/* 801934E0 1C A0 00 0C */ mulli r5, r0, 0xc -/* 801934E4 3C 80 80 3C */ lis r4, brightChackProc@ha /* 0x803BB5D4@ha */ -/* 801934E8 38 04 B5 D4 */ addi r0, r4, brightChackProc@l /* 0x803BB5D4@l */ -/* 801934EC 7D 80 2A 14 */ add r12, r0, r5 -/* 801934F0 48 1C EB 95 */ bl __ptmf_scall -/* 801934F4 60 00 00 00 */ nop -/* 801934F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801934FC 7C 08 03 A6 */ mtlr r0 -/* 80193500 38 21 00 10 */ addi r1, r1, 0x10 -/* 80193504 4E 80 00 20 */ blr diff --git a/asm/d/d_bright_check/modeMove__14dBrightCheck_cFv.s b/asm/d/d_bright_check/modeMove__14dBrightCheck_cFv.s deleted file mode 100644 index c837a95bb31..00000000000 --- a/asm/d/d_bright_check/modeMove__14dBrightCheck_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8019350C: -/* 8019350C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80193510 7C 08 02 A6 */ mflr r0 -/* 80193514 90 01 00 24 */ stw r0, 0x24(r1) -/* 80193518 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8019351C 7C 7F 1B 78 */ mr r31, r3 -/* 80193520 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 80193524 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 80193528 80 63 00 34 */ lwz r3, 0x34(r3) -/* 8019352C 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 -/* 80193530 40 82 00 0C */ bne lbl_8019353C -/* 80193534 54 60 04 E7 */ rlwinm. r0, r3, 0, 0x13, 0x13 -/* 80193538 41 82 00 48 */ beq lbl_80193580 -lbl_8019353C: -/* 8019353C 38 00 00 01 */ li r0, 1 -/* 80193540 90 01 00 08 */ stw r0, 8(r1) -/* 80193544 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80193548 38 81 00 08 */ addi r4, r1, 8 -/* 8019354C 38 A0 00 00 */ li r5, 0 -/* 80193550 38 C0 00 00 */ li r6, 0 -/* 80193554 38 E0 00 00 */ li r7, 0 -/* 80193558 C0 22 A0 04 */ lfs f1, lit_3821(r2) -/* 8019355C FC 40 08 90 */ fmr f2, f1 -/* 80193560 C0 62 A0 08 */ lfs f3, lit_3822(r2) -/* 80193564 FC 80 18 90 */ fmr f4, f3 -/* 80193568 39 00 00 00 */ li r8, 0 -/* 8019356C 48 11 84 19 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80193570 38 00 00 01 */ li r0, 1 -/* 80193574 98 1F 00 19 */ stb r0, 0x19(r31) -/* 80193578 38 00 00 00 */ li r0, 0 -/* 8019357C 98 1F 00 18 */ stb r0, 0x18(r31) -lbl_80193580: -/* 80193580 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80193584 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80193588 7C 08 03 A6 */ mtlr r0 -/* 8019358C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80193590 4E 80 00 20 */ blr diff --git a/asm/d/d_resorce/__dt__14dRes_control_cFv.s b/asm/d/d_resorce/__dt__14dRes_control_cFv.s deleted file mode 100644 index 0930e77a347..00000000000 --- a/asm/d/d_resorce/__dt__14dRes_control_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_8003BFB0: -/* 8003BFB0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003BFB4 7C 08 02 A6 */ mflr r0 -/* 8003BFB8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003BFBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003BFC0 48 32 62 19 */ bl _savegpr_28 -/* 8003BFC4 7C 7C 1B 79 */ or. r28, r3, r3 -/* 8003BFC8 7C 9D 23 78 */ mr r29, r4 -/* 8003BFCC 41 82 00 90 */ beq lbl_8003C05C -/* 8003BFD0 3B C0 00 00 */ li r30, 0 -/* 8003BFD4 3B E0 00 00 */ li r31, 0 -lbl_8003BFD8: -/* 8003BFD8 7C 7C FA 14 */ add r3, r28, r31 -/* 8003BFDC 38 80 FF FF */ li r4, -1 -/* 8003BFE0 4B FF E2 A1 */ bl __dt__11dRes_info_cFv -/* 8003BFE4 3B DE 00 01 */ addi r30, r30, 1 -/* 8003BFE8 2C 1E 00 80 */ cmpwi r30, 0x80 -/* 8003BFEC 3B FF 00 24 */ addi r31, r31, 0x24 -/* 8003BFF0 41 80 FF E8 */ blt lbl_8003BFD8 -/* 8003BFF4 3B C0 00 00 */ li r30, 0 -/* 8003BFF8 3B E0 00 00 */ li r31, 0 -lbl_8003BFFC: -/* 8003BFFC 38 7F 12 00 */ addi r3, r31, 0x1200 -/* 8003C000 7C 7C 1A 14 */ add r3, r28, r3 -/* 8003C004 38 80 FF FF */ li r4, -1 -/* 8003C008 4B FF E2 79 */ bl __dt__11dRes_info_cFv -/* 8003C00C 3B DE 00 01 */ addi r30, r30, 1 -/* 8003C010 2C 1E 00 40 */ cmpwi r30, 0x40 -/* 8003C014 3B FF 00 24 */ addi r31, r31, 0x24 -/* 8003C018 41 80 FF E4 */ blt lbl_8003BFFC -/* 8003C01C 38 7C 12 00 */ addi r3, r28, 0x1200 -/* 8003C020 3C 80 80 04 */ lis r4, __dt__11dRes_info_cFv@ha /* 0x8003A280@ha */ -/* 8003C024 38 84 A2 80 */ addi r4, r4, __dt__11dRes_info_cFv@l /* 0x8003A280@l */ -/* 8003C028 38 A0 00 24 */ li r5, 0x24 -/* 8003C02C 38 C0 00 40 */ li r6, 0x40 -/* 8003C030 48 32 5C B9 */ bl __destroy_arr -/* 8003C034 7F 83 E3 78 */ mr r3, r28 -/* 8003C038 3C 80 80 04 */ lis r4, __dt__11dRes_info_cFv@ha /* 0x8003A280@ha */ -/* 8003C03C 38 84 A2 80 */ addi r4, r4, __dt__11dRes_info_cFv@l /* 0x8003A280@l */ -/* 8003C040 38 A0 00 24 */ li r5, 0x24 -/* 8003C044 38 C0 00 80 */ li r6, 0x80 -/* 8003C048 48 32 5C A1 */ bl __destroy_arr -/* 8003C04C 7F A0 07 35 */ extsh. r0, r29 -/* 8003C050 40 81 00 0C */ ble lbl_8003C05C -/* 8003C054 7F 83 E3 78 */ mr r3, r28 -/* 8003C058 48 29 2C E5 */ bl __dl__FPv -lbl_8003C05C: -/* 8003C05C 7F 83 E3 78 */ mr r3, r28 -/* 8003C060 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003C064 48 32 61 C1 */ bl _restgpr_28 -/* 8003C068 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003C06C 7C 08 03 A6 */ mtlr r0 -/* 8003C070 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003C074 4E 80 00 20 */ blr diff --git a/asm/d/d_resorce/addWarpMaterial__FP12J3DModelData.s b/asm/d/d_resorce/addWarpMaterial__FP12J3DModelData.s deleted file mode 100644 index b48813f6e4e..00000000000 --- a/asm/d/d_resorce/addWarpMaterial__FP12J3DModelData.s +++ /dev/null @@ -1,167 +0,0 @@ -lbl_8003A840: -/* 8003A840 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8003A844 7C 08 02 A6 */ mflr r0 -/* 8003A848 90 01 00 54 */ stw r0, 0x54(r1) -/* 8003A84C 39 61 00 50 */ addi r11, r1, 0x50 -/* 8003A850 48 32 79 69 */ bl _savegpr_20 -/* 8003A854 7C 77 1B 78 */ mr r23, r3 -/* 8003A858 3C 60 80 38 */ lis r3, d_d_resorce__stringBase0@ha /* 0x803798B8@ha */ -/* 8003A85C 38 63 98 B8 */ addi r3, r3, d_d_resorce__stringBase0@l /* 0x803798B8@l */ -/* 8003A860 38 63 00 23 */ addi r3, r3, 0x23 -/* 8003A864 38 80 00 5D */ li r4, 0x5d -/* 8003A868 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8003A86C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003A870 3C A5 00 02 */ addis r5, r5, 2 -/* 8003A874 38 C0 00 80 */ li r6, 0x80 -/* 8003A878 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8003A87C 48 00 1A 71 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8003A880 7C 65 1B 78 */ mr r5, r3 -/* 8003A884 80 77 00 6C */ lwz r3, 0x6c(r23) -/* 8003A888 A3 C3 00 00 */ lhz r30, 0(r3) -/* 8003A88C 38 80 00 01 */ li r4, 1 -/* 8003A890 57 C0 28 34 */ slwi r0, r30, 5 -/* 8003A894 7C A0 28 50 */ subf r5, r0, r5 -/* 8003A898 48 2D 79 85 */ bl addResTIMG__10J3DTextureFUsPC7ResTIMG -/* 8003A89C 38 60 00 94 */ li r3, 0x94 -/* 8003A8A0 48 29 43 AD */ bl __nw__FUl -/* 8003A8A4 7C 7D 1B 79 */ or. r29, r3, r3 -/* 8003A8A8 41 82 00 10 */ beq lbl_8003A8B8 -/* 8003A8AC 3C 80 80 38 */ lis r4, l_texMtxInfo@ha /* 0x80379840@ha */ -/* 8003A8B0 38 84 98 40 */ addi r4, r4, l_texMtxInfo@l /* 0x80379840@l */ -/* 8003A8B4 48 2E AE 65 */ bl __as__13J3DTexMtxInfoFRC13J3DTexMtxInfo -lbl_8003A8B8: -/* 8003A8B8 3B 20 00 00 */ li r25, 0 -/* 8003A8BC 3B 6D 80 A8 */ la r27, l_texCoordInfo(r13) /* 80450628-_SDA_BASE_ */ -/* 8003A8C0 3B 42 83 F0 */ la r26, l_alphaCompInfo(r2) /* 80451DF0-_SDA2_BASE_ */ -/* 8003A8C4 3C 60 80 38 */ lis r3, l_tevStageInfo@ha /* 0x803798A4@ha */ -/* 8003A8C8 3B E3 98 A4 */ addi r31, r3, l_tevStageInfo@l /* 0x803798A4@l */ -/* 8003A8CC 48 00 01 D8 */ b lbl_8003AAA4 -lbl_8003A8D0: -/* 8003A8D0 80 77 00 60 */ lwz r3, 0x60(r23) -/* 8003A8D4 57 20 13 BA */ rlwinm r0, r25, 2, 0xe, 0x1d -/* 8003A8D8 7F 83 00 2E */ lwzx r28, r3, r0 -/* 8003A8DC 82 DC 00 28 */ lwz r22, 0x28(r28) -/* 8003A8E0 7E C3 B3 78 */ mr r3, r22 -/* 8003A8E4 81 96 00 00 */ lwz r12, 0(r22) -/* 8003A8E8 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 8003A8EC 7D 89 03 A6 */ mtctr r12 -/* 8003A8F0 4E 80 04 21 */ bctrl -/* 8003A8F4 7C 78 1B 78 */ mr r24, r3 -/* 8003A8F8 7E C3 B3 78 */ mr r3, r22 -/* 8003A8FC 7F 04 C3 78 */ mr r4, r24 -/* 8003A900 81 96 00 00 */ lwz r12, 0(r22) -/* 8003A904 81 8C 00 48 */ lwz r12, 0x48(r12) -/* 8003A908 7D 89 03 A6 */ mtctr r12 -/* 8003A90C 4E 80 04 21 */ bctrl -/* 8003A910 1C 98 00 03 */ mulli r4, r24, 3 -/* 8003A914 38 04 00 1E */ addi r0, r4, 0x1e -/* 8003A918 98 1B 00 02 */ stb r0, 2(r27) -/* 8003A91C 80 0D 80 A8 */ lwz r0, l_texCoordInfo(r13) -/* 8003A920 90 03 00 00 */ stw r0, 0(r3) -/* 8003A924 88 03 00 02 */ lbz r0, 2(r3) -/* 8003A928 B0 03 00 04 */ sth r0, 4(r3) -/* 8003A92C 7E C3 B3 78 */ mr r3, r22 -/* 8003A930 38 98 00 01 */ addi r4, r24, 1 -/* 8003A934 81 96 00 00 */ lwz r12, 0(r22) -/* 8003A938 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8003A93C 7D 89 03 A6 */ mtctr r12 -/* 8003A940 4E 80 04 21 */ bctrl -/* 8003A944 7E C3 B3 78 */ mr r3, r22 -/* 8003A948 7F 04 C3 78 */ mr r4, r24 -/* 8003A94C 7F A5 EB 78 */ mr r5, r29 -/* 8003A950 81 96 00 00 */ lwz r12, 0(r22) -/* 8003A954 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 8003A958 7D 89 03 A6 */ mtctr r12 -/* 8003A95C 4E 80 04 21 */ bctrl -/* 8003A960 82 BC 00 2C */ lwz r21, 0x2c(r28) -/* 8003A964 7E A3 AB 78 */ mr r3, r21 -/* 8003A968 81 95 00 00 */ lwz r12, 0(r21) -/* 8003A96C 81 8C 00 98 */ lwz r12, 0x98(r12) -/* 8003A970 7D 89 03 A6 */ mtctr r12 -/* 8003A974 4E 80 04 21 */ bctrl -/* 8003A978 7C 76 1B 78 */ mr r22, r3 -/* 8003A97C 9B 0D 80 AC */ stb r24, l_tevOrderInfo(r13) -/* 8003A980 7E A3 AB 78 */ mr r3, r21 -/* 8003A984 38 80 00 03 */ li r4, 3 -/* 8003A988 7F C5 F3 78 */ mr r5, r30 -/* 8003A98C 81 95 00 00 */ lwz r12, 0(r21) -/* 8003A990 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 8003A994 7D 89 03 A6 */ mtctr r12 -/* 8003A998 4E 80 04 21 */ bctrl -/* 8003A99C 80 0D 80 AC */ lwz r0, l_tevOrderInfo(r13) -/* 8003A9A0 90 01 00 08 */ stw r0, 8(r1) -/* 8003A9A4 90 01 00 0C */ stw r0, 0xc(r1) -/* 8003A9A8 7E A3 AB 78 */ mr r3, r21 -/* 8003A9AC 56 D4 06 3E */ clrlwi r20, r22, 0x18 -/* 8003A9B0 7E 84 A3 78 */ mr r4, r20 -/* 8003A9B4 38 A1 00 0C */ addi r5, r1, 0xc -/* 8003A9B8 81 95 00 00 */ lwz r12, 0(r21) -/* 8003A9BC 81 8C 00 58 */ lwz r12, 0x58(r12) -/* 8003A9C0 7D 89 03 A6 */ mtctr r12 -/* 8003A9C4 4E 80 04 21 */ bctrl -/* 8003A9C8 38 61 00 10 */ addi r3, r1, 0x10 -/* 8003A9CC 7F E4 FB 78 */ mr r4, r31 -/* 8003A9D0 48 00 00 FD */ bl __ct__11J3DTevStageFRC15J3DTevStageInfo -/* 8003A9D4 80 83 00 00 */ lwz r4, 0(r3) -/* 8003A9D8 80 03 00 04 */ lwz r0, 4(r3) -/* 8003A9DC 90 81 00 18 */ stw r4, 0x18(r1) -/* 8003A9E0 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8003A9E4 7E A3 AB 78 */ mr r3, r21 -/* 8003A9E8 7E 84 A3 78 */ mr r4, r20 -/* 8003A9EC 38 A1 00 18 */ addi r5, r1, 0x18 -/* 8003A9F0 81 95 00 00 */ lwz r12, 0(r21) -/* 8003A9F4 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 8003A9F8 7D 89 03 A6 */ mtctr r12 -/* 8003A9FC 4E 80 04 21 */ bctrl -/* 8003AA00 7E A3 AB 78 */ mr r3, r21 -/* 8003AA04 38 16 00 01 */ addi r0, r22, 1 -/* 8003AA08 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8003AA0C 81 95 00 00 */ lwz r12, 0(r21) -/* 8003AA10 81 8C 00 94 */ lwz r12, 0x94(r12) -/* 8003AA14 7D 89 03 A6 */ mtctr r12 -/* 8003AA18 4E 80 04 21 */ bctrl -/* 8003AA1C 82 BC 00 08 */ lwz r21, 8(r28) -/* 8003AA20 3A 98 00 01 */ addi r20, r24, 1 -/* 8003AA24 7E A3 AB 78 */ mr r3, r21 -/* 8003AA28 7E 84 A3 78 */ mr r4, r20 -/* 8003AA2C 38 A0 00 00 */ li r5, 0 -/* 8003AA30 48 2D A1 89 */ bl addTexMtxIndexInDL__8J3DShapeF7_GXAttrUl -/* 8003AA34 7E A3 AB 78 */ mr r3, r21 -/* 8003AA38 7E 84 A3 78 */ mr r4, r20 -/* 8003AA3C 48 2D A2 81 */ bl addTexMtxIndexInVcd__8J3DShapeF7_GXAttr -/* 8003AA40 82 BC 00 34 */ lwz r21, 0x34(r28) -/* 8003AA44 7E A3 AB 78 */ mr r3, r21 -/* 8003AA48 81 95 00 00 */ lwz r12, 0(r21) -/* 8003AA4C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8003AA50 7D 89 03 A6 */ mtctr r12 -/* 8003AA54 4E 80 04 21 */ bctrl -/* 8003AA58 88 1A 00 01 */ lbz r0, 1(r26) -/* 8003AA5C 98 03 00 02 */ stb r0, 2(r3) -/* 8003AA60 88 1A 00 04 */ lbz r0, 4(r26) -/* 8003AA64 98 03 00 03 */ stb r0, 3(r3) -/* 8003AA68 88 BA 00 03 */ lbz r5, 3(r26) -/* 8003AA6C 88 02 83 F0 */ lbz r0, l_alphaCompInfo(r2) -/* 8003AA70 54 04 2C F4 */ rlwinm r4, r0, 5, 0x13, 0x1a -/* 8003AA74 88 1A 00 02 */ lbz r0, 2(r26) -/* 8003AA78 54 00 1D 78 */ rlwinm r0, r0, 3, 0x15, 0x1c -/* 8003AA7C 7C 00 2A 14 */ add r0, r0, r5 -/* 8003AA80 7C 04 02 14 */ add r0, r4, r0 -/* 8003AA84 B0 03 00 00 */ sth r0, 0(r3) -/* 8003AA88 7E A3 AB 78 */ mr r3, r21 -/* 8003AA8C 38 80 00 00 */ li r4, 0 -/* 8003AA90 81 95 00 00 */ lwz r12, 0(r21) -/* 8003AA94 81 8C 00 5C */ lwz r12, 0x5c(r12) -/* 8003AA98 7D 89 03 A6 */ mtctr r12 -/* 8003AA9C 4E 80 04 21 */ bctrl -/* 8003AAA0 3B 39 00 01 */ addi r25, r25, 1 -lbl_8003AAA4: -/* 8003AAA4 57 23 04 3E */ clrlwi r3, r25, 0x10 -/* 8003AAA8 A0 17 00 5C */ lhz r0, 0x5c(r23) -/* 8003AAAC 7C 03 00 40 */ cmplw r3, r0 -/* 8003AAB0 41 80 FE 20 */ blt lbl_8003A8D0 -/* 8003AAB4 39 61 00 50 */ addi r11, r1, 0x50 -/* 8003AAB8 48 32 77 4D */ bl _restgpr_20 -/* 8003AABC 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8003AAC0 7C 08 03 A6 */ mtlr r0 -/* 8003AAC4 38 21 00 50 */ addi r1, r1, 0x50 -/* 8003AAC8 4E 80 00 20 */ blr diff --git a/asm/d/d_resorce/deleteArchiveRes__11dRes_info_cFv.s b/asm/d/d_resorce/deleteArchiveRes__11dRes_info_cFv.s deleted file mode 100644 index a719dc86807..00000000000 --- a/asm/d/d_resorce/deleteArchiveRes__11dRes_info_cFv.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_8003B998: -/* 8003B998 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8003B99C 7C 08 02 A6 */ mflr r0 -/* 8003B9A0 90 01 00 44 */ stw r0, 0x44(r1) -/* 8003B9A4 39 61 00 40 */ addi r11, r1, 0x40 -/* 8003B9A8 48 32 68 21 */ bl _savegpr_24 -/* 8003B9AC 7C 7D 1B 78 */ mr r29, r3 -/* 8003B9B0 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8003B9B4 83 E3 00 48 */ lwz r31, 0x48(r3) -/* 8003B9B8 3B C0 00 00 */ li r30, 0 -/* 8003B9BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8003B9C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003B9C4 3F 83 00 02 */ addis r28, r3, 2 -/* 8003B9C8 3B 9C C2 F8 */ addi r28, r28, -15624 -/* 8003B9CC 48 00 00 A4 */ b lbl_8003BA70 -lbl_8003B9D0: -/* 8003B9D0 80 7F 00 00 */ lwz r3, 0(r31) -/* 8003B9D4 3C 03 BE AE */ addis r0, r3, 0xbeae -/* 8003B9D8 28 00 43 20 */ cmplwi r0, 0x4320 -/* 8003B9DC 40 82 00 8C */ bne lbl_8003BA68 -/* 8003B9E0 83 7F 00 0C */ lwz r27, 0xc(r31) -/* 8003B9E4 3B 40 00 00 */ li r26, 0 -/* 8003B9E8 48 00 00 74 */ b lbl_8003BA5C -lbl_8003B9EC: -/* 8003B9EC 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 8003B9F0 7F 64 DB 78 */ mr r4, r27 -/* 8003B9F4 48 29 A8 69 */ bl getFileAttribute__10JKRArchiveCFUl -/* 8003B9F8 54 60 07 FF */ clrlwi. r0, r3, 0x1f -/* 8003B9FC 41 82 00 58 */ beq lbl_8003BA54 -/* 8003BA00 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 8003BA04 7F 64 DB 78 */ mr r4, r27 -/* 8003BA08 48 29 AC 7D */ bl findIdxResource__10JKRArchiveCFUl -/* 8003BA0C 80 03 00 04 */ lwz r0, 4(r3) -/* 8003BA10 54 04 02 3E */ clrlwi r4, r0, 8 -/* 8003BA14 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 8003BA18 80 03 00 54 */ lwz r0, 0x54(r3) -/* 8003BA1C 7F 20 22 14 */ add r25, r0, r4 -/* 8003BA20 7F 23 CB 78 */ mr r3, r25 -/* 8003BA24 48 32 D1 C1 */ bl strlen -/* 8003BA28 3B 03 FF FC */ addi r24, r3, -4 -/* 8003BA2C 38 61 00 08 */ addi r3, r1, 8 -/* 8003BA30 7F 24 CB 78 */ mr r4, r25 -/* 8003BA34 7F 05 C3 78 */ mr r5, r24 -/* 8003BA38 48 32 D0 B1 */ bl strncpy -/* 8003BA3C 38 00 00 00 */ li r0, 0 -/* 8003BA40 38 61 00 08 */ addi r3, r1, 8 -/* 8003BA44 7C 03 C1 AE */ stbx r0, r3, r24 -/* 8003BA48 7F 84 E3 78 */ mr r4, r28 -/* 8003BA4C 38 A0 00 80 */ li r5, 0x80 -/* 8003BA50 48 00 07 45 */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci -lbl_8003BA54: -/* 8003BA54 3B 7B 00 01 */ addi r27, r27, 1 -/* 8003BA58 3B 5A 00 01 */ addi r26, r26, 1 -lbl_8003BA5C: -/* 8003BA5C A0 1F 00 0A */ lhz r0, 0xa(r31) -/* 8003BA60 7C 1A 00 00 */ cmpw r26, r0 -/* 8003BA64 41 80 FF 88 */ blt lbl_8003B9EC -lbl_8003BA68: -/* 8003BA68 3B FF 00 10 */ addi r31, r31, 0x10 -/* 8003BA6C 3B DE 00 01 */ addi r30, r30, 1 -lbl_8003BA70: -/* 8003BA70 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 8003BA74 80 63 00 44 */ lwz r3, 0x44(r3) -/* 8003BA78 80 03 00 00 */ lwz r0, 0(r3) -/* 8003BA7C 7C 1E 00 00 */ cmpw r30, r0 -/* 8003BA80 41 80 FF 50 */ blt lbl_8003B9D0 -/* 8003BA84 39 61 00 40 */ addi r11, r1, 0x40 -/* 8003BA88 48 32 67 8D */ bl _restgpr_24 -/* 8003BA8C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8003BA90 7C 08 03 A6 */ mtlr r0 -/* 8003BA94 38 21 00 40 */ addi r1, r1, 0x40 -/* 8003BA98 4E 80 00 20 */ blr diff --git a/asm/d/d_resorce/deleteRes__14dRes_control_cFPCcP11dRes_info_ci.s b/asm/d/d_resorce/deleteRes__14dRes_control_cFPCcP11dRes_info_ci.s deleted file mode 100644 index 647151cf603..00000000000 --- a/asm/d/d_resorce/deleteRes__14dRes_control_cFPCcP11dRes_info_ci.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8003C194: -/* 8003C194 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003C198 7C 08 02 A6 */ mflr r0 -/* 8003C19C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003C1A0 48 00 00 45 */ bl getResInfo__14dRes_control_cFPCcP11dRes_info_ci -/* 8003C1A4 28 03 00 00 */ cmplwi r3, 0 -/* 8003C1A8 40 82 00 0C */ bne lbl_8003C1B4 -/* 8003C1AC 38 60 00 00 */ li r3, 0 -/* 8003C1B0 48 00 00 24 */ b lbl_8003C1D4 -lbl_8003C1B4: -/* 8003C1B4 A0 83 00 0C */ lhz r4, 0xc(r3) -/* 8003C1B8 38 04 FF FF */ addi r0, r4, -1 -/* 8003C1BC B0 03 00 0C */ sth r0, 0xc(r3) -/* 8003C1C0 54 00 04 3F */ clrlwi. r0, r0, 0x10 -/* 8003C1C4 40 82 00 0C */ bne lbl_8003C1D0 -/* 8003C1C8 38 80 FF FF */ li r4, -1 -/* 8003C1CC 4B FF E0 B5 */ bl __dt__11dRes_info_cFv -lbl_8003C1D0: -/* 8003C1D0 38 60 00 01 */ li r3, 1 -lbl_8003C1D4: -/* 8003C1D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003C1D8 7C 08 03 A6 */ mtlr r0 -/* 8003C1DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003C1E0 4E 80 00 20 */ blr diff --git a/asm/d/d_resorce/dump_long__11dRes_info_cFP11dRes_info_ci.s b/asm/d/d_resorce/dump_long__11dRes_info_cFP11dRes_info_ci.s deleted file mode 100644 index df2e78227b9..00000000000 --- a/asm/d/d_resorce/dump_long__11dRes_info_cFP11dRes_info_ci.s +++ /dev/null @@ -1,73 +0,0 @@ -lbl_8003BD2C: -/* 8003BD2C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8003BD30 7C 08 02 A6 */ mflr r0 -/* 8003BD34 90 01 00 44 */ stw r0, 0x44(r1) -/* 8003BD38 39 61 00 40 */ addi r11, r1, 0x40 -/* 8003BD3C 48 32 64 91 */ bl _savegpr_25 -/* 8003BD40 7C 7E 1B 78 */ mr r30, r3 -/* 8003BD44 7C 9F 23 78 */ mr r31, r4 -/* 8003BD48 3C 60 80 38 */ lis r3, d_d_resorce__stringBase0@ha /* 0x803798B8@ha */ -/* 8003BD4C 38 63 98 B8 */ addi r3, r3, d_d_resorce__stringBase0@l /* 0x803798B8@l */ -/* 8003BD50 38 63 00 E3 */ addi r3, r3, 0xe3 -/* 8003BD54 7F C4 F3 78 */ mr r4, r30 -/* 8003BD58 7F E5 FB 78 */ mr r5, r31 -/* 8003BD5C 4C C6 31 82 */ crclr 6 -/* 8003BD60 48 2A C8 69 */ bl JUTReportConsole_f -/* 8003BD64 3C 60 80 38 */ lis r3, d_d_resorce__stringBase0@ha /* 0x803798B8@ha */ -/* 8003BD68 38 63 98 B8 */ addi r3, r3, d_d_resorce__stringBase0@l /* 0x803798B8@l */ -/* 8003BD6C 38 63 01 03 */ addi r3, r3, 0x103 -/* 8003BD70 4C C6 31 82 */ crclr 6 -/* 8003BD74 48 2A C8 55 */ bl JUTReportConsole_f -/* 8003BD78 3B 80 00 00 */ li r28, 0 -/* 8003BD7C 48 00 00 9C */ b lbl_8003BE18 -lbl_8003BD80: -/* 8003BD80 A0 1E 00 0C */ lhz r0, 0xc(r30) -/* 8003BD84 2C 00 00 00 */ cmpwi r0, 0 -/* 8003BD88 41 82 00 88 */ beq lbl_8003BE10 -/* 8003BD8C 83 BE 00 14 */ lwz r29, 0x14(r30) -/* 8003BD90 3B 60 00 00 */ li r27, 0 -/* 8003BD94 3B 40 00 00 */ li r26, 0 -/* 8003BD98 28 1D 00 00 */ cmplwi r29, 0 -/* 8003BD9C 41 82 00 18 */ beq lbl_8003BDB4 -/* 8003BDA0 7F A3 EB 78 */ mr r3, r29 -/* 8003BDA4 4B FF FC F9 */ bl getArcHeader__FP10JKRArchive -/* 8003BDA8 7C 7B 1B 78 */ mr r27, r3 -/* 8003BDAC 4B FF FF 55 */ bl myGetMemBlockSize0__FPv -/* 8003BDB0 7C 7A 1B 78 */ mr r26, r3 -lbl_8003BDB4: -/* 8003BDB4 83 3E 00 1C */ lwz r25, 0x1c(r30) -/* 8003BDB8 39 40 00 00 */ li r10, 0 -/* 8003BDBC 28 19 00 00 */ cmplwi r25, 0 -/* 8003BDC0 41 82 00 10 */ beq lbl_8003BDD0 -/* 8003BDC4 7F 23 CB 78 */ mr r3, r25 -/* 8003BDC8 4B FF FF 39 */ bl myGetMemBlockSize0__FPv -/* 8003BDCC 7C 6A 1B 78 */ mr r10, r3 -lbl_8003BDD0: -/* 8003BDD0 80 1E 00 20 */ lwz r0, 0x20(r30) -/* 8003BDD4 90 01 00 08 */ stw r0, 8(r1) -/* 8003BDD8 A0 1E 00 0C */ lhz r0, 0xc(r30) -/* 8003BDDC 90 01 00 0C */ stw r0, 0xc(r1) -/* 8003BDE0 93 C1 00 10 */ stw r30, 0x10(r1) -/* 8003BDE4 3C 60 80 38 */ lis r3, d_d_resorce__stringBase0@ha /* 0x803798B8@ha */ -/* 8003BDE8 38 63 98 B8 */ addi r3, r3, d_d_resorce__stringBase0@l /* 0x803798B8@l */ -/* 8003BDEC 38 63 01 51 */ addi r3, r3, 0x151 -/* 8003BDF0 7F 84 E3 78 */ mr r4, r28 -/* 8003BDF4 80 BE 00 10 */ lwz r5, 0x10(r30) -/* 8003BDF8 7F A6 EB 78 */ mr r6, r29 -/* 8003BDFC 7F 67 DB 78 */ mr r7, r27 -/* 8003BE00 7F 48 D3 78 */ mr r8, r26 -/* 8003BE04 7F 29 CB 78 */ mr r9, r25 -/* 8003BE08 4C C6 31 82 */ crclr 6 -/* 8003BE0C 48 2A C7 BD */ bl JUTReportConsole_f -lbl_8003BE10: -/* 8003BE10 3B DE 00 24 */ addi r30, r30, 0x24 -/* 8003BE14 3B 9C 00 01 */ addi r28, r28, 1 -lbl_8003BE18: -/* 8003BE18 7C 1C F8 00 */ cmpw r28, r31 -/* 8003BE1C 41 80 FF 64 */ blt lbl_8003BD80 -/* 8003BE20 39 61 00 40 */ addi r11, r1, 0x40 -/* 8003BE24 48 32 63 F5 */ bl _restgpr_25 -/* 8003BE28 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8003BE2C 7C 08 03 A6 */ mtlr r0 -/* 8003BE30 38 21 00 40 */ addi r1, r1, 0x40 -/* 8003BE34 4E 80 00 20 */ blr diff --git a/asm/d/d_resorce/getArcHeader__FP10JKRArchive.s b/asm/d/d_resorce/getArcHeader__FP10JKRArchive.s deleted file mode 100644 index 068dbfdb7ef..00000000000 --- a/asm/d/d_resorce/getArcHeader__FP10JKRArchive.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8003BA9C: -/* 8003BA9C 28 03 00 00 */ cmplwi r3, 0 -/* 8003BAA0 41 82 00 1C */ beq lbl_8003BABC -/* 8003BAA4 88 03 00 3C */ lbz r0, 0x3c(r3) -/* 8003BAA8 2C 00 00 01 */ cmpwi r0, 1 -/* 8003BAAC 41 82 00 08 */ beq lbl_8003BAB4 -/* 8003BAB0 48 00 00 0C */ b lbl_8003BABC -lbl_8003BAB4: -/* 8003BAB4 80 63 00 64 */ lwz r3, 0x64(r3) -/* 8003BAB8 4E 80 00 20 */ blr -lbl_8003BABC: -/* 8003BABC 38 60 00 00 */ li r3, 0 -/* 8003BAC0 4E 80 00 20 */ blr diff --git a/asm/d/d_resorce/getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci.s b/asm/d/d_resorce/getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci.s deleted file mode 100644 index 127c59d9f6c..00000000000 --- a/asm/d/d_resorce/getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_8003C400: -/* 8003C400 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003C404 7C 08 02 A6 */ mflr r0 -/* 8003C408 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003C40C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003C410 93 C1 00 08 */ stw r30, 8(r1) -/* 8003C414 7C 9E 23 78 */ mr r30, r4 -/* 8003C418 7C A4 2B 78 */ mr r4, r5 -/* 8003C41C 7C C5 33 78 */ mr r5, r6 -/* 8003C420 4B FF FE 69 */ bl getResInfoLoaded__14dRes_control_cFPCcP11dRes_info_ci -/* 8003C424 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8003C428 40 82 00 08 */ bne lbl_8003C430 -/* 8003C42C 48 00 00 2C */ b lbl_8003C458 -lbl_8003C430: -/* 8003C430 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8003C434 7F C4 F3 78 */ mr r4, r30 -/* 8003C438 4B FD 2D E9 */ bl mDoExt_resIDToIndex__FP10JKRArchiveUs -/* 8003C43C 2C 03 00 00 */ cmpwi r3, 0 -/* 8003C440 40 80 00 0C */ bge lbl_8003C44C -/* 8003C444 38 60 00 00 */ li r3, 0 -/* 8003C448 48 00 00 10 */ b lbl_8003C458 -lbl_8003C44C: -/* 8003C44C 80 9F 00 20 */ lwz r4, 0x20(r31) -/* 8003C450 54 60 10 3A */ slwi r0, r3, 2 -/* 8003C454 7C 64 00 2E */ lwzx r3, r4, r0 -lbl_8003C458: -/* 8003C458 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003C45C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8003C460 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003C464 7C 08 03 A6 */ mtlr r0 -/* 8003C468 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003C46C 4E 80 00 20 */ blr diff --git a/asm/d/d_resorce/getRes__14dRes_control_cFPCcPCcP11dRes_info_ci.s b/asm/d/d_resorce/getRes__14dRes_control_cFPCcPCcP11dRes_info_ci.s deleted file mode 100644 index 3c6046de810..00000000000 --- a/asm/d/d_resorce/getRes__14dRes_control_cFPCcPCcP11dRes_info_ci.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8003C37C: -/* 8003C37C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003C380 7C 08 02 A6 */ mflr r0 -/* 8003C384 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003C388 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003C38C 48 32 5E 51 */ bl _savegpr_29 -/* 8003C390 7C 9D 23 78 */ mr r29, r4 -/* 8003C394 7C A4 2B 78 */ mr r4, r5 -/* 8003C398 7C C5 33 78 */ mr r5, r6 -/* 8003C39C 4B FF FE ED */ bl getResInfoLoaded__14dRes_control_cFPCcP11dRes_info_ci -/* 8003C3A0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8003C3A4 40 82 00 08 */ bne lbl_8003C3AC -/* 8003C3A8 48 00 00 40 */ b lbl_8003C3E8 -lbl_8003C3AC: -/* 8003C3AC 83 DF 00 14 */ lwz r30, 0x14(r31) -/* 8003C3B0 7F C3 F3 78 */ mr r3, r30 -/* 8003C3B4 7F A4 EB 78 */ mr r4, r29 -/* 8003C3B8 48 29 A2 F5 */ bl findNameResource__10JKRArchiveCFPCc -/* 8003C3BC 28 03 00 00 */ cmplwi r3, 0 -/* 8003C3C0 41 82 00 24 */ beq lbl_8003C3E4 -/* 8003C3C4 80 9F 00 20 */ lwz r4, 0x20(r31) -/* 8003C3C8 80 1E 00 4C */ lwz r0, 0x4c(r30) -/* 8003C3CC 7C 60 18 50 */ subf r3, r0, r3 -/* 8003C3D0 38 00 00 14 */ li r0, 0x14 -/* 8003C3D4 7C 03 03 D6 */ divw r0, r3, r0 -/* 8003C3D8 54 00 10 3A */ slwi r0, r0, 2 -/* 8003C3DC 7C 64 00 2E */ lwzx r3, r4, r0 -/* 8003C3E0 48 00 00 08 */ b lbl_8003C3E8 -lbl_8003C3E4: -/* 8003C3E4 38 60 00 00 */ li r3, 0 -lbl_8003C3E8: -/* 8003C3E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003C3EC 48 32 5E 3D */ bl _restgpr_29 -/* 8003C3F0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003C3F4 7C 08 03 A6 */ mtlr r0 -/* 8003C3F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003C3FC 4E 80 00 20 */ blr diff --git a/asm/d/d_resorce/getRes__14dRes_control_cFPCclP11dRes_info_ci.s b/asm/d/d_resorce/getRes__14dRes_control_cFPCclP11dRes_info_ci.s deleted file mode 100644 index 39f02d4e7a7..00000000000 --- a/asm/d/d_resorce/getRes__14dRes_control_cFPCclP11dRes_info_ci.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8003C2EC: -/* 8003C2EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003C2F0 7C 08 02 A6 */ mflr r0 -/* 8003C2F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003C2F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003C2FC 93 C1 00 08 */ stw r30, 8(r1) -/* 8003C300 7C 7E 1B 78 */ mr r30, r3 -/* 8003C304 7C 9F 23 78 */ mr r31, r4 -/* 8003C308 7C A4 2B 78 */ mr r4, r5 -/* 8003C30C 7C C5 33 78 */ mr r5, r6 -/* 8003C310 4B FF FF 79 */ bl getResInfoLoaded__14dRes_control_cFPCcP11dRes_info_ci -/* 8003C314 28 03 00 00 */ cmplwi r3, 0 -/* 8003C318 40 82 00 08 */ bne lbl_8003C320 -/* 8003C31C 48 00 00 48 */ b lbl_8003C364 -lbl_8003C320: -/* 8003C320 80 83 00 14 */ lwz r4, 0x14(r3) -/* 8003C324 80 84 00 44 */ lwz r4, 0x44(r4) -/* 8003C328 80 C4 00 08 */ lwz r6, 8(r4) -/* 8003C32C 7C 1F 30 00 */ cmpw r31, r6 -/* 8003C330 41 80 00 28 */ blt lbl_8003C358 -/* 8003C334 3C 60 80 38 */ lis r3, d_d_resorce__stringBase0@ha /* 0x803798B8@ha */ -/* 8003C338 38 63 98 B8 */ addi r3, r3, d_d_resorce__stringBase0@l /* 0x803798B8@l */ -/* 8003C33C 38 63 02 E8 */ addi r3, r3, 0x2e8 -/* 8003C340 7F C4 F3 78 */ mr r4, r30 -/* 8003C344 7F E5 FB 78 */ mr r5, r31 -/* 8003C348 4C C6 31 82 */ crclr 6 -/* 8003C34C 4B FC A8 C1 */ bl OSReport_Error -/* 8003C350 38 60 00 00 */ li r3, 0 -/* 8003C354 48 00 00 10 */ b lbl_8003C364 -lbl_8003C358: -/* 8003C358 80 63 00 20 */ lwz r3, 0x20(r3) -/* 8003C35C 57 E0 10 3A */ slwi r0, r31, 2 -/* 8003C360 7C 63 00 2E */ lwzx r3, r3, r0 -lbl_8003C364: -/* 8003C364 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003C368 83 C1 00 08 */ lwz r30, 8(r1) -/* 8003C36C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003C370 7C 08 03 A6 */ mtlr r0 -/* 8003C374 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003C378 4E 80 00 20 */ blr diff --git a/asm/d/d_resorce/offWarpMaterial__11dRes_info_cFP12J3DModelData.s b/asm/d/d_resorce/offWarpMaterial__11dRes_info_cFP12J3DModelData.s deleted file mode 100644 index 9c33221c5c9..00000000000 --- a/asm/d/d_resorce/offWarpMaterial__11dRes_info_cFP12J3DModelData.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_8003AC1C: -/* 8003AC1C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003AC20 7C 08 02 A6 */ mflr r0 -/* 8003AC24 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003AC28 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003AC2C 48 32 75 A9 */ bl _savegpr_27 -/* 8003AC30 7C 7B 1B 78 */ mr r27, r3 -/* 8003AC34 3B 80 00 00 */ li r28, 0 -/* 8003AC38 48 00 00 A8 */ b lbl_8003ACE0 -lbl_8003AC3C: -/* 8003AC3C 80 7B 00 60 */ lwz r3, 0x60(r27) -/* 8003AC40 57 80 13 BA */ rlwinm r0, r28, 2, 0xe, 0x1d -/* 8003AC44 7F E3 00 2E */ lwzx r31, r3, r0 -/* 8003AC48 83 DF 00 2C */ lwz r30, 0x2c(r31) -/* 8003AC4C 7F C3 F3 78 */ mr r3, r30 -/* 8003AC50 81 9E 00 00 */ lwz r12, 0(r30) -/* 8003AC54 81 8C 00 98 */ lwz r12, 0x98(r12) -/* 8003AC58 7D 89 03 A6 */ mtctr r12 -/* 8003AC5C 4E 80 04 21 */ bctrl -/* 8003AC60 7C 60 1B 78 */ mr r0, r3 -/* 8003AC64 7F C3 F3 78 */ mr r3, r30 -/* 8003AC68 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8003AC6C 3B A4 FF FF */ addi r29, r4, -1 -/* 8003AC70 7F A4 EB 78 */ mr r4, r29 -/* 8003AC74 81 9E 00 00 */ lwz r12, 0(r30) -/* 8003AC78 81 8C 00 5C */ lwz r12, 0x5c(r12) -/* 8003AC7C 7D 89 03 A6 */ mtctr r12 -/* 8003AC80 4E 80 04 21 */ bctrl -/* 8003AC84 88 03 00 01 */ lbz r0, 1(r3) -/* 8003AC88 28 00 00 03 */ cmplwi r0, 3 -/* 8003AC8C 40 82 00 64 */ bne lbl_8003ACF0 -/* 8003AC90 7F C3 F3 78 */ mr r3, r30 -/* 8003AC94 57 A4 06 3E */ clrlwi r4, r29, 0x18 -/* 8003AC98 81 9E 00 00 */ lwz r12, 0(r30) -/* 8003AC9C 81 8C 00 94 */ lwz r12, 0x94(r12) -/* 8003ACA0 7D 89 03 A6 */ mtctr r12 -/* 8003ACA4 4E 80 04 21 */ bctrl -/* 8003ACA8 83 DF 00 28 */ lwz r30, 0x28(r31) -/* 8003ACAC 7F C3 F3 78 */ mr r3, r30 -/* 8003ACB0 81 9E 00 00 */ lwz r12, 0(r30) -/* 8003ACB4 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 8003ACB8 7D 89 03 A6 */ mtctr r12 -/* 8003ACBC 4E 80 04 21 */ bctrl -/* 8003ACC0 7C 64 1B 78 */ mr r4, r3 -/* 8003ACC4 7F C3 F3 78 */ mr r3, r30 -/* 8003ACC8 38 84 FF FF */ addi r4, r4, -1 -/* 8003ACCC 81 9E 00 00 */ lwz r12, 0(r30) -/* 8003ACD0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8003ACD4 7D 89 03 A6 */ mtctr r12 -/* 8003ACD8 4E 80 04 21 */ bctrl -/* 8003ACDC 3B 9C 00 01 */ addi r28, r28, 1 -lbl_8003ACE0: -/* 8003ACE0 57 83 04 3E */ clrlwi r3, r28, 0x10 -/* 8003ACE4 A0 1B 00 5C */ lhz r0, 0x5c(r27) -/* 8003ACE8 7C 03 00 40 */ cmplw r3, r0 -/* 8003ACEC 41 80 FF 50 */ blt lbl_8003AC3C -lbl_8003ACF0: -/* 8003ACF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003ACF4 48 32 75 2D */ bl _restgpr_27 -/* 8003ACF8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003ACFC 7C 08 03 A6 */ mtlr r0 -/* 8003AD00 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003AD04 4E 80 00 20 */ blr diff --git a/asm/d/d_resorce/onWarpMaterial__11dRes_info_cFP12J3DModelData.s b/asm/d/d_resorce/onWarpMaterial__11dRes_info_cFP12J3DModelData.s deleted file mode 100644 index 36a925719b4..00000000000 --- a/asm/d/d_resorce/onWarpMaterial__11dRes_info_cFP12J3DModelData.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_8003AB30: -/* 8003AB30 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003AB34 7C 08 02 A6 */ mflr r0 -/* 8003AB38 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003AB3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003AB40 48 32 76 95 */ bl _savegpr_27 -/* 8003AB44 7C 7B 1B 78 */ mr r27, r3 -/* 8003AB48 3B 80 00 00 */ li r28, 0 -/* 8003AB4C 48 00 00 A8 */ b lbl_8003ABF4 -lbl_8003AB50: -/* 8003AB50 80 7B 00 60 */ lwz r3, 0x60(r27) -/* 8003AB54 57 80 13 BA */ rlwinm r0, r28, 2, 0xe, 0x1d -/* 8003AB58 7F E3 00 2E */ lwzx r31, r3, r0 -/* 8003AB5C 83 DF 00 2C */ lwz r30, 0x2c(r31) -/* 8003AB60 7F C3 F3 78 */ mr r3, r30 -/* 8003AB64 81 9E 00 00 */ lwz r12, 0(r30) -/* 8003AB68 81 8C 00 98 */ lwz r12, 0x98(r12) -/* 8003AB6C 7D 89 03 A6 */ mtctr r12 -/* 8003AB70 4E 80 04 21 */ bctrl -/* 8003AB74 7C 60 1B 78 */ mr r0, r3 -/* 8003AB78 7F C3 F3 78 */ mr r3, r30 -/* 8003AB7C 54 1D 06 3E */ clrlwi r29, r0, 0x18 -/* 8003AB80 38 9D FF FF */ addi r4, r29, -1 -/* 8003AB84 81 9E 00 00 */ lwz r12, 0(r30) -/* 8003AB88 81 8C 00 5C */ lwz r12, 0x5c(r12) -/* 8003AB8C 7D 89 03 A6 */ mtctr r12 -/* 8003AB90 4E 80 04 21 */ bctrl -/* 8003AB94 88 03 00 01 */ lbz r0, 1(r3) -/* 8003AB98 28 00 00 03 */ cmplwi r0, 3 -/* 8003AB9C 41 82 00 68 */ beq lbl_8003AC04 -/* 8003ABA0 7F C3 F3 78 */ mr r3, r30 -/* 8003ABA4 38 1D 00 01 */ addi r0, r29, 1 -/* 8003ABA8 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8003ABAC 81 9E 00 00 */ lwz r12, 0(r30) -/* 8003ABB0 81 8C 00 94 */ lwz r12, 0x94(r12) -/* 8003ABB4 7D 89 03 A6 */ mtctr r12 -/* 8003ABB8 4E 80 04 21 */ bctrl -/* 8003ABBC 83 DF 00 28 */ lwz r30, 0x28(r31) -/* 8003ABC0 7F C3 F3 78 */ mr r3, r30 -/* 8003ABC4 81 9E 00 00 */ lwz r12, 0(r30) -/* 8003ABC8 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 8003ABCC 7D 89 03 A6 */ mtctr r12 -/* 8003ABD0 4E 80 04 21 */ bctrl -/* 8003ABD4 7C 64 1B 78 */ mr r4, r3 -/* 8003ABD8 7F C3 F3 78 */ mr r3, r30 -/* 8003ABDC 38 84 00 01 */ addi r4, r4, 1 -/* 8003ABE0 81 9E 00 00 */ lwz r12, 0(r30) -/* 8003ABE4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8003ABE8 7D 89 03 A6 */ mtctr r12 -/* 8003ABEC 4E 80 04 21 */ bctrl -/* 8003ABF0 3B 9C 00 01 */ addi r28, r28, 1 -lbl_8003ABF4: -/* 8003ABF4 57 83 04 3E */ clrlwi r3, r28, 0x10 -/* 8003ABF8 A0 1B 00 5C */ lhz r0, 0x5c(r27) -/* 8003ABFC 7C 03 00 40 */ cmplw r3, r0 -/* 8003AC00 41 80 FF 50 */ blt lbl_8003AB50 -lbl_8003AC04: -/* 8003AC04 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003AC08 48 32 76 19 */ bl _restgpr_27 -/* 8003AC0C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003AC10 7C 08 03 A6 */ mtlr r0 -/* 8003AC14 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003AC18 4E 80 00 20 */ blr diff --git a/asm/d/d_resorce/setIndirectTex__FP12J3DModelData.s b/asm/d/d_resorce/setIndirectTex__FP12J3DModelData.s deleted file mode 100644 index 9a5fd38e97f..00000000000 --- a/asm/d/d_resorce/setIndirectTex__FP12J3DModelData.s +++ /dev/null @@ -1,234 +0,0 @@ -lbl_8003A490: -/* 8003A490 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003A494 7C 08 02 A6 */ mflr r0 -/* 8003A498 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003A49C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003A4A0 48 32 7D 35 */ bl _savegpr_27 -/* 8003A4A4 83 C3 00 6C */ lwz r30, 0x6c(r3) -/* 8003A4A8 28 1E 00 00 */ cmplwi r30, 0 -/* 8003A4AC 41 82 03 58 */ beq lbl_8003A804 -/* 8003A4B0 83 A3 00 70 */ lwz r29, 0x70(r3) -/* 8003A4B4 28 1D 00 00 */ cmplwi r29, 0 -/* 8003A4B8 41 82 03 4C */ beq lbl_8003A804 -/* 8003A4BC 3B 60 00 00 */ li r27, 0 -/* 8003A4C0 3C 60 80 38 */ lis r3, d_d_resorce__stringBase0@ha /* 0x803798B8@ha */ -/* 8003A4C4 3B E3 98 B8 */ addi r31, r3, d_d_resorce__stringBase0@l /* 0x803798B8@l */ -/* 8003A4C8 48 00 03 2C */ b lbl_8003A7F4 -lbl_8003A4CC: -/* 8003A4CC 7F A3 EB 78 */ mr r3, r29 -/* 8003A4D0 7F 64 DB 78 */ mr r4, r27 -/* 8003A4D4 48 2A 46 25 */ bl getName__10JUTNameTabCFUs -/* 8003A4D8 7C 7C 1B 78 */ mr r28, r3 -/* 8003A4DC 38 9F 00 09 */ addi r4, r31, 9 -/* 8003A4E0 38 A0 00 0C */ li r5, 0xc -/* 8003A4E4 48 32 BB A9 */ bl memcmp -/* 8003A4E8 2C 03 00 00 */ cmpwi r3, 0 -/* 8003A4EC 40 82 00 F4 */ bne lbl_8003A5E0 -/* 8003A4F0 80 8D 86 4C */ lwz r4, mFrameBufferTimg__13mDoGph_gInf_c(r13) -/* 8003A4F4 80 7E 00 04 */ lwz r3, 4(r30) -/* 8003A4F8 57 60 2A F4 */ rlwinm r0, r27, 5, 0xb, 0x1a -/* 8003A4FC 7C 63 02 14 */ add r3, r3, r0 -/* 8003A500 88 A4 00 00 */ lbz r5, 0(r4) -/* 8003A504 98 A3 00 00 */ stb r5, 0(r3) -/* 8003A508 88 A4 00 01 */ lbz r5, 1(r4) -/* 8003A50C 98 A3 00 01 */ stb r5, 1(r3) -/* 8003A510 A0 A4 00 02 */ lhz r5, 2(r4) -/* 8003A514 B0 A3 00 02 */ sth r5, 2(r3) -/* 8003A518 A0 A4 00 04 */ lhz r5, 4(r4) -/* 8003A51C B0 A3 00 04 */ sth r5, 4(r3) -/* 8003A520 88 A4 00 06 */ lbz r5, 6(r4) -/* 8003A524 98 A3 00 06 */ stb r5, 6(r3) -/* 8003A528 88 A4 00 07 */ lbz r5, 7(r4) -/* 8003A52C 98 A3 00 07 */ stb r5, 7(r3) -/* 8003A530 88 A4 00 08 */ lbz r5, 8(r4) -/* 8003A534 98 A3 00 08 */ stb r5, 8(r3) -/* 8003A538 88 A4 00 09 */ lbz r5, 9(r4) -/* 8003A53C 98 A3 00 09 */ stb r5, 9(r3) -/* 8003A540 A0 A4 00 0A */ lhz r5, 0xa(r4) -/* 8003A544 B0 A3 00 0A */ sth r5, 0xa(r3) -/* 8003A548 80 A4 00 0C */ lwz r5, 0xc(r4) -/* 8003A54C 90 A3 00 0C */ stw r5, 0xc(r3) -/* 8003A550 88 A4 00 10 */ lbz r5, 0x10(r4) -/* 8003A554 98 A3 00 10 */ stb r5, 0x10(r3) -/* 8003A558 88 A4 00 11 */ lbz r5, 0x11(r4) -/* 8003A55C 98 A3 00 11 */ stb r5, 0x11(r3) -/* 8003A560 88 A4 00 12 */ lbz r5, 0x12(r4) -/* 8003A564 98 A3 00 12 */ stb r5, 0x12(r3) -/* 8003A568 88 A4 00 13 */ lbz r5, 0x13(r4) -/* 8003A56C 98 A3 00 13 */ stb r5, 0x13(r3) -/* 8003A570 88 A4 00 14 */ lbz r5, 0x14(r4) -/* 8003A574 98 A3 00 14 */ stb r5, 0x14(r3) -/* 8003A578 88 A4 00 15 */ lbz r5, 0x15(r4) -/* 8003A57C 98 A3 00 15 */ stb r5, 0x15(r3) -/* 8003A580 88 A4 00 16 */ lbz r5, 0x16(r4) -/* 8003A584 98 A3 00 16 */ stb r5, 0x16(r3) -/* 8003A588 88 A4 00 17 */ lbz r5, 0x17(r4) -/* 8003A58C 98 A3 00 17 */ stb r5, 0x17(r3) -/* 8003A590 88 A4 00 18 */ lbz r5, 0x18(r4) -/* 8003A594 98 A3 00 18 */ stb r5, 0x18(r3) -/* 8003A598 88 A4 00 19 */ lbz r5, 0x19(r4) -/* 8003A59C 98 A3 00 19 */ stb r5, 0x19(r3) -/* 8003A5A0 A8 A4 00 1A */ lha r5, 0x1a(r4) -/* 8003A5A4 B0 A3 00 1A */ sth r5, 0x1a(r3) -/* 8003A5A8 80 A4 00 1C */ lwz r5, 0x1c(r4) -/* 8003A5AC 90 A3 00 1C */ stw r5, 0x1c(r3) -/* 8003A5B0 80 7E 00 04 */ lwz r3, 4(r30) -/* 8003A5B4 7C A3 02 14 */ add r5, r3, r0 -/* 8003A5B8 80 65 00 1C */ lwz r3, 0x1c(r5) -/* 8003A5BC 7C 64 1A 14 */ add r3, r4, r3 -/* 8003A5C0 7C 65 18 50 */ subf r3, r5, r3 -/* 8003A5C4 90 65 00 1C */ stw r3, 0x1c(r5) -/* 8003A5C8 80 7E 00 04 */ lwz r3, 4(r30) -/* 8003A5CC 7C 63 02 14 */ add r3, r3, r0 -/* 8003A5D0 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8003A5D4 7C 04 02 14 */ add r0, r4, r0 -/* 8003A5D8 7C 03 00 50 */ subf r0, r3, r0 -/* 8003A5DC 90 03 00 0C */ stw r0, 0xc(r3) -lbl_8003A5E0: -/* 8003A5E0 7F 83 E3 78 */ mr r3, r28 -/* 8003A5E4 38 9F 00 15 */ addi r4, r31, 0x15 -/* 8003A5E8 38 A0 00 06 */ li r5, 6 -/* 8003A5EC 48 32 BA A1 */ bl memcmp -/* 8003A5F0 2C 03 00 00 */ cmpwi r3, 0 -/* 8003A5F4 40 82 00 F4 */ bne lbl_8003A6E8 -/* 8003A5F8 80 8D 86 4C */ lwz r4, mFrameBufferTimg__13mDoGph_gInf_c(r13) -/* 8003A5FC 80 7E 00 04 */ lwz r3, 4(r30) -/* 8003A600 57 60 2A F4 */ rlwinm r0, r27, 5, 0xb, 0x1a -/* 8003A604 7C 63 02 14 */ add r3, r3, r0 -/* 8003A608 88 A4 00 00 */ lbz r5, 0(r4) -/* 8003A60C 98 A3 00 00 */ stb r5, 0(r3) -/* 8003A610 88 A4 00 01 */ lbz r5, 1(r4) -/* 8003A614 98 A3 00 01 */ stb r5, 1(r3) -/* 8003A618 A0 A4 00 02 */ lhz r5, 2(r4) -/* 8003A61C B0 A3 00 02 */ sth r5, 2(r3) -/* 8003A620 A0 A4 00 04 */ lhz r5, 4(r4) -/* 8003A624 B0 A3 00 04 */ sth r5, 4(r3) -/* 8003A628 88 A4 00 06 */ lbz r5, 6(r4) -/* 8003A62C 98 A3 00 06 */ stb r5, 6(r3) -/* 8003A630 88 A4 00 07 */ lbz r5, 7(r4) -/* 8003A634 98 A3 00 07 */ stb r5, 7(r3) -/* 8003A638 88 A4 00 08 */ lbz r5, 8(r4) -/* 8003A63C 98 A3 00 08 */ stb r5, 8(r3) -/* 8003A640 88 A4 00 09 */ lbz r5, 9(r4) -/* 8003A644 98 A3 00 09 */ stb r5, 9(r3) -/* 8003A648 A0 A4 00 0A */ lhz r5, 0xa(r4) -/* 8003A64C B0 A3 00 0A */ sth r5, 0xa(r3) -/* 8003A650 80 A4 00 0C */ lwz r5, 0xc(r4) -/* 8003A654 90 A3 00 0C */ stw r5, 0xc(r3) -/* 8003A658 88 A4 00 10 */ lbz r5, 0x10(r4) -/* 8003A65C 98 A3 00 10 */ stb r5, 0x10(r3) -/* 8003A660 88 A4 00 11 */ lbz r5, 0x11(r4) -/* 8003A664 98 A3 00 11 */ stb r5, 0x11(r3) -/* 8003A668 88 A4 00 12 */ lbz r5, 0x12(r4) -/* 8003A66C 98 A3 00 12 */ stb r5, 0x12(r3) -/* 8003A670 88 A4 00 13 */ lbz r5, 0x13(r4) -/* 8003A674 98 A3 00 13 */ stb r5, 0x13(r3) -/* 8003A678 88 A4 00 14 */ lbz r5, 0x14(r4) -/* 8003A67C 98 A3 00 14 */ stb r5, 0x14(r3) -/* 8003A680 88 A4 00 15 */ lbz r5, 0x15(r4) -/* 8003A684 98 A3 00 15 */ stb r5, 0x15(r3) -/* 8003A688 88 A4 00 16 */ lbz r5, 0x16(r4) -/* 8003A68C 98 A3 00 16 */ stb r5, 0x16(r3) -/* 8003A690 88 A4 00 17 */ lbz r5, 0x17(r4) -/* 8003A694 98 A3 00 17 */ stb r5, 0x17(r3) -/* 8003A698 88 A4 00 18 */ lbz r5, 0x18(r4) -/* 8003A69C 98 A3 00 18 */ stb r5, 0x18(r3) -/* 8003A6A0 88 A4 00 19 */ lbz r5, 0x19(r4) -/* 8003A6A4 98 A3 00 19 */ stb r5, 0x19(r3) -/* 8003A6A8 A8 A4 00 1A */ lha r5, 0x1a(r4) -/* 8003A6AC B0 A3 00 1A */ sth r5, 0x1a(r3) -/* 8003A6B0 80 A4 00 1C */ lwz r5, 0x1c(r4) -/* 8003A6B4 90 A3 00 1C */ stw r5, 0x1c(r3) -/* 8003A6B8 80 7E 00 04 */ lwz r3, 4(r30) -/* 8003A6BC 7C A3 02 14 */ add r5, r3, r0 -/* 8003A6C0 80 65 00 1C */ lwz r3, 0x1c(r5) -/* 8003A6C4 7C 64 1A 14 */ add r3, r4, r3 -/* 8003A6C8 7C 65 18 50 */ subf r3, r5, r3 -/* 8003A6CC 90 65 00 1C */ stw r3, 0x1c(r5) -/* 8003A6D0 80 7E 00 04 */ lwz r3, 4(r30) -/* 8003A6D4 7C 63 02 14 */ add r3, r3, r0 -/* 8003A6D8 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8003A6DC 7C 04 02 14 */ add r0, r4, r0 -/* 8003A6E0 7C 03 00 50 */ subf r0, r3, r0 -/* 8003A6E4 90 03 00 0C */ stw r0, 0xc(r3) -lbl_8003A6E8: -/* 8003A6E8 7F 83 E3 78 */ mr r3, r28 -/* 8003A6EC 38 9F 00 1B */ addi r4, r31, 0x1b -/* 8003A6F0 38 A0 00 08 */ li r5, 8 -/* 8003A6F4 48 32 B9 99 */ bl memcmp -/* 8003A6F8 2C 03 00 00 */ cmpwi r3, 0 -/* 8003A6FC 40 82 00 F4 */ bne lbl_8003A7F0 -/* 8003A700 80 8D 86 54 */ lwz r4, mZbufferTimg__13mDoGph_gInf_c(r13) -/* 8003A704 80 7E 00 04 */ lwz r3, 4(r30) -/* 8003A708 57 60 2A F4 */ rlwinm r0, r27, 5, 0xb, 0x1a -/* 8003A70C 7C 63 02 14 */ add r3, r3, r0 -/* 8003A710 88 A4 00 00 */ lbz r5, 0(r4) -/* 8003A714 98 A3 00 00 */ stb r5, 0(r3) -/* 8003A718 88 A4 00 01 */ lbz r5, 1(r4) -/* 8003A71C 98 A3 00 01 */ stb r5, 1(r3) -/* 8003A720 A0 A4 00 02 */ lhz r5, 2(r4) -/* 8003A724 B0 A3 00 02 */ sth r5, 2(r3) -/* 8003A728 A0 A4 00 04 */ lhz r5, 4(r4) -/* 8003A72C B0 A3 00 04 */ sth r5, 4(r3) -/* 8003A730 88 A4 00 06 */ lbz r5, 6(r4) -/* 8003A734 98 A3 00 06 */ stb r5, 6(r3) -/* 8003A738 88 A4 00 07 */ lbz r5, 7(r4) -/* 8003A73C 98 A3 00 07 */ stb r5, 7(r3) -/* 8003A740 88 A4 00 08 */ lbz r5, 8(r4) -/* 8003A744 98 A3 00 08 */ stb r5, 8(r3) -/* 8003A748 88 A4 00 09 */ lbz r5, 9(r4) -/* 8003A74C 98 A3 00 09 */ stb r5, 9(r3) -/* 8003A750 A0 A4 00 0A */ lhz r5, 0xa(r4) -/* 8003A754 B0 A3 00 0A */ sth r5, 0xa(r3) -/* 8003A758 80 A4 00 0C */ lwz r5, 0xc(r4) -/* 8003A75C 90 A3 00 0C */ stw r5, 0xc(r3) -/* 8003A760 88 A4 00 10 */ lbz r5, 0x10(r4) -/* 8003A764 98 A3 00 10 */ stb r5, 0x10(r3) -/* 8003A768 88 A4 00 11 */ lbz r5, 0x11(r4) -/* 8003A76C 98 A3 00 11 */ stb r5, 0x11(r3) -/* 8003A770 88 A4 00 12 */ lbz r5, 0x12(r4) -/* 8003A774 98 A3 00 12 */ stb r5, 0x12(r3) -/* 8003A778 88 A4 00 13 */ lbz r5, 0x13(r4) -/* 8003A77C 98 A3 00 13 */ stb r5, 0x13(r3) -/* 8003A780 88 A4 00 14 */ lbz r5, 0x14(r4) -/* 8003A784 98 A3 00 14 */ stb r5, 0x14(r3) -/* 8003A788 88 A4 00 15 */ lbz r5, 0x15(r4) -/* 8003A78C 98 A3 00 15 */ stb r5, 0x15(r3) -/* 8003A790 88 A4 00 16 */ lbz r5, 0x16(r4) -/* 8003A794 98 A3 00 16 */ stb r5, 0x16(r3) -/* 8003A798 88 A4 00 17 */ lbz r5, 0x17(r4) -/* 8003A79C 98 A3 00 17 */ stb r5, 0x17(r3) -/* 8003A7A0 88 A4 00 18 */ lbz r5, 0x18(r4) -/* 8003A7A4 98 A3 00 18 */ stb r5, 0x18(r3) -/* 8003A7A8 88 A4 00 19 */ lbz r5, 0x19(r4) -/* 8003A7AC 98 A3 00 19 */ stb r5, 0x19(r3) -/* 8003A7B0 A8 A4 00 1A */ lha r5, 0x1a(r4) -/* 8003A7B4 B0 A3 00 1A */ sth r5, 0x1a(r3) -/* 8003A7B8 80 A4 00 1C */ lwz r5, 0x1c(r4) -/* 8003A7BC 90 A3 00 1C */ stw r5, 0x1c(r3) -/* 8003A7C0 80 7E 00 04 */ lwz r3, 4(r30) -/* 8003A7C4 7C A3 02 14 */ add r5, r3, r0 -/* 8003A7C8 80 65 00 1C */ lwz r3, 0x1c(r5) -/* 8003A7CC 7C 64 1A 14 */ add r3, r4, r3 -/* 8003A7D0 7C 65 18 50 */ subf r3, r5, r3 -/* 8003A7D4 90 65 00 1C */ stw r3, 0x1c(r5) -/* 8003A7D8 80 7E 00 04 */ lwz r3, 4(r30) -/* 8003A7DC 7C 63 02 14 */ add r3, r3, r0 -/* 8003A7E0 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8003A7E4 7C 04 02 14 */ add r0, r4, r0 -/* 8003A7E8 7C 03 00 50 */ subf r0, r3, r0 -/* 8003A7EC 90 03 00 0C */ stw r0, 0xc(r3) -lbl_8003A7F0: -/* 8003A7F0 3B 7B 00 01 */ addi r27, r27, 1 -lbl_8003A7F4: -/* 8003A7F4 57 63 04 3E */ clrlwi r3, r27, 0x10 -/* 8003A7F8 A0 1E 00 00 */ lhz r0, 0(r30) -/* 8003A7FC 7C 03 00 40 */ cmplw r3, r0 -/* 8003A800 41 80 FC CC */ blt lbl_8003A4CC -lbl_8003A804: -/* 8003A804 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003A808 48 32 7A 19 */ bl _restgpr_27 -/* 8003A80C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003A810 7C 08 03 A6 */ mtlr r0 -/* 8003A814 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003A818 4E 80 00 20 */ blr diff --git a/asm/d/d_resorce/setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap.s b/asm/d/d_resorce/setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap.s deleted file mode 100644 index bce74b16583..00000000000 --- a/asm/d/d_resorce/setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_8003C078: -/* 8003C078 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8003C07C 7C 08 02 A6 */ mflr r0 -/* 8003C080 90 01 00 34 */ stw r0, 0x34(r1) -/* 8003C084 39 61 00 30 */ addi r11, r1, 0x30 -/* 8003C088 48 32 61 45 */ bl _savegpr_25 -/* 8003C08C 7C 79 1B 78 */ mr r25, r3 -/* 8003C090 7C 9A 23 78 */ mr r26, r4 -/* 8003C094 7C BB 2B 78 */ mr r27, r5 -/* 8003C098 7C DC 33 78 */ mr r28, r6 -/* 8003C09C 7C FD 3B 78 */ mr r29, r7 -/* 8003C0A0 7D 1E 43 78 */ mr r30, r8 -/* 8003C0A4 48 00 01 41 */ bl getResInfo__14dRes_control_cFPCcP11dRes_info_ci -/* 8003C0A8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8003C0AC 40 82 00 8C */ bne lbl_8003C138 -/* 8003C0B0 7F 43 D3 78 */ mr r3, r26 -/* 8003C0B4 7F 64 DB 78 */ mr r4, r27 -/* 8003C0B8 48 00 01 A9 */ bl newResInfo__14dRes_control_cFP11dRes_info_ci -/* 8003C0BC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8003C0C0 40 82 00 30 */ bne lbl_8003C0F0 -/* 8003C0C4 3C 60 80 38 */ lis r3, d_d_resorce__stringBase0@ha /* 0x803798B8@ha */ -/* 8003C0C8 38 63 98 B8 */ addi r3, r3, d_d_resorce__stringBase0@l /* 0x803798B8@l */ -/* 8003C0CC 38 63 02 41 */ addi r3, r3, 0x241 -/* 8003C0D0 7F 24 CB 78 */ mr r4, r25 -/* 8003C0D4 4C C6 31 82 */ crclr 6 -/* 8003C0D8 4B FC AB 35 */ bl OSReport_Error -/* 8003C0DC 7F E3 FB 78 */ mr r3, r31 -/* 8003C0E0 38 80 FF FF */ li r4, -1 -/* 8003C0E4 4B FF E1 9D */ bl __dt__11dRes_info_cFv -/* 8003C0E8 38 60 00 00 */ li r3, 0 -/* 8003C0EC 48 00 00 5C */ b lbl_8003C148 -lbl_8003C0F0: -/* 8003C0F0 7F 24 CB 78 */ mr r4, r25 -/* 8003C0F4 7F 85 E3 78 */ mr r5, r28 -/* 8003C0F8 7F A6 EB 78 */ mr r6, r29 -/* 8003C0FC 7F C7 F3 78 */ mr r7, r30 -/* 8003C100 4B FF E2 49 */ bl set__11dRes_info_cFPCcPCcUcP7JKRHeap -/* 8003C104 2C 03 00 00 */ cmpwi r3, 0 -/* 8003C108 40 82 00 30 */ bne lbl_8003C138 -/* 8003C10C 3C 60 80 38 */ lis r3, d_d_resorce__stringBase0@ha /* 0x803798B8@ha */ -/* 8003C110 38 63 98 B8 */ addi r3, r3, d_d_resorce__stringBase0@l /* 0x803798B8@l */ -/* 8003C114 38 63 02 88 */ addi r3, r3, 0x288 -/* 8003C118 7F 24 CB 78 */ mr r4, r25 -/* 8003C11C 4C C6 31 82 */ crclr 6 -/* 8003C120 4B FC AA ED */ bl OSReport_Error -/* 8003C124 7F E3 FB 78 */ mr r3, r31 -/* 8003C128 38 80 FF FF */ li r4, -1 -/* 8003C12C 4B FF E1 55 */ bl __dt__11dRes_info_cFv -/* 8003C130 38 60 00 00 */ li r3, 0 -/* 8003C134 48 00 00 14 */ b lbl_8003C148 -lbl_8003C138: -/* 8003C138 A0 7F 00 0C */ lhz r3, 0xc(r31) -/* 8003C13C 38 03 00 01 */ addi r0, r3, 1 -/* 8003C140 B0 1F 00 0C */ sth r0, 0xc(r31) -/* 8003C144 38 60 00 01 */ li r3, 1 -lbl_8003C148: -/* 8003C148 39 61 00 30 */ addi r11, r1, 0x30 -/* 8003C14C 48 32 60 CD */ bl _restgpr_25 -/* 8003C150 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8003C154 7C 08 03 A6 */ mtlr r0 -/* 8003C158 38 21 00 30 */ addi r1, r1, 0x30 -/* 8003C15C 4E 80 00 20 */ blr diff --git a/asm/d/d_resorce/setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff.s b/asm/d/d_resorce/setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff.s deleted file mode 100644 index 119207bbfde..00000000000 --- a/asm/d/d_resorce/setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_8003AD08: -/* 8003AD08 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8003AD0C 7C 08 02 A6 */ mflr r0 -/* 8003AD10 90 01 00 34 */ stw r0, 0x34(r1) -/* 8003AD14 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 8003AD18 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 8003AD1C DB C1 00 10 */ stfd f30, 0x10(r1) -/* 8003AD20 F3 C1 00 18 */ psq_st f30, 24(r1), 0, 0 /* qr0 */ -/* 8003AD24 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003AD28 93 C1 00 08 */ stw r30, 8(r1) -/* 8003AD2C 7C 9E 23 78 */ mr r30, r4 -/* 8003AD30 FF C0 08 90 */ fmr f30, f1 -/* 8003AD34 FF E0 10 90 */ fmr f31, f2 -/* 8003AD38 80 63 00 60 */ lwz r3, 0x60(r3) -/* 8003AD3C 80 63 00 00 */ lwz r3, 0(r3) -/* 8003AD40 83 E3 00 28 */ lwz r31, 0x28(r3) -/* 8003AD44 7F E3 FB 78 */ mr r3, r31 -/* 8003AD48 81 9F 00 00 */ lwz r12, 0(r31) -/* 8003AD4C 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 8003AD50 7D 89 03 A6 */ mtctr r12 -/* 8003AD54 4E 80 04 21 */ bctrl -/* 8003AD58 7C 64 1B 78 */ mr r4, r3 -/* 8003AD5C 7F E3 FB 78 */ mr r3, r31 -/* 8003AD60 38 84 FF FF */ addi r4, r4, -1 -/* 8003AD64 81 9F 00 00 */ lwz r12, 0(r31) -/* 8003AD68 81 8C 00 50 */ lwz r12, 0x50(r12) -/* 8003AD6C 7D 89 03 A6 */ mtctr r12 -/* 8003AD70 4E 80 04 21 */ bctrl -/* 8003AD74 7C 7F 1B 78 */ mr r31, r3 -/* 8003AD78 D3 C3 00 1C */ stfs f30, 0x1c(r3) -/* 8003AD7C D3 E3 00 20 */ stfs f31, 0x20(r3) -/* 8003AD80 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8003AD84 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8003AD88 C0 1E 00 00 */ lfs f0, 0(r30) -/* 8003AD8C FC 20 00 50 */ fneg f1, f0 -/* 8003AD90 C0 1E 00 04 */ lfs f0, 4(r30) -/* 8003AD94 FC 40 00 50 */ fneg f2, f0 -/* 8003AD98 C0 1E 00 08 */ lfs f0, 8(r30) -/* 8003AD9C FC 60 00 50 */ fneg f3, f0 -/* 8003ADA0 48 30 BB 49 */ bl PSMTXTrans -/* 8003ADA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8003ADA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003ADAC 88 03 5D B0 */ lbz r0, 0x5db0(r3) -/* 8003ADB0 7C 00 07 74 */ extsb r0, r0 -/* 8003ADB4 1C 00 00 38 */ mulli r0, r0, 0x38 -/* 8003ADB8 7C 63 02 14 */ add r3, r3, r0 -/* 8003ADBC 80 63 5D 74 */ lwz r3, 0x5d74(r3) -/* 8003ADC0 A8 83 02 32 */ lha r4, 0x232(r3) -/* 8003ADC4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8003ADC8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8003ADCC 4B FD 16 69 */ bl mDoMtx_YrotM__FPA4_fs -/* 8003ADD0 3C 60 80 38 */ lis r3, l_texMtxInfo@ha /* 0x80379840@ha */ -/* 8003ADD4 38 63 98 40 */ addi r3, r3, l_texMtxInfo@l /* 0x80379840@l */ -/* 8003ADD8 38 63 00 24 */ addi r3, r3, 0x24 -/* 8003ADDC 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8003ADE0 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8003ADE4 38 BF 00 24 */ addi r5, r31, 0x24 -/* 8003ADE8 48 30 B6 FD */ bl PSMTXConcat -/* 8003ADEC E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 8003ADF0 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 8003ADF4 E3 C1 00 18 */ psq_l f30, 24(r1), 0, 0 /* qr0 */ -/* 8003ADF8 CB C1 00 10 */ lfd f30, 0x10(r1) -/* 8003ADFC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003AE00 83 C1 00 08 */ lwz r30, 8(r1) -/* 8003AE04 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8003AE08 7C 08 03 A6 */ mtlr r0 -/* 8003AE0C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8003AE10 4E 80 00 20 */ blr diff --git a/asm/d/d_tresure/addData__7dTres_cFPQ27dTres_c10list_classSc.s b/asm/d/d_tresure/addData__7dTres_cFPQ27dTres_c10list_classSc.s deleted file mode 100644 index d50b918bf61..00000000000 --- a/asm/d/d_tresure/addData__7dTres_cFPQ27dTres_c10list_classSc.s +++ /dev/null @@ -1,101 +0,0 @@ -lbl_8009BCB4: -/* 8009BCB4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8009BCB8 7C 08 02 A6 */ mflr r0 -/* 8009BCBC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8009BCC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009BCC4 48 2C 65 0D */ bl _savegpr_26 -/* 8009BCC8 7C 7B 1B 78 */ mr r27, r3 -/* 8009BCCC 7C 9C 23 78 */ mr r28, r4 -/* 8009BCD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009BCD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009BCD8 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 8009BCDC 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8009BCE0 7D 89 03 A6 */ mtctr r12 -/* 8009BCE4 4E 80 04 21 */ bctrl -/* 8009BCE8 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8009BCEC 54 00 87 7E */ rlwinm r0, r0, 0x10, 0x1d, 0x1f -/* 8009BCF0 28 00 00 03 */ cmplwi r0, 3 -/* 8009BCF4 41 82 01 1C */ beq lbl_8009BE10 -/* 8009BCF8 4B FF FF 75 */ bl reset__7dTres_cFv -/* 8009BCFC 83 FB 00 04 */ lwz r31, 4(r27) -/* 8009BD00 80 6D 8A 18 */ lwz r3, mTypeGroupData__7dTres_c(r13) -/* 8009BD04 A0 0D 8A 1C */ lhz r0, mNum__7dTres_c(r13) -/* 8009BD08 1C 00 00 1C */ mulli r0, r0, 0x1c -/* 8009BD0C 7F C3 02 14 */ add r30, r3, r0 -/* 8009BD10 3B A0 00 00 */ li r29, 0 -/* 8009BD14 3C 60 80 42 */ lis r3, mTypeGroupListAll__7dTres_c@ha /* 0x80425438@ha */ -/* 8009BD18 3B 43 54 38 */ addi r26, r3, mTypeGroupListAll__7dTres_c@l /* 0x80425438@l */ -/* 8009BD1C 48 00 00 E8 */ b lbl_8009BE04 -lbl_8009BD20: -/* 8009BD20 88 1F 00 00 */ lbz r0, 0(r31) -/* 8009BD24 98 1E 00 00 */ stb r0, 0(r30) -/* 8009BD28 88 1F 00 01 */ lbz r0, 1(r31) -/* 8009BD2C 98 1E 00 01 */ stb r0, 1(r30) -/* 8009BD30 88 1F 00 02 */ lbz r0, 2(r31) -/* 8009BD34 98 1E 00 02 */ stb r0, 2(r30) -/* 8009BD38 88 1F 00 03 */ lbz r0, 3(r31) -/* 8009BD3C 98 1E 00 03 */ stb r0, 3(r30) -/* 8009BD40 80 7F 00 04 */ lwz r3, 4(r31) -/* 8009BD44 80 1F 00 08 */ lwz r0, 8(r31) -/* 8009BD48 90 7E 00 04 */ stw r3, 4(r30) -/* 8009BD4C 90 1E 00 08 */ stw r0, 8(r30) -/* 8009BD50 80 1F 00 0C */ lwz r0, 0xc(r31) -/* 8009BD54 90 1E 00 0C */ stw r0, 0xc(r30) -/* 8009BD58 88 1F 00 10 */ lbz r0, 0x10(r31) -/* 8009BD5C 98 1E 00 10 */ stb r0, 0x10(r30) -/* 8009BD60 88 1F 00 11 */ lbz r0, 0x11(r31) -/* 8009BD64 98 1E 00 11 */ stb r0, 0x11(r30) -/* 8009BD68 88 1F 00 12 */ lbz r0, 0x12(r31) -/* 8009BD6C 98 1E 00 12 */ stb r0, 0x12(r30) -/* 8009BD70 88 1F 00 13 */ lbz r0, 0x13(r31) -/* 8009BD74 98 1E 00 13 */ stb r0, 0x13(r30) -/* 8009BD78 9B 9E 00 01 */ stb r28, 1(r30) -/* 8009BD7C 38 00 00 00 */ li r0, 0 -/* 8009BD80 98 1E 00 02 */ stb r0, 2(r30) -/* 8009BD84 88 7E 00 11 */ lbz r3, 0x11(r30) -/* 8009BD88 48 00 07 29 */ bl getTypeToTypeGroupNo__7dTres_cFUc -/* 8009BD8C 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8009BD90 38 00 00 00 */ li r0, 0 -/* 8009BD94 90 1E 00 14 */ stw r0, 0x14(r30) -/* 8009BD98 98 7E 00 18 */ stb r3, 0x18(r30) -/* 8009BD9C 1C 04 00 0C */ mulli r0, r4, 0xc -/* 8009BDA0 7C 9A 02 14 */ add r4, r26, r0 -/* 8009BDA4 80 04 00 00 */ lwz r0, 0(r4) -/* 8009BDA8 28 00 00 00 */ cmplwi r0, 0 -/* 8009BDAC 40 82 00 08 */ bne lbl_8009BDB4 -/* 8009BDB0 93 C4 00 00 */ stw r30, 0(r4) -lbl_8009BDB4: -/* 8009BDB4 80 64 00 04 */ lwz r3, 4(r4) -/* 8009BDB8 28 03 00 00 */ cmplwi r3, 0 -/* 8009BDBC 41 82 00 08 */ beq lbl_8009BDC4 -/* 8009BDC0 93 C3 00 14 */ stw r30, 0x14(r3) -lbl_8009BDC4: -/* 8009BDC4 93 C4 00 04 */ stw r30, 4(r4) -/* 8009BDC8 88 64 00 08 */ lbz r3, 8(r4) -/* 8009BDCC 38 03 00 01 */ addi r0, r3, 1 -/* 8009BDD0 98 04 00 08 */ stb r0, 8(r4) -/* 8009BDD4 88 1E 00 11 */ lbz r0, 0x11(r30) -/* 8009BDD8 2C 00 00 FF */ cmpwi r0, 0xff -/* 8009BDDC 41 82 00 08 */ beq lbl_8009BDE4 -/* 8009BDE0 48 00 00 0C */ b lbl_8009BDEC -lbl_8009BDE4: -/* 8009BDE4 7F C3 F3 78 */ mr r3, r30 -/* 8009BDE8 48 00 00 41 */ bl checkTreasureBox__7dTres_cFPQ27dTres_c6data_s -lbl_8009BDEC: -/* 8009BDEC A0 6D 8A 1C */ lhz r3, mNum__7dTres_c(r13) -/* 8009BDF0 38 03 00 01 */ addi r0, r3, 1 -/* 8009BDF4 B0 0D 8A 1C */ sth r0, mNum__7dTres_c(r13) -/* 8009BDF8 3B BD 00 01 */ addi r29, r29, 1 -/* 8009BDFC 3B FF 00 14 */ addi r31, r31, 0x14 -/* 8009BE00 3B DE 00 1C */ addi r30, r30, 0x1c -lbl_8009BE04: -/* 8009BE04 80 1B 00 00 */ lwz r0, 0(r27) -/* 8009BE08 7C 1D 00 00 */ cmpw r29, r0 -/* 8009BE0C 41 80 FF 14 */ blt lbl_8009BD20 -lbl_8009BE10: -/* 8009BE10 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009BE14 48 2C 64 09 */ bl _restgpr_26 -/* 8009BE18 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8009BE1C 7C 08 03 A6 */ mtlr r0 -/* 8009BE20 38 21 00 20 */ addi r1, r1, 0x20 -/* 8009BE24 4E 80 00 20 */ blr diff --git a/asm/d/d_tresure/checkTreasureBox__7dTres_cFPQ27dTres_c6data_s.s b/asm/d/d_tresure/checkTreasureBox__7dTres_cFPQ27dTres_c6data_s.s deleted file mode 100644 index 1778dcce5ca..00000000000 --- a/asm/d/d_tresure/checkTreasureBox__7dTres_cFPQ27dTres_c6data_s.s +++ /dev/null @@ -1,225 +0,0 @@ -lbl_8009BE28: -/* 8009BE28 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 8009BE2C 7C 08 02 A6 */ mflr r0 -/* 8009BE30 90 01 00 74 */ stw r0, 0x74(r1) -/* 8009BE34 39 61 00 70 */ addi r11, r1, 0x70 -/* 8009BE38 48 2C 63 99 */ bl _savegpr_26 -/* 8009BE3C 7C 7D 1B 78 */ mr r29, r3 -/* 8009BE40 88 03 00 10 */ lbz r0, 0x10(r3) -/* 8009BE44 28 00 00 FF */ cmplwi r0, 0xff -/* 8009BE48 41 82 03 08 */ beq lbl_8009C150 -/* 8009BE4C 88 7D 00 03 */ lbz r3, 3(r29) -/* 8009BE50 28 03 00 FF */ cmplwi r3, 0xff -/* 8009BE54 41 82 02 FC */ beq lbl_8009C150 -/* 8009BE58 38 80 FF FF */ li r4, -1 -/* 8009BE5C 4B FB 59 91 */ bl dPath_GetRoomPath__Fii -/* 8009BE60 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8009BE64 41 82 02 EC */ beq lbl_8009C150 -/* 8009BE68 88 1D 00 12 */ lbz r0, 0x12(r29) -/* 8009BE6C 28 00 00 00 */ cmplwi r0, 0 -/* 8009BE70 40 82 02 80 */ bne lbl_8009C0F0 -/* 8009BE74 3B 60 00 00 */ li r27, 0 -/* 8009BE78 3B 40 00 00 */ li r26, 0 -/* 8009BE7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009BE80 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009BE84 3B C0 00 01 */ li r30, 1 -lbl_8009BE88: -/* 8009BE88 7F 83 E3 78 */ mr r3, r28 -/* 8009BE8C 88 1D 00 10 */ lbz r0, 0x10(r29) -/* 8009BE90 7C 80 D2 14 */ add r4, r0, r26 -/* 8009BE94 88 BD 00 01 */ lbz r5, 1(r29) -/* 8009BE98 7C A5 07 74 */ extsb r5, r5 -/* 8009BE9C 4B F9 94 C5 */ bl isSwitch__10dSv_info_cCFii -/* 8009BEA0 20 03 00 00 */ subfic r0, r3, 0 -/* 8009BEA4 7C 60 01 10 */ subfe r3, r0, r0 -/* 8009BEA8 7F C0 D0 30 */ slw r0, r30, r26 -/* 8009BEAC 7C 00 18 38 */ and r0, r0, r3 -/* 8009BEB0 7C 1B 02 14 */ add r0, r27, r0 -/* 8009BEB4 7C 1B 07 34 */ extsh r27, r0 -/* 8009BEB8 3B 5A 00 01 */ addi r26, r26, 1 -/* 8009BEBC 2C 1A 00 04 */ cmpwi r26, 4 -/* 8009BEC0 41 80 FF C8 */ blt lbl_8009BE88 -/* 8009BEC4 7F 60 07 35 */ extsh. r0, r27 -/* 8009BEC8 41 82 01 FC */ beq lbl_8009C0C4 -/* 8009BECC C0 42 91 E8 */ lfs f2, lit_3839(r2) -/* 8009BED0 38 1B FF FF */ addi r0, r27, -1 -/* 8009BED4 1C 60 00 18 */ mulli r3, r0, 0x18 -/* 8009BED8 38 03 00 0C */ addi r0, r3, 0xc -/* 8009BEDC C8 22 92 08 */ lfd f1, lit_3845(r2) -/* 8009BEE0 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8009BEE4 90 01 00 4C */ stw r0, 0x4c(r1) -/* 8009BEE8 3C 00 43 30 */ lis r0, 0x4330 -/* 8009BEEC 90 01 00 48 */ stw r0, 0x48(r1) -/* 8009BEF0 C8 01 00 48 */ lfd f0, 0x48(r1) -/* 8009BEF4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8009BEF8 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8009BEFC FC 00 00 1E */ fctiwz f0, f0 -/* 8009BF00 D8 01 00 50 */ stfd f0, 0x50(r1) -/* 8009BF04 83 C1 00 54 */ lwz r30, 0x54(r1) -/* 8009BF08 80 9F 00 08 */ lwz r4, 8(r31) -/* 8009BF0C C0 84 00 04 */ lfs f4, 4(r4) -/* 8009BF10 D0 81 00 3C */ stfs f4, 0x3c(r1) -/* 8009BF14 C0 04 00 08 */ lfs f0, 8(r4) -/* 8009BF18 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 8009BF1C C0 64 00 0C */ lfs f3, 0xc(r4) -/* 8009BF20 D0 61 00 44 */ stfs f3, 0x44(r1) -/* 8009BF24 A0 7F 00 00 */ lhz r3, 0(r31) -/* 8009BF28 38 03 FF FF */ addi r0, r3, -1 -/* 8009BF2C 54 03 20 36 */ slwi r3, r0, 4 -/* 8009BF30 38 63 00 04 */ addi r3, r3, 4 -/* 8009BF34 7C 64 1A 14 */ add r3, r4, r3 -/* 8009BF38 C0 43 00 00 */ lfs f2, 0(r3) -/* 8009BF3C D0 41 00 30 */ stfs f2, 0x30(r1) -/* 8009BF40 C0 03 00 04 */ lfs f0, 4(r3) -/* 8009BF44 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 8009BF48 C0 23 00 08 */ lfs f1, 8(r3) -/* 8009BF4C D0 21 00 38 */ stfs f1, 0x38(r1) -/* 8009BF50 D0 81 00 0C */ stfs f4, 0xc(r1) -/* 8009BF54 C0 02 91 EC */ lfs f0, lit_3840(r2) -/* 8009BF58 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8009BF5C D0 61 00 14 */ stfs f3, 0x14(r1) -/* 8009BF60 D0 41 00 18 */ stfs f2, 0x18(r1) -/* 8009BF64 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8009BF68 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 8009BF6C 38 61 00 0C */ addi r3, r1, 0xc -/* 8009BF70 38 81 00 18 */ addi r4, r1, 0x18 -/* 8009BF74 48 2A B4 29 */ bl PSVECSquareDistance -/* 8009BF78 C0 02 91 EC */ lfs f0, lit_3840(r2) -/* 8009BF7C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8009BF80 40 81 00 58 */ ble lbl_8009BFD8 -/* 8009BF84 FC 00 08 34 */ frsqrte f0, f1 -/* 8009BF88 C8 82 91 F0 */ lfd f4, lit_3841(r2) -/* 8009BF8C FC 44 00 32 */ fmul f2, f4, f0 -/* 8009BF90 C8 62 91 F8 */ lfd f3, lit_3842(r2) -/* 8009BF94 FC 00 00 32 */ fmul f0, f0, f0 -/* 8009BF98 FC 01 00 32 */ fmul f0, f1, f0 -/* 8009BF9C FC 03 00 28 */ fsub f0, f3, f0 -/* 8009BFA0 FC 02 00 32 */ fmul f0, f2, f0 -/* 8009BFA4 FC 44 00 32 */ fmul f2, f4, f0 -/* 8009BFA8 FC 00 00 32 */ fmul f0, f0, f0 -/* 8009BFAC FC 01 00 32 */ fmul f0, f1, f0 -/* 8009BFB0 FC 03 00 28 */ fsub f0, f3, f0 -/* 8009BFB4 FC 02 00 32 */ fmul f0, f2, f0 -/* 8009BFB8 FC 44 00 32 */ fmul f2, f4, f0 -/* 8009BFBC FC 00 00 32 */ fmul f0, f0, f0 -/* 8009BFC0 FC 01 00 32 */ fmul f0, f1, f0 -/* 8009BFC4 FC 03 00 28 */ fsub f0, f3, f0 -/* 8009BFC8 FC 02 00 32 */ fmul f0, f2, f0 -/* 8009BFCC FC 21 00 32 */ fmul f1, f1, f0 -/* 8009BFD0 FC 20 08 18 */ frsp f1, f1 -/* 8009BFD4 48 00 00 88 */ b lbl_8009C05C -lbl_8009BFD8: -/* 8009BFD8 C8 02 92 00 */ lfd f0, lit_3843(r2) -/* 8009BFDC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8009BFE0 40 80 00 10 */ bge lbl_8009BFF0 -/* 8009BFE4 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8009BFE8 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8009BFEC 48 00 00 70 */ b lbl_8009C05C -lbl_8009BFF0: -/* 8009BFF0 D0 21 00 08 */ stfs f1, 8(r1) -/* 8009BFF4 80 81 00 08 */ lwz r4, 8(r1) -/* 8009BFF8 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8009BFFC 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8009C000 7C 03 00 00 */ cmpw r3, r0 -/* 8009C004 41 82 00 14 */ beq lbl_8009C018 -/* 8009C008 40 80 00 40 */ bge lbl_8009C048 -/* 8009C00C 2C 03 00 00 */ cmpwi r3, 0 -/* 8009C010 41 82 00 20 */ beq lbl_8009C030 -/* 8009C014 48 00 00 34 */ b lbl_8009C048 -lbl_8009C018: -/* 8009C018 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8009C01C 41 82 00 0C */ beq lbl_8009C028 -/* 8009C020 38 00 00 01 */ li r0, 1 -/* 8009C024 48 00 00 28 */ b lbl_8009C04C -lbl_8009C028: -/* 8009C028 38 00 00 02 */ li r0, 2 -/* 8009C02C 48 00 00 20 */ b lbl_8009C04C -lbl_8009C030: -/* 8009C030 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8009C034 41 82 00 0C */ beq lbl_8009C040 -/* 8009C038 38 00 00 05 */ li r0, 5 -/* 8009C03C 48 00 00 10 */ b lbl_8009C04C -lbl_8009C040: -/* 8009C040 38 00 00 03 */ li r0, 3 -/* 8009C044 48 00 00 08 */ b lbl_8009C04C -lbl_8009C048: -/* 8009C048 38 00 00 04 */ li r0, 4 -lbl_8009C04C: -/* 8009C04C 2C 00 00 01 */ cmpwi r0, 1 -/* 8009C050 40 82 00 0C */ bne lbl_8009C05C -/* 8009C054 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8009C058 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8009C05C: -/* 8009C05C C0 02 91 EC */ lfs f0, lit_3840(r2) -/* 8009C060 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8009C064 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8009C068 D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 8009C06C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8009C070 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8009C074 7F C4 F3 78 */ mr r4, r30 -/* 8009C078 4B F7 03 65 */ bl mDoMtx_YrotS__FPA4_fs -/* 8009C07C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8009C080 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8009C084 38 81 00 24 */ addi r4, r1, 0x24 -/* 8009C088 7C 85 23 78 */ mr r5, r4 -/* 8009C08C 48 2A AC E1 */ bl PSMTXMultVec -/* 8009C090 38 61 00 24 */ addi r3, r1, 0x24 -/* 8009C094 38 81 00 3C */ addi r4, r1, 0x3c -/* 8009C098 7C 65 1B 78 */ mr r5, r3 -/* 8009C09C 48 2A AF F5 */ bl PSVECAdd -/* 8009C0A0 C0 01 00 34 */ lfs f0, 0x34(r1) -/* 8009C0A4 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8009C0A8 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 8009C0AC D0 1D 00 04 */ stfs f0, 4(r29) -/* 8009C0B0 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 8009C0B4 D0 1D 00 08 */ stfs f0, 8(r29) -/* 8009C0B8 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 8009C0BC D0 1D 00 0C */ stfs f0, 0xc(r29) -/* 8009C0C0 48 00 00 20 */ b lbl_8009C0E0 -lbl_8009C0C4: -/* 8009C0C4 80 7F 00 08 */ lwz r3, 8(r31) -/* 8009C0C8 C0 03 00 04 */ lfs f0, 4(r3) -/* 8009C0CC D0 1D 00 04 */ stfs f0, 4(r29) -/* 8009C0D0 C0 03 00 08 */ lfs f0, 8(r3) -/* 8009C0D4 D0 1D 00 08 */ stfs f0, 8(r29) -/* 8009C0D8 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8009C0DC D0 1D 00 0C */ stfs f0, 0xc(r29) -lbl_8009C0E0: -/* 8009C0E0 88 7D 00 01 */ lbz r3, 1(r29) -/* 8009C0E4 38 9D 00 04 */ addi r4, r29, 4 -/* 8009C0E8 4B FA 2C 79 */ bl correctionOriginPos__10dMapInfo_nFScP3Vec -/* 8009C0EC 48 00 00 64 */ b lbl_8009C150 -lbl_8009C0F0: -/* 8009C0F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009C0F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009C0F8 88 9D 00 10 */ lbz r4, 0x10(r29) -/* 8009C0FC 88 BD 00 01 */ lbz r5, 1(r29) -/* 8009C100 7C A5 07 74 */ extsb r5, r5 -/* 8009C104 4B F9 92 5D */ bl isSwitch__10dSv_info_cCFii -/* 8009C108 2C 03 00 00 */ cmpwi r3, 0 -/* 8009C10C 41 82 00 1C */ beq lbl_8009C128 -/* 8009C110 80 9F 00 08 */ lwz r4, 8(r31) -/* 8009C114 A0 7F 00 00 */ lhz r3, 0(r31) -/* 8009C118 38 03 FF FF */ addi r0, r3, -1 -/* 8009C11C 54 00 20 36 */ slwi r0, r0, 4 -/* 8009C120 7C 64 02 14 */ add r3, r4, r0 -/* 8009C124 48 00 00 08 */ b lbl_8009C12C -lbl_8009C128: -/* 8009C128 80 7F 00 08 */ lwz r3, 8(r31) -lbl_8009C12C: -/* 8009C12C C0 03 00 04 */ lfs f0, 4(r3) -/* 8009C130 D0 1D 00 04 */ stfs f0, 4(r29) -/* 8009C134 C0 03 00 08 */ lfs f0, 8(r3) -/* 8009C138 D0 1D 00 08 */ stfs f0, 8(r29) -/* 8009C13C C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8009C140 D0 1D 00 0C */ stfs f0, 0xc(r29) -/* 8009C144 88 7D 00 01 */ lbz r3, 1(r29) -/* 8009C148 38 9D 00 04 */ addi r4, r29, 4 -/* 8009C14C 4B FA 2C 15 */ bl correctionOriginPos__10dMapInfo_nFScP3Vec -lbl_8009C150: -/* 8009C150 39 61 00 70 */ addi r11, r1, 0x70 -/* 8009C154 48 2C 60 C9 */ bl _restgpr_26 -/* 8009C158 80 01 00 74 */ lwz r0, 0x74(r1) -/* 8009C15C 7C 08 03 A6 */ mtlr r0 -/* 8009C160 38 21 00 70 */ addi r1, r1, 0x70 -/* 8009C164 4E 80 00 20 */ blr diff --git a/asm/d/d_tresure/createWork__7dTres_cFv.s b/asm/d/d_tresure/createWork__7dTres_cFv.s deleted file mode 100644 index 1dfb0d1fedb..00000000000 --- a/asm/d/d_tresure/createWork__7dTres_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8009BBD8: -/* 8009BBD8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009BBDC 7C 08 02 A6 */ mflr r0 -/* 8009BBE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009BBE4 38 60 07 10 */ li r3, 0x710 -/* 8009BBE8 48 23 30 DD */ bl __nwa__FUl -/* 8009BBEC 38 80 00 00 */ li r4, 0 -/* 8009BBF0 38 A0 00 00 */ li r5, 0 -/* 8009BBF4 38 C0 00 1C */ li r6, 0x1c -/* 8009BBF8 38 E0 00 40 */ li r7, 0x40 -/* 8009BBFC 48 2C 63 19 */ bl __construct_new_array -/* 8009BC00 90 6D 8A 18 */ stw r3, mTypeGroupData__7dTres_c(r13) -/* 8009BC04 38 60 00 01 */ li r3, 1 -/* 8009BC08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009BC0C 7C 08 03 A6 */ mtlr r0 -/* 8009BC10 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009BC14 4E 80 00 20 */ blr diff --git a/asm/d/d_tresure/offStatus__7dTres_cFUcii.s b/asm/d/d_tresure/offStatus__7dTres_cFUcii.s deleted file mode 100644 index 358ebe5fbe5..00000000000 --- a/asm/d/d_tresure/offStatus__7dTres_cFUcii.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8009C1F0: -/* 8009C1F0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8009C1F4 7C 08 02 A6 */ mflr r0 -/* 8009C1F8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8009C1FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009C200 48 2C 5F D9 */ bl _savegpr_28 -/* 8009C204 7C 7D 1B 78 */ mr r29, r3 -/* 8009C208 7C 9C 23 78 */ mr r28, r4 -/* 8009C20C 7C BF 2B 78 */ mr r31, r5 -/* 8009C210 48 00 01 51 */ bl getFirstData__7dTres_cFUc -/* 8009C214 3C 80 80 42 */ lis r4, mTypeGroupListAll__7dTres_c@ha /* 0x80425438@ha */ -/* 8009C218 38 84 54 38 */ addi r4, r4, mTypeGroupListAll__7dTres_c@l /* 0x80425438@l */ -/* 8009C21C 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 8009C220 1C 00 00 0C */ mulli r0, r0, 0xc -/* 8009C224 7C 84 02 14 */ add r4, r4, r0 -/* 8009C228 8B C4 00 08 */ lbz r30, 8(r4) -/* 8009C22C 3B A0 00 00 */ li r29, 0 -/* 8009C230 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8009C234 7C 1F 00 F8 */ nor r31, r0, r0 -/* 8009C238 48 00 00 24 */ b lbl_8009C25C -lbl_8009C23C: -/* 8009C23C 88 03 00 00 */ lbz r0, 0(r3) -/* 8009C240 7C 1C 00 00 */ cmpw r28, r0 -/* 8009C244 40 82 00 10 */ bne lbl_8009C254 -/* 8009C248 88 03 00 02 */ lbz r0, 2(r3) -/* 8009C24C 7C 00 F8 38 */ and r0, r0, r31 -/* 8009C250 98 03 00 02 */ stb r0, 2(r3) -lbl_8009C254: -/* 8009C254 48 00 01 49 */ bl getNextData__7dTres_cFPQ27dTres_c15typeGroupData_c -/* 8009C258 3B BD 00 01 */ addi r29, r29, 1 -lbl_8009C25C: -/* 8009C25C 7C 1D F0 00 */ cmpw r29, r30 -/* 8009C260 41 80 FF DC */ blt lbl_8009C23C -/* 8009C264 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009C268 48 2C 5F BD */ bl _restgpr_28 -/* 8009C26C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8009C270 7C 08 03 A6 */ mtlr r0 -/* 8009C274 38 21 00 20 */ addi r1, r1, 0x20 -/* 8009C278 4E 80 00 20 */ blr diff --git a/asm/d/d_vibration/Run__12dVibration_cFv.s b/asm/d/d_vibration/Run__12dVibration_cFv.s index 4bfb117ea35..60bb70ce5a3 100644 --- a/asm/d/d_vibration/Run__12dVibration_cFv.s +++ b/asm/d/d_vibration/Run__12dVibration_cFv.s @@ -121,7 +121,7 @@ lbl_8006F404: /* 8006F40C 90 01 00 08 */ stw r0, 8(r1) /* 8006F410 80 7F 00 10 */ lwz r3, 0x10(r31) /* 8006F414 7F A4 EB 78 */ mr r4, r29 -/* 8006F418 4B FF FD C1 */ bl func_8006F1D8 +/* 8006F418 4B FF FD C1 */ bl func_8006F1D8__Fll /* 8006F41C 80 01 00 08 */ lwz r0, 8(r1) /* 8006F420 7C 00 1B 78 */ or r0, r0, r3 /* 8006F424 90 01 00 08 */ stw r0, 8(r1) @@ -154,11 +154,11 @@ lbl_8006F484: /* 8006F488 80 7F 00 30 */ lwz r3, 0x30(r31) /* 8006F48C 7F C4 F3 78 */ mr r4, r30 /* 8006F490 80 BF 00 88 */ lwz r5, 0x88(r31) -/* 8006F494 4B FF FC F1 */ bl func_8006F184 +/* 8006F494 4B FF FC F1 */ bl func_8006F184__FUlll /* 8006F498 90 61 00 08 */ stw r3, 8(r1) /* 8006F49C 80 7F 00 38 */ lwz r3, 0x38(r31) /* 8006F4A0 7F C4 F3 78 */ mr r4, r30 -/* 8006F4A4 4B FF FD 35 */ bl func_8006F1D8 +/* 8006F4A4 4B FF FD 35 */ bl func_8006F1D8__Fll /* 8006F4A8 80 01 00 08 */ lwz r0, 8(r1) /* 8006F4AC 7C 00 1B 78 */ or r0, r0, r3 /* 8006F4B0 90 01 00 08 */ stw r0, 8(r1) @@ -197,10 +197,10 @@ lbl_8006F510: /* 8006F52C 80 7F 00 30 */ lwz r3, 0x30(r31) /* 8006F530 80 9F 00 34 */ lwz r4, 0x34(r31) /* 8006F534 7F C5 F3 78 */ mr r5, r30 -/* 8006F538 4B FF FC 6D */ bl func_8006F1A4 +/* 8006F538 4B FF FC 6D */ bl func_8006F1A4__FUlll /* 8006F53C 7F C4 F3 78 */ mr r4, r30 /* 8006F540 80 BF 00 88 */ lwz r5, 0x88(r31) -/* 8006F544 4B FF FC 41 */ bl func_8006F184 +/* 8006F544 4B FF FC 41 */ bl func_8006F184__FUlll /* 8006F548 80 01 00 08 */ lwz r0, 8(r1) /* 8006F54C 7C 00 1B 78 */ or r0, r0, r3 /* 8006F550 90 01 00 08 */ stw r0, 8(r1) @@ -211,7 +211,7 @@ lbl_8006F510: /* 8006F564 7C 03 03 78 */ mr r3, r0 lbl_8006F568: /* 8006F568 7F C4 F3 78 */ mr r4, r30 -/* 8006F56C 4B FF FC 6D */ bl func_8006F1D8 +/* 8006F56C 4B FF FC 6D */ bl func_8006F1D8__Fll /* 8006F570 80 01 00 08 */ lwz r0, 8(r1) /* 8006F574 7C 00 1B 78 */ or r0, r0, r3 /* 8006F578 90 01 00 08 */ stw r0, 8(r1) @@ -351,13 +351,13 @@ lbl_8006F750: /* 8006F754 83 BF 00 58 */ lwz r29, 0x58(r31) /* 8006F758 80 7F 00 60 */ lwz r3, 0x60(r31) /* 8006F75C 7F C4 F3 78 */ mr r4, r30 -/* 8006F760 4B FF FA 79 */ bl func_8006F1D8 +/* 8006F760 4B FF FA 79 */ bl func_8006F1D8__Fll /* 8006F764 7F BD 1B 78 */ or r29, r29, r3 /* 8006F768 93 DF 00 68 */ stw r30, 0x68(r31) /* 8006F76C 38 6D 89 D0 */ la r3, data(r13) /* 80450F50-_SDA_BASE_ */ /* 8006F770 7F A4 EB 78 */ mr r4, r29 /* 8006F774 7F C5 F3 78 */ mr r5, r30 -/* 8006F778 4B FF F9 F1 */ bl func_8006F168 +/* 8006F778 4B FF F9 F1 */ bl func_8006F168__FPUsUll /* 8006F77C 7C 64 1B 78 */ mr r4, r3 /* 8006F780 3C 60 80 3E */ lis r3, m_gamePad__8mDoCPd_c@ha /* 0x803DD2D8@ha */ /* 8006F784 38 63 D2 D8 */ addi r3, r3, m_gamePad__8mDoCPd_c@l /* 0x803DD2D8@l */ @@ -372,18 +372,18 @@ lbl_8006F7A0: /* 8006F7A4 80 7F 00 74 */ lwz r3, 0x74(r31) /* 8006F7A8 7F A4 EB 78 */ mr r4, r29 /* 8006F7AC 80 BF 00 88 */ lwz r5, 0x88(r31) -/* 8006F7B0 4B FF F9 D5 */ bl func_8006F184 +/* 8006F7B0 4B FF F9 D5 */ bl func_8006F184__FUlll /* 8006F7B4 7C 7E 1B 78 */ mr r30, r3 /* 8006F7B8 80 7F 00 7C */ lwz r3, 0x7c(r31) /* 8006F7BC 7F A4 EB 78 */ mr r4, r29 -/* 8006F7C0 4B FF FA 19 */ bl func_8006F1D8 +/* 8006F7C0 4B FF FA 19 */ bl func_8006F1D8__Fll /* 8006F7C4 7F C4 1B 78 */ or r4, r30, r3 /* 8006F7C8 3C 60 80 00 */ lis r3, 0x8000 /* 0x7FFFFFFF@ha */ /* 8006F7CC 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x7FFFFFFF@l */ /* 8006F7D0 90 1F 00 84 */ stw r0, 0x84(r31) /* 8006F7D4 38 6D 89 D0 */ la r3, data(r13) /* 80450F50-_SDA_BASE_ */ /* 8006F7D8 7F A5 EB 78 */ mr r5, r29 -/* 8006F7DC 4B FF F9 8D */ bl func_8006F168 +/* 8006F7DC 4B FF F9 8D */ bl func_8006F168__FPUsUll /* 8006F7E0 7C 64 1B 78 */ mr r4, r3 /* 8006F7E4 3C 60 80 3E */ lis r3, m_gamePad__8mDoCPd_c@ha /* 0x803DD2D8@ha */ /* 8006F7E8 38 63 D2 D8 */ addi r3, r3, m_gamePad__8mDoCPd_c@l /* 0x803DD2D8@l */ @@ -402,10 +402,10 @@ lbl_8006F804: /* 8006F818 80 7F 00 74 */ lwz r3, 0x74(r31) /* 8006F81C 80 9F 00 78 */ lwz r4, 0x78(r31) /* 8006F820 7F A5 EB 78 */ mr r5, r29 -/* 8006F824 4B FF F9 81 */ bl func_8006F1A4 +/* 8006F824 4B FF F9 81 */ bl func_8006F1A4__FUlll /* 8006F828 7F A4 EB 78 */ mr r4, r29 /* 8006F82C 80 BF 00 88 */ lwz r5, 0x88(r31) -/* 8006F830 4B FF F9 55 */ bl func_8006F184 +/* 8006F830 4B FF F9 55 */ bl func_8006F184__FUlll /* 8006F834 7F DE 1B 78 */ or r30, r30, r3 /* 8006F838 80 1F 00 60 */ lwz r0, 0x60(r31) /* 8006F83C 80 7F 00 7C */ lwz r3, 0x7c(r31) @@ -414,7 +414,7 @@ lbl_8006F804: /* 8006F848 7C 03 03 78 */ mr r3, r0 lbl_8006F84C: /* 8006F84C 7F A4 EB 78 */ mr r4, r29 -/* 8006F850 4B FF F9 89 */ bl func_8006F1D8 +/* 8006F850 4B FF F9 89 */ bl func_8006F1D8__Fll /* 8006F854 7F DE 1B 78 */ or r30, r30, r3 /* 8006F858 93 BF 00 84 */ stw r29, 0x84(r31) /* 8006F85C 93 BF 00 68 */ stw r29, 0x68(r31) @@ -424,7 +424,7 @@ lbl_8006F84C: /* 8006F86C 38 6D 89 D0 */ la r3, data(r13) /* 80450F50-_SDA_BASE_ */ /* 8006F870 7F C4 F3 78 */ mr r4, r30 /* 8006F874 7F A5 EB 78 */ mr r5, r29 -/* 8006F878 4B FF F8 F1 */ bl func_8006F168 +/* 8006F878 4B FF F8 F1 */ bl func_8006F168__FPUsUll /* 8006F87C 7C 64 1B 78 */ mr r4, r3 /* 8006F880 3C 60 80 3E */ lis r3, m_gamePad__8mDoCPd_c@ha /* 0x803DD2D8@ha */ /* 8006F884 38 63 D2 D8 */ addi r3, r3, m_gamePad__8mDoCPd_c@l /* 0x803DD2D8@l */ diff --git a/asm/d/d_vibration/StartQuake__12dVibration_cFPCUcii4cXyz.s b/asm/d/d_vibration/StartQuake__12dVibration_cFPCUcii4cXyz.s deleted file mode 100644 index 63501dbb4ee..00000000000 --- a/asm/d/d_vibration/StartQuake__12dVibration_cFPCUcii4cXyz.s +++ /dev/null @@ -1,101 +0,0 @@ -lbl_8006FC0C: -/* 8006FC0C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8006FC10 7C 08 02 A6 */ mflr r0 -/* 8006FC14 90 01 00 24 */ stw r0, 0x24(r1) -/* 8006FC18 39 61 00 20 */ addi r11, r1, 0x20 -/* 8006FC1C 48 2F 25 B5 */ bl _savegpr_26 -/* 8006FC20 7C 7B 1B 78 */ mr r27, r3 -/* 8006FC24 7C 9C 23 78 */ mr r28, r4 -/* 8006FC28 7C BD 2B 78 */ mr r29, r5 -/* 8006FC2C 7C DE 33 78 */ mr r30, r6 -/* 8006FC30 3B E0 00 00 */ li r31, 0 -/* 8006FC34 88 04 00 00 */ lbz r0, 0(r4) -/* 8006FC38 88 84 00 01 */ lbz r4, 1(r4) -/* 8006FC3C 7C 83 23 78 */ mr r3, r4 -/* 8006FC40 50 03 44 2E */ rlwimi r3, r0, 8, 0x10, 0x17 -/* 8006FC44 38 00 00 09 */ li r0, 9 -/* 8006FC48 6C 05 80 00 */ xoris r5, r0, 0x8000 -/* 8006FC4C 38 03 FF F7 */ addi r0, r3, -9 -/* 8006FC50 7C 00 28 14 */ addc r0, r0, r5 -/* 8006FC54 7C A0 01 10 */ subfe r5, r0, r0 -/* 8006FC58 38 00 00 03 */ li r0, 3 -/* 8006FC5C 7C 00 28 38 */ and r0, r0, r5 -/* 8006FC60 38 A0 00 01 */ li r5, 1 -/* 8006FC64 6C A6 80 00 */ xoris r6, r5, 0x8000 -/* 8006FC68 38 A3 FF FF */ addi r5, r3, -1 -/* 8006FC6C 7C A5 30 14 */ addc r5, r5, r6 -/* 8006FC70 7C C5 29 10 */ subfe r6, r5, r5 -/* 8006FC74 38 A0 00 02 */ li r5, 2 -/* 8006FC78 7C A8 30 38 */ and r8, r5, r6 -/* 8006FC7C 38 A0 00 11 */ li r5, 0x11 -/* 8006FC80 6C A6 80 00 */ xoris r6, r5, 0x8000 -/* 8006FC84 38 A3 FF EF */ addi r5, r3, -17 -/* 8006FC88 7C A5 30 14 */ addc r5, r5, r6 -/* 8006FC8C 7C C5 29 10 */ subfe r6, r5, r5 -/* 8006FC90 38 A0 00 04 */ li r5, 4 -/* 8006FC94 7C A9 30 38 */ and r9, r5, r6 -/* 8006FC98 38 A0 00 19 */ li r5, 0x19 -/* 8006FC9C 6C A5 80 00 */ xoris r5, r5, 0x8000 -/* 8006FCA0 38 63 FF E7 */ addi r3, r3, -25 -/* 8006FCA4 7C 63 28 14 */ addc r3, r3, r5 -/* 8006FCA8 7C A3 19 10 */ subfe r5, r3, r3 -/* 8006FCAC 38 60 00 05 */ li r3, 5 -/* 8006FCB0 7C 63 28 38 */ and r3, r3, r5 -/* 8006FCB4 7C DC 18 AE */ lbzx r6, r28, r3 -/* 8006FCB8 7C BC 48 AE */ lbzx r5, r28, r9 -/* 8006FCBC 7C 7C 40 AE */ lbzx r3, r28, r8 -/* 8006FCC0 7C 1C 00 AE */ lbzx r0, r28, r0 -/* 8006FCC4 54 00 80 1E */ slwi r0, r0, 0x10 -/* 8006FCC8 50 60 C0 0E */ rlwimi r0, r3, 0x18, 0, 7 -/* 8006FCCC 50 A0 44 2E */ rlwimi r0, r5, 8, 0x10, 0x17 -/* 8006FCD0 7C DA 03 78 */ or r26, r6, r0 -/* 8006FCD4 57 C0 06 7D */ rlwinm. r0, r30, 0, 0x19, 0x1e -/* 8006FCD8 41 82 00 4C */ beq lbl_8006FD24 -/* 8006FCDC 38 00 00 00 */ li r0, 0 -/* 8006FCE0 90 1B 00 2C */ stw r0, 0x2c(r27) -/* 8006FCE4 90 1B 00 4C */ stw r0, 0x4c(r27) -/* 8006FCE8 93 DB 00 3C */ stw r30, 0x3c(r27) -/* 8006FCEC C0 07 00 00 */ lfs f0, 0(r7) -/* 8006FCF0 D0 1B 00 40 */ stfs f0, 0x40(r27) -/* 8006FCF4 C0 07 00 04 */ lfs f0, 4(r7) -/* 8006FCF8 D0 1B 00 44 */ stfs f0, 0x44(r27) -/* 8006FCFC C0 07 00 08 */ lfs f0, 8(r7) -/* 8006FD00 D0 1B 00 48 */ stfs f0, 0x48(r27) -/* 8006FD04 7F 43 D3 78 */ mr r3, r26 -/* 8006FD08 38 A0 00 20 */ li r5, 0x20 -/* 8006FD0C 4B FF F4 99 */ bl func_8006F1A4 -/* 8006FD10 90 7B 00 30 */ stw r3, 0x30(r27) -/* 8006FD14 38 00 00 20 */ li r0, 0x20 -/* 8006FD18 90 1B 00 34 */ stw r0, 0x34(r27) -/* 8006FD1C 93 BB 00 38 */ stw r29, 0x38(r27) -/* 8006FD20 3B E0 00 01 */ li r31, 1 -lbl_8006FD24: -/* 8006FD24 57 C0 07 FF */ clrlwi. r0, r30, 0x1f -/* 8006FD28 41 82 00 50 */ beq lbl_8006FD78 -/* 8006FD2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8006FD30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8006FD34 38 63 01 E0 */ addi r3, r3, 0x1e0 -/* 8006FD38 4B FC 49 0D */ bl checkVibration__19dSv_player_config_cCFv -/* 8006FD3C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8006FD40 28 00 00 01 */ cmplwi r0, 1 -/* 8006FD44 40 82 00 34 */ bne lbl_8006FD78 -/* 8006FD48 38 00 00 00 */ li r0, 0 -/* 8006FD4C 90 1B 00 70 */ stw r0, 0x70(r27) -/* 8006FD50 90 1B 00 80 */ stw r0, 0x80(r27) -/* 8006FD54 7F 43 D3 78 */ mr r3, r26 -/* 8006FD58 88 9C 00 01 */ lbz r4, 1(r28) -/* 8006FD5C 38 A0 00 20 */ li r5, 0x20 -/* 8006FD60 4B FF F4 45 */ bl func_8006F1A4 -/* 8006FD64 90 7B 00 74 */ stw r3, 0x74(r27) -/* 8006FD68 38 00 00 20 */ li r0, 0x20 -/* 8006FD6C 90 1B 00 78 */ stw r0, 0x78(r27) -/* 8006FD70 93 BB 00 7C */ stw r29, 0x7c(r27) -/* 8006FD74 3B E0 00 01 */ li r31, 1 -lbl_8006FD78: -/* 8006FD78 7F E3 FB 78 */ mr r3, r31 -/* 8006FD7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8006FD80 48 2F 24 9D */ bl _restgpr_26 -/* 8006FD84 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8006FD88 7C 08 03 A6 */ mtlr r0 -/* 8006FD8C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8006FD90 4E 80 00 20 */ blr diff --git a/asm/d/d_vibration/func_8006F168.s b/asm/d/d_vibration/func_8006F168.s deleted file mode 100644 index d1a5e094580..00000000000 --- a/asm/d/d_vibration/func_8006F168.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8006F168: -/* 8006F168 B0 A3 00 00 */ sth r5, 0(r3) -/* 8006F16C 54 80 84 3E */ srwi r0, r4, 0x10 -/* 8006F170 B0 03 00 02 */ sth r0, 2(r3) -/* 8006F174 B0 83 00 04 */ sth r4, 4(r3) -/* 8006F178 38 00 00 00 */ li r0, 0 -/* 8006F17C B0 03 00 06 */ sth r0, 6(r3) -/* 8006F180 4E 80 00 20 */ blr diff --git a/asm/d/d_vibration/func_8006F184.s b/asm/d/d_vibration/func_8006F184.s deleted file mode 100644 index 34de7726968..00000000000 --- a/asm/d/d_vibration/func_8006F184.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8006F184: -/* 8006F184 7C 05 23 D6 */ divw r0, r5, r4 -/* 8006F188 7C 00 21 D6 */ mullw r0, r0, r4 -/* 8006F18C 7C 00 28 50 */ subf r0, r0, r5 -/* 8006F190 7C 65 04 30 */ srw r5, r3, r0 -/* 8006F194 7C 00 20 50 */ subf r0, r0, r4 -/* 8006F198 7C 60 00 30 */ slw r0, r3, r0 -/* 8006F19C 7C A3 03 78 */ or r3, r5, r0 -/* 8006F1A0 4E 80 00 20 */ blr diff --git a/asm/d/d_vibration/func_8006F1A4.s b/asm/d/d_vibration/func_8006F1A4.s deleted file mode 100644 index dccbf81e507..00000000000 --- a/asm/d/d_vibration/func_8006F1A4.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8006F1A4: -/* 8006F1A4 38 C0 FF FF */ li r6, -1 -/* 8006F1A8 20 04 00 20 */ subfic r0, r4, 0x20 -/* 8006F1AC 7C C0 00 30 */ slw r0, r6, r0 -/* 8006F1B0 7C 67 00 38 */ and r7, r3, r0 -/* 8006F1B4 7C E3 3B 78 */ mr r3, r7 -/* 8006F1B8 7C 86 23 78 */ mr r6, r4 -/* 8006F1BC 48 00 00 10 */ b lbl_8006F1CC -lbl_8006F1C0: -/* 8006F1C0 7C 60 24 30 */ srw r0, r3, r4 -/* 8006F1C4 7C E3 03 78 */ or r3, r7, r0 -/* 8006F1C8 7C C6 22 14 */ add r6, r6, r4 -lbl_8006F1CC: -/* 8006F1CC 7C 06 28 00 */ cmpw r6, r5 -/* 8006F1D0 41 80 FF F0 */ blt lbl_8006F1C0 -/* 8006F1D4 4E 80 00 20 */ blr diff --git a/asm/d/d_vibration/func_8006F1D8.s b/asm/d/d_vibration/func_8006F1D8.s deleted file mode 100644 index 959117cf167..00000000000 --- a/asm/d/d_vibration/func_8006F1D8.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8006F1D8: -/* 8006F1D8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8006F1DC 7C 08 02 A6 */ mflr r0 -/* 8006F1E0 90 01 00 44 */ stw r0, 0x44(r1) -/* 8006F1E4 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 8006F1E8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 8006F1EC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8006F1F0 48 2F 2F E1 */ bl _savegpr_26 -/* 8006F1F4 7C 7A 1B 78 */ mr r26, r3 -/* 8006F1F8 3B 80 00 00 */ li r28, 0 -/* 8006F1FC 3B 60 00 00 */ li r27, 0 -/* 8006F200 CB E2 8C 20 */ lfd f31, lit_3756(r2) -/* 8006F204 6C 9D 80 00 */ xoris r29, r4, 0x8000 -/* 8006F208 3F C0 43 30 */ lis r30, 0x4330 -/* 8006F20C 3F E0 40 00 */ lis r31, 0x4000 -/* 8006F210 48 00 00 2C */ b lbl_8006F23C -lbl_8006F214: -/* 8006F214 48 1F 86 59 */ bl cM_rnd__Fv -/* 8006F218 93 A1 00 0C */ stw r29, 0xc(r1) -/* 8006F21C 93 C1 00 08 */ stw r30, 8(r1) -/* 8006F220 C8 01 00 08 */ lfd f0, 8(r1) -/* 8006F224 EC 00 F8 28 */ fsubs f0, f0, f31 -/* 8006F228 EC 20 00 72 */ fmuls f1, f0, f1 -/* 8006F22C 48 2F 2E 81 */ bl __cvt_fp2unsigned -/* 8006F230 7F E0 1E 30 */ sraw r0, r31, r3 -/* 8006F234 7F 9C 03 78 */ or r28, r28, r0 -/* 8006F238 3B 7B 00 01 */ addi r27, r27, 1 -lbl_8006F23C: -/* 8006F23C 7C 1B D0 00 */ cmpw r27, r26 -/* 8006F240 41 80 FF D4 */ blt lbl_8006F214 -/* 8006F244 7F 83 E3 78 */ mr r3, r28 -/* 8006F248 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 8006F24C CB E1 00 30 */ lfd f31, 0x30(r1) -/* 8006F250 39 61 00 30 */ addi r11, r1, 0x30 -/* 8006F254 48 2F 2F C9 */ bl _restgpr_26 -/* 8006F258 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8006F25C 7C 08 03 A6 */ mtlr r0 -/* 8006F260 38 21 00 40 */ addi r1, r1, 0x40 -/* 8006F264 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/cutEnd__16dEvent_manager_cFi.s b/asm/d/event/d_event_manager/cutEnd__16dEvent_manager_cFi.s deleted file mode 100644 index f690cc2b7bd..00000000000 --- a/asm/d/event/d_event_manager/cutEnd__16dEvent_manager_cFi.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_8004817C: -/* 8004817C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80048180 7C 08 02 A6 */ mflr r0 -/* 80048184 90 01 00 14 */ stw r0, 0x14(r1) -/* 80048188 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8004818C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80048190 88 05 4F AC */ lbz r0, 0x4fac(r5) -/* 80048194 28 00 00 00 */ cmplwi r0, 0 -/* 80048198 41 82 00 4C */ beq lbl_800481E4 -/* 8004819C 2C 04 FF FF */ cmpwi r4, -1 -/* 800481A0 41 82 00 44 */ beq lbl_800481E4 -/* 800481A4 A8 03 01 AA */ lha r0, 0x1aa(r3) -/* 800481A8 2C 00 FF FF */ cmpwi r0, -1 -/* 800481AC 41 82 00 38 */ beq lbl_800481E4 -/* 800481B0 80 03 01 B4 */ lwz r0, 0x1b4(r3) -/* 800481B4 1C 00 00 24 */ mulli r0, r0, 0x24 -/* 800481B8 7C C3 02 14 */ add r6, r3, r0 -/* 800481BC 80 A6 00 08 */ lwz r5, 8(r6) -/* 800481C0 1C 84 00 50 */ mulli r4, r4, 0x50 -/* 800481C4 38 04 00 38 */ addi r0, r4, 0x38 -/* 800481C8 7C 05 00 2E */ lwzx r0, r5, r0 -/* 800481CC 80 86 00 0C */ lwz r4, 0xc(r6) -/* 800481D0 1C 00 00 50 */ mulli r0, r0, 0x50 -/* 800481D4 7C 84 02 14 */ add r4, r4, r0 -/* 800481D8 38 63 01 BC */ addi r3, r3, 0x1bc -/* 800481DC 80 84 00 34 */ lwz r4, 0x34(r4) -/* 800481E0 4B FF BB E9 */ bl flagSet__11dEvDtFlag_cFi -lbl_800481E4: -/* 800481E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800481E8 7C 08 03 A6 */ mtlr r0 -/* 800481EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800481F0 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/getFirstRoomPointer__16renderingDAmap_cFv.s b/asm/d/map/d_map_path_dmap/getFirstRoomPointer__16renderingDAmap_cFv.s deleted file mode 100644 index 51d0aba683b..00000000000 --- a/asm/d/map/d_map_path_dmap/getFirstRoomPointer__16renderingDAmap_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80040134: -/* 80040134 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80040138 7C 08 02 A6 */ mflr r0 -/* 8004013C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80040140 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80040144 93 C1 00 08 */ stw r30, 8(r1) -/* 80040148 7C 7E 1B 78 */ mr r30, r3 -/* 8004014C 3B E0 00 00 */ li r31, 0 -/* 80040150 4B FF FE A5 */ bl getFirstDrawRoomNo__16renderingDAmap_cFv -/* 80040154 90 7E 00 24 */ stw r3, 0x24(r30) -/* 80040158 80 1E 00 24 */ lwz r0, 0x24(r30) -/* 8004015C 2C 00 00 00 */ cmpwi r0, 0 -/* 80040160 41 80 00 5C */ blt lbl_800401BC -/* 80040164 7F C3 F3 78 */ mr r3, r30 -/* 80040168 81 9E 00 00 */ lwz r12, 0(r30) -/* 8004016C 81 8C 00 68 */ lwz r12, 0x68(r12) -/* 80040170 7D 89 03 A6 */ mtctr r12 -/* 80040174 4E 80 04 21 */ bctrl -/* 80040178 90 7E 00 28 */ stw r3, 0x28(r30) -/* 8004017C 80 8D 88 E4 */ lwz r4, mLayerList__8dMpath_c(r13) -/* 80040180 80 1E 00 28 */ lwz r0, 0x28(r30) -/* 80040184 54 03 40 2E */ slwi r3, r0, 8 -/* 80040188 80 1E 00 24 */ lwz r0, 0x24(r30) -/* 8004018C 54 00 10 3A */ slwi r0, r0, 2 -/* 80040190 7C 03 02 14 */ add r0, r3, r0 -/* 80040194 7C 04 00 2E */ lwzx r0, r4, r0 -/* 80040198 7C 1F 03 78 */ mr r31, r0 -/* 8004019C 28 00 00 00 */ cmplwi r0, 0 -/* 800401A0 40 82 00 1C */ bne lbl_800401BC -/* 800401A4 7F C3 F3 78 */ mr r3, r30 -/* 800401A8 81 9E 00 00 */ lwz r12, 0(r30) -/* 800401AC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 800401B0 7D 89 03 A6 */ mtctr r12 -/* 800401B4 4E 80 04 21 */ bctrl -/* 800401B8 7C 7F 1B 78 */ mr r31, r3 -lbl_800401BC: -/* 800401BC 28 1F 00 00 */ cmplwi r31, 0 -/* 800401C0 41 82 00 0C */ beq lbl_800401CC -/* 800401C4 7F C3 F3 78 */ mr r3, r30 -/* 800401C8 4B FF FC A5 */ bl setSingleRoomSetting__16renderingDAmap_cFv -lbl_800401CC: -/* 800401CC 7F E3 FB 78 */ mr r3, r31 -/* 800401D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800401D4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800401D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800401DC 7C 08 03 A6 */ mtlr r0 -/* 800401E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800401E4 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/getMapRestartAngleY__10dMapInfo_nFv.s b/asm/d/map/d_map_path_dmap/getMapRestartAngleY__10dMapInfo_nFv.s deleted file mode 100644 index ecf075c5395..00000000000 --- a/asm/d/map/d_map_path_dmap/getMapRestartAngleY__10dMapInfo_nFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8003F0F8: -/* 8003F0F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003F0FC 7C 08 02 A6 */ mflr r0 -/* 8003F100 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003F104 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003F108 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8003F10C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003F110 AB E3 0D BA */ lha r31, 0xdba(r3) -/* 8003F114 4B FF FE 5D */ bl getConstRestartIconPointer__10dMapInfo_nFv -/* 8003F118 28 03 00 00 */ cmplwi r3, 0 -/* 8003F11C 41 82 00 34 */ beq lbl_8003F150 -/* 8003F120 88 03 00 13 */ lbz r0, 0x13(r3) -/* 8003F124 7C 00 07 74 */ extsb r0, r0 -/* 8003F128 7C 1F 03 78 */ mr r31, r0 -/* 8003F12C 7C 60 00 D0 */ neg r3, r0 -/* 8003F130 7C 60 00 78 */ andc r0, r3, r0 -/* 8003F134 54 00 0F FF */ rlwinm. r0, r0, 1, 0x1f, 0x1f -/* 8003F138 41 82 00 08 */ beq lbl_8003F140 -/* 8003F13C 7C 7F 1B 78 */ mr r31, r3 -lbl_8003F140: -/* 8003F140 57 FF 40 2E */ slwi r31, r31, 8 -/* 8003F144 28 00 00 00 */ cmplwi r0, 0 -/* 8003F148 41 82 00 08 */ beq lbl_8003F150 -/* 8003F14C 7F FF 00 D0 */ neg r31, r31 -lbl_8003F150: -/* 8003F150 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 8003F154 38 83 60 94 */ addi r4, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 8003F158 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8003F15C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003F160 88 03 0D B4 */ lbz r0, 0xdb4(r3) -/* 8003F164 7C 00 07 74 */ extsb r0, r0 -/* 8003F168 1C 00 04 04 */ mulli r0, r0, 0x404 -/* 8003F16C 7C 64 02 14 */ add r3, r4, r0 -/* 8003F170 80 63 00 20 */ lwz r3, 0x20(r3) -/* 8003F174 28 03 00 00 */ cmplwi r3, 0 -/* 8003F178 41 82 00 0C */ beq lbl_8003F184 -/* 8003F17C A8 03 00 1C */ lha r0, 0x1c(r3) -/* 8003F180 7F FF 02 14 */ add r31, r31, r0 -lbl_8003F184: -/* 8003F184 7F E3 07 34 */ extsh r3, r31 -/* 8003F188 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003F18C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003F190 7C 08 03 A6 */ mtlr r0 -/* 8003F194 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003F198 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/getNextRoomPointer__16renderingDAmap_cFv.s b/asm/d/map/d_map_path_dmap/getNextRoomPointer__16renderingDAmap_cFv.s deleted file mode 100644 index 556b9c6ab5a..00000000000 --- a/asm/d/map/d_map_path_dmap/getNextRoomPointer__16renderingDAmap_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_800401E8: -/* 800401E8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800401EC 7C 08 02 A6 */ mflr r0 -/* 800401F0 90 01 00 24 */ stw r0, 0x24(r1) -/* 800401F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800401F8 48 32 1F E5 */ bl _savegpr_29 -/* 800401FC 7C 7D 1B 78 */ mr r29, r3 -/* 80040200 3B E0 00 00 */ li r31, 0 -/* 80040204 3B C0 00 00 */ li r30, 0 -lbl_80040208: -/* 80040208 7F A3 EB 78 */ mr r3, r29 -/* 8004020C 80 9D 00 24 */ lwz r4, 0x24(r29) -/* 80040210 4B FF FE 85 */ bl getNextDrawRoomNo__16renderingDAmap_cFi -/* 80040214 90 7D 00 24 */ stw r3, 0x24(r29) -/* 80040218 80 1D 00 24 */ lwz r0, 0x24(r29) -/* 8004021C 2C 00 00 00 */ cmpwi r0, 0 -/* 80040220 40 80 00 40 */ bge lbl_80040260 -/* 80040224 7F A3 EB 78 */ mr r3, r29 -/* 80040228 80 9D 00 28 */ lwz r4, 0x28(r29) -/* 8004022C 81 9D 00 00 */ lwz r12, 0(r29) -/* 80040230 81 8C 00 6C */ lwz r12, 0x6c(r12) -/* 80040234 7D 89 03 A6 */ mtctr r12 -/* 80040238 4E 80 04 21 */ bctrl -/* 8004023C 90 7D 00 28 */ stw r3, 0x28(r29) -/* 80040240 80 1D 00 28 */ lwz r0, 0x28(r29) -/* 80040244 2C 00 00 00 */ cmpwi r0, 0 -/* 80040248 40 80 00 0C */ bge lbl_80040254 -/* 8004024C 3B C0 00 01 */ li r30, 1 -/* 80040250 48 00 00 10 */ b lbl_80040260 -lbl_80040254: -/* 80040254 7F A3 EB 78 */ mr r3, r29 -/* 80040258 4B FF FD 9D */ bl getFirstDrawRoomNo__16renderingDAmap_cFv -/* 8004025C 90 7D 00 24 */ stw r3, 0x24(r29) -lbl_80040260: -/* 80040260 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80040264 40 82 00 20 */ bne lbl_80040284 -/* 80040268 80 8D 88 E4 */ lwz r4, mLayerList__8dMpath_c(r13) -/* 8004026C 80 1D 00 28 */ lwz r0, 0x28(r29) -/* 80040270 54 03 40 2E */ slwi r3, r0, 8 -/* 80040274 80 1D 00 24 */ lwz r0, 0x24(r29) -/* 80040278 54 00 10 3A */ slwi r0, r0, 2 -/* 8004027C 7C 03 02 14 */ add r0, r3, r0 -/* 80040280 7F E4 00 2E */ lwzx r31, r4, r0 -lbl_80040284: -/* 80040284 28 1F 00 00 */ cmplwi r31, 0 -/* 80040288 40 82 00 0C */ bne lbl_80040294 -/* 8004028C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80040290 41 82 FF 78 */ beq lbl_80040208 -lbl_80040294: -/* 80040294 28 1F 00 00 */ cmplwi r31, 0 -/* 80040298 41 82 00 0C */ beq lbl_800402A4 -/* 8004029C 7F A3 EB 78 */ mr r3, r29 -/* 800402A0 4B FF FB CD */ bl setSingleRoomSetting__16renderingDAmap_cFv -lbl_800402A4: -/* 800402A4 7F E3 FB 78 */ mr r3, r31 -/* 800402A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800402AC 48 32 1F 7D */ bl _restgpr_29 -/* 800402B0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800402B4 7C 08 03 A6 */ mtlr r0 -/* 800402B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800402BC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_collect/__ct__15dMenu_Collect_cFP10JKRExpHeapP9STControlP10CSTControl.s b/asm/d/menu/d_menu_collect/__ct__15dMenu_Collect_cFP10JKRExpHeapP9STControlP10CSTControl.s deleted file mode 100644 index 32b8b38dfe1..00000000000 --- a/asm/d/menu/d_menu_collect/__ct__15dMenu_Collect_cFP10JKRExpHeapP9STControlP10CSTControl.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/__dt__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/__dt__17dMenu_Collect2D_cFv.s deleted file mode 100644 index c78dfa63b23..00000000000 --- a/asm/d/menu/d_menu_collect/__dt__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/_create__15dMenu_Collect_cFv.s b/asm/d/menu/d_menu_collect/_create__15dMenu_Collect_cFv.s deleted file mode 100644 index e4b735eb468..00000000000 --- a/asm/d/menu/d_menu_collect/_create__15dMenu_Collect_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/_create__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/_create__17dMenu_Collect2D_cFv.s deleted file mode 100644 index cfee93d47ed..00000000000 --- a/asm/d/menu/d_menu_collect/_create__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/_delete__15dMenu_Collect_cFv.s b/asm/d/menu/d_menu_collect/_delete__15dMenu_Collect_cFv.s deleted file mode 100644 index b3ab0625742..00000000000 --- a/asm/d/menu/d_menu_collect/_delete__15dMenu_Collect_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/_delete__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/_delete__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 8f456315a98..00000000000 --- a/asm/d/menu/d_menu_collect/_delete__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/_delete__17dMenu_Collect3D_cFv.s b/asm/d/menu/d_menu_collect/_delete__17dMenu_Collect3D_cFv.s deleted file mode 100644 index 3589ebdd733..00000000000 --- a/asm/d/menu/d_menu_collect/_delete__17dMenu_Collect3D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/_move__15dMenu_Collect_cFv.s b/asm/d/menu/d_menu_collect/_move__15dMenu_Collect_cFv.s deleted file mode 100644 index f437bd00cd9..00000000000 --- a/asm/d/menu/d_menu_collect/_move__15dMenu_Collect_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/drawTop__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/drawTop__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 6a3d9f6ba79..00000000000 --- a/asm/d/menu/d_menu_collect/drawTop__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/draw__15dMenu_Collect_cFv.s b/asm/d/menu/d_menu_collect/draw__15dMenu_Collect_cFv.s deleted file mode 100644 index 90e2835d910..00000000000 --- a/asm/d/menu/d_menu_collect/draw__15dMenu_Collect_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/draw__17dMenu_Collect3D_cFv.s b/asm/d/menu/d_menu_collect/draw__17dMenu_Collect3D_cFv.s deleted file mode 100644 index 14347a9effe..00000000000 --- a/asm/d/menu/d_menu_collect/draw__17dMenu_Collect3D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/fishing_close_init__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/fishing_close_init__17dMenu_Collect2D_cFv.s deleted file mode 100644 index b6710bc3b6e..00000000000 --- a/asm/d/menu/d_menu_collect/fishing_close_init__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/fishing_close_proc__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/fishing_close_proc__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 3de819b8085..00000000000 --- a/asm/d/menu/d_menu_collect/fishing_close_proc__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/fishing_move_init__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/fishing_move_init__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 237231e45cf..00000000000 --- a/asm/d/menu/d_menu_collect/fishing_move_init__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/fishing_move_proc__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/fishing_move_proc__17dMenu_Collect2D_cFv.s deleted file mode 100644 index a8c53be2d7f..00000000000 --- a/asm/d/menu/d_menu_collect/fishing_move_proc__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/fishing_open_init__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/fishing_open_init__17dMenu_Collect2D_cFv.s deleted file mode 100644 index c255926b378..00000000000 --- a/asm/d/menu/d_menu_collect/fishing_open_init__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/fishing_open_proc__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/fishing_open_proc__17dMenu_Collect2D_cFv.s deleted file mode 100644 index e16509c1c9a..00000000000 --- a/asm/d/menu/d_menu_collect/fishing_open_proc__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/getCrystalNum__17dMenu_Collect3D_cFv.s b/asm/d/menu/d_menu_collect/getCrystalNum__17dMenu_Collect3D_cFv.s deleted file mode 100644 index b5a250729d0..00000000000 --- a/asm/d/menu/d_menu_collect/getCrystalNum__17dMenu_Collect3D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/getMirrorNum__17dMenu_Collect3D_cFv.s b/asm/d/menu/d_menu_collect/getMirrorNum__17dMenu_Collect3D_cFv.s deleted file mode 100644 index 774c3ac4611..00000000000 --- a/asm/d/menu/d_menu_collect/getMirrorNum__17dMenu_Collect3D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/insect_close_init__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/insect_close_init__17dMenu_Collect2D_cFv.s deleted file mode 100644 index d56d9a4d71c..00000000000 --- a/asm/d/menu/d_menu_collect/insect_close_init__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/insect_close_proc__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/insect_close_proc__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 1bf27dd372f..00000000000 --- a/asm/d/menu/d_menu_collect/insect_close_proc__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/insect_move_init__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/insect_move_init__17dMenu_Collect2D_cFv.s deleted file mode 100644 index fc6a789de7b..00000000000 --- a/asm/d/menu/d_menu_collect/insect_move_init__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/insect_move_proc__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/insect_move_proc__17dMenu_Collect2D_cFv.s deleted file mode 100644 index fb51eb8eeee..00000000000 --- a/asm/d/menu/d_menu_collect/insect_move_proc__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/insect_open_init__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/insect_open_init__17dMenu_Collect2D_cFv.s deleted file mode 100644 index ae89badb404..00000000000 --- a/asm/d/menu/d_menu_collect/insect_open_init__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/insect_open_proc__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/insect_open_proc__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 268a38cbbb3..00000000000 --- a/asm/d/menu/d_menu_collect/insect_open_proc__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/isFishIconVisible__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/isFishIconVisible__17dMenu_Collect2D_cFv.s deleted file mode 100644 index c6687fb302e..00000000000 --- a/asm/d/menu/d_menu_collect/isFishIconVisible__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/isInsectIconVisible__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/isInsectIconVisible__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 7793f43449b..00000000000 --- a/asm/d/menu/d_menu_collect/isInsectIconVisible__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/isKeyCheck__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/isKeyCheck__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 21987149adf..00000000000 --- a/asm/d/menu/d_menu_collect/isKeyCheck__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/isSkillIconVisible__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/isSkillIconVisible__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 4a1b4c8ff8f..00000000000 --- a/asm/d/menu/d_menu_collect/isSkillIconVisible__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/letter_close_init__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/letter_close_init__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 565ed68a7f0..00000000000 --- a/asm/d/menu/d_menu_collect/letter_close_init__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/letter_close_proc__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/letter_close_proc__17dMenu_Collect2D_cFv.s deleted file mode 100644 index decf91d2949..00000000000 --- a/asm/d/menu/d_menu_collect/letter_close_proc__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/letter_move_init__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/letter_move_init__17dMenu_Collect2D_cFv.s deleted file mode 100644 index ff8345cbf00..00000000000 --- a/asm/d/menu/d_menu_collect/letter_move_init__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/letter_move_proc__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/letter_move_proc__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 0a7a0b1af13..00000000000 --- a/asm/d/menu/d_menu_collect/letter_move_proc__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/letter_open_init__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/letter_open_init__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 546ef8322ba..00000000000 --- a/asm/d/menu/d_menu_collect/letter_open_init__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/letter_open_proc__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/letter_open_proc__17dMenu_Collect2D_cFv.s deleted file mode 100644 index d1e64df4068..00000000000 --- a/asm/d/menu/d_menu_collect/letter_open_proc__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/option_close_init__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/option_close_init__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 5b6b4f985ae..00000000000 --- a/asm/d/menu/d_menu_collect/option_close_init__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/option_close_proc__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/option_close_proc__17dMenu_Collect2D_cFv.s deleted file mode 100644 index e5edc1536de..00000000000 --- a/asm/d/menu/d_menu_collect/option_close_proc__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/option_move_init__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/option_move_init__17dMenu_Collect2D_cFv.s deleted file mode 100644 index cbe9e5ef18e..00000000000 --- a/asm/d/menu/d_menu_collect/option_move_init__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/option_move_proc__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/option_move_proc__17dMenu_Collect2D_cFv.s deleted file mode 100644 index ae5529423a7..00000000000 --- a/asm/d/menu/d_menu_collect/option_move_proc__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/option_open_init__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/option_open_init__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 118220e7ae3..00000000000 --- a/asm/d/menu/d_menu_collect/option_open_init__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/option_open_proc__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/option_open_proc__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 787895b7a12..00000000000 --- a/asm/d/menu/d_menu_collect/option_open_proc__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/save_close_init__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/save_close_init__17dMenu_Collect2D_cFv.s deleted file mode 100644 index eeb29a09dba..00000000000 --- a/asm/d/menu/d_menu_collect/save_close_init__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/save_close_proc__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/save_close_proc__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 63d2eeb4148..00000000000 --- a/asm/d/menu/d_menu_collect/save_close_proc__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/save_move_init__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/save_move_init__17dMenu_Collect2D_cFv.s deleted file mode 100644 index c5395c86481..00000000000 --- a/asm/d/menu/d_menu_collect/save_move_init__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/save_move_proc__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/save_move_proc__17dMenu_Collect2D_cFv.s deleted file mode 100644 index f30b1fc94d9..00000000000 --- a/asm/d/menu/d_menu_collect/save_move_proc__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/save_open_init__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/save_open_init__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 483b6af0a47..00000000000 --- a/asm/d/menu/d_menu_collect/save_open_init__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/save_open_proc__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/save_open_proc__17dMenu_Collect2D_cFv.s deleted file mode 100644 index d26672b5599..00000000000 --- a/asm/d/menu/d_menu_collect/save_open_proc__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/setArrowMaxNum__17dMenu_Collect2D_cFUc.s b/asm/d/menu/d_menu_collect/setArrowMaxNum__17dMenu_Collect2D_cFUc.s deleted file mode 100644 index 400934d8e2a..00000000000 --- a/asm/d/menu/d_menu_collect/setArrowMaxNum__17dMenu_Collect2D_cFUc.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/setItemNameStringNull__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/setItemNameStringNull__17dMenu_Collect2D_cFv.s deleted file mode 100644 index eb35d50936c..00000000000 --- a/asm/d/menu/d_menu_collect/setItemNameStringNull__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/setWalletMaxNum__17dMenu_Collect2D_cFUs.s b/asm/d/menu/d_menu_collect/setWalletMaxNum__17dMenu_Collect2D_cFUs.s deleted file mode 100644 index e5135466a1f..00000000000 --- a/asm/d/menu/d_menu_collect/setWalletMaxNum__17dMenu_Collect2D_cFUs.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/skill_close_init__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/skill_close_init__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 84b14162b78..00000000000 --- a/asm/d/menu/d_menu_collect/skill_close_init__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/skill_close_proc__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/skill_close_proc__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 758dac0746c..00000000000 --- a/asm/d/menu/d_menu_collect/skill_close_proc__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/skill_move_init__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/skill_move_init__17dMenu_Collect2D_cFv.s deleted file mode 100644 index b5e5ce954ab..00000000000 --- a/asm/d/menu/d_menu_collect/skill_move_init__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/skill_move_proc__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/skill_move_proc__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 0367f198267..00000000000 --- a/asm/d/menu/d_menu_collect/skill_move_proc__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/skill_open_init__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/skill_open_init__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 4a56485bb15..00000000000 --- a/asm/d/menu/d_menu_collect/skill_open_init__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_collect/skill_open_proc__17dMenu_Collect2D_cFv.s b/asm/d/menu/d_menu_collect/skill_open_proc__17dMenu_Collect2D_cFv.s deleted file mode 100644 index 079565119b5..00000000000 --- a/asm/d/menu/d_menu_collect/skill_open_proc__17dMenu_Collect2D_cFv.s +++ /dev/null @@ -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 diff --git a/asm/d/menu/d_menu_window/dMw_fade_in__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_fade_in__5dMw_cFv.s deleted file mode 100644 index 967ddd324af..00000000000 --- a/asm/d/menu/d_menu_window/dMw_fade_in__5dMw_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_801FCE78: -/* 801FCE78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FCE7C 7C 08 02 A6 */ mflr r0 -/* 801FCE80 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FCE84 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 801FCE88 80 63 00 04 */ lwz r3, 4(r3) -/* 801FCE8C 28 03 00 00 */ cmplwi r3, 0 -/* 801FCE90 41 82 00 18 */ beq lbl_801FCEA8 -/* 801FCE94 38 80 00 0D */ li r4, 0xd -/* 801FCE98 81 83 00 00 */ lwz r12, 0(r3) -/* 801FCE9C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FCEA0 7D 89 03 A6 */ mtctr r12 -/* 801FCEA4 4E 80 04 21 */ bctrl -lbl_801FCEA8: -/* 801FCEA8 80 0D 80 84 */ lwz r0, g_blackColor(r13) -/* 801FCEAC 90 01 00 0C */ stw r0, 0xc(r1) -/* 801FCEB0 90 01 00 08 */ stw r0, 8(r1) -/* 801FCEB4 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 801FCEB8 88 01 00 08 */ lbz r0, 8(r1) -/* 801FCEBC 98 03 00 0C */ stb r0, 0xc(r3) -/* 801FCEC0 88 01 00 09 */ lbz r0, 9(r1) -/* 801FCEC4 98 03 00 0D */ stb r0, 0xd(r3) -/* 801FCEC8 88 01 00 0A */ lbz r0, 0xa(r1) -/* 801FCECC 98 03 00 0E */ stb r0, 0xe(r3) -/* 801FCED0 88 01 00 0B */ lbz r0, 0xb(r1) -/* 801FCED4 98 03 00 0F */ stb r0, 0xf(r3) -/* 801FCED8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FCEDC 7C 08 03 A6 */ mtlr r0 -/* 801FCEE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FCEE4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_fade_out__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_fade_out__5dMw_cFv.s deleted file mode 100644 index f9efd592f0a..00000000000 --- a/asm/d/menu/d_menu_window/dMw_fade_out__5dMw_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_801FCE08: -/* 801FCE08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FCE0C 7C 08 02 A6 */ mflr r0 -/* 801FCE10 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FCE14 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 801FCE18 80 63 00 04 */ lwz r3, 4(r3) -/* 801FCE1C 28 03 00 00 */ cmplwi r3, 0 -/* 801FCE20 41 82 00 18 */ beq lbl_801FCE38 -/* 801FCE24 38 80 00 0D */ li r4, 0xd -/* 801FCE28 81 83 00 00 */ lwz r12, 0(r3) -/* 801FCE2C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 801FCE30 7D 89 03 A6 */ mtctr r12 -/* 801FCE34 4E 80 04 21 */ bctrl -lbl_801FCE38: -/* 801FCE38 80 0D 80 84 */ lwz r0, g_blackColor(r13) -/* 801FCE3C 90 01 00 0C */ stw r0, 0xc(r1) -/* 801FCE40 90 01 00 08 */ stw r0, 8(r1) -/* 801FCE44 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 801FCE48 88 01 00 08 */ lbz r0, 8(r1) -/* 801FCE4C 98 03 00 0C */ stb r0, 0xc(r3) -/* 801FCE50 88 01 00 09 */ lbz r0, 9(r1) -/* 801FCE54 98 03 00 0D */ stb r0, 0xd(r3) -/* 801FCE58 88 01 00 0A */ lbz r0, 0xa(r1) -/* 801FCE5C 98 03 00 0E */ stb r0, 0xe(r3) -/* 801FCE60 88 01 00 0B */ lbz r0, 0xb(r1) -/* 801FCE64 98 03 00 0F */ stb r0, 0xf(r3) -/* 801FCE68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FCE6C 7C 08 03 A6 */ mtlr r0 -/* 801FCE70 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FCE74 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter_map/checkMoveStatus__11dMeterMap_cFv.s b/asm/d/meter/d_meter_map/checkMoveStatus__11dMeterMap_cFv.s deleted file mode 100644 index ec3c843cbd2..00000000000 --- a/asm/d/meter/d_meter_map/checkMoveStatus__11dMeterMap_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_8020E45C: -/* 8020E45C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8020E460 7C 08 02 A6 */ mflr r0 -/* 8020E464 90 01 00 14 */ stw r0, 0x14(r1) -/* 8020E468 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8020E46C 7C 7F 1B 78 */ mr r31, r3 -/* 8020E470 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8020E474 48 00 00 55 */ bl isShow__11dMeterMap_cFUl -/* 8020E478 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8020E47C 41 82 00 34 */ beq lbl_8020E4B0 -/* 8020E480 4B FF F1 D1 */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv -/* 8020E484 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8020E488 41 82 00 20 */ beq lbl_8020E4A8 -/* 8020E48C 88 1F 00 2D */ lbz r0, 0x2d(r31) -/* 8020E490 28 00 00 00 */ cmplwi r0, 0 -/* 8020E494 41 82 00 0C */ beq lbl_8020E4A0 -/* 8020E498 38 60 00 01 */ li r3, 1 -/* 8020E49C 48 00 00 18 */ b lbl_8020E4B4 -lbl_8020E4A0: -/* 8020E4A0 38 60 00 02 */ li r3, 2 -/* 8020E4A4 48 00 00 10 */ b lbl_8020E4B4 -lbl_8020E4A8: -/* 8020E4A8 38 60 00 03 */ li r3, 3 -/* 8020E4AC 48 00 00 08 */ b lbl_8020E4B4 -lbl_8020E4B0: -/* 8020E4B0 38 60 00 00 */ li r3, 0 -lbl_8020E4B4: -/* 8020E4B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8020E4B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8020E4BC 7C 08 03 A6 */ mtlr r0 -/* 8020E4C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020E4C4 4E 80 00 20 */ blr diff --git a/asm/d/meter/d_meter_map/getMapDispSizeTypeNo__11dMeterMap_cFv.s b/asm/d/meter/d_meter_map/getMapDispSizeTypeNo__11dMeterMap_cFv.s deleted file mode 100644 index fc8cab55b9d..00000000000 --- a/asm/d/meter/d_meter_map/getMapDispSizeTypeNo__11dMeterMap_cFv.s +++ /dev/null @@ -1,85 +0,0 @@ -lbl_8020D528: -/* 8020D528 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8020D52C 7C 08 02 A6 */ mflr r0 -/* 8020D530 90 01 00 24 */ stw r0, 0x24(r1) -/* 8020D534 39 61 00 20 */ addi r11, r1, 0x20 -/* 8020D538 48 15 4C A5 */ bl _savegpr_29 -/* 8020D53C 3B A0 00 07 */ li r29, 7 -/* 8020D540 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) -/* 8020D544 7C 84 07 74 */ extsb r4, r4 -/* 8020D548 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8020D54C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8020D550 38 7F 4E C4 */ addi r3, r31, 0x4ec4 -/* 8020D554 4B E1 6E 31 */ bl getStatusRoomDt__20dStage_roomControl_cFi -/* 8020D558 81 83 00 00 */ lwz r12, 0(r3) -/* 8020D55C 81 8C 01 0C */ lwz r12, 0x10c(r12) -/* 8020D560 7D 89 03 A6 */ mtctr r12 -/* 8020D564 4E 80 04 21 */ bctrl -/* 8020D568 28 03 00 00 */ cmplwi r3, 0 -/* 8020D56C 41 82 00 0C */ beq lbl_8020D578 -/* 8020D570 80 03 00 00 */ lwz r0, 0(r3) -/* 8020D574 54 1D EF 7E */ rlwinm r29, r0, 0x1d, 0x1d, 0x1f -lbl_8020D578: -/* 8020D578 3B DF 4E 20 */ addi r30, r31, 0x4e20 -/* 8020D57C 7F C3 F3 78 */ mr r3, r30 -/* 8020D580 81 9E 00 00 */ lwz r12, 0(r30) -/* 8020D584 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8020D588 7D 89 03 A6 */ mtctr r12 -/* 8020D58C 4E 80 04 21 */ bctrl -/* 8020D590 A0 03 00 0A */ lhz r0, 0xa(r3) -/* 8020D594 54 1F 9F 7E */ rlwinm r31, r0, 0x13, 0x1d, 0x1f -/* 8020D598 7F C3 F3 78 */ mr r3, r30 -/* 8020D59C 81 9E 00 00 */ lwz r12, 0(r30) -/* 8020D5A0 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8020D5A4 7D 89 03 A6 */ mtctr r12 -/* 8020D5A8 4E 80 04 21 */ bctrl -/* 8020D5AC A0 03 00 0A */ lhz r0, 0xa(r3) -/* 8020D5B0 54 00 07 7E */ clrlwi r0, r0, 0x1d -/* 8020D5B4 2C 00 00 01 */ cmpwi r0, 1 -/* 8020D5B8 40 82 00 0C */ bne lbl_8020D5C4 -/* 8020D5BC 3B A0 00 01 */ li r29, 1 -/* 8020D5C0 48 00 00 10 */ b lbl_8020D5D0 -lbl_8020D5C4: -/* 8020D5C4 2C 1D 00 07 */ cmpwi r29, 7 -/* 8020D5C8 40 82 00 08 */ bne lbl_8020D5D0 -/* 8020D5CC 7F FD FB 78 */ mr r29, r31 -lbl_8020D5D0: -/* 8020D5D0 38 60 00 00 */ li r3, 0 -/* 8020D5D4 2C 1D 00 02 */ cmpwi r29, 2 -/* 8020D5D8 41 82 00 3C */ beq lbl_8020D614 -/* 8020D5DC 40 80 00 14 */ bge lbl_8020D5F0 -/* 8020D5E0 2C 1D 00 00 */ cmpwi r29, 0 -/* 8020D5E4 41 82 00 54 */ beq lbl_8020D638 -/* 8020D5E8 40 80 00 14 */ bge lbl_8020D5FC -/* 8020D5EC 48 00 00 4C */ b lbl_8020D638 -lbl_8020D5F0: -/* 8020D5F0 2C 1D 00 04 */ cmpwi r29, 4 -/* 8020D5F4 40 80 00 44 */ bge lbl_8020D638 -/* 8020D5F8 48 00 00 2C */ b lbl_8020D624 -lbl_8020D5FC: -/* 8020D5FC 2C 00 00 01 */ cmpwi r0, 1 -/* 8020D600 40 82 00 0C */ bne lbl_8020D60C -/* 8020D604 38 60 00 04 */ li r3, 4 -/* 8020D608 48 00 00 30 */ b lbl_8020D638 -lbl_8020D60C: -/* 8020D60C 38 60 00 01 */ li r3, 1 -/* 8020D610 48 00 00 28 */ b lbl_8020D638 -lbl_8020D614: -/* 8020D614 2C 00 00 01 */ cmpwi r0, 1 -/* 8020D618 41 82 00 20 */ beq lbl_8020D638 -/* 8020D61C 38 60 00 02 */ li r3, 2 -/* 8020D620 48 00 00 18 */ b lbl_8020D638 -lbl_8020D624: -/* 8020D624 2C 00 00 01 */ cmpwi r0, 1 -/* 8020D628 40 82 00 0C */ bne lbl_8020D634 -/* 8020D62C 38 60 00 05 */ li r3, 5 -/* 8020D630 48 00 00 08 */ b lbl_8020D638 -lbl_8020D634: -/* 8020D634 38 60 00 03 */ li r3, 3 -lbl_8020D638: -/* 8020D638 39 61 00 20 */ addi r11, r1, 0x20 -/* 8020D63C 48 15 4B ED */ bl _restgpr_29 -/* 8020D640 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8020D644 7C 08 03 A6 */ mtlr r0 -/* 8020D648 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020D64C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query039__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query039__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index aca83101cc9..00000000000 --- a/asm/d/msg/d_msg_flow/query039__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8024BDB0: -/* 8024BDB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024BDB4 7C 08 02 A6 */ mflr r0 -/* 8024BDB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024BDBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024BDC0 93 C1 00 08 */ stw r30, 8(r1) -/* 8024BDC4 A3 C4 00 04 */ lhz r30, 4(r4) -/* 8024BDC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BDCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BDD0 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 8024BDD4 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FBFF@ha */ -/* 8024BDD8 38 84 FB FF */ addi r4, r4, 0xFBFF /* 0x0000FBFF@l */ -/* 8024BDDC 4B DE 8C 29 */ bl getEventReg__11dSv_event_cCFUs -/* 8024BDE0 7C 64 1B 78 */ mr r4, r3 -/* 8024BDE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BDE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BDEC 38 63 00 EC */ addi r3, r3, 0xec -/* 8024BDF0 38 04 FF FF */ addi r0, r4, -1 -/* 8024BDF4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8024BDF8 4B DE 81 85 */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 8024BDFC 7C 7F 1B 78 */ mr r31, r3 -/* 8024BE00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BE04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BE08 38 63 00 F8 */ addi r3, r3, 0xf8 -/* 8024BE0C 38 80 00 70 */ li r4, 0x70 -/* 8024BE10 4B DE 82 E9 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 8024BE14 54 65 06 3E */ clrlwi r5, r3, 0x18 -/* 8024BE18 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8024BE1C 7C 00 F2 14 */ add r0, r0, r30 -/* 8024BE20 7C A4 FE 70 */ srawi r4, r5, 0x1f -/* 8024BE24 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8024BE28 7C 00 28 10 */ subfc r0, r0, r5 -/* 8024BE2C 7C 04 19 14 */ adde r0, r4, r3 -/* 8024BE30 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8024BE34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024BE38 83 C1 00 08 */ lwz r30, 8(r1) -/* 8024BE3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024BE40 7C 08 03 A6 */ mtlr r0 -/* 8024BE44 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024BE48 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query040__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query040__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 3f50c7ea65e..00000000000 --- a/asm/d/msg/d_msg_flow/query040__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_8024BE4C: -/* 8024BE4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024BE50 7C 08 02 A6 */ mflr r0 -/* 8024BE54 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024BE58 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024BE5C 93 C1 00 08 */ stw r30, 8(r1) -/* 8024BE60 A0 64 00 04 */ lhz r3, 4(r4) -/* 8024BE64 2C 03 00 01 */ cmpwi r3, 1 -/* 8024BE68 41 80 00 18 */ blt lbl_8024BE80 -/* 8024BE6C 2C 03 00 04 */ cmpwi r3, 4 -/* 8024BE70 40 80 00 10 */ bge lbl_8024BE80 -/* 8024BE74 38 03 FF FF */ addi r0, r3, -1 -/* 8024BE78 54 1E 06 3E */ clrlwi r30, r0, 0x18 -/* 8024BE7C 48 00 00 48 */ b lbl_8024BEC4 -lbl_8024BE80: -/* 8024BE80 2C 03 00 04 */ cmpwi r3, 4 -/* 8024BE84 40 82 00 20 */ bne lbl_8024BEA4 -/* 8024BE88 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8024BE8C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8024BE90 88 03 00 DC */ lbz r0, 0xdc(r3) -/* 8024BE94 28 00 00 FF */ cmplwi r0, 0xff -/* 8024BE98 41 82 00 2C */ beq lbl_8024BEC4 -/* 8024BE9C 7C 1E 03 78 */ mr r30, r0 -/* 8024BEA0 48 00 00 24 */ b lbl_8024BEC4 -lbl_8024BEA4: -/* 8024BEA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BEA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BEAC 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 8024BEB0 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FBFF@ha */ -/* 8024BEB4 38 84 FB FF */ addi r4, r4, 0xFBFF /* 0x0000FBFF@l */ -/* 8024BEB8 4B DE 8B 4D */ bl getEventReg__11dSv_event_cCFUs -/* 8024BEBC 38 03 FF FF */ addi r0, r3, -1 -/* 8024BEC0 54 1E 06 3E */ clrlwi r30, r0, 0x18 -lbl_8024BEC4: -/* 8024BEC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BEC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BECC 38 63 00 EC */ addi r3, r3, 0xec -/* 8024BED0 7F C4 F3 78 */ mr r4, r30 -/* 8024BED4 4B DE 80 A9 */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 8024BED8 7C 7F 1B 78 */ mr r31, r3 -/* 8024BEDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BEE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BEE4 38 63 00 9C */ addi r3, r3, 0x9c -/* 8024BEE8 38 1E 00 0F */ addi r0, r30, 0xf -/* 8024BEEC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8024BEF0 38 A0 00 00 */ li r5, 0 -/* 8024BEF4 4B DE 71 3D */ bl getItem__17dSv_player_item_cCFib -/* 8024BEF8 7C 64 1B 78 */ mr r4, r3 -/* 8024BEFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BF00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BF04 38 63 00 F8 */ addi r3, r3, 0xf8 -/* 8024BF08 4B DE 81 F1 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 8024BF0C 57 E4 06 3F */ clrlwi. r4, r31, 0x18 -/* 8024BF10 40 82 00 0C */ bne lbl_8024BF1C -/* 8024BF14 38 00 00 00 */ li r0, 0 -/* 8024BF18 48 00 00 1C */ b lbl_8024BF34 -lbl_8024BF1C: -/* 8024BF1C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8024BF20 7C 04 00 40 */ cmplw r4, r0 -/* 8024BF24 41 80 00 0C */ blt lbl_8024BF30 -/* 8024BF28 38 00 00 02 */ li r0, 2 -/* 8024BF2C 48 00 00 08 */ b lbl_8024BF34 -lbl_8024BF30: -/* 8024BF30 38 00 00 01 */ li r0, 1 -lbl_8024BF34: -/* 8024BF34 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8024BF38 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024BF3C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8024BF40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024BF44 7C 08 03 A6 */ mtlr r0 -/* 8024BF48 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024BF4C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query041__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query041__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 7f2a6dbe095..00000000000 --- a/asm/d/msg/d_msg_flow/query041__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8024BF50: -/* 8024BF50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024BF54 7C 08 02 A6 */ mflr r0 -/* 8024BF58 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024BF5C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024BF60 93 C1 00 08 */ stw r30, 8(r1) -/* 8024BF64 A3 C4 00 04 */ lhz r30, 4(r4) -/* 8024BF68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BF6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BF70 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 8024BF74 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FBFF@ha */ -/* 8024BF78 38 84 FB FF */ addi r4, r4, 0xFBFF /* 0x0000FBFF@l */ -/* 8024BF7C 4B DE 8A 89 */ bl getEventReg__11dSv_event_cCFUs -/* 8024BF80 7C 64 1B 78 */ mr r4, r3 -/* 8024BF84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BF88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BF8C 38 63 00 EC */ addi r3, r3, 0xec -/* 8024BF90 38 04 FF FF */ addi r0, r4, -1 -/* 8024BF94 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8024BF98 4B DE 7F E5 */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 8024BF9C 7C 7F 1B 78 */ mr r31, r3 -/* 8024BFA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BFA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BFA8 38 63 00 F8 */ addi r3, r3, 0xf8 -/* 8024BFAC 38 80 00 71 */ li r4, 0x71 -/* 8024BFB0 4B DE 81 49 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 8024BFB4 54 65 06 3E */ clrlwi r5, r3, 0x18 -/* 8024BFB8 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8024BFBC 7C 00 F2 14 */ add r0, r0, r30 -/* 8024BFC0 7C A4 FE 70 */ srawi r4, r5, 0x1f -/* 8024BFC4 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8024BFC8 7C 00 28 10 */ subfc r0, r0, r5 -/* 8024BFCC 7C 04 19 14 */ adde r0, r4, r3 -/* 8024BFD0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8024BFD4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024BFD8 83 C1 00 08 */ lwz r30, 8(r1) -/* 8024BFDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024BFE0 7C 08 03 A6 */ mtlr r0 -/* 8024BFE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024BFE8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query045__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query045__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 5baa0870eef..00000000000 --- a/asm/d/msg/d_msg_flow/query045__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_8024C18C: -/* 8024C18C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024C190 7C 08 02 A6 */ mflr r0 -/* 8024C194 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C198 4B DE 22 91 */ bl dComIfGs_checkGetInsectNum__Fv -/* 8024C19C 38 80 00 00 */ li r4, 0 -/* 8024C1A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8024C1A4 40 82 00 0C */ bne lbl_8024C1B0 -/* 8024C1A8 38 80 00 00 */ li r4, 0 -/* 8024C1AC 48 00 00 58 */ b lbl_8024C204 -lbl_8024C1B0: -/* 8024C1B0 28 00 00 01 */ cmplwi r0, 1 -/* 8024C1B4 41 80 00 14 */ blt lbl_8024C1C8 -/* 8024C1B8 28 00 00 0B */ cmplwi r0, 0xb -/* 8024C1BC 41 81 00 0C */ bgt lbl_8024C1C8 -/* 8024C1C0 38 80 00 01 */ li r4, 1 -/* 8024C1C4 48 00 00 40 */ b lbl_8024C204 -lbl_8024C1C8: -/* 8024C1C8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8024C1CC 28 00 00 0C */ cmplwi r0, 0xc -/* 8024C1D0 41 80 00 14 */ blt lbl_8024C1E4 -/* 8024C1D4 28 00 00 16 */ cmplwi r0, 0x16 -/* 8024C1D8 41 81 00 0C */ bgt lbl_8024C1E4 -/* 8024C1DC 38 80 00 02 */ li r4, 2 -/* 8024C1E0 48 00 00 24 */ b lbl_8024C204 -lbl_8024C1E4: -/* 8024C1E4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8024C1E8 28 00 00 17 */ cmplwi r0, 0x17 -/* 8024C1EC 40 82 00 0C */ bne lbl_8024C1F8 -/* 8024C1F0 38 80 00 03 */ li r4, 3 -/* 8024C1F4 48 00 00 10 */ b lbl_8024C204 -lbl_8024C1F8: -/* 8024C1F8 28 00 00 18 */ cmplwi r0, 0x18 -/* 8024C1FC 40 82 00 08 */ bne lbl_8024C204 -/* 8024C200 38 80 00 04 */ li r4, 4 -lbl_8024C204: -/* 8024C204 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 8024C208 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024C20C 7C 08 03 A6 */ mtlr r0 -/* 8024C210 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C214 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/dScnLogo_Create__FP11scene_class.s b/asm/d/s/d_s_logo/dScnLogo_Create__FP11scene_class.s deleted file mode 100644 index 574982c32c4..00000000000 --- a/asm/d/s/d_s_logo/dScnLogo_Create__FP11scene_class.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80258420: -/* 80258420 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80258424 7C 08 02 A6 */ mflr r0 -/* 80258428 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025842C 28 03 00 00 */ cmplwi r3, 0 -/* 80258430 4B FF F6 B1 */ bl create__10dScnLogo_cFv -/* 80258434 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80258438 7C 08 03 A6 */ mtlr r0 -/* 8025843C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80258440 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/phase_0__FP10dScnLogo_c.s b/asm/d/s/d_s_logo/phase_0__FP10dScnLogo_c.s deleted file mode 100644 index b30a43354db..00000000000 --- a/asm/d/s/d_s_logo/phase_0__FP10dScnLogo_c.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80257910: -/* 80257910 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80257914 7C 08 02 A6 */ mflr r0 -/* 80257918 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025791C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80257920 7C 7F 1B 78 */ mr r31, r3 -/* 80257924 80 0D 80 84 */ lwz r0, g_blackColor(r13) -/* 80257928 90 01 00 0C */ stw r0, 0xc(r1) -/* 8025792C 90 01 00 08 */ stw r0, 8(r1) -/* 80257930 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 80257934 88 01 00 08 */ lbz r0, 8(r1) -/* 80257938 98 03 00 0C */ stb r0, 0xc(r3) -/* 8025793C 88 01 00 09 */ lbz r0, 9(r1) -/* 80257940 98 03 00 0D */ stb r0, 0xd(r3) -/* 80257944 88 01 00 0A */ lbz r0, 0xa(r1) -/* 80257948 98 03 00 0E */ stb r0, 0xe(r3) -/* 8025794C 88 01 00 0B */ lbz r0, 0xb(r1) -/* 80257950 98 03 00 0F */ stb r0, 0xf(r3) -/* 80257954 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80257958 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025795C 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80257960 4B DD 50 79 */ bl createParticle__14dComIfG_play_cFv -/* 80257964 4B DB 73 ED */ bl mDoExt_getGameHeap__Fv -/* 80257968 3C 80 00 34 */ lis r4, 0x34 -/* 8025796C 38 A0 FF F0 */ li r5, -16 -/* 80257970 48 07 6B 65 */ bl alloc__7JKRHeapFUli -/* 80257974 90 7F 02 1C */ stw r3, 0x21c(r31) -/* 80257978 80 7F 02 1C */ lwz r3, 0x21c(r31) -/* 8025797C 3C 80 00 34 */ lis r4, 0x34 -/* 80257980 38 A0 00 00 */ li r5, 0 -/* 80257984 38 C0 00 00 */ li r6, 0 -/* 80257988 48 07 75 79 */ bl create__10JKRExpHeapFPvUlP7JKRHeapb -/* 8025798C 90 7F 01 D0 */ stw r3, 0x1d0(r31) -/* 80257990 3C 60 00 13 */ lis r3, 0x13 -/* 80257994 80 9F 01 D0 */ lwz r4, 0x1d0(r31) -/* 80257998 38 A0 00 00 */ li r5, 0 -/* 8025799C 48 07 74 91 */ bl create__10JKRExpHeapFUlP7JKRHeapb -/* 802579A0 90 7F 01 D4 */ stw r3, 0x1d4(r31) -/* 802579A4 38 60 00 02 */ li r3, 2 -/* 802579A8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802579AC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802579B0 7C 08 03 A6 */ mtlr r0 -/* 802579B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802579B8 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/FileSelectClose__10dScnName_cFv.s b/asm/d/s/d_s_name/FileSelectClose__10dScnName_cFv.s deleted file mode 100644 index 6cbea6c72e2..00000000000 --- a/asm/d/s/d_s_name/FileSelectClose__10dScnName_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80258F20: -/* 80258F20 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80258F24 7C 08 02 A6 */ mflr r0 -/* 80258F28 90 01 00 24 */ stw r0, 0x24(r1) -/* 80258F2C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80258F30 7C 7F 1B 78 */ mr r31, r3 -/* 80258F34 88 63 04 1E */ lbz r3, 0x41e(r3) -/* 80258F38 38 03 FF FF */ addi r0, r3, -1 -/* 80258F3C 98 1F 04 1E */ stb r0, 0x41e(r31) -/* 80258F40 88 1F 04 1E */ lbz r0, 0x41e(r31) -/* 80258F44 28 00 00 00 */ cmplwi r0, 0 -/* 80258F48 40 82 00 78 */ bne lbl_80258FC0 -/* 80258F4C 38 00 00 03 */ li r0, 3 -/* 80258F50 98 1F 04 1D */ stb r0, 0x41d(r31) -/* 80258F54 38 00 00 0F */ li r0, 0xf -/* 80258F58 98 1F 04 1E */ stb r0, 0x41e(r31) -/* 80258F5C 38 00 00 01 */ li r0, 1 -/* 80258F60 98 1F 04 1C */ stb r0, 0x41c(r31) -/* 80258F64 80 0D 80 84 */ lwz r0, g_blackColor(r13) -/* 80258F68 90 01 00 0C */ stw r0, 0xc(r1) -/* 80258F6C 90 01 00 08 */ stw r0, 8(r1) -/* 80258F70 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 80258F74 88 01 00 08 */ lbz r0, 8(r1) -/* 80258F78 98 03 00 0C */ stb r0, 0xc(r3) -/* 80258F7C 88 01 00 09 */ lbz r0, 9(r1) -/* 80258F80 98 03 00 0D */ stb r0, 0xd(r3) -/* 80258F84 88 01 00 0A */ lbz r0, 0xa(r1) -/* 80258F88 98 03 00 0E */ stb r0, 0xe(r3) -/* 80258F8C 88 01 00 0B */ lbz r0, 0xb(r1) -/* 80258F90 98 03 00 0F */ stb r0, 0xf(r3) -/* 80258F94 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80258F98 80 63 00 04 */ lwz r3, 4(r3) -/* 80258F9C 28 03 00 00 */ cmplwi r3, 0 -/* 80258FA0 41 82 00 18 */ beq lbl_80258FB8 -/* 80258FA4 38 80 00 0F */ li r4, 0xf -/* 80258FA8 81 83 00 00 */ lwz r12, 0(r3) -/* 80258FAC 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80258FB0 7D 89 03 A6 */ mtctr r12 -/* 80258FB4 4E 80 04 21 */ bctrl -lbl_80258FB8: -/* 80258FB8 38 00 00 00 */ li r0, 0 -/* 80258FBC 98 1F 04 20 */ stb r0, 0x420(r31) -lbl_80258FC0: -/* 80258FC0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80258FC4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80258FC8 7C 08 03 A6 */ mtlr r0 -/* 80258FCC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80258FD0 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/FileSelectMainNormal__10dScnName_cFv.s b/asm/d/s/d_s_name/FileSelectMainNormal__10dScnName_cFv.s deleted file mode 100644 index d5ce69d5916..00000000000 --- a/asm/d/s/d_s_name/FileSelectMainNormal__10dScnName_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80258E78: -/* 80258E78 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80258E7C 7C 08 02 A6 */ mflr r0 -/* 80258E80 90 01 00 24 */ stw r0, 0x24(r1) -/* 80258E84 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80258E88 7C 7F 1B 78 */ mr r31, r3 -/* 80258E8C 80 63 04 14 */ lwz r3, 0x414(r3) -/* 80258E90 88 03 02 70 */ lbz r0, 0x270(r3) -/* 80258E94 2C 00 00 01 */ cmpwi r0, 1 -/* 80258E98 41 82 00 08 */ beq lbl_80258EA0 -/* 80258E9C 48 00 00 70 */ b lbl_80258F0C -lbl_80258EA0: -/* 80258EA0 38 00 00 0F */ li r0, 0xf -/* 80258EA4 98 1F 04 1E */ stb r0, 0x41e(r31) -/* 80258EA8 80 0D 80 84 */ lwz r0, g_blackColor(r13) -/* 80258EAC 90 01 00 0C */ stw r0, 0xc(r1) -/* 80258EB0 90 01 00 08 */ stw r0, 8(r1) -/* 80258EB4 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 80258EB8 88 01 00 08 */ lbz r0, 8(r1) -/* 80258EBC 98 03 00 0C */ stb r0, 0xc(r3) -/* 80258EC0 88 01 00 09 */ lbz r0, 9(r1) -/* 80258EC4 98 03 00 0D */ stb r0, 0xd(r3) -/* 80258EC8 88 01 00 0A */ lbz r0, 0xa(r1) -/* 80258ECC 98 03 00 0E */ stb r0, 0xe(r3) -/* 80258ED0 88 01 00 0B */ lbz r0, 0xb(r1) -/* 80258ED4 98 03 00 0F */ stb r0, 0xf(r3) -/* 80258ED8 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80258EDC 80 63 00 04 */ lwz r3, 4(r3) -/* 80258EE0 28 03 00 00 */ cmplwi r3, 0 -/* 80258EE4 41 82 00 18 */ beq lbl_80258EFC -/* 80258EE8 38 80 00 0F */ li r4, 0xf -/* 80258EEC 81 83 00 00 */ lwz r12, 0(r3) -/* 80258EF0 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80258EF4 7D 89 03 A6 */ mtctr r12 -/* 80258EF8 4E 80 04 21 */ bctrl -lbl_80258EFC: -/* 80258EFC 38 00 00 02 */ li r0, 2 -/* 80258F00 98 1F 04 1D */ stb r0, 0x41d(r31) -/* 80258F04 38 00 00 01 */ li r0, 1 -/* 80258F08 98 1F 04 20 */ stb r0, 0x420(r31) -lbl_80258F0C: -/* 80258F0C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80258F10 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80258F14 7C 08 03 A6 */ mtlr r0 -/* 80258F18 38 21 00 20 */ addi r1, r1, 0x20 -/* 80258F1C 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/changeGameScene__10dScnName_cFv.s b/asm/d/s/d_s_name/changeGameScene__10dScnName_cFv.s deleted file mode 100644 index ab36a9279ba..00000000000 --- a/asm/d/s/d_s_name/changeGameScene__10dScnName_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_802590F8: -/* 802590F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802590FC 7C 08 02 A6 */ mflr r0 -/* 80259100 90 01 00 14 */ stw r0, 0x14(r1) -/* 80259104 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80259108 7C 7F 1B 78 */ mr r31, r3 -/* 8025910C 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 80259110 80 03 00 00 */ lwz r0, 0(r3) -/* 80259114 2C 00 00 00 */ cmpwi r0, 0 -/* 80259118 40 82 00 94 */ bne lbl_802591AC -/* 8025911C 4B DC 54 3D */ bl fopOvlpM_IsPeek__Fv -/* 80259120 2C 03 00 00 */ cmpwi r3, 0 -/* 80259124 40 82 00 88 */ bne lbl_802591AC -/* 80259128 4B DD 58 4D */ bl dComIfGs_gameStart__Fv -/* 8025912C 7F E3 FB 78 */ mr r3, r31 -/* 80259130 88 1F 04 1F */ lbz r0, 0x41f(r31) -/* 80259134 28 00 00 00 */ cmplwi r0, 0 -/* 80259138 38 00 00 0B */ li r0, 0xb -/* 8025913C 7C 04 07 34 */ extsh r4, r0 -/* 80259140 38 A0 00 00 */ li r5, 0 -/* 80259144 38 C0 00 05 */ li r6, 5 -/* 80259148 4B DC 5B 99 */ bl fopScnM_ChangeReq__FP11scene_classssUs -/* 8025914C 38 00 00 00 */ li r0, 0 -/* 80259150 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80259154 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80259158 98 03 4E 1C */ stb r0, 0x4e1c(r3) -/* 8025915C 80 7F 04 14 */ lwz r3, 0x414(r31) -/* 80259160 88 03 02 65 */ lbz r0, 0x265(r3) -/* 80259164 7C 63 02 14 */ add r3, r3, r0 -/* 80259168 88 03 02 58 */ lbz r0, 0x258(r3) -/* 8025916C 2C 00 00 00 */ cmpwi r0, 0 -/* 80259170 41 82 00 20 */ beq lbl_80259190 -/* 80259174 3C 60 80 3A */ lis r3, d_s_d_s_name__stringBase0@ha /* 0x8039A2A8@ha */ -/* 80259178 38 63 A2 A8 */ addi r3, r3, d_s_d_s_name__stringBase0@l /* 0x8039A2A8@l */ -/* 8025917C 38 63 00 15 */ addi r3, r3, 0x15 -/* 80259180 38 80 00 15 */ li r4, 0x15 -/* 80259184 38 A0 00 01 */ li r5, 1 -/* 80259188 38 C0 00 0D */ li r6, 0xd -/* 8025918C 4B DD 43 C9 */ bl dComIfGp_setNextStage__FPCcsScSc -lbl_80259190: -/* 80259190 4B F4 60 D5 */ bl dKy_clear_game_init__Fv -/* 80259194 38 00 FF FF */ li r0, -1 -/* 80259198 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025919C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802591A0 98 03 09 78 */ stb r0, 0x978(r3) -/* 802591A4 38 00 00 00 */ li r0, 0 -/* 802591A8 90 03 0D C8 */ stw r0, 0xdc8(r3) -lbl_802591AC: -/* 802591AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802591B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802591B4 7C 08 03 A6 */ mtlr r0 -/* 802591B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802591BC 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/create__10dScnName_cFv.s b/asm/d/s/d_s_name/create__10dScnName_cFv.s deleted file mode 100644 index a0e9b46fab6..00000000000 --- a/asm/d/s/d_s_name/create__10dScnName_cFv.s +++ /dev/null @@ -1,168 +0,0 @@ -lbl_802588A0: -/* 802588A0 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 802588A4 7C 08 02 A6 */ mflr r0 -/* 802588A8 90 01 00 54 */ stw r0, 0x54(r1) -/* 802588AC DB E1 00 40 */ stfd f31, 0x40(r1) -/* 802588B0 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 802588B4 DB C1 00 30 */ stfd f30, 0x30(r1) -/* 802588B8 F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 802588BC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802588C0 48 10 99 19 */ bl _savegpr_28 -/* 802588C4 7C 7D 1B 78 */ mr r29, r3 -/* 802588C8 38 7D 01 C4 */ addi r3, r29, 0x1c4 -/* 802588CC 3C 80 80 3A */ lis r4, d_s_d_s_name__stringBase0@ha /* 0x8039A2A8@ha */ -/* 802588D0 38 84 A2 A8 */ addi r4, r4, d_s_d_s_name__stringBase0@l /* 0x8039A2A8@l */ -/* 802588D4 38 84 00 0D */ addi r4, r4, 0xd -/* 802588D8 4B FF FF A1 */ bl resLoad__FP30request_of_phase_process_classPc -/* 802588DC 7C 7E 1B 78 */ mr r30, r3 -/* 802588E0 2C 1E 00 04 */ cmpwi r30, 4 -/* 802588E4 40 82 02 1C */ bne lbl_80258B00 -/* 802588E8 4B DB 64 69 */ bl mDoExt_getGameHeap__Fv -/* 802588EC 7C 64 1B 78 */ mr r4, r3 -/* 802588F0 3C 60 00 18 */ lis r3, 0x18 -/* 802588F4 38 A0 00 00 */ li r5, 0 -/* 802588F8 48 07 65 35 */ bl create__10JKRExpHeapFUlP7JKRHeapb -/* 802588FC 90 7D 01 CC */ stw r3, 0x1cc(r29) -/* 80258900 80 7D 01 CC */ lwz r3, 0x1cc(r29) -/* 80258904 4B DB 68 C9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 80258908 90 7D 01 D0 */ stw r3, 0x1d0(r29) -/* 8025890C 3C 60 80 3A */ lis r3, d_s_d_s_name__stringBase0@ha /* 0x8039A2A8@ha */ -/* 80258910 38 63 A2 A8 */ addi r3, r3, d_s_d_s_name__stringBase0@l /* 0x8039A2A8@l */ -/* 80258914 38 63 00 0D */ addi r3, r3, 0xd -/* 80258918 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025891C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80258920 3C 84 00 02 */ addis r4, r4, 2 -/* 80258924 38 A0 00 80 */ li r5, 0x80 -/* 80258928 38 84 C2 F8 */ addi r4, r4, -15624 -/* 8025892C 4B DE 38 B9 */ bl getResInfo__14dRes_control_cFPCcP11dRes_info_ci -/* 80258930 7C 7F 1B 78 */ mr r31, r3 -/* 80258934 38 60 23 7C */ li r3, 0x237c -/* 80258938 48 07 63 15 */ bl __nw__FUl -/* 8025893C 7C 60 1B 79 */ or. r0, r3, r3 -/* 80258940 41 82 00 10 */ beq lbl_80258950 -/* 80258944 80 9F 00 14 */ lwz r4, 0x14(r31) -/* 80258948 4B F2 AD 25 */ bl __ct__14dFile_select_cFP10JKRArchive -/* 8025894C 7C 60 1B 78 */ mr r0, r3 -lbl_80258950: -/* 80258950 90 1D 04 14 */ stw r0, 0x414(r29) -/* 80258954 80 7D 04 14 */ lwz r3, 0x414(r29) -/* 80258958 4B F2 BA 75 */ bl _create__14dFile_select_cFv -/* 8025895C A8 1D 00 08 */ lha r0, 8(r29) -/* 80258960 2C 00 00 0D */ cmpwi r0, 0xd -/* 80258964 40 82 00 1C */ bne lbl_80258980 -/* 80258968 38 00 00 00 */ li r0, 0 -/* 8025896C 80 7D 04 14 */ lwz r3, 0x414(r29) -/* 80258970 98 03 03 B0 */ stb r0, 0x3b0(r3) -/* 80258974 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80258978 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025897C 98 03 0F 1A */ stb r0, 0xf1a(r3) -lbl_80258980: -/* 80258980 38 60 00 1C */ li r3, 0x1c -/* 80258984 48 07 62 C9 */ bl __nw__FUl -/* 80258988 7C 60 1B 79 */ or. r0, r3, r3 -/* 8025898C 41 82 00 10 */ beq lbl_8025899C -/* 80258990 80 9F 00 14 */ lwz r4, 0x14(r31) -/* 80258994 4B F3 A5 7D */ bl __ct__14dBrightCheck_cFP10JKRArchive -/* 80258998 7C 60 1B 78 */ mr r0, r3 -lbl_8025899C: -/* 8025899C 90 1D 04 18 */ stw r0, 0x418(r29) -/* 802589A0 38 00 00 00 */ li r0, 0 -/* 802589A4 98 1D 04 20 */ stb r0, 0x420(r29) -/* 802589A8 38 00 FF FF */ li r0, -1 -/* 802589AC 38 6D 8B 70 */ la r3, g_snHIO(r13) /* 804510F0-_SDA_BASE_ */ -/* 802589B0 98 03 00 04 */ stb r0, 4(r3) -/* 802589B4 80 7D 01 D0 */ lwz r3, 0x1d0(r29) -/* 802589B8 48 07 5A 81 */ bl becomeCurrentHeap__7JKRHeapFv -/* 802589BC 38 00 00 01 */ li r0, 1 -/* 802589C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802589C4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802589C8 98 1F 5D 44 */ stb r0, 0x5d44(r31) -/* 802589CC 80 8D 80 20 */ lwz r4, mRenderModeObj__15mDoMch_render_c(r13) -/* 802589D0 A0 04 00 06 */ lhz r0, 6(r4) -/* 802589D4 C8 22 B5 10 */ lfd f1, lit_3930(r2) -/* 802589D8 90 01 00 0C */ stw r0, 0xc(r1) -/* 802589DC 3C 60 43 30 */ lis r3, 0x4330 -/* 802589E0 90 61 00 08 */ stw r3, 8(r1) -/* 802589E4 C8 01 00 08 */ lfd f0, 8(r1) -/* 802589E8 EF C0 08 28 */ fsubs f30, f0, f1 -/* 802589EC A0 04 00 04 */ lhz r0, 4(r4) -/* 802589F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802589F4 90 61 00 10 */ stw r3, 0x10(r1) -/* 802589F8 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802589FC EF E0 08 28 */ fsubs f31, f0, f1 -/* 80258A00 3B 9F 5D 48 */ addi r28, r31, 0x5d48 -/* 80258A04 7F 83 E3 78 */ mr r3, r28 -/* 80258A08 C0 22 B4 F8 */ lfs f1, lit_3923(r2) -/* 80258A0C FC 40 08 90 */ fmr f2, f1 -/* 80258A10 FC 60 F8 90 */ fmr f3, f31 -/* 80258A14 FC 80 F0 90 */ fmr f4, f30 -/* 80258A18 FC A0 08 90 */ fmr f5, f1 -/* 80258A1C C0 C2 B4 FC */ lfs f6, lit_3924(r2) -/* 80258A20 4B DF 90 A1 */ bl setViewPort__14dDlst_window_cFffffff -/* 80258A24 7F 83 E3 78 */ mr r3, r28 -/* 80258A28 C0 22 B4 F8 */ lfs f1, lit_3923(r2) -/* 80258A2C FC 40 08 90 */ fmr f2, f1 -/* 80258A30 FC 60 F8 90 */ fmr f3, f31 -/* 80258A34 FC 80 F0 90 */ fmr f4, f30 -/* 80258A38 4B DF 90 A5 */ bl setScissor__14dDlst_window_cFffff -/* 80258A3C 38 80 00 00 */ li r4, 0 -/* 80258A40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80258A44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80258A48 98 83 5D 70 */ stb r4, 0x5d70(r3) -/* 80258A4C 38 00 00 02 */ li r0, 2 -/* 80258A50 98 03 5D 71 */ stb r0, 0x5d71(r3) -/* 80258A54 38 1D 01 D4 */ addi r0, r29, 0x1d4 -/* 80258A58 90 03 5D 74 */ stw r0, 0x5d74(r3) -/* 80258A5C C0 02 B4 FC */ lfs f0, lit_3924(r2) -/* 80258A60 D0 1D 02 9C */ stfs f0, 0x29c(r29) -/* 80258A64 C0 02 B5 00 */ lfs f0, lit_3925(r2) -/* 80258A68 D0 1D 02 A0 */ stfs f0, 0x2a0(r29) -/* 80258A6C C0 02 B5 04 */ lfs f0, lit_3926(r2) -/* 80258A70 D0 1D 02 A4 */ stfs f0, 0x2a4(r29) -/* 80258A74 C0 02 B5 08 */ lfs f0, lit_3927(r2) -/* 80258A78 D0 1D 02 A8 */ stfs f0, 0x2a8(r29) -/* 80258A7C C0 22 B4 F8 */ lfs f1, lit_3923(r2) -/* 80258A80 D0 3D 02 AC */ stfs f1, 0x2ac(r29) -/* 80258A84 D0 3D 02 B0 */ stfs f1, 0x2b0(r29) -/* 80258A88 C0 02 B5 0C */ lfs f0, lit_3928(r2) -/* 80258A8C D0 1D 02 B4 */ stfs f0, 0x2b4(r29) -/* 80258A90 D0 3D 02 B8 */ stfs f1, 0x2b8(r29) -/* 80258A94 D0 3D 02 BC */ stfs f1, 0x2bc(r29) -/* 80258A98 D0 3D 02 C0 */ stfs f1, 0x2c0(r29) -/* 80258A9C B0 9D 02 D0 */ sth r4, 0x2d0(r29) -/* 80258AA0 90 83 5D AC */ stw r4, 0x5dac(r3) -/* 80258AA4 93 83 61 A8 */ stw r28, 0x61a8(r3) -/* 80258AA8 93 83 61 AC */ stw r28, 0x61ac(r3) -/* 80258AAC 90 03 61 B0 */ stw r0, 0x61b0(r3) -/* 80258AB0 98 8D 86 67 */ stb r4, mBlureFlag__13mDoGph_gInf_c+0x3(r13) -/* 80258AB4 7F A3 EB 78 */ mr r3, r29 -/* 80258AB8 48 00 00 75 */ bl setView__10dScnName_cFv -/* 80258ABC 4B F4 D3 99 */ bl dKy_setLight_init__Fv -/* 80258AC0 38 6D 8B 70 */ la r3, g_snHIO(r13) /* 804510F0-_SDA_BASE_ */ -/* 80258AC4 88 03 00 05 */ lbz r0, 5(r3) -/* 80258AC8 98 1D 04 1E */ stb r0, 0x41e(r29) -/* 80258ACC 38 80 00 00 */ li r4, 0 -/* 80258AD0 98 9D 04 1C */ stb r4, 0x41c(r29) -/* 80258AD4 98 9D 04 1D */ stb r4, 0x41d(r29) -/* 80258AD8 80 AD 8C 40 */ lwz r5, sManager__10JFWDisplay(r13) -/* 80258ADC 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 80258AE0 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 80258AE4 54 03 F0 BE */ srwi r3, r0, 2 -/* 80258AE8 38 00 00 1E */ li r0, 0x1e -/* 80258AEC 7C 03 03 96 */ divwu r0, r3, r0 -/* 80258AF0 90 05 00 20 */ stw r0, 0x20(r5) -/* 80258AF4 B0 85 00 1C */ sth r4, 0x1c(r5) -/* 80258AF8 38 7F 5B D4 */ addi r3, r31, 0x5bd4 -/* 80258AFC 4B E1 74 09 */ bl Init__12dVibration_cFv -lbl_80258B00: -/* 80258B00 7F C3 F3 78 */ mr r3, r30 -/* 80258B04 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 80258B08 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 80258B0C E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 80258B10 CB C1 00 30 */ lfd f30, 0x30(r1) -/* 80258B14 39 61 00 30 */ addi r11, r1, 0x30 -/* 80258B18 48 10 97 0D */ bl _restgpr_28 -/* 80258B1C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80258B20 7C 08 03 A6 */ mtlr r0 -/* 80258B24 38 21 00 50 */ addi r1, r1, 0x50 -/* 80258B28 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__22dSvBit_childOtherHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__22dSvBit_childOtherHIO_cFv.s deleted file mode 100644 index 504cc0ef4c1..00000000000 --- a/asm/d/save/d_save_HIO/__ct__22dSvBit_childOtherHIO_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8025C13C: -/* 8025C13C 3C 80 80 3C */ lis r4, __vt__22dSvBit_childOtherHIO_c@ha /* 0x803C3300@ha */ -/* 8025C140 38 04 33 00 */ addi r0, r4, __vt__22dSvBit_childOtherHIO_c@l /* 0x803C3300@l */ -/* 8025C144 90 03 00 00 */ stw r0, 0(r3) -/* 8025C148 38 80 00 00 */ li r4, 0 -/* 8025C14C 98 83 00 05 */ stb r4, 5(r3) -/* 8025C150 98 83 00 06 */ stb r4, 6(r3) -/* 8025C154 38 C0 00 00 */ li r6, 0 -/* 8025C158 38 00 00 04 */ li r0, 4 -/* 8025C15C 7C 09 03 A6 */ mtctr r0 -lbl_8025C160: -/* 8025C160 7C A3 32 14 */ add r5, r3, r6 -/* 8025C164 98 85 00 07 */ stb r4, 7(r5) -/* 8025C168 98 85 00 0B */ stb r4, 0xb(r5) -/* 8025C16C 38 C6 00 01 */ addi r6, r6, 1 -/* 8025C170 42 00 FF F0 */ bdnz lbl_8025C160 -/* 8025C174 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__23dSvBit_childItZoneHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__23dSvBit_childItZoneHIO_cFv.s deleted file mode 100644 index 257fd46904d..00000000000 --- a/asm/d/save/d_save_HIO/__ct__23dSvBit_childItZoneHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025BEA8: -/* 8025BEA8 3C 80 80 3C */ lis r4, __vt__23dSvBit_childItZoneHIO_c@ha /* 0x803C333C@ha */ -/* 8025BEAC 38 04 33 3C */ addi r0, r4, __vt__23dSvBit_childItZoneHIO_c@l /* 0x803C333C@l */ -/* 8025BEB0 90 03 00 00 */ stw r0, 0(r3) -/* 8025BEB4 38 C0 00 00 */ li r6, 0 -/* 8025BEB8 38 80 00 00 */ li r4, 0 -/* 8025BEBC 38 00 00 20 */ li r0, 0x20 -/* 8025BEC0 7C 09 03 A6 */ mtctr r0 -lbl_8025BEC4: -/* 8025BEC4 7C A3 32 14 */ add r5, r3, r6 -/* 8025BEC8 98 85 00 05 */ stb r4, 5(r5) -/* 8025BECC 98 85 00 25 */ stb r4, 0x25(r5) -/* 8025BED0 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BED4 42 00 FF F0 */ bdnz lbl_8025BEC4 -/* 8025BED8 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__23dSvBit_childSwZoneHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__23dSvBit_childSwZoneHIO_cFv.s deleted file mode 100644 index 06098cec51e..00000000000 --- a/asm/d/save/d_save_HIO/__ct__23dSvBit_childSwZoneHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025BCB0: -/* 8025BCB0 3C 80 80 3C */ lis r4, __vt__23dSvBit_childSwZoneHIO_c@ha /* 0x803C336C@ha */ -/* 8025BCB4 38 04 33 6C */ addi r0, r4, __vt__23dSvBit_childSwZoneHIO_c@l /* 0x803C336C@l */ -/* 8025BCB8 90 03 00 00 */ stw r0, 0(r3) -/* 8025BCBC 38 C0 00 00 */ li r6, 0 -/* 8025BCC0 38 80 00 00 */ li r4, 0 -/* 8025BCC4 38 00 00 20 */ li r0, 0x20 -/* 8025BCC8 7C 09 03 A6 */ mtctr r0 -lbl_8025BCCC: -/* 8025BCCC 7C A3 32 14 */ add r5, r3, r6 -/* 8025BCD0 98 85 00 05 */ stb r4, 5(r5) -/* 8025BCD4 98 85 00 25 */ stb r4, 0x25(r5) -/* 8025BCD8 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BCDC 42 00 FF F0 */ bdnz lbl_8025BCCC -/* 8025BCE0 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__25dSvBit_childDarknessHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__25dSvBit_childDarknessHIO_cFv.s deleted file mode 100644 index e9d90dac70b..00000000000 --- a/asm/d/save/d_save_HIO/__ct__25dSvBit_childDarknessHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025C004: -/* 8025C004 3C 80 80 3C */ lis r4, __vt__25dSvBit_childDarknessHIO_c@ha /* 0x803C3318@ha */ -/* 8025C008 38 04 33 18 */ addi r0, r4, __vt__25dSvBit_childDarknessHIO_c@l /* 0x803C3318@l */ -/* 8025C00C 90 03 00 00 */ stw r0, 0(r3) -/* 8025C010 38 C0 00 00 */ li r6, 0 -/* 8025C014 38 80 00 00 */ li r4, 0 -/* 8025C018 38 00 00 06 */ li r0, 6 -/* 8025C01C 7C 09 03 A6 */ mtctr r0 -lbl_8025C020: -/* 8025C020 7C A3 32 14 */ add r5, r3, r6 -/* 8025C024 98 85 00 05 */ stb r4, 5(r5) -/* 8025C028 98 85 00 0B */ stb r4, 0xb(r5) -/* 8025C02C 38 C6 00 01 */ addi r6, r6, 1 -/* 8025C030 42 00 FF F0 */ bdnz lbl_8025C020 -/* 8025C034 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__26dSvBit_childItDungeonHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__26dSvBit_childItDungeonHIO_cFv.s deleted file mode 100644 index 4aa5bb1ff36..00000000000 --- a/asm/d/save/d_save_HIO/__ct__26dSvBit_childItDungeonHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025BE0C: -/* 8025BE0C 3C 80 80 3C */ lis r4, __vt__26dSvBit_childItDungeonHIO_c@ha /* 0x803C3348@ha */ -/* 8025BE10 38 04 33 48 */ addi r0, r4, __vt__26dSvBit_childItDungeonHIO_c@l /* 0x803C3348@l */ -/* 8025BE14 90 03 00 00 */ stw r0, 0(r3) -/* 8025BE18 38 C0 00 00 */ li r6, 0 -/* 8025BE1C 38 80 00 00 */ li r4, 0 -/* 8025BE20 38 00 00 80 */ li r0, 0x80 -/* 8025BE24 7C 09 03 A6 */ mtctr r0 -lbl_8025BE28: -/* 8025BE28 7C A3 32 14 */ add r5, r3, r6 -/* 8025BE2C 98 85 00 05 */ stb r4, 5(r5) -/* 8025BE30 98 85 00 85 */ stb r4, 0x85(r5) -/* 8025BE34 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BE38 42 00 FF F0 */ bdnz lbl_8025BE28 -/* 8025BE3C 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__26dSvBit_childItOneZoneHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__26dSvBit_childItOneZoneHIO_cFv.s deleted file mode 100644 index 1556403eb05..00000000000 --- a/asm/d/save/d_save_HIO/__ct__26dSvBit_childItOneZoneHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025BF08: -/* 8025BF08 3C 80 80 3C */ lis r4, __vt__26dSvBit_childItOneZoneHIO_c@ha /* 0x803C3330@ha */ -/* 8025BF0C 38 04 33 30 */ addi r0, r4, __vt__26dSvBit_childItOneZoneHIO_c@l /* 0x803C3330@l */ -/* 8025BF10 90 03 00 00 */ stw r0, 0(r3) -/* 8025BF14 38 C0 00 00 */ li r6, 0 -/* 8025BF18 38 80 00 00 */ li r4, 0 -/* 8025BF1C 38 00 00 10 */ li r0, 0x10 -/* 8025BF20 7C 09 03 A6 */ mtctr r0 -lbl_8025BF24: -/* 8025BF24 7C A3 32 14 */ add r5, r3, r6 -/* 8025BF28 98 85 00 05 */ stb r4, 5(r5) -/* 8025BF2C 98 85 00 15 */ stb r4, 0x15(r5) -/* 8025BF30 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BF34 42 00 FF F0 */ bdnz lbl_8025BF24 -/* 8025BF38 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__26dSvBit_childSwDungeonHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__26dSvBit_childSwDungeonHIO_cFv.s deleted file mode 100644 index 36c86f0c2d5..00000000000 --- a/asm/d/save/d_save_HIO/__ct__26dSvBit_childSwDungeonHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025BC14: -/* 8025BC14 3C 80 80 3C */ lis r4, __vt__26dSvBit_childSwDungeonHIO_c@ha /* 0x803C3378@ha */ -/* 8025BC18 38 04 33 78 */ addi r0, r4, __vt__26dSvBit_childSwDungeonHIO_c@l /* 0x803C3378@l */ -/* 8025BC1C 90 03 00 00 */ stw r0, 0(r3) -/* 8025BC20 38 C0 00 00 */ li r6, 0 -/* 8025BC24 38 80 00 00 */ li r4, 0 -/* 8025BC28 38 00 00 40 */ li r0, 0x40 -/* 8025BC2C 7C 09 03 A6 */ mtctr r0 -lbl_8025BC30: -/* 8025BC30 7C A3 32 14 */ add r5, r3, r6 -/* 8025BC34 98 85 00 05 */ stb r4, 5(r5) -/* 8025BC38 98 85 00 45 */ stb r4, 0x45(r5) -/* 8025BC3C 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BC40 42 00 FF F0 */ bdnz lbl_8025BC30 -/* 8025BC44 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__26dSvBit_childSwOneZoneHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__26dSvBit_childSwOneZoneHIO_cFv.s deleted file mode 100644 index 2d379c7e8b2..00000000000 --- a/asm/d/save/d_save_HIO/__ct__26dSvBit_childSwOneZoneHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025BD10: -/* 8025BD10 3C 80 80 3C */ lis r4, __vt__26dSvBit_childSwOneZoneHIO_c@ha /* 0x803C3360@ha */ -/* 8025BD14 38 04 33 60 */ addi r0, r4, __vt__26dSvBit_childSwOneZoneHIO_c@l /* 0x803C3360@l */ -/* 8025BD18 90 03 00 00 */ stw r0, 0(r3) -/* 8025BD1C 38 C0 00 00 */ li r6, 0 -/* 8025BD20 38 80 00 00 */ li r4, 0 -/* 8025BD24 38 00 00 10 */ li r0, 0x10 -/* 8025BD28 7C 09 03 A6 */ mtctr r0 -lbl_8025BD2C: -/* 8025BD2C 7C A3 32 14 */ add r5, r3, r6 -/* 8025BD30 98 85 00 05 */ stb r4, 5(r5) -/* 8025BD34 98 85 00 15 */ stb r4, 0x15(r5) -/* 8025BD38 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BD3C 42 00 FF F0 */ bdnz lbl_8025BD2C -/* 8025BD40 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__26dSvBit_childTransformHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__26dSvBit_childTransformHIO_cFv.s deleted file mode 100644 index c4ed8498ca1..00000000000 --- a/asm/d/save/d_save_HIO/__ct__26dSvBit_childTransformHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025C0A0: -/* 8025C0A0 3C 80 80 3C */ lis r4, __vt__26dSvBit_childTransformHIO_c@ha /* 0x803C330C@ha */ -/* 8025C0A4 38 04 33 0C */ addi r0, r4, __vt__26dSvBit_childTransformHIO_c@l /* 0x803C330C@l */ -/* 8025C0A8 90 03 00 00 */ stw r0, 0(r3) -/* 8025C0AC 38 C0 00 00 */ li r6, 0 -/* 8025C0B0 38 80 00 00 */ li r4, 0 -/* 8025C0B4 38 00 00 04 */ li r0, 4 -/* 8025C0B8 7C 09 03 A6 */ mtctr r0 -lbl_8025C0BC: -/* 8025C0BC 7C A3 32 14 */ add r5, r3, r6 -/* 8025C0C0 98 85 00 05 */ stb r4, 5(r5) -/* 8025C0C4 98 85 00 09 */ stb r4, 9(r5) -/* 8025C0C8 38 C6 00 01 */ addi r6, r6, 1 -/* 8025C0CC 42 00 FF F0 */ bdnz lbl_8025C0BC -/* 8025C0D0 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__29dSvBit_childItPerfectionHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__29dSvBit_childItPerfectionHIO_cFv.s deleted file mode 100644 index f7e2430698e..00000000000 --- a/asm/d/save/d_save_HIO/__ct__29dSvBit_childItPerfectionHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025BD70: -/* 8025BD70 3C 80 80 3C */ lis r4, __vt__29dSvBit_childItPerfectionHIO_c@ha /* 0x803C3354@ha */ -/* 8025BD74 38 04 33 54 */ addi r0, r4, __vt__29dSvBit_childItPerfectionHIO_c@l /* 0x803C3354@l */ -/* 8025BD78 90 03 00 00 */ stw r0, 0(r3) -/* 8025BD7C 38 C0 00 00 */ li r6, 0 -/* 8025BD80 38 80 00 00 */ li r4, 0 -/* 8025BD84 38 00 00 20 */ li r0, 0x20 -/* 8025BD88 7C 09 03 A6 */ mtctr r0 -lbl_8025BD8C: -/* 8025BD8C 7C A3 32 14 */ add r5, r3, r6 -/* 8025BD90 98 85 00 05 */ stb r4, 5(r5) -/* 8025BD94 98 85 00 25 */ stb r4, 0x25(r5) -/* 8025BD98 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BD9C 42 00 FF F0 */ bdnz lbl_8025BD8C -/* 8025BDA0 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__12dSvBit_HIO_cFv.s b/asm/d/save/d_save_HIO/__dt__12dSvBit_HIO_cFv.s deleted file mode 100644 index f42d8213758..00000000000 --- a/asm/d/save/d_save_HIO/__dt__12dSvBit_HIO_cFv.s +++ /dev/null @@ -1,108 +0,0 @@ -lbl_8025C6FC: -/* 8025C6FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C700 7C 08 02 A6 */ mflr r0 -/* 8025C704 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C708 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C70C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C710 41 82 01 4C */ beq lbl_8025C85C -/* 8025C714 3C 60 80 3C */ lis r3, __vt__12dSvBit_HIO_c@ha /* 0x803C33B4@ha */ -/* 8025C718 38 03 33 B4 */ addi r0, r3, __vt__12dSvBit_HIO_c@l /* 0x803C33B4@l */ -/* 8025C71C 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C720 34 1F 04 8C */ addic. r0, r31, 0x48c -/* 8025C724 41 82 00 10 */ beq lbl_8025C734 -/* 8025C728 3C 60 80 3C */ lis r3, __vt__22dSvBit_childOtherHIO_c@ha /* 0x803C3300@ha */ -/* 8025C72C 38 03 33 00 */ addi r0, r3, __vt__22dSvBit_childOtherHIO_c@l /* 0x803C3300@l */ -/* 8025C730 90 1F 04 8C */ stw r0, 0x48c(r31) -lbl_8025C734: -/* 8025C734 34 1F 04 7C */ addic. r0, r31, 0x47c -/* 8025C738 41 82 00 10 */ beq lbl_8025C748 -/* 8025C73C 3C 60 80 3C */ lis r3, __vt__26dSvBit_childTransformHIO_c@ha /* 0x803C330C@ha */ -/* 8025C740 38 03 33 0C */ addi r0, r3, __vt__26dSvBit_childTransformHIO_c@l /* 0x803C330C@l */ -/* 8025C744 90 1F 04 7C */ stw r0, 0x47c(r31) -lbl_8025C748: -/* 8025C748 34 1F 04 68 */ addic. r0, r31, 0x468 -/* 8025C74C 41 82 00 10 */ beq lbl_8025C75C -/* 8025C750 3C 60 80 3C */ lis r3, __vt__25dSvBit_childDarknessHIO_c@ha /* 0x803C3318@ha */ -/* 8025C754 38 03 33 18 */ addi r0, r3, __vt__25dSvBit_childDarknessHIO_c@l /* 0x803C3318@l */ -/* 8025C758 90 1F 04 68 */ stw r0, 0x468(r31) -lbl_8025C75C: -/* 8025C75C 34 1F 03 D8 */ addic. r0, r31, 0x3d8 -/* 8025C760 41 82 00 24 */ beq lbl_8025C784 -/* 8025C764 3C 60 80 3C */ lis r3, __vt__25dSvBit_childTreasureHIO_c@ha /* 0x803C3390@ha */ -/* 8025C768 38 03 33 90 */ addi r0, r3, __vt__25dSvBit_childTreasureHIO_c@l /* 0x803C3390@l */ -/* 8025C76C 90 1F 03 D8 */ stw r0, 0x3d8(r31) -/* 8025C770 34 1F 03 E0 */ addic. r0, r31, 0x3e0 -/* 8025C774 41 82 00 10 */ beq lbl_8025C784 -/* 8025C778 3C 60 80 3C */ lis r3, __vt__29dSvBit_childTbPerfectionHIO_c@ha /* 0x803C3324@ha */ -/* 8025C77C 38 03 33 24 */ addi r0, r3, __vt__29dSvBit_childTbPerfectionHIO_c@l /* 0x803C3324@l */ -/* 8025C780 90 1F 03 E0 */ stw r0, 0x3e0(r31) -lbl_8025C784: -/* 8025C784 34 1F 02 10 */ addic. r0, r31, 0x210 -/* 8025C788 41 82 00 60 */ beq lbl_8025C7E8 -/* 8025C78C 3C 60 80 3C */ lis r3, __vt__21dSvBit_childItemHIO_c@ha /* 0x803C339C@ha */ -/* 8025C790 38 03 33 9C */ addi r0, r3, __vt__21dSvBit_childItemHIO_c@l /* 0x803C339C@l */ -/* 8025C794 90 1F 02 10 */ stw r0, 0x210(r31) -/* 8025C798 34 1F 03 B0 */ addic. r0, r31, 0x3b0 -/* 8025C79C 41 82 00 10 */ beq lbl_8025C7AC -/* 8025C7A0 3C 60 80 3C */ lis r3, __vt__26dSvBit_childItOneZoneHIO_c@ha /* 0x803C3330@ha */ -/* 8025C7A4 38 03 33 30 */ addi r0, r3, __vt__26dSvBit_childItOneZoneHIO_c@l /* 0x803C3330@l */ -/* 8025C7A8 90 1F 03 B0 */ stw r0, 0x3b0(r31) -lbl_8025C7AC: -/* 8025C7AC 34 1F 03 68 */ addic. r0, r31, 0x368 -/* 8025C7B0 41 82 00 10 */ beq lbl_8025C7C0 -/* 8025C7B4 3C 60 80 3C */ lis r3, __vt__23dSvBit_childItZoneHIO_c@ha /* 0x803C333C@ha */ -/* 8025C7B8 38 03 33 3C */ addi r0, r3, __vt__23dSvBit_childItZoneHIO_c@l /* 0x803C333C@l */ -/* 8025C7BC 90 1F 03 68 */ stw r0, 0x368(r31) -lbl_8025C7C0: -/* 8025C7C0 34 1F 02 60 */ addic. r0, r31, 0x260 -/* 8025C7C4 41 82 00 10 */ beq lbl_8025C7D4 -/* 8025C7C8 3C 60 80 3C */ lis r3, __vt__26dSvBit_childItDungeonHIO_c@ha /* 0x803C3348@ha */ -/* 8025C7CC 38 03 33 48 */ addi r0, r3, __vt__26dSvBit_childItDungeonHIO_c@l /* 0x803C3348@l */ -/* 8025C7D0 90 1F 02 60 */ stw r0, 0x260(r31) -lbl_8025C7D4: -/* 8025C7D4 34 1F 02 18 */ addic. r0, r31, 0x218 -/* 8025C7D8 41 82 00 10 */ beq lbl_8025C7E8 -/* 8025C7DC 3C 60 80 3C */ lis r3, __vt__29dSvBit_childItPerfectionHIO_c@ha /* 0x803C3354@ha */ -/* 8025C7E0 38 03 33 54 */ addi r0, r3, __vt__29dSvBit_childItPerfectionHIO_c@l /* 0x803C3354@l */ -/* 8025C7E4 90 1F 02 18 */ stw r0, 0x218(r31) -lbl_8025C7E8: -/* 8025C7E8 34 1F 00 08 */ addic. r0, r31, 8 -/* 8025C7EC 41 82 00 60 */ beq lbl_8025C84C -/* 8025C7F0 3C 60 80 3C */ lis r3, __vt__23dSvBit_childSwitchHIO_c@ha /* 0x803C33A8@ha */ -/* 8025C7F4 38 03 33 A8 */ addi r0, r3, __vt__23dSvBit_childSwitchHIO_c@l /* 0x803C33A8@l */ -/* 8025C7F8 90 1F 00 08 */ stw r0, 8(r31) -/* 8025C7FC 34 1F 01 E8 */ addic. r0, r31, 0x1e8 -/* 8025C800 41 82 00 10 */ beq lbl_8025C810 -/* 8025C804 3C 60 80 3C */ lis r3, __vt__26dSvBit_childSwOneZoneHIO_c@ha /* 0x803C3360@ha */ -/* 8025C808 38 03 33 60 */ addi r0, r3, __vt__26dSvBit_childSwOneZoneHIO_c@l /* 0x803C3360@l */ -/* 8025C80C 90 1F 01 E8 */ stw r0, 0x1e8(r31) -lbl_8025C810: -/* 8025C810 34 1F 01 A0 */ addic. r0, r31, 0x1a0 -/* 8025C814 41 82 00 10 */ beq lbl_8025C824 -/* 8025C818 3C 60 80 3C */ lis r3, __vt__23dSvBit_childSwZoneHIO_c@ha /* 0x803C336C@ha */ -/* 8025C81C 38 03 33 6C */ addi r0, r3, __vt__23dSvBit_childSwZoneHIO_c@l /* 0x803C336C@l */ -/* 8025C820 90 1F 01 A0 */ stw r0, 0x1a0(r31) -lbl_8025C824: -/* 8025C824 34 1F 01 18 */ addic. r0, r31, 0x118 -/* 8025C828 41 82 00 10 */ beq lbl_8025C838 -/* 8025C82C 3C 60 80 3C */ lis r3, __vt__26dSvBit_childSwDungeonHIO_c@ha /* 0x803C3378@ha */ -/* 8025C830 38 03 33 78 */ addi r0, r3, __vt__26dSvBit_childSwDungeonHIO_c@l /* 0x803C3378@l */ -/* 8025C834 90 1F 01 18 */ stw r0, 0x118(r31) -lbl_8025C838: -/* 8025C838 34 1F 00 10 */ addic. r0, r31, 0x10 -/* 8025C83C 41 82 00 10 */ beq lbl_8025C84C -/* 8025C840 3C 60 80 3C */ lis r3, __vt__29dSvBit_childSwPerfectionHIO_c@ha /* 0x803C3384@ha */ -/* 8025C844 38 03 33 84 */ addi r0, r3, __vt__29dSvBit_childSwPerfectionHIO_c@l /* 0x803C3384@l */ -/* 8025C848 90 1F 00 10 */ stw r0, 0x10(r31) -lbl_8025C84C: -/* 8025C84C 7C 80 07 35 */ extsh. r0, r4 -/* 8025C850 40 81 00 0C */ ble lbl_8025C85C -/* 8025C854 7F E3 FB 78 */ mr r3, r31 -/* 8025C858 48 07 24 E5 */ bl __dl__FPv -lbl_8025C85C: -/* 8025C85C 7F E3 FB 78 */ mr r3, r31 -/* 8025C860 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C864 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C868 7C 08 03 A6 */ mtlr r0 -/* 8025C86C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C870 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__21dSvBit_childItemHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__21dSvBit_childItemHIO_cFv.s deleted file mode 100644 index 5804262d1a7..00000000000 --- a/asm/d/save/d_save_HIO/__dt__21dSvBit_childItemHIO_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8025C8D4: -/* 8025C8D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C8D8 7C 08 02 A6 */ mflr r0 -/* 8025C8DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C8E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C8E4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C8E8 41 82 00 70 */ beq lbl_8025C958 -/* 8025C8EC 3C 60 80 3C */ lis r3, __vt__21dSvBit_childItemHIO_c@ha /* 0x803C339C@ha */ -/* 8025C8F0 38 03 33 9C */ addi r0, r3, __vt__21dSvBit_childItemHIO_c@l /* 0x803C339C@l */ -/* 8025C8F4 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C8F8 34 1F 01 A0 */ addic. r0, r31, 0x1a0 -/* 8025C8FC 41 82 00 10 */ beq lbl_8025C90C -/* 8025C900 3C 60 80 3C */ lis r3, __vt__26dSvBit_childItOneZoneHIO_c@ha /* 0x803C3330@ha */ -/* 8025C904 38 03 33 30 */ addi r0, r3, __vt__26dSvBit_childItOneZoneHIO_c@l /* 0x803C3330@l */ -/* 8025C908 90 1F 01 A0 */ stw r0, 0x1a0(r31) -lbl_8025C90C: -/* 8025C90C 34 1F 01 58 */ addic. r0, r31, 0x158 -/* 8025C910 41 82 00 10 */ beq lbl_8025C920 -/* 8025C914 3C 60 80 3C */ lis r3, __vt__23dSvBit_childItZoneHIO_c@ha /* 0x803C333C@ha */ -/* 8025C918 38 03 33 3C */ addi r0, r3, __vt__23dSvBit_childItZoneHIO_c@l /* 0x803C333C@l */ -/* 8025C91C 90 1F 01 58 */ stw r0, 0x158(r31) -lbl_8025C920: -/* 8025C920 34 1F 00 50 */ addic. r0, r31, 0x50 -/* 8025C924 41 82 00 10 */ beq lbl_8025C934 -/* 8025C928 3C 60 80 3C */ lis r3, __vt__26dSvBit_childItDungeonHIO_c@ha /* 0x803C3348@ha */ -/* 8025C92C 38 03 33 48 */ addi r0, r3, __vt__26dSvBit_childItDungeonHIO_c@l /* 0x803C3348@l */ -/* 8025C930 90 1F 00 50 */ stw r0, 0x50(r31) -lbl_8025C934: -/* 8025C934 34 1F 00 08 */ addic. r0, r31, 8 -/* 8025C938 41 82 00 10 */ beq lbl_8025C948 -/* 8025C93C 3C 60 80 3C */ lis r3, __vt__29dSvBit_childItPerfectionHIO_c@ha /* 0x803C3354@ha */ -/* 8025C940 38 03 33 54 */ addi r0, r3, __vt__29dSvBit_childItPerfectionHIO_c@l /* 0x803C3354@l */ -/* 8025C944 90 1F 00 08 */ stw r0, 8(r31) -lbl_8025C948: -/* 8025C948 7C 80 07 35 */ extsh. r0, r4 -/* 8025C94C 40 81 00 0C */ ble lbl_8025C958 -/* 8025C950 7F E3 FB 78 */ mr r3, r31 -/* 8025C954 48 07 23 E9 */ bl __dl__FPv -lbl_8025C958: -/* 8025C958 7F E3 FB 78 */ mr r3, r31 -/* 8025C95C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C960 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C964 7C 08 03 A6 */ mtlr r0 -/* 8025C968 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C96C 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__22dSvBit_childOtherHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__22dSvBit_childOtherHIO_cFv.s deleted file mode 100644 index aca7f42b65a..00000000000 --- a/asm/d/save/d_save_HIO/__dt__22dSvBit_childOtherHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C29C: -/* 8025C29C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C2A0 7C 08 02 A6 */ mflr r0 -/* 8025C2A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C2A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C2AC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C2B0 41 82 00 1C */ beq lbl_8025C2CC -/* 8025C2B4 3C A0 80 3C */ lis r5, __vt__22dSvBit_childOtherHIO_c@ha /* 0x803C3300@ha */ -/* 8025C2B8 38 05 33 00 */ addi r0, r5, __vt__22dSvBit_childOtherHIO_c@l /* 0x803C3300@l */ -/* 8025C2BC 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C2C0 7C 80 07 35 */ extsh. r0, r4 -/* 8025C2C4 40 81 00 08 */ ble lbl_8025C2CC -/* 8025C2C8 48 07 2A 75 */ bl __dl__FPv -lbl_8025C2CC: -/* 8025C2CC 7F E3 FB 78 */ mr r3, r31 -/* 8025C2D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C2D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C2D8 7C 08 03 A6 */ mtlr r0 -/* 8025C2DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C2E0 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__23dSvBit_childItZoneHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__23dSvBit_childItZoneHIO_cFv.s deleted file mode 100644 index c600bc174be..00000000000 --- a/asm/d/save/d_save_HIO/__dt__23dSvBit_childItZoneHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C404: -/* 8025C404 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C408 7C 08 02 A6 */ mflr r0 -/* 8025C40C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C410 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C414 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C418 41 82 00 1C */ beq lbl_8025C434 -/* 8025C41C 3C A0 80 3C */ lis r5, __vt__23dSvBit_childItZoneHIO_c@ha /* 0x803C333C@ha */ -/* 8025C420 38 05 33 3C */ addi r0, r5, __vt__23dSvBit_childItZoneHIO_c@l /* 0x803C333C@l */ -/* 8025C424 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C428 7C 80 07 35 */ extsh. r0, r4 -/* 8025C42C 40 81 00 08 */ ble lbl_8025C434 -/* 8025C430 48 07 29 0D */ bl __dl__FPv -lbl_8025C434: -/* 8025C434 7F E3 FB 78 */ mr r3, r31 -/* 8025C438 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C43C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C440 7C 08 03 A6 */ mtlr r0 -/* 8025C444 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C448 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__23dSvBit_childSwZoneHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__23dSvBit_childSwZoneHIO_cFv.s deleted file mode 100644 index 923256718c3..00000000000 --- a/asm/d/save/d_save_HIO/__dt__23dSvBit_childSwZoneHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C524: -/* 8025C524 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C528 7C 08 02 A6 */ mflr r0 -/* 8025C52C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C530 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C534 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C538 41 82 00 1C */ beq lbl_8025C554 -/* 8025C53C 3C A0 80 3C */ lis r5, __vt__23dSvBit_childSwZoneHIO_c@ha /* 0x803C336C@ha */ -/* 8025C540 38 05 33 6C */ addi r0, r5, __vt__23dSvBit_childSwZoneHIO_c@l /* 0x803C336C@l */ -/* 8025C544 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C548 7C 80 07 35 */ extsh. r0, r4 -/* 8025C54C 40 81 00 08 */ ble lbl_8025C554 -/* 8025C550 48 07 27 ED */ bl __dl__FPv -lbl_8025C554: -/* 8025C554 7F E3 FB 78 */ mr r3, r31 -/* 8025C558 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C55C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C560 7C 08 03 A6 */ mtlr r0 -/* 8025C564 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C568 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__23dSvBit_childSwitchHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__23dSvBit_childSwitchHIO_cFv.s deleted file mode 100644 index 4ef98aedf6c..00000000000 --- a/asm/d/save/d_save_HIO/__dt__23dSvBit_childSwitchHIO_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8025C970: -/* 8025C970 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C974 7C 08 02 A6 */ mflr r0 -/* 8025C978 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C97C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C980 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C984 41 82 00 70 */ beq lbl_8025C9F4 -/* 8025C988 3C 60 80 3C */ lis r3, __vt__23dSvBit_childSwitchHIO_c@ha /* 0x803C33A8@ha */ -/* 8025C98C 38 03 33 A8 */ addi r0, r3, __vt__23dSvBit_childSwitchHIO_c@l /* 0x803C33A8@l */ -/* 8025C990 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C994 34 1F 01 E0 */ addic. r0, r31, 0x1e0 -/* 8025C998 41 82 00 10 */ beq lbl_8025C9A8 -/* 8025C99C 3C 60 80 3C */ lis r3, __vt__26dSvBit_childSwOneZoneHIO_c@ha /* 0x803C3360@ha */ -/* 8025C9A0 38 03 33 60 */ addi r0, r3, __vt__26dSvBit_childSwOneZoneHIO_c@l /* 0x803C3360@l */ -/* 8025C9A4 90 1F 01 E0 */ stw r0, 0x1e0(r31) -lbl_8025C9A8: -/* 8025C9A8 34 1F 01 98 */ addic. r0, r31, 0x198 -/* 8025C9AC 41 82 00 10 */ beq lbl_8025C9BC -/* 8025C9B0 3C 60 80 3C */ lis r3, __vt__23dSvBit_childSwZoneHIO_c@ha /* 0x803C336C@ha */ -/* 8025C9B4 38 03 33 6C */ addi r0, r3, __vt__23dSvBit_childSwZoneHIO_c@l /* 0x803C336C@l */ -/* 8025C9B8 90 1F 01 98 */ stw r0, 0x198(r31) -lbl_8025C9BC: -/* 8025C9BC 34 1F 01 10 */ addic. r0, r31, 0x110 -/* 8025C9C0 41 82 00 10 */ beq lbl_8025C9D0 -/* 8025C9C4 3C 60 80 3C */ lis r3, __vt__26dSvBit_childSwDungeonHIO_c@ha /* 0x803C3378@ha */ -/* 8025C9C8 38 03 33 78 */ addi r0, r3, __vt__26dSvBit_childSwDungeonHIO_c@l /* 0x803C3378@l */ -/* 8025C9CC 90 1F 01 10 */ stw r0, 0x110(r31) -lbl_8025C9D0: -/* 8025C9D0 34 1F 00 08 */ addic. r0, r31, 8 -/* 8025C9D4 41 82 00 10 */ beq lbl_8025C9E4 -/* 8025C9D8 3C 60 80 3C */ lis r3, __vt__29dSvBit_childSwPerfectionHIO_c@ha /* 0x803C3384@ha */ -/* 8025C9DC 38 03 33 84 */ addi r0, r3, __vt__29dSvBit_childSwPerfectionHIO_c@l /* 0x803C3384@l */ -/* 8025C9E0 90 1F 00 08 */ stw r0, 8(r31) -lbl_8025C9E4: -/* 8025C9E4 7C 80 07 35 */ extsh. r0, r4 -/* 8025C9E8 40 81 00 0C */ ble lbl_8025C9F4 -/* 8025C9EC 7F E3 FB 78 */ mr r3, r31 -/* 8025C9F0 48 07 23 4D */ bl __dl__FPv -lbl_8025C9F4: -/* 8025C9F4 7F E3 FB 78 */ mr r3, r31 -/* 8025C9F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C9FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025CA00 7C 08 03 A6 */ mtlr r0 -/* 8025CA04 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025CA08 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__25dSvBit_childDarknessHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__25dSvBit_childDarknessHIO_cFv.s deleted file mode 100644 index a992d48ab00..00000000000 --- a/asm/d/save/d_save_HIO/__dt__25dSvBit_childDarknessHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C32C: -/* 8025C32C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C330 7C 08 02 A6 */ mflr r0 -/* 8025C334 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C338 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C33C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C340 41 82 00 1C */ beq lbl_8025C35C -/* 8025C344 3C A0 80 3C */ lis r5, __vt__25dSvBit_childDarknessHIO_c@ha /* 0x803C3318@ha */ -/* 8025C348 38 05 33 18 */ addi r0, r5, __vt__25dSvBit_childDarknessHIO_c@l /* 0x803C3318@l */ -/* 8025C34C 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C350 7C 80 07 35 */ extsh. r0, r4 -/* 8025C354 40 81 00 08 */ ble lbl_8025C35C -/* 8025C358 48 07 29 E5 */ bl __dl__FPv -lbl_8025C35C: -/* 8025C35C 7F E3 FB 78 */ mr r3, r31 -/* 8025C360 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C364 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C368 7C 08 03 A6 */ mtlr r0 -/* 8025C36C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C370 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__25dSvBit_childTreasureHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__25dSvBit_childTreasureHIO_cFv.s deleted file mode 100644 index d761deeb11e..00000000000 --- a/asm/d/save/d_save_HIO/__dt__25dSvBit_childTreasureHIO_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8025C874: -/* 8025C874 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C878 7C 08 02 A6 */ mflr r0 -/* 8025C87C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C880 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C884 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C888 41 82 00 34 */ beq lbl_8025C8BC -/* 8025C88C 3C 60 80 3C */ lis r3, __vt__25dSvBit_childTreasureHIO_c@ha /* 0x803C3390@ha */ -/* 8025C890 38 03 33 90 */ addi r0, r3, __vt__25dSvBit_childTreasureHIO_c@l /* 0x803C3390@l */ -/* 8025C894 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C898 34 1F 00 08 */ addic. r0, r31, 8 -/* 8025C89C 41 82 00 10 */ beq lbl_8025C8AC -/* 8025C8A0 3C 60 80 3C */ lis r3, __vt__29dSvBit_childTbPerfectionHIO_c@ha /* 0x803C3324@ha */ -/* 8025C8A4 38 03 33 24 */ addi r0, r3, __vt__29dSvBit_childTbPerfectionHIO_c@l /* 0x803C3324@l */ -/* 8025C8A8 90 1F 00 08 */ stw r0, 8(r31) -lbl_8025C8AC: -/* 8025C8AC 7C 80 07 35 */ extsh. r0, r4 -/* 8025C8B0 40 81 00 0C */ ble lbl_8025C8BC -/* 8025C8B4 7F E3 FB 78 */ mr r3, r31 -/* 8025C8B8 48 07 24 85 */ bl __dl__FPv -lbl_8025C8BC: -/* 8025C8BC 7F E3 FB 78 */ mr r3, r31 -/* 8025C8C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C8C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C8C8 7C 08 03 A6 */ mtlr r0 -/* 8025C8CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C8D0 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__26dSvBit_childItDungeonHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__26dSvBit_childItDungeonHIO_cFv.s deleted file mode 100644 index a8d6b4c7e78..00000000000 --- a/asm/d/save/d_save_HIO/__dt__26dSvBit_childItDungeonHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C44C: -/* 8025C44C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C450 7C 08 02 A6 */ mflr r0 -/* 8025C454 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C458 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C45C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C460 41 82 00 1C */ beq lbl_8025C47C -/* 8025C464 3C A0 80 3C */ lis r5, __vt__26dSvBit_childItDungeonHIO_c@ha /* 0x803C3348@ha */ -/* 8025C468 38 05 33 48 */ addi r0, r5, __vt__26dSvBit_childItDungeonHIO_c@l /* 0x803C3348@l */ -/* 8025C46C 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C470 7C 80 07 35 */ extsh. r0, r4 -/* 8025C474 40 81 00 08 */ ble lbl_8025C47C -/* 8025C478 48 07 28 C5 */ bl __dl__FPv -lbl_8025C47C: -/* 8025C47C 7F E3 FB 78 */ mr r3, r31 -/* 8025C480 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C484 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C488 7C 08 03 A6 */ mtlr r0 -/* 8025C48C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C490 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__26dSvBit_childItOneZoneHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__26dSvBit_childItOneZoneHIO_cFv.s deleted file mode 100644 index aaaee9f22c4..00000000000 --- a/asm/d/save/d_save_HIO/__dt__26dSvBit_childItOneZoneHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C3BC: -/* 8025C3BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C3C0 7C 08 02 A6 */ mflr r0 -/* 8025C3C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C3C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C3CC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C3D0 41 82 00 1C */ beq lbl_8025C3EC -/* 8025C3D4 3C A0 80 3C */ lis r5, __vt__26dSvBit_childItOneZoneHIO_c@ha /* 0x803C3330@ha */ -/* 8025C3D8 38 05 33 30 */ addi r0, r5, __vt__26dSvBit_childItOneZoneHIO_c@l /* 0x803C3330@l */ -/* 8025C3DC 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C3E0 7C 80 07 35 */ extsh. r0, r4 -/* 8025C3E4 40 81 00 08 */ ble lbl_8025C3EC -/* 8025C3E8 48 07 29 55 */ bl __dl__FPv -lbl_8025C3EC: -/* 8025C3EC 7F E3 FB 78 */ mr r3, r31 -/* 8025C3F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C3F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C3F8 7C 08 03 A6 */ mtlr r0 -/* 8025C3FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C400 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__26dSvBit_childSwDungeonHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__26dSvBit_childSwDungeonHIO_cFv.s deleted file mode 100644 index 61ab8beae5e..00000000000 --- a/asm/d/save/d_save_HIO/__dt__26dSvBit_childSwDungeonHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C56C: -/* 8025C56C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C570 7C 08 02 A6 */ mflr r0 -/* 8025C574 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C578 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C57C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C580 41 82 00 1C */ beq lbl_8025C59C -/* 8025C584 3C A0 80 3C */ lis r5, __vt__26dSvBit_childSwDungeonHIO_c@ha /* 0x803C3378@ha */ -/* 8025C588 38 05 33 78 */ addi r0, r5, __vt__26dSvBit_childSwDungeonHIO_c@l /* 0x803C3378@l */ -/* 8025C58C 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C590 7C 80 07 35 */ extsh. r0, r4 -/* 8025C594 40 81 00 08 */ ble lbl_8025C59C -/* 8025C598 48 07 27 A5 */ bl __dl__FPv -lbl_8025C59C: -/* 8025C59C 7F E3 FB 78 */ mr r3, r31 -/* 8025C5A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C5A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C5A8 7C 08 03 A6 */ mtlr r0 -/* 8025C5AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C5B0 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__26dSvBit_childSwOneZoneHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__26dSvBit_childSwOneZoneHIO_cFv.s deleted file mode 100644 index 6e68da61b9c..00000000000 --- a/asm/d/save/d_save_HIO/__dt__26dSvBit_childSwOneZoneHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C4DC: -/* 8025C4DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C4E0 7C 08 02 A6 */ mflr r0 -/* 8025C4E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C4E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C4EC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C4F0 41 82 00 1C */ beq lbl_8025C50C -/* 8025C4F4 3C A0 80 3C */ lis r5, __vt__26dSvBit_childSwOneZoneHIO_c@ha /* 0x803C3360@ha */ -/* 8025C4F8 38 05 33 60 */ addi r0, r5, __vt__26dSvBit_childSwOneZoneHIO_c@l /* 0x803C3360@l */ -/* 8025C4FC 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C500 7C 80 07 35 */ extsh. r0, r4 -/* 8025C504 40 81 00 08 */ ble lbl_8025C50C -/* 8025C508 48 07 28 35 */ bl __dl__FPv -lbl_8025C50C: -/* 8025C50C 7F E3 FB 78 */ mr r3, r31 -/* 8025C510 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C514 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C518 7C 08 03 A6 */ mtlr r0 -/* 8025C51C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C520 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__26dSvBit_childTransformHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__26dSvBit_childTransformHIO_cFv.s deleted file mode 100644 index db816a74810..00000000000 --- a/asm/d/save/d_save_HIO/__dt__26dSvBit_childTransformHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C2E4: -/* 8025C2E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C2E8 7C 08 02 A6 */ mflr r0 -/* 8025C2EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C2F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C2F4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C2F8 41 82 00 1C */ beq lbl_8025C314 -/* 8025C2FC 3C A0 80 3C */ lis r5, __vt__26dSvBit_childTransformHIO_c@ha /* 0x803C330C@ha */ -/* 8025C300 38 05 33 0C */ addi r0, r5, __vt__26dSvBit_childTransformHIO_c@l /* 0x803C330C@l */ -/* 8025C304 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C308 7C 80 07 35 */ extsh. r0, r4 -/* 8025C30C 40 81 00 08 */ ble lbl_8025C314 -/* 8025C310 48 07 2A 2D */ bl __dl__FPv -lbl_8025C314: -/* 8025C314 7F E3 FB 78 */ mr r3, r31 -/* 8025C318 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C31C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C320 7C 08 03 A6 */ mtlr r0 -/* 8025C324 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C328 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__29dSvBit_childItPerfectionHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__29dSvBit_childItPerfectionHIO_cFv.s deleted file mode 100644 index 2f8bbb9120a..00000000000 --- a/asm/d/save/d_save_HIO/__dt__29dSvBit_childItPerfectionHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C494: -/* 8025C494 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C498 7C 08 02 A6 */ mflr r0 -/* 8025C49C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C4A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C4A4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C4A8 41 82 00 1C */ beq lbl_8025C4C4 -/* 8025C4AC 3C A0 80 3C */ lis r5, __vt__29dSvBit_childItPerfectionHIO_c@ha /* 0x803C3354@ha */ -/* 8025C4B0 38 05 33 54 */ addi r0, r5, __vt__29dSvBit_childItPerfectionHIO_c@l /* 0x803C3354@l */ -/* 8025C4B4 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C4B8 7C 80 07 35 */ extsh. r0, r4 -/* 8025C4BC 40 81 00 08 */ ble lbl_8025C4C4 -/* 8025C4C0 48 07 28 7D */ bl __dl__FPv -lbl_8025C4C4: -/* 8025C4C4 7F E3 FB 78 */ mr r3, r31 -/* 8025C4C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C4CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C4D0 7C 08 03 A6 */ mtlr r0 -/* 8025C4D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C4D8 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__29dSvBit_childSwPerfectionHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__29dSvBit_childSwPerfectionHIO_cFv.s deleted file mode 100644 index fcaa4bc78aa..00000000000 --- a/asm/d/save/d_save_HIO/__dt__29dSvBit_childSwPerfectionHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C5B4: -/* 8025C5B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C5B8 7C 08 02 A6 */ mflr r0 -/* 8025C5BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C5C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C5C4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C5C8 41 82 00 1C */ beq lbl_8025C5E4 -/* 8025C5CC 3C A0 80 3C */ lis r5, __vt__29dSvBit_childSwPerfectionHIO_c@ha /* 0x803C3384@ha */ -/* 8025C5D0 38 05 33 84 */ addi r0, r5, __vt__29dSvBit_childSwPerfectionHIO_c@l /* 0x803C3384@l */ -/* 8025C5D4 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C5D8 7C 80 07 35 */ extsh. r0, r4 -/* 8025C5DC 40 81 00 08 */ ble lbl_8025C5E4 -/* 8025C5E0 48 07 27 5D */ bl __dl__FPv -lbl_8025C5E4: -/* 8025C5E4 7F E3 FB 78 */ mr r3, r31 -/* 8025C5E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C5EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C5F0 7C 08 03 A6 */ mtlr r0 -/* 8025C5F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C5F8 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__29dSvBit_childTbPerfectionHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__29dSvBit_childTbPerfectionHIO_cFv.s deleted file mode 100644 index a7a7248f8e1..00000000000 --- a/asm/d/save/d_save_HIO/__dt__29dSvBit_childTbPerfectionHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C374: -/* 8025C374 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C378 7C 08 02 A6 */ mflr r0 -/* 8025C37C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C380 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C384 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C388 41 82 00 1C */ beq lbl_8025C3A4 -/* 8025C38C 3C A0 80 3C */ lis r5, __vt__29dSvBit_childTbPerfectionHIO_c@ha /* 0x803C3324@ha */ -/* 8025C390 38 05 33 24 */ addi r0, r5, __vt__29dSvBit_childTbPerfectionHIO_c@l /* 0x803C3324@l */ -/* 8025C394 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C398 7C 80 07 35 */ extsh. r0, r4 -/* 8025C39C 40 81 00 08 */ ble lbl_8025C3A4 -/* 8025C3A0 48 07 29 9D */ bl __dl__FPv -lbl_8025C3A4: -/* 8025C3A4 7F E3 FB 78 */ mr r3, r31 -/* 8025C3A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C3AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C3B0 7C 08 03 A6 */ mtlr r0 -/* 8025C3B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C3B8 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__sinit_d_save_HIO_cpp.s b/asm/d/save/d_save_HIO/__sinit_d_save_HIO_cpp.s deleted file mode 100644 index 69f1b34c782..00000000000 --- a/asm/d/save/d_save_HIO/__sinit_d_save_HIO_cpp.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_8025C5FC: -/* 8025C5FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C600 7C 08 02 A6 */ mflr r0 -/* 8025C604 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C608 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C60C 3C 60 80 3C */ lis r3, __vt__12dSvBit_HIO_c@ha /* 0x803C33B4@ha */ -/* 8025C610 38 03 33 B4 */ addi r0, r3, __vt__12dSvBit_HIO_c@l /* 0x803C33B4@l */ -/* 8025C614 3C 60 80 43 */ lis r3, g_save_bit_HIO@ha /* 0x804307EC@ha */ -/* 8025C618 3B E3 07 EC */ addi r31, r3, g_save_bit_HIO@l /* 0x804307EC@l */ -/* 8025C61C 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C620 3C 60 80 3C */ lis r3, __vt__23dSvBit_childSwitchHIO_c@ha /* 0x803C33A8@ha */ -/* 8025C624 38 03 33 A8 */ addi r0, r3, __vt__23dSvBit_childSwitchHIO_c@l /* 0x803C33A8@l */ -/* 8025C628 90 1F 00 08 */ stw r0, 8(r31) -/* 8025C62C 38 7F 00 10 */ addi r3, r31, 0x10 -/* 8025C630 4B FF F5 49 */ bl __ct__29dSvBit_childSwPerfectionHIO_cFv -/* 8025C634 38 7F 01 18 */ addi r3, r31, 0x118 -/* 8025C638 4B FF F5 DD */ bl __ct__26dSvBit_childSwDungeonHIO_cFv -/* 8025C63C 38 7F 01 A0 */ addi r3, r31, 0x1a0 -/* 8025C640 4B FF F6 71 */ bl __ct__23dSvBit_childSwZoneHIO_cFv -/* 8025C644 38 7F 01 E8 */ addi r3, r31, 0x1e8 -/* 8025C648 4B FF F6 C9 */ bl __ct__26dSvBit_childSwOneZoneHIO_cFv -/* 8025C64C 3C 60 80 43 */ lis r3, g_save_bit_HIO@ha /* 0x804307EC@ha */ -/* 8025C650 3B E3 07 EC */ addi r31, r3, g_save_bit_HIO@l /* 0x804307EC@l */ -/* 8025C654 3C 60 80 3C */ lis r3, __vt__21dSvBit_childItemHIO_c@ha /* 0x803C339C@ha */ -/* 8025C658 38 03 33 9C */ addi r0, r3, __vt__21dSvBit_childItemHIO_c@l /* 0x803C339C@l */ -/* 8025C65C 90 1F 02 10 */ stw r0, 0x210(r31) -/* 8025C660 38 7F 02 18 */ addi r3, r31, 0x218 -/* 8025C664 4B FF F7 0D */ bl __ct__29dSvBit_childItPerfectionHIO_cFv -/* 8025C668 38 7F 02 60 */ addi r3, r31, 0x260 -/* 8025C66C 4B FF F7 A1 */ bl __ct__26dSvBit_childItDungeonHIO_cFv -/* 8025C670 38 7F 03 68 */ addi r3, r31, 0x368 -/* 8025C674 4B FF F8 35 */ bl __ct__23dSvBit_childItZoneHIO_cFv -/* 8025C678 38 7F 03 B0 */ addi r3, r31, 0x3b0 -/* 8025C67C 4B FF F8 8D */ bl __ct__26dSvBit_childItOneZoneHIO_cFv -/* 8025C680 3C 60 80 43 */ lis r3, g_save_bit_HIO@ha /* 0x804307EC@ha */ -/* 8025C684 38 83 07 EC */ addi r4, r3, g_save_bit_HIO@l /* 0x804307EC@l */ -/* 8025C688 3C 60 80 3C */ lis r3, __vt__25dSvBit_childTreasureHIO_c@ha /* 0x803C3390@ha */ -/* 8025C68C 38 03 33 90 */ addi r0, r3, __vt__25dSvBit_childTreasureHIO_c@l /* 0x803C3390@l */ -/* 8025C690 90 04 03 D8 */ stw r0, 0x3d8(r4) -/* 8025C694 38 64 03 E0 */ addi r3, r4, 0x3e0 -/* 8025C698 4B FF F8 D1 */ bl __ct__29dSvBit_childTbPerfectionHIO_cFv -/* 8025C69C 3C 60 80 43 */ lis r3, g_save_bit_HIO@ha /* 0x804307EC@ha */ -/* 8025C6A0 38 63 07 EC */ addi r3, r3, g_save_bit_HIO@l /* 0x804307EC@l */ -/* 8025C6A4 38 63 04 68 */ addi r3, r3, 0x468 -/* 8025C6A8 4B FF F9 5D */ bl __ct__25dSvBit_childDarknessHIO_cFv -/* 8025C6AC 3C 60 80 43 */ lis r3, g_save_bit_HIO@ha /* 0x804307EC@ha */ -/* 8025C6B0 38 63 07 EC */ addi r3, r3, g_save_bit_HIO@l /* 0x804307EC@l */ -/* 8025C6B4 38 63 04 7C */ addi r3, r3, 0x47c -/* 8025C6B8 4B FF F9 E9 */ bl __ct__26dSvBit_childTransformHIO_cFv -/* 8025C6BC 3C 60 80 43 */ lis r3, g_save_bit_HIO@ha /* 0x804307EC@ha */ -/* 8025C6C0 38 63 07 EC */ addi r3, r3, g_save_bit_HIO@l /* 0x804307EC@l */ -/* 8025C6C4 38 63 04 8C */ addi r3, r3, 0x48c -/* 8025C6C8 4B FF FA 75 */ bl __ct__22dSvBit_childOtherHIO_cFv -/* 8025C6CC 3C 60 80 43 */ lis r3, g_save_bit_HIO@ha /* 0x804307EC@ha */ -/* 8025C6D0 38 63 07 EC */ addi r3, r3, g_save_bit_HIO@l /* 0x804307EC@l */ -/* 8025C6D4 3C 80 80 26 */ lis r4, __dt__12dSvBit_HIO_cFv@ha /* 0x8025C6FC@ha */ -/* 8025C6D8 38 84 C6 FC */ addi r4, r4, __dt__12dSvBit_HIO_cFv@l /* 0x8025C6FC@l */ -/* 8025C6DC 3C A0 80 43 */ lis r5, lit_3659@ha /* 0x804307E0@ha */ -/* 8025C6E0 38 A5 07 E0 */ addi r5, r5, lit_3659@l /* 0x804307E0@l */ -/* 8025C6E4 48 10 55 41 */ bl __register_global_object -/* 8025C6E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C6EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C6F0 7C 08 03 A6 */ mtlr r0 -/* 8025C6F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C6F8 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__12dSvBit_HIO_cFv.s b/asm/d/save/d_save_HIO/init__12dSvBit_HIO_cFv.s deleted file mode 100644 index e6259f920f1..00000000000 --- a/asm/d/save/d_save_HIO/init__12dSvBit_HIO_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8025C1F8: -/* 8025C1F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C1FC 7C 08 02 A6 */ mflr r0 -/* 8025C200 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C204 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C208 7C 7F 1B 78 */ mr r31, r3 -/* 8025C20C 38 7F 00 10 */ addi r3, r31, 0x10 -/* 8025C210 4B FF F9 9D */ bl init__29dSvBit_childSwPerfectionHIO_cFv -/* 8025C214 38 7F 01 18 */ addi r3, r31, 0x118 -/* 8025C218 4B FF FA 31 */ bl init__26dSvBit_childSwDungeonHIO_cFv -/* 8025C21C 38 7F 01 A0 */ addi r3, r31, 0x1a0 -/* 8025C220 4B FF FA C5 */ bl init__23dSvBit_childSwZoneHIO_cFv -/* 8025C224 38 7F 01 E8 */ addi r3, r31, 0x1e8 -/* 8025C228 4B FF FB 1D */ bl init__26dSvBit_childSwOneZoneHIO_cFv -/* 8025C22C 38 7F 02 18 */ addi r3, r31, 0x218 -/* 8025C230 4B FF FB 75 */ bl init__29dSvBit_childItPerfectionHIO_cFv -/* 8025C234 38 7F 02 60 */ addi r3, r31, 0x260 -/* 8025C238 4B FF FC 09 */ bl init__26dSvBit_childItDungeonHIO_cFv -/* 8025C23C 38 7F 03 68 */ addi r3, r31, 0x368 -/* 8025C240 4B FF FC 9D */ bl init__23dSvBit_childItZoneHIO_cFv -/* 8025C244 38 7F 03 B0 */ addi r3, r31, 0x3b0 -/* 8025C248 4B FF FC F5 */ bl init__26dSvBit_childItOneZoneHIO_cFv -/* 8025C24C 38 7F 03 E0 */ addi r3, r31, 0x3e0 -/* 8025C250 4B FF FD 4D */ bl init__29dSvBit_childTbPerfectionHIO_cFv -/* 8025C254 38 7F 04 68 */ addi r3, r31, 0x468 -/* 8025C258 4B FF FD E1 */ bl init__25dSvBit_childDarknessHIO_cFv -/* 8025C25C 38 7F 04 7C */ addi r3, r31, 0x47c -/* 8025C260 4B FF FE 75 */ bl init__26dSvBit_childTransformHIO_cFv -/* 8025C264 38 7F 04 8C */ addi r3, r31, 0x48c -/* 8025C268 4B FF FF 11 */ bl init__22dSvBit_childOtherHIO_cFv -/* 8025C26C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025C270 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025C274 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8025C278 38 80 0D 04 */ li r4, 0xd04 -/* 8025C27C 4B DD 87 41 */ bl isEventBit__11dSv_event_cCFUs -/* 8025C280 98 7F 04 9D */ stb r3, 0x49d(r31) -/* 8025C284 98 7F 04 9C */ stb r3, 0x49c(r31) -/* 8025C288 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C28C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C290 7C 08 03 A6 */ mtlr r0 -/* 8025C294 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C298 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__22dSvBit_childOtherHIO_cFv.s b/asm/d/save/d_save_HIO/init__22dSvBit_childOtherHIO_cFv.s deleted file mode 100644 index 0d4cdf4d36f..00000000000 --- a/asm/d/save/d_save_HIO/init__22dSvBit_childOtherHIO_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8025C178: -/* 8025C178 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025C17C 7C 08 02 A6 */ mflr r0 -/* 8025C180 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025C184 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025C188 48 10 60 55 */ bl _savegpr_29 -/* 8025C18C 7C 7D 1B 78 */ mr r29, r3 -/* 8025C190 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025C194 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025C198 3B E4 01 14 */ addi r31, r4, 0x114 -/* 8025C19C 7F E3 FB 78 */ mr r3, r31 -/* 8025C1A0 88 84 4E 0C */ lbz r4, 0x4e0c(r4) -/* 8025C1A4 4B DD 81 9D */ bl getLightDropNum__16dSv_light_drop_cCFUc -/* 8025C1A8 98 7D 00 05 */ stb r3, 5(r29) -/* 8025C1AC 88 1D 00 05 */ lbz r0, 5(r29) -/* 8025C1B0 98 1D 00 06 */ stb r0, 6(r29) -/* 8025C1B4 3B C0 00 00 */ li r30, 0 -lbl_8025C1B8: -/* 8025C1B8 7F E3 FB 78 */ mr r3, r31 -/* 8025C1BC 57 C4 06 3E */ clrlwi r4, r30, 0x18 -/* 8025C1C0 4B DD 81 DD */ bl isLightDropGetFlag__16dSv_light_drop_cCFUc -/* 8025C1C4 7C 9D F2 14 */ add r4, r29, r30 -/* 8025C1C8 98 64 00 07 */ stb r3, 7(r4) -/* 8025C1CC 88 04 00 07 */ lbz r0, 7(r4) -/* 8025C1D0 98 04 00 0B */ stb r0, 0xb(r4) -/* 8025C1D4 3B DE 00 01 */ addi r30, r30, 1 -/* 8025C1D8 2C 1E 00 04 */ cmpwi r30, 4 -/* 8025C1DC 41 80 FF DC */ blt lbl_8025C1B8 -/* 8025C1E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025C1E4 48 10 60 45 */ bl _restgpr_29 -/* 8025C1E8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025C1EC 7C 08 03 A6 */ mtlr r0 -/* 8025C1F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025C1F4 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__23dSvBit_childItZoneHIO_cFv.s b/asm/d/save/d_save_HIO/init__23dSvBit_childItZoneHIO_cFv.s deleted file mode 100644 index 7595d0a5cd4..00000000000 --- a/asm/d/save/d_save_HIO/init__23dSvBit_childItZoneHIO_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8025BEDC: -/* 8025BEDC 38 C0 00 00 */ li r6, 0 -/* 8025BEE0 38 80 00 00 */ li r4, 0 -/* 8025BEE4 38 00 00 20 */ li r0, 0x20 -/* 8025BEE8 7C 09 03 A6 */ mtctr r0 -lbl_8025BEEC: -/* 8025BEEC 7C A3 32 14 */ add r5, r3, r6 -/* 8025BEF0 98 85 00 05 */ stb r4, 5(r5) -/* 8025BEF4 88 05 00 05 */ lbz r0, 5(r5) -/* 8025BEF8 98 05 00 25 */ stb r0, 0x25(r5) -/* 8025BEFC 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BF00 42 00 FF EC */ bdnz lbl_8025BEEC -/* 8025BF04 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__23dSvBit_childSwZoneHIO_cFv.s b/asm/d/save/d_save_HIO/init__23dSvBit_childSwZoneHIO_cFv.s deleted file mode 100644 index 65a84a3e838..00000000000 --- a/asm/d/save/d_save_HIO/init__23dSvBit_childSwZoneHIO_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8025BCE4: -/* 8025BCE4 38 C0 00 00 */ li r6, 0 -/* 8025BCE8 38 80 00 00 */ li r4, 0 -/* 8025BCEC 38 00 00 20 */ li r0, 0x20 -/* 8025BCF0 7C 09 03 A6 */ mtctr r0 -lbl_8025BCF4: -/* 8025BCF4 7C A3 32 14 */ add r5, r3, r6 -/* 8025BCF8 98 85 00 05 */ stb r4, 5(r5) -/* 8025BCFC 88 05 00 05 */ lbz r0, 5(r5) -/* 8025BD00 98 05 00 25 */ stb r0, 0x25(r5) -/* 8025BD04 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BD08 42 00 FF EC */ bdnz lbl_8025BCF4 -/* 8025BD0C 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__25dSvBit_childDarknessHIO_cFv.s b/asm/d/save/d_save_HIO/init__25dSvBit_childDarknessHIO_cFv.s deleted file mode 100644 index 382d8273ceb..00000000000 --- a/asm/d/save/d_save_HIO/init__25dSvBit_childDarknessHIO_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8025C038: -/* 8025C038 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025C03C 7C 08 02 A6 */ mflr r0 -/* 8025C040 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025C044 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025C048 48 10 61 95 */ bl _savegpr_29 -/* 8025C04C 7C 7D 1B 78 */ mr r29, r3 -/* 8025C050 3B C0 00 00 */ li r30, 0 -/* 8025C054 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025C058 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025C05C 3B E3 00 28 */ addi r31, r3, 0x28 -lbl_8025C060: -/* 8025C060 7F E3 FB 78 */ mr r3, r31 -/* 8025C064 7F C4 F3 78 */ mr r4, r30 -/* 8025C068 4B DD 6B 49 */ bl isDarkClearLV__21dSv_player_status_b_cCFi -/* 8025C06C 7C 9D F2 14 */ add r4, r29, r30 -/* 8025C070 98 64 00 05 */ stb r3, 5(r4) -/* 8025C074 88 04 00 05 */ lbz r0, 5(r4) -/* 8025C078 98 04 00 0B */ stb r0, 0xb(r4) -/* 8025C07C 3B DE 00 01 */ addi r30, r30, 1 -/* 8025C080 2C 1E 00 06 */ cmpwi r30, 6 -/* 8025C084 41 80 FF DC */ blt lbl_8025C060 -/* 8025C088 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025C08C 48 10 61 9D */ bl _restgpr_29 -/* 8025C090 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025C094 7C 08 03 A6 */ mtlr r0 -/* 8025C098 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025C09C 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__26dSvBit_childItDungeonHIO_cFv.s b/asm/d/save/d_save_HIO/init__26dSvBit_childItDungeonHIO_cFv.s deleted file mode 100644 index 3e786b7f9f2..00000000000 --- a/asm/d/save/d_save_HIO/init__26dSvBit_childItDungeonHIO_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8025BE40: -/* 8025BE40 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025BE44 7C 08 02 A6 */ mflr r0 -/* 8025BE48 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025BE4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BE50 48 10 63 8D */ bl _savegpr_29 -/* 8025BE54 7C 7D 1B 78 */ mr r29, r3 -/* 8025BE58 3B C0 00 00 */ li r30, 0 -/* 8025BE5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025BE60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025BE64 3B E3 09 78 */ addi r31, r3, 0x978 -lbl_8025BE68: -/* 8025BE68 7F E3 FB 78 */ mr r3, r31 -/* 8025BE6C 7F C4 F3 78 */ mr r4, r30 -/* 8025BE70 4B DD 8E 05 */ bl isItem__12dSv_danBit_cCFi -/* 8025BE74 7C 9D F2 14 */ add r4, r29, r30 -/* 8025BE78 98 64 00 05 */ stb r3, 5(r4) -/* 8025BE7C 88 04 00 05 */ lbz r0, 5(r4) -/* 8025BE80 98 04 00 85 */ stb r0, 0x85(r4) -/* 8025BE84 3B DE 00 01 */ addi r30, r30, 1 -/* 8025BE88 2C 1E 00 80 */ cmpwi r30, 0x80 -/* 8025BE8C 41 80 FF DC */ blt lbl_8025BE68 -/* 8025BE90 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BE94 48 10 63 95 */ bl _restgpr_29 -/* 8025BE98 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025BE9C 7C 08 03 A6 */ mtlr r0 -/* 8025BEA0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025BEA4 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__26dSvBit_childItOneZoneHIO_cFv.s b/asm/d/save/d_save_HIO/init__26dSvBit_childItOneZoneHIO_cFv.s deleted file mode 100644 index 8975c81b1f7..00000000000 --- a/asm/d/save/d_save_HIO/init__26dSvBit_childItOneZoneHIO_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8025BF3C: -/* 8025BF3C 38 C0 00 00 */ li r6, 0 -/* 8025BF40 38 80 00 00 */ li r4, 0 -/* 8025BF44 38 00 00 10 */ li r0, 0x10 -/* 8025BF48 7C 09 03 A6 */ mtctr r0 -lbl_8025BF4C: -/* 8025BF4C 7C A3 32 14 */ add r5, r3, r6 -/* 8025BF50 98 85 00 05 */ stb r4, 5(r5) -/* 8025BF54 88 05 00 05 */ lbz r0, 5(r5) -/* 8025BF58 98 05 00 15 */ stb r0, 0x15(r5) -/* 8025BF5C 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BF60 42 00 FF EC */ bdnz lbl_8025BF4C -/* 8025BF64 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__26dSvBit_childSwDungeonHIO_cFv.s b/asm/d/save/d_save_HIO/init__26dSvBit_childSwDungeonHIO_cFv.s deleted file mode 100644 index b415cc80eeb..00000000000 --- a/asm/d/save/d_save_HIO/init__26dSvBit_childSwDungeonHIO_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8025BC48: -/* 8025BC48 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025BC4C 7C 08 02 A6 */ mflr r0 -/* 8025BC50 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025BC54 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BC58 48 10 65 85 */ bl _savegpr_29 -/* 8025BC5C 7C 7D 1B 78 */ mr r29, r3 -/* 8025BC60 3B C0 00 00 */ li r30, 0 -/* 8025BC64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025BC68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025BC6C 3B E3 09 78 */ addi r31, r3, 0x978 -lbl_8025BC70: -/* 8025BC70 7F E3 FB 78 */ mr r3, r31 -/* 8025BC74 7F C4 F3 78 */ mr r4, r30 -/* 8025BC78 4B DD 8F 71 */ bl isSwitch__12dSv_danBit_cCFi -/* 8025BC7C 7C 9D F2 14 */ add r4, r29, r30 -/* 8025BC80 98 64 00 05 */ stb r3, 5(r4) -/* 8025BC84 88 04 00 05 */ lbz r0, 5(r4) -/* 8025BC88 98 04 00 45 */ stb r0, 0x45(r4) -/* 8025BC8C 3B DE 00 01 */ addi r30, r30, 1 -/* 8025BC90 2C 1E 00 40 */ cmpwi r30, 0x40 -/* 8025BC94 41 80 FF DC */ blt lbl_8025BC70 -/* 8025BC98 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BC9C 48 10 65 8D */ bl _restgpr_29 -/* 8025BCA0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025BCA4 7C 08 03 A6 */ mtlr r0 -/* 8025BCA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025BCAC 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__26dSvBit_childSwOneZoneHIO_cFv.s b/asm/d/save/d_save_HIO/init__26dSvBit_childSwOneZoneHIO_cFv.s deleted file mode 100644 index cbdfb868329..00000000000 --- a/asm/d/save/d_save_HIO/init__26dSvBit_childSwOneZoneHIO_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8025BD44: -/* 8025BD44 38 C0 00 00 */ li r6, 0 -/* 8025BD48 38 80 00 00 */ li r4, 0 -/* 8025BD4C 38 00 00 10 */ li r0, 0x10 -/* 8025BD50 7C 09 03 A6 */ mtctr r0 -lbl_8025BD54: -/* 8025BD54 7C A3 32 14 */ add r5, r3, r6 -/* 8025BD58 98 85 00 05 */ stb r4, 5(r5) -/* 8025BD5C 88 05 00 05 */ lbz r0, 5(r5) -/* 8025BD60 98 05 00 15 */ stb r0, 0x15(r5) -/* 8025BD64 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BD68 42 00 FF EC */ bdnz lbl_8025BD54 -/* 8025BD6C 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__26dSvBit_childTransformHIO_cFv.s b/asm/d/save/d_save_HIO/init__26dSvBit_childTransformHIO_cFv.s deleted file mode 100644 index 5359fa0825a..00000000000 --- a/asm/d/save/d_save_HIO/init__26dSvBit_childTransformHIO_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8025C0D4: -/* 8025C0D4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025C0D8 7C 08 02 A6 */ mflr r0 -/* 8025C0DC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025C0E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025C0E4 48 10 60 F9 */ bl _savegpr_29 -/* 8025C0E8 7C 7D 1B 78 */ mr r29, r3 -/* 8025C0EC 3B C0 00 00 */ li r30, 0 -/* 8025C0F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025C0F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025C0F8 3B E3 00 28 */ addi r31, r3, 0x28 -lbl_8025C0FC: -/* 8025C0FC 7F E3 FB 78 */ mr r3, r31 -/* 8025C100 7F C4 F3 78 */ mr r4, r30 -/* 8025C104 4B DD 6A E9 */ bl isTransformLV__21dSv_player_status_b_cCFi -/* 8025C108 7C 9D F2 14 */ add r4, r29, r30 -/* 8025C10C 98 64 00 05 */ stb r3, 5(r4) -/* 8025C110 88 04 00 05 */ lbz r0, 5(r4) -/* 8025C114 98 04 00 09 */ stb r0, 9(r4) -/* 8025C118 3B DE 00 01 */ addi r30, r30, 1 -/* 8025C11C 2C 1E 00 04 */ cmpwi r30, 4 -/* 8025C120 41 80 FF DC */ blt lbl_8025C0FC -/* 8025C124 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025C128 48 10 61 01 */ bl _restgpr_29 -/* 8025C12C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025C130 7C 08 03 A6 */ mtlr r0 -/* 8025C134 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025C138 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__29dSvBit_childItPerfectionHIO_cFv.s b/asm/d/save/d_save_HIO/init__29dSvBit_childItPerfectionHIO_cFv.s deleted file mode 100644 index 4f76fd98c2f..00000000000 --- a/asm/d/save/d_save_HIO/init__29dSvBit_childItPerfectionHIO_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8025BDA4: -/* 8025BDA4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025BDA8 7C 08 02 A6 */ mflr r0 -/* 8025BDAC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025BDB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BDB4 48 10 64 29 */ bl _savegpr_29 -/* 8025BDB8 7C 7D 1B 78 */ mr r29, r3 -/* 8025BDBC 3B C0 00 00 */ li r30, 0 -/* 8025BDC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025BDC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025BDC8 3B E3 09 58 */ addi r31, r3, 0x958 -lbl_8025BDCC: -/* 8025BDCC 7F E3 FB 78 */ mr r3, r31 -/* 8025BDD0 7F C4 F3 78 */ mr r4, r30 -/* 8025BDD4 4B DD 8B 19 */ bl isItem__12dSv_memBit_cCFi -/* 8025BDD8 7C 9D F2 14 */ add r4, r29, r30 -/* 8025BDDC 98 64 00 05 */ stb r3, 5(r4) -/* 8025BDE0 88 04 00 05 */ lbz r0, 5(r4) -/* 8025BDE4 98 04 00 25 */ stb r0, 0x25(r4) -/* 8025BDE8 3B DE 00 01 */ addi r30, r30, 1 -/* 8025BDEC 2C 1E 00 20 */ cmpwi r30, 0x20 -/* 8025BDF0 41 80 FF DC */ blt lbl_8025BDCC -/* 8025BDF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BDF8 48 10 64 31 */ bl _restgpr_29 -/* 8025BDFC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025BE00 7C 08 03 A6 */ mtlr r0 -/* 8025BE04 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025BE08 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__29dSvBit_childSwPerfectionHIO_cFv.s b/asm/d/save/d_save_HIO/init__29dSvBit_childSwPerfectionHIO_cFv.s deleted file mode 100644 index f0ed57ae9cc..00000000000 --- a/asm/d/save/d_save_HIO/init__29dSvBit_childSwPerfectionHIO_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8025BBAC: -/* 8025BBAC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025BBB0 7C 08 02 A6 */ mflr r0 -/* 8025BBB4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025BBB8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BBBC 48 10 66 21 */ bl _savegpr_29 -/* 8025BBC0 7C 7D 1B 78 */ mr r29, r3 -/* 8025BBC4 3B C0 00 00 */ li r30, 0 -/* 8025BBC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025BBCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025BBD0 3B E3 09 58 */ addi r31, r3, 0x958 -lbl_8025BBD4: -/* 8025BBD4 7F E3 FB 78 */ mr r3, r31 -/* 8025BBD8 7F C4 F3 78 */ mr r4, r30 -/* 8025BBDC 4B DD 8C 85 */ bl isSwitch__12dSv_memBit_cCFi -/* 8025BBE0 7C 9D F2 14 */ add r4, r29, r30 -/* 8025BBE4 98 64 00 05 */ stb r3, 5(r4) -/* 8025BBE8 88 04 00 05 */ lbz r0, 5(r4) -/* 8025BBEC 98 04 00 85 */ stb r0, 0x85(r4) -/* 8025BBF0 3B DE 00 01 */ addi r30, r30, 1 -/* 8025BBF4 2C 1E 00 80 */ cmpwi r30, 0x80 -/* 8025BBF8 41 80 FF DC */ blt lbl_8025BBD4 -/* 8025BBFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BC00 48 10 66 29 */ bl _restgpr_29 -/* 8025BC04 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025BC08 7C 08 03 A6 */ mtlr r0 -/* 8025BC0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025BC10 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__29dSvBit_childTbPerfectionHIO_cFv.s b/asm/d/save/d_save_HIO/init__29dSvBit_childTbPerfectionHIO_cFv.s deleted file mode 100644 index 187aa6895a5..00000000000 --- a/asm/d/save/d_save_HIO/init__29dSvBit_childTbPerfectionHIO_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8025BF9C: -/* 8025BF9C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025BFA0 7C 08 02 A6 */ mflr r0 -/* 8025BFA4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025BFA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BFAC 48 10 62 31 */ bl _savegpr_29 -/* 8025BFB0 7C 7D 1B 78 */ mr r29, r3 -/* 8025BFB4 3B C0 00 00 */ li r30, 0 -/* 8025BFB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025BFBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025BFC0 3B E3 09 58 */ addi r31, r3, 0x958 -lbl_8025BFC4: -/* 8025BFC4 7F E3 FB 78 */ mr r3, r31 -/* 8025BFC8 7F C4 F3 78 */ mr r4, r30 -/* 8025BFCC 4B DD 88 1D */ bl isTbox__12dSv_memBit_cCFi -/* 8025BFD0 7C 9D F2 14 */ add r4, r29, r30 -/* 8025BFD4 98 64 00 05 */ stb r3, 5(r4) -/* 8025BFD8 88 04 00 05 */ lbz r0, 5(r4) -/* 8025BFDC 98 04 00 45 */ stb r0, 0x45(r4) -/* 8025BFE0 3B DE 00 01 */ addi r30, r30, 1 -/* 8025BFE4 2C 1E 00 40 */ cmpwi r30, 0x40 -/* 8025BFE8 41 80 FF DC */ blt lbl_8025BFC4 -/* 8025BFEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BFF0 48 10 62 39 */ bl _restgpr_29 -/* 8025BFF4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025BFF8 7C 08 03 A6 */ mtlr r0 -/* 8025BFFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025C000 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/chooseItem3__13dShopSystem_cFUc.s b/asm/d/shop/d_shop_system/chooseItem3__13dShopSystem_cFUc.s deleted file mode 100644 index e354b4d7e8a..00000000000 --- a/asm/d/shop/d_shop_system/chooseItem3__13dShopSystem_cFUc.s +++ /dev/null @@ -1,396 +0,0 @@ -lbl_80197808: -/* 80197808 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8019780C 7C 08 02 A6 */ mflr r0 -/* 80197810 90 01 00 44 */ stw r0, 0x44(r1) -/* 80197814 39 61 00 40 */ addi r11, r1, 0x40 -/* 80197818 48 1C A9 C5 */ bl _savegpr_29 -/* 8019781C 7C 7D 1B 78 */ mr r29, r3 -/* 80197820 7C 9E 23 78 */ mr r30, r4 -/* 80197824 8B E3 0F 6F */ lbz r31, 0xf6f(r3) -/* 80197828 80 83 0E 40 */ lwz r4, 0xe40(r3) -/* 8019782C 48 00 33 35 */ bl checkLeftTrigger__13dShopSystem_cFP9STControl -/* 80197830 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80197834 41 82 02 1C */ beq lbl_80197A50 -/* 80197838 57 C3 06 3E */ clrlwi r3, r30, 0x18 -/* 8019783C 28 03 00 02 */ cmplwi r3, 2 -/* 80197840 41 82 02 10 */ beq lbl_80197A50 -/* 80197844 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197848 28 00 00 07 */ cmplwi r0, 7 -/* 8019784C 40 82 00 BC */ bne lbl_80197908 -/* 80197850 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 80197854 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197858 38 00 00 07 */ li r0, 7 -/* 8019785C 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 80197860 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 80197864 28 04 00 00 */ cmplwi r4, 0 -/* 80197868 41 82 00 28 */ beq lbl_80197890 -/* 8019786C 7F A3 EB 78 */ mr r3, r29 -/* 80197870 38 84 FF FF */ addi r4, r4, -1 -/* 80197874 4B FF FD 85 */ bl isFlag__13dShopSystem_cFi -/* 80197878 2C 03 00 00 */ cmpwi r3, 0 -/* 8019787C 41 82 00 14 */ beq lbl_80197890 -/* 80197880 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 80197884 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197888 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 8019788C 48 00 01 C4 */ b lbl_80197A50 -lbl_80197890: -/* 80197890 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197894 28 00 00 01 */ cmplwi r0, 1 -/* 80197898 41 82 00 68 */ beq lbl_80197900 -/* 8019789C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 801978A0 28 00 00 00 */ cmplwi r0, 0 -/* 801978A4 41 82 00 38 */ beq lbl_801978DC -/* 801978A8 38 00 00 5F */ li r0, 0x5f -/* 801978AC 90 01 00 20 */ stw r0, 0x20(r1) -/* 801978B0 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801978B4 38 81 00 20 */ addi r4, r1, 0x20 -/* 801978B8 38 A0 00 00 */ li r5, 0 -/* 801978BC 38 C0 00 00 */ li r6, 0 -/* 801978C0 38 E0 00 00 */ li r7, 0 -/* 801978C4 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 801978C8 FC 40 08 90 */ fmr f2, f1 -/* 801978CC C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 801978D0 FC 80 18 90 */ fmr f4, f3 -/* 801978D4 39 00 00 00 */ li r8, 0 -/* 801978D8 48 11 40 AD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_801978DC: -/* 801978DC 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 801978E0 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 801978E4 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 801978E8 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 801978EC C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 801978F0 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 801978F4 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 801978F8 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 801978FC D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80197900: -/* 80197900 38 60 00 03 */ li r3, 3 -/* 80197904 48 00 04 B4 */ b lbl_80197DB8 -lbl_80197908: -/* 80197908 28 00 00 04 */ cmplwi r0, 4 -/* 8019790C 40 82 00 84 */ bne lbl_80197990 -/* 80197910 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 80197914 38 00 00 00 */ li r0, 0 -/* 80197918 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 8019791C 28 03 00 01 */ cmplwi r3, 1 -/* 80197920 41 82 00 68 */ beq lbl_80197988 -/* 80197924 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197928 28 00 00 00 */ cmplwi r0, 0 -/* 8019792C 41 82 00 38 */ beq lbl_80197964 -/* 80197930 38 00 00 5F */ li r0, 0x5f -/* 80197934 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80197938 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 8019793C 38 81 00 1C */ addi r4, r1, 0x1c -/* 80197940 38 A0 00 00 */ li r5, 0 -/* 80197944 38 C0 00 00 */ li r6, 0 -/* 80197948 38 E0 00 00 */ li r7, 0 -/* 8019794C C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197950 FC 40 08 90 */ fmr f2, f1 -/* 80197954 C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80197958 FC 80 18 90 */ fmr f4, f3 -/* 8019795C 39 00 00 00 */ li r8, 0 -/* 80197960 48 11 40 25 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80197964: -/* 80197964 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197968 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 8019796C C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80197970 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80197974 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80197978 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 8019797C D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80197980 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80197984 D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80197988: -/* 80197988 38 60 00 03 */ li r3, 3 -/* 8019798C 48 00 04 2C */ b lbl_80197DB8 -lbl_80197990: -/* 80197990 28 00 00 00 */ cmplwi r0, 0 -/* 80197994 41 82 00 BC */ beq lbl_80197A50 -/* 80197998 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 8019799C 88 7D 0F 6E */ lbz r3, 0xf6e(r29) -/* 801979A0 38 03 FF FF */ addi r0, r3, -1 -/* 801979A4 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 801979A8 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 801979AC 28 04 00 00 */ cmplwi r4, 0 -/* 801979B0 41 82 00 28 */ beq lbl_801979D8 -/* 801979B4 7F A3 EB 78 */ mr r3, r29 -/* 801979B8 38 84 FF FF */ addi r4, r4, -1 -/* 801979BC 4B FF FC 3D */ bl isFlag__13dShopSystem_cFi -/* 801979C0 2C 03 00 00 */ cmpwi r3, 0 -/* 801979C4 41 82 00 14 */ beq lbl_801979D8 -/* 801979C8 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 801979CC 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 801979D0 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 801979D4 48 00 00 7C */ b lbl_80197A50 -lbl_801979D8: -/* 801979D8 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801979DC 28 00 00 01 */ cmplwi r0, 1 -/* 801979E0 41 82 00 68 */ beq lbl_80197A48 -/* 801979E4 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 801979E8 28 00 00 00 */ cmplwi r0, 0 -/* 801979EC 41 82 00 38 */ beq lbl_80197A24 -/* 801979F0 38 00 00 5F */ li r0, 0x5f -/* 801979F4 90 01 00 18 */ stw r0, 0x18(r1) -/* 801979F8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801979FC 38 81 00 18 */ addi r4, r1, 0x18 -/* 80197A00 38 A0 00 00 */ li r5, 0 -/* 80197A04 38 C0 00 00 */ li r6, 0 -/* 80197A08 38 E0 00 00 */ li r7, 0 -/* 80197A0C C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197A10 FC 40 08 90 */ fmr f2, f1 -/* 80197A14 C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80197A18 FC 80 18 90 */ fmr f4, f3 -/* 80197A1C 39 00 00 00 */ li r8, 0 -/* 80197A20 48 11 3F 65 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80197A24: -/* 80197A24 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197A28 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80197A2C C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80197A30 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80197A34 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80197A38 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80197A3C D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80197A40 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80197A44 D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80197A48: -/* 80197A48 38 60 00 03 */ li r3, 3 -/* 80197A4C 48 00 03 6C */ b lbl_80197DB8 -lbl_80197A50: -/* 80197A50 7F A3 EB 78 */ mr r3, r29 -/* 80197A54 80 9D 0E 40 */ lwz r4, 0xe40(r29) -/* 80197A58 48 00 31 2D */ bl checkRightTrigger__13dShopSystem_cFP9STControl -/* 80197A5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80197A60 41 82 01 8C */ beq lbl_80197BEC -/* 80197A64 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197A68 28 00 00 02 */ cmplwi r0, 2 -/* 80197A6C 41 82 01 80 */ beq lbl_80197BEC -/* 80197A70 88 7D 0F 6E */ lbz r3, 0xf6e(r29) -/* 80197A74 28 03 00 07 */ cmplwi r3, 7 -/* 80197A78 41 82 01 74 */ beq lbl_80197BEC -/* 80197A7C 28 03 00 03 */ cmplwi r3, 3 -/* 80197A80 41 82 00 B8 */ beq lbl_80197B38 -/* 80197A84 28 03 00 06 */ cmplwi r3, 6 -/* 80197A88 41 82 00 B0 */ beq lbl_80197B38 -/* 80197A8C 98 7D 0F 6F */ stb r3, 0xf6f(r29) -/* 80197A90 88 7D 0F 6E */ lbz r3, 0xf6e(r29) -/* 80197A94 38 03 00 01 */ addi r0, r3, 1 -/* 80197A98 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197A9C 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 80197AA0 28 04 00 00 */ cmplwi r4, 0 -/* 80197AA4 41 82 00 28 */ beq lbl_80197ACC -/* 80197AA8 7F A3 EB 78 */ mr r3, r29 -/* 80197AAC 38 84 FF FF */ addi r4, r4, -1 -/* 80197AB0 4B FF FB 49 */ bl isFlag__13dShopSystem_cFi -/* 80197AB4 2C 03 00 00 */ cmpwi r3, 0 -/* 80197AB8 41 82 00 14 */ beq lbl_80197ACC -/* 80197ABC 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 80197AC0 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197AC4 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 80197AC8 48 00 01 24 */ b lbl_80197BEC -lbl_80197ACC: -/* 80197ACC 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197AD0 28 00 00 01 */ cmplwi r0, 1 -/* 80197AD4 41 82 00 5C */ beq lbl_80197B30 -/* 80197AD8 38 00 00 5F */ li r0, 0x5f -/* 80197ADC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80197AE0 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80197AE4 38 81 00 14 */ addi r4, r1, 0x14 -/* 80197AE8 38 A0 00 00 */ li r5, 0 -/* 80197AEC 38 C0 00 00 */ li r6, 0 -/* 80197AF0 38 E0 00 00 */ li r7, 0 -/* 80197AF4 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197AF8 FC 40 08 90 */ fmr f2, f1 -/* 80197AFC C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80197B00 FC 80 18 90 */ fmr f4, f3 -/* 80197B04 39 00 00 00 */ li r8, 0 -/* 80197B08 48 11 3E 7D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80197B0C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197B10 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80197B14 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80197B18 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80197B1C C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80197B20 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80197B24 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80197B28 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80197B2C D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80197B30: -/* 80197B30 38 60 00 04 */ li r3, 4 -/* 80197B34 48 00 02 84 */ b lbl_80197DB8 -lbl_80197B38: -/* 80197B38 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 80197B3C 28 00 00 07 */ cmplwi r0, 7 -/* 80197B40 40 82 00 AC */ bne lbl_80197BEC -/* 80197B44 98 7D 0F 6F */ stb r3, 0xf6f(r29) -/* 80197B48 38 00 00 07 */ li r0, 7 -/* 80197B4C 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197B50 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 80197B54 28 04 00 00 */ cmplwi r4, 0 -/* 80197B58 41 82 00 28 */ beq lbl_80197B80 -/* 80197B5C 7F A3 EB 78 */ mr r3, r29 -/* 80197B60 38 84 FF FF */ addi r4, r4, -1 -/* 80197B64 4B FF FA 95 */ bl isFlag__13dShopSystem_cFi -/* 80197B68 2C 03 00 00 */ cmpwi r3, 0 -/* 80197B6C 41 82 00 14 */ beq lbl_80197B80 -/* 80197B70 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 80197B74 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197B78 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 80197B7C 48 00 00 70 */ b lbl_80197BEC -lbl_80197B80: -/* 80197B80 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197B84 28 00 00 01 */ cmplwi r0, 1 -/* 80197B88 41 82 00 5C */ beq lbl_80197BE4 -/* 80197B8C 38 00 00 5F */ li r0, 0x5f -/* 80197B90 90 01 00 10 */ stw r0, 0x10(r1) -/* 80197B94 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80197B98 38 81 00 10 */ addi r4, r1, 0x10 -/* 80197B9C 38 A0 00 00 */ li r5, 0 -/* 80197BA0 38 C0 00 00 */ li r6, 0 -/* 80197BA4 38 E0 00 00 */ li r7, 0 -/* 80197BA8 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197BAC FC 40 08 90 */ fmr f2, f1 -/* 80197BB0 C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80197BB4 FC 80 18 90 */ fmr f4, f3 -/* 80197BB8 39 00 00 00 */ li r8, 0 -/* 80197BBC 48 11 3D C9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80197BC0 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197BC4 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80197BC8 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80197BCC D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80197BD0 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80197BD4 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80197BD8 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80197BDC C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80197BE0 D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80197BE4: -/* 80197BE4 38 60 00 04 */ li r3, 4 -/* 80197BE8 48 00 01 D0 */ b lbl_80197DB8 -lbl_80197BEC: -/* 80197BEC 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 80197BF0 28 00 00 06 */ cmplwi r0, 6 -/* 80197BF4 41 80 01 C0 */ blt lbl_80197DB4 -/* 80197BF8 80 7D 0E 40 */ lwz r3, 0xe40(r29) -/* 80197BFC 4B E9 A9 29 */ bl checkUpTrigger__9STControlFv -/* 80197C00 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80197C04 41 82 00 D4 */ beq lbl_80197CD8 -/* 80197C08 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197C0C 28 00 00 02 */ cmplwi r0, 2 -/* 80197C10 41 82 00 C8 */ beq lbl_80197CD8 -/* 80197C14 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197C18 28 00 00 03 */ cmplwi r0, 3 -/* 80197C1C 41 81 00 BC */ bgt lbl_80197CD8 -/* 80197C20 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 80197C24 88 7D 0F 6E */ lbz r3, 0xf6e(r29) -/* 80197C28 38 03 00 03 */ addi r0, r3, 3 -/* 80197C2C 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197C30 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 80197C34 28 04 00 00 */ cmplwi r4, 0 -/* 80197C38 41 82 00 28 */ beq lbl_80197C60 -/* 80197C3C 7F A3 EB 78 */ mr r3, r29 -/* 80197C40 38 84 FF FF */ addi r4, r4, -1 -/* 80197C44 4B FF F9 B5 */ bl isFlag__13dShopSystem_cFi -/* 80197C48 2C 03 00 00 */ cmpwi r3, 0 -/* 80197C4C 41 82 00 14 */ beq lbl_80197C60 -/* 80197C50 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 80197C54 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197C58 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 80197C5C 48 00 00 7C */ b lbl_80197CD8 -lbl_80197C60: -/* 80197C60 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197C64 28 00 00 01 */ cmplwi r0, 1 -/* 80197C68 41 82 00 68 */ beq lbl_80197CD0 -/* 80197C6C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197C70 28 00 00 00 */ cmplwi r0, 0 -/* 80197C74 41 82 00 38 */ beq lbl_80197CAC -/* 80197C78 38 00 00 5F */ li r0, 0x5f -/* 80197C7C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80197C80 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80197C84 38 81 00 0C */ addi r4, r1, 0xc -/* 80197C88 38 A0 00 00 */ li r5, 0 -/* 80197C8C 38 C0 00 00 */ li r6, 0 -/* 80197C90 38 E0 00 00 */ li r7, 0 -/* 80197C94 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197C98 FC 40 08 90 */ fmr f2, f1 -/* 80197C9C C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80197CA0 FC 80 18 90 */ fmr f4, f3 -/* 80197CA4 39 00 00 00 */ li r8, 0 -/* 80197CA8 48 11 3C DD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80197CAC: -/* 80197CAC 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197CB0 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80197CB4 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80197CB8 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80197CBC C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80197CC0 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80197CC4 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80197CC8 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80197CCC D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80197CD0: -/* 80197CD0 38 60 00 05 */ li r3, 5 -/* 80197CD4 48 00 00 E4 */ b lbl_80197DB8 -lbl_80197CD8: -/* 80197CD8 80 7D 0E 40 */ lwz r3, 0xe40(r29) -/* 80197CDC 4B E9 A8 C5 */ bl checkDownTrigger__9STControlFv -/* 80197CE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80197CE4 41 82 00 D0 */ beq lbl_80197DB4 -/* 80197CE8 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197CEC 28 00 00 02 */ cmplwi r0, 2 -/* 80197CF0 41 82 00 C4 */ beq lbl_80197DB4 -/* 80197CF4 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197CF8 28 00 00 03 */ cmplwi r0, 3 -/* 80197CFC 40 81 00 B8 */ ble lbl_80197DB4 -/* 80197D00 28 00 00 06 */ cmplwi r0, 6 -/* 80197D04 41 81 00 B0 */ bgt lbl_80197DB4 -/* 80197D08 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 80197D0C 88 7D 0F 6E */ lbz r3, 0xf6e(r29) -/* 80197D10 38 03 FF FD */ addi r0, r3, -3 -/* 80197D14 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197D18 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 80197D1C 28 04 00 00 */ cmplwi r4, 0 -/* 80197D20 41 82 00 28 */ beq lbl_80197D48 -/* 80197D24 7F A3 EB 78 */ mr r3, r29 -/* 80197D28 38 84 FF FF */ addi r4, r4, -1 -/* 80197D2C 4B FF F8 CD */ bl isFlag__13dShopSystem_cFi -/* 80197D30 2C 03 00 00 */ cmpwi r3, 0 -/* 80197D34 41 82 00 14 */ beq lbl_80197D48 -/* 80197D38 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 80197D3C 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197D40 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 80197D44 48 00 00 70 */ b lbl_80197DB4 -lbl_80197D48: -/* 80197D48 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197D4C 28 00 00 01 */ cmplwi r0, 1 -/* 80197D50 41 82 00 5C */ beq lbl_80197DAC -/* 80197D54 38 00 00 5F */ li r0, 0x5f -/* 80197D58 90 01 00 08 */ stw r0, 8(r1) -/* 80197D5C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80197D60 38 81 00 08 */ addi r4, r1, 8 -/* 80197D64 38 A0 00 00 */ li r5, 0 -/* 80197D68 38 C0 00 00 */ li r6, 0 -/* 80197D6C 38 E0 00 00 */ li r7, 0 -/* 80197D70 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197D74 FC 40 08 90 */ fmr f2, f1 -/* 80197D78 C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80197D7C FC 80 18 90 */ fmr f4, f3 -/* 80197D80 39 00 00 00 */ li r8, 0 -/* 80197D84 48 11 3C 01 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80197D88 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197D8C B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80197D90 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80197D94 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80197D98 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80197D9C D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80197DA0 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80197DA4 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80197DA8 D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80197DAC: -/* 80197DAC 38 60 00 06 */ li r3, 6 -/* 80197DB0 48 00 00 08 */ b lbl_80197DB8 -lbl_80197DB4: -/* 80197DB4 38 60 00 00 */ li r3, 0 -lbl_80197DB8: -/* 80197DB8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80197DBC 48 1C A4 6D */ bl _restgpr_29 -/* 80197DC0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80197DC4 7C 08 03 A6 */ mtlr r0 -/* 80197DC8 38 21 00 40 */ addi r1, r1, 0x40 -/* 80197DCC 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/chooseItem4__13dShopSystem_cFUc.s b/asm/d/shop/d_shop_system/chooseItem4__13dShopSystem_cFUc.s deleted file mode 100644 index c6ee81129eb..00000000000 --- a/asm/d/shop/d_shop_system/chooseItem4__13dShopSystem_cFUc.s +++ /dev/null @@ -1,134 +0,0 @@ -lbl_80198250: -/* 80198250 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80198254 7C 08 02 A6 */ mflr r0 -/* 80198258 90 01 00 24 */ stw r0, 0x24(r1) -/* 8019825C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80198260 48 1C 9F 7D */ bl _savegpr_29 -/* 80198264 7C 7F 1B 78 */ mr r31, r3 -/* 80198268 7C 9D 23 78 */ mr r29, r4 -/* 8019826C 8B C3 0F 6F */ lbz r30, 0xf6f(r3) -/* 80198270 80 83 0E 40 */ lwz r4, 0xe40(r3) -/* 80198274 48 00 28 ED */ bl checkLeftTrigger__13dShopSystem_cFP9STControl -/* 80198278 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8019827C 41 82 00 D4 */ beq lbl_80198350 -/* 80198280 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80198284 28 00 00 02 */ cmplwi r0, 2 -/* 80198288 41 82 00 C8 */ beq lbl_80198350 -/* 8019828C 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 80198290 28 00 00 00 */ cmplwi r0, 0 -/* 80198294 41 82 00 BC */ beq lbl_80198350 -/* 80198298 98 1F 0F 6F */ stb r0, 0xf6f(r31) -/* 8019829C 88 7F 0F 6E */ lbz r3, 0xf6e(r31) -/* 801982A0 38 03 FF FF */ addi r0, r3, -1 -/* 801982A4 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 801982A8 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 801982AC 28 04 00 00 */ cmplwi r4, 0 -/* 801982B0 41 82 00 28 */ beq lbl_801982D8 -/* 801982B4 7F E3 FB 78 */ mr r3, r31 -/* 801982B8 38 84 FF FF */ addi r4, r4, -1 -/* 801982BC 4B FF F3 3D */ bl isFlag__13dShopSystem_cFi -/* 801982C0 2C 03 00 00 */ cmpwi r3, 0 -/* 801982C4 41 82 00 14 */ beq lbl_801982D8 -/* 801982C8 88 1F 0F 6F */ lbz r0, 0xf6f(r31) -/* 801982CC 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 801982D0 9B DF 0F 6F */ stb r30, 0xf6f(r31) -/* 801982D4 48 00 00 7C */ b lbl_80198350 -lbl_801982D8: -/* 801982D8 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 801982DC 28 00 00 01 */ cmplwi r0, 1 -/* 801982E0 41 82 00 68 */ beq lbl_80198348 -/* 801982E4 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 801982E8 28 00 00 00 */ cmplwi r0, 0 -/* 801982EC 41 82 00 38 */ beq lbl_80198324 -/* 801982F0 38 00 00 5F */ li r0, 0x5f -/* 801982F4 90 01 00 0C */ stw r0, 0xc(r1) -/* 801982F8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801982FC 38 81 00 0C */ addi r4, r1, 0xc -/* 80198300 38 A0 00 00 */ li r5, 0 -/* 80198304 38 C0 00 00 */ li r6, 0 -/* 80198308 38 E0 00 00 */ li r7, 0 -/* 8019830C C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80198310 FC 40 08 90 */ fmr f2, f1 -/* 80198314 C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80198318 FC 80 18 90 */ fmr f4, f3 -/* 8019831C 39 00 00 00 */ li r8, 0 -/* 80198320 48 11 36 65 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80198324: -/* 80198324 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 80198328 B0 1F 0F 4C */ sth r0, 0xf4c(r31) -/* 8019832C C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80198330 D0 3F 0F 38 */ stfs f1, 0xf38(r31) -/* 80198334 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80198338 D0 1F 0F 3C */ stfs f0, 0xf3c(r31) -/* 8019833C D0 3F 0F 40 */ stfs f1, 0xf40(r31) -/* 80198340 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80198344 D0 1F 0F 44 */ stfs f0, 0xf44(r31) -lbl_80198348: -/* 80198348 38 60 00 03 */ li r3, 3 -/* 8019834C 48 00 00 E0 */ b lbl_8019842C -lbl_80198350: -/* 80198350 7F E3 FB 78 */ mr r3, r31 -/* 80198354 80 9F 0E 40 */ lwz r4, 0xe40(r31) -/* 80198358 48 00 28 2D */ bl checkRightTrigger__13dShopSystem_cFP9STControl -/* 8019835C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80198360 41 82 00 C8 */ beq lbl_80198428 -/* 80198364 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80198368 28 00 00 02 */ cmplwi r0, 2 -/* 8019836C 41 82 00 BC */ beq lbl_80198428 -/* 80198370 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 80198374 28 00 00 04 */ cmplwi r0, 4 -/* 80198378 40 80 00 B0 */ bge lbl_80198428 -/* 8019837C 98 1F 0F 6F */ stb r0, 0xf6f(r31) -/* 80198380 88 7F 0F 6E */ lbz r3, 0xf6e(r31) -/* 80198384 38 03 00 01 */ addi r0, r3, 1 -/* 80198388 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 8019838C 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 80198390 28 04 00 00 */ cmplwi r4, 0 -/* 80198394 41 82 00 28 */ beq lbl_801983BC -/* 80198398 7F E3 FB 78 */ mr r3, r31 -/* 8019839C 38 84 FF FF */ addi r4, r4, -1 -/* 801983A0 4B FF F2 59 */ bl isFlag__13dShopSystem_cFi -/* 801983A4 2C 03 00 00 */ cmpwi r3, 0 -/* 801983A8 41 82 00 14 */ beq lbl_801983BC -/* 801983AC 88 1F 0F 6F */ lbz r0, 0xf6f(r31) -/* 801983B0 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 801983B4 9B DF 0F 6F */ stb r30, 0xf6f(r31) -/* 801983B8 48 00 00 70 */ b lbl_80198428 -lbl_801983BC: -/* 801983BC 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 801983C0 28 00 00 01 */ cmplwi r0, 1 -/* 801983C4 41 82 00 5C */ beq lbl_80198420 -/* 801983C8 38 00 00 5F */ li r0, 0x5f -/* 801983CC 90 01 00 08 */ stw r0, 8(r1) -/* 801983D0 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801983D4 38 81 00 08 */ addi r4, r1, 8 -/* 801983D8 38 A0 00 00 */ li r5, 0 -/* 801983DC 38 C0 00 00 */ li r6, 0 -/* 801983E0 38 E0 00 00 */ li r7, 0 -/* 801983E4 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 801983E8 FC 40 08 90 */ fmr f2, f1 -/* 801983EC C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 801983F0 FC 80 18 90 */ fmr f4, f3 -/* 801983F4 39 00 00 00 */ li r8, 0 -/* 801983F8 48 11 35 8D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801983FC 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 80198400 B0 1F 0F 4C */ sth r0, 0xf4c(r31) -/* 80198404 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80198408 D0 3F 0F 38 */ stfs f1, 0xf38(r31) -/* 8019840C C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80198410 D0 1F 0F 3C */ stfs f0, 0xf3c(r31) -/* 80198414 D0 3F 0F 40 */ stfs f1, 0xf40(r31) -/* 80198418 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 8019841C D0 1F 0F 44 */ stfs f0, 0xf44(r31) -lbl_80198420: -/* 80198420 38 60 00 04 */ li r3, 4 -/* 80198424 48 00 00 08 */ b lbl_8019842C -lbl_80198428: -/* 80198428 38 60 00 00 */ li r3, 0 -lbl_8019842C: -/* 8019842C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80198430 48 1C 9D F9 */ bl _restgpr_29 -/* 80198434 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80198438 7C 08 03 A6 */ mtlr r0 -/* 8019843C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80198440 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/chooseItem5__13dShopSystem_cFUc.s b/asm/d/shop/d_shop_system/chooseItem5__13dShopSystem_cFUc.s deleted file mode 100644 index 56e8c640b65..00000000000 --- a/asm/d/shop/d_shop_system/chooseItem5__13dShopSystem_cFUc.s +++ /dev/null @@ -1,313 +0,0 @@ -lbl_80197DD0: -/* 80197DD0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80197DD4 7C 08 02 A6 */ mflr r0 -/* 80197DD8 90 01 00 34 */ stw r0, 0x34(r1) -/* 80197DDC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80197DE0 48 1C A3 FD */ bl _savegpr_29 -/* 80197DE4 7C 7D 1B 78 */ mr r29, r3 -/* 80197DE8 7C 9E 23 78 */ mr r30, r4 -/* 80197DEC 8B E3 0F 6F */ lbz r31, 0xf6f(r3) -/* 80197DF0 80 83 0E 40 */ lwz r4, 0xe40(r3) -/* 80197DF4 48 00 2D 6D */ bl checkLeftTrigger__13dShopSystem_cFP9STControl -/* 80197DF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80197DFC 41 82 01 5C */ beq lbl_80197F58 -/* 80197E00 57 C3 06 3E */ clrlwi r3, r30, 0x18 -/* 80197E04 28 03 00 02 */ cmplwi r3, 2 -/* 80197E08 41 82 01 50 */ beq lbl_80197F58 -/* 80197E0C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197E10 28 00 00 03 */ cmplwi r0, 3 -/* 80197E14 40 82 00 84 */ bne lbl_80197E98 -/* 80197E18 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 80197E1C 38 00 00 00 */ li r0, 0 -/* 80197E20 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197E24 28 03 00 01 */ cmplwi r3, 1 -/* 80197E28 41 82 00 68 */ beq lbl_80197E90 -/* 80197E2C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197E30 28 00 00 00 */ cmplwi r0, 0 -/* 80197E34 41 82 00 38 */ beq lbl_80197E6C -/* 80197E38 38 00 00 5F */ li r0, 0x5f -/* 80197E3C 90 01 00 18 */ stw r0, 0x18(r1) -/* 80197E40 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80197E44 38 81 00 18 */ addi r4, r1, 0x18 -/* 80197E48 38 A0 00 00 */ li r5, 0 -/* 80197E4C 38 C0 00 00 */ li r6, 0 -/* 80197E50 38 E0 00 00 */ li r7, 0 -/* 80197E54 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197E58 FC 40 08 90 */ fmr f2, f1 -/* 80197E5C C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80197E60 FC 80 18 90 */ fmr f4, f3 -/* 80197E64 39 00 00 00 */ li r8, 0 -/* 80197E68 48 11 3B 1D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80197E6C: -/* 80197E6C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197E70 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80197E74 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80197E78 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80197E7C C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80197E80 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80197E84 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80197E88 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80197E8C D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80197E90: -/* 80197E90 38 60 00 03 */ li r3, 3 -/* 80197E94 48 00 03 A4 */ b lbl_80198238 -lbl_80197E98: -/* 80197E98 28 00 00 00 */ cmplwi r0, 0 -/* 80197E9C 41 82 00 BC */ beq lbl_80197F58 -/* 80197EA0 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 80197EA4 88 7D 0F 6E */ lbz r3, 0xf6e(r29) -/* 80197EA8 38 03 FF FF */ addi r0, r3, -1 -/* 80197EAC 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197EB0 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 80197EB4 28 04 00 00 */ cmplwi r4, 0 -/* 80197EB8 41 82 00 28 */ beq lbl_80197EE0 -/* 80197EBC 7F A3 EB 78 */ mr r3, r29 -/* 80197EC0 38 84 FF FF */ addi r4, r4, -1 -/* 80197EC4 4B FF F7 35 */ bl isFlag__13dShopSystem_cFi -/* 80197EC8 2C 03 00 00 */ cmpwi r3, 0 -/* 80197ECC 41 82 00 14 */ beq lbl_80197EE0 -/* 80197ED0 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 80197ED4 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197ED8 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 80197EDC 48 00 00 7C */ b lbl_80197F58 -lbl_80197EE0: -/* 80197EE0 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197EE4 28 00 00 01 */ cmplwi r0, 1 -/* 80197EE8 41 82 00 68 */ beq lbl_80197F50 -/* 80197EEC 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197EF0 28 00 00 00 */ cmplwi r0, 0 -/* 80197EF4 41 82 00 38 */ beq lbl_80197F2C -/* 80197EF8 38 00 00 5F */ li r0, 0x5f -/* 80197EFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80197F00 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80197F04 38 81 00 14 */ addi r4, r1, 0x14 -/* 80197F08 38 A0 00 00 */ li r5, 0 -/* 80197F0C 38 C0 00 00 */ li r6, 0 -/* 80197F10 38 E0 00 00 */ li r7, 0 -/* 80197F14 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197F18 FC 40 08 90 */ fmr f2, f1 -/* 80197F1C C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80197F20 FC 80 18 90 */ fmr f4, f3 -/* 80197F24 39 00 00 00 */ li r8, 0 -/* 80197F28 48 11 3A 5D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80197F2C: -/* 80197F2C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197F30 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80197F34 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80197F38 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80197F3C C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80197F40 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80197F44 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80197F48 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80197F4C D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80197F50: -/* 80197F50 38 60 00 03 */ li r3, 3 -/* 80197F54 48 00 02 E4 */ b lbl_80198238 -lbl_80197F58: -/* 80197F58 7F A3 EB 78 */ mr r3, r29 -/* 80197F5C 80 9D 0E 40 */ lwz r4, 0xe40(r29) -/* 80197F60 48 00 2C 25 */ bl checkRightTrigger__13dShopSystem_cFP9STControl -/* 80197F64 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80197F68 41 82 00 D0 */ beq lbl_80198038 -/* 80197F6C 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197F70 28 00 00 02 */ cmplwi r0, 2 -/* 80197F74 41 82 00 C4 */ beq lbl_80198038 -/* 80197F78 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197F7C 28 00 00 02 */ cmplwi r0, 2 -/* 80197F80 41 82 00 B8 */ beq lbl_80198038 -/* 80197F84 28 00 00 05 */ cmplwi r0, 5 -/* 80197F88 41 82 00 B0 */ beq lbl_80198038 -/* 80197F8C 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 80197F90 88 7D 0F 6E */ lbz r3, 0xf6e(r29) -/* 80197F94 38 03 00 01 */ addi r0, r3, 1 -/* 80197F98 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197F9C 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 80197FA0 28 04 00 00 */ cmplwi r4, 0 -/* 80197FA4 41 82 00 28 */ beq lbl_80197FCC -/* 80197FA8 7F A3 EB 78 */ mr r3, r29 -/* 80197FAC 38 84 FF FF */ addi r4, r4, -1 -/* 80197FB0 4B FF F6 49 */ bl isFlag__13dShopSystem_cFi -/* 80197FB4 2C 03 00 00 */ cmpwi r3, 0 -/* 80197FB8 41 82 00 14 */ beq lbl_80197FCC -/* 80197FBC 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 80197FC0 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197FC4 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 80197FC8 48 00 00 70 */ b lbl_80198038 -lbl_80197FCC: -/* 80197FCC 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197FD0 28 00 00 01 */ cmplwi r0, 1 -/* 80197FD4 41 82 00 5C */ beq lbl_80198030 -/* 80197FD8 38 00 00 5F */ li r0, 0x5f -/* 80197FDC 90 01 00 10 */ stw r0, 0x10(r1) -/* 80197FE0 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80197FE4 38 81 00 10 */ addi r4, r1, 0x10 -/* 80197FE8 38 A0 00 00 */ li r5, 0 -/* 80197FEC 38 C0 00 00 */ li r6, 0 -/* 80197FF0 38 E0 00 00 */ li r7, 0 -/* 80197FF4 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197FF8 FC 40 08 90 */ fmr f2, f1 -/* 80197FFC C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80198000 FC 80 18 90 */ fmr f4, f3 -/* 80198004 39 00 00 00 */ li r8, 0 -/* 80198008 48 11 39 7D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8019800C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80198010 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80198014 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80198018 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 8019801C C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80198020 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80198024 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80198028 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 8019802C D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80198030: -/* 80198030 38 60 00 04 */ li r3, 4 -/* 80198034 48 00 02 04 */ b lbl_80198238 -lbl_80198038: -/* 80198038 80 7D 0E 40 */ lwz r3, 0xe40(r29) -/* 8019803C 4B E9 A4 E9 */ bl checkUpTrigger__9STControlFv -/* 80198040 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80198044 41 82 00 F8 */ beq lbl_8019813C -/* 80198048 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8019804C 28 00 00 02 */ cmplwi r0, 2 -/* 80198050 41 82 00 EC */ beq lbl_8019813C -/* 80198054 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80198058 28 00 00 03 */ cmplwi r0, 3 -/* 8019805C 41 82 00 0C */ beq lbl_80198068 -/* 80198060 28 00 00 05 */ cmplwi r0, 5 -/* 80198064 40 82 00 D8 */ bne lbl_8019813C -lbl_80198068: -/* 80198068 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 8019806C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80198070 28 00 00 03 */ cmplwi r0, 3 -/* 80198074 40 82 00 10 */ bne lbl_80198084 -/* 80198078 38 00 00 01 */ li r0, 1 -/* 8019807C 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80198080 48 00 00 14 */ b lbl_80198094 -lbl_80198084: -/* 80198084 28 00 00 05 */ cmplwi r0, 5 -/* 80198088 40 82 00 0C */ bne lbl_80198094 -/* 8019808C 38 00 00 02 */ li r0, 2 -/* 80198090 98 1D 0F 6E */ stb r0, 0xf6e(r29) -lbl_80198094: -/* 80198094 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 80198098 28 04 00 00 */ cmplwi r4, 0 -/* 8019809C 41 82 00 28 */ beq lbl_801980C4 -/* 801980A0 7F A3 EB 78 */ mr r3, r29 -/* 801980A4 38 84 FF FF */ addi r4, r4, -1 -/* 801980A8 4B FF F5 51 */ bl isFlag__13dShopSystem_cFi -/* 801980AC 2C 03 00 00 */ cmpwi r3, 0 -/* 801980B0 41 82 00 14 */ beq lbl_801980C4 -/* 801980B4 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 801980B8 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 801980BC 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 801980C0 48 00 00 7C */ b lbl_8019813C -lbl_801980C4: -/* 801980C4 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801980C8 28 00 00 01 */ cmplwi r0, 1 -/* 801980CC 41 82 00 68 */ beq lbl_80198134 -/* 801980D0 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 801980D4 28 00 00 00 */ cmplwi r0, 0 -/* 801980D8 41 82 00 38 */ beq lbl_80198110 -/* 801980DC 38 00 00 5F */ li r0, 0x5f -/* 801980E0 90 01 00 0C */ stw r0, 0xc(r1) -/* 801980E4 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801980E8 38 81 00 0C */ addi r4, r1, 0xc -/* 801980EC 38 A0 00 00 */ li r5, 0 -/* 801980F0 38 C0 00 00 */ li r6, 0 -/* 801980F4 38 E0 00 00 */ li r7, 0 -/* 801980F8 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 801980FC FC 40 08 90 */ fmr f2, f1 -/* 80198100 C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80198104 FC 80 18 90 */ fmr f4, f3 -/* 80198108 39 00 00 00 */ li r8, 0 -/* 8019810C 48 11 38 79 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80198110: -/* 80198110 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80198114 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80198118 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 8019811C D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80198120 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80198124 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80198128 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 8019812C C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80198130 D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80198134: -/* 80198134 38 60 00 05 */ li r3, 5 -/* 80198138 48 00 01 00 */ b lbl_80198238 -lbl_8019813C: -/* 8019813C 80 7D 0E 40 */ lwz r3, 0xe40(r29) -/* 80198140 4B E9 A4 61 */ bl checkDownTrigger__9STControlFv -/* 80198144 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80198148 41 82 00 EC */ beq lbl_80198234 -/* 8019814C 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80198150 28 00 00 02 */ cmplwi r0, 2 -/* 80198154 41 82 00 E0 */ beq lbl_80198234 -/* 80198158 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 8019815C 28 00 00 01 */ cmplwi r0, 1 -/* 80198160 41 82 00 0C */ beq lbl_8019816C -/* 80198164 28 00 00 02 */ cmplwi r0, 2 -/* 80198168 40 82 00 CC */ bne lbl_80198234 -lbl_8019816C: -/* 8019816C 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 80198170 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80198174 28 00 00 01 */ cmplwi r0, 1 -/* 80198178 40 82 00 10 */ bne lbl_80198188 -/* 8019817C 38 00 00 03 */ li r0, 3 -/* 80198180 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80198184 48 00 00 14 */ b lbl_80198198 -lbl_80198188: -/* 80198188 28 00 00 02 */ cmplwi r0, 2 -/* 8019818C 40 82 00 0C */ bne lbl_80198198 -/* 80198190 38 00 00 05 */ li r0, 5 -/* 80198194 98 1D 0F 6E */ stb r0, 0xf6e(r29) -lbl_80198198: -/* 80198198 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 8019819C 28 04 00 00 */ cmplwi r4, 0 -/* 801981A0 41 82 00 28 */ beq lbl_801981C8 -/* 801981A4 7F A3 EB 78 */ mr r3, r29 -/* 801981A8 38 84 FF FF */ addi r4, r4, -1 -/* 801981AC 4B FF F4 4D */ bl isFlag__13dShopSystem_cFi -/* 801981B0 2C 03 00 00 */ cmpwi r3, 0 -/* 801981B4 41 82 00 14 */ beq lbl_801981C8 -/* 801981B8 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 801981BC 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 801981C0 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 801981C4 48 00 00 70 */ b lbl_80198234 -lbl_801981C8: -/* 801981C8 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801981CC 28 00 00 01 */ cmplwi r0, 1 -/* 801981D0 41 82 00 5C */ beq lbl_8019822C -/* 801981D4 38 00 00 5F */ li r0, 0x5f -/* 801981D8 90 01 00 08 */ stw r0, 8(r1) -/* 801981DC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801981E0 38 81 00 08 */ addi r4, r1, 8 -/* 801981E4 38 A0 00 00 */ li r5, 0 -/* 801981E8 38 C0 00 00 */ li r6, 0 -/* 801981EC 38 E0 00 00 */ li r7, 0 -/* 801981F0 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 801981F4 FC 40 08 90 */ fmr f2, f1 -/* 801981F8 C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 801981FC FC 80 18 90 */ fmr f4, f3 -/* 80198200 39 00 00 00 */ li r8, 0 -/* 80198204 48 11 37 81 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80198208 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 8019820C B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80198210 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80198214 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80198218 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 8019821C D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80198220 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80198224 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80198228 D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_8019822C: -/* 8019822C 38 60 00 06 */ li r3, 6 -/* 80198230 48 00 00 08 */ b lbl_80198238 -lbl_80198234: -/* 80198234 38 60 00 00 */ li r3, 0 -lbl_80198238: -/* 80198238 39 61 00 30 */ addi r11, r1, 0x30 -/* 8019823C 48 1C 9F ED */ bl _restgpr_29 -/* 80198240 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80198244 7C 08 03 A6 */ mtlr r0 -/* 80198248 38 21 00 30 */ addi r1, r1, 0x30 -/* 8019824C 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/initShopSystem__13dShopSystem_cFv.s b/asm/d/shop/d_shop_system/initShopSystem__13dShopSystem_cFv.s deleted file mode 100644 index 0f3873cb513..00000000000 --- a/asm/d/shop/d_shop_system/initShopSystem__13dShopSystem_cFv.s +++ /dev/null @@ -1,114 +0,0 @@ -lbl_80197338: -/* 80197338 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8019733C 7C 08 02 A6 */ mflr r0 -/* 80197340 90 01 00 14 */ stw r0, 0x14(r1) -/* 80197344 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80197348 93 C1 00 08 */ stw r30, 8(r1) -/* 8019734C 7C 7F 1B 78 */ mr r31, r3 -/* 80197350 38 00 00 03 */ li r0, 3 -/* 80197354 98 0D 8A D8 */ stb r0, data_80451058(r13) -/* 80197358 38 E0 00 00 */ li r7, 0 -/* 8019735C 98 ED 8A E0 */ stb r7, data_80451060(r13) -/* 80197360 7C E4 3B 78 */ mr r4, r7 -/* 80197364 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 80197368 38 C3 B8 A4 */ addi r6, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 8019736C 38 A0 00 FF */ li r5, 0xff -/* 80197370 38 6D 81 68 */ la r3, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 80197374 38 00 00 07 */ li r0, 7 -/* 80197378 7C 09 03 A6 */ mtctr r0 -lbl_8019737C: -/* 8019737C 7C E6 21 2E */ stwx r7, r6, r4 -/* 80197380 98 A3 00 00 */ stb r5, 0(r3) -/* 80197384 38 63 00 01 */ addi r3, r3, 1 -/* 80197388 38 84 00 04 */ addi r4, r4, 4 -/* 8019738C 42 00 FF F0 */ bdnz lbl_8019737C -/* 80197390 38 A0 00 00 */ li r5, 0 -/* 80197394 90 AD 8A DC */ stw r5, dShopSystem_item_count(r13) -/* 80197398 38 60 00 00 */ li r3, 0 -/* 8019739C 38 8D 81 70 */ la r4, dShopSystem_cameraActor(r13) /* 804506F0-_SDA_BASE_ */ -/* 801973A0 38 00 00 02 */ li r0, 2 -/* 801973A4 7C 09 03 A6 */ mtctr r0 -lbl_801973A8: -/* 801973A8 7C A4 19 2E */ stwx r5, r4, r3 -/* 801973AC 38 63 00 04 */ addi r3, r3, 4 -/* 801973B0 42 00 FF F8 */ bdnz lbl_801973A8 -/* 801973B4 38 00 00 00 */ li r0, 0 -/* 801973B8 90 0D 8A E4 */ stw r0, dShopSystem_camera_count(r13) -/* 801973BC 80 1F 0E 40 */ lwz r0, 0xe40(r31) -/* 801973C0 28 00 00 00 */ cmplwi r0, 0 -/* 801973C4 40 82 00 50 */ bne lbl_80197414 -/* 801973C8 38 60 00 30 */ li r3, 0x30 -/* 801973CC 48 13 78 81 */ bl __nw__FUl -/* 801973D0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 801973D4 41 82 00 3C */ beq lbl_80197410 -/* 801973D8 3C 80 80 3A */ lis r4, __vt__9STControl@ha /* 0x803A7260@ha */ -/* 801973DC 38 04 72 60 */ addi r0, r4, __vt__9STControl@l /* 0x803A7260@l */ -/* 801973E0 90 1E 00 00 */ stw r0, 0(r30) -/* 801973E4 38 80 00 0F */ li r4, 0xf -/* 801973E8 38 A0 00 0F */ li r5, 0xf -/* 801973EC 38 C0 00 00 */ li r6, 0 -/* 801973F0 38 E0 00 00 */ li r7, 0 -/* 801973F4 C0 22 A1 00 */ lfs f1, lit_4097(r2) -/* 801973F8 C0 42 A1 04 */ lfs f2, lit_4098(r2) -/* 801973FC 39 00 00 00 */ li r8, 0 -/* 80197400 39 20 20 00 */ li r9, 0x2000 -/* 80197404 4B E9 AC 85 */ bl setWaitParm__9STControlFssssffss -/* 80197408 7F C3 F3 78 */ mr r3, r30 -/* 8019740C 4B E9 AC A1 */ bl init__9STControlFv -lbl_80197410: -/* 80197410 93 DF 0E 40 */ stw r30, 0xe40(r31) -lbl_80197414: -/* 80197414 80 1F 0E 44 */ lwz r0, 0xe44(r31) -/* 80197418 28 00 00 00 */ cmplwi r0, 0 -/* 8019741C 40 82 00 48 */ bne lbl_80197464 -/* 80197420 38 60 00 B8 */ li r3, 0xb8 -/* 80197424 48 13 78 29 */ bl __nw__FUl -/* 80197428 7C 60 1B 79 */ or. r0, r3, r3 -/* 8019742C 41 82 00 18 */ beq lbl_80197444 -/* 80197430 38 80 00 01 */ li r4, 1 -/* 80197434 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197438 38 A0 00 00 */ li r5, 0 -/* 8019743C 4B FF CD E5 */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive -/* 80197440 7C 60 1B 78 */ mr r0, r3 -lbl_80197444: -/* 80197444 90 1F 0E 44 */ stw r0, 0xe44(r31) -/* 80197448 80 7F 0E 44 */ lwz r3, 0xe44(r31) -/* 8019744C C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197450 FC 40 08 90 */ fmr f2, f1 -/* 80197454 C0 62 A1 0C */ lfs f3, lit_4100(r2) -/* 80197458 C0 82 A1 10 */ lfs f4, lit_4101(r2) -/* 8019745C FC A0 20 90 */ fmr f5, f4 -/* 80197460 4B FF DD 51 */ bl setParam__16dSelect_cursor_cFfffff -lbl_80197464: -/* 80197464 38 00 FF FF */ li r0, -1 -/* 80197468 90 1F 0F 64 */ stw r0, 0xf64(r31) -/* 8019746C 38 80 00 00 */ li r4, 0 -/* 80197470 90 9F 0F 54 */ stw r4, 0xf54(r31) -/* 80197474 90 9F 0F 58 */ stw r4, 0xf58(r31) -/* 80197478 B0 9F 0F 6A */ sth r4, 0xf6a(r31) -/* 8019747C 98 9F 0F 6E */ stb r4, 0xf6e(r31) -/* 80197480 98 9F 0F 6F */ stb r4, 0xf6f(r31) -/* 80197484 B0 9F 0F 68 */ sth r4, 0xf68(r31) -/* 80197488 98 9F 0F 70 */ stb r4, 0xf70(r31) -/* 8019748C 88 1F 0F 70 */ lbz r0, 0xf70(r31) -/* 80197490 98 1F 0F 71 */ stb r0, 0xf71(r31) -/* 80197494 98 9F 0F 79 */ stb r4, 0xf79(r31) -/* 80197498 98 9F 0F 7A */ stb r4, 0xf7a(r31) -/* 8019749C 98 9F 0F 72 */ stb r4, 0xf72(r31) -/* 801974A0 38 60 00 FF */ li r3, 0xff -/* 801974A4 98 7F 0F 73 */ stb r3, 0xf73(r31) -/* 801974A8 98 9F 0F 74 */ stb r4, 0xf74(r31) -/* 801974AC 98 9F 0F 75 */ stb r4, 0xf75(r31) -/* 801974B0 B0 9F 0F 6C */ sth r4, 0xf6c(r31) -/* 801974B4 98 9F 0F 76 */ stb r4, 0xf76(r31) -/* 801974B8 38 00 00 09 */ li r0, 9 -/* 801974BC 98 1F 0F 77 */ stb r0, 0xf77(r31) -/* 801974C0 98 7F 0F 78 */ stb r3, 0xf78(r31) -/* 801974C4 38 00 00 01 */ li r0, 1 -/* 801974C8 98 1F 09 BC */ stb r0, 0x9bc(r31) -/* 801974CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801974D0 83 C1 00 08 */ lwz r30, 8(r1) -/* 801974D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801974D8 7C 08 03 A6 */ mtlr r0 -/* 801974DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801974E0 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/itemZoom__13dShopSystem_cFP4cXyz.s b/asm/d/shop/d_shop_system/itemZoom__13dShopSystem_cFP4cXyz.s deleted file mode 100644 index c9795848566..00000000000 --- a/asm/d/shop/d_shop_system/itemZoom__13dShopSystem_cFP4cXyz.s +++ /dev/null @@ -1,442 +0,0 @@ -lbl_80198A2C: -/* 80198A2C 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80198A30 7C 08 02 A6 */ mflr r0 -/* 80198A34 90 01 00 64 */ stw r0, 0x64(r1) -/* 80198A38 39 61 00 60 */ addi r11, r1, 0x60 -/* 80198A3C 48 1C 97 9D */ bl _savegpr_28 -/* 80198A40 7C 7C 1B 78 */ mr r28, r3 -/* 80198A44 7C 9D 23 78 */ mr r29, r4 -/* 80198A48 80 03 0F 60 */ lwz r0, 0xf60(r3) -/* 80198A4C 2C 00 00 00 */ cmpwi r0, 0 -/* 80198A50 41 80 00 9C */ blt lbl_80198AEC -/* 80198A54 C0 1D 00 00 */ lfs f0, 0(r29) -/* 80198A58 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80198A5C C0 1D 00 04 */ lfs f0, 4(r29) -/* 80198A60 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80198A64 C0 1D 00 08 */ lfs f0, 8(r29) -/* 80198A68 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80198A6C 38 8D 81 68 */ la r4, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 80198A70 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 80198A74 7C 84 02 14 */ add r4, r4, r0 -/* 80198A78 88 04 FF FF */ lbz r0, -1(r4) -/* 80198A7C 28 00 00 66 */ cmplwi r0, 0x66 -/* 80198A80 40 82 00 3C */ bne lbl_80198ABC -/* 80198A84 38 80 00 08 */ li r4, 8 -/* 80198A88 4B FF EB 71 */ bl isFlag__13dShopSystem_cFi -/* 80198A8C 30 03 FF FF */ addic r0, r3, -1 -/* 80198A90 7C E0 19 10 */ subfe r7, r0, r3 -/* 80198A94 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80198A98 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80198A9C 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80198AA0 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198AA4 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80198AA8 A8 C6 00 3C */ lha r6, 0x3c(r6) -/* 80198AAC 38 06 EC 78 */ addi r0, r6, -5000 -/* 80198AB0 7C 06 07 34 */ extsh r6, r0 -/* 80198AB4 4B FF E0 F1 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80198AB8 48 00 05 DC */ b lbl_80199094 -lbl_80198ABC: -/* 80198ABC 38 80 00 08 */ li r4, 8 -/* 80198AC0 4B FF EB 39 */ bl isFlag__13dShopSystem_cFi -/* 80198AC4 30 03 FF FF */ addic r0, r3, -1 -/* 80198AC8 7C E0 19 10 */ subfe r7, r0, r3 -/* 80198ACC 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80198AD0 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80198AD4 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80198AD8 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198ADC 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80198AE0 A8 C6 00 3C */ lha r6, 0x3c(r6) -/* 80198AE4 4B FF E0 C1 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80198AE8 48 00 05 AC */ b lbl_80199094 -lbl_80198AEC: -/* 80198AEC 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 80198AF0 38 63 B8 A4 */ addi r3, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 80198AF4 80 83 00 04 */ lwz r4, 4(r3) -/* 80198AF8 28 04 00 00 */ cmplwi r4, 0 -/* 80198AFC 41 82 02 F0 */ beq lbl_80198DEC -/* 80198B00 3B ED 81 70 */ la r31, dShopSystem_cameraActor(r13) /* 804506F0-_SDA_BASE_ */ -/* 80198B04 80 DF 00 04 */ lwz r6, 4(r31) -/* 80198B08 28 06 00 00 */ cmplwi r6, 0 -/* 80198B0C 41 82 02 E0 */ beq lbl_80198DEC -/* 80198B10 C0 04 04 A8 */ lfs f0, 0x4a8(r4) -/* 80198B14 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80198B18 C0 04 04 AC */ lfs f0, 0x4ac(r4) -/* 80198B1C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80198B20 C0 04 04 B0 */ lfs f0, 0x4b0(r4) -/* 80198B24 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80198B28 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 80198B2C 28 00 00 04 */ cmplwi r0, 4 -/* 80198B30 40 82 00 54 */ bne lbl_80198B84 -/* 80198B34 80 63 00 08 */ lwz r3, 8(r3) -/* 80198B38 28 03 00 00 */ cmplwi r3, 0 -/* 80198B3C 41 82 00 90 */ beq lbl_80198BCC -/* 80198B40 C0 23 04 A8 */ lfs f1, 0x4a8(r3) -/* 80198B44 C0 04 04 A8 */ lfs f0, 0x4a8(r4) -/* 80198B48 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198B4C C0 42 A1 04 */ lfs f2, lit_4098(r2) -/* 80198B50 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80198B54 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80198B58 C0 23 04 AC */ lfs f1, 0x4ac(r3) -/* 80198B5C C0 04 04 AC */ lfs f0, 0x4ac(r4) -/* 80198B60 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198B64 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80198B68 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80198B6C C0 23 04 B0 */ lfs f1, 0x4b0(r3) -/* 80198B70 C0 04 04 B0 */ lfs f0, 0x4b0(r4) -/* 80198B74 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198B78 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80198B7C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80198B80 48 00 00 4C */ b lbl_80198BCC -lbl_80198B84: -/* 80198B84 28 00 00 05 */ cmplwi r0, 5 -/* 80198B88 40 82 00 44 */ bne lbl_80198BCC -/* 80198B8C 80 A3 00 08 */ lwz r5, 8(r3) -/* 80198B90 C0 25 04 A8 */ lfs f1, 0x4a8(r5) -/* 80198B94 80 83 00 0C */ lwz r4, 0xc(r3) -/* 80198B98 C0 04 04 A8 */ lfs f0, 0x4a8(r4) -/* 80198B9C EC 01 00 2A */ fadds f0, f1, f0 -/* 80198BA0 C0 42 A1 04 */ lfs f2, lit_4098(r2) -/* 80198BA4 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80198BA8 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80198BAC 80 63 00 00 */ lwz r3, 0(r3) -/* 80198BB0 C0 03 04 AC */ lfs f0, 0x4ac(r3) -/* 80198BB4 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80198BB8 C0 25 04 B0 */ lfs f1, 0x4b0(r5) -/* 80198BBC C0 04 04 B0 */ lfs f0, 0x4b0(r4) -/* 80198BC0 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198BC4 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80198BC8 D0 01 00 28 */ stfs f0, 0x28(r1) -lbl_80198BCC: -/* 80198BCC 38 61 00 08 */ addi r3, r1, 8 -/* 80198BD0 38 81 00 20 */ addi r4, r1, 0x20 -/* 80198BD4 38 A6 04 D0 */ addi r5, r6, 0x4d0 -/* 80198BD8 48 0C DF 5D */ bl __mi__4cXyzCFRC3Vec -/* 80198BDC C0 21 00 08 */ lfs f1, 8(r1) -/* 80198BE0 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80198BE4 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80198BE8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80198BEC C0 41 00 10 */ lfs f2, 0x10(r1) -/* 80198BF0 D0 41 00 1C */ stfs f2, 0x1c(r1) -/* 80198BF4 48 0C EA 81 */ bl cM_atan2s__Fff -/* 80198BF8 7C 7E 1B 78 */ mr r30, r3 -/* 80198BFC 3C 60 80 39 */ lis r3, d_shop_d_shop_system__stringBase0@ha /* 0x80394C10@ha */ -/* 80198C00 38 63 4C 10 */ addi r3, r3, d_shop_d_shop_system__stringBase0@l /* 0x80394C10@l */ -/* 80198C04 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80198C08 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80198C0C 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 80198C10 48 1C FD 85 */ bl strcmp -/* 80198C14 2C 03 00 00 */ cmpwi r3, 0 -/* 80198C18 40 82 00 38 */ bne lbl_80198C50 -/* 80198C1C 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198C20 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80198C24 C0 03 00 14 */ lfs f0, 0x14(r3) -/* 80198C28 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80198C2C C0 22 A1 24 */ lfs f1, lit_5000(r2) -/* 80198C30 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 80198C34 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198C38 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80198C3C C0 22 A1 28 */ lfs f1, lit_5001(r2) -/* 80198C40 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 80198C44 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198C48 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80198C4C 48 00 01 30 */ b lbl_80198D7C -lbl_80198C50: -/* 80198C50 88 1C 0F 77 */ lbz r0, 0xf77(r28) -/* 80198C54 28 00 00 05 */ cmplwi r0, 5 -/* 80198C58 40 82 00 B4 */ bne lbl_80198D0C -/* 80198C5C 38 6D 81 68 */ la r3, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 80198C60 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 80198C64 7C 63 02 14 */ add r3, r3, r0 -/* 80198C68 88 03 FF FF */ lbz r0, -1(r3) -/* 80198C6C 28 00 00 0E */ cmplwi r0, 0xe -/* 80198C70 41 82 00 14 */ beq lbl_80198C84 -/* 80198C74 28 00 00 0F */ cmplwi r0, 0xf -/* 80198C78 41 82 00 0C */ beq lbl_80198C84 -/* 80198C7C 28 00 00 10 */ cmplwi r0, 0x10 -/* 80198C80 40 82 00 48 */ bne lbl_80198CC8 -lbl_80198C84: -/* 80198C84 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198C88 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80198C8C C0 03 00 14 */ lfs f0, 0x14(r3) -/* 80198C90 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80198C94 C0 42 A1 20 */ lfs f2, lit_4496(r2) -/* 80198C98 C0 22 A1 2C */ lfs f1, lit_5002(r2) -/* 80198C9C C0 03 00 18 */ lfs f0, 0x18(r3) -/* 80198CA0 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198CA4 EC 02 00 2A */ fadds f0, f2, f0 -/* 80198CA8 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80198CAC C0 22 A1 30 */ lfs f1, lit_5003(r2) -/* 80198CB0 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 80198CB4 EC 21 00 2A */ fadds f1, f1, f0 -/* 80198CB8 C0 02 A1 34 */ lfs f0, lit_5004(r2) -/* 80198CBC EC 01 00 28 */ fsubs f0, f1, f0 -/* 80198CC0 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80198CC4 48 00 00 B8 */ b lbl_80198D7C -lbl_80198CC8: -/* 80198CC8 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198CCC 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80198CD0 C0 03 00 14 */ lfs f0, 0x14(r3) -/* 80198CD4 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80198CD8 C0 42 A1 1C */ lfs f2, lit_4495(r2) -/* 80198CDC C0 22 A1 2C */ lfs f1, lit_5002(r2) -/* 80198CE0 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 80198CE4 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198CE8 EC 02 00 2A */ fadds f0, f2, f0 -/* 80198CEC D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80198CF0 C0 22 A1 30 */ lfs f1, lit_5003(r2) -/* 80198CF4 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 80198CF8 EC 21 00 2A */ fadds f1, f1, f0 -/* 80198CFC C0 02 A1 34 */ lfs f0, lit_5004(r2) -/* 80198D00 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80198D04 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80198D08 48 00 00 74 */ b lbl_80198D7C -lbl_80198D0C: -/* 80198D0C 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 80198D10 28 00 00 07 */ cmplwi r0, 7 -/* 80198D14 40 82 00 38 */ bne lbl_80198D4C -/* 80198D18 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198D1C 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80198D20 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80198D24 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80198D28 C0 22 A1 38 */ lfs f1, lit_5005(r2) -/* 80198D2C C0 03 00 24 */ lfs f0, 0x24(r3) -/* 80198D30 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198D34 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80198D38 C0 22 A1 3C */ lfs f1, lit_5006(r2) -/* 80198D3C C0 03 00 28 */ lfs f0, 0x28(r3) -/* 80198D40 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198D44 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80198D48 48 00 00 34 */ b lbl_80198D7C -lbl_80198D4C: -/* 80198D4C 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198D50 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80198D54 C0 03 00 14 */ lfs f0, 0x14(r3) -/* 80198D58 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80198D5C C0 22 A1 2C */ lfs f1, lit_5002(r2) -/* 80198D60 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 80198D64 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198D68 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80198D6C C0 22 A1 30 */ lfs f1, lit_5003(r2) -/* 80198D70 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 80198D74 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198D78 D0 01 00 34 */ stfs f0, 0x34(r1) -lbl_80198D7C: -/* 80198D7C 38 61 00 38 */ addi r3, r1, 0x38 -/* 80198D80 80 9F 00 04 */ lwz r4, 4(r31) -/* 80198D84 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 80198D88 7F C5 F3 78 */ mr r5, r30 -/* 80198D8C 38 C1 00 2C */ addi r6, r1, 0x2c -/* 80198D90 48 0D 80 31 */ bl cLib_offsetPos__FP4cXyzPC4cXyzsPC4cXyz -/* 80198D94 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 80198D98 28 00 00 06 */ cmplwi r0, 6 -/* 80198D9C 41 82 00 0C */ beq lbl_80198DA8 -/* 80198DA0 28 00 00 05 */ cmplwi r0, 5 -/* 80198DA4 40 82 00 14 */ bne lbl_80198DB8 -lbl_80198DA8: -/* 80198DA8 C0 3D 00 04 */ lfs f1, 4(r29) -/* 80198DAC C0 02 A1 40 */ lfs f0, lit_5007(r2) -/* 80198DB0 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198DB4 D0 1D 00 04 */ stfs f0, 4(r29) -lbl_80198DB8: -/* 80198DB8 C0 21 00 40 */ lfs f1, 0x40(r1) -/* 80198DBC C0 1D 00 08 */ lfs f0, 8(r29) -/* 80198DC0 EC 61 00 2A */ fadds f3, f1, f0 -/* 80198DC4 C0 21 00 3C */ lfs f1, 0x3c(r1) -/* 80198DC8 C0 1D 00 04 */ lfs f0, 4(r29) -/* 80198DCC EC 41 00 2A */ fadds f2, f1, f0 -/* 80198DD0 C0 21 00 38 */ lfs f1, 0x38(r1) -/* 80198DD4 C0 1D 00 00 */ lfs f0, 0(r29) -/* 80198DD8 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198DDC D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80198DE0 D0 41 00 48 */ stfs f2, 0x48(r1) -/* 80198DE4 D0 61 00 4C */ stfs f3, 0x4c(r1) -/* 80198DE8 48 00 00 28 */ b lbl_80198E10 -lbl_80198DEC: -/* 80198DEC C0 5D 00 00 */ lfs f2, 0(r29) -/* 80198DF0 D0 41 00 38 */ stfs f2, 0x38(r1) -/* 80198DF4 C0 3D 00 04 */ lfs f1, 4(r29) -/* 80198DF8 D0 21 00 3C */ stfs f1, 0x3c(r1) -/* 80198DFC C0 1D 00 08 */ lfs f0, 8(r29) -/* 80198E00 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80198E04 D0 41 00 44 */ stfs f2, 0x44(r1) -/* 80198E08 D0 21 00 48 */ stfs f1, 0x48(r1) -/* 80198E0C D0 01 00 4C */ stfs f0, 0x4c(r1) -lbl_80198E10: -/* 80198E10 88 1C 0F 77 */ lbz r0, 0xf77(r28) -/* 80198E14 28 00 00 01 */ cmplwi r0, 1 -/* 80198E18 40 82 00 8C */ bne lbl_80198EA4 -/* 80198E1C 38 6D 81 68 */ la r3, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 80198E20 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 80198E24 7C 63 02 14 */ add r3, r3, r0 -/* 80198E28 88 03 FF FF */ lbz r0, -1(r3) -/* 80198E2C 28 00 00 66 */ cmplwi r0, 0x66 -/* 80198E30 40 82 00 40 */ bne lbl_80198E70 -/* 80198E34 7F 83 E3 78 */ mr r3, r28 -/* 80198E38 38 80 00 08 */ li r4, 8 -/* 80198E3C 4B FF E7 BD */ bl isFlag__13dShopSystem_cFi -/* 80198E40 30 03 FF FF */ addic r0, r3, -1 -/* 80198E44 7C E0 19 10 */ subfe r7, r0, r3 -/* 80198E48 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80198E4C 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80198E50 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80198E54 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198E58 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80198E5C A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80198E60 38 06 E4 A8 */ addi r0, r6, -7000 -/* 80198E64 7C 06 07 34 */ extsh r6, r0 -/* 80198E68 4B FF DD 3D */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80198E6C 48 00 02 28 */ b lbl_80199094 -lbl_80198E70: -/* 80198E70 7F 83 E3 78 */ mr r3, r28 -/* 80198E74 38 80 00 08 */ li r4, 8 -/* 80198E78 4B FF E7 81 */ bl isFlag__13dShopSystem_cFi -/* 80198E7C 30 03 FF FF */ addic r0, r3, -1 -/* 80198E80 7C E0 19 10 */ subfe r7, r0, r3 -/* 80198E84 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80198E88 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80198E8C 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80198E90 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198E94 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80198E98 A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80198E9C 4B FF DD 09 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80198EA0 48 00 01 F4 */ b lbl_80199094 -lbl_80198EA4: -/* 80198EA4 28 00 00 02 */ cmplwi r0, 2 -/* 80198EA8 40 82 00 8C */ bne lbl_80198F34 -/* 80198EAC 38 6D 81 68 */ la r3, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 80198EB0 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 80198EB4 7C 63 02 14 */ add r3, r3, r0 -/* 80198EB8 88 03 FF FF */ lbz r0, -1(r3) -/* 80198EBC 28 00 00 61 */ cmplwi r0, 0x61 -/* 80198EC0 40 82 00 40 */ bne lbl_80198F00 -/* 80198EC4 7F 83 E3 78 */ mr r3, r28 -/* 80198EC8 38 80 00 08 */ li r4, 8 -/* 80198ECC 4B FF E7 2D */ bl isFlag__13dShopSystem_cFi -/* 80198ED0 30 03 FF FF */ addic r0, r3, -1 -/* 80198ED4 7C E0 19 10 */ subfe r7, r0, r3 -/* 80198ED8 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80198EDC 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80198EE0 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80198EE4 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198EE8 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80198EEC A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80198EF0 38 06 F4 48 */ addi r0, r6, -3000 -/* 80198EF4 7C 06 07 34 */ extsh r6, r0 -/* 80198EF8 4B FF DC AD */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80198EFC 48 00 01 98 */ b lbl_80199094 -lbl_80198F00: -/* 80198F00 7F 83 E3 78 */ mr r3, r28 -/* 80198F04 38 80 00 08 */ li r4, 8 -/* 80198F08 4B FF E6 F1 */ bl isFlag__13dShopSystem_cFi -/* 80198F0C 30 03 FF FF */ addic r0, r3, -1 -/* 80198F10 7C E0 19 10 */ subfe r7, r0, r3 -/* 80198F14 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80198F18 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80198F1C 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80198F20 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198F24 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80198F28 A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80198F2C 4B FF DC 79 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80198F30 48 00 01 64 */ b lbl_80199094 -lbl_80198F34: -/* 80198F34 28 00 00 05 */ cmplwi r0, 5 -/* 80198F38 40 82 00 A4 */ bne lbl_80198FDC -/* 80198F3C 38 6D 81 68 */ la r3, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 80198F40 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 80198F44 7C 63 02 14 */ add r3, r3, r0 -/* 80198F48 88 03 FF FF */ lbz r0, -1(r3) -/* 80198F4C 28 00 00 0E */ cmplwi r0, 0xe -/* 80198F50 41 82 00 14 */ beq lbl_80198F64 -/* 80198F54 28 00 00 0F */ cmplwi r0, 0xf -/* 80198F58 41 82 00 0C */ beq lbl_80198F64 -/* 80198F5C 28 00 00 10 */ cmplwi r0, 0x10 -/* 80198F60 40 82 00 40 */ bne lbl_80198FA0 -lbl_80198F64: -/* 80198F64 7F 83 E3 78 */ mr r3, r28 -/* 80198F68 38 80 00 08 */ li r4, 8 -/* 80198F6C 4B FF E6 8D */ bl isFlag__13dShopSystem_cFi -/* 80198F70 30 03 FF FF */ addic r0, r3, -1 -/* 80198F74 7C E0 19 10 */ subfe r7, r0, r3 -/* 80198F78 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80198F7C 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80198F80 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80198F84 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198F88 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80198F8C A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80198F90 38 06 F0 60 */ addi r0, r6, -4000 -/* 80198F94 7C 06 07 34 */ extsh r6, r0 -/* 80198F98 4B FF DC 0D */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80198F9C 48 00 00 F8 */ b lbl_80199094 -lbl_80198FA0: -/* 80198FA0 7F 83 E3 78 */ mr r3, r28 -/* 80198FA4 38 80 00 08 */ li r4, 8 -/* 80198FA8 4B FF E6 51 */ bl isFlag__13dShopSystem_cFi -/* 80198FAC 30 03 FF FF */ addic r0, r3, -1 -/* 80198FB0 7C E0 19 10 */ subfe r7, r0, r3 -/* 80198FB4 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80198FB8 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80198FBC 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80198FC0 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198FC4 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80198FC8 A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80198FCC 38 06 F8 30 */ addi r0, r6, -2000 -/* 80198FD0 7C 06 07 34 */ extsh r6, r0 -/* 80198FD4 4B FF DB D1 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80198FD8 48 00 00 BC */ b lbl_80199094 -lbl_80198FDC: -/* 80198FDC 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 80198FE0 28 00 00 07 */ cmplwi r0, 7 -/* 80198FE4 40 82 00 38 */ bne lbl_8019901C -/* 80198FE8 7F 83 E3 78 */ mr r3, r28 -/* 80198FEC 38 80 00 08 */ li r4, 8 -/* 80198FF0 4B FF E6 09 */ bl isFlag__13dShopSystem_cFi -/* 80198FF4 30 03 FF FF */ addic r0, r3, -1 -/* 80198FF8 7C E0 19 10 */ subfe r7, r0, r3 -/* 80198FFC 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80199000 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80199004 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80199008 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 8019900C 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80199010 A8 C6 00 40 */ lha r6, 0x40(r6) -/* 80199014 4B FF DB 91 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80199018 48 00 00 7C */ b lbl_80199094 -lbl_8019901C: -/* 8019901C 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 80199020 28 00 00 07 */ cmplwi r0, 7 -/* 80199024 40 82 00 40 */ bne lbl_80199064 -/* 80199028 7F 83 E3 78 */ mr r3, r28 -/* 8019902C 38 80 00 08 */ li r4, 8 -/* 80199030 4B FF E5 C9 */ bl isFlag__13dShopSystem_cFi -/* 80199034 30 03 FF FF */ addic r0, r3, -1 -/* 80199038 7C E0 19 10 */ subfe r7, r0, r3 -/* 8019903C 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80199040 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80199044 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80199048 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 8019904C 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80199050 A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80199054 38 06 F4 48 */ addi r0, r6, -3000 -/* 80199058 7C 06 07 34 */ extsh r6, r0 -/* 8019905C 4B FF DB 49 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80199060 48 00 00 34 */ b lbl_80199094 -lbl_80199064: -/* 80199064 7F 83 E3 78 */ mr r3, r28 -/* 80199068 38 80 00 08 */ li r4, 8 -/* 8019906C 4B FF E5 8D */ bl isFlag__13dShopSystem_cFi -/* 80199070 30 03 FF FF */ addic r0, r3, -1 -/* 80199074 7C E0 19 10 */ subfe r7, r0, r3 -/* 80199078 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 8019907C 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80199080 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80199084 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80199088 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 8019908C A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80199090 4B FF DB 15 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -lbl_80199094: -/* 80199094 38 60 00 01 */ li r3, 1 -/* 80199098 39 61 00 60 */ addi r11, r1, 0x60 -/* 8019909C 48 1C 91 89 */ bl _restgpr_28 -/* 801990A0 80 01 00 64 */ lwz r0, 0x64(r1) -/* 801990A4 7C 08 03 A6 */ mtlr r0 -/* 801990A8 38 21 00 60 */ addi r1, r1, 0x60 -/* 801990AC 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/moveCursor0__13dShopSystem_cFiUc.s b/asm/d/shop/d_shop_system/moveCursor0__13dShopSystem_cFiUc.s deleted file mode 100644 index 1c0388c9575..00000000000 --- a/asm/d/shop/d_shop_system/moveCursor0__13dShopSystem_cFiUc.s +++ /dev/null @@ -1,176 +0,0 @@ -lbl_80198488: -/* 80198488 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8019848C 7C 08 02 A6 */ mflr r0 -/* 80198490 90 01 00 24 */ stw r0, 0x24(r1) -/* 80198494 39 61 00 20 */ addi r11, r1, 0x20 -/* 80198498 48 1C 9D 45 */ bl _savegpr_29 -/* 8019849C 7C 7D 1B 78 */ mr r29, r3 -/* 801984A0 7C 9E 23 78 */ mr r30, r4 -/* 801984A4 7C BF 2B 78 */ mr r31, r5 -/* 801984A8 38 80 00 07 */ li r4, 7 -/* 801984AC 4B FF F1 31 */ bl offFlag__13dShopSystem_cFi -/* 801984B0 2C 1E 00 04 */ cmpwi r30, 4 -/* 801984B4 41 82 00 78 */ beq lbl_8019852C -/* 801984B8 40 80 00 1C */ bge lbl_801984D4 -/* 801984BC 2C 1E 00 02 */ cmpwi r30, 2 -/* 801984C0 41 82 01 80 */ beq lbl_80198640 -/* 801984C4 40 80 00 1C */ bge lbl_801984E0 -/* 801984C8 2C 1E 00 01 */ cmpwi r30, 1 -/* 801984CC 40 80 00 F8 */ bge lbl_801985C4 -/* 801984D0 48 00 02 1C */ b lbl_801986EC -lbl_801984D4: -/* 801984D4 2C 1E 00 07 */ cmpwi r30, 7 -/* 801984D8 41 82 00 A0 */ beq lbl_80198578 -/* 801984DC 48 00 02 10 */ b lbl_801986EC -lbl_801984E0: -/* 801984E0 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 801984E4 28 00 00 00 */ cmplwi r0, 0 -/* 801984E8 40 82 00 20 */ bne lbl_80198508 -/* 801984EC 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 801984F0 20 00 00 03 */ subfic r0, r0, 3 -/* 801984F4 54 00 18 38 */ slwi r0, r0, 3 -/* 801984F8 7C 60 04 30 */ srw r0, r3, r0 -/* 801984FC 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80198500 38 63 00 52 */ addi r3, r3, 0x52 -/* 80198504 48 00 01 EC */ b lbl_801986F0 -lbl_80198508: -/* 80198508 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 8019850C 20 00 00 03 */ subfic r0, r0, 3 -/* 80198510 54 00 18 38 */ slwi r0, r0, 3 -/* 80198514 7C 60 04 30 */ srw r0, r3, r0 -/* 80198518 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8019851C 38 03 FF FF */ addi r0, r3, -1 -/* 80198520 54 03 08 3C */ slwi r3, r0, 1 -/* 80198524 38 63 00 66 */ addi r3, r3, 0x66 -/* 80198528 48 00 01 C8 */ b lbl_801986F0 -lbl_8019852C: -/* 8019852C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80198530 28 00 00 00 */ cmplwi r0, 0 -/* 80198534 40 82 00 20 */ bne lbl_80198554 -/* 80198538 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 8019853C 20 00 00 03 */ subfic r0, r0, 3 -/* 80198540 54 00 18 38 */ slwi r0, r0, 3 -/* 80198544 7C 60 04 30 */ srw r0, r3, r0 -/* 80198548 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8019854C 38 63 00 52 */ addi r3, r3, 0x52 -/* 80198550 48 00 01 A0 */ b lbl_801986F0 -lbl_80198554: -/* 80198554 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 80198558 20 00 00 03 */ subfic r0, r0, 3 -/* 8019855C 54 00 18 38 */ slwi r0, r0, 3 -/* 80198560 7C 60 04 30 */ srw r0, r3, r0 -/* 80198564 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80198568 38 03 FF FF */ addi r0, r3, -1 -/* 8019856C 54 03 08 3C */ slwi r3, r0, 1 -/* 80198570 38 63 00 66 */ addi r3, r3, 0x66 -/* 80198574 48 00 01 7C */ b lbl_801986F0 -lbl_80198578: -/* 80198578 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 8019857C 28 00 00 00 */ cmplwi r0, 0 -/* 80198580 40 82 00 20 */ bne lbl_801985A0 -/* 80198584 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 80198588 20 00 00 03 */ subfic r0, r0, 3 -/* 8019858C 54 00 18 38 */ slwi r0, r0, 3 -/* 80198590 7C 60 04 30 */ srw r0, r3, r0 -/* 80198594 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80198598 38 63 00 52 */ addi r3, r3, 0x52 -/* 8019859C 48 00 01 54 */ b lbl_801986F0 -lbl_801985A0: -/* 801985A0 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 801985A4 20 00 00 03 */ subfic r0, r0, 3 -/* 801985A8 54 00 18 38 */ slwi r0, r0, 3 -/* 801985AC 7C 60 04 30 */ srw r0, r3, r0 -/* 801985B0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 801985B4 38 03 FF FF */ addi r0, r3, -1 -/* 801985B8 54 03 08 3C */ slwi r3, r0, 1 -/* 801985BC 38 63 00 66 */ addi r3, r3, 0x66 -/* 801985C0 48 00 01 30 */ b lbl_801986F0 -lbl_801985C4: -/* 801985C4 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 801985C8 28 04 00 00 */ cmplwi r4, 0 -/* 801985CC 40 82 00 20 */ bne lbl_801985EC -/* 801985D0 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 801985D4 20 04 00 03 */ subfic r0, r4, 3 -/* 801985D8 54 00 18 38 */ slwi r0, r0, 3 -/* 801985DC 7C 60 04 30 */ srw r0, r3, r0 -/* 801985E0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 801985E4 38 63 00 52 */ addi r3, r3, 0x52 -/* 801985E8 48 00 01 08 */ b lbl_801986F0 -lbl_801985EC: -/* 801985EC 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 801985F0 28 00 00 02 */ cmplwi r0, 2 -/* 801985F4 41 82 00 28 */ beq lbl_8019861C -/* 801985F8 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 801985FC 20 04 00 03 */ subfic r0, r4, 3 -/* 80198600 54 00 18 38 */ slwi r0, r0, 3 -/* 80198604 7C 60 04 30 */ srw r0, r3, r0 -/* 80198608 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8019860C 38 03 FF FF */ addi r0, r3, -1 -/* 80198610 54 03 08 3C */ slwi r3, r0, 1 -/* 80198614 38 63 00 65 */ addi r3, r3, 0x65 -/* 80198618 48 00 00 D8 */ b lbl_801986F0 -lbl_8019861C: -/* 8019861C 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 80198620 20 04 00 03 */ subfic r0, r4, 3 -/* 80198624 54 00 18 38 */ slwi r0, r0, 3 -/* 80198628 7C 60 04 30 */ srw r0, r3, r0 -/* 8019862C 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80198630 38 03 FF FF */ addi r0, r3, -1 -/* 80198634 54 03 08 3C */ slwi r3, r0, 1 -/* 80198638 38 63 00 66 */ addi r3, r3, 0x66 -/* 8019863C 48 00 00 B4 */ b lbl_801986F0 -lbl_80198640: -/* 80198640 7F A3 EB 78 */ mr r3, r29 -/* 80198644 38 80 00 07 */ li r4, 7 -/* 80198648 4B FF EF 79 */ bl onFlag__13dShopSystem_cFi -/* 8019864C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80198650 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80198654 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80198658 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 8019865C C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80198660 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80198664 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80198668 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 8019866C D0 1D 0F 44 */ stfs f0, 0xf44(r29) -/* 80198670 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 80198674 28 04 00 00 */ cmplwi r4, 0 -/* 80198678 40 82 00 20 */ bne lbl_80198698 -/* 8019867C 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 80198680 20 04 00 03 */ subfic r0, r4, 3 -/* 80198684 54 00 18 38 */ slwi r0, r0, 3 -/* 80198688 7C 60 04 30 */ srw r0, r3, r0 -/* 8019868C 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80198690 38 63 00 52 */ addi r3, r3, 0x52 -/* 80198694 48 00 00 5C */ b lbl_801986F0 -lbl_80198698: -/* 80198698 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8019869C 28 00 00 02 */ cmplwi r0, 2 -/* 801986A0 41 82 00 28 */ beq lbl_801986C8 -/* 801986A4 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 801986A8 20 04 00 03 */ subfic r0, r4, 3 -/* 801986AC 54 00 18 38 */ slwi r0, r0, 3 -/* 801986B0 7C 60 04 30 */ srw r0, r3, r0 -/* 801986B4 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 801986B8 38 03 FF FF */ addi r0, r3, -1 -/* 801986BC 54 03 08 3C */ slwi r3, r0, 1 -/* 801986C0 38 63 00 65 */ addi r3, r3, 0x65 -/* 801986C4 48 00 00 2C */ b lbl_801986F0 -lbl_801986C8: -/* 801986C8 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 801986CC 20 04 00 03 */ subfic r0, r4, 3 -/* 801986D0 54 00 18 38 */ slwi r0, r0, 3 -/* 801986D4 7C 60 04 30 */ srw r0, r3, r0 -/* 801986D8 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 801986DC 38 03 FF FF */ addi r0, r3, -1 -/* 801986E0 54 03 08 3C */ slwi r3, r0, 1 -/* 801986E4 38 63 00 66 */ addi r3, r3, 0x66 -/* 801986E8 48 00 00 08 */ b lbl_801986F0 -lbl_801986EC: -/* 801986EC 38 60 00 00 */ li r3, 0 -lbl_801986F0: -/* 801986F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801986F4 48 1C 9B 35 */ bl _restgpr_29 -/* 801986F8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801986FC 7C 08 03 A6 */ mtlr r0 -/* 80198700 38 21 00 20 */ addi r1, r1, 0x20 -/* 80198704 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/moveCursor1__13dShopSystem_cFiUc.s b/asm/d/shop/d_shop_system/moveCursor1__13dShopSystem_cFiUc.s deleted file mode 100644 index 4a3c94c2e6c..00000000000 --- a/asm/d/shop/d_shop_system/moveCursor1__13dShopSystem_cFiUc.s +++ /dev/null @@ -1,103 +0,0 @@ -lbl_80198708: -/* 80198708 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8019870C 7C 08 02 A6 */ mflr r0 -/* 80198710 90 01 00 24 */ stw r0, 0x24(r1) -/* 80198714 39 61 00 20 */ addi r11, r1, 0x20 -/* 80198718 48 1C 9A C5 */ bl _savegpr_29 -/* 8019871C 7C 7F 1B 78 */ mr r31, r3 -/* 80198720 7C 9D 23 78 */ mr r29, r4 -/* 80198724 7C BE 2B 78 */ mr r30, r5 -/* 80198728 38 80 00 07 */ li r4, 7 -/* 8019872C 4B FF EE B1 */ bl offFlag__13dShopSystem_cFi -/* 80198730 2C 1D 00 02 */ cmpwi r29, 2 -/* 80198734 41 82 00 A4 */ beq lbl_801987D8 -/* 80198738 40 80 00 10 */ bge lbl_80198748 -/* 8019873C 2C 1D 00 01 */ cmpwi r29, 1 -/* 80198740 40 80 00 44 */ bge lbl_80198784 -/* 80198744 48 00 01 18 */ b lbl_8019885C -lbl_80198748: -/* 80198748 2C 1D 00 08 */ cmpwi r29, 8 -/* 8019874C 40 80 01 10 */ bge lbl_8019885C -/* 80198750 88 7F 0F 6E */ lbz r3, 0xf6e(r31) -/* 80198754 28 03 00 00 */ cmplwi r3, 0 -/* 80198758 40 82 00 14 */ bne lbl_8019876C -/* 8019875C 7F E3 FB 78 */ mr r3, r31 -/* 80198760 48 00 23 A1 */ bl getFlowNodeNum__13dShopSystem_cFv -/* 80198764 38 63 00 01 */ addi r3, r3, 1 -/* 80198768 48 00 00 F8 */ b lbl_80198860 -lbl_8019876C: -/* 8019876C 38 03 FF FF */ addi r0, r3, -1 -/* 80198770 54 00 08 3C */ slwi r0, r0, 1 -/* 80198774 7C 7F 02 14 */ add r3, r31, r0 -/* 80198778 A0 63 0E 68 */ lhz r3, 0xe68(r3) -/* 8019877C 38 63 00 01 */ addi r3, r3, 1 -/* 80198780 48 00 00 E0 */ b lbl_80198860 -lbl_80198784: -/* 80198784 88 7F 0F 6E */ lbz r3, 0xf6e(r31) -/* 80198788 28 03 00 00 */ cmplwi r3, 0 -/* 8019878C 40 82 00 14 */ bne lbl_801987A0 -/* 80198790 7F E3 FB 78 */ mr r3, r31 -/* 80198794 48 00 23 6D */ bl getFlowNodeNum__13dShopSystem_cFv -/* 80198798 38 63 00 01 */ addi r3, r3, 1 -/* 8019879C 48 00 00 C4 */ b lbl_80198860 -lbl_801987A0: -/* 801987A0 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801987A4 28 00 00 02 */ cmplwi r0, 2 -/* 801987A8 41 82 00 18 */ beq lbl_801987C0 -/* 801987AC 38 03 FF FF */ addi r0, r3, -1 -/* 801987B0 54 00 08 3C */ slwi r0, r0, 1 -/* 801987B4 7C 7F 02 14 */ add r3, r31, r0 -/* 801987B8 A0 63 0E 68 */ lhz r3, 0xe68(r3) -/* 801987BC 48 00 00 A4 */ b lbl_80198860 -lbl_801987C0: -/* 801987C0 38 03 FF FF */ addi r0, r3, -1 -/* 801987C4 54 00 08 3C */ slwi r0, r0, 1 -/* 801987C8 7C 7F 02 14 */ add r3, r31, r0 -/* 801987CC A0 63 0E 68 */ lhz r3, 0xe68(r3) -/* 801987D0 38 63 00 01 */ addi r3, r3, 1 -/* 801987D4 48 00 00 8C */ b lbl_80198860 -lbl_801987D8: -/* 801987D8 7F E3 FB 78 */ mr r3, r31 -/* 801987DC 38 80 00 07 */ li r4, 7 -/* 801987E0 4B FF ED E1 */ bl onFlag__13dShopSystem_cFi -/* 801987E4 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 801987E8 B0 1F 0F 4C */ sth r0, 0xf4c(r31) -/* 801987EC C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 801987F0 D0 3F 0F 38 */ stfs f1, 0xf38(r31) -/* 801987F4 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 801987F8 D0 1F 0F 3C */ stfs f0, 0xf3c(r31) -/* 801987FC D0 3F 0F 40 */ stfs f1, 0xf40(r31) -/* 80198800 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80198804 D0 1F 0F 44 */ stfs f0, 0xf44(r31) -/* 80198808 88 7F 0F 6E */ lbz r3, 0xf6e(r31) -/* 8019880C 28 03 00 00 */ cmplwi r3, 0 -/* 80198810 40 82 00 14 */ bne lbl_80198824 -/* 80198814 7F E3 FB 78 */ mr r3, r31 -/* 80198818 48 00 22 E9 */ bl getFlowNodeNum__13dShopSystem_cFv -/* 8019881C 38 63 00 01 */ addi r3, r3, 1 -/* 80198820 48 00 00 40 */ b lbl_80198860 -lbl_80198824: -/* 80198824 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80198828 28 00 00 02 */ cmplwi r0, 2 -/* 8019882C 41 82 00 18 */ beq lbl_80198844 -/* 80198830 38 03 FF FF */ addi r0, r3, -1 -/* 80198834 54 00 08 3C */ slwi r0, r0, 1 -/* 80198838 7C 7F 02 14 */ add r3, r31, r0 -/* 8019883C A0 63 0E 68 */ lhz r3, 0xe68(r3) -/* 80198840 48 00 00 20 */ b lbl_80198860 -lbl_80198844: -/* 80198844 38 03 FF FF */ addi r0, r3, -1 -/* 80198848 54 00 08 3C */ slwi r0, r0, 1 -/* 8019884C 7C 7F 02 14 */ add r3, r31, r0 -/* 80198850 A0 63 0E 68 */ lhz r3, 0xe68(r3) -/* 80198854 38 63 00 01 */ addi r3, r3, 1 -/* 80198858 48 00 00 08 */ b lbl_80198860 -lbl_8019885C: -/* 8019885C 38 60 00 00 */ li r3, 0 -lbl_80198860: -/* 80198860 39 61 00 20 */ addi r11, r1, 0x20 -/* 80198864 48 1C 99 C5 */ bl _restgpr_29 -/* 80198868 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8019886C 7C 08 03 A6 */ mtlr r0 -/* 80198870 38 21 00 20 */ addi r1, r1, 0x20 -/* 80198874 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/searchItemActor__13dShopSystem_cFv.s b/asm/d/shop/d_shop_system/searchItemActor__13dShopSystem_cFv.s deleted file mode 100644 index a187ffefcdb..00000000000 --- a/asm/d/shop/d_shop_system/searchItemActor__13dShopSystem_cFv.s +++ /dev/null @@ -1,361 +0,0 @@ -lbl_8019A5D0: -/* 8019A5D0 94 21 FF 40 */ stwu r1, -0xc0(r1) -/* 8019A5D4 7C 08 02 A6 */ mflr r0 -/* 8019A5D8 90 01 00 C4 */ stw r0, 0xc4(r1) -/* 8019A5DC DB E1 00 B0 */ stfd f31, 0xb0(r1) -/* 8019A5E0 F3 E1 00 B8 */ psq_st f31, 184(r1), 0, 0 /* qr0 */ -/* 8019A5E4 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8019A5E8 48 1C 7B D5 */ bl _savegpr_21 -/* 8019A5EC 7C 7E 1B 78 */ mr r30, r3 -/* 8019A5F0 80 6D 8A DC */ lwz r3, dShopSystem_item_count(r13) -/* 8019A5F4 2C 03 FF FF */ cmpwi r3, -1 -/* 8019A5F8 41 82 00 58 */ beq lbl_8019A650 -/* 8019A5FC 88 8D 8A D8 */ lbz r4, data_80451058(r13) -/* 8019A600 7C 03 20 00 */ cmpw r3, r4 -/* 8019A604 41 80 00 10 */ blt lbl_8019A614 -/* 8019A608 80 0D 8A E4 */ lwz r0, dShopSystem_camera_count(r13) -/* 8019A60C 2C 00 00 02 */ cmpwi r0, 2 -/* 8019A610 40 80 00 40 */ bge lbl_8019A650 -lbl_8019A614: -/* 8019A614 7C 03 20 00 */ cmpw r3, r4 -/* 8019A618 40 80 00 14 */ bge lbl_8019A62C -/* 8019A61C 3C 60 80 19 */ lis r3, dShopSystem_searchItemActor__FPvPv@ha /* 0x80197098@ha */ -/* 8019A620 38 63 70 98 */ addi r3, r3, dShopSystem_searchItemActor__FPvPv@l /* 0x80197098@l */ -/* 8019A624 7F C4 F3 78 */ mr r4, r30 -/* 8019A628 4B E8 6D 11 */ bl fpcEx_Search__FPFPvPv_PvPv -lbl_8019A62C: -/* 8019A62C 80 0D 8A E4 */ lwz r0, dShopSystem_camera_count(r13) -/* 8019A630 2C 00 00 02 */ cmpwi r0, 2 -/* 8019A634 40 80 00 14 */ bge lbl_8019A648 -/* 8019A638 3C 60 80 19 */ lis r3, dShopSystem_searchCameraActor__FPvPv@ha /* 0x80197270@ha */ -/* 8019A63C 38 63 72 70 */ addi r3, r3, dShopSystem_searchCameraActor__FPvPv@l /* 0x80197270@l */ -/* 8019A640 7F C4 F3 78 */ mr r4, r30 -/* 8019A644 4B E8 6C F5 */ bl fpcEx_Search__FPFPvPv_PvPv -lbl_8019A648: -/* 8019A648 38 60 00 00 */ li r3, 0 -/* 8019A64C 48 00 04 94 */ b lbl_8019AAE0 -lbl_8019A650: -/* 8019A650 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 8019A654 7C 03 00 00 */ cmpw r3, r0 -/* 8019A658 41 80 04 84 */ blt lbl_8019AADC -/* 8019A65C 80 0D 8A E4 */ lwz r0, dShopSystem_camera_count(r13) -/* 8019A660 2C 00 00 02 */ cmpwi r0, 2 -/* 8019A664 41 80 04 78 */ blt lbl_8019AADC -/* 8019A668 38 00 00 FF */ li r0, 0xff -/* 8019A66C 98 1E 0F 73 */ stb r0, 0xf73(r30) -/* 8019A670 88 0D 8A E0 */ lbz r0, data_80451060(r13) -/* 8019A674 28 00 00 00 */ cmplwi r0, 0 -/* 8019A678 41 82 01 68 */ beq lbl_8019A7E0 -/* 8019A67C 3A A0 00 00 */ li r21, 0 -/* 8019A680 3B 60 00 00 */ li r27, 0 -/* 8019A684 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019A688 3A E3 B8 A4 */ addi r23, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 8019A68C 3A C1 00 2C */ addi r22, r1, 0x2c -/* 8019A690 3B 01 00 64 */ addi r24, r1, 0x64 -/* 8019A694 C3 E2 A1 44 */ lfs f31, lit_5084(r2) -/* 8019A698 3B 21 00 48 */ addi r25, r1, 0x48 -/* 8019A69C 7F 7A DB 78 */ mr r26, r27 -/* 8019A6A0 3B ED 81 68 */ la r31, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 8019A6A4 3B A1 00 18 */ addi r29, r1, 0x18 -/* 8019A6A8 3B 81 00 10 */ addi r28, r1, 0x10 -/* 8019A6AC 48 00 00 40 */ b lbl_8019A6EC -lbl_8019A6B0: -/* 8019A6B0 7C 17 D8 2E */ lwzx r0, r23, r27 -/* 8019A6B4 7C 16 D9 2E */ stwx r0, r22, r27 -/* 8019A6B8 88 1F 00 00 */ lbz r0, 0(r31) -/* 8019A6BC 98 1D 00 00 */ stb r0, 0(r29) -/* 8019A6C0 7F C3 F3 78 */ mr r3, r30 -/* 8019A6C4 7C 96 D8 2E */ lwzx r4, r22, r27 -/* 8019A6C8 4B E8 01 19 */ bl fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 8019A6CC 7C 38 DD 2E */ stfsx f1, r24, r27 -/* 8019A6D0 7F F9 DD 2E */ stfsx f31, r25, r27 -/* 8019A6D4 9B 5C 00 00 */ stb r26, 0(r28) -/* 8019A6D8 3A B5 00 01 */ addi r21, r21, 1 -/* 8019A6DC 3B 9C 00 01 */ addi r28, r28, 1 -/* 8019A6E0 3B BD 00 01 */ addi r29, r29, 1 -/* 8019A6E4 3B FF 00 01 */ addi r31, r31, 1 -/* 8019A6E8 3B 7B 00 04 */ addi r27, r27, 4 -lbl_8019A6EC: -/* 8019A6EC 89 2D 8A D8 */ lbz r9, data_80451058(r13) -/* 8019A6F0 7C 15 48 00 */ cmpw r21, r9 -/* 8019A6F4 41 80 FF BC */ blt lbl_8019A6B0 -/* 8019A6F8 39 40 00 00 */ li r10, 0 -/* 8019A6FC 38 80 00 00 */ li r4, 0 -/* 8019A700 38 E1 00 64 */ addi r7, r1, 0x64 -/* 8019A704 38 C1 00 48 */ addi r6, r1, 0x48 -/* 8019A708 38 61 00 10 */ addi r3, r1, 0x10 -/* 8019A70C 48 00 00 7C */ b lbl_8019A788 -lbl_8019A710: -/* 8019A710 7C 07 24 2E */ lfsx f0, r7, r4 -/* 8019A714 7C 06 25 2E */ stfsx f0, r6, r4 -/* 8019A718 99 43 00 00 */ stb r10, 0(r3) -/* 8019A71C 2C 0A 00 00 */ cmpwi r10, 0 -/* 8019A720 40 81 00 5C */ ble lbl_8019A77C -/* 8019A724 7D 4B 53 78 */ mr r11, r10 -/* 8019A728 55 45 10 3A */ slwi r5, r10, 2 -/* 8019A72C 38 0A 00 01 */ addi r0, r10, 1 -/* 8019A730 7C 09 03 A6 */ mtctr r0 -/* 8019A734 41 80 00 48 */ blt lbl_8019A77C -lbl_8019A738: -/* 8019A738 39 01 00 48 */ addi r8, r1, 0x48 -/* 8019A73C 7D 08 2A 14 */ add r8, r8, r5 -/* 8019A740 C0 08 00 00 */ lfs f0, 0(r8) -/* 8019A744 C0 28 FF FC */ lfs f1, -4(r8) -/* 8019A748 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8019A74C 40 80 00 24 */ bge lbl_8019A770 -/* 8019A750 D0 28 00 00 */ stfs f1, 0(r8) -/* 8019A754 D0 08 FF FC */ stfs f0, -4(r8) -/* 8019A758 39 01 00 10 */ addi r8, r1, 0x10 -/* 8019A75C 7D 08 5A 14 */ add r8, r8, r11 -/* 8019A760 89 88 00 00 */ lbz r12, 0(r8) -/* 8019A764 88 08 FF FF */ lbz r0, -1(r8) -/* 8019A768 98 08 00 00 */ stb r0, 0(r8) -/* 8019A76C 99 88 FF FF */ stb r12, -1(r8) -lbl_8019A770: -/* 8019A770 39 6B FF FF */ addi r11, r11, -1 -/* 8019A774 38 A5 FF FC */ addi r5, r5, -4 -/* 8019A778 42 00 FF C0 */ bdnz lbl_8019A738 -lbl_8019A77C: -/* 8019A77C 39 4A 00 01 */ addi r10, r10, 1 -/* 8019A780 38 63 00 01 */ addi r3, r3, 1 -/* 8019A784 38 84 00 04 */ addi r4, r4, 4 -lbl_8019A788: -/* 8019A788 7C 0A 48 00 */ cmpw r10, r9 -/* 8019A78C 41 80 FF 84 */ blt lbl_8019A710 -/* 8019A790 38 80 00 00 */ li r4, 0 -/* 8019A794 39 01 00 2C */ addi r8, r1, 0x2c -/* 8019A798 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019A79C 38 E3 B8 A4 */ addi r7, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 8019A7A0 38 C1 00 18 */ addi r6, r1, 0x18 -/* 8019A7A4 38 A1 00 10 */ addi r5, r1, 0x10 -/* 8019A7A8 38 6D 81 68 */ la r3, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 8019A7AC 7D 29 03 A6 */ mtctr r9 -/* 8019A7B0 2C 09 00 00 */ cmpwi r9, 0 -/* 8019A7B4 40 81 00 2C */ ble lbl_8019A7E0 -lbl_8019A7B8: -/* 8019A7B8 89 25 00 00 */ lbz r9, 0(r5) -/* 8019A7BC 55 20 10 3A */ slwi r0, r9, 2 -/* 8019A7C0 7C 08 00 2E */ lwzx r0, r8, r0 -/* 8019A7C4 7C 07 21 2E */ stwx r0, r7, r4 -/* 8019A7C8 7C 06 48 AE */ lbzx r0, r6, r9 -/* 8019A7CC 98 03 00 00 */ stb r0, 0(r3) -/* 8019A7D0 38 63 00 01 */ addi r3, r3, 1 -/* 8019A7D4 38 84 00 04 */ addi r4, r4, 4 -/* 8019A7D8 38 A5 00 01 */ addi r5, r5, 1 -/* 8019A7DC 42 00 FF DC */ bdnz lbl_8019A7B8 -lbl_8019A7E0: -/* 8019A7E0 3B E0 00 00 */ li r31, 0 -/* 8019A7E4 3B A0 00 00 */ li r29, 0 -/* 8019A7E8 3B 80 00 00 */ li r28, 0 -/* 8019A7EC 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019A7F0 3B 63 B8 A4 */ addi r27, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 8019A7F4 48 00 00 A8 */ b lbl_8019A89C -lbl_8019A7F8: -/* 8019A7F8 7C 7B E0 2E */ lwzx r3, r27, r28 -/* 8019A7FC 80 83 05 6C */ lwz r4, 0x56c(r3) -/* 8019A800 38 1C 0E 4C */ addi r0, r28, 0xe4c -/* 8019A804 7C 9E 01 2E */ stwx r4, r30, r0 -/* 8019A808 7C 7B E0 2E */ lwzx r3, r27, r28 -/* 8019A80C A8 03 04 B4 */ lha r0, 0x4b4(r3) -/* 8019A810 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 8019A814 28 00 FF FF */ cmplwi r0, 0xffff -/* 8019A818 38 60 FF FF */ li r3, -1 -/* 8019A81C 41 82 00 08 */ beq lbl_8019A824 -/* 8019A820 7C 03 03 78 */ mr r3, r0 -lbl_8019A824: -/* 8019A824 38 1D 0E 68 */ addi r0, r29, 0xe68 -/* 8019A828 7C 7E 03 2E */ sthx r3, r30, r0 -/* 8019A82C 3C 04 00 01 */ addis r0, r4, 1 -/* 8019A830 28 00 FF FF */ cmplwi r0, 0xffff -/* 8019A834 40 82 00 20 */ bne lbl_8019A854 -/* 8019A838 7F C3 F3 78 */ mr r3, r30 -/* 8019A83C 7F E4 FB 78 */ mr r4, r31 -/* 8019A840 4B FF CD 81 */ bl onFlag__13dShopSystem_cFi -/* 8019A844 7F C3 F3 78 */ mr r3, r30 -/* 8019A848 7F E4 FB 78 */ mr r4, r31 -/* 8019A84C 4B FF CD CD */ bl onSoldOutItemFlag__13dShopSystem_cFi -/* 8019A850 48 00 00 40 */ b lbl_8019A890 -lbl_8019A854: -/* 8019A854 7F C3 F3 78 */ mr r3, r30 -/* 8019A858 7F E4 FB 78 */ mr r4, r31 -/* 8019A85C 4B FF CD 81 */ bl offFlag__13dShopSystem_cFi -/* 8019A860 7C 7B E0 2E */ lwzx r3, r27, r28 -/* 8019A864 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8019A868 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8019A86C 28 00 00 FF */ cmplwi r0, 0xff -/* 8019A870 40 82 00 14 */ bne lbl_8019A884 -/* 8019A874 7F C3 F3 78 */ mr r3, r30 -/* 8019A878 7F E4 FB 78 */ mr r4, r31 -/* 8019A87C 4B FF CD 9D */ bl onSoldOutItemFlag__13dShopSystem_cFi -/* 8019A880 48 00 00 10 */ b lbl_8019A890 -lbl_8019A884: -/* 8019A884 7F C3 F3 78 */ mr r3, r30 -/* 8019A888 7F E4 FB 78 */ mr r4, r31 -/* 8019A88C 4B FF CD A9 */ bl offSoldOutItemFlag__13dShopSystem_cFi -lbl_8019A890: -/* 8019A890 3B FF 00 01 */ addi r31, r31, 1 -/* 8019A894 3B BD 00 02 */ addi r29, r29, 2 -/* 8019A898 3B 9C 00 04 */ addi r28, r28, 4 -lbl_8019A89C: -/* 8019A89C 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 8019A8A0 7C 1F 00 00 */ cmpw r31, r0 -/* 8019A8A4 41 80 FF 54 */ blt lbl_8019A7F8 -/* 8019A8A8 88 1E 0F 77 */ lbz r0, 0xf77(r30) -/* 8019A8AC 28 00 00 08 */ cmplwi r0, 8 -/* 8019A8B0 40 82 00 40 */ bne lbl_8019A8F0 -/* 8019A8B4 80 6D 81 70 */ lwz r3, dShopSystem_cameraActor(r13) -/* 8019A8B8 C0 02 A1 60 */ lfs f0, lit_5687(r2) -/* 8019A8BC D0 03 04 D0 */ stfs f0, 0x4d0(r3) -/* 8019A8C0 C0 02 A1 64 */ lfs f0, lit_5688(r2) -/* 8019A8C4 D0 03 04 D4 */ stfs f0, 0x4d4(r3) -/* 8019A8C8 C0 02 A1 68 */ lfs f0, lit_5689(r2) -/* 8019A8CC D0 03 04 D8 */ stfs f0, 0x4d8(r3) -/* 8019A8D0 38 6D 81 70 */ la r3, dShopSystem_cameraActor(r13) /* 804506F0-_SDA_BASE_ */ -/* 8019A8D4 80 63 00 04 */ lwz r3, 4(r3) -/* 8019A8D8 C0 02 A1 3C */ lfs f0, lit_5006(r2) -/* 8019A8DC D0 03 04 D0 */ stfs f0, 0x4d0(r3) -/* 8019A8E0 C0 02 A1 6C */ lfs f0, lit_5690(r2) -/* 8019A8E4 D0 03 04 D4 */ stfs f0, 0x4d4(r3) -/* 8019A8E8 C0 02 A1 70 */ lfs f0, lit_5691(r2) -/* 8019A8EC D0 03 04 D8 */ stfs f0, 0x4d8(r3) -lbl_8019A8F0: -/* 8019A8F0 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 8019A8F4 28 00 00 03 */ cmplwi r0, 3 -/* 8019A8F8 40 81 01 18 */ ble lbl_8019AA10 -/* 8019A8FC 80 6D 81 70 */ lwz r3, dShopSystem_cameraActor(r13) -/* 8019A900 38 03 04 D0 */ addi r0, r3, 0x4d0 -/* 8019A904 90 01 00 08 */ stw r0, 8(r1) -/* 8019A908 38 6D 81 70 */ la r3, dShopSystem_cameraActor(r13) /* 804506F0-_SDA_BASE_ */ -/* 8019A90C 80 63 00 04 */ lwz r3, 4(r3) -/* 8019A910 38 03 04 D0 */ addi r0, r3, 0x4d0 -/* 8019A914 90 01 00 0C */ stw r0, 0xc(r1) -/* 8019A918 38 7E 0E 78 */ addi r3, r30, 0xe78 -/* 8019A91C 7F C4 F3 78 */ mr r4, r30 -/* 8019A920 3C A0 80 3C */ lis r5, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019A924 39 45 B8 A4 */ addi r10, r5, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 8019A928 80 AA 00 00 */ lwz r5, 0(r10) -/* 8019A92C 80 CA 00 04 */ lwz r6, 4(r10) -/* 8019A930 80 EA 00 08 */ lwz r7, 8(r10) -/* 8019A934 81 0A 00 0C */ lwz r8, 0xc(r10) -/* 8019A938 81 2A 00 10 */ lwz r9, 0x10(r10) -/* 8019A93C 81 4A 00 14 */ lwz r10, 0x14(r10) -/* 8019A940 4B FF BC C9 */ bl setCamDataIdx2__16ShopCam_action_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyz -/* 8019A944 88 1E 0F 77 */ lbz r0, 0xf77(r30) -/* 8019A948 28 00 00 08 */ cmplwi r0, 8 -/* 8019A94C 40 82 00 28 */ bne lbl_8019A974 -/* 8019A950 C0 02 A1 74 */ lfs f0, lit_5692(r2) -/* 8019A954 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8019A958 C0 02 A1 78 */ lfs f0, lit_5693(r2) -/* 8019A95C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8019A960 C0 02 A1 7C */ lfs f0, lit_5694(r2) -/* 8019A964 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8019A968 38 7E 0E 78 */ addi r3, r30, 0xe78 -/* 8019A96C 38 81 00 20 */ addi r4, r1, 0x20 -/* 8019A970 4B FF BF 49 */ bl setMasterCamCtrPos__16ShopCam_action_cFP4cXyz -lbl_8019A974: -/* 8019A974 3A A0 00 00 */ li r21, 0 -/* 8019A978 3B E0 00 00 */ li r31, 0 -/* 8019A97C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8019A980 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8019A984 3A E3 09 58 */ addi r23, r3, 0x958 -/* 8019A988 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019A98C 3B 83 B8 A4 */ addi r28, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -lbl_8019A990: -/* 8019A990 7C 7C F8 2E */ lwzx r3, r28, r31 -/* 8019A994 28 03 00 00 */ cmplwi r3, 0 -/* 8019A998 41 82 00 5C */ beq lbl_8019A9F4 -/* 8019A99C A8 03 04 B8 */ lha r0, 0x4b8(r3) -/* 8019A9A0 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8019A9A4 54 1B C6 3E */ rlwinm r27, r0, 0x18, 0x18, 0x1f -/* 8019A9A8 28 04 00 FF */ cmplwi r4, 0xff -/* 8019A9AC 41 82 00 48 */ beq lbl_8019A9F4 -/* 8019A9B0 7E E3 BB 78 */ mr r3, r23 -/* 8019A9B4 4B E9 9E AD */ bl isSwitch__12dSv_memBit_cCFi -/* 8019A9B8 2C 03 00 00 */ cmpwi r3, 0 -/* 8019A9BC 40 82 00 38 */ bne lbl_8019A9F4 -/* 8019A9C0 28 1B 00 FF */ cmplwi r27, 0xff -/* 8019A9C4 41 82 00 30 */ beq lbl_8019A9F4 -/* 8019A9C8 7E E3 BB 78 */ mr r3, r23 -/* 8019A9CC 7F 64 DB 78 */ mr r4, r27 -/* 8019A9D0 4B E9 9E 91 */ bl isSwitch__12dSv_memBit_cCFi -/* 8019A9D4 2C 03 00 00 */ cmpwi r3, 0 -/* 8019A9D8 40 82 00 1C */ bne lbl_8019A9F4 -/* 8019A9DC 7F C3 F3 78 */ mr r3, r30 -/* 8019A9E0 7E A4 AB 78 */ mr r4, r21 -/* 8019A9E4 4B FF CB DD */ bl onFlag__13dShopSystem_cFi -/* 8019A9E8 7F C3 F3 78 */ mr r3, r30 -/* 8019A9EC 7E A4 AB 78 */ mr r4, r21 -/* 8019A9F0 4B FF CC 29 */ bl onSoldOutItemFlag__13dShopSystem_cFi -lbl_8019A9F4: -/* 8019A9F4 3A B5 00 01 */ addi r21, r21, 1 -/* 8019A9F8 2C 15 00 07 */ cmpwi r21, 7 -/* 8019A9FC 3B FF 00 04 */ addi r31, r31, 4 -/* 8019AA00 41 80 FF 90 */ blt lbl_8019A990 -/* 8019AA04 38 00 FF FF */ li r0, -1 -/* 8019AA08 90 0D 8A DC */ stw r0, dShopSystem_item_count(r13) -/* 8019AA0C 48 00 00 D0 */ b lbl_8019AADC -lbl_8019AA10: -/* 8019AA10 38 7E 0E 78 */ addi r3, r30, 0xe78 -/* 8019AA14 7F C4 F3 78 */ mr r4, r30 -/* 8019AA18 3C A0 80 3C */ lis r5, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019AA1C 38 E5 B8 A4 */ addi r7, r5, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 8019AA20 80 A7 00 00 */ lwz r5, 0(r7) -/* 8019AA24 80 C7 00 04 */ lwz r6, 4(r7) -/* 8019AA28 80 E7 00 08 */ lwz r7, 8(r7) -/* 8019AA2C 81 0D 81 70 */ lwz r8, dShopSystem_cameraActor(r13) -/* 8019AA30 39 08 04 D0 */ addi r8, r8, 0x4d0 -/* 8019AA34 39 2D 81 70 */ la r9, dShopSystem_cameraActor(r13) /* 804506F0-_SDA_BASE_ */ -/* 8019AA38 81 29 00 04 */ lwz r9, 4(r9) -/* 8019AA3C 39 29 04 D0 */ addi r9, r9, 0x4d0 -/* 8019AA40 4B FF BB 05 */ bl setCamDataIdx__16ShopCam_action_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyz -/* 8019AA44 3A A0 00 00 */ li r21, 0 -/* 8019AA48 3B E0 00 00 */ li r31, 0 -/* 8019AA4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8019AA50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8019AA54 3A E3 09 58 */ addi r23, r3, 0x958 -/* 8019AA58 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019AA5C 3B 83 B8 A4 */ addi r28, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -lbl_8019AA60: -/* 8019AA60 7C 7C F8 2E */ lwzx r3, r28, r31 -/* 8019AA64 28 03 00 00 */ cmplwi r3, 0 -/* 8019AA68 41 82 00 5C */ beq lbl_8019AAC4 -/* 8019AA6C A8 03 04 B8 */ lha r0, 0x4b8(r3) -/* 8019AA70 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8019AA74 54 1B C6 3E */ rlwinm r27, r0, 0x18, 0x18, 0x1f -/* 8019AA78 28 04 00 FF */ cmplwi r4, 0xff -/* 8019AA7C 41 82 00 48 */ beq lbl_8019AAC4 -/* 8019AA80 7E E3 BB 78 */ mr r3, r23 -/* 8019AA84 4B E9 9D DD */ bl isSwitch__12dSv_memBit_cCFi -/* 8019AA88 2C 03 00 00 */ cmpwi r3, 0 -/* 8019AA8C 40 82 00 38 */ bne lbl_8019AAC4 -/* 8019AA90 28 1B 00 FF */ cmplwi r27, 0xff -/* 8019AA94 41 82 00 30 */ beq lbl_8019AAC4 -/* 8019AA98 7E E3 BB 78 */ mr r3, r23 -/* 8019AA9C 7F 64 DB 78 */ mr r4, r27 -/* 8019AAA0 4B E9 9D C1 */ bl isSwitch__12dSv_memBit_cCFi -/* 8019AAA4 2C 03 00 00 */ cmpwi r3, 0 -/* 8019AAA8 40 82 00 1C */ bne lbl_8019AAC4 -/* 8019AAAC 7F C3 F3 78 */ mr r3, r30 -/* 8019AAB0 7E A4 AB 78 */ mr r4, r21 -/* 8019AAB4 4B FF CB 0D */ bl onFlag__13dShopSystem_cFi -/* 8019AAB8 7F C3 F3 78 */ mr r3, r30 -/* 8019AABC 7E A4 AB 78 */ mr r4, r21 -/* 8019AAC0 4B FF CB 59 */ bl onSoldOutItemFlag__13dShopSystem_cFi -lbl_8019AAC4: -/* 8019AAC4 3A B5 00 01 */ addi r21, r21, 1 -/* 8019AAC8 2C 15 00 07 */ cmpwi r21, 7 -/* 8019AACC 3B FF 00 04 */ addi r31, r31, 4 -/* 8019AAD0 41 80 FF 90 */ blt lbl_8019AA60 -/* 8019AAD4 38 00 FF FF */ li r0, -1 -/* 8019AAD8 90 0D 8A DC */ stw r0, dShopSystem_item_count(r13) -lbl_8019AADC: -/* 8019AADC 38 60 00 01 */ li r3, 1 -lbl_8019AAE0: -/* 8019AAE0 E3 E1 00 B8 */ psq_l f31, 184(r1), 0, 0 /* qr0 */ -/* 8019AAE4 CB E1 00 B0 */ lfd f31, 0xb0(r1) -/* 8019AAE8 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8019AAEC 48 1C 77 1D */ bl _restgpr_21 -/* 8019AAF0 80 01 00 C4 */ lwz r0, 0xc4(r1) -/* 8019AAF4 7C 08 03 A6 */ mtlr r0 -/* 8019AAF8 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8019AAFC 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/seq_decide_yes__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/seq_decide_yes__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s deleted file mode 100644 index 3e2a58a084c..00000000000 --- a/asm/d/shop/d_shop_system/seq_decide_yes__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s +++ /dev/null @@ -1,104 +0,0 @@ -lbl_80199E28: -/* 80199E28 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80199E2C 7C 08 02 A6 */ mflr r0 -/* 80199E30 90 01 00 24 */ stw r0, 0x24(r1) -/* 80199E34 39 61 00 20 */ addi r11, r1, 0x20 -/* 80199E38 48 1C 83 A5 */ bl _savegpr_29 -/* 80199E3C 7C 7D 1B 78 */ mr r29, r3 -/* 80199E40 7C 9E 23 78 */ mr r30, r4 -/* 80199E44 7C BF 2B 78 */ mr r31, r5 -/* 80199E48 48 09 E5 89 */ bl getMessageID__12dMsgObject_cFv -/* 80199E4C 28 03 1B 82 */ cmplwi r3, 0x1b82 -/* 80199E50 40 82 00 30 */ bne lbl_80199E80 -/* 80199E54 38 00 00 00 */ li r0, 0 -/* 80199E58 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80199E5C C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80199E60 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80199E64 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80199E68 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80199E6C D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80199E70 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80199E74 D0 1D 0F 44 */ stfs f0, 0xf44(r29) -/* 80199E78 38 00 00 01 */ li r0, 1 -/* 80199E7C 98 1D 0F 76 */ stb r0, 0xf76(r29) -lbl_80199E80: -/* 80199E80 38 7D 09 74 */ addi r3, r29, 0x974 -/* 80199E84 38 81 00 08 */ addi r4, r1, 8 -/* 80199E88 48 0B 06 A1 */ bl getEventId__10dMsgFlow_cFPi -/* 80199E8C 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80199E90 28 00 00 01 */ cmplwi r0, 1 -/* 80199E94 40 82 00 98 */ bne lbl_80199F2C -/* 80199E98 7F E3 FB 78 */ mr r3, r31 -/* 80199E9C 7F C4 F3 78 */ mr r4, r30 -/* 80199EA0 38 A0 00 00 */ li r5, 0 -/* 80199EA4 38 C0 00 00 */ li r6, 0 -/* 80199EA8 48 0B 04 31 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80199EAC 2C 03 00 00 */ cmpwi r3, 0 -/* 80199EB0 41 82 00 D8 */ beq lbl_80199F88 -/* 80199EB4 80 7D 0D 90 */ lwz r3, 0xd90(r29) -/* 80199EB8 3C 03 00 01 */ addis r0, r3, 1 -/* 80199EBC 28 00 FF FF */ cmplwi r0, 0xffff -/* 80199EC0 40 82 00 28 */ bne lbl_80199EE8 -/* 80199EC4 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 80199EC8 80 81 00 08 */ lwz r4, 8(r1) -/* 80199ECC 38 A0 00 00 */ li r5, 0 -/* 80199ED0 38 C0 FF FF */ li r6, -1 -/* 80199ED4 38 E0 FF FF */ li r7, -1 -/* 80199ED8 39 00 00 00 */ li r8, 0 -/* 80199EDC 39 20 00 00 */ li r9, 0 -/* 80199EE0 4B E8 1D 09 */ bl fopAcM_createItemForPresentDemo__FPC4cXyziUciiPC5csXyzPC4cXyz -/* 80199EE4 90 7D 0D 90 */ stw r3, 0xd90(r29) -lbl_80199EE8: -/* 80199EE8 80 7D 0D 90 */ lwz r3, 0xd90(r29) -/* 80199EEC 4B E8 74 B1 */ bl fpcEx_IsExist__FUi -/* 80199EF0 2C 03 00 00 */ cmpwi r3, 0 -/* 80199EF4 41 82 00 30 */ beq lbl_80199F24 -/* 80199EF8 7F A3 EB 78 */ mr r3, r29 -/* 80199EFC 38 80 00 08 */ li r4, 8 -/* 80199F00 4B FF D6 DD */ bl offFlag__13dShopSystem_cFi -/* 80199F04 7F A3 EB 78 */ mr r3, r29 -/* 80199F08 48 00 05 ED */ bl setSoldOutItemHide__13dShopSystem_cFv -/* 80199F0C 38 00 00 01 */ li r0, 1 -/* 80199F10 B0 1D 0E 30 */ sth r0, 0xe30(r29) -/* 80199F14 7F A3 EB 78 */ mr r3, r29 -/* 80199F18 4B FB 03 0D */ bl evtChange__8daNpcT_cFv -/* 80199F1C 38 60 00 02 */ li r3, 2 -/* 80199F20 48 00 00 6C */ b lbl_80199F8C -lbl_80199F24: -/* 80199F24 38 60 00 00 */ li r3, 0 -/* 80199F28 48 00 00 64 */ b lbl_80199F8C -lbl_80199F2C: -/* 80199F2C 80 1D 0F 60 */ lwz r0, 0xf60(r29) -/* 80199F30 2C 00 00 00 */ cmpwi r0, 0 -/* 80199F34 41 80 00 0C */ blt lbl_80199F40 -/* 80199F38 38 C0 00 64 */ li r6, 0x64 -/* 80199F3C 48 00 00 1C */ b lbl_80199F58 -lbl_80199F40: -/* 80199F40 88 7D 0F 6E */ lbz r3, 0xf6e(r29) -/* 80199F44 38 03 FF FF */ addi r0, r3, -1 -/* 80199F48 54 00 08 3C */ slwi r0, r0, 1 -/* 80199F4C 7C 7D 02 14 */ add r3, r29, r0 -/* 80199F50 A0 63 0E 68 */ lhz r3, 0xe68(r3) -/* 80199F54 38 C3 00 01 */ addi r6, r3, 1 -lbl_80199F58: -/* 80199F58 7F E3 FB 78 */ mr r3, r31 -/* 80199F5C 7F C4 F3 78 */ mr r4, r30 -/* 80199F60 38 A0 00 00 */ li r5, 0 -/* 80199F64 48 0B 03 75 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80199F68 2C 03 00 00 */ cmpwi r3, 0 -/* 80199F6C 41 82 00 1C */ beq lbl_80199F88 -/* 80199F70 7F A3 EB 78 */ mr r3, r29 -/* 80199F74 38 80 00 08 */ li r4, 8 -/* 80199F78 4B FF D6 65 */ bl offFlag__13dShopSystem_cFi -/* 80199F7C 7F A3 EB 78 */ mr r3, r29 -/* 80199F80 38 80 00 02 */ li r4, 2 -/* 80199F84 48 00 03 C1 */ bl setSeq__13dShopSystem_cFUc -lbl_80199F88: -/* 80199F88 38 60 00 00 */ li r3, 0 -lbl_80199F8C: -/* 80199F8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80199F90 48 1C 82 99 */ bl _restgpr_29 -/* 80199F94 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80199F98 7C 08 03 A6 */ mtlr r0 -/* 80199F9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80199FA0 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/seq_moving__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/seq_moving__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s deleted file mode 100644 index 660846c9c76..00000000000 --- a/asm/d/shop/d_shop_system/seq_moving__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s +++ /dev/null @@ -1,128 +0,0 @@ -lbl_80199A18: -/* 80199A18 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80199A1C 7C 08 02 A6 */ mflr r0 -/* 80199A20 90 01 00 64 */ stw r0, 0x64(r1) -/* 80199A24 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 80199A28 7C 7F 1B 78 */ mr r31, r3 -/* 80199A2C A8 63 0F 68 */ lha r3, 0xf68(r3) -/* 80199A30 38 03 00 01 */ addi r0, r3, 1 -/* 80199A34 B0 1F 0F 68 */ sth r0, 0xf68(r31) -/* 80199A38 38 61 00 14 */ addi r3, r1, 0x14 -/* 80199A3C 38 9F 0E 48 */ addi r4, r31, 0xe48 -/* 80199A40 88 BF 0F 6E */ lbz r5, 0xf6e(r31) -/* 80199A44 38 A5 FF FF */ addi r5, r5, -1 -/* 80199A48 4B FF CF 59 */ bl getCurrentPos__15dShopItemCtrl_cFi -/* 80199A4C C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80199A50 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80199A54 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80199A58 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80199A5C C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80199A60 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80199A64 38 61 00 38 */ addi r3, r1, 0x38 -/* 80199A68 38 81 00 20 */ addi r4, r1, 0x20 -/* 80199A6C 4B E7 B8 A5 */ bl mDoLib_project__FP3VecP3Vec -/* 80199A70 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 80199A74 28 00 00 07 */ cmplwi r0, 7 -/* 80199A78 40 82 00 30 */ bne lbl_80199AA8 -/* 80199A7C C0 21 00 20 */ lfs f1, 0x20(r1) -/* 80199A80 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80199A84 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80199A88 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 80199A8C EC 01 00 2A */ fadds f0, f1, f0 -/* 80199A90 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80199A94 C0 21 00 24 */ lfs f1, 0x24(r1) -/* 80199A98 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 80199A9C EC 01 00 2A */ fadds f0, f1, f0 -/* 80199AA0 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80199AA4 48 00 00 1C */ b lbl_80199AC0 -lbl_80199AA8: -/* 80199AA8 C0 21 00 24 */ lfs f1, 0x24(r1) -/* 80199AAC 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80199AB0 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80199AB4 C0 03 00 30 */ lfs f0, 0x30(r3) -/* 80199AB8 EC 01 00 2A */ fadds f0, f1, f0 -/* 80199ABC D0 01 00 24 */ stfs f0, 0x24(r1) -lbl_80199AC0: -/* 80199AC0 88 BF 0F 6F */ lbz r5, 0xf6f(r31) -/* 80199AC4 28 05 00 00 */ cmplwi r5, 0 -/* 80199AC8 41 82 00 EC */ beq lbl_80199BB4 -/* 80199ACC 38 61 00 08 */ addi r3, r1, 8 -/* 80199AD0 38 9F 0E 48 */ addi r4, r31, 0xe48 -/* 80199AD4 38 A5 FF FF */ addi r5, r5, -1 -/* 80199AD8 4B FF CE C9 */ bl getCurrentPos__15dShopItemCtrl_cFi -/* 80199ADC C0 01 00 08 */ lfs f0, 8(r1) -/* 80199AE0 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80199AE4 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80199AE8 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80199AEC C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80199AF0 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80199AF4 38 61 00 44 */ addi r3, r1, 0x44 -/* 80199AF8 38 81 00 2C */ addi r4, r1, 0x2c -/* 80199AFC 4B E7 B8 15 */ bl mDoLib_project__FP3VecP3Vec -/* 80199B00 88 1F 0F 6F */ lbz r0, 0xf6f(r31) -/* 80199B04 28 00 00 07 */ cmplwi r0, 7 -/* 80199B08 40 82 00 30 */ bne lbl_80199B38 -/* 80199B0C C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 80199B10 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80199B14 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80199B18 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 80199B1C EC 01 00 2A */ fadds f0, f1, f0 -/* 80199B20 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80199B24 C0 21 00 30 */ lfs f1, 0x30(r1) -/* 80199B28 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 80199B2C EC 01 00 2A */ fadds f0, f1, f0 -/* 80199B30 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80199B34 48 00 00 1C */ b lbl_80199B50 -lbl_80199B38: -/* 80199B38 C0 21 00 30 */ lfs f1, 0x30(r1) -/* 80199B3C 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80199B40 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80199B44 C0 03 00 30 */ lfs f0, 0x30(r3) -/* 80199B48 EC 01 00 2A */ fadds f0, f1, f0 -/* 80199B4C D0 01 00 30 */ stfs f0, 0x30(r1) -lbl_80199B50: -/* 80199B50 A8 1F 0F 68 */ lha r0, 0xf68(r31) -/* 80199B54 7C 00 01 D6 */ mullw r0, r0, r0 -/* 80199B58 C8 22 A1 50 */ lfd f1, lit_5298(r2) -/* 80199B5C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80199B60 90 01 00 54 */ stw r0, 0x54(r1) -/* 80199B64 3C 00 43 30 */ lis r0, 0x4330 -/* 80199B68 90 01 00 50 */ stw r0, 0x50(r1) -/* 80199B6C C8 01 00 50 */ lfd f0, 0x50(r1) -/* 80199B70 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80199B74 C0 02 A1 48 */ lfs f0, lit_5296(r2) -/* 80199B78 EC 61 00 24 */ fdivs f3, f1, f0 -/* 80199B7C C0 21 00 30 */ lfs f1, 0x30(r1) -/* 80199B80 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 80199B84 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80199B88 EC 03 00 32 */ fmuls f0, f3, f0 -/* 80199B8C EC 21 00 2A */ fadds f1, f1, f0 -/* 80199B90 80 7F 0E 44 */ lwz r3, 0xe44(r31) -/* 80199B94 C0 41 00 2C */ lfs f2, 0x2c(r1) -/* 80199B98 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80199B9C EC 00 10 28 */ fsubs f0, f0, f2 -/* 80199BA0 EC 03 00 32 */ fmuls f0, f3, f0 -/* 80199BA4 EC 02 00 2A */ fadds f0, f2, f0 -/* 80199BA8 D0 03 00 58 */ stfs f0, 0x58(r3) -/* 80199BAC D0 23 00 5C */ stfs f1, 0x5c(r3) -/* 80199BB0 48 00 00 18 */ b lbl_80199BC8 -lbl_80199BB4: -/* 80199BB4 C0 21 00 24 */ lfs f1, 0x24(r1) -/* 80199BB8 80 7F 0E 44 */ lwz r3, 0xe44(r31) -/* 80199BBC C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80199BC0 D0 03 00 58 */ stfs f0, 0x58(r3) -/* 80199BC4 D0 23 00 5C */ stfs f1, 0x5c(r3) -lbl_80199BC8: -/* 80199BC8 A8 1F 0F 68 */ lha r0, 0xf68(r31) -/* 80199BCC 2C 00 00 03 */ cmpwi r0, 3 -/* 80199BD0 41 80 00 10 */ blt lbl_80199BE0 -/* 80199BD4 7F E3 FB 78 */ mr r3, r31 -/* 80199BD8 38 80 00 04 */ li r4, 4 -/* 80199BDC 48 00 07 69 */ bl setSeq__13dShopSystem_cFUc -lbl_80199BE0: -/* 80199BE0 38 60 00 00 */ li r3, 0 -/* 80199BE4 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 80199BE8 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80199BEC 7C 08 03 A6 */ mtlr r0 -/* 80199BF0 38 21 00 60 */ addi r1, r1, 0x60 -/* 80199BF4 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/seq_select__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/seq_select__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s deleted file mode 100644 index ce782bd41ee..00000000000 --- a/asm/d/shop/d_shop_system/seq_select__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s +++ /dev/null @@ -1,312 +0,0 @@ -lbl_8019959C: -/* 8019959C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 801995A0 7C 08 02 A6 */ mflr r0 -/* 801995A4 90 01 00 54 */ stw r0, 0x54(r1) -/* 801995A8 39 61 00 50 */ addi r11, r1, 0x50 -/* 801995AC 48 1C 8C 2D */ bl _savegpr_28 -/* 801995B0 7C 7C 1B 78 */ mr r28, r3 -/* 801995B4 7C 9D 23 78 */ mr r29, r4 -/* 801995B8 7C BE 2B 78 */ mr r30, r5 -/* 801995BC 88 03 0F 75 */ lbz r0, 0xf75(r3) -/* 801995C0 28 00 00 01 */ cmplwi r0, 1 -/* 801995C4 40 82 00 2C */ bne lbl_801995F0 -/* 801995C8 7F C4 F3 78 */ mr r4, r30 -/* 801995CC 80 BC 0F 5C */ lwz r5, 0xf5c(r28) -/* 801995D0 81 83 0E 3C */ lwz r12, 0xe3c(r3) -/* 801995D4 81 8C 00 CC */ lwz r12, 0xcc(r12) -/* 801995D8 7D 89 03 A6 */ mtctr r12 -/* 801995DC 4E 80 04 21 */ bctrl -/* 801995E0 2C 03 00 00 */ cmpwi r3, 0 -/* 801995E4 40 82 00 0C */ bne lbl_801995F0 -/* 801995E8 38 60 00 00 */ li r3, 0 -/* 801995EC 48 00 04 14 */ b lbl_80199A00 -lbl_801995F0: -/* 801995F0 88 1C 0F 76 */ lbz r0, 0xf76(r28) -/* 801995F4 28 00 00 00 */ cmplwi r0, 0 -/* 801995F8 41 82 00 0C */ beq lbl_80199604 -/* 801995FC 38 00 00 00 */ li r0, 0 -/* 80199600 98 1C 0F 76 */ stb r0, 0xf76(r28) -lbl_80199604: -/* 80199604 7F 83 E3 78 */ mr r3, r28 -/* 80199608 38 80 00 01 */ li r4, 1 -/* 8019960C 7F C5 F3 78 */ mr r5, r30 -/* 80199610 4B FF E0 61 */ bl checkController__13dShopSystem_cFUcP10dMsgFlow_c -/* 80199614 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80199618 38 00 00 22 */ li r0, 0x22 -/* 8019961C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80199620 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80199624 98 04 5E 3C */ stb r0, 0x5e3c(r4) -/* 80199628 38 60 00 00 */ li r3, 0 -/* 8019962C 98 64 5E 57 */ stb r3, 0x5e57(r4) -/* 80199630 38 00 00 2A */ li r0, 0x2a -/* 80199634 98 04 5E 35 */ stb r0, 0x5e35(r4) -/* 80199638 98 64 5E 50 */ stb r3, 0x5e50(r4) -/* 8019963C 41 82 02 E4 */ beq lbl_80199920 -/* 80199640 7F 83 E3 78 */ mr r3, r28 -/* 80199644 7F E4 FB 78 */ mr r4, r31 -/* 80199648 38 A0 00 01 */ li r5, 1 -/* 8019964C 4B FF ED F9 */ bl moveCursor__13dShopSystem_cFiUc -/* 80199650 7C 66 1B 78 */ mr r6, r3 -/* 80199654 88 1C 0F 75 */ lbz r0, 0xf75(r28) -/* 80199658 20 00 00 01 */ subfic r0, r0, 1 -/* 8019965C 7C 00 00 34 */ cntlzw r0, r0 -/* 80199660 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 80199664 41 82 00 34 */ beq lbl_80199698 -/* 80199668 2C 1F 00 02 */ cmpwi r31, 2 -/* 8019966C 40 82 00 2C */ bne lbl_80199698 -/* 80199670 90 DC 0F 5C */ stw r6, 0xf5c(r28) -/* 80199674 C0 02 A1 44 */ lfs f0, lit_5084(r2) -/* 80199678 D0 1C 0F 38 */ stfs f0, 0xf38(r28) -/* 8019967C D0 1C 0F 3C */ stfs f0, 0xf3c(r28) -/* 80199680 D0 1C 0F 40 */ stfs f0, 0xf40(r28) -/* 80199684 D0 1C 0F 44 */ stfs f0, 0xf44(r28) -/* 80199688 7F 83 E3 78 */ mr r3, r28 -/* 8019968C 38 80 00 0A */ li r4, 0xa -/* 80199690 48 00 0C B5 */ bl setSeq__13dShopSystem_cFUc -/* 80199694 48 00 02 A0 */ b lbl_80199934 -lbl_80199698: -/* 80199698 2C 00 00 00 */ cmpwi r0, 0 -/* 8019969C 41 82 00 5C */ beq lbl_801996F8 -/* 801996A0 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 801996A4 28 00 00 00 */ cmplwi r0, 0 -/* 801996A8 40 82 00 50 */ bne lbl_801996F8 -/* 801996AC 90 DC 0F 5C */ stw r6, 0xf5c(r28) -/* 801996B0 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 801996B4 B0 1C 0F 4C */ sth r0, 0xf4c(r28) -/* 801996B8 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 801996BC D0 3C 0F 38 */ stfs f1, 0xf38(r28) -/* 801996C0 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 801996C4 D0 1C 0F 3C */ stfs f0, 0xf3c(r28) -/* 801996C8 D0 3C 0F 40 */ stfs f1, 0xf40(r28) -/* 801996CC C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 801996D0 D0 1C 0F 44 */ stfs f0, 0xf44(r28) -/* 801996D4 C0 02 A1 44 */ lfs f0, lit_5084(r2) -/* 801996D8 D0 1C 0F 38 */ stfs f0, 0xf38(r28) -/* 801996DC D0 1C 0F 3C */ stfs f0, 0xf3c(r28) -/* 801996E0 D0 1C 0F 40 */ stfs f0, 0xf40(r28) -/* 801996E4 D0 1C 0F 44 */ stfs f0, 0xf44(r28) -/* 801996E8 7F 83 E3 78 */ mr r3, r28 -/* 801996EC 38 80 00 01 */ li r4, 1 -/* 801996F0 48 00 0C 55 */ bl setSeq__13dShopSystem_cFUc -/* 801996F4 48 00 02 40 */ b lbl_80199934 -lbl_801996F8: -/* 801996F8 7F C3 F3 78 */ mr r3, r30 -/* 801996FC 7F A4 EB 78 */ mr r4, r29 -/* 80199700 38 A0 00 00 */ li r5, 0 -/* 80199704 48 0B 0B D5 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80199708 2C 03 00 00 */ cmpwi r3, 0 -/* 8019970C 41 82 01 A4 */ beq lbl_801998B0 -/* 80199710 2C 1F 00 03 */ cmpwi r31, 3 -/* 80199714 40 82 00 6C */ bne lbl_80199780 -/* 80199718 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 8019971C 28 00 00 00 */ cmplwi r0, 0 -/* 80199720 41 82 00 38 */ beq lbl_80199758 -/* 80199724 38 00 00 5F */ li r0, 0x5f -/* 80199728 90 01 00 0C */ stw r0, 0xc(r1) -/* 8019972C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80199730 38 81 00 0C */ addi r4, r1, 0xc -/* 80199734 38 A0 00 00 */ li r5, 0 -/* 80199738 38 C0 00 00 */ li r6, 0 -/* 8019973C 38 E0 00 00 */ li r7, 0 -/* 80199740 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80199744 FC 40 08 90 */ fmr f2, f1 -/* 80199748 C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 8019974C FC 80 18 90 */ fmr f4, f3 -/* 80199750 39 00 00 00 */ li r8, 0 -/* 80199754 48 11 22 31 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80199758: -/* 80199758 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 8019975C B0 1C 0F 4C */ sth r0, 0xf4c(r28) -/* 80199760 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80199764 D0 3C 0F 38 */ stfs f1, 0xf38(r28) -/* 80199768 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 8019976C D0 1C 0F 3C */ stfs f0, 0xf3c(r28) -/* 80199770 D0 3C 0F 40 */ stfs f1, 0xf40(r28) -/* 80199774 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80199778 D0 1C 0F 44 */ stfs f0, 0xf44(r28) -/* 8019977C 48 00 00 70 */ b lbl_801997EC -lbl_80199780: -/* 80199780 38 1F FF FC */ addi r0, r31, -4 -/* 80199784 28 00 00 01 */ cmplwi r0, 1 -/* 80199788 40 81 00 0C */ ble lbl_80199794 -/* 8019978C 2C 1F 00 06 */ cmpwi r31, 6 -/* 80199790 40 82 00 5C */ bne lbl_801997EC -lbl_80199794: -/* 80199794 38 00 00 5F */ li r0, 0x5f -/* 80199798 90 01 00 08 */ stw r0, 8(r1) -/* 8019979C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801997A0 38 81 00 08 */ addi r4, r1, 8 -/* 801997A4 38 A0 00 00 */ li r5, 0 -/* 801997A8 38 C0 00 00 */ li r6, 0 -/* 801997AC 38 E0 00 00 */ li r7, 0 -/* 801997B0 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 801997B4 FC 40 08 90 */ fmr f2, f1 -/* 801997B8 C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 801997BC FC 80 18 90 */ fmr f4, f3 -/* 801997C0 39 00 00 00 */ li r8, 0 -/* 801997C4 48 11 21 C1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801997C8 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 801997CC B0 1C 0F 4C */ sth r0, 0xf4c(r28) -/* 801997D0 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 801997D4 D0 3C 0F 38 */ stfs f1, 0xf38(r28) -/* 801997D8 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 801997DC D0 1C 0F 3C */ stfs f0, 0xf3c(r28) -/* 801997E0 D0 3C 0F 40 */ stfs f1, 0xf40(r28) -/* 801997E4 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 801997E8 D0 1C 0F 44 */ stfs f0, 0xf44(r28) -lbl_801997EC: -/* 801997EC 38 00 00 01 */ li r0, 1 -/* 801997F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801997F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801997F8 98 03 5E 86 */ stb r0, 0x5e86(r3) -/* 801997FC 2C 1F 00 01 */ cmpwi r31, 1 -/* 80199800 40 82 00 54 */ bne lbl_80199854 -/* 80199804 7F 83 E3 78 */ mr r3, r28 -/* 80199808 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 8019980C 38 84 FF FF */ addi r4, r4, -1 -/* 80199810 4B FF DD E9 */ bl isFlag__13dShopSystem_cFi -/* 80199814 2C 03 00 00 */ cmpwi r3, 0 -/* 80199818 40 82 00 28 */ bne lbl_80199840 -/* 8019981C 7F 83 E3 78 */ mr r3, r28 -/* 80199820 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80199824 38 84 FF FF */ addi r4, r4, -1 -/* 80199828 4B FF DE 29 */ bl isSoldOutItemFlag__13dShopSystem_cFi -/* 8019982C 2C 03 00 00 */ cmpwi r3, 0 -/* 80199830 40 82 00 10 */ bne lbl_80199840 -/* 80199834 7F 83 E3 78 */ mr r3, r28 -/* 80199838 38 80 00 08 */ li r4, 8 -/* 8019983C 4B FF DD 85 */ bl onFlag__13dShopSystem_cFi -lbl_80199840: -/* 80199840 48 08 51 95 */ bl dMeter2Info_set2DVibrationM__Fv -/* 80199844 7F 83 E3 78 */ mr r3, r28 -/* 80199848 38 80 00 06 */ li r4, 6 -/* 8019984C 48 00 0A F9 */ bl setSeq__13dShopSystem_cFUc -/* 80199850 48 00 00 E4 */ b lbl_80199934 -lbl_80199854: -/* 80199854 2C 1F 00 02 */ cmpwi r31, 2 -/* 80199858 40 82 00 14 */ bne lbl_8019986C -/* 8019985C 7F 83 E3 78 */ mr r3, r28 -/* 80199860 38 80 00 0A */ li r4, 0xa -/* 80199864 48 00 0A E1 */ bl setSeq__13dShopSystem_cFUc -/* 80199868 48 00 00 CC */ b lbl_80199934 -lbl_8019986C: -/* 8019986C 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 80199870 28 00 00 00 */ cmplwi r0, 0 -/* 80199874 40 82 00 14 */ bne lbl_80199888 -/* 80199878 7F 83 E3 78 */ mr r3, r28 -/* 8019987C 38 80 00 01 */ li r4, 1 -/* 80199880 48 00 0A C5 */ bl setSeq__13dShopSystem_cFUc -/* 80199884 48 00 00 B0 */ b lbl_80199934 -lbl_80199888: -/* 80199888 38 00 00 00 */ li r0, 0 -/* 8019988C B0 1C 0F 68 */ sth r0, 0xf68(r28) -/* 80199890 7F 83 E3 78 */ mr r3, r28 -/* 80199894 38 80 00 05 */ li r4, 5 -/* 80199898 48 00 0A AD */ bl setSeq__13dShopSystem_cFUc -/* 8019989C 88 1C 0F 6F */ lbz r0, 0xf6f(r28) -/* 801998A0 28 00 00 00 */ cmplwi r0, 0 -/* 801998A4 41 82 00 90 */ beq lbl_80199934 -/* 801998A8 38 60 00 00 */ li r3, 0 -/* 801998AC 48 00 01 54 */ b lbl_80199A00 -lbl_801998B0: -/* 801998B0 38 1F FF FD */ addi r0, r31, -3 -/* 801998B4 28 00 00 04 */ cmplwi r0, 4 -/* 801998B8 40 81 00 0C */ ble lbl_801998C4 -/* 801998BC 2C 1F 00 02 */ cmpwi r31, 2 -/* 801998C0 40 82 00 74 */ bne lbl_80199934 -lbl_801998C4: -/* 801998C4 88 1C 0F 6F */ lbz r0, 0xf6f(r28) -/* 801998C8 28 00 00 07 */ cmplwi r0, 7 -/* 801998CC 40 82 00 18 */ bne lbl_801998E4 -/* 801998D0 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 801998D4 98 1C 0F 6F */ stb r0, 0xf6f(r28) -/* 801998D8 38 00 00 07 */ li r0, 7 -/* 801998DC 98 1C 0F 6E */ stb r0, 0xf6e(r28) -/* 801998E0 48 00 00 08 */ b lbl_801998E8 -lbl_801998E4: -/* 801998E4 98 1C 0F 6E */ stb r0, 0xf6e(r28) -lbl_801998E8: -/* 801998E8 38 00 00 00 */ li r0, 0 -/* 801998EC 98 1C 0F 7A */ stb r0, 0xf7a(r28) -/* 801998F0 2C 1F 00 02 */ cmpwi r31, 2 -/* 801998F4 40 82 00 40 */ bne lbl_80199934 -/* 801998F8 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 801998FC B0 1C 0F 4C */ sth r0, 0xf4c(r28) -/* 80199900 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80199904 D0 3C 0F 38 */ stfs f1, 0xf38(r28) -/* 80199908 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 8019990C D0 1C 0F 3C */ stfs f0, 0xf3c(r28) -/* 80199910 D0 3C 0F 40 */ stfs f1, 0xf40(r28) -/* 80199914 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80199918 D0 1C 0F 44 */ stfs f0, 0xf44(r28) -/* 8019991C 48 00 00 18 */ b lbl_80199934 -lbl_80199920: -/* 80199920 7F C3 F3 78 */ mr r3, r30 -/* 80199924 7F A4 EB 78 */ mr r4, r29 -/* 80199928 38 A0 00 00 */ li r5, 0 -/* 8019992C 38 C0 00 00 */ li r6, 0 -/* 80199930 48 0B 09 A9 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -lbl_80199934: -/* 80199934 3B A0 00 00 */ li r29, 0 -/* 80199938 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 8019993C 28 00 00 00 */ cmplwi r0, 0 -/* 80199940 41 82 00 0C */ beq lbl_8019994C -/* 80199944 7C 1D 03 78 */ mr r29, r0 -/* 80199948 48 00 00 14 */ b lbl_8019995C -lbl_8019994C: -/* 8019994C 88 1C 0F 6F */ lbz r0, 0xf6f(r28) -/* 80199950 28 00 00 00 */ cmplwi r0, 0 -/* 80199954 41 82 00 08 */ beq lbl_8019995C -/* 80199958 7C 1D 03 78 */ mr r29, r0 -lbl_8019995C: -/* 8019995C 57 A5 06 3F */ clrlwi. r5, r29, 0x18 -/* 80199960 41 82 00 9C */ beq lbl_801999FC -/* 80199964 38 61 00 10 */ addi r3, r1, 0x10 -/* 80199968 38 9C 0E 48 */ addi r4, r28, 0xe48 -/* 8019996C 38 A5 FF FF */ addi r5, r5, -1 -/* 80199970 4B FF D0 31 */ bl getCurrentPos__15dShopItemCtrl_cFi -/* 80199974 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80199978 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8019997C C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80199980 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80199984 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80199988 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 8019998C 38 61 00 28 */ addi r3, r1, 0x28 -/* 80199990 38 81 00 1C */ addi r4, r1, 0x1c -/* 80199994 4B E7 B9 7D */ bl mDoLib_project__FP3VecP3Vec -/* 80199998 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 8019999C 28 00 00 07 */ cmplwi r0, 7 -/* 801999A0 40 82 00 30 */ bne lbl_801999D0 -/* 801999A4 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 801999A8 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 801999AC 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 801999B0 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 801999B4 EC 01 00 2A */ fadds f0, f1, f0 -/* 801999B8 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 801999BC C0 21 00 20 */ lfs f1, 0x20(r1) -/* 801999C0 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 801999C4 EC 01 00 2A */ fadds f0, f1, f0 -/* 801999C8 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 801999CC 48 00 00 1C */ b lbl_801999E8 -lbl_801999D0: -/* 801999D0 C0 21 00 20 */ lfs f1, 0x20(r1) -/* 801999D4 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 801999D8 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 801999DC C0 03 00 30 */ lfs f0, 0x30(r3) -/* 801999E0 EC 01 00 2A */ fadds f0, f1, f0 -/* 801999E4 D0 01 00 20 */ stfs f0, 0x20(r1) -lbl_801999E8: -/* 801999E8 C0 21 00 20 */ lfs f1, 0x20(r1) -/* 801999EC 80 7C 0E 44 */ lwz r3, 0xe44(r28) -/* 801999F0 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 801999F4 D0 03 00 58 */ stfs f0, 0x58(r3) -/* 801999F8 D0 23 00 5C */ stfs f1, 0x5c(r3) -lbl_801999FC: -/* 801999FC 38 60 00 00 */ li r3, 0 -lbl_80199A00: -/* 80199A00 39 61 00 50 */ addi r11, r1, 0x50 -/* 80199A04 48 1C 88 21 */ bl _restgpr_28 -/* 80199A08 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80199A0C 7C 08 03 A6 */ mtlr r0 -/* 80199A10 38 21 00 50 */ addi r1, r1, 0x50 -/* 80199A14 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/seq_select_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/seq_select_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s deleted file mode 100644 index ba0dcb7b167..00000000000 --- a/asm/d/shop/d_shop_system/seq_select_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s +++ /dev/null @@ -1,127 +0,0 @@ -lbl_801993C4: -/* 801993C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801993C8 7C 08 02 A6 */ mflr r0 -/* 801993CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801993D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801993D4 7C 7F 1B 78 */ mr r31, r3 -/* 801993D8 80 03 0F 60 */ lwz r0, 0xf60(r3) -/* 801993DC 2C 00 00 00 */ cmpwi r0, 0 -/* 801993E0 40 80 00 34 */ bge lbl_80199414 -/* 801993E4 88 1F 0F 76 */ lbz r0, 0xf76(r31) -/* 801993E8 28 00 00 00 */ cmplwi r0, 0 -/* 801993EC 40 82 00 28 */ bne lbl_80199414 -/* 801993F0 80 8D 8A DC */ lwz r4, dShopSystem_item_count(r13) -/* 801993F4 2C 04 FF FF */ cmpwi r4, -1 -/* 801993F8 41 82 00 1C */ beq lbl_80199414 -/* 801993FC 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 80199400 7C 04 00 00 */ cmpw r4, r0 -/* 80199404 41 82 00 0C */ beq lbl_80199410 -/* 80199408 38 60 00 00 */ li r3, 0 -/* 8019940C 48 00 01 7C */ b lbl_80199588 -lbl_80199410: -/* 80199410 48 00 11 C1 */ bl searchItemActor__13dShopSystem_cFv -lbl_80199414: -/* 80199414 7F E3 FB 78 */ mr r3, r31 -/* 80199418 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 8019941C 38 84 FF FF */ addi r4, r4, -1 -/* 80199420 4B FF E1 D9 */ bl isFlag__13dShopSystem_cFi -/* 80199424 2C 03 00 00 */ cmpwi r3, 0 -/* 80199428 41 82 01 0C */ beq lbl_80199534 -/* 8019942C 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 80199430 2C 00 00 02 */ cmpwi r0, 2 -/* 80199434 41 82 00 6C */ beq lbl_801994A0 -/* 80199438 40 80 00 10 */ bge lbl_80199448 -/* 8019943C 2C 00 00 01 */ cmpwi r0, 1 -/* 80199440 40 80 00 14 */ bge lbl_80199454 -/* 80199444 48 00 00 F0 */ b lbl_80199534 -lbl_80199448: -/* 80199448 2C 00 00 04 */ cmpwi r0, 4 -/* 8019944C 40 80 00 E8 */ bge lbl_80199534 -/* 80199450 48 00 00 9C */ b lbl_801994EC -lbl_80199454: -/* 80199454 38 00 00 02 */ li r0, 2 -/* 80199458 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 8019945C 7F E3 FB 78 */ mr r3, r31 -/* 80199460 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 80199464 38 84 FF FF */ addi r4, r4, -1 -/* 80199468 4B FF E1 91 */ bl isFlag__13dShopSystem_cFi -/* 8019946C 2C 03 00 00 */ cmpwi r3, 0 -/* 80199470 41 82 00 C4 */ beq lbl_80199534 -/* 80199474 38 00 00 03 */ li r0, 3 -/* 80199478 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 8019947C 7F E3 FB 78 */ mr r3, r31 -/* 80199480 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 80199484 38 84 FF FF */ addi r4, r4, -1 -/* 80199488 4B FF E1 71 */ bl isFlag__13dShopSystem_cFi -/* 8019948C 2C 03 00 00 */ cmpwi r3, 0 -/* 80199490 41 82 00 A4 */ beq lbl_80199534 -/* 80199494 38 00 00 00 */ li r0, 0 -/* 80199498 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 8019949C 48 00 00 98 */ b lbl_80199534 -lbl_801994A0: -/* 801994A0 38 00 00 01 */ li r0, 1 -/* 801994A4 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 801994A8 7F E3 FB 78 */ mr r3, r31 -/* 801994AC 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 801994B0 38 84 FF FF */ addi r4, r4, -1 -/* 801994B4 4B FF E1 45 */ bl isFlag__13dShopSystem_cFi -/* 801994B8 2C 03 00 00 */ cmpwi r3, 0 -/* 801994BC 41 82 00 78 */ beq lbl_80199534 -/* 801994C0 38 00 00 03 */ li r0, 3 -/* 801994C4 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 801994C8 7F E3 FB 78 */ mr r3, r31 -/* 801994CC 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 801994D0 38 84 FF FF */ addi r4, r4, -1 -/* 801994D4 4B FF E1 25 */ bl isFlag__13dShopSystem_cFi -/* 801994D8 2C 03 00 00 */ cmpwi r3, 0 -/* 801994DC 41 82 00 58 */ beq lbl_80199534 -/* 801994E0 38 00 00 00 */ li r0, 0 -/* 801994E4 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 801994E8 48 00 00 4C */ b lbl_80199534 -lbl_801994EC: -/* 801994EC 38 00 00 02 */ li r0, 2 -/* 801994F0 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 801994F4 7F E3 FB 78 */ mr r3, r31 -/* 801994F8 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 801994FC 38 84 FF FF */ addi r4, r4, -1 -/* 80199500 4B FF E0 F9 */ bl isFlag__13dShopSystem_cFi -/* 80199504 2C 03 00 00 */ cmpwi r3, 0 -/* 80199508 41 82 00 2C */ beq lbl_80199534 -/* 8019950C 38 00 00 01 */ li r0, 1 -/* 80199510 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 80199514 7F E3 FB 78 */ mr r3, r31 -/* 80199518 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 8019951C 38 84 FF FF */ addi r4, r4, -1 -/* 80199520 4B FF E0 D9 */ bl isFlag__13dShopSystem_cFi -/* 80199524 2C 03 00 00 */ cmpwi r3, 0 -/* 80199528 41 82 00 0C */ beq lbl_80199534 -/* 8019952C 38 00 00 00 */ li r0, 0 -/* 80199530 98 1F 0F 6E */ stb r0, 0xf6e(r31) -lbl_80199534: -/* 80199534 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 80199538 B0 1F 0F 4C */ sth r0, 0xf4c(r31) -/* 8019953C C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80199540 D0 3F 0F 38 */ stfs f1, 0xf38(r31) -/* 80199544 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80199548 D0 1F 0F 3C */ stfs f0, 0xf3c(r31) -/* 8019954C D0 3F 0F 40 */ stfs f1, 0xf40(r31) -/* 80199550 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80199554 D0 1F 0F 44 */ stfs f0, 0xf44(r31) -/* 80199558 7F E3 FB 78 */ mr r3, r31 -/* 8019955C 38 80 00 04 */ li r4, 4 -/* 80199560 38 A0 00 00 */ li r5, 0 -/* 80199564 4B FF EE E1 */ bl moveCursor__13dShopSystem_cFiUc -/* 80199568 7C 64 1B 78 */ mr r4, r3 -/* 8019956C 7F E3 FB 78 */ mr r3, r31 -/* 80199570 38 A0 00 00 */ li r5, 0 -/* 80199574 4B FB 26 7D */ bl initTalk__8daNpcT_cFiPP10fopAc_ac_c -/* 80199578 7F E3 FB 78 */ mr r3, r31 -/* 8019957C 38 80 00 04 */ li r4, 4 -/* 80199580 48 00 0D C5 */ bl setSeq__13dShopSystem_cFUc -/* 80199584 38 60 00 00 */ li r3, 0 -lbl_80199588: -/* 80199588 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8019958C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80199590 7C 08 03 A6 */ mtlr r0 -/* 80199594 38 21 00 10 */ addi r1, r1, 0x10 -/* 80199598 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/seq_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/seq_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s deleted file mode 100644 index 4a4725a9899..00000000000 --- a/asm/d/shop/d_shop_system/seq_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s +++ /dev/null @@ -1,185 +0,0 @@ -lbl_801990B8: -/* 801990B8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 801990BC 7C 08 02 A6 */ mflr r0 -/* 801990C0 90 01 00 44 */ stw r0, 0x44(r1) -/* 801990C4 39 61 00 40 */ addi r11, r1, 0x40 -/* 801990C8 48 1C 91 11 */ bl _savegpr_28 -/* 801990CC 7C 7D 1B 78 */ mr r29, r3 -/* 801990D0 7C 9E 23 78 */ mr r30, r4 -/* 801990D4 7C BF 2B 78 */ mr r31, r5 -/* 801990D8 88 03 0F 79 */ lbz r0, 0xf79(r3) -/* 801990DC 28 00 00 00 */ cmplwi r0, 0 -/* 801990E0 41 82 00 24 */ beq lbl_80199104 -/* 801990E4 38 00 00 00 */ li r0, 0 -/* 801990E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801990EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801990F0 98 03 5E 3C */ stb r0, 0x5e3c(r3) -/* 801990F4 98 03 5E 57 */ stb r0, 0x5e57(r3) -/* 801990F8 98 03 5E 35 */ stb r0, 0x5e35(r3) -/* 801990FC 98 03 5E 50 */ stb r0, 0x5e50(r3) -/* 80199100 98 1D 0F 79 */ stb r0, 0xf79(r29) -lbl_80199104: -/* 80199104 38 61 00 0C */ addi r3, r1, 0xc -/* 80199108 38 9D 0E 48 */ addi r4, r29, 0xe48 -/* 8019910C 38 A0 00 00 */ li r5, 0 -/* 80199110 4B FF D8 91 */ bl getCurrentPos__15dShopItemCtrl_cFi -/* 80199114 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80199118 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8019911C C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80199120 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80199124 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80199128 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 8019912C 38 61 00 24 */ addi r3, r1, 0x24 -/* 80199130 38 81 00 18 */ addi r4, r1, 0x18 -/* 80199134 4B E7 C1 DD */ bl mDoLib_project__FP3VecP3Vec -/* 80199138 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 8019913C 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80199140 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80199144 C0 03 00 30 */ lfs f0, 0x30(r3) -/* 80199148 EC 21 00 2A */ fadds f1, f1, f0 -/* 8019914C 80 7D 0E 44 */ lwz r3, 0xe44(r29) -/* 80199150 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80199154 D0 03 00 58 */ stfs f0, 0x58(r3) -/* 80199158 D0 23 00 5C */ stfs f1, 0x5c(r3) -/* 8019915C 88 1D 0F 75 */ lbz r0, 0xf75(r29) -/* 80199160 28 00 00 01 */ cmplwi r0, 1 -/* 80199164 40 82 00 30 */ bne lbl_80199194 -/* 80199168 7F A3 EB 78 */ mr r3, r29 -/* 8019916C 7F E4 FB 78 */ mr r4, r31 -/* 80199170 80 BD 0F 5C */ lwz r5, 0xf5c(r29) -/* 80199174 81 9D 0E 3C */ lwz r12, 0xe3c(r29) -/* 80199178 81 8C 00 C8 */ lwz r12, 0xc8(r12) -/* 8019917C 7D 89 03 A6 */ mtctr r12 -/* 80199180 4E 80 04 21 */ bctrl -/* 80199184 2C 03 00 00 */ cmpwi r3, 0 -/* 80199188 40 82 00 0C */ bne lbl_80199194 -/* 8019918C 38 60 00 00 */ li r3, 0 -/* 80199190 48 00 01 C4 */ b lbl_80199354 -lbl_80199194: -/* 80199194 48 09 F1 61 */ bl isMsgSendControl__12dMsgObject_cFv -/* 80199198 2C 03 00 00 */ cmpwi r3, 0 -/* 8019919C 41 82 01 14 */ beq lbl_801992B0 -/* 801991A0 38 80 00 00 */ li r4, 0 -/* 801991A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801991A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801991AC 98 83 5E 3C */ stb r4, 0x5e3c(r3) -/* 801991B0 98 83 5E 57 */ stb r4, 0x5e57(r3) -/* 801991B4 38 00 00 2A */ li r0, 0x2a -/* 801991B8 98 03 5E 35 */ stb r0, 0x5e35(r3) -/* 801991BC 98 83 5E 50 */ stb r4, 0x5e50(r3) -/* 801991C0 7F A3 EB 78 */ mr r3, r29 -/* 801991C4 38 80 00 00 */ li r4, 0 -/* 801991C8 7F E5 FB 78 */ mr r5, r31 -/* 801991CC 4B FF E4 A5 */ bl checkController__13dShopSystem_cFUcP10dMsgFlow_c -/* 801991D0 7C 7C 1B 79 */ or. r28, r3, r3 -/* 801991D4 41 82 01 7C */ beq lbl_80199350 -/* 801991D8 48 09 F1 49 */ bl onMsgSend__12dMsgObject_cFv -/* 801991DC 7F A3 EB 78 */ mr r3, r29 -/* 801991E0 7F 84 E3 78 */ mr r4, r28 -/* 801991E4 38 A0 00 00 */ li r5, 0 -/* 801991E8 4B FF F2 5D */ bl moveCursor__13dShopSystem_cFiUc -/* 801991EC 7C 66 1B 78 */ mr r6, r3 -/* 801991F0 88 1D 0F 75 */ lbz r0, 0xf75(r29) -/* 801991F4 28 00 00 01 */ cmplwi r0, 1 -/* 801991F8 40 82 00 74 */ bne lbl_8019926C -/* 801991FC 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80199200 28 00 00 00 */ cmplwi r0, 0 -/* 80199204 41 82 00 2C */ beq lbl_80199230 -/* 80199208 90 DD 0F 5C */ stw r6, 0xf5c(r29) -/* 8019920C C0 02 A1 44 */ lfs f0, lit_5084(r2) -/* 80199210 D0 1D 0F 38 */ stfs f0, 0xf38(r29) -/* 80199214 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80199218 D0 1D 0F 40 */ stfs f0, 0xf40(r29) -/* 8019921C D0 1D 0F 44 */ stfs f0, 0xf44(r29) -/* 80199220 7F A3 EB 78 */ mr r3, r29 -/* 80199224 38 80 00 04 */ li r4, 4 -/* 80199228 48 00 11 1D */ bl setSeq__13dShopSystem_cFUc -/* 8019922C 48 00 01 24 */ b lbl_80199350 -lbl_80199230: -/* 80199230 7F E3 FB 78 */ mr r3, r31 -/* 80199234 7F C4 F3 78 */ mr r4, r30 -/* 80199238 38 A0 00 00 */ li r5, 0 -/* 8019923C 48 0B 10 9D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80199240 2C 03 00 00 */ cmpwi r3, 0 -/* 80199244 41 82 01 0C */ beq lbl_80199350 -/* 80199248 C0 02 A1 44 */ lfs f0, lit_5084(r2) -/* 8019924C D0 1D 0F 38 */ stfs f0, 0xf38(r29) -/* 80199250 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80199254 D0 1D 0F 40 */ stfs f0, 0xf40(r29) -/* 80199258 D0 1D 0F 44 */ stfs f0, 0xf44(r29) -/* 8019925C 7F A3 EB 78 */ mr r3, r29 -/* 80199260 38 80 00 0A */ li r4, 0xa -/* 80199264 48 00 10 E1 */ bl setSeq__13dShopSystem_cFUc -/* 80199268 48 00 00 E8 */ b lbl_80199350 -lbl_8019926C: -/* 8019926C 7F E3 FB 78 */ mr r3, r31 -/* 80199270 7F C4 F3 78 */ mr r4, r30 -/* 80199274 38 A0 00 00 */ li r5, 0 -/* 80199278 48 0B 10 61 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 8019927C 2C 03 00 00 */ cmpwi r3, 0 -/* 80199280 41 82 00 D0 */ beq lbl_80199350 -/* 80199284 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80199288 28 00 00 00 */ cmplwi r0, 0 -/* 8019928C 40 82 00 14 */ bne lbl_801992A0 -/* 80199290 7F A3 EB 78 */ mr r3, r29 -/* 80199294 38 80 00 0A */ li r4, 0xa -/* 80199298 48 00 10 AD */ bl setSeq__13dShopSystem_cFUc -/* 8019929C 48 00 00 B4 */ b lbl_80199350 -lbl_801992A0: -/* 801992A0 7F A3 EB 78 */ mr r3, r29 -/* 801992A4 38 80 00 04 */ li r4, 4 -/* 801992A8 48 00 10 9D */ bl setSeq__13dShopSystem_cFUc -/* 801992AC 48 00 00 A4 */ b lbl_80199350 -lbl_801992B0: -/* 801992B0 7F E3 FB 78 */ mr r3, r31 -/* 801992B4 7F C4 F3 78 */ mr r4, r30 -/* 801992B8 38 A0 00 00 */ li r5, 0 -/* 801992BC 38 C0 00 00 */ li r6, 0 -/* 801992C0 48 0B 10 19 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 801992C4 2C 03 00 00 */ cmpwi r3, 0 -/* 801992C8 41 82 00 88 */ beq lbl_80199350 -/* 801992CC 38 7D 09 74 */ addi r3, r29, 0x974 -/* 801992D0 38 81 00 08 */ addi r4, r1, 8 -/* 801992D4 48 0B 12 55 */ bl getEventId__10dMsgFlow_cFPi -/* 801992D8 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 801992DC 28 00 00 01 */ cmplwi r0, 1 -/* 801992E0 40 82 00 68 */ bne lbl_80199348 -/* 801992E4 80 7D 0D 90 */ lwz r3, 0xd90(r29) -/* 801992E8 3C 03 00 01 */ addis r0, r3, 1 -/* 801992EC 28 00 FF FF */ cmplwi r0, 0xffff -/* 801992F0 40 82 00 28 */ bne lbl_80199318 -/* 801992F4 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 801992F8 80 81 00 08 */ lwz r4, 8(r1) -/* 801992FC 38 A0 00 00 */ li r5, 0 -/* 80199300 38 C0 FF FF */ li r6, -1 -/* 80199304 38 E0 FF FF */ li r7, -1 -/* 80199308 39 00 00 00 */ li r8, 0 -/* 8019930C 39 20 00 00 */ li r9, 0 -/* 80199310 4B E8 28 D9 */ bl fopAcM_createItemForPresentDemo__FPC4cXyziUciiPC5csXyzPC4cXyz -/* 80199314 90 7D 0D 90 */ stw r3, 0xd90(r29) -lbl_80199318: -/* 80199318 80 7D 0D 90 */ lwz r3, 0xd90(r29) -/* 8019931C 4B E8 80 81 */ bl fpcEx_IsExist__FUi -/* 80199320 2C 03 00 00 */ cmpwi r3, 0 -/* 80199324 41 82 00 1C */ beq lbl_80199340 -/* 80199328 38 00 00 01 */ li r0, 1 -/* 8019932C B0 1D 0E 30 */ sth r0, 0xe30(r29) -/* 80199330 7F A3 EB 78 */ mr r3, r29 -/* 80199334 4B FB 0E F1 */ bl evtChange__8daNpcT_cFv -/* 80199338 38 60 00 01 */ li r3, 1 -/* 8019933C 48 00 00 18 */ b lbl_80199354 -lbl_80199340: -/* 80199340 38 60 00 00 */ li r3, 0 -/* 80199344 48 00 00 10 */ b lbl_80199354 -lbl_80199348: -/* 80199348 38 60 00 01 */ li r3, 1 -/* 8019934C 48 00 00 08 */ b lbl_80199354 -lbl_80199350: -/* 80199350 38 60 00 00 */ li r3, 0 -lbl_80199354: -/* 80199354 39 61 00 40 */ addi r11, r1, 0x40 -/* 80199358 48 1C 8E CD */ bl _restgpr_28 -/* 8019935C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80199360 7C 08 03 A6 */ mtlr r0 -/* 80199364 38 21 00 40 */ addi r1, r1, 0x40 -/* 80199368 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/shop_process__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/shop_process__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s deleted file mode 100644 index d51146c1b7c..00000000000 --- a/asm/d/shop/d_shop_system/shop_process__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_8019A158: -/* 8019A158 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8019A15C 7C 08 02 A6 */ mflr r0 -/* 8019A160 90 01 00 14 */ stw r0, 0x14(r1) -/* 8019A164 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8019A168 93 C1 00 08 */ stw r30, 8(r1) -/* 8019A16C 7C 7F 1B 78 */ mr r31, r3 -/* 8019A170 88 03 0F 70 */ lbz r0, 0xf70(r3) -/* 8019A174 1C E0 00 0C */ mulli r7, r0, 0xc -/* 8019A178 3C C0 80 3C */ lis r6, process@ha /* 0x803BB974@ha */ -/* 8019A17C 38 06 B9 74 */ addi r0, r6, process@l /* 0x803BB974@l */ -/* 8019A180 7D 80 3A 14 */ add r12, r0, r7 -/* 8019A184 48 1C 7F 01 */ bl __ptmf_scall -/* 8019A188 60 00 00 00 */ nop -/* 8019A18C 7C 7E 1B 78 */ mr r30, r3 -/* 8019A190 88 7F 0F 72 */ lbz r3, 0xf72(r31) -/* 8019A194 28 03 00 00 */ cmplwi r3, 0 -/* 8019A198 41 82 00 0C */ beq lbl_8019A1A4 -/* 8019A19C 38 03 FF FF */ addi r0, r3, -1 -/* 8019A1A0 98 1F 0F 72 */ stb r0, 0xf72(r31) -lbl_8019A1A4: -/* 8019A1A4 88 1F 0F 7A */ lbz r0, 0xf7a(r31) -/* 8019A1A8 28 00 00 00 */ cmplwi r0, 0 -/* 8019A1AC 41 82 00 10 */ beq lbl_8019A1BC -/* 8019A1B0 48 08 48 21 */ bl dMeter2Info_set2DVibration__Fv -/* 8019A1B4 38 00 00 00 */ li r0, 0 -/* 8019A1B8 98 1F 0F 7A */ stb r0, 0xf7a(r31) -lbl_8019A1BC: -/* 8019A1BC 2C 1E 00 00 */ cmpwi r30, 0 -/* 8019A1C0 41 82 00 40 */ beq lbl_8019A200 -/* 8019A1C4 38 00 00 00 */ li r0, 0 -/* 8019A1C8 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8019A1CC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8019A1D0 98 03 00 BD */ stb r0, 0xbd(r3) -/* 8019A1D4 88 1F 0F 70 */ lbz r0, 0xf70(r31) -/* 8019A1D8 28 00 00 00 */ cmplwi r0, 0 -/* 8019A1DC 41 82 00 10 */ beq lbl_8019A1EC -/* 8019A1E0 7F E3 FB 78 */ mr r3, r31 -/* 8019A1E4 38 80 00 00 */ li r4, 0 -/* 8019A1E8 48 00 01 5D */ bl setSeq__13dShopSystem_cFUc -lbl_8019A1EC: -/* 8019A1EC 2C 1E 00 02 */ cmpwi r30, 2 -/* 8019A1F0 41 82 00 10 */ beq lbl_8019A200 -/* 8019A1F4 38 00 00 00 */ li r0, 0 -/* 8019A1F8 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 8019A1FC 98 1F 0F 6F */ stb r0, 0xf6f(r31) -lbl_8019A200: -/* 8019A200 88 7F 0F 70 */ lbz r3, 0xf70(r31) -/* 8019A204 88 1F 0F 71 */ lbz r0, 0xf71(r31) -/* 8019A208 7C 03 00 40 */ cmplw r3, r0 -/* 8019A20C 41 82 00 10 */ beq lbl_8019A21C -/* 8019A210 98 7F 0F 71 */ stb r3, 0xf71(r31) -/* 8019A214 38 00 00 01 */ li r0, 1 -/* 8019A218 98 1F 0F 79 */ stb r0, 0xf79(r31) -lbl_8019A21C: -/* 8019A21C 7F C3 F3 78 */ mr r3, r30 -/* 8019A220 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8019A224 83 C1 00 08 */ lwz r30, 8(r1) -/* 8019A228 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8019A22C 7C 08 03 A6 */ mtlr r0 -/* 8019A230 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019A234 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Create__10daNpcAsh_cFv.s b/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Create__10daNpcAsh_cFv.s deleted file mode 100644 index fc4ed0c802c..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Create__10daNpcAsh_cFv.s +++ /dev/null @@ -1,260 +0,0 @@ -lbl_809587A0: -/* 809587A0 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 809587A4 7C 08 02 A6 */ mflr r0 -/* 809587A8 90 01 00 44 */ stw r0, 0x44(r1) -/* 809587AC 39 61 00 40 */ addi r11, r1, 0x40 -/* 809587B0 4B A0 9A 19 */ bl _savegpr_24 -/* 809587B4 7C 7C 1B 78 */ mr r28, r3 -/* 809587B8 3C 80 80 96 */ lis r4, m__16daNpcAsh_Param_c@ha /* 0x8095D640@ha */ -/* 809587BC 3B E4 D6 40 */ addi r31, r4, m__16daNpcAsh_Param_c@l /* 0x8095D640@l */ -/* 809587C0 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 809587C4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 809587C8 40 82 00 1C */ bne lbl_809587E4 -/* 809587CC 28 1C 00 00 */ cmplwi r28, 0 -/* 809587D0 41 82 00 08 */ beq lbl_809587D8 -/* 809587D4 4B FF FB 19 */ bl __ct__10daNpcAsh_cFv -lbl_809587D8: -/* 809587D8 80 1C 04 A0 */ lwz r0, 0x4a0(r28) -/* 809587DC 60 00 00 08 */ ori r0, r0, 8 -/* 809587E0 90 1C 04 A0 */ stw r0, 0x4a0(r28) -lbl_809587E4: -/* 809587E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 809587E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 809587EC 3B C3 0F 38 */ addi r30, r3, 0xf38 -/* 809587F0 3B 1E 3E C8 */ addi r24, r30, 0x3ec8 -/* 809587F4 7F 03 C3 78 */ mr r3, r24 -/* 809587F8 3C 80 80 96 */ lis r4, d_a_npc_ash__stringBase0@ha /* 0x8095D910@ha */ -/* 809587FC 38 84 D9 10 */ addi r4, r4, d_a_npc_ash__stringBase0@l /* 0x8095D910@l */ -/* 80958800 38 84 00 6C */ addi r4, r4, 0x6c -/* 80958804 4B A1 01 91 */ bl strcmp -/* 80958808 2C 03 00 00 */ cmpwi r3, 0 -/* 8095880C 40 82 00 64 */ bne lbl_80958870 -/* 80958810 38 60 00 00 */ li r3, 0 -/* 80958814 4B 6D 41 69 */ bl getLayerNo__14dComIfG_play_cFi -/* 80958818 2C 03 00 04 */ cmpwi r3, 4 -/* 8095881C 40 82 00 54 */ bne lbl_80958870 -/* 80958820 38 60 01 69 */ li r3, 0x169 -/* 80958824 4B 7F CE 11 */ bl daNpcF_chkEvtBit__FUl -/* 80958828 2C 03 00 00 */ cmpwi r3, 0 -/* 8095882C 41 82 00 1C */ beq lbl_80958848 -/* 80958830 38 60 01 0A */ li r3, 0x10a -/* 80958834 4B 7F CE 01 */ bl daNpcF_chkEvtBit__FUl -/* 80958838 2C 03 00 00 */ cmpwi r3, 0 -/* 8095883C 40 82 00 0C */ bne lbl_80958848 -/* 80958840 38 60 00 05 */ li r3, 5 -/* 80958844 48 00 03 0C */ b lbl_80958B50 -lbl_80958848: -/* 80958848 38 60 00 18 */ li r3, 0x18 -/* 8095884C 38 80 00 4B */ li r4, 0x4b -/* 80958850 4B 6D 4E F1 */ bl dComIfGs_isStageSwitch__Fii -/* 80958854 2C 03 00 00 */ cmpwi r3, 0 -/* 80958858 41 82 00 0C */ beq lbl_80958864 -/* 8095885C 38 60 00 05 */ li r3, 5 -/* 80958860 48 00 02 F0 */ b lbl_80958B50 -lbl_80958864: -/* 80958864 38 00 00 00 */ li r0, 0 -/* 80958868 98 1C 0F 60 */ stb r0, 0xf60(r28) -/* 8095886C 48 00 00 58 */ b lbl_809588C4 -lbl_80958870: -/* 80958870 7F 03 C3 78 */ mr r3, r24 -/* 80958874 3C 80 80 96 */ lis r4, d_a_npc_ash__stringBase0@ha /* 0x8095D910@ha */ -/* 80958878 38 84 D9 10 */ addi r4, r4, d_a_npc_ash__stringBase0@l /* 0x8095D910@l */ -/* 8095887C 38 84 00 74 */ addi r4, r4, 0x74 -/* 80958880 4B A1 01 15 */ bl strcmp -/* 80958884 2C 03 00 00 */ cmpwi r3, 0 -/* 80958888 40 82 00 3C */ bne lbl_809588C4 -/* 8095888C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80958890 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80958894 38 63 09 58 */ addi r3, r3, 0x958 -/* 80958898 38 80 00 14 */ li r4, 0x14 -/* 8095889C 4B 6D BF C5 */ bl isSwitch__12dSv_memBit_cCFi -/* 809588A0 2C 03 00 00 */ cmpwi r3, 0 -/* 809588A4 41 82 00 0C */ beq lbl_809588B0 -/* 809588A8 38 60 00 05 */ li r3, 5 -/* 809588AC 48 00 02 A4 */ b lbl_80958B50 -lbl_809588B0: -/* 809588B0 80 1C 04 9C */ lwz r0, 0x49c(r28) -/* 809588B4 60 00 40 00 */ ori r0, r0, 0x4000 -/* 809588B8 90 1C 04 9C */ stw r0, 0x49c(r28) -/* 809588BC 38 00 00 01 */ li r0, 1 -/* 809588C0 98 1C 0F 60 */ stb r0, 0xf60(r28) -lbl_809588C4: -/* 809588C4 A8 1C 04 E4 */ lha r0, 0x4e4(r28) -/* 809588C8 B0 1C 0F 58 */ sth r0, 0xf58(r28) -/* 809588CC 3B A0 00 05 */ li r29, 5 -/* 809588D0 3B 60 00 00 */ li r27, 0 -/* 809588D4 3B 40 00 00 */ li r26, 0 -/* 809588D8 3C 60 80 96 */ lis r3, l_arcNames@ha /* 0x8095DAC0@ha */ -/* 809588DC 3B 03 DA C0 */ addi r24, r3, l_arcNames@l /* 0x8095DAC0@l */ -/* 809588E0 3C 60 80 96 */ lis r3, l_loadRes_list@ha /* 0x8095DAB8@ha */ -/* 809588E4 3B 23 DA B8 */ addi r25, r3, l_loadRes_list@l /* 0x8095DAB8@l */ -/* 809588E8 48 00 00 30 */ b lbl_80958918 -lbl_809588EC: -/* 809588EC 38 7A 0F 3C */ addi r3, r26, 0xf3c -/* 809588F0 7C 7C 1A 14 */ add r3, r28, r3 -/* 809588F4 54 00 10 3A */ slwi r0, r0, 2 -/* 809588F8 7C 98 00 2E */ lwzx r4, r24, r0 -/* 809588FC 4B 6D 45 C1 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80958900 7C 7D 1B 78 */ mr r29, r3 -/* 80958904 2C 1D 00 04 */ cmpwi r29, 4 -/* 80958908 41 82 00 08 */ beq lbl_80958910 -/* 8095890C 48 00 02 44 */ b lbl_80958B50 -lbl_80958910: -/* 80958910 3B 7B 00 04 */ addi r27, r27, 4 -/* 80958914 3B 5A 00 08 */ addi r26, r26, 8 -lbl_80958918: -/* 80958918 88 9C 0F 60 */ lbz r4, 0xf60(r28) -/* 8095891C 54 80 15 BA */ rlwinm r0, r4, 2, 0x16, 0x1d -/* 80958920 7C 79 00 2E */ lwzx r3, r25, r0 -/* 80958924 7C 03 D8 2E */ lwzx r0, r3, r27 -/* 80958928 2C 00 00 00 */ cmpwi r0, 0 -/* 8095892C 40 80 FF C0 */ bge lbl_809588EC -/* 80958930 2C 1D 00 04 */ cmpwi r29, 4 -/* 80958934 40 82 02 18 */ bne lbl_80958B4C -/* 80958938 38 A0 00 00 */ li r5, 0 -/* 8095893C 2C 04 00 01 */ cmpwi r4, 1 -/* 80958940 41 82 00 1C */ beq lbl_8095895C -/* 80958944 40 80 00 1C */ bge lbl_80958960 -/* 80958948 2C 04 00 00 */ cmpwi r4, 0 -/* 8095894C 40 80 00 08 */ bge lbl_80958954 -/* 80958950 48 00 00 10 */ b lbl_80958960 -lbl_80958954: -/* 80958954 38 A0 42 10 */ li r5, 0x4210 -/* 80958958 48 00 00 08 */ b lbl_80958960 -lbl_8095895C: -/* 8095895C 38 A0 58 B0 */ li r5, 0x58b0 -lbl_80958960: -/* 80958960 7F 83 E3 78 */ mr r3, r28 -/* 80958964 3C 80 80 96 */ lis r4, createHeapCallBack__10daNpcAsh_cFP10fopAc_ac_c@ha /* 0x80959458@ha */ -/* 80958968 38 84 94 58 */ addi r4, r4, createHeapCallBack__10daNpcAsh_cFP10fopAc_ac_c@l /* 0x80959458@l */ -/* 8095896C 4B 6C 1B 45 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80958970 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80958974 40 82 00 0C */ bne lbl_80958980 -/* 80958978 38 60 00 05 */ li r3, 5 -/* 8095897C 48 00 01 D4 */ b lbl_80958B50 -lbl_80958980: -/* 80958980 80 7C 05 68 */ lwz r3, 0x568(r28) -/* 80958984 80 63 00 04 */ lwz r3, 4(r3) -/* 80958988 38 03 00 24 */ addi r0, r3, 0x24 -/* 8095898C 90 1C 05 04 */ stw r0, 0x504(r28) -/* 80958990 7F 83 E3 78 */ mr r3, r28 -/* 80958994 C0 3F 00 6C */ lfs f1, 0x6c(r31) -/* 80958998 C0 5F 00 70 */ lfs f2, 0x70(r31) -/* 8095899C FC 60 08 90 */ fmr f3, f1 -/* 809589A0 C0 9F 00 74 */ lfs f4, 0x74(r31) -/* 809589A4 C0 BF 00 78 */ lfs f5, 0x78(r31) -/* 809589A8 FC C0 20 90 */ fmr f6, f4 -/* 809589AC 4B 6C 1B 9D */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 809589B0 38 7C 0B 48 */ addi r3, r28, 0xb48 -/* 809589B4 38 9C 04 D0 */ addi r4, r28, 0x4d0 -/* 809589B8 38 BC 05 38 */ addi r5, r28, 0x538 -/* 809589BC 38 C0 00 03 */ li r6, 3 -/* 809589C0 38 E0 00 01 */ li r7, 1 -/* 809589C4 4B 96 7B 6D */ bl init__10Z2CreatureFP3VecP3VecUcUc -/* 809589C8 38 7C 07 E4 */ addi r3, r28, 0x7e4 -/* 809589CC 38 9F 00 00 */ addi r4, r31, 0 -/* 809589D0 C0 24 00 1C */ lfs f1, 0x1c(r4) -/* 809589D4 C0 44 00 18 */ lfs f2, 0x18(r4) -/* 809589D8 4B 71 D5 81 */ bl SetWall__12dBgS_AcchCirFff -/* 809589DC 38 1C 04 E4 */ addi r0, r28, 0x4e4 -/* 809589E0 90 01 00 08 */ stw r0, 8(r1) -/* 809589E4 38 7C 05 D0 */ addi r3, r28, 0x5d0 -/* 809589E8 38 9C 04 D0 */ addi r4, r28, 0x4d0 -/* 809589EC 38 BC 04 BC */ addi r5, r28, 0x4bc -/* 809589F0 7F 86 E3 78 */ mr r6, r28 -/* 809589F4 38 E0 00 01 */ li r7, 1 -/* 809589F8 39 1C 07 E4 */ addi r8, r28, 0x7e4 -/* 809589FC 39 3C 04 F8 */ addi r9, r28, 0x4f8 -/* 80958A00 39 5C 04 DC */ addi r10, r28, 0x4dc -/* 80958A04 4B 71 D8 45 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80958A08 80 1C 05 FC */ lwz r0, 0x5fc(r28) -/* 80958A0C 60 00 00 08 */ ori r0, r0, 8 -/* 80958A10 90 1C 05 FC */ stw r0, 0x5fc(r28) -/* 80958A14 80 1C 05 FC */ lwz r0, 0x5fc(r28) -/* 80958A18 60 00 04 00 */ ori r0, r0, 0x400 -/* 80958A1C 90 1C 05 FC */ stw r0, 0x5fc(r28) -/* 80958A20 38 7C 05 D0 */ addi r3, r28, 0x5d0 -/* 80958A24 7F C4 F3 78 */ mr r4, r30 -/* 80958A28 4B 71 E0 85 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 80958A2C 38 7C 07 A8 */ addi r3, r28, 0x7a8 -/* 80958A30 38 9F 00 00 */ addi r4, r31, 0 -/* 80958A34 C0 04 00 10 */ lfs f0, 0x10(r4) -/* 80958A38 FC 00 00 1E */ fctiwz f0, f0 -/* 80958A3C D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80958A40 80 81 00 14 */ lwz r4, 0x14(r1) -/* 80958A44 38 A0 00 00 */ li r5, 0 -/* 80958A48 7F 86 E3 78 */ mr r6, r28 -/* 80958A4C 4B 72 AE 15 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80958A50 38 7C 0C B8 */ addi r3, r28, 0xcb8 -/* 80958A54 3C 80 80 3B */ lis r4, mCcDCyl__8daNpcF_c@ha /* 0x803B37E0@ha */ -/* 80958A58 38 84 37 E0 */ addi r4, r4, mCcDCyl__8daNpcF_c@l /* 0x803B37E0@l */ -/* 80958A5C 4B 72 BE 59 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80958A60 38 1C 07 A8 */ addi r0, r28, 0x7a8 -/* 80958A64 90 1C 0C FC */ stw r0, 0xcfc(r28) -/* 80958A68 38 00 00 00 */ li r0, 0 -/* 80958A6C 90 1C 0C E0 */ stw r0, 0xce0(r28) -/* 80958A70 90 1C 0C D0 */ stw r0, 0xcd0(r28) -/* 80958A74 88 1C 0F 60 */ lbz r0, 0xf60(r28) -/* 80958A78 28 00 00 00 */ cmplwi r0, 0 -/* 80958A7C 40 82 00 30 */ bne lbl_80958AAC -/* 80958A80 38 7C 0D F4 */ addi r3, r28, 0xdf4 -/* 80958A84 3C 80 80 3B */ lis r4, mCcDCyl__8daNpcF_c@ha /* 0x803B37E0@ha */ -/* 80958A88 38 84 37 E0 */ addi r4, r4, mCcDCyl__8daNpcF_c@l /* 0x803B37E0@l */ -/* 80958A8C 4B 72 BE 29 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80958A90 38 1C 07 A8 */ addi r0, r28, 0x7a8 -/* 80958A94 90 1C 0E 38 */ stw r0, 0xe38(r28) -/* 80958A98 38 00 00 00 */ li r0, 0 -/* 80958A9C 90 1C 0E 1C */ stw r0, 0xe1c(r28) -/* 80958AA0 90 1C 0E 0C */ stw r0, 0xe0c(r28) -/* 80958AA4 38 00 00 19 */ li r0, 0x19 -/* 80958AA8 90 1C 0E 20 */ stw r0, 0xe20(r28) -lbl_80958AAC: -/* 80958AAC 80 1C 06 AC */ lwz r0, 0x6ac(r28) -/* 80958AB0 90 1C 0A 44 */ stw r0, 0xa44(r28) -/* 80958AB4 80 1C 06 B0 */ lwz r0, 0x6b0(r28) -/* 80958AB8 90 1C 0A 48 */ stw r0, 0xa48(r28) -/* 80958ABC 80 1C 06 B4 */ lwz r0, 0x6b4(r28) -/* 80958AC0 90 1C 0A 4C */ stw r0, 0xa4c(r28) -/* 80958AC4 88 1C 06 B8 */ lbz r0, 0x6b8(r28) -/* 80958AC8 98 1C 0A 50 */ stb r0, 0xa50(r28) -/* 80958ACC A0 1C 06 C0 */ lhz r0, 0x6c0(r28) -/* 80958AD0 B0 1C 0A 58 */ sth r0, 0xa58(r28) -/* 80958AD4 A0 1C 06 C2 */ lhz r0, 0x6c2(r28) -/* 80958AD8 B0 1C 0A 5A */ sth r0, 0xa5a(r28) -/* 80958ADC 80 1C 06 C4 */ lwz r0, 0x6c4(r28) -/* 80958AE0 90 1C 0A 5C */ stw r0, 0xa5c(r28) -/* 80958AE4 80 1C 06 C8 */ lwz r0, 0x6c8(r28) -/* 80958AE8 90 1C 0A 60 */ stw r0, 0xa60(r28) -/* 80958AEC C0 1C 06 D0 */ lfs f0, 0x6d0(r28) -/* 80958AF0 D0 1C 0A 68 */ stfs f0, 0xa68(r28) -/* 80958AF4 C0 1C 06 D4 */ lfs f0, 0x6d4(r28) -/* 80958AF8 D0 1C 0A 6C */ stfs f0, 0xa6c(r28) -/* 80958AFC C0 1C 06 D8 */ lfs f0, 0x6d8(r28) -/* 80958B00 D0 1C 0A 70 */ stfs f0, 0xa70(r28) -/* 80958B04 80 1C 06 DC */ lwz r0, 0x6dc(r28) -/* 80958B08 90 1C 0A 74 */ stw r0, 0xa74(r28) -/* 80958B0C C0 1C 06 E0 */ lfs f0, 0x6e0(r28) -/* 80958B10 D0 1C 0A 78 */ stfs f0, 0xa78(r28) -/* 80958B14 80 1C 06 E4 */ lwz r0, 0x6e4(r28) -/* 80958B18 90 1C 0A 7C */ stw r0, 0xa7c(r28) -/* 80958B1C C0 1C 06 68 */ lfs f0, 0x668(r28) -/* 80958B20 D0 1C 09 80 */ stfs f0, 0x980(r28) -/* 80958B24 7F 83 E3 78 */ mr r3, r28 -/* 80958B28 4B 7F A2 5D */ bl setEnvTevColor__8daNpcF_cFv -/* 80958B2C 7F 83 E3 78 */ mr r3, r28 -/* 80958B30 4B 7F A2 B1 */ bl setRoomNo__8daNpcF_cFv -/* 80958B34 80 7C 05 68 */ lwz r3, 0x568(r28) -/* 80958B38 4B 6B 86 B5 */ bl modelCalc__16mDoExt_McaMorfSOFv -/* 80958B3C 7F 83 E3 78 */ mr r3, r28 -/* 80958B40 48 00 0D D1 */ bl reset__10daNpcAsh_cFv -/* 80958B44 7F 83 E3 78 */ mr r3, r28 -/* 80958B48 48 00 05 B1 */ bl Execute__10daNpcAsh_cFv -lbl_80958B4C: -/* 80958B4C 7F A3 EB 78 */ mr r3, r29 -lbl_80958B50: -/* 80958B50 39 61 00 40 */ addi r11, r1, 0x40 -/* 80958B54 4B A0 96 C1 */ bl _restgpr_24 -/* 80958B58 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80958B5C 7C 08 03 A6 */ mtlr r0 -/* 80958B60 38 21 00 40 */ addi r1, r1, 0x40 -/* 80958B64 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Delete__10daNpcAsh_cFv.s b/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Delete__10daNpcAsh_cFv.s deleted file mode 100644 index aed9db96956..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Delete__10daNpcAsh_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_809590C4: -/* 809590C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 809590C8 7C 08 02 A6 */ mflr r0 -/* 809590CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 809590D0 38 80 FF FF */ li r4, -1 -/* 809590D4 81 83 0B 44 */ lwz r12, 0xb44(r3) -/* 809590D8 81 8C 00 08 */ lwz r12, 8(r12) -/* 809590DC 7D 89 03 A6 */ mtctr r12 -/* 809590E0 4E 80 04 21 */ bctrl -/* 809590E4 38 60 00 01 */ li r3, 1 -/* 809590E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 809590EC 7C 08 03 A6 */ mtlr r0 -/* 809590F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 809590F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Draw__10daNpcAsh_cFv.s b/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Draw__10daNpcAsh_cFv.s deleted file mode 100644 index 59ec5bed8a3..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Draw__10daNpcAsh_cFv.s +++ /dev/null @@ -1,73 +0,0 @@ -lbl_8095911C: -/* 8095911C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80959120 7C 08 02 A6 */ mflr r0 -/* 80959124 90 01 00 14 */ stw r0, 0x14(r1) -/* 80959128 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8095912C 7C 7F 1B 78 */ mr r31, r3 -/* 80959130 80 83 05 68 */ lwz r4, 0x568(r3) -/* 80959134 80 84 00 04 */ lwz r4, 4(r4) -/* 80959138 80 84 00 04 */ lwz r4, 4(r4) -/* 8095913C 80 84 00 60 */ lwz r4, 0x60(r4) -/* 80959140 80 84 00 08 */ lwz r4, 8(r4) -/* 80959144 80 03 0B E0 */ lwz r0, 0xbe0(r3) -/* 80959148 90 04 00 3C */ stw r0, 0x3c(r4) -/* 8095914C 38 80 00 00 */ li r4, 0 -/* 80959150 38 A0 00 00 */ li r5, 0 -/* 80959154 3C C0 80 96 */ lis r6, m__16daNpcAsh_Param_c@ha /* 0x8095D640@ha */ -/* 80959158 38 C6 D6 40 */ addi r6, r6, m__16daNpcAsh_Param_c@l /* 0x8095D640@l */ -/* 8095915C C0 26 00 0C */ lfs f1, 0xc(r6) -/* 80959160 38 C0 00 00 */ li r6, 0 -/* 80959164 38 E0 00 00 */ li r7, 0 -/* 80959168 4B 7F 91 45 */ bl draw__8daNpcF_cFiifP11_GXColorS10i -/* 8095916C 88 1F 0F 60 */ lbz r0, 0xf60(r31) -/* 80959170 28 00 00 01 */ cmplwi r0, 1 -/* 80959174 40 82 00 AC */ bne lbl_80959220 -/* 80959178 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8095917C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80959180 80 9F 0B D8 */ lwz r4, 0xbd8(r31) -/* 80959184 80 84 00 04 */ lwz r4, 4(r4) -/* 80959188 38 BF 01 0C */ addi r5, r31, 0x10c -/* 8095918C 4B 84 BC 15 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80959190 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80959194 80 63 00 04 */ lwz r3, 4(r3) -/* 80959198 80 63 00 84 */ lwz r3, 0x84(r3) -/* 8095919C 80 63 00 0C */ lwz r3, 0xc(r3) -/* 809591A0 38 63 03 00 */ addi r3, r3, 0x300 -/* 809591A4 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 809591A8 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 809591AC 4B 9E D3 05 */ bl PSMTXCopy -/* 809591B0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 809591B4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 809591B8 80 9F 0B D8 */ lwz r4, 0xbd8(r31) -/* 809591BC 38 84 00 24 */ addi r4, r4, 0x24 -/* 809591C0 4B 9E D2 F1 */ bl PSMTXCopy -/* 809591C4 80 7F 0B D8 */ lwz r3, 0xbd8(r31) -/* 809591C8 4B 6B 4A FD */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 809591CC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 809591D0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 809591D4 80 9F 0B DC */ lwz r4, 0xbdc(r31) -/* 809591D8 80 84 00 04 */ lwz r4, 4(r4) -/* 809591DC 38 BF 01 0C */ addi r5, r31, 0x10c -/* 809591E0 4B 84 BB C1 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 809591E4 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 809591E8 80 63 00 04 */ lwz r3, 4(r3) -/* 809591EC 80 63 00 84 */ lwz r3, 0x84(r3) -/* 809591F0 80 63 00 0C */ lwz r3, 0xc(r3) -/* 809591F4 38 63 00 60 */ addi r3, r3, 0x60 -/* 809591F8 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 809591FC 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80959200 4B 9E D2 B1 */ bl PSMTXCopy -/* 80959204 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80959208 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8095920C 80 9F 0B DC */ lwz r4, 0xbdc(r31) -/* 80959210 38 84 00 24 */ addi r4, r4, 0x24 -/* 80959214 4B 9E D2 9D */ bl PSMTXCopy -/* 80959218 80 7F 0B DC */ lwz r3, 0xbdc(r31) -/* 8095921C 4B 6B 4A A9 */ bl mDoExt_modelUpdateDL__FP8J3DModel -lbl_80959220: -/* 80959220 38 60 00 01 */ li r3, 1 -/* 80959224 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80959228 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8095922C 7C 08 03 A6 */ mtlr r0 -/* 80959230 38 21 00 10 */ addi r1, r1, 0x10 -/* 80959234 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/EvCut_Introduction__10daNpcAsh_cFi.s b/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/EvCut_Introduction__10daNpcAsh_cFi.s deleted file mode 100644 index 272cfebe2da..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/EvCut_Introduction__10daNpcAsh_cFi.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_8095B48C: -/* 8095B48C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8095B490 7C 08 02 A6 */ mflr r0 -/* 8095B494 90 01 00 24 */ stw r0, 0x24(r1) -/* 8095B498 39 61 00 20 */ addi r11, r1, 0x20 -/* 8095B49C 4B A0 6D 3D */ bl _savegpr_28 -/* 8095B4A0 7C 7C 1B 78 */ mr r28, r3 -/* 8095B4A4 7C 9D 23 78 */ mr r29, r4 -/* 8095B4A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8095B4AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8095B4B0 3B C3 4F F8 */ addi r30, r3, 0x4ff8 -/* 8095B4B4 7F C3 F3 78 */ mr r3, r30 -/* 8095B4B8 3C A0 80 96 */ lis r5, d_a_npc_ash__stringBase0@ha /* 0x8095D910@ha */ -/* 8095B4BC 38 A5 D9 10 */ addi r5, r5, d_a_npc_ash__stringBase0@l /* 0x8095D910@l */ -/* 8095B4C0 38 A5 00 7B */ addi r5, r5, 0x7b -/* 8095B4C4 38 C0 00 03 */ li r6, 3 -/* 8095B4C8 4B 6E CC 25 */ bl getMySubstanceP__16dEvent_manager_cFiPCci -/* 8095B4CC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8095B4D0 40 82 00 0C */ bne lbl_8095B4DC -/* 8095B4D4 38 60 00 00 */ li r3, 0 -/* 8095B4D8 48 00 00 9C */ b lbl_8095B574 -lbl_8095B4DC: -/* 8095B4DC 7F C3 F3 78 */ mr r3, r30 -/* 8095B4E0 7F A4 EB 78 */ mr r4, r29 -/* 8095B4E4 4B 6E C8 69 */ bl getIsAddvance__16dEvent_manager_cFi -/* 8095B4E8 2C 03 00 00 */ cmpwi r3, 0 -/* 8095B4EC 41 82 00 84 */ beq lbl_8095B570 -/* 8095B4F0 80 1F 00 00 */ lwz r0, 0(r31) -/* 8095B4F4 2C 00 00 01 */ cmpwi r0, 1 -/* 8095B4F8 41 82 00 48 */ beq lbl_8095B540 -/* 8095B4FC 40 80 00 10 */ bge lbl_8095B50C -/* 8095B500 2C 00 00 00 */ cmpwi r0, 0 -/* 8095B504 40 80 00 10 */ bge lbl_8095B514 -/* 8095B508 48 00 00 68 */ b lbl_8095B570 -lbl_8095B50C: -/* 8095B50C 2C 00 00 03 */ cmpwi r0, 3 -/* 8095B510 40 80 00 60 */ bge lbl_8095B570 -lbl_8095B514: -/* 8095B514 A8 1C 0F 5A */ lha r0, 0xf5a(r28) -/* 8095B518 2C 00 00 00 */ cmpwi r0, 0 -/* 8095B51C 40 82 00 10 */ bne lbl_8095B52C -/* 8095B520 80 1C 0C B0 */ lwz r0, 0xcb0(r28) -/* 8095B524 28 00 00 00 */ cmplwi r0, 0 -/* 8095B528 41 82 00 10 */ beq lbl_8095B538 -lbl_8095B52C: -/* 8095B52C 38 00 00 00 */ li r0, 0 -/* 8095B530 B0 1C 0F 5A */ sth r0, 0xf5a(r28) -/* 8095B534 90 1C 0C B0 */ stw r0, 0xcb0(r28) -lbl_8095B538: -/* 8095B538 38 60 00 01 */ li r3, 1 -/* 8095B53C 48 00 00 38 */ b lbl_8095B574 -lbl_8095B540: -/* 8095B540 A8 1C 0F 5A */ lha r0, 0xf5a(r28) -/* 8095B544 2C 00 00 02 */ cmpwi r0, 2 -/* 8095B548 40 82 00 10 */ bne lbl_8095B558 -/* 8095B54C 80 1C 0C B0 */ lwz r0, 0xcb0(r28) -/* 8095B550 28 00 00 00 */ cmplwi r0, 0 -/* 8095B554 41 82 00 14 */ beq lbl_8095B568 -lbl_8095B558: -/* 8095B558 38 00 00 02 */ li r0, 2 -/* 8095B55C B0 1C 0F 5A */ sth r0, 0xf5a(r28) -/* 8095B560 38 00 00 00 */ li r0, 0 -/* 8095B564 90 1C 0C B0 */ stw r0, 0xcb0(r28) -lbl_8095B568: -/* 8095B568 38 60 00 01 */ li r3, 1 -/* 8095B56C 48 00 00 08 */ b lbl_8095B574 -lbl_8095B570: -/* 8095B570 38 60 00 00 */ li r3, 0 -lbl_8095B574: -/* 8095B574 39 61 00 20 */ addi r11, r1, 0x20 -/* 8095B578 4B A0 6C AD */ bl _restgpr_28 -/* 8095B57C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8095B580 7C 08 03 A6 */ mtlr r0 -/* 8095B584 38 21 00 20 */ addi r1, r1, 0x20 -/* 8095B588 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Execute__10daNpcAsh_cFv.s b/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Execute__10daNpcAsh_cFv.s deleted file mode 100644 index 3cfa8d61159..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Execute__10daNpcAsh_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_809590F8: -/* 809590F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 809590FC 7C 08 02 A6 */ mflr r0 -/* 80959100 90 01 00 14 */ stw r0, 0x14(r1) -/* 80959104 4B 7F 8F 11 */ bl execute__8daNpcF_cFv -/* 80959108 38 60 00 01 */ li r3, 1 -/* 8095910C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80959110 7C 08 03 A6 */ mtlr r0 -/* 80959114 38 21 00 10 */ addi r1, r1, 0x10 -/* 80959118 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/createHeapCallBack__10daNpcAsh_cFP10fopAc_ac_c.s b/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/createHeapCallBack__10daNpcAsh_cFP10fopAc_ac_c.s deleted file mode 100644 index e768e8cfde9..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/createHeapCallBack__10daNpcAsh_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80959458: -/* 80959458 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8095945C 7C 08 02 A6 */ mflr r0 -/* 80959460 90 01 00 14 */ stw r0, 0x14(r1) -/* 80959464 4B FF F7 05 */ bl CreateHeap__10daNpcAsh_cFv -/* 80959468 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8095946C 7C 08 03 A6 */ mtlr r0 -/* 80959470 38 21 00 10 */ addi r1, r1, 0x10 -/* 80959474 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/ctrlJointCallBack__10daNpcAsh_cFP8J3DJointi.s b/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/ctrlJointCallBack__10daNpcAsh_cFP8J3DJointi.s deleted file mode 100644 index 3153d6a123e..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/ctrlJointCallBack__10daNpcAsh_cFP8J3DJointi.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80959478: -/* 80959478 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8095947C 7C 08 02 A6 */ mflr r0 -/* 80959480 90 01 00 14 */ stw r0, 0x14(r1) -/* 80959484 7C 60 1B 78 */ mr r0, r3 -/* 80959488 2C 04 00 00 */ cmpwi r4, 0 -/* 8095948C 40 82 00 24 */ bne lbl_809594B0 -/* 80959490 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80959494 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80959498 80 A3 00 38 */ lwz r5, 0x38(r3) -/* 8095949C 80 65 00 14 */ lwz r3, 0x14(r5) -/* 809594A0 28 03 00 00 */ cmplwi r3, 0 -/* 809594A4 41 82 00 0C */ beq lbl_809594B0 -/* 809594A8 7C 04 03 78 */ mr r4, r0 -/* 809594AC 4B FF FD 8D */ bl ctrlJoint__10daNpcAsh_cFP8J3DJointP8J3DModel -lbl_809594B0: -/* 809594B0 38 60 00 01 */ li r3, 1 -/* 809594B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 809594B8 7C 08 03 A6 */ mtlr r0 -/* 809594BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 809594C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/ctrlJoint__10daNpcAsh_cFP8J3DJointP8J3DModel.s b/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/ctrlJoint__10daNpcAsh_cFP8J3DJointP8J3DModel.s deleted file mode 100644 index 23093ffad16..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/ctrlJoint__10daNpcAsh_cFP8J3DJointP8J3DModel.s +++ /dev/null @@ -1,145 +0,0 @@ -lbl_80959238: -/* 80959238 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8095923C 7C 08 02 A6 */ mflr r0 -/* 80959240 90 01 00 34 */ stw r0, 0x34(r1) -/* 80959244 39 61 00 30 */ addi r11, r1, 0x30 -/* 80959248 4B A0 8F 91 */ bl _savegpr_28 -/* 8095924C 7C 7D 1B 78 */ mr r29, r3 -/* 80959250 7C BE 2B 78 */ mr r30, r5 -/* 80959254 A0 A4 00 14 */ lhz r5, 0x14(r4) -/* 80959258 7C BF 2B 78 */ mr r31, r5 -/* 8095925C 3C 60 80 96 */ lis r3, lit_4385@ha /* 0x8095D6C4@ha */ -/* 80959260 38 83 D6 C4 */ addi r4, r3, lit_4385@l /* 0x8095D6C4@l */ -/* 80959264 80 64 00 00 */ lwz r3, 0(r4) -/* 80959268 80 04 00 04 */ lwz r0, 4(r4) -/* 8095926C 90 61 00 08 */ stw r3, 8(r1) -/* 80959270 90 01 00 0C */ stw r0, 0xc(r1) -/* 80959274 80 04 00 08 */ lwz r0, 8(r4) -/* 80959278 90 01 00 10 */ stw r0, 0x10(r1) -/* 8095927C 2C 05 00 00 */ cmpwi r5, 0 -/* 80959280 40 82 00 B0 */ bne lbl_80959330 -/* 80959284 80 7D 05 68 */ lwz r3, 0x568(r29) -/* 80959288 80 63 00 04 */ lwz r3, 4(r3) -/* 8095928C 80 63 00 84 */ lwz r3, 0x84(r3) -/* 80959290 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80959294 38 63 00 30 */ addi r3, r3, 0x30 -/* 80959298 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8095929C 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 809592A0 4B 9E D2 11 */ bl PSMTXCopy -/* 809592A4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 809592A8 3B 83 D4 70 */ addi r28, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 809592AC C0 1C 00 0C */ lfs f0, 0xc(r28) -/* 809592B0 D0 1D 08 54 */ stfs f0, 0x854(r29) -/* 809592B4 C0 1C 00 1C */ lfs f0, 0x1c(r28) -/* 809592B8 D0 1D 08 58 */ stfs f0, 0x858(r29) -/* 809592BC C0 1C 00 2C */ lfs f0, 0x2c(r28) -/* 809592C0 D0 1D 08 5C */ stfs f0, 0x85c(r29) -/* 809592C4 80 7D 05 68 */ lwz r3, 0x568(r29) -/* 809592C8 80 63 00 04 */ lwz r3, 4(r3) -/* 809592CC 80 63 00 84 */ lwz r3, 0x84(r3) -/* 809592D0 80 63 00 0C */ lwz r3, 0xc(r3) -/* 809592D4 38 63 00 90 */ addi r3, r3, 0x90 -/* 809592D8 7F 84 E3 78 */ mr r4, r28 -/* 809592DC 4B 9E D1 D5 */ bl PSMTXCopy -/* 809592E0 C0 1C 00 0C */ lfs f0, 0xc(r28) -/* 809592E4 D0 1D 08 60 */ stfs f0, 0x860(r29) -/* 809592E8 C0 1C 00 1C */ lfs f0, 0x1c(r28) -/* 809592EC D0 1D 08 64 */ stfs f0, 0x864(r29) -/* 809592F0 C0 1C 00 2C */ lfs f0, 0x2c(r28) -/* 809592F4 D0 1D 08 68 */ stfs f0, 0x868(r29) -/* 809592F8 80 7D 05 68 */ lwz r3, 0x568(r29) -/* 809592FC 80 63 00 04 */ lwz r3, 4(r3) -/* 80959300 80 63 00 84 */ lwz r3, 0x84(r3) -/* 80959304 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80959308 38 63 00 C0 */ addi r3, r3, 0xc0 -/* 8095930C 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80959310 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80959314 4B 9E D1 9D */ bl PSMTXCopy -/* 80959318 C0 1C 00 0C */ lfs f0, 0xc(r28) -/* 8095931C D0 1D 08 6C */ stfs f0, 0x86c(r29) -/* 80959320 C0 1C 00 1C */ lfs f0, 0x1c(r28) -/* 80959324 D0 1D 08 70 */ stfs f0, 0x870(r29) -/* 80959328 C0 1C 00 2C */ lfs f0, 0x2c(r28) -/* 8095932C D0 1D 08 74 */ stfs f0, 0x874(r29) -lbl_80959330: -/* 80959330 80 7E 00 84 */ lwz r3, 0x84(r30) -/* 80959334 80 03 00 0C */ lwz r0, 0xc(r3) -/* 80959338 1F 9F 00 30 */ mulli r28, r31, 0x30 -/* 8095933C 7C 60 E2 14 */ add r3, r0, r28 -/* 80959340 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80959344 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80959348 4B 9E D1 69 */ bl PSMTXCopy -/* 8095934C 2C 1F 00 02 */ cmpwi r31, 2 -/* 80959350 41 82 00 38 */ beq lbl_80959388 -/* 80959354 40 80 00 10 */ bge lbl_80959364 -/* 80959358 2C 1F 00 01 */ cmpwi r31, 1 -/* 8095935C 40 80 00 10 */ bge lbl_8095936C -/* 80959360 48 00 00 28 */ b lbl_80959388 -lbl_80959364: -/* 80959364 2C 1F 00 05 */ cmpwi r31, 5 -/* 80959368 40 80 00 20 */ bge lbl_80959388 -lbl_8095936C: -/* 8095936C 7F A3 EB 78 */ mr r3, r29 -/* 80959370 7F E4 FB 78 */ mr r4, r31 -/* 80959374 38 A1 00 08 */ addi r5, r1, 8 -/* 80959378 3C C0 80 96 */ lis r6, m__16daNpcAsh_Param_c@ha /* 0x8095D640@ha */ -/* 8095937C 38 C6 D6 40 */ addi r6, r6, m__16daNpcAsh_Param_c@l /* 0x8095D640@l */ -/* 80959380 C0 26 00 40 */ lfs f1, 0x40(r6) -/* 80959384 4B 7F 9F F9 */ bl setLookatMtx__8daNpcF_cFiPif -lbl_80959388: -/* 80959388 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8095938C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80959390 80 9E 00 84 */ lwz r4, 0x84(r30) -/* 80959394 80 04 00 0C */ lwz r0, 0xc(r4) -/* 80959398 7C 80 E2 14 */ add r4, r0, r28 -/* 8095939C 4B 9E D1 15 */ bl PSMTXCopy -/* 809593A0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 809593A4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 809593A8 3C 80 80 43 */ lis r4, mCurrentMtx__6J3DSys@ha /* 0x80434BE4@ha */ -/* 809593AC 38 84 4B E4 */ addi r4, r4, mCurrentMtx__6J3DSys@l /* 0x80434BE4@l */ -/* 809593B0 4B 9E D1 01 */ bl PSMTXCopy -/* 809593B4 2C 1F 00 04 */ cmpwi r31, 4 -/* 809593B8 41 82 00 0C */ beq lbl_809593C4 -/* 809593BC 2C 1F 00 0C */ cmpwi r31, 0xc -/* 809593C0 40 82 00 2C */ bne lbl_809593EC -lbl_809593C4: -/* 809593C4 80 1D 09 9C */ lwz r0, 0x99c(r29) -/* 809593C8 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 809593CC 41 82 00 20 */ beq lbl_809593EC -/* 809593D0 83 9D 05 80 */ lwz r28, 0x580(r29) -/* 809593D4 80 7D 05 68 */ lwz r3, 0x568(r29) -/* 809593D8 80 83 00 08 */ lwz r4, 8(r3) -/* 809593DC 38 7D 05 6C */ addi r3, r29, 0x56c -/* 809593E0 4B 6B 45 B1 */ bl changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform -/* 809593E4 80 7D 05 68 */ lwz r3, 0x568(r29) -/* 809593E8 93 83 00 08 */ stw r28, 8(r3) -lbl_809593EC: -/* 809593EC C0 1D 09 78 */ lfs f0, 0x978(r29) -/* 809593F0 FC 00 02 10 */ fabs f0, f0 -/* 809593F4 FC 20 00 18 */ frsp f1, f0 -/* 809593F8 3C 60 80 45 */ lis r3, G_CM3D_F_ABS_MIN@ha /* 0x80451180@ha */ -/* 809593FC C0 03 11 80 */ lfs f0, G_CM3D_F_ABS_MIN@l(r3) /* 0x80451180@l */ -/* 80959400 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80959404 7C 00 00 26 */ mfcr r0 -/* 80959408 54 00 0F FF */ rlwinm. r0, r0, 1, 0x1f, 0x1f -/* 8095940C 40 82 00 30 */ bne lbl_8095943C -/* 80959410 2C 1F 00 0C */ cmpwi r31, 0xc -/* 80959414 40 82 00 14 */ bne lbl_80959428 -/* 80959418 38 00 00 01 */ li r0, 1 -/* 8095941C 80 7D 05 68 */ lwz r3, 0x568(r29) -/* 80959420 98 03 00 55 */ stb r0, 0x55(r3) -/* 80959424 48 00 00 18 */ b lbl_8095943C -lbl_80959428: -/* 80959428 2C 1F 00 04 */ cmpwi r31, 4 -/* 8095942C 40 82 00 10 */ bne lbl_8095943C -/* 80959430 38 00 00 00 */ li r0, 0 -/* 80959434 80 7D 05 68 */ lwz r3, 0x568(r29) -/* 80959438 98 03 00 55 */ stb r0, 0x55(r3) -lbl_8095943C: -/* 8095943C 38 60 00 01 */ li r3, 1 -/* 80959440 39 61 00 30 */ addi r11, r1, 0x30 -/* 80959444 4B A0 8D E1 */ bl _restgpr_28 -/* 80959448 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8095944C 7C 08 03 A6 */ mtlr r0 -/* 80959450 38 21 00 30 */ addi r1, r1, 0x30 -/* 80959454 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Create__FPv.s b/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Create__FPv.s deleted file mode 100644 index ca5abd33af2..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Create__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8095BC38: -/* 8095BC38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8095BC3C 7C 08 02 A6 */ mflr r0 -/* 8095BC40 90 01 00 14 */ stw r0, 0x14(r1) -/* 8095BC44 4B FF CB 5D */ bl Create__10daNpcAsh_cFv -/* 8095BC48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8095BC4C 7C 08 03 A6 */ mtlr r0 -/* 8095BC50 38 21 00 10 */ addi r1, r1, 0x10 -/* 8095BC54 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Delete__FPv.s b/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Delete__FPv.s deleted file mode 100644 index 09bfef9fc7b..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Delete__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8095BC58: -/* 8095BC58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8095BC5C 7C 08 02 A6 */ mflr r0 -/* 8095BC60 90 01 00 14 */ stw r0, 0x14(r1) -/* 8095BC64 4B FF D4 61 */ bl Delete__10daNpcAsh_cFv -/* 8095BC68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8095BC6C 7C 08 03 A6 */ mtlr r0 -/* 8095BC70 38 21 00 10 */ addi r1, r1, 0x10 -/* 8095BC74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Draw__FPv.s b/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Draw__FPv.s deleted file mode 100644 index 88d6cd61a2e..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Draw__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8095BC98: -/* 8095BC98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8095BC9C 7C 08 02 A6 */ mflr r0 -/* 8095BCA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8095BCA4 4B FF D4 79 */ bl Draw__10daNpcAsh_cFv -/* 8095BCA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8095BCAC 7C 08 03 A6 */ mtlr r0 -/* 8095BCB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8095BCB4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Execute__FPv.s b/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Execute__FPv.s deleted file mode 100644 index 4b10b747931..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Execute__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8095BC78: -/* 8095BC78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8095BC7C 7C 08 02 A6 */ mflr r0 -/* 8095BC80 90 01 00 14 */ stw r0, 0x14(r1) -/* 8095BC84 4B FF D4 75 */ bl Execute__10daNpcAsh_cFv -/* 8095BC88 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8095BC8C 7C 08 03 A6 */ mtlr r0 -/* 8095BC90 38 21 00 10 */ addi r1, r1, 0x10 -/* 8095BC94 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/isSneaking__10daNpcAsh_cFv.s b/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/isSneaking__10daNpcAsh_cFv.s deleted file mode 100644 index ecd9d7c421f..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/isSneaking__10daNpcAsh_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80959BD0: -/* 80959BD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80959BD4 7C 08 02 A6 */ mflr r0 -/* 80959BD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80959BDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80959BE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80959BE4 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 80959BE8 3C 80 80 96 */ lis r4, d_a_npc_ash__stringBase0@ha /* 0x8095D910@ha */ -/* 80959BEC 38 84 D9 10 */ addi r4, r4, d_a_npc_ash__stringBase0@l /* 0x8095D910@l */ -/* 80959BF0 38 84 00 6C */ addi r4, r4, 0x6c -/* 80959BF4 4B A0 ED A1 */ bl strcmp -/* 80959BF8 2C 03 00 00 */ cmpwi r3, 0 -/* 80959BFC 40 82 00 30 */ bne lbl_80959C2C -/* 80959C00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80959C04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80959C08 88 03 4E 0A */ lbz r0, 0x4e0a(r3) -/* 80959C0C 2C 00 00 05 */ cmpwi r0, 5 -/* 80959C10 40 82 00 1C */ bne lbl_80959C2C -/* 80959C14 38 60 00 00 */ li r3, 0 -/* 80959C18 4B 6D 2D 65 */ bl getLayerNo__14dComIfG_play_cFi -/* 80959C1C 2C 03 00 02 */ cmpwi r3, 2 -/* 80959C20 40 82 00 0C */ bne lbl_80959C2C -/* 80959C24 38 60 00 01 */ li r3, 1 -/* 80959C28 48 00 00 08 */ b lbl_80959C30 -lbl_80959C2C: -/* 80959C2C 38 60 00 00 */ li r3, 0 -lbl_80959C30: -/* 80959C30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80959C34 7C 08 03 A6 */ mtlr r0 -/* 80959C38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80959C3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/main__10daNpcAsh_cFv.s b/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/main__10daNpcAsh_cFv.s deleted file mode 100644 index 6ab78f8038a..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/main__10daNpcAsh_cFv.s +++ /dev/null @@ -1,170 +0,0 @@ -lbl_8095BF6C: -/* 8095BF6C 94 21 FF 50 */ stwu r1, -0xb0(r1) -/* 8095BF70 7C 08 02 A6 */ mflr r0 -/* 8095BF74 90 01 00 B4 */ stw r0, 0xb4(r1) -/* 8095BF78 93 E1 00 AC */ stw r31, 0xac(r1) -/* 8095BF7C 93 C1 00 A8 */ stw r30, 0xa8(r1) -/* 8095BF80 7C 7E 1B 78 */ mr r30, r3 -/* 8095BF84 3C 60 80 96 */ lis r3, m__16daNpcAsh_Param_c@ha /* 0x8095D640@ha */ -/* 8095BF88 3B E3 D6 40 */ addi r31, r3, m__16daNpcAsh_Param_c@l /* 0x8095D640@l */ -/* 8095BF8C 38 7E 0F 30 */ addi r3, r30, 0xf30 -/* 8095BF90 4B A0 60 89 */ bl __ptmf_test -/* 8095BF94 2C 03 00 00 */ cmpwi r3, 0 -/* 8095BF98 41 82 00 18 */ beq lbl_8095BFB0 -/* 8095BF9C 7F C3 F3 78 */ mr r3, r30 -/* 8095BFA0 38 80 00 00 */ li r4, 0 -/* 8095BFA4 39 9E 0F 30 */ addi r12, r30, 0xf30 -/* 8095BFA8 4B A0 60 DD */ bl __ptmf_scall -/* 8095BFAC 60 00 00 00 */ nop -lbl_8095BFB0: -/* 8095BFB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8095BFB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8095BFB8 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 8095BFBC 28 00 00 00 */ cmplwi r0, 0 -/* 8095BFC0 41 82 00 30 */ beq lbl_8095BFF0 -/* 8095BFC4 A0 1E 00 F8 */ lhz r0, 0xf8(r30) -/* 8095BFC8 28 00 00 01 */ cmplwi r0, 1 -/* 8095BFCC 41 82 00 24 */ beq lbl_8095BFF0 -/* 8095BFD0 80 9E 0F 4C */ lwz r4, 0xf4c(r30) -/* 8095BFD4 3C 04 00 01 */ addis r0, r4, 1 -/* 8095BFD8 28 00 FF FF */ cmplwi r0, 0xffff -/* 8095BFDC 41 82 00 14 */ beq lbl_8095BFF0 -/* 8095BFE0 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 8095BFE4 4B 6E 77 09 */ bl setPtI_Id__14dEvt_control_cFUi -/* 8095BFE8 38 00 FF FF */ li r0, -1 -/* 8095BFEC 90 1E 0F 4C */ stw r0, 0xf4c(r30) -lbl_8095BFF0: -/* 8095BFF0 80 7F 00 90 */ lwz r3, 0x90(r31) -/* 8095BFF4 80 1F 00 94 */ lwz r0, 0x94(r31) -/* 8095BFF8 90 61 00 28 */ stw r3, 0x28(r1) -/* 8095BFFC 90 01 00 2C */ stw r0, 0x2c(r1) -/* 8095C000 80 1F 00 98 */ lwz r0, 0x98(r31) -/* 8095C004 90 01 00 30 */ stw r0, 0x30(r1) -/* 8095C008 38 7F 00 00 */ addi r3, r31, 0 -/* 8095C00C C0 03 00 44 */ lfs f0, 0x44(r3) -/* 8095C010 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 8095C014 80 1F 00 9C */ lwz r0, 0x9c(r31) -/* 8095C018 90 01 00 08 */ stw r0, 8(r1) -/* 8095C01C 38 01 00 28 */ addi r0, r1, 0x28 -/* 8095C020 90 01 00 08 */ stw r0, 8(r1) -/* 8095C024 80 7F 00 A0 */ lwz r3, 0xa0(r31) -/* 8095C028 80 1F 00 A4 */ lwz r0, 0xa4(r31) -/* 8095C02C 90 61 00 34 */ stw r3, 0x34(r1) -/* 8095C030 90 01 00 38 */ stw r0, 0x38(r1) -/* 8095C034 80 1F 00 A8 */ lwz r0, 0xa8(r31) -/* 8095C038 90 01 00 3C */ stw r0, 0x3c(r1) -/* 8095C03C D0 01 00 38 */ stfs f0, 0x38(r1) -/* 8095C040 80 1F 00 AC */ lwz r0, 0xac(r31) -/* 8095C044 90 01 00 0C */ stw r0, 0xc(r1) -/* 8095C048 38 01 00 34 */ addi r0, r1, 0x34 -/* 8095C04C 90 01 00 0C */ stw r0, 0xc(r1) -/* 8095C050 80 7F 00 B0 */ lwz r3, 0xb0(r31) -/* 8095C054 80 1F 00 B4 */ lwz r0, 0xb4(r31) -/* 8095C058 90 61 00 40 */ stw r3, 0x40(r1) -/* 8095C05C 90 01 00 44 */ stw r0, 0x44(r1) -/* 8095C060 80 1F 00 B8 */ lwz r0, 0xb8(r31) -/* 8095C064 90 01 00 48 */ stw r0, 0x48(r1) -/* 8095C068 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 8095C06C 80 1F 00 BC */ lwz r0, 0xbc(r31) -/* 8095C070 90 01 00 10 */ stw r0, 0x10(r1) -/* 8095C074 38 01 00 40 */ addi r0, r1, 0x40 -/* 8095C078 90 01 00 10 */ stw r0, 0x10(r1) -/* 8095C07C 80 7F 00 C0 */ lwz r3, 0xc0(r31) -/* 8095C080 80 1F 00 C4 */ lwz r0, 0xc4(r31) -/* 8095C084 90 61 00 4C */ stw r3, 0x4c(r1) -/* 8095C088 90 01 00 50 */ stw r0, 0x50(r1) -/* 8095C08C 80 1F 00 C8 */ lwz r0, 0xc8(r31) -/* 8095C090 90 01 00 54 */ stw r0, 0x54(r1) -/* 8095C094 D0 01 00 50 */ stfs f0, 0x50(r1) -/* 8095C098 80 1F 00 CC */ lwz r0, 0xcc(r31) -/* 8095C09C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8095C0A0 38 01 00 4C */ addi r0, r1, 0x4c -/* 8095C0A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8095C0A8 80 7F 00 D0 */ lwz r3, 0xd0(r31) -/* 8095C0AC 80 1F 00 D4 */ lwz r0, 0xd4(r31) -/* 8095C0B0 90 61 00 58 */ stw r3, 0x58(r1) -/* 8095C0B4 90 01 00 5C */ stw r0, 0x5c(r1) -/* 8095C0B8 80 1F 00 D8 */ lwz r0, 0xd8(r31) -/* 8095C0BC 90 01 00 60 */ stw r0, 0x60(r1) -/* 8095C0C0 D0 01 00 5C */ stfs f0, 0x5c(r1) -/* 8095C0C4 80 1F 00 DC */ lwz r0, 0xdc(r31) -/* 8095C0C8 90 01 00 18 */ stw r0, 0x18(r1) -/* 8095C0CC 38 01 00 58 */ addi r0, r1, 0x58 -/* 8095C0D0 90 01 00 18 */ stw r0, 0x18(r1) -/* 8095C0D4 80 7F 00 E0 */ lwz r3, 0xe0(r31) -/* 8095C0D8 80 1F 00 E4 */ lwz r0, 0xe4(r31) -/* 8095C0DC 90 61 00 64 */ stw r3, 0x64(r1) -/* 8095C0E0 90 01 00 68 */ stw r0, 0x68(r1) -/* 8095C0E4 80 1F 00 E8 */ lwz r0, 0xe8(r31) -/* 8095C0E8 90 01 00 6C */ stw r0, 0x6c(r1) -/* 8095C0EC D0 01 00 68 */ stfs f0, 0x68(r1) -/* 8095C0F0 80 1F 00 EC */ lwz r0, 0xec(r31) -/* 8095C0F4 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8095C0F8 38 01 00 64 */ addi r0, r1, 0x64 -/* 8095C0FC 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8095C100 80 7F 00 F0 */ lwz r3, 0xf0(r31) -/* 8095C104 80 1F 00 F4 */ lwz r0, 0xf4(r31) -/* 8095C108 90 61 00 70 */ stw r3, 0x70(r1) -/* 8095C10C 90 01 00 74 */ stw r0, 0x74(r1) -/* 8095C110 80 1F 00 F8 */ lwz r0, 0xf8(r31) -/* 8095C114 90 01 00 78 */ stw r0, 0x78(r1) -/* 8095C118 D0 01 00 74 */ stfs f0, 0x74(r1) -/* 8095C11C 80 1F 00 FC */ lwz r0, 0xfc(r31) -/* 8095C120 90 01 00 20 */ stw r0, 0x20(r1) -/* 8095C124 38 01 00 70 */ addi r0, r1, 0x70 -/* 8095C128 90 01 00 20 */ stw r0, 0x20(r1) -/* 8095C12C 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8095C130 80 1F 01 04 */ lwz r0, 0x104(r31) -/* 8095C134 90 61 00 7C */ stw r3, 0x7c(r1) -/* 8095C138 90 01 00 80 */ stw r0, 0x80(r1) -/* 8095C13C 80 1F 01 08 */ lwz r0, 0x108(r31) -/* 8095C140 90 01 00 84 */ stw r0, 0x84(r1) -/* 8095C144 D0 01 00 80 */ stfs f0, 0x80(r1) -/* 8095C148 80 1F 01 0C */ lwz r0, 0x10c(r31) -/* 8095C14C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8095C150 38 01 00 7C */ addi r0, r1, 0x7c -/* 8095C154 90 01 00 24 */ stw r0, 0x24(r1) -/* 8095C158 38 A1 00 84 */ addi r5, r1, 0x84 -/* 8095C15C 38 9F 01 0C */ addi r4, r31, 0x10c -/* 8095C160 38 00 00 04 */ li r0, 4 -/* 8095C164 7C 09 03 A6 */ mtctr r0 -lbl_8095C168: -/* 8095C168 80 64 00 04 */ lwz r3, 4(r4) -/* 8095C16C 84 04 00 08 */ lwzu r0, 8(r4) -/* 8095C170 90 65 00 04 */ stw r3, 4(r5) -/* 8095C174 94 05 00 08 */ stwu r0, 8(r5) -/* 8095C178 42 00 FF F0 */ bdnz lbl_8095C168 -/* 8095C17C 38 01 00 08 */ addi r0, r1, 8 -/* 8095C180 90 01 00 88 */ stw r0, 0x88(r1) -/* 8095C184 38 01 00 0C */ addi r0, r1, 0xc -/* 8095C188 90 01 00 8C */ stw r0, 0x8c(r1) -/* 8095C18C 38 01 00 10 */ addi r0, r1, 0x10 -/* 8095C190 90 01 00 90 */ stw r0, 0x90(r1) -/* 8095C194 38 01 00 14 */ addi r0, r1, 0x14 -/* 8095C198 90 01 00 94 */ stw r0, 0x94(r1) -/* 8095C19C 38 01 00 18 */ addi r0, r1, 0x18 -/* 8095C1A0 90 01 00 98 */ stw r0, 0x98(r1) -/* 8095C1A4 38 01 00 1C */ addi r0, r1, 0x1c -/* 8095C1A8 90 01 00 9C */ stw r0, 0x9c(r1) -/* 8095C1AC 38 01 00 20 */ addi r0, r1, 0x20 -/* 8095C1B0 90 01 00 A0 */ stw r0, 0xa0(r1) -/* 8095C1B4 38 01 00 24 */ addi r0, r1, 0x24 -/* 8095C1B8 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 8095C1BC A8 7E 09 DE */ lha r3, 0x9de(r30) -/* 8095C1C0 7C 60 07 35 */ extsh. r0, r3 -/* 8095C1C4 41 80 00 18 */ blt lbl_8095C1DC -/* 8095C1C8 2C 03 00 08 */ cmpwi r3, 8 -/* 8095C1CC 40 80 00 10 */ bge lbl_8095C1DC -/* 8095C1D0 7F C3 F3 78 */ mr r3, r30 -/* 8095C1D4 38 81 00 88 */ addi r4, r1, 0x88 -/* 8095C1D8 4B 7F 6F 79 */ bl playExpressionAnm__8daNpcF_cFPPPQ28daNpcF_c18daNpcF_anmPlayData -lbl_8095C1DC: -/* 8095C1DC 7F C3 F3 78 */ mr r3, r30 -/* 8095C1E0 48 00 00 21 */ bl playMotion__10daNpcAsh_cFv -/* 8095C1E4 38 60 00 01 */ li r3, 1 -/* 8095C1E8 83 E1 00 AC */ lwz r31, 0xac(r1) -/* 8095C1EC 83 C1 00 A8 */ lwz r30, 0xa8(r1) -/* 8095C1F0 80 01 00 B4 */ lwz r0, 0xb4(r1) -/* 8095C1F4 7C 08 03 A6 */ mtlr r0 -/* 8095C1F8 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8095C1FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setAction__10daNpcAsh_cFM10daNpcAsh_cFPCvPvPv_b.s b/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setAction__10daNpcAsh_cFM10daNpcAsh_cFPCvPvPv_b.s deleted file mode 100644 index d0e55b78d2f..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setAction__10daNpcAsh_cFM10daNpcAsh_cFPCvPvPv_b.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80959B28: -/* 80959B28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80959B2C 7C 08 02 A6 */ mflr r0 -/* 80959B30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80959B34 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80959B38 93 C1 00 08 */ stw r30, 8(r1) -/* 80959B3C 7C 7E 1B 78 */ mr r30, r3 -/* 80959B40 7C 9F 23 78 */ mr r31, r4 -/* 80959B44 38 00 00 03 */ li r0, 3 -/* 80959B48 B0 03 0F 5C */ sth r0, 0xf5c(r3) -/* 80959B4C 38 7E 0F 30 */ addi r3, r30, 0xf30 -/* 80959B50 4B A0 84 C9 */ bl __ptmf_test -/* 80959B54 2C 03 00 00 */ cmpwi r3, 0 -/* 80959B58 41 82 00 18 */ beq lbl_80959B70 -/* 80959B5C 7F C3 F3 78 */ mr r3, r30 -/* 80959B60 38 80 00 00 */ li r4, 0 -/* 80959B64 39 9E 0F 30 */ addi r12, r30, 0xf30 -/* 80959B68 4B A0 85 1D */ bl __ptmf_scall -/* 80959B6C 60 00 00 00 */ nop -lbl_80959B70: -/* 80959B70 38 00 00 00 */ li r0, 0 -/* 80959B74 B0 1E 0F 5C */ sth r0, 0xf5c(r30) -/* 80959B78 80 7F 00 00 */ lwz r3, 0(r31) -/* 80959B7C 80 1F 00 04 */ lwz r0, 4(r31) -/* 80959B80 90 7E 0F 30 */ stw r3, 0xf30(r30) -/* 80959B84 90 1E 0F 34 */ stw r0, 0xf34(r30) -/* 80959B88 80 1F 00 08 */ lwz r0, 8(r31) -/* 80959B8C 90 1E 0F 38 */ stw r0, 0xf38(r30) -/* 80959B90 38 7E 0F 30 */ addi r3, r30, 0xf30 -/* 80959B94 4B A0 84 85 */ bl __ptmf_test -/* 80959B98 2C 03 00 00 */ cmpwi r3, 0 -/* 80959B9C 41 82 00 18 */ beq lbl_80959BB4 -/* 80959BA0 7F C3 F3 78 */ mr r3, r30 -/* 80959BA4 38 80 00 00 */ li r4, 0 -/* 80959BA8 39 9E 0F 30 */ addi r12, r30, 0xf30 -/* 80959BAC 4B A0 84 D9 */ bl __ptmf_scall -/* 80959BB0 60 00 00 00 */ nop -lbl_80959BB4: -/* 80959BB4 38 60 00 01 */ li r3, 1 -/* 80959BB8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80959BBC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80959BC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80959BC4 7C 08 03 A6 */ mtlr r0 -/* 80959BC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80959BCC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setExpression__10daNpcAsh_cFif.s b/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setExpression__10daNpcAsh_cFif.s deleted file mode 100644 index 19617a1f83f..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setExpression__10daNpcAsh_cFif.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8095A6C0: -/* 8095A6C0 2C 04 00 00 */ cmpwi r4, 0 -/* 8095A6C4 4D 80 00 20 */ bltlr -/* 8095A6C8 2C 04 00 08 */ cmpwi r4, 8 -/* 8095A6CC 4C 80 00 20 */ bgelr -/* 8095A6D0 B0 83 09 DE */ sth r4, 0x9de(r3) -/* 8095A6D4 D0 23 09 74 */ stfs f1, 0x974(r3) -/* 8095A6D8 38 00 FF FF */ li r0, -1 -/* 8095A6DC B0 03 09 D8 */ sth r0, 0x9d8(r3) -/* 8095A6E0 38 00 00 00 */ li r0, 0 -/* 8095A6E4 B0 03 09 D6 */ sth r0, 0x9d6(r3) -/* 8095A6E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setMotion__10daNpcAsh_cFifi.s b/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setMotion__10daNpcAsh_cFifi.s deleted file mode 100644 index 252b6105ea0..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setMotion__10daNpcAsh_cFifi.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8095A67C: -/* 8095A67C 7C 86 07 34 */ extsh r6, r4 -/* 8095A680 2C 05 00 00 */ cmpwi r5, 0 -/* 8095A684 40 82 00 10 */ bne lbl_8095A694 -/* 8095A688 A8 03 09 E0 */ lha r0, 0x9e0(r3) -/* 8095A68C 7C 00 30 00 */ cmpw r0, r6 -/* 8095A690 4D 82 00 20 */ beqlr -lbl_8095A694: -/* 8095A694 2C 04 00 00 */ cmpwi r4, 0 -/* 8095A698 4D 80 00 20 */ bltlr -/* 8095A69C 2C 04 00 0A */ cmpwi r4, 0xa -/* 8095A6A0 4C 80 00 20 */ bgelr -/* 8095A6A4 B0 C3 09 E0 */ sth r6, 0x9e0(r3) -/* 8095A6A8 D0 23 09 7C */ stfs f1, 0x97c(r3) -/* 8095A6AC 38 00 FF FF */ li r0, -1 -/* 8095A6B0 B0 03 09 DC */ sth r0, 0x9dc(r3) -/* 8095A6B4 38 00 00 00 */ li r0, 0 -/* 8095A6B8 B0 03 09 DA */ sth r0, 0x9da(r3) -/* 8095A6BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/__dt__14daObjDigholl_cFv.s b/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/__dt__14daObjDigholl_cFv.s deleted file mode 100644 index 8533b6edfc6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/__dt__14daObjDigholl_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80BDC75C: -/* 80BDC75C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDC760 7C 08 02 A6 */ mflr r0 -/* 80BDC764 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDC768 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDC76C 93 C1 00 08 */ stw r30, 8(r1) -/* 80BDC770 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80BDC774 7C 9F 23 78 */ mr r31, r4 -/* 80BDC778 41 82 00 1C */ beq lbl_80BDC794 -/* 80BDC77C 38 80 00 00 */ li r4, 0 -/* 80BDC780 4B 43 C5 0D */ bl __dt__10fopAc_ac_cFv -/* 80BDC784 7F E0 07 35 */ extsh. r0, r31 -/* 80BDC788 40 81 00 0C */ ble lbl_80BDC794 -/* 80BDC78C 7F C3 F3 78 */ mr r3, r30 -/* 80BDC790 4B 6F 25 AD */ bl __dl__FPv -lbl_80BDC794: -/* 80BDC794 7F C3 F3 78 */ mr r3, r30 -/* 80BDC798 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDC79C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BDC7A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDC7A4 7C 08 03 A6 */ mtlr r0 -/* 80BDC7A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDC7AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/create__14daObjDigholl_cFv.s b/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/create__14daObjDigholl_cFv.s deleted file mode 100644 index 412a7d9b3a6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/create__14daObjDigholl_cFv.s +++ /dev/null @@ -1,78 +0,0 @@ -lbl_80BDC618: -/* 80BDC618 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDC61C 7C 08 02 A6 */ mflr r0 -/* 80BDC620 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDC624 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDC628 93 C1 00 08 */ stw r30, 8(r1) -/* 80BDC62C 7C 7E 1B 78 */ mr r30, r3 -/* 80BDC630 3C 80 80 BE */ lis r4, lit_3678@ha /* 0x80BDCB3C@ha */ -/* 80BDC634 3B E4 CB 3C */ addi r31, r4, lit_3678@l /* 0x80BDCB3C@l */ -/* 80BDC638 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80BDC63C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80BDC640 40 82 00 1C */ bne lbl_80BDC65C -/* 80BDC644 28 1E 00 00 */ cmplwi r30, 0 -/* 80BDC648 41 82 00 08 */ beq lbl_80BDC650 -/* 80BDC64C 4B 43 C5 19 */ bl __ct__10fopAc_ac_cFv -lbl_80BDC650: -/* 80BDC650 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80BDC654 60 00 00 08 */ ori r0, r0, 8 -/* 80BDC658 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80BDC65C: -/* 80BDC65C 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80BDC660 98 1E 05 69 */ stb r0, 0x569(r30) -/* 80BDC664 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80BDC668 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80BDC66C 98 1E 05 6A */ stb r0, 0x56a(r30) -/* 80BDC670 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80BDC674 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f -/* 80BDC678 B0 1E 05 6C */ sth r0, 0x56c(r30) -/* 80BDC67C A8 1E 05 6C */ lha r0, 0x56c(r30) -/* 80BDC680 2C 00 00 FF */ cmpwi r0, 0xff -/* 80BDC684 40 82 00 0C */ bne lbl_80BDC690 -/* 80BDC688 38 00 FF FF */ li r0, -1 -/* 80BDC68C B0 1E 05 6C */ sth r0, 0x56c(r30) -lbl_80BDC690: -/* 80BDC690 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDC694 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDC698 88 9E 05 69 */ lbz r4, 0x569(r30) -/* 80BDC69C 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80BDC6A0 7C 05 07 74 */ extsb r5, r0 -/* 80BDC6A4 4B 45 8C BD */ bl isSwitch__10dSv_info_cCFii -/* 80BDC6A8 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDC6AC 41 82 00 14 */ beq lbl_80BDC6C0 -/* 80BDC6B0 38 00 00 02 */ li r0, 2 -/* 80BDC6B4 98 1E 05 68 */ stb r0, 0x568(r30) -/* 80BDC6B8 38 00 00 01 */ li r0, 1 -/* 80BDC6BC 98 1E 05 6B */ stb r0, 0x56b(r30) -lbl_80BDC6C0: -/* 80BDC6C0 7F C3 F3 78 */ mr r3, r30 -/* 80BDC6C4 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80BDC6C8 C0 5F 00 04 */ lfs f2, 4(r31) -/* 80BDC6CC C0 7F 00 08 */ lfs f3, 8(r31) -/* 80BDC6D0 4B 43 DE 59 */ bl fopAcM_SetMin__FP10fopAc_ac_cfff -/* 80BDC6D4 7F C3 F3 78 */ mr r3, r30 -/* 80BDC6D8 C0 3F 00 0C */ lfs f1, 0xc(r31) -/* 80BDC6DC C0 5F 00 10 */ lfs f2, 0x10(r31) -/* 80BDC6E0 C0 7F 00 14 */ lfs f3, 0x14(r31) -/* 80BDC6E4 4B 43 DE 55 */ bl fopAcM_SetMax__FP10fopAc_ac_cfff -/* 80BDC6E8 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80BDC6EC D0 1E 05 50 */ stfs f0, 0x550(r30) -/* 80BDC6F0 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80BDC6F4 D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 80BDC6F8 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80BDC6FC D0 1E 05 58 */ stfs f0, 0x558(r30) -/* 80BDC700 C0 1E 05 50 */ lfs f0, 0x550(r30) -/* 80BDC704 D0 1E 05 38 */ stfs f0, 0x538(r30) -/* 80BDC708 C0 1E 05 54 */ lfs f0, 0x554(r30) -/* 80BDC70C D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 80BDC710 C0 1E 05 58 */ lfs f0, 0x558(r30) -/* 80BDC714 D0 1E 05 40 */ stfs f0, 0x540(r30) -/* 80BDC718 38 00 00 20 */ li r0, 0x20 -/* 80BDC71C 98 1E 05 4B */ stb r0, 0x54b(r30) -/* 80BDC720 38 60 00 04 */ li r3, 4 -/* 80BDC724 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDC728 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BDC72C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDC730 7C 08 03 A6 */ mtlr r0 -/* 80BDC734 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDC738 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Create__FP10fopAc_ac_c.s deleted file mode 100644 index c578d787b68..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BDC73C: -/* 80BDC73C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDC740 7C 08 02 A6 */ mflr r0 -/* 80BDC744 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDC748 4B FF FE D1 */ bl create__14daObjDigholl_cFv -/* 80BDC74C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDC750 7C 08 03 A6 */ mtlr r0 -/* 80BDC754 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDC758 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Delete__FP14daObjDigholl_c.s b/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Delete__FP14daObjDigholl_c.s deleted file mode 100644 index c8621080c5d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Delete__FP14daObjDigholl_c.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80BDC7B0: -/* 80BDC7B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDC7B4 7C 08 02 A6 */ mflr r0 -/* 80BDC7B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDC7BC 38 80 FF FF */ li r4, -1 -/* 80BDC7C0 4B FF FF 9D */ bl __dt__14daObjDigholl_cFv -/* 80BDC7C4 38 60 00 01 */ li r3, 1 -/* 80BDC7C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDC7CC 7C 08 03 A6 */ mtlr r0 -/* 80BDC7D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDC7D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Draw__FP14daObjDigholl_c.s b/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Draw__FP14daObjDigholl_c.s deleted file mode 100644 index 5d4afb0a3cc..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Draw__FP14daObjDigholl_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BDCB14: -/* 80BDCB14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDCB18 7C 08 02 A6 */ mflr r0 -/* 80BDCB1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDCB20 4B FF FF ED */ bl draw__14daObjDigholl_cFv -/* 80BDCB24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDCB28 7C 08 03 A6 */ mtlr r0 -/* 80BDCB2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDCB30 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Execute__FP14daObjDigholl_c.s b/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Execute__FP14daObjDigholl_c.s deleted file mode 100644 index 90c8fbbe850..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Execute__FP14daObjDigholl_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BDCAEC: -/* 80BDCAEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDCAF0 7C 08 02 A6 */ mflr r0 -/* 80BDCAF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDCAF8 4B FF FC E1 */ bl execute__14daObjDigholl_cFv -/* 80BDCAFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDCB00 7C 08 03 A6 */ mtlr r0 -/* 80BDCB04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDCB08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/execute__14daObjDigholl_cFv.s b/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/execute__14daObjDigholl_cFv.s deleted file mode 100644 index 77257d866e2..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/execute__14daObjDigholl_cFv.s +++ /dev/null @@ -1,215 +0,0 @@ -lbl_80BDC7D8: -/* 80BDC7D8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80BDC7DC 7C 08 02 A6 */ mflr r0 -/* 80BDC7E0 90 01 00 44 */ stw r0, 0x44(r1) -/* 80BDC7E4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80BDC7E8 4B 78 59 F5 */ bl _savegpr_29 -/* 80BDC7EC 7C 7D 1B 78 */ mr r29, r3 -/* 80BDC7F0 3C 60 80 BE */ lis r3, lit_3678@ha /* 0x80BDCB3C@ha */ -/* 80BDC7F4 3B E3 CB 3C */ addi r31, r3, lit_3678@l /* 0x80BDCB3C@l */ -/* 80BDC7F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDC7FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDC800 83 C3 5D B4 */ lwz r30, 0x5db4(r3) -/* 80BDC804 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 80BDC808 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80BDC80C 41 82 00 50 */ beq lbl_80BDC85C -/* 80BDC810 88 9D 05 6A */ lbz r4, 0x56a(r29) -/* 80BDC814 28 04 00 FF */ cmplwi r4, 0xff -/* 80BDC818 41 82 00 18 */ beq lbl_80BDC830 -/* 80BDC81C 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 80BDC820 7C 05 07 74 */ extsb r5, r0 -/* 80BDC824 4B 45 8B 3D */ bl isSwitch__10dSv_info_cCFii -/* 80BDC828 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDC82C 41 82 00 30 */ beq lbl_80BDC85C -lbl_80BDC830: -/* 80BDC830 C0 3D 04 D4 */ lfs f1, 0x4d4(r29) -/* 80BDC834 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80BDC838 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80BDC83C FC 00 02 10 */ fabs f0, f0 -/* 80BDC840 FC 20 00 18 */ frsp f1, f0 -/* 80BDC844 C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 80BDC848 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDC84C 40 80 00 10 */ bge lbl_80BDC85C -/* 80BDC850 38 00 00 80 */ li r0, 0x80 -/* 80BDC854 90 1D 05 5C */ stw r0, 0x55c(r29) -/* 80BDC858 48 00 00 0C */ b lbl_80BDC864 -lbl_80BDC85C: -/* 80BDC85C 38 00 00 00 */ li r0, 0 -/* 80BDC860 90 1D 05 5C */ stw r0, 0x55c(r29) -lbl_80BDC864: -/* 80BDC864 88 1D 05 68 */ lbz r0, 0x568(r29) -/* 80BDC868 28 00 00 01 */ cmplwi r0, 1 -/* 80BDC86C 40 82 00 9C */ bne lbl_80BDC908 -/* 80BDC870 A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 80BDC874 A8 9D 04 E6 */ lha r4, 0x4e6(r29) -/* 80BDC878 4B 69 45 AD */ bl cLib_distanceAngleS__Fss -/* 80BDC87C 2C 03 60 00 */ cmpwi r3, 0x6000 -/* 80BDC880 40 80 00 1C */ bge lbl_80BDC89C -/* 80BDC884 A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 80BDC888 3C 63 00 01 */ addis r3, r3, 1 -/* 80BDC88C 38 03 80 00 */ addi r0, r3, -32768 -/* 80BDC890 B0 1D 04 E6 */ sth r0, 0x4e6(r29) -/* 80BDC894 A8 1D 04 E6 */ lha r0, 0x4e6(r29) -/* 80BDC898 B0 1D 04 DE */ sth r0, 0x4de(r29) -lbl_80BDC89C: -/* 80BDC89C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDC8A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDC8A4 88 9D 05 69 */ lbz r4, 0x569(r29) -/* 80BDC8A8 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 80BDC8AC 7C 05 07 74 */ extsb r5, r0 -/* 80BDC8B0 4B 45 89 51 */ bl onSwitch__10dSv_info_cFii -/* 80BDC8B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDC8B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDC8BC 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 80BDC8C0 28 00 00 00 */ cmplwi r0, 0 -/* 80BDC8C4 41 82 00 30 */ beq lbl_80BDC8F4 -/* 80BDC8C8 7F C3 F3 78 */ mr r3, r30 -/* 80BDC8CC 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 80BDC8D0 81 8C 00 E4 */ lwz r12, 0xe4(r12) -/* 80BDC8D4 7D 89 03 A6 */ mtctr r12 -/* 80BDC8D8 4E 80 04 21 */ bctrl -/* 80BDC8DC C0 1F 00 1C */ lfs f0, 0x1c(r31) -/* 80BDC8E0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDC8E4 40 81 00 90 */ ble lbl_80BDC974 -/* 80BDC8E8 38 00 00 01 */ li r0, 1 -/* 80BDC8EC 98 1D 05 6B */ stb r0, 0x56b(r29) -/* 80BDC8F0 48 00 00 84 */ b lbl_80BDC974 -lbl_80BDC8F4: -/* 80BDC8F4 38 00 00 02 */ li r0, 2 -/* 80BDC8F8 98 1D 05 68 */ stb r0, 0x568(r29) -/* 80BDC8FC 38 00 00 01 */ li r0, 1 -/* 80BDC900 98 1D 05 6B */ stb r0, 0x56b(r29) -/* 80BDC904 48 00 00 70 */ b lbl_80BDC974 -lbl_80BDC908: -/* 80BDC908 C0 5E 04 D8 */ lfs f2, 0x4d8(r30) -/* 80BDC90C C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80BDC910 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80BDC914 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80BDC918 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80BDC91C D0 41 00 14 */ stfs f2, 0x14(r1) -/* 80BDC920 C0 5D 04 D8 */ lfs f2, 0x4d8(r29) -/* 80BDC924 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80BDC928 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80BDC92C D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80BDC930 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 80BDC934 38 61 00 0C */ addi r3, r1, 0xc -/* 80BDC938 38 81 00 18 */ addi r4, r1, 0x18 -/* 80BDC93C 4B 76 AA 61 */ bl PSVECSquareDistance -/* 80BDC940 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 80BDC944 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDC948 40 80 00 2C */ bge lbl_80BDC974 -/* 80BDC94C C0 3D 04 D4 */ lfs f1, 0x4d4(r29) -/* 80BDC950 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80BDC954 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80BDC958 FC 00 02 10 */ fabs f0, f0 -/* 80BDC95C FC 20 00 18 */ frsp f1, f0 -/* 80BDC960 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 80BDC964 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDC968 40 80 00 0C */ bge lbl_80BDC974 -/* 80BDC96C 38 7D 05 50 */ addi r3, r29, 0x550 -/* 80BDC970 4B 58 2B 81 */ bl setLookPos__9daPy_py_cFP4cXyz -lbl_80BDC974: -/* 80BDC974 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80BDC978 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80BDC97C 4B 76 AA 21 */ bl PSVECSquareDistance -/* 80BDC980 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80BDC984 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDC988 40 81 00 58 */ ble lbl_80BDC9E0 -/* 80BDC98C FC 00 08 34 */ frsqrte f0, f1 -/* 80BDC990 C8 9F 00 28 */ lfd f4, 0x28(r31) -/* 80BDC994 FC 44 00 32 */ fmul f2, f4, f0 -/* 80BDC998 C8 7F 00 30 */ lfd f3, 0x30(r31) -/* 80BDC99C FC 00 00 32 */ fmul f0, f0, f0 -/* 80BDC9A0 FC 01 00 32 */ fmul f0, f1, f0 -/* 80BDC9A4 FC 03 00 28 */ fsub f0, f3, f0 -/* 80BDC9A8 FC 02 00 32 */ fmul f0, f2, f0 -/* 80BDC9AC FC 44 00 32 */ fmul f2, f4, f0 -/* 80BDC9B0 FC 00 00 32 */ fmul f0, f0, f0 -/* 80BDC9B4 FC 01 00 32 */ fmul f0, f1, f0 -/* 80BDC9B8 FC 03 00 28 */ fsub f0, f3, f0 -/* 80BDC9BC FC 02 00 32 */ fmul f0, f2, f0 -/* 80BDC9C0 FC 44 00 32 */ fmul f2, f4, f0 -/* 80BDC9C4 FC 00 00 32 */ fmul f0, f0, f0 -/* 80BDC9C8 FC 01 00 32 */ fmul f0, f1, f0 -/* 80BDC9CC FC 03 00 28 */ fsub f0, f3, f0 -/* 80BDC9D0 FC 02 00 32 */ fmul f0, f2, f0 -/* 80BDC9D4 FC 21 00 32 */ fmul f1, f1, f0 -/* 80BDC9D8 FC 20 08 18 */ frsp f1, f1 -/* 80BDC9DC 48 00 00 88 */ b lbl_80BDCA64 -lbl_80BDC9E0: -/* 80BDC9E0 C8 1F 00 38 */ lfd f0, 0x38(r31) -/* 80BDC9E4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDC9E8 40 80 00 10 */ bge lbl_80BDC9F8 -/* 80BDC9EC 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80BDC9F0 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80BDC9F4 48 00 00 70 */ b lbl_80BDCA64 -lbl_80BDC9F8: -/* 80BDC9F8 D0 21 00 08 */ stfs f1, 8(r1) -/* 80BDC9FC 80 81 00 08 */ lwz r4, 8(r1) -/* 80BDCA00 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80BDCA04 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80BDCA08 7C 03 00 00 */ cmpw r3, r0 -/* 80BDCA0C 41 82 00 14 */ beq lbl_80BDCA20 -/* 80BDCA10 40 80 00 40 */ bge lbl_80BDCA50 -/* 80BDCA14 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDCA18 41 82 00 20 */ beq lbl_80BDCA38 -/* 80BDCA1C 48 00 00 34 */ b lbl_80BDCA50 -lbl_80BDCA20: -/* 80BDCA20 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80BDCA24 41 82 00 0C */ beq lbl_80BDCA30 -/* 80BDCA28 38 00 00 01 */ li r0, 1 -/* 80BDCA2C 48 00 00 28 */ b lbl_80BDCA54 -lbl_80BDCA30: -/* 80BDCA30 38 00 00 02 */ li r0, 2 -/* 80BDCA34 48 00 00 20 */ b lbl_80BDCA54 -lbl_80BDCA38: -/* 80BDCA38 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80BDCA3C 41 82 00 0C */ beq lbl_80BDCA48 -/* 80BDCA40 38 00 00 05 */ li r0, 5 -/* 80BDCA44 48 00 00 10 */ b lbl_80BDCA54 -lbl_80BDCA48: -/* 80BDCA48 38 00 00 03 */ li r0, 3 -/* 80BDCA4C 48 00 00 08 */ b lbl_80BDCA54 -lbl_80BDCA50: -/* 80BDCA50 38 00 00 04 */ li r0, 4 -lbl_80BDCA54: -/* 80BDCA54 2C 00 00 01 */ cmpwi r0, 1 -/* 80BDCA58 40 82 00 0C */ bne lbl_80BDCA64 -/* 80BDCA5C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80BDCA60 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80BDCA64: -/* 80BDCA64 C0 1F 00 40 */ lfs f0, 0x40(r31) -/* 80BDCA68 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDCA6C 40 80 00 64 */ bge lbl_80BDCAD0 -/* 80BDCA70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDCA74 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDCA78 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 80BDCA7C 38 80 07 0F */ li r4, 0x70f -/* 80BDCA80 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80BDCA84 38 C0 00 00 */ li r6, 0 -/* 80BDCA88 38 E0 00 FF */ li r7, 0xff -/* 80BDCA8C 3D 00 80 45 */ lis r8, g_whiteColor@ha /* 0x80450608@ha */ -/* 80BDCA90 39 08 06 08 */ addi r8, r8, g_whiteColor@l /* 0x80450608@l */ -/* 80BDCA94 7D 09 43 78 */ mr r9, r8 -/* 80BDCA98 39 40 00 00 */ li r10, 0 -/* 80BDCA9C C0 3F 00 04 */ lfs f1, 4(r31) -/* 80BDCAA0 4B 47 07 19 */ bl setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif -/* 80BDCAA4 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 80BDCAA8 38 80 07 3D */ li r4, 0x73d -/* 80BDCAAC 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80BDCAB0 38 C0 00 00 */ li r6, 0 -/* 80BDCAB4 38 E0 00 FF */ li r7, 0xff -/* 80BDCAB8 3D 00 80 45 */ lis r8, g_whiteColor@ha /* 0x80450608@ha */ -/* 80BDCABC 39 08 06 08 */ addi r8, r8, g_whiteColor@l /* 0x80450608@l */ -/* 80BDCAC0 7D 09 43 78 */ mr r9, r8 -/* 80BDCAC4 39 40 00 00 */ li r10, 0 -/* 80BDCAC8 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80BDCACC 4B 47 06 ED */ bl setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif -lbl_80BDCAD0: -/* 80BDCAD0 38 60 00 01 */ li r3, 1 -/* 80BDCAD4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80BDCAD8 4B 78 57 51 */ bl _restgpr_29 -/* 80BDCADC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80BDCAE0 7C 08 03 A6 */ mtlr r0 -/* 80BDCAE4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80BDCAE8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/CreateHeap__12daObjKJgjs_cFv.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/CreateHeap__12daObjKJgjs_cFv.s deleted file mode 100644 index 3a37f0c06b3..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/CreateHeap__12daObjKJgjs_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80C461E4: -/* 80C461E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C461E8 7C 08 02 A6 */ mflr r0 -/* 80C461EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C461F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C461F4 7C 7F 1B 78 */ mr r31, r3 -/* 80C461F8 3C 60 80 C4 */ lis r3, l_arcName@ha /* 0x80C4658C@ha */ -/* 80C461FC 38 63 65 8C */ addi r3, r3, l_arcName@l /* 0x80C4658C@l */ -/* 80C46200 80 63 00 00 */ lwz r3, 0(r3) -/* 80C46204 80 1F 06 0C */ lwz r0, 0x60c(r31) -/* 80C46208 54 00 10 3A */ slwi r0, r0, 2 -/* 80C4620C 3C 80 80 C4 */ lis r4, l_bmdidx@ha /* 0x80C4654C@ha */ -/* 80C46210 38 84 65 4C */ addi r4, r4, l_bmdidx@l /* 0x80C4654C@l */ -/* 80C46214 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80C46218 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C4621C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C46220 3C A5 00 02 */ addis r5, r5, 2 -/* 80C46224 38 C0 00 80 */ li r6, 0x80 -/* 80C46228 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80C4622C 4B 3F 60 C1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C46230 3C 80 00 08 */ lis r4, 8 -/* 80C46234 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C46238 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C4623C 4B 3C EA 19 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C46240 90 7F 06 08 */ stw r3, 0x608(r31) -/* 80C46244 80 7F 06 08 */ lwz r3, 0x608(r31) -/* 80C46248 30 03 FF FF */ addic r0, r3, -1 -/* 80C4624C 7C 60 19 10 */ subfe r3, r0, r3 -/* 80C46250 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C46254 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C46258 7C 08 03 A6 */ mtlr r0 -/* 80C4625C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C46260 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Create__12daObjKJgjs_cFv.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Create__12daObjKJgjs_cFv.s deleted file mode 100644 index 27c44814b4c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Create__12daObjKJgjs_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80C46264: -/* 80C46264 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C46268 7C 08 02 A6 */ mflr r0 -/* 80C4626C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C46270 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C46274 7C 7F 1B 78 */ mr r31, r3 -/* 80C46278 38 7F 05 D8 */ addi r3, r31, 0x5d8 -/* 80C4627C 90 7F 05 04 */ stw r3, 0x504(r31) -/* 80C46280 80 9F 06 08 */ lwz r4, 0x608(r31) -/* 80C46284 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C46288 4B 70 02 29 */ bl PSMTXCopy -/* 80C4628C 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C46290 88 03 00 91 */ lbz r0, 0x91(r3) -/* 80C46294 60 00 00 04 */ ori r0, r0, 4 -/* 80C46298 98 03 00 91 */ stb r0, 0x91(r3) -/* 80C4629C 80 1F 06 0C */ lwz r0, 0x60c(r31) -/* 80C462A0 2C 00 00 00 */ cmpwi r0, 0 -/* 80C462A4 40 82 00 2C */ bne lbl_80C462D0 -/* 80C462A8 7F E3 FB 78 */ mr r3, r31 -/* 80C462AC 3C 80 80 C4 */ lis r4, l_cull_box@ha /* 0x80C46554@ha */ -/* 80C462B0 C4 24 65 54 */ lfsu f1, l_cull_box@l(r4) /* 0x80C46554@l */ -/* 80C462B4 C0 44 00 04 */ lfs f2, 4(r4) -/* 80C462B8 C0 64 00 08 */ lfs f3, 8(r4) -/* 80C462BC C0 84 00 0C */ lfs f4, 0xc(r4) -/* 80C462C0 C0 A4 00 10 */ lfs f5, 0x10(r4) -/* 80C462C4 C0 C4 00 14 */ lfs f6, 0x14(r4) -/* 80C462C8 4B 3D 42 81 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80C462CC 48 00 00 2C */ b lbl_80C462F8 -lbl_80C462D0: -/* 80C462D0 7F E3 FB 78 */ mr r3, r31 -/* 80C462D4 3C 80 80 C4 */ lis r4, l_cull_box@ha /* 0x80C46554@ha */ -/* 80C462D8 38 84 65 54 */ addi r4, r4, l_cull_box@l /* 0x80C46554@l */ -/* 80C462DC C0 24 00 18 */ lfs f1, 0x18(r4) -/* 80C462E0 C0 44 00 1C */ lfs f2, 0x1c(r4) -/* 80C462E4 C0 64 00 20 */ lfs f3, 0x20(r4) -/* 80C462E8 C0 84 00 24 */ lfs f4, 0x24(r4) -/* 80C462EC C0 A4 00 28 */ lfs f5, 0x28(r4) -/* 80C462F0 C0 C4 00 2C */ lfs f6, 0x2c(r4) -/* 80C462F4 4B 3D 42 55 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -lbl_80C462F8: -/* 80C462F8 38 60 00 01 */ li r3, 1 -/* 80C462FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C46300 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C46304 7C 08 03 A6 */ mtlr r0 -/* 80C46308 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C4630C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Delete__12daObjKJgjs_cFv.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Delete__12daObjKJgjs_cFv.s deleted file mode 100644 index 634bc19cecb..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Delete__12daObjKJgjs_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80C463C4: -/* 80C463C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C463C8 7C 08 02 A6 */ mflr r0 -/* 80C463CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C463D0 28 03 00 00 */ cmplwi r3, 0 -/* 80C463D4 41 82 00 08 */ beq lbl_80C463DC -/* 80C463D8 38 63 05 A0 */ addi r3, r3, 0x5a0 -lbl_80C463DC: -/* 80C463DC 3C 80 80 C4 */ lis r4, l_arcName@ha /* 0x80C4658C@ha */ -/* 80C463E0 38 84 65 8C */ addi r4, r4, l_arcName@l /* 0x80C4658C@l */ -/* 80C463E4 80 84 00 00 */ lwz r4, 0(r4) -/* 80C463E8 4B 3E 6C 21 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C463EC 38 60 00 01 */ li r3, 1 -/* 80C463F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C463F4 7C 08 03 A6 */ mtlr r0 -/* 80C463F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C463FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Draw__12daObjKJgjs_cFv.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Draw__12daObjKJgjs_cFv.s deleted file mode 100644 index 849cd5c065c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Draw__12daObjKJgjs_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80C46320: -/* 80C46320 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C46324 7C 08 02 A6 */ mflr r0 -/* 80C46328 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C4632C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C46330 93 C1 00 08 */ stw r30, 8(r1) -/* 80C46334 7C 7E 1B 78 */ mr r30, r3 -/* 80C46338 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C4633C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C46340 38 80 00 10 */ li r4, 0x10 -/* 80C46344 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C46348 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80C4634C 4B 55 D4 79 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C46350 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C46354 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C46358 80 9E 06 08 */ lwz r4, 0x608(r30) -/* 80C4635C 80 84 00 04 */ lwz r4, 4(r4) -/* 80C46360 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80C46364 4B 55 EA 3D */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C46368 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C4636C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C46370 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C46374 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C46378 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C4637C 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C46380 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C46384 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C46388 80 7E 06 08 */ lwz r3, 0x608(r30) -/* 80C4638C 4B 3C 79 39 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C46390 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C46394 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C46398 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C4639C 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C463A0 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C463A4 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C463A8 38 60 00 01 */ li r3, 1 -/* 80C463AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C463B0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C463B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C463B8 7C 08 03 A6 */ mtlr r0 -/* 80C463BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C463C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Execute__12daObjKJgjs_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Execute__12daObjKJgjs_cFPPA3_A4_f.s deleted file mode 100644 index 84053fbdc5f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Execute__12daObjKJgjs_cFPPA3_A4_f.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80C46310: -/* 80C46310 38 03 05 A8 */ addi r0, r3, 0x5a8 -/* 80C46314 90 04 00 00 */ stw r0, 0(r4) -/* 80C46318 38 60 00 01 */ li r3, 1 -/* 80C4631C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/__dt__12daObjKJgjs_cFv.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/__dt__12daObjKJgjs_cFv.s deleted file mode 100644 index 6c16bac4fbf..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/__dt__12daObjKJgjs_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80C464CC: -/* 80C464CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C464D0 7C 08 02 A6 */ mflr r0 -/* 80C464D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C464D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C464DC 93 C1 00 08 */ stw r30, 8(r1) -/* 80C464E0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80C464E4 7C 9F 23 78 */ mr r31, r4 -/* 80C464E8 41 82 00 38 */ beq lbl_80C46520 -/* 80C464EC 3C 80 80 C4 */ lis r4, __vt__12daObjKJgjs_c@ha /* 0x80C465E0@ha */ -/* 80C464F0 38 04 65 E0 */ addi r0, r4, __vt__12daObjKJgjs_c@l /* 0x80C465E0@l */ -/* 80C464F4 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80C464F8 41 82 00 18 */ beq lbl_80C46510 -/* 80C464FC 3C 80 80 3B */ lis r4, __vt__16dBgS_MoveBgActor@ha /* 0x803AB9A0@ha */ -/* 80C46500 38 04 B9 A0 */ addi r0, r4, __vt__16dBgS_MoveBgActor@l /* 0x803AB9A0@l */ -/* 80C46504 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80C46508 38 80 00 00 */ li r4, 0 -/* 80C4650C 4B 3D 27 81 */ bl __dt__10fopAc_ac_cFv -lbl_80C46510: -/* 80C46510 7F E0 07 35 */ extsh. r0, r31 -/* 80C46514 40 81 00 0C */ ble lbl_80C46520 -/* 80C46518 7F C3 F3 78 */ mr r3, r30 -/* 80C4651C 4B 68 88 21 */ bl __dl__FPv -lbl_80C46520: -/* 80C46520 7F C3 F3 78 */ mr r3, r30 -/* 80C46524 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C46528 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C4652C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C46530 7C 08 03 A6 */ mtlr r0 -/* 80C46534 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C46538 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/create1st__12daObjKJgjs_cFv.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/create1st__12daObjKJgjs_cFv.s deleted file mode 100644 index ffb127abf74..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/create1st__12daObjKJgjs_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_80C46098: -/* 80C46098 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C4609C 7C 08 02 A6 */ mflr r0 -/* 80C460A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C460A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C460A8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C460AC 41 82 00 08 */ beq lbl_80C460B4 -/* 80C460B0 38 63 05 A0 */ addi r3, r3, 0x5a0 -lbl_80C460B4: -/* 80C460B4 3C 80 80 C4 */ lis r4, l_arcName@ha /* 0x80C4658C@ha */ -/* 80C460B8 38 84 65 8C */ addi r4, r4, l_arcName@l /* 0x80C4658C@l */ -/* 80C460BC 80 84 00 00 */ lwz r4, 0(r4) -/* 80C460C0 4B 3E 6D FD */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C460C4 7C 60 1B 78 */ mr r0, r3 -/* 80C460C8 2C 00 00 04 */ cmpwi r0, 4 -/* 80C460CC 40 82 00 88 */ bne lbl_80C46154 -/* 80C460D0 7F E3 FB 78 */ mr r3, r31 -/* 80C460D4 48 00 00 99 */ bl setMtx__12daObjKJgjs_cFv -/* 80C460D8 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C460DC 54 00 07 3E */ clrlwi r0, r0, 0x1c -/* 80C460E0 90 1F 06 0C */ stw r0, 0x60c(r31) -/* 80C460E4 80 1F 06 0C */ lwz r0, 0x60c(r31) -/* 80C460E8 2C 00 00 00 */ cmpwi r0, 0 -/* 80C460EC 40 80 00 10 */ bge lbl_80C460FC -/* 80C460F0 38 00 00 00 */ li r0, 0 -/* 80C460F4 90 1F 06 0C */ stw r0, 0x60c(r31) -/* 80C460F8 48 00 00 14 */ b lbl_80C4610C -lbl_80C460FC: -/* 80C460FC 2C 00 00 02 */ cmpwi r0, 2 -/* 80C46100 40 81 00 0C */ ble lbl_80C4610C -/* 80C46104 38 00 00 01 */ li r0, 1 -/* 80C46108 90 1F 06 0C */ stw r0, 0x60c(r31) -lbl_80C4610C: -/* 80C4610C 7F E3 FB 78 */ mr r3, r31 -/* 80C46110 3C 80 80 C4 */ lis r4, l_arcName@ha /* 0x80C4658C@ha */ -/* 80C46114 38 84 65 8C */ addi r4, r4, l_arcName@l /* 0x80C4658C@l */ -/* 80C46118 80 84 00 00 */ lwz r4, 0(r4) -/* 80C4611C 80 1F 06 0C */ lwz r0, 0x60c(r31) -/* 80C46120 54 00 10 3A */ slwi r0, r0, 2 -/* 80C46124 3C A0 80 C4 */ lis r5, l_dzbidx@ha /* 0x80C46544@ha */ -/* 80C46128 38 A5 65 44 */ addi r5, r5, l_dzbidx@l /* 0x80C46544@l */ -/* 80C4612C 7C A5 00 2E */ lwzx r5, r5, r0 -/* 80C46130 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80C46134 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80C46138 38 E0 47 F0 */ li r7, 0x47f0 -/* 80C4613C 39 1F 05 A8 */ addi r8, r31, 0x5a8 -/* 80C46140 4B 43 26 7D */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C46144 7C 60 1B 78 */ mr r0, r3 -/* 80C46148 2C 00 00 05 */ cmpwi r0, 5 -/* 80C4614C 40 82 00 08 */ bne lbl_80C46154 -/* 80C46150 48 00 00 08 */ b lbl_80C46158 -lbl_80C46154: -/* 80C46154 7C 03 03 78 */ mr r3, r0 -lbl_80C46158: -/* 80C46158 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C4615C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C46160 7C 08 03 A6 */ mtlr r0 -/* 80C46164 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C46168 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGDelete__FP12daObjKJgjs_c.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGDelete__FP12daObjKJgjs_c.s deleted file mode 100644 index f7a80b50cef..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGDelete__FP12daObjKJgjs_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C46460: -/* 80C46460 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C46464 7C 08 02 A6 */ mflr r0 -/* 80C46468 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C4646C 4B 43 24 71 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C46470 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C46474 7C 08 03 A6 */ mtlr r0 -/* 80C46478 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C4647C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGDraw__FP12daObjKJgjs_c.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGDraw__FP12daObjKJgjs_c.s deleted file mode 100644 index f5dd1737623..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGDraw__FP12daObjKJgjs_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C464A0: -/* 80C464A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C464A4 7C 08 02 A6 */ mflr r0 -/* 80C464A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C464AC 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C464B0 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C464B4 7D 89 03 A6 */ mtctr r12 -/* 80C464B8 4E 80 04 21 */ bctrl -/* 80C464BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C464C0 7C 08 03 A6 */ mtlr r0 -/* 80C464C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C464C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGExecute__FP12daObjKJgjs_c.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGExecute__FP12daObjKJgjs_c.s deleted file mode 100644 index 243db6a9d8b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGExecute__FP12daObjKJgjs_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C46480: -/* 80C46480 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C46484 7C 08 02 A6 */ mflr r0 -/* 80C46488 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C4648C 4B 43 24 C5 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C46490 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C46494 7C 08 03 A6 */ mtlr r0 -/* 80C46498 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C4649C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_create1st__FP12daObjKJgjs_c.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_create1st__FP12daObjKJgjs_c.s deleted file mode 100644 index 45cf3fe12dc..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_create1st__FP12daObjKJgjs_c.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80C46400: -/* 80C46400 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C46404 7C 08 02 A6 */ mflr r0 -/* 80C46408 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C4640C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C46410 7C 7F 1B 78 */ mr r31, r3 -/* 80C46414 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C46418 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C4641C 40 82 00 28 */ bne lbl_80C46444 -/* 80C46420 28 1F 00 00 */ cmplwi r31, 0 -/* 80C46424 41 82 00 14 */ beq lbl_80C46438 -/* 80C46428 4B 43 21 FD */ bl __ct__16dBgS_MoveBgActorFv -/* 80C4642C 3C 60 80 C4 */ lis r3, __vt__12daObjKJgjs_c@ha /* 0x80C465E0@ha */ -/* 80C46430 38 03 65 E0 */ addi r0, r3, __vt__12daObjKJgjs_c@l /* 0x80C465E0@l */ -/* 80C46434 90 1F 05 9C */ stw r0, 0x59c(r31) -lbl_80C46438: -/* 80C46438 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C4643C 60 00 00 08 */ ori r0, r0, 8 -/* 80C46440 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C46444: -/* 80C46444 7F E3 FB 78 */ mr r3, r31 -/* 80C46448 4B FF FC 51 */ bl create1st__12daObjKJgjs_cFv -/* 80C4644C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C46450 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C46454 7C 08 03 A6 */ mtlr r0 -/* 80C46458 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C4645C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/setMtx__12daObjKJgjs_cFv.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/setMtx__12daObjKJgjs_cFv.s deleted file mode 100644 index 3b23374e268..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/setMtx__12daObjKJgjs_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80C4616C: -/* 80C4616C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C46170 7C 08 02 A6 */ mflr r0 -/* 80C46174 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C46178 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C4617C 7C 7F 1B 78 */ mr r31, r3 -/* 80C46180 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C46184 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C46188 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C4618C C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C46190 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C46194 4B 70 07 55 */ bl PSMTXTrans -/* 80C46198 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C4619C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C461A0 A8 9F 04 DC */ lha r4, 0x4dc(r31) -/* 80C461A4 A8 BF 04 DE */ lha r5, 0x4de(r31) -/* 80C461A8 A8 DF 04 E0 */ lha r6, 0x4e0(r31) -/* 80C461AC 4B 3C 5F B9 */ bl mDoMtx_XYZrotM__FPA4_fsss -/* 80C461B0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C461B4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C461B8 38 9F 05 D8 */ addi r4, r31, 0x5d8 -/* 80C461BC 4B 70 02 F5 */ bl PSMTXCopy -/* 80C461C0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C461C4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C461C8 38 9F 05 A8 */ addi r4, r31, 0x5a8 -/* 80C461CC 4B 70 02 E5 */ bl PSMTXCopy -/* 80C461D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C461D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C461D8 7C 08 03 A6 */ mtlr r0 -/* 80C461DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C461E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate/executeDemoFilone2__13daTagTWGate_cFv.s b/asm/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate/executeDemoFilone2__13daTagTWGate_cFv.s deleted file mode 100644 index f845318444c..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate/executeDemoFilone2__13daTagTWGate_cFv.s +++ /dev/null @@ -1,122 +0,0 @@ -lbl_80D52BF0: -/* 80D52BF0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D52BF4 7C 08 02 A6 */ mflr r0 -/* 80D52BF8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D52BFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D52C00 4B 60 F5 D5 */ bl _savegpr_27 -/* 80D52C04 7C 7C 1B 78 */ mr r28, r3 -/* 80D52C08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D52C0C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D52C10 3B DF 4F F8 */ addi r30, r31, 0x4ff8 -/* 80D52C14 7F C3 F3 78 */ mr r3, r30 -/* 80D52C18 3C 80 80 D5 */ lis r4, l_myName@ha /* 0x80D55994@ha */ -/* 80D52C1C 38 84 59 94 */ addi r4, r4, l_myName@l /* 0x80D55994@l */ -/* 80D52C20 80 84 00 00 */ lwz r4, 0(r4) -/* 80D52C24 38 A0 00 00 */ li r5, 0 -/* 80D52C28 38 C0 00 00 */ li r6, 0 -/* 80D52C2C 4B 2F 4E F1 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80D52C30 7C 7D 1B 78 */ mr r29, r3 -/* 80D52C34 2C 1D FF FF */ cmpwi r29, -1 -/* 80D52C38 41 82 01 64 */ beq lbl_80D52D9C -/* 80D52C3C 7F C3 F3 78 */ mr r3, r30 -/* 80D52C40 7F A4 EB 78 */ mr r4, r29 -/* 80D52C44 4B 2F 53 19 */ bl getMyNowCutName__16dEvent_manager_cFi -/* 80D52C48 7C 7B 1B 78 */ mr r27, r3 -/* 80D52C4C 7F C3 F3 78 */ mr r3, r30 -/* 80D52C50 7F A4 EB 78 */ mr r4, r29 -/* 80D52C54 4B 2F 50 F9 */ bl getIsAddvance__16dEvent_manager_cFi -/* 80D52C58 2C 03 00 00 */ cmpwi r3, 0 -/* 80D52C5C 41 82 00 34 */ beq lbl_80D52C90 -/* 80D52C60 80 9B 00 00 */ lwz r4, 0(r27) -/* 80D52C64 3C 60 30 30 */ lis r3, 0x3030 /* 0x30303032@ha */ -/* 80D52C68 38 03 30 32 */ addi r0, r3, 0x3032 /* 0x30303032@l */ -/* 80D52C6C 7C 04 00 00 */ cmpw r4, r0 -/* 80D52C70 41 82 00 10 */ beq lbl_80D52C80 -/* 80D52C74 40 80 00 1C */ bge lbl_80D52C90 -/* 80D52C78 48 00 00 18 */ b lbl_80D52C90 -/* 80D52C7C 48 00 00 14 */ b lbl_80D52C90 -lbl_80D52C80: -/* 80D52C80 7F 83 E3 78 */ mr r3, r28 -/* 80D52C84 38 80 0B C1 */ li r4, 0xbc1 -/* 80D52C88 38 A0 00 00 */ li r5, 0 -/* 80D52C8C 48 00 23 A1 */ bl initTalk__13daTagTWGate_cFiPP10fopAc_ac_c -lbl_80D52C90: -/* 80D52C90 80 9B 00 00 */ lwz r4, 0(r27) -/* 80D52C94 3C 60 30 30 */ lis r3, 0x3030 /* 0x30303032@ha */ -/* 80D52C98 38 03 30 32 */ addi r0, r3, 0x3032 /* 0x30303032@l */ -/* 80D52C9C 7C 04 00 00 */ cmpw r4, r0 -/* 80D52CA0 41 82 00 34 */ beq lbl_80D52CD4 -/* 80D52CA4 40 80 00 14 */ bge lbl_80D52CB8 -/* 80D52CA8 38 03 30 31 */ addi r0, r3, 0x3031 -/* 80D52CAC 7C 04 00 00 */ cmpw r4, r0 -/* 80D52CB0 40 80 00 14 */ bge lbl_80D52CC4 -/* 80D52CB4 48 00 00 84 */ b lbl_80D52D38 -lbl_80D52CB8: -/* 80D52CB8 38 03 30 34 */ addi r0, r3, 0x3034 -/* 80D52CBC 7C 04 00 00 */ cmpw r4, r0 -/* 80D52CC0 40 80 00 78 */ bge lbl_80D52D38 -lbl_80D52CC4: -/* 80D52CC4 7F C3 F3 78 */ mr r3, r30 -/* 80D52CC8 7F A4 EB 78 */ mr r4, r29 -/* 80D52CCC 4B 2F 54 B1 */ bl cutEnd__16dEvent_manager_cFi -/* 80D52CD0 48 00 00 68 */ b lbl_80D52D38 -lbl_80D52CD4: -/* 80D52CD4 7F 83 E3 78 */ mr r3, r28 -/* 80D52CD8 38 80 00 00 */ li r4, 0 -/* 80D52CDC 38 A0 00 01 */ li r5, 1 -/* 80D52CE0 38 C0 00 00 */ li r6, 0 -/* 80D52CE4 48 00 23 85 */ bl talkProc__13daTagTWGate_cFPiiPP10fopAc_ac_c -/* 80D52CE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D52CEC 41 82 00 4C */ beq lbl_80D52D38 -/* 80D52CF0 A0 1C 05 C6 */ lhz r0, 0x5c6(r28) -/* 80D52CF4 7C 00 07 35 */ extsh. r0, r0 -/* 80D52CF8 40 82 00 34 */ bne lbl_80D52D2C -/* 80D52CFC 38 00 00 03 */ li r0, 3 -/* 80D52D00 90 1C 05 88 */ stw r0, 0x588(r28) -/* 80D52D04 80 1C 05 88 */ lwz r0, 0x588(r28) -/* 80D52D08 1C 80 00 18 */ mulli r4, r0, 0x18 -/* 80D52D0C 3C 60 80 D5 */ lis r3, ActionTable__13daTagTWGate_c@ha /* 0x80D55AD0@ha */ -/* 80D52D10 38 03 5A D0 */ addi r0, r3, ActionTable__13daTagTWGate_c@l /* 0x80D55AD0@l */ -/* 80D52D14 7C 00 22 14 */ add r0, r0, r4 -/* 80D52D18 90 1C 05 84 */ stw r0, 0x584(r28) -/* 80D52D1C 7F 83 E3 78 */ mr r3, r28 -/* 80D52D20 81 9C 05 84 */ lwz r12, 0x584(r28) -/* 80D52D24 4B 60 F3 61 */ bl __ptmf_scall -/* 80D52D28 60 00 00 00 */ nop -lbl_80D52D2C: -/* 80D52D2C 7F C3 F3 78 */ mr r3, r30 -/* 80D52D30 7F A4 EB 78 */ mr r4, r29 -/* 80D52D34 4B 2F 54 49 */ bl cutEnd__16dEvent_manager_cFi -lbl_80D52D38: -/* 80D52D38 A0 1C 00 F8 */ lhz r0, 0xf8(r28) -/* 80D52D3C 28 00 00 02 */ cmplwi r0, 2 -/* 80D52D40 40 82 00 5C */ bne lbl_80D52D9C -/* 80D52D44 A8 9C 05 DC */ lha r4, 0x5dc(r28) -/* 80D52D48 2C 04 FF FF */ cmpwi r4, -1 -/* 80D52D4C 41 82 00 50 */ beq lbl_80D52D9C -/* 80D52D50 7F C3 F3 78 */ mr r3, r30 -/* 80D52D54 4B 2F 4D 25 */ bl endCheck__16dEvent_manager_cFs -/* 80D52D58 2C 03 00 00 */ cmpwi r3, 0 -/* 80D52D5C 41 82 00 40 */ beq lbl_80D52D9C -/* 80D52D60 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 80D52D64 4B 2E F7 05 */ bl reset__14dEvt_control_cFv -/* 80D52D68 38 00 00 00 */ li r0, 0 -/* 80D52D6C 98 1C 05 E0 */ stb r0, 0x5e0(r28) -/* 80D52D70 90 1C 05 88 */ stw r0, 0x588(r28) -/* 80D52D74 80 1C 05 88 */ lwz r0, 0x588(r28) -/* 80D52D78 1C 80 00 18 */ mulli r4, r0, 0x18 -/* 80D52D7C 3C 60 80 D5 */ lis r3, ActionTable__13daTagTWGate_c@ha /* 0x80D55AD0@ha */ -/* 80D52D80 38 03 5A D0 */ addi r0, r3, ActionTable__13daTagTWGate_c@l /* 0x80D55AD0@l */ -/* 80D52D84 7C 00 22 14 */ add r0, r0, r4 -/* 80D52D88 90 1C 05 84 */ stw r0, 0x584(r28) -/* 80D52D8C 7F 83 E3 78 */ mr r3, r28 -/* 80D52D90 81 9C 05 84 */ lwz r12, 0x584(r28) -/* 80D52D94 4B 60 F2 F1 */ bl __ptmf_scall -/* 80D52D98 60 00 00 00 */ nop -lbl_80D52D9C: -/* 80D52D9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D52DA0 4B 60 F4 81 */ bl _restgpr_27 -/* 80D52DA4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D52DA8 7C 08 03 A6 */ mtlr r0 -/* 80D52DAC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D52DB0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/Execute__15daTag_EvtArea_cFv.s b/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/Execute__15daTag_EvtArea_cFv.s deleted file mode 100644 index c75e965dac6..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/Execute__15daTag_EvtArea_cFv.s +++ /dev/null @@ -1,95 +0,0 @@ -lbl_8048C730: -/* 8048C730 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8048C734 7C 08 02 A6 */ mflr r0 -/* 8048C738 90 01 00 24 */ stw r0, 0x24(r1) -/* 8048C73C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8048C740 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8048C744 7C 7F 1B 78 */ mr r31, r3 -/* 8048C748 88 03 04 BA */ lbz r0, 0x4ba(r3) -/* 8048C74C 7C 05 07 74 */ extsb r5, r0 -/* 8048C750 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8048C754 88 04 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ -/* 8048C758 7C 00 07 74 */ extsb r0, r0 -/* 8048C75C 7C 05 00 00 */ cmpw r5, r0 -/* 8048C760 40 82 01 18 */ bne lbl_8048C878 -/* 8048C764 48 00 01 39 */ bl isDelete__15daTag_EvtArea_cFv -/* 8048C768 2C 03 00 00 */ cmpwi r3, 0 -/* 8048C76C 41 82 00 14 */ beq lbl_8048C780 -/* 8048C770 7F E3 FB 78 */ mr r3, r31 -/* 8048C774 4B B8 D5 09 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 8048C778 38 60 00 01 */ li r3, 1 -/* 8048C77C 48 00 01 00 */ b lbl_8048C87C -lbl_8048C780: -/* 8048C780 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 8048C784 D0 1F 05 50 */ stfs f0, 0x550(r31) -/* 8048C788 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 8048C78C D0 1F 05 54 */ stfs f0, 0x554(r31) -/* 8048C790 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 8048C794 D0 1F 05 58 */ stfs f0, 0x558(r31) -/* 8048C798 A8 1F 04 E8 */ lha r0, 0x4e8(r31) -/* 8048C79C 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8048C7A0 38 03 FF 01 */ addi r0, r3, -255 -/* 8048C7A4 30 00 FF FF */ addic r0, r0, -1 -/* 8048C7A8 7C 00 01 10 */ subfe r0, r0, r0 -/* 8048C7AC 7C 60 00 78 */ andc r0, r3, r0 -/* 8048C7B0 2C 00 00 08 */ cmpwi r0, 8 -/* 8048C7B4 40 82 00 18 */ bne lbl_8048C7CC -/* 8048C7B8 C0 3F 05 54 */ lfs f1, 0x554(r31) -/* 8048C7BC 3C 60 80 49 */ lis r3, lit_3853@ha /* 0x8048CDD0@ha */ -/* 8048C7C0 C0 03 CD D0 */ lfs f0, lit_3853@l(r3) /* 0x8048CDD0@l */ -/* 8048C7C4 EC 01 00 2A */ fadds f0, f1, f0 -/* 8048C7C8 D0 1F 05 54 */ stfs f0, 0x554(r31) -lbl_8048C7CC: -/* 8048C7CC 38 00 00 00 */ li r0, 0 -/* 8048C7D0 98 1F 04 96 */ stb r0, 0x496(r31) -/* 8048C7D4 C0 1F 05 50 */ lfs f0, 0x550(r31) -/* 8048C7D8 D0 1F 05 38 */ stfs f0, 0x538(r31) -/* 8048C7DC C0 1F 05 54 */ lfs f0, 0x554(r31) -/* 8048C7E0 D0 1F 05 3C */ stfs f0, 0x53c(r31) -/* 8048C7E4 C0 1F 05 58 */ lfs f0, 0x558(r31) -/* 8048C7E8 D0 1F 05 40 */ stfs f0, 0x540(r31) -/* 8048C7EC A8 1F 04 E8 */ lha r0, 0x4e8(r31) -/* 8048C7F0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8048C7F4 38 03 FF 01 */ addi r0, r3, -255 -/* 8048C7F8 30 00 FF FF */ addic r0, r0, -1 -/* 8048C7FC 7C 00 01 10 */ subfe r0, r0, r0 -/* 8048C800 7C 60 00 78 */ andc r0, r3, r0 -/* 8048C804 2C 00 00 0F */ cmpwi r0, 0xf -/* 8048C808 40 82 00 60 */ bne lbl_8048C868 -/* 8048C80C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048C810 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048C814 80 7E 5D AC */ lwz r3, 0x5dac(r30) -/* 8048C818 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 8048C81C D0 01 00 08 */ stfs f0, 8(r1) -/* 8048C820 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 8048C824 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8048C828 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 8048C82C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8048C830 7F E3 FB 78 */ mr r3, r31 -/* 8048C834 38 81 00 08 */ addi r4, r1, 8 -/* 8048C838 48 00 04 D1 */ bl chkPointInArea__15daTag_EvtArea_cF4cXyz -/* 8048C83C 2C 03 00 00 */ cmpwi r3, 0 -/* 8048C840 41 82 00 28 */ beq lbl_8048C868 -/* 8048C844 80 7E 5D AC */ lwz r3, 0x5dac(r30) -/* 8048C848 C0 03 05 38 */ lfs f0, 0x538(r3) -/* 8048C84C D0 1F 05 38 */ stfs f0, 0x538(r31) -/* 8048C850 C0 03 05 3C */ lfs f0, 0x53c(r3) -/* 8048C854 D0 1F 05 3C */ stfs f0, 0x53c(r31) -/* 8048C858 C0 03 05 40 */ lfs f0, 0x540(r3) -/* 8048C85C D0 1F 05 40 */ stfs f0, 0x540(r31) -/* 8048C860 38 00 00 04 */ li r0, 4 -/* 8048C864 98 1F 04 96 */ stb r0, 0x496(r31) -lbl_8048C868: -/* 8048C868 38 00 00 00 */ li r0, 0 -/* 8048C86C 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 8048C870 38 60 00 01 */ li r3, 1 -/* 8048C874 48 00 00 08 */ b lbl_8048C87C -lbl_8048C878: -/* 8048C878 38 60 00 00 */ li r3, 0 -lbl_8048C87C: -/* 8048C87C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8048C880 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8048C884 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8048C888 7C 08 03 A6 */ mtlr r0 -/* 8048C88C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8048C890 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/__dt__15daTag_EvtArea_cFv.s b/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/__dt__15daTag_EvtArea_cFv.s deleted file mode 100644 index 7715cbb6a73..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/__dt__15daTag_EvtArea_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8048CD68: -/* 8048CD68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048CD6C 7C 08 02 A6 */ mflr r0 -/* 8048CD70 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048CD74 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048CD78 93 C1 00 08 */ stw r30, 8(r1) -/* 8048CD7C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8048CD80 7C 9F 23 78 */ mr r31, r4 -/* 8048CD84 41 82 00 28 */ beq lbl_8048CDAC -/* 8048CD88 3C 80 80 49 */ lis r4, __vt__15daTag_EvtArea_c@ha /* 0x8048CE98@ha */ -/* 8048CD8C 38 04 CE 98 */ addi r0, r4, __vt__15daTag_EvtArea_c@l /* 0x8048CE98@l */ -/* 8048CD90 90 1E 05 68 */ stw r0, 0x568(r30) -/* 8048CD94 38 80 00 00 */ li r4, 0 -/* 8048CD98 4B B8 BE F5 */ bl __dt__10fopAc_ac_cFv -/* 8048CD9C 7F E0 07 35 */ extsh. r0, r31 -/* 8048CDA0 40 81 00 0C */ ble lbl_8048CDAC -/* 8048CDA4 7F C3 F3 78 */ mr r3, r30 -/* 8048CDA8 4B E4 1F 95 */ bl __dl__FPv -lbl_8048CDAC: -/* 8048CDAC 7F C3 F3 78 */ mr r3, r30 -/* 8048CDB0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048CDB4 83 C1 00 08 */ lwz r30, 8(r1) -/* 8048CDB8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048CDBC 7C 08 03 A6 */ mtlr r0 -/* 8048CDC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048CDC4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/chkPointInArea__15daTag_EvtArea_cF4cXyz.s b/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/chkPointInArea__15daTag_EvtArea_cF4cXyz.s deleted file mode 100644 index 991467e74e6..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/chkPointInArea__15daTag_EvtArea_cF4cXyz.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8048CD08: -/* 8048CD08 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8048CD0C 7C 08 02 A6 */ mflr r0 -/* 8048CD10 90 01 00 34 */ stw r0, 0x34(r1) -/* 8048CD14 3C A0 80 49 */ lis r5, lit_3922@ha /* 0x8048CDE0@ha */ -/* 8048CD18 C0 25 CD E0 */ lfs f1, lit_3922@l(r5) /* 0x8048CDE0@l */ -/* 8048CD1C D0 21 00 20 */ stfs f1, 0x20(r1) -/* 8048CD20 D0 21 00 24 */ stfs f1, 0x24(r1) -/* 8048CD24 D0 21 00 28 */ stfs f1, 0x28(r1) -/* 8048CD28 C0 04 00 00 */ lfs f0, 0(r4) -/* 8048CD2C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8048CD30 C0 04 00 04 */ lfs f0, 4(r4) -/* 8048CD34 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8048CD38 C0 04 00 08 */ lfs f0, 8(r4) -/* 8048CD3C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8048CD40 D0 21 00 08 */ stfs f1, 8(r1) -/* 8048CD44 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 8048CD48 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8048CD4C 38 81 00 14 */ addi r4, r1, 0x14 -/* 8048CD50 38 A1 00 08 */ addi r5, r1, 8 -/* 8048CD54 4B FF FB F9 */ bl chkPointInArea__15daTag_EvtArea_cF4cXyz4cXyz -/* 8048CD58 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8048CD5C 7C 08 03 A6 */ mtlr r0 -/* 8048CD60 38 21 00 30 */ addi r1, r1, 0x30 -/* 8048CD64 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/chkPointInArea__15daTag_EvtArea_cF4cXyz4cXyz.s b/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/chkPointInArea__15daTag_EvtArea_cF4cXyz4cXyz.s deleted file mode 100644 index 34ab268e1cd..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/chkPointInArea__15daTag_EvtArea_cF4cXyz4cXyz.s +++ /dev/null @@ -1,217 +0,0 @@ -lbl_8048C94C: -/* 8048C94C 94 21 FF 20 */ stwu r1, -0xe0(r1) -/* 8048C950 7C 08 02 A6 */ mflr r0 -/* 8048C954 90 01 00 E4 */ stw r0, 0xe4(r1) -/* 8048C958 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8048C95C 4B ED 58 81 */ bl _savegpr_29 -/* 8048C960 7C 7D 1B 78 */ mr r29, r3 -/* 8048C964 7C 9E 23 78 */ mr r30, r4 -/* 8048C968 7C BF 2B 78 */ mr r31, r5 -/* 8048C96C 88 03 05 6C */ lbz r0, 0x56c(r3) -/* 8048C970 28 00 00 00 */ cmplwi r0, 0 -/* 8048C974 40 82 02 F0 */ bne lbl_8048CC64 -/* 8048C978 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 8048C97C 54 04 05 3E */ clrlwi r4, r0, 0x14 -/* 8048C980 28 04 0F FF */ cmplwi r4, 0xfff -/* 8048C984 38 60 FF FF */ li r3, -1 -/* 8048C988 41 82 00 08 */ beq lbl_8048C990 -/* 8048C98C 7C 83 23 78 */ mr r3, r4 -lbl_8048C990: -/* 8048C990 3C 03 00 01 */ addis r0, r3, 1 -/* 8048C994 28 00 FF FF */ cmplwi r0, 0xffff -/* 8048C998 41 82 00 20 */ beq lbl_8048C9B8 -/* 8048C99C 28 04 0F FF */ cmplwi r4, 0xfff -/* 8048C9A0 38 60 FF FF */ li r3, -1 -/* 8048C9A4 41 82 00 08 */ beq lbl_8048C9AC -/* 8048C9A8 7C 83 23 78 */ mr r3, r4 -lbl_8048C9AC: -/* 8048C9AC 4B CC 01 01 */ bl daNpcT_chkEvtBit__FUl -/* 8048C9B0 2C 03 00 00 */ cmpwi r3, 0 -/* 8048C9B4 40 82 00 64 */ bne lbl_8048CA18 -lbl_8048C9B8: -/* 8048C9B8 A8 1D 04 B4 */ lha r0, 0x4b4(r29) -/* 8048C9BC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8048C9C0 28 04 00 FF */ cmplwi r4, 0xff -/* 8048C9C4 41 82 00 20 */ beq lbl_8048C9E4 -/* 8048C9C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048C9CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048C9D0 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 8048C9D4 7C 05 07 74 */ extsb r5, r0 -/* 8048C9D8 4B BA 89 89 */ bl isSwitch__10dSv_info_cCFii -/* 8048C9DC 2C 03 00 00 */ cmpwi r3, 0 -/* 8048C9E0 40 82 00 38 */ bne lbl_8048CA18 -lbl_8048C9E4: -/* 8048C9E4 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 8048C9E8 54 00 05 3E */ clrlwi r0, r0, 0x14 -/* 8048C9EC 28 00 0F FF */ cmplwi r0, 0xfff -/* 8048C9F0 38 60 FF FF */ li r3, -1 -/* 8048C9F4 41 82 00 08 */ beq lbl_8048C9FC -/* 8048C9F8 7C 03 03 78 */ mr r3, r0 -lbl_8048C9FC: -/* 8048C9FC 3C 03 00 01 */ addis r0, r3, 1 -/* 8048CA00 28 00 FF FF */ cmplwi r0, 0xffff -/* 8048CA04 40 82 02 60 */ bne lbl_8048CC64 -/* 8048CA08 A8 1D 04 B4 */ lha r0, 0x4b4(r29) -/* 8048CA0C 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8048CA10 28 00 00 FF */ cmplwi r0, 0xff -/* 8048CA14 40 82 02 50 */ bne lbl_8048CC64 -lbl_8048CA18: -/* 8048CA18 38 61 00 5C */ addi r3, r1, 0x5c -/* 8048CA1C 38 9D 04 EC */ addi r4, r29, 0x4ec -/* 8048CA20 7F E5 FB 78 */ mr r5, r31 -/* 8048CA24 4B DD A0 C1 */ bl __pl__4cXyzCFRC3Vec -/* 8048CA28 C0 C1 00 5C */ lfs f6, 0x5c(r1) -/* 8048CA2C D0 C1 00 8C */ stfs f6, 0x8c(r1) -/* 8048CA30 C0 A1 00 60 */ lfs f5, 0x60(r1) -/* 8048CA34 D0 A1 00 90 */ stfs f5, 0x90(r1) -/* 8048CA38 C0 81 00 64 */ lfs f4, 0x64(r1) -/* 8048CA3C D0 81 00 94 */ stfs f4, 0x94(r1) -/* 8048CA40 A8 1D 04 E8 */ lha r0, 0x4e8(r29) -/* 8048CA44 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8048CA48 38 85 FF 01 */ addi r4, r5, -255 -/* 8048CA4C 30 04 FF FF */ addic r0, r4, -1 -/* 8048CA50 7C 00 01 10 */ subfe r0, r0, r0 -/* 8048CA54 7C A0 00 78 */ andc r0, r5, r0 -/* 8048CA58 2C 00 00 0F */ cmpwi r0, 0xf -/* 8048CA5C 41 82 00 18 */ beq lbl_8048CA74 -/* 8048CA60 30 04 FF FF */ addic r0, r4, -1 -/* 8048CA64 7C 00 01 10 */ subfe r0, r0, r0 -/* 8048CA68 7C A0 00 78 */ andc r0, r5, r0 -/* 8048CA6C 2C 00 00 10 */ cmpwi r0, 0x10 -/* 8048CA70 40 82 01 20 */ bne lbl_8048CB90 -lbl_8048CA74: -/* 8048CA74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048CA78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048CA7C 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 8048CA80 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 8048CA84 D0 01 00 74 */ stfs f0, 0x74(r1) -/* 8048CA88 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 8048CA8C D0 01 00 78 */ stfs f0, 0x78(r1) -/* 8048CA90 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 8048CA94 D0 01 00 7C */ stfs f0, 0x7c(r1) -/* 8048CA98 38 61 00 74 */ addi r3, r1, 0x74 -/* 8048CA9C 38 9D 04 A8 */ addi r4, r29, 0x4a8 -/* 8048CAA0 7C 65 1B 78 */ mr r5, r3 -/* 8048CAA4 4B EB A6 11 */ bl PSVECSubtract -/* 8048CAA8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8048CAAC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8048CAB0 A8 1D 04 DE */ lha r0, 0x4de(r29) -/* 8048CAB4 7C 00 00 D0 */ neg r0, r0 -/* 8048CAB8 7C 04 07 34 */ extsh r4, r0 -/* 8048CABC 4B B7 F9 21 */ bl mDoMtx_YrotS__FPA4_fs -/* 8048CAC0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8048CAC4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8048CAC8 38 81 00 74 */ addi r4, r1, 0x74 -/* 8048CACC 7C 85 23 78 */ mr r5, r4 -/* 8048CAD0 4B EB A2 9D */ bl PSMTXMultVec -/* 8048CAD4 C0 21 00 8C */ lfs f1, 0x8c(r1) -/* 8048CAD8 FC 00 08 50 */ fneg f0, f1 -/* 8048CADC D0 01 00 98 */ stfs f0, 0x98(r1) -/* 8048CAE0 C0 61 00 94 */ lfs f3, 0x94(r1) -/* 8048CAE4 FC 40 18 50 */ fneg f2, f3 -/* 8048CAE8 D0 41 00 A0 */ stfs f2, 0xa0(r1) -/* 8048CAEC D0 21 00 A4 */ stfs f1, 0xa4(r1) -/* 8048CAF0 D0 41 00 AC */ stfs f2, 0xac(r1) -/* 8048CAF4 D0 21 00 B0 */ stfs f1, 0xb0(r1) -/* 8048CAF8 D0 61 00 B8 */ stfs f3, 0xb8(r1) -/* 8048CAFC D0 01 00 BC */ stfs f0, 0xbc(r1) -/* 8048CB00 D0 61 00 C4 */ stfs f3, 0xc4(r1) -/* 8048CB04 FC 00 00 18 */ frsp f0, f0 -/* 8048CB08 C0 81 00 74 */ lfs f4, 0x74(r1) -/* 8048CB0C FC 00 20 40 */ fcmpo cr0, f0, f4 -/* 8048CB10 40 80 01 54 */ bge lbl_8048CC64 -/* 8048CB14 FC 00 10 18 */ frsp f0, f2 -/* 8048CB18 C0 41 00 7C */ lfs f2, 0x7c(r1) -/* 8048CB1C FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 8048CB20 40 80 01 44 */ bge lbl_8048CC64 -/* 8048CB24 FC 01 20 40 */ fcmpo cr0, f1, f4 -/* 8048CB28 40 81 01 3C */ ble lbl_8048CC64 -/* 8048CB2C FC 03 10 40 */ fcmpo cr0, f3, f2 -/* 8048CB30 40 81 01 34 */ ble lbl_8048CC64 -/* 8048CB34 38 61 00 50 */ addi r3, r1, 0x50 -/* 8048CB38 7F C4 F3 78 */ mr r4, r30 -/* 8048CB3C 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 8048CB40 4B DD 9F F5 */ bl __mi__4cXyzCFRC3Vec -/* 8048CB44 C0 01 00 50 */ lfs f0, 0x50(r1) -/* 8048CB48 D0 01 00 68 */ stfs f0, 0x68(r1) -/* 8048CB4C C0 21 00 54 */ lfs f1, 0x54(r1) -/* 8048CB50 D0 21 00 6C */ stfs f1, 0x6c(r1) -/* 8048CB54 C0 01 00 58 */ lfs f0, 0x58(r1) -/* 8048CB58 D0 01 00 70 */ stfs f0, 0x70(r1) -/* 8048CB5C FC 00 08 1E */ fctiwz f0, f1 -/* 8048CB60 D8 01 00 C8 */ stfd f0, 0xc8(r1) -/* 8048CB64 80 61 00 CC */ lwz r3, 0xcc(r1) -/* 8048CB68 2C 03 00 00 */ cmpwi r3, 0 -/* 8048CB6C 41 80 00 F8 */ blt lbl_8048CC64 -/* 8048CB70 C0 01 00 90 */ lfs f0, 0x90(r1) -/* 8048CB74 FC 00 00 1E */ fctiwz f0, f0 -/* 8048CB78 D8 01 00 C8 */ stfd f0, 0xc8(r1) -/* 8048CB7C 80 01 00 CC */ lwz r0, 0xcc(r1) -/* 8048CB80 7C 03 00 00 */ cmpw r3, r0 -/* 8048CB84 40 80 00 E0 */ bge lbl_8048CC64 -/* 8048CB88 38 60 00 01 */ li r3, 1 -/* 8048CB8C 48 00 00 DC */ b lbl_8048CC68 -lbl_8048CB90: -/* 8048CB90 C0 7D 04 D0 */ lfs f3, 0x4d0(r29) -/* 8048CB94 D0 61 00 80 */ stfs f3, 0x80(r1) -/* 8048CB98 C0 3D 04 D4 */ lfs f1, 0x4d4(r29) -/* 8048CB9C D0 21 00 84 */ stfs f1, 0x84(r1) -/* 8048CBA0 C0 5D 04 D8 */ lfs f2, 0x4d8(r29) -/* 8048CBA4 D0 41 00 88 */ stfs f2, 0x88(r1) -/* 8048CBA8 3C 60 80 49 */ lis r3, lit_4146@ha /* 0x8048CDE4@ha */ -/* 8048CBAC C0 03 CD E4 */ lfs f0, lit_4146@l(r3) /* 0x8048CDE4@l */ -/* 8048CBB0 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8048CBB4 D0 21 00 84 */ stfs f1, 0x84(r1) -/* 8048CBB8 30 04 FF FF */ addic r0, r4, -1 -/* 8048CBBC 7C 00 01 10 */ subfe r0, r0, r0 -/* 8048CBC0 7C A0 00 78 */ andc r0, r5, r0 -/* 8048CBC4 2C 00 00 15 */ cmpwi r0, 0x15 -/* 8048CBC8 40 82 00 50 */ bne lbl_8048CC18 -/* 8048CBCC C0 1E 00 00 */ lfs f0, 0(r30) -/* 8048CBD0 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 8048CBD4 C0 1E 00 04 */ lfs f0, 4(r30) -/* 8048CBD8 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 8048CBDC C0 1E 00 08 */ lfs f0, 8(r30) -/* 8048CBE0 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 8048CBE4 D0 61 00 38 */ stfs f3, 0x38(r1) -/* 8048CBE8 D0 21 00 3C */ stfs f1, 0x3c(r1) -/* 8048CBEC D0 41 00 40 */ stfs f2, 0x40(r1) -/* 8048CBF0 D0 C1 00 2C */ stfs f6, 0x2c(r1) -/* 8048CBF4 D0 A1 00 30 */ stfs f5, 0x30(r1) -/* 8048CBF8 D0 81 00 34 */ stfs f4, 0x34(r1) -/* 8048CBFC 38 61 00 44 */ addi r3, r1, 0x44 -/* 8048CC00 38 81 00 38 */ addi r4, r1, 0x38 -/* 8048CC04 38 A1 00 2C */ addi r5, r1, 0x2c -/* 8048CC08 A8 DD 04 E6 */ lha r6, 0x4e6(r29) -/* 8048CC0C 38 E0 00 00 */ li r7, 0 -/* 8048CC10 4B CB F7 75 */ bl daNpcT_chkPointInArea__F4cXyz4cXyz4cXyzsi -/* 8048CC14 48 00 00 54 */ b lbl_8048CC68 -lbl_8048CC18: -/* 8048CC18 C0 1E 00 00 */ lfs f0, 0(r30) -/* 8048CC1C D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8048CC20 C0 1E 00 04 */ lfs f0, 4(r30) -/* 8048CC24 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8048CC28 C0 1E 00 08 */ lfs f0, 8(r30) -/* 8048CC2C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8048CC30 D0 61 00 14 */ stfs f3, 0x14(r1) -/* 8048CC34 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 8048CC38 D0 41 00 1C */ stfs f2, 0x1c(r1) -/* 8048CC3C D0 C1 00 08 */ stfs f6, 8(r1) -/* 8048CC40 D0 A1 00 0C */ stfs f5, 0xc(r1) -/* 8048CC44 D0 81 00 10 */ stfs f4, 0x10(r1) -/* 8048CC48 38 61 00 20 */ addi r3, r1, 0x20 -/* 8048CC4C 38 81 00 14 */ addi r4, r1, 0x14 -/* 8048CC50 38 A1 00 08 */ addi r5, r1, 8 -/* 8048CC54 A8 DD 04 E6 */ lha r6, 0x4e6(r29) -/* 8048CC58 38 E0 00 01 */ li r7, 1 -/* 8048CC5C 4B CB F7 29 */ bl daNpcT_chkPointInArea__F4cXyz4cXyz4cXyzsi -/* 8048CC60 48 00 00 08 */ b lbl_8048CC68 -lbl_8048CC64: -/* 8048CC64 38 60 00 00 */ li r3, 0 -lbl_8048CC68: -/* 8048CC68 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8048CC6C 4B ED 55 BD */ bl _restgpr_29 -/* 8048CC70 80 01 00 E4 */ lwz r0, 0xe4(r1) -/* 8048CC74 7C 08 03 A6 */ mtlr r0 -/* 8048CC78 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8048CC7C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/create__15daTag_EvtArea_cFv.s b/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/create__15daTag_EvtArea_cFv.s deleted file mode 100644 index 52c7646eb52..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/create__15daTag_EvtArea_cFv.s +++ /dev/null @@ -1,154 +0,0 @@ -lbl_8048C4F8: -/* 8048C4F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048C4FC 7C 08 02 A6 */ mflr r0 -/* 8048C500 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048C504 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048C508 93 C1 00 08 */ stw r30, 8(r1) -/* 8048C50C 7C 7F 1B 78 */ mr r31, r3 -/* 8048C510 3C 80 80 49 */ lis r4, lit_3853@ha /* 0x8048CDD0@ha */ -/* 8048C514 3B C4 CD D0 */ addi r30, r4, lit_3853@l /* 0x8048CDD0@l */ -/* 8048C518 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8048C51C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8048C520 40 82 00 28 */ bne lbl_8048C548 -/* 8048C524 28 1F 00 00 */ cmplwi r31, 0 -/* 8048C528 41 82 00 14 */ beq lbl_8048C53C -/* 8048C52C 4B B8 C6 39 */ bl __ct__10fopAc_ac_cFv -/* 8048C530 3C 60 80 49 */ lis r3, __vt__15daTag_EvtArea_c@ha /* 0x8048CE98@ha */ -/* 8048C534 38 03 CE 98 */ addi r0, r3, __vt__15daTag_EvtArea_c@l /* 0x8048CE98@l */ -/* 8048C538 90 1F 05 68 */ stw r0, 0x568(r31) -lbl_8048C53C: -/* 8048C53C 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 8048C540 60 00 00 08 */ ori r0, r0, 8 -/* 8048C544 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_8048C548: -/* 8048C548 A8 1F 04 E8 */ lha r0, 0x4e8(r31) -/* 8048C54C 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8048C550 38 03 FF 01 */ addi r0, r3, -255 -/* 8048C554 30 00 FF FF */ addic r0, r0, -1 -/* 8048C558 7C 00 01 10 */ subfe r0, r0, r0 -/* 8048C55C 7C 60 00 78 */ andc r0, r3, r0 -/* 8048C560 28 00 00 17 */ cmplwi r0, 0x17 -/* 8048C564 41 81 01 60 */ bgt lbl_8048C6C4 -/* 8048C568 3C 60 80 49 */ lis r3, lit_3857@ha /* 0x8048CDE8@ha */ -/* 8048C56C 38 63 CD E8 */ addi r3, r3, lit_3857@l /* 0x8048CDE8@l */ -/* 8048C570 54 00 10 3A */ slwi r0, r0, 2 -/* 8048C574 7C 03 00 2E */ lwzx r0, r3, r0 -/* 8048C578 7C 09 03 A6 */ mtctr r0 -/* 8048C57C 4E 80 04 20 */ bctr -lbl_8048C580: -/* 8048C580 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 8048C584 C0 3E 00 00 */ lfs f1, 0(r30) -/* 8048C588 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C58C D0 1F 04 EC */ stfs f0, 0x4ec(r31) -/* 8048C590 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 8048C594 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C598 D0 1F 04 F0 */ stfs f0, 0x4f0(r31) -/* 8048C59C C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 8048C5A0 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C5A4 D0 1F 04 F4 */ stfs f0, 0x4f4(r31) -/* 8048C5A8 48 00 01 44 */ b lbl_8048C6EC -lbl_8048C5AC: -/* 8048C5AC C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 8048C5B0 C0 3E 00 04 */ lfs f1, 4(r30) -/* 8048C5B4 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C5B8 D0 1F 04 EC */ stfs f0, 0x4ec(r31) -/* 8048C5BC C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 8048C5C0 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C5C4 D0 1F 04 F0 */ stfs f0, 0x4f0(r31) -/* 8048C5C8 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 8048C5CC EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C5D0 D0 1F 04 F4 */ stfs f0, 0x4f4(r31) -/* 8048C5D4 48 00 01 18 */ b lbl_8048C6EC -lbl_8048C5D8: -/* 8048C5D8 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 8048C5DC C0 3E 00 00 */ lfs f1, 0(r30) -/* 8048C5E0 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C5E4 D0 1F 04 EC */ stfs f0, 0x4ec(r31) -/* 8048C5E8 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 8048C5EC EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C5F0 D0 1F 04 F0 */ stfs f0, 0x4f0(r31) -/* 8048C5F4 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 8048C5F8 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C5FC D0 1F 04 F4 */ stfs f0, 0x4f4(r31) -/* 8048C600 48 00 00 EC */ b lbl_8048C6EC -lbl_8048C604: -/* 8048C604 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 8048C608 C0 3E 00 08 */ lfs f1, 8(r30) -/* 8048C60C EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C610 D0 1F 04 EC */ stfs f0, 0x4ec(r31) -/* 8048C614 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 8048C618 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C61C D0 1F 04 F4 */ stfs f0, 0x4f4(r31) -/* 8048C620 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 8048C624 C0 3E 00 0C */ lfs f1, 0xc(r30) -/* 8048C628 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C62C D0 1F 04 EC */ stfs f0, 0x4ec(r31) -/* 8048C630 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 8048C634 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C638 D0 1F 04 F0 */ stfs f0, 0x4f0(r31) -/* 8048C63C C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 8048C640 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C644 D0 1F 04 F4 */ stfs f0, 0x4f4(r31) -/* 8048C648 48 00 00 A4 */ b lbl_8048C6EC -lbl_8048C64C: -/* 8048C64C C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 8048C650 C0 3E 00 00 */ lfs f1, 0(r30) -/* 8048C654 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C658 D0 1F 04 EC */ stfs f0, 0x4ec(r31) -/* 8048C65C C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 8048C660 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C664 D0 1F 04 F0 */ stfs f0, 0x4f0(r31) -/* 8048C668 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 8048C66C EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C670 D0 1F 04 F4 */ stfs f0, 0x4f4(r31) -/* 8048C674 48 00 00 78 */ b lbl_8048C6EC -lbl_8048C678: -/* 8048C678 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 8048C67C C0 3E 00 0C */ lfs f1, 0xc(r30) -/* 8048C680 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C684 D0 1F 04 EC */ stfs f0, 0x4ec(r31) -/* 8048C688 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 8048C68C EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C690 D0 1F 04 F4 */ stfs f0, 0x4f4(r31) -/* 8048C694 48 00 00 58 */ b lbl_8048C6EC -lbl_8048C698: -/* 8048C698 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 8048C69C C0 3E 00 00 */ lfs f1, 0(r30) -/* 8048C6A0 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C6A4 D0 1F 04 EC */ stfs f0, 0x4ec(r31) -/* 8048C6A8 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 8048C6AC EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C6B0 D0 1F 04 F0 */ stfs f0, 0x4f0(r31) -/* 8048C6B4 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 8048C6B8 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C6BC D0 1F 04 F4 */ stfs f0, 0x4f4(r31) -/* 8048C6C0 48 00 00 2C */ b lbl_8048C6EC -lbl_8048C6C4: -/* 8048C6C4 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 8048C6C8 C0 3E 00 00 */ lfs f1, 0(r30) -/* 8048C6CC EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C6D0 D0 1F 04 EC */ stfs f0, 0x4ec(r31) -/* 8048C6D4 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 8048C6D8 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C6DC D0 1F 04 F0 */ stfs f0, 0x4f0(r31) -/* 8048C6E0 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 8048C6E4 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048C6E8 D0 1F 04 F4 */ stfs f0, 0x4f4(r31) -lbl_8048C6EC: -/* 8048C6EC 7F E3 FB 78 */ mr r3, r31 -/* 8048C6F0 48 00 01 AD */ bl isDelete__15daTag_EvtArea_cFv -/* 8048C6F4 2C 03 00 00 */ cmpwi r3, 0 -/* 8048C6F8 41 82 00 0C */ beq lbl_8048C704 -/* 8048C6FC 38 60 00 05 */ li r3, 5 -/* 8048C700 48 00 00 10 */ b lbl_8048C710 -lbl_8048C704: -/* 8048C704 38 00 00 00 */ li r0, 0 -/* 8048C708 98 1F 05 6C */ stb r0, 0x56c(r31) -/* 8048C70C 38 60 00 04 */ li r3, 4 -lbl_8048C710: -/* 8048C710 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048C714 83 C1 00 08 */ lwz r30, 8(r1) -/* 8048C718 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048C71C 7C 08 03 A6 */ mtlr r0 -/* 8048C720 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048C724 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Create__FPv.s b/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Create__FPv.s deleted file mode 100644 index 1694802d984..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Create__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048CC80: -/* 8048CC80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048CC84 7C 08 02 A6 */ mflr r0 -/* 8048CC88 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048CC8C 4B FF F8 6D */ bl create__15daTag_EvtArea_cFv -/* 8048CC90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048CC94 7C 08 03 A6 */ mtlr r0 -/* 8048CC98 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048CC9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Delete__FPv.s b/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Delete__FPv.s deleted file mode 100644 index bd6b48d858d..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Delete__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048CCA0: -/* 8048CCA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048CCA4 7C 08 02 A6 */ mflr r0 -/* 8048CCA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048CCAC 4B FF FA 7D */ bl Delete__15daTag_EvtArea_cFv -/* 8048CCB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048CCB4 7C 08 03 A6 */ mtlr r0 -/* 8048CCB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048CCBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Draw__FPv.s b/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Draw__FPv.s deleted file mode 100644 index 408d01ecaef..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Draw__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048CCE0: -/* 8048CCE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048CCE4 7C 08 02 A6 */ mflr r0 -/* 8048CCE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048CCEC 4B FF FB A9 */ bl Draw__15daTag_EvtArea_cFv -/* 8048CCF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048CCF4 7C 08 03 A6 */ mtlr r0 -/* 8048CCF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048CCFC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Execute__FPv.s b/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Execute__FPv.s deleted file mode 100644 index 3df35c4331a..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Execute__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048CCC0: -/* 8048CCC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048CCC4 7C 08 02 A6 */ mflr r0 -/* 8048CCC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048CCCC 4B FF FA 65 */ bl Execute__15daTag_EvtArea_cFv -/* 8048CCD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048CCD4 7C 08 03 A6 */ mtlr r0 -/* 8048CCD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048CCDC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/isDelete__15daTag_EvtArea_cFv.s b/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/isDelete__15daTag_EvtArea_cFv.s deleted file mode 100644 index 70149fc8904..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/isDelete__15daTag_EvtArea_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_8048C89C: -/* 8048C89C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048C8A0 7C 08 02 A6 */ mflr r0 -/* 8048C8A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048C8A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048C8AC 93 C1 00 08 */ stw r30, 8(r1) -/* 8048C8B0 7C 7E 1B 78 */ mr r30, r3 -/* 8048C8B4 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8048C8B8 54 04 A5 3E */ rlwinm r4, r0, 0x14, 0x14, 0x1f -/* 8048C8BC 28 04 0F FF */ cmplwi r4, 0xfff -/* 8048C8C0 38 60 FF FF */ li r3, -1 -/* 8048C8C4 41 82 00 08 */ beq lbl_8048C8CC -/* 8048C8C8 7C 83 23 78 */ mr r3, r4 -lbl_8048C8CC: -/* 8048C8CC 3C 03 00 01 */ addis r0, r3, 1 -/* 8048C8D0 28 00 FF FF */ cmplwi r0, 0xffff -/* 8048C8D4 41 82 00 28 */ beq lbl_8048C8FC -/* 8048C8D8 28 04 0F FF */ cmplwi r4, 0xfff -/* 8048C8DC 38 60 FF FF */ li r3, -1 -/* 8048C8E0 41 82 00 08 */ beq lbl_8048C8E8 -/* 8048C8E4 7C 83 23 78 */ mr r3, r4 -lbl_8048C8E8: -/* 8048C8E8 4B CC 01 C5 */ bl daNpcT_chkEvtBit__FUl -/* 8048C8EC 2C 03 00 00 */ cmpwi r3, 0 -/* 8048C8F0 41 82 00 0C */ beq lbl_8048C8FC -/* 8048C8F4 38 60 00 01 */ li r3, 1 -/* 8048C8F8 48 00 00 3C */ b lbl_8048C934 -lbl_8048C8FC: -/* 8048C8FC 3B E0 00 00 */ li r31, 0 -/* 8048C900 A8 1E 04 B4 */ lha r0, 0x4b4(r30) -/* 8048C904 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 8048C908 28 04 00 FF */ cmplwi r4, 0xff -/* 8048C90C 41 82 00 24 */ beq lbl_8048C930 -/* 8048C910 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048C914 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048C918 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 8048C91C 7C 05 07 74 */ extsb r5, r0 -/* 8048C920 4B BA 8A 41 */ bl isSwitch__10dSv_info_cCFii -/* 8048C924 2C 03 00 00 */ cmpwi r3, 0 -/* 8048C928 41 82 00 08 */ beq lbl_8048C930 -/* 8048C92C 3B E0 00 01 */ li r31, 1 -lbl_8048C930: -/* 8048C930 57 E3 06 3E */ clrlwi r3, r31, 0x18 -lbl_8048C934: -/* 8048C934 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048C938 83 C1 00 08 */ lwz r30, 8(r1) -/* 8048C93C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048C940 7C 08 03 A6 */ mtlr r0 -/* 8048C944 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048C948 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/__dt__13daTagWljump_cFv.s b/asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/__dt__13daTagWljump_cFv.s deleted file mode 100644 index 6ce0e10a2fe..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/__dt__13daTagWljump_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80D65004: -/* 80D65004 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D65008 7C 08 02 A6 */ mflr r0 -/* 80D6500C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D65010 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D65014 93 C1 00 08 */ stw r30, 8(r1) -/* 80D65018 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80D6501C 7C 9F 23 78 */ mr r31, r4 -/* 80D65020 41 82 00 2C */ beq lbl_80D6504C -/* 80D65024 38 7E 05 78 */ addi r3, r30, 0x578 -/* 80D65028 38 80 FF FF */ li r4, -1 -/* 80D6502C 4B 4E 4F 1D */ bl __dt__10dMsgFlow_cFv -/* 80D65030 7F C3 F3 78 */ mr r3, r30 -/* 80D65034 38 80 00 00 */ li r4, 0 -/* 80D65038 4B 2B 3C 55 */ bl __dt__10fopAc_ac_cFv -/* 80D6503C 7F E0 07 35 */ extsh. r0, r31 -/* 80D65040 40 81 00 0C */ ble lbl_80D6504C -/* 80D65044 7F C3 F3 78 */ mr r3, r30 -/* 80D65048 4B 56 9C F5 */ bl __dl__FPv -lbl_80D6504C: -/* 80D6504C 7F C3 F3 78 */ mr r3, r30 -/* 80D65050 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D65054 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D65058 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D6505C 7C 08 03 A6 */ mtlr r0 -/* 80D65060 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D65064 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/create__13daTagWljump_cFv.s b/asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/create__13daTagWljump_cFv.s deleted file mode 100644 index 2ad616cea21..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/create__13daTagWljump_cFv.s +++ /dev/null @@ -1,84 +0,0 @@ -lbl_80D64EB8: -/* 80D64EB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D64EBC 7C 08 02 A6 */ mflr r0 -/* 80D64EC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D64EC4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D64EC8 93 C1 00 08 */ stw r30, 8(r1) -/* 80D64ECC 7C 7F 1B 78 */ mr r31, r3 -/* 80D64ED0 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D64ED4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D64ED8 40 82 00 28 */ bne lbl_80D64F00 -/* 80D64EDC 7F E0 FB 79 */ or. r0, r31, r31 -/* 80D64EE0 41 82 00 14 */ beq lbl_80D64EF4 -/* 80D64EE4 7C 1E 03 78 */ mr r30, r0 -/* 80D64EE8 4B 2B 3C 7D */ bl __ct__10fopAc_ac_cFv -/* 80D64EEC 38 7E 05 78 */ addi r3, r30, 0x578 -/* 80D64EF0 4B 4E 50 11 */ bl __ct__10dMsgFlow_cFv -lbl_80D64EF4: -/* 80D64EF4 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80D64EF8 60 00 00 08 */ ori r0, r0, 8 -/* 80D64EFC 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80D64F00: -/* 80D64F00 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D64F04 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80D64F08 98 1F 05 71 */ stb r0, 0x571(r31) -/* 80D64F0C 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D64F10 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80D64F14 2C 03 00 FF */ cmpwi r3, 0xff -/* 80D64F18 40 82 00 0C */ bne lbl_80D64F24 -/* 80D64F1C 38 60 00 05 */ li r3, 5 -/* 80D64F20 48 00 00 AC */ b lbl_80D64FCC -lbl_80D64F24: -/* 80D64F24 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80D64F28 7C 04 07 74 */ extsb r4, r0 -/* 80D64F2C 4B 2E C8 C1 */ bl dPath_GetRoomPath__Fii -/* 80D64F30 90 7F 05 C4 */ stw r3, 0x5c4(r31) -/* 80D64F34 80 7F 05 C4 */ lwz r3, 0x5c4(r31) -/* 80D64F38 28 03 00 00 */ cmplwi r3, 0 -/* 80D64F3C 41 82 00 10 */ beq lbl_80D64F4C -/* 80D64F40 A0 03 00 00 */ lhz r0, 0(r3) -/* 80D64F44 28 00 00 02 */ cmplwi r0, 2 -/* 80D64F48 40 80 00 0C */ bge lbl_80D64F54 -lbl_80D64F4C: -/* 80D64F4C 38 60 00 05 */ li r3, 5 -/* 80D64F50 48 00 00 7C */ b lbl_80D64FCC -lbl_80D64F54: -/* 80D64F54 38 00 00 32 */ li r0, 0x32 -/* 80D64F58 98 1F 05 44 */ stb r0, 0x544(r31) -/* 80D64F5C 98 1F 05 4B */ stb r0, 0x54b(r31) -/* 80D64F60 38 60 00 00 */ li r3, 0 -/* 80D64F64 B0 7F 04 E8 */ sth r3, 0x4e8(r31) -/* 80D64F68 38 00 FF FF */ li r0, -1 -/* 80D64F6C 98 1F 05 68 */ stb r0, 0x568(r31) -/* 80D64F70 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D64F74 54 00 87 3E */ rlwinm r0, r0, 0x10, 0x1c, 0x1f -/* 80D64F78 98 1F 05 6C */ stb r0, 0x56c(r31) -/* 80D64F7C 88 1F 05 6C */ lbz r0, 0x56c(r31) -/* 80D64F80 28 00 00 01 */ cmplwi r0, 1 -/* 80D64F84 41 82 00 08 */ beq lbl_80D64F8C -/* 80D64F88 98 7F 05 6C */ stb r3, 0x56c(r31) -lbl_80D64F8C: -/* 80D64F8C 88 1F 05 6C */ lbz r0, 0x56c(r31) -/* 80D64F90 28 00 00 00 */ cmplwi r0, 0 -/* 80D64F94 40 82 00 34 */ bne lbl_80D64FC8 -/* 80D64F98 88 9F 05 71 */ lbz r4, 0x571(r31) -/* 80D64F9C 28 04 00 FF */ cmplwi r4, 0xff -/* 80D64FA0 41 82 00 28 */ beq lbl_80D64FC8 -/* 80D64FA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D64FA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D64FAC 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80D64FB0 7C 05 07 74 */ extsb r5, r0 -/* 80D64FB4 4B 2D 03 AD */ bl isSwitch__10dSv_info_cCFii -/* 80D64FB8 2C 03 00 00 */ cmpwi r3, 0 -/* 80D64FBC 40 82 00 0C */ bne lbl_80D64FC8 -/* 80D64FC0 38 00 00 01 */ li r0, 1 -/* 80D64FC4 98 1F 05 73 */ stb r0, 0x573(r31) -lbl_80D64FC8: -/* 80D64FC8 38 60 00 04 */ li r3, 4 -lbl_80D64FCC: -/* 80D64FCC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D64FD0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D64FD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D64FD8 7C 08 03 A6 */ mtlr r0 -/* 80D64FDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D64FE0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/daTagWljump_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/daTagWljump_Create__FP10fopAc_ac_c.s deleted file mode 100644 index fb6a2159492..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/daTagWljump_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D64FE4: -/* 80D64FE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D64FE8 7C 08 02 A6 */ mflr r0 -/* 80D64FEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D64FF0 4B FF FE C9 */ bl create__13daTagWljump_cFv -/* 80D64FF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D64FF8 7C 08 03 A6 */ mtlr r0 -/* 80D64FFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D65000 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/daTagWljump_Delete__FP13daTagWljump_c.s b/asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/daTagWljump_Delete__FP13daTagWljump_c.s deleted file mode 100644 index 6d604c5e6a8..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/daTagWljump_Delete__FP13daTagWljump_c.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80D65068: -/* 80D65068 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D6506C 7C 08 02 A6 */ mflr r0 -/* 80D65070 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D65074 38 80 FF FF */ li r4, -1 -/* 80D65078 4B FF FF 8D */ bl __dt__13daTagWljump_cFv -/* 80D6507C 38 60 00 01 */ li r3, 1 -/* 80D65080 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D65084 7C 08 03 A6 */ mtlr r0 -/* 80D65088 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D6508C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/daTagWljump_Draw__FP13daTagWljump_c.s b/asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/daTagWljump_Draw__FP13daTagWljump_c.s deleted file mode 100644 index 0455a883fa6..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/daTagWljump_Draw__FP13daTagWljump_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D658A4: -/* 80D658A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D658A8 7C 08 02 A6 */ mflr r0 -/* 80D658AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D658B0 4B FF FF ED */ bl draw__13daTagWljump_cFv -/* 80D658B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D658B8 7C 08 03 A6 */ mtlr r0 -/* 80D658BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D658C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/daTagWljump_Execute__FP13daTagWljump_c.s b/asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/daTagWljump_Execute__FP13daTagWljump_c.s deleted file mode 100644 index cf546a30478..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/daTagWljump_Execute__FP13daTagWljump_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D6587C: -/* 80D6587C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D65880 7C 08 02 A6 */ mflr r0 -/* 80D65884 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D65888 4B FF F8 09 */ bl execute__13daTagWljump_cFv -/* 80D6588C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D65890 7C 08 03 A6 */ mtlr r0 -/* 80D65894 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D65898 4E 80 00 20 */ blr diff --git a/diff_settings.py b/diff_settings.py index 986d3639456..c7971cb6bef 100644 --- a/diff_settings.py +++ b/diff_settings.py @@ -15,6 +15,6 @@ def apply(config, args): ] if args.show_source: config['makeflags'].append('DEBUG=1') - config['source_directories'] = ['src', 'libs', 'include'] + config['source_directories'] = ['src', 'libs', 'include', 'rel'] config['arch'] = 'ppc' config['objdump_executable'] = f"{os.environ['DEVKITPPC']}/bin/powerpc-eabi-objdump" diff --git a/include/JSystem/J2DGraph/J2DAnmLoader.h b/include/JSystem/J2DGraph/J2DAnmLoader.h index 19b86425589..5b1257b9254 100644 --- a/include/JSystem/J2DGraph/J2DAnmLoader.h +++ b/include/JSystem/J2DGraph/J2DAnmLoader.h @@ -5,7 +5,7 @@ #include "dolphin/types.h" struct J2DAnmLoaderDataBase { - /* 80308A6C */ static void* load(void const*); + /* 80308A6C */ static J2DAnmBase* load(void const*); }; class J2DAnmLoader { diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h index b87b1f0d0aa..ebef351f8b6 100644 --- a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h +++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h @@ -9,8 +9,8 @@ typedef struct _GXColorS10 GXColorS10; class J3DMatColorAnm { public: - /* 8003B2B8 */ ~J3DMatColorAnm(); - /* 8003B2F4 */ J3DMatColorAnm(); + /* 8003B2B8 */ ~J3DMatColorAnm() {}; + /* 8003B2F4 */ J3DMatColorAnm() {}; void operator=(J3DMatColorAnm const& other) { mAnmColor = other.mAnmColor; @@ -30,9 +30,9 @@ private: class J3DTexNoAnm { public: - /* 8003B1F8 */ ~J3DTexNoAnm(); - /* 8003B240 */ J3DTexNoAnm(); - /* 8003C82C */ virtual void calc(u16*) const; + /* 8003B1F8 */ ~J3DTexNoAnm() {}; + /* 8003B240 */ J3DTexNoAnm() {}; + /* 8003C82C */ virtual void calc(u16* param_0) const { mAnmTexPattern->getTexNo(field_0x4, param_0); } void operator=(J3DTexNoAnm const& other) { mAnmTexPattern = other.mAnmTexPattern; @@ -52,8 +52,8 @@ private: class J3DTexMtxAnm { public: - /* 8003B264 */ ~J3DTexMtxAnm(); - /* 8003B2A0 */ J3DTexMtxAnm(); + /* 8003B264 */ ~J3DTexMtxAnm() {}; + /* 8003B2A0 */ J3DTexMtxAnm() {}; void operator=(J3DTexMtxAnm const& other) { mAnmTransform = other.mAnmTransform; @@ -75,8 +75,8 @@ private: class J3DTevKColorAnm { public: - /* 8003B150 */ ~J3DTevKColorAnm(); - /* 8003B18C */ J3DTevKColorAnm(); + /* 8003B150 */ ~J3DTevKColorAnm() {}; + /* 8003B18C */ J3DTevKColorAnm() {}; void operator=(J3DTevKColorAnm const& other) { mAnmTevReg = other.mAnmTevReg; @@ -96,8 +96,8 @@ private: class J3DTevColorAnm { public: - /* 8003B1A4 */ ~J3DTevColorAnm(); - /* 8003B1E0 */ J3DTevColorAnm(); + /* 8003B1A4 */ ~J3DTevColorAnm() {}; + /* 8003B1E0 */ J3DTevColorAnm() {}; void operator=(J3DTevColorAnm const& other) { mAnmTevReg = other.mAnmTevReg; @@ -126,7 +126,7 @@ public: /* 8032C664 */ void setTevColorAnm(int, J3DTevColorAnm*); /* 8032C6A4 */ void setTevKColorAnm(int, J3DTevKColorAnm*); - /* 800A4820 */ virtual ~J3DMaterialAnm(); + /* 800A4820 */ virtual ~J3DMaterialAnm() {}; /* 8032C3C4 */ virtual void calc(J3DMaterial*) const; const J3DTexMtxAnm& getTexMtxAnm(int i) const { return mTexMtxAnm[i]; } diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h index 125e7c9b3d3..441b2fdebd3 100644 --- a/include/JSystem/J3DGraphAnimator/J3DModelData.h +++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h @@ -48,6 +48,7 @@ public: GXColor* getVtxColorArray(u8 idx) const { return mVertexData.getVtxColorArray(idx); } bool checkFlag(u32 flag) const { return (mFlags & flag) ? true : false; } u32 getFlag() const { return mFlags; } + void* getRawData() const { return mpRawData; } u16 checkBumpFlag() const { return mbHasBumpArray; } void setBumpFlag(u32 flag) { mbHasBumpArray = flag; } bool checkBBoardFlag() const { return mbHasBillboard == 1; } diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index 4e1ca4a6e3e..73209b64a07 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -7,6 +7,7 @@ #include "dolphin/gx/GXStruct.h" #include "dolphin/mtx/mtx.h" #include "dolphin/types.h" +#include "m_Do/m_Do_lib.h" struct J3DGXColorS10 { /* 8000E460 */ J3DGXColorS10(); @@ -45,9 +46,9 @@ public: virtual u32 getType() = 0; /* 8031741C */ virtual void setTexGenNum(u32 const*); /* 8000E0D0 */ virtual void setTexGenNum(u32); - /* 8000DFE8 */ virtual bool getTexGenNum() const; + /* 8000DFE8 */ virtual u32 getTexGenNum() const; /* 8000E0CC */ virtual void setTexCoord(u32, J3DTexCoord const*); - /* 8000DFE0 */ virtual bool getTexCoord(u32); + /* 8000DFE0 */ virtual J3DTexCoord* getTexCoord(u32); /* 8003AB2C */ virtual void setTexMtx(u32, J3DTexMtx*); /* 8000DFD8 */ virtual J3DTexMtx* getTexMtx(u32); /* 80317424 */ virtual void setNBTScale(J3DNBTScale const*); @@ -76,9 +77,9 @@ public: /* 80322E74 */ virtual u32 getType(); /* 80322D3C */ virtual void setTexGenNum(u32 const*); /* 80322D34 */ virtual void setTexGenNum(u32); - /* 80322D48 */ virtual bool getTexGenNum() const; + /* 80322D48 */ virtual u32 getTexGenNum() const; /* 80322D50 */ virtual void setTexCoord(u32, J3DTexCoord const*); - /* 80322D64 */ virtual bool getTexCoord(u32); + /* 80322D64 */ virtual J3DTexCoord* getTexCoord(u32); /* 80322D78 */ virtual void setTexMtx(u32, J3DTexMtx*); /* 80322D88 */ virtual J3DTexMtx* getTexMtx(u32); /* 80322D98 */ virtual bool getTexMtxOffset() const; @@ -151,7 +152,7 @@ public: /* 8000DF94 */ virtual u32 getTexNo(u32) const; /* 80323548 */ virtual void setTevOrder(u32, J3DTevOrder const*); /* 8000E0BC */ virtual void setTevOrder(u32, J3DTevOrder); - /* 8000DFB8 */ virtual bool getTevOrder(u32); + /* 8000DFB8 */ virtual J3DTevOrder* getTevOrder(u32); /* 80110E80 */ virtual void setTevColor(u32, J3DGXColorS10 const*); /* 8000E0C4 */ virtual void setTevColor(u32, J3DGXColorS10); /* 8000DFC8 */ virtual _GXColorS10* getTevColor(u32); @@ -214,7 +215,7 @@ public: /* 803229E4 */ virtual u32 getTexNo(u32) const; /* 80322A08 */ virtual void setTevOrder(u32, J3DTevOrder const*); /* 803229F4 */ virtual void setTevOrder(u32, J3DTevOrder); - /* 80322A1C */ virtual bool getTevOrder(u32); + /* 80322A1C */ virtual J3DTevOrder* getTevOrder(u32); /* 80322B24 */ virtual void setTevColor(u32, J3DGXColorS10 const*); /* 80322AF8 */ virtual void setTevColor(u32, J3DGXColorS10); /* 80322B50 */ virtual GXColorS10* getTevColor(u32); @@ -278,7 +279,7 @@ public: /* 80322040 */ virtual u32 getTexNo(u32) const; /* 80322064 */ virtual void setTevOrder(u32, J3DTevOrder const*); /* 80322050 */ virtual void setTevOrder(u32, J3DTevOrder); - /* 80322078 */ virtual bool getTevOrder(u32); + /* 80322078 */ virtual J3DTevOrder* getTevOrder(u32); /* 803220B8 */ virtual void setTevColor(u32, J3DGXColorS10 const*); /* 8032208C */ virtual void setTevColor(u32, J3DGXColorS10); /* 803220E4 */ virtual GXColorS10* getTevColor(u32); @@ -348,7 +349,7 @@ public: /* 80322404 */ virtual u32 getTexNo(u32) const; /* 80322428 */ virtual void setTevOrder(u32, J3DTevOrder const*); /* 80322414 */ virtual void setTevOrder(u32, J3DTevOrder); - /* 8032243C */ virtual bool getTevOrder(u32); + /* 8032243C */ virtual J3DTevOrder* getTevOrder(u32); /* 8032247C */ virtual void setTevColor(u32, J3DGXColorS10 const*); /* 80322450 */ virtual void setTevColor(u32, J3DGXColorS10); /* 803224A8 */ virtual GXColorS10* getTevColor(u32); @@ -418,7 +419,7 @@ public: /* 80321C74 */ virtual u32 getTexNo(u32) const; /* 80321C98 */ virtual void setTevOrder(u32, J3DTevOrder const*); /* 80321C84 */ virtual void setTevOrder(u32, J3DTevOrder); - /* 80321CAC */ virtual bool getTevOrder(u32); + /* 80321CAC */ virtual J3DTevOrder* getTevOrder(u32); /* 80321CEC */ virtual void setTevColor(u32, J3DGXColorS10 const*); /* 80321CC0 */ virtual void setTevColor(u32, J3DGXColorS10); /* 80321D18 */ virtual GXColorS10* getTevColor(u32); @@ -488,7 +489,7 @@ public: /* 803227C8 */ virtual u32 getTexNo(u32) const; /* 803227EC */ virtual void setTevOrder(u32, J3DTevOrder const*); /* 803227D8 */ virtual void setTevOrder(u32, J3DTevOrder); - /* 80322800 */ virtual bool getTevOrder(u32); + /* 80322800 */ virtual J3DTevOrder* getTevOrder(u32); /* 80322818 */ virtual void setTevStageNum(u8 const*); /* 80322814 */ virtual void setTevStageNum(u8); /* 8032281C */ virtual u8 getTevStageNum() const; @@ -542,10 +543,21 @@ struct J3DFog : public J3DFogInfo { J3DFogInfo* getFogInfo() { return (J3DFogInfo*)this; } }; -struct J3DAlphaComp { - /* 0x0 */ u16 field_0x0; +struct J3DAlphaCompInfo { + /* 0x0 */ u8 field_0x0; + /* 0x1 */ u8 field_0x1; /* 0x2 */ u8 mRef0; /* 0x3 */ u8 mRef1; + /* 0x4 */ u8 field_0x4; +}; + +struct J3DAlphaComp: public J3DAlphaCompInfo { + void setAlphaCompInfo(J3DAlphaCompInfo *param_1) { + mRef0 = param_1->field_0x1; + mRef1 = param_1->field_0x4; + u32 p1_mref1 = param_1->mRef1; + *(u16*)&field_0x0 = calcAlphaCmpID(param_1->field_0x0, param_1->mRef0, p1_mref1); + } }; // Size: 0x4 class J3DPEBlock { @@ -563,7 +575,7 @@ public: /* 8000DF5C */ virtual J3DFog* getFog(); /* 8031736C */ virtual void setAlphaComp(J3DAlphaComp const*); /* 8000E01C */ virtual void setAlphaComp(J3DAlphaComp const&); - /* 8000DF54 */ virtual bool getAlphaComp(); + /* 8000DF54 */ virtual J3DAlphaComp* getAlphaComp(); /* 80317370 */ virtual void setBlend(J3DBlend const*); /* 8000E018 */ virtual void setBlend(J3DBlend const&); /* 8000DF4C */ virtual bool getBlend(); @@ -622,7 +634,7 @@ public: /* 803219A0 */ virtual J3DFog* getFog(); /* 803219C4 */ virtual void setAlphaComp(J3DAlphaComp const*); /* 803219A8 */ virtual void setAlphaComp(J3DAlphaComp const&); - /* 803219E0 */ virtual bool getAlphaComp(); + /* 803219E0 */ virtual J3DAlphaComp* getAlphaComp(); /* 803219F4 */ virtual void setBlend(J3DBlend const*); /* 803219E8 */ virtual void setBlend(J3DBlend const&); /* 80321A00 */ virtual bool getBlend(); @@ -661,7 +673,7 @@ public: /* 80321B00 */ virtual u32 getType(); /* 80321B28 */ virtual void setAlphaComp(J3DAlphaComp const*); /* 80321B0C */ virtual void setAlphaComp(J3DAlphaComp const&); - /* 80321B44 */ virtual bool getAlphaComp(); + /* 80321B44 */ virtual J3DAlphaComp* getAlphaComp(); /* 80321B58 */ virtual void setBlend(J3DBlend const*); /* 80321B4C */ virtual void setBlend(J3DBlend const&); /* 80321B64 */ virtual bool getBlend(); @@ -777,6 +789,11 @@ struct J3DColorChanInfo { struct J3DColorChan { /* 8000E47C */ J3DColorChan(); + u8 getLightMask() { return (((mColorChanID & 0x7800) >> 7) | (mColorChanID & 0x3c) >> 2); } + void setLightMask(u8 param_1) { + mColorChanID = (mColorChanID & ~0x3c) | ((param_1 & 0xf) << 2); + mColorChanID = (mColorChanID & ~0x7800) | ((param_1 & 0xf0) << 7); + } /* 0x0 */ u16 mColorChanID; }; @@ -806,7 +823,7 @@ public: /* 8000E008 */ virtual bool getColorChanNum() const; /* 8000E0D8 */ virtual void setColorChan(u32, J3DColorChan const&); /* 80317450 */ virtual void setColorChan(u32, J3DColorChan const*); - /* 8000DFF8 */ virtual bool getColorChan(u32); + /* 8000DFF8 */ virtual J3DColorChan* getColorChan(u32); /* 801A4C08 */ virtual void setLight(u32, J3DLightObj*); /* 80317454 */ virtual bool getLight(u32); /* 80317460 */ virtual void setCullMode(u8 const*); @@ -846,7 +863,7 @@ public: /* 80322F78 */ virtual bool getColorChanNum() const; /* 80322F94 */ virtual void setColorChan(u32, J3DColorChan const&); /* 80322F80 */ virtual void setColorChan(u32, J3DColorChan const*); - /* 80322FA8 */ virtual bool getColorChan(u32); + /* 80322FA8 */ virtual J3DColorChan* getColorChan(u32); /* 80322FBC */ virtual void setLight(u32, J3DLightObj*); /* 80322FCC */ virtual bool getLight(u32); /* 80322FE4 */ virtual void setCullMode(u8 const*); @@ -891,7 +908,7 @@ public: /* 803231D8 */ virtual bool getColorChanNum() const; /* 803231F4 */ virtual void setColorChan(u32, J3DColorChan const&); /* 803231E0 */ virtual void setColorChan(u32, J3DColorChan const*); - /* 80323208 */ virtual bool getColorChan(u32); + /* 80323208 */ virtual J3DColorChan* getColorChan(u32); /* 80323224 */ virtual void setCullMode(u8 const*); /* 8032321C */ virtual void setCullMode(u8); /* 80323230 */ virtual s32 getCullMode() const; diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index dd973c96bd6..b2f67574c55 100644 --- a/include/JSystem/J3DGraphBase/J3DMaterial.h +++ b/include/JSystem/J3DGraphBase/J3DMaterial.h @@ -66,6 +66,8 @@ public: J3DTexMtx* getTexMtx(u32 idx) { return mTexGenBlock->getTexMtx(idx); } u16 getIndex() { return mIndex; } bool isDrawModeOpaTexEdge() { return (mMaterialMode & 3) == 0; } + J3DPEBlock* getPEBlock() { return mPEBlock; } + void onInvalid() { mInvalid = 1; } void setTevColor(u32 i, const J3DGXColorS10* i_color) { mTevBlock->setTevColor(i, i_color); } void setTevKColor(u32 i, const J3DGXColor* i_color) { mTevBlock->setTevKColor(i, i_color); } diff --git a/include/JSystem/J3DGraphBase/J3DTevs.h b/include/JSystem/J3DGraphBase/J3DTevs.h index 32f5e1277a6..5462140ce81 100644 --- a/include/JSystem/J3DGraphBase/J3DTevs.h +++ b/include/JSystem/J3DGraphBase/J3DTevs.h @@ -3,13 +3,7 @@ #include "dolphin/types.h" -struct J3DTevStageInfo {}; - -struct J3DTevStage { - /* 8000E230 */ J3DTevStage(); - /* 8000E298 */ void setTevStageInfo(J3DTevStageInfo const&); - /* 8003AACC */ J3DTevStage(J3DTevStageInfo const&); - +struct J3DTevStageInfo { /* 0x0 */ u8 field_0x0; /* 0x1 */ u8 mTevColorOp; /* 0x2 */ u8 mTevColorAB; @@ -20,6 +14,12 @@ struct J3DTevStage { /* 0x7 */ u8 mTevSwapModeInfo; }; +struct J3DTevStage : public J3DTevStageInfo { + /* 8000E230 */ J3DTevStage(); + /* 8000E298 */ void setTevStageInfo(J3DTevStageInfo const&); + /* 8003AACC */ J3DTevStage(J3DTevStageInfo const&); +}; + struct J3DIndTevStageInfo { /* 0x0 */ u8 mIndStage; /* 0x1 */ u8 mIndFormat; @@ -39,13 +39,23 @@ struct J3DIndTevStage { }; struct J3DTevOrderInfo { + void operator=(const J3DTevOrderInfo& other) { + *(u32*) this = *(u32*)&other; + } + /* 0x0 */ u8 field_0x0; /* 0x1 */ u8 mTexMap; /* 0x2 */ u8 field_0x2; + /* 0x3 */ u8 field_0x3; // Maybe padding }; struct J3DTevOrder : public J3DTevOrderInfo { /* 8000E140 */ J3DTevOrder(); + J3DTevOrder(const J3DTevOrderInfo& info) { + *(J3DTevOrderInfo*)this = info; + } + + u8 getTexMap() { return mTexMap; } }; struct J3DTevSwapModeTable { diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h index b66c8b6c33f..96ee30877af 100644 --- a/include/JSystem/J3DGraphBase/J3DTexture.h +++ b/include/JSystem/J3DGraphBase/J3DTexture.h @@ -22,8 +22,8 @@ public: ResTIMG* getResTIMG(u16 entry) const { return &mpRes[entry]; } void setResTIMG(u16 entry, const ResTIMG& timg) { mpRes[entry] = timg; - mpRes[entry].imageOffset = ((mpRes[entry].imageOffset - (u32)(mpRes + entry))) + (u32)&timg; - mpRes[entry].paletteOffset = ((mpRes[entry].paletteOffset - (u32)(mpRes + entry))) + (u32)&timg; + mpRes[entry].imageOffset = ((mpRes[entry].imageOffset + (u32)&timg - (u32)(mpRes + entry))); + mpRes[entry].paletteOffset = ((mpRes[entry].paletteOffset + (u32)&timg - (u32)(mpRes + entry))); } }; @@ -48,6 +48,9 @@ struct J3DTexMtxInfo { class J3DTexMtx { public: + J3DTexMtx(const J3DTexMtxInfo& info) { + mTexMtxInfo = info; + } /* 803238C4 */ void load(u32) const; /* 80323900 */ void calc(f32 const (*)[4]); /* 80323920 */ void calcTexMtx(f32 const (*)[4]); @@ -68,10 +71,20 @@ struct J3DTexCoordInfo { /* 0x0 */ u8 mTexGenType; /* 0x1 */ u8 mTexGenSrc; /* 0x2 */ u8 mTexGenMtx; + void operator=(J3DTexCoordInfo const& other) { + *(u32*) this = *(u32*)&other; + } }; struct J3DTexCoord : public J3DTexCoordInfo { /* 8000E464 */ J3DTexCoord(); + void setTexCoordInfo(J3DTexCoordInfo *param_1) { + *(J3DTexCoordInfo*)this = *param_1; + } + + void resetTexMtxReg() { + mTexMtxReg = mTexGenMtx; + } /* 0x4 */ u16 mTexMtxReg; }; // Size: 0x6 diff --git a/include/JSystem/J3DGraphLoader/J3DAnmLoader.h b/include/JSystem/J3DGraphLoader/J3DAnmLoader.h index c9ec70a8ab3..21df0044fd9 100644 --- a/include/JSystem/J3DGraphLoader/J3DAnmLoader.h +++ b/include/JSystem/J3DGraphLoader/J3DAnmLoader.h @@ -9,7 +9,7 @@ struct J3DAnmBase; struct J3DAnmLoaderDataBase { /* 80337B40 */ static void* load(void const*, J3DAnmLoaderDataBaseFlag); - /* 80338134 */ void setResource(J3DAnmBase*, void const*); + /* 80338134 */ static void setResource(J3DAnmBase*, void const*); }; #endif /* J3DANMLOADER_H */ diff --git a/include/JSystem/J3DGraphLoader/J3DClusterLoader.h b/include/JSystem/J3DGraphLoader/J3DClusterLoader.h index 78e22688b14..4d8f7486760 100644 --- a/include/JSystem/J3DGraphLoader/J3DClusterLoader.h +++ b/include/JSystem/J3DGraphLoader/J3DClusterLoader.h @@ -4,7 +4,7 @@ #include "dolphin/types.h" struct J3DClusterLoaderDataBase { - /* 80334130 */ void load(void const*); + /* 80334130 */ static void* load(void const*); }; #endif /* J3DCLUSTERLOADER_H */ diff --git a/include/JSystem/J3DGraphLoader/J3DModelLoader.h b/include/JSystem/J3DGraphLoader/J3DModelLoader.h index c86393eb810..deff8ed9787 100644 --- a/include/JSystem/J3DGraphLoader/J3DModelLoader.h +++ b/include/JSystem/J3DGraphLoader/J3DModelLoader.h @@ -5,7 +5,7 @@ class J3DModelLoaderDataBase { public: - /* 803346BC */ void load(void const*, u32); + /* 803346BC */ static void* load(void const*, u32); }; #endif /* J3DMODELLOADER_H */ diff --git a/include/JSystem/JAudio2/JASAudioThread.h b/include/JSystem/JAudio2/JASAudioThread.h index 95a9a9fd026..9d89801cc50 100644 --- a/include/JSystem/JAudio2/JASAudioThread.h +++ b/include/JSystem/JAudio2/JASAudioThread.h @@ -2,17 +2,27 @@ #define JASAUDIOTHREAD_H #include "JSystem/JAudio2/JASGadget.h" +#include "JSystem/JKernel/JKRThread.h" -struct JASAudioThread : public JASGlobalInstance { +enum JASAudioMessage { + AUDIOMSG_DMA = 0, + AUDIOMSG_DSP = 1, + AUDIOMSG_STOP = 2, +}; + +struct JASAudioThread : public JKRThread, public JASGlobalInstance { /* 8029CCDC */ JASAudioThread(int, int, u32); - /* 8029CD4C */ void create(s32); + /* 8029CD4C */ static void create(s32); /* 8029CDC0 */ void stop(); - /* 8029CDEC */ void run(); - /* 8029CF68 */ void DMACallback(); - /* 8029CFBC */ void DSPCallback(void*); - /* 8029D028 */ ~JASAudioThread(); + /* 8029CDEC */ virtual void* run(); + /* 8029CF68 */ static void DMACallback(); + /* 8029CFBC */ static void DSPCallback(void*); + /* 8029D028 */ virtual ~JASAudioThread() {} - static u8 snIntCount[4 + 4 /* padding */]; + /* 0x7c */ OSThreadQueue sThreadQueue; + /* 0x84 */ bool sbPauseFlag; // type unsure + + static volatile int snIntCount; // type unsure }; #endif /* JASAUDIOTHREAD_H */ diff --git a/include/JSystem/JAudio2/JASDriverIF.h b/include/JSystem/JAudio2/JASDriverIF.h index af133f69674..05b9d3c827a 100644 --- a/include/JSystem/JAudio2/JASDriverIF.h +++ b/include/JSystem/JAudio2/JASDriverIF.h @@ -19,6 +19,13 @@ struct JASDriver { /* 8029E2D0 */ void DSPSyncCallback(); /* 8029E2F8 */ void updateDacCallback(); /* 8029C9F0 */ static u32 getSubFrames(); + static void initAI(void (*)()); + static void startDMA(); + static void stopDMA(); + static void updateDac(); + static void updateDacCallback(); + static void finishDSPFrame(); + static void updateDSP(); static u8 sDspSyncCallback[256]; static u8 sSubFrameCallback[256]; diff --git a/include/JSystem/JAudio2/JASGadget.h b/include/JSystem/JAudio2/JASGadget.h index fc4e7e9516a..24b00e3c79d 100644 --- a/include/JSystem/JAudio2/JASGadget.h +++ b/include/JSystem/JAudio2/JASGadget.h @@ -10,8 +10,12 @@ public: sInstance = inst; } + JASGlobalInstance(bool param_1) { + sInstance = (T*)this; + } + ~JASGlobalInstance() { - if (this == sInstance) { + if (sInstance == (T*)this) { sInstance = NULL; } } diff --git a/include/JSystem/JAudio2/JASSeqReader.h b/include/JSystem/JAudio2/JASSeqReader.h index 065c3298422..89e44f14415 100644 --- a/include/JSystem/JAudio2/JASSeqReader.h +++ b/include/JSystem/JAudio2/JASSeqReader.h @@ -13,6 +13,21 @@ public: /* 8029627C */ bool ret(); /* 802962B0 */ int readMidiValue(); + void jump(u32 param_1) { + field_0x04 = (u8*)field_0x00 + param_1; + } + + void jump(void* param_1) { + field_0x04 = (u8*)param_1; + } + + u32 get24(int param_0) { + return (*(u32*)((int)field_0x00 + param_0 - 1)) & 0xffffff; + } + + u32* getBase() { return field_0x00; } + u8* getCur() { return field_0x04; } + u8 readByte() { u8* tmp = field_0x04; field_0x04 += 1; diff --git a/include/JSystem/JAudio2/JASTrack.h b/include/JSystem/JAudio2/JASTrack.h index 12465a470c4..396a32ae150 100644 --- a/include/JSystem/JAudio2/JASTrack.h +++ b/include/JSystem/JAudio2/JASTrack.h @@ -70,7 +70,7 @@ struct JASTrack { /* 80291F38 */ void noteOn(u32, u32, u32); /* 80292008 */ void gateOn(u32, u32, f32, u32); /* 80292198 */ void noteOff(u32, u16); - /* 80292220 */ void checkNoteStop(u32) const; + /* 80292220 */ bool checkNoteStop(u32) const; /* 8029226C */ void overwriteOsc(JASChannel*); /* 802922D8 */ void updateTimedParam(); /* 80292348 */ void updateTrack(f32); diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h index e6e230d4150..687dc1865fe 100644 --- a/include/JSystem/JKernel/JKRArchive.h +++ b/include/JSystem/JKernel/JKRArchive.h @@ -133,7 +133,6 @@ public: u32 countResource(void) const; u32 getFileAttribute(u32) const; - u32 getMountMode() const { return mMountMode; } SDIFileEntry* findNameResource(const char*) const; bool isSameName(CArcName&, u32, u16) const; SDIDirEntry* findResType(u32) const; @@ -164,6 +163,10 @@ public: u32 countFile() const { return mArcInfoBlock->num_file_entries; } s32 countDirectory() const { return mArcInfoBlock->num_nodes; } + u8 getMountMode() const { return mMountMode; } + bool isFileEntry(u32 param_0) { + return getFileAttribute(param_0) & 1; + } public: /* 0x00 */ // vtable @@ -175,10 +178,10 @@ public: /* 0x44 */ SArcDataInfo* mArcInfoBlock; /* 0x48 */ SDIDirEntry* mNodes; /* 0x4C */ SDIFileEntry* mFiles; - -protected: /* 0x50 */ s32* mExpandedSize; /* 0x54 */ char* mStringTable; + +protected: /* 0x58 */ u32 field_0x58; public: diff --git a/include/JSystem/JKernel/JKRMemArchive.h b/include/JSystem/JKernel/JKRMemArchive.h index 883b7479951..105cae54fea 100644 --- a/include/JSystem/JKernel/JKRMemArchive.h +++ b/include/JSystem/JKernel/JKRMemArchive.h @@ -27,6 +27,7 @@ public: public: static u32 fetchResource_subroutine(u8*, u32, u8*, u32, JKRCompression); + SArcHeader* getArcHeader() { return mArcHeader; } private: /* 0x00 */ // vtable diff --git a/include/JSystem/JKernel/JKRThread.h b/include/JSystem/JKernel/JKRThread.h index 12ed5241f6a..b7e31e20011 100644 --- a/include/JSystem/JKernel/JKRThread.h +++ b/include/JSystem/JKernel/JKRThread.h @@ -72,11 +72,7 @@ public: s32 getCurrentHeapError() const { return mCurrentHeapError; } void setCurrentHeap(JKRHeap* heap) { - if (!heap) { - heap = JKRHeap::getCurrentHeap(); - } - - mCurrentHeap = heap; + mCurrentHeap = heap ? heap : JKRHeap::getCurrentHeap(); } protected: diff --git a/include/JSystem/JParticle/JPAParticle.h b/include/JSystem/JParticle/JPAParticle.h index 62c4a90a874..3448720ae0f 100644 --- a/include/JSystem/JParticle/JPAParticle.h +++ b/include/JSystem/JParticle/JPAParticle.h @@ -248,6 +248,8 @@ public: void setRate(f32 rate) { mRate = rate; } void setEmitterCallBackPtr(JPAEmitterCallBack* ptr) { mpEmtrCallBack = ptr; } void setGlobalRTMatrix(const Mtx m) { JPASetRMtxTVecfromMtx(m, mGlobalRot, &mGlobalTrs); } + void setGlobalTranslation(f32 x, f32 y, f32 z) { mGlobalTrs.set(x, y, z); } + void setGlobalAlpha(u8 alpha) { mGlobalPrmClr.a = alpha; } // void setGlobalScale(const JGeometry::TVec3& scale) { // mGlobalScl = scale; // mGlobalPScl = scale; diff --git a/include/JSystem/JUtility/JUTFader.h b/include/JSystem/JUtility/JUTFader.h index b9a3af2f657..3ee0a6a160c 100644 --- a/include/JSystem/JUtility/JUTFader.h +++ b/include/JSystem/JUtility/JUTFader.h @@ -21,7 +21,7 @@ public: /* 802E56DC */ virtual void draw(); s32 getStatus() const { return mStatus; } - void setColor(JUtility::TColor color) { mColor.set(color); } + void setColor(JUtility::TColor& color) { mColor.set(color); } /* 0x04 */ s32 mStatus; /* 0x08 */ u16 field_0x8; diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h index 322fd52aa95..c2748a89967 100644 --- a/include/JSystem/JUtility/JUTGamePad.h +++ b/include/JSystem/JUtility/JUTGamePad.h @@ -128,6 +128,8 @@ public: return isPushingReset; } + inline void stopMotorWave() { mRumble.stopPatternedRumbleAtThePeriod(); } + void stopMotor() { mRumble.stopMotor(mPortNum, false); } void stopMotorHard() { mRumble.stopMotorHard(mPortNum); } static s8 getPortStatus(u32 port) { return mPadStatus[port].error; } @@ -227,6 +229,10 @@ public: /* 0x10 */ u8* field_0x10; }; // Size: 0x14 + void startMotorWave(void* param_2, CRumble::ERumble rumble, u32 param_4) { + mRumble.startPatternedRumble(param_2, rumble, param_4); + } + /* 0x18 */ CButton mButton; /* 0x48 */ CStick mMainStick; /* 0x58 */ CStick mSubStick; diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index fe834acc38c..b8b1ba29fa4 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -458,6 +458,7 @@ public: void OffAtVsPlayerBit() { mObjAt.OffSPrmBit(0xC); } void OnAtVsPlayerBit() { mObjAt.OnSPrmBit(0xC); } void OnCoSPrmBit(u32 flag) { mObjCo.OnSPrmBit(flag); } + void SetTgSPrm(u32 prm) { mObjTg.SetSPrm(prm); } void SetCoSPrm(u32 prm) { mObjCo.SetSPrm(prm); } }; // Size = 0x40 diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h index e0e9c2084cb..f1488363f6c 100644 --- a/include/SSystem/SComponent/c_lib.h +++ b/include/SSystem/SComponent/c_lib.h @@ -87,7 +87,17 @@ inline T cLib_maxLimit(T val, T max) { } template -T cLib_calcTimer(T* val); +T cLib_calcTimer(T* value) { + if (*value != 0) { + *value = *value - 1; + } + return *value; +} + +template +T cLib_getRndValue(T min, T range) { + return (T)(min + cM_rndF((f32)range)); +} void MtxInit(void); void MtxTrans(f32, f32, f32, u8); diff --git a/include/SSystem/SComponent/c_math.h b/include/SSystem/SComponent/c_math.h index 1a9f67eefe5..ae0d7985093 100644 --- a/include/SSystem/SComponent/c_math.h +++ b/include/SSystem/SComponent/c_math.h @@ -18,11 +18,11 @@ float cM_rndF2(float); float cM_rndFX2(float); inline f32 cM_scos(s16 s) { - return JMath::sincosTable_.table[static_cast(s) >> 3].second; + return JMASCos(s); } inline f32 cM_ssin(s16 s) { - return JMath::sincosTable_.table[static_cast(s) >> 3].first; + return JMASSin(s); } inline s16 cM_deg2s(f32 val) { diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h index d8863f3471f..9139673dc80 100644 --- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h +++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h @@ -3,4 +3,8 @@ #include "dolphin/types.h" +u8 TRKReleaseMutex(); +u8 TRKAcquireMutex(); +u8 TRKInitializeMutex(); + #endif /* METROTRK_PORTABLE_MUTEX_TRK_H */ diff --git a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.h b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.h index 9f18712d1db..2e81c94a799 100644 --- a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.h +++ b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.h @@ -3,4 +3,7 @@ #include "dolphin/types.h" +u8 GetUseSerialIO(); +void SetUseSerialIO(u8); + #endif /* OS_DOLPHIN_TARGET_OPTIONS_H */ diff --git a/include/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h b/include/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h index 7466d146944..72693ecc25e 100644 --- a/include/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h +++ b/include/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h @@ -3,4 +3,19 @@ #include "dolphin/types.h" +typedef struct CircleBuffer { + int field_0x0; + int field_0x4; + int field_0x8; + u32 field_0xc; + s32 readBuf; + u32 field_0x14; + u32 criticalSection; +} CircleBuffer; + +s32 CircleBufferReadBytes(CircleBuffer*, u32, u32); +s32 CircleBufferWriteBytes(CircleBuffer* buf, s32 param_2, u32 param_3); +void CircleBufferInitialize(CircleBuffer* buf, s32 param_2, s32 param_3); +s32 CBGetBytesAvailableForRead(CircleBuffer* buf); + #endif /* UTILS_COMMON_CIRCLEBUFFER_H */ diff --git a/include/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h b/include/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h index d8b3c0a9a58..b0193083558 100644 --- a/include/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h +++ b/include/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h @@ -3,4 +3,8 @@ #include "dolphin/types.h" +void MWExitCriticalSection(u32* section); +void MWEnterCriticalSection(u32* section); +void MWInitializeCriticalSection(); + #endif /* UTILS_GC_MWCRITICALSECTION_GC_H */ diff --git a/include/amcstubs/AmcExi2Stubs.h b/include/amcstubs/AmcExi2Stubs.h index 47cf965e4b3..707b3022e31 100644 --- a/include/amcstubs/AmcExi2Stubs.h +++ b/include/amcstubs/AmcExi2Stubs.h @@ -3,4 +3,13 @@ #include "dolphin/types.h" +void EXI2_Init(void); +void EXI2_EnableInterrupts(void); +u8 EXI2_Poll(void); +u8 EXI2_ReadN(void*, u32); +u8 EXI2_WriteN(void*, u32); +void EXI2_Reserve(void); +void EXI2_Unreserve(void); +u8 AMC_IsStub(void); + #endif /* AMCEXI2STUBS_H */ diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index f918ad216aa..95ba5e5a4b5 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -6243,6 +6243,9 @@ public: class mDoExt_morf_c; +inline BOOL dComIfGs_isTransformLV(int i_no); +inline BOOL i_dComIfGs_isEventBit(const u16); + typedef int (daMidna_c::*daMidna_func)(); class daMidna_c : public fopAc_ac_c { public: @@ -6257,6 +6260,7 @@ public: FLG0_NPC_FAR = 0x40000, FLG0_NO_INPUT = 0x4000, FLG0_NO_DRAW = 0x2000, + FLG0_UNK_800 = 0x800, FLG0_UNK_200 = 0x200, }; @@ -6272,6 +6276,9 @@ public: u32 checkForceNormalColor() const; u32 checkForceTiredColor() const; bool checkMidnaTired(); + bool i_checkMidnaTired() { + return dComIfGs_isTransformLV(3) && !i_dComIfGs_isEventBit(0x1e08); + } void onNoServiceWait(); /* 804BC3E0 */ void modelCallBack(int); /* 804BC5C4 */ void changeUpperBck(); @@ -6330,6 +6337,7 @@ public: BOOL checkNpcFar() { return checkStateFlg0(FLG0_NPC_FAR); } BOOL checkNoDraw() const { return checkStateFlg0(FLG0_NO_DRAW); } BOOL checkNoInput() const { return checkStateFlg0(FLG0_NO_INPUT); } + BOOL checkWolfNoPos() const { return checkStateFlg0(FLG0_UNK_800); } int checkMetamorphoseEnable() { return (this->*mpFunc)(); } int checkShadowModelDrawDemoForce() const { return checkStateFlg1(FLG1_SHADOW_MODEL_DRAW_DEMO_FORCE); } @@ -6362,12 +6370,8 @@ public: return 0; } - int checkShadowModeTalkWait() const { - if (mDemoType != 2 && mDemoType != 1) { - return 0; - } - - return 1; + bool checkShadowModeTalkWait() const { + return (field_0x84e == 2 || field_0x84e == 1) ; } void setShadowReturn() { mDemoType = 4; } diff --git a/include/d/a/d_a_npc.h b/include/d/a/d_a_npc.h index 40620561ef4..6737df5b279 100644 --- a/include/d/a/d_a_npc.h +++ b/include/d/a/d_a_npc.h @@ -4,12 +4,31 @@ #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" #include "Z2AudioLib/Z2Creature.h" #include "d/com/d_com_inf_game.h" +#include "d/a/d_a_player.h" #include "d/d_path.h" #include "d/msg/d_msg_flow.h" #include "d/particle/d_particle_copoly.h" #include "dolphin/types.h" #include "global.h" +struct bckGetParam { + /* 0x00 */ int bckIdx; + /* 0x04 */ int bckAttr; + /* 0x08 */ int arcIdx; +}; + +struct btpGetParam { + /* 0x00 */ int btpIdx; + /* 0x04 */ int btpAttr; + /* 0x08 */ int arcIdx; +}; + +struct btkGetParam { + /* 0x00 */ int btkIdx; + /* 0x04 */ int btkAttr; + /* 0x08 */ int arcIdx; +}; + struct dPnt {}; class daNpcT_ActorMngr_c { @@ -126,12 +145,16 @@ private: struct daNpcT_evtData_c {}; -struct daNpcT_faceMotionAnmData_c {}; +struct daNpcT_faceMotionAnmData_c { + u32 field_0x0[6]; + u32 field_0x18; +}; struct daNpcT_pntData_c {}; struct daNpcT_motionAnmData_c { - u8 data[8]; + u32 field_0x0[6]; + u32 field_0x18; }; class daNpcT_Hermite_c { @@ -167,7 +190,7 @@ public: /* 80146188 */ int chkPassed1(cXyz, int); /* 801464D8 */ int chkPassed2(cXyz, cXyz*, int, int); - inline cXyz& getPntPos(int i_idx) { + inline Vec getPntPos(int i_idx) { return mpRoomPath->m_points[i_idx].m_position; } @@ -176,6 +199,8 @@ public: return roomPath; } + bool chkReverse() { return mDirection == 1; } + u16 getNumPnts() { dPath* path = mpRoomPath; return path->m_num; @@ -309,7 +334,7 @@ public: /* 80148C70 */ void setEnvTevColor(); /* 80148CCC */ void setRoomNo(); /* 80148D10 */ int checkEndAnm(f32); - /* 80148DD0 */ void checkEndAnm(J3DFrameCtrl*, f32); + /* 80148DD0 */ int checkEndAnm(J3DFrameCtrl*, f32); /* 80148E4C */ void playAllAnm(); /* 80149190 */ void setMtx(); /* 8014924C */ void ctrlFaceMotion(); @@ -336,9 +361,9 @@ public: /* 8014BB00 */ void getActorDistance(fopAc_ac_c*, int, int); /* 8014BBF0 */ int initTalk(int, fopAc_ac_c**); /* 8014BC78 */ void talkProc(int*, int, fopAc_ac_c**, int); - /* 8014BE2C */ void getNearestActorP(s16); + /* 8014BE2C */ fopAc_ac_c* getNearestActorP(s16); /* 8014BEE4 */ void getEvtAreaTagP(int, int); - /* 8014BFB0 */ u32 getShopItemTagP(); + /* 8014BFB0 */ fopAc_ac_c* getShopItemTagP(); /* 8014C030 */ void setHitodamaPrtcl(); /* 8014CD20 */ virtual ~daNpcT_c(); @@ -381,8 +406,8 @@ public: /* 8014CC2C */ virtual void drawGhost(); /* 8014CCA0 */ virtual bool afterSetFaceMotionAnm(int, int, f32, int); /* 8014CCE0 */ virtual bool afterSetMotionAnm(int, int, f32, int); - /* 8014CCB0 */ virtual void getFaceMotionAnm(daNpcT_faceMotionAnmData_c); - /* 8014CCF0 */ virtual void getMotionAnm(daNpcT_motionAnmData_c); + /* 8014CCB0 */ virtual daNpcT_faceMotionAnmData_c getFaceMotionAnm(daNpcT_faceMotionAnmData_c); + /* 8014CCF0 */ virtual daNpcT_motionAnmData_c getMotionAnm(daNpcT_motionAnmData_c); /* 8014CCEC */ virtual void changeAnm(int*, int*); /* 8014CCAC */ virtual void changeBck(int*, int*); /* 8014CCA8 */ virtual void changeBtp(int*, int*); @@ -407,11 +432,16 @@ public: STATIC_ASSERT(sizeof(daNpcT_c) == 0xE40); +BOOL daNpcT_chkEvtBit(u32 i_idx); +BOOL daNpcT_chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3, int param_4); + class daNpcF_ActorMngr_c { private: /* 0x0 */ u32 mActorID; public: + daNpcF_ActorMngr_c() { initialize(); } + /* 801506B0 */ void initialize(); /* 801506D8 */ void entry(unsigned int); /* 801506BC */ void entry(fopAc_ac_c*); @@ -422,19 +452,19 @@ public: }; class daNpcF_c : public fopAc_ac_c { -private: +protected: /* 0x568 */ mDoExt_McaMorfSO* mMcaMorf; /* 0x56C */ mDoExt_bckAnm mBckAnm; /* 0x588 */ mDoExt_btpAnm mBtpAnm; /* 0x5A0 */ mDoExt_btkAnm mBtkAnm; /* 0x5B8 */ mDoExt_brkAnm mBrkAnm; - /* 0x5D0 */ dBgS_ObjAcch field_0x5d0; - /* 0x7A8 */ dCcD_Stts field_0x7a8; - /* 0x7E4 */ dBgS_AcchCir field_0x7e4; + /* 0x5D0 */ dBgS_ObjAcch mAcch; + /* 0x7A8 */ dCcD_Stts mStts; + /* 0x7E4 */ dBgS_AcchCir mAcchCir; /* 0x824 */ daNpcF_ActorMngr_c field_0x824; /* 0x82C */ daNpcF_ActorMngr_c field_0x82c[5]; - /* 0x854 */ cXyz field_0x854[3]; - /* 0x878 */ cXyz field_0x878; + /* 0x854 */ cXyz mLookatPos[3]; + /* 0x878 */ cXyz mLookPos; /* 0x884 */ cXyz field_0x884; /* 0x890 */ cXyz field_0x890; /* 0x89C */ cXyz field_0x89c; @@ -443,20 +473,20 @@ private: /* 0x8C0 */ cXyz field_0x8c0; /* 0x8CC */ cXyz field_0x8cc; /* 0x8D8 */ cXyz field_0x8d8; - /* 0x8E4 */ cXyz field_0x8e4; + /* 0x8E4 */ cXyz mHeadPos; /* 0x8F0 */ csXyz field_0x8f0; /* 0x8F6 */ csXyz field_0x8f6; /* 0x8FC */ csXyz field_0x8fc; /* 0x902 */ csXyz field_0x902; /* 0x908 */ csXyz field_0x908[3]; /* 0x91A */ csXyz field_0x91a[3]; - /* 0x92C */ int field_0x92c; + /* 0x92C */ int mCutIndex; /* 0x930 */ u32 field_0x930; - /* 0x934 */ u32 field_0x934; - /* 0x938 */ u32 field_0x938; - /* 0x93C */ u32 field_0x93c[5]; + /* 0x934 */ int field_0x934; // index in 0x93c to not decrement timer (if 0x938 is nonzero) + /* 0x938 */ int field_0x938; // controls whether to use field 0x934 + /* 0x93C */ int field_0x93c[5]; // timers for removing actors from 0x82c /* 0x950 */ int field_0x950; - /* 0x954 */ int field_0x954; + /* 0x954 */ int field_0x954; // a timer /* 0x958 */ int field_0x958; /* 0x95C */ int field_0x95c; /* 0x960 */ int field_0x960; @@ -464,38 +494,37 @@ private: /* 0x968 */ int field_0x968; /* 0x96C */ int field_0x96c; /* 0x970 */ f32 field_0x970; - /* 0x974 */ f32 field_0x974; - /* 0x978 */ f32 field_0x978; - /* 0x97C */ f32 field_0x97c; + /* 0x974 */ f32 mExpressionMorfOverride; + /* 0x978 */ f32 mExpressionMorf; + /* 0x97C */ f32 mMotionMorfOverride; /* 0x980 */ f32 field_0x980; /* 0x984 */ f32 field_0x984[3]; /* 0x990 */ u16 field_0x990; - /* 0x990 */ u16 field_0x992; - /* 0x990 */ u16 field_0x994; - /* 0x990 */ u16 field_0x996; + /* 0x992 */ u16 field_0x992; + /* 0x994 */ u16 field_0x994; + /* 0x996 */ s16 field_0x996; /* 0x998 */ u16 field_0x998; - /* 0x99C */ u32 field_0x99c; + /* 0x99C */ u32 mAnmFlags; /* 0x9A0 */ u32 field_0x9a0; - /* 0x9A4 */ int field_0x9a4; - /* 0x9A8 */ int field_0x9a8; - /* 0x9AC */ int field_0x9ac; + /* 0x9A4 */ profile_method_class* field_0x9a4; + /* 0x9A8 */ int field_0x9a8[2]; /* 0x9B0 */ u32 field_0x9b0; /* 0x9B4 */ int mFlowNodeNo; /* 0x9B8 */ cXyz field_0x9b8; /* 0x9C4 */ cXyz field_0x9c4; - /* 0x9D0 */ u16 field_0x9d0; - /* 0x9D2 */ u16 field_0x9d2; - /* 0x9D4 */ u16 field_0x9d4; - /* 0x9D6 */ u16 field_0x9d6; - /* 0x9D8 */ u16 field_0x9d8; - /* 0x9DA */ u16 field_0x9da; - /* 0x9DC */ u16 field_0x9dc; - /* 0x9DE */ u16 field_0x9de; - /* 0x9E0 */ u16 field_0x9e0; - /* 0x9E2 */ u16 field_0x9e2; - /* 0x9E4 */ u16 field_0x9e4; - /* 0x9E6 */ u16 field_0x9e6; - /* 0x9E8 */ u8 field_0x9e8; + /* 0x9D0 */ s16 field_0x9d0; + /* 0x9D2 */ s16 field_0x9d2; + /* 0x9D4 */ s16 field_0x9d4; + /* 0x9D6 */ s16 mExpressionPhase; + /* 0x9D8 */ s16 mExpressionPrevPhase; + /* 0x9DA */ s16 mMotionPhase; + /* 0x9DC */ s16 mMotionPrevPhase; + /* 0x9DE */ s16 mExpression; + /* 0x9E0 */ s16 mMotion; + /* 0x9E2 */ u16 mMotionLoops; + /* 0x9E4 */ u16 mExpressionLoops; + /* 0x9E6 */ u16 mOrderEvtNo; + /* 0x9E8 */ s8 field_0x9e8; /* 0x9E9 */ u8 field_0x9e9; /* 0x9EA */ u8 field_0x9ea; /* 0x9EB */ u8 field_0x9eb; @@ -507,7 +536,7 @@ private: /* 0x9F1 */ u8 field_0x9f1; /* 0x9F2 */ bool mHide; /* 0x9f3 */ u8 field_0x9f3; - /* 0x9F4 */ u8 field_0x9f4; + /* 0x9F4 */ bool field_0x9f4; // controls whether setHitodamaPrtcl is called /* 0x9F5 */ u8 field_0x9f5; /* 0x9F6 */ u8 field_0x9f6; /* 0x9F8 */ dMsgFlow_c mFlow; @@ -516,85 +545,118 @@ private: /* 0xAD4 */ dBgS_LinChk field_0xad4; public: - struct daNpcF_anmPlayData {}; + struct daNpcF_anmPlayData { + u16 idx; + f32 morf; + s32 numLoops; + }; - /* 80152014 */ void execute(); - /* 801522AC */ void draw(int, int, f32, _GXColorS10*, int); + enum AnmFlags { + ANM_PAUSE_MORF = 0x0001, + ANM_PAUSE_BTK = 0x0002, + ANM_PAUSE_BRK = 0x0004, + ANM_PLAY_MORF = 0x0008, + ANM_PLAY_BTK = 0x0010, + ANM_PLAY_BRK = 0x0020, + ANM_PAUSE_BCK = 0x0040, + ANM_PAUSE_BTP = 0x0080, + ANM_PLAY_BCK = 0x0100, + ANM_PLAY_BTP = 0x0200, + ANM_FLAG_400 = 0x0400, + ANM_FLAG_800 = 0x0800, + ANM_PAUSE_EXPRESSION = 0x1000, + ANM_MOTION_FLAGS = ANM_PAUSE_MORF | ANM_PAUSE_BTK | ANM_PAUSE_BRK | ANM_PLAY_MORF | ANM_PLAY_BTK | ANM_PLAY_BRK, + ANM_EXPRESSION_FLAGS = ANM_PAUSE_BCK | ANM_PAUSE_BTP | ANM_PLAY_BCK | ANM_PLAY_BTP | ANM_FLAG_400 | ANM_FLAG_800 | ANM_PAUSE_EXPRESSION, + ANM_PAUSE_ALL = ANM_PAUSE_MORF | ANM_PAUSE_BTK | ANM_PAUSE_BRK | ANM_PAUSE_BCK | ANM_PAUSE_BTP | ANM_PAUSE_EXPRESSION, + }; + + /* 80152014 */ BOOL execute(); + /* 801522AC */ BOOL draw(int, int, f32, _GXColorS10*, int); /* 80152614 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80152654 */ void srchAttnActor1(void*, void*); /* 801526E8 */ void* srchActor(void*, void*); /* 801528C8 */ void initialize(); - /* 80152B2C */ void getTrnsfrmKeyAnmP(char*, int); - /* 80152B68 */ void getTexPtrnAnmP(char*, int); - /* 80152BA4 */ void getTexSRTKeyAnmP(char*, int); - /* 80152BE0 */ void getTevRegKeyAnmP(char*, int); - /* 80152C1C */ void setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int); - /* 80152C80 */ void setBckAnm(J3DAnmTransform*, f32, int, int, int, bool); - /* 80152CC4 */ void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int); - /* 80152D04 */ void setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int); - /* 80152D44 */ void setBrkAnm(J3DAnmTevRegKey*, J3DModelData*, f32, int); + /* 80152B2C */ J3DAnmTransformKey* getTrnsfrmKeyAnmP(char*, int); + /* 80152B68 */ J3DAnmTexPattern* getTexPtrnAnmP(char*, int); + /* 80152BA4 */ J3DAnmTextureSRTKey* getTexSRTKeyAnmP(char*, int); + /* 80152BE0 */ J3DAnmTevRegKey* getTevRegKeyAnmP(char*, int); + /* 80152C1C */ BOOL setMcaMorfAnm(J3DAnmTransformKey* i_anm, f32 i_rate, f32 i_morf, int i_attr, int i_start, int i_end); + /* 80152C80 */ BOOL setBckAnm(J3DAnmTransform* i_bck, f32 i_rate, int i_attr, int i_start, int i_end, bool i_modify); + /* 80152CC4 */ BOOL setBtpAnm(J3DAnmTexPattern* i_btp, J3DModelData* i_modelData, f32 i_rate, int i_attr); + /* 80152D04 */ BOOL setBtkAnm(J3DAnmTextureSRTKey* i_btk, J3DModelData* i_modelData, f32 i_rate, int i_attr); + /* 80152D44 */ BOOL setBrkAnm(J3DAnmTevRegKey* i_brk, J3DModelData* i_modelData, f32 i_rate, int i_attr); /* 80152D84 */ void setEnvTevColor(); /* 80152DE0 */ void setRoomNo(); - /* 80152E24 */ void chkEndAnm(f32); - /* 80152EC4 */ void chkEndAnm(J3DFrameCtrl*, f32); - /* 80152F40 */ void playAllAnm(); + /* 80152E24 */ BOOL chkEndAnm(f32); + /* 80152EC4 */ BOOL chkEndAnm(J3DFrameCtrl*, f32); + /* 80152F40 */ BOOL playAllAnm(); /* 80153150 */ void playExpressionAnm(daNpcF_c::daNpcF_anmPlayData***); /* 80153264 */ void playMotionAnm(daNpcF_c::daNpcF_anmPlayData***); /* 8015337C */ void setLookatMtx(int, int*, f32); /* 80153578 */ void hitChk2(dCcD_Cyl*, int, int); /* 80153658 */ void setDamage(int, int, int); - /* 80153718 */ void ctrlMsgAnm(int&, int&, fopAc_ac_c*, int); + /* 80153718 */ int ctrlMsgAnm(int&, int&, fopAc_ac_c*, int); /* 8015387C */ void orderEvent(int, char*, u16, u16, u8, u16); /* 80153954 */ void changeEvent(char*, char*, u16, u16); - /* 801539F0 */ void chkActorInSight(fopAc_ac_c*, f32); - /* 80153A78 */ void chkActorInArea(fopAc_ac_c*, cXyz, cXyz, s16); - /* 80153BDC */ void chkActorInAttnArea(fopAc_ac_c*, fopAc_ac_c*, int); + /* 801539F0 */ BOOL chkActorInSight(fopAc_ac_c*, f32); + /* 80153A78 */ BOOL chkActorInArea(fopAc_ac_c*, cXyz, cXyz, s16); + /* 80153BDC */ BOOL chkActorInAttnArea(fopAc_ac_c*, fopAc_ac_c*, int); /* 80153D1C */ int initTalk(int, fopAc_ac_c**); - /* 80153D84 */ void talkProc(int*, int, fopAc_ac_c**); - /* 80153EF4 */ void turn(s16, f32, int); + /* 80153D84 */ BOOL talkProc(int*, int, fopAc_ac_c**); + /* 80153EF4 */ BOOL turn(s16, f32, int); /* 801540A4 */ void step(s16, int, int, int); /* 80154250 */ void setAngle(s16); - /* 80154278 */ void getDistTableIdx(int, int); - /* 801542A0 */ int getEvtAreaTagP(int, int); - /* 8015436C */ void getAttnActorP(int, void* (*)(void*, void*), f32, f32, f32, f32, s16, int, + /* 80154278 */ u8 getDistTableIdx(int, int); + /* 801542A0 */ fopAc_ac_c* getEvtAreaTagP(int, int); + /* 8015436C */ fopAc_ac_c* getAttnActorP(int, void* (*)(void*, void*), f32, f32, f32, f32, s16, int, int); - /* 80154730 */ void chkActorInSight2(fopAc_ac_c*, f32, s16); - /* 80154834 */ bool chkPointInArea(cXyz, cXyz, f32, f32, f32, s16); - /* 801548F4 */ bool chkPointInArea(cXyz, cXyz, cXyz, s16); + /* 80154730 */ BOOL chkActorInSight2(fopAc_ac_c*, f32, s16); + /* 80154834 */ BOOL chkPointInArea(cXyz, cXyz, f32, f32, f32, s16); + /* 801548F4 */ BOOL chkPointInArea(cXyz, cXyz, cXyz, s16); /* 8015496C */ cXyz getAttentionPos(fopAc_ac_c*); /* 801549E0 */ void chkFindPlayer2(int, s16); /* 80154BD8 */ void setHitodamaPrtcl(); /* 80155BF4 */ virtual ~daNpcF_c(); /* 80155BC8 */ virtual void setParam(); - /* 80155BC0 */ virtual bool main(); - /* 80155BD8 */ virtual bool ctrlBtk(); + /* 80155BC0 */ virtual BOOL main(); + /* 80155BD8 */ virtual BOOL ctrlBtk(); /* 80155BBC */ virtual void adjustShapeAngle(); /* 8015276C */ virtual void setMtx(); /* 801527FC */ virtual void setMtx2(); /* 80155BB8 */ virtual void setAttnPos(); /* 80155BB4 */ virtual void setCollisions(); - /* 80155BE0 */ virtual bool setExpressionAnm(int, bool); - /* 80155EC8 */ virtual bool setExpressionBtp(int); - /* 80155BF0 */ virtual void setExpression(int, f32); - /* 80155BE8 */ virtual void setMotionAnm(int, f32); - /* 80155BEC */ virtual void setMotion(int, f32, int); - /* 80155BD0 */ virtual bool drawDbgInfo(); + /* 80155BE0 */ virtual bool setExpressionAnm(int i_idx, bool i_modify); + /* 80155EC8 */ virtual bool setExpressionBtp(int i_idx); + /* 80155BF0 */ virtual void setExpression(int i_expression, f32 i_morf); + /* 80155BE8 */ virtual void setMotionAnm(int i_idx, f32 i_morf); + /* 80155BEC */ virtual void setMotion(int i_motion, f32 i_morf, int i_restart); + /* 80155BD0 */ virtual BOOL drawDbgInfo(); /* 80155BCC */ virtual void drawOtherMdls(); + BOOL chkActorInSpeakArea(fopAc_ac_c* i_actorCheck, fopAc_ac_c* i_actorArea) { return chkActorInAttnArea(i_actorCheck, i_actorArea, mAttentionInfo.field_0x0[3]); } + BOOL chkPlayerInSpeakArea(fopAc_ac_c* i_actor) { return chkActorInSpeakArea(daPy_getPlayerActorClass(), i_actor); } + BOOL chkActorInTalkArea(fopAc_ac_c* i_actorCheck, fopAc_ac_c* i_actorArea) { return chkActorInAttnArea(i_actorCheck, i_actorArea, mAttentionInfo.field_0x0[1]); } + BOOL chkPlayerInTalkArea(fopAc_ac_c* i_actor) { return chkActorInTalkArea(daPy_getPlayerActorClass(), i_actor); } + BOOL checkHide() { return mHide || (field_0x9f4 && !dComIfGs_wolfeye_effect_check()); } + static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; + static dCcD_SrcCyl mCcDCyl; static u8 mCcDSph[64]; - static u8 mFindActorPList[400]; + static fopAc_ac_c* mFindActorPList[100]; static s32 mFindCount; static s16 mSrchActorName; }; STATIC_ASSERT(sizeof(daNpcF_c) == 0xB48); +BOOL daNpcF_chkEvtBit(u32 i_idx); +BOOL daNpcF_chkTmpBit(u32 i_idx); +void daNpcF_offTmpBit(u32 i_idx); int daNpcF_getPlayerInfoFromPlayerList(int param_0, int i_roomNo, cXyz& param_2, csXyz& param_3); +s16 daNpcF_getGroundAngle(cBgS_PolyInfo*, s16); struct daBaseNpc_matAnm_c { /* 8014D884 */ void calc(J3DMaterial*) const; @@ -617,8 +679,7 @@ private: /* 0x000 */ f32 field_0x0; /* 0x004 */ dPath* mpRoomPath; /* 0x008 */ f32 field_0x8; - /* 0x00C */ dPath* field_0xc; - /* 0x010 */ u8 field_0x10[2558]; + /* 0x010 */ u8 field_0xc[2562]; /* 0xA0E */ u16 field_0xa0e; /* 0xA10 */ u16 mIdx; /* 0xA12 */ s8 mDirection; @@ -629,11 +690,11 @@ public: /* 8014D9A8 */ BOOL isPath(); /* 8014D9BC */ int setPathInfo(u8, s8, s8); /* 8014DA48 */ void reverseDir(); - /* 8014DA64 */ void chkPnt(cXyz); + /* 8014DA64 */ s32 chkPnt(cXyz); /* 8014DAC4 */ void setNextPnt(); /* 8014DB04 */ u16 getIdx(); /* 8014DB0C */ void setIdx(u16); - /* 8014DB14 */ void getPntPos(u16); + /* 8014DB14 */ Vec getPntPos(u16); /* 801503FC */ ~daBaseNpc_path_c(); @@ -649,7 +710,7 @@ private: /* 0x34 */ cXyz mJntPos[3]; /* 0x4C */ u8 field_0x4C[24]; /* 0x64 */ csXyz mUnk[2]; - /* 0x70 */ u8 field_0x70[12]; + /* 0x70 */ csXyz mRotation[2]; /* 0x7C */ csXyz mUnk2[2]; /* 0x88 */ u8 field_0x88[4]; /* 0x8C */ cXyz* mpAttnPos; @@ -661,7 +722,7 @@ public: /* 8014E658 */ void setMinJntLmt(csXyz, int); /* 8014E67C */ void setJntPos(cXyz, int); /* 8014E6A0 */ int setAttnPos(cXyz*); - /* 8014E6AC */ void getRot(int); + /* 8014E6AC */ csXyz getRot(int); /* 801502EC */ ~daBaseNpc_lookat_c(); }; @@ -765,20 +826,23 @@ public: static u8 m_set_func[4]; }; -class daNpcF_MatAnm_c { +class daNpcF_MatAnm_c : public J3DMaterialAnm { private: - /* 0x000 */ J3DMaterialAnm mMaterialAnm; /* 0x0F4 */ mutable f32 field_0xF4; /* 0x0F8 */ mutable f32 field_0xF8; - /* 0x0FC */ f32 mTranslationX; - /* 0x100 */ f32 mTranslationY; - /* 0x104 */ u8 field_0x104; + /* 0x0FC */ f32 mNowOffsetX; + /* 0x100 */ f32 mNowOffsetY; + /* 0x104 */ u8 mEyeMoveFlag; /* 0x105 */ u8 field_0x105; public: + daNpcF_MatAnm_c() { initialize(); } /* 80150738 */ void initialize(); /* 8015075C */ void calc(J3DMaterial*) const; /* 80155ED0 */ ~daNpcF_MatAnm_c(); + void setNowOffsetX(float i_nowOffsetX) { mNowOffsetX = i_nowOffsetX; } + void setNowOffsetY(float i_nowOffsetY) { mNowOffsetY = i_nowOffsetY; } + void onEyeMoveFlag() { mEyeMoveFlag = 1; } }; class daNpcF_SPCurve_c { @@ -787,7 +851,7 @@ private: /* 0x02 */ u16 field_0x02; /* 0x04 */ u8 field_0x04; /* 0x05 */ bool mIsClosed; - // /* 0x08 */ dPnt mPoints[96]; + /* 0x08 */ dStage_dPnt_c mPoints[96]; public: @@ -815,13 +879,45 @@ public: /* 80150BE0 */ int setNextIdx(); /* 80150C18 */ u16 getNextIdx(); /* 80150C60 */ u16 getBeforeIdx(); - /* 80150CA8 */ void getBeforePos(cXyz&); - /* 80150D44 */ void getNextPos(cXyz&); + /* 80150CA8 */ int getBeforePos(cXyz&); + /* 80150D44 */ int getNextPos(cXyz&); /* 80150DE0 */ int getDstPos(cXyz, cXyz&); /* 80150EB4 */ void setNextIdxDst(cXyz); u16& getIdx() { return mIdx; }; - cXyz* getPntPos(); // finish + inline Vec getPntPos(int i_idx) { + return mpRoomPath->m_points[i_idx].m_position; + } + int chkClose() { + return dPath_ChkClose(mpRoomPath); + } +}; + +class daNpcF_Lookat_c { +private: + /* 0x00 */ cXyz field_0x00[4]; + /* 0x30 */ cXyz* mAttnPos; + /* 0x34 */ csXyz field_0x34[4]; + /* 0x4C */ csXyz field_0x4c[4]; + /* 0x64 */ csXyz field_0x64[4]; + /* 0x7C */ csXyz mRotAngle[4]; + /* 0x94 */ u8 field_0x94[4]; + /* 0x98 vtable */ + +public: + /* 80151038 */ void initialize(); + /* 801510B8 */ void setParam(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s16, + cXyz*); + /* 80151350 */ void calc(fopAc_ac_c*, f32 (*)[4], csXyz**, int, int, int); + /* 801515D4 */ void adjustMoveDisAngle(s16&, s16, s16, s16); + /* 80151648 */ void initCalc(fopAc_ac_c*, f32 (*)[4], cXyz*, csXyz*, f32*, cXyz&, int); + /* 80151A54 */ void update(cXyz*, csXyz*, f32*); + /* 80151B68 */ void calcMoveDisAngle(int, cXyz*, csXyz*, cXyz, int, int); + /* 80151F54 */ void setRotAngle(); + /* 80151FE0 */ void clrRotAngle(); + virtual ~daNpcF_Lookat_c() {} + cXyz* getAttnPos() { return mAttnPos; } + void setAttnPos(cXyz* i_attnPos) { mAttnPos = i_attnPos; } }; class daNpcF_MoveBgActor_c { @@ -839,29 +935,4 @@ public: /* 80155EC0 */ bool ToBack(); }; -class daNpcF_Lookat_c { -private: - /* 0x00 */ cXyz field_0x00[4]; - /* 0x30 */ int field_0x30; - /* 0x34 */ csXyz field_0x34[4]; - /* 0x4C */ csXyz field_0x4c[4]; - /* 0x64 */ csXyz field_0x64[4]; - /* 0x7C */ csXyz mRotAngle[4]; - /* 0x94 */ u8 field_0x94[4]; - /* 0x98 */ void* vtable; - -public: - /* 80151038 */ void initialize(); - /* 801510B8 */ void setParam(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s16, - cXyz*); - /* 80151350 */ void calc(fopAc_ac_c*, f32 (*)[4], csXyz**, int, int, int); - /* 801515D4 */ void adjustMoveDisAngle(s16&, s16, s16, s16); - /* 80151648 */ void initCalc(fopAc_ac_c*, f32 (*)[4], cXyz*, csXyz*, f32*, cXyz&, int); - /* 80151A54 */ void update(cXyz*, csXyz*, f32*); - /* 80151B68 */ void calcMoveDisAngle(int, cXyz*, csXyz*, cXyz, int, int); - /* 80151F54 */ void setRotAngle(); - /* 80151FE0 */ void clrRotAngle(); -}; - - #endif /* D_A_D_A_NPC_H */ diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index ede65e97816..2bb875205d1 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -176,6 +176,7 @@ private: class daMidna_c; class daPy_py_c; inline daPy_py_c* dComIfGp_getLinkPlayer(); +inline BOOL i_dComIfGs_isEventBit(const u16); class daPy_py_c : public fopAc_ac_c { public: @@ -788,6 +789,7 @@ public: inline static BOOL i_checkNowWolf() { return dComIfGp_getLinkPlayer()->i_checkWolf(); } inline bool checkZoraWearFlg() const; inline bool checkMagicArmorWearFlg() const; + inline static BOOL i_checkFirstMidnaDemo() { return i_dComIfGs_isEventBit(0xc10); } static daMidna_c* getMidnaActor() { return m_midnaActor; } diff --git a/include/d/bg/d_bg_s.h b/include/d/bg/d_bg_s.h index befe2aed02b..9bfb83b528d 100644 --- a/include/d/bg/d_bg_s.h +++ b/include/d/bg/d_bg_s.h @@ -43,7 +43,7 @@ public: int Release(dBgW_Base*); bool LineCross(cBgS_LinChk*); f32 GroundCross(cBgS_GndChk*); - static void ConvDzb(void*); + static void* ConvDzb(void*); fopAc_ac_c* GetActorPointer(int) const; dBgW_Base* GetBgWBasePointer(cBgS_PolyInfo const&) const; bool ChkPolySafe(cBgS_PolyInfo const&); diff --git a/include/d/bg/d_bg_s_acch.h b/include/d/bg/d_bg_s_acch.h index 8088837a38d..407b02b5c12 100644 --- a/include/d/bg/d_bg_s_acch.h +++ b/include/d/bg/d_bg_s_acch.h @@ -126,6 +126,7 @@ public: void ClrWallHit() { m_flags &= ~WALL_HIT; } void SetRoofNone() { m_flags |= ROOF_NONE; } void SetRoofHit() { m_flags |= ROOF_HIT; } + void SetWaterNone() { m_flags |= WATER_NONE; } bool ChkWallHit() { return m_flags & WALL_HIT; } void OffLineCheckHit() { m_flags &= ~LINE_CHECK_HIT; } void OffLineCheck() { m_flags &= ~LINE_CHECK; } diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index e03010cf773..ae2994b76c5 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -827,6 +827,10 @@ inline int dComIfG_setObjectRes(const char* name, u8 param_1, JKRHeap* heap) { return g_dComIfG_gameInfo.mResControl.setObjectRes(name, param_1, heap); } +inline int dComIfG_setObjectRes(const char* name, void* param_1, u32 param_2) { + return g_dComIfG_gameInfo.mResControl.setObjectRes(name, param_1, param_2, NULL); +} + inline int dComIfG_setStageRes(const char* name, JKRHeap* heap) { return g_dComIfG_gameInfo.mResControl.setStageRes(name, heap); } @@ -924,7 +928,7 @@ void dComIfGs_offZoneSwitch(int i_swBit, int i_roomNo); void dComIfGs_offOneZoneSwitch(int i_swBit, int i_roomNo); s8 dComIfGp_getReverb(int i_roomNo); void dComIfGs_gameStart(); -bool dComIfGs_wolfeye_effect_check(); +BOOL dComIfGs_wolfeye_effect_check(); BOOL dComIfGs_Wolf_Change_Check(); void dComIfGs_onVisitedRoom(int param_0); void dComIfGs_offVisitedRoom(int param_0); @@ -1698,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(); @@ -1744,6 +1752,11 @@ static dAttCatch_c* dComIfGp_att_getCatghTarget(); static void dComIfGp_setBottleStatus(u8 param_0, u8 param_1); bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_angle); + +inline void dComIfGp_itemDataInit() { + g_dComIfG_gameInfo.play.itemInit(); +} + inline bool i_dComIfGp_checkPlayerStatus0(int param_0, u32 flag) { return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 0, flag); } @@ -2878,22 +2891,22 @@ inline int dComIfGp_evmng_startDemo(int param_0) { return dComIfGp_getPEvtManager()->setStartDemo(param_0); } -inline void* dComIfGp_event_getTalkPartner() { +inline fopAc_ac_c* dComIfGp_event_getTalkPartner() { u32 t = g_dComIfG_gameInfo.play.getEvent().mPtT; return g_dComIfG_gameInfo.play.getEvent().convPId(t); } -inline void* dComIfGp_event_getItemPartner() { +inline fopAc_ac_c* dComIfGp_event_getItemPartner() { u32 i = g_dComIfG_gameInfo.play.getEvent().mPtI; return g_dComIfG_gameInfo.play.getEvent().convPId(i); } -inline void* dComIfGp_event_getPt1() { +inline fopAc_ac_c* dComIfGp_event_getPt1() { u32 pt1 = g_dComIfG_gameInfo.play.getEvent().mPt1; return g_dComIfG_gameInfo.play.getEvent().convPId(pt1); } -inline void* dComIfGp_event_getPt2() { +inline fopAc_ac_c* dComIfGp_event_getPt2() { u32 pt2 = g_dComIfG_gameInfo.play.getEvent().mPt2; return g_dComIfG_gameInfo.play.getEvent().convPId(pt2); } @@ -2917,6 +2930,10 @@ inline u16 i_dComIfGp_event_chkEventFlag(u16 flag) { return g_dComIfG_gameInfo.play.getEvent().chkEventFlag(flag); } +inline BOOL dComIfGp_event_chkTalkXY() { + return g_dComIfG_gameInfo.play.getEvent().chkTalkXY(); +} + inline void dComIfGp_event_setCullRate(f32 f) { g_dComIfG_gameInfo.play.getEvent().setCullRate(f); } @@ -2949,6 +2966,10 @@ inline int dComIfGp_evmng_getMySubstanceNum(int index, char* name) { return dComIfGp_getPEvtManager()->getMySubstanceNum(index, name); } +inline BOOL dComIfGp_evmng_ChkPresentEnd() { + return dComIfGp_getPEvtManager()->ChkPresentEnd(); +} + inline int dComIfGp_evmng_checkStartDemo() { return dComIfGp_getPEvtManager()->checkStartDemo(); } diff --git a/include/d/d_attention.h b/include/d/d_attention.h index 114151fcc63..0fec633004c 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -215,6 +215,9 @@ public: int GetActionCount() { return mActionCount; } int GetLockonCount() { return mLockonCount; } bool Lockon() { return LockonTruth() || chkFlag(0x20000000); } // only matches with -O2? + int ZHintRequest(fopAc_ac_c *param_1, int param_2) { + return mZHintTarget.request(param_1, param_2); + } static dist_entry& i_getDistTable(int i_no) { return dist_table[i_no]; } diff --git a/include/d/d_model.h b/include/d/d_model.h index 2a68d5bf39b..4623c46053d 100644 --- a/include/d/d_model.h +++ b/include/d/d_model.h @@ -46,7 +46,7 @@ public: /* 8009C8D8 */ dMdl_c* entry(J3DModelData*, u16, int); /* 8009C7AC */ static void create(); /* 8009C864 */ void remove(); - /* 8009C8C0 */ void reset(); + /* 8009C8C0 */ static void reset(); static dMdl_mng_c* m_myObj; diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index a8bd1b0dbbe..95ad1ff0458 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -18,7 +18,7 @@ public: /* 8003A348 */ int set(char const*, char const*, u8, JKRHeap*); /* 8003AB30 */ static void onWarpMaterial(J3DModelData*); /* 8003AC1C */ static void offWarpMaterial(J3DModelData*); - /* 8003AD08 */ void setWarpSRT(J3DModelData*, cXyz const&, f32, f32); + /* 8003AD08 */ static void setWarpSRT(J3DModelData*, cXyz const&, f32, f32); /* 8003AE14 */ static J3DModelData* loaderBasicBmd(u32, void*); /* 8003B30C */ int loadResource(); /* 8003B998 */ void deleteArchiveRes(); @@ -34,8 +34,7 @@ public: JKRArchive* getArchive() { return mArchive; } void incCount() { mCount++; } u16 decCount() { - mCount--; - return mCount; + return --mCount; } private: diff --git a/include/d/d_select_cursor.h b/include/d/d_select_cursor.h index 8d08fe368bc..698156c485d 100644 --- a/include/d/d_select_cursor.h +++ b/include/d/d_select_cursor.h @@ -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); } + void onPlayAllAnime() { field_0xb4 = 0xff; } + void offPlayAllAnime() { field_0xb4 = 0; } private: /* 0x04 */ J2DScreen* mpScreen; diff --git a/include/d/d_tresure.h b/include/d/d_tresure.h index cd6232c2a96..eb977e7959e 100644 --- a/include/d/d_tresure.h +++ b/include/d/d_tresure.h @@ -18,31 +18,36 @@ public: /* 0x13 */ s8 mAngleY; }; - class typeGroupData_c { + class typeGroupData_c : public data_s { public: - data_s* getDataPointer() { return &mData; } - const data_s* getConstDataPointer() const { return &mData; } + data_s* getDataPointer() { return (data_s*)this; } + const data_s* getConstDataPointer() const { return (data_s*)this; } typeGroupData_c* getNextDataPointer() const { return mNextData; } void setNextDataPointer(typeGroupData_c* data) { mNextData = data; } void setTypeGroupNo(u8 no) { mTypeGroupNo = no; } - u8 getNo() const { return mData.mNo; } - u8 getStatus() const { return mData.mStatus; } - void setStatus(u8 status) { mData.mStatus = status; } - void setRoomNo(s8 roomNo) { mData.mRoomNo = roomNo; } - s8 getRoomNo() const { return mData.mRoomNo; } - void setPos(const Vec& pos) { mData.mPos = pos; } - u8 getSwBit() const { return mData.mSwBit; } - const Vec* getPos() const { return &mData.mPos; } - int getAngleY() const { return mData.mAngleY; } + u8 getNo() const { return mNo; } + u8 getStatus() const { return mStatus; } + void setStatus(u8 status) { mStatus = status; } + void setRoomNo(s8 roomNo) { mRoomNo = roomNo; } + s8 getRoomNo() const { return mRoomNo; } + void setPos(const Vec& pos) { mPos = pos; } + u8 getSwBit() const { return mSwBit; } + const Vec* getPos() const { return &mPos; } + int getAngleY() const { return mAngleY; } - /* 0x00 */ data_s mData; /* 0x14 */ typeGroupData_c* mNextData; /* 0x18 */ u8 mTypeGroupNo; }; // Size: 0x1C struct list_class { /* 0x0 */ int field_0x0; - /* 0x4 */ data_s* field_0x4; + /* 0x4 */ typeGroupData_c* field_0x4; + /* 0x8 */ u8 mNumber; + }; + + struct type_group_list { + /* 0x0 */ typeGroupData_c* field_0x0; + /* 0x4 */ typeGroupData_c* field_0x4; /* 0x8 */ u8 mNumber; }; @@ -67,7 +72,7 @@ public: } static u8 const typeToTypeGroup[17][2]; - static list_class mTypeGroupListAll[17]; + static type_group_list mTypeGroupListAll[17]; static typeGroupData_c* mTypeGroupData; static u16 mNum; }; diff --git a/include/d/d_vibration.h b/include/d/d_vibration.h index 2bc721a34db..fe12038ec39 100644 --- a/include/d/d_vibration.h +++ b/include/d/d_vibration.h @@ -7,9 +7,9 @@ class dVibration_c { public: - /* 8006F268 */ void Run(); + /* 8006F268 */ int Run(); /* 8006FA24 */ bool StartShock(int, int, cXyz); - /* 8006FC0C */ void StartQuake(u8 const*, int, int, cXyz); + /* 8006FC0C */ bool StartQuake(u8 const*, int, int, cXyz); /* 8006FB10 */ bool StartQuake(int, int, cXyz); /* 8006FD94 */ int StopQuake(int); /* 8006FE00 */ void Kill(); @@ -43,16 +43,16 @@ private: /* 0x54 */ int field_0x54; /* 0x58 */ s32 field_0x58; /* 0x5C */ s32 field_0x5c; - /* 0x60 */ u32 field_0x60; + /* 0x60 */ s32 field_0x60; /* 0x64 */ s32 field_0x64; - /* 0x68 */ u32 field_0x68; + /* 0x68 */ s32 field_0x68; /* 0x6C */ u32 field_0x6c; /* 0x70 */ s32 field_0x70; /* 0x74 */ u32 field_0x74; /* 0x78 */ u32 field_0x78; - /* 0x7C */ u32 field_0x7c; + /* 0x7C */ s32 field_0x7c; /* 0x80 */ s32 field_0x80; - /* 0x84 */ u32 field_0x84; + /* 0x84 */ s32 field_0x84; /* 0x88 */ s32 field_0x88; /* 0x8C */ s32 field_0x8c; }; // Size: 0x90 diff --git a/include/d/event/d_event.h b/include/d/event/d_event.h index 6fdd1171430..2eb3dc5e497 100644 --- a/include/d/event/d_event.h +++ b/include/d/event/d_event.h @@ -125,7 +125,7 @@ public: dStage_MapEvent_dt_c* getStageEventDt(); void sceneChange(int exitId); u32 getPId(void*); - void* convPId(unsigned int); + fopAc_ac_c* convPId(unsigned int); void* getStbDemoData(char* resName); static dStage_MapEvent_dt_c* searchMapEventData(u8 mapToolID, s32 roomNo); static dStage_MapEvent_dt_c* searchMapEventData(u8 mapToolID); @@ -154,11 +154,12 @@ public: void onFlag2(u16 flag) { mFlag2 |= flag; } void offFlag2(u16 flag) { mFlag2 &= ~flag; } void setCullRate(f32 f) { mCullRate = f; } + BOOL chkTalkXY() { return field_0xed == 1 || field_0xed == 2; } bool i_isOrderOK() { return mEventStatus == 0 || mEventStatus == 2; } - void* getPt1() { return convPId(mPt1); } - void* getPt2() { return convPId(mPt2); } - void* getPtT() { return convPId(mPtT); } + fopAc_ac_c* getPt1() { return convPId(mPt1); } + fopAc_ac_c* getPt2() { return convPId(mPt2); } + fopAc_ac_c* getPtT() { return convPId(mPtT); } bool isChangeOK(void* param_0) { return mChangeOK == param_0; } u8 getPreItemNo() { return mPreItemNo; } diff --git a/include/d/file/d_file_select.h b/include/d/file/d_file_select.h index b1113c2011f..5c274e7574a 100644 --- a/include/d/file/d_file_select.h +++ b/include/d/file/d_file_select.h @@ -395,8 +395,8 @@ public: /* 0x0250 */ char* field_0x0250; /* 0x0254 */ STControl* mStick; /* 0x0258 */ u8 mDataNew[3]; - /* 0x025B */ u8 field_0x025b; - /* 0x025C */ u8 field_0x025c[0x0264 - 0x025C]; + /* 0x025B */ u8 field_0x025b[3]; + /* 0x025C */ u8 field_0x025e[0x0264 - 0x025E]; /* 0x0264 */ u8 field_0x0264; /* 0x0265 */ u8 mSelectNum; /* 0x0266 */ u8 field_0x0266; diff --git a/include/d/map/d_map_path_dmap.h b/include/d/map/d_map_path_dmap.h index 08af8253fbc..6b0ed898c08 100644 --- a/include/d/map/d_map_path_dmap.h +++ b/include/d/map/d_map_path_dmap.h @@ -18,6 +18,9 @@ public: /* 8003FB70 */ static void create(); /* 8003FBD0 */ static void reset(); /* 8003FC70 */ static void remove(); + static dDrawPath_c::room_class* getRoomPointer(int layerNo, int roomNo) { + return (mLayerList + 0x40*layerNo)[roomNo]; + } static dDrawPath_c::room_class** mLayerList; // this doesn't seem right, but can't figure it out atm static f32 mMinX; @@ -92,7 +95,7 @@ public: /* 8003FFC4 */ virtual void postDrawPath(); /* 800402C0 */ virtual bool isDrawPath(); /* 8003FE4C */ virtual GXColor* getBackColor() const; - /* 800402E0 */ virtual bool getFirstDrawLayerNo(); + /* 800402E0 */ virtual int getFirstDrawLayerNo(); /* 800402E8 */ virtual int getNextDrawLayerNo(int); /* 800409E0 */ virtual bool isDrawIconSingle(dTres_c::data_s const*, int, int, bool, bool, Vec const*) const; diff --git a/include/d/menu/d_menu_collect.h b/include/d/menu/d_menu_collect.h index 26ca21fb311..d5599adbb54 100644 --- a/include/d/menu/d_menu_collect.h +++ b/include/d/menu/d_menu_collect.h @@ -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; diff --git a/include/d/menu/d_menu_insect.h b/include/d/menu/d_menu_insect.h index 5ae137e84c1..e394a8a4f25 100644 --- a/include/d/menu/d_menu_insect.h +++ b/include/d/menu/d_menu_insect.h @@ -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); diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index 78ad8a4cc1e..2b1a57c7969 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -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(); diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h index b4927ab8f3a..ace935de8bc 100644 --- a/include/d/msg/d_msg_object.h +++ b/include/d/msg/d_msg_object.h @@ -136,7 +136,7 @@ public: /* 80238320 */ static void onMsgSend(); /* 8023834C */ void offMsgSend(); /* 80238378 */ void isMsgSend(); - /* 802383A4 */ bool isMouthCheck(); + /* 802383A4 */ static bool isMouthCheck(); /* 802383D0 */ static u32 getMessageID(); /* 802383E4 */ void getSmellTypeMessageID(); /* 80238410 */ static void setSmellType(u8); diff --git a/include/d/s/d_s_logo.h b/include/d/s/d_s_logo.h index 9f6502979ce..a4d5f249cbb 100644 --- a/include/d/s/d_s_logo.h +++ b/include/d/s/d_s_logo.h @@ -39,6 +39,7 @@ public: /* 0xF */ EXEC_SCENE_CHANGE, }; + dScnLogo_c() {} /* 802560B4 */ void preLoad_dyl_create(); /* 802560F8 */ void preLoad_dyl_remove(); /* 8025611C */ bool preLoad_dyl(); @@ -128,4 +129,6 @@ static int phase_0(dScnLogo_c* logo); static int phase_1(dScnLogo_c* logo); static int phase_2(dScnLogo_c* logo); +typedef int (*dScnLogo_Method)(dScnLogo_c*);; + #endif /* D_S_D_S_LOGO_H */ diff --git a/include/d/s/d_s_name.h b/include/d/s/d_s_name.h index d894b00859f..fd56c057019 100644 --- a/include/d/s/d_s_name.h +++ b/include/d/s/d_s_name.h @@ -2,5 +2,48 @@ #define D_S_D_S_NAME_H #include "dolphin/types.h" +#include "f_op/f_op_camera_mng.h" +#include "f_op/f_op_scene.h" + +class JKRExpHeap; +class dFile_select_c; +class dBrightCheck_c; + +class dScnName_camera_c : public camera_process_class { +public: + dScnName_camera_c() { field_0x22f = 84; } + /* 80259294 */ virtual ~dScnName_camera_c() {} +}; + +class dScnName_c : public scene_class { +public: + dScnName_c() {} + + /* 802588A0 */ s32 create(); + /* 80258B2C */ void setView(); + /* 80258BC8 */ s32 execute(); + /* 80258C5C */ s32 draw(); + /* 80258CC8 */ ~dScnName_c(); + /* 80258DD0 */ void FileSelectOpen(); + /* 80258E34 */ void FileSelectMain(); + /* 80258E78 */ void FileSelectMainNormal(); + /* 80258F20 */ void FileSelectClose(); + /* 80258FD4 */ void brightCheckOpen(); + /* 80259008 */ void brightCheck(); + /* 802590F8 */ void changeGameScene(); + +private: + /* 0x1C4 */ request_of_phase_process_class field_0x1c4; + /* 0x1CC */ JKRExpHeap* mHeap; + /* 0x1D0 */ JKRExpHeap* field_0x1d0; + /* 0x1D4 */ dScnName_camera_c mCamera; + /* 0x414 */ dFile_select_c* dFs_c; + /* 0x418 */ dBrightCheck_c* mBrightCheck; + /* 0x41C */ u8 field_0x41c; + /* 0x41D */ u8 field_0x41d; + /* 0x41E */ u8 field_0x41e; + /* 0x41F */ u8 field_0x41f; + /* 0x420 */ u8 field_0x420; +}; #endif /* D_S_D_S_NAME_H */ diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index fa3f80cdeab..dc3880cf182 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -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; } @@ -1111,7 +1113,7 @@ public: void removeZone(int zoneNo) { mZone[zoneNo].reset(); } void setNoFile(u8 file) { mNoFile = file; } u8 getNewFile() const { return mNewFile; } - void setNewFile(u8 file) { mNewFile |= file; } + void setNewFile(u8 file) { mNewFile = file; } static const int MEMORY_SWITCH = 0x80; static const int DAN_SWITCH = 0x40; diff --git a/include/d/save/d_save_HIO.h b/include/d/save/d_save_HIO.h index dfa7c8b1478..4943ca414d6 100644 --- a/include/d/save/d_save_HIO.h +++ b/include/d/save/d_save_HIO.h @@ -9,12 +9,12 @@ public: /* 8025C0A0 */ dSvBit_childTransformHIO_c(); /* 8025C0D4 */ void init(); - /* 8025C2E4 */ virtual ~dSvBit_childTransformHIO_c(); + /* 8025C2E4 */ virtual ~dSvBit_childTransformHIO_c() {} private: /* 0x04 */ u8 field_0x4; - /* 0x05 */ bool WF[4]; - /* 0x09 */ bool field_0x9[4]; + /* 0x05 */ u8 WF[4]; + /* 0x09 */ u8 field_0x9[4]; }; class dSvBit_childDarknessHIO_c { @@ -22,12 +22,12 @@ public: /* 8025C004 */ dSvBit_childDarknessHIO_c(); /* 8025C038 */ void init(); - /* 8025C32C */ virtual ~dSvBit_childDarknessHIO_c(); + /* 8025C32C */ virtual ~dSvBit_childDarknessHIO_c() {} private: /* 0x04 */ u8 field_0x4; - /* 0x05 */ bool TW[6]; - /* 0x0B */ bool field_0x9[6]; + /* 0x05 */ u8 TW[6]; + /* 0x0B */ u8 field_0xB[6]; }; class dSvBit_childOtherHIO_c { @@ -35,14 +35,14 @@ public: /* 8025C13C */ dSvBit_childOtherHIO_c(); /* 8025C178 */ void init(); - /* 8025C29C */ virtual ~dSvBit_childOtherHIO_c(); + /* 8025C29C */ virtual ~dSvBit_childOtherHIO_c() {} private: /* 0x04 */ u8 field_0x4; /* 0x05 */ u8 mDropNum; /* 0x06 */ u8 field_0x6; - /* 0x07 */ bool mLightVessel[4]; - /* 0x0B */ bool field_0xb[4]; + /* 0x07 */ u8 mLightVessel[4]; + /* 0x0B */ u8 field_0xb[4]; }; class dSvBit_childTbPerfectionHIO_c { @@ -50,17 +50,20 @@ public: /* 8025BF68 */ dSvBit_childTbPerfectionHIO_c(); /* 8025BF9C */ void init(); - /* 8025C374 */ virtual ~dSvBit_childTbPerfectionHIO_c(); + /* 8025C374 */ virtual ~dSvBit_childTbPerfectionHIO_c() {} private: /* 0x04 */ u8 field_0x4; - /* 0x05 */ bool field_0x5[0x40]; - /* 0x45 */ bool field_0x45[0x40]; + /* 0x05 */ u8 field_0x5[0x40]; + /* 0x45 */ u8 field_0x45[0x40]; }; class dSvBit_childTreasureHIO_c { public: - /* 8025C874 */ virtual ~dSvBit_childTreasureHIO_c(); + /* 8025C874 */ virtual ~dSvBit_childTreasureHIO_c() {} + void init() { + mPerfectSave.init(); + } private: /* 0x04 */ u8 field_0x4; @@ -72,7 +75,7 @@ public: /* 8025BCB0 */ dSvBit_childSwZoneHIO_c(); /* 8025BCE4 */ void init(); - /* 8025C524 */ virtual ~dSvBit_childSwZoneHIO_c(); + /* 8025C524 */ virtual ~dSvBit_childSwZoneHIO_c() {} private: /* 0x04 */ u8 field_0x4; @@ -85,12 +88,12 @@ public: /* 8025BB78 */ dSvBit_childSwPerfectionHIO_c(); /* 8025BBAC */ void init(); - /* 8025C5B4 */ virtual ~dSvBit_childSwPerfectionHIO_c(); + /* 8025C5B4 */ virtual ~dSvBit_childSwPerfectionHIO_c() {} private: /* 0x04 */ u8 field_0x4; - /* 0x05 */ bool field_0x5[0x80]; - /* 0x85 */ bool field_0x85[0x80]; + /* 0x05 */ u8 field_0x5[0x80]; + /* 0x85 */ u8 field_0x85[0x80]; }; class dSvBit_childSwOneZoneHIO_c { @@ -98,7 +101,7 @@ public: /* 8025BD10 */ dSvBit_childSwOneZoneHIO_c(); /* 8025BD44 */ void init(); - /* 8025C4DC */ virtual ~dSvBit_childSwOneZoneHIO_c(); + /* 8025C4DC */ virtual ~dSvBit_childSwOneZoneHIO_c() {} private: /* 0x04 */ u8 field_0x4; @@ -111,17 +114,23 @@ public: /* 8025BC14 */ dSvBit_childSwDungeonHIO_c(); /* 8025BC48 */ void init(); - /* 8025C56C */ virtual ~dSvBit_childSwDungeonHIO_c(); + /* 8025C56C */ virtual ~dSvBit_childSwDungeonHIO_c() {} private: /* 0x04 */ u8 field_0x4; - /* 0x05 */ bool field_0x5[0x40]; - /* 0x45 */ bool field_0x45[0x40]; + /* 0x05 */ u8 field_0x5[0x40]; + /* 0x45 */ u8 field_0x45[0x40]; }; class dSvBit_childSwitchHIO_c { public: - /* 8025C970 */ virtual ~dSvBit_childSwitchHIO_c(); + /* 8025C970 */ virtual ~dSvBit_childSwitchHIO_c() {} + void init() { + field_0x8.init(); + field_0x110.init(); + field_0x198.init(); + field_0x1e0.init(); + } private: /* 0x004 */ u8 field_0x4; @@ -136,12 +145,12 @@ public: /* 8025BEA8 */ dSvBit_childItZoneHIO_c(); /* 8025BEDC */ void init(); - /* 8025C404 */ virtual ~dSvBit_childItZoneHIO_c(); + /* 8025C404 */ virtual ~dSvBit_childItZoneHIO_c() {} private: /* 0x04 */ u8 field_0x4; - /* 0x05 */ bool field_0x5[0x20]; - /* 0x25 */ bool field_0x25[0x20]; + /* 0x05 */ u8 field_0x5[0x20]; + /* 0x25 */ u8 field_0x25[0x20]; }; class dSvBit_childItPerfectionHIO_c { @@ -149,12 +158,12 @@ public: /* 8025BD70 */ dSvBit_childItPerfectionHIO_c(); /* 8025BDA4 */ void init(); - /* 8025C494 */ virtual ~dSvBit_childItPerfectionHIO_c(); + /* 8025C494 */ virtual ~dSvBit_childItPerfectionHIO_c() {} private: /* 0x04 */ u8 field_0x4; - /* 0x05 */ bool field_0x5[0x20]; - /* 0x25 */ bool field_0x25[0x20]; + /* 0x05 */ u8 field_0x5[0x20]; + /* 0x25 */ u8 field_0x25[0x20]; }; class dSvBit_childItOneZoneHIO_c { @@ -162,12 +171,12 @@ public: /* 8025BF08 */ dSvBit_childItOneZoneHIO_c(); /* 8025BF3C */ void init(); - /* 8025C3BC */ virtual ~dSvBit_childItOneZoneHIO_c(); + /* 8025C3BC */ virtual ~dSvBit_childItOneZoneHIO_c() {} private: /* 0x04 */ u8 field_0x4; - /* 0x05 */ bool field_0x5[0x10]; - /* 0x15 */ bool field_0x15[0x10]; + /* 0x05 */ u8 field_0x5[0x10]; + /* 0x15 */ u8 field_0x15[0x10]; }; class dSvBit_childItDungeonHIO_c { @@ -175,17 +184,23 @@ public: /* 8025BE0C */ dSvBit_childItDungeonHIO_c(); /* 8025BE40 */ void init(); - /* 8025C44C */ virtual ~dSvBit_childItDungeonHIO_c(); + /* 8025C44C */ virtual ~dSvBit_childItDungeonHIO_c() {} private: /* 0x04 */ u8 field_0x4; - /* 0x05 */ bool field_0x5[0x80]; - /* 0x85 */ bool field_0x85[0x80]; + /* 0x05 */ u8 field_0x5[0x80]; + /* 0x85 */ u8 field_0x85[0x80]; }; class dSvBit_childItemHIO_c { public: - /* 8025C8D4 */ virtual ~dSvBit_childItemHIO_c(); + /* 8025C8D4 */ virtual ~dSvBit_childItemHIO_c() {} + void init() { + mFullSave.init(); + mDungeonSave.init(); + mZoneSave.init(); + mOneZoneSave.init(); + } private: /* 0x004 */ u8 field_0x4; @@ -199,7 +214,7 @@ class dSvBit_HIO_c { public: /* 8025C1F8 */ void init(); - /* 8025C6FC */ virtual ~dSvBit_HIO_c(); + /* 8025C6FC */ virtual ~dSvBit_HIO_c() {} /* 0x004 */ s8 field_0x4; /* 0x008 */ dSvBit_childSwitchHIO_c mSwitch; @@ -208,8 +223,8 @@ public: /* 0x468 */ dSvBit_childDarknessHIO_c mDarkness; /* 0x47C */ dSvBit_childTransformHIO_c mTransform; /* 0x48C */ dSvBit_childOtherHIO_c mOther; - /* 0x49C */ bool mTransformFlag; - /* 0x49D */ bool field_0x49d; + /* 0x49C */ u8 mTransformFlag; + /* 0x49D */ u8 field_0x49d; }; STATIC_ASSERT(sizeof(dSvBit_HIO_c) == 0x4A0); diff --git a/include/d/shop/d_shop_item_ctrl.h b/include/d/shop/d_shop_item_ctrl.h index 5a486dc093d..54b164a2f79 100644 --- a/include/d/shop/d_shop_item_ctrl.h +++ b/include/d/shop/d_shop_item_ctrl.h @@ -16,6 +16,7 @@ public: void setItemIndex(int i, u32 index) { mItemIndex[i] = index; } u32 getItemIndex(int i) { return mItemIndex[i]; } + void setMessageIndex(int i, u16 messageIndex) { mMessageIndex[i] = messageIndex; } u16 getMessageIndex(int i) { return mMessageIndex[i]; } private: diff --git a/include/d/shop/d_shop_system.h b/include/d/shop/d_shop_system.h index 048398c6ad6..5401ee44a2f 100644 --- a/include/d/shop/d_shop_system.h +++ b/include/d/shop/d_shop_system.h @@ -120,7 +120,7 @@ public: /* 8019A364 */ void setSoldOut(); /* 8019A4F4 */ void setSoldOutItemHide(); /* 8019A564 */ void deleteObject(); - /* 8019A5D0 */ void searchItemActor(); + /* 8019A5D0 */ int searchItemActor(); /* 8019AB00 */ int getFlowNodeNum(); /* 8019AB1C */ void setSellItemMax(u8); /* 8019AB24 */ bool checkShopOpen(); diff --git a/include/dolphin/vi/vi.h b/include/dolphin/vi/vi.h index 23abbcc4080..f233b302490 100644 --- a/include/dolphin/vi/vi.h +++ b/include/dolphin/vi/vi.h @@ -52,6 +52,7 @@ void* VIGetNextFrameBuffer(); void* VIGetCurrentFrameBuffer(); void VISetBlack(BOOL); u32 VIGetRetraceCount(); +u32 VIGetDTVStatus(); vu16 __VIRegs[59] : 0xCC002000; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index a702fbf32c5..22d2ae1eb2b 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -473,9 +473,9 @@ s32 fopAcM_orderMapToolAutoNextEvent(fopAc_ac_c*, u8, s16, u16, u16, u16); s32 fopAcM_orderPotentialEvent(fopAc_ac_c*, u16, u16, u16); s32 fopAcM_orderItemEvent(fopAc_ac_c*, u16, u16); s32 fopAcM_orderTreasureEvent(fopAc_ac_c*, fopAc_ac_c*, u16, u16); -void* fopAcM_getTalkEventPartner(const fopAc_ac_c*); -void* fopAcM_getItemEventPartner(const fopAc_ac_c*); -void* fopAcM_getEventPartner(const fopAc_ac_c*); +fopAc_ac_c* fopAcM_getTalkEventPartner(const fopAc_ac_c*); +fopAc_ac_c* fopAcM_getItemEventPartner(const fopAc_ac_c*); +fopAc_ac_c* fopAcM_getEventPartner(const fopAc_ac_c*); static void fopAcM_onSwitch(fopAc_ac_c const* param_0, int param_1); s32 fopAcM_createItemForPresentDemo(cXyz const* p_pos, int i_itemNo, u8 param_2, int i_itemBitNo, diff --git a/include/f_op/f_op_camera_mng.h b/include/f_op/f_op_camera_mng.h index ba595396cd0..d022417bad9 100644 --- a/include/f_op/f_op_camera_mng.h +++ b/include/f_op/f_op_camera_mng.h @@ -18,7 +18,7 @@ public: /* 0x22C */ s8 mPrm1; /* 0x22D */ s8 mPrm2; /* 0x22E */ s8 mPrm3; - /* 0x22F */ u8 field_0x22f; + /* 0x22F */ s8 field_0x22f; /* 0x230 */ csXyz mAngle; /* 0x238 */ int field_0x238; }; diff --git a/include/m_Do/m_Do_controller_pad.h b/include/m_Do/m_Do_controller_pad.h index c7b6fea361f..a33525fa0a0 100644 --- a/include/m_Do/m_Do_controller_pad.h +++ b/include/m_Do/m_Do_controller_pad.h @@ -59,6 +59,11 @@ public: static f32 getAnalogR(u32 pad) { return getCpadInfo(pad).mTriggerRight; } static f32 getAnalogL(u32 pad) { return getCpadInfo(pad).mTriggerLeft; } static BOOL isConnect(u32 pad) { return JUTGamePad::getPortStatus(pad) == 0; } + static void startMotorWave(u32 pad, void* param_2, JUTGamePad::CRumble::ERumble param_3, u32 param_4) { + m_gamePad[pad]->startMotorWave(param_2, param_3, param_4); + } + static void stopMotor(u32 pad) { m_gamePad[pad]->stopMotor(); } + static void stopMotorWave(u32 pad) { m_gamePad[pad]->stopMotorWave(); } static void stopMotorHard(u32 pad) { return m_gamePad[pad]->stopMotorHard(); } static void stopMotorWaveHard(u32 pad) { return m_gamePad[pad]->stopMotorWaveHard(); } diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index fa80315ac81..51c4d8baabe 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -26,6 +26,8 @@ public: s16 i_endF); /* 8000D428 */ int play(); + J3DFrameCtrl* getFrameCtrl() { return &mFrameCtrl; } + f32 getPlaySpeed() { return mFrameCtrl.getRate(); } void setPlaySpeed(f32 speed) { mFrameCtrl.setRate(speed); } f32 getFrame() { return mFrameCtrl.getFrame(); } f32 getEndFrame() { return mFrameCtrl.getEnd(); } @@ -272,6 +274,7 @@ public: f32 getEndFrame() { return mFrameCtrl.getEnd(); } BOOL checkFrame(f32 frame) { return mFrameCtrl.checkPass(frame); } J3DAnmTransform* getAnm() { return mpAnm; } + void changeAnm(J3DAnmTransform* anm) { mpAnm = anm; } bool isStop() { bool stopped = true; @@ -299,7 +302,7 @@ public: int, Z2Creature*, u32, u32); /* 800108F0 */ int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); + /* 80010E70 */ void setAnm(J3DAnmTransform* i_anm, int i_attr, f32 i_morf, f32 i_rate, f32 i_start, f32 i_end); /* 800110B0 */ int play(u32, s8); /* 80011154 */ void updateDL(); /* 800111C0 */ void entryDL(); diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h index 68ebab896b2..1c24974dc59 100644 --- a/include/m_Do/m_Do_graphic.h +++ b/include/m_Do/m_Do_graphic.h @@ -55,7 +55,7 @@ public: static int startFadeOut(int param_0) { return JFWDisplay::getManager()->startFadeOut(param_0); } static int startFadeIn(int param_0) { return JFWDisplay::getManager()->startFadeIn(param_0); } - static void setFadeColor(JUtility::TColor& color) { mFader->setColor(color); } + static void setFadeColor(JUtility::TColor color) { mFader->mColor.set(color); } static void setClearColor(JUtility::TColor color) { JFWDisplay::getManager()->setClearColor(color); } static void setBackColor(GXColor& color) { mBackColor = color; } static void endFrame() { JFWDisplay::getManager()->endFrame(); } @@ -73,11 +73,13 @@ 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; } static int getMaxX() { return 608; } static ResTIMG* getFrameBufferTimg() { return mFrameBufferTimg; } + static ResTIMG* getZbufferTimg() { return mZbufferTimg; } static void* getFrameBufferTex() { return mFrameBufferTex; } static void setFadeRate(f32 rate) { mFadeRate = rate; } static f32 getFadeRate() { return mFadeRate; } diff --git a/include/m_Do/m_Do_lib.h b/include/m_Do/m_Do_lib.h index 42b303bee32..33e6ae7f3fc 100644 --- a/include/m_Do/m_Do_lib.h +++ b/include/m_Do/m_Do_lib.h @@ -32,6 +32,8 @@ struct mDoLib_clipper { mClipper.calcViewFrustum(); } + static void setup(f32, f32, f32, f32); + static J3DUClipper mClipper; static f32 mSystemFar; static f32 mFovyRate; @@ -42,4 +44,8 @@ u8 mDoLib_setResTimgObj(ResTIMG const* res, GXTexObj* o_texObj, u32 tlut_name, GXTlutObj* o_tlutObj); void mDoLib_pos2camera(Vec* src, Vec* dst); +inline u32 calcAlphaCmpID(u32 param_1, u32 param_2, u32 param_3) { + return ((param_1 & 0xff) << 5) + ((param_2 & 0xff) << 3) + (param_3 & 0xff); +} + #endif /* M_DO_M_DO_LIB_H */ diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index 2d66ab19cec..c849395597b 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -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); @@ -31,10 +31,18 @@ inline void mDoMtx_multVecSR(Mtx m, const Vec* src, Vec* dst) { PSMTXMultVecSR(m, src, dst); } +inline void cMtx_concat(const Mtx a, const Mtx b, Mtx ab) { + PSMTXConcat(a, b, ab); +} + inline void mDoMtx_multVec(Mtx m, const Vec* src, Vec* dst) { PSMTXMultVec(m, src, dst); } +inline void mDoMtx_multVecArray(Mtx m, const Vec* src, Vec* dst, u32 count) { + PSMTXMultVecArray(m, src, dst, count); +} + inline void mDoMtx_copy(const Mtx src, Mtx dst) { PSMTXCopy(src, dst); } @@ -59,6 +67,14 @@ inline void cMtx_multVec(Mtx mtx, const Vec* src, Vec* dst) { mDoMtx_multVec(mtx, src, dst); } +inline void cMtx_copy(const Mtx src, Mtx dst) { + mDoMtx_copy(src, dst); +} + +inline void cMtx_multVecArray(Mtx mtx, const Vec* src, Vec* dst, u32 count) { + mDoMtx_multVecArray(mtx, src, dst, count); +} + inline void mDoMtx_multVecZero(MtxP param_0, Vec* param_1) { param_1->x = param_0[0][3]; param_1->y = param_0[1][3]; diff --git a/include/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.h b/include/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.h index 743e2486f2d..c10791a6c22 100644 --- a/include/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.h +++ b/include/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.h @@ -2,5 +2,123 @@ #define D_A_NPC_ASH_H #include "dolphin/types.h" +#include "d/a/d_a_npc.h" + +class daNpcAsh_c; + +typedef bool (daNpcAsh_c::*daNpcAsh_actionFn)(void*); +typedef BOOL (daNpcAsh_c::*daNpcAsh_eventFn)(int); + +class daNpcAsh_c : public daNpcF_c { +private: + /* 0xB48 */ Z2Creature mZ2; + /* 0xBD8 */ J3DModel* mModelBow; + /* 0xBDC */ J3DModel* mModelQuiver; + /* 0xBE0 */ daNpcF_MatAnm_c* mpMatAnm; + /* 0xBE4 */ daNpcF_Lookat_c mLookat; + /* 0xC80 */ daNpcF_ActorMngr_c mActorMngr[6]; + /* 0xCB0 */ fopAc_ac_c* mTalkPartner; + /* 0xCB4 */ u32 field_0xcb4; // unused + /* 0xCB8 */ dCcD_Cyl mCcCyl[2]; + /* 0xF30 */ daNpcAsh_actionFn mpActionFn; + /* 0xF3C */ request_of_phase_process_class mPhase[2]; + /* 0xF4C */ u32 mItemPartnerId; + /* 0xF50 */ u32 field_0xf50; // unused + /* 0xF54 */ u32 field_0xf54; + /* 0xF58 */ s16 mMessageNo; + /* 0xF5A */ s16 mLookMode; + /* 0xF5C */ u16 field_0xf5c; + /* 0xF5E */ u8 mMapToolId; + /* 0xF5F */ u8 field_0xf5f; + /* 0xF60 */ u8 field_0xf60; + +public: + /* 809582EC */ daNpcAsh_c(); + /* 80958610 */ ~daNpcAsh_c(); + /* 809587A0 */ cPhs__Step Create(); + /* 80958B68 */ BOOL CreateHeap(); + /* 809590C4 */ int Delete(); + /* 809590F8 */ int Execute(); + /* 8095911C */ int Draw(); + /* 80959238 */ bool ctrlJoint(J3DJoint*, J3DModel*); + /* 80959458 */ static BOOL createHeapCallBack(fopAc_ac_c*); + /* 80959478 */ static BOOL ctrlJointCallBack(J3DJoint*, int); + /* 809594C4 */ bool setExpressionAnm(int, bool); + /* 809596E0 */ bool setExpressionBtp(int); + /* 809597C0 */ void setMotionAnm(int i_idx, f32 i_morf); + /* 80959910 */ void reset(); + /* 80959B28 */ /* inline */ bool setAction(daNpcAsh_actionFn); + /* 80959BD0 */ /* inline */ bool isSneaking(); + /* 80959C40 */ bool wait_type0(void*); + /* 8095A67C */ void setMotion(int, f32, int); + /* 8095A6C0 */ void setExpression(int, f32); + /* 8095A6EC */ bool wait_type1(void*); + /* 8095A8EC */ bool talk(void*); + /* 8095AD28 */ bool demo(void*); + /* 8095B164 */ bool leave(void*); + /* 8095B48C */ BOOL EvCut_Introduction(int cutIndex); + /* 8095B58C */ BOOL EvCut_Meeting(int cutIndex); + /* 8095B83C */ BOOL EvCut_WiretapSponsor(int cutIndex); + /* 8095BA80 */ BOOL EvCut_WiretapEntrant(int cutIndex); + /* 8095BCF0 */ void setParam(); + /* 8095BF6C */ BOOL main(); + /* 8095C200 */ /* inline */ void playMotion(); + /* 8095C520 */ BOOL ctrlBtk(); + /* 8095C5C4 */ void setAttnPos(); + /* 8095C9BC */ void lookat(); + /* 8095CC8C */ BOOL drawDbgInfo(); + + s16 getMessageNo() { return shape_angle.x; } + bool isMap() { return !(daNpcF_chkEvtBit(0x10c) || !daNpcF_chkEvtBit(0x108)); } + inline void setExpressionTalkAfter() { setExpression(7, -1.0f); } + inline void setLookMode(int i_lookMode, fopAc_ac_c* i_talkPartner); + inline void searchActors(); + inline BOOL chkFindPlayer(); + inline bool step(s16, bool); + inline void playExpression(); + + #ifdef NONMATCHING + static daNpcAsh_eventFn mEvtSeqList[6]; + #else + static u8 mEvtSeqList[72]; + #endif +}; + +STATIC_ASSERT(sizeof(daNpcAsh_c) == 0xF64); + +class daNpcAsh_Param_c { +public: + /* 8095D5D4 */ virtual ~daNpcAsh_Param_c(); + + struct param { + /* 0x00 */ f32 m00; + /* 0x04 */ f32 mGravity; + /* 0x08 */ f32 m08; + /* 0x0C */ f32 mShadow; + /* 0x10 */ f32 mSttsWeight; + /* 0x14 */ f32 m14; + /* 0x18 */ f32 m18; + /* 0x1C */ f32 m1C; + /* 0x20 */ f32 m20; + /* 0x24 */ f32 m24; + /* 0x28 */ f32 m28; + /* 0x2C */ f32 m2C; + /* 0x30 */ f32 m30; + /* 0x34 */ f32 m34; + /* 0x38 */ f32 m38; + /* 0x3C */ f32 m3C; + /* 0x40 */ f32 mLookatScl; + /* 0x44 */ f32 m44; + /* 0x48 */ s16 m48; + /* 0x4A */ s16 m4A; + /* 0x4C */ s16 m4C; + /* 0x4E */ s16 m4E; + /* 0x50 */ f32 mSightAngle; + /* 0x54 */ f32 m54[3]; + /* 0x60 */ u16 m60[6]; + }; + + static param const m; +}; #endif /* D_A_NPC_ASH_H */ diff --git a/include/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.h b/include/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.h index 285883ee1c4..0dde03517fe 100644 --- a/include/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.h +++ b/include/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.h @@ -1,6 +1,22 @@ #ifndef D_A_OBJ_DIGHOLL_H #define D_A_OBJ_DIGHOLL_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +class daObjDigholl_c : public fopAc_ac_c { +public: + /* 80BDC618 */ int create(); + /* 80BDC75C */ ~daObjDigholl_c(); + /* 80BDC7D8 */ int execute(); + /* 80BDCB0C */ int draw(); + + /* 0x568 */ u8 field_0x568; + /* 0x569 */ u8 field_0x569; + /* 0x56A */ u8 field_0x56a; + /* 0x56B */ u8 field_0x56b; + /* 0x56C */ s16 field_0x56c; + /* 0x56E */ s16 field_0x56e; +}; // Size: 0x570 #endif /* D_A_OBJ_DIGHOLL_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h b/include/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h index da044153b08..e2736ac4659 100644 --- a/include/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h +++ b/include/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h @@ -1,6 +1,27 @@ #ifndef D_A_OBJ_KJGJS_H #define D_A_OBJ_KJGJS_H -#include "dolphin/types.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +class daObjKJgjs_c : public dBgS_MoveBgActor { +public: + /* 80C46098 */ int create1st(); + /* 80C4616C */ void setMtx(); + /* 80C461E4 */ int CreateHeap(); + /* 80C46264 */ int Create(); + /* 80C46310 */ int Execute(f32 (**)[3][4]); + /* 80C46320 */ int Draw(); + /* 80C463C4 */ int Delete(); + /* 80C464CC */ virtual ~daObjKJgjs_c(); + + u32 getType() { return fopAcM_GetParamBit(this, 0, 4); } + + /* 0x5A0 */ request_of_phase_process_class mPhaseReq; + /* 0x5A8 */ Mtx mMtx[2]; + /* 0x608 */ J3DModel* mpModel; + /* 0x60C */ s32 field_0x60c; +}; // Size: 0x610 #endif /* D_A_OBJ_KJGJS_H */ diff --git a/include/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h b/include/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h index 108bd6bf8d8..61dc4fbec24 100644 --- a/include/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h +++ b/include/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h @@ -1,6 +1,30 @@ #ifndef D_A_TAG_EVTAREA_H #define D_A_TAG_EVTAREA_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class daTag_EvtArea_c : public fopAc_ac_c { +public: + /* 8048C4F8 */ cPhs__Step create(); + /* 8048C728 */ bool Delete(); + /* 8048C730 */ bool Execute(); + /* 8048C894 */ bool Draw(); + /* 8048C89C */ BOOL isDelete(); + /* 8048C94C */ BOOL chkPointInArea(cXyz, cXyz); + /* 8048CD08 */ BOOL chkPointInArea(cXyz); + /* 8048CD68 */ virtual ~daTag_EvtArea_c(); + + inline s32 getType(); + inline u32 getOnEvtBit(); + inline u32 getOffEvtBit(); + inline u8 getBitSW(); + inline u8 getBitSW2(); + +private: + /* 0x568 vtable */ + /* 0x56C */ u8 field_0x56c; +}; + +STATIC_ASSERT(sizeof(daTag_EvtArea_c) == 0x570); #endif /* D_A_TAG_EVTAREA_H */ diff --git a/include/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.h b/include/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.h index 0b3799c0095..261e5288140 100644 --- a/include/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.h +++ b/include/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.h @@ -16,6 +16,7 @@ public: /* 80D61050 */ u8 getSwitchBit2(); /* 80D6105C */ void initialize(); /* 80D61168 */ virtual ~daTag_ShopItem_c(); + s32 getProcessID() { return field_0x56c; } /* 0x56C */ s32 field_0x56c; /* 0x570 */ s16 field_0x570; diff --git a/include/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.h b/include/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.h index 510dfa5d8b3..fa13fcbb8c9 100644 --- a/include/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.h +++ b/include/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.h @@ -2,5 +2,36 @@ #define D_A_TAG_WLJUMP_H #include "dolphin/types.h" +#include "f_op/f_op_actor.h" +#include "d/msg/d_msg_flow.h" +#include "d/com/d_com_inf_game.h" + +struct dPath; + +struct daTagWljump_c : fopAc_ac_c { + /* 80D64EB8 */ int create(); + /* 80D65004 */ ~daTagWljump_c(); + /* 80D65090 */ int execute(); + /* 80D6589C */ int draw(); + + int dComIfGp_att_ZHintRequest(fopAc_ac_c *param_1, int param_2) { + return dComIfGp_getAttention().ZHintRequest(param_1, param_2); + } + + /* 0x568 */ s8 field_0x568; + /* 0x568 */ s8 field_0x569; + /* 0x568 */ u8 field_0x56a; + /* 0x568 */ u8 field_0x56b; + /* 0x56C */ u8 field_0x56c[4]; + /* 0x570 */ u8 field_0x570; + /* 0x571 */ u8 field_0x571; + /* 0x572 */ u8 field_0x572; + /* 0x573 */ u8 field_0x573; + /* 0x574 */ s16 field_0x574; + /* 0x574 */ u16 field_0x576; + /* 0x578 */ dMsgFlow_c mMsgFlow; + /* 0x5C4 */ dPath* field_0x5c4; + /* 0x5C8 */ f32 field_0x5c8; +}; #endif /* D_A_TAG_WLJUMP_H */ diff --git a/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp index d98e1baf0bf..8230388584f 100644 --- a/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -2161,7 +2161,7 @@ asm void J3DPEBlockFull::setAlphaComp(J3DAlphaComp const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DPEBlockFull::getAlphaComp() { +asm J3DAlphaComp* J3DPEBlockFull::getAlphaComp() { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getAlphaComp__14J3DPEBlockFullFv.s" } @@ -2383,7 +2383,7 @@ asm void J3DPEBlockFogOff::setAlphaComp(J3DAlphaComp const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DPEBlockFogOff::getAlphaComp() { +asm J3DAlphaComp* J3DPEBlockFogOff::getAlphaComp() { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getAlphaComp__16J3DPEBlockFogOffFv.s" } @@ -2619,7 +2619,7 @@ asm void J3DTevBlock16::setTevOrder(u32 param_0, J3DTevOrder const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTevBlock16::getTevOrder(u32 param_0) { +asm J3DTevOrder* J3DTevBlock16::getTevOrder(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevOrder__13J3DTevBlock16FUl.s" } @@ -3672,7 +3672,7 @@ asm void J3DTevBlock4::setTevOrder(u32 param_0, J3DTevOrder const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTevBlock4::getTevOrder(u32 param_0) { +asm J3DTevOrder* J3DTevBlock4::getTevOrder(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevOrder__12J3DTevBlock4FUl.s" } @@ -4065,7 +4065,7 @@ asm void J3DTevBlock2::setTevOrder(u32 param_0, J3DTevOrder const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTevBlock2::getTevOrder(u32 param_0) { +asm J3DTevOrder* J3DTevBlock2::getTevOrder(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevOrder__12J3DTevBlock2FUl.s" } @@ -4458,7 +4458,7 @@ asm void J3DTevBlock1::setTevOrder(u32 param_0, J3DTevOrder const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTevBlock1::getTevOrder(u32 param_0) { +asm J3DTevOrder* J3DTevBlock1::getTevOrder(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevOrder__12J3DTevBlock1FUl.s" } @@ -4712,7 +4712,7 @@ asm void J3DTevBlockPatched::setTevOrder(u32 param_0, J3DTevOrder const* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTevBlockPatched::getTevOrder(u32 param_0) { +asm J3DTevOrder* J3DTevBlockPatched::getTevOrder(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTevOrder__18J3DTevBlockPatchedFUl.s" } @@ -4980,7 +4980,7 @@ asm void J3DTexGenBlockPatched::setTexGenNum(u32 const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTexGenBlockPatched::getTexGenNum() const { +asm u32 J3DTexGenBlockPatched::getTexGenNum() const { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexGenNum__21J3DTexGenBlockPatchedCFv.s" } @@ -5001,7 +5001,7 @@ asm void J3DTexGenBlockPatched::setTexCoord(u32 param_0, J3DTexCoord const* para #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DTexGenBlockPatched::getTexCoord(u32 param_0) { +asm J3DTexCoord* J3DTexGenBlockPatched::getTexCoord(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexCoord__21J3DTexGenBlockPatchedFUl.s" } @@ -5227,7 +5227,7 @@ asm void J3DColorBlockLightOn::setColorChan(u32 param_0, J3DColorChan const& par #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DColorBlockLightOn::getColorChan(u32 param_0) { +asm J3DColorChan* J3DColorBlockLightOn::getColorChan(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChan__20J3DColorBlockLightOnFUl.s" } @@ -5501,7 +5501,7 @@ asm void J3DColorBlockLightOff::setColorChan(u32 param_0, J3DColorChan const& pa #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool J3DColorBlockLightOff::getColorChan(u32 param_0) { +asm J3DColorChan* J3DColorBlockLightOff::getColorChan(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DMatBlock/getColorChan__21J3DColorBlockLightOffFUl.s" } diff --git a/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp index c332c292d5a..d8d01eddeba 100644 --- a/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp @@ -82,7 +82,7 @@ extern "C" void _restgpr_26(); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DClusterLoaderDataBase::load(void const* param_0) { +asm void* J3DClusterLoaderDataBase::load(void const* param_0) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DClusterLoader/load__24J3DClusterLoaderDataBaseFPCv.s" } diff --git a/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp index 78ad78ab7d7..535ee61efcd 100644 --- a/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp @@ -460,7 +460,7 @@ asm J3DModelLoader::J3DModelLoader() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DModelLoaderDataBase::load(void const* param_0, u32 param_1) { +asm void* J3DModelLoaderDataBase::load(void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/load__22J3DModelLoaderDataBaseFPCvUl.s" } diff --git a/libs/JSystem/JAudio2/JASAudioThread.cpp b/libs/JSystem/JAudio2/JASAudioThread.cpp index b67d7c792e7..10ba8cd1399 100644 --- a/libs/JSystem/JAudio2/JASAudioThread.cpp +++ b/libs/JSystem/JAudio2/JASAudioThread.cpp @@ -4,30 +4,24 @@ // #include "JSystem/JAudio2/JASAudioThread.h" +#include "JSystem/JAudio2/JASDriverIF.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "dolphin/os/OS.h" +#include "dolphin/dsp/dsp.h" // // Types: // -struct JKRHeap { - static u8 sSystemHeap[4]; - static u8 sCurrentHeap[4]; -}; - -struct JKRThread { - /* 802D1610 */ JKRThread(JKRHeap*, u32, int, int); - /* 802D1758 */ ~JKRThread(); -}; - struct JASProbe { - /* 80290EE4 */ void start(s32, char const*); - /* 80290F24 */ void stop(s32); + /* 80290EE4 */ static void start(s32, char const*); + /* 80290F24 */ static void stop(s32); }; template -struct JASMemPool_MultiThreaded {}; +struct JASMemPool {}; + /* JASMemPool_MultiThreaded */ struct JASMemPool_MultiThreaded__template2 { /* 802978DC */ void func_802978DC(void* _this); @@ -35,27 +29,17 @@ struct JASMemPool_MultiThreaded__template2 { struct JASGenericMemPool { /* 80290848 */ JASGenericMemPool(); - /* 802908C8 */ void newMemPool(u32, int); + /* 802908C8 */ static void newMemPool(u32, int); }; struct JASDsp { - /* 8029D958 */ void boot(void (*)(void*)); - /* 8029D9C4 */ void finishWork(u16); - /* 8029DAC8 */ void initBuffer(); -}; - -struct JASDriver { - /* 8029C388 */ void initAI(void (*)(void)); - /* 8029C4E4 */ void startDMA(); - /* 8029C504 */ void stopDMA(); - /* 8029C568 */ void updateDac(); - /* 8029C6C4 */ void updateDSP(); - /* 8029C900 */ void finishDSPFrame(); - /* 8029E2F8 */ void updateDacCallback(); + /* 8029D958 */ static void boot(void (*)(void*)); + /* 8029D9C4 */ static void finishWork(u16); + /* 8029DAC8 */ static void initBuffer(); }; struct JASDSPChannel { - /* 8029D3C8 */ void initAll(); + /* 8029D3C8 */ static void initAll(); }; // @@ -96,67 +80,41 @@ extern "C" void* __nw__FUlP7JKRHeapi(); extern "C" void __dl__FPv(); extern "C" void __ct__9JKRThreadFP7JKRHeapUlii(); extern "C" void __dt__9JKRThreadFv(); -extern "C" void OSDisableInterrupts(); -extern "C" void OSRestoreInterrupts(); -extern "C" void OSSendMessage(); -extern "C" void OSReceiveMessage(); -extern "C" void OSJamMessage(); -extern "C" void OSInitThreadQueue(); -extern "C" void OSExitThread(); -extern "C" void OSResumeThread(); -extern "C" void OSSleepThread(); -extern "C" void DSPCheckMailFromDSP(); -extern "C" void DSPReadMailFromDSP(); extern "C" void __register_global_object(); extern "C" extern u8 data_80431B34[16 + 4 /* padding */]; -extern "C" extern u8 JASDram[4]; extern "C" extern u8 struct_80451260[8]; extern "C" u8 sSystemHeap__7JKRHeap[4]; extern "C" u8 sCurrentHeap__7JKRHeap[4]; extern "C" extern u8 __OSReport_disable; +extern JKRHeap* JASDram; // // Declarations: // /* ############################################################################################## */ -/* 803C78E0-803C78F0 024A00 0010+00 2/2 0/0 0/0 .data __vt__14JASAudioThread */ -SECTION_DATA extern void* __vt__14JASAudioThread[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14JASAudioThreadFv, - (void*)run__14JASAudioThreadFv, -}; /* 8029CCDC-8029CD4C 29761C 0070+00 1/1 0/0 0/0 .text __ct__14JASAudioThreadFiiUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JASAudioThread::JASAudioThread(int param_0, int param_1, u32 param_2) { - nofralloc -#include "asm/JSystem/JAudio2/JASAudioThread/__ct__14JASAudioThreadFiiUl.s" +JASAudioThread::JASAudioThread(int stackSize, int msgCount, u32 threadPriority) + : + JKRThread(JASDram, threadPriority, msgCount, stackSize), + JASGlobalInstance(true) +{ + sbPauseFlag = false; + OSInitThreadQueue(&sThreadQueue); } -#pragma pop /* 8029CD4C-8029CDC0 29768C 0074+00 0/0 1/1 0/0 .text create__14JASAudioThreadFl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASAudioThread::create(s32 param_0) { - nofralloc -#include "asm/JSystem/JAudio2/JASAudioThread/create__14JASAudioThreadFl.s" +void JASAudioThread::create(long threadPriority) { + JASAudioThread* sAudioThread = new (JASDram, 0) JASAudioThread(threadPriority, 0x10, 0x1400); + sAudioThread->setCurrentHeap(JKRGetSystemHeap()); + sAudioThread->resume(); } -#pragma pop /* 8029CDC0-8029CDEC 297700 002C+00 0/0 1/1 0/0 .text stop__14JASAudioThreadFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASAudioThread::stop() { - nofralloc -#include "asm/JSystem/JAudio2/JASAudioThread/stop__14JASAudioThreadFv.s" +void JASAudioThread::stop() { + jamMessageBlock((void*)2); } -#pragma pop /* ############################################################################################## */ /* 8039B338-8039B338 027998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -169,18 +127,93 @@ SECTION_DEAD static char const* const stringBase_8039B338 = "SFR_DSP"; static u8 lit_205[12 + 4 /* padding */]; /* 804512D8-804512E0 0007D8 0004+04 1/1 2/2 0/0 .sbss snIntCount__14JASAudioThread */ -u8 JASAudioThread::snIntCount[4 + 4 /* padding */]; +volatile int JASAudioThread::snIntCount; + +class Lock { +public: + Lock() { + mInterrupts = OSDisableInterrupts(); + } + ~Lock() { + OSRestoreInterrupts(mInterrupts); + } +private: + BOOL mInterrupts; +}; + +class JASChannel {}; + +template +class JASMemPool_MultiThreaded { +public: + static void newMemPool(int param_1) { + Lock lock; + JASGenericMemPool::newMemPool(0x108, param_1); + } +}; + +template +class JASPoolAllocObject_MultiThreaded { +public: + static void newMemPool(int param_1) { + JASMemPool_MultiThreaded::newMemPool(param_1); + } +}; /* 8029CDEC-8029CF68 29772C 017C+00 1/0 0/0 0/0 .text run__14JASAudioThreadFv */ +// JASPoolAllocObject_MultiThreaded is complex +#ifdef NONMATCHING +void* JASAudioThread::run() { + i_OSInitFastCast(); + JASDriver::initAI(DMACallback); + JASDsp::boot(DSPCallback); + JASDsp::initBuffer(); + JASDSPChannel::initAll(); + + JASPoolAllocObject_MultiThreaded::newMemPool(0x48); + JASDriver::startDMA(); + + while (true) { + OSMessage msg = waitMessageBlock(); + switch ((int)msg) { + case AUDIOMSG_DMA: + if (sbPauseFlag) { + JASDriver::stopDMA(); + OSSleepThread(&sThreadQueue); + } + JASDriver::updateDac(); + JASDriver::updateDacCallback(); + break; + + case AUDIOMSG_DSP: + snIntCount--; + if (snIntCount == 0) { + JASProbe::stop(7); + JASDriver::finishDSPFrame(); + } else { + JASProbe::start(2, "SFR_DSP"); + JASDriver::updateDSP(); + JASProbe::stop(2); + } + break; + + case AUDIOMSG_STOP: + JASDriver::stopDMA(); + OSExitThread(NULL); + break; + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASAudioThread::run() { +asm void* JASAudioThread::run() { nofralloc #include "asm/JSystem/JAudio2/JASAudioThread/run__14JASAudioThreadFv.s" } #pragma pop - +#endif /* ############################################################################################## */ /* 8039B338-8039B338 027998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ #pragma push @@ -191,33 +224,26 @@ SECTION_DEAD static char const* const pad_8039B34B = "\0\0\0\0\0\0\0\0\0\0\0\0\0 #pragma pop /* 8029CF68-8029CFBC 2978A8 0054+00 1/1 0/0 0/0 .text DMACallback__14JASAudioThreadFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASAudioThread::DMACallback() { - nofralloc -#include "asm/JSystem/JAudio2/JASAudioThread/DMACallback__14JASAudioThreadFv.s" +void JASAudioThread::DMACallback() { + JASAudioThread* thread = getInstance(); + JASProbe::stop(4); + JASProbe::start(4, "UPDATE-DAC"); + thread->sendMessage((void*)AUDIOMSG_DMA); } -#pragma pop /* 8029CFBC-8029D028 2978FC 006C+00 1/1 0/0 0/0 .text DSPCallback__14JASAudioThreadFPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASAudioThread::DSPCallback(void* param_0) { - nofralloc -#include "asm/JSystem/JAudio2/JASAudioThread/DSPCallback__14JASAudioThreadFPv.s" -} -#pragma pop +void JASAudioThread::DSPCallback(void*) { + JASAudioThread* thread = getInstance(); + while (DSPCheckMailFromDSP() == 0) { } -/* 8029D028-8029D0B4 297968 008C+00 1/0 0/0 0/0 .text __dt__14JASAudioThreadFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JASAudioThread::~JASAudioThread() { - nofralloc -#include "asm/JSystem/JAudio2/JASAudioThread/__dt__14JASAudioThreadFv.s" + u32 mail = DSPReadMailFromDSP(); + if (mail >> 0x10 == 0xF355) { + if ((mail & 0xFF00) == 0xFF00) { + thread->sendMessage((void*)AUDIOMSG_DSP); + } else { + JASDsp::finishWork(mail); + } + } } -#pragma pop /* 8039B338-8039B338 027998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JAudio2/JASSeqCtrl.cpp b/libs/JSystem/JAudio2/JASSeqCtrl.cpp index b8ed73edb3d..6d92d7fea8d 100644 --- a/libs/JSystem/JAudio2/JASSeqCtrl.cpp +++ b/libs/JSystem/JAudio2/JASSeqCtrl.cpp @@ -6,217 +6,227 @@ #include "JSystem/JAudio2/JASSeqCtrl.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "JSystem/JAudio2/JASSeqReader.h" +#include "JSystem/JAudio2/JASTrack.h" // // Types: // -struct JASTrack { - /* 80292220 */ void checkNoteStop(u32) const; -}; - -struct JASSeqReader { - /* 80296108 */ void init(); - /* 80296148 */ void init(void*); -}; - +// TODO: Use JASSeqParser.hh when possible struct JASSeqParser { - /* 80293CAC */ ~JASSeqParser(); + /* 80293CAC */ inline virtual ~JASSeqParser() {} + /* 802958D4 */ virtual int parse(JASTrack*); + /* 80295540 */ virtual void execNoteOnMidi(JASTrack*, u32, u32, u32); + /* 80295498 */ virtual void execNoteOnGate(JASTrack*, u32, u32, u32, u32); + /* 80295570 */ virtual void execNoteOff(JASTrack*, u32); + /* 8029559C */ virtual void execCommand(JASTrack*, s32 (JASSeqParser::*)(JASTrack*, u32*), u32, u32*); + + static u8 sCmdInfo[1536]; + static u8 sExtCmdInfo[4080]; + static u8 sCallBackFunc[4]; }; struct JASSeqCtrl { - struct IntrType {}; + enum IntrType { + INTRTYPE_VALUE_0, + INTRTYPE_VALUE_1, + INTRTYPE_VALUE_2, + INTRTYPE_VALUE_3, + INTRTYPE_VALUE_4, + INTRTYPE_VALUE_5, + INTRTYPE_VALUE_6, + }; /* 802938BC */ JASSeqCtrl(); /* 80293924 */ void init(); /* 80293980 */ void start(void*, u32); - /* 802939C4 */ void tickProc(JASTrack*); + /* 802939C4 */ int tickProc(JASTrack*); /* 80293ABC */ void interrupt(JASSeqCtrl::IntrType); /* 80293AE0 */ void setIntrMask(u32); /* 80293AF0 */ void clrIntrMask(u32); - /* 80293B00 */ void retIntr(); - /* 80293B28 */ void findIntr(); + /* 80293B00 */ int retIntr(); + /* 80293B28 */ int findIntr(); /* 80293B78 */ void checkIntr(); /* 80293BE8 */ void timerProcess(); - static u8 sDefaultParser[4 + 4 /* padding */]; + u32 get24(int param_0) { + return mReader.get24(param_0); + } + + /* 0x00 */ JASSeqReader mReader; + /* 0x3c */ JASSeqParser* field_0x3c; + /* 0x40 */ s32 field_0x40; + /* 0x44 */ void* field_0x44; + /* 0x48 */ u32 field_0x48; + /* 0x4c */ u16 field_0x4c; + /* 0x4e */ u16 field_0x4e; + /* 0x50 */ u8 field_0x50; + /* 0x51 */ u8 field_0x51; + /* 0x52 */ u16 field_0x52; + /* 0x54 */ u32 field_0x54; + /* 0x58 */ u32 field_0x58; + static JASSeqParser sDefaultParser; }; // // Forward References: // -extern "C" void __ct__10JASSeqCtrlFv(); -extern "C" void init__10JASSeqCtrlFv(); -extern "C" void start__10JASSeqCtrlFPvUl(); -extern "C" void tickProc__10JASSeqCtrlFP8JASTrack(); -extern "C" void interrupt__10JASSeqCtrlFQ210JASSeqCtrl8IntrType(); -extern "C" void setIntrMask__10JASSeqCtrlFUl(); -extern "C" void clrIntrMask__10JASSeqCtrlFUl(); -extern "C" void retIntr__10JASSeqCtrlFv(); -extern "C" void findIntr__10JASSeqCtrlFv(); -extern "C" void checkIntr__10JASSeqCtrlFv(); -extern "C" void timerProcess__10JASSeqCtrlFv(); -extern "C" void __sinit_JASSeqCtrl_cpp(); -extern "C" void __dt__12JASSeqParserFv(); -extern "C" u8 sDefaultParser__10JASSeqCtrl[4 + 4 /* padding */]; - // // External References: // -extern "C" void checkNoteStop__8JASTrackCFUl(); -extern "C" void init__12JASSeqReaderFv(); -extern "C" void init__12JASSeqReaderFPv(); -extern "C" void __dl__FPv(); -extern "C" void __register_global_object(); -extern "C" extern void* __vt__12JASSeqParser[8]; - // // Declarations: // /* ############################################################################################## */ /* 80451238-80451240 000738 0004+04 3/3 0/0 0/0 .sbss sDefaultParser__10JASSeqCtrl */ -u8 JASSeqCtrl::sDefaultParser[4 + 4 /* padding */]; +JASSeqParser JASSeqCtrl::sDefaultParser; /* 802938BC-80293924 28E1FC 0068+00 0/0 1/1 0/0 .text __ct__10JASSeqCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JASSeqCtrl::JASSeqCtrl() { - nofralloc -#include "asm/JSystem/JAudio2/JASSeqCtrl/__ct__10JASSeqCtrlFv.s" +JASSeqCtrl::JASSeqCtrl() { + mReader.init(); + field_0x3c = &sDefaultParser; + field_0x40 = 0; + field_0x44 = NULL; + field_0x48 = 0; + field_0x4c = 0; + field_0x4e = 0; + field_0x50 = 0; + field_0x51 = 0; + field_0x54 = 0; + field_0x58 = 0; + mReader.init(); } -#pragma pop /* 80293924-80293980 28E264 005C+00 0/0 1/1 0/0 .text init__10JASSeqCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASSeqCtrl::init() { - nofralloc -#include "asm/JSystem/JAudio2/JASSeqCtrl/init__10JASSeqCtrlFv.s" +void JASSeqCtrl::init() { + mReader.init(); + field_0x3c = &sDefaultParser; + field_0x40 = 0; + field_0x44 = NULL; + field_0x48 = 0; + field_0x4c = 0; + field_0x4e = 0; + field_0x50 = 0; + field_0x54 = 0; + field_0x58 = 0; + field_0x51 = 0; } -#pragma pop /* 80293980-802939C4 28E2C0 0044+00 0/0 1/1 0/0 .text start__10JASSeqCtrlFPvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASSeqCtrl::start(void* param_0, u32 param_1) { - nofralloc -#include "asm/JSystem/JAudio2/JASSeqCtrl/start__10JASSeqCtrlFPvUl.s" +void JASSeqCtrl::start(void* param_0, u32 param_1) { + mReader.init(param_0); + mReader.jump(param_1); } -#pragma pop /* 802939C4-80293ABC 28E304 00F8+00 0/0 1/1 0/0 .text tickProc__10JASSeqCtrlFP8JASTrack */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASSeqCtrl::tickProc(JASTrack* param_0) { - nofralloc -#include "asm/JSystem/JAudio2/JASSeqCtrl/tickProc__10JASSeqCtrlFP8JASTrack.s" +int JASSeqCtrl::tickProc(JASTrack* param_0) { + if (!mReader.getBase()) { + return 0; + } + + interrupt(INTRTYPE_VALUE_6); + timerProcess(); + + if (field_0x51) { + if (!param_0->checkNoteStop(0)) { + return 0; + } + + field_0x51 = 0; + } + + if (field_0x40 > 0) { + field_0x40--; + } + + checkIntr(); + + while ((field_0x40 == 0 || field_0x44 != NULL) && field_0x51 == 0) { + if (field_0x3c->parse(param_0) < 0) { + return -1; + } + } + + return 0; } -#pragma pop /* 80293ABC-80293AE0 28E3FC 0024+00 2/2 2/2 0/0 .text * interrupt__10JASSeqCtrlFQ210JASSeqCtrl8IntrType */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASSeqCtrl::interrupt(JASSeqCtrl::IntrType param_0) { - nofralloc -#include "asm/JSystem/JAudio2/JASSeqCtrl/interrupt__10JASSeqCtrlFQ210JASSeqCtrl8IntrType.s" +void JASSeqCtrl::interrupt(JASSeqCtrl::IntrType param_0) { + if (field_0x4e & (1 << param_0)) { + field_0x4c |= (1 << param_0); + } } -#pragma pop /* 80293AE0-80293AF0 28E420 0010+00 0/0 1/1 0/0 .text setIntrMask__10JASSeqCtrlFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASSeqCtrl::setIntrMask(u32 param_0) { - nofralloc -#include "asm/JSystem/JAudio2/JASSeqCtrl/setIntrMask__10JASSeqCtrlFUl.s" +void JASSeqCtrl::setIntrMask(u32 param_0) { + field_0x4e |= param_0; } -#pragma pop /* 80293AF0-80293B00 28E430 0010+00 0/0 1/1 0/0 .text clrIntrMask__10JASSeqCtrlFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASSeqCtrl::clrIntrMask(u32 param_0) { - nofralloc -#include "asm/JSystem/JAudio2/JASSeqCtrl/clrIntrMask__10JASSeqCtrlFUl.s" +void JASSeqCtrl::clrIntrMask(u32 param_0) { + field_0x4e &= ~param_0; } -#pragma pop /* 80293B00-80293B28 28E440 0028+00 0/0 1/1 0/0 .text retIntr__10JASSeqCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASSeqCtrl::retIntr() { - nofralloc -#include "asm/JSystem/JAudio2/JASSeqCtrl/retIntr__10JASSeqCtrlFv.s" +int JASSeqCtrl::retIntr() { + if (field_0x44 == NULL) { + return 0; + } + + mReader.jump(field_0x44); + field_0x44 = NULL; + return 1; } -#pragma pop /* 80293B28-80293B78 28E468 0050+00 1/1 0/0 0/0 .text findIntr__10JASSeqCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASSeqCtrl::findIntr() { - nofralloc -#include "asm/JSystem/JAudio2/JASSeqCtrl/findIntr__10JASSeqCtrlFv.s" +int JASSeqCtrl::findIntr() { + u32 uVar1 = field_0x4e & field_0x4c; + for (int i = 0; uVar1 != 0; uVar1 >>= 1, i++) { + if (uVar1 & 1) { + field_0x4c &= ~(1 << i); + return i; + } + } + return -1; } -#pragma pop /* 80293B78-80293BE8 28E4B8 0070+00 1/1 2/2 0/0 .text checkIntr__10JASSeqCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASSeqCtrl::checkIntr() { - nofralloc -#include "asm/JSystem/JAudio2/JASSeqCtrl/checkIntr__10JASSeqCtrlFv.s" +void JASSeqCtrl::checkIntr() { + if (field_0x44) return; + int intr = findIntr(); + + if (intr < 0) return; + + u32 uVar2 = field_0x48; + uVar2 += intr * 3; + u32 uVar1 = get24(uVar2); + field_0x44 = mReader.getCur(); + mReader.jump(uVar1); } -#pragma pop /* 80293BE8-80293C6C 28E528 0084+00 1/1 0/0 0/0 .text timerProcess__10JASSeqCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASSeqCtrl::timerProcess() { - nofralloc -#include "asm/JSystem/JAudio2/JASSeqCtrl/timerProcess__10JASSeqCtrlFv.s" +void JASSeqCtrl::timerProcess() { + if (field_0x54 == 0) return; + + field_0x54--; + if (field_0x54) return; + + interrupt(INTRTYPE_VALUE_5); + + if (field_0x50) { + field_0x50--; + if (field_0x50) { + field_0x54 = field_0x58; + } + } else { + field_0x54 = field_0x58; + } } -#pragma pop /* ############################################################################################## */ -/* 80431B18-80431B28 05E838 000C+04 1/1 0/0 0/0 .bss @433 */ -static u8 lit_433[12 + 4 /* padding */]; - -/* 80293C6C-80293CAC 28E5AC 0040+00 0/0 1/0 0/0 .text __sinit_JASSeqCtrl_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_JASSeqCtrl_cpp() { - nofralloc -#include "asm/JSystem/JAudio2/JASSeqCtrl/__sinit_JASSeqCtrl_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80293C6C, __sinit_JASSeqCtrl_cpp); -#pragma pop - -/* 80293CAC-80293CF4 28E5EC 0048+00 1/1 1/0 0/0 .text __dt__12JASSeqParserFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JASSeqParser::~JASSeqParser() { - nofralloc -#include "asm/JSystem/JAudio2/JASSeqCtrl/__dt__12JASSeqParserFv.s" -} -#pragma pop diff --git a/libs/JSystem/JAudio2/JASTrack.cpp b/libs/JSystem/JAudio2/JASTrack.cpp index 977e09bf6cd..ae377bfc22d 100644 --- a/libs/JSystem/JAudio2/JASTrack.cpp +++ b/libs/JSystem/JAudio2/JASTrack.cpp @@ -522,7 +522,7 @@ asm void JASTrack::noteOff(u32 param_0, u16 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASTrack::checkNoteStop(u32 param_0) const { +asm bool JASTrack::checkNoteStop(u32 param_0) const { nofralloc #include "asm/JSystem/JAudio2/JASTrack/checkNoteStop__8JASTrackCFUl.s" } diff --git a/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main.c b/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main.c index 6e85dc39257..41396b26986 100644 --- a/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main.c +++ b/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main.c @@ -4,6 +4,9 @@ // #include "TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main.h" +#include "TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h" +#include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" +#include "amcstubs/AmcExi2Stubs.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -11,34 +14,17 @@ // Forward References: // -void ddh_cc_initinterrupts(); +int ddh_cc_initinterrupts(); void ddh_cc_peek(); -void ddh_cc_post_stop(); -void ddh_cc_pre_continue(); +int ddh_cc_post_stop(); +int ddh_cc_pre_continue(); void ddh_cc_write(); void ddh_cc_read(); u8 ddh_cc_close(); -void ddh_cc_open(); +s32 ddh_cc_open(); u8 ddh_cc_shutdown(); void ddh_cc_initialize(); -// -// External References: -// - -void CircleBufferReadBytes(); -void CircleBufferWriteBytes(); -void CircleBufferInitialize(); -void CBGetBytesAvailableForRead(); -void MWTRACE(); -void EXI2_Init(); -void EXI2_EnableInterrupts(); -u8 EXI2_Poll(); -u8 EXI2_ReadN(); -u8 EXI2_WriteN(); -void EXI2_Reserve(); -void EXI2_Unreserve(); - // // Declarations: // @@ -48,23 +34,19 @@ void EXI2_Unreserve(); static u8 gRecvBuf[2048]; /* 80450030-80450050 07CD50 001C+04 3/3 0/0 0/0 .bss gRecvCB */ -static u8 gRecvCB[28 + 4 /* padding */]; +static CircleBuffer gRecvCB; // copied from pikmin2. should try to find a real fix static makeMainBSSOrderingWork() { - u8 buff[0x500]; - memcpy(buff, gRecvBuf, 0x500); + u8 buff[0x500]; + memcpy(buff, gRecvBuf, 0x500); } /* 8037235C-80372380 36CC9C 0024+00 0/0 1/1 0/0 .text ddh_cc_initinterrupts */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void ddh_cc_initinterrupts() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_initinterrupts.s" +int ddh_cc_initinterrupts() { + EXI2_EnableInterrupts(); + return 0; } -#pragma pop /* 80372380-803723F0 36CCC0 0070+00 0/0 1/1 0/0 .text ddh_cc_peek */ #pragma push @@ -77,24 +59,16 @@ asm void ddh_cc_peek() { #pragma pop /* 803723F0-80372414 36CD30 0024+00 0/0 1/1 0/0 .text ddh_cc_post_stop */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void ddh_cc_post_stop() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_post_stop.s" +int ddh_cc_post_stop() { + EXI2_Reserve(); + return 0; } -#pragma pop /* 80372414-80372438 36CD54 0024+00 0/0 1/1 0/0 .text ddh_cc_pre_continue */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void ddh_cc_pre_continue() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_pre_continue.s" +int ddh_cc_pre_continue() { + EXI2_Unreserve(); + return 0; } -#pragma pop /* ############################################################################################## */ /* 803A2D10-803A2D24 02F370 0014+00 1/1 0/0 0/0 .rodata @318 */ @@ -116,7 +90,7 @@ COMPILER_STRIP_GATE(0x803A2D50, &lit_320); #pragma pop /* 804519C0-804519C8 000EC0 0004+04 3/3 0/0 0/0 .sbss gIsInitialized */ -static u8 gIsInitialized[4 + 4 /* padding */]; +static BOOL gIsInitialized; /* 80372438-803724F8 36CD78 00C0+00 0/0 1/1 0/0 .text ddh_cc_write */ #pragma push @@ -153,14 +127,13 @@ u8 ddh_cc_close() { } /* 803725EC-80372610 36CF2C 0024+00 0/0 1/1 0/0 .text ddh_cc_open */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void ddh_cc_open() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_open.s" +s32 ddh_cc_open() { + if (gIsInitialized != FALSE) { + return -10005; + } + gIsInitialized = TRUE; + return 0; } -#pragma pop /* 80372610-80372618 36CF50 0008+00 0/0 1/1 0/0 .text ddh_cc_shutdown */ u8 ddh_cc_shutdown() { diff --git a/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main.c b/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main.c index d1d349c3cad..7e010d1ead0 100644 --- a/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main.c +++ b/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main.c @@ -4,6 +4,7 @@ // #include "TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main.h" +#include "TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -11,14 +12,14 @@ // Forward References: // -void gdev_cc_initinterrupts(); +u8 gdev_cc_initinterrupts(); void gdev_cc_peek(); -void gdev_cc_post_stop(); -void gdev_cc_pre_continue(); +u8 gdev_cc_post_stop(); +u8 gdev_cc_pre_continue(); void gdev_cc_write(); void gdev_cc_read(); u8 gdev_cc_close(); -void gdev_cc_open(); +s32 gdev_cc_open(); u8 gdev_cc_shutdown(); void gdev_cc_initialize(); @@ -26,16 +27,12 @@ void gdev_cc_initialize(); // External References: // -void CircleBufferReadBytes(); -void CircleBufferWriteBytes(); -void CircleBufferInitialize(); -void CBGetBytesAvailableForRead(); void MWTRACE(); void DBClose(); void DBOpen(); void DBWrite(); -void DBRead(); -void DBQueryData(); +int DBRead(); +int DBQueryData(); void DBInitInterrupts(); void DBInitComm(); @@ -48,23 +45,19 @@ void DBInitComm(); static u8 gRecvBuf[1280]; /* 80450550-8045056C 07D270 001C+00 3/3 0/0 0/0 .bss gRecvCB */ -static u8 gRecvCB[28]; +static CircleBuffer gRecvCB; // copied from pikmin2. should try to find a real fix static makeMainBSSOrderingWork() { - u8 buff[0x500]; - memcpy(buff, gRecvBuf, 0x500); + u8 buff[0x500]; + memcpy(buff, gRecvBuf, 0x500); } /* 80372908-8037292C 36D248 0024+00 0/0 1/1 0/0 .text gdev_cc_initinterrupts */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void gdev_cc_initinterrupts() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_initinterrupts.s" +u8 gdev_cc_initinterrupts() { + DBInitInterrupts(); + return 0; } -#pragma pop /* 8037292C-8037299C 36D26C 0070+00 0/0 1/1 0/0 .text gdev_cc_peek */ #pragma push @@ -77,24 +70,16 @@ asm void gdev_cc_peek() { #pragma pop /* 8037299C-803729C0 36D2DC 0024+00 0/0 1/1 0/0 .text gdev_cc_post_stop */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void gdev_cc_post_stop() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_post_stop.s" +u8 gdev_cc_post_stop() { + DBOpen(); + return 0; } -#pragma pop /* 803729C0-803729E4 36D300 0024+00 0/0 1/1 0/0 .text gdev_cc_pre_continue */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void gdev_cc_pre_continue() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_pre_continue.s" +u8 gdev_cc_pre_continue() { + DBClose(); + return 0; } -#pragma pop /* ############################################################################################## */ /* 803A2DF0-803A2E04 02F450 0014+00 1/1 0/0 0/0 .rodata @318 */ @@ -116,7 +101,7 @@ COMPILER_STRIP_GATE(0x803A2E30, &lit_320); #pragma pop /* 804519C8-804519D0 000EC8 0004+04 3/3 0/0 0/0 .sbss gIsInitialized */ -static u8 gIsInitialized[4 + 4 /* padding */]; +static BOOL gIsInitialized; /* 803729E4-80372AA4 36D324 00C0+00 0/0 1/1 0/0 .text gdev_cc_write */ #pragma push @@ -153,14 +138,13 @@ u8 gdev_cc_close() { } /* 80372BA0-80372BC4 36D4E0 0024+00 0/0 1/1 0/0 .text gdev_cc_open */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void gdev_cc_open() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_open.s" +s32 gdev_cc_open() { + if (gIsInitialized != FALSE) { + return -10005; + } + gIsInitialized = TRUE; + return 0; } -#pragma pop /* 80372BC4-80372BCC 36D504 0008+00 0/0 1/1 0/0 .text gdev_cc_shutdown */ u8 gdev_cc_shutdown() { diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr.c b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr.c index 0dc5b184d16..3ea7dc70cc2 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr.c +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr.c @@ -268,7 +268,7 @@ asm s32 TRKDoReset(TRKBuffer*) { /* ############################################################################################## */ /* 8044F288-8044F290 07BFA8 0004+04 4/4 0/0 0/0 .bss IsTRKConnected */ -SECTION_BSS static u8 IsTRKConnected[4 + 4 /* padding */]; +SECTION_BSS static BOOL IsTRKConnected; /* 8036EBE4-8036EC5C 369524 0078+00 0/0 1/1 0/0 .text TRKDoDisconnect */ #pragma push @@ -291,24 +291,14 @@ asm s32 TRKDoConnect(TRKBuffer*) { #pragma pop /* 8036ECC0-8036ECCC 369600 000C+00 0/0 1/1 0/0 .text SetTRKConnected */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void SetTRKConnected(BOOL) { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr/SetTRKConnected.s" +void SetTRKConnected(BOOL isTRKConnected) { + IsTRKConnected = isTRKConnected; } -#pragma pop /* 8036ECCC-8036ECDC 36960C 0010+00 0/0 3/3 0/0 .text GetTRKConnected */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL GetTRKConnected(void) { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr/GetTRKConnected.s" +BOOL GetTRKConnected(void) { + return IsTRKConnected; } -#pragma pop /* ############################################################################################## */ /* 803A2AAC-803A2AB4 02F10C 0006+02 1/1 0/0 0/0 .rodata @573 */ diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent.c b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent.c index b812ae39b2b..8e486537ba1 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent.c +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent.c @@ -4,6 +4,8 @@ // #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent.h" +#include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h" +#include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -15,7 +17,7 @@ void TRKDestructEvent(); void TRKConstructEvent(); void TRKPostEvent(); void TRKGetNextEvent(); -void TRKInitializeEventQueue(); +u8 TRKInitializeEventQueue(); // // External References: @@ -23,23 +25,15 @@ void TRKInitializeEventQueue(); SECTION_INIT void TRK_memcpy(); void TRKReleaseBuffer(); -u8 TRKReleaseMutex(); -u8 TRKAcquireMutex(); -u8 TRKInitializeMutex(); // // Declarations: // /* 8036CC18-8036CC3C 367558 0024+00 0/0 1/1 0/0 .text TRKDestructEvent */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void TRKDestructEvent() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent/TRKDestructEvent.s" +void TRKDestructEvent(TRKBuffer* buf) { + TRKReleaseBuffer(buf->_08); } -#pragma pop /* 8036CC3C-8036CC54 36757C 0018+00 0/0 5/5 0/0 .text TRKConstructEvent */ #pragma push @@ -53,7 +47,7 @@ asm void TRKConstructEvent() { /* ############################################################################################## */ /* 8044D890-8044D8B8 07A5B0 0028+00 3/3 0/0 0/0 .bss gTRKEventQueue */ -static u8 gTRKEventQueue[40]; +static s32 gTRKEventQueue[10]; /* 8036CC54-8036CD34 367594 00E0+00 0/0 5/5 0/0 .text TRKPostEvent */ #pragma push @@ -76,11 +70,12 @@ asm void TRKGetNextEvent() { #pragma pop /* 8036CDE8-8036CE40 367728 0058+00 0/0 1/1 0/0 .text TRKInitializeEventQueue */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void TRKInitializeEventQueue() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent/TRKInitializeEventQueue.s" +u8 TRKInitializeEventQueue() { + TRKInitializeMutex(&gTRKEventQueue); + TRKAcquireMutex(&gTRKEventQueue); + gTRKEventQueue[1] = 0; + gTRKEventQueue[2] = 0; + gTRKEventQueue[9] = 0x100; + TRKReleaseMutex(); + return 0; } -#pragma pop diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.c b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.c index 5ccaf088b65..7ebb145e565 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.c +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.c @@ -20,7 +20,7 @@ u8 TRKInitializeDispatcher(); void TRKTargetSetInputPendingPtr(); void TRKInitializeTarget(); void InitializeProgramEndTrap(); -void TRK_board_display(); +void TRK_board_display(const char*); void TRKInitializeIntDrivenUART(); void MWTRACE(); extern u8 gTRKInputPendingPtr[4 + 4 /* padding */]; @@ -45,14 +45,10 @@ asm void TRKNubWelcome(void) { #pragma pop /* 8036CE68-8036CE8C 3677A8 0024+00 0/0 1/1 0/0 .text TRKTerminateNub */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 TRKTerminateNub(void) { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit/TRKTerminateNub.s" +s32 TRKTerminateNub(void) { + TRKTerminateSerialHandler(); + return 0; } -#pragma pop /* ############################################################################################## */ /* 803A26A4-803A26B8 02ED04 0010+04 1/1 0/0 0/0 .rodata @154 */ @@ -60,8 +56,8 @@ SECTION_RODATA static char const lit_154[] = "Initialize NUB\n"; COMPILER_STRIP_GATE(0x803A26A4, &lit_154); /* 8044D8B8-8044D8C0 07A5D8 0004+04 1/1 4/4 0/0 .bss gTRKBigEndian */ -SECTION_BSS extern u8 gTRKBigEndian[4 + 4 /* padding */]; -SECTION_BSS u8 gTRKBigEndian[4 + 4 /* padding */]; +SECTION_BSS extern BOOL gTRKBigEndian; +SECTION_BSS BOOL gTRKBigEndian; /* 8036CE8C-8036CFD8 3677CC 014C+00 0/0 1/1 0/0 .text TRKInitializeNub */ #pragma push diff --git a/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.c b/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.c index c65da3b2b7a..f0f94d0809f 100644 --- a/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.c +++ b/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.c @@ -4,6 +4,7 @@ // #include "TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.h" +#include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -15,9 +16,9 @@ void InitMetroTRK(); void InitMetroTRK_BBA(); void TRK__write_aram(); void TRK__read_aram(); -void TRKInitializeTarget(); +int TRKInitializeTarget(); void __TRK_copy_vectors(); -void TRKTargetTranslate(); +u32 TRKTargetTranslate(); void EnableMetroTRKInterrupts(); // @@ -31,20 +32,19 @@ void ARStartDMA(); void __ARClearInterrupt(); void __ARGetInterruptStatus(); void TRK_flush_cache(); -void __TRK_get_MSR(); void TRKSaveExtended1Block(); void TRK_main(); void EnableEXI2Interrupts(); void InitMetroTRKCommTable(); -extern u8 gTRKState[164]; -extern u8 gTRKCPUState[1072]; +extern u32 gTRKState[41]; +extern u32 gTRKCPUState[268]; void regist__9daBgObj_cFP4dBgW(); // // Declarations: // -/* 80371560-803715F8 36BEA0 0098+00 0/0 1/1 0/0 .text InitMetroTRK */ +/* 80371560-803715F8 36BEA0 0098+00 0/0 1/1 0/0 .text InitMetroTRK */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -86,17 +86,15 @@ asm void TRK__read_aram() { /* ############################################################################################## */ /* 8044F810-8044F818 07C530 0004+04 3/3 0/0 0/0 .bss lc_base */ -SECTION_BSS static u8 lc_base[4 + 4 /* padding */]; +SECTION_BSS static u32 lc_base[1 + 1 /*padding*/]; -/* 803719AC-803719F8 36C2EC 004C+00 0/0 1/1 0/0 .text TRKInitializeTarget */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void TRKInitializeTarget() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/TRKInitializeTarget.s" +/* 803719AC-803719F8 36C2EC 004C+00 0/0 1/1 0/0 .text TRKInitializeTarget */ +int TRKInitializeTarget() { + gTRKState[38] = 1; + gTRKState[35] = __TRK_get_MSR(); + *lc_base = 0xE0000000; + return 0; } -#pragma pop /* ############################################################################################## */ /* 803D3268-803D32A8 030388 003C+04 1/1 0/0 0/0 .data TRK_ISR_OFFSETS */ @@ -179,21 +177,19 @@ asm void __TRK_copy_vectors() { #pragma pop /* 80371B24-80371B7C 36C464 0058+00 0/0 1/1 0/0 .text TRKTargetTranslate */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void TRKTargetTranslate() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/TRKTargetTranslate.s" +u32 TRKTargetTranslate(u32 param_0) { + if (param_0 >= *lc_base) { + if ((param_0 < *lc_base + 0x4000) && ((gTRKCPUState[142] & 3) != 0)) { + return param_0; + } + } + if ((0x7E000000 <= param_0) && (param_0 <= 0x80000000)) { + return param_0; + } + return param_0 & 0x3FFFFFFF | 0x80000000; } -#pragma pop -/* 80371B7C-80371B9C 36C4BC 0020+00 0/0 1/1 0/0 .text EnableMetroTRKInterrupts */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void EnableMetroTRKInterrupts() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/EnableMetroTRKInterrupts.s" +/* 80371B7C-80371B9C 36C4BC 0020+00 0/0 1/1 0/0 .text EnableMetroTRKInterrupts */ +void EnableMetroTRKInterrupts() { + EnableEXI2Interrupts(); } -#pragma pop diff --git a/libs/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.c b/libs/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.c index 593a6012473..d8b43fe108f 100644 --- a/libs/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.c +++ b/libs/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.c @@ -1,70 +1,78 @@ -// -// Generated By: dol2asm // Translation Unit: utils/common/CircleBuffer -// #include "TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h" -#include "dol2asm.h" +#include "TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h" #include "dolphin/types.h" -// -// Forward References: -// - -void CircleBufferReadBytes(); -void CircleBufferWriteBytes(); -void CircleBufferInitialize(); -void CBGetBytesAvailableForRead(); - -// -// External References: -// - -SECTION_INIT void memcpy(); -void MWExitCriticalSection(); -void MWEnterCriticalSection(); -void MWInitializeCriticalSection(); - -// -// Declarations: -// - /* 803726A0-803727A8 36CFE0 0108+00 0/0 2/2 0/0 .text CircleBufferReadBytes */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CircleBufferReadBytes() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferReadBytes.s" +s32 CircleBufferReadBytes(CircleBuffer* buf, u32 param_2, u32 param_3) { + int temp; + if (param_3 > buf->readBuf) { + return -1; + } else { + MWEnterCriticalSection(&buf->criticalSection); + temp = buf->field_0xc - (buf->field_0x0 - buf->field_0x8); + if (param_3 < temp) { + memcpy(param_2, buf->field_0x0, param_3); + buf->field_0x0 += param_3; + } else { + memcpy(param_2, buf->field_0x0, temp); + memcpy(param_2 + temp, buf->field_0x8, param_3 - temp); + buf->field_0x0 = buf->field_0x8 + param_3 - temp; + } + + if (buf->field_0xc == (buf->field_0x0 - buf->field_0x8)) { + buf->field_0x0 = buf->field_0x8; + } + + buf->field_0x14 += param_3; + buf->readBuf -= param_3; + MWExitCriticalSection(&buf->criticalSection); + return 0; + } } -#pragma pop /* 803727A8-803728B0 36D0E8 0108+00 0/0 4/4 0/0 .text CircleBufferWriteBytes */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CircleBufferWriteBytes() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferWriteBytes.s" +s32 CircleBufferWriteBytes(CircleBuffer* buf, s32 param_2, u32 param_3) { + s32 temp; + + if (param_3 > buf->field_0x14) { + return -1; + } else { + MWEnterCriticalSection(&buf->criticalSection); + temp = buf->field_0xc - (buf->field_0x4 - buf->field_0x8); + if (temp >= param_3) { + memcpy(buf->field_0x4, param_2, param_3); + buf->field_0x4 += param_3; + } else { + memcpy(buf->field_0x4, param_2, temp); + memcpy(buf->field_0x8, param_2 + temp, param_3 - temp); + buf->field_0x4 = buf->field_0x8 + param_3 - temp; + } + + if (buf->field_0xc == (buf->field_0x4 - buf->field_0x8)) { + buf->field_0x4 = buf->field_0x8; + } + + buf->field_0x14 -= param_3; + buf->readBuf += param_3; + MWExitCriticalSection(&buf->criticalSection); + return 0; + } } -#pragma pop /* 803728B0-80372900 36D1F0 0050+00 0/0 2/2 0/0 .text CircleBufferInitialize */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CircleBufferInitialize() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferInitialize.s" +void CircleBufferInitialize(CircleBuffer* buf, s32 param_2, s32 param_3) { + buf->field_0x8 = param_2; + buf->field_0xc = param_3; + buf->field_0x0 = buf->field_0x8; + buf->field_0x4 = buf->field_0x8; + buf->readBuf = 0; + buf->field_0x14 = buf->field_0xc; + MWInitializeCriticalSection(&buf->criticalSection); } -#pragma pop /* 80372900-80372908 36D240 0008+00 0/0 2/2 0/0 .text CBGetBytesAvailableForRead */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CBGetBytesAvailableForRead() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CBGetBytesAvailableForRead.s" +s32 CBGetBytesAvailableForRead(CircleBuffer* buf) { + return buf->readBuf; } -#pragma pop diff --git a/libs/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.c b/libs/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.c index 80fab2ebb7c..8e3633acff4 100644 --- a/libs/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.c +++ b/libs/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.c @@ -12,20 +12,9 @@ void MWExitCriticalSection(u32* section) { } /* 80372CC8-80372CF8 36D608 0030+00 0/0 2/2 0/0 .text MWEnterCriticalSection */ -#ifdef NONMATCHING void MWEnterCriticalSection(u32* section) { *section = OSDisableInterrupts(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void MWEnterCriticalSection(u32* section) { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc/MWEnterCriticalSection.s" -} -#pragma pop -#endif /* 80372CF8-80372CFC 36D638 0004+00 0/0 1/1 0/0 .text MWInitializeCriticalSection */ void MWInitializeCriticalSection() {} diff --git a/rel/d/a/d_a_bg/d_a_bg.cpp b/rel/d/a/d_a_bg/d_a_bg.cpp index 8299f55d9f5..9ecc9c554a7 100644 --- a/rel/d/a/d_a_bg/d_a_bg.cpp +++ b/rel/d/a/d_a_bg/d_a_bg.cpp @@ -208,7 +208,8 @@ static asm int createMatAnm(J3DModelData* param_0, u16 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTevKColorAnm::~J3DTevKColorAnm() { +// asm J3DTevKColorAnm::~J3DTevKColorAnm() { +extern "C" asm void __dt__15J3DTevKColorAnmFv() { nofralloc #include "asm/rel/d/a/d_a_bg/d_a_bg/__dt__15J3DTevKColorAnmFv.s" } @@ -218,7 +219,8 @@ asm J3DTevKColorAnm::~J3DTevKColorAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTevKColorAnm::J3DTevKColorAnm() { +// asm J3DTevKColorAnm::J3DTevKColorAnm() { +extern "C" asm void __ct__15J3DTevKColorAnmFv() { nofralloc #include "asm/rel/d/a/d_a_bg/d_a_bg/__ct__15J3DTevKColorAnmFv.s" } @@ -228,7 +230,8 @@ asm J3DTevKColorAnm::J3DTevKColorAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTevColorAnm::~J3DTevColorAnm() { +// asm J3DTevColorAnm::~J3DTevColorAnm() { +extern "C" asm void __dt__14J3DTevColorAnmFv() { nofralloc #include "asm/rel/d/a/d_a_bg/d_a_bg/__dt__14J3DTevColorAnmFv.s" } @@ -238,7 +241,8 @@ asm J3DTevColorAnm::~J3DTevColorAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTevColorAnm::J3DTevColorAnm() { +// asm J3DTevColorAnm::J3DTevColorAnm() { +extern "C" asm void __ct__14J3DTevColorAnmFv() { nofralloc #include "asm/rel/d/a/d_a_bg/d_a_bg/__ct__14J3DTevColorAnmFv.s" } @@ -323,7 +327,8 @@ extern "C" asm void __dt__11J3DTexNoAnmFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTexNoAnm::J3DTexNoAnm() { +// asm J3DTexNoAnm::J3DTexNoAnm() { +extern "C" asm void __ct__11J3DTexNoAnmFv() { nofralloc #include "asm/rel/d/a/d_a_bg/d_a_bg/__ct__11J3DTexNoAnmFv.s" } @@ -333,7 +338,8 @@ asm J3DTexNoAnm::J3DTexNoAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTexMtxAnm::~J3DTexMtxAnm() { +// asm J3DTexMtxAnm::~J3DTexMtxAnm() { +extern "C" asm void __dt__12J3DTexMtxAnmFv() { nofralloc #include "asm/rel/d/a/d_a_bg/d_a_bg/__dt__12J3DTexMtxAnmFv.s" } @@ -343,7 +349,8 @@ asm J3DTexMtxAnm::~J3DTexMtxAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTexMtxAnm::J3DTexMtxAnm() { +// asm J3DTexMtxAnm::J3DTexMtxAnm() { +extern "C" asm void __ct__12J3DTexMtxAnmFv() { nofralloc #include "asm/rel/d/a/d_a_bg/d_a_bg/__ct__12J3DTexMtxAnmFv.s" } @@ -353,7 +360,8 @@ asm J3DTexMtxAnm::J3DTexMtxAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DMatColorAnm::~J3DMatColorAnm() { +// asm J3DMatColorAnm::~J3DMatColorAnm() { +extern "C" asm void __dt__14J3DMatColorAnmFv() { nofralloc #include "asm/rel/d/a/d_a_bg/d_a_bg/__dt__14J3DMatColorAnmFv.s" } @@ -363,7 +371,8 @@ asm J3DMatColorAnm::~J3DMatColorAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DMatColorAnm::J3DMatColorAnm() { +// asm J3DMatColorAnm::J3DMatColorAnm() { +extern "C" asm void __ct__14J3DMatColorAnmFv() { nofralloc #include "asm/rel/d/a/d_a_bg/d_a_bg/__ct__14J3DMatColorAnmFv.s" } @@ -1091,7 +1100,8 @@ asm int daBg_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTexNoAnm::calc(u16* param_0) const { +// asm void J3DTexNoAnm::calc(u16* param_0) const { +extern "C" asm void calc__11J3DTexNoAnmCFPUs() { nofralloc #include "asm/rel/d/a/d_a_bg/d_a_bg/calc__11J3DTexNoAnmCFPUs.s" } diff --git a/rel/d/a/d_a_title/d_a_title_nonmatching.cpp b/rel/d/a/d_a_title/d_a_title_nonmatching.cpp index d587c93b3dc..001404baf52 100644 --- a/rel/d/a/d_a_title/d_a_title_nonmatching.cpp +++ b/rel/d/a/d_a_title/d_a_title_nonmatching.cpp @@ -4,7 +4,11 @@ // #include "rel/d/a/d_a_title/d_a_title.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JKernel/JKRMemArchive.h" #include "JSystem/JStudio/JStudio/stb.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -12,6 +16,10 @@ #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_overlap_mng.h" #include "f_op/f_op_msg_mng.h" +#include "d/pane/d_pane_class_alpha.h" +#include "d/menu/d_menu_collect.h" +#include "m_Do/m_Do_Reset.h" +#include "m_Do/m_Do_controller_pad.h" // // Types: @@ -186,7 +194,6 @@ extern "C" void _savegpr_26(); extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; extern "C" f32 mViewOffsetY__17dMenu_Collect3D_c[1 + 1 /* padding */]; extern "C" u8 mFader__13mDoGph_gInf_c[4]; @@ -468,8 +475,6 @@ void daTitle_c::nextScene_init() { } /* 80D67550-80D675EC 000B30 009C+00 1/0 0/0 0/0 .text nextScene_proc__9daTitle_cFv */ -// setFadeColor store order issue -#ifdef NONMATCHING void daTitle_c::nextScene_proc() { if (!fopOvlpM_IsPeek() && !mDoRst::isReset()) { scene_class* playScene = fopScnM_SearchByID(dStage_roomControl_c::getProcID()); @@ -477,16 +482,6 @@ void daTitle_c::nextScene_proc() { mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTitle_c::nextScene_proc() { - nofralloc -#include "asm/rel/d/a/d_a_title/d_a_title/nextScene_proc__9daTitle_cFv.s" -} -#pragma pop -#endif /* 80D675EC-80D676AC 000BCC 00C0+00 1/1 0/0 0/0 .text fastLogoDispInit__9daTitle_cFv */ void daTitle_c::fastLogoDispInit() { diff --git a/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp b/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp index f3b9f8327e9..2551314525c 100644 --- a/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp +++ b/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp @@ -4,368 +4,15 @@ // #include "rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.h" +#include "rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "SSystem/SComponent/c_math.h" +#include "f_op/f_op_actor_mng.h" +#include "d/d_procname.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DModelData {}; - -struct Vec {}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0420 */ ~Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 8095CF20 */ ~cXyz(); - /* 8095CF5C */ cXyz(); -}; - -struct daTag_EvtArea_c { - /* 8095D574 */ void chkPointInArea(cXyz); - /* 8048C94C */ void chkPointInArea(cXyz, cXyz); -}; - -struct J3DAnmTexPattern { - /* 8032AF50 */ void getTexNo(u16, u16*) const; -}; - -struct J3DAnmTextureSRTKey {}; - -struct J3DAnmTransformKey {}; - -struct _GXColorS10 {}; - -struct daNpcF_c { - struct daNpcF_anmPlayData {}; - - /* 80152014 */ void execute(); - /* 801522AC */ void draw(int, int, f32, _GXColorS10*, int); - /* 8015276C */ void setMtx(); - /* 801527FC */ void setMtx2(); - /* 801528C8 */ void initialize(); - /* 80152B2C */ void getTrnsfrmKeyAnmP(char*, int); - /* 80152B68 */ void getTexPtrnAnmP(char*, int); - /* 80152BA4 */ void getTexSRTKeyAnmP(char*, int); - /* 80152C1C */ void setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int); - /* 80152C80 */ void setBckAnm(J3DAnmTransform*, f32, int, int, int, bool); - /* 80152CC4 */ void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int); - /* 80152D04 */ void setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int); - /* 80152D84 */ void setEnvTevColor(); - /* 80152DE0 */ void setRoomNo(); - /* 80153150 */ void playExpressionAnm(daNpcF_c::daNpcF_anmPlayData***); - /* 80153264 */ void playMotionAnm(daNpcF_c::daNpcF_anmPlayData***); - /* 8015337C */ void setLookatMtx(int, int*, f32); - /* 80153718 */ void ctrlMsgAnm(int&, int&, fopAc_ac_c*, int); - /* 8015387C */ void orderEvent(int, char*, u16, u16, u8, u16); - /* 80153954 */ void changeEvent(char*, char*, u16, u16); - /* 801539F0 */ void chkActorInSight(fopAc_ac_c*, f32); - /* 80153BDC */ void chkActorInAttnArea(fopAc_ac_c*, fopAc_ac_c*, int); - /* 80153D1C */ void initTalk(int, fopAc_ac_c**); - /* 80153D84 */ void talkProc(int*, int, fopAc_ac_c**); - /* 80153EF4 */ void turn(s16, f32, int); - /* 80154250 */ void setAngle(s16); - /* 80154278 */ void getDistTableIdx(int, int); - /* 801542A0 */ void getEvtAreaTagP(int, int); - /* 8095CF60 */ ~daNpcF_c(); - /* 8095D1AC */ daNpcF_c(); - /* 8095D520 */ void adjustShapeAngle(); - /* 8095D524 */ void setCollisions(); - /* 8095D528 */ void drawOtherMdls(); - - static u8 mCcDCyl[68]; -}; - -struct daNpcF_MatAnm_c { - /* 80150738 */ void initialize(); -}; - -struct csXyz { - /* 8095CEE0 */ ~csXyz(); - /* 8095CF1C */ csXyz(); -}; - -struct daNpcF_Lookat_c { - /* 80151038 */ void initialize(); - /* 801510B8 */ void setParam(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s16, - cXyz*); - /* 80151350 */ void calc(fopAc_ac_c*, f32 (*)[4], csXyz**, int, int, int); - /* 8095CE10 */ ~daNpcF_Lookat_c(); -}; - -struct daNpcF_ActorMngr_c { - /* 801506B0 */ void initialize(); - /* 801506BC */ void entry(fopAc_ac_c*); - /* 801506E0 */ void remove(); - /* 801506EC */ void getActorP(); - /* 8095CD8C */ ~daNpcF_ActorMngr_c(); - /* 8095CDD4 */ daNpcF_ActorMngr_c(); -}; - -struct J3DModel {}; - -struct J3DJoint {}; - -struct daNpcAsh_c { - /* 809582EC */ daNpcAsh_c(); - /* 80958610 */ ~daNpcAsh_c(); - /* 809587A0 */ void Create(); - /* 80958B68 */ void CreateHeap(); - /* 809590C4 */ void Delete(); - /* 809590F8 */ void Execute(); - /* 8095911C */ void Draw(); - /* 80959238 */ void ctrlJoint(J3DJoint*, J3DModel*); - /* 80959458 */ void createHeapCallBack(fopAc_ac_c*); - /* 80959478 */ void ctrlJointCallBack(J3DJoint*, int); - /* 809594C4 */ void setExpressionAnm(int, bool); - /* 809596E0 */ void setExpressionBtp(int); - /* 809597C0 */ void setMotionAnm(int, f32); - /* 80959910 */ void reset(); - /* 80959B28 */ void setAction(bool (daNpcAsh_c::*)(void*)); - /* 80959BD0 */ void isSneaking(); - /* 80959C40 */ void wait_type0(void*); - /* 8095A67C */ void setMotion(int, f32, int); - /* 8095A6C0 */ void setExpression(int, f32); - /* 8095A6EC */ void wait_type1(void*); - /* 8095A8EC */ void talk(void*); - /* 8095AD28 */ void demo(void*); - /* 8095B164 */ void leave(void*); - /* 8095B48C */ void EvCut_Introduction(int); - /* 8095B58C */ void EvCut_Meeting(int); - /* 8095B83C */ void EvCut_WiretapSponsor(int); - /* 8095BA80 */ void EvCut_WiretapEntrant(int); - /* 8095BCF0 */ void setParam(); - /* 8095BF6C */ void main(); - /* 8095C200 */ void playMotion(); - /* 8095C520 */ void ctrlBtk(); - /* 8095C5C4 */ void setAttnPos(); - /* 8095C9BC */ void lookat(); - /* 8095CC8C */ bool drawDbgInfo(); - - static u8 mEvtSeqList[72]; -}; - -struct daNpcAsh_Param_c { - /* 8095D5D4 */ ~daNpcAsh_Param_c(); - - static u8 const m[108]; -}; - -struct dSv_memBit_c { - /* 80034860 */ void isSwitch(int) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F48 */ ~dMsgFlow_c(); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); - /* 800432EC */ void convPId(unsigned int); -}; - -struct dEvent_manager_c { - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 80047F5C */ void getMyNowCutName(int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); - /* 800487F0 */ void ChkPresentEnd(); -}; - -struct dComIfG_play_c { - /* 8002C97C */ void getLayerNo(int); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 8095D40C */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); - /* 80958430 */ ~dCcD_Cyl(); - /* 809584FC */ dCcD_Cyl(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 8095D468 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 8095D39C */ ~dBgS_AcchCir(); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80958580 */ ~cM3dGCyl(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 809585C8 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 8095D52C */ ~cCcD_GStts(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); -}; - -struct JMath { - template - struct TSinCosTable {}; - /* TSinCosTable<13, f32> */ - struct TSinCosTable__template0 { - /* 8095CC94 */ void func_8095CC94(void* _this, s16) /* const */; - }; - - static u8 sincosTable_[65536]; -}; - -struct J3DTexNoAnm { - /* 80958FB0 */ ~J3DTexNoAnm(); - /* 80958FF8 */ J3DTexNoAnm(); - /* 8095BCC0 */ void calc(u16*) const; -}; - -struct J3DTexMtxAnm { - /* 8095901C */ ~J3DTexMtxAnm(); - /* 80959058 */ J3DTexMtxAnm(); -}; - -struct J3DTevKColorAnm { - /* 80958F08 */ ~J3DTevKColorAnm(); - /* 80958F44 */ J3DTevKColorAnm(); -}; - -struct J3DTevColorAnm { - /* 80958F5C */ ~J3DTevColorAnm(); - /* 80958F98 */ J3DTevColorAnm(); -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DMaterialAnm { - /* 8032C320 */ void initialize(); -}; - -struct J3DMatColorAnm { - /* 80959070 */ ~J3DMatColorAnm(); - /* 809590AC */ J3DMatColorAnm(); -}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 8095D4D8 */ ~J3DFrameCtrl(); -}; - // // Forward References: // @@ -448,7 +95,7 @@ extern "C" void __dt__16daNpcAsh_Param_cFv(); extern "C" static void func_8095D61C(); extern "C" static void func_8095D624(); extern "C" u8 const m__16daNpcAsh_Param_c[108]; -extern "C" extern char const* const d_a_npc_ash__stringBase0; +extern "C" extern char* const d_a_npc_ash__stringBase0; extern "C" u8 mEvtSeqList__10daNpcAsh_c[72]; // @@ -565,10 +212,6 @@ extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); extern "C" void getTexNo__16J3DAnmTexPatternCFUsPUs(); extern "C" void initialize__14J3DMaterialAnmFv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECSquareDistance(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void __ptmf_test(); @@ -585,10 +228,7 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" u8 mCcDCyl__8daNpcF_c[68]; @@ -599,13 +239,8 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" extern void* __vt__14J3DMaterialAnm[4]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void chkPointInArea__15daTag_EvtArea_cF4cXyz4cXyz(); extern "C" void __register_global_object(); @@ -613,6 +248,81 @@ extern "C" void __register_global_object(); // Declarations: // +void daNpcAsh_c::setLookMode(int i_lookMode, fopAc_ac_c* i_talkPartner) { + if (i_lookMode != mLookMode || i_talkPartner != mTalkPartner) { + mLookMode = i_lookMode; + mTalkPartner = i_talkPartner; + } +} + +void daNpcAsh_c::searchActors() { + if (!mActorMngr[1].getActorP()) { + mActorMngr[1].entry(i_fopAcM_SearchByName(PROC_NPC_SHAD)); + } + if (!mActorMngr[2].getActorP()) { + mActorMngr[2].entry(i_fopAcM_SearchByName(PROC_NPC_RAFREL)); + } + if (!mActorMngr[3].getActorP()) { + mActorMngr[3].entry(i_fopAcM_SearchByName(PROC_NPC_MOIR)); + } + if (isMap() && !mActorMngr[4].getActorP()) { + mActorMngr[4].entry(i_fopAcM_SearchByName(PROC_Obj_Table)); + } + if (!mActorMngr[5].getActorP()) { + mActorMngr[5].entry(getEvtAreaTagP(17, 0)); + } +} + +BOOL daNpcAsh_c::chkFindPlayer() { + BOOL ret; + if (!chkActorInSight(daPy_getPlayerActorClass(), daNpcAsh_Param_c::m.mSightAngle)) { + mActorMngr[0].remove(); + ret = false; + } else { + if (mActorMngr[0].getActorP() == NULL) { + ret = chkPlayerInSpeakArea(this); + } else { + ret = chkPlayerInTalkArea(this); + } + if (ret) { + mActorMngr[0].entry(daPy_getPlayerActorClass()); + } else { + mActorMngr[0].remove(); + } + } + return ret; +} + +bool daNpcAsh_c::step(s16 i_angY, bool i_animate) { + if (field_0x96c == 0) { + if (i_animate) { + if ((s32)fabsf(cM_sht2d((f32)(s16)(i_angY - field_0x8f0.y))) > 40) { + setExpression(7, -1.0f); + setMotion(9, -1.0f, false); + } + } + field_0x996 = i_angY; + field_0x968 = 0; + if (field_0x8f0.y == field_0x996) { + field_0x96c++; + } + current.angle.y = field_0x8f0.y; + shape_angle.y = current.angle.y; + field_0x96c++; + } else if (field_0x96c == 1) { + if (turn(field_0x996, 15.0, 0)) { + shape_angle.y = current.angle.y; + field_0x8f0.y = current.angle.y; + field_0x8f6.y = current.angle.y; + field_0x96c++; + } else { + shape_angle.y = current.angle.y; + field_0x8f0.y = current.angle.y; + } + } + return field_0x96c > 1; +} + /* ############################################################################################## */ /* 8095D910-8095D910 0002D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ #pragma push @@ -647,78 +357,121 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 8095D9B0-8095DA88 000020 00D8+00 1/2 0/0 0/0 .data l_bckGetParamList */ -SECTION_DATA static u8 l_bckGetParamList[216] = { - 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, - 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x07, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, - 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, - 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x02, - 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, - 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, - 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, +static bckGetParam l_bckGetParamList[18] = { + {-1, 2, 0}, // + {7, 0, 0}, // ash_f_talk_a + {12, 0, 1}, // ash_f_talk_b + {11, 0, 1}, // ash_f_silent + {8, 0, 1}, // ash_f_cool + {7, 0, 1}, // ash_f_ask + {9, 0, 1}, // ash_f_explain_a + {10, 0, 1}, // ash_f_explain_b + {8, 2, 0}, // ash_wait_a + {14, 2, 1}, // ash_wait_b + {15, 2, 1}, // ash_wait_c + {13, 0, 1}, // ash_step + {4, 0, 1}, // ash_cool + {3, 0, 1}, // ash_ask + {5, 0, 1}, // ash_explain_a + {6, 0, 1}, // ash_explain_b + {5, 2, 2}, // ash_bowwait + {4, 2, 2}, // ash_bowrun }; /* 8095DA88-8095DA94 0000F8 000C+00 1/1 0/0 0/0 .data l_btpGetParamList */ -SECTION_DATA static u8 l_btpGetParamList[12] = { - 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, +static btpGetParam l_btpGetParamList[1] = { + {17, 2, 0}, // ash }; /* 8095DA94-8095DAA0 000104 000C+00 0/1 0/0 0/0 .data l_btkGetParamList */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_btkGetParamList[12] = { - 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, +static btkGetParam l_btkGetParamList[1] = { + {14, 2, 0}, // ash }; #pragma pop /* 8095DAA0-8095DAAC 000110 000C+00 1/0 0/0 0/0 .data l_loadRes_ASH0 */ -SECTION_DATA static u8 l_loadRes_ASH0[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, +static int l_loadRes_ASH0[3] = { + 0, 1, -1, }; /* 8095DAAC-8095DAB8 00011C 000C+00 1/0 0/0 0/0 .data l_loadRes_ASH1 */ -SECTION_DATA static u8 l_loadRes_ASH1[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFF, 0xFF, 0xFF, 0xFF, +static int l_loadRes_ASH1[3] = { + 0, 2, -1, }; /* 8095DAB8-8095DAC0 -00001 0008+00 2/2 0/0 0/0 .data l_loadRes_list */ -SECTION_DATA static void* l_loadRes_list[2] = { - (void*)&l_loadRes_ASH0, - (void*)&l_loadRes_ASH1, +static int* l_loadRes_list[2] = { + l_loadRes_ASH0, + l_loadRes_ASH1, }; +#ifdef NONMATCHING + /* 8095DAC0-8095DACC -00001 000C+00 5/7 0/0 0/0 .data l_arcNames */ -SECTION_DATA static void* l_arcNames[3] = { - (void*)&d_a_npc_ash__stringBase0, - (void*)(((char*)&d_a_npc_ash__stringBase0) + 0x4), - (void*)(((char*)&d_a_npc_ash__stringBase0) + 0x9), +static char* l_arcNames[3] = { + "Ash", + "Ash1", + "Ash2", +}; + +/* 8095DACC-8095DAE4 -00001 0018+00 0/2 0/0 0/0 .data l_evtNames */ +static char* l_evtNames[6] = { + "", + "THE_INTRODUCTION", + "RESIST_MEETING", + "RESIST_WIRETAP_ASH", + "RESIST_WIRETAP_SHAD", + "RESIST_WIRETAP_RAFREL", +}; + +/* 8095DAE4-8095DAE8 -00001 0004+00 0/2 0/0 0/0 .data l_myName */ +static char* l_myName = "Ash"; + +#else + +/* 8095DAC0-8095DACC -00001 000C+00 5/7 0/0 0/0 .data l_arcNames */ +SECTION_DATA static char* l_arcNames[3] = { + (char*)&d_a_npc_ash__stringBase0, + (((char*)&d_a_npc_ash__stringBase0) + 0x4), + (((char*)&d_a_npc_ash__stringBase0) + 0x9), }; /* 8095DACC-8095DAE4 -00001 0018+00 0/2 0/0 0/0 .data l_evtNames */ #pragma push #pragma force_active on -SECTION_DATA static void* l_evtNames[6] = { - (void*)(((char*)&d_a_npc_ash__stringBase0) + 0xE), - (void*)(((char*)&d_a_npc_ash__stringBase0) + 0xF), - (void*)(((char*)&d_a_npc_ash__stringBase0) + 0x20), - (void*)(((char*)&d_a_npc_ash__stringBase0) + 0x2F), - (void*)(((char*)&d_a_npc_ash__stringBase0) + 0x42), - (void*)(((char*)&d_a_npc_ash__stringBase0) + 0x56), +SECTION_DATA static char* l_evtNames[6] = { + (((char*)&d_a_npc_ash__stringBase0) + 0xE), + (((char*)&d_a_npc_ash__stringBase0) + 0xF), + (((char*)&d_a_npc_ash__stringBase0) + 0x20), + (((char*)&d_a_npc_ash__stringBase0) + 0x2F), + (((char*)&d_a_npc_ash__stringBase0) + 0x42), + (((char*)&d_a_npc_ash__stringBase0) + 0x56), }; #pragma pop /* 8095DAE4-8095DAE8 -00001 0004+00 0/2 0/0 0/0 .data l_myName */ #pragma push #pragma force_active on -SECTION_DATA static void* l_myName = (void*)&d_a_npc_ash__stringBase0; +SECTION_DATA static char* l_myName = (char*)&d_a_npc_ash__stringBase0; #pragma pop +#endif + +#ifdef NONMATCHING + +daNpcAsh_eventFn daNpcAsh_c::mEvtSeqList[6] = { + NULL, + &EvCut_Introduction, + &EvCut_Meeting, + &EvCut_WiretapSponsor, + &EvCut_WiretapEntrant, + &EvCut_WiretapEntrant, +}; + +#else + /* 8095DAE8-8095DAF4 -00001 000C+00 0/1 0/0 0/0 .data @3823 */ #pragma push #pragma force_active on @@ -781,6 +534,8 @@ SECTION_DATA u8 daNpcAsh_c::mEvtSeqList[72] = { }; #pragma pop +#endif + /* 8095DB6C-8095DB8C -00001 0020+00 1/1 0/0 0/0 .data @4549 */ SECTION_DATA static void* lit_4549[8] = { (void*)(((char*)setExpressionAnm__10daNpcAsh_cFib) + 0xB4), @@ -881,26 +636,37 @@ SECTION_DATA static void* lit_5140[3] = { }; #pragma pop +static cPhs__Step daNpcAsh_Create(void*); +static int daNpcAsh_Delete(void*); +static int daNpcAsh_Execute(void*); +static int daNpcAsh_IsDelete(void*); +static int daNpcAsh_Draw(void*); + /* 8095DC04-8095DC24 -00001 0020+00 1/0 0/0 0/0 .data daNpcAsh_MethodTable */ -SECTION_DATA static void* daNpcAsh_MethodTable[8] = { - (void*)daNpcAsh_Create__FPv, - (void*)daNpcAsh_Delete__FPv, - (void*)daNpcAsh_Execute__FPv, - (void*)daNpcAsh_IsDelete__FPv, - (void*)daNpcAsh_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daNpcAsh_MethodTable = { + (process_method_func)daNpcAsh_Create, + (process_method_func)daNpcAsh_Delete, + (process_method_func)daNpcAsh_Execute, + (process_method_func)daNpcAsh_IsDelete, + (process_method_func)daNpcAsh_Draw, }; /* 8095DC24-8095DC54 -00001 0030+00 0/0 0/0 1/0 .data g_profile_NPC_ASH */ -SECTION_DATA extern void* g_profile_NPC_ASH[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02980000, (void*)&g_fpcLf_Method, - (void*)0x00000F64, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x019B0000, (void*)&daNpcAsh_MethodTable, - (void*)0x00040100, (void*)0x040E0000, +extern actor_process_profile_definition g_profile_NPC_ASH = { + -3, + 7, + -3, + PROC_NPC_ASH, + &g_fpcLf_Method.mBase, + sizeof(daNpcAsh_c), + 0, + 0, + &g_fopAc_Method.base, + 0x019B, + &daNpcAsh_MethodTable, + 0x00040100, + 4, + 14, }; /* 8095DC54-8095DC60 0002C4 000C+00 2/2 0/0 0/0 .data __vt__11J3DTexNoAnm */ @@ -1010,12 +776,13 @@ asm daNpcAsh_c::daNpcAsh_c() { #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__ct__10daNpcAsh_cFv.s" } #pragma pop - + /* 80958430-809584FC 000230 00CC+00 2/2 0/0 0/0 .text __dt__8dCcD_CylFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::~dCcD_Cyl() { +// asm dCcD_Cyl::~dCcD_Cyl() { +asm void __dt__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__8dCcD_CylFv.s" } @@ -1025,7 +792,8 @@ asm dCcD_Cyl::~dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_Cyl::dCcD_Cyl() { +// asm dCcD_Cyl::dCcD_Cyl() { +asm void __ct__8dCcD_CylFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__ct__8dCcD_CylFv.s" } @@ -1035,7 +803,8 @@ asm dCcD_Cyl::dCcD_Cyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__8cM3dGCylFv.s" } @@ -1045,7 +814,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__8cM3dGAabFv.s" } @@ -1055,7 +825,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daNpcAsh_c::~daNpcAsh_c() { +// asm daNpcAsh_c::~daNpcAsh_c() { +asm void __dt__10daNpcAsh_cFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__10daNpcAsh_cFv.s" } @@ -1063,61 +834,126 @@ asm daNpcAsh_c::~daNpcAsh_c() { /* ############################################################################################## */ /* 8095D640-8095D6AC 000000 006C+00 14/14 0/0 0/0 .rodata m__16daNpcAsh_Param_c */ -SECTION_RODATA u8 const daNpcAsh_Param_c::m[108] = { - 0x42, 0x0C, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, - 0x43, 0x7F, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x41, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0xC1, 0xF0, 0x00, 0x00, - 0x3F, 0x4C, 0xCC, 0xCD, 0x41, 0x40, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x05, 0x00, 0x06, - 0x42, 0xF0, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +SECTION_RODATA daNpcAsh_Param_c::param const daNpcAsh_Param_c::m = { + 35.0f, + -3.0f, // mGravity + 1.0f, + 400.0f, // mShadow + 255.0f, // mSttsWeight + 200.0f, + 35.0f, + 30.0f, + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 30.0f, + 0.0f, + 30.0f, + -30.0f, + 0.8f, // mLookatScl + 12.0f, + 3, + 6, + 5, + 6, + 120.0f, // mSightAngle + 500.0f, + 300.0f, + -300.0f, + 60, + 8, + 0, + 0, + 0, + 0, }; COMPILER_STRIP_GATE(0x8095D640, &daNpcAsh_Param_c::m); -/* 8095D6AC-8095D6B0 00006C 0004+00 0/1 0/0 0/0 .rodata @4224 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4224 = -100.0f; -COMPILER_STRIP_GATE(0x8095D6AC, &lit_4224); -#pragma pop - -/* 8095D6B0-8095D6B4 000070 0004+00 0/1 0/0 0/0 .rodata @4225 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4225 = -50.0f; -COMPILER_STRIP_GATE(0x8095D6B0, &lit_4225); -#pragma pop - -/* 8095D6B4-8095D6B8 000074 0004+00 0/1 0/0 0/0 .rodata @4226 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4226 = 100.0f; -COMPILER_STRIP_GATE(0x8095D6B4, &lit_4226); -#pragma pop - -/* 8095D6B8-8095D6BC 000078 0004+00 0/1 0/0 0/0 .rodata @4227 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4227 = 220.0f; -COMPILER_STRIP_GATE(0x8095D6B8, &lit_4227); -#pragma pop - -/* 8095D910-8095D910 0002D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8095D97C = "R_SP116"; -SECTION_DEAD static char const* const stringBase_8095D984 = "D_MN09"; -#pragma pop - /* 809587A0-80958B68 0005A0 03C8+00 1/1 0/0 0/0 .text Create__10daNpcAsh_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcAsh_c::Create() { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Create__10daNpcAsh_cFv.s" +cPhs__Step daNpcAsh_c::Create() { + cPhs__Step step; + + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daNpcAsh_c(); + fopAcM_OnCondition(this, 8); + } + + if (!strcmp(dComIfGp_getStartStageName(), "R_SP116") && dComIfG_play_c::getLayerNo(0) == 4) { + if (daNpcF_chkEvtBit(0x169) && !daNpcF_chkEvtBit(0x10a)) { + return cPhs_ERROR_e; + } + if (dComIfGs_isStageSwitch(0x18, 0x4b)) { + return cPhs_ERROR_e; + } + field_0xf60 = 0; + } else if (!strcmp(dComIfGp_getStartStageName(), "D_MN09")) { + if (dComIfGs_isSaveSwitch(0x14)) { + return cPhs_ERROR_e; + } + fopAcM_OnStatus(this, 0x4000); + field_0xf60 = 1; + } + + mMessageNo = getMessageNo(); + + step = cPhs_ERROR_e; + u32 i = 0; + int arcIndex; + while (arcIndex = l_loadRes_list[field_0xf60][i], arcIndex >= 0) { + step = (cPhs__Step)dComIfG_resLoad(&mPhase[i], l_arcNames[arcIndex]); + if (step != cPhs_COMPLEATE_e) { + return step; + } + i++; + } + + if (step == cPhs_COMPLEATE_e) { + u32 heapSize = 0; + switch (field_0xf60) { + case 0: + heapSize = 0x4210; + break; + case 1: + heapSize = 0x58b0; + break; + } + + if (!fopAcM_entrySolidHeap(this, createHeapCallBack, heapSize)) { + return cPhs_ERROR_e; + } + + fopAcM_SetMtx(this, mMcaMorf->getModel()->getBaseTRMtx()); + fopAcM_setCullSizeBox(this, -100.0f, -50.0f, -100.0f, 100.0f, 220.0f, 100.0f); + mZ2.init(¤t.pos, &mEyePos, 3, 1); + mAcchCir.SetWall(daNpcAsh_Param_c::m.m1C, daNpcAsh_Param_c::m.m18); + mAcch.Set(&fopAcM_GetPosition_p(this), &fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, &fopAcM_GetSpeed_p(this), &fopAcM_GetAngle_p(this), &fopAcM_GetShapeAngle_p(this)); + mAcch.SetRoofNone(); + mAcch.SetWaterNone(); + mAcch.CrrPos(dComIfG_Bgsp()); + mStts.Init((int)daNpcAsh_Param_c::m.mSttsWeight, 0, this); + mCcCyl[0].Set(daNpcF_c::mCcDCyl); + mCcCyl[0].SetStts(&mStts); + mCcCyl[0].SetTgType(0); + mCcCyl[0].SetTgSPrm(0); + if (field_0xf60 == 0) { + mCcCyl[1].Set(daNpcF_c::mCcDCyl); + mCcCyl[1].SetStts(&mStts); + mCcCyl[1].SetTgType(0); + mCcCyl[1].SetTgSPrm(0); + mCcCyl[1].SetCoSPrm(0x19); + } + field_0xa44 = mAcch.m_gnd; + field_0x980 = mAcch.GetGroundH(); + setEnvTevColor(); + setRoomNo(); + mMcaMorf->modelCalc(); + reset(); + Execute(); + } + + return step; } -#pragma pop /* ############################################################################################## */ /* 8095D6BC-8095D6C0 00007C 0004+00 4/4 0/0 0/0 .rodata @4300 */ @@ -1125,29 +961,81 @@ SECTION_RODATA static f32 const lit_4300 = 1.0f; COMPILER_STRIP_GATE(0x8095D6BC, &lit_4300); /* 8095D6C0-8095D6C4 000080 0004+00 3/9 0/0 0/0 .rodata @4301 */ -SECTION_RODATA static u8 const lit_4301[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; +SECTION_RODATA static f32 const lit_4301 = 0.0f; COMPILER_STRIP_GATE(0x8095D6C0, &lit_4301); /* 80958B68-80958F08 000968 03A0+00 1/1 0/0 0/0 .text CreateHeap__10daNpcAsh_cFv */ +#ifdef NONMATCHING +BOOL daNpcAsh_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], 11); + mMcaMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mZ2, 0x80000, 0x11020284); + if (mMcaMorf != NULL && mMcaMorf->mpModel == NULL) { + mMcaMorf->stopZelAnime(); + mMcaMorf = NULL; + } + if (mMcaMorf == NULL) { + return false; + } + + J3DModel* model = mMcaMorf->getModel(); + for (u16 jointNo = 0; jointNo < modelData->getJointNum(); jointNo++) { + modelData->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack); + } + model->setUserArea((u32)this); + + mpMatAnm = new daNpcF_MatAnm_c(); + if (mpMatAnm == NULL) { + return false; + } + + mModelQuiver = NULL; + mModelBow = NULL; + if (field_0xf60 == 1) { + mModelBow = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes(l_arcNames[2], 8), 0x80000, 0x11000084); + if (mModelBow == NULL) { + return false; + } + mModelQuiver = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes(l_arcNames[2], 9), 0x80000, 0x11000084); + if (mModelQuiver == NULL) { + return false; + } + } + + if (!setExpressionAnm(1, false)) { + return false; + } + + switch (field_0xf60) { + case 0: + if (isMap()) { + setMotionAnm(9, 0.0f); + } else { + setMotionAnm(8, 0.0f); + } + break; + case 1: + setMotionAnm(16, 0.0f); + break; + } + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcAsh_c::CreateHeap() { +asm BOOL daNpcAsh_c::CreateHeap() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/CreateHeap__10daNpcAsh_cFv.s" } #pragma pop +#endif /* 80958F08-80958F44 000D08 003C+00 1/1 0/0 0/0 .text __dt__15J3DTevKColorAnmFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTevKColorAnm::~J3DTevKColorAnm() { +// asm J3DTevKColorAnm::~J3DTevKColorAnm() { +asm void __dt__15J3DTevKColorAnmFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__15J3DTevKColorAnmFv.s" } @@ -1157,7 +1045,8 @@ asm J3DTevKColorAnm::~J3DTevKColorAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTevKColorAnm::J3DTevKColorAnm() { +// asm J3DTevKColorAnm::J3DTevKColorAnm() { +asm void __ct__15J3DTevKColorAnmFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__ct__15J3DTevKColorAnmFv.s" } @@ -1167,7 +1056,8 @@ asm J3DTevKColorAnm::J3DTevKColorAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTevColorAnm::~J3DTevColorAnm() { +// asm J3DTevColorAnm::~J3DTevColorAnm() { +asm void __dt__14J3DTevColorAnmFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__14J3DTevColorAnmFv.s" } @@ -1177,7 +1067,8 @@ asm J3DTevColorAnm::~J3DTevColorAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTevColorAnm::J3DTevColorAnm() { +// asm J3DTevColorAnm::J3DTevColorAnm() { +asm void __ct__14J3DTevColorAnmFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__ct__14J3DTevColorAnmFv.s" } @@ -1187,7 +1078,8 @@ asm J3DTevColorAnm::J3DTevColorAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTexNoAnm::~J3DTexNoAnm() { +// asm J3DTexNoAnm::~J3DTexNoAnm() { +asm void __dt__11J3DTexNoAnmFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__11J3DTexNoAnmFv.s" } @@ -1197,7 +1089,8 @@ asm J3DTexNoAnm::~J3DTexNoAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTexNoAnm::J3DTexNoAnm() { +// asm J3DTexNoAnm::J3DTexNoAnm() { +asm void __ct__11J3DTexNoAnmFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__ct__11J3DTexNoAnmFv.s" } @@ -1207,7 +1100,8 @@ asm J3DTexNoAnm::J3DTexNoAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTexMtxAnm::~J3DTexMtxAnm() { +// asm J3DTexMtxAnm::~J3DTexMtxAnm() { +asm void __dt__12J3DTexMtxAnmFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__12J3DTexMtxAnmFv.s" } @@ -1217,7 +1111,8 @@ asm J3DTexMtxAnm::~J3DTexMtxAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTexMtxAnm::J3DTexMtxAnm() { +// asm J3DTexMtxAnm::J3DTexMtxAnm() { +asm void __ct__12J3DTexMtxAnmFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__ct__12J3DTexMtxAnmFv.s" } @@ -1227,7 +1122,8 @@ asm J3DTexMtxAnm::J3DTexMtxAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DMatColorAnm::~J3DMatColorAnm() { +// asm J3DMatColorAnm::~J3DMatColorAnm() { +asm void __dt__14J3DMatColorAnmFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__14J3DMatColorAnmFv.s" } @@ -1237,104 +1133,232 @@ asm J3DMatColorAnm::~J3DMatColorAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DMatColorAnm::J3DMatColorAnm() { +// asm J3DMatColorAnm::J3DMatColorAnm() { +asm void __ct__14J3DMatColorAnmFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__ct__14J3DMatColorAnmFv.s" } #pragma pop /* 809590C4-809590F8 000EC4 0034+00 1/1 0/0 0/0 .text Delete__10daNpcAsh_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcAsh_c::Delete() { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Delete__10daNpcAsh_cFv.s" +int daNpcAsh_c::Delete() { + this->~daNpcAsh_c(); + return 1; } -#pragma pop /* 809590F8-8095911C 000EF8 0024+00 2/2 0/0 0/0 .text Execute__10daNpcAsh_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcAsh_c::Execute() { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Execute__10daNpcAsh_cFv.s" +int daNpcAsh_c::Execute() { + execute(); + return 1; } -#pragma pop /* 8095911C-80959238 000F1C 011C+00 1/1 0/0 0/0 .text Draw__10daNpcAsh_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcAsh_c::Draw() { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Draw__10daNpcAsh_cFv.s" +int daNpcAsh_c::Draw() { + mMcaMorf->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); + draw(0, 0, daNpcAsh_Param_c::m.mShadow, NULL, 0); + if (field_0xf60 == 1) { + g_env_light.setLightTevColorType_MAJI(mModelBow->mModelData, &mTevStr); + mDoMtx_stack_c::copy(mMcaMorf->getModel()->i_getAnmMtx(16)); + mModelBow->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mDoExt_modelUpdateDL(mModelBow); + g_env_light.setLightTevColorType_MAJI(mModelQuiver->mModelData, &mTevStr); + mDoMtx_stack_c::copy(mMcaMorf->getModel()->i_getAnmMtx(2)); + mModelQuiver->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mDoExt_modelUpdateDL(mModelQuiver); + } + return 1; } -#pragma pop /* ############################################################################################## */ -/* 8095D6C4-8095D6D0 000084 000C+00 1/1 0/0 0/0 .rodata @4385 */ -SECTION_RODATA static u8 const lit_4385[12] = { - 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, -}; -COMPILER_STRIP_GATE(0x8095D6C4, &lit_4385); /* 80959238-80959458 001038 0220+00 1/1 0/0 0/0 .text ctrlJoint__10daNpcAsh_cFP8J3DJointP8J3DModel */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcAsh_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/ctrlJoint__10daNpcAsh_cFP8J3DJointP8J3DModel.s" +bool daNpcAsh_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { + int jointNo = i_joint->getJntNo(); + int lookatJoints[3] = {1, 3, 4}; + if (jointNo == 0) { + mDoMtx_stack_c::copy(mMcaMorf->getModel()->i_getAnmMtx(1)); + mDoMtx_stack_c::multVecZero(&mLookatPos[0]); + mDoMtx_stack_c::copy(mMcaMorf->getModel()->i_getAnmMtx(3)); + mDoMtx_stack_c::multVecZero(&mLookatPos[1]); + mDoMtx_stack_c::copy(mMcaMorf->getModel()->i_getAnmMtx(4)); + mDoMtx_stack_c::multVecZero(&mLookatPos[2]); + } + mDoMtx_stack_c::copy(i_model->i_getAnmMtx(jointNo)); + switch (jointNo) { + case 1: + case 3: + case 4: + setLookatMtx(jointNo, lookatJoints, daNpcAsh_Param_c::m.mLookatScl); + break; + } + i_model->setAnmMtx(jointNo, mDoMtx_stack_c::get()); + cMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); + if ((jointNo == 4 || jointNo == 12) && (mAnmFlags & 0x100) != 0) { + J3DAnmTransform* bckAnm = mBckAnm.getBckAnm(); + mBckAnm.changeBckOnly(mMcaMorf->getAnm()); + mMcaMorf->changeAnm(bckAnm); + } + if (cM3d_IsZero_inverted(mExpressionMorf)) { + if (jointNo == 12) { + mMcaMorf->onMorfNone(); + } else if (jointNo == 4) { + mMcaMorf->offMorfNone(); + } + } + return true; } -#pragma pop /* 80959458-80959478 001258 0020+00 1/1 0/0 0/0 .text * createHeapCallBack__10daNpcAsh_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcAsh_c::createHeapCallBack(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/createHeapCallBack__10daNpcAsh_cFP10fopAc_ac_c.s" +BOOL daNpcAsh_c::createHeapCallBack(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop /* 80959478-809594C4 001278 004C+00 1/1 0/0 0/0 .text ctrlJointCallBack__10daNpcAsh_cFP8J3DJointi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcAsh_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/ctrlJointCallBack__10daNpcAsh_cFP8J3DJointi.s" +BOOL daNpcAsh_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) { + J3DModel* model; + daNpcAsh_c* self; + if (param_1 == 0) { + model = j3dSys.getModel(); + self = (daNpcAsh_c*)model->getUserArea(); + if (self != NULL) { + self->ctrlJoint(i_joint, model); + } + } + return true; } -#pragma pop /* 809594C4-809596E0 0012C4 021C+00 2/0 0/0 0/0 .text setExpressionAnm__10daNpcAsh_cFib */ +#ifdef NONMATCHING +// literals +bool daNpcAsh_c::setExpressionAnm(int i_idx, bool i_modify) { + J3DAnmTransform* bckAnm; + if (i_idx < 0 || i_idx > 7) { + return false; + } + mAnmFlags &= ~ANM_EXPRESSION_FLAGS; + if (l_bckGetParamList[i_idx].bckIdx >= 0) { + bckAnm = getTrnsfrmKeyAnmP(l_arcNames[l_bckGetParamList[i_idx].arcIdx], l_bckGetParamList[i_idx].bckIdx); + } else { + bckAnm = NULL; + } + s32 attr = l_bckGetParamList[i_idx].bckAttr; + bool res = false; + switch (i_idx) { + case 0: + res = setExpressionBtp(0); + break; + case 1: + res = setExpressionBtp(0); + break; + case 2: + res = setExpressionBtp(0); + break; + case 3: + res = setExpressionBtp(0); + break; + case 4: + res = setExpressionBtp(0); + break; + case 5: + res = setExpressionBtp(0); + break; + case 6: + res = setExpressionBtp(0); + break; + case 7: + res = setExpressionBtp(0); + break; + default: + bckAnm = NULL; + break; + } + if (!res) { + return false; + } + if (bckAnm == NULL) { + return true; + } + if (setBckAnm(bckAnm, 1.0f, attr, 0, -1, i_modify)) { + mAnmFlags |= ANM_PAUSE_BCK | ANM_PLAY_BCK; + mExpressionLoops = 0; + return true; + } + return false; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcAsh_c::setExpressionAnm(int param_0, bool param_1) { +asm bool daNpcAsh_c::setExpressionAnm(int param_0, bool param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setExpressionAnm__10daNpcAsh_cFib.s" } #pragma pop +#endif /* 809596E0-809597C0 0014E0 00E0+00 1/0 0/0 0/0 .text setExpressionBtp__10daNpcAsh_cFi */ +#ifdef NONMATCHING +// literals +bool daNpcAsh_c::setExpressionBtp(int i_idx) { + J3DAnmTexPattern* btpAnm = getTexPtrnAnmP(l_arcNames[l_btpGetParamList[i_idx].arcIdx], l_btpGetParamList[i_idx].btpIdx); + s32 attr = l_btpGetParamList[i_idx].btpAttr; + mAnmFlags &= ~(ANM_PAUSE_BTP | ANM_PLAY_BTP | ANM_FLAG_800); + if (btpAnm == NULL) { + return true; + } + if (setBtpAnm(btpAnm, mMcaMorf->getModel()->getModelData(), 1.0f, attr)) { + mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP; + if (i_idx == 0) { + mAnmFlags |= ANM_FLAG_800; + } + return true; + } + return false; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcAsh_c::setExpressionBtp(int param_0) { +asm bool daNpcAsh_c::setExpressionBtp(int param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setExpressionBtp__10daNpcAsh_cFi.s" } #pragma pop +#endif /* 809597C0-80959910 0015C0 0150+00 1/0 0/0 0/0 .text setMotionAnm__10daNpcAsh_cFif */ +#ifdef NONMATCHING +// literals +void daNpcAsh_c::setMotionAnm(int i_idx, f32 i_morf) { + J3DAnmTransformKey* morfAnm; + J3DAnmTextureSRTKey* btkAnm; + s32 morfAttr; + s32 btkAttr; + if (i_idx < 8 || i_idx >= 18) { + return; + } + morfAnm = getTrnsfrmKeyAnmP(l_arcNames[l_bckGetParamList[i_idx].arcIdx], l_bckGetParamList[i_idx].bckIdx); + btkAnm = getTexSRTKeyAnmP(l_arcNames[l_btkGetParamList[0].arcIdx], l_btkGetParamList[0].btkIdx); + morfAttr = l_bckGetParamList[i_idx].bckAttr; + btkAttr = l_btkGetParamList[0].btkAttr; + mAnmFlags &= ~ANM_MOTION_FLAGS; + if (morfAnm != NULL) { + if (setMcaMorfAnm(morfAnm, 1.0f, i_morf, morfAttr, 0, -1)) { + mAnmFlags |= ANM_PAUSE_MORF | ANM_PLAY_MORF; + mMotionLoops = 0; + } + } + if (btkAnm != NULL) { + if (setBtkAnm(btkAnm, mMcaMorf->getModel()->getModelData(), 1.0f, btkAttr)) { + mAnmFlags |= ANM_PAUSE_BTK | ANM_PLAY_BTK; + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1343,8 +1367,56 @@ asm void daNpcAsh_c::setMotionAnm(int param_0, f32 param_1) { #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setMotionAnm__10daNpcAsh_cFif.s" } #pragma pop +#endif /* 80959910-80959B28 001710 0218+00 1/1 0/0 0/0 .text reset__10daNpcAsh_cFv */ +#ifdef NONMATCHING +// literals +void daNpcAsh_c::reset() { + initialize(); + mpMatAnm->initialize(); + mLookat.initialize(); + for (int i = 0; i < 6; i++) { + mActorMngr[i].initialize(); + } + + field_0xf50 = 0; + field_0xf54 = 0; + mpActionFn = NULL; + mLookMode = -1; + field_0xf5c = 0; + mGravity = daNpcAsh_Param_c::m.mGravity; + current.pos = orig.pos; + next.pos = current.pos; + current.angle.set(0, orig.angle.y, 0); + next.angle = current.angle; + shape_angle = current.angle; + field_0x8f0 = current.angle; + field_0x8f6 = field_0x8f0; + speedF = 0.0f; + speed.setAll(0.0f); + mItemPartnerId = -1; + mOrderEvtNo = 0; + mExpressionMorfOverride = 0; + mMotionMorfOverride = 0; + + if (mMessageNo == 0x42d) { + field_0xf5f = 0; + } else { + field_0xf5f = 3; + } + + if (isSneaking()) { + fopAcM_OnStatus(this, 0x4000); + } + + if (field_0xf60 == 0) { + setAction(&wait_type0); + } else { + setAction(&wait_type1); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1353,206 +1425,109 @@ asm void daNpcAsh_c::reset() { #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/reset__10daNpcAsh_cFv.s" } #pragma pop +#endif /* 80959B28-80959BD0 001928 00A8+00 1/1 0/0 0/0 .text * setAction__10daNpcAsh_cFM10daNpcAsh_cFPCvPvPv_b */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcAsh_c::setAction(bool (daNpcAsh_c::*param_0)(void*)) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setAction__10daNpcAsh_cFM10daNpcAsh_cFPCvPvPv_b.s" +bool daNpcAsh_c::setAction(daNpcAsh_actionFn i_actionFn) { + field_0xf5c = 3; + if (mpActionFn != NULL) { + (this->*mpActionFn)(NULL); + } + field_0xf5c = 0; + this->mpActionFn = i_actionFn; + if (mpActionFn != NULL) { + (this->*mpActionFn)(NULL); + } + return true; } -#pragma pop /* 80959BD0-80959C40 0019D0 0070+00 1/1 0/0 0/0 .text isSneaking__10daNpcAsh_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcAsh_c::isSneaking() { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/isSneaking__10daNpcAsh_cFv.s" +bool daNpcAsh_c::isSneaking() { + if (!strcmp(dComIfGp_getStartStageName(), ((char*)&d_a_npc_ash__stringBase0) + 0x6C) && dComIfGp_getStartStageRoomNo() == 5 && dComIfG_play_c::getLayerNo(0) == 2) { // "R_SP116" + return true; + } else { + return false; + } } -#pragma pop -/* ############################################################################################## */ -/* 8095D6D0-8095D6DC 000090 000C+00 0/1 0/0 0/0 .rodata @4638 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4638[12] = { - 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8095D6D0, &lit_4638); -#pragma pop +void daNpcAsh_c::playExpression() { + daNpcF_anmPlayData dat0 = {1, daNpcAsh_Param_c::m.m44, 0}; + daNpcF_anmPlayData* pDat0[1] = {&dat0}; + daNpcF_anmPlayData dat1 = {2, daNpcAsh_Param_c::m.m44, 0}; + daNpcF_anmPlayData* pDat1[1] = {&dat1}; + daNpcF_anmPlayData dat2 = {3, daNpcAsh_Param_c::m.m44, 0}; + daNpcF_anmPlayData* pDat2[1] = {&dat2}; + daNpcF_anmPlayData dat3 = {4, daNpcAsh_Param_c::m.m44, 0}; + daNpcF_anmPlayData* pDat3[1] = {&dat3}; + daNpcF_anmPlayData dat4 = {5, daNpcAsh_Param_c::m.m44, 0}; + daNpcF_anmPlayData* pDat4[1] = {&dat4}; + daNpcF_anmPlayData dat5 = {6, daNpcAsh_Param_c::m.m44, 0}; + daNpcF_anmPlayData* pDat5[1] = {&dat5}; + daNpcF_anmPlayData dat6 = {7, daNpcAsh_Param_c::m.m44, 0}; + daNpcF_anmPlayData* pDat6[1] = {&dat6}; + daNpcF_anmPlayData dat7 = {0, daNpcAsh_Param_c::m.m44, 0}; + daNpcF_anmPlayData* pDat7[1] = {&dat7}; + daNpcF_anmPlayData** ppDat[8] = { + pDat0, + pDat1, + pDat2, + pDat3, + pDat4, + pDat5, + pDat6, + pDat7, + }; + if (mExpression >= 0 && mExpression < 8) { + playExpressionAnm(ppDat); + } +} -/* 8095D6DC-8095D6E0 00009C 0004+00 0/1 0/0 0/0 .rodata @4639 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4639[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8095D6DC, &lit_4639); -#pragma pop +#ifdef NONMATCHING +// inlining +void daNpcAsh_c::playMotion() { + daNpcF_anmPlayData dat0 = {8, daNpcAsh_Param_c::m.m44, 0}; + daNpcF_anmPlayData* pDat0[1] = {&dat0}; + daNpcF_anmPlayData dat1 = {9, daNpcAsh_Param_c::m.m44, 0}; + daNpcF_anmPlayData* pDat1[1] = {&dat1}; + daNpcF_anmPlayData dat2 = {10, daNpcAsh_Param_c::m.m44, 0}; + daNpcF_anmPlayData* pDat2[1] = {&dat2}; + daNpcF_anmPlayData dat3a = {12, daNpcAsh_Param_c::m.m44, 1}; + daNpcF_anmPlayData dat3b = {10, daNpcAsh_Param_c::m.m44, 0}; + daNpcF_anmPlayData* pDat3[2] = {&dat3a, &dat3b}; + daNpcF_anmPlayData dat4a = {13, daNpcAsh_Param_c::m.m44, 1}; + daNpcF_anmPlayData dat4b = {10, daNpcAsh_Param_c::m.m44, 0}; + daNpcF_anmPlayData* pDat4[2] = {&dat4a, &dat4b}; + daNpcF_anmPlayData dat5a = {14, daNpcAsh_Param_c::m.m44, 1}; + daNpcF_anmPlayData dat5b = {10, daNpcAsh_Param_c::m.m44, 0}; + daNpcF_anmPlayData* pDat5[2] = {&dat5a, &dat5b}; + daNpcF_anmPlayData dat6a = {15, daNpcAsh_Param_c::m.m44, 1}; + daNpcF_anmPlayData dat6b = {8, daNpcAsh_Param_c::m.m44, 0}; + daNpcF_anmPlayData* pDat6[2] = {&dat6a, &dat6b}; + daNpcF_anmPlayData dat7 = {16, daNpcAsh_Param_c::m.m44, 0}; + daNpcF_anmPlayData* pDat7[1] = {&dat7}; + daNpcF_anmPlayData dat8 = {17, daNpcAsh_Param_c::m.m44, 0}; + daNpcF_anmPlayData* pDat8[1] = {&dat8}; + daNpcF_anmPlayData dat9 = {11, 4.0, 1}; + daNpcF_anmPlayData* pDat9[1] = {&dat9}; + daNpcF_anmPlayData** ppDat[10] = { + pDat0, + pDat1, + pDat2, + pDat3, + pDat4, + pDat5, + pDat6, + pDat7, + pDat8, + pDat9, + }; + if (mMotion >= 0 && mMotion < 10) { + playMotionAnm(ppDat); + } +} -/* 8095D6E0-8095D6EC 0000A0 000C+00 0/1 0/0 0/0 .rodata @4640 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4640[12] = { - 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8095D6E0, &lit_4640); -#pragma pop - -/* 8095D6EC-8095D6F0 0000AC 0004+00 0/1 0/0 0/0 .rodata @4641 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4641[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8095D6EC, &lit_4641); -#pragma pop - -/* 8095D6F0-8095D6FC 0000B0 000C+00 0/1 0/0 0/0 .rodata @4642 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4642[12] = { - 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8095D6F0, &lit_4642); -#pragma pop - -/* 8095D6FC-8095D700 0000BC 0004+00 0/1 0/0 0/0 .rodata @4643 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4643[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8095D6FC, &lit_4643); -#pragma pop - -/* 8095D700-8095D70C 0000C0 000C+00 0/1 0/0 0/0 .rodata @4644 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4644[12] = { - 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8095D700, &lit_4644); -#pragma pop - -/* 8095D70C-8095D710 0000CC 0004+00 0/1 0/0 0/0 .rodata @4645 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4645[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8095D70C, &lit_4645); -#pragma pop - -/* 8095D710-8095D71C 0000D0 000C+00 0/1 0/0 0/0 .rodata @4646 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4646[12] = { - 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8095D710, &lit_4646); -#pragma pop - -/* 8095D71C-8095D720 0000DC 0004+00 0/1 0/0 0/0 .rodata @4647 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4647[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8095D71C, &lit_4647); -#pragma pop - -/* 8095D720-8095D72C 0000E0 000C+00 0/1 0/0 0/0 .rodata @4648 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4648[12] = { - 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8095D720, &lit_4648); -#pragma pop - -/* 8095D72C-8095D730 0000EC 0004+00 0/1 0/0 0/0 .rodata @4649 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4649[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8095D72C, &lit_4649); -#pragma pop - -/* 8095D730-8095D73C 0000F0 000C+00 0/1 0/0 0/0 .rodata @4650 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4650[12] = { - 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8095D730, &lit_4650); -#pragma pop - -/* 8095D73C-8095D740 0000FC 0004+00 0/1 0/0 0/0 .rodata @4651 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4651[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8095D73C, &lit_4651); -#pragma pop - -/* 8095D740-8095D74C 000100 000C+00 0/1 0/0 0/0 .rodata @4652 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4652[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8095D740, &lit_4652); -#pragma pop - -/* 8095D74C-8095D750 00010C 0004+00 0/1 0/0 0/0 .rodata @4653 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4653[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8095D74C, &lit_4653); -#pragma pop - -/* 8095D750-8095D770 000110 0020+00 0/0 0/0 0/0 .rodata @4654 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4654[32] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8095D750, &lit_4654); -#pragma pop +#else /* 8095D770-8095D77C 000130 000C+00 0/1 0/0 0/0 .rodata @4658 */ #pragma push @@ -1799,6 +1774,8 @@ SECTION_RODATA static u8 const lit_4682[40] = { COMPILER_STRIP_GATE(0x8095D850, &lit_4682); #pragma pop +#endif + /* 8095D878-8095D884 000238 000C+00 0/1 0/0 0/0 .rodata @4697 */ #pragma push #pragma force_active on @@ -1836,34 +1813,132 @@ COMPILER_STRIP_GATE(0x8095D890, &lit_4980); #pragma pop /* 80959C40-8095A67C 001A40 0A3C+00 4/0 0/0 0/0 .text wait_type0__10daNpcAsh_cFPv */ +#ifdef NONMATCHING +bool daNpcAsh_c::wait_type0(void* param_0) { + switch (field_0xf5c) { + case 0: + setExpression(7, -1.0f); + if (!isMap()) { + setMotion(0, -1.0f, false); + } else if (field_0x8f0.y == orig.angle.y) { + setMotion(1, -1.0f, false); + } + field_0x96c = 0; + speedF = 0.0f; + field_0xf5c = 2; + break; + case 2: + if (isSneaking()) { + setLookMode(0, NULL); + } else { + if (mActorMngr[0].getActorP() != NULL) { + if (!chkFindPlayer()) { + field_0x96c = 0; + } + } else { + if (chkFindPlayer()) { + field_0x96c = 0; + } + } + if (mActorMngr[0].getActorP() != NULL) { + setLookMode(2, NULL); + } else { + if (isMap()) { + setLookMode(4, NULL); + } else { + setLookMode(0, NULL); + } + if (orig.angle.y != field_0x8f0.y) { + if (step(orig.angle.y, true)) { + setExpression(7, -1.0f); + if (!isMap()) { + setMotion(0, -1.0f, false); + } else { + setMotion(1, -1.0f, false); + } + field_0x96c = 0; + } + } + daTag_EvtArea_c* evtArea = (daTag_EvtArea_c*)mActorMngr[5].getActorP(); + if (evtArea != NULL) { + if (evtArea->chkPointInArea(fopAcM_GetPosition_p(daPy_getPlayerActorClass()))) { + daNpcF_offTmpBit(11); + mOrderEvtNo = 2; + fopAcM_delete(evtArea); + } + } + } + } + if (field_0x8f0.y != orig.angle.y) { + if (step(orig.angle.y, true)) { + if (!isMap()) { + setMotion(0, -1.0f, false); + } else { + setMotion(1, -1.0f, false); + } + field_0x96c = 0; + } + } + if (i_dComIfGp_event_runCheck()) { + if (mEvtInfo.checkCommandTalk()) { + if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) { + if (isSneaking()) { + mOrderEvtNo = 3; + changeEvent(l_arcNames[0], l_evtNames[mOrderEvtNo], 1, -1); + } else { + setAction(&talk); + } + } + } else { + if (i_dComIfGp_getEventManager().getMyStaffId(l_myName, NULL, 0) != -1) { + setAction(&demo); + } + } + } else { + if (mOrderEvtNo != 0) { + mEvtInfo.setArchiveName("Ash"); + } + orderEvent(mMapToolId, mOrderEvtNo != 0 ? l_evtNames[mOrderEvtNo] : NULL, -1, 40, -1, 1); + } + break; + case 3: + break; + } + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcAsh_c::wait_type0(void* param_0) { +asm bool daNpcAsh_c::wait_type0(void* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/wait_type0__10daNpcAsh_cFPv.s" } #pragma pop +#endif /* 8095A67C-8095A6C0 00247C 0044+00 1/0 0/0 0/0 .text setMotion__10daNpcAsh_cFifi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcAsh_c::setMotion(int param_0, f32 param_1, int param_2) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setMotion__10daNpcAsh_cFifi.s" +void daNpcAsh_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) { + s16 motion = (s16)i_motion; + if ((i_restart || mMotion != motion)) { + if (i_motion >= 0 && i_motion < 10) { + mMotion = motion; + mMotionMorfOverride = i_morf; + mMotionPrevPhase = -1; + mMotionPhase = 0; + } + } } -#pragma pop /* 8095A6C0-8095A6EC 0024C0 002C+00 1/0 0/0 0/0 .text setExpression__10daNpcAsh_cFif */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcAsh_c::setExpression(int param_0, f32 param_1) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setExpression__10daNpcAsh_cFif.s" +void daNpcAsh_c::setExpression(int i_expression, f32 i_morf) { + if (i_expression >= 0 && i_expression < 8) { + mExpression = i_expression; + mExpressionMorfOverride = i_morf; + mExpressionPrevPhase = -1; + mExpressionPhase = 0; + } } -#pragma pop /* ############################################################################################## */ /* 8095D898-8095D89C 000258 0004+00 0/1 0/0 0/0 .rodata @5033 */ @@ -1881,34 +1956,177 @@ COMPILER_STRIP_GATE(0x8095D89C, &lit_5034); #pragma pop /* 8095A6EC-8095A8EC 0024EC 0200+00 3/0 0/0 0/0 .text wait_type1__10daNpcAsh_cFPv */ +#ifdef NONMATCHING +// literals +bool daNpcAsh_c::wait_type1(void* param_0) { + switch (field_0xf5c) { + case 0: + setExpression(7, -1.0f); + setMotion(7, -1.0f, false); + field_0x96c = 0; + speedF = 0.0f; + mActorMngr[0].entry(daPy_getPlayerActorClass()); + setLookMode(0, NULL); + field_0xf5c = 2; + break; + case 2: + switch (field_0xf54) { + case 0: + if (daNpcF_chkTmpBit(0x76)) { + current.pos.set(-4300.0f, 0.0f, 8627.657f); + next.pos = current.pos; + setAngle(-0x6000); + field_0xf54++; + } + break; + case 1: + if (daNpcF_chkTmpBit(0x74)) { + setAction(&leave); + } + break; + } + break; + case 3: + break; + } + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcAsh_c::wait_type1(void* param_0) { +asm bool daNpcAsh_c::wait_type1(void* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/wait_type1__10daNpcAsh_cFPv.s" } #pragma pop +#endif /* 8095A8EC-8095AD28 0026EC 043C+00 1/0 0/0 0/0 .text talk__10daNpcAsh_cFPv */ +#ifdef NONMATCHING +// literals +bool daNpcAsh_c::talk(void* param_0) { + int expression, motion; + bool ret = false; + switch (field_0xf5c) { + case 0: + initTalk(mMessageNo, NULL); + field_0x96c = 0; + field_0x950 = 0; + if (mMessageNo == 0x42d) { + field_0xf5f++; + } + mMapToolId = 0; + speedF = 0.0f; + setLookMode(3, NULL); + setMotion(0, -1.0f, false); + field_0xf5c = 2; + break; + case 2: + if (field_0xf5f <= 2 || field_0x8f0.y == fopAcM_searchPlayerAngleY(this)) { + if (talkProc(NULL, 1, NULL)) { + mActorMngr[0].entry(daPy_getPlayerActorClass()); + setAction(&wait_type0); + ret = true; + } else { + s32 unk = field_0x950; + if (ctrlMsgAnm(expression, motion, this, 0)) { + setExpression(expression, -1.0f); + setMotion(motion, -1.0f, false); + } else { + if (unk != 0 && field_0x950 == 0) { + setExpressionTalkAfter(); + } + } + } + } else { + if (step(fopAcM_searchPlayerAngleY(this), true)) { + setMotion(0, -1.0f, false); + field_0x96c = 0; + } + } + break; + case 3: + setExpression(7, -1.0f); + if (field_0x9ec == 0) { + i_dComIfGp_event_reset(); + } + break; + } + return ret; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcAsh_c::talk(void* param_0) { +asm bool daNpcAsh_c::talk(void* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/talk__10daNpcAsh_cFPv.s" } #pragma pop +#endif /* 8095AD28-8095B164 002B28 043C+00 1/0 0/0 0/0 .text demo__10daNpcAsh_cFPv */ +#ifdef NONMATCHING +bool daNpcAsh_c::demo(void* param_0) { + switch (field_0xf5c) { + case 0: + setExpression(7, -1.0f); + if (!isMap()) { + setMotion(0, -1.0f, false); + } else { + setMotion(1, -1.0f, false); + } + field_0xf5c = 2; + // no break + case 2: + if (i_dComIfGp_event_runCheck() && !mEvtInfo.checkCommandTalk()) { + s32 cutIndex = i_dComIfGp_getEventManager().getMyStaffId(l_myName, NULL, 0); + if (cutIndex != -1) { + mCutIndex = cutIndex; + s32 eventIdx = i_dComIfGp_getEventManager().getMyActIdx(cutIndex, l_evtNames, 6, 0, 0); + if (eventIdx >= 1 && eventIdx < 6) { + mOrderEvtNo = eventIdx; + } + if ((this->*(mEvtSeqList[mOrderEvtNo]))(cutIndex)) { + i_dComIfGp_getEventManager().cutEnd(cutIndex); + } + } + if (mEvtInfo.checkCommandDemoAccrpt() && field_0x9d4 != -1 && i_dComIfGp_getEventManager().endCheck(field_0x9d4)) { + i_dComIfGp_event_reset(); + mOrderEvtNo = 0; + field_0x9d4 = -1; + if (field_0xf60 == 0) { + setAction(&wait_type0); + } else { + setAction(&wait_type1); + } + } + } else { + mOrderEvtNo = 0; + field_0x9d4 = -1; + if (field_0xf60 == 0) { + setAction(&wait_type0); + } else { + setAction(&wait_type1); + } + } + break; + case 3: + break; + } + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcAsh_c::demo(void* param_0) { +asm bool daNpcAsh_c::demo(void* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/demo__10daNpcAsh_cFPv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8095D8A0-8095D8A4 000260 0004+00 0/1 0/0 0/0 .rodata @5227 */ @@ -1953,14 +2171,41 @@ COMPILER_STRIP_GATE(0x8095D8B8, &lit_5231); #pragma pop /* 8095B164-8095B48C 002F64 0328+00 1/0 0/0 0/0 .text leave__10daNpcAsh_cFPv */ +#ifdef NONMATCHING +// literals +bool daNpcAsh_c::leave(void* param_0) { + cXyz target; + target.set(-6253.387, 0.0, 6251.76); + switch (field_0xf5c) { + case 0: + setExpression(7, -1.0f); + setMotion(8, -1.0f, false); + field_0x96c = 0; + speedF = 0.0f; + field_0xf5c = 2; + break; + case 2: + step(cLib_targetAngleY(¤t.pos, &target), true); + speedF = 15.0f; + if (mAcch.ChkWallHit() || current.pos.abs(target) < speedF) { + fopAcM_delete(this); + } + break; + case 3: + break; + } + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcAsh_c::leave(void* param_0) { +asm bool daNpcAsh_c::leave(void* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/leave__10daNpcAsh_cFPv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8095D910-8095D910 0002D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -1971,14 +2216,26 @@ SECTION_DEAD static char const* const stringBase_8095D98B = "prm"; /* 8095B48C-8095B58C 00328C 0100+00 1/0 0/0 0/0 .text EvCut_Introduction__10daNpcAsh_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcAsh_c::EvCut_Introduction(int param_0) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/EvCut_Introduction__10daNpcAsh_cFi.s" + +BOOL daNpcAsh_c::EvCut_Introduction(int cutIndex) { + int* prm = dComIfGp_evmng_getMyIntegerP(cutIndex, ((char*)&d_a_npc_ash__stringBase0) + 0x7B); + if (prm == NULL) { + return false; + } + if (i_dComIfGp_getEventManager().getIsAddvance(cutIndex)) { + switch (*prm) { + case 0: + case 2: + setLookMode(0, NULL); + return true; + case 1: + setLookMode(2, NULL); + return true; + } + } + return false; } -#pragma pop + /* ############################################################################################## */ /* 8095D8C0-8095D8D0 000280 0010+00 1/1 0/0 0/0 .rodata @5254 */ @@ -1988,14 +2245,66 @@ SECTION_RODATA static u8 const lit_5254[16] = { COMPILER_STRIP_GATE(0x8095D8C0, &lit_5254); /* 8095B58C-8095B83C 00338C 02B0+00 1/0 0/0 0/0 .text EvCut_Meeting__10daNpcAsh_cFi */ +#ifdef NONMATCHING +// literals +BOOL daNpcAsh_c::EvCut_Meeting(int cutIndex) { + int expression, motion; + fopAc_ac_c* talkPartner; + dEvent_manager_c& evtMgr = i_dComIfGp_getEventManager(); + fopAc_ac_c* actors[4] = { + mActorMngr[2].getActorP(), + (fopAc_ac_c*)this, + mActorMngr[1].getActorP(), + mActorMngr[3].getActorP(), + }; + int* cutName = (int*)evtMgr.getMyNowCutName(cutIndex); + if (evtMgr.getIsAddvance(cutIndex)) { + switch (*cutName) { + case '0001': + case '0002': + dComIfGp_setMesgCameraInfoActor(actors[0], actors[1], actors[2], actors[3], NULL, NULL, NULL, NULL, NULL, NULL); + initTalk(0x42e, actors); + } + } + int unk = field_0x950; + if (ctrlMsgAnm(expression, motion, this, 0)) { + setExpression(expression, -1.0f); + setMotion(motion, -1.0f, false); + } else { + if (unk != 0 && field_0x950 == 0) { + setExpressionTalkAfter(); + } + } + switch (*cutName) { + case '0001': + if (talkProc(NULL, 1, actors)) { + return true; + } + talkPartner = dComIfGp_event_getTalkPartner(); + if (talkPartner == this) { + talkPartner = NULL; + } + setLookMode(5, talkPartner); + break; + case '0002': + if (talkProc(NULL, 1, actors)) { + return true; + } + setLookMode(2, NULL); + break; + } + return false; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcAsh_c::EvCut_Meeting(int param_0) { +asm BOOL daNpcAsh_c::EvCut_Meeting(int param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/EvCut_Meeting__10daNpcAsh_cFi.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8095D8D0-8095D8E0 000290 0010+00 1/1 0/0 0/0 .rodata @5295 */ @@ -2005,81 +2314,163 @@ SECTION_RODATA static u8 const lit_5295[16] = { COMPILER_STRIP_GATE(0x8095D8D0, &lit_5295); /* 8095B83C-8095BA80 00363C 0244+00 1/0 0/0 0/0 .text EvCut_WiretapSponsor__10daNpcAsh_cFi */ +#ifdef NONMATCHING +// literals +BOOL daNpcAsh_c::EvCut_WiretapSponsor(int cutIndex) { + int expression, motion; + fopAc_ac_c* talkPartner; + dEvent_manager_c& evtMgr = i_dComIfGp_getEventManager(); + fopAc_ac_c* actors[4] = { + mActorMngr[2].getActorP(), + (fopAc_ac_c*)this, + mActorMngr[1].getActorP(), + mActorMngr[3].getActorP(), + }; + int* cutName = (int*)evtMgr.getMyNowCutName(cutIndex); + if (evtMgr.getIsAddvance(cutIndex)) { + switch (*cutName) { + case '0001': + dComIfGp_setMesgCameraInfoActor(actors[0], actors[1], actors[2], actors[3], NULL, NULL, NULL, NULL, NULL, NULL); + initTalk(mMessageNo, actors); + } + } + int unk = field_0x950; + if (ctrlMsgAnm(expression, motion, this, 0)) { + setExpression(expression, -1.0f); + setMotion(motion, -1.0f, false); + } else { + if (unk != 0 && field_0x950 == 0) { + setExpressionTalkAfter(); + } + } + switch (*cutName) { + case '0001': + if (talkProc(NULL, 1, actors)) { + return true; + } + talkPartner = dComIfGp_event_getTalkPartner(); + if (talkPartner == this) { + talkPartner = NULL; + } + setLookMode(5, talkPartner); + } + return false; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcAsh_c::EvCut_WiretapSponsor(int param_0) { +asm BOOL daNpcAsh_c::EvCut_WiretapSponsor(int param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/EvCut_WiretapSponsor__10daNpcAsh_cFi.s" } #pragma pop +#endif /* 8095BA80-8095BC38 003880 01B8+00 2/0 0/0 0/0 .text EvCut_WiretapEntrant__10daNpcAsh_cFi */ +#ifdef NONMATCHING +BOOL daNpcAsh_c::EvCut_WiretapEntrant(int cutIndex) { + int expression, motion; + fopAc_ac_c* talkPartner; + int* prm = dComIfGp_evmng_getMyIntegerP(cutIndex, "prm"); + if (prm == NULL) { + return false; + } + if (i_dComIfGp_getEventManager().getIsAddvance(cutIndex)) { + switch (*prm) { + case 0: + setExpression(7, -1.0f); + setMotion(0, -1.0f, false); + break; + } + } + int unk = field_0x950; + if (ctrlMsgAnm(expression, motion, this, 0) != 0) { + setExpression(expression, -1.0f); + setMotion(motion, -1.0f, false); + } else { + if (unk != 0 && field_0x950 == 0) { + setExpressionTalkAfter(); + } + } + talkPartner = dComIfGp_event_getTalkPartner(); + if (talkPartner == this) { + talkPartner = NULL; + } + setLookMode(5, talkPartner); + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcAsh_c::EvCut_WiretapEntrant(int param_0) { +asm BOOL daNpcAsh_c::EvCut_WiretapEntrant(int param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/EvCut_WiretapEntrant__10daNpcAsh_cFi.s" } #pragma pop +#endif /* 8095BC38-8095BC58 003A38 0020+00 1/0 0/0 0/0 .text daNpcAsh_Create__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daNpcAsh_Create(void* param_0) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Create__FPv.s" +static cPhs__Step daNpcAsh_Create(void* i_this) { + return static_cast(i_this)->Create(); } -#pragma pop /* 8095BC58-8095BC78 003A58 0020+00 1/0 0/0 0/0 .text daNpcAsh_Delete__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daNpcAsh_Delete(void* param_0) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Delete__FPv.s" +static int daNpcAsh_Delete(void* i_this) { + return static_cast(i_this)->Delete(); } -#pragma pop /* 8095BC78-8095BC98 003A78 0020+00 1/0 0/0 0/0 .text daNpcAsh_Execute__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daNpcAsh_Execute(void* param_0) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Execute__FPv.s" +static int daNpcAsh_Execute(void* i_this) { + return static_cast(i_this)->Execute(); } -#pragma pop /* 8095BC98-8095BCB8 003A98 0020+00 1/0 0/0 0/0 .text daNpcAsh_Draw__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daNpcAsh_Draw(void* param_0) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Draw__FPv.s" +static int daNpcAsh_Draw(void* i_this) { + return static_cast(i_this)->Draw(); } -#pragma pop /* 8095BCB8-8095BCC0 003AB8 0008+00 1/0 0/0 0/0 .text daNpcAsh_IsDelete__FPv */ -static bool daNpcAsh_IsDelete(void* param_0) { - return true; +static int daNpcAsh_IsDelete(void* i_this) { + return 1; } /* 8095BCC0-8095BCF0 003AC0 0030+00 1/0 0/0 0/0 .text calc__11J3DTexNoAnmCFPUs */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTexNoAnm::calc(u16* param_0) const { +// asm void J3DTexNoAnm::calc(u16* param_0) const { +asm void calc__11J3DTexNoAnmCFPUs() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/calc__11J3DTexNoAnmCFPUs.s" } #pragma pop /* 8095BCF0-8095BF6C 003AF0 027C+00 1/0 0/0 0/0 .text setParam__10daNpcAsh_cFv */ +#ifdef NONMATCHING +// literals +void daNpcAsh_c::setParam() { + searchActors(); + mAttentionInfo.mFlags = 0xa; + if (isSneaking()) { + mAttentionInfo.field_0x0[0] = 0x4e; + mAttentionInfo.field_0x0[1] = mAttentionInfo.field_0x0[0]; + mAttentionInfo.field_0x0[3] = 0x4d; + mAttentionInfo.mFlags |= 0x800000; + } else { + if (!strcmp(dComIfGp_getStartStageName(), "R_SP116")) { + mAttentionInfo.field_0x0[0] = getDistTableIdx(3, 6); + mAttentionInfo.field_0x0[1] = mAttentionInfo.field_0x0[0]; + mAttentionInfo.field_0x0[3] = getDistTableIdx(2, 6); + } else { + mAttentionInfo.field_0x0[0] = getDistTableIdx(daNpcAsh_Param_c::m.m4C, daNpcAsh_Param_c::m.m4E); + mAttentionInfo.field_0x0[1] = mAttentionInfo.field_0x0[0]; + mAttentionInfo.field_0x0[3] = getDistTableIdx(daNpcAsh_Param_c::m.m48, daNpcAsh_Param_c::m.m4A); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2088,18 +2479,24 @@ asm void daNpcAsh_c::setParam() { #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setParam__10daNpcAsh_cFv.s" } #pragma pop +#endif /* 8095BF6C-8095C200 003D6C 0294+00 1/0 0/0 0/0 .text main__10daNpcAsh_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcAsh_c::main() { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/main__10daNpcAsh_cFv.s" +BOOL daNpcAsh_c::main() { + if (mpActionFn != NULL) { + (this->*mpActionFn)(NULL); + } + if (i_dComIfGp_event_runCheck() && !mEvtInfo.checkCommandTalk() && mItemPartnerId != -1) { + dComIfGp_event_setItemPartnerId(mItemPartnerId); + mItemPartnerId = -1; + } + playExpression(); + playMotion(); + return true; } -#pragma pop -/* 8095C200-8095C520 004000 0320+00 1/1 0/0 0/0 .text playMotion__10daNpcAsh_cFv */ +// /* 8095C200-8095C520 004000 0320+00 1/1 0/0 0/0 .text playMotion__10daNpcAsh_cFv */ +#ifndef NONMATCHING #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2108,6 +2505,7 @@ asm void daNpcAsh_c::playMotion() { #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/playMotion__10daNpcAsh_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8095D8E0-8095D8E4 0002A0 0004+00 0/1 0/0 0/0 .rodata @5492 */ @@ -2125,14 +2523,25 @@ COMPILER_STRIP_GATE(0x8095D8E4, &lit_5493); #pragma pop /* 8095C520-8095C5C4 004320 00A4+00 1/0 0/0 0/0 .text ctrlBtk__10daNpcAsh_cFv */ +#ifdef NONMATCHING +BOOL daNpcAsh_c::ctrlBtk() { + if (mpMatAnm != NULL) { + mpMatAnm->setNowOffsetX(cM_ssin(field_0x8fc.y) * 0.2f * -1.0f); + mpMatAnm->setNowOffsetY(cM_ssin(field_0x8fc.x) * 0.4f); + mpMatAnm->onEyeMoveFlag(); + } + return mpMatAnm != NULL; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcAsh_c::ctrlBtk() { +asm BOOL daNpcAsh_c::ctrlBtk() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/ctrlBtk__10daNpcAsh_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8095D8E8-8095D8EC 0002A8 0004+00 0/1 0/0 0/0 .rodata @5589 */ @@ -2178,6 +2587,53 @@ COMPILER_STRIP_GATE(0x8095D8FC, &lit_5594); #pragma pop /* 8095C5C4-8095C9BC 0043C4 03F8+00 1/0 0/0 0/0 .text setAttnPos__10daNpcAsh_cFv */ +#ifdef NONMATCHING +// literals +void daNpcAsh_c::setAttnPos() { + if (mLookMode == 1) { + for (int i = 0; i < 3; i++) { + field_0x91a[i].setall(0); + } + } + setMtx2(); + lookat(); + cXyz vec(10.0f, 10.0f, 0.0f); + mDoMtx_stack_c::copy(mMcaMorf->getModel()->i_getAnmMtx(4)); + mDoMtx_stack_c::multVecZero(&mHeadPos); + mDoMtx_stack_c::multVec(&vec, &mEyePos); + vec.x = 0.0f; + mDoMtx_stack_c::multVec(&vec, &vec); + field_0x902.x = cLib_targetAngleX(&mHeadPos, &vec); + field_0x902.y = cLib_targetAngleY(&mHeadPos, &vec); + cXyz* attnPos = mLookat.getAttnPos(); + if (attnPos != NULL) { + cXyz local_48 = *attnPos - mEyePos; + field_0x8fc.y = -(field_0x91a[2].y + field_0x8f0.y); + field_0x8fc.y += cM_atan2s(local_48.x, local_48.z); + field_0x8fc.x = -cM_atan2s(local_48.y, local_48.absXZ()); + field_0x8fc.x += field_0x902.x; + } else { + field_0x8fc.y = 0; + field_0x8fc.x = 0; + } + mAttentionInfo.mPosition.set(mHeadPos.x, mHeadPos.y + 35.0f, mHeadPos.z); + cXyz center; + mDoMtx_stack_c::copy(mMcaMorf->getModel()->i_getAnmMtx(2)); + mDoMtx_stack_c::multVecZero(¢er); + center.y = current.pos.y; + mCcCyl[0].SetC(center); + mCcCyl[0].SetH(daNpcAsh_Param_c::m.m14); + mCcCyl[0].SetR(daNpcAsh_Param_c::m.m1C); + dComIfG_Ccsp()->Set(&mCcCyl[0]); + if (field_0xf60 == 0 && (!daNpcF_chkEvtBit(0x169) || !daNpcF_chkEvtBit(0x10a) || !daNpcF_chkEvtBit(0x10b) || daNpcF_chkEvtBit(0x10c))) { + center.set(3070.0f, -1150.0f, 2446.0f); + mCcCyl[1].SetC(center); + mCcCyl[1].SetH(170.0f); + mCcCyl[1].SetR(60.0f); + dComIfG_Ccsp()->Set(&mCcCyl[1]); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2186,6 +2642,7 @@ asm void daNpcAsh_c::setAttnPos() { #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setAttnPos__10daNpcAsh_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8095D900-8095D904 0002C0 0004+00 0/1 0/0 0/0 .rodata @5649 */ @@ -2217,6 +2674,53 @@ COMPILER_STRIP_GATE(0x8095D90C, &lit_5652); #pragma pop /* 8095C9BC-8095CC8C 0047BC 02D0+00 1/1 0/0 0/0 .text lookat__10daNpcAsh_cFv */ +#ifdef NONMATCHING +// literals +void daNpcAsh_c::lookat() { + fopAc_ac_c* actor = NULL; + J3DModel* model = mMcaMorf->getModel(); + BOOL iv7 = false; + f32 fv13 = daNpcAsh_Param_c::m.m24; + f32 fv12 = daNpcAsh_Param_c::m.m20; + f32 fv17 = mMotion == 0 ? -15.0f : daNpcAsh_Param_c::m.m2C; + f32 fv16 = mMotion == 0 ? 15.0f : daNpcAsh_Param_c::m.m28; + f32 fv11 = daNpcAsh_Param_c::m.m34; + f32 fv10 = daNpcAsh_Param_c::m.m30; + f32 fv15 = mMotion == 0 ? 0.0f : daNpcAsh_Param_c::m.m3C; + f32 fv14 = mMotion == 0 ? 0.0f : daNpcAsh_Param_c::m.m38; + s16 idk = field_0x8f0.y - field_0x8f6.y; + cXyz lookatPos[3] = {mLookatPos[0], mLookatPos[1], mLookatPos[2]}; + csXyz* svecarray[3] = {&field_0x91a[0], &field_0x91a[1], &field_0x91a[2]}; + switch (mLookMode) { + case 0: + break; + case 1: + iv7 = true; + break; + case 2: + case 3: + actor = daPy_getPlayerActorClass(); + break; + case 4: + actor = mActorMngr[4].getActorP(); + break; + case 5: + actor = mTalkPartner; + break; + } + if (actor != NULL) { + mLookPos = actor->mAttentionInfo.mPosition; + if (mLookMode != 2 && mLookMode != 3) { + mLookPos.y -= 40.0f; + } + mLookat.setAttnPos(&mLookPos); + } else { + mLookat.setAttnPos(NULL); + } + mLookat.setParam(fv13, fv12, fv17, fv16, 0.0f, 0.0f, 0.0f, 0.0f, fv11, fv10, fv15, fv14, field_0x8f0.y, lookatPos); + mLookat.calc(this, model->getBaseTRMtx(), svecarray, iv7, idk, 0); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2225,9 +2729,10 @@ asm void daNpcAsh_c::lookat() { #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/lookat__10daNpcAsh_cFv.s" } #pragma pop +#endif /* 8095CC8C-8095CC94 004A8C 0008+00 1/0 0/0 0/0 .text drawDbgInfo__10daNpcAsh_cFv */ -bool daNpcAsh_c::drawDbgInfo() { +BOOL daNpcAsh_c::drawDbgInfo() { return false; } @@ -2274,7 +2779,8 @@ REGISTER_CTORS(0x8095CCA0, __sinit_d_a_npc_ash_cpp); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daNpcF_ActorMngr_c::~daNpcF_ActorMngr_c() { +// asm daNpcF_ActorMngr_c::~daNpcF_ActorMngr_c() { +asm void __dt__18daNpcF_ActorMngr_cFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__18daNpcF_ActorMngr_cFv.s" } @@ -2284,7 +2790,8 @@ asm daNpcF_ActorMngr_c::~daNpcF_ActorMngr_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daNpcF_ActorMngr_c::daNpcF_ActorMngr_c() { +// asm daNpcF_ActorMngr_c::daNpcF_ActorMngr_c() { +asm void __ct__18daNpcF_ActorMngr_cFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__ct__18daNpcF_ActorMngr_cFv.s" } @@ -2294,7 +2801,8 @@ asm daNpcF_ActorMngr_c::daNpcF_ActorMngr_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daNpcF_Lookat_c::~daNpcF_Lookat_c() { +// asm daNpcF_Lookat_c::~daNpcF_Lookat_c() { +asm void __dt__15daNpcF_Lookat_cFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__15daNpcF_Lookat_cFv.s" } @@ -2304,14 +2812,16 @@ asm daNpcF_Lookat_c::~daNpcF_Lookat_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm csXyz::~csXyz() { +// asm csXyz::~csXyz() { +asm void __dt__5csXyzFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__5csXyzFv.s" } #pragma pop /* 8095CF1C-8095CF20 004D1C 0004+00 2/2 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { +// csXyz::csXyz() { +void __ct__5csXyzFv() { /* empty function */ } @@ -2319,14 +2829,16 @@ csXyz::csXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__4cXyzFv.s" } #pragma pop /* 8095CF5C-8095CF60 004D5C 0004+00 2/2 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { +// cXyz::cXyz() { +void __ct__4cXyzFv() { /* empty function */ } @@ -2334,7 +2846,8 @@ cXyz::cXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daNpcF_c::~daNpcF_c() { +// asm daNpcF_c::~daNpcF_c() { +asm void __dt__8daNpcF_cFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__8daNpcF_cFv.s" } @@ -2344,7 +2857,8 @@ asm daNpcF_c::~daNpcF_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daNpcF_c::daNpcF_c() { +// asm daNpcF_c::daNpcF_c() { +asm void __ct__8daNpcF_cFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__ct__8daNpcF_cFv.s" } @@ -2354,7 +2868,8 @@ asm daNpcF_c::daNpcF_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { +asm void __dt__12dBgS_AcchCirFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__12dBgS_AcchCirFv.s" } @@ -2364,7 +2879,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__10dCcD_GSttsFv.s" } @@ -2374,7 +2890,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__12dBgS_ObjAcchFv.s" } @@ -2384,24 +2901,28 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__12J3DFrameCtrlFv.s" } #pragma pop /* 8095D520-8095D524 005320 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__8daNpcF_cFv */ -void daNpcF_c::adjustShapeAngle() { +// void daNpcF_c::adjustShapeAngle() { +void adjustShapeAngle__8daNpcF_cFv() { /* empty function */ } /* 8095D524-8095D528 005324 0004+00 1/0 0/0 0/0 .text setCollisions__8daNpcF_cFv */ -void daNpcF_c::setCollisions() { +// void daNpcF_c::setCollisions() { +void setCollisions__8daNpcF_cFv() { /* empty function */ } /* 8095D528-8095D52C 005328 0004+00 1/0 0/0 0/0 .text drawOtherMdls__8daNpcF_cFv */ -void daNpcF_c::drawOtherMdls() { +// void daNpcF_c::drawOtherMdls() { +void drawOtherMdls__8daNpcF_cFv() { /* empty function */ } @@ -2409,7 +2930,8 @@ void daNpcF_c::drawOtherMdls() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/__dt__10cCcD_GSttsFv.s" } @@ -2419,7 +2941,8 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daTag_EvtArea_c::chkPointInArea(cXyz param_0) { +// asm void daTag_EvtArea_c::chkPointInArea(cXyz param_0) { +asm void chkPointInArea__15daTag_EvtArea_cF4cXyz() { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/chkPointInArea__15daTag_EvtArea_cF4cXyz.s" } diff --git a/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp b/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp index d7b8dff5274..39184236181 100644 --- a/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp +++ b/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp @@ -1,292 +1,133 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_digholl -// +/** + * d_a_obj_digholl.cpp + * Object - Dig Hole + */ #include "rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct cXyz {}; - -struct daPy_py_c { - /* 8015F4F0 */ void setLookPos(cXyz*); -}; - -struct daObjDigholl_c { - /* 80BDC618 */ void create(); - /* 80BDC75C */ ~daObjDigholl_c(); - /* 80BDC7D8 */ void execute(); - /* 80BDCB0C */ bool draw(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004D1B8 */ void setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, - _GXColor const&, int, f32); -}; - -// -// Forward References: -// - -extern "C" void create__14daObjDigholl_cFv(); -extern "C" static void daObjDigholl_Create__FP10fopAc_ac_c(); -extern "C" void __dt__14daObjDigholl_cFv(); -extern "C" static void daObjDigholl_Delete__FP14daObjDigholl_c(); -extern "C" void execute__14daObjDigholl_cFv(); -extern "C" static void daObjDigholl_Execute__FP14daObjDigholl_c(); -extern "C" bool draw__14daObjDigholl_cFv(); -extern "C" static void daObjDigholl_Draw__FP14daObjDigholl_c(); -extern "C" extern void* g_profile_Obj_Digholl[12]; - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_SetMin__FP10fopAc_ac_cfff(); -extern "C" void fopAcM_SetMax__FP10fopAc_ac_cfff(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif(); -extern "C" void setLookPos__9daPy_py_cFP4cXyz(); -extern "C" void cLib_distanceAngleS__Fss(); -extern "C" void __dl__FPv(); -extern "C" void PSVECSquareDistance(); -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" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 g_whiteColor; -extern "C" extern u32 __float_nan; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80BDCB3C-80BDCB40 000000 0004+00 2/2 0/0 0/0 .rodata @3678 */ -SECTION_RODATA static f32 const lit_3678 = -60.0f; -COMPILER_STRIP_GATE(0x80BDCB3C, &lit_3678); - -/* 80BDCB40-80BDCB44 000004 0004+00 0/2 0/0 0/0 .rodata @3679 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3679[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80BDCB40, &lit_3679); -#pragma pop - -/* 80BDCB44-80BDCB48 000008 0004+00 0/1 0/0 0/0 .rodata @3680 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3680 = -100.0f; -COMPILER_STRIP_GATE(0x80BDCB44, &lit_3680); -#pragma pop - -/* 80BDCB48-80BDCB4C 00000C 0004+00 0/1 0/0 0/0 .rodata @3681 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3681 = 60.0f; -COMPILER_STRIP_GATE(0x80BDCB48, &lit_3681); -#pragma pop - -/* 80BDCB4C-80BDCB50 000010 0004+00 0/1 0/0 0/0 .rodata @3682 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3682 = 10.0f; -COMPILER_STRIP_GATE(0x80BDCB4C, &lit_3682); -#pragma pop - -/* 80BDCB50-80BDCB54 000014 0004+00 0/1 0/0 0/0 .rodata @3683 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3683 = 100.0f; -COMPILER_STRIP_GATE(0x80BDCB50, &lit_3683); -#pragma pop +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" /* 80BDC618-80BDC73C 000078 0124+00 1/1 0/0 0/0 .text create__14daObjDigholl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigholl_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/create__14daObjDigholl_cFv.s" +int daObjDigholl_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daObjDigholl_c(); + fopAcM_OnCondition(this, 8); + } + field_0x569 = fopAcM_GetParam(this); + field_0x56a = fopAcM_GetParam(this) >> 8; + field_0x56c = fopAcM_GetParam(this) >> 0x10 & 0xff; + if (field_0x56c == 0xff) { + field_0x56c = -1; + } + if (i_fopAcM_isSwitch(this, field_0x569)) { + field_0x568 = 2; + field_0x56b = 1; + } + fopAcM_SetMin(this, -60.0f, 0.0f, -100.0f); + fopAcM_SetMax(this, 60.0f, 10.0f, 100.0f); + mAttentionInfo.mPosition = current.pos; + mEyePos = mAttentionInfo.mPosition; + mAttentionInfo.field_0x4[3] = 0x20; + return cPhs_COMPLEATE_e; } -#pragma pop -/* 80BDC73C-80BDC75C 00019C 0020+00 1/0 0/0 0/0 .text daObjDigholl_Create__FP10fopAc_ac_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDigholl_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Create__FP10fopAc_ac_c.s" +/* 80BDC73C-80BDC75C 00019C 0020+00 1/0 0/0 0/0 .text daObjDigholl_Create__FP10fopAc_ac_c */ +static int daObjDigholl_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 80BDC75C-80BDC7B0 0001BC 0054+00 1/1 0/0 0/0 .text __dt__14daObjDigholl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObjDigholl_c::~daObjDigholl_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/__dt__14daObjDigholl_cFv.s" -} -#pragma pop +daObjDigholl_c::~daObjDigholl_c() {} /* 80BDC7B0-80BDC7D8 000210 0028+00 1/0 0/0 0/0 .text daObjDigholl_Delete__FP14daObjDigholl_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDigholl_Delete(daObjDigholl_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Delete__FP14daObjDigholl_c.s" +static int daObjDigholl_Delete(daObjDigholl_c* i_this) { + i_this->~daObjDigholl_c(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80BDCB54-80BDCB58 000018 0004+00 0/1 0/0 0/0 .rodata @3793 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3793 = 40.0f; -COMPILER_STRIP_GATE(0x80BDCB54, &lit_3793); -#pragma pop - -/* 80BDCB58-80BDCB5C 00001C 0004+00 0/1 0/0 0/0 .rodata @3794 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3794 = 35.0f; -COMPILER_STRIP_GATE(0x80BDCB58, &lit_3794); -#pragma pop - -/* 80BDCB5C-80BDCB60 000020 0004+00 0/1 0/0 0/0 .rodata @3795 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3795 = 250000.0f; -COMPILER_STRIP_GATE(0x80BDCB5C, &lit_3795); -#pragma pop - -/* 80BDCB60-80BDCB64 000024 0004+00 0/1 0/0 0/0 .rodata @3796 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3796 = 200.0f; -COMPILER_STRIP_GATE(0x80BDCB60, &lit_3796); -#pragma pop - -/* 80BDCB64-80BDCB6C 000028 0008+00 0/1 0/0 0/0 .rodata @3797 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3797[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BDCB64, &lit_3797); -#pragma pop - -/* 80BDCB6C-80BDCB74 000030 0008+00 0/1 0/0 0/0 .rodata @3798 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3798[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BDCB6C, &lit_3798); -#pragma pop - -/* 80BDCB74-80BDCB7C 000038 0008+00 0/1 0/0 0/0 .rodata @3799 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3799[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BDCB74, &lit_3799); -#pragma pop - -/* 80BDCB7C-80BDCB80 000040 0004+00 0/1 0/0 0/0 .rodata @3800 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3800 = 1000.0f; -COMPILER_STRIP_GATE(0x80BDCB7C, &lit_3800); -#pragma pop /* 80BDC7D8-80BDCAEC 000238 0314+00 1/1 0/0 0/0 .text execute__14daObjDigholl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigholl_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/execute__14daObjDigholl_cFv.s" +int daObjDigholl_c::execute() { + daPy_py_c* player = daPy_getLinkPlayerActorClass(); + if (player->i_checkNowWolf() && + (field_0x56a == 0xff || i_fopAcM_isSwitch(this, field_0x56a)) && + (f32)fabsf(current.pos.y - player->current.pos.y) < 40.0f) + { + mAttentionInfo.mFlags = 0x80; + } else { + mAttentionInfo.mFlags = 0; + } + if (field_0x568 == 1) { + if (cLib_distanceAngleS(player->shape_angle.y, shape_angle.y) < 0x6000) { + shape_angle.y = player->shape_angle.y + 0x10000 - 0x8000; + current.angle.y = shape_angle.y; + } + i_fopAcM_onSwitch(this, field_0x569); + + if (i_dComIfGp_event_runCheck()) { + if (player->getBaseAnimeFrame() > 35.0f) { + field_0x56b = 1; + } + } else { + field_0x568 = 2; + field_0x56b = 1; + } + } else { + if ((player->current.pos.abs2XZ(current.pos) < 250000.0f) && + (fabsf(current.pos.y - player->current.pos.y) < 200.0f)) + { + daPy_py_c::setLookPos(&mAttentionInfo.mPosition); + } + } + + if (player->current.pos.abs(current.pos) < 1000.0f) { + dComIfGp_particle_setSimple(0x70f, ¤t.pos, 0xff, g_whiteColor, g_whiteColor, NULL, + 0.0f); + dComIfGp_particle_setSimple(0x73d, ¤t.pos, 0xff, g_whiteColor, g_whiteColor, NULL, + 0.0f); + } + + return 1; } -#pragma pop /* 80BDCAEC-80BDCB0C 00054C 0020+00 1/0 0/0 0/0 .text daObjDigholl_Execute__FP14daObjDigholl_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDigholl_Execute(daObjDigholl_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Execute__FP14daObjDigholl_c.s" +static int daObjDigholl_Execute(daObjDigholl_c* i_this) { + return i_this->execute(); } -#pragma pop /* 80BDCB0C-80BDCB14 00056C 0008+00 1/1 0/0 0/0 .text draw__14daObjDigholl_cFv */ -bool daObjDigholl_c::draw() { - return true; +int daObjDigholl_c::draw() { + return 1; } /* 80BDCB14-80BDCB34 000574 0020+00 1/0 0/0 0/0 .text daObjDigholl_Draw__FP14daObjDigholl_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDigholl_Draw(daObjDigholl_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Draw__FP14daObjDigholl_c.s" +static int daObjDigholl_Draw(daObjDigholl_c* i_this) { + return i_this->draw(); } -#pragma pop -/* ############################################################################################## */ /* 80BDCB80-80BDCBA0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjDigholl_Method */ -SECTION_DATA static void* l_daObjDigholl_Method[8] = { - (void*)daObjDigholl_Create__FP10fopAc_ac_c, - (void*)daObjDigholl_Delete__FP14daObjDigholl_c, - (void*)daObjDigholl_Execute__FP14daObjDigholl_c, - (void*)NULL, - (void*)daObjDigholl_Draw__FP14daObjDigholl_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjDigholl_Method = { + (process_method_func)daObjDigholl_Create, (process_method_func)daObjDigholl_Delete, + (process_method_func)daObjDigholl_Execute, (process_method_func)NULL, + (process_method_func)daObjDigholl_Draw, }; /* 80BDCBA0-80BDCBD0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Digholl */ -SECTION_DATA extern void* g_profile_Obj_Digholl[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00520000, (void*)&g_fpcLf_Method, - (void*)0x00000570, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00F90000, (void*)&l_daObjDigholl_Method, - (void*)0x00044100, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_Digholl = { + -3, + 3, + -3, + PROC_Obj_Digholl, + &g_fpcLf_Method.mBase, + sizeof(daObjDigholl_c), + 0, + 0, + &g_fopAc_Method.base, + 0x00F9, + &l_daObjDigholl_Method, + 0x00044100, + 3, + 14, }; diff --git a/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp b/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp index 42dc358db94..408f98d5790 100644 --- a/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp +++ b/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp @@ -1,321 +1,153 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kjgjs -// +/** + * d_a_obj_kjgjs.cpp + * Object - Kjgjs + */ #include "rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h" -#include "dol2asm.h" -#include "dolphin/types.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/bg/d_bg_w.h" +#include "d/d_procname.h" -// -// Types: -// +static const u32 l_dzbidx[2] = {8, 9}; +static const char* l_arcName = "K_jgjs"; -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjKJgjs_c { - /* 80C46098 */ void create1st(); - /* 80C4616C */ void setMtx(); - /* 80C461E4 */ void CreateHeap(); - /* 80C46264 */ void Create(); - /* 80C46310 */ void Execute(f32 (**)[3][4]); - /* 80C46320 */ void Draw(); - /* 80C463C4 */ void Delete(); - /* 80C464CC */ ~daObjKJgjs_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void create1st__12daObjKJgjs_cFv(); -extern "C" void setMtx__12daObjKJgjs_cFv(); -extern "C" void CreateHeap__12daObjKJgjs_cFv(); -extern "C" void Create__12daObjKJgjs_cFv(); -extern "C" void Execute__12daObjKJgjs_cFPPA3_A4_f(); -extern "C" void Draw__12daObjKJgjs_cFv(); -extern "C" void Delete__12daObjKJgjs_cFv(); -extern "C" static void daObjKJgjs_create1st__FP12daObjKJgjs_c(); -extern "C" static void daObjKJgjs_MoveBGDelete__FP12daObjKJgjs_c(); -extern "C" static void daObjKJgjs_MoveBGExecute__FP12daObjKJgjs_c(); -extern "C" static void daObjKJgjs_MoveBGDraw__FP12daObjKJgjs_c(); -extern "C" void __dt__12daObjKJgjs_cFv(); -extern "C" extern char const* const d_a_obj_kjgjs__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_XYZrotM__FPA4_fsss(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80C46544-80C4654C 000000 0008+00 1/1 0/0 0/0 .rodata l_dzbidx */ -SECTION_RODATA static u8 const l_dzbidx[8] = { - 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, -}; -COMPILER_STRIP_GATE(0x80C46544, &l_dzbidx); - -/* 80C46584-80C46584 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C46584 = "K_jgjs"; -#pragma pop - -/* 80C4658C-80C46590 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_kjgjs__stringBase0; +inline request_of_phase_process_class* daObjKJgjs_getRes(daObjKJgjs_c* i_kjgjs) { + daObjKJgjs_c* mpKjgjs = (daObjKJgjs_c*)i_kjgjs; + return i_kjgjs ? &mpKjgjs->mPhaseReq : (request_of_phase_process_class*)mpKjgjs; +} /* 80C46098-80C4616C 000078 00D4+00 1/1 0/0 0/0 .text create1st__12daObjKJgjs_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjKJgjs_c::create1st() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/create1st__12daObjKJgjs_cFv.s" +int daObjKJgjs_c::create1st() { + int phase = dComIfG_resLoad(daObjKJgjs_getRes(this), l_arcName); + if (phase == cPhs_COMPLEATE_e) { + setMtx(); + field_0x60c = getType(); + if (field_0x60c < 0) { + field_0x60c = 0; + } else if (field_0x60c > 2) { + field_0x60c = 1; + } + phase = MoveBGCreate(l_arcName, l_dzbidx[field_0x60c], dBgS_MoveBGProc_TypicalRotY, 0x47f0, + &mMtx[0]); + + if (phase == cPhs_ERROR_e) { + return phase; + } + } + return phase; } -#pragma pop /* 80C4616C-80C461E4 00014C 0078+00 1/1 0/0 0/0 .text setMtx__12daObjKJgjs_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjKJgjs_c::setMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/setMtx__12daObjKJgjs_cFv.s" +void daObjKJgjs_c::setMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::XYZrotM(current.angle.x, current.angle.y, current.angle.z); + PSMTXCopy(mDoMtx_stack_c::now, mMtx[1]); + PSMTXCopy(mDoMtx_stack_c::now, mMtx[0]); } -#pragma pop -/* ############################################################################################## */ /* 80C4654C-80C46554 000008 0008+00 1/1 0/0 0/0 .rodata l_bmdidx */ -SECTION_RODATA static u8 const l_bmdidx[8] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, -}; -COMPILER_STRIP_GATE(0x80C4654C, &l_bmdidx); +static const u32 l_bmdidx[2] = {4, 5}; /* 80C461E4-80C46264 0001C4 0080+00 1/0 0/0 0/0 .text CreateHeap__12daObjKJgjs_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjKJgjs_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/CreateHeap__12daObjKJgjs_cFv.s" +int daObjKJgjs_c::CreateHeap() { + mpModel = mDoExt_J3DModel__create( + (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[field_0x60c]), 0x80000, 0x11000084); + return mpModel != NULL ? 1 : 0; } -#pragma pop -/* ############################################################################################## */ -/* 80C46554-80C46584 000010 0030+00 1/1 0/0 0/0 .rodata l_cull_box */ -SECTION_RODATA static u8 const l_cull_box[48] = { - 0xC4, 0x9D, 0x80, 0x00, 0xC5, 0x3E, 0xA0, 0x00, 0xC4, 0x9D, 0x80, 0x00, 0x44, 0x9D, 0x80, 0x00, - 0x45, 0x2F, 0x00, 0x00, 0x44, 0x9D, 0x80, 0x00, 0xC2, 0x98, 0xBD, 0x71, 0xC1, 0x2D, 0x47, 0xAE, - 0xC2, 0x9D, 0x05, 0x1F, 0x42, 0x97, 0x0A, 0x3D, 0x41, 0x2F, 0x33, 0x33, 0x42, 0x9C, 0x1E, 0xB8, +static const Vec l_cull_box[4] = { + {-1260.0f, -3050.0f, -1260.0f}, + {1260.0f, 2800.0f, 1260.0f}, + {-76.37f, -10.83f, -78.51}, + {75.52f, 10.95f, 78.06f}, }; -COMPILER_STRIP_GATE(0x80C46554, &l_cull_box); /* 80C46264-80C46310 000244 00AC+00 1/0 0/0 0/0 .text Create__12daObjKJgjs_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjKJgjs_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Create__12daObjKJgjs_cFv.s" +int daObjKJgjs_c::Create() { + fopAcM_SetMtx(this, mMtx[1]); + PSMTXCopy(mMtx[1], mpModel->mBaseTransformMtx); + dBgW* mpBgW = field_0x568; + mpBgW->field_0x91 |= 4; + if (!field_0x60c) { + fopAcM_setCullSizeBox(this, l_cull_box[0].x, l_cull_box[0].y, l_cull_box[0].z, + l_cull_box[1].x, l_cull_box[1].y, l_cull_box[1].z); + } else { + fopAcM_setCullSizeBox(this, l_cull_box[2].x, l_cull_box[2].y, l_cull_box[2].z, + l_cull_box[3].x, l_cull_box[3].y, l_cull_box[3].z); + } + return 1; } -#pragma pop -/* 80C46310-80C46320 0002F0 0010+00 1/0 0/0 0/0 .text Execute__12daObjKJgjs_cFPPA3_A4_f - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjKJgjs_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Execute__12daObjKJgjs_cFPPA3_A4_f.s" +/* 80C46310-80C46320 0002F0 0010+00 1/0 0/0 0/0 .text Execute__12daObjKJgjs_cFPPA3_A4_f */ +int daObjKJgjs_c::Execute(f32 (**i_mtx)[3][4]) { + *i_mtx = mMtx; + return 1; } -#pragma pop /* 80C46320-80C463C4 000300 00A4+00 1/0 0/0 0/0 .text Draw__12daObjKJgjs_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjKJgjs_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Draw__12daObjKJgjs_cFv.s" +int daObjKJgjs_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; } -#pragma pop /* 80C463C4-80C46400 0003A4 003C+00 1/0 0/0 0/0 .text Delete__12daObjKJgjs_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjKJgjs_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Delete__12daObjKJgjs_cFv.s" +int daObjKJgjs_c::Delete() { + dComIfG_resDelete(daObjKJgjs_getRes(this), l_arcName); + return 1; } -#pragma pop -/* ############################################################################################## */ +/* 80C46400-80C46460 0003E0 0060+00 1/0 0/0 0/0 .text daObjKJgjs_create1st__FP12daObjKJgjs_c */ +static int daObjKJgjs_create1st(daObjKJgjs_c* i_this) { + if (!fopAcM_CheckCondition(i_this, 8)) { + new (i_this) daObjKJgjs_c(); + fopAcM_OnCondition(i_this, 8); + } + return i_this->create1st(); +} + +/* 80C46460-80C46480 000440 0020+00 1/0 0/0 0/0 .text daObjKJgjs_MoveBGDelete__FP12daObjKJgjs_c */ +static int daObjKJgjs_MoveBGDelete(daObjKJgjs_c* i_this) { + return static_cast(i_this)->MoveBGDelete(); +} + +/* 80C46480-80C464A0 000460 0020+00 1/0 0/0 0/0 .text daObjKJgjs_MoveBGExecute__FP12daObjKJgjs_c*/ +static int daObjKJgjs_MoveBGExecute(daObjKJgjs_c* i_this) { + return static_cast(i_this)->MoveBGExecute(); +} + +/* 80C464A0-80C464CC 000480 002C+00 1/0 0/0 0/0 .text daObjKJgjs_MoveBGDraw__FP12daObjKJgjs_c */ +static int daObjKJgjs_MoveBGDraw(daObjKJgjs_c* i_this) { + return static_cast(i_this)->MoveBGDraw(); +} + +/* 80C464CC-80C4653C 0004AC 0070+00 1/0 0/0 0/0 .text __dt__12daObjKJgjs_cFv */ +daObjKJgjs_c::~daObjKJgjs_c() {} + /* 80C46590-80C465B0 -00001 0020+00 1/0 0/0 0/0 .data daObjKJgjs_METHODS */ -SECTION_DATA static void* daObjKJgjs_METHODS[8] = { - (void*)daObjKJgjs_create1st__FP12daObjKJgjs_c, - (void*)daObjKJgjs_MoveBGDelete__FP12daObjKJgjs_c, - (void*)daObjKJgjs_MoveBGExecute__FP12daObjKJgjs_c, - (void*)NULL, - (void*)daObjKJgjs_MoveBGDraw__FP12daObjKJgjs_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjKJgjs_METHODS = { + (process_method_func)daObjKJgjs_create1st, (process_method_func)daObjKJgjs_MoveBGDelete, + (process_method_func)daObjKJgjs_MoveBGExecute, (process_method_func)NULL, + (process_method_func)daObjKJgjs_MoveBGDraw, }; /* 80C465B0-80C465E0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_KJgjs */ -SECTION_DATA extern void* g_profile_Obj_KJgjs[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00DD0000, (void*)&g_fpcLf_Method, - (void*)0x00000610, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02A50000, (void*)&daObjKJgjs_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_KJgjs = { + -3, + 3, + -3, + PROC_Obj_KJgjs, + &g_fpcLf_Method.mBase, + sizeof(daObjKJgjs_c), + 0, + 0, + &g_fopAc_Method.base, + 0x02A5, + &daObjKJgjs_METHODS, + 0x00040100, + 0, + 14, }; - -/* 80C465E0-80C4660C 000054 002C+00 2/2 0/0 0/0 .data __vt__12daObjKJgjs_c */ -SECTION_DATA extern void* __vt__12daObjKJgjs_c[11] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__12daObjKJgjs_cFv, - (void*)Create__12daObjKJgjs_cFv, - (void*)Execute__12daObjKJgjs_cFPPA3_A4_f, - (void*)Draw__12daObjKJgjs_cFv, - (void*)Delete__12daObjKJgjs_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, - (void*)__dt__12daObjKJgjs_cFv, -}; - -/* 80C46400-80C46460 0003E0 0060+00 1/0 0/0 0/0 .text daObjKJgjs_create1st__FP12daObjKJgjs_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjKJgjs_create1st(daObjKJgjs_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_create1st__FP12daObjKJgjs_c.s" -} -#pragma pop - -/* 80C46460-80C46480 000440 0020+00 1/0 0/0 0/0 .text daObjKJgjs_MoveBGDelete__FP12daObjKJgjs_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjKJgjs_MoveBGDelete(daObjKJgjs_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGDelete__FP12daObjKJgjs_c.s" -} -#pragma pop - -/* 80C46480-80C464A0 000460 0020+00 1/0 0/0 0/0 .text daObjKJgjs_MoveBGExecute__FP12daObjKJgjs_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjKJgjs_MoveBGExecute(daObjKJgjs_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGExecute__FP12daObjKJgjs_c.s" -} -#pragma pop - -/* 80C464A0-80C464CC 000480 002C+00 1/0 0/0 0/0 .text daObjKJgjs_MoveBGDraw__FP12daObjKJgjs_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjKJgjs_MoveBGDraw(daObjKJgjs_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGDraw__FP12daObjKJgjs_c.s" -} -#pragma pop - -/* 80C464CC-80C4653C 0004AC 0070+00 1/0 0/0 0/0 .text __dt__12daObjKJgjs_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObjKJgjs_c::~daObjKJgjs_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/__dt__12daObjKJgjs_cFv.s" -} -#pragma pop - -/* 80C46584-80C46584 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp b/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp index 081ec1037b7..9dbabb02568 100644 --- a/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp +++ b/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp @@ -603,31 +603,29 @@ asm void daTagTWGate_c::initDemoFilone2() { #endif /* 80D52BF0-80D52DB4 000670 01C4+00 1/0 0/0 0/0 .text executeDemoFilone2__13daTagTWGate_cFv */ -// regswap -#ifdef NONMATCHING void daTagTWGate_c::executeDemoFilone2() { - int staffId = i_dComIfGp_evmng_getMyStaffId(l_myName, NULL, 0); + s32 staffId = i_dComIfGp_evmng_getMyStaffId(l_myName, NULL, 0); if (staffId != -1) { int* cutName = (int*)i_dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { switch (*cutName) { - case 0x30303032: + case '0002': initTalk(0xBC1, NULL); break; - case 0x30303031: - case 0x30303033: + case '0001': + case '0003': break; } } switch (*cutName) { - case 0x30303031: - case 0x30303033: + case '0001': + case '0003': dComIfGp_evmng_cutEnd(staffId); break; - case 0x30303032: + case '0002': if (talkProc(NULL, 1, NULL)) { if (mMsgFlow.getChoiceNo() == 0) { mActionID = ACT_DEMO_FILONE_3; @@ -649,16 +647,6 @@ void daTagTWGate_c::executeDemoFilone2() { } } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagTWGate_c::executeDemoFilone2() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate/executeDemoFilone2__13daTagTWGate_cFv.s" -} -#pragma pop -#endif /* 80D52DB4-80D52E7C 000834 00C8+00 1/0 0/0 0/0 .text initDemoFilone3__13daTagTWGate_cFv */ @@ -706,10 +694,10 @@ SECTION_RODATA static f32 const lit_4083 = -1.0f; COMPILER_STRIP_GATE(0x80D5583C, &lit_4083); /* 80D52E7C-80D53250 0008FC 03D4+00 1/0 0/0 0/0 .text executeDemoFilone3__13daTagTWGate_cFv */ -// regswap +// matches without literals #ifdef NONMATCHING void daTagTWGate_c::executeDemoFilone3() { - int staffId = i_dComIfGp_evmng_getMyStaffId(l_myName, NULL, 0); + s32 staffId = i_dComIfGp_evmng_getMyStaffId(l_myName, NULL, 0); if (staffId != -1) { int* cutName = (int*)i_dComIfGp_getEventManager().getMyNowCutName(staffId); diff --git a/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp b/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp index 0e4a5d41416..d302e6a830d 100644 --- a/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp +++ b/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp @@ -4,161 +4,107 @@ // #include "rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_npc.h" +#include "d/d_procname.h" #include "dol2asm.h" -#include "dolphin/types.h" -// -// Types: -// +s32 daTag_EvtArea_c::getType() { + u8 type = (u8)shape_angle.z; + return type == 0xff ? 0 : type; +} -struct mDoMtx_stack_c { - static u8 now[48]; -}; +u32 daTag_EvtArea_c::getOnEvtBit() { + u32 ret = fopAcM_GetParam(this) & 0xfff; + return ret == 0xfff ? -1 : ret; +} -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; +u32 daTag_EvtArea_c::getOffEvtBit() { + u32 ret = (fopAcM_GetParam(this) & 0xfff000) >> 12; + return ret == 0xfff ? -1 : ret; +} -struct Vec {}; +u8 daTag_EvtArea_c::getBitSW() { + return orig.angle.x & 0xff; +} -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct daTag_EvtArea_c { - /* 8048C4F8 */ void create(); - /* 8048C728 */ bool Delete(); - /* 8048C730 */ void Execute(); - /* 8048C894 */ bool Draw(); - /* 8048C89C */ void isDelete(); - /* 8048CD08 */ void chkPointInArea(cXyz); - /* 8048C94C */ void chkPointInArea(cXyz, cXyz); - /* 8048CD68 */ ~daTag_EvtArea_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -// -// Forward References: -// - -extern "C" void create__15daTag_EvtArea_cFv(); -extern "C" bool Delete__15daTag_EvtArea_cFv(); -extern "C" void Execute__15daTag_EvtArea_cFv(); -extern "C" bool Draw__15daTag_EvtArea_cFv(); -extern "C" void isDelete__15daTag_EvtArea_cFv(); -extern "C" void chkPointInArea__15daTag_EvtArea_cF4cXyz4cXyz(); -extern "C" static void daTag_EvtArea_Create__FPv(); -extern "C" static void daTag_EvtArea_Delete__FPv(); -extern "C" static void daTag_EvtArea_Execute__FPv(); -extern "C" static void daTag_EvtArea_Draw__FPv(); -extern "C" static bool daTag_EvtArea_IsDelete__FPv(); -extern "C" void chkPointInArea__15daTag_EvtArea_cF4cXyz(); -extern "C" void __dt__15daTag_EvtArea_cFv(); - -// -// External References: -// - -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void daNpcT_chkPointInArea__F4cXyz4cXyz4cXyzsi(); -extern "C" void daNpcT_chkEvtBit__FUl(); -extern "C" void __pl__4cXyzCFRC3Vec(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECSubtract(); -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 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8048CDD0-8048CDD4 000000 0004+00 2/2 0/0 0/0 .rodata @3853 */ -SECTION_RODATA static f32 const lit_3853 = 100.0f; -COMPILER_STRIP_GATE(0x8048CDD0, &lit_3853); - -/* 8048CDE8-8048CE48 -00001 0060+00 1/1 0/0 0/0 .data @3857 */ -SECTION_DATA static void* lit_3857[24] = { - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0xB4), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0xE0), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x10C), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x154), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x154), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x154), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x154), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x154), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x180), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x1A0), - (void*)(((char*)create__15daTag_EvtArea_cFv) + 0x1A0), -}; - -/* 8048CE48-8048CE68 -00001 0020+00 1/0 0/0 0/0 .data daTag_EvtArea_MethodTable */ -SECTION_DATA static void* daTag_EvtArea_MethodTable[8] = { - (void*)daTag_EvtArea_Create__FPv, - (void*)daTag_EvtArea_Delete__FPv, - (void*)daTag_EvtArea_Execute__FPv, - (void*)daTag_EvtArea_IsDelete__FPv, - (void*)daTag_EvtArea_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 8048CE68-8048CE98 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_EVTAREA */ -SECTION_DATA extern void* g_profile_TAG_EVTAREA[12] = { - (void*)0xFFFFFFFD, (void*)0x0008FFFD, - (void*)0x02E90000, (void*)&g_fpcLf_Method, - (void*)0x00000570, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x011F0000, (void*)&daTag_EvtArea_MethodTable, - (void*)0x00044000, (void*)0x000E0000, -}; - -/* 8048CE98-8048CEA4 0000B0 000C+00 2/2 0/0 0/0 .data __vt__15daTag_EvtArea_c */ -SECTION_DATA extern void* __vt__15daTag_EvtArea_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15daTag_EvtArea_cFv, -}; +u8 daTag_EvtArea_c::getBitSW2() { + return (orig.angle.x & 0xff00) >> 8; +} /* 8048C4F8-8048C728 000078 0230+00 2/1 0/0 0/0 .text create__15daTag_EvtArea_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_EvtArea_c::create() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/create__15daTag_EvtArea_cFv.s" +cPhs__Step daTag_EvtArea_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daTag_EvtArea_c(); + fopAcM_OnCondition(this, 8); + } + + switch (getType()) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + case 10: + case 11: + case 12: + mScale.x *= 100.0f; + mScale.y *= 100.0f; + mScale.z *= 100.0f; + break; + case 13: + mScale.x *= 200.0f; + mScale.y *= 200.0f; + mScale.z *= 200.0f; + break; + case 14: + mScale.x *= 100.0f; + mScale.y *= 100.0f; + mScale.z *= 100.0f; + break; + case 15: + mScale.x *= 0.5f; + mScale.z *= 0.5f; + mScale.x *= 1000.0f; + mScale.y *= 1000.0f; + mScale.z *= 1000.0f; + break; + case 16: + case 17: + case 18: + case 19: + case 20: + mScale.x *= 100.0f; + mScale.y *= 100.0f; + mScale.z *= 100.0f; + break; + case 21: + mScale.x *= 1000.0f; + mScale.z *= 1000.0f; + break; + case 22: + case 23: + mScale.x *= 100.0f; + mScale.y *= 100.0f; + mScale.z *= 100.0f; + break; + default: + mScale.x *= 100.0f; + mScale.y *= 100.0f; + mScale.z *= 100.0f; + } + if (isDelete()) { + return cPhs_ERROR_e; + } else { + field_0x56c = 0; + return cPhs_COMPLEATE_e; + } } -#pragma pop /* 8048C728-8048C730 0002A8 0008+00 1/1 0/0 0/0 .text Delete__15daTag_EvtArea_cFv */ bool daTag_EvtArea_c::Delete() { @@ -166,14 +112,31 @@ bool daTag_EvtArea_c::Delete() { } /* 8048C730-8048C894 0002B0 0164+00 1/1 0/0 0/0 .text Execute__15daTag_EvtArea_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_EvtArea_c::Execute() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/Execute__15daTag_EvtArea_cFv.s" +bool daTag_EvtArea_c::Execute() { + if (orig.roomNo == dComIfGp_roomControl_getStayNo()) { + if (isDelete()) { + fopAcM_delete(this); + return true; + } else { + mAttentionInfo.mPosition = current.pos; + if (getType() == 8) { + mAttentionInfo.mPosition.y += 100.0f; + } + mGroup = 0; + mEyePos = mAttentionInfo.mPosition; + if (getType() == 15) { + if (chkPointInArea(daPy_getPlayerActorClass()->current.pos)) { + mEyePos = daPy_getPlayerActorClass()->mEyePos; + mGroup = 4; + } + } + mAttentionInfo.mFlags = 0; + return true; + } + } else { + return false; + } } -#pragma pop /* 8048C894-8048C89C 000414 0008+00 1/1 0/0 0/0 .text Draw__15daTag_EvtArea_cFv */ bool daTag_EvtArea_c::Draw() { @@ -181,44 +144,24 @@ bool daTag_EvtArea_c::Draw() { } /* 8048C89C-8048C94C 00041C 00B0+00 2/2 0/0 0/0 .text isDelete__15daTag_EvtArea_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_EvtArea_c::isDelete() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/isDelete__15daTag_EvtArea_cFv.s" +BOOL daTag_EvtArea_c::isDelete() { + bool ret; + if (getOffEvtBit() != -1) { + if (daNpcT_chkEvtBit(getOffEvtBit())) { + return true; + } + } + ret = false; + if (getBitSW2() != 0xff) { + if (dComIfGs_isSwitch(getBitSW2(), fopAcM_GetRoomNo(this))) { + ret = true; + } + } + return ret; } -#pragma pop - -/* ############################################################################################## */ -/* 8048CDD4-8048CDD8 000004 0004+00 0/0 0/0 0/0 .rodata @3854 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3854 = 200.0f; -COMPILER_STRIP_GATE(0x8048CDD4, &lit_3854); -#pragma pop - -/* 8048CDD8-8048CDDC 000008 0004+00 0/0 0/0 0/0 .rodata @3855 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3855 = 0.5f; -COMPILER_STRIP_GATE(0x8048CDD8, &lit_3855); -#pragma pop - -/* 8048CDDC-8048CDE0 00000C 0004+00 0/0 0/0 0/0 .rodata @3856 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3856 = 1000.0f; -COMPILER_STRIP_GATE(0x8048CDDC, &lit_3856); -#pragma pop /* 8048CDE0-8048CDE4 000010 0004+00 1/1 0/0 0/0 .rodata @3922 */ -SECTION_RODATA static u8 const lit_3922[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; +SECTION_RODATA static f32 const lit_3922 = 0.0f; COMPILER_STRIP_GATE(0x8048CDE0, &lit_3922); /* 8048CDE4-8048CDE8 000014 0004+00 1/1 0/0 0/0 .rodata @4146 */ @@ -227,76 +170,104 @@ COMPILER_STRIP_GATE(0x8048CDE4, &lit_4146); /* 8048C94C-8048CC80 0004CC 0334+00 1/1 0/0 16/16 .text * chkPointInArea__15daTag_EvtArea_cF4cXyz4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_EvtArea_c::chkPointInArea(cXyz param_0, cXyz param_1) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/chkPointInArea__15daTag_EvtArea_cF4cXyz4cXyz.s" +BOOL daTag_EvtArea_c::chkPointInArea(cXyz param_0, cXyz param_1) { + cXyz local_24, local_30, local_3c, local_48, local_84, local_cc, local_6c, local_90; + if (field_0x56c == 0) { + if ((getOnEvtBit() != -1 && daNpcT_chkEvtBit(getOnEvtBit())) + || (getBitSW() != 0xff && dComIfGs_isSwitch(getBitSW(), fopAcM_GetRoomNo(this))) + || (getOnEvtBit() == -1 && getBitSW() == 0xff)) { + local_84 = mScale + param_1; + if (getType() == 15 || getType() == 16) { + local_6c = daPy_getPlayerActorClass()->current.pos; + local_6c -= orig.pos; + mDoMtx_YrotS(mDoMtx_stack_c::now, -current.angle.y); + mDoMtx_stack_c::multVec(&local_6c, &local_6c); + local_48.x = -local_84.x; + local_48.z = -local_84.z; + local_3c.x = local_84.x; + local_3c.z = -local_84.z; + local_30.x = local_84.x; + local_30.z = local_84.z; + local_24.x = -local_84.x; + local_24.z = local_84.z; + if (local_48.x < local_6c.x && local_48.z < local_6c.z && local_84.x > local_6c.x && local_84.z > local_6c.z) { + local_90 = param_0 - current.pos; + if (0 <= (s32)local_90.y && (s32)local_90.y < (s32)local_84.y) { + return true; + } + } + } else { + local_cc = current.pos; + local_cc.y -= FLOAT_LABEL(lit_4146); + if (getType() == 21) { + return daNpcT_chkPointInArea(param_0, local_cc, local_84, shape_angle.y, 0); + } + return daNpcT_chkPointInArea(param_0, local_cc, local_84, shape_angle.y, 1); + } + } + } + return false; } -#pragma pop /* 8048CC80-8048CCA0 000800 0020+00 1/0 0/0 0/0 .text daTag_EvtArea_Create__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_EvtArea_Create(void* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Create__FPv.s" +static cPhs__Step daTag_EvtArea_Create(void* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 8048CCA0-8048CCC0 000820 0020+00 1/0 0/0 0/0 .text daTag_EvtArea_Delete__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_EvtArea_Delete(void* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Delete__FPv.s" +static bool daTag_EvtArea_Delete(void* i_this) { + return static_cast(i_this)->Delete(); } -#pragma pop /* 8048CCC0-8048CCE0 000840 0020+00 1/0 0/0 0/0 .text daTag_EvtArea_Execute__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_EvtArea_Execute(void* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Execute__FPv.s" +static bool daTag_EvtArea_Execute(void* i_this) { + return static_cast(i_this)->Execute(); } -#pragma pop /* 8048CCE0-8048CD00 000860 0020+00 1/0 0/0 0/0 .text daTag_EvtArea_Draw__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_EvtArea_Draw(void* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Draw__FPv.s" +static bool daTag_EvtArea_Draw(void* i_this) { + return static_cast(i_this)->Draw(); } -#pragma pop /* 8048CD00-8048CD08 000880 0008+00 1/0 0/0 0/0 .text daTag_EvtArea_IsDelete__FPv */ -static bool daTag_EvtArea_IsDelete(void* param_0) { +static bool daTag_EvtArea_IsDelete(void* i_this) { return true; } /* 8048CD08-8048CD68 000888 0060+00 1/1 0/0 0/0 .text chkPointInArea__15daTag_EvtArea_cF4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_EvtArea_c::chkPointInArea(cXyz param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/chkPointInArea__15daTag_EvtArea_cF4cXyz.s" +BOOL daTag_EvtArea_c::chkPointInArea(cXyz param_0) { + cXyz local_28; + local_28.set(FLOAT_LABEL(lit_3922), FLOAT_LABEL(lit_3922), FLOAT_LABEL(lit_3922)); + return chkPointInArea(param_0, local_28); } -#pragma pop /* 8048CD68-8048CDC8 0008E8 0060+00 1/0 0/0 0/0 .text __dt__15daTag_EvtArea_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daTag_EvtArea_c::~daTag_EvtArea_c() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/__dt__15daTag_EvtArea_cFv.s" +daTag_EvtArea_c::~daTag_EvtArea_c() { } -#pragma pop + +/* 8048CE48-8048CE68 -00001 0020+00 1/0 0/0 0/0 .data daTag_EvtArea_MethodTable */ +static actor_method_class daTag_EvtArea_MethodTable = { + (process_method_func)daTag_EvtArea_Create, + (process_method_func)daTag_EvtArea_Delete, + (process_method_func)daTag_EvtArea_Execute, + (process_method_func)daTag_EvtArea_IsDelete, + (process_method_func)daTag_EvtArea_Draw, +}; + +/* 8048CE68-8048CE98 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_EVTAREA */ +extern actor_process_profile_definition g_profile_TAG_EVTAREA = { + -3, + 8, + -3, + PROC_TAG_EVTAREA, + &g_fpcLf_Method.mBase, + sizeof(daTag_EvtArea_c), + 0, + 0, + &g_fopAc_Method.base, + 0x011F, + &daTag_EvtArea_MethodTable, + 0x00044000, + 0, + 14, +}; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp b/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp index e2c6f35225a..4c29ffb81da 100644 --- a/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp +++ b/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp @@ -6,67 +6,16 @@ #include "rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "d/d_path.h" +#include "d/a/d_a_alink.h" +#include "d/d_procname.h" +#include "JSystem/JKernel/JKRHeap.h" // // Types: // -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daTagWljump_c { - /* 80D64EB8 */ void create(); - /* 80D65004 */ ~daTagWljump_c(); - /* 80D65090 */ void execute(); - /* 80D6589C */ bool draw(); -}; - -struct daPy_py_c { - static u8 m_midnaActor[4]; -}; - -struct dSv_player_status_b_c { - /* 80032BEC */ void isTransformLV(int) const; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -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 dAttHint_c { - /* 800738FC */ void request(fopAc_ac_c*, int); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - // // Forward References: // @@ -79,7 +28,6 @@ extern "C" void execute__13daTagWljump_cFv(); extern "C" static void daTagWljump_Execute__FP13daTagWljump_c(); extern "C" bool draw__13daTagWljump_cFv(); extern "C" static void daTagWljump_Draw__FP13daTagWljump_c(); -extern "C" extern void* g_profile_Tag_Wljump[12]; // // External References: @@ -100,13 +48,8 @@ extern "C" void init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c(); extern "C" void doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSVECSquareDistance(); extern "C" void _savegpr_26(); extern "C" void _restgpr_26(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -115,47 +58,215 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* 80D64EB8-80D64FE4 000078 012C+00 1/1 0/0 0/0 .text create__13daTagWljump_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagWljump_c::create() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/create__13daTagWljump_cFv.s" +int daTagWljump_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daTagWljump_c(); + fopAcM_OnCondition(this, 8); + } + u32 param = (fopAcM_GetParam(this) >> 8) & 0xff; + field_0x571 = (u8)param; + s32 uVar2 = fopAcM_GetParam(this); + if ((uVar2 & 0xff) == 0xff) { + return 5; + } + + field_0x5c4 = dPath_GetRoomPath(uVar2 & 0xff, fopAcM_GetRoomNo(this)); + if (field_0x5c4 == NULL || field_0x5c4->m_num < 2) { + return 5; + } + + mAttentionInfo.field_0x0[0] = 0x32; + mAttentionInfo.field_0x4[3] = 0x32; + shape_angle.z = 0; + field_0x568 = -1; + field_0x56c[0] = (fopAcM_GetParam(this) >> 16) & 0xf; + if (field_0x56c[0] != 1) { + field_0x56c[0] = 0; + } + if (field_0x56c[0] == 0 && field_0x571 != 0xff) { + if (dComIfGs_isSwitch(field_0x571, fopAcM_GetHomeRoomNo(this)) == 0) { + field_0x573 = 1; + } + } + return 4; } -#pragma pop /* 80D64FE4-80D65004 0001A4 0020+00 1/0 0/0 0/0 .text daTagWljump_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagWljump_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/daTagWljump_Create__FP10fopAc_ac_c.s" +static int daTagWljump_Create(fopAc_ac_c* param_0) { + return ((daTagWljump_c*)param_0)->create(); } -#pragma pop /* 80D65004-80D65068 0001C4 0064+00 1/1 0/0 0/0 .text __dt__13daTagWljump_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daTagWljump_c::~daTagWljump_c() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/__dt__13daTagWljump_cFv.s" +daTagWljump_c::~daTagWljump_c() { } -#pragma pop /* 80D65068-80D65090 000228 0028+00 1/0 0/0 0/0 .text daTagWljump_Delete__FP13daTagWljump_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagWljump_Delete(daTagWljump_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/daTagWljump_Delete__FP13daTagWljump_c.s" +static int daTagWljump_Delete(daTagWljump_c* param_0) { + param_0->~daTagWljump_c(); + return 1; } -#pragma pop /* ############################################################################################## */ + +/* 80D65090-80D6587C 000250 07EC+00 1/1 0/0 0/0 .text execute__13daTagWljump_cFv */ +// reg swap +#ifdef NONMATCHING +int daTagWljump_c::execute() { + mAttentionInfo.mFlags = 0; + if (field_0x56c[1]) { + field_0x56c[1]--; + } + + daPy_py_c* linkPlayer = daPy_getLinkPlayerActorClass(); + daMidna_c* midnaActor = daPy_py_c::getMidnaActor(); + + if (midnaActor == NULL) { + return 1; + } + + if (mEvtInfo.checkCommandTalk()) { + s32 bVar2 = 1; + if (!midnaActor->checkShadowModeTalkWait()) { + if (shape_angle.x != 0 && + (field_0x571 == 0xff || + !i_fopAcM_isSwitch(this, field_0x571))) + { + if (field_0x56c[3] == 0) { + mMsgFlow.init(this, shape_angle.x & 0xffff, 0, NULL); + field_0x56c[3] = 1; + mDoAud_seStart(0x10, 0, 0, 0); + } else { + ; + if (mMsgFlow.doFlow(this, NULL, 0)) { + mDoAud_seStart(0x11, 0, 0, 0); + shape_angle.x = 0; + } + } + } else { + field_0x568 = field_0x570; + if (midnaActor->current.pos.abs(mEyePos) < 5.0f) { + bVar2 = 0; + } + } + } + if (bVar2) { + return 1; + } + field_0x56c[3] = 0; + i_dComIfGp_event_reset(); + field_0x56c[0] = 0; + field_0x572 = 1; + if (field_0x571 != 0xff) { + i_fopAcM_onSwitch(this, field_0x571); + } + } else if (!i_dComIfGp_getEvent().i_isOrderOK()) { + field_0x572 = 0; + } else { + if (!midnaActor->checkWolfNoPos()) { + field_0x574++; + if (field_0x574 >= 5) { + field_0x572 = 0; + } + } else { + field_0x574 = 0; + } + } + + if (!linkPlayer->i_checkNowWolf() || + !daPy_py_c::i_checkFirstMidnaDemo() || + midnaActor->i_checkMidnaTired()) { + return 1; + } + if (field_0x571 != 0xff && i_fopAcM_isSwitch(this, field_0x571)) { + field_0x56c[0] = 0; + if (field_0x573) { + field_0x573 = 0; + field_0x572 = 1; + field_0x574 = 0; + } + } + if (field_0x56c[0] != 0 || field_0x572 != 0 || field_0x571 == 0xff || + i_fopAcM_isSwitch(this, field_0x571)) + { + s32 uVar6; + dStage_dPnt_c* pbVar7 = field_0x5c4->m_points; + if (linkPlayer->checkWolfTagLockJumpLand() == 0) { + if (linkPlayer->checkWolfTagLockJump() == 0) { + for (uVar6 = 0; uVar6 < field_0x5c4->m_num; uVar6++, pbVar7++) { + if (linkPlayer->current.pos.abs2(pbVar7->m_position) < pbVar7->field_0x0 * pbVar7->field_0x0 * 10.0f * 10.0f) { + field_0x56a = uVar6; + if (uVar6 == 0) { + field_0x568 = 1; + } else if (uVar6 == field_0x5c4->m_num - 1) { + field_0x568 = uVar6 - 1; + } else { + field_0x568 = uVar6 + 1; + } + break; + } + } + if (uVar6 == field_0x5c4->m_num) { + field_0x568 = -1; + } + } else if (field_0x56b) { + field_0x56b = 0; + if (field_0x56a < field_0x568) { + field_0x568++; + if (field_0x5c4->m_num == field_0x568) { + field_0x568 = 0xff; + } + } else { + field_0x568--; + } + } + } + if (field_0x568 >= 0) { + dStage_dPnt_c* pPoint = &field_0x5c4->m_points[field_0x568]; + mEyePos.set(pPoint->m_position.x, pPoint->m_position.y, pPoint->m_position.z); + mAttentionInfo.mPosition = mEyePos; + mAttentionInfo.mPosition.y += 220.0f; + field_0x5c8 = pPoint->field_0x3 * 10.0f; + if (pPoint->field_0x1 == 1) { + shape_angle.z = 1; + } else { + shape_angle.z = 0; + } + if (field_0x572 == 0) { + if (!g_dComIfG_gameInfo.play.getEvent().runCheck()) { + mEvtInfo.i_onCondition(1); + if (!linkPlayer->checkPlayerFly() && + linkPlayer->mEvtInfo.chkCondition(1)) { + dComIfGp_att_ZHintRequest(this, 0x1ff); + if (field_0x56c[2] == 0) { + field_0x56c[2] = 1; + if (field_0x56c[1] == 0) { + mDoAud_seStart(0xe, 0, 0, 0); + } + field_0x56c[1] = 0x3c; + } + } + } + field_0x570 = field_0x568; + field_0x568 = -1; + } else { + mAttentionInfo.mFlags |= 0x81; + } + } else { + field_0x572 = 0; + } + } else { + field_0x572 = 0; + field_0x568 = -1; + } + current.pos = mAttentionInfo.mPosition; + if (!mEvtInfo.chkCondition(1)) { + field_0x56c[2] = 0; + } + + return 1; +} +#else /* 80D658CC-80D658D0 000000 0004+00 1/1 0/0 0/0 .rodata @4044 */ SECTION_RODATA static f32 const lit_4044 = 1.0f; COMPILER_STRIP_GATE(0x80D658CC, &lit_4044); @@ -254,61 +365,56 @@ SECTION_RODATA static u8 const lit_4055[8] = { COMPILER_STRIP_GATE(0x80D6590C, &lit_4055); #pragma pop -/* 80D65090-80D6587C 000250 07EC+00 1/1 0/0 0/0 .text execute__13daTagWljump_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daTagWljump_c::execute() { +asm int daTagWljump_c::execute() { nofralloc #include "asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/execute__13daTagWljump_cFv.s" } #pragma pop +#endif /* 80D6587C-80D6589C 000A3C 0020+00 1/0 0/0 0/0 .text daTagWljump_Execute__FP13daTagWljump_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagWljump_Execute(daTagWljump_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/daTagWljump_Execute__FP13daTagWljump_c.s" +static int daTagWljump_Execute(daTagWljump_c* param_0) { + return param_0->execute(); } -#pragma pop /* 80D6589C-80D658A4 000A5C 0008+00 1/1 0/0 0/0 .text draw__13daTagWljump_cFv */ -bool daTagWljump_c::draw() { - return true; +int daTagWljump_c::draw() { + return 1; } /* 80D658A4-80D658C4 000A64 0020+00 1/0 0/0 0/0 .text daTagWljump_Draw__FP13daTagWljump_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagWljump_Draw(daTagWljump_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump/daTagWljump_Draw__FP13daTagWljump_c.s" +static int daTagWljump_Draw(daTagWljump_c* param_0) { + return param_0->draw(); } -#pragma pop /* ############################################################################################## */ /* 80D65914-80D65934 -00001 0020+00 1/0 0/0 0/0 .data l_daTagWljump_Method */ -SECTION_DATA static void* l_daTagWljump_Method[8] = { - (void*)daTagWljump_Create__FP10fopAc_ac_c, - (void*)daTagWljump_Delete__FP13daTagWljump_c, - (void*)daTagWljump_Execute__FP13daTagWljump_c, - (void*)NULL, - (void*)daTagWljump_Draw__FP13daTagWljump_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daTagWljump_Method = { + (process_method_func)daTagWljump_Create, + (process_method_func)daTagWljump_Delete, + (process_method_func)daTagWljump_Execute, + NULL, + (process_method_func)daTagWljump_Draw, }; /* 80D65934-80D65964 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Wljump */ -SECTION_DATA extern void* g_profile_Tag_Wljump[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02C70000, (void*)&g_fpcLf_Method, - (void*)0x000005CC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01040000, (void*)&l_daTagWljump_Method, - (void*)0x00044000, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Tag_Wljump = { + -3, + 7, + -3, + PROC_Tag_Wljump, + &g_fpcLf_Method.mBase, + sizeof(daTagWljump_c), + 0, + 0, + &g_fopAc_Method.base, + 0x0104, + &l_daTagWljump_Method, + 0x00044000, + 3, + 0x0E, }; diff --git a/src/d/a/d_a_alink_demo.inc b/src/d/a/d_a_alink_demo.inc index 6be8821b59f..2379f9b8693 100644 --- a/src/d/a/d_a_alink_demo.inc +++ b/src/d/a/d_a_alink_demo.inc @@ -128,11 +128,11 @@ asm void daAlink_c::endDemoMode() { #ifdef NONMATCHING fopAc_ac_c* daAlink_c::getDemoLookActor() { if (mDemo.getParam0() == 1) { - return (fopAc_ac_c*)dComIfGp_event_getPt1(); + return dComIfGp_event_getPt1(); } else if (mDemo.getParam0() == 2) { - return (fopAc_ac_c*)dComIfGp_event_getPt2(); + return dComIfGp_event_getPt2(); } else if (mDemo.getParam0() == 3) { - return (fopAc_ac_c*)fopAcM_getTalkEventPartner(this); + return fopAcM_getTalkEventPartner(this); } else if (mDemo.getParam0() == 4) { return getMidnaActor(); } diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp index 768d73c0137..64c3627cb17 100644 --- a/src/d/a/d_a_npc.cpp +++ b/src/d/a/d_a_npc.cpp @@ -13,7 +13,9 @@ #include "global.h" #include "m_Do/m_Do_mtx.h" #include "rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.h" +#include "d/msg/d_msg_object.h" #include "m_Do/m_Do_lib.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" // // Forward References: @@ -167,7 +169,7 @@ extern "C" void __dt__18daNpcT_ActorMngr_cFv(); extern "C" void __dt__15daNpcT_JntAnm_cFv(); extern "C" void __dt__15daNpcT_MatAnm_cFv(); extern "C" void func_8014D32C(void* _this, s16*); -extern "C" void func_8014D348(void* _this, int*); +extern "C" void func_8014D348(void* _this); extern "C" void func_8014D364(void* _this, int, int); extern "C" void __sinit_d_a_npc_cpp(); extern "C" static void daBaseNpc_addIdx__FiiPUsi(); @@ -384,6 +386,9 @@ extern "C" u8 m_set_func__23daBaseNpc_moveBgActor_c[4]; extern "C" u8 mFindCount__8daNpcF_c[4]; extern "C" u8 mSrchActorName__8daNpcF_c[2 + 2 /* padding */]; extern "C" extern u8 data_80450FF8[8]; +static asm s32 daBaseNpc_chkPnt(cXyz param_0, dPnt* param_1, u16 param_2, u16 param_3, int param_4, + int param_5); +static u16 daNpcF_putNurbs(dPnt* param_0, int param_1, int param_2, dPnt* param_3, int param_4); // // External References: @@ -664,7 +669,7 @@ SECTION_SDATA2 static f64 lit_4142 = 4503601774854144.0 /* cast s32 to float */; /* 80145788-80145898 1400C8 0110+00 1/0 0/0 0/0 .text calc__15daNpcT_MatAnm_cCFP11J3DMaterial */ #ifdef NONMATCHING -// 1 instruction in wrong place + float literals +// float literals void daNpcT_MatAnm_c::calc(J3DMaterial* param_0) const { J3DMaterialAnm::calc(param_0); @@ -679,10 +684,9 @@ void daNpcT_MatAnm_c::calc(J3DMaterial* param_0) const { if (field_0x105 != 0) { f32 tmp8 = 1.0f / (field_0x105 + 1); - f32 tmp9 = (1.0f - tmp8); - curr_mtx_info->mSRT.mTranslationX = field_0xF4 * tmp9 + curr_mtx_info->mSRT.mTranslationX * tmp8; - curr_mtx_info->mSRT.mTranslationY = field_0xF8 * tmp9 + curr_mtx_info->mSRT.mTranslationY * tmp8; + curr_mtx_info->mSRT.mTranslationX = field_0xF4 * (1.0f - tmp8) + curr_mtx_info->mSRT.mTranslationX * tmp8; + curr_mtx_info->mSRT.mTranslationY = field_0xF8 * (1.0f - tmp8) + curr_mtx_info->mSRT.mTranslationY * tmp8; } @@ -864,8 +868,6 @@ void daNpcT_Path_c::initialize() { } /* 80145C74-80145D2C 1405B4 00B8+00 0/0 0/0 18/18 .text setPathInfo__13daNpcT_Path_cFUcScUc */ -#ifdef NONMATCHING -// something wrong with the getPntPos inline int daNpcT_Path_c::setPathInfo(u8 i_pathIdx, s8 i_roomNo, u8 i_direction) { mpRoomPath = 0; mIdx = 0; @@ -877,22 +879,12 @@ int daNpcT_Path_c::setPathInfo(u8 i_pathIdx, s8 i_roomNo, u8 i_direction) { return 0; } - mIsClosed = mpRoomPath->m_closed & 1; - int tmpidx = getIdx(); - mPosition = *getPntPos(tmpidx); + mIsClosed = dPath_ChkClose(mpRoomPath); + u16 idx; + mPosition = getPntPos(idx = getIdx()); } return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daNpcT_Path_c::setPathInfo(u8 param_0, s8 param_1, u8 param_2) { - nofralloc -#include "asm/d/a/d_a_npc/setPathInfo__13daNpcT_Path_cFUcScUc.s" -} -#pragma pop -#endif /* 80145D2C-80145DA0 14066C 0074+00 0/0 0/0 1/1 .text setNextPathInfo__13daNpcT_Path_cFScUc */ int daNpcT_Path_c::setNextPathInfo(s8 param_0, u8 i_direction) { @@ -935,87 +927,63 @@ int daNpcT_Path_c::setNextIdx(int param_0) { } /* 80145E38-80145FB4 140778 017C+00 0/0 0/0 1/1 .text getDstPos__13daNpcT_Path_cF4cXyzP4cXyzi */ -#ifdef NONMATCHING int daNpcT_Path_c::getDstPos(cXyz param_0, cXyz* param_1, int i_idx) { - cXyz* curr_room_pos = &mpRoomPath->m_points[mIdx].m_position; - if (i_idx == mIdx) { - mIdx--; + *param_1 = getPntPos(getIdx() - 1); + return 1; + } - param_1 = curr_room_pos; - - } else { - do { - int ret = chkPassed1(param_0,i_idx); - - if (ret == 0) { - param_1 = curr_room_pos; - break; - } - - field_0x1E = 1; - - } while (setNextIdx(i_idx) == 0); - - mIdx = i_idx; - mIdx--; - - param_1 = curr_room_pos; + while(true) { + if (!chkPassed1(param_0,i_idx)) { + break; + } + field_0x1E = 1; + if (setNextIdx(i_idx)) { + mIdx = i_idx; + *param_1 = getPntPos(getIdx() - 1); + return 1; + } } - return 1; + int i_idx2; + *param_1 = getPntPos(i_idx2 = getIdx()); + + return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daNpcT_Path_c::getDstPos(cXyz param_0, cXyz* param_1, int param_2) { - nofralloc -#include "asm/d/a/d_a_npc/getDstPos__13daNpcT_Path_cF4cXyzP4cXyzi.s" -} -#pragma pop -#endif /* 80145FB4-80146188 1408F4 01D4+00 0/0 0/0 10/10 .text getDstPosH__13daNpcT_Path_cF4cXyzP4cXyzii */ -#ifdef NONMATCHING -int daNpcT_Path_c::getDstPosH(cXyz param_0, cXyz* param_1, int param_2, int param_3) { - cXyz* curr_room_pos = &mpRoomPath->m_points[mIdx].m_position; - +int daNpcT_Path_c::getDstPosH(cXyz param_0, cXyz* param_1, int i_idx, int param_3) { if (i_idx == mIdx) { - mIdx--; + *param_1 = getPntPos(getIdx() - 1); + return 1; + } - param_1 = curr_room_pos; - - } else { - do { - int ret = chkPassed1(param_0,i_idx); - - if (ret == 0) { - param_1 = curr_room_pos; - break; - } - - field_0x1E = 1; - - } while (setNextIdx(i_idx) == 0); - - mIdx = i_idx; - mIdx--; - - param_1 = curr_room_pos; + while(true) { + if (!chkPassed1(param_0,i_idx)) { + break; + } + field_0x1E = 1; + if (setNextIdx(i_idx)) { + mIdx = i_idx; + *param_1 = getPntPos(getIdx() - 1); + return 1; + } } - return 1; + + while(true) { + if (field_0x1E < param_3) { + if (chkPassed2(param_0, param_1, i_idx, param_3)) { + field_0x1E++; + continue; + } + } else { + int i_idx2; + *param_1 = getPntPos(i_idx2 = getIdx()); + } + return 0; + } + } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daNpcT_Path_c::getDstPosH(cXyz param_0, cXyz* param_1, int param_2, int param_3) { - nofralloc -#include "asm/d/a/d_a_npc/getDstPosH__13daNpcT_Path_cF4cXyzP4cXyzii.s" -} -#pragma pop -#endif /* ############################################################################################## */ /* 804533EC-804533F0 0019EC 0004+00 1/1 0/0 0/0 .sdata2 @4513 */ @@ -1050,24 +1018,20 @@ int daNpcT_Path_c::chkPassed1(cXyz param_0, int param_1) { if ((mpRoomPath->m_closed & 1) == 0 || param_1 == mpRoomPath->m_num) { - tmp = mDirection == 1; - daNpcT_decIdx(param_1,tmpIdx2,1,tmp); + daNpcT_decIdx(param_1,tmpIdx2,1, chkReverse()); - tmp = mDirection == 1; - daNpcT_incIdx(param_1,tmpIdx1,0,tmp); + daNpcT_incIdx(mpRoomPath->m_num,tmpIdx1,1,chkReverse()); } else { - tmp = mDirection == 1; - daNpcT_decIdx(tmp,tmpIdx1,0,tmp); + daNpcT_decIdx(param_1,tmpIdx1,0,chkReverse()); - tmp = mDirection == 1; - daNpcT_incIdx(mpRoomPath->m_num,tmpIdx2,1,tmp); + daNpcT_incIdx(param_1,tmpIdx2,0,chkReverse()); } tmp = tmpIdx2; - l_pos5 = mpRoomPath->m_points[idx].m_position; - l_pos6 = mpRoomPath->m_points[mIdx].m_position; - l_pos7 = mpRoomPath->m_points[mIdx].m_position; + l_pos5 = getPntPos(idx); + l_pos6 = getPntPos(mIdx); + l_pos7 = getPntPos(mIdx); l_pos1 = l_pos7; l_pos2 = l_pos6; @@ -1180,12 +1144,8 @@ SECTION_DATA u8 daBaseNpc_c::mCcDSph[64] = { }; /* 803B37E0-803B3824 010900 0044+00 0/0 0/0 36/36 .data mCcDCyl__8daNpcF_c */ -SECTION_DATA u8 daNpcF_c::mCcDCyl[68] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +SECTION_DATA dCcD_SrcCyl daNpcF_c::mCcDCyl = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; /* 803B3824-803B3864 010944 0040+00 0/0 0/0 2/2 .data mCcDSph__8daNpcF_c */ @@ -1943,36 +1903,29 @@ void daNpcT_c::setRoomNo() { } /* 80148D10-80148DD0 143650 00C0+00 1/1 0/0 0/0 .text checkEndAnm__8daNpcT_cFf */ +// weird mr assignments #ifdef NONMATCHING int daNpcT_c::checkEndAnm(f32 param_0) { - bool ret; - u8 play_mode = mMcaMorfAnm[0]->getPlayMode(); - int tmp = 2; - - if (play_mode == tmp || play_mode < tmp) { - tmp = 0; - if (play_mode < tmp) { - ret = 0; - } else { + switch(mMcaMorfAnm[0]->getPlayMode()) { + case 2: return mMcaMorfAnm[0]->isLoop(); - } + case 0: + case 1: + bool ret; + bool ret2; + ret2 = ret = 0; + if (mMcaMorfAnm[0]->isStop() && cM3d_IsZero(mMcaMorfAnm[0]->getPlaySpeed()) != false) { + ret2 = 1; + } + if (ret2 && cM3d_IsZero_inverted(param_0)) { + ret = 1; + } + return ret; + case 3: + break; } - if (ret == 0 && cM3d_IsZero_inverted(mMcaMorfAnm[0]->getPlaySpeed())) { - if (cM3d_IsZero_inverted(param_0)) { - play_mode = 1; - } - } - - if (!mMcaMorfAnm[0]->mFrameCtrl.checkState(1) && mMcaMorfAnm[0]->mFrameCtrl.getRate() != 0.0f) { - ret = 1; - } - - if (play_mode = 1 && cM3d_IsZero_inverted(param_0)) { - ret = 1; - } - - return ret; + return 0; } #else #pragma push @@ -1986,14 +1939,40 @@ asm int daNpcT_c::checkEndAnm(f32 param_0) { #endif /* 80148DD0-80148E4C 143710 007C+00 1/1 0/0 0/0 .text checkEndAnm__8daNpcT_cFP12J3DFrameCtrlf */ +// weird mr +#ifdef NONMATCHING +int daNpcT_c::checkEndAnm(J3DFrameCtrl* param_0, f32 param_1) { + switch(param_0->getAttribute()) { + case 2: + return (param_0->getState() >> 1) & 1; + case 0: + case 1: + bool ret; + bool ret2; + ret2 = ret = 0; + if ((param_0->getState() & 1) && param_0->getRate() == 0.0f) { + ret2 = 1; + } + if (ret2 && param_1 != 0.0f) { + ret = 1; + } + return ret; + case 3: + break; + } + + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcT_c::checkEndAnm(J3DFrameCtrl* param_0, f32 param_1) { +asm int daNpcT_c::checkEndAnm(J3DFrameCtrl* param_0, f32 param_1) { nofralloc #include "asm/d/a/d_a_npc/checkEndAnm__8daNpcT_cFP12J3DFrameCtrlf.s" } #pragma pop +#endif /* 80148E4C-801490D4 14378C 0288+00 1/1 0/0 0/0 .text playAllAnm__8daNpcT_cFv */ #pragma push @@ -2067,7 +2046,7 @@ void daNpcT_c::ctrlFaceMotion() { /* 80149300-801493B8 143C40 00B8+00 1/1 0/0 0/0 .text ctrlMotion__8daNpcT_cFv */ #ifdef NONMATCHING -// 1 instruction in the wrong place + 1 register wrong +// matches with literals void daNpcT_c::ctrlMotion() { int l_int; int l_int2; @@ -2076,27 +2055,21 @@ void daNpcT_c::ctrlMotion() { if (field_0xb74.play(field_0xe1e,&l_int,&l_float)) { l_int2 = 0; - if (l_float < FLOAT_LABEL(lit_4148)) { + if (l_float < 0.5f) { l_int2 = 1; } - int l_int3 = l_int; + setMotionAnm(l_int,l_float < 0.0f ? field_0xa84 : l_float,l_int2); - if (l_float < FLOAT_LABEL(lit_4116)) { - setMotionAnm(l_int3,field_0xa84,l_int2); - } - - f32 tmp = FLOAT_LABEL(lit_4116); - field_0xdfc = tmp; + field_0xdfc = 0.0f; if (field_0xa88) { - mMcaMorfAnm[0]->setMorf(tmp); + mMcaMorfAnm[0]->setMorf(0.0f); - f32 tmp2 = FLOAT_LABEL(lit_4116); - field_0xdfc = tmp2; + field_0xdfc = 0.0f; if (mMcaMorfAnm[1]) { - mMcaMorfAnm[1]->setMorf(tmp2); + mMcaMorfAnm[1]->setMorf(0.0f); } } } @@ -2113,34 +2086,28 @@ asm void daNpcT_c::ctrlMotion() { #endif /* 801493B8-8014951C 143CF8 0164+00 1/1 0/0 2/2 .text ctrlMsgAnm__8daNpcT_cFPiPiP10fopAc_ac_ci */ -#ifdef NONMATCHING -// few extra mr instructions + regalloc nightmare int daNpcT_c::ctrlMsgAnm(int* param_0, int* param_1, fopAc_ac_c* param_2, int param_3) { - int* tmp0 = param_0; - int* tmp1 = param_1; - fopAc_ac_c* tmp2 = param_2; - int tmp3 = param_3; - *param_0 = -1; *param_1 = -1; - if (tmp3 != 0 || mEvtInfo.checkCommandTalk() || field_0xdac != -1) { - fopAc_ac_c* talk_partner = (fopAc_ac_c*)dComIfGp_event_getTalkPartner(); + if (param_3 != 0 || mEvtInfo.checkCommandTalk() || field_0xdac != -1) { + fopAc_ac_c* talk_partner = dComIfGp_event_getTalkPartner(); dMsgObject_c* talk_partner_conv = (dMsgObject_c*)talk_partner; - if (tmp2 == talk_partner) { - u16 actor_command = talk_partner_conv->getActor()->mEvtInfo.mCommand; + if (talk_partner == param_2) { + fopAc_ac_c* conv_actor = talk_partner_conv->getActor(); + u16 actor_command = conv_actor->mEvtInfo.mCommand; if (actor_command == 2 || actor_command == 3) { mSubMtd = (profile_method_class*)-1; } else if (actor_command == 6) { - if (talk_partner->mSubMtd != mSubMtd) { - *tmp0 = dComIfGp_getMesgFaceAnimeAttrInfo(); - *tmp1 = dComIfGp_getMesgAnimeAttrInfo(); - mSubMtd = talk_partner->mSubMtd; + if (conv_actor->mSubMtd != mSubMtd) { + *param_0 = dComIfGp_getMesgFaceAnimeAttrInfo(); + *param_1 = dComIfGp_getMesgAnimeAttrInfo(); + mSubMtd = conv_actor->mSubMtd; } - if (talk_partner_conv->isMouthCheck()) { + if (dMsgObject_c::isMouthCheck()) { field_0xd98 &= ~0x4000; } else { field_0xd98 |= 0x4000; @@ -2159,24 +2126,15 @@ int daNpcT_c::ctrlMsgAnm(int* param_0, int* param_1, fopAc_ac_c* param_2, int pa field_0xdb4 = 1; } } - - if (tmp3 == 0) { - cLib_calcTimer(&field_0xdb4); - } - - return field_0xdb4; } + + if (param_3 == 0) { + // cLib_calcTimer + func_8014D348(&field_0xdb4); + } + + return field_0xdb4; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daNpcT_c::ctrlMsgAnm(int* param_0, int* param_1, fopAc_ac_c* param_2, int param_3) { - nofralloc -#include "asm/d/a/d_a_npc/ctrlMsgAnm__8daNpcT_cFPiPiP10fopAc_ac_ci.s" -} -#pragma pop -#endif /* 8014951C-8014997C 143E5C 0460+00 1/0 1/0 59/0 .text ctrlJoint__8daNpcT_cFP8J3DJointP8J3DModel */ @@ -2560,14 +2518,33 @@ asm void daNpcT_c::talkProc(int* param_0, int param_1, fopAc_ac_c** param_2, int SECTION_SDATA2 static f32 lit_7337 = 1000000000.0f; /* 8014BE2C-8014BEE4 14676C 00B8+00 0/0 0/0 25/25 .text getNearestActorP__8daNpcT_cFs */ +// Matches with literals +#ifdef NONMATCHING +fopAc_ac_c* daNpcT_c::getNearestActorP(s16 param_0) { + fopAc_ac_c* actor = NULL; + f32 minDistance = 1000000000.0f; + mFindCount = 0; + mSrchName = param_0; + fpcEx_Search((fpcLyIt_JudgeFunc)srchActor, this); + for (s32 i = 0; i < mFindCount; i++) { + f32 dist = fopAcM_searchActorDistance(this, mFindActorPtrs[i]); + if (dist < minDistance) { + minDistance = fopAcM_searchActorDistance(this, mFindActorPtrs[i]); + actor = mFindActorPtrs[i]; + } + } + return actor; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcT_c::getNearestActorP(s16 param_0) { +asm fopAc_ac_c* daNpcT_c::getNearestActorP(s16 param_0) { nofralloc #include "asm/d/a/d_a_npc/getNearestActorP__8daNpcT_cFs.s" } #pragma pop +#endif /* 8014BEE4-8014BFB0 146824 00CC+00 0/0 0/0 12/12 .text getEvtAreaTagP__8daNpcT_cFii */ #pragma push @@ -2580,42 +2557,19 @@ asm void daNpcT_c::getEvtAreaTagP(int param_0, int param_1) { #pragma pop /* 8014BFB0-8014C030 1468F0 0080+00 0/0 0/0 5/5 .text getShopItemTagP__8daNpcT_cFv */ -#ifdef NONMATCHING -// few instructions off + regalloc -u32 daNpcT_c::getShopItemTagP() { +fopAc_ac_c* daNpcT_c::getShopItemTagP() { mFindCount = 0; mSrchName = 0x127; - fpcM_Search((fopAcIt_JudgeFunc)srchActor,(void*)this); - - int i = 0; + i_fpcM_Search((fopAcIt_JudgeFunc)srchActor,(void*)this); - for (;;) { - - if (0 >= mFindCount) { - break; - } - - u16 param = fopAcM_GetParam(mFindActorPtrs[i]); - - if (param == 0xf0000000) { - return param; + for (s32 i = 0; i < mFindCount; i++) { + if ((fopAcM_GetParam(mFindActorPtrs[i]) & 0xf0000000) == 0xf0000000) { + return mFindActorPtrs[i]; } - - i++; } - return 0; + return NULL; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 daNpcT_c::getShopItemTagP() { - nofralloc -#include "asm/d/a/d_a_npc/getShopItemTagP__8daNpcT_cFv.s" -} -#pragma pop -#endif /* ############################################################################################## */ /* 80453480-80453484 001A80 0004+00 1/1 0/0 0/0 .sdata2 id$7388 */ @@ -2648,47 +2602,43 @@ SECTION_SDATA2 static f32 lit_7551 = 448.0f; /* 8014C200-8014C384 146B40 0184+00 0/0 0/0 2/2 .text * daNpcT_chkActorInScreen__FP10fopAc_ac_cfffffffi */ +// matches with literals #ifdef NONMATCHING bool daNpcT_chkActorInScreen(fopAc_ac_c* i_ActorP, f32 param_1, f32 param_2, f32 param_3, f32 param_4, f32 param_5, f32 param_6, f32 param_7, int param_8) { - bool ret = false; - cXyz pos_array[4]; - cXyz pos1; - cXyz pos2; - cXyz pos3; - cXyz pos4; + cXyz proj; + cXyz pos_array[8]; if (fopAcM_GetMtx(i_ActorP)) { - ret = false; - } else { - pos_array[0].set(param_1,param_4,param_2); - pos_array[1].set(param_3,param_4,param_2); - pos_array[2].set(param_1,param_4,param_6); - pos_array[3].set(param_3,param_4,param_5); + pos_array[0].set(param_1,param_5,param_3); + pos_array[1].set(param_4,param_5,param_3); + pos_array[2].set(param_1,param_5,param_6); + pos_array[3].set(param_4,param_5,param_6); + pos_array[4].set(param_1,param_2,param_3); + pos_array[5].set(param_4,param_2,param_3); + pos_array[6].set(param_1,param_2,param_6); + pos_array[7].set(param_4,param_2,param_6); - pos1.set(param_1,param_2,param_3); - pos2.set(param_3,param_1,param_2); - pos3.set(param_1,param_2,param_6); - pos4.set(param_3,param_1,param_6); mDoMtx_stack_c::copy(fopAcM_GetMtx(i_ActorP)); - mDoMtx_stack_c::transM(FLOAT_LABEL(lit_4116),param_6,FLOAT_LABEL(lit_4116)); - PSMTXMultVec((MtxP)&mDoMtx_stack_c::now,&pos_array[0],&pos_array[0]); + mDoMtx_stack_c::transM(0.0f, param_7, 0.0f); + cMtx_multVecArray((MtxP)&mDoMtx_stack_c::now, pos_array, pos_array, 8); if (param_8) { - for (int i = 0; i < 8; i++) { - mDoLib_project(&pos_array[i],&pos4); - if (true) { - ret = false; - } + return false; + } + for (int i = 0; i < 8; i++) { + mDoLib_project(&pos_array[i],&proj); + if (0.0f < proj.x && proj.x < 608.0f && 0.0f < proj.y && proj.y < 448.0f) { + continue; } - ret = true; - } else { - ret = false; + return false; } + + return true; } - return ret; + return false; } #else #pragma push @@ -2703,10 +2653,10 @@ asm void daNpcT_chkActorInScreen(fopAc_ac_c* param_0, f32 param_1, f32 param_2, #endif /* 8014C384-8014C500 146CC4 017C+00 1/1 0/0 3/3 .text daNpcT_chkPointInArea__F4cXyz4cXyz4cXyzsi */ -#ifdef NONMATCHING -bool daNpcT_chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3, int param_4) { - bool ret; +BOOL daNpcT_chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3, int param_4) { + BOOL ret; cXyz l_pos; + cXyz diff; mDoMtx_stack_c::YrotS(-param_3); mDoMtx_stack_c::transM(-param_1.x,-param_1.y,-param_1.z); @@ -2717,28 +2667,16 @@ bool daNpcT_chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3 f32 l_float3 = fabsf(l_pos.x); f32 l_float4 = fabsf(l_pos.z); - - l_pos = param_0 - param_1; - if (param_4 != 0 || (FLOAT_LABEL(lit_4116) <= l_pos.y && l_pos.y > param_2.y)) { - ret = false; + if (param_4 != 0 && (!(FLOAT_LABEL(lit_4116) <= (diff = param_0 - param_1).y) || !(diff.y < param_2.y))) { + ret = FALSE; } else { f32 tmp1 = (l_float3 * l_float3) / (l_float1 * l_float1); f32 tmp2 = (l_float4 * l_float4) / (l_float2 * l_float2); - tmp1 + tmp2 <= FLOAT_LABEL(lit_4140) ? ret = true : ret = false; + tmp1 + tmp2 <= FLOAT_LABEL(lit_4140) ? ret = TRUE : ret = FALSE; } return ret; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcT_chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3, int param_4) { - nofralloc -#include "asm/d/a/d_a_npc/daNpcT_chkPointInArea__F4cXyz4cXyz4cXyzsi.s" -} -#pragma pop -#endif /* 8014C500-8014C5E0 146E40 00E0+00 0/0 0/0 29/29 .text * daNpcT_getPlayerInfoFromPlayerList__FiiP4cXyzP5csXyz */ @@ -2806,8 +2744,8 @@ void daNpcT_offEvtBit(u32 i_idx) { } /* 8014CAAC-8014CAEC 1473EC 0040+00 0/0 0/0 155/155 .text daNpcT_chkEvtBit__FUl */ -void daNpcT_chkEvtBit(u32 i_idx) { - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_idx]); +BOOL daNpcT_chkEvtBit(u32 i_idx) { + return i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_idx]); } /* 8014CAEC-8014CB2C 14742C 0040+00 0/0 0/0 26/26 .text daNpcT_onTmpBit__FUl */ @@ -2821,8 +2759,8 @@ void daNpcT_offTmpBit(u32 i_idx) { } /* 8014CB6C-8014CBAC 1474AC 0040+00 0/0 0/0 38/38 .text daNpcT_chkTmpBit__FUl */ -void daNpcT_chkTmpBit(u32 i_idx) { - dComIfGs_isTmpBit(dSv_event_tmp_flag_c::tempBitLabels[i_idx]); +BOOL daNpcT_chkTmpBit(u32 i_idx) { + return dComIfGs_isTmpBit(dSv_event_tmp_flag_c::tempBitLabels[i_idx]); } /* 8014CBAC-8014CBF4 1474EC 0048+00 1/0 0/0 0/0 .text __dt__16daNpcT_Hermite_cFv */ @@ -2982,7 +2920,7 @@ void daNpcT_c::changeBck(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcT_c::getFaceMotionAnm(daNpcT_faceMotionAnmData_c param_0) { +asm daNpcT_faceMotionAnmData_c daNpcT_c::getFaceMotionAnm(daNpcT_faceMotionAnmData_c param_0) { nofralloc #include "asm/d/a/d_a_npc/getFaceMotionAnm__8daNpcT_cF26daNpcT_faceMotionAnmData_c.s" } @@ -3006,14 +2944,21 @@ void daNpcT_c::changeAnm(int* param_0, int* param_1) { /* 8014CCF0-8014CD20 147630 0030+00 1/0 1/0 0/0 .text * getMotionAnm__8daNpcT_cF22daNpcT_motionAnmData_c */ +// probably inline +#ifdef NONMATCHING +daNpcT_motionAnmData_c daNpcT_c::getMotionAnm(daNpcT_motionAnmData_c param_0) { + return param_0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcT_c::getMotionAnm(daNpcT_motionAnmData_c param_0) { +asm daNpcT_motionAnmData_c daNpcT_c::getMotionAnm(daNpcT_motionAnmData_c param_0) { nofralloc #include "asm/d/a/d_a_npc/getMotionAnm__8daNpcT_cF22daNpcT_motionAnmData_c.s" } #pragma pop +#endif /* 8014CD20-8014D0A8 147660 0388+00 1/0 1/1 0/0 .text __dt__8daNpcT_cFv */ #pragma push @@ -3033,7 +2978,7 @@ bool daNpcT_c::getEyeballLMaterialNo() { } /* 8014D0B0-8014D0B8 1479F0 0008+00 1/0 1/0 0/0 .text getEyeballRMaterialNo__8daNpcT_cFv - */ + */\ bool daNpcT_c::getEyeballRMaterialNo() { return false; } @@ -3112,7 +3057,7 @@ extern "C" asm void func_8014D32C(void* _this, s16* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8014D348(void* _this, int* param_0) { +extern "C" asm void func_8014D348(void* _this) { nofralloc #include "asm/d/a/d_a_npc/func_8014D348.s" } @@ -3153,20 +3098,19 @@ REGISTER_CTORS(0x8014D3D8, __sinit_d_a_npc_cpp); #pragma pop /* 8014D538-8014D584 147E78 004C+00 2/2 0/0 0/0 .text daBaseNpc_addIdx__FiiPUsi */ -#ifdef NONMATCHING static int daBaseNpc_addIdx(int param_0, int param_1, u16* param_2, int param_3) { - int tmp; + int tmp = *param_2; int ret; ret = 0; - tmp = *param_2 - param_0; + tmp += param_0; - if (0 >= tmp) { + if (param_1 <= tmp) { if (param_3 != 0) { - tmp += param_1 * (tmp / param_1 + 1); + tmp -= param_1 * (tmp / param_1); } else { - tmp = 0; + tmp = param_1 != 0 ? param_1 - 1 : 0; ret = 1; } } @@ -3174,27 +3118,16 @@ static int daBaseNpc_addIdx(int param_0, int param_1, u16* param_2, int param_3) *param_2 = (u16)tmp; return ret; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBaseNpc_addIdx(int param_0, int param_1, u16* param_2, int param_3) { - nofralloc -#include "asm/d/a/d_a_npc/daBaseNpc_addIdx__FiiPUsi.s" -} -#pragma pop -#endif /* 8014D584-8014D5C4 147EC4 0040+00 2/2 0/0 0/0 .text daBaseNpc_subIdx__FiiPUsi */ -#ifdef NONMATCHING static int daBaseNpc_subIdx(int param_0, int param_1, u16* param_2, int param_3) { - int tmp; + int tmp = *param_2; int ret; ret = 0; - tmp = *param_2 - param_0; + tmp -= param_0; - if (0 >= tmp) { + if (tmp <= 0) { if (param_3 != 0) { tmp += param_1 * (tmp / param_1 + 1); } @@ -3207,16 +3140,6 @@ static int daBaseNpc_subIdx(int param_0, int param_1, u16* param_2, int param_3) *param_2 = (u16)tmp; return ret; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBaseNpc_subIdx(int param_0, int param_1, u16* param_2, int param_3) { - nofralloc -#include "asm/d/a/d_a_npc/daBaseNpc_subIdx__FiiPUsi.s" -} -#pragma pop -#endif /* 8014D5C4-8014D620 147F04 005C+00 2/2 0/0 0/0 .text daBaseNpc_incIdx__FiPUsii */ static void daBaseNpc_incIdx(int i_pathNo, u16* i_pathIdx, int i_pathClosed, int i_pathDirection) { @@ -3257,44 +3180,18 @@ asm daBaseNpc_acMngr_c::daBaseNpc_acMngr_c() { #pragma pop /* 8014D81C-8014D838 14815C 001C+00 0/0 0/0 9/9 .text entry__18daBaseNpc_acMngr_cFP10fopAc_ac_c */ -#ifndef NONMATCHING void daBaseNpc_acMngr_c::entry(fopAc_ac_c* i_ActorP) { mActorId = fopAcM_GetID(i_ActorP); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBaseNpc_acMngr_c::entry(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_npc/entry__18daBaseNpc_acMngr_cFP10fopAc_ac_c.s" -} -#pragma pop -#endif /* 8014D838-8014D884 148178 004C+00 0/0 0/0 6/6 .text getActor__18daBaseNpc_acMngr_cFv */ -#ifdef NONMATCHING -// finish fopAc_ac_c* daBaseNpc_acMngr_c::getActor() { - fopAc_ac_c* ret[4]; - ret[0] = 0; - u32 searched_actor_id = fopAcM_SearchByID(mActorId,ret); - if (!searched_actor_id || ret[0]) { - ret[0] = 0; - } - - return ret[0]; + fopAc_ac_c* ret = NULL; + if (fopAcM_SearchByID(mActorId, &ret) && ret != NULL) { + return ret; + } + return NULL; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm fopAc_ac_c* daBaseNpc_acMngr_c::getActor() { - nofralloc -#include "asm/d/a/d_a_npc/getActor__18daBaseNpc_acMngr_cFv.s" -} -#pragma pop -#endif /* 8014D884-8014D998 1481C4 0114+00 1/0 0/0 0/0 .text calc__18daBaseNpc_matAnm_cCFP11J3DMaterial */ @@ -3323,40 +3220,27 @@ BOOL daBaseNpc_path_c::isPath() { } /* 8014D9BC-8014DA48 1482FC 008C+00 0/0 0/0 1/1 .text setPathInfo__16daBaseNpc_path_cFUcScSc */ -#ifdef NONMATCHING - -typedef dStage_dPnt_c dPnt; static asm int daBaseNpc_putNurbs(dPnt* param_0, int param_1, int param_2, dPnt* param_3, int param_4); int daBaseNpc_path_c::setPathInfo(u8 i_pathIdx, s8 i_roomNo, s8 i_direction) { dPath* room_path; - mRoomPath = 0; + mpRoomPath = 0; mIdx = 0; mDirection = i_direction; if (i_pathIdx != 0xFF) { - mRoomPath = dPath_GetRoomPath(i_pathIdx,i_roomNo); - room_path = mRoomPath; + mpRoomPath = dPath_GetRoomPath(i_pathIdx,i_roomNo); + room_path = mpRoomPath; if (!room_path) { return 0; } - - field_0xa0e = daBaseNpc_putNurbs(room_path->m_points,room_path->m_num,0xA0,field_0xc,room_path->m_closed & 1); + int isClosed = dPath_ChkClose(room_path); + field_0xa0e = daBaseNpc_putNurbs((dPnt*)room_path->m_points,room_path->m_num,0xA0, (dPnt*)field_0xc, isClosed); } return isPath(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daBaseNpc_path_c::setPathInfo(u8 param_0, s8 param_1, s8 param_2) { - nofralloc -#include "asm/d/a/d_a_npc/setPathInfo__16daBaseNpc_path_cFUcScSc.s" -} -#pragma pop -#endif /* 8014DA48-8014DA64 148388 001C+00 0/0 0/0 1/1 .text reverseDir__16daBaseNpc_path_cFv */ void daBaseNpc_path_c::reverseDir() { @@ -3366,45 +3250,14 @@ void daBaseNpc_path_c::reverseDir() { } /* 8014DA64-8014DAC4 1483A4 0060+00 0/0 0/0 3/3 .text chkPnt__16daBaseNpc_path_cF4cXyz */ -#ifdef NONMATCHING -void daBaseNpc_path_c::chkPnt(cXyz i_pos) { - int curr_path = mRoomPath; - daBaseNpc_chkPnt(i_pos,(dPnt*)curr_path,mIdx,curr_path,(curr_path+5)&1,(int)mDirection); +s32 daBaseNpc_path_c::chkPnt(cXyz i_pos) { + return daBaseNpc_chkPnt(i_pos, (dPnt*)mpRoomPath->m_points, mIdx, mpRoomPath->m_num, dPath_ChkClose(mpRoomPath), mDirection); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBaseNpc_path_c::chkPnt(cXyz param_0) { - nofralloc -#include "asm/d/a/d_a_npc/chkPnt__16daBaseNpc_path_cF4cXyz.s" -} -#pragma pop -#endif /* 8014DAC4-8014DB04 148404 0040+00 0/0 0/0 3/3 .text setNextPnt__16daBaseNpc_path_cFv */ -#ifdef NONMATCHING -// some instructions switched around void daBaseNpc_path_c::setNextPnt() { - - u16 arg1 = mpRoomPath->m_num; - u16* arg2 = &mIdx; - u8 arg3 = mpRoomPath->m_closed & 1; - s8 arg4 = mDirection; - - - daBaseNpc_incIdx(arg1,arg2,arg3,arg4); + daBaseNpc_incIdx(mpRoomPath->m_num, &mIdx, dPath_ChkClose(mpRoomPath), mDirection); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBaseNpc_path_c::setNextPnt() { - nofralloc -#include "asm/d/a/d_a_npc/setNextPnt__16daBaseNpc_path_cFv.s" -} -#pragma pop -#endif /* 8014DB04-8014DB0C 148444 0008+00 0/0 0/0 3/3 .text getIdx__16daBaseNpc_path_cFv */ u16 daBaseNpc_path_c::getIdx() { @@ -3417,25 +3270,9 @@ void daBaseNpc_path_c::setIdx(u16 i_idx) { } /* 8014DB14-8014DB40 148454 002C+00 0/0 0/0 4/4 .text getPntPos__16daBaseNpc_path_cFUs */ -#ifdef NONMATCHING -void daBaseNpc_path_c::getPntPos(u16 param_0) { - dStage_dPnt_c* pnt = mpRoomPath->m_points; // get the points on the path - dStage_dPnt_c pnt2 = pnt[param_0*16]; // probably a cast (& 0xFFFF0); - - field_0x0 = pnt2.m_position.x; - mpRoomPath = 0; - field_0x8 = pnt2.m_position.z; +Vec daBaseNpc_path_c::getPntPos(u16 i_idx) { + return mpRoomPath->m_points[i_idx].m_position; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBaseNpc_path_c::getPntPos(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_npc/getPntPos__16daBaseNpc_path_cFUs.s" -} -#pragma pop -#endif /* 8014DB40-8014DBB4 148480 0074+00 1/1 0/0 0/0 .text limitter__18daBaseNpc_lookat_cFsPsss */ void daBaseNpc_lookat_c::limitter(s16 param_1, s16* param_2, s16 param_3, s16 param_4) { @@ -3514,33 +3351,9 @@ int daBaseNpc_lookat_c::setAttnPos(cXyz* i_pos) { } /* 8014E6AC-8014E6C8 148FEC 001C+00 0/0 0/0 1/1 .text getRot__18daBaseNpc_lookat_cFi */ -#ifdef NONMATCHING - -// 2 instructions off - -struct someType { - u8 unk[0x7c]; - int someMember; - u16 someMember2; -}; - -void daBaseNpc_lookat_c::getRot(int param_0) { - someType* tmp = (someType*)(this + param_0); - - field_0x00 = tmp->someMember; - mMaxJntLmt[0].x = tmp->someMember2; - +csXyz daBaseNpc_lookat_c::getRot(int param_0) { + return mRotation[param_0]; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBaseNpc_lookat_c::getRot(int param_0) { - nofralloc -#include "asm/d/a/d_a_npc/getRot__18daBaseNpc_lookat_cFi.s" -} -#pragma pop -#endif /* 8014E6C8-8014E89C 149008 01D4+00 1/1 0/0 0/0 .text __ct__11daBaseNpc_cFv */ #pragma push @@ -3684,25 +3497,25 @@ bool daBaseNpc_c::btkCtrl() { } /* 8014F148-8014F1C8 149A88 0080+00 1/1 0/0 0/0 .text checkEndAnm__11daBaseNpc_cFf */ +// weird condition mr #ifdef NONMATCHING int daBaseNpc_c::checkEndAnm(f32 param_0) { - u32 state; - u8 play_mode = mpMorf->getPlayMode(); + switch(mMcaMorfAnm[0]->getPlayMode()) { + case 2: + return mMcaMorfAnm[0]->isLoop(); + case 0: + case 1: + bool state = false; - if (play_mode != 2) { - state = mpMorf->isLoop(); - } else if (play_mode < 2) { - state = 0; - - if (!mpMorf->isStop() && param_0 != mpMorf->getPlaySpeed()) { - state = 1; - } - - } else { - state = 0; + if (mMcaMorfAnm[0]->isStop() && param_0 != mMcaMorfAnm[0]->getPlaySpeed()) { + state = true; + } + return state; + case 3: + break; } - return state; + return 0; } #else #pragma push @@ -3717,23 +3530,25 @@ asm int daBaseNpc_c::checkEndAnm(f32 param_0) { /* 8014F1C8-8014F228 149B08 0060+00 1/1 0/0 0/0 .text checkEndAnm__11daBaseNpc_cFP12J3DFrameCtrl */ +// matches with literals #ifdef NONMATCHING int daBaseNpc_c::checkEndAnm(J3DFrameCtrl* param_0) { - int tmp; - int tmp_attr = param_0->getAttribute(); - - if (tmp_attr == 2) { - tmp_attr = param_0->checkState(2); - } else if (2 > tmp_attr) { - tmp = 1; + switch (param_0->getAttribute()) { + case 2: + return param_0->checkState(2); + case 0: + case 1: + bool rv = true; if (((param_0->checkState(1) == 0) && (param_0->getRate() != 0.0f))) { - tmp = 0; + rv = false; } - } else { - tmp = 0; + return rv; + break; + case 3: + break; } - return tmp; + return 0; } #else @@ -3921,7 +3736,7 @@ static asm int daBaseNpc_putNurbs(dPnt* param_0, int param_1, int param_2, dPnt* #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void daBaseNpc_chkPnt(cXyz param_0, dPnt* param_1, u16 param_2, u16 param_3, int param_4, +static asm s32 daBaseNpc_chkPnt(cXyz param_0, dPnt* param_1, u16 param_2, u16 param_3, int param_4, int param_5) { nofralloc #include "asm/d/a/d_a_npc/daBaseNpc_chkPnt__F4cXyzP4dPntUsUsii.s" @@ -4076,13 +3891,13 @@ static int daNpcF_subIdx(int param_0, int param_1, u16& param_2, int param_3) { } /* 801505F8-80150654 14AF38 005C+00 4/4 0/0 0/0 .text daNpcF_incIdx__FiRUsii */ -static void daNpcF_incIdx(int param_0, u16& param_1, int param_2, int param_3) { - param_3 ? daNpcF_subIdx(1,param_0,param_1,param_2) : daNpcF_addIdx(1,param_0,param_1,param_2); +static int daNpcF_incIdx(int param_0, u16& param_1, int param_2, int param_3) { + return param_3 ? daNpcF_subIdx(1,param_0,param_1,param_2) : daNpcF_addIdx(1,param_0,param_1,param_2); } /* 80150654-801506B0 14AF94 005C+00 3/3 0/0 0/0 .text daNpcF_decIdx__FiRUsii */ -static void daNpcF_decIdx(int param_0, u16& param_1, int param_2, int param_3) { - param_3 ? daNpcF_addIdx(1,param_0,param_1,param_2) : daNpcF_subIdx(1,param_0,param_1,param_2); +static int daNpcF_decIdx(int param_0, u16& param_1, int param_2, int param_3) { + return param_3 ? daNpcF_addIdx(1,param_0,param_1,param_2) : daNpcF_subIdx(1,param_0,param_1,param_2); } /* 801506B0-801506BC 14AFF0 000C+00 0/0 0/0 130/130 .text initialize__18daNpcF_ActorMngr_cFv */ @@ -4127,17 +3942,15 @@ void daNpcF_MatAnm_c::initialize() { field_0xF4 = value; field_0xF8 = value; - mTranslationX = value; - mTranslationY = value; - field_0x104 = 0; + mNowOffsetX = value; + mNowOffsetY = value; + mEyeMoveFlag = 0; field_0x105 = 0; } /* 8015075C-80150870 14B09C 0114+00 1/0 0/0 0/0 .text calc__15daNpcF_MatAnm_cCFP11J3DMaterial */ +// matches with literals #ifdef NONMATCHING -// matches if you make daNpcF_MatAnm_c inherit J3DMaterialAnm -// But doing so causes the dol overall to not match -// something obvious here i'm missing void daNpcF_MatAnm_c::calc(J3DMaterial* param_0) const { J3DMaterialAnm::calc(param_0); @@ -4154,9 +3967,9 @@ void daNpcF_MatAnm_c::calc(J3DMaterial* param_0) const { curr_mtx_info->mSRT.mTranslationY = field_0xF8 * tmp9 + curr_mtx_info->mSRT.mTranslationY * tmp8; } else { - if (field_0x104 != 0) { - curr_mtx_info->mSRT.mTranslationX = mTranslationX; - curr_mtx_info->mSRT.mTranslationY = mTranslationY; + if (mEyeMoveFlag != 0) { + curr_mtx_info->mSRT.mTranslationX = mNowOffsetX; + curr_mtx_info->mSRT.mTranslationY = mNowOffsetY; } } @@ -4169,7 +3982,8 @@ void daNpcF_MatAnm_c::calc(J3DMaterial* param_0) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcF_MatAnm_c::calc(J3DMaterial* param_0) const { +// asm void daNpcF_MatAnm_c::calc(J3DMaterial* param_0) const { +asm void calc__15daNpcF_MatAnm_cCFP11J3DMaterial() { nofralloc #include "asm/d/a/d_a_npc/calc__15daNpcF_MatAnm_cCFP11J3DMaterial.s" } @@ -4177,9 +3991,8 @@ asm void daNpcF_MatAnm_c::calc(J3DMaterial* param_0) const { #endif /* 80150870-80150900 14B1B0 0090+00 2/2 0/0 8/8 .text initialize__16daNpcF_SPCurve_cFP5dPathi */ +// matches with literals #ifdef NONMATCHING -static u16 daNpcF_putNurbs(dPnt* param_0, int param_1, int param_2, dPnt* param_3, int param_4); - void daNpcF_SPCurve_c::initialize(dPath* i_path, int param_1) { mNurbs = 0; field_0x02 = 0; @@ -4195,7 +4008,7 @@ void daNpcF_SPCurve_c::initialize(dPath* i_path, int param_1) { if (i_path) { mIsClosed = i_path->m_closed & 1; - mNurbs = daNpcF_putNurbs(i_path->m_points,i_path->m_num, 0x60, mPoints,mIsClosed); + mNurbs = daNpcF_putNurbs((dPnt*)i_path->m_points,i_path->m_num, 0x60, (dPnt*)mPoints,mIsClosed); } } #else @@ -4225,11 +4038,9 @@ void daNpcF_Path_c::initialize() { } /* 8015095C-80150A24 14B29C 00C8+00 0/0 0/0 12/12 .text setPathInfo__13daNpcF_Path_cFUcScUc */ -#ifdef NONMATCHING -// bunch of regalloc issues. There is an inline function at the end that needs to be defined int daNpcF_Path_c::setPathInfo(u8 param_0, s8 param_1, u8 param_2) { mpRoomPath = 0; - field_0x00 = 0; + mIdx = 0; field_0x02 = param_2; dStage_dPnt_c point; @@ -4240,30 +4051,11 @@ int daNpcF_Path_c::setPathInfo(u8 param_0, s8 param_1, u8 param_2) { } mSPCurve.initialize(mpRoomPath,field_0x02); mIsClosed = mpRoomPath->m_closed & 1; - - int idx = field_0x00; - point = mpRoomPath->m_points[idx]; - - f32 x = point.m_position.x; - f32 y = point.m_position.y; - f32 z = point.m_position.z; - - mPosition.x = x; - mPosition.y = y; - mPosition.z = z; + u16 idx; + mPosition = getPntPos(idx = mIdx); } return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daNpcF_Path_c::setPathInfo(u8 param_0, s8 param_1, u8 param_2) { - nofralloc -#include "asm/d/a/d_a_npc/setPathInfo__13daNpcF_Path_cFUcScUc.s" -} -#pragma pop -#endif /* 80150A24-80150A7C 14B364 0058+00 1/1 0/0 1/1 .text chkPassed__13daNpcF_Path_cF4cXyz */ // forward decleration @@ -4296,170 +4088,63 @@ void daNpcF_Path_c::reverse() { } /* 80150BE0-80150C18 14B520 0038+00 2/2 0/0 6/6 .text setNextIdx__13daNpcF_Path_cFv */ -#ifdef NONMATCHING -// 1 instruction off, params being loaded out of order? -void daNpcF_Path_c::setNextIdx() { - int a = mpRoomPath->m_num; - int c = mpRoomPath->m_closed & 1; - u16& b = field_0x00; - u8 d = field_0x02; - - daNpcF_incIdx(a,b,c,d); +int daNpcF_Path_c::setNextIdx() { + return daNpcF_incIdx(mpRoomPath->m_num, mIdx, chkClose(), field_0x02); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daNpcF_Path_c::setNextIdx() { - nofralloc -#include "asm/d/a/d_a_npc/setNextIdx__13daNpcF_Path_cFv.s" -} -#pragma pop -#endif /* 80150C18-80150C60 14B558 0048+00 0/0 0/0 9/9 .text getNextIdx__13daNpcF_Path_cFv */ -#ifdef NONMATCHING -// same problem as above u16 daNpcF_Path_c::getNextIdx() { u16 ret = mIdx; - daNpcF_incIdx(mpRoomPath->m_num,ret,mpRoomPath->m_closed & 1, field_0x02); + daNpcF_incIdx(mpRoomPath->m_num, ret, chkClose(), field_0x02); return ret; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u16 daNpcF_Path_c::getNextIdx() { - nofralloc -#include "asm/d/a/d_a_npc/getNextIdx__13daNpcF_Path_cFv.s" -} -#pragma pop -#endif /* 80150C60-80150CA8 14B5A0 0048+00 0/0 0/0 3/3 .text getBeforeIdx__13daNpcF_Path_cFv */ -#ifdef NONMATCHING -// same problem as above u16 daNpcF_Path_c::getBeforeIdx() { u16 ret = mIdx; - daNpcF_decIdx(mpRoomPath->m_num,ret,mpRoomPath->m_closed & 1, field_0x02); + daNpcF_decIdx(mpRoomPath->m_num, ret, chkClose(), field_0x02); return ret; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u16 daNpcF_Path_c::getBeforeIdx() { - nofralloc -#include "asm/d/a/d_a_npc/getBeforeIdx__13daNpcF_Path_cFv.s" -} -#pragma pop -#endif /* 80150CA8-80150D44 14B5E8 009C+00 0/0 0/0 1/1 .text getBeforePos__13daNpcF_Path_cFR4cXyz */ -#ifdef NONMATCHING -// many regalloc issues -void daNpcF_Path_c::getBeforePos(cXyz& param_0) { - u16 ret = mIdx; - dStage_dPnt_c* points; +int daNpcF_Path_c::getBeforePos(cXyz& param_0) { + u16 idx = mIdx; - daNpcF_decIdx(mpRoomPath->m_num,ret,mpRoomPath->m_closed & 1, field_0x02); + int ret = daNpcF_decIdx(mpRoomPath->m_num, idx, chkClose(), field_0x02); - int idx = mIdx; - points = mpRoomPath->m_points; - - f32 x = points[mIdx].m_position.x; - f32 y = points[mIdx].m_position.y; - f32 z = points[mIdx].m_position.z; - - mPosition.x = x; - mPosition.y = y; - mPosition.z = z; + param_0 = getPntPos(idx); + return ret; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcF_Path_c::getBeforePos(cXyz& param_0) { - nofralloc -#include "asm/d/a/d_a_npc/getBeforePos__13daNpcF_Path_cFR4cXyz.s" -} -#pragma pop -#endif /* 80150D44-80150DE0 14B684 009C+00 0/0 0/0 1/1 .text getNextPos__13daNpcF_Path_cFR4cXyz */ -// many regalloc issues -#ifdef NONMATCHING -void daNpcF_Path_c::getNextPos(cXyz& param_0) { - u16 ret = mIdx; - dStage_dPnt_c* points; +int daNpcF_Path_c::getNextPos(cXyz& param_0) { + u16 idx = mIdx; - daNpcF_incIdx(mpRoomPath->m_num,ret,mpRoomPath->m_closed & 1, field_0x02); + int ret = daNpcF_incIdx(mpRoomPath->m_num, idx, chkClose(), field_0x02); - int idx = mIdx; - points = mpRoomPath->m_points; - - f32 x = points[mIdx].m_position.x; - f32 y = points[mIdx].m_position.y; - f32 z = points[mIdx].m_position.z; - - mPosition.x = x; - mPosition.y = y; - mPosition.z = z; + param_0 = getPntPos(idx); + return ret; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcF_Path_c::getNextPos(cXyz& param_0) { - nofralloc -#include "asm/d/a/d_a_npc/getNextPos__13daNpcF_Path_cFR4cXyz.s" -} -#pragma pop -#endif /* 80150DE0-80150EB4 14B720 00D4+00 0/0 0/0 16/16 .text getDstPos__13daNpcF_Path_cF4cXyzR4cXyz */ -#ifdef NONMATCHING int daNpcF_Path_c::getDstPos(cXyz i_pos1, cXyz& i_pos2) { int ret = 0; - while (true) { - int curr_index = getIdx(); - cXyz* curr_room_pos = &mpRoomPath->m_points[curr_index].m_position; - - i_pos2.x = curr_room_pos->x; - i_pos2.y = curr_room_pos->y; - i_pos2.z = curr_room_pos->x; - - cXyz local_pos; - local_pos.x = i_pos1.x; - local_pos.y = i_pos1.y; - local_pos.z = i_pos1.z; + while (ret == 0) { + int curr_index; + i_pos2 = getPntPos(curr_index = getIdx()); - if (!chkPassed(local_pos)) { break; }; + if (!chkPassed(i_pos1)) { break; }; if (setNextIdx()) { ret = 1; } - - if (ret != 0) { - return ret; - } } - return 0; + return ret; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daNpcF_Path_c::getDstPos(cXyz param_0, cXyz& param_1) { - nofralloc -#include "asm/d/a/d_a_npc/getDstPos__13daNpcF_Path_cF4cXyzR4cXyz.s" -} -#pragma pop -#endif /* 80150EB4-80151038 14B7F4 0184+00 0/0 0/0 2/2 .text setNextIdxDst__13daNpcF_Path_cF4cXyz */ #pragma push @@ -4501,32 +4186,34 @@ SECTION_SDATA2 static f32 lit_9971 = 32.0f; void daNpcF_Lookat_c::setParam(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4, f32 param_5, f32 param_6, f32 param_7, f32 param_8, f32 param_9, f32 param_10, f32 param_11, s16 param_12, cXyz* param_13) { - f32 l_float0 = param_0; - f32 l_float1 = param_1; - f32 l_float2 = param_2; - f32 l_float3 = param_3; - u32 tmp = 0; - - if (!data_80450FEC) { - f32 value = FLOAT_LABEL(lit_9971); + static cXyz vec(0.0f, 0.0f, 32.0f); - // vec.set(0.0f,0.0f,value); - FLOAT_LABEL(data_80450FEC) = 1.0f; - } + field_0x00[0] = param_13[0]; + field_0x4c[0].x = cM_deg2s(-param_1) - 0x4000; + field_0x4c[0].y = cM_deg2s(param_2); + field_0x4c[0].z = 0; + field_0x64[0].x = cM_deg2s(-param_0) - 0x4000; + field_0x64[0].y = cM_deg2s(param_3); + field_0x64[0].z = 0; - field_0x00[0] = *param_13; - field_0x4c[0].set((cM_deg2s(-param_1) - 0x4000),cM_deg2s(param_2),0); - field_0x64[0].set((cM_deg2s(-param_0) - 0x4000),cM_deg2s(param_3),0); + field_0x00[1] = param_13[1]; + field_0x4c[1].set(-0x4000, 0, 0); + field_0x64[1].set(-0x4000, 0, 0); - field_0x00[1].set(param_12,param_12,param_12); - field_0x4c[1].set(cM_deg2s(-0x4000),param_8,param_8); - field_0x64[1].set(-0x4000,param_8,param_8); - - field_0x00[2].set(param_9,param_9,param_9); - field_0x4c[2].set(-0x4000,param_11,param_11); - field_0x64[2].set(-0x4000,param_11,param_11); + field_0x00[2] = param_13[2]; + field_0x4c[2].x = cM_deg2s(-param_9); + field_0x4c[2].y = cM_deg2s(param_10); + field_0x4c[2].z = 0; + field_0x64[2].x = cM_deg2s(-param_8); + field_0x64[2].y = cM_deg2s(param_11); + field_0x64[2].z = 0; + mDoMtx_stack_c::transS(field_0x00[2]); + mDoMtx_stack_c::YrotM(param_12); + mDoMtx_stack_c::multVec(&vec, &field_0x00[3]); + field_0x4c[3].set(0, 0, 0); + field_0x64[3].set(0, 0, 0); } #else #pragma push @@ -4544,43 +4231,51 @@ asm void daNpcF_Lookat_c::setParam(f32 param_0, f32 param_1, f32 param_2, f32 pa /* 80151350-801515D4 14BC90 0284+00 0/0 0/0 34/34 .text * calc__15daNpcF_Lookat_cFP10fopAc_ac_cPA4_fPP5csXyziii */ #ifdef NONMATCHING -void daNpcF_Lookat_c::calc(fopAc_ac_c* param_0, f32 (*param_1)[4], csXyz** param_2, int param_3, - int param_4, int param_5) { - int tmp = 0; - int tmp2; +void daNpcF_Lookat_c::calc(fopAc_ac_c* param_0, Mtx baseTransformMtx, csXyz** param_2, int param_3, + int param_4, int debug) { + cXyz local_a4[4]; + csXyz local_bc[4]; + cXyz local_c8; + f32 local_d8[4]; + f32 local_e8; + f32 angY; - if (field_0x30) { - initCalc(param_0,param_1,(cXyz*)param_2,*param_2,*param_1,(cXyz&)param_2,param_5); + if (mAttnPos) { + initCalc(param_0, baseTransformMtx, local_a4, local_bc, local_d8, local_c8, debug); for (int i = 2; i >= -1; i--) { - update((cXyz*)param_2,*param_2,(float*)param_4); + update(local_a4, local_bc, local_d8); if (0 <= i) { - calcMoveDisAngle(i,(cXyz*)param_2,*param_2,(cXyz&)param_2,param_4,param_5); + calcMoveDisAngle(i, local_a4, local_bc, local_c8, param_4, debug); } } setRotAngle(); - + } else { clrRotAngle(); } - tmp2 = 1; - - for (int i = 2; i >= -1; i-- ) { + int i,j; + for (i = 2, j = 1; i >= 0; i--, j++) { if (param_3) { - cLib_addCalc2((float*)param_2,(float)field_0x7c[0].y,0.25f,(0x800/ (float)tmp2)); - cLib_addCalc2((float*)param_2,(float)field_0x7c[0].y,0.25f,(0x800/ (float)tmp2)); - - if (0 < param_4 && (field_0x7c[0].y - param_2[i]->y) > 0.0f) { - param_2[i]->y = field_0x7c[0].y; - } - - if (0 < param_4 && (field_0x7c[0].y - param_2[i]->y) > 0.0f) { - param_2[i]->y = field_0x7c[0].y; - } - + *(param_2[i]) = mRotAngle[i]; } else { - param_2[8] = field_0x7c; + local_e8 = (f32)param_2[i]->x; + cLib_addCalc2(&local_e8, (f32)mRotAngle[i].x, 0.25f, (f32)(0x800 / j)); + param_2[i]->x = (s16)local_e8; + + local_e8 = (f32)param_2[i]->y; + angY = (f32)mRotAngle[i].y; + cLib_addCalc2(&local_e8, angY, 0.25f, (f32)(0x800 / j)); + if (param_4 > 0 && angY - local_e8 < 0.0f) { + local_e8 = angY; + } + if (param_4 < 0 && 0.0f < angY - local_e8) { + local_e8 = angY; + } + param_2[i]->y = (s16)local_e8; + + param_2[i]->z = 0; } } } @@ -4600,31 +4295,24 @@ asm void daNpcF_Lookat_c::calc(fopAc_ac_c* param_0, f32 (*param_1)[4], csXyz** p */ #ifdef NONMATCHING // regalloc -void daNpcF_Lookat_c::adjustMoveDisAngle(s16& param_0, s16 param_1, s16 param_2, s16 param_3) { - int tmp2 = param_1; - int tmp = tmp2 + param_0; - - - if (param_3 < tmp) { - if (tmp2 < param_3) { - param_0 -= (tmp - param_3); +void daNpcF_Lookat_c::adjustMoveDisAngle(s16& delta, s16 angle, s16 min, s16 max) { + int newAngle = angle + delta; + if (max < newAngle) { + if (angle < max) { + delta -= (newAngle - max); } else { - param_0 = 0; + delta = 0; } } - tmp2 += param_0; - - if (tmp2 >= param_2) { - return; + newAngle = angle + delta; + if (newAngle < min) { + if (min < angle) { + delta -= (newAngle - min); + } else { + delta = 0; + } } - - if (param_2 < param_1) { - param_0 -= (tmp2 - param_2); - return; - } - - param_0 = 0; } #else #pragma push @@ -4643,6 +4331,41 @@ SECTION_SDATA2 static f32 lit_10253 = 63.0f / 100.0f; /* 80151648-80151A54 14BF88 040C+00 1/1 0/0 0/0 .text * initCalc__15daNpcF_Lookat_cFP10fopAc_ac_cPA4_fP4cXyzP5csXyzPfR4cXyzi */ +#ifdef NONMATCHING +// matches except literals +void daNpcF_Lookat_c::initCalc(fopAc_ac_c* actor, Mtx baseTransformMtx, cXyz* param_2, + csXyz* param_3, f32* param_4, cXyz& param_5, int debug) { + Mtx mtx; + cXyz local_90; + cMtx_copy(baseTransformMtx, mtx); + mtx[0][3] = 0.0f; + mtx[1][3] = 0.0f; + mtx[2][3] = 0.0f; + mDoMtx_stack_c::copy(mtx); + mDoMtx_stack_c::inverse(); + cMtx_copy(mDoMtx_stack_c::get(), mtx); + mDoMtx_stack_c::transS(actor->current.pos); + mDoMtx_stack_c::concat(mtx); + for (int i = 0; i < 4; i++) { + local_90 = field_0x00[i] - actor->current.pos; + mDoMtx_stack_c::multVec(&local_90, ¶m_2[i]); + } + local_90 = *mAttnPos - actor->current.pos; + mDoMtx_stack_c::multVec(&local_90, ¶m_5); + for (int i = 0; i < 3; i++) { + cXyz* vec = ¶m_2[i]; + local_90 = vec[1] - vec[0]; + param_4[i] = local_90.abs(); + param_3[i].setall(0); + param_3[i].x = -cM_atan2s(local_90.y, local_90.absXZ()); + if (fabsf(cM_ssin(param_3[i].x)) < 0.63) { + param_3[i].y = cM_atan2s(local_90.x, local_90.z); + } else { + param_3[i].y = 0; + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4652,8 +4375,30 @@ asm void daNpcF_Lookat_c::initCalc(fopAc_ac_c* param_0, f32 (*param_1)[4], cXyz* #include "asm/d/a/d_a_npc/initCalc__15daNpcF_Lookat_cFP10fopAc_ac_cPA4_fP4cXyzP5csXyzPfR4cXyzi.s" } #pragma pop +#endif /* 80151A54-80151B68 14C394 0114+00 1/1 0/0 0/0 .text update__15daNpcF_Lookat_cFP4cXyzP5csXyzPf */ +#ifdef NONMATCHING +// literals +void daNpcF_Lookat_c::update(cXyz* param_0, csXyz* param_1, f32* param_2) { + csXyz ang = csXyz::Zero; + cXyz vec; + Mtx mtx; + cXyz* pparam0i; + for (int i = 0; i < 3; i++) { + mDoMtx_stack_c::XYZrotS(param_1[i]); + cMtx_copy(mDoMtx_stack_c::get(), mtx); + pparam0i = ¶m_0[i]; + mDoMtx_stack_c::transS(pparam0i[0]); + ang.x += field_0x34[i].x; + ang.y += field_0x34[i].y; + mDoMtx_stack_c::ZXYrotM(ang); + mDoMtx_stack_c::concat(mtx); + vec.set(0.0f, 0.0f, param_2[i]); + mDoMtx_stack_c::multVec(&vec, &pparam0i[1]); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4662,6 +4407,7 @@ asm void daNpcF_Lookat_c::update(cXyz* param_0, csXyz* param_1, f32* param_2) { #include "asm/d/a/d_a_npc/update__15daNpcF_Lookat_cFP4cXyzP5csXyzPf.s" } #pragma pop +#endif /* 80151B68-80151F54 14C4A8 03EC+00 1/1 0/0 0/0 .text * calcMoveDisAngle__15daNpcF_Lookat_cFiP4cXyzP5csXyz4cXyzii */ @@ -4696,24 +4442,154 @@ asm void daNpcF_Lookat_c::clrRotAngle() { #pragma pop /* 80152014-801522AC 14C954 0298+00 0/0 0/0 38/38 .text execute__8daNpcF_cFv */ +#ifdef NONMATCHING +// will match once cLib_calcTimer is located correctly +BOOL daNpcF_c::execute() { + setParam(); + if (main()) { + fopAcM_posMoveF(this, mStts.GetCCMoveP()); + mAcch.CrrPos(dComIfG_Bgsp()); + field_0xa44 = mAcch.m_gnd; + field_0x980 = mAcch.GetGroundH(); + if (field_0x980 != -1e+9f) { + field_0x998 = daNpcF_getGroundAngle(&field_0xa44, field_0x8f0.y); + setEnvTevColor(); + setRoomNo(); + field_0x9b0 = dKy_pol_sound_get(&mAcch.m_gnd); + field_0x9e8 = dComIfGp_getReverb(mStts.GetRoomId()); + if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > field_0x980) { + field_0x9b0 = dKy_pol_sound_get(&mAcch.m_wtr); + } + } + } + playAllAnm(); + adjustShapeAngle(); + setAttnPos(); + cLib_chaseF(&field_0x978, 0.0f, 1.0f); + setCollisions(); + if (field_0x9f4 != 0) { + mAttentionInfo.mFlags |= 0x400000; + mAttentionInfo.mFlags |= 0x800000; + setHitodamaPrtcl(); + } + field_0x8f6 = field_0x8f0; + field_0x930 = 0; + field_0x9e9 = 0; + field_0x9ed = 0; + field_0x9eb = 0; + field_0x9ef = 0; + field_0x9f3 = 0; + for (int i = 0; i < 5; i++) { + if ((field_0x938 == 0 || field_0x934 != i) && field_0x93c[i] != 0 && cLib_calcTimer(&field_0x93c[i]) == 0) { + field_0x82c[i].remove(); + } + } + if (field_0x954 != 0) { + cLib_calcTimer(&field_0x954); + } + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcF_c::execute() { +asm BOOL daNpcF_c::execute() { nofralloc #include "asm/d/a/d_a_npc/execute__8daNpcF_cFv.s" } #pragma pop +#endif /* 801522AC-80152614 14CBEC 0368+00 0/0 0/0 33/33 .text draw__8daNpcF_cFiifP11_GXColorS10i */ +#ifdef NONMATCHING +// literals +BOOL daNpcF_c::draw(int param_0, int param_1, f32 param_2, _GXColorS10* param_3, int param_4) { + f32 fVar1, frame; + J3DModel* model = mMcaMorf->getModel(); + J3DModelData* modelData = model->getModelData(); + field_0x9f3 = 1; + + if (!checkHide()) { + if (!param_4 && field_0x954 != 0 && field_0x958 != 0) { + fVar1 = (f32)field_0x954 / (f32)field_0x958; + } else { + fVar1 = 0.0f; + } + if (cM3d_IsZero_inverted(fVar1)) { + mTevStr.mFogColor.r = (s16)(fVar1 * 20.0f); + mTevStr.mFogColor.g = 0; + } else if (param_0) { + mTevStr.mFogColor.g = 20; + mTevStr.mFogColor.r = 0; + } else if (param_3 != NULL) { + mTevStr.mFogColor.r = param_3->r; + mTevStr.mFogColor.g = param_3->g; + mTevStr.mFogColor.b = param_3->b; + mTevStr.mFogColor.a = param_3->a; + } else { + mTevStr.mFogColor.g = 0; + mTevStr.mFogColor.r = 0; + } + + if (field_0x9f4) { + g_env_light.settingTevStruct(4, ¤t.pos, &mTevStr); + } else { + g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); + } + g_env_light.setLightTevColorType_MAJI(model->getModelData(), &mTevStr); + + if (!drawDbgInfo()) { + if (mAnmFlags & ANM_PLAY_BTP) { + mBtpAnm.entry(&modelData->getMaterialTable(), (s16)mBtpAnm.getFrame()); + } + if (mAnmFlags & ANM_PLAY_BTK) { + frame = mBtkAnm.getFrame(); + mBtkAnm.entry(&modelData->getMaterialTable(), frame); + } + if (mAnmFlags & ANM_PLAY_BRK) { + frame = mBrkAnm.getFrame(); + mBrkAnm.entry(&modelData->getMaterialTable(), frame); + } + + if (param_1) { + fopAcM_setEffectMtx(this, modelData); + } + + if (field_0x9f4) { + dComIfGd_setListDark(); + mMcaMorf->entryDL(); + dComIfGd_setList(); + } else { + mMcaMorf->entryDL(); + } + + if (mAnmFlags & ANM_PLAY_BTP) { + mBtpAnm.remove(modelData); + } + if (mAnmFlags & ANM_PLAY_BTK) { + mBtkAnm.remove(modelData); + } + if (mAnmFlags & ANM_PLAY_BRK) { + mBrkAnm.remove(modelData); + } + + field_0x9a0 = dComIfGd_setShadow(field_0x9a0, true, model, ¤t.pos, param_2, 20.0f, current.pos.y, field_0x980, field_0xa44, &mTevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); + + drawOtherMdls(); + } + } + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcF_c::draw(int param_0, int param_1, f32 param_2, _GXColorS10* param_3, int param_4) { +asm BOOL daNpcF_c::draw(int param_0, int param_1, f32 param_2, _GXColorS10* param_3, int param_4) { nofralloc #include "asm/d/a/d_a_npc/draw__8daNpcF_cFiifP11_GXColorS10i.s" } #pragma pop +#endif /* 80152614-80152654 14CF54 0040+00 0/0 0/0 13/13 .text * tgHitCallBack__8daNpcF_cFP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ @@ -4729,7 +4605,7 @@ asm void daNpcF_c::tgHitCallBack(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fop /* ############################################################################################## */ /* 804257E8-80425978 052508 0190+00 4/4 0/0 0/0 .bss mFindActorPList__8daNpcF_c */ -u8 daNpcF_c::mFindActorPList[400]; +fopAc_ac_c* daNpcF_c::mFindActorPList[100]; /* 80450FF0-80450FF4 0004F0 0004+00 4/4 0/0 0/0 .sbss mFindCount__8daNpcF_c */ s32 daNpcF_c::mFindCount; @@ -4794,105 +4670,74 @@ asm void daNpcF_c::initialize() { /* 80152B2C-80152B68 14D46C 003C+00 0/0 0/0 69/69 .text getTrnsfrmKeyAnmP__8daNpcF_cFPci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcF_c::getTrnsfrmKeyAnmP(char* param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_npc/getTrnsfrmKeyAnmP__8daNpcF_cFPci.s" +J3DAnmTransformKey* daNpcF_c::getTrnsfrmKeyAnmP(char* arcName, int fileIdx) { + return (J3DAnmTransformKey*)dComIfG_getObjectRes(arcName, fileIdx); } -#pragma pop /* 80152B68-80152BA4 14D4A8 003C+00 0/0 0/0 31/31 .text getTexPtrnAnmP__8daNpcF_cFPci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcF_c::getTexPtrnAnmP(char* param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_npc/getTexPtrnAnmP__8daNpcF_cFPci.s" +J3DAnmTexPattern* daNpcF_c::getTexPtrnAnmP(char* arcName, int fileIdx) { + return (J3DAnmTexPattern*)dComIfG_getObjectRes(arcName, fileIdx); } -#pragma pop /* 80152BA4-80152BE0 14D4E4 003C+00 0/0 0/0 50/50 .text getTexSRTKeyAnmP__8daNpcF_cFPci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcF_c::getTexSRTKeyAnmP(char* param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_npc/getTexSRTKeyAnmP__8daNpcF_cFPci.s" +J3DAnmTextureSRTKey* daNpcF_c::getTexSRTKeyAnmP(char* arcName, int fileIdx) { + return (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(arcName, fileIdx); } -#pragma pop /* 80152BE0-80152C1C 14D520 003C+00 0/0 0/0 2/2 .text getTevRegKeyAnmP__8daNpcF_cFPci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcF_c::getTevRegKeyAnmP(char* param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_npc/getTevRegKeyAnmP__8daNpcF_cFPci.s" +J3DAnmTevRegKey* daNpcF_c::getTevRegKeyAnmP(char* arcName, int fileIdx) { + return (J3DAnmTevRegKey*)dComIfG_getObjectRes(arcName, fileIdx); } -#pragma pop /* 80152C1C-80152C80 14D55C 0064+00 0/0 0/0 38/38 .text * setMcaMorfAnm__8daNpcF_cFP18J3DAnmTransformKeyffiii */ +#ifdef NONMATCHING +// literals +BOOL daNpcF_c::setMcaMorfAnm(J3DAnmTransformKey* i_anm, f32 i_rate, f32 i_morf, int i_attr, + int i_start, int i_end) { + mMcaMorf->setAnm(i_anm, i_attr, i_morf, i_rate, (f32)i_start, (f32)i_end); + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcF_c::setMcaMorfAnm(J3DAnmTransformKey* param_0, f32 param_1, f32 param_2, int param_3, +asm BOOL daNpcF_c::setMcaMorfAnm(J3DAnmTransformKey* param_0, f32 param_1, f32 param_2, int param_3, int param_4, int param_5) { nofralloc #include "asm/d/a/d_a_npc/setMcaMorfAnm__8daNpcF_cFP18J3DAnmTransformKeyffiii.s" } #pragma pop +#endif /* 80152C80-80152CC4 14D5C0 0044+00 0/0 0/0 25/25 .text * setBckAnm__8daNpcF_cFP15J3DAnmTransformfiiib */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcF_c::setBckAnm(J3DAnmTransform* param_0, f32 param_1, int param_2, int param_3, - int param_4, bool param_5) { - nofralloc -#include "asm/d/a/d_a_npc/setBckAnm__8daNpcF_cFP15J3DAnmTransformfiiib.s" +BOOL daNpcF_c::setBckAnm(J3DAnmTransform* i_bck, f32 i_rate, int i_attr, int i_start, + int i_end, bool i_modify) { + return mBckAnm.init(i_bck, true, i_attr, i_rate, (s16)i_start, (s16)i_end, i_modify); } -#pragma pop /* 80152CC4-80152D04 14D604 0040+00 0/0 0/0 32/32 .text * setBtpAnm__8daNpcF_cFP16J3DAnmTexPatternP12J3DModelDatafi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcF_c::setBtpAnm(J3DAnmTexPattern* param_0, J3DModelData* param_1, f32 param_2, - int param_3) { - nofralloc -#include "asm/d/a/d_a_npc/setBtpAnm__8daNpcF_cFP16J3DAnmTexPatternP12J3DModelDatafi.s" +BOOL daNpcF_c::setBtpAnm(J3DAnmTexPattern* i_btp, J3DModelData* i_modelData, f32 i_rate, + int i_attr) { + return mBtpAnm.init(i_modelData, i_btp, true, i_attr, i_rate, 0, -1); } -#pragma pop /* 80152D04-80152D44 14D644 0040+00 0/0 0/0 26/26 .text * setBtkAnm__8daNpcF_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcF_c::setBtkAnm(J3DAnmTextureSRTKey* param_0, J3DModelData* param_1, f32 param_2, - int param_3) { - nofralloc -#include "asm/d/a/d_a_npc/setBtkAnm__8daNpcF_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi.s" +BOOL daNpcF_c::setBtkAnm(J3DAnmTextureSRTKey* i_btk, J3DModelData* i_modelData, f32 i_rate, + int i_attr) { + return mBtkAnm.init(i_modelData, i_btk, true, i_attr, i_rate, 0, -1); } -#pragma pop /* 80152D44-80152D84 14D684 0040+00 0/0 0/0 2/2 .text * setBrkAnm__8daNpcF_cFP15J3DAnmTevRegKeyP12J3DModelDatafi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcF_c::setBrkAnm(J3DAnmTevRegKey* param_0, J3DModelData* param_1, f32 param_2, - int param_3) { - nofralloc -#include "asm/d/a/d_a_npc/setBrkAnm__8daNpcF_cFP15J3DAnmTevRegKeyP12J3DModelDatafi.s" +BOOL daNpcF_c::setBrkAnm(J3DAnmTevRegKey* i_brk, J3DModelData* i_modelData, f32 i_rate, + int i_attr) { + return mBrkAnm.init(i_modelData, i_brk, true, i_attr, i_rate, 0, -1); } -#pragma pop /* 80152D84-80152DE0 14D6C4 005C+00 1/1 0/0 40/40 .text setEnvTevColor__8daNpcF_cFv */ #pragma push @@ -4915,37 +4760,192 @@ asm void daNpcF_c::setRoomNo() { #pragma pop /* 80152E24-80152EC4 14D764 00A0+00 1/1 0/0 0/0 .text chkEndAnm__8daNpcF_cFf */ +#ifdef NONMATCHING +BOOL daNpcF_c::chkEndAnm(f32 param_0) { + switch (mMcaMorf->getPlayMode()) { + case 2: + return mMcaMorf->isLoop(); + case 0: + case 1: + bool b = false; + bool ret = false; + if (mMcaMorf->isStop() && mMcaMorf->getPlaySpeed() == 0.0f) { + b = true; + } + if (b && param_0 != 0.0f) { + ret = true; + } + return ret; + case 3: + default: + return false; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcF_c::chkEndAnm(f32 param_0) { +asm BOOL daNpcF_c::chkEndAnm(f32 param_0) { nofralloc #include "asm/d/a/d_a_npc/chkEndAnm__8daNpcF_cFf.s" } #pragma pop +#endif /* 80152EC4-80152F40 14D804 007C+00 1/1 0/0 0/0 .text chkEndAnm__8daNpcF_cFP12J3DFrameCtrlf */ +/** + * Check whether an animation has ended or looped. + * @param frameCtrl The frame controller for the animation. + * @param prevRate The previous rate of animation. + * @return `true` if the animation has just stopped or just looped, `false` otherwise. Returns `false` if the animation is two-way (attribute 3 or 4). + */ +#ifdef NONMATCHING +BOOL daNpcF_c::chkEndAnm(J3DFrameCtrl* frameCtrl, f32 prevRate) { + switch (frameCtrl->getAttribute()) { + case 2: + return (frameCtrl->getState() >> 1) & 1; + case 0: + case 1: + bool b = false; + bool ret = false; + if (frameCtrl->getState() & 1 && frameCtrl->getRate() == 0.0f) { + b = true; + } + if (b && prevRate != 0.0f) { + ret = true; + } + return ret; + case 3: + default: + return false; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcF_c::chkEndAnm(J3DFrameCtrl* param_0, f32 param_1) { +asm BOOL daNpcF_c::chkEndAnm(J3DFrameCtrl* frameCtrl, f32 prevRate) { nofralloc #include "asm/d/a/d_a_npc/chkEndAnm__8daNpcF_cFP12J3DFrameCtrlf.s" } #pragma pop +#endif /* 80152F40-80153150 14D880 0210+00 1/1 0/0 2/2 .text playAllAnm__8daNpcF_cFv */ +#ifdef NONMATCHING +// matches once template functions located correctly +BOOL daNpcF_c::playAllAnm() { + f32 rate; + if (!(mAnmFlags & ANM_PAUSE_EXPRESSION)) { + if (mAnmFlags & ANM_PLAY_BCK) { + rate = mBckAnm.getPlaySpeed(); + if (mAnmFlags & ANM_PAUSE_BTK) { + mBckAnm.setPlaySpeed(0.0f); + } + mBckAnm.play(); + if (chkEndAnm(mBckAnm.getFrameCtrl(), rate)) { + mExpressionLoops++; + } + mBckAnm.setPlaySpeed(rate); + } + if (mAnmFlags & ANM_PLAY_BTP) { + rate = mBtpAnm.getPlaySpeed(); + if (mAnmFlags & ANM_PAUSE_BTP) { + mBtpAnm.setPlaySpeed(0.0f); + } + mBtpAnm.play(); + mBtpAnm.setPlaySpeed(rate); + if (mAnmFlags & ANM_FLAG_800) { + if (chkEndAnm(mBtpAnm.getFrameCtrl(), rate)) { + field_0x964 = cLib_getRndValue(90, 90); + mBtpAnm.setPlaySpeed(0.0f); + } + } else { + field_0x964 = 0; + } + if (cLib_calcTimer(&field_0x964) == 0) { + mBtpAnm.setPlaySpeed(1.0f); + } + } + } + if (mAnmFlags & ANM_PLAY_MORF) { + rate = mMcaMorf->getPlaySpeed(); + if (mAnmFlags & ANM_PAUSE_MORF) { + mMcaMorf->setPlaySpeed(0.0f); + mMcaMorf->play(field_0x9b0, field_0x9e8); + mMcaMorf->setPlaySpeed(rate); + } else { + mMcaMorf->play(field_0x9b0, field_0x9e8); + if (chkEndAnm(rate)) { + motionLoops++; + } + } + } + if (mAnmFlags & ANM_PLAY_BTK) { + rate = mBtkAnm.getPlaySpeed(); + if (mAnmFlags & ANM_PAUSE_BTK) { + mBtkAnm.setPlaySpeed(0.0f); + } + if (!ctrlBtk()) { + mBtkAnm.play(); + } + mBtkAnm.setPlaySpeed(rate); + } + if (mAnmFlags & ANM_PLAY_BRK) { + rate = mBrkAnm.getPlaySpeed(); + if (mAnmFlags & ANM_PAUSE_BRK) { + mBrkAnm.setPlaySpeed(0.0f); + } + mBrkAnm.play(); + mBrkAnm.setPlaySpeed(rate); + } + mAnmFlags &= ~ANM_PAUSE_ALL; + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcF_c::playAllAnm() { +asm BOOL daNpcF_c::playAllAnm() { nofralloc #include "asm/d/a/d_a_npc/playAllAnm__8daNpcF_cFv.s" } #pragma pop +#endif /* 80153150-80153264 14DA90 0114+00 0/0 0/0 25/25 .text * playExpressionAnm__8daNpcF_cFPPPQ28daNpcF_c18daNpcF_anmPlayData */ +/** + * Set the expression animation. + * @param anm The animation data, a two-dimensional array of data pointers, indexed first by + * the expression index and second by the expression phase. Each piece of data consists of + * an animation index for that phase of the expression, a `morf`, and the number of loops + * before moving on to the next phase (or 0 for the last phase). + */ +#ifdef NONMATCHING +void daNpcF_c::playExpressionAnm(daNpcF_c::daNpcF_anmPlayData*** anm) { + daNpcF_anmPlayData* playData = NULL; + if (anm[mExpression] != NULL) { + playData = anm[mExpression][mExpressionPhase]; + } + if (playData != NULL) { + if (mExpressionPrevPhase == mExpressionPhase && playData->numLoops > 0 && playData->numLoops <= mExpressionLoops) { + mExpressionPhase++; + playData = anm[mExpression][mExpressionPhase]; + } + if (playData != NULL && mExpressionPrevPhase != mExpressionPhase) { + setExpressionAnm(playData->idx, true); + f32 morf = playData->morf; + if (mExpressionPhase == 0 && 0.0f <= mExpressionMorfOverride) { + morf = mExpressionMorfOverride; + } + mExpressionMorf = morf; + mMcaMorf->setMorf(morf); + } + } + mExpressionPrevPhase = mExpressionPhase; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4954,9 +4954,41 @@ asm void daNpcF_c::playExpressionAnm(daNpcF_c::daNpcF_anmPlayData*** param_0) { #include "asm/d/a/d_a_npc/playExpressionAnm__8daNpcF_cFPPPQ28daNpcF_c18daNpcF_anmPlayData.s" } #pragma pop +#endif /* 80153264-8015337C 14DBA4 0118+00 0/0 0/0 37/37 .text * playMotionAnm__8daNpcF_cFPPPQ28daNpcF_c18daNpcF_anmPlayData */ +/** + * Set the motion animation. + * @param anm The animation data, a two-dimensional array of data pointers, indexed first by + * the motion index and second by the motion phase. Each piece of data consists of + * an animation index for that phase of the motion, a `morf`, and the number of loops + * before moving on to the next phase (or 0 for the last phase). + */ +#ifdef NONMATCHING +void daNpcF_c::playMotionAnm(daNpcF_c::daNpcF_anmPlayData*** anm) { + daNpcF_anmPlayData* playData = NULL; + if (anm[mMotion] != NULL) { + playData = anm[mMotion][mMotionPhase]; + } + if (playData != NULL) { + if (mMotionPrevPhase == mMotionPhase && playData->numLoops > 0 && playData->numLoops <= motionLoops) { + mMotionPhase++; + playData = anm[mMotion][mMotionPhase]; + } + if (playData != NULL && mMotionPrevPhase != mMotionPhase) { + setMotionAnm(playData->idx, 0.0f); + f32 morf = playData->morf; + if (mMotionPhase == 0 && 0.0f <= mMotionMorfOverride) { + morf = mMotionMorfOverride; + } + mExpressionMorf = 0.0f; + mMcaMorf->setMorf(morf); + } + } + mMotionPrevPhase = mMotionPhase; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4965,8 +4997,56 @@ asm void daNpcF_c::playMotionAnm(daNpcF_c::daNpcF_anmPlayData*** param_0) { #include "asm/d/a/d_a_npc/playMotionAnm__8daNpcF_cFPPPQ28daNpcF_c18daNpcF_anmPlayData.s" } #pragma pop +#endif /* 8015337C-80153578 14DCBC 01FC+00 0/0 0/0 34/34 .text setLookatMtx__8daNpcF_cFiPif */ +/** + * Compute the animation matrix for one of the "lookat" joints (lower body, upper body, head). + * This matrix is applied to the matrix in `mDoMtx_stack_c::now`. + * @param jointNo The index of the joint in question. + * @param jointList An array of the three indices of the joints for the lower body, the upper body, and the head. + * @param param_2 Unknown. + */ +#ifdef NONMATCHING +// literals +void daNpcF_c::setLookatMtx(int jointNo, int* jointList, f32 param_2) { + cXyz pos; + Mtx baseMtx, invParentMtx; + + if (jointList[0] == jointNo || jointList[1] == jointNo || jointList[2] == jointNo) { + field_0x91a[1].x = (s16)((f32)field_0x91a[2].x * param_2); + field_0x91a[1].y = (s16)((f32)field_0x91a[2].y * param_2); + field_0x91a[1].z = (s16)((f32)field_0x91a[2].z * param_2); + + cMtx_copy(mDoMtx_stack_c::get(), baseMtx); + pos.set(baseMtx[0][3], baseMtx[1][3], baseMtx[2][3]); + baseMtx[0][3] = baseMtx[1][3] = baseMtx[2][3] = 0.0f; + + mDoMtx_stack_c::ZXYrotS(field_0x8f0); + if (jointList[0] != jointNo) { + if (jointList[1] == jointNo) { + mDoMtx_stack_c::ZXYrotM(field_0x91a[0]); + } else if (jointList[2] == jointNo) { + mDoMtx_stack_c::ZXYrotM(field_0x91a[1]); + } + } + mDoMtx_stack_c::inverse(); + cMtx_copy(mDoMtx_stack_c::get(), invParentMtx); + + mDoMtx_stack_c::transS(pos); + mDoMtx_stack_c::XYZrotM(field_0x8f0); + if (jointList[0] == jointNo) { + mDoMtx_stack_c::ZXYrotM(field_0x91a[0]); + } else if (jointList[1] == jointNo) { + mDoMtx_stack_c::ZXYrotM(field_0x91a[1]); + } else if (jointList[2] == jointNo) { + mDoMtx_stack_c::ZXYrotM(field_0x91a[2]); + } + mDoMtx_stack_c::concat(invParentMtx); + mDoMtx_stack_c::concat(baseMtx); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4975,6 +5055,7 @@ asm void daNpcF_c::setLookatMtx(int param_0, int* param_1, f32 param_2) { #include "asm/d/a/d_a_npc/setLookatMtx__8daNpcF_cFiPif.s" } #pragma pop +#endif /* 80153578-80153658 14DEB8 00E0+00 0/0 0/0 13/13 .text hitChk2__8daNpcF_cFP8dCcD_Cylii */ @@ -5006,14 +5087,57 @@ asm void daNpcF_c::setDamage(int param_0, int param_1, int param_2) { /* 80153718-8015387C 14E058 0164+00 0/0 0/0 81/81 .text ctrlMsgAnm__8daNpcF_cFRiRiP10fopAc_ac_ci */ +#ifdef NONMATCHING +// will match when cLib_calcTimer located correctly +int daNpcF_c::ctrlMsgAnm(int& expression, int& motion, fopAc_ac_c* param_2, int param_3) { + expression = -1; + motion = -1; + if (param_3 || mEvtInfo.checkCommandTalk() || mCutIndex != -1) { + fopAc_ac_c* talkPartner = dComIfGp_event_getTalkPartner(); + if (talkPartner == param_2) { + fopAc_ac_c* actor = dMsgObject_c::getActor(); + if (actor->mEvtInfo.mCommand == 2 || actor->mEvtInfo.mCommand == 3) { + field_0x9a4 = (profile_method_class*)-1; + } else if (actor->mEvtInfo.mCommand == 6) { + if (actor->mSubMtd != field_0x9a4) { + expression = dComIfGp_getMesgFaceAnimeAttrInfo(); + motion = dComIfGp_getMesgAnimeAttrInfo(); + field_0x9a4 = actor->mSubMtd; + } + if (dMsgObject_c::isMouthCheck()) { + mAnmFlags &= ~ANM_PAUSE_EXPRESSION; + } else { + mAnmFlags |= ANM_PAUSE_EXPRESSION; + } + field_0x950 = 20; + } else { + if (mAnmFlags & ANM_PAUSE_EXPRESSION) { + mAnmFlags &= ~ANM_PAUSE_EXPRESSION; + } + field_0x9a4 = (profile_method_class*)-1; + } + } else { + field_0x9a4 = (profile_method_class*)-1; + if (field_0x950 != 0) { + field_0x950 = 1; + } + } + } + if (!param_3) { + cLib_calcTimer(&field_0x950); + } + return field_0x950; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcF_c::ctrlMsgAnm(int& param_0, int& param_1, fopAc_ac_c* param_2, int param_3) { +asm int daNpcF_c::ctrlMsgAnm(int& param_0, int& param_1, fopAc_ac_c* param_2, int param_3) { nofralloc #include "asm/d/a/d_a_npc/ctrlMsgAnm__8daNpcF_cFRiRiP10fopAc_ac_ci.s" } #pragma pop +#endif /* 8015387C-80153954 14E1BC 00D8+00 0/0 0/0 45/45 .text orderEvent__8daNpcF_cFiPcUsUsUcUs */ @@ -5043,7 +5167,7 @@ asm void daNpcF_c::changeEvent(char* param_0, char* param_1, u16 param_2, u16 pa #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcF_c::chkActorInSight(fopAc_ac_c* param_0, f32 param_1) { +asm BOOL daNpcF_c::chkActorInSight(fopAc_ac_c* param_0, f32 param_1) { nofralloc #include "asm/d/a/d_a_npc/chkActorInSight__8daNpcF_cFP10fopAc_ac_cf.s" } @@ -5051,14 +5175,46 @@ asm void daNpcF_c::chkActorInSight(fopAc_ac_c* param_0, f32 param_1) { /* 80153A78-80153BDC 14E3B8 0164+00 1/1 0/0 0/0 .text * chkActorInArea__8daNpcF_cFP10fopAc_ac_c4cXyz4cXyzs */ +/** + * Check whether an actor is in an elliptic cylinder region. + * @param actor The actor to check. + * @param center The center of the cylinder. + * @param box The dimensions of the bounding box. + * @param angY The angle to align the axis of the ellipse. + * @return Whether the actor's position vector lies in the elliptic cylinder. + */ +#ifdef NONMATCHING +// literals +BOOL daNpcF_c::chkActorInArea(fopAc_ac_c* actor, cXyz center, cXyz box, s16 angY) { + cXyz disp, relPos; + BOOL ret = false; + + mDoMtx_stack_c::YrotS(-angY); + mDoMtx_stack_c::transM(-center.x, -center.y, -center.z); + mDoMtx_stack_c::multVec(&actor->current.pos, &relPos); + + f32 boxX = fabsf(box.x); + f32 boxZ = fabsf(box.z); + f32 posX = fabsf(relPos.x); + f32 posZ = fabsf(relPos.z); + disp = center - actor->current.pos; + + if ((posX * posX) / (boxX * boxX) + (posZ * posZ) / (boxZ * boxZ) <= 1.0f && -box.y < disp.y && disp.y < box.y) { + ret = true; + } + + return ret; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcF_c::chkActorInArea(fopAc_ac_c* param_0, cXyz param_1, cXyz param_2, s16 param_3) { +asm BOOL daNpcF_c::chkActorInArea(fopAc_ac_c* param_0, cXyz param_1, cXyz param_2, s16 param_3) { nofralloc #include "asm/d/a/d_a_npc/chkActorInArea__8daNpcF_cFP10fopAc_ac_c4cXyz4cXyzs.s" } #pragma pop +#endif /* ############################################################################################## */ /* 804534AC-804534B0 001AAC 0004+00 3/3 0/0 0/0 .sdata2 @11253 */ @@ -5066,14 +5222,39 @@ SECTION_SDATA2 static f32 lit_11253 = 0.5f; /* 80153BDC-80153D1C 14E51C 0140+00 0/0 0/0 25/25 .text * chkActorInAttnArea__8daNpcF_cFP10fopAc_ac_cP10fopAc_ac_ci */ +/** + * Check whether an actor lies within another actor's region of attention. + * @param actorCheck The actor to check. + * @param actorAttn The actor whose attention region we are using. + * @param distIndex An index into the distance table to determine the size of the attention region. + * @return Whether `actorCheck` is within the region of attention of `actorAttn`. + */ +#ifdef NONMATCHING +BOOL daNpcF_c::chkActorInAttnArea(fopAc_ac_c* actorCheck, fopAc_ac_c* actorAttn, int distIndex) { + BOOL ret = false; + f32 fv5 = dAttention_c::getDistTable(distIndex)->field_0x10 * -1.0f; + f32 fv4 = dAttention_c::getDistTable(distIndex)->field_0xc * -1.0f; + cXyz attnCtr = actorAttn->current.pos; + cXyz attnBox; + attnBox.x = dAttention_c::getDistTable(distIndex)->field_0x0; + attnBox.y = (fabsf(fv5) + fabsf(fv4)) * 0.5f; + attnBox.z = dAttention_c::getDistTable(distIndex)->field_0x0; + attnCtr.y = attnBox.y + (attnCtr.y + fv4); + if (chkActorInArea(actorCheck, attnCtr, attnBox, actorAttn->shape_angle.y)) { + ret = true; + } + return ret; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcF_c::chkActorInAttnArea(fopAc_ac_c* param_0, fopAc_ac_c* param_1, int param_2) { +asm BOOL daNpcF_c::chkActorInAttnArea(fopAc_ac_c* actorCheck, fopAc_ac_c* actorAttn, int param_2) { nofralloc #include "asm/d/a/d_a_npc/chkActorInAttnArea__8daNpcF_cFP10fopAc_ac_cP10fopAc_ac_ci.s" } #pragma pop +#endif /* 80153D1C-80153D84 14E65C 0068+00 0/0 0/0 118/118 .text initTalk__8daNpcF_cFiPP10fopAc_ac_c */ int daNpcF_c::initTalk(int param_0, fopAc_ac_c** param_1) { @@ -5090,7 +5271,7 @@ int daNpcF_c::initTalk(int param_0, fopAc_ac_c** param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcF_c::talkProc(int* param_0, int param_1, fopAc_ac_c** param_2) { +asm BOOL daNpcF_c::talkProc(int* param_0, int param_1, fopAc_ac_c** param_2) { nofralloc #include "asm/d/a/d_a_npc/talkProc__8daNpcF_cFPiiPP10fopAc_ac_c.s" } @@ -5100,7 +5281,7 @@ asm void daNpcF_c::talkProc(int* param_0, int param_1, fopAc_ac_c** param_2) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcF_c::turn(s16 param_0, f32 param_1, int param_2) { +asm BOOL daNpcF_c::turn(s16 param_0, f32 param_1, int param_2) { nofralloc #include "asm/d/a/d_a_npc/turn__8daNpcF_cFsfi.s" } @@ -5129,13 +5310,13 @@ asm void daNpcF_c::setAngle(s16 param_0) { /* 80154278-801542A0 14EBB8 0028+00 0/0 0/0 36/36 .text getDistTableIdx__8daNpcF_cFii */ u8 daNpcF_getDistTableIdx(int param_0, int param_1); //fwd dec to get a match -void daNpcF_c::getDistTableIdx(int param_0, int param_1) { - daNpcF_getDistTableIdx(param_0,param_1); +u8 daNpcF_c::getDistTableIdx(int param_0, int param_1) { + return daNpcF_getDistTableIdx(param_0,param_1); } /* 801542A0-8015436C 14EBE0 00CC+00 0/0 0/0 6/6 .text getEvtAreaTagP__8daNpcF_cFii */ #ifdef NONMATCHING -int daNpcF_c::getEvtAreaTagP(int param_0, int param_1) { +fopAc_ac_c* daNpcF_c::getEvtAreaTagP(int param_0, int param_1) { mFindCount = 0; mSrchActorName = PROC_TAG_EVTAREA; fpcM_Search((fpcLyIt_JudgeFunc)this->srchActor,(void*)this); @@ -5152,7 +5333,7 @@ int daNpcF_c::getEvtAreaTagP(int param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int daNpcF_c::getEvtAreaTagP(int param_0, int param_1) { +asm fopAc_ac_c* daNpcF_c::getEvtAreaTagP(int param_0, int param_1) { nofralloc #include "asm/d/a/d_a_npc/getEvtAreaTagP__8daNpcF_cFii.s" } @@ -5165,59 +5346,139 @@ SECTION_SDATA2 static f32 lit_11605 = 450.0f; /* 8015436C-80154730 14ECAC 03C4+00 0/0 0/0 12/12 .text getAttnActorP__8daNpcF_cFiPFPvPv_Pvffffsii */ +#ifdef NONMATCHING +fopAc_ac_c* daNpcF_c::getAttnActorP(int param_0, void* (*param_1)(void*, void*), f32 param_2, + f32 param_3, f32 param_4, f32 param_5, s16 param_6, int param_7, + int param_8) { + fopAc_ac_c* actor = NULL; + int rnd = 450 + (int)((cM_rnd() - 0.5f) * 450.0f); + int rnd2 = param_7 + (int)((cM_rnd() - 0.5f) * param_7); + int r28 = 0; + f32 minDistance = 1000000000.0f; + if (field_0x938) { + daPy_py_c* player = daPy_getPlayerActorClass(); + fopAcM_SearchByID(player->getGrabActorID(), &actor); + if (field_0x82c[field_0x934].getActorP() != actor) { + func_8014D348(&field_0x938); + } + actor = field_0x82c[field_0x934].getActorP(); + } + if (actor == NULL) { + field_0x938 = 0; + if (param_0) { + param_2 = fopAcM_searchActorDistanceXZ(this, daPy_getPlayerActorClass()); + } + mFindCount = 0; + fpcEx_Search((fpcLyIt_JudgeFunc)param_1, this); + for (int i = 0; i < mFindCount; i++) { + if (chkPointInArea(getAttentionPos(mFindActorPList[i]), mAttentionInfo.mPosition, param_2, param_3, param_4, 0) && + chkActorInSight2(mFindActorPList[i], param_5, param_6)) { + int j; + for (j = 0; j < 5; j++) { + // !@Bug I think field_0x93c index should be j + if (mFindActorPList[i] == field_0x82c[j].getActorP() && field_0x93c[i] != 0) { + break; + } + } + + if (j == 5) { + f32 dist2 = fopAcM_searchActorDistanceXZ(this, mFindActorPList[i]); + if (dist2 < minDistance) { + actor = mFindActorPList[i]; + minDistance = dist2; + } + } + } + } + + if (actor == NULL && param_0) { + daPy_py_c* player = daPy_getPlayerActorClass(); + fopAcM_SearchByID(player->getGrabActorID(), &actor); + r28 = 1; + } + if (actor != NULL) { + int minInd, j;; + int dist3 = 900; + minInd = 0; + for (j = 0; j < 5; j++) { + if (field_0x93c[j] < dist3) { + dist3 = field_0x93c[j]; + minInd = j; + } + } + field_0x82c[minInd].entry(actor); + if (param_8) { + field_0x93c[minInd] = r28 != 1 ? 0 : rnd; + } else { + field_0x93c[minInd] = 0; + } + + field_0x938 = (r28 != 1) ? rnd2 : 30; + field_0x934 = minInd; + } + } + if (actor == NULL) { + field_0x938 = 0; + } + return actor; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcF_c::getAttnActorP(int param_0, void* (*param_1)(void*, void*), f32 param_2, +asm fopAc_ac_c* daNpcF_c::getAttnActorP(int param_0, void* (*param_1)(void*, void*), f32 param_2, f32 param_3, f32 param_4, f32 param_5, s16 param_6, int param_7, int param_8) { nofralloc #include "asm/d/a/d_a_npc/getAttnActorP__8daNpcF_cFiPFPvPv_Pvffffsii.s" } #pragma pop +#endif /* 80154730-80154834 14F070 0104+00 2/2 0/0 0/0 .text chkActorInSight2__8daNpcF_cFP10fopAc_ac_cfs */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcF_c::chkActorInSight2(fopAc_ac_c* param_0, f32 param_1, s16 param_2) { +asm BOOL daNpcF_c::chkActorInSight2(fopAc_ac_c* param_0, f32 param_1, s16 param_2) { nofralloc #include "asm/d/a/d_a_npc/chkActorInSight2__8daNpcF_cFP10fopAc_ac_cfs.s" } #pragma pop /* 80154834-801548F4 14F174 00C0+00 2/2 0/0 0/0 .text chkPointInArea__8daNpcF_cF4cXyz4cXyzfffs */ +// literal load order #ifdef NONMATCHING -bool daNpcF_c::chkPointInArea(cXyz param_0, cXyz param_1, f32 param_2, f32 param_3, f32 param_4, +BOOL daNpcF_c::chkPointInArea(cXyz param_0, cXyz param_1, f32 param_2, f32 param_3, f32 param_4, s16 param_5) { cXyz tmp_pos1; cXyz tmp_pos2; - cXyz tmp_pos3; - f32 tmp_float1 = param_3; + f32 tmp_float1 = param_4; if (param_3 < param_4) { - tmp_float1 = param_4; - param_4 = param_3; + tmp_float1 = param_3; + param_3 = param_4; } - f32 result1 = fabsf(tmp_float1 - param_4); - f32 result = FLOAT_LABEL(lit_11253) * result1; - tmp_pos1.set(param_2,result,param_2); + f32 res = fabsf(param_3 - tmp_float1) * 0.5f; + tmp_pos1.x = param_2; + tmp_pos1.y = res; + tmp_pos1.z = param_2; - f32 result2 = param_1.y + param_4 + tmp_pos1.y; - tmp_pos2.set(param_1.x,result2,param_1.z); + tmp_pos2.x = param_1.x; + tmp_pos2.y = param_1.y; + tmp_pos2.z = param_1.z; + tmp_pos2.y += tmp_float1; + tmp_pos2.y += tmp_pos1.y; - tmp_pos3 = param_0; - - return chkPointInArea(tmp_pos3,tmp_pos2,tmp_pos1,param_5); + return chkPointInArea(param_0,tmp_pos2,tmp_pos1,param_5); } #else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool daNpcF_c::chkPointInArea(cXyz param_0, cXyz param_1, f32 param_2, f32 param_3, f32 param_4, +asm BOOL daNpcF_c::chkPointInArea(cXyz param_0, cXyz param_1, f32 param_2, f32 param_3, f32 param_4, s16 param_5) { nofralloc #include "asm/d/a/d_a_npc/chkPointInArea__8daNpcF_cF4cXyz4cXyzfffs.s" @@ -5227,9 +5488,9 @@ asm bool daNpcF_c::chkPointInArea(cXyz param_0, cXyz param_1, f32 param_2, f32 p /* 801548F4-8015496C 14F234 0078+00 1/1 0/0 0/0 .text chkPointInArea__8daNpcF_cF4cXyz4cXyz4cXyzs */ -bool daNpcF_chkPointInArea(cXyz,cXyz,cXyz,s16); // fwd reference +BOOL daNpcF_chkPointInArea(cXyz,cXyz,cXyz,s16); // fwd reference -bool daNpcF_c::chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3) { +BOOL daNpcF_c::chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3) { return daNpcF_chkPointInArea(param_0,param_1,param_2,param_3); } @@ -5256,14 +5517,44 @@ asm void daNpcF_c::chkFindPlayer2(int param_0, s16 param_1) { /* ############################################################################################## */ /* 804534B4-804534B8 001AB4 0004+00 1/1 0/0 0/0 .sdata2 id$11798 */ -SECTION_SDATA2 static u8 id_11798[4] = { - 0x84, - 0x97, - 0x84, - 0x98, +SECTION_SDATA2 static u16 id_11798[2] = { + 0x8497, + 0x8498, }; /* 80154BD8-80154DA8 14F518 01D0+00 1/1 0/0 0/0 .text setHitodamaPrtcl__8daNpcF_cFv */ +// field_0x9d2 is weird +#ifdef NONMATCHING +void daNpcF_c::setHitodamaPrtcl() { + u8 uVar3; + cXyz local_20; + + field_0x9d0 = (2 * ((u16)field_0x9d2)); + field_0x9b8.x = cM_ssin(((u16)field_0x9d2)) * 8.0f; + field_0x9b8.y = cM_ssin(field_0x9d0) * 4.0f; + field_0x9b8.z = field_0x9b8.x * -cM_ssin(shape_angle.y); + + field_0x9b8.x *= cM_scos(shape_angle.y); + field_0x9d2 += 0x400; + local_20.x = mEyePos.x + field_0x9b8.x + field_0x9c4.x; + local_20.y = mEyePos.y + field_0x9b8.y + field_0x9c4.y; + local_20.z = mEyePos.z + field_0x9b8.z + field_0x9c4.z; + + for (int i = 0; i < 2; i++) { + field_0x9a8[i] = dComIfGp_particle_set(field_0x9a8[i], id_11798[i], &local_20, &field_0x8f0, NULL); + JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(field_0x9a8[i]); + if (emitter != NULL) { + if (dComIfGs_wolfeye_effect_check() == 0) { + uVar3 = 0xff; + } else { + uVar3 = 0; + } + emitter->setGlobalTranslation(local_20.x, local_20.y, local_20.z); + emitter->setGlobalAlpha(uVar3); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -5272,6 +5563,7 @@ asm void daNpcF_c::setHitodamaPrtcl() { #include "asm/d/a/d_a_npc/setHitodamaPrtcl__8daNpcF_cFv.s" } #pragma pop +#endif /* 80154DA8-80154E54 14F6E8 00AC+00 1/1 0/0 1/1 .text * daNpcF_pntVsLineSegmentLengthSquare2D__FffffffPfPfPf */ @@ -5309,7 +5601,7 @@ int daNpcF_pntVsLineSegmentLengthSquare2D(f32 param_0, f32 param_1, f32 param_2, /* 80154E54-80154E5C 14F794 0008+00 1/1 0/0 0/0 .text daNpcF_putNurbs__FP4dPntiiP4dPnti */ -static bool daNpcF_putNurbs(dPnt* param_0, int param_1, int param_2, dPnt* param_3, int param_4) { +static u16 daNpcF_putNurbs(dPnt* param_0, int param_1, int param_2, dPnt* param_3, int param_4) { return false; } @@ -5325,38 +5617,23 @@ asm int daNpcF_chkPassed(cXyz param_0, dPnt* param_1, u16 param_2, u16 param_3, #pragma pop /* 8015556C-80155634 14FEAC 00C8+00 1/1 0/0 8/8 .text daNpcF_getGroundAngle__FP13cBgS_PolyInfos */ -#ifdef NONMATCHING -int daNpcF_getGroundAngle(cBgS_PolyInfo* param_0, s16 param_1) { +s16 daNpcF_getGroundAngle(cBgS_PolyInfo* param_0, s16 param_1) { cM3dGPla tmp; - f32 l_float; - int ret; if (dComIfG_Bgsp().ChkPolySafe(*param_0)) { - if (dComIfG_Bgsp().GetTriPla(*param_0,&tmp) && !cBgW_CheckBGround(l_float)) { - ret = fopAcM_getPolygonAngle(&tmp,(int)param_1); + if (!dComIfG_Bgsp().GetTriPla(*param_0, &tmp) || !cBgW_CheckBGround(tmp.mNormal.y)) { + return 0; } else { - ret = 0; + return fopAcM_getPolygonAngle(&tmp, param_1); } } else { - ret = 0; + return 0; } - - return ret; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcF_getGroundAngle(cBgS_PolyInfo* param_0, s16 param_1) { - nofralloc -#include "asm/d/a/d_a_npc/daNpcF_getGroundAngle__FP13cBgS_PolyInfos.s" -} -#pragma pop -#endif /* 80155634-80155674 14FF74 0040+00 0/0 0/0 69/69 .text daNpcF_chkEvtBit__FUl */ -void daNpcF_chkEvtBit(u32 i_idx) { - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_idx]); +BOOL daNpcF_chkEvtBit(u32 i_idx) { + return i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_idx]); } /* 80155674-801556B4 14FFB4 0040+00 0/0 0/0 13/13 .text daNpcF_onEvtBit__FUl */ @@ -5365,8 +5642,8 @@ void daNpcF_onEvtBit(u32 i_idx) { } /* 801556B4-801556F4 14FFF4 0040+00 0/0 0/0 6/6 .text daNpcF_chkTmpBit__FUl */ -void daNpcF_chkTmpBit(u32 i_idx) { - dComIfGs_isTmpBit(dSv_event_tmp_flag_c::tempBitLabels[i_idx]); +BOOL daNpcF_chkTmpBit(u32 i_idx) { + return dComIfGs_isTmpBit(dSv_event_tmp_flag_c::tempBitLabels[i_idx]); } /* 801556F4-80155734 150034 0040+00 0/0 0/0 6/6 .text daNpcF_onTmpBit__FUl */ @@ -5381,41 +5658,23 @@ void daNpcF_offTmpBit(u32 i_idx) { /* 80155774-80155854 1500B4 00E0+00 0/0 2/2 5/5 .text * daNpcF_getPlayerInfoFromPlayerList__FiiR4cXyzR5csXyz */ -#ifdef NONMATCHING int daNpcF_getPlayerInfoFromPlayerList(int param_0, int i_roomNo, cXyz& param_2, csXyz& param_3) { - int i = 0; + int rv = 0; dStage_roomStatus_c* roomP = dComIfGp_roomControl_getStatusRoomDt(i_roomNo); stage_actor_data_class* entries = roomP->mRoomDt.getPlayer()->mEntries; - while (true) { - if (param_0 == entries->mEnemyNo) { + for (int i = 0; i < roomP->mRoomDt.getPlayerNum(); entries++, i++) { + if (param_0 == (u8)entries->mAngle.z) { + param_2 = entries->mSpawnPos; + param_3 = entries->mAngle; + rv = 1; break; } } - param_2 = entries->mSpawnPos; - param_3 = entries->mAngle; - - i++; - - if (roomP->mRoomDt.getPlayerNum() >= i) { - return 0; - } - - return 1; + return rv; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daNpcF_getPlayerInfoFromPlayerList(int param_0, int param_1, cXyz& param_2, - csXyz& param_3) { - nofralloc -#include "asm/d/a/d_a_npc/daNpcF_getPlayerInfoFromPlayerList__FiiR4cXyzR5csXyz.s" -} -#pragma pop -#endif /* 80155854-80155968 150194 0114+00 0/0 0/0 1/1 .text daNpcF_chkDoBtnEqSpeak__FP10fopAc_ac_c */ bool daNpcF_chkDoBtnEqSpeak(fopAc_ac_c* i_ActorP) { @@ -5442,8 +5701,8 @@ bool daNpcF_chkDoBtnEqSpeak(fopAc_ac_c* i_ActorP) { } /* 80155968-80155AD4 1502A8 016C+00 1/1 0/0 2/2 .text daNpcF_chkPointInArea__F4cXyz4cXyz4cXyzs */ -bool daNpcF_chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3) { - bool ret = 0; +BOOL daNpcF_chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3) { + BOOL ret; Vec l_vec; f32 l_float1; f32 l_float2; @@ -5463,15 +5722,13 @@ bool daNpcF_chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3 l_pos = param_1 - param_0; if (l_pos.y <= -param_2.y || param_2.y <= l_pos.y) { - ret = 0; + return FALSE; } else { f32 tmp_float1 = (l_float3 * l_float3) / (l_float1 * l_float1); f32 tmp_float2 = (l_float4 * l_float4) / (l_float2 * l_float2); f32 tmp_float3 = tmp_float1 + tmp_float2; - ret = tmp_float3 <= FLOAT_LABEL(lit_4140); + return tmp_float3 <= FLOAT_LABEL(lit_4140); } - - return ret; } /* 80155AD4-80155AE8 150414 0014+00 1/1 0/0 1/1 .text daNpcF_getDistTableIdx__Fii */ @@ -5519,7 +5776,7 @@ void daNpcF_c::adjustShapeAngle() { } /* 80155BC0-80155BC8 150500 0008+00 2/0 0/0 0/0 .text main__8daNpcF_cFv */ -bool daNpcF_c::main() { +BOOL daNpcF_c::main() { return true; } @@ -5534,12 +5791,12 @@ void daNpcF_c::drawOtherMdls() { } /* 80155BD0-80155BD8 150510 0008+00 2/0 0/0 0/0 .text drawDbgInfo__8daNpcF_cFv */ -bool daNpcF_c::drawDbgInfo() { +BOOL daNpcF_c::drawDbgInfo() { return true; } /* 80155BD8-80155BE0 150518 0008+00 2/0 0/0 0/0 .text ctrlBtk__8daNpcF_cFv */ -bool daNpcF_c::ctrlBtk() { +BOOL daNpcF_c::ctrlBtk() { return false; } @@ -5635,7 +5892,8 @@ bool daNpcF_c::setExpressionBtp(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daNpcF_MatAnm_c::~daNpcF_MatAnm_c() { +// asm daNpcF_MatAnm_c::~daNpcF_MatAnm_c() { +asm void __dt__15daNpcF_MatAnm_cFv() { nofralloc #include "asm/d/a/d_a_npc/__dt__15daNpcF_MatAnm_cFv.s" } diff --git a/src/d/bg/d_bg_s.cpp b/src/d/bg/d_bg_s.cpp index 4f110311d40..73543c51d21 100644 --- a/src/d/bg/d_bg_s.cpp +++ b/src/d/bg/d_bg_s.cpp @@ -305,32 +305,36 @@ struct cBgS_dzb_strgroup { /* 80074578-80074618 06EEB8 00A0+00 0/0 1/1 0/0 .text ConvDzb__4cBgSFPv */ #ifdef NONMATCHING -void cBgS::ConvDzb(void* p_dzb) { +void* cBgS::ConvDzb(void* p_dzb) { cBgS_dzb_data* pbgd = (cBgS_dzb_data*)p_dzb; - if (!(pbgd->field_0x30 & 0x80000000)) { - pbgd->field_0x30 |= 0x80000000; - - if (pbgd->m_v_tbl != 0) { - pbgd->m_v_tbl += (u32)p_dzb; - } - - pbgd->m_t_tbl += (u32)p_dzb; - pbgd->m_b_tbl += (u32)p_dzb; - pbgd->m_tree_tbl += (u32)p_dzb; - pbgd->m_g_tbl += (u32)p_dzb; - pbgd->m_ti_tbl += (u32)p_dzb; - - for (int i = 0; i < pbgd->m_g_num; i++) { - ((cBgS_dzb_strgroup*)pbgd->m_g_tbl)[i].strOffset += (u32)p_dzb; - } + if ((pbgd->field_0x30 & 0x80000000)) { + return; } + + pbgd->field_0x30 |= 0x80000000; + + if (pbgd->m_v_tbl != 0) { + pbgd->m_v_tbl += (u32)p_dzb; + } + + pbgd->m_t_tbl += (u32)p_dzb; + pbgd->m_b_tbl += (u32)p_dzb; + pbgd->m_tree_tbl += (u32)p_dzb; + pbgd->m_g_tbl += (u32)p_dzb; + pbgd->m_ti_tbl += (u32)p_dzb; + + for (int i = 0; i < pbgd->m_g_num; i++) { + ((cBgS_dzb_strgroup*)pbgd->m_g_tbl)[i].strOffset = (u32)p_dzb + ((cBgS_dzb_strgroup*)pbgd->m_g_tbl)[i].strOffset; + } + + return p_dzb; } #else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cBgS::ConvDzb(void* param_0) { +asm void* cBgS::ConvDzb(void* param_0) { nofralloc #include "asm/d/bg/d_bg_s/ConvDzb__4cBgSFPv.s" } diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index c02cefa0600..7c466e72e3f 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -1270,7 +1270,7 @@ BOOL dComIfG_resetToOpening(scene_class* i_scene) { } static int phase_1(char* i_arcName) { - if (!dComIfG_setObjectRes(i_arcName, 0, NULL)) { + if (!dComIfG_setObjectRes(i_arcName, (u8)0, NULL)) { OSReport_Error("%s.arc Read Error !!\n", i_arcName); return cPhs_ERROR_e; } @@ -1310,7 +1310,7 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_arcNa /* 8002CEFC-8002CF5C 02783C 0060+00 1/0 0/0 0/0 .text phase_01__FP12phaseParam_c */ static int phase_01(phaseParam_c* i_phasePrm) { - if (dComIfG_setObjectRes(i_phasePrm->mResName, 0, i_phasePrm->mpHeap) == 0) { + if (dComIfG_setObjectRes(i_phasePrm->mResName, (u8)0, i_phasePrm->mpHeap) == 0) { return 5; } @@ -2388,10 +2388,14 @@ bool dComIfGs_shake_kandelaar_check() { /* 8002FA54-8002FA84 02A394 0030+00 0/0 4/4 96/96 .text dComIfGs_wolfeye_effect_check__Fv */ -bool dComIfGs_wolfeye_effect_check() { +BOOL dComIfGs_wolfeye_effect_check() { dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + BOOL ret = false; - return env_light->field_0xf3d == 1 && env_light->field_0xf40 > 0.6; + if (env_light->field_0xf3d == 1 && env_light->field_0xf40 > 0.6) { + ret = true; + } + return ret; } void dComIfGs_Grass_hide_Set(s8 param_0) { diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp index 3c5249ac944..aec69a7a85e 100644 --- a/src/d/d_bright_check.cpp +++ b/src/d/d_bright_check.cpp @@ -6,65 +6,56 @@ #include "d/d_bright_check.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "d/d_drawlist.h" +#include "d/com/d_com_inf_game.h" +#include "d/msg/d_msg_string.h" +#include "d/meter/d_meter2_info.h" +#include "m_Do/m_Do_controller_pad.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "JSystem/J2DGraph/J2DGrafContext.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/JKernel/JKRArchive.h" // // Types: // -struct mDoCPd_c { - static u8 m_cpadInfo[256]; -}; - -struct dMsgString_c { - /* 80249C20 */ dMsgString_c(); - /* 80249D28 */ ~dMsgString_c(); -}; - -struct dDlst_base_c {}; - -struct dDlst_list_c { - /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); -}; - -struct dDlst_BrightCheck_c { +struct dDlst_BrightCheck_c +#ifdef NONMATCHING +: public dDlst_base_c +#endif +{ + #ifdef NONMATCHING + /* 801935D0 */ virtual void draw(); + /* 80193648 */ virtual ~dDlst_BrightCheck_c() {}; + #else /* 801935D0 */ void draw(); /* 80193648 */ ~dDlst_BrightCheck_c(); + void* vtable; + #endif + J2DScreen* mScreen; }; -struct JKRArchive {}; - struct dBrightCheck_c { /* 80192F10 */ dBrightCheck_c(JKRArchive*); + #ifdef NONMATCHING + /* 80192F98 */ virtual ~dBrightCheck_c(); + #else + void * vtable; /* 80192F98 */ ~dBrightCheck_c(); + #endif /* 80193030 */ void screenSet(); /* 801934D0 */ void _move(); /* 80193508 */ void modeWait(); /* 8019350C */ void modeMove(); /* 80193594 */ void _draw(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J2DTextBox { - /* 8030074C */ void setString(s16, char const*, ...); -}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); + + /* 0x04 */ JKRArchive* mArchive; + /* 0x08 */ dDlst_BrightCheck_c mDlstBrightCheck; + /* 0x10 */ u8 field_0x10[4]; + /* 0x14 */ dMsgString_c* mMsgString; + /* 0x18 */ u8 field_0x18; + /* 0x19 */ u8 field_0x19; }; // @@ -104,7 +95,6 @@ extern "C" void _savegpr_22(); extern "C" void _restgpr_22(); extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -117,6 +107,13 @@ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +typedef void (dBrightCheck_c::*BrightCheckFunc)(); + +#ifdef NONMATCHING +SECTION_DATA static BrightCheckFunc brightChackProc[2] = { + &dBrightCheck_c::modeWait, &dBrightCheck_c::modeMove, +}; +#else /* 803BB5BC-803BB5C8 -00001 000C+00 0/1 0/0 0/0 .data @3797 */ #pragma push #pragma force_active on @@ -163,7 +160,19 @@ SECTION_DATA extern void* __vt__14dBrightCheck_c[3 + 4 /* padding */] = { NULL, }; +#endif + /* 80192F10-80192F98 18D850 0088+00 0/0 1/1 0/0 .text __ct__14dBrightCheck_cFP10JKRArchive */ +// Matches without vtables +#ifdef NONMATCHING +dBrightCheck_c::dBrightCheck_c(JKRArchive* param_0) { + mArchive = param_0; + mMsgString = new dMsgString_c(); + screenSet(); + field_0x19 = 0; + field_0x18 = 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -172,8 +181,15 @@ asm dBrightCheck_c::dBrightCheck_c(JKRArchive* param_0) { #include "asm/d/d_bright_check/__ct__14dBrightCheck_cFP10JKRArchive.s" } #pragma pop +#endif /* 80192F98-80193030 18D8D8 0098+00 1/0 0/0 0/0 .text __dt__14dBrightCheck_cFv */ +#ifdef NONMATCHING +dBrightCheck_c::~dBrightCheck_c() { + delete mDlstBrightCheck.mScreen; + delete mMsgString; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -182,23 +198,20 @@ asm dBrightCheck_c::~dBrightCheck_c() { #include "asm/d/d_bright_check/__dt__14dBrightCheck_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80394910-80394938 020F70 0028+00 1/1 0/0 0/0 .rodata tv_btnA$3744 */ -SECTION_RODATA static u8 const tv_btnA[40] = { - 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x31, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, - 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, - 0x5F, 0x61, 0x74, 0x34, 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, +SECTION_RODATA static u64 const tv_btnA[5] = { + 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at', }; COMPILER_STRIP_GATE(0x80394910, &tv_btnA); /* 80394938-80394960 020F98 0028+00 0/1 0/0 0/0 .rodata ftv_btnA$3745 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const ftv_btnA[40] = { - 0x00, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x31, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, - 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, - 0x5F, 0x61, 0x74, 0x34, 0x00, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, +SECTION_RODATA static u64 const ftv_btnA[5] = { + 'font_a1', 'font_at2', 'font_at3' , 'font_at4', 'font_at', }; COMPILER_STRIP_GATE(0x80394938, &ftv_btnA); #pragma pop @@ -206,12 +219,9 @@ COMPILER_STRIP_GATE(0x80394938, &ftv_btnA); /* 80394960-803949B0 020FC0 0050+00 0/1 0/0 0/0 .rodata txTV$3751 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const txTV[80] = { - 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x36, 0x31, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, - 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x39, 0x31, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, - 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x30, 0x31, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30, 0x31, - 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x37, 0x31, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, - 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x38, 0x31, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, +SECTION_RODATA static u64 const txTV[10] = { + 'menu_t61', 'menu_t2', 'menu_t91', 'menu_t1', 'menut101', 'menu_t01', 'menu_t71', + 'menu_t3', 'menu_t81', 'menu_t4', }; COMPILER_STRIP_GATE(0x80394960, &txTV); #pragma pop @@ -219,10 +229,8 @@ COMPILER_STRIP_GATE(0x80394960, &txTV); /* 803949B0-803949D8 021010 0028+00 0/1 0/0 0/0 .rodata txTVhide$3752 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const txTVhide[40] = { - 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x36, 0x6E, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, - 0x39, 0x6E, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x30, 0x6E, 0x00, 0x6D, 0x65, 0x6E, - 0x75, 0x5F, 0x37, 0x6E, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x38, 0x6E, +SECTION_RODATA static u64 const txTVhide[5] = { + 'menu_6n', 'menu_9n', 'menu_10n', 'menu_7n', 'menu_8n', }; COMPILER_STRIP_GATE(0x803949B0, &txTVhide); #pragma pop @@ -243,6 +251,56 @@ SECTION_SDATA2 static u8 lit_3792[4] = { }; /* 80193030-801934D0 18D970 04A0+00 1/1 0/0 0/0 .text screenSet__14dBrightCheck_cFv */ +// matches with literals +#ifdef NONMATCHING +void dBrightCheck_c::screenSet() { + mDlstBrightCheck.mScreen = new J2DScreen(); + mDlstBrightCheck.mScreen->setPriority("zelda_option_check.blo", 0x1100000, mArchive); + mDlstBrightCheck.mScreen->search('g_abtn_n')->hide(); + J2DTextBox* textBox = (J2DTextBox*)mDlstBrightCheck.mScreen->search('f_t00'); + mDlstBrightCheck.mScreen->search('f_t00')->show(); + mDlstBrightCheck.mScreen->search('t_t00')->hide(); + textBox->setFont(mDoExt_getRubyFont()); + textBox->setString(0x40, ""); + mMsgString->getString(0x55c, textBox, NULL, NULL, NULL, 0); + + J2DTextBox* texts[5]; + for (int i = 0; i < 5; i++) { + texts[i] = (J2DTextBox*)mDlstBrightCheck.mScreen->search(ftv_btnA[i]); + mDlstBrightCheck.mScreen->search(tv_btnA[i])->hide(); + texts[i]->setFont(mDoExt_getMesgFont()); + texts[i]->setString(0x40, ""); + mMsgString->getString(0x564, texts[i], NULL, NULL, NULL, 0); + } + + for (int i = 0; i < 5; i++) { + mDlstBrightCheck.mScreen->search(txTVhide[i])->hide(); + } + + for (int i = 0; i < 10; i++) { + textBox = (J2DTextBox*)mDlstBrightCheck.mScreen->search(txTV[i]); + textBox->setFont(mDoExt_getMesgFont()); + textBox->setCharSpace(0.0f); + + if (i < 2) { + textBox->setString(0x100, ""); + mMsgString->getString(0x558, textBox, NULL, NULL, NULL, 0); + } else if (i < 4) { + textBox->setString(0x100, ""); + mMsgString->getString(0x557, textBox, NULL, NULL, NULL, 0); + } else if (i < 6) { + textBox->setString(0x100, ""); + mMsgString->getString(0x559, textBox, NULL, NULL, NULL, 0); + } else if (i < 8) { + textBox->setString(0x100, ""); + mMsgString->getString(0x55a, textBox, NULL, NULL, NULL, 0); + } else { + textBox->setString(0x100, ""); + mMsgString->getString(0x55b, textBox, NULL, NULL, NULL, 0); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -251,16 +309,12 @@ asm void dBrightCheck_c::screenSet() { #include "asm/d/d_bright_check/screenSet__14dBrightCheck_cFv.s" } #pragma pop +#endif /* 801934D0-80193508 18DE10 0038+00 0/0 1/1 0/0 .text _move__14dBrightCheck_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBrightCheck_c::_move() { - nofralloc -#include "asm/d/d_bright_check/_move__14dBrightCheck_cFv.s" +void dBrightCheck_c::_move() { + (this->*(((BrightCheckFunc*)brightChackProc)[field_0x18]))(); } -#pragma pop /* 80193508-8019350C 18DE48 0004+00 1/0 0/0 0/0 .text modeWait__14dBrightCheck_cFv */ void dBrightCheck_c::modeWait() { @@ -279,16 +333,21 @@ SECTION_SDATA2 static f32 lit_3822[1 + 1 /* padding */] = { }; /* 8019350C-80193594 18DE4C 0088+00 1/0 0/0 0/0 .text modeMove__14dBrightCheck_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBrightCheck_c::modeMove() { - nofralloc -#include "asm/d/d_bright_check/modeMove__14dBrightCheck_cFv.s" +void dBrightCheck_c::modeMove() { + if (mDoCPd_c::getTrigA(0) || mDoCPd_c::getTrigStart(0)) { + mDoAud_seStart(1, 0, 0, 0); + field_0x19 = 1; + field_0x18 = 0; + } } -#pragma pop /* 80193594-801935D0 18DED4 003C+00 0/0 1/1 0/0 .text _draw__14dBrightCheck_cFv */ +// Matches with mDlstBrightCheck inheritance +#ifdef NONMATCHING +void dBrightCheck_c::_draw() { + dComIfGd_set2DOpa(&mDlstBrightCheck); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -297,8 +356,16 @@ asm void dBrightCheck_c::_draw() { #include "asm/d/d_bright_check/_draw__14dBrightCheck_cFv.s" } #pragma pop +#endif /* 801935D0-80193608 18DF10 0038+00 1/0 0/0 0/0 .text draw__19dDlst_BrightCheck_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dDlst_BrightCheck_c::draw() { + J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort(); + mScreen->draw(0.0f, 0.0f, grafContext); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -307,6 +374,7 @@ asm void dDlst_BrightCheck_c::draw() { #include "asm/d/d_bright_check/draw__19dDlst_BrightCheck_cFv.s" } #pragma pop +#endif /* 80193608-80193648 18DF48 0040+00 0/0 1/0 0/0 .text __sinit_d_bright_check_cpp */ #pragma push diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index e3d6b9ba5b5..de0acc72d71 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -22,10 +22,6 @@ namespace std { /* 80182D10 */ void fabs(f32); }; // namespace std -struct mDoLib_clipper { - /* 8001528C */ void setup(f32, f32, f32, f32); -}; - struct daTagMwait_c { /* 80182D9C */ void checkEndMessage(); }; diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index f07967a6cf1..1a63461f926 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -13,6 +13,7 @@ #include "JSystem/J3DGraphLoader/J3DModelLoader.h" #include "JSystem/JKernel/JKRMemArchive.h" #include "JSystem/JKernel/JKRSolidHeap.h" +#include "m_Do/m_Do_graphic.h" #include "MSL_C/stdio.h" #include "MSL_C/string.h" #include "d/com/d_com_inf_game.h" @@ -27,7 +28,7 @@ // struct dBgWKCol { - /* 8007E7D0 */ void initKCollision(void*); + /* 8007E7D0 */ static void* initKCollision(void*); }; // @@ -222,23 +223,31 @@ static void setAlpha(J3DMaterialTable* pMatTable) { } /* ############################################################################################## */ -/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803798C1 = "fbtex_dummy"; -SECTION_DEAD static char const* const stringBase_803798CD = "dummy"; -SECTION_DEAD static char const* const stringBase_803798D3 = "Zbuffer"; -#pragma pop /* 8003A490-8003A81C 034DD0 038C+00 1/1 0/0 0/0 .text setIndirectTex__FP12J3DModelData */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void setIndirectTex(J3DModelData* param_0) { - nofralloc -#include "asm/d/d_resorce/setIndirectTex__FP12J3DModelData.s" +static void setIndirectTex(J3DModelData* param_0) { + const char* textureName; + J3DMaterialTable& materialTable = param_0->getMaterialTable(); + J3DTexture* texture = materialTable.getTexture(); + if (texture == NULL) + return; + JUTNameTab* nameTab = materialTable.getTextureName(); + if (nameTab == NULL) + return; + + for (u16 i = 0; i < texture->getNum(); i++) { + textureName = nameTab->getName(i); + if (memcmp(textureName, "fbtex_dummy", 0xc) == 0) { + texture->setResTIMG(i, *mDoGph_gInf_c::getFrameBufferTimg()); + } + if (memcmp(textureName, "dummy", 6) == 0) { + texture->setResTIMG(i, *mDoGph_gInf_c::getFrameBufferTimg()); + } + if (memcmp(textureName, "Zbuffer", 8) == 0) { + texture->setResTIMG(i, *mDoGph_gInf_c::getZbufferTimg()); + } + } } -#pragma pop /* 8003A81C-8003A840 03515C 0024+00 1/1 0/0 0/0 .text setAlpha__FP12J3DModelData */ static void setAlpha(J3DModelData* pModelData) { @@ -247,16 +256,18 @@ static void setAlpha(J3DModelData* pModelData) { /* ############################################################################################## */ /* 80379840-803798A4 005EA0 0064+00 2/2 0/0 0/0 .rodata l_texMtxInfo */ -SECTION_RODATA static u8 const l_texMtxInfo[100] = { - 0x00, 0x08, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x3D, 0xCC, 0xCC, 0xCD, 0x3D, 0xCC, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, +SECTION_RODATA static const J3DTexMtxInfo l_texMtxInfo = { + 0x00, + 0x08, + {0.5f, 0.5f, 0.0f}, + { 0.1f, 0.1f, 0, 0.0f, 0.0f}, + { + { 0.5f, 0.0f, 0.0f, 0.5f }, + { 0.0f, 0.5f, 0.0f, 0.5f }, + { 0.0f, 0.0f, 0.0f, 1.0f }, + { 0.0f, 0.0f, 0.0f, 1.0f }, + }, }; -COMPILER_STRIP_GATE(0x80379840, &l_texMtxInfo); /* 803798A4-803798B8 005F04 0014+00 1/1 0/0 0/0 .rodata l_tevStageInfo$3774 */ SECTION_RODATA static u8 const l_tevStageInfo[20] = { @@ -265,22 +276,15 @@ SECTION_RODATA static u8 const l_tevStageInfo[20] = { }; COMPILER_STRIP_GATE(0x803798A4, &l_tevStageInfo); -/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803798DB = "Always"; -#pragma pop - /* 80450628-8045062C 0000A8 0004+00 1/1 0/0 0/0 .sdata l_texCoordInfo$3772 */ -SECTION_SDATA static u8 l_texCoordInfo[4] = { +SECTION_SDATA static J3DTexCoordInfo l_texCoordInfo = { 0x00, 0x00, 0x27, - 0x00, }; /* 8045062C-80450630 0000AC 0004+00 1/1 0/0 0/0 .sdata l_tevOrderInfo$3773 */ -SECTION_SDATA static u8 l_tevOrderInfo[4] = { +SECTION_SDATA static J3DTevOrderInfo l_tevOrderInfo = { 0x00, 0x03, 0xFF, @@ -288,20 +292,46 @@ SECTION_SDATA static u8 l_tevOrderInfo[4] = { }; /* 80451DF0-80451DF8 0003F0 0008+00 1/1 0/0 0/0 .sdata2 l_alphaCompInfo$3775 */ -SECTION_SDATA2 static u8 l_alphaCompInfo[8] = { - 0x04, 0x80, 0x00, 0x03, 0xFF, 0x00, 0x00, 0x00, +SECTION_SDATA2 static J3DAlphaCompInfo l_alphaCompInfo = { + 0x04, 0x80, 0x00, 0x03, 0xFF, }; /* 8003A840-8003AACC 035180 028C+00 1/1 0/0 0/0 .text addWarpMaterial__FP12J3DModelData */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void addWarpMaterial(J3DModelData* param_0) { - nofralloc -#include "asm/d/d_resorce/addWarpMaterial__FP12J3DModelData.s" +static void addWarpMaterial(J3DModelData* param_1) { + ResTIMG* objectRes = (ResTIMG*)dComIfG_getObjectRes("Always", 0x5d); + J3DTexture* texture = param_1->getTexture(); + u16 textureNum = texture->getNum(); + texture->addResTIMG(1, objectRes - textureNum); + J3DTexMtx* texMtxInfo = new J3DTexMtx(l_texMtxInfo); + + for (u16 i = 0; i < param_1->getMaterialNum(); i++) { + J3DMaterial* pMaterial = param_1->getMaterialNodePointer(i); + J3DTexGenBlock* texGenBlock = pMaterial->getTexGenBlock(); + u32 texGenNum = texGenBlock->getTexGenNum(); + J3DTexCoord* coord = texGenBlock->getTexCoord(texGenNum); + l_texCoordInfo.mTexGenMtx = texGenNum * 3 + 0x1e; + coord->setTexCoordInfo(&l_texCoordInfo); + coord->resetTexMtxReg(); + texGenBlock->setTexGenNum(texGenNum + 1); + texGenBlock->setTexMtx(texGenNum, texMtxInfo); + J3DTevBlock* tevBlock = pMaterial->getTevBlock(); + u8 tevStageNum = tevBlock->getTevStageNum(); + l_tevOrderInfo.field_0x0 = texGenNum; + tevBlock->setTexNo(3, textureNum); + tevBlock->setTevOrder(tevStageNum, l_tevOrderInfo); + tevBlock->setTevStage(tevStageNum, J3DTevStage(*(J3DTevStageInfo*)l_tevStageInfo)); + tevBlock->setTevStageNum(tevStageNum + 1); + J3DShape* pShape = pMaterial->getShape(); + GXAttr attr = (GXAttr)(texGenNum + 1); + pShape->addTexMtxIndexInDL(attr, 0); + pShape->addTexMtxIndexInVcd(attr); + J3DPEBlock* peBlock = pMaterial->getPEBlock(); + J3DAlphaComp* alphaComp = peBlock->getAlphaComp(); + alphaComp->setAlphaCompInfo(&l_alphaCompInfo); + peBlock->setZCompLoc((u8)0); + } } -#pragma pop /* 8003AACC-8003AB2C 03540C 0060+00 1/1 2/2 0/0 .text __ct__11J3DTevStageFRC15J3DTevStageInfo */ #pragma push @@ -320,37 +350,54 @@ void J3DTexGenBlock::setTexMtx(u32 param_0, J3DTexMtx* param_1) { /* 8003AB30-8003AC1C 035470 00EC+00 0/0 2/1 0/0 .text * onWarpMaterial__11dRes_info_cFP12J3DModelData */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dRes_info_c::onWarpMaterial(J3DModelData* param_0) { - nofralloc -#include "asm/d/d_resorce/onWarpMaterial__11dRes_info_cFP12J3DModelData.s" +void dRes_info_c::onWarpMaterial(J3DModelData* param_0) { + for (u16 i = 0; i < param_0->getMaterialNum(); i++) { + J3DMaterial* pMaterial = param_0->getMaterialNodePointer(i); + J3DTevBlock* tevBlock = pMaterial->getTevBlock(); + u8 tevStageNum = tevBlock->getTevStageNum(); + J3DTevOrder* tevorder = tevBlock->getTevOrder(tevStageNum - 1); + if (tevorder->getTexMap() == 3) { + break; + } + tevBlock->setTevStageNum(tevStageNum + 1); + J3DTexGenBlock* texGenBlock = pMaterial->getTexGenBlock(); + texGenBlock->setTexGenNum(texGenBlock->getTexGenNum() + 1); + } } -#pragma pop /* 8003AC1C-8003AD08 03555C 00EC+00 0/0 2/1 0/0 .text * offWarpMaterial__11dRes_info_cFP12J3DModelData */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dRes_info_c::offWarpMaterial(J3DModelData* param_0) { - nofralloc -#include "asm/d/d_resorce/offWarpMaterial__11dRes_info_cFP12J3DModelData.s" +void dRes_info_c::offWarpMaterial(J3DModelData* modelData) { + for (u16 i = 0; i < modelData->getMaterialNum(); i++) { + J3DMaterial* pMaterial = modelData->getMaterialNodePointer(i); + J3DTevBlock* tevBlock = pMaterial->getTevBlock(); + u8 tevStageNum = tevBlock->getTevStageNum(); + J3DTevOrder* tevorder = tevBlock->getTevOrder(tevStageNum - 1); + if (tevorder->getTexMap() != 3) { + break; + } + tevBlock->setTevStageNum(tevStageNum - 1); + J3DTexGenBlock* texGenBlock = pMaterial->getTexGenBlock(); + texGenBlock->setTexGenNum(texGenBlock->getTexGenNum() - 1); + } } -#pragma pop /* 8003AD08-8003AE14 035648 010C+00 0/0 1/1 0/0 .text * setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dRes_info_c::setWarpSRT(J3DModelData* param_0, cXyz const& param_1, f32 param_2, - f32 param_3) { - nofralloc -#include "asm/d/d_resorce/setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff.s" +void dRes_info_c::setWarpSRT(J3DModelData* modelData, cXyz const& param_1, f32 translationX, f32 translationY) { + J3DMaterial* pMaterial = modelData->getMaterialNodePointer(0); + J3DTexGenBlock* texGenBlock = pMaterial->getTexGenBlock(); + u32 texGenNum = texGenBlock->getTexGenNum(); + J3DTexMtx* texMtx = texGenBlock->getTexMtx(texGenNum - 1); + J3DTexMtxInfo& texMtxInfo = texMtx->getTexMtxInfo(); + texMtxInfo.mSRT.mTranslationX = translationX; + texMtxInfo.mSRT.mTranslationY = translationY; + mDoMtx_stack_c::transS(-param_1.x, -param_1.y, -param_1.z); + s16 angleY = fopCamM_GetAngleY(dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0))); + mDoMtx_stack_c::YrotM(angleY); + MtxP stackMtx = mDoMtx_stack_c::get(); + cMtx_concat(l_texMtxInfo.mEffectMtx, stackMtx, texMtxInfo.mEffectMtx); } -#pragma pop /* ############################################################################################## */ /* 803A7C18-803A7C38 -00001 0020+00 1/1 0/0 0/0 .data @4017 */ @@ -367,6 +414,77 @@ SECTION_DATA static void* lit_4017[8] = { /* 8003AE14-8003B150 035754 033C+00 2/1 1/1 0/0 .text loaderBasicBmd__11dRes_info_cFUlPv */ +// regalloc +#ifdef NONMATCHING +J3DModelData* dRes_info_c::loaderBasicBmd(u32 param_1, void* param_2) { + u32 pvVar5 = 0x59020010; + J3DMaterial* pMaterial; + J3DModelData* modelData; + u8 lightMask; + if (param_1 == 'BMDE' || param_1 == 'BMDV') { + pvVar5 |= 0x20; + } else if (param_1 == 'BMWR' || param_1 == 'BMWE') { + pvVar5 ^= 0x60020; + } + modelData = (J3DModelData*)J3DModelLoaderDataBase::load(param_2, pvVar5); + if (modelData == NULL) { + return NULL; + } + + if ((param_1 == 'BMDE' || param_1 == 'BMDV') || param_1 == 'BMWE') { + for (u16 i = 0; i < modelData->getShapeNum(); i++) { + modelData->getShapeNodePointer(i)->setTexMtxLoadType(0x2000); + } + } + for (u16 i = 0; i < modelData->getMaterialNum(); i++) { + pMaterial = modelData->getMaterialNodePointer(i); + lightMask = pMaterial->getColorBlock()->getColorChan(0)->getLightMask(); + switch (g_env_light.field_0x1308) { + case 1: + lightMask &= 4; + break; + case 2: + lightMask &= 0xc; + break; + case 3: + lightMask &= 0xd; + break; + case 4: + lightMask &= 0xf; + break; + case 5: + lightMask &= 0x1f; + break; + case 6: + lightMask &= 0x3f; + break; + case 7: + lightMask &= 0x7f; + } + pMaterial->getColorBlock()->getColorChan(0)->setLightMask(lightMask); + pMaterial->change(); + J3DMaterialAnm* local_38 = new J3DMaterialAnm(); + if (local_38 == NULL) { + return NULL; + } + pMaterial->setMaterialAnm(local_38); + } + setIndirectTex(modelData); + if ((param_1 == 'BMWR') || (param_1 == 'BMWE')) { + addWarpMaterial(modelData); + } + if ((param_1 == 'BMDR') || (param_1 == 'BMWR')) { + if (modelData->newSharedDisplayList(0x40000) == 0) { + modelData->simpleCalcMaterial(0, (float (*)[4])j3dDefaultMtx); + modelData->makeSharedDL(); + } else { + modelData = NULL; + } + } + + return modelData; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -375,12 +493,14 @@ asm J3DModelData* dRes_info_c::loaderBasicBmd(u32 param_0, void* param_1) { #include "asm/d/d_resorce/loaderBasicBmd__11dRes_info_cFUlPv.s" } #pragma pop +#endif /* 8003B150-8003B18C 035A90 003C+00 2/2 8/8 0/0 .text __dt__15J3DTevKColorAnmFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTevKColorAnm::~J3DTevKColorAnm() { +// asm J3DTevKColorAnm::~J3DTevKColorAnm() { +extern "C" asm void __dt__15J3DTevKColorAnmFv() { nofralloc #include "asm/d/d_resorce/__dt__15J3DTevKColorAnmFv.s" } @@ -390,7 +510,8 @@ asm J3DTevKColorAnm::~J3DTevKColorAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTevKColorAnm::J3DTevKColorAnm() { +// asm J3DTevKColorAnm::J3DTevKColorAnm() { +extern "C" asm void __ct__15J3DTevKColorAnmFv() { nofralloc #include "asm/d/d_resorce/__ct__15J3DTevKColorAnmFv.s" } @@ -400,7 +521,8 @@ asm J3DTevKColorAnm::J3DTevKColorAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTevColorAnm::~J3DTevColorAnm() { +// asm J3DTevColorAnm::~J3DTevColorAnm() { +extern "C" asm void __dt__14J3DTevColorAnmFv() { nofralloc #include "asm/d/d_resorce/__dt__14J3DTevColorAnmFv.s" } @@ -410,7 +532,8 @@ asm J3DTevColorAnm::~J3DTevColorAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTevColorAnm::J3DTevColorAnm() { +// asm J3DTevColorAnm::J3DTevColorAnm() { +extern "C" asm void __ct__14J3DTevColorAnmFv() { nofralloc #include "asm/d/d_resorce/__ct__14J3DTevColorAnmFv.s" } @@ -474,7 +597,8 @@ extern "C" asm void __dt__11J3DTexNoAnmFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTexNoAnm::J3DTexNoAnm() { +// asm J3DTexNoAnm::J3DTexNoAnm() { +extern "C" asm void __ct__11J3DTexNoAnmFv() { nofralloc #include "asm/d/d_resorce/__ct__11J3DTexNoAnmFv.s" } @@ -484,7 +608,8 @@ asm J3DTexNoAnm::J3DTexNoAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTexMtxAnm::~J3DTexMtxAnm() { +// asm J3DTexMtxAnm::~J3DTexMtxAnm() { +extern "C" asm void __dt__12J3DTexMtxAnmFv() { nofralloc #include "asm/d/d_resorce/__dt__12J3DTexMtxAnmFv.s" } @@ -494,7 +619,8 @@ asm J3DTexMtxAnm::~J3DTexMtxAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DTexMtxAnm::J3DTexMtxAnm() { +// asm J3DTexMtxAnm::J3DTexMtxAnm() { +extern "C" asm void __ct__12J3DTexMtxAnmFv() { nofralloc #include "asm/d/d_resorce/__ct__12J3DTexMtxAnmFv.s" } @@ -504,7 +630,8 @@ asm J3DTexMtxAnm::J3DTexMtxAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DMatColorAnm::~J3DMatColorAnm() { +// asm J3DMatColorAnm::~J3DMatColorAnm() { +extern "C" asm void __dt__14J3DMatColorAnmFv() { nofralloc #include "asm/d/d_resorce/__dt__14J3DMatColorAnmFv.s" } @@ -514,7 +641,8 @@ asm J3DMatColorAnm::~J3DMatColorAnm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DMatColorAnm::J3DMatColorAnm() { +// asm J3DMatColorAnm::J3DMatColorAnm() { +extern "C" asm void __ct__14J3DMatColorAnmFv() { nofralloc #include "asm/d/d_resorce/__ct__14J3DMatColorAnmFv.s" } @@ -530,6 +658,142 @@ SECTION_DEAD static char const* const stringBase_80379912 = "<%s> res == NULL !! #pragma pop /* 8003B30C-8003B8D0 035C4C 05C4+00 2/2 0/0 0/0 .text loadResource__11dRes_info_cFv */ +// J3DXXX ctor/dtor inlines +#ifdef NONMATCHING +int dRes_info_c::loadResource() { + s32 pJVar4 = mArchive->countFile(); + mRes = new void*[pJVar4]; + if (mRes == NULL) { + OSReport_Error("<%s.arc> setRes: res pointer buffer nothing !!\n", this); + return -1; + } + + for (int i = 0; i < pJVar4; i++) { + mRes[i] = NULL; + } + JKRArchive::SDIDirEntry* node = mArchive->mNodes; + + for (int i = 0; i < mArchive->countDirectory(); i++) { + u32 nodeType = node->type; + u32 firstFileIndex = node->first_file_index; + J3DModelData* modelData; + void* result; + for (int j = 0; j < node->num_entries; j++) { + if (mArchive->isFileEntry(firstFileIndex)) { + result = mArchive->getIdxResource(firstFileIndex); + if (result == NULL) { + OSReport_Error("<%s> res == NULL !!\n", mArchive->mStringTable + (mArchive->findIdxResource(firstFileIndex)->type_flags_and_name_offset & 0xFFFFFF)); + } + else if (nodeType == 'ARC ') { + JKRArchive::SDIFileEntry* fileEntry = mArchive->findIdxResource(firstFileIndex); + const char* __s = mArchive->mStringTable + fileEntry->getNameOffset(); + size_t len = strlen(__s) - 4; + char aJStack_24[9]; + strncpy(aJStack_24, __s, len); + aJStack_24[len] = '\0'; + JKRHeap* local_58 = JKRHeap::findFromRoot(JKRHeap::getCurrentHeap()); + JKRHeap* pJVar3 = local_58; + + if (local_58 == (JKRHeap*)mDoExt_getGameHeap()) { + local_58 = NULL; + } + dComIfG_setObjectRes(aJStack_24, result, fileEntry->data_size); + } else if (nodeType == 'BMDP') { + result = (J3DModelData*) J3DModelLoaderDataBase::load(result, 0x59020030); + if (result == NULL) { + return -1; + } + modelData = (J3DModelData*)result; + for (u16 k = 0; k < modelData->getMaterialNum(); k++) { + J3DMaterial* pMaterial = modelData->getMaterialNodePointer(k); + pMaterial->change(); + J3DMaterialAnm* materialAnm = new J3DMaterialAnm(); + if (materialAnm == (J3DMaterialAnm*)0x0) { + return -1; + } + pMaterial->setMaterialAnm(materialAnm); + } + setAlpha(modelData); + if (modelData->newSharedDisplayList(0x40000) != 0) { + return -1; + } + modelData->simpleCalcMaterial(0, (float (*)[4])j3dDefaultMtx); + modelData->makeSharedDL(); + } else if ((((nodeType == 'BMDR') || + (nodeType == 'BMDV')) || + (nodeType == 'BMDE')) || + ((nodeType == 'BMWR' || + (nodeType == 'BMWE')))) + { + result = loaderBasicBmd(nodeType, result); + if (result == NULL) { + return -1; + } + } else if (nodeType == 'BMDG') { + result = (J3DModelData*)J3DModelLoaderDataBase::load(result, 0x59020010); + if (result == NULL) { + return -1; + } + modelData = (J3DModelData*)result; + if (modelData->newSharedDisplayList(0x40000) != 0) { + return -1; + } + modelData->simpleCalcMaterial(0, (float (*)[4])j3dDefaultMtx); + modelData->makeSharedDL(); + } else if (nodeType == 'BMDA') { + result = (J3DModelData*)J3DModelLoaderDataBase::load(result, 0x59020010); + if (result == NULL) { + return -1; + } + modelData = (J3DModelData*)result; + if (modelData->newSharedDisplayList(0x40000) != 0) { + return -1; + } + modelData->simpleCalcMaterial(0, (float (*)[4])j3dDefaultMtx); + modelData->makeSharedDL(); + } else if (nodeType == 'BLS ') { + result = J3DClusterLoaderDataBase::load(result); + if (result == NULL) { + return -1; + } + } else if ((nodeType == 'BCKS') || + (nodeType == 'BCK ')) + { + int sVar1 = *(int*)((int)result + 0x1c); + void* local_9c = sVar1 != 0xffffffff ? (void*)(sVar1 + (u32)result) : NULL; + mDoExt_transAnmBas* transAnmBas = new mDoExt_transAnmBas(local_9c); + if (transAnmBas == NULL) { + return -1; + } + J3DAnmLoaderDataBase::setResource(transAnmBas, result); + result = transAnmBas; + } else if ((((nodeType == 'BTP ') || + (nodeType == 'BTK ')) || + (nodeType == 'BPK ')) || + (((nodeType == 'BRK ' || + (nodeType == 'BLK ')) || + ((nodeType == 'BVA ' || + (nodeType == 'BXA ')))))) + { + result = J3DAnmLoaderDataBase::load(result, J3DLOADER_UNK_FLAG0); + if (result == NULL) { + return -1; + } + } else if (nodeType == 'DZB ') { + result = ((cBgS*)result)->ConvDzb(result); + } else if (nodeType == 'KCL ') { + result = dBgWKCol::initKCollision(result); + } + mRes[firstFileIndex] = result; + } + firstFileIndex++; + } + node++; + } + + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -538,6 +802,7 @@ asm int dRes_info_c::loadResource() { #include "asm/d/d_resorce/loadResource__11dRes_info_cFv.s" } #pragma pop +#endif /* 8003B8D0-8003B93C 036210 006C+00 1/0 0/0 0/0 .text __dt__18J3DAnmTransformKeyFv */ #pragma push @@ -563,24 +828,39 @@ extern "C" asm void __dt__15J3DAnmTransformFv() { /* 8003B998-8003BA9C 0362D8 0104+00 1/1 0/0 0/0 .text deleteArchiveRes__11dRes_info_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dRes_info_c::deleteArchiveRes() { - nofralloc -#include "asm/d/d_resorce/deleteArchiveRes__11dRes_info_cFv.s" +void dRes_info_c::deleteArchiveRes() { + JKRArchive::SDIDirEntry* nodes = mArchive->mNodes; + for (int i = 0; i < mArchive->countDirectory(); nodes++, i++) { + if (nodes->type == 0x41524320) { + u32 firstFileIndex = nodes->first_file_index; + for (int j = 0; j < nodes->num_entries; j++) { + if (mArchive->isFileEntry(firstFileIndex)) { + JKRArchive::SDIFileEntry* fileEntry = mArchive->findIdxResource(firstFileIndex); + u32 nameOffset = fileEntry->getNameOffset(); + char* fileName = mArchive->mStringTable + nameOffset; + size_t nameLen = strlen(fileName) - 4; + char nameBuffer[12]; + strncpy(nameBuffer, fileName, nameLen); + nameBuffer[nameLen] = '\0'; + dComIfG_deleteObjectResMain(nameBuffer); + } + firstFileIndex++; + } + } + } } -#pragma pop /* 8003BA9C-8003BAC4 0363DC 0028+00 2/2 0/0 0/0 .text getArcHeader__FP10JKRArchive */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void* getArcHeader(JKRArchive* param_0) { - nofralloc -#include "asm/d/d_resorce/getArcHeader__FP10JKRArchive.s" +static SArcHeader* getArcHeader(JKRArchive* param_0) { + if (param_0 != NULL) { + switch(param_0->getMountMode()) { + case JKRArchive::MOUNT_MEM: + return ((JKRMemArchive*)param_0)->getArcHeader(); + } + } + + return NULL; } -#pragma pop /* 8003BAC4-8003BAF8 036404 0034+00 1/1 0/0 0/0 .text setRes__11dRes_info_cFP10JKRArchiveP7JKRHeap */ @@ -670,28 +950,24 @@ static s32 myGetMemBlockSize0(void* param_0) { #pragma push #pragma force_active on SECTION_DEAD static char const* const stringBase_8037997F = "%5.1f %5x %5.1f %5x %3d %s\n"; -SECTION_DEAD static char const* const stringBase_8037999B = "dRes_info_c::dump_long %08x %d\n"; -SECTION_DEAD static char const* const stringBase_803799BB = - "No Command Archive ArcHeader(size) SolidHeap(si" - "ze) Resource Cnt ArchiveName\n"; -SECTION_DEAD static char const* const stringBase_80379A09 = - "%2d %08x %08x %08x(%6x) %08x(%5x) %08x %3d %s\n"; #pragma pop /* 8003BD2C-8003BE38 03666C 010C+00 1/1 0/0 0/0 .text dump_long__11dRes_info_cFP11dRes_info_ci */ -#ifdef NONMATCHING void dRes_info_c::dump_long(dRes_info_c* param_0, int param_1) { + int i; void* header; int blockSize1; int blockSize2; + JKRArchive* archive; + JKRSolidHeap* dataHeap; JUTReportConsole_f("dRes_info_c::dump_long %08x %d\n", param_0, param_1); JUTReportConsole_f( "No Command Archive ArcHeader(size) SolidHeap(size) Resource Cnt ArchiveName\n"); - for (int i = 0; i < param_1; i++) { + for (i = 0; i < param_1; i++) { if (param_0->getCount() != 0) { - JKRArchive* archive = param_0->getArchive(); + archive = param_0->getArchive(); header = NULL; blockSize1 = 0; @@ -700,7 +976,7 @@ void dRes_info_c::dump_long(dRes_info_c* param_0, int param_1) { blockSize1 = myGetMemBlockSize0(header); } - JKRSolidHeap* dataHeap = param_0->mDataHeap; + dataHeap = param_0->mDataHeap; blockSize2 = 0; if (dataHeap != NULL) { blockSize2 = myGetMemBlockSize0((void*)dataHeap); @@ -708,22 +984,12 @@ void dRes_info_c::dump_long(dRes_info_c* param_0, int param_1) { JUTReportConsole_f("%2d %08x %08x %08x(%6x) %08x(%5x) %08x %3d %s\n", i, param_0->getDMCommand(), archive, header, blockSize1, - ¶m_0->mDataHeap, blockSize2, param_0->mRes, + dataHeap, blockSize2, param_0->mRes, param_0->getCount(), param_0->getArchiveName()); } param_0++; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dRes_info_c::dump_long(dRes_info_c* param_0, int param_1) { - nofralloc -#include "asm/d/d_resorce/dump_long__11dRes_info_cFP11dRes_info_ci.s" -} -#pragma pop -#endif /* ############################################################################################## */ /* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -751,6 +1017,33 @@ SECTION_SDATA2 static f32 lit_4333[1 + 1 /* padding */] = { /* 8003BE38-8003BFB0 036778 0178+00 1/1 0/0 0/0 .text dump__11dRes_info_cFP11dRes_info_ci */ +// float literal order +#ifdef NONMATCHING +void dRes_info_c::dump(dRes_info_c* param_0, int param_1) { + int totalArcHeaderSize; + int totalHeapSize; + int arcHeaderSize; + int heapSize; + char* archiveName; + JUTReportConsole_f("dRes_info_c::dump %08x %d\n", param_0, param_1); + JUTReportConsole_f("No ArchiveSize(KB) SolidHeapSize(KB) Cnt ArchiveName\n"); + totalArcHeaderSize = 0; + totalHeapSize = 0; + for (int i = 0; i < param_1; i++) { + if (param_0->getCount()) { + arcHeaderSize = JKRGetMemBlockSize(NULL, getArcHeader(param_0->getArchive())); + heapSize = JKRGetMemBlockSize(NULL, param_0->mDataHeap); + archiveName = param_0->getArchiveName(); + JUTReportConsole_f("%2d %6.1f %6x %6.1f %6x %3d %s\n", i, arcHeaderSize / 1024.0f, arcHeaderSize, heapSize / 1024.0f, heapSize, param_0->getCount(), archiveName); + totalArcHeaderSize += arcHeaderSize; + totalHeapSize += heapSize; + } + param_0++; + } + JUTReportConsole_f( + "----------------------------------------------\n %6.1f %6x %6.1f %6x Total\n\n", totalArcHeaderSize / 1024.0f, totalArcHeaderSize, totalHeapSize / 1024.0f, totalHeapSize); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -759,37 +1052,23 @@ asm void dRes_info_c::dump(dRes_info_c* param_0, int param_1) { #include "asm/d/d_resorce/dump__11dRes_info_cFP11dRes_info_ci.s" } #pragma pop +#endif /* 8003BFB0-8003C078 0368F0 00C8+00 0/0 1/1 0/0 .text __dt__14dRes_control_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dRes_control_c::~dRes_control_c() { - nofralloc -#include "asm/d/d_resorce/__dt__14dRes_control_cFv.s" +dRes_control_c::~dRes_control_c() { + for (int i = 0; i < (int)ARRAY_SIZE(mObjectInfo); i++) { + mObjectInfo[i].~dRes_info_c(); + } + + for (int i = 0; i < (int)ARRAY_SIZE(mStageInfo); i++) { + mStageInfo[i].~dRes_info_c(); + } } -#pragma pop /* ############################################################################################## */ -/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -// MWCC ignores mapping of some japanese characters using the -// byte 0x5C (ASCII '\'). This is why this string is hex-encoded. -SECTION_DEAD static char const* const stringBase_80379AF9 = - "\x3C\x25\x73\x2E\x61\x72\x63\x3E\x20\x64\x52\x65\x73\x5F\x63\x6F\x6E\x74\x72\x6F\x6C\x5F\x63" - "\x3A\x3A\x73\x65\x74\x52\x65\x73\x3A\x20\x8B\xF3\x82\xAB\x83\x8A\x83\x5C\x81\x5B\x83\x58\x8F" - "\xEE\x95" - "\xF1\x83\x7C\x83\x43\x83\x93\x83\x5E\x82\xAA\x82\xA0\x82\xE8\x82\xDC\x82\xB9\x82\xF1\x0A"; -SECTION_DEAD static char const* const stringBase_80379B40 = - "<%s.arc> dRes_control_c::setRes: res info set er" - "ror !!\n"; -#pragma pop /* 8003C078-8003C160 0369B8 00E8+00 2/2 8/8 0/0 .text * setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap */ -// matches except resInfo destructor issues? -#ifdef NONMATCHING int dRes_control_c::setRes(char const* arcName, dRes_info_c* pInfo, int infoSize, char const* arcPath, u8 param_4, JKRHeap* pHeap) { dRes_info_c* resInfo = getResInfo(arcName, pInfo, infoSize); @@ -798,6 +1077,8 @@ int dRes_control_c::setRes(char const* arcName, dRes_info_c* pInfo, int infoSize resInfo = newResInfo(pInfo, infoSize); if (resInfo == NULL) { + // MWCC ignores mapping of some japanese characters using the + // byte 0x5C (ASCII '\'). This is why this string is hex-encoded. // "<%s.arc> dRes_control_c::setRes: 空きリソース情報ポインタがありません\n" // "<%s.arc> dRes_control_c::setRes: There isn't a free Resource Info pointer\n" OSReport_Error( @@ -806,31 +1087,20 @@ int dRes_control_c::setRes(char const* arcName, dRes_info_c* pInfo, int infoSize "\x5C\x81\x5B\x83\x58\x8F\xEE\x95\xF1\x83\x7C\x83\x43\x83\x93\x83\x5E\x82\xAA\x82" "\xA0\x82\xE8\x82\xDC\x82\xB9\x82\xF1\x0A", arcName); - delete resInfo; + resInfo->~dRes_info_c(); return 0; } int resStatus = resInfo->set(arcName, arcPath, param_4, pHeap); if (resStatus == 0) { OSReport_Error("<%s.arc> dRes_control_c::setRes: res info set error !!\n", arcName); - delete resInfo; + resInfo->~dRes_info_c(); return 0; } } resInfo->incCount(); return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dRes_control_c::setRes(char const* param_0, dRes_info_c* param_1, int param_2, - char const* param_3, u8 param_4, JKRHeap* param_5) { - nofralloc -#include "asm/d/d_resorce/setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap.s" -} -#pragma pop -#endif /* 8003C160-8003C194 036AA0 0034+00 0/0 10/10 1/1 .text * syncRes__14dRes_control_cFPCcP11dRes_info_ci */ @@ -846,7 +1116,6 @@ int dRes_control_c::syncRes(char const* arcName, dRes_info_c* pInfo, int infoSiz /* 8003C194-8003C1E4 036AD4 0050+00 1/1 7/7 0/0 .text * deleteRes__14dRes_control_cFPCcP11dRes_info_ci */ -#ifdef NONMATCHING int dRes_control_c::deleteRes(char const* arcName, dRes_info_c* pInfo, int infoSize) { dRes_info_c* resInfo = getResInfo(arcName, pInfo, infoSize); @@ -854,21 +1123,11 @@ int dRes_control_c::deleteRes(char const* arcName, dRes_info_c* pInfo, int infoS return 0; } else { if (resInfo->decCount() == 0) { - delete resInfo; + resInfo->~dRes_info_c(); } return 1; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dRes_control_c::deleteRes(char const* param_0, dRes_info_c* param_1, int param_2) { - nofralloc -#include "asm/d/d_resorce/deleteRes__14dRes_control_cFPCcP11dRes_info_ci.s" -} -#pragma pop -#endif /* 8003C1E4-8003C260 036B24 007C+00 5/5 5/5 3/3 .text * getResInfo__14dRes_control_cFPCcP11dRes_info_ci */ @@ -912,87 +1171,64 @@ dRes_info_c* dRes_control_c::getResInfoLoaded(char const* arcName, dRes_info_c* } /* ############################################################################################## */ -/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80379BA0 = - "<%s.arc> getRes: res index over !! index=%d coun" - "t=%d\n"; -#pragma pop /* 8003C2EC-8003C37C 036C2C 0090+00 1/1 54/54 894/894 .text * getRes__14dRes_control_cFPCclP11dRes_info_ci */ -// weird branching -#ifdef NONMATCHING void* dRes_control_c::getRes(char const* arcName, s32 resIdx, dRes_info_c* pInfo, int infoSize) { dRes_info_c* resInfo = getResInfoLoaded(arcName, pInfo, infoSize); if (resInfo == NULL) { - JKRArchive* archive = resInfo->getArchive(); - u32 fileCount = archive->countFile(); + return resInfo; + } + JKRArchive* archive = resInfo->getArchive(); + u32 fileCount = archive->countFile(); - if (resIdx >= (int)fileCount) { - OSReport_Error("<%s.arc> getRes: res index over !! index=%d count=%d\n", arcName, - resIdx, fileCount); - return NULL; - } + if (resIdx >= (int)fileCount) { + OSReport_Error("<%s.arc> getRes: res index over !! index=%d count=%d\n", arcName, + resIdx, fileCount); + return NULL; } return resInfo->getRes(resIdx); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void* dRes_control_c::getRes(char const* param_0, s32 param_1, dRes_info_c* param_2, - int param_3) { - nofralloc -#include "asm/d/d_resorce/getRes__14dRes_control_cFPCclP11dRes_info_ci.s" -} -#pragma pop -#endif /* 8003C37C-8003C400 036CBC 0084+00 0/0 18/18 109/109 .text * getRes__14dRes_control_cFPCcPCcP11dRes_info_ci */ -// same weird branch issue -#ifdef NONMATCHING void* dRes_control_c::getRes(char const* arcName, char const* resName, dRes_info_c* pInfo, int infoSize) { dRes_info_c* resInfo = getResInfoLoaded(arcName, pInfo, infoSize); if (resInfo == NULL) { - JKRArchive* archive = resInfo->getArchive(); - JKRArchive::SDIFileEntry* entry = archive->findNameResource(resName); + return resInfo; + } - if (entry != NULL) { - return resInfo->getRes(entry - archive->mFiles); - } else { - return NULL; - } + JKRArchive* archive = resInfo->getArchive(); + JKRArchive::SDIFileEntry* entry = archive->findNameResource(resName); + + if (entry != NULL) { + return resInfo->getRes(entry - archive->mFiles); + } else { + return NULL; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void* dRes_control_c::getRes(char const* param_0, char const* param_1, dRes_info_c* param_2, - int param_3) { - nofralloc -#include "asm/d/d_resorce/getRes__14dRes_control_cFPCcPCcP11dRes_info_ci.s" -} -#pragma pop -#endif /* 8003C400-8003C470 036D40 0070+00 0/0 7/7 4/4 .text * getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void* dRes_control_c::getIDRes(char const* param_0, u16 param_1, dRes_info_c* param_2, - int param_3) { - nofralloc -#include "asm/d/d_resorce/getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci.s" +void* dRes_control_c::getIDRes(char const* arcName, u16 param_1, dRes_info_c* pInfo, int infoSize) { + dRes_info_c* resInfo = getResInfoLoaded(arcName, pInfo, infoSize); + + if (resInfo == NULL) { + return resInfo; + } + + JKRArchive* archive = resInfo->getArchive(); + int index = mDoExt_resIDToIndex(archive, param_1); + + if (index < 0) { + return 0; + } + + return resInfo->getRes(index); } -#pragma pop /* 8003C470-8003C4E4 036DB0 0074+00 0/0 3/3 0/0 .text syncAllRes__14dRes_control_cFP11dRes_info_ci */ @@ -1114,7 +1350,8 @@ asm void J3DAnmTransformKey::getTransform(u16 param_0, J3DTransformInfo* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DTexNoAnm::calc(u16* param_0) const { +// asm void J3DTexNoAnm::calc(u16* param_0) const { +extern "C" asm void calc__11J3DTexNoAnmCFPUs() { nofralloc #include "asm/d/d_resorce/calc__11J3DTexNoAnmCFPUs.s" } diff --git a/src/d/d_tresure.cpp b/src/d/d_tresure.cpp index 5c373374076..1f7217d2aa4 100644 --- a/src/d/d_tresure.cpp +++ b/src/d/d_tresure.cpp @@ -8,65 +8,28 @@ #include "d/map/d_map_path_dmap.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "d/d_path.h" +#include "SSystem/SComponent/c_math.h" // // Forward References: // -extern "C" void createWork__7dTres_cFv(); -extern "C" void create__7dTres_cFv(); -extern "C" void remove__7dTres_cFv(); -extern "C" void reset__7dTres_cFv(); -extern "C" void addData__7dTres_cFPQ27dTres_c10list_classSc(); -extern "C" void checkTreasureBox__7dTres_cFPQ27dTres_c6data_s(); -extern "C" void onStatus__7dTres_cFUcii(); -extern "C" void offStatus__7dTres_cFUcii(); -extern "C" void getBossIconFloorNo__7dTres_cFPi(); -extern "C" void getFirstData__7dTres_cFUc(); -extern "C" void getNextData__7dTres_cFPQ27dTres_c15typeGroupData_c(); -extern "C" void getNextData__7dTres_cFPCQ27dTres_c15typeGroupData_c(); -extern "C" void setPosition__7dTres_cFiUcPC3Veci(); -extern "C" void getTypeGroupNoToType__7dTres_cFUc(); -extern "C" void getTypeToTypeGroupNo__7dTres_cFUc(); -extern "C" u8 const typeToTypeGroup__7dTres_c[34 + 6 /* padding */]; -extern "C" u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */]; -extern "C" u8 mTypeGroupData__7dTres_c[4]; -extern "C" u8 mNum__7dTres_c[2 + 2 /* padding */]; - // // External References: // -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void isDungeonItem__12dSv_memBit_cCFi(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void correctionOriginPos__10dMapInfo_nFScP3Vec(); -extern "C" void calcFloorNo__10dMapInfo_cFfbi(); -extern "C" void dPath_GetRoomPath__Fii(); -extern "C" void* __nwa__FUl(); -extern "C" void __construct_new_array(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern bool data_80450680; +extern bool data_80450680; /* ############################################################################################## */ /* 80450F98-80450F9C 000498 0004+00 2/2 0/0 0/0 .sbss mTypeGroupData__7dTres_c */ dTres_c::typeGroupData_c* dTres_c::mTypeGroupData; /* 8009BBD8-8009BC18 096518 0040+00 0/0 1/1 0/0 .text createWork__7dTres_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dTres_c::createWork() { - nofralloc -#include "asm/d/d_tresure/createWork__7dTres_cFv.s" +int dTres_c::createWork() { + mTypeGroupData = new dTres_c::typeGroupData_c[0x40]; + return 1; } -#pragma pop /* 8009BC18-8009BC60 096558 0048+00 0/0 1/1 0/0 .text create__7dTres_cFv */ void dTres_c::create() { @@ -82,7 +45,7 @@ void dTres_c::remove() { /* ############################################################################################## */ /* 80425438-80425508 052158 00CC+04 6/6 3/3 0/0 .bss mTypeGroupListAll__7dTres_c */ -dTres_c::list_class dTres_c::mTypeGroupListAll[17]; +dTres_c::type_group_list dTres_c::mTypeGroupListAll[17]; /* 80450F9C-80450FA0 00049C 0002+02 2/2 0/0 0/0 .sbss mNum__7dTres_c */ u16 dTres_c::mNum; @@ -103,88 +66,92 @@ void dTres_c::reset() { /* 8009BCB4-8009BE28 0965F4 0174+00 0/0 1/1 0/0 .text addData__7dTres_cFPQ27dTres_c10list_classSc */ -#ifdef NONMATCHING void dTres_c::addData(dTres_c::list_class* p_list, s8 roomNo) { if (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) != ST_BOSS_ROOM) { reset(); - typeGroupData_c* listData = p_list->field_0x4; + data_s* listData = p_list->field_0x4->getDataPointer(); typeGroupData_c* groupData = &mTypeGroupData[mNum]; - for (int i = 0; i < (int)p_list->field_0x0; i++) { - groupData->mData = listData->mData; - groupData->mData.mRoomNo = roomNo; - groupData->mData.mStatus = 0; + for (int i = 0; i < p_list->field_0x0; i++, listData++, groupData++) { + *(data_s*)groupData = *listData; + groupData->mRoomNo = roomNo; + groupData->mStatus = 0; - u8 typeGroupNo = getTypeToTypeGroupNo(groupData->mData.mType); + u32 typeGroupNo = getTypeToTypeGroupNo(groupData->mType); groupData->setNextDataPointer(NULL); groupData->setTypeGroupNo(typeGroupNo); - list_class* typeGroupList = mTypeGroupListAll + typeGroupNo; + type_group_list* typeGroupList = mTypeGroupListAll + typeGroupNo; if (typeGroupList->field_0x0 == NULL) { typeGroupList->field_0x0 = groupData; } - if (mTypeGroupListAll[i].field_0x4 != NULL) { - mTypeGroupListAll[i].field_0x4->setNextDataPointer(groupData); + if (typeGroupList->field_0x4 != NULL) { + typeGroupList->field_0x4->setNextDataPointer(groupData); } - mTypeGroupListAll[i].field_0x4 = groupData; - mTypeGroupListAll[i].mNumber++; + typeGroupList->field_0x4 = groupData; + typeGroupList->mNumber++; - if ((s32)groupData->mData.mType == 0xFF) { - checkTreasureBox(&groupData->mData); + switch (groupData->mType) { + case 0xFF: + checkTreasureBox(groupData); + break; } mNum++; } } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTres_c::addData(dTres_c::list_class* param_0, s8 param_1) { - nofralloc -#include "asm/d/d_tresure/addData__7dTres_cFPQ27dTres_c10list_classSc.s" -} -#pragma pop -#endif /* ############################################################################################## */ -/* 80452BE8-80452BEC 0011E8 0004+00 1/1 0/0 0/0 .sdata2 @3839 */ -SECTION_SDATA2 static f32 lit_3839 = 182.04444885253906f; - -/* 80452BEC-80452BF0 0011EC 0004+00 1/1 0/0 0/0 .sdata2 @3840 */ -SECTION_SDATA2 static u8 lit_3840[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80452BF0-80452BF8 0011F0 0008+00 1/1 0/0 0/0 .sdata2 @3841 */ -SECTION_SDATA2 static f64 lit_3841 = 0.5; - -/* 80452BF8-80452C00 0011F8 0008+00 1/1 0/0 0/0 .sdata2 @3842 */ -SECTION_SDATA2 static f64 lit_3842 = 3.0; - -/* 80452C00-80452C08 001200 0008+00 1/1 0/0 0/0 .sdata2 @3843 */ -SECTION_SDATA2 static u8 lit_3843[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80452C08-80452C10 001208 0008+00 1/1 0/0 0/0 .sdata2 @3845 */ -SECTION_SDATA2 static f64 lit_3845 = 4503601774854144.0 /* cast s32 to float */; /* 8009BE28-8009C168 096768 0340+00 1/1 0/0 0/0 .text * checkTreasureBox__7dTres_cFPQ27dTres_c6data_s */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTres_c::checkTreasureBox(dTres_c::data_s* param_0) { - nofralloc -#include "asm/d/d_tresure/checkTreasureBox__7dTres_cFPQ27dTres_c6data_s.s" +void dTres_c::checkTreasureBox(dTres_c::data_s* param_0) { + if (param_0->mSwBit != 0xff && param_0->mArg1 != 0xff){ + dPath* path = dPath_GetRoomPath(param_0->mArg1, -1); + + if (path == NULL) return; + + if (param_0->mArg2 == 0) { + s16 sVar5 = 0; + for (int i = 0; i < 4; i++) { + int sStack_62; + if (dComIfGs_isSwitch(param_0->mSwBit + i, param_0->mRoomNo) != 0) { + sStack_62 = (1 << i); + } else { + sStack_62 = 0; + } + sVar5 += sStack_62; + } + if (sVar5 != 0) { + s16 uStack_34 = cM_deg2s((sVar5 - 1) * 0x18 + 12); + cXyz cStack_48(path->m_points[0].m_position); + cXyz cStack_54(path->m_points[path->m_num - 1].m_position); + f32 dVar7 = cStack_48.absXZ(cStack_54); + cXyz local_60(0.0f, 0.0f, dVar7); + mDoMtx_stack_c::YrotS(uStack_34); + mDoMtx_stack_c::multVec(&local_60, &local_60); + local_60 += cStack_48; + local_60.y = cStack_54.y; + param_0->mPos = local_60; + } else { + param_0->mPos = path->m_points[0].m_position; + } + dMapInfo_n::correctionOriginPos(param_0->mRoomNo, ¶m_0->mPos); + } else { + dStage_dPnt_c* point; + if (dComIfGs_isSwitch(param_0->mSwBit, param_0->mRoomNo)) { + point = &path->m_points[path->m_num - 1]; + } else { + point = &path->m_points[0]; + } + + param_0->mPos = point->m_position; + dMapInfo_n::correctionOriginPos(param_0->mRoomNo, ¶m_0->mPos); + } + } } -#pragma pop /* 8009C168-8009C1F0 096AA8 0088+00 0/0 0/0 3/3 .text onStatus__7dTres_cFUcii */ void dTres_c::onStatus(u8 listIdx, int param_1, int flag) { @@ -203,10 +170,9 @@ void dTres_c::onStatus(u8 listIdx, int param_1, int flag) { } /* 8009C1F0-8009C27C 096B30 008C+00 0/0 0/0 3/3 .text offStatus__7dTres_cFUcii */ -#ifdef NONMATCHING void dTres_c::offStatus(u8 listIdx, int param_1, int flag) { typeGroupData_c* groupData = getFirstData(listIdx); - int typeGroupNo = getTypeGroupNumber(listIdx); + s32 typeGroupNo = getTypeGroupNumber(listIdx); for (int i = 0; i < typeGroupNo; i++) { if (param_1 == groupData->getNo()) { @@ -218,16 +184,6 @@ void dTres_c::offStatus(u8 listIdx, int param_1, int flag) { groupData = getNextData(groupData); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dTres_c::offStatus(u8 param_0, int param_1, int param_2) { - nofralloc -#include "asm/d/d_tresure/offStatus__7dTres_cFUcii.s" -} -#pragma pop -#endif /* 8009C27C-8009C360 096BBC 00E4+00 0/0 1/1 0/0 .text getBossIconFloorNo__7dTres_cFPi */ int dTres_c::getBossIconFloorNo(int* o_floorNo) { @@ -265,8 +221,7 @@ dTres_c::typeGroupData_c* dTres_c::getFirstData(u8 listIdx) { return NULL; } - // this is wrong, fix later - return (dTres_c::typeGroupData_c*)mTypeGroupListAll[listIdx].field_0x0; + return mTypeGroupListAll[listIdx].field_0x0; } /* 8009C39C-8009C3B4 096CDC 0018+00 2/2 3/3 0/0 .text @@ -314,12 +269,11 @@ void dTres_c::setPosition(int dataNo, u8 listIdx, Vec const* i_pos, int i_roomNo /* ############################################################################################## */ /* 8037B0D8-8037B100 007738 0022+06 2/2 0/0 0/0 .rodata typeToTypeGroup__7dTres_c */ -SECTION_RODATA u8 const dTres_c::typeToTypeGroup[17][2] = { +u8 const dTres_c::typeToTypeGroup[17][2] = { {0xFF, 0x00}, {0x00, 0x01}, {0x01, 0x02}, {0x02, 0x03}, {0x03, 0x04}, {0x04, 0x05}, {0x05, 0x06}, {0x06, 0x07}, {0x07, 0x08}, {0x80, 0x09}, {0x81, 0x0A}, {0x82, 0x0B}, {0x83, 0x0C}, {0x84, 0x0D}, {0x85, 0x0E}, {0x87, 0x0F}, {0x88, 0x10}, }; -COMPILER_STRIP_GATE(0x8037B0D8, &dTres_c::typeToTypeGroup); /* 8009C49C-8009C4B0 096DDC 0014+00 0/0 1/1 0/0 .text getTypeGroupNoToType__7dTres_cFUc */ diff --git a/src/d/d_vibration.cpp b/src/d/d_vibration.cpp index d6f44ddcd24..81546a355da 100644 --- a/src/d/d_vibration.cpp +++ b/src/d/d_vibration.cpp @@ -8,15 +8,16 @@ #include "dolphin/types.h" #include "d/com/d_com_inf_game.h" #include "m_Do/m_Do_controller_pad.h" +#include "SSystem/SComponent/c_math.h" // // Forward References: // -extern "C" static void func_8006F168(); -extern "C" static void func_8006F184(); -extern "C" static void func_8006F1A4(); -extern "C" static void func_8006F1D8(); +extern "C" static void func_8006F168__FPUsUll(); +extern "C" static void func_8006F184__FUlll(); +extern "C" static u32 func_8006F1A4__FUlll(); +extern "C" static void func_8006F1D8__Fll(); extern "C" void Run__12dVibration_cFv(); extern "C" void StartShock__12dVibration_cFii4cXyz(); extern "C" void StartQuake__12dVibration_cFii4cXyz(); @@ -63,64 +64,284 @@ extern "C" u8 m_gamePad__8mDoCPd_c[16]; /* 8006F168-8006F184 069AA8 001C+00 1/1 0/0 0/0 .text makedata__25@unnamed@d_vibration_cpp@FPUsUll */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8006F168() { - nofralloc -#include "asm/d/d_vibration/func_8006F168.s" +static u16* func_8006F168(u16* param_0, u32 param_1, s32 param_2) { + param_0[0] = param_2; + param_0[1] = param_1 >> 16; + param_0[2] = param_1; + param_0[3] = 0; + return param_0; } -#pragma pop /* 8006F184-8006F1A4 069AC4 0020+00 1/1 0/0 0/0 .text rollshift__25@unnamed@d_vibration_cpp@FUlll */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8006F184() { - nofralloc -#include "asm/d/d_vibration/func_8006F184.s" +static s32 func_8006F184(u32 param_0, s32 param_1, s32 param_2) { + s32 temp = param_2 / param_1; + temp = temp * param_1; + temp = param_2 - temp; + param_2 = param_0 >> temp; + temp = param_1 - temp; + temp = param_0 << temp; + return param_2 | temp; } -#pragma pop /* 8006F1A4-8006F1D8 069AE4 0034+00 2/2 0/0 0/0 .text makebits__25@unnamed@d_vibration_cpp@FUlll */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8006F1A4() { - nofralloc -#include "asm/d/d_vibration/func_8006F1A4.s" +static u32 func_8006F1A4(u32 param_0, s32 param_1, s32 param_2) { + s32 uVar1 = -1; + u32 temp = param_0 & (uVar1 << (32 - param_1)); + param_0 = temp; + uVar1 = param_1; + while (uVar1 < param_2) { + param_0 = temp | (param_0 >> param_1); + uVar1 += param_1; + } + return param_0; } -#pragma pop /* ############################################################################################## */ -/* 80452620-80452628 000C20 0008+00 1/1 0/0 0/0 .sdata2 @3756 */ -SECTION_SDATA2 static f64 lit_3756 = 4503601774854144.0 /* cast s32 to float */; /* 8006F1D8-8006F268 069B18 0090+00 1/1 0/0 0/0 .text randombit__25@unnamed@d_vibration_cpp@Fll */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8006F1D8() { - nofralloc -#include "asm/d/d_vibration/func_8006F1D8.s" +static u32 func_8006F1D8(s32 param_0, s32 param_1) { + u32 uVar3 = 0; + + for (s32 iVar2 = 0; iVar2 < param_0; iVar2++) { + u32 dVar4 = param_1 * cM_rnd(); + uVar3 |= 0x40000000 >> dVar4; + } + return uVar3; } -#pragma pop /* ############################################################################################## */ /* 80450F50-80450F58 000450 0008+00 1/1 0/0 0/0 .sbss data$3831 */ -static u8 data[8]; +static u16 data[4]; /* 8006F268-8006FA24 069BA8 07BC+00 0/0 2/2 0/0 .text Run__12dVibration_cFv */ +// Stack issues +#ifdef NONMATCHING +int dVibration_c::Run() { + + field_0x8c = 1; + if (dComIfGs_checkOptVibration() != 1) { + if (field_0x54 != -1) { + field_0x54 = -1; + field_0x50 |= 1; + } + if (field_0x70 != -1) { + field_0x70 = -1; + field_0x6c |= 1; + } + field_0x80 = -99; + field_0x64 = 0xffffff9d; + } + + if (((field_0x0.mShock.field_0x0 & 1) != 0) && (field_0x0.mShock.field_0x24 != -99)) { + field_0x0.mShock.field_0x24 = 0; + field_0x0.mShock.field_0x4 = -1; + } + if (((field_0x0.mQuake.field_0x0 & 1) != 0) && (field_0x0.mQuake.field_0x24 != -99)) { + field_0x0.mQuake.field_0x24 = 0; + field_0x0.mQuake.field_0x4 = -1; + } + + if (field_0x0.mShock.field_0x24 == 0 || field_0x0.mQuake.field_0x24 == 0) { + s32 local_68 = 0; + if (field_0x0.mShock.field_0x4 == -1 || (field_0x0.mShock.field_0x0 & 1) != 0) { + field_0x0.mShock.field_0x24 = -99; + field_0x0.mShock.field_0x8 = 0; + field_0x0.mShock.field_0xc = 0; + field_0x0.mShock.field_0x10 = 0; + } else if (field_0x0.mShock.field_0x24 >= 0) { + local_68 |= 1; + } + + if (field_0x0.mQuake.field_0x4 == -1 || (field_0x0.mQuake.field_0x0 & 1) != 0) { + field_0x0.mQuake.field_0x24 = -99; + field_0x0.mQuake.field_0x8 = 0; + field_0x0.mQuake.field_0xc = 0; + field_0x0.mQuake.field_0x10 = 0; + } else if (field_0x0.mQuake.field_0x24 >= 0) { + local_68 |= 2; + } + + switch (local_68) { + case 1: + s32 x = field_0x0.mShock.field_0xc; + u32 local_60 = field_0x0.mShock.field_0x8; + local_60 |= func_8006F1D8(field_0x0.mShock.field_0x10, x); + s32 uVar3 = field_0x0.mShock.field_0x14; + if (dKy_darkworld_check()) { + uVar3 &= ~0x30; + } + camera_class* pCamera = dComIfGp_getCamera(0); + if (pCamera && pCamera->field_0x22f == 0x47) { + dCam_getBody()->StartShake(x, (u8*)&local_60, uVar3, field_0x0.mShock.field_0x18.norm()); + } + break; + case 2: + x = field_0x0.mQuake.field_0xc; + local_60 = func_8006F184(field_0x0.mQuake.field_0x8, x, field_0x88); + local_60 |= func_8006F1D8(field_0x0.mQuake.field_0x10, x); + uVar3 = field_0x0.mQuake.field_0x14; + if (dKy_darkworld_check()) { + uVar3 &= ~0x30; + } + pCamera = dComIfGp_getCamera(0); + if (pCamera && pCamera->field_0x22f == 0x47) { + dCam_getBody()->StartShake(x, (u8*)&local_60, uVar3, field_0x0.mQuake.field_0x18.norm()); + } + break; + case 3: + local_60 = field_0x0.mShock.field_0x8 << field_0x0.mShock.field_0x24; + x = field_0x0.mShock.field_0xc - field_0x0.mShock.field_0x24; + local_60 |= func_8006F184(func_8006F1A4(field_0x0.mQuake.field_0x8, field_0x0.mQuake.field_0xc, x), x, field_0x88); + local_60 |= func_8006F1D8( + field_0x0.mShock.field_0x10 > field_0x0.mQuake.field_0x10 ? field_0x0.mShock.field_0x10 : field_0x0.mQuake.field_0x10, + x + ); + uVar3 = field_0x0.mShock.field_0x14 | field_0x0.mQuake.field_0x14; + if (dKy_darkworld_check()) { + uVar3 &= ~0x30; + } + pCamera = dComIfGp_getCamera(0); + if (pCamera && pCamera->field_0x22f == 0x47) { + cXyz tempSum = field_0x0.mShock.field_0x18 + field_0x0.mQuake.field_0x18; + dCam_getBody()->StartShake(x, (u8*)&local_60, uVar3, tempSum.norm()); + } + field_0x0.mQuake.field_0x24 = 0; + field_0x0.mShock.field_0x24 = 0; + break; + default: + pCamera = dComIfGp_getCamera(0); + if (pCamera && pCamera->field_0x22f == 0x47) { + dCam_getBody()->StopShake(); + } + break; + } + } + + if (((field_0x50 & 1) != 0) && (field_0x64 != -99)) { + field_0x64 = 0; + field_0x54 = -1; + } + + if (((field_0x6c & 1) != 0) && (field_0x80 != -99)) { + field_0x80 = 0; + field_0x70 = -1; + } + + if (field_0x64 == 0 || field_0x80 == 0) { + s32 local_68 = 0; + if (field_0x54 == -1 || (field_0x50 & 1) != 0) { + field_0x64 = -99; + field_0x58 = 0; + field_0x5c = 0; + field_0x60 = 0; + } else if (field_0x64 >= 0) { + local_68 |= 1; + } + + if (field_0x70 == -1 || (field_0x6c & 1) != 0) { + field_0x80 = -99; + field_0x74 = 0; + field_0x78 = 0; + field_0x7c = 0; + } else if (field_0x80 >= 0) { + local_68 |= 2; + } + switch (local_68) { + case 1: + u32 local_60; + s32 x = field_0x5c; + local_60 = field_0x58; + local_60 |= func_8006F1D8(field_0x60, x); + field_0x68 = x; + mDoCPd_c::startMotorWave(0, func_8006F168(data, local_60, x), JUTGamePad::CRumble::VAL_0, 0x3c); + break; + case 2: + x = field_0x78; + local_60 = func_8006F184(field_0x74, x, field_0x88); + local_60 |= func_8006F1D8(field_0x7c, x); + field_0x84 = 0x7fffffff; + mDoCPd_c::startMotorWave(0, func_8006F168(data, local_60, x), JUTGamePad::CRumble::VAL_1, 0x3c); + break; + case 3: + local_60 = field_0x58 << field_0x64; + x = field_0x5c - field_0x64; + local_60 |= func_8006F184(func_8006F1A4(field_0x74, field_0x78, x), x, field_0x88); + local_60 |= func_8006F1D8( + field_0x60 > field_0x7c ? field_0x60 : field_0x7c, + x + ); + field_0x84 = x; + field_0x68 = x; + field_0x80 = 0; + field_0x64 = 0; + mDoCPd_c::startMotorWave(0, func_8006F168(data, local_60, x), JUTGamePad::CRumble::VAL_0, 0x3c); + break; + default: + mDoCPd_c::stopMotorWave(0); + mDoCPd_c::stopMotor(0); + field_0x84 = -99; + field_0x68 = -99; + break; + } + } + + field_0x0.mQuake.field_0x0 = 0; + field_0x0.mShock.field_0x0 = 0; + field_0x6c = 0; + field_0x50 = 0; + + if (field_0x0.mShock.field_0x24 >= 0) { + field_0x0.mShock.field_0x24++; + + if (field_0x0.mShock.field_0x24 > field_0x0.mShock.field_0xc) { + field_0x0.mShock.field_0x0 |= 1; + } + } + + if (field_0x64 >= 0) { + field_0x64++; + + if (field_0x64 > field_0x68) { + field_0x50 |= 1; + } + } + + if (field_0x0.mQuake.field_0x24 >= 0) { + field_0x0.mQuake.field_0x24++; + + if (field_0x0.mQuake.field_0x24 > field_0x0.mQuake.field_0xc) { + field_0x0.mQuake.field_0x24 = 0; + } + } + + if (field_0x80 >= 930) { + field_0x80 = 0; + } else if (field_0x80 >= 900) { + mDoCPd_c::stopMotorWave(0); + mDoCPd_c::stopMotor(0); + field_0x80++; + } else if (field_0x80 >= 0) { + field_0x80++; + if (field_0x80 > field_0x84) { + field_0x80 = 0; + } + } + + field_0x88++; + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dVibration_c::Run() { +asm int dVibration_c::Run() { nofralloc #include "asm/d/d_vibration/Run__12dVibration_cFv.s" } #pragma pop +#endif /* 8006FA24-8006FB10 06A364 00EC+00 0/0 62/62 298/298 .text StartShock__12dVibration_cFii4cXyz */ bool dVibration_c::StartShock(int param_0, int param_1, cXyz param_2) { @@ -170,14 +391,58 @@ bool dVibration_c::StartQuake(int param_0, int param_1, cXyz param_2) { } /* 8006FC0C-8006FD94 06A54C 0188+00 0/0 2/2 2/2 .text StartQuake__12dVibration_cFPCUcii4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dVibration_c::StartQuake(u8 const* param_0, int param_1, int param_2, cXyz param_3) { - nofralloc -#include "asm/d/d_vibration/StartQuake__12dVibration_cFPCUcii4cXyz.s" +bool dVibration_c::StartQuake(u8 const* param_0, int param_1, int param_2, cXyz param_3) { + int iVar7; + int iVar6; + int iVar5; + int iVar4; + bool bVar8 = false; + int uVar1 = (param_0[0] << 8) | param_0[1]; + if (uVar1 >= 9) { + iVar7 = 3; + } else { + iVar7 = 0; + } + if (uVar1 >= 1) { + iVar6 = 2; + } else { + iVar6 = 0; + } + + if (uVar1 >= 0x11) { + iVar5 = 4; + } else { + iVar5 = 0; + } + if (uVar1 >= 0x19) { + iVar4 = 5; + } else { + iVar4 = 0; + } + u32 this_00 = + param_0[iVar6] << 24 | param_0[iVar7] << 16 | param_0[iVar5] << 8 | (param_0[iVar4]); + if ((param_2 & 0x7e) != 0) { + field_0x0.mQuake.field_0x4 = 0; + field_0x0.mQuake.field_0x24 = 0; + field_0x0.mQuake.field_0x14 = param_2; + field_0x0.mQuake.field_0x18 = param_3; + field_0x0.mQuake.field_0x8 = func_8006F1A4(this_00, param_0[1], 0x20); + field_0x0.mQuake.field_0xc = 0x20; + field_0x0.mQuake.field_0x10 = param_1; + bVar8 = true; + } + if (((param_2 & 1) != 0) && + (dComIfGs_checkOptVibration() == 1)) + { + field_0x70 = 0; + field_0x80 = 0; + field_0x74 = func_8006F1A4(this_00, param_0[1], 0x20); + field_0x78 = 0x20; + field_0x7c = param_1; + bVar8 = true; + } + return bVar8; } -#pragma pop /* 8006FD94-8006FE00 06A6D4 006C+00 0/0 6/6 82/82 .text StopQuake__12dVibration_cFi */ int dVibration_c::StopQuake(int param_0) { diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index 004225ab224..9ab4514e203 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -489,12 +489,12 @@ int dEvt_control_c::catchCheck(dEvt_order_c* p_order) { /* 80041D34-80041DDC 03C674 00A8+00 1/1 0/0 0/0 .text talkEnd__14dEvt_control_cFv */ int dEvt_control_c::talkEnd() { - fopAc_ac_c* actor = (fopAc_ac_c*)getPt1(); + fopAc_ac_c* actor = getPt1(); if (actor != NULL) { actor->mEvtInfo.setCommand(0); } - actor = (fopAc_ac_c*)getPt2(); + actor = getPt2(); if (actor != NULL) { actor->mEvtInfo.setCommand(0); } @@ -560,12 +560,12 @@ int dEvt_control_c::demoCheck(dEvt_order_c* p_order) { /* 80041F18-80041FA0 03C858 0088+00 1/1 0/0 0/0 .text demoEnd__14dEvt_control_cFv */ int dEvt_control_c::demoEnd() { - fopAc_ac_c* actor = (fopAc_ac_c*)getPt1(); + fopAc_ac_c* actor = getPt1(); if (actor != NULL) { actor->mEvtInfo.setCommand(0); } - actor = (fopAc_ac_c*)getPt2(); + actor = getPt2(); if (actor != NULL) { actor->mEvtInfo.setCommand(0); } @@ -597,7 +597,7 @@ int dEvt_control_c::doorCheck(dEvt_order_c* p_order) { if (commonCheck(p_order, 4, 3)) { mMode = EVT_MODE_DEMO; - fopAc_ac_c* actor2 = (fopAc_ac_c*)getPt2(); + fopAc_ac_c* actor2 = getPt2(); if (actor2 != NULL) { i_dComIfGp_getEventManager().setObjectArchive(actor2->mEvtInfo.getArchiveName()); } @@ -754,9 +754,9 @@ int dEvt_control_c::entry() { /* 80042468-80042518 03CDA8 00B0+00 1/1 8/8 388/388 .text reset__14dEvt_control_cFv */ void dEvt_control_c::reset() { if (field_0xec != 0xFF) { - void* pt1 = getPt1(); + fopAc_ac_c* pt1 = getPt1(); s16 eventIdx = i_dComIfGp_getEventManager().getEventIdx(NULL, field_0xec, -1); - void* pt2 = getPt2(); + fopAc_ac_c* pt2 = getPt2(); order(EVT_TYPE_OTHER, 3, 0x201, mHindFlag, pt1, pt2, eventIdx, field_0xec); mChangeOK = pt1; @@ -769,7 +769,7 @@ void dEvt_control_c::reset() { void dEvt_control_c::reset(void* param_0) { if (field_0xec != 0xFF) { s16 eventIdx = i_dComIfGp_getEventManager().getEventIdx((fopAc_ac_c*)param_0, field_0xec); - void* pt2 = getPt2(); + fopAc_ac_c* pt2 = getPt2(); order(EVT_TYPE_OTHER, 3, 0x201, mHindFlag, param_0, pt2, eventIdx, field_0xec); } @@ -970,7 +970,7 @@ bool dEvt_control_c::skipper() { if (startSkip) { dMsgObject_onKillMessageFlag(); - void* ptr = convPId(field_0x104); + fopAc_ac_c* ptr = convPId(field_0x104); if (ptr == NULL) { ptr = dComIfGp_getPlayer(0); } @@ -1240,8 +1240,8 @@ u32 dEvt_control_c::getPId(void* actor) { } /* 800432EC-8004331C 03DC2C 0030+00 7/7 13/13 16/16 .text convPId__14dEvt_control_cFUi */ -void* dEvt_control_c::convPId(unsigned int id) { - return fopAcIt_Judge(fpcSch_JudgeByID, &id); +fopAc_ac_c* dEvt_control_c::convPId(unsigned int id) { + return (fopAc_ac_c*)fopAcIt_Judge(fpcSch_JudgeByID, &id); } /* 8004331C-800433F0 03DC5C 00D4+00 0/0 1/1 0/0 .text getStbDemoData__14dEvt_control_cFPc diff --git a/src/d/event/d_event_manager.cpp b/src/d/event/d_event_manager.cpp index 556a3f3615c..4fea4c76949 100644 --- a/src/d/event/d_event_manager.cpp +++ b/src/d/event/d_event_manager.cpp @@ -464,7 +464,7 @@ void dEvent_manager_c::Sequencer() { evtControl.onSkipFade(); } - void* actor = evtControl.getPt1(); + fopAc_ac_c* actor = evtControl.getPt1(); if (actor == NULL) { actor = evtControl.getPt2(); } @@ -1042,7 +1042,6 @@ int dEvent_manager_c::getMySubstanceNum(int index, char const* name) { /* 8004817C-800481F4 042ABC 0078+00 1/1 78/78 182/182 .text cutEnd__16dEvent_manager_cFi */ -#ifdef NONMATCHING void dEvent_manager_c::cutEnd(int cutIndex) { if (i_dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { return; @@ -1052,19 +1051,10 @@ void dEvent_manager_c::cutEnd(int cutIndex) { return; } else { // instruction swap - mFlags.flagSet(getBase().getCutStaffCurrentCutP(cutIndex)->getFlagId()); + dEvDtCut_c* cut = getBase().getCutStaffCurrentCutP(cutIndex); + mFlags.flagSet(cut->getFlagId()); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::cutEnd(int param_0) { - nofralloc -#include "asm/d/event/d_event_manager/cutEnd__16dEvent_manager_cFi.s" -} -#pragma pop -#endif /* 800481F4-800482CC 042B34 00D8+00 0/0 4/4 0/0 .text * getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs */ diff --git a/src/d/file/d_file_select.cpp b/src/d/file/d_file_select.cpp index de8ebe15e6f..52707f9efd8 100644 --- a/src/d/file/d_file_select.cpp +++ b/src/d/file/d_file_select.cpp @@ -19,6 +19,7 @@ #include "dolphin/types.h" #include "m_Do/m_Do_MemCard.h" #include "m_Do/m_Do_controller_pad.h" +#include "m_Do/m_Do_graphic.h" // @@ -1904,11 +1905,28 @@ SECTION_SDATA2 static f32 lit_4166[1 + 1 /* padding */] = { }; /* 801843CC-801844FC 17ED0C 0130+00 0/0 1/1 0/0 .text _create__14dFile_select_cFv */ +// Matches with literals #ifdef NONMATCHING void dFile_select_c::_create() { mDoGph_gInf_c::setFadeColor(static_cast(g_blackColor)); - mStick = new STControl(); + mStick = new STControl(2, 2, 1, 1, 0.9f, 0.5f, 0, 0x2000); g_fsHIO.field_0x0004 = -1; + for (int iVar2 = 0; iVar2 < 3; iVar2++) { + mDataNew[iVar2] = 0; + field_0x025b[iVar2] = 0; + } + + mSelectNum = 0; + dComIfGs_init(); + dComIfGp_itemDataInit(); + dComIfGs_setNewFile(0); + mHasDrawn = 0; + screenSet(); + screenSetCopySel(); + screenSet3Menu(); + screenSetYesNo(); + screenSetDetail(); + displayInit(); } #else #pragma push diff --git a/src/d/map/d_map_path_dmap.cpp b/src/d/map/d_map_path_dmap.cpp index 1e8d53c23dd..170d86a3e25 100644 --- a/src/d/map/d_map_path_dmap.cpp +++ b/src/d/map/d_map_path_dmap.cpp @@ -301,23 +301,21 @@ Vec dMapInfo_n::getMapRestartPos() { /* 8003F0F8-8003F19C 039A38 00A4+00 1/1 1/1 0/0 .text getMapRestartAngleY__10dMapInfo_nFv */ -// small regalloc -#ifdef NONMATCHING s16 dMapInfo_n::getMapRestartAngleY() { int angle = dComIfGs_getRestartRoomAngleY(); const dTres_c::typeGroupData_c* icon_data = getConstRestartIconPointer(); if (icon_data != NULL) { - int icon_angle = icon_data->getAngleY(); - bool tmp = icon_angle > 0; + angle = icon_data->getAngleY(); + bool tmp = angle > 0; if (tmp) { - icon_angle = -icon_angle; + angle = -angle; } - angle = icon_angle * 0x0100; + angle = angle * 0x0100; if (tmp) { - angle = icon_angle * -0x0100; + angle = -angle; } } @@ -329,16 +327,6 @@ s16 dMapInfo_n::getMapRestartAngleY() { return angle; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s16 dMapInfo_n::getMapRestartAngleY() { - nofralloc -#include "asm/d/map/d_map_path_dmap/getMapRestartAngleY__10dMapInfo_nFv.s" -} -#pragma pop -#endif /* 8003F19C-8003F1F4 039ADC 0058+00 0/0 1/1 0/0 .text getRoomCenter__10dMapInfo_nFiPfPf */ @@ -896,24 +884,49 @@ asm int renderingDAmap_c::getNextDrawRoomNo(int param_0) { #endif /* 80040134-800401E8 03AA74 00B4+00 3/0 3/0 0/0 .text getFirstRoomPointer__16renderingDAmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dDrawPath_c::room_class* renderingDAmap_c::getFirstRoomPointer() { - nofralloc -#include "asm/d/map/d_map_path_dmap/getFirstRoomPointer__16renderingDAmap_cFv.s" +dDrawPath_c::room_class* renderingDAmap_c::getFirstRoomPointer() { + dDrawPath_c::room_class* pRoomClass = NULL; + mRoomNo = getFirstDrawRoomNo(); + if (mRoomNo >= 0) { + field_0x28 = getFirstDrawLayerNo(); + + pRoomClass = dMpath_c::getRoomPointer(field_0x28, mRoomNo); + if (pRoomClass == NULL) { + pRoomClass = getNextRoomPointer(); + } + } + + if(pRoomClass != NULL) { + setSingleRoomSetting(); + } + return pRoomClass; } -#pragma pop /* 800401E8-800402C0 03AB28 00D8+00 3/0 3/0 0/0 .text getNextRoomPointer__16renderingDAmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dDrawPath_c::room_class* renderingDAmap_c::getNextRoomPointer() { - nofralloc -#include "asm/d/map/d_map_path_dmap/getNextRoomPointer__16renderingDAmap_cFv.s" +dDrawPath_c::room_class* renderingDAmap_c::getNextRoomPointer() { + dDrawPath_c::room_class* pRoomClass = NULL; + bool bVar1 = false; + do { + mRoomNo = getNextDrawRoomNo(mRoomNo); + if (mRoomNo < 0) { + field_0x28 = getNextDrawLayerNo(field_0x28); + if (field_0x28 < 0) { + bVar1 = true; + } else { + mRoomNo = getFirstDrawRoomNo(); + } + } + + if (!bVar1) { + pRoomClass = dMpath_c::getRoomPointer(field_0x28, mRoomNo); + } + } while(pRoomClass == NULL && !bVar1); + + if (pRoomClass != NULL) { + setSingleRoomSetting(); + } + return pRoomClass; } -#pragma pop /* 800402C0-800402E0 03AC00 0020+00 3/0 3/0 0/0 .text isDrawPath__16renderingDAmap_cFv */ bool renderingDAmap_c::isDrawPath() { @@ -921,8 +934,8 @@ bool renderingDAmap_c::isDrawPath() { } /* 800402E0-800402E8 03AC20 0008+00 3/0 3/0 0/0 .text getFirstDrawLayerNo__16renderingDAmap_cFv */ -bool renderingDAmap_c::getFirstDrawLayerNo() { - return false; +int renderingDAmap_c::getFirstDrawLayerNo() { + return 0; } /* 800402E8-800402FC 03AC28 0014+00 3/0 3/0 0/0 .text getNextDrawLayerNo__16renderingDAmap_cFi */ @@ -1232,8 +1245,9 @@ void renderingPlusDoorAndCursor_c::drawTreasure() { setTevSettingIntensityTextureToCI(); for (int i = 0; i < 4; i++) { + dTres_c::typeGroupData_c* typeGroupData_p; u8 tmp = l_treasureDispList_4524[i].field_0x0; - dTres_c::typeGroupData_c* typeGroupData_p = getFirstData(tmp); + typeGroupData_p = getFirstData(tmp); int group_num = getIconGroupNumber(tmp); if (group_num != 0) { @@ -1256,7 +1270,7 @@ void renderingPlusDoorAndCursor_c::drawTreasure() { GXSetTevColor(GX_TEVREG2, sp18); for (int j = 0; j < group_num && typeGroupData_p != NULL; j++) { - Vec* icon_pos = getIconPosition(typeGroupData_p); + const Vec* icon_pos = getIconPosition(typeGroupData_p); if (tmp == 0) { if (mRoomNoSingle != typeGroupData_p->getRoomNo()) { diff --git a/src/d/map/d_map_path_fmap.cpp b/src/d/map/d_map_path_fmap.cpp index de419779eef..61c4e42e9b1 100644 --- a/src/d/map/d_map_path_fmap.cpp +++ b/src/d/map/d_map_path_fmap.cpp @@ -277,7 +277,7 @@ void dMenu_Fmap_room_data_c::buildTresTypeGroup(int param_0, int param_1, int pa dTres_c::list_class* tresure_p = mp_fmapData->getTresure(); if (tresure_p != NULL) { int num = tresure_p->field_0x0; - dTres_c::data_s* data_p = tresure_p->field_0x4; + dTres_c::data_s* data_p = tresure_p->field_0x4->getDataPointer(); if (mp_fmpTresTypeGroupDataListAll == NULL) { mp_fmpTresTypeGroupDataListAll = new fmpTresTypeGroupDataListAll_c(); diff --git a/src/d/menu/d_menu_collect.cpp b/src/d/menu/d_menu_collect.cpp index ae5417b21e2..313fc9a12df 100644 --- a/src/d/menu/d_menu_collect.cpp +++ b/src/d/menu/d_menu_collect.cpp @@ -4,19 +4,36 @@ // #include "d/menu/d_menu_collect.h" -#include "d/d_lib.h" +#include "JSystem/J2DGraph/J2DAnimation.h" +#include "JSystem/J2DGraph/J2DAnmLoader.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "MSL_C/string.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_lib.h" +#include "d/d_select_cursor.h" +#include "d/meter/d_meter_HIO.h" +#include "d/meter/d_meter2_info.h" +#include "d/menu/d_menu_fishing.h" +#include "d/menu/d_menu_insect.h" +#include "d/menu/d_menu_letter.h" +#include "d/menu/d_menu_option.h" +#include "d/menu/d_menu_save.h" +#include "d/menu/d_menu_skill.h" +#include "d/msg/d_msg_string.h" +#include "d/pane/d_pane_class.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" +#include "m_Do/m_Do_graphic.h" +#include "m_Do/m_Do_mtx.h" // // Types: // -struct mDoGph_gInf_c { - static u8 mFader[4]; -}; - struct daAlink_c { /* 80140064 */ void setShieldChange(); /* 801406A8 */ void initStatusWindow(); @@ -25,96 +42,12 @@ struct daAlink_c { /* 80140AC8 */ void resetStatusWindow(); }; -struct dSv_player_status_a_c { - /* 80032AA8 */ void getRupeeMax() const; -}; - -struct dSv_player_get_item_c { - /* 80033EC8 */ void isFirstBit(u8) const; -}; - -struct dSv_player_collect_c { - /* 8003424C */ void isCollectCrystal(u8) const; - /* 80034290 */ void isCollectMirror(u8) const; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dMsgString_c { - /* 80249C20 */ dMsgString_c(); - /* 80249D28 */ ~dMsgString_c(); -}; - struct dMsgObject_c { /* 802383E4 */ void getSmellTypeMessageID(); }; struct JMSMesgEntry_c {}; -struct dMeter2Info_c { - /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); -}; - -struct dMenu_save_c { - /* 801EF6A0 */ dMenu_save_c(); - /* 801EF7AC */ void _create(); - /* 801F0938 */ void initialize(); - /* 801F09AC */ void _open(); - /* 801F0B10 */ void _close(); - /* 801F0B28 */ void _delete(); - /* 801F1048 */ void _move(); - /* 801F69B8 */ void _draw(); -}; - -struct dMenu_Skill_c { - /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*); - /* 801F7718 */ void _move(); - /* 801F77B0 */ void _draw(); - /* 801F7A40 */ void _open(); - /* 801F7C1C */ void _close(); -}; - -struct dMenu_Option_c { - /* 801E1F10 */ dMenu_Option_c(JKRArchive*, STControl*); - /* 801E2C1C */ void _delete(); - /* 801E3408 */ void _move(); - /* 801E36CC */ void _draw(); - /* 801E3B98 */ void _open(); - /* 801E3DE0 */ void _close(); - /* 801E8210 */ void initialize(); -}; - -struct dMenu_Letter_c { - /* 801DCDC0 */ dMenu_Letter_c(JKRExpHeap*, STControl*, CSTControl*); - /* 801DD474 */ void _move(); - /* 801DD50C */ void _draw(); - /* 801DDA74 */ void _open(); - /* 801DDC98 */ void _close(); -}; - -struct dMenu_Insect_c { - /* 801D8114 */ dMenu_Insect_c(JKRExpHeap*, STControl*, CSTControl*, u8); - /* 801D86C8 */ void _move(); - /* 801D8760 */ void _draw(); - /* 801D894C */ void _open(); - /* 801D8B2C */ void _close(); - /* 801D9D4C */ void getGetInsectNum(); -}; - -struct dMenu_Fishing_c { - /* 801C4D54 */ dMenu_Fishing_c(JKRExpHeap*, STControl*, CSTControl*); - /* 801C50B4 */ void _move(); - /* 801C514C */ void _draw(); - /* 801C52E4 */ void _open(); - /* 801C5470 */ void _close(); -}; - struct J3DTexNoAnm { /* 8003B1F8 */ ~J3DTexNoAnm(); /* 8003B240 */ J3DTexNoAnm(); @@ -154,10 +87,6 @@ struct J3DAnmLoaderDataBase { /* 80337B40 */ void load(void const*, J3DAnmLoaderDataBaseFlag); }; -struct J2DAnmLoaderDataBase { - /* 80308A6C */ void load(void const*); -}; - // // Forward References: // @@ -424,9 +353,6 @@ extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__8J3DModel[9]; extern "C" extern void* __vt__14J3DMaterialAnm[4]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_meter2_info[248]; extern "C" f32 Zero__4cXyz[3]; extern "C" u8 mFader__13mDoGph_gInf_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -980,6 +906,32 @@ SECTION_SDATA2 static f32 lit_4482 = 1.0f; /* 801AFD48-801AFE34 1AA688 00EC+00 1/1 0/0 0/0 .text * __ct__17dMenu_Collect2D_cFP10JKRExpHeapP9STControlP10CSTControl */ +// matches with literals +#ifdef NONMATCHING +dMenu_Collect2D_c::dMenu_Collect2D_c(JKRExpHeap* param_0, STControl* param_1, CSTControl* param_2) { + mpHeap = param_0; + field_0x10 = param_1; + field_0x14 = param_2; + field_0xc = NULL; + field_0x40 = daPy_py_c::i_checkNowWolf(); + field_0x7c.set(0.0f, 0.0f, 0.0f); + for (int i = 0; i < 2; i++) { + field_0x44[i] = 1.0f; + field_0x4c[i] = 1.0f; + } + field_0x54 = 0.0f; + field_0x58 = 0.0f; + field_0x5c = 1.0f; + field_0x60 = 1.0f; + field_0x64 = 0.0f; + field_0x68 = 0.0f; + field_0x6c = 1.0f; + field_0x70 = 0.0f; + field_0x74 = 0.0f; + field_0x78 = 1.0f; + mpSubHeap = JKRCreateExpHeap(0x00046000, mpHeap, 0); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -989,36 +941,131 @@ asm dMenu_Collect2D_c::dMenu_Collect2D_c(JKRExpHeap* param_0, STControl* param_1 #include "asm/d/menu/d_menu_collect/__ct__17dMenu_Collect2D_cFP10JKRExpHeapP9STControlP10CSTControl.s" } #pragma pop +#endif /* 801AFE34-801AFEA4 1AA774 0070+00 1/0 0/0 0/0 .text __dt__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMenu_Collect2D_c::~dMenu_Collect2D_c() { - nofralloc -#include "asm/d/menu/d_menu_collect/__dt__17dMenu_Collect2D_cFv.s" +dMenu_Collect2D_c::~dMenu_Collect2D_c() { + if (mpSubHeap) { + mDoExt_destroyExpHeap(mpSubHeap); + mpSubHeap = NULL; + } } -#pragma pop /* 801AFEA4-801B0100 1AA7E4 025C+00 1/1 0/0 0/0 .text _create__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::_create() { - nofralloc -#include "asm/d/menu/d_menu_collect/_create__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::_create() { + mpHeap->getTotalFreeSize(); + mpScreen = new J2DScreen(); + mpScreen->setPriority("zelda_collect_soubi_screen.blo", 0x1020000, dComIfGp_getCollectResArchive()); + dPaneClass_showNullPane(mpScreen); + mpScreenIcon = new J2DScreen(); + mpScreenIcon->setPriority("zelda_collect_soubi_do_icon_parts.blo", 0x20000, dComIfGp_getCollectResArchive()); + for (int i = 0; i < 2; i++) { + mpButtonAB[i] = NULL; + mpButtonText[i] = NULL; + } + dPaneClass_showNullPane(mpScreenIcon); + mpDraw2DTop = new dMenu_Collect2DTop_c(this); + ResTIMG* image = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); + mpBlackTex = new J2DPicture(image); + mpBlackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 255)); + mpBlackTex->setAlpha(0); + mpDrawCursor = new dSelect_cursor_c(2, lit_4482, NULL); + mpString = new dMsgString_c(); + mpSaveScrn = NULL; + mpOptionScrn = NULL; + mpLetterScrn = NULL; + mpFishingScrn = NULL; + mpSkillScrn = NULL; + mpInsectScrn = NULL; + field_0x22c = 0; + animationSet(); + screenSet(); + initialize(); + setHIO(true); } -#pragma pop /* 801B0100-801B0570 1AAA40 0470+00 1/1 0/0 0/0 .text _delete__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::_delete() { - nofralloc -#include "asm/d/menu/d_menu_collect/_delete__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::_delete() { + mpHeap->getTotalFreeSize(); + dMeter2Info_setCollectCursorPosXY(mCursorX, mCursorY); + delete mpScreen; + mpScreen = NULL; + delete mpScreenIcon; + mpScreenIcon = NULL; + for (int i = 0; i < 2; i++) { + if (mpButtonAB[i]) { + delete mpButtonAB[i]; + mpButtonAB[i] = NULL; + } + if (mpButtonText[i]) { + delete mpButtonText[i]; + mpButtonText[i] = NULL; + } + } + delete mpDraw2DTop; + mpDraw2DTop = NULL; + delete mpBlackTex; + mpBlackTex = NULL; + delete mpDrawCursor; + mpDrawCursor = NULL; + delete mpString; + mpString = NULL; + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpSaveScrn) { + mpSaveScrn->_delete(); + delete mpSaveScrn; + mpSaveScrn = NULL; + mpSubHeap->freeAll(); + } + if (mpOptionScrn) { + mpOptionScrn->_delete(); + delete mpOptionScrn; + mpOptionScrn = NULL; + mpSubHeap->freeAll(); + } + if (mpLetterScrn) { + delete mpLetterScrn; + mpLetterScrn = NULL; + mpSubHeap->freeAll(); + } + if (mpFishingScrn) { + delete mpFishingScrn; + mpFishingScrn = NULL; + mpSubHeap->freeAll(); + } + if (mpSkillScrn) { + delete mpSkillScrn; + mpSkillScrn = NULL; + mpSubHeap->freeAll(); + } + if (mpInsectScrn) { + delete mpInsectScrn; + mpInsectScrn = NULL; + mpSubHeap->freeAll(); + } + mDoExt_setCurrentHeap(heap); + delete field_0x2c; + field_0x2c = NULL; + for (int i = 0; i < 7; i++) { + for (int j = 0; j < 6; j++) { + if (mpSelPm[i][j]) { + delete mpSelPm[i][j]; + mpSelPm[i][j] = NULL; + } + } + } + delete mpLinkPm; + mpLinkPm = NULL; + delete mpMaskPm; + mpMaskPm = NULL; + delete mpModelBg; + mpModelBg = NULL; + delete mpHeartParent; + mpHeartParent = NULL; + delete mpHeartPiece; + mpHeartPiece = NULL; + dComIfGp_getCollectResArchive()->removeResourceAll(); } -#pragma pop /* 801B0570-801B05A8 1AAEB0 0038+00 1/1 0/0 0/0 .text initialize__17dMenu_Collect2D_cFv */ @@ -1032,35 +1079,40 @@ asm void dMenu_Collect2D_c::initialize() { #pragma pop /* 801B05A8-801B061C 1AAEE8 0074+00 2/2 0/0 0/0 .text isFishIconVisible__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::isFishIconVisible() { - nofralloc -#include "asm/d/menu/d_menu_collect/isFishIconVisible__17dMenu_Collect2D_cFv.s" +bool dMenu_Collect2D_c::isFishIconVisible() { + if (dComIfGs_getFishNum(0) || + dComIfGs_getFishNum(1) || + dComIfGs_getFishNum(2) || + dComIfGs_getFishNum(3) || + dComIfGs_getFishNum(4) || + dComIfGs_getFishNum(5) || + g_drawHIO.mFishListScreen.mDebug) + { + return true; + } + return false; } -#pragma pop /* 801B061C-801B071C 1AAF5C 0100+00 2/2 0/0 0/0 .text isSkillIconVisible__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::isSkillIconVisible() { - nofralloc -#include "asm/d/menu/d_menu_collect/isSkillIconVisible__17dMenu_Collect2D_cFv.s" +bool dMenu_Collect2D_c::isSkillIconVisible() { + if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[338]) || + i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[339]) || + i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[340]) || + i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[341]) || + i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[342]) || + i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[343]) || + i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[344])) + { + return true; + } + return false; } -#pragma pop /* 801B071C-801B074C 1AB05C 0030+00 2/2 0/0 0/0 .text isInsectIconVisible__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::isInsectIconVisible() { - nofralloc -#include "asm/d/menu/d_menu_collect/isInsectIconVisible__17dMenu_Collect2D_cFv.s" +bool dMenu_Collect2D_c::isInsectIconVisible() { + return dMenu_Insect_c::getGetInsectNum(); } -#pragma pop /* ############################################################################################## */ /* 80394F78-80394F88 0215D8 000C+04 3/3 0/0 0/0 .rodata @3778 */ @@ -1165,6 +1217,18 @@ asm void dMenu_Collect2D_c::screenSet() { /* 801B1C3C-801B1CE0 1AC57C 00A4+00 1/1 0/0 0/0 .text animationSet__17dMenu_Collect2D_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_Collect2D_c::animationSet() { + i_OSInitFastCast(); + void* resource = JKRGetNameResource("zelda_collect_soubi_screen_revo.btk", dComIfGp_getCollectResArchive()); + field_0x2c = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(resource); + field_0x2c->searchUpdateMaterialID(mpScreen); + field_0x34 = 0.0f; + field_0x38 = 0.0f; + field_0x3c = 0.0f; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1173,6 +1237,7 @@ asm void dMenu_Collect2D_c::animationSet() { #include "asm/d/menu/d_menu_collect/animationSet__17dMenu_Collect2D_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80453F38-80453F40 002538 0008+00 2/2 0/0 0/0 .sdata2 @5199 */ @@ -1340,24 +1405,51 @@ asm void dMenu_Collect2D_c::changeClothe() { #pragma pop /* 801B30C8-801B3340 1ADA08 0278+00 1/1 0/0 0/0 .text setArrowMaxNum__17dMenu_Collect2D_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::setArrowMaxNum(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_collect/setArrowMaxNum__17dMenu_Collect2D_cFUc.s" +void dMenu_Collect2D_c::setArrowMaxNum(u8 param_0) { + switch (param_0) { + case 0: + mpScreen->search('item_0_0')->hide(); + mpScreen->search('item_0_1')->hide(); + mpScreen->search('item_0_2')->hide(); + break; + case 30: + mpScreen->search('item_0_0')->show(); + mpScreen->search('item_0_1')->hide(); + mpScreen->search('item_0_2')->hide(); + break; + case 60: + mpScreen->search('item_0_0')->hide(); + mpScreen->search('item_0_1')->show(); + mpScreen->search('item_0_2')->hide(); + break; + case 100: + mpScreen->search('item_0_0')->hide(); + mpScreen->search('item_0_1')->hide(); + mpScreen->search('item_0_2')->show(); + break; + } } -#pragma pop /* 801B3340-801B3524 1ADC80 01E4+00 1/1 0/0 0/0 .text setWalletMaxNum__17dMenu_Collect2D_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::setWalletMaxNum(u16 param_0) { - nofralloc -#include "asm/d/menu/d_menu_collect/setWalletMaxNum__17dMenu_Collect2D_cFUs.s" +void dMenu_Collect2D_c::setWalletMaxNum(u16 param_0) { + switch (param_0) { + case 300: + mpScreen->search('item_1_0')->show(); + mpScreen->search('item_1_1')->hide(); + mpScreen->search('item_1_2')->hide(); + break; + case 600: + mpScreen->search('item_1_0')->hide(); + mpScreen->search('item_1_1')->show(); + mpScreen->search('item_1_2')->hide(); + break; + case 1000: + mpScreen->search('item_1_0')->hide(); + mpScreen->search('item_1_1')->hide(); + mpScreen->search('item_1_2')->show(); + break; + } } -#pragma pop /* ############################################################################################## */ /* 80395050-80395078 0216B0 0028+00 1/1 0/0 0/0 .rodata smell_tag$5891 */ @@ -1542,364 +1634,375 @@ asm void dMenu_Collect2D_c::wait_proc() { #pragma pop /* 801B4E14-801B4EC0 1AF754 00AC+00 1/0 0/0 0/0 .text save_open_init__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::save_open_init() { - nofralloc -#include "asm/d/menu/d_menu_collect/save_open_init__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::save_open_init() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (!mpSaveScrn) { + mpSaveScrn = new dMenu_save_c(); + } + mpSaveScrn->setUseType(1); + mpSaveScrn->_create(); + mpSaveScrn->initialize(); + setAButtonString(0); + setBButtonString(0); + mpDrawCursor->offPlayAllAnime(); + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B4EC0-801B4F30 1AF800 0070+00 1/0 0/0 0/0 .text save_open_proc__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::save_open_proc() { - nofralloc -#include "asm/d/menu/d_menu_collect/save_open_proc__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::save_open_proc() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpSaveScrn->getSaveStatus() == 1) { + mpSaveScrn->_open(); + } + if (mpSaveScrn->getSaveStatus() == 2) { + field_0x22c = 2; + } + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B4F30-801B4F6C 1AF870 003C+00 1/0 0/0 0/0 .text save_move_init__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::save_move_init() { - nofralloc -#include "asm/d/menu/d_menu_collect/save_move_init__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::save_move_init() { + setAButtonString(0x040c); + setBButtonString(0); } -#pragma pop /* 801B4F6C-801B4FDC 1AF8AC 0070+00 1/0 0/0 0/0 .text save_move_proc__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::save_move_proc() { - nofralloc -#include "asm/d/menu/d_menu_collect/save_move_proc__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::save_move_proc() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpSaveScrn->getSaveStatus() == 2) { + mpSaveScrn->_move(); + } + if (mpSaveScrn->getSaveStatus() == 3) { + field_0x22c = 3; + } + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B4FDC-801B5018 1AF91C 003C+00 1/0 0/0 0/0 .text save_close_init__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::save_close_init() { - nofralloc -#include "asm/d/menu/d_menu_collect/save_close_init__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::save_close_init() { + setAButtonString(0); + setBButtonString(0); } -#pragma pop /* 801B5018-801B5094 1AF958 007C+00 1/0 0/0 0/0 .text save_close_proc__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::save_close_proc() { - nofralloc -#include "asm/d/menu/d_menu_collect/save_close_proc__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::save_close_proc() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpSaveScrn->getSaveStatus() == 3) { + mpSaveScrn->_close(); + } + if (mpSaveScrn->getSaveStatus() == 0) { + field_0x22c = 0; + mpDrawCursor->onPlayAllAnime(); + } + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B5094-801B513C 1AF9D4 00A8+00 1/0 0/0 0/0 .text option_open_init__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::option_open_init() { - nofralloc -#include "asm/d/menu/d_menu_collect/option_open_init__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::option_open_init() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (!mpOptionScrn) { + mpOptionScrn = new dMenu_Option_c(dComIfGp_getCollectResArchive(), field_0x10); + } + mpOptionScrn->initialize(); + setAButtonString(0); + setBButtonString(0); + mpDrawCursor->offPlayAllAnime(); + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B513C-801B51AC 1AFA7C 0070+00 1/0 0/0 0/0 .text option_open_proc__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::option_open_proc() { - nofralloc -#include "asm/d/menu/d_menu_collect/option_open_proc__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::option_open_proc() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpOptionScrn->getQuitStatus() == 1) { + mpOptionScrn->_open(); + } + if (mpOptionScrn->getQuitStatus() == 2) { + field_0x22c = 5; + } + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B51AC-801B51E8 1AFAEC 003C+00 1/0 0/0 0/0 .text option_move_init__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::option_move_init() { - nofralloc -#include "asm/d/menu/d_menu_collect/option_move_init__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::option_move_init() { + setAButtonString(0x040c); + setBButtonString(0x03f9); } -#pragma pop /* 801B51E8-801B5258 1AFB28 0070+00 1/0 0/0 0/0 .text option_move_proc__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::option_move_proc() { - nofralloc -#include "asm/d/menu/d_menu_collect/option_move_proc__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::option_move_proc() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpOptionScrn->getQuitStatus() == 2) { + mpOptionScrn->_move(); + } + if (mpOptionScrn->getQuitStatus() == 3) { + field_0x22c = 6; + } + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B5258-801B5294 1AFB98 003C+00 1/0 0/0 0/0 .text option_close_init__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::option_close_init() { - nofralloc -#include "asm/d/menu/d_menu_collect/option_close_init__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::option_close_init() { + setAButtonString(0); + setBButtonString(0); } -#pragma pop /* 801B5294-801B5310 1AFBD4 007C+00 1/0 0/0 0/0 .text option_close_proc__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::option_close_proc() { - nofralloc -#include "asm/d/menu/d_menu_collect/option_close_proc__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::option_close_proc() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpOptionScrn->getQuitStatus() == 3) { + mpOptionScrn->_close(); + } + if (mpOptionScrn->getQuitStatus() == 0) { + field_0x22c = 0; + mpDrawCursor->onPlayAllAnime(); + } + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B5310-801B53AC 1AFC50 009C+00 1/0 0/0 0/0 .text letter_open_init__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::letter_open_init() { - nofralloc -#include "asm/d/menu/d_menu_collect/letter_open_init__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::letter_open_init() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (!mpLetterScrn) { + mpLetterScrn = new dMenu_Letter_c(mpSubHeap, field_0x10, field_0x14); + } + setAButtonString(0); + setBButtonString(0); + mpDrawCursor->offPlayAllAnime(); + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B53AC-801B541C 1AFCEC 0070+00 1/0 0/0 0/0 .text letter_open_proc__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::letter_open_proc() { - nofralloc -#include "asm/d/menu/d_menu_collect/letter_open_proc__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::letter_open_proc() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpLetterScrn->getStatus() == 1) { + mpLetterScrn->_open(); + } + if (mpLetterScrn->getStatus() == 2) { + field_0x22c = 8; + } + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B541C-801B5458 1AFD5C 003C+00 1/0 0/0 0/0 .text letter_move_init__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::letter_move_init() { - nofralloc -#include "asm/d/menu/d_menu_collect/letter_move_init__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::letter_move_init() { + setAButtonString(0x040c); + setBButtonString(0x03f9); } -#pragma pop /* 801B5458-801B54C8 1AFD98 0070+00 1/0 0/0 0/0 .text letter_move_proc__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::letter_move_proc() { - nofralloc -#include "asm/d/menu/d_menu_collect/letter_move_proc__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::letter_move_proc() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpLetterScrn->getStatus() == 2) { + mpLetterScrn->_move(); + } + if (mpLetterScrn->getStatus() == 3) { + field_0x22c = 9; + } + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B54C8-801B5504 1AFE08 003C+00 1/0 0/0 0/0 .text letter_close_init__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::letter_close_init() { - nofralloc -#include "asm/d/menu/d_menu_collect/letter_close_init__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::letter_close_init() { + setAButtonString(0); + setBButtonString(0); } -#pragma pop /* 801B5504-801B5580 1AFE44 007C+00 1/0 0/0 0/0 .text letter_close_proc__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::letter_close_proc() { - nofralloc -#include "asm/d/menu/d_menu_collect/letter_close_proc__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::letter_close_proc() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpLetterScrn->getStatus() == 3) { + mpLetterScrn->_close(); + } + if (mpLetterScrn->getStatus() == 0) { + field_0x22c = 0; + mpDrawCursor->onPlayAllAnime(); + } + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B5580-801B561C 1AFEC0 009C+00 1/0 0/0 0/0 .text fishing_open_init__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::fishing_open_init() { - nofralloc -#include "asm/d/menu/d_menu_collect/fishing_open_init__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::fishing_open_init() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (!mpFishingScrn) { + mpFishingScrn = new dMenu_Fishing_c(mpSubHeap, field_0x10, field_0x14); + } + setAButtonString(0); + setBButtonString(0); + mpDrawCursor->offPlayAllAnime(); + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B561C-801B568C 1AFF5C 0070+00 1/0 0/0 0/0 .text fishing_open_proc__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::fishing_open_proc() { - nofralloc -#include "asm/d/menu/d_menu_collect/fishing_open_proc__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::fishing_open_proc() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpFishingScrn->getStatus() == 1) { + mpFishingScrn->_open(); + } + if (mpFishingScrn->getStatus() == 2) { + field_0x22c = 11; + } + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B568C-801B56C8 1AFFCC 003C+00 1/0 0/0 0/0 .text fishing_move_init__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::fishing_move_init() { - nofralloc -#include "asm/d/menu/d_menu_collect/fishing_move_init__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::fishing_move_init() { + setAButtonString(0x040c); + setBButtonString(0x03f9); } -#pragma pop /* 801B56C8-801B5738 1B0008 0070+00 1/0 0/0 0/0 .text fishing_move_proc__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::fishing_move_proc() { - nofralloc -#include "asm/d/menu/d_menu_collect/fishing_move_proc__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::fishing_move_proc() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpFishingScrn->getStatus() == 2) { + mpFishingScrn->_move(); + } + if (mpFishingScrn->getStatus() == 3) { + field_0x22c = 12; + } + mDoExt_setCurrentHeap(heap); } -#pragma pop + /* 801B5738-801B5774 1B0078 003C+00 1/0 0/0 0/0 .text fishing_close_init__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::fishing_close_init() { - nofralloc -#include "asm/d/menu/d_menu_collect/fishing_close_init__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::fishing_close_init() { + setAButtonString(0); + setBButtonString(0); } -#pragma pop /* 801B5774-801B57F0 1B00B4 007C+00 1/0 0/0 0/0 .text fishing_close_proc__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::fishing_close_proc() { - nofralloc -#include "asm/d/menu/d_menu_collect/fishing_close_proc__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::fishing_close_proc() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpFishingScrn->getStatus() == 3) { + mpFishingScrn->_close(); + } + if (mpFishingScrn->getStatus() == 0) { + field_0x22c = 0; + mpDrawCursor->onPlayAllAnime(); + } + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B57F0-801B588C 1B0130 009C+00 1/0 0/0 0/0 .text skill_open_init__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::skill_open_init() { - nofralloc -#include "asm/d/menu/d_menu_collect/skill_open_init__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::skill_open_init() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (!mpSkillScrn) { + mpSkillScrn = new dMenu_Skill_c(mpSubHeap, field_0x10, field_0x14); + } + setAButtonString(0); + setBButtonString(0); + mpDrawCursor->offPlayAllAnime(); + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B588C-801B58FC 1B01CC 0070+00 1/0 0/0 0/0 .text skill_open_proc__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::skill_open_proc() { - nofralloc -#include "asm/d/menu/d_menu_collect/skill_open_proc__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::skill_open_proc() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpSkillScrn->getStatus() == 1) { + mpSkillScrn->_open(); + } + if (mpSkillScrn->getStatus() == 2) { + field_0x22c = 14; + } + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B58FC-801B5938 1B023C 003C+00 1/0 0/0 0/0 .text skill_move_init__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::skill_move_init() { - nofralloc -#include "asm/d/menu/d_menu_collect/skill_move_init__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::skill_move_init() { + setAButtonString(0x040c); + setBButtonString(0x03f9); } -#pragma pop /* 801B5938-801B59A8 1B0278 0070+00 1/0 0/0 0/0 .text skill_move_proc__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::skill_move_proc() { - nofralloc -#include "asm/d/menu/d_menu_collect/skill_move_proc__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::skill_move_proc() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpSkillScrn->getStatus() == 2) { + mpSkillScrn->_move(); + } + if (mpSkillScrn->getStatus() == 3) { + field_0x22c = 15; + } + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B59A8-801B59E4 1B02E8 003C+00 1/0 0/0 0/0 .text skill_close_init__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::skill_close_init() { - nofralloc -#include "asm/d/menu/d_menu_collect/skill_close_init__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::skill_close_init() { + setAButtonString(0); + setBButtonString(0); } -#pragma pop /* 801B59E4-801B5A60 1B0324 007C+00 1/0 0/0 0/0 .text skill_close_proc__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::skill_close_proc() { - nofralloc -#include "asm/d/menu/d_menu_collect/skill_close_proc__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::skill_close_proc() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpSkillScrn->getStatus() == 3) { + mpSkillScrn->_close(); + } + if (mpSkillScrn->getStatus() == 0) { + field_0x22c = 0; + mpDrawCursor->onPlayAllAnime(); + } + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B5A60-801B5B00 1B03A0 00A0+00 1/0 0/0 0/0 .text insect_open_init__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::insect_open_init() { - nofralloc -#include "asm/d/menu/d_menu_collect/insect_open_init__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::insect_open_init() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (!mpInsectScrn) { + mpInsectScrn = new dMenu_Insect_c(mpSubHeap, field_0x10, field_0x14, 0); + } + setAButtonString(0); + setBButtonString(0); + mpDrawCursor->offPlayAllAnime(); + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B5B00-801B5B70 1B0440 0070+00 1/0 0/0 0/0 .text insect_open_proc__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::insect_open_proc() { - nofralloc -#include "asm/d/menu/d_menu_collect/insect_open_proc__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::insect_open_proc() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpInsectScrn->getStatus() == 1) { + mpInsectScrn->_open(); + } + if (mpInsectScrn->getStatus() == 2) { + field_0x22c = 17; + } + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B5B70-801B5BAC 1B04B0 003C+00 1/0 0/0 0/0 .text insect_move_init__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::insect_move_init() { - nofralloc -#include "asm/d/menu/d_menu_collect/insect_move_init__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::insect_move_init() { + setAButtonString(0x040c); + setBButtonString(0x03f9); } -#pragma pop /* 801B5BAC-801B5C1C 1B04EC 0070+00 1/0 0/0 0/0 .text insect_move_proc__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::insect_move_proc() { - nofralloc -#include "asm/d/menu/d_menu_collect/insect_move_proc__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::insect_move_proc() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpInsectScrn->getStatus() == 2) { + mpInsectScrn->_move(); + } + if (mpInsectScrn->getStatus() == 3) { + field_0x22c = 18; + } + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B5C1C-801B5C58 1B055C 003C+00 1/0 0/0 0/0 .text insect_close_init__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::insect_close_init() { - nofralloc -#include "asm/d/menu/d_menu_collect/insect_close_init__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::insect_close_init() { + setAButtonString(0); + setBButtonString(0); } -#pragma pop /* 801B5C58-801B5CD4 1B0598 007C+00 1/0 0/0 0/0 .text insect_close_proc__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::insect_close_proc() { - nofralloc -#include "asm/d/menu/d_menu_collect/insect_close_proc__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::insect_close_proc() { + JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); + if (mpInsectScrn->getStatus() == 3) { + mpInsectScrn->_close(); + } + if (mpInsectScrn->getStatus() == 0) { + field_0x22c = 0; + mpDrawCursor->onPlayAllAnime(); + } + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 801B5CD4-801B5D70 1B0614 009C+00 1/1 0/0 0/0 .text _move__17dMenu_Collect2D_cFv */ #pragma push @@ -1922,25 +2025,18 @@ asm void dMenu_Collect2D_c::_draw() { #pragma pop /* 801B5F48-801B5F84 1B0888 003C+00 1/1 0/0 0/0 .text drawTop__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::drawTop() { - nofralloc -#include "asm/d/menu/d_menu_collect/drawTop__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::drawTop() { + dComIfGd_set2DOpaTop(mpDraw2DTop); } -#pragma pop /* 801B5F84-801B5FAC 1B08C4 0028+00 0/0 1/1 0/0 .text isKeyCheck__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMenu_Collect2D_c::isKeyCheck() { - nofralloc -#include "asm/d/menu/d_menu_collect/isKeyCheck__17dMenu_Collect2D_cFv.s" +bool dMenu_Collect2D_c::isKeyCheck() { + if (field_0x22c || field_0x25f) { + return true; + } + return false; } -#pragma pop /* 801B5FAC-801B5FB4 1B08EC 0008+00 0/0 1/1 0/0 .text isOutCheck__17dMenu_Collect2D_cFv */ @@ -2001,17 +2097,41 @@ asm void dMenu_Collect2D_c::setItemNameString(u8 param_0, u8 param_1) { /* 801B6344-801B6454 1B0C84 0110+00 1/1 0/0 0/0 .text setItemNameStringNull__17dMenu_Collect2D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect2D_c::setItemNameStringNull() { - nofralloc -#include "asm/d/menu/d_menu_collect/setItemNameStringNull__17dMenu_Collect2D_cFv.s" +void dMenu_Collect2D_c::setItemNameStringNull() { + field_0x182 = 0; + J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('item_n04'); + strcpy(textBox->getStringPtr(), ""); + textBox = (J2DTextBox*)mpScreen->search('item_n05'); + strcpy(textBox->getStringPtr(), ""); + textBox = (J2DTextBox*)mpScreen->search('item_n06'); + strcpy(textBox->getStringPtr(), ""); + textBox = (J2DTextBox*)mpScreen->search('item_n07'); + strcpy(textBox->getStringPtr(), ""); } -#pragma pop /* 801B6454-801B6538 1B0D94 00E4+00 1/1 0/0 0/0 .text * __ct__17dMenu_Collect3D_cFP10JKRExpHeapP17dMenu_Collect2D_cP10CSTControl */ +// matches with literals +#ifdef NONMATCHING +dMenu_Collect3D_c::dMenu_Collect3D_c(JKRExpHeap* param_0, dMenu_Collect2D_c* param_1, + CSTControl* param_2) { + field_0x24 = daPy_py_c::i_checkNowWolf(); + mpHeap = param_0; + mpSolidHeap = NULL; + field_0x14 = param_2; + mpCollect2D = param_1; + if (field_0x24) { + field_0x3d8 = -20748; + } else { + field_0x3d8 = -23324; + } + field_0x3d0 = 0.0f; + field_0x3d4 = 0.0f; + field_0x3c8 = 0.0f; + field_0x3c4 = 0.0f; + field_0x3cc = 1.0f; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2021,8 +2141,18 @@ asm dMenu_Collect3D_c::dMenu_Collect3D_c(JKRExpHeap* param_0, dMenu_Collect2D_c* #include "asm/d/menu/d_menu_collect/__ct__17dMenu_Collect3D_cFP10JKRExpHeapP17dMenu_Collect2D_cP10CSTControl.s" } #pragma pop +#endif /* 801B6538-801B65A8 1B0E78 0070+00 1/0 0/0 0/0 .text __dt__17dMenu_Collect3D_cFv */ +// matches with vtable data +#ifdef NONMATCHING +dMenu_Collect3D_c::~dMenu_Collect3D_c() { + if (mpSolidHeap) { + mDoExt_destroySolidHeap(mpSolidHeap); + mpSolidHeap = NULL; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2032,6 +2162,7 @@ extern "C" asm void __dt__17dMenu_Collect3D_cFv() { #include "asm/d/menu/d_menu_collect/__dt__17dMenu_Collect3D_cFv.s" } #pragma pop +#endif /* 801B65A8-801B6694 1B0EE8 00EC+00 1/1 0/0 0/0 .text _create__17dMenu_Collect3D_cFv */ #pragma push @@ -2044,14 +2175,11 @@ asm void dMenu_Collect3D_c::_create() { #pragma pop /* 801B6694-801B66C8 1B0FD4 0034+00 1/1 0/0 0/0 .text _delete__17dMenu_Collect3D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect3D_c::_delete() { - nofralloc -#include "asm/d/menu/d_menu_collect/_delete__17dMenu_Collect3D_cFv.s" +void dMenu_Collect3D_c::_delete() { + if (daAlink_getAlinkActorClass()) { + daAlink_getAlinkActorClass()->resetStatusWindow(); + } } -#pragma pop /* ############################################################################################## */ /* 80453F80-80453F84 002580 0004+00 1/1 0/0 0/0 .sdata2 @7324 */ @@ -2104,14 +2232,19 @@ asm void dMenu_Collect3D_c::_move(u8 param_0, u8 param_1) { #pragma pop /* 801B696C-801B6A30 1B12AC 00C4+00 1/1 0/0 0/0 .text draw__17dMenu_Collect3D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect3D_c::draw() { - nofralloc -#include "asm/d/menu/d_menu_collect/draw__17dMenu_Collect3D_cFv.s" +void dMenu_Collect3D_c::draw() { + dComIfGd_setListItem3D(); + if (daAlink_getAlinkActorClass()) { + daAlink_getAlinkActorClass()->statusWindowDraw(); + } + if (mpModel) { + g_env_light.settingTevStruct(13, &field_0x3b0, &field_0x28); + g_env_light.setLightTevColorType_MAJI(mpModel, &field_0x28); + animeEntry(); + mDoExt_modelUpdateDL(mpModel); + } + dComIfGd_setList(); } -#pragma pop /* 801B6A30-801B6D30 1B1370 0300+00 2/2 0/0 0/0 .text setJ3D__17dMenu_Collect3D_cFPCcPCcPCc */ #pragma push @@ -2258,25 +2391,29 @@ asm void dMenu_Collect3D_c::createMirrorModel() { #pragma pop /* 801B7434-801B749C 1B1D74 0068+00 5/5 0/0 0/0 .text getCrystalNum__17dMenu_Collect3D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect3D_c::getCrystalNum() { - nofralloc -#include "asm/d/menu/d_menu_collect/getCrystalNum__17dMenu_Collect3D_cFv.s" +int dMenu_Collect3D_c::getCrystalNum() { + int count = 0; + for (int i = 0; i < 4; i++) { + if (!dComIfGs_isCollectCrystal(i)) { + break; + } + count++; + } + return count; } -#pragma pop /* 801B749C-801B7504 1B1DDC 0068+00 5/5 0/0 0/0 .text getMirrorNum__17dMenu_Collect3D_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect3D_c::getMirrorNum() { - nofralloc -#include "asm/d/menu/d_menu_collect/getMirrorNum__17dMenu_Collect3D_cFv.s" +int dMenu_Collect3D_c::getMirrorNum() { + int count = 0; + for (int i = 0; i < 4; i++) { + if (!dComIfGs_isCollectMirror(i)) { + break; + } + count++; + } + return count; } -#pragma pop /* 801B7504-801B75E8 1B1E44 00E4+00 4/4 0/0 0/0 .text getMaskMdlVisible__17dMenu_Collect3D_cFv */ #pragma push @@ -2316,14 +2453,26 @@ SECTION_SDATA2 static f32 lit_7949[1 + 1 /* padding */] = { }; /* 801B75E8-801B7660 1B1F28 0078+00 0/0 1/1 0/0 .text setupItem3D__17dMenu_Collect3D_cFPA4_f */ +// matches with literals +#ifdef NONMATCHING +void dMenu_Collect3D_c::setupItem3D(Mtx param_0) { + GXSetViewport(0.0, mViewOffsetY, 608.0, 448.0, 0.0, 1.0); + mViewOffsetY = -100.0; + Mtx44 projection; + C_MTXPerspective(projection, 45.0, mDoGph_gInf_c::getAspect(), 1.0, 100000.0); + GXSetProjection(projection, GX_PERSPECTIVE); + calcViewMtx(param_0); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Collect3D_c::setupItem3D(f32 (*param_0)[4]) { +asm void dMenu_Collect3D_c::setupItem3D(Mtx param_0) { nofralloc #include "asm/d/menu/d_menu_collect/setupItem3D__17dMenu_Collect3D_cFPA4_f.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80453FE0-80453FE8 0025E0 0008+00 1/1 0/0 0/0 .sdata2 @7963 */ @@ -2341,14 +2490,21 @@ asm void dMenu_Collect3D_c::toItem3Dpos(f32 param_0, f32 param_1, f32 param_2, c #pragma pop /* 801B774C-801B77A4 1B208C 0058+00 2/2 0/0 0/0 .text calcViewMtx__17dMenu_Collect3D_cFPA4_f */ +// matches with literals +#ifdef NONMATCHING +void dMenu_Collect3D_c::calcViewMtx(Mtx param_0) { + mDoMtx_lookAt(param_0, &cXyz(0.0f, 0.0f, -1000.0f), &cXyz::Zero, &cXyz(0.0f, 1.0f, 0.0f), 0); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_Collect3D_c::calcViewMtx(f32 (*param_0)[4]) { +asm void dMenu_Collect3D_c::calcViewMtx(Mtx param_0) { nofralloc #include "asm/d/menu/d_menu_collect/calcViewMtx__17dMenu_Collect3D_cFPA4_f.s" } #pragma pop +#endif /* 801B77A4-801B78C0 1B20E4 011C+00 1/0 0/0 0/0 .text draw__20dMenu_Collect2DTop_cFv */ #pragma push @@ -2363,16 +2519,25 @@ extern "C" asm void draw__20dMenu_Collect2DTop_cFv() { /* 801B78C0-801B795C 1B2200 009C+00 0/0 1/1 0/0 .text * __ct__15dMenu_Collect_cFP10JKRExpHeapP9STControlP10CSTControl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMenu_Collect_c::dMenu_Collect_c(JKRExpHeap* param_0, STControl* param_1, CSTControl* param_2) { - nofralloc -#include "asm/d/menu/d_menu_collect/__ct__15dMenu_Collect_cFP10JKRExpHeapP9STControlP10CSTControl.s" +dMenu_Collect_c::dMenu_Collect_c(JKRExpHeap* param_0, STControl* param_1, CSTControl* param_2) { + mpCollect2D = new dMenu_Collect2D_c(param_0, param_1, param_2); + mpCollect3D = new dMenu_Collect3D_c(param_0, mpCollect2D, param_2); } -#pragma pop /* 801B795C-801B7A0C 1B229C 00B0+00 1/0 0/0 0/0 .text __dt__15dMenu_Collect_cFv */ +// matches with vtable data +#ifdef NONMATCHING +dMenu_Collect_c::~dMenu_Collect_c() { + if (mpCollect2D) { + delete mpCollect2D; + mpCollect2D = NULL; + } + if (mpCollect3D) { + delete mpCollect3D; + mpCollect3D = NULL; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2382,46 +2547,32 @@ extern "C" asm void __dt__15dMenu_Collect_cFv() { #include "asm/d/menu/d_menu_collect/__dt__15dMenu_Collect_cFv.s" } #pragma pop +#endif /* 801B7A0C-801B7A44 1B234C 0038+00 0/0 1/1 0/0 .text _create__15dMenu_Collect_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect_c::_create() { - nofralloc -#include "asm/d/menu/d_menu_collect/_create__15dMenu_Collect_cFv.s" +void dMenu_Collect_c::_create() { + mpCollect2D->_create(); + mpCollect3D->_create(); } -#pragma pop /* 801B7A44-801B7A7C 1B2384 0038+00 0/0 1/1 0/0 .text _delete__15dMenu_Collect_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect_c::_delete() { - nofralloc -#include "asm/d/menu/d_menu_collect/_delete__15dMenu_Collect_cFv.s" +void dMenu_Collect_c::_delete() { + mpCollect2D->_delete(); + mpCollect3D->_delete(); } -#pragma pop /* 801B7A7C-801B7AC0 1B23BC 0044+00 0/0 1/1 0/0 .text _move__15dMenu_Collect_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect_c::_move() { - nofralloc -#include "asm/d/menu/d_menu_collect/_move__15dMenu_Collect_cFv.s" +void dMenu_Collect_c::_move() { + mpCollect2D->_move(); + mpCollect3D->_move(mpCollect2D->getCursorX(), mpCollect2D->getCursorY()); } -#pragma pop /* 801B7AC0-801B7B14 1B2400 0054+00 0/0 1/1 0/0 .text draw__15dMenu_Collect_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_Collect_c::draw() { - nofralloc -#include "asm/d/menu/d_menu_collect/draw__15dMenu_Collect_cFv.s" +void dMenu_Collect_c::draw() { + dComIfGd_set2DOpa(mpCollect2D); + mpCollect3D->draw(); + mpCollect2D->drawTop(); } -#pragma pop /* 801B7B14-801B7EB8 1B2454 03A4+00 0/0 1/0 0/0 .text __sinit_d_menu_collect_cpp */ #pragma push diff --git a/src/d/menu/d_menu_insect.cpp b/src/d/menu/d_menu_insect.cpp index 19eb040ea3f..420f49057bd 100644 --- a/src/d/menu/d_menu_insect.cpp +++ b/src/d/menu/d_menu_insect.cpp @@ -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" } diff --git a/src/d/menu/d_menu_save.cpp b/src/d/menu/d_menu_save.cpp index 38919655419..520b913408a 100644 --- a/src/d/menu/d_menu_save.cpp +++ b/src/d/menu/d_menu_save.cpp @@ -1883,7 +1883,7 @@ void dMenu_save_c::memCardMakeGameFileWait() { errorTxtSet(0x3C6); // An error might have occurred when creating a save file. mMenuProc = PROC_MEMCARD_COMMAND_END; } else if (mCmdState == 1) { - dComIfGs_setNewFile(1); + dComIfGs_setNewFile(dComIfGs_getNewFile() | 1); errorTxtSet(0x3C7); // A save file has been created. mMenuProc = PROC_MEMCARD_COMMAND_END; } diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp index 5f4291ca6f9..99ecf51c609 100644 --- a/src/d/menu/d_menu_window.cpp +++ b/src/d/menu/d_menu_window.cpp @@ -2436,39 +2436,16 @@ bool dMw_c::isPauseReady() { } /* 801FCE08-801FCE78 1F7748 0070+00 10/10 3/3 0/0 .text dMw_fade_out__5dMw_cFv */ -// instructions switched -#ifdef NONMATCHING void dMw_c::dMw_fade_out() { mDoGph_gInf_c::startFadeOut(13); mDoGph_gInf_c::setFadeColor(static_cast(g_blackColor)); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_fade_out() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_fade_out__5dMw_cFv.s" -} -#pragma pop -#endif /* 801FCE78-801FCEE8 1F77B8 0070+00 9/9 4/4 0/0 .text dMw_fade_in__5dMw_cFv */ -#ifdef NONMATCHING void dMw_c::dMw_fade_in() { mDoGph_gInf_c::startFadeIn(13); mDoGph_gInf_c::setFadeColor(static_cast(g_blackColor)); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_fade_in() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_fade_in__5dMw_cFv.s" -} -#pragma pop -#endif /* 801FCEE8-801FCF84 1F7828 009C+00 1/1 0/0 0/0 .text checkCStickTrigger__5dMw_cFv */ int dMw_c::checkCStickTrigger() { diff --git a/src/d/meter/d_meter_map.cpp b/src/d/meter/d_meter_map.cpp index d7cf9e1d954..adf7c9a1904 100644 --- a/src/d/meter/d_meter_map.cpp +++ b/src/d/meter/d_meter_map.cpp @@ -107,11 +107,9 @@ bool dMeterMap_c::isEnableDispMap() { } /* 8020D528-8020D650 207E68 0128+00 3/3 0/0 0/0 .text getMapDispSizeTypeNo__11dMeterMap_cFv */ -// stayNo load block in wrong order -#ifdef NONMATCHING int dMeterMap_c::getMapDispSizeTypeNo() { int uvar6 = 7; - int stayNo = dComIfGp_roomControl_getStayNo(); + s32 stayNo = dComIfGp_roomControl_getStayNo(); dStage_FileList_dt_c* fList = dComIfGp_roomControl_getStatusRoomDt(stayNo)->mRoomDt.getFileListInfo(); @@ -155,16 +153,6 @@ int dMeterMap_c::getMapDispSizeTypeNo() { return mapDispSizeType; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMeterMap_c::getMapDispSizeTypeNo() { - nofralloc -#include "asm/d/meter/d_meter_map/getMapDispSizeTypeNo__11dMeterMap_cFv.s" -} -#pragma pop -#endif /* 8020D650-8020D690 207F90 0040+00 5/5 3/3 0/0 .text * isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv */ @@ -277,17 +265,17 @@ SECTION_SDATA2 static f32 lit_4159 = -36.0f; /* 8020D7EC-8020D874 20812C 0088+00 2/2 0/0 0/0 .text getDispPosOutSide_OffsetX__11dMeterMap_cFv */ -// calculation order is wrong +// matches with literals #ifdef NONMATCHING s16 dMeterMap_c::getDispPosOutSide_OffsetX() { f32 dvar3 = -36.0f - mSizeW; - f32 tmp = 0.0f; + f32 offset = 0.0f; if (mMap != NULL) { - tmp = (mMap->getTexelPerCm() * mMap->getPackX()) + - (mMap->getRightEdgePlus() + (mMap->getTexelPerCm() * mMap->getPackPlusZ())); - tmp += dvar3; + offset = mMap->getTexelPerCm() * mMap->getPackX(); + offset +=(mMap->getRightEdgePlus() + (mMap->getTexelPerCm() * mMap->getPackPlusZ())); } - return tmp - getMapDispEdgeLeftX_Layout(); + dvar3 += offset; + return dvar3 - getMapDispEdgeLeftX_Layout(); } #else #pragma push @@ -474,7 +462,7 @@ SECTION_DEAD static char const* const stringBase_80398208 = "F_SP115"; #pragma pop /* 8020DCE4-8020DF1C 208624 0238+00 0/0 1/1 0/0 .text _move__11dMeterMap_cFUl */ -// just regalloc +// matches with literals #ifdef NONMATCHING void dMeterMap_c::_move(u32 param_0) { if (!field_0x2b && i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[118])) { @@ -485,7 +473,7 @@ void dMeterMap_c::_move(u32 param_0) { dMeter2Info_setPauseStatus(2); } } - int stayNo = dComIfGp_roomControl_getStayNo(); + s32 stayNo = dComIfGp_roomControl_getStayNo(); field_0x14 = param_0; field_0x2a = checkMoveStatus(); @@ -654,30 +642,23 @@ asm void dMeterMap_c::ctrlShowMap() { #endif /* 8020E45C-8020E4C8 208D9C 006C+00 1/1 0/0 0/0 .text checkMoveStatus__11dMeterMap_cFv */ -// field_0x2d compare is weird -#ifdef NONMATCHING u8 dMeterMap_c::checkMoveStatus() { + u8 rv; if (isShow(field_0x14)) { if (isEnableDispMapAndMapDispSizeTypeNo()) { if (isDispPosInsideFlg()) { - return 1; + rv = 1; + } else { + rv = 2; } - return 2; + } else { + rv = 3; } - return 3; + } else { + rv = 0; } - return 0; + return rv; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 dMeterMap_c::checkMoveStatus() { - nofralloc -#include "asm/d/meter/d_meter_map/checkMoveStatus__11dMeterMap_cFv.s" -} -#pragma pop -#endif /* 8020E4C8-8020E620 208E08 0158+00 2/2 0/0 0/0 .text isShow__11dMeterMap_cFUl */ // extra gameinfo label load for dComIfGp_event_checkHind diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index ae8ddbd6abd..a3d75a80d5d 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -18,6 +18,7 @@ #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_audio.h" +#include "m_Do/m_Do_graphic.h" // // Forward References: @@ -1559,36 +1560,50 @@ int dMsgFlow_c::query038(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, in /* 8024BDB0-8024BE4C 2466F0 009C+00 1/0 0/0 0/0 .text * query039__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query039(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query039__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query039(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { + u16 uVar2 = *(u16*)param_0->params; + u8 iVar4 = dComIfGs_getTmpReg(0xfbff); + u8 bombNum = dComIfGs_getBombNum(iVar4 - 1); + return dComIfGs_getBombMax(NORMAL_BOMB) >= bombNum + uVar2; } -#pragma pop /* 8024BE4C-8024BF50 24678C 0104+00 1/0 0/0 0/0 .text * query040__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query040(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query040__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query040(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { + s32 uVar7 = *(u16*)param_0->params; + u8 unaff_r30; + if (uVar7 >= 1 && uVar7 < 4) { + unaff_r30 = uVar7 - 1; + } else if (uVar7 == 4) { + if (dMeter2Info_getRentalBombBag() != 0xff) { + unaff_r30 = dMeter2Info_getRentalBombBag(); + } + } else { + unaff_r30 = dComIfGs_getTmpReg(0xfbff) - 1; + } + + u8 bombNum = dComIfGs_getBombNum(unaff_r30); + u8 uVar4 = dComIfGs_getItem((u8)(unaff_r30 + SLOT_15), 0); + u8 bombMax = dComIfGs_getBombMax(uVar4); + u8 rv; + if (bombNum == 0) { + rv = 0; + } else if (bombNum >= bombMax) { + rv = 2; + } else { + rv = 1; + } + return rv; } -#pragma pop /* 8024BF50-8024BFEC 246890 009C+00 1/0 0/0 0/0 .text * query041__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query041(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query041__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query041(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { + u16 uVar2 = *(u16*)param_0->params; + u8 iVar4 = dComIfGs_getTmpReg(0xfbff); + u8 bombNum = dComIfGs_getBombNum(iVar4 - 1); + return dComIfGs_getBombMax(WATER_BOMB) >= bombNum + uVar2; } -#pragma pop /* 8024BFEC-8024C0A8 24692C 00BC+00 1/0 0/0 0/0 .text * query042__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ @@ -1627,14 +1642,23 @@ int dMsgFlow_c::query044(mesg_flow_node_branch*, fopAc_ac_c*, int) { /* 8024C18C-8024C218 246ACC 008C+00 1/0 0/0 0/0 .text * query045__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query045(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query045__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query045(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { + u8 insectNum = dComIfGs_checkGetInsectNum(); + u8 rv = 0; + if (insectNum == 0) { + rv = 0; + } else if (insectNum >= 1 && insectNum <= 11) { + rv = 1; + } else if (insectNum >= 12 && insectNum <= 22) { + rv = 2; + } else if (insectNum == 23) { + rv = 3; + } else if (insectNum == 24) { + rv = 4; + } + + return rv; } -#pragma pop /* 8024C218-8024C248 246B58 0030+00 1/0 0/0 0/0 .text * query046__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ @@ -2094,6 +2118,12 @@ int dMsgFlow_c::event020(mesg_flow_node_event* flow_node, fopAc_ac_c* actor) { /* 8024CD84-8024CDAC 2476C4 0028+00 1/0 0/0 0/0 .text * event021__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ +#ifdef NONMATCHING +int dMsgFlow_c::event021(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { + cLib_calcTimer(&field_0x3c); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2102,6 +2132,7 @@ asm int dMsgFlow_c::event021(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) #include "asm/d/msg/d_msg_flow/event021__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80454DA8-80454DAC 0033A8 0004+00 1/1 0/0 0/0 .sdata2 @6273 */ @@ -2435,6 +2466,29 @@ asm int dMsgFlow_c::event032(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) /* 8024D6BC-8024D788 247FFC 00CC+00 1/0 0/0 0/0 .text * event033__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ +#ifdef NONMATCHING +// Matches with literals +int dMsgFlow_c::event033(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { + u16 uVar1; + u16 uVar2; + GXColor color; + + getParam(&uVar2, &uVar1, param_0->params); + if (uVar1 + 1 == field_0x3c) { + if (uVar2 == 0) { + color.r = 0; + color.g = 0; + color.b = 0; + color.a = 0; + } else { + color = g_saftyWhiteColor; + } + mDoGph_gInf_c::fadeOut(1.0f / uVar1, color); + } + cLib_calcTimer(&field_0x3c); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2443,6 +2497,7 @@ asm int dMsgFlow_c::event033(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) #include "asm/d/msg/d_msg_flow/event033__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" } #pragma pop +#endif /* 8024D788-8024D7C8 2480C8 0040+00 1/0 0/0 0/0 .text * event034__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ diff --git a/src/d/msg/d_msg_out_font.cpp b/src/d/msg/d_msg_out_font.cpp index f32dc327fcb..618593a0ed0 100644 --- a/src/d/msg/d_msg_out_font.cpp +++ b/src/d/msg/d_msg_out_font.cpp @@ -793,11 +793,10 @@ void COutFont_c::reset(J2DTextBox* p_textBox) { /* 80228490-80228530 222DD0 00A0+00 1/1 0/0 0/0 .text setBlendAnime__10COutFont_cFP10J2DPictures */ -// regalloc +// matches with literals #ifdef NONMATCHING void COutFont_c::setBlendAnime(J2DPicture* param_0, s16 param_1) { - s32 iVar5 = param_1; - iVar5 = 0x14 - iVar5 / 0x14 * 0x14; + int iVar5 = param_1 % 0x14; if (iVar5 < 10) { f32 dVar6 = fopMsgM_valueIncrease(10, iVar5, 0); param_0->setBlendRatio(1.0f - dVar6, dVar6); diff --git a/src/d/s/d_s_logo.cpp b/src/d/s/d_s_logo.cpp index 01873202547..9d37edf30d4 100644 --- a/src/d/s/d_s_logo.cpp +++ b/src/d/s/d_s_logo.cpp @@ -18,6 +18,8 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_machine.h" +#include "dolphin/os/OSRtc.h" +#include "dolphin/vi/vi.h" // // Types: @@ -34,123 +36,10 @@ public: // Forward References: // -extern "C" void __ct__10dLog_HIO_cFv(); -extern "C" void preLoad_dyl_create__10dScnLogo_cFv(); -extern "C" void preLoad_dyl_remove__10dScnLogo_cFv(); -extern "C" void preLoad_dyl__10dScnLogo_cFv(); -extern "C" void checkProgSelect__10dScnLogo_cFv(); -extern "C" void draw__10dScnLogo_cFv(); -extern "C" void progInDraw__10dScnLogo_cFv(); -extern "C" void progSelDraw__10dScnLogo_cFv(); -extern "C" void progOutDraw__10dScnLogo_cFv(); -extern "C" void progSetDraw__10dScnLogo_cFv(); -extern "C" void progSet2Draw__10dScnLogo_cFv(); -extern "C" void progChangeDraw__10dScnLogo_cFv(); -extern "C" void warningInDraw__10dScnLogo_cFv(); -extern "C" void warningDispDraw__10dScnLogo_cFv(); -extern "C" void warningOutDraw__10dScnLogo_cFv(); -extern "C" void nintendoInDraw__10dScnLogo_cFv(); -extern "C" void nintendoOutDraw__10dScnLogo_cFv(); -extern "C" void dolbyInDraw__10dScnLogo_cFv(); -extern "C" void dolbyOutDraw__10dScnLogo_cFv(); -extern "C" void dolbyOutDraw2__10dScnLogo_cFv(); -extern "C" void dvdWaitDraw__10dScnLogo_cFv(); -extern "C" void nextSceneChange__10dScnLogo_cFv(); -extern "C" void __dt__10dScnLogo_cFv(); -extern "C" static void phase_0__FP10dScnLogo_c(); -extern "C" static void phase_1__FP10dScnLogo_c(); -extern "C" static void phase_2__FP10dScnLogo_c(); -extern "C" static void resLoad__FP30request_of_phase_process_classP10dScnLogo_c(); -extern "C" void create__10dScnLogo_cFv(); -extern "C" void logoInitGC__10dScnLogo_cFv(); -extern "C" void dvdDataLoad__10dScnLogo_cFv(); -extern "C" static void dScnLogo_Create__FP11scene_class(); -extern "C" static void dScnLogo_Execute__FP10dScnLogo_c(); -extern "C" static void dScnLogo_Draw__FP10dScnLogo_c(); -extern "C" static void dScnLogo_Delete__FP10dScnLogo_c(); -extern "C" static bool dScnLogo_IsDelete__FP10dScnLogo_c(); -extern "C" void setProgressiveMode__10dScnLogo_cFUc(); -extern "C" void getProgressiveMode__10dScnLogo_cFv(); -extern "C" void isProgressiveMode__10dScnLogo_cFv(); -extern "C" void setRenderMode__10dScnLogo_cFv(); -extern "C" void __dt__10dLog_HIO_cFv(); -extern "C" void func_802585A4(u16*); -extern "C" void __sinit_d_s_logo_cpp(); -extern "C" extern char const* const d_s_d_s_logo__stringBase0; - // // External References: // -extern "C" void mDoExt_getGameHeap__Fv(); -extern "C" void mDoExt_getJ2dHeap__Fv(); -extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); -extern "C" void mDoExt_getMesgFont__Fv(); -extern "C" void mDoExt_getRubyFont__Fv(); -extern "C" void mDoExt_getSubFont__Fv(); -extern "C" void mDoExt_setAraCacheSize__FUl(); -extern "C" void mDoRst_reset__FiUli(); -extern "C" void mDoRst_resetCallBack__FiPv(); -extern "C" void create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap(); -extern "C" void create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap(); -extern "C" void cDyl_InitAsyncIsDone__Fv(); -extern "C" void Link__7cDylPhsFP30request_of_phase_process_classs(); -extern "C" void fopScnM_ChangeReq__FP11scene_classssUs(); -extern "C" void createParticle__14dComIfG_play_cFv(); -extern "C" void dComIfG_changeOpeningScene__FP11scene_classs(); -extern "C" void dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv(); -extern "C" void setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap(); -extern "C" void deleteRes__14dRes_control_cFPCcP11dRes_info_ci(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void syncAllRes__14dRes_control_cFP11dRes_info_ci(); -extern "C" void createWork__8dMpath_cFv(); -extern "C" void createCommon__13dPa_control_cFPCv(); -extern "C" void __ct__10dDlst_2D_cFP7ResTIMGssssUc(); -extern "C" void setSimpleTex__21dDlst_shadowControl_cFPC7ResTIMG(); -extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c(); -extern "C" void createWork__7dTres_cFv(); -extern "C" void waitBlanking__10JFWDisplayFi(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void loadStaticWaves__10Z2SceneMgrFv(); -extern "C" bool checkFirstWaves__10Z2SceneMgrFv(); -extern "C" void resetProcess__10Z2AudioMgrFUlb(); -extern "C" void becomeCurrentHeap__7JKRHeapFv(); -extern "C" void destroy__7JKRHeapFv(); -extern "C" void alloc__7JKRHeapFUli(); -extern "C" void free__7JKRHeapFPvP7JKRHeap(); -extern "C" void* __nw__FUl(); -extern "C" void* __nwa__FUl(); -extern "C" void __dl__FPv(); -extern "C" void __dla__FPv(); -extern "C" void create__10JKRExpHeapFUlP7JKRHeapb(); -extern "C" void create__10JKRExpHeapFPvUlP7JKRHeapb(); -extern "C" void getTotalFreeSize__11JKRAramHeapFv(); -extern "C" void __dt__10J2DPictureFv(); -extern "C" u32 OSGetProgressiveMode(); -extern "C" void OSSetProgressiveMode(u32); -extern "C" u32 VIGetDTVStatus(); -extern "C" void __register_global_object(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__10dDlst_2D_c[3]; -extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" void* mRenderModeObj__15mDoMch_render_c[1 + 1 /* padding */]; -extern "C" extern u8 mInitFlag__17mDoAud_zelAudio_c[4]; -extern "C" u8 mFader__13mDoGph_gInf_c[4]; -extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" u8 mData__12dEnemyItem_c[4 + 4 /* padding */]; -extern "C" u8 sManager__10JFWDisplay[4]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" u8 sAramObject__7JKRAram[4]; -extern "C" u8 sCallback__Q210JUTGamePad13C3ButtonReset[4]; -extern "C" u8 sCallbackArg__Q210JUTGamePad13C3ButtonReset[4 + 4 /* padding */]; // // Declarations: @@ -158,7 +47,7 @@ extern "C" u8 sCallbackArg__Q210JUTGamePad13C3ButtonReset[4 + 4 /* padding */]; /* ############################################################################################## */ /* 803C2E38-803C2E44 01FF58 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; @@ -166,7 +55,7 @@ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { static dLog_HIO_c g_LogHIO; typedef void (dScnLogo_c::*execFunc)(); -SECTION_DATA static execFunc l_execFunc[16] = { +static execFunc l_execFunc[16] = { &dScnLogo_c::warningInDraw, &dScnLogo_c::warningDispDraw, &dScnLogo_c::warningOutDraw, &dScnLogo_c::nintendoInDraw, &dScnLogo_c::nintendoOutDraw, &dScnLogo_c::dolbyInDraw, &dScnLogo_c::dolbyOutDraw, &dScnLogo_c::dolbyOutDraw2, &dScnLogo_c::progInDraw, @@ -632,8 +521,6 @@ dScnLogo_c::~dScnLogo_c() { } /* 80257910-802579BC 252250 00AC+00 1/0 0/0 0/0 .text phase_0__FP10dScnLogo_c */ -// setFadeColor instruction reordering -#ifdef NONMATCHING static int phase_0(dScnLogo_c* logo) { mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); dComIfGp_particle_create(); @@ -644,16 +531,6 @@ static int phase_0(dScnLogo_c* logo) { return 2; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int phase_0(dScnLogo_c* param_0) { - nofralloc -#include "asm/d/s/d_s_logo/phase_0__FP10dScnLogo_c.s" -} -#pragma pop -#endif /* 802579BC-80257A70 2522FC 00B4+00 1/0 0/0 0/0 .text phase_1__FP10dScnLogo_c */ static int phase_1(dScnLogo_c* logo) { @@ -666,7 +543,7 @@ static int phase_1(dScnLogo_c* logo) { return 0; } - dComIfG_setObjectRes("LogoUs", 0, logo->field_0x1d0); + dComIfG_setObjectRes("LogoUs", (u8)0, logo->field_0x1d0); mDoRst::setLogoScnFlag(1); archiveHeap->dump_sort(); return 2; @@ -761,10 +638,10 @@ void dScnLogo_c::logoInitGC() { /* 80257FEC-80258420 25292C 0434+00 1/1 0/0 0/0 .text dvdDataLoad__10dScnLogo_cFv */ void dScnLogo_c::dvdDataLoad() { - dComIfG_setObjectRes("Always", 0, NULL); + dComIfG_setObjectRes("Always", (u8)0, NULL); archiveHeap->dump_sort(); - dComIfG_setObjectRes("Alink", 0, NULL); + dComIfG_setObjectRes("Alink", (u8)0, NULL); mpField0Command = mDoDvdThd_mountXArchive_c::create( "/res/FieldMap/Field0.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); @@ -822,20 +699,9 @@ void dScnLogo_c::dvdDataLoad() { } /* 80258420-80258444 252D60 0024+00 1/0 0/0 0/0 .text dScnLogo_Create__FP11scene_class */ -#ifdef NONMATCHING static int dScnLogo_Create(scene_class* scn) { - return static_cast(scn)->create(); + return (new (scn) dScnLogo_c())->create(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dScnLogo_Create(scene_class* param_0) { - nofralloc -#include "asm/d/s/d_s_logo/dScnLogo_Create__FP11scene_class.s" -} -#pragma pop -#endif /* 80258444-80258484 252D84 0040+00 1/0 0/0 0/0 .text dScnLogo_Execute__FP10dScnLogo_c */ static int dScnLogo_Execute(dScnLogo_c* logo) { @@ -889,34 +755,26 @@ void dScnLogo_c::setRenderMode() { /* 8025855C-802585A4 252E9C 0048+00 2/1 0/0 0/0 .text __dt__10dLog_HIO_cFv */ dLog_HIO_c::~dLog_HIO_c() {} -/* 802585A4-802585C0 252EE4 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPUs */ -template -T cLib_calcTimer(T* value) { - if (*value != 0) { - *value = *value - 1; - } - return *value; -} - /* 803C2FD0-803C2FE4 -00001 0014+00 1/0 0/0 0/0 .data l_dScnLogo_Method */ -SECTION_DATA static void* l_dScnLogo_Method[5] = { - (void*)dScnLogo_Create__FP11scene_class, (void*)dScnLogo_Delete__FP10dScnLogo_c, - (void*)dScnLogo_Execute__FP10dScnLogo_c, (void*)dScnLogo_IsDelete__FP10dScnLogo_c, - (void*)dScnLogo_Draw__FP10dScnLogo_c, +static dScnLogo_Method l_dScnLogo_Method[5] = { + (dScnLogo_Method) dScnLogo_Create, dScnLogo_Delete, + dScnLogo_Execute, dScnLogo_IsDelete, + dScnLogo_Draw, }; /* 803C2FE4-803C300C -00001 0028+00 0/0 0/0 1/0 .data g_profile_LOGO_SCENE */ -SECTION_DATA extern void* g_profile_LOGO_SCENE[10] = { - (void*)NULL, - (void*)0x0001FFFD, - (void*)0x00090000, - (void*)&g_fpcNd_Method, - (void*)0x000002A8, - (void*)NULL, - (void*)NULL, - (void*)&g_fopScn_Method, - (void*)&l_dScnLogo_Method, - (void*)NULL, +extern scene_process_profile_definition g_profile_LOGO_SCENE = { + 0, + 1, + -3, + PROC_LOGO_SCENE, + &g_fpcNd_Method.mBase, + sizeof(dScnLogo_c), + 0, + 0, + &g_fopScn_Method.mBase, + (process_method_class*)&l_dScnLogo_Method, + NULL, }; /* 80399FFC-80399FFC 02665C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/s/d_s_name.cpp b/src/d/s/d_s_name.cpp index 77bc75d70d7..6ea7e9f2696 100644 --- a/src/d/s/d_s_name.cpp +++ b/src/d/s/d_s_name.cpp @@ -8,10 +8,9 @@ #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" #include "d/meter/d_meter2_info.h" -#include "dol2asm.h" #include "dolphin/types.h" #include "f_op/f_op_overlap_mng.h" -#include "f_op/f_op_scene.h" +#include "f_op/f_op_scene_mng.h" #include "f_pc/f_pc_manager.h" #include "global.h" #include "m_Do/m_Do_Reset.h" @@ -33,12 +32,7 @@ public: /* 0x5 */ u8 mFileSelWaitTime; }; -class dScnName_camera_c : public camera_process_class { -public: - dScnName_camera_c() { field_0x22f = 84; } - /* 80259294 */ virtual ~dScnName_camera_c() {} -}; - +// TODO: Remove when dFile_select_c virtual functions are properly defined in header class dFile_select_c { public: /* 8018366C */ dFile_select_c(JKRArchive*); @@ -67,6 +61,7 @@ private: /* 0x2375 */ u8 field_0x2375[0x237c - 0x2375]; }; +// TODO: Remove when dBrightCheck_c virtual functions are properly defined in header class dBrightCheck_c { public: /* 80192F10 */ dBrightCheck_c(JKRArchive*); @@ -80,129 +75,19 @@ public: /* 0x19 */ bool mEnd; }; -class dScnName_c : public scene_class { -public: - dScnName_c() {} - /* 802588A0 */ s32 create(); - /* 80258B2C */ void setView(); - /* 80258BC8 */ s32 execute(); - /* 80258C5C */ s32 draw(); - /* 80258CC8 */ ~dScnName_c(); - /* 80258DD0 */ void FileSelectOpen(); - /* 80258E34 */ void FileSelectMain(); - /* 80258E78 */ void FileSelectMainNormal(); - /* 80258F20 */ void FileSelectClose(); - /* 80258FD4 */ void brightCheckOpen(); - /* 80259008 */ void brightCheck(); - /* 802590F8 */ void changeGameScene(); - -private: - /* 0x1C4 */ request_of_phase_process_class field_0x1c4; - /* 0x1CC */ JKRExpHeap* mHeap; - /* 0x1D0 */ JKRExpHeap* field_0x1d0; - /* 0x1D4 */ dScnName_camera_c mCamera; - /* 0x414 */ dFile_select_c* dFs_c; - /* 0x418 */ dBrightCheck_c* mBrightCheck; - /* 0x41C */ u8 field_0x41c; - /* 0x41D */ u8 field_0x41d; - /* 0x41E */ u8 field_0x41e; - /* 0x41F */ u8 field_0x41f; - /* 0x420 */ u8 field_0x420; -}; // // Forward References: // -extern "C" void __ct__9dSn_HIO_cFv(); -extern "C" static void phase_1__FPc(); -extern "C" static void phase_2__FPc(); -extern "C" static void resLoad__FP30request_of_phase_process_classPc(); -extern "C" void create__10dScnName_cFv(); -extern "C" void setView__10dScnName_cFv(); -extern "C" void execute__10dScnName_cFv(); -extern "C" void draw__10dScnName_cFv(); -extern "C" void __dt__10dScnName_cFv(); -extern "C" void FileSelectOpen__10dScnName_cFv(); -extern "C" void FileSelectMain__10dScnName_cFv(); -extern "C" void FileSelectMainNormal__10dScnName_cFv(); -extern "C" void FileSelectClose__10dScnName_cFv(); -extern "C" void brightCheckOpen__10dScnName_cFv(); -extern "C" void brightCheck__10dScnName_cFv(); -extern "C" void changeGameScene__10dScnName_cFv(); -extern "C" static void dScnName_Draw__FP10dScnName_c(); -extern "C" static void dScnName_Execute__FP10dScnName_c(); -extern "C" static void dScnName_IsDelete__FP10dScnName_c(); -extern "C" static void dScnName_Delete__FP10dScnName_c(); -extern "C" static void dScnName_Create__FP11scene_class(); -extern "C" void __dt__17dScnName_camera_cFv(); -extern "C" void __dt__9dSn_HIO_cFv(); -extern "C" void __sinit_d_s_name_cpp(); -extern "C" extern char const* const d_s_d_s_name__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_lookAt__FPA4_fPC3VecPC3Vecs(); -extern "C" void mDoMtx_concatProjView__FPA4_CfPA4_CfPA4_f(); -extern "C" void mDoExt_getGameHeap__Fv(); -extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); -extern "C" void fopOvlpM_IsPeek__Fv(); -extern "C" void fopScnM_ChangeReq__FP11scene_classssUs(); -extern "C" void dComIfG_resetToOpening__FP11scene_class(); -extern "C" void dComIfGp_setNextStage__FPCcsScSc(); -extern "C" void dComIfGs_gameStart__Fv(); -extern "C" void dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv(); -extern "C" void offFirstBit__21dSv_player_get_item_cFUc(); -extern "C" void setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap(); -extern "C" void syncRes__14dRes_control_cFPCcP11dRes_info_ci(); -extern "C" void deleteRes__14dRes_control_cFPCcP11dRes_info_ci(); -extern "C" void getResInfo__14dRes_control_cFPCcP11dRes_info_ci(); -extern "C" void cleanup__13dPa_control_cFv(); -extern "C" void setViewPort__14dDlst_window_cFffffff(); -extern "C" void setScissor__14dDlst_window_cFffff(); -extern "C" void Run__12dVibration_cFv(); -extern "C" void Init__12dVibration_cFv(); -extern "C" void __ct__14dFile_select_cFP10JKRArchive(); -extern "C" void _create__14dFile_select_cFv(); -extern "C" void _move__14dFile_select_cFv(); -extern "C" void _draw__14dFile_select_cFv(); -extern "C" void __ct__14dBrightCheck_cFP10JKRArchive(); -extern "C" void _move__14dBrightCheck_cFv(); -extern "C" void _draw__14dBrightCheck_cFv(); -extern "C" void dKy_clear_game_init__Fv(); -extern "C" void dKy_setLight_init__Fv(); -extern "C" void changeWater__13dMeter2Info_cFUc(); -extern "C" void bgmStart__8Z2SeqMgrFUlUll(); -extern "C" void bgmStop__8Z2SeqMgrFUll(); -extern "C" void bgmStreamPrepare__8Z2SeqMgrFUl(); -extern "C" void bgmStreamPlay__8Z2SeqMgrFv(); -extern "C" void becomeCurrentHeap__7JKRHeapFv(); -extern "C" void destroy__7JKRHeapFv(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void create__10JKRExpHeapFUlP7JKRHeapb(); -extern "C" void __register_global_object(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_28(); -// extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; -// extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; -extern "C" void* mRenderModeObj__15mDoMch_render_c[1 + 1 /* padding */]; -extern "C" u8 mFader__13mDoGph_gInf_c[4]; -extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" u8 sManager__10JFWDisplay[4]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - // // Declarations: // /* ############################################################################################## */ /* 803C3040-803C304C 020160 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; @@ -211,46 +96,11 @@ static dSn_HIO_c g_snHIO; /* 803C3094-803C30DC 0201B4 0048+00 1/2 0/0 0/0 .data MainProc */ typedef void (dScnName_c::*mainProcFunc)(void); -SECTION_DATA static mainProcFunc MainProc[6] = { +static mainProcFunc MainProc[6] = { &dScnName_c::FileSelectOpen, &dScnName_c::FileSelectMain, &dScnName_c::FileSelectClose, &dScnName_c::brightCheckOpen, &dScnName_c::brightCheck, &dScnName_c::changeGameScene, }; -/* 803C30DC-803C30F0 -00001 0014+00 2/0 0/0 0/0 .data l_dScnName_Method */ -SECTION_DATA static void* l_dScnName_Method[5] = { - (void*)dScnName_Create__FP11scene_class, (void*)dScnName_Delete__FP10dScnName_c, - (void*)dScnName_Execute__FP10dScnName_c, (void*)dScnName_IsDelete__FP10dScnName_c, - (void*)dScnName_Draw__FP10dScnName_c, -}; - -/* 803C30F0-803C3118 -00001 0028+00 0/0 0/0 1/0 .data g_profile_NAME_SCENE */ -SECTION_DATA extern void* g_profile_NAME_SCENE[10] = { - (void*)NULL, - (void*)0x0001FFFD, - (void*)0x000D0000, - (void*)&g_fpcNd_Method, - (void*)0x00000424, - (void*)NULL, - (void*)NULL, - (void*)&g_fopScn_Method, - (void*)&l_dScnName_Method, - (void*)NULL, -}; - -/* 803C3118-803C3140 -00001 0028+00 0/0 0/0 1/0 .data g_profile_NAMEEX_SCENE */ -SECTION_DATA extern void* g_profile_NAMEEX_SCENE[10] = { - (void*)NULL, - (void*)0x0001FFFD, - (void*)0x000E0000, - (void*)&g_fpcNd_Method, - (void*)0x00000424, - (void*)NULL, - (void*)NULL, - (void*)&g_fopScn_Method, - (void*)&l_dScnName_Method, - (void*)NULL, -}; - /* 8025878C-802587A4 2530CC 0018+00 1/1 0/0 0/0 .text __ct__9dSn_HIO_cFv */ dSn_HIO_c::dSn_HIO_c() { mFileSelWaitTime = 15; @@ -259,7 +109,7 @@ dSn_HIO_c::dSn_HIO_c() { /* 802587A4-80258820 2530E4 007C+00 1/0 0/0 0/0 .text phase_1__FPc */ static s32 phase_1(char* resName) { mDoAud_bgmStart(-1); - if (dComIfG_setObjectRes(resName, 0, NULL) == 0) { + if (dComIfG_setObjectRes(resName, (u8)0, NULL) == 0) { return 5; } @@ -286,47 +136,12 @@ static s32 resLoad(request_of_phase_process_class* i_phase, char* param_1) { } /* ############################################################################################## */ -/* 8039A2A8-8039A2A8 026908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039A2B5 = "fileSel"; -#pragma pop -/* 80454EF8-80454EFC 0034F8 0004+00 2/2 0/0 0/0 .sdata2 @3923 */ -SECTION_SDATA2 static u8 lit_3923[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80454EFC-80454F00 0034FC 0004+00 1/1 0/0 0/0 .sdata2 @3924 */ -SECTION_SDATA2 static f32 lit_3924 = 1.0f; - -/* 80454F00-80454F04 003500 0004+00 1/1 0/0 0/0 .sdata2 @3925 */ -SECTION_SDATA2 static f32 lit_3925 = 100000.0f; - -/* 80454F04-80454F08 003504 0004+00 1/1 0/0 0/0 .sdata2 @3926 */ -SECTION_SDATA2 static f32 lit_3926 = 45.0f; - -/* 80454F08-80454F0C 003508 0004+00 1/1 0/0 0/0 .sdata2 @3927 */ -SECTION_SDATA2 static f32 lit_3927 = 19.0f / 14.0f; - -/* 80454F0C-80454F10 00350C 0004+00 1/1 0/0 0/0 .sdata2 @3928 */ -SECTION_SDATA2 static f32 lit_3928 = -1000.0f; - -/* 80454F10-80454F18 003510 0008+00 1/1 0/0 0/0 .sdata2 @3930 */ -SECTION_SDATA2 static f64 lit_3930 = 4503599627370496.0 /* cast u32 to float */; - -/* 802588A0-80258B2C 2531E0 028C+00 1/1 0/0 0/0 .text create__10dScnName_cFv */ -#ifdef NONMATCHING s32 dScnName_c::create() { int phase_state = resLoad(&field_0x1c4, "fileSel"); if (phase_state == cPhs_COMPLEATE_e) { mHeap = JKRExpHeap::create(0x180000, mDoExt_getGameHeap(), false); - JKRExpHeap* heap = mHeap; - mDoExt_setCurrentHeap(heap); - field_0x1d0 = heap; + field_0x1d0 = (JKRExpHeap*)mDoExt_setCurrentHeap(mHeap); dRes_info_c* res = dComIfG_getObjectResInfo("fileSel"); dFs_c = new dFile_select_c(res->getArchive()); @@ -346,28 +161,20 @@ s32 dScnName_c::create() { dComIfGp_setWindowNum(1); dComIfGp_setWindow(0, 0.0f, 0.0f, mDoMch_render_c::getFbWidth(), mDoMch_render_c::getEfbHeight(), 0.0f, 1.0f, 0, 2); - dComIfGp_setCamera(0, &mCamera); - // dDlst_window_c* window = &g_dComIfG_gameInfo.play.mWindow[0]; - - /* fopCamM_SetNear(&mCamera, 1.0f); - fopCamM_SetFar(&mCamera, 100000.0f); - fopCamM_SetFovy(&mCamera, 45.0f); - fopCamM_SetAspect(&mCamera, mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF()); - fopCamM_SetEye(&mCamera, 0.0f, 0.0f, -1000.0f); - fopCamM_SetCenter(&mCamera, 0.0f, 0.0f, 0.0f); - fopCamM_SetBank(&mCamera, 0); */ + dDlst_window_c* window = dComIfGp_getWindow(0); + dComIfGp_setCamera(0, (camera_class*)&mCamera); mCamera.mNear = 1.0f; mCamera.mFar = 100000.0f; mCamera.mFovy = 45.0f; mCamera.mAspect = mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF(); - mCamera.field_0xd8.mEye.set(0.0f, 0.0f, -1000.0f); - mCamera.field_0xd8.mCenter.set(0.0f, 0.0f, 0.0f); + mCamera.mLookat.mEye.set(0.0f, 0.0f, -1000.0f); + mCamera.mLookat.mCenter.set(0.0f, 0.0f, 0.0f); mCamera.mBank = 0; dComIfGp_setPlayer(0, NULL); - dComIfGd_setWindow(g_dComIfG_gameInfo.play.mWindow); - dComIfGd_setViewport(g_dComIfG_gameInfo.play.mWindow->getViewPort()); + dComIfGd_setWindow(window); + dComIfGd_setViewport(window->getViewPort()); dComIfGd_setView(&mCamera); mDoGph_gInf_c::offAutoForcus(); setView(); @@ -381,16 +188,6 @@ s32 dScnName_c::create() { } return phase_state; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 dScnName_c::create() { - nofralloc -#include "asm/d/s/d_s_name/create__10dScnName_cFv.s" -} -#pragma pop -#endif /* 80258B2C-80258BC8 25346C 009C+00 1/1 0/0 0/0 .text setView__10dScnName_cFv */ void dScnName_c::setView() { @@ -400,10 +197,9 @@ void dScnName_c::setView() { mCamera.mBank); PSMTXInverse(mCamera.mViewMtx, mCamera.mInvViewMtx); PSMTXCopy(mCamera.mViewMtx, mCamera.mViewMtxNoTrans); - f32 tmp_0 = FLOAT_LABEL(lit_3923); - mCamera.mViewMtxNoTrans[0][3] = tmp_0; - mCamera.mViewMtxNoTrans[1][3] = tmp_0; - mCamera.mViewMtxNoTrans[2][3] = tmp_0; + mCamera.mViewMtxNoTrans[0][3] = 0.0f; + mCamera.mViewMtxNoTrans[1][3] = 0.0f; + mCamera.mViewMtxNoTrans[2][3] = 0.0f; PSMTXCopy(mCamera.mViewMtx, j3dSys.mViewMtx); mDoMtx_concatProjView(mCamera.mProjMtx, mCamera.mViewMtx, mCamera.mProjViewMtx); } @@ -474,29 +270,19 @@ void dScnName_c::FileSelectMain() { } /* 80258E78-80258F20 2537B8 00A8+00 1/1 0/0 0/0 .text FileSelectMainNormal__10dScnName_cFv */ -#ifdef NONMATCHING void dScnName_c::FileSelectMainNormal() { - if (dFs_c->isSelectEnd() == true) { + switch(dFs_c->isSelectEnd()) { + case 1: field_0x41e = 15; mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); mDoGph_gInf_c::startFadeOut(15); field_0x41d = 2; field_0x420 = 1; + break; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnName_c::FileSelectMainNormal() { - nofralloc -#include "asm/d/s/d_s_name/FileSelectMainNormal__10dScnName_cFv.s" -} -#pragma pop -#endif /* 80258F20-80258FD4 253860 00B4+00 1/0 0/0 0/0 .text FileSelectClose__10dScnName_cFv */ -#ifdef NONMATCHING void dScnName_c::FileSelectClose() { field_0x41e--; @@ -509,16 +295,6 @@ void dScnName_c::FileSelectClose() { field_0x420 = 0; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnName_c::FileSelectClose() { - nofralloc -#include "asm/d/s/d_s_name/FileSelectClose__10dScnName_cFv.s" -} -#pragma pop -#endif /* 80258FD4-80259008 253914 0034+00 1/0 0/0 0/0 .text brightCheckOpen__10dScnName_cFv */ void dScnName_c::brightCheckOpen() { @@ -552,21 +328,12 @@ void dScnName_c::brightCheck() { } /* ############################################################################################## */ -/* 8039A2A8-8039A2A8 026908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039A2BD = "F_SP108"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039A2C5 = "\0\0"; -#pragma pop /* 802590F8-802591C0 253A38 00C8+00 1/0 0/0 0/0 .text changeGameScene__10dScnName_cFv */ -// weird comparison in changeReq -#ifdef NONMATCHING void dScnName_c::changeGameScene() { if (!mDoRst::isReset() && !fopOvlpM_IsPeek()) { dComIfGs_gameStart(); - fopScnM_ChangeReq(this, field_0x41f == 0 ? PROC_PLAY_SCENE : 10, 0, 5); + fopScnM_ChangeReq(this, field_0x41f == 0 ? PROC_PLAY_SCENE : PROC_PLAY_SCENE, 0, 5); dComIfGp_offEnableNextStage(); if (dFs_c->isDataNew(dFs_c->getSelectNum())) { @@ -577,16 +344,6 @@ void dScnName_c::changeGameScene() { dComIfGs_setRestartRoomParam(0); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnName_c::changeGameScene() { - nofralloc -#include "asm/d/s/d_s_name/changeGameScene__10dScnName_cFv.s" -} -#pragma pop -#endif /* 802591C0-802591E0 253B00 0020+00 1/0 0/0 0/0 .text dScnName_Draw__FP10dScnName_c */ static void dScnName_Draw(dScnName_c* scn) { @@ -618,3 +375,41 @@ static void dScnName_Create(scene_class* scn) { } /* 8039A2A8-8039A2A8 026908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ + + +/* 803C30DC-803C30F0 -00001 0014+00 2/0 0/0 0/0 .data l_dScnName_Method */ +static leafdraw_method_class l_dScnName_Method = { + (process_method_func)dScnName_Create, (process_method_func)dScnName_Delete, + (process_method_func)dScnName_Execute, (process_method_func)dScnName_IsDelete, + (process_method_func)dScnName_Draw, +}; + +/* 803C30F0-803C3118 -00001 0028+00 0/0 0/0 1/0 .data g_profile_NAME_SCENE */ +extern scene_process_profile_definition g_profile_NAME_SCENE = { + 0, + 1, + -3, + PROC_NAME_SCENE, + &g_fpcNd_Method.mBase, + sizeof(dScnName_c), + 0, + 0, + &g_fopScn_Method.mBase, + (process_method_class*)&l_dScnName_Method, + NULL, +}; + +/* 803C3118-803C3140 -00001 0028+00 0/0 0/0 1/0 .data g_profile_NAMEEX_SCENE */ +extern scene_process_profile_definition g_profile_NAMEEX_SCENE = { + 0, + 1, + -3, + PROC_NAMEEX_SCENE, + &g_fpcNd_Method.mBase, + sizeof(dScnName_c), + 0, + 0, + &g_fopScn_Method.mBase, + (process_method_class*)&l_dScnName_Method, + NULL, +}; diff --git a/src/d/s/d_s_play.cpp b/src/d/s/d_s_play.cpp index fc16b0726dc..a42e87d2267 100644 --- a/src/d/s/d_s_play.cpp +++ b/src/d/s/d_s_play.cpp @@ -24,6 +24,7 @@ #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_graphic.h" +#include "d/d_eye_hl.h" // // Types: @@ -387,7 +388,7 @@ asm dScnPly_env_debugHIO_c::dScnPly_env_debugHIO_c() { SECTION_SDATA2 static u32 lit_4100 = 0x2A1E46FF; /* 802594AC-802597B8 253DEC 030C+00 1/0 0/0 0/0 .text dScnPly_Draw__FP9dScnPly_c */ -// some small issues like instruction reordering +// bool comparison issues #ifdef NONMATCHING static int dScnPly_Draw(dScnPly_c* scn) { dComIfG_Ccsp()->Move(); @@ -425,7 +426,7 @@ static int dScnPly_Draw(dScnPly_c* scn) { } dMdl_mng_c::reset(); - if (!dComIfGp_isPauseFlag() && pauseTimer == 0) { + if (!dComIfGp_isPauseFlag() && dScnPly_c::pauseTimer == 0) { if (fpcM_GetName(scn) == PROC_PLAY_SCENE) { dComIfGp_getVibration().Run(); } @@ -436,9 +437,9 @@ static int dScnPly_Draw(dScnPly_c* scn) { cCt_execCounter(); } else { dPa_control_c::onStatus(1); - if (pauseTimer == 0) { + if (dScnPly_c::pauseTimer == 0) { dPa_control_c::onStatus(2); - if (pauseTimer == 0) { + if (dScnPly_c::pauseTimer == 0) { dComIfGp_getVibration().Pause(); } } @@ -770,9 +771,9 @@ static int phase_1_0(dScnPly_c* param_0) { return cPhs_ZERO_e; } else { dStage_infoCreate(); - dComIfG_setObjectRes("Event", 0, NULL); + dComIfG_setObjectRes("Event", (u8)0, NULL); dComIfGp_setCameraParamFileName(0, camparamarc); - dComIfG_setObjectRes("CamParam", 0, NULL); + dComIfG_setObjectRes("CamParam", (u8)0, NULL); return cPhs_TWO_e; } } diff --git a/src/d/save/d_save_HIO.cpp b/src/d/save/d_save_HIO.cpp index f7092ae5397..14060b8b945 100644 --- a/src/d/save/d_save_HIO.cpp +++ b/src/d/save/d_save_HIO.cpp @@ -5,651 +5,229 @@ #include "d/save/d_save_HIO.h" #include "d/com/d_com_inf_game.h" -#include "dol2asm.h" #include "dolphin/types.h" // // Forward References: // -extern "C" void __ct__29dSvBit_childSwPerfectionHIO_cFv(); -extern "C" void init__29dSvBit_childSwPerfectionHIO_cFv(); -extern "C" void __ct__26dSvBit_childSwDungeonHIO_cFv(); -extern "C" void init__26dSvBit_childSwDungeonHIO_cFv(); -extern "C" void __ct__23dSvBit_childSwZoneHIO_cFv(); -extern "C" void init__23dSvBit_childSwZoneHIO_cFv(); -extern "C" void __ct__26dSvBit_childSwOneZoneHIO_cFv(); -extern "C" void init__26dSvBit_childSwOneZoneHIO_cFv(); -extern "C" void __ct__29dSvBit_childItPerfectionHIO_cFv(); -extern "C" void init__29dSvBit_childItPerfectionHIO_cFv(); -extern "C" void __ct__26dSvBit_childItDungeonHIO_cFv(); -extern "C" void init__26dSvBit_childItDungeonHIO_cFv(); -extern "C" void __ct__23dSvBit_childItZoneHIO_cFv(); -extern "C" void init__23dSvBit_childItZoneHIO_cFv(); -extern "C" void __ct__26dSvBit_childItOneZoneHIO_cFv(); -extern "C" void init__26dSvBit_childItOneZoneHIO_cFv(); -extern "C" void __ct__29dSvBit_childTbPerfectionHIO_cFv(); -extern "C" void init__29dSvBit_childTbPerfectionHIO_cFv(); -extern "C" void __ct__25dSvBit_childDarknessHIO_cFv(); -extern "C" void init__25dSvBit_childDarknessHIO_cFv(); -extern "C" void __ct__26dSvBit_childTransformHIO_cFv(); -extern "C" void init__26dSvBit_childTransformHIO_cFv(); -extern "C" void __ct__22dSvBit_childOtherHIO_cFv(); -extern "C" void init__22dSvBit_childOtherHIO_cFv(); -extern "C" void init__12dSvBit_HIO_cFv(); -extern "C" void __dt__22dSvBit_childOtherHIO_cFv(); -extern "C" void __dt__26dSvBit_childTransformHIO_cFv(); -extern "C" void __dt__25dSvBit_childDarknessHIO_cFv(); -extern "C" void __dt__29dSvBit_childTbPerfectionHIO_cFv(); -extern "C" void __dt__26dSvBit_childItOneZoneHIO_cFv(); -extern "C" void __dt__23dSvBit_childItZoneHIO_cFv(); -extern "C" void __dt__26dSvBit_childItDungeonHIO_cFv(); -extern "C" void __dt__29dSvBit_childItPerfectionHIO_cFv(); -extern "C" void __dt__26dSvBit_childSwOneZoneHIO_cFv(); -extern "C" void __dt__23dSvBit_childSwZoneHIO_cFv(); -extern "C" void __dt__26dSvBit_childSwDungeonHIO_cFv(); -extern "C" void __dt__29dSvBit_childSwPerfectionHIO_cFv(); -extern "C" void __sinit_d_save_HIO_cpp(); -extern "C" void __dt__12dSvBit_HIO_cFv(); -extern "C" void __dt__25dSvBit_childTreasureHIO_cFv(); -extern "C" void __dt__21dSvBit_childItemHIO_cFv(); -extern "C" void __dt__23dSvBit_childSwitchHIO_cFv(); - -// -// External References: -// - -extern "C" void isDarkClearLV__21dSv_player_status_b_cCFi(); -extern "C" void isTransformLV__21dSv_player_status_b_cCFi(); -extern "C" void getLightDropNum__16dSv_light_drop_cCFUc(); -extern "C" void isLightDropGetFlag__16dSv_light_drop_cCFUc(); -extern "C" void isTbox__12dSv_memBit_cCFi(); -extern "C" void isSwitch__12dSv_memBit_cCFi(); -extern "C" void isItem__12dSv_memBit_cCFi(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void isSwitch__12dSv_danBit_cCFi(); -extern "C" void isItem__12dSv_danBit_cCFi(); -extern "C" void __dl__FPv(); -extern "C" void __register_global_object(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); - // // Declarations: // -/* ############################################################################################## */ -/* 803C3300-803C330C 020420 000C+00 3/3 0/0 0/0 .data __vt__22dSvBit_childOtherHIO_c */ -SECTION_DATA extern void* __vt__22dSvBit_childOtherHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__22dSvBit_childOtherHIO_cFv, -}; - -/* 803C330C-803C3318 02042C 000C+00 3/3 0/0 0/0 .data __vt__26dSvBit_childTransformHIO_c - */ -SECTION_DATA extern void* __vt__26dSvBit_childTransformHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__26dSvBit_childTransformHIO_cFv, -}; - -/* 803C3318-803C3324 020438 000C+00 3/3 0/0 0/0 .data __vt__25dSvBit_childDarknessHIO_c - */ -SECTION_DATA extern void* __vt__25dSvBit_childDarknessHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__25dSvBit_childDarknessHIO_cFv, -}; - -/* 803C3324-803C3330 020444 000C+00 4/4 0/0 0/0 .data __vt__29dSvBit_childTbPerfectionHIO_c */ -SECTION_DATA extern void* __vt__29dSvBit_childTbPerfectionHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__29dSvBit_childTbPerfectionHIO_cFv, -}; - -/* 803C3330-803C333C 020450 000C+00 4/4 0/0 0/0 .data __vt__26dSvBit_childItOneZoneHIO_c - */ -SECTION_DATA extern void* __vt__26dSvBit_childItOneZoneHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__26dSvBit_childItOneZoneHIO_cFv, -}; - -/* 803C333C-803C3348 02045C 000C+00 4/4 0/0 0/0 .data __vt__23dSvBit_childItZoneHIO_c */ -SECTION_DATA extern void* __vt__23dSvBit_childItZoneHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__23dSvBit_childItZoneHIO_cFv, -}; - -/* 803C3348-803C3354 020468 000C+00 4/4 0/0 0/0 .data __vt__26dSvBit_childItDungeonHIO_c - */ -SECTION_DATA extern void* __vt__26dSvBit_childItDungeonHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__26dSvBit_childItDungeonHIO_cFv, -}; - -/* 803C3354-803C3360 020474 000C+00 4/4 0/0 0/0 .data __vt__29dSvBit_childItPerfectionHIO_c */ -SECTION_DATA extern void* __vt__29dSvBit_childItPerfectionHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__29dSvBit_childItPerfectionHIO_cFv, -}; - -/* 803C3360-803C336C 020480 000C+00 4/4 0/0 0/0 .data __vt__26dSvBit_childSwOneZoneHIO_c - */ -SECTION_DATA extern void* __vt__26dSvBit_childSwOneZoneHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__26dSvBit_childSwOneZoneHIO_cFv, -}; - -/* 803C336C-803C3378 02048C 000C+00 4/4 0/0 0/0 .data __vt__23dSvBit_childSwZoneHIO_c */ -SECTION_DATA extern void* __vt__23dSvBit_childSwZoneHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__23dSvBit_childSwZoneHIO_cFv, -}; - -/* 803C3378-803C3384 020498 000C+00 4/4 0/0 0/0 .data __vt__26dSvBit_childSwDungeonHIO_c - */ -SECTION_DATA extern void* __vt__26dSvBit_childSwDungeonHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__26dSvBit_childSwDungeonHIO_cFv, -}; - -/* 803C3384-803C3390 0204A4 000C+00 4/4 0/0 0/0 .data __vt__29dSvBit_childSwPerfectionHIO_c */ -SECTION_DATA extern void* __vt__29dSvBit_childSwPerfectionHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__29dSvBit_childSwPerfectionHIO_cFv, -}; - /* 8025BB78-8025BBAC 2564B8 0034+00 1/1 0/0 0/0 .text __ct__29dSvBit_childSwPerfectionHIO_cFv */ dSvBit_childSwPerfectionHIO_c::dSvBit_childSwPerfectionHIO_c() { for (int i = 0; i < 0x80; i++) { - field_0x5[i] = false; - field_0x85[i] = false; + field_0x5[i] = 0; + field_0x85[i] = 0; } } /* 8025BBAC-8025BC14 2564EC 0068+00 1/1 0/0 0/0 .text init__29dSvBit_childSwPerfectionHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childSwPerfectionHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__29dSvBit_childSwPerfectionHIO_cFv.s" +void dSvBit_childSwPerfectionHIO_c::init() { + for (int i = 0; i < 0x80; i++) { + field_0x5[i] = dComIfGs_isSaveSwitch(i); + field_0x85[i] = field_0x5[i]; + } } -#pragma pop /* 8025BC14-8025BC48 256554 0034+00 1/1 0/0 0/0 .text __ct__26dSvBit_childSwDungeonHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childSwDungeonHIO_c::dSvBit_childSwDungeonHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__26dSvBit_childSwDungeonHIO_cFv.s" +dSvBit_childSwDungeonHIO_c::dSvBit_childSwDungeonHIO_c() { + for (int i = 0; i < 0x40; i++) { + field_0x5[i] = 0; + field_0x45[i] = 0; + } } -#pragma pop /* 8025BC48-8025BCB0 256588 0068+00 1/1 0/0 0/0 .text init__26dSvBit_childSwDungeonHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childSwDungeonHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__26dSvBit_childSwDungeonHIO_cFv.s" +void dSvBit_childSwDungeonHIO_c::init() { + for (int i = 0; i < 0x40; i++) { + field_0x5[i] = dComIfGs_isSaveDunSwitch(i); + field_0x45[i] = field_0x5[i]; + } } -#pragma pop /* 8025BCB0-8025BCE4 2565F0 0034+00 1/1 0/0 0/0 .text __ct__23dSvBit_childSwZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childSwZoneHIO_c::dSvBit_childSwZoneHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__23dSvBit_childSwZoneHIO_cFv.s" +dSvBit_childSwZoneHIO_c::dSvBit_childSwZoneHIO_c() { + for (int i = 0; i < 0x20; i++) { + field_0x5[i] = 0; + field_0x25[i] = 0; + } } -#pragma pop /* 8025BCE4-8025BD10 256624 002C+00 1/1 0/0 0/0 .text init__23dSvBit_childSwZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childSwZoneHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__23dSvBit_childSwZoneHIO_cFv.s" +void dSvBit_childSwZoneHIO_c::init() { + for (int i = 0; i < 0x20; i++) { + field_0x5[i] = 0; + field_0x25[i] = field_0x5[i]; + } } -#pragma pop /* 8025BD10-8025BD44 256650 0034+00 1/1 0/0 0/0 .text __ct__26dSvBit_childSwOneZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childSwOneZoneHIO_c::dSvBit_childSwOneZoneHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__26dSvBit_childSwOneZoneHIO_cFv.s" +dSvBit_childSwOneZoneHIO_c::dSvBit_childSwOneZoneHIO_c() { + for (int i = 0; i < 0x10; i++) { + field_0x5[i] = 0; + field_0x15[i] = 0; + } } -#pragma pop /* 8025BD44-8025BD70 256684 002C+00 1/1 0/0 0/0 .text init__26dSvBit_childSwOneZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childSwOneZoneHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__26dSvBit_childSwOneZoneHIO_cFv.s" +void dSvBit_childSwOneZoneHIO_c::init() { + for (int i = 0; i < 0x10; i++) { + field_0x5[i] = 0; + field_0x15[i] = field_0x5[i]; + } } -#pragma pop /* 8025BD70-8025BDA4 2566B0 0034+00 1/1 0/0 0/0 .text __ct__29dSvBit_childItPerfectionHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childItPerfectionHIO_c::dSvBit_childItPerfectionHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__29dSvBit_childItPerfectionHIO_cFv.s" +dSvBit_childItPerfectionHIO_c::dSvBit_childItPerfectionHIO_c() { + for (int i = 0; i < 0x20; i++) { + field_0x5[i] = 0; + field_0x25[i] = 0; + } } -#pragma pop /* 8025BDA4-8025BE0C 2566E4 0068+00 1/1 0/0 0/0 .text init__29dSvBit_childItPerfectionHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childItPerfectionHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__29dSvBit_childItPerfectionHIO_cFv.s" +void dSvBit_childItPerfectionHIO_c::init() { + for (int i = 0; i < 0x20; i++) { + field_0x5[i] = dComIfGs_isSaveItem(i); + field_0x25[i] = field_0x5[i]; + } } -#pragma pop /* 8025BE0C-8025BE40 25674C 0034+00 1/1 0/0 0/0 .text __ct__26dSvBit_childItDungeonHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childItDungeonHIO_c::dSvBit_childItDungeonHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__26dSvBit_childItDungeonHIO_cFv.s" +dSvBit_childItDungeonHIO_c::dSvBit_childItDungeonHIO_c() { + for (int i = 0; i < 0x80; i++) { + field_0x5[i] = 0; + field_0x85[i] = 0; + } } -#pragma pop /* 8025BE40-8025BEA8 256780 0068+00 1/1 0/0 0/0 .text init__26dSvBit_childItDungeonHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childItDungeonHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__26dSvBit_childItDungeonHIO_cFv.s" +void dSvBit_childItDungeonHIO_c::init() { + for (int i = 0; i < 0x80; i++) { + field_0x5[i] = dComIfGs_isSaveDunItem(i); + field_0x85[i] = field_0x5[i]; + } } -#pragma pop /* 8025BEA8-8025BEDC 2567E8 0034+00 1/1 0/0 0/0 .text __ct__23dSvBit_childItZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childItZoneHIO_c::dSvBit_childItZoneHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__23dSvBit_childItZoneHIO_cFv.s" +dSvBit_childItZoneHIO_c::dSvBit_childItZoneHIO_c() { + for (int i = 0; i < 0x20; i++) { + field_0x5[i] = 0; + field_0x25[i] = 0; + } } -#pragma pop /* 8025BEDC-8025BF08 25681C 002C+00 1/1 0/0 0/0 .text init__23dSvBit_childItZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childItZoneHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__23dSvBit_childItZoneHIO_cFv.s" +void dSvBit_childItZoneHIO_c::init() { + for (int i = 0; i < 0x20; i++) { + field_0x5[i] = 0; + field_0x25[i] = field_0x5[i]; + } } -#pragma pop /* 8025BF08-8025BF3C 256848 0034+00 1/1 0/0 0/0 .text __ct__26dSvBit_childItOneZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childItOneZoneHIO_c::dSvBit_childItOneZoneHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__26dSvBit_childItOneZoneHIO_cFv.s" +dSvBit_childItOneZoneHIO_c::dSvBit_childItOneZoneHIO_c() { + for (int i = 0; i < 0x10; i++) { + field_0x5[i] = 0; + field_0x15[i] = 0; + } } -#pragma pop /* 8025BF3C-8025BF68 25687C 002C+00 1/1 0/0 0/0 .text init__26dSvBit_childItOneZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childItOneZoneHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__26dSvBit_childItOneZoneHIO_cFv.s" +void dSvBit_childItOneZoneHIO_c::init() { + for (int i = 0; i < 0x10; i++) { + field_0x5[i] = 0; + field_0x15[i] = field_0x5[i]; + } } -#pragma pop /* 8025BF68-8025BF9C 2568A8 0034+00 1/1 0/0 0/0 .text __ct__29dSvBit_childTbPerfectionHIO_cFv */ dSvBit_childTbPerfectionHIO_c::dSvBit_childTbPerfectionHIO_c() { for (int i = 0; i < 0x40; i++) { - field_0x5[i] = false; - field_0x45[i] = false; + field_0x5[i] = 0; + field_0x45[i] = 0; } } /* 8025BF9C-8025C004 2568DC 0068+00 1/1 0/0 0/0 .text init__29dSvBit_childTbPerfectionHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childTbPerfectionHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__29dSvBit_childTbPerfectionHIO_cFv.s" +void dSvBit_childTbPerfectionHIO_c::init() { + for (int i = 0; i < 0x40; i++) { + field_0x5[i] = dComIfGs_isTbox(i); + field_0x45[i] = field_0x5[i]; + } } -#pragma pop /* 8025C004-8025C038 256944 0034+00 1/1 0/0 0/0 .text __ct__25dSvBit_childDarknessHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childDarknessHIO_c::dSvBit_childDarknessHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__25dSvBit_childDarknessHIO_cFv.s" +dSvBit_childDarknessHIO_c::dSvBit_childDarknessHIO_c() { + for (int i = 0; i < 6; i++) { + TW[i] = 0; + field_0xB[i] = 0; + } } -#pragma pop /* 8025C038-8025C0A0 256978 0068+00 1/1 0/0 0/0 .text init__25dSvBit_childDarknessHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childDarknessHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__25dSvBit_childDarknessHIO_cFv.s" +void dSvBit_childDarknessHIO_c::init() { + for (int i = 0; i < 6; i++) { + TW[i] = dComIfGs_isDarkClearLV(i); + field_0xB[i] = TW[i]; + } } -#pragma pop /* 8025C0A0-8025C0D4 2569E0 0034+00 1/1 0/0 0/0 .text __ct__26dSvBit_childTransformHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childTransformHIO_c::dSvBit_childTransformHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__26dSvBit_childTransformHIO_cFv.s" +dSvBit_childTransformHIO_c::dSvBit_childTransformHIO_c() { + for (int i = 0; i < 4; i++) { + WF[i] = 0; + field_0x9[i] = 0; + } } -#pragma pop /* 8025C0D4-8025C13C 256A14 0068+00 1/1 0/0 0/0 .text init__26dSvBit_childTransformHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childTransformHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__26dSvBit_childTransformHIO_cFv.s" +void dSvBit_childTransformHIO_c::init() { + for (int i = 0; i < 4; i++) { + WF[i] = dComIfGs_isTransformLV(i); + field_0x9[i] = WF[i]; + } } -#pragma pop /* 8025C13C-8025C178 256A7C 003C+00 1/1 0/0 0/0 .text __ct__22dSvBit_childOtherHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childOtherHIO_c::dSvBit_childOtherHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__22dSvBit_childOtherHIO_cFv.s" +dSvBit_childOtherHIO_c::dSvBit_childOtherHIO_c() { + mDropNum = 0; + field_0x6 = 0; + for (int i = 0; i < 4; i++) { + mLightVessel[i] = 0; + field_0xb[i] = 0; + } } -#pragma pop /* 8025C178-8025C1F8 256AB8 0080+00 1/1 0/0 0/0 .text init__22dSvBit_childOtherHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childOtherHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__22dSvBit_childOtherHIO_cFv.s" +void dSvBit_childOtherHIO_c::init() { + mDropNum = dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea()); + field_0x6 = mDropNum; + for (int i = 0; i < 4; i++) { + mLightVessel[i] = dComIfGs_isLightDropGetFlag(i); + field_0xb[i] = mLightVessel[i]; + } } -#pragma pop /* 8025C1F8-8025C29C 256B38 00A4+00 0/0 1/1 0/0 .text init__12dSvBit_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_HIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__12dSvBit_HIO_cFv.s" +void dSvBit_HIO_c::init() { + mSwitch.init(); + mItem.init(); + mTreasure.init(); + mDarkness.init(); + mTransform.init(); + mOther.init(); + mTransformFlag = field_0x49d = i_dComIfGs_isEventBit(dSv_event_flag_c::M_077); } -#pragma pop - -/* 8025C29C-8025C2E4 256BDC 0048+00 1/0 0/0 0/0 .text __dt__22dSvBit_childOtherHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childOtherHIO_c::~dSvBit_childOtherHIO_c() { -extern "C" asm void __dt__22dSvBit_childOtherHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__22dSvBit_childOtherHIO_cFv.s" -} -#pragma pop - -/* 8025C2E4-8025C32C 256C24 0048+00 1/0 0/0 0/0 .text __dt__26dSvBit_childTransformHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childTransformHIO_c::~dSvBit_childTransformHIO_c() { -extern "C" asm void __dt__26dSvBit_childTransformHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__26dSvBit_childTransformHIO_cFv.s" -} -#pragma pop - -/* 8025C32C-8025C374 256C6C 0048+00 1/0 0/0 0/0 .text __dt__25dSvBit_childDarknessHIO_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childDarknessHIO_c::~dSvBit_childDarknessHIO_c() { -extern "C" asm void __dt__25dSvBit_childDarknessHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__25dSvBit_childDarknessHIO_cFv.s" -} -#pragma pop - -/* 8025C374-8025C3BC 256CB4 0048+00 1/0 0/0 0/0 .text __dt__29dSvBit_childTbPerfectionHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childTbPerfectionHIO_c::~dSvBit_childTbPerfectionHIO_c() { -extern "C" asm void __dt__29dSvBit_childTbPerfectionHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__29dSvBit_childTbPerfectionHIO_cFv.s" -} -#pragma pop - -/* 8025C3BC-8025C404 256CFC 0048+00 1/0 0/0 0/0 .text __dt__26dSvBit_childItOneZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childItOneZoneHIO_c::~dSvBit_childItOneZoneHIO_c() { -extern "C" asm void __dt__26dSvBit_childItOneZoneHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__26dSvBit_childItOneZoneHIO_cFv.s" -} -#pragma pop - -/* 8025C404-8025C44C 256D44 0048+00 1/0 0/0 0/0 .text __dt__23dSvBit_childItZoneHIO_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childItZoneHIO_c::~dSvBit_childItZoneHIO_c() { -extern "C" asm void __dt__23dSvBit_childItZoneHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__23dSvBit_childItZoneHIO_cFv.s" -} -#pragma pop - -/* 8025C44C-8025C494 256D8C 0048+00 1/0 0/0 0/0 .text __dt__26dSvBit_childItDungeonHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childItDungeonHIO_c::~dSvBit_childItDungeonHIO_c() { -extern "C" asm void __dt__26dSvBit_childItDungeonHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__26dSvBit_childItDungeonHIO_cFv.s" -} -#pragma pop - -/* 8025C494-8025C4DC 256DD4 0048+00 1/0 0/0 0/0 .text __dt__29dSvBit_childItPerfectionHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childItPerfectionHIO_c::~dSvBit_childItPerfectionHIO_c() { -extern "C" asm void __dt__29dSvBit_childItPerfectionHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__29dSvBit_childItPerfectionHIO_cFv.s" -} -#pragma pop - -/* 8025C4DC-8025C524 256E1C 0048+00 1/0 0/0 0/0 .text __dt__26dSvBit_childSwOneZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childSwOneZoneHIO_c::~dSvBit_childSwOneZoneHIO_c() { -extern "C" asm void __dt__26dSvBit_childSwOneZoneHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__26dSvBit_childSwOneZoneHIO_cFv.s" -} -#pragma pop - -/* 8025C524-8025C56C 256E64 0048+00 1/0 0/0 0/0 .text __dt__23dSvBit_childSwZoneHIO_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childSwZoneHIO_c::~dSvBit_childSwZoneHIO_c() { -extern "C" asm void __dt__23dSvBit_childSwZoneHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__23dSvBit_childSwZoneHIO_cFv.s" -} -#pragma pop - -/* 8025C56C-8025C5B4 256EAC 0048+00 1/0 0/0 0/0 .text __dt__26dSvBit_childSwDungeonHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childSwDungeonHIO_c::~dSvBit_childSwDungeonHIO_c() { -extern "C" asm void __dt__26dSvBit_childSwDungeonHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__26dSvBit_childSwDungeonHIO_cFv.s" -} -#pragma pop - -/* 8025C5B4-8025C5FC 256EF4 0048+00 1/0 0/0 0/0 .text __dt__29dSvBit_childSwPerfectionHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childSwPerfectionHIO_c::~dSvBit_childSwPerfectionHIO_c() { -extern "C" asm void __dt__29dSvBit_childSwPerfectionHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__29dSvBit_childSwPerfectionHIO_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803C3390-803C339C 0204B0 000C+00 3/3 0/0 0/0 .data __vt__25dSvBit_childTreasureHIO_c - */ -SECTION_DATA extern void* __vt__25dSvBit_childTreasureHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__25dSvBit_childTreasureHIO_cFv, -}; - -/* 803C339C-803C33A8 0204BC 000C+00 3/3 0/0 0/0 .data __vt__21dSvBit_childItemHIO_c */ -SECTION_DATA extern void* __vt__21dSvBit_childItemHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__21dSvBit_childItemHIO_cFv, -}; - -/* 803C33A8-803C33B4 0204C8 000C+00 3/3 0/0 0/0 .data __vt__23dSvBit_childSwitchHIO_c */ -SECTION_DATA extern void* __vt__23dSvBit_childSwitchHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__23dSvBit_childSwitchHIO_cFv, -}; - -/* 803C33B4-803C33C0 0204D4 000C+00 2/2 0/0 0/0 .data __vt__12dSvBit_HIO_c */ -SECTION_DATA extern void* __vt__12dSvBit_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dSvBit_HIO_cFv, -}; - -/* 804307E0-804307EC 05D500 000C+00 1/1 0/0 0/0 .bss @3659 */ -static u8 lit_3659[12]; /* 804307EC-80430C90 05D50C 04A0+04 1/1 2/2 0/0 .bss g_save_bit_HIO */ -extern u8 g_save_bit_HIO[1184 + 4 /* padding */]; -u8 g_save_bit_HIO[1184 + 4 /* padding */]; +dSvBit_HIO_c g_save_bit_HIO; -/* 8025C5FC-8025C6FC 256F3C 0100+00 0/0 1/0 0/0 .text __sinit_d_save_HIO_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_save_HIO_cpp() { - nofralloc -#include "asm/d/save/d_save_HIO/__sinit_d_save_HIO_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8025C5FC, __sinit_d_save_HIO_cpp); -#pragma pop - -/* 8025C6FC-8025C874 25703C 0178+00 2/1 0/0 0/0 .text __dt__12dSvBit_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_HIO_c::~dSvBit_HIO_c() { -extern "C" asm void __dt__12dSvBit_HIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__12dSvBit_HIO_cFv.s" -} -#pragma pop - -/* 8025C874-8025C8D4 2571B4 0060+00 1/0 0/0 0/0 .text __dt__25dSvBit_childTreasureHIO_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childTreasureHIO_c::~dSvBit_childTreasureHIO_c() { -extern "C" asm void __dt__25dSvBit_childTreasureHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__25dSvBit_childTreasureHIO_cFv.s" -} -#pragma pop - -/* 8025C8D4-8025C970 257214 009C+00 1/0 0/0 0/0 .text __dt__21dSvBit_childItemHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childItemHIO_c::~dSvBit_childItemHIO_c() { -extern "C" asm void __dt__21dSvBit_childItemHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__21dSvBit_childItemHIO_cFv.s" -} -#pragma pop - -/* 8025C970-8025CA0C 2572B0 009C+00 1/0 0/0 0/0 .text __dt__23dSvBit_childSwitchHIO_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childSwitchHIO_c::~dSvBit_childSwitchHIO_c() { -extern "C" asm void __dt__23dSvBit_childSwitchHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__23dSvBit_childSwitchHIO_cFv.s" -} -#pragma pop diff --git a/src/d/shop/d_shop_system.cpp b/src/d/shop/d_shop_system.cpp index 34b2ac1c67a..c7dfe7e6383 100644 --- a/src/d/shop/d_shop_system.cpp +++ b/src/d/shop/d_shop_system.cpp @@ -4,6 +4,7 @@ // #include "d/shop/d_shop_system.h" +#include "rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.h" #include "SSystem/SComponent/c_math.h" #include "d/a/d_a_shop_item_static.h" #include "d/com/d_com_inf_game.h" @@ -208,7 +209,7 @@ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { }; /* 803BB8A4-803BB8C0 0189C4 001C+00 6/6 0/0 0/0 .data dShopSystem_itemActor */ -SECTION_DATA static fopAc_ac_c* dShopSystem_itemActor[7] = { +SECTION_DATA static daTag_ShopItem_c* dShopSystem_itemActor[7] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, }; @@ -249,10 +250,10 @@ static int dShopSystem_searchItemActor(void* param_0, void* param_1) { } else { if (param2 == 0) { data_80451060 = 1; - dShopSystem_itemActor[dShopSystem_item_count] = (fopAc_ac_c*) param_0; + dShopSystem_itemActor[dShopSystem_item_count] = (daTag_ShopItem_c*) param_0; dShopSystem_itemNo[dShopSystem_item_count] = item_no; } else if (dShopSystem_itemActor[param2 - 1] == NULL) { - dShopSystem_itemActor[param2 - 1] = (fopAc_ac_c*) param_0; + dShopSystem_itemActor[param2 - 1] = (daTag_ShopItem_c*) param_0; dShopSystem_itemNo[param2 - 1] = item_no; } dShopSystem_item_count++; @@ -298,25 +299,9 @@ static int dShopSystem_searchCameraActor(void* param_0, void* param_1) { } /* ############################################################################################## */ -/* 80453B00-80453B04 002100 0004+00 1/1 0/0 0/0 .sdata2 @4097 */ -SECTION_SDATA2 static f32 lit_4097 = 9.0f / 10.0f; - -/* 80453B04-80453B08 002104 0004+00 2/2 0/0 0/0 .sdata2 @4098 */ -SECTION_SDATA2 static f32 lit_4098 = 0.5f; - -/* 80453B08-80453B0C 002108 0004+00 5/5 0/0 0/0 .sdata2 @4099 */ -SECTION_SDATA2 static f32 lit_4099 = 1.0f; - -/* 80453B0C-80453B10 00210C 0004+00 1/1 0/0 0/0 .sdata2 @4100 */ -SECTION_SDATA2 static f32 lit_4100 = 1.0f / 10.0f; - -/* 80453B10-80453B14 002110 0004+00 1/1 0/0 0/0 .sdata2 @4101 */ -SECTION_SDATA2 static f32 lit_4101 = 7.0f / 10.0f; /* 80197338-801974E4 191C78 01AC+00 0/0 0/0 19/19 .text initShopSystem__13dShopSystem_cFv */ -// matches with literals -#ifdef NONMATCHING void dShopSystem_c::initShopSystem() { data_80451058 = 3; data_80451060 = 0; @@ -362,16 +347,6 @@ void dShopSystem_c::initShopSystem() { field_0xf78 = -1; mFlow.onNonStopJunpFlowFlag(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::initShopSystem() { - nofralloc -#include "asm/d/shop/d_shop_system/initShopSystem__13dShopSystem_cFv.s" -} -#pragma pop -#endif struct shop_item_data { Vec mItemPos[3]; @@ -396,16 +371,6 @@ static processFunc process[22] = { &dShopSystem_c::seq_decide_no, &dShopSystem_c::seq_finish, (processFunc)&dShopSystem_c::seq_event, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, }; #else /* 803BB8E4-803BB8F0 -00001 000C+00 0/1 0/0 0/0 .data @4056 */ @@ -900,21 +865,8 @@ int dShopSystem_c::checkController(u8 seq, dMsgFlow_c* p_flow) { } /* ############################################################################################## */ -/* 80453B14-80453B18 002114 0004+00 4/4 0/0 0/0 .sdata2 @4493 */ -SECTION_SDATA2 static f32 lit_4493 = -1.0f; - -/* 80453B18-80453B1C 002118 0004+00 8/8 0/0 0/0 .sdata2 @4494 */ -SECTION_SDATA2 static f32 lit_4494 = 0.25f; - -/* 80453B1C-80453B20 00211C 0004+00 9/9 0/0 0/0 .sdata2 @4495 */ -SECTION_SDATA2 static f32 lit_4495 = 20.0f; - -/* 80453B20-80453B24 002120 0004+00 9/9 0/0 0/0 .sdata2 @4496 */ -SECTION_SDATA2 static f32 lit_4496 = 5.0f; /* 80197808-80197DD0 192148 05C8+00 1/1 0/0 0/0 .text chooseItem3__13dShopSystem_cFUc */ -// matches with literals -#ifdef NONMATCHING int dShopSystem_c::chooseItem3(u8 seq) { u8 old_cursor = mLastCursorPos; if (checkLeftTrigger(mpStick) && seq != SEQ_SELECT_WAIT) { @@ -1051,20 +1003,8 @@ up: ret: return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::chooseItem3(u8 param_0) { - nofralloc -#include "asm/d/shop/d_shop_system/chooseItem3__13dShopSystem_cFUc.s" -} -#pragma pop -#endif /* 80197DD0-80198250 192710 0480+00 1/1 0/0 0/0 .text chooseItem5__13dShopSystem_cFUc */ -// matches with literals -#ifdef NONMATCHING int dShopSystem_c::chooseItem5(u8 seq) { u8 old_cursor = mLastCursorPos; if (checkLeftTrigger(mpStick) && seq != SEQ_SELECT_WAIT) { @@ -1178,20 +1118,8 @@ down: ret: return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::chooseItem5(u8 seq) { - nofralloc -#include "asm/d/shop/d_shop_system/chooseItem5__13dShopSystem_cFUc.s" -} -#pragma pop -#endif /* 80198250-80198444 192B90 01F4+00 1/1 0/0 0/0 .text chooseItem4__13dShopSystem_cFUc */ -// matches with literals. gotos can probably be removed -#ifdef NONMATCHING int dShopSystem_c::chooseItem4(u8 seq) { u8 old_cursor = mLastCursorPos; if (checkLeftTrigger(mpStick) && seq != SEQ_SELECT_WAIT && mCursorPos != 0) { @@ -1233,16 +1161,6 @@ right: ret: return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::chooseItem4(u8 seq) { - nofralloc -#include "asm/d/shop/d_shop_system/chooseItem4__13dShopSystem_cFUc.s" -} -#pragma pop -#endif /* 80198444-80198488 192D84 0044+00 5/5 0/0 0/0 .text moveCursor__13dShopSystem_cFiUc */ int dShopSystem_c::moveCursor(int control_status, u8 param_1) { @@ -1258,8 +1176,6 @@ int dShopSystem_c::moveCursor(int control_status, u8 param_1) { } /* 80198488-80198708 192DC8 0280+00 1/1 0/0 0/0 .text moveCursor0__13dShopSystem_cFiUc */ -// matches with literals -#ifdef NONMATCHING int dShopSystem_c::moveCursor0(int control_status, u8 param_1) { offFlag(7); @@ -1313,23 +1229,16 @@ int dShopSystem_c::moveCursor0(int control_status, u8 param_1) { return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::moveCursor0(int param_0, u8 param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/moveCursor0__13dShopSystem_cFiUc.s" -} -#pragma pop -#endif /* 80198708-80198878 193048 0170+00 1/1 0/0 0/0 .text moveCursor1__13dShopSystem_cFiUc */ -#ifdef NONMATCHING int dShopSystem_c::moveCursor1(int control_status, u8 param_1) { offFlag(7); switch (control_status) { + case 3: + case 4: + case 5: + case 6: case 7: if (mCursorPos == 0) { return getFlowNodeNum() + 1; @@ -1362,16 +1271,6 @@ int dShopSystem_c::moveCursor1(int control_status, u8 param_1) { return 0; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::moveCursor1(int param_0, u8 param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/moveCursor1__13dShopSystem_cFiUc.s" -} -#pragma pop -#endif /* 80198878-80198950 1931B8 00D8+00 0/0 0/0 9/9 .text drawCursor__13dShopSystem_cFv */ int dShopSystem_c::drawCursor() { @@ -1426,39 +1325,8 @@ int dShopSystem_c::itemRotate() { } /* ############################################################################################## */ -/* 80394C10-80394C10 021270 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80394C10 = "R_SP01"; -#pragma pop - -/* 80453B24-80453B28 002124 0004+00 1/1 0/0 0/0 .sdata2 @5000 */ -SECTION_SDATA2 static f32 lit_5000 = -25.0f; - -/* 80453B28-80453B2C 002128 0004+00 1/1 0/0 0/0 .sdata2 @5001 */ -SECTION_SDATA2 static f32 lit_5001 = 150.0f; - -/* 80453B2C-80453B30 00212C 0004+00 1/1 0/0 0/0 .sdata2 @5002 */ -SECTION_SDATA2 static f32 lit_5002 = -50.0f; - -/* 80453B30-80453B34 002130 0004+00 1/1 0/0 0/0 .sdata2 @5003 */ -SECTION_SDATA2 static f32 lit_5003 = 250.0f; - -/* 80453B34-80453B38 002134 0004+00 1/1 0/0 0/0 .sdata2 @5004 */ -SECTION_SDATA2 static f32 lit_5004 = 60.0f; - -/* 80453B38-80453B3C 002138 0004+00 1/1 0/0 0/0 .sdata2 @5005 */ -SECTION_SDATA2 static f32 lit_5005 = -130.0f; - -/* 80453B3C-80453B40 00213C 0004+00 2/2 0/0 0/0 .sdata2 @5006 */ -SECTION_SDATA2 static f32 lit_5006 = 215.0f; - -/* 80453B40-80453B44 002140 0004+00 1/1 0/0 0/0 .sdata2 @5007 */ -SECTION_SDATA2 static f32 lit_5007 = 15.0f; /* 80198A2C-801990B0 19336C 0684+00 0/0 0/0 9/9 .text itemZoom__13dShopSystem_cFP4cXyz */ -// matches with literals -#ifdef NONMATCHING int dShopSystem_c::itemZoom(cXyz* param_0) { cXyz local_1c; @@ -1519,11 +1387,11 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { if (dShopSystem_itemNo[mCursorPos - 1] == ARROW_10 || dShopSystem_itemNo[mCursorPos - 1] == ARROW_20 || dShopSystem_itemNo[mCursorPos - 1] == ARROW_30) { - local_34.set(g_cursorHIO.mObjZoom.x, 5.0f + g_cursorHIO.mObjZoom.y + -50.0f, + local_34.set(g_cursorHIO.mObjZoom.x, -50.0f + g_cursorHIO.mObjZoom.y + 5.0f, (g_cursorHIO.mObjZoom.z + 250.0f) - 60.0f); } else { local_34.set(g_cursorHIO.mObjZoom.x, - 20.0f + g_cursorHIO.mObjZoom.y + -50.0f, + -50.0f + g_cursorHIO.mObjZoom.y + 20.0f, (g_cursorHIO.mObjZoom.z + 250.0f) - 60.0f); } } else if (mCursorPos == 7) { @@ -1589,16 +1457,6 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::itemZoom(cXyz* param_0) { - nofralloc -#include "asm/d/shop/d_shop_system/itemZoom__13dShopSystem_cFP4cXyz.s" -} -#pragma pop -#endif /* 801990B0-801990B8 1939F0 0008+00 1/0 0/0 0/0 .text * seq_wait__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ @@ -1607,13 +1465,6 @@ int dShopSystem_c::seq_wait(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { } /* ############################################################################################## */ -/* 80453B44-80453B48 002144 0004+00 3/3 0/0 0/0 .sdata2 @5084 */ -SECTION_SDATA2 static u8 lit_5084[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; inline void pos3Dto2D(Vec* a, Vec* b) { mDoLib_project(a, b); @@ -1621,8 +1472,6 @@ inline void pos3Dto2D(Vec* a, Vec* b) { /* 801990B8-8019936C 1939F8 02B4+00 1/0 0/0 0/0 .text * seq_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -// matches with literals -#ifdef NONMATCHING int dShopSystem_c::seq_start(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { if (field_0xf79 != 0) { dComIfGp_setDoStatusForce(0, 0); @@ -1690,16 +1539,6 @@ int dShopSystem_c::seq_start(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::seq_start(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/seq_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" -} -#pragma pop -#endif /* 8019936C-801993C4 193CAC 0058+00 1/0 0/0 0/0 .text * seq_select_wait__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ @@ -1714,8 +1553,6 @@ int dShopSystem_c::seq_select_wait(fopAc_ac_c*, dMsgFlow_c*) { /* 801993C4-8019959C 193D04 01D8+00 1/0 0/0 0/0 .text * seq_select_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -// matches with literals -#ifdef NONMATCHING int dShopSystem_c::seq_select_start(fopAc_ac_c*, dMsgFlow_c*) { if (field_0xf60 < 0 && field_0xf76 == 0 && dShopSystem_item_count != -1) { if (dShopSystem_item_count != data_80451058) { @@ -1765,21 +1602,9 @@ int dShopSystem_c::seq_select_start(fopAc_ac_c*, dMsgFlow_c*) { return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::seq_select_start(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/seq_select_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" -} -#pragma pop -#endif /* 8019959C-80199A18 193EDC 047C+00 1/0 0/0 0/0 .text * seq_select__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -// matches with literals -#ifdef NONMATCHING int dShopSystem_c::seq_select(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { if (chkSpMode() && !beforeSelectSeqAction(p_flow, field_0xf5c)) { return 0; @@ -1883,32 +1708,11 @@ int dShopSystem_c::seq_select(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::seq_select(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/seq_select__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" -} -#pragma pop -#endif /* ############################################################################################## */ -/* 80453B48-80453B50 002148 0004+04 1/1 0/0 0/0 .sdata2 @5296 */ -SECTION_SDATA2 static f32 lit_5296[1 + 1 /* padding */] = { - 9.0f, - /* padding */ - 0.0f, -}; - -/* 80453B50-80453B58 002150 0008+00 1/1 0/0 0/0 .sdata2 @5298 */ -SECTION_SDATA2 static f64 lit_5298 = 4503601774854144.0 /* cast s32 to float */; /* 80199A18-80199BF8 194358 01E0+00 1/0 0/0 0/0 .text * seq_moving__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -// matches with literals -#ifdef NONMATCHING int dShopSystem_c::seq_moving(fopAc_ac_c*, dMsgFlow_c*) { field_0xf68++; @@ -1952,16 +1756,6 @@ int dShopSystem_c::seq_moving(fopAc_ac_c*, dMsgFlow_c*) { return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::seq_moving(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/seq_moving__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" -} -#pragma pop -#endif /* 80199BF8-80199D14 194538 011C+00 1/0 0/0 0/0 .text * seq_decide__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ @@ -2019,8 +1813,6 @@ int dShopSystem_c::seq_choose(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { /* 80199E28-80199FA4 194768 017C+00 1/0 0/0 0/0 .text * seq_decide_yes__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -// matches with literals -#ifdef NONMATCHING int dShopSystem_c::seq_decide_yes(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { if (dMsgObject_getMessageID() == 0x1B82) { mShopCamAction.SetSelectIdx(0); @@ -2061,16 +1853,6 @@ int dShopSystem_c::seq_decide_yes(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::seq_decide_yes(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/seq_decide_yes__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" -} -#pragma pop -#endif /* 80199FA4-8019A020 1948E4 007C+00 1/0 0/0 0/0 .text * seq_decide_no__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ @@ -2120,11 +1902,9 @@ int dShopSystem_c::shop_init(bool param_0) { /* 8019A158-8019A238 194A98 00E0+00 0/0 0/0 9/9 .text * shop_process__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -// process array match issues -#ifdef NONMATCHING int dShopSystem_c::shop_process(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { int iVar1; - iVar1 = (this->*process[mSeq])(param_0, param_1); + iVar1 = (this->*((processFunc*)process)[mSeq])(param_0, param_1); if (mWaitTimer != 0) { mWaitTimer--; @@ -2149,16 +1929,6 @@ int dShopSystem_c::shop_process(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { } return iVar1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::shop_process(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/shop_process__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" -} -#pragma pop -#endif /* ############################################################################################## */ /* 804506F8-80450700 -00001 0004+04 1/1 0/0 0/0 .sdata shop_item_pos_data_tbl */ @@ -2278,40 +2048,134 @@ void dShopSystem_c::deleteObject() { } /* ############################################################################################## */ -/* 80453B60-80453B64 002160 0004+00 1/1 0/0 0/0 .sdata2 @5687 */ -SECTION_SDATA2 static f32 lit_5687 = -175.0f; - -/* 80453B64-80453B68 002164 0004+00 1/1 0/0 0/0 .sdata2 @5688 */ -SECTION_SDATA2 static f32 lit_5688 = 165.0f; - -/* 80453B68-80453B6C 002168 0004+00 1/1 0/0 0/0 .sdata2 @5689 */ -SECTION_SDATA2 static f32 lit_5689 = 10.0f; - -/* 80453B6C-80453B70 00216C 0004+00 1/1 0/0 0/0 .sdata2 @5690 */ -SECTION_SDATA2 static f32 lit_5690 = 225.0f; - -/* 80453B70-80453B74 002170 0004+00 1/1 0/0 0/0 .sdata2 @5691 */ -SECTION_SDATA2 static f32 lit_5691 = 370.0f; - -/* 80453B74-80453B78 002174 0004+00 1/1 0/0 0/0 .sdata2 @5692 */ -SECTION_SDATA2 static f32 lit_5692 = -180.0f; - -/* 80453B78-80453B7C 002178 0004+00 1/1 0/0 0/0 .sdata2 @5693 */ -SECTION_SDATA2 static f32 lit_5693 = 245.0f; - -/* 80453B7C-80453B80 00217C 0004+00 1/1 0/0 0/0 .sdata2 @5694 */ -SECTION_SDATA2 static f32 lit_5694 = -380.0f; /* 8019A5D0-8019AB00 194F10 0530+00 1/1 0/0 8/8 .text searchItemActor__13dShopSystem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::searchItemActor() { - nofralloc -#include "asm/d/shop/d_shop_system/searchItemActor__13dShopSystem_cFv.s" +int dShopSystem_c::searchItemActor() { + u8 temp_data; + if ((dShopSystem_item_count != -1 && ((dShopSystem_item_count < (temp_data = data_80451058)) || dShopSystem_camera_count < 2))) { + if (dShopSystem_item_count < temp_data) { + fpcEx_Search((fpcLyIt_JudgeFunc)dShopSystem_searchItemActor, this); + } + if (dShopSystem_camera_count < 2) { + fpcEx_Search((fpcLyIt_JudgeFunc)dShopSystem_searchCameraActor, this); + } + return 0; + } + + if (dShopSystem_item_count >= data_80451058 && dShopSystem_camera_count >= 2) { + mSoldOutFlag = -1; + if (data_80451060) { + f32 actorDistArr[7]; + u8 itemNoArr[7]; + f32 arr2[7]; + daTag_ShopItem_c* actorArr[7]; + u8 arr3[7]; + for (int i = 0; i < data_80451058; i++) { + actorArr[i] = dShopSystem_itemActor[i]; + itemNoArr[i] = dShopSystem_itemNo[i]; + actorDistArr[i] = fopAcM_searchActorDistance(this, actorArr[i]); + arr2[i] = 0.0f; + arr3[i] = 0; + } + for (int i = 0; i < data_80451058; i++) { + arr2[i] = actorDistArr[i]; + arr3[i] = i; + if (i > 0) { + for (int j = i; j >= 0; j--) { + if (arr2[j] < arr2[j-1]) { + f32 temp = arr2[j]; + arr2[j] = arr2[j-1]; + arr2[j-1] = temp; + u8 temp2 = arr3[j]; + arr3[j] = arr3[j-1]; + arr3[j-1] = temp2; + } + } + } + } + for (int i = 0; i < data_80451058; i++) { + dShopSystem_itemActor[i] = actorArr[arr3[i]]; + dShopSystem_itemNo[i] = itemNoArr[arr3[i]]; + } + } + + for (int i = 0; i < data_80451058; i++) { + u32 processId = dShopSystem_itemActor[i]->getProcessID(); + mItemCtrl.setItemIndex(i, processId); + mItemCtrl.setMessageIndex(i, (u16)dShopSystem_itemActor[i]->orig.angle.GetX() != 0xffff ? (u16)dShopSystem_itemActor[i]->orig.angle.GetX() : -1); + + if (processId + 0x10000 == 0xffff) { + onFlag(i); + onSoldOutItemFlag(i); + } else { + offFlag(i); + if ((u8)fopAcM_GetParam(dShopSystem_itemActor[i]) == 0xff) { + onSoldOutItemFlag(i); + } else { + offSoldOutItemFlag(i); + } + } + } + + if (field_0xf77 == 8) { + dShopSystem_cameraActor[0]->current.pos.set(-175.0f, 165.0f, 10.0f); + dShopSystem_cameraActor[1]->current.pos.set(215.0f, 225.0f, 370.0f); + } + + if (data_80451058 > 3) { + mShopCamAction.setCamDataIdx2( + this, dShopSystem_itemActor[0], dShopSystem_itemActor[1], dShopSystem_itemActor[2], + dShopSystem_itemActor[3], dShopSystem_itemActor[4], dShopSystem_itemActor[5], &dShopSystem_cameraActor[0]->current.pos, + &dShopSystem_cameraActor[1]->current.pos + ); + + if (field_0xf77 == 8) { + cXyz camCtrPos; + camCtrPos.set(-180.0f, 245.0f, -380.0f); + mShopCamAction.setMasterCamCtrPos(&camCtrPos); + } + + for (int i = 0; i < 7; i++) { + if (dShopSystem_itemActor[i] != NULL) { + u8 cVar8 = dShopSystem_itemActor[i]->orig.angle.GetZ(); + u8 cVar4 = ((u16)dShopSystem_itemActor[i]->orig.angle.GetZ()) >> 8; + if (((cVar8 != 0xff) && + (dComIfGs_isSaveSwitch(cVar8) == 0)) && + ((cVar4 != 0xff && + (dComIfGs_isSaveSwitch(cVar4) == 0)))) { + onFlag(i); + onSoldOutItemFlag(i); + } + } + } + dShopSystem_item_count = -1; + } else { + mShopCamAction.setCamDataIdx( + this, dShopSystem_itemActor[0], dShopSystem_itemActor[1], dShopSystem_itemActor[2], + &dShopSystem_cameraActor[0]->current.pos, + &dShopSystem_cameraActor[1]->current.pos + ); + + for (int i = 0; i < 7; i++) { + if (dShopSystem_itemActor[i] != NULL) { + u8 cVar8 = dShopSystem_itemActor[i]->orig.angle.GetZ(); + u8 cVar4 = ((u16)dShopSystem_itemActor[i]->orig.angle.GetZ()) >> 8; + if (((cVar8 != 0xff) && + (dComIfGs_isSaveSwitch(cVar8) == 0)) && + ((cVar4 != 0xff && + (dComIfGs_isSaveSwitch(cVar4) == 0)))) { + onFlag(i); + onSoldOutItemFlag(i); + } + } + } + dShopSystem_item_count = -1; + } + } + + return 1; } -#pragma pop /* 8019AB00-8019AB1C 195440 001C+00 1/1 0/0 0/0 .text getFlowNodeNum__13dShopSystem_cFv */ diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 112eea3affa..e0fe58f10e0 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -1435,18 +1435,18 @@ s32 fopAcM_orderTreasureEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priori /* 8001BB14-8001BB44 016454 0030+00 0/0 11/11 10/10 .text * fopAcM_getTalkEventPartner__FPC10fopAc_ac_c */ -void* fopAcM_getTalkEventPartner(fopAc_ac_c const*) { +fopAc_ac_c* fopAcM_getTalkEventPartner(fopAc_ac_c const*) { return dComIfGp_event_getTalkPartner(); } /* 8001BB44-8001BB74 016484 0030+00 0/0 5/5 0/0 .text fopAcM_getItemEventPartner__FPC10fopAc_ac_c */ -void* fopAcM_getItemEventPartner(fopAc_ac_c const*) { +fopAc_ac_c* fopAcM_getItemEventPartner(fopAc_ac_c const*) { return dComIfGp_event_getItemPartner(); } /* 8001BB74-8001BBE8 0164B4 0074+00 0/0 1/1 0/0 .text fopAcM_getEventPartner__FPC10fopAc_ac_c */ -void* fopAcM_getEventPartner(fopAc_ac_c const* actor) { +fopAc_ac_c* fopAcM_getEventPartner(fopAc_ac_c const* actor) { if (dComIfGp_event_getPt1() != actor) { return dComIfGp_event_getPt1(); } diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 471fb991d64..1d803049d6f 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -1620,8 +1620,8 @@ bool J3DPEBlock::getBlend() { } /* 8000DF54-8000DF5C 008894 0008+00 0/0 5/0 0/0 .text getAlphaComp__10J3DPEBlockFv */ -bool J3DPEBlock::getAlphaComp() { - return false; +J3DAlphaComp* J3DPEBlock::getAlphaComp() { + return NULL; } /* 8000DF5C-8000DF64 00889C 0008+00 0/0 6/0 0/0 .text getFog__10J3DPEBlockFv */ @@ -1688,8 +1688,8 @@ bool J3DTevBlock::getTevKColorSel(u32 param_0) { } /* 8000DFB8-8000DFC0 0088F8 0008+00 0/0 2/0 0/0 .text getTevOrder__11J3DTevBlockFUl */ -bool J3DTevBlock::getTevOrder(u32 param_0) { - return false; +J3DTevOrder* J3DTevBlock::getTevOrder(u32 param_0) { + return NULL; } /* 8000DFC0-8000DFC8 008900 0008+00 0/0 3/0 0/0 .text getTevKColor__11J3DTevBlockFUl */ @@ -1713,14 +1713,14 @@ J3DTexMtx* J3DTexGenBlock::getTexMtx(u32 param_0) { } /* 8000DFE0-8000DFE8 008920 0008+00 0/0 2/0 0/0 .text getTexCoord__14J3DTexGenBlockFUl */ -bool J3DTexGenBlock::getTexCoord(u32 param_0) { - return false; +J3DTexCoord* J3DTexGenBlock::getTexCoord(u32 param_0) { + return NULL; } /* 8000DFE8-8000DFF0 008928 0008+00 0/0 2/0 0/0 .text getTexGenNum__14J3DTexGenBlockCFv */ -bool J3DTexGenBlock::getTexGenNum() const { - return false; +u32 J3DTexGenBlock::getTexGenNum() const { + return 0; } /* 8000DFF0-8000DFF8 008930 0008+00 0/0 3/0 0/0 .text getAmbColor__13J3DColorBlockFUl */ @@ -1729,8 +1729,8 @@ bool J3DColorBlock::getAmbColor(u32 param_0) { } /* 8000DFF8-8000E000 008938 0008+00 0/0 2/0 0/0 .text getColorChan__13J3DColorBlockFUl */ -bool J3DColorBlock::getColorChan(u32 param_0) { - return false; +J3DColorChan* J3DColorBlock::getColorChan(u32 param_0) { + return NULL; } /* 8000E000-8000E008 008940 0008+00 0/0 2/0 0/0 .text getMatColor__13J3DColorBlockFUl */ @@ -2828,8 +2828,8 @@ asm void mDoExt_McaMorfSO::calc() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void mDoExt_McaMorfSO::setAnm(J3DAnmTransform* param_0, int param_1, f32 param_2, f32 param_3, - f32 param_4, f32 param_5) { +asm void mDoExt_McaMorfSO::setAnm(J3DAnmTransform* i_anm, int i_attr, f32 i_morf, f32 i_rate, + f32 i_start, f32 i_end) { nofralloc #include "asm/m_Do/m_Do_ext/setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff.s" } diff --git a/tools/requirements.txt b/tools/requirements.txt index d6052029675..275d38be3b6 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -9,3 +9,4 @@ python-Levenshtein cxxfilt pyelftools requests +GitPython \ No newline at end of file diff --git a/tools/tp.py b/tools/tp.py index 250d6c7b679..148d0dc28b7 100644 --- a/tools/tp.py +++ b/tools/tp.py @@ -25,7 +25,7 @@ from pathlib import Path def _handle_import_error(ex: ImportError): MISSING_PREREQUISITES = ( - f"Missing prerequisite python module {e}.\n" + f"Missing prerequisite python module {ex}.\n" f"Run `python3 -m pip install --user -r tools/requirements.txt` to install prerequisites." ) @@ -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) @@ -717,43 +720,16 @@ def calculate_progress(build_path: Path, matching: bool, format: str, print_rels ) ) elif format == "JSON": - matching = {} - non_matching = {} - - matching["main.dol"] = { - "decompiled": dol_progress.decompiled, - "total": dol_progress.size, - "sections": [ - { - name: { - "decompiled": sec.decompiled, - "total": sec.size, - } - } - for name, sec in dol_progress.sections.items() - ], - } - - if rels_progress: - matching["rels"] = { - "decompiled": rel_decompiled, - "total": rel_size, - } - - for rel in rels_progress: - matching[rel.name] = { - "decompiled": rel.decompiled, - "total": rel.size, - } - - print( - json.dumps( - { - "matching": matching, - "non-matchgin": non_matching, - } - ) - ) + # TODO: add dol sections instead of total dol. + data = { + "code": decompiled_size, + "code/total": total_size, + "dol": dol_progress.decompiled, + "dol/total": dol_progress.size, + "rels": rel_decompiled, + "rels/total": rel_size, + } + print(json.dumps(data)) else: print(dol_progress.percentage) print(100 * (rel_decompiled / rel_size)) @@ -1223,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: '_.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()