diff --git a/engine/scripting.asm b/engine/scripting.asm index ef451f51e..c2eeb30f4 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -51,9 +51,9 @@ ScriptCommandTable: ; 0x96cb1 dw Script_checkevent dw Script_clearevent dw Script_setevent - dw Script_checkbit2 - dw Script_clearbit2 - dw Script_setbit2 + dw Script_checkflag + dw Script_clearflag + dw Script_setflag dw Script_wildon dw Script_wildoff dw Script_xycompare @@ -2715,7 +2715,7 @@ Script_checkevent: ; 0x979a4 ret ; 0x979bb -Script_setbit2: ; 0x979bb +Script_setflag: ; 0x979bb ; script command 0x36 ; parameters: ; bit_number (MultiByteParam) @@ -2729,7 +2729,7 @@ Script_setbit2: ; 0x979bb ret ; 0x979c9 -Script_clearbit2: ; 0x979c9 +Script_clearflag: ; 0x979c9 ; script command 0x35 ; parameters: ; bit_number (MultiByteParam) @@ -2743,7 +2743,7 @@ Script_clearbit2: ; 0x979c9 ret ; 0x979d7 -Script_checkbit2: ; 0x979d7 +Script_checkflag: ; 0x979d7 ; script command 0x34 ; parameters: ; bit_number (MultiByteParam) diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 0b2a81ea4..7c927d044 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -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 @@ -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 @@ -359,7 +359,7 @@ UnknownScript_0xbc23e: ; 0xbc23e ; 0xbc242 UnknownScript_0xbc242: ; 0xbc242 - setbit2 $0013 + setflag $0013 setevent $06cf setevent $06d1 clearevent $06ce @@ -380,7 +380,7 @@ UnknownScript_0xbc25c: ; 0xbc25c applymovement $0, MovementData_0xbcea1 UnknownScript_0xbc274: ; bc274 - clearbit2 $0011 + clearflag $0011 clearevent $02d2 clearevent $0313 clearevent $0314 @@ -440,7 +440,7 @@ UnknownScript_0xbc2b1: ; 0xbc2b1 setevent $0727 setevent $0728 setevent $0729 - setbit2 $0051 + setflag $0051 special $003c end ; 0xbc31e @@ -659,8 +659,8 @@ UnknownScript_0xbc3db: ; 0xbc3db setevent $07af setevent $07ae setevent $07cf - setbit2 $000e - setbit2 $0017 + setflag $000e + setflag $0017 variablesprite $4, $52 variablesprite $5, $4 variablesprite $6, $35 @@ -2398,7 +2398,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 +2436,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 @@ -2465,7 +2465,7 @@ MomPhoneNoGymQuestScript: ; 0xbcfac MomPhoneLectureScript: ; 0xbcfb1 setevent $0040 - setbit2 $0009 + setflag $0009 specialphonecall $0000 3writetext BANK(MomPhoneLectureText), MomPhoneLectureText yesorno diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 1fb164122..2731615f8 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -23,7 +23,7 @@ BugsyScript_0x18ec1e: ; 0x18ec1e 2writetext UnknownText_0x18ee14 playsound $009c waitbutton - setbit2 $001c + setflag $001c checkcode $7 2call UnknownScript_0x18ec73 UnknownScript_0x18ec48: ; 0x18ec48 @@ -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 c90c95086..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 @@ -175,7 +175,7 @@ UnknownScript_0x1980e5: ; 0x1980e5 closetext verbosegiveitem GS_BALL, 1 spriteface $d, $2 - setbit2 $0064 + setflag $0064 clearevent $06ed setevent $06eb dotrigger $0 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 6e8eeabf0..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 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 80a04aec8..354e14bfe 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -29,7 +29,7 @@ UnknownScript_0x194e23: ; 0x194e23 ClairScript_0x194e24: ; 0x194e24 faceplayer loadfont - checkbit2 $0022 + checkflag $0022 iftrue UnknownScript_0x194e69 checkevent EVENT_BEAT_CLAIR iftrue UnknownScript_0x194e63 @@ -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/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/CeladonGym.asm b/maps/CeladonGym.asm index 34628be38..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 @@ -27,7 +27,7 @@ ErikaScript_0x72a6a: ; 0x72a6a 2writetext UnknownText_0x72c96 playsound $009c waitbutton - setbit2 $0026 + setflag $0026 UnknownScript_0x72a9b: ; 0x72a9b checkevent EVENT_GOT_TM19_GIGA_DRAIN iftrue UnknownScript_0x72aae @@ -189,7 +189,7 @@ TwinsJoandzoe2Script: ; 0x72b10 ; 0x72b18 MapCeladonGymSignpost1Script: ; 0x72b18 - checkbit2 $0026 + checkflag $0026 iftrue UnknownScript_0x72b21 jumpstd $002d ; 0x72b21 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index c848645b0..7cd8b19d2 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -11,7 +11,7 @@ CeruleanCity_MapScriptHeader: ; 0x184000 ; 0x184005 UnknownScript_0x184005: ; 0x184005 - setbit2 $0038 + setflag $0038 return ; 0x184009 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index bb7b444b5..10199e2a4 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -59,7 +59,7 @@ UnknownScript_0x1883de: ; 0x1883de MistyScript_0x188432: ; 0x188432 faceplayer loadfont - checkbit2 $0024 + checkflag $0024 iftrue UnknownScript_0x188460 2writetext UnknownText_0x188674 closetext @@ -76,7 +76,7 @@ MistyScript_0x188432: ; 0x188432 2writetext UnknownText_0x188768 playsound $009c waitbutton - setbit2 $0024 + setflag $0024 UnknownScript_0x188460: ; 0x188460 2writetext UnknownText_0x188782 closetext @@ -215,7 +215,7 @@ MapCeruleanGymSignpost2Script: ; 0x1884c6 ; 0x1884d3 UnknownScript_0x1884d3: ; 0x1884d3 - checkbit2 $0024 + checkflag $0024 iftrue UnknownScript_0x1884dc jumpstd $002d ; 0x1884dc diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index bdbe52745..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 @@ -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 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 3399aaf26..88471e22c 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -23,7 +23,7 @@ UnknownScript_0x1a000e: ; 0x1a000e ; 0x1a000f UnknownScript_0x1a000f: ; 0x1a000f - setbit2 $0045 + setflag $0045 setevent $07aa checkevent $0333 iffalse UnknownScript_0x1a001d diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index db6078522..a87870e17 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -38,7 +38,7 @@ ChuckScript_0x9d60f: ; 0x9d60f 2writetext UnknownText_0x9d835 playsound $009c waitbutton - setbit2 $0020 + setflag $0020 checkcode $7 2call UnknownScript_0x9d681 UnknownScript_0x9d656: ; 0x9d656 @@ -202,7 +202,7 @@ BoulderScript_0x9d6e0: ; 0x9d6e0 ; 0x9d6e3 MapCianwoodGymSignpost1Script: ; 0x9d6e3 - checkbit2 $0020 + checkflag $0020 iftrue UnknownScript_0x9d6ec jumpstd $002d ; 0x9d6ec diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index b27dcd85d..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 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index b295d7a00..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 @@ -33,7 +33,7 @@ CopycatScript_0x18aeb1: ; 0x18aeb1 iftrue UnknownScript_0x18af5b checkitem LOST_ITEM iftrue UnknownScript_0x18af4a - checkbit2 $0063 + checkflag $0063 iftrue UnknownScript_0x18aed4 applymovement $2, MovementData_0x18afd0 faceplayer @@ -50,7 +50,7 @@ UnknownScript_0x18aedc: ; 0x18aedc 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 @@ -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 0448b2cb4..fb76190f2 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -172,7 +172,7 @@ GentlemanScript_0x994c6: ; 0x994c6 ; 0x994f3 UnknownScript_0x994f3: ; 0x994f3 - checkbit2 $0063 + checkflag $0063 iftrue UnknownScript_0x994ff 2writetext UnknownText_0x99891 closetext diff --git a/maps/DayCare.asm b/maps/DayCare.asm index d4bc1197d..0fc1f13ee 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -11,7 +11,7 @@ DayCare_MapScriptHeader: ; 0x62f76 ; 0x62f7b UnknownScript_0x62f7b: ; 0x62f7b - checkbit2 $0005 + checkflag $0005 iftrue UnknownScript_0x62f88 clearevent $06e5 setevent $06e6 @@ -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 0a0c0c390..bafdc98cc 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -160,7 +160,7 @@ UnknownScript_0x18d100: ; 0x18d100 loadfont 2writetext UnknownText_0x18d9bf closetext - setbit2 $0022 + setflag $0022 playsound $009c waitbutton special $003d diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index dc8c1ea28..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 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 7dddca95b..af463d505 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -36,7 +36,7 @@ MortyScript_0x99d58: ; 0x99d58 2writetext UnknownText_0x9a043 playsound $009c waitbutton - setbit2 $001e + setflag $001e checkcode $7 2call UnknownScript_0x99db7 domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $1 @@ -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 7fd952aaf..a3c9ea671 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -79,7 +79,7 @@ SageScript_0x98062: ; 0x98062 loadfont checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x9807c - checkbit2 $001e + checkflag $001e iftrue UnknownScript_0x98076 2writetext UnknownText_0x980d1 closetext diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index b277a94db..23a51b7e6 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -51,7 +51,7 @@ UnknownScript_0x98e95: ; 0x98e95 playsound $0023 disappear $6 clearevent $0712 - setbit2 $0053 + setflag $0053 dotrigger $1 waitbutton end diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 1b8a0bb04..2d94f8169 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -105,7 +105,7 @@ ProfElmScript: ; 0x78be0 UnknownScript_0x78bee: ; 0x78bee checkevent EVENT_GOT_MASTER_BALL_FROM_ELM iftrue UnknownScript_0x78bfa - checkbit2 $0022 + checkflag $0022 iftrue ElmGiveMasterBallScript UnknownScript_0x78bfa: ; 0x78bfa checkevent EVENT_GOT_EVERSTONE_FROM_ELM @@ -144,7 +144,7 @@ UnknownScript_0x78c35: ; 0x78c35 UnknownScript_0x78c41: ; 0x78c41 checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE ; why are we checking it again? iftrue ElmWaitingEggHatchScript - checkbit2 $001b + checkflag $001b iftrue ElmAideHasEggScript checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue ElmStudyingEggScript @@ -362,7 +362,7 @@ ElmAfterTheftScript: ; 0x78da2 2writetext ElmAfterTheftText5 keeptextopen setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - setbit2 $0010 + setflag $0010 domaptrigger GROUP_ROUTE_29, MAP_ROUTE_29, $1 clearevent $0715 setevent $0714 @@ -615,7 +615,7 @@ MeetCopScript: ; 0x78f16 MapElmsLabSignpost14Script: ; 0x78f33 loadfont - checkbit2 $0043 + checkflag $0043 iftrue UnknownScript_0x78f49 checkevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON iftrue UnknownScript_0x78f43 diff --git a/maps/FastShipCabins.asm b/maps/FastShipCabins.asm index 7cf653801..d83bd73a8 100644 --- a/maps/FastShipCabins.asm +++ b/maps/FastShipCabins.asm @@ -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 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 7cf653801..d83bd73a8 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -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 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 ee05f1f30..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 @@ -33,7 +33,7 @@ JanineScript_0x195db9: ; 0x195db9 2writetext UnknownText_0x195feb playsound $009c waitbutton - setbit2 $0027 + setflag $0027 2jump UnknownScript_0x195e02 ; 0x195e00 @@ -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 129e80393..80a3b8b46 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -26,7 +26,7 @@ ClerkScript_0x54750: ; 0x54750 playsound $0091 waitbutton itemnotify - setbit2 $0014 + setflag $0014 setevent EVENT_GOT_BICYCLE UnknownScript_0x54775: ; 0x54775 2writetext UnknownText_0x5485f diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 217a3ca77..c94f5fec2 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -13,8 +13,8 @@ GoldenrodCity_MapScriptHeader: ; 0x1988d0 ; 0x1988d8 UnknownScript_0x1988d8: ; 0x1988d8 - setbit2 $0046 - setbit2 $0016 + setflag $0046 + setflag $0016 checkevent $00b9 iftrue UnknownScript_0x1988e7 clearevent $0769 @@ -36,7 +36,7 @@ UnknownScript_0x1988fd: ; 0x1988fd ; 0x198900 UnknownScript_0x198900: ; 0x198900 - checkbit2 $005e + checkflag $005e iftrue UnknownScript_0x198908 appear $10 UnknownScript_0x198908: ; 0x198908 @@ -144,7 +144,7 @@ UnknownScript_0x1989ca: ; 0x1989ca playsound $001f disappear $10 clearevent $076b - setbit2 $005e + setflag $005e waitbutton end ; 0x1989d7 @@ -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 8a0735269..536df8772 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -67,7 +67,7 @@ ReceptionistScript_0x560ce: ; 0x560ce loadfont checkcode $b if_not_equal SUNDAY, UnknownScript_0x56112 - checkbit2 $005b + checkflag $005b iftrue UnknownScript_0x56112 special $0059 2writetext UnknownText_0x56143 @@ -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/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 5f0e5d5b1..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,7 +25,7 @@ UnknownScript_0x56722: ; 0x56722 ; 0x5672b UnknownScript_0x5672b: ; 0x5672b - checkbit2 $0061 + checkflag $0061 iftrue UnknownScript_0x56738 setevent $06f0 clearevent $06f1 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 16dff55a2..da4eb8edd 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -15,7 +15,7 @@ TeacherScript_0x5535d: ; 0x5535d iffalse UnknownScript_0x5539f checkevent $00ba iffalse UnknownScript_0x5538f - checkbit2 $001d + checkflag $001d iffalse UnknownScript_0x5539c faceplayer loadfont diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 4962a9173..58edaacb8 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -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 230a5e965..f4699fb61 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -50,7 +50,7 @@ UnknownScript_0x54037: ; 0x54037 UnknownScript_0x54044: ; 0x54044 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 @@ -244,7 +244,7 @@ GoldenrodGymGuyScript: ; 0x540f7 ; 0x5410c MapGoldenrodGymSignpost1Script: ; 0x5410c - checkbit2 $001d + checkflag $001d iftrue UnknownScript_0x54115 jumpstd $002d ; 0x54115 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index cd985b46c..a66f8d159 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -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 88938eed3..070d05002 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -46,7 +46,7 @@ UnknownScript_0x18000a: ; 0x18000a UnknownScript_0x180053: ; 0x180053 checkevent EVENT_BEAT_RIVAL_IN_MT_MOON iffalse UnknownScript_0x18012b - checkbit2 $005d + checkflag $005d iftrue UnknownScript_0x18012b checkcode $b if_equal SUNDAY, UnknownScript_0x18012b @@ -69,7 +69,7 @@ UnknownScript_0x180053: ; 0x180053 UnknownScript_0x180094: ; 0x180094 checkevent EVENT_BEAT_RIVAL_IN_MT_MOON iffalse UnknownScript_0x18012b - checkbit2 $005d + checkflag $005d iftrue UnknownScript_0x18012b checkcode $b if_equal SUNDAY, UnknownScript_0x18012b @@ -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/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 8eb38f4d7..5a67bdb73 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -40,8 +40,8 @@ UnknownScript_0x7a4f6: ; 0x7a4f6 keeptextopen stringtotext GearName, $1 2call UnknownScript_0x7a57e - setbit2 $0004 - setbit2 $0002 + setflag $0004 + setflag $0002 addcellnum $1 dotrigger $1 setevent $06c7 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index a1aeb9ffa..c5c56bf9c 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -15,7 +15,7 @@ UnknownScript_0x18e154: ; 0x18e154 iffalse UnknownScript_0x18e177 checkevent $00c0 iftrue UnknownScript_0x18e177 - checkbit2 $0050 + checkflag $0050 iftrue UnknownScript_0x18e16f disappear $5 appear $2 @@ -178,7 +178,7 @@ UnknownScript_0x18e293: ; 0x18e293 UnknownScript_0x18e299: ; 0x18e299 setevent $0000 - setbit2 $0050 + setflag $0050 UnknownScript_0x18e29f: ; 0x18e29f 2writetext UnknownText_0x18e779 closetext @@ -204,7 +204,7 @@ UnknownScript_0x18e2b2: ; 0x18e2b2 ; 0x18e2b4 UnknownScript_0x18e2b4: ; 0x18e2b4 - checkbit2 $0050 + checkflag $0050 iftrue UnknownScript_0x18e3c5 2writetext UnknownText_0x18e7fb keeptextopen @@ -216,7 +216,7 @@ UnknownScript_0x18e2c4: ; 0x18e2c4 ; 0x18e2ca UnknownScript_0x18e2ca: ; 0x18e2ca - checkbit2 $0050 + checkflag $0050 iftrue UnknownScript_0x18e3c5 2writetext UnknownText_0x18e7fb keeptextopen @@ -228,7 +228,7 @@ UnknownScript_0x18e2da: ; 0x18e2da ; 0x18e2e0 UnknownScript_0x18e2e0: ; 0x18e2e0 - checkbit2 $0050 + checkflag $0050 iftrue UnknownScript_0x18e3c5 2writetext UnknownText_0x18e7fb keeptextopen @@ -240,7 +240,7 @@ UnknownScript_0x18e2f0: ; 0x18e2f0 ; 0x18e2f6 UnknownScript_0x18e2f6: ; 0x18e2f6 - checkbit2 $0050 + checkflag $0050 iftrue UnknownScript_0x18e3c5 2writetext UnknownText_0x18e7fb keeptextopen @@ -252,7 +252,7 @@ UnknownScript_0x18e306: ; 0x18e306 ; 0x18e30c UnknownScript_0x18e30c: ; 0x18e30c - checkbit2 $0050 + checkflag $0050 iftrue UnknownScript_0x18e3c5 2writetext UnknownText_0x18e7fb keeptextopen @@ -264,7 +264,7 @@ UnknownScript_0x18e31c: ; 0x18e31c ; 0x18e322 UnknownScript_0x18e322: ; 0x18e322 - checkbit2 $0050 + checkflag $0050 iftrue UnknownScript_0x18e3c5 2writetext UnknownText_0x18e7fb keeptextopen @@ -276,7 +276,7 @@ UnknownScript_0x18e332: ; 0x18e332 ; 0x18e338 UnknownScript_0x18e338: ; 0x18e338 - checkbit2 $0050 + checkflag $0050 iftrue UnknownScript_0x18e3c5 2writetext UnknownText_0x18e7fb keeptextopen @@ -297,12 +297,12 @@ UnknownScript_0x18e34e: ; 0x18e34e loadmovesprites 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 diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index f49f4faae..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 diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index e374c684b..2fc58f6ce 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -21,7 +21,7 @@ SuperNerdScript_0x7ee69: ; 0x7ee69 GentlemanScript_0x7ee6c: ; 0x7ee6c faceplayer loadfont - checkbit2 $0003 + checkflag $0003 iftrue .UnknownScript_0x7ee8e checkevent EVENT_RETURNED_MACHINE_PART iftrue .UnknownScript_0x7ee80 @@ -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/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 c11d6089a..ccebe7a03 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -23,7 +23,7 @@ PryceScript_0x199a9e: ; 0x199a9e 2writetext UnknownText_0x199d3b playsound $009c waitbutton - setbit2 $0021 + setflag $0021 checkcode $7 2call UnknownScript_0x199af6 UnknownScript_0x199ac8: ; 0x199ac8 @@ -230,7 +230,7 @@ MahoganyGymGuyScript: ; 0x199b69 ; 0x199b7d MapMahoganyGymSignpost1Script: ; 0x199b7d - checkbit2 $0021 + checkflag $0021 iftrue UnknownScript_0x199b86 jumpstd $002d ; 0x199b86 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 9a7354ce9..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 diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 141677cad..300946057 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -30,7 +30,7 @@ RockerScript_0x9d278: ; 0x9d278 ; 0x9d2a4 UnknownScript_0x9d2a4: ; 0x9d2a4 - checkbit2 $0055 + checkflag $0055 iffalse UnknownScript_0x9d2bc 2writetext UnknownText_0x9d3ed closetext diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index bfc4049ab..56c63d350 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -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 @@ -73,7 +73,7 @@ UnknownScript_0x7709a: ; 0x7709a disappear $3 stopfollow clearevent $00ec - setbit2 $0058 + setflag $0058 end ; 0x77117 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 892fd1d45..e9b7a939f 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -100,7 +100,7 @@ UnknownScript_0x196ec9: ; 0x196ec9 2writetext UnknownText_0x1973cc playsound $0001 waitbutton - setbit2 $000b + setflag $000b 2writetext UnknownText_0x1973de closetext loadmovesprites diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 294100948..537c074d1 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -88,7 +88,7 @@ SchoolboyJack1Script: ; 0x5c04e writecode $17, $5 talkaftercancel loadfont - checkbit2 $0065 + checkflag $0065 iftrue UnknownScript_0x5c088 checkcellnum $5 iftrue UnknownScript_0x5c108 @@ -131,14 +131,14 @@ UnknownScript_0x5c0b3: ; 0x5c0b3 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,7 +265,7 @@ PokefanfBeverly1Script: ; 0x5c138 writecode $17, $6 talkaftercancel loadfont - checkbit2 $007d + checkflag $007d iftrue UnknownScript_0x5c177 checkcellnum $6 iftrue UnknownScript_0x5c19b @@ -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 65864f961..e53904e52 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -23,7 +23,7 @@ UnknownScript_0x1a800e: ; 0x1a800e ; 0x1a800f UnknownScript_0x1a800f: ; 0x1a800f - setbit2 $0041 + setflag $0041 clearevent $0076 return ; 0x1a8016 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/OlivineGym.asm b/maps/OlivineGym.asm index d2c0f7abc..4c39123b0 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -23,7 +23,7 @@ JasmineScript_0x9c12f: ; 0x9c12f 2writetext UnknownText_0x9c33a playsound $009c waitbutton - setbit2 $001f + setflag $001f checkcode $7 2call UnknownScript_0x9c178 UnknownScript_0x9c159: ; 0x9c159 @@ -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 4da346383..449989dfd 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -59,7 +59,7 @@ SailorHuey1Script: ; 0x5af91 writecode $17, $7 talkaftercancel loadfont - checkbit2 $0066 + checkflag $0066 iftrue UnknownScript_0x5afc7 checkcellnum $7 iftrue UnknownScript_0x5b05f @@ -103,7 +103,7 @@ UnknownScript_0x5aff4: ; 0x5aff4 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,7 +129,7 @@ UnknownScript_0x5b01b: ; 0x5b01b loadtrainer SAILOR, HUEY4 startbattle returnafterbattle - clearbit2 $0066 + clearflag $0066 checkevent EVENT_HUEY_PROTEIN iftrue UnknownScript_0x5b03f checkevent $0265 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 3f976e235..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 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 72e879efb..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 @@ -24,7 +24,7 @@ BrockScript_0x1a2864: ; 0x1a2864 2writetext UnknownText_0x1a2a3d playsound $009c waitbutton - setbit2 $0023 + setflag $0023 2writetext UnknownText_0x1a2a57 closetext loadmovesprites @@ -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 c4d6851f1..9a5f2a5e3 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -333,7 +333,7 @@ UnknownScript_0x192a25: ; 0x192a25 LinkReceptionistScript_0x192a2d: ; 0x192a2d 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 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 6a0a8429f..34cbc747f 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 checkevent EVENT_MET_BUENA iffalse UnknownScript_0x5d800 - checkbit2 $0060 + checkflag $0060 iftrue UnknownScript_0x5d82f checkcode $a if_greater_than $12, UnknownScript_0x5d893 - checkbit2 $005f + 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 @@ -272,7 +272,7 @@ UnknownScript_0x5d83f: ; 0x5d83f ; 0x5d845 UnknownScript_0x5d845: ; 0x5d845 - setbit2 $0060 + setflag $0060 loadfont 2writetext UnknownText_0x5e01c closetext diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 8865d8453..07e3a07be 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -123,12 +123,12 @@ UnknownScript_0x6006e: ; 0x6006e special $0032 setevent $0571 setevent EVENT_CLEARED_RADIO_TOWER - clearbit2 $0013 + clearflag $0013 setevent $06cc setevent $06cd setevent $06ce clearevent $0736 - clearbit2 $0017 + clearflag $0017 clearevent $06cf clearevent $06d0 setevent $06e3 diff --git a/maps/Route16.asm b/maps/Route16.asm index 0478953ec..24c145a85 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -15,12 +15,12 @@ UnknownScript_0x1ad318: ; 0x1ad318 if_greater_than $5, UnknownScript_0x1ad328 checkcode $12 if_less_than $d, UnknownScript_0x1ad328 - setbit2 $0019 + 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/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/Route26.asm b/maps/Route26.asm index 3052991b7..582785c69 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -59,7 +59,7 @@ CooltrainermGaven3Script: ; 0x1a4d3f writecode $17, $b talkaftercancel loadfont - checkbit2 $0067 + checkflag $0067 iftrue UnknownScript_0x1a4d79 checkcellnum $b iftrue UnknownScript_0x1a4dcb @@ -101,7 +101,7 @@ UnknownScript_0x1a4d9c: ; 0x1a4d9c 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,7 +210,7 @@ CooltrainerfBeth1Script: ; 0x1a4dfb writecode $17, $c talkaftercancel loadfont - checkbit2 $0068 + checkflag $0068 iftrue UnknownScript_0x1a4e35 checkcellnum $c iftrue UnknownScript_0x1a4e87 @@ -252,7 +252,7 @@ UnknownScript_0x1a4e58: ; 0x1a4e58 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 5b4ecae20..08476a333 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -98,9 +98,9 @@ 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 @@ -142,7 +142,7 @@ UnknownScript_0x1a0922: ; 0x1a0922 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,7 +302,7 @@ CooltrainerfReena1Script: ; 0x1a09af writecode $17, $e talkaftercancel loadfont - checkbit2 $006a + checkflag $006a iftrue UnknownScript_0x1a09e9 checkcellnum $e iftrue UnknownScript_0x1a0a3b @@ -344,7 +344,7 @@ UnknownScript_0x1a0a0c: ; 0x1a0a0c 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/Route29.asm b/maps/Route29.asm index 814f548c1..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 diff --git a/maps/Route30.asm b/maps/Route30.asm index eefa95ca2..6f3c0fd43 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -51,7 +51,7 @@ YoungsterJoey1Script: ; 0x1a16a6 writecode $17, $f talkaftercancel loadfont - checkbit2 $006b + checkflag $006b iftrue UnknownScript_0x1a16e0 checkcellnum $f iftrue UnknownScript_0x1a178f @@ -91,17 +91,17 @@ UnknownScript_0x1a1705: ; 0x1a1705 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,7 +136,7 @@ UnknownScript_0x1a174b: ; 0x1a174b loadtrainer YOUNGSTER, JOEY5 startbattle returnafterbattle - clearbit2 $006b + clearflag $006b checkevent EVENT_JOEY_HP_UP iftrue UnknownScript_0x1a176f checkevent $0266 diff --git a/maps/Route31.asm b/maps/Route31.asm index 424a95fb4..9dae62509 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -45,9 +45,9 @@ 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 @@ -87,17 +87,17 @@ UnknownScript_0x1a54b8: ; 0x1a54b8 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,7 +132,7 @@ UnknownScript_0x1a54fe: ; 0x1a54fe loadtrainer BUG_CATCHER, WADE5 startbattle returnafterbattle - clearbit2 $006c + clearflag $006c end ; 0x1a5507 @@ -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 diff --git a/maps/Route32.asm b/maps/Route32.asm index 7aa5b7f42..f2c247719 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -45,7 +45,7 @@ UnknownScript_0x190470: ; 0x190470 loadfont checkevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 iftrue UnknownScript_0x1904a5 - checkbit2 $001b + checkflag $001b iffalse UnknownScript_0x19049f checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE iftrue UnknownScript_0x19048f @@ -230,9 +230,9 @@ 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 @@ -272,17 +272,17 @@ UnknownScript_0x1905a2: ; 0x1905a2 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,7 +416,7 @@ PicnickerLiz1Script: ; 0x190633 writecode $17, $12 talkaftercancel loadfont - checkbit2 $006e + checkflag $006e iftrue UnknownScript_0x19066d checkcellnum $12 iftrue UnknownScript_0x1906ed @@ -459,14 +459,14 @@ UnknownScript_0x190698: ; 0x190698 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 diff --git a/maps/Route33.asm b/maps/Route33.asm index 36210b971..d43f5b0bd 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -34,9 +34,9 @@ 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 @@ -79,14 +79,14 @@ UnknownScript_0x1ac07c: ; 0x1ac07c 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 c5f7d17e7..3f369d014 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -11,7 +11,7 @@ Route34_MapScriptHeader: ; 0x78000 ; 0x78005 UnknownScript_0x78005: ; 0x78005 - checkbit2 $0005 + checkflag $0005 iftrue UnknownScript_0x78014 clearevent $06e5 setevent $06e6 @@ -25,7 +25,7 @@ UnknownScript_0x78014: ; 0x78014 ; 0x7801d UnknownScript_0x7801d: ; 0x7801d - checkbit2 $0006 + checkflag $0006 iffalse UnknownScript_0x78029 clearevent $06e7 2jump UnknownScript_0x7802f @@ -37,7 +37,7 @@ UnknownScript_0x78029: ; 0x78029 ; 0x7802f UnknownScript_0x7802f: ; 0x7802f - checkbit2 $0007 + checkflag $0007 iffalse UnknownScript_0x78039 clearevent $06e8 return @@ -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,9 +110,9 @@ 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 @@ -152,17 +152,17 @@ UnknownScript_0x780e2: ; 0x780e2 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,9 +267,9 @@ 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 @@ -312,14 +312,14 @@ UnknownScript_0x781ca: ; 0x781ca 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,7 +362,7 @@ UnknownScript_0x78213: ; 0x78213 2call UnknownScript_0x78244 verbosegiveitem LEAF_STONE, 1 iffalse UnknownScript_0x78225 - clearbit2 $0080 + clearflag $0080 setevent $0100 2jump UnknownScript_0x78234 ; 0x78225 diff --git a/maps/Route35.asm b/maps/Route35.asm index 2d9943da3..fc7a17a0c 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -256,9 +256,9 @@ 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 @@ -298,17 +298,17 @@ UnknownScript_0x19c9e0: ; 0x19c9e0 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 diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index 3185688db..8f2fcd9e8 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,7 +98,7 @@ OfficerScript_0x6a204: ; 0x6a204 if_equal FRIDAY, UnknownScript_0x6a2c7 faceplayer loadfont - checkbit2 $0051 + checkflag $0051 iftrue UnknownScript_0x6a2c1 2call UnknownScript_0x6a2de 2writetext UnknownText_0x6a2eb @@ -109,7 +109,7 @@ OfficerScript_0x6a204: ; 0x6a204 special $0016 clearevent $0308 UnknownScript_0x6a234: ; 0x6a234 - setbit2 $0011 + setflag $0011 special $003c 2writetext UnknownText_0x6a39d keeptextopen @@ -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 30500c39d..cf28ae207 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -203,9 +203,9 @@ 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 @@ -245,17 +245,17 @@ UnknownScript_0x194165: ; 0x194165 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,7 +298,7 @@ UnknownScript_0x1941b4: ; 0x1941b4 2call UnknownScript_0x1941e5 verbosegiveitem FIRE_STONE, 1 iffalse UnknownScript_0x1941c6 - clearbit2 $0081 + clearflag $0081 setevent $0101 2jump UnknownScript_0x1941d5 ; 0x1941c6 diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index 7a770f203..d6e7f6e63 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 @@ -49,7 +49,7 @@ UnknownScript_0x6ab23: ; 0x6ab23 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 @@ -151,7 +151,7 @@ OfficerScript_0x6abe0: ; 0x6abe0 if_equal FRIDAY, UnknownScript_0x6acf1 faceplayer loadfont - checkbit2 $0051 + checkflag $0051 iftrue UnknownScript_0x6ac91 2call UnknownScript_0x6ad02 2writetext UnknownText_0x6add5 @@ -162,7 +162,7 @@ OfficerScript_0x6abe0: ; 0x6abe0 special $0016 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 @@ -311,7 +311,7 @@ UnknownScript_0x6acf1: ; 0x6acf1 OfficerScript_0x6acf4: ; 0x6acf4 faceplayer loadfont - checkbit2 $0051 + checkflag $0051 iftrue UnknownScript_0x6ac91 2writetext UnknownText_0x6b370 closetext diff --git a/maps/Route37.asm b/maps/Route37.asm index f482865a1..55c9cf340 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -122,7 +122,7 @@ BugCatcherScript_0x1a8dbf: ; 0x1a8dbf keeptextopen setevent EVENT_MET_SUNNY_OF_SUNDAY UnknownScript_0x1a8dda: ; 0x1a8dda - checkbit2 $0063 + checkflag $0063 iftrue UnknownScript_0x1a8de7 2writetext UnknownText_0x1a9004 keeptextopen diff --git a/maps/Route38.asm b/maps/Route38.asm index 95073dcec..2dbfb8a57 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -88,9 +88,9 @@ 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 @@ -133,14 +133,14 @@ UnknownScript_0x1a1dad: ; 0x1a1dad 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,7 +183,7 @@ UnknownScript_0x1a1df6: ; 0x1a1df6 2call UnknownScript_0x1a1e27 verbosegiveitem THUNDERSTONE, 1 iffalse UnknownScript_0x1a1e08 - clearbit2 $0082 + clearflag $0082 setevent $0102 2jump UnknownScript_0x1a1e17 ; 0x1a1e08 @@ -261,7 +261,7 @@ SchoolboyChad1Script: ; 0x1a1e3b writecode $17, $1b talkaftercancel loadfont - checkbit2 $0075 + checkflag $0075 iftrue UnknownScript_0x1a1e75 checkcellnum $1b iftrue UnknownScript_0x1a1ef5 @@ -304,14 +304,14 @@ UnknownScript_0x1a1ea0: ; 0x1a1ea0 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 390ed1b15..96bd384fa 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -39,7 +39,7 @@ PokefanmDerek1Script: ; 0x1a5b0b writecode $17, $1c talkaftercancel loadfont - checkbit2 $0083 + checkflag $0083 iftrue UnknownScript_0x1a5b4a checkcellnum $1c iftrue UnknownScript_0x1a5b6e @@ -69,7 +69,7 @@ UnknownScript_0x1a5b4a: ; 0x1a5b4a 2call UnknownScript_0x1a5b7a verbosegiveitem NUGGET, 1 iffalse UnknownScript_0x1a5b59 - clearbit2 $0083 + clearflag $0083 2jump UnknownScript_0x1a5b6e ; 0x1a5b59 diff --git a/maps/Route42.asm b/maps/Route42.asm index 94e28b3ed..511fb4df0 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -55,9 +55,9 @@ 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 @@ -103,7 +103,7 @@ UnknownScript_0x1a92ac: ; 0x1a92ac 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,7 +137,7 @@ UnknownScript_0x1a92dc: ; 0x1a92dc 2call UnknownScript_0x1a930d verbosegiveitem WATER_STONE, 1 iffalse UnknownScript_0x1a92ee - clearbit2 $0084 + clearflag $0084 setevent $0103 2jump UnknownScript_0x1a92fd ; 0x1a92ee diff --git a/maps/Route43.asm b/maps/Route43.asm index a396a52e0..37e19c10f 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -104,7 +104,7 @@ PokemaniacBrent1Script: ; 0x19d095 writecode $17, $1e talkaftercancel loadfont - checkbit2 $0077 + checkflag $0077 iftrue UnknownScript_0x19d0cf checkcellnum $1e iftrue UnknownScript_0x19d138 @@ -150,7 +150,7 @@ UnknownScript_0x19d0fc: ; 0x19d0fc 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,9 +297,9 @@ 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 @@ -347,7 +347,7 @@ UnknownScript_0x19d1ee: ; 0x19d1ee 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,7 +381,7 @@ UnknownScript_0x19d21e: ; 0x19d21e 2call UnknownScript_0x19d255 verbosegiveitem PINK_BOW, 1 iffalse UnknownScript_0x19d230 - clearbit2 $0085 + clearflag $0085 setevent $0104 2jump UnknownScript_0x19d245 ; 0x19d230 diff --git a/maps/Route44.asm b/maps/Route44.asm index 4488db741..c035607ce 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -30,7 +30,7 @@ Bird_keeperVance1Script: ; 0x19d830 writecode $17, $20 talkaftercancel loadfont - checkbit2 $0079 + checkflag $0079 iftrue UnknownScript_0x19d86a checkcellnum $20 iftrue UnknownScript_0x19d8eb @@ -72,7 +72,7 @@ UnknownScript_0x19d88d: ; 0x19d88d 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,7 +89,7 @@ UnknownScript_0x19d8a7: ; 0x19d8a7 loadtrainer BIRD_KEEPER, VANCE3 startbattle returnafterbattle - clearbit2 $0079 + clearflag $0079 checkevent EVENT_VANCE_CARBOS iftrue UnknownScript_0x19d8cb checkevent $0267 @@ -225,9 +225,9 @@ 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 @@ -269,7 +269,7 @@ UnknownScript_0x19d991: ; 0x19d991 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,7 +286,7 @@ UnknownScript_0x19d9ab: ; 0x19d9ab loadtrainer FISHER, WILTON3 startbattle returnafterbattle - clearbit2 $007a + clearflag $007a end ; 0x19d9b4 @@ -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 e9cc61942..664701542 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -226,7 +226,7 @@ HikerParry3Script: ; 0x19e17e writecode $17, $23 talkaftercancel loadfont - checkbit2 $007b + checkflag $007b iftrue UnknownScript_0x19e1b8 checkcellnum $23 iftrue UnknownScript_0x19e127 @@ -268,7 +268,7 @@ UnknownScript_0x19e1db: ; 0x19e1db 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,7 +285,7 @@ UnknownScript_0x19e1f5: ; 0x19e1f5 loadtrainer HIKER, PARRY2 startbattle returnafterbattle - clearbit2 $007b + clearflag $007b checkevent EVENT_PARRY_IRON iftrue UnknownScript_0x19e219 checkevent $0268 diff --git a/maps/Route46.asm b/maps/Route46.asm index 9add0691f..f9b922687 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -59,7 +59,7 @@ PicnickerErin1Script: ; 0x1a96a0 writecode $17, $24 talkaftercancel loadfont - checkbit2 $007c + checkflag $007c iftrue UnknownScript_0x1a96da checkcellnum $24 iftrue UnknownScript_0x1a975b @@ -101,7 +101,7 @@ UnknownScript_0x1a96fd: ; 0x1a96fd 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,7 +118,7 @@ UnknownScript_0x1a9717: ; 0x1a9717 loadtrainer PICNICKER, ERIN3 startbattle returnafterbattle - clearbit2 $007c + clearflag $007c checkevent EVENT_ERIN_CALCIUM iftrue UnknownScript_0x1a973b checkevent $0269 diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index e5ef5ca15..c2d8865f3 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -71,7 +71,7 @@ MapRuinsofAlphAerodactylChamberSignpost2Script: ; 0x58deb UnknownScript_0x58df7: ; 0x58df7 setevent $0705 setevent $02a3 - setbit2 $002d + setflag $002d domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote $0, $0, 15 diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index 5f56c9e34..f4ffeec68 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -72,7 +72,7 @@ MapRuinsofAlphHoOhChamberSignpost2Script: ; 0x585ae UnknownScript_0x585ba: ; 0x585ba setevent $0705 setevent $02a0 - setbit2 $002e + setflag $002e domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote $0, $0, 15 diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index 409779fcb..4dbc95939 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -78,7 +78,7 @@ MapRuinsofAlphKabutoChamberSignpost2Script: ; 0x5876c UnknownScript_0x58778: ; 0x58778 setevent $0705 setevent $02a1 - setbit2 $002b + setflag $002b setevent $074e domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index 3c8de39bf..f0e488dfa 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -72,7 +72,7 @@ MapRuinsofAlphOmanyteChamberSignpost2Script: ; 0x58c2a UnknownScript_0x58c36: ; 0x58c36 setevent $0705 setevent $02a2 - setbit2 $002c + setflag $002c domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote $0, $0, 15 diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index 82bd6de34..cd2c2e0fd 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -23,7 +23,7 @@ UnknownScript_0x5800e: ; 0x5800e ; 0x5800f UnknownScript_0x5800f: ; 0x5800f - checkbit2 $000c + checkflag $000c iftrue UnknownScript_0x5802c checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x5801e diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index a4e54dab5..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,7 +88,7 @@ ScientistScript_0x591e5: ; 0x591e5 loadfont checkcode $e if_equal 26, UnknownScript_0x5920b - checkbit2 $000c + checkflag $000c iftrue UnknownScript_0x59205 checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x591ff diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 4c996e826..8d449f089 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -11,7 +11,7 @@ SaffronCity_MapScriptHeader: ; 0x199321 ; 0x199326 UnknownScript_0x199326: ; 0x199326 - setbit2 $003c + setflag $003c return ; 0x19932a diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 78e3d11bf..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 @@ -27,7 +27,7 @@ SabrinaScript_0x189c2e: ; 0x189c2e 2writetext UnknownText_0x189e95 playsound $009c waitbutton - setbit2 $0028 + setflag $0028 2writetext UnknownText_0x189ead closetext loadmovesprites @@ -175,7 +175,7 @@ SaffronGymGuyScript: ; 0x189cbb ; 0x189ccf MapSaffronGymSignpost0Script: ; 0x189ccf - checkbit2 $0028 + checkflag $0028 iftrue UnknownScript_0x189cd8 jumpstd $002d ; 0x189cd8 diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 9c0adaf69..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 @@ -33,7 +33,7 @@ UnknownScript_0x1ab516: ; 0x1ab516 2writetext UnknownText_0x1ab683 playsound $009c waitbutton - setbit2 $0029 + setflag $0029 2writetext UnknownText_0x1ab69d closetext loadmovesprites 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/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index e287e05cb..ac966f621 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -362,7 +362,7 @@ UnknownScript_0x6d184: ; 0x6d184 applymovement $4, MovementData_0x6d283 disappear $4 setevent EVENT_CLEARED_ROCKET_HIDEOUT - clearbit2 $000e + clearflag $000e setevent $06dc setevent $0757 dotrigger $3 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/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 6cf5adc8f..3be964a41 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 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index fdad83920..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 @@ -26,7 +26,7 @@ SurgeScript_0x1920a5: ; 0x1920a5 2writetext UnknownText_0x192277 playsound $009c waitbutton - setbit2 $0025 + setflag $0025 2writetext UnknownText_0x192291 closetext loadmovesprites @@ -149,7 +149,7 @@ MapVermilionGymSignpost14Script: ; 0x19212f ; 0x192132 MapVermilionGymSignpost16Script: ; 0x192132 - checkbit2 $0025 + checkflag $0025 iftrue UnknownScript_0x19213b jumpstd $002d ; 0x19213b diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 8dc4ea6d9..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 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 09be64713..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 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 408af76b8..41f2d3278 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -23,7 +23,7 @@ FalknerScript_0x683c2: ; 0x683c2 2writetext UnknownText_0x685af playsound $009c waitbutton - setbit2 $001b + setflag $001b checkcode $7 2call UnknownScript_0x68418 UnknownScript_0x683ec: ; 0x683ec @@ -142,7 +142,7 @@ VioletGymGuyScript: ; 0x6844f ; 0x68463 MapVioletGymSignpost1Script: ; 0x68463 - checkbit2 $001b + checkflag $001b iftrue UnknownScript_0x6846c jumpstd $002d ; 0x6846c diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index e06edc535..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 diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 717bfbe18..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 @@ -23,7 +23,7 @@ BlueScript_0x9aa26: ; 0x9aa26 2writetext UnknownText_0x9ac0f playsound $009c waitbutton - setbit2 $002a + setflag $002a 2writetext UnknownText_0x9ac27 closetext loadmovesprites @@ -55,7 +55,7 @@ ViridianGymGuyScript: ; 0x9aa57 ; 0x9aa6b MapViridianGymSignpost1Script: ; 0x9aa6b - checkbit2 $002a + checkflag $002a iftrue UnknownScript_0x9aa74 jumpstd $002d ; 0x9aa74 diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index fbd6286d0..f5a9da725 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -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,7 +283,7 @@ 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 @@ -362,7 +362,7 @@ SuperNerdScript_0x7c20e: ; 0x7c20e ; 0x7c220 UnknownScript_0x7c220: ; 0x7c220 - checkbit2 $005a + checkflag $005a iftrue UnknownScript_0x7c2b5 special $0051 2writetext UnknownText_0x7c75c @@ -375,7 +375,7 @@ 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