Decompile scrcmd_21 -> scrcmd_flags

2 files changed, 20 insertions, 485 deletions

diff --git a/arm9/asm/scrcmd_21.s b/arm9/asm/scrcmd_21.s
deleted file mode 100644
index e1f03c4a..00000000
--- a/arm9/asm/scrcmd_21.s
+++ /dev/null
@@ -1,465 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.section .rodata
-
-	.global UNK_020F4574
-UNK_020F4574: ; 0x020F4574
-	.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
-
-	.text
-
-	thumb_func_start FUN_020453F4
-FUN_020453F4: ; 0x020453F4
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_Pokedex_get
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r5, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r5, #0x0]
-	bl GetVarPointer
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	bl Pokedex_GetSinnohDexFlag
-	strh r0, [r5, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045424
-FUN_02045424: ; 0x02045424
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_Pokedex_get
-	bl Pokedex_SetSinnohDexFlag
-	mov r0, #0x0
-	pop {r3, pc}
-
-	thumb_func_start FUN_02045438
-FUN_02045438: ; 0x02045438
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl GetVarPointer
-	add r5, #0x80
-	add r4, r0, #0x0
-	ldr r0, [r5, #0x0]
-	ldr r0, [r0, #0xc]
-	bl FUN_02034E30
-	bl FUN_02034E20
-	bl FUN_02055474
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045468
-FUN_02045468: ; 0x02045468
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl FUN_02034E30
-	bl FUN_02034E20
-	mov r1, #0x1
-	bl FUN_02055488
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045484
-FUN_02045484: ; 0x02045484
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl GetVarPointer
-	add r6, r0, #0x0
-	cmp r4, #0x8
-	blo _020454B6
-	bl ErrorHandling
-_020454B6:
-	add r5, #0x80
-	ldr r0, [r5, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_PlayerData_GetProfileAddr
-	add r1, r4, #0x0
-	bl PlayerProfile_TestBadgeFlag
-	strh r0, [r6, #0x0]
-	mov r0, #0x0
-	pop {r4-r6, pc}
-
-	thumb_func_start FUN_020454CC
-FUN_020454CC: ; 0x020454CC
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r4, r0, #0x0
-	cmp r4, #0x8
-	blo _020454EA
-	bl ErrorHandling
-_020454EA:
-	add r5, #0x80
-	ldr r0, [r5, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_PlayerData_GetProfileAddr
-	add r1, r4, #0x0
-	bl PlayerProfile_SetBadgeFlag
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045500
-FUN_02045500: ; 0x02045500
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl GetVarPointer
-	add r5, #0x80
-	add r4, r0, #0x0
-	ldr r0, [r5, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	bl FUN_0205ECE0
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_0204552C
-FUN_0204552C: ; 0x0204552C
-	push {r3-r7, lr}
-	add r6, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r6, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl GetVarPointer
-	mov r4, #0x0
-	ldr r7, _02045578 ; =UNK_020F4574
-	str r0, [sp, #0x0]
-	add r5, r4, #0x0
-_02045548:
-	add r0, r6, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_PlayerData_GetProfileAddr
-	ldrb r1, [r7, r4]
-	bl PlayerProfile_TestBadgeFlag
-	cmp r0, #0x1
-	bne _02045564
-	add r0, r5, #0x1
-	lsl r0, r0, #0x10
-	lsr r5, r0, #0x10
-_02045564:
-	add r0, r4, #0x1
-	lsl r0, r0, #0x10
-	lsr r4, r0, #0x10
-	cmp r4, #0x8
-	blo _02045548
-	ldr r0, [sp, #0x0]
-	strh r5, [r0, #0x0]
-	mov r0, #0x0
-	pop {r3-r7, pc}
-	nop
-_02045578: .word UNK_020F4574
-
-	thumb_func_start FUN_0204557C
-FUN_0204557C: ; 0x0204557C
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	bl FUN_0205ECD4
-	mov r0, #0x0
-	pop {r3, pc}
-
-	thumb_func_start FUN_02045590
-FUN_02045590: ; 0x02045590
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl GetVarPointer
-	add r5, #0x80
-	add r4, r0, #0x0
-	ldr r0, [r5, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	bl FUN_0205ED3C
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_020455BC
-FUN_020455BC: ; 0x020455BC
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	bl FUN_0205ED1C
-	mov r0, #0x0
-	pop {r3, pc}
-
-	thumb_func_start FUN_020455D0
-FUN_020455D0: ; 0x020455D0
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	bl FUN_0205ED2C
-	mov r0, #0x0
-	pop {r3, pc}
-
-	thumb_func_start FUN_020455E4
-FUN_020455E4: ; 0x020455E4
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl GetVarPointer
-	add r5, #0x80
-	add r4, r0, #0x0
-	ldr r0, [r5, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	bl FUN_0205ED6C
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045610
-FUN_02045610: ; 0x02045610
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	bl FUN_0205ED4C
-	mov r0, #0x0
-	pop {r3, pc}
-
-	thumb_func_start FUN_02045624
-FUN_02045624: ; 0x02045624
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	bl FUN_0205ED5C
-	mov r0, #0x0
-	pop {r3, pc}
-
-	thumb_func_start FUN_02045638
-FUN_02045638: ; 0x02045638
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl GetVarPointer
-	add r5, #0x80
-	add r4, r0, #0x0
-	ldr r0, [r5, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	bl FUN_0205ED0C
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045664
-FUN_02045664: ; 0x02045664
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	bl FUN_0205ECFC
-	mov r0, #0x0
-	pop {r3, pc}
-
-	thumb_func_start FUN_02045678
-FUN_02045678: ; 0x02045678
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	ldr r2, [r5, #0x8]
-	add r4, r0, #0x0
-	add r1, r2, #0x1
-	str r1, [r5, #0x8]
-	ldrb r1, [r2, #0x0]
-	cmp r1, #0x0
-	beq _020456A6
-	cmp r1, #0x1
-	beq _0204569E
-	cmp r1, #0x2
-	beq _020456AE
-	b _020456CC
-_0204569E:
-	mov r1, #0x1
-	bl FUN_0205F264
-	b _020456D0
-_020456A6:
-	mov r1, #0x0
-	bl FUN_0205F264
-	b _020456D0
-_020456AE:
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r5, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r5, #0x0]
-	bl GetVarPointer
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	mov r1, #0x2
-	bl FUN_0205F264
-	strh r0, [r5, #0x0]
-	b _020456D0
-_020456CC:
-	bl ErrorHandling
-_020456D0:
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_020456D4
-FUN_020456D4: ; 0x020456D4
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	ldr r2, [r5, #0x8]
-	add r4, r0, #0x0
-	add r1, r2, #0x1
-	str r1, [r5, #0x8]
-	ldrb r1, [r2, #0x0]
-	cmp r1, #0x0
-	beq _02045700
-	cmp r1, #0x1
-	beq _020456FA
-	cmp r1, #0x2
-	beq _02045706
-	b _02045722
-_020456FA:
-	bl FUN_0205F274
-	b _02045726
-_02045700:
-	bl FUN_0205F284
-	b _02045726
-_02045706:
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r5, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r5, #0x0]
-	bl GetVarPointer
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	bl FUN_0205F294
-	strh r0, [r5, #0x0]
-	b _02045726
-_02045722:
-	bl ErrorHandling
-_02045726:
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_0204572C
-FUN_0204572C: ; 0x0204572C
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	ldr r2, [r5, #0x8]
-	add r4, r0, #0x0
-	add r1, r2, #0x1
-	str r1, [r5, #0x8]
-	ldrb r1, [r2, #0x0]
-	cmp r1, #0x0
-	beq _02045758
-	cmp r1, #0x1
-	beq _02045752
-	cmp r1, #0x2
-	beq _0204575E
-	b _0204577A
-_02045752:
-	bl FUN_0205F2A4
-	b _0204577E
-_02045758:
-	bl FUN_0205F2B4
-	b _0204577E
-_0204575E:
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r5, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r5, #0x0]
-	bl GetVarPointer
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	bl FUN_0205F2C4
-	strh r0, [r5, #0x0]
-	b _0204577E
-_0204577A:
-	bl ErrorHandling
-_0204577E:
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index 08416fc7..98ec9e95 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -492,23 +492,23 @@ gScriptCmdTable: ; 0x020F355C
     .word FUN_0203D738
     .word FUN_0203D774
     .word FUN_0203D834
-    .word FUN_020453F4
-    .word FUN_02045424
-    .word FUN_02045438
-    .word FUN_02045468
-    .word FUN_02045484
-    .word FUN_020454CC
-    .word FUN_0204552C
-    .word FUN_02045500
-    .word FUN_0204557C
-    .word FUN_02045590
-    .word FUN_020455BC
-    .word FUN_020455D0
-    .word FUN_020455E4
-    .word FUN_02045610
-    .word FUN_02045624
-    .word FUN_02045638
-    .word FUN_02045664
+    .word ScrCmd_HasSinnohDex
+    .word ScrCmd_GiveSinnohDex
+    .word ScrCmd_Unk0159
+    .word ScrCmd_Unk015A
+    .word ScrCmd_HasBadge
+    .word ScrCmd_GiveBadge
+    .word ScrCmd_GetTotalEarnedBadges
+    .word ScrCmd_Unk015E
+    .word ScrCmd_Unk015F
+    .word ScrCmd_Unk0160
+    .word ScrCmd_Unk0161
+    .word ScrCmd_Unk0162
+    .word ScrCmd_Unk0163
+    .word ScrCmd_Unk0164
+    .word ScrCmd_Unk0165
+    .word ScrCmd_Unk0166
+    .word ScrCmd_Unk0167
     .word FUN_0203DC00
     .word FUN_0203DC58
     .word FUN_0203DC70
@@ -612,9 +612,9 @@ gScriptCmdTable: ; 0x020F355C
     .word FUN_0203E138
     .word FUN_0203E168
     .word FUN_0203E254
-    .word FUN_02045678
-    .word FUN_020456D4
-    .word FUN_0204572C
+    .word ScrCmd_Unk01CF
+    .word ScrCmd_Unk01D0
+    .word ScrCmd_Unk01D1
     .word FUN_0203E258
     .word FUN_0203E29C
     .word FUN_0203E2F8