darkkirb/donut-decomp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge mtx

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2022-10-17 09:09:31 +01:00
parent 2c6145b76a
commit b9c7017018
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
13 changed files with 135 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
asm/mtx/mtx_800304e0.s → asm/mtx/mtx.s
View file

@ -821,3 +821,49 @@ C_MTXLightOrtho:
/* 800310E4 0002CF24 4E 80 00 20 */ blr /* 800310E4 0002CF24 4E 80 00 20 */ blr
/* 800310E8 0002CF28 00 00 00 00 */ .4byte 0x00000000 /* 800310E8 0002CF28 00 00 00 00 */ .4byte 0x00000000
/* 800310EC 0002CF2C 00 00 00 00 */ .4byte 0x00000000 /* 800310EC 0002CF2C 00 00 00 00 */ .4byte 0x00000000
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global Unit01
Unit01:
.4byte 0
.4byte 0x3F800000
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@1635"
"@1635":
.4byte 0x3F800000
.global "@1636"
"@1636":
.4byte 0
.global "@1729"
"@1729":
.4byte 0x3F000000
.global "@1730"
"@1730":
.4byte 0x40400000
.global "@1756"
"@1756":
.4byte 0x40000000
.global "@1779_8055E544"
"@1779_8055E544":
.4byte 0xBF800000
.global "@1786_8055E548"
"@1786_8055E548":
.4byte 0x3C8EFA35
.4byte 0

32
asm/mtx/mtx44_800311b0.s → asm/mtx/mtx44.s
View file

@ -217,3 +217,35 @@ PSMTX44Concat:
/* 800314E4 0002D324 00 00 00 00 */ .4byte 0x00000000 /* 800314E4 0002D324 00 00 00 00 */ .4byte 0x00000000
/* 800314E8 0002D328 00 00 00 00 */ .4byte 0x00000000 /* 800314E8 0002D328 00 00 00 00 */ .4byte 0x00000000
/* 800314EC 0002D32C 00 00 00 00 */ .4byte 0x00000000 /* 800314EC 0002D32C 00 00 00 00 */ .4byte 0x00000000
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@1671_8055E550"
"@1671_8055E550":
.4byte 0x3F800000
.global "@1672"
"@1672":
.4byte 0x40000000
.global "@1673_8055E558"
"@1673_8055E558":
.4byte 0
.global "@1674_8055E55C"
"@1674_8055E55C":
.4byte 0xBF800000
.global "@1681"
"@1681":
.4byte 0x3F000000
.global "@1682_8055E564"
"@1682_8055E564":
.4byte 0x3C8EFA35

32
asm/mtx/mtx44_8055e550.s
View file

@ -1,32 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@1671_8055E550"
"@1671_8055E550":
.4byte 0x3F800000
.global "@1672"
"@1672":
.4byte 0x40000000
.global "@1673_8055E558"
"@1673_8055E558":
.4byte 0
.global "@1674_8055E55C"
"@1674_8055E55C":
.4byte 0xBF800000
.global "@1681"
"@1681":
.4byte 0x3F000000
.global "@1682_8055E564"
"@1682_8055E564":
.4byte 0x3C8EFA35

0
asm/mtx/mtx44vec_800314f0.s → asm/mtx/mtx44vec.s
View file

8
asm/mtx/mtx_80556560.s
View file

@ -1,8 +0,0 @@
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global Unit01
Unit01:
.4byte 0
.4byte 0x3F800000

38
asm/mtx/mtx_8055e530.s
View file

@ -1,38 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@1635"
"@1635":
.4byte 0x3F800000
.global "@1636"
"@1636":
.4byte 0
.global "@1729"
"@1729":
.4byte 0x3F000000
.global "@1730"
"@1730":
.4byte 0x40400000
.global "@1756"
"@1756":
.4byte 0x40000000
.global "@1779_8055E544"
"@1779_8055E544":
.4byte 0xBF800000
.global "@1786_8055E548"
"@1786_8055E548":
.4byte 0x3C8EFA35
.4byte 0

