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

Kytag00 / Vrbox2 work, some cphase / kankyo doc (#1886)

Browse Source 
* kytag00 work

* d_a_vrbox2 close to done

* rename cPhase enum values

* some enums from noclip / kankyo doc

* remove asm

* use macro

* uncomment ok-check.yml
This commit is contained in:
TakaRikka
2023-08-16 14:32:40 -06:00
committed by GitHub
parent 7fd7d0c1f3
commit 114582643f
42 changed files with 1534 additions and 968 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ok-check.yml
+38 -38
View File
@@ -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
asm/rel/d/a/d_a_vrbox2/d_a_vrbox2/__dt__12J3DFrameCtrlFv.s
-20
View File
@@ -1,20 +0,0 @@
lbl_80499A1C:
/* 80499A1C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80499A20 7C 08 02 A6 */ mflr r0
/* 80499A24 90 01 00 14 */ stw r0, 0x14(r1)
/* 80499A28 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80499A2C 7C 7F 1B 79 */ or. r31, r3, r3
/* 80499A30 41 82 00 1C */ beq lbl_80499A4C
/* 80499A34 3C A0 80 4A */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80499B68@ha */
/* 80499A38 38 05 9B 68 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80499B68@l */
/* 80499A3C 90 1F 00 00 */ stw r0, 0(r31)
/* 80499A40 7C 80 07 35 */ extsh. r0, r4
/* 80499A44 40 81 00 08 */ ble lbl_80499A4C
/* 80499A48 4B E3 52 F5 */ bl __dl__FPv
lbl_80499A4C:
/* 80499A4C 7F E3 FB 78 */ mr r3, r31
/* 80499A50 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80499A54 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80499A58 7C 08 03 A6 */ mtlr r0
/* 80499A5C 38 21 00 10 */ addi r1, r1, 0x10
/* 80499A60 4E 80 00 20 */ blr
asm/rel/d/a/d_a_vrbox2/d_a_vrbox2/daVrbox2_Create__FP10fopAc_ac_c.s
-45
View File
@@ -1,45 +0,0 @@
lbl_80499978:
/* 80499978 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8049997C 7C 08 02 A6 */ mflr r0
/* 80499980 90 01 00 14 */ stw r0, 0x14(r1)
/* 80499984 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80499988 93 C1 00 08 */ stw r30, 8(r1)
/* 8049998C 7C 7E 1B 78 */ mr r30, r3
/* 80499990 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 80499994 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 80499998 40 82 00 40 */ bne lbl_804999D8
/* 8049999C 7F C0 F3 79 */ or. r0, r30, r30
/* 804999A0 41 82 00 2C */ beq lbl_804999CC
/* 804999A4 7C 1F 03 78 */ mr r31, r0
/* 804999A8 4B B7 F1 BD */ bl __ct__10fopAc_ac_cFv
/* 804999AC 3C 60 80 4A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x80499B68@ha */
/* 804999B0 38 03 9B 68 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x80499B68@l */
/* 804999B4 94 1F 05 80 */ stwu r0, 0x580(r31)
/* 804999B8 7F E3 FB 78 */ mr r3, r31
/* 804999BC 38 80 00 00 */ li r4, 0
/* 804999C0 4B E8 EA 3D */ bl init__12J3DFrameCtrlFs
/* 804999C4 38 00 00 00 */ li r0, 0
/* 804999C8 90 1F 00 14 */ stw r0, 0x14(r31)
lbl_804999CC:
/* 804999CC 80 1E 04 A0 */ lwz r0, 0x4a0(r30)
/* 804999D0 60 00 00 08 */ ori r0, r0, 8
/* 804999D4 90 1E 04 A0 */ stw r0, 0x4a0(r30)
lbl_804999D8:
/* 804999D8 3B E0 00 04 */ li r31, 4
/* 804999DC 7F C3 F3 78 */ mr r3, r30
/* 804999E0 3C 80 80 4A */ lis r4, daVrbox2_solidHeapCB__FP10fopAc_ac_c@ha /* 0x8049983C@ha */
/* 804999E4 38 84 98 3C */ addi r4, r4, daVrbox2_solidHeapCB__FP10fopAc_ac_c@l /* 0x8049983C@l */
/* 804999E8 3C A0 80 00 */ lis r5, 0x8000 /* 0x80004340@ha */
/* 804999EC 38 A5 43 40 */ addi r5, r5, 0x4340 /* 0x80004340@l */
/* 804999F0 4B B8 0A C1 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl
/* 804999F4 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 804999F8 40 82 00 08 */ bne lbl_80499A00
/* 804999FC 3B E0 00 05 */ li r31, 5
lbl_80499A00:
/* 80499A00 7F E3 FB 78 */ mr r3, r31
/* 80499A04 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80499A08 83 C1 00 08 */ lwz r30, 8(r1)
/* 80499A0C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80499A10 7C 08 03 A6 */ mtlr r0
/* 80499A14 38 21 00 10 */ addi r1, r1, 0x10
/* 80499A18 4E 80 00 20 */ blr
asm/rel/d/a/d_a_vrbox2/d_a_vrbox2/daVrbox2_Execute__FP12vrbox2_class.s
-19
View File
@@ -1,19 +0,0 @@
lbl_804997E8:
/* 804997E8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 804997EC 7C 08 02 A6 */ mflr r0
/* 804997F0 90 01 00 14 */ stw r0, 0x14(r1)
/* 804997F4 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */
/* 804997F8 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */
/* 804997FC C0 24 12 44 */ lfs f1, 0x1244(r4)
/* 80499800 3C 80 80 4A */ lis r4, lit_3837@ha /* 0x80499A7C@ha */
/* 80499804 C0 04 9A 7C */ lfs f0, lit_3837@l(r4) /* 0x80499A7C@l */
/* 80499808 FC 01 00 40 */ fcmpo cr0, f1, f0
/* 8049980C 40 81 00 0C */ ble lbl_80499818
/* 80499810 38 63 05 80 */ addi r3, r3, 0x580
/* 80499814 4B B7 3C 15 */ bl play__14mDoExt_baseAnmFv
lbl_80499818:
/* 80499818 38 60 00 01 */ li r3, 1
/* 8049981C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80499820 7C 08 03 A6 */ mtlr r0
/* 80499824 38 21 00 10 */ addi r1, r1, 0x10
/* 80499828 4E 80 00 20 */ blr
asm/rel/d/a/d_a_vrbox2/d_a_vrbox2/daVrbox2_solidHeapCB__FP10fopAc_ac_c.s
-84
View File
@@ -1,84 +0,0 @@
lbl_8049983C:
/* 8049983C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80499840 7C 08 02 A6 */ mflr r0
/* 80499844 90 01 00 14 */ stw r0, 0x14(r1)
/* 80499848 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8049984C 93 C1 00 08 */ stw r30, 8(r1)
/* 80499850 7C 7F 1B 78 */ mr r31, r3
/* 80499854 3C 60 80 4A */ lis r3, d_a_vrbox2__stringBase0@ha /* 0x80499AC4@ha */
/* 80499858 38 63 9A C4 */ addi r3, r3, d_a_vrbox2__stringBase0@l /* 0x80499AC4@l */
/* 8049985C 38 63 00 17 */ addi r3, r3, 0x17
/* 80499860 4B B9 5B D5 */ bl dComIfG_getStageRes__FPCc
/* 80499864 3C 80 00 08 */ lis r4, 8
/* 80499868 3C A0 11 02 */ lis r5, 0x1102 /* 0x11020202@ha */
/* 8049986C 38 A5 02 02 */ addi r5, r5, 0x0202 /* 0x11020202@l */
/* 80499870 4B B7 B3 E5 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl
/* 80499874 90 7F 05 6C */ stw r3, 0x56c(r31)
/* 80499878 3C 60 80 4A */ lis r3, d_a_vrbox2__stringBase0@ha /* 0x80499AC4@ha */
/* 8049987C 38 63 9A C4 */ addi r3, r3, d_a_vrbox2__stringBase0@l /* 0x80499AC4@l */
/* 80499880 38 63 00 26 */ addi r3, r3, 0x26
/* 80499884 4B B9 5B B1 */ bl dComIfG_getStageRes__FPCc
/* 80499888 7C 7E 1B 79 */ or. r30, r3, r3
/* 8049988C 41 82 00 78 */ beq lbl_80499904
/* 80499890 3C 80 00 08 */ lis r4, 8
/* 80499894 3C A0 11 02 */ lis r5, 0x1102 /* 0x11020202@ha */
/* 80499898 38 A5 02 02 */ addi r5, r5, 0x0202 /* 0x11020202@l */
/* 8049989C 4B B7 B3 B9 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl
/* 804998A0 90 7F 05 74 */ stw r3, 0x574(r31)
/* 804998A4 7F C3 F3 78 */ mr r3, r30
/* 804998A8 3C 80 00 08 */ lis r4, 8
/* 804998AC 3C A0 11 02 */ lis r5, 0x1102 /* 0x11020202@ha */
/* 804998B0 38 A5 02 02 */ addi r5, r5, 0x0202 /* 0x11020202@l */
/* 804998B4 4B B7 B3 A1 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl
/* 804998B8 90 7F 05 78 */ stw r3, 0x578(r31)
/* 804998BC 3C 60 80 4A */ lis r3, d_a_vrbox2__stringBase0@ha /* 0x80499AC4@ha */
/* 804998C0 38 63 9A C4 */ addi r3, r3, d_a_vrbox2__stringBase0@l /* 0x80499AC4@l */
/* 804998C4 38 63 00 34 */ addi r3, r3, 0x34
/* 804998C8 4B B9 5B 6D */ bl dComIfG_getStageRes__FPCc
/* 804998CC 7C 65 1B 78 */ mr r5, r3
/* 804998D0 38 7F 05 80 */ addi r3, r31, 0x580
/* 804998D4 38 9E 00 58 */ addi r4, r30, 0x58
/* 804998D8 38 C0 00 01 */ li r6, 1
/* 804998DC 38 E0 00 02 */ li r7, 2
/* 804998E0 3D 00 80 4A */ lis r8, lit_3627@ha /* 0x80499A6C@ha */
/* 804998E4 C0 28 9A 6C */ lfs f1, lit_3627@l(r8) /* 0x80499A6C@l */
/* 804998E8 39 00 00 00 */ li r8, 0
/* 804998EC 39 20 FF FF */ li r9, -1
/* 804998F0 4B B7 3D 4D */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss
/* 804998F4 2C 03 00 00 */ cmpwi r3, 0
/* 804998F8 40 82 00 0C */ bne lbl_80499904
/* 804998FC 38 60 00 00 */ li r3, 0
/* 80499900 48 00 00 60 */ b lbl_80499960
lbl_80499904:
/* 80499904 3C 60 80 4A */ lis r3, d_a_vrbox2__stringBase0@ha /* 0x80499AC4@ha */
/* 80499908 38 63 9A C4 */ addi r3, r3, d_a_vrbox2__stringBase0@l /* 0x80499AC4@l */
/* 8049990C 38 63 00 42 */ addi r3, r3, 0x42
/* 80499910 4B B9 5B 25 */ bl dComIfG_getStageRes__FPCc
/* 80499914 28 03 00 00 */ cmplwi r3, 0
/* 80499918 41 82 00 18 */ beq lbl_80499930
/* 8049991C 3C 80 00 08 */ lis r4, 8
/* 80499920 3C A0 11 02 */ lis r5, 0x1102 /* 0x11020202@ha */
/* 80499924 38 A5 02 02 */ addi r5, r5, 0x0202 /* 0x11020202@l */
/* 80499928 4B B7 B3 2D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl
/* 8049992C 90 7F 05 98 */ stw r3, 0x598(r31)
lbl_80499930:
/* 80499930 38 60 00 00 */ li r3, 0
/* 80499934 80 1F 05 6C */ lwz r0, 0x56c(r31)
/* 80499938 28 00 00 00 */ cmplwi r0, 0
/* 8049993C 41 82 00 20 */ beq lbl_8049995C
/* 80499940 80 1F 05 74 */ lwz r0, 0x574(r31)
/* 80499944 28 00 00 00 */ cmplwi r0, 0
/* 80499948 41 82 00 14 */ beq lbl_8049995C
/* 8049994C 80 1F 05 78 */ lwz r0, 0x578(r31)
/* 80499950 28 00 00 00 */ cmplwi r0, 0
/* 80499954 41 82 00 08 */ beq lbl_8049995C
/* 80499958 38 60 00 01 */ li r3, 1
lbl_8049995C:
/* 8049995C 54 63 06 3E */ clrlwi r3, r3, 0x18
lbl_80499960:
/* 80499960 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80499964 83 C1 00 08 */ lwz r30, 8(r1)
/* 80499968 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8049996C 7C 08 03 A6 */ mtlr r0
/* 80499970 38 21 00 10 */ addi r1, r1, 0x10
/* 80499974 4E 80 00 20 */ blr
asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/daKytag00_Delete__FP13kytag00_class.s
-19
View File
@@ -1,19 +0,0 @@
lbl_8046C774:
/* 8046C774 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8046C778 7C 08 02 A6 */ mflr r0
/* 8046C77C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8046C780 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8046C784 7C 7F 1B 78 */ mr r31, r3
/* 8046C788 4B FF F2 55 */ bl wether_tag_reset__FP13kytag00_class
/* 8046C78C 7F E3 FB 78 */ mr r3, r31
/* 8046C790 4B FF F6 29 */ bl wether_tag_efect_reset__FP13kytag00_class
/* 8046C794 38 00 00 00 */ li r0, 0
/* 8046C798 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 8046C79C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 8046C7A0 90 03 0E B8 */ stw r0, 0xeb8(r3)
/* 8046C7A4 38 60 00 01 */ li r3, 1
/* 8046C7A8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8046C7AC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8046C7B0 7C 08 03 A6 */ mtlr r0
/* 8046C7B4 38 21 00 10 */ addi r1, r1, 0x10
/* 8046C7B8 4E 80 00 20 */ blr
asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/daKytag00_Draw__FP13kytag00_class.s
-10
View File
@@ -1,10 +0,0 @@
lbl_8046C660:
/* 8046C660 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8046C664 7C 08 02 A6 */ mflr r0
/* 8046C668 90 01 00 14 */ stw r0, 0x14(r1)
/* 8046C66C 4B FF F8 4D */ bl wether_tag_efect_move__FP13kytag00_class
/* 8046C670 38 60 00 01 */ li r3, 1
/* 8046C674 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8046C678 7C 08 03 A6 */ mtlr r0
/* 8046C67C 38 21 00 10 */ addi r1, r1, 0x10
/* 8046C680 4E 80 00 20 */ blr
asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/raincnt_cut__Fv.s
-6
View File
@@ -1,6 +0,0 @@
lbl_8046BDA4:
/* 8046BDA4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 8046BDA8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 8046BDAC 80 03 12 9C */ lwz r0, 0x129c(r3)
/* 8046BDB0 90 03 0E 80 */ stw r0, 0xe80(r3)
/* 8046BDB4 4E 80 00 20 */ blr
asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/raincnt_set__Ff.s
-19
View File
@@ -1,19 +0,0 @@
lbl_8046BD60:
/* 8046BD60 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8046BD64 3C 60 80 47 */ lis r3, lit_3918@ha /* 0x8046C9B8@ha */
/* 8046BD68 C0 43 C9 B8 */ lfs f2, lit_3918@l(r3) /* 0x8046C9B8@l */
/* 8046BD6C EC 01 00 72 */ fmuls f0, f1, f1
/* 8046BD70 EC 01 00 32 */ fmuls f0, f1, f0
/* 8046BD74 EC 02 00 32 */ fmuls f0, f2, f0
/* 8046BD78 FC 00 00 1E */ fctiwz f0, f0
/* 8046BD7C D8 01 00 08 */ stfd f0, 8(r1)
/* 8046BD80 80 81 00 0C */ lwz r4, 0xc(r1)
/* 8046BD84 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 8046BD88 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 8046BD8C 80 03 12 9C */ lwz r0, 0x129c(r3)
/* 8046BD90 7C 04 00 00 */ cmpw r4, r0
/* 8046BD94 40 81 00 08 */ ble lbl_8046BD9C
/* 8046BD98 90 83 0E 80 */ stw r4, 0xe80(r3)
lbl_8046BD9C:
/* 8046BD9C 38 21 00 10 */ addi r1, r1, 0x10
/* 8046BDA0 4E 80 00 20 */ blr
asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/wether_tag_efect_reset__FP13kytag00_class.s
-75
View File
@@ -1,75 +0,0 @@
lbl_8046BDB8:
/* 8046BDB8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8046BDBC 7C 08 02 A6 */ mflr r0
/* 8046BDC0 90 01 00 14 */ stw r0, 0x14(r1)
/* 8046BDC4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8046BDC8 7C 7F 1B 78 */ mr r31, r3
/* 8046BDCC 38 80 00 00 */ li r4, 0
/* 8046BDD0 98 83 05 6C */ stb r4, 0x56c(r3)
/* 8046BDD4 88 03 05 70 */ lbz r0, 0x570(r3)
/* 8046BDD8 28 00 00 12 */ cmplwi r0, 0x12
/* 8046BDDC 41 81 00 C8 */ bgt lbl_8046BEA4
/* 8046BDE0 3C 60 80 47 */ lis r3, lit_3957@ha /* 0x8046C9E0@ha */
/* 8046BDE4 38 63 C9 E0 */ addi r3, r3, lit_3957@l /* 0x8046C9E0@l */
/* 8046BDE8 54 00 10 3A */ slwi r0, r0, 2
/* 8046BDEC 7C 03 00 2E */ lwzx r0, r3, r0
/* 8046BDF0 7C 09 03 A6 */ mtctr r0
/* 8046BDF4 4E 80 04 20 */ bctr
lbl_8046BDF8:
/* 8046BDF8 4B FF FF AD */ bl raincnt_cut__Fv
/* 8046BDFC 48 00 00 A8 */ b lbl_8046BEA4
lbl_8046BE00:
/* 8046BE00 38 00 00 00 */ li r0, 0
/* 8046BE04 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 8046BE08 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 8046BE0C 90 03 0E 8C */ stw r0, 0xe8c(r3)
/* 8046BE10 90 03 0E B8 */ stw r0, 0xeb8(r3)
/* 8046BE14 48 00 00 90 */ b lbl_8046BEA4
lbl_8046BE18:
/* 8046BE18 38 00 00 00 */ li r0, 0
/* 8046BE1C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 8046BE20 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 8046BE24 90 03 0E AC */ stw r0, 0xeac(r3)
/* 8046BE28 98 03 0E A9 */ stb r0, 0xea9(r3)
/* 8046BE2C 48 00 00 78 */ b lbl_8046BEA4
lbl_8046BE30:
/* 8046BE30 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 8046BE34 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 8046BE38 80 03 0E D8 */ lwz r0, 0xed8(r3)
/* 8046BE3C 2C 00 00 02 */ cmpwi r0, 2
/* 8046BE40 40 82 00 0C */ bne lbl_8046BE4C
/* 8046BE44 38 00 00 00 */ li r0, 0
/* 8046BE48 90 03 0E D8 */ stw r0, 0xed8(r3)
lbl_8046BE4C:
/* 8046BE4C 88 1F 05 70 */ lbz r0, 0x570(r31)
/* 8046BE50 28 00 00 08 */ cmplwi r0, 8
/* 8046BE54 41 82 00 0C */ beq lbl_8046BE60
/* 8046BE58 28 00 00 09 */ cmplwi r0, 9
/* 8046BE5C 40 82 00 08 */ bne lbl_8046BE64
lbl_8046BE60:
/* 8046BE60 4B FF FF 45 */ bl raincnt_cut__Fv
lbl_8046BE64:
/* 8046BE64 88 1F 05 70 */ lbz r0, 0x570(r31)
/* 8046BE68 28 00 00 09 */ cmplwi r0, 9
/* 8046BE6C 40 82 00 38 */ bne lbl_8046BEA4
/* 8046BE70 38 00 00 00 */ li r0, 0
/* 8046BE74 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 8046BE78 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 8046BE7C 90 03 0E B8 */ stw r0, 0xeb8(r3)
/* 8046BE80 48 00 00 24 */ b lbl_8046BEA4
lbl_8046BE84:
/* 8046BE84 38 00 00 00 */ li r0, 0
/* 8046BE88 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 8046BE8C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 8046BE90 90 03 0E B8 */ stw r0, 0xeb8(r3)
/* 8046BE94 48 00 00 10 */ b lbl_8046BEA4
lbl_8046BE98:
/* 8046BE98 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 8046BE9C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 8046BEA0 90 83 10 48 */ stw r4, 0x1048(r3)
lbl_8046BEA4:
/* 8046BEA4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8046BEA8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8046BEAC 7C 08 03 A6 */ mtlr r0
/* 8046BEB0 38 21 00 10 */ addi r1, r1, 0x10
/* 8046BEB4 4E 80 00 20 */ blr
asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/wether_tag_reset__FP13kytag00_class.s
-14
View File
@@ -1,14 +0,0 @@
lbl_8046B9DC:
/* 8046B9DC 38 00 00 00 */ li r0, 0
/* 8046B9E0 98 03 05 6D */ stb r0, 0x56d(r3)
/* 8046B9E4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 8046B9E8 38 83 CA 54 */ addi r4, r3, g_env_light@l /* 0x8042CA54@l */
/* 8046B9EC 88 04 12 C8 */ lbz r0, 0x12c8(r4)
/* 8046B9F0 98 04 12 C4 */ stb r0, 0x12c4(r4)
/* 8046B9F4 98 04 12 C5 */ stb r0, 0x12c5(r4)
/* 8046B9F8 3C 60 80 47 */ lis r3, lit_3798@ha /* 0x8046C980@ha */
/* 8046B9FC C0 03 C9 80 */ lfs f0, lit_3798@l(r3) /* 0x8046C980@l */
/* 8046BA00 D0 04 11 E0 */ stfs f0, 0x11e0(r4)
/* 8046BA04 38 00 00 01 */ li r0, 1
/* 8046BA08 98 04 12 CE */ stb r0, 0x12ce(r4)
/* 8046BA0C 4E 80 00 20 */ blr
include/JSystem/J3DGraphAnimator/J3DAnimation.h
+8
View File
@@ -588,6 +588,14 @@ private:
class J3DFrameCtrl {
public:
enum Attribute_e {
LOOP_ONCE_e,
LOOP_ONCE_RESET_e,
LOOP_REPEAT_e,
LOOP_MIRROR_ONCE_e,
LOOP_MIRROR_REPEAT_e,
};
J3DFrameCtrl() { this->init(0); }
void init(s16);
BOOL checkPass(f32);
include/SSystem/SComponent/c_phase.h
+4 -5
View File
@@ -5,13 +5,12 @@
typedef int (*cPhs__Handler)(void*);
enum cPhs__Step {
/* 0x0 */ cPhs_ZERO_e,
/* 0x1 */ cPhs_ONE_e, // next?
/* 0x2 */ cPhs_TWO_e, // ready?
/* 0x3 */ cPhs_UNK3_e,
/* 0x0 */ cPhs_INIT_e,
/* 0x1 */ cPhs_LOADING_e,
/* 0x2 */ cPhs_NEXT_e,
/* 0x3 */ cPhs_UNK3_e, // appears to be an alternate error code, unsure how it differs
/* 0x4 */ cPhs_COMPLEATE_e,
/* 0x5 */ cPhs_ERROR_e,
/* 0x6 */ cPhs_NEXT_e,
};
typedef struct request_of_phase_process_class {
include/d/d_stage.h
+36 -29
View File
@@ -16,12 +16,12 @@ struct stage_vrboxcol_info_class {
// Virt
struct stage_vrbox_info_class {
/* 0x00 */ GXColor field_0x0;
/* 0x04 */ GXColor field_0x4;
/* 0x08 */ color_RGB_class field_0x8;
/* 0x0B */ color_RGB_class field_0xb;
/* 0x0E */ color_RGB_class field_0xe;
/* 0x11 */ color_RGB_class field_0x11;
/* 0x00 */ color_RGB_class field_0x0;
/* 0x03 */ color_RGB_class field_0x3;
/* 0x06 */ color_RGB_class field_0x6;
/* 0x09 */ GXColor field_0x9;
/* 0x0D */ GXColor field_0xd;
/* 0x11 */ GXColor field_0x11;
}; // Size: 0x15
class stage_tresure_class {
@@ -86,7 +86,13 @@ struct stage_scls_info_dummy_class {
struct stage_pure_lightvec_info_class {
// LGT
/* 0x00 */ u8 field_0x0[0x1E - 0x0];
/* 0x00 */ Vec m_position;
/* 0x0C */ f32 m_radius;
/* 0x10 */ f32 m_directionX;
/* 0x14 */ f32 m_directionY;
/* 0x18 */ f32 m_spotCutoff;
/* 0x1C */ u8 field_0x1c;
/* 0x1D */ u8 field_0x1d;
/* 0x1E */ u8 field_0x1e;
/* 0x1F */ u8 field_0x1f;
}; // Size: 0x20
@@ -99,27 +105,28 @@ struct stage_pselect_info_class {
struct stage_plight_info_class {
// LGHT
};
/* 0x00 */ Vec m_position;
/* 0x0C */ f32 m_radius;
/* 0x10 */ u8 field_0x10[0x18 - 0x10];
/* 0x18 */ GXColor m_color;
}; // Size: 0x1C
// PALE
struct stage_palette_info_class {
/* 0x00 */ color_RGB_class mActor_C0;
/* 0x03 */ color_RGB_class mActor_K0;
/* 0x06 */ color_RGB_class mBG0_C0;
/* 0x09 */ color_RGB_class mBG0_K0;
/* 0x0C */ color_RGB_class mBG1_C0;
/* 0x0F */ color_RGB_class mBG1_K0;
/* 0x12 */ color_RGB_class mBG2_C0;
/* 0x15 */ color_RGB_class mBG2_K0;
/* 0x18 */ color_RGB_class mBG3_C0;
/* 0x1B */ color_RGB_class mBG3_K0;
/* 0x1E */ color_RGB_class mFog;
/* 0x21 */ u8 mVirtIdx;
/* 0x22 */ u8 field_0x22;
/* 0x23 */ u8 field_0x23;
/* 0x00 */ color_RGB_class mActorAmbColor;
/* 0x03 */ color_RGB_class mBgAmbColor[4];
/* 0x0F */ color_RGB_class mPlightColor[6];
/* 0x21 */ color_RGB_class mFogColor;
/* 0x24 */ f32 mFogStartZ;
/* 0x28 */ f32 mFogEndZ;
/* 0x2C */ u8 field_0x2c[8];
/* 0x2C */ u8 mVirtIdx;
/* 0x2D */ u8 mTerrainLightInfluence;
/* 0x2E */ u8 mCloudShadowDensity;
/* 0x2F */ u8 field_0x2f;
/* 0x30 */ u8 mBloomTblIdx;
/* 0x31 */ u8 mBgAmbColor1A;
/* 0x32 */ u8 mBgAmbColor2A;
/* 0x33 */ u8 mBgAmbColor3A;
}; // Size: 0x34
struct stage_map_info_class {
@@ -134,7 +141,7 @@ struct stage_map_info_dummy_class {
};
struct stage_envr_info_class {
/* 0x0 */ u8 field_0x0[0x41];
/* 0x0 */ u8 m_pselectID[65];
}; // Size: 0x41
struct stage_camera2_data_class {
@@ -295,13 +302,13 @@ struct dStage_Lbnk_c {
// LBNK
};
struct dStage_Elst_c {
struct unkData {
u8 field_0x0[15];
struct dStage_Elst_data {
/* 0x0 */ u8 m_layerTable[15];
};
/* 0x0 */ int field_0x0;
/* 0x4 */ unkData* field_0x4;
struct dStage_Elst_c {
/* 0x0 */ int m_entryNum;
/* 0x4 */ dStage_Elst_data* m_entries;
};
struct dStage_MemoryConfig_data {
include/d/kankyo/d_kankyo.h
+27 -12
View File
@@ -398,17 +398,14 @@ public:
/* 0x1094 */ cXyz mMoonPos;
/* 0x10A0 */ cXyz field_0x10a0;
/* 0x10AC */ GXFogAdjTable mXFogTbl;
/* 0x10C0 */ GXColorS10 mSkyColor;
/* 0x10C8 */ GXColorS10 mUpperCloudColor;
/* 0x10D0 */ GXColorS10 mUnderCloudColor;
/* 0x10D8 */ GXColorS10 mUnderCloudShadowColor;
/* 0x10E0 */ GXColorS10 mCloudOuterHazeColor;
/* 0x10E8 */ GXColorS10 mCloudInnerHazeColor;
/* 0x10C0 */ GXColorS10 mVrSkyCol;
/* 0x10C8 */ GXColorS10 mVrkumoCol;
/* 0x10D0 */ GXColorS10 mVrShitaGumoCol;
/* 0x10D8 */ GXColorS10 mVrShitaUneiCol;
/* 0x10E0 */ GXColorS10 mVrKasumiCol;
/* 0x10E8 */ GXColorS10 mVrOkuKasumiCol;
/* 0x10F0 */ GXColorS10 field_0x10f0;
/* 0x10F8 */ s16 field_0x10f8;
/* 0x10FA */ s16 field_0x10fa;
/* 0x10FC */ s16 field_0x10fc;
/* 0x10FE */ s16 field_0x10fe;
/* 0x10F8 */ GXColorS10 field_0x10f8;
/* 0x1100 */ GXColorS10 mActorAmbience;
/* 0x1108 */ GXColorS10 mTerrainAmbienceBG0;
/* 0x1110 */ GXColorS10 mTerrainAmbienceBG1;
@@ -496,7 +493,7 @@ public:
/* 0x12C3 */ u8 mColPatCurr;
/* 0x12C4 */ u8 mColpatPrevGather;
/* 0x12C5 */ u8 mColpatCurrGather;
/* 0x12C6 */ s8 mNowRoom;
/* 0x12C6 */ u8 mEnvrIdxPrev;
/* 0x12C7 */ u8 mEnvrIdxCurr;
/* 0x12C8 */ u8 mColpatWeather;
/* 0x12C9 */ u8 mDiceWeatherMode;
@@ -528,7 +525,7 @@ public:
/* 0x12FB */ u8 field_0x12fb;
/* 0x12FC */ s8 field_0x12fc;
/* 0x12FD */ u8 mDarktimeWeek;
/* 0x12FE */ u8 field_0x12fe;
/* 0x12FE */ u8 mPondSeason;
/* 0x1300 */ s16 field_0x1300;
/* 0x1302 */ s16 field_0x1302;
/* 0x1304 */ f32 mWaterSurfaceShineRate;
@@ -547,6 +544,24 @@ inline dScnKy_env_light_c* i_dKy_getEnvlight() {
return &g_env_light;
}
enum dKy_dice_wether_mode {
DICE_MODE_SUNNY_e,
DICE_MODE_CLOUDY_e,
DICE_MODE_RAIN_LIGHT_e,
DICE_MODE_RAIN_HEAVY_e,
DICE_MODE_THUNDER_LIGHT_e,
DICE_MODE_THUNDER_HEAVY_e,
DICE_MODE_UNK6_e,
DICE_MODE_DONE_e = 0xFF,
};
enum dKy_dice_wether_state {
DICE_STATE_RESET_e,
DICE_STATE_INIT_e,
DICE_STATE_EXEC_e,
DICE_STATE_NEXT_e,
};
u8 dKy_darkworld_stage_check(char const*, int);
BOOL dKy_withwarp_capture_check();
bool dKy_darkworld_check();
include/d/kankyo/d_kankyo_wether.h
+3 -3
View File
@@ -45,8 +45,8 @@ public:
/* 0x40 */ u8* mpResMoon_A_A03;
/* 0x44 */ u32 field_0x44[5];
/* 0x58 */ int field_0x58;
/* 0x5C */ f32 field_0x5c;
/* 0x60 */ f32 field_0x60;
/* 0x5C */ f32 mVisibility;
/* 0x60 */ f32 mSunAlpha;
/* 0x64 */ f32 field_0x64;
/* 0x68 */ f32 field_0x68;
/* 0x6C */ f32 field_0x6c;
@@ -70,7 +70,7 @@ public:
/* 0x8C */ f32 field_0x8c;
/* 0x90 */ f32 field_0x90;
/* 0x94 */ f32 field_0x94;
/* 0x98 */ f32 field_0x98;
/* 0x98 */ f32 mDistFalloff;
/* 0x9C */ u8 field_0x9c[2];
/* 0x9E */ bool mDrawLenzInSky;
}; // Size: 0xA0
include/m_Do/m_Do_audio.h
+4
View File
@@ -115,6 +115,10 @@ inline void mDoAud_heartGaugeOn() {
Z2AudioMgr::getInterface()->mStatusMgr.heartGaugeOn();
}
inline void mDoAud_setSnowPower(s8 i_power) {
g_mEnvSeMgr.setSnowPower(i_power);
}
inline void mDoAud_setFogWipeWidth(f32 i_width) {
g_mEnvSeMgr.setFogWipeWidth(i_width);
}
include/rel/d/a/d_a_vrbox2/d_a_vrbox2.h
+1 -1
View File
@@ -1,6 +1,6 @@
#ifndef D_A_VRBOX2_H
#define D_A_VRBOX2_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#endif /* D_A_VRBOX2_H */
include/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.h
+19 -1
View File
@@ -1,6 +1,24 @@
#ifndef D_A_KYTAG00_H
#define D_A_KYTAG00_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class kytag00_class : public fopAc_ac_c {
public:
/* 0x568 */ u8 field_0x568[0x56C - 0x568];
/* 0x56C */ u8 field_0x56c;
/* 0x56D */ u8 field_0x56d;
/* 0x56E */ u8 field_0x56e;
/* 0x56F */ u8 field_0x56f;
/* 0x570 */ u8 field_0x570;
/* 0x571 */ u8 field_0x571;
/* 0x572 */ u8 field_0x572;
/* 0x573 */ u8 field_0x573[0x578 - 0x573];
/* 0x578 */ int field_0x578;
/* 0x57C */ int field_0x57c;
/* 0x580 */ f32 field_0x580;
/* 0x584 */ f32 field_0x584;
/* 0x588 */ f32 field_0x588;
};
#endif /* D_A_KYTAG00_H */
libs/SSystem/SComponent/c_phase.cpp
+6 -6
View File
@@ -17,14 +17,14 @@ extern "C" static void cPhs_Next__FP30request_of_phase_process_class();
/* 80266624-80266630 000C+00 s=1 e=2 z=0 None .text
* cPhs_Reset__FP30request_of_phase_process_class */
void cPhs_Reset(request_of_phase_process_class* pPhase) {
pPhase->id = cPhs_ZERO_e;
pPhase->id = cPhs_INIT_e;
}
/* 80266630-80266640 0010+00 s=0 e=3 z=0 None .text
* cPhs_Set__FP30request_of_phase_process_classPPFPv_i */
void cPhs_Set(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable) {
pPhase->mpHandlerTable = pHandlerTable;
pPhase->id = cPhs_ZERO_e;
pPhase->id = cPhs_INIT_e;
}
/* 80266640-80266668 0028+00 s=1 e=0 z=0 None .text
@@ -53,7 +53,7 @@ int cPhs_Next(request_of_phase_process_class* pPhase) {
if (handler == NULL || handler == NULL) {
return cPhs_Compleate(pPhase);
} else {
return cPhs_ONE_e;
return cPhs_LOADING_e;
}
}
@@ -69,10 +69,10 @@ int cPhs_Do(request_of_phase_process_class* pPhase, void* pUserData) {
int newStep = pPhase->mpHandlerTable[pPhase->id](pUserData);
switch (newStep) {
case cPhs_ONE_e:
case cPhs_LOADING_e:
return cPhs_Next(pPhase);
case cPhs_TWO_e:
return cPhs_Next(pPhase) == cPhs_ONE_e ? cPhs_TWO_e : cPhs_COMPLEATE_e;
case cPhs_NEXT_e:
return cPhs_Next(pPhase) == cPhs_LOADING_e ? cPhs_NEXT_e : cPhs_COMPLEATE_e;
case cPhs_COMPLEATE_e:
return cPhs_Compleate(pPhase);
case cPhs_UNK3_e:

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