thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-10-15 19:54:24 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

6
constants/hide_show_constants.asm
View file

@ -50,7 +50,6 @@ DEF SHOW EQU $15
const HS_ROUTE_24_ITEM ; 26 X
const HS_ROUTE_25_ITEM ; 27 X
const HS_CACTUS ; 28 X
const HS_BRUNSWICK_ZAPDOS_G ; 29 X
const HS_DAISY_SITTING ; 2A
const HS_DAISY_WALKING ; 2B
const HS_TOWN_MAP ; 2C
@ -72,7 +71,8 @@ DEF SHOW EQU $15
const HS_CELESTE_ARTICUNO_G ; 3C
const HS_MOLTRES_G ; 3D X
const HS_POKEMON_TOWER_2F_RIVAL ; 3E
const HS_POKEMON_TOWER_3F_ITEM ; 3F X
const HS_BRUNSWICK_ZAPDOS_G_1 ; 29 X
const HS_BRUNSWICK_ZAPDOS_G_2 ;was const HS_POKEMON_TOWER_3F_ITEM ; 3F X
const HS_POKEMON_TOWER_4F_ITEM_1 ; 40 X
const HS_POKEMON_TOWER_4F_ITEM_2 ; 41 X
const HS_POKEMON_TOWER_4F_ITEM_3 ; 42 X
@ -187,7 +187,7 @@ DEF SHOW EQU $15
const HS_SILPH_CO_7F_RIVAL ; AF
const HS_SILPH_CO_7F_ITEM_1 ; B0 X
const HS_SILPH_CO_7F_ITEM_2 ; B1 X
const HS_SILPH_CO_7F_8 ; B2 XXX sprite doesn't exist
const HS_SILPH_CO_7F_8 ; B2 XXX sprite doesn't exist
const HS_SILPH_CO_8F_1 ; B3
const HS_SILPH_CO_8F_2 ; B4
const HS_SILPH_CO_8F_3 ; B5

8
constants/map_constants.asm
View file

@ -166,7 +166,8 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const LAVENDER_POKECENTER, 7, 4 ; $8F
map_const POKEMON_TOWER_1F, 10, 9 ; $90
map_const POKEMON_TOWER_2F, 10, 9 ; $91
map_const POKEMON_TOWER_3F, 10, 9 ; $92 - Currently unused
map_const BRUNSWICK_GROTTO, 15, 12 ; $FF ; ooo
;map_const POKEMON_TOWER_3F, 10, 9 ; $92 - Currently unused
map_const POKEMON_TOWER_4F, 10, 9 ; $93 - Currently unused
map_const POKEMON_TOWER_5F, 10, 9 ; $94 - Currently unused
map_const POKEMON_TOWER_6F, 10, 9 ; $95
@ -272,9 +273,8 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const BATTLE_TENT, 5, 10 ; $FA
map_const MT_MOON_SQUARE, 13, 7 ; $FB
map_const MT_MOON_SQUARE_HOUSE, 4, 4 ; $FC
map_const CELESTE_HILL_CAVE, 20, 19 ; $FD
map_const CELESTE_HILL_OUTSIDE, 20, 18 ; $FE
map_const BRUNSWICK_GROTTO, 20, 9 ; $FF ; ooo
map_const CELESTE_HILL_CAVE, 19, 20 ; $FD
map_const CELESTE_HILL_OUTSIDE, 18, 20 ; $FE
DEF NUM_MAPS EQU const_value
; Indoor maps, such as houses, use this as the Map ID in their exit warps

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

4
data/text/text_2.asm
View file

@ -1850,3 +1850,7 @@ _MeltanIncrement::
_GameCornerArbok:: ; Putting here to be potentially farcalled somewhere else.
text "ARBOK: Chaaarbok!"
done
_BirdBattleText:: ; This is defined in many places and can just be farcalled here instead.
text "Gyaoo!@"
text_end

2
data/tilesets/collision_tile_ids.asm
View file

