Nihon Route 49, Folage, and Barreau

This commit adds Nihon Route 49. It has everything necessary to work, but the wild Pokemon don't seem to spawn. I've added infrastructure that should allow this to happen, and it works for Kanto, so I am presuming that some other tomfoolery is at work.

I've also added Folage and Barreau, and implemented Folage into the Headbutt Tree table. This was to give them to the Bug Catcher on the route.
This commit is contained in:
Llinos Evans 2023-11-03 22:17:30 +00:00
parent e9cab6db16
commit 9c824b3c5e
65 changed files with 369 additions and 59 deletions

View file

@ -374,6 +374,9 @@ ENDM
map_attributes Route10South, ROUTE_10_SOUTH, $2c, NORTH | SOUTH
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.
connection west, Route49, ROUTE_49, 0
map_attributes Route23, ROUTE_23, $0f, 0
map_attributes SproutTower1F, SPROUT_TOWER_1F, $00, 0
@ -708,7 +711,7 @@ ENDM
map_attributes CeruleanCave1F, CERULEAN_CAVE_1F, $00, 0
map_attributes CeruleanCave2F, CERULEAN_CAVE_2F, $00, 0
map_attributes CeruleanCaveB1F, CERULEAN_CAVE_B1F, $00, 0
map_attributes SilentHills, SILENT_HILLS, $00, 0 ; this is on its own for now. add connections to mt. silver later.
map_attributes DebugRoom, DEBUG_ROOM, $05, 0 ; Debug Room :V
map_attributes CliffCave, CLIFF_CAVE, $00, 0
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
map_attributes Route49, ROUTE_49, $00, 0
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.

View file

@ -1086,3 +1086,6 @@ CliffCave_Blocks:
BlueForest_Blocks:
INCBIN "maps/BlueForest.ablk"
Route49_Blocks:
INCBIN "maps/Route49.ablk"

View file

@ -109,6 +109,7 @@ Landmarks:
landmark 140, 116, FastShipName
assert_table_length NIHON_LANDMARK
landmark 92, 108, SilentHillsName
landmark 91, 108, Route49Name ; probably not correct
landmark 140, 60, BlueForestName
assert_table_length NUM_LANDMARKS
@ -216,4 +217,5 @@ UndergroundName: db "UNDERGROUND@"
BattleTowerName: db "BATTLE¯TOWER@"
SpecialMapName: db "SPECIAL@"
SilentHillsName: db "SILENT¯HILLS@"
Route49Name: db "ROUTE 49@"
BlueForestName: db "BLUE¯FOREST@"

View file

@ -557,6 +557,7 @@ MapGroup_SilentHills:
table_width MAP_LENGTH, MapGroup_SilentHills
map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
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
assert_table_length NUM_SILENT_HILLS_MAPS
MapGroup_BlueForest:

View file

@ -500,4 +500,5 @@ INCLUDE "maps/LakeOfRageMart.asm"
INCLUDE "maps/LakeOfRagePrycesHouse.asm"
INCLUDE "maps/DebugRoom.asm"
INCLUDE "maps/CliffCave.asm"
INCLUDE "maps/Route49.asm"
INCLUDE "maps/BlueForest.asm"