From 20444bb9e9790155566404b0b56ab641171d754c Mon Sep 17 00:00:00 2001
From: Martha Schilling <harleyrayquaza@gmail.com>
Date: Thu, 21 Dec 2023 17:06:55 +0000
Subject: [PATCH] Small palette changes

- Fixes a bug where the player's house would have the wrong palette after returning there after beating the Champion

- Gave Jabetta's line the dark purple/peach palette since I just thought it looked better
---
 data/pokemon/palettes.asm | 4 ++--
 engine/gfx/palettes.asm   | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm
index c5e0be6b..773cdaeb 100644
--- a/data/pokemon/palettes.asm
+++ b/data/pokemon/palettes.asm
@@ -106,8 +106,8 @@ MonsterPalettes:
 	db PAL_YELLOWMON ; ABRA
 	db PAL_YELLOWMON ; KADABRA
 	db PAL_YELLOWMON ; ALAKAZAM
-	db PAL_PURPLEMON ; CHEEP
-	db PAL_PURPLEMON ; JABETTA
+	db PAL_MEWMON    ; CHEEP
+	db PAL_MEWMON    ; JABETTA
 	db PAL_PINKMON   ; LICKITUNG
 	db PAL_PINKMON   ; LICKILICKY
 	db PAL_REDMON    ; GROWLITHE
diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm
index 52761814..f103fe39 100644
--- a/engine/gfx/palettes.asm
+++ b/engine/gfx/palettes.asm
@@ -207,6 +207,10 @@ SetPal_Overworld:
 	jp z, .ferry
 	cp SILPH_GAUNTLET_5F
 	jp z, .trans
+	cp REDS_HOUSE_1F
+	jp z, .pallet
+	cp REDS_HOUSE_2F
+	jp z, .pallet
 	cp CERULEAN_CAVE_2F
 	jp c, .normalDungeonOrBuilding
 	cp LORELEIS_ROOM
@@ -291,6 +295,9 @@ SetPal_Overworld:
 .citrine
 	ld a, PAL_CITRINE - 1
 	jr .town
+.pallet
+	ld a, PAL_PALLET - 1
+	jr .town
 .ferry
 	ld a, PAL_BLUEMON - 1
 	jr .town