diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/scripting.asm | 12 | ||||
| -rw-r--r-- | engine/std_scripts.asm | 22 |
2 files changed, 17 insertions, 17 deletions
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 |