Label SDK versions (to be moved to respective libraries)

4 files changed, 46 insertions, 36 deletions

diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf
index cccbb9a4..2c5fb145 100644
--- a/arm9/arm9.lcf
+++ b/arm9/arm9.lcf
@@ -117,7 +117,8 @@ SECTIONS {
 		SDK_STATIC_TEXT_START = .;
 		secure.o (.text)
 		crt0.o (.text)
-		crt0.o (.version)
+		crt0.o (.rodata)
+		* (.version)
 		main.o (.text)
 		FUN_02000DF4.o (.text)
 		unk_02000E0C.o (.text)
diff --git a/arm9/asm/crt0.s b/arm9/asm/crt0.s
index aaf2d22f..05a91b28 100644
--- a/arm9/asm/crt0.s
+++ b/arm9/asm/crt0.s
@@ -255,32 +255,43 @@ OSi_ReferSymbol: ; 0x02000B60
 NitroStartUp: ; 0x02000B64
 	bx lr
 
+	.section .rodata
 	.global _start_ModuleParams
-_start_ModuleParams:
+_start_ModuleParams: ; 0x02000B68
 	.word SDK_AUTOLOAD_LIST
 	.word SDK_AUTOLOAD_LIST_END
 	.word SDK_AUTOLOAD_START
 	.word SDK_STATIC_BSS_START
 	.word SDK_STATIC_BSS_END
-
-	.balign 16, 0
-
-	.section .version
+	.word 0 ; Compressed static init end
 	; NITRO SDK 3.2.30001
 	.word (3 << 24) | (2 << 16) | 30001
 	.word 0xdec00621 ; Nitro code BE
 	.word 0x2106c0de ; Nitro code LE
-	
+
 	# strings
+	# .section .version
 	.balign 4
+	.global _SDK_NintendoDWC
+_SDK_NintendoDWC: ; 0x02000b8c
 	.asciz "[SDK+NINTENDO:DWC1.2.30006.061019.2254_DWC_1_2_PLUS6]"
 	.balign 4
+	.global _SDK_NintendoWiFi
+_SDK_NintendoWiFi: ; 0x02000bc4
 	.asciz "[SDK+NINTENDO:WiFi1.2.30000.0609050341]"
 	.balign 4
+	.global _SDK_UbiquitousCPS
+_SDK_UbiquitousCPS: ; 0x02000bec
 	.asciz "[SDK+UBIQUITOUS:CPS]"
 	.balign 4
+	.global _SDK_UbiquitousSSL
+_SDK_UbiquitousSSL: ; 0x02000c04
 	.asciz "[SDK+UBIQUITOUS:SSL]"
 	.balign 4
+	.global _SDK_AbiossolibVCT
+_SDK_AbiossolibVCT: ; 0x02000c1c
 	.asciz "[SDK+Abiosso:libVCT 1.0.1_ec]"
 	.balign 4
+	.global _SDK_NintendoBackup
+_SDK_NintendoBackup: ; 0x02000c3c
 	.asciz "[SDK+NINTENDO:BACKUP]"
diff --git a/arm9/asm/libcard.s b/arm9/asm/libcard.s
index 664e85f5..959c6f64 100644
--- a/arm9/asm/libcard.s
+++ b/arm9/asm/libcard.s
@@ -558,12 +558,14 @@ CARD_WaitBackupAsync: ; 0x020D6DB8
 	.balign 4
 _020D6DC0: .word CARDi_WaitAsync
 
+	.extern _SDK_NintendoBackup
+
 	arm_func_start CARD_IdentifyBackup
 CARD_IdentifyBackup: ; 0x020D6DC4
 	stmdb sp!, {r4-r7,lr}
 	sub sp, sp, #0x4
 	mov r5, r0
-	ldr r0, _020D6F00 ; =0x02000C3C
+	ldr r0, _020D6F00 ; =_SDK_NintendoBackup
 	ldr r7, _020D6F04 ; =0x021D55C0
 	bl OSi_ReferSymbol
 _020D6DDC: ; 0x020D6DDC
@@ -648,7 +650,7 @@ _020D6EE0:
 	ldmia sp!, {r4-r7,lr}
 	bx lr
 	.balign 4
-_020D6F00: .word 0x02000C3C
+_020D6F00: .word _SDK_NintendoBackup
 _020D6F04: .word 0x021D55C0
 _020D6F08: .word 0x021D3498
 
@@ -666,7 +668,7 @@ CARDi_RequestStreamCommand: ; 0x020D6F20
 	stmdb sp!, {r4-r10,lr}
 	mov r10, r0
 	ldr r6, _020D7004 ; =0x021D55C0
-	ldr r0, _020D7008 ; =0x02000C3C
+	ldr r0, _020D7008 ; =_SDK_NintendoBackup
 	mov r9, r1
 	mov r8, r2
 	mov r7, r3
@@ -726,7 +728,7 @@ _020D6FE8: ; 0x020D6FE8
 	bx lr
 	.balign 4
 _020D7004: .word 0x021D55C0
-_020D7008: .word 0x02000C3C
+_020D7008: .word _SDK_NintendoBackup
 _020D700C: .word CARDi_RequestStreamCommandCore
 _020D7010: .word 0x021D3498
 
@@ -736,7 +738,7 @@ CARDi_RequestStreamCommandCore:
 	sub sp, sp, #0x4
 	mov r9, r0
 	ldr r8, [r9, #0x2c]
-	ldr r0, _020D720C ; =0x02000C3C
+	ldr r0, _020D720C ; =_SDK_NintendoBackup
 	ldr r7, [r9, #0x34]
 	ldr r10, [r9, #0x30]
 	mov r6, #0x100
@@ -878,7 +880,7 @@ _020D71E8: ; 0x020D71E8
 	ldmia sp!, {r4-r11,lr}
 	bx lr
 	.balign 4
-_020D720C: .word 0x02000C3C
+_020D720C: .word _SDK_NintendoBackup
 
 	arm_func_start CARDi_GetRomAccessor
 CARDi_GetRomAccessor: ; 0x020D7210
diff --git a/arm9/asm/unk_020910EC.s b/arm9/asm/unk_020910EC.s
index 3ae14dd4..cca70353 100644
--- a/arm9/asm/unk_020910EC.s
+++ b/arm9/asm/unk_020910EC.s
@@ -6591,11 +6591,13 @@ _02096B08: .word 0x0000FFFF
 _02096B0C: .word 0x020FF580
 _02096B10: .word 0x020FF578
 
+	.extern _SDK_NintendoDWC
+
 	arm_func_start FUN_02096B14
 FUN_02096B14: ; 0x02096B14
 	stmdb sp!, {r4-r6,lr}
 	mov r6, r0
-	ldr r0, _02096B74 ; =0x02000B8C
+	ldr r0, _02096B74 ; =_SDK_NintendoDWC
 	mov r4, #0x0
 	bl OSi_ReferSymbol
 	mov r0, r6
@@ -6621,7 +6623,7 @@ _02096B64:
 	moveq r0, #0x0
 	ldmia sp!, {r4-r6,pc}
 	.balign 4
-_02096B74: .word 0x02000B8C
+_02096B74: .word _SDK_NintendoDWC
 
 	arm_func_start FUN_02096B78
 FUN_02096B78: ; 0x02096B78
@@ -7657,11 +7659,13 @@ _02097828: .word 0x021C8CC0
 _0209782C: .word 0x021061F4
 _02097830: .word 0x021C8CD0
 
+	.extern _SDK_NintendoWiFi
+
 	arm_func_start FUN_02097834
 FUN_02097834: ; 0x02097834
 	stmdb sp!, {r4,lr}
 	mov r4, r0
-	ldr r0, _02097870 ; =0x02000BC4
+	ldr r0, _02097870 ; =_SDK_NintendoWiFi
 	bl OSi_ReferSymbol
 	ldr r0, _02097874 ; =0x021C8CC0
 	ldr r1, [r0, #0x0]
@@ -7675,7 +7679,7 @@ FUN_02097834: ; 0x02097834
 	ldmia sp!, {r4,lr}
 	bx lr
 	.balign 4
-_02097870: .word 0x02000BC4
+_02097870: .word _SDK_NintendoWiFi
 _02097874: .word 0x021C8CC0
 
 	arm_func_start FUN_02097878
@@ -17528,12 +17532,14 @@ _0209FD74:
 _0209FD8C: .word 0x021C90A0
 _0209FD90: .word 0x021C8EF8
 
+	.extern _SDK_UbiquitousCPS
+
 	arm_func_start FUN_0209FD94
 FUN_0209FD94: ; 0x0209FD94
 	stmdb sp!, {r4-r6,lr}
 	sub sp, sp, #0x8
 	mov r4, r0
-	ldr r0, _0209FFD4 ; =0x02000BEC
+	ldr r0, _0209FFD4 ; =_SDK_UbiquitousCPS
 	bl OSi_ReferSymbol
 	ldr r12, [r4, #0x14]
 	ldr r6, [r4, #0x18]
@@ -17679,7 +17685,7 @@ _0209FE60:
 	ldmia sp!, {r4-r6,lr}
 	bx lr
 	.balign 4
-_0209FFD4: .word 0x02000BEC
+_0209FFD4: .word _SDK_UbiquitousCPS
 _0209FFD8: .word 0x021C8F24
 _0209FFDC: .word 0x6C078965
 _0209FFE0: .word 0x5D588B65
@@ -17911,11 +17917,13 @@ _020A02E0: .word 0x021CA6FC
 _020A02E4: .word 0x000003BD
 _020A02E8: .word 0x021D3498
 
+	.extern _SDK_UbiquitousSSL
+
 	arm_func_start FUN_020A02EC
 FUN_020A02EC:
 	stmdb sp!, {r4,lr}
 	mov r4, r0
-	ldr r0, _020A0318 ; =0x02000C04
+	ldr r0, _020A0318 ; =_SDK_UbiquitousSSL
 	bl OSi_ReferSymbol
 	ldr r0, _020A031C ; =0x021D3498
 	ldr r0, [r0, #0x4]
@@ -17925,7 +17933,7 @@ FUN_020A02EC:
 	ldmia sp!, {r4,lr}
 	bx lr
 	.balign 4
-_020A0318: .word 0x02000C04
+_020A0318: .word _SDK_UbiquitousSSL
 _020A031C: .word 0x021D3498
 
 	arm_func_start FUN_020A0320
@@ -33682,23 +33690,21 @@ FUN_020AD904: ; 0x020AD904
 _020AD934: .word 0x021CCD20
 _020AD938: .word 0x021CCD1C
 
+	.extern _SDK_AbiossolibVCT
 	arm_func_start FUN_020AD93C
 FUN_020AD93C: ; 0x020AD93C
 	stmdb sp!, {r4,lr}
 	mov r4, r0
-	ldr r0, _020ADA78 ; =0x02000C1C
+	ldr r0, _020ADA78 ; =_SDK_AbiossolibVCT
 	bl OSi_ReferSymbol
-_020AD94C: ; 0x020AD94C
 	cmp r4, #0x0
 	moveq r0, #0x0
 	ldmeqia sp!, {r4,pc}
-_020AD958: ; 0x020AD958
 	ldr r0, _020ADA7C ; =0x021CCD1C
 	ldr r0, [r0, #0x0]
 	cmp r0, #0x0
 	movne r0, #0x1
 	ldmneia sp!, {r4,pc}
-_020AD96C: ; 0x020AD96C
 	ldr r0, [r4, #0x8]
 	cmp r0, #0x1
 	beq _020AD98C
@@ -33712,7 +33718,6 @@ _020AD98C:
 	cmp r0, #0x0
 	moveq r0, #0x0
 	ldmeqia sp!, {r4,pc}
-_020AD99C: ; 0x020AD99C
 	ldr r2, [r4, #0x10]
 	cmp r2, #0x0
 	beq _020AD9B4
@@ -33728,7 +33733,6 @@ _020AD9BC:
 	adds r0, r1, r0, ror #0x1b
 	movne r0, #0x0
 	ldmneia sp!, {r4,pc}
-_020AD9D0: ; 0x020AD9D0
 	ldr r0, _020ADA80 ; =0x021CCD20
 	mov r1, #0x0
 	mov r2, #0x18
@@ -33745,44 +33749,36 @@ _020AD9D0: ; 0x020AD9D0
 	ldrb r2, [r4, #0xc]
 	cmp r2, #0x20
 	ldmcsia sp!, {r4,pc}
-_020ADA10: ; 0x020ADA10
 	strb r2, [r1, #0x0]
 	ldr r0, [r4, #0x10]
 	ldr r1, [r4, #0x14]
 	bl FUN_020ACE30
-_020ADA20: ; 0x020ADA20
 	cmp r0, #0x0
 	bne _020ADA34
 	bl FUN_020ACE10
-_020ADA2C: ; 0x020ADA2C
 	mov r0, #0x0
 	ldmia sp!, {r4,pc}
 _020ADA34:
 	mov r0, r4
 	bl FUN_020AC97C
-_020ADA3C: ; 0x020ADA3C
 	cmp r0, #0x0
 	bne _020ADA50
 	bl FUN_020ACE10
-_020ADA48: ; 0x020ADA48
 	mov r0, #0x0
 	ldmia sp!, {r4,pc}
 _020ADA50:
 	bl FUN_020AAF58
-_020ADA54: ; 0x020ADA54
 	cmp r0, #0x0
 	ldrne r1, _020ADA7C ; =0x021CCD1C
 	movne r0, #0x1
 	strne r0, [r1, #0x0]
 	ldmneia sp!, {r4,pc}
-_020ADA68: ; 0x020ADA68
 	bl FUN_020AC964
 	bl FUN_020ACE10
-_020ADA70: ; 0x020ADA70
 	mov r0, #0x0
 	ldmia sp!, {r4,pc}
 	.balign 4
-_020ADA78: .word 0x02000C1C
+_020ADA78: .word _SDK_AbiossolibVCT
 _020ADA7C: .word 0x021CCD1C
 _020ADA80: .word 0x021CCD20