From e234d77c24b0b0c40cb8a4a94d4a24aea7040305 Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Tue, 18 Apr 2023 07:33:35 +0100
Subject: [PATCH] Citrine grass encounter fix

Had to hardcode the tile to work. Yeah.
---
 data/tilesets/tileset_headers.asm | 1 -
 data/tilesets/water_tilesets.asm  | 1 +
 engine/battle/wild_encounters.asm | 7 +++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm
index 5a3ac3ac..712ae8e5 100644
--- a/data/tilesets/tileset_headers.asm
+++ b/data/tilesets/tileset_headers.asm
@@ -9,7 +9,6 @@ ENDM
 Tilesets:
 	table_width 12, Tilesets
 	; name, 3 counter tiles, grass tile, animations
-	; FIXME: Needs to have a new column for a second grass tile for Citrine to work properly. Missing tile is $3F.
 	tileset Overworld,    -1, -1, -1, $52, TILEANIM_WATER_FLOWER
 	tileset RedsHouse1,   -1, -1, -1,  -1, TILEANIM_NONE
 	tileset Mart,        $18,$19,$1E,  -1, TILEANIM_NONE
diff --git a/data/tilesets/water_tilesets.asm b/data/tilesets/water_tilesets.asm
index 8abdce39..d73ff27f 100644
--- a/data/tilesets/water_tilesets.asm
+++ b/data/tilesets/water_tilesets.asm
@@ -9,4 +9,5 @@ WaterTilesets:
 	db CAVERN
 	db FACILITY
 	db PLATEAU
+	db CITRINE
 	db -1 ; end
diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm
index 0a053428..77e1736f 100644
--- a/engine/battle/wild_encounters.asm
+++ b/engine/battle/wild_encounters.asm
@@ -31,6 +31,13 @@ TryDoWildEncounter:
 	cp c
 	ld a, [wGrassRate]
 	jr z, .CanEncounter
+	
+	cp CITRINE
+	ld a, $0E ; So the Citrine grass works.
+	cp c
+	ld a, [wGrassRate]
+	jr z, .CanEncounter
+	
 	ld a, $14 ; in all tilesets with a water tile, this is its id
 	cp c
 	ld a, [wWaterRate]