More work on slots; WRAM cleanup, Move Deleter

10 files changed, 68 insertions, 67 deletions

diff --git a/misc/gfx_41.asm b/misc/gfx_41.asm
index 6f55c237e..a07e3c429 100755
--- a/misc/gfx_41.asm
+++ b/misc/gfx_41.asm
@@ -8,11 +8,11 @@ Function104006: ; 104006
 	ld hl, wBackupAttrMap
 	call CutAndPasteAttrMap
 	decoord 0, 0
-	ld hl, wBackupTilemap
+	ld hl, wDecompressScratch
 	call CutAndPasteTilemap
 	ld a, $0
 	ld [rVBK], a
-	ld hl, wBackupTilemap
+	ld hl, wDecompressScratch
 	call Function10419d
 	ld a, $1
 	ld [rVBK], a
@@ -28,11 +28,11 @@ Function10402d:: ; 10402d
 
 Function104033: ; 104033
 	decoord 0, 0
-	ld hl, wBackupTilemap
+	ld hl, wDecompressScratch
 	call CutAndPasteTilemap
 	ld a, $0
 	ld [rVBK], a
-	ld hl, wBackupTilemap
+	ld hl, wDecompressScratch
 	call Function10419d
 	ret
 ; 104047
@@ -63,7 +63,7 @@ Function104067: ; 104067
 	ld hl, wBackupAttrMap
 	call CutAndPasteAttrMap
 	decoord 0, 0
-	ld hl, wBackupTilemap
+	ld hl, wDecompressScratch
 	call CutAndPasteTilemap
 	call DelayFrame
 	di
@@ -75,7 +75,7 @@ Function104067: ; 104067
 	call Function1041ad
 	ld a, $0
 	ld [rVBK], a
-	ld hl, wBackupTilemap
+	ld hl, wDecompressScratch
 	call Function1041ad
 	pop af
 	ld [rVBK], a
@@ -93,7 +93,7 @@ Function1040a2: ; 1040a2
 	ld hl, wBackupAttrMap
 	call CutAndPasteAttrMap
 	decoord 0, 0
-	ld hl, wBackupTilemap
+	ld hl, wDecompressScratch
 	call CutAndPasteTilemap
 	call DelayFrame
 	di
@@ -105,7 +105,7 @@ Function1040a2: ; 1040a2
 	call Function1041c1
 	ld a, $0
 	ld [rVBK], a
-	ld hl, wBackupTilemap
+	ld hl, wDecompressScratch
 	call Function1041c1
 	pop af
 	ld [rVBK], a
@@ -164,7 +164,7 @@ Function104116: ; 104116
 	ld hl, wBackupAttrMap
 	call CutAndPasteAttrMap
 	decoord 0, 0
-	ld hl, wBackupTilemap
+	ld hl, wDecompressScratch
 	call CutAndPasteTilemap
 	call DelayFrame
 
@@ -177,7 +177,7 @@ Function104116: ; 104116
 	call Function1041b7
 	ld a, $0
 	ld [rVBK], a
-	ld hl, wBackupTilemap
+	ld hl, wDecompressScratch
 	call Function1041b7
 	pop af
 	ld [rVBK], a
@@ -196,7 +196,7 @@ Function10414e: ; 10414e
 	call CutAndPasteAttrMap
 	ld c, $ff
 	decoord 0, 0
-	ld hl, wBackupTilemap
+	ld hl, wDecompressScratch
 	call CutAndPasteMap
 	ld a, $1
 	ld [rVBK], a
@@ -204,7 +204,7 @@ Function10414e: ; 10414e
 	call Function1041ad
 	ld a, $0
 	ld [rVBK], a
-	ld hl, wBackupTilemap
+	ld hl, wDecompressScratch
 	call Function1041ad
 	ret
 ; 104177
@@ -450,7 +450,7 @@ _Get2bpp:: ; 104284
 	push bc
 	push hl
 
-	; Copy c tiles of the 2bpp from b:de to wBackupTilemap
+	; Copy c tiles of the 2bpp from b:de to wDecompressScratch
 	ld a, b ; bank
 	ld l, c ; number of tiles
 	ld h, $0