0
asm/mtx/mtxvec_800310f0.s → asm/mtx/mtxvec.s
View file

32
asm/mtx/quat_800317b0.s → asm/mtx/quat.s
View file

@ -309,3 +309,35 @@ lbl_80031B80:
/* 80031C14 0002DA54 38 21 00 60 */ addi r1, r1, 0x60 /* 80031C14 0002DA54 38 21 00 60 */ addi r1, r1, 0x60
/* 80031C18 0002DA58 4E 80 00 20 */ blr /* 80031C18 0002DA58 4E 80 00 20 */ blr
/* 80031C1C 0002DA5C 00 00 00 00 */ .4byte 0x00000000 /* 80031C1C 0002DA5C 00 00 00 00 */ .4byte 0x00000000
.include "macros.inc"
.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0
.global "@1420"
"@1420":
.4byte 0x00000001
.4byte 0x00000002
.4byte 0
.4byte 0
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@1598"
"@1598":
.4byte 0x3F800000
.global "@1599"
"@1599":
.4byte 0
.global "@1603"
"@1603":
.4byte 0x3F000000
.global "@1754"
"@1754":
.4byte 0x3F7FFF58

10
asm/mtx/quat_80407840.s
View file

@ -1,10 +0,0 @@
.include "macros.inc"
.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0
.global "@1420"
"@1420":
.4byte 0x00000001
.4byte 0x00000002
.4byte 0
.4byte 0

22
asm/mtx/quat_8055e578.s
View file

@ -1,22 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@1598"
"@1598":
.4byte 0x3F800000
.global "@1599"
"@1599":
.4byte 0
.global "@1603"
"@1603":
.4byte 0x3F000000
.global "@1754"
"@1754":
.4byte 0x3F7FFF58

18
asm/mtx/vec_80031570.s → asm/mtx/vec.s
View file

@ -163,3 +163,21 @@ PSVECSquareDistance:
/* 800317A4 0002D5E4 4E 80 00 20 */ blr /* 800317A4 0002D5E4 4E 80 00 20 */ blr
/* 800317A8 0002D5E8 00 00 00 00 */ .4byte 0x00000000 /* 800317A8 0002D5E8 00 00 00 00 */ .4byte 0x00000000
/* 800317AC 0002D5EC 00 00 00 00 */ .4byte 0x00000000 /* 800317AC 0002D5EC 00 00 00 00 */ .4byte 0x00000000
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@1414"
"@1414":
.4byte 0x3F000000
.global "@1415_8055E56C"
"@1415_8055E56C":
.4byte 0x40400000
.global "@1443"
"@1443":
.4byte 0
.4byte 0

18
asm/mtx/vec_8055e568.s
View file

@ -1,18 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@1414"
"@1414":
.4byte 0x3F000000
.global "@1415_8055E56C"
"@1415_8055E56C":
.4byte 0x40400000
.global "@1443"
"@1443":
.4byte 0
.4byte 0

19
obj_files.mk
View file

