thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 23:55:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Citrine Mart

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/headers/CitrineMart.asm Normal file
View file

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

2
data/maps/map_header_banks.asm
View file

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

4
data/maps/map_header_pointers.asm
View file

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

1
data/maps/objects/CitrineCity.asm
View file

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

16
data/maps/objects/CitrineMart.asm Normal file
View file

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

2
data/maps/songs.asm
View file

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