summaryrefslogtreecommitdiff
path: root/maps/PewterGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/PewterGym.asm')
-rw-r--r--maps/PewterGym.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm
index 427a77195..1c7213313 100644
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -9,7 +9,7 @@ PewterGym_MapScriptHeader: ; 0x1a2862
BrockScript_0x1a2864: ; 0x1a2864
faceplayer
loadfont
- checkbit2 $0023
+ checkflag $0023
iftrue UnknownScript_0x1a2892
2writetext UnknownText_0x1a28d0
closetext
@@ -18,13 +18,13 @@ BrockScript_0x1a2864: ; 0x1a2864
loadtrainer BROCK, 1
startbattle
returnafterbattle
- setbit1 EVENT_BEAT_BROCK
- setbit1 EVENT_BEAT_CAMPER_JERRY
+ setevent EVENT_BEAT_BROCK
+ setevent EVENT_BEAT_CAMPER_JERRY
loadfont
2writetext UnknownText_0x1a2a3d
playsound $009c
waitbutton
- setbit2 $0023
+ setflag $0023
2writetext UnknownText_0x1a2a57
closetext
loadmovesprites
@@ -70,7 +70,7 @@ CamperJerryScript: ; 0x1a28a4
PewterGymGuyScript: ; 0x1a28ac
faceplayer
loadfont
- checkbit1 EVENT_BEAT_BROCK
+ checkevent EVENT_BEAT_BROCK
iftrue .PewterGymGuyWinScript
2writetext PewterGymGuyText
closetext
@@ -85,7 +85,7 @@ PewterGymGuyScript: ; 0x1a28ac
; 0x1a28c0
MapPewterGymSignpost1Script: ; 0x1a28c0
- checkbit2 $0023
+ checkflag $0023
iftrue UnknownScript_0x1a28c9
jumpstd $002d
; 0x1a28c9