Fixed build issue, flypoints for coral/savoy, populate savoy

Savoy City is now full of savvy younglings ready to bombard people with old slang. I wanted it to be a capitalistic hellscape where all the young ones trying to keep up with the trends. A few older people, as well as those entering, do not appreciate the babel.
This commit is contained in:
Llinos Evans 2024-10-26 23:09:40 +01:00
parent 94599c63e3
commit 94436d0ef6
13 changed files with 310 additions and 10 deletions

View file

@ -117,6 +117,8 @@ EngineFlags:
engine_flag wVisitedSpawns, SPAWN_SEVEN_ISLAND
engine_flag wVisitedSpawns, SPAWN_SILENT_HILLS
engine_flag wVisitedSpawns, SPAWN_OLD_CITY
engine_flag wVisitedSpawns, SPAWN_SAVOY_CITY
engine_flag wVisitedSpawns, SPAWN_CORAL_CITY
engine_flag wVisitedSpawns, NUM_SPAWNS ; unused
engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F

View file

@ -39,4 +39,6 @@ Flypoints:
; Nihon
db LANDMARK_SILENT_HILLS, SPAWN_SILENT_HILLS
db LANDMARK_OLD_CITY, SPAWN_OLD_CITY
db LANDMARK_SAVOY_CITY, SPAWN_SAVOY_CITY
db LANDMARK_CORAL_CITY, SPAWN_CORAL_CITY
db -1 ; end

View file

@ -694,15 +694,15 @@ MapGroup_SilentHills:
map WinnersPath, TILESET_CAVE, CAVE, LANDMARK_WINNERS_PATH, MUSIC_VICTORY_ROAD, FALSE, PALETTE_NITE, FISHGROUP_DRATINI ; Sounds like a funny fishgroup
map WinnersPathOutside, TILESET_NIHON_01, ROUTE, LANDMARK_WINNERS_PATH, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_NONE
map Route66, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_66, MUSIC_NIHONTIME, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_SILENTHILLS, TRUE, PALETTE_AUTO, FISHGROUP_NONE
map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_NONE
map DebugRoom, TILESET_NIHON_01, TOWN, LANDMARK_DEBUG_ROOM, MUSIC_SINJOH_RUINS, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
map Route49, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, TRUE, PALETTE_AUTO, FISHGROUP_POND
map QuietCave, TILESET_LUSHCAVE, FOREST, LANDMARK_QUIET_CAVE, MUSIC_NIHONTIME, TRUE, PALETTE_NITE, FISHGROUP_POND
map Route49_2, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, TRUE, PALETTE_AUTO, FISHGROUP_POND
map SilentHillsPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map SilversHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_SILENTHILLS, FALSE, PALETTE_DAY, FISHGROUP_NONE
map CalsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_SILENTHILLS, FALSE, PALETTE_DAY, FISHGROUP_NONE
map CalsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_SILENTHILLS, FALSE, PALETTE_DAY, FISHGROUP_NONE
map SilversHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE
map CalsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE
map CalsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE
map SinjohRuinsExterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_NONE
map SinjohRuinsInterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_NONE
map Route49OldCityGate1F, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, FALSE, PALETTE_DAY, FISHGROUP_NONE

View file

@ -331,9 +331,7 @@ IndigoGroupSprites:
db SPRITE_POKE_BALL
db SPRITE_BOULDER
SavoyCityGroupSprites: ; Will have its own thing eventually
CoralCityGroupSprites: ; Ditto
BlueForestGroupSprites: ; Ditto
BlueForestGroupSprites: ; Will have its own thing eventually
WhiteCityGroupSprites: ; Ditto
NewBarkGroupSprites:
db SPRITE_SUICUNE
@ -753,3 +751,56 @@ OldCityGroupSprites:
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE
SavoyCityGroupSprites:
; 12 non-walking filler sprites
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
db SPRITE_POKEDEX
db SPRITE_WILL
db SPRITE_ROCKER
db SPRITE_NURSE
db SPRITE_FISHER
db SPRITE_BIG_LAPRAS
db SPRITE_BIG_ONIX
db SPRITE_SUDOWOODO
db SPRITE_RIVAL
; 9 walking sprites
db SPRITE_LASS
db SPRITE_COOLTRAINER_F
db SPRITE_ROCKER
db SPRITE_SAILOR
db SPRITE_GENTLEMAN
db SPRITE_ROCKET
db SPRITE_FISHER
db SPRITE_FAIRY
; 2 non-walking sprites
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE
CoralCityGroupSprites:
; 12 non-walking filler sprites
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
db SPRITE_POKEDEX
db SPRITE_WILL
db SPRITE_ROCKER
db SPRITE_NURSE
db SPRITE_FISHER
db SPRITE_BIG_LAPRAS
db SPRITE_BIG_ONIX
db SPRITE_SUDOWOODO
db SPRITE_RIVAL
; 9 walking sprites
db SPRITE_RIVAL
db SPRITE_TWIN
db SPRITE_SAILOR
db SPRITE_POKEFAN_M
db SPRITE_SWIMMER_GUY
db SPRITE_SWIMMER_GIRL
db SPRITE_FISHER
db SPRITE_MONSTER
; 2 non-walking sprites
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE

View file

@ -49,6 +49,8 @@ SpawnPoints:
spawn SILENT_HILLS, 13, 5
spawn OLD_CITY, 27, 29
spawn SAVOY_CITY, 25, 15
spawn CORAL_CITY, 31, 11
spawn N_A, -1, -1