diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm index 52e6d1d..c8ccbc1 100644 --- a/constants/landmark_constants.asm +++ b/constants/landmark_constants.asm @@ -137,6 +137,7 @@ DEF NIHON_LANDMARK EQU const_value const LANDMARK_OLD_CITY const LANDMARK_POKEMON_PAGODA const LANDMARK_ROUTE_50 + const LANDMARK_SAVOY_CITY const LANDMARK_BLUE_FOREST const LANDMARK_ROUTE_66 const LANDMARK_WHITE_CITY diff --git a/constants/map_constants.asm b/constants/map_constants.asm index e1be798..565bdd8 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -668,13 +668,17 @@ ENDM map_const JACKYS_HOUSE, 4, 4 ; 16 endgroup - newgroup BLUE_FOREST ; 37 + newgroup SAVOY_CITY ; 37 + map_const SAVOY_CITY, 20, 18 ; 1 + endgroup + + newgroup BLUE_FOREST ; 38 map_const BLUE_FOREST, 20, 18 ; 1 endgroup - newgroup WHITE_CITY ; 38 + newgroup WHITE_CITY ; 39 map_const WHITE_CITY, 30, 27 ; 1 map_const ROUTE_66_WHITE_CITY_GATE, 5, 4 ; 2 endgroup -DEF NUM_MAP_GROUPS EQU const_value ; 38 +DEF NUM_MAP_GROUPS EQU const_value ; 39 diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm index 28fc4f3..9a2b0f3 100644 --- a/constants/scgb_constants.asm +++ b/constants/scgb_constants.asm @@ -81,6 +81,7 @@ DEF SCGB_DEFAULT EQU $ff const PREDEFPAL_SEVEN_ISLAND const PREDEFPAL_SILENT_HILLS const PREDEFPAL_OLD_CITY + const PREDEFPAL_SAVOY_CITY const PREDEFPAL_BLUE_FOREST const PREDEFPAL_WHITE_CITY const PREDEFPAL_NITE diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 51cf634..c050525 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -891,6 +891,8 @@ ENDM connection north, KantoSafariZoneArea2West, KANTO_SAFARI_ZONE_AREA2_WEST, 10 connection east, KantoSafariZoneCenter, KANTO_SAFARI_ZONE_CENTER, 2 + map_attributes SavoyCity, SAVOY_CITY, $15, 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. diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 2f8c3e1..d642faa 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1309,3 +1309,6 @@ KantoSafariZoneArea2West_Blocks: KantoSafariZoneArea3_Blocks: INCBIN "maps/KantoSafariZoneArea3.ablk" + +SavoyCity_Blocks: + INCBIN "maps/SavoyCity.ablk" diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index e61efd1..52a994b 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -140,7 +140,8 @@ Landmarks: landmark 76, 108, QuietCaveName landmark 76, 100, OldCityName landmark 76, 100, PokemonPagodaName - landmark 60, 100, Route50Name + landmark 68, 100, Route50Name + landmark 60, 100, SavoyCityName landmark 140, 60, BlueForestName landmark 108, 108, Route66Name landmark 124, 108, WhiteCityName @@ -268,6 +269,7 @@ Route50Name: db "ROUTE 50@" QuietCaveName: db "QUIET¯CAVE@" OldCityName: db "SEPIA¯CITY@" PokemonPagodaName: db "#MON¯PAGODA@" +SavoyCityName: db "SAVOY¯CITY@" ; High Tech will be called "Vogue City" BlueForestName: db "BLUE¯FOREST@" WhiteCityName: db "WHITE¯CITY@" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 09dfefb..79de4eb 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -53,8 +53,9 @@ MapGroupPointers:: dw MapGroup_SevenIsland ; 34 dw MapGroup_SilentHills ; 35 dw MapGroup_OldCity ; 36 - dw MapGroup_BlueForest ; 37 - dw MapGroup_WhiteCity ; 38 + dw MapGroup_SavoyCity ; 37 + dw MapGroup_BlueForest ; 38 + dw MapGroup_WhiteCity ; 39 assert_table_length NUM_MAP_GROUPS MapGroup_Olivine: @@ -728,6 +729,11 @@ MapGroup_OldCity: map JackysHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_50, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE assert_table_length NUM_OLD_CITY_MAPS +MapGroup_SavoyCity: + table_width MAP_LENGTH, MapGroup_SavoyCity + map SavoyCity, TILESET_NIHON_WEST, TOWN, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, TRUE, PALETTE_AUTO, FISHGROUP_SHORE + assert_table_length NUM_SAVOY_CITY_MAPS + MapGroup_BlueForest: table_width MAP_LENGTH, MapGroup_BlueForest map BlueForest, TILESET_NIHON_SNOWY, TOWN, LANDMARK_BLUE_FOREST, MUSIC_SINJOH_RUINS, TRUE, PALETTE_AUTO, FISHGROUP_SHORE diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm index 63d598e..5762c8a 100644 --- a/data/maps/outdoor_sprites.asm +++ b/data/maps/outdoor_sprites.asm @@ -40,6 +40,7 @@ OutdoorSprites: dw SevenIslandGroupSprites dw SilentHillsGroupSprites dw OldCityGroupSprites + dw SavoyCityGroupSprites dw BlueForestGroupSprites dw WhiteCityGroupSprites assert_table_length NUM_MAP_GROUPS @@ -329,6 +330,7 @@ IndigoGroupSprites: db SPRITE_POKE_BALL db SPRITE_BOULDER +SavoyCityGroupSprites: ; Ditto BlueForestGroupSprites: ; Will have its own thing eventually WhiteCityGroupSprites: ; Ditto NewBarkGroupSprites: diff --git a/data/maps/roofs.asm b/data/maps/roofs.asm index 7048610..f452b7c 100644 --- a/data/maps/roofs.asm +++ b/data/maps/roofs.asm @@ -48,8 +48,9 @@ MapGroupRoofs: db ROOF_AZALEA ; 34 (Seven Island) db ROOF_NEW_BARK ; 35 (Silent Hills) db ROOF_VIOLET ; 36 (Old City) - db ROOF_NEW_BARK ; 37 (Blue Forest) - db ROOF_NEW_BARK ; 38 (White City) + db ROOF_NEW_BARK ; 37 (Savoy City) + db ROOF_NEW_BARK ; 38 (Blue Forest) + db ROOF_NEW_BARK ; 39 (White City) assert_table_length NUM_MAP_GROUPS + 1 Roofs: diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index c627330..6533828 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -632,4 +632,5 @@ INCLUDE "maps/KantoSafariZoneArea1South.asm" INCLUDE "maps/KantoSafariZoneArea1North.asm" INCLUDE "maps/KantoSafariZoneArea2East.asm" INCLUDE "maps/KantoSafariZoneArea2West.asm" -INCLUDE "maps/KantoSafariZoneArea3.asm" \ No newline at end of file +INCLUDE "maps/KantoSafariZoneArea3.asm" +INCLUDE "maps/SavoyCity.asm" \ No newline at end of file diff --git a/data/maps/sgb_roof_pal_inds.asm b/data/maps/sgb_roof_pal_inds.asm index 95f4c13..fce47f9 100644 --- a/data/maps/sgb_roof_pal_inds.asm +++ b/data/maps/sgb_roof_pal_inds.asm @@ -40,6 +40,7 @@ MapGroupRoofSGBPalInds: db PREDEFPAL_SEVEN_ISLAND db PREDEFPAL_SILENT_HILLS db PREDEFPAL_OLD_CITY + db PREDEFPAL_SAVOY_CITY db PREDEFPAL_BLUE_FOREST db PREDEFPAL_WHITE_CITY assert_table_length NUM_MAP_GROUPS + 1 diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index 228ed1a..bab2395 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -33,6 +33,7 @@ RGB 31,31,31, 29,21,31, 15,20,31, 00,00,00 ; PREDEFPAL_SEVEN_ISLAND RGB 31,31,31, 12,28,22, 15,20,20, 00,00,00 ; PREDEFPAL_SILENT_HILLS RGB 31,31,31, 21,14,09, 15,20,20, 00,00,00 ; PREDEFPAL_OLD_CITY (31,31,31, 25,20,16, 15,20,31, 00,00,00 for Final-style colors) + RGB 31,31,31, 19,20,25, 15,20,20, 00,00,00 ; PREDEFPAL_SAVOY_CITY RGB 31,31,31, 18,14,31, 15,20,20, 00,00,00 ; PREDEFPAL_BLUE_FOREST (31,31,31, 22,19,31, 15,20,31, 00,00,00 for Final-style colors) RGB 31,31,31, 27,27,29, 15,20,20, 00,00,00 ; PREDEFPAL_WHITE_CITY RGB 31,31,31, 12,28,22, 15,20,20, 00,00,00 ; PREDEFPAL_NITE diff --git a/gfx/tilesets/roofs.pal b/gfx/tilesets/roofs.pal index fad2361..f1285c9 100644 --- a/gfx/tilesets/roofs.pal +++ b/gfx/tilesets/roofs.pal @@ -139,10 +139,14 @@ RGB 25,13,07, 20,06,00 ; morn/day RGB 12,07,02, 09,04,02 ; nite -; group 29 (Blue Forest) +; group 29 (Savoy City) + RGB 21,22,25, 13,12,31 ; morn/day + RGB 11,09,19, 04,03,18 ; nite + +; group 30 (Blue Forest) RGB 24,22,31, 18,14,31 ; morn/day RGB 12,10,24, 08,03,23 ; nite -; group 30 (White City) +; group 31 (White City) RGB 27,28,31, 24,24,26 ; morn/day RGB 13,12,24, 11,09,22 ; nite diff --git a/maps/Route50.asm b/maps/Route50.asm index 9586850..24d3c00 100644 --- a/maps/Route50.asm +++ b/maps/Route50.asm @@ -117,7 +117,7 @@ Route50_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 6, 5, DEBUG_ROOM, 1 ; West Gate + warp_event 6, 5, SAVOY_CITY, 1 ; West Gate warp_event 15, 4, JACKYS_HOUSE, 1 ; Game House def_coord_events diff --git a/maps/SavoyCity.ablk b/maps/SavoyCity.ablk index e8d4835..ef952cd 100644 --- a/maps/SavoyCity.ablk +++ b/maps/SavoyCity.ablk @@ -1,3 +1,3 @@ -89:@AAB89:HIJKT] DE<=>LMNOC;W$%3& PQRS?22222$3%66\67$'01% W# 45" ()))W !,---W ' +++++++++++** //+++.. ..W W ' +89:@AAB89:HIJKT] DE<=>LMNOC;W$%3& PQRS?22222$3&66\67$'01%"W# 45" ()))W !,---W ' +++++++++++** //+++.. ..W W ' !! - W$%%%%%W#$%%%%%&W#GTUVTUV#XYZYYYYYYYYYXYZ# \ No newline at end of file + "W$%%%%&W#$%%%%%&W#GTUVTUV#XYZYYYYYYYYYXYZ# \ No newline at end of file