quick fixes

README.md

@@ -3,8 +3,8 @@
 This is a custom Pokémon game based on [the Pokémon Crystal disassembly](https://github.com/pret/pokecrystal).
 
 The goal of this project is to build a realistic recreation of the GBA titles Pokémon Ruby and Sapphire on the GBC using custom devamps of the art and music of the original games.
-Inspired by the rmxp game [Pokémon Ancient Emerald](https://www.pokecommunity.com/showthread.php?t=296411) by Pia Carrot, which in turn was inspired the Silver hack
-Pokemon Ancient Emerald(http://www.romhack.me/ancientemerald/) by Melash this version of the hack began art production around 2015 and began official work on mapping and scripting
+Inspired by the rmxp game [Pokémon Ancient Emerald](https://www.pokecommunity.com/showthread.php?t=296411) by Pia Carrot, which in turn was inspired by the Silver hack
+Pokémon Ancient Emerald(http://www.romhack.me/ancientemerald/) by Melash. This version of the hack began art production around 2015 and began official work on mapping and scripting
 January 2018.
 To set up the repository, see [INSTALL.md](INSTALL.md).
 

constants/landmark_constants.asm

@@ -10,6 +10,7 @@
 	const ROUTE_103         ; 02
 	const PETALBURG_CITY
 	const ROUTE_104         ; 02
+	const ROUTE_105
 	const CHERRYGROVE_CITY  ; 03
 	const ROUTE_30          ; 04
 	const ROUTE_31          ; 05

constants/map_constants.asm

@@ -349,6 +349,7 @@ ENDM
 	map_const PETALBURG_WOODS,                             20, 19 ; 1
 	map_const WALLYS_HOUSE,                                 4,  4 ; 2
 	map_const BRINEYS_CABIN,                                5,  4 ; 3
+	map_const ROUTE_105,                                   16, 35 ; 4
 
 	newgroup                                                      ; 25
 

data/maps/attributes.asm

@@ -89,9 +89,13 @@ ENDM
 	connection west, Route104South, ROUTE_104_SOUTH, 1, 8, 8
 	connection east, Route102, ROUTE_102, 5, 1, 6
 	
-	map_attributes Route104South, ROUTE_104_SOUTH, $00, EAST
+	map_attributes Route104South, ROUTE_104_SOUTH, $00, SOUTH | EAST
+	connection south, Route105, ROUTE_105, 0, 0, 16
 	connection east, PetalburgCity, PETALBURG_CITY, 8, 1, 8
 	
+	map_attributes Route105, ROUTE_105, $00, NORTH
+	connection north, Route104South, ROUTE_104_SOUTH, 0, 0, 16
+	
 	map_attributes CherrygroveCity, CHERRYGROVE_CITY, $35, NORTH
 	connection north, Route30, ROUTE_30, 5, 0, 10
 

data/maps/blocks.asm

@@ -834,4 +834,7 @@ WallysHouse_Blocks:
 	
 BrineysCabin_Blocks:
 	INCBIN "maps/BrineysCabin.ablk"
+	
+Route105_Blocks:
+	INCBIN "maps/Route105.ablk"
 	

data/maps/landmarks.asm

@@ -7,38 +7,14 @@ ENDM
 Landmarks:
 ; entries correspond to constants/landmark_constants.asm
 	dbbw       0,   0, SpecialMapName
-	landmark 44,  100, LittlerootTownName
-	landmark 44,   92,  Route101Name
-	landmark 44,   84, OldaleTownName
-	landmark 36,   84,  Route102Name
-	landmark 44,   78,  Route103Name
-	landmark 44,   70, PetalburgCityName
-	landmark 44,   62,  Route104Name
-	landmark 100, 100, CherrygroveCityName
-	landmark 100,  80, Route30Name
-	landmark  96,  60, Route31Name
-	landmark  85,  58, SproutTowerName
-	landmark  76,  76, RuinsOfAlphName
-	landmark  84, 124, UnionCaveName
-	landmark  70, 122, RaltsWellName
-	landmark  52, 120, IlexForestName
-	landmark  52, 112, Route34Name
-	landmark  52,  92, GoldenrodCityName
-	landmark  50,  92, RadioTowerName
-	landmark  52,  60, NationalParkName
-	landmark  70,  42, TinTowerName
-	landmark  66,  42, BurnedTowerName
-	landmark  38,  62, LighthouseName
-	landmark  28,  56, BattleTowerName
-	landmark  28,  64, Route40Name
-	landmark  28,  92, WhirlIslandsName
-	landmark  28, 100, Route41Name
-	landmark  20, 100, CianwoodCityName
-	landmark  84,  44, MtMortarName
-	landmark 130,  38, IcePathName
-	landmark 132,  36, DragonsDenName
-	landmark 112,  72, DarkCaveName
-	landmark 148,  68, SilverCaveName
+	landmark 44,  116, LittlerootTownName
+	landmark 44,   108,  Route101Name
+	landmark 44,   100, OldaleTownName
+	landmark 36,   100,  Route102Name
+	landmark 44,   94,  Route103Name
+	landmark 28,   100, PetalburgCityName
+	landmark 20,   100,  Route104Name
+	landmark 20,   108,  Route105Name
 	landmark  52,  76, ViridianCityName
 	landmark  52,  64, Route2Name
 	landmark  76,  52, MtMoonName
@@ -78,22 +54,7 @@ Route102Name:        db "ROUTE 102@"
 Route103Name:        db "ROUTE 103@"
 PetalburgCityName:   db "PETALBURG¯CITY@"
 Route104Name:        db "ROUTE 104@"
-CherrygroveCityName: db "CHERRYGROVE¯CITY@"
-GoldenrodCityName:   db "GOLDENROD¯CITY@"
-CianwoodCityName:    db "CIANWOOD¯CITY@"
-SilverCaveName:      db "SILVER CAVE@"
-SproutTowerName:     db "SPROUT¯TOWER@"
-RuinsOfAlphName:     db "RUINS¯OF ALPH@"
-UnionCaveName:       db "UNION CAVE@"
-RaltsWellName:    db "RALTS¯WELL@"
-RadioTowerName:      db "RADIO TOWER@"
-NationalParkName:    db "NATIONAL¯PARK@"
-TinTowerName:        db "TIN TOWER@"
-LighthouseName:      db "LIGHTHOUSE@"
-WhirlIslandsName:    db "WHIRL¯ISLANDS@"
-MtMortarName:        db "MT.MORTAR@"
-DragonsDenName:      db "DRAGON'S¯DEN@"
-IcePathName:         db "ICE PATH@"
+Route105Name:        db "ROUTE 105@"
 NotApplicableName:   db "N/A@" ; "オバケやしき" ("HAUNTED HOUSE") in Japanese
 ViridianCityName:    db "VIRIDIAN¯CITY@"
 LavenderTownName:    db "LAVENDER¯TOWN@"
@@ -127,14 +88,6 @@ Route22Name:         db "ROUTE 22@"
 Route23Name:         db "ROUTE 23@"
 Route28Name:         db "ROUTE 28@"
 Route29Name:         db "ROUTE 29@"
-Route30Name:         db "ROUTE 30@"
-Route31Name:         db "ROUTE 31@"
-Route34Name:         db "ROUTE 34@"
-Route40Name:         db "ROUTE 40@"
-Route41Name:         db "ROUTE 41@"
-DarkCaveName:        db "DARK CAVE@"
-IlexForestName:      db "ILEX¯FOREST@"
-BurnedTowerName:     db "BURNED¯TOWER@"
 FastShipName:        db "FAST SHIP@"
 ViridianForestName:  db "VIRIDIAN¯FOREST@"
 DiglettsCaveName:    db "DIGLETT'S¯CAVE@"

data/maps/maps.asm

@@ -354,6 +354,7 @@ MapGroup_Rustboro:
 	map PetalburgWoods, TILESET_FOREST, ROUTE, ROUTE_104, MUSIC_ROUTE_103, FALSE, PALETTE_AUTO, FISHGROUP_POND
 	map WallysHouse, TILESET_HOUSE, INDOOR, PETALBURG_CITY, MUSIC_PETALBURG_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map BrineysCabin, TILESET_TRADITIONAL_HOUSE, INDOOR, ROUTE_104, MUSIC_ROUTE_103, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route105, TILESET_JOHTO, ROUTE, ROUTE_105, MUSIC_ROUTE_103, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 
 MapGroup_Saffron:
 	map Route5, TILESET_KANTO, ROUTE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

data/maps/scripts.asm

@@ -388,3 +388,4 @@ INCLUDE "maps/Route104South.asm"
 INCLUDE "maps/PetalburgWoods.asm"
 INCLUDE "maps/WallysHouse.asm"
 INCLUDE "maps/BrineysCabin.asm"
+INCLUDE "maps/Route105.asm"

data/tilesets/johto_collision.asm

@@ -176,7 +176,7 @@
 	tilecoll WALL, WALL, WALL, WALL ; af
 	tilecoll FLOOR, WALL, FLOOR, WALL ; b0
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; b1
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; b2
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; b2
 	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; b3
 	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, FLOOR ; b4
 	tilecoll WATER, WATER, WATER, WATER ; b5

engine/pokegear/pokegear.asm

@@ -2810,6 +2810,7 @@ LoadTownMapGFX:
 
 JohtoMap:
 INCBIN "gfx/pokegear/johto.bin"
+	db $ff
 
 KantoMap:
 INCBIN "gfx/pokegear/kanto.bin"

maps/PetalburgWoods.asm

@@ -115,7 +115,7 @@ endc
 	setlasttalked ROUTE103_RIVAL
 	loadtrainer GRUNTM, GRUNTM_1,
 	startbattle
-	dontrestartmapmusic
+	playmapmusic
 	reloadmapafterbattle
 	applymovement PETALBURGWOODS_GRUNT, MovementData_GruntM3
 	opentext

maps/Route105.asm

@@ -1,11 +1,11 @@
 	const_def 2 ; object constants
 
-OldaleTown_MapScripts:
+Route105_MapScripts:
 	db 0 ; scene scripts
 
 	db 0 ; callbacks
 
-OldaleTown_MapEvents:
+Route105_MapEvents:
 	db 0, 0 ; filler
 
 	db 0 ; warp events
@@ -15,3 +15,4 @@ OldaleTown_MapEvents:
 	db 0 ; bg events
 
 	db 0 ; object events
+