diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 87196653a..16d03b5e9 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -11015,7 +11015,7 @@ Function0x37e77: ; 37e77 BattleCommandaa: ; 37e80 -; wait +; movedelay ; Wait 40 frames. ld c, 40 jp DelayFrames diff --git a/battle/moves/move_effects.asm b/battle/moves/move_effects.asm index a17a9a7d5..1e3bd4586 100644 --- a/battle/moves/move_effects.asm +++ b/battle/moves/move_effects.asm @@ -2201,7 +2201,7 @@ Teleport: BeatUp: checkobedience usedmovetext - wait + movedelay doturn startloop effect0x0a diff --git a/engine/scripting.asm b/engine/scripting.asm index 597f25693..39a56950e 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -9,8 +9,8 @@ ScriptCommandTable: ; 0x96cb1 dw Script_if_not_equal dw Script_iffalse dw Script_iftrue - dw Script_if_less_than dw Script_if_greater_than + dw Script_if_less_than dw Script_jumpstd dw Script_callstd dw Script_3callasm @@ -48,14 +48,14 @@ ScriptCommandTable: ; 0x96cb1 dw Script_giveegg dw Script_givepokeitem dw Script_checkpokeitem - dw Script_checkbit1 - dw Script_clearbit1 - dw Script_setbit1 - dw Script_checkbit2 - dw Script_clearbit2 - dw Script_setbit2 - dw Script_wildoff + dw Script_checkevent + dw Script_clearevent + dw Script_setevent + dw Script_checkflag + dw Script_clearflag + dw Script_setflag dw Script_wildon + dw Script_wildoff dw Script_xycompare dw Script_warpmod dw Script_blackoutmod @@ -165,9 +165,9 @@ ScriptCommandTable: ; 0x96cb1 dw Script_warpfacing dw Script_storetext dw Script_displaylocation - dw Script_unknown0xa6 - dw Script_unknown0xa7 - dw Script_unknown0xa8 + dw Script_trainerclassname + dw Script_name + dw Script_wait dw Script_unknown0xa9 ; 0x96e05 @@ -1734,7 +1734,7 @@ Script_if_not_equal: ; 0x9754b jr SkipTwoScriptBytes ; 0x97554 $40 ; 0x97556 -Script_if_less_than: ; 0x97556 +Script_if_greater_than: ; 0x97556 ; script command 0xa ; parameters: ; byte (SingleByteParam) @@ -1748,7 +1748,7 @@ Script_if_less_than: ; 0x97556 jr SkipTwoScriptBytes ; 0x97560 $34 ; 0x97562 -Script_if_greater_than: ; 0x97562 +Script_if_less_than: ; 0x97562 ; script command 0xb ; parameters: ; byte (SingleByteParam) @@ -2151,6 +2151,7 @@ Script_displaylocation: ; 0x97701 ; script command 0xa5 ; parameters: ; id (SingleByteParam) +; memory (SingleByteParam) call GetScriptByte jr Unknown_976f4 ; 0x97704 $ee @@ -2173,8 +2174,11 @@ Script_trainertotext: ; 0x97706 jr Unknown_976c0 ; 0x97714 $aa ; 0x97716 -Script_unknown0xa7: ; 0x97716 +Script_name: ; 0x97716 ; script command 0xa7 +; parameters: +; type (SingleByteParam) +; id (SingleByteParam) call GetScriptByte ld [$cf61], a @@ -2187,7 +2191,7 @@ Unknown_9771c: ; 0x9771c jp Unknown_976c0 ; 0x9772b -Script_unknown0xa6: ; 0x9772b +Script_trainerclassname: ; 0x9772b ; script command 0xa6 ld a, $7 @@ -2667,7 +2671,7 @@ Script_giveegg: ; 0x97968 ret ; 0x97988 -Script_setbit1: ; 0x97988 +Script_setevent: ; 0x97988 ; script command 0x33 ; parameters: ; bit_number (MultiByteParam) @@ -2681,7 +2685,7 @@ Script_setbit1: ; 0x97988 ret ; 0x97996 -Script_clearbit1: ; 0x97996 +Script_clearevent: ; 0x97996 ; script command 0x32 ; parameters: ; bit_number (MultiByteParam) @@ -2695,7 +2699,7 @@ Script_clearbit1: ; 0x97996 ret ; 0x979a4 -Script_checkbit1: ; 0x979a4 +Script_checkevent: ; 0x979a4 ; script command 0x31 ; parameters: ; bit_number (MultiByteParam) @@ -2715,7 +2719,7 @@ Script_checkbit1: ; 0x979a4 ret ; 0x979bb -Script_setbit2: ; 0x979bb +Script_setflag: ; 0x979bb ; script command 0x36 ; parameters: ; bit_number (MultiByteParam) @@ -2729,7 +2733,7 @@ Script_setbit2: ; 0x979bb ret ; 0x979c9 -Script_clearbit2: ; 0x979c9 +Script_clearflag: ; 0x979c9 ; script command 0x35 ; parameters: ; bit_number (MultiByteParam) @@ -2743,7 +2747,7 @@ Script_clearbit2: ; 0x979c9 ret ; 0x979d7 -Script_checkbit2: ; 0x979d7 +Script_checkflag: ; 0x979d7 ; script command 0x34 ; parameters: ; bit_number (MultiByteParam) @@ -2770,18 +2774,18 @@ Unknown_0x979ee: ; 0x979ee ret ; 0x979f5 -Script_wildon: ; 0x979f5 +Script_wildoff: ; 0x979f5 ; script command 0x38 - ld hl, $d84c + ld hl, StatusFlags set 5, [hl] ret ; 0x979fb -Script_wildoff: ; 0x979fb +Script_wildon: ; 0x979fb ; script command 0x37 - ld hl, $d84c + ld hl, StatusFlags res 5, [hl] ret ; 0x97a01 @@ -3211,7 +3215,7 @@ DisplayCredits: ret ; 0x97c05 -Script_unknown0xa8: ; 0x97c05 +Script_wait: ; 0x97c05 ; script command 0xa8 ; parameters: ; unknown (SingleByteParam) diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 095013d1d..7b64ebe00 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -72,7 +72,7 @@ PokeCenterNurseScript: ; bc09c .morn ; Different text if we're in the com center - checkbit1 $032a + checkevent $032a iftrue .morn_comcenter ; Good morning! Welcome to ... 3writetext BANK(UnknownText_0x1b0000), UnknownText_0x1b0000 @@ -86,7 +86,7 @@ PokeCenterNurseScript: ; bc09c .day ; Different text if we're in the com center - checkbit1 $032a + checkevent $032a iftrue .day_comcenter ; Hello! Welcome to ... 3writetext BANK(UnknownText_0x1b002b), UnknownText_0x1b002b @@ -100,7 +100,7 @@ PokeCenterNurseScript: ; bc09c .nite ; Different text if we're in the com center - checkbit1 $032a + checkevent $032a iftrue .nite_comcenter ; Good evening! You're out late. ... 3writetext BANK(UnknownText_0x1b004f), UnknownText_0x1b004f @@ -114,7 +114,7 @@ PokeCenterNurseScript: ; bc09c .heal ; If we come back, don't welcome us to the com center again - clearbit1 $032a + clearevent $032a ; Ask if you want to heal 3writetext BANK(UnknownText_0x1b017a), UnknownText_0x1b017a yesorno @@ -138,7 +138,7 @@ PokeCenterNurseScript: ; bc09c checkphonecall iftrue .done ; Has Pokerus already been found in the Pokecenter? - checkbit2 $000d + checkflag $000d iftrue .done ; Check for Pokerus special $004e ; SPECIAL_CHECKPOKERUS @@ -164,7 +164,7 @@ PokeCenterNurseScript: ; bc09c ; Different text for com center (excludes 'in a Pokemon Center') ; Since flag $32a is cleared when healing, ; this text is never actually seen - checkbit1 $032a + checkevent $032a iftrue .pokerus_comcenter ; Your Pokemon appear to be infected ... 3writetext BANK(UnknownText_0x1b0241), UnknownText_0x1b0241 @@ -178,7 +178,7 @@ PokeCenterNurseScript: ; bc09c loadmovesprites .endpokerus ; Don't tell us about Pokerus again - setbit2 $000d + setflag $000d ; Trigger Elm's Pokerus phone call specialphonecall $0001 end @@ -354,17 +354,17 @@ UnknownRawText_0xbc235: ; bc235 ; bc23e UnknownScript_0xbc23e: ; 0xbc23e - clearbit1 $06cd + clearevent $06cd end ; 0xbc242 UnknownScript_0xbc242: ; 0xbc242 - setbit2 $0013 - setbit1 $06cf - setbit1 $06d1 - clearbit1 $06ce - clearbit1 $0025 - setbit1 $0756 + setflag $0013 + setevent $06cf + setevent $06d1 + clearevent $06ce + clearevent $0025 + setevent $0756 specialphonecall $0004 domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1 end @@ -373,19 +373,19 @@ UnknownScript_0xbc242: ; 0xbc242 UnknownScript_0xbc25c: ; 0xbc25c special $0034 2call UnknownScript_0xbc380 - setbit1 $0747 - clearbit1 $0748 - setbit1 $02d2 + setevent $0747 + clearevent $0748 + setevent $02d2 warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4 applymovement $0, MovementData_0xbcea1 UnknownScript_0xbc274: ; bc274 - clearbit2 $0011 - clearbit1 $02d2 - clearbit1 $0313 - clearbit1 $0314 - clearbit1 $0315 - clearbit1 $0316 + clearflag $0011 + clearevent $02d2 + clearevent $0313 + clearevent $0314 + clearevent $0315 + clearevent $0316 loadfont 3writetext $6c, $45bf closetext @@ -407,7 +407,7 @@ UnknownScript_0xbc274: ; bc274 UnknownScript_0xbc2b1: ; 0xbc2b1 3writetext $6c, $465b keeptextopen - checkbit1 $0308 + checkevent $0308 iffalse $42c4 3writetext $6c, $46d9 closetext @@ -420,33 +420,33 @@ UnknownScript_0xbc2b1: ; 0xbc2b1 loadmovesprites dotrigger $0 domaptrigger GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE, $0 - setbit1 $0716 - setbit1 $0717 - setbit1 $0718 - setbit1 $0719 - setbit1 $071a - setbit1 $071b - setbit1 $071c - setbit1 $071d - setbit1 $071e - setbit1 $071f - setbit1 $0720 - setbit1 $0721 - setbit1 $0722 - setbit1 $0723 - setbit1 $0724 - setbit1 $0725 - setbit1 $0726 - setbit1 $0727 - setbit1 $0728 - setbit1 $0729 - setbit2 $0051 + setevent $0716 + setevent $0717 + setevent $0718 + setevent $0719 + setevent $071a + setevent $071b + setevent $071c + setevent $071d + setevent $071e + setevent $071f + setevent $0720 + setevent $0721 + setevent $0722 + setevent $0723 + setevent $0724 + setevent $0725 + setevent $0726 + setevent $0727 + setevent $0728 + setevent $0729 + setflag $0051 special $003c end ; 0xbc31e UnknownScript_0xbc31e: ; 0xbc31e - setbit1 $0000 + setevent $0000 itemtotext SUN_STONE, $1 3writetext $6c, $4621 closetext @@ -476,191 +476,191 @@ UnknownScript_0xbc343: ; 0xbc343 UnknownScript_0xbc354: ; 0xbc354 3writetext $6c, $48cc keeptextopen - setbit1 $0313 + setevent $0313 2jump UnknownScript_0xbc2b1 ; 0xbc35f UnknownScript_0xbc35f: ; 0xbc35f 3writetext $6c, $48cc keeptextopen - setbit1 $0314 + setevent $0314 2jump UnknownScript_0xbc2b1 ; 0xbc36a UnknownScript_0xbc36a: ; 0xbc36a 3writetext $6c, $48cc keeptextopen - setbit1 $0315 + setevent $0315 2jump UnknownScript_0xbc2b1 ; 0xbc375 UnknownScript_0xbc375: ; 0xbc375 3writetext $6c, $48cc keeptextopen - setbit1 $0316 + setevent $0316 2jump $42a9 ; 0xbc380 UnknownScript_0xbc380: ; 0xbc380 - checkbit1 $0716 + checkevent $0716 iftrue .skip1 - clearbit1 $0720 + clearevent $0720 .skip1 - checkbit1 $0717 + checkevent $0717 iftrue .skip2 - clearbit1 $0721 + clearevent $0721 .skip2 - checkbit1 $0718 + checkevent $0718 iftrue .skip3 - clearbit1 $0722 + clearevent $0722 .skip3 - checkbit1 $0719 + checkevent $0719 iftrue .skip4 - clearbit1 $0723 + clearevent $0723 .skip4 - checkbit1 $071a + checkevent $071a iftrue .skip5 - clearbit1 $0724 + clearevent $0724 .skip5 - checkbit1 $071b + checkevent $071b iftrue .skip6 - clearbit1 $0725 + clearevent $0725 .skip6 - checkbit1 $071c + checkevent $071c iftrue .skip7 - clearbit1 $0726 + clearevent $0726 .skip7 - checkbit1 $071d + checkevent $071d iftrue .skip8 - clearbit1 $0727 + clearevent $0727 .skip8 - checkbit1 $071e + checkevent $071e iftrue .skip9 - clearbit1 $0728 + clearevent $0728 .skip9 - checkbit1 $071f + checkevent $071f iftrue .skip10 - clearbit1 $0729 + clearevent $0729 .skip10 end ; 0xbc3db UnknownScript_0xbc3db: ; 0xbc3db - setbit1 $06cb - setbit1 $06ce - setbit1 $06cd - setbit1 $06d0 - setbit1 $06f3 - setbit1 $06e9 - setbit1 $06f4 - setbit1 $06d5 - setbit1 $06de - setbit1 $06dd - setbit1 $06df - setbit1 $06c0 - setbit1 $06e4 - setbit1 $0025 - setbit1 $06be - setbit1 $06bf - setbit1 $06c1 - setbit1 $06f9 - setbit1 $06fd - setbit1 $06ff - setbit1 $0700 - setbit1 $0702 - setbit1 $0703 - setbit1 $0704 - setbit1 $070d - setbit1 $070e - setbit1 $070f - setbit1 $0710 - setbit1 $0715 - setbit1 $0716 - setbit1 $0717 - setbit1 $0718 - setbit1 $0719 - setbit1 $071a - setbit1 $071b - setbit1 $071c - setbit1 $071d - setbit1 $071e - setbit1 $071f - setbit1 $0720 - setbit1 $0721 - setbit1 $0722 - setbit1 $0723 - setbit1 $0724 - setbit1 $0725 - setbit1 $0726 - setbit1 $0727 - setbit1 $0728 - setbit1 $0729 - setbit1 $072c - setbit1 $072f - setbit1 $072d - setbit1 $0735 - setbit1 $0736 - setbit1 $073c - setbit1 $073d - setbit1 $0741 - setbit1 $0742 - setbit1 $0743 - setbit1 $0744 - setbit1 $02a4 - setbit1 $02af - setbit1 $0749 - setbit1 $06d3 - setbit1 $074d - setbit1 $0712 - setbit1 $0713 - setbit1 $0711 - setbit1 $06d4 - setbit1 $0304 - setbit1 $0307 - setbit1 $06d8 - setbit1 $06c3 - setbit1 $06c2 - setbit1 $06c6 - setbit1 $075f - setbit1 $0731 - setbit1 $074a - setbit1 $0762 - setbit1 $0738 - setbit1 $073a - setbit1 $073b - setbit1 $0733 - setbit1 $073f - setbit1 $078d - setbit1 $0766 - setbit1 $0768 - setbit1 $0769 - setbit1 $076a - setbit1 $078e - setbit1 $078f - setbit1 $0790 - setbit1 $0791 - setbit1 $0793 - setbit1 $07a4 - setbit1 $07a4 - setbit1 $07a5 - setbit1 $06ec - setbit1 $06ed - setbit1 $06f0 - setbit1 $07a9 - setbit1 $07aa - setbit1 $06c8 - setbit1 $07ac - setbit1 $07ad - setbit1 $07b5 - setbit1 $07b6 - setbit1 $07c5 - setbit1 $07b7 - setbit1 $07b0 - setbit1 $07af - setbit1 $07ae - setbit1 $07cf - setbit2 $000e - setbit2 $0017 + setevent $06cb + setevent $06ce + setevent $06cd + setevent $06d0 + setevent $06f3 + setevent $06e9 + setevent $06f4 + setevent $06d5 + setevent $06de + setevent $06dd + setevent $06df + setevent $06c0 + setevent $06e4 + setevent $0025 + setevent $06be + setevent $06bf + setevent $06c1 + setevent $06f9 + setevent $06fd + setevent $06ff + setevent $0700 + setevent $0702 + setevent $0703 + setevent $0704 + setevent $070d + setevent $070e + setevent $070f + setevent $0710 + setevent $0715 + setevent $0716 + setevent $0717 + setevent $0718 + setevent $0719 + setevent $071a + setevent $071b + setevent $071c + setevent $071d + setevent $071e + setevent $071f + setevent $0720 + setevent $0721 + setevent $0722 + setevent $0723 + setevent $0724 + setevent $0725 + setevent $0726 + setevent $0727 + setevent $0728 + setevent $0729 + setevent $072c + setevent $072f + setevent $072d + setevent $0735 + setevent $0736 + setevent $073c + setevent $073d + setevent $0741 + setevent $0742 + setevent $0743 + setevent $0744 + setevent $02a4 + setevent $02af + setevent $0749 + setevent $06d3 + setevent $074d + setevent $0712 + setevent $0713 + setevent $0711 + setevent $06d4 + setevent $0304 + setevent $0307 + setevent $06d8 + setevent $06c3 + setevent $06c2 + setevent $06c6 + setevent $075f + setevent $0731 + setevent $074a + setevent $0762 + setevent $0738 + setevent $073a + setevent $073b + setevent $0733 + setevent $073f + setevent $078d + setevent $0766 + setevent $0768 + setevent $0769 + setevent $076a + setevent $078e + setevent $078f + setevent $0790 + setevent $0791 + setevent $0793 + setevent $07a4 + setevent $07a4 + setevent $07a5 + setevent $06ec + setevent $06ed + setevent $06f0 + setevent $07a9 + setevent $07aa + setevent $06c8 + setevent $07ac + setevent $07ad + setevent $07b5 + setevent $07b6 + setevent $07c5 + setevent $07b7 + setevent $07b0 + setevent $07af + setevent $07ae + setevent $07cf + setflag $000e + setflag $0017 variablesprite $4, $52 variablesprite $5, $4 variablesprite $6, $35 @@ -670,18 +670,18 @@ UnknownScript_0xbc3db: ; 0xbc3db variablesprite $a, $a variablesprite $b, $28 variablesprite $c, $28 - setbit1 $00fb - setbit1 $076d - setbit1 $076c - setbit1 $076e - setbit1 $076f - setbit1 $0773 - setbit1 $0776 - setbit1 $0777 - setbit1 $0779 - setbit1 $0772 - setbit1 $077b - setbit1 $0036 + setevent $00fb + setevent $076d + setevent $076c + setevent $076e + setevent $076f + setevent $0773 + setevent $0776 + setevent $0777 + setevent $0779 + setevent $0772 + setevent $077b + setevent $0036 return ; 0xbc574 @@ -2298,8 +2298,8 @@ UnknownScript_0xbce7f: ; 0xbce7f faceplayer loadfont special $0059 - if_greater_than $32, UnknownScript_0xbce9a - if_greater_than $96, UnknownScript_0xbce93 + if_less_than $32, UnknownScript_0xbce9a + if_less_than $96, UnknownScript_0xbce93 3writetext $6c, $492a closetext loadmovesprites @@ -2332,25 +2332,25 @@ UnusedPhoneScript: ; 0xbcea5 end MomPhoneScript: ; 0xbceaa - checkbit1 $0040 + checkevent $0040 iftrue .bcec5 - checkbit1 $0041 ; if dude talked to you, then you left home without talking to mom + checkevent $0041 ; if dude talked to you, then you left home without talking to mom iftrue MomPhoneLectureScript - checkbit1 $001f + checkevent $001f iftrue MomPhoneNoGymQuestScript - checkbit1 $001a + checkevent $001a iftrue MomPhoneNoPokedexScript 2jump MomPhoneNoPokemonScript .bcec5 ; 0xbcec5 - checkbit1 $0007 + checkevent $0007 iftrue MomPhoneHangUpScript 3writetext BANK(MomPhoneGreetingText), MomPhoneGreetingText keeptextopen mapnametotext $0 checkcode $f if_equal $1, UnknownScript_0xbcee7 - if_equal $2, $4f27 + if_equal $2, UnknownScript_0xbcf27 2jump UnknownScript_0xbcf2f UnknownScript_0xbcedf: ; 0xbcedf @@ -2380,14 +2380,16 @@ UnknownScript_0xbcee7: ; 0xbcee7 2jump UnknownScript_0xbcf37 .violet ; 0xbcf15 - displaylocation $7 ; sprout tower - 3call $3, UnknownScript_0xbcedf + displaylocation $7, 1 ; sprout tower + 2jump UnknownScript_0xbcedf .azalea ; 0xbcf1b - displaylocation $d ; slowpoke well - 3call $3, UnknownScript_0xbcedf + displaylocation $d, 1 ; slowpoke well + 2jump UnknownScript_0xbcedf .goldenrod ; 0xbcf21 - displaylocation $11 ; radio tower - 3call $3, UnknownScript_0xbcedf + displaylocation $11, 1 ; radio tower + 2jump UnknownScript_0xbcedf + +UnknownScript_0xbcf27: ; 0xbcf27 3writetext $6d, $411c keeptextopen 2jump UnknownScript_0xbcf37 @@ -2398,7 +2400,7 @@ UnknownScript_0xbcf2f: ; 0xbcf2f 2jump UnknownScript_0xbcf37 UnknownScript_0xbcf37: ; 0xbcf37 - checkbit2 $0008 + checkflag $0008 iffalse UnknownScript_0xbcf49 checkmoney $1, 0 if_equal $0, UnknownScript_0xbcf55 @@ -2436,13 +2438,13 @@ UnknownScript_0xbcf79: ; 0xbcf79 2jump MomPhoneWontSaveMoneyScript MomPhoneSaveMoneyScript: ; 0xbcf87 - setbit2 $0008 + setflag $0008 3writetext $6d, $4289 keeptextopen 2jump MomPhoneHangUpScript MomPhoneWontSaveMoneyScript: ; 0xbcf92 - clearbit2 $0008 + clearflag $0008 3writetext BANK(MomPhoneWontSaveMoneyText), MomPhoneWontSaveMoneyText keeptextopen 2jump MomPhoneHangUpScript @@ -2464,8 +2466,8 @@ MomPhoneNoGymQuestScript: ; 0xbcfac end MomPhoneLectureScript: ; 0xbcfb1 - setbit1 $0040 - setbit2 $0009 + setevent $0040 + setflag $0009 specialphonecall $0000 3writetext BANK(MomPhoneLectureText), MomPhoneLectureText yesorno @@ -2497,7 +2499,7 @@ BillPhoneScript1: ; 0xbcfc5 checkcode $10 RAM2MEM $0 if_equal $0, .full - if_greater_than $6, .nearlyfull + if_less_than $6, .nearlyfull 3writetext BANK(BillPhoneNotFullText), BillPhoneNotFullText end @@ -2517,22 +2519,22 @@ BillPhoneScript2: ; 0xbd007 ElmPhoneScript1: ; 0xbd00d checkcode $14 if_equal $1, .pokerus - checkbit1 $0055 + checkevent $0055 iftrue .discovery - checkbit1 $002d + checkevent $002d iffalse .next - checkbit1 $0054 + checkevent $0054 iftrue .egghatched .next - checkbit1 $002d + checkevent $002d iftrue .eggunhatched - checkbit1 $0701 + checkevent $0701 iftrue .assistant - checkbit1 $001f + checkevent $001f iftrue .checkingegg - checkbit1 $0043 + checkevent $0043 iftrue .stolen - checkbit1 $001e + checkevent $001e iftrue .sawmrpokemon 3writetext BANK(ElmPhoneStartText), ElmPhoneStartText end @@ -2559,7 +2561,7 @@ ElmPhoneScript1: ; 0xbd00d .egghatched ; 0xbd061 3writetext BANK(ElmPhoneEggHatchedText), ElmPhoneEggHatchedText - setbit1 $0077 + setevent $0077 end .discovery ; 0xbd069 @@ -2591,14 +2593,14 @@ ElmPhoneScript2: ; 0xbd081 .disaster ; 0xbd09f 3writetext BANK(ElmPhoneDisasterText), ElmPhoneDisasterText specialphonecall $0000 - setbit1 $0043 + setevent $0043 end .assistant ; 0xbd0aa 3writetext BANK(ElmPhoneEggAssistantText), ElmPhoneEggAssistantText specialphonecall $0000 - clearbit1 $0700 - setbit1 $0701 + clearevent $0700 + setevent $0701 end .rocket ; 0xbd0b8 diff --git a/extras b/extras index f3fb1f24e..1089cf99d 160000 --- a/extras +++ b/extras @@ -1 +1 @@ -Subproject commit f3fb1f24eaffce571d3fe5555adf41232aad3f67 +Subproject commit 1089cf99d09ffe057660d8022fe8f82da1463a38 diff --git a/main.asm b/main.asm index bfda61d2e..1707f0172 100644 --- a/main.asm +++ b/main.asm @@ -19116,9 +19116,9 @@ BoxNameInputUpper: INCBIN "baserom.gbc", $11e5d, $122c1 - $11e5d UnknownScript_0x122c1: ; 0x122c1 - checkbit2 $0011 + checkflag $0011 iffalse .script_122cd - setbit2 $0051 + setflag $0051 special $0017 .script_122cd end @@ -19409,7 +19409,7 @@ UnknownScript_0x124c8: ; 0x124c8 special $002e pause 40 special $001b - checkbit2 $0011 + checkflag $0011 iftrue .script_64f2 3callasm BANK(HalveMoney), HalveMoney 3callasm BANK(Function12527), Function12527 @@ -54426,7 +54426,7 @@ UnknownScript_0x506c8: ; 0x506c8 closetext 3callasm BANK(Function506ef), Function506ef iffalse UnknownScript_0x506e9 - checkbit2 $0011 + checkflag $0011 iftrue UnknownScript_0x506e5 battlecheck startbattle diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index dc30fa5be..2731615f8 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -9,7 +9,7 @@ AzaleaGym_MapScriptHeader: ; 0x18ec1c BugsyScript_0x18ec1e: ; 0x18ec1e faceplayer loadfont - checkbit1 EVENT_BEAT_BUGSY + checkevent EVENT_BEAT_BUGSY iftrue UnknownScript_0x18ec48 2writetext UnknownText_0x18ed0b closetext @@ -18,26 +18,26 @@ BugsyScript_0x18ec1e: ; 0x18ec1e loadtrainer BUGSY, 1 startbattle returnafterbattle - setbit1 EVENT_BEAT_BUGSY + setevent EVENT_BEAT_BUGSY loadfont 2writetext UnknownText_0x18ee14 playsound $009c waitbutton - setbit2 $001c + setflag $001c checkcode $7 2call UnknownScript_0x18ec73 UnknownScript_0x18ec48: ; 0x18ec48 - checkbit1 EVENT_GOT_TM49_FURY_CUTTER + checkevent EVENT_GOT_TM49_FURY_CUTTER iftrue UnknownScript_0x18ec6d - setbit1 EVENT_BEAT_TWINS_AMY_AND_MAY - setbit1 EVENT_BEAT_BUG_CATCHER_BENNY - setbit1 EVENT_BEAT_BUG_CATCHER_AL - setbit1 EVENT_BEAT_BUG_CATCHER_JOSH + setevent EVENT_BEAT_TWINS_AMY_AND_MAY + setevent EVENT_BEAT_BUG_CATCHER_BENNY + setevent EVENT_BEAT_BUG_CATCHER_AL + setevent EVENT_BEAT_BUG_CATCHER_JOSH 2writetext UnknownText_0x18ee2b keeptextopen verbosegiveitem TM_49, 1 iffalse UnknownScript_0x18ec71 - setbit1 EVENT_GOT_TM49_FURY_CUTTER + setevent EVENT_GOT_TM49_FURY_CUTTER 2writetext UnknownText_0x18eefa closetext loadmovesprites @@ -213,7 +213,7 @@ Bug_catcherJoshScript: ; 0x18ecde AzaleaGymGuyScript: ; 0x18ece6 faceplayer - checkbit1 EVENT_BEAT_BUGSY + checkevent EVENT_BEAT_BUGSY iftrue .AzaleaGymGuyWinScript loadfont 2writetext AzaleaGymGuyText @@ -230,7 +230,7 @@ AzaleaGymGuyScript: ; 0x18ece6 ; 0x18ecfb MapAzaleaGymSignpost1Script: ; 0x18ecfb - checkbit2 $001c + checkflag $001c iftrue UnknownScript_0x18ed04 jumpstd $002d ; 0x18ed04 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 96c7ce25c..b4c1fb2d6 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -28,7 +28,7 @@ UnknownScript_0x198013: ; 0x198013 ; 0x198014 UnknownScript_0x198014: ; 0x198014 - setbit2 $0044 + setflag $0044 return ; 0x198018 @@ -58,10 +58,10 @@ UnknownScript_0x198049: ; 0x198049 2writetext UnknownText_0x19814d closetext loadmovesprites - setbit1 $06bf - checkbit1 EVENT_GOT_TOTODILE_FROM_ELM + setevent $06bf + checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x198071 - checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM + checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x198081 winlosstext UnknownText_0x1981e6, UnknownText_0x19835b setlasttalked $b @@ -119,7 +119,7 @@ AzaleaRocketScript_0x1980ae: ; 0x1980ae GrampsScript_0x1980b1: ; 0x1980b1 faceplayer loadfont - checkbit1 EVENT_CLEARED_SLOWPOKE_WELL + checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue UnknownScript_0x1980bf 2writetext UnknownText_0x19841b closetext @@ -175,9 +175,9 @@ UnknownScript_0x1980e5: ; 0x1980e5 closetext verbosegiveitem GS_BALL, 1 spriteface $d, $2 - setbit2 $0064 - clearbit1 $06ed - setbit1 $06eb + setflag $0064 + clearevent $06ed + setevent $06eb dotrigger $0 loadmovesprites end diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index a6dc3a09e..880563960 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -17,7 +17,7 @@ UnknownScript_0x9f85a: ; 0x9f85a ; 0x9f85b UnknownScript_0x9f85b: ; 0x9f85b - clearbit1 $07cf + clearevent $07cf return ; 0x9f85f diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index af1495f73..c1981657d 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -9,25 +9,25 @@ BillsHouse_MapScriptHeader: ; 0x189536 GrampsScript_0x189538: ; 0x189538 faceplayer loadfont - checkbit1 $0000 + checkevent $0000 iftrue UnknownScript_0x1896ba - checkbit1 EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA + checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x1896c0 - checkbit1 EVENT_MET_BILLS_GRANDPA + checkevent EVENT_MET_BILLS_GRANDPA iftrue UnknownScript_0x189553 2writetext UnknownText_0x1896ce keeptextopen - setbit1 EVENT_MET_BILLS_GRANDPA + setevent EVENT_MET_BILLS_GRANDPA UnknownScript_0x189553: ; 0x189553 - checkbit1 EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA + checkevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA iftrue UnknownScript_0x189697 - checkbit1 EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA + checkevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA iftrue UnknownScript_0x189680 - checkbit1 EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA + checkevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA iftrue UnknownScript_0x189669 - checkbit1 EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA + checkevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA iftrue UnknownScript_0x189652 - checkbit1 EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA + checkevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA iftrue UnknownScript_0x18963b 2writetext UnknownText_0x1898c0 keeptextopen @@ -39,7 +39,7 @@ UnknownScript_0x189553: ; 0x189553 iffalse UnknownScript_0x1896aa if_not_equal LICKITUNG, UnknownScript_0x1896c6 2call UnknownScript_0x1896b0 - setbit1 EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA + setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA 2jump UnknownScript_0x18963b ; 0x189592 @@ -54,7 +54,7 @@ UnknownScript_0x189592: ; 0x189592 iffalse UnknownScript_0x1896aa if_not_equal ODDISH, UnknownScript_0x1896c6 2call UnknownScript_0x1896b0 - setbit1 EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA + setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA 2jump UnknownScript_0x189652 ; 0x1895b3 @@ -69,7 +69,7 @@ UnknownScript_0x1895b3: ; 0x1895b3 iffalse UnknownScript_0x1896aa if_not_equal STARYU, UnknownScript_0x1896c6 2call UnknownScript_0x1896b0 - setbit1 EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA + setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA 2jump UnknownScript_0x189669 ; 0x1895d4 @@ -86,7 +86,7 @@ UnknownScript_0x1895d4: ; 0x1895d4 iffalse UnknownScript_0x1896aa if_not_equal GROWLITHE, UnknownScript_0x1896c6 2call UnknownScript_0x1896b0 - setbit1 EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA + setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA 2jump UnknownScript_0x189680 ; 0x1895f9 @@ -101,7 +101,7 @@ UnknownScript_0x1895f9: ; 0x1895f9 iffalse UnknownScript_0x1896aa if_not_equal VULPIX, UnknownScript_0x1896c6 2call UnknownScript_0x1896b0 - setbit1 EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA + setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA 2jump UnknownScript_0x189680 ; 0x18961a @@ -116,54 +116,54 @@ UnknownScript_0x18961a: ; 0x18961a iffalse UnknownScript_0x1896aa if_not_equal PICHU, UnknownScript_0x1896c6 2call UnknownScript_0x1896b0 - setbit1 EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA + setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA 2jump UnknownScript_0x189697 ; 0x18963b UnknownScript_0x18963b: ; 0x18963b - checkbit1 EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA + checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x189592 2call UnknownScript_0x1896b5 verbosegiveitem EVERSTONE, 1 iffalse UnknownScript_0x1896cc - setbit1 EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA - setbit1 $0000 + setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA + setevent $0000 loadmovesprites end ; 0x189652 UnknownScript_0x189652: ; 0x189652 - checkbit1 EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA + checkevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x1895b3 2call UnknownScript_0x1896b5 verbosegiveitem LEAF_STONE, 1 iffalse UnknownScript_0x1896cc - setbit1 EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA - setbit1 $0000 + setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA + setevent $0000 loadmovesprites end ; 0x189669 UnknownScript_0x189669: ; 0x189669 - checkbit1 EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA + checkevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x1895d4 2call UnknownScript_0x1896b5 verbosegiveitem WATER_STONE, 1 iffalse UnknownScript_0x1896cc - setbit1 EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA - setbit1 $0000 + setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA + setevent $0000 loadmovesprites end ; 0x189680 UnknownScript_0x189680: ; 0x189680 - checkbit1 EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA + checkevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x18961a 2call UnknownScript_0x1896b5 verbosegiveitem FIRE_STONE, 1 iffalse UnknownScript_0x1896cc - setbit1 EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA - setbit1 $0000 + setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA + setevent $0000 loadmovesprites end ; 0x189697 @@ -172,7 +172,7 @@ UnknownScript_0x189697: ; 0x189697 2call UnknownScript_0x1896b5 verbosegiveitem THUNDERSTONE, 1 iffalse UnknownScript_0x1896cc - setbit1 EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA + setevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA loadmovesprites end ; 0x1896a5 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 6b60c56fc..29cca7d91 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -13,7 +13,7 @@ BlackthornCity_MapScriptHeader: ; 0x1a46d0 ; 0x1a46d8 UnknownScript_0x1a46d8: ; 0x1a46d8 - setbit2 $004b + setflag $004b return ; 0x1a46dc @@ -32,9 +32,9 @@ UnknownScript_0x1a46e5: ; 0x1a46e5 SuperNerdScript_0x1a46e8: ; 0x1a46e8 faceplayer loadfont - checkbit1 EVENT_BEAT_CLAIR + checkevent EVENT_BEAT_CLAIR iftrue UnknownScript_0x1a4702 - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1a46fc 2writetext UnknownText_0x1a477a closetext @@ -67,7 +67,7 @@ GrampsScript_0x1a470b: ; 0x1a470b BlackBeltScript_0x1a470e: ; 0x1a470e faceplayer loadfont - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1a471c 2writetext UnknownText_0x1a494a closetext @@ -97,21 +97,21 @@ CooltrainerFScript_0x1a4728: ; 0x1a4728 YoungsterScript_0x1a472b: ; 0x1a472b faceplayer loadfont - checkbit1 EVENT_GOT_SPELL_TAG_FROM_SANTOS + checkevent EVENT_GOT_SPELL_TAG_FROM_SANTOS iftrue UnknownScript_0x1a4759 checkcode $b if_not_equal SATURDAY, UnknownScript_0x1a475f - checkbit1 EVENT_MET_SANTOS_OF_SATURDAY + checkevent EVENT_MET_SANTOS_OF_SATURDAY iftrue UnknownScript_0x1a4746 2writetext UnknownText_0x1a4a27 keeptextopen - setbit1 EVENT_MET_SANTOS_OF_SATURDAY + setevent EVENT_MET_SANTOS_OF_SATURDAY UnknownScript_0x1a4746: ; 0x1a4746 2writetext UnknownText_0x1a4a57 keeptextopen verbosegiveitem SPELL_TAG, 1 iffalse UnknownScript_0x1a475d - setbit1 EVENT_GOT_SPELL_TAG_FROM_SANTOS + setevent EVENT_GOT_SPELL_TAG_FROM_SANTOS 2writetext UnknownText_0x1a4a6b closetext loadmovesprites diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index d86dde1bd..354e14bfe 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -11,15 +11,15 @@ BlackthornGym1F_MapScriptHeader: ; 0x194e00 ; 0x194e05 UnknownScript_0x194e05: ; 0x194e05 - checkbit1 $0706 + checkevent $0706 iffalse UnknownScript_0x194e0f changeblock $8, $2, $3b UnknownScript_0x194e0f: ; 0x194e0f - checkbit1 $0707 + checkevent $0707 iffalse UnknownScript_0x194e19 changeblock $2, $4, $3a UnknownScript_0x194e19: ; 0x194e19 - checkbit1 $0708 + checkevent $0708 iffalse UnknownScript_0x194e23 changeblock $8, $6, $3b UnknownScript_0x194e23: ; 0x194e23 @@ -29,9 +29,9 @@ UnknownScript_0x194e23: ; 0x194e23 ClairScript_0x194e24: ; 0x194e24 faceplayer loadfont - checkbit2 $0022 + checkflag $0022 iftrue UnknownScript_0x194e69 - checkbit1 EVENT_BEAT_CLAIR + checkevent EVENT_BEAT_CLAIR iftrue UnknownScript_0x194e63 2writetext UnknownText_0x194efa closetext @@ -40,19 +40,19 @@ ClairScript_0x194e24: ; 0x194e24 loadtrainer CLAIR, 1 startbattle returnafterbattle - setbit1 EVENT_BEAT_CLAIR + setevent EVENT_BEAT_CLAIR loadfont 2writetext UnknownText_0x19500e closetext loadmovesprites - setbit1 EVENT_BEAT_COOLTRAINERM_PAUL - setbit1 EVENT_BEAT_COOLTRAINERM_CODY - setbit1 EVENT_BEAT_COOLTRAINERM_MIKE - setbit1 EVENT_BEAT_COOLTRAINERF_FRAN - setbit1 EVENT_BEAT_COOLTRAINERF_LOLA - clearbit1 $0736 - setbit1 $074c - clearbit1 $074d + setevent EVENT_BEAT_COOLTRAINERM_PAUL + setevent EVENT_BEAT_COOLTRAINERM_CODY + setevent EVENT_BEAT_COOLTRAINERM_MIKE + setevent EVENT_BEAT_COOLTRAINERF_FRAN + setevent EVENT_BEAT_COOLTRAINERF_LOLA + clearevent $0736 + setevent $074c + clearevent $074d end ; 0x194e63 @@ -64,7 +64,7 @@ UnknownScript_0x194e63: ; 0x194e63 ; 0x194e69 UnknownScript_0x194e69: ; 0x194e69 - checkbit1 EVENT_GOT_TM24_DRAGONBREATH + checkevent EVENT_GOT_TM24_DRAGONBREATH iftrue UnknownScript_0x194e94 2writetext UnknownText_0x195196 keeptextopen @@ -75,7 +75,7 @@ UnknownScript_0x194e69: ; 0x194e69 playsound $0001 waitbutton itemnotify - setbit1 EVENT_GOT_TM24_DRAGONBREATH + setevent EVENT_GOT_TM24_DRAGONBREATH 2writetext UnknownText_0x1951d1 keeptextopen 2jump UnknownScript_0x194e94 @@ -185,7 +185,7 @@ CooltrainerfLolaScript: ; 0x194ece BlackthornGymGuyScript: ; 0x194ed6 faceplayer loadfont - checkbit1 EVENT_BEAT_CLAIR + checkevent EVENT_BEAT_CLAIR iftrue .BlackthornGymGuyWinScript 2writetext BlackthornGymGuyText closetext @@ -200,7 +200,7 @@ BlackthornGymGuyScript: ; 0x194ed6 ; 0x194eea MapBlackthornGym1FSignpost1Script: ; 0x194eea - checkbit2 $0022 + checkflag $0022 iftrue UnknownScript_0x194ef3 jumpstd $002d ; 0x194ef3 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index dcc5815fa..c5efc3640 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -18,7 +18,7 @@ DaisyScript_0x19b0d0: ; 0x19b0d0 ; 0x19b0de UnknownScript_0x19b0de: ; 0x19b0de - checkbit2 $005c + checkflag $005c iftrue UnknownScript_0x19b11e 2writetext UnknownText_0x19b1b6 yesorno @@ -28,7 +28,7 @@ UnknownScript_0x19b0de: ; 0x19b0de special $0063 if_equal $0, UnknownScript_0x19b124 if_equal $1, UnknownScript_0x19b12a - setbit2 $005c + setflag $005c 2writetext UnknownText_0x19b266 closetext loadmovesprites diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 261799f2d..7cc4e0298 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -24,11 +24,11 @@ UnknownScript_0x180997: ; 0x180997 ; 0x180998 UnknownScript_0x180998: ; 0x180998 - checkbit1 EVENT_KOGAS_ROOM_ENTRANCE_CLOSED + checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED iffalse UnknownScript_0x1809a2 changeblock $4, $e, $2a UnknownScript_0x1809a2: ; 0x1809a2 - checkbit1 EVENT_BRUNOS_ROOM_EXIT_OPEN + checkevent EVENT_BRUNOS_ROOM_EXIT_OPEN iffalse UnknownScript_0x1809ac changeblock $4, $2, $16 UnknownScript_0x1809ac: ; 0x1809ac @@ -44,7 +44,7 @@ UnknownScript_0x1809ad: ; 0x1809ad reloadmappart loadmovesprites dotrigger $1 - setbit1 EVENT_KOGAS_ROOM_ENTRANCE_CLOSED + setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED waitbutton end ; 0x1809c5 @@ -52,7 +52,7 @@ UnknownScript_0x1809ad: ; 0x1809ad BrunoScript_0x1809c5: ; 0x1809c5 faceplayer loadfont - checkbit1 $05ba + checkevent $05ba iftrue UnknownScript_0x1809f3 2writetext UnknownText_0x1809fe closetext @@ -61,7 +61,7 @@ BrunoScript_0x1809c5: ; 0x1809c5 loadtrainer BRUNO, 1 startbattle returnafterbattle - setbit1 $05ba + setevent $05ba loadfont 2writetext UnknownText_0x180b3c closetext @@ -70,7 +70,7 @@ BrunoScript_0x1809c5: ; 0x1809c5 changeblock $4, $2, $16 reloadmappart loadmovesprites - setbit1 EVENT_BRUNOS_ROOM_EXIT_OPEN + setevent EVENT_BRUNOS_ROOM_EXIT_OPEN waitbutton end ; 0x1809f3 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 7d85aa5af..13fbe9c09 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -29,11 +29,11 @@ UnknownScript_0x185bf7: ; 0x185bf7 ; 0x185bf8 UnknownScript_0x185bf8: ; 0x185bf8 - checkbit1 $0332 + checkevent $0332 iftrue UnknownScript_0x185c02 changeblock $a, $8, $32 UnknownScript_0x185c02: ; 0x185c02 - checkbit1 EVENT_RELEASED_THE_BEASTS + checkevent EVENT_RELEASED_THE_BEASTS iftrue UnknownScript_0x185c0c changeblock $6, $e, $9 UnknownScript_0x185c0c: ; 0x185c0c @@ -66,9 +66,9 @@ UnknownScript_0x185c25: ; 0x185c25 2writetext UnknownText_0x185cd9 closetext loadmovesprites - checkbit1 EVENT_GOT_TOTODILE_FROM_ELM + checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x185c60 - checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM + checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x185c70 winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c setlasttalked $4 @@ -106,7 +106,7 @@ UnknownScript_0x185c80: ; 0x185c80 closetext loadmovesprites dotrigger $2 - setbit1 $06c5 + setevent $06c5 special $006a pause 15 earthquake 50 @@ -123,7 +123,7 @@ UnknownScript_0x185c80: ; 0x185c80 2writetext UnknownText_0x185e75 closetext loadmovesprites - setbit1 $0332 + setevent $0332 pause 15 warpcheck end diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 54645c58f..0be88fa33 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -23,7 +23,7 @@ UnknownScript_0x18615f: ; 0x18615f ; 0x186160 UnknownScript_0x186160: ; 0x186160 - checkbit1 EVENT_RELEASED_THE_BEASTS + checkevent EVENT_RELEASED_THE_BEASTS iftrue UnknownScript_0x18616a changeblock $6, $e, $2 UnknownScript_0x18616a: ; 0x18616a @@ -80,15 +80,15 @@ UnknownScript_0x18616b: ; 0x18616b waitbutton special $003d dotrigger $1 - setbit1 EVENT_RELEASED_THE_BEASTS + setevent EVENT_RELEASED_THE_BEASTS special $0069 domaptrigger GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM, $1 domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $1 - clearbit1 EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY - setbit1 $07a8 - clearbit1 $07a9 - setbit1 $0764 - setbit1 $0765 + clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY + setevent $07a8 + clearevent $07a9 + setevent $0764 + setevent $0765 appear $a refreshscreen $0 changeblock $6, $e, $1b diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 19beea7f3..6436cc347 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -92,7 +92,7 @@ MapCeladonCafeSignpost0Script: ; 0x730ad ; 0x730b0 MapCeladonCafeSignpost1Script: ; 0x730b0 - checkbit1 EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE + checkevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE iftrue UnknownScript_0x730db giveitem LEFTOVERS, $1 iffalse UnknownScript_0x730cd @@ -103,7 +103,7 @@ MapCeladonCafeSignpost1Script: ; 0x730b0 waitbutton itemnotify loadmovesprites - setbit1 EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE + setevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE end ; 0x730cd diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 72b2029a0..0f09da31f 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -11,7 +11,7 @@ CeladonCity_MapScriptHeader: ; 0x1a9f3a ; 0x1a9f3f UnknownScript_0x1a9f3f: ; 0x1a9f3f - setbit2 $003d + setflag $003d return ; 0x1a9f43 diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 8d5927f83..ced8e9445 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -47,7 +47,7 @@ FishingGuruScript_0x72139: ; 0x72139 FisherScript_0x72144: ; 0x72144 faceplayer loadfont - checkbit1 EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON + checkevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON iftrue .UnknownScript_0x72169 2writetext UnknownText_0x722dc keeptextopen @@ -58,7 +58,7 @@ FisherScript_0x72144: ; 0x72144 stringtotext .coinname, $1 2call .UnknownScript_0x72172 givecoins 18 - setbit1 EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON + setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON .UnknownScript_0x72169 ; 0x72169 2writetext UnknownText_0x72345 closetext diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 1a2abe435..1208de957 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -9,7 +9,7 @@ CeladonGym_MapScriptHeader: ; 0x72a68 ErikaScript_0x72a6a: ; 0x72a6a faceplayer loadfont - checkbit2 $0026 + checkflag $0026 iftrue UnknownScript_0x72a9b 2writetext UnknownText_0x72b28 closetext @@ -18,24 +18,24 @@ ErikaScript_0x72a6a: ; 0x72a6a loadtrainer ERIKA, 1 startbattle returnafterbattle - setbit1 $04c8 - setbit1 EVENT_BEAT_LASS_MICHELLE - setbit1 EVENT_BEAT_PICNICKER_TANYA - setbit1 EVENT_BEAT_BEAUTY_JULIA - setbit1 EVENT_BEAT_TWINS_JO_AND_ZOE + setevent $04c8 + setevent EVENT_BEAT_LASS_MICHELLE + setevent EVENT_BEAT_PICNICKER_TANYA + setevent EVENT_BEAT_BEAUTY_JULIA + setevent EVENT_BEAT_TWINS_JO_AND_ZOE loadfont 2writetext UnknownText_0x72c96 playsound $009c waitbutton - setbit2 $0026 + setflag $0026 UnknownScript_0x72a9b: ; 0x72a9b - checkbit1 EVENT_GOT_TM19_GIGA_DRAIN + checkevent EVENT_GOT_TM19_GIGA_DRAIN iftrue UnknownScript_0x72aae 2writetext UnknownText_0x72cb0 keeptextopen verbosegiveitem TM_19, 1 iffalse UnknownScript_0x72aae - setbit1 EVENT_GOT_TM19_GIGA_DRAIN + setevent EVENT_GOT_TM19_GIGA_DRAIN UnknownScript_0x72aae: ; 0x72aae 2writetext UnknownText_0x72d8f closetext @@ -189,7 +189,7 @@ TwinsJoandzoe2Script: ; 0x72b10 ; 0x72b18 MapCeladonGymSignpost1Script: ; 0x72b18 - checkbit2 $0026 + checkflag $0026 iftrue UnknownScript_0x72b21 jumpstd $002d ; 0x72b21 diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 012f05e51..6c2b41e08 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -11,7 +11,7 @@ CooltrainerMScript_0x71670: ; 0x71670 loadfont 2writetext UnknownText_0x716ce checkcode $5 - if_less_than $f8, UnknownScript_0x7167e + if_greater_than $f8, UnknownScript_0x7167e closetext loadmovesprites end @@ -28,14 +28,14 @@ UnknownScript_0x7167e: ; 0x7167e 2writetext UnknownText_0x71763 closetext loadmovesprites - setbit1 EVENT_ENABLE_DIPLOMA_PRINTING + setevent EVENT_ENABLE_DIPLOMA_PRINTING end ; 0x71696 GymGuyScript_0x71696: ; 0x71696 faceplayer loadfont - checkbit1 EVENT_ENABLE_DIPLOMA_PRINTING + checkevent EVENT_ENABLE_DIPLOMA_PRINTING iftrue UnknownScript_0x716a4 2writetext UnknownText_0x717b4 closetext diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index a79e9a3bb..be690ed40 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -9,7 +9,7 @@ CeladonMansionRoofHouse_MapScriptHeader: ; 0x71afb PharmacistScript_0x71afd: ; 0x71afd faceplayer loadfont - checkbit1 EVENT_GOT_TM03_CURSE + checkevent EVENT_GOT_TM03_CURSE iftrue UnknownScript_0x71b21 2writetext UnknownText_0x71b27 keeptextopen @@ -26,7 +26,7 @@ UnknownScript_0x71b14: ; 0x71b14 keeptextopen verbosegiveitem TM_03, 1 iffalse UnknownScript_0x71b25 - setbit1 EVENT_GOT_TM03_CURSE + setevent EVENT_GOT_TM03_CURSE UnknownScript_0x71b21: ; 0x71b21 2writetext UnknownText_0x71db3 closetext diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index b3d4dede2..7cd8b19d2 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -11,14 +11,14 @@ CeruleanCity_MapScriptHeader: ; 0x184000 ; 0x184005 UnknownScript_0x184005: ; 0x184005 - setbit2 $0038 + setflag $0038 return ; 0x184009 CooltrainerMScript_0x184009: ; 0x184009 faceplayer loadfont - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x184017 2writetext UnknownText_0x1840bc closetext @@ -72,9 +72,9 @@ CooltrainerFScript_0x18402a: ; 0x18402a FisherScript_0x18404a: ; 0x18404a faceplayer loadfont - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x184058 - checkbit1 EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM + checkevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM iftrue UnknownScript_0x18405e UnknownScript_0x184058: ; 0x184058 2writetext UnknownText_0x18424e @@ -96,7 +96,7 @@ YoungsterScript_0x184064: ; 0x184064 2writetext UnknownText_0x1842a9 closetext loadmovesprites - checkbit1 $00fa + checkevent $00fa iffalse UnknownScript_0x184072 end ; 0x184072 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 319944032..10199e2a4 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -42,9 +42,9 @@ UnknownScript_0x1883de: ; 0x1883de applymovement $2, MovementData_0x1884e8 playsound $0023 disappear $2 - setbit1 EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM - clearbit1 $076c - clearbit1 $076e + setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM + clearevent $076c + clearevent $076e dotrigger $0 domaptrigger GROUP_ROUTE_25, MAP_ROUTE_25, $1 domaptrigger GROUP_POWER_PLANT, MAP_POWER_PLANT, $0 @@ -59,7 +59,7 @@ UnknownScript_0x1883de: ; 0x1883de MistyScript_0x188432: ; 0x188432 faceplayer loadfont - checkbit2 $0024 + checkflag $0024 iftrue UnknownScript_0x188460 2writetext UnknownText_0x188674 closetext @@ -68,15 +68,15 @@ MistyScript_0x188432: ; 0x188432 loadtrainer MISTY, 1 startbattle returnafterbattle - setbit1 EVENT_BEAT_MISTY - setbit1 EVENT_BEAT_SWIMMERF_DIANA - setbit1 EVENT_BEAT_SWIMMERF_BRIANA - setbit1 EVENT_BEAT_SWIMMERM_PARKER + setevent EVENT_BEAT_MISTY + setevent EVENT_BEAT_SWIMMERF_DIANA + setevent EVENT_BEAT_SWIMMERF_BRIANA + setevent EVENT_BEAT_SWIMMERM_PARKER loadfont 2writetext UnknownText_0x188768 playsound $009c waitbutton - setbit2 $0024 + setflag $0024 UnknownScript_0x188460: ; 0x188460 2writetext UnknownText_0x188782 closetext @@ -174,7 +174,7 @@ SwimmermParkerScript: ; 0x18849a CeruleanGymGuyScript: ; 0x1884a2 faceplayer loadfont - checkbit1 EVENT_BEAT_MISTY + checkevent EVENT_BEAT_MISTY iftrue .CeruleanGymGuyWinScript 2writetext CeruleanGymGuyText closetext @@ -195,7 +195,7 @@ MapCeruleanGymSignpostItem0: ; 0x1884b6 ; 0x1884b9 MapCeruleanGymSignpost1Script: ; 0x1884b9 - checkbit1 $076f + checkevent $076f iffalse UnknownScript_0x1884d3 loadfont 2writetext UnknownText_0x188610 @@ -205,7 +205,7 @@ MapCeruleanGymSignpost1Script: ; 0x1884b9 ; 0x1884c6 MapCeruleanGymSignpost2Script: ; 0x1884c6 - checkbit1 $076f + checkevent $076f iffalse UnknownScript_0x1884d3 loadfont 2writetext UnknownText_0x188642 @@ -215,7 +215,7 @@ MapCeruleanGymSignpost2Script: ; 0x1884c6 ; 0x1884d3 UnknownScript_0x1884d3: ; 0x1884d3 - checkbit2 $0024 + checkflag $0024 iftrue UnknownScript_0x1884dc jumpstd $002d ; 0x1884dc diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index ef8f92b2a..ec5b73fb6 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -9,9 +9,9 @@ CharcoalKiln_MapScriptHeader: ; 0x18dd18 BlackBeltScript_0x18dd1a: ; 0x18dd1a faceplayer loadfont - checkbit1 EVENT_GOT_HM01_CUT + checkevent EVENT_GOT_HM01_CUT iftrue UnknownScript_0x18dd34 - checkbit1 EVENT_CLEARED_SLOWPOKE_WELL + checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue UnknownScript_0x18dd2e 2writetext UnknownText_0x18dd74 closetext @@ -36,9 +36,9 @@ UnknownScript_0x18dd34: ; 0x18dd34 YoungsterScript_0x18dd3a: ; 0x18dd3a faceplayer loadfont - checkbit1 EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN + checkevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN iftrue UnknownScript_0x18dd5d - checkbit1 EVENT_GOT_HM01_CUT + checkevent EVENT_GOT_HM01_CUT iftrue UnknownScript_0x18dd4e 2writetext UnknownText_0x18dee0 closetext @@ -51,7 +51,7 @@ UnknownScript_0x18dd4e: ; 0x18dd4e keeptextopen verbosegiveitem CHARCOAL, 1 iffalse UnknownScript_0x18dd61 - setbit1 EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN + setevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN loadmovesprites end ; 0x18dd5d diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 884ca2eae..bb5aada48 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -23,7 +23,7 @@ UnknownScript_0x19c00e: ; 0x19c00e ; 0x19c00f UnknownScript_0x19c00f: ; 0x19c00f - setbit2 $0042 + setflag $0042 return ; 0x19c013 @@ -75,7 +75,7 @@ UnknownScript_0x19c01f: ; 0x19c01f keeptextopen stringtotext .mapcardname, $1 2call .UnknownScript_0x19c097 - setbit2 $0001 + setflag $0001 2writetext UnknownText_0x19c438 keeptextopen 2writetext UnknownText_0x19c451 @@ -87,7 +87,7 @@ UnknownScript_0x19c01f: ; 0x19c01f applymovement $2, MovementData_0x19c1cb playsound $001f disappear $2 - clearbit1 EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE + clearevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE waitbutton end @@ -123,9 +123,9 @@ UnknownScript_0x19c0ae: ; 0x19c0ae 2writetext UnknownText_0x19c4e2 closetext loadmovesprites - checkbit1 EVENT_GOT_TOTODILE_FROM_ELM + checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x19c0ee - checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM + checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x19c104 winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6 setlasttalked $3 @@ -192,7 +192,7 @@ UnknownScript_0x19c12f: ; 0x19c12f TeacherScript_0x19c146: ; 0x19c146 faceplayer loadfont - checkbit2 $0001 + checkflag $0001 iftrue UnknownScript_0x19c154 2writetext UnknownText_0x19c650 closetext @@ -210,7 +210,7 @@ UnknownScript_0x19c154: ; 0x19c154 YoungsterScript_0x19c15a: ; 0x19c15a faceplayer loadfont - checkbit2 $000b + checkflag $000b iftrue UnknownScript_0x19c168 2writetext UnknownText_0x19c6d6 closetext @@ -228,13 +228,13 @@ UnknownScript_0x19c168: ; 0x19c168 FisherScript_0x19c16e: ; 0x19c16e faceplayer loadfont - checkbit1 EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE + checkevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE iftrue UnknownScript_0x19c183 2writetext UnknownText_0x19c766 keeptextopen verbosegiveitem MYSTIC_WATER, 1 iffalse UnknownScript_0x19c187 - setbit1 EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE + setevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE UnknownScript_0x19c183: ; 0x19c183 2writetext UnknownText_0x19c7c1 closetext diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 441dacd51..5600c948d 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -8,7 +8,7 @@ CherrygroveMart_MapScriptHeader: ; 0x196808 ClerkScript_0x19680a: ; 0x19680a loadfont - checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM + checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x196817 pokemart $0, $0000 loadmovesprites @@ -24,7 +24,7 @@ UnknownScript_0x196817: ; 0x196817 CooltrainerMScript_0x19681d: ; 0x19681d faceplayer loadfont - checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM + checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x19682b 2writetext UnknownText_0x196834 closetext diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm index 368d5a146..d3b5b4920 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokeCenter1F.asm @@ -21,7 +21,7 @@ GentlemanScript_0x196973: ; 0x196973 TeacherScript_0x196976: ; 0x196976 faceplayer loadfont - checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM + checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x196984 2writetext UnknownText_0x1969f1 closetext diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 527be1bf1..88471e22c 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -23,9 +23,9 @@ UnknownScript_0x1a000e: ; 0x1a000e ; 0x1a000f UnknownScript_0x1a000f: ; 0x1a000f - setbit2 $0045 - setbit1 $07aa - checkbit1 $0333 + setflag $0045 + setevent $07aa + checkevent $0333 iffalse UnknownScript_0x1a001d disappear $c UnknownScript_0x1a001d: ; 0x1a001d @@ -45,11 +45,11 @@ UnknownScript_0x1a001e: ; 0x1a001e disappear $d pause 10 dotrigger $0 - clearbit1 EVENT_SAW_SUICUNE_ON_ROUTE_42 + clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42 domaptrigger GROUP_ROUTE_42, MAP_ROUTE_42, $1 - checkbit1 $0333 + checkevent $0333 iftrue UnknownScript_0x1a0083 - setbit1 $0333 + setevent $0333 playmusic $0061 appear $c applymovement $c, MovementData_0x1a00e7 @@ -81,11 +81,11 @@ UnknownScript_0x1a0083: ; 0x1a0083 PokefanFScript_0x1a0084: ; 0x1a0084 faceplayer loadfont - checkbit1 EVENT_GOT_HM02_FLY + checkevent EVENT_GOT_HM02_FLY iftrue UnknownScript_0x1a00ad 2writetext UnknownText_0x1a00f1 keeptextopen - checkbit1 EVENT_BEAT_CHUCK + checkevent EVENT_BEAT_CHUCK iftrue UnknownScript_0x1a009c 2writetext UnknownText_0x1a0163 closetext @@ -98,7 +98,7 @@ UnknownScript_0x1a009c: ; 0x1a009c keeptextopen verbosegiveitem HM_02, 1 iffalse UnknownScript_0x1a00b1 - setbit1 EVENT_GOT_HM02_FLY + setevent EVENT_GOT_HM02_FLY 2writetext UnknownText_0x1a021d keeptextopen UnknownScript_0x1a00ad: ; 0x1a00ad diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 5b34e53b1..a87870e17 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -9,7 +9,7 @@ CianwoodGym_MapScriptHeader: ; 0x9d60d ChuckScript_0x9d60f: ; 0x9d60f faceplayer loadfont - checkbit1 EVENT_BEAT_CHUCK + checkevent EVENT_BEAT_CHUCK iftrue UnknownScript_0x9d656 2writetext UnknownText_0x9d6f9 closetext @@ -33,26 +33,26 @@ ChuckScript_0x9d60f: ; 0x9d60f loadtrainer CHUCK, 1 startbattle returnafterbattle - setbit1 EVENT_BEAT_CHUCK + setevent EVENT_BEAT_CHUCK loadfont 2writetext UnknownText_0x9d835 playsound $009c waitbutton - setbit2 $0020 + setflag $0020 checkcode $7 2call UnknownScript_0x9d681 UnknownScript_0x9d656: ; 0x9d656 - checkbit1 EVENT_GOT_TM01_DYNAMICPUNCH + checkevent EVENT_GOT_TM01_DYNAMICPUNCH iftrue UnknownScript_0x9d67b - setbit1 EVENT_BEAT_BLACKBELT_YOSHI - setbit1 EVENT_BEAT_BLACKBELT_LAO - setbit1 EVENT_BEAT_BLACKBELT_NOB - setbit1 EVENT_BEAT_BLACKBELT_LUNG + setevent EVENT_BEAT_BLACKBELT_YOSHI + setevent EVENT_BEAT_BLACKBELT_LAO + setevent EVENT_BEAT_BLACKBELT_NOB + setevent EVENT_BEAT_BLACKBELT_LUNG 2writetext UnknownText_0x9d84d keeptextopen verbosegiveitem TM_01, 1 iffalse UnknownScript_0x9d67f - setbit1 EVENT_GOT_TM01_DYNAMICPUNCH + setevent EVENT_GOT_TM01_DYNAMICPUNCH 2writetext UnknownText_0x9d8da closetext loadmovesprites @@ -202,7 +202,7 @@ BoulderScript_0x9d6e0: ; 0x9d6e0 ; 0x9d6e3 MapCianwoodGymSignpost1Script: ; 0x9d6e3 - checkbit2 $0020 + checkflag $0020 iftrue UnknownScript_0x9d6ec jumpstd $002d ; 0x9d6ec diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 4f8bb2a49..dfafc9ea3 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -16,9 +16,9 @@ UnknownScript_0x9df9d: ; 0x9df9d PharmacistScript_0x9df9e: ; 0x9df9e faceplayer loadfont - checkbit1 EVENT_GOT_SECRETPOTION_FROM_PHARMACY + checkevent EVENT_GOT_SECRETPOTION_FROM_PHARMACY iftrue UnknownScript_0x9dfc4 - checkbit1 $0037 + checkevent $0037 iffalse UnknownScript_0x9dfc4 2writetext UnknownText_0x9dfcd keeptextopen @@ -27,7 +27,7 @@ PharmacistScript_0x9df9e: ; 0x9df9e playsound $0091 waitbutton itemnotify - setbit1 EVENT_GOT_SECRETPOTION_FROM_PHARMACY + setevent EVENT_GOT_SECRETPOTION_FROM_PHARMACY 2writetext UnknownText_0x9e070 closetext loadmovesprites diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index 54cd87573..964d76d8d 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -16,7 +16,7 @@ LassScript_0x9dbd2: ; 0x9dbd2 CianwoodGymGuyScript: ; 0x9dbd5 faceplayer - checkbit1 EVENT_BEAT_CHUCK + checkevent EVENT_BEAT_CHUCK iftrue .CianwoodGymGuyWinScript loadfont 2writetext CianwoodGymGuyText diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 424ea6c20..1788398cd 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -11,7 +11,7 @@ CinnabarIsland_MapScriptHeader: ; 0x1ac9a7 ; 0x1ac9ac UnknownScript_0x1ac9ac: ; 0x1ac9ac - setbit2 $003f + setflag $003f return ; 0x1ac9b0 @@ -24,7 +24,7 @@ BlueScript_0x1ac9b0: ; 0x1ac9b0 playsound $0013 applymovement $2, MovementData_0x1ac9d0 disappear $2 - clearbit1 $0776 + clearevent $0776 end ; 0x1ac9c4 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 89f2835e7..9aef7fdf7 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -13,7 +13,7 @@ PokefanMScript_0x18ad13: ; 0x18ad13 PokefanFScript_0x18ad16: ; 0x18ad16 faceplayer loadfont - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x18ad24 2writetext UnknownText_0x18ad95 closetext diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index eb85b9e77..ece80881f 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -11,7 +11,7 @@ CopycatsHouse2F_MapScriptHeader: ; 0x18ae9a ; 0x18ae9f UnknownScript_0x18ae9f: ; 0x18ae9f - checkbit2 $0063 + checkflag $0063 iftrue UnknownScript_0x18aeac disappear $7 appear $2 @@ -27,13 +27,13 @@ UnknownScript_0x18aeb0: ; 0x18aeb0 CopycatScript_0x18aeb1: ; 0x18aeb1 faceplayer - checkbit1 EVENT_GOT_PASS_FROM_COPYCAT + checkevent EVENT_GOT_PASS_FROM_COPYCAT iftrue UnknownScript_0x18af6f - checkbit1 EVENT_RETURNED_LOST_ITEM_TO_COPYCAT + checkevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT iftrue UnknownScript_0x18af5b checkitem LOST_ITEM iftrue UnknownScript_0x18af4a - checkbit2 $0063 + checkflag $0063 iftrue UnknownScript_0x18aed4 applymovement $2, MovementData_0x18afd0 faceplayer @@ -47,10 +47,10 @@ UnknownScript_0x18aed4: ; 0x18aed4 variablesprite $b, $60 UnknownScript_0x18aedc: ; 0x18aedc special $005e - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x18af16 loadfont - checkbit2 $0063 + checkflag $0063 iftrue UnknownScript_0x18aef2 2writetext UnknownText_0x18afda 2jump UnknownScript_0x18aef5 @@ -61,7 +61,7 @@ UnknownScript_0x18aef2: ; 0x18aef2 UnknownScript_0x18aef5: ; 0x18aef5 closetext loadmovesprites - checkbit2 $0063 + checkflag $0063 iftrue UnknownScript_0x18af04 applymovement $2, MovementData_0x18afd0 2jump UnknownScript_0x18af08 @@ -82,7 +82,7 @@ UnknownScript_0x18af08: ; 0x18af08 UnknownScript_0x18af16: ; 0x18af16 loadfont - checkbit2 $0063 + checkflag $0063 iftrue UnknownScript_0x18af23 2writetext UnknownText_0x18b064 2jump UnknownScript_0x18af26 @@ -93,7 +93,7 @@ UnknownScript_0x18af23: ; 0x18af23 UnknownScript_0x18af26: ; 0x18af26 closetext loadmovesprites - checkbit2 $0063 + checkflag $0063 iftrue UnknownScript_0x18af35 applymovement $2, MovementData_0x18afd0 2jump UnknownScript_0x18af39 @@ -109,7 +109,7 @@ UnknownScript_0x18af39: ; 0x18af39 2writetext UnknownText_0x18b116 closetext loadmovesprites - setbit1 EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM + setevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM end ; 0x18af4a @@ -118,8 +118,8 @@ UnknownScript_0x18af4a: ; 0x18af4a 2writetext UnknownText_0x18b17f keeptextopen takeitem LOST_ITEM, 1 - setbit1 EVENT_RETURNED_LOST_ITEM_TO_COPYCAT - clearbit1 $0773 + setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT + clearevent $0773 2jump UnknownScript_0x18af5c ; 0x18af5b @@ -130,7 +130,7 @@ UnknownScript_0x18af5c: ; 0x18af5c keeptextopen verbosegiveitem PASS, 1 iffalse UnknownScript_0x18afba - setbit1 EVENT_GOT_PASS_FROM_COPYCAT + setevent EVENT_GOT_PASS_FROM_COPYCAT 2writetext UnknownText_0x18b214 closetext loadmovesprites @@ -138,7 +138,7 @@ UnknownScript_0x18af5c: ; 0x18af5c ; 0x18af6f UnknownScript_0x18af6f: ; 0x18af6f - checkbit2 $0063 + checkflag $0063 iftrue UnknownScript_0x18af80 applymovement $2, MovementData_0x18afd0 faceplayer @@ -153,7 +153,7 @@ UnknownScript_0x18af80: ; 0x18af80 UnknownScript_0x18af88: ; 0x18af88 special $005e loadfont - checkbit2 $0063 + checkflag $0063 iftrue UnknownScript_0x18af98 2writetext UnknownText_0x18b298 2jump UnknownScript_0x18af9b @@ -164,7 +164,7 @@ UnknownScript_0x18af98: ; 0x18af98 UnknownScript_0x18af9b: ; 0x18af9b closetext loadmovesprites - checkbit2 $0063 + checkflag $0063 iftrue UnknownScript_0x18afaa applymovement $2, MovementData_0x18afd0 2jump UnknownScript_0x18afae diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 3f4f2656b..fb76190f2 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -156,23 +156,23 @@ GentlemanScript_0x994c6: ; 0x994c6 loadfont 2writetext UnknownText_0x9980a keeptextopen - checkbit1 EVENT_GOT_HM03_SURF + checkevent EVENT_GOT_HM03_SURF iftrue UnknownScript_0x99515 - checkbit1 EVENT_BEAT_KIMONO_GIRL_NAOKO + checkevent EVENT_BEAT_KIMONO_GIRL_NAOKO iffalse UnknownScript_0x994f3 - checkbit1 EVENT_BEAT_KIMONO_GIRL_SAYO + checkevent EVENT_BEAT_KIMONO_GIRL_SAYO iffalse UnknownScript_0x994f3 - checkbit1 EVENT_BEAT_KIMONO_GIRL_ZUKI + checkevent EVENT_BEAT_KIMONO_GIRL_ZUKI iffalse UnknownScript_0x994f3 - checkbit1 EVENT_BEAT_KIMONO_GIRL_KUNI + checkevent EVENT_BEAT_KIMONO_GIRL_KUNI iffalse UnknownScript_0x994f3 - checkbit1 EVENT_BEAT_KIMONO_GIRL_MIKI + checkevent EVENT_BEAT_KIMONO_GIRL_MIKI iffalse UnknownScript_0x994f3 2jump UnknownScript_0x99505 ; 0x994f3 UnknownScript_0x994f3: ; 0x994f3 - checkbit2 $0063 + checkflag $0063 iftrue UnknownScript_0x994ff 2writetext UnknownText_0x99891 closetext @@ -191,7 +191,7 @@ UnknownScript_0x99505: ; 0x99505 2writetext UnknownText_0x9991a keeptextopen verbosegiveitem HM_03, 1 - setbit1 EVENT_GOT_HM03_SURF + setevent EVENT_GOT_HM03_SURF 2writetext UnknownText_0x9999b closetext loadmovesprites diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index cc87b799a..d7e3b53dd 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -9,13 +9,13 @@ DarkCaveBlackthornEntrance_MapScriptHeader: ; 0x18c71e PharmacistScript_0x18c720: ; 0x18c720 faceplayer loadfont - checkbit1 EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE + checkevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE iftrue UnknownScript_0x18c735 2writetext UnknownText_0x18c73f keeptextopen verbosegiveitem BLACKGLASSES, 1 iffalse UnknownScript_0x18c739 - setbit1 EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE + setevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE UnknownScript_0x18c735: ; 0x18c735 2writetext UnknownText_0x18c80c closetext diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 2c05823e4..0fc1f13ee 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -11,23 +11,23 @@ DayCare_MapScriptHeader: ; 0x62f76 ; 0x62f7b UnknownScript_0x62f7b: ; 0x62f7b - checkbit2 $0005 + checkflag $0005 iftrue UnknownScript_0x62f88 - clearbit1 $06e5 - setbit1 $06e6 + clearevent $06e5 + setevent $06e6 return ; 0x62f88 UnknownScript_0x62f88: ; 0x62f88 - setbit1 $06e5 - clearbit1 $06e6 + setevent $06e5 + clearevent $06e6 return ; 0x62f8f GrampsScript_0x62f8f: ; 0x62f8f faceplayer loadfont - checkbit1 EVENT_GOT_ODD_EGG + checkevent EVENT_GOT_ODD_EGG iftrue UnknownScript_0x62fbd 2writetext UnknownText_0x630ce keeptextopen @@ -42,7 +42,7 @@ GrampsScript_0x62f8f: ; 0x62f8f 2writetext UnknownText_0x631c3 closetext loadmovesprites - setbit1 EVENT_GOT_ODD_EGG + setevent EVENT_GOT_ODD_EGG end ; 0x62fb6 @@ -64,7 +64,7 @@ UnknownScript_0x62fbd: ; 0x62fbd GrannyScript_0x62fc3: ; 0x62fc3 faceplayer loadfont - checkbit2 $0005 + checkflag $0005 iftrue UnknownScript_0x62fd1 special $001f closetext diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 28ef72a6d..bafdc98cc 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -26,7 +26,7 @@ UnknownScript_0x18d023: ; 0x18d023 2writetext UnknownText_0x18d2ea keeptextopen UnknownScript_0x18d030: ; 0x18d030 - setbit1 $0001 + setevent $0001 2writetext UnknownText_0x18d3bc keeptextopen loadmenudata MenuDataHeader_0x18d215 @@ -39,7 +39,7 @@ UnknownScript_0x18d030: ; 0x18d030 ; 0x18d049 UnknownScript_0x18d049: ; 0x18d049 - setbit1 $0002 + setevent $0002 2writetext UnknownText_0x18d3d3 keeptextopen loadmenudata MenuDataHeader_0x18d234 @@ -49,7 +49,7 @@ UnknownScript_0x18d049: ; 0x18d049 if_equal $2, UnknownScript_0x18d0a9 if_equal $3, UnknownScript_0x18d0cb UnknownScript_0x18d061: ; 0x18d061 - setbit1 $0003 + setevent $0003 2writetext UnknownText_0x18d3f3 keeptextopen loadmenudata MenuDataHeader_0x18d258 @@ -59,7 +59,7 @@ UnknownScript_0x18d061: ; 0x18d061 if_equal $2, UnknownScript_0x18d0a9 if_equal $3, UnknownScript_0x18d0a9 UnknownScript_0x18d079: ; 0x18d079 - setbit1 $0004 + setevent $0004 2writetext UnknownText_0x18d420 keeptextopen loadmenudata MenuDataHeader_0x18d283 @@ -69,7 +69,7 @@ UnknownScript_0x18d079: ; 0x18d079 if_equal $2, UnknownScript_0x18d0cb if_equal $3, UnknownScript_0x18d0a9 UnknownScript_0x18d091: ; 0x18d091 - setbit1 $0005 + setevent $0005 2writetext UnknownText_0x18d44a keeptextopen loadmenudata MenuDataHeader_0x18d2a5 @@ -79,17 +79,17 @@ UnknownScript_0x18d091: ; 0x18d091 if_equal $2, UnknownScript_0x18d0a9 if_equal $3, UnknownScript_0x18d0cb UnknownScript_0x18d0a9: ; 0x18d0a9 - checkbit1 $0005 + checkevent $0005 iftrue UnknownScript_0x18d100 2writetext UnknownText_0x18d82d keeptextopen - checkbit1 $0004 + checkevent $0004 iftrue UnknownScript_0x18d091 - checkbit1 $0003 + checkevent $0003 iftrue UnknownScript_0x18d079 - checkbit1 $0002 + checkevent $0002 iftrue UnknownScript_0x18d061 - checkbit1 $0001 + checkevent $0001 iftrue UnknownScript_0x18d049 UnknownScript_0x18d0cb: ; 0x18d0cb loadmovesprites @@ -103,17 +103,17 @@ UnknownScript_0x18d0cb: ; 0x18d0cb 2writetext UnknownText_0x18d816 closetext loadmovesprites - setbit1 $00c1 + setevent $00c1 loadfont - checkbit1 $0005 + checkevent $0005 iftrue UnknownScript_0x18d091 - checkbit1 $0004 + checkevent $0004 iftrue UnknownScript_0x18d079 - checkbit1 $0003 + checkevent $0003 iftrue UnknownScript_0x18d061 - checkbit1 $0002 + checkevent $0002 iftrue UnknownScript_0x18d049 - checkbit1 $0001 + checkevent $0001 iftrue UnknownScript_0x18d030 UnknownScript_0x18d100: ; 0x18d100 2writetext UnknownText_0x18d47c @@ -160,7 +160,7 @@ UnknownScript_0x18d100: ; 0x18d100 loadfont 2writetext UnknownText_0x18d9bf closetext - setbit2 $0022 + setflag $0022 playsound $009c waitbutton special $003d @@ -188,20 +188,20 @@ UnknownScript_0x18d100: ; 0x18d100 playsound $001f disappear $5 waitbutton - setbit1 $0000 + setevent $0000 end ; 0x18d1a5 ElderScript_0x18d1a5: ; 0x18d1a5 faceplayer loadfont - checkbit1 $0000 + checkevent $0000 iftrue UnknownScript_0x18d1f9 - checkbit1 $0006 + checkevent $0006 iftrue UnknownScript_0x18d1ff - checkbit1 $00bd + checkevent $00bd iffalse UnknownScript_0x18d1c5 - checkbit1 EVENT_BEAT_RIVAL_IN_MT_MOON + checkevent EVENT_BEAT_RIVAL_IN_MT_MOON iftrue UnknownScript_0x18d1f3 2writetext UnknownText_0x18d724 closetext @@ -218,10 +218,10 @@ UnknownScript_0x18d1c5: ; 0x18d1c5 playsound $0002 waitbutton givepoke DRATINI, 15, 0, 0 - checkbit1 $00c1 + checkevent $00c1 special $0094 - setbit1 $00bd - setbit1 $0006 + setevent $00bd + setevent $0006 2writetext UnknownText_0x18d6ca closetext loadmovesprites diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 44e852f01..d5778adeb 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -23,7 +23,7 @@ UnknownScript_0x18c89e: ; 0x18c89e ; 0x18c89f UnknownScript_0x18c89f: ; 0x18c89f - checkbit1 EVENT_BEAT_RIVAL_IN_MT_MOON + checkevent EVENT_BEAT_RIVAL_IN_MT_MOON iftrue UnknownScript_0x18c8a8 disappear $4 return @@ -62,7 +62,7 @@ UnknownScript_0x18c8b8: ; 0x18c8b8 playsound $0001 waitbutton itemnotify - setbit1 EVENT_GOT_TM24_DRAGONBREATH + setevent EVENT_GOT_TM24_DRAGONBREATH 2writetext UnknownText_0x18ca0d keeptextopen 2writetext UnknownText_0x18caf1 @@ -230,12 +230,12 @@ SilverScript_0x18c97e: ; 0x18c97e playmusic $001f faceplayer loadfont - checkbit1 $0000 + checkevent $0000 iftrue UnknownScript_0x18c995 2writetext UnknownText_0x18cc83 closetext loadmovesprites - setbit1 $0000 + setevent $0000 special $003d end ; 0x18c995 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 62318f36e..3eae996f0 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -11,7 +11,7 @@ EcruteakCity_MapScriptHeader: ; 0x1a4000 ; 0x1a4005 UnknownScript_0x1a4005: ; 0x1a4005 - setbit2 $0048 + setflag $0048 return ; 0x1a4009 @@ -34,7 +34,7 @@ LassScript_0x1a4012: ; 0x1a4012 LassScript_0x1a4015: ; 0x1a4015 faceplayer loadfont - checkbit1 EVENT_RELEASED_THE_BEASTS + checkevent EVENT_RELEASED_THE_BEASTS iftrue UnknownScript_0x1a4023 2writetext UnknownText_0x1a421a closetext @@ -52,7 +52,7 @@ UnknownScript_0x1a4023: ; 0x1a4023 FisherScript_0x1a4029: ; 0x1a4029 faceplayer loadfont - checkbit1 EVENT_JASMINE_RETURNED_TO_GYM + checkevent EVENT_JASMINE_RETURNED_TO_GYM iftrue UnknownScript_0x1a4037 2writetext UnknownText_0x1a42ac closetext diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index b6e49ac57..af463d505 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -22,7 +22,7 @@ UnknownScript_0x99d57: ; 0x99d57 MortyScript_0x99d58: ; 0x99d58 faceplayer loadfont - checkbit1 EVENT_BEAT_MORTY + checkevent EVENT_BEAT_MORTY iftrue UnknownScript_0x99d8c 2writetext UnknownText_0x99e65 closetext @@ -31,29 +31,29 @@ MortyScript_0x99d58: ; 0x99d58 loadtrainer MORTY, 1 startbattle returnafterbattle - setbit1 EVENT_BEAT_MORTY + setevent EVENT_BEAT_MORTY loadfont 2writetext UnknownText_0x9a043 playsound $009c waitbutton - setbit2 $001e + setflag $001e checkcode $7 2call UnknownScript_0x99db7 domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $1 - setbit1 $0766 - setbit1 $0767 + setevent $0766 + setevent $0767 UnknownScript_0x99d8c: ; 0x99d8c - checkbit1 EVENT_GOT_TM30_SHADOW_BALL + checkevent EVENT_GOT_TM30_SHADOW_BALL iftrue UnknownScript_0x99db1 - setbit1 EVENT_BEAT_SAGE_JEFFREY - setbit1 EVENT_BEAT_SAGE_PING - setbit1 EVENT_BEAT_MEDIUM_MARTHA - setbit1 EVENT_BEAT_MEDIUM_GRACE + setevent EVENT_BEAT_SAGE_JEFFREY + setevent EVENT_BEAT_SAGE_PING + setevent EVENT_BEAT_MEDIUM_MARTHA + setevent EVENT_BEAT_MEDIUM_GRACE 2writetext UnknownText_0x9a059 keeptextopen verbosegiveitem TM_30, 1 iffalse UnknownScript_0x99db5 - setbit1 EVENT_GOT_TM30_SHADOW_BALL + setevent EVENT_GOT_TM30_SHADOW_BALL 2writetext UnknownText_0x9a0ec closetext loadmovesprites @@ -218,7 +218,7 @@ MediumGraceScript: ; 0x99e31 EcruteakGymGuyScript: ; 0x99e39 faceplayer loadfont - checkbit1 EVENT_BEAT_MORTY + checkevent EVENT_BEAT_MORTY iftrue .EcruteakGymGuyWinScript 2writetext EcruteakGymGuyText closetext @@ -233,7 +233,7 @@ EcruteakGymGuyScript: ; 0x99e39 ; 0x99e4d MapEcruteakGymSignpost1Script: ; 0x99e4d - checkbit2 $001e + checkflag $001e iftrue UnknownScript_0x99e56 jumpstd $002d ; 0x99e56 diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 0356d9dc8..a3c9ea671 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -23,19 +23,19 @@ UnknownScript_0x9800e: ; 0x9800e ; 0x9800f UnknownScript_0x9800f: ; 0x9800f - checkbit1 EVENT_FOUGHT_SUICUNE + checkevent EVENT_FOUGHT_SUICUNE iftrue UnknownScript_0x98033 - checkbit1 EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER + checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue UnknownScript_0x98033 - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x98022 return ; 0x98022 UnknownScript_0x98022: ; 0x98022 - clearbit1 $0766 - setbit1 $0767 - setbit1 $07b1 + clearevent $0766 + setevent $0767 + setevent $07b1 checkitem CLEAR_BELL iftrue UnknownScript_0x98032 dotrigger $0 @@ -44,12 +44,12 @@ UnknownScript_0x98032: ; 0x98032 ; 0x98033 UnknownScript_0x98033: ; 0x98033 - clearbit1 $07b1 + clearevent $07b1 return ; 0x98037 UnknownScript_0x98037: ; 0x98037 - checkbit1 $0767 + checkevent $0767 iftrue UnknownScript_0x98061 applymovement $3, MovementData_0x980c7 moveperson $2, $4, $6 @@ -60,7 +60,7 @@ UnknownScript_0x98037: ; 0x98037 ; 0x9804c UnknownScript_0x9804c: ; 0x9804c - checkbit1 $0766 + checkevent $0766 iftrue UnknownScript_0x98061 applymovement $2, MovementData_0x980cc moveperson $3, $5, $6 @@ -77,9 +77,9 @@ UnknownScript_0x98061: ; 0x98061 SageScript_0x98062: ; 0x98062 faceplayer loadfont - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x9807c - checkbit2 $001e + checkflag $001e iftrue UnknownScript_0x98076 2writetext UnknownText_0x980d1 closetext @@ -95,9 +95,9 @@ UnknownScript_0x98076: ; 0x98076 ; 0x9807c UnknownScript_0x9807c: ; 0x9807c - checkbit1 EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER + checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue UnknownScript_0x980a4 - checkbit1 $0000 + checkevent $0000 iftrue UnknownScript_0x980aa checkitem CLEAR_BELL iftrue UnknownScript_0x98093 @@ -112,9 +112,9 @@ UnknownScript_0x98093: ; 0x98093 closetext loadmovesprites dotrigger $1 - setbit1 $0767 - clearbit1 $0766 - setbit1 $0000 + setevent $0767 + clearevent $0766 + setevent $0000 end ; 0x980a4 @@ -135,7 +135,7 @@ UnknownScript_0x980aa: ; 0x980aa SageScript_0x980b0: ; 0x980b0 faceplayer loadfont - checkbit1 EVENT_GOT_CLEAR_BELL + checkevent EVENT_GOT_CLEAR_BELL iftrue UnknownScript_0x980be 2writetext UnknownText_0x9840b closetext diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index b340e9fd4..a86cf0e3e 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -9,7 +9,7 @@ EcruteakItemfinderHouse_MapScriptHeader: ; 0x9a5f9 CooltrainerMScript_0x9a5fb: ; 0x9a5fb faceplayer loadfont - checkbit1 EVENT_GOT_ITEMFINDER + checkevent EVENT_GOT_ITEMFINDER iftrue UnknownScript_0x9a614 2writetext UnknownText_0x9a63c yesorno @@ -17,7 +17,7 @@ CooltrainerMScript_0x9a5fb: ; 0x9a5fb 2writetext UnknownText_0x9a6b5 keeptextopen verbosegiveitem ITEMFINDER, 1 - setbit1 EVENT_GOT_ITEMFINDER + setevent EVENT_GOT_ITEMFINDER UnknownScript_0x9a614: ; 0x9a614 2writetext UnknownText_0x9a70e closetext diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index 4a13e61cd..23a51b7e6 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -50,8 +50,8 @@ UnknownScript_0x98e95: ; 0x98e95 applymovement $6, MovementData_0x98ece playsound $0023 disappear $6 - clearbit1 $0712 - setbit2 $0053 + clearevent $0712 + setflag $0053 dotrigger $1 waitbutton end diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index d567846ff..2d94f8169 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -98,21 +98,21 @@ UnknownScript_0x78ba5: ; 0x78ba5 ProfElmScript: ; 0x78be0 faceplayer loadfont - checkbit1 EVENT_GOT_SS_TICKET_FROM_ELM + checkevent EVENT_GOT_SS_TICKET_FROM_ELM iftrue UnknownScript_0x78bee - checkbit1 $0044 + checkevent $0044 iftrue ElmGiveTicketScript UnknownScript_0x78bee: ; 0x78bee - checkbit1 EVENT_GOT_MASTER_BALL_FROM_ELM + checkevent EVENT_GOT_MASTER_BALL_FROM_ELM iftrue UnknownScript_0x78bfa - checkbit2 $0022 + checkflag $0022 iftrue ElmGiveMasterBallScript UnknownScript_0x78bfa: ; 0x78bfa - checkbit1 EVENT_GOT_EVERSTONE_FROM_ELM + checkevent EVENT_GOT_EVERSTONE_FROM_ELM iftrue UnknownScript_0x78e16 - checkbit1 EVENT_SHOWED_TOGEPI_TO_ELM + checkevent EVENT_SHOWED_TOGEPI_TO_ELM iftrue UnknownScript_0x78e03 - checkbit1 EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE + checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE iffalse UnknownScript_0x78c35 writebyte TOGEPI special $0043 @@ -137,20 +137,20 @@ UnknownScript_0x78c22: ; 0x78c22 ; 0x78c35 UnknownScript_0x78c35: ; 0x78c35 - checkbit1 EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE + checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE iffalse UnknownScript_0x78c41 - checkbit1 EVENT_TOGEPI_HATCHED + checkevent EVENT_TOGEPI_HATCHED iftrue UnknownScript_0x78c22 UnknownScript_0x78c41: ; 0x78c41 - checkbit1 EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE ; why are we checking it again? + checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE ; why are we checking it again? iftrue ElmWaitingEggHatchScript - checkbit2 $001b + checkflag $001b iftrue ElmAideHasEggScript - checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM + checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue ElmStudyingEggScript - checkbit1 EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON + checkevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON iftrue ElmAfterTheftScript - checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM + checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue ElmDescribesMrPokemonScript 2writetext UnknownText_0x79375 closetext @@ -169,7 +169,7 @@ LabTryToLeaveScript: ; 0x78c65 ; 0x78c73 CyndaquilPokeBallScript: ; 0x78c73 - checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM + checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript spriteface $2, $0 refreshscreen $0 @@ -182,7 +182,7 @@ CyndaquilPokeBallScript: ; 0x78c73 yesorno iffalse DidntChooseStarterScript disappear $4 - setbit1 EVENT_GOT_CYNDAQUIL_FROM_ELM + setevent EVENT_GOT_CYNDAQUIL_FROM_ELM 2writetext ChoseStarterText keeptextopen waitbutton @@ -200,7 +200,7 @@ CyndaquilPokeBallScript: ; 0x78c73 ; 0x78cb5 TotodilePokeBallScript: ; 0x78cb5 - checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM + checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript spriteface $2, $0 refreshscreen $0 @@ -213,7 +213,7 @@ TotodilePokeBallScript: ; 0x78cb5 yesorno iffalse DidntChooseStarterScript disappear $5 - setbit1 EVENT_GOT_TOTODILE_FROM_ELM + setevent EVENT_GOT_TOTODILE_FROM_ELM 2writetext ChoseStarterText keeptextopen waitbutton @@ -229,7 +229,7 @@ TotodilePokeBallScript: ; 0x78cb5 ; 0x78cf1 ChikoritaPokeBallScript: ; 0x78cf1 - checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM + checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript spriteface $2, $0 refreshscreen $0 @@ -242,7 +242,7 @@ ChikoritaPokeBallScript: ; 0x78cf1 yesorno iffalse DidntChooseStarterScript disappear $6 - setbit1 EVENT_GOT_CHIKORITA_FROM_ELM + setevent EVENT_GOT_CHIKORITA_FROM_ELM 2writetext ChoseStarterText keeptextopen waitbutton @@ -287,8 +287,8 @@ ElmDirectionsScript: ; 0x78d33 2writetext ElmDirectionsText3 closetext loadmovesprites - setbit1 EVENT_GOT_A_POKEMON_FROM_ELM - setbit1 $06be + setevent EVENT_GOT_A_POKEMON_FROM_ELM + setevent $06be dotrigger $5 domaptrigger GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN, $1 end @@ -311,7 +311,7 @@ LookAtElmPokeBallScript: ; 0x78d6d MapElmsLabSignpost0Script: ; 0x78d74 loadfont - checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM + checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue UnknownScript_0x78d81 2writetext UnknownText_0x79690 closetext @@ -361,11 +361,11 @@ ElmAfterTheftScript: ; 0x78da2 keeptextopen 2writetext ElmAfterTheftText5 keeptextopen - setbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM - setbit2 $0010 + setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM + setflag $0010 domaptrigger GROUP_ROUTE_29, MAP_ROUTE_29, $1 - clearbit1 $0715 - setbit1 $0714 + clearevent $0715 + setevent $0714 2writetext ElmAfterTheftText6 closetext loadmovesprites @@ -399,7 +399,7 @@ ShowElmTogepiScript: ; 0x78dee closetext loadmovesprites showemote $0, $2, 15 - setbit1 EVENT_SHOWED_TOGEPI_TO_ELM + setevent EVENT_SHOWED_TOGEPI_TO_ELM loadfont 2writetext ShowElmTogepiText2 keeptextopen @@ -413,7 +413,7 @@ UnknownScript_0x78e03: ; 0x78e03 2writetext ElmGiveEverstoneText2 closetext loadmovesprites - setbit1 EVENT_GOT_EVERSTONE_FROM_ELM + setevent EVENT_GOT_EVERSTONE_FROM_ELM end ; 0x78e16 @@ -430,7 +430,7 @@ ElmGiveMasterBallScript: ; 0x78e1c keeptextopen verbosegiveitem MASTER_BALL, 1 iffalse .notdone - setbit1 EVENT_GOT_MASTER_BALL_FROM_ELM + setevent EVENT_GOT_MASTER_BALL_FROM_ELM 2writetext ElmGiveMasterBallText2 closetext .notdone @@ -442,7 +442,7 @@ ElmGiveTicketScript: ; 0x78e2f 2writetext ElmGiveTicketText1 keeptextopen verbosegiveitem S_S_TICKET, 1 - setbit1 EVENT_GOT_SS_TICKET_FROM_ELM + setevent EVENT_GOT_SS_TICKET_FROM_ELM 2writetext ElmGiveTicketText2 closetext loadmovesprites @@ -560,11 +560,11 @@ UnknownScript_0x78ee2: ; 0x78ee2 ElmsAideScript: ; 0x78ee6 faceplayer loadfont - checkbit1 EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE + checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE iftrue UnknownScript_0x78f0c - checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM + checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x78f06 - checkbit1 EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON + checkevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON iftrue UnknownScript_0x78f00 2writetext UnknownText_0x79f65 closetext @@ -615,9 +615,9 @@ MeetCopScript: ; 0x78f16 MapElmsLabSignpost14Script: ; 0x78f33 loadfont - checkbit2 $0043 + checkflag $0043 iftrue UnknownScript_0x78f49 - checkbit1 EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON + checkevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON iftrue UnknownScript_0x78f43 2jump UnknownScript_0x78f49 ; 0x78f43 diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index eb9286e6e..6e7fd349b 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -32,8 +32,8 @@ UnknownScript_0x7513b: ; 0x7513b playsound $001c earthquake 30 blackoutmod GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW - clearbit1 $0031 - checkbit1 $0030 + clearevent $0031 + checkevent $0030 iftrue UnknownScript_0x7515d dotrigger $2 end @@ -47,9 +47,9 @@ UnknownScript_0x7515d: ; 0x7515d SailorScript_0x75160: ; 0x75160 faceplayer loadfont - checkbit1 $0031 + checkevent $0031 iftrue UnknownScript_0x7517a - checkbit1 $002f + checkevent $002f iftrue UnknownScript_0x75174 2writetext UnknownText_0x7523b closetext @@ -65,7 +65,7 @@ UnknownScript_0x75174: ; 0x75174 ; 0x7517a UnknownScript_0x7517a: ; 0x7517a - checkbit1 $002f + checkevent $002f iftrue UnknownScript_0x7519c 2writetext UnknownText_0x754be closetext @@ -74,7 +74,7 @@ UnknownScript_0x7517a: ; 0x7517a playsound $0023 special $002e waitbutton - setbit1 $072b + setevent $072b domaptrigger GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $1 warp GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $7, $11 end @@ -88,7 +88,7 @@ UnknownScript_0x7519c: ; 0x7519c playsound $0023 special $002e waitbutton - setbit1 $072a + setevent $072a domaptrigger GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $1 warp GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $7, $17 end @@ -111,7 +111,7 @@ UnknownScript_0x751c7: ; 0x751c7 SailorScript_0x751d0: ; 0x751d0 faceplayer loadfont - checkbit1 $0030 + checkevent $0030 iftrue UnknownScript_0x751de 2writetext UnknownText_0x752f9 closetext diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 027a575e9..1670d28e6 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -19,7 +19,7 @@ UnknownScript_0x7673b: ; 0x7673b ; 0x7673c UnknownScript_0x7673c: ; 0x7673c - checkbit1 $072f + checkevent $072f iftrue UnknownScript_0x76766 applymovement $3, MovementData_0x76876 moveperson $2, $1e, $6 @@ -30,7 +30,7 @@ UnknownScript_0x7673c: ; 0x7673c ; 0x76751 UnknownScript_0x76751: ; 0x76751 - checkbit1 $072e + checkevent $072e iftrue UnknownScript_0x76766 applymovement $2, MovementData_0x76871 moveperson $3, $1f, $6 @@ -47,17 +47,17 @@ UnknownScript_0x76766: ; 0x76766 SailorScript_0x76767: ; 0x76767 faceplayer loadfont - checkbit1 $0030 + checkevent $0030 iftrue UnknownScript_0x767a0 - checkbit1 $0033 + checkevent $0033 iftrue UnknownScript_0x7678d - checkbit1 $0034 + checkevent $0034 iftrue UnknownScript_0x76787 2writetext UnknownText_0x7687b closetext loadmovesprites - setbit1 $0034 - clearbit1 $072d + setevent $0034 + clearevent $072d end ; 0x76787 @@ -70,7 +70,7 @@ UnknownScript_0x76787: ; 0x76787 UnknownScript_0x7678d: ; 0x7678d 2writetext UnknownText_0x7692e - checkbit1 $0032 + checkevent $0032 iffalse UnknownScript_0x76799 closetext loadmovesprites diff --git a/maps/FastShipCabins.asm b/maps/FastShipCabins.asm index 7eaf4f1de..d83bd73a8 100644 --- a/maps/FastShipCabins.asm +++ b/maps/FastShipCabins.asm @@ -13,7 +13,7 @@ UnknownScript_0x75ea6: ; 0x75ea6 CaptainScript_0x75ea7: ; 0x75ea7 faceplayer loadfont - checkbit1 $0030 + checkevent $0030 iftrue UnknownScript_0x75eb5 2writetext UnknownText_0x76012 closetext @@ -52,7 +52,7 @@ TwinScript_0x75ebb: ; 0x75ebb showemote $0, $3, 15 applymovement $4, MovementData_0x7600c spriteface $3, $3 - checkbit2 $0063 + checkflag $0063 iftrue UnknownScript_0x75f03 loadfont 2writetext UnknownText_0x76284 @@ -72,7 +72,7 @@ UnknownScript_0x75f09: ; 0x75f09 loadfont 2writetext UnknownText_0x76143 keeptextopen - setbit1 $072b + setevent $072b domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0 2jump UnknownScript_0x75f37 ; 0x75f1f @@ -80,9 +80,9 @@ UnknownScript_0x75f09: ; 0x75f09 GentlemanScript_0x75f1f: ; 0x75f1f faceplayer loadfont - checkbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA + checkevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA iftrue UnknownScript_0x75f67 - checkbit1 $0732 + checkevent $0732 iftrue UnknownScript_0x75f58 2writetext UnknownText_0x760ae closetext @@ -96,7 +96,7 @@ UnknownScript_0x75f37: ; 0x75f37 keeptextopen verbosegiveitem METAL_COAT, 1 iffalse UnknownScript_0x75f44 - setbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA + setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA UnknownScript_0x75f44: ; 0x75f44 loadmovesprites waitbutton @@ -105,8 +105,8 @@ UnknownScript_0x75f44: ; 0x75f44 loadfont 2writetext UnknownText_0x76645 closetext - setbit1 $0031 - setbit1 $0032 + setevent $0031 + setevent $0032 loadmovesprites end ; 0x75f58 @@ -116,7 +116,7 @@ UnknownScript_0x75f58: ; 0x75f58 keeptextopen verbosegiveitem METAL_COAT, 1 iffalse UnknownScript_0x75f65 - setbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA + setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA UnknownScript_0x75f65: ; 0x75f65 loadmovesprites end diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index e9b2de6d9..55f1702c9 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -192,12 +192,12 @@ SailorScript_0x755f1: ; 0x755f1 startbattle reloadmap special $001b - setbit1 $057d + setevent $057d loadfont 2writetext UnknownText_0x758b1 closetext loadmovesprites - setbit1 $0033 + setevent $0033 domaptrigger GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F, $1 checkcode $9 if_equal $3, UnknownScript_0x75629 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 7eaf4f1de..d83bd73a8 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -13,7 +13,7 @@ UnknownScript_0x75ea6: ; 0x75ea6 CaptainScript_0x75ea7: ; 0x75ea7 faceplayer loadfont - checkbit1 $0030 + checkevent $0030 iftrue UnknownScript_0x75eb5 2writetext UnknownText_0x76012 closetext @@ -52,7 +52,7 @@ TwinScript_0x75ebb: ; 0x75ebb showemote $0, $3, 15 applymovement $4, MovementData_0x7600c spriteface $3, $3 - checkbit2 $0063 + checkflag $0063 iftrue UnknownScript_0x75f03 loadfont 2writetext UnknownText_0x76284 @@ -72,7 +72,7 @@ UnknownScript_0x75f09: ; 0x75f09 loadfont 2writetext UnknownText_0x76143 keeptextopen - setbit1 $072b + setevent $072b domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0 2jump UnknownScript_0x75f37 ; 0x75f1f @@ -80,9 +80,9 @@ UnknownScript_0x75f09: ; 0x75f09 GentlemanScript_0x75f1f: ; 0x75f1f faceplayer loadfont - checkbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA + checkevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA iftrue UnknownScript_0x75f67 - checkbit1 $0732 + checkevent $0732 iftrue UnknownScript_0x75f58 2writetext UnknownText_0x760ae closetext @@ -96,7 +96,7 @@ UnknownScript_0x75f37: ; 0x75f37 keeptextopen verbosegiveitem METAL_COAT, 1 iffalse UnknownScript_0x75f44 - setbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA + setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA UnknownScript_0x75f44: ; 0x75f44 loadmovesprites waitbutton @@ -105,8 +105,8 @@ UnknownScript_0x75f44: ; 0x75f44 loadfont 2writetext UnknownText_0x76645 closetext - setbit1 $0031 - setbit1 $0032 + setevent $0031 + setevent $0032 loadmovesprites end ; 0x75f58 @@ -116,7 +116,7 @@ UnknownScript_0x75f58: ; 0x75f58 keeptextopen verbosegiveitem METAL_COAT, 1 iffalse UnknownScript_0x75f65 - setbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA + setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA UnknownScript_0x75f65: ; 0x75f65 loadmovesprites end diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 37d937531..758c2b858 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -149,11 +149,11 @@ MapFastShipCabins_SW_SSW_NWSignpost1Script: ; 0x75aac 2writetext UnknownText_0x75dc1 closetext loadmovesprites - checkbit1 $0031 + checkevent $0031 iftrue UnknownScript_0x75ae1 - checkbit1 $0032 + checkevent $0032 iftrue UnknownScript_0x75ae2 - checkbit1 $0030 + checkevent $0030 iftrue UnknownScript_0x75ae2 UnknownScript_0x75ae1: ; 0x75ae1 end @@ -162,13 +162,13 @@ UnknownScript_0x75ae1: ; 0x75ae1 UnknownScript_0x75ae2: ; 0x75ae2 playsound $0027 pause 30 - checkbit1 $002f + checkevent $002f iftrue UnknownScript_0x75af7 loadfont 2writetext UnknownText_0x75e0f closetext loadmovesprites - setbit1 $0031 + setevent $0031 end ; 0x75af7 @@ -177,7 +177,7 @@ UnknownScript_0x75af7: ; 0x75af7 2writetext UnknownText_0x75dde closetext loadmovesprites - setbit1 $0031 + setevent $0031 end ; 0x75b01 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index eaa058535..1cb9992df 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -11,7 +11,7 @@ FuchsiaCity_MapScriptHeader: ; 0x194b19 ; 0x194b1e UnknownScript_0x194b1e: ; 0x194b1e - setbit2 $003e + setflag $003e return ; 0x194b22 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index e7bd0f9cf..b60d305df 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -7,7 +7,7 @@ FuchsiaGym_MapScriptHeader: ; 0x195db7 ; 0x195db9 JanineScript_0x195db9: ; 0x195db9 - checkbit2 $0027 + checkflag $0027 iftrue UnknownScript_0x195e00 applymovement $2, MovementData_0x195f27 faceplayer @@ -19,11 +19,11 @@ JanineScript_0x195db9: ; 0x195db9 loadtrainer JANINE, 1 startbattle returnafterbattle - setbit1 EVENT_BEAT_JANINE - setbit1 $0517 - setbit1 $051a - setbit1 $0482 - setbit1 $041e + setevent EVENT_BEAT_JANINE + setevent $0517 + setevent $051a + setevent $0482 + setevent $041e variablesprite $7, $28 variablesprite $8, $28 variablesprite $9, $28 @@ -33,7 +33,7 @@ JanineScript_0x195db9: ; 0x195db9 2writetext UnknownText_0x195feb playsound $009c waitbutton - setbit2 $0027 + setflag $0027 2jump UnknownScript_0x195e02 ; 0x195e00 @@ -41,13 +41,13 @@ UnknownScript_0x195e00: ; 0x195e00 faceplayer loadfont UnknownScript_0x195e02: ; 0x195e02 - checkbit1 EVENT_GOT_TM06_TOXIC + checkevent EVENT_GOT_TM06_TOXIC iftrue UnknownScript_0x195e15 2writetext UnknownText_0x196002 keeptextopen verbosegiveitem TM_06, 1 iffalse UnknownScript_0x195e15 - setbit1 EVENT_GOT_TM06_TOXIC + setevent EVENT_GOT_TM06_TOXIC UnknownScript_0x195e15: ; 0x195e15 2writetext UnknownText_0x196074 closetext @@ -56,7 +56,7 @@ UnknownScript_0x195e15: ; 0x195e15 ; 0x195e1b FuschiaGym1Script_0x195e1b: ; 0x195e1b - checkbit1 $0517 + checkevent $0517 iftrue UnknownScript_0x195e2c applymovement $3, MovementData_0x195f27 faceplayer @@ -65,7 +65,7 @@ FuschiaGym1Script_0x195e1b: ; 0x195e1b UnknownScript_0x195e2c: ; 0x195e2c faceplayer loadfont - checkbit1 $0517 + checkevent $0517 iftrue UnknownScript_0x195e4f 2writetext UnknownText_0x1960e6 closetext @@ -75,7 +75,7 @@ UnknownScript_0x195e2c: ; 0x195e2c startbattle iftrue UnknownScript_0x195e4a returnafterbattle - setbit1 $0517 + setevent $0517 end ; 0x195e4a @@ -93,7 +93,7 @@ UnknownScript_0x195e4f: ; 0x195e4f ; 0x195e55 FuschiaGym2Script_0x195e55: ; 0x195e55 - checkbit1 $051a + checkevent $051a iftrue UnknownScript_0x195e66 applymovement $4, MovementData_0x195f27 faceplayer @@ -102,7 +102,7 @@ FuschiaGym2Script_0x195e55: ; 0x195e55 UnknownScript_0x195e66: ; 0x195e66 faceplayer loadfont - checkbit1 $051a + checkevent $051a iftrue UnknownScript_0x195e89 2writetext UnknownText_0x196166 closetext @@ -112,7 +112,7 @@ UnknownScript_0x195e66: ; 0x195e66 startbattle iftrue UnknownScript_0x195e84 returnafterbattle - setbit1 $051a + setevent $051a end ; 0x195e84 @@ -130,7 +130,7 @@ UnknownScript_0x195e89: ; 0x195e89 ; 0x195e8f FuschiaGym3Script_0x195e8f: ; 0x195e8f - checkbit1 $0482 + checkevent $0482 iftrue UnknownScript_0x195ea0 applymovement $5, MovementData_0x195f27 faceplayer @@ -139,7 +139,7 @@ FuschiaGym3Script_0x195e8f: ; 0x195e8f UnknownScript_0x195ea0: ; 0x195ea0 faceplayer loadfont - checkbit1 $0482 + checkevent $0482 iftrue UnknownScript_0x195ec3 2writetext UnknownText_0x1961bb closetext @@ -149,7 +149,7 @@ UnknownScript_0x195ea0: ; 0x195ea0 startbattle iftrue UnknownScript_0x195ebe returnafterbattle - setbit1 $0482 + setevent $0482 end ; 0x195ebe @@ -167,7 +167,7 @@ UnknownScript_0x195ec3: ; 0x195ec3 ; 0x195ec9 FuschiaGym4Script_0x195ec9: ; 0x195ec9 - checkbit1 $041e + checkevent $041e iftrue UnknownScript_0x195eda applymovement $6, MovementData_0x195f27 faceplayer @@ -176,7 +176,7 @@ FuschiaGym4Script_0x195ec9: ; 0x195ec9 UnknownScript_0x195eda: ; 0x195eda faceplayer loadfont - checkbit1 $041e + checkevent $041e iftrue UnknownScript_0x195efd 2writetext UnknownText_0x196228 closetext @@ -186,7 +186,7 @@ UnknownScript_0x195eda: ; 0x195eda startbattle iftrue UnknownScript_0x195ef8 returnafterbattle - setbit1 $041e + setevent $041e end ; 0x195ef8 @@ -206,7 +206,7 @@ UnknownScript_0x195efd: ; 0x195efd FuchsiaGymGuyScript: ; 0x195f03 faceplayer loadfont - checkbit1 EVENT_BEAT_JANINE + checkevent EVENT_BEAT_JANINE iftrue .FuchsiaGymGuyWinScript 2writetext FuchsiaGymGuyText closetext @@ -221,7 +221,7 @@ FuchsiaGymGuyScript: ; 0x195f03 ; 0x195f17 MapFuchsiaGymSignpost1Script: ; 0x195f17 - checkbit2 $0027 + checkflag $0027 iftrue UnknownScript_0x195f20 jumpstd $002d ; 0x195f20 diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index f45d769b5..80a3b8b46 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -13,7 +13,7 @@ UnknownScript_0x5474f: ; 0x5474f ClerkScript_0x54750: ; 0x54750 faceplayer loadfont - checkbit1 EVENT_GOT_BICYCLE + checkevent EVENT_GOT_BICYCLE iftrue UnknownScript_0x54775 2writetext UnknownText_0x54787 yesorno @@ -26,8 +26,8 @@ ClerkScript_0x54750: ; 0x54750 playsound $0091 waitbutton itemnotify - setbit2 $0014 - setbit1 EVENT_GOT_BICYCLE + setflag $0014 + setevent EVENT_GOT_BICYCLE UnknownScript_0x54775: ; 0x54775 2writetext UnknownText_0x5485f closetext diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 955721ea0..7276f12f1 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -9,7 +9,7 @@ GoldenrodBillsHouse_MapScriptHeader: ; 0x54be2 BillScript_0x54be4: ; 0x54be4 faceplayer loadfont - checkbit1 EVENT_GOT_EEVEE + checkevent EVENT_GOT_EEVEE iftrue UnknownScript_0x54c1f 2writetext UnknownText_0x54c74 yesorno @@ -23,7 +23,7 @@ BillScript_0x54be4: ; 0x54be4 playsound $0002 waitbutton givepoke EEVEE, 20, 0, 0 - setbit1 EVENT_GOT_EEVEE + setevent EVENT_GOT_EEVEE 2writetext UnknownText_0x54dc1 closetext loadmovesprites @@ -54,7 +54,7 @@ UnknownScript_0x54c1f: ; 0x54c1f PokefanFScript_0x54c25: ; 0x54c25 faceplayer loadfont - checkbit1 $0712 + checkevent $0712 iffalse UnknownScript_0x54c33 2writetext UnknownText_0x54ea8 closetext diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 0644c1cb2..c94f5fec2 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -13,17 +13,17 @@ GoldenrodCity_MapScriptHeader: ; 0x1988d0 ; 0x1988d8 UnknownScript_0x1988d8: ; 0x1988d8 - setbit2 $0046 - setbit2 $0016 - checkbit1 $00b9 + setflag $0046 + setflag $0016 + checkevent $00b9 iftrue UnknownScript_0x1988e7 - clearbit1 $0769 + clearevent $0769 UnknownScript_0x1988e7: ; 0x1988e7 return ; 0x1988e8 UnknownScript_0x1988e8: ; 0x1988e8 - checkbit1 $0044 + checkevent $0044 iffalse UnknownScript_0x198908 checkitem COIN_CASE iffalse UnknownScript_0x1988fd @@ -36,7 +36,7 @@ UnknownScript_0x1988fd: ; 0x1988fd ; 0x198900 UnknownScript_0x198900: ; 0x198900 - checkbit2 $005e + checkflag $005e iftrue UnknownScript_0x198908 appear $10 UnknownScript_0x198908: ; 0x198908 @@ -143,8 +143,8 @@ UnknownScript_0x1989c6: ; 0x1989c6 UnknownScript_0x1989ca: ; 0x1989ca playsound $001f disappear $10 - clearbit1 $076b - setbit2 $005e + clearevent $076b + setflag $005e waitbutton end ; 0x1989d7 @@ -174,7 +174,7 @@ YoungsterScript_0x1989e6: ; 0x1989e6 CooltrainerFScript_0x1989e9: ; 0x1989e9 faceplayer loadfont - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1989f7 2writetext UnknownText_0x198ae6 closetext @@ -192,7 +192,7 @@ UnknownScript_0x1989f7: ; 0x1989f7 CooltrainerFScript_0x1989fd: ; 0x1989fd faceplayer loadfont - checkbit2 $0000 + checkflag $0000 iftrue UnknownScript_0x198a0b 2writetext UnknownText_0x198b73 closetext diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 3558f5d28..e824b39e5 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -25,15 +25,15 @@ UnknownScript_0x56099: ; 0x56099 ClerkScript_0x5609c: ; 0x5609c faceplayer loadfont - checkbit1 EVENT_GOT_TM02_HEADBUTT + checkevent EVENT_GOT_TM02_HEADBUTT iftrue UnknownScript_0x560ad - checkbit1 EVENT_GOT_TM08_ROCK_SMASH + checkevent EVENT_GOT_TM08_ROCK_SMASH iftrue UnknownScript_0x560c2 2jump UnknownScript_0x560b6 ; 0x560ad UnknownScript_0x560ad: ; 0x560ad - checkbit1 EVENT_GOT_TM08_ROCK_SMASH + checkevent EVENT_GOT_TM08_ROCK_SMASH iftrue UnknownScript_0x560c8 2jump UnknownScript_0x560bc ; 0x560b6 @@ -67,13 +67,13 @@ ReceptionistScript_0x560ce: ; 0x560ce loadfont checkcode $b if_not_equal SUNDAY, UnknownScript_0x56112 - checkbit2 $005b + checkflag $005b iftrue UnknownScript_0x56112 special $0059 2writetext UnknownText_0x56143 keeptextopen - if_less_than $95, UnknownScript_0x560ee - if_less_than $31, UnknownScript_0x560fd + if_greater_than $95, UnknownScript_0x560ee + if_greater_than $31, UnknownScript_0x560fd 2jump UnknownScript_0x56103 ; 0x560ee @@ -82,7 +82,7 @@ UnknownScript_0x560ee: ; 0x560ee keeptextopen verbosegiveitem TM_27, 1 iffalse UnknownScript_0x56116 - setbit2 $005b + setflag $005b loadmovesprites end ; 0x560fd @@ -99,7 +99,7 @@ UnknownScript_0x56103: ; 0x56103 keeptextopen verbosegiveitem TM_21, 1 iffalse UnknownScript_0x56116 - setbit2 $005b + setflag $005b loadmovesprites end ; 0x56112 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 012ad97c4..c99944258 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -13,7 +13,7 @@ GoldenrodDeptStoreB1F_MapScriptHeader: ; 0x7d779 ; 0x7d781 UnknownScript_0x7d781: ; 0x7d781 - checkbit1 $004a + checkevent $004a iftrue UnknownScript_0x7d78a 2jump UnknownScript_0x7d791 ; 0x7d78a @@ -24,9 +24,9 @@ UnknownScript_0x7d78a: ; 0x7d78a ; 0x7d791 UnknownScript_0x7d791: ; 0x7d791 - checkbit1 $0305 + checkevent $0305 iftrue UnknownScript_0x7d7a2 - checkbit1 $0306 + checkevent $0306 iftrue UnknownScript_0x7d7a7 changeblock $a, $8, $d return @@ -43,7 +43,7 @@ UnknownScript_0x7d7a7: ; 0x7d7a7 ; 0x7d7ac UnknownScript_0x7d7ac: ; 0x7d7ac - clearbit1 $0307 + clearevent $0307 return ; 0x7d7b0 diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 651fcf7f6..696ac6fda 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -15,32 +15,32 @@ MapGoldenrodDeptStoreElevatorSignpost0Script: ; 0x56699 playsound $006e earthquake 60 waitbutton - checkbit1 $0307 + checkevent $0307 iftrue UnknownScript_0x566df - checkbit1 $0304 + checkevent $0304 iftrue UnknownScript_0x566cb - checkbit1 $0305 + checkevent $0305 iftrue UnknownScript_0x566d5 - checkbit1 $0306 + checkevent $0306 iftrue UnknownScript_0x566c1 UnknownScript_0x566c1: ;0x566c1 - setbit1 $0304 - clearbit1 $0305 - clearbit1 $0306 + setevent $0304 + clearevent $0305 + clearevent $0306 end ; 0x566cb UnknownScript_0x566cb: ; 0x566cb - clearbit1 $0304 - setbit1 $0305 - clearbit1 $0306 + clearevent $0304 + setevent $0305 + clearevent $0306 end ; 0x566d5 UnknownScript_0x566d5: ; 0x566d5 - clearbit1 $0304 - clearbit1 $0305 - setbit1 $0306 + clearevent $0304 + clearevent $0305 + setevent $0306 end ; 0x566df diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index a582edd5d..4d6017ef3 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -13,7 +13,7 @@ GoldenrodDeptStoreRoof_MapScriptHeader: ; 0x56713 ; 0x5671b UnknownScript_0x5671b: ; 0x5671b - checkbit2 $0061 + checkflag $0061 iftrue UnknownScript_0x56722 return ; 0x56722 @@ -25,16 +25,16 @@ UnknownScript_0x56722: ; 0x56722 ; 0x5672b UnknownScript_0x5672b: ; 0x5672b - checkbit2 $0061 + checkflag $0061 iftrue UnknownScript_0x56738 - setbit1 $06f0 - clearbit1 $06f1 + setevent $06f0 + clearevent $06f1 return ; 0x56738 UnknownScript_0x56738: ; 0x56738 - clearbit1 $06f0 - setbit1 $06f1 + clearevent $06f0 + setevent $06f1 return ; 0x5673f diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index a4282f5cd..da4eb8edd 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -7,25 +7,25 @@ GoldenrodFlowerShop_MapScriptHeader: ; 0x5535b ; 0x5535d TeacherScript_0x5535d: ; 0x5535d - checkbit1 EVENT_FOUGHT_SUDOWOODO + checkevent EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x5538f - checkbit1 EVENT_GOT_SQUIRTBOTTLE + checkevent EVENT_GOT_SQUIRTBOTTLE iftrue UnknownScript_0x55399 - checkbit1 $00b9 + checkevent $00b9 iffalse UnknownScript_0x5539f - checkbit1 $00ba + checkevent $00ba iffalse UnknownScript_0x5538f - checkbit2 $001d + checkflag $001d iffalse UnknownScript_0x5539c faceplayer loadfont 2writetext UnknownText_0x554c2 keeptextopen verbosegiveitem SQUIRTBOTTLE, 1 - setbit1 EVENT_GOT_SQUIRTBOTTLE + setevent EVENT_GOT_SQUIRTBOTTLE loadmovesprites - setbit1 $0769 - clearbit1 $0768 + setevent $0769 + clearevent $0768 end ; 0x5538f @@ -53,16 +53,16 @@ UnknownScript_0x5539f: ; 0x5539f LassScript_0x553a2: ; 0x553a2 faceplayer loadfont - checkbit1 EVENT_FOUGHT_SUDOWOODO + checkevent EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x553c5 - checkbit1 EVENT_GOT_SQUIRTBOTTLE + checkevent EVENT_GOT_SQUIRTBOTTLE iftrue UnknownScript_0x553bf 2writetext UnknownText_0x55561 closetext loadmovesprites - setbit1 $00ba - setbit1 $0768 - clearbit1 $0769 + setevent $00ba + setevent $0768 + clearevent $0769 end ; 0x553bf diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 827a4fb44..58edaacb8 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -11,7 +11,7 @@ GoldenrodGameCorner_MapScriptHeader: ; 0x56bf4 ; 0x56bf9 UnknownScript_0x56bf9: ; 0x56bf9 - checkbit1 $0044 + checkevent $0044 iffalse UnknownScript_0x56c19 checkitem COIN_CASE iffalse UnknownScript_0x56c0e @@ -24,7 +24,7 @@ UnknownScript_0x56c0e: ; 0x56c0e ; 0x56c11 UnknownScript_0x56c11: ; 0x56c11 - checkbit2 $005e + checkflag $005e iftrue UnknownScript_0x56c19 disappear $d UnknownScript_0x56c19: ;0x56c19 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 88d4a61f5..f4699fb61 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -20,7 +20,7 @@ UnknownScript_0x5400b: ; 0x5400b WhitneyScript_0x5400c: ; 0x5400c faceplayer - checkbit1 EVENT_BEAT_WHITNEY + checkevent EVENT_BEAT_WHITNEY iftrue UnknownScript_0x54037 loadfont 2writetext UnknownText_0x54122 @@ -30,16 +30,16 @@ WhitneyScript_0x5400c: ; 0x5400c loadtrainer WHITNEY, 1 startbattle returnafterbattle - setbit1 EVENT_BEAT_WHITNEY - setbit1 EVENT_MADE_WHITNEY_CRY + setevent EVENT_BEAT_WHITNEY + setevent EVENT_MADE_WHITNEY_CRY dotrigger $1 - setbit1 EVENT_BEAT_BEAUTY_VICTORIA - setbit1 EVENT_BEAT_BEAUTY_SAMANTHA - setbit1 EVENT_BEAT_LASS_CARRIE - setbit1 EVENT_BEAT_LASS_BRIDGET + setevent EVENT_BEAT_BEAUTY_VICTORIA + setevent EVENT_BEAT_BEAUTY_SAMANTHA + setevent EVENT_BEAT_LASS_CARRIE + setevent EVENT_BEAT_LASS_BRIDGET UnknownScript_0x54037: ; 0x54037 loadfont - checkbit1 EVENT_MADE_WHITNEY_CRY + checkevent EVENT_MADE_WHITNEY_CRY iffalse UnknownScript_0x54044 2writetext UnknownText_0x541f4 closetext @@ -48,9 +48,9 @@ UnknownScript_0x54037: ; 0x54037 ; 0x54044 UnknownScript_0x54044: ; 0x54044 - checkbit1 EVENT_GOT_TM45_ATTRACT + checkevent EVENT_GOT_TM45_ATTRACT iftrue UnknownScript_0x54077 - checkbit2 $001d + checkflag $001d iftrue UnknownScript_0x54064 2writetext UnknownText_0x54222 keeptextopen @@ -58,7 +58,7 @@ UnknownScript_0x54044: ; 0x54044 2writetext UnknownText_0x54273 playsound $009c waitbutton - setbit2 $001d + setflag $001d checkcode $7 2call UnknownScript_0x5407d UnknownScript_0x54064: ; 0x54064 @@ -66,7 +66,7 @@ UnknownScript_0x54064: ; 0x54064 keeptextopen verbosegiveitem TM_45, 1 iffalse UnknownScript_0x5407b - setbit1 EVENT_GOT_TM45_ATTRACT + setevent EVENT_GOT_TM45_ATTRACT 2writetext UnknownText_0x54302 closetext loadmovesprites @@ -134,7 +134,7 @@ WhitneyCriesScript: ; 0x540a0 loadmovesprites applymovement $4, BridgetWalksAwayMovement dotrigger $0 - clearbit1 EVENT_MADE_WHITNEY_CRY + clearevent EVENT_MADE_WHITNEY_CRY end ; 0x540bb @@ -227,7 +227,7 @@ BeautySamanthaScript: ; 0x540ef GoldenrodGymGuyScript: ; 0x540f7 faceplayer - checkbit1 EVENT_BEAT_WHITNEY + checkevent EVENT_BEAT_WHITNEY iftrue .GoldenrodGymGuyWinScript loadfont 2writetext GoldenrodGymGuyText @@ -244,7 +244,7 @@ GoldenrodGymGuyScript: ; 0x540f7 ; 0x5410c MapGoldenrodGymSignpost1Script: ; 0x5410c - checkbit2 $001d + checkflag $001d iftrue UnknownScript_0x54115 jumpstd $002d ; 0x54115 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 609bb37af..9b5bc7987 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -12,11 +12,11 @@ TeacherScript_0x54953: ; 0x54953 special $0059 2writetext UnknownText_0x549a3 keeptextopen - if_less_than $f9, UnknownScript_0x54973 - if_less_than $c7, UnknownScript_0x54979 - if_less_than $95, UnknownScript_0x5497f - if_less_than $63, UnknownScript_0x54985 - if_less_than $31, UnknownScript_0x5498b + if_greater_than $f9, UnknownScript_0x54973 + if_greater_than $c7, UnknownScript_0x54979 + if_greater_than $95, UnknownScript_0x5497f + if_greater_than $63, UnknownScript_0x54985 + if_greater_than $31, UnknownScript_0x5498b 2jump UnknownScript_0x54991 ; 0x54973 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 952a7d1f4..119fd231b 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -16,7 +16,7 @@ UnknownScript_0x550eb: ; 0x550eb OfficerScript_0x550ec: ; 0x550ec faceplayer loadfont - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x550fa 2writetext UnknownText_0x55160 closetext @@ -40,7 +40,7 @@ UnknownScript_0x550fa: ; 0x550fa warpcheck newloadmap $f9 applymovement $0, MovementData_0x55122 - unknown0xa8 $14 + wait $14 end ; 0x55122 diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index d5bf6ab80..18b7e559b 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -18,7 +18,7 @@ UnknownScript_0x60f94: ; 0x60f94 ; 0x60f9e UnknownScript_0x60f9e: ; 0x60f9e - checkbit1 EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER + checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER iftrue UnknownScript_0x60fd8 playsound $0023 moveperson $3, $0, $7 @@ -31,8 +31,8 @@ UnknownScript_0x60f9e: ; 0x60f9e 2writetext UnknownText_0x622f0 closetext verbosegiveitem GS_BALL, 1 - setbit1 EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER - setbit1 EVENT_CAN_GIVE_GS_BALL_TO_KURT + setevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER + setevent EVENT_CAN_GIVE_GS_BALL_TO_KURT 2writetext UnknownText_0x62359 closetext loadmovesprites @@ -52,7 +52,7 @@ UnknownScript_0x60fd9: ; 0x60fd9 ; 0x60fe3 UnknownScript_0x60fe3: ; 0x60fe3 - checkbit1 EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER + checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER iftrue UnknownScript_0x6101d playsound $0023 moveperson $3, $0, $7 @@ -65,8 +65,8 @@ UnknownScript_0x60fe3: ; 0x60fe3 2writetext UnknownText_0x622f0 closetext verbosegiveitem GS_BALL, 1 - setbit1 EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER - setbit1 EVENT_CAN_GIVE_GS_BALL_TO_KURT + setevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER + setevent EVENT_CAN_GIVE_GS_BALL_TO_KURT 2writetext UnknownText_0x62359 closetext loadmovesprites diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index a0cace60f..275894fba 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -34,15 +34,15 @@ UnknownScript_0x181454: ; 0x181454 pause 15 writebyte $2 special $003e - setbit1 $0044 - setbit1 $077c - setbit1 $06c4 - clearbit1 $0762 - setbit1 $0737 - clearbit1 $0738 + setevent $0044 + setevent $077c + setevent $06c4 + clearevent $0762 + setevent $0737 + clearevent $0738 domaptrigger GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F, $1 special $001b - checkbit1 EVENT_GOT_SS_TICKET_FROM_ELM + checkevent EVENT_GOT_SS_TICKET_FROM_ELM iftrue UnknownScript_0x181497 specialphonecall $5 UnknownScript_0x181497: ; 0x181497 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 5d51fcf32..36d34c747 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -38,25 +38,25 @@ StoneTable_0x7e4c7: ; 0x7e4c7 UnknownScript_0x7e4d8: ; 0x7e4d8 disappear 2 - clearbit1 EVENT_BOULDER_IN_ICE_PATH_1 + clearevent EVENT_BOULDER_IN_ICE_PATH_1 2jump UnknownScript_0x7e4f8 ; 0x7e4e0 UnknownScript_0x7e4e0: ; 0x7e4e0 disappear 3 - clearbit1 EVENT_BOULDER_IN_ICE_PATH_2 + clearevent EVENT_BOULDER_IN_ICE_PATH_2 2jump UnknownScript_0x7e4f8 ; 0x7e4e8 UnknownScript_0x7e4e8: ; 0x7e4e8 disappear 4 - clearbit1 EVENT_BOULDER_IN_ICE_PATH_3 + clearevent EVENT_BOULDER_IN_ICE_PATH_3 2jump UnknownScript_0x7e4f8 ; 0x7e4f0 UnknownScript_0x7e4f0: ; 0x7e4f0 disappear 5 - clearbit1 EVENT_BOULDER_IN_ICE_PATH_4 + clearevent EVENT_BOULDER_IN_ICE_PATH_4 2jump UnknownScript_0x7e4f8 ; 0x7e4f8 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 280d1f9a2..a66f8d159 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -11,7 +11,7 @@ IlexForest_MapScriptHeader: ; 0x6eafe ; 0x6eb03 UnknownScript_0x6eb03: ; 0x6eb03 - checkbit1 EVENT_GOT_HM01_CUT + checkevent EVENT_GOT_HM01_CUT iftrue UnknownScript_0x6eb34 copybytetovar FarfetchdPosition if_equal $1, UnknownScript_0x6eb35 @@ -91,7 +91,7 @@ UnknownScript_0x6eb74: ; 0x6eb74 YoungsterScript_0x6eb7b: ; 0x6eb7b faceplayer loadfont - checkbit1 $0029 + checkevent $0029 iftrue UnknownScript_0x6eb89 2writetext UnknownText_0x6ef5c closetext @@ -326,8 +326,8 @@ UnknownScript_0x6ed50: ; 0x6ed50 appear $2 loadvar FarfetchdPosition, $a appear $4 - setbit1 $06f7 - setbit1 $0029 + setevent $06f7 + setevent $0029 end ; 0x6ed74 @@ -373,21 +373,21 @@ UnknownScript_0x6eda1: ; 0x6eda1 BlackBeltScript_0x6edae: ; 0x6edae faceplayer loadfont - checkbit1 EVENT_GOT_HM01_CUT + checkevent EVENT_GOT_HM01_CUT iftrue UnknownScript_0x6edd8 2writetext UnknownText_0x6f099 keeptextopen verbosegiveitem HM_01, 1 - setbit1 EVENT_GOT_HM01_CUT + setevent EVENT_GOT_HM01_CUT 2writetext UnknownText_0x6f141 closetext loadmovesprites - setbit1 $06e9 - setbit1 $06f3 - setbit1 $06f4 - clearbit1 $06f5 - clearbit1 $06f6 - clearbit1 $06f7 + setevent $06e9 + setevent $06f3 + setevent $06f4 + clearevent $06f5 + clearevent $06f6 + clearevent $06f7 end ; 0x6edd8 @@ -401,13 +401,13 @@ UnknownScript_0x6edd8: ; 0x6edd8 RockerScript_0x6edde: ; 0x6edde faceplayer loadfont - checkbit1 EVENT_GOT_TM02_HEADBUTT + checkevent EVENT_GOT_TM02_HEADBUTT iftrue UnknownScript_0x6edf3 2writetext UnknownText_0x6f21b keeptextopen verbosegiveitem TM_02, 1 iffalse UnknownScript_0x6edf7 - setbit1 EVENT_GOT_TM02_HEADBUTT + setevent EVENT_GOT_TM02_HEADBUTT UnknownScript_0x6edf3: ; 0x6edf3 2writetext UnknownText_0x6f26d closetext @@ -491,7 +491,7 @@ MapIlexForestSignpost0Script: ; 0x6ee24 ; 0x6ee27 MapIlexForestSignpost4Script: ; 0x6ee27 - checkbit1 $00c0 + checkevent $00c0 iftrue UnknownScript_0x6ee30 2jump UnknownScript_0x6ee35 ; 0x6ee30 @@ -514,10 +514,10 @@ UnknownScript_0x6ee38: ; 0x6ee38 UnknownScript_0x6ee42: ; 0x6ee42 takeitem GS_BALL, 1 - clearbit1 $00c0 - setbit1 $07a4 + clearevent $00c0 + setevent $07a4 disappear $8 - clearbit1 $06eb + clearevent $06eb 2writetext UnknownText_0x6f43b closetext loadmovesprites @@ -528,7 +528,7 @@ UnknownScript_0x6ee42: ; 0x6ee42 pause 30 spriteface $0, $0 pause 20 - clearbit2 $0064 + clearflag $0064 special $008f loadpokedata CELEBI, 30 startbattle diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 892d9dd16..070d05002 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -24,29 +24,29 @@ UnknownScript_0x18000a: ; 0x18000a domaptrigger GROUP_KARENS_ROOM, MAP_KARENS_ROOM, $0 domaptrigger GROUP_LANCES_ROOM, MAP_LANCES_ROOM, $0 domaptrigger GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME, $0 - clearbit1 $0309 - clearbit1 EVENT_WILLS_ROOM_EXIT_OPEN - clearbit1 EVENT_WILLS_ROOM_ENTRANCE_CLOSED - clearbit1 EVENT_KOGAS_ROOM_EXIT_OPEN - clearbit1 EVENT_KOGAS_ROOM_ENTRANCE_CLOSED - clearbit1 EVENT_BRUNOS_ROOM_EXIT_OPEN - clearbit1 EVENT_KARENS_ROOM_ENTRANCE_CLOSED - clearbit1 EVENT_KARENS_ROOM_EXIT_OPEN - clearbit1 EVENT_LANCES_ROOM_ENTRANCE_CLOSED - clearbit1 $0312 - clearbit1 $05b8 - clearbit1 $05b9 - clearbit1 $05ba - clearbit1 EVENT_BEAT_ELITE_4_KAREN - clearbit1 EVENT_BEAT_CHAMPION_LANCE - setbit1 $075f + clearevent $0309 + clearevent EVENT_WILLS_ROOM_EXIT_OPEN + clearevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED + clearevent EVENT_KOGAS_ROOM_EXIT_OPEN + clearevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED + clearevent EVENT_BRUNOS_ROOM_EXIT_OPEN + clearevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED + clearevent EVENT_KARENS_ROOM_EXIT_OPEN + clearevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED + clearevent $0312 + clearevent $05b8 + clearevent $05b9 + clearevent $05ba + clearevent EVENT_BEAT_ELITE_4_KAREN + clearevent EVENT_BEAT_CHAMPION_LANCE + setevent $075f return ; 0x180053 UnknownScript_0x180053: ; 0x180053 - checkbit1 EVENT_BEAT_RIVAL_IN_MT_MOON + checkevent EVENT_BEAT_RIVAL_IN_MT_MOON iffalse UnknownScript_0x18012b - checkbit2 $005d + checkflag $005d iftrue UnknownScript_0x18012b checkcode $b if_equal SUNDAY, UnknownScript_0x18012b @@ -67,9 +67,9 @@ UnknownScript_0x180053: ; 0x180053 ; 0x180094 UnknownScript_0x180094: ; 0x180094 - checkbit1 EVENT_BEAT_RIVAL_IN_MT_MOON + checkevent EVENT_BEAT_RIVAL_IN_MT_MOON iffalse UnknownScript_0x18012b - checkbit2 $005d + checkflag $005d iftrue UnknownScript_0x18012b checkcode $b if_equal SUNDAY, UnknownScript_0x18012b @@ -90,10 +90,10 @@ UnknownScript_0x1800ce: ; 0x1800ce 2writetext UnknownText_0x1801f5 closetext loadmovesprites - setbit1 $077b - checkbit1 EVENT_GOT_TOTODILE_FROM_ELM + setevent $077b + checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x1800f3 - checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM + checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x180103 winlosstext UnknownText_0x180295, UnknownText_0x1802fd setlasttalked $5 @@ -135,7 +135,7 @@ UnknownScript_0x180113: ; 0x180113 disappear $5 dotrigger $0 playmapmusic - setbit2 $005d + setflag $005d UnknownScript_0x18012b: ; 0x18012b end ; 0x18012c diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index cf0219ffc..bdec372ae 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -24,11 +24,11 @@ UnknownScript_0x180bc0: ; 0x180bc0 ; 0x180bc1 UnknownScript_0x180bc1: ; 0x180bc1 - checkbit1 EVENT_KARENS_ROOM_ENTRANCE_CLOSED + checkevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED iffalse UnknownScript_0x180bcb changeblock $4, $e, $2a UnknownScript_0x180bcb: ; 0x180bcb - checkbit1 EVENT_KARENS_ROOM_EXIT_OPEN + checkevent EVENT_KARENS_ROOM_EXIT_OPEN iffalse UnknownScript_0x180bd5 changeblock $4, $2, $16 UnknownScript_0x180bd5: ; 0x180bd5 @@ -44,7 +44,7 @@ UnknownScript_0x180bd6: ; 0x180bd6 reloadmappart loadmovesprites dotrigger $1 - setbit1 EVENT_KARENS_ROOM_ENTRANCE_CLOSED + setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED waitbutton end ; 0x180bee @@ -52,7 +52,7 @@ UnknownScript_0x180bd6: ; 0x180bd6 KarenScript_0x180bee: ; 0x180bee faceplayer loadfont - checkbit1 EVENT_BEAT_ELITE_4_KAREN + checkevent EVENT_BEAT_ELITE_4_KAREN iftrue UnknownScript_0x180c1c 2writetext UnknownText_0x180c27 closetext @@ -61,7 +61,7 @@ KarenScript_0x180bee: ; 0x180bee loadtrainer KAREN, 1 startbattle returnafterbattle - setbit1 EVENT_BEAT_ELITE_4_KAREN + setevent EVENT_BEAT_ELITE_4_KAREN loadfont 2writetext UnknownText_0x180d29 closetext @@ -70,7 +70,7 @@ KarenScript_0x180bee: ; 0x180bee changeblock $4, $2, $16 reloadmappart loadmovesprites - setbit1 EVENT_KARENS_ROOM_EXIT_OPEN + setevent EVENT_KARENS_ROOM_EXIT_OPEN waitbutton end ; 0x180c1c diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 7fba3dde1..cc6a9370d 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -24,11 +24,11 @@ UnknownScript_0x18072c: ; 0x18072c ; 0x18072d UnknownScript_0x18072d: ; 0x18072d - checkbit1 EVENT_WILLS_ROOM_ENTRANCE_CLOSED + checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED iffalse UnknownScript_0x180737 changeblock $4, $e, $2a UnknownScript_0x180737: ; 0x180737 - checkbit1 EVENT_KOGAS_ROOM_EXIT_OPEN + checkevent EVENT_KOGAS_ROOM_EXIT_OPEN iffalse UnknownScript_0x180741 changeblock $4, $2, $16 UnknownScript_0x180741: ; 0x180741 @@ -44,7 +44,7 @@ UnknownScript_0x180742: ; 0x180742 reloadmappart loadmovesprites dotrigger $1 - setbit1 EVENT_WILLS_ROOM_ENTRANCE_CLOSED + setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED waitbutton end ; 0x18075a @@ -52,7 +52,7 @@ UnknownScript_0x180742: ; 0x180742 KogaScript_0x18075a: ; 0x18075a faceplayer loadfont - checkbit1 $05b9 + checkevent $05b9 iftrue UnknownScript_0x180788 2writetext UnknownText_0x180793 closetext @@ -61,7 +61,7 @@ KogaScript_0x18075a: ; 0x18075a loadtrainer KOGA, 1 startbattle returnafterbattle - setbit1 $05b9 + setevent $05b9 loadfont 2writetext UnknownText_0x1808ca closetext @@ -70,7 +70,7 @@ KogaScript_0x18075a: ; 0x18075a changeblock $4, $2, $16 reloadmappart loadmovesprites - setbit1 EVENT_KOGAS_ROOM_EXIT_OPEN + setevent EVENT_KOGAS_ROOM_EXIT_OPEN waitbutton end ; 0x180788 diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 3c6641e9e..5a67bdb73 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -19,14 +19,14 @@ UnknownScript_0x7a4d7: ; 0x7a4d7 ; 0x7a4d8 UnknownScript_0x7a4d8: ; 0x7a4d8 - setbit1 $0000 + setevent $0000 ; 0x7a4db UnknownScript_0x7a4db: ; 0x7a4db playmusic $004e showemote $0, $2, 15 spriteface $0, $2 - checkbit1 $0000 + checkevent $0000 iffalse UnknownScript_0x7a4f2 applymovement $2, MovementData_0x7a5fc 2jump UnknownScript_0x7a4f6 @@ -40,12 +40,12 @@ UnknownScript_0x7a4f6: ; 0x7a4f6 keeptextopen stringtotext GearName, $1 2call UnknownScript_0x7a57e - setbit2 $0004 - setbit2 $0002 + setflag $0004 + setflag $0002 addcellnum $1 dotrigger $1 - setbit1 $06c7 - clearbit1 $06c8 + setevent $06c7 + clearevent $06c8 2writetext UnknownText_0x7a6bd keeptextopen special $0025 @@ -86,9 +86,9 @@ UnknownScript_0x7a549: ; 0x7a549 2writetext UnknownText_0x7a850 closetext loadmovesprites - checkbit1 $0000 + checkevent $0000 iftrue UnknownScript_0x7a55d - checkbit1 $0001 + checkevent $0001 iffalse UnknownScript_0x7a564 2jump UnknownScript_0x7a56b ; 0x7a55d @@ -125,17 +125,17 @@ UnknownScript_0x7a57e: ; 0x7a57e MomScript_0x7a582: ; 0x7a582 faceplayer - setbit1 $0001 + setevent $0001 checktriggers iffalse UnknownScript_0x7a572 loadfont - checkbit1 $0076 + checkevent $0076 iftrue UnknownScript_0x7a5af - checkbit1 EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST + checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST iftrue UnknownScript_0x7a5b8 - checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM + checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x7a5b5 - checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM + checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue UnknownScript_0x7a5a9 2writetext UnknownText_0x7a8b5 closetext @@ -158,9 +158,9 @@ UnknownScript_0x7a5af: ; 0x7a5af ; 0x7a5b5 UnknownScript_0x7a5b5: ; 0x7a5b5 - setbit1 $0076 + setevent $0076 UnknownScript_0x7a5b8: ; 0x7a5b8 - setbit1 EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST + setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST special $0022 closetext loadmovesprites diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index 1d4a33040..7aae9881c 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -18,8 +18,8 @@ UnknownScript_0x7abb3: ; 0x7abb3 UnknownScript_0x7abb4: ; 0x7abb4 special $004a - setbit1 $0007 - checkbit1 $0036 + setevent $0007 + checkevent $0036 iftrue UnknownScript_0x7abc4 jumpstd $0018 return @@ -55,7 +55,7 @@ ConsoleScript_0x7abd2: ; 0x7abd2 ; 0x7abd4 MapKrissHouse2FSignpost4: ; 0x7abd4 - dw $02cc ; bit1 + dw $02cc ; event dw MapKrissHouse2FSignpost4Script ; 0x7abd8 @@ -64,9 +64,9 @@ MapKrissHouse2FSignpost4Script: ; 0x7abd8 ; 0x7abda MapKrissHouse2FSignpost2Script: ; 0x7abda - checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM + checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue UnknownScript_0x7ac07 - checkbit1 EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE + checkevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE iftrue UnknownScript_0x7ac0a playmusic $001d loadfont @@ -80,7 +80,7 @@ MapKrissHouse2FSignpost2Script: ; 0x7abda 2writetext UnknownText_0x7ac84 pause 45 loadmovesprites - setbit1 EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE + setevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE end ; 0x7ac07 diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 313678348..13272b4f6 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -19,9 +19,9 @@ MapKrissNeighborsHouseSignpost1Script: ; 0x7acf4 ; 0x7acf7 MapKrissNeighborsHouseSignpost2Script: ; 0x7acf7 - checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM + checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue UnknownScript_0x7ad24 - checkbit1 EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE + checkevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE iftrue UnknownScript_0x7ad27 playmusic $001d loadfont @@ -35,7 +35,7 @@ MapKrissNeighborsHouseSignpost2Script: ; 0x7acf7 2writetext UnknownText_0x7ae9b pause 45 loadmovesprites - setbit1 EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE + setevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE end ; 0x7ad24 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 53920eede..c5c56bf9c 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -11,11 +11,11 @@ KurtsHouse_MapScriptHeader: ; 0x18e14f ; 0x18e154 UnknownScript_0x18e154: ; 0x18e154 - checkbit1 EVENT_CLEARED_SLOWPOKE_WELL + checkevent EVENT_CLEARED_SLOWPOKE_WELL iffalse UnknownScript_0x18e177 - checkbit1 $00c0 + checkevent $00c0 iftrue UnknownScript_0x18e177 - checkbit2 $0050 + checkflag $0050 iftrue UnknownScript_0x18e16f disappear $5 appear $2 @@ -36,15 +36,15 @@ UnknownScript_0x18e177: ; 0x18e177 KurtScript_0x18e178: ; 0x18e178 faceplayer loadfont - checkbit1 $0035 + checkevent $0035 iftrue UnknownScript_0x18e1cc - checkbit1 EVENT_CLEARED_SLOWPOKE_WELL + checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue UnknownScript_0x18e1bf 2writetext UnknownText_0x18e473 closetext loadmovesprites special $006a - setbit1 $06fa + setevent $06fa checkcode $9 if_equal $1, UnknownScript_0x18e1ab spriteface $0, $0 @@ -73,30 +73,30 @@ UnknownScript_0x18e1bf: ; 0x18e1bf keeptextopen verbosegiveitem LURE_BALL, 1 iffalse UnknownScript_0x18e2b2 - setbit1 $0035 + setevent $0035 UnknownScript_0x18e1cc: ; 0x18e1cc - checkbit1 $0000 + checkevent $0000 iftrue UnknownScript_0x18e29f - checkbit1 $0258 + checkevent $0258 iftrue UnknownScript_0x18e2b4 - checkbit1 $0259 + checkevent $0259 iftrue UnknownScript_0x18e2ca - checkbit1 $025a + checkevent $025a iftrue UnknownScript_0x18e2e0 - checkbit1 $025b + checkevent $025b iftrue UnknownScript_0x18e2f6 - checkbit1 $025c + checkevent $025c iftrue UnknownScript_0x18e30c - checkbit1 $025d + checkevent $025d iftrue UnknownScript_0x18e322 - checkbit1 $025e + checkevent $025e iftrue UnknownScript_0x18e338 - checkbit1 EVENT_CAN_GIVE_GS_BALL_TO_KURT + checkevent EVENT_CAN_GIVE_GS_BALL_TO_KURT iftrue UnknownScript_0x18e34e UnknownScript_0x18e202: ; 0x18e202 - checkbit1 $0001 + checkevent $0001 iftrue UnknownScript_0x18e212 - checkbit1 $0002 + checkevent $0002 iftrue UnknownScript_0x18e212 2writetext UnknownText_0x18e6c9 closetext @@ -115,9 +115,9 @@ UnknownScript_0x18e212: ; 0x18e212 iftrue UnknownScript_0x18e249 checkitem PNK_APRICORN iftrue UnknownScript_0x18e249 - checkbit1 $0001 + checkevent $0001 iftrue UnknownScript_0x18e2ae - checkbit1 $0002 + checkevent $0002 iftrue UnknownScript_0x18e243 loadmovesprites end @@ -133,7 +133,7 @@ UnknownScript_0x18e243: ; 0x18e243 UnknownScript_0x18e249: ; 0x18e249 2writetext UnknownText_0x18e736 keeptextopen - setbit1 $0002 + setevent $0002 special $0056 if_equal $0, UnknownScript_0x18e2a5 if_equal $59, UnknownScript_0x18e275 @@ -142,43 +142,43 @@ UnknownScript_0x18e249: ; 0x18e249 if_equal $61, UnknownScript_0x18e287 if_equal $63, UnknownScript_0x18e28d if_equal $65, UnknownScript_0x18e293 - setbit1 $0258 + setevent $0258 2jump UnknownScript_0x18e299 ; 0x18e275 UnknownScript_0x18e275: ; 0x18e275 - setbit1 $0259 + setevent $0259 2jump UnknownScript_0x18e299 ; 0x18e27b UnknownScript_0x18e27b: ; 0x18e27b - setbit1 $025a + setevent $025a 2jump UnknownScript_0x18e299 ; 0x18e281 UnknownScript_0x18e281: ; 0x18e281 - setbit1 $025b + setevent $025b 2jump UnknownScript_0x18e299 ; 0x18e287 UnknownScript_0x18e287: ; 0x18e287 - setbit1 $025c + setevent $025c 2jump UnknownScript_0x18e299 ; 0x18e28d UnknownScript_0x18e28d: ; 0x18e28d - setbit1 $025d + setevent $025d 2jump UnknownScript_0x18e299 ; 0x18e293 UnknownScript_0x18e293: ; 0x18e293 - setbit1 $025e + setevent $025e 2jump UnknownScript_0x18e299 ; 0x18e299 UnknownScript_0x18e299: ; 0x18e299 - setbit1 $0000 - setbit2 $0050 + setevent $0000 + setflag $0050 UnknownScript_0x18e29f: ; 0x18e29f 2writetext UnknownText_0x18e779 closetext @@ -194,7 +194,7 @@ UnknownScript_0x18e2a5: ; 0x18e2a5 ; 0x18e2ab UnknownScript_0x18e2ab: ; 0x18e2ab - setbit1 $0001 + setevent $0001 UnknownScript_0x18e2ae: ; 0x18e2ae 2writetext UnknownText_0x18e82a closetext @@ -204,105 +204,105 @@ UnknownScript_0x18e2b2: ; 0x18e2b2 ; 0x18e2b4 UnknownScript_0x18e2b4: ; 0x18e2b4 - checkbit2 $0050 + checkflag $0050 iftrue UnknownScript_0x18e3c5 2writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 LEVEL_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e2c4: ; 0x18e2c4 - clearbit1 $0258 + clearevent $0258 2jump UnknownScript_0x18e2ab ; 0x18e2ca UnknownScript_0x18e2ca: ; 0x18e2ca - checkbit2 $0050 + checkflag $0050 iftrue UnknownScript_0x18e3c5 2writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 LURE_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e2da: ; 0x18e2da - clearbit1 $0259 + clearevent $0259 2jump UnknownScript_0x18e2ab ; 0x18e2e0 UnknownScript_0x18e2e0: ; 0x18e2e0 - checkbit2 $0050 + checkflag $0050 iftrue UnknownScript_0x18e3c5 2writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 MOON_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e2f0: ; 0x18e2f0 - clearbit1 $025a + clearevent $025a 2jump UnknownScript_0x18e2ab ; 0x18e2f6 UnknownScript_0x18e2f6: ; 0x18e2f6 - checkbit2 $0050 + checkflag $0050 iftrue UnknownScript_0x18e3c5 2writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 FRIEND_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e306: ; 0x18e306 - clearbit1 $025b + clearevent $025b 2jump UnknownScript_0x18e2ab ; 0x18e30c UnknownScript_0x18e30c: ; 0x18e30c - checkbit2 $0050 + checkflag $0050 iftrue UnknownScript_0x18e3c5 2writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 FAST_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e31c: ; 0x18e31c - clearbit1 $025c + clearevent $025c 2jump UnknownScript_0x18e2ab ; 0x18e322 UnknownScript_0x18e322: ; 0x18e322 - checkbit2 $0050 + checkflag $0050 iftrue UnknownScript_0x18e3c5 2writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 HEAVY_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e332: ; 0x18e332 - clearbit1 $025d + clearevent $025d 2jump UnknownScript_0x18e2ab ; 0x18e338 UnknownScript_0x18e338: ; 0x18e338 - checkbit2 $0050 + checkflag $0050 iftrue UnknownScript_0x18e3c5 2writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 LOVE_BALL, $16 iffalse UnknownScript_0x18e2b2 UnknownScript_0x18e348: ; 0x18e348 - clearbit1 $025e + clearevent $025e 2jump UnknownScript_0x18e2ab ; 0x18e34e UnknownScript_0x18e34e: ; 0x18e34e - checkbit1 $00bf + checkevent $00bf iftrue UnknownScript_0x18e368 checkitem GS_BALL iffalse UnknownScript_0x18e202 2writetext UnknownText_0x18e8ab closetext loadmovesprites - setbit1 $00bf + setevent $00bf takeitem GS_BALL, 1 - setbit2 $0050 + setflag $0050 end ; 0x18e368 UnknownScript_0x18e368: ; 0x18e368 - checkbit2 $0050 + checkflag $0050 iffalse UnknownScript_0x18e378 2writetext UnknownText_0x18e934 closetext @@ -316,9 +316,9 @@ UnknownScript_0x18e378: ; 0x18e378 2writetext UnknownText_0x18e95c closetext loadmovesprites - setbit1 $00c0 - clearbit1 EVENT_CAN_GIVE_GS_BALL_TO_KURT - clearbit1 $00bf + setevent $00c0 + clearevent EVENT_CAN_GIVE_GS_BALL_TO_KURT + clearevent $00bf special $006a pause 20 showemote $0, $2, 30 @@ -337,7 +337,7 @@ UnknownScript_0x18e3a2: ; 0x18e3a2 UnknownScript_0x18e3ac: ; 0x18e3ac playsound $0023 disappear $2 - clearbit1 $07a4 + clearevent $07a4 waitbutton special $003d domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $2 @@ -347,10 +347,10 @@ UnknownScript_0x18e3ac: ; 0x18e3ac KurtScript_0x18e3bd: ; 0x18e3bd faceplayer loadfont - checkbit1 $00bf + checkevent $00bf iftrue UnknownScript_0x18e3e0 UnknownScript_0x18e3c5: ; 0x18e3c5 - checkbit1 $00bb + checkevent $00bb iffalse UnknownScript_0x18e3d4 2writetext UnknownText_0x18e7d8 closetext @@ -364,7 +364,7 @@ UnknownScript_0x18e3d4: ; 0x18e3d4 closetext loadmovesprites spriteface $5, $1 - setbit1 $00bb + setevent $00bb end ; 0x18e3e0 @@ -380,17 +380,17 @@ UnknownScript_0x18e3e0: ; 0x18e3e0 TwinScript_0x18e3ed: ; 0x18e3ed faceplayer - checkbit1 $0000 + checkevent $0000 iftrue UnknownScript_0x18e42f - checkbit1 $0001 + checkevent $0001 iftrue UnknownScript_0x18e448 - checkbit1 $00c0 + checkevent $00c0 iftrue UnknownScript_0x18e420 - checkbit1 $0030 + checkevent $0030 iftrue UnknownScript_0x18e427 - checkbit1 EVENT_CLEARED_SLOWPOKE_WELL + checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue UnknownScript_0x18e419 - checkbit1 $06fa + checkevent $06fa iftrue UnknownScript_0x18e420 loadfont 2writetext UnknownText_0x18e9b5 @@ -427,7 +427,7 @@ TwinScript_0x18e42e: ; 0x18e42e faceplayer UnknownScript_0x18e42f: ; 0x18e42f loadfont - checkbit1 $00bf + checkevent $00bf iftrue UnknownScript_0x18e43f 2writetext UnknownText_0x18eab2 closetext diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index f11687473..e37483c4b 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -25,7 +25,7 @@ UnknownScript_0x70011: ; 0x70011 ; 0x70012 UnknownScript_0x70012: ; 0x70012 - setbit2 $004a + setflag $004a return ; 0x70016 @@ -42,7 +42,7 @@ UnknownScript_0x7001f: ; 0x7001f ; 0x70022 LanceScript_0x70022: ; 0x70022 - checkbit1 EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE + checkevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE iftrue UnknownScript_0x70057 loadfont 2writetext UnknownText_0x70157 @@ -58,8 +58,8 @@ UnknownScript_0x70035: ; 0x70035 playsound $0013 applymovement $2, MovementData_0x70155 disappear $2 - clearbit1 $06d5 - setbit1 EVENT_DECIDED_TO_HELP_LANCE + clearevent $06d5 + setevent EVENT_DECIDED_TO_HELP_LANCE domaptrigger GROUP_MAHOGANY_MART_1F, MAP_MAHOGANY_MART_1F, $1 end ; 0x7004e @@ -68,7 +68,7 @@ UnknownScript_0x7004e: ; 0x7004e 2writetext UnknownText_0x70371 closetext loadmovesprites - setbit1 EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE + setevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE end ; 0x70057 @@ -110,7 +110,7 @@ UnknownScript_0x7007a: ; 0x7007a GrampsScript_0x7008e: ; 0x7008e faceplayer loadfont - checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT + checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x7009c 2writetext UnknownText_0x703f8 closetext @@ -140,7 +140,7 @@ MapLakeofRageSignpost0Script: ; 0x700a8 MapLakeofRageSignpost1Script: ; 0x700ab loadfont 2writetext UnknownText_0x70903 - checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT + checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x700b8 closetext loadmovesprites @@ -273,21 +273,21 @@ CooltrainerfLoisScript: ; 0x70106 SuperNerdScript_0x7010e: ; 0x7010e faceplayer loadfont - checkbit1 EVENT_GOT_BLACKBELT_FROM_WESLEY + checkevent EVENT_GOT_BLACKBELT_FROM_WESLEY iftrue UnknownScript_0x7013c checkcode $b if_not_equal WEDNESDAY, UnknownScript_0x70142 - checkbit1 EVENT_MET_WESLEY_OF_WEDNESDAY + checkevent EVENT_MET_WESLEY_OF_WEDNESDAY iftrue UnknownScript_0x70129 2writetext UnknownText_0x70784 keeptextopen - setbit1 EVENT_MET_WESLEY_OF_WEDNESDAY + setevent EVENT_MET_WESLEY_OF_WEDNESDAY UnknownScript_0x70129: ; 0x70129 2writetext UnknownText_0x707dd keeptextopen verbosegiveitem BLACKBELT, 1 iffalse UnknownScript_0x70140 - setbit1 EVENT_GOT_BLACKBELT_FROM_WESLEY + setevent EVENT_GOT_BLACKBELT_FROM_WESLEY 2writetext UnknownText_0x7080b closetext loadmovesprites diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm index cc50000ec..1958ce5e6 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeofRageHiddenPowerHouse.asm @@ -9,13 +9,13 @@ LakeofRageHiddenPowerHouse_MapScriptHeader: ; 0x19a525 FisherScript_0x19a527: ; 0x19a527 faceplayer loadfont - checkbit1 EVENT_GOT_TM10_HIDDEN_POWER + checkevent EVENT_GOT_TM10_HIDDEN_POWER iftrue UnknownScript_0x19a542 2writetext UnknownText_0x19a54b keeptextopen verbosegiveitem TM_10, 1 iffalse UnknownScript_0x19a546 - setbit1 EVENT_GOT_TM10_HIDDEN_POWER + setevent EVENT_GOT_TM10_HIDDEN_POWER 2writetext UnknownText_0x19a5de closetext loadmovesprites diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm index a89867a4d..478282693 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeofRageMagikarpHouse.asm @@ -9,18 +9,18 @@ LakeofRageMagikarpHouse_MapScriptHeader: ; 0x19a6ac FishingGuruScript_0x19a6ae: ; 0x19a6ae faceplayer loadfont - checkbit1 $003a + checkevent $003a iftrue UnknownScript_0x19a6fe - checkbit1 $0039 + checkevent $0039 iftrue UnknownScript_0x19a6e0 - checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT + checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19a6d7 - checkbit1 $0038 + checkevent $0038 iftrue UnknownScript_0x19a6d1 2writetext UnknownText_0x19a72e closetext loadmovesprites - setbit1 $0038 + setevent $0038 end ; 0x19a6d1 @@ -35,7 +35,7 @@ UnknownScript_0x19a6d7: ; 0x19a6d7 2writetext UnknownText_0x19a890 closetext loadmovesprites - setbit1 $0039 + setevent $0039 end ; 0x19a6e0 @@ -60,13 +60,13 @@ UnknownScript_0x19a6fe: ; 0x19a6fe 2writetext UnknownText_0x19a9c3 closetext loadmovesprites - clearbit1 $003a + clearevent $003a end ; 0x19a711 UnknownScript_0x19a711: ; 0x19a711 loadmovesprites - setbit1 $003a + setevent $003a end ; 0x19a716 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 30773e254..ec65ab725 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -24,11 +24,11 @@ UnknownScript_0x180e3d: ; 0x180e3d ; 0x180e3e UnknownScript_0x180e3e: ; 0x180e3e - checkbit1 EVENT_LANCES_ROOM_ENTRANCE_CLOSED + checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED iffalse UnknownScript_0x180e48 changeblock $4, $16, $34 UnknownScript_0x180e48: ; 0x180e48 - checkbit1 $0312 + checkevent $0312 iffalse UnknownScript_0x180e52 changeblock $4, $0, $b UnknownScript_0x180e52: ; 0x180e52 @@ -44,7 +44,7 @@ UnknownScript_0x180e53: ; 0x180e53 reloadmappart loadmovesprites dotrigger $1 - setbit1 EVENT_LANCES_ROOM_ENTRANCE_CLOSED + setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED end ; 0x180e6a @@ -69,7 +69,7 @@ UnknownScript_0x180e7b: ; 0x180e7b startbattle reloadmapmusic returnafterbattle - setbit1 EVENT_BEAT_CHAMPION_LANCE + setevent EVENT_BEAT_CHAMPION_LANCE loadfont 2writetext UnknownText_0x181132 closetext @@ -78,7 +78,7 @@ UnknownScript_0x180e7b: ; 0x180e7b changeblock $4, $0, $b reloadmappart loadmovesprites - setbit1 EVENT_LANCES_ROOM_ENTRANCE_CLOSED + setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED musicfadeout $0038, $10 pause 30 showemote $0, $2, 15 diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 8069343f2..2fc58f6ce 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -21,9 +21,9 @@ SuperNerdScript_0x7ee69: ; 0x7ee69 GentlemanScript_0x7ee6c: ; 0x7ee6c faceplayer loadfont - checkbit2 $0003 + checkflag $0003 iftrue .UnknownScript_0x7ee8e - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue .UnknownScript_0x7ee80 2writetext UnknownText_0x7effb closetext @@ -36,7 +36,7 @@ GentlemanScript_0x7ee6c: ; 0x7ee6c keeptextopen stringtotext .expncardname, $1 2call .UnknownScript_0x7ee94 - setbit2 $0003 + setflag $0003 .UnknownScript_0x7ee8e ; 0x7ee8e 2writetext UnknownText_0x7f141 closetext @@ -56,7 +56,7 @@ GentlemanScript_0x7ee6c: ; 0x7ee6c SuperNerdScript_0x7eea2: ; 0x7eea2 faceplayer loadfont - checkbit2 $0003 + checkflag $0003 iftrue UnknownScript_0x7eeb0 2writetext UnknownText_0x7f193 closetext diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm index e1a7f591e..b046a99ca 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokeCenter1F.asm @@ -21,7 +21,7 @@ TeacherScript_0x7e6a6: ; 0x7e6a6 YoungsterScript_0x7e6a9: ; 0x7e6a9 faceplayer loadfont - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x7e6b7 2writetext UnknownText_0x7e779 closetext diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 26dcd0931..eebafd1ff 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -11,7 +11,7 @@ LavenderTown_MapScriptHeader: ; 0x1ad6db ; 0x1ad6e0 UnknownScript_0x1ad6e0: ; 0x1ad6e0 - setbit2 $003b + setflag $003b return ; 0x1ad6e4 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 9356cdc84..ccebe7a03 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -9,7 +9,7 @@ MahoganyGym_MapScriptHeader: ; 0x199a9c PryceScript_0x199a9e: ; 0x199a9e faceplayer loadfont - checkbit1 EVENT_BEAT_PRYCE + checkevent EVENT_BEAT_PRYCE iftrue UnknownScript_0x199ac8 2writetext UnknownText_0x199b8d closetext @@ -18,27 +18,27 @@ PryceScript_0x199a9e: ; 0x199a9e loadtrainer PRYCE, 1 startbattle returnafterbattle - setbit1 EVENT_BEAT_PRYCE + setevent EVENT_BEAT_PRYCE loadfont 2writetext UnknownText_0x199d3b playsound $009c waitbutton - setbit2 $0021 + setflag $0021 checkcode $7 2call UnknownScript_0x199af6 UnknownScript_0x199ac8: ; 0x199ac8 - checkbit1 EVENT_GOT_TM16_ICY_WIND + checkevent EVENT_GOT_TM16_ICY_WIND iftrue UnknownScript_0x199af0 - setbit1 EVENT_BEAT_SKIER_ROXANNE - setbit1 EVENT_BEAT_SKIER_CLARISSA - setbit1 EVENT_BEAT_BOARDER_RONALD - setbit1 EVENT_BEAT_BOARDER_BRAD - setbit1 EVENT_BEAT_BOARDER_DOUGLAS + setevent EVENT_BEAT_SKIER_ROXANNE + setevent EVENT_BEAT_SKIER_CLARISSA + setevent EVENT_BEAT_BOARDER_RONALD + setevent EVENT_BEAT_BOARDER_BRAD + setevent EVENT_BEAT_BOARDER_DOUGLAS 2writetext UnknownText_0x199d55 keeptextopen verbosegiveitem TM_16, 1 iffalse UnknownScript_0x199af4 - setbit1 EVENT_GOT_TM16_ICY_WIND + setevent EVENT_GOT_TM16_ICY_WIND 2writetext UnknownText_0x199def closetext loadmovesprites @@ -215,7 +215,7 @@ BoarderDouglasScript: ; 0x199b61 MahoganyGymGuyScript: ; 0x199b69 faceplayer loadfont - checkbit1 EVENT_BEAT_PRYCE + checkevent EVENT_BEAT_PRYCE iftrue .MahoganyGymGuyWinScript 2writetext MahoganyGymGuyText closetext @@ -230,7 +230,7 @@ MahoganyGymGuyScript: ; 0x199b69 ; 0x199b7d MapMahoganyGymSignpost1Script: ; 0x199b7d - checkbit2 $0021 + checkflag $0021 iftrue UnknownScript_0x199b86 jumpstd $002d ; 0x199b86 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index a81b0bfa1..0d1a0b179 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -24,7 +24,7 @@ UnknownScript_0x6c357: ; 0x6c357 ; 0x6c35b UnknownScript_0x6c35b: ; 0x6c35b - checkbit1 EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART + checkevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART iftrue UnknownScript_0x6c362 return ; 0x6c362 @@ -37,7 +37,7 @@ UnknownScript_0x6c362: ; 0x6c362 PharmacistScript_0x6c367: ; 0x6c367 faceplayer loadfont - checkbit1 EVENT_DECIDED_TO_HELP_LANCE + checkevent EVENT_DECIDED_TO_HELP_LANCE iftrue UnknownScript_0x6c375 pokemart $0, $000f loadmovesprites @@ -54,7 +54,7 @@ UnknownScript_0x6c375: ; 0x6c375 BlackBeltScript_0x6c37b: ; 0x6c37b faceplayer loadfont - checkbit1 EVENT_DECIDED_TO_HELP_LANCE + checkevent EVENT_DECIDED_TO_HELP_LANCE iftrue UnknownScript_0x6c389 2writetext UnknownText_0x6c494 closetext @@ -99,7 +99,7 @@ UnknownScript_0x6c38f: ; 0x6c38f changeblock $6, $2, $1e reloadmappart loadmovesprites - setbit1 EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART + setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART spriteface $4, $2 loadfont 2writetext UnknownText_0x6c5ba diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 34a94be42..9ab656927 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -13,7 +13,7 @@ BlackBeltScript_0x19997f: ; 0x19997f TeacherScript_0x199982: ; 0x199982 faceplayer loadfont - checkbit2 $0013 + checkflag $0013 iftrue UnknownScript_0x199990 2writetext UnknownText_0x199a0e closetext diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 89a51f4e0..bda64b8ee 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -23,7 +23,7 @@ UnknownScript_0x19000e: ; 0x19000e ; 0x19000f UnknownScript_0x19000f: ; 0x19000f - setbit2 $0049 + setflag $0049 return ; 0x190013 @@ -42,7 +42,7 @@ UnknownScript_0x190013: ; 0x190013 PokefanMScript_0x19002e: ; 0x19002e faceplayer UnknownScript_0x19002f: ; 0x19002f - checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT + checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x190039 2call UnknownScript_0x190040 end @@ -100,7 +100,7 @@ UnknownScript_0x190078: ; 0x190078 GrampsScript_0x19007e: ; 0x19007e faceplayer loadfont - checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT + checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19008c 2writetext UnknownText_0x1901e5 closetext diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 6ffc2d3b8..300946057 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -9,9 +9,9 @@ ManiasHouse_MapScriptHeader: ; 0x9d276 RockerScript_0x9d278: ; 0x9d278 faceplayer loadfont - checkbit1 EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM + checkevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM iftrue UnknownScript_0x9d2fa - checkbit1 EVENT_GOT_SHUCKIE + checkevent EVENT_GOT_SHUCKIE iftrue UnknownScript_0x9d2a4 2writetext UnknownText_0x9d303 yesorno @@ -25,12 +25,12 @@ RockerScript_0x9d278: ; 0x9d278 playsound $0091 waitbutton loadmovesprites - setbit1 EVENT_GOT_SHUCKIE + setevent EVENT_GOT_SHUCKIE end ; 0x9d2a4 UnknownScript_0x9d2a4: ; 0x9d2a4 - checkbit2 $0055 + checkflag $0055 iffalse UnknownScript_0x9d2bc 2writetext UnknownText_0x9d3ed closetext @@ -64,7 +64,7 @@ UnknownScript_0x9d2bc: ; 0x9d2bc 2writetext UnknownText_0x9d4b1 closetext loadmovesprites - setbit1 EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM + setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM end ; 0x9d2df @@ -79,7 +79,7 @@ UnknownScript_0x9d2e5: ; 0x9d2e5 2writetext UnknownText_0x9d4e3 closetext loadmovesprites - setbit1 EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM + setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM end ; 0x9d2ee diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index f3c760189..10466e763 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -30,9 +30,9 @@ UnknownScript_0x7408e: ; 0x7408e 2writetext UnknownText_0x74105 closetext loadmovesprites - checkbit1 EVENT_GOT_TOTODILE_FROM_ELM + checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x740c3 - checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM + checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x740d3 winlosstext UnknownText_0x7419d, UnknownText_0x742e0 setlasttalked $2 @@ -72,7 +72,7 @@ UnknownScript_0x740e3: ; 0x740e3 applymovement $2, MovementData_0x740fd disappear $2 dotrigger $1 - setbit1 EVENT_BEAT_RIVAL_IN_MT_MOON + setevent EVENT_BEAT_RIVAL_IN_MT_MOON playmapmusic end ; 0x740f9 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 9ab259580..56c63d350 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -20,7 +20,7 @@ UnknownScript_0x77092: ; 0x77092 ; 0x77093 UnknownScript_0x77093: ; 0x77093 - setbit1 $00ec + setevent $00ec return ; 0x77097 @@ -30,7 +30,7 @@ UnknownScript_0x77097: ; 0x77097 ; 0x7709a UnknownScript_0x7709a: ; 0x7709a - checkbit2 $0058 + checkflag $0058 iftrue UnknownScript_0x77117 checkcode $b if_not_equal MONDAY, UnknownScript_0x77117 @@ -72,8 +72,8 @@ UnknownScript_0x7709a: ; 0x7709a disappear $2 disappear $3 stopfollow - clearbit1 $00ec - setbit2 $0058 + clearevent $00ec + setflag $0058 end ; 0x77117 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 02f12f2ee..9c841d197 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -9,9 +9,9 @@ MountMortarB1F_MapScriptHeader: ; 0x7e1f4 BlackBeltScript_0x7e1f6: ; 0x7e1f6 faceplayer loadfont - checkbit1 EVENT_GOT_TYROGUE_FROM_KIYO + checkevent EVENT_GOT_TYROGUE_FROM_KIYO iftrue UnknownScript_0x7e231 - checkbit1 $04a9 + checkevent $04a9 iftrue UnknownScript_0x7e217 2writetext UnknownText_0x7e24d closetext @@ -20,7 +20,7 @@ BlackBeltScript_0x7e1f6: ; 0x7e1f6 loadtrainer BLACKBELT_T, KIYO startbattle returnafterbattle - setbit1 $04a9 + setevent $04a9 loadfont UnknownScript_0x7e217: ; 0x7e217 2writetext UnknownText_0x7e2c0 @@ -32,7 +32,7 @@ UnknownScript_0x7e217: ; 0x7e217 playsound $0002 waitbutton givepoke TYROGUE, 10, 0, 0 - setbit1 EVENT_GOT_TYROGUE_FROM_KIYO + setevent EVENT_GOT_TYROGUE_FROM_KIYO UnknownScript_0x7e231: ; 0x7e231 2writetext UnknownText_0x7e36a closetext diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index c3677dea2..e9b7a939f 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -36,7 +36,7 @@ UnknownScript_0x196e56: ; 0x196e56 playsound $0091 waitbutton itemnotify - setbit1 EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON + setevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON blackoutmod GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY 2writetext UnknownText_0x196feb keeptextopen @@ -56,7 +56,7 @@ GentlemanScript_0x196e97: ; 0x196e97 loadfont checkitem RED_SCALE iftrue UnknownScript_0x196eb0 - checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM + checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x196eaa 2writetext UnknownText_0x197134 closetext @@ -100,7 +100,7 @@ UnknownScript_0x196ec9: ; 0x196ec9 2writetext UnknownText_0x1973cc playsound $0001 waitbutton - setbit2 $000b + setflag $000b 2writetext UnknownText_0x1973de closetext loadmovesprites @@ -128,29 +128,29 @@ UnknownScript_0x196ec9: ; 0x196ec9 2writetext UnknownText_0x197134 closetext loadmovesprites - setbit1 $06bd - setbit1 $0792 - clearbit1 $0793 + setevent $06bd + setevent $0792 + clearevent $0793 dotrigger $1 domaptrigger GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY, $1 domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $3 specialphonecall $2 - clearbit1 $0702 - checkbit1 EVENT_GOT_TOTODILE_FROM_ELM + clearevent $0702 + checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x196f49 - checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM + checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x196f4d - setbit1 $0641 + setevent $0641 end ; 0x196f49 UnknownScript_0x196f49: ; 0x196f49 - setbit1 $0642 + setevent $0642 end ; 0x196f4d UnknownScript_0x196f4d: ; 0x196f4d - setbit1 $0640 + setevent $0640 end ; 0x196f51 diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index e760c3f99..4cebd46b6 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -9,13 +9,13 @@ MrPsychicsHouse_MapScriptHeader: ; 0x18a778 FishingGuruScript_0x18a77a: ; 0x18a77a faceplayer loadfont - checkbit1 EVENT_GOT_TM29_PSYCHIC + checkevent EVENT_GOT_TM29_PSYCHIC iftrue UnknownScript_0x18a78f 2writetext UnknownText_0x18a798 keeptextopen verbosegiveitem TM_29, 1 iffalse UnknownScript_0x18a793 - setbit1 EVENT_GOT_TM29_PSYCHIC + setevent EVENT_GOT_TM29_PSYCHIC UnknownScript_0x18a78f: ; 0x18a78f 2writetext UnknownText_0x18a7bb closetext diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index f11a8f429..537c074d1 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -17,13 +17,13 @@ PokefanFScript_0x5c005: ; 0x5c005 TeacherScript_0x5c008: ; 0x5c008 faceplayer loadfont - checkbit1 EVENT_GOT_QUICK_CLAW + checkevent EVENT_GOT_QUICK_CLAW iftrue UnknownScript_0x5c01d 2writetext UnknownText_0x5c265 keeptextopen verbosegiveitem QUICK_CLAW, 1 iffalse UnknownScript_0x5c021 - setbit1 EVENT_GOT_QUICK_CLAW + setevent EVENT_GOT_QUICK_CLAW UnknownScript_0x5c01d: ; 0x5c01d 2writetext UnknownText_0x5c30d closetext @@ -88,15 +88,15 @@ SchoolboyJack1Script: ; 0x5c04e writecode $17, $5 talkaftercancel loadfont - checkbit2 $0065 + checkflag $0065 iftrue UnknownScript_0x5c088 checkcellnum $5 iftrue UnknownScript_0x5c108 - checkbit1 $025f + checkevent $025f iftrue UnknownScript_0x5c071 2writetext UnknownText_0x5c4f3 keeptextopen - setbit1 $025f + setevent $025f 2call UnknownScript_0x5c0fc 2jump UnknownScript_0x5c074 ; 0x5c071 @@ -122,23 +122,23 @@ UnknownScript_0x5c088: ; 0x5c088 if_equal $1, UnknownScript_0x5c0b9 if_equal $0, UnknownScript_0x5c0bf UnknownScript_0x5c0a7: ; 0x5c0a7 - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x5c0f3 UnknownScript_0x5c0ad: ; 0x5c0ad - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x5c0e6 UnknownScript_0x5c0b3: ; 0x5c0b3 - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x5c0d9 UnknownScript_0x5c0b9: ; 0x5c0b9 - checkbit2 $0047 + checkflag $0047 iftrue UnknownScript_0x5c0cc UnknownScript_0x5c0bf: ; 0x5c0bf loadtrainer SCHOOLBOY, JACK1 startbattle returnafterbattle loadvar $d9f2, $1 - clearbit2 $0065 + clearflag $0065 end ; 0x5c0cc @@ -147,7 +147,7 @@ UnknownScript_0x5c0cc: ; 0x5c0cc startbattle returnafterbattle loadvar $d9f2, $2 - clearbit2 $0065 + clearflag $0065 end ; 0x5c0d9 @@ -156,7 +156,7 @@ UnknownScript_0x5c0d9: ; 0x5c0d9 startbattle returnafterbattle loadvar $d9f2, $3 - clearbit2 $0065 + clearflag $0065 end ; 0x5c0e6 @@ -165,7 +165,7 @@ UnknownScript_0x5c0e6: ; 0x5c0e6 startbattle returnafterbattle loadvar $d9f2, $4 - clearbit2 $0065 + clearflag $0065 end ; 0x5c0f3 @@ -173,7 +173,7 @@ UnknownScript_0x5c0f3: ; 0x5c0f3 loadtrainer SCHOOLBOY, JACK5 startbattle returnafterbattle - clearbit2 $0065 + clearflag $0065 end ; 0x5c0fc @@ -265,17 +265,17 @@ PokefanfBeverly1Script: ; 0x5c138 writecode $17, $6 talkaftercancel loadfont - checkbit2 $007d + checkflag $007d iftrue UnknownScript_0x5c177 checkcellnum $6 iftrue UnknownScript_0x5c19b checkpoke MARILL iffalse UnknownScript_0x5c189 - checkbit1 EVENT_SHOWED_BEVERLY_MARILL + checkevent EVENT_SHOWED_BEVERLY_MARILL iftrue UnknownScript_0x5c160 2writetext UnknownText_0x5c5bd keeptextopen - setbit1 EVENT_SHOWED_BEVERLY_MARILL + setevent EVENT_SHOWED_BEVERLY_MARILL 2call UnknownScript_0x5c18f 2jump UnknownScript_0x5c163 ; 0x5c160 @@ -295,7 +295,7 @@ UnknownScript_0x5c177: ; 0x5c177 2call UnknownScript_0x5c1a7 verbosegiveitem NUGGET, 1 iffalse UnknownScript_0x5c186 - clearbit2 $007d + clearflag $007d 2jump UnknownScript_0x5c19b ; 0x5c186 diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index e6e643abf..e53904e52 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -23,8 +23,8 @@ UnknownScript_0x1a800e: ; 0x1a800e ; 0x1a800f UnknownScript_0x1a800f: ; 0x1a800f - setbit2 $0041 - clearbit1 $0076 + setflag $0041 + clearevent $0076 return ; 0x1a8016 @@ -80,11 +80,11 @@ UnknownScript_0x1a8041: ; 0x1a8041 TeacherScript_0x1a806f: ; 0x1a806f faceplayer loadfont - checkbit1 EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST + checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST iftrue UnknownScript_0x1a8095 - checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM + checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x1a808f - checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM + checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue UnknownScript_0x1a8089 2writetext UnknownText_0x1a80f7 closetext diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 9a21e8935..21e2119ad 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -13,13 +13,13 @@ UnknownScript_0x19b3c7: ; 0x19b3c7 OakScript_0x19b3c8: ; 0x19b3c8 faceplayer loadfont - checkbit1 $074f + checkevent $074f iftrue UnknownScript_0x19b3ea - checkbit1 $00e1 + checkevent $00e1 iftrue UnknownScript_0x19b3dd 2writetext UnknownText_0x19b427 keeptextopen - setbit1 $00e1 + setevent $00e1 UnknownScript_0x19b3dd: ; 0x19b3dd checkcode $7 if_equal $10, UnknownScript_0x19b3f7 @@ -40,7 +40,7 @@ UnknownScript_0x19b3ea: ; 0x19b3ea UnknownScript_0x19b3f7: ; 0x19b3f7 2writetext UnknownText_0x19b4fc keeptextopen - setbit1 $074f + setevent $074f 2jump UnknownScript_0x19b3ea ; 0x19b401 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index e5c31f9f5..d1393498d 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -9,12 +9,12 @@ OlivineCafe_MapScriptHeader: ; 0x9c8bf SailorScript_0x9c8c1: ; 0x9c8c1 faceplayer loadfont - checkbit1 EVENT_GOT_HM04_STRENGTH + checkevent EVENT_GOT_HM04_STRENGTH iftrue UnknownScript_0x9c8d3 2writetext UnknownText_0x9c8df keeptextopen verbosegiveitem HM_04, 1 - setbit1 EVENT_GOT_HM04_STRENGTH + setevent EVENT_GOT_HM04_STRENGTH UnknownScript_0x9c8d3: ; 0x9c8d3 2writetext UnknownText_0x9c965 closetext diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 183e3288b..cb6d57db8 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -23,7 +23,7 @@ UnknownScript_0x1a882e: ; 0x1a882e ; 0x1a882f UnknownScript_0x1a882f: ; 0x1a882f - setbit2 $0047 + setflag $0047 return ; 0x1a8833 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 26d128460..f36b0562d 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -9,7 +9,7 @@ OlivineGoodRodHouse_MapScriptHeader: ; 0x9c719 FishingGuruScript_0x9c71b: ; 0x9c71b faceplayer loadfont - checkbit1 EVENT_GOT_GOOD_ROD + checkevent EVENT_GOT_GOOD_ROD iftrue UnknownScript_0x9c740 2writetext UnknownText_0x9c749 yesorno @@ -20,7 +20,7 @@ FishingGuruScript_0x9c71b: ; 0x9c71b 2writetext UnknownText_0x9c807 closetext loadmovesprites - setbit1 EVENT_GOT_GOOD_ROD + setevent EVENT_GOT_GOOD_ROD end ; 0x9c73a diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index df750359f..4c39123b0 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -9,7 +9,7 @@ OlivineGym_MapScriptHeader: ; 0x9c12d JasmineScript_0x9c12f: ; 0x9c12f faceplayer loadfont - checkbit1 EVENT_BEAT_JASMINE + checkevent EVENT_BEAT_JASMINE iftrue UnknownScript_0x9c159 2writetext UnknownText_0x9c1b9 closetext @@ -18,22 +18,22 @@ JasmineScript_0x9c12f: ; 0x9c12f loadtrainer JASMINE, 1 startbattle returnafterbattle - setbit1 EVENT_BEAT_JASMINE + setevent EVENT_BEAT_JASMINE loadfont 2writetext UnknownText_0x9c33a playsound $009c waitbutton - setbit2 $001f + setflag $001f checkcode $7 2call UnknownScript_0x9c178 UnknownScript_0x9c159: ; 0x9c159 - checkbit1 EVENT_GOT_TM23_IRON_TAIL + checkevent EVENT_GOT_TM23_IRON_TAIL iftrue UnknownScript_0x9c172 2writetext UnknownText_0x9c354 keeptextopen verbosegiveitem TM_23, 1 iffalse UnknownScript_0x9c176 - setbit1 EVENT_GOT_TM23_IRON_TAIL + setevent EVENT_GOT_TM23_IRON_TAIL 2writetext UnknownText_0x9c3a5 closetext loadmovesprites @@ -64,9 +64,9 @@ UnknownScript_0x9c184: ; 0x9c184 OlivineGymGuyScript: ; 0x9c187 faceplayer - checkbit1 EVENT_BEAT_JASMINE + checkevent EVENT_BEAT_JASMINE iftrue .OlivineGymGuyWinScript - checkbit1 EVENT_JASMINE_RETURNED_TO_GYM + checkevent EVENT_JASMINE_RETURNED_TO_GYM iffalse .OlivineGymGuyPreScript loadfont 2writetext OlivineGymGuyText @@ -92,7 +92,7 @@ OlivineGymGuyScript: ; 0x9c187 ; 0x9c1a9 MapOlivineGymSignpost1Script: ; 0x9c1a9 - checkbit2 $001f + checkflag $001f iftrue UnknownScript_0x9c1b2 jumpstd $002d ; 0x9c1b2 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index defcbb4d6..449989dfd 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -59,13 +59,13 @@ SailorHuey1Script: ; 0x5af91 writecode $17, $7 talkaftercancel loadfont - checkbit2 $0066 + checkflag $0066 iftrue UnknownScript_0x5afc7 checkcellnum $7 iftrue UnknownScript_0x5b05f - checkbit1 $0263 + checkevent $0263 iftrue UnknownScript_0x5afb0 - setbit1 $0263 + setevent $0263 2call UnknownScript_0x5b053 2jump UnknownScript_0x5afb3 ; 0x5afb0 @@ -90,20 +90,20 @@ UnknownScript_0x5afc7: ; 0x5afc7 if_equal $1, UnknownScript_0x5afee if_equal $0, UnknownScript_0x5aff4 UnknownScript_0x5afe2: ; 0x5afe2 - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x5b01b UnknownScript_0x5afe8: ; 0x5afe8 - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x5b00e UnknownScript_0x5afee: ; 0x5afee - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x5b001 UnknownScript_0x5aff4: ; 0x5aff4 loadtrainer SAILOR, HUEY1 startbattle returnafterbattle loadvar $d9f4, $1 - clearbit2 $0066 + clearflag $0066 end ; 0x5b001 @@ -112,7 +112,7 @@ UnknownScript_0x5b001: ; 0x5b001 startbattle returnafterbattle loadvar $d9f4, $2 - clearbit2 $0066 + clearflag $0066 end ; 0x5b00e @@ -121,7 +121,7 @@ UnknownScript_0x5b00e: ; 0x5b00e startbattle returnafterbattle loadvar $d9f4, $3 - clearbit2 $0066 + clearflag $0066 end ; 0x5b01b @@ -129,15 +129,15 @@ UnknownScript_0x5b01b: ; 0x5b01b loadtrainer SAILOR, HUEY4 startbattle returnafterbattle - clearbit2 $0066 - checkbit1 EVENT_HUEY_PROTEIN + clearflag $0066 + checkevent EVENT_HUEY_PROTEIN iftrue UnknownScript_0x5b03f - checkbit1 $0265 + checkevent $0265 iftrue UnknownScript_0x5b03e 2call UnknownScript_0x5b076 verbosegiveitem PROTEIN, 1 iffalse UnknownScript_0x5b06f - setbit1 $0265 + setevent $0265 2jump UnknownScript_0x5b05f ; 0x5b03e @@ -151,8 +151,8 @@ UnknownScript_0x5b03f: ; 0x5b03f closetext verbosegiveitem PROTEIN, 1 iffalse UnknownScript_0x5b06f - clearbit1 EVENT_HUEY_PROTEIN - setbit1 $0265 + clearevent EVENT_HUEY_PROTEIN + setevent $0265 2jump UnknownScript_0x5b05f ; 0x5b053 @@ -192,7 +192,7 @@ UnknownScript_0x5b06b: ; 0x5b06b ; 0x5b06f UnknownScript_0x5b06f: ; 0x5b06f - setbit1 EVENT_HUEY_PROTEIN + setevent EVENT_HUEY_PROTEIN jumpstd $0021 end ; 0x5b076 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 6ecb4230d..562c2ed08 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -11,11 +11,11 @@ JasmineScript_0x60b91: ; 0x60b91 loadfont checkitem SECRETPOTION iftrue UnknownScript_0x60bab - checkbit1 $0037 + checkevent $0037 iftrue UnknownScript_0x60ba5 2writetext UnknownText_0x60c81 keeptextopen - setbit1 $0037 + setevent $0037 UnknownScript_0x60ba5: ; 0x60ba5 2writetext UnknownText_0x60d64 closetext @@ -64,8 +64,8 @@ UnknownScript_0x60bab: ; 0x60bab 2writetext UnknownText_0x60e6c closetext loadmovesprites - setbit1 EVENT_JASMINE_RETURNED_TO_GYM - clearbit1 $06d3 + setevent EVENT_JASMINE_RETURNED_TO_GYM + clearevent $06d3 checkcode $9 if_equal $0, UnknownScript_0x60c17 if_equal $3, UnknownScript_0x60c1e @@ -107,7 +107,7 @@ UnknownScript_0x60c39: ; 0x60c39 MonsterScript_0x60c3a: ; 0x60c3a faceplayer loadfont - checkbit1 EVENT_JASMINE_RETURNED_TO_GYM + checkevent EVENT_JASMINE_RETURNED_TO_GYM iftrue UnknownScript_0x60c51 2writetext UnknownText_0x60f03 writebyte AMPHAROS diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 6819babd3..ef24e1fbc 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -23,7 +23,7 @@ UnknownScript_0x748b1: ; 0x748b1 applymovement $0, MovementData_0x74a32 appear $2 dotrigger $0 - setbit1 $0000 + setevent $0000 blackoutmod GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY end ; 0x748c0 @@ -31,7 +31,7 @@ UnknownScript_0x748b1: ; 0x748b1 SailorScript_0x748c0: ; 0x748c0 faceplayer loadfont - checkbit1 $0000 + checkevent $0000 iftrue UnknownScript_0x74919 2writetext UnknownText_0x74a55 closetext @@ -45,21 +45,21 @@ SailorScript_0x748c0: ; 0x748c0 playsound $0023 special $002e waitbutton - checkbit1 $0030 + checkevent $0030 iffalse UnknownScript_0x7490a - clearbit1 $073a - setbit1 $073b - clearbit1 EVENT_BEAT_COOLTRAINERM_SEAN - clearbit1 EVENT_BEAT_COOLTRAINERF_CAROL - clearbit1 EVENT_BEAT_GENTLEMAN_EDWARD - clearbit1 EVENT_BEAT_BEAUTY_CASSIE - clearbit1 EVENT_BEAT_PSYCHIC_RODNEY - clearbit1 EVENT_BEAT_SUPER_NERD_SHAWN - clearbit1 EVENT_BEAT_SAILOR_GARRETT - clearbit1 EVENT_BEAT_FISHER_JONAH - clearbit1 EVENT_BEAT_BLACKBELT_WAI + clearevent $073a + setevent $073b + clearevent EVENT_BEAT_COOLTRAINERM_SEAN + clearevent EVENT_BEAT_COOLTRAINERF_CAROL + clearevent EVENT_BEAT_GENTLEMAN_EDWARD + clearevent EVENT_BEAT_BEAUTY_CASSIE + clearevent EVENT_BEAT_PSYCHIC_RODNEY + clearevent EVENT_BEAT_SUPER_NERD_SHAWN + clearevent EVENT_BEAT_SAILOR_GARRETT + clearevent EVENT_BEAT_FISHER_JONAH + clearevent EVENT_BEAT_BLACKBELT_WAI UnknownScript_0x7490a: ; 0x7490a - clearbit1 $002f + clearevent $002f appear $2 domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $1 warp GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $19, $1 @@ -75,13 +75,13 @@ UnknownScript_0x74919: ; 0x74919 UnknownScript_0x7491f: ; 0x7491f spriteface $4, $3 - checkbit1 $0000 + checkevent $0000 iftrue UnknownScript_0x7498b - checkbit1 $0001 + checkevent $0001 iftrue UnknownScript_0x7498b spriteface $0, $2 loadfont - checkbit1 $0030 + checkevent $0030 iffalse UnknownScript_0x7494e checkcode $b if_equal SUNDAY, UnknownScript_0x74977 @@ -100,7 +100,7 @@ UnknownScript_0x7494e: ; 0x7494e 2writetext UnknownText_0x74b11 closetext loadmovesprites - setbit1 $0001 + setevent $0001 applymovement $0, MovementData_0x74a37 2jump SailorScript_0x748c0 ; 0x7496d @@ -151,9 +151,9 @@ UnknownScript_0x74992: ; 0x74992 SailorScript_0x7499c: ; 0x7499c faceplayer loadfont - checkbit1 $0000 + checkevent $0000 iftrue UnknownScript_0x74919 - checkbit1 $0030 + checkevent $0030 iffalse UnknownScript_0x749c0 checkcode $b if_equal SUNDAY, UnknownScript_0x749f2 @@ -172,7 +172,7 @@ UnknownScript_0x749c0: ; 0x749c0 2writetext UnknownText_0x74b11 closetext loadmovesprites - setbit1 $0001 + setevent $0001 checkcode $9 if_equal $3, UnknownScript_0x749e5 applymovement $0, MovementData_0x74a3f diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index bf1bfc539..d6a564ce7 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -11,7 +11,7 @@ PalletTown_MapScriptHeader: ; 0x1ac6cc ; 0x1ac6d1 UnknownScript_0x1ac6d1: ; 0x1ac6d1 - setbit2 $0035 + setflag $0035 return ; 0x1ac6d5 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 5f41c2a05..4cd40909c 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -11,7 +11,7 @@ PewterCity_MapScriptHeader: ; 0x18c000 ; 0x18c005 UnknownScript_0x18c005: ; 0x18c005 - setbit2 $0037 + setflag $0037 return ; 0x18c009 @@ -26,12 +26,12 @@ BugCatcherScript_0x18c00c: ; 0x18c00c GrampsScript_0x18c00f: ; 0x18c00f faceplayer loadfont - checkbit1 EVENT_GOT_SILVER_WING + checkevent EVENT_GOT_SILVER_WING iftrue UnknownScript_0x18c023 2writetext UnknownText_0x18c0c6 keeptextopen verbosegiveitem SILVER_WING, 1 - setbit1 EVENT_GOT_SILVER_WING + setevent EVENT_GOT_SILVER_WING loadmovesprites end ; 0x18c023 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 427a77195..1c7213313 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -9,7 +9,7 @@ PewterGym_MapScriptHeader: ; 0x1a2862 BrockScript_0x1a2864: ; 0x1a2864 faceplayer loadfont - checkbit2 $0023 + checkflag $0023 iftrue UnknownScript_0x1a2892 2writetext UnknownText_0x1a28d0 closetext @@ -18,13 +18,13 @@ BrockScript_0x1a2864: ; 0x1a2864 loadtrainer BROCK, 1 startbattle returnafterbattle - setbit1 EVENT_BEAT_BROCK - setbit1 EVENT_BEAT_CAMPER_JERRY + setevent EVENT_BEAT_BROCK + setevent EVENT_BEAT_CAMPER_JERRY loadfont 2writetext UnknownText_0x1a2a3d playsound $009c waitbutton - setbit2 $0023 + setflag $0023 2writetext UnknownText_0x1a2a57 closetext loadmovesprites @@ -70,7 +70,7 @@ CamperJerryScript: ; 0x1a28a4 PewterGymGuyScript: ; 0x1a28ac faceplayer loadfont - checkbit1 EVENT_BEAT_BROCK + checkevent EVENT_BEAT_BROCK iftrue .PewterGymGuyWinScript 2writetext PewterGymGuyText closetext @@ -85,7 +85,7 @@ PewterGymGuyScript: ; 0x1a28ac ; 0x1a28c0 MapPewterGymSignpost1Script: ; 0x1a28c0 - checkbit2 $0023 + checkflag $0023 iftrue UnknownScript_0x1a28c9 jumpstd $002d ; 0x1a28c9 diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 6f9503fb6..9a5f2a5e3 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -17,8 +17,8 @@ PokeCenter2F_MapScriptHeader: ; 0x192845 UnknownScript_0x19285f: ; 0x19285f special $0011 if_equal $0, UnknownScript_0x192872 - clearbit1 $0711 - checkbit1 $0001 + clearevent $0711 + checkevent $0001 iftrue UnknownScript_0x192872 priorityjump UnknownScript_0x192887 ; 0x192872 @@ -54,7 +54,7 @@ UnknownScript_0x192883: ; 0x192883 UnknownScript_0x192887: ; 0x192887 appear $5 - setbit1 $0001 + setevent $0001 end ; 0x19288d @@ -77,7 +77,7 @@ UnknownScript_0x192895: ; 0x192895 ; 0x19289d LinkReceptionistScript_0x19289d: ; 0x19289d - checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM + checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iffalse UnknownScript_0x19288d loadfont 2writetext UnknownText_0x192e3a @@ -190,7 +190,7 @@ UnknownScript_0x19294a: ; 0x19294a ; 0x192952 LinkReceptionistScript_0x192952: ; 0x192952 - checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM + checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iffalse UnknownScript_0x192895 loadfont 2writetext UnknownText_0x192de0 @@ -331,9 +331,9 @@ UnknownScript_0x192a25: ; 0x192a25 ; 0x192a2d LinkReceptionistScript_0x192a2d: ; 0x192a2d - checkbit1 $0712 + checkevent $0712 iftrue UnknownScript_0x192a25 - checkbit2 $0053 + checkflag $0053 iftrue UnknownScript_0x192a25 special $000a faceplayer @@ -460,7 +460,7 @@ UnknownScript_0x192af7: ; 0x192af7 ; 0x192b04 UnknownScript_0x192b04: ; 0x192b04 - checkbit2 $0063 + checkflag $0063 iftrue UnknownScript_0x192b12 applymovement2 MovementData_0x192cca applymovement $0, MovementData_0x192cde @@ -485,7 +485,7 @@ UnknownScript_0x192b12: ; 0x192b12 writebyte $80 special $0098 applymovement $0, MovementData_0x192d1c - setbit2 $009f + setflag $009f special $0038 loadfont 2writetext UnknownText_0x19329a @@ -497,7 +497,7 @@ UnknownScript_0x192b12: ; 0x192b12 ; 0x192b50 UnknownScript_0x192b50: ; 0x192b50 - checkbit2 $009f + checkflag $009f iftrue UnknownScript_0x192b63 applymovement $2, MovementData_0x192d04 applymovement $0, MovementData_0x192cf5 @@ -508,7 +508,7 @@ UnknownScript_0x192b50: ; 0x192b50 UnknownScript_0x192b63: ; 0x192b63 applymovement $2, MovementData_0x192d04 applymovement $0, MovementData_0x192d28 - clearbit2 $009f + clearflag $009f playsound $00ca applymovement $0, MovementData_0x192d17 writebyte $90 @@ -521,7 +521,7 @@ UnknownScript_0x192b63: ; 0x192b63 ; 0x192b8a UnknownScript_0x192b8a: ; 0x192b8a - checkbit2 $009f + checkflag $009f iftrue UnknownScript_0x192b9d applymovement $3, MovementData_0x192d04 applymovement $0, MovementData_0x192cf5 @@ -532,7 +532,7 @@ UnknownScript_0x192b8a: ; 0x192b8a UnknownScript_0x192b9d: ; 0x192b9d applymovement $3, MovementData_0x192d04 applymovement $0, MovementData_0x192d28 - clearbit2 $009f + clearflag $009f playsound $00ca applymovement $0, MovementData_0x192d17 writebyte $90 @@ -545,7 +545,7 @@ UnknownScript_0x192b9d: ; 0x192b9d ; 0x192bc4 UnknownScript_0x192bc4: ; 0x192bc4 - checkbit2 $0063 + checkflag $0063 iftrue UnknownScript_0x192bec checkcode $9 if_equal $2, UnknownScript_0x192bdc @@ -604,7 +604,7 @@ UnknownScript_0x192c20: ; 0x192c20 special $0098 applymovement $0, MovementData_0x192d22 faceperson $0, $4 - setbit2 $009f + setflag $009f special $0038 loadfont 2writetext UnknownText_0x19329a @@ -617,7 +617,7 @@ UnknownScript_0x192c20: ; 0x192c20 UnknownScript_0x192c4e: ; 0x192c4e special $0008 - checkbit2 $009f + checkflag $009f iftrue UnknownScript_0x192c66 applymovement $4, MovementData_0x192d08 applymovement $0, MovementData_0x192cf9 @@ -628,7 +628,7 @@ UnknownScript_0x192c4e: ; 0x192c4e UnknownScript_0x192c66: ; 0x192c66 applymovement $4, MovementData_0x192d08 applymovement $0, MovementData_0x192cfc - clearbit2 $009f + clearflag $009f playsound $00ca applymovement $0, MovementData_0x192d17 writebyte $90 @@ -653,7 +653,7 @@ MapPokeCenter2FSignpost0Script: ; 0x192c93 OfficerScript_0x192c9a: ; 0x192c9a faceplayer loadfont - checkbit1 $0711 + checkevent $0711 iftrue UnknownScript_0x192cb8 2writetext UnknownText_0x193190 yesorno @@ -664,7 +664,7 @@ OfficerScript_0x192c9a: ; 0x192c9a special $0012 iffalse UnknownScript_0x192cbe itemnotify - setbit1 $0711 + setevent $0711 UnknownScript_0x192cb8: ; 0x192cb8 2writetext UnknownText_0x1931d2 closetext diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index f2b4e8b62..d8c919faf 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -9,9 +9,9 @@ PokemonFanClub_MapScriptHeader: ; 0x1917e7 GentlemanScript_0x1917e9: ; 0x1917e9 faceplayer loadfont - checkbit1 EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT + checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT iftrue UnknownScript_0x191815 - checkbit1 EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL + checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL iftrue UnknownScript_0x191802 2writetext UnknownText_0x191881 yesorno @@ -23,7 +23,7 @@ UnknownScript_0x191802: ; 0x191802 keeptextopen verbosegiveitem RARE_CANDY, 1 iffalse UnknownScript_0x19181f - setbit1 EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT + setevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT 2writetext UnknownText_0x191a72 closetext loadmovesprites @@ -52,9 +52,9 @@ ReceptionistScript_0x191821: ; 0x191821 FisherScript_0x191824: ; 0x191824 faceplayer loadfont - checkbit1 EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB + checkevent EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB iftrue UnknownScript_0x19185f - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x191838 2writetext UnknownText_0x191ba0 closetext @@ -64,7 +64,7 @@ FisherScript_0x191824: ; 0x191824 UnknownScript_0x191838: ; 0x191838 2writetext UnknownText_0x191bff - checkbit1 EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM + checkevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM iftrue UnknownScript_0x191844 closetext loadmovesprites @@ -83,7 +83,7 @@ UnknownScript_0x191844: ; 0x191844 playsound $0091 waitbutton itemnotify - setbit1 EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB + setevent EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB loadmovesprites end ; 0x19185f diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 9247de7a8..6989589ca 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -45,9 +45,9 @@ UnknownScript_0x188dc5: ; 0x188dc5 OfficerScript_0x188df5: ; 0x188df5 faceplayer loadfont - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e0f - checkbit1 EVENT_MET_MANAGER_AT_POWER_PLANT + checkevent EVENT_MET_MANAGER_AT_POWER_PLANT iftrue UnknownScript_0x188e09 2writetext UnknownText_0x188ee0 closetext @@ -72,7 +72,7 @@ UnknownScript_0x188e0f: ; 0x188e0f GymGuyScript_0x188e15: ; 0x188e15 faceplayer loadfont - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e23 2writetext UnknownText_0x188fcf closetext @@ -90,7 +90,7 @@ UnknownScript_0x188e23: ; 0x188e23 GymGuyScript_0x188e29: ; 0x188e29 faceplayer loadfont - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e37 2writetext UnknownText_0x189079 closetext @@ -108,7 +108,7 @@ UnknownScript_0x188e37: ; 0x188e37 OfficerScript_0x188e3d: ; 0x188e3d faceplayer loadfont - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e4b 2writetext UnknownText_0x18910e closetext @@ -126,7 +126,7 @@ UnknownScript_0x188e4b: ; 0x188e4b GymGuyScript_0x188e51: ; 0x188e51 faceplayer loadfont - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e5f 2writetext UnknownText_0x1891c2 closetext @@ -144,18 +144,18 @@ UnknownScript_0x188e5f: ; 0x188e5f FisherScript_0x188e65: ; 0x188e65 faceplayer loadfont - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188eac checkitem MACHINE_PART iftrue UnknownScript_0x188e93 - checkbit1 EVENT_MET_MANAGER_AT_POWER_PLANT + checkevent EVENT_MET_MANAGER_AT_POWER_PLANT iftrue UnknownScript_0x188e8d 2writetext UnknownText_0x189264 closetext loadmovesprites - setbit1 EVENT_MET_MANAGER_AT_POWER_PLANT - clearbit1 $076d - clearbit1 EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM + setevent EVENT_MET_MANAGER_AT_POWER_PLANT + clearevent $076d + clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM domaptrigger GROUP_CERULEAN_GYM, MAP_CERULEAN_GYM, $1 dotrigger $1 end @@ -172,20 +172,20 @@ UnknownScript_0x188e93: ; 0x188e93 2writetext UnknownText_0x18936e keeptextopen takeitem MACHINE_PART, 1 - setbit1 EVENT_RETURNED_MACHINE_PART - clearbit1 $0772 - setbit1 $0771 - setbit1 $076c - setbit1 EVENT_RESTORED_POWER_TO_KANTO - clearbit1 $0749 + setevent EVENT_RETURNED_MACHINE_PART + clearevent $0772 + setevent $0771 + setevent $076c + setevent EVENT_RESTORED_POWER_TO_KANTO + clearevent $0749 UnknownScript_0x188eac: ; 0x188eac - checkbit1 EVENT_GOT_TM07_ZAP_CANNON + checkevent EVENT_GOT_TM07_ZAP_CANNON iftrue UnknownScript_0x188ec5 2writetext UnknownText_0x1893c4 keeptextopen verbosegiveitem TM_07, 1 iffalse UnknownScript_0x188ec3 - setbit1 EVENT_GOT_TM07_ZAP_CANNON + setevent EVENT_GOT_TM07_ZAP_CANNON 2writetext UnknownText_0x1893f4 closetext UnknownScript_0x188ec3: ; 0x188ec3 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index ab26e2ca7..15d608441 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -9,7 +9,7 @@ RadioTower1F_MapScriptHeader: ; 0x5cd27 ReceptionistScript_0x5cd29: ; 0x5cd29 faceplayer loadfont - checkbit2 $0013 + checkflag $0013 iftrue UnknownScript_0x5cd37 2writetext UnknownText_0x5ce77 closetext @@ -34,7 +34,7 @@ GentlemanScript_0x5cd3d: ; 0x5cd3d special $0054 UnknownScript_0x5cd4c: ; 0x5cd4c special $0055 - checkbit2 $004e + checkflag $004e iftrue UnknownScript_0x5cd84 2writetext UnknownText_0x5cf3a keeptextopen @@ -73,7 +73,7 @@ UnknownScript_0x5cd8a: ; 0x5cd8a giveitem MASTER_BALL, $1 iffalse UnknownScript_0x5cdcf itemnotify - setbit2 $004e + setflag $004e 2jump UnknownScript_0x5cd84 ; 0x5cd9f @@ -85,7 +85,7 @@ UnknownScript_0x5cd9f: ; 0x5cd9f giveitem EXP_SHARE, $1 iffalse UnknownScript_0x5cdcf itemnotify - setbit2 $004e + setflag $004e 2jump UnknownScript_0x5cd84 ; 0x5cdb4 @@ -97,7 +97,7 @@ UnknownScript_0x5cdb4: ; 0x5cdb4 giveitem PP_UP, $1 iffalse UnknownScript_0x5cdcf itemnotify - setbit2 $004e + setflag $004e 2jump UnknownScript_0x5cd84 ; 0x5cdc9 @@ -118,7 +118,7 @@ UnknownScript_0x5cdcf: ; 0x5cdcf CooltrainerFScript_0x5cdd5: ; 0x5cdd5 faceplayer loadfont - checkbit2 $0000 + checkflag $0000 iftrue UnknownScript_0x5ce2d 2writetext UnknownText_0x5d12d yesorno @@ -154,7 +154,7 @@ CooltrainerFScript_0x5cdd5: ; 0x5cdd5 2call UnknownScript_0x5ce3e 2writetext UnknownText_0x5d3c0 keeptextopen - setbit2 $0000 + setflag $0000 UnknownScript_0x5ce2d: ; 0x5ce2d 2writetext UnknownText_0x5d3e5 closetext 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 diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 6037234c6..cff5376cc 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -11,7 +11,7 @@ RadioTower3F_MapScriptHeader: ; 0x5e53e ; 0x5e543 UnknownScript_0x5e543: ; 0x5e543 - checkbit1 EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER + checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue UnknownScript_0x5e54a return ; 0x5e54a @@ -29,7 +29,7 @@ SuperNerdScript_0x5e553: ; 0x5e553 GymGuyScript_0x5e556: ; 0x5e556 faceplayer loadfont - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x5e564 2writetext UnknownText_0x5e682 closetext @@ -47,11 +47,11 @@ UnknownScript_0x5e564: ; 0x5e564 CooltrainerFScript_0x5e56a: ; 0x5e56a faceplayer loadfont - checkbit1 EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER + checkevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER iftrue UnknownScript_0x5e59d - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x5e58a - checkbit1 EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER + checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue UnknownScript_0x5e584 2writetext UnknownText_0x5e754 closetext @@ -74,7 +74,7 @@ UnknownScript_0x5e58a: ; 0x5e58a 2writetext UnknownText_0x5e821 closetext loadmovesprites - setbit1 EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER + setevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER end ; 0x5e59d @@ -206,7 +206,7 @@ MapRadioTower3FSignpost2Script: ; 0x5e5f3 loadfont 2writetext UnknownText_0x5eaa4 closetext - checkbit1 EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER + checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue UnknownScript_0x5e603 checkitem CARD_KEY iftrue UnknownScript_0x5e605 @@ -218,7 +218,7 @@ UnknownScript_0x5e603: ; 0x5e603 UnknownScript_0x5e605: ; 0x5e605 2writetext UnknownText_0x5eabc closetext - setbit1 EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER + setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER playsound $001f changeblock $e, $2, $2a changeblock $e, $4, $1 diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 5300c23b2..6d08a0258 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -13,9 +13,9 @@ FisherScript_0x5eb82: ; 0x5eb82 TeacherScript_0x5eb85: ; 0x5eb85 faceplayer loadfont - checkbit1 EVENT_GOT_PINK_BOW_FROM_MARY + checkevent EVENT_GOT_PINK_BOW_FROM_MARY iftrue UnknownScript_0x5ebac - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x5eb99 2writetext UnknownText_0x5ec68 closetext @@ -31,7 +31,7 @@ UnknownScript_0x5eb99: ; 0x5eb99 2writetext UnknownText_0x5ecef closetext loadmovesprites - setbit1 EVENT_GOT_PINK_BOW_FROM_MARY + setevent EVENT_GOT_PINK_BOW_FROM_MARY end ; 0x5ebac diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 4f0588598..07e3a07be 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -47,14 +47,14 @@ UnknownScript_0x60011: ; 0x60011 verbosegiveitem BASEMENT_KEY, 1 loadmovesprites dotrigger $1 - setbit1 $0573 + setevent $0573 end ; 0x60046 GentlemanScript_0x60046: ; 0x60046 faceplayer loadfont - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x60054 2writetext UnknownText_0x60246 closetext @@ -121,18 +121,18 @@ UnknownScript_0x6006e: ; 0x6006e disappear $4 pause 15 special $0032 - setbit1 $0571 - setbit1 EVENT_CLEARED_RADIO_TOWER - clearbit2 $0013 - setbit1 $06cc - setbit1 $06cd - setbit1 $06ce - clearbit1 $0736 - clearbit2 $0017 - clearbit1 $06cf - clearbit1 $06d0 - setbit1 $06e3 - clearbit1 $06e4 + setevent $0571 + setevent EVENT_CLEARED_RADIO_TOWER + clearflag $0013 + setevent $06cc + setevent $06cd + setevent $06ce + clearevent $0736 + clearflag $0017 + clearevent $06cf + clearevent $06d0 + setevent $06e3 + clearevent $06e4 special $003c disappear $2 moveperson $2, $c, $0 @@ -148,8 +148,8 @@ UnknownScript_0x6006e: ; 0x6006e loadmovesprites dotrigger $2 domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $0 - setbit1 EVENT_GOT_CLEAR_BELL - setbit1 $0761 + setevent EVENT_GOT_CLEAR_BELL + setevent $0761 2jump UnknownScript_0x600f1 ; 0x600f1 diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 266fbb3c7..3384ac523 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -16,12 +16,12 @@ UnknownScript_0x19aea2: ; 0x19aea2 RedsMomScript_0x19aea3: ; 0x19aea3 faceplayer loadfont - checkbit1 EVENT_MET_REDS_MOM + checkevent EVENT_MET_REDS_MOM iftrue UnknownScript_0x19aeb4 2writetext UnknownText_0x19aec0 closetext loadmovesprites - setbit1 EVENT_MET_REDS_MOM + setevent EVENT_MET_REDS_MOM end ; 0x19aeb4 diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm index c44e702b5..51fb17c8b 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10PokeCenter1F.asm @@ -17,7 +17,7 @@ GentlemanScript_0x188bd7: ; 0x188bd7 GymGuyScript_0x188bda: ; 0x188bda faceplayer loadfont - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188be8 2writetext UnknownText_0x188c26 closetext diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 33df4505a..98cb312af 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -9,7 +9,7 @@ Route12SuperRodHouse_MapScriptHeader: ; 0x7f482 FishingGuruScript_0x7f484: ; 0x7f484 faceplayer loadfont - checkbit1 EVENT_GOT_SUPER_ROD + checkevent EVENT_GOT_SUPER_ROD iftrue UnknownScript_0x7f4a0 2writetext UnknownText_0x7f4af yesorno @@ -18,7 +18,7 @@ FishingGuruScript_0x7f484: ; 0x7f484 keeptextopen verbosegiveitem SUPER_ROD, 1 iffalse UnknownScript_0x7f4aa - setbit1 EVENT_GOT_SUPER_ROD + setevent EVENT_GOT_SUPER_ROD UnknownScript_0x7f4a0: ; 0x7f4a0 2writetext UnknownText_0x7f57c closetext diff --git a/maps/Route16.asm b/maps/Route16.asm index 0478953ec..6116c0c6d 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -12,15 +12,15 @@ Route16_MapScriptHeader: ; 0x1ad313 UnknownScript_0x1ad318: ; 0x1ad318 checkcode $13 - if_greater_than $5, UnknownScript_0x1ad328 + if_less_than $5, UnknownScript_0x1ad328 checkcode $12 - if_less_than $d, UnknownScript_0x1ad328 - setbit2 $0019 + if_greater_than $d, UnknownScript_0x1ad328 + setflag $0019 return ; 0x1ad328 UnknownScript_0x1ad328: ; 0x1ad328 - clearbit2 $0019 + clearflag $0019 return ; 0x1ad32c diff --git a/maps/Route17.asm b/maps/Route17.asm index 8c7e001a9..9dac5d238 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -11,8 +11,8 @@ Route17_MapScriptHeader: ; 0x1ad0a6 ; 0x1ad0ab UnknownScript_0x1ad0ab: ; 0x1ad0ab - setbit2 $0019 - setbit2 $001a + setflag $0019 + setflag $001a return ; 0x1ad0b2 diff --git a/maps/Route19.asm b/maps/Route19.asm index 304a4a029..107632221 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -11,7 +11,7 @@ Route19_MapScriptHeader: ; 0x19e9d9 ; 0x19e9de UnknownScript_0x19e9de: ; 0x19e9de - checkbit1 $00d7 + checkevent $00d7 iftrue UnknownScript_0x19e9fc changeblock $6, $6, $7a changeblock $8, $6, $7a @@ -142,7 +142,7 @@ SwimmermTuckerScript: ; 0x19ea45 FisherScript_0x19ea4d: ; 0x19ea4d faceplayer loadfont - checkbit1 $00d7 + checkevent $00d7 iftrue UnknownScript_0x19ea5b 2writetext UnknownText_0x19ecaf closetext @@ -160,7 +160,7 @@ UnknownScript_0x19ea5b: ; 0x19ea5b FisherScript_0x19ea61: ; 0x19ea61 faceplayer loadfont - checkbit1 $00d7 + checkevent $00d7 iftrue UnknownScript_0x19ea6f 2writetext UnknownText_0x19ed45 closetext diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index acb1fc761..d784cd8a2 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -9,7 +9,7 @@ Route19FuchsiaGate_MapScriptHeader: ; 0x1ab3f4 OfficerScript_0x1ab3f6: ; 0x1ab3f6 faceplayer loadfont - checkbit1 $00d7 + checkevent $00d7 iftrue UnknownScript_0x1ab404 2writetext UnknownText_0x1ab40a closetext diff --git a/maps/Route20.asm b/maps/Route20.asm index 74ac03422..b9b80c7cc 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -11,7 +11,7 @@ Route20_MapScriptHeader: ; 0x1acd20 ; 0x1acd25 UnknownScript_0x1acd25: ; 0x1acd25 - setbit1 $00d7 + setevent $00d7 return ; 0x1acd29 diff --git a/maps/Route23.asm b/maps/Route23.asm index 8bf50fb28..518537f82 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -11,7 +11,7 @@ Route23_MapScriptHeader: ; 0x1ae52e ; 0x1ae533 UnknownScript_0x1ae533: ; 0x1ae533 - setbit2 $0040 + setflag $0040 return ; 0x1ae537 diff --git a/maps/Route25.asm b/maps/Route25.asm index 9aa6a9a6e..bdf40c419 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -39,7 +39,7 @@ UnknownScript_0x19eea0: ; 0x19eea0 spriteface $0, $2 applymovement $2, MovementData_0x19f000 disappear $2 - clearbit1 $076f + clearevent $076f dotrigger $0 special $003d end @@ -66,7 +66,7 @@ UnknownScript_0x19eee0: ; 0x19eee0 spriteface $0, $2 applymovement $2, MovementData_0x19f000 disappear $2 - clearbit1 $076f + clearevent $076f dotrigger $0 special $003d end @@ -278,15 +278,15 @@ SupernerdPatScript: ; 0x19efa4 CooltrainerMScript_0x19efac: ; 0x19efac faceplayer loadfont - checkbit1 $0558 + checkevent $0558 iftrue UnknownScript_0x19efda - checkbit1 EVENT_CLEARED_NUGGET_BRIDGE + checkevent EVENT_CLEARED_NUGGET_BRIDGE iftrue UnknownScript_0x19efc7 2writetext UnknownText_0x19f43b keeptextopen verbosegiveitem NUGGET, 1 iffalse UnknownScript_0x19efde - setbit1 EVENT_CLEARED_NUGGET_BRIDGE + setevent EVENT_CLEARED_NUGGET_BRIDGE UnknownScript_0x19efc7: ; 0x19efc7 2writetext UnknownText_0x19f49d closetext @@ -295,7 +295,7 @@ UnknownScript_0x19efc7: ; 0x19efc7 loadtrainer COOLTRAINERM, KEVIN startbattle returnafterbattle - setbit1 $0558 + setevent $0558 loadfont UnknownScript_0x19efda: ; 0x19efda 2writetext UnknownText_0x19f520 diff --git a/maps/Route26.asm b/maps/Route26.asm index 29df4ac92..582785c69 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -59,15 +59,15 @@ CooltrainermGaven3Script: ; 0x1a4d3f writecode $17, $b talkaftercancel loadfont - checkbit2 $0067 + checkflag $0067 iftrue UnknownScript_0x1a4d79 checkcellnum $b iftrue UnknownScript_0x1a4dcb - checkbit1 $026b + checkevent $026b iftrue UnknownScript_0x1a4d62 2writetext UnknownText_0x1a4fe4 keeptextopen - setbit1 $026b + setevent $026b 2call UnknownScript_0x1a4dbf 2jump UnknownScript_0x1a4d65 ; 0x1a4d62 @@ -91,17 +91,17 @@ UnknownScript_0x1a4d79: ; 0x1a4d79 if_equal $1, UnknownScript_0x1a4d96 if_equal $0, UnknownScript_0x1a4d9c UnknownScript_0x1a4d90: ; 0x1a4d90 - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a4db6 UnknownScript_0x1a4d96: ; 0x1a4d96 - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x1a4da9 UnknownScript_0x1a4d9c: ; 0x1a4d9c loadtrainer COOLTRAINERM, GAVEN3 startbattle returnafterbattle loadvar $d9f5, $1 - clearbit2 $0067 + clearflag $0067 end ; 0x1a4da9 @@ -110,7 +110,7 @@ UnknownScript_0x1a4da9: ; 0x1a4da9 startbattle returnafterbattle loadvar $d9f5, $2 - clearbit2 $0067 + clearflag $0067 end ; 0x1a4db6 @@ -118,7 +118,7 @@ UnknownScript_0x1a4db6: ; 0x1a4db6 loadtrainer COOLTRAINERM, GAVEN2 startbattle returnafterbattle - clearbit2 $0067 + clearflag $0067 end ; 0x1a4dbf @@ -210,15 +210,15 @@ CooltrainerfBeth1Script: ; 0x1a4dfb writecode $17, $c talkaftercancel loadfont - checkbit2 $0068 + checkflag $0068 iftrue UnknownScript_0x1a4e35 checkcellnum $c iftrue UnknownScript_0x1a4e87 - checkbit1 $026d + checkevent $026d iftrue UnknownScript_0x1a4e1e 2writetext UnknownText_0x1a51d9 keeptextopen - setbit1 $026d + setevent $026d 2call UnknownScript_0x1a4e7b 2jump UnknownScript_0x1a4e21 ; 0x1a4e1e @@ -242,17 +242,17 @@ UnknownScript_0x1a4e35: ; 0x1a4e35 if_equal $1, UnknownScript_0x1a4e52 if_equal $0, UnknownScript_0x1a4e58 UnknownScript_0x1a4e4c: ; 0x1a4e4c - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a4e72 UnknownScript_0x1a4e52: ; 0x1a4e52 - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x1a4e65 UnknownScript_0x1a4e58: ; 0x1a4e58 loadtrainer COOLTRAINERF, BETH1 startbattle returnafterbattle loadvar $d9f6, $1 - clearbit2 $0068 + clearflag $0068 end ; 0x1a4e65 @@ -261,7 +261,7 @@ UnknownScript_0x1a4e65: ; 0x1a4e65 startbattle returnafterbattle loadvar $d9f6, $2 - clearbit2 $0068 + clearflag $0068 end ; 0x1a4e72 @@ -269,7 +269,7 @@ UnknownScript_0x1a4e72: ; 0x1a4e72 loadtrainer COOLTRAINERF, BETH3 startbattle returnafterbattle - clearbit2 $0068 + clearflag $0068 end ; 0x1a4e7b diff --git a/maps/Route27.asm b/maps/Route27.asm index 5f5de922b..08476a333 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -98,17 +98,17 @@ Bird_keeperJose2Script: ; 0x1a08bf writecode $17, $d talkaftercancel loadfont - checkbit2 $0069 + checkflag $0069 iftrue UnknownScript_0x1a08ff - checkbit2 $007e + checkflag $007e iftrue UnknownScript_0x1a0945 checkcellnum $d iftrue UnknownScript_0x1a0963 - checkbit1 $026f + checkevent $026f iftrue UnknownScript_0x1a08e8 2writetext UnknownText_0x1a0e42 keeptextopen - setbit1 $026f + setevent $026f 2call UnknownScript_0x1a0957 2jump UnknownScript_0x1a08eb ; 0x1a08e8 @@ -132,17 +132,17 @@ UnknownScript_0x1a08ff: ; 0x1a08ff if_equal $1, UnknownScript_0x1a091c if_equal $0, UnknownScript_0x1a0922 UnknownScript_0x1a0916: ; 0x1a0916 - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a093c UnknownScript_0x1a091c: ; 0x1a091c - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x1a092f UnknownScript_0x1a0922: ; 0x1a0922 loadtrainer BIRD_KEEPER, JOSE2 startbattle returnafterbattle loadvar $d9f7, $1 - clearbit2 $0069 + clearflag $0069 end ; 0x1a092f @@ -151,7 +151,7 @@ UnknownScript_0x1a092f: ; 0x1a092f startbattle returnafterbattle loadvar $d9f7, $2 - clearbit2 $0069 + clearflag $0069 end ; 0x1a093c @@ -159,7 +159,7 @@ UnknownScript_0x1a093c: ; 0x1a093c loadtrainer BIRD_KEEPER, JOSE3 startbattle returnafterbattle - clearbit2 $0069 + clearflag $0069 end ; 0x1a0945 @@ -167,7 +167,7 @@ UnknownScript_0x1a0945: ; 0x1a0945 2call UnknownScript_0x1a0973 verbosegiveitem STAR_PIECE, 1 iffalse UnknownScript_0x1a0954 - clearbit2 $007e + clearflag $007e 2jump UnknownScript_0x1a0963 ; 0x1a0954 @@ -302,15 +302,15 @@ CooltrainerfReena1Script: ; 0x1a09af writecode $17, $e talkaftercancel loadfont - checkbit2 $006a + checkflag $006a iftrue UnknownScript_0x1a09e9 checkcellnum $e iftrue UnknownScript_0x1a0a3b - checkbit1 $0271 + checkevent $0271 iftrue UnknownScript_0x1a09d2 2writetext UnknownText_0x1a0c35 keeptextopen - setbit1 $0271 + setevent $0271 2call UnknownScript_0x1a0a2f 2jump UnknownScript_0x1a09d5 ; 0x1a09d2 @@ -334,17 +334,17 @@ UnknownScript_0x1a09e9: ; 0x1a09e9 if_equal $1, UnknownScript_0x1a0a06 if_equal $0, UnknownScript_0x1a0a0c UnknownScript_0x1a0a00: ; 0x1a0a00 - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a0a26 UnknownScript_0x1a0a06: ; 0x1a0a06 - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x1a0a19 UnknownScript_0x1a0a0c: ; 0x1a0a0c loadtrainer COOLTRAINERF, REENA1 startbattle returnafterbattle loadvar $d9f8, $1 - clearbit2 $006a + clearflag $006a end ; 0x1a0a19 @@ -353,7 +353,7 @@ UnknownScript_0x1a0a19: ; 0x1a0a19 startbattle returnafterbattle loadvar $d9f8, $2 - clearbit2 $006a + clearflag $006a end ; 0x1a0a26 @@ -361,7 +361,7 @@ UnknownScript_0x1a0a26: ; 0x1a0a26 loadtrainer COOLTRAINERF, REENA3 startbattle returnafterbattle - clearbit2 $006a + clearflag $006a end ; 0x1a0a2f diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 2de720eac..fdc14b6d4 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -9,12 +9,12 @@ Route27SandstormHouse_MapScriptHeader: ; 0x7b392 GrannyScript_0x7b394: ; 0x7b394 faceplayer loadfont - checkbit1 EVENT_GOT_TM37_SANDSTORM + checkevent EVENT_GOT_TM37_SANDSTORM iftrue UnknownScript_0x7b3b7 special $0059 2writetext UnknownText_0x7b3c6 keeptextopen - if_less_than $95, UnknownScript_0x7b3aa + if_greater_than $95, UnknownScript_0x7b3aa 2jump UnknownScript_0x7b3bd ; 0x7b3aa @@ -23,7 +23,7 @@ UnknownScript_0x7b3aa: ; 0x7b3aa keeptextopen verbosegiveitem TM_37, 1 iffalse UnknownScript_0x7b3bb - setbit1 EVENT_GOT_TM37_SANDSTORM + setevent EVENT_GOT_TM37_SANDSTORM UnknownScript_0x7b3b7: ; 0x7b3b7 2writetext UnknownText_0x7b48f closetext diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index 3dc744a33..673a3ee58 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -16,13 +16,13 @@ UnknownScript_0x1ae657: ; 0x1ae657 CooltrainerFScript_0x1ae658: ; 0x1ae658 faceplayer loadfont - checkbit1 EVENT_GOT_TM47_STEEL_WING + checkevent EVENT_GOT_TM47_STEEL_WING iftrue UnknownScript_0x1ae66f 2writetext UnknownText_0x1ae682 keeptextopen verbosegiveitem TM_47, 1 iffalse UnknownScript_0x1ae66d - setbit1 EVENT_GOT_TM47_STEEL_WING + setevent EVENT_GOT_TM47_STEEL_WING UnknownScript_0x1ae66d: ; 0x1ae66d loadmovesprites end diff --git a/maps/Route29.asm b/maps/Route29.asm index a6f5e2e92..ee619bc95 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -23,7 +23,7 @@ UnknownScript_0x1a0f5a: ; 0x1a0f5a ; 0x1a0f5b UnknownScript_0x1a0f5b: ; 0x1a0f5b - checkbit2 $001b + checkflag $001b iftrue UnknownScript_0x1a0f64 UnknownScript_0x1a0f61: ; 0x1a0f61 disappear $8 @@ -42,7 +42,7 @@ UnknownScript_0x1a0f6d: ; 0x1a0f6d showemote $0, $2, 15 applymovement $2, MovementData_0x1a108d spriteface $0, $2 - setbit1 EVENT_DUDE_TALKED_TO_YOU + setevent EVENT_DUDE_TALKED_TO_YOU loadfont 2writetext UnknownText_0x1a10df yesorno @@ -59,7 +59,7 @@ UnknownScript_0x1a0f6d: ; 0x1a0f6d closetext loadmovesprites dotrigger $0 - setbit1 EVENT_LEARNED_TO_CATCH_POKEMON + setevent EVENT_LEARNED_TO_CATCH_POKEMON end ; 0x1a0fa3 @@ -68,7 +68,7 @@ UnknownScript_0x1a0fa3: ; 0x1a0fa3 showemote $0, $2, 15 applymovement $2, MovementData_0x1a1094 spriteface $0, $2 - setbit1 EVENT_DUDE_TALKED_TO_YOU + setevent EVENT_DUDE_TALKED_TO_YOU loadfont 2writetext UnknownText_0x1a10df yesorno @@ -85,7 +85,7 @@ UnknownScript_0x1a0fa3: ; 0x1a0fa3 closetext loadmovesprites dotrigger $0 - setbit1 EVENT_LEARNED_TO_CATCH_POKEMON + setevent EVENT_LEARNED_TO_CATCH_POKEMON end ; 0x1a0fd9 @@ -112,9 +112,9 @@ CooltrainerMScript_0x1a0ff1: ; 0x1a0ff1 loadfont checkcode $10 if_equal $0, UnknownScript_0x1a101c - checkbit1 EVENT_LEARNED_TO_CATCH_POKEMON + checkevent EVENT_LEARNED_TO_CATCH_POKEMON iftrue UnknownScript_0x1a101c - checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM + checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iffalse UnknownScript_0x1a101c 2writetext UnknownText_0x1a11e3 yesorno @@ -126,7 +126,7 @@ CooltrainerMScript_0x1a0ff1: ; 0x1a0ff1 2writetext UnknownText_0x1a114d closetext loadmovesprites - setbit1 EVENT_LEARNED_TO_CATCH_POKEMON + setevent EVENT_LEARNED_TO_CATCH_POKEMON end ; 0x1a101c @@ -180,21 +180,21 @@ UnknownScript_0x1a1043: ; 0x1a1043 TeacherScript_0x1a1049: ; 0x1a1049 faceplayer loadfont - checkbit1 EVENT_GOT_PINK_BOW_FROM_TUSCANY + checkevent EVENT_GOT_PINK_BOW_FROM_TUSCANY iftrue UnknownScript_0x1a1077 checkcode $b if_not_equal TUESDAY, UnknownScript_0x1a107d - checkbit1 EVENT_MET_TUSCANY_OF_TUESDAY + checkevent EVENT_MET_TUSCANY_OF_TUESDAY iftrue UnknownScript_0x1a1064 2writetext UnknownText_0x1a13b2 keeptextopen - setbit1 EVENT_MET_TUSCANY_OF_TUESDAY + setevent EVENT_MET_TUSCANY_OF_TUESDAY UnknownScript_0x1a1064: ; 0x1a1064 2writetext UnknownText_0x1a142f keeptextopen verbosegiveitem PINK_BOW, 1 iffalse UnknownScript_0x1a107b - setbit1 EVENT_GOT_PINK_BOW_FROM_TUSCANY + setevent EVENT_GOT_PINK_BOW_FROM_TUSCANY 2writetext UnknownText_0x1a146f closetext loadmovesprites diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index e4824f529..8b68d2201 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -9,13 +9,13 @@ Route2NuggetSpeechHouse_MapScriptHeader: ; 0x9b845 FisherScript_0x9b847: ; 0x9b847 faceplayer loadfont - checkbit1 $00c8 + checkevent $00c8 iftrue UnknownScript_0x9b85c 2writetext UnknownText_0x9b865 keeptextopen verbosegiveitem NUGGET, 1 iffalse UnknownScript_0x9b860 - setbit1 $00c8 + setevent $00c8 UnknownScript_0x9b85c: ; 0x9b85c 2writetext UnknownText_0x9b8e5 closetext diff --git a/maps/Route30.asm b/maps/Route30.asm index ddf2dffd4..6f3c0fd43 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -51,15 +51,15 @@ YoungsterJoey1Script: ; 0x1a16a6 writecode $17, $f talkaftercancel loadfont - checkbit2 $006b + checkflag $006b iftrue UnknownScript_0x1a16e0 checkcellnum $f iftrue UnknownScript_0x1a178f - checkbit1 $0273 + checkevent $0273 iftrue UnknownScript_0x1a16c9 2writetext UnknownText_0x1a18c2 keeptextopen - setbit1 $0273 + setevent $0273 2call UnknownScript_0x1a1783 2jump UnknownScript_0x1a16cc ; 0x1a16c9 @@ -85,23 +85,23 @@ UnknownScript_0x1a16e0: ; 0x1a16e0 if_equal $1, UnknownScript_0x1a1711 if_equal $0, UnknownScript_0x1a1717 UnknownScript_0x1a16ff: ; 0x1a16ff - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x1a174b UnknownScript_0x1a1705: ; 0x1a1705 - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1a173e UnknownScript_0x1a170b: ; 0x1a170b - checkbit2 $0047 + checkflag $0047 iftrue UnknownScript_0x1a1731 UnknownScript_0x1a1711: ; 0x1a1711 - checkbit2 $0046 + checkflag $0046 iftrue UnknownScript_0x1a1724 UnknownScript_0x1a1717: ; 0x1a717 loadtrainer YOUNGSTER, JOEY1 startbattle returnafterbattle loadvar $d9f9, $1 - clearbit2 $006b + clearflag $006b end ; 0x1a1724 @@ -110,7 +110,7 @@ UnknownScript_0x1a1724: ; 0x1a1724 startbattle returnafterbattle loadvar $d9f9, $2 - clearbit2 $006b + clearflag $006b end ; 0x1a1731 @@ -119,7 +119,7 @@ UnknownScript_0x1a1731: ; 0x1a1731 startbattle returnafterbattle loadvar $d9f9, $3 - clearbit2 $006b + clearflag $006b end ; 0x1a173e @@ -128,7 +128,7 @@ UnknownScript_0x1a173e: ; 0x1a173e startbattle returnafterbattle loadvar $d9f9, $4 - clearbit2 $006b + clearflag $006b end ; 0x1a174b @@ -136,15 +136,15 @@ UnknownScript_0x1a174b: ; 0x1a174b loadtrainer YOUNGSTER, JOEY5 startbattle returnafterbattle - clearbit2 $006b - checkbit1 EVENT_JOEY_HP_UP + clearflag $006b + checkevent EVENT_JOEY_HP_UP iftrue UnknownScript_0x1a176f - checkbit1 $0266 + checkevent $0266 iftrue UnknownScript_0x1a176e 2call UnknownScript_0x1a17a6 verbosegiveitem HP_UP, 1 iffalse UnknownScript_0x1a179f - setbit1 $0266 + setevent $0266 2jump UnknownScript_0x1a178f ; 0x1a176e @@ -158,8 +158,8 @@ UnknownScript_0x1a176f: ; 0x1a176f closetext verbosegiveitem HP_UP, 1 iffalse UnknownScript_0x1a179f - clearbit1 EVENT_JOEY_HP_UP - setbit1 $0266 + clearevent EVENT_JOEY_HP_UP + setevent $0266 2jump UnknownScript_0x1a178f ; 0x1a1783 @@ -199,7 +199,7 @@ UnknownScript_0x1a179b: ; 0x1a179b ; 0x1a179f UnknownScript_0x1a179f: ; 0x1a179f - setbit1 EVENT_JOEY_HP_UP + setevent EVENT_JOEY_HP_UP jumpstd $0021 end ; 0x1a17a6 @@ -270,7 +270,7 @@ Bug_catcherDonScript: ; 0x1a17ca YoungsterScript_0x1a17d2: ; 0x1a17d2 faceplayer loadfont - checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM + checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x1a17e0 2writetext UnknownText_0x1a1a6a closetext diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index 52437a0c9..d9fa7c8ad 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -9,13 +9,13 @@ Route30BerrySpeechHouse_MapScriptHeader: ; 0x196d62 PokefanMScript_0x196d64: ; 0x196d64 faceplayer loadfont - checkbit1 EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE + checkevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE iftrue UnknownScript_0x196d79 2writetext UnknownText_0x196d82 keeptextopen verbosegiveitem BERRY, 1 iffalse UnknownScript_0x196d7d - setbit1 EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE + setevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE UnknownScript_0x196d79: ; 0x196d79 2writetext UnknownText_0x196dec closetext diff --git a/maps/Route31.asm b/maps/Route31.asm index 0948f2464..9dae62509 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -11,7 +11,7 @@ Route31_MapScriptHeader: ; 0x1a5437 ; 0x1a543c UnknownScript_0x1a543c: ; 0x1a543c - checkbit1 EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST + checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST iffalse UnknownScript_0x1a5443 return ; 0x1a5443 @@ -45,17 +45,17 @@ Bug_catcherWade1Script: ; 0x1a5453 writecode $17, $10 talkaftercancel loadfont - checkbit2 $006c + checkflag $006c iftrue UnknownScript_0x1a5493 - checkbit2 $007f + checkflag $007f iftrue UnknownScript_0x1a5507 checkcellnum $10 iftrue UnknownScript_0x1a5558 - checkbit1 $0275 + checkevent $0275 iftrue UnknownScript_0x1a547c 2writetext UnknownText_0x1a5671 closetext - setbit1 $0275 + setevent $0275 2call UnknownScript_0x1a554c 2jump UnknownScript_0x1a547f ; 0x1a547c @@ -81,23 +81,23 @@ UnknownScript_0x1a5493: ; 0x1a5493 if_equal $1, UnknownScript_0x1a54c4 if_equal $0, UnknownScript_0x1a54ca UnknownScript_0x1a54b2: ; 0x1a54b2 - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x1a54fe UnknownScript_0x1a54b8: ; 0x1a54b8 - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1a54f1 UnknownScript_0x1a54be: ; 0x1a54be - checkbit2 $0049 + checkflag $0049 iftrue UnknownScript_0x1a54e4 UnknownScript_0x1a54c4: ; 0x1a54c4 - checkbit2 $0046 + checkflag $0046 iftrue UnknownScript_0x1a54d7 UnknownScript_0x1a54ca: ; 0x1a54ca loadtrainer BUG_CATCHER, WADE1 startbattle returnafterbattle loadvar $d9fa, $1 - clearbit2 $006c + clearflag $006c end ; 0x1a54d7 @@ -106,7 +106,7 @@ UnknownScript_0x1a54d7: ; 0x1a54d7 startbattle returnafterbattle loadvar $d9fa, $2 - clearbit2 $006c + clearflag $006c end ; 0x1a54e4 @@ -115,7 +115,7 @@ UnknownScript_0x1a54e4: ; 0x1a54e4 startbattle returnafterbattle loadvar $d9fa, $3 - clearbit2 $006c + clearflag $006c end ; 0x1a54f1 @@ -124,7 +124,7 @@ UnknownScript_0x1a54f1: ; 0x1a54f1 startbattle returnafterbattle loadvar $d9fa, $4 - clearbit2 $006c + clearflag $006c end ; 0x1a54fe @@ -132,19 +132,19 @@ UnknownScript_0x1a54fe: ; 0x1a54fe loadtrainer BUG_CATCHER, WADE5 startbattle returnafterbattle - clearbit2 $006c + clearflag $006c end ; 0x1a5507 UnknownScript_0x1a5507: ; 0x1a5507 2call UnknownScript_0x1a5568 - checkbit1 EVENT_WADE_HAS_BERRY + checkevent EVENT_WADE_HAS_BERRY iftrue UnknownScript_0x1a5522 - checkbit1 EVENT_WADE_HAS_PSNCUREBERRY + checkevent EVENT_WADE_HAS_PSNCUREBERRY iftrue UnknownScript_0x1a552b - checkbit1 EVENT_WADE_HAS_PRZCUREBERRY + checkevent EVENT_WADE_HAS_PRZCUREBERRY iftrue UnknownScript_0x1a5534 - checkbit1 EVENT_WADE_HAS_BITTER_BERRY + checkevent EVENT_WADE_HAS_BITTER_BERRY iftrue UnknownScript_0x1a553d UnknownScript_0x1a5522: ; 0x1a5522 verbosegiveitem BERRY, 1 @@ -168,7 +168,7 @@ UnknownScript_0x1a553d: ; 0x1a553d verbosegiveitem BITTER_BERRY, 1 iffalse UnknownScript_0x1a5549 UnknownScript_0x1a5543: ; 0x1a5543 - clearbit2 $007f + clearflag $007f 2jump UnknownScript_0x1a5558 ; 0x1a5549 @@ -224,9 +224,9 @@ UnknownScript_0x1a556c: ; 0x1a556c FisherScript_0x1a5570: ; 0x1a5570 faceplayer loadfont - checkbit1 EVENT_GOT_TM50_NIGHTMARE + checkevent EVENT_GOT_TM50_NIGHTMARE iftrue UnknownScript_0x1a55af - checkbit1 EVENT_GOT_KENYA + checkevent EVENT_GOT_KENYA iftrue UnknownScript_0x1a5584 2writetext UnknownText_0x1a56d9 closetext @@ -246,10 +246,10 @@ UnknownScript_0x1a5584: ; 0x1a5584 keeptextopen 2writetext UnknownText_0x1a57ba keeptextopen - setbit1 EVENT_GAVE_KENYA + setevent EVENT_GAVE_KENYA verbosegiveitem TM_50, 1 iffalse UnknownScript_0x1a55b3 - setbit1 EVENT_GOT_TM50_NIGHTMARE + setevent EVENT_GOT_TM50_NIGHTMARE UnknownScript_0x1a55af: ; 0x1a55af 2writetext UnknownText_0x1a5896 closetext diff --git a/maps/Route32.asm b/maps/Route32.asm index 8a16abafe..f2c247719 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -43,11 +43,11 @@ CooltrainerMScript_0x19046f: ; 0x19046f faceplayer UnknownScript_0x190470: ; 0x190470 loadfont - checkbit1 EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 + checkevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 iftrue UnknownScript_0x1904a5 - checkbit2 $001b + checkflag $001b iffalse UnknownScript_0x19049f - checkbit1 EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE + checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE iftrue UnknownScript_0x19048f 2writetext UnknownText_0x1907ab closetext @@ -67,7 +67,7 @@ UnknownScript_0x19048f: ; 0x19048f keeptextopen verbosegiveitem MIRACLE_SEED, 1 iffalse UnknownScript_0x1904a9 - setbit1 EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 + setevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 2jump UnknownScript_0x1904a5 ; 0x19049f @@ -106,13 +106,13 @@ UnknownScript_0x1904ab: ; 0x1904ab FisherScript_0x1904ce: ; 0x1904ce faceplayer loadfont - checkbit1 EVENT_GOT_TM05_ROAR + checkevent EVENT_GOT_TM05_ROAR iftrue UnknownScript_0x1904e3 2writetext UnknownText_0x191133 keeptextopen verbosegiveitem TM_05, 1 iffalse UnknownScript_0x1904e7 - setbit1 EVENT_GOT_TM05_ROAR + setevent EVENT_GOT_TM05_ROAR UnknownScript_0x1904e3: ; 0x1904e3 2writetext UnknownText_0x19118c closetext @@ -230,17 +230,17 @@ FisherRalph1Script: ; 0x19053d writecode $17, $11 talkaftercancel loadfont - checkbit2 $006d + checkflag $006d iftrue UnknownScript_0x19057d - checkbit2 $0052 + checkflag $0052 iftrue UnknownScript_0x1905f1 checkcellnum $11 iftrue UnknownScript_0x190603 - checkbit1 $0277 + checkevent $0277 iftrue UnknownScript_0x190566 2writetext UnknownText_0x190bf8 keeptextopen - setbit1 $0277 + setevent $0277 2call UnknownScript_0x1905f7 2jump UnknownScript_0x190569 ; 0x190566 @@ -266,23 +266,23 @@ UnknownScript_0x19057d: ; 0x19057d if_equal $1, UnknownScript_0x1905ae if_equal $0, UnknownScript_0x1905b4 UnknownScript_0x19059c: ; 0x19059c - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1905e8 UnknownScript_0x1905a2: ; 0x1905a2 - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x1905db UnknownScript_0x1905a8: ; 0x1905a8 - checkbit2 $004a + checkflag $004a iftrue UnknownScript_0x1905ce UnknownScript_0x1905ae: ; 0x1905ae - checkbit2 $0048 + checkflag $0048 iftrue UnknownScript_0x1905c1 UnknownScript_0x1905b4: ; 0x1905b4 loadtrainer FISHER, RALPH1 startbattle returnafterbattle loadvar $d9fb, $1 - clearbit2 $006d + clearflag $006d end ; 0x1905c1 @@ -291,7 +291,7 @@ UnknownScript_0x1905c1: ; 0x1905c1 startbattle returnafterbattle loadvar $d9fb, $2 - clearbit2 $006d + clearflag $006d end ; 0x1905ce @@ -300,7 +300,7 @@ UnknownScript_0x1905ce: ; 0x1905ce startbattle returnafterbattle loadvar $d9fb, $3 - clearbit2 $006d + clearflag $006d end ; 0x1905db @@ -309,7 +309,7 @@ UnknownScript_0x1905db: ; 0x1905db startbattle returnafterbattle loadvar $d9fb, $4 - clearbit2 $006d + clearflag $006d end ; 0x1905e8 @@ -317,7 +317,7 @@ UnknownScript_0x1905e8: ; 0x1905e8 loadtrainer FISHER, RALPH5 startbattle returnafterbattle - clearbit2 $006d + clearflag $006d end ; 0x1905f1 @@ -416,15 +416,15 @@ PicnickerLiz1Script: ; 0x190633 writecode $17, $12 talkaftercancel loadfont - checkbit2 $006e + checkflag $006e iftrue UnknownScript_0x19066d checkcellnum $12 iftrue UnknownScript_0x1906ed - checkbit1 $0279 + checkevent $0279 iftrue UnknownScript_0x190656 2writetext UnknownText_0x191060 keeptextopen - setbit1 $0279 + setevent $0279 2call UnknownScript_0x1906e1 2jump UnknownScript_0x190659 ; 0x190656 @@ -450,23 +450,23 @@ UnknownScript_0x19066d: ; 0x19066d if_equal $1, UnknownScript_0x19069e if_equal $0, UnknownScript_0x1906a4 UnknownScript_0x19068c: ; 0x19068c - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x1906d8 UnknownScript_0x190692: ; 0x190692 - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1906cb UnknownScript_0x190698: ; 0x190698 - checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT + checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x1906be UnknownScript_0x19069e: ; 0x19069e - checkbit2 $0048 + checkflag $0048 iftrue UnknownScript_0x1906b1 UnknownScript_0x1906a4: ; 0x1906a4 loadtrainer PICNICKER, LIZ1 startbattle returnafterbattle loadvar $d9fc, $1 - clearbit2 $006e + clearflag $006e end ; 0x1906b1 @@ -475,7 +475,7 @@ UnknownScript_0x1906b1: ; 0x1906b1 startbattle returnafterbattle loadvar $d9fc, $2 - clearbit2 $006e + clearflag $006e end ; 0x1906be @@ -484,7 +484,7 @@ UnknownScript_0x1906be: ; 0x1906be startbattle returnafterbattle loadvar $d9fc, $3 - clearbit2 $006e + clearflag $006e end ; 0x1906cb @@ -493,7 +493,7 @@ UnknownScript_0x1906cb: ; 0x1906cb startbattle returnafterbattle loadvar $d9fc, $4 - clearbit2 $006e + clearflag $006e end ; 0x1906d8 @@ -501,7 +501,7 @@ UnknownScript_0x1906d8: ; 0x1906d8 loadtrainer PICNICKER, LIZ5 startbattle returnafterbattle - clearbit2 $006e + clearflag $006e end ; 0x1906e1 @@ -630,21 +630,21 @@ Bird_keeperPeterScript: ; 0x190731 LassScript_0x190739: ; 0x190739 faceplayer loadfont - checkbit1 EVENT_GOT_POISON_BARB_FROM_FRIEDA + checkevent EVENT_GOT_POISON_BARB_FROM_FRIEDA iftrue UnknownScript_0x190767 checkcode $b if_not_equal FRIDAY, UnknownScript_0x19076d - checkbit1 EVENT_MET_FRIEDA_OF_FRIDAY + checkevent EVENT_MET_FRIEDA_OF_FRIDAY iftrue UnknownScript_0x190754 2writetext UnknownText_0x1911c1 keeptextopen - setbit1 EVENT_MET_FRIEDA_OF_FRIDAY + setevent EVENT_MET_FRIEDA_OF_FRIDAY UnknownScript_0x190754: ; 0x190754 2writetext UnknownText_0x191204 keeptextopen verbosegiveitem POISON_BARB, 1 iffalse UnknownScript_0x19076b - setbit1 EVENT_GOT_POISON_BARB_FROM_FRIEDA + setevent EVENT_GOT_POISON_BARB_FROM_FRIEDA 2writetext UnknownText_0x191222 closetext loadmovesprites diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm index 472b65c34..f67cbe834 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32PokeCenter1F.asm @@ -13,7 +13,7 @@ NurseScript_0x69b52: ; 0x69b52 FishingGuruScript_0x69b55: ; 0x69b55 faceplayer loadfont - checkbit1 EVENT_GOT_OLD_ROD + checkevent EVENT_GOT_OLD_ROD iftrue UnknownScript_0x69b7a 2writetext UnknownText_0x69b83 yesorno @@ -24,7 +24,7 @@ FishingGuruScript_0x69b55: ; 0x69b55 2writetext UnknownText_0x69c1b closetext loadmovesprites - setbit1 EVENT_GOT_OLD_ROD + setevent EVENT_GOT_OLD_ROD end ; 0x69b74 diff --git a/maps/Route33.asm b/maps/Route33.asm index fb3bd84bf..d43f5b0bd 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -34,17 +34,17 @@ HikerAnthony2Script: ; 0x1ac011 writecode $17, $13 talkaftercancel loadfont - checkbit2 $006f + checkflag $006f iftrue UnknownScript_0x1ac051 - checkbit2 $00a0 + checkflag $00a0 iftrue UnknownScript_0x1ac0c5 checkcellnum $13 iftrue UnknownScript_0x1ac0d7 - checkbit1 $027b + checkevent $027b iftrue UnknownScript_0x1ac03a 2writetext UnknownText_0x1ac153 keeptextopen - setbit1 $027b + setevent $027b 2call UnknownScript_0x1ac0cb 2jump UnknownScript_0x1ac03d ; 0x1ac03a @@ -70,23 +70,23 @@ UnknownScript_0x1ac051: ; 0x1ac051 if_equal $1, UnknownScript_0x1ac082 if_equal $0, UnknownScript_0x1ac088 UnknownScript_0x1ac070: ; 0x1ac070 - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1ac0bc UnknownScript_0x1ac076: ; 0x1ac076 - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x1ac0af UnknownScript_0x1ac07c: ; 0x1ac07c - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1ac0a2 UnknownScript_0x1ac082: ; 0x1ac082 - checkbit2 $0047 + checkflag $0047 iftrue UnknownScript_0x1ac095 UnknownScript_0x1ac088: ; 0x1ac088 loadtrainer HIKER, ANTHONY2 startbattle returnafterbattle loadvar $d9fd, $1 - clearbit2 $006f + clearflag $006f end ; 0x1ac095 @@ -95,7 +95,7 @@ UnknownScript_0x1ac095: ; 0x1ac095 startbattle returnafterbattle loadvar $d9fd, $2 - clearbit2 $006f + clearflag $006f end ; 0x1ac0a2 @@ -104,7 +104,7 @@ UnknownScript_0x1ac0a2: ; 0x1ac0a2 startbattle returnafterbattle loadvar $d9fd, $3 - clearbit2 $006f + clearflag $006f end ; 0x1ac0af @@ -113,7 +113,7 @@ UnknownScript_0x1ac0af: ; 0x1ac0af startbattle returnafterbattle loadvar $d9fd, $4 - clearbit2 $006f + clearflag $006f end ; 0x1ac0bc @@ -121,7 +121,7 @@ UnknownScript_0x1ac0bc: ; 0x1ac0bc loadtrainer HIKER, ANTHONY5 startbattle returnafterbattle - clearbit2 $006f + clearflag $006f end ; 0x1ac0c5 diff --git a/maps/Route34.asm b/maps/Route34.asm index 8bdd35677..3f369d014 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -11,40 +11,40 @@ Route34_MapScriptHeader: ; 0x78000 ; 0x78005 UnknownScript_0x78005: ; 0x78005 - checkbit2 $0005 + checkflag $0005 iftrue UnknownScript_0x78014 - clearbit1 $06e5 - setbit1 $06e6 + clearevent $06e5 + setevent $06e6 2jump UnknownScript_0x7801d ; 0x78014 UnknownScript_0x78014: ; 0x78014 - setbit1 $06e5 - clearbit1 $06e6 + setevent $06e5 + clearevent $06e6 2jump UnknownScript_0x7801d ; 0x7801d UnknownScript_0x7801d: ; 0x7801d - checkbit2 $0006 + checkflag $0006 iffalse UnknownScript_0x78029 - clearbit1 $06e7 + clearevent $06e7 2jump UnknownScript_0x7802f ; 0x78029 UnknownScript_0x78029: ; 0x78029 - setbit1 $06e7 + setevent $06e7 2jump UnknownScript_0x7802f ; 0x7802f UnknownScript_0x7802f: ; 0x7802f - checkbit2 $0007 + checkflag $0007 iffalse UnknownScript_0x78039 - clearbit1 $06e8 + clearevent $06e8 return ; 0x78039 UnknownScript_0x78039: ; 0x78039 - setbit1 $06e8 + setevent $06e8 return ; 0x7803d @@ -55,7 +55,7 @@ GrampsScript_0x7803d: ; 0x7803d closetext loadmovesprites if_equal $1, UnknownScript_0x7805a - clearbit2 $0005 + clearflag $0005 checkcode $9 if_equal $3, UnknownScript_0x7805b applymovement $8, MovementData_0x78333 @@ -110,17 +110,17 @@ CamperTodd1Script: ; 0x7807d writecode $17, $14 talkaftercancel loadfont - checkbit2 $0070 + checkflag $0070 iftrue UnknownScript_0x780bd - checkbit2 $0061 + checkflag $0061 iftrue UnknownScript_0x78131 checkcellnum $14 iftrue UnknownScript_0x78143 - checkbit1 $027d + checkevent $027d iftrue UnknownScript_0x780a6 2writetext UnknownText_0x784f0 keeptextopen - setbit1 $027d + setevent $027d 2call UnknownScript_0x78137 2jump UnknownScript_0x780a9 ; 0x780a6 @@ -146,23 +146,23 @@ UnknownScript_0x780bd: ; 0x780bd if_equal $1, UnknownScript_0x780ee if_equal $0, UnknownScript_0x780f4 UnknownScript_0x780dc: ; 0x780dc - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x78128 UnknownScript_0x780e2: ; 0x780e2 - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x7811b UnknownScript_0x780e8: ; 0x780e8 - checkbit2 $004b + checkflag $004b iftrue UnknownScript_0x7810e UnknownScript_0x780ee: ; 0x780ee - checkbit2 $0045 + checkflag $0045 iftrue UnknownScript_0x78101 UnknownScript_0x780f4: ; 0x780f4 loadtrainer CAMPER, TODD1 startbattle returnafterbattle loadvar $d9fe, $1 - clearbit2 $0070 + clearflag $0070 end ; 0x78101 @@ -171,7 +171,7 @@ UnknownScript_0x78101: ; 0x78101 startbattle returnafterbattle loadvar $d9fe, $2 - clearbit2 $0070 + clearflag $0070 end ; 0x7810e @@ -180,7 +180,7 @@ UnknownScript_0x7810e: ; 0x7810e startbattle returnafterbattle loadvar $d9fe, $3 - clearbit2 $0070 + clearflag $0070 end ; 0x7811b @@ -189,7 +189,7 @@ UnknownScript_0x7811b: ; 0x7811b startbattle returnafterbattle loadvar $d9fe, $4 - clearbit2 $0070 + clearflag $0070 end ; 0x78128 @@ -197,7 +197,7 @@ UnknownScript_0x78128: ; 0x78128 loadtrainer CAMPER, TODD5 startbattle returnafterbattle - clearbit2 $0070 + clearflag $0070 end ; 0x78131 @@ -267,17 +267,17 @@ PicnickerGina1Script: ; 0x7815f writecode $17, $15 talkaftercancel loadfont - checkbit2 $0071 + checkflag $0071 iftrue UnknownScript_0x7819f - checkbit2 $0080 + checkflag $0080 iftrue UnknownScript_0x78213 checkcellnum $15 iftrue UnknownScript_0x78234 - checkbit1 $027f + checkevent $027f iftrue UnknownScript_0x78188 2writetext UnknownText_0x785b8 keeptextopen - setbit1 $027f + setevent $027f 2call UnknownScript_0x78228 2jump UnknownScript_0x7818b ; 0x78188 @@ -303,23 +303,23 @@ UnknownScript_0x7819f: ; 0x7819f if_equal $1, UnknownScript_0x781d0 if_equal $0, UnknownScript_0x781d6 UnknownScript_0x781be: ; 0x781be - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x7820a UnknownScript_0x781c4: ; 0x781c4 - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x781fd UnknownScript_0x781ca: ; 0x781ca - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x781f0 UnknownScript_0x781d0: ; 0x781d0 - checkbit2 $0049 + checkflag $0049 iftrue UnknownScript_0x781e3 UnknownScript_0x781d6: ; 0x781d6 loadtrainer PICNICKER, GINA1 startbattle returnafterbattle loadvar $d9ff, $1 - clearbit2 $0071 + clearflag $0071 end ; 0x781e3 @@ -328,7 +328,7 @@ UnknownScript_0x781e3: ; 0x781e3 startbattle returnafterbattle loadvar $d9ff, $2 - clearbit2 $0071 + clearflag $0071 end ; 0x781f0 @@ -337,7 +337,7 @@ UnknownScript_0x781f0: ; 0x781f0 startbattle returnafterbattle loadvar $d9ff, $3 - clearbit2 $0071 + clearflag $0071 end ; 0x781fd @@ -346,7 +346,7 @@ UnknownScript_0x781fd: ; 0x781fd startbattle returnafterbattle loadvar $d9ff, $4 - clearbit2 $0071 + clearflag $0071 end ; 0x7820a @@ -354,7 +354,7 @@ UnknownScript_0x7820a: ; 0x7820a loadtrainer PICNICKER, GINA5 startbattle returnafterbattle - clearbit2 $0071 + clearflag $0071 end ; 0x78213 @@ -362,8 +362,8 @@ UnknownScript_0x78213: ; 0x78213 2call UnknownScript_0x78244 verbosegiveitem LEAF_STONE, 1 iffalse UnknownScript_0x78225 - clearbit2 $0080 - setbit1 $0100 + clearflag $0080 + setevent $0100 2jump UnknownScript_0x78234 ; 0x78225 @@ -421,7 +421,7 @@ OfficerScript_0x7824c: ; 0x7824c loadfont checktime $4 iffalse UnknownScript_0x78276 - checkbit1 $0546 + checkevent $0546 iftrue UnknownScript_0x78270 playmusic $000c 2writetext UnknownText_0x785e4 @@ -431,7 +431,7 @@ OfficerScript_0x7824c: ; 0x7824c loadtrainer OFFICER, KEITH startbattle returnafterbattle - setbit1 $0546 + setevent $0546 loadmovesprites end ; 0x78270 @@ -560,7 +560,7 @@ TrainerCooltrainerfIrene: ; 0x782b8 CooltrainerfIreneScript: ; 0x782c4 talkaftercancel loadfont - checkbit1 EVENT_GOT_SOFT_SAND_FROM_KATE + checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue UnknownScript_0x782d2 2writetext UnknownText_0x7877f closetext @@ -598,7 +598,7 @@ TrainerCooltrainerfJenn: ; 0x782d8 CooltrainerfJennScript: ; 0x782e4 talkaftercancel loadfont - checkbit1 EVENT_GOT_SOFT_SAND_FROM_KATE + checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue UnknownScript_0x782f2 2writetext UnknownText_0x78836 closetext @@ -636,13 +636,13 @@ TrainerCooltrainerfKate: ; 0x782f8 CooltrainerfKateScript: ; 0x78304 talkaftercancel loadfont - checkbit1 EVENT_GOT_SOFT_SAND_FROM_KATE + checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue UnknownScript_0x78319 2writetext UnknownText_0x788e2 keeptextopen verbosegiveitem SOFT_SAND, 1 iffalse UnknownScript_0x7831d - setbit1 EVENT_GOT_SOFT_SAND_FROM_KATE + setevent EVENT_GOT_SOFT_SAND_FROM_KATE UnknownScript_0x78319: ; 0x78319 2writetext UnknownText_0x7892b closetext diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index dc9a16e59..f8e5c91a8 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -11,7 +11,7 @@ Route34IlexForestGate_MapScriptHeader: ; 0x62d28 ; 0x62d2d UnknownScript_0x62d2d: ; 0x62d2d - checkbit1 $00c0 + checkevent $00c0 iffalse UnknownScript_0x62d38 disappear $2 appear $5 @@ -25,7 +25,7 @@ UnknownScript_0x62d38: ; 0x62d38 ; 0x62d3d UnknownScript_0x62d3d: ; 0x62d3d - checkbit1 $00c0 + checkevent $00c0 iffalse UnknownScript_0x62d62 showemote $0, $5, 20 spriteface $5, $2 @@ -46,15 +46,15 @@ UnknownScript_0x62d62: ; 0x62d62 TeacherScript_0x62d63: ; 0x62d63 faceplayer loadfont - checkbit1 $00c0 + checkevent $00c0 iftrue UnknownScript_0x62d84 - checkbit1 EVENT_GOT_TM12_SWEET_SCENT + checkevent EVENT_GOT_TM12_SWEET_SCENT iftrue UnknownScript_0x62d7e 2writetext UnknownText_0x62d9d keeptextopen verbosegiveitem TM_12, 1 iffalse UnknownScript_0x62d82 - setbit1 EVENT_GOT_TM12_SWEET_SCENT + setevent EVENT_GOT_TM12_SWEET_SCENT UnknownScript_0x62d7e: ; 0x62d7e 2writetext UnknownText_0x62df6 closetext diff --git a/maps/Route35.asm b/maps/Route35.asm index 713d2ecb5..fc7a17a0c 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -61,11 +61,11 @@ JugglerIrwin1Script: ; 0x19c8cf loadfont checkcellnum $16 iftrue UnknownScript_0x19c90f - checkbit1 $0281 + checkevent $0281 iftrue UnknownScript_0x19c8ec 2writetext UnknownText_0x19cd5a keeptextopen - setbit1 $0281 + setevent $0281 2call UnknownScript_0x19c903 2jump UnknownScript_0x19c8ef ; 0x19c8ec @@ -256,17 +256,17 @@ Bug_catcherArnie1Script: ; 0x19c97b writecode $17, $17 talkaftercancel loadfont - checkbit2 $0072 + checkflag $0072 iftrue UnknownScript_0x19c9bb - checkbit2 $00a1 + checkflag $00a1 iftrue UnknownScript_0x19ca2f checkcellnum $17 iftrue UnknownScript_0x19c90f - checkbit1 $0283 + checkevent $0283 iftrue UnknownScript_0x19c9a4 2writetext UnknownText_0x19cdf6 keeptextopen - setbit1 $0283 + setevent $0283 2call UnknownScript_0x19c903 2jump UnknownScript_0x19c9a7 ; 0x19c9a4 @@ -292,23 +292,23 @@ UnknownScript_0x19c9bb: ; 0x19c9bb if_equal $1, UnknownScript_0x19c9ec if_equal $0, UnknownScript_0x19c9f2 UnknownScript_0x19c9da: ; 0x19c9da - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x19ca26 UnknownScript_0x19c9e0: ; 0x19c9e0 - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x19ca19 UnknownScript_0x19c9e6: ; 0x19c9e6 - checkbit2 $004b + checkflag $004b iftrue UnknownScript_0x19ca0c UnknownScript_0x19c9ec: ; 0x19c9ec - checkbit2 $004a + checkflag $004a iftrue UnknownScript_0x19c9ff UnknownScript_0x19c9f2: ; 0x19c9f2 loadtrainer BUG_CATCHER, ARNIE1 startbattle returnafterbattle loadvar $da01, $1 - clearbit2 $0072 + clearflag $0072 end ; 0x19c9ff @@ -317,7 +317,7 @@ UnknownScript_0x19c9ff: ; 0x19c9ff startbattle returnafterbattle loadvar $da01, $2 - clearbit2 $0072 + clearflag $0072 end ; 0x19ca0c @@ -326,7 +326,7 @@ UnknownScript_0x19ca0c: ; 0x19ca0c startbattle returnafterbattle loadvar $da01, $3 - clearbit2 $0072 + clearflag $0072 end ; 0x19ca19 @@ -335,7 +335,7 @@ UnknownScript_0x19ca19: ; 0x19ca19 startbattle returnafterbattle loadvar $da01, $4 - clearbit2 $0072 + clearflag $0072 end ; 0x19ca26 @@ -343,7 +343,7 @@ UnknownScript_0x19ca26: ; 0x19ca26 loadtrainer BUG_CATCHER, ARNIE5 startbattle returnafterbattle - clearbit2 $0072 + clearflag $0072 end ; 0x19ca2f @@ -388,7 +388,7 @@ OfficerScript_0x19ca49: ; 0x19ca49 loadfont checktime $4 iffalse UnknownScript_0x19ca73 - checkbit1 $0547 + checkevent $0547 iftrue UnknownScript_0x19ca6d playmusic $000c 2writetext UnknownText_0x19ceea @@ -398,7 +398,7 @@ OfficerScript_0x19ca49: ; 0x19ca49 loadtrainer OFFICER, DIRK startbattle returnafterbattle - setbit1 $0547 + setevent $0547 loadmovesprites end ; 0x19ca6d diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm index 0fbd6d2af..b5fb6b78f 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35Goldenrodgate.asm @@ -9,11 +9,11 @@ Route35Goldenrodgate_MapScriptHeader: ; 0x69d35 OfficerScript_0x69d37: ; 0x69d37 faceplayer loadfont - checkbit1 EVENT_GOT_HP_UP_FROM_RANDY + checkevent EVENT_GOT_HP_UP_FROM_RANDY iftrue UnknownScript_0x69d92 - checkbit1 EVENT_GAVE_KENYA + checkevent EVENT_GAVE_KENYA iftrue UnknownScript_0x69d85 - checkbit1 EVENT_GOT_KENYA + checkevent EVENT_GOT_KENYA iftrue UnknownScript_0x69d73 2writetext UnknownText_0x69ddd yesorno @@ -28,7 +28,7 @@ OfficerScript_0x69d37: ; 0x69d37 waitbutton givepoke SPEAROW, 10, 0, 1, GiftSpearowName, GiftSpearowOTName givepokeitem GiftSpearowMail - setbit1 EVENT_GOT_KENYA + setevent EVENT_GOT_KENYA UnknownScript_0x69d73: ; 0x69d73 2writetext UnknownText_0x69ed6 closetext @@ -55,7 +55,7 @@ UnknownScript_0x69d85: ; 0x69d85 keeptextopen verbosegiveitem HP_UP, 1 iffalse UnknownScript_0x69d96 - setbit1 EVENT_GOT_HP_UP_FROM_RANDY + setevent EVENT_GOT_HP_UP_FROM_RANDY UnknownScript_0x69d92: ; 0x69d92 2writetext UnknownText_0x69fd9 closetext @@ -77,7 +77,7 @@ GiftSpearowOTName: ; 0x69dbf PokefanFScript_0x69dc6: ; 0x69dc6 faceplayer loadfont - checkbit1 EVENT_FOUGHT_SUDOWOODO + checkevent EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x69dd4 2writetext UnknownText_0x6a00a closetext diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index b691588ec..13969c316 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -31,7 +31,7 @@ UnknownScript_0x6a19f: ; 0x6a19f ; 0x6a1a3 UnknownScript_0x6a1a3: ; 0x6a1a3 - checkbit2 $0011 + checkflag $0011 iftrue UnknownScript_0x6a1ac dotrigger $0 return @@ -47,7 +47,7 @@ UnknownScript_0x6a1af: ; 0x6a1af if_equal TUESDAY, UnknownScript_0x6a1ca if_equal THURSDAY, UnknownScript_0x6a1ca if_equal SATURDAY, UnknownScript_0x6a1ca - checkbit2 $0011 + checkflag $0011 iftrue UnknownScript_0x6a1ac disappear $2 appear $3 @@ -98,18 +98,18 @@ OfficerScript_0x6a204: ; 0x6a204 if_equal FRIDAY, UnknownScript_0x6a2c7 faceplayer loadfont - checkbit2 $0051 + checkflag $0051 iftrue UnknownScript_0x6a2c1 2call UnknownScript_0x6a2de 2writetext UnknownText_0x6a2eb yesorno iffalse UnknownScript_0x6a2a3 checkcode $1 - if_less_than $1, UnknownScript_0x6a271 + if_greater_than $1, UnknownScript_0x6a271 special $0016 - clearbit1 $0308 + clearevent $0308 UnknownScript_0x6a234: ; 0x6a234 - setbit2 $0011 + setflag $0011 special $003c 2writetext UnknownText_0x6a39d keeptextopen @@ -143,7 +143,7 @@ UnknownScript_0x6a26c: ; 0x6a26c UnknownScript_0x6a271: ; 0x6a271 checkcode $1 - if_greater_than $6, $627d + if_less_than $6, $627d checkcode $10 if_equal $0, UnknownScript_0x6a2b5 special $005a @@ -153,7 +153,7 @@ UnknownScript_0x6a271: ; 0x6a271 iffalse UnknownScript_0x6a2a9 special $0016 iftrue UnknownScript_0x6a2af - setbit1 $0308 + setevent $0308 2writetext UnknownText_0x6a537 keeptextopen 2writetext UnknownText_0x6a56b @@ -212,7 +212,7 @@ UnknownScript_0x6a2c7: ; 0x6a2c7 OfficerScript_0x6a2ca: ; 0x6a2ca faceplayer loadfont - checkbit2 $0051 + checkflag $0051 iftrue UnknownScript_0x6a2c1 2writetext UnknownText_0x6a894 closetext 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 diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index f294de452..8efe42620 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -31,7 +31,7 @@ UnknownScript_0x6ab13: ; 0x6ab13 ; 0x6ab17 UnknownScript_0x6ab17: ; 0x6ab17 - checkbit2 $0011 + checkflag $0011 iftrue UnknownScript_0x6ab20 dotrigger $0 return @@ -43,13 +43,13 @@ UnknownScript_0x6ab20: ; 0x6ab20 ; 0x6ab23 UnknownScript_0x6ab23: ; 0x6ab23 - checkbit1 $02d2 + checkevent $02d2 iftrue UnknownScript_0x6ab46 checkcode $b if_equal TUESDAY, UnknownScript_0x6ab42 if_equal THURSDAY, UnknownScript_0x6ab42 if_equal SATURDAY, UnknownScript_0x6ab42 - checkbit2 $0011 + checkflag $0011 iftrue UnknownScript_0x6ab42 disappear $2 appear $d @@ -99,43 +99,43 @@ UnknownScript_0x6ab76: ; 0x6ab76 ; 0x6ab8c UnknownScript_0x6ab8c: ; 0x6ab8c - checkbit1 $0716 + checkevent $0716 iftrue UnknownScript_0x6ab94 appear $3 UnknownScript_0x6ab94: ; 0x6ab94 - checkbit1 $0717 + checkevent $0717 iftrue UnknownScript_0x6ab9c appear $4 UnknownScript_0x6ab9c: ; 0x6ab9c - checkbit1 $0718 + checkevent $0718 iftrue UnknownScript_0x6aba4 appear $5 UnknownScript_0x6aba4: ; 0x6aba4 - checkbit1 $0719 + checkevent $0719 iftrue UnknownScript_0x6abac appear $6 UnknownScript_0x6abac: ; 0x6abac - checkbit1 $071a + checkevent $071a iftrue UnknownScript_0x6abb4 appear $7 UnknownScript_0x6abb4: ; 0x6abb4 - checkbit1 $071b + checkevent $071b iftrue UnknownScript_0x6abbc appear $8 UnknownScript_0x6abbc: ; 0x6abbc - checkbit1 $071c + checkevent $071c iftrue UnknownScript_0x6abc4 appear $9 UnknownScript_0x6abc4: ; 0x6abc4 - checkbit1 $071d + checkevent $071d iftrue UnknownScript_0x6abcc appear $a UnknownScript_0x6abcc: ; 0x6abcc - checkbit1 $071e + checkevent $071e iftrue UnknownScript_0x6abd4 appear $b UnknownScript_0x6abd4: ; 0x6abd4 - checkbit1 $071f + checkevent $071f iftrue UnknownScript_0x6abdc appear $c UnknownScript_0x6abdc: ; 0x6abdc @@ -151,18 +151,18 @@ OfficerScript_0x6abe0: ; 0x6abe0 if_equal FRIDAY, UnknownScript_0x6acf1 faceplayer loadfont - checkbit2 $0051 + checkflag $0051 iftrue UnknownScript_0x6ac91 2call UnknownScript_0x6ad02 2writetext UnknownText_0x6add5 yesorno iffalse UnknownScript_0x6ac73 checkcode $1 - if_less_than $1, UnknownScript_0x6ac41 + if_greater_than $1, UnknownScript_0x6ac41 special $0016 - clearbit1 $0308 + clearevent $0308 UnknownScript_0x6ac10: ; 0x6ac10 - setbit2 $0011 + setflag $0011 special $003c 2writetext UnknownText_0x6ae87 keeptextopen @@ -173,7 +173,7 @@ UnknownScript_0x6ac10: ; 0x6ac10 2writetext UnknownText_0x6aecc closetext loadmovesprites - setbit2 $0011 + setflag $0011 special $0018 spriteface $0, $2 playsound $0023 @@ -186,7 +186,7 @@ UnknownScript_0x6ac10: ; 0x6ac10 UnknownScript_0x6ac41: ; 0x6ac41 checkcode $1 - if_greater_than $6, UnknownScript_0x6ac4d + if_less_than $6, UnknownScript_0x6ac4d checkcode $10 if_equal $0, UnknownScript_0x6ac85 UnknownScript_0x6ac4d: ; 0x6ac4d @@ -197,7 +197,7 @@ UnknownScript_0x6ac4d: ; 0x6ac4d iffalse UnknownScript_0x6ac79 special $0016 iftrue UnknownScript_0x6ac7f - setbit1 $0308 + setevent $0308 2writetext UnknownText_0x6b021 keeptextopen 2writetext UnknownText_0x6b055 @@ -243,13 +243,13 @@ UnknownScript_0x6ac8b: ; 0x6ac8b ; 0x6ac91 UnknownScript_0x6ac91: ; 0x6ac91 - checkbit1 $0313 + checkevent $0313 iftrue UnknownScript_0x6acaf - checkbit1 $0314 + checkevent $0314 iftrue UnknownScript_0x6acbe - checkbit1 $0315 + checkevent $0315 iftrue UnknownScript_0x6accd - checkbit1 $0316 + checkevent $0316 iftrue UnknownScript_0x6acdc 2writetext UnknownText_0x6b32b closetext @@ -262,7 +262,7 @@ UnknownScript_0x6acaf: ; 0x6acaf keeptextopen verbosegiveitem SUN_STONE, 1 iffalse UnknownScript_0x6aceb - clearbit1 $0313 + clearevent $0313 loadmovesprites end ; 0x6acbe @@ -272,7 +272,7 @@ UnknownScript_0x6acbe: ; 0x6acbe keeptextopen verbosegiveitem EVERSTONE, 1 iffalse UnknownScript_0x6aceb - clearbit1 $0314 + clearevent $0314 loadmovesprites end ; 0x6accd @@ -282,7 +282,7 @@ UnknownScript_0x6accd: ; 0x6accd keeptextopen verbosegiveitem GOLD_BERRY, 1 iffalse UnknownScript_0x6aceb - clearbit1 $0315 + clearevent $0315 loadmovesprites end ; 0x6acdc @@ -292,7 +292,7 @@ UnknownScript_0x6acdc: ; 0x6acdc keeptextopen verbosegiveitem BERRY, 1 iffalse UnknownScript_0x6aceb - clearbit1 $0316 + clearevent $0316 loadmovesprites end ; 0x6aceb @@ -311,7 +311,7 @@ UnknownScript_0x6acf1: ; 0x6acf1 OfficerScript_0x6acf4: ; 0x6acf4 faceplayer loadfont - checkbit2 $0051 + checkflag $0051 iftrue UnknownScript_0x6ac91 2writetext UnknownText_0x6b370 closetext @@ -327,7 +327,7 @@ UnknownScript_0x6ad02: ; 0x6ad02 YoungsterScript_0x6ad06: ; 0x6ad06 faceplayer loadfont - checkbit1 $0000 + checkevent $0000 iffalse UnknownScript_0x6ad14 2writetext UnknownText_0x6b399 closetext @@ -345,7 +345,7 @@ UnknownScript_0x6ad14: ; 0x6ad14 YoungsterScript_0x6ad1a: ; 0x6ad1a faceplayer loadfont - checkbit1 $0000 + checkevent $0000 iffalse UnknownScript_0x6ad28 2writetext UnknownText_0x6b40f closetext @@ -363,7 +363,7 @@ UnknownScript_0x6ad28: ; 0x6ad28 RockerScript_0x6ad2e: ; 0x6ad2e faceplayer loadfont - checkbit1 $0000 + checkevent $0000 iffalse UnknownScript_0x6ad3c 2writetext UnknownText_0x6b462 closetext @@ -381,7 +381,7 @@ UnknownScript_0x6ad3c: ; 0x6ad3c PokefanMScript_0x6ad42: ; 0x6ad42 faceplayer loadfont - checkbit1 $0000 + checkevent $0000 iffalse UnknownScript_0x6ad50 2writetext UnknownText_0x6b4da closetext @@ -399,7 +399,7 @@ UnknownScript_0x6ad50: ; 0x6ad50 YoungsterScript_0x6ad56: ; 0x6ad56 faceplayer loadfont - checkbit1 $0000 + checkevent $0000 iffalse UnknownScript_0x6ad64 2writetext UnknownText_0x6b54e closetext @@ -417,7 +417,7 @@ UnknownScript_0x6ad64: ; 0x6ad64 YoungsterScript_0x6ad6a: ; 0x6ad6a faceplayer loadfont - checkbit1 $0000 + checkevent $0000 iffalse UnknownScript_0x6ad78 2writetext UnknownText_0x6b5b0 closetext @@ -435,7 +435,7 @@ UnknownScript_0x6ad78: ; 0x6ad78 LassScript_0x6ad7e: ; 0x6ad7e faceplayer loadfont - checkbit1 $0000 + checkevent $0000 iffalse UnknownScript_0x6ad8c 2writetext UnknownText_0x6b64b closetext @@ -453,7 +453,7 @@ UnknownScript_0x6ad8c: ; 0x6ad8c YoungsterScript_0x6ad92: ; 0x6ad92 faceplayer loadfont - checkbit1 $0000 + checkevent $0000 iffalse UnknownScript_0x6ada0 2writetext UnknownText_0x6b6b8 closetext @@ -471,7 +471,7 @@ UnknownScript_0x6ada0: ; 0x6ada0 YoungsterScript_0x6ada6: ; 0x6ada6 faceplayer loadfont - checkbit1 $0000 + checkevent $0000 iffalse UnknownScript_0x6adb4 2writetext UnknownText_0x6b71b closetext @@ -489,7 +489,7 @@ UnknownScript_0x6adb4: ; 0x6adb4 YoungsterScript_0x6adba: ; 0x6adba faceplayer loadfont - checkbit1 $0000 + checkevent $0000 iffalse UnknownScript_0x6adc8 2writetext UnknownText_0x6b76f closetext diff --git a/maps/Route37.asm b/maps/Route37.asm index c70e38521..55c9cf340 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -112,17 +112,17 @@ PsychicGregScript: ; 0x1a8db7 BugCatcherScript_0x1a8dbf: ; 0x1a8dbf faceplayer loadfont - checkbit1 EVENT_GOT_MAGNET_FROM_SUNNY + checkevent EVENT_GOT_MAGNET_FROM_SUNNY iftrue UnknownScript_0x1a8dfa checkcode $b if_not_equal SUNDAY, UnknownScript_0x1a8e00 - checkbit1 EVENT_MET_SUNNY_OF_SUNDAY + checkevent EVENT_MET_SUNNY_OF_SUNDAY iftrue UnknownScript_0x1a8dda 2writetext UnknownText_0x1a8fc8 keeptextopen - setbit1 EVENT_MET_SUNNY_OF_SUNDAY + setevent EVENT_MET_SUNNY_OF_SUNDAY UnknownScript_0x1a8dda: ; 0x1a8dda - checkbit2 $0063 + checkflag $0063 iftrue UnknownScript_0x1a8de7 2writetext UnknownText_0x1a9004 keeptextopen @@ -135,7 +135,7 @@ UnknownScript_0x1a8de7: ; 0x1a8de7 UnknownScript_0x1a8deb: ; 0x1a8deb verbosegiveitem MAGNET, 1 iffalse UnknownScript_0x1a8dfe - setbit1 EVENT_GOT_MAGNET_FROM_SUNNY + setevent EVENT_GOT_MAGNET_FROM_SUNNY 2writetext UnknownText_0x1a905a closetext loadmovesprites 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 diff --git a/maps/Route39.asm b/maps/Route39.asm index ad255cd9b..96bd384fa 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -39,17 +39,17 @@ PokefanmDerek1Script: ; 0x1a5b0b writecode $17, $1c talkaftercancel loadfont - checkbit2 $0083 + checkflag $0083 iftrue UnknownScript_0x1a5b4a checkcellnum $1c iftrue UnknownScript_0x1a5b6e checkpoke PIKACHU iffalse UnknownScript_0x1a5b5c - checkbit1 EVENT_SHOWED_DEREK_PIKACHU + checkevent EVENT_SHOWED_DEREK_PIKACHU iftrue UnknownScript_0x1a5b33 2writetext UnknownText_0x1a5cf8 keeptextopen - setbit1 EVENT_SHOWED_DEREK_PIKACHU + setevent EVENT_SHOWED_DEREK_PIKACHU 2call UnknownScript_0x1a5b62 2jump UnknownScript_0x1a5b36 ; 0x1a5b33 @@ -69,7 +69,7 @@ UnknownScript_0x1a5b4a: ; 0x1a5b4a 2call UnknownScript_0x1a5b7a verbosegiveitem NUGGET, 1 iffalse UnknownScript_0x1a5b59 - clearbit2 $0083 + clearflag $0083 2jump UnknownScript_0x1a5b6e ; 0x1a5b59 @@ -216,7 +216,7 @@ PokefanFScript_0x1a5bbe: ; 0x1a5bbe loadfont checktime $4 iffalse UnknownScript_0x1a5be5 - checkbit1 $05c2 + checkevent $05c2 iftrue UnknownScript_0x1a5bdf 2writetext UnknownText_0x1a5ee8 closetext @@ -225,7 +225,7 @@ PokefanFScript_0x1a5bbe: ; 0x1a5bbe loadtrainer POKEFANF, JAIME startbattle returnafterbattle - setbit1 $05c2 + setevent $05c2 loadmovesprites end ; 0x1a5bdf diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index e937bcc0b..5757188e1 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -9,7 +9,7 @@ Route39Barn_MapScriptHeader: ; 0x9cc74 TwinScript_0x9cc76: ; 0x9cc76 faceplayer loadfont - checkbit1 EVENT_HEALED_MOOMOO + checkevent EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cc87 2writetext UnknownText_0x9cd2e closetext @@ -29,7 +29,7 @@ UnknownScript_0x9cc87: ; 0x9cc87 TwinScript_0x9cc90: ; 0x9cc90 faceplayer loadfont - checkbit1 EVENT_HEALED_MOOMOO + checkevent EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cca1 2writetext UnknownText_0x9cd2e closetext @@ -48,14 +48,14 @@ UnknownScript_0x9cca1: ; 0x9cca1 TaurosScript_0x9ccaa: ; 0x9ccaa loadfont - checkbit1 EVENT_HEALED_MOOMOO + checkevent EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cd25 2writetext UnknownText_0x9cd70 writebyte MILTANK special $005f keeptextopen 2writetext UnknownText_0x9cd80 - checkbit1 EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO + checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO iftrue UnknownScript_0x9ccc6 closetext loadmovesprites @@ -109,7 +109,7 @@ UnknownScript_0x9cd04: ; 0x9cd04 2writetext UnknownText_0x9ce1b closetext loadmovesprites - setbit1 EVENT_HEALED_MOOMOO + setevent EVENT_HEALED_MOOMOO end ; 0x9cd19 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index cef97e8da..f21b53286 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -9,12 +9,12 @@ Route39Farmhouse_MapScriptHeader: ; 0x9ceb2 PokefanMScript_0x9ceb4: ; 0x9ceb4 faceplayer loadfont - checkbit1 EVENT_HEALED_MOOMOO + checkevent EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cec5 2writetext UnknownText_0x9cf38 closetext loadmovesprites - setbit1 EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO + setevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO end ; 0x9cec5 @@ -71,9 +71,9 @@ UnknownScript_0x9cf08: ; 0x9cf08 PokefanFScript_0x9cf0e: ; 0x9cf0e faceplayer loadfont - checkbit1 EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM + checkevent EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM iftrue UnknownScript_0x9cf2f - checkbit1 EVENT_HEALED_MOOMOO + checkevent EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cf22 2writetext UnknownText_0x9d0f6 closetext @@ -86,7 +86,7 @@ UnknownScript_0x9cf22: ; 0x9cf22 keeptextopen verbosegiveitem TM_13, 1 iffalse UnknownScript_0x9cf33 - setbit1 EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM + setevent EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM UnknownScript_0x9cf2f: ; 0x9cf2f 2writetext UnknownText_0x9d1c7 closetext diff --git a/maps/Route40.asm b/maps/Route40.asm index 6b03735d1..bece0f561 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -11,7 +11,7 @@ Route40_MapScriptHeader: ; 0x1a6160 ; 0x1a6165 UnknownScript_0x1a6165: ; 0x1a6165 - clearbit1 $07cf + clearevent $07cf checkcode $b if_equal MONDAY, UnknownScript_0x1a6171 disappear $a @@ -164,21 +164,21 @@ StandingYoungsterScript_0x1a61d6: ; 0x1a61d6 BuenaScript_0x1a61d9: ; 0x1a61d9 faceplayer loadfont - checkbit1 EVENT_GOT_SHARP_BEAK_FROM_MONICA + checkevent EVENT_GOT_SHARP_BEAK_FROM_MONICA iftrue UnknownScript_0x1a6207 checkcode $b if_not_equal MONDAY, UnknownScript_0x1a620d - checkbit1 EVENT_MET_MONICA_OF_MONDAY + checkevent EVENT_MET_MONICA_OF_MONDAY iftrue UnknownScript_0x1a61f4 2writetext UnknownText_0x1a6606 keeptextopen - setbit1 EVENT_MET_MONICA_OF_MONDAY + setevent EVENT_MET_MONICA_OF_MONDAY UnknownScript_0x1a61f4: ; 0x1a61f4 2writetext UnknownText_0x1a6636 keeptextopen verbosegiveitem SHARP_BEAK, 1 iffalse UnknownScript_0x1a620b - setbit1 EVENT_GOT_SHARP_BEAK_FROM_MONICA + setevent EVENT_GOT_SHARP_BEAK_FROM_MONICA 2writetext UnknownText_0x1a666c closetext loadmovesprites diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 6ea576cbd..f9e1ffef6 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -11,7 +11,7 @@ Route40BattleTowerGate_MapScriptHeader: ; 0x9f660 ; 0x9f665 UnknownScript_0x9f665: ; 0x9f665 - clearbit1 $07cf + clearevent $07cf return ; 0x9f669 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 diff --git a/maps/Route43.asm b/maps/Route43.asm index 749bed109..37e19c10f 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -11,7 +11,7 @@ Route43_MapScriptHeader: ; 0x19d04c ; 0x19d051 UnknownScript_0x19d051: ; 0x19d051 - checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT + checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19d05c domaptrigger GROUP_ROUTE_43_GATE, MAP_ROUTE_43_GATE, $0 return @@ -104,15 +104,15 @@ PokemaniacBrent1Script: ; 0x19d095 writecode $17, $1e talkaftercancel loadfont - checkbit2 $0077 + checkflag $0077 iftrue UnknownScript_0x19d0cf checkcellnum $1e iftrue UnknownScript_0x19d138 - checkbit1 $0291 + checkevent $0291 iftrue UnknownScript_0x19d0b8 2writetext UnknownText_0x19d359 keeptextopen - setbit1 $0291 + setevent $0291 2call UnknownScript_0x19d12c 2jump UnknownScript_0x19d0bb ; 0x19d0b8 @@ -137,20 +137,20 @@ UnknownScript_0x19d0cf: ; 0x19d0cf if_equal $1, UnknownScript_0x19d0f6 if_equal $0, UnknownScript_0x19d0fc UnknownScript_0x19d0ea: ; 0x19d0ea - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x19d123 UnknownScript_0x19d0f0: ; 0x19d0f0 - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x19d116 UnknownScript_0x19d0f6: ; 0x19d0f6 - checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT + checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19d109 UnknownScript_0x19d0fc: ; 0x19d0fc loadtrainer POKEMANIAC, BRENT1 startbattle returnafterbattle loadvar $da07, $1 - clearbit2 $0077 + clearflag $0077 end ; 0x19d109 @@ -159,7 +159,7 @@ UnknownScript_0x19d109: ; 0x19d109 startbattle returnafterbattle loadvar $da07, $2 - clearbit2 $0077 + clearflag $0077 end ; 0x19d116 @@ -168,7 +168,7 @@ UnknownScript_0x19d116: ; 0x19d116 startbattle returnafterbattle loadvar $da07, $3 - clearbit2 $0077 + clearflag $0077 end ; 0x19d123 @@ -176,7 +176,7 @@ UnknownScript_0x19d123: ; 0x19d123 loadtrainer POKEMANIAC, BRENT4 startbattle returnafterbattle - clearbit2 $0077 + clearflag $0077 end ; 0x19d12c @@ -297,19 +297,19 @@ PicnickerTiffany3Script: ; 0x19d17c writecode $17, $1f talkaftercancel loadfont - checkbit2 $0078 + checkflag $0078 iftrue UnknownScript_0x19d1c1 - checkbit2 $0085 + checkflag $0085 iftrue UnknownScript_0x19d21e checkcellnum $1f iftrue UnknownScript_0x19d245 checkpoke CLEFAIRY iffalse UnknownScript_0x19d233 - checkbit1 EVENT_SHOWED_TIFFANY_CLEFAIRY + checkevent EVENT_SHOWED_TIFFANY_CLEFAIRY iftrue UnknownScript_0x19d1aa 2writetext UnknownText_0x19d618 keeptextopen - setbit1 EVENT_SHOWED_TIFFANY_CLEFAIRY + setevent EVENT_SHOWED_TIFFANY_CLEFAIRY 2call UnknownScript_0x19d239 2jump UnknownScript_0x19d1ad ; 0x19d1aa @@ -334,20 +334,20 @@ UnknownScript_0x19d1c1: ; 0x19d1c1 if_equal $1, UnknownScript_0x19d1e8 if_equal $0, UnknownScript_0x19d1ee UnknownScript_0x19d1dc: ; 0x19d1dc - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x19d215 UnknownScript_0x19d1e2: ; 0x19d1e2 - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x19d208 UnknownScript_0x19d1e8: ; 0x19d1e8 - checkbit1 EVENT_CLEARED_RADIO_TOWER + checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x19d1fb UnknownScript_0x19d1ee: ; 0x19d1ee loadtrainer PICNICKER, TIFFANY3 startbattle returnafterbattle loadvar $da08, $1 - clearbit2 $0078 + clearflag $0078 end ; 0x19d1fb @@ -356,7 +356,7 @@ UnknownScript_0x19d1fb: ; 0x19d1fb startbattle returnafterbattle loadvar $da08, $2 - clearbit2 $0078 + clearflag $0078 end ; 0x19d208 @@ -365,7 +365,7 @@ UnknownScript_0x19d208: ; 0x19d208 startbattle returnafterbattle loadvar $da08, $3 - clearbit2 $0078 + clearflag $0078 end ; 0x19d215 @@ -373,7 +373,7 @@ UnknownScript_0x19d215: ; 0x19d215 loadtrainer PICNICKER, TIFFANY4 startbattle returnafterbattle - clearbit2 $0078 + clearflag $0078 end ; 0x19d21e @@ -381,8 +381,8 @@ UnknownScript_0x19d21e: ; 0x19d21e 2call UnknownScript_0x19d255 verbosegiveitem PINK_BOW, 1 iffalse UnknownScript_0x19d230 - clearbit2 $0085 - setbit1 $0104 + clearflag $0085 + setevent $0104 2jump UnknownScript_0x19d245 ; 0x19d230 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index f6947da9e..fcf1ab98b 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -24,7 +24,7 @@ UnknownScript_0x19abc9: ; 0x19abc9 ; 0x19abca UnknownScript_0x19abca: ; 0x19abca - checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT + checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19abd5 domaptrigger GROUP_ROUTE_43, MAP_ROUTE_43, $0 return @@ -124,13 +124,13 @@ RocketScript_0x19ac82: ; 0x19ac82 OfficerScript_0x19ac85: ; 0x19ac85 faceplayer loadfont - checkbit1 EVENT_GOT_TM36_SLUDGE_BOMB + checkevent EVENT_GOT_TM36_SLUDGE_BOMB iftrue UnknownScript_0x19ac9c 2writetext UnknownText_0x19ad9b keeptextopen verbosegiveitem TM_36, 1 iffalse UnknownScript_0x19aca0 - setbit1 EVENT_GOT_TM36_SLUDGE_BOMB + setevent EVENT_GOT_TM36_SLUDGE_BOMB loadmovesprites end ; 0x19ac9c diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index 168e5a6d8..e03ac1d63 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -9,7 +9,7 @@ Route43MahoganyGate_MapScriptHeader: ; 0x19ab09 OfficerScript_0x19ab0b: ; 0x19ab0b faceplayer loadfont - checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT + checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19ab19 2writetext UnknownText_0x19ab1f closetext diff --git a/maps/Route44.asm b/maps/Route44.asm index d94cccfbd..c035607ce 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -30,15 +30,15 @@ Bird_keeperVance1Script: ; 0x19d830 writecode $17, $20 talkaftercancel loadfont - checkbit2 $0079 + checkflag $0079 iftrue UnknownScript_0x19d86a checkcellnum $20 iftrue UnknownScript_0x19d8eb - checkbit1 $0295 + checkevent $0295 iftrue UnknownScript_0x19d853 2writetext UnknownText_0x19dbf3 keeptextopen - setbit1 $0295 + setevent $0295 2call UnknownScript_0x19d8df 2jump UnknownScript_0x19d856 ; 0x19d853 @@ -62,17 +62,17 @@ UnknownScript_0x19d86a: ; 0x19d86a if_equal $1, UnknownScript_0x19d887 if_equal $0, UnknownScript_0x19d88d UnknownScript_0x19d881: ; 0x19d881 - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x19d8a7 UnknownScript_0x19d887: ; 0x19d887 - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x19d89a UnknownScript_0x19d88d: ; 0x19d88d loadtrainer BIRD_KEEPER, VANCE1 startbattle returnafterbattle loadvar $da09, $1 - clearbit2 $0079 + clearflag $0079 end ; 0x19d89a @@ -81,7 +81,7 @@ UnknownScript_0x19d89a: ; 0x19d89a startbattle returnafterbattle loadvar $da09, $2 - clearbit2 $0079 + clearflag $0079 end ; 0x19d8a7 @@ -89,15 +89,15 @@ UnknownScript_0x19d8a7: ; 0x19d8a7 loadtrainer BIRD_KEEPER, VANCE3 startbattle returnafterbattle - clearbit2 $0079 - checkbit1 EVENT_VANCE_CARBOS + clearflag $0079 + checkevent EVENT_VANCE_CARBOS iftrue UnknownScript_0x19d8cb - checkbit1 $0267 + checkevent $0267 iftrue UnknownScript_0x19d8ca 2call UnknownScript_0x19d90a verbosegiveitem CARBOS, 1 iffalse UnknownScript_0x19d903 - setbit1 $0267 + setevent $0267 2jump UnknownScript_0x19d8eb ; 0x19d8ca @@ -111,8 +111,8 @@ UnknownScript_0x19d8cb: ; 0x19d8cb closetext verbosegiveitem CARBOS, 1 iffalse UnknownScript_0x19d903 - clearbit1 EVENT_VANCE_CARBOS - setbit1 $0267 + clearevent EVENT_VANCE_CARBOS + setevent $0267 2jump UnknownScript_0x19d8eb ; 0x19d8df @@ -162,7 +162,7 @@ UnknownScript_0x19d8ff: ; 0x19d8ff ; 0x19d903 UnknownScript_0x19d903: ; 0x19d903 - setbit1 EVENT_VANCE_CARBOS + setevent EVENT_VANCE_CARBOS jumpstd $0021 end ; 0x19d90a @@ -225,17 +225,17 @@ FisherWilton1Script: ; 0x19d92e writecode $17, $21 talkaftercancel loadfont - checkbit2 $007a + checkflag $007a iftrue UnknownScript_0x19d96e - checkbit2 $0086 + checkflag $0086 iftrue UnknownScript_0x19d9b4 checkcellnum $21 iftrue UnknownScript_0x19d8eb - checkbit1 $0297 + checkevent $0297 iftrue UnknownScript_0x19d957 2writetext UnknownText_0x19daa8 keeptextopen - setbit1 $0297 + setevent $0297 2call UnknownScript_0x19d8df 2jump UnknownScript_0x19d95a ; 0x19d957 @@ -259,17 +259,17 @@ UnknownScript_0x19d96e: ; 0x19d96e if_equal $1, UnknownScript_0x19d98b if_equal $0, UnknownScript_0x19d991 UnknownScript_0x19d985: ; 0x19d985 - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x19d9ab UnknownScript_0x19d98b: ; 0x19d98b - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x19d99e UnknownScript_0x19d991: ; 0x19d991 loadtrainer FISHER, WILTON1 startbattle returnafterbattle loadvar $da0a, $1 - clearbit2 $007a + clearflag $007a end ; 0x19d99e @@ -278,7 +278,7 @@ UnknownScript_0x19d99e: ; 0x19d99e startbattle returnafterbattle loadvar $da0a, $2 - clearbit2 $007a + clearflag $007a end ; 0x19d9ab @@ -286,17 +286,17 @@ UnknownScript_0x19d9ab: ; 0x19d9ab loadtrainer FISHER, WILTON3 startbattle returnafterbattle - clearbit2 $007a + clearflag $007a end ; 0x19d9b4 UnknownScript_0x19d9b4: ; 0x19d9b4 2call UnknownScript_0x19d8fb - checkbit1 EVENT_WILTON_HAS_ULTRA_BALL + checkevent EVENT_WILTON_HAS_ULTRA_BALL iftrue UnknownScript_0x19d9c9 - checkbit1 EVENT_WILTON_HAS_GREAT_BALL + checkevent EVENT_WILTON_HAS_GREAT_BALL iftrue UnknownScript_0x19d9d2 - checkbit1 EVENT_WILTON_HAS_POKE_BALL + checkevent EVENT_WILTON_HAS_POKE_BALL iftrue UnknownScript_0x19d9db UnknownScript_0x19d9c9: ; 0x19d9c9 verbosegiveitem ULTRA_BALL, 1 @@ -314,7 +314,7 @@ UnknownScript_0x19d9db: ; 0x19d9db verbosegiveitem POKE_BALL, 1 iffalse UnknownScript_0x19d9e7 UnknownScript_0x19d9e1: ; 0x19d9e1 - clearbit2 $0086 + clearflag $0086 2jump UnknownScript_0x19d8eb ; 0x19d9e7 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 diff --git a/maps/Route46.asm b/maps/Route46.asm index 2203faeba..f9b922687 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -59,15 +59,15 @@ PicnickerErin1Script: ; 0x1a96a0 writecode $17, $24 talkaftercancel loadfont - checkbit2 $007c + checkflag $007c iftrue UnknownScript_0x1a96da checkcellnum $24 iftrue UnknownScript_0x1a975b - checkbit1 $029d + checkevent $029d iftrue UnknownScript_0x1a96c3 2writetext UnknownText_0x1a98c6 keeptextopen - setbit1 $029d + setevent $029d 2call UnknownScript_0x1a974f 2jump UnknownScript_0x1a96c6 ; 0x1a96c3 @@ -91,17 +91,17 @@ UnknownScript_0x1a96da: ; 0x1a96da if_equal $1, UnknownScript_0x1a96f7 if_equal $0, UnknownScript_0x1a96fd UnknownScript_0x1a96f1: ; 0x1a96f1 - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a9717 UnknownScript_0x1a96f7: ; 0x1a96f7 - checkbit1 $0044 + checkevent $0044 iftrue UnknownScript_0x1a970a UnknownScript_0x1a96fd: ; 0x1a96fd loadtrainer PICNICKER, ERIN1 startbattle returnafterbattle loadvar $da0d, $1 - clearbit2 $007c + clearflag $007c end ; 0x1a970a @@ -110,7 +110,7 @@ UnknownScript_0x1a970a: ; 0x1a970a startbattle returnafterbattle loadvar $da0d, $2 - clearbit2 $007c + clearflag $007c end ; 0x1a9717 @@ -118,15 +118,15 @@ UnknownScript_0x1a9717: ; 0x1a9717 loadtrainer PICNICKER, ERIN3 startbattle returnafterbattle - clearbit2 $007c - checkbit1 EVENT_ERIN_CALCIUM + clearflag $007c + checkevent EVENT_ERIN_CALCIUM iftrue UnknownScript_0x1a973b - checkbit1 $0269 + checkevent $0269 iftrue UnknownScript_0x1a973a 2call UnknownScript_0x1a9772 verbosegiveitem CALCIUM, 1 iffalse UnknownScript_0x1a976b - setbit1 $0269 + setevent $0269 2jump UnknownScript_0x1a975b ; 0x1a973a @@ -140,8 +140,8 @@ UnknownScript_0x1a973b: ; 0x1a973b closetext verbosegiveitem CALCIUM, 1 iffalse UnknownScript_0x1a976b - clearbit1 EVENT_ERIN_CALCIUM - setbit1 $0269 + clearevent EVENT_ERIN_CALCIUM + setevent $0269 2jump UnknownScript_0x1a975b ; 0x1a974f @@ -181,7 +181,7 @@ UnknownScript_0x1a9767: ; 0x1a9767 ; 0x1a976b UnknownScript_0x1a976b: ; 0x1a976b - setbit1 EVENT_ERIN_CALCIUM + setevent EVENT_ERIN_CALCIUM jumpstd $002b end ; 0x1a9772 diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index 918c411d7..9479583a4 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -9,13 +9,13 @@ Route5CleanseTagSpeechHouse_MapScriptHeader: ; 0x18b632 GrannyScript_0x18b634: ; 0x18b634 faceplayer loadfont - checkbit1 EVENT_GOT_CLEANSE_TAG + checkevent EVENT_GOT_CLEANSE_TAG iftrue UnknownScript_0x18b649 2writetext UnknownText_0x18b655 keeptextopen verbosegiveitem CLEANSE_TAG, 1 iffalse UnknownScript_0x18b64d - setbit1 EVENT_GOT_CLEANSE_TAG + setevent EVENT_GOT_CLEANSE_TAG UnknownScript_0x18b649: ; 0x18b649 2writetext UnknownText_0x18b6a7 closetext diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 380f9fbd8..4f0a6ed68 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -16,7 +16,7 @@ UnknownScript_0x1926e9: ; 0x1926e9 OfficerScript_0x1926ea: ; 0x1926ea faceplayer loadfont - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x1926f8 2writetext UnknownText_0x1926fe closetext diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 0ded4568b..b41b967ae 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -9,7 +9,7 @@ Route7SaffronGate_MapScriptHeader: ; 0x73516 OfficerScript_0x73518: ; 0x73518 faceplayer loadfont - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x73526 2writetext UnknownText_0x7352c closetext diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index 62739b4a9..c2d8865f3 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -15,7 +15,7 @@ RuinsofAlphAerodactylChamber_MapScriptHeader: ; 0x58da0 ; 0x58dad UnknownScript_0x58dad: ; 0x58dad - checkbit1 EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER + checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER iftrue UnknownScript_0x58db4 end ; 0x58db4 @@ -30,11 +30,11 @@ UnknownScript_0x58db8: ; 0x58db8 ; 0x58db9 UnknownScript_0x58db9: ; 0x58db9 - checkbit1 EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER + checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER iftrue UnknownScript_0x58dc3 changeblock $4, $0, $2e UnknownScript_0x58dc3: ; 0x58dc3 - checkbit1 $02a3 + checkevent $02a3 iffalse UnknownScript_0x58dca return ; 0x58dca @@ -69,9 +69,9 @@ MapRuinsofAlphAerodactylChamberSignpost2Script: ; 0x58deb ; 0x58df7 UnknownScript_0x58df7: ; 0x58df7 - setbit1 $0705 - setbit1 $02a3 - setbit2 $002d + setevent $0705 + setevent $02a3 + setflag $002d domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote $0, $0, 15 @@ -106,7 +106,7 @@ MapRuinsofAlphAerodactylChamberSignpost4Script: ; 0x58e2a ; 0x58e35 MapRuinsofAlphAerodactylChamberSignpost5Script: ; 0x58e35 - checkbit1 EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER + checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER iftrue UnknownScript_0x58e46 loadfont 2writetext UnknownText_0x58e81 diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index 512f0a37c..f4ffeec68 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -16,7 +16,7 @@ RuinsofAlphHoOhChamber_MapScriptHeader: ; 0x58560 UnknownScript_0x5856d: ; 0x5856d special $008d - checkbit1 EVENT_WALL_OPENED_IN_HO_OH_CHAMBER + checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue UnknownScript_0x58577 end ; 0x58577 @@ -31,11 +31,11 @@ UnknownScript_0x5857b: ; 0x5857b ; 0x5857c UnknownScript_0x5857c: ; 0x5857c - checkbit1 EVENT_WALL_OPENED_IN_HO_OH_CHAMBER + checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue UnknownScript_0x58586 changeblock $4, $0, $2e UnknownScript_0x58586: ; 0x58586 - checkbit1 $02a0 + checkevent $02a0 iffalse UnknownScript_0x5858d return ; 0x5858d @@ -70,9 +70,9 @@ MapRuinsofAlphHoOhChamberSignpost2Script: ; 0x585ae ; 0x585ba UnknownScript_0x585ba: ; 0x585ba - setbit1 $0705 - setbit1 $02a0 - setbit2 $002e + setevent $0705 + setevent $02a0 + setflag $002e domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote $0, $0, 15 @@ -107,7 +107,7 @@ MapRuinsofAlphHoOhChamberSignpost4Script: ; 0x585ed ; 0x585f8 MapRuinsofAlphHoOhChamberSignpost5Script: ; 0x585f8 - checkbit1 EVENT_WALL_OPENED_IN_HO_OH_CHAMBER + checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue UnknownScript_0x58609 loadfont 2writetext UnknownText_0x58644 diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index 3ef70d6bd..aaa3f0906 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -28,8 +28,8 @@ UnknownScript_0x58f6e: ; 0x58f6e closetext loadmovesprites dotrigger $0 - setbit1 EVENT_MADE_UNOWN_APPEAR_IN_RUINS - clearbit1 $078e + setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS + clearevent $078e end ; 0x58f7d diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index b96862cc3..4dbc95939 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -15,7 +15,7 @@ RuinsofAlphKabutoChamber_MapScriptHeader: ; 0x5871e ; 0x5872b UnknownScript_0x5872b: ; 0x5872b - checkbit1 EVENT_WALL_OPENED_IN_KABUTO_CHAMBER + checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x58732 end ; 0x58732 @@ -33,11 +33,11 @@ UnknownScript_0x58736: ; 0x58736 ; 0x58737 UnknownScript_0x58737: ; 0x58737 - checkbit1 EVENT_WALL_OPENED_IN_KABUTO_CHAMBER + checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x58741 changeblock $4, $0, $2e UnknownScript_0x58741: ; 0x58741 - checkbit1 $02a1 + checkevent $02a1 iffalse UnknownScript_0x58748 return ; 0x58748 @@ -76,10 +76,10 @@ MapRuinsofAlphKabutoChamberSignpost2Script: ; 0x5876c ; 0x58778 UnknownScript_0x58778: ; 0x58778 - setbit1 $0705 - setbit1 $02a1 - setbit2 $002b - setbit1 $074e + setevent $0705 + setevent $02a1 + setflag $002b + setevent $074e domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote $0, $0, 15 @@ -101,9 +101,9 @@ ScientistScript_0x587a8: ; 0x587a8 loadfont checkcode $e if_equal 26, UnknownScript_0x587cf - checkbit1 EVENT_WALL_OPENED_IN_KABUTO_CHAMBER + checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x587c9 - checkbit1 $02a1 + checkevent $02a1 iffalse UnknownScript_0x587c0 2writetext UnknownText_0x589b8 keeptextopen @@ -147,7 +147,7 @@ MapRuinsofAlphKabutoChamberSignpost4Script: ; 0x587db ; 0x587e6 MapRuinsofAlphKabutoChamberSignpost5Script: ; 0x587e6 - checkbit1 EVENT_WALL_OPENED_IN_KABUTO_CHAMBER + checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x587f7 loadfont 2writetext UnknownText_0x58ad9 diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index a904b7118..f0e488dfa 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -16,7 +16,7 @@ RuinsofAlphOmanyteChamber_MapScriptHeader: ; 0x58bdc UnknownScript_0x58be9: ; 0x58be9 special $0084 - checkbit1 EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER + checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue UnknownScript_0x58bf3 end ; 0x58bf3 @@ -31,11 +31,11 @@ UnknownScript_0x58bf7: ; 0x58bf7 ; 0x58bf8 UnknownScript_0x58bf8: ; 0x58bf8 - checkbit1 EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER + checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue UnknownScript_0x58c02 changeblock $4, $0, $2e UnknownScript_0x58c02: ; 0x58c02 - checkbit1 $02a2 + checkevent $02a2 iffalse UnknownScript_0x58c09 return ; 0x58c09 @@ -70,9 +70,9 @@ MapRuinsofAlphOmanyteChamberSignpost2Script: ; 0x58c2a ; 0x58c36 UnknownScript_0x58c36: ; 0x58c36 - setbit1 $0705 - setbit1 $02a2 - setbit2 $002c + setevent $0705 + setevent $02a2 + setflag $002c domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote $0, $0, 15 @@ -107,7 +107,7 @@ MapRuinsofAlphOmanyteChamberSignpost4Script: ; 0x58c69 ; 0x58c74 MapRuinsofAlphOmanyteChamberSignpost5Script: ; 0x58c74 - checkbit1 EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER + checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue UnknownScript_0x58c85 loadfont 2writetext UnknownText_0x58cc0 diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index 4658d2d61..34f5bc650 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -23,16 +23,16 @@ UnknownScript_0x5800e: ; 0x5800e ; 0x5800f UnknownScript_0x5800f: ; 0x5800f - checkbit2 $000c + checkflag $000c iftrue UnknownScript_0x5802c - checkbit1 EVENT_MADE_UNOWN_APPEAR_IN_RUINS + checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x5801e 2jump UnknownScript_0x5802c ; 0x5801e UnknownScript_0x5801e: ; 0x5801e checkcode $e - if_less_than $2, UnknownScript_0x58027 + if_greater_than $2, UnknownScript_0x58027 2jump UnknownScript_0x5802c ; 0x58027 @@ -81,9 +81,9 @@ UnknownScript_0x58044: ; 0x58044 FisherScript_0x58061: ; 0x58061 faceplayer loadfont - checkbit1 $00bc + checkevent $00bc iftrue UnknownScript_0x58070 - setbit1 $00bc + setevent $00bc 2writetext UnknownText_0x583a4 keeptextopen UnknownScript_0x58070: ;0x58070 diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index 0ab3ff03d..6ed7d902c 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -55,7 +55,7 @@ UnknownScript_0x59192: ; 0x59192 2writetext UnknownText_0x592fa playsound $0001 waitbutton - setbit2 $000c + setflag $000c 2writetext UnknownText_0x59311 closetext loadmovesprites @@ -88,9 +88,9 @@ ScientistScript_0x591e5: ; 0x591e5 loadfont checkcode $e if_equal 26, UnknownScript_0x5920b - checkbit2 $000c + checkflag $000c iftrue UnknownScript_0x59205 - checkbit1 EVENT_MADE_UNOWN_APPEAR_IN_RUINS + checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x591ff 2writetext UnknownText_0x593ed closetext @@ -116,7 +116,7 @@ UnknownScript_0x5920b: ; 0x5920b 2writetext UnknownText_0x594cb closetext loadmovesprites - clearbit1 $078f + clearevent $078f end ; 0x59214 @@ -125,7 +125,7 @@ ScientistScript_0x59214: ; 0x59214 loadfont checkcode $e if_equal 26, UnknownScript_0x5922e - checkbit1 EVENT_MADE_UNOWN_APPEAR_IN_RUINS + checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x59228 2writetext UnknownText_0x5954f closetext @@ -149,7 +149,7 @@ UnknownScript_0x5922e: ; 0x5922e MapRuinsofAlphResearchCenterSignpost1Script: ; 0x59234 loadfont - checkbit1 $0704 + checkevent $0704 iftrue UnknownScript_0x59241 checkcode $e if_equal 26, UnknownScript_0x59247 @@ -169,7 +169,7 @@ UnknownScript_0x59247: ; 0x59247 MapRuinsofAlphResearchCenterSignpost2Script: ; 0x5924d loadfont - checkbit1 $0704 + checkevent $0704 iftrue UnknownScript_0x5925a checkcode $e if_equal 26, UnknownScript_0x59260 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index aac403aa0..dd3c3f0fe 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -9,12 +9,12 @@ SafariZoneWardensHome_MapScriptHeader: ; 0x1965c4 LassScript_0x1965c6: ; 0x1965c6 faceplayer loadfont - checkbit1 EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER + checkevent EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER iftrue UnknownScript_0x1965d7 2writetext UnknownText_0x1965e6 closetext loadmovesprites - setbit1 EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER + setevent EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER end ; 0x1965d7 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 5b045eff1..8d449f089 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -11,14 +11,14 @@ SaffronCity_MapScriptHeader: ; 0x199321 ; 0x199326 UnknownScript_0x199326: ; 0x199326 - setbit2 $003c + setflag $003c return ; 0x19932a LassScript_0x19932a: ; 0x19932a faceplayer loadfont - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x199338 2writetext UnknownText_0x19938d closetext @@ -36,7 +36,7 @@ UnknownScript_0x199338: ; 0x199338 PokefanMScript_0x19933e: ; 0x19933e faceplayer loadfont - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x19934c 2writetext UnknownText_0x199460 closetext @@ -62,7 +62,7 @@ CooltrainerFScript_0x199355: ; 0x199355 FisherScript_0x199358: ; 0x199358 faceplayer loadfont - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x199366 2writetext UnknownText_0x1995fc closetext diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 52499a2f7..a888d34b7 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -9,7 +9,7 @@ SaffronGym_MapScriptHeader: ; 0x189c2c SabrinaScript_0x189c2e: ; 0x189c2e faceplayer loadfont - checkbit2 $0028 + checkflag $0028 iftrue UnknownScript_0x189c65 2writetext UnknownText_0x189cdf closetext @@ -18,16 +18,16 @@ SabrinaScript_0x189c2e: ; 0x189c2e loadtrainer SABRINA, 1 startbattle returnafterbattle - setbit1 EVENT_BEAT_SABRINA - setbit1 EVENT_BEAT_MEDIUM_REBECCA - setbit1 EVENT_BEAT_MEDIUM_DORIS - setbit1 EVENT_BEAT_PSYCHIC_FRANKLIN - setbit1 EVENT_BEAT_PSYCHIC_JARED + setevent EVENT_BEAT_SABRINA + setevent EVENT_BEAT_MEDIUM_REBECCA + setevent EVENT_BEAT_MEDIUM_DORIS + setevent EVENT_BEAT_PSYCHIC_FRANKLIN + setevent EVENT_BEAT_PSYCHIC_JARED loadfont 2writetext UnknownText_0x189e95 playsound $009c waitbutton - setbit2 $0028 + setflag $0028 2writetext UnknownText_0x189ead closetext loadmovesprites @@ -160,7 +160,7 @@ PsychicJaredScript: ; 0x189cb3 SaffronGymGuyScript: ; 0x189cbb faceplayer loadfont - checkbit1 EVENT_BEAT_SABRINA + checkevent EVENT_BEAT_SABRINA iftrue .SaffronGymGuyWinScript 2writetext SaffronGymGuyText closetext @@ -175,7 +175,7 @@ SaffronGymGuyScript: ; 0x189cbb ; 0x189ccf MapSaffronGymSignpost0Script: ; 0x189ccf - checkbit2 $0028 + checkflag $0028 iftrue UnknownScript_0x189cd8 jumpstd $002d ; 0x189cd8 diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index 41b028d5b..785005eab 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -23,7 +23,7 @@ UnknownScript_0x18a489: ; 0x18a489 FisherScript_0x18a48c: ; 0x18a48c faceplayer loadfont - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x18a49a 2writetext UnknownText_0x18a5d3 closetext diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index 897f702d7..599a19d71 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -16,7 +16,7 @@ UnknownScript_0x18a81d: ; 0x18a81d OfficerScript_0x18a81e: ; 0x18a81e faceplayer loadfont - checkbit1 EVENT_RESTORED_POWER_TO_KANTO + checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x18a82c 2writetext UnknownText_0x18a8a9 closetext @@ -40,7 +40,7 @@ UnknownScript_0x18a82c: ; 0x18a82c warpcheck newloadmap $f9 applymovement $0, MovementData_0x18a854 - unknown0xa8 $14 + wait $14 end ; 0x18a854 @@ -77,7 +77,7 @@ UnknownScript_0x18a862: ; 0x18a862 GymGuyScript_0x18a875: ; 0x18a875 faceplayer loadfont - checkbit1 EVENT_RETURNED_MACHINE_PART + checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x18a883 2writetext UnknownText_0x18a9ca closetext diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index cd0405e3b..35ea18064 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -16,7 +16,7 @@ UnknownScript_0x1ab4fa: ; 0x1ab4fa BlaineScript_0x1ab4fb: ; 0x1ab4fb faceplayer loadfont - checkbit2 $0029 + checkflag $0029 iftrue UnknownScript_0x1ab52b 2writetext UnknownText_0x1ab548 closetext @@ -28,12 +28,12 @@ BlaineScript_0x1ab4fb: ; 0x1ab4fb appear $3 UnknownScript_0x1ab516: ; 0x1ab516 returnafterbattle - setbit1 $04cb + setevent $04cb loadfont 2writetext UnknownText_0x1ab683 playsound $009c waitbutton - setbit2 $0029 + setflag $0029 2writetext UnknownText_0x1ab69d closetext loadmovesprites @@ -50,12 +50,12 @@ UnknownScript_0x1ab52b: ; 0x1ab52b SeafoamGymGuyScript: ; 0x1ab531 faceplayer loadfont - checkbit1 EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE + checkevent EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE iftrue .TalkedToSeafoamGymGuyScript 2writetext SeafoamGymGuyWinText closetext loadmovesprites - setbit1 EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE + setevent EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE end .TalkedToSeafoamGymGuyScript diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index 614b3eb8d..05d6b012a 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -13,13 +13,13 @@ ReceptionistScript_0x18abe5: ; 0x18abe5 OfficerScript_0x18abe8: ; 0x18abe8 faceplayer loadfont - checkbit1 EVENT_GOT_UP_GRADE + checkevent EVENT_GOT_UP_GRADE iftrue UnknownScript_0x18abfd 2writetext UnknownText_0x18ac36 keeptextopen verbosegiveitem UP_GRADE, 1 iffalse UnknownScript_0x18ac01 - setbit1 EVENT_GOT_UP_GRADE + setevent EVENT_GOT_UP_GRADE UnknownScript_0x18abfd: ; 0x18abfd 2writetext UnknownText_0x18aca8 closetext diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 6b97ca848..9bd575c83 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -11,7 +11,7 @@ SilverCaveOutside_MapScriptHeader: ; 0x1b2042 ; 0x1b2047 UnknownScript_0x1b2047: ; 0x1b2047 - setbit2 $004c + setflag $004c return ; 0x1b204b diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 245bdbc29..d8bce2163 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -81,18 +81,18 @@ GruntM1Script: ; 0x5a5f8 2writetext KurtLeaveSlowpokeWellText closetext loadmovesprites - setbit1 EVENT_CLEARED_SLOWPOKE_WELL + setevent EVENT_CLEARED_SLOWPOKE_WELL variablesprite $6, $4 domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $1 - clearbit1 $06f3 - clearbit1 $06e9 - setbit1 $06f5 - setbit1 $06f6 - setbit1 $06fb - setbit1 $0740 - clearbit1 $06f9 - clearbit1 $06fd - clearbit1 $073e + clearevent $06f3 + clearevent $06e9 + setevent $06f5 + setevent $06f6 + setevent $06fb + setevent $0740 + clearevent $06f9 + clearevent $06fd + clearevent $073e special $002e special $001b pause 15 diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 45b3201fe..de9f00def 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -9,13 +9,13 @@ SlowpokeWellB2F_MapScriptHeader: ; 0x5ad09 GymGuyScript_0x5ad0b: ; 0x5ad0b faceplayer loadfont - checkbit1 EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL + checkevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL iftrue UnknownScript_0x5ad22 2writetext UnknownText_0x5ad2a keeptextopen verbosegiveitem KINGS_ROCK, 1 iffalse UnknownScript_0x5ad20 - setbit1 EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL + setevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL UnknownScript_0x5ad20: ; 0x5ad20 loadmovesprites end diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 0f935bb74..70209ba59 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -63,7 +63,7 @@ UnknownScript_0x184947: ; 0x184947 SageLiScript: ; 0x1849a6 faceplayer loadfont - checkbit1 EVENT_GOT_HM05_FLASH + checkevent EVENT_GOT_HM05_FLASH iftrue UnknownScript_0x1849d1 2writetext SageLiSeenText closetext @@ -76,8 +76,8 @@ SageLiScript: ; 0x1849a6 2writetext UnknownText_0x184cc2 keeptextopen verbosegiveitem HM_05, 1 - setbit1 EVENT_GOT_HM05_FLASH - setbit1 EVENT_BEAT_SAGE_LI + setevent EVENT_GOT_HM05_FLASH + setevent EVENT_BEAT_SAGE_LI 2writetext UnknownText_0x184d13 closetext loadmovesprites diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 30b163509..101813c0e 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -23,10 +23,10 @@ UnknownScript_0x6c65b: ; 0x6c65b ; 0x6c65e SecurityCamera1a: ; 0x6c65e - checkbit1 EVENT_SECURITY_CAMERA_1 + checkevent EVENT_SECURITY_CAMERA_1 iftrue NoSecurityCamera 2call PlaySecurityCameraSounds - checkbit1 $06da + checkevent $06da iftrue NoSecurityCamera showemote $0, $0, 15 playmusic $0039 @@ -44,15 +44,15 @@ SecurityCamera1a: ; 0x6c65e applymovement $2, SecurityCameraMovement1 2call TrainerCameraGrunt2 if_equal $1, NoSecurityCamera - setbit1 EVENT_SECURITY_CAMERA_1 + setevent EVENT_SECURITY_CAMERA_1 end ; 0x6c6a7 SecurityCamera1b: ; 0x6c6a7 - checkbit1 EVENT_SECURITY_CAMERA_1 + checkevent EVENT_SECURITY_CAMERA_1 iftrue NoSecurityCamera 2call PlaySecurityCameraSounds - checkbit1 $06da + checkevent $06da iftrue NoSecurityCamera showemote $0, $0, 15 playmusic $0039 @@ -70,15 +70,15 @@ SecurityCamera1b: ; 0x6c6a7 applymovement $2, SecurityCameraMovement1 2call TrainerCameraGrunt2 if_equal $1, NoSecurityCamera - setbit1 EVENT_SECURITY_CAMERA_1 + setevent EVENT_SECURITY_CAMERA_1 end ; 0x6c6f0 SecurityCamera2a: ; 0x6c6f0 - checkbit1 EVENT_SECURITY_CAMERA_2 + checkevent EVENT_SECURITY_CAMERA_2 iftrue NoSecurityCamera 2call PlaySecurityCameraSounds - checkbit1 $06da + checkevent $06da iftrue NoSecurityCamera showemote $0, $0, 15 playmusic $0039 @@ -97,15 +97,15 @@ SecurityCamera2a: ; 0x6c6f0 applymovement $2, SecurityCameraMovement3 2call TrainerCameraGrunt2 if_equal $1, NoSecurityCamera - setbit1 EVENT_SECURITY_CAMERA_2 + setevent EVENT_SECURITY_CAMERA_2 end ; 0x6c73c SecurityCamera2b: ; 0x6c73c - checkbit1 EVENT_SECURITY_CAMERA_2 + checkevent EVENT_SECURITY_CAMERA_2 iftrue NoSecurityCamera 2call PlaySecurityCameraSounds - checkbit1 $06da + checkevent $06da iftrue NoSecurityCamera showemote $0, $0, 15 playmusic $0039 @@ -124,15 +124,15 @@ SecurityCamera2b: ; 0x6c73c applymovement $2, SecurityCameraMovement5 2call TrainerCameraGrunt2 if_equal $1, NoSecurityCamera - setbit1 EVENT_SECURITY_CAMERA_2 + setevent EVENT_SECURITY_CAMERA_2 end ; 0x6c788 SecurityCamera3a: ; 0x6c788 - checkbit1 EVENT_SECURITY_CAMERA_3 + checkevent EVENT_SECURITY_CAMERA_3 iftrue NoSecurityCamera 2call PlaySecurityCameraSounds - checkbit1 $06da + checkevent $06da iftrue NoSecurityCamera showemote $0, $0, 15 playmusic $0039 @@ -151,15 +151,15 @@ SecurityCamera3a: ; 0x6c788 applymovement $2, SecurityCameraMovement6 2call TrainerCameraGrunt2 if_equal $1, NoSecurityCamera - setbit1 EVENT_SECURITY_CAMERA_3 + setevent EVENT_SECURITY_CAMERA_3 end ; 0x6c7d4 SecurityCamera3b: ; 0x6c7d4 - checkbit1 EVENT_SECURITY_CAMERA_3 + checkevent EVENT_SECURITY_CAMERA_3 iftrue NoSecurityCamera 2call PlaySecurityCameraSounds - checkbit1 $06da + checkevent $06da iftrue NoSecurityCamera showemote $0, $0, 15 playmusic $0039 @@ -178,15 +178,15 @@ SecurityCamera3b: ; 0x6c7d4 applymovement $2, SecurityCameraMovement7 2call TrainerCameraGrunt2 if_equal $1, NoSecurityCamera - setbit1 EVENT_SECURITY_CAMERA_3 + setevent EVENT_SECURITY_CAMERA_3 end ; 0x6c820 SecurityCamera4: ; 0x6c820 - checkbit1 EVENT_SECURITY_CAMERA_4 + checkevent EVENT_SECURITY_CAMERA_4 iftrue NoSecurityCamera 2call PlaySecurityCameraSounds - checkbit1 $06da + checkevent $06da iftrue NoSecurityCamera showemote $0, $0, 15 playmusic $0039 @@ -205,15 +205,15 @@ SecurityCamera4: ; 0x6c820 applymovement $2, SecurityCameraMovement8 2call TrainerCameraGrunt2 if_equal $1, NoSecurityCamera - setbit1 EVENT_SECURITY_CAMERA_4 + setevent EVENT_SECURITY_CAMERA_4 end ; 0x6c86c SecurityCamera5: ; 0x6c86c - checkbit1 EVENT_SECURITY_CAMERA_5 + checkevent EVENT_SECURITY_CAMERA_5 iftrue NoSecurityCamera 2call PlaySecurityCameraSounds - checkbit1 $06da + checkevent $06da iftrue NoSecurityCamera showemote $0, $0, 15 playmusic $0039 @@ -232,7 +232,7 @@ SecurityCamera5: ; 0x6c86c applymovement $2, SecurityCameraMovement9 2call TrainerCameraGrunt2 if_equal $1, NoSecurityCamera - setbit1 EVENT_SECURITY_CAMERA_5 + setevent EVENT_SECURITY_CAMERA_5 end ; 0x6c8b8 @@ -284,179 +284,179 @@ PlaySecurityCameraSounds: ; 0x6c8e3 ; 0x6c900 ExplodingTrap1: ; 0x6c900 - checkbit1 EVENT_EXPLODING_TRAP_1 + checkevent EVENT_EXPLODING_TRAP_1 iftrue NoExplodingTrap 2call KoffingExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_1 + setevent EVENT_EXPLODING_TRAP_1 end ExplodingTrap2: ; 0x6c90e - checkbit1 EVENT_EXPLODING_TRAP_2 + checkevent EVENT_EXPLODING_TRAP_2 iftrue NoExplodingTrap 2call VoltorbExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_2 + setevent EVENT_EXPLODING_TRAP_2 end ExplodingTrap3: ; 0x6c91c - checkbit1 EVENT_EXPLODING_TRAP_3 + checkevent EVENT_EXPLODING_TRAP_3 iftrue NoExplodingTrap 2call GeodudeExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_3 + setevent EVENT_EXPLODING_TRAP_3 end ExplodingTrap4: ; 0x6c92a - checkbit1 EVENT_EXPLODING_TRAP_4 + checkevent EVENT_EXPLODING_TRAP_4 iftrue NoExplodingTrap 2call VoltorbExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_4 + setevent EVENT_EXPLODING_TRAP_4 end ExplodingTrap5: ; 0x6c938 - checkbit1 EVENT_EXPLODING_TRAP_5 + checkevent EVENT_EXPLODING_TRAP_5 iftrue NoExplodingTrap 2call GeodudeExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_5 + setevent EVENT_EXPLODING_TRAP_5 end ExplodingTrap6: ; 0x6c946 - checkbit1 EVENT_EXPLODING_TRAP_6 + checkevent EVENT_EXPLODING_TRAP_6 iftrue NoExplodingTrap 2call KoffingExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_6 + setevent EVENT_EXPLODING_TRAP_6 end ExplodingTrap7: ; 0x6c954 - checkbit1 EVENT_EXPLODING_TRAP_7 + checkevent EVENT_EXPLODING_TRAP_7 iftrue NoExplodingTrap 2call VoltorbExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_7 + setevent EVENT_EXPLODING_TRAP_7 end ExplodingTrap8: ; 0x6c962 - checkbit1 EVENT_EXPLODING_TRAP_8 + checkevent EVENT_EXPLODING_TRAP_8 iftrue NoExplodingTrap 2call KoffingExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_8 + setevent EVENT_EXPLODING_TRAP_8 end ExplodingTrap9: ; 0x6c970 - checkbit1 EVENT_EXPLODING_TRAP_9 + checkevent EVENT_EXPLODING_TRAP_9 iftrue NoExplodingTrap 2call KoffingExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_9 + setevent EVENT_EXPLODING_TRAP_9 end ExplodingTrap10: ; 0x6c97e - checkbit1 EVENT_EXPLODING_TRAP_10 + checkevent EVENT_EXPLODING_TRAP_10 iftrue NoExplodingTrap 2call VoltorbExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_10 + setevent EVENT_EXPLODING_TRAP_10 end ExplodingTrap11: ; 0x6c98c - checkbit1 EVENT_EXPLODING_TRAP_11 + checkevent EVENT_EXPLODING_TRAP_11 iftrue NoExplodingTrap 2call GeodudeExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_11 + setevent EVENT_EXPLODING_TRAP_11 end ExplodingTrap12: ; 0x6c99a - checkbit1 EVENT_EXPLODING_TRAP_12 + checkevent EVENT_EXPLODING_TRAP_12 iftrue NoExplodingTrap 2call GeodudeExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_12 + setevent EVENT_EXPLODING_TRAP_12 end ExplodingTrap13: ; 0x6c9a8 - checkbit1 EVENT_EXPLODING_TRAP_13 + checkevent EVENT_EXPLODING_TRAP_13 iftrue NoExplodingTrap 2call GeodudeExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_13 + setevent EVENT_EXPLODING_TRAP_13 end ExplodingTrap14: ; 0x6c9b6 - checkbit1 EVENT_EXPLODING_TRAP_14 + checkevent EVENT_EXPLODING_TRAP_14 iftrue NoExplodingTrap 2call KoffingExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_14 + setevent EVENT_EXPLODING_TRAP_14 end ExplodingTrap15: ; 0x6c9c4 - checkbit1 EVENT_EXPLODING_TRAP_15 + checkevent EVENT_EXPLODING_TRAP_15 iftrue NoExplodingTrap 2call VoltorbExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_15 + setevent EVENT_EXPLODING_TRAP_15 end ExplodingTrap16: ; 0x6c9d2 - checkbit1 EVENT_EXPLODING_TRAP_16 + checkevent EVENT_EXPLODING_TRAP_16 iftrue NoExplodingTrap 2call KoffingExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_16 + setevent EVENT_EXPLODING_TRAP_16 end ExplodingTrap17: ; 0x6c9e0 - checkbit1 EVENT_EXPLODING_TRAP_17 + checkevent EVENT_EXPLODING_TRAP_17 iftrue NoExplodingTrap 2call VoltorbExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_17 + setevent EVENT_EXPLODING_TRAP_17 end ExplodingTrap18: ; 0x6c9ee - checkbit1 EVENT_EXPLODING_TRAP_18 + checkevent EVENT_EXPLODING_TRAP_18 iftrue NoExplodingTrap 2call GeodudeExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_18 + setevent EVENT_EXPLODING_TRAP_18 end ExplodingTrap19: ; 0x6c9fc - checkbit1 EVENT_EXPLODING_TRAP_19 + checkevent EVENT_EXPLODING_TRAP_19 iftrue NoExplodingTrap 2call GeodudeExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_19 + setevent EVENT_EXPLODING_TRAP_19 end ExplodingTrap20: ; 0x6ca0a - checkbit1 EVENT_EXPLODING_TRAP_20 + checkevent EVENT_EXPLODING_TRAP_20 iftrue NoExplodingTrap 2call VoltorbExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_20 + setevent EVENT_EXPLODING_TRAP_20 end ExplodingTrap21: ; 0x6ca18 - checkbit1 EVENT_EXPLODING_TRAP_21 + checkevent EVENT_EXPLODING_TRAP_21 iftrue NoExplodingTrap 2call KoffingExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_21 + setevent EVENT_EXPLODING_TRAP_21 end ExplodingTrap22: ; 0x6ca26 - checkbit1 EVENT_EXPLODING_TRAP_22 + checkevent EVENT_EXPLODING_TRAP_22 iftrue NoExplodingTrap 2call VoltorbExplodingTrap returnafterbattle - setbit1 EVENT_EXPLODING_TRAP_22 + setevent EVENT_EXPLODING_TRAP_22 end VoltorbExplodingTrap: ; 0x6ca34 @@ -561,18 +561,18 @@ MapTeamRocketBaseB1FSignpost7Script: ; 0x6ca99 MapTeamRocketBaseB1FSignpost0Script: ; 0x6ca9c loadfont - checkbit1 EVENT_TURNED_OFF_SECURITY_CAMERAS + checkevent EVENT_TURNED_OFF_SECURITY_CAMERAS iftrue UnknownScript_0x6cabe 2writetext UnknownText_0x6cdad playsound $0021 closetext loadmovesprites - setbit1 EVENT_TURNED_OFF_SECURITY_CAMERAS - setbit1 EVENT_SECURITY_CAMERA_1 - setbit1 EVENT_SECURITY_CAMERA_2 - setbit1 EVENT_SECURITY_CAMERA_3 - setbit1 EVENT_SECURITY_CAMERA_4 - setbit1 EVENT_SECURITY_CAMERA_5 + setevent EVENT_TURNED_OFF_SECURITY_CAMERAS + setevent EVENT_SECURITY_CAMERA_1 + setevent EVENT_SECURITY_CAMERA_2 + setevent EVENT_SECURITY_CAMERA_3 + setevent EVENT_SECURITY_CAMERA_4 + setevent EVENT_SECURITY_CAMERA_5 end ; 0x6cabe diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 229dbddcc..ac966f621 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -33,7 +33,7 @@ UnknownScript_0x6cf88: ; 0x6cf88 ; 0x6cf89 UnknownScript_0x6cf89: ; 0x6cf89 - checkbit1 EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER + checkevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER iftrue UnknownScript_0x6cf90 return ; 0x6cf90 @@ -97,11 +97,11 @@ UnknownScript_0x6cfac: ; 0x6cfac loadtrainer EXECUTIVEF, 2 startbattle disappear $5 - setbit1 $06dd - setbit1 $06de - setbit1 $06d6 + setevent $06dd + setevent $06de + setevent $06d6 returnafterbattle - setbit1 $0570 + setevent $0570 loadfont 2writetext UnknownText_0x6d4c6 closetext @@ -116,7 +116,7 @@ UnknownScript_0x6cfac: ; 0x6cfac pause 15 special $0032 dotrigger $2 - clearbit1 $06d6 + clearevent $06d6 spriteface $4, $0 loadfont 2writetext UnknownText_0x6d5d8 @@ -177,7 +177,7 @@ UnknownScript_0x6d091: ; 0x6d091 closetext loadmovesprites dotrigger $1 - setbit1 $004c + setevent $004c checkcode $9 if_equal $3, UnknownScript_0x6d0be applymovement $4, MovementData_0x6d212 @@ -285,11 +285,11 @@ VoltorbScript_0x6d101: ; 0x6d101 iftrue UnknownScript_0x6d182 disappear $6 disappear $9 - checkbit1 $06e0 + checkevent $06e0 iffalse UnknownScript_0x6d182 - checkbit1 $06e1 + checkevent $06e1 iffalse UnknownScript_0x6d182 - checkbit1 $06e2 + checkevent $06e2 iffalse UnknownScript_0x6d182 returnafterbattle special $003c @@ -304,11 +304,11 @@ VoltorbScript_0x6d12c: ; 0x6d12c iftrue UnknownScript_0x6d182 disappear $7 disappear $a - checkbit1 $06e0 + checkevent $06e0 iffalse UnknownScript_0x6d182 - checkbit1 $06e1 + checkevent $06e1 iffalse UnknownScript_0x6d182 - checkbit1 $06e2 + checkevent $06e2 iffalse UnknownScript_0x6d182 returnafterbattle special $003c @@ -323,11 +323,11 @@ VoltorbScript_0x6d157: ; 0x6d157 iftrue UnknownScript_0x6d182 disappear $8 disappear $b - checkbit1 $06e0 + checkevent $06e0 iffalse UnknownScript_0x6d182 - checkbit1 $06e1 + checkevent $06e1 iffalse UnknownScript_0x6d182 - checkbit1 $06e2 + checkevent $06e2 iffalse UnknownScript_0x6d182 returnafterbattle special $003c @@ -349,7 +349,7 @@ UnknownScript_0x6d184: ; 0x6d184 2writetext UnknownText_0x6d809 keeptextopen verbosegiveitem HM_06, 1 - setbit1 EVENT_GOT_HM06_WHIRLPOOL + setevent EVENT_GOT_HM06_WHIRLPOOL 2writetext UnknownText_0x6d8f8 closetext loadmovesprites @@ -361,18 +361,18 @@ UnknownScript_0x6d184: ; 0x6d184 spriteface $0, $0 applymovement $4, MovementData_0x6d283 disappear $4 - setbit1 EVENT_CLEARED_ROCKET_HIDEOUT - clearbit2 $000e - setbit1 $06dc - setbit1 $0757 + setevent EVENT_CLEARED_ROCKET_HIDEOUT + clearflag $000e + setevent $06dc + setevent $0757 dotrigger $3 - clearbit1 $0735 - setbit1 EVENT_TURNED_OFF_SECURITY_CAMERAS - setbit1 EVENT_SECURITY_CAMERA_1 - setbit1 EVENT_SECURITY_CAMERA_2 - setbit1 EVENT_SECURITY_CAMERA_3 - setbit1 EVENT_SECURITY_CAMERA_4 - setbit1 EVENT_SECURITY_CAMERA_5 + clearevent $0735 + setevent EVENT_TURNED_OFF_SECURITY_CAMERAS + setevent EVENT_SECURITY_CAMERA_1 + setevent EVENT_SECURITY_CAMERA_2 + setevent EVENT_SECURITY_CAMERA_3 + setevent EVENT_SECURITY_CAMERA_4 + setevent EVENT_SECURITY_CAMERA_5 end ; 0x6d1d7 @@ -384,7 +384,7 @@ MapTeamRocketBaseB2FSignpostPtr1: ; 0x6d1d7 MapTeamRocketBaseB2FSignpost1Script: ; 0x6d1db loadfont - checkbit1 EVENT_LEARNED_HAIL_GIOVANNI + checkevent EVENT_LEARNED_HAIL_GIOVANNI iftrue UnknownScript_0x6d1e8 2writetext UnknownText_0x6dd39 closetext @@ -399,14 +399,14 @@ UnknownScript_0x6d1e8: ; 0x6d1e8 changeblock $e, $c, $7 reloadmappart loadmovesprites - setbit1 EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER + setevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER waitbutton end ; 0x6d1fa MapTeamRocketBaseB2FSignpost21Script: ; 0x6d1fa loadfont - checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT + checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x6d207 2writetext UnknownText_0x6dda7 closetext diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 9e89313b5..ea5bf45b1 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -34,7 +34,7 @@ UnknownScript_0x6dfef: ; 0x6dfef ; 0x6dff0 UnknownScript_0x6dff0: ; 0x6dff0 - checkbit1 $0303 + checkevent $0303 iftrue UnknownScript_0x6dff7 return ; 0x6dff7 @@ -107,7 +107,7 @@ UnknownScript_0x6e056: ; 0x6e056 loadtrainer EXECUTIVEM, 4 startbattle returnafterbattle - setbit1 $0574 + setevent $0574 loadfont 2writetext UnknownText_0x6e548 closetext @@ -125,7 +125,7 @@ MoltresScript_0x6e091: ; 0x6e091 2writetext UnknownText_0x6e585 closetext loadmovesprites - setbit1 EVENT_LEARNED_HAIL_GIOVANNI + setevent EVENT_LEARNED_HAIL_GIOVANNI end ; 0x6e09b @@ -155,7 +155,7 @@ GruntF5Script: ; 0x6e0a7 2writetext UnknownText_0x6e611 closetext loadmovesprites - setbit1 $0301 + setevent $0301 end ; 0x6e0b2 @@ -185,7 +185,7 @@ GruntM28Script: ; 0x6e0be 2writetext UnknownText_0x6e737 closetext loadmovesprites - setbit1 $0302 + setevent $0302 end ; 0x6e0c9 @@ -255,9 +255,9 @@ MapTeamRocketBaseB3FSignpostPtr1: ; 0x6e0f1 MapTeamRocketBaseB3FSignpost1Script: ; 0x6e0f5 loadfont - checkbit1 $0301 + checkevent $0301 iffalse UnknownScript_0x6e105 - checkbit1 $0302 + checkevent $0302 iffalse UnknownScript_0x6e105 2jump UnknownScript_0x6e10b ; 0x6e105 @@ -276,7 +276,7 @@ UnknownScript_0x6e10b: ; 0x6e10b changeblock $a, $8, $7 reloadmappart loadmovesprites - setbit1 $0303 + setevent $0303 waitbutton end ; 0x6e11d diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 5f927fb36..e63276817 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -26,16 +26,16 @@ UnknownScript_0x18502e: ; 0x18502e ; 0x18502f UnknownScript_0x18502f: ; 0x18502f - checkbit1 EVENT_GOT_RAINBOW_WING + checkevent EVENT_GOT_RAINBOW_WING iftrue UnknownScript_0x185047 - checkbit1 $0044 + checkevent $0044 iffalse UnknownScript_0x185050 special $0096 iffalse UnknownScript_0x185050 - clearbit1 $07c5 - setbit1 $07b6 + clearevent $07c5 + setevent $07b6 UnknownScript_0x185047: ; 0x185047 - checkbit1 EVENT_FOUGHT_HO_OH + checkevent EVENT_FOUGHT_HO_OH iffalse UnknownScript_0x18504f appear $5 UnknownScript_0x18504f: ; 0x18504f @@ -43,7 +43,7 @@ UnknownScript_0x18504f: ; 0x18504f ; 0x185050 UnknownScript_0x185050: ; 0x185050 - checkbit1 EVENT_FOUGHT_SUICUNE + checkevent EVENT_FOUGHT_SUICUNE iftrue UnknownScript_0x185077 appear $2 writebyte RAIKOU @@ -73,13 +73,13 @@ UnknownScript_0x185077: ; 0x185077 disappear $2 disappear $3 disappear $4 - clearbit1 $07b6 - setbit1 $07c5 + clearevent $07b6 + setevent $07c5 return ; 0x185084 UnknownScript_0x185084: ; 0x185084 - checkbit1 EVENT_GOT_RAINBOW_WING + checkevent EVENT_GOT_RAINBOW_WING iftrue UnknownScript_0x18508e changeblock $a, $2, $9 UnknownScript_0x18508e: ; 0x18508e @@ -126,15 +126,15 @@ UnknownScript_0x1850d7: ; 0x1850d7 startbattle reloadmapmusic disappear $2 - setbit1 EVENT_FOUGHT_SUICUNE - setbit1 EVENT_SAW_SUICUNE_ON_ROUTE_42 + setevent EVENT_FOUGHT_SUICUNE + setevent EVENT_SAW_SUICUNE_ON_ROUTE_42 domaptrigger GROUP_ROUTE_42, MAP_ROUTE_42, $0 - setbit1 EVENT_SAW_SUICUNE_ON_ROUTE_36 + setevent EVENT_SAW_SUICUNE_ON_ROUTE_36 domaptrigger GROUP_ROUTE_36, MAP_ROUTE_36, $0 - setbit1 EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY + setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $0 dotrigger $1 - clearbit1 EVENT_SET_WHEN_FOUGHT_HO_OH + clearevent EVENT_SET_WHEN_FOUGHT_HO_OH returnafterbattle pause 20 spriteface $0, $0 @@ -186,7 +186,7 @@ SageScript_0x185179: ; 0x185179 ; 0x18517c SageScript_0x18517c: ; 0x18517c - checkbit1 EVENT_FOUGHT_HO_OH + checkevent EVENT_FOUGHT_HO_OH iftrue UnknownScript_0x185185 jumptextfaceplayer UnknownText_0x1855ee ; 0x185185 @@ -198,9 +198,9 @@ UnknownScript_0x185185: ; 0x185185 SageScript_0x185188: ; 0x185188 faceplayer loadfont - checkbit1 EVENT_FOUGHT_HO_OH + checkevent EVENT_FOUGHT_HO_OH iftrue UnknownScript_0x1851b6 - checkbit1 EVENT_GOT_RAINBOW_WING + checkevent EVENT_GOT_RAINBOW_WING iftrue UnknownScript_0x1851b0 2writetext UnknownText_0x185629 keeptextopen @@ -212,7 +212,7 @@ SageScript_0x185188: ; 0x185188 playsound $001b changeblock $a, $2, $20 reloadmappart - setbit1 EVENT_GOT_RAINBOW_WING + setevent EVENT_GOT_RAINBOW_WING loadmovesprites loadfont UnknownScript_0x1851b0: ; 0x1851b0 @@ -230,7 +230,7 @@ UnknownScript_0x1851b6: ; 0x1851b6 ; 0x1851bc SageScript_0x1851bc: ; 0x1851bc - checkbit1 EVENT_FOUGHT_HO_OH + checkevent EVENT_FOUGHT_HO_OH iftrue UnknownScript_0x1851c5 jumptextfaceplayer UnknownText_0x185654 ; 0x1851c5 diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index c30744c0b..eef7e17b7 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -11,7 +11,7 @@ TinTowerRoof_MapScriptHeader: ; 0x7722b ; 0x77230 UnknownScript_0x77230: ; 0x77230 - checkbit1 EVENT_FOUGHT_HO_OH + checkevent EVENT_FOUGHT_HO_OH iftrue UnknownScript_0x77241 checkitem RAINBOW_WING iftrue UnknownScript_0x7723e @@ -35,13 +35,13 @@ HoOhScript_0x77244: ; 0x77244 cry HO_OH pause 15 loadmovesprites - setbit1 EVENT_FOUGHT_HO_OH + setevent EVENT_FOUGHT_HO_OH writecode $3, $a loadpokedata HO_OH, 60 startbattle disappear $2 returnafterbattle - setbit1 EVENT_SET_WHEN_FOUGHT_HO_OH + setevent EVENT_SET_WHEN_FOUGHT_HO_OH end ; 0x77260 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 9c3c910c3..9eac4aa8e 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -16,7 +16,7 @@ UnknownScript_0x9b38a: ; 0x9b38a UnknownScript_0x9b38b: ; 0x9b38b spriteface $0, $1 loadfont - checkbit2 $0057 + checkflag $0057 iftrue UnknownScript_0x9b3f7 2writetext UnknownText_0x9b420 keeptextopen @@ -34,7 +34,7 @@ UnknownScript_0x9b3aa: ; 0x9b3aa 2writetext UnknownText_0x9b487 yesorno iffalse UnknownScript_0x9b3ed - setbit2 $0057 + setflag $0057 2writetext UnknownText_0x9b4a2 closetext loadmovesprites diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 36b951d59..76a00134d 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -23,51 +23,51 @@ UnknownScript_0x7c9f6: ; 0x7c9f6 ; 0x7c9f7 UnknownScript_0x7c9f7: ; 0x7c9f7 - checkbit1 EVENT_SWITCH_4 + checkevent EVENT_SWITCH_4 iffalse UnknownScript_0x7ca01 changeblock $10, $6, $2d UnknownScript_0x7ca01: ; 0x7ca01 - checkbit1 EVENT_SWITCH_5 + checkevent EVENT_SWITCH_5 iffalse UnknownScript_0x7ca0b changeblock $a, $6, $2d UnknownScript_0x7ca0b: ; 0x7ca0b - checkbit1 EVENT_SWITCH_6 + checkevent EVENT_SWITCH_6 iffalse UnknownScript_0x7ca15 changeblock $2, $6, $2d UnknownScript_0x7ca15: ; 0x7ca15 - checkbit1 EVENT_SWITCH_7 + checkevent EVENT_SWITCH_7 iffalse UnknownScript_0x7ca1f changeblock $2, $a, $2d UnknownScript_0x7ca1f: ; 0x7ca15 - checkbit1 EVENT_SWITCH_8 + checkevent EVENT_SWITCH_8 iffalse UnknownScript_0x7ca29 changeblock $a, $a, $2d UnknownScript_0x7ca29: ; 0x7ca29 - checkbit1 EVENT_SWITCH_9 + checkevent EVENT_SWITCH_9 iffalse UnknownScript_0x7ca33 changeblock $10, $a, $2d UnknownScript_0x7ca33: ; 0x7ca33 - checkbit1 EVENT_SWITCH_10 + checkevent EVENT_SWITCH_10 iffalse UnknownScript_0x7ca41 changeblock $c, $6, $2a changeblock $c, $8, $2d UnknownScript_0x7ca41: ; 0x7ca41 - checkbit1 EVENT_SWITCH_11 + checkevent EVENT_SWITCH_11 iffalse UnknownScript_0x7ca4f changeblock $6, $6, $2a changeblock $6, $8, $2d UnknownScript_0x7ca4f: ; 0x7ca4f - checkbit1 EVENT_SWITCH_12 + checkevent EVENT_SWITCH_12 iffalse UnknownScript_0x7ca5d changeblock $c, $a, $2a changeblock $c, $c, $2d UnknownScript_0x7ca5d: ; 0x7ca5d - checkbit1 EVENT_SWITCH_13 + checkevent EVENT_SWITCH_13 iffalse UnknownScript_0x7ca6b changeblock $6, $a, $2a changeblock $6, $c, $2d UnknownScript_0x7ca6b: ; 0x7ca6b - checkbit1 EVENT_SWITCH_14 + checkevent EVENT_SWITCH_14 iffalse UnknownScript_0x7ca79 changeblock $12, $a, $2a changeblock $12, $c, $2d @@ -124,9 +124,9 @@ UnknownScript_0x7caaa: ; 0x7caaa ; 0x7cad4 UnknownScript_0x7cad4: ; 0x7cad4 - checkbit1 $06c5 + checkevent $06c5 iftrue UnknownScript_0x7cae1 - setbit1 $06c5 + setevent $06c5 domaptrigger GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F, $1 UnknownScript_0x7cae1: ; 0x7cae1 playmusic $001f @@ -134,10 +134,10 @@ UnknownScript_0x7cae1: ; 0x7cae1 2writetext UnknownText_0x7ce9d closetext loadmovesprites - setbit1 $06c1 - checkbit1 EVENT_GOT_TOTODILE_FROM_ELM + setevent $06c1 + checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x7cb09 - checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM + checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x7cb19 winlosstext UnknownText_0x7cf5d, UnknownText_0x7d102 setlasttalked $c @@ -355,7 +355,7 @@ MapUndergroundPathSwitchRoomEntrancesSignpost0Script: ; 0x7cbab loadfont 2writetext UnknownText_0x7d554 keeptextopen - checkbit1 EVENT_SWITCH_1 + checkevent EVENT_SWITCH_1 iftrue UnknownScript_0x7cbcb 2writetext UnknownText_0x7d617 yesorno @@ -363,7 +363,7 @@ MapUndergroundPathSwitchRoomEntrancesSignpost0Script: ; 0x7cbab copybytetovar UndergroundSwitchPositions addvar $1 copyvartobyte UndergroundSwitchPositions - setbit1 EVENT_SWITCH_1 + setevent EVENT_SWITCH_1 2jump UnknownScript_0x7cc8d ; 0x7cbcb @@ -374,7 +374,7 @@ UnknownScript_0x7cbcb: ; 0x7cbcb copybytetovar UndergroundSwitchPositions addvar -1 copyvartobyte UndergroundSwitchPositions - clearbit1 EVENT_SWITCH_1 + clearevent EVENT_SWITCH_1 2jump UnknownScript_0x7cc8d ; 0x7cbe0 @@ -382,7 +382,7 @@ MapUndergroundPathSwitchRoomEntrancesSignpost1Script: ; 0x7cbe0 loadfont 2writetext UnknownText_0x7d643 keeptextopen - checkbit1 EVENT_SWITCH_2 + checkevent EVENT_SWITCH_2 iftrue UnknownScript_0x7cc00 2writetext UnknownText_0x7d617 yesorno @@ -390,7 +390,7 @@ MapUndergroundPathSwitchRoomEntrancesSignpost1Script: ; 0x7cbe0 copybytetovar UndergroundSwitchPositions addvar $2 copyvartobyte UndergroundSwitchPositions - setbit1 EVENT_SWITCH_2 + setevent EVENT_SWITCH_2 2jump UnknownScript_0x7cc8d ; 0x7cc00 @@ -401,7 +401,7 @@ UnknownScript_0x7cc00: ; 0x7cc00 copybytetovar UndergroundSwitchPositions addvar -2 copyvartobyte UndergroundSwitchPositions - clearbit1 EVENT_SWITCH_2 + clearevent EVENT_SWITCH_2 2jump UnknownScript_0x7cc8d ; 0x7cc15 @@ -409,7 +409,7 @@ MapUndergroundPathSwitchRoomEntrancesSignpost2Script: ; 0x7cc15 loadfont 2writetext UnknownText_0x7d65a keeptextopen - checkbit1 EVENT_SWITCH_3 + checkevent EVENT_SWITCH_3 iftrue UnknownScript_0x7cc35 2writetext UnknownText_0x7d617 yesorno @@ -417,7 +417,7 @@ MapUndergroundPathSwitchRoomEntrancesSignpost2Script: ; 0x7cc15 copybytetovar UndergroundSwitchPositions addvar $3 copyvartobyte UndergroundSwitchPositions - setbit1 EVENT_SWITCH_3 + setevent EVENT_SWITCH_3 2jump UnknownScript_0x7cc8d ; 0x7cc35 @@ -428,7 +428,7 @@ UnknownScript_0x7cc35: ; 0x7cc35 copybytetovar UndergroundSwitchPositions addvar -3 copyvartobyte UndergroundSwitchPositions - clearbit1 EVENT_SWITCH_3 + clearevent EVENT_SWITCH_3 2jump UnknownScript_0x7cc8d ; 0x7cc4a @@ -436,17 +436,17 @@ MapUndergroundPathSwitchRoomEntrancesSignpost3Script: ; 0x7cc4a loadfont 2writetext UnknownText_0x7d671 keeptextopen - checkbit1 EVENT_EMERGENCY_SWITCH + checkevent EVENT_EMERGENCY_SWITCH iftrue UnknownScript_0x7cc70 2writetext UnknownText_0x7d617 yesorno iffalse UnknownScript_0x7cc8b writebyte $7 copyvartobyte UndergroundSwitchPositions - setbit1 EVENT_EMERGENCY_SWITCH - setbit1 EVENT_SWITCH_1 - setbit1 EVENT_SWITCH_2 - setbit1 EVENT_SWITCH_3 + setevent EVENT_EMERGENCY_SWITCH + setevent EVENT_SWITCH_1 + setevent EVENT_SWITCH_2 + setevent EVENT_SWITCH_3 2jump UnknownScript_0x7cc8d ; 0x7cc70 @@ -456,10 +456,10 @@ UnknownScript_0x7cc70: ; 0x7cc70 iffalse UnknownScript_0x7cc8b writebyte $0 copyvartobyte UndergroundSwitchPositions - clearbit1 EVENT_EMERGENCY_SWITCH - clearbit1 EVENT_SWITCH_1 - clearbit1 EVENT_SWITCH_2 - clearbit1 EVENT_SWITCH_3 + clearevent EVENT_EMERGENCY_SWITCH + clearevent EVENT_SWITCH_1 + clearevent EVENT_SWITCH_2 + clearevent EVENT_SWITCH_3 2jump UnknownScript_0x7cc8d ; 0x7cc8b @@ -602,143 +602,143 @@ UnknownScript_0x7cd79: ; 0x7cd79 UnknownScript_0x7cda5: ; 0x7cda5 changeblock $10, $6, $2d - setbit1 EVENT_SWITCH_4 + setevent EVENT_SWITCH_4 end ; 0x7cdad UnknownScript_0x7cdad: ; 0x7cdad changeblock $a, $6, $2d - setbit1 EVENT_SWITCH_5 + setevent EVENT_SWITCH_5 end ; 0x7cdb5 UnknownScript_0x7cdb5: ; 0x7cdb5 changeblock $2, $6, $2d - setbit1 EVENT_SWITCH_6 + setevent EVENT_SWITCH_6 end ; 0x7cdbd UnknownScript_0x7cdbd: ; 0x7cdbd changeblock $2, $a, $2d - setbit1 EVENT_SWITCH_7 + setevent EVENT_SWITCH_7 end ; 0x7cdc5 UnknownScript_0x7cdc5: ; 0x7cdc5 changeblock $a, $a, $2d - setbit1 EVENT_SWITCH_8 + setevent EVENT_SWITCH_8 end ; 0x7cdcd UnknownScript_0x7cdcd: ; 0x7cdcd changeblock $10, $a, $2d - setbit1 EVENT_SWITCH_9 + setevent EVENT_SWITCH_9 end ; 0x7cdd5 UnknownScript_0x7cdd5: ; 0x7cdd5 changeblock $c, $6, $2a changeblock $c, $8, $2d - setbit1 EVENT_SWITCH_10 + setevent EVENT_SWITCH_10 end ; 0x7cde1 UnknownScript_0x7cde1: ; 0x7cde1 changeblock $6, $6, $2a changeblock $6, $8, $2d - setbit1 EVENT_SWITCH_11 + setevent EVENT_SWITCH_11 end ; 0x7cded UnknownScript_0x7cded: ; 0x7cded changeblock $c, $a, $2a changeblock $c, $c, $2d - setbit1 EVENT_SWITCH_12 + setevent EVENT_SWITCH_12 end ; 0x7cdf9 UnknownScript_0x7cdf9: ; 0x7cdf9 changeblock $6, $a, $2a changeblock $6, $c, $2d - setbit1 EVENT_SWITCH_13 + setevent EVENT_SWITCH_13 end ; 0x7ce05 UnknownScript_0x7ce05: ; 0x7ce05 changeblock $12, $a, $2a changeblock $12, $c, $2d - setbit1 EVENT_SWITCH_14 + setevent EVENT_SWITCH_14 end ; 0x7ce11 UnknownScript_0x7ce11: ; 0x7ce11 changeblock $10, $6, $3e - clearbit1 EVENT_SWITCH_4 + clearevent EVENT_SWITCH_4 end ; 0x7ce19 UnknownScript_0x7ce19: ; 0x7ce19 changeblock $a, $6, $3e - clearbit1 EVENT_SWITCH_5 + clearevent EVENT_SWITCH_5 end ; 0x7ce21 UnknownScript_0x7ce21: ; 0x7ce21 changeblock $2, $6, $3e - clearbit1 EVENT_SWITCH_6 + clearevent EVENT_SWITCH_6 end ; 0x7ce29 UnknownScript_0x7ce29: ; 0x7ce29 changeblock $2, $a, $3e - clearbit1 EVENT_SWITCH_7 + clearevent EVENT_SWITCH_7 end ; 0x7ce31 UnknownScript_0x7ce31: ; 0x7ce31 changeblock $a, $a, $3e - clearbit1 EVENT_SWITCH_8 + clearevent EVENT_SWITCH_8 end ; 0x7ce39 UnknownScript_0x7ce39: ; 0x7ce39 changeblock $10, $a, $3e - clearbit1 EVENT_SWITCH_9 + clearevent EVENT_SWITCH_9 end ; 0x7ce41 UnknownScript_0x7ce41: ; 0x7ce41 changeblock $c, $6, $3f changeblock $c, $8, $3d - clearbit1 EVENT_SWITCH_10 + clearevent EVENT_SWITCH_10 end ; 0x7ce4d UnknownScript_0x7ce4d: ; 0x7ce4d changeblock $6, $6, $3f changeblock $6, $8, $3d - clearbit1 EVENT_SWITCH_11 + clearevent EVENT_SWITCH_11 end ; 0x7ce59 UnknownScript_0x7ce59: ; 0x7ce59 changeblock $c, $a, $3f changeblock $c, $c, $3d - clearbit1 EVENT_SWITCH_12 + clearevent EVENT_SWITCH_12 end ; 0x7ce65 UnknownScript_0x7ce65: ; 0x7ce65 changeblock $6, $a, $3f changeblock $6, $c, $3d - clearbit1 EVENT_SWITCH_13 + clearevent EVENT_SWITCH_13 end ; 0x7ce71 UnknownScript_0x7ce71: ; 0x7ce71 changeblock $12, $a, $3f changeblock $12, $c, $3d - clearbit1 EVENT_SWITCH_14 + clearevent EVENT_SWITCH_14 end ; 0x7ce7d diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index f20f78273..42200c133 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -11,21 +11,21 @@ UndergroundWarehouse_MapScriptHeader: ; 0x7d94b ; 0x7d950 UnknownScript_0x7d950: ; 0x7d950 - clearbit1 EVENT_SWITCH_1 - clearbit1 EVENT_SWITCH_2 - clearbit1 EVENT_SWITCH_3 - clearbit1 EVENT_EMERGENCY_SWITCH - clearbit1 EVENT_SWITCH_4 - clearbit1 EVENT_SWITCH_5 - clearbit1 EVENT_SWITCH_6 - clearbit1 EVENT_SWITCH_7 - clearbit1 EVENT_SWITCH_8 - clearbit1 EVENT_SWITCH_9 - clearbit1 EVENT_SWITCH_10 - clearbit1 EVENT_SWITCH_11 - clearbit1 EVENT_SWITCH_12 - clearbit1 EVENT_SWITCH_13 - clearbit1 EVENT_SWITCH_14 + clearevent EVENT_SWITCH_1 + clearevent EVENT_SWITCH_2 + clearevent EVENT_SWITCH_3 + clearevent EVENT_EMERGENCY_SWITCH + clearevent EVENT_SWITCH_4 + clearevent EVENT_SWITCH_5 + clearevent EVENT_SWITCH_6 + clearevent EVENT_SWITCH_7 + clearevent EVENT_SWITCH_8 + clearevent EVENT_SWITCH_9 + clearevent EVENT_SWITCH_10 + clearevent EVENT_SWITCH_11 + clearevent EVENT_SWITCH_12 + clearevent EVENT_SWITCH_13 + clearevent EVENT_SWITCH_14 writebyte $0 copyvartobyte UndergroundSwitchPositions return @@ -121,15 +121,15 @@ GruntM15Script: ; 0x7d9b7 GentlemanScript_0x7d9bf: ; 0x7d9bf faceplayer loadfont - checkbit1 $004a + checkevent $004a iftrue UnknownScript_0x7d9de 2writetext UnknownText_0x7dbc6 keeptextopen verbosegiveitem CARD_KEY, 1 - setbit1 $004a - setbit1 $0304 - clearbit1 $0305 - clearbit1 $0306 + setevent $004a + setevent $0304 + clearevent $0305 + clearevent $0306 2writetext UnknownText_0x7dc5b keeptextopen UnknownScript_0x7d9de: ; 0x7d9de diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 5649f3d2b..7bf8d7a0f 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -11,7 +11,7 @@ UnionCaveB2F_MapScriptHeader: ; 0x5a308 ; 0x5a30d UnknownScript_0x5a30d: ; 0x5a30d - checkbit2 $0059 + checkflag $0059 iftrue UnknownScript_0x5a319 checkcode $b if_equal FRIDAY, UnknownScript_0x5a31c @@ -31,7 +31,7 @@ SurfScript_0x5a31f: ; 0x5a31f loadpokedata LAPRAS, 20 startbattle disappear $7 - setbit2 $0059 + setflag $0059 returnafterbattle end ; 0x5a32e diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 69ba933e6..a5eae1a34 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -11,7 +11,7 @@ VermilionCity_MapScriptHeader: ; 0x1aa97a ; 0x1aa97f UnknownScript_0x1aa97f: ; 0x1aa97f - setbit2 $003a + setflag $003a return ; 0x1aa983 @@ -60,7 +60,7 @@ UnknownScript_0x1aa9ab: ; 0x1aa9ab loadpokedata SNORLAX, 50 startbattle disappear $6 - setbit1 EVENT_FOUGHT_SNORLAX + setevent EVENT_FOUGHT_SNORLAX returnafterbattle end ; 0x1aa9c2 @@ -68,12 +68,12 @@ UnknownScript_0x1aa9ab: ; 0x1aa9ab PokefanMScript_0x1aa9c2: ; 0x1aa9c2 faceplayer loadfont - checkbit1 $00e2 + checkevent $00e2 iftrue UnknownScript_0x1aa9f7 checkcode $7 if_equal $10, UnknownScript_0x1aa9ea - if_less_than $d, UnknownScript_0x1aa9e4 - if_less_than $9, UnknownScript_0x1aa9de + if_greater_than $d, UnknownScript_0x1aa9e4 + if_greater_than $9, UnknownScript_0x1aa9de 2writetext UnknownText_0x1aabc8 closetext loadmovesprites @@ -99,7 +99,7 @@ UnknownScript_0x1aa9ea: ; 0x1aa9ea keeptextopen verbosegiveitem HP_UP, 1 iffalse UnknownScript_0x1aa9fb - setbit1 $00e2 + setevent $00e2 UnknownScript_0x1aa9f7: ; 0x1aa9f7 2writetext UnknownText_0x1aad4a closetext diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 1988a1588..f8018b6f7 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -9,7 +9,7 @@ VermilionGym_MapScriptHeader: ; 0x1920a3 SurgeScript_0x1920a5: ; 0x1920a5 faceplayer loadfont - checkbit2 $0025 + checkflag $0025 iftrue UnknownScript_0x1920d9 2writetext UnknownText_0x192142 closetext @@ -18,15 +18,15 @@ SurgeScript_0x1920a5: ; 0x1920a5 loadtrainer LT_SURGE, 1 startbattle returnafterbattle - setbit1 EVENT_BEAT_LTSURGE - setbit1 EVENT_BEAT_GENTLEMAN_GREGORY - setbit1 EVENT_BEAT_GUITARIST_VINCENT - setbit1 EVENT_BEAT_JUGGLER_HORTON + setevent EVENT_BEAT_LTSURGE + setevent EVENT_BEAT_GENTLEMAN_GREGORY + setevent EVENT_BEAT_GUITARIST_VINCENT + setevent EVENT_BEAT_JUGGLER_HORTON loadfont 2writetext UnknownText_0x192277 playsound $009c waitbutton - setbit2 $0025 + setflag $0025 2writetext UnknownText_0x192291 closetext loadmovesprites @@ -130,7 +130,7 @@ JugglerHortonScript: ; 0x192113 VermilionGymGuyScript: ; 0x19211b faceplayer loadfont - checkbit1 EVENT_BEAT_LTSURGE + checkevent EVENT_BEAT_LTSURGE iftrue .VermilionGymGuyWinScript 2writetext VermilionGymGuyText closetext @@ -149,7 +149,7 @@ MapVermilionGymSignpost14Script: ; 0x19212f ; 0x192132 MapVermilionGymSignpost16Script: ; 0x192132 - checkbit2 $0025 + checkflag $0025 iftrue UnknownScript_0x19213b jumpstd $002d ; 0x19213b diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm index 4bf949b10..d25ff2ba4 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokeCenter1F.asm @@ -13,7 +13,7 @@ NurseScript_0x191603: ; 0x191603 FishingGuruScript_0x191606: ; 0x191606 faceplayer loadfont - checkbit1 EVENT_FOUGHT_SNORLAX + checkevent EVENT_FOUGHT_SNORLAX iftrue UnknownScript_0x191614 2writetext UnknownText_0x191620 closetext diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index c541f77b2..326fa565a 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -24,7 +24,7 @@ UnknownScript_0x74d9e: ; 0x74d9e ; 0x74da2 UnknownScript_0x74da2: ; 0x74da2 - setbit2 $003a + setflag $003a return ; 0x74da6 @@ -32,12 +32,12 @@ UnknownScript_0x74da6: ; 0x74da6 applymovement $0, MovementData_0x74ef3 appear $2 dotrigger $0 - setbit1 $0731 - setbit1 $0730 - setbit1 $0739 - clearbit1 $0733 - setbit1 $0030 - setbit1 $0000 + setevent $0731 + setevent $0730 + setevent $0739 + clearevent $0733 + setevent $0030 + setevent $0000 blackoutmod GROUP_VERMILION_CITY, MAP_VERMILION_CITY end ; 0x74dc4 @@ -45,7 +45,7 @@ UnknownScript_0x74da6: ; 0x74da6 SailorScript_0x74dc4: ; 0x74dc4 faceplayer loadfont - checkbit1 $0000 + checkevent $0000 iftrue UnknownScript_0x74e1a 2writetext UnknownText_0x74f06 closetext @@ -59,19 +59,19 @@ SailorScript_0x74dc4: ; 0x74dc4 playsound $0023 special $002e waitbutton - setbit1 $073a - clearbit1 $073b - clearbit1 EVENT_BEAT_POKEMANIAC_ETHAN - clearbit1 EVENT_BEAT_BURGLAR_COREY - clearbit1 EVENT_BEAT_BUG_CATCHER_KEN - clearbit1 EVENT_BEAT_GUITARIST_CLYDE - clearbit1 EVENT_BEAT_POKEFANM_JEREMY - clearbit1 EVENT_BEAT_POKEFANF_GEORGIA - clearbit1 EVENT_BEAT_SAILOR_KENNETH - clearbit1 EVENT_BEAT_TEACHER_SHIRLEY - clearbit1 EVENT_BEAT_SCHOOLBOY_NATE - clearbit1 EVENT_BEAT_SCHOOLBOY_RICKY - setbit1 $002f + setevent $073a + clearevent $073b + clearevent EVENT_BEAT_POKEMANIAC_ETHAN + clearevent EVENT_BEAT_BURGLAR_COREY + clearevent EVENT_BEAT_BUG_CATCHER_KEN + clearevent EVENT_BEAT_GUITARIST_CLYDE + clearevent EVENT_BEAT_POKEFANM_JEREMY + clearevent EVENT_BEAT_POKEFANF_GEORGIA + clearevent EVENT_BEAT_SAILOR_KENNETH + clearevent EVENT_BEAT_TEACHER_SHIRLEY + clearevent EVENT_BEAT_SCHOOLBOY_NATE + clearevent EVENT_BEAT_SCHOOLBOY_RICKY + setevent $002f appear $2 domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $1 warp GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $19, $1 @@ -87,9 +87,9 @@ UnknownScript_0x74e1a: ; 0x74e1a UnknownScript_0x74e20: ; 0x74e20 spriteface $3, $3 - checkbit1 $0000 + checkevent $0000 iftrue UnknownScript_0x74e86 - checkbit1 $0001 + checkevent $0001 iftrue UnknownScript_0x74e86 spriteface $0, $2 loadfont @@ -109,7 +109,7 @@ UnknownScript_0x74e20: ; 0x74e20 2writetext UnknownText_0x74fc2 closetext loadmovesprites - setbit1 $0001 + setevent $0001 applymovement $0, MovementData_0x74ef8 2jump SailorScript_0x74dc4 ; 0x74e68 @@ -160,7 +160,7 @@ UnknownScript_0x74e8d: ; 0x74e8d SailorScript_0x74e97: ; 0x74e97 faceplayer loadfont - checkbit1 $0000 + checkevent $0000 iftrue UnknownScript_0x74e1a checkcode $b if_equal MONDAY, UnknownScript_0x74eda @@ -178,7 +178,7 @@ SailorScript_0x74e97: ; 0x74e97 2writetext UnknownText_0x74fc2 closetext loadmovesprites - setbit1 $0001 + setevent $0001 applymovement $0, MovementData_0x74efe 2jump SailorScript_0x74dc4 ; 0x74ed4 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 86f94969c..bc7777e56 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -56,10 +56,10 @@ UnknownScript_0x744d4: ; 0x744d4 2writetext UnknownText_0x7455f closetext loadmovesprites - setbit1 $06c2 - checkbit1 EVENT_GOT_TOTODILE_FROM_ELM + setevent $06c2 + checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x744ff - checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM + checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x7450f winlosstext UnknownText_0x7463d, UnknownText_0x747aa setlasttalked $2 diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index f2e689ceb..9cd574826 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -30,7 +30,7 @@ UnknownScript_0x9ba04: ; 0x9ba04 2writetext UnknownText_0x9ba29 keeptextopen checkcode $7 - if_less_than $7, UnknownScript_0x9ba19 + if_greater_than $7, UnknownScript_0x9ba19 2writetext UnknownText_0x9ba5f closetext loadmovesprites diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 92e105ffa..e0aabbd45 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -11,7 +11,7 @@ VioletCity_MapScriptHeader: ; 0x1a83b2 ; 0x1a83b7 UnknownScript_0x1a83b7: ; 0x1a83b7 - setbit2 $0043 + setflag $0043 return ; 0x1a83bb @@ -51,7 +51,7 @@ UnknownScript_0x1a83d1: ; 0x1a83d1 applymovement $2, MovementData_0x1a8463 playsound $001f disappear $2 - clearbit1 $06cb + clearevent $06cb waitbutton end ; 0x1a8403 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 9c4a862f2..41f2d3278 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -9,7 +9,7 @@ VioletGym_MapScriptHeader: ; 0x683c0 FalknerScript_0x683c2: ; 0x683c2 faceplayer loadfont - checkbit1 EVENT_BEAT_FALKNER + checkevent EVENT_BEAT_FALKNER iftrue UnknownScript_0x683ec 2writetext UnknownText_0x68473 closetext @@ -18,26 +18,26 @@ FalknerScript_0x683c2: ; 0x683c2 loadtrainer FALKNER, 1 startbattle returnafterbattle - setbit1 EVENT_BEAT_FALKNER + setevent EVENT_BEAT_FALKNER loadfont 2writetext UnknownText_0x685af playsound $009c waitbutton - setbit2 $001b + setflag $001b checkcode $7 2call UnknownScript_0x68418 UnknownScript_0x683ec: ; 0x683ec - checkbit1 EVENT_GOT_TM31_MUD_SLAP + checkevent EVENT_GOT_TM31_MUD_SLAP iftrue UnknownScript_0x68412 - setbit1 EVENT_BEAT_BIRD_KEEPER_ROD - setbit1 EVENT_BEAT_BIRD_KEEPER_ABE + setevent EVENT_BEAT_BIRD_KEEPER_ROD + setevent EVENT_BEAT_BIRD_KEEPER_ABE domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $2 specialphonecall $3 2writetext UnknownText_0x685c8 keeptextopen verbosegiveitem TM_31, 1 iffalse UnknownScript_0x68416 - setbit1 EVENT_GOT_TM31_MUD_SLAP + setevent EVENT_GOT_TM31_MUD_SLAP 2writetext UnknownText_0x68648 closetext loadmovesprites @@ -127,7 +127,7 @@ Bird_keeperAbeScript: ; 0x68447 VioletGymGuyScript: ; 0x6844f faceplayer loadfont - checkbit1 EVENT_BEAT_FALKNER + checkevent EVENT_BEAT_FALKNER iftrue .VioletGymGuyWinScript 2writetext VioletGymGuyText closetext @@ -142,7 +142,7 @@ VioletGymGuyScript: ; 0x6844f ; 0x68463 MapVioletGymSignpost1Script: ; 0x68463 - checkbit2 $001b + checkflag $001b iftrue UnknownScript_0x6846c jumpstd $002d ; 0x6846c diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index 1fba9bb62..b7c245809 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -13,7 +13,7 @@ NurseScript_0x694c9: ; 0x694c9 ScientistScript_0x694cc: ; 0x694cc faceplayer loadfont - checkbit1 EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE + checkevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE iftrue UnknownScript_0x6953a 2writetext UnknownText_0x69555 UnknownScript_0x694d7: ; 0x694d7 @@ -24,9 +24,9 @@ UnknownScript_0x694d7: ; 0x694d7 giveegg TOGEPI, 5 stringtotext .eggname, $1 2call UnknownScript_0x69527 - setbit1 EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE - clearbit1 EVENT_ELMS_AIDE_IN_LAB - clearbit1 EVENT_TOGEPI_HATCHED + setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE + clearevent EVENT_ELMS_AIDE_IN_LAB + clearevent EVENT_TOGEPI_HATCHED domaptrigger GROUP_ROUTE_32, MAP_ROUTE_32, $1 2writetext UnknownText_0x695c5 closetext @@ -70,7 +70,7 @@ UnknownScript_0x69531: ; 0x69531 2writetext UnknownText_0x696f2 closetext loadmovesprites - setbit1 EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE + setevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE end ; 0x6953a diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index e16dad94c..b08b10ecb 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -11,7 +11,7 @@ ViridianCity_MapScriptHeader: ; 0x1a9a43 ; 0x1a9a48 UnknownScript_0x1a9a48: ; 0x1a9a48 - setbit2 $0036 + setflag $0036 return ; 0x1a9a4c @@ -37,7 +37,7 @@ UnknownScript_0x1a9a5b: ; 0x1a9a5b GrampsScript_0x1a9a61: ; 0x1a9a61 faceplayer loadfont - checkbit1 $0775 + checkevent $0775 iftrue UnknownScript_0x1a9a6f 2writetext UnknownText_0x1a9c11 closetext @@ -55,13 +55,13 @@ UnknownScript_0x1a9a6f: ; 0x1a9a6f FisherScript_0x1a9a75: ; 0x1a9a75 faceplayer loadfont - checkbit1 EVENT_GOT_TM42_DREAM_EATER + checkevent EVENT_GOT_TM42_DREAM_EATER iftrue UnknownScript_0x1a9a8a 2writetext UnknownText_0x1a9cc4 keeptextopen verbosegiveitem TM_42, 1 iffalse UnknownScript_0x1a9a8e - setbit1 EVENT_GOT_TM42_DREAM_EATER + setevent EVENT_GOT_TM42_DREAM_EATER UnknownScript_0x1a9a8a: ; 0x1a9a8a 2writetext UnknownText_0x1a9d86 closetext diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index b8f733bb3..d39168cd8 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -9,7 +9,7 @@ ViridianGym_MapScriptHeader: ; 0x9aa24 BlueScript_0x9aa26: ; 0x9aa26 faceplayer loadfont - checkbit2 $002a + checkflag $002a iftrue UnknownScript_0x9aa51 2writetext UnknownText_0x9aa7b closetext @@ -18,12 +18,12 @@ BlueScript_0x9aa26: ; 0x9aa26 loadtrainer BLUE, 1 startbattle returnafterbattle - setbit1 EVENT_BEAT_BLUE + setevent EVENT_BEAT_BLUE loadfont 2writetext UnknownText_0x9ac0f playsound $009c waitbutton - setbit2 $002a + setflag $002a 2writetext UnknownText_0x9ac27 closetext loadmovesprites @@ -40,7 +40,7 @@ UnknownScript_0x9aa51: ; 0x9aa51 ViridianGymGuyScript: ; 0x9aa57 faceplayer loadfont - checkbit1 EVENT_BEAT_BLUE + checkevent EVENT_BEAT_BLUE iftrue .ViridianGymGuyWinScript 2writetext ViridianGymGuyText closetext @@ -55,7 +55,7 @@ ViridianGymGuyScript: ; 0x9aa57 ; 0x9aa6b MapViridianGymSignpost1Script: ; 0x9aa6b - checkbit2 $002a + checkflag $002a iftrue UnknownScript_0x9aa74 jumpstd $002d ; 0x9aa74 diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm index a38fdb34d..817307bda 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokeCenter1F.asm @@ -13,7 +13,7 @@ NurseScript_0x9b690: ; 0x9b690 CooltrainerMScript_0x9b693: ; 0x9b693 faceplayer loadfont - checkbit1 $0775 + checkevent $0775 iftrue UnknownScript_0x9b6a1 2writetext UnknownText_0x9b6ad closetext diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index ba083e7ff..f5a9da725 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -15,28 +15,28 @@ WarehouseEntrance_MapScriptHeader: ; 0x7c038 ; 0x7c043 UnknownScript_0x7c043: ; 0x7c043 - clearbit1 EVENT_SWITCH_1 - clearbit1 EVENT_SWITCH_2 - clearbit1 EVENT_SWITCH_3 - clearbit1 EVENT_EMERGENCY_SWITCH - clearbit1 EVENT_SWITCH_4 - clearbit1 EVENT_SWITCH_5 - clearbit1 EVENT_SWITCH_6 - clearbit1 EVENT_SWITCH_7 - clearbit1 EVENT_SWITCH_8 - clearbit1 EVENT_SWITCH_9 - clearbit1 EVENT_SWITCH_10 - clearbit1 EVENT_SWITCH_11 - clearbit1 EVENT_SWITCH_12 - clearbit1 EVENT_SWITCH_13 - clearbit1 EVENT_SWITCH_14 + clearevent EVENT_SWITCH_1 + clearevent EVENT_SWITCH_2 + clearevent EVENT_SWITCH_3 + clearevent EVENT_EMERGENCY_SWITCH + clearevent EVENT_SWITCH_4 + clearevent EVENT_SWITCH_5 + clearevent EVENT_SWITCH_6 + clearevent EVENT_SWITCH_7 + clearevent EVENT_SWITCH_8 + clearevent EVENT_SWITCH_9 + clearevent EVENT_SWITCH_10 + clearevent EVENT_SWITCH_11 + clearevent EVENT_SWITCH_12 + clearevent EVENT_SWITCH_13 + clearevent EVENT_SWITCH_14 writebyte $0 copyvartobyte UndergroundSwitchPositions return ; 0x7c076 UnknownScript_0x7c076: ; 0x7c076 - checkbit1 EVENT_USED_BASEMENT_KEY + checkevent EVENT_USED_BASEMENT_KEY iffalse UnknownScript_0x7c07d return ; 0x7c07d @@ -245,7 +245,7 @@ UnknownScript_0x7c140: ; 0x7c140 GrampsScript_0x7c146: ; 0x7c146 loadfont - checkbit2 $0056 + checkflag $0056 iftrue UnknownScript_0x7c300 checkcode $b if_equal MONDAY, UnknownScript_0x7c156 @@ -270,7 +270,7 @@ SuperNerdScript_0x7c161: ; 0x7c161 ; 0x7c173 UnknownScript_0x7c173: ; 0x7c173 - checkbit2 $005a + checkflag $005a iftrue UnknownScript_0x7c208 special $0051 2writetext UnknownText_0x7c5f9 @@ -283,30 +283,30 @@ UnknownScript_0x7c173: ; 0x7c173 special $0061 if_equal $0, UnknownScript_0x7c1fc if_equal $1, UnknownScript_0x7c1fc - setbit2 $005a + setflag $005a if_equal $2, UnknownScript_0x7c1a9 if_equal $3, UnknownScript_0x7c1b5 2jump UnknownScript_0x7c1c1 ; 0x7c1a9 UnknownScript_0x7c1a9: ; 0x7c1a9 - setbit1 $0000 - clearbit1 $0001 - clearbit1 $0002 + setevent $0000 + clearevent $0001 + clearevent $0002 2jump UnknownScript_0x7c1cd ; 0x7c1b5 UnknownScript_0x7c1b5: ; 0x7c1b5 - clearbit1 $0000 - setbit1 $0001 - clearbit1 $0002 + clearevent $0000 + setevent $0001 + clearevent $0002 2jump UnknownScript_0x7c1cd ; 0x7c1c1 UnknownScript_0x7c1c1: ; 0x7c1c1 - clearbit1 $0000 - clearbit1 $0001 - setbit1 $0002 + clearevent $0000 + clearevent $0001 + setevent $0002 2jump UnknownScript_0x7c1cd ; 0x7c1cd @@ -324,9 +324,9 @@ UnknownScript_0x7c1cd: ; 0x7c1cd loadfont 2writetext UnknownText_0x7c6d8 closetext - checkbit1 $0000 + checkevent $0000 iftrue UnknownScript_0x7c2bb - checkbit1 $0001 + checkevent $0001 iftrue UnknownScript_0x7c2c4 2jump UnknownScript_0x7c2cd ; 0x7c1fc @@ -362,7 +362,7 @@ SuperNerdScript_0x7c20e: ; 0x7c20e ; 0x7c220 UnknownScript_0x7c220: ; 0x7c220 - checkbit2 $005a + checkflag $005a iftrue UnknownScript_0x7c2b5 special $0051 2writetext UnknownText_0x7c75c @@ -375,30 +375,30 @@ UnknownScript_0x7c220: ; 0x7c220 special $0062 if_equal $0, UnknownScript_0x7c2a9 if_equal $1, UnknownScript_0x7c2a9 - setbit2 $005a + setflag $005a if_equal $2, UnknownScript_0x7c256 if_equal $3, UnknownScript_0x7c262 2jump UnknownScript_0x7c26e ; 0x7c256 UnknownScript_0x7c256: ; 0x7c256 - setbit1 $0000 - clearbit1 $0001 - clearbit1 $0002 + setevent $0000 + clearevent $0001 + clearevent $0002 2jump UnknownScript_0x7c27a ; 0x7c262 UnknownScript_0x7c262: ; 0x7c262 - clearbit1 $0000 - setbit1 $0001 - clearbit1 $0002 + clearevent $0000 + setevent $0001 + clearevent $0002 2jump UnknownScript_0x7c27a ; 0x7c26e UnknownScript_0x7c26e: ; 0x7c26e - clearbit1 $0000 - clearbit1 $0001 - setbit1 $0002 + clearevent $0000 + clearevent $0001 + setevent $0002 2jump UnknownScript_0x7c27a ; 0x7c27a @@ -416,9 +416,9 @@ UnknownScript_0x7c27a: ; 0x7c27a loadfont 2writetext UnknownText_0x7c82a closetext - checkbit1 $0000 + checkevent $0000 iftrue UnknownScript_0x7c2bb - checkbit1 $0001 + checkevent $0001 iftrue UnknownScript_0x7c2c4 2jump UnknownScript_0x7c2cd ; 0x7c2a9 @@ -470,7 +470,7 @@ UnknownScript_0x7c2cd: ; 0x7c2cd MapWarehouseEntranceSignpost0Script: ; 0x7c2d6 loadfont - checkbit1 EVENT_USED_BASEMENT_KEY + checkevent EVENT_USED_BASEMENT_KEY iftrue UnknownScript_0x7c2fa checkitem BASEMENT_KEY iftrue UnknownScript_0x7c2e8 @@ -488,7 +488,7 @@ UnknownScript_0x7c2e8: ; 0x7c2e8 changeblock $12, $6, $2e reloadmappart loadmovesprites - setbit1 EVENT_USED_BASEMENT_KEY + setevent EVENT_USED_BASEMENT_KEY end ; 0x7c2fa diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 1b002757b..78f7f3c1e 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -11,7 +11,7 @@ WhirlIslandLugiaChamber_MapScriptHeader: ; 0x18c4ff ; 0x18c504 UnknownScript_0x18c504: ; 0x18c504 - checkbit1 EVENT_FOUGHT_LUGIA + checkevent EVENT_FOUGHT_LUGIA iftrue UnknownScript_0x18c515 checkitem SILVER_WING iftrue UnknownScript_0x18c512 @@ -35,7 +35,7 @@ LugiaScript_0x18c518: ; 0x18c518 cry LUGIA pause 15 loadmovesprites - setbit1 EVENT_FOUGHT_LUGIA + setevent EVENT_FOUGHT_LUGIA writecode $3, $a loadpokedata LUGIA, 60 startbattle diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 8089c469e..9d65f03a1 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -24,11 +24,11 @@ UnknownScript_0x1804ca: ; 0x1804ca ; 0x1804cb UnknownScript_0x1804cb: ; 0x1804cb - checkbit1 $0309 + checkevent $0309 iffalse UnknownScript_0x1804d5 changeblock $4, $e, $2a UnknownScript_0x1804d5: ; 0x1804d5 - checkbit1 EVENT_WILLS_ROOM_EXIT_OPEN + checkevent EVENT_WILLS_ROOM_EXIT_OPEN iffalse UnknownScript_0x1804df changeblock $4, $2, $16 UnknownScript_0x1804df: ; 0x1804df @@ -44,7 +44,7 @@ UnknownScript_0x1804e0: ; 0x1804e0 reloadmappart loadmovesprites dotrigger $1 - setbit1 $0309 + setevent $0309 waitbutton end ; 0x1804f8 @@ -52,7 +52,7 @@ UnknownScript_0x1804e0: ; 0x1804e0 WillScript_0x1804f8: ; 0x1804f8 faceplayer loadfont - checkbit1 $05b8 + checkevent $05b8 iftrue UnknownScript_0x180526 2writetext UnknownText_0x180531 closetext @@ -61,7 +61,7 @@ WillScript_0x1804f8: ; 0x1804f8 loadtrainer WILL, 1 startbattle returnafterbattle - setbit1 $05b8 + setevent $05b8 loadfont 2writetext UnknownText_0x180644 closetext @@ -70,7 +70,7 @@ WillScript_0x1804f8: ; 0x1804f8 changeblock $4, $2, $16 reloadmappart loadmovesprites - setbit1 EVENT_WILLS_ROOM_EXIT_OPEN + setevent EVENT_WILLS_ROOM_EXIT_OPEN waitbutton end ; 0x180526 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index f99817aac..9c2a2278f 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -23,26 +23,26 @@ UnknownScript_0x98573: ; 0x98573 ; 0x98574 UnknownScript_0x98574: ; 0x98574 - checkbit1 EVENT_FOUGHT_SUICUNE + checkevent EVENT_FOUGHT_SUICUNE iftrue UnknownScript_0x98593 - checkbit1 EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER + checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue UnknownScript_0x9858c checkitem CLEAR_BELL iftrue UnknownScript_0x9858c - clearbit1 $07ab - setbit1 $07ac + clearevent $07ab + setevent $07ac return ; 0x9858c UnknownScript_0x9858c: ; 0x9858c - setbit1 $07ab - clearbit1 $07ac + setevent $07ab + clearevent $07ac return ; 0x98593 UnknownScript_0x98593: ; 0x98593 - setbit1 $07ab - setbit1 $07ac + setevent $07ab + setevent $07ac return ; 0x9859a @@ -152,7 +152,7 @@ TrainerSageKoji: ; 0x985ec ; 0x985f8 SageKojiScript: ; 0x985f8 - checkbit1 EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER + checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue UnknownScript_0x9861b pause 10 showemote $0, $7, 20 @@ -164,7 +164,7 @@ SageKojiScript: ; 0x985f8 loadmovesprites applymovement $7, MovementData_0x98628 spriteface $7, $1 - setbit1 EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER + setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER dotrigger $1 end ; 0x9861b