7 files changed, 15 insertions, 40 deletions
diff --git a/asm/bonus_field_select.s b/asm/bonus_field_select.s
index 331e00b..75f11da 100755
--- a/asm/bonus_field_select.s
+++ b/asm/bonus_field_select.s
@@ -368,7 +368,7 @@ _080028A0:
 	lsls r2, r2, #1
 	adds r1, r5, r2
 	strb r0, [r1]
-	bl sub_52B30
+	bl SaveFile_WriteToSram
 	movs r0, #2
 	strb r0, [r6]
 _080028CC:
diff --git a/asm/field_select.s b/asm/field_select.s
index f789dbf..2ee614e 100755
--- a/asm/field_select.s
+++ b/asm/field_select.s
@@ -386,7 +386,7 @@ _08008DDA:
 	lsls r2, r2, #1
 	adds r1, r7, r2
 	strb r0, [r1]
-	bl sub_52B30
+	bl SaveFile_WriteToSram
 	movs r0, #3
 	strh r0, [r5, #0xa]
 _08008E00:
diff --git a/asm/high_scores.s b/asm/high_scores.s
index 2c93e68..2db7c6a 100755
--- a/asm/high_scores.s
+++ b/asm/high_scores.s
@@ -1320,7 +1320,7 @@ _0800D8CE:
 	mov r3, sb
 	cmp r3, #1
 	ble _0800D8AC
-	bl sub_52B30
+	bl SaveFile_WriteToSram
 	ldr r1, _0800D8FC @ =gMain
 	movs r0, #3
 	strb r0, [r1, #3]
@@ -1772,7 +1772,7 @@ _0800DC88:
 	mov r2, sb
 	cmp r2, #1
 	ble _0800DC68
-	bl sub_52B30
+	bl SaveFile_WriteToSram
 	bl sub_2B4
 	bl m4aMPlayAllStop
 	bl sub_D10
@@ -1813,7 +1813,7 @@ sub_DCF0: @ 0x0800DCF0
 	movs r0, #0x65
 	bl m4aSongNumStart
 	bl sub_F6E0
-	bl sub_52B30
+	bl SaveFile_WriteToSram
 	bl sub_2B4
 	bl m4aMPlayAllStop
 	bl sub_D10
@@ -6025,7 +6025,7 @@ _0800FE8C:
 	bls _0800FE4C
 	bl sub_10528
 	bl sub_D74
-	bl sub_490
+	bl ClearGraphicsMemory
 	add sp, #4
 	pop {r3}
 	mov r8, r3
diff --git a/asm/intro.s b/asm/intro.s
index 1953b80..401f925 100755
--- a/asm/intro.s
+++ b/asm/intro.s
@@ -264,7 +264,7 @@ sub_9498: @ 0x08009498
 	mov r6, sb
 	mov r5, r8
 	push {r5, r6, r7}
-	bl sub_490
+	bl ClearGraphicsMemory
 	bl sub_518
 	bl sub_578
 	movs r2, #0x80
diff --git a/asm/options.s b/asm/options.s
index d2938b9..0ddc2e5 100755
--- a/asm/options.s
+++ b/asm/options.s
@@ -4,31 +4,6 @@
 
 	.text
 
-	thumb_func_start sub_51C60
-sub_51C60: @ 0x08051C60
-	push {lr}
-	ldr r1, _08051C90 @ =gMain+0x74
-	ldr r0, _08051C94 @ =gUnknown_02002920
-	adds r0, #0x2a
-	ldrb r0, [r0]
-	adds r1, #0xcd
-	strb r0, [r1]
-	bl sub_52B30
-	bl sub_2B4
-	bl m4aMPlayAllStop
-	bl sub_D10
-	ldr r1, _08051C98 @ =gAutoDisplayTitlescreenMenu
-	movs r0, #1
-	strb r0, [r1]
-	movs r0, #1
-	bl SetMainGameState
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08051C90: .4byte gMain+0x74
-_08051C94: .4byte gUnknown_02002920
-_08051C98: .4byte gAutoDisplayTitlescreenMenu
-
 	thumb_func_start sub_51C9C
 sub_51C9C: @ 0x08051C9C
 	push {r4, r5, r6, r7, lr}
diff --git a/asm/pokedex.s b/asm/pokedex.s
index 9980236..c0c5dea 100755
--- a/asm/pokedex.s
+++ b/asm/pokedex.s
@@ -1684,7 +1684,7 @@ _08004C2A:
 	adds r2, #1
 	cmp r2, #0xcc
 	ble _08004C2A
-	bl sub_52B30
+	bl SaveFile_WriteToSram
 	bl sub_2B4
 	bl m4aMPlayAllStop
 	bl sub_D10
@@ -1760,7 +1760,7 @@ _08004CC2:
 	movs r0, #1
 	mov r1, ip
 	strh r0, [r1]
-	bl sub_52B30
+	bl SaveFile_WriteToSram
 	bl sub_2B4
 	bl m4aMPlayAllStop
 	bl sub_D10
diff --git a/asm/rom_11B9C.s b/asm/rom_11B9C.s
index ca2c4c6..d5b362d 100755
--- a/asm/rom_11B9C.s
+++ b/asm/rom_11B9C.s
@@ -35770,7 +35770,7 @@ _08023B36:
 	movs r4, #0
 	ldrsh r0, [r0, r4]
 	movs r1, #1
-	bl sub_52BB0
+	bl SaveFile_SetPokedexFlags
 _08023B66:
 	ldr r5, _08023C94 @ =gUnknown_020314E0
 	ldr r0, [r5]
@@ -44250,7 +44250,7 @@ _08028040:
 	movs r2, #0
 	ldrsh r0, [r0, r2]
 	movs r1, #1
-	bl sub_52BB0
+	bl SaveFile_SetPokedexFlags
 _08028060:
 	ldr r0, _08028070 @ =gUnknown_020314E0
 	ldr r1, [r0]
@@ -60704,7 +60704,7 @@ _0803062E:
 	movs r2, #0
 	ldrsh r0, [r0, r2]
 	movs r1, #1
-	bl sub_52BB0
+	bl SaveFile_SetPokedexFlags
 _0803065E:
 	ldr r5, _08030784 @ =gUnknown_020314E0
 	ldr r0, [r5]
@@ -63561,7 +63561,7 @@ sub_31CF8: @ 0x08031CF8
 	movs r2, #0
 	ldrsh r0, [r0, r2]
 	movs r1, #4
-	bl sub_52BB0
+	bl SaveFile_SetPokedexFlags
 _08031D20:
 	ldr r2, _08031D88 @ =gUnknown_086A3700
 	ldr r1, _08031D84 @ =gUnknown_020314E0
@@ -63757,7 +63757,7 @@ _08031E7C:
 	beq _08031E94
 	movs r0, #0x2b
 	movs r1, #4
-	bl sub_52BB0
+	bl SaveFile_SetPokedexFlags
 _08031E94:
 	mov r2, r8
 	ldr r0, [r2]
@@ -63789,7 +63789,7 @@ _08031EB4:
 	movs r1, #0
 	ldrsh r0, [r0, r1]
 	movs r1, #4
-	bl sub_52BB0
+	bl SaveFile_SetPokedexFlags
 _08031ECE:
 	ldr r2, _08031F1C @ =gUnknown_086A3700
 	ldr r1, _08031F20 @ =gUnknown_020314E0