summaryrefslogtreecommitdiff
path: root/maps/PewterGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/PewterGym.asm')
-rw-r--r--maps/PewterGym.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm
index 9585b7320..c927206f7 100644
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -11,10 +11,10 @@ BrockScript_0x1a2864:
checkflag ENGINE_BOULDERBADGE
iftrue .FightDone
writetext UnknownText_0x1a28d0
+ waitbutton
closetext
- loadmovesprites
winlosstext UnknownText_0x1a29bb, 0
- loadtrainer BROCK, 1
+ scriptedtrainerdata BROCK, 1
startbattle
returnafterbattle
setevent EVENT_BEAT_BROCK
@@ -22,28 +22,28 @@ BrockScript_0x1a2864:
loadfont
writetext UnknownText_0x1a2a3d
playsound SFX_GET_BADGE
- waitbutton
+ waitsfx
setflag ENGINE_BOULDERBADGE
writetext UnknownText_0x1a2a57
+ waitbutton
closetext
- loadmovesprites
end
.FightDone
writetext UnknownText_0x1a2ada
+ waitbutton
closetext
- loadmovesprites
end
TrainerCamperJerry:
trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, CamperJerryScript
CamperJerryScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1a2c0f
+ waitbutton
closetext
- loadmovesprites
end
PewterGymGuyScript:
@@ -52,14 +52,14 @@ PewterGymGuyScript:
checkevent EVENT_BEAT_BROCK
iftrue .PewterGymGuyWinScript
writetext PewterGymGuyText
+ waitbutton
closetext
- loadmovesprites
end
.PewterGymGuyWinScript
writetext PewterGymGuyWinText
+ waitbutton
closetext
- loadmovesprites
end
PewterGymStatue: