Lots of wram addresses

10 files changed, 454 insertions, 454 deletions

diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm
index 7544314..4d4582f 100755
--- a/src/engine/bank1.asm
+++ b/src/engine/bank1.asm
@@ -6,9 +6,9 @@ Func_4000: ; 4000 (1:4000)
 	call EnableInt_Timer
 	call EnableExtRAM
 	ld a, [$a006]
-	ld [$ce47], a
+	ld [wTextSpeed], a
 	ld a, [$a009]
-	ld [$ccf2], a
+	ld [wccf2], a
 	call DisableExtRAM
 	ld a, $1
 	ld [wUppercaseFlag], a
@@ -51,7 +51,7 @@ StartDuel: ; 409f (1:409f)
 	ldh [hWhoseTurn], a
 	ld a, $0
 	ld [wPlayerDuelistType], a
-	ld a, [$cc19]
+	ld a, [wcc19]
 	ld [wOpponentDeckId], a
 	call LoadPlayerDeck
 	call SwapTurn
@@ -70,14 +70,14 @@ StartDuel: ; 409f (1:409f)
 .asm_40ca
 	ld hl, [sp+$0]
 	ld a, l
-	ld [$cbe5], a
+	ld [wcbe5], a
 	ld a, h
-	ld [$cbe6], a
+	ld [wcbe6], a
 	xor a
 	ld [wCurrentDuelMenuItem], a
 	call $420b
-	ld a, [$cc18]
-	ld [$cc08], a
+	ld a, [wcc18]
+	ld [wcc08], a
 	call $70aa
 	ld a, [wDuelTheme]
 	call PlaySong
@@ -104,7 +104,7 @@ StartDuel: ; 409f (1:409f)
 	jr nz, .duelFinished
 	ld hl, $cc06
 	inc [hl]
-	ld a, [$cc09]
+	ld a, [wcc09]
 	cp $80
 	jr z, .asm_4126
 
@@ -120,7 +120,7 @@ StartDuel: ; 409f (1:409f)
 	cp $f
 	jr c, .nextTurn
 	xor a
-	ld [$d0c3], a
+	ld [wd0c3], a
 	ret
 
 .duelFinished
@@ -156,7 +156,7 @@ StartDuel: ; 409f (1:409f)
 	jr nz, .opponentWonBattle
 .playerWonBattle
 	xor a
-	ld [$d0c3], a
+	ld [wd0c3], a
 	ld a, $5d
 	ld c, MUSIC_MATCHVICTORY
 	text_hl WonDuelText
@@ -168,7 +168,7 @@ StartDuel: ; 409f (1:409f)
 	jr nz, .playerWonBattle
 .opponentWonBattle
 	ld a, $1
-	ld [$d0c3], a
+	ld [wd0c3], a
 	ld a, $5e
 	ld c, MUSIC_MATCHLOSS
 	text_hl LostDuelText
@@ -205,9 +205,9 @@ StartDuel: ; 409f (1:409f)
 	text_hl StartSuddenDeathMatchText
 	call DrawWideTextBox_WaitForInput
 	ld a, $1
-	ld [$cc08], a
+	ld [wcc08], a
 	call $70aa
-	ld a, [$cc09]
+	ld a, [wcc09]
 	cp $1
 	jr z, .asm_41f3
 	ld a, PLAYER_TURN
@@ -236,8 +236,8 @@ INCBIN "baserom.gbc",$420b,$4225 - $420b
 DrawCardFromDeck: ; 4225 (1:4225)
 	ld a, DUELVARS_DUELIST_TYPE
 	call GetTurnDuelistVariable
-	ld [$cc0d], a
-	ld a, [$cc06]
+	ld [wcc0d], a
+	ld a, [wcc06]
 	cp a, $02
 	jr c, .asm_4237
 	call $70f6
@@ -254,7 +254,7 @@ DrawCardFromDeck: ; 4225 (1:4225)
 .deckNotEmpty
 	ldh [hTempCardNumber], a
 	call AddCardToHand
-	ld a, [$cc0d]
+	ld a, [wcc0d]
 	cp $00
 	jr z, Func_4262
 	call SwapTurn
@@ -273,20 +273,20 @@ Func_4268:
 
 Func_426d:
 	call $4f9d
-	ld a, [$cc0d]
+	ld a, [wcc0d]
 	cp a, $00
 	jr z, PrintDuelMenu
 	cp a, $01
 	jp z, $6911
 	xor a
 	ld [wVBlankCtr], a
-	ld [$cbf9], a
+	ld [wcbf9], a
 	text_hl DuelistIsThinkingText
 	call Func_2a36
 	call Func_2bbf
 	ld a, $ff
-	ld [$cc11], a
-	ld [$cc10], a
+	ld [wcc11], a
+	ld [wcc10], a
 	ret
 
 PrintDuelMenu:
@@ -324,7 +324,7 @@ Func_42ac:
 	ldh a, [hButtonsPressed]
 	bit SELECT_F, a
 	jp nz, $458e
-	ld a, [$cbe7]
+	ld a, [wcbe7]
 	or a
 	jr nz, Func_42ac
 	call Func_271a
@@ -405,7 +405,7 @@ PlayerRetreat: ; 43ab (1:43ab)
 	cp a, $01
 	ldh [$ffa0], a
 	jr nz, Func_43f1
-	ld a, [$cc0c]
+	ld a, [wcc0c]
 	or a
 	jr nz, Func_43e8
 	call $45bb
@@ -613,7 +613,7 @@ Func_478b: ; 478b (1:478b)
 	ld a, $01
 	ld [wCardPageNumber], a
 	xor a
-	ld [$cbc9], a
+	ld [wcbc9], a
 	call Func_04a2
 	call Func_3b31
 	ld de, $8a00
@@ -642,7 +642,7 @@ Func_478b: ; 478b (1:478b)
 	ld a, $02
 
 .asm_47cb
-	ld [$cc04], a
+	ld [wcc04], a
 
 .asm_47ce
 	call Func_47ec
@@ -669,7 +669,7 @@ AttackMenuCursorData:
 	db $00
 
 Func_47ec: ; $47ec (1:47ec)
-	ld a, [$cc04]
+	ld a, [wcc04]
 	ld hl, $47f5
 	jp JumpToFunctionInTable
 
@@ -722,7 +722,7 @@ LoadPokemonMovesToDuelCardOrAttackList: ; 4823 (1:4823)
 	ld b, $0d
 	ld hl, wDuelCardOrAttackList
 	xor a
-	ld [$cbc7], a
+	ld [wCardPageNumber], a
 	ld de, wCardBuffer1Move1Name
 	call CheckIfMoveExists
 	jr c, .checkForSecondAttackSlot
@@ -984,7 +984,7 @@ AIMakeDecision: ; 67be (1:67be)
 	ld hl, $cbe1
 	or [hl]
 	jr nz, .turnEnded
-	ld a, [$cbf9]
+	ld a, [wcbf9]
 	or a
 	ret nz
 	ld [wVBlankCtr], a
@@ -1149,17 +1149,17 @@ InitializeDuelVariables: ; 7107 (1:7107)
 INCBIN "baserom.gbc",$7133,$71ad - $7133
 
 _TossCoin: ; 71ad (1:71ad)
-	ld [$cd9c], a
+	ld [wcd9c], a
 	ld a, [wcac2]
 	cp $6
 	jr z, .asm_71c1
 	xor a
-	ld [$cd9f], a
+	ld [wcd9f], a
 	call Func_04a2
 	call $210f
 
 .asm_71c1
-	ld a, [$cd9f]
+	ld a, [wcd9f]
 	or a
 	jr nz, .asm_71ec
 	ld a, $6
@@ -1186,31 +1186,31 @@ _TossCoin: ; 71ad (1:71ad)
 	call EnableLCD
 	ld a, $f1
 	call GetTurnDuelistVariable
-	ld [$cd9e], a
+	ld [wcd9e], a
 	call Func_0f58
 	xor a
-	ld [$cd9d], a
+	ld [wcd9d], a
 
 .asm_7204
-	ld a, [$cd9c]
+	ld a, [wcd9c]
 	cp $2
 	jr c, .asm_7223
 	ld bc, $0f0b
-	ld a, [$cd9f]
+	ld a, [wcd9f]
 	inc a
 	call $65b7
 	ld b, $11
 	ld a, $2e
 	call Func_06c3
 	inc b
-	ld a, [$cd9c]
+	ld a, [wcd9c]
 	call $65b7
 
 .asm_7223
 	call Func_3b21
 	ld a, $58
 	call Func_3b6a
-	ld a, [$cd9e]
+	ld a, [wcd9e]
 	or a
 	jr z, .asm_7236
 	call $7324
@@ -1233,7 +1233,7 @@ _TossCoin: ; 71ad (1:71ad)
 .asm_724d
 	ld a, d
 	call Func_3b6a
-	ld a, [$cd9e]
+	ld a, [wcd9e]
 	or a
 	jr z, .asm_725e
 	ld a, e
@@ -1264,7 +1264,7 @@ _TossCoin: ; 71ad (1:71ad)
 .asm_727c
 	ld a, b
 	call Func_3b6a
-	ld a, [$cd9e]
+	ld a, [wcd9e]
 	or a
 	jr z, .asm_728a
 	ld a, $1
@@ -1281,13 +1281,13 @@ _TossCoin: ; 71ad (1:71ad)
 .asm_7292
 	ld a, d
 	call Func_3796
-	ld a, [$cd9c]
+	ld a, [wcd9c]
 	dec a
 	jr z, .asm_72b9
 	ld a, c
 	push af
 	ld e, $0
-	ld a, [$cd9f]
+	ld a, [wcd9f]
 .asm_72a3
 	cp $a
 	jr c, .asm_72ad
@@ -1307,7 +1307,7 @@ _TossCoin: ; 71ad (1:71ad)
 .asm_72b9
 	ld hl, $cd9f
 	inc [hl]
-	ld a, [$cd9e]
+	ld a, [wcd9e]
 	or a
 	jr z, .asm_72dc
 	ld a, [hl]
@@ -1315,7 +1315,7 @@ _TossCoin: ; 71ad (1:71ad)
 	cp [hl]
 	call z, WaitForWideTextBoxInput
 	call $7324
-	ld a, [$cd9c]
+	ld a, [wcd9c]
 	ld hl, $cd9d
 	or [hl]
 	jr nz, .asm_72e2
@@ -1328,14 +1328,14 @@ _TossCoin: ; 71ad (1:71ad)
 
 .asm_72e2
 	call Func_3b31
