diff options
Diffstat (limited to 'maps/Route38.asm')
| -rw-r--r-- | maps/Route38.asm | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/maps/Route38.asm b/maps/Route38.asm index fd6a9ab6c..2dbfb8a57 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -88,17 +88,17 @@ LassDana1Script: ; 0x1a1d42 writecode $17, $1a talkaftercancel loadfont - checkbit2 $0074 + checkflag $0074 iftrue UnknownScript_0x1a1d82 - checkbit2 $0082 + checkflag $0082 iftrue UnknownScript_0x1a1df6 checkcellnum $1a iftrue UnknownScript_0x1a1e17 - checkbit1 $0289 + checkevent $0289 iftrue UnknownScript_0x1a1d6b 2writetext UnknownText_0x1a20ec keeptextopen - setbit1 $0289 + setevent $0289 2call UnknownScript_0x1a1e0b 2jump UnknownScript_0x1a1d6e ; 0x1a1d6b @@ -124,23 +124,23 @@ UnknownScript_0x1a1d82: ; 0x1a1d82 if_equal $1, UnknownScript_0x1a1db3 if_equal $0, UnknownScript_0x1a1db9 UnknownScript_0x1a1da1: ; 0x1a1da1 - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a1ded UnknownScript_0x1a1da7: ; 0x1a1da7 - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x1a1de0 UnknownScript_0x1a1dad: ; 0x1a1dad - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1a1dd3 UnknownScript_0x1a1db3: ; 0x1a1db3 - checkbit2 $0045 + checkflag $0045 iftrue UnknownScript_0x1a1dc6 UnknownScript_0x1a1db9: ; 0x1a1db9 loadtrainer LASS, DANA1 startbattle returnafterbattle loadvar $da03, $1 - clearbit2 $0074 + clearflag $0074 end ; 0x1a1dc6 @@ -149,7 +149,7 @@ UnknownScript_0x1a1dc6: ; 0x1a1dc6 startbattle returnafterbattle loadvar $da03, $2 - clearbit2 $0074 + clearflag $0074 end ; 0x1a1dd3 @@ -158,7 +158,7 @@ UnknownScript_0x1a1dd3: ; 0x1a1dd3 startbattle returnafterbattle loadvar $da03, $3 - clearbit2 $0074 + clearflag $0074 end ; 0x1a1de0 @@ -167,7 +167,7 @@ UnknownScript_0x1a1de0: ; 0x1a1de0 startbattle returnafterbattle loadvar $da03, $4 - clearbit2 $0074 + clearflag $0074 end ; 0x1a1ded @@ -175,7 +175,7 @@ UnknownScript_0x1a1ded: ; 0x1a1ded loadtrainer LASS, DANA5 startbattle returnafterbattle - clearbit2 $0074 + clearflag $0074 end ; 0x1a1df6 @@ -183,8 +183,8 @@ UnknownScript_0x1a1df6: ; 0x1a1df6 2call UnknownScript_0x1a1e27 verbosegiveitem THUNDERSTONE, 1 iffalse UnknownScript_0x1a1e08 - clearbit2 $0082 - setbit1 $0102 + clearflag $0082 + setevent $0102 2jump UnknownScript_0x1a1e17 ; 0x1a1e08 @@ -261,15 +261,15 @@ SchoolboyChad1Script: ; 0x1a1e3b writecode $17, $1b talkaftercancel loadfont - checkbit2 $0075 + checkflag $0075 iftrue UnknownScript_0x1a1e75 checkcellnum $1b iftrue UnknownScript_0x1a1ef5 - checkbit1 $028b + checkevent $028b iftrue UnknownScript_0x1a1e5e 2writetext UnknownText_0x1a200e keeptextopen - setbit1 $028b + setevent $028b 2call UnknownScript_0x1a1ee9 2jump UnknownScript_0x1a1e61 ; 0x1a1e5e @@ -295,23 +295,23 @@ UnknownScript_0x1a1e75: ; 0x1a1e75 if_equal $1, UnknownScript_0x1a1ea6 if_equal $0, UnknownScript_0x1a1eac UnknownScript_0x1a1e94: ; 0x1a1e94 - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a1ee0 UnknownScript_0x1a1e9a: ; 0x1a1e9a - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x1a1ed3 UnknownScript_0x1a1ea0: ; 0x1a1ea0 - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1a1ec6 UnknownScript_0x1a1ea6: ; 0x1a1ea6 - checkbit2 $0049 + checkflag $0049 iftrue UnknownScript_0x1a1eb9 UnknownScript_0x1a1eac: ; 0x1a1eac loadtrainer SCHOOLBOY, CHAD1 startbattle returnafterbattle loadvar $da04, $1 - clearbit2 $0075 + clearflag $0075 end ; 0x1a1eb9 @@ -320,7 +320,7 @@ UnknownScript_0x1a1eb9: ; 0x1a1eb9 startbattle returnafterbattle loadvar $da04, $2 - clearbit2 $0075 + clearflag $0075 end ; 0x1a1ec6 @@ -329,7 +329,7 @@ UnknownScript_0x1a1ec6: ; 0x1a1ec6 startbattle returnafterbattle loadvar $da04, $3 - clearbit2 $0075 + clearflag $0075 end ; 0x1a1ed3 @@ -338,7 +338,7 @@ UnknownScript_0x1a1ed3: ; 0x1a1ed3 startbattle returnafterbattle loadvar $da04, $4 - clearbit2 $0075 + clearflag $0075 end ; 0x1a1ee0 @@ -346,7 +346,7 @@ UnknownScript_0x1a1ee0: ; 0x1a1ee0 loadtrainer SCHOOLBOY, CHAD5 startbattle returnafterbattle - clearbit2 $0075 + clearflag $0075 end ; 0x1a1ee9 |