seems this is needed?

This commit is contained in:
May Evans 2022-08-31 17:45:23 +01:00
parent 8dafe51b13
commit 0c9da85a51
6 changed files with 53 additions and 1 deletions

View file

@ -8,6 +8,6 @@ DiglettsCave_Object:
def_bg_events def_bg_events
def_object_events def_object_events
object_event 30, 15, SPRITE_MONSTER, WALK, DOWN, 9, CROCKY, 40 object_event 30, 15, SPRITE_MONSTER, WALK, DOWN, 1, CROCKY, 40
def_warps_to DIGLETTS_CAVE def_warps_to DIGLETTS_CAVE

View file

@ -4,3 +4,25 @@ DiglettsCave_Script:
DiglettsCave_TextPointers: DiglettsCave_TextPointers:
text_end ; unused text_end ; unused
; Edited from Articuno - PvK
def_trainers 1
CrockyTrainerHeader:
trainer EVENT_BEAT_CROCKY, 0, CrockyBattleText, CrockyBattleText, CrockyBattleText
db -1 ; end
CrockyText:
text_asm
ld hl, CrockyTrainerHeader
call TalkToTrainer
ld a, $4
ld [wSeafoamIslandsB4FCurScript], a
jp TextScriptEnd
CrockyBattleText:
text_far _CrockyBattleText
text_asm
ld a, CROCKY
call PlayCry
call WaitForSoundToFinish
jp TextScriptEnd

View file

@ -185,3 +185,25 @@ RockTunnel2EndBattleText9:
RockTunnel2AfterBattleText9: RockTunnel2AfterBattleText9:
text_far _RockTunnel2AfterBattleText9 text_far _RockTunnel2AfterBattleText9
text_end text_end
; Edited from Articuno - PvK
def_trainers 9
KabutopsTrainerHeader:
trainer EVENT_BEAT_KABUTOPS, 0, KabutopsBattleText, KabutopsBattleText, KabutopsBattleText
db -1 ; end
KabutopsText:
text_asm
ld hl, KabutopsTrainerHeader
call TalkToTrainer
ld a, $4
ld [wSeafoamIslandsB4FCurScript], a
jp TextScriptEnd
KabutopsBattleText:
text_far _KabutopsBattleText
text_asm
ld a, KABUTOPS
call PlayCry
call WaitForSoundToFinish
jp TextScriptEnd

View file

@ -70,6 +70,7 @@ INCLUDE "text/SeafoamIslandsB4F.asm"
INCLUDE "data/text/text_2.asm" INCLUDE "data/text/text_2.asm"
INCLUDE "text/DiglettsCaveRoute2.asm" INCLUDE "text/DiglettsCaveRoute2.asm"
INCLUDE "text/DiglettsCave.asm"
INCLUDE "text/ViridianForestNorthGate.asm" INCLUDE "text/ViridianForestNorthGate.asm"
INCLUDE "text/Route2TradeHouse.asm" INCLUDE "text/Route2TradeHouse.asm"
INCLUDE "text/Route2Gate.asm" INCLUDE "text/Route2Gate.asm"

3
text/DiglettsCave.asm Normal file
View file

@ -0,0 +1,3 @@
_CrockyBattleText::
text "Graogh!"
text_end

View file

@ -18,3 +18,7 @@ _RockTunnel2AfterBattleText9::
text "I'm an artist," text "I'm an artist,"
line "not a fighter." line "not a fighter."
done done
_KabutopsBattleText::
text "Grr..."
text_end