Merge pull request #455 from xCrystal/master

Use more palette(s) constants, rename BG/OBP wram addresses, and rBGPI+rOBPI auto-increment constants (from Rangi)

2 files changed, 29 insertions, 31 deletions

diff --git a/tilesets/animations.asm b/tilesets/animations.asm
index 5f77b0e08..d500a24b8 100644
--- a/tilesets/animations.asm
+++ b/tilesets/animations.asm
@@ -935,26 +935,24 @@ TileAnimationPalette: ; fc6d7
 	ret nz
 
 ; Ready for BGPD input...
-	ld a, %10011000 ; auto increment, index $18 (pal 3 color 0)
+
+	ld a, (1 << rBGPI_AUTO_INCREMENT) palette PAL_BG_WATER
 	ld [rBGPI], a
 
 	ld a, [rSVBK]
 	push af
-	ld a, 5 ; wra5: gfx
+	ld a, BANK(wBGPals1)
 	ld [rSVBK], a
 
 ; Update color 0 in order 0 1 2 1
-
 	ld a, l
 	and %110 ; frames 0 2 4 6
-
 	jr z, .color0
-
 	cp 4
 	jr z, .color2
 
 .color1
-	ld hl, UnknBGPals + $1a ; pal 3 color 1
+	ld hl, wBGPals1 palette PAL_BG_WATER + 2
 	ld a, [hli]
 	ld [rBGPD], a
 	ld a, [hli]
@@ -962,7 +960,7 @@ TileAnimationPalette: ; fc6d7
 	jr .end
 
 .color0
-	ld hl, UnknBGPals + $18 ; pal 3 color 0
+	ld hl, wBGPals1 palette PAL_BG_WATER
 	ld a, [hli]
 	ld [rBGPD], a
 	ld a, [hli]
@@ -970,7 +968,7 @@ TileAnimationPalette: ; fc6d7
 	jr .end
 
 .color2
-	ld hl, UnknBGPals + $1c ; pal 3 color 2
+	ld hl, wBGPals1 palette PAL_BG_WATER + 4
 	ld a, [hli]
 	ld [rBGPD], a
 	ld a, [hli]
@@ -999,19 +997,19 @@ FlickeringCaveEntrancePalette: ; fc71e
 
 	ld a, [rSVBK]
 	push af
-	ld a, 5 ; wra5: gfx
+	ld a, BANK(wBGPals1)
 	ld [rSVBK], a
 ; Ready for BGPD input...
-	ld a, %10100000 ; auto-increment, index $20 (pal 4 color 0)
+	ld a, (1 << rBGPI_AUTO_INCREMENT) palette PAL_BG_YELLOW
 	ld [rBGPI], a
 	ld a, [hVBlankCounter]
-	and %00000010
+	and 1 << 1
 	jr nz, .bit1set
-	ld hl, UnknBGPals + $20 ; pal 4 color 0
+	ld hl, wBGPals1 palette PAL_BG_YELLOW
 	jr .okay
 
 .bit1set
-	ld hl, UnknBGPals + $22 ; pal 4 color 2
+	ld hl, wBGPals1 palette PAL_BG_YELLOW + 2
 
 .okay
 	ld a, [hli]
diff --git a/tilesets/special_palettes.asm b/tilesets/special_palettes.asm
index de7d09963..761b15348 100644
--- a/tilesets/special_palettes.asm
+++ b/tilesets/special_palettes.asm
@@ -54,8 +54,8 @@ LoadSpecialMapPalette: ; 494ac
 ; 494f2
 
 LoadPokeComPalette: ; 494f2
-	ld a, BANK(UnknBGPals)
-	ld de, UnknBGPals
+	ld a, BANK(wBGPals1)
+	ld de, wBGPals1
 	ld hl, PokeComPalette
 	ld bc, 8 palettes
 	call FarCopyWRAM
@@ -67,8 +67,8 @@ INCLUDE "data/palettes/tilesets/pokecom_center.pal"
 ; 49541
 
 LoadBattleTowerPalette: ; 49541
-	ld a, BANK(UnknBGPals)
-	ld de, UnknBGPals
+	ld a, BANK(wBGPals1)
+	ld de, wBGPals1
 	ld hl, BattleTowerPalette
 	ld bc, 8 palettes
 	call FarCopyWRAM
@@ -80,8 +80,8 @@ INCLUDE "data/palettes/tilesets/battle_tower.pal"
 ; 49590
 
 LoadIcePathPalette: ; 49590
-	ld a, BANK(UnknBGPals)
-	ld de, UnknBGPals
+	ld a, BANK(wBGPals1)
+	ld de, wBGPals1
 	ld hl, IcePathPalette
 	ld bc, 8 palettes
 	call FarCopyWRAM
@@ -93,8 +93,8 @@ INCLUDE "data/palettes/tilesets/ice_path.pal"
 ; 495df
 
 LoadHousePalette: ; 495df
-	ld a, BANK(UnknBGPals)
-	ld de, UnknBGPals
+	ld a, BANK(wBGPals1)
+	ld de, wBGPals1
 	ld hl, HousePalette
 	ld bc, 8 palettes
 	call FarCopyWRAM
@@ -106,8 +106,8 @@ INCLUDE "data/palettes/tilesets/house_1.pal"
 ; 4962e
 
 LoadRadioTowerPalette: ; 4962e
-	ld a, BANK(UnknBGPals)
-	ld de, UnknBGPals
+	ld a, BANK(wBGPals1)
+	ld de, wBGPals1
 	ld hl, RadioTowerPalette
 	ld bc, 8 palettes
 	call FarCopyWRAM
@@ -169,23 +169,23 @@ MansionPalette4: ; 496bd
 ; 496c5
 
 LoadMansionPalette: ; 496c5
-	ld a, BANK(UnknBGPals)
-	ld de, UnknBGPals
+	ld a, BANK(wBGPals1)
+	ld de, wBGPals1
 	ld hl, MansionPalette1
 	ld bc, 8 palettes
 	call FarCopyWRAM
-	ld a, BANK(UnknBGPals)
-	ld de, UnknBGPals palette PAL_BG_YELLOW
+	ld a, BANK(wBGPals1)
+	ld de, wBGPals1 palette PAL_BG_YELLOW
 	ld hl, MansionPalette2
 	ld bc, 1 palettes
 	call FarCopyWRAM
-	ld a, BANK(UnknBGPals)
-	ld de, UnknBGPals palette PAL_BG_WATER
+	ld a, BANK(wBGPals1)
+	ld de, wBGPals1 palette PAL_BG_WATER
 	ld hl, MansionPalette3
 	ld bc, 1 palettes
 	call FarCopyWRAM
-	ld a, BANK(UnknBGPals)
-	ld de, UnknBGPals palette PAL_BG_ROOF
+	ld a, BANK(wBGPals1)
+	ld de, wBGPals1 palette PAL_BG_ROOF
 	ld hl, MansionPalette4
 	ld bc, 1 palettes
 	call FarCopyWRAM