summaryrefslogtreecommitdiff
path: root/maps/CianwoodGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CianwoodGym.asm')
-rw-r--r--maps/CianwoodGym.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
index 5b34e53b1..a87870e17 100644
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -9,7 +9,7 @@ CianwoodGym_MapScriptHeader: ; 0x9d60d
ChuckScript_0x9d60f: ; 0x9d60f
faceplayer
loadfont
- checkbit1 EVENT_BEAT_CHUCK
+ checkevent EVENT_BEAT_CHUCK
iftrue UnknownScript_0x9d656
2writetext UnknownText_0x9d6f9
closetext
@@ -33,26 +33,26 @@ ChuckScript_0x9d60f: ; 0x9d60f
loadtrainer CHUCK, 1
startbattle
returnafterbattle
- setbit1 EVENT_BEAT_CHUCK
+ setevent EVENT_BEAT_CHUCK
loadfont
2writetext UnknownText_0x9d835
playsound $009c
waitbutton
- setbit2 $0020
+ setflag $0020
checkcode $7
2call UnknownScript_0x9d681
UnknownScript_0x9d656: ; 0x9d656
- checkbit1 EVENT_GOT_TM01_DYNAMICPUNCH
+ checkevent EVENT_GOT_TM01_DYNAMICPUNCH
iftrue UnknownScript_0x9d67b
- setbit1 EVENT_BEAT_BLACKBELT_YOSHI
- setbit1 EVENT_BEAT_BLACKBELT_LAO
- setbit1 EVENT_BEAT_BLACKBELT_NOB
- setbit1 EVENT_BEAT_BLACKBELT_LUNG
+ setevent EVENT_BEAT_BLACKBELT_YOSHI
+ setevent EVENT_BEAT_BLACKBELT_LAO
+ setevent EVENT_BEAT_BLACKBELT_NOB
+ setevent EVENT_BEAT_BLACKBELT_LUNG
2writetext UnknownText_0x9d84d
keeptextopen
verbosegiveitem TM_01, 1
iffalse UnknownScript_0x9d67f
- setbit1 EVENT_GOT_TM01_DYNAMICPUNCH
+ setevent EVENT_GOT_TM01_DYNAMICPUNCH
2writetext UnknownText_0x9d8da
closetext
loadmovesprites
@@ -202,7 +202,7 @@ BoulderScript_0x9d6e0: ; 0x9d6e0
; 0x9d6e3
MapCianwoodGymSignpost1Script: ; 0x9d6e3
- checkbit2 $0020
+ checkflag $0020
iftrue UnknownScript_0x9d6ec
jumpstd $002d
; 0x9d6ec