Citrine Mart

This adds Citrine Mart, which is battle-centric. It sells all the "strongest" items and makes Max Revives renewable.

I made a specialised tileset for Citrine Mart, combining the old and new styles to make something that feels right.

data/maps/headers/CitrineMart.asm

@@ -0,0 +1,2 @@
+	map_header CitrineMart, CITRINE_MART, BETAMART, 0
+	end_map_header

data/maps/map_header_banks.asm

@@ -206,7 +206,7 @@ MapHeaderBanks::
 	db BANK(RocketHideoutB3F_h)
 	db BANK(RocketHideoutB4F_h)
 	db BANK(RocketHideoutElevator_h)
-	db $01 ; UNUSED_MAP_CC
+	db BANK(CitrineMart_h) ; was UNUSED_MAP_CC
 	db $01 ; UNUSED_MAP_CD
 	db $01 ; UNUSED_MAP_CE
 	db BANK(SilphCo2F_h)

data/maps/map_header_pointers.asm

@@ -206,8 +206,8 @@ MapHeaderPointers::
 	dw RocketHideoutB3F_h
 	dw RocketHideoutB4F_h
 	dw RocketHideoutElevator_h
-	dw RocketHideoutElevator_h ; UNUSED_MAP_CC
-	dw RocketHideoutElevator_h ; UNUSED_MAP_CD
+	dw CitrineMart_h ; UNUSED_MAP_CC
+	dw RocketHideoutElevator_h ; UNUSED_MAP_CD, used hideout elevator
 	dw RocketHideoutElevator_h ; UNUSED_MAP_CE
 	dw SilphCo2F_h
 	dw SilphCo3F_h

data/maps/objects/CitrineCity.asm

@@ -5,6 +5,7 @@ CitrineCity_Object:
 	warp_event  9, 27, CITRINE_ROCKET_HOUSE, 1
 	warp_event  9, 17, CITRINE_TRADEBACK_HOUSE, 1
 	warp_event 15, 17, CITRINE_POKECENTER, 1
+	warp_event 15, 27, CITRINE_MART, 1
 
 	def_bg_events
 

data/maps/objects/CitrineMart.asm

@@ -0,0 +1,16 @@
+CitrineMart_Object:
+	db $0e ; border block
+
+	def_warp_events
+	warp_event  2,  7, CITRINE_CITY, 4
+	warp_event  3,  7, CITRINE_CITY, 4
+
+	def_bg_events
+
+	def_object_events
+	object_event  2,  1, SPRITE_CLERK, STAY, RIGHT, 1 ; person
+	object_event  6,  6, SPRITE_COOLTRAINER_F, STAY, UP, 2 ; person
+	object_event  7,  6, SPRITE_CAT, STAY, UP, 3 ; person
+	object_event  1,  1, SPRITE_CLEFAIRY, STAY, DOWN, 4 ; person
+
+	def_warps_to CITRINE_MART

data/maps/songs.asm

@@ -205,7 +205,7 @@ MapSongBanks::
 	db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B3F
 	db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B4F
 	db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_ELEVATOR
-	db MUSIC_DUNGEON1, 0 ; UNUSED_MAP_CC
+	db MUSIC_POKECENTER, 0 ; CITRINE_MART, was UNUSED_MAP_CC
 	db MUSIC_DUNGEON1, 0 ; UNUSED_MAP_CD
 	db MUSIC_DUNGEON1, 0 ; UNUSED_MAP_CE
 	db MUSIC_SILPH_CO, 0 ; SILPH_CO_2F

data/tilesets/bookshelf_tile_ids.asm

@@ -26,4 +26,11 @@ BookshelfTileIDs:
 	bookshelf_tile PREGYM,		 $57, BookOrSculptureText
 	bookshelf_tile ROCKETHOUSE,  $38, BookOrSculptureText
 	bookshelf_tile ROCKETHOUSE,  $39, BookOrSculptureText
+	bookshelf_tile BETAMART,	 $38, PokemonStuffText
+	bookshelf_tile BETAMART,	 $39, PokemonStuffText
+	bookshelf_tile BETAMART,	 $3B, PokemonStuffText
+	bookshelf_tile BETAMART,	 $31, BookOrSculptureText
+	bookshelf_tile BETAMART,	 $30, BookOrSculptureText
+	bookshelf_tile BETAMART,	 $4E, PokemonStuffText
+	bookshelf_tile BETAMART,	 $4F, PokemonStuffText
 	db -1 ; end

data/tilesets/collision_tile_ids.asm

@@ -49,8 +49,6 @@ Interior_Coll::
 Cavern_Coll::
 	coll_tiles $05, $15, $18, $1a, $20, $21, $22, $2a, $2d, $30
 
-	coll_tiles ; unused
-
 Lobby_Coll::
 	coll_tiles $14, $17, $1a, $1c, $20, $38, $45
 
@@ -80,3 +78,6 @@ Celeste_Coll::
 
 RocketHouse_Coll::
 	coll_tiles $13, $31, $01, $53
+
+BetaMart_Coll::
+	coll_tiles $01, $11, $1C, $1D, $1E, $1F, $0C, $0D, $0E, $0F, $4D, $4C

data/tilesets/tileset_headers.asm

@@ -37,4 +37,5 @@ Tilesets:
 	tileset Citrine,	 -1,  -1,  -1, $3F, TILEANIM_WATER_FLOWER
 	tileset Celeste,	 -1,  -1,  -1, $18, TILEANIM_WATER_FLOWER
 	tileset RocketHouse, $0A,  -1,  -1, -1, TILEANIM_NONE
+	tileset BetaMart,    $18, -1, -1,  -1, TILEANIM_NONE
 	assert_table_length NUM_TILESETS

data/tilesets/warp_tile_ids.asm

@@ -28,6 +28,7 @@ WarpTileIDPointers:
 	dw .CitrineWarpTileIDs
 	dw .CelesteWarpTileIDs
 	dw .RocketHouseWarpTileIDs
+	dw .BetaMartWarpTileIDs
 	assert_table_length NUM_TILESETS
 
 MACRO warp_tiles
@@ -106,6 +107,9 @@ ENDM
 .RocketHouseWarpTileIDs:
 	warp_tiles $53
 
+.BetaMartWarpTileIDs:
+	warp_tiles $1C, $1D, $1E, $1F, $0C, $0D, $0E, $0F, $4B, $4C
+
 .ShipPortWarpTileIDs:
 .ClubWarpTileIDs:
 	warp_tiles ; end