pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-12-11 05:02:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 2d0ed11 and 355acfc from Roukaour/master

Browse Source
This commit is contained in:
xCrystal
2018-01-01 20:25:07 +01:00
parent 37369d1ae0 355acfcaeb
commit a98ed77c83
9 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tilesets/animations.asm
View File

@@ -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]