Route 52 (Needs encounter data)

This commit is contained in:
Zeta_Null 2024-10-28 15:32:57 -04:00
parent fd15675a67
commit cf1489967f
12 changed files with 15 additions and 2 deletions

View file

@ -139,6 +139,7 @@ DEF NIHON_LANDMARK EQU const_value
const LANDMARK_ROUTE_50 const LANDMARK_ROUTE_50
const LANDMARK_SAVOY_CITY const LANDMARK_SAVOY_CITY
const LANDMARK_CORAL_CITY const LANDMARK_CORAL_CITY
const LANDMARK_ROUTE_52
const LANDMARK_BLUE_FOREST const LANDMARK_BLUE_FOREST
const LANDMARK_ROUTE_66 const LANDMARK_ROUTE_66
const LANDMARK_WHITE_CITY const LANDMARK_WHITE_CITY

View file

@ -675,6 +675,7 @@ ENDM
newgroup CORAL_CITY ; 38 newgroup CORAL_CITY ; 38
map_const CORAL_CITY, 20, 18 ; 1 map_const CORAL_CITY, 20, 18 ; 1
map_const ROUTE_52, 25, 9 ; 2
endgroup endgroup
newgroup BLUE_FOREST ; 39 newgroup BLUE_FOREST ; 39

View file

@ -894,7 +894,11 @@ ENDM
map_attributes SavoyCity, SAVOY_CITY, $15, 0 map_attributes SavoyCity, SAVOY_CITY, $15, 0
map_attributes Route50SavoyCityGate, ROUTE_50_SAVOY_CITY_GATE, $00, 0 map_attributes Route50SavoyCityGate, ROUTE_50_SAVOY_CITY_GATE, $00, 0
map_attributes CoralCity, CORAL_CITY, $04, 0 map_attributes CoralCity, CORAL_CITY, $04, WEST
connection west, Route52, ROUTE_52, 0
map_attributes Route52, ROUTE_52, $05, EAST
connection east, CoralCity, CORAL_CITY, 0
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later. map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.

View file

@ -1316,3 +1316,6 @@ SavoyCity_Blocks:
CoralCity_Blocks: CoralCity_Blocks:
INCBIN "maps/CoralCity.ablk" INCBIN "maps/CoralCity.ablk"
Route52_Blocks:
INCBIN "maps/Route52.ablk"

View file

@ -143,6 +143,7 @@ Landmarks:
landmark 68, 100, Route50Name landmark 68, 100, Route50Name
landmark 60, 100, SavoyCityName landmark 60, 100, SavoyCityName
landmark 36, 92, CoralCityName landmark 36, 92, CoralCityName
landmark 24, 92, Route52Name
landmark 140, 60, BlueForestName landmark 140, 60, BlueForestName
landmark 108, 108, Route66Name landmark 108, 108, Route66Name
landmark 124, 108, WhiteCityName landmark 124, 108, WhiteCityName
@ -267,6 +268,7 @@ UnknownName: db "?????@"
Route66Name: db "ROUTE 66@" Route66Name: db "ROUTE 66@"
Route49Name: db "ROUTE 49@" Route49Name: db "ROUTE 49@"
Route50Name: db "ROUTE 50@" Route50Name: db "ROUTE 50@"
Route52Name: db "ROUTE 52@"
QuietCaveName: db "QUIET¯CAVE@" QuietCaveName: db "QUIET¯CAVE@"
OldCityName: db "SEPIA¯CITY@" OldCityName: db "SEPIA¯CITY@"
PokemonPagodaName: db "#MON¯PAGODA@" PokemonPagodaName: db "#MON¯PAGODA@"

View file

@ -739,6 +739,7 @@ MapGroup_SavoyCity:
MapGroup_CoralCity: MapGroup_CoralCity:
table_width MAP_LENGTH, 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 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
assert_table_length NUM_CORAL_CITY_MAPS assert_table_length NUM_CORAL_CITY_MAPS
MapGroup_BlueForest: MapGroup_BlueForest:

View file

@ -636,3 +636,4 @@ INCLUDE "maps/KantoSafariZoneArea3.asm"
INCLUDE "maps/SavoyCity.asm" INCLUDE "maps/SavoyCity.asm"
INCLUDE "maps/Route50SavoyCityGate.asm" INCLUDE "maps/Route50SavoyCityGate.asm"
INCLUDE "maps/CoralCity.asm" INCLUDE "maps/CoralCity.asm"
INCLUDE "maps/Route52.asm"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB