summaryrefslogtreecommitdiff
path: root/maps/PokeCenter2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/PokeCenter2F.asm')
-rw-r--r--maps/PokeCenter2F.asm38
1 files changed, 19 insertions, 19 deletions
diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm
index 6f9503fb6..9a5f2a5e3 100644
--- a/maps/PokeCenter2F.asm
+++ b/maps/PokeCenter2F.asm
@@ -17,8 +17,8 @@ PokeCenter2F_MapScriptHeader: ; 0x192845
UnknownScript_0x19285f: ; 0x19285f
special $0011
if_equal $0, UnknownScript_0x192872
- clearbit1 $0711
- checkbit1 $0001
+ clearevent $0711
+ checkevent $0001
iftrue UnknownScript_0x192872
priorityjump UnknownScript_0x192887
; 0x192872
@@ -54,7 +54,7 @@ UnknownScript_0x192883: ; 0x192883
UnknownScript_0x192887: ; 0x192887
appear $5
- setbit1 $0001
+ setevent $0001
end
; 0x19288d
@@ -77,7 +77,7 @@ UnknownScript_0x192895: ; 0x192895
; 0x19289d
LinkReceptionistScript_0x19289d: ; 0x19289d
- checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iffalse UnknownScript_0x19288d
loadfont
2writetext UnknownText_0x192e3a
@@ -190,7 +190,7 @@ UnknownScript_0x19294a: ; 0x19294a
; 0x192952
LinkReceptionistScript_0x192952: ; 0x192952
- checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iffalse UnknownScript_0x192895
loadfont
2writetext UnknownText_0x192de0
@@ -331,9 +331,9 @@ UnknownScript_0x192a25: ; 0x192a25
; 0x192a2d
LinkReceptionistScript_0x192a2d: ; 0x192a2d
- checkbit1 $0712
+ checkevent $0712
iftrue UnknownScript_0x192a25
- checkbit2 $0053
+ checkflag $0053
iftrue UnknownScript_0x192a25
special $000a
faceplayer
@@ -460,7 +460,7 @@ UnknownScript_0x192af7: ; 0x192af7
; 0x192b04
UnknownScript_0x192b04: ; 0x192b04
- checkbit2 $0063
+ checkflag $0063
iftrue UnknownScript_0x192b12
applymovement2 MovementData_0x192cca
applymovement $0, MovementData_0x192cde
@@ -485,7 +485,7 @@ UnknownScript_0x192b12: ; 0x192b12
writebyte $80
special $0098
applymovement $0, MovementData_0x192d1c
- setbit2 $009f
+ setflag $009f
special $0038
loadfont
2writetext UnknownText_0x19329a
@@ -497,7 +497,7 @@ UnknownScript_0x192b12: ; 0x192b12
; 0x192b50
UnknownScript_0x192b50: ; 0x192b50
- checkbit2 $009f
+ checkflag $009f
iftrue UnknownScript_0x192b63
applymovement $2, MovementData_0x192d04
applymovement $0, MovementData_0x192cf5
@@ -508,7 +508,7 @@ UnknownScript_0x192b50: ; 0x192b50
UnknownScript_0x192b63: ; 0x192b63
applymovement $2, MovementData_0x192d04
applymovement $0, MovementData_0x192d28
- clearbit2 $009f
+ clearflag $009f
playsound $00ca
applymovement $0, MovementData_0x192d17
writebyte $90
@@ -521,7 +521,7 @@ UnknownScript_0x192b63: ; 0x192b63
; 0x192b8a
UnknownScript_0x192b8a: ; 0x192b8a
- checkbit2 $009f
+ checkflag $009f
iftrue UnknownScript_0x192b9d
applymovement $3, MovementData_0x192d04
applymovement $0, MovementData_0x192cf5
@@ -532,7 +532,7 @@ UnknownScript_0x192b8a: ; 0x192b8a
UnknownScript_0x192b9d: ; 0x192b9d
applymovement $3, MovementData_0x192d04
applymovement $0, MovementData_0x192d28
- clearbit2 $009f
+ clearflag $009f
playsound $00ca
applymovement $0, MovementData_0x192d17
writebyte $90
@@ -545,7 +545,7 @@ UnknownScript_0x192b9d: ; 0x192b9d
; 0x192bc4
UnknownScript_0x192bc4: ; 0x192bc4
- checkbit2 $0063
+ checkflag $0063
iftrue UnknownScript_0x192bec
checkcode $9
if_equal $2, UnknownScript_0x192bdc
@@ -604,7 +604,7 @@ UnknownScript_0x192c20: ; 0x192c20
special $0098
applymovement $0, MovementData_0x192d22
faceperson $0, $4
- setbit2 $009f
+ setflag $009f
special $0038
loadfont
2writetext UnknownText_0x19329a
@@ -617,7 +617,7 @@ UnknownScript_0x192c20: ; 0x192c20
UnknownScript_0x192c4e: ; 0x192c4e
special $0008
- checkbit2 $009f
+ checkflag $009f
iftrue UnknownScript_0x192c66
applymovement $4, MovementData_0x192d08
applymovement $0, MovementData_0x192cf9
@@ -628,7 +628,7 @@ UnknownScript_0x192c4e: ; 0x192c4e
UnknownScript_0x192c66: ; 0x192c66
applymovement $4, MovementData_0x192d08
applymovement $0, MovementData_0x192cfc
- clearbit2 $009f
+ clearflag $009f
playsound $00ca
applymovement $0, MovementData_0x192d17
writebyte $90
@@ -653,7 +653,7 @@ MapPokeCenter2FSignpost0Script: ; 0x192c93
OfficerScript_0x192c9a: ; 0x192c9a
faceplayer
loadfont
- checkbit1 $0711
+ checkevent $0711
iftrue UnknownScript_0x192cb8
2writetext UnknownText_0x193190
yesorno
@@ -664,7 +664,7 @@ OfficerScript_0x192c9a: ; 0x192c9a
special $0012
iffalse UnknownScript_0x192cbe
itemnotify
- setbit1 $0711
+ setevent $0711
UnknownScript_0x192cb8: ; 0x192cb8
2writetext UnknownText_0x1931d2
closetext