Kagawa Tileset, Kagawa Town

-Created and added the Kagawa Tileset

-Created the Kagawa Town map which serves as the player's neighborhood.

-Player's room now warps to Kagawa Town for testing

constants/map_constants.asm

@@ -501,4 +501,8 @@ ENDM
 	map_const ROUTE_31_VIOLET_GATE,                         5,  4 ; 11
 	endgroup
 
-DEF NUM_MAP_GROUPS EQU const_value ; 26
+	newgroup KAGAWA												  ; 27
+	map_const HONZU_TOWN,								    24, 18 ; 1
+	endgroup
+
+DEF NUM_MAP_GROUPS EQU const_value ; 27

constants/scgb_constants.asm

@@ -71,6 +71,7 @@ DEF SCGB_DEFAULT EQU $ff
 	const PREDEFPAL_LAKE_OF_RAGE
 	const PREDEFPAL_SILVER_CAVE
 	const PREDEFPAL_DUNGEONS
+	const PREDEFPAL_KAGAWA
 	const PREDEFPAL_NITE
 	const PREDEFPAL_BLACKOUT
 	const PREDEFPAL_DIPLOMA ; RB_MEWMON

constants/tileset_constants.asm

@@ -36,6 +36,7 @@
 	const TILESET_KABUTO_WORD_ROOM     ; 22
 	const TILESET_OMANYTE_WORD_ROOM    ; 23
 	const TILESET_AERODACTYL_WORD_ROOM ; 24
+	const TILESET_KAGAWA			   ; 24
 DEF NUM_TILESETS EQU const_value - 1
 
 ; wTileset struct size

data/maps/attributes.asm

@@ -375,6 +375,8 @@ ENDM
 	connection north, Route10North, ROUTE_10_NORTH, 0
 	connection south, LavenderTown, LAVENDER_TOWN, 0
 
+	map_attributes HonzuTown, HONZU_TOWN, $2c, 0
+
 	map_attributes Route23, ROUTE_23, $0f, 0
 	map_attributes SproutTower1F, SPROUT_TOWER_1F, $00, 0
 	map_attributes SproutTower2F, SPROUT_TOWER_2F, $00, 0

data/maps/blocks.asm

@@ -1047,3 +1047,9 @@ GoldenrodDeptStoreRoof_Blocks:
 	INCBIN "maps/GoldenrodDeptStoreRoof.ablk"
 
 ENDSECTION
+
+
+SECTION "Map Blocks 4", ROMX
+
+HonzuTown_Blocks:
+	INCBIN "maps/HonzuTown.ablk"

data/maps/maps.asm

@@ -43,6 +43,7 @@ MapGroupPointers::
 	dw MapGroup_NewBark     ; 24
 	dw MapGroup_Saffron     ; 25
 	dw MapGroup_Cherrygrove ; 26
+	dw MapGroup_Kagawa 		; 27
 	assert_table_length NUM_MAP_GROUPS
 
 MapGroup_Olivine:
@@ -536,3 +537,8 @@ MapGroup_Cherrygrove:
 	map MrPokemonsHouse, TILESET_FACILITY, INDOOR, LANDMARK_ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map Route31VioletGate, TILESET_GATE, GATE, LANDMARK_ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	assert_table_length NUM_CHERRYGROVE_MAPS
+
+MapGroup_Kagawa:
+	table_width MAP_LENGTH, MapGroup_Kagawa
+	map HonzuTown, TILESET_KAGAWA, TOWN, LANDMARK_ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	assert_table_length NUM_KAGAWA_MAPS

data/maps/outdoor_sprites.asm

@@ -30,6 +30,7 @@ OutdoorSprites:
 	dw NewBarkGroupSprites
 	dw SaffronGroupSprites
 	dw CherrygroveGroupSprites
+	dw KagawaGroupSprites
 	assert_table_length NUM_MAP_GROUPS
 
 PalletGroupSprites:
@@ -669,3 +670,16 @@ CableClubGroupSprites:
 	db SPRITE_FISHING_GURU
 	db SPRITE_POKE_BALL
 	db SPRITE_POKEDEX
+
+KagawaGroupSprites:
+	db SPRITE_OAK
+	db SPRITE_FISHER
+	db SPRITE_TEACHER
+	db SPRITE_TWIN
+	db SPRITE_POKEFAN_M
+	db SPRITE_GRAMPS
+	db SPRITE_FAIRY
+	db SPRITE_RIVAL
+	db SPRITE_FISHING_GURU
+	db SPRITE_POKE_BALL
+	db SPRITE_POKEDEX

data/maps/roofs.asm

@@ -38,6 +38,7 @@ MapGroupRoofs:
 	db ROOF_NEW_BARK  ; 24 (New Bark)
 	db -1             ; 25
 	db ROOF_NEW_BARK  ; 26 (Cherrygrove)
