Added Mineyama Camp Map

OrchiidDev · Sep 9, 2024 · 37fb37b · 37fb37b
1 parent ecc6be8
commit 37fb37b
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 3 deletions.
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
@@ -511,6 +511,7 @@ ENDM
 	map_const KAGA_POND,									18, 24 ; 7
 	map_const RAMEN_SHOP,									 8,  6 ; 8
 	map_const KAGA_FISHING_SHOP,							 5,  6 ; 9
+	map_const KAGA_CAMP,									18, 22 ; 10
 	endgroup
 
 DEF NUM_MAP_GROUPS EQU const_value ; 27
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
@@ -385,7 +385,8 @@ ENDM
 	connection west, KagaTown, KAGA_TOWN, -15
 	connection east, HonzuTown, HONZU_TOWN, -6
 
-	map_attributes MineyamaPark, MINEYAMA_PARK, $2c, WEST
+	map_attributes MineyamaPark, MINEYAMA_PARK, $2c, NORTH | WEST
+	connection north, KagaCamp, KAGA_CAMP, 4
 	connection west, HonzuTown, HONZU_TOWN, 0
 
 	map_attributes HonzuHarbor, HONZU_HARBOR, $2c, SOUTH
@@ -401,6 +402,9 @@ ENDM
 	map_attributes KagaPond, KAGA_POND, $2c, SOUTH
 	connection south, MtKaga, MT_KAGA, -8
 
+	map_attributes KagaCamp, KAGA_CAMP, $2c, SOUTH
+	connection south, MineyamaPark, MINEYAMA_PARK, -4
+
 	map_attributes RamenShop, RAMEN_SHOP, $00, 0
 	map_attributes KagaFishingShop, KAGA_FISHING_SHOP, $00, 0
 	map_attributes Route23, ROUTE_23, $0f, 0

diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm
@@ -1077,4 +1077,7 @@ RamenShop_Blocks:
 	INCBIN "maps/RamenShop.ablk"
 
 KagaFishingShop_Blocks:
-	INCBIN "maps/KagaFishingShop.ablk"
+	INCBIN "maps/KagaFishingShop.ablk"
+
+KagaCamp_Blocks:
+	INCBIN "maps/MineyamaCamp.ablk"
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
@@ -549,5 +549,6 @@ MapGroup_Kagawa:
 	map MtKaga, TILESET_KAGAWA, TOWN, LANDMARK_ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_SHORE, KELPGROUP_KRABBY
 	map KagaPond, TILESET_KAGAWA, TOWN, LANDMARK_ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_SHORE, KELPGROUP_KRABBY
 	map RamenShop, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_30, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE, KELPGROUP_KRABBY
-	map KagaFishingShop, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_30, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE, KELPGROUP_KRABBY
+	map KagaFishingShop, TILESET_HOUSE, ROUTE, LANDMARK_ROUTE_30, MUSIC_DANCING_HALL, FALSE, PALETTE_AUTO, FISHGROUP_SHORE, KELPGROUP_KRABBY
+	map KagaCamp, TILESET_KAGAWA, ROUTE, LANDMARK_ROUTE_30, MUSIC_DANCING_HALL, FALSE, PALETTE_AUTO, FISHGROUP_SHORE, KELPGROUP_KRABBY
 	assert_table_length NUM_KAGAWA_MAPS
diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm
@@ -493,5 +493,6 @@ INCLUDE "maps/MtKaga.asm"
 INCLUDE "maps/KagaPond.asm"
 INCLUDE "maps/RamenShop.asm"
 INCLUDE "maps/KagaFishingShop.asm"
+INCLUDE "maps/MineyamaCamp.asm"
 
 ENDSECTION
diff --git a/data/tilesets/kagawa_attributes.bin b/data/tilesets/kagawa_attributes.bin
diff --git a/data/tilesets/kagawa_collision.asm b/data/tilesets/kagawa_collision.asm
@@ -146,3 +146,6 @@
 	tilecoll WALL, WALL, WALL, WALL ; 91
 	tilecoll WALL, WALL, WALL, WALL ; 92
 	tilecoll FLOOR, FLOOR, HOP_DOWN, FLOOR ; 93
+	tilecoll WALL, WALL, WALL, WALL ; 94
+	tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 95
+	tilecoll FLOOR, WALL, WARP_CARPET_DOWN, WALL ; 96
diff --git a/data/tilesets/kagawa_metatiles.bin b/data/tilesets/kagawa_metatiles.bin
diff --git a/maps/MineyamaCamp.ablk b/maps/MineyamaCamp.ablk
@@ -0,0 +1 @@
+wwwwwvutuvvwwvvvwvvvtwvvwvwwwtuvvvIJKvvuvwvvutwtMNOtvw$%%&wwvv$-))*ttvvuvu()))*wtwvtvwuwutwwut�wuvwutu!!!!!utwuwtVtw!!u!!wu!!!uu!!!wu��
diff --git a/maps/MineyamaCamp.asm b/maps/MineyamaCamp.asm
@@ -0,0 +1,21 @@
+	object_const_def
+
+
+KagaCamp_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+KagaCamp_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event  7, 43, MINEYAMA_PARK, 1
+	warp_event  8, 43, MINEYAMA_PARK, 1
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events
+
diff --git a/maps/MineyamaPark.asm b/maps/MineyamaPark.asm
@@ -10,6 +10,7 @@ MineyamaPark_MapEvents:
 	db 0, 0 ; filler
 
 	def_warp_events
+	warp_event 15, 3, KAGA_CAMP, 1
 
 	def_coord_events
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		wwwwwvutuvvwwvvvwvvvtwvvwvwwwtuvvvIJKvvuvwvvutwtMNOtvw$%%&wwvv$-))ttvvuvu()))wtwvtvwuwutwwut�wuvwutu!!!!!utwuwtVtw!!u!!wu!!!uu!!!wu��