-	ld a, [$cd9f]
+	ld a, [wcd9f]
 	ld hl, $cd9c
 	cp [hl]
 	jp c, .asm_7204
 	call Func_0f58
 	call Func_3b31
 	call Func_3b21
-	ld a, [$cd9d]
+	ld a, [wcd9d]
 	or a
 	ret z
 	scf
diff --git a/src/engine/bank1c.asm b/src/engine/bank1c.asm
index 3f0351a..6d9d685 100755
--- a/src/engine/bank1c.asm
+++ b/src/engine/bank1c.asm
@@ -1,5 +1,5 @@
 Func_70000: ; 70000 (1c:4000)
-	ld a, [$cab4]
+	ld a, [wConsole]
 	cp $1
 	ret nz
 	ld b, $1
@@ -14,7 +14,7 @@ Func_70000: ; 70000 (1c:4000)
 	ret
 
 Func_70018: ; 70018 (1c:4018)
-	ld a, [$cab4]
+	ld a, [wConsole]
 	cp $1
 	ret nz
 	ld a, $0
@@ -44,7 +44,7 @@ Unknown_70057: ; 70057 (1c:4057)
 INCBIN "baserom.gbc",$70057,$70082 - $70057
 
 Func_70082: ; 70082 (1c:4082)
-	ld a, [$cab4]
+	ld a, [wConsole]
 	cp $1
 	ret nz
 	push hl
@@ -147,21 +147,21 @@ Func_70136: ; 70136 (1c:4136)
 	push bc
 	push de
 	ldh a, [hSCX]
-	ld [$d41d], a
+	ld [wd41d], a
 	ldh a, [hSCY]
-	ld [$d41e], a
-	ld a, [$cabc]
-	ld [$d41f], a
-	ld a, [$cabb]
-	ld [$d420], a
+	ld [wd41e], a
+	ld a, [wBGP]
+	ld [wd41f], a
+	ld a, [wLCDC]
+	ld [wd420], a
 	di
 	ld hl, SGB_MASK_EN_ON_701a0
 	call SendSGB
 	call DisableLCD
-	ld a, [$cabb]
+	ld a, [wLCDC]
 	and $41
 	or $1
-	ld [$cabb], a
+	ld [wLCDC], a
 	ld a, $e4
 	ld [rBGP], a
 	call Func_040c
@@ -183,14 +183,14 @@ Func_70177: ; 70177 (1c:4177)
 	call EnableLCD
 	pop hl
 	call SendSGB
-	ld a, [$d41d]
+	ld a, [wd41d]
 	ldh [hSCX], a
-	ld a, [$d41e]
+	ld a, [wd41e]
 	ldh [hSCY], a
-	ld a, [$d41f]
+	ld a, [wd41f]
 	call Func_040c
-	ld a, [$d420]
-	ld [$cabb], a
+	ld a, [wd420]
+	ld [wLCDC], a
 	call DisableLCD
 	ei
 	pop de
@@ -217,13 +217,13 @@ Func_701c0: ; 701c0 (1c:41c0)
 	ld [hli], a
 	dec c
 	jr nz, .asm_701cb
-	ld a, [$cab6]
+	ld a, [wTileMapFill]
 	push af
 	xor a
-	ld [$cab6], a
+	ld [wTileMapFill], a
 	call Func_04a2
 	pop af
-	ld [$cab6], a
+	ld [wTileMapFill], a
 	di
 	ld hl, SGB_MASK_EN_OFF_701b0
 	call SendSGB
diff --git a/src/engine/bank2.asm b/src/engine/bank2.asm
index 5c36476..48d39cc 100755
--- a/src/engine/bank2.asm
+++ b/src/engine/bank2.asm
@@ -41,11 +41,11 @@ INCBIN "baserom.gbc",$8d15,$8d56 - $8d15
 
 Func_8d56: ; 8d56 (2:4d56)
 	xor a
-	ld [$cab6], a
+	ld [wTileMapFill], a
 	call Func_04a2
 	call Func_099c
 	ld a, $1
-	ld [$cac0], a
+	ld [wVBlankOAMCopyToggle], a
 	call Func_2119
 	call Func_20b0
 	call Func_8d0b
@@ -93,7 +93,7 @@ Func_8dbc: ; 8dbc (2:4dbc)
 	ldh a, [hCurrentMenuItem]
 	cp $ff
 	ret z
-	ld [$ceb1], a
+	ld [wceb1], a
 	jp Func_8e42
 
 Unknown_8de2: ; 8de2 (2:4de2)
@@ -104,7 +104,7 @@ Func_8dea: ; 8dea (2:4dea)
 	and START
 	ret z
 	ld a, [wCurMenuItem]
-	ld [$ceb1], a
+	ld [wceb1], a
 	call Func_8ff2
 	jp nc, Func_8e05
 	ld a, $ff
@@ -123,7 +123,7 @@ Func_8e05: ; 8e05 (2:4e05)
 	call Func_8e1f
 	ld a, $ff
 	call Func_9168
-	ld a, [$ceb1]
+	ld a, [wceb1]
 	scf
 	ret
 
@@ -138,7 +138,7 @@ Func_8e1f: ; 8e1f (2:4e1f)
 	ld hl, $cebb
 	call Func_9843
 	ld a, $3c
-	ld [$cecc], a
+	ld [wcecc], a
 	ld hl, $cebb
 	ld [hl], a
 	call Func_9e41
@@ -156,13 +156,13 @@ Func_8e42: ; 8e42 (2:4e42)
 	cp $ff
 	jr nz, .asm_8e64
 	call Func_90d8
-	ld a, [$ceb1]
+	ld a, [wceb1]
 	jp Func_8dbc
 .asm_8e64
-	ld a, [$ceaf]
+	ld a, [wceaf]
 	or a
 	jp nz, Func_8f8a
-	ld a, [$ceb0]
+	ld a, [wceb0]
 	or a
 	jp nz, .asm_8ecf
 	call Func_9048
@@ -206,7 +206,7 @@ Func_8e42: ; 8e42 (2:4e42)
 .asm_8ec4
 	ld a, $ff
 	call Func_9168
-	ld a, [$ceb1]
+	ld a, [wceb1]
 	jp Func_8dbc
 .asm_8ecf
 	call Func_8ff2
@@ -228,11 +228,11 @@ Func_8e42: ; 8e42 (2:4e42)
 	call Func_92b4
 	ld a, $ff
 	call Func_9168
-	ld a, [$ceb1]
+	ld a, [wceb1]
 	jp Func_8dbc
 
 Func_8f05: ; 8f05 (2:4f05)
-	ld a, [$ceb1]
+	ld a, [wceb1]
 	or a
 	jr nz, .asm_8f10
 	ld hl, Unknown_a763
@@ -254,7 +254,7 @@ Func_8f05: ; 8f05 (2:4f05)
 	ld bc, $0401
 	ld de, $cfb9
 	farcall Func_1ad89
-	ld a, [$cfb9]
+	ld a, [wcfb9]
 	or a
 	ret nz
 	call Func_8f38
@@ -314,7 +314,7 @@ Func_8f38: ; 8f38 (2:4f38)
 	ret
 
 Func_8f8a: ; 8f8a (2:4f8a)
-	ld a, [$ceb0]
+	ld a, [wceb0]
 	or a
 	jp nz, Func_9026
 	call Func_8ff2
@@ -336,7 +336,7 @@ Func_8f9d: ; 8f9d (2:4f9d)
 	ld hl, $0000
 	ld bc, $0202
 	call Func_1f5f
-	ld a, [$ceb1]
+	ld a, [wceb1]
 	call EnableExtRAM
 	ld [$b700], a
 	call DisableExtRAM
@@ -346,21 +346,21 @@ Func_8f9d: ; 8f9d (2:4f9d)
 	call Func_9253
 	call DisableExtRAM
 	xor a
-	ld [$ce3f], a
-	ld [$ce40], a
+	ld [wce3f], a
+	ld [wce40], a
 	text_hl ChosenAsDuelingDeckText
 	call DrawWideTextBox_WaitForInput
-	ld a, [$ceb1]
+	ld a, [wceb1]
 	jp Func_8dbc
 
 Func_8fe8: ; 8fe8 (2:4fe8)
 	text_hl ThereIsNoDeckHereText
 	call DrawWideTextBox_WaitForInput
-	ld a, [$ceb1]
+	ld a, [wceb1]
 	ret
 
 Func_8ff2: ; 8ff2 (2:4ff2)
-	ld a, [$ceb1]
+	ld a, [wceb1]
 	ld hl, $ceb2
 	ld b, $0
 	ld c, a
@@ -381,7 +381,7 @@ Unknown_9027: ; 9027 (2:5027)
 INCBIN "baserom.gbc",$9027,$9038 - $9027
 
 Func_9038: ; 9038 (2:5038)
-	ld a, [$ceb1]
+	ld a, [wceb1]
 	ld h, a
 	ld l, $54
 	call HtimesL
@@ -393,7 +393,7 @@ Func_9038: ; 9038 (2:5038)
 
 Func_9048: ; 9048 (2:5048)
 	push af
-	ld a, [$ceb1]
+	ld a, [wceb1]
 	ld h, a
 	ld l, $54
 	call HtimesL
@@ -406,17 +406,17 @@ Func_9048: ; 9048 (2:5048)
 
 Func_905a: ; 905a (2:505a)
 	xor a
-	ld [$ceaf], a
-	ld [$ceb0], a
-	ld [$cea3], a
+	ld [wceaf], a
+	ld [wceb0], a
+	ld [wcea3], a
 	ret
 
 Func_9065: ; 9065 (2:5065)
 	xor a
-	ld [$cfe3], a
-	ld a, [$ceaf]
+	ld [wcfe3], a
+	ld a, [wceaf]
 	ld d, a
-	ld a, [$ceb0]
+	ld a, [wceb0]
 	ld e, a
 	ldh a, [hButtonsPressed2]
 	or a
@@ -441,16 +441,16 @@ Func_9065: ; 9065 (2:5065)
 	ld e, a
 .asm_9090
 	ld a, $1
-	ld [$cfe3], a
+	ld [wcfe3], a
 	push de
 	call Func_90d8
 	pop de
 	ld a, d
-	ld [$ceaf], a
+	ld [wceaf], a
 	ld a, e
-	ld [$ceb0], a
+	ld [wceb0], a
 	xor a
-	ld [$cea3], a
+	ld [wcea3], a
 .asm_90a6
 	ldh a, [hButtonsPressed]
 	and A_BUTTON | B_BUTTON
@@ -468,7 +468,7 @@ Func_9065: ; 9065 (2:5065)
 	scf
 	ret
 .asm_90c1
