diff options
Diffstat (limited to 'maps/RadioTower2F.asm')
| -rw-r--r-- | maps/RadioTower2F.asm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index cc9f529f8..a851abdf9 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -17,7 +17,7 @@ SuperNerdScript_0x5d6fe: ; 0x5d6fe TeacherScript_0x5d701: ; 0x5d701 faceplayer loadfont - checkbit2 $0013 + checkflag $0013 iftrue UnknownScript_0x5d70f 2writetext UnknownText_0x5d956 closetext @@ -168,15 +168,15 @@ GruntF2Script: ; 0x5d76d BuenaScript_0x5d775: ; 0x5d775 faceplayer loadfont - checkbit2 $0013 + checkflag $0013 iftrue UnknownScript_0x5d865 - checkbit1 EVENT_MET_BUENA + checkevent EVENT_MET_BUENA iffalse UnknownScript_0x5d800 - checkbit2 $0060 + checkflag $0060 iftrue UnknownScript_0x5d82f checkcode $a - if_greater_than $12, UnknownScript_0x5d893 - checkbit2 $005f + if_less_than $12, UnknownScript_0x5d893 + checkflag $005f iffalse UnknownScript_0x5d80a checkitem BLUE_CARD iffalse UnknownScript_0x5d86b @@ -213,7 +213,7 @@ UnknownScript_0x5d7be: ; 0x5d7be writevarcode $18 waitbutton playsound $0022 - setbit2 $0060 + setflag $0060 pause 20 spriteface $b, $3 loadfont @@ -231,7 +231,7 @@ UnknownScript_0x5d7be: ; 0x5d7be UnknownScript_0x5d800: ; 0x5d800 2writetext UnknownText_0x5dcf4 keeptextopen - setbit1 EVENT_MET_BUENA + setevent EVENT_MET_BUENA verbosegiveitem BLUE_CARD, 1 UnknownScript_0x5d80a: ; 0x5d80a 2writetext UnknownText_0x5de10 @@ -239,7 +239,7 @@ UnknownScript_0x5d80a: ; 0x5d80a loadmovesprites checkcellnum $25 iftrue UnknownScript_0x5d81a - checkbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER + checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc UnknownScript_0x5d81a: ; 0x5d81a spriteface $b, $3 @@ -263,7 +263,7 @@ UnknownScript_0x5d82f: ; 0x5d82f loadmovesprites checkcellnum $25 iftrue UnknownScript_0x5d83f - checkbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER + checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc UnknownScript_0x5d83f: ; 0x5d83f spriteface $b, $3 @@ -272,7 +272,7 @@ UnknownScript_0x5d83f: ; 0x5d83f ; 0x5d845 UnknownScript_0x5d845: ; 0x5d845 - setbit2 $0060 + setflag $0060 loadfont 2writetext UnknownText_0x5e01c closetext @@ -303,7 +303,7 @@ UnknownScript_0x5d86b: ; 0x5d86b loadmovesprites checkcellnum $25 iftrue UnknownScript_0x5d87b - checkbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD + checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc UnknownScript_0x5d87b: ; 0x5d87b spriteface $b, $3 @@ -316,7 +316,7 @@ UnknownScript_0x5d87f: ; 0x5d87f loadmovesprites checkcellnum $25 iftrue UnknownScript_0x5d88f - checkbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD + checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc UnknownScript_0x5d88f: ; 0x5d88f spriteface $b, $3 @@ -329,7 +329,7 @@ UnknownScript_0x5d893: ; 0x5d893 loadmovesprites checkcellnum $25 iftrue UnknownScript_0x5d8a3 - checkbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER + checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc UnknownScript_0x5d8a3: ; 0x5d8a3 end @@ -343,11 +343,11 @@ UnknownScript_0x5d8a4: ; 0x5d8a4 pause 15 spriteface $0, $1 pause 15 - checkbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD + checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc showemote $0, $b, 15 - setbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD - setbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER + setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD + setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER loadfont 2writetext UnknownText_0x5e1ee 2jump UnknownScript_0x5d8d0 |