From b0ae5b0c6df5c95b1f235cf86aaff03659faa76b Mon Sep 17 00:00:00 2001
From: thornAvery <145814585+thornAvery@users.noreply.github.com>
Date: Tue, 31 Oct 2023 03:01:11 +1100
Subject: [PATCH] Pokegear Map Fix + Minor Fixes (#13)

* pokegear townmap shows correct region + doest OOB

* fixed route data
---
 .gitignore                   |  5 +++
 data/wild/kanto_grass.asm    | 84 ++++++++++++++++++------------------
 engine/pokegear/pokegear.asm | 37 ++++++++--------
 3 files changed, 67 insertions(+), 59 deletions(-)

diff --git a/.gitignore b/.gitignore
index 99c530f..879586b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,8 @@ used_space.png
 
 # macos files
 .DS_STORE
+
+# nix files
+result
+.envrc
+.direnv/*
diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm
index 28128c3..dcc9a7c 100644
--- a/data/wild/kanto_grass.asm
+++ b/data/wild/kanto_grass.asm
@@ -342,58 +342,58 @@ KantoGrassWildMons:
 	def_grass_wildmons ROUTE_7
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
-	db 37, RATTATA
-	db 37, SPEAROW
-	db 38, GROWLITHE
-	db 39, RATICATE
-	db 39, RATTATA
-	db 35, SNUBBULL
-	db 35, SNUBBULL
+	dbw 37, RATTATA
+	dbw 37, SPEAROW
+	dbw 38, GROWLITHE
+	dbw 39, RATICATE
+	dbw 39, RATTATA
+	dbw 35, SNUBBULL
+	dbw 35, SNUBBULL
 	; day
-	db 37, RATTATA
-	db 37, SPEAROW
-	db 38, GROWLITHE
-	db 39, RATICATE
-	db 39, RATTATA
-	db 35, GROWLITHE
-	db 35, GROWLITHE
+	dbw 37, RATTATA
+	dbw 37, SPEAROW
+	dbw 38, GROWLITHE
+	dbw 39, RATICATE
+	dbw 39, RATTATA
+	dbw 35, GROWLITHE
+	dbw 35, GROWLITHE
 	; nite
-	db 37, RATTATA
-	db 37, MURKROW
-	db 38, GROWLITHE
-	db 39, RATICATE
-	db 39, MURKROW
-	db 35, HOUNDOUR
-	db 35, HOUNDOUR
+	dbw 37, RATTATA
+	dbw 37, MURKROW
+	dbw 38, GROWLITHE
+	dbw 39, RATICATE
+	dbw 39, MURKROW
+	dbw 35, HOUNDOUR
+	dbw 35, HOUNDOUR
 	end_grass_wildmons
 
 ; Silver Data, contrasting with Route 7's Gold Data.
 	def_grass_wildmons ROUTE_8
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
-	db 37, MEOWTH
-	db 39, PIDGEOTTO
-	db 35, ABRA
-	db 38, VULPIX
-	db 37, PIDGEOTTO
-	db 35, KADABRA
-	db 35, KADABRA
+	dbw 37, MEOWTH
+	dbw 39, PIDGEOTTO
+	dbw 35, ABRA
+	dbw 38, VULPIX
+	dbw 37, PIDGEOTTO
+	dbw 35, KADABRA
+	dbw 35, KADABRA
 	; day
-	db 37, MEOWTH
-	db 39, PIDGEOTTO
-	db 35, ABRA
-	db 38, VULPIX
-	db 37, PIDGEOTTO
-	db 35, KADABRA
-	db 35, KADABRA
+	dbw 37, MEOWTH
+	dbw 39, PIDGEOTTO
+	dbw 35, ABRA
+	dbw 38, VULPIX
+	dbw 37, PIDGEOTTO
+	dbw 35, KADABRA
+	dbw 35, KADABRA
 	; nite
-	db 37, MEOWTH
-	db 30, HAUNTER
-	db 35, ABRA
-	db 39, NOCTOWL
-	db 38, VULPIX
-	db 35, KADABRA
-	db 35, KADABRA
+	dbw 37, MEOWTH
+	dbw 30, HAUNTER
+	dbw 35, ABRA
+	dbw 39, NOCTOWL
+	dbw 38, VULPIX
+	dbw 35, KADABRA
+	dbw 35, KADABRA
 	end_grass_wildmons
 
 	def_grass_wildmons ROUTE_9
diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm
index 22dec4b..e2bac8f 100644
--- a/engine/pokegear/pokegear.asm
+++ b/engine/pokegear/pokegear.asm
@@ -540,12 +540,12 @@ Pokegear_UpdateClock:
 
 PokegearMap_CheckRegion:
 	ld a, [wPokegearMapPlayerIconLandmark]
-	cp LANDMARK_FAST_SHIP
-	jr z, .johto
-	cp KANTO_LANDMARK
-	jr nc, .kanto
-	cp NIHON_LANDMARK
-	jr c, .nihon
+	cp LANDMARK_SILVER_CAVE+1
+	jr c, .johto
+	cp LANDMARK_FAST_SHIP+1
+	jr c, .kanto
+	;cp NIHON_LANDMARK
+	jp .nihon
 .johto
 	ld a, POKEGEARSTATE_JOHTOMAPINIT
 	jr .done
@@ -752,13 +752,13 @@ TownMap_GetKantoLandmarkLimits:
 	ld a, [wStatusFlags]
 	bit STATUSFLAGS_HALL_OF_FAME_F, a
 	jr z, .not_hof
-	ld d, LANDMARK_ROUTE_28
+	ld d, LANDMARK_FAST_SHIP
 	ld e, LANDMARK_PALLET_TOWN
 	ret
 
 .not_hof
-	ld d, LANDMARK_ROUTE_28
-	ld e, LANDMARK_VICTORY_ROAD
+	ld d, LANDMARK_VICTORY_ROAD
+	ld e, LANDMARK_PALLET_TOWN
 	ret
 
 TownMap_GetNihonLandmarkLimits:
@@ -1572,7 +1572,7 @@ RadioChannels:
 	ld a, [wPokegearMapPlayerIconLandmark]
 	cp LANDMARK_FAST_SHIP
 	jr z, .johto
-	cp KANTO_LANDMARK
+	cp LANDMARK_SILVER_CAVE+1
 	jr c, .johto
 ; kanto or nihon
 	and a
@@ -1925,10 +1925,13 @@ _TownMap:
 
 .InitTilemap:
 	ld a, [wTownMapPlayerIconLandmark]
-	cp NIHON_LANDMARK
-	jr nc, .nihon2
-	cp KANTO_LANDMARK
-	jr nc, .kanto2
+	cp LANDMARK_SILVER_CAVE + 1 ; last johto landmark + 1
+	jr c, .johto2
+	cp LANDMARK_FAST_SHIP + 1 ; last kanto landmark + 1
+	jr c, .kanto2
+	jp .nihon2
+
+.johto2
 	ld e, JOHTO_REGION
 	jr .okay_tilemap
 
@@ -2052,15 +2055,15 @@ LoadStation_PokemonChannel:
 
 PokegearMap:
 	ld a, e
-	and a
+	cp JOHTO_REGION
 	jr nz, .kanto
 	call LoadTownMapGFX
 	call FillJohtoMap
 	ret
 
 .kanto
-	cp NIHON_LANDMARK
-	jr c, .nihon
+	cp KANTO_REGION
+	jr nz, .nihon
 	call LoadTownMapGFX
 	call FillKantoMap
 	ret