@ -24,7 +24,7 @@ Gym_Coll::
coll_tiles $11, $16, $19, $2b, $3c, $3d, $3f, $4a, $4c, $4d, $03
Forest_Coll::
coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f
coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f, $00, $30
House_Coll::
coll_tiles $01, $12, $14, $28, $32, $37, $44, $54, $5c

8
data/wild/grass_water.asm
View file

@ -147,7 +147,8 @@ WildDataPointers:
dw NothingWildMons
dw PokemonTower1FWildMons
dw PokemonTower2FWildMons
dw PokemonTower3FWildMons
dw BrunswickGrottoWildMons
;dw PokemonTower3FWildMons
dw PokemonTower4FWildMons
dw PokemonTower5FWildMons
dw PokemonTower6FWildMons
@ -255,7 +256,6 @@ WildDataPointers:
dw NothingWildMons
dw CelesteHillCaveWildMons
dw CelesteHillWildMons ; using Celeste Hill's summit for Celeste Hill Outside
dw BrunswickGrottoWildMons
assert_table_length NUM_MAPS
dw -1 ; end
@ -295,7 +295,8 @@ INCLUDE "data/wild/maps/Route8.asm"
INCLUDE "data/wild/maps/Route7.asm"
INCLUDE "data/wild/maps/PokemonTower1F.asm"
INCLUDE "data/wild/maps/PokemonTower2F.asm"
INCLUDE "data/wild/maps/PokemonTower3F.asm"
INCLUDE "data/wild/maps/BrunswickGrotto.asm"
;INCLUDE "data/wild/maps/PokemonTower3F.asm"
INCLUDE "data/wild/maps/PokemonTower4F.asm"
INCLUDE "data/wild/maps/PokemonTower5F.asm"
INCLUDE "data/wild/maps/PokemonTower6F.asm"
@ -347,4 +348,3 @@ INCLUDE "data/wild/maps/GarnetCavern1F.asm"
INCLUDE "data/wild/maps/GarnetCavernB1F.asm"
INCLUDE "data/wild/maps/GarnetCavern2F.asm"
INCLUDE "data/wild/maps/CelesteHillCave.asm"
INCLUDE "data/wild/maps/BrunswickGrotto.asm"

2
gfx/blocksets/citrine.bst
View file

@ -75,4 +75,4 @@ KKKK
KKKK
KKKK@A@APQPQHI@AXYPQ

10
maps.asm
View file

@ -989,11 +989,11 @@ INCLUDE "scripts/PokemonTower2F.asm"
INCLUDE "data/maps/objects/PokemonTower2F.asm"
PokemonTower2F_Blocks: INCBIN "maps/PokemonTower2F.blk"
; Removed for the Battle Tent.
INCLUDE "data/maps/headers/PokemonTower3F.asm"
INCLUDE "scripts/PokemonTower3F.asm"
INCLUDE "data/maps/objects/PokemonTower3F.asm"
PokemonTower3F_Blocks: INCBIN "maps/PokemonTower3F.blk"
; Removed for Brunswick Grotto
;INCLUDE "data/maps/headers/PokemonTower3F.asm"
;INCLUDE "scripts/PokemonTower3F.asm"
;INCLUDE "data/maps/objects/PokemonTower3F.asm"
;PokemonTower3F_Blocks: INCBIN "maps/PokemonTower3F.blk"
INCLUDE "data/maps/headers/PokemonTower4F.asm"
INCLUDE "scripts/PokemonTower4F.asm"

BIN
maps/BrunswickGrotto.blk
View file

Binary file not shown.

BIN
maps/BrunswickTrail.blk
View file

Binary file not shown.

71
scripts/BrunswickGrotto.asm
View file

