Update undefined_syms.txt and global.inc

6 files changed, 26 insertions, 21 deletions

diff --git a/asm/CARD_arm9.s b/asm/CARD_arm9.s
index 7222bfc4..08129ab5 100644
--- a/asm/CARD_arm9.s
+++ b/asm/CARD_arm9.s
@@ -565,7 +565,7 @@ CARD_IdentifyBackup: ; 0x020D6DC4
 	mov r5, r0
 	ldr r0, _020D6F00 ; =0x02000C3C
 	ldr r7, _020D6F04 ; =0x021D55C0
-	bl FUN_02000B60
+	bl OSi_ReferSymbol
 _020D6DDC: ; 0x020D6DDC
 	cmp r5, #0x0
 	bne _020D6DE8
@@ -670,7 +670,7 @@ CARDi_RequestStreamCommand: ; 0x020D6F20
 	mov r9, r1
 	mov r8, r2
 	mov r7, r3
-	bl FUN_02000B60
+	bl OSi_ReferSymbol
 	bl OS_DisableInterrupts
 	ldr r1, [r6, #0x114]
 	mov r5, r0
@@ -740,7 +740,7 @@ CARDi_RequestStreamCommandCore:
 	ldr r7, [r9, #0x34]
 	ldr r10, [r9, #0x30]
 	mov r6, #0x100
-	bl FUN_02000B60
+	bl OSi_ReferSymbol
 	cmp r8, #0xb
 	bne _020D7048
 	bl CARD_GetBackupSectorSize
diff --git a/asm/OS_arm9.s b/asm/OS_arm9.s
index af2c75f1..5a013ac1 100644
--- a/asm/OS_arm9.s
+++ b/asm/OS_arm9.s
@@ -28,6 +28,8 @@ OS_IRQTable: ; 027E0000 ;10b6a0
 	.word OS_IrqDummy ; 020c9da8
 	.word OS_IrqDummy ; 020c9da8
 	.balign 16, 0
+
+	.global OSi_IrqThreadQueue
 OSi_IrqThreadQueue: ; 027E0060
 
 	.section .text
diff --git a/asm/unk_0208AC14.s b/asm/unk_0208AC14.s
index 9650ea9d..59d1fcb9 100644
--- a/asm/unk_0208AC14.s
+++ b/asm/unk_0208AC14.s
@@ -13544,7 +13544,7 @@ FUN_02096B14: ; 0x02096B14
 	mov r6, r0
 	ldr r0, _02096B74 ; =0x02000B8C
 	mov r4, #0x0
-	bl FUN_02000B60
+	bl OSi_ReferSymbol
 	mov r0, r6
 	bl FUN_02096190
 	mov r5, r0
@@ -14607,7 +14607,7 @@ FUN_02097834: ; 0x02097834
 	stmdb sp!, {r4,lr}
 	mov r4, r0
 	ldr r0, _02097870 ; =0x02000BC4
-	bl FUN_02000B60
+	bl OSi_ReferSymbol
 	ldr r0, _02097874 ; =0x021C8CC0
 	ldr r1, [r0, #0x0]
 	cmp r1, #0x0
@@ -24479,7 +24479,7 @@ FUN_0209FD94: ; 0x0209FD94
 	sub sp, sp, #0x8
 	mov r4, r0
 	ldr r0, _0209FFD4 ; =0x02000BEC
-	bl FUN_02000B60
+	bl OSi_ReferSymbol
 	ldr r12, [r4, #0x14]
 	ldr r6, [r4, #0x18]
 	mov r1, #0x0
@@ -24861,7 +24861,7 @@ FUN_020A02EC:
 	stmdb sp!, {r4,lr}
 	mov r4, r0
 	ldr r0, _020A0318 ; =0x02000C04
-	bl FUN_02000B60
+	bl OSi_ReferSymbol
 	ldr r0, _020A031C ; =0x021D3498
 	ldr r0, [r0, #0x4]
 	ldr r0, [r0, #0xa4]
@@ -40632,7 +40632,7 @@ FUN_020AD93C: ; 0x020AD93C
 	stmdb sp!, {r4,lr}
 	mov r4, r0
 	ldr r0, _020ADA78 ; =0x02000C1C
-	bl FUN_02000B60
+	bl OSi_ReferSymbol
 _020AD94C: ; 0x020AD94C
 	cmp r4, #0x0
 	moveq r0, #0x0
diff --git a/global.inc b/global.inc
index f337679f..1e8e2db7 100644
--- a/global.inc
+++ b/global.inc
@@ -53,7 +53,7 @@
 .extern FUN_0200019E

 .extern FUN_020002FE

 .extern FUN_020005F2

-.extern FUN_02000B60

+.extern OSi_ReferSymbol

 .extern FUN_02000DF4

 .extern FUN_02000E7C

 .extern FUN_02000EE8

diff --git a/pokediamond.lcf b/pokediamond.lcf
index 6581649a..da357c97 100644
--- a/pokediamond.lcf
+++ b/pokediamond.lcf
@@ -419,10 +419,10 @@ SECTIONS {
 
 	SDK_AUTOLOAD_START = .;
 	SDK_STATIC_BSS_START = .;
+	SDK_STATIC_BSS_END = . + 0xd0540;
 
 	.arm9.itcm : AT (0x10AFA0)
 	{
-		OS_arm9.o (.itcm)
         arm9_itcm.o (.itcm)
         . = 0x01FF8720;
         SDK_SECTION_ARENA_ITCM_START = .;
diff --git a/undefined_syms.txt b/undefined_syms.txt
index e3ad952b..46a62ad1 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -1,12 +1,18 @@
 CONST_34 = 0x00000034;
 CONST_3F = 0x0000003F;
-FUN_02000B60 = 0x02000B60;
+
+// .bss
 gBacklightTop = 0x02106FA0;
 gBacklightTop_2 = 0x02106FA0;
 gUnknown2106FB8 = 0x02106FB8;
 gUnknown21C48B8 = 0x021C48B8;
 gUnk021C4918 = 0x021C4918;
+OSi_ThreadInfo = 0x021D3498;
+OSi_MainExArenaEnabled = 0x021D36F4;
 OSi_IsResetOccurred = 0x021D37E0;
+cardi_common = 0x021D55C0;
+
+// Overlay
 FUN_021D74E0 = 0x021D74E0;
 FUN_021D76AC = 0x021D76AC;
 gUnk021D76C8 = 0x021D76C8;
@@ -447,15 +453,12 @@ FUN_0224F12C = 0x0224F12C;
 FUN_02252534 = 0x02252534;
 FUN_02252538 = 0x02252538;
 FUN_022567E0 = 0x022567E0;
-SDK_AUTOLOAD_DTCM_START = 0x027E0000;
-OSi_IrqThreadQueue = 0x027E0060;
-OSi_ThreadInfo = 0x021D3498;
-CP_SaveContext = 0x020D3648;
-CP_RestoreContext = 0x020D3688;
-SDK_STATIC_BSS_END = 0x021D74E0;
-gUnk027FFC20 = 0x027FFC20;
-FUN_02000B60 = 0x02000B60;
-cardi_common = 0x021D55C0;
-OSi_MainExArenaEnabled = 0x021D36F4;
+
+// ???
 SDK_MAIN_ARENA_LO = 0x0225FFA0;
+
+// EWRAM
 SDK_SECTION_ARENA_EX_START = 0x023E0000;
+
+// DTCM
+gUnk027FFC20 = 0x027FFC20;