From f983bc8f163dbcf29713947c4a7f03161dbf9f3a Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Mon, 23 Oct 2023 16:01:55 +0100
Subject: [PATCH] Prototype Safari Zone map

No scripts or Safari Game yet, but this removes the details of the Safari Zone's closure and adds the map back in. Fixed the entry zone and stuff while I was at it.

Fully functional.
---
 data/tilesets/park_attributes.bin | Bin 1024 -> 1056 bytes
 data/tilesets/park_collision.asm  |   2 ++
 data/tilesets/park_metatiles.bin  | Bin 1024 -> 1056 bytes
 maps/FuchsiaCity.ablk             |   2 +-
 maps/FuchsiaCity.asm              |  30 +++++++++++-------------------
 maps/SafariZoneBeta.ablk          |   2 +-
 6 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/data/tilesets/park_attributes.bin b/data/tilesets/park_attributes.bin
index 4a5b3c9cf1c9ef2ff10a7196bbab037039d7e0dd..1c2b31685336f9388a5561b8a6922db78c620025 100644
GIT binary patch
delta 39
dcmZqRSirG>MS+!-i3x%k8Ch8w8BuwxtN>1P0$l(A

delta 6
NcmZ3$(ZI2Q1po(10o4Ei

diff --git a/data/tilesets/park_collision.asm b/data/tilesets/park_collision.asm
index d24de1e..7a223a7 100644
--- a/data/tilesets/park_collision.asm
+++ b/data/tilesets/park_collision.asm
@@ -62,3 +62,5 @@
 	tilecoll WALL, WALL, WALL, WALL ; 3d
 	tilecoll WALL, WALL, WALL, WALL ; 3e
 	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 3f
+	tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 40
+	tilecoll FLOOR, WALL, WARP_CARPET_DOWN, WALL ; 41
diff --git a/data/tilesets/park_metatiles.bin b/data/tilesets/park_metatiles.bin
index 0d6739bbab8bb987558d09845c9d6ded98932c83..853b8bb70d273123ae878064b04f394263ca73d5 100644
GIT binary patch
delta 39
pcmZqRSirG>MS)eCk&)FIg#G<lgZ=#(8Kqen8J$`E{XsaG6##~Z2893s

delta 6
NcmZ3$(ZI2Q1po(10o4Ei

diff --git a/maps/FuchsiaCity.ablk b/maps/FuchsiaCity.ablk
index b46ef2c..c40a4bd 100644
--- a/maps/FuchsiaCity.ablk
+++ b/maps/FuchsiaCity.ablk
@@ -1,7 +1,7 @@
 
 
  T!
-ooo7}~ttttntmVUw
+ooo7€~ttttntmVUw
 
t
 
 6nwtttt{oowwwwwwwttt{tttn{{
diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm
index 5fe9f0b..a65d6e8 100644
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -68,12 +68,12 @@ FuchsiaCityPokefanMText:
 	done
 
 FuchsiaCityTeacherText:
-	text "The SAFARI ZONE is"
-	line "closed… It's sad,"
-
-	para "considering it's"
-	line "FUCHSIA's main"
-	cont "attraction."
+	text "I caught a"
+	line "TRAMPEL in the"
+	cont "SAFARI ZONE!"
+	
+	para "I should show"
+	line "it to my class!"
 	done
 
 FuchsiaCitySignText:
@@ -93,12 +93,8 @@ FuchsiaGymSignText:
 	done
 
 SafariZoneOfficeSignText:
-	text "There's a notice"
-	line "here…"
-
-	para "SAFARI ZONE OFFICE"
-	line "is closed until"
-	cont "further notice."
+	text "#MON PARADISE"
+	line "SAFARI ZONE"
 	done
 
 WardensHomeSignText:
@@ -107,12 +103,8 @@ WardensHomeSignText:
 	done
 
 SafariZoneClosedSignText:
-	text "The WARDEN is"
-	line "traveling abroad."
-
-	para "Therefore, the"
-	line "SAFARI ZONE is"
-	cont "closed."
+	text "SAFARI GAME"
+	line "#MON-U-CATCH!"
 	done
 
 NoLitteringSignText:
@@ -132,7 +124,7 @@ FuchsiaCity_MapEvents:
 	warp_event 11, 27, BILLS_BROTHERS_HOUSE, 1
 	warp_event 19, 27, FUCHSIA_POKECENTER_1F, 1
 	warp_event 27, 27, SAFARI_ZONE_WARDENS_HOME, 1
-	warp_event 18,  3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; inaccessible
+	warp_event 18,  3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3
 	warp_event 37, 22, ROUTE_15_FUCHSIA_GATE, 1
 	warp_event 37, 23, ROUTE_15_FUCHSIA_GATE, 2
 	warp_event  7, 35, ROUTE_19_FUCHSIA_GATE, 1
diff --git a/maps/SafariZoneBeta.ablk b/maps/SafariZoneBeta.ablk
index fb340d3..49cda8e 100644
--- a/maps/SafariZoneBeta.ablk
+++ b/maps/SafariZoneBeta.ablk
@@ -1 +1 @@
-?//'#33+
\ No newline at end of file
+@A())*,--.0112
\ No newline at end of file