summaryrefslogtreecommitdiff
path: root/maps/VermilionCity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/VermilionCity.asm')
-rw-r--r--maps/VermilionCity.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
index 69ba933e6..a5eae1a34 100644
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -11,7 +11,7 @@ VermilionCity_MapScriptHeader: ; 0x1aa97a
; 0x1aa97f
UnknownScript_0x1aa97f: ; 0x1aa97f
- setbit2 $003a
+ setflag $003a
return
; 0x1aa983
@@ -60,7 +60,7 @@ UnknownScript_0x1aa9ab: ; 0x1aa9ab
loadpokedata SNORLAX, 50
startbattle
disappear $6
- setbit1 EVENT_FOUGHT_SNORLAX
+ setevent EVENT_FOUGHT_SNORLAX
returnafterbattle
end
; 0x1aa9c2
@@ -68,12 +68,12 @@ UnknownScript_0x1aa9ab: ; 0x1aa9ab
PokefanMScript_0x1aa9c2: ; 0x1aa9c2
faceplayer
loadfont
- checkbit1 $00e2
+ checkevent $00e2
iftrue UnknownScript_0x1aa9f7
checkcode $7
if_equal $10, UnknownScript_0x1aa9ea
- if_less_than $d, UnknownScript_0x1aa9e4
- if_less_than $9, UnknownScript_0x1aa9de
+ if_greater_than $d, UnknownScript_0x1aa9e4
+ if_greater_than $9, UnknownScript_0x1aa9de
2writetext UnknownText_0x1aabc8
closetext
loadmovesprites
@@ -99,7 +99,7 @@ UnknownScript_0x1aa9ea: ; 0x1aa9ea
keeptextopen
verbosegiveitem HP_UP, 1
iffalse UnknownScript_0x1aa9fb
- setbit1 $00e2
+ setevent $00e2
UnknownScript_0x1aa9f7: ; 0x1aa9f7
2writetext UnknownText_0x1aad4a
closetext