diff options
Diffstat (limited to 'maps/Route36.asm')
| -rw-r--r-- | maps/Route36.asm | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/maps/Route36.asm b/maps/Route36.asm index 032135784..cf28ae207 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -44,7 +44,7 @@ UnknownScript_0x19401b: ; 0x19401b spriteface $0, $0 pause 10 dotrigger $0 - clearbit1 EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY + clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $1 end ; 0x19403c @@ -81,7 +81,7 @@ WateredWeirdTreeScript: ; 0x194053 loadmovesprites loadpokedata SUDOWOODO, 20 startbattle - setbit1 EVENT_FOUGHT_SUDOWOODO + setevent EVENT_FOUGHT_SUDOWOODO if_equal $2, UnknownScript_0x19407b disappear $4 variablesprite $4, $26 @@ -107,13 +107,13 @@ UnknownScript_0x19407b: ; 0x19407b LassScript_0x19408c: ; 0x19408c faceplayer loadfont - checkbit1 $00ba + checkevent $00ba iftrue UnknownScript_0x1940b3 - setbit1 $00b9 + setevent $00b9 2writetext UnknownText_0x1942f1 closetext loadmovesprites - clearbit1 $0768 + clearevent $0768 checkcode $9 if_equal $1, UnknownScript_0x1940ac applymovement $9, MovementData_0x19424e @@ -137,9 +137,9 @@ UnknownScript_0x1940b3: ; 0x1940b3 FisherScript_0x1940b9: ; 0x1940b9 faceplayer loadfont - checkbit1 EVENT_GOT_TM08_ROCK_SMASH + checkevent EVENT_GOT_TM08_ROCK_SMASH iftrue UnknownScript_0x1940da - checkbit1 EVENT_FOUGHT_SUDOWOODO + checkevent EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x1940cd 2writetext UnknownText_0x19446f closetext @@ -152,7 +152,7 @@ UnknownScript_0x1940cd: ; 0x1940cd keeptextopen verbosegiveitem TM_08, 1 iffalse UnknownScript_0x1940de - setbit1 EVENT_GOT_TM08_ROCK_SMASH + setevent EVENT_GOT_TM08_ROCK_SMASH UnknownScript_0x1940da: ; 0x1940da 2writetext UnknownText_0x19452c closetext @@ -164,7 +164,7 @@ UnknownScript_0x1940de: ; 0x1940de LassScript_0x1940e0: ; 0x1940e0 faceplayer loadfont - checkbit1 EVENT_FOUGHT_SUDOWOODO + checkevent EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x1940ee 2writetext UnknownText_0x194626 closetext @@ -203,17 +203,17 @@ SchoolboyAlan1Script: ; 0x194100 writecode $17, $18 talkaftercancel loadfont - checkbit2 $0073 + checkflag $0073 iftrue UnknownScript_0x194140 - checkbit2 $0081 + checkflag $0081 iftrue UnknownScript_0x1941b4 checkcellnum $18 iftrue UnknownScript_0x1941d5 - checkbit1 $0285 + checkevent $0285 iftrue UnknownScript_0x194129 2writetext UnknownText_0x1947aa keeptextopen - setbit1 $0285 + setevent $0285 2call UnknownScript_0x1941c9 2jump UnknownScript_0x19412c ; 0x194129 @@ -239,23 +239,23 @@ UnknownScript_0x194140: ; 0x194140 if_equal $1, UnknownScript_0x194171 if_equal $0, UnknownScript_0x194177 UnknownScript_0x19415f: ; 0x19415f - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1941ab UnknownScript_0x194165: ; 0x194165 - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x19419e UnknownScript_0x19416b: ; 0x19416b - checkbit2 $004b + checkflag $004b iftrue UnknownScript_0x194191 UnknownScript_0x194171: ; 0x194171 - checkbit2 $0047 + checkflag $0047 iftrue UnknownScript_0x194184 UnknownScript_0x194177: ; 0x194177 loadtrainer SCHOOLBOY, ALAN1 startbattle returnafterbattle loadvar $da02, $1 - clearbit2 $0073 + clearflag $0073 end ; 0x194184 @@ -264,7 +264,7 @@ UnknownScript_0x194184: ; 0x194184 startbattle returnafterbattle loadvar $da02, $2 - clearbit2 $0073 + clearflag $0073 end ; 0x194191 @@ -273,7 +273,7 @@ UnknownScript_0x194191: ; 0x194191 startbattle returnafterbattle loadvar $da02, $3 - clearbit2 $0073 + clearflag $0073 end ; 0x19419e @@ -282,7 +282,7 @@ UnknownScript_0x19419e: ; 0x19419e startbattle returnafterbattle loadvar $da02, $4 - clearbit2 $0073 + clearflag $0073 end ; 0x1941ab @@ -290,7 +290,7 @@ UnknownScript_0x1941ab: ; 0x1941ab loadtrainer SCHOOLBOY, ALAN5 startbattle returnafterbattle - clearbit2 $0073 + clearflag $0073 end ; 0x1941b4 @@ -298,8 +298,8 @@ UnknownScript_0x1941b4: ; 0x1941b4 2call UnknownScript_0x1941e5 verbosegiveitem FIRE_STONE, 1 iffalse UnknownScript_0x1941c6 - clearbit2 $0081 - setbit1 $0101 + clearflag $0081 + setevent $0101 2jump UnknownScript_0x1941d5 ; 0x1941c6 @@ -384,21 +384,21 @@ PsychicMarkScript: ; 0x1941f9 YoungsterScript_0x194201: ; 0x194201 faceplayer loadfont - checkbit1 EVENT_GOT_HARD_STONE_FROM_ARTHUR + checkevent EVENT_GOT_HARD_STONE_FROM_ARTHUR iftrue UnknownScript_0x19422f checkcode $b if_not_equal THURSDAY, UnknownScript_0x194235 - checkbit1 EVENT_MET_ARTHUR_OF_THURSDAY + checkevent EVENT_MET_ARTHUR_OF_THURSDAY iftrue UnknownScript_0x19421c 2writetext UnknownText_0x194800 keeptextopen - setbit1 EVENT_MET_ARTHUR_OF_THURSDAY + setevent EVENT_MET_ARTHUR_OF_THURSDAY UnknownScript_0x19421c: ; 0x19421c 2writetext UnknownText_0x19482d keeptextopen verbosegiveitem HARD_STONE, 1 iffalse UnknownScript_0x194233 - setbit1 EVENT_GOT_HARD_STONE_FROM_ARTHUR + setevent EVENT_GOT_HARD_STONE_FROM_ARTHUR 2writetext UnknownText_0x194847 closetext loadmovesprites |