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 Rocket House

Browse source 
This map is pretty much finished, save for the map sprites for Jessie, James, and the unused Cat (aka Meowth) being imported, as well as an & symbol. This adds everything else - the marts, the Rocket Trio fight, the meeting music, the tileset, the trainer class for Jessie/James, I could go on. A ton of work well-done.
This commit is contained in:
Llinos Evans 2023-04-22 20:49:19 +01:00
parent 437602bf21
commit 78d3ed63f2
37 changed files with 287 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1,2 @@
map_header CitrineRocketHouse, CITRINE_ROCKET_HOUSE, ROCKETHOUSE, 0
end_map_header

2
data/maps/map_header_banks.asm
View file

@ -80,7 +80,7 @@ MapHeaderBanks::
db BANK(CelesteHill_h) ; was db BANK(UndergroundPathRoute6_h), UNDERGROUND_PATH_ROUTE_6_COPY
db BANK(Route7Gate_h)
db BANK(UndergroundPathRoute7_h)
db BANK(UndergroundPathRoute7Copy_h)
db BANK(CitrineRocketHouse_h) ; was db BANK(UndergroundPathRoute7Copy_h)
db BANK(Route8Gate_h)
db BANK(UndergroundPathRoute8_h)
db BANK(RockTunnelPokecenter_h)

2
data/maps/map_header_pointers.asm
View file

@ -80,7 +80,7 @@ MapHeaderPointers::
dw CelesteHill_h ; was dw UndergroundPathRoute6_h, UNDERGROUND_PATH_ROUTE_6_COPY
dw Route7Gate_h
dw UndergroundPathRoute7_h
dw UndergroundPathRoute7Copy_h
dw CitrineRocketHouse_h ; was dw UndergroundPathRoute7Copy_h
dw Route8Gate_h
dw UndergroundPathRoute8_h
dw RockTunnelPokecenter_h

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

@ -2,6 +2,7 @@ CitrineCity_Object:
db $43 ; border block
def_warp_events
warp_event 9, 27, CITRINE_ROCKET_HOUSE, 1
def_bg_events

19
data/maps/objects/CitrineRocketHouse.asm Normal file
View file

@ -0,0 +1,19 @@
CitrineRocketHouse_Object:
db $01 ; border block
def_warp_events
warp_event 4, 9, CITRINE_CITY, 1
warp_event 5, 9, CITRINE_CITY, 1
def_bg_events
def_object_events
object_event 4, 1, SPRITE_ROCKET, STAY, DOWN, 1 ; Mart Guy
object_event 5, 1, SPRITE_ROCKET, STAY, DOWN, 2 ; Mart Guy
object_event 1, 6, SPRITE_ROCKET, STAY, RIGHT, 3 ; person
object_event 9, 3, SPRITE_ROCKET, STAY, UP, 4 ; person
object_event 9, 8, SPRITE_ROCKET, STAY, UP, 5 ; Meowth ; SPRITE_CAT
object_event 9, 5, SPRITE_ROCKET, STAY, DOWN, 6 ; James ; SPRITE_JAMES
object_event 7, 6, SPRITE_ROCKET, STAY, RIGHT, 7 ; Jessie ; SPRITE_JESSIE
def_warps_to CITRINE_ROCKET_HOUSE

2
data/maps/songs.asm
View file

@ -79,7 +79,7 @@ MapSongBanks::
db MUSIC_DUNGEON2, 0 ; CELESTE_HILL, was UNDERGROUND_PATH_ROUTE_6_COPY
db MUSIC_CITIES1, 0 ; ROUTE_7_GATE
db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_7
db MUSIC_CELADON, 0 ; UNDERGROUND_PATH_ROUTE_7_COPY
db MUSIC_DUNGEON1, 0 ; Rocket House, UNDERGROUND_PATH_ROUTE_7_COPY
db MUSIC_CITIES1, 0 ; ROUTE_8_GATE
db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_8
db MUSIC_POKECENTER, 0 ; ROCK_TUNNEL_POKECENTER

1
data/maps/town_map_entries.asm
View file

@ -69,7 +69,6 @@ InternalMapEntries:
internal_map DAYCARE, 10, 4, Route5Name
internal_map UNDERGROUND_PATH_ROUTE_6, 10, 8, Route6Name
internal_map CELESTE_HILL, 6, 10, CelesteHillName
internal_map UNDERGROUND_PATH_ROUTE_7_COPY, 9, 5, Route7Name
internal_map UNDERGROUND_PATH_ROUTE_8, 11, 5, Route8Name
internal_map ROCK_TUNNEL_1F, 14, 3, RockTunnelName
internal_map POWER_PLANT, 15, 4, PowerPlantName