-	ld a, [$cfe3]
+	ld a, [wcfe3]
 	or a
 	jr z, .asm_90ca
 	call Func_3796
@@ -487,13 +487,13 @@ asm_90da
 	ld e, a
 	ld a, $a
 	ld l, a
-	ld a, [$ceaf]
+	ld a, [wceaf]
 	ld h, a
 	call HtimesL
 	ld a, l
 	add $1
 	ld b, a
-	ld a, [$ceb0]
+	ld a, [wceb0]
 	sla a
 	add $e
 	ld c, a
@@ -593,7 +593,7 @@ Func_9168: ; 9168 (2:5168)
 	call Func_9314
 	jr c, .asm_91bd
 	ld a, $1
-	ld [$ceb2], a
+	ld [wceb2], a
 .asm_91bd
 	ld a, [hffb5]
 	bit 1, a
@@ -606,7 +606,7 @@ Func_9168: ; 9168 (2:5168)
 	call Func_9314
 	jr c, .asm_91da
 	ld a, $1
-	ld [$ceb3], a
+	ld [wceb3], a
 .asm_91da
 	ld a, [hffb5]
 	bit 2, a
@@ -619,7 +619,7 @@ Func_9168: ; 9168 (2:5168)
 	call Func_9314
 	jr c, .asm_91f7
 	ld a, $1
-	ld [$ceb4], a
+	ld [wceb4], a
 .asm_91f7
 	ld a, [hffb5]
 	bit 3, a
@@ -632,7 +632,7 @@ Func_9168: ; 9168 (2:5168)
 	call Func_9314
 	jr c, .asm_9214
 	ld a, $1
-	ld [$ceb5], a
+	ld [wceb5], a
 .asm_9214
 	call EnableExtRAM
 	ld a, [$b700]
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index 11ca29a..453cf61 100755
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -26,12 +26,12 @@ Func_8020f: ; 8020f (20:420f)
 
 Func_80229: ; 80229 (20:4229)
 	ld a, [hli]
-	ld [$d4c4], a
+	ld [wd4c4], a
 	ld a, [hli]
-	ld [$d4c5], a
+	ld [wd4c5], a
 	ld a, [hli]
 	add $20
-	ld [$d4c6], a
+	ld [wd4c6], a
 	ret
 ; 0x80238
 
@@ -44,9 +44,9 @@ Func_8025b: ; 8025b (20:425b)
 	call Func_80229
 	ld a, [hl]
 	push af
-	ld [$d4c8], a
+	ld [wd4c8], a
 	ld a, $10
-	ld [$d4c7], a
+	ld [wd4c7], a
 	call Func_80274
 	pop af
 	pop hl
@@ -62,9 +62,9 @@ asm_8027c
 	push hl
 	push bc
 	push de
-	ld a, [$d4c8]
+	ld a, [wd4c8]
 	ld b, a
-	ld a, [$d4c7]
+	ld a, [wd4c7]
 	ld c, a
 	ld hl, $d4c2
 	ld e, [hl]
@@ -84,31 +84,31 @@ asm_8027c
 	ret
 
 Func_8029f: ; 8029f (20:429f)
-	ld a, [$d4ca]
+	ld a, [wd4ca]
 	swap a
 	push af
 	and $f0
-	ld [$d4c2], a
+	ld [wd4c2], a
 	pop af
 	and $f
 	add $80
-	ld [$d4c3], a
-	ld a, [$d4cb]
+	ld [wd4c3], a
+	ld a, [wd4cb]
 	and $1
 	call BankswitchVRAM
 	ret
 
 Func_802bb: ; 802bb (20:42bb)
-	ld a, [$d4ca]
+	ld a, [wd4ca]
 	push af
 	xor $80
-	ld [$d4ca], a
+	ld [wd4ca], a
 	call Func_8029f
-	ld a, [$d4c3]
+	ld a, [wd4c3]
 	add $8
-	ld [$d4c3], a
+	ld [wd4c3], a
 	pop af
-	ld [$d4ca], a
+	ld [wd4ca], a
 	ret
 ; 0x802d4
 
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm
index f3bcee9..feb7c05 100755
--- a/src/engine/bank3.asm
+++ b/src/engine/bank3.asm
@@ -4,22 +4,22 @@ LoadMap: ; c000 (3:4000)
 	bank1call Func_6785
 	call DisableExtRAM
 	ld a, $0
-	ld [$d0b5], a
+	ld [wd0b5], a
 	xor a
-	ld [$d10f], a
-	ld [$d110], a
-	ld [$d113], a
+	ld [wd10f], a
+	ld [wd110], a
+	ld [wMatchStartTheme], a
 	farcall Func_10a9b
 	call Func_c1a4
 	call Func_099c
 	xor a
-	ld [$cab6], a
+	ld [wTileMapFill], a
 	call Func_2119
 	call Set_OBJ_8x8
 	xor a
-	ld [$cd08], a
+	ld [wcd08], a
 	xor a
-	ld [$d291], a
+	ld [wd291], a
 .asm_c037
 	farcall Func_10ab4
 	call Func_c1a4
@@ -29,11 +29,11 @@ LoadMap: ; c000 (3:4000)
 	ld a, PLAYER_TURN
 	ldh [hWhoseTurn], a
 	farcall Func_1c440
-	ld a, [$d0bb]
+	ld a, [wd0bb]
 	ld [wCurMap], a
-	ld a, [$d0bc]
+	ld a, [wd0bc]
 	ld [wPlayerXCoord], a
-	ld a, [$d0bd]
+	ld a, [wd0bd]
 	ld [wPlayerYCoord], a
 	call Func_c36a
 	call Func_c184
@@ -45,8 +45,8 @@ LoadMap: ; c000 (3:4000)
 	farcall Func_80480
 	call Func_c199
 	xor a
-	ld [$d0b4], a
-	ld [$d0c1], a
+	ld [wd0b4], a
+	ld [wd0c1], a
 	call Func_39fc
 	farcall Func_10af9
 	call Func_c141
@@ -70,7 +70,7 @@ LoadMap: ; c000 (3:4000)
 .asm_c0b6
 	farcall Func_10ab4
 	call Func_c1a0
-	ld a, [$d113]
+	ld a, [wMatchStartTheme]
 	or a
 	jr z, .asm_c0ca
 	call Func_c280
@@ -80,7 +80,7 @@ LoadMap: ; c000 (3:4000)
 	ret
 
 Func_c0ce: ; c0ce (3:40ce)
-	ld a, [$d0bf]
+	ld a, [wd0bf]
 	res 7, a
 	rlca
 	add PointerTable_c0e0 & $ff
@@ -108,15 +108,15 @@ Func_c0ed: ; c0ed (3:40ed)
 	ret
 
 Func_c0f1: ; c0f1 (3:40f1)
-	ld a, [$d3b6]
-	ld [$d3aa], a
+	ld a, [wd3b6]
+	ld [wd3aa], a
 	farcall Func_1c768
 	ld a, c
-	ld [$d0c6], a
+	ld [wd0c6], a
 	ld a, b
-	ld [$d0c7], a
+	ld [wd0c7], a
 	ld a, $3
-	ld [$d0bf], a
+	ld [wd0bf], a
 	jr Func_c10a
 
 Func_c10a: ; c10a (3:410a)
@@ -127,20 +127,20 @@ Func_c10a: ; c10a (3:410a)
 	jp [hl]
 
 Func_c111: ; c111 (3:4111)
-	ld a, [$d0c1]
+	ld a, [wd0c1]
 	bit 0, a
 	call nz, Func_c135
-	ld a, [$d0c1]
+	ld a, [wd0c1]
 	bit 1, a
 	jr z, .asm_c12a
-	ld a, [$d3b6]
-	ld [$d3aa], a
+	ld a, [wd3b6]
+	ld [wd3aa], a
 	farcall Func_1c5e9
 .asm_c12a
 	xor a
-	ld [$d0c1], a
-	ld a, [$d0c0]
-	ld [$d0bf], a
+	ld [wd0c1], a
+	ld a, [wd0c0]
+	ld [wd0bf], a
 	ret
 
 Func_c135: ; c135 (3:4135)
@@ -170,24 +170,24 @@ PointerTable_c152: ; c152 (3:4152)
 	dw Func_fcad
 
 Func_c158: ; c158 (3:4158)
-	ld a, [$d0c2]
+	ld a, [wd0c2]
 	cp $1
 	ret nz
-	ld a, [$d0c4]
-	ld [$d3ab], a
+	ld a, [wd0c4]
+	ld [wd3ab], a
 	call Func_39c3
 	jr c, .asm_c179
-	ld a, [$d3aa]
+	ld a, [wd3aa]
 	ld l, $4
 	call Func_39ad
-	ld a, [$d0c5]
+	ld a, [wd0c5]
 	ld [hl], a
 	farcall Func_1c58e
 .asm_c179
 	ret
 
 Func_c17a: ; c17a (3:417a)
-	ld a, [$d0bf]
+	ld a, [wd0bf]
 	cp $3
 	ret z
 	call Func_c9b8
@@ -202,8 +202,8 @@ Func_c184: ; c184 (3:4184)
 	ld c, $0
 .asm_c190
 	ld a, c
-	ld [$d0bf], a
-	ld [$d0c0], a
+	ld [wd0bf], a
+	ld [wd0c0], a
 	pop bc
 	ret
 
@@ -227,15 +227,15 @@ Func_c1a4: ; c1a4 (3:41a4)
 
 Func_c1b1: ; c1b1 (3:41b1)
 	ld a, $c
-	ld [$d32e], a
+	ld [wd32e], a
 	ld a, $0
-	ld [$d0bb], a
+	ld [wd0bb], a
 	ld a, $c
-	ld [$d0bc], a
+	ld [wd0bc], a
 	ld a, $c
-	ld [$d0bd], a
+	ld [wd0bd], a
 	ld a, $2
-	ld [$d0be], a
+	ld [wd0be], a
 	call Func_c9cb
 	call Func_c9dd
 	farcall Func_80b7a
@@ -257,32 +257,32 @@ Func_c1ed: ; c1ed (3:41ed)
 
 Func_c1f8: ; c1f8 (3:41f8)
 	xor a
-	ld [$d0b8], a
-	ld [$d0b9], a
-	ld [$d0ba], a
-	ld [$d11b], a
-	ld [$d0c2], a
-	ld [$d111], a
-	ld [$d112], a
-	ld [$d3b8], a
+	ld [wd0b8], a
+	ld [wd0b9], a
+	ld [wd0ba], a
+	ld [wd11b], a
+	ld [wd0c2], a
+	ld [wd111], a
+	ld [wd112], a
+	ld [wd3b8], a
 	call EnableExtRAM
 	ld a, [$a007]
-	ld [$d421], a
+	ld [wd421], a
 	ld a, [$a006]
-	ld [$ce47], a
+	ld [wTextSpeed], a
 	call DisableExtRAM
 	farcall Func_10756
 	ret
 
 Func_c228: ; c228 (3:4228)
 	ld a, [wCurMap]
-	ld [$d0bb], a
+	ld [wd0bb], a
 	ld a, [wPlayerXCoord]
-	ld [$d0bc], a
+	ld [wd0bc], a
 	ld a, [wPlayerYCoord]
-	ld [$d0bd], a
-	ld a, [$d334]
-	ld [$d0be], a
+	ld [wd0bd], a
+	ld a, [wd334]
+	ld [wd0be], a
 	ret
 
 Func_c241: ; c241 (3:4241)
@@ -341,7 +341,7 @@ Func_c280: ; c280 (3:4280)
 	call Func_c228
 	call Func_3ca0
 	call Func_099c
-	ld hl, $cac0
+	ld hl, wVBlankOAMCopyToggle
 	inc [hl]
 	call EnableLCD
 	call DoFrameIfLCDEnabled
@@ -371,7 +371,7 @@ Func_c2a3: ; c2a3 (3:42a3)
 	call Func_3ca0
 	call Func_099c
 	ld a, $1
-	ld [$cac0], a
+	ld [wVBlankOAMCopyToggle], a
 	call EnableLCD
 	call DoFrameIfLCDEnabled
 	call DisableLCD
@@ -395,11 +395,11 @@ Func_c2db: ; c2db (3:42db)
 	ldh [hWhoseTurn], a
 	call Func_c241
 	call Func_04a2
-	ld a, [$d111]
+	ld a, [wd111]
 	push af
 	farcall Func_80000
 	pop af
-	ld [$d111], a
+	ld [wd111], a
 	ld hl, $d0c1
 	res 0, [hl]
 	call Func_c34e
@@ -424,16 +424,16 @@ Func_c2db: ; c2db (3:42db)
 
 Func_c32b: ; c32b (3:432b)
 	ld a, l
-	ld [$d10f], a
+	ld [wd10f], a
 	ld a, h
-	ld [$d110], a
+	ld [wd110], a
 	jr Func_c2db
 
 Func_c335: ; c335 (3:4335)
-	ld a, [$cabd]
-	ld [$d10c], a
-	ld a, [$cabe]
-	ld [$d10d], a
+	ld a, [wOBP0]
+	ld [wd10c], a
+	ld a, [wOBP1]
+	ld [wd10d], a
 	ld hl, $cb30
 	ld de, $d0cc
 	ld bc, $0040
@@ -441,10 +441,10 @@ Func_c335: ; c335 (3:4335)
 	ret
 
 Func_c34e: ; c34e (3:434e)
-	ld a, [$d10c]
-	ld [$cabd], a
-	ld a, [$d10d]
-	ld [$cabe], a
+	ld a, [wd10c]
+	ld [wOBP0], a
+	ld a, [wd10d]
+	ld [wOBP1], a
 	ld hl, $d0cc
 	ld de, $cb30
 	ld bc, $0040
@@ -454,12 +454,12 @@ Func_c34e: ; c34e (3:434e)
 
 Func_c36a: ; c36a (3:436a)
 	xor a
-	ld [$d323], a
+	ld [wd323], a
 	ld a, [wCurMap]
 	cp POKEMON_DOME_ENTRANCE
 	jr nz, .asm_c379
 	xor a
-	ld [$d324], a
+	ld [wd324], a
 .asm_c379
 	ret
 ; 0xc37a
@@ -467,23 +467,23 @@ Func_c36a: ; c36a (3:436a)
 INCBIN "baserom.gbc",$c37a,$c41c - $c37a
 
 Func_c41c: ; c41c (3:441c)
-	ld a, [$d332]
+	ld a, [wd332]
 	sub $40
-	ld [$d235], a
-	ld a, [$d333]
+	ld [wd235], a
+	ld a, [wd333]
 	sub $40
-	ld [$d236], a
+	ld [wd236], a
 	call Func_c430
 	ret
 
 Func_c430: ; c430 (3:4430)
 	push bc
-	ld a, [$d237]
+	ld a, [wd237]
 	sla a
 	sla a
 	sla a
 	ld b, a
-	ld a, [$d235]
+	ld a, [wd235]
 	cp $b1
 	jr c, .asm_c445
 	xor a
@@ -493,13 +493,13 @@ Func_c430: ; c430 (3:4430)
 	jr c, .asm_c449
 	ld a, b
 .asm_c449
-	ld [$d235], a
-	ld a, [$d238]
+	ld [wd235], a
+	ld a, [wd238]
 	sla a
 	sla a
 	sla a
 	ld b, a
-	ld a, [$d236]
+	ld a, [wd236]
 	cp $b9
 	jr c, .asm_c460
 	xor a
@@ -509,38 +509,38 @@ Func_c430: ; c430 (3:4430)
 	jr c, .asm_c464
 	ld a, b
 .asm_c464
-	ld [$d236], a
+	ld [wd236], a
 	pop bc
 	ret
 
 Func_c469: ; c469 (3:4469)
-	ld a, [$d235]
+	ld a, [wd235]
 	add $4
 	and $f8
 	rrca
 	rrca
 	rrca
-	ld [$d233], a
-	ld a, [$d236]
+	ld [wd233], a
+	ld a, [wd236]
 	add $4
 	and $f8
 	rrca
 	rrca
 	rrca
-	ld [$d234], a
+	ld [wd234], a
 	ret
 
 Func_c484: ; c484 (3:4484)
-	ld a, [$d235]
-	ld [$d0b6], a
-	ld a, [$d236]
-	ld [$d0b7], a
+	ld a, [wd235]
+	ld [wd0b6], a
+	ld a, [wd236]
+	ld [wd0b7], a
 	ret
 
 Func_c491: ; c491 (3:4491)
-	ld a, [$d0b6]
+	ld a, [wd0b6]
 	ldh [hSCX], a
-	ld a, [$d0b7]
+	ld a, [wd0b7]
 	ldh [hSCY], a
 	ret
 
@@ -551,50 +551,50 @@ Func_c49c: ; c49c (3:449c)
 	rlca
 	rlca
 	rlca
-	ld [$d332], a
+	ld [wd332], a
 	ld a, [wPlayerYCoord]
 	and $1f
 	ld [wPlayerYCoord], a
 	rlca
 	rlca
 	rlca
-	ld [$d333], a
+	ld [wd333], a
 	ret
 
 Func_c4b9: ; c4b9 (3:44b9)
 	xor a
-	ld [$d4ca], a
-	ld [$d4cb], a
+	ld [wd4ca], a
+	ld [wd4cb], a
 	ld a, $1d
 	farcall Func_80418
 	ld b, $0
-	ld a, [$cab4]
+	ld a, [wConsole]
 	cp $2
 	jr nz, .asm_c4d1
 	ld b, $1e
 .asm_c4d1
 	ld a, b
-	ld [$d337], a
+	ld [wd337], a
 	ld a, $0
 	farcall Func_1299f
-	ld a, [$d4cf]
-	ld [$d336], a
+	ld a, [wd4cf]
+	ld [wd336], a
 	ld b, $2
 	ld a, [wCurMap]
 	cp OVERWORLD_MAP
 	jr z, .asm_c4ee
-	ld a, [$d0be]
+	ld a, [wd0be]
 	ld b, a
 .asm_c4ee
 	ld a, b
-	ld [$d334], a
+	ld [wd334], a
 	call Func_c5e9
 	ld a, [wCurMap]
 	cp OVERWORLD_MAP
 	call nz, Func_c6f7
 	xor a
-	ld [$d335], a
-	ld [$d338], a
+	ld [wd335], a
+	ld [wd338], a
 	ld a, [wCurMap]
 	cp OVERWORLD_MAP
 	jr nz, .asm_c50f
@@ -603,19 +603,19 @@ Func_c4b9: ; c4b9 (3:44b9)
 	ret
 
 Func_c510: ; c510 (3:4510)
-	ld a, [$d336]
-	ld [$d4cf], a
-	ld a, [$d335]
+	ld a, [wd336]
+	ld [wd4cf], a
+	ld a, [wd335]
 	bit 4, a
 	ret nz
 	bit 0, a
 	call z, Func_c5ac
-	ld a, [$d335]
+	ld a, [wd335]
 	or a
 	jr z, .asm_c535
 	bit 0, a
 	call nz, Func_c66c
-	ld a, [$d335]
+	ld a, [wd335]
 	bit 1, a
 	call nz, Func_c6dc
 	ret
@@ -629,8 +629,8 @@ Func_c510: ; c510 (3:4510)
 INCBIN "baserom.gbc",$c53d,$c554 - $c53d
 
 Func_c554: ; c554 (3:4554)
-	ld a, [$d336]
-	ld [$d4cf], a
+	ld a, [wd336]
+	ld [wd4cf], a
 	ld a, [wCurMap]
 	cp OVERWORLD_MAP
 	jr nz, .asm_c566
@@ -641,17 +641,17 @@ Func_c554: ; c554 (3:4554)
 	push bc
 	push de
 	call Func_c58b
-	ld a, [$d235]
+	ld a, [wd235]
 	ld d, a
-	ld a, [$d236]
+	ld a, [wd236]
 	ld e, a
 	ld c, $2
 	call Func_3dbf
-	ld a, [$d332]
+	ld a, [wd332]
 	sub d
 	add $8
 	ld [hli], a
-	ld a, [$d333]
+	ld a, [wd333]
 	sub e
 	add $10
 	ld [hli], a
@@ -689,7 +689,7 @@ Func_c5ac: ; c5ac (3:45ac)
 	jr z, .asm_c5bf
 	call Func_c5cb
 	call Func_c5fe
-	ld a, [$d335]
+	ld a, [wd335]
 	and $1
 	jr nz, .asm_c5ca
 .asm_c5bf
@@ -703,7 +703,7 @@ Func_c5ac: ; c5ac (3:45ac)
 
 Func_c5cb: ; c5cb (3:45cb)
 	call Func_c5d5
-	ld [$d334], a
+	ld [wd334], a
 	call Func_c5e9
 	ret
 
@@ -727,11 +727,11 @@ Unknown_c5e5: ; c5e5 (3:45e5)
 
 Func_c5e9: ; c5e9 (3:45e9)
 	push bc
