Kaga Castle Exterior

- added Kaga Castle Exterior map, temp cave connection to Mt. Kaga
OrchiidDev · Sep 11, 2024 · c3763c2 · c3763c2
1 parent 29c1793
commit c3763c2
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 2 deletions.
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
@@ -512,6 +512,7 @@ ENDM
 	map_const RAMEN_SHOP,									 8,  6 ; 8
 	map_const KAGA_FISHING_SHOP,							 5,  6 ; 9
 	map_const KAGA_CAMP,									18, 22 ; 10
+	map_const KAGA_CASTLE,									14, 12 ; 11
 	endgroup
 
 DEF NUM_MAP_GROUPS EQU const_value ; 27
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
@@ -399,12 +399,16 @@ ENDM
 	connection north, KagaPond, KAGA_POND, 8
 	connection south, LakeFuchu, LAKE_FUCHU, 0
 
-	map_attributes KagaPond, KAGA_POND, $2c, SOUTH
+	map_attributes KagaPond, KAGA_POND, $2c, EAST | SOUTH
+	connection east, KagaCastle, KAGA_CASTLE, 12
 	connection south, MtKaga, MT_KAGA, -8
 
 	map_attributes KagaCamp, KAGA_CAMP, $2c, SOUTH
 	connection south, MineyamaPark, MINEYAMA_PARK, -4
 
+	map_attributes KagaCastle, KAGA_CASTLE, $2c, WEST
+	connection west, KagaPond, KAGA_POND, -12
+
 	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
@@ -1080,4 +1080,7 @@ KagaFishingShop_Blocks:
 	INCBIN "maps/KagaFishingShop.ablk"
 
 KagaCamp_Blocks:
-	INCBIN "maps/MineyamaCamp.ablk"
+	INCBIN "maps/MineyamaCamp.ablk"
+
+KagaCastle_Blocks:
+	INCBIN "maps/KagaCastle.ablk"
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
@@ -551,4 +551,5 @@ MapGroup_Kagawa:
 	map RamenShop, 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
+	map KagaCastle, 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
@@ -494,5 +494,6 @@ INCLUDE "maps/KagaPond.asm"
 INCLUDE "maps/RamenShop.asm"
 INCLUDE "maps/KagaFishingShop.asm"
 INCLUDE "maps/MineyamaCamp.asm"
+INCLUDE "maps/KagaCastle.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
@@ -155,3 +155,6 @@
 	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 9a
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 9b
 	tilecoll WALL, WALL, WALL, WALL ; 9c
+	tilecoll WALL, WALL, WALL, WALL ; 9d
+	tilecoll WALL, WALL, DOOR, DOOR ; 9e
+	tilecoll WALL, WALL, WALL, WALL ; 9f
diff --git a/data/tilesets/kagawa_metatiles.bin b/data/tilesets/kagawa_metatiles.bin
diff --git a/maps/KagaCastle.ablk b/maps/KagaCastle.ablk
@@ -0,0 +1 @@
+IJK���������VMNO!!!!!!
diff --git a/maps/KagaCastle.asm b/maps/KagaCastle.asm
@@ -0,0 +1,19 @@
+	object_const_def
+
+KagaCastle_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+KagaCastle_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event 8,  9, MT_KAGA, 1
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events
+
diff --git a/maps/MtKaga.asm b/maps/MtKaga.asm
@@ -10,6 +10,7 @@ MtKaga_MapEvents:
 	db 0, 0 ; filler
 
 	def_warp_events
+	warp_event 52,  7, KAGA_CASTLE, 1
 
 	def_coord_events