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

merge namespace hel::math

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2022-10-21 16:05:17 +01:00
parent 9e0c407318
commit 787e2963c1
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
23 changed files with 243 additions and 256 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
asm/src/Direction3_80406318.s
View file

@ -1,4 +0,0 @@
.include "macros.inc"
.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0
.4byte "__sinit_@@1Direction3_cpp"

14
asm/src/Direction3_80545260.s
View file

@ -1,14 +0,0 @@
.include "macros.inc"
.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20
.global BASIS__Q33hel4math10Direction3
BASIS__Q33hel4math10Direction3:
.skip 0x24
.global FRONT_TO_RIGHT__Q33hel4math10Direction3
FRONT_TO_RIGHT__Q33hel4math10Direction3:
.skip 0x24
.global FRONT_TO_LEFT__Q33hel4math10Direction3
FRONT_TO_LEFT__Q33hel4math10Direction3:
.skip 0x28

18
asm/src/Direction3_8055f828.s
View file

@ -1,18 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@55184_8055F828"
"@55184_8055F828":
.4byte 0
.global "@55436"
"@55436":
.4byte 0x3F800000
.global "@55438"
"@55438":
.4byte 0xBF800000
.4byte 0

22
asm/src/Matrix34_8055f838.s
View file

@ -1,22 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@51888_8055F838"
"@51888_8055F838":
.4byte 0x4222F983
.global "@51900_8055F83C"
"@51900_8055F83C":
.4byte 0x3F360B61
.global "@51977"
"@51977":
.4byte 0x3727C5AC
.global "@51978"
"@51978":
.4byte 0x3F800000

9
asm/src/Point2_8019ec6c.s
View file

@ -1,9 +0,0 @@
.include "macros.inc"
.section .text, "ax" # 0x80006A00 - 0x80406260 ; 0x003FF860
.global "__sinit_@@1Point2_cpp"
"__sinit_@@1Point2_cpp":
/* 8019EC6C 0019AAAC 38 6D EE 20 */ addi r3, r13, ORIGIN__Q33hel4math6Point2@sda21
/* 8019EC70 0019AAB0 C0 22 98 C8 */ lfs f1, "@49826"@sda21(r2)
/* 8019EC74 0019AAB4 FC 40 08 90 */ fmr f2, f1
/* 8019EC78 0019AAB8 48 00 07 30 */ b set__Q33hel4math7Vector2Fff

4
asm/src/Point2_8040631c.s
View file

@ -1,4 +0,0 @@
.include "macros.inc"
.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0
.4byte "__sinit_@@1Point2_cpp"

6
asm/src/Point2_8055d240.s
View file

@ -1,6 +0,0 @@
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global ORIGIN__Q33hel4math6Point2
ORIGIN__Q33hel4math6Point2:
.skip 0x8

8
asm/src/Point2_8055f848.s
View file

@ -1,8 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@49826"
"@49826":
.4byte 0
.4byte 0

28
asm/src/Random_8055f850.s
View file

@ -1,28 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@49032_8055F850"
"@49032_8055F850":
.4byte 0
.global "@49057_8055F854"
"@49057_8055F854":
.4byte 0xBF800000
.global "@49058_8055F858"
"@49058_8055F858":
.4byte 0x40000000
.global "@49069_8055F85C"
"@49069_8055F85C":
.4byte 0x47800000
.global "@49072_8055F860"
"@49072_8055F860":
.4byte 0x43300000
.4byte 0

4
asm/src/Vector2_80406320.s
View file

@ -1,4 +0,0 @@
.include "macros.inc"
.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0
.4byte "__sinit_@@1Vector2_cpp"

22
asm/src/Vector2_8055d248.s
View file

@ -1,22 +0,0 @@
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global ZERO__Q33hel4math7Vector2
ZERO__Q33hel4math7Vector2:
.skip 0x4
.global lbl_8055D24C
lbl_8055D24C:
.skip 0x4
.global ALL_ONE__Q33hel4math7Vector2
ALL_ONE__Q33hel4math7Vector2:
.skip 0x8
.global BASIS_X__Q33hel4math7Vector2
BASIS_X__Q33hel4math7Vector2:
.skip 0x8
.global BASIS_Y__Q33hel4math7Vector2
BASIS_Y__Q33hel4math7Vector2:
.skip 0x8

28
asm/src/Vector2_8055f868.s
View file