-	ld a, [$d336]
-	ld [$d4cf], a
-	ld a, [$d337]
+	ld a, [wd336]
+	ld [wd4cf], a
+	ld a, [wd337]
 	ld b, a
-	ld a, [$d334]
+	ld a, [wd334]
 	add b
 	farcall Func_12ab5
 	pop bc
@@ -763,11 +763,11 @@ Func_c619: ; c619 (3:4619)
 	ld [wPlayerXCoord], a
 	ld a, c
 	ld [wPlayerYCoord], a
-	ld a, [$d335]
+	ld a, [wd335]
 	or $1
-	ld [$d335], a
+	ld [wd335], a
 	ld a, $10
-	ld [$d338], a
+	ld [wd338], a
 	ld c, $f
 	call Func_3dbf
 	set 2, [hl]
@@ -781,7 +781,7 @@ Func_c619: ; c619 (3:4619)
 	ret
 
 Func_c653: ; c653 (3:4653)
-	ld a, [$d334]
+	ld a, [wd334]
 	rlca
 	ld c, a
 	ld b, $0
@@ -805,12 +805,12 @@ Func_c66c: ; c66c (3:466c)
 	ldh a, [hButtonsHeld]
 	bit B_BUTTON_F, a
 	jr z, .asm_c67e
-	ld a, [$d338]
+	ld a, [wd338]
 	cp $2
 	jr c, .asm_c67e
 	inc c
 .asm_c67e
-	ld a, [$d334]
+	ld a, [wd334]
 	call Func_c694
 	pop bc
 	pop hl
@@ -838,14 +838,14 @@ Func_c694: ; c694 (3:4694)
 	or a
 	call nz, Func_c6d4
 	pop hl
-	ld a, [$d338]
+	ld a, [wd338]
 	dec a
-	ld [$d338], a
+	ld [wd338], a
 	jr z, .asm_c6b8
 	dec c
 	jr nz, .asm_c6a0
 .asm_c6b8
-	ld a, [$d338]
+	ld a, [wd338]
 	or a
 	jr nz, .asm_c6c3
 	ld hl, $d335
@@ -881,15 +881,15 @@ Func_c6dc: ; c6dc (3:46dc)
 	call Func_c6f7
 	call Func_3997
 	call Func_c70d
-	ld a, [$d0bf]
+	ld a, [wd0bf]
 	cp $1
 	call z, Func_c9c0
 	pop hl
 	ret
 
 Func_c6f7: ; c6f7 (3:46f7)
-	ld a, [$d336]
-	ld [$d4cf], a
+	ld a, [wd336]
+	ld [wd4cf], a
 	ld c, $f
 	call Func_3dbf
 	res 2, [hl]
@@ -913,15 +913,15 @@ Func_c70d: ; c70d (3:470d)
 
 Func_c71e: ; c71e (3:471e)
 	ld a, $ff
-	ld [$d3b6], a
+	ld [wd3b6], a
 	call Func_c653
 	call Func_3927
 	and $40
 	jr z, .asm_c73d
 	farcall Func_1c72e
 	jr c, .asm_c73d
-	ld a, [$d3aa]
-	ld [$d3b6], a
+	ld a, [wd3aa]
+	ld [wd3b6], a
 	ld a, $2
 	jr .asm_c748
 .asm_c73d
@@ -933,7 +933,7 @@ Func_c71e: ; c71e (3:471e)
 	or a
 	ret
 .asm_c748
-	ld [$d0bf], a
+	ld [wd0bf], a
 	scf
 	ret
 
@@ -961,14 +961,14 @@ MainMenu_c75a: ; c75a (3:475a)
 	call MenuCursorAcceptInput
 	jr nc, .asm_c76a
 	ld a, e
-	ld [$d0b8], a
+	ld [wd0b8], a
 	ldh a, [hCurrentMenuItem]
 	cp e
 	jr nz, .asm_c793
 	cp $5
 	jr z, .asm_c793
 	call Func_c2a3
-	ld a, [$d0b8]
+	ld a, [wd0b8]
 	ld hl, PointerTable_c7a2
 	call JumpToFunctionInTable
 	ld hl, Func_c797
@@ -979,7 +979,7 @@ MainMenu_c75a: ; c75a (3:475a)
 	ret
 
 Func_c797: ; c797 (3:4797)
-	ld a, [$d0b8]
+	ld a, [wd0b8]
 	ld hl, Unknown_cd98
 	farcall Func_111e9
 	ret
@@ -1045,14 +1045,14 @@ PC_c7ea: ; c7ea (3:47ea)
 	call MenuCursorAcceptInput
 	jr nc, .asm_c806
 	ld a, e
-	ld [$d0b9], a
+	ld [wd0b9], a
 	ldh a, [hCurrentMenuItem]
 	cp e
 	jr nz, .asm_c82f
 	cp $4
 	jr z, .asm_c82f
 	call Func_c2a3
-	ld a, [$d0b9]
+	ld a, [wd0b9]
 	ld hl, $4846
 	call JumpToFunctionInTable
 	ld hl, $484e
@@ -1065,7 +1065,7 @@ PC_c7ea: ; c7ea (3:47ea)
 	call $4891
 	call Func_c111
 	xor a
-	ld [$d112], a
+	ld [wd112], a
 	call Func_39fc
 	ret
 ; 0xc846
@@ -1079,7 +1079,7 @@ Func_c935: ; c935 (3:4935)
 	inc hl
 	ld [hl], b
 	ld a, $3
-	ld [$d0bf], a
+	ld [wd0bf], a
 	pop hl
 	ret
 
@@ -1092,28 +1092,28 @@ Func_c943: ; c943 (3:4943)
 	jr nc, .asm_c98f
 .asm_c94d
 	ld a, l
-	ld [$d4c4], a
+	ld [wd4c4], a
 	ld a, h
-	ld [$d4c5], a
+	ld [wd4c5], a
 	ld a, $4
-	ld [$d4c6], a
+	ld [wd4c6], a
 	ld de, $d3ab
 	ld bc, $0006
 	call Func_3bf5
-	ld a, [$d3ab]
+	ld a, [wd3ab]
 	or a
 	jr z, .asm_c98f
 	push hl
-	ld a, [$d3af]
+	ld a, [wd3af]
 	ld l, a
-	ld a, [$d3b0]
+	ld a, [wd3b0]
 	ld h, a
 	or l
 	jr z, .asm_c97a
 	call Func_3c45
 	jr nc, .asm_c988
 .asm_c97a
-	ld a, [$d3ab]
+	ld a, [wd3ab]
 	farcall Func_11857
 	call Func_c998
 	farcall Func_1c485
@@ -1131,22 +1131,22 @@ Func_c943: ; c943 (3:4943)
 	ret
 
 Func_c998: ; c998 (3:4998)
-	ld a, [$d3ab]
+	ld a, [wd3ab]
 	cp $22
 	ret nz
-	ld a, [$d3d0]
+	ld a, [wd3d0]
 	or a
 	ret z
 	ld b, $4
-	ld a, [$cab4]
+	ld a, [wConsole]
 	cp $2
 	jr nz, .asm_c9ae
 	ld b, $e
 .asm_c9ae
 	ld a, b
-	ld [$d3b1], a
+	ld [wd3b1], a
 	ld a, $0
-	ld [$d3b2], a
+	ld [wd3b2], a
 	ret
 
 Func_c9b8: ; c9b8 (3:49b8)
@@ -1187,7 +1187,7 @@ Func_c9cb: ; c9cb (3:49cb)
 
 Func_c9dd: ; c9dd (3:49dd)
 	xor a
-	ld [$d411], a
+	ld [wd411], a
 	call Func_c9e8
 	call Func_ca0e
 	ret
@@ -1205,7 +1205,7 @@ Func_c9e8: ; c9e8 (3:49e8)
 	ld b, $0
 	ld hl, Unknown_ca0a
 	add hl, bc
-	ld a, [$d0bb]
+	ld a, [wd0bb]
 	cp [hl]
 	jr z, .asm_c9f2
 .asm_ca04
@@ -1218,7 +1218,7 @@ Unknown_ca0a: ; ca0a (3:4a04)
 INCBIN "baserom.gbc",$ca0a,$ca0e - $ca0a
 
 Func_ca0e: ; ca0e (3:4a0e)
-	ld a, [$d32e]
+	ld a, [wd32e]
 	cp $b
 	jr z, .asm_ca68
 	call Func_ca69
@@ -1279,7 +1279,7 @@ Func_ca6c: ; ca6c (3:4a6c)
 	push bc
 	call Func_cb1d
 	ld c, [hl]
-	ld a, [$d3d1]
+	ld a, [wd3d1]
 .asm_ca75
 	bit 0, a
 	jr nz, .asm_ca7f
@@ -1301,7 +1301,7 @@ Func_ca8f: ; ca8f (3:4a8f)
 	push hl
 	push bc
 	call Func_cb1d
-	ld a, [$d3d1]
+	ld a, [wd3d1]
 .asm_ca9a
 	bit 0, a
 	jr nz, .asm_caa4
@@ -1309,10 +1309,10 @@ Func_ca8f: ; ca8f (3:4a8f)
 	sla c
 	jr .asm_ca9a
 .asm_caa4
-	ld a, [$d3d1]
+	ld a, [wd3d1]
 	and c
 	ld c, a
-	ld a, [$d3d1]
+	ld a, [wd3d1]
 	cpl
 	and [hl]
 	or c
@@ -1351,7 +1351,7 @@ Func_cb1d: ; cb1d (3:4b1d)
 	ld a, [hli]
 	ld c, a
 	ld a, [hl]
-	ld [$d3d1], a
+	ld [wd3d1], a
 	ld b, $0
 	ld hl, $d3d2
 	add hl, bc
@@ -1364,14 +1364,14 @@ INCBIN "baserom.gbc",$cb37,$cc42 - $cb37
 RST20: ; cc42 (3:4c42)
 	pop hl
 	ld a, l
-	ld [$d413], a
+	ld [wd413], a
 	ld a, h
-	ld [$d414], a
+	ld [wd414], a
 	xor a
-	ld [$d412], a
+	ld [wd412], a
 .asm_cc4f
 	call Func_3aed
-	ld a, [$d412]
+	ld a, [wd412]
 	or a
 	jr z, .asm_cc4f
 	ld hl, $d413
@@ -1404,7 +1404,7 @@ DeckMachine_d336: ; d336 (3:5336)
 	or a
 	jr z, .asm_d360
 	dec a
