From c724dd397779dd4036728a9d557bcb3821ed9ff8 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Tue, 29 Oct 2024 00:58:15 -0400 Subject: [PATCH] Route 53; needs refinement and lacks encounter data Right side of the map is visibly slightly cut off. Whoops. I'll probably adjust it later. Left side is fine, though. --- constants/landmark_constants.asm | 1 + constants/map_constants.asm | 1 + data/maps/attributes.asm | 6 +++++- data/maps/blocks.asm | 3 +++ data/maps/landmarks.asm | 2 ++ data/maps/maps.asm | 1 + data/maps/scripts.asm | 3 ++- data/tilesets/nihon_hightech_attributes.bin | Bin 1792 -> 1856 bytes data/tilesets/nihon_hightech_collision.asm | 4 ++++ data/tilesets/nihon_hightech_metatiles.bin | Bin 1792 -> 1856 bytes gfx/tilesets/nihon_hightech.png | Bin 3793 -> 4047 bytes maps/Route53.ablk | 2 +- 12 files changed, 20 insertions(+), 3 deletions(-) diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm index cd4f103..d3f7c03 100644 --- a/constants/landmark_constants.asm +++ b/constants/landmark_constants.asm @@ -140,6 +140,7 @@ DEF NIHON_LANDMARK EQU const_value const LANDMARK_SAVOY_CITY const LANDMARK_CORAL_CITY const LANDMARK_ROUTE_52 + const LANDMARK_ROUTE_53 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 1976ef7..899d276 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -676,6 +676,7 @@ ENDM newgroup CORAL_CITY ; 38 map_const CORAL_CITY, 20, 18 ; 1 map_const ROUTE_52, 25, 9 ; 2 + map_const ROUTE_53, 10, 27 ; 3 endgroup newgroup BLUE_FOREST ; 39 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 1d3b712..99a5c6d 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -897,9 +897,13 @@ ENDM map_attributes CoralCity, CORAL_CITY, $04, WEST connection west, Route52, ROUTE_52, 0 - map_attributes Route52, ROUTE_52, $05, EAST + map_attributes Route52, ROUTE_52, $05, WEST | EAST + connection west, Route53, ROUTE_53, -18 connection east, CoralCity, CORAL_CITY, 0 + map_attributes Route53, ROUTE_53, $04, EAST + connection east, Route52, ROUTE_52, 18 + 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 ab0ba23..5c76c25 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1319,3 +1319,6 @@ CoralCity_Blocks: Route52_Blocks: INCBIN "maps/Route52.ablk" + +Route53_Blocks: + INCBIN "maps/Route53.ablk" diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index 4994177..d22931d 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -144,6 +144,7 @@ Landmarks: landmark 60, 100, SavoyCityName landmark 36, 92, CoralCityName landmark 24, 92, Route52Name + landmark 12, 84, Route53Name landmark 140, 60, BlueForestName landmark 108, 108, Route66Name landmark 124, 108, WhiteCityName @@ -269,6 +270,7 @@ Route66Name: db "ROUTE 66@" Route49Name: db "ROUTE 49@" Route50Name: db "ROUTE 50@" Route52Name: db "ROUTE 52@" +Route53Name: db "ROUTE 53@" QuietCaveName: db "QUIET¯CAVE@" OldCityName: db "SEPIA¯CITY@" PokemonPagodaName: db "#MON¯PAGODA@" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 8aeb27f..b7be623 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -740,6 +740,7 @@ 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 map Route52, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_52, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map Route53, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_53, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE assert_table_length NUM_CORAL_CITY_MAPS MapGroup_BlueForest: diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index b852f52..d277758 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -636,4 +636,5 @@ INCLUDE "maps/KantoSafariZoneArea3.asm" INCLUDE "maps/SavoyCity.asm" INCLUDE "maps/Route50SavoyCityGate.asm" INCLUDE "maps/CoralCity.asm" -INCLUDE "maps/Route52.asm" \ No newline at end of file +INCLUDE "maps/Route52.asm" +INCLUDE "maps/Route53.asm" \ No newline at end of file diff --git a/data/tilesets/nihon_hightech_attributes.bin b/data/tilesets/nihon_hightech_attributes.bin index 614cfce076432eff268d0467f2d09574a5310021..b6b383eb273beea673b5b63b13757834e26ab9bb 100644 GIT binary patch delta 71 ZcmZqRJHWSq-GPIFfq@hZR1OCqeE_QA0;~W4 delta 6 NcmX@W*TA=c9RLVD0t5g6 diff --git a/data/tilesets/nihon_hightech_collision.asm b/data/tilesets/nihon_hightech_collision.asm index 6aedb73..249558f 100644 --- a/data/tilesets/nihon_hightech_collision.asm +++ b/data/tilesets/nihon_hightech_collision.asm @@ -110,3 +110,7 @@ tilecoll WALL, WALL, WALL, WALL ; 6d tilecoll WALL, WALL, WALL, WALL ; 6e tilecoll WALL, WALL, WALL, WALL ; 6f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 70 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 73 diff --git a/data/tilesets/nihon_hightech_metatiles.bin b/data/tilesets/nihon_hightech_metatiles.bin index 7c03be74572f0fd58a404370f160301e2a21f4cc..25a8cf2cdfd2ab1e6aac91dddd26e4474753f551 100644 GIT binary patch delta 71 ucmZqRJHWSq-NA=}jlqYFfel96xGK0J^I_s3I>s{C5~!2`h}b|hNF4xd$_N<% delta 6 NcmX@W*TA=c9RLVD0t5g6 diff --git a/gfx/tilesets/nihon_hightech.png b/gfx/tilesets/nihon_hightech.png index 2909987e7eba5e4722ed88d7885f245fc3004a91..b5d1874c791ff88f3d77b7b6f2eb4dcd8450178b 100644 GIT binary patch delta 3817 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 F{srh_7~}u| diff --git a/maps/Route53.ablk b/maps/Route53.ablk index 4533aac..6400487 100644 --- a/maps/Route53.ablk +++ b/maps/Route53.ablk @@ -1 +1 @@ -lllllllllllmnolllllllijklllllllijkllllllfhgll^]\^_aeeeee`__a`__aeeeee`__a`__aeeeee`__a`__aeeeee`_[cSSS`_?`_?`_?`_?===SSSb[?d(?===;?99OOOXW???OYOOO&&&&&&Z \ No newline at end of file +lllllllllllmnolllllllijklllllllijkllllllfhgll^]\^_aeeeee`__a`__aeeeee`__a`__aeeeee`__a`__aeeeee`_[cSSSs`_?p`_?p`_?p`_?===rSSb[?d(?===;?99qOOXW?p?p?pOYOOO&&&&&&Z \ No newline at end of file