thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-21 14:48:43 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

BIG changes to postgame island

Browse source 
- Properly adds Brunswick Grotto, as well as Celeste Hill Outside and Celeste Hill Cave
- Citrine City received a minor redesign, putting the path to Brunswick Trail more to the west
- Added complete event for Galarian Zapdos as well as an encounterable, but unfinished Galarian Moltres, so all 3 birds can currently be caught
This commit is contained in:
Martha Schilling 2023-06-17 20:36:01 +01:00
parent 5279e8a06e
commit f9d6534bcf
34 changed files with 208 additions and 299 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/headers/BrunswickGrotto.asm
View file

@ -1,2 +1,2 @@
map_header BrunswickGrotto, BRUNSWICK_GROTTO, FOREST, 0
map_header BrunswickGrotto, BRUNSWICK_GROTTO, CELESTE, 0
end_map_header

2
data/maps/headers/BrunswickTrail.asm
View file

@ -1,3 +1,3 @@
map_header BrunswickTrail, BRUNSWICK_TRAIL, CITRINE, NORTH
connection north, CitrineCity, CITRINE_CITY, 18
connection north, CitrineCity, CITRINE_CITY, 24
end_map_header

2
data/maps/headers/CitrineCity.asm
View file

@ -1,3 +1,3 @@
map_header CitrineCity, CITRINE_CITY, CITRINE, SOUTH
connection south, BrunswickTrail, BRUNSWICK_TRAIL, -18
connection south, BrunswickTrail, BRUNSWICK_TRAIL, -24
end_map_header

9
data/maps/hide_show_data.asm
View file

@ -326,6 +326,7 @@ Route25HS:
db ROUTE_25, $0A, SHOW ; HS_ROUTE_25_ITEM
BrunswickTrailHS:
db BRUNSWICK_TRAIL, $01, SHOW ; HS_CACTUS
db BRUNSWICK_TRAIL, $03, SHOW ; HS_BRUNSWICK_ZAPDOS_G_1
BluesHouseHS:
db BLUES_HOUSE, $01, SHOW ; HS_DAISY_SITTING
db BLUES_HOUSE, $02, HIDE ; HS_DAISY_WALKING
@ -349,14 +350,11 @@ CeruleanCaveHS:
db CERULEAN_CAVE_1F, $02, SHOW ; HS_CERULEAN_CAVE_1F_ITEM_2
db CERULEAN_CAVE_1F, $03, SHOW ; HS_CERULEAN_CAVE_1F_ITEM_3
CelesteHillHS:
db CELESTE_HILL, $01, SHOW ; HS_CELESTE_ZAPDOS_G
db CELESTE_HILL, $02, SHOW ; HS_CELESTE_ARTICUNO_G
db CELESTE_HILL, $03, SHOW ; HS_MOLTRES_G
db CELESTE_HILL, $01, SHOW ; HS_MOLTRES_G
PokemonTower2FHS:
db POKEMON_TOWER_2F, $01, SHOW ; HS_POKEMON_TOWER_2F_RIVAL
BrunswickGrottoHS:
db BRUNSWICK_GROTTO, $01, SHOW ; HS_BRUNSWICK_ZAPDOS_G_1
db BRUNSWICK_GROTTO, $02, HIDE ; HS_BRUNSWICK_ZAPDOS_G_2
db BRUNSWICK_GROTTO, $01, SHOW ; HS_BRUNSWICK_ZAPDOS_G_2
;PokemonTower3FHS:
; db POKEMON_TOWER_3F, $04, SHOW ; HS_POKEMON_TOWER_3F_ITEM
PokemonTower4FHS:
@ -614,4 +612,5 @@ RockTunnelB1FHS:
db ROCK_TUNNEL_B1F, $0B, SHOW ; HS_ROCK_TUNNEL_B1F_HELIX
db ROCK_TUNNEL_B1F, $0C, SHOW ; HS_ROCK_TUNNEL_B1F_AMBER
db ROCK_TUNNEL_B1F, $0D, SHOW ; HS_ROCK_TUNNEL_B1F_WING
db $FF, $01, SHOW ; end
assert_table_length NUM_HS_OBJECTS + 1

5
data/maps/objects/BrunswickGrotto.asm
View file