@@ -461,7 +461,7 @@ endr
 	ld c, l
 	ld h, d ; address
 	ld l, e
-	ld de, wBackupTilemap
+	ld de, wDecompressScratch
 	call FarCopyBytes
 	
 	pop hl
@@ -473,7 +473,7 @@ endr
 
 	ld d, h
 	ld e, l
-	ld hl, wBackupTilemap
+	ld hl, wDecompressScratch
 	call Function104209
 
 	; restore the previous bank
@@ -528,7 +528,7 @@ endr
 	ld b, h
 	ld h, d
 	ld l, e
-	ld de, wBackupTilemap
+	ld de, wDecompressScratch
 	call FarCopyBytesDouble_DoubleBankSwitch
 
 	pop hl
@@ -540,7 +540,7 @@ endr
 
 	ld d, h
 	ld e, l
-	ld hl, wBackupTilemap
+	ld hl, wDecompressScratch
 	call Function104209
 
 	pop af
@@ -554,22 +554,22 @@ Function104303: ; 104303
 ; 104309
 
 Function104309:
-	ld hl, wBackupTilemap
+	ld hl, wDecompressScratch
 	decoord 0, 0
 	call Function10433a
-	ld hl, wBackupTilemap + $80
+	ld hl, wDecompressScratch + $80
 	decoord 0, 0, AttrMap
 	call Function10433a
 	ld a, $1
 	ld [rVBK], a
 	ld c, $8
-	ld hl, wBackupTilemap + $80
+	ld hl, wDecompressScratch + $80
 	debgcoord 0, 0, VBGMap1
 	call Function104209
 	ld a, $0
 	ld [rVBK], a
 	ld c, $8
-	ld hl, wBackupTilemap
+	ld hl, wDecompressScratch
 	debgcoord 0, 0, VBGMap1
 	call Function104209
 	ret
diff --git a/misc/mobile_12.asm b/misc/mobile_12.asm
index 748b095de..7dca10581 100755
--- a/misc/mobile_12.asm
+++ b/misc/mobile_12.asm
@@ -687,7 +687,7 @@ Function48689: ; 48689 (12:4689)
 	ret
 
 Function486bf: ; 486bf (12:46bf)
-	ld hl, wcfa1
+	ld hl, w2DMenuCursorInitY
 	ld a, [wd002]
 	bit 6, a
 	jr nz, .asm_486ce
@@ -772,7 +772,7 @@ Function48725: ; 48725 (12:4725)
 	ret
 
 Function4873c: ; 4873c (12:473c)
-	ld hl, wcfa1
+	ld hl, w2DMenuCursorInitY
 	ld a, $4
 	ld [hli], a
 	ld a, $c
@@ -1217,9 +1217,9 @@ Function48a3a: ; 48a3a (12:4a3a)
 	call LoadMenuDataHeader
 	call Function4873c
 	ld a, $a
-	ld [wcfa1], a
+	ld [w2DMenuCursorInitY], a
 	ld a, $b
-	ld [wcfa2], a
+	ld [w2DMenuCursorInitX], a
 	ld a, $1
 	ld [wMenuCursorY], a
 	hlcoord 10, 8
@@ -1605,7 +1605,8 @@ Function48c63: ; 48c63
 ; 48c8e
 
 Function48c8e: ; 48c8e
-	ld hl, wd02a
+; unreferenced
+	ld hl, $d02a
 	ld d, h
 	ld e, l
 	callba Function48c63
diff --git a/misc/mobile_12_2.asm b/misc/mobile_12_2.asm
index d7c987c36..6865c480a 100755
--- a/misc/mobile_12_2.asm
+++ b/misc/mobile_12_2.asm
@@ -488,11 +488,11 @@ Function4ab06: ; 4ab06
 Function4ab1a: ; 4ab1a
 .asm_4ab1a
 	ld a, $fb
-	ld [wcfa8], a
+	ld [w2DMenuFlags4], a
 	ld a, $26
