summaryrefslogtreecommitdiff
path: root/maps/CeladonGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CeladonGym.asm')
-rw-r--r--maps/CeladonGym.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm
index 1a2abe435..1208de957 100644
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -9,7 +9,7 @@ CeladonGym_MapScriptHeader: ; 0x72a68
ErikaScript_0x72a6a: ; 0x72a6a
faceplayer
loadfont
- checkbit2 $0026
+ checkflag $0026
iftrue UnknownScript_0x72a9b
2writetext UnknownText_0x72b28
closetext
@@ -18,24 +18,24 @@ ErikaScript_0x72a6a: ; 0x72a6a
loadtrainer ERIKA, 1
startbattle
returnafterbattle
- setbit1 $04c8
- setbit1 EVENT_BEAT_LASS_MICHELLE
- setbit1 EVENT_BEAT_PICNICKER_TANYA
- setbit1 EVENT_BEAT_BEAUTY_JULIA
- setbit1 EVENT_BEAT_TWINS_JO_AND_ZOE
+ setevent $04c8
+ setevent EVENT_BEAT_LASS_MICHELLE
+ setevent EVENT_BEAT_PICNICKER_TANYA
+ setevent EVENT_BEAT_BEAUTY_JULIA
+ setevent EVENT_BEAT_TWINS_JO_AND_ZOE
loadfont
2writetext UnknownText_0x72c96
playsound $009c
waitbutton
- setbit2 $0026
+ setflag $0026
UnknownScript_0x72a9b: ; 0x72a9b
- checkbit1 EVENT_GOT_TM19_GIGA_DRAIN
+ checkevent EVENT_GOT_TM19_GIGA_DRAIN
iftrue UnknownScript_0x72aae
2writetext UnknownText_0x72cb0
keeptextopen
verbosegiveitem TM_19, 1
iffalse UnknownScript_0x72aae
- setbit1 EVENT_GOT_TM19_GIGA_DRAIN
+ setevent EVENT_GOT_TM19_GIGA_DRAIN
UnknownScript_0x72aae: ; 0x72aae
2writetext UnknownText_0x72d8f
closetext
@@ -189,7 +189,7 @@ TwinsJoandzoe2Script: ; 0x72b10
; 0x72b18
MapCeladonGymSignpost1Script: ; 0x72b18
- checkbit2 $0026
+ checkflag $0026
iftrue UnknownScript_0x72b21
jumpstd $002d
; 0x72b21