Trader NPC & Lake of Rage "Town"

This adds the Trader NPC to the Lake of Rage and restores its "town" environment.

The town is themed around evolution. The mart sells all the "normal" evolution stones, aiming to solve Johto's "stone problem" for Pokemon like Vulpix and Bellsprout. The Trader NPC actualises this, being at a point where most Pokemon are around Level 35-40, as is how we balanced it on Cinnabar Island in KEP.

The text is mostly revolved around the Gyarados, but this could shift.

The Gym isn't done - I don't have time to sort it at the moment - but I am thinking of making it a Pre-Gym. This doesn't make a lot of sense though, so maybe it should be changed to be the tower seen in an earlier build.
This commit is contained in:
Llinos Evans 2023-10-26 13:51:05 +01:00
parent b582a0e7aa
commit a4854f63ba
18 changed files with 418 additions and 25 deletions

View file

@ -568,6 +568,7 @@ ENDM
map_attributes RedsHouse1F, REDS_HOUSE_1F, $00, 0
map_attributes RedsHouse2F, REDS_HOUSE_2F, $00, 0
map_attributes BluesHouse, BLUES_HOUSE, $00, 0
map_attributes LakeOfRageTraderHouse, LAKE_OF_RAGE_TRADER_HOUSE, $00, 0
map_attributes OaksLab, OAKS_LAB, $00, 0
map_attributes PewterNidoranSpeechHouse, PEWTER_NIDORAN_SPEECH_HOUSE, $00, 0
map_attributes PewterGym, PEWTER_GYM, $00, 0
@ -603,11 +604,13 @@ ENDM
map_attributes SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $00, 0
map_attributes Route15FuchsiaGate, ROUTE_15_FUCHSIA_GATE, $00, 0
map_attributes LavenderPokecenter1F, LAVENDER_POKECENTER_1F, $00, 0
map_attributes LakeOfRagePokecenter1F, LAKE_OF_RAGE_POKECENTER_1F, $00, 0
map_attributes LavenderPokecenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $00, 0
map_attributes MrFujisHouse, MR_FUJIS_HOUSE, $00, 0
map_attributes LavenderSpeechHouse, LAVENDER_SPEECH_HOUSE, $00, 0
map_attributes LavenderNameRater, LAVENDER_NAME_RATER, $00, 0
map_attributes LavenderMart, LAVENDER_MART, $00, 0
map_attributes LakeOfRageMart, LAKE_OF_RAGE_MART, $00, 0
map_attributes SoulHouse, SOUL_HOUSE, $00, 0
map_attributes LavRadioTower1F, LAV_RADIO_TOWER_1F, $00, 0
map_attributes Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $00, 0

View file

@ -198,6 +198,7 @@ CherrygroveGymSpeechHouse_Blocks:
GuideGentsHouse_Blocks:
CherrygroveEvolutionSpeechHouse_Blocks:
Route30BerryHouse_Blocks:
LakeOfRageTraderHouse_Blocks:
INCBIN "maps/House1.ablk"
SafariZoneFuchsiaGateBeta_Blocks:
@ -334,6 +335,7 @@ LavenderMart_Blocks:
ViridianMart_Blocks:
SaffronMart_Blocks:
CherrygroveMart_Blocks:
LakeOfRageMart_Blocks:
INCBIN "maps/Mart.ablk"
Route10North_Blocks:
@ -363,6 +365,7 @@ CianwoodPokecenter1F_Blocks:
ViridianPokecenter1F_Blocks:
SaffronPokecenter1F_Blocks:
CherrygrovePokecenter1F_Blocks:
LakeOfRagePokecenter1F_Blocks:
INCBIN "maps/Pokecenter1F.ablk"
BetaPewterMuseumOfScience1F_Blocks: ; unreferenced

View file

@ -73,6 +73,9 @@ MapGroup_Mahogany:
map Route42, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
map Route44, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_44, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND
map MahoganyTown, TILESET_JOHTO, TOWN, LANDMARK_MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map LakeOfRageTraderHouse, TILESET_HOUSE, INDOOR, LANDMARK_OLIVINE_CITY, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map LakeOfRagePokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map LakeOfRageMart, TILESET_MART, INDOOR, LANDMARK_MAHOGANY_TOWN, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
assert_table_length NUM_MAHOGANY_MAPS
MapGroup_Dungeons:

View file

@ -494,3 +494,6 @@ INCLUDE "maps/CeruleanCave1F.asm"
INCLUDE "maps/CeruleanCave2F.asm"
INCLUDE "maps/CeruleanCaveB1F.asm"
INCLUDE "maps/SilentHills.asm"
INCLUDE "maps/LakeOfRageTraderHouse.asm"
INCLUDE "maps/LakeOfRagePokecenter1F.asm"
INCLUDE "maps/LakeOfRageMart.asm"