diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2018-01-01 20:25:07 +0100 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2018-01-01 20:25:07 +0100 |
| commit | a98ed77c836b348088772dc4ec138ff53a6598d5 (patch) | |
| tree | 7a22accc9378818a7b5b3ee7f11043ce9374dc91 /tilesets/animations.asm | |
| parent | 37369d1ae0890c63b494937ed6234e68f46359c5 (diff) | |
| parent | 355acfcaeb215e794e446e056fdca59647ea1327 (diff) | |
Merge 2d0ed11 and 355acfc from Roukaour/master
Diffstat (limited to 'tilesets/animations.asm')
| -rw-r--r-- | tilesets/animations.asm | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/tilesets/animations.asm b/tilesets/animations.asm index 9234a411f..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, wBGPals1 + palette 3 + 2 + 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, wBGPals1 + palette 3 + 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, wBGPals1 + palette 3 + 4 + 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, wBGPals1 + palette 4 + ld hl, wBGPals1 palette PAL_BG_YELLOW jr .okay .bit1set - ld hl, wBGPals1 + palette 4 + 2 + ld hl, wBGPals1 palette PAL_BG_YELLOW + 2 .okay ld a, [hli] |