mini update

- Tiles now animate correctly while still being sped up (credit to jojobear13!)

- Fixed issues with certain cave maps being glitched after importing the new tileset for Seafoam

- Gave Celeste Hill Cave the same palette as the exterior areas

- Fixed an inconsistency in Koga's pre-fight script

engine/gfx/palettes.asm

@@ -161,8 +161,6 @@ SetPal_Overworld:
 	jr z, .pachinko
 	cp GAME_CORNER_PRIZE_ROOM
 	jr z, .pachinko
-	cp SILPH_GAUNTLET_1F
-	jr z, .faraway
 	cp CELESTE_HILL_OUTSIDE
 	jr z, .celeste
 	cp CELESTE_HILL
@@ -212,6 +210,8 @@ SetPal_Overworld:
 	jr z, .garnet
 	cp ROCK_TUNNEL_B1F + 1
 	jr c, .caveDefault
+	cp CELESTE_HILL_CAVE
+	jr z, .celeste
 .caveDefault
 	ld a, PAL_CAVE - 1
 	jr .town
@@ -230,9 +230,6 @@ SetPal_Overworld:
 .celeste
 	ld a, PAL_CELESTE - 1
 	jr .town
-.faraway
-	ld a, PAL_ROUTE - 1
-	jr .town
 .seafoam
 	ld a, PAL_CYANMON - 1
 	jr .town
@@ -249,6 +246,30 @@ SetPal_Overworld:
 	ld a, PAL_FUCHSIA - 1
 	jr .town
 
+; these can't be added without a more efficient solution
+;	cp ROCKET_HIDEOUT_B1F
+;	jr z, .pachinko
+;	cp ROCKET_HIDEOUT_B2F
+;	jr z, .pachinko
+;	cp ROCKET_HIDEOUT_B3F
+;	jr z, .pachinko
+;	cp ROCKET_HIDEOUT_B4F
+;	jr z, .pachinko
+;	cp ROCKET_HIDEOUT_ELEVATOR
+;	jr z, .pachinko
+;	cp FARAWAY_ISLAND_OUTSIDE
+;	jr z, .faraway
+;	cp FARAWAY_ISLAND_INSIDE
+;	jr z, .faraway
+;	cp SILPH_GAUNTLET_1F
+;	jr z, .faraway
+;.pachinko
+;	ld a, PAL_CASINO - 1
+;	jr .town
+;.faraway
+;	ld a, PAL_ROUTE - 1
+;	jr .town
+
 ; used when a Pokemon is the only thing on the screen
 ; such as evolution, trading and the Hall of Fame
 SetPal_PokemonWholeScreen:

engine/overworld/spinners.asm

@@ -20,7 +20,7 @@ LoadSpinnerArrowTiles::
 	ld de, 6 * 4
 	add hl, de
 .alternateGraphics
-	ld a, 1
+	ld a, $4
 	ld bc, $0
 .loop
 	push af
@@ -38,7 +38,8 @@ LoadSpinnerArrowTiles::
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	call CopyVideoData
+	;call CopyVideoData
+	call CopySpinnerTiles
 	pop bc
 	ld a, $6
 	add c
@@ -47,6 +48,54 @@ LoadSpinnerArrowTiles::
 	pop af
 	dec a
 	jr nz, .loop
+	call DelayFrame ;Delay a frame because CopySpinnerTiles does not do this like CopyVideoData
+	ret
+
+CopySpinnerTiles:
+	di	;prevent vblank functions from running
+	
+	;back up destination address
+	ld b, h
+	ld c, l
+	;back up stack pointer
+	ld hl, sp + 0
+	ld a, h
+	ld [hstemp], a
+	ld a, l
+	ld [hstemp + 1], a
+	;set stack pointer to source address
+	ld h, d
+	ld l, e
+	ld sp, hl
+	;restore destination address
+	ld h, b
+	ld l, c
+	
+	;Stack Pointer = tile source address
+	;HL = tile destination address
+
+	ld c, 8
+.loop
+	pop de
+.waitVRAM
+	ldh a, [rSTAT]		;read from stat register to get the mode
+	and %10				
+	jr nz, .waitVRAM	
+	ld [hl], e
+	inc l
+	ld [hl], d
+	inc l
+	dec c
+	jr nz, .loop
+
+	;restore stack spointer
+	ld a, [hstemp]
+	ld h, a
+	ld a, [hstemp + 1]
+	ld l, a
+	ld sp, hl
+	
+	ei	;re-enable vblank functions
 	ret
 
 INCLUDE "data/tilesets/spinner_tiles.asm"