@ -158,14 +158,15 @@ $(BUILD_DIR)/asm/vi/vi.o \
$(BUILD_DIR)/asm/vi/i2c.o \ $(BUILD_DIR)/asm/vi/i2c.o \
$(BUILD_DIR)/asm/vi/vi3in1.o \ $(BUILD_DIR)/asm/vi/vi3in1.o \
\ \
$(BUILD_DIR)/asm/mtx/mtx.o \
$(BUILD_DIR)/asm/mtx/mtxvec.o \
$(BUILD_DIR)/asm/mtx/mtx44.o \
$(BUILD_DIR)/asm/mtx/mtx44vec.o \
$(BUILD_DIR)/asm/mtx/vec.o \
$(BUILD_DIR)/asm/mtx/quat.o \
\
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
$(BUILD_DIR)/asm/mtx/mtx_800304e0.o \
$(BUILD_DIR)/asm/mtx/mtxvec_800310f0.o \
$(BUILD_DIR)/asm/mtx/mtx44_800311b0.o \
$(BUILD_DIR)/asm/mtx/mtx44vec_800314f0.o \
$(BUILD_DIR)/asm/mtx/vec_80031570.o \
$(BUILD_DIR)/asm/mtx/quat_800317b0.o \
$(BUILD_DIR)/asm/gx/GXInit_80031c20.o \ $(BUILD_DIR)/asm/gx/GXInit_80031c20.o \
$(BUILD_DIR)/asm/gx/GXFifo_80032db0.o \ $(BUILD_DIR)/asm/gx/GXFifo_80032db0.o \
$(BUILD_DIR)/asm/gx/GXAttr_800337a0.o \ $(BUILD_DIR)/asm/gx/GXAttr_800337a0.o \
@ -2989,7 +2990,6 @@ $(BUILD_DIR)/asm/src/MintSERequestor_80406524.o \
$(BUILD_DIR)/asm/src/Alarm_80406528.o \ $(BUILD_DIR)/asm/src/Alarm_80406528.o \
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_8040652c.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_8040652c.o \
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80406548.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80406548.o \
$(BUILD_DIR)/asm/mtx/quat_80407840.o \
$(BUILD_DIR)/asm/dvd/dvdFatal_80407850.o \ $(BUILD_DIR)/asm/dvd/dvdFatal_80407850.o \
$(BUILD_DIR)/asm/dvd/dvdDeviceError_80407888.o \ $(BUILD_DIR)/asm/dvd/dvdDeviceError_80407888.o \
$(BUILD_DIR)/asm/nand/nand_804078a8.o \ $(BUILD_DIR)/asm/nand/nand_804078a8.o \
@ -5181,7 +5181,6 @@ $(BUILD_DIR)/asm/src/ScoreCoin_80554888.o \
$(BUILD_DIR)/asm/src/EffectLocatorModelDesc_805549b8.o \ $(BUILD_DIR)/asm/src/EffectLocatorModelDesc_805549b8.o \
$(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \ $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \
$(BUILD_DIR)/asm/src/Table_80556398.o \ $(BUILD_DIR)/asm/src/Table_80556398.o \
$(BUILD_DIR)/asm/mtx/mtx_80556560.o \
$(BUILD_DIR)/asm/gx/GXInit_80556568.o \ $(BUILD_DIR)/asm/gx/GXInit_80556568.o \
$(BUILD_DIR)/asm/gx/GXAttr_80556570.o \ $(BUILD_DIR)/asm/gx/GXAttr_80556570.o \
$(BUILD_DIR)/asm/gx/GXTexture_80556580.o \ $(BUILD_DIR)/asm/gx/GXTexture_80556580.o \
@ -5859,10 +5858,6 @@ $(BUILD_DIR)/asm/src/SequenceProductRoot_8055df48.o \
$(BUILD_DIR)/asm/src/MintSERequestor_8055df58.o \ $(BUILD_DIR)/asm/src/MintSERequestor_8055df58.o \
$(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \ $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \
$(BUILD_DIR)/asm/src/Alarm_8055df68.o \ $(BUILD_DIR)/asm/src/Alarm_8055df68.o \
$(BUILD_DIR)/asm/mtx/mtx_8055e530.o \
$(BUILD_DIR)/asm/mtx/mtx44_8055e550.o \
$(BUILD_DIR)/asm/mtx/vec_8055e568.o \
$(BUILD_DIR)/asm/mtx/quat_8055e578.o \
$(BUILD_DIR)/asm/gx/GXInit_8055e588.o \ $(BUILD_DIR)/asm/gx/GXInit_8055e588.o \
$(BUILD_DIR)/asm/gx/GXFrameBuf_8055e5b0.o \ $(BUILD_DIR)/asm/gx/GXFrameBuf_8055e5b0.o \
$(BUILD_DIR)/asm/gx/GXLight_8055e5b8.o \ $(BUILD_DIR)/asm/gx/GXLight_8055e5b8.o \