This adds Route 50 to the game, as well as Jacky, albeit without the gate or house that you can warp to within.

I decided that the game house will be where Shinjuku Jacky hangs out this time! He'll battle the player and give them uhhh idfk you figure it out

Also I don't know what to call West City. It's a rather sea-blueish colour, sort of like duck egg blue. Sort of a Pacific Teal, right? I need another gay person to give colour ideas.
This commit is contained in:
Llinos Evans 2024-07-27 11:34:14 +01:00
parent b7099d8ee8
commit 7114109368
32 changed files with 286 additions and 42 deletions

View file

@ -374,17 +374,6 @@ 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, $05, EAST | WEST ; Add Prince connections later
connection west, Route49, ROUTE_49, 0
connection east, Route66, ROUTE_66, 0
map_attributes Route49, ROUTE_49, $05, EAST | WEST
connection east, SilentHills, SILENT_HILLS, $00, 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
@ -815,10 +804,21 @@ ENDM
map_attributes WinnersPathOutside, WINNERS_PATH_OUTSIDE, $05, NORTH
connection north, Route66, ROUTE_66, 0
map_attributes SilentHills, SILENT_HILLS, $05, EAST | WEST ; Add Prince connections later
connection west, Route49, ROUTE_49, 0
connection east, Route66, ROUTE_66, 0
map_attributes Route49, ROUTE_49, $05, EAST | WEST
connection east, SilentHills, SILENT_HILLS, $00, 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 Route66, ROUTE_66, $05, WEST | SOUTH
connection south, WinnersPathOutside, WINNERS_PATH_OUTSIDE, 0
connection west, SilentHills, SILENT_HILLS, 0
map_attributes QuietCave, QUIET_CAVE, $76, 0
map_attributes BlueLab, BLUE_LAB, $00, 0
map_attributes SilentHillsPokecenter1F, SILENT_HILLS_POKECENTER_1F, $00, 0
@ -826,7 +826,11 @@ ENDM
map_attributes CalsHouse1F, CALS_HOUSE_1F, $00, 0
map_attributes CalsHouse2F, CALS_HOUSE_2F, $00, 0
map_attributes OldCity, OLD_CITY, $00, 0 ; will have a west exit.
map_attributes OldCity, OLD_CITY, $00, WEST
connection west, Route50, ROUTE_50, 4
map_attributes Route50, ROUTE_50, $00, EAST
connection east, OldCity, OLD_CITY, -4
map_attributes Route49OldCityGate1F, ROUTE_49_OLD_CITY_GATE_1F, $00, 0
map_attributes Route49OldCityGate2F, ROUTE_49_OLD_CITY_GATE_2F, $00, 0

View file

@ -1273,3 +1273,6 @@ PokemonPagoda4F_Blocks:
PokemonPagoda5F_Blocks:
INCBIN "maps/PokemonPagoda5F.ablk"
Route50_Blocks:
INCBIN "maps/Route50.ablk"

View file

@ -137,6 +137,7 @@ Landmarks:
landmark 76, 108, QuietCaveName
landmark 76, 100, OldCityName
landmark 76, 100, PokemonPagodaName
landmark 60, 100, Route50Name
landmark 140, 60, BlueForestName
landmark 108, 108, Route66Name
landmark 124, 108, WhiteCityName
@ -250,6 +251,7 @@ SilentHillsName: db "SILENT¯HILLS@"
UnknownName: db "?????@"
Route66Name: db "ROUTE 66@"
Route49Name: db "ROUTE 49@"
Route50Name: db "ROUTE 50@"
QuietCaveName: db "QUIET¯CAVE@"
OldCityName: db "SEPIA¯CITY@"
PokemonPagodaName: db "#MON¯PAGODA@"

View file

@ -714,6 +714,7 @@ MapGroup_OldCity:
map PokemonPagoda3F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map PokemonPagoda4F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map PokemonPagoda5F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map Route50, TILESET_NIHON_OLD, ROUTE, LANDMARK_ROUTE_50, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_NONE
assert_table_length NUM_OLD_CITY_MAPS
MapGroup_BlueForest:

View file

@ -741,7 +741,7 @@ OldCityGroupSprites:
db SPRITE_TWIN
db SPRITE_BUG_CATCHER
db SPRITE_YOUNGSTER
db SPRITE_BEAUTY
db SPRITE_SPACEWORLD_GIRL
db SPRITE_SUPER_NERD
db SPRITE_GRANNY
db SPRITE_MONSTER

View file

@ -600,6 +600,7 @@ INCLUDE "maps/LavenderCryptSet1.asm"
INCLUDE "maps/LavenderCryptSet2.asm"
INCLUDE "maps/LavenderCryptSet3.asm"
INCLUDE "maps/LavenderCryptDokuroarsRoom.asm"
INCLUDE "maps/Route50.asm"
SECTION "Map Scripts 31", ROMX ; spillover
INCLUDE "maps/TanobyRuins.asm"