summaryrefslogtreecommitdiff
path: root/maps/SeafoamGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/SeafoamGym.asm')
-rw-r--r--maps/SeafoamGym.asm20
1 files changed, 12 insertions, 8 deletions
diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm
index 4b0a49491..b617c7647 100644
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -1,3 +1,7 @@
+const_value set 2
+ const SEAFOAMGYM_BLAINE
+ const SEAFOAMGYM_GYM_GUY
+
SeafoamGym_MapScriptHeader:
.MapTriggers:
db 1
@@ -17,30 +21,30 @@ BlaineScript_0x1ab4fb:
checkflag ENGINE_VOLCANOBADGE
iftrue .FightDone
writetext UnknownText_0x1ab548
+ waitbutton
closetext
- loadmovesprites
winlosstext UnknownText_0x1ab646, 0
- loadtrainer BLAINE, 1
+ scriptedtrainerdata BLAINE, 1
startbattle
iftrue .ReturnAfterBattle
- appear $3
+ appear SEAFOAMGYM_GYM_GUY
.ReturnAfterBattle
returnafterbattle
setevent EVENT_BEAT_BLAINE
loadfont
writetext UnknownText_0x1ab683
playsound SFX_GET_BADGE
- waitbutton
+ waitsfx
setflag ENGINE_VOLCANOBADGE
writetext UnknownText_0x1ab69d
+ waitbutton
closetext
- loadmovesprites
end
.FightDone
writetext UnknownText_0x1ab71c
+ waitbutton
closetext
- loadmovesprites
end
SeafoamGymGuyScript:
@@ -49,15 +53,15 @@ SeafoamGymGuyScript:
checkevent EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE
iftrue .TalkedToSeafoamGymGuyScript
writetext SeafoamGymGuyWinText
+ waitbutton
closetext
- loadmovesprites
setevent EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE
end
.TalkedToSeafoamGymGuyScript
writetext SeafoamGymGuyWinText2
+ waitbutton
closetext
- loadmovesprites
end
UnknownText_0x1ab548: