Skip to content

Commit

Permalink
Match more of HSD LObj (#523)
Browse files Browse the repository at this point in the history 
* Match more of HSD lobj

* Label LObj functions with actual HAL names

* Disable formatting on inline asm

* Run git-clang-format

* Move rest of lobj.s data section to lobj.c

Intended to fix build with r41 (was not aligned on 8-byte boundary)
  • Loading branch information
@r-burns
r-burns authored Sep 1, 2022
1 parent ff4156a commit b30677f
Show file tree
Hide file tree
Showing 23 changed files with 1,156 additions and 1,888 deletions.
4 changes: 2 additions & 2 deletions asm/melee/cm/camera.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8392,7 +8392,7 @@ lbl_8003025C:
/* 80030270 0002CE50 7F 63 DB 78 */ mr r3, r27
/* 80030274 0002CE54 48 19 4D 39 */ bl func_801C4FAC
/* 80030278 0002CE58 38 60 00 00 */ li r3, 0
/* 8003027C 0002CE5C 48 33 63 D9 */ bl func_80366654
/* 8003027C 0002CE5C 48 33 63 D9 */ bl HSD_LObjDeleteCurrentAll
/* 80030280 0002CE60 38 60 00 02 */ li r3, 2
/* 80030284 0002CE64 48 00 0E 1D */ bl func_800310A0
/* 80030288 0002CE68 88 1F 00 00 */ lbz r0, 0(r31)
Expand Down Expand Up @@ -8599,7 +8599,7 @@ func_800304E0:
/* 80030540 0002D120 7F A3 EB 78 */ mr r3, r29
/* 80030544 0002D124 48 19 4A 69 */ bl func_801C4FAC
/* 80030548 0002D128 38 60 00 00 */ li r3, 0
/* 8003054C 0002D12C 48 33 61 09 */ bl func_80366654
/* 8003054C 0002D12C 48 33 61 09 */ bl HSD_LObjDeleteCurrentAll
/* 80030550 0002D130 38 60 00 02 */ li r3, 2
/* 80030554 0002D134 48 00 0B 4D */ bl func_800310A0
/* 80030558 0002D138 8C 1E 03 98 */ lbzu r0, 0x398(r30)
Expand Down
18 changes: 9 additions & 9 deletions asm/melee/ft/ft_unknown_006.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27350,7 +27350,7 @@ lbl_8009F54C:
/* 8009F558 0009C138 80 63 00 28 */ lwz r3, 0x28(r3)
/* 8009F55C 0009C13C 48 2C 73 91 */ bl func_803668EC
/* 8009F560 0009C140 48 2C AD 29 */ bl HSD_CObjGetCurrent
/* 8009F564 0009C144 48 2C 69 C5 */ bl func_80365F28
/* 8009F564 0009C144 48 2C 69 C5 */ bl HSD_LObjSetupInit
/* 8009F568 0009C148 80 01 00 0C */ lwz r0, 0xc(r1)
/* 8009F56C 0009C14C 38 21 00 08 */ addi r1, r1, 8
/* 8009F570 0009C150 7C 08 03 A6 */ mtlr r0
Expand Down Expand Up @@ -27431,7 +27431,7 @@ lbl_8009F61C:
/* 8009F680 0009C260 EC 00 00 72 */ fmuls f0, f0, f1
/* 8009F684 0009C264 D0 01 00 30 */ stfs f0, 0x30(r1)
/* 8009F688 0009C268 80 7E 05 88 */ lwz r3, 0x588(r30)
/* 8009F68C 0009C26C 48 2C 76 5D */ bl func_80366CE8
/* 8009F68C 0009C26C 48 2C 76 5D */ bl HSD_LObjSetPosition
/* 8009F690 0009C270 88 1F 00 7C */ lbz r0, 0x7c(r31)
/* 8009F694 0009C274 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f
/* 8009F698 0009C278 41 82 00 40 */ beq lbl_8009F6D8
Expand Down Expand Up @@ -27473,12 +27473,12 @@ lbl_8009F708:
/* 8009F71C 0009C2FC 48 00 00 0C */ b lbl_8009F728
lbl_8009F720:
/* 8009F720 0009C300 80 6D AE CC */ lwz r3, lbl_804D656C@sda21(r13)
/* 8009F724 0009C304 48 2C 70 85 */ bl func_803667A8
/* 8009F724 0009C304 48 2C 70 85 */ bl HSD_LObjSetCurrentAll
lbl_8009F728:
/* 8009F728 0009C308 80 7E 05 88 */ lwz r3, 0x588(r30)
/* 8009F72C 0009C30C 48 2C 6C 89 */ bl func_803663B4
/* 8009F72C 0009C30C 48 2C 6C 89 */ bl HSD_LObjAddCurrent
/* 8009F730 0009C310 48 2C AB 59 */ bl HSD_CObjGetCurrent
/* 8009F734 0009C314 48 2C 67 F5 */ bl func_80365F28
/* 8009F734 0009C314 48 2C 67 F5 */ bl HSD_LObjSetupInit
lbl_8009F738:
/* 8009F738 0009C318 80 01 00 5C */ lwz r0, 0x5c(r1)
/* 8009F73C 0009C31C CB E1 00 50 */ lfd f31, 0x50(r1)
Expand Down Expand Up @@ -27522,12 +27522,12 @@ lbl_8009F7B4:
/* 8009F7C4 0009C3A4 48 00 00 0C */ b lbl_8009F7D0
lbl_8009F7C8:
/* 8009F7C8 0009C3A8 80 6D AE CC */ lwz r3, lbl_804D656C@sda21(r13)
/* 8009F7CC 0009C3AC 48 2C 6F DD */ bl func_803667A8
/* 8009F7CC 0009C3AC 48 2C 6F DD */ bl HSD_LObjSetCurrentAll
lbl_8009F7D0:
/* 8009F7D0 0009C3B0 80 7E 05 88 */ lwz r3, 0x588(r30)
/* 8009F7D4 0009C3B4 48 2C 6B E1 */ bl func_803663B4
/* 8009F7D4 0009C3B4 48 2C 6B E1 */ bl HSD_LObjAddCurrent
/* 8009F7D8 0009C3B8 48 2C AA B1 */ bl HSD_CObjGetCurrent
/* 8009F7DC 0009C3BC 48 2C 67 4D */ bl func_80365F28
/* 8009F7DC 0009C3BC 48 2C 67 4D */ bl HSD_LObjSetupInit
lbl_8009F7E0:
/* 8009F7E0 0009C3C0 80 01 00 1C */ lwz r0, 0x1c(r1)
/* 8009F7E4 0009C3C4 83 E1 00 14 */ lwz r31, 0x14(r1)
Expand All @@ -27548,7 +27548,7 @@ func_8009F7F8:
/* 8009F814 0009C3F4 80 6D AE C8 */ lwz r3, lbl_804D6568@sda21(r13)
/* 8009F818 0009C3F8 48 2C 70 D5 */ bl func_803668EC
/* 8009F81C 0009C3FC 48 2C AA 6D */ bl HSD_CObjGetCurrent
/* 8009F820 0009C400 48 2C 67 09 */ bl func_80365F28
/* 8009F820 0009C400 48 2C 67 09 */ bl HSD_LObjSetupInit
lbl_8009F824:
/* 8009F824 0009C404 80 01 00 0C */ lwz r0, 0xc(r1)
/* 8009F828 0009C408 38 21 00 08 */ addi r1, r1, 8
Expand Down
2 changes: 1 addition & 1 deletion asm/melee/gr/grizumi.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1471,7 +1471,7 @@ lbl_801CCF7C:
/* 801CCFAC 001C9B8C 38 C0 00 00 */ li r6, 0
/* 801CCFB0 001C9B90 48 19 A7 49 */ bl HSD_CObjEraseScreen
/* 801CCFB4 001C9B94 38 60 00 00 */ li r3, 0
/* 801CCFB8 001C9B98 48 19 96 9D */ bl func_80366654
/* 801CCFB8 001C9B98 48 19 96 9D */ bl HSD_LObjDeleteCurrentAll
/* 801CCFBC 001C9B9C 38 60 00 00 */ li r3, 0
/* 801CCFC0 001C9BA0 4B E6 40 E1 */ bl func_800310A0
/* 801CCFC4 001C9BA4 38 60 00 01 */ li r3, 1
Expand Down
18 changes: 9 additions & 9 deletions asm/melee/gr/grpushon.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -732,10 +732,10 @@ lbl_80218CA4:
/* 80218CDC 002158BC 4B DF 47 91 */ bl lbvector_Add
/* 80218CE0 002158C0 80 7E 01 6C */ lwz r3, 0x16c(r30)
/* 80218CE4 002158C4 38 81 00 3C */ addi r4, r1, 0x3c
/* 80218CE8 002158C8 48 14 E0 01 */ bl func_80366CE8
/* 80218CE8 002158C8 48 14 E0 01 */ bl HSD_LObjSetPosition
/* 80218CEC 002158CC 80 7E 01 6C */ lwz r3, 0x16c(r30)
/* 80218CF0 002158D0 38 81 01 0C */ addi r4, r1, 0x10c
/* 80218CF4 002158D4 48 14 E0 BD */ bl func_80366DB0
/* 80218CF4 002158D4 48 14 E0 BD */ bl HSD_LObjSetInterest
/* 80218CF8 002158D8 80 7E 01 6C */ lwz r3, 0x16c(r30)
/* 80218CFC 002158DC 38 80 04 00 */ li r4, 0x400
/* 80218D00 002158E0 48 14 C6 B5 */ bl HSD_LObjSetFlags
Expand Down Expand Up @@ -815,7 +815,7 @@ lbl_80218DE0:
lbl_80218E24:
/* 80218E24 00215A04 80 7E 01 70 */ lwz r3, 0x170(r30)
/* 80218E28 00215A08 38 81 00 2C */ addi r4, r1, 0x2c
/* 80218E2C 00215A0C 48 14 DE BD */ bl func_80366CE8
/* 80218E2C 00215A0C 48 14 DE BD */ bl HSD_LObjSetPosition
/* 80218E30 00215A10 80 01 00 B4 */ lwz r0, 0xb4(r1)
/* 80218E34 00215A14 38 81 00 2C */ addi r4, r1, 0x2c
/* 80218E38 00215A18 54 00 10 3A */ slwi r0, r0, 2
Expand All @@ -831,7 +831,7 @@ lbl_80218E24:
lbl_80218E60:
/* 80218E60 00215A40 80 7E 01 70 */ lwz r3, 0x170(r30)
/* 80218E64 00215A44 38 81 00 2C */ addi r4, r1, 0x2c
/* 80218E68 00215A48 48 14 DF 49 */ bl func_80366DB0
/* 80218E68 00215A48 48 14 DF 49 */ bl HSD_LObjSetInterest
/* 80218E6C 00215A4C 80 01 00 B4 */ lwz r0, 0xb4(r1)
/* 80218E70 00215A50 80 7E 01 70 */ lwz r3, 0x170(r30)
/* 80218E74 00215A54 54 00 10 3A */ slwi r0, r0, 2
Expand Down Expand Up @@ -899,7 +899,7 @@ lbl_80218F34:
/* 80218F38 00215B18 40 82 FF D0 */ bne lbl_80218F08
/* 80218F3C 00215B1C 3C 60 80 3E */ lis r3, lbl_803E7B74@ha
/* 80218F40 00215B20 38 63 7B 74 */ addi r3, r3, lbl_803E7B74@l
/* 80218F44 00215B24 48 14 E3 99 */ bl func_803672DC
/* 80218F44 00215B24 48 14 E3 99 */ bl HSD_LObjLoadDesc
/* 80218F48 00215B28 7C 7F 1B 79 */ or. r31, r3, r3
/* 80218F4C 00215B2C 41 82 00 58 */ beq lbl_80218FA4
/* 80218F50 00215B30 3C 60 80 3C */ lis r3, lbl_803B8458@ha
Expand All @@ -920,7 +920,7 @@ lbl_80218F88:
/* 80218F88 00215B68 93 FE 00 0C */ stw r31, 0xc(r30)
/* 80218F8C 00215B6C 38 7F 00 00 */ addi r3, r31, 0
/* 80218F90 00215B70 38 81 00 14 */ addi r4, r1, 0x14
/* 80218F94 00215B74 48 14 DD 55 */ bl func_80366CE8
/* 80218F94 00215B74 48 14 DD 55 */ bl HSD_LObjSetPosition
/* 80218F98 00215B78 38 7F 00 00 */ addi r3, r31, 0
/* 80218F9C 00215B7C 38 80 00 20 */ li r4, 0x20
/* 80218FA0 00215B80 48 14 C4 15 */ bl HSD_LObjSetFlags
Expand Down Expand Up @@ -971,7 +971,7 @@ lbl_80219020:
/* 80219024 00215C04 40 82 FF D0 */ bne lbl_80218FF4
/* 80219028 00215C08 3C 60 80 3E */ lis r3, lbl_803E7B90@ha
/* 8021902C 00215C0C 38 63 7B 90 */ addi r3, r3, lbl_803E7B90@l
/* 80219030 00215C10 48 14 E2 AD */ bl func_803672DC
/* 80219030 00215C10 48 14 E2 AD */ bl HSD_LObjLoadDesc
/* 80219034 00215C14 7C 7F 1B 79 */ or. r31, r3, r3
/* 80219038 00215C18 41 82 00 4C */ beq lbl_80219084
/* 8021903C 00215C1C 3C 60 80 3C */ lis r3, lbl_803B8464@ha
Expand All @@ -992,7 +992,7 @@ lbl_80219074:
/* 80219074 00215C54 93 FE 00 0C */ stw r31, 0xc(r30)
/* 80219078 00215C58 38 7F 00 00 */ addi r3, r31, 0
/* 8021907C 00215C5C 38 81 00 14 */ addi r4, r1, 0x14
/* 80219080 00215C60 48 14 DC 69 */ bl func_80366CE8
/* 80219080 00215C60 48 14 DC 69 */ bl HSD_LObjSetPosition
lbl_80219084:
/* 80219084 00215C64 7F E3 FB 78 */ mr r3, r31
lbl_80219088:
Expand Down Expand Up @@ -1074,7 +1074,7 @@ lbl_80219140:
/* 80219194 00215D74 C0 01 00 1C */ lfs f0, 0x1c(r1)
/* 80219198 00215D78 EC 00 07 F2 */ fmuls f0, f0, f31
/* 8021919C 00215D7C D0 01 00 1C */ stfs f0, 0x1c(r1)
/* 802191A0 00215D80 48 14 DB 49 */ bl func_80366CE8
/* 802191A0 00215D80 48 14 DB 49 */ bl HSD_LObjSetPosition
/* 802191A4 00215D84 C0 1D 00 14 */ lfs f0, 0x14(r29)
/* 802191A8 00215D88 7F 83 E3 78 */ mr r3, r28
/* 802191AC 00215D8C C0 5D 00 10 */ lfs f2, 0x10(r29)
Expand Down
20 changes: 10 additions & 10 deletions asm/melee/gr/grshrineroute.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2224,10 +2224,10 @@ lbl_8020A638:
/* 8020A670 00207250 4B E0 2D FD */ bl lbvector_Add
/* 8020A674 00207254 80 7E 01 6C */ lwz r3, 0x16c(r30)
/* 8020A678 00207258 38 81 00 3C */ addi r4, r1, 0x3c
/* 8020A67C 0020725C 48 15 C6 6D */ bl func_80366CE8
/* 8020A67C 0020725C 48 15 C6 6D */ bl HSD_LObjSetPosition
/* 8020A680 00207260 80 7E 01 6C */ lwz r3, 0x16c(r30)
/* 8020A684 00207264 38 81 01 0C */ addi r4, r1, 0x10c
/* 8020A688 00207268 48 15 C7 29 */ bl func_80366DB0
/* 8020A688 00207268 48 15 C7 29 */ bl HSD_LObjSetInterest
/* 8020A68C 0020726C 80 7E 01 6C */ lwz r3, 0x16c(r30)
/* 8020A690 00207270 38 80 04 00 */ li r4, 0x400
/* 8020A694 00207274 48 15 AD 21 */ bl HSD_LObjSetFlags
Expand Down Expand Up @@ -2307,7 +2307,7 @@ lbl_8020A774:
lbl_8020A7B8:
/* 8020A7B8 00207398 80 7E 01 70 */ lwz r3, 0x170(r30)
/* 8020A7BC 0020739C 38 81 00 2C */ addi r4, r1, 0x2c
/* 8020A7C0 002073A0 48 15 C5 29 */ bl func_80366CE8
/* 8020A7C0 002073A0 48 15 C5 29 */ bl HSD_LObjSetPosition
/* 8020A7C4 002073A4 80 01 00 B4 */ lwz r0, 0xb4(r1)
/* 8020A7C8 002073A8 38 81 00 2C */ addi r4, r1, 0x2c
/* 8020A7CC 002073AC 54 00 10 3A */ slwi r0, r0, 2
Expand All @@ -2323,7 +2323,7 @@ lbl_8020A7B8:
lbl_8020A7F4:
/* 8020A7F4 002073D4 80 7E 01 70 */ lwz r3, 0x170(r30)
/* 8020A7F8 002073D8 38 81 00 2C */ addi r4, r1, 0x2c
/* 8020A7FC 002073DC 48 15 C5 B5 */ bl func_80366DB0
/* 8020A7FC 002073DC 48 15 C5 B5 */ bl HSD_LObjSetInterest
/* 8020A800 002073E0 80 01 00 B4 */ lwz r0, 0xb4(r1)
/* 8020A804 002073E4 80 7E 01 70 */ lwz r3, 0x170(r30)
/* 8020A808 002073E8 54 00 10 3A */ slwi r0, r0, 2
Expand Down Expand Up @@ -2525,7 +2525,7 @@ lbl_8020AA8C:
/* 8020AAA4 00207684 48 15 C2 01 */ bl func_80366CA4
/* 8020AAA8 00207688 38 7C 00 00 */ addi r3, r28, 0
/* 8020AAAC 0020768C 38 9D 00 04 */ addi r4, r29, 4
/* 8020AAB0 00207690 48 15 C2 39 */ bl func_80366CE8
/* 8020AAB0 00207690 48 15 C2 39 */ bl HSD_LObjSetPosition
/* 8020AAB4 00207694 C0 3D 00 2C */ lfs f1, 0x2c(r29)
/* 8020AAB8 00207698 7F 83 E3 78 */ mr r3, r28
/* 8020AABC 0020769C C0 5D 00 28 */ lfs f2, 0x28(r29)
Expand All @@ -2544,7 +2544,7 @@ lbl_8020AAE0:
/* 8020AAEC 002076CC B0 1C 00 08 */ sth r0, 8(r28)
/* 8020AAF0 002076D0 38 7C 00 00 */ addi r3, r28, 0
/* 8020AAF4 002076D4 38 9D 00 10 */ addi r4, r29, 0x10
/* 8020AAF8 002076D8 48 15 C2 B9 */ bl func_80366DB0
/* 8020AAF8 002076D8 48 15 C2 B9 */ bl HSD_LObjSetInterest
/* 8020AAFC 002076DC C0 3D 00 20 */ lfs f1, 0x20(r29)
/* 8020AB00 002076E0 7F 83 E3 78 */ mr r3, r28
/* 8020AB04 002076E4 80 9D 00 24 */ lwz r4, 0x24(r29)
Expand Down Expand Up @@ -2611,7 +2611,7 @@ lbl_8020ABB8:
/* 8020ABBC 0020779C 40 82 FF D0 */ bne lbl_8020AB8C
/* 8020ABC0 002077A0 3C 60 80 3E */ lis r3, lbl_803E5D74@ha
/* 8020ABC4 002077A4 38 63 5D 74 */ addi r3, r3, lbl_803E5D74@l
/* 8020ABC8 002077A8 48 15 C7 15 */ bl func_803672DC
/* 8020ABC8 002077A8 48 15 C7 15 */ bl HSD_LObjLoadDesc
/* 8020ABCC 002077AC 7C 7F 1B 79 */ or. r31, r3, r3
/* 8020ABD0 002077B0 41 82 00 58 */ beq lbl_8020AC28
/* 8020ABD4 002077B4 3C 60 80 3C */ lis r3, lbl_803B836C@ha
Expand All @@ -2632,7 +2632,7 @@ lbl_8020AC0C:
/* 8020AC0C 002077EC 93 FE 00 0C */ stw r31, 0xc(r30)
/* 8020AC10 002077F0 38 7F 00 00 */ addi r3, r31, 0
/* 8020AC14 002077F4 38 81 00 14 */ addi r4, r1, 0x14
/* 8020AC18 002077F8 48 15 C0 D1 */ bl func_80366CE8
/* 8020AC18 002077F8 48 15 C0 D1 */ bl HSD_LObjSetPosition
/* 8020AC1C 002077FC 38 7F 00 00 */ addi r3, r31, 0
/* 8020AC20 00207800 38 80 00 20 */ li r4, 0x20
/* 8020AC24 00207804 48 15 A7 91 */ bl HSD_LObjSetFlags
Expand Down Expand Up @@ -2683,7 +2683,7 @@ lbl_8020ACA4:
/* 8020ACA8 00207888 40 82 FF D0 */ bne lbl_8020AC78
/* 8020ACAC 0020788C 3C 60 80 3E */ lis r3, lbl_803E5D90@ha
/* 8020ACB0 00207890 38 63 5D 90 */ addi r3, r3, lbl_803E5D90@l
/* 8020ACB4 00207894 48 15 C6 29 */ bl func_803672DC
/* 8020ACB4 00207894 48 15 C6 29 */ bl HSD_LObjLoadDesc
/* 8020ACB8 00207898 7C 7F 1B 79 */ or. r31, r3, r3
/* 8020ACBC 0020789C 41 82 00 4C */ beq lbl_8020AD08
/* 8020ACC0 002078A0 3C 60 80 3C */ lis r3, lbl_803B8378@ha
Expand All @@ -2704,7 +2704,7 @@ lbl_8020ACF8:
/* 8020ACF8 002078D8 93 FE 00 0C */ stw r31, 0xc(r30)
/* 8020ACFC 002078DC 38 7F 00 00 */ addi r3, r31, 0
/* 8020AD00 002078E0 38 81 00 14 */ addi r4, r1, 0x14
/* 8020AD04 002078E4 48 15 BF E5 */ bl func_80366CE8
/* 8020AD04 002078E4 48 15 BF E5 */ bl HSD_LObjSetPosition
lbl_8020AD08:
/* 8020AD08 002078E8 7F E3 FB 78 */ mr r3, r31
lbl_8020AD0C:
Expand Down
8 changes: 4 additions & 4 deletions asm/melee/gr/grzebesroute.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ lbl_8020B618:
/* 8020B68C 0020826C C0 01 00 54 */ lfs f0, 0x54(r1)
/* 8020B690 00208270 EC 00 07 F2 */ fmuls f0, f0, f31
/* 8020B694 00208274 D0 01 00 54 */ stfs f0, 0x54(r1)
/* 8020B698 00208278 48 15 B6 51 */ bl func_80366CE8
/* 8020B698 00208278 48 15 B6 51 */ bl HSD_LObjSetPosition
/* 8020B69C 0020827C C0 01 00 40 */ lfs f0, 0x40(r1)
/* 8020B6A0 00208280 38 7A 00 00 */ addi r3, r26, 0
/* 8020B6A4 00208284 38 81 00 40 */ addi r4, r1, 0x40
Expand All @@ -407,7 +407,7 @@ lbl_8020B618:
/* 8020B6BC 0020829C C0 01 00 48 */ lfs f0, 0x48(r1)
/* 8020B6C0 002082A0 EC 00 07 F2 */ fmuls f0, f0, f31
/* 8020B6C4 002082A4 D0 01 00 48 */ stfs f0, 0x48(r1)
/* 8020B6C8 002082A8 48 15 B6 E9 */ bl func_80366DB0
/* 8020B6C8 002082A8 48 15 B6 E9 */ bl HSD_LObjSetInterest
/* 8020B6CC 002082AC C0 22 BF 58 */ lfs f1, lbl_804DB938@sda21(r2)
/* 8020B6D0 002082B0 38 7A 00 00 */ addi r3, r26, 0
/* 8020B6D4 002082B4 38 80 00 03 */ li r4, 3
Expand Down Expand Up @@ -446,7 +446,7 @@ lbl_8020B6F4:
/* 8020B754 00208334 C0 01 00 38 */ lfs f0, 0x38(r1)
/* 8020B758 00208338 EC 00 07 F2 */ fmuls f0, f0, f31
/* 8020B75C 0020833C D0 01 00 38 */ stfs f0, 0x38(r1)
/* 8020B760 00208340 48 15 B5 89 */ bl func_80366CE8
/* 8020B760 00208340 48 15 B5 89 */ bl HSD_LObjSetPosition
/* 8020B764 00208344 FC 20 E8 90 */ fmr f1, f29
/* 8020B768 00208348 C0 42 BF 64 */ lfs f2, lbl_804DB944@sda21(r2)
/* 8020B76C 0020834C 38 7A 00 00 */ addi r3, r26, 0
Expand Down Expand Up @@ -481,7 +481,7 @@ lbl_8020B77C:
/* 8020B7DC 002083BC C0 01 00 28 */ lfs f0, 0x28(r1)
/* 8020B7E0 002083C0 EC 00 07 F2 */ fmuls f0, f0, f31
/* 8020B7E4 002083C4 D0 01 00 28 */ stfs f0, 0x28(r1)
/* 8020B7E8 002083C8 48 15 B5 01 */ bl func_80366CE8
/* 8020B7E8 002083C8 48 15 B5 01 */ bl HSD_LObjSetPosition
/* 8020B7EC 002083CC FC 20 E0 90 */ fmr f1, f28
/* 8020B7F0 002083D0 C0 42 BF 64 */ lfs f2, lbl_804DB944@sda21(r2)
/* 8020B7F4 002083D4 38 7A 00 00 */ addi r3, r26, 0
Expand Down
2 changes: 1 addition & 1 deletion asm/melee/if/ifall.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ func_802F390C:
/* 802F39E0 002F05C0 48 09 C8 11 */ bl func_803901F0
/* 802F39E4 002F05C4 3B A3 00 00 */ addi r29, r3, 0
/* 802F39E8 002F05C8 38 7E 00 00 */ addi r3, r30, 0
/* 802F39EC 002F05CC 48 07 38 F1 */ bl func_803672DC
/* 802F39EC 002F05CC 48 07 38 F1 */ bl HSD_LObjLoadDesc
/* 802F39F0 002F05D0 88 8D C1 AA */ lbz r4, lbl_804D784A@sda21(r13)
/* 802F39F4 002F05D4 38 A3 00 00 */ addi r5, r3, 0
/* 802F39F8 002F05D8 38 7D 00 00 */ addi r3, r29, 0
Expand Down
4 changes: 2 additions & 2 deletions asm/melee/lb/lbunknown_003.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2349,15 +2349,15 @@ func_80011AC4:
/* 80011AE8 0000E6C8 48 00 00 5C */ b lbl_80011B44
lbl_80011AEC:
/* 80011AEC 0000E6CC 80 63 00 00 */ lwz r3, 0(r3)
/* 80011AF0 0000E6D0 48 35 57 ED */ bl func_803672DC
/* 80011AF0 0000E6D0 48 35 57 ED */ bl HSD_LObjLoadDesc
/* 80011AF4 0000E6D4 80 9C 00 00 */ lwz r4, 0(r28)
/* 80011AF8 0000E6D8 7C 7E 1B 78 */ mr r30, r3
/* 80011AFC 0000E6DC 80 84 00 04 */ lwz r4, 4(r4)
/* 80011B00 0000E6E0 28 04 00 00 */ cmplwi r4, 0
/* 80011B04 0000E6E4 41 82 00 10 */ beq lbl_80011B14
/* 80011B08 0000E6E8 7F C3 F3 78 */ mr r3, r30
/* 80011B0C 0000E6EC 80 84 00 00 */ lwz r4, 0(r4)
/* 80011B10 0000E6F0 48 35 58 C9 */ bl func_803673D8
/* 80011B10 0000E6F0 48 35 58 C9 */ bl HSD_LObjAddAnim
lbl_80011B14:
/* 80011B14 0000E6F4 28 1F 00 00 */ cmplwi r31, 0
/* 80011B18 0000E6F8 41 82 00 20 */ beq lbl_80011B38
Expand Down
4 changes: 2 additions & 2 deletions asm/melee/mn/mncharsel.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9160,11 +9160,11 @@ lbl_80264324:
/* 802643CC 00260FAC 80 8D B6 14 */ lwz r4, lbl_804D6CB4@sda21(r13)
/* 802643D0 00260FB0 7C 72 1B 78 */ mr r18, r3
/* 802643D4 00260FB4 80 64 00 04 */ lwz r3, 4(r4)
/* 802643D8 00260FB8 48 10 2F 05 */ bl func_803672DC
/* 802643D8 00260FB8 48 10 2F 05 */ bl HSD_LObjLoadDesc
/* 802643DC 00260FBC 80 8D B6 14 */ lwz r4, lbl_804D6CB4@sda21(r13)
/* 802643E0 00260FC0 7C 74 1B 78 */ mr r20, r3
/* 802643E4 00260FC4 80 64 00 08 */ lwz r3, 8(r4)
/* 802643E8 00260FC8 48 10 2E F5 */ bl func_803672DC
/* 802643E8 00260FC8 48 10 2E F5 */ bl HSD_LObjLoadDesc
/* 802643EC 00260FCC 28 14 00 00 */ cmplwi r20, 0
/* 802643F0 00260FD0 3A 23 00 00 */ addi r17, r3, 0
/* 802643F4 00260FD4 40 82 00 14 */ bne lbl_80264408
Expand Down
4 changes: 2 additions & 2 deletions asm/melee/mn/mnstagesel.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1188,11 +1188,11 @@ lbl_8025A9F0:
/* 8025AABC 0025769C 7C 60 1B 78 */ mr r0, r3
/* 8025AAC0 002576A0 80 7C 00 04 */ lwz r3, 4(r28)
/* 8025AAC4 002576A4 7C 16 03 78 */ mr r22, r0
/* 8025AAC8 002576A8 48 10 C8 15 */ bl func_803672DC
/* 8025AAC8 002576A8 48 10 C8 15 */ bl HSD_LObjLoadDesc
/* 8025AACC 002576AC 7C 60 1B 78 */ mr r0, r3
/* 8025AAD0 002576B0 80 7C 00 08 */ lwz r3, 8(r28)
/* 8025AAD4 002576B4 7C 18 03 78 */ mr r24, r0
/* 8025AAD8 002576B8 48 10 C8 05 */ bl func_803672DC
/* 8025AAD8 002576B8 48 10 C8 05 */ bl HSD_LObjLoadDesc
/* 8025AADC 002576BC 28 18 00 00 */ cmplwi r24, 0
/* 8025AAE0 002576C0 3A E3 00 00 */ addi r23, r3, 0
/* 8025AAE4 002576C4 40 82 00 14 */ bne lbl_8025AAF8
Expand Down
4 changes: 2 additions & 2 deletions asm/melee/mp/mplib.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14608,7 +14608,7 @@ func_80059E60:
/* 80059E6C 00056A4C 93 E1 01 3C */ stw r31, 0x13c(r1)
/* 80059E70 00056A50 93 C1 01 38 */ stw r30, 0x138(r1)
/* 80059E74 00056A54 48 31 04 15 */ bl HSD_CObjGetCurrent
/* 80059E78 00056A58 48 30 C0 B1 */ bl func_80365F28
/* 80059E78 00056A58 48 30 C0 B1 */ bl HSD_LObjSetupInit
/* 80059E7C 00056A5C 38 60 00 00 */ li r3, 0
/* 80059E80 00056A60 48 2E 34 D1 */ bl GXSetCullMode
/* 80059E84 00056A64 48 2E 25 45 */ bl GXClearVtxDesc
Expand Down Expand Up @@ -14951,7 +14951,7 @@ func_8005A340:
/* 8005A35C 00056F3C 93 E1 00 B4 */ stw r31, 0xb4(r1)
/* 8005A360 00056F40 93 C1 00 B0 */ stw r30, 0xb0(r1)
/* 8005A364 00056F44 48 30 FF 25 */ bl HSD_CObjGetCurrent
/* 8005A368 00056F48 48 30 BB C1 */ bl func_80365F28
/* 8005A368 00056F48 48 30 BB C1 */ bl HSD_LObjSetupInit
/* 8005A36C 00056F4C 38 60 00 00 */ li r3, 0
/* 8005A370 00056F50 48 2E 2F E1 */ bl GXSetCullMode
/* 8005A374 00056F54 48 2E 20 55 */ bl GXClearVtxDesc
Expand Down
2 changes: 1 addition & 1 deletion asm/melee/text_2.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7047,7 +7047,7 @@ lbl_801A9730:
/* 801A982C 001A640C 80 84 00 00 */ lwz r4, 0(r4)
/* 801A9830 001A6410 80 84 00 04 */ lwz r4, 4(r4)
/* 801A9834 001A6414 80 84 00 00 */ lwz r4, 0(r4)
/* 801A9838 001A6418 48 1B DB A1 */ bl func_803673D8
/* 801A9838 001A6418 48 1B DB A1 */ bl HSD_LObjAddAnim
/* 801A983C 001A641C 7F C3 F3 78 */ mr r3, r30
/* 801A9840 001A6420 C0 22 B0 50 */ lfs f1, lbl_804DAA30@sda21(r2)
/* 801A9844 001A6424 48 1B BE B5 */ bl HSD_LObjReqAnimAll
Expand Down
Loading

0 comments on commit b30677f

Please sign in to comment.