@ -1,28 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@50690_8055F868"
"@50690_8055F868":
.4byte 0
.global "@50708"
"@50708":
.4byte 0x3F800000
.global "@50709"
"@50709":
.4byte 0xBF800000
.global "@50737"
"@50737":
.4byte 0x3727C5AC
.global "@50738"
"@50738":
.4byte 0x40490FDB
.4byte 0

4
asm/src/Vector3_80406324.s
View file

@ -1,4 +0,0 @@
.include "macros.inc"
.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0
.4byte "__sinit_@@1Vector3_cpp"

22
asm/src/Vector3_805452d0.s
View file

@ -1,22 +0,0 @@
.include "macros.inc"
.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20
.global ZERO__Q33hel4math7Vector3
ZERO__Q33hel4math7Vector3:
.skip 0xC
.global ALL_ONE__Q33hel4math7Vector3
ALL_ONE__Q33hel4math7Vector3:
.skip 0xC
.global BASIS_X__Q33hel4math7Vector3
BASIS_X__Q33hel4math7Vector3:
.skip 0xC
.global BASIS_Y__Q33hel4math7Vector3
BASIS_Y__Q33hel4math7Vector3:
.skip 0xC
.global BASIS_Z__Q33hel4math7Vector3
BASIS_Z__Q33hel4math7Vector3:
.skip 0x10

42
asm/src/Vector3_8055f880.s
View file

@ -1,42 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@51176"
"@51176":
.4byte 0
.global "@51220"
"@51220":
.4byte 0x3F800000
.global "@51221"
"@51221":
.4byte 0xBF800000
.global "@51266"
"@51266":
.4byte 0x4222F983
.global "@51306"
"@51306":
.4byte 0x3727C5AC
.global "@51307"
"@51307":
.4byte 0x3F000000
.global "@51308"
"@51308":
.4byte 0x3FC90FDB
.global "@51309"
"@51309":
.4byte 0x40000000

36
asm/src/Direction3_8019df7c.s → asm/src/hel/math/Direction3.s
View file

@ -440,3 +440,39 @@ lbl_8019E420:
/* 8019E584 0019A3C4 7C 08 03 A6 */ mtlr r0
/* 8019E588 0019A3C8 38 21 00 90 */ addi r1, r1, 0x90
/* 8019E58C 0019A3CC 4E 80 00 20 */ blr
.include "macros.inc"
.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0
.4byte "__sinit_@@1Direction3_cpp"
.include "macros.inc"
.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20
.global BASIS__Q33hel4math10Direction3
BASIS__Q33hel4math10Direction3:
.skip 0x24
.global FRONT_TO_RIGHT__Q33hel4math10Direction3
FRONT_TO_RIGHT__Q33hel4math10Direction3:
.skip 0x24
.global FRONT_TO_LEFT__Q33hel4math10Direction3
FRONT_TO_LEFT__Q33hel4math10Direction3:
.skip 0x28
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@55184_8055F828"
"@55184_8055F828":
.4byte 0
.global "@55436"
"@55436":
.4byte 0x3F800000
.global "@55438"
"@55438":
.4byte 0xBF800000
.4byte 0

22
asm/src/Matrix34_8019e590.s → asm/src/hel/math/Matrix34.s
View file

@ -368,3 +368,25 @@ lbl_8019EACC:
/* 8019EAE0 0019A920 7C 08 03 A6 */ mtlr r0
/* 8019EAE4 0019A924 38 21 00 50 */ addi r1, r1, 0x50
/* 8019EAE8 0019A928 4E 80 00 20 */ blr
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@51888_8055F838"
"@51888_8055F838":
.4byte 0x4222F983
.global "@51900_8055F83C"
"@51900_8055F83C":
.4byte 0x3F360B61
.global "@51977"
"@51977":
.4byte 0x3727C5AC
.global "@51978"
"@51978":
.4byte 0x3F800000

0
asm/src/Matrix44_8019eaec.s → asm/src/hel/math/Matrix44.s
View file

27
asm/src/hel/math/Point2.s Normal file
View file

@ -0,0 +1,27 @@
.include "macros.inc"
.section .text, "ax" # 0x80006A00 - 0x80406260 ; 0x003FF860
.global "__sinit_@@1Point2_cpp"
"__sinit_@@1Point2_cpp":
/* 8019EC6C 0019AAAC 38 6D EE 20 */ addi r3, r13, ORIGIN__Q33hel4math6Point2@sda21
/* 8019EC70 0019AAB0 C0 22 98 C8 */ lfs f1, "@49826"@sda21(r2)
/* 8019EC74 0019AAB4 FC 40 08 90 */ fmr f2, f1
/* 8019EC78 0019AAB8 48 00 07 30 */ b set__Q33hel4math7Vector2Fff
.include "macros.inc"
.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0
.4byte "__sinit_@@1Point2_cpp"
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global ORIGIN__Q33hel4math6Point2
ORIGIN__Q33hel4math6Point2:
.skip 0x8
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@49826"
"@49826":
.4byte 0
.4byte 0

