diff options
Diffstat (limited to 'maps/Route45.asm')
| -rw-r--r-- | maps/Route45.asm | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/maps/Route45.asm b/maps/Route45.asm index f4468f997..664701542 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -32,12 +32,12 @@ BlackbeltKenji3Script: ; 0x19e0ad loadfont checkcellnum $22 iftrue UnknownScript_0x19e0e4 - checkbit1 $0299 + checkevent $0299 iftrue UnknownScript_0x19e0cd special $0095 2writetext UnknownText_0x19e5e2 closetext - setbit1 $0299 + setevent $0299 2call UnknownScript_0x19e11b 2jump UnknownScript_0x19e0d0 ; 0x19e0cd @@ -60,12 +60,12 @@ UnknownScript_0x19e0e4: ; 0x19e0e4 iftrue UnknownScript_0x19e10c checktime $4 iftrue UnknownScript_0x19e112 - checkbit1 $026a + checkevent $026a iffalse UnknownScript_0x19e127 2call UnknownScript_0x19e137 verbosegiveitem PP_UP, 1 iffalse UnknownScript_0x19e118 - clearbit1 $026a + clearevent $026a special $0095 2jump UnknownScript_0x19e127 ; 0x19e10c @@ -134,7 +134,7 @@ UnknownScript_0x19e13b: ; 0x19e13b ; 0x19e13f UnknownScript_0x19e13f: ; 0x19e13f - setbit1 EVENT_PARRY_IRON + setevent EVENT_PARRY_IRON jumpstd $0021 end ; 0x19e146 @@ -226,15 +226,15 @@ HikerParry3Script: ; 0x19e17e writecode $17, $23 talkaftercancel loadfont - checkbit2 $007b + checkflag $007b iftrue UnknownScript_0x19e1b8 checkcellnum $23 iftrue UnknownScript_0x19e127 - checkbit1 $029b + checkevent $029b iftrue UnknownScript_0x19e1a1 2writetext UnknownText_0x19e434 keeptextopen - setbit1 $029b + setevent $029b 2call UnknownScript_0x19e11b 2jump UnknownScript_0x19e1a4 ; 0x19e1a1 @@ -258,17 +258,17 @@ UnknownScript_0x19e1b8: ; 0x19e1b8 if_equal $1, UnknownScript_0x19e1d5 if_equal $0, UnknownScript_0x19e1db UnknownScript_0x19e1cf: ; 0x19e1c - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x19e1f5 UnknownScript_0x19e1d5: ; 0x19e1d5 - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x19e1e8 UnknownScript_0x19e1db: ; 0x19e1db loadtrainer HIKER, PARRY3 startbattle returnafterbattle loadvar $da0c, $1 - clearbit2 $007b + clearflag $007b end ; 0x19e1e8 @@ -277,7 +277,7 @@ UnknownScript_0x19e1e8: ; 0x19e1e8 startbattle returnafterbattle loadvar $da0c, $2 - clearbit2 $007b + clearflag $007b end ; 0x19e1f5 @@ -285,15 +285,15 @@ UnknownScript_0x19e1f5: ; 0x19e1f5 loadtrainer HIKER, PARRY2 startbattle returnafterbattle - clearbit2 $007b - checkbit1 EVENT_PARRY_IRON + clearflag $007b + checkevent EVENT_PARRY_IRON iftrue UnknownScript_0x19e219 - checkbit1 $0268 + checkevent $0268 iftrue UnknownScript_0x19e218 2call UnknownScript_0x19e146 verbosegiveitem IRON, 1 iffalse UnknownScript_0x19e13f - setbit1 $0268 + setevent $0268 2jump UnknownScript_0x19e127 ; 0x19e218 @@ -307,8 +307,8 @@ UnknownScript_0x19e219: ; 0x19e219 closetext verbosegiveitem IRON, 1 iffalse UnknownScript_0x19e13f - clearbit1 EVENT_PARRY_IRON - setbit1 $0268 + clearevent EVENT_PARRY_IRON + setevent $0268 2jump UnknownScript_0x19e127 ; 0x19e22d @@ -402,7 +402,7 @@ CooltrainerfKellyScript: ; 0x19e261 YoungsterScript_0x19e269: ; 0x19e269 faceplayer loadfont - checkbit1 $05c3 + checkevent $05c3 iftrue UnknownScript_0x19e285 2writetext UnknownText_0x19e87f closetext @@ -411,7 +411,7 @@ YoungsterScript_0x19e269: ; 0x19e269 loadtrainer CAMPER, QUENTIN startbattle returnafterbattle - setbit1 $05c3 + setevent $05c3 loadmovesprites end ; 0x19e285 |