diff options
Diffstat (limited to 'maps/BlackthornGym2F.asm')
| -rw-r--r-- | maps/BlackthornGym2F.asm | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 48ea2db38..ecadfd73b 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -1,3 +1,13 @@ +const_value set 2 + const BLACKTHORNGYM2F_COOLTRAINER_M + const BLACKTHORNGYM2F_COOLTRAINER_F + const BLACKTHORNGYM2F_BOULDER1 + const BLACKTHORNGYM2F_BOULDER2 + const BLACKTHORNGYM2F_BOULDER3 + const BLACKTHORNGYM2F_BOULDER4 + const BLACKTHORNGYM2F_BOULDER5 + const BLACKTHORNGYM2F_BOULDER6 + BlackthornGym2F_MapScriptHeader: .MapTriggers: db 0 @@ -29,15 +39,15 @@ BlackthornGym2F_MapScriptHeader: db $ff ; end .Disappear4 - disappear 4 + disappear BLACKTHORNGYM2F_BOULDER1 jump .Fall .Disappear5 - disappear 5 + disappear BLACKTHORNGYM2F_BOULDER2 jump .Fall .Disappear6 - disappear 6 + disappear BLACKTHORNGYM2F_BOULDER3 jump .Fall .Fall @@ -45,8 +55,8 @@ BlackthornGym2F_MapScriptHeader: scall .FX loadfont writetext BlackthornGym2FBoulderFellText + waitbutton closetext - loadmovesprites end .FX @@ -62,22 +72,22 @@ TrainerCooltrainermCody: trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, CooltrainermCodyScript CooltrainermCodyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1957d5 + waitbutton closetext - loadmovesprites end TrainerCooltrainerfFran: trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, CooltrainerfFranScript CooltrainerfFranScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x195883 + waitbutton closetext - loadmovesprites end CooltrainermCodySeenText: |