diff options
Diffstat (limited to 'maps/PewterGym.asm')
| -rw-r--r-- | maps/PewterGym.asm | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 9585b7320..8f80b9dc7 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -1,3 +1,8 @@ +const_value set 2 + const PEWTERGYM_BROCK + const PEWTERGYM_YOUNGSTER + const PEWTERGYM_GYM_GUY + PewterGym_MapScriptHeader: .MapTriggers: db 0 @@ -11,10 +16,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 +27,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 +57,14 @@ PewterGymGuyScript: checkevent EVENT_BEAT_BROCK iftrue .PewterGymGuyWinScript writetext PewterGymGuyText + waitbutton closetext - loadmovesprites end .PewterGymGuyWinScript writetext PewterGymGuyWinText + waitbutton closetext - loadmovesprites end PewterGymStatue: |