diff --git a/config/G2ME01/splits.txt b/config/G2ME01/splits.txt index ade9d88..69c5d0b 100644 --- a/config/G2ME01/splits.txt +++ b/config/G2ME01/splits.txt @@ -1,3 +1,9 @@ +MetroidPrime/CAxisAngle.cpp: + .bss start:0x8040AD40 end:0x8040AD4C common + +MetroidPrime/CEulerAngles.cpp: + .bss start:0x8040AD4C end:0x8040AD58 common + MetroidPrime/Player/CPlayerState.cpp: .text start:0x80084864 end:0x80086410 diff --git a/config/G2ME01/symbols.txt b/config/G2ME01/symbols.txt index 3e23f1f..9a74a34 100644 --- a/config/G2ME01/symbols.txt +++ b/config/G2ME01/symbols.txt @@ -19026,8 +19026,8 @@ lbl_8040865C = .bss:0x8040865C; // type:object size:0x284 lbl_804088E0 = .bss:0x804088E0; // type:object size:0x400 data:4byte lbl_80408CE0 = .bss:0x80408CE0; // type:object size:0x60 lbl_80408D40 = .bss:0x80408D40; // type:object size:0x2000 -lbl_8040AD40 = .bss:0x8040AD40; // type:object size:0xC -lbl_8040AD4C = .bss:0x8040AD4C; // type:object size:0xC data:float +sIdentity__10CAxisAngle = .bss:0x8040AD40; // type:object size:0xC scope:global align:0x4 +sIdentity__12CEulerAngles = .bss:0x8040AD4C; // type:object size:0xC scope:global align:0x4 data:float lbl_8040AD58 = .bss:0x8040AD58; // type:object size:0x184 data:4byte lbl_8040AEDC = .bss:0x8040AEDC; // type:object size:0x404 data:4byte lbl_8040B2E0 = .bss:0x8040B2E0; // type:object size:0x1104 data:4byte diff --git a/configure.py b/configure.py index d758db9..ad344b4 100644 --- a/configure.py +++ b/configure.py @@ -10,7 +10,7 @@ LIBS = [ ["Runtime/__init_cpp_exceptions.cpp", False], # TODO: need to implement all ["Runtime/Gecko_ExceptionPPC.cp", False], - ["Runtime/global_destructor_chain.c", False], + ["Runtime/global_destructor_chain.c", True], ], }, { diff --git a/src/Kyoto/Math/CVector3i.cpp b/src/Kyoto/Math/CVector3i.cpp index 47bf34e..001cdde 100644 --- a/src/Kyoto/Math/CVector3i.cpp +++ b/src/Kyoto/Math/CVector3i.cpp @@ -1,6 +1,5 @@ #include "Kyoto/Math/CVector3i.hpp" -// .bss start:0x80417510 end:0x80417570 CVector3i CVector3i::sZeroVector = CVector3i(0, 0, 0); CVector3i CVector3i::sUpVector = CVector3i(0, 0, 1); CVector3i CVector3i::sDownVector = CVector3i(0, 0, -1); diff --git a/src/Runtime/__init_cpp_exceptions.cpp b/src/Runtime/__init_cpp_exceptions.cpp index 2f8853f..99433cb 100644 --- a/src/Runtime/__init_cpp_exceptions.cpp +++ b/src/Runtime/__init_cpp_exceptions.cpp @@ -49,10 +49,13 @@ void __fini_cpp_exceptions(void) { } /* clang-format off */ +#pragma section ".ctors$10" __declspec(section ".ctors$10") void *const __init_cpp_exceptions_reference = __init_cpp_exceptions; +#pragma section ".dtors$10" __declspec(section ".dtors$10") void *const __destroy_global_chain_reference = __destroy_global_chain; +#pragma section ".dtors$15" __declspec(section ".dtors$15") void *const __fini_cpp_exceptions_reference = __fini_cpp_exceptions; /* clang-format on */ diff --git a/tools/dtk_version b/tools/dtk_version index 7becae1..600e6fd 100644 --- a/tools/dtk_version +++ b/tools/dtk_version @@ -1 +1 @@ -v0.3.2 +v0.3.3