I dont understand why that was making the error it was but yeah okay I guess we're good here

This commit is contained in:
Zeta_Null 2024-10-23 02:11:35 -04:00
parent 8a8e17cf01
commit eb10621ac6
15 changed files with 43 additions and 14 deletions

View file

@ -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.

View file

@ -1309,3 +1309,6 @@ KantoSafariZoneArea2West_Blocks:
KantoSafariZoneArea3_Blocks:
INCBIN "maps/KantoSafariZoneArea3.ablk"
SavoyCity_Blocks:
INCBIN "maps/SavoyCity.ablk"

View file

@ -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@"

View file

@ -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

View file

@ -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:

View file

@ -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:

View file

@ -632,4 +632,5 @@ INCLUDE "maps/KantoSafariZoneArea1South.asm"
INCLUDE "maps/KantoSafariZoneArea1North.asm"
INCLUDE "maps/KantoSafariZoneArea2East.asm"
INCLUDE "maps/KantoSafariZoneArea2West.asm"
INCLUDE "maps/KantoSafariZoneArea3.asm"
INCLUDE "maps/KantoSafariZoneArea3.asm"
INCLUDE "maps/SavoyCity.asm"

View file

@ -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