Stalls + map tweaks

This commit is contained in:
Zeta_Null 2025-07-24 16:12:29 -04:00
parent 68d457d4e4
commit 95b59dfa8d
19 changed files with 62 additions and 31 deletions

View file

@ -56,10 +56,11 @@ MapGroupPointers::
dw MapGroup_SavoyCity ; 37
dw MapGroup_CoralCity ; 38
dw MapGroup_RuddyTown ; 39
dw MapGroup_SunglowCity ; 40
dw MapGroup_BlueForest ; 41
dw MapGroup_Aventurine ; 42
dw MapGroup_WhiteCity ; 43
dw MapGroup_OchreTown ; 40
dw MapGroup_SunglowCity ; 41
dw MapGroup_BlueForest ; 42
dw MapGroup_Aventurine ; 43
dw MapGroup_WhiteCity ; 44
assert_table_length NUM_MAP_GROUPS
MapGroup_Olivine:
@ -763,11 +764,15 @@ MapGroup_RuddyTown:
map RuddyTownBigHouse1, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_RUDDY_TOWN, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map RuddyTownBigHouse2, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_RUDDY_TOWN, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map Route52RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_52, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE
map Route53RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE ; needs new landmark when route is made
map Route54RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE ; see above
map Route53, TILESET_NIHON_FONT, ROUTE, LANDMARK_ROUTE_53, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
map Route53RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_53, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE
map Route54RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE ; needs new landmark when route is made
assert_table_length NUM_RUDDY_TOWN_MAPS
MapGroup_OchreTown:
table_width MAP_LENGTH, MapGroup_OchreTown
map Route53, TILESET_NIHON_FONT, ROUTE, LANDMARK_ROUTE_53, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
assert_table_length NUM_OCHRE_TOWN_MAPS
MapGroup_SunglowCity:
table_width MAP_LENGTH, MapGroup_SunglowCity
map Route57, TILESET_NIHON_BIRDON, ROUTE, LANDMARK_ROUTE_57, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

View file

@ -43,6 +43,7 @@ OutdoorSprites:
dw SavoyCityGroupSprites
dw CoralCityGroupSprites
dw RuddyTownGroupSprites
dw OchreTownGroupSprites
dw SunglowCityGroupSprites
dw BlueForestGroupSprites
dw AventurineCityGroupSprites
@ -338,6 +339,7 @@ BlueForestGroupSprites: ; Will have its own thing eventually
SunglowCityGroupSprites: ; Ditto
AventurineCityGroupSprites: ; Ditto
WhiteCityGroupSprites: ; Ditto
OchreTownGroupSprites: ; Ditto
NewBarkGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY

View file

@ -51,10 +51,11 @@ MapGroupRoofs:
db ROOF_NEW_BARK ; 37 (Savoy City)
db ROOF_NEW_BARK ; 38 (Coral City)
db ROOF_NEW_BARK ; 39 (Ruddy Town)
db ROOF_NEW_BARK ; 40 (Sunglow City)
db ROOF_NEW_BARK ; 41 (Blue Forest)
db ROOF_NEW_BARK ; 42 (Aventurine City)
db ROOF_NEW_BARK ; 43 (White City)
db ROOF_NEW_BARK ; 40 (Ochre Town)
db ROOF_NEW_BARK ; 41 (Sunglow City)
db ROOF_NEW_BARK ; 42 (Blue Forest)
db ROOF_NEW_BARK ; 43 (Aventurine City)
db ROOF_NEW_BARK ; 44 (White City)
assert_table_length NUM_MAP_GROUPS + 1
Roofs:

View file

@ -43,6 +43,7 @@ MapGroupRoofSGBPalInds:
db PREDEFPAL_SAVOY_CITY
db PREDEFPAL_CORAL_CITY
db PREDEFPAL_RUDDY_TOWN
db PREDEFPAL_OCHRE_TOWN
db PREDEFPAL_SUNGLOW_CITY
db PREDEFPAL_BLUE_FOREST
db PREDEFPAL_AVENTURINE
@ -92,6 +93,7 @@ MapGroupRoofSGBPalIndsMorn:
db PREDEFPAL_SAVOY_CITY_MORN
db PREDEFPAL_CORAL_CITY_MORN
db PREDEFPAL_RUDDY_TOWN_MORN
db PREDEFPAL_OCHRE_TOWN_MORN
db PREDEFPAL_SUNGLOW_CITY_MORN
db PREDEFPAL_BLUE_FOREST_MORN
db PREDEFPAL_AVENTURINE_MORN