diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 33c702a..d9a7b86 100644 --- a/constants/map_constants.asm +++ b/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 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index e0418ea..2035990 100644 --- a/data/maps/attributes.asm +++ b/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. diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index c220132..2f8c3e1 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1306,3 +1306,6 @@ KantoSafariZoneArea2East_Blocks: KantoSafariZoneArea2West_Blocks: INCBIN "maps/KantoSafariZoneArea2West.ablk" + +KantoSafariZoneArea3_Blocks: + INCBIN "maps/KantoSafariZoneArea3.ablk" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 4ead29e..36d532d 100644 --- a/data/maps/maps.asm +++ b/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 KantoSafariZoneArea1South, TILESET_FOREST_KANTO, FOREST, LANDMARK_FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI - map KantoSafariZoneArea1North, TILESET_FOREST_KANTO, FOREST, LANDMARK_FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI - map KantoSafariZoneArea2East, TILESET_FOREST_KANTO, FOREST, LANDMARK_FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI - map KantoSafariZoneArea2West, 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_KANTO_SAFARI_ZONE, 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_KANTO_SAFARI_ZONE, 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: diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index f6fec14..c627330 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -631,4 +631,5 @@ INCLUDE "maps/KantoSafariZoneCenter.asm" INCLUDE "maps/KantoSafariZoneArea1South.asm" INCLUDE "maps/KantoSafariZoneArea1North.asm" INCLUDE "maps/KantoSafariZoneArea2East.asm" -INCLUDE "maps/KantoSafariZoneArea2West.asm" \ No newline at end of file +INCLUDE "maps/KantoSafariZoneArea2West.asm" +INCLUDE "maps/KantoSafariZoneArea3.asm" \ No newline at end of file diff --git a/data/tilesets/forest_kanto_attributes.bin b/data/tilesets/forest_kanto_attributes.bin index d05718f..b4616fe 100644 Binary files a/data/tilesets/forest_kanto_attributes.bin and b/data/tilesets/forest_kanto_attributes.bin differ diff --git a/data/tilesets/forest_kanto_collision.asm b/data/tilesets/forest_kanto_collision.asm index 47effd4..162f26a 100644 --- a/data/tilesets/forest_kanto_collision.asm +++ b/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 diff --git a/data/tilesets/forest_kanto_metatiles.bin b/data/tilesets/forest_kanto_metatiles.bin index 4937e30..ea04290 100644 Binary files a/data/tilesets/forest_kanto_metatiles.bin and b/data/tilesets/forest_kanto_metatiles.bin differ diff --git a/maps/KantoSafariZoneArea2East.ablk b/maps/KantoSafariZoneArea2East.ablk new file mode 100644 index 0000000..27078ed --- /dev/null +++ b/maps/KantoSafariZoneArea2East.ablk @@ -0,0 +1 @@ +555555qqqq]V)YQRA5555))ZoA]X)WA]X)WAvvvvvvvX)A]accg]`jdh]UZeh]ehcccg]ehlijk]ehh))Waccccfhk)))`jiiiikX)))2]ZsX))WUt]XY]]suZp5555ZUZ \ No newline at end of file diff --git a/maps/KantoSafariZoneArea2East.asm b/maps/KantoSafariZoneArea2East.asm new file mode 100644 index 0000000..c60e812 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/maps/KantoSafariZoneArea2West.ablk b/maps/KantoSafariZoneArea2West.ablk new file mode 100644 index 0000000..712a114 --- /dev/null +++ b/maps/KantoSafariZoneArea2West.ablk @@ -0,0 +1,7 @@ +55555555@VWVW]@X))YA55@V))WAXYX ]@] + )W@ + )W@@] Z))Y@@ + XYX@@ + @@A]]ac@AVV)Wey@x) )ey@A) + Y`j@AX + A@]AAA]AZZwssss \ No newline at end of file diff --git a/maps/KantoSafariZoneArea2West.asm b/maps/KantoSafariZoneArea2West.asm new file mode 100644 index 0000000..f838717 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/maps/KantoSafariZoneArea3.ablk b/maps/KantoSafariZoneArea3.ablk new file mode 100644 index 0000000..301ea21 --- /dev/null +++ b/maps/KantoSafariZoneArea3.ablk @@ -0,0 +1,2 @@ +]9999UZ{QRz]]@A{ZUz]]@A{ZZaccg]@]A{UZ]`idh@A QReh]]@A9 + Zoeh@A]e|ccgZ@]accccflirk]A@V`jiiiik]]A@))))))))@A@]X))YXY@]2A99????9 \ No newline at end of file diff --git a/maps/KantoSafariZoneArea3.asm b/maps/KantoSafariZoneArea3.asm new file mode 100644 index 0000000..abd6eb2 --- /dev/null +++ b/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 \ No newline at end of file