Merge pull request #30 from Engezerstorung/master

Fix healing machine pokeballs in Indigo plateau lobby and slots machines

Author: dannye

color/color.asm

@@ -453,7 +453,10 @@ SetPal_Slots:
 
 	xor a
 	ldh [rSVBK], a
-	ret
+	
+	; Wait 3 frames to allow tilemap updates to apply. Prevents garbage
+	; Prevents garbage from appearing when the slots machine open.
+	jp Delay3
 
 ; Titlescreen with cycling pokemon
 SetPal_TitleScreen:

color/sprites.asm

@@ -38,6 +38,9 @@ LoadOverworldSpritePalettes:
 	ld hl, SpritePalettesPokecenter
 	cp POKECENTER
 	jr z, .gotPaletteList
+	ld a, [wCurMap]
+	cp INDIGO_PLATEAU_LOBBY
+	jr z, .gotPaletteList
 	; If not, load the normal Object Pals
 	ld hl, SpritePalettes
 .gotPaletteList