@ -6,10 +6,9 @@ BrunswickGrotto_Object:
warp_event 25, 23, BRUNSWICK_TRAIL, 2
def_bg_events
bg_event 22, 9, 3 ; signage
bg_event 22, 10, 2 ; signage
def_object_events
object_event 6, 4, SPRITE_BIRD, STAY, DOWN, 1 ; person
object_event 27, 2, SPRITE_BIRD, STAY, LEFT, 2, ZAPDOS_G, 70 | OW_POKEMON ; person
object_event 6, 4, SPRITE_BIRD, STAY, LEFT, 1, ZAPDOS_G, 70 | OW_POKEMON ; person
def_warps_to BRUNSWICK_GROTTO

8
data/maps/objects/BrunswickTrail.asm
View file

@ -2,13 +2,15 @@ BrunswickTrail_Object:
db $43 ; border block
def_warp_events
warp_event 24, 11, CELESTE_HILL_CAVE, 1
warp_event 46, 5, BRUNSWICK_GROTTO, 1
warp_event 12, 9, GARNET_CAVERN_1F, 1
warp_event 40, 5, BRUNSWICK_GROTTO, 1
warp_event 41, 5, BRUNSWICK_GROTTO, 1
def_bg_events
def_object_events
object_event 29, 11, SPRITE_FAKE_TREE, STAY, NONE, 1, CACTUS, 60 | OW_POKEMON ; person
object_event 23, 11, SPRITE_FAKE_TREE, STAY, NONE, 1, CACTUS, 60 | OW_POKEMON ; person
object_event 37, 23, SPRITE_BRUNETTE_GIRL, STAY, DOWN, 2 ; person
object_event 40, 6, SPRITE_BIRD, STAY, UP, 3 ; person
def_warps_to BRUNSWICK_TRAIL

9
data/maps/objects/CelesteHill.asm
View file

@ -2,16 +2,13 @@ CelesteHill_Object:
db $0 ; border block
def_warp_events
warp_event 12, 23, BRUNSWICK_TRAIL, 1
warp_event 13, 23, BRUNSWICK_TRAIL, 1
warp_event 10, 21, CELESTE_HILL_OUTSIDE, 7
warp_event 11, 21, CELESTE_HILL_OUTSIDE, 8
def_bg_events
bg_event 12, 20, 2
bg_event 12, 8, 3
bg_event 10, 12, 2
def_object_events
object_event 12, 7, SPRITE_BIRD, STAY, DOWN, 1 ; person
object_event 13, 6, SPRITE_BIRD, STAY, DOWN, 1 ; person
object_event 11, 6, SPRITE_BIRD, STAY, DOWN, 1, MOLTRES_G, 70 | OW_POKEMON ; person
def_warps_to CELESTE_HILL

10
data/maps/objects/CelesteHillCave.asm
View file

@ -1,8 +1,14 @@
CelesteHillCave_Object:
db $0 ; border block
db $03 ; border block
def_warp_events
warp_event 4, 11, 0, REDS_HOUSE_2F
warp_event 18, 35, CELESTE_HILL_OUTSIDE, 3
warp_event 19, 35, CELESTE_HILL_OUTSIDE, 3
warp_event 19, 25, CELESTE_HILL_CAVE, 4
warp_event 2, 16, CELESTE_HILL_CAVE, 3
warp_event 37, 13, CELESTE_HILL_OUTSIDE, 4
warp_event 3, 3, CELESTE_HILL_OUTSIDE, 5
warp_event 35, 2, CELESTE_HILL_OUTSIDE, 6
def_bg_events

9
data/maps/objects/CelesteHillOutside.asm
View file

@ -2,7 +2,14 @@ CelesteHillOutside_Object:
db $0 ; border block
def_warp_events
warp_event 4, 11, 0, REDS_HOUSE_2F
warp_event 18, 35, CITRINE_CITY, 5
warp_event 19, 35, CITRINE_CITY, 5
warp_event 16, 23, CELESTE_HILL_CAVE, 1
warp_event 36, 11, CELESTE_HILL_CAVE, 5
warp_event 2, 9, CELESTE_HILL_CAVE, 6
warp_event 22, 3, CELESTE_HILL_CAVE, 7
warp_event 18, 0, CELESTE_HILL, 1
warp_event 19, 0, CELESTE_HILL, 2
def_bg_events

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

@ -6,10 +6,10 @@ CitrineCity_Object:
warp_event 9, 17, CITRINE_TRADEBACK_HOUSE, 1
warp_event 15, 17, CITRINE_POKECENTER, 1
warp_event 15, 27, CITRINE_MART, 1
warp_event 22, 5, GARNET_CAVERN_1F, 1
warp_event 23, 5, CELESTE_HILL_OUTSIDE, 1
warp_event 11, 7, BATTLE_TENT, 1
warp_event 35, 31, VERMILION_CITY, 6
warp_event 35, 30, VERMILION_CITY, 6
warp_event 27, 33, VERMILION_CITY, 6
warp_event 26, 33, VERMILION_CITY, 6
def_bg_events
bg_event 16, 27, 5 ; Citrine Shop
@ -18,13 +18,13 @@ CitrineCity_Object:
bg_event 5, 18, 8 ; Billboard 2
bg_event 9, 7, 9 ; Battle Tower
bg_event 25, 23, 10 ; City Sign
bg_event 21, 26, 11 ; Directions
bg_event 23, 7, 12 ; Garnet Cavern Sign
bg_event 21, 28, 11 ; Directions
bg_event 25, 7, 12 ; Celeste Hill Sign
def_object_events
object_event 12, 18, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person
object_event 6, 9, SPRITE_HIKER, WALK, LEFT_RIGHT, 2 ; person
object_event 20, 26, SPRITE_GENTLEMAN, STAY, UP, 3 ; person
object_event 10, 30, SPRITE_ROCKER, WALK, ANY_DIR, 4 ; person
object_event 31, 28, SPRITE_ROCKER, WALK, ANY_DIR, 4 ; person
def_warps_to CITRINE_CITY

4
data/maps/objects/GarnetCavern1F.asm
View file

@ -2,8 +2,8 @@ GarnetCavern1F_Object:
db $7d ; border block
def_warp_events
warp_event 24, 17, CITRINE_CITY, 5
warp_event 25, 17, CITRINE_CITY, 5
warp_event 24, 17, BRUNSWICK_TRAIL, 1
warp_event 25, 17, BRUNSWICK_TRAIL, 1
warp_event 27, 1, GARNET_CAVERN_2F, 1
warp_event 23, 7, GARNET_CAVERN_2F, 2

12
data/maps/songs.asm
View file

@ -78,7 +78,7 @@ MapSongBanks::
db MUSIC_CITIES1, 0 ; DAYCARE
db MUSIC_CITIES1, 0 ; ROUTE_6_GATE
db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_6
db MUSIC_DUNGEON2, 0 ; CELESTE_HILL, was UNDERGROUND_PATH_ROUTE_6_COPY
db MUSIC_KINCHOU01, 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_DUNGEON1, 0 ; Rocket House, UNDERGROUND_PATH_ROUTE_7_COPY
@ -208,8 +208,8 @@ MapSongBanks::
db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B4F
db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_ELEVATOR
db MUSIC_POKECENTER, 0 ; CITRINE_MART, was UNUSED_MAP_CC
db MUSIC_DUNGEON3, 0 ; GARNET_CAVERN_1F, was UNUSED_MAP_CD
db MUSIC_DUNGEON3, 0 ; GARNET_CAVERN_2F, was UNUSED_MAP_CE
db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_1F, was UNUSED_MAP_CD
db MUSIC_KINCHOU01, 0 ; GARNET_CAVERN_B1F, was UNUSED_MAP_CE
db MUSIC_SILPH_CO, 0 ; SILPH_CO_2F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_3F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_4F
@ -240,7 +240,7 @@ MapSongBanks::
db MUSIC_SILPH_CO, 0 ; SILPH_CO_10F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_ELEVATOR
db MUSIC_DUNGEON3, 0 ; GARNET_CAVERN_2F, was UNUSED_MAP_ED
db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_2F, was UNUSED_MAP_ED
db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_EE / Underwater Tunnel
db MUSIC_CELADON, 0 ; TRADE_CENTER
db MUSIC_CELADON, 0 ; COLOSSEUM
@ -254,6 +254,6 @@ MapSongBanks::
db MUSIC_GYM, 0 ; BATTLE_TENT
db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE
db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE_HOUSE
db MUSIC_KINCHOU01, 0 ; CELESTE_HILL_CAVE
db MUSIC_KINCHOU01, 0 ; CELESTE_HILL_OUTSIDE
db MUSIC_SILPH_CO, 0 ; CELESTE_HILL_CAVE
db MUSIC_SILPH_CO, 0 ; CELESTE_HILL_OUTSIDE
assert_table_length NUM_MAPS