-	ld [wcfa7], a
+	ld [w2DMenuFlags3], a
 	ld a, $2
-	ld [wcfa4], a
+	ld [w2DMenuNumCols], a
 	call Function4adf7
 	call StaticMenuJoypad
 	call Function4abc3
@@ -748,7 +748,7 @@ Function4acaa: ; 4acaa
 	ld a, $1
 	ld [wMenuCursorBuffer], a
 	call InitVerticalMenuCursor
-	ld hl, wcfa5
+	ld hl, w2DMenuFlags1
 	set 6, [hl]
 	call StaticMenuJoypad
 	ld de, SFX_READ_TEXT_2
diff --git a/misc/mobile_22.asm b/misc/mobile_22.asm
index 8734a4ca3..38acfa3af 100644
--- a/misc/mobile_22.asm
+++ b/misc/mobile_22.asm
@@ -2200,7 +2200,7 @@ Function89d5e: ; 89d5e (22:5d5e)
 	call Function8923c
 	call PlaceVerticalMenuItems
 	call InitVerticalMenuCursor
-	ld hl, wcfa5
+	ld hl, w2DMenuFlags1
 	set 7, [hl]
 	ret
 
@@ -2242,7 +2242,7 @@ Function89dab: ; 89dab (22:5dab)
 	callba MobileMenuJoypad
 	call Function8923c
 	ld a, c
-	ld hl, wcfa8
+	ld hl, w2DMenuFlags4
 	and [hl]
 	ret z
 	bit 0, a
@@ -2253,7 +2253,7 @@ Function89dab: ; 89dab (22:5dab)
 	ret
 .asm_89dc7
 	call PlayClickSFX
-	ld a, [wcfa3]
+	ld a, [w2DMenuNumRows]
 	ld c, a
 	ld a, [wMenuCursorY]
 	cp c
@@ -2384,8 +2384,8 @@ Function89e9a: ; 89e9a (22:5e9a)
 	ld a, $5
 	ld [rSVBK], a
 	ld hl, Palette_89eb1
-	ld de, wd028
-	ld bc, $8
+	ld de, UnknBGPals + 5 palettes
+	ld bc, 1 palettes
 	call CopyBytes
 	pop af
 	ld [rSVBK], a
@@ -3056,7 +3056,7 @@ Function8a31c: ; 8a31c (22:631c)
 	ld [MenuSelection], a
 	call PlaceVerticalMenuItems
 	call InitVerticalMenuCursor
-	ld hl, wcfa5
+	ld hl, w2DMenuFlags1
 	set 7, [hl]
 .asm_8a34e
 	call Function8a3a2
@@ -3088,7 +3088,7 @@ Function8a31c: ; 8a31c (22:631c)
 Function8a383: ; 8a383 (22:6383)
 	callba MobileMenuJoypad
 	ld a, c
-	ld hl, wcfa8
+	ld hl, w2DMenuFlags4
 	and [hl]
 	ret z
 	bit 0, a
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index 548c4b1d4..0041d549d 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -820,7 +820,7 @@ Function100513: ; 100513
 	call Function3f7c
 	call PlaceVerticalMenuItems
 	call InitVerticalMenuCursor
-	ld hl, wcfa5
+	ld hl, w2DMenuFlags1
 	set 7, [hl]
 	ret
 ; 100522
@@ -860,7 +860,7 @@ Function100545: ; 100545
 Function10054d: ; 10054d
 	callba MobileMenuJoypad
 	ld a, c
-	ld hl, wcfa8
+	ld hl, w2DMenuFlags4
 	and [hl]
 	ret z
 	call MenuClickSound
@@ -1829,16 +1829,16 @@ Function100b45: ; 100b45
 	call Function100e2d
 	pop bc
 	jr c, .asm_100b6b
-	ld a, [wcfa8]
+	ld a, [w2DMenuFlags4]
 	and c
 	jr z, .asm_100b48
 	callba Mobile_GetMenuSelection
 	ret
 
 .asm_100b6b
-	ld a, [wcfa4]
+	ld a, [w2DMenuNumCols]
 	ld c, a
