Coral City (High-Tech)

This commit is contained in:
Zeta_Null 2024-10-24 18:12:34 -04:00
parent 71739fddc2
commit 7a6d9b3b46
20 changed files with 145 additions and 13 deletions

View file

@ -894,6 +894,8 @@ ENDM
map_attributes SavoyCity, SAVOY_CITY, $15, 0
map_attributes Route50SavoyCityGate, ROUTE_50_SAVOY_CITY_GATE, $00, 0
map_attributes CoralCity, CORAL_CITY, $04, 0
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
map_attributes WhiteCity, WHITE_CITY, $01, 0 ; this is on its own for now. add connections later.

View file

@ -1313,3 +1313,6 @@ KantoSafariZoneArea3_Blocks:
SavoyCity_Blocks:
INCBIN "maps/SavoyCity.ablk"
CoralCity_Blocks:
INCBIN "maps/CoralCity.ablk"

View file

@ -142,6 +142,7 @@ Landmarks:
landmark 76, 100, PokemonPagodaName
landmark 68, 100, Route50Name
landmark 60, 100, SavoyCityName
landmark 36, 92, CoralCityName
landmark 140, 60, BlueForestName
landmark 108, 108, Route66Name
landmark 124, 108, WhiteCityName
@ -270,6 +271,6 @@ QuietCaveName: db "QUIET¯CAVE@"
OldCityName: db "SEPIA¯CITY@"
PokemonPagodaName: db "#MON¯PAGODA@"
SavoyCityName: db "SAVOY¯CITY@"
; High Tech will be called "Vogue City"
CoralCityName: db "CORAL¯CITY@"
BlueForestName: db "BLUE¯FOREST@"
WhiteCityName: db "WHITE¯CITY@"

View file

@ -54,8 +54,9 @@ MapGroupPointers::
dw MapGroup_SilentHills ; 35
dw MapGroup_OldCity ; 36
dw MapGroup_SavoyCity ; 37
dw MapGroup_BlueForest ; 38
dw MapGroup_WhiteCity ; 39
dw MapGroup_CoralCity ; 38
dw MapGroup_BlueForest ; 39
dw MapGroup_WhiteCity ; 40
assert_table_length NUM_MAP_GROUPS
MapGroup_Olivine:
@ -734,6 +735,11 @@ MapGroup_SavoyCity:
map SavoyCity, TILESET_NIHON_WEST, TOWN, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map Route50SavoyCityGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE
assert_table_length NUM_SAVOY_CITY_MAPS
MapGroup_CoralCity:
table_width MAP_LENGTH, MapGroup_CoralCity
map CoralCity, TILESET_NIHON_HIGHTECH, TOWN, LANDMARK_CORAL_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_CORAL_CITY_MAPS
MapGroup_BlueForest:
table_width MAP_LENGTH, MapGroup_BlueForest

View file

@ -41,6 +41,7 @@ OutdoorSprites:
dw SilentHillsGroupSprites
dw OldCityGroupSprites
dw SavoyCityGroupSprites
dw CoralCityGroupSprites
dw BlueForestGroupSprites
dw WhiteCityGroupSprites
assert_table_length NUM_MAP_GROUPS
@ -330,8 +331,9 @@ IndigoGroupSprites:
db SPRITE_POKE_BALL
db SPRITE_BOULDER
SavoyCityGroupSprites: ; Ditto
BlueForestGroupSprites: ; Will have its own thing eventually
SavoyCityGroupSprites: ; Will have its own thing eventually
CoralCityGroupSprites: ; Ditto
BlueForestGroupSprites: ; Ditto
WhiteCityGroupSprites: ; Ditto
NewBarkGroupSprites:
db SPRITE_SUICUNE

View file

@ -49,8 +49,9 @@ MapGroupRoofs:
db ROOF_NEW_BARK ; 35 (Silent Hills)
db ROOF_VIOLET ; 36 (Old City)
db ROOF_NEW_BARK ; 37 (Savoy City)
db ROOF_NEW_BARK ; 38 (Blue Forest)
db ROOF_NEW_BARK ; 39 (White City)
db ROOF_NEW_BARK ; 38 (Coral City)
db ROOF_NEW_BARK ; 39 (Blue Forest)
db ROOF_NEW_BARK ; 40 (White City)
assert_table_length NUM_MAP_GROUPS + 1
Roofs:

View file

@ -634,4 +634,5 @@ INCLUDE "maps/KantoSafariZoneArea2East.asm"
INCLUDE "maps/KantoSafariZoneArea2West.asm"
INCLUDE "maps/KantoSafariZoneArea3.asm"
INCLUDE "maps/SavoyCity.asm"
INCLUDE "maps/Route50SavoyCityGate.asm"
INCLUDE "maps/Route50SavoyCityGate.asm"
INCLUDE "maps/CoralCity.asm"

View file

@ -41,6 +41,7 @@ MapGroupRoofSGBPalInds:
db PREDEFPAL_SILENT_HILLS
db PREDEFPAL_OLD_CITY
db PREDEFPAL_SAVOY_CITY
db PREDEFPAL_CORAL_CITY
db PREDEFPAL_BLUE_FOREST
db PREDEFPAL_WHITE_CITY
assert_table_length NUM_MAP_GROUPS + 1