pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

rename bit2 script commands to flag

Browse Source
This commit is contained in:
yenatch
2013-09-24 03:51:42 -04:00
parent 3134b26f7b
commit 73bd376cfd
104 changed files with 376 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine/scripting.asm
View File

@ -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)

22
engine/std_scripts.asm
View File

@ -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

4
maps/AzaleaGym.asm
View File

@ -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

4
maps/AzaleaTown.asm
View File

@ -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

2
maps/BlackthornCity.asm
View File

@ -13,7 +13,7 @@ BlackthornCity_MapScriptHeader: ; 0x1a46d0
; 0x1a46d8
UnknownScript_0x1a46d8: ; 0x1a46d8
setbit2 $004b
setflag $004b
return
; 0x1a46dc

4
maps/BlackthornGym1F.asm
View File

@ -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

4
maps/BluesHouse.asm
View File

@ -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

2
maps/CeladonCity.asm
View File

@ -11,7 +11,7 @@ CeladonCity_MapScriptHeader: ; 0x1a9f3a
; 0x1a9f3f
UnknownScript_0x1a9f3f: ; 0x1a9f3f
setbit2 $003d
setflag $003d
return
; 0x1a9f43

6
maps/CeladonGym.asm
View File

@ -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

2
maps/CeruleanCity.asm
View File

@ -11,7 +11,7 @@ CeruleanCity_MapScriptHeader: ; 0x184000
; 0x184005
UnknownScript_0x184005: ; 0x184005
setbit2 $0038
setflag $0038
return
; 0x184009

6
maps/CeruleanGym.asm
View File

@ -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

8
maps/CherrygroveCity.asm
View File

@ -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

2
maps/CianwoodCity.asm
View File

@ -23,7 +23,7 @@ UnknownScript_0x1a000e: ; 0x1a000e
; 0x1a000f
UnknownScript_0x1a000f: ; 0x1a000f
setbit2 $0045
setflag $0045
setevent $07aa
checkevent $0333
iffalse UnknownScript_0x1a001d

4
maps/CianwoodGym.asm
View File

@ -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

2
maps/CinnabarIsland.asm
View File

@ -11,7 +11,7 @@ CinnabarIsland_MapScriptHeader: ; 0x1ac9a7
; 0x1ac9ac
UnknownScript_0x1ac9ac: ; 0x1ac9ac
setbit2 $003f
setflag $003f
return
; 0x1ac9b0

18
maps/CopycatsHouse2F.asm
View File

@ -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

2
maps/DanceTheatre.asm
View File

@ -172,7 +172,7 @@ GentlemanScript_0x994c6: ; 0x994c6
; 0x994f3
UnknownScript_0x994f3: ; 0x994f3
checkbit2 $0063
checkflag $0063
iftrue UnknownScript_0x994ff
2writetext UnknownText_0x99891
closetext

4
maps/DayCare.asm
View File

@ -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

2
maps/DragonShrine.asm
View File

@ -160,7 +160,7 @@ UnknownScript_0x18d100: ; 0x18d100
loadfont
2writetext UnknownText_0x18d9bf
closetext
setbit2 $0022
setflag $0022
playsound $009c
waitbutton
special $003d

2
maps/EcruteakCity.asm
View File

@ -11,7 +11,7 @@ EcruteakCity_MapScriptHeader: ; 0x1a4000
; 0x1a4005
UnknownScript_0x1a4005: ; 0x1a4005
setbit2 $0048
setflag $0048
return
; 0x1a4009

Some files were not shown because too many files have changed in this diff Show More