Kaga Library

- Added Kaga Library Map - tweaked Kaga Town map, House tileset
OrchiidDev · Sep 12, 2024 · 936d09f · 936d09f
1 parent e630229
commit 936d09f
Show file tree

Hide file tree

Showing 16 changed files with 61 additions and 8 deletions.
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
@@ -513,6 +513,7 @@ ENDM
 	map_const KAGA_FISHING_SHOP,							 5,  6 ; 9
 	map_const KAGA_CAMP,									18, 22 ; 10
 	map_const KAGA_CASTLE,									14, 12 ; 11
+	map_const KAGA_LIBRARY,									 8,  6 ; 12
 	endgroup
 
 DEF NUM_MAP_GROUPS EQU const_value ; 27
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
@@ -411,6 +411,7 @@ ENDM
 
 	map_attributes RamenShop, RAMEN_SHOP, $00, 0
 	map_attributes KagaFishingShop, KAGA_FISHING_SHOP, $00, 0
+	map_attributes KagaLibrary, KAGA_LIBRARY, $00, 0
 	map_attributes Route23, ROUTE_23, $0f, 0
 	map_attributes SproutTower1F, SPROUT_TOWER_1F, $00, 0
 	map_attributes SproutTower2F, SPROUT_TOWER_2F, $00, 0

diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm
@@ -1083,4 +1083,7 @@ KagaCamp_Blocks:
 	INCBIN "maps/MineyamaCamp.ablk"
 
 KagaCastle_Blocks:
-	INCBIN "maps/KagaCastle.ablk"
+	INCBIN "maps/KagaCastle.ablk"
+
+KagaLibrary_Blocks:
+	INCBIN "maps/KagaLibrary.ablk"
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
@@ -552,4 +552,5 @@ MapGroup_Kagawa:
 	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
+	map KagaLibrary, TILESET_HOUSE, 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
@@ -495,5 +495,6 @@ INCLUDE "maps/RamenShop.asm"
 INCLUDE "maps/KagaFishingShop.asm"
 INCLUDE "maps/MineyamaCamp.asm"
 INCLUDE "maps/KagaCastle.asm"
+INCLUDE "maps/KagaLibrary.asm"
 
 ENDSECTION
diff --git a/data/tilesets/house_attributes.bin b/data/tilesets/house_attributes.bin
diff --git a/data/tilesets/house_collision.asm b/data/tilesets/house_collision.asm
@@ -33,3 +33,24 @@
 	tilecoll WALL, WALL, FLOOR, WALL ; 20
 	tilecoll WALL, WALL, WALL, WALL ; 21
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 22
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 24
+	tilecoll WALL, WALL, WALL, WALL ; 25
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 26
+	tilecoll WALL, WALL, FLOOR, STAIRCASE ; 27
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 28
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 29
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2a
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2b
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2e
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2f
+	tilecoll WALL, WALL, WALL, WALL ; 30
+	tilecoll WALL, WALL, WALL, WALL ; 31
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 32
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 33
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 35
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
diff --git a/data/tilesets/house_metatiles.bin b/data/tilesets/house_metatiles.bin
diff --git a/data/tilesets/kagawa_collision.asm b/data/tilesets/kagawa_collision.asm
@@ -124,7 +124,7 @@
 	tilecoll WALL, WALL, WALL, WALL ; 7b
 	tilecoll WALL, WALL, WALL, DOOR ; 7c
 	tilecoll WALL, WALL, WALL, WALL ; 7d
-	tilecoll WALL, WALL, WALL, WALL ; 7e
+	tilecoll WALL, WALL, DOOR, WALL ; 7e
 	tilecoll WALL, WALL, WALL, WALL ; 7f
 	tilecoll WALL, WALL, WALL, WALL ; 80
 	tilecoll WALL, WALL, WALL, WALL ; 81

diff --git a/gfx/pokemon/taillow/back.png b/gfx/pokemon/taillow/back.png
diff --git a/gfx/pokemon/taillow/front.png b/gfx/pokemon/taillow/front.png
diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm
@@ -267,12 +267,6 @@ INCBIN "data/tilesets/house_metatiles.bin"
 TilesetHouseColl::
 INCLUDE "data/tilesets/house_collision.asm"
 
-TilesetLighthouseGFX::
-INCBIN "gfx/tilesets/lighthouse.2bpp.lz"
-
-TilesetLighthouseMeta::
-INCBIN "data/tilesets/lighthouse_metatiles.bin"
-
 TilesetLighthouseColl::
 INCLUDE "data/tilesets/lighthouse_collision.asm"
 
@@ -321,6 +315,12 @@ INCBIN "data/tilesets/ruins_of_alph_metatiles.bin"
 TilesetRuinsOfAlphColl::
 INCLUDE "data/tilesets/ruins_of_alph_collision.asm"
 
+TilesetLighthouseGFX::
+INCBIN "gfx/tilesets/lighthouse.2bpp.lz"
+
+TilesetLighthouseMeta::
+INCBIN "data/tilesets/lighthouse_metatiles.bin"
+
 
 SECTION "Tileset Data 8", ROMX
 

diff --git a/gfx/tilesets/house.png b/gfx/tilesets/house.png
diff --git a/maps/KagaLibrary.ablk b/maps/KagaLibrary.ablk
@@ -0,0 +1 @@
+%%5$1%%5########%%%%2607######4#2#*,,+#32&(--)&3
diff --git a/maps/KagaLibrary.asm b/maps/KagaLibrary.asm
@@ -0,0 +1,22 @@
+	object_const_def
+
+KagaLibrary_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+KagaLibrary_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event 2,  11, KAGA_TOWN, 1
+	warp_event 3,  11, KAGA_TOWN, 1
+	warp_event 12,  11, KAGA_TOWN, 3
+	warp_event 13,  11, KAGA_TOWN, 3
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events
+
diff --git a/maps/KagaTown.asm b/maps/KagaTown.asm
@@ -11,6 +11,8 @@ KagaTown_MapEvents:
 
 	def_warp_events
 	warp_event  23, 27, KAGA_FISHING_SHOP, 1
+	warp_event  19, 35, KAGA_LIBRARY, 1
+	warp_event  22, 35, KAGA_LIBRARY, 3
 
 	def_coord_events
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		%%5$1%%5########%%%%2607######4#2#*,,+#32&(--)&3