tile+color macros in gfx.asm

This commit is contained in:
Rangi
2018-01-22 19:40:17 -05:00
parent f81add782a
commit a73c532738
7 changed files with 17 additions and 15 deletions

View File

@@ -337,11 +337,11 @@ ApplyHPBarPals:
ret
.Enemy:
ld de, wBGPals2 palette PAL_BATTLE_BG_ENEMY_HP + 2
ld de, wBGPals2 palette PAL_BATTLE_BG_ENEMY_HP color 1
jr .okay
.Player:
ld de, wBGPals2 palette PAL_BATTLE_BG_PLAYER_HP + 2
ld de, wBGPals2 palette PAL_BATTLE_BG_PLAYER_HP color 1
.okay
ld l, c
@@ -521,7 +521,7 @@ LoadPalette_White_Col1_Col2_Black:
ld [de], a
inc de
ld c, 2 * 2
ld c, 2 * PAL_COLOR_SIZE
.loop
ld a, [hli]
ld [de], a
@@ -1308,7 +1308,7 @@ rept 4
inc hl
endr
.morn_day
ld de, wBGPals1 palette PAL_BG_ROOF + 2
ld de, wBGPals1 palette PAL_BG_ROOF color 1
ld bc, 4
ld a, BANK(wBGPals1)
call FarCopyWRAM

View File

@@ -952,7 +952,7 @@ TileAnimationPalette: ; fc6d7
jr z, .color2
.color1
ld hl, wBGPals1 palette PAL_BG_WATER + 2
ld hl, wBGPals1 palette PAL_BG_WATER color 1
ld a, [hli]
ld [rBGPD], a
ld a, [hli]
@@ -960,7 +960,7 @@ TileAnimationPalette: ; fc6d7
jr .end
.color0
ld hl, wBGPals1 palette PAL_BG_WATER
ld hl, wBGPals1 palette PAL_BG_WATER color 0
ld a, [hli]
ld [rBGPD], a
ld a, [hli]
@@ -968,7 +968,7 @@ TileAnimationPalette: ; fc6d7
jr .end
.color2
ld hl, wBGPals1 palette PAL_BG_WATER + 4
ld hl, wBGPals1 palette PAL_BG_WATER color 2
ld a, [hli]
ld [rBGPD], a
ld a, [hli]
@@ -1009,7 +1009,7 @@ FlickeringCaveEntrancePalette: ; fc71e
jr .okay
.bit1set
ld hl, wBGPals1 palette PAL_BG_YELLOW + 2
ld hl, wBGPals1 palette PAL_BG_YELLOW color 1
.okay
ld a, [hli]