Merge 2d0ed11 and 355acfc from Roukaour/master

2018-01-01 20:25:07 +01:00
parent 37369d1ae0 355acfcaeb
commit a98ed77c83
9 changed files with 61 additions and 61 deletions
--- a/home/palettes.asm
+++ b/home/palettes.asm
@@ -30,7 +30,7 @@ ForceUpdateCGBPals:: ; c37
 	ld hl, wBGPals2

 ; copy 8 pals to bgpd
-	ld a, %10000000 ; auto increment, index 0
+	ld a, 1 << rBGPI_AUTO_INCREMENT
 	ld [rBGPI], a
 	ld c, LOW(rBGPD)
 	ld b, 8 / 2
@@ -46,7 +46,7 @@ endr
 ; hl is now wOBPals2

 ; copy 8 pals to obpd
-	ld a, %10000000 ; auto increment, index 0
+	ld a, 1 << rOBPI_AUTO_INCREMENT
 	ld [rOBPI], a
 	ld c, LOW(rOBPD)
 	ld b, 8 / 2