-	ld [$d0a9], a
+	ld [wd0a9], a
 	farcallx $2, $7a04
 	jr .asm_d364
 .asm_d360
@@ -1418,7 +1418,7 @@ DeckMachine_d336: ; d336 (3:5336)
 INCBIN "baserom.gbc",$d36d,$fc2b - $d36d
 
 Func_fc2b: ; fc2b (3:7c2b)
-	ld a, [$d0c3]
+	ld a, [wd0c3]
 	cp $2
 	jr c, .asm_fc34
 	ld a, $2
@@ -1432,9 +1432,9 @@ Func_fc2b: ; fc2b (3:7c2b)
 	inc hl
 	ld b, [hl]
 	ld a, $b0
-	ld [$d0c8], a
+	ld [wd0c8], a
 	ld a, $3
-	ld [$d0c9], a
+	ld [wd0c9], a
 	jp Func_c935
 
 PointerTable_fc4c: ; fc4c (3:7c4c)
diff --git a/src/engine/bank4.asm b/src/engine/bank4.asm
index 6dfb9ac..36aa471 100755
--- a/src/engine/bank4.asm
+++ b/src/engine/bank4.asm
@@ -9,8 +9,8 @@ INCBIN "baserom.gbc",$100a2,$1029e - $100a2
 Medal_1029e: ; 1029e (4:429e)
 	sub $8
 	ld c, a
-	ld [$d115], a
-	ld a, [$d291]
+	ld [wd115], a
+	ld a, [wd291]
 	push af
 	push bc
 	call Func_379b
@@ -20,7 +20,7 @@ Medal_1029e: ; 1029e (4:429e)
 	call DisableLCD
 	call $4000
 	ld a, $fa
-	ld [$d114], a
+	ld [wd114], a
 	call $410c
 	pop bc
 	ld a, c
@@ -30,23 +30,23 @@ Medal_1029e: ; 1029e (4:429e)
 	ld hl, Unknown_1030b
 	add hl, bc
 	ld a, [hli]
-	ld [$ce3f], a
+	ld [wce3f], a
 	ld a, [hl]
-	ld [$ce40], a
+	ld [wce40], a
 	call $4031
 	ld a, MUSIC_MEDAL
 	call PlaySong
 	ld a, $ff
-	ld [$d116], a
+	ld [wd116], a
 .asm_102e2
 	call DoFrameIfLCDEnabled
-	ld a, [$d116]
+	ld a, [wd116]
 	inc a
-	ld [$d116], a
+	ld [wd116], a
 	and $f
 	jr nz, .asm_102e2
 	call $4197
-	ld a, [$d116]
+	ld a, [wd116]
 	cp $e0
 	jr nz, .asm_102e2
 	text_hl WonTheMedalText
@@ -54,7 +54,7 @@ Medal_1029e: ; 1029e (4:429e)
 	call Func_3c96
 	call Func_37a0
 	pop af
-	ld [$d291], a
+	ld [wd291], a
 	ret
 
 Unknown_1030b: ; 1030b (4:430b)
@@ -62,7 +62,7 @@ INCBIN "baserom.gbc",$1030b,$1031b - $1030b
 
 BoosterPack_1031b: ; 1031b (4:431b)
 	ld c, a
-	ld a, [$d291]
+	ld a, [wd291]
 	push af
 	push bc
 	call DisableLCD
@@ -87,13 +87,13 @@ BoosterPack_1031b: ; 1031b (4:431b)
 	call $70ca
 	pop hl
 	ld a, [hli]
-	ld [$ce43], a
+	ld [wce43], a
 	xor a
-	ld [$ce44], a
+	ld [wce44], a
 	ld a, [hli]
-	ld [$ce3f], a
+	ld [wce3f], a
 	ld a, [hl]
-	ld [$ce40], a
+	ld [wce40], a
 	call $4031
 	call Func_379b
 	ld a, MUSIC_BOOSTERPACK
@@ -102,7 +102,7 @@ BoosterPack_1031b: ; 1031b (4:431b)
 	ld a, c
 	farcall GenerateBoosterPack
 	text_hl ReceivedBoosterPackText
-	ld a, [$d117]
+	ld a, [wd117]
 	cp $1
 	jr nz, .asm_10373
 	text_hl AndAnotherBoosterPackText
@@ -116,14 +116,14 @@ BoosterPack_1031b: ; 1031b (4:431b)
 	call Func_1288c
 	call Func_099c
 	ld a, $1
-	ld [$cac0], a
+	ld [wVBlankOAMCopyToggle], a
 	ld a, $4
 	ld [wFrameType], a
 	farcallx $1, $7599
 	farcall Func_c1a4
 	call DoFrameIfLCDEnabled
 	pop af
-	ld [$d291], a
+	ld [wd291], a
 	ret
 ; 0x103a5
 
@@ -133,7 +133,7 @@ Func_103d2: ; 103d2 (4:43d2)
 INCBIN "baserom.gbc",$103d2,$103d3 - $103d2
 
 Duel_Init: ; 103d3 (4:43d3)
-	ld a, [$d291]
+	ld a, [wd291]
 	push af
 	call DisableLCD
 	call $4000
@@ -142,7 +142,7 @@ Duel_Init: ; 103d3 (4:43d3)
 	ld de, $000c
 	ld bc, $1406
 	call DrawRegularTextBox
-	ld a, [$cc19]
+	ld a, [wcc19]
 	add a
 	add a
 	ld c, a
@@ -150,22 +150,22 @@ Duel_Init: ; 103d3 (4:43d3)
 	ld hl, $445b
 	add hl, bc
 	ld a, [hli]
-	ld [$ce3f], a
+	ld [wce3f], a
 	ld a, [hli]
-	ld [$ce40], a
+	ld [wce40], a
 	push hl
-	ld a, [$cc16]
-	ld [$ce41], a
-	ld a, [$cc17]
-	ld [$ce42], a
+	ld a, [wcc16]
+	ld [wce41], a
+	ld a, [wcc17]
+	ld [wce42], a
 	ld hl, $4451
 	call $51b3 ; LoadDuelistName
 	pop hl
 	ld a, [hli]
-	ld [$ce3f], a
+	ld [wce3f], a
 	ld c, a
 	ld a, [hli]
-	ld [$ce40], a
+	ld [wce40], a
 	or c
 	jr z, .asm_10425
 	ld hl, $4456
@@ -173,7 +173,7 @@ Duel_Init: ; 103d3 (4:43d3)
 
 .asm_10425
 	ld bc, $0703
-	ld a, [$cc15]
+	ld a, [wcc15]
 	call Func_3e2a ; LoadDuelistPortrait
 	ld a, [wMatchStartTheme]
 	call PlaySong
@@ -186,7 +186,7 @@ Duel_Init: ; 103d3 (4:43d3)
 	call Func_3c96
 	call Func_10ab4 ; fade out
 	pop af
-	ld [$d291], a
+	ld [wd291], a
 	ret
 ; 0x10451
 
@@ -211,9 +211,9 @@ Func_10e28: ; 10e28 (4:4e28)
 INCBIN "baserom.gbc",$10e28,$10e55 - $10e28
 
 Func_10e55: ; 10e55 (4:4e55)
-	ld a, [$d336]
-	ld [$d4cf], a
-	ld a, [$d33e]
+	ld a, [wd336]
+	ld [wd4cf], a
+	ld a, [wd33e]
 	or a
 	jr nz, .asm_10e65
 	call Func_10e71
@@ -232,7 +232,7 @@ Func_10e71: ; 10e71 (4:4e71)
 	and D_PAD
 	jr z, .asm_10e83
 	farcall Func_c5d5
-	ld [$d334], a
+	ld [wd334], a
 	call Func_10e97
 	jr .asm_10e96
 .asm_10e83
@@ -250,11 +250,11 @@ Func_10e71: ; 10e71 (4:4e71)
 Func_10e97: ; 10e97 (4:4e97)
 	push hl
 	pop hl
-	ld a, [$d32e]
+	ld a, [wd32e]
 	rlca
 	rlca
 	ld c, a
-	ld a, [$d334]
+	ld a, [wd334]
 	add c
 	ld c, a
 	ld b, $0
@@ -263,7 +263,7 @@ Func_10e97: ; 10e97 (4:4e97)
 	ld a, [hl]
 	or a
 	jr z, .asm_10eb9
-	ld [$d32e], a
+	ld [wd32e], a
 	call Func_10f2e
 	ld a, $1
 	call Func_3796
@@ -319,7 +319,7 @@ Func_10f2e: ; 10f2e (4:4f2e)
 
 Func_10f4a: ; 10f4a (4:4f4a)
 	push bc
-	ld a, [$d32e]
+	ld a, [wd32e]
 	cp $2
 	jr nz, .asm_10f5f
 	ld c, a
@@ -336,7 +336,7 @@ Func_10f4a: ; 10f4a (4:4f4a)
 LoadOverworldMapSelection: ; 10f61 (4:4f61)
 	push hl
 	push bc
-	ld a, [$d32e]
+	ld a, [wd32e]
 	rlca
 	rlca
 	ld c, a
@@ -344,13 +344,13 @@ LoadOverworldMapSelection: ; 10f61 (4:4f61)
 	ld hl, OverworldMapIndexes
 	add hl, bc
 	ld a, [hli]
-	ld [$d0bb], a
+	ld [wd0bb], a
 	ld a, [hli]
-	ld [$d0bc], a
+	ld [wd0bc], a
 	ld a, [hli]
-	ld [$d0bd], a
+	ld [wd0bd], a
 	ld a, $0
-	ld [$d0be], a
+	ld [wd0be], a
 	ld hl, $d0b4
 	set 4, [hl]
 	pop bc
@@ -369,7 +369,7 @@ Func_10fbc: ; 10fbc (4:4fbc)
 	ld a, $10
 	ld [hl], a
 	ld b, $34
-	ld a, [$cab4]
+	ld a, [wConsole]
 	cp $2
 	jr nz, .asm_10fd8
 	ld b, $37
@@ -379,22 +379,22 @@ Func_10fbc: ; 10fbc (4:4fbc)
 	ret
 
 Func_10fde: ; 10fde (4:4fde)
-	ld a, [$d32e]
-	ld [$d33d], a
+	ld a, [wd32e]
+	ld [wd33d], a
 	xor a
-	ld [$d33e], a
+	ld [wd33e], a
 	ld a, $25
 	call Func_1299f
-	ld a, [$d4cf]
-	ld [$d33b], a
+	ld a, [wd4cf]
+	ld [wd33b], a
 	ld b, $35
