summaryrefslogtreecommitdiff
path: root/maps/NationalPark.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/NationalPark.asm')
-rw-r--r--maps/NationalPark.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index f11a8f429..294100948 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -17,13 +17,13 @@ PokefanFScript_0x5c005: ; 0x5c005
TeacherScript_0x5c008: ; 0x5c008
faceplayer
loadfont
- checkbit1 EVENT_GOT_QUICK_CLAW
+ checkevent EVENT_GOT_QUICK_CLAW
iftrue UnknownScript_0x5c01d
2writetext UnknownText_0x5c265
keeptextopen
verbosegiveitem QUICK_CLAW, 1
iffalse UnknownScript_0x5c021
- setbit1 EVENT_GOT_QUICK_CLAW
+ setevent EVENT_GOT_QUICK_CLAW
UnknownScript_0x5c01d: ; 0x5c01d
2writetext UnknownText_0x5c30d
closetext
@@ -92,11 +92,11 @@ SchoolboyJack1Script: ; 0x5c04e
iftrue UnknownScript_0x5c088
checkcellnum $5
iftrue UnknownScript_0x5c108
- checkbit1 $025f
+ checkevent $025f
iftrue UnknownScript_0x5c071
2writetext UnknownText_0x5c4f3
keeptextopen
- setbit1 $025f
+ setevent $025f
2call UnknownScript_0x5c0fc
2jump UnknownScript_0x5c074
; 0x5c071
@@ -122,13 +122,13 @@ UnknownScript_0x5c088: ; 0x5c088
if_equal $1, UnknownScript_0x5c0b9
if_equal $0, UnknownScript_0x5c0bf
UnknownScript_0x5c0a7: ; 0x5c0a7
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x5c0f3
UnknownScript_0x5c0ad: ; 0x5c0ad
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x5c0e6
UnknownScript_0x5c0b3: ; 0x5c0b3
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x5c0d9
UnknownScript_0x5c0b9: ; 0x5c0b9
checkbit2 $0047
@@ -271,11 +271,11 @@ PokefanfBeverly1Script: ; 0x5c138
iftrue UnknownScript_0x5c19b
checkpoke MARILL
iffalse UnknownScript_0x5c189
- checkbit1 EVENT_SHOWED_BEVERLY_MARILL
+ checkevent EVENT_SHOWED_BEVERLY_MARILL
iftrue UnknownScript_0x5c160
2writetext UnknownText_0x5c5bd
keeptextopen
- setbit1 EVENT_SHOWED_BEVERLY_MARILL
+ setevent EVENT_SHOWED_BEVERLY_MARILL
2call UnknownScript_0x5c18f
2jump UnknownScript_0x5c163
; 0x5c160