thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45: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

8
data/items/prices.asm
View file

@ -30,7 +30,7 @@ ItemPrices::
bcd3 0 ; EARTHBADGE
bcd3 550 ; ESCAPE_ROPE
bcd3 350 ; REPEL
bcd3 0 ; OLD_AMBER
bcd3 7000 ; OLD_AMBER
bcd3 2100 ; FIRE_STONE
bcd3 2100 ; THUNDER_STONE
bcd3 2100 ; WATER_STONE
@ -40,8 +40,8 @@ ItemPrices::
bcd3 9800 ; CARBOS
bcd3 9800 ; CALCIUM
bcd3 4800 ; RARE_CANDY
bcd3 0 ; DOME_FOSSIL
bcd3 0 ; HELIX_FOSSIL
bcd3 7000 ; DOME_FOSSIL
bcd3 7000 ; HELIX_FOSSIL
bcd3 0 ; SECRET_KEY
bcd3 2100 ; HEART_STONE
bcd3 0 ; BIKE_VOUCHER
@ -49,7 +49,7 @@ ItemPrices::
bcd3 2100 ; LEAF_STONE
bcd3 0 ; CARD_KEY
bcd3 10000 ; NUGGET
bcd3 0 ; WING_FOSSIL
bcd3 7000 ; WING_FOSSIL
bcd3 1000 ; POKE_DOLL
bcd3 600 ; FULL_HEAL
bcd3 1500 ; REVIVE

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

2
data/tilesets/bookshelf_tile_ids.asm
View file

@ -24,4 +24,6 @@ BookshelfTileIDs:
bookshelf_tile SHIP, $36, BookOrSculptureText
bookshelf_tile PREGYM, $56, BookOrSculptureText
bookshelf_tile PREGYM, $57, BookOrSculptureText
bookshelf_tile ROCKETHOUSE, $38, BookOrSculptureText
bookshelf_tile ROCKETHOUSE, $39, BookOrSculptureText
db -1 ; end

5
data/tilesets/collision_tile_ids.asm
View file

@ -76,4 +76,7 @@ Citrine_Coll::
coll_tiles $2C, $31, $3F, $55, $0E, $2F, $23, $20, $10, $03, $1C, $1B, $0B, $0C, $21, $39, $3C, $48, $49, $58, $59
Celeste_Coll::
coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f, $09, $08, $18, $19
coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f, $09, $08, $18, $19
RocketHouse_Coll::
coll_tiles $13, $31, $01, $53

1
data/tilesets/dungeon_tilesets.asm
View file

@ -10,4 +10,5 @@ DungeonTilesets:
db FACILITY
db CEMETERY
db GYM
db ROCKETHOUSE
db -1 ; end

1
data/tilesets/tileset_headers.asm
View file

@ -36,4 +36,5 @@ Tilesets:
tileset PreGym, $3A, $3B, -1, -1, TILEANIM_NONE
tileset Citrine, -1, -1, -1, $3F, TILEANIM_WATER_FLOWER
tileset Celeste, -1, -1, -1, $19, TILEANIM_WATER_FLOWER
tileset RocketHouse, $0A, -1, -1, -1, TILEANIM_NONE
assert_table_length NUM_TILESETS

6
data/tilesets/warp_tile_ids.asm
View file

@ -27,6 +27,7 @@ WarpTileIDPointers:
dw .PreGymWarpTileIDs
dw .CitrineWarpTileIDs
dw .CelesteWarpTileIDs
dw .RocketHouseWarpTileIDs
assert_table_length NUM_TILESETS
MACRO warp_tiles
@ -97,11 +98,14 @@ ENDM
warp_tiles $23
.CitrineWarpTileIDs:
warp_tiles $1B, $1C
warp_tiles $1B, $1C, $0B, $0C
.CelesteWarpTileIDs:
warp_tiles $5A, $5C, $3A, $30, $50, $51 ; Like Forest but a bit better
.RocketHouseWarpTileIDs:
warp_tiles $53
.ShipPortWarpTileIDs:
.ClubWarpTileIDs:
warp_tiles ; end

1
data/trainers/ai_pointers.asm
View file

@ -55,4 +55,5 @@ TrainerAIPointers:
dbw 3, GenericAI ; Firefighter
dbw 3, GenericAI ; Junior
dbw 2, BlackbeltAI ; Jack
dbw 2, GenericAI ; Jessie & James
assert_table_length NUM_TRAINERS

1
data/trainers/encounter_types.asm
View file

@ -14,4 +14,5 @@ EvilTrainerList::
db OPP_SCIENTIST
db OPP_GIOVANNI
db OPP_ROCKET
db OPP_JESSIE_JAMES
db -1 ; end

1
data/trainers/move_choices.asm
View file

@ -60,4 +60,5 @@ TrainerClassMoveChoiceModifications:
move_choices 1, 3, ; FIREFIGHTER
move_choices 1, 3, ; JUNIOR
move_choices 1, 3, ; JACK
move_choices 1, 3, ; JESSIE_JAMES
assert_list_length NUM_TRAINERS

1
data/trainers/names.asm
View file

@ -51,4 +51,5 @@ TrainerNames::
li "FIREFIGHTER"
li "JUNIOR"
li "JACK"
li "JESSIE&JAMES"
assert_list_length NUM_TRAINERS

8
data/trainers/parties.asm
View file

@ -51,6 +51,7 @@ TrainerDataPointers:
dw FirefighterData
dw JuniorData
dw JackData
dw JessieJamesData
assert_table_length NUM_TRAINERS
; if first byte != $FF, then
@ -676,5 +677,12 @@ JuniorData:
JackData:
JessieJamesData:
db 14, EKANS, MEOWTH, KOFFING, 0 ; Mt. Moon
db 25, KOFFING, LICKITUNG, MEOWTH, EKANS, 0 ; Rocket Hideout
db 27, MEOWTH, LICKITUNG, ARBOK, VICTREEBEL, WEEZING, 0 ; Pokemon Tower
db 31, WEEZING, ARBOK, LICKITUNG, VICTREEBEL, GYARADOS, MEOWTH, 0 ; Silph Co.
db $FF, 80, MEOWTH, 72, ARBOK, 71, WEEZING, 74, LICKILICKY, 74, VICTREEBEL, 74, GYARADOS, 0 ; Citrine Rocket House
INCLUDE "data/trainers/scaled_parties.asm"
INCLUDE "data/trainers/rival_parties.asm"

1
data/trainers/pic_pointers_money.asm
View file

@ -58,4 +58,5 @@ TrainerPicAndMoneyPointers::
pic_money FirefighterPic, 1500
pic_money JuniorPic, 1000
pic_money JackPic, 5000
pic_money JessieJamesPic, 9900
assert_table_length NUM_TRAINERS