Establish Brunswick Grotto

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

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

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

View file

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

View file

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

View file

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