+	db ROOF_NEW_BARK  ; 27
 	assert_table_length NUM_MAP_GROUPS + 1
 
 Roofs:

data/maps/scripts.asm

@@ -484,5 +484,6 @@ SECTION "Map Scripts 25", ROMX
 
 INCLUDE "maps/SilverCaveOutside.asm"
 INCLUDE "maps/Route10North.asm"
+INCLUDE "maps/HonzuTown.asm"
 
 ENDSECTION

data/maps/sgb_roof_pal_inds.asm

@@ -30,4 +30,5 @@ MapGroupRoofSGBPalInds:
 	db PREDEFPAL_NEW_BARK
 	db PREDEFPAL_SAFFRON
 	db PREDEFPAL_CHERRYGROVE
+	db PREDEFPAL_KAGAWA
 	assert_table_length NUM_MAP_GROUPS + 1

data/tilesets.asm

@@ -47,4 +47,5 @@ Tilesets::
 	tileset TilesetKabutoWordRoom
 	tileset TilesetOmanyteWordRoom
 	tileset TilesetAerodactylWordRoom
+	tileset TilesetKagawa
 	assert_table_length NUM_TILESETS + 1

data/tilesets/kagawa_collision.asm

@@ -0,0 +1,120 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
+	tilecoll TALL_GRASS, FLOOR, TALL_GRASS, TALL_GRASS ; 06
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
+	tilecoll FLOOR, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 08
+	tilecoll TALL_GRASS, FLOOR, TALL_GRASS, TALL_GRASS ; 09
+	tilecoll FLOOR, CUT_TREE, CUT_TREE, FLOOR ; 0a
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0b
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0c
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0d
+	tilecoll TALL_GRASS, TALL_GRASS, FLOOR, TALL_GRASS ; 0e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15
+	tilecoll WALL, WALL, WALL, WALL ; 16
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 17
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19
+	tilecoll WALL, WALL, WALL, WALL ; 1a
+	tilecoll WALL, WALL, WALL, WALL ; 1b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e
+	tilecoll WALL, WALL, WALL, WALL ; 1f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
+	tilecoll WATER, WATER, WATER, WATER ; 23
+	tilecoll WATER, WATER, WATER, WATER ; 24
+	tilecoll WATER, WATER, WATER, WATER ; 25
+	tilecoll WATER, WATER, WATER, WATER ; 26
+	tilecoll WATER, WATER, WATER, WATER ; 27
+	tilecoll WATER, WATER, WATER, WATER ; 28
+	tilecoll WATER, WATER, WATER, WATER ; 29
+	tilecoll WATER, WATER, WATER, WATER ; 2a
+	tilecoll WATER, WATER, WATER, WATER ; 2b
+	tilecoll WATER, WATER, WATER, WATER ; 2c
+	tilecoll WATER, WATER, WATER, WATER ; 2d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
+	tilecoll WALL, WALL, WALL, WALL ; 30
+	tilecoll WALL, WALL, WALL, WALL ; 31
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
+	tilecoll WALL, WALL, WALL, DOOR ; 34
+	tilecoll WALL, WALL, WALL, WALL ; 35
+	tilecoll WALL, WALL, WALL, WALL ; 36
+	tilecoll WALL, WALL, WALL, WALL ; 37
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 38
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 39
+	tilecoll WALL, WALL, WALL, WALL ; 3a
+	tilecoll WALL, WALL, DOOR, WALL ; 3b
+	tilecoll WALL, WALL, WALL, FLOOR ; 3c
+	tilecoll WALL, WALL, FLOOR, WALL ; 3d
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 3e
+	tilecoll WALL, WALL, WALL, WALL ; 3f
+	tilecoll WALL, FLOOR, WALL, WALL ; 40
+	tilecoll FLOOR, WALL, WALL, WALL ; 41
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 42
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 43
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 44
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 45
+	tilecoll WALL, WALL, WALL, WALL ; 46
+	tilecoll WALL, WALL, WALL, WALL ; 47
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 48
+	tilecoll WALL, WALL, WALL, WALL ; 49
+	tilecoll WALL, WALL, WALL, WALL ; 4a
+	tilecoll WALL, WALL, WALL, WALL ; 4b
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 4c
+	tilecoll WALL, WALL, WALL, WALL ; 4d
+	tilecoll WALL, WALL, DOOR, DOOR ; 4e
+	tilecoll WALL, WALL, WALL, WALL ; 4f
+	tilecoll WALL, FLOOR, WALL, WALL ; 50
+	tilecoll FLOOR, WALL, WALL, WALL ; 51
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 52
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 53
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 54
+	tilecoll WALL, WALL, WALL, WALL ; 55
+	tilecoll FLOOR, FLOOR, CAVE, FLOOR ; 56
+	tilecoll WALL, WALL, WALL, WALL ; 57
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 58
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 59
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5a
+	tilecoll WALL, WALL, FLOOR, WALL ; 5b
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 5c
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 5d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5e
+	tilecoll WALL, WALL, WALL, FLOOR ; 5f
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 60
+	tilecoll WALL, FLOOR, WALL, WALL ; 61
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 62
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 63
+	tilecoll WALL, WALL, WALL, FLOOR ; 64
+	tilecoll WALL, WALL, FLOOR, WALL ; 65
+	tilecoll WALL, WATER, WALL, WATER ; 66
+	tilecoll WATER, WALL, WATER, WALL ; 67
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 68
+	tilecoll WALL, WALL, WALL, WALL ; 69
+	tilecoll WALL, WALL, WALL, WALL ; 6a
+	tilecoll WATER, WATER, WATER, WATER ; 6b
+	tilecoll WATER, WATER, WALL, WALL ; 6c
+	tilecoll WALL, WALL, WATER, WATER ; 6d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 70
+	tilecoll WALL, WALL, WALL, WALL ; 71
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 72
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 73
+	tilecoll WALL, WALL, WALL, WALL ; 74
+	tilecoll WALL, WALL, WALL, WALL ; 75
+	tilecoll WALL, WALL, WALL, WALL ; 76
+	tilecoll WALL, WALL, WALL, WALL ; 77