28
asm/src/Random_8019ec7c.s → asm/src/hel/math/Random.s
View file

@ -218,3 +218,31 @@ randCoreF32__Q33hel4math6RandomFv:
/* 8019EF4C 0019AD8C 7C 08 03 A6 */ mtlr r0
/* 8019EF50 0019AD90 38 21 00 10 */ addi r1, r1, 0x10
/* 8019EF54 0019AD94 4E 80 00 20 */ blr
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@49032_8055F850"
"@49032_8055F850":
.4byte 0
.global "@49057_8055F854"
"@49057_8055F854":
.4byte 0xBF800000
.global "@49058_8055F858"
"@49058_8055F858":
.4byte 0x40000000
.global "@49069_8055F85C"
"@49069_8055F85C":
.4byte 0x47800000
.global "@49072_8055F860"
"@49072_8055F860":
.4byte 0x43300000
.4byte 0

54
asm/src/Vector2_8019ef58.s → asm/src/hel/math/Vector2.s
View file

@ -453,3 +453,57 @@ __ami__Q33hel4math7Vector2FRCQ33hel4math7Vector2:
/* 8019F500 0019B340 7C 08 03 A6 */ mtlr r0
/* 8019F504 0019B344 38 21 00 10 */ addi r1, r1, 0x10
/* 8019F508 0019B348 4E 80 00 20 */ blr
.include "macros.inc"
.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0
.4byte "__sinit_@@1Vector2_cpp"
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global ZERO__Q33hel4math7Vector2
ZERO__Q33hel4math7Vector2:
.skip 0x4
.global lbl_8055D24C
lbl_8055D24C:
.skip 0x4
.global ALL_ONE__Q33hel4math7Vector2
ALL_ONE__Q33hel4math7Vector2:
.skip 0x8
.global BASIS_X__Q33hel4math7Vector2
BASIS_X__Q33hel4math7Vector2:
.skip 0x8
.global BASIS_Y__Q33hel4math7Vector2
BASIS_Y__Q33hel4math7Vector2:
.skip 0x8
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@50690_8055F868"
"@50690_8055F868":
.4byte 0
.global "@50708"
"@50708":
.4byte 0x3F800000
.global "@50709"
"@50709":
.4byte 0xBF800000
.global "@50737"
"@50737":
.4byte 0x3727C5AC
.global "@50738"
"@50738":
.4byte 0x40490FDB
.4byte 0

68
asm/src/Vector3_8019f50c.s → asm/src/hel/math/Vector3.s
View file

@ -624,3 +624,71 @@ __ami__Q33hel4math7Vector3FRCQ33hel4math7Vector3:
/* 8019FD40 0019BB80 7C 08 03 A6 */ mtlr r0
/* 8019FD44 0019BB84 38 21 00 10 */ addi r1, r1, 0x10
/* 8019FD48 0019BB88 4E 80 00 20 */ blr
.include "macros.inc"
.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0
.4byte "__sinit_@@1Vector3_cpp"
.include "macros.inc"
.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20
.global ZERO__Q33hel4math7Vector3
ZERO__Q33hel4math7Vector3:
.skip 0xC
.global ALL_ONE__Q33hel4math7Vector3
ALL_ONE__Q33hel4math7Vector3:
.skip 0xC
.global BASIS_X__Q33hel4math7Vector3
BASIS_X__Q33hel4math7Vector3:
.skip 0xC
.global BASIS_Y__Q33hel4math7Vector3
BASIS_Y__Q33hel4math7Vector3:
.skip 0xC
.global BASIS_Z__Q33hel4math7Vector3
BASIS_Z__Q33hel4math7Vector3:
.skip 0x10
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@51176"
"@51176":
.4byte 0
.global "@51220"
"@51220":
.4byte 0x3F800000
.global "@51221"
"@51221":
.4byte 0xBF800000
.global "@51266"
"@51266":
.4byte 0x4222F983
.global "@51306"
"@51306":
.4byte 0x3727C5AC
.global "@51307"
"@51307":
.4byte 0x3F000000
.global "@51308"
"@51308":
.4byte 0x3FC90FDB
.global "@51309"
"@51309":
.4byte 0x40000000

29
obj_files.mk
View file

@ -817,15 +817,16 @@ $(BUILD_DIR)/asm/src/hel/common/Locale.o \
$(BUILD_DIR)/asm/src/hel/debug/Assert.o \
$(BUILD_DIR)/asm/src/hel/debug/Print.o \
\
$(BUILD_DIR)/asm/src/hel/math/Direction3.o \
$(BUILD_DIR)/asm/src/hel/math/Matrix34.o \
$(BUILD_DIR)/asm/src/hel/math/Matrix44.o \
$(BUILD_DIR)/asm/src/hel/math/Point2.o \
$(BUILD_DIR)/asm/src/hel/math/Random.o \
$(BUILD_DIR)/asm/src/hel/math/Vector2.o \
$(BUILD_DIR)/asm/src/hel/math/Vector3.o \
\
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
$(BUILD_DIR)/asm/src/Direction3_8019df7c.o \
$(BUILD_DIR)/asm/src/Matrix34_8019e590.o \
$(BUILD_DIR)/asm/src/Matrix44_8019eaec.o \
$(BUILD_DIR)/asm/src/Point2_8019ec6c.o \
$(BUILD_DIR)/asm/src/Random_8019ec7c.o \
$(BUILD_DIR)/asm/src/Vector2_8019ef58.o \
$(BUILD_DIR)/asm/src/Vector3_8019f50c.o \
$(BUILD_DIR)/asm/src/AABBox_8019fd4c.o \
$(BUILD_DIR)/asm/src/Rect_8019fd54.o \
$(BUILD_DIR)/asm/src/Closest_801a01fc.o \
@ -2943,10 +2944,6 @@ $(BUILD_DIR)/asm/src/Thread_80405f14.o \
$(BUILD_DIR)/asm/src/UIntAABBox_8040603c.o
# .ctors
O_FILES += \
$(BUILD_DIR)/asm/src/Direction3_80406318.o \
$(BUILD_DIR)/asm/src/Point2_8040631c.o \
$(BUILD_DIR)/asm/src/Vector2_80406320.o \
$(BUILD_DIR)/asm/src/Vector3_80406324.o \
$(BUILD_DIR)/asm/src/HIDManager_80406328.o \
$(BUILD_DIR)/asm/src/LandLayer_8040632c.o \
$(BUILD_DIR)/asm/src/MoveGridGroup_80406330.o \
@ -4682,8 +4679,6 @@ $(BUILD_DIR)/asm/src/Alarm_804966e0.o \
$(BUILD_DIR)/asm/src/StateChanger_804966f0.o
# .bss
O_FILES += \
$(BUILD_DIR)/asm/src/Direction3_80545260.o \
$(BUILD_DIR)/asm/src/Vector3_805452d0.o \
$(BUILD_DIR)/asm/src/AddOnMathDirection3_80545310.o \
$(BUILD_DIR)/asm/src/AddOnMathVector3_80545338.o \
$(BUILD_DIR)/asm/src/HIDManager_80545378.o \
@ -5070,8 +5065,6 @@ $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \
$(BUILD_DIR)/asm/src/Wipe_8055c6c0.o
# .sbss
O_FILES += \
$(BUILD_DIR)/asm/src/Point2_8055d240.o \
$(BUILD_DIR)/asm/src/Vector2_8055d248.o \
$(BUILD_DIR)/asm/src/AddOnMathDirection3_8055d268.o \
$(BUILD_DIR)/asm/src/AddOnMathVector3_8055d270.o \
$(BUILD_DIR)/asm/src/HIDManager_8055d278.o \
@ -5185,12 +5178,6 @@ $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \
$(BUILD_DIR)/asm/src/Alarm_8055df68.o
# .sdata2
O_FILES += \
$(BUILD_DIR)/asm/src/Direction3_8055f828.o \
$(BUILD_DIR)/asm/src/Matrix34_8055f838.o \
$(BUILD_DIR)/asm/src/Point2_8055f848.o \
$(BUILD_DIR)/asm/src/Random_8055f850.o \
$(BUILD_DIR)/asm/src/Vector2_8055f868.o \
$(BUILD_DIR)/asm/src/Vector3_8055f880.o \
$(BUILD_DIR)/asm/src/AABBox_8055f8a0.o \
$(BUILD_DIR)/asm/src/Rect_8055f8a8.o \
$(BUILD_DIR)/asm/src/Closest_8055f8b8.o \