Kanto Safari Zone Maps finished. Also whoops I forgot to include the maps last time

constants/map_constants.asm

@@ -379,6 +379,7 @@ ENDM
 	map_const KANTO_SAFARI_ZONE_AREA1_NORTH,               15,  4 ; 17
 	map_const KANTO_SAFARI_ZONE_AREA2_EAST,                11, 20 ; 18
 	map_const KANTO_SAFARI_ZONE_AREA2_WEST,                 9, 18 ; 19
+	map_const KANTO_SAFARI_ZONE_AREA3,           	       15, 13 ; 20
 	endgroup
 
 	newgroup LAVENDER                                             ; 18

data/maps/attributes.asm

@@ -865,8 +865,9 @@ ENDM
 	map_attributes JackysHouse, JACKYS_HOUSE, $00, 0
 	map_attributes SummerBeachHouse, SUMMER_BEACH_HOUSE, $00, 0
 	
-	map_attributes KantoSafariZoneCenter, KANTO_SAFARI_ZONE_CENTER, $05, NORTH | EAST
+	map_attributes KantoSafariZoneCenter, KANTO_SAFARI_ZONE_CENTER, $05, NORTH | WEST | EAST
 	connection north, KantoSafariZoneArea2East, KANTO_SAFARI_ZONE_AREA2_EAST, 4
+	connection west, KantoSafariZoneArea3, KANTO_SAFARI_ZONE_AREA3, -2
 	connection east, KantoSafariZoneArea1South, KANTO_SAFARI_ZONE_AREA1_SOUTH, -2
 	
 	map_attributes KantoSafariZoneArea1South, KANTO_SAFARI_ZONE_AREA1_SOUTH, $05, NORTH | WEST
@@ -882,9 +883,14 @@ ENDM
 	connection west, KantoSafariZoneArea2West, KANTO_SAFARI_ZONE_AREA2_WEST, 0
 	connection east, KantoSafariZoneArea1North, KANTO_SAFARI_ZONE_AREA1_NORTH, 14
 	
-	map_attributes KantoSafariZoneArea2West, KANTO_SAFARI_ZONE_AREA2_WEST, $05, EAST
+	map_attributes KantoSafariZoneArea2West, KANTO_SAFARI_ZONE_AREA2_WEST, $05, SOUTH | EAST
+	connection south, KantoSafariZoneArea3, KANTO_SAFARI_ZONE_AREA3, -10
 	connection east, KantoSafariZoneArea2East, KANTO_SAFARI_ZONE_AREA2_EAST, 0
 	
+	map_attributes KantoSafariZoneArea3, KANTO_SAFARI_ZONE_AREA3, $05, NORTH | EAST
+	connection north, KantoSafariZoneArea2West, KANTO_SAFARI_ZONE_AREA2_WEST, 10
+	connection east, KantoSafariZoneCenter, KANTO_SAFARI_ZONE_CENTER, 2
+	
 	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.

data/maps/blocks.asm

@@ -1306,3 +1306,6 @@ KantoSafariZoneArea2East_Blocks:
 
 KantoSafariZoneArea2West_Blocks:
 	INCBIN "maps/KantoSafariZoneArea2West.ablk"
+
+KantoSafariZoneArea3_Blocks:
+	INCBIN "maps/KantoSafariZoneArea3.ablk"

data/maps/maps.asm

@@ -413,11 +413,12 @@ MapGroup_Fuchsia:
 	map SafariZoneWardensHome, TILESET_HOUSE, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map Route15FuchsiaGate, TILESET_GATE, GATE, LANDMARK_ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map SummerBeachHouse, TILESET_HOUSE, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
-	map KantoSafariZoneCenter, TILESET_FOREST_KANTO, FOREST, LANDMARK_FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI
+	map KantoSafariZoneCenter, TILESET_FOREST_KANTO, FOREST, LANDMARK_KANTO_SAFARI_ZONE, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI
-	map KantoSafariZoneArea1South, TILESET_FOREST_KANTO, FOREST, LANDMARK_FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI
+	map KantoSafariZoneArea1South, TILESET_FOREST_KANTO, FOREST, LANDMARK_KANTO_SAFARI_ZONE, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI
-	map KantoSafariZoneArea1North, TILESET_FOREST_KANTO, FOREST, LANDMARK_FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI
+	map KantoSafariZoneArea1North, TILESET_FOREST_KANTO, FOREST, LANDMARK_KANTO_SAFARI_ZONE, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI
-	map KantoSafariZoneArea2East, TILESET_FOREST_KANTO, FOREST, LANDMARK_FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI
+	map KantoSafariZoneArea2East, TILESET_FOREST_KANTO, FOREST, LANDMARK_KANTO_SAFARI_ZONE, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI
-	map KantoSafariZoneArea2West, TILESET_FOREST_KANTO, FOREST, LANDMARK_FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI
+	map KantoSafariZoneArea2West, TILESET_FOREST_KANTO, FOREST, LANDMARK_KANTO_SAFARI_ZONE, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI
+	map KantoSafariZoneArea3, TILESET_FOREST_KANTO, FOREST, LANDMARK_KANTO_SAFARI_ZONE, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI
 	assert_table_length NUM_FUCHSIA_MAPS
 
 MapGroup_Lavender:

data/maps/scripts.asm

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

data/tilesets/forest_kanto_collision.asm

@@ -120,3 +120,6 @@
 	tilecoll WALL, WALL, WALL, FLOOR ; 77
 	tilecoll FLOOR, WALL, WALL, WALL ; 78
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 79
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 7a
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 7b
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 7c

maps/KantoSafariZoneArea2East.ablk

@@ -0,0 +1 @@
+555555qqqq]


V)YQRA5555))
ZoA


]
X)W

A]


X)W
AvvvvvvvX)
A
]
accg



]
`jdh
]




UZeh


]

ehcccg



]ehlijk
]
ehh))Waccccfhk)))`jiiiikX)))2
]
Zs
X))W


Ut]
XY]

]suZp5555ZUZ

maps/KantoSafariZoneArea2East.asm

@@ -0,0 +1,17 @@
+	object_const_def
+
+KantoSafariZoneArea2East_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+KantoSafariZoneArea2East_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events

maps/KantoSafariZoneArea2West.ablk

@@ -0,0 +1,7 @@
+55555555@VWVW
]
@X))YA55@V))WA
XYX

]
@
]

+)W@



+)W@@]
Z))Y@@

+XYX
@@

+


@@
A
]
]ac@
AVV)Wey@x)
)ey@
A)
+Y`j@
AX
+

A@]A



A
A
]

AZZwssss

maps/KantoSafariZoneArea2West.asm

@@ -0,0 +1,17 @@
+	object_const_def
+
+KantoSafariZoneArea2West_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+KantoSafariZoneArea2West_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events

maps/KantoSafariZoneArea3.ablk

@@ -0,0 +1,2 @@
+
]9999UZ{QRz

]


]@
A{ZUz]


]

@A{ZZ
accg
]
@]A{UZ]`idh

@
A
QReh]
]@
A9
+Zoeh
@
A


]
e|ccg

Z@]accccflirk
]A@V`jiiiik]

]A@))))))))@


A@]X))YXY
@]
2
A99????9

maps/KantoSafariZoneArea3.asm

@@ -0,0 +1,17 @@
+	object_const_def
+
+KantoSafariZoneArea3_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+KantoSafariZoneArea3_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events