summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-05-08 10:17:38 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-05-08 10:17:38 -0400
commitd9f4b0bc06c782ed161dcb024c685a41aef25c1d (patch)
tree0321f08f0f9c30c0fb562a84d70ccd7ea6609336
parent22d325d76a279da3a45e8bd0748a9450d5688456 (diff)
__global_destructor_chain
-rw-r--r--arm9/arm9.lcf4
-rw-r--r--arm9/asm/libmwcc.s4
-rw-r--r--arm9/global.inc1
3 files changed, 7 insertions, 2 deletions
diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf
index 3aeb3859..cccbb9a4 100644
--- a/arm9/arm9.lcf
+++ b/arm9/arm9.lcf
@@ -255,9 +255,12 @@ SECTIONS {
.arm9.bss :
{
+ /* ALIGNALL(4); . = ALIGN(32); */
SDK_STATIC_BSS_START = .;
+ /* .sbss */
gBacklightTop = 0x02106FA0;
gBacklightTop_2 = 0x02106FA0;
+ /* .bss */
gLoadedOverlays = 0x021C45B0;
gUnknown21C48B8 = 0x021C48B8;
gUnk021C4918 = 0x021C4918;
@@ -305,6 +308,7 @@ SECTIONS {
fsi_ovt7 = 0x021D540C;
fsi_arc_rom = 0x021D5414;
__global_destructor_chain = 0x021D74C8;
+ /* . = ALIGN(32); */
SDK_STATIC_BSS_END = 0x021D74E0;
SDK_STATIC_BSS_SIZE = SDK_STATIC_BSS_END - SDK_STATIC_BSS_START;
} >> arm9
diff --git a/arm9/asm/libmwcc.s b/arm9/asm/libmwcc.s
index 259abf50..a6013179 100644
--- a/arm9/asm/libmwcc.s
+++ b/arm9/asm/libmwcc.s
@@ -3125,7 +3125,7 @@ _020EC6BC: .word __static_initializers
arm_func_start __destroy_global_chain
__destroy_global_chain: ; 0x020EC6C0
stmdb sp!, {r3-r5,lr}
- ldr r4, _020EC700 ; =0x021D74C8
+ ldr r4, _020EC700 ; =__global_destructor_chain
ldr r2, [r4, #0x0]
cmp r2, #0x0
ldmeqia sp!, {r3-r5,pc}
@@ -3143,7 +3143,7 @@ _020EC6D8:
bne _020EC6D8
ldmia sp!, {r3-r5,pc}
.balign 4
-_020EC700: .word 0x021D74C8
+_020EC700: .word __global_destructor_chain
arm_func_start _ExitProcess
_ExitProcess: ; 0x020EC704
diff --git a/arm9/global.inc b/arm9/global.inc
index 0db306cc..508f71de 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -3806,6 +3806,7 @@
.extern sys_writec
.extern tempName_NNS_FndAllocFromExpHeapEx
.extern tempName_NNS_FndCreateExpHeapEx
+.extern __global_destructor_chain
.extern thunk_FUN_02096e4c
.extern thunk_FUN_02097190
.extern thunk_FUN_020995dc