encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

d_file_select work + misc changes (#1873)

Browse Source 
* setup TU

* JASResArcLoader OK

* d_a_obj_stoneMark work

* some funcs in d_a_obj_stoneMark

* many changes

* quat, d_a_obj_stone, d_a_alink, fix python script, tidy makefile

* d_file_select functions + pr cleanup

* match many dfile_select_c methods

* m_Do_main OK

* selFileWakuAnm & bookIconAnm

* selCopyFileWakuAnm & copyBookIconAnm

* dataDelEffAnm & dataCopyEffAnm

* selectDataBaseMoveAnmInitSet & selectDataBaseMoveAnm

* dataSelectIn

* _move & dataSelectInit

* match a few more

* comment

* J2DPicture::drawTexCoord

* draw_function

* dScnPly_Create + fix typing on request_of_phase_process_fn

* checkpoint

* checkpoint

* checkpoint

* checkpoint 2 (fixed)

* dFile_select_c::dataSelectAnmSet

* dFile_select_c::selectDataOpenMove

* dFile_select_c::copySelMoveAnmInitSet

* fix brightcheck issues

* rm comments, fix status update

* small mod to pr template
This commit is contained in:
Pheenoh
2023-08-10 03:57:49 -06:00
committed by GitHub
parent 244892aeb8
commit d24b09c2d9
45 changed files with 1702 additions and 1110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/pull_request_template.md
+1 -1
View File
@@ -9,7 +9,7 @@ To the best of my knowledge and belief, my contribution is either originally cre
I understand that this project and its maintainers are not responsible for enforcing the CC0 license, and I release them from any potential liability related to my contribution.
-->
- [ ] I agree to the terms of the CC0 License.
- [] I agree to the terms of the CC0 License.
<!--
Please check the checkbox above to indicate your agreement.
.github/workflows/ok-check.yml
+20 -8
View File
@@ -51,14 +51,26 @@ jobs:
FILENAMES="${{ steps.changed-files-specific.outputs.all_changed_files }}"
CMD="./tp github-check-update-status --personal-access-token ${{ secrets.PAT_TOKEN }} --debug"
# If .inc files are found, assume it's for d_a_alink.cpp for now.
# We can come up something better here later if needed.
if echo "$FILENAMES" | grep -q ".inc"; then
CMD="$CMD --filename src/d/a/d_a_alink.cpp"
else
for FILE in $FILENAMES; do
CMD="$CMD --filename $FILE"
done
IFS=' ' read -ra FILE_ARRAY <<< "$FILENAMES"
INC_FOUND=false
# Remove any .inc files from the array
for index in "${!FILE_ARRAY[@]}"; do
if [[ "${FILE_ARRAY[index]}" == *.inc ]]; then
unset 'FILE_ARRAY[index]'
INC_FOUND=true
fi
done
# If any .inc files were found,
# We will add "src/d/a/d_a_alink.cpp" to the array once
# if it's not already there
if $INC_FOUND && ! [[ " ${FILE_ARRAY[@]} " =~ " src/d/a/d_a_alink.cpp " ]]; then
FILE_ARRAY+=("src/d/a/d_a_alink.cpp")
fi
for FILE in "${FILE_ARRAY[@]}"; do
CMD="$CMD --filename $FILE"
done
$CMD
Progress.md
+4 -4
View File
@@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes)
.init | 97.972973% | 9280 | 9472
.extab | 100.000000% | 96 | 96
.extabindex | 100.000000% | 96 | 96
.text | 30.410194% | 1093716 | 3596544
.text | 30.684235% | 1103572 | 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 | 37.746227% | 1517652 | 4020672
Total | 37.991361% | 1527508 | 4020672
## Total
Section | Percentage | Decompiled (bytes) | Total (bytes)
---|---|---|---
main.dol | 37.746227% | 1517652 | 4020672
main.dol | 37.991361% | 1527508 | 4020672
RELs | 34.103178% | 3921976 | 11500324
Total | 35.046900% | 5439628 | 15520996
Total | 35.110401% | 5449484 | 15520996
## RELs
asm/d/file/d_file_select/ToErasePaneMove__14dFile_select_cFv.s
-28
View File
@@ -1,28 +0,0 @@
lbl_80187ADC:
/* 80187ADC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80187AE0 7C 08 02 A6 */ mflr r0
/* 80187AE4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80187AE8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80187AEC 93 C1 00 08 */ stw r30, 8(r1)
/* 80187AF0 7C 7E 1B 78 */ mr r30, r3
/* 80187AF4 48 00 57 69 */ bl headerTxtChangeAnm__14dFile_select_cFv
/* 80187AF8 7C 7F 1B 78 */ mr r31, r3
/* 80187AFC 7F C3 F3 78 */ mr r3, r30
/* 80187B00 48 00 12 39 */ bl yesnoMenuMoveAnm__14dFile_select_cFv
/* 80187B04 57 E0 06 3E */ clrlwi r0, r31, 0x18
/* 80187B08 28 00 00 01 */ cmplwi r0, 1
/* 80187B0C 40 82 00 20 */ bne lbl_80187B2C
/* 80187B10 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80187B14 28 00 00 01 */ cmplwi r0, 1
/* 80187B18 40 82 00 14 */ bne lbl_80187B2C
/* 80187B1C 7F C3 F3 78 */ mr r3, r30
/* 80187B20 48 00 16 0D */ bl yesnoCursorShow__14dFile_select_cFv
/* 80187B24 38 00 00 1A */ li r0, 0x1a
/* 80187B28 98 1E 02 6F */ stb r0, 0x26f(r30)
lbl_80187B2C:
/* 80187B2C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80187B30 83 C1 00 08 */ lwz r30, 8(r1)
/* 80187B34 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80187B38 7C 08 03 A6 */ mtlr r0
/* 80187B3C 38 21 00 10 */ addi r1, r1, 0x10
/* 80187B40 4E 80 00 20 */ blr
asm/d/file/d_file_select/_move__14dFile_select_cFv.s
-96
View File
@@ -1,96 +0,0 @@
lbl_801844FC:
/* 801844FC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80184500 7C 08 02 A6 */ mflr r0
/* 80184504 90 01 00 14 */ stw r0, 0x14(r1)
/* 80184508 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8018450C 93 C1 00 08 */ stw r30, 8(r1)
/* 80184510 7C 7F 1B 78 */ mr r31, r3
/* 80184514 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
/* 80184518 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
/* 8018451C 48 09 7D 1D */ bl decMsgKeyWaitTimer__13dMeter2Info_cFv
/* 80184520 48 1C 6C A9 */ bl DVDGetDriveStatus
/* 80184524 2C 03 00 00 */ cmpwi r3, 0
/* 80184528 41 82 00 20 */ beq lbl_80184548
/* 8018452C 2C 03 00 01 */ cmpwi r3, 1
/* 80184530 41 82 00 18 */ beq lbl_80184548
/* 80184534 88 1F 03 B1 */ lbz r0, 0x3b1(r31)
/* 80184538 28 00 00 00 */ cmplwi r0, 0
/* 8018453C 41 82 00 0C */ beq lbl_80184548
/* 80184540 38 00 00 00 */ li r0, 0
/* 80184544 98 1F 03 B1 */ stb r0, 0x3b1(r31)
lbl_80184548:
/* 80184548 3C 60 80 3F */ lis r3, g_mDoMemCd_control@ha /* 0x803EAF40@ha */
/* 8018454C 3B C3 AF 40 */ addi r30, r3, g_mDoMemCd_control@l /* 0x803EAF40@l */
/* 80184550 88 1E 1F BE */ lbz r0, 0x1fbe(r30)
/* 80184554 28 00 00 00 */ cmplwi r0, 0
/* 80184558 41 82 00 0C */ beq lbl_80184564
/* 8018455C 28 00 00 01 */ cmplwi r0, 1
/* 80184560 40 82 00 50 */ bne lbl_801845B0
lbl_80184564:
/* 80184564 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13)
/* 80184568 80 03 00 00 */ lwz r0, 0(r3)
/* 8018456C 2C 00 00 00 */ cmpwi r0, 0
/* 80184570 40 82 00 40 */ bne lbl_801845B0
/* 80184574 88 1F 03 B1 */ lbz r0, 0x3b1(r31)
/* 80184578 28 00 00 00 */ cmplwi r0, 0
/* 8018457C 40 82 00 34 */ bne lbl_801845B0
/* 80184580 80 7F 23 78 */ lwz r3, 0x2378(r31)
/* 80184584 88 03 00 B2 */ lbz r0, 0xb2(r3)
/* 80184588 28 00 00 00 */ cmplwi r0, 0
/* 8018458C 41 82 00 18 */ beq lbl_801845A4
/* 80184590 38 80 00 00 */ li r4, 0
/* 80184594 81 83 00 00 */ lwz r12, 0(r3)
/* 80184598 81 8C 00 24 */ lwz r12, 0x24(r12)
/* 8018459C 7D 89 03 A6 */ mtctr r12
/* 801845A0 4E 80 04 21 */ bctrl
lbl_801845A4:
/* 801845A4 38 00 00 00 */ li r0, 0
/* 801845A8 98 1F 02 6F */ stb r0, 0x26f(r31)
/* 801845AC 98 1F 02 71 */ stb r0, 0x271(r31)
lbl_801845B0:
/* 801845B0 7F E3 FB 78 */ mr r3, r31
/* 801845B4 88 1F 02 6F */ lbz r0, 0x26f(r31)
/* 801845B8 1C A0 00 0C */ mulli r5, r0, 0xc
/* 801845BC 3C 80 80 3C */ lis r4, DataSelProc@ha /* 0x803BAAEC@ha */
/* 801845C0 38 04 AA EC */ addi r0, r4, DataSelProc@l /* 0x803BAAEC@l */
/* 801845C4 7D 80 2A 14 */ add r12, r0, r5
/* 801845C8 48 1D DA BD */ bl __ptmf_scall
/* 801845CC 60 00 00 00 */ nop
/* 801845D0 7F E3 FB 78 */ mr r3, r31
/* 801845D4 48 00 00 91 */ bl selFileWakuAnm__14dFile_select_cFv
/* 801845D8 7F E3 FB 78 */ mr r3, r31
/* 801845DC 48 00 02 C5 */ bl bookIconAnm__14dFile_select_cFv
/* 801845E0 7F E3 FB 78 */ mr r3, r31
/* 801845E4 48 00 05 61 */ bl dataDelEffAnm__14dFile_select_cFv
/* 801845E8 7F E3 FB 78 */ mr r3, r31
/* 801845EC 48 00 06 11 */ bl dataCopyEffAnm__14dFile_select_cFv
/* 801845F0 80 7F 00 14 */ lwz r3, 0x14(r31)
/* 801845F4 48 17 50 9D */ bl animation__9J2DScreenFv
/* 801845F8 80 7F 00 4C */ lwz r3, 0x4c(r31)
/* 801845FC 48 17 50 95 */ bl animation__9J2DScreenFv
/* 80184600 80 7F 00 58 */ lwz r3, 0x58(r31)
/* 80184604 48 17 50 8D */ bl animation__9J2DScreenFv
/* 80184608 80 7F 00 28 */ lwz r3, 0x28(r31)
/* 8018460C 48 17 50 85 */ bl animation__9J2DScreenFv
/* 80184610 88 1F 00 3C */ lbz r0, 0x3c(r31)
/* 80184614 28 00 00 00 */ cmplwi r0, 0
/* 80184618 41 82 00 1C */ beq lbl_80184634
/* 8018461C 7F E3 FB 78 */ mr r3, r31
/* 80184620 48 00 03 7D */ bl selCopyFileWakuAnm__14dFile_select_cFv
/* 80184624 7F E3 FB 78 */ mr r3, r31
/* 80184628 48 00 04 21 */ bl copyBookIconAnm__14dFile_select_cFv
/* 8018462C 80 7F 00 38 */ lwz r3, 0x38(r31)
/* 80184630 48 17 50 61 */ bl animation__9J2DScreenFv
lbl_80184634:
/* 80184634 80 7F 00 6C */ lwz r3, 0x6c(r31)
/* 80184638 48 00 D8 E1 */ bl _move__15dFile_warning_cFv
/* 8018463C 80 7F 00 0C */ lwz r3, 0xc(r31)
/* 80184640 48 00 BE A5 */ bl _move__16dFile_select3D_cFv
/* 80184644 38 00 00 02 */ li r0, 2
/* 80184648 98 1E 1F BE */ stb r0, 0x1fbe(r30)
/* 8018464C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80184650 83 C1 00 08 */ lwz r30, 8(r1)
/* 80184654 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80184658 7C 08 03 A6 */ mtlr r0
/* 8018465C 38 21 00 10 */ addi r1, r1, 0x10
/* 80184660 4E 80 00 20 */ blr
asm/d/file/d_file_select/animeEntry__16dFile_select3D_cFv.s
-28
View File
@@ -1,28 +0,0 @@
lbl_80190B44:
/* 80190B44 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80190B48 7C 08 02 A6 */ mflr r0
/* 80190B4C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80190B50 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80190B54 7C 7F 1B 78 */ mr r31, r3
/* 80190B58 80 63 00 10 */ lwz r3, 0x10(r3)
/* 80190B5C 28 03 00 00 */ cmplwi r3, 0
/* 80190B60 41 82 00 18 */ beq lbl_80190B78
/* 80190B64 80 9F 00 08 */ lwz r4, 8(r31)
/* 80190B68 80 84 00 04 */ lwz r4, 4(r4)
/* 80190B6C C0 23 00 10 */ lfs f1, 0x10(r3)
/* 80190B70 38 84 00 58 */ addi r4, r4, 0x58
/* 80190B74 4B E7 CC 35 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef
lbl_80190B78:
/* 80190B78 80 7F 00 0C */ lwz r3, 0xc(r31)
/* 80190B7C 28 03 00 00 */ cmplwi r3, 0
/* 80190B80 41 82 00 14 */ beq lbl_80190B94
/* 80190B84 80 9F 00 08 */ lwz r4, 8(r31)
/* 80190B88 80 84 00 04 */ lwz r4, 4(r4)
/* 80190B8C C0 23 00 10 */ lfs f1, 0x10(r3)
/* 80190B90 4B E7 CE 3D */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf
lbl_80190B94:
/* 80190B94 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80190B98 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80190B9C 7C 08 03 A6 */ mtlr r0
/* 80190BA0 38 21 00 10 */ addi r1, r1, 0x10
/* 80190BA4 4E 80 00 20 */ blr
asm/d/file/d_file_select/backSelectMove__14dFile_select_cFv.s
-43
View File
@@ -1,43 +0,0 @@
lbl_80187B44:
/* 80187B44 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80187B48 7C 08 02 A6 */ mflr r0
/* 80187B4C 90 01 00 24 */ stw r0, 0x24(r1)
/* 80187B50 39 61 00 20 */ addi r11, r1, 0x20
/* 80187B54 48 1D A6 85 */ bl _savegpr_28
/* 80187B58 7C 7C 1B 78 */ mr r28, r3
/* 80187B5C 48 00 57 01 */ bl headerTxtChangeAnm__14dFile_select_cFv
/* 80187B60 7C 7D 1B 78 */ mr r29, r3
/* 80187B64 7F 83 E3 78 */ mr r3, r28
/* 80187B68 4B FF DF 45 */ bl selectDataMoveAnm__14dFile_select_cFv
/* 80187B6C 7C 7E 1B 78 */ mr r30, r3
/* 80187B70 7F 83 E3 78 */ mr r3, r28
/* 80187B74 4B FF F1 39 */ bl menuMoveAnm__14dFile_select_cFv
/* 80187B78 7C 7F 1B 78 */ mr r31, r3
/* 80187B7C 7F 83 E3 78 */ mr r3, r28
/* 80187B80 48 00 58 9D */ bl modoruTxtDispAnm__14dFile_select_cFv
/* 80187B84 57 A0 06 3E */ clrlwi r0, r29, 0x18
/* 80187B88 28 00 00 01 */ cmplwi r0, 1
/* 80187B8C 40 82 00 44 */ bne lbl_80187BD0
/* 80187B90 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 80187B94 28 00 00 01 */ cmplwi r0, 1
/* 80187B98 40 82 00 38 */ bne lbl_80187BD0
/* 80187B9C 57 E0 06 3E */ clrlwi r0, r31, 0x18
/* 80187BA0 28 00 00 01 */ cmplwi r0, 1
/* 80187BA4 40 82 00 2C */ bne lbl_80187BD0
/* 80187BA8 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80187BAC 28 00 00 01 */ cmplwi r0, 1
/* 80187BB0 40 82 00 20 */ bne lbl_80187BD0
/* 80187BB4 7F 83 E3 78 */ mr r3, r28
/* 80187BB8 48 00 5B AD */ bl selFileCursorShow__14dFile_select_cFv
/* 80187BBC 38 00 00 00 */ li r0, 0
/* 80187BC0 80 7C 00 0C */ lwz r3, 0xc(r28)
/* 80187BC4 90 03 00 08 */ stw r0, 8(r3)
/* 80187BC8 38 00 00 03 */ li r0, 3
/* 80187BCC 98 1C 02 6F */ stb r0, 0x26f(r28)
lbl_80187BD0:
/* 80187BD0 39 61 00 20 */ addi r11, r1, 0x20
/* 80187BD4 48 1D A6 51 */ bl _restgpr_28
/* 80187BD8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80187BDC 7C 08 03 A6 */ mtlr r0
/* 80187BE0 38 21 00 20 */ addi r1, r1, 0x20
/* 80187BE4 4E 80 00 20 */ blr
asm/d/file/d_file_select/dataSelectIn__14dFile_select_cFv.s
-135
View File
@@ -1,135 +0,0 @@
lbl_80185040:
/* 80185040 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 80185044 7C 08 02 A6 */ mflr r0
/* 80185048 90 01 00 34 */ stw r0, 0x34(r1)
/* 8018504C 39 61 00 30 */ addi r11, r1, 0x30
/* 80185050 48 1D D1 7D */ bl _savegpr_25
/* 80185054 7C 7F 1B 78 */ mr r31, r3
/* 80185058 48 00 82 05 */ bl headerTxtChangeAnm__14dFile_select_cFv
/* 8018505C 7C 7D 1B 78 */ mr r29, r3
/* 80185060 7F E3 FB 78 */ mr r3, r31
/* 80185064 4B FF FC E9 */ bl selectDataBaseMoveAnm__14dFile_select_cFv
/* 80185068 7C 7E 1B 78 */ mr r30, r3
/* 8018506C 3B 80 00 01 */ li r28, 1
/* 80185070 88 1F 01 4A */ lbz r0, 0x14a(r31)
/* 80185074 28 00 00 00 */ cmplwi r0, 0
/* 80185078 40 82 00 10 */ bne lbl_80185088
/* 8018507C 88 1F 01 4B */ lbz r0, 0x14b(r31)
/* 80185080 28 00 00 00 */ cmplwi r0, 0
/* 80185084 41 82 00 10 */ beq lbl_80185094
lbl_80185088:
/* 80185088 7F E3 FB 78 */ mr r3, r31
/* 8018508C 48 00 91 35 */ bl errorMoveAnm__14dFile_select_cFv
/* 80185090 7C 7C 1B 78 */ mr r28, r3
lbl_80185094:
/* 80185094 3B 60 00 01 */ li r27, 1
/* 80185098 88 1F 01 08 */ lbz r0, 0x108(r31)
/* 8018509C 28 00 00 00 */ cmplwi r0, 0
/* 801850A0 40 82 00 10 */ bne lbl_801850B0
/* 801850A4 88 1F 02 81 */ lbz r0, 0x281(r31)
/* 801850A8 28 00 00 00 */ cmplwi r0, 0
/* 801850AC 41 82 00 10 */ beq lbl_801850BC
lbl_801850B0:
/* 801850B0 7F E3 FB 78 */ mr r3, r31
/* 801850B4 48 00 3C 85 */ bl yesnoMenuMoveAnm__14dFile_select_cFv
/* 801850B8 7C 7B 1B 78 */ mr r27, r3
lbl_801850BC:
/* 801850BC 3B 40 00 01 */ li r26, 1
/* 801850C0 88 1F 01 28 */ lbz r0, 0x128(r31)
/* 801850C4 28 00 00 00 */ cmplwi r0, 0
/* 801850C8 40 82 00 10 */ bne lbl_801850D8
/* 801850CC 88 1F 00 3C */ lbz r0, 0x3c(r31)
/* 801850D0 28 00 00 00 */ cmplwi r0, 0
/* 801850D4 41 82 00 10 */ beq lbl_801850E4
lbl_801850D8:
/* 801850D8 7F E3 FB 78 */ mr r3, r31
/* 801850DC 48 00 B0 49 */ bl nameMoveAnm__14dFile_select_cFv
/* 801850E0 7C 7A 1B 78 */ mr r26, r3
lbl_801850E4:
/* 801850E4 3B 20 00 01 */ li r25, 1
/* 801850E8 88 1F 03 60 */ lbz r0, 0x360(r31)
/* 801850EC 28 00 00 00 */ cmplwi r0, 0
/* 801850F0 40 82 00 10 */ bne lbl_80185100
/* 801850F4 88 1F 02 83 */ lbz r0, 0x283(r31)
/* 801850F8 28 00 00 00 */ cmplwi r0, 0
/* 801850FC 41 82 00 10 */ beq lbl_8018510C
lbl_80185100:
/* 80185100 7F E3 FB 78 */ mr r3, r31
/* 80185104 48 00 1B A9 */ bl menuMoveAnm__14dFile_select_cFv
/* 80185108 7C 79 1B 78 */ mr r25, r3
lbl_8018510C:
/* 8018510C 7F E3 FB 78 */ mr r3, r31
/* 80185110 48 00 83 0D */ bl modoruTxtDispAnm__14dFile_select_cFv
/* 80185114 57 A0 06 3E */ clrlwi r0, r29, 0x18
/* 80185118 28 00 00 01 */ cmplwi r0, 1
/* 8018511C 40 82 00 FC */ bne lbl_80185218
/* 80185120 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 80185124 28 00 00 01 */ cmplwi r0, 1
/* 80185128 40 82 00 F0 */ bne lbl_80185218
/* 8018512C 57 80 06 3E */ clrlwi r0, r28, 0x18
/* 80185130 28 00 00 01 */ cmplwi r0, 1
/* 80185134 40 82 00 E4 */ bne lbl_80185218
/* 80185138 57 60 06 3E */ clrlwi r0, r27, 0x18
/* 8018513C 28 00 00 01 */ cmplwi r0, 1
/* 80185140 40 82 00 D8 */ bne lbl_80185218
/* 80185144 57 40 06 3E */ clrlwi r0, r26, 0x18
/* 80185148 28 00 00 01 */ cmplwi r0, 1
/* 8018514C 40 82 00 CC */ bne lbl_80185218
/* 80185150 57 20 06 3E */ clrlwi r0, r25, 0x18
/* 80185154 28 00 00 01 */ cmplwi r0, 1
/* 80185158 40 82 00 C0 */ bne lbl_80185218
/* 8018515C 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80185160 28 00 00 01 */ cmplwi r0, 1
/* 80185164 40 82 00 B4 */ bne lbl_80185218
/* 80185168 3B 20 00 00 */ li r25, 0
/* 8018516C 3B C0 00 00 */ li r30, 0
lbl_80185170:
/* 80185170 38 1E 00 BC */ addi r0, r30, 0xbc
/* 80185174 7C 7F 00 2E */ lwzx r3, r31, r0
/* 80185178 48 0C E9 B5 */ bl reinit__8CPaneMgrFv
/* 8018517C 3B 39 00 01 */ addi r25, r25, 1
/* 80185180 2C 19 00 03 */ cmpwi r25, 3
/* 80185184 3B DE 00 04 */ addi r30, r30, 4
/* 80185188 41 80 FF E8 */ blt lbl_80185170
/* 8018518C 7F E3 FB 78 */ mr r3, r31
/* 80185190 38 80 00 43 */ li r4, 0x43
/* 80185194 38 A0 00 01 */ li r5, 1
/* 80185198 38 C0 00 00 */ li r6, 0
/* 8018519C 48 00 7F 49 */ bl headerTxtSet__14dFile_select_cFUsUcUc
/* 801851A0 88 1F 02 65 */ lbz r0, 0x265(r31)
/* 801851A4 98 1F 02 64 */ stb r0, 0x264(r31)
/* 801851A8 88 1F 02 65 */ lbz r0, 0x265(r31)
/* 801851AC 54 00 10 3A */ slwi r0, r0, 2
/* 801851B0 7C 7F 02 14 */ add r3, r31, r0
/* 801851B4 80 63 00 BC */ lwz r3, 0xbc(r3)
/* 801851B8 80 63 00 04 */ lwz r3, 4(r3)
/* 801851BC 80 9F 00 84 */ lwz r4, 0x84(r31)
/* 801851C0 81 83 00 00 */ lwz r12, 0(r3)
/* 801851C4 81 8C 00 60 */ lwz r12, 0x60(r12)
/* 801851C8 7D 89 03 A6 */ mtctr r12
/* 801851CC 4E 80 04 21 */ bctrl
/* 801851D0 88 1F 02 65 */ lbz r0, 0x265(r31)
/* 801851D4 54 04 10 3A */ slwi r4, r0, 2
/* 801851D8 3C 60 80 3C */ lis r3, SelStartFrameTbl@ha /* 0x803BA854@ha */
/* 801851DC 38 63 A8 54 */ addi r3, r3, SelStartFrameTbl@l /* 0x803BA854@l */
/* 801851E0 7C 03 20 2E */ lwzx r0, r3, r4
/* 801851E4 7C 7F 22 14 */ add r3, r31, r4
/* 801851E8 90 03 00 E0 */ stw r0, 0xe0(r3)
/* 801851EC 38 80 00 00 */ li r4, 0
/* 801851F0 88 1F 02 65 */ lbz r0, 0x265(r31)
/* 801851F4 54 00 10 3A */ slwi r0, r0, 2
/* 801851F8 7C 7F 02 14 */ add r3, r31, r0
/* 801851FC 80 63 01 88 */ lwz r3, 0x188(r3)
/* 80185200 B0 83 00 16 */ sth r4, 0x16(r3)
/* 80185204 7F E3 FB 78 */ mr r3, r31
/* 80185208 38 80 00 01 */ li r4, 1
/* 8018520C 48 00 82 ED */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc
/* 80185210 38 00 00 02 */ li r0, 2
/* 80185214 98 1F 02 6F */ stb r0, 0x26f(r31)
lbl_80185218:
/* 80185218 39 61 00 30 */ addi r11, r1, 0x30
/* 8018521C 48 1D CF FD */ bl _restgpr_25
/* 80185220 80 01 00 34 */ lwz r0, 0x34(r1)
/* 80185224 7C 08 03 A6 */ mtlr r0
/* 80185228 38 21 00 30 */ addi r1, r1, 0x30
/* 8018522C 4E 80 00 20 */ blr
asm/d/file/d_file_select/nameInputWait__14dFile_select_cFv.s
-15
View File
@@ -1,15 +0,0 @@
lbl_80187384:
/* 80187384 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80187388 7C 08 02 A6 */ mflr r0
/* 8018738C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80187390 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80187394 7C 7F 1B 78 */ mr r31, r3
/* 80187398 80 63 00 68 */ lwz r3, 0x68(r3)
/* 8018739C 48 0C 74 51 */ bl showIcon__7dName_cFv
/* 801873A0 38 00 00 10 */ li r0, 0x10
/* 801873A4 98 1F 02 6F */ stb r0, 0x26f(r31)
/* 801873A8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801873AC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801873B0 7C 08 03 A6 */ mtlr r0
/* 801873B4 38 21 00 10 */ addi r1, r1, 0x10
/* 801873B8 4E 80 00 20 */ blr
asm/d/file/d_file_select/nameToDataSelectMove__14dFile_select_cFv.s
-43
View File
@@ -1,43 +0,0 @@
lbl_801874F8:
/* 801874F8 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 801874FC 7C 08 02 A6 */ mflr r0
/* 80187500 90 01 00 24 */ stw r0, 0x24(r1)
/* 80187504 39 61 00 20 */ addi r11, r1, 0x20
/* 80187508 48 1D AC D1 */ bl _savegpr_28
/* 8018750C 7C 7C 1B 78 */ mr r28, r3
/* 80187510 48 00 5D 4D */ bl headerTxtChangeAnm__14dFile_select_cFv
/* 80187514 7C 7D 1B 78 */ mr r29, r3
/* 80187518 7F 83 E3 78 */ mr r3, r28
/* 8018751C 48 00 89 D9 */ bl fileRecScaleAnm2__14dFile_select_cFv
/* 80187520 7C 7E 1B 78 */ mr r30, r3
/* 80187524 7F 83 E3 78 */ mr r3, r28
/* 80187528 48 00 8B FD */ bl nameMoveAnm__14dFile_select_cFv
/* 8018752C 7C 7F 1B 78 */ mr r31, r3
/* 80187530 7F 83 E3 78 */ mr r3, r28
/* 80187534 48 00 5E E9 */ bl modoruTxtDispAnm__14dFile_select_cFv
/* 80187538 57 A0 06 3E */ clrlwi r0, r29, 0x18
/* 8018753C 28 00 00 01 */ cmplwi r0, 1
/* 80187540 40 82 00 44 */ bne lbl_80187584
/* 80187544 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 80187548 28 00 00 01 */ cmplwi r0, 1
/* 8018754C 40 82 00 38 */ bne lbl_80187584
/* 80187550 57 E0 06 3E */ clrlwi r0, r31, 0x18
/* 80187554 28 00 00 01 */ cmplwi r0, 1
/* 80187558 40 82 00 2C */ bne lbl_80187584
/* 8018755C 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80187560 28 00 00 01 */ cmplwi r0, 1
/* 80187564 40 82 00 20 */ bne lbl_80187584
/* 80187568 7F 83 E3 78 */ mr r3, r28
/* 8018756C 38 80 00 00 */ li r4, 0
/* 80187570 48 00 5D D5 */ bl modoruTxtChange__14dFile_select_cFUc
/* 80187574 7F 83 E3 78 */ mr r3, r28
/* 80187578 48 00 61 ED */ bl selFileCursorShow__14dFile_select_cFv
/* 8018757C 38 00 00 03 */ li r0, 3
/* 80187580 98 1C 02 6F */ stb r0, 0x26f(r28)
lbl_80187584:
/* 80187584 39 61 00 20 */ addi r11, r1, 0x20
/* 80187588 48 1D AC 9D */ bl _restgpr_28
/* 8018758C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80187590 7C 08 03 A6 */ mtlr r0
/* 80187594 38 21 00 20 */ addi r1, r1, 0x20
/* 80187598 4E 80 00 20 */ blr
asm/d/file/d_file_select/selectDataNameMove__14dFile_select_cFv.s
-38
View File
@@ -1,38 +0,0 @@
lbl_80186638:
/* 80186638 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8018663C 7C 08 02 A6 */ mflr r0
/* 80186640 90 01 00 24 */ stw r0, 0x24(r1)
/* 80186644 39 61 00 20 */ addi r11, r1, 0x20
/* 80186648 48 1D BB 91 */ bl _savegpr_28
/* 8018664C 7C 7C 1B 78 */ mr r28, r3
/* 80186650 48 00 6C 0D */ bl headerTxtChangeAnm__14dFile_select_cFv
/* 80186654 7C 7D 1B 78 */ mr r29, r3
/* 80186658 7F 83 E3 78 */ mr r3, r28
/* 8018665C 48 00 98 99 */ bl fileRecScaleAnm2__14dFile_select_cFv
/* 80186660 7C 7E 1B 78 */ mr r30, r3
/* 80186664 7F 83 E3 78 */ mr r3, r28
/* 80186668 48 00 9A BD */ bl nameMoveAnm__14dFile_select_cFv
/* 8018666C 7C 7F 1B 78 */ mr r31, r3
/* 80186670 7F 83 E3 78 */ mr r3, r28
/* 80186674 48 00 6D A9 */ bl modoruTxtDispAnm__14dFile_select_cFv
/* 80186678 57 A0 06 3E */ clrlwi r0, r29, 0x18
/* 8018667C 28 00 00 01 */ cmplwi r0, 1
/* 80186680 40 82 00 30 */ bne lbl_801866B0
/* 80186684 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 80186688 28 00 00 01 */ cmplwi r0, 1
/* 8018668C 40 82 00 24 */ bne lbl_801866B0
/* 80186690 57 E0 06 3E */ clrlwi r0, r31, 0x18
/* 80186694 28 00 00 01 */ cmplwi r0, 1
/* 80186698 40 82 00 18 */ bne lbl_801866B0
/* 8018669C 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 801866A0 28 00 00 01 */ cmplwi r0, 1
/* 801866A4 40 82 00 0C */ bne lbl_801866B0
/* 801866A8 38 00 00 0F */ li r0, 0xf
/* 801866AC 98 1C 02 6F */ stb r0, 0x26f(r28)
lbl_801866B0:
/* 801866B0 39 61 00 20 */ addi r11, r1, 0x20
/* 801866B4 48 1D BB 71 */ bl _restgpr_28
/* 801866B8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 801866BC 7C 08 03 A6 */ mtlr r0
/* 801866C0 38 21 00 20 */ addi r1, r1, 0x20
/* 801866C4 4E 80 00 20 */ blr
asm/d/file/d_file_select/selectDataOpenEraseMove__14dFile_select_cFv.s
-45
View File
@@ -1,45 +0,0 @@
lbl_801866C8:
/* 801866C8 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 801866CC 7C 08 02 A6 */ mflr r0
/* 801866D0 90 01 00 24 */ stw r0, 0x24(r1)
/* 801866D4 39 61 00 20 */ addi r11, r1, 0x20
/* 801866D8 48 1D BB 01 */ bl _savegpr_28
/* 801866DC 7C 7C 1B 78 */ mr r28, r3
/* 801866E0 48 00 6B 7D */ bl headerTxtChangeAnm__14dFile_select_cFv
/* 801866E4 7C 7D 1B 78 */ mr r29, r3
/* 801866E8 7F 83 E3 78 */ mr r3, r28
/* 801866EC 4B FF F3 C1 */ bl selectDataMoveAnm__14dFile_select_cFv
/* 801866F0 7C 7E 1B 78 */ mr r30, r3
/* 801866F4 7F 83 E3 78 */ mr r3, r28
/* 801866F8 48 00 26 41 */ bl yesnoMenuMoveAnm__14dFile_select_cFv
/* 801866FC 7F 83 E3 78 */ mr r3, r28
/* 80186700 48 00 6D 1D */ bl modoruTxtDispAnm__14dFile_select_cFv
/* 80186704 7C 7F 1B 78 */ mr r31, r3
/* 80186708 7F 83 E3 78 */ mr r3, r28
/* 8018670C 88 9C 02 65 */ lbz r4, 0x265(r28)
/* 80186710 48 00 6F 7D */ bl selectWakuAlpahAnm__14dFile_select_cFUc
/* 80186714 57 A0 06 3E */ clrlwi r0, r29, 0x18
/* 80186718 28 00 00 01 */ cmplwi r0, 1
/* 8018671C 40 82 00 40 */ bne lbl_8018675C
/* 80186720 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 80186724 28 00 00 01 */ cmplwi r0, 1
/* 80186728 40 82 00 34 */ bne lbl_8018675C
/* 8018672C 57 E0 06 3E */ clrlwi r0, r31, 0x18
/* 80186730 28 00 00 01 */ cmplwi r0, 1
/* 80186734 40 82 00 28 */ bne lbl_8018675C
/* 80186738 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8018673C 28 00 00 01 */ cmplwi r0, 1
/* 80186740 40 82 00 1C */ bne lbl_8018675C
/* 80186744 38 00 00 02 */ li r0, 2
/* 80186748 98 1C 02 6E */ stb r0, 0x26e(r28)
/* 8018674C 7F 83 E3 78 */ mr r3, r28
/* 80186750 48 00 29 DD */ bl yesnoCursorShow__14dFile_select_cFv
/* 80186754 38 00 00 1A */ li r0, 0x1a
/* 80186758 98 1C 02 6F */ stb r0, 0x26f(r28)
lbl_8018675C:
/* 8018675C 39 61 00 20 */ addi r11, r1, 0x20
/* 80186760 48 1D BA C5 */ bl _restgpr_28
/* 80186764 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80186768 7C 08 03 A6 */ mtlr r0
/* 8018676C 38 21 00 20 */ addi r1, r1, 0x20
/* 80186770 4E 80 00 20 */ blr
asm/d/s/d_s_play/dScnPly_Create__FP11scene_class.s
-13
View File
@@ -1,13 +0,0 @@
lbl_8025AB94:
/* 8025AB94 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8025AB98 7C 08 02 A6 */ mflr r0
/* 8025AB9C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8025ABA0 7C 65 1B 78 */ mr r5, r3
/* 8025ABA4 38 65 01 C4 */ addi r3, r5, 0x1c4
/* 8025ABA8 3C 80 80 3C */ lis r4, l_method@ha /* 0x803C3194@ha */
/* 8025ABAC 38 84 31 94 */ addi r4, r4, l_method@l /* 0x803C3194@l */
/* 8025ABB0 4B DD 4F 71 */ bl dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv
/* 8025ABB4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8025ABB8 7C 08 03 A6 */ mtlr r0
/* 8025ABBC 38 21 00 10 */ addi r1, r1, 0x10
/* 8025ABC0 4E 80 00 20 */ blr
asm/m_Do/m_Do_main/__sinit_m_Do_main_cpp.s
-111
View File
@@ -1,111 +0,0 @@
lbl_800065E0:
/* 800065E0 3C 60 80 3D */ lis r3, RootHeapCheck@ha /* 0x803D32E0@ha */
/* 800065E4 38 C3 32 E0 */ addi r6, r3, RootHeapCheck@l /* 0x803D32E0@l */
/* 800065E8 3C 60 80 37 */ lis r3, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */
/* 800065EC 38 A3 39 A0 */ addi r5, r3, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */
/* 800065F0 38 65 02 9F */ addi r3, r5, 0x29f
/* 800065F4 38 85 02 A4 */ addi r4, r5, 0x2a4
/* 800065F8 90 66 00 00 */ stw r3, 0(r6)
/* 800065FC 38 66 00 00 */ addi r3, r6, 0
/* 80006600 90 83 00 04 */ stw r4, 4(r3)
/* 80006604 38 80 00 00 */ li r4, 0
/* 80006608 90 83 00 08 */ stw r4, 8(r3)
/* 8000660C 90 03 00 0C */ stw r0, 0xc(r3)
/* 80006610 90 03 00 10 */ stw r0, 0x10(r3)
/* 80006614 90 03 00 14 */ stw r0, 0x14(r3)
/* 80006618 90 03 00 18 */ stw r0, 0x18(r3)
/* 8000661C 90 03 00 1C */ stw r0, 0x1c(r3)
/* 80006620 90 03 00 20 */ stw r0, 0x20(r3)
/* 80006624 90 03 00 24 */ stw r0, 0x24(r3)
/* 80006628 38 65 02 AB */ addi r3, r5, 0x2ab
/* 8000662C 38 E5 02 B2 */ addi r7, r5, 0x2b2
/* 80006630 90 66 00 28 */ stw r3, 0x28(r6)
/* 80006634 38 66 00 28 */ addi r3, r6, 0x28
/* 80006638 90 E3 00 04 */ stw r7, 4(r3)
/* 8000663C 90 83 00 08 */ stw r4, 8(r3)
/* 80006640 90 03 00 0C */ stw r0, 0xc(r3)
/* 80006644 90 03 00 10 */ stw r0, 0x10(r3)
/* 80006648 90 03 00 14 */ stw r0, 0x14(r3)
/* 8000664C 90 03 00 18 */ stw r0, 0x18(r3)
/* 80006650 90 03 00 1C */ stw r0, 0x1c(r3)
/* 80006654 90 03 00 20 */ stw r0, 0x20(r3)
/* 80006658 90 03 00 24 */ stw r0, 0x24(r3)
/* 8000665C 38 65 02 BB */ addi r3, r5, 0x2bb
/* 80006660 38 E5 02 C1 */ addi r7, r5, 0x2c1
/* 80006664 90 66 00 50 */ stw r3, 0x50(r6)
/* 80006668 38 66 00 50 */ addi r3, r6, 0x50
/* 8000666C 90 E3 00 04 */ stw r7, 4(r3)
/* 80006670 90 83 00 08 */ stw r4, 8(r3)
/* 80006674 90 03 00 0C */ stw r0, 0xc(r3)
/* 80006678 90 03 00 10 */ stw r0, 0x10(r3)
/* 8000667C 90 03 00 14 */ stw r0, 0x14(r3)
/* 80006680 90 03 00 18 */ stw r0, 0x18(r3)
/* 80006684 90 03 00 1C */ stw r0, 0x1c(r3)
/* 80006688 90 03 00 20 */ stw r0, 0x20(r3)
/* 8000668C 90 03 00 24 */ stw r0, 0x24(r3)
/* 80006690 38 65 02 C8 */ addi r3, r5, 0x2c8
/* 80006694 38 E5 02 CD */ addi r7, r5, 0x2cd
/* 80006698 90 66 00 78 */ stw r3, 0x78(r6)
/* 8000669C 38 66 00 78 */ addi r3, r6, 0x78
/* 800066A0 90 E3 00 04 */ stw r7, 4(r3)
/* 800066A4 90 83 00 08 */ stw r4, 8(r3)
/* 800066A8 90 03 00 0C */ stw r0, 0xc(r3)
/* 800066AC 90 03 00 10 */ stw r0, 0x10(r3)
/* 800066B0 90 03 00 14 */ stw r0, 0x14(r3)
/* 800066B4 90 03 00 18 */ stw r0, 0x18(r3)
/* 800066B8 90 03 00 1C */ stw r0, 0x1c(r3)
/* 800066BC 90 03 00 20 */ stw r0, 0x20(r3)
/* 800066C0 90 03 00 24 */ stw r0, 0x24(r3)
/* 800066C4 38 65 02 D4 */ addi r3, r5, 0x2d4
/* 800066C8 38 E5 02 DC */ addi r7, r5, 0x2dc
/* 800066CC 90 66 00 A0 */ stw r3, 0xa0(r6)
/* 800066D0 38 66 00 A0 */ addi r3, r6, 0xa0
/* 800066D4 90 E3 00 04 */ stw r7, 4(r3)
/* 800066D8 90 83 00 08 */ stw r4, 8(r3)
/* 800066DC 90 03 00 0C */ stw r0, 0xc(r3)
/* 800066E0 90 03 00 10 */ stw r0, 0x10(r3)
/* 800066E4 90 03 00 14 */ stw r0, 0x14(r3)
/* 800066E8 90 03 00 18 */ stw r0, 0x18(r3)
/* 800066EC 90 03 00 1C */ stw r0, 0x1c(r3)
/* 800066F0 90 03 00 20 */ stw r0, 0x20(r3)
/* 800066F4 90 03 00 24 */ stw r0, 0x24(r3)
/* 800066F8 38 65 02 E7 */ addi r3, r5, 0x2e7
/* 800066FC 38 E5 02 EB */ addi r7, r5, 0x2eb
/* 80006700 90 66 00 C8 */ stw r3, 0xc8(r6)
/* 80006704 38 66 00 C8 */ addi r3, r6, 0xc8
/* 80006708 90 E3 00 04 */ stw r7, 4(r3)
/* 8000670C 90 83 00 08 */ stw r4, 8(r3)
/* 80006710 90 03 00 0C */ stw r0, 0xc(r3)
/* 80006714 90 03 00 10 */ stw r0, 0x10(r3)
/* 80006718 90 03 00 14 */ stw r0, 0x14(r3)
/* 8000671C 90 03 00 18 */ stw r0, 0x18(r3)
/* 80006720 90 03 00 1C */ stw r0, 0x1c(r3)
/* 80006724 90 03 00 20 */ stw r0, 0x20(r3)
/* 80006728 90 03 00 24 */ stw r0, 0x24(r3)
/* 8000672C 38 65 02 EF */ addi r3, r5, 0x2ef
/* 80006730 38 E5 02 F6 */ addi r7, r5, 0x2f6
/* 80006734 90 66 00 F0 */ stw r3, 0xf0(r6)
/* 80006738 38 66 00 F0 */ addi r3, r6, 0xf0
/* 8000673C 90 E3 00 04 */ stw r7, 4(r3)
/* 80006740 90 83 00 08 */ stw r4, 8(r3)
/* 80006744 90 03 00 0C */ stw r0, 0xc(r3)
/* 80006748 90 03 00 10 */ stw r0, 0x10(r3)
/* 8000674C 90 03 00 14 */ stw r0, 0x14(r3)
/* 80006750 90 03 00 18 */ stw r0, 0x18(r3)
/* 80006754 90 03 00 1C */ stw r0, 0x1c(r3)
/* 80006758 90 03 00 20 */ stw r0, 0x20(r3)
/* 8000675C 90 03 00 24 */ stw r0, 0x24(r3)
/* 80006760 38 65 02 FF */ addi r3, r5, 0x2ff
/* 80006764 38 A5 03 07 */ addi r5, r5, 0x307
/* 80006768 90 66 01 18 */ stw r3, 0x118(r6)
/* 8000676C 38 66 01 18 */ addi r3, r6, 0x118
/* 80006770 90 A3 00 04 */ stw r5, 4(r3)
/* 80006774 90 83 00 08 */ stw r4, 8(r3)
/* 80006778 90 03 00 0C */ stw r0, 0xc(r3)
/* 8000677C 90 03 00 10 */ stw r0, 0x10(r3)
/* 80006780 90 03 00 14 */ stw r0, 0x14(r3)
/* 80006784 90 03 00 18 */ stw r0, 0x18(r3)
/* 80006788 90 03 00 1C */ stw r0, 0x1c(r3)
/* 8000678C 90 03 00 20 */ stw r0, 0x20(r3)
/* 80006790 90 03 00 24 */ stw r0, 0x24(r3)
/* 80006794 4E 80 00 20 */ blr
include/JSystem/JAudio2/JASResArcLoader.h
+3 -5
View File
@@ -1,10 +1,7 @@
#ifndef JASRESARCLOADER_H
#define JASRESARCLOADER_H
#include "dolphin/types.h"
typedef struct OSMessageQueue OSMessageQueue;
class JKRArchive;
#include "JSystem/JKernel/JKRArchive.h"
namespace JASResArcLoader {
/* 80290BD0 */ size_t getResSize(JKRArchive const*, u16);
@@ -13,7 +10,8 @@ namespace JASResArcLoader {
/* 80290D18 */ int loadResourceAsync(JKRArchive*, u16, u8*, u32, void (*)(u32, u32), u32);
};
typedef struct OSMessageQueue OSMessageQueue;
class JKRArchive;
// from pikmin2
typedef void (*LoadCallback)(u32, u32);
include/MSL_C/MSL_Common/Src/alloc.h
+1 -1
View File
@@ -8,7 +8,7 @@ extern "C" {
#endif
void free(FILE* file);
void __pool_free();
void __pool_free(int **param_1, unsigned int **param_2);
#ifdef __cplusplus
}
include/SSystem/SComponent/c_phase.h
+1 -1
View File
@@ -20,7 +20,7 @@ typedef struct request_of_phase_process_class {
int id;
} request_of_phase_process_class;
typedef int (**request_of_phase_process_fn)(void*);
typedef int (*request_of_phase_process_fn)(void*);
void cPhs_Reset(request_of_phase_process_class* pPhase);
void cPhs_Set(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable);
include/d/com/d_com_inf_game.h
+17 -1
View File
@@ -788,7 +788,7 @@ extern GXColor g_blackColor;
extern GXColor g_clearColor;
extern GXColor g_whiteColor;
int dComLbG_PhaseHandler(request_of_phase_process_class*, request_of_phase_process_fn, void*);
int dComLbG_PhaseHandler(request_of_phase_process_class*, request_of_phase_process_fn*, void*);
BOOL dComIfG_resetToOpening(scene_class* scene);
char* dComIfG_getRoomArcName(int roomNo);
void* dComIfG_getStageRes(char const* resName);
@@ -1497,6 +1497,10 @@ inline void dComIfGs_setNewFile(u8 i_fileNo) {
return g_dComIfG_gameInfo.info.setNewFile(i_fileNo);
}
inline void dComIfGs_i_setNewFile(u8 i_fileNo) {
return g_dComIfG_gameInfo.info.setNewFile(i_fileNo);
}
inline char* dComIfGs_getPlayerName() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().getLinkName();
}
@@ -1527,6 +1531,14 @@ inline void dComIfGs_setPlayerFieldLastStayInfo(const char* i_stage, cXyz& i_pos
i_point, i_region);
}
inline void dComIfGs_setPlayerName(const char* i_name) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().setPlayerName(i_name);
}
inline void dComIfGs_setHorseName(const char* i_name) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().setHorseName(i_name);
}
inline void dComIfGs_setStartPoint(s16 i_point) {
g_dComIfG_gameInfo.info.getRestart().setStartPoint(i_point);
}
@@ -1671,6 +1683,10 @@ inline u8 dComIfGs_getNewFile() {
return g_dComIfG_gameInfo.info.getNewFile();
}
inline u8 dComIfGs_getNoFile() {
return g_dComIfG_gameInfo.info.getNoFile();
}
inline void dComIfGs_setInitDataToCard(u8* i_saveData, int i_dataNum) {
g_dComIfG_gameInfo.info.initdata_to_card((char*)i_saveData, i_dataNum);
}
include/d/d_bright_check.h
+18
View File
@@ -2,5 +2,23 @@
#define D_D_BRIGHT_CHECK_H
#include "dolphin/types.h"
#include "d/com/d_com_inf_game.h"
// class dBrightCheck_c {
// public:
// /* 80192F10 */ dBrightCheck_c(JKRArchive*);
// /* 80192F98 */ ~dBrightCheck_c();
// /* 80193030 */ void screenSet();
// /* 801934D0 */ void _move();
// /* 80193508 */ void modeWait();
// /* 8019350C */ void modeMove();
// /* 80193594 */ void _draw();
// bool isEnd() { return mEnd; }
// void* vtable;
// /* 0x04 */ u8 field_0x4[0x15];
// /* 0x19 */ bool mEnd;
// };
#endif /* D_D_BRIGHT_CHECK_H */
include/d/d_lib.h
+2 -1
View File
@@ -12,7 +12,8 @@ u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* arc, char const* resName);
BOOL dLib_checkActorInRectangle(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz const* param_2,
cXyz const* param_3);
struct STControl {
class STControl {
public:
STControl() {
setWaitParm(15, 15, 0, 0, 0.9f, 0.5f, 0, 0x2000);
init();

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