From d765610c0436668d6e67cb5b53251251d41ff446 Mon Sep 17 00:00:00 2001
From: Zeta_Null <z0zetanull@gmail.com>
Date: Tue, 30 Jul 2024 14:03:33 -0400
Subject: [PATCH] TREASURE BEACH

just some basic map layout and connections shit
---
 constants/map_constants.asm        |   4 ++--
 data/maps/attributes.asm           |   6 +++--
 data/tilesets/sevii_attributes.bin | Bin 896 -> 976 bytes
 data/tilesets/sevii_collision.asm  |   9 ++++++--
 data/tilesets/sevii_metatiles.bin  | Bin 896 -> 976 bytes
 maps/OneIsland.ablk                |  34 +++++++++++++++++++++++++++--
 maps/OneIsland.asm                 |   4 ++--
 maps/TreasureBeach.ablk            | Bin 100 -> 180 bytes
 8 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 0647566..0bc3761 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -558,8 +558,8 @@ ENDM
 	newgroup ONE_ISLAND ; 28
 	map_const FARAWAY_ISLAND_OUTSIDE,				10, 10 ; 1
 	map_const FARAWAY_ISLAND_INSIDE,				10, 10 ; 2
-	map_const ONE_ISLAND,							12, 12 ; 3
-	map_const TREASURE_BEACH,						10, 10 ; 4
+	map_const ONE_ISLAND,							14, 13 ; 3
+	map_const TREASURE_BEACH,						10, 18 ; 4
 	map_const KINDLE_ROAD,							10, 10 ; 5
 	map_const MT_EMBER_EXTERIOR,					10, 10 ; 6
 	map_const MT_EMBER_INTERIOR,					10, 10 ; 7
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
index 9cd1518..d69ce4b 100644
--- a/data/maps/attributes.asm
+++ b/data/maps/attributes.asm
@@ -751,8 +751,10 @@ ENDM
 	; Sevii Island Sizzle Reel
 	map_attributes FarawayIslandOutside, FARAWAY_ISLAND_OUTSIDE, $00, 0 ; Bank 2
 	map_attributes FarawayIslandInside, FARAWAY_ISLAND_INSIDE, $00, 0 ; Bank 2
-	map_attributes OneIsland, ONE_ISLAND, $00, 0 ; Bank 2
-	map_attributes TreasureBeach, TREASURE_BEACH, $00, 0 ; Bank 2
+	map_attributes OneIsland, ONE_ISLAND, $02, SOUTH ; Bank 2
+	connection south, TreasureBeach, TREASURE_BEACH, 1
+	map_attributes TreasureBeach, TREASURE_BEACH, $02, NORTH ; Bank 2
+	connection north, OneIsland, ONE_ISLAND, -1
 	map_attributes KindleRoad, KINDLE_ROAD, $00, 0 ; Bank 2
 	map_attributes MtEmberExterior, MT_EMBER_EXTERIOR, $00, 0 ; Bank 2
 	map_attributes MtEmberInterior, MT_EMBER_INTERIOR, $00, 0 ; Bank 2
diff --git a/data/tilesets/sevii_attributes.bin b/data/tilesets/sevii_attributes.bin
index 6b90c7ea00a8eef9c433a7b544bc8a6061b163fd..c777da15377390d07391f0658d6061e7dc709589 100644
GIT binary patch
delta 71
ocmZo*zremBfq8NPBZmbOGGJt41R}5qFEcYUGDhR_PE0fa01q4mv;Y7A

delta 40
Scmcb>-oU;gfmwlp0001BA_9^C

diff --git a/data/tilesets/sevii_collision.asm b/data/tilesets/sevii_collision.asm
index 0163516..1b4a4a9 100644
--- a/data/tilesets/sevii_collision.asm
+++ b/data/tilesets/sevii_collision.asm
@@ -52,5 +52,10 @@
 	tilecoll WATER, WATER, WATER, WATER ; 33
 	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 34
 	tilecoll WALL, WALL, WALL, WALL ; 35
-	tilecoll WALL, WALL, WALL, WALL ; 36
-	tilecoll WALL, WALL, WALL, WALL ; 37
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 36
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
+	tilecoll WATER, WATER, WATER, WATER ; 38
+	tilecoll WATER, WATER, WATER, WATER ; 39
+	tilecoll WALL, WALL, WALL, FLOOR ; 3a
+	tilecoll WALL, WALL, FLOOR, WALL ; 3b
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 3c
diff --git a/data/tilesets/sevii_metatiles.bin b/data/tilesets/sevii_metatiles.bin
index dde2371e3d4d3585902d125d3fa38f4eee244187..25ea1835b240504b571fe6431aa6310256ca54e5 100644
GIT binary patch
delta 120
zcmZo*zremBfw_PM4X}a$Gb=L?ftdm#A|l8b$Q44yjs}K?1`dvn4p3}pXyoYV=maF3
NoIuzR2!H}`001&Z5kdd}

delta 40
Scmcb>-oU;gfmwlp0001BA_9^C

diff --git a/maps/OneIsland.ablk b/maps/OneIsland.ablk
index f00ce78..1baa420 100644
--- a/maps/OneIsland.ablk
+++ b/maps/OneIsland.ablk
@@ -1,16 +1,46 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
 
+
+
  

 
 
+
+
 	
+
+
 5
-	

2(
+
+
+	7
2(
+
+
 	
2(
-	

$%(

1&((("4"0!
#3!)*+.!-,,/,,
\ No newline at end of file
+
+
+	77$%(
+
+7
1&(((4"0!
#3!)*+.!-,,/,,
\ No newline at end of file
diff --git a/maps/OneIsland.asm b/maps/OneIsland.asm
index 15dfdf8..712865e 100644
--- a/maps/OneIsland.asm
+++ b/maps/OneIsland.asm
@@ -9,8 +9,8 @@ OneIsland_MapEvents:
 	db 0, 0 ; filler
 
 	def_warp_events
-	warp_event 10, 17, DEBUG_ROOM, 1
-	warp_event  11,  17, DEBUG_ROOM, 1
+	warp_event 14, 19, DEBUG_ROOM, 1
+	warp_event 15, 19, DEBUG_ROOM, 1
 
 	def_coord_events
 
diff --git a/maps/TreasureBeach.ablk b/maps/TreasureBeach.ablk
index eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7..b2d88018b6d27e936db671ae95ba5868d8e96e28 100644
GIT binary patch
literal 180
zcmZ9DF%Cc>2t%W6-E}7}o&XiR|G7TI<eS)`d9)>G&Y|#2?aAVPvsj-j{QmxQ%GmIt
o?wZ^drQQ?G#%d#p5KToD8KT<?U?K|CqK3T@RA7LYaB>X$09+&up8x;=

literal 100
LcmZQzpgjNp0Av6G