Use more updated hardware constants

Author: dannye

color/animations.asm

@@ -13,7 +13,7 @@ SpriteifyPlayerPokemon:
 	call CopyVideoData
 
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ld hl, W2_BgPaletteData
 	ld de, W2_SprPaletteData
 	ld bc, 8
@@ -23,5 +23,5 @@ SpriteifyPlayerPokemon:
 	ld [W2_LastOBP0], a
 
 	xor a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ret

color/cable_club.asm

@@ -20,7 +20,7 @@ CableClub_DoBattleOrTrade_ColorHook:
 
 LoadCableClubTextPaletteAndMap:
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	call LoadCableClubTextPalette
 
@@ -36,7 +36,7 @@ LoadCableClubTextPaletteAndMap:
 	ld [W2_StaticPaletteMapChanged], a
 
 	xor a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ret
 
 LoadCableClubTextPalette:

color/color.asm

@@ -4,7 +4,7 @@ SECTION "bank1C_extension", ROMX
 ; Set all palettes to black at beginning of battle
 SetPal_BattleBlack:
 	ld a, $02
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	ld d, PAL_BLACK
 	ld e, 7
@@ -25,7 +25,7 @@ SetPal_BattleBlack:
 	ld [W2_ForceOBPUpdate], a
 
 	xor a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ret
 
 
@@ -47,11 +47,11 @@ SetPal_BattleAfterBlack:
 	; Update palettes (AFTER frame delay, so the tilemap is updated after player/enemy
 	; scroll in)
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ld a, 1
 	ld [W2_ForceBGPUpdate], a
 	ld [W2_ForceOBPUpdate], a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ret
 
 ; Set proper palettes for pokemon/trainers. Called a lot during battle, like when the
@@ -61,11 +61,11 @@ SetPal_Battle:
 
 	; Update palettes (BEFORE frame delay, so lifebars get updated snappily)
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ld a, 1
 	ld [W2_ForceBGPUpdate], a
 	ld [W2_ForceOBPUpdate], a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	; Wait 3 frames (if LCD is on) to allow tilemap updates to apply. Prevents garbage
 	; from appearing after closing pokemon menu.
@@ -84,11 +84,11 @@ SetPal_Battle_Common:
 
 	; If transformed, don't trust the "DetermineBackSpritePaletteID" function.
 	ld a, $02
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ld a, [W2_BattleMonPalette]
 	ld b, a
 	xor a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	jr .getEnemyMonPal
 
 .getBattleMonPal
@@ -102,7 +102,7 @@ SetPal_Battle_Common:
 	ld c, a
 
 	ld a, $02
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	; Save the player mon's palette in case it transforms later
 	ld a, b
@@ -206,7 +206,7 @@ ENDC
 	ld [W2_StaticPaletteMapChanged], a
 
 	xor a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	ld a, SET_PAL_BATTLE
 	ld [wDefaultPaletteCommand], a
@@ -240,7 +240,7 @@ FillBox:
 ; Load town map
 SetPal_TownMap:
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	ld d, PAL_TOWNMAP
 	ld e, 0
@@ -263,7 +263,7 @@ SetPal_TownMap:
 	ld [hl], 1
 
 	xor a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ret
 
 ; Status screen
@@ -277,7 +277,7 @@ SetPal_StatusScreen:
 	ld b, a
 
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	push bc
 
@@ -346,7 +346,7 @@ IF GEN_2_GRAPHICS
 ENDC
 
 	xor a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ret
 
 ; Show pokedex data
@@ -357,7 +357,7 @@ SetPal_Pokedex:
 	ld e, 0
 
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	farcall LoadSGBPalette
 
@@ -402,13 +402,13 @@ ENDC
 	ld [W2_TileBasedPalettes], a
 
 	;xor a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ret
 
 ; Slots
 SetPal_Slots:
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	ld d, PAL_SLOTS1
 	ld e, 0
@@ -452,7 +452,7 @@ SetPal_Slots:
 	call FarCopyData
 
 	xor a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	
 	; Wait 3 frames to allow tilemap updates to apply.
 	; Prevents garbage from appearing when the slots machine open.
@@ -466,7 +466,7 @@ SetPal_TitleScreen:
 	ld e, 0
 
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	farcall LoadSGBPalette
 
@@ -525,7 +525,7 @@ ENDC
 	ld [W2_ForceBGPUpdate], a ; Palettes must be redrawn
 
 	;ld a, 1
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	; This fixes the text at the bottom being the wrong color for a second or so.
 	; It's a real hack, but the game's using two vram maps at once, and the color code
@@ -556,7 +556,7 @@ ENDC
 ; Called during the intro
 SetPal_NidorinoIntro:
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 IF GEN_2_GRAPHICS
 	ld d, PAL_NIDORINO
@@ -575,13 +575,13 @@ ENDC
 	ld [W2_ForceBGPUpdate], a ; Palettes must be redrawn
 
 	xor a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ret
 
 ; used mostly for menus and the Oak intro, pokedex screen
 SetPal_Generic:
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	ld d, PAL_REDBAR ; Red lifebar color (for pokeballs)
 	ld e, 0
@@ -605,13 +605,13 @@ SetPal_Generic:
 	ld [W2_ForceBGPUpdate], a
 
 	;xor a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ret
 
 ; Loading a map. Called when first loading, and when transitioning between maps.
 SetPal_Overworld:
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	dec a ; ld a, 1
 	ld [W2_TileBasedPalettes], a
 
@@ -633,7 +633,7 @@ SetPal_Overworld:
 	CALL_INDIRECT LoadOverworldSpritePalettes
 
 	xor a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	CALL_INDIRECT LoadTilesetPalette
 
@@ -646,15 +646,15 @@ SetPal_Overworld:
 .doneDelay:
 
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	; Signal to refresh palettes
 	ld a, 1
 	ld [W2_ForceBGPUpdate], a
 	ld [W2_ForceOBPUpdate], a
 
 	xor a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	ld a, SET_PAL_OVERWORLD
 	ld [wDefaultPaletteCommand], a
@@ -663,7 +663,7 @@ SetPal_Overworld:
 ; Open pokemon menu
 SetPal_PartyMenu:
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	CALL_INDIRECT LoadOverworldSpritePalettes
 
@@ -704,7 +704,7 @@ SetPal_PartyMenu:
 	ld [W2_StaticPaletteMapChanged], a
 	xor a
 	ld [W2_TileBasedPalettes], a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ret
 
 
@@ -732,7 +732,7 @@ SetPal_PokemonWholeScreen:
 .loadPalette
 	ld d, a
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	ld e, 0
 	farcall LoadSGBPalette
@@ -777,14 +777,14 @@ SetPal_PokemonWholeScreen:
 	ld [W2_StaticPaletteMapChanged], a
 
 	xor a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ret
 
 
 ; Called as the game starts up
 SetPal_GameFreakIntro:
 	ld a, $02
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	; Load "INTRO_GRAY" palette from map_palettes.asm
 	ld hl, MapPalettes + INTRO_GRAY * 4
@@ -829,13 +829,13 @@ SetPal_GameFreakIntro:
 	ld [W2_UseOBP1], a
 
 	xor a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ret
 
 ; Trainer card
 SetPal_TrainerCard:
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	ld d, PAL_MEWMON
 	ld e, 0
@@ -888,14 +888,14 @@ ENDC
 
 	ld a, 1
 	ld [W2_ForceBGPUpdate], a ; Signal to update palettes
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ret
 
 
 ; Clear colors after titlescreen
 SetPal_OakIntro:
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	ld bc, 20 * 18
 	ld hl, W2_TilesetPaletteMap
@@ -914,21 +914,21 @@ SetPal_OakIntro:
 	ld [W2_StaticPaletteMapChanged], a
 
 	xor a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ret
 
 ; Name entry
 ; Deals with sprites for the pokemon naming screen
 SetPal_NameEntry:
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	CALL_INDIRECT LoadOverworldSpritePalettes
 
 	CALL_INDIRECT ClearSpritePaletteMap
 
 	xor a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 	ret
 
 

color/draw_hud_pokeball_gfx.asm

@@ -9,7 +9,7 @@ LoadPartyPokeballGfx:
 	CALL_INDIRECT LoadOverworldSpritePalettes
 
 	ld a, 2
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	; Set the palette the pokeball sprite uses
 	ld hl, W2_SpritePaletteMap + $31
@@ -20,7 +20,7 @@ LoadPartyPokeballGfx:
 	ld [hli], a
 
 	xor a
-	ldh [rSVBK], a
+	ldh [rWBK], a
 
 	jp LoadPartyPokeballGfx_orig