6 files changed, 43 insertions, 28 deletions
diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm
index a07ed92..f1dd18f 100644
--- a/src/engine/bank1.asm
+++ b/src/engine/bank1.asm
@@ -6,9 +6,9 @@ Start_Cont: ; 4000 (1:4000)
 	call EnableInt_VBlank
 	call EnableInt_Timer
 	call EnableSRAM
-	ld a, [$a006]
+	ld a, [sa006]
 	ld [wTextSpeed], a
-	ld a, [$a009]
+	ld a, [sa009]
 	ld [wccf2], a
 	call DisableSRAM
 	ld a, $1
@@ -29,7 +29,7 @@ Start_Cont: ; 4000 (1:4000)
 ; erase sram
 	call EnableSRAM
 	xor a
-	ld [$a000], a
+	ld [sa000], a
 	call DisableSRAM
 .reset_game
 	jp Reset
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm
index 6577a69..8bdf8ad 100644
--- a/src/engine/bank3.asm
+++ b/src/engine/bank3.asm
@@ -267,9 +267,9 @@ Func_c1f8: ; c1f8 (3:41f8)
 	ld [wd112], a
 	ld [wd3b8], a
 	call EnableSRAM
-	ld a, [$a007]
+	ld a, [sa007]
 	ld [wd421], a
-	ld a, [$a006]
+	ld a, [sa006]
 	ld [wTextSpeed], a
 	call DisableSRAM
 	farcall Func_10756
diff --git a/src/engine/bank4.asm b/src/engine/bank4.asm
index 19d5396..aa5fdd4 100644
--- a/src/engine/bank4.asm
+++ b/src/engine/bank4.asm
@@ -1109,9 +1109,9 @@ Func_12704: ; 12704 (4:6704)
 	call Func_128a9
 	farcall Func_1996e
 	call EnableSRAM
-	ld a, [$a007]
+	ld a, [sa007]
 	ld [wd421], a
-	ld a, [$a006]
+	ld a, [sa006]
 	ld [wTextSpeed], a
 	call DisableSRAM
 	ld a, MUSIC_STOP
diff --git a/src/engine/bank6.asm b/src/engine/bank6.asm
index 8f58133..18e8b98 100644
--- a/src/engine/bank6.asm
+++ b/src/engine/bank6.asm
@@ -18,13 +18,13 @@ Func_1996e: ; 1996e (6:596e)
 	or b
 	jr nz, .asm_1997b
 	ld a, $5
-	ld hl, $a350
+	ld hl, sa350
 	call Func_199e0
 	ld a, $7
-	ld hl, $a3a4
+	ld hl, sa3a4
 	call Func_199e0
 	ld a, $9
-	ld hl, $a3f8
+	ld hl, sa3f8
 	call Func_199e0
 	call EnableSRAM
 	ld hl, sCardCollection
@@ -47,16 +47,16 @@ Func_1996e: ; 1996e (6:596e)
 	dec c
 	jr nz, .asm_199b2
 	ld a, $2
-	ld [$a003], a
+	ld [sa003], a
 	ld a, $2
-	ld [$a006], a
+	ld [sa006], a
 	ld [wTextSpeed], a
 	xor a
-	ld [$a007], a
-	ld [$a009], a
-	ld [$a004], a
-	ld [$a005], a
-	ld [$a00a], a
+	ld [sa007], a
+	ld [sa009], a
+	ld [sa004], a
+	ld [sa005], a
+	ld [sa00a], a
 	farcall Func_8cf9
 	call DisableSRAM
 	ret
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 6d596f9..0de3823 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -1305,7 +1305,7 @@ CGBSpeedSwitch: ; 07f1 (0:07f1)
 SetupExtRAM: ; 080b (0:080b)
 	xor a
 	call BankswitchSRAM
-	ld hl, $a000
+	ld hl, sa000
 	ld bc, $1000
 .asm_815
 	ld a, [hli]
@@ -1324,7 +1324,7 @@ SetupExtRAM: ; 080b (0:080b)
 	call DisableSRAM
 	ret
 .asm_82f
-	ld hl, $a000
+	ld hl, sa000
 	ld a, [hli]
 	cp $4
 	jr nz, .asm_842
@@ -1343,13 +1343,13 @@ SetupExtRAM: ; 080b (0:080b)
 	ret
 
 Func_084d: ; 084d (0:084d)
-	ld a, $3
-.asm_84f
+	ld a, 3
+.clear_loop
 	call ClearExtRAMBank
 	dec a
-	cp $ff
-	jr nz, .asm_84f
-	ld hl, $a000
+	cp -1
+	jr nz, .clear_loop
+	ld hl, sa000
 	ld [hl], $4
 	inc hl
 	ld [hl], $21
@@ -2612,7 +2612,7 @@ Func_100b: ; 100b (0:100b)
 	xor a
 	call BankswitchSRAM
 	call EnableSRAM
-	ld hl, $a008
+	ld hl, sa008
 	ld a, [hl]
 	inc [hl]
 	call DisableSRAM
@@ -9191,7 +9191,7 @@ Func_3917: ; 3917 (0:3917)
 	ld a, $22
 	farcall CheckIfEventFlagSet
 	call EnableSRAM
-	ld [$a00a], a
+	ld [sa00a], a
 	call DisableSRAM
 	ret
 
diff --git a/src/sram.asm b/src/sram.asm
index 89f8255..e5bd99d 100644
--- a/src/sram.asm
+++ b/src/sram.asm
@@ -1,8 +1,19 @@
 SECTION "SRAM", SRAM
 
-	ds $10
+sa000:: ds $3 ; a000
 
-sPlayerName:: ds $10
+sa003:: ds $1 ; a003
+sa004:: ds $1 ; a004
+sa005:: ds $1 ; a005
+sa006:: ds $1 ; a006
+sa007:: ds $1 ; a007
+sa008:: ds $1 ; a008
+sa009:: ds $1 ; a009
+sa00a:: ds $1 ; a00a
+
+	ds $5
+
+sPlayerName:: ds $10 ; a010
 
 	ds $e0
 
@@ -21,3 +32,7 @@ sDeck3Cards:: ds DECK_SIZE      ; a2c0
 
 sDeck4Name::  ds DECK_NAME_SIZE ; a2fc
 sDeck4Cards:: ds DECK_SIZE      ; a314
+
+sa350:: ds DECK_NAME_SIZE + DECK_SIZE ; a350
+sa3a4:: ds DECK_NAME_SIZE + DECK_SIZE ; a3a4
+sa3f8:: ds DECK_NAME_SIZE + DECK_SIZE ; a3f8