mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-02 00:24:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Split SComponent (#45)

Browse Source 
* split c_math

* split c_angle

* split c_API_controller_pad

* split c_API_graphic

* split c_bg_s_chk

* c_bg_s_gnd_chk split

* more c_bg split

* split c_cc_d

* delete asm

* split c_cc_s

* split c_lib

* split c_m2d and c_m3d_g_aab

* split c_m3d_g_cir

* split c_m3d_g_cps

* split rest of c_m3d_g

* split c_m3d

* split c_malloc

* split c_request

* split c_sxyz

* split and partly decompile c_xyz

* format

* c_angle.h

* begin c_angle decomp

* c_angle

* progress adding stub classes for SComponent

* more c_m3d

* remove some asm and format

* more m3d headers

* more c_angle decomp

* c_lib headers

* add public to classes

* fix csXyz member names

* c_sxyz partly OK

* move Zero csXyz to c_sxyz header

* c_API_graphic

* delete some unused asm

* move math extern data, decompile some functions

* delete unused asm

* fix duplicated c_angle.h

* fix an inlined function name, add more inlined functions for c_angle.h (currently unused)

* format

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
lepelog
2021-01-07 02:04:53 +01:00
committed by GitHub
parent 792509e0a1
commit 0cf65151b3
921 changed files with 22374 additions and 59192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/d/a/obj/d_a_obj_item.s
+25 -25
View File
@@ -109,11 +109,11 @@ lbl_8015AF28:
/* 8015AF38 00157E78 38 61 00 34 */ addi r3, r1, 0x34
/* 8015AF3C 00157E7C 38 81 00 40 */ addi r4, r1, 0x40
/* 8015AF40 00157E80 FC 20 F0 90 */ fmr f1, f30
/* 8015AF44 00157E84 48 10 BC 41 */ bl cXyz_NS___ml
/* 8015AF44 00157E84 48 10 BC 41 */ bl __ml__4cXyzCFf
/* 8015AF48 00157E88 38 61 00 28 */ addi r3, r1, 0x28
/* 8015AF4C 00157E8C 38 81 00 34 */ addi r4, r1, 0x34
/* 8015AF50 00157E90 FC 20 F8 90 */ fmr f1, f31
/* 8015AF54 00157E94 48 10 BC 31 */ bl cXyz_NS___ml
/* 8015AF54 00157E94 48 10 BC 31 */ bl __ml__4cXyzCFf
/* 8015AF58 00157E98 C0 01 00 28 */ lfs f0, 0x28(r1)
/* 8015AF5C 00157E9C D0 1F 00 00 */ stfs f0, 0(r31)
/* 8015AF60 00157EA0 C0 01 00 2C */ lfs f0, 0x2c(r1)
@@ -525,10 +525,10 @@ daItem_c_NS_CreateInit:
/* 8015B4F4 00158434 EC 21 00 B2 */ fmuls f1, f1, f2
lbl_8015B4F8:
/* 8015B4F8 00158438 38 7F 09 04 */ addi r3, r31, 0x904
/* 8015B4FC 0015843C 48 11 3D 05 */ bl cM3dGCyl_NS_SetR
/* 8015B4FC 0015843C 48 11 3D 05 */ bl SetR__8cM3dGCylFf
/* 8015B500 00158440 38 7F 09 04 */ addi r3, r31, 0x904
/* 8015B504 00158444 FC 20 F8 90 */ fmr f1, f31
/* 8015B508 00158448 48 11 3C F1 */ bl cM3dGCyl_NS_SetH
/* 8015B508 00158448 48 11 3C F1 */ bl SetH__8cM3dGCylFf
/* 8015B50C 0015844C 7F E3 FB 78 */ mr r3, r31
/* 8015B510 00158450 48 00 02 AD */ bl daItem_c_NS_setCullInfo
/* 8015B514 00158454 7F E3 FB 78 */ mr r3, r31
@@ -1213,7 +1213,7 @@ daItem_c_NS_procInitNormal:
/* 8015BED0 00158E10 48 00 0B E9 */ bl daItem_c_NS_move_proc_call
/* 8015BED4 00158E14 38 7F 04 EC */ addi r3, r31, 0x4ec
/* 8015BED8 00158E18 38 9F 09 30 */ addi r4, r31, 0x930
/* 8015BEDC 00158E1C 48 10 B1 91 */ bl cXyz_NS___ne
/* 8015BEDC 00158E1C 48 10 B1 91 */ bl __ne__4cXyzCFRC3Vec
/* 8015BEE0 00158E20 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8015BEE4 00158E24 41 82 00 70 */ beq lbl_8015BF54
/* 8015BEE8 00158E28 7F E3 FB 78 */ mr r3, r31
@@ -1234,15 +1234,15 @@ daItem_c_NS_procInitNormal:
/* 8015BF24 00158E64 38 7F 04 EC */ addi r3, r31, 0x4ec
/* 8015BF28 00158E68 C0 3F 09 30 */ lfs f1, 0x930(r31)
/* 8015BF2C 00158E6C FC 40 F8 90 */ fmr f2, f31
/* 8015BF30 00158E70 48 11 48 11 */ bl cLib_chaseF
/* 8015BF30 00158E70 48 11 48 11 */ bl cLib_chaseF__FPfff
/* 8015BF34 00158E74 38 7F 04 F0 */ addi r3, r31, 0x4f0
/* 8015BF38 00158E78 C0 3F 09 34 */ lfs f1, 0x934(r31)
/* 8015BF3C 00158E7C FC 40 F0 90 */ fmr f2, f30
/* 8015BF40 00158E80 48 11 48 01 */ bl cLib_chaseF
/* 8015BF40 00158E80 48 11 48 01 */ bl cLib_chaseF__FPfff
/* 8015BF44 00158E84 38 7F 04 F4 */ addi r3, r31, 0x4f4
/* 8015BF48 00158E88 C0 3F 09 38 */ lfs f1, 0x938(r31)
/* 8015BF4C 00158E8C FC 40 E8 90 */ fmr f2, f29
/* 8015BF50 00158E90 48 11 47 F1 */ bl cLib_chaseF
/* 8015BF50 00158E90 48 11 47 F1 */ bl cLib_chaseF__FPfff
lbl_8015BF54:
/* 8015BF54 00158E94 A8 1F 09 42 */ lha r0, 0x942(r31)
/* 8015BF58 00158E98 2C 00 00 00 */ cmpwi r0, 0
@@ -1266,12 +1266,12 @@ lbl_8015BF74:
lbl_8015BF9C:
/* 8015BF9C 00158EDC 38 7F 09 04 */ addi r3, r31, 0x904
/* 8015BFA0 00158EE0 38 9F 04 D0 */ addi r4, r31, 0x4d0
/* 8015BFA4 00158EE4 48 11 32 39 */ bl cM3dGCyl_NS_SetC
/* 8015BFA4 00158EE4 48 11 32 39 */ bl SetC__8cM3dGCylFRC4cXyz
/* 8015BFA8 00158EE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015BFAC 00158EEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015BFB0 00158EF0 38 63 23 3C */ addi r3, r3, 0x233c
/* 8015BFB4 00158EF4 38 9F 07 E0 */ addi r4, r31, 0x7e0
/* 8015BFB8 00158EF8 48 10 8B F1 */ bl cCcS_NS_Set
/* 8015BFB8 00158EF8 48 10 8B F1 */ bl Set__4cCcSFP8cCcD_Obj
/* 8015BFBC 00158EFC E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0
/* 8015BFC0 00158F00 CB E1 00 30 */ lfd f31, 0x30(r1)
/* 8015BFC4 00158F04 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0
@@ -1611,7 +1611,7 @@ daItem_c_NS_procInitBoomerangCarry:
/* 8015C498 001593D8 C8 01 00 08 */ lfd f0, 8(r1)
/* 8015C49C 001593DC EC 00 08 28 */ fsubs f0, f0, f1
/* 8015C4A0 001593E0 EC 22 00 32 */ fmuls f1, f2, f0
/* 8015C4A4 001593E4 48 11 2D 5D */ bl cM3dGCyl_NS_SetR
/* 8015C4A4 001593E4 48 11 2D 5D */ bl SetR__8cM3dGCylFf
/* 8015C4A8 001593E8 38 7F 09 04 */ addi r3, r31, 0x904
/* 8015C4AC 001593EC C0 42 9B 9C */ lfs f2, lbl_8045359C-_SDA2_BASE_(r2)
/* 8015C4B0 001593F0 57 C0 06 3E */ clrlwi r0, r30, 0x18
@@ -1622,7 +1622,7 @@ daItem_c_NS_procInitBoomerangCarry:
/* 8015C4C4 00159404 C8 01 00 10 */ lfd f0, 0x10(r1)
/* 8015C4C8 00159408 EC 00 08 28 */ fsubs f0, f0, f1
/* 8015C4CC 0015940C EC 22 00 32 */ fmuls f1, f2, f0
/* 8015C4D0 00159410 48 11 2D 29 */ bl cM3dGCyl_NS_SetH
/* 8015C4D0 00159410 48 11 2D 29 */ bl SetH__8cM3dGCylFf
/* 8015C4D4 00159414 80 1F 08 0C */ lwz r0, 0x80c(r31)
/* 8015C4D8 00159418 60 00 00 01 */ ori r0, r0, 1
/* 8015C4DC 0015941C 90 1F 08 0C */ stw r0, 0x80c(r31)
@@ -1685,12 +1685,12 @@ lbl_8015C59C:
/* 8015C5B8 001594F8 48 00 22 C5 */ bl daPy_boomerangMove_c_NS_bgCheckAfterOffset
/* 8015C5BC 001594FC 38 7D 09 04 */ addi r3, r29, 0x904
/* 8015C5C0 00159500 38 9D 04 D0 */ addi r4, r29, 0x4d0
/* 8015C5C4 00159504 48 11 2C 19 */ bl cM3dGCyl_NS_SetC
/* 8015C5C4 00159504 48 11 2C 19 */ bl SetC__8cM3dGCylFRC4cXyz
/* 8015C5C8 00159508 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015C5CC 0015950C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015C5D0 00159510 38 63 23 3C */ addi r3, r3, 0x233c
/* 8015C5D4 00159514 38 9D 07 E0 */ addi r4, r29, 0x7e0
/* 8015C5D8 00159518 48 10 85 D1 */ bl cCcS_NS_Set
/* 8015C5D8 00159518 48 10 85 D1 */ bl Set__4cCcSFP8cCcD_Obj
/* 8015C5DC 0015951C 39 61 00 20 */ addi r11, r1, 0x20
/* 8015C5E0 00159520 48 20 5C 49 */ bl _restgpr_29
/* 8015C5E4 00159524 80 01 00 24 */ lwz r0, 0x24(r1)
@@ -1867,7 +1867,7 @@ lbl_8015C818:
/* 8015C84C 0015978C 38 61 00 18 */ addi r3, r1, 0x18
/* 8015C850 00159790 38 81 00 24 */ addi r4, r1, 0x24
/* 8015C854 00159794 38 BF 04 D0 */ addi r5, r31, 0x4d0
/* 8015C858 00159798 48 10 A2 DD */ bl cXyz_NS___mi
/* 8015C858 00159798 48 10 A2 DD */ bl __mi__4cXyzCFRC3Vec
/* 8015C85C 0015979C C0 01 00 18 */ lfs f0, 0x18(r1)
/* 8015C860 001597A0 D0 01 00 3C */ stfs f0, 0x3c(r1)
/* 8015C864 001597A4 C0 01 00 1C */ lfs f0, 0x1c(r1)
@@ -1962,7 +1962,7 @@ lbl_8015C960:
/* 8015C9A4 001598E4 38 61 00 0C */ addi r3, r1, 0xc
/* 8015C9A8 001598E8 38 9E 04 D0 */ addi r4, r30, 0x4d0
/* 8015C9AC 001598EC 38 A1 00 30 */ addi r5, r1, 0x30
/* 8015C9B0 001598F0 48 10 A1 35 */ bl cXyz_NS___pl
/* 8015C9B0 001598F0 48 10 A1 35 */ bl __pl__4cXyzCFRC3Vec
/* 8015C9B4 001598F4 C0 01 00 0C */ lfs f0, 0xc(r1)
/* 8015C9B8 001598F8 D0 1F 04 D0 */ stfs f0, 0x4d0(r31)
/* 8015C9BC 001598FC C0 01 00 10 */ lfs f0, 0x10(r1)
@@ -1970,7 +1970,7 @@ lbl_8015C960:
/* 8015C9C4 00159904 C0 01 00 14 */ lfs f0, 0x14(r1)
/* 8015C9C8 00159908 D0 1F 04 D8 */ stfs f0, 0x4d8(r31)
/* 8015C9CC 0015990C C0 22 9B A8 */ lfs f1, lbl_804535A8-_SDA2_BASE_(r2)
/* 8015C9D0 00159910 48 10 AF BD */ bl cM_rndFX
/* 8015C9D0 00159910 48 10 AF BD */ bl cM_rndFX__Ff
/* 8015C9D4 00159914 A8 1E 04 E6 */ lha r0, 0x4e6(r30)
/* 8015C9D8 00159918 C8 42 9B B0 */ lfd f2, lbl_804535B0-_SDA2_BASE_(r2)
/* 8015C9DC 0015991C 6C 00 80 00 */ xoris r0, r0, 0x8000
@@ -2021,12 +2021,12 @@ lbl_8015C960:
lbl_8015CA80:
/* 8015CA80 001599C0 38 7F 09 04 */ addi r3, r31, 0x904
/* 8015CA84 001599C4 38 9F 04 D0 */ addi r4, r31, 0x4d0
/* 8015CA88 001599C8 48 11 27 55 */ bl cM3dGCyl_NS_SetC
/* 8015CA88 001599C8 48 11 27 55 */ bl SetC__8cM3dGCylFRC4cXyz
/* 8015CA8C 001599CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015CA90 001599D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015CA94 001599D4 38 63 23 3C */ addi r3, r3, 0x233c
/* 8015CA98 001599D8 38 9F 07 E0 */ addi r4, r31, 0x7e0
/* 8015CA9C 001599DC 48 10 81 0D */ bl cCcS_NS_Set
/* 8015CA9C 001599DC 48 10 81 0D */ bl Set__4cCcSFP8cCcD_Obj
/* 8015CAA0 001599E0 83 E1 00 5C */ lwz r31, 0x5c(r1)
/* 8015CAA4 001599E4 83 C1 00 58 */ lwz r30, 0x58(r1)
/* 8015CAA8 001599E8 80 01 00 64 */ lwz r0, 0x64(r1)
@@ -2094,7 +2094,7 @@ lbl_8015CB44:
/* 8015CB8C 00159ACC 40 82 00 40 */ bne lbl_8015CBCC
/* 8015CB90 00159AD0 38 7E 09 6C */ addi r3, r30, 0x96c
/* 8015CB94 00159AD4 38 9E 04 D0 */ addi r4, r30, 0x4d0
/* 8015CB98 00159AD8 48 10 A4 95 */ bl cXyz_NS___eq
/* 8015CB98 00159AD8 48 10 A4 95 */ bl __eq__4cXyzCFRC3Vec
/* 8015CB9C 00159ADC 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8015CBA0 00159AE0 41 82 00 2C */ beq lbl_8015CBCC
/* 8015CBA4 00159AE4 80 1E 05 B8 */ lwz r0, 0x5b8(r30)
@@ -2954,7 +2954,7 @@ daItem_c_NS_bg_check:
lbl_8015D774:
/* 8015D774 0015A6B4 C0 3F 04 F8 */ lfs f1, 0x4f8(r31)
/* 8015D778 0015A6B8 C0 5F 05 00 */ lfs f2, 0x500(r31)
/* 8015D77C 0015A6BC 48 10 9E F9 */ bl cM_atan2s
/* 8015D77C 0015A6BC 48 10 9E F9 */ bl cM_atan2s__Fff
/* 8015D780 0015A6C0 B0 7F 04 DE */ sth r3, 0x4de(r31)
lbl_8015D784:
/* 8015D784 0015A6C4 80 1F 05 B8 */ lwz r0, 0x5b8(r31)
@@ -3152,7 +3152,7 @@ daItem_c_NS_initAction:
/* 8015DA2C 0015A96C 2C 03 00 00 */ cmpwi r3, 0
/* 8015DA30 0015A970 41 82 00 5C */ beq lbl_8015DA8C
/* 8015DA34 0015A974 C0 22 9B C4 */ lfs f1, lbl_804535C4-_SDA2_BASE_(r2)
/* 8015DA38 0015A978 48 10 9F 1D */ bl cM_rndF
/* 8015DA38 0015A978 48 10 9F 1D */ bl cM_rndF__Ff
/* 8015DA3C 0015A97C C0 02 9B CC */ lfs f0, lbl_804535CC-_SDA2_BASE_(r2)
/* 8015DA40 0015A980 EC 20 08 2A */ fadds f1, f0, f1
/* 8015DA44 0015A984 C0 02 9B 98 */ lfs f0, lbl_80453598-_SDA2_BASE_(r2)
@@ -3168,7 +3168,7 @@ daItem_c_NS_initAction:
/* 8015DA6C 0015A9AC 90 01 00 08 */ stw r0, 8(r1)
/* 8015DA70 0015A9B0 C8 01 00 08 */ lfd f0, 8(r1)
/* 8015DA74 0015A9B4 EC 20 08 28 */ fsubs f1, f0, f1
/* 8015DA78 0015A9B8 48 10 9F 15 */ bl cM_rndFX
/* 8015DA78 0015A9B8 48 10 9F 15 */ bl cM_rndFX__Ff
/* 8015DA7C 0015A9BC FC 00 08 1E */ fctiwz f0, f1
/* 8015DA80 0015A9C0 D8 01 00 10 */ stfd f0, 0x10(r1)
/* 8015DA84 0015A9C4 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -3310,7 +3310,7 @@ daItem_c_NS_initSpeed:
/* 8015DC70 0015ABB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015DC74 0015ABB4 83 E3 5D AC */ lwz r31, 0x5dac(r3)
/* 8015DC78 0015ABB8 C0 22 9B C4 */ lfs f1, lbl_804535C4-_SDA2_BASE_(r2)
/* 8015DC7C 0015ABBC 48 10 9D 11 */ bl cM_rndFX
/* 8015DC7C 0015ABBC 48 10 9D 11 */ bl cM_rndFX__Ff
/* 8015DC80 0015ABC0 FF E0 08 90 */ fmr f31, f1
/* 8015DC84 0015ABC4 7F A3 EB 78 */ mr r3, r29
/* 8015DC88 0015ABC8 4B FF D4 31 */ bl daItemBase_c_NS_getData
@@ -3361,7 +3361,7 @@ lbl_8015DD04:
/* 8015DD2C 0015AC6C C0 02 9B D0 */ lfs f0, lbl_804535D0-_SDA2_BASE_(r2)
/* 8015DD30 0015AC70 EF C0 00 72 */ fmuls f30, f0, f1
/* 8015DD34 0015AC74 C0 22 9B A8 */ lfs f1, lbl_804535A8-_SDA2_BASE_(r2)
/* 8015DD38 0015AC78 48 10 9C 55 */ bl cM_rndFX
/* 8015DD38 0015AC78 48 10 9C 55 */ bl cM_rndFX__Ff
/* 8015DD3C 0015AC7C A8 1F 04 E6 */ lha r0, 0x4e6(r31)
/* 8015DD40 0015AC80 C8 42 9B B0 */ lfd f2, lbl_804535B0-_SDA2_BASE_(r2)
/* 8015DD44 0015AC84 6C 00 80 00 */ xoris r0, r0, 0x8000