Route 49_2

This completes the SW97 demo content, featuring translated text!

README.md

@@ -59,6 +59,7 @@ In general, there have been many wild encounter tweaks. View this document for d
 - Wiz (Nihon Pokemon names)
 - Rezzo (GSC-specific advice)
 - Old Dance Jacket (GSC-specific advice)
+- Minamitoku (SW97 demo translation commentary [here](https://www.youtube.com/watch?v=Pe1vsKRl7_M&ab_channel=Minamitoku))
 
 # Sprite Credits
 - Zeta_Null: Topaz sprites, numerous tileset bits, Omegadge, 

constants/map_constants.asm

@@ -520,6 +520,7 @@ ENDM
 	map_const DEBUG_ROOM,								   20, 20 ; 2
 	map_const ROUTE_49,									   15,  9 ; 3
 	map_const QUIET_CAVE,								   27, 18 ; 4
+	map_const ROUTE_49_2,								   10, 18 ; 5
 	endgroup
 	
 	newgroup BLUE_FOREST                                          ; 27

data/maps/attributes.asm

@@ -375,9 +375,16 @@ ENDM
 	connection north, Route10North, ROUTE_10_NORTH, 0
 	connection south, LavenderTown, LAVENDER_TOWN, 0
 	
-	map_attributes SilentHills, SILENT_HILLS, $00, WEST ; this is on its own for now. add connections to mt. silver later.
+	map_attributes SilentHills, SILENT_HILLS, $00, WEST ; this is on its own for now. add connections to Prince later.
 	connection west, Route49, ROUTE_49, 0
 	
+	map_attributes Route49, ROUTE_49, $05, EAST | WEST
+	connection east, SilentHills, SILENT_HILLS, $05, 0
+	connection west, Route49_2, ROUTE_49_2, $05, 0
+	
+	map_attributes Route49_2, ROUTE_49_2, $05, 0, EAST
+	connection east, Route49, ROUTE_49, $05, 0
+
 	map_attributes Route23, ROUTE_23, $0f, 0
 	map_attributes SproutTower1F, SPROUT_TOWER_1F, $00, 0
 	map_attributes SproutTower2F, SPROUT_TOWER_2F, $00, 0
@@ -713,6 +720,5 @@ ENDM
 	map_attributes CeruleanCaveB1F, CERULEAN_CAVE_B1F, $00, 0
 	map_attributes DebugRoom, DEBUG_ROOM, $05, 0 ; Debug Room :V
 	map_attributes CliffCave, CLIFF_CAVE, $00, 0
-	map_attributes Route49, ROUTE_49, $00, 0
 	map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
-	map_attributes QuietCave, QUIET_CAVE, $00, 0
+	map_attributes QuietCave, QUIET_CAVE, $76, 0

data/maps/blocks.asm

@@ -1092,3 +1092,6 @@ Route49_Blocks:
 	
 QuietCave_Blocks:
 	INCBIN "maps/QuietCave.ablk"
+
+Route49_2_Blocks:
+	INCBIN "maps/Route49_2.ablk"

data/maps/maps.asm

@@ -559,6 +559,7 @@ MapGroup_SilentHills:
 	map DebugRoom, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_MORN, FISHGROUP_SHORE
 	map Route49, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
 	map QuietCave, TILESET_NIHON_01, ROUTE, LANDMARK_QUIET_CAVE, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
+	map Route49_2, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
 	assert_table_length NUM_SILENT_HILLS_MAPS
 	
 MapGroup_BlueForest:

data/maps/outdoor_sprites.asm

@@ -309,7 +309,6 @@ IndigoGroupSprites:
 	db SPRITE_POKE_BALL
 	db SPRITE_BOULDER
 
-SilentHillsGroupSprites: ; Will have its own thing eventually
 BlueForestGroupSprites: ; Will have its own thing eventually
 NewBarkGroupSprites:
 	db SPRITE_SUICUNE

data/maps/scripts.asm

@@ -503,3 +503,4 @@ INCLUDE "maps/CliffCave.asm"
 INCLUDE "maps/Route49.asm"
 INCLUDE "maps/BlueForest.asm"
 INCLUDE "maps/QuietCave.asm"
+INCLUDE "maps/Route49_2.asm"

data/tilesets/nihon01_collision.asm

@@ -11,7 +11,7 @@
 	tilecoll WALL, WALL, WALL, WALL ; 0a
 	tilecoll WALL, FLOOR, WALL, WALL ; 0b
 	tilecoll FLOOR, WALL, WALL, WALL ; 0c
-	tilecoll FLOOR, WALL, WALL, WALL ; 0d
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d
 	tilecoll WALL, WALL, DOOR, WALL ; 0e
 	tilecoll WALL, WALL, WALL, WALL ; 0f
 	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 10
@@ -104,22 +104,22 @@
 	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 67
 	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, FLOOR ; 68
 	tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 69
-	tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a
+	tilecoll WALL, FLOOR, WALL, WALL ; 6a
-	tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b
+	tilecoll WALL, WALL, FLOOR, WALL ; 6b
-	tilecoll WALL, FLOOR, WALL, WALL ; 6c
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 6c
-	tilecoll FLOOR, WALL, WALL, WALL ; 6d
+	tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 6d
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e
+	tilecoll WATER, WATER, WATER, WATER ; 6e
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f
+	tilecoll WALL, WALL, WALL, WALL ; 6f
-	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70
+	tilecoll WALL, WALL, WALL, WALL ; 70
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71
+	tilecoll WALL, WALL, DOOR, DOOR ; 71
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 72
+	tilecoll WALL, WALL, WALL, WALL ; 72
-	tilecoll FLOOR, FLOOR, CAVE, WALL ; 73
+	tilecoll WALL, WALL, WALL, WALL ; 73
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74
+	tilecoll WALL, WALL, WALL, WALL ; 74
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 75
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 75
-	tilecoll WATER, WATER, WATER, WATER ; 76
+	tilecoll WALL, WALL, WALL, WALL ; 76
-	tilecoll WALL, WALL, DOOR, WALL ; 77
+	tilecoll WALL, WALL, WALL, WALL ; 77
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 78
+	tilecoll WALL, WALL, WALL, WALL ; 78
-	tilecoll WATER, WATER, WATER, WATER ; 79
+	tilecoll WALL, WALL, WALL, WALL ; 79
 	tilecoll WATER, WATER, WATER, WATER ; 7a
 	tilecoll WALL, WALL, WALL, WALL ; 7b
 	tilecoll WALL, WALL, WALL, WALL ; 7c

data/trainers/parties.asm

@@ -1822,8 +1822,10 @@ BeautyGroup:
 
 	next_list_item ; BEAUTY (15)
 	db "THERESA@", TRAINERTYPE_NORMAL
-	db 15
+	db 45
-	dw SENTRET
+	dw FURRET ; MIMEAR
+	db 48
+	dw CLEFABLE
 	db -1 ; end
 
 	next_list_item ; BEAUTY (16)

data/wild/nihon_grass.asm

@@ -56,4 +56,32 @@ NihonGrassWildMons:
 	dbw 35, SKARMORY
 	end_grass_wildmons
 
+	def_grass_wildmons ROUTE_49_2
+	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
+	; morn
+	dbw 30, RATTATA
+	dbw 31, PIDGEY
+	dbw 30, PIKACHU
+	dbw 31, MARILL
+	dbw 32, HOPPIP
+	dbw 32, EKANS
+	dbw 35, SUNFLORA
+	; day
+	dbw 30, RATTATA
+	dbw 31, PIDGEY
+	dbw 30, PIKACHU
+	dbw 31, MARILL
+	dbw 32, HOPPIP
+	dbw 32, EKANS
+	dbw 35, GIRAFARIG
+	; nite
+	dbw 30, RATTATA
+	dbw 31, PIDGEY
+	dbw 30, PIKACHU
+	dbw 31, MARILL
+	dbw 32, HOOTHOOT
+	dbw 32, EKANS
+	dbw 35, SKARMORY
+	end_grass_wildmons
+
 	db -1 ; end

data/wild/nihon_water.asm

@@ -1,3 +1,32 @@
 NihonWaterWildMons:
 
+	; Placeholder
+	def_grass_wildmons ROUTE_49_2
+	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
+	; morn
+	dbw 30, MAGIKARP
+	dbw 31, MAGIKARP
+	dbw 30, MAGIKARP
+	dbw 31, MAGIKARP
+	dbw 32, MAGIKARP
+	dbw 32, MAGIKARP
+	dbw 35, MAGIKARP
+	; day
+	dbw 30, MAGIKARP
+	dbw 31, MAGIKARP
+	dbw 30, MAGIKARP
+	dbw 31, MAGIKARP
+	dbw 32, MAGIKARP
+	dbw 32, MAGIKARP
+	dbw 35, MAGIKARP
+	; nite
+	dbw 30, MAGIKARP
+	dbw 31, MAGIKARP
+	dbw 30, MAGIKARP
+	dbw 31, MAGIKARP
+	dbw 32, MAGIKARP
+	dbw 32, MAGIKARP
+	dbw 35, MAGIKARP
+	end_grass_wildmons
+
 	db -1 ; end

maps/QuietCave.asm

@@ -10,7 +10,7 @@ QuietCave_MapScripts:
 	def_callbacks
 
 QuietCaveSign1:
-	jumptext QuietCaveSign1Text
+	jumptext QuietCaveSign2Text ; swapped because im lazy and misplaced the signs
 
 QuietCaveSign1Text:
 	text "SILENT HILLS"
@@ -18,7 +18,7 @@ QuietCaveSign1Text:
 	done
 
 QuietCaveSign2:
-	jumptext Route49Sign2Text
+	jumptext QuietCaveSign1Text
 
 QuietCaveSign2Text:
 	text "OLD CITY"
@@ -30,9 +30,9 @@ QuietCaveBoy1:
 
 QuietCaveBoy1Text:
 	text "The wild #MON"
-	line "here are weak,"
+	line "are weak, so my"
-	cont "so my friends"
+	cont "friends come"
-	cont "train here!"
+	cont "here to train!"
 	
 	para "Test your strength"
 	line "against them!"
@@ -139,7 +139,7 @@ TrainerBugCatcherElwyn:
 .Script:
 	endifjustbattled
 	opentext
-	writetext BugCatcherElwynBeatenText
+	writetext BugCatcherElwynAfterText
 	waitbutton
 	closetext
 	end
@@ -208,8 +208,8 @@ QuietCave_MapEvents:
 	def_warp_events
 	warp_event 53, 29, ROUTE_49, 1
 	warp_event 53, 30, ROUTE_49, 2
-;	warp_event  8,  0, ROUTE_49_2, 1
+	warp_event  8,  0, ROUTE_49_2, 1
-;	warp_event  9,  0, ROUTE_49_2, 2
+	warp_event  9,  0, ROUTE_49_2, 2
 
 	def_coord_events
 
@@ -219,7 +219,7 @@ QuietCave_MapEvents:
 
 	def_object_events
 	object_event 45, 28, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, QuietCaveBoy1, -1
-	object_event 45, 19, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherSioned, -1
+	object_event 45, 19, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherSioned, -1
 	object_event 33, 26, SPRITE_BEAUTY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBeautyJulie, -1
 	object_event 31,  6, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherDick, -1
 	object_event 11, 27, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBugCatcherElwyn, -1

maps/Route49.asm

@@ -35,9 +35,9 @@ Route49Boy1:
 ; Minamitoku stated that the school the boy went to here is used to prepare for exams and the like, so this seems to be the best localisation.
 Route49Boy1Text:
 	text "I saw a strange"
-	line "#MON when I came"
+	line "#MON when I was"
-	cont "back from prep"
+	cont "coming back from"
-	cont "school!"
+	cont "prep school!"
 	done
 
 Route49Boy2:

maps/Route49_2.ablk

@@ -0,0 +1 @@
+ptowxyrqs$$$$$$e$$$ennU`$bTnnn55Y`$bX55555Y`$bX555b]$$$^$b$Ek))b$lk)bm$k)*l*bul**l*bk
**j'bj'''''b$]]]]]]]]

maps/Route49_2.asm

@@ -0,0 +1,68 @@
+; Text on this route uses translations from Minamitoku.
+; https://www.youtube.com/watch?v=Pe1vsKRl7_M&ab_channel=Minamitoku
+
+	object_const_def
+	const ROUTE_49_2_BEAUTY
+
+Route49_2_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+Route49Sign1_2:
+	jumptext Route49Sign1_2Text
+
+Route49Sign1_2Text:
+	text "ROUTE 49" ; Originally Route 1, but since Johto exists now, we use Route 49.
+	line "OLD CITY -" ; Localisation TBD
+	cont "SILENT HILLS"
+	done
+
+; Reusing previously unused Beauty here.
+TrainerBeautyTheresa:
+	trainer BEAUTY, THERESA, EVENT_BEAT_BEAUTY_THERESA, BeautyTheresaSeenText, BeautyTheresaBeatenText, 0, .Script
+
+.Script:
+	endifjustbattled
+	opentext
+	writetext BeautyTheresaAfterText
+	waitbutton
+	closetext
+	end
+
+; Minamitoku didn't translate the text outside of the spotted text here too.
+BeautyTheresaSeenText:
+	text "Oh! Such a cute"
+	line "TRAINER!"
+	para "Would you battle"
+	line "me?"
+	done
+
+BeautyTheresaBeatenText:
+	text "Awhhh..."
+	done
+
+BeautyTheresaAfterText:
+	text "Hm? The cave?"
+	
+	para "I try to avoid"
+	line "it. The boys in"
+	cont "there are too"
+	cont "immature!"
+	
+	done
+
+Route49_2_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event  8, 27, QUIET_CAVE, 3
+	warp_event  9, 27, QUIET_CAVE, 4
+
+	def_coord_events
+
+	def_bg_events
+	bg_event 10, 20, BGEVENT_READ, Route49Sign1_2
+
+	def_object_events
+	object_event  7, 15, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyTheresa, -1