-	ld a, [wcfa3]
+	ld a, [w2DMenuNumRows]
 	call SimpleMultiply
 	ld [wMenuCursorBuffer], a
 	and a
@@ -1854,7 +1854,7 @@ Function100b7a: ; 100b7a
 	call UpdateSprites
 	call ApplyTilemap
 	callba Init2DMenuCursorPosition
-	ld hl, wcfa5
+	ld hl, w2DMenuFlags1
 	set 7, [hl]
 	ret
 ; 100b9f
@@ -1890,7 +1890,7 @@ Function100bc2: ; 100bc2
 	call Function100e2d
 	pop bc
 	jr c, .asm_100c25
-	ld a, [wcfa8]
+	ld a, [w2DMenuFlags4]
 	and c
 	bit 6, a
 	jp nz, .asm_100bff
@@ -1996,7 +1996,7 @@ Function100c98: ; 100c98
 	call InitMenu3
 	ld a, [wNumMoves]
 	inc a
-	ld [wcfa3], a
+	ld [w2DMenuNumRows], a
 	ld a, [CurMoveNum]
 	inc a
 	ld [wMenuCursorY], a
@@ -2009,7 +2009,7 @@ Unknown_100cad: ; 100cad
 Function100cb5: ; 100cb5
 	call Function100dd8
 	ret c
-	ld hl, wcfa5
+	ld hl, w2DMenuFlags1
 	set 7, [hl]
 	res 6, [hl]
 .asm_100cc0
@@ -2021,7 +2021,7 @@ Function100cb5: ; 100cb5
 	call Function100dfd
 	pop bc
 	jr c, .asm_100d17
-	ld a, [wcfa8]
+	ld a, [w2DMenuFlags4]
 	and c
 	jr z, .asm_100cc0
 	call PlaceHollowCursor
@@ -2063,7 +2063,7 @@ MobileBattleMonMenu: ; 100d22
 	call Function100dd8
 	ret c
 	call Function100d67
-	ld hl, wcfa5
+	ld hl, w2DMenuFlags1
 	set 7, [hl]
 	res 6, [hl]
 .asm_100d30
@@ -2075,7 +2075,7 @@ MobileBattleMonMenu: ; 100d22
 	call Function100dfd
 	pop bc
 	jr c, .asm_100d54
-	ld a, [wcfa8]
+	ld a, [w2DMenuFlags4]
 	and c
 	jr nz, .asm_100d56
 	jr .asm_100d30
@@ -2111,7 +2111,7 @@ Function100d67: ; 100d67
 	call WaitBGMap
 	call CopyMenuData2
 	call InitVerticalMenuCursor
-	ld hl, wcfa5
+	ld hl, w2DMenuFlags1
 	set 6, [hl]
 	ret
 ; 100d88
@@ -5722,7 +5722,7 @@ Function1025ff: ; 1025ff
 	callba Function1009f3
 	ret c
 	callba MobileMenuJoypad
-	ld a, [wcfa8]
+	ld a, [w2DMenuFlags4]
 	and c
 	ret z
 	bit 0, c
@@ -5784,7 +5784,7 @@ Function10266b: ; 10266b
 	callba Function1009f3
 	ret c
 	callba MobileMenuJoypad
-	ld a, [wcfa8]
+	ld a, [w2DMenuFlags4]
 	and c
 	ret z
 	bit 0, c
@@ -6494,7 +6494,7 @@ Function102b4e: ; 102b4e
 	pop af
 	ld [wMenuCursorY], a
 	ld a, [OTPartyCount]
-	ld [wcfa3], a
+	ld [w2DMenuNumRows], a
 	ret
 ; 102b68
 
@@ -6519,7 +6519,7 @@ Function102b7b: ; 102b7b
 	pop af
 	ld [wMenuCursorY], a
 	ld a, [PartyCount]
-	ld [wcfa3], a
+	ld [w2DMenuNumRows], a
 	ret
 ; 102b94
 
diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm
index cc78c84e7..0f84cbf3c 100755
--- a/misc/mobile_41.asm
+++ b/misc/mobile_41.asm
@@ -1054,7 +1054,7 @@ Function1064d8: ; 1064d8
 	jr asm_1064ed
 
 asm_1064ed
-	ld de, wBackupTilemap
+	ld de, wDecompressScratch
 	ld b, $0
 	ld a, [rSVBK]
 	push af
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index c5c18b6fc..9afa520fb 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -5662,7 +5662,7 @@ Function1161d5: ; 1161d5
 	ld [rSVBK], a
 
 	ld hl, Unknown_117356
-	ld de, wBackupTilemap
+	ld de, wDecompressScratch
 	ld bc, $0300
 	call CopyBytes
 
diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm
index d11e655cf..cc5f3e8ba 100755
--- a/misc/mobile_5b.asm
+++ b/misc/mobile_5b.asm
@@ -1084,7 +1084,7 @@ Function16d713: ; 16d713
 ; 16d725
 
 Function16d725: ; 16d725
-	ld hl, wcfa6
+	ld hl, w2DMenuFlags2
 	res 7, [hl]
 	ld a, [hBGMapMode]
 	push af
@@ -1102,12 +1102,12 @@ Function16d734: ; 16d734
 	jr nc, .asm_16d758
 	callba _2DMenuInterpretJoypad
 	jr c, .asm_16d758
-	ld a, [wcfa5]
+	ld a, [w2DMenuFlags1]
 	bit 7, a
 	jr nz, .asm_16d758
 	call Function16d713
 	ld b, a
-	ld a, [wcfa8]
+	ld a, [w2DMenuFlags4]
 	and b
 	jr z, .asm_16d734
 
@@ -1133,7 +1133,7 @@ Function16d76a: ; 16d76a
 	call RTC
 	call Function16d7e7
 	ret c
-	ld a, [wcfa5]
+	ld a, [w2DMenuFlags1]
 	bit 7, a
 	jr z, .asm_16d76a
 	and a
@@ -1159,12 +1159,12 @@ Function16d77a: ; 16d77a
 	pop hl
 
 .asm_16d792
-	ld a, [wcfa1]
+	ld a, [w2DMenuCursorInitY]
 	ld b, a
-	ld a, [wcfa2]
+	ld a, [w2DMenuCursorInitX]
 	ld c, a
 	call Coord2Tile
-	ld a, [wcfa7]
+	ld a, [w2DMenuFlags3]
 	swap a
 	and $f
 	ld c, a
@@ -1181,7 +1181,7 @@ Function16d77a: ; 16d77a
 .asm_16d7b1
 	ld c, $14
 	call AddNTimes
-	ld a, [wcfa7]
+	ld a, [w2DMenuFlags3]
 	and $f
 	ld c, a
 	ld a, [wMenuCursorX]
@@ -1219,7 +1219,7 @@ Function16d77a: ; 16d77a
 ; 16d7e7
 
 Function16d7e7: ; 16d7e7
-	ld a, [wcfa5]
+	ld a, [w2DMenuFlags1]
 	bit 6, a
 	jr z, .asm_16d7f4
 	callba PlaySpriteAnimationsAndDelayFrame
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index a8a98c49d..321ea9382 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -270,7 +270,7 @@ Function170cc6: ; 170cc6
 	ld a, $6
 	ld [rSVBK], a
 	ld hl, LZ_170d16
-	ld de, wBackupTilemap
+	ld de, wDecompressScratch
 	call Decompress
 	ld a, $1
 	ld [rVBK], a
diff --git a/misc/printer_77.asm b/misc/printer_77.asm
index 72a7ec645..b176e9be9 100755
--- a/misc/printer_77.asm
+++ b/misc/printer_77.asm
@@ -214,7 +214,7 @@ Function1dc381: ; 1dc381
 	call Function1dc52c
 	ld hl, TempMonDVs
 	predef GetUnownLetter
-	ld hl, wc2c6
+	ld hl, wBoxAlignment
 	xor a
 	ld [hl], a
 	ld a, [CurPartySpecies]