-	ld a, [$cab4]
+	ld a, [wConsole]
 	cp $2
 	jr nz, .asm_10ffe
 	ld b, $38
 .asm_10ffe
 	ld a, b
-	ld [$d33c], a
+	ld [wd33c], a
 	call Func_12ab5
 	ld a, $3e
 	farcall Func_ca6c
@@ -407,9 +407,9 @@ Func_10fde: ; 10fde (4:4fde)
 	ret
 
 Func_11016: ; 11016 (4:5016)
-	ld a, [$d33b]
-	ld [$d4cf], a
-	ld a, [$d33c]
+	ld a, [wd33b]
+	ld [wd4cf], a
+	ld a, [wd33c]
 	inc a
 	call Func_12ab5
 	ret
@@ -417,13 +417,13 @@ Func_11016: ; 11016 (4:5016)
 Func_11024: ; 11024 (4:5024)
 	ld a, $57
 	call Func_3796
-	ld a, [$d336]
-	ld [$d4cf], a
+	ld a, [wd336]
+	ld [wd4cf], a
 	ld c, $f
 	call Func_3dbf
 	set 2, [hl]
 	ld hl, Unknown_1229f
-	ld a, [$d33d]
+	ld a, [wd33d]
 	dec a
 	add a
 	ld c, a
@@ -432,31 +432,31 @@ Func_11024: ; 11024 (4:5024)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld a, [$d32e]
+	ld a, [wd32e]
 	dec a
 	add a
 	ld c, a
 	ld b, $0
 	add hl, bc
 	ld a, [hli]
-	ld [$d33f], a
+	ld [wd33f], a
 	ld a, [hl]
-	ld [$d340], a
+	ld [wd340], a
 	ld a, $1
-	ld [$d33e], a
+	ld [wd33e], a
 	xor a
-	ld [$d341], a
+	ld [wd341], a
 	ret
 
 Func_11060: ; 11060 (4:5060)
-	ld a, [$d336]
-	ld [$d4cf], a
-	ld a, [$d341]
+	ld a, [wd336]
+	ld [wd4cf], a
+	ld a, [wd341]
 	or a
 	jp nz, Func_11184
-	ld a, [$d33f]
+	ld a, [wd33f]
 	ld l, a
-	ld a, [$d340]
+	ld a, [wd340]
 	ld h, a
 	ld a, [hli]
 	ld b, a
@@ -468,9 +468,9 @@ Func_11060: ; 11060 (4:5060)
 	ld a, c
 	or b
 	jr nz, .asm_11094
-	ld a, [$d33d]
+	ld a, [wd33d]
 	ld e, a
-	ld a, [$d32e]
+	ld a, [wd32e]
 	cp e
 	jr z, .asm_110a0
 	ld de, $0000
@@ -479,14 +479,14 @@ Func_11060: ; 11060 (4:5060)
 	ld c, e
 .asm_11094
 	ld a, l
-	ld [$d33f], a
+	ld [wd33f], a
 	ld a, h
-	ld [$d340], a
+	ld [wd340], a
 	call Func_110a6
 	ret
 .asm_110a0
 	ld a, $2
-	ld [$d33e], a
+	ld [wd33e], a
 	ret
 
 Func_110a6: ; 110a6 (4:50a6)
@@ -497,33 +497,33 @@ Func_110a6: ; 110a6 (4:50a6)
 	pop bc
 	ld a, b
 	sub [hl]
-	ld [$d343], a
+	ld [wd343], a
 	ld a, $0
 	sbc $0
-	ld [$d344], a
+	ld [wd344], a
 	inc hl
 	ld a, c
 	sub [hl]
-	ld [$d345], a
+	ld [wd345], a
 	ld a, $0
 	sbc $0
-	ld [$d346], a
-	ld a, [$d343]
+	ld [wd346], a
+	ld a, [wd343]
 	ld b, a
-	ld a, [$d344]
+	ld a, [wd344]
 	bit 7, a
 	jr z, .asm_110d8
-	ld a, [$d343]
+	ld a, [wd343]
 	cpl
 	inc a
 	ld b, a
 .asm_110d8
-	ld a, [$d345]
+	ld a, [wd345]
 	ld c, a
-	ld a, [$d346]
+	ld a, [wd346]
 	bit 7, a
 	jr z, .asm_110e9
-	ld a, [$d345]
+	ld a, [wd345]
 	cpl
 	inc a
 	ld c, a
@@ -537,15 +537,15 @@ Func_110a6: ; 110a6 (4:50a6)
 	call Func_1113e
 .asm_110f5
 	xor a
-	ld [$d347], a
-	ld [$d348], a
+	ld [wd347], a
+	ld [wd348], a
 	farcall Func_c5e9
 	pop hl
 	ret
 
 Func_11102: ; 11102 (4:5102)
 	ld a, b
-	ld [$d341], a
+	ld [wd341], a
 	ld e, a
 	ld d, $0
 	ld hl, $d343
@@ -562,27 +562,27 @@ Func_11102: ; 11102 (4:5102)
 	ld b, c
 	ld c, $0
 	call DivideBCbyDE
-	ld a, [$d346]
+	ld a, [wd346]
 	bit 7, a
 	jr z, .asm_11127
 	call Func_11179
 .asm_11127
 	ld a, c
-	ld [$d345], a
+	ld [wd345], a
 	ld a, b
-	ld [$d346], a
+	ld [wd346], a
 	ld hl, $d344
 	ld a, $1
 	bit 7, [hl]
 	jr z, .asm_1113a
 	ld a, $3
 .asm_1113a
-	ld [$d334], a
+	ld [wd334], a
 	ret
 
 Func_1113e: ; 1113e (4:513e)
 	ld a, c
-	ld [$d341], a
+	ld [wd341], a
 	ld e, a
 	ld d, $0
 	ld hl, $d345
@@ -598,22 +598,22 @@ Func_1113e: ; 1113e (4:513e)
 	ld [hl], a
 	ld c, $0
 	call DivideBCbyDE
-	ld a, [$d344]
+	ld a, [wd344]
 	bit 7, a
 	jr z, .asm_11162
 	call Func_11179
 .asm_11162
 	ld a, c
-	ld [$d343], a
+	ld [wd343], a
 	ld a, b
-	ld [$d344], a
+	ld [wd344], a
 	ld hl, $d346
 	ld a, $2
 	bit 7, [hl]
 	jr z, .asm_11175
 	ld a, $0
 .asm_11175
-	ld [$d334], a
+	ld [wd334], a
 	ret
 
 Func_11179: ; 11179 (4:5179)
@@ -628,29 +628,29 @@ Func_11179: ; 11179 (4:5179)
 	ret
 
 Func_11184: ; 11184 (4:5184)
-	ld a, [$d347]
+	ld a, [wd347]
 	ld d, a
-	ld a, [$d348]
+	ld a, [wd348]
 	ld e, a
 	ld c, $2
 	call Func_3dbf
-	ld a, [$d343]
+	ld a, [wd343]
 	add d
 	ld d, a
-	ld a, [$d344]
+	ld a, [wd344]
 	adc [hl]
 	ld [hl], a
 	inc hl
-	ld a, [$d345]
+	ld a, [wd345]
 	add e
 	ld e, a
-	ld a, [$d346]
+	ld a, [wd346]
 	adc [hl]
 	ld [hl], a
 	ld a, d
-	ld [$d347], a
+	ld [wd347], a
 	ld a, e
-	ld [$d348], a
+	ld [wd348], a
 	ld hl, $d341
 	dec [hl]
 	ret
@@ -688,17 +688,17 @@ INCBIN "baserom.gbc",$1229f,$126d1 - $1229f
 
 Func_126d1: ; 126d1 (4:66d1)
 	call Func_099c
-	ld hl, $cac0
+	ld hl, wVBlankOAMCopyToggle
 	inc [hl]
 	farcall Func_70018
 	ld a, $ff
-	ld [$d627], a
+	ld [wd627], a
 .asm_126e1
 	ld a, PLAYER_TURN
 	ldh [hWhoseTurn], a
 	farcall Func_c1f8
 	farcall Func_1d078
-	ld a, [$d628]
+	ld a, [wd628]
 	ld hl, PointerTable_126fc
 	call JumpToFunctionInTable
 	jr c, .asm_126e1
@@ -719,19 +719,19 @@ Func_12704: ; 12704 (4:6704)
 	farcall Func_1996e
 	call EnableExtRAM
 	ld a, [$a007]
-	ld [$d421], a
+	ld [wd421], a
 	ld a, [$a006]
-	ld [$ce47], a
+	ld [wTextSpeed], a
 	call DisableExtRAM
 	ld a, MUSIC_STOP
 	call PlaySong
 	farcall Func_70000
 	ld a, $9
-	ld [$d111], a
+	ld [wd111], a
 	call Func_39fc
 	farcall Func_1d306
 	ld a, $0
-	ld [$d0b5], a
+	ld [wd0b5], a
 	farcallx $03, Func_383d
 	or a
 	ret
@@ -748,7 +748,7 @@ Func_12741: ; 12741 (4:6741)
 	ld [$ba44], a
 	call DisableExtRAM
 	ld a, $0
-	ld [$d0b5], a
+	ld [wd0b5], a
 	farcallx $03, Func_383d
 	or a
 	ret
@@ -771,7 +771,7 @@ Func_1277e: ; 1277e (4:677e)
 	farcallx $04, Func_3a40
 	farcall Func_70000
 	ld a, $5
-	ld [$d0b5], a
+	ld [wd0b5], a
 	farcallx $03, Func_383d
 	or a
 	ret
@@ -793,7 +793,7 @@ INCBIN "baserom.gbc",$1296e,$1299f - $1296e
 
 Func_1299f: ; 1299f (4:699f)
 	push af
-	ld a, [$d5d7]
+	ld a, [wd5d7]
 	or a
 	jr z, .asm_129a8
 	pop af
@@ -803,9 +803,9 @@ Func_1299f: ; 1299f (4:699f)
 	push bc
 	push hl
 	call Func_12c05
-	ld [$d5d3], a
+	ld [wd5d3], a
 	xor a
-	ld [$d4cf], a
+	ld [wd4cf], a
 	call Func_3db7
 	ld bc, $0010
 .asm_129bb
@@ -813,9 +813,9 @@ Func_1299f: ; 1299f (4:699f)
 	or a
 	jr z, .asm_129cf
 	add hl, bc
-	ld a, [$d4cf]
+	ld a, [wd4cf]
 	inc a
-	ld [$d4cf], a
+	ld [wd4cf], a
 	cp $10
 	jr nz, .asm_129bb
 	rst $38
