From 2fe0d906ea959e18c009a3fab2be4ffb5cf092c7 Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:39:59 +0000
Subject: [PATCH] Integrate Route 53

For some reason the map was in the game with no data, so I added it into the region with some signs. No connection to the nonexistent Ochre Town.
---
 constants/landmark_constants.asm |  1 +
 constants/map_constants.asm      |  9 ++---
 data/maps/attributes.asm         |  4 ++-
 data/maps/blocks.asm             |  3 ++
 data/maps/landmarks.asm          |  2 ++
 data/maps/maps.asm               |  1 +
 data/maps/scripts.asm            |  1 +
 data/wild/nihon_grass.asm        | 60 ++++++++++++++++++++++++++++++--
 data/wild/nihon_water.asm        |  9 +++++
 maps/Route53.asm                 | 50 ++++++++++++++++++++++++++
 maps/Route53RuddyTownGate.asm    | 12 ++++---
 11 files changed, 141 insertions(+), 11 deletions(-)
 create mode 100644 maps/Route53.asm

diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm
index 0849d77..bb1c1ab 100644
--- a/constants/landmark_constants.asm
+++ b/constants/landmark_constants.asm
@@ -142,6 +142,7 @@ DEF NIHON_LANDMARK EQU const_value
 	const LANDMARK_ROUTE_51
 	const LANDMARK_ROUTE_52
 	const LANDMARK_RUDDY_TOWN
+	const LANDMARK_ROUTE_53
 	const LANDMARK_ROUTE_57
 	const LANDMARK_SUNGLOW_CITY
 	const LANDMARK_BLUE_FOREST
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 8e187ee..40306be 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -693,10 +693,11 @@ ENDM
 	map_const RUDDY_TOWN_POKECENTER_1F,                   10,  4 ; 2
 	map_const RUDDY_MART,								 	8, 4 ; 3
 	map_const RUDDY_TOWN_BIG_HOUSE_1,						5, 4 ; 4
-	map_const RUDDY_TOWN_BIG_HOUSE_2,						5, 4 ; 4
-	map_const ROUTE_52_RUDDY_TOWN_GATE,						5, 4 ; 4
-	map_const ROUTE_53_RUDDY_TOWN_GATE,						5, 4 ; 5
-	map_const ROUTE_54_RUDDY_TOWN_GATE,						5, 4 ; 6
+	map_const RUDDY_TOWN_BIG_HOUSE_2,						5, 4 ; 5
+	map_const ROUTE_52_RUDDY_TOWN_GATE,						5, 4 ; 6
+	map_const ROUTE_53_RUDDY_TOWN_GATE,						5, 4 ; 7
+	map_const ROUTE_54_RUDDY_TOWN_GATE,						5, 4 ; 8
+	map_const ROUTE_53,									  35,  9 ; 9
 	endgroup
 
 	newgroup SUNGLOW_CITY                                        ; 40
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
index 11f8f2c..d40b095 100644
--- a/data/maps/attributes.asm
+++ b/data/maps/attributes.asm
@@ -922,7 +922,9 @@ ENDM
 	map_attributes Route52RuddyTownGate, ROUTE_52_RUDDY_TOWN_GATE, $00, 0
 	map_attributes Route53RuddyTownGate, ROUTE_53_RUDDY_TOWN_GATE, $00, 0
 	map_attributes Route54RuddyTownGate, ROUTE_54_RUDDY_TOWN_GATE, $00, 0
-
+	
+	map_attributes Route53, ROUTE_53, $00, 0
+	
 	map_attributes Route57, ROUTE_57, $03, NORTH
 	connection north, SunglowCity, SUNGLOW_CITY, 0
 
diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm
index 95c739e..72198c7 100644
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@@ -1333,6 +1333,9 @@ Route51_Blocks:
 Route52_Blocks:
 	INCBIN "maps/Route52.ablk"
 	
+Route53_Blocks:
+	INCBIN "maps/Route53.ablk"
+	
 RuddyTown_Blocks:
 	INCBIN "maps/RuddyTown.ablk"
 	
diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm
index 94e4552..6b64b9c 100644
--- a/data/maps/landmarks.asm
+++ b/data/maps/landmarks.asm
@@ -146,6 +146,7 @@ Landmarks:
 	landmark  24, 92, Route51Name
 	landmark  12, 84, Route52Name
 	landmark  12, 68, RuddyTownName
+	landmark  16, 68, Route53Name
 	landmark  60, 88, Route57Name
 	landmark  60, 76, SunglowCityName
 	landmark 140, 60, BlueForestName
@@ -275,6 +276,7 @@ Route49Name:         db "ROUTE 49@"
 Route50Name:		 db "ROUTE 50@"
 Route51Name:		 db "ROUTE 51@"
 Route52Name:		 db "ROUTE 52@"
+Route53Name:		 db "ROUTE 53@"
 Route57Name:		 db "ROUTE 57@"
 QuietCaveName:       db "QUIET¯CAVE@"
 OldCityName:		 db "SEPIA¯CITY@"
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
index 82ebeba..6dfa43a 100644
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@@ -765,6 +765,7 @@ MapGroup_RuddyTown:
 	map Route52RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_52, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map Route53RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE ; needs new landmark when route is made
 	map Route54RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE ; see above
+	map Route53, TILESET_NIHON_FONT, ROUTE, LANDMARK_ROUTE_53, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
 	assert_table_length NUM_RUDDY_TOWN_MAPS
 
 MapGroup_SunglowCity:
diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm
index 37b93cc..e6f95ae 100644
--- a/data/maps/scripts.asm
+++ b/data/maps/scripts.asm
@@ -659,3 +659,4 @@ INCLUDE "maps/CoralCityFishingGuruHouse.asm"
 INCLUDE "maps/CoralCityBigHouse.asm"
 INCLUDE "maps/RuddyTownBigHouse1.asm"
 INCLUDE "maps/RuddyTownBigHouse2.asm"
+INCLUDE "maps/Route53.asm"
diff --git a/data/wild/nihon_grass.asm b/data/wild/nihon_grass.asm
index ce572bd..b3f32c5 100644
--- a/data/wild/nihon_grass.asm
+++ b/data/wild/nihon_grass.asm
@@ -203,7 +203,7 @@ NihonGrassWildMons:
 	def_grass_wildmons ROUTE_51
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
-	dbw 30, FEAROW
+	dbw 30, SPEAROW
 	dbw 31, RAPIDASH
 	dbw 30, FEAROW
 	dbw 31, COATL
@@ -211,7 +211,7 @@ NihonGrassWildMons:
 	dbw 32, TAUROS
 	dbw 35, WARUCHU
 	; day
-	dbw 30, FEAROW
+	dbw 30, SPEAROW
 	dbw 31, RAPIDASH
 	dbw 30, FEAROW
 	dbw 31, COATL
@@ -230,4 +230,60 @@ NihonGrassWildMons:
 	
 	; Route 52 has no grass.
 	
+	def_grass_wildmons ROUTE_53
+	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
+	; morn
+	dbw 30, SPEAROW
+	dbw 31, RAPIDASH
+	dbw 30, FEAROW
+	dbw 31, COATL
+	dbw 32, QATU
+	dbw 32, TAUROS
+	dbw 35, WARUCHU
+	; day
+	dbw 30, SPEAROW
+	dbw 31, RAPIDASH
+	dbw 30, FEAROW
+	dbw 31, COATL
+	dbw 32, QATU
+	dbw 32, TAUROS
+	dbw 35, WARUCHU
+	; nite
+	dbw 30, MURKROW
+	dbw 31, FOXFIRE
+	dbw 30, MURKROW
+	dbw 31, SNEASEL
+	dbw 32, ARBOK
+	dbw 32, NOCTOWL
+	dbw 35, WARUCHU
+	end_grass_wildmons
+	
+	def_grass_wildmons ROUTE_57
+	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
+	; morn
+	dbw 30, SPEAROW
+	dbw 31, DODUO
+	dbw 30, FEAROW
+	dbw 31, DODRIO ; CACTORMUS
+	dbw 32, KIWOOKED
+	dbw 32, DITTO
+	dbw 35, CYCLORP
+	; day
+	dbw 30, SPEAROW
+	dbw 31, DODUO
+	dbw 30, FEAROW
+	dbw 31, DODRIO ; CACTORMUS
+	dbw 32, KIWOOKED
+	dbw 32, DITTO
+	dbw 35, CYCLORP
+	; nite
+	dbw 30, CUBONE
+	dbw 31, DROWZEE
+	dbw 30, MAROWAK
+	dbw 31, DODRIO ; CACTORMUS
+	dbw 32, ARBOK
+	dbw 32, DITTO
+	dbw 35, CYCLORP
+	end_grass_wildmons
+	
 	db -1 ; end
diff --git a/data/wild/nihon_water.asm b/data/wild/nihon_water.asm
index 1266fa9..5ce8c35 100644
--- a/data/wild/nihon_water.asm
+++ b/data/wild/nihon_water.asm
@@ -30,4 +30,13 @@ NihonWaterWildMons:
 	dbw 30, ANGORE
 	end_water_wildmons
 	
+	def_water_wildmons ROUTE_53
+	db 4 percent ; encounter rates: morn/day/nite
+	dbw 30, MOLAMBINO
+	dbw 31, MANTINE
+	dbw 30, ANGORE
+	end_water_wildmons
+	
+	; Route 57 has no grass
+	
 	db -1 ; end
diff --git a/maps/Route53.asm b/maps/Route53.asm
new file mode 100644
index 0000000..851e2ba
--- /dev/null
+++ b/maps/Route53.asm
@@ -0,0 +1,50 @@
+	object_const_def
+
+Route53_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+Route53SignScript1:
+	jumptext Route53SignText1
+
+Route53SignText1:
+	text "ROUTE 53"
+	para "WEST: RUDDY TOWN"
+	line "EAST: OCHRE TOWN"
+	done
+
+Route53SignScript2:
+	jumptext Route53SignText2
+
+Route53SignText2:
+	text "RUDDY SAND"
+	line "BATHS"
+	
+	para "Relax your"
+	line "mind and body!"
+	done
+
+Route53SignScript3:
+	jumptext Route53SignText3
+
+Route53SignText3:
+	text "Comment to be"
+	line "written."
+	done
+
+Route53_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event  6,  9, ROUTE_53_RUDDY_TOWN_GATE, 3
+		
+	def_coord_events
+
+	def_bg_events
+	bg_event  8,  9, BGEVENT_READ, Route53SignScript1
+	bg_event 24,  9, BGEVENT_READ, Route53SignScript2
+	bg_event 16,  6, BGEVENT_READ, Route53SignScript3
+
+	def_object_events
+
diff --git a/maps/Route53RuddyTownGate.asm b/maps/Route53RuddyTownGate.asm
index 48b6700..2fffe06 100644
--- a/maps/Route53RuddyTownGate.asm
+++ b/maps/Route53RuddyTownGate.asm
@@ -11,8 +11,12 @@ Route53RuddyTownGateOfficerScript:
 	jumptextfaceplayer Route53RuddyTownGateOfficerText
 
 Route53RuddyTownGateOfficerText:
-	text "Comment to be"
-	line "written."
+	text "The waters here"
+	line "are hotter than"
+	cont "usual."
+	
+	para "Expect to see"
+	line "tropical fish!"
 	done
 
 Route53RuddyTownGateGrampsScript:
@@ -48,8 +52,8 @@ Route53RuddyTownGate_MapEvents:
 	def_warp_events
 	warp_event  0, 7, RUDDY_TOWN, 5
 	warp_event  1, 7, RUDDY_TOWN, 5
-	warp_event  8, 7, DEBUG_ROOM, 1 ; Route 53
-	warp_event  9, 7, DEBUG_ROOM, 1 ; Route 53
+	warp_event  8, 7, ROUTE_53, 1 ; Route 53
+	warp_event  9, 7, ROUTE_53, 1 ; Route 53
 
 	def_coord_events