mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-11 13:08:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_carry work, SETUP_ACTOR macro, header cleanup (#1885)

Browse Source 
* d_a_obj_carry work, SETUP_ACTOR macro

* rm headers, add script

* progress

* macro rename, consistent spacing
This commit is contained in:
Pheenoh
2023-08-16 13:07:52 -06:00
committed by GitHub
parent c372915a50
commit f9380b3e05
4558 changed files with 741 additions and 6064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/CheckCreateHeap__FP10fopAc_ac_c.s
-9
View File
@@ -1,9 +0,0 @@
lbl_8046F684:
/* 8046F684 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8046F688 7C 08 02 A6 */ mflr r0
/* 8046F68C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8046F690 48 00 14 CD */ bl CreateHeap__12daObjCarry_cFv
/* 8046F694 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8046F698 7C 08 03 A6 */ mtlr r0
/* 8046F69C 38 21 00 10 */ addi r1, r1, 0x10
/* 8046F6A0 4E 80 00 20 */ blr
asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/func_8046F340.s
-42
View File
@@ -1,42 +0,0 @@
lbl_8046F340:
/* 8046F340 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8046F344 7C 08 02 A6 */ mflr r0
/* 8046F348 90 01 00 24 */ stw r0, 0x24(r1)
/* 8046F34C 39 61 00 20 */ addi r11, r1, 0x20
/* 8046F350 4B EF 2E 8D */ bl _savegpr_29
/* 8046F354 7C 7D 1B 79 */ or. r29, r3, r3
/* 8046F358 7C BE 2B 78 */ mr r30, r5
/* 8046F35C 3C 60 80 48 */ lis r3, l_cyl_info@ha /* 0x8047990C@ha */
/* 8046F360 3B E3 99 0C */ addi r31, r3, l_cyl_info@l /* 0x8047990C@l */
/* 8046F364 41 82 00 64 */ beq lbl_8046F3C8
/* 8046F368 28 1E 00 00 */ cmplwi r30, 0
/* 8046F36C 41 82 00 5C */ beq lbl_8046F3C8
/* 8046F370 80 06 00 10 */ lwz r0, 0x10(r6)
/* 8046F374 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b
/* 8046F378 41 82 00 50 */ beq lbl_8046F3C8
/* 8046F37C 7F C3 F3 78 */ mr r3, r30
/* 8046F380 4B BA 99 61 */ bl fopAc_IsActor__FPv
/* 8046F384 2C 03 00 00 */ cmpwi r3, 0
/* 8046F388 41 82 00 40 */ beq lbl_8046F3C8
/* 8046F38C A8 1E 00 08 */ lha r0, 8(r30)
/* 8046F390 2C 00 00 FD */ cmpwi r0, 0xfd
/* 8046F394 40 82 00 34 */ bne lbl_8046F3C8
/* 8046F398 C0 3F 0A 6C */ lfs f1, 0xa6c(r31)
/* 8046F39C 4B DF 85 B9 */ bl cM_rndF__Ff
/* 8046F3A0 C0 1F 0A 68 */ lfs f0, 0xa68(r31)
/* 8046F3A4 EC 00 08 2A */ fadds f0, f0, f1
/* 8046F3A8 D0 1D 0D 5C */ stfs f0, 0xd5c(r29)
/* 8046F3AC C0 3F 0A 74 */ lfs f1, 0xa74(r31)
/* 8046F3B0 4B DF 85 A5 */ bl cM_rndF__Ff
/* 8046F3B4 C0 1F 0A 70 */ lfs f0, 0xa70(r31)
/* 8046F3B8 EC 00 08 2A */ fadds f0, f0, f1
/* 8046F3BC D0 1D 0D 60 */ stfs f0, 0xd60(r29)
/* 8046F3C0 38 00 0F A0 */ li r0, 0xfa0
/* 8046F3C4 B0 1D 0D 68 */ sth r0, 0xd68(r29)
lbl_8046F3C8:
/* 8046F3C8 39 61 00 20 */ addi r11, r1, 0x20
/* 8046F3CC 4B EF 2E 5D */ bl _restgpr_29
/* 8046F3D0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8046F3D4 7C 08 03 A6 */ mtlr r0
/* 8046F3D8 38 21 00 20 */ addi r1, r1, 0x20
/* 8046F3DC 4E 80 00 20 */ blr
asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/getArcName__12daObjCarry_cFv.s
-7
View File
@@ -1,7 +0,0 @@
lbl_8046F6BC:
/* 8046F6BC 88 03 0C F0 */ lbz r0, 0xcf0(r3)
/* 8046F6C0 54 00 10 3A */ slwi r0, r0, 2
/* 8046F6C4 3C 60 80 48 */ lis r3, l_arcName@ha /* 0x8047A670@ha */
/* 8046F6C8 38 63 A6 70 */ addi r3, r3, l_arcName@l /* 0x8047A670@l */
/* 8046F6CC 7C 63 00 2E */ lwzx r3, r3, r0
/* 8046F6D0 4E 80 00 20 */ blr
asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/getBmdName__12daObjCarry_cFv.s
-7
View File
@@ -1,7 +0,0 @@
lbl_8046F6D4:
/* 8046F6D4 88 03 0C F0 */ lbz r0, 0xcf0(r3)
/* 8046F6D8 54 00 10 3A */ slwi r0, r0, 2
/* 8046F6DC 3C 60 80 48 */ lis r3, l_bmdName@ha /* 0x8047A6A8@ha */
/* 8046F6E0 38 63 A6 A8 */ addi r3, r3, l_bmdName@l /* 0x8047A6A8@l */
/* 8046F6E4 7C 63 00 2E */ lwzx r3, r3, r0
/* 8046F6E8 4E 80 00 20 */ blr
asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/initBaseMtx__12daObjCarry_cFv.s
-35
View File
@@ -1,35 +0,0 @@
lbl_8046F724:
/* 8046F724 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8046F728 7C 08 02 A6 */ mflr r0
/* 8046F72C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8046F730 3C 80 80 43 */ lis r4, Zero__4cXyz@ha /* 0x80430CF4@ha */
/* 8046F734 C4 04 0C F4 */ lfsu f0, Zero__4cXyz@l(r4) /* 0x80430CF4@l */
/* 8046F738 D0 03 0C F4 */ stfs f0, 0xcf4(r3)
/* 8046F73C C0 04 00 04 */ lfs f0, 4(r4)
/* 8046F740 D0 03 0C F8 */ stfs f0, 0xcf8(r3)
/* 8046F744 C0 04 00 08 */ lfs f0, 8(r4)
/* 8046F748 D0 03 0C FC */ stfs f0, 0xcfc(r3)
/* 8046F74C 38 00 00 00 */ li r0, 0
/* 8046F750 B0 03 0D 00 */ sth r0, 0xd00(r3)
/* 8046F754 3C 80 80 3A */ lis r4, ZeroQuat@ha /* 0x803A7240@ha */
/* 8046F758 C4 04 72 40 */ lfsu f0, ZeroQuat@l(r4) /* 0x803A7240@l */
/* 8046F75C D0 03 0D 3C */ stfs f0, 0xd3c(r3)
/* 8046F760 C0 04 00 04 */ lfs f0, 4(r4)
/* 8046F764 D0 03 0D 40 */ stfs f0, 0xd40(r3)
/* 8046F768 C0 04 00 08 */ lfs f0, 8(r4)
/* 8046F76C D0 03 0D 44 */ stfs f0, 0xd44(r3)
/* 8046F770 C0 04 00 0C */ lfs f0, 0xc(r4)
/* 8046F774 D0 03 0D 48 */ stfs f0, 0xd48(r3)
/* 8046F778 C0 03 0D 3C */ lfs f0, 0xd3c(r3)
/* 8046F77C D0 03 0D 4C */ stfs f0, 0xd4c(r3)
/* 8046F780 C0 03 0D 40 */ lfs f0, 0xd40(r3)
/* 8046F784 D0 03 0D 50 */ stfs f0, 0xd50(r3)
/* 8046F788 C0 03 0D 44 */ lfs f0, 0xd44(r3)
/* 8046F78C D0 03 0D 54 */ stfs f0, 0xd54(r3)
/* 8046F790 C0 03 0D 48 */ lfs f0, 0xd48(r3)
/* 8046F794 D0 03 0D 58 */ stfs f0, 0xd58(r3)
/* 8046F798 48 00 00 15 */ bl setBaseMtx__12daObjCarry_cFv
/* 8046F79C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8046F7A0 7C 08 03 A6 */ mtlr r0
/* 8046F7A4 38 21 00 10 */ addi r1, r1, 0x10
/* 8046F7A8 4E 80 00 20 */ blr
asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/preInit__12daObjCarry_cFv.s
-47
View File
@@ -1,47 +0,0 @@
lbl_8046FACC:
/* 8046FACC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8046FAD0 7C 08 02 A6 */ mflr r0
/* 8046FAD4 90 01 00 14 */ stw r0, 0x14(r1)
/* 8046FAD8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8046FADC 7C 7F 1B 78 */ mr r31, r3
/* 8046FAE0 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 8046FAE4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 8046FAE8 40 82 00 1C */ bne lbl_8046FB04
/* 8046FAEC 28 1F 00 00 */ cmplwi r31, 0
/* 8046FAF0 41 82 00 08 */ beq lbl_8046FAF8
/* 8046FAF4 48 00 00 85 */ bl __ct__12daObjCarry_cFv
lbl_8046FAF8:
/* 8046FAF8 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
/* 8046FAFC 60 00 00 08 */ ori r0, r0, 8
/* 8046FB00 90 1F 04 A0 */ stw r0, 0x4a0(r31)
lbl_8046FB04:
/* 8046FB04 88 1F 0D 15 */ lbz r0, 0xd15(r31)
/* 8046FB08 28 00 00 00 */ cmplwi r0, 0
/* 8046FB0C 40 82 00 48 */ bne lbl_8046FB54
/* 8046FB10 A8 1F 04 B4 */ lha r0, 0x4b4(r31)
/* 8046FB14 B0 1F 0D 16 */ sth r0, 0xd16(r31)
/* 8046FB18 A8 1F 04 B8 */ lha r0, 0x4b8(r31)
/* 8046FB1C B0 1F 0D 18 */ sth r0, 0xd18(r31)
/* 8046FB20 38 00 00 00 */ li r0, 0
/* 8046FB24 B0 1F 04 B8 */ sth r0, 0x4b8(r31)
/* 8046FB28 B0 1F 04 B4 */ sth r0, 0x4b4(r31)
/* 8046FB2C B0 1F 04 E0 */ sth r0, 0x4e0(r31)
/* 8046FB30 B0 1F 04 DC */ sth r0, 0x4dc(r31)
/* 8046FB34 B0 1F 04 E8 */ sth r0, 0x4e8(r31)
/* 8046FB38 B0 1F 04 E4 */ sth r0, 0x4e4(r31)
/* 8046FB3C A0 1F 0D 18 */ lhz r0, 0xd18(r31)
/* 8046FB40 7C 00 66 70 */ srawi r0, r0, 0xc
/* 8046FB44 38 60 00 01 */ li r3, 1
/* 8046FB48 7C 00 1B B8 */ nand r0, r0, r3
/* 8046FB4C 98 1F 0D B2 */ stb r0, 0xdb2(r31)
/* 8046FB50 98 7F 0D 15 */ stb r3, 0xd15(r31)
lbl_8046FB54:
/* 8046FB54 A0 1F 0D 18 */ lhz r0, 0xd18(r31)
/* 8046FB58 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f
/* 8046FB5C 98 1F 0C F0 */ stb r0, 0xcf0(r31)
/* 8046FB60 38 60 00 01 */ li r3, 1
/* 8046FB64 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8046FB68 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8046FB6C 7C 08 03 A6 */ mtlr r0
/* 8046FB70 38 21 00 10 */ addi r1, r1, 0x10
/* 8046FB74 4E 80 00 20 */ blr
asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/s_setA_sub__FPvPv.s
-32
View File
@@ -1,32 +0,0 @@
lbl_8046F59C:
/* 8046F59C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8046F5A0 7C 08 02 A6 */ mflr r0
/* 8046F5A4 90 01 00 14 */ stw r0, 0x14(r1)
/* 8046F5A8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8046F5AC 93 C1 00 08 */ stw r30, 8(r1)
/* 8046F5B0 7C 7E 1B 78 */ mr r30, r3
/* 8046F5B4 7C 9F 23 78 */ mr r31, r4
/* 8046F5B8 4B BA 97 29 */ bl fopAc_IsActor__FPv
/* 8046F5BC 2C 03 00 00 */ cmpwi r3, 0
/* 8046F5C0 41 82 00 34 */ beq lbl_8046F5F4
/* 8046F5C4 A8 1E 00 08 */ lha r0, 8(r30)
/* 8046F5C8 2C 00 01 9F */ cmpwi r0, 0x19f
/* 8046F5CC 40 82 00 28 */ bne lbl_8046F5F4
/* 8046F5D0 28 1E 00 00 */ cmplwi r30, 0
/* 8046F5D4 41 82 00 20 */ beq lbl_8046F5F4
/* 8046F5D8 28 1F 00 00 */ cmplwi r31, 0
/* 8046F5DC 41 82 00 18 */ beq lbl_8046F5F4
/* 8046F5E0 88 1E 05 68 */ lbz r0, 0x568(r30)
/* 8046F5E4 2C 00 00 0F */ cmpwi r0, 0xf
/* 8046F5E8 40 82 00 0C */ bne lbl_8046F5F4
/* 8046F5EC 7F C3 F3 78 */ mr r3, r30
/* 8046F5F0 48 00 00 08 */ b lbl_8046F5F8
lbl_8046F5F4:
/* 8046F5F4 38 60 00 00 */ li r3, 0
lbl_8046F5F8:
/* 8046F5F8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8046F5FC 83 C1 00 08 */ lwz r30, 8(r1)
/* 8046F600 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8046F604 7C 08 03 A6 */ mtlr r0
/* 8046F608 38 21 00 10 */ addi r1, r1, 0x10
/* 8046F60C 4E 80 00 20 */ blr
asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/s_setB_sub__FPvPv.s
-32
View File
@@ -1,32 +0,0 @@
lbl_8046F610:
/* 8046F610 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8046F614 7C 08 02 A6 */ mflr r0
/* 8046F618 90 01 00 14 */ stw r0, 0x14(r1)
/* 8046F61C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8046F620 93 C1 00 08 */ stw r30, 8(r1)
/* 8046F624 7C 7E 1B 78 */ mr r30, r3
/* 8046F628 7C 9F 23 78 */ mr r31, r4
/* 8046F62C 4B BA 96 B5 */ bl fopAc_IsActor__FPv
/* 8046F630 2C 03 00 00 */ cmpwi r3, 0
/* 8046F634 41 82 00 34 */ beq lbl_8046F668
/* 8046F638 A8 1E 00 08 */ lha r0, 8(r30)
/* 8046F63C 2C 00 01 9F */ cmpwi r0, 0x19f
/* 8046F640 40 82 00 28 */ bne lbl_8046F668
/* 8046F644 28 1E 00 00 */ cmplwi r30, 0
/* 8046F648 41 82 00 20 */ beq lbl_8046F668
/* 8046F64C 28 1F 00 00 */ cmplwi r31, 0
/* 8046F650 41 82 00 18 */ beq lbl_8046F668
/* 8046F654 88 1E 05 68 */ lbz r0, 0x568(r30)
/* 8046F658 2C 00 00 00 */ cmpwi r0, 0
/* 8046F65C 40 82 00 0C */ bne lbl_8046F668
/* 8046F660 7F C3 F3 78 */ mr r3, r30
/* 8046F664 48 00 00 08 */ b lbl_8046F66C
lbl_8046F668:
/* 8046F668 38 60 00 00 */ li r3, 0
lbl_8046F66C:
/* 8046F66C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8046F670 83 C1 00 08 */ lwz r30, 8(r1)
/* 8046F674 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8046F678 7C 08 03 A6 */ mtlr r0
/* 8046F67C 38 21 00 10 */ addi r1, r1, 0x10
/* 8046F680 4E 80 00 20 */ blr
asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/s_swA_sub__FPvPv.s
-35
View File
@@ -1,35 +0,0 @@
lbl_8046F4AC:
/* 8046F4AC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8046F4B0 7C 08 02 A6 */ mflr r0
/* 8046F4B4 90 01 00 14 */ stw r0, 0x14(r1)
/* 8046F4B8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8046F4BC 93 C1 00 08 */ stw r30, 8(r1)
/* 8046F4C0 7C 7E 1B 78 */ mr r30, r3
/* 8046F4C4 7C 9F 23 78 */ mr r31, r4
/* 8046F4C8 4B BA 98 19 */ bl fopAc_IsActor__FPv
/* 8046F4CC 2C 03 00 00 */ cmpwi r3, 0
/* 8046F4D0 41 82 00 40 */ beq lbl_8046F510
/* 8046F4D4 A8 1E 00 08 */ lha r0, 8(r30)
/* 8046F4D8 2C 00 01 99 */ cmpwi r0, 0x199
/* 8046F4DC 40 82 00 34 */ bne lbl_8046F510
/* 8046F4E0 28 1E 00 00 */ cmplwi r30, 0
/* 8046F4E4 41 82 00 2C */ beq lbl_8046F510
/* 8046F4E8 28 1F 00 00 */ cmplwi r31, 0
/* 8046F4EC 41 82 00 24 */ beq lbl_8046F510
/* 8046F4F0 80 1E 00 B0 */ lwz r0, 0xb0(r30)
/* 8046F4F4 54 03 86 3E */ rlwinm r3, r0, 0x10, 0x18, 0x1f
/* 8046F4F8 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 8046F4FC 54 00 96 3E */ rlwinm r0, r0, 0x12, 0x18, 0x1f
/* 8046F500 7C 03 00 40 */ cmplw r3, r0
/* 8046F504 40 82 00 0C */ bne lbl_8046F510
/* 8046F508 7F C3 F3 78 */ mr r3, r30
/* 8046F50C 48 00 00 08 */ b lbl_8046F514
lbl_8046F510:
/* 8046F510 38 60 00 00 */ li r3, 0
lbl_8046F514:
/* 8046F514 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8046F518 83 C1 00 08 */ lwz r30, 8(r1)
/* 8046F51C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8046F520 7C 08 03 A6 */ mtlr r0
/* 8046F524 38 21 00 10 */ addi r1, r1, 0x10
/* 8046F528 4E 80 00 20 */ blr
asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/s_sw_sub__FPvPv.s
-31
View File
@@ -1,31 +0,0 @@
lbl_8046F52C:
/* 8046F52C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8046F530 7C 08 02 A6 */ mflr r0
/* 8046F534 90 01 00 14 */ stw r0, 0x14(r1)
/* 8046F538 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8046F53C 7C 7F 1B 78 */ mr r31, r3
/* 8046F540 4B BA 97 A1 */ bl fopAc_IsActor__FPv
/* 8046F544 2C 03 00 00 */ cmpwi r3, 0
/* 8046F548 41 82 00 3C */ beq lbl_8046F584
/* 8046F54C A8 1F 00 08 */ lha r0, 8(r31)
/* 8046F550 2C 00 01 9A */ cmpwi r0, 0x19a
/* 8046F554 40 82 00 30 */ bne lbl_8046F584
/* 8046F558 28 1F 00 00 */ cmplwi r31, 0
/* 8046F55C 41 82 00 28 */ beq lbl_8046F584
/* 8046F560 3C 60 80 48 */ lis r3, l_sw_id@ha /* 0x8047B1D8@ha */
/* 8046F564 38 63 B1 D8 */ addi r3, r3, l_sw_id@l /* 0x8047B1D8@l */
/* 8046F568 80 63 00 00 */ lwz r3, 0(r3)
/* 8046F56C 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 8046F570 54 00 06 3E */ clrlwi r0, r0, 0x18
/* 8046F574 7C 03 00 00 */ cmpw r3, r0
/* 8046F578 40 82 00 0C */ bne lbl_8046F584
/* 8046F57C 7F E3 FB 78 */ mr r3, r31
/* 8046F580 48 00 00 08 */ b lbl_8046F588
lbl_8046F584:
/* 8046F584 38 60 00 00 */ li r3, 0
lbl_8046F588:
/* 8046F588 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8046F58C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8046F590 7C 08 03 A6 */ mtlr r0
/* 8046F594 38 21 00 10 */ addi r1, r1, 0x10
/* 8046F598 4E 80 00 20 */ blr