@@ -845,7 +845,7 @@ Func_129d9: ; 129d9 (4:69d9)
 	pop hl
 	ld bc, $0004
 	add hl, bc
-	ld a, [$d5d3]
+	ld a, [wd5d3]
 	ld [hli], a
 	ld a, $ff
 	ld [hl], a
@@ -895,12 +895,12 @@ Func_12ae2: ; 12ae2 (4:6ae2)
 	farcall Func_8020f
 	farcall Func_80229
 	pop hl
-	ld a, [$d4c6]
+	ld a, [wd4c6]
 	ld [hli], a
-	ld a, [$d4c4]
+	ld a, [wd4c4]
 	ld [hli], a
 	ld c, a
-	ld a, [$d4c5]
+	ld a, [wd4c5]
 	ld [hli], a
 	ld b, a
 	ld a, $3
@@ -922,15 +922,15 @@ Func_12b13: ; 12b13 (4:6b13)
 	ld bc, $0006
 	add hl, bc
 	ld a, [hli]
-	ld [$d4c6], a
+	ld [wd4c6], a
 	inc hl
 	inc hl
 	ld a, [hl]
-	ld [$d4c4], a
+	ld [wd4c4], a
 	add $4
 	ld [hli], a
 	ld a, [hl]
-	ld [$d4c5], a
+	ld [wd4c5], a
 	adc $0
 	ld [hl], a
 	ld de, $d23e
@@ -975,7 +975,7 @@ Func_12b13: ; 12b13 (4:6b13)
 	ret
 
 Func_12b6a: ; 12b6a (4:6b6a)
-	ld [$d4ca], a
+	ld [wd4ca], a
 	push hl
 	push bc
 	push de
@@ -983,11 +983,11 @@ Func_12b6a: ; 12b6a (4:6b6a)
 	ld bc, $0006
 	add hl, bc
 	ld a, [hli]
-	ld [$d4c6], a
+	ld [wd4c6], a
 	ld a, [hli]
-	ld [$d4c4], a
+	ld [wd4c4], a
 	ld a, [hli]
-	ld [$d4c5], a
+	ld [wd4c5], a
 	pop hl
 	call Func_3d72
 	pop de
@@ -1033,7 +1033,7 @@ Func_12c05: ; 12c05 (4:6c05)
 	push de
 	ld b, a
 	ld d, $0
-	ld a, [$d618]
+	ld a, [wd618]
 	ld c, a
 	ld hl, $d5d8
 	or a
@@ -1051,11 +1051,11 @@ Func_12c05: ; 12c05 (4:6c05)
 	dec c
 	jr nz, .asm_12c15
 .asm_12c22
-	ld a, [$d618]
+	ld a, [wd618]
 	cp $10
 	jr nc, .asm_12c48
 	inc a
-	ld [$d618], a
+	ld [wd618], a
 	inc hl
 	push hl
 	ld a, b
@@ -1092,9 +1092,9 @@ Func_12c05: ; 12c05 (4:6c05)
 Func_12c4f: ; 12c4f (4:6c4f)
 	push af
 	xor a
-	ld [$d4cb], a
+	ld [wd4cb], a
 	ld a, d
-	ld [$d4ca], a
+	ld [wd4ca], a
 	pop af
 	farcall Func_8025b
 	ret
@@ -1130,9 +1130,9 @@ Func_13485: ; 13485 (4:7485)
 	or a
 	ret z
 	ld a, [$ba56]
-	ld [$ce43], a
+	ld [wce43], a
 	ld a, [$ba57]
-	ld [$ce44], a
+	ld [wce44], a
 	call DisableExtRAM
 	call Func_379b
 	ld a, MUSIC_MEDAL
diff --git a/src/engine/bank6.asm b/src/engine/bank6.asm
index 63497e7..c66e669 100755
--- a/src/engine/bank6.asm
+++ b/src/engine/bank6.asm
@@ -50,7 +50,7 @@ Func_1996e: ; 1996e (6:596e)
 	ld [$a003], a
 	ld a, $2
 	ld [$a006], a
-	ld [$ce47], a
+	ld [wTextSpeed], a
 	xor a
 	ld [$a007], a
 	ld [$a009], a
diff --git a/src/engine/bank7.asm b/src/engine/bank7.asm
index e8d9743..f43258e 100755
--- a/src/engine/bank7.asm
+++ b/src/engine/bank7.asm
@@ -35,13 +35,13 @@ Func_1c056: ; 1c056 (7:4056)
 	inc hl
 	inc hl
 	ld a, [hli]
-	ld [$d0bb], a
+	ld [wd0bb], a
 	ld a, [hli]
-	ld [$d0bc], a
+	ld [wd0bc], a
 	ld a, [hli]
-	ld [$d0bd], a
-	ld a, [$d334]
-	ld [$d0be], a
+	ld [wd0bd], a
+	ld a, [wd334]
+	ld [wd0be], a
 .asm_1c095
 	pop de
 	pop bc
@@ -64,24 +64,24 @@ Func_1c33b: ; 1c33b (7:433b)
 	ld hl, MapSongs
 	add hl, bc
 	ld a, [hli]
-	ld [$d131], a
+	ld [wd131], a
 	ld a, [hli]
 	ld c, a
 	ld a, [hli]
-	ld [$d28f], a
+	ld [wd28f], a
 	ld a, [hli]
-	ld [$d132], a
+	ld [wd132], a
 	ld a, [hli]
-	ld [$d290], a
+	ld [wd290], a
 	ld a, [hli]
-	ld [$d111], a
-	ld a, [$cab4]
+	ld [wd111], a
+	ld a, [wConsole]
 	cp $2
 	jr nz, .asm_1c370
 	ld a, c
 	or a
 	jr z, .asm_1c370
-	ld [$d131], a
+	ld [wd131], a
 .asm_1c370
 	pop de
 	pop bc
@@ -118,7 +118,7 @@ Func_1c82e: ; 1c82e (7:482e)
 INCBIN "baserom.gbc",$1c82e,$1d078 - $1c82e
 
 Func_1d078: ; 1d078 (7:5078)
-	ld a, [$d627]
+	ld a, [wd627]
 	or a
 	jr z, .asm_1d0c7
 .asm_1d07e
@@ -128,9 +128,9 @@ Func_1d078: ; 1d078 (7:5078)
 	call $5335
 	call $53ce
 	xor a
-	ld [$d635], a
+	ld [wd635], a
 	ld a, $3c
-	ld [$d626], a
+	ld [wd626], a
 .asm_1d095
 	call DoFrameIfLCDEnabled
 	call UpdateRNGSources
@@ -160,20 +160,20 @@ Func_1d078: ; 1d078 (7:5078)
 .asm_1d0c7
 	call $50fa
 	call $511c
-	ld a, [$d628]
+	ld a, [wd628]
 	cp $2
 	jr nz, .asm_1d0db
 	call $5289
 	jr c, Func_1d078
 	jr .asm_1d0e7
 .asm_1d0db
-	ld a, [$d628]
+	ld a, [wd628]
 	cp $1
 	jr nz, .asm_1d0e7
 	call $52b8
 	jr c, Func_1d078
 .asm_1d0e7
-	ld a, [$d628]
+	ld a, [wd628]
 	cp $0
 	jr nz, .asm_1d0f3
 	call $52dd
@@ -195,15 +195,15 @@ Func_1d11c: ; 1d11c (7:511c)
 	call Func_2275
 	call Func_3ca0
 	xor a
-	ld [$cd08], a
+	ld [wcd08], a
 	call $51e1
 	call $517f
 	ld a, $ff
-	ld [$d626], a
-	ld a, [$d627]
+	ld [wd626], a
+	ld a, [wd627]
 	cp $4
 	jr c, .asm_1d14f
-	ld a, [$d624]
+	ld a, [wd624]
 	or a
 	jr z, .asm_1d14f
 	ld a, $1
@@ -222,15 +222,15 @@ Func_1d11c: ; 1d11c (7:511c)
 	ldh a, [hCurrentMenuItem]
 	cp e
 	jr nz, .asm_1d15a
-	ld [$d627], a
-	ld a, [$d624]
+	ld [wd627], a
+	ld a, [wd624]
 	or a
 	jr nz, .asm_1d17a
 	inc e
 	inc e
 .asm_1d17a
 	ld a, e
-	ld [$d628], a
+	ld [wd628], a
 	ret
 ; 0x1d17f
 
@@ -281,7 +281,7 @@ Credits_1d6ad: ; 1d6ad (7:56ad)
 	call $5705
 	call $4858
 	xor a
-	ld [$d324], a
+	ld [wd324], a
 	ld a, MUSIC_CREDITS
 	call PlaySong
 	farcallx $4, $4031
@@ -290,7 +290,7 @@ Credits_1d6ad: ; 1d6ad (7:56ad)
 	call DoFrameIfLCDEnabled
 	call $5765
 	call $580b
-	ld a, [$d633]
+	ld a, [wd633]
 	cp $ff
 	jr nz, .asm_1d6c8
 	call Func_3c96
@@ -305,7 +305,7 @@ Credits_1d6ad: ; 1d6ad (7:56ad)
 	call EnableLCD
 	call DoFrameIfLCDEnabled
 	call DisableLCD
-	ld hl, $cabb
+	ld hl, wLCDC
 	set 1, [hl]
 	call ResetDoFrameFunction
 	ret
diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm
index a749bd8..d3d4eb1 100644
--- a/src/engine/effect_functions.asm
+++ b/src/engine/effect_functions.asm
@@ -34,7 +34,7 @@ SleepEffect: ; 2c030 (b:4030)
 
 applyEffect
 	ldh a, [hWhoseTurn]
-	ld hl, $cc05
+	ld hl, wcc05
 	cp [hl]
 	jr nz, .canInduceStatus
 	ld a, [wTempNonTurnDuelistCardId]
@@ -64,7 +64,7 @@ applyEffect
 	push hl
 	ld e, [hl]
 	ld d, $0
-	ld hl, $ccce
+	ld hl, wccce
 	add hl, de
 	call SwapTurn
 	ldh a, [hWhoseTurn]
diff --git a/src/engine/home.asm b/src/engine/home.asm
index e35bc18..5d1938b 100755
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -2586,7 +2586,7 @@ CopyMoveDataAndDamageToBuffer: ; 16c0 (0:16c0)
 	ld a, d
 	ld [$ff9f], a
 	call LoadDeckCardToBuffer1
-	ld a, [$cc2b]
+	ld a, [wCardBuffer1ID]
 	ld [wTempCardId], a
 	ld hl, wCardBuffer1Move1
 	dec e