mirror of
https://github.com/encounter/tp.git
synced 2026-07-11 06:18:46 -07:00
d_a_obj_carry work, setup static shape data (#1890)
This commit is contained in:
Pheenoh
@@ -37,47 +37,47 @@ jobs:
|
||||
run: |
|
||||
./tp progress -f JSON > progress-${{ github.run_id }}.json
|
||||
./tp upload-progress progress-${{ github.run_id }}.json -b https://progress.deco.mp/ -p twilightprincess -v gcn_usa
|
||||
- name: Get changed .c, .cpp, .inc files
|
||||
if: github.event_name != 'pull_request'
|
||||
id: changed-files-specific
|
||||
uses: tj-actions/changed-files@v36
|
||||
with:
|
||||
files: |
|
||||
**/*.{c,cpp,inc}
|
||||
- name: Update Issue(s)
|
||||
if: github.event_name != 'pull_request' && steps.changed-files-specific.outputs.any_changed == 'true'
|
||||
run: |
|
||||
# Install libclang-16-dev for FunctionChecker
|
||||
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
|
||||
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main"
|
||||
sudo apt update
|
||||
sudo apt install -y libclang-16-dev
|
||||
# - name: Get changed .c, .cpp, .inc files
|
||||
# if: github.event_name != 'pull_request'
|
||||
# id: changed-files-specific
|
||||
# uses: tj-actions/changed-files@v36
|
||||
# with:
|
||||
# files: |
|
||||
# **/*.{c,cpp,inc}
|
||||
# - name: Update Issue(s)
|
||||
# if: github.event_name != 'pull_request' && steps.changed-files-specific.outputs.any_changed == 'true'
|
||||
# run: |
|
||||
# # Install libclang-16-dev for FunctionChecker
|
||||
# wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
|
||||
# sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main"
|
||||
# sudo apt update
|
||||
# sudo apt install -y libclang-16-dev
|
||||
|
||||
FILENAMES="${{ steps.changed-files-specific.outputs.all_changed_files }}"
|
||||
CMD="./tp github-update-issues --personal-access-token ${{ secrets.PAT_TOKEN }} --debug --owner ${{ env.GITHUB_ORG }} --repo ${{ env.GITHUB_REPO }} --state-file ${{ env.STATE_FILE }}"
|
||||
# FILENAMES="${{ steps.changed-files-specific.outputs.all_changed_files }}"
|
||||
# CMD="./tp github-update-issues --personal-access-token ${{ secrets.PAT_TOKEN }} --debug --owner ${{ env.GITHUB_ORG }} --repo ${{ env.GITHUB_REPO }} --state-file ${{ env.STATE_FILE }}"
|
||||
|
||||
IFS=' ' read -ra FILE_ARRAY <<< "$FILENAMES"
|
||||
INC_FOUND=false
|
||||
# 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
|
||||
# # 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
|
||||
# # 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
|
||||
AUTHOR=$(git log -1 --pretty=format:'%an' -- $FILE)
|
||||
CMD="$CMD --filename $FILE --author $AUTHOR"
|
||||
done
|
||||
# for FILE in "${FILE_ARRAY[@]}"; do
|
||||
# AUTHOR=$(git log -1 --pretty=format:'%an' -- $FILE)
|
||||
# CMD="$CMD --filename $FILE --author $AUTHOR"
|
||||
# done
|
||||
|
||||
# Update the status and assignees for every issue identified
|
||||
$CMD
|
||||
# # Update the status and assignees for every issue identified
|
||||
# $CMD
|
||||
+8
-8
@@ -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 | 31.228646% | 1123152 | 3596544
|
||||
.text | 31.257674% | 1124196 | 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 | 38.478344% | 1547088 | 4020672
|
||||
Total | 38.504310% | 1548132 | 4020672
|
||||
|
||||
## Total
|
||||
|
||||
Section | Percentage | Decompiled (bytes) | Total (bytes)
|
||||
---|---|---|---
|
||||
main.dol | 38.478344% | 1547088 | 4020672
|
||||
RELs | 34.240635% | 3937784 | 11500324
|
||||
Total | 35.338402% | 5484872 | 15520996
|
||||
main.dol | 38.504310% | 1548132 | 4020672
|
||||
RELs | 34.251939% | 3939084 | 11500324
|
||||
Total | 35.353504% | 5487216 | 15520996
|
||||
|
||||
## RELs
|
||||
|
||||
@@ -368,7 +368,7 @@ d_a_obj_brg | 22.881356% | 6696 | 29264
|
||||
d_a_obj_bsGate | 48.010850% | 2124 | 4424
|
||||
d_a_obj_bubblePilar | 44.760583% | 2580 | 5764
|
||||
d_a_obj_burnbox | 45.251397% | 1620 | 3580
|
||||
d_a_obj_carry | 31.484852% | 19372 | 61528
|
||||
d_a_obj_carry | 33.422182% | 20564 | 61528
|
||||
d_a_obj_catdoor | 82.338611% | 2704 | 3284
|
||||
d_a_obj_cb | 43.008475% | 2436 | 5664
|
||||
d_a_obj_cblock | 42.294713% | 3008 | 7112
|
||||
@@ -495,7 +495,7 @@ d_a_obj_lv4CandleTag | 50.114416% | 1752 | 3496
|
||||
d_a_obj_lv4EdShutter | 45.846154% | 2384 | 5200
|
||||
d_a_obj_lv4Gate | 97.443182% | 4116 | 4224
|
||||
d_a_obj_lv4HsTarget | 100.000000% | 2448 | 2448
|
||||
d_a_obj_lv4PoGate | 98.063128% | 5468 | 5576
|
||||
d_a_obj_lv4PoGate | 100.000000% | 5576 | 5576
|
||||
d_a_obj_lv4RailWall | 41.496973% | 3016 | 7268
|
||||
d_a_obj_lv4SlideWall | 48.954373% | 2060 | 4208
|
||||
d_a_obj_lv4bridge | 47.146866% | 2016 | 4276
|
||||
@@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244
|
||||
d_a_warp_bug | 100.000000% | 2024 | 2024
|
||||
d_a_ykgr | 44.400631% | 2252 | 5072
|
||||
f_pc_profile_lst | 100.000000% | 28156 | 28156
|
||||
Total | 34.240635% | 3937784 | 11500324
|
||||
Total | 34.251939% | 3939084 | 11500324
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
lbl_80470AB4:
|
||||
/* 80470AB4 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80470AB8 7C 08 02 A6 */ mflr r0
|
||||
/* 80470ABC 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80470AC0 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80470AC4 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80470AC8 38 7F 0D 88 */ addi r3, r31, 0xd88
|
||||
/* 80470ACC 38 9F 04 D0 */ addi r4, r31, 0x4d0
|
||||
/* 80470AD0 38 A0 00 01 */ li r5, 1
|
||||
/* 80470AD4 81 9F 0D 98 */ lwz r12, 0xd98(r31)
|
||||
/* 80470AD8 81 8C 00 14 */ lwz r12, 0x14(r12)
|
||||
/* 80470ADC 7D 89 03 A6 */ mtctr r12
|
||||
/* 80470AE0 4E 80 04 21 */ bctrl
|
||||
/* 80470AE4 38 00 00 09 */ li r0, 9
|
||||
/* 80470AE8 98 1F 08 80 */ stb r0, 0x880(r31)
|
||||
/* 80470AEC 38 00 00 02 */ li r0, 2
|
||||
/* 80470AF0 98 1F 08 82 */ stb r0, 0x882(r31)
|
||||
/* 80470AF4 80 1F 08 64 */ lwz r0, 0x864(r31)
|
||||
/* 80470AF8 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c
|
||||
/* 80470AFC 90 1F 08 64 */ stw r0, 0x864(r31)
|
||||
/* 80470B00 80 1F 08 68 */ lwz r0, 0x868(r31)
|
||||
/* 80470B04 60 00 00 02 */ ori r0, r0, 2
|
||||
/* 80470B08 90 1F 08 68 */ stw r0, 0x868(r31)
|
||||
/* 80470B0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80470B10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80470B14 80 1F 00 B0 */ lwz r0, 0xb0(r31)
|
||||
/* 80470B18 54 04 D6 3E */ rlwinm r4, r0, 0x1a, 0x18, 0x1f
|
||||
/* 80470B1C 88 1F 04 BA */ lbz r0, 0x4ba(r31)
|
||||
/* 80470B20 7C 05 07 74 */ extsb r5, r0
|
||||
/* 80470B24 4B BC 48 3D */ bl isSwitch__10dSv_info_cCFii
|
||||
/* 80470B28 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80470B2C 41 82 00 10 */ beq lbl_80470B3C
|
||||
/* 80470B30 7F E3 FB 78 */ mr r3, r31
|
||||
/* 80470B34 48 00 48 51 */ bl mode_init_fit__12daObjCarry_cFv
|
||||
/* 80470B38 48 00 00 0C */ b lbl_80470B44
|
||||
lbl_80470B3C:
|
||||
/* 80470B3C 7F E3 FB 78 */ mr r3, r31
|
||||
/* 80470B40 48 00 28 A9 */ bl mode_init_wait__12daObjCarry_cFv
|
||||
lbl_80470B44:
|
||||
/* 80470B44 38 60 00 01 */ li r3, 1
|
||||
/* 80470B48 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80470B4C 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80470B50 7C 08 03 A6 */ mtlr r0
|
||||
/* 80470B54 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80470B58 4E 80 00 20 */ blr
|
||||
@@ -1,21 +0,0 @@
|
||||
lbl_80470840:
|
||||
/* 80470840 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80470844 7C 08 02 A6 */ mflr r0
|
||||
/* 80470848 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 8047084C 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80470850 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80470854 48 00 2B 95 */ bl mode_init_wait__12daObjCarry_cFv
|
||||
/* 80470858 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8047085C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80470860 80 1F 00 B0 */ lwz r0, 0xb0(r31)
|
||||
/* 80470864 54 04 D6 3E */ rlwinm r4, r0, 0x1a, 0x18, 0x1f
|
||||
/* 80470868 88 1F 04 BA */ lbz r0, 0x4ba(r31)
|
||||
/* 8047086C 7C 05 07 74 */ extsb r5, r0
|
||||
/* 80470870 4B BC 4A F1 */ bl isSwitch__10dSv_info_cCFii
|
||||
/* 80470874 7C 60 00 34 */ cntlzw r0, r3
|
||||
/* 80470878 54 03 D9 7E */ srwi r3, r0, 5
|
||||
/* 8047087C 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80470880 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80470884 7C 08 03 A6 */ mtlr r0
|
||||
/* 80470888 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 8047088C 4E 80 00 20 */ blr
|
||||
@@ -1,69 +0,0 @@
|
||||
lbl_804706D4:
|
||||
/* 804706D4 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 804706D8 7C 08 02 A6 */ mflr r0
|
||||
/* 804706DC 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 804706E0 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 804706E4 93 C1 00 08 */ stw r30, 8(r1)
|
||||
/* 804706E8 7C 7E 1B 78 */ mr r30, r3
|
||||
/* 804706EC 4B BC 16 25 */ bl chkSaveFlag__12daObjCarry_cFv
|
||||
/* 804706F0 54 60 06 3F */ clrlwi. r0, r3, 0x18
|
||||
/* 804706F4 41 82 00 A4 */ beq lbl_80470798
|
||||
/* 804706F8 A0 1E 0D 16 */ lhz r0, 0xd16(r30)
|
||||
/* 804706FC 54 1F 06 3E */ clrlwi r31, r0, 0x18
|
||||
/* 80470700 7F E3 FB 78 */ mr r3, r31
|
||||
/* 80470704 4B BC 16 21 */ bl getPos__12daObjCarry_cFi
|
||||
/* 80470708 C0 03 00 00 */ lfs f0, 0(r3)
|
||||
/* 8047070C D0 1E 04 D0 */ stfs f0, 0x4d0(r30)
|
||||
/* 80470710 C0 03 00 04 */ lfs f0, 4(r3)
|
||||
/* 80470714 D0 1E 04 D4 */ stfs f0, 0x4d4(r30)
|
||||
/* 80470718 C0 03 00 08 */ lfs f0, 8(r3)
|
||||
/* 8047071C D0 1E 04 D8 */ stfs f0, 0x4d8(r30)
|
||||
/* 80470720 C0 1E 04 D0 */ lfs f0, 0x4d0(r30)
|
||||
/* 80470724 D0 1E 04 BC */ stfs f0, 0x4bc(r30)
|
||||
/* 80470728 C0 1E 04 D4 */ lfs f0, 0x4d4(r30)
|
||||
/* 8047072C D0 1E 04 C0 */ stfs f0, 0x4c0(r30)
|
||||
/* 80470730 C0 1E 04 D8 */ lfs f0, 0x4d8(r30)
|
||||
/* 80470734 D0 1E 04 C4 */ stfs f0, 0x4c4(r30)
|
||||
/* 80470738 C0 1E 04 D0 */ lfs f0, 0x4d0(r30)
|
||||
/* 8047073C D0 1E 05 50 */ stfs f0, 0x550(r30)
|
||||
/* 80470740 C0 1E 04 D4 */ lfs f0, 0x4d4(r30)
|
||||
/* 80470744 D0 1E 05 54 */ stfs f0, 0x554(r30)
|
||||
/* 80470748 C0 1E 04 D8 */ lfs f0, 0x4d8(r30)
|
||||
/* 8047074C D0 1E 05 58 */ stfs f0, 0x558(r30)
|
||||
/* 80470750 C0 1E 04 D0 */ lfs f0, 0x4d0(r30)
|
||||
/* 80470754 D0 1E 05 38 */ stfs f0, 0x538(r30)
|
||||
/* 80470758 C0 1E 04 D4 */ lfs f0, 0x4d4(r30)
|
||||
/* 8047075C D0 1E 05 3C */ stfs f0, 0x53c(r30)
|
||||
/* 80470760 C0 1E 04 D8 */ lfs f0, 0x4d8(r30)
|
||||
/* 80470764 D0 1E 05 40 */ stfs f0, 0x540(r30)
|
||||
/* 80470768 7F E3 FB 78 */ mr r3, r31
|
||||
/* 8047076C 4B BC 16 4D */ bl getRoomNo__12daObjCarry_cFi
|
||||
/* 80470770 98 7E 04 E2 */ stb r3, 0x4e2(r30)
|
||||
/* 80470774 88 1E 04 E2 */ lbz r0, 0x4e2(r30)
|
||||
/* 80470778 98 1E 04 8C */ stb r0, 0x48c(r30)
|
||||
/* 8047077C 7F E3 FB 78 */ mr r3, r31
|
||||
/* 80470780 38 80 00 01 */ li r4, 1
|
||||
/* 80470784 4B BC 16 09 */ bl chkSttsFlag__12daObjCarry_cFiUc
|
||||
/* 80470788 54 60 06 3F */ clrlwi. r0, r3, 0x18
|
||||
/* 8047078C 41 82 00 0C */ beq lbl_80470798
|
||||
/* 80470790 38 00 00 01 */ li r0, 1
|
||||
/* 80470794 98 1E 0D B7 */ stb r0, 0xdb7(r30)
|
||||
lbl_80470798:
|
||||
/* 80470798 38 7E 05 88 */ addi r3, r30, 0x588
|
||||
/* 8047079C 4B C0 86 FD */ bl SetLink__16dBgS_PolyPassChkFv
|
||||
/* 804707A0 38 7E 05 88 */ addi r3, r30, 0x588
|
||||
/* 804707A4 4B C0 86 D1 */ bl ClrObj__16dBgS_PolyPassChkFv
|
||||
/* 804707A8 7F C3 F3 78 */ mr r3, r30
|
||||
/* 804707AC 48 00 2C 3D */ bl mode_init_wait__12daObjCarry_cFv
|
||||
/* 804707B0 80 1E 07 D8 */ lwz r0, 0x7d8(r30)
|
||||
/* 804707B4 64 00 00 40 */ oris r0, r0, 0x40
|
||||
/* 804707B8 90 1E 07 D8 */ stw r0, 0x7d8(r30)
|
||||
/* 804707BC 38 00 00 06 */ li r0, 6
|
||||
/* 804707C0 98 1E 08 3C */ stb r0, 0x83c(r30)
|
||||
/* 804707C4 38 60 00 01 */ li r3, 1
|
||||
/* 804707C8 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 804707CC 83 C1 00 08 */ lwz r30, 8(r1)
|
||||
/* 804707D0 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 804707D4 7C 08 03 A6 */ mtlr r0
|
||||
/* 804707D8 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 804707DC 4E 80 00 20 */ blr
|
||||
@@ -1,27 +0,0 @@
|
||||
lbl_80470674:
|
||||
/* 80470674 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80470678 7C 08 02 A6 */ mflr r0
|
||||
/* 8047067C 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80470680 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80470684 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80470688 38 7F 0E 10 */ addi r3, r31, 0xe10
|
||||
/* 8047068C 7F E4 FB 78 */ mr r4, r31
|
||||
/* 80470690 3C A0 80 48 */ lis r5, kibako_jc_data@ha /* 0x8047A710@ha */
|
||||
/* 80470694 38 A5 A7 10 */ addi r5, r5, kibako_jc_data@l /* 0x8047A710@l */
|
||||
/* 80470698 80 DF 05 70 */ lwz r6, 0x570(r31)
|
||||
/* 8047069C 38 E0 00 01 */ li r7, 1
|
||||
/* 804706A0 4B BC 56 01 */ bl init__9dJntCol_cFP10fopAc_ac_cPC13dJntColData_cP8J3DModeli
|
||||
/* 804706A4 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 804706A8 40 82 00 0C */ bne lbl_804706B4
|
||||
/* 804706AC 38 60 00 00 */ li r3, 0
|
||||
/* 804706B0 48 00 00 10 */ b lbl_804706C0
|
||||
lbl_804706B4:
|
||||
/* 804706B4 7F E3 FB 78 */ mr r3, r31
|
||||
/* 804706B8 48 00 2D 31 */ bl mode_init_wait__12daObjCarry_cFv
|
||||
/* 804706BC 38 60 00 01 */ li r3, 1
|
||||
lbl_804706C0:
|
||||
/* 804706C0 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 804706C4 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 804706C8 7C 08 03 A6 */ mtlr r0
|
||||
/* 804706CC 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 804706D0 4E 80 00 20 */ blr
|
||||
@@ -1,10 +0,0 @@
|
||||
lbl_80470650:
|
||||
/* 80470650 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80470654 7C 08 02 A6 */ mflr r0
|
||||
/* 80470658 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 8047065C 48 00 2D 8D */ bl mode_init_wait__12daObjCarry_cFv
|
||||
/* 80470660 38 60 00 01 */ li r3, 1
|
||||
/* 80470664 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80470668 7C 08 03 A6 */ mtlr r0
|
||||
/* 8047066C 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80470670 4E 80 00 20 */ blr
|
||||
@@ -1,27 +0,0 @@
|
||||
lbl_804707E0:
|
||||
/* 804707E0 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 804707E4 7C 08 02 A6 */ mflr r0
|
||||
/* 804707E8 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 804707EC 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 804707F0 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 804707F4 38 7F 0E 10 */ addi r3, r31, 0xe10
|
||||
/* 804707F8 7F E4 FB 78 */ mr r4, r31
|
||||
/* 804707FC 3C A0 80 48 */ lis r5, taru_jc_data@ha /* 0x8047A71C@ha */
|
||||
/* 80470800 38 A5 A7 1C */ addi r5, r5, taru_jc_data@l /* 0x8047A71C@l */
|
||||
/* 80470804 80 DF 05 70 */ lwz r6, 0x570(r31)
|
||||
/* 80470808 38 E0 00 01 */ li r7, 1
|
||||
/* 8047080C 4B BC 54 95 */ bl init__9dJntCol_cFP10fopAc_ac_cPC13dJntColData_cP8J3DModeli
|
||||
/* 80470810 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80470814 40 82 00 0C */ bne lbl_80470820
|
||||
/* 80470818 38 60 00 00 */ li r3, 0
|
||||
/* 8047081C 48 00 00 10 */ b lbl_8047082C
|
||||
lbl_80470820:
|
||||
/* 80470820 7F E3 FB 78 */ mr r3, r31
|
||||
/* 80470824 48 00 2B C5 */ bl mode_init_wait__12daObjCarry_cFv
|
||||
/* 80470828 38 60 00 01 */ li r3, 1
|
||||
lbl_8047082C:
|
||||
/* 8047082C 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80470830 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80470834 7C 08 03 A6 */ mtlr r0
|
||||
/* 80470838 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 8047083C 4E 80 00 20 */ blr
|
||||
@@ -1,32 +0,0 @@
|
||||
lbl_804705DC:
|
||||
/* 804705DC 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 804705E0 7C 08 02 A6 */ mflr r0
|
||||
/* 804705E4 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 804705E8 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 804705EC 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 804705F0 A0 03 0D 18 */ lhz r0, 0xd18(r3)
|
||||
/* 804705F4 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f
|
||||
/* 804705F8 40 82 00 0C */ bne lbl_80470604
|
||||
/* 804705FC 38 00 00 01 */ li r0, 1
|
||||
/* 80470600 98 1F 0D B5 */ stb r0, 0xdb5(r31)
|
||||
lbl_80470604:
|
||||
/* 80470604 7F E3 FB 78 */ mr r3, r31
|
||||
/* 80470608 48 00 2D E1 */ bl mode_init_wait__12daObjCarry_cFv
|
||||
/* 8047060C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80470610 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80470614 38 63 4E 00 */ addi r3, r3, 0x4e00
|
||||
/* 80470618 3C 80 80 48 */ lis r4, d_a_obj_carry__stringBase0@ha /* 0x8047A4BC@ha */
|
||||
/* 8047061C 38 84 A4 BC */ addi r4, r4, d_a_obj_carry__stringBase0@l /* 0x8047A4BC@l */
|
||||
/* 80470620 38 84 01 33 */ addi r4, r4, 0x133
|
||||
/* 80470624 4B EF 83 71 */ bl strcmp
|
||||
/* 80470628 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 8047062C 40 82 00 0C */ bne lbl_80470638
|
||||
/* 80470630 38 00 00 01 */ li r0, 1
|
||||
/* 80470634 98 1F 0E 25 */ stb r0, 0xe25(r31)
|
||||
lbl_80470638:
|
||||
/* 80470638 38 60 00 01 */ li r3, 1
|
||||
/* 8047063C 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80470640 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80470644 7C 08 03 A6 */ mtlr r0
|
||||
/* 80470648 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 8047064C 4E 80 00 20 */ blr
|
||||
@@ -1,24 +0,0 @@
|
||||
lbl_8046FFA4:
|
||||
/* 8046FFA4 88 03 0C F0 */ lbz r0, 0xcf0(r3)
|
||||
/* 8046FFA8 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 8046FFAC 41 82 00 3C */ beq lbl_8046FFE8
|
||||
/* 8046FFB0 28 00 00 07 */ cmplwi r0, 7
|
||||
/* 8046FFB4 41 82 00 34 */ beq lbl_8046FFE8
|
||||
/* 8046FFB8 28 00 00 01 */ cmplwi r0, 1
|
||||
/* 8046FFBC 41 82 00 2C */ beq lbl_8046FFE8
|
||||
/* 8046FFC0 28 00 00 02 */ cmplwi r0, 2
|
||||
/* 8046FFC4 41 82 00 24 */ beq lbl_8046FFE8
|
||||
/* 8046FFC8 28 00 00 05 */ cmplwi r0, 5
|
||||
/* 8046FFCC 41 82 00 1C */ beq lbl_8046FFE8
|
||||
/* 8046FFD0 28 00 00 0A */ cmplwi r0, 0xa
|
||||
/* 8046FFD4 41 82 00 14 */ beq lbl_8046FFE8
|
||||
/* 8046FFD8 28 00 00 0C */ cmplwi r0, 0xc
|
||||
/* 8046FFDC 41 82 00 0C */ beq lbl_8046FFE8
|
||||
/* 8046FFE0 28 00 00 0D */ cmplwi r0, 0xd
|
||||
/* 8046FFE4 40 82 00 0C */ bne lbl_8046FFF0
|
||||
lbl_8046FFE8:
|
||||
/* 8046FFE8 38 60 00 01 */ li r3, 1
|
||||
/* 8046FFEC 4E 80 00 20 */ blr
|
||||
lbl_8046FFF0:
|
||||
/* 8046FFF0 38 60 00 00 */ li r3, 0
|
||||
/* 8046FFF4 4E 80 00 20 */ blr
|
||||
@@ -1,26 +0,0 @@
|
||||
lbl_8046FFF8:
|
||||
/* 8046FFF8 88 03 0C F0 */ lbz r0, 0xcf0(r3)
|
||||
/* 8046FFFC 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 80470000 41 82 00 44 */ beq lbl_80470044
|
||||
/* 80470004 28 00 00 07 */ cmplwi r0, 7
|
||||
/* 80470008 41 82 00 3C */ beq lbl_80470044
|
||||
/* 8047000C 28 00 00 01 */ cmplwi r0, 1
|
||||
/* 80470010 41 82 00 34 */ beq lbl_80470044
|
||||
/* 80470014 28 00 00 02 */ cmplwi r0, 2
|
||||
/* 80470018 41 82 00 2C */ beq lbl_80470044
|
||||
/* 8047001C 28 00 00 05 */ cmplwi r0, 5
|
||||
/* 80470020 41 82 00 24 */ beq lbl_80470044
|
||||
/* 80470024 28 00 00 06 */ cmplwi r0, 6
|
||||
/* 80470028 41 82 00 1C */ beq lbl_80470044
|
||||
/* 8047002C 28 00 00 0A */ cmplwi r0, 0xa
|
||||
/* 80470030 41 82 00 14 */ beq lbl_80470044
|
||||
/* 80470034 28 00 00 0C */ cmplwi r0, 0xc
|
||||
/* 80470038 41 82 00 0C */ beq lbl_80470044
|
||||
/* 8047003C 28 00 00 0D */ cmplwi r0, 0xd
|
||||
/* 80470040 40 82 00 0C */ bne lbl_8047004C
|
||||
lbl_80470044:
|
||||
/* 80470044 38 60 00 01 */ li r3, 1
|
||||
/* 80470048 4E 80 00 20 */ blr
|
||||
lbl_8047004C:
|
||||
/* 8047004C 38 60 00 00 */ li r3, 0
|
||||
/* 80470050 4E 80 00 20 */ blr
|
||||
@@ -1,14 +0,0 @@
|
||||
lbl_80470054:
|
||||
/* 80470054 88 03 0C F0 */ lbz r0, 0xcf0(r3)
|
||||
/* 80470058 28 00 00 08 */ cmplwi r0, 8
|
||||
/* 8047005C 41 82 00 14 */ beq lbl_80470070
|
||||
/* 80470060 28 00 00 09 */ cmplwi r0, 9
|
||||
/* 80470064 41 82 00 0C */ beq lbl_80470070
|
||||
/* 80470068 28 00 00 0B */ cmplwi r0, 0xb
|
||||
/* 8047006C 40 82 00 0C */ bne lbl_80470078
|
||||
lbl_80470070:
|
||||
/* 80470070 38 60 00 01 */ li r3, 1
|
||||
/* 80470074 4E 80 00 20 */ blr
|
||||
lbl_80470078:
|
||||
/* 80470078 38 60 00 00 */ li r3, 0
|
||||
/* 8047007C 4E 80 00 20 */ blr
|
||||
@@ -1,18 +0,0 @@
|
||||
lbl_804700B4:
|
||||
/* 804700B4 88 03 0C F0 */ lbz r0, 0xcf0(r3)
|
||||
/* 804700B8 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 804700BC 41 82 00 24 */ beq lbl_804700E0
|
||||
/* 804700C0 28 00 00 05 */ cmplwi r0, 5
|
||||
/* 804700C4 41 82 00 1C */ beq lbl_804700E0
|
||||
/* 804700C8 28 00 00 07 */ cmplwi r0, 7
|
||||
/* 804700CC 41 82 00 14 */ beq lbl_804700E0
|
||||
/* 804700D0 28 00 00 06 */ cmplwi r0, 6
|
||||
/* 804700D4 41 82 00 0C */ beq lbl_804700E0
|
||||
/* 804700D8 28 00 00 0C */ cmplwi r0, 0xc
|
||||
/* 804700DC 40 82 00 0C */ bne lbl_804700E8
|
||||
lbl_804700E0:
|
||||
/* 804700E0 38 60 00 01 */ li r3, 1
|
||||
/* 804700E4 4E 80 00 20 */ blr
|
||||
lbl_804700E8:
|
||||
/* 804700E8 38 60 00 00 */ li r3, 0
|
||||
/* 804700EC 4E 80 00 20 */ blr
|
||||
@@ -1,16 +0,0 @@
|
||||
lbl_80470080:
|
||||
/* 80470080 88 03 0C F0 */ lbz r0, 0xcf0(r3)
|
||||
/* 80470084 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 80470088 41 82 00 1C */ beq lbl_804700A4
|
||||
/* 8047008C 28 00 00 05 */ cmplwi r0, 5
|
||||
/* 80470090 41 82 00 14 */ beq lbl_804700A4
|
||||
/* 80470094 28 00 00 07 */ cmplwi r0, 7
|
||||
/* 80470098 41 82 00 0C */ beq lbl_804700A4
|
||||
/* 8047009C 28 00 00 0C */ cmplwi r0, 0xc
|
||||
/* 804700A0 40 82 00 0C */ bne lbl_804700AC
|
||||
lbl_804700A4:
|
||||
/* 804700A4 38 60 00 01 */ li r3, 1
|
||||
/* 804700A8 4E 80 00 20 */ blr
|
||||
lbl_804700AC:
|
||||
/* 804700AC 38 60 00 00 */ li r3, 0
|
||||
/* 804700B0 4E 80 00 20 */ blr
|
||||
@@ -222,6 +222,7 @@ class dCcD_GObjTg : public dCcD_GAtTgCoCommonBase {
|
||||
public:
|
||||
/* 800839A0 */ void Set(dCcD_SrcGObjTg const&);
|
||||
/* 80083BE8 */ virtual ~dCcD_GObjTg() {}
|
||||
void SetSe(u8 se) { mSe = se; }
|
||||
void SetVec(cXyz& vec) { mVec = vec; }
|
||||
cXyz& GetVec() { return mVec; }
|
||||
void SetShieldFrontRangeYAngle(s16* angle) { mShieldFrontRangeYAngle = angle; }
|
||||
@@ -288,11 +289,13 @@ public:
|
||||
void OnAtNoHitMark() { mGObjAt.OnSPrm(2); }
|
||||
void OffAtNoHitMark() { mGObjAt.OffSPrm(2); }
|
||||
void OnTgNoHitMark() { mGObjTg.OnSPrm(4); }
|
||||
void OffTgNoHitMark() { mGObjTg.OffSPrm(4); }
|
||||
void OnAtNoConHit() { mGObjAt.OnSPrm(1); }
|
||||
void OffAtNoConHit() { mGObjAt.OffSPrm(1); }
|
||||
void OnTgNoConHit() { mGObjTg.OnSPrm(2); }
|
||||
void SetAtHitMark(u8 mark) { mGObjAt.SetHitMark(mark); }
|
||||
void SetAtSe(u8 se) { mGObjAt.SetSe(se); }
|
||||
void SetTgSe(u8 se) { mGObjTg.SetSe(se); }
|
||||
void SetAtMtrl(u8 mtrl) { mGObjAt.SetMtrl(mtrl); }
|
||||
void SetTgMtrl(u8 mtrl) { mGObjTg.SetMtrl(mtrl); }
|
||||
fopAc_ac_c* GetAtHitAc() { return mGObjAt.GetAc(); }
|
||||
|
||||
@@ -13,7 +13,8 @@ public:
|
||||
/* 0x0 */ u8 field_0x0;
|
||||
/* 0x1 */ s8 mType;
|
||||
/* 0x2 */ s16 mJntNum;
|
||||
/* 0x4 */ u8 field_0x4[0xC - 0x4];
|
||||
/* 0x4 */ u32 field_0x4;
|
||||
/* 0x8 */ void* field_0x8;
|
||||
};
|
||||
|
||||
class dJntCol_c {
|
||||
|
||||
@@ -571,7 +571,7 @@ JKRHeap* mDoExt_getCurrentHeap();
|
||||
void mDoExt_removeMesgFont();
|
||||
void mDoExt_modelUpdate(J3DModel* i_model);
|
||||
void mDoExt_modelUpdateDL(J3DModel* i_model);
|
||||
J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 param_1, u32 param_2);
|
||||
J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag, u32 i_differedDlistFlag);
|
||||
void mDoExt_setAraCacheSize(u32 size);
|
||||
int mDoExt_resIDToIndex(JKRArchive* p_archive, u16 id);
|
||||
void mDoExt_modelEntryDL(J3DModel* i_model);
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "d/cc/d_cc_d.h"
|
||||
#include "d/d_jnt_col.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
#include "d/com/d_com_inf_game.h"
|
||||
|
||||
struct daObjCarry_Data {
|
||||
/* 0x0000 */ u8 field_0x0000[0x0030 - 0x0000];
|
||||
@@ -47,33 +48,33 @@ public:
|
||||
/* 80031DAC */ static void setRoomNo(int, s8);
|
||||
/* 80031DB8 */ static s8 getRoomNo(int);
|
||||
/* 8046F6A4 */ u8 data();
|
||||
/* 8046F6BC */ void* getArcName();
|
||||
/* 8046F6D4 */ void* getBmdName();
|
||||
/* 8046F6BC */ char* getArcName();
|
||||
/* 8046F6D4 */ int getBmdName();
|
||||
/* 8046F6EC */ void checkFlag(u8);
|
||||
/* 8046F724 */ void initBaseMtx();
|
||||
/* 8046F7AC */ void setBaseMtx();
|
||||
/* 8046FACC */ s32 preInit();
|
||||
/* 8046FB78 */ daObjCarry_c();
|
||||
/* 8046FFA4 */ void checkBreakWolfAttack();
|
||||
/* 8046FFF8 */ void checkCarryBoomerang();
|
||||
/* 80470054 */ void checkCarryHookshot();
|
||||
/* 80470080 */ void checkCarryWolf();
|
||||
/* 804700B4 */ void checkCarryOneHand();
|
||||
/* 8046FFA4 */ s32 checkBreakWolfAttack();
|
||||
/* 8046FFF8 */ s32 checkCarryBoomerang();
|
||||
/* 80470054 */ s32 checkCarryHookshot();
|
||||
/* 80470080 */ s32 checkCarryWolf();
|
||||
/* 804700B4 */ s32 checkCarryOneHand();
|
||||
/* 804700F0 */ void Create();
|
||||
/* 804705DC */ void CreateInit_tsubo();
|
||||
/* 80470650 */ void CreateInit_ootubo();
|
||||
/* 80470674 */ void CreateInit_kibako();
|
||||
/* 804706D4 */ void CreateInit_ironball();
|
||||
/* 804707E0 */ void CreateInit_taru();
|
||||
/* 80470840 */ void CreateInit_dokuro();
|
||||
/* 80470890 */ void CreateInit_bokkuri();
|
||||
/* 804709DC */ void CreateInit_LightBall();
|
||||
/* 80470AB4 */ void CreateInit_Lv8Ball();
|
||||
/* 80470B5C */ void CreateHeap();
|
||||
/* 80470BF4 */ void create();
|
||||
/* 80470CF0 */ void checkCreate_LightBallA();
|
||||
/* 8047114C */ void checkCreate_LightBallB();
|
||||
/* 804715A8 */ void checkCreate_Lv8Ball();
|
||||
/* 804705DC */ s32 CreateInit_tsubo();
|
||||
/* 80470650 */ s32 CreateInit_ootubo();
|
||||
/* 80470674 */ s32 CreateInit_kibako();
|
||||
/* 804706D4 */ s32 CreateInit_ironball();
|
||||
/* 804707E0 */ s32 CreateInit_taru();
|
||||
/* 80470840 */ bool CreateInit_dokuro();
|
||||
/* 80470890 */ s32 CreateInit_bokkuri();
|
||||
/* 804709DC */ s32 CreateInit_LightBall();
|
||||
/* 80470AB4 */ s32 CreateInit_Lv8Ball();
|
||||
/* 80470B5C */ s32 CreateHeap();
|
||||
/* 80470BF4 */ cPhs__Step create();
|
||||
/* 80470CF0 */ s32 checkCreate_LightBallA();
|
||||
/* 8047114C */ s32 checkCreate_LightBallB();
|
||||
/* 804715A8 */ s32 checkCreate_Lv8Ball();
|
||||
/* 80471680 */ void resetIconPosForLightBallA();
|
||||
/* 804716D4 */ void setIconPosForLightBallAAtR00();
|
||||
/* 804717B4 */ void setIconPosForLightBallBAtR00();
|
||||
@@ -193,8 +194,14 @@ public:
|
||||
/* 80479664 */ void CreateInitCall();
|
||||
|
||||
s32 getType() { return mType; }
|
||||
u32 getSwbit() { return fopAcM_GetParamBit(this,6,8);}
|
||||
u32 getSwbit2() { return fopAcM_GetParamBit(this,0xe,8); }
|
||||
u32 checkOnMoveBg() { return ~((field_0xd18 >> 0xc) & 1);}
|
||||
u32 checkCrashRoll() { return field_0xd18 >> 6 & 1;}
|
||||
u8 getItemNo() { return mItemNo; }
|
||||
u8 getSaveID() { return getItemNo(); }
|
||||
u32 getSetType() { return (u32)(field_0xd18 << 16) >> 29;} // fake match?
|
||||
s8 prm_chk_type_ironball() { return (s8)(getType() == TYPE_IRON_BALL); }
|
||||
|
||||
static u8 const mData[2072];
|
||||
static Vec mPos[5];
|
||||
@@ -205,7 +212,7 @@ public:
|
||||
public:
|
||||
/* 0x568 */ request_of_phase_process_class mPhaseReq;
|
||||
/* 0x570 */ J3DModel* mpModel;
|
||||
/* 0x574 */ dBgS_Acch mAcch;
|
||||
/* 0x574 */ dBgS_ObjAcch mAcch;
|
||||
/* 0x74C */ dBgS_AcchCir mAcchCir;
|
||||
/* 0x78C */ dCcD_Stts mStts;
|
||||
/* 0x7C8 */ dCcD_Cyl field_0x7c8;
|
||||
@@ -223,7 +230,7 @@ public:
|
||||
/* 0xD04 */ s16 field_0xd04;
|
||||
/* 0xD06 */ u8 field_0xD06[0xD15 - 0xD06];
|
||||
/* 0xD15 */ u8 field_0xd15;
|
||||
/* 0xD16 */ u16 field_0xd16;
|
||||
/* 0xD16 */ u16 mItemNo;
|
||||
/* 0xD18 */ u16 field_0xd18;
|
||||
/* 0xD1A */ u8 field_0xD1A[0xD1C - 0xD1A];
|
||||
/* 0xD1C */ cXyz field_0xd1c;
|
||||
@@ -261,7 +268,9 @@ public:
|
||||
/* 0xDB1 */ u8 field_0xDB1[0xDB2 - 0xDB1];
|
||||
/* 0xDB2 */ u8 mOnMoveBG;
|
||||
/* 0xDB3 */ u8 field_0xdb3;
|
||||
/* 0xDB4 */ u8 field_0xDB4[0xDB7 - 0xDB4];
|
||||
/* 0xDB4 */ u8 field_0xdb4;
|
||||
/* 0xDB5 */ u8 mCrashRoll;
|
||||
/* 0xDB6 */ u8 field_0xdb6;
|
||||
/* 0xDB7 */ u8 mDraw;
|
||||
/* 0xDB8 */ u8 mCtrl;
|
||||
/* 0xDB9 */ u8 field_0xdb9;
|
||||
@@ -284,7 +293,10 @@ public:
|
||||
/* 0xE0E */ u8 field_0xE0E[0xE10 - 0xE0E];
|
||||
/* 0xE10 */ dJntCol_c field_0xe10;
|
||||
/* 0xE20 */ float field_0xe20;
|
||||
/* 0xE24 */ u8 field_0xe24[0xE28 - 0xE24];
|
||||
/* 0xE24 */ u8 field_0xe24;
|
||||
/* 0xE25 */ u8 field_0xe25;
|
||||
/* 0xE26 */ u8 field_0xe26;
|
||||
/* 0xE27 */ u8 field_0xe27;
|
||||
|
||||
private:
|
||||
u16 getType_private() { return field_0xd18 >> 1 & 0x1f; }
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
//
|
||||
|
||||
#include "rel/d/a/b/d_a_b_bh/d_a_b_bh.h"
|
||||
#include "d/cc/d_cc_d.h"
|
||||
#include "dol2asm.h"
|
||||
|
||||
//
|
||||
@@ -52,16 +53,6 @@ struct daB_BH_HIO_c {
|
||||
/* 805B3098 */ ~daB_BH_HIO_c();
|
||||
};
|
||||
|
||||
struct Vec {};
|
||||
|
||||
struct cXyz {
|
||||
/* 80266AE4 */ void operator+(Vec const&) const;
|
||||
/* 80266B34 */ void operator-(Vec const&) const;
|
||||
/* 80266B84 */ void operator*(f32) const;
|
||||
/* 805AEB04 */ ~cXyz();
|
||||
/* 805B3094 */ cXyz();
|
||||
};
|
||||
|
||||
struct dVibration_c {
|
||||
/* 8006FA24 */ void StartShock(int, int, cXyz);
|
||||
};
|
||||
@@ -109,26 +100,6 @@ struct dComIfG_play_c {
|
||||
/* 8002C97C */ void getLayerNo(int);
|
||||
};
|
||||
|
||||
struct dCcD_Stts {
|
||||
/* 80083860 */ void Init(int, int, fopAc_ac_c*);
|
||||
};
|
||||
|
||||
struct dCcD_SrcSph {};
|
||||
|
||||
struct dCcD_Sph {
|
||||
/* 80084A34 */ void Set(dCcD_SrcSph const&);
|
||||
};
|
||||
|
||||
struct dCcD_GStts {
|
||||
/* 80083760 */ dCcD_GStts();
|
||||
};
|
||||
|
||||
struct dCcD_GObjInf {
|
||||
/* 80083A28 */ dCcD_GObjInf();
|
||||
/* 80084460 */ void ChkTgHit();
|
||||
/* 800844F8 */ void GetTgHitObj();
|
||||
};
|
||||
|
||||
struct dBgS_PolyPassChk {
|
||||
/* 80078E68 */ void SetObj();
|
||||
};
|
||||
@@ -151,50 +122,21 @@ struct dBgS_Acch {
|
||||
/* 80076AAC */ void CrrPos(dBgS&);
|
||||
};
|
||||
|
||||
struct cM3dGSph {
|
||||
/* 8026F648 */ void SetC(cXyz const&);
|
||||
/* 8026F708 */ void SetR(f32);
|
||||
/* 805B2FC4 */ ~cM3dGSph();
|
||||
};
|
||||
|
||||
struct cM3dGAab {
|
||||
/* 805B300C */ ~cM3dGAab();
|
||||
};
|
||||
|
||||
struct cCcD_Obj {};
|
||||
|
||||
struct cCcS {
|
||||
/* 80264BA8 */ void Set(cCcD_Obj*);
|
||||
};
|
||||
|
||||
struct b_bh_class {};
|
||||
|
||||
struct JAISoundID {};
|
||||
|
||||
struct Z2SeMgr {
|
||||
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
|
||||
};
|
||||
|
||||
struct Z2CreatureEnemy {
|
||||
/* 802C0F64 */ Z2CreatureEnemy();
|
||||
/* 802C1094 */ void init(Vec*, Vec*, u8, u8);
|
||||
};
|
||||
|
||||
struct Z2AudioMgr {
|
||||
static u8 mAudioMgrPtr[4 + 4 /* padding */];
|
||||
};
|
||||
|
||||
struct JMath {
|
||||
static u8 sincosTable_[65536];
|
||||
};
|
||||
|
||||
struct JGeometry {
|
||||
template <typename A1>
|
||||
struct TVec3 {};
|
||||
/* TVec3<f32> */
|
||||
struct TVec3__template0 {};
|
||||
};
|
||||
|
||||
struct J3DModel {};
|
||||
|
||||
//
|
||||
@@ -320,9 +262,6 @@ extern "C" void* __nw__FUl();
|
||||
extern "C" void __dl__FPv();
|
||||
extern "C" void PSMTXCopy();
|
||||
extern "C" void PSMTXTrans();
|
||||
extern "C" void PSVECAdd();
|
||||
extern "C" void PSVECSubtract();
|
||||
extern "C" void PSVECSquareMag();
|
||||
extern "C" void __construct_array();
|
||||
extern "C" void _savegpr_21();
|
||||
extern "C" void _savegpr_24();
|
||||
@@ -351,7 +290,6 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384];
|
||||
extern "C" extern u8 g_env_light[4880];
|
||||
extern "C" u8 sincosTable___5JMath[65536];
|
||||
extern "C" extern void* calc_mtx[1 + 1 /* padding */];
|
||||
extern "C" extern u32 __float_nan;
|
||||
extern "C" extern u8 struct_80450C98[4];
|
||||
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
|
||||
extern "C" void __register_global_object();
|
||||
@@ -452,19 +390,29 @@ SECTION_DATA static u8 g_y_ji[20] = {
|
||||
};
|
||||
|
||||
/* 805B328C-805B32CC 000058 0040+00 1/1 0/0 0/0 .data cc_sph_src$5408 */
|
||||
SECTION_DATA static u8 cc_sph_src[64] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D,
|
||||
0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x75, 0x0B, 0x00, 0x01, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x0A, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00,
|
||||
static dCcD_SrcSph cc_sph_src = {
|
||||
{
|
||||
{0x0, {{AT_TYPE_CSTATUE_SWING, 0x2, 0xd}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj
|
||||
{dCcD_SE_HARD_BODY, 0x0, 0x1, 0x0, 0x0}, // mGObjAt
|
||||
{dCcD_SE_STONE, 0x2, 0x0, 0x0, 0x3}, // mGObjTg
|
||||
{0x0}, // mGObjCo
|
||||
}, // mObjInf
|
||||
{
|
||||
{{0.0f, 0.0f, 0.0f}, 40.0f} // mSph
|
||||
} // mSphAttr
|
||||
};
|
||||
|
||||
/* 805B32CC-805B330C 000098 0040+00 1/1 0/0 0/0 .data tg_sph_src$5409 */
|
||||
SECTION_DATA static u8 tg_sph_src[64] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x01, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00,
|
||||
static dCcD_SrcSph tg_sph_src = {
|
||||
{
|
||||
{0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x0}}, // mObj
|
||||
{dCcD_SE_HARD_BODY, 0x0, 0x1, 0x0, 0x0}, // mGObjAt
|
||||
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
|
||||
{0x0}, // mGObjCo
|
||||
}, // mObjInf
|
||||
{
|
||||
{{0.0f, 0.0f, 0.0f}, 40.0f} // mSph
|
||||
} // mSphAttr
|
||||
};
|
||||
|
||||
/* 805B330C-805B332C -00001 0020+00 1/0 0/0 0/0 .data l_daB_BH_Method */
|
||||
@@ -869,7 +817,8 @@ static asm void b_bh_wait(b_bh_class* param_0) {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm cXyz::~cXyz() {
|
||||
// asm cXyz::~cXyz() {
|
||||
extern "C" asm void __dt__4cXyzFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_bh/d_a_b_bh/__dt__4cXyzFv.s"
|
||||
}
|
||||
@@ -1285,7 +1234,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm cM3dGSph::~cM3dGSph() {
|
||||
// asm cM3dGSph::~cM3dGSph() {
|
||||
extern "C" asm void __dt__8cM3dGSphFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_bh/d_a_b_bh/__dt__8cM3dGSphFv.s"
|
||||
}
|
||||
@@ -1295,7 +1245,8 @@ asm cM3dGSph::~cM3dGSph() {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm cM3dGAab::~cM3dGAab() {
|
||||
// asm cM3dGAab::~cM3dGAab() {
|
||||
extern "C" asm void __dt__8cM3dGAabFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_bh/d_a_b_bh/__dt__8cM3dGAabFv.s"
|
||||
}
|
||||
@@ -1317,7 +1268,8 @@ csXyz::csXyz() {
|
||||
}
|
||||
|
||||
/* 805B3094-805B3098 004F14 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */
|
||||
cXyz::cXyz() {
|
||||
// cXyz::cXyz() {
|
||||
extern "C" asm void __ct__4cXyzFv() {
|
||||
/* empty function */
|
||||
}
|
||||
|
||||
|
||||
+84
-120
@@ -4,6 +4,7 @@
|
||||
//
|
||||
|
||||
#include "rel/d/a/b/d_a_b_bq/d_a_b_bq.h"
|
||||
#include "d/cc/d_cc_d.h"
|
||||
#include "dol2asm.h"
|
||||
|
||||
//
|
||||
@@ -16,22 +17,6 @@ namespace std {
|
||||
|
||||
struct request_of_phase_process_class {};
|
||||
|
||||
struct Vec {};
|
||||
|
||||
struct cXyz {
|
||||
/* 80266AE4 */ void operator+(Vec const&) const;
|
||||
/* 80266B34 */ void operator-(Vec const&) const;
|
||||
/* 80266B84 */ void operator*(f32) const;
|
||||
/* 805B3C20 */ ~cXyz();
|
||||
/* 805BA250 */ cXyz(cXyz const&);
|
||||
/* 805BA530 */ cXyz(f32, f32, f32);
|
||||
/* 805B9D74 */ cXyz();
|
||||
/* 805BA160 */ void set(f32, f32, f32);
|
||||
/* 805BA170 */ void operator=(cXyz const&);
|
||||
/* 805BA3C4 */ void abs() const;
|
||||
/* 805BA540 */ void operator+=(Vec const&);
|
||||
};
|
||||
|
||||
struct obj_ystone_class {
|
||||
/* 805BA234 */ void setCurrentPos(cXyz);
|
||||
};
|
||||
@@ -174,31 +159,6 @@ struct dComIfG_play_c {
|
||||
|
||||
struct dCcU_AtInfo {};
|
||||
|
||||
struct dCcD_Stts {
|
||||
/* 80083860 */ void Init(int, int, fopAc_ac_c*);
|
||||
};
|
||||
|
||||
struct dCcD_SrcSph {};
|
||||
|
||||
struct dCcD_Sph {
|
||||
/* 80084A34 */ void Set(dCcD_SrcSph const&);
|
||||
/* 805B9D78 */ dCcD_Sph();
|
||||
/* 805B9DFC */ ~dCcD_Sph();
|
||||
};
|
||||
|
||||
struct dCcD_GStts {
|
||||
/* 80083760 */ dCcD_GStts();
|
||||
/* 80083830 */ void Move();
|
||||
/* 805B9F58 */ ~dCcD_GStts();
|
||||
};
|
||||
|
||||
struct dCcD_GObjInf {
|
||||
/* 80083A28 */ dCcD_GObjInf();
|
||||
/* 800840E4 */ ~dCcD_GObjInf();
|
||||
/* 80084460 */ void ChkTgHit();
|
||||
/* 800844F8 */ void GetTgHitObj();
|
||||
};
|
||||
|
||||
struct dCamera_c {
|
||||
/* 801614AC */ void Start();
|
||||
/* 801614D0 */ void Stop();
|
||||
@@ -213,26 +173,10 @@ struct dBgS_LinChk {
|
||||
/* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
|
||||
};
|
||||
|
||||
struct cM3dGSph {
|
||||
/* 8026F648 */ void SetC(cXyz const&);
|
||||
/* 8026F708 */ void SetR(f32);
|
||||
/* 805B9EC8 */ ~cM3dGSph();
|
||||
};
|
||||
|
||||
struct cM3dGAab {
|
||||
/* 805B9F10 */ ~cM3dGAab();
|
||||
};
|
||||
|
||||
struct cCcD_Obj {};
|
||||
|
||||
struct cCcS {
|
||||
/* 80264BA8 */ void Set(cCcD_Obj*);
|
||||
};
|
||||
|
||||
struct cCcD_GStts {
|
||||
/* 805B9FB4 */ ~cCcD_GStts();
|
||||
};
|
||||
|
||||
struct cBgS_LinChk {
|
||||
/* 805B8A04 */ void GetCross();
|
||||
};
|
||||
@@ -263,34 +207,15 @@ struct Z2SeqMgr {
|
||||
/* 802AFF8C */ void changeBgmStatus(s32);
|
||||
};
|
||||
|
||||
struct JAISoundID {
|
||||
/* 805BA26C */ JAISoundID(u32);
|
||||
};
|
||||
|
||||
struct Z2SeMgr {
|
||||
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
|
||||
};
|
||||
|
||||
struct Z2CreatureEnemy {
|
||||
/* 802C0F64 */ Z2CreatureEnemy();
|
||||
/* 802C1094 */ void init(Vec*, Vec*, u8, u8);
|
||||
};
|
||||
|
||||
struct Z2AudioMgr {
|
||||
static u8 mAudioMgrPtr[4 + 4 /* padding */];
|
||||
};
|
||||
|
||||
struct JMath {
|
||||
static u8 sincosTable_[65536];
|
||||
};
|
||||
|
||||
struct JGeometry {
|
||||
template <typename A1>
|
||||
struct TVec3 {};
|
||||
/* TVec3<f32> */
|
||||
struct TVec3__template0 {};
|
||||
};
|
||||
|
||||
struct J3DSys {
|
||||
static u8 mCurrentMtx[48];
|
||||
};
|
||||
@@ -509,8 +434,6 @@ extern "C" void init__12J3DFrameCtrlFs();
|
||||
extern "C" void checkPass__12J3DFrameCtrlFf();
|
||||
extern "C" void PSMTXCopy();
|
||||
extern "C" void PSMTXTrans();
|
||||
extern "C" void PSVECAdd();
|
||||
extern "C" void PSVECSquareMag();
|
||||
extern "C" void __construct_array();
|
||||
extern "C" void _savegpr_22();
|
||||
extern "C" void _savegpr_23();
|
||||
@@ -540,7 +463,6 @@ extern "C" extern u8 j3dSys[284];
|
||||
extern "C" u8 mCurrentMtx__6J3DSys[48];
|
||||
extern "C" u8 sincosTable___5JMath[65536];
|
||||
extern "C" extern void* calc_mtx[1 + 1 /* padding */];
|
||||
extern "C" extern u32 __float_nan;
|
||||
extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4];
|
||||
extern "C" extern u8 struct_80450C98[4];
|
||||
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
|
||||
@@ -904,55 +826,80 @@ SECTION_DATA static u8 takino2[8] = {
|
||||
/* 805BAB6C-805BABAC 0002F8 0040+00 0/1 0/0 0/0 .data cc_sph_src$6538 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 cc_sph_src[64] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x75, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00,
|
||||
static dCcD_SrcSph cc_sph_src = {
|
||||
{
|
||||
{0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj
|
||||
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
|
||||
{dCcD_SE_HARD_BODY, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
|
||||
{0x0}, // mGObjCo
|
||||
}, // mObjInf
|
||||
{
|
||||
{{0.0f, 0.0f, 0.0f}, 40.0f} // mSph
|
||||
} // mSphAttr
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 805BABAC-805BABEC 000338 0040+00 0/1 0/0 0/0 .data core_sph_src$6539 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 core_sph_src[64] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00,
|
||||
static dCcD_SrcSph core_sph_src = {
|
||||
{
|
||||
{0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x0}}, // mObj
|
||||
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
|
||||
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
|
||||
{0x0}, // mGObjCo
|
||||
}, // mObjInf
|
||||
{
|
||||
{{0.0f, 0.0f, 0.0f}, 40.0f} // mSph
|
||||
} // mSphAttr
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 805BABEC-805BAC2C 000378 0040+00 0/1 0/0 0/0 .data core_co_sph_src$6540 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 core_co_sph_src[64] = {
|
||||
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, 0x75, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00,
|
||||
static dCcD_SrcSph core_co_sph_src = {
|
||||
{
|
||||
{0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x75}}, // mObj
|
||||
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
|
||||
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
|
||||
{0x0}, // mGObjCo
|
||||
}, // mObjInf
|
||||
{
|
||||
{{0.0f, 0.0f, 0.0f}, 60.0f} // mSph
|
||||
} // mSphAttr
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 805BAC2C-805BAC6C 0003B8 0040+00 0/1 0/0 0/0 .data body_co_sph_src$6541 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 body_co_sph_src[64] = {
|
||||
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, 0x75, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00,
|
||||
static dCcD_SrcSph body_co_sph_src = {
|
||||
{
|
||||
{0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x75}}, // mObj
|
||||
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
|
||||
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
|
||||
{0x0}, // mGObjCo
|
||||
}, // mObjInf
|
||||
{
|
||||
{{0.0f, 0.0f, 0.0f}, 60.0f} // mSph
|
||||
} // mSphAttr
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
/* 805BAC6C-805BACAC 0003F8 0040+00 0/1 0/0 0/0 .data mizu_sph_src$6542 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DATA static u8 mizu_sph_src[64] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x0D, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00,
|
||||
static dCcD_SrcSph mizu_sph_src = {
|
||||
{
|
||||
{0x0, {{AT_TYPE_CSTATUE_SWING, 0x2, 0xd}, {0x0, 0x0}, 0x0}}, // mObj
|
||||
{dCcD_SE_SOFT_BODY, 0x0, 0xd, 0x0, 0x0}, // mGObjAt
|
||||
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg
|
||||
{0x0}, // mGObjCo
|
||||
}, // mObjInf
|
||||
{
|
||||
{{0.0f, 0.0f, 0.0f}, 35.0f} // mSph
|
||||
} // mSphAttr
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
@@ -1141,7 +1088,8 @@ static asm void s_fw_sub1(void* param_0, void* param_1) {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm cXyz::~cXyz() {
|
||||
// asm cXyz::~cXyz() {
|
||||
extern "C" asm void __dt__4cXyzFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/__dt__4cXyzFv.s"
|
||||
}
|
||||
@@ -2599,7 +2547,8 @@ asm b_bq_class::b_bq_class() {
|
||||
#pragma pop
|
||||
|
||||
/* 805B9D74-805B9D78 0068F4 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */
|
||||
cXyz::cXyz() {
|
||||
// cXyz::cXyz() {
|
||||
extern "C" asm void __ct__4cXyzFv() {
|
||||
/* empty function */
|
||||
}
|
||||
|
||||
@@ -2607,7 +2556,8 @@ cXyz::cXyz() {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm dCcD_Sph::dCcD_Sph() {
|
||||
// asm dCcD_Sph::dCcD_Sph() {
|
||||
extern "C" asm void __ct__8dCcD_SphFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/__ct__8dCcD_SphFv.s"
|
||||
}
|
||||
@@ -2617,7 +2567,8 @@ asm dCcD_Sph::dCcD_Sph() {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm dCcD_Sph::~dCcD_Sph() {
|
||||
// asm dCcD_Sph::~dCcD_Sph() {
|
||||
extern "C" asm void __dt__8dCcD_SphFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/__dt__8dCcD_SphFv.s"
|
||||
}
|
||||
@@ -2627,7 +2578,8 @@ asm dCcD_Sph::~dCcD_Sph() {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm cM3dGSph::~cM3dGSph() {
|
||||
// asm cM3dGSph::~cM3dGSph() {
|
||||
extern "C" asm void __dt__8cM3dGSphFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/__dt__8cM3dGSphFv.s"
|
||||
}
|
||||
@@ -2637,7 +2589,8 @@ asm cM3dGSph::~cM3dGSph() {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm cM3dGAab::~cM3dGAab() {
|
||||
// asm cM3dGAab::~cM3dGAab() {
|
||||
extern "C" asm void __dt__8cM3dGAabFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/__dt__8cM3dGAabFv.s"
|
||||
}
|
||||
@@ -2647,7 +2600,8 @@ asm cM3dGAab::~cM3dGAab() {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm dCcD_GStts::~dCcD_GStts() {
|
||||
// asm dCcD_GStts::~dCcD_GStts() {
|
||||
extern "C" asm void __dt__10dCcD_GSttsFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/__dt__10dCcD_GSttsFv.s"
|
||||
}
|
||||
@@ -2657,7 +2611,8 @@ asm dCcD_GStts::~dCcD_GStts() {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm cCcD_GStts::~cCcD_GStts() {
|
||||
// asm cCcD_GStts::~cCcD_GStts() {
|
||||
extern "C" asm void __dt__10cCcD_GSttsFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/__dt__10cCcD_GSttsFv.s"
|
||||
}
|
||||
@@ -2753,7 +2708,8 @@ asm csXyz::~csXyz() {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void cXyz::set(f32 param_0, f32 param_1, f32 param_2) {
|
||||
// asm void cXyz::set(f32 param_0, f32 param_1, f32 param_2) {
|
||||
extern "C" asm void set__4cXyzFfff() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/set__4cXyzFfff.s"
|
||||
}
|
||||
@@ -2763,7 +2719,8 @@ asm void cXyz::set(f32 param_0, f32 param_1, f32 param_2) {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void cXyz::operator=(cXyz const& param_0) {
|
||||
// asm void cXyz::operator=(cXyz const& param_0) {
|
||||
extern "C" asm void __as__4cXyzFRC4cXyz() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/__as__4cXyzFRC4cXyz.s"
|
||||
}
|
||||
@@ -2863,15 +2820,19 @@ asm void obj_ystone_class::setCurrentPos(cXyz param_0) {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm cXyz::cXyz(cXyz const& param_0) {
|
||||
// asm cXyz::cXyz(cXyz const& param_0) {
|
||||
extern "C" asm void __ct__4cXyzFRC4cXyz() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/__ct__4cXyzFRC4cXyz.s"
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 805BA26C-805BA274 -00001 0008+00 0/0 0/0 0/0 .text __ct__10JAISoundIDFUl */
|
||||
JAISoundID::JAISoundID(u32 param_0) {
|
||||
*(u32*)this = (u32)(param_0);
|
||||
// JAISoundID::JAISoundID(u32 param_0) {
|
||||
void __ct__10JAISoundIDFUl() {
|
||||
asm {
|
||||
stw r4, 0x0(r3)
|
||||
}
|
||||
}
|
||||
|
||||
/* 805BA274-805BA2E8 006DF4 0074+00 1/1 0/0 0/0 .text
|
||||
@@ -2941,7 +2902,8 @@ static asm void cM_ssin(s16 param_0) {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void cXyz::abs() const {
|
||||
// asm void cXyz::abs() const {
|
||||
extern "C" asm void abs__4cXyzCFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/abs__4cXyzCFv.s"
|
||||
}
|
||||
@@ -2991,7 +2953,8 @@ static asm void dComIfGp_getVibration() {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm cXyz::cXyz(f32 param_0, f32 param_1, f32 param_2) {
|
||||
// asm cXyz::cXyz(f32 param_0, f32 param_1, f32 param_2) {
|
||||
extern "C" asm void __ct__4cXyzFfff() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/__ct__4cXyzFfff.s"
|
||||
}
|
||||
@@ -3001,7 +2964,8 @@ asm cXyz::cXyz(f32 param_0, f32 param_1, f32 param_2) {
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void cXyz::operator+=(Vec const& param_0) {
|
||||
// asm void cXyz::operator+=(Vec const& param_0) {
|
||||
extern "C" asm void __apl__4cXyzFRC3Vec() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/__apl__4cXyzFRC3Vec.s"
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user