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.
This commit is contained in:
Llinos Evans 2023-04-28 03:08:54 +01:00
parent d5708ef12e
commit 583847ae2c
21 changed files with 101 additions and 12 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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