Snowy tileset palettes + Blue Forest start

This commit is contained in:
Zeta_Null 2023-11-03 17:34:54 -04:00
parent 2a3547c22e
commit e9cab6db16
23 changed files with 111 additions and 12 deletions

View file

@ -711,3 +711,4 @@ ENDM
map_attributes SilentHills, SILENT_HILLS, $00, 0 ; this is on its own for now. add connections to mt. silver later.
map_attributes DebugRoom, DEBUG_ROOM, $05, 0 ; Debug Room :V
map_attributes CliffCave, CLIFF_CAVE, $00, 0
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.

View file

@ -1083,3 +1083,6 @@ DebugRoom_Blocks: ; Pipis Room
CliffCave_Blocks:
INCBIN "maps/CliffCave.ablk"
BlueForest_Blocks:
INCBIN "maps/BlueForest.ablk"

View file

@ -109,6 +109,7 @@ Landmarks:
landmark 140, 116, FastShipName
assert_table_length NIHON_LANDMARK
landmark 92, 108, SilentHillsName
landmark 140, 60, BlueForestName
assert_table_length NUM_LANDMARKS
NewBarkTownName: db "NEW BARK¯TOWN@"
@ -215,3 +216,4 @@ UndergroundName: db "UNDERGROUND@"
BattleTowerName: db "BATTLE¯TOWER@"
SpecialMapName: db "SPECIAL@"
SilentHillsName: db "SILENT¯HILLS@"
BlueForestName: db "BLUE¯FOREST@"

View file

@ -44,6 +44,7 @@ MapGroupPointers::
dw MapGroup_Saffron ; 25
dw MapGroup_Cherrygrove ; 26
dw MapGroup_SilentHills ; 27
dw MapGroup_BlueForest ; 28
assert_table_length NUM_MAP_GROUPS
MapGroup_Olivine:
@ -557,3 +558,8 @@ MapGroup_SilentHills:
map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
map DebugRoom, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_MORN, FISHGROUP_SHORE
assert_table_length NUM_SILENT_HILLS_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
assert_table_length NUM_BLUE_FOREST_MAPS

View file

@ -31,6 +31,7 @@ OutdoorSprites:
dw SaffronGroupSprites
dw CherrygroveGroupSprites
dw SilentHillsGroupSprites
dw BlueForestGroupSprites
assert_table_length NUM_MAP_GROUPS
PalletGroupSprites:
@ -309,6 +310,7 @@ IndigoGroupSprites:
db SPRITE_BOULDER
SilentHillsGroupSprites: ; Will have its own thing eventually
BlueForestGroupSprites: ; Will have its own thing eventually
NewBarkGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY

View file

@ -39,6 +39,7 @@ MapGroupRoofs:
db -1 ; 25
db ROOF_NEW_BARK ; 26 (Cherrygrove)
db ROOF_NEW_BARK ; 27 (Silent Hills)
db ROOF_NEW_BARK ; 28 (Blue Forest)
assert_table_length NUM_MAP_GROUPS + 1
Roofs:

View file

@ -500,3 +500,4 @@ INCLUDE "maps/LakeOfRageMart.asm"
INCLUDE "maps/LakeOfRagePrycesHouse.asm"
INCLUDE "maps/DebugRoom.asm"
INCLUDE "maps/CliffCave.asm"
INCLUDE "maps/BlueForest.asm"

View file

@ -31,4 +31,5 @@ MapGroupRoofSGBPalInds:
db PREDEFPAL_SAFFRON
db PREDEFPAL_CHERRYGROVE
db PREDEFPAL_SILENT_HILLS
db PREDEFPAL_BLUE_FOREST
assert_table_length NUM_MAP_GROUPS + 1