PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix symbols in CEulerAngles, add correct extab references to calcprogress

This commit is contained in:
Phillip Stephens 2022-10-16 23:05:04 -07:00
parent 608f103163
commit 9200d573f1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/MetroidPrime/CAutoMapper.s
View File

@ -5023,7 +5023,7 @@ lbl_80099984:
/* 80099994 000968F4 4B F7 0F D5 */ bl GetCurrentCameraTransform__14CCameraManagerCFRC13CStateManager /* 80099994 000968F4 4B F7 0F D5 */ bl GetCurrentCameraTransform__14CCameraManagerCFRC13CStateManager
/* 80099998 000968F8 38 61 00 C8 */ addi r3, r1, 0xc8 /* 80099998 000968F8 38 61 00 C8 */ addi r3, r1, 0xc8
/* 8009999C 000968FC 38 81 03 A0 */ addi r4, r1, 0x3a0 /* 8009999C 000968FC 38 81 03 A0 */ addi r4, r1, 0x3a0
/* 800999A0 00096900 4B F8 1E 61 */ bl sub_8001b800 /* 800999A0 00096900 4B F8 1E 61 */ bl FromMatrix3f__12CEulerAnglesFRC9CMatrix3f
/* 800999A4 00096904 C0 81 00 D0 */ lfs f4, 0xd0(r1) /* 800999A4 00096904 C0 81 00 D0 */ lfs f4, 0xd0(r1)
/* 800999A8 00096908 3C 00 43 30 */ lis r0, 0x4330 /* 800999A8 00096908 3C 00 43 30 */ lis r0, 0x4330
/* 800999AC 0009690C C0 02 8B A4 */ lfs f0, lbl_805AA8C4@sda21(r2) /* 800999AC 0009690C C0 02 8B A4 */ lfs f0, lbl_805AA8C4@sda21(r2)

10
asm/MetroidPrime/CEulerAngles.s
View File

@ -207,8 +207,8 @@ lbl_8001B7C4:
/* 8001B7F8 00018758 38 21 00 60 */ addi r1, r1, 0x60 /* 8001B7F8 00018758 38 21 00 60 */ addi r1, r1, 0x60
/* 8001B7FC 0001875C 4E 80 00 20 */ blr /* 8001B7FC 0001875C 4E 80 00 20 */ blr
.global sub_8001b800 .global FromMatrix3f__12CEulerAnglesFRC9CMatrix3f
sub_8001b800: FromMatrix3f__12CEulerAnglesFRC9CMatrix3f:
/* 8001B800 00018760 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8001B800 00018760 94 21 FF 90 */ stwu r1, -0x70(r1)
/* 8001B804 00018764 7C 08 02 A6 */ mflr r0 /* 8001B804 00018764 7C 08 02 A6 */ mflr r0
/* 8001B808 00018768 90 01 00 74 */ stw r0, 0x74(r1) /* 8001B808 00018768 90 01 00 74 */ stw r0, 0x74(r1)
@ -221,7 +221,7 @@ sub_8001b800:
/* 8001B824 00018784 93 E1 00 3C */ stw r31, 0x3c(r1) /* 8001B824 00018784 93 E1 00 3C */ stw r31, 0x3c(r1)
/* 8001B828 00018788 7C 7F 1B 78 */ mr r31, r3 /* 8001B828 00018788 7C 7F 1B 78 */ mr r31, r3
/* 8001B82C 0001878C 38 61 00 08 */ addi r3, r1, 8 /* 8001B82C 0001878C 38 61 00 08 */ addi r3, r1, 8
/* 8001B830 00018790 48 00 01 8D */ bl FromMatrix3f__12CEulerAnglesFRC9CMatrix3f /* 8001B830 00018790 48 00 01 8D */ bl FromTransform__9CMatrix3fFRC12CTransform4f
/* 8001B834 00018794 C0 01 00 0C */ lfs f0, 0xc(r1) /* 8001B834 00018794 C0 01 00 0C */ lfs f0, 0xc(r1)
/* 8001B838 00018798 C0 41 00 18 */ lfs f2, 0x18(r1) /* 8001B838 00018798 C0 41 00 18 */ lfs f2, 0x18(r1)
/* 8001B83C 0001879C EC 00 00 32 */ fmuls f0, f0, f0 /* 8001B83C 0001879C EC 00 00 32 */ fmuls f0, f0, f0
@ -330,8 +330,8 @@ __sinit_CEulerAngles_cpp:
/* 8001B9B4 00018914 D0 03 00 08 */ stfs f0, 8(r3) /* 8001B9B4 00018914 D0 03 00 08 */ stfs f0, 8(r3)
/* 8001B9B8 00018918 4E 80 00 20 */ blr /* 8001B9B8 00018918 4E 80 00 20 */ blr
.global FromMatrix3f__12CEulerAnglesFRC9CMatrix3f .global FromTransform__9CMatrix3fFRC12CTransform4f
FromMatrix3f__12CEulerAnglesFRC9CMatrix3f: FromTransform__9CMatrix3fFRC12CTransform4f:
/* 8001B9BC 0001891C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001B9BC 0001891C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8001B9C0 00018920 7C 08 02 A6 */ mflr r0 /* 8001B9C0 00018920 7C 08 02 A6 */ mflr r0
/* 8001B9C4 00018924 38 A4 00 10 */ addi r5, r4, 0x10 /* 8001B9C4 00018924 38 A4 00 10 */ addi r5, r4, 0x10

2
tools/calcprogress.py
View File

@ -60,7 +60,7 @@ TEXT_SECTIONS = ["init", "text"]
DATA_SECTIONS = [ DATA_SECTIONS = [
"rodata", "data", "bss", "sdata", "sbss", "sdata2", "sbss2", "rodata", "data", "bss", "sdata", "sbss", "sdata2", "sbss2",
"ctors", "_ctors", "dtors", "ctors$99", "_ctors$99", "ctors$00", "dtors$99", "ctors", "_ctors", "dtors", "ctors$99", "_ctors$99", "ctors$00", "dtors$99",
"extab_", "extabindex_", "_extab", "_exidx" "extab", "extabindex", "extab_", "extabindex_", "_extab", "_exidx"
] ]
# DOL info # DOL info