Resolve #428: Use HIGH(X) and LOW(X) instead of X / $100 and X % $100 or X >> 8 and X & $ff

home/palettes.asm

@@ -24,18 +24,18 @@ ForceUpdateCGBPals:: ; c37
 
 	ld a, [rSVBK]
 	push af
-	ld a, 5 ; BANK(BGPals)
+	ld a, BANK(BGPals)
 	ld [rSVBK], a
 
-	ld hl, BGPals ; 5:d080
+	ld hl, BGPals
 
 ; copy 8 pals to bgpd
 	ld a, %10000000 ; auto increment, index 0
 	ld [rBGPI], a
-	ld c, rBGPD % $100
-	ld b, 4 ; NUM_PALS / 2
+	ld c, LOW(rBGPD)
+	ld b, 8 / 2
 .bgp
-rept 2 palettes
+rept (1 palettes) * 2
 	ld a, [hli]
 	ld [$ff00+c], a
 endr
@@ -43,15 +43,15 @@ endr
 	dec b
 	jr nz, .bgp
 
-; hl is now 5:d0c0 OBPals
+; hl is now OBPals
 
 ; copy 8 pals to obpd
 	ld a, %10000000 ; auto increment, index 0
 	ld [rOBPI], a
-	ld c, rOBPD % $100
-	ld b, 4 ; NUM_PALS / 2
+	ld c, LOW(rOBPD)
+	ld b, 8 / 2
 .obp
-rept 2 palettes
+rept (1 palettes) * 2
 	ld a, [hli]
 	ld [$ff00+c], a
 endr
@@ -90,7 +90,7 @@ DmgToCgbBGPals:: ; c9f
 	ld a, [rSVBK]
 	push af
 
-	ld a, 5 ; gfx
+	ld a, BANK(BGPals)
 	ld [rSVBK], a
 
 ; copy & reorder bg pal buffer
@@ -138,7 +138,7 @@ DmgToCgbObjPals:: ; ccb
 	ld a, [rSVBK]
 	push af
 
-	ld a, 5
+	ld a, BANK(OBPals)
 	ld [rSVBK], a
 
 ; copy & reorder obj pal buffer
@@ -178,11 +178,11 @@ DmgToCgbObjPal0:: ; cf8
 
 	ld a, [rSVBK]
 	push af
-	ld a, 5 ; gfx
+	ld a, BANK(OBPals)
 	ld [rSVBK], a
 
-	ld hl, OBPals
-	ld de, UnknOBPals
+	ld hl, OBPals palette 0
+	ld de, UnknOBPals palette 0
 	ld a, [rOBP0]
 	ld b, a
 	ld c, 1
@@ -216,11 +216,11 @@ DmgToCgbObjPal1:: ; d24
 
 	ld a, [rSVBK]
 	push af
-	ld a, 5 ; gfx
+	ld a, BANK(OBPals)
 	ld [rSVBK], a
 
-	ld hl, OBPals + 1 palettes
-	ld de, UnknOBPals + 1 palettes
+	ld hl, OBPals palette 1
+	ld de, UnknOBPals palette 1
 	ld a, [rOBP1]
 	ld b, a
 	ld c, 1
@@ -325,10 +325,10 @@ Special_ReloadSpritesNoPalettes:: ; d91
 	ret z
 	ld a, [rSVBK]
 	push af
-	ld a, 5 ; BANK(BGPals)
+	ld a, BANK(BGPals)
 	ld [rSVBK], a
 	ld hl, BGPals
-	ld bc, $40 + $10
+	ld bc, (8 palettes) + (2 palettes)
 	xor a
 	call ByteFill
 	pop af