diff options
Diffstat (limited to 'maps/Route42.asm')
| -rw-r--r-- | maps/Route42.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/maps/Route42.asm b/maps/Route42.asm index 186e01268..511fb4df0 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -26,7 +26,7 @@ UnknownScript_0x1a9218: ; 0x1a9218 disappear $a pause 10 dotrigger $0 - clearbit1 EVENT_SAW_SUICUNE_ON_ROUTE_36 + clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36 domaptrigger GROUP_ROUTE_36, MAP_ROUTE_36, $1 end ; 0x1a9233 @@ -55,17 +55,17 @@ FisherTully1Script: ; 0x1a923f writecode $17, $1d talkaftercancel loadfont - checkbit2 $0076 + checkflag $0076 iftrue UnknownScript_0x1a927f - checkbit2 $0084 + checkflag $0084 iftrue UnknownScript_0x1a92dc checkcellnum $1d iftrue UnknownScript_0x1a92fd - checkbit1 $028f + checkevent $028f iftrue UnknownScript_0x1a9268 2writetext UnknownText_0x1a93ab keeptextopen - setbit1 $028f + setevent $028f 2call UnknownScript_0x1a92f1 2jump UnknownScript_0x1a926b ; 0x1a9268 @@ -90,20 +90,20 @@ UnknownScript_0x1a927f: ; 0x1a927f if_equal $1, UnknownScript_0x1a92a6 if_equal $0, UnknownScript_0x1a92ac UnknownScript_0x1a929a: ; 0x1a929a - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a92d3 UnknownScript_0x1a92a0: ; 0x1a92a0 - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x1a92c6 UnknownScript_0x1a92a6: ; 0x1a92a6 - checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT + checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x1a92b9 UnknownScript_0x1a92ac: ; 0x1a92ac loadtrainer FISHER, TULLY1 startbattle returnafterbattle loadvar $da06, $1 - clearbit2 $0076 + clearflag $0076 end ; 0x1a92b9 @@ -112,7 +112,7 @@ UnknownScript_0x1a92b9: ; 0x1a92b9 startbattle returnafterbattle loadvar $da06, $2 - clearbit2 $0076 + clearflag $0076 end ; 0x1a92c6 @@ -121,7 +121,7 @@ UnknownScript_0x1a92c6: ; 0x1a92c6 startbattle returnafterbattle loadvar $da06, $3 - clearbit2 $0076 + clearflag $0076 end ; 0x1a92d3 @@ -129,7 +129,7 @@ UnknownScript_0x1a92d3: ; 0x1a92d3 loadtrainer FISHER, TULLY4 startbattle returnafterbattle - clearbit2 $0076 + clearflag $0076 end ; 0x1a92dc @@ -137,8 +137,8 @@ UnknownScript_0x1a92dc: ; 0x1a92dc 2call UnknownScript_0x1a930d verbosegiveitem WATER_STONE, 1 iffalse UnknownScript_0x1a92ee - clearbit2 $0084 - setbit1 $0103 + clearflag $0084 + setevent $0103 2jump UnknownScript_0x1a92fd ; 0x1a92ee |