From 7d6c62358e475b512636153cbbbf493b81b91bf1 Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Wed, 10 Jul 2024 13:47:45 +0100
Subject: [PATCH] I GOT IT

Ok this fixes all the wild data issues between regions and gives a possible fix for the PokeGear issues.

Yes it was that silly.

I am VERY happy it's done though.

Thanks to Frrf for playing one more Dota 2 game, giving me the time to fix it.
---
 engine/overworld/wildmons.asm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm
index 2108f49..35fc770 100644
--- a/engine/overworld/wildmons.asm
+++ b/engine/overworld/wildmons.asm
@@ -441,9 +441,13 @@ _GrassWildmonLookup:
 ;.skip2 ; If you skip here, you're in Nihon or Johto.
 
 	ld de, NihonGrassWildMons
+	ld a, [wMapGroup]
+	ld b, a
+	ld a, [wMapNumber]
+	ld c, a
 	call GetWorldMapLocation
 	cp NIHON_LANDMARK
-	jr z, .skip2
+	jr nc, .skip2
 	ld de, KantoGrassWildMons
 .skip2
 
@@ -460,9 +464,13 @@ _WaterWildmonLookup:
 	
 	; Nihon Check 2
 	ld de, NihonWaterWildMons
+	ld a, [wMapGroup]
+	ld b, a
+	ld a, [wMapNumber]
+	ld c, a
 	call GetWorldMapLocation
 	cp NIHON_LANDMARK
-	jr z, .skip2
+	jr nc, .skip2
 	ld de, KantoWaterWildMons
 .skip2