@ -2,6 +2,75 @@ BrunswickGrotto_Script:
jp EnableAutoTextBoxDrawing
BrunswickGrotto_TextPointers:
dw GZapFound
dw GalarianZapdosText
dw BrunswickSign
text_end ; unused
BrunswickGrottoTrainerHeaders:
GalarianZapdosTrainerHeader:
trainer EVENT_BEAT_ZAPDOSG, 0, GZapBattleText, GZapBattleText, GZapBattleText
db -1
GZapFound:
text_asm
ld hl, BirdTextCall
call PrintText
ld a, ZAPDOS
call PlayCry
call WaitForSoundToFinish
ld a, $ff
ld [wJoyIgnore], a
call GBFadeOutToBlack
ld a, HS_BRUNSWICK_ZAPDOS_G_1
ld [wMissableObjectIndex], a
predef HideObject
ld a, HS_BRUNSWICK_ZAPDOS_G_2
ld [wMissableObjectIndex], a
predef ShowObject
call UpdateSprites
call Delay3
call GBFadeInFromBlack
ld a, 0
ld [wJoyIgnore], a
ld hl, GZapRunText
call PrintText
jp TextScriptEnd
GalarianZapdosText:
text_asm
ld hl, GalarianZapdosTrainerHeader
call TalkToTrainer
jp TextScriptEnd
GZapBattleText:
text_far _BirdBattleText
text_asm
ld a, ZAPDOS
call PlayCry
call WaitForSoundToFinish
jp TextScriptEnd
GZapRunText:
text "It ran off"
line "somewhere..."
prompt
text_end
BirdTextCall:
text_far _BirdBattleText
text_end
BrunswickSign:
text "GROTTO BIRD"
line "WATCHING"
para "The sign is"
line "covered in"
cont "scratches..."
done
text_end

17
scripts/BrunswickTrail.asm
View file

@ -21,8 +21,6 @@ BrunswickTrailTrainerHeaders:
def_trainers
CactusTrainerHeader:
trainer EVENT_BEAT_CACTUS, 0, CactusBattleText, CactusBattleText, CactusBattleText
GalarianZapdosTrainerHeader:
trainer EVENT_BEAT_ZAPDOSG, 0, GalarianZapdosBattleText, GalarianZapdosBattleText, GalarianZapdosBattleText
db -1 ; end
ZapdosGuy:
@ -78,18 +76,3 @@ CactusBattleText:
call WaitForSoundToFinish
jp TextScriptEnd
GalarianZapdosText:
text_asm
ld hl, GalarianZapdosTrainerHeader
call TalkToTrainer
jp TextScriptEnd
GalarianZapdosBattleText:
text_far _GalarianZapdosBattleText
text_asm
ld a, ZAPDOS_G
call PlayCry
call WaitForSoundToFinish
jp TextScriptEnd
text_end ; unused

2
scripts/CinnabarVolcano.asm
View file

@ -28,7 +28,7 @@ MoltresText:
jp TextScriptEnd
MoltresBattleText:
text_far _MoltresBattleText
text_far _BirdBattleText
text_asm
ld a, MOLTRES
call PlayCry

2
scripts/PowerPlant.asm
View file

@ -106,7 +106,7 @@ VoltorbBattleText:
text_end
ZapdosBattleText:
text_far _ZapdosBattleText
text_far _BirdBattleText
text_asm
ld a, ZAPDOS
call PlayCry

2
scripts/SeafoamIslandsB4F.asm
View file

@ -154,7 +154,7 @@ ArticunoText:
jp TextScriptEnd
ArticunoBattleText:
text_far _ArticunoBattleText
text_far _BirdBattleText
text_asm
ld a, ARTICUNO
call PlayCry

1
text.asm
View file

@ -271,7 +271,6 @@ INCLUDE "data/pokemon/new_dex_text.asm"
INCLUDE "text/CeladonUniversityOutside.asm"
INCLUDE "text/CeladonUniversityInside.asm"
INCLUDE "text/CeladonUniversityPokecenter.asm"
INCLUDE "text/CinnabarVolcano.asm"
INCLUDE "text/UnderwaterTunnel.asm"
INCLUDE "text/FarawayIslandOutside.asm"
INCLUDE "text/PokemonMansionB2F.asm"

4
text/BrunswickTrail.asm
View file

@ -33,8 +33,4 @@ _FakeTreeAttack::
line "in a rage!"
prompt
_GalarianZapdosBattleText::
text "Gyaoo!"
prompt
; Martha can do the text for her things...

3
text/CinnabarVolcano.asm
View file

@ -1,3 +0,0 @@
_MoltresBattleText::
text "Gyaoo!@"
text_end