engine/tilesets/tileset_anims.asm

@@ -38,6 +38,7 @@ _AnimateTileset::
 Tileset0Anim:
 TilesetJohtoModernAnim:
 TilesetKantoAnim:
+TilesetKagawaAnim:
 	dw vTiles2 tile $14, AnimateWaterTile
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation

gfx/sgb/predef.pal

@@ -23,6 +23,7 @@
 	RGB 31,31,31, 31,20,20, 15,20,31, 00,00,00 ; PREDEFPAL_LAKE_OF_RAGE
 	RGB 31,31,31, 26,26,26, 15,20,31, 00,00,00 ; PREDEFPAL_SILVER_CAVE
 	RGB 31,31,31, 21,14,09, 15,20,20, 00,00,00 ; PREDEFPAL_DUNGEONS
+	RGB 31,31,31, 21,14,09, 15,20,20, 00,00,00 ; PREDEFPAL_KAGAWA
 	RGB 31,31,31, 12,28,22, 15,20,20, 00,00,00 ; PREDEFPAL_NITE
 	RGB 31,31,31, 07,07,07, 02,03,03, 00,00,00 ; PREDEFPAL_BLACKOUT
 	RGB 31,31,31, 30,22,17, 16,14,19, 00,00,00 ; PREDEFPAL_DIPLOMA

gfx/tilesets.asm

@@ -451,3 +451,17 @@ INCBIN "data/tilesets/omanyte_word_room_attributes.bin"
 
 TilesetAerodactylWordRoomAttr::
 INCBIN "data/tilesets/aerodactyl_word_room_attributes.bin"
+
+SECTION "Tileset Data 12", ROMX
+
+TilesetKagawaGFX::
+INCBIN "gfx/tilesets/kagawa.2bpp.lz"
+
+TilesetKagawaMeta::
+INCBIN "data/tilesets/kagawa_metatiles.bin"
+
+TilesetKagawaColl::
+INCLUDE "data/tilesets/kagawa_collision.asm"
+
+TilesetKagawaAttr::
+INCBIN "data/tilesets/kagawa_attributes.bin"

gfx/tilesets/roofs.pal

@@ -105,3 +105,7 @@
 ; group 26 (Cherrygrove)
 	RGB 31,14,28, 31,05,21 ; morn/day
 	RGB 14,07,17, 13,00,08 ; nite
+
+; group 27 (Kagawa)
+	RGB 31,15,18, 19,05,08 ; morn/day
+	RGB 21,15,24, 10,5,14 ; nite

maps/HonzuTown.ablk

@@ -0,0 +1 @@
+S.2.RS.2.R

S.2.RL01LL01Q.2.P
$%%C45.C45..2....>>()).//..//..2..C.....$-))3333333333333333$-)))

2




()))*
201


()*IJK01265


MNO45201010101DD/DDDDD2456565453333333333333333333333<EEE=2<E=201010101012@:;245>4565265D653333333333

maps/HonzuTown.asm

@@ -0,0 +1,21 @@
+	object_const_def
+
+
+HonzuTown_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+
+HonzuTown_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event  7,  10, PLAYERS_HOUSE_2F, 1
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events
+

maps/PlayersHouse2F.asm

@@ -116,7 +116,7 @@ PlayersHouse2F_MapEvents:
 	db 0, 0 ; filler
 
 	def_warp_events
-	warp_event  7,  0, PLAYERS_HOUSE_1F, 3
+	warp_event  7,  0, HONZU_TOWN, 1
 
 	def_coord_events