From 0075e0d0baf72f75c36c30122ff6f296099f4dbc Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Sun, 21 Jul 2024 17:11:04 +0100
Subject: [PATCH] bug fixes

fsr silent hills's connections are a bit buggy uhhh
---
 data/maps/attributes.asm          |   2 +-
 data/tilesets/cave_attributes.bin | Bin 1440 -> 1456 bytes
 data/tilesets/cave_collision.asm  |   1 +
 data/tilesets/cave_metatiles.bin  | Bin 1440 -> 1456 bytes
 maps/WinnersPath.ablk             |   2 +-
 maps/WinnersPathOutside.asm       |   4 ++--
 6 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
index a89762b..89a1a50 100644
--- a/data/maps/attributes.asm
+++ b/data/maps/attributes.asm
@@ -380,7 +380,7 @@ ENDM
 	connection east, UnnumberedRoute, UNNUMBERED_ROUTE, 0
 	
 	map_attributes Route49, ROUTE_49, $05, EAST | WEST
-	connection east, SilentHills, SILENT_HILLS, $05, 0
+	connection east, SilentHills, SILENT_HILLS, $00, 0
 	connection west, Route49_2, ROUTE_49_2, $05, 0
 	
 	map_attributes Route49_2, ROUTE_49_2, $05, 0, EAST
diff --git a/data/tilesets/cave_attributes.bin b/data/tilesets/cave_attributes.bin
index 9188e52af845a9b506baca49ca855b3ad332c10f..5e327a804d969dbbdf27db18302fc0b4117397f4 100644
GIT binary patch
delta 11
ScmZ3$y@7kf0@ld_tO5WTAOmy&

delta 7
OcmdnMy?}ee0#*PEx&pia

diff --git a/data/tilesets/cave_collision.asm b/data/tilesets/cave_collision.asm
index 9870e19..0ef5556 100644
--- a/data/tilesets/cave_collision.asm
+++ b/data/tilesets/cave_collision.asm
@@ -88,3 +88,4 @@
 	tilecoll WALL, WALL, WALL, FLOOR ; 57
 	tilecoll FLOOR, WALL, FLOOR, WARP_CARPET_DOWN ; 58
 	tilecoll FLOOR, SWITCH, FLOOR, FLOOR ; 59
+	tilecoll WALL, FLOOR, FLOOR, WARP_CARPET_DOWN ; 5a
diff --git a/data/tilesets/cave_metatiles.bin b/data/tilesets/cave_metatiles.bin
index 5801bd05acd54c28ce6fadbcca1b96932c47c742..d4996cdedc07bc096cfbd2c5e3ae81947c38d63a 100644
GIT binary patch
delta 24
YcmZ3$y@7kf0#*S|E=ER4DMmN|06ypg9smFU

delta 7
OcmdnMy?}ee0#*PEx&pia

diff --git a/maps/WinnersPath.ablk b/maps/WinnersPath.ablk
index 5ae8447..364cd29 100644
--- a/maps/WinnersPath.ablk
+++ b/maps/WinnersPath.ablk
@@ -14,5 +14,5 @@ $&VN#M









....................







  
 F
 J
-Q
+Z
  !!!"N#MNM
\ No newline at end of file
diff --git a/maps/WinnersPathOutside.asm b/maps/WinnersPathOutside.asm
index 4f1d6c4..50874f4 100644
--- a/maps/WinnersPathOutside.asm
+++ b/maps/WinnersPathOutside.asm
@@ -60,10 +60,10 @@ EngineerDashuAfterBattleText:
 	cont "NEW TYPE." ; Change name when necessary.
 	
 	para "Why aren't I there"
-	line "right now"
+	line "right now?"
 	
 	para "Aren't you a nosy"
-	cont "one, eh?"
+	line "one, eh?"
 	done
 
 TrainerCoolTrainerSteve: