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

Establish Brunswick Grotto

Browse source 
The warp at the moment is an absolute travesty, something on that tileset needs to change. Either that or we figure out something else.

Everything in the Grotto is done, except for making Galarian Zapdos disappear after being defeated. At least, to my knowledge...

Pokemon Tower 3F is dead until future notice - Martha said she wanted to compress the Diglett's Cave maps, though.
This commit is contained in:
Llinos Evans 2023-06-17 07:56:30 +01:00
parent 2bdf1f2a9d
commit 5279e8a06e
24 changed files with 117 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

15
data/maps/hide_show_data.asm
View file

@ -150,7 +150,8 @@ MapHSPointers:
dw NoHS
dw NoHS
dw PokemonTower2FHS
dw PokemonTower3FHS
dw BrunswickGrottoHS ; Brunswick Grotto
;dw PokemonTower3FHS
dw PokemonTower4FHS
dw PokemonTower5FHS
dw PokemonTower6FHS
@ -258,7 +259,6 @@ MapHSPointers:
dw NoHS ; Mt Moon Square House
dw NoHS ; Celeste Hill Cave
dw NoHS ; Celeste Hill Outside
dw NoHS ; Brunswick Grotto, should have HS Data later.
assert_table_length NUM_MAPS
dw -1 ; end
@ -326,7 +326,6 @@ 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
BluesHouseHS:
db BLUES_HOUSE, $01, SHOW ; HS_DAISY_SITTING
db BLUES_HOUSE, $02, HIDE ; HS_DAISY_WALKING
@ -355,8 +354,11 @@ CelesteHillHS:
db CELESTE_HILL, $03, SHOW ; HS_MOLTRES_G
PokemonTower2FHS:
db POKEMON_TOWER_2F, $01, SHOW ; HS_POKEMON_TOWER_2F_RIVAL
PokemonTower3FHS:
db POKEMON_TOWER_3F, $04, SHOW ; HS_POKEMON_TOWER_3F_ITEM
BrunswickGrottoHS:
db BRUNSWICK_GROTTO, $01, SHOW ; HS_BRUNSWICK_ZAPDOS_G_1
db BRUNSWICK_GROTTO, $02, HIDE ; HS_BRUNSWICK_ZAPDOS_G_2
;PokemonTower3FHS:
; db POKEMON_TOWER_3F, $04, SHOW ; HS_POKEMON_TOWER_3F_ITEM
PokemonTower4FHS:
db POKEMON_TOWER_4F, $04, SHOW ; HS_POKEMON_TOWER_4F_ITEM_1
db POKEMON_TOWER_4F, $05, SHOW ; HS_POKEMON_TOWER_4F_ITEM_2
@ -504,7 +506,6 @@ SilphCo7FHS:
db SILPH_CO_7F, $09, SHOW ; HS_SILPH_CO_7F_RIVAL
db SILPH_CO_7F, $0A, SHOW ; HS_SILPH_CO_7F_ITEM_1
db SILPH_CO_7F, $0B, SHOW ; HS_SILPH_CO_7F_ITEM_2
db SILPH_CO_7F, $0C, SHOW ; HS_SILPH_CO_7F_8
SilphCo8FHS:
db SILPH_CO_8F, $02, SHOW ; HS_SILPH_CO_8F_1
db SILPH_CO_8F, $03, SHOW ; HS_SILPH_CO_8F_2
@ -613,6 +614,4 @@ 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

4
data/maps/map_header_banks.asm
View file

@ -148,7 +148,8 @@ MapHeaderBanks::
db BANK(LavenderPokecenter_h)
db BANK(PokemonTower1F_h)
db BANK(PokemonTower2F_h)
db BANK(PokemonTower3F_h)
db BANK(BrunswickGrotto_h)
;db BANK(PokemonTower3F_h)
db BANK(PokemonTower4F_h)
db BANK(PokemonTower5F_h)
db BANK(PokemonTower6F_h)
@ -256,5 +257,4 @@ MapHeaderBanks::
db BANK(MtMoonSquareHouse_h)
db BANK(CelesteHillCave_h)
db BANK(CelesteHillOutside_h)
db BANK(BrunswickGrotto_h)
assert_table_length NUM_MAPS

4
data/maps/map_header_pointers.asm
View file

@ -148,7 +148,8 @@ MapHeaderPointers::
dw LavenderPokecenter_h
dw PokemonTower1F_h
dw PokemonTower2F_h
dw PokemonTower3F_h
dw BrunswickGrotto_h
;dw PokemonTower3F_h
dw PokemonTower4F_h
dw PokemonTower5F_h
dw PokemonTower6F_h
@ -256,5 +257,4 @@ MapHeaderPointers::
dw MtMoonSquareHouse_h
dw CelesteHillCave_h
dw CelesteHillOutside_h
dw BrunswickGrotto_h
assert_table_length NUM_MAPS

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

@ -2,10 +2,14 @@ BrunswickGrotto_Object:
db $0 ; border block
def_warp_events
warp_event 4, 11, 0, REDS_HOUSE_2F
warp_event 24, 23, BRUNSWICK_TRAIL, 2
warp_event 25, 23, BRUNSWICK_TRAIL, 2
def_bg_events
bg_event 22, 9, 3 ; 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
def_warps_to BRUNSWICK_GROTTO

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

@ -2,13 +2,13 @@ BrunswickTrail_Object:
db $43 ; border block
def_warp_events
warp_event 24, 11, CELESTE_HILL, 2
warp_event 24, 11, CELESTE_HILL_CAVE, 1
warp_event 46, 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 37, 23, SPRITE_BRUNETTE_GIRL, STAY, DOWN, 2 ; person
object_event 46, 7, SPRITE_BIRD, STAY, DOWN, 3, ZAPDOS_G, 70 | OW_POKEMON ; person
def_warps_to BRUNSWICK_TRAIL

2
data/maps/objects/PokemonTower4F.asm
View file

@ -3,7 +3,7 @@ PokemonTower4F_Object:
def_warp_events
warp_event 3, 9, POKEMON_TOWER_5F, 1
warp_event 18, 9, POKEMON_TOWER_3F, 2
;warp_event 18, 9, POKEMON_TOWER_3F, 2
def_bg_events

4
data/maps/songs.asm
View file

@ -147,7 +147,8 @@ MapSongBanks::
db MUSIC_POKECENTER, 0 ; LAVENDER_POKECENTER
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_1F
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_2F
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_3F
db MUSIC_KINCHOU01, 0 ; BRUNSWICK_GROTTO
;db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_3F
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_4F
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_5F
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_6F
@ -255,5 +256,4 @@ MapSongBanks::
db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE_HOUSE
db MUSIC_KINCHOU01, 0 ; CELESTE_HILL_CAVE
db MUSIC_KINCHOU01, 0 ; CELESTE_HILL_OUTSIDE
db MUSIC_DUNGEON2, 0 ; BRUNSWICK_GROTTO
assert_table_length NUM_MAPS