ref: 3134b26f7b5e27242eb9f2a4cdc976a250cf0813
parent: 8da8dff7cf00647e9c33e10ceb10908a5411ef2a
author: yenatch <[email protected]>
date: Mon Sep 23 23:48:58 EDT 2013
rename bit1 script commands to event
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -48,9 +48,9 @@
dw Script_giveegg
dw Script_givepokeitem
dw Script_checkpokeitem
- dw Script_checkbit1
- dw Script_clearbit1
- dw Script_setbit1
+ dw Script_checkevent
+ dw Script_clearevent
+ dw Script_setevent
dw Script_checkbit2
dw Script_clearbit2
dw Script_setbit2
@@ -2667,7 +2667,7 @@
ret
; 0x97988
-Script_setbit1: ; 0x97988
+Script_setevent: ; 0x97988
; script command 0x33
; parameters:
; bit_number (MultiByteParam)
@@ -2681,7 +2681,7 @@
ret
; 0x97996
-Script_clearbit1: ; 0x97996
+Script_clearevent: ; 0x97996
; script command 0x32
; parameters:
; bit_number (MultiByteParam)
@@ -2695,7 +2695,7 @@
ret
; 0x979a4
-Script_checkbit1: ; 0x979a4
+Script_checkevent: ; 0x979a4
; script command 0x31
; parameters:
; bit_number (MultiByteParam)
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -72,7 +72,7 @@
.morn
; Different text if we're in the com center
- checkbit1 $032a
+ checkevent $032a
iftrue .morn_comcenter
; Good morning! Welcome to ...
3writetext BANK(UnknownText_0x1b0000), UnknownText_0x1b0000
@@ -86,7 +86,7 @@
.day
; Different text if we're in the com center
- checkbit1 $032a
+ checkevent $032a
iftrue .day_comcenter
; Hello! Welcome to ...
3writetext BANK(UnknownText_0x1b002b), UnknownText_0x1b002b
@@ -100,7 +100,7 @@
.nite
; Different text if we're in the com center
- checkbit1 $032a
+ checkevent $032a
iftrue .nite_comcenter
; Good evening! You're out late. ...
3writetext BANK(UnknownText_0x1b004f), UnknownText_0x1b004f
@@ -114,7 +114,7 @@
.heal
; If we come back, don't welcome us to the com center again
- clearbit1 $032a
+ clearevent $032a
; Ask if you want to heal
3writetext BANK(UnknownText_0x1b017a), UnknownText_0x1b017a
yesorno
@@ -164,7 +164,7 @@
; Different text for com center (excludes 'in a Pokemon Center')
; Since flag $32a is cleared when healing,
; this text is never actually seen
- checkbit1 $032a
+ checkevent $032a
iftrue .pokerus_comcenter
; Your Pokemon appear to be infected ...
3writetext BANK(UnknownText_0x1b0241), UnknownText_0x1b0241
@@ -354,17 +354,17 @@
; bc23e
UnknownScript_0xbc23e: ; 0xbc23e
- clearbit1 $06cd
+ clearevent $06cd
end
; 0xbc242
UnknownScript_0xbc242: ; 0xbc242
setbit2 $0013
- setbit1 $06cf
- setbit1 $06d1
- clearbit1 $06ce
- clearbit1 $0025
- setbit1 $0756
+ setevent $06cf
+ setevent $06d1
+ clearevent $06ce
+ clearevent $0025
+ setevent $0756
specialphonecall $0004
domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1
end
@@ -373,19 +373,19 @@
UnknownScript_0xbc25c: ; 0xbc25c
special $0034
2call UnknownScript_0xbc380
- setbit1 $0747
- clearbit1 $0748
- setbit1 $02d2
+ setevent $0747
+ clearevent $0748
+ setevent $02d2
warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4
applymovement $0, MovementData_0xbcea1
UnknownScript_0xbc274: ; bc274
clearbit2 $0011
- clearbit1 $02d2
- clearbit1 $0313
- clearbit1 $0314
- clearbit1 $0315
- clearbit1 $0316
+ clearevent $02d2
+ clearevent $0313
+ clearevent $0314
+ clearevent $0315
+ clearevent $0316
loadfont
3writetext $6c, $45bf
closetext
@@ -407,7 +407,7 @@
UnknownScript_0xbc2b1: ; 0xbc2b1
3writetext $6c, $465b
keeptextopen
- checkbit1 $0308
+ checkevent $0308
iffalse $42c4
3writetext $6c, $46d9
closetext
@@ -420,26 +420,26 @@
loadmovesprites
dotrigger $0
domaptrigger GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE, $0
- setbit1 $0716
- setbit1 $0717
- setbit1 $0718
- setbit1 $0719
- setbit1 $071a
- setbit1 $071b
- setbit1 $071c
- setbit1 $071d
- setbit1 $071e
- setbit1 $071f
- setbit1 $0720
- setbit1 $0721
- setbit1 $0722
- setbit1 $0723
- setbit1 $0724
- setbit1 $0725
- setbit1 $0726
- setbit1 $0727
- setbit1 $0728
- setbit1 $0729
+ setevent $0716
+ setevent $0717
+ setevent $0718
+ setevent $0719
+ setevent $071a
+ setevent $071b
+ setevent $071c
+ setevent $071d
+ setevent $071e
+ setevent $071f
+ setevent $0720
+ setevent $0721
+ setevent $0722
+ setevent $0723
+ setevent $0724
+ setevent $0725
+ setevent $0726
+ setevent $0727
+ setevent $0728
+ setevent $0729
setbit2 $0051
special $003c
end
@@ -446,7 +446,7 @@
; 0xbc31e
UnknownScript_0xbc31e: ; 0xbc31e
- setbit1 $0000
+ setevent $0000
itemtotext SUN_STONE, $1
3writetext $6c, $4621
closetext
@@ -476,7 +476,7 @@
UnknownScript_0xbc354: ; 0xbc354
3writetext $6c, $48cc
keeptextopen
- setbit1 $0313
+ setevent $0313
2jump UnknownScript_0xbc2b1
; 0xbc35f
@@ -483,7 +483,7 @@
UnknownScript_0xbc35f: ; 0xbc35f
3writetext $6c, $48cc
keeptextopen
- setbit1 $0314
+ setevent $0314
2jump UnknownScript_0xbc2b1
; 0xbc36a
@@ -490,7 +490,7 @@
UnknownScript_0xbc36a: ; 0xbc36a
3writetext $6c, $48cc
keeptextopen
- setbit1 $0315
+ setevent $0315
2jump UnknownScript_0xbc2b1
; 0xbc375
@@ -497,168 +497,168 @@
UnknownScript_0xbc375: ; 0xbc375
3writetext $6c, $48cc
keeptextopen
- setbit1 $0316
+ setevent $0316
2jump $42a9
; 0xbc380
UnknownScript_0xbc380: ; 0xbc380
- checkbit1 $0716
+ checkevent $0716
iftrue .skip1
- clearbit1 $0720
+ clearevent $0720
.skip1
- checkbit1 $0717
+ checkevent $0717
iftrue .skip2
- clearbit1 $0721
+ clearevent $0721
.skip2
- checkbit1 $0718
+ checkevent $0718
iftrue .skip3
- clearbit1 $0722
+ clearevent $0722
.skip3
- checkbit1 $0719
+ checkevent $0719
iftrue .skip4
- clearbit1 $0723
+ clearevent $0723
.skip4
- checkbit1 $071a
+ checkevent $071a
iftrue .skip5
- clearbit1 $0724
+ clearevent $0724
.skip5
- checkbit1 $071b
+ checkevent $071b
iftrue .skip6
- clearbit1 $0725
+ clearevent $0725
.skip6
- checkbit1 $071c
+ checkevent $071c
iftrue .skip7
- clearbit1 $0726
+ clearevent $0726
.skip7
- checkbit1 $071d
+ checkevent $071d
iftrue .skip8
- clearbit1 $0727
+ clearevent $0727
.skip8
- checkbit1 $071e
+ checkevent $071e
iftrue .skip9
- clearbit1 $0728
+ clearevent $0728
.skip9
- checkbit1 $071f
+ checkevent $071f
iftrue .skip10
- clearbit1 $0729
+ clearevent $0729
.skip10
end
; 0xbc3db
UnknownScript_0xbc3db: ; 0xbc3db
- setbit1 $06cb
- setbit1 $06ce
- setbit1 $06cd
- setbit1 $06d0
- setbit1 $06f3
- setbit1 $06e9
- setbit1 $06f4
- setbit1 $06d5
- setbit1 $06de
- setbit1 $06dd
- setbit1 $06df
- setbit1 $06c0
- setbit1 $06e4
- setbit1 $0025
- setbit1 $06be
- setbit1 $06bf
- setbit1 $06c1
- setbit1 $06f9
- setbit1 $06fd
- setbit1 $06ff
- setbit1 $0700
- setbit1 $0702
- setbit1 $0703
- setbit1 $0704
- setbit1 $070d
- setbit1 $070e
- setbit1 $070f
- setbit1 $0710
- setbit1 $0715
- setbit1 $0716
- setbit1 $0717
- setbit1 $0718
- setbit1 $0719
- setbit1 $071a
- setbit1 $071b
- setbit1 $071c
- setbit1 $071d
- setbit1 $071e
- setbit1 $071f
- setbit1 $0720
- setbit1 $0721
- setbit1 $0722
- setbit1 $0723
- setbit1 $0724
- setbit1 $0725
- setbit1 $0726
- setbit1 $0727
- setbit1 $0728
- setbit1 $0729
- setbit1 $072c
- setbit1 $072f
- setbit1 $072d
- setbit1 $0735
- setbit1 $0736
- setbit1 $073c
- setbit1 $073d
- setbit1 $0741
- setbit1 $0742
- setbit1 $0743
- setbit1 $0744
- setbit1 $02a4
- setbit1 $02af
- setbit1 $0749
- setbit1 $06d3
- setbit1 $074d
- setbit1 $0712
- setbit1 $0713
- setbit1 $0711
- setbit1 $06d4
- setbit1 $0304
- setbit1 $0307
- setbit1 $06d8
- setbit1 $06c3
- setbit1 $06c2
- setbit1 $06c6
- setbit1 $075f
- setbit1 $0731
- setbit1 $074a
- setbit1 $0762
- setbit1 $0738
- setbit1 $073a
- setbit1 $073b
- setbit1 $0733
- setbit1 $073f
- setbit1 $078d
- setbit1 $0766
- setbit1 $0768
- setbit1 $0769
- setbit1 $076a
- setbit1 $078e
- setbit1 $078f
- setbit1 $0790
- setbit1 $0791
- setbit1 $0793
- setbit1 $07a4
- setbit1 $07a4
- setbit1 $07a5
- setbit1 $06ec
- setbit1 $06ed
- setbit1 $06f0
- setbit1 $07a9
- setbit1 $07aa
- setbit1 $06c8
- setbit1 $07ac
- setbit1 $07ad
- setbit1 $07b5
- setbit1 $07b6
- setbit1 $07c5
- setbit1 $07b7
- setbit1 $07b0
- setbit1 $07af
- setbit1 $07ae
- setbit1 $07cf
+ setevent $06cb
+ setevent $06ce
+ setevent $06cd
+ setevent $06d0
+ setevent $06f3
+ setevent $06e9
+ setevent $06f4
+ setevent $06d5
+ setevent $06de
+ setevent $06dd
+ setevent $06df
+ setevent $06c0
+ setevent $06e4
+ setevent $0025
+ setevent $06be
+ setevent $06bf
+ setevent $06c1
+ setevent $06f9
+ setevent $06fd
+ setevent $06ff
+ setevent $0700
+ setevent $0702
+ setevent $0703
+ setevent $0704
+ setevent $070d
+ setevent $070e
+ setevent $070f
+ setevent $0710
+ setevent $0715
+ setevent $0716
+ setevent $0717
+ setevent $0718
+ setevent $0719
+ setevent $071a
+ setevent $071b
+ setevent $071c
+ setevent $071d
+ setevent $071e
+ setevent $071f
+ setevent $0720
+ setevent $0721
+ setevent $0722
+ setevent $0723
+ setevent $0724
+ setevent $0725
+ setevent $0726
+ setevent $0727
+ setevent $0728
+ setevent $0729
+ setevent $072c
+ setevent $072f
+ setevent $072d
+ setevent $0735
+ setevent $0736
+ setevent $073c
+ setevent $073d
+ setevent $0741
+ setevent $0742
+ setevent $0743
+ setevent $0744
+ setevent $02a4
+ setevent $02af
+ setevent $0749
+ setevent $06d3
+ setevent $074d
+ setevent $0712
+ setevent $0713
+ setevent $0711
+ setevent $06d4
+ setevent $0304
+ setevent $0307
+ setevent $06d8
+ setevent $06c3
+ setevent $06c2
+ setevent $06c6
+ setevent $075f
+ setevent $0731
+ setevent $074a
+ setevent $0762
+ setevent $0738
+ setevent $073a
+ setevent $073b
+ setevent $0733
+ setevent $073f
+ setevent $078d
+ setevent $0766
+ setevent $0768
+ setevent $0769
+ setevent $076a
+ setevent $078e
+ setevent $078f
+ setevent $0790
+ setevent $0791
+ setevent $0793
+ setevent $07a4
+ setevent $07a4
+ setevent $07a5
+ setevent $06ec
+ setevent $06ed
+ setevent $06f0
+ setevent $07a9
+ setevent $07aa
+ setevent $06c8
+ setevent $07ac
+ setevent $07ad
+ setevent $07b5
+ setevent $07b6
+ setevent $07c5
+ setevent $07b7
+ setevent $07b0
+ setevent $07af
+ setevent $07ae
+ setevent $07cf
setbit2 $000e
setbit2 $0017
variablesprite $4, $52
@@ -670,18 +670,18 @@
variablesprite $a, $a
variablesprite $b, $28
variablesprite $c, $28
- setbit1 $00fb
- setbit1 $076d
- setbit1 $076c
- setbit1 $076e
- setbit1 $076f
- setbit1 $0773
- setbit1 $0776
- setbit1 $0777
- setbit1 $0779
- setbit1 $0772
- setbit1 $077b
- setbit1 $0036
+ setevent $00fb
+ setevent $076d
+ setevent $076c
+ setevent $076e
+ setevent $076f
+ setevent $0773
+ setevent $0776
+ setevent $0777
+ setevent $0779
+ setevent $0772
+ setevent $077b
+ setevent $0036
return
; 0xbc574
@@ -2332,18 +2332,18 @@
end
MomPhoneScript: ; 0xbceaa
- checkbit1 $0040
+ checkevent $0040
iftrue .bcec5
- checkbit1 $0041 ; if dude talked to you, then you left home without talking to mom
+ checkevent $0041 ; if dude talked to you, then you left home without talking to mom
iftrue MomPhoneLectureScript
- checkbit1 $001f
+ checkevent $001f
iftrue MomPhoneNoGymQuestScript
- checkbit1 $001a
+ checkevent $001a
iftrue MomPhoneNoPokedexScript
2jump MomPhoneNoPokemonScript
.bcec5 ; 0xbcec5
- checkbit1 $0007
+ checkevent $0007
iftrue MomPhoneHangUpScript
3writetext BANK(MomPhoneGreetingText), MomPhoneGreetingText
keeptextopen
@@ -2464,7 +2464,7 @@
end
MomPhoneLectureScript: ; 0xbcfb1
- setbit1 $0040
+ setevent $0040
setbit2 $0009
specialphonecall $0000
3writetext BANK(MomPhoneLectureText), MomPhoneLectureText
@@ -2517,22 +2517,22 @@
ElmPhoneScript1: ; 0xbd00d
checkcode $14
if_equal $1, .pokerus
- checkbit1 $0055
+ checkevent $0055
iftrue .discovery
- checkbit1 $002d
+ checkevent $002d
iffalse .next
- checkbit1 $0054
+ checkevent $0054
iftrue .egghatched
.next
- checkbit1 $002d
+ checkevent $002d
iftrue .eggunhatched
- checkbit1 $0701
+ checkevent $0701
iftrue .assistant
- checkbit1 $001f
+ checkevent $001f
iftrue .checkingegg
- checkbit1 $0043
+ checkevent $0043
iftrue .stolen
- checkbit1 $001e
+ checkevent $001e
iftrue .sawmrpokemon
3writetext BANK(ElmPhoneStartText), ElmPhoneStartText
end
@@ -2559,7 +2559,7 @@
.egghatched ; 0xbd061
3writetext BANK(ElmPhoneEggHatchedText), ElmPhoneEggHatchedText
- setbit1 $0077
+ setevent $0077
end
.discovery ; 0xbd069
@@ -2591,14 +2591,14 @@
.disaster ; 0xbd09f
3writetext BANK(ElmPhoneDisasterText), ElmPhoneDisasterText
specialphonecall $0000
- setbit1 $0043
+ setevent $0043
end
.assistant ; 0xbd0aa
3writetext BANK(ElmPhoneEggAssistantText), ElmPhoneEggAssistantText
specialphonecall $0000
- clearbit1 $0700
- setbit1 $0701
+ clearevent $0700
+ setevent $0701
end
.rocket ; 0xbd0b8
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -9,7 +9,7 @@
BugsyScript_0x18ec1e: ; 0x18ec1e
faceplayer
loadfont
- checkbit1 EVENT_BEAT_BUGSY
+ checkevent EVENT_BEAT_BUGSY
iftrue UnknownScript_0x18ec48
2writetext UnknownText_0x18ed0b
closetext
@@ -18,7 +18,7 @@
loadtrainer BUGSY, 1
startbattle
returnafterbattle
- setbit1 EVENT_BEAT_BUGSY
+ setevent EVENT_BEAT_BUGSY
loadfont
2writetext UnknownText_0x18ee14
playsound $009c
@@ -27,17 +27,17 @@
checkcode $7
2call UnknownScript_0x18ec73
UnknownScript_0x18ec48: ; 0x18ec48
- checkbit1 EVENT_GOT_TM49_FURY_CUTTER
+ checkevent EVENT_GOT_TM49_FURY_CUTTER
iftrue UnknownScript_0x18ec6d
- setbit1 EVENT_BEAT_TWINS_AMY_AND_MAY
- setbit1 EVENT_BEAT_BUG_CATCHER_BENNY
- setbit1 EVENT_BEAT_BUG_CATCHER_AL
- setbit1 EVENT_BEAT_BUG_CATCHER_JOSH
+ setevent EVENT_BEAT_TWINS_AMY_AND_MAY
+ setevent EVENT_BEAT_BUG_CATCHER_BENNY
+ setevent EVENT_BEAT_BUG_CATCHER_AL
+ setevent EVENT_BEAT_BUG_CATCHER_JOSH
2writetext UnknownText_0x18ee2b
keeptextopen
verbosegiveitem TM_49, 1
iffalse UnknownScript_0x18ec71
- setbit1 EVENT_GOT_TM49_FURY_CUTTER
+ setevent EVENT_GOT_TM49_FURY_CUTTER
2writetext UnknownText_0x18eefa
closetext
loadmovesprites
@@ -213,7 +213,7 @@
AzaleaGymGuyScript: ; 0x18ece6
faceplayer
- checkbit1 EVENT_BEAT_BUGSY
+ checkevent EVENT_BEAT_BUGSY
iftrue .AzaleaGymGuyWinScript
loadfont
2writetext AzaleaGymGuyText
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -58,10 +58,10 @@
2writetext UnknownText_0x19814d
closetext
loadmovesprites
- setbit1 $06bf
- checkbit1 EVENT_GOT_TOTODILE_FROM_ELM
+ setevent $06bf
+ checkevent EVENT_GOT_TOTODILE_FROM_ELM
iftrue UnknownScript_0x198071
- checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM
+ checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue UnknownScript_0x198081
winlosstext UnknownText_0x1981e6, UnknownText_0x19835b
setlasttalked $b
@@ -119,7 +119,7 @@
GrampsScript_0x1980b1: ; 0x1980b1
faceplayer
loadfont
- checkbit1 EVENT_CLEARED_SLOWPOKE_WELL
+ checkevent EVENT_CLEARED_SLOWPOKE_WELL
iftrue UnknownScript_0x1980bf
2writetext UnknownText_0x19841b
closetext
@@ -176,8 +176,8 @@
verbosegiveitem GS_BALL, 1
spriteface $d, $2
setbit2 $0064
- clearbit1 $06ed
- setbit1 $06eb
+ clearevent $06ed
+ setevent $06eb
dotrigger $0
loadmovesprites
end
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -17,7 +17,7 @@
; 0x9f85b
UnknownScript_0x9f85b: ; 0x9f85b
- clearbit1 $07cf
+ clearevent $07cf
return
; 0x9f85f
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -9,25 +9,25 @@
GrampsScript_0x189538: ; 0x189538
faceplayer
loadfont
- checkbit1 $0000
+ checkevent $0000
iftrue UnknownScript_0x1896ba
- checkbit1 EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
+ checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x1896c0
- checkbit1 EVENT_MET_BILLS_GRANDPA
+ checkevent EVENT_MET_BILLS_GRANDPA
iftrue UnknownScript_0x189553
2writetext UnknownText_0x1896ce
keeptextopen
- setbit1 EVENT_MET_BILLS_GRANDPA
+ setevent EVENT_MET_BILLS_GRANDPA
UnknownScript_0x189553: ; 0x189553
- checkbit1 EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
+ checkevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
iftrue UnknownScript_0x189697
- checkbit1 EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
+ checkevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
iftrue UnknownScript_0x189680
- checkbit1 EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
+ checkevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
iftrue UnknownScript_0x189669
- checkbit1 EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
+ checkevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
iftrue UnknownScript_0x189652
- checkbit1 EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
+ checkevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
iftrue UnknownScript_0x18963b
2writetext UnknownText_0x1898c0
keeptextopen
@@ -39,7 +39,7 @@
iffalse UnknownScript_0x1896aa
if_not_equal LICKITUNG, UnknownScript_0x1896c6
2call UnknownScript_0x1896b0
- setbit1 EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
+ setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
2jump UnknownScript_0x18963b
; 0x189592
@@ -54,7 +54,7 @@
iffalse UnknownScript_0x1896aa
if_not_equal ODDISH, UnknownScript_0x1896c6
2call UnknownScript_0x1896b0
- setbit1 EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
+ setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
2jump UnknownScript_0x189652
; 0x1895b3
@@ -69,7 +69,7 @@
iffalse UnknownScript_0x1896aa
if_not_equal STARYU, UnknownScript_0x1896c6
2call UnknownScript_0x1896b0
- setbit1 EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
+ setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
2jump UnknownScript_0x189669
; 0x1895d4
@@ -86,7 +86,7 @@
iffalse UnknownScript_0x1896aa
if_not_equal GROWLITHE, UnknownScript_0x1896c6
2call UnknownScript_0x1896b0
- setbit1 EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
+ setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
2jump UnknownScript_0x189680
; 0x1895f9
@@ -101,7 +101,7 @@
iffalse UnknownScript_0x1896aa
if_not_equal VULPIX, UnknownScript_0x1896c6
2call UnknownScript_0x1896b0
- setbit1 EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
+ setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
2jump UnknownScript_0x189680
; 0x18961a
@@ -116,54 +116,54 @@
iffalse UnknownScript_0x1896aa
if_not_equal PICHU, UnknownScript_0x1896c6
2call UnknownScript_0x1896b0
- setbit1 EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
+ setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
2jump UnknownScript_0x189697
; 0x18963b
UnknownScript_0x18963b: ; 0x18963b
- checkbit1 EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
+ checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x189592
2call UnknownScript_0x1896b5
verbosegiveitem EVERSTONE, 1
iffalse UnknownScript_0x1896cc
- setbit1 EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
- setbit1 $0000
+ setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
+ setevent $0000
loadmovesprites
end
; 0x189652
UnknownScript_0x189652: ; 0x189652
- checkbit1 EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
+ checkevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x1895b3
2call UnknownScript_0x1896b5
verbosegiveitem LEAF_STONE, 1
iffalse UnknownScript_0x1896cc
- setbit1 EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
- setbit1 $0000
+ setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
+ setevent $0000
loadmovesprites
end
; 0x189669
UnknownScript_0x189669: ; 0x189669
- checkbit1 EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
+ checkevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x1895d4
2call UnknownScript_0x1896b5
verbosegiveitem WATER_STONE, 1
iffalse UnknownScript_0x1896cc
- setbit1 EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
- setbit1 $0000
+ setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
+ setevent $0000
loadmovesprites
end
; 0x189680
UnknownScript_0x189680: ; 0x189680
- checkbit1 EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
+ checkevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x18961a
2call UnknownScript_0x1896b5
verbosegiveitem FIRE_STONE, 1
iffalse UnknownScript_0x1896cc
- setbit1 EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
- setbit1 $0000
+ setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
+ setevent $0000
loadmovesprites
end
; 0x189697
@@ -172,7 +172,7 @@
2call UnknownScript_0x1896b5
verbosegiveitem THUNDERSTONE, 1
iffalse UnknownScript_0x1896cc
- setbit1 EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
+ setevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
loadmovesprites
end
; 0x1896a5
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -32,9 +32,9 @@
SuperNerdScript_0x1a46e8: ; 0x1a46e8
faceplayer
loadfont
- checkbit1 EVENT_BEAT_CLAIR
+ checkevent EVENT_BEAT_CLAIR
iftrue UnknownScript_0x1a4702
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1a46fc
2writetext UnknownText_0x1a477a
closetext
@@ -67,7 +67,7 @@
BlackBeltScript_0x1a470e: ; 0x1a470e
faceplayer
loadfont
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1a471c
2writetext UnknownText_0x1a494a
closetext
@@ -97,21 +97,21 @@
YoungsterScript_0x1a472b: ; 0x1a472b
faceplayer
loadfont
- checkbit1 EVENT_GOT_SPELL_TAG_FROM_SANTOS
+ checkevent EVENT_GOT_SPELL_TAG_FROM_SANTOS
iftrue UnknownScript_0x1a4759
checkcode $b
if_not_equal SATURDAY, UnknownScript_0x1a475f
- checkbit1 EVENT_MET_SANTOS_OF_SATURDAY
+ checkevent EVENT_MET_SANTOS_OF_SATURDAY
iftrue UnknownScript_0x1a4746
2writetext UnknownText_0x1a4a27
keeptextopen
- setbit1 EVENT_MET_SANTOS_OF_SATURDAY
+ setevent EVENT_MET_SANTOS_OF_SATURDAY
UnknownScript_0x1a4746: ; 0x1a4746
2writetext UnknownText_0x1a4a57
keeptextopen
verbosegiveitem SPELL_TAG, 1
iffalse UnknownScript_0x1a475d
- setbit1 EVENT_GOT_SPELL_TAG_FROM_SANTOS
+ setevent EVENT_GOT_SPELL_TAG_FROM_SANTOS
2writetext UnknownText_0x1a4a6b
closetext
loadmovesprites
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -11,15 +11,15 @@
; 0x194e05
UnknownScript_0x194e05: ; 0x194e05
- checkbit1 $0706
+ checkevent $0706
iffalse UnknownScript_0x194e0f
changeblock $8, $2, $3b
UnknownScript_0x194e0f: ; 0x194e0f
- checkbit1 $0707
+ checkevent $0707
iffalse UnknownScript_0x194e19
changeblock $2, $4, $3a
UnknownScript_0x194e19: ; 0x194e19
- checkbit1 $0708
+ checkevent $0708
iffalse UnknownScript_0x194e23
changeblock $8, $6, $3b
UnknownScript_0x194e23: ; 0x194e23
@@ -31,7 +31,7 @@
loadfont
checkbit2 $0022
iftrue UnknownScript_0x194e69
- checkbit1 EVENT_BEAT_CLAIR
+ checkevent EVENT_BEAT_CLAIR
iftrue UnknownScript_0x194e63
2writetext UnknownText_0x194efa
closetext
@@ -40,19 +40,19 @@
loadtrainer CLAIR, 1
startbattle
returnafterbattle
- setbit1 EVENT_BEAT_CLAIR
+ setevent EVENT_BEAT_CLAIR
loadfont
2writetext UnknownText_0x19500e
closetext
loadmovesprites
- setbit1 EVENT_BEAT_COOLTRAINERM_PAUL
- setbit1 EVENT_BEAT_COOLTRAINERM_CODY
- setbit1 EVENT_BEAT_COOLTRAINERM_MIKE
- setbit1 EVENT_BEAT_COOLTRAINERF_FRAN
- setbit1 EVENT_BEAT_COOLTRAINERF_LOLA
- clearbit1 $0736
- setbit1 $074c
- clearbit1 $074d
+ setevent EVENT_BEAT_COOLTRAINERM_PAUL
+ setevent EVENT_BEAT_COOLTRAINERM_CODY
+ setevent EVENT_BEAT_COOLTRAINERM_MIKE
+ setevent EVENT_BEAT_COOLTRAINERF_FRAN
+ setevent EVENT_BEAT_COOLTRAINERF_LOLA
+ clearevent $0736
+ setevent $074c
+ clearevent $074d
end
; 0x194e63
@@ -64,7 +64,7 @@
; 0x194e69
UnknownScript_0x194e69: ; 0x194e69
- checkbit1 EVENT_GOT_TM24_DRAGONBREATH
+ checkevent EVENT_GOT_TM24_DRAGONBREATH
iftrue UnknownScript_0x194e94
2writetext UnknownText_0x195196
keeptextopen
@@ -75,7 +75,7 @@
playsound $0001
waitbutton
itemnotify
- setbit1 EVENT_GOT_TM24_DRAGONBREATH
+ setevent EVENT_GOT_TM24_DRAGONBREATH
2writetext UnknownText_0x1951d1
keeptextopen
2jump UnknownScript_0x194e94
@@ -185,7 +185,7 @@
BlackthornGymGuyScript: ; 0x194ed6
faceplayer
loadfont
- checkbit1 EVENT_BEAT_CLAIR
+ checkevent EVENT_BEAT_CLAIR
iftrue .BlackthornGymGuyWinScript
2writetext BlackthornGymGuyText
closetext
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -24,11 +24,11 @@
; 0x180998
UnknownScript_0x180998: ; 0x180998
- checkbit1 EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
+ checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
iffalse UnknownScript_0x1809a2
changeblock $4, $e, $2a
UnknownScript_0x1809a2: ; 0x1809a2
- checkbit1 EVENT_BRUNOS_ROOM_EXIT_OPEN
+ checkevent EVENT_BRUNOS_ROOM_EXIT_OPEN
iffalse UnknownScript_0x1809ac
changeblock $4, $2, $16
UnknownScript_0x1809ac: ; 0x1809ac
@@ -44,7 +44,7 @@
reloadmappart
loadmovesprites
dotrigger $1
- setbit1 EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
+ setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
waitbutton
end
; 0x1809c5
@@ -52,7 +52,7 @@
BrunoScript_0x1809c5: ; 0x1809c5
faceplayer
loadfont
- checkbit1 $05ba
+ checkevent $05ba
iftrue UnknownScript_0x1809f3
2writetext UnknownText_0x1809fe
closetext
@@ -61,7 +61,7 @@
loadtrainer BRUNO, 1
startbattle
returnafterbattle
- setbit1 $05ba
+ setevent $05ba
loadfont
2writetext UnknownText_0x180b3c
closetext
@@ -70,7 +70,7 @@
changeblock $4, $2, $16
reloadmappart
loadmovesprites
- setbit1 EVENT_BRUNOS_ROOM_EXIT_OPEN
+ setevent EVENT_BRUNOS_ROOM_EXIT_OPEN
waitbutton
end
; 0x1809f3
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -29,11 +29,11 @@
; 0x185bf8
UnknownScript_0x185bf8: ; 0x185bf8
- checkbit1 $0332
+ checkevent $0332
iftrue UnknownScript_0x185c02
changeblock $a, $8, $32
UnknownScript_0x185c02: ; 0x185c02
- checkbit1 EVENT_RELEASED_THE_BEASTS
+ checkevent EVENT_RELEASED_THE_BEASTS
iftrue UnknownScript_0x185c0c
changeblock $6, $e, $9
UnknownScript_0x185c0c: ; 0x185c0c
@@ -66,9 +66,9 @@
2writetext UnknownText_0x185cd9
closetext
loadmovesprites
- checkbit1 EVENT_GOT_TOTODILE_FROM_ELM
+ checkevent EVENT_GOT_TOTODILE_FROM_ELM
iftrue UnknownScript_0x185c60
- checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM
+ checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue UnknownScript_0x185c70
winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c
setlasttalked $4
@@ -106,7 +106,7 @@
closetext
loadmovesprites
dotrigger $2
- setbit1 $06c5
+ setevent $06c5
special $006a
pause 15
earthquake 50
@@ -123,7 +123,7 @@
2writetext UnknownText_0x185e75
closetext
loadmovesprites
- setbit1 $0332
+ setevent $0332
pause 15
warpcheck
end
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -23,7 +23,7 @@
; 0x186160
UnknownScript_0x186160: ; 0x186160
- checkbit1 EVENT_RELEASED_THE_BEASTS
+ checkevent EVENT_RELEASED_THE_BEASTS
iftrue UnknownScript_0x18616a
changeblock $6, $e, $2
UnknownScript_0x18616a: ; 0x18616a
@@ -80,15 +80,15 @@
waitbutton
special $003d
dotrigger $1
- setbit1 EVENT_RELEASED_THE_BEASTS
+ setevent EVENT_RELEASED_THE_BEASTS
special $0069
domaptrigger GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM, $1
domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $1
- clearbit1 EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
- setbit1 $07a8
- clearbit1 $07a9
- setbit1 $0764
- setbit1 $0765
+ clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
+ setevent $07a8
+ clearevent $07a9
+ setevent $0764
+ setevent $0765
appear $a
refreshscreen $0
changeblock $6, $e, $1b
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -92,7 +92,7 @@
; 0x730b0
MapCeladonCafeSignpost1Script: ; 0x730b0
- checkbit1 EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE
+ checkevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE
iftrue UnknownScript_0x730db
giveitem LEFTOVERS, $1
iffalse UnknownScript_0x730cd
@@ -103,7 +103,7 @@
waitbutton
itemnotify
loadmovesprites
- setbit1 EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE
+ setevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE
end
; 0x730cd
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -47,7 +47,7 @@
FisherScript_0x72144: ; 0x72144
faceplayer
loadfont
- checkbit1 EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON
+ checkevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON
iftrue .UnknownScript_0x72169
2writetext UnknownText_0x722dc
keeptextopen
@@ -58,7 +58,7 @@
stringtotext .coinname, $1
2call .UnknownScript_0x72172
givecoins 18
- setbit1 EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON
+ setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON
.UnknownScript_0x72169 ; 0x72169
2writetext UnknownText_0x72345
closetext
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -18,11 +18,11 @@
loadtrainer ERIKA, 1
startbattle
returnafterbattle
- setbit1 $04c8
- setbit1 EVENT_BEAT_LASS_MICHELLE
- setbit1 EVENT_BEAT_PICNICKER_TANYA
- setbit1 EVENT_BEAT_BEAUTY_JULIA
- setbit1 EVENT_BEAT_TWINS_JO_AND_ZOE
+ setevent $04c8
+ setevent EVENT_BEAT_LASS_MICHELLE
+ setevent EVENT_BEAT_PICNICKER_TANYA
+ setevent EVENT_BEAT_BEAUTY_JULIA
+ setevent EVENT_BEAT_TWINS_JO_AND_ZOE
loadfont
2writetext UnknownText_0x72c96
playsound $009c
@@ -29,13 +29,13 @@
waitbutton
setbit2 $0026
UnknownScript_0x72a9b: ; 0x72a9b
- checkbit1 EVENT_GOT_TM19_GIGA_DRAIN
+ checkevent EVENT_GOT_TM19_GIGA_DRAIN
iftrue UnknownScript_0x72aae
2writetext UnknownText_0x72cb0
keeptextopen
verbosegiveitem TM_19, 1
iffalse UnknownScript_0x72aae
- setbit1 EVENT_GOT_TM19_GIGA_DRAIN
+ setevent EVENT_GOT_TM19_GIGA_DRAIN
UnknownScript_0x72aae: ; 0x72aae
2writetext UnknownText_0x72d8f
closetext
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -28,7 +28,7 @@
2writetext UnknownText_0x71763
closetext
loadmovesprites
- setbit1 EVENT_ENABLE_DIPLOMA_PRINTING
+ setevent EVENT_ENABLE_DIPLOMA_PRINTING
end
; 0x71696
@@ -35,7 +35,7 @@
GymGuyScript_0x71696: ; 0x71696
faceplayer
loadfont
- checkbit1 EVENT_ENABLE_DIPLOMA_PRINTING
+ checkevent EVENT_ENABLE_DIPLOMA_PRINTING
iftrue UnknownScript_0x716a4
2writetext UnknownText_0x717b4
closetext
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -9,7 +9,7 @@
PharmacistScript_0x71afd: ; 0x71afd
faceplayer
loadfont
- checkbit1 EVENT_GOT_TM03_CURSE
+ checkevent EVENT_GOT_TM03_CURSE
iftrue UnknownScript_0x71b21
2writetext UnknownText_0x71b27
keeptextopen
@@ -26,7 +26,7 @@
keeptextopen
verbosegiveitem TM_03, 1
iffalse UnknownScript_0x71b25
- setbit1 EVENT_GOT_TM03_CURSE
+ setevent EVENT_GOT_TM03_CURSE
UnknownScript_0x71b21: ; 0x71b21
2writetext UnknownText_0x71db3
closetext
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -18,7 +18,7 @@
CooltrainerMScript_0x184009: ; 0x184009
faceplayer
loadfont
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x184017
2writetext UnknownText_0x1840bc
closetext
@@ -72,9 +72,9 @@
FisherScript_0x18404a: ; 0x18404a
faceplayer
loadfont
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x184058
- checkbit1 EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
+ checkevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
iftrue UnknownScript_0x18405e
UnknownScript_0x184058: ; 0x184058
2writetext UnknownText_0x18424e
@@ -96,7 +96,7 @@
2writetext UnknownText_0x1842a9
closetext
loadmovesprites
- checkbit1 $00fa
+ checkevent $00fa
iffalse UnknownScript_0x184072
end
; 0x184072
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -42,9 +42,9 @@
applymovement $2, MovementData_0x1884e8
playsound $0023
disappear $2
- setbit1 EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
- clearbit1 $076c
- clearbit1 $076e
+ setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
+ clearevent $076c
+ clearevent $076e
dotrigger $0
domaptrigger GROUP_ROUTE_25, MAP_ROUTE_25, $1
domaptrigger GROUP_POWER_PLANT, MAP_POWER_PLANT, $0
@@ -68,10 +68,10 @@
loadtrainer MISTY, 1
startbattle
returnafterbattle
- setbit1 EVENT_BEAT_MISTY
- setbit1 EVENT_BEAT_SWIMMERF_DIANA
- setbit1 EVENT_BEAT_SWIMMERF_BRIANA
- setbit1 EVENT_BEAT_SWIMMERM_PARKER
+ setevent EVENT_BEAT_MISTY
+ setevent EVENT_BEAT_SWIMMERF_DIANA
+ setevent EVENT_BEAT_SWIMMERF_BRIANA
+ setevent EVENT_BEAT_SWIMMERM_PARKER
loadfont
2writetext UnknownText_0x188768
playsound $009c
@@ -174,7 +174,7 @@
CeruleanGymGuyScript: ; 0x1884a2
faceplayer
loadfont
- checkbit1 EVENT_BEAT_MISTY
+ checkevent EVENT_BEAT_MISTY
iftrue .CeruleanGymGuyWinScript
2writetext CeruleanGymGuyText
closetext
@@ -195,7 +195,7 @@
; 0x1884b9
MapCeruleanGymSignpost1Script: ; 0x1884b9
- checkbit1 $076f
+ checkevent $076f
iffalse UnknownScript_0x1884d3
loadfont
2writetext UnknownText_0x188610
@@ -205,7 +205,7 @@
; 0x1884c6
MapCeruleanGymSignpost2Script: ; 0x1884c6
- checkbit1 $076f
+ checkevent $076f
iffalse UnknownScript_0x1884d3
loadfont
2writetext UnknownText_0x188642
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -9,9 +9,9 @@
BlackBeltScript_0x18dd1a: ; 0x18dd1a
faceplayer
loadfont
- checkbit1 EVENT_GOT_HM01_CUT
+ checkevent EVENT_GOT_HM01_CUT
iftrue UnknownScript_0x18dd34
- checkbit1 EVENT_CLEARED_SLOWPOKE_WELL
+ checkevent EVENT_CLEARED_SLOWPOKE_WELL
iftrue UnknownScript_0x18dd2e
2writetext UnknownText_0x18dd74
closetext
@@ -36,9 +36,9 @@
YoungsterScript_0x18dd3a: ; 0x18dd3a
faceplayer
loadfont
- checkbit1 EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN
+ checkevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN
iftrue UnknownScript_0x18dd5d
- checkbit1 EVENT_GOT_HM01_CUT
+ checkevent EVENT_GOT_HM01_CUT
iftrue UnknownScript_0x18dd4e
2writetext UnknownText_0x18dee0
closetext
@@ -51,7 +51,7 @@
keeptextopen
verbosegiveitem CHARCOAL, 1
iffalse UnknownScript_0x18dd61
- setbit1 EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN
+ setevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN
loadmovesprites
end
; 0x18dd5d
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -87,7 +87,7 @@
applymovement $2, MovementData_0x19c1cb
playsound $001f
disappear $2
- clearbit1 EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
+ clearevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
waitbutton
end
@@ -123,9 +123,9 @@
2writetext UnknownText_0x19c4e2
closetext
loadmovesprites
- checkbit1 EVENT_GOT_TOTODILE_FROM_ELM
+ checkevent EVENT_GOT_TOTODILE_FROM_ELM
iftrue UnknownScript_0x19c0ee
- checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM
+ checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue UnknownScript_0x19c104
winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6
setlasttalked $3
@@ -228,13 +228,13 @@
FisherScript_0x19c16e: ; 0x19c16e
faceplayer
loadfont
- checkbit1 EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE
+ checkevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE
iftrue UnknownScript_0x19c183
2writetext UnknownText_0x19c766
keeptextopen
verbosegiveitem MYSTIC_WATER, 1
iffalse UnknownScript_0x19c187
- setbit1 EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE
+ setevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE
UnknownScript_0x19c183: ; 0x19c183
2writetext UnknownText_0x19c7c1
closetext
--- a/maps/CherrygroveMart.asm
+++ b/maps/CherrygroveMart.asm
@@ -8,7 +8,7 @@
ClerkScript_0x19680a: ; 0x19680a
loadfont
- checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iftrue UnknownScript_0x196817
pokemart $0, $0000
loadmovesprites
@@ -24,7 +24,7 @@
CooltrainerMScript_0x19681d: ; 0x19681d
faceplayer
loadfont
- checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iftrue UnknownScript_0x19682b
2writetext UnknownText_0x196834
closetext
--- a/maps/CherrygrovePokeCenter1F.asm
+++ b/maps/CherrygrovePokeCenter1F.asm
@@ -21,7 +21,7 @@
TeacherScript_0x196976: ; 0x196976
faceplayer
loadfont
- checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iftrue UnknownScript_0x196984
2writetext UnknownText_0x1969f1
closetext
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -24,8 +24,8 @@
UnknownScript_0x1a000f: ; 0x1a000f
setbit2 $0045
- setbit1 $07aa
- checkbit1 $0333
+ setevent $07aa
+ checkevent $0333
iffalse UnknownScript_0x1a001d
disappear $c
UnknownScript_0x1a001d: ; 0x1a001d
@@ -45,11 +45,11 @@
disappear $d
pause 10
dotrigger $0
- clearbit1 EVENT_SAW_SUICUNE_ON_ROUTE_42
+ clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42
domaptrigger GROUP_ROUTE_42, MAP_ROUTE_42, $1
- checkbit1 $0333
+ checkevent $0333
iftrue UnknownScript_0x1a0083
- setbit1 $0333
+ setevent $0333
playmusic $0061
appear $c
applymovement $c, MovementData_0x1a00e7
@@ -81,11 +81,11 @@
PokefanFScript_0x1a0084: ; 0x1a0084
faceplayer
loadfont
- checkbit1 EVENT_GOT_HM02_FLY
+ checkevent EVENT_GOT_HM02_FLY
iftrue UnknownScript_0x1a00ad
2writetext UnknownText_0x1a00f1
keeptextopen
- checkbit1 EVENT_BEAT_CHUCK
+ checkevent EVENT_BEAT_CHUCK
iftrue UnknownScript_0x1a009c
2writetext UnknownText_0x1a0163
closetext
@@ -98,7 +98,7 @@
keeptextopen
verbosegiveitem HM_02, 1
iffalse UnknownScript_0x1a00b1
- setbit1 EVENT_GOT_HM02_FLY
+ setevent EVENT_GOT_HM02_FLY
2writetext UnknownText_0x1a021d
keeptextopen
UnknownScript_0x1a00ad: ; 0x1a00ad
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -9,7 +9,7 @@
ChuckScript_0x9d60f: ; 0x9d60f
faceplayer
loadfont
- checkbit1 EVENT_BEAT_CHUCK
+ checkevent EVENT_BEAT_CHUCK
iftrue UnknownScript_0x9d656
2writetext UnknownText_0x9d6f9
closetext
@@ -33,7 +33,7 @@
loadtrainer CHUCK, 1
startbattle
returnafterbattle
- setbit1 EVENT_BEAT_CHUCK
+ setevent EVENT_BEAT_CHUCK
loadfont
2writetext UnknownText_0x9d835
playsound $009c
@@ -42,17 +42,17 @@
checkcode $7
2call UnknownScript_0x9d681
UnknownScript_0x9d656: ; 0x9d656
- checkbit1 EVENT_GOT_TM01_DYNAMICPUNCH
+ checkevent EVENT_GOT_TM01_DYNAMICPUNCH
iftrue UnknownScript_0x9d67b
- setbit1 EVENT_BEAT_BLACKBELT_YOSHI
- setbit1 EVENT_BEAT_BLACKBELT_LAO
- setbit1 EVENT_BEAT_BLACKBELT_NOB
- setbit1 EVENT_BEAT_BLACKBELT_LUNG
+ setevent EVENT_BEAT_BLACKBELT_YOSHI
+ setevent EVENT_BEAT_BLACKBELT_LAO
+ setevent EVENT_BEAT_BLACKBELT_NOB
+ setevent EVENT_BEAT_BLACKBELT_LUNG
2writetext UnknownText_0x9d84d
keeptextopen
verbosegiveitem TM_01, 1
iffalse UnknownScript_0x9d67f
- setbit1 EVENT_GOT_TM01_DYNAMICPUNCH
+ setevent EVENT_GOT_TM01_DYNAMICPUNCH
2writetext UnknownText_0x9d8da
closetext
loadmovesprites
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -16,9 +16,9 @@
PharmacistScript_0x9df9e: ; 0x9df9e
faceplayer
loadfont
- checkbit1 EVENT_GOT_SECRETPOTION_FROM_PHARMACY
+ checkevent EVENT_GOT_SECRETPOTION_FROM_PHARMACY
iftrue UnknownScript_0x9dfc4
- checkbit1 $0037
+ checkevent $0037
iffalse UnknownScript_0x9dfc4
2writetext UnknownText_0x9dfcd
keeptextopen
@@ -27,7 +27,7 @@
playsound $0091
waitbutton
itemnotify
- setbit1 EVENT_GOT_SECRETPOTION_FROM_PHARMACY
+ setevent EVENT_GOT_SECRETPOTION_FROM_PHARMACY
2writetext UnknownText_0x9e070
closetext
loadmovesprites
--- a/maps/CianwoodPokeCenter1F.asm
+++ b/maps/CianwoodPokeCenter1F.asm
@@ -16,7 +16,7 @@
CianwoodGymGuyScript: ; 0x9dbd5
faceplayer
- checkbit1 EVENT_BEAT_CHUCK
+ checkevent EVENT_BEAT_CHUCK
iftrue .CianwoodGymGuyWinScript
loadfont
2writetext CianwoodGymGuyText
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -24,7 +24,7 @@
playsound $0013
applymovement $2, MovementData_0x1ac9d0
disappear $2
- clearbit1 $0776
+ clearevent $0776
end
; 0x1ac9c4
--- a/maps/CopycatsHouse1F.asm
+++ b/maps/CopycatsHouse1F.asm
@@ -13,7 +13,7 @@
PokefanFScript_0x18ad16: ; 0x18ad16
faceplayer
loadfont
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x18ad24
2writetext UnknownText_0x18ad95
closetext
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -27,9 +27,9 @@
CopycatScript_0x18aeb1: ; 0x18aeb1
faceplayer
- checkbit1 EVENT_GOT_PASS_FROM_COPYCAT
+ checkevent EVENT_GOT_PASS_FROM_COPYCAT
iftrue UnknownScript_0x18af6f
- checkbit1 EVENT_RETURNED_LOST_ITEM_TO_COPYCAT
+ checkevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT
iftrue UnknownScript_0x18af5b
checkitem LOST_ITEM
iftrue UnknownScript_0x18af4a
@@ -47,7 +47,7 @@
variablesprite $b, $60
UnknownScript_0x18aedc: ; 0x18aedc
special $005e
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x18af16
loadfont
checkbit2 $0063
@@ -109,7 +109,7 @@
2writetext UnknownText_0x18b116
closetext
loadmovesprites
- setbit1 EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM
+ setevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM
end
; 0x18af4a
@@ -118,8 +118,8 @@
2writetext UnknownText_0x18b17f
keeptextopen
takeitem LOST_ITEM, 1
- setbit1 EVENT_RETURNED_LOST_ITEM_TO_COPYCAT
- clearbit1 $0773
+ setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT
+ clearevent $0773
2jump UnknownScript_0x18af5c
; 0x18af5b
@@ -130,7 +130,7 @@
keeptextopen
verbosegiveitem PASS, 1
iffalse UnknownScript_0x18afba
- setbit1 EVENT_GOT_PASS_FROM_COPYCAT
+ setevent EVENT_GOT_PASS_FROM_COPYCAT
2writetext UnknownText_0x18b214
closetext
loadmovesprites
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -156,17 +156,17 @@
loadfont
2writetext UnknownText_0x9980a
keeptextopen
- checkbit1 EVENT_GOT_HM03_SURF
+ checkevent EVENT_GOT_HM03_SURF
iftrue UnknownScript_0x99515
- checkbit1 EVENT_BEAT_KIMONO_GIRL_NAOKO
+ checkevent EVENT_BEAT_KIMONO_GIRL_NAOKO
iffalse UnknownScript_0x994f3
- checkbit1 EVENT_BEAT_KIMONO_GIRL_SAYO
+ checkevent EVENT_BEAT_KIMONO_GIRL_SAYO
iffalse UnknownScript_0x994f3
- checkbit1 EVENT_BEAT_KIMONO_GIRL_ZUKI
+ checkevent EVENT_BEAT_KIMONO_GIRL_ZUKI
iffalse UnknownScript_0x994f3
- checkbit1 EVENT_BEAT_KIMONO_GIRL_KUNI
+ checkevent EVENT_BEAT_KIMONO_GIRL_KUNI
iffalse UnknownScript_0x994f3
- checkbit1 EVENT_BEAT_KIMONO_GIRL_MIKI
+ checkevent EVENT_BEAT_KIMONO_GIRL_MIKI
iffalse UnknownScript_0x994f3
2jump UnknownScript_0x99505
; 0x994f3
@@ -191,7 +191,7 @@
2writetext UnknownText_0x9991a
keeptextopen
verbosegiveitem HM_03, 1
- setbit1 EVENT_GOT_HM03_SURF
+ setevent EVENT_GOT_HM03_SURF
2writetext UnknownText_0x9999b
closetext
loadmovesprites
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -9,13 +9,13 @@
PharmacistScript_0x18c720: ; 0x18c720
faceplayer
loadfont
- checkbit1 EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE
+ checkevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE
iftrue UnknownScript_0x18c735
2writetext UnknownText_0x18c73f
keeptextopen
verbosegiveitem BLACKGLASSES, 1
iffalse UnknownScript_0x18c739
- setbit1 EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE
+ setevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE
UnknownScript_0x18c735: ; 0x18c735
2writetext UnknownText_0x18c80c
closetext
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -13,14 +13,14 @@
UnknownScript_0x62f7b: ; 0x62f7b
checkbit2 $0005
iftrue UnknownScript_0x62f88
- clearbit1 $06e5
- setbit1 $06e6
+ clearevent $06e5
+ setevent $06e6
return
; 0x62f88
UnknownScript_0x62f88: ; 0x62f88
- setbit1 $06e5
- clearbit1 $06e6
+ setevent $06e5
+ clearevent $06e6
return
; 0x62f8f
@@ -27,7 +27,7 @@
GrampsScript_0x62f8f: ; 0x62f8f
faceplayer
loadfont
- checkbit1 EVENT_GOT_ODD_EGG
+ checkevent EVENT_GOT_ODD_EGG
iftrue UnknownScript_0x62fbd
2writetext UnknownText_0x630ce
keeptextopen
@@ -42,7 +42,7 @@
2writetext UnknownText_0x631c3
closetext
loadmovesprites
- setbit1 EVENT_GOT_ODD_EGG
+ setevent EVENT_GOT_ODD_EGG
end
; 0x62fb6
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -26,7 +26,7 @@
2writetext UnknownText_0x18d2ea
keeptextopen
UnknownScript_0x18d030: ; 0x18d030
- setbit1 $0001
+ setevent $0001
2writetext UnknownText_0x18d3bc
keeptextopen
loadmenudata MenuDataHeader_0x18d215
@@ -39,7 +39,7 @@
; 0x18d049
UnknownScript_0x18d049: ; 0x18d049
- setbit1 $0002
+ setevent $0002
2writetext UnknownText_0x18d3d3
keeptextopen
loadmenudata MenuDataHeader_0x18d234
@@ -49,7 +49,7 @@
if_equal $2, UnknownScript_0x18d0a9
if_equal $3, UnknownScript_0x18d0cb
UnknownScript_0x18d061: ; 0x18d061
- setbit1 $0003
+ setevent $0003
2writetext UnknownText_0x18d3f3
keeptextopen
loadmenudata MenuDataHeader_0x18d258
@@ -59,7 +59,7 @@
if_equal $2, UnknownScript_0x18d0a9
if_equal $3, UnknownScript_0x18d0a9
UnknownScript_0x18d079: ; 0x18d079
- setbit1 $0004
+ setevent $0004
2writetext UnknownText_0x18d420
keeptextopen
loadmenudata MenuDataHeader_0x18d283
@@ -69,7 +69,7 @@
if_equal $2, UnknownScript_0x18d0cb
if_equal $3, UnknownScript_0x18d0a9
UnknownScript_0x18d091: ; 0x18d091
- setbit1 $0005
+ setevent $0005
2writetext UnknownText_0x18d44a
keeptextopen
loadmenudata MenuDataHeader_0x18d2a5
@@ -79,17 +79,17 @@
if_equal $2, UnknownScript_0x18d0a9
if_equal $3, UnknownScript_0x18d0cb
UnknownScript_0x18d0a9: ; 0x18d0a9
- checkbit1 $0005
+ checkevent $0005
iftrue UnknownScript_0x18d100
2writetext UnknownText_0x18d82d
keeptextopen
- checkbit1 $0004
+ checkevent $0004
iftrue UnknownScript_0x18d091
- checkbit1 $0003
+ checkevent $0003
iftrue UnknownScript_0x18d079
- checkbit1 $0002
+ checkevent $0002
iftrue UnknownScript_0x18d061
- checkbit1 $0001
+ checkevent $0001
iftrue UnknownScript_0x18d049
UnknownScript_0x18d0cb: ; 0x18d0cb
loadmovesprites
@@ -103,17 +103,17 @@
2writetext UnknownText_0x18d816
closetext
loadmovesprites
- setbit1 $00c1
+ setevent $00c1
loadfont
- checkbit1 $0005
+ checkevent $0005
iftrue UnknownScript_0x18d091
- checkbit1 $0004
+ checkevent $0004
iftrue UnknownScript_0x18d079
- checkbit1 $0003
+ checkevent $0003
iftrue UnknownScript_0x18d061
- checkbit1 $0002
+ checkevent $0002
iftrue UnknownScript_0x18d049
- checkbit1 $0001
+ checkevent $0001
iftrue UnknownScript_0x18d030
UnknownScript_0x18d100: ; 0x18d100
2writetext UnknownText_0x18d47c
@@ -188,7 +188,7 @@
playsound $001f
disappear $5
waitbutton
- setbit1 $0000
+ setevent $0000
end
; 0x18d1a5
@@ -195,13 +195,13 @@
ElderScript_0x18d1a5: ; 0x18d1a5
faceplayer
loadfont
- checkbit1 $0000
+ checkevent $0000
iftrue UnknownScript_0x18d1f9
- checkbit1 $0006
+ checkevent $0006
iftrue UnknownScript_0x18d1ff
- checkbit1 $00bd
+ checkevent $00bd
iffalse UnknownScript_0x18d1c5
- checkbit1 EVENT_BEAT_RIVAL_IN_MT_MOON
+ checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
iftrue UnknownScript_0x18d1f3
2writetext UnknownText_0x18d724
closetext
@@ -218,10 +218,10 @@
playsound $0002
waitbutton
givepoke DRATINI, 15, 0, 0
- checkbit1 $00c1
+ checkevent $00c1
special $0094
- setbit1 $00bd
- setbit1 $0006
+ setevent $00bd
+ setevent $0006
2writetext UnknownText_0x18d6ca
closetext
loadmovesprites
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -23,7 +23,7 @@
; 0x18c89f
UnknownScript_0x18c89f: ; 0x18c89f
- checkbit1 EVENT_BEAT_RIVAL_IN_MT_MOON
+ checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
iftrue UnknownScript_0x18c8a8
disappear $4
return
@@ -62,7 +62,7 @@
playsound $0001
waitbutton
itemnotify
- setbit1 EVENT_GOT_TM24_DRAGONBREATH
+ setevent EVENT_GOT_TM24_DRAGONBREATH
2writetext UnknownText_0x18ca0d
keeptextopen
2writetext UnknownText_0x18caf1
@@ -230,12 +230,12 @@
playmusic $001f
faceplayer
loadfont
- checkbit1 $0000
+ checkevent $0000
iftrue UnknownScript_0x18c995
2writetext UnknownText_0x18cc83
closetext
loadmovesprites
- setbit1 $0000
+ setevent $0000
special $003d
end
; 0x18c995
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -34,7 +34,7 @@
LassScript_0x1a4015: ; 0x1a4015
faceplayer
loadfont
- checkbit1 EVENT_RELEASED_THE_BEASTS
+ checkevent EVENT_RELEASED_THE_BEASTS
iftrue UnknownScript_0x1a4023
2writetext UnknownText_0x1a421a
closetext
@@ -52,7 +52,7 @@
FisherScript_0x1a4029: ; 0x1a4029
faceplayer
loadfont
- checkbit1 EVENT_JASMINE_RETURNED_TO_GYM
+ checkevent EVENT_JASMINE_RETURNED_TO_GYM
iftrue UnknownScript_0x1a4037
2writetext UnknownText_0x1a42ac
closetext
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -22,7 +22,7 @@
MortyScript_0x99d58: ; 0x99d58
faceplayer
loadfont
- checkbit1 EVENT_BEAT_MORTY
+ checkevent EVENT_BEAT_MORTY
iftrue UnknownScript_0x99d8c
2writetext UnknownText_0x99e65
closetext
@@ -31,7 +31,7 @@
loadtrainer MORTY, 1
startbattle
returnafterbattle
- setbit1 EVENT_BEAT_MORTY
+ setevent EVENT_BEAT_MORTY
loadfont
2writetext UnknownText_0x9a043
playsound $009c
@@ -40,20 +40,20 @@
checkcode $7
2call UnknownScript_0x99db7
domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $1
- setbit1 $0766
- setbit1 $0767
+ setevent $0766
+ setevent $0767
UnknownScript_0x99d8c: ; 0x99d8c
- checkbit1 EVENT_GOT_TM30_SHADOW_BALL
+ checkevent EVENT_GOT_TM30_SHADOW_BALL
iftrue UnknownScript_0x99db1
- setbit1 EVENT_BEAT_SAGE_JEFFREY
- setbit1 EVENT_BEAT_SAGE_PING
- setbit1 EVENT_BEAT_MEDIUM_MARTHA
- setbit1 EVENT_BEAT_MEDIUM_GRACE
+ setevent EVENT_BEAT_SAGE_JEFFREY
+ setevent EVENT_BEAT_SAGE_PING
+ setevent EVENT_BEAT_MEDIUM_MARTHA
+ setevent EVENT_BEAT_MEDIUM_GRACE
2writetext UnknownText_0x9a059
keeptextopen
verbosegiveitem TM_30, 1
iffalse UnknownScript_0x99db5
- setbit1 EVENT_GOT_TM30_SHADOW_BALL
+ setevent EVENT_GOT_TM30_SHADOW_BALL
2writetext UnknownText_0x9a0ec
closetext
loadmovesprites
@@ -218,7 +218,7 @@
EcruteakGymGuyScript: ; 0x99e39
faceplayer
loadfont
- checkbit1 EVENT_BEAT_MORTY
+ checkevent EVENT_BEAT_MORTY
iftrue .EcruteakGymGuyWinScript
2writetext EcruteakGymGuyText
closetext
--- a/maps/EcruteakHouse.asm
+++ b/maps/EcruteakHouse.asm
@@ -23,19 +23,19 @@
; 0x9800f
UnknownScript_0x9800f: ; 0x9800f
- checkbit1 EVENT_FOUGHT_SUICUNE
+ checkevent EVENT_FOUGHT_SUICUNE
iftrue UnknownScript_0x98033
- checkbit1 EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
+ checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
iftrue UnknownScript_0x98033
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x98022
return
; 0x98022
UnknownScript_0x98022: ; 0x98022
- clearbit1 $0766
- setbit1 $0767
- setbit1 $07b1
+ clearevent $0766
+ setevent $0767
+ setevent $07b1
checkitem CLEAR_BELL
iftrue UnknownScript_0x98032
dotrigger $0
@@ -44,12 +44,12 @@
; 0x98033
UnknownScript_0x98033: ; 0x98033
- clearbit1 $07b1
+ clearevent $07b1
return
; 0x98037
UnknownScript_0x98037: ; 0x98037
- checkbit1 $0767
+ checkevent $0767
iftrue UnknownScript_0x98061
applymovement $3, MovementData_0x980c7
moveperson $2, $4, $6
@@ -60,7 +60,7 @@
; 0x9804c
UnknownScript_0x9804c: ; 0x9804c
- checkbit1 $0766
+ checkevent $0766
iftrue UnknownScript_0x98061
applymovement $2, MovementData_0x980cc
moveperson $3, $5, $6
@@ -77,7 +77,7 @@
SageScript_0x98062: ; 0x98062
faceplayer
loadfont
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x9807c
checkbit2 $001e
iftrue UnknownScript_0x98076
@@ -95,9 +95,9 @@
; 0x9807c
UnknownScript_0x9807c: ; 0x9807c
- checkbit1 EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
+ checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
iftrue UnknownScript_0x980a4
- checkbit1 $0000
+ checkevent $0000
iftrue UnknownScript_0x980aa
checkitem CLEAR_BELL
iftrue UnknownScript_0x98093
@@ -112,9 +112,9 @@
closetext
loadmovesprites
dotrigger $1
- setbit1 $0767
- clearbit1 $0766
- setbit1 $0000
+ setevent $0767
+ clearevent $0766
+ setevent $0000
end
; 0x980a4
@@ -135,7 +135,7 @@
SageScript_0x980b0: ; 0x980b0
faceplayer
loadfont
- checkbit1 EVENT_GOT_CLEAR_BELL
+ checkevent EVENT_GOT_CLEAR_BELL
iftrue UnknownScript_0x980be
2writetext UnknownText_0x9840b
closetext
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -9,7 +9,7 @@
CooltrainerMScript_0x9a5fb: ; 0x9a5fb
faceplayer
loadfont
- checkbit1 EVENT_GOT_ITEMFINDER
+ checkevent EVENT_GOT_ITEMFINDER
iftrue UnknownScript_0x9a614
2writetext UnknownText_0x9a63c
yesorno
@@ -17,7 +17,7 @@
2writetext UnknownText_0x9a6b5
keeptextopen
verbosegiveitem ITEMFINDER, 1
- setbit1 EVENT_GOT_ITEMFINDER
+ setevent EVENT_GOT_ITEMFINDER
UnknownScript_0x9a614: ; 0x9a614
2writetext UnknownText_0x9a70e
closetext
--- a/maps/EcruteakPokeCenter1F.asm
+++ b/maps/EcruteakPokeCenter1F.asm
@@ -50,7 +50,7 @@
applymovement $6, MovementData_0x98ece
playsound $0023
disappear $6
- clearbit1 $0712
+ clearevent $0712
setbit2 $0053
dotrigger $1
waitbutton
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -98,21 +98,21 @@
ProfElmScript: ; 0x78be0
faceplayer
loadfont
- checkbit1 EVENT_GOT_SS_TICKET_FROM_ELM
+ checkevent EVENT_GOT_SS_TICKET_FROM_ELM
iftrue UnknownScript_0x78bee
- checkbit1 $0044
+ checkevent $0044
iftrue ElmGiveTicketScript
UnknownScript_0x78bee: ; 0x78bee
- checkbit1 EVENT_GOT_MASTER_BALL_FROM_ELM
+ checkevent EVENT_GOT_MASTER_BALL_FROM_ELM
iftrue UnknownScript_0x78bfa
checkbit2 $0022
iftrue ElmGiveMasterBallScript
UnknownScript_0x78bfa: ; 0x78bfa
- checkbit1 EVENT_GOT_EVERSTONE_FROM_ELM
+ checkevent EVENT_GOT_EVERSTONE_FROM_ELM
iftrue UnknownScript_0x78e16
- checkbit1 EVENT_SHOWED_TOGEPI_TO_ELM
+ checkevent EVENT_SHOWED_TOGEPI_TO_ELM
iftrue UnknownScript_0x78e03
- checkbit1 EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE
+ checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE
iffalse UnknownScript_0x78c35
writebyte TOGEPI
special $0043
@@ -137,20 +137,20 @@
; 0x78c35
UnknownScript_0x78c35: ; 0x78c35
- checkbit1 EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
+ checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
iffalse UnknownScript_0x78c41
- checkbit1 EVENT_TOGEPI_HATCHED
+ checkevent EVENT_TOGEPI_HATCHED
iftrue UnknownScript_0x78c22
UnknownScript_0x78c41: ; 0x78c41
- checkbit1 EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE ; why are we checking it again?
+ checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE ; why are we checking it again?
iftrue ElmWaitingEggHatchScript
checkbit2 $001b
iftrue ElmAideHasEggScript
- checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iftrue ElmStudyingEggScript
- checkbit1 EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON
+ checkevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON
iftrue ElmAfterTheftScript
- checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM
+ checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue ElmDescribesMrPokemonScript
2writetext UnknownText_0x79375
closetext
@@ -169,7 +169,7 @@
; 0x78c73
CyndaquilPokeBallScript: ; 0x78c73
- checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM
+ checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
spriteface $2, $0
refreshscreen $0
@@ -182,7 +182,7 @@
yesorno
iffalse DidntChooseStarterScript
disappear $4
- setbit1 EVENT_GOT_CYNDAQUIL_FROM_ELM
+ setevent EVENT_GOT_CYNDAQUIL_FROM_ELM
2writetext ChoseStarterText
keeptextopen
waitbutton
@@ -200,7 +200,7 @@
; 0x78cb5
TotodilePokeBallScript: ; 0x78cb5
- checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM
+ checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
spriteface $2, $0
refreshscreen $0
@@ -213,7 +213,7 @@
yesorno
iffalse DidntChooseStarterScript
disappear $5
- setbit1 EVENT_GOT_TOTODILE_FROM_ELM
+ setevent EVENT_GOT_TOTODILE_FROM_ELM
2writetext ChoseStarterText
keeptextopen
waitbutton
@@ -229,7 +229,7 @@
; 0x78cf1
ChikoritaPokeBallScript: ; 0x78cf1
- checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM
+ checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
spriteface $2, $0
refreshscreen $0
@@ -242,7 +242,7 @@
yesorno
iffalse DidntChooseStarterScript
disappear $6
- setbit1 EVENT_GOT_CHIKORITA_FROM_ELM
+ setevent EVENT_GOT_CHIKORITA_FROM_ELM
2writetext ChoseStarterText
keeptextopen
waitbutton
@@ -287,8 +287,8 @@
2writetext ElmDirectionsText3
closetext
loadmovesprites
- setbit1 EVENT_GOT_A_POKEMON_FROM_ELM
- setbit1 $06be
+ setevent EVENT_GOT_A_POKEMON_FROM_ELM
+ setevent $06be
dotrigger $5
domaptrigger GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN, $1
end
@@ -311,7 +311,7 @@
MapElmsLabSignpost0Script: ; 0x78d74
loadfont
- checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM
+ checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue UnknownScript_0x78d81
2writetext UnknownText_0x79690
closetext
@@ -361,11 +361,11 @@
keeptextopen
2writetext ElmAfterTheftText5
keeptextopen
- setbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
setbit2 $0010
domaptrigger GROUP_ROUTE_29, MAP_ROUTE_29, $1
- clearbit1 $0715
- setbit1 $0714
+ clearevent $0715
+ setevent $0714
2writetext ElmAfterTheftText6
closetext
loadmovesprites
@@ -399,7 +399,7 @@
closetext
loadmovesprites
showemote $0, $2, 15
- setbit1 EVENT_SHOWED_TOGEPI_TO_ELM
+ setevent EVENT_SHOWED_TOGEPI_TO_ELM
loadfont
2writetext ShowElmTogepiText2
keeptextopen
@@ -413,7 +413,7 @@
2writetext ElmGiveEverstoneText2
closetext
loadmovesprites
- setbit1 EVENT_GOT_EVERSTONE_FROM_ELM
+ setevent EVENT_GOT_EVERSTONE_FROM_ELM
end
; 0x78e16
@@ -430,7 +430,7 @@
keeptextopen
verbosegiveitem MASTER_BALL, 1
iffalse .notdone
- setbit1 EVENT_GOT_MASTER_BALL_FROM_ELM
+ setevent EVENT_GOT_MASTER_BALL_FROM_ELM
2writetext ElmGiveMasterBallText2
closetext
.notdone
@@ -442,7 +442,7 @@
2writetext ElmGiveTicketText1
keeptextopen
verbosegiveitem S_S_TICKET, 1
- setbit1 EVENT_GOT_SS_TICKET_FROM_ELM
+ setevent EVENT_GOT_SS_TICKET_FROM_ELM
2writetext ElmGiveTicketText2
closetext
loadmovesprites
@@ -560,11 +560,11 @@
ElmsAideScript: ; 0x78ee6
faceplayer
loadfont
- checkbit1 EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
+ checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
iftrue UnknownScript_0x78f0c
- checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iftrue UnknownScript_0x78f06
- checkbit1 EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON
+ checkevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON
iftrue UnknownScript_0x78f00
2writetext UnknownText_0x79f65
closetext
@@ -617,7 +617,7 @@
loadfont
checkbit2 $0043
iftrue UnknownScript_0x78f49
- checkbit1 EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON
+ checkevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON
iftrue UnknownScript_0x78f43
2jump UnknownScript_0x78f49
; 0x78f43
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -32,8 +32,8 @@
playsound $001c
earthquake 30
blackoutmod GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW
- clearbit1 $0031
- checkbit1 $0030
+ clearevent $0031
+ checkevent $0030
iftrue UnknownScript_0x7515d
dotrigger $2
end
@@ -47,9 +47,9 @@
SailorScript_0x75160: ; 0x75160
faceplayer
loadfont
- checkbit1 $0031
+ checkevent $0031
iftrue UnknownScript_0x7517a
- checkbit1 $002f
+ checkevent $002f
iftrue UnknownScript_0x75174
2writetext UnknownText_0x7523b
closetext
@@ -65,7 +65,7 @@
; 0x7517a
UnknownScript_0x7517a: ; 0x7517a
- checkbit1 $002f
+ checkevent $002f
iftrue UnknownScript_0x7519c
2writetext UnknownText_0x754be
closetext
@@ -74,7 +74,7 @@
playsound $0023
special $002e
waitbutton
- setbit1 $072b
+ setevent $072b
domaptrigger GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $1
warp GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $7, $11
end
@@ -88,7 +88,7 @@
playsound $0023
special $002e
waitbutton
- setbit1 $072a
+ setevent $072a
domaptrigger GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $1
warp GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $7, $17
end
@@ -111,7 +111,7 @@
SailorScript_0x751d0: ; 0x751d0
faceplayer
loadfont
- checkbit1 $0030
+ checkevent $0030
iftrue UnknownScript_0x751de
2writetext UnknownText_0x752f9
closetext
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -19,7 +19,7 @@
; 0x7673c
UnknownScript_0x7673c: ; 0x7673c
- checkbit1 $072f
+ checkevent $072f
iftrue UnknownScript_0x76766
applymovement $3, MovementData_0x76876
moveperson $2, $1e, $6
@@ -30,7 +30,7 @@
; 0x76751
UnknownScript_0x76751: ; 0x76751
- checkbit1 $072e
+ checkevent $072e
iftrue UnknownScript_0x76766
applymovement $2, MovementData_0x76871
moveperson $3, $1f, $6
@@ -47,17 +47,17 @@
SailorScript_0x76767: ; 0x76767
faceplayer
loadfont
- checkbit1 $0030
+ checkevent $0030
iftrue UnknownScript_0x767a0
- checkbit1 $0033
+ checkevent $0033
iftrue UnknownScript_0x7678d
- checkbit1 $0034
+ checkevent $0034
iftrue UnknownScript_0x76787
2writetext UnknownText_0x7687b
closetext
loadmovesprites
- setbit1 $0034
- clearbit1 $072d
+ setevent $0034
+ clearevent $072d
end
; 0x76787
@@ -70,7 +70,7 @@
UnknownScript_0x7678d: ; 0x7678d
2writetext UnknownText_0x7692e
- checkbit1 $0032
+ checkevent $0032
iffalse UnknownScript_0x76799
closetext
loadmovesprites
--- a/maps/FastShipCabins.asm
+++ b/maps/FastShipCabins.asm
@@ -13,7 +13,7 @@
CaptainScript_0x75ea7: ; 0x75ea7
faceplayer
loadfont
- checkbit1 $0030
+ checkevent $0030
iftrue UnknownScript_0x75eb5
2writetext UnknownText_0x76012
closetext
@@ -72,7 +72,7 @@
loadfont
2writetext UnknownText_0x76143
keeptextopen
- setbit1 $072b
+ setevent $072b
domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0
2jump UnknownScript_0x75f37
; 0x75f1f
@@ -80,9 +80,9 @@
GentlemanScript_0x75f1f: ; 0x75f1f
faceplayer
loadfont
- checkbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
+ checkevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
iftrue UnknownScript_0x75f67
- checkbit1 $0732
+ checkevent $0732
iftrue UnknownScript_0x75f58
2writetext UnknownText_0x760ae
closetext
@@ -96,7 +96,7 @@
keeptextopen
verbosegiveitem METAL_COAT, 1
iffalse UnknownScript_0x75f44
- setbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
+ setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
UnknownScript_0x75f44: ; 0x75f44
loadmovesprites
waitbutton
@@ -105,8 +105,8 @@
loadfont
2writetext UnknownText_0x76645
closetext
- setbit1 $0031
- setbit1 $0032
+ setevent $0031
+ setevent $0032
loadmovesprites
end
; 0x75f58
@@ -116,7 +116,7 @@
keeptextopen
verbosegiveitem METAL_COAT, 1
iffalse UnknownScript_0x75f65
- setbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
+ setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
UnknownScript_0x75f65: ; 0x75f65
loadmovesprites
end
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -192,12 +192,12 @@
startbattle
reloadmap
special $001b
- setbit1 $057d
+ setevent $057d
loadfont
2writetext UnknownText_0x758b1
closetext
loadmovesprites
- setbit1 $0033
+ setevent $0033
domaptrigger GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F, $1
checkcode $9
if_equal $3, UnknownScript_0x75629
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -13,7 +13,7 @@
CaptainScript_0x75ea7: ; 0x75ea7
faceplayer
loadfont
- checkbit1 $0030
+ checkevent $0030
iftrue UnknownScript_0x75eb5
2writetext UnknownText_0x76012
closetext
@@ -72,7 +72,7 @@
loadfont
2writetext UnknownText_0x76143
keeptextopen
- setbit1 $072b
+ setevent $072b
domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0
2jump UnknownScript_0x75f37
; 0x75f1f
@@ -80,9 +80,9 @@
GentlemanScript_0x75f1f: ; 0x75f1f
faceplayer
loadfont
- checkbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
+ checkevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
iftrue UnknownScript_0x75f67
- checkbit1 $0732
+ checkevent $0732
iftrue UnknownScript_0x75f58
2writetext UnknownText_0x760ae
closetext
@@ -96,7 +96,7 @@
keeptextopen
verbosegiveitem METAL_COAT, 1
iffalse UnknownScript_0x75f44
- setbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
+ setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
UnknownScript_0x75f44: ; 0x75f44
loadmovesprites
waitbutton
@@ -105,8 +105,8 @@
loadfont
2writetext UnknownText_0x76645
closetext
- setbit1 $0031
- setbit1 $0032
+ setevent $0031
+ setevent $0032
loadmovesprites
end
; 0x75f58
@@ -116,7 +116,7 @@
keeptextopen
verbosegiveitem METAL_COAT, 1
iffalse UnknownScript_0x75f65
- setbit1 EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
+ setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
UnknownScript_0x75f65: ; 0x75f65
loadmovesprites
end
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -149,11 +149,11 @@
2writetext UnknownText_0x75dc1
closetext
loadmovesprites
- checkbit1 $0031
+ checkevent $0031
iftrue UnknownScript_0x75ae1
- checkbit1 $0032
+ checkevent $0032
iftrue UnknownScript_0x75ae2
- checkbit1 $0030
+ checkevent $0030
iftrue UnknownScript_0x75ae2
UnknownScript_0x75ae1: ; 0x75ae1
end
@@ -162,13 +162,13 @@
UnknownScript_0x75ae2: ; 0x75ae2
playsound $0027
pause 30
- checkbit1 $002f
+ checkevent $002f
iftrue UnknownScript_0x75af7
loadfont
2writetext UnknownText_0x75e0f
closetext
loadmovesprites
- setbit1 $0031
+ setevent $0031
end
; 0x75af7
@@ -177,7 +177,7 @@
2writetext UnknownText_0x75dde
closetext
loadmovesprites
- setbit1 $0031
+ setevent $0031
end
; 0x75b01
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -19,11 +19,11 @@
loadtrainer JANINE, 1
startbattle
returnafterbattle
- setbit1 EVENT_BEAT_JANINE
- setbit1 $0517
- setbit1 $051a
- setbit1 $0482
- setbit1 $041e
+ setevent EVENT_BEAT_JANINE
+ setevent $0517
+ setevent $051a
+ setevent $0482
+ setevent $041e
variablesprite $7, $28
variablesprite $8, $28
variablesprite $9, $28
@@ -41,13 +41,13 @@
faceplayer
loadfont
UnknownScript_0x195e02: ; 0x195e02
- checkbit1 EVENT_GOT_TM06_TOXIC
+ checkevent EVENT_GOT_TM06_TOXIC
iftrue UnknownScript_0x195e15
2writetext UnknownText_0x196002
keeptextopen
verbosegiveitem TM_06, 1
iffalse UnknownScript_0x195e15
- setbit1 EVENT_GOT_TM06_TOXIC
+ setevent EVENT_GOT_TM06_TOXIC
UnknownScript_0x195e15: ; 0x195e15
2writetext UnknownText_0x196074
closetext
@@ -56,7 +56,7 @@
; 0x195e1b
FuschiaGym1Script_0x195e1b: ; 0x195e1b
- checkbit1 $0517
+ checkevent $0517
iftrue UnknownScript_0x195e2c
applymovement $3, MovementData_0x195f27
faceplayer
@@ -65,7 +65,7 @@
UnknownScript_0x195e2c: ; 0x195e2c
faceplayer
loadfont
- checkbit1 $0517
+ checkevent $0517
iftrue UnknownScript_0x195e4f
2writetext UnknownText_0x1960e6
closetext
@@ -75,7 +75,7 @@
startbattle
iftrue UnknownScript_0x195e4a
returnafterbattle
- setbit1 $0517
+ setevent $0517
end
; 0x195e4a
@@ -93,7 +93,7 @@
; 0x195e55
FuschiaGym2Script_0x195e55: ; 0x195e55
- checkbit1 $051a
+ checkevent $051a
iftrue UnknownScript_0x195e66
applymovement $4, MovementData_0x195f27
faceplayer
@@ -102,7 +102,7 @@
UnknownScript_0x195e66: ; 0x195e66
faceplayer
loadfont
- checkbit1 $051a
+ checkevent $051a
iftrue UnknownScript_0x195e89
2writetext UnknownText_0x196166
closetext
@@ -112,7 +112,7 @@
startbattle
iftrue UnknownScript_0x195e84
returnafterbattle
- setbit1 $051a
+ setevent $051a
end
; 0x195e84
@@ -130,7 +130,7 @@
; 0x195e8f
FuschiaGym3Script_0x195e8f: ; 0x195e8f
- checkbit1 $0482
+ checkevent $0482
iftrue UnknownScript_0x195ea0
applymovement $5, MovementData_0x195f27
faceplayer
@@ -139,7 +139,7 @@
UnknownScript_0x195ea0: ; 0x195ea0
faceplayer
loadfont
- checkbit1 $0482
+ checkevent $0482
iftrue UnknownScript_0x195ec3
2writetext UnknownText_0x1961bb
closetext
@@ -149,7 +149,7 @@
startbattle
iftrue UnknownScript_0x195ebe
returnafterbattle
- setbit1 $0482
+ setevent $0482
end
; 0x195ebe
@@ -167,7 +167,7 @@
; 0x195ec9
FuschiaGym4Script_0x195ec9: ; 0x195ec9
- checkbit1 $041e
+ checkevent $041e
iftrue UnknownScript_0x195eda
applymovement $6, MovementData_0x195f27
faceplayer
@@ -176,7 +176,7 @@
UnknownScript_0x195eda: ; 0x195eda
faceplayer
loadfont
- checkbit1 $041e
+ checkevent $041e
iftrue UnknownScript_0x195efd
2writetext UnknownText_0x196228
closetext
@@ -186,7 +186,7 @@
startbattle
iftrue UnknownScript_0x195ef8
returnafterbattle
- setbit1 $041e
+ setevent $041e
end
; 0x195ef8
@@ -206,7 +206,7 @@
FuchsiaGymGuyScript: ; 0x195f03
faceplayer
loadfont
- checkbit1 EVENT_BEAT_JANINE
+ checkevent EVENT_BEAT_JANINE
iftrue .FuchsiaGymGuyWinScript
2writetext FuchsiaGymGuyText
closetext
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -13,7 +13,7 @@
ClerkScript_0x54750: ; 0x54750
faceplayer
loadfont
- checkbit1 EVENT_GOT_BICYCLE
+ checkevent EVENT_GOT_BICYCLE
iftrue UnknownScript_0x54775
2writetext UnknownText_0x54787
yesorno
@@ -27,7 +27,7 @@
waitbutton
itemnotify
setbit2 $0014
- setbit1 EVENT_GOT_BICYCLE
+ setevent EVENT_GOT_BICYCLE
UnknownScript_0x54775: ; 0x54775
2writetext UnknownText_0x5485f
closetext
--- a/maps/GoldenrodBillsHouse.asm
+++ b/maps/GoldenrodBillsHouse.asm
@@ -9,7 +9,7 @@
BillScript_0x54be4: ; 0x54be4
faceplayer
loadfont
- checkbit1 EVENT_GOT_EEVEE
+ checkevent EVENT_GOT_EEVEE
iftrue UnknownScript_0x54c1f
2writetext UnknownText_0x54c74
yesorno
@@ -23,7 +23,7 @@
playsound $0002
waitbutton
givepoke EEVEE, 20, 0, 0
- setbit1 EVENT_GOT_EEVEE
+ setevent EVENT_GOT_EEVEE
2writetext UnknownText_0x54dc1
closetext
loadmovesprites
@@ -54,7 +54,7 @@
PokefanFScript_0x54c25: ; 0x54c25
faceplayer
loadfont
- checkbit1 $0712
+ checkevent $0712
iffalse UnknownScript_0x54c33
2writetext UnknownText_0x54ea8
closetext
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -15,15 +15,15 @@
UnknownScript_0x1988d8: ; 0x1988d8
setbit2 $0046
setbit2 $0016
- checkbit1 $00b9
+ checkevent $00b9
iftrue UnknownScript_0x1988e7
- clearbit1 $0769
+ clearevent $0769
UnknownScript_0x1988e7: ; 0x1988e7
return
; 0x1988e8
UnknownScript_0x1988e8: ; 0x1988e8
- checkbit1 $0044
+ checkevent $0044
iffalse UnknownScript_0x198908
checkitem COIN_CASE
iffalse UnknownScript_0x1988fd
@@ -143,7 +143,7 @@
UnknownScript_0x1989ca: ; 0x1989ca
playsound $001f
disappear $10
- clearbit1 $076b
+ clearevent $076b
setbit2 $005e
waitbutton
end
@@ -174,7 +174,7 @@
CooltrainerFScript_0x1989e9: ; 0x1989e9
faceplayer
loadfont
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1989f7
2writetext UnknownText_0x198ae6
closetext
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -25,15 +25,15 @@
ClerkScript_0x5609c: ; 0x5609c
faceplayer
loadfont
- checkbit1 EVENT_GOT_TM02_HEADBUTT
+ checkevent EVENT_GOT_TM02_HEADBUTT
iftrue UnknownScript_0x560ad
- checkbit1 EVENT_GOT_TM08_ROCK_SMASH
+ checkevent EVENT_GOT_TM08_ROCK_SMASH
iftrue UnknownScript_0x560c2
2jump UnknownScript_0x560b6
; 0x560ad
UnknownScript_0x560ad: ; 0x560ad
- checkbit1 EVENT_GOT_TM08_ROCK_SMASH
+ checkevent EVENT_GOT_TM08_ROCK_SMASH
iftrue UnknownScript_0x560c8
2jump UnknownScript_0x560bc
; 0x560b6
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -13,7 +13,7 @@
; 0x7d781
UnknownScript_0x7d781: ; 0x7d781
- checkbit1 $004a
+ checkevent $004a
iftrue UnknownScript_0x7d78a
2jump UnknownScript_0x7d791
; 0x7d78a
@@ -24,9 +24,9 @@
; 0x7d791
UnknownScript_0x7d791: ; 0x7d791
- checkbit1 $0305
+ checkevent $0305
iftrue UnknownScript_0x7d7a2
- checkbit1 $0306
+ checkevent $0306
iftrue UnknownScript_0x7d7a7
changeblock $a, $8, $d
return
@@ -43,7 +43,7 @@
; 0x7d7ac
UnknownScript_0x7d7ac: ; 0x7d7ac
- clearbit1 $0307
+ clearevent $0307
return
; 0x7d7b0
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -15,32 +15,32 @@
playsound $006e
earthquake 60
waitbutton
- checkbit1 $0307
+ checkevent $0307
iftrue UnknownScript_0x566df
- checkbit1 $0304
+ checkevent $0304
iftrue UnknownScript_0x566cb
- checkbit1 $0305
+ checkevent $0305
iftrue UnknownScript_0x566d5
- checkbit1 $0306
+ checkevent $0306
iftrue UnknownScript_0x566c1
UnknownScript_0x566c1: ;0x566c1
- setbit1 $0304
- clearbit1 $0305
- clearbit1 $0306
+ setevent $0304
+ clearevent $0305
+ clearevent $0306
end
; 0x566cb
UnknownScript_0x566cb: ; 0x566cb
- clearbit1 $0304
- setbit1 $0305
- clearbit1 $0306
+ clearevent $0304
+ setevent $0305
+ clearevent $0306
end
; 0x566d5
UnknownScript_0x566d5: ; 0x566d5
- clearbit1 $0304
- clearbit1 $0305
- setbit1 $0306
+ clearevent $0304
+ clearevent $0305
+ setevent $0306
end
; 0x566df
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -27,14 +27,14 @@
UnknownScript_0x5672b: ; 0x5672b
checkbit2 $0061
iftrue UnknownScript_0x56738
- setbit1 $06f0
- clearbit1 $06f1
+ setevent $06f0
+ clearevent $06f1
return
; 0x56738
UnknownScript_0x56738: ; 0x56738
- clearbit1 $06f0
- setbit1 $06f1
+ clearevent $06f0
+ setevent $06f1
return
; 0x5673f
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -7,13 +7,13 @@
; 0x5535d
TeacherScript_0x5535d: ; 0x5535d
- checkbit1 EVENT_FOUGHT_SUDOWOODO
+ checkevent EVENT_FOUGHT_SUDOWOODO
iftrue UnknownScript_0x5538f
- checkbit1 EVENT_GOT_SQUIRTBOTTLE
+ checkevent EVENT_GOT_SQUIRTBOTTLE
iftrue UnknownScript_0x55399
- checkbit1 $00b9
+ checkevent $00b9
iffalse UnknownScript_0x5539f
- checkbit1 $00ba
+ checkevent $00ba
iffalse UnknownScript_0x5538f
checkbit2 $001d
iffalse UnknownScript_0x5539c
@@ -22,10 +22,10 @@
2writetext UnknownText_0x554c2
keeptextopen
verbosegiveitem SQUIRTBOTTLE, 1
- setbit1 EVENT_GOT_SQUIRTBOTTLE
+ setevent EVENT_GOT_SQUIRTBOTTLE
loadmovesprites
- setbit1 $0769
- clearbit1 $0768
+ setevent $0769
+ clearevent $0768
end
; 0x5538f
@@ -53,16 +53,16 @@
LassScript_0x553a2: ; 0x553a2
faceplayer
loadfont
- checkbit1 EVENT_FOUGHT_SUDOWOODO
+ checkevent EVENT_FOUGHT_SUDOWOODO
iftrue UnknownScript_0x553c5
- checkbit1 EVENT_GOT_SQUIRTBOTTLE
+ checkevent EVENT_GOT_SQUIRTBOTTLE
iftrue UnknownScript_0x553bf
2writetext UnknownText_0x55561
closetext
loadmovesprites
- setbit1 $00ba
- setbit1 $0768
- clearbit1 $0769
+ setevent $00ba
+ setevent $0768
+ clearevent $0769
end
; 0x553bf
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -11,7 +11,7 @@
; 0x56bf9
UnknownScript_0x56bf9: ; 0x56bf9
- checkbit1 $0044
+ checkevent $0044
iffalse UnknownScript_0x56c19
checkitem COIN_CASE
iffalse UnknownScript_0x56c0e
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -20,7 +20,7 @@
WhitneyScript_0x5400c: ; 0x5400c
faceplayer
- checkbit1 EVENT_BEAT_WHITNEY
+ checkevent EVENT_BEAT_WHITNEY
iftrue UnknownScript_0x54037
loadfont
2writetext UnknownText_0x54122
@@ -30,16 +30,16 @@
loadtrainer WHITNEY, 1
startbattle
returnafterbattle
- setbit1 EVENT_BEAT_WHITNEY
- setbit1 EVENT_MADE_WHITNEY_CRY
+ setevent EVENT_BEAT_WHITNEY
+ setevent EVENT_MADE_WHITNEY_CRY
dotrigger $1
- setbit1 EVENT_BEAT_BEAUTY_VICTORIA
- setbit1 EVENT_BEAT_BEAUTY_SAMANTHA
- setbit1 EVENT_BEAT_LASS_CARRIE
- setbit1 EVENT_BEAT_LASS_BRIDGET
+ setevent EVENT_BEAT_BEAUTY_VICTORIA
+ setevent EVENT_BEAT_BEAUTY_SAMANTHA
+ setevent EVENT_BEAT_LASS_CARRIE
+ setevent EVENT_BEAT_LASS_BRIDGET
UnknownScript_0x54037: ; 0x54037
loadfont
- checkbit1 EVENT_MADE_WHITNEY_CRY
+ checkevent EVENT_MADE_WHITNEY_CRY
iffalse UnknownScript_0x54044
2writetext UnknownText_0x541f4
closetext
@@ -48,7 +48,7 @@
; 0x54044
UnknownScript_0x54044: ; 0x54044
- checkbit1 EVENT_GOT_TM45_ATTRACT
+ checkevent EVENT_GOT_TM45_ATTRACT
iftrue UnknownScript_0x54077
checkbit2 $001d
iftrue UnknownScript_0x54064
@@ -66,7 +66,7 @@
keeptextopen
verbosegiveitem TM_45, 1
iffalse UnknownScript_0x5407b
- setbit1 EVENT_GOT_TM45_ATTRACT
+ setevent EVENT_GOT_TM45_ATTRACT
2writetext UnknownText_0x54302
closetext
loadmovesprites
@@ -134,7 +134,7 @@
loadmovesprites
applymovement $4, BridgetWalksAwayMovement
dotrigger $0
- clearbit1 EVENT_MADE_WHITNEY_CRY
+ clearevent EVENT_MADE_WHITNEY_CRY
end
; 0x540bb
@@ -227,7 +227,7 @@
GoldenrodGymGuyScript: ; 0x540f7
faceplayer
- checkbit1 EVENT_BEAT_WHITNEY
+ checkevent EVENT_BEAT_WHITNEY
iftrue .GoldenrodGymGuyWinScript
loadfont
2writetext GoldenrodGymGuyText
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -16,7 +16,7 @@
OfficerScript_0x550ec: ; 0x550ec
faceplayer
loadfont
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x550fa
2writetext UnknownText_0x55160
closetext
--- a/maps/GoldenrodPokeCenter1F.asm
+++ b/maps/GoldenrodPokeCenter1F.asm
@@ -18,7 +18,7 @@
; 0x60f9e
UnknownScript_0x60f9e: ; 0x60f9e
- checkbit1 EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
+ checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
iftrue UnknownScript_0x60fd8
playsound $0023
moveperson $3, $0, $7
@@ -31,8 +31,8 @@
2writetext UnknownText_0x622f0
closetext
verbosegiveitem GS_BALL, 1
- setbit1 EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
- setbit1 EVENT_CAN_GIVE_GS_BALL_TO_KURT
+ setevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
+ setevent EVENT_CAN_GIVE_GS_BALL_TO_KURT
2writetext UnknownText_0x62359
closetext
loadmovesprites
@@ -52,7 +52,7 @@
; 0x60fe3
UnknownScript_0x60fe3: ; 0x60fe3
- checkbit1 EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
+ checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
iftrue UnknownScript_0x6101d
playsound $0023
moveperson $3, $0, $7
@@ -65,8 +65,8 @@
2writetext UnknownText_0x622f0
closetext
verbosegiveitem GS_BALL, 1
- setbit1 EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
- setbit1 EVENT_CAN_GIVE_GS_BALL_TO_KURT
+ setevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
+ setevent EVENT_CAN_GIVE_GS_BALL_TO_KURT
2writetext UnknownText_0x62359
closetext
loadmovesprites
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -34,15 +34,15 @@
pause 15
writebyte $2
special $003e
- setbit1 $0044
- setbit1 $077c
- setbit1 $06c4
- clearbit1 $0762
- setbit1 $0737
- clearbit1 $0738
+ setevent $0044
+ setevent $077c
+ setevent $06c4
+ clearevent $0762
+ setevent $0737
+ clearevent $0738
domaptrigger GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F, $1
special $001b
- checkbit1 EVENT_GOT_SS_TICKET_FROM_ELM
+ checkevent EVENT_GOT_SS_TICKET_FROM_ELM
iftrue UnknownScript_0x181497
specialphonecall $5
UnknownScript_0x181497: ; 0x181497
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -38,25 +38,25 @@
UnknownScript_0x7e4d8: ; 0x7e4d8
disappear 2
- clearbit1 EVENT_BOULDER_IN_ICE_PATH_1
+ clearevent EVENT_BOULDER_IN_ICE_PATH_1
2jump UnknownScript_0x7e4f8
; 0x7e4e0
UnknownScript_0x7e4e0: ; 0x7e4e0
disappear 3
- clearbit1 EVENT_BOULDER_IN_ICE_PATH_2
+ clearevent EVENT_BOULDER_IN_ICE_PATH_2
2jump UnknownScript_0x7e4f8
; 0x7e4e8
UnknownScript_0x7e4e8: ; 0x7e4e8
disappear 4
- clearbit1 EVENT_BOULDER_IN_ICE_PATH_3
+ clearevent EVENT_BOULDER_IN_ICE_PATH_3
2jump UnknownScript_0x7e4f8
; 0x7e4f0
UnknownScript_0x7e4f0: ; 0x7e4f0
disappear 5
- clearbit1 EVENT_BOULDER_IN_ICE_PATH_4
+ clearevent EVENT_BOULDER_IN_ICE_PATH_4
2jump UnknownScript_0x7e4f8
; 0x7e4f8
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -11,7 +11,7 @@
; 0x6eb03
UnknownScript_0x6eb03: ; 0x6eb03
- checkbit1 EVENT_GOT_HM01_CUT
+ checkevent EVENT_GOT_HM01_CUT
iftrue UnknownScript_0x6eb34
copybytetovar FarfetchdPosition
if_equal $1, UnknownScript_0x6eb35
@@ -91,7 +91,7 @@
YoungsterScript_0x6eb7b: ; 0x6eb7b
faceplayer
loadfont
- checkbit1 $0029
+ checkevent $0029
iftrue UnknownScript_0x6eb89
2writetext UnknownText_0x6ef5c
closetext
@@ -326,8 +326,8 @@
appear $2
loadvar FarfetchdPosition, $a
appear $4
- setbit1 $06f7
- setbit1 $0029
+ setevent $06f7
+ setevent $0029
end
; 0x6ed74
@@ -373,21 +373,21 @@
BlackBeltScript_0x6edae: ; 0x6edae
faceplayer
loadfont
- checkbit1 EVENT_GOT_HM01_CUT
+ checkevent EVENT_GOT_HM01_CUT
iftrue UnknownScript_0x6edd8
2writetext UnknownText_0x6f099
keeptextopen
verbosegiveitem HM_01, 1
- setbit1 EVENT_GOT_HM01_CUT
+ setevent EVENT_GOT_HM01_CUT
2writetext UnknownText_0x6f141
closetext
loadmovesprites
- setbit1 $06e9
- setbit1 $06f3
- setbit1 $06f4
- clearbit1 $06f5
- clearbit1 $06f6
- clearbit1 $06f7
+ setevent $06e9
+ setevent $06f3
+ setevent $06f4
+ clearevent $06f5
+ clearevent $06f6
+ clearevent $06f7
end
; 0x6edd8
@@ -401,13 +401,13 @@
RockerScript_0x6edde: ; 0x6edde
faceplayer
loadfont
- checkbit1 EVENT_GOT_TM02_HEADBUTT
+ checkevent EVENT_GOT_TM02_HEADBUTT
iftrue UnknownScript_0x6edf3
2writetext UnknownText_0x6f21b
keeptextopen
verbosegiveitem TM_02, 1
iffalse UnknownScript_0x6edf7
- setbit1 EVENT_GOT_TM02_HEADBUTT
+ setevent EVENT_GOT_TM02_HEADBUTT
UnknownScript_0x6edf3: ; 0x6edf3
2writetext UnknownText_0x6f26d
closetext
@@ -491,7 +491,7 @@
; 0x6ee27
MapIlexForestSignpost4Script: ; 0x6ee27
- checkbit1 $00c0
+ checkevent $00c0
iftrue UnknownScript_0x6ee30
2jump UnknownScript_0x6ee35
; 0x6ee30
@@ -514,10 +514,10 @@
UnknownScript_0x6ee42: ; 0x6ee42
takeitem GS_BALL, 1
- clearbit1 $00c0
- setbit1 $07a4
+ clearevent $00c0
+ setevent $07a4
disappear $8
- clearbit1 $06eb
+ clearevent $06eb
2writetext UnknownText_0x6f43b
closetext
loadmovesprites
--- a/maps/IndigoPlateauPokeCenter1F.asm
+++ b/maps/IndigoPlateauPokeCenter1F.asm
@@ -24,27 +24,27 @@
domaptrigger GROUP_KARENS_ROOM, MAP_KARENS_ROOM, $0
domaptrigger GROUP_LANCES_ROOM, MAP_LANCES_ROOM, $0
domaptrigger GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME, $0
- clearbit1 $0309
- clearbit1 EVENT_WILLS_ROOM_EXIT_OPEN
- clearbit1 EVENT_WILLS_ROOM_ENTRANCE_CLOSED
- clearbit1 EVENT_KOGAS_ROOM_EXIT_OPEN
- clearbit1 EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
- clearbit1 EVENT_BRUNOS_ROOM_EXIT_OPEN
- clearbit1 EVENT_KARENS_ROOM_ENTRANCE_CLOSED
- clearbit1 EVENT_KARENS_ROOM_EXIT_OPEN
- clearbit1 EVENT_LANCES_ROOM_ENTRANCE_CLOSED
- clearbit1 $0312
- clearbit1 $05b8
- clearbit1 $05b9
- clearbit1 $05ba
- clearbit1 EVENT_BEAT_ELITE_4_KAREN
- clearbit1 EVENT_BEAT_CHAMPION_LANCE
- setbit1 $075f
+ clearevent $0309
+ clearevent EVENT_WILLS_ROOM_EXIT_OPEN
+ clearevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
+ clearevent EVENT_KOGAS_ROOM_EXIT_OPEN
+ clearevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
+ clearevent EVENT_BRUNOS_ROOM_EXIT_OPEN
+ clearevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED
+ clearevent EVENT_KARENS_ROOM_EXIT_OPEN
+ clearevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
+ clearevent $0312
+ clearevent $05b8
+ clearevent $05b9
+ clearevent $05ba
+ clearevent EVENT_BEAT_ELITE_4_KAREN
+ clearevent EVENT_BEAT_CHAMPION_LANCE
+ setevent $075f
return
; 0x180053
UnknownScript_0x180053: ; 0x180053
- checkbit1 EVENT_BEAT_RIVAL_IN_MT_MOON
+ checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
iffalse UnknownScript_0x18012b
checkbit2 $005d
iftrue UnknownScript_0x18012b
@@ -67,7 +67,7 @@
; 0x180094
UnknownScript_0x180094: ; 0x180094
- checkbit1 EVENT_BEAT_RIVAL_IN_MT_MOON
+ checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
iffalse UnknownScript_0x18012b
checkbit2 $005d
iftrue UnknownScript_0x18012b
@@ -90,10 +90,10 @@
2writetext UnknownText_0x1801f5
closetext
loadmovesprites
- setbit1 $077b
- checkbit1 EVENT_GOT_TOTODILE_FROM_ELM
+ setevent $077b
+ checkevent EVENT_GOT_TOTODILE_FROM_ELM
iftrue UnknownScript_0x1800f3
- checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM
+ checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue UnknownScript_0x180103
winlosstext UnknownText_0x180295, UnknownText_0x1802fd
setlasttalked $5
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -24,11 +24,11 @@
; 0x180bc1
UnknownScript_0x180bc1: ; 0x180bc1
- checkbit1 EVENT_KARENS_ROOM_ENTRANCE_CLOSED
+ checkevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED
iffalse UnknownScript_0x180bcb
changeblock $4, $e, $2a
UnknownScript_0x180bcb: ; 0x180bcb
- checkbit1 EVENT_KARENS_ROOM_EXIT_OPEN
+ checkevent EVENT_KARENS_ROOM_EXIT_OPEN
iffalse UnknownScript_0x180bd5
changeblock $4, $2, $16
UnknownScript_0x180bd5: ; 0x180bd5
@@ -44,7 +44,7 @@
reloadmappart
loadmovesprites
dotrigger $1
- setbit1 EVENT_KARENS_ROOM_ENTRANCE_CLOSED
+ setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED
waitbutton
end
; 0x180bee
@@ -52,7 +52,7 @@
KarenScript_0x180bee: ; 0x180bee
faceplayer
loadfont
- checkbit1 EVENT_BEAT_ELITE_4_KAREN
+ checkevent EVENT_BEAT_ELITE_4_KAREN
iftrue UnknownScript_0x180c1c
2writetext UnknownText_0x180c27
closetext
@@ -61,7 +61,7 @@
loadtrainer KAREN, 1
startbattle
returnafterbattle
- setbit1 EVENT_BEAT_ELITE_4_KAREN
+ setevent EVENT_BEAT_ELITE_4_KAREN
loadfont
2writetext UnknownText_0x180d29
closetext
@@ -70,7 +70,7 @@
changeblock $4, $2, $16
reloadmappart
loadmovesprites
- setbit1 EVENT_KARENS_ROOM_EXIT_OPEN
+ setevent EVENT_KARENS_ROOM_EXIT_OPEN
waitbutton
end
; 0x180c1c
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -24,11 +24,11 @@
; 0x18072d
UnknownScript_0x18072d: ; 0x18072d
- checkbit1 EVENT_WILLS_ROOM_ENTRANCE_CLOSED
+ checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
iffalse UnknownScript_0x180737
changeblock $4, $e, $2a
UnknownScript_0x180737: ; 0x180737
- checkbit1 EVENT_KOGAS_ROOM_EXIT_OPEN
+ checkevent EVENT_KOGAS_ROOM_EXIT_OPEN
iffalse UnknownScript_0x180741
changeblock $4, $2, $16
UnknownScript_0x180741: ; 0x180741
@@ -44,7 +44,7 @@
reloadmappart
loadmovesprites
dotrigger $1
- setbit1 EVENT_WILLS_ROOM_ENTRANCE_CLOSED
+ setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
waitbutton
end
; 0x18075a
@@ -52,7 +52,7 @@
KogaScript_0x18075a: ; 0x18075a
faceplayer
loadfont
- checkbit1 $05b9
+ checkevent $05b9
iftrue UnknownScript_0x180788
2writetext UnknownText_0x180793
closetext
@@ -61,7 +61,7 @@
loadtrainer KOGA, 1
startbattle
returnafterbattle
- setbit1 $05b9
+ setevent $05b9
loadfont
2writetext UnknownText_0x1808ca
closetext
@@ -70,7 +70,7 @@
changeblock $4, $2, $16
reloadmappart
loadmovesprites
- setbit1 EVENT_KOGAS_ROOM_EXIT_OPEN
+ setevent EVENT_KOGAS_ROOM_EXIT_OPEN
waitbutton
end
; 0x180788
--- a/maps/KrissHouse1F.asm
+++ b/maps/KrissHouse1F.asm
@@ -19,7 +19,7 @@
; 0x7a4d8
UnknownScript_0x7a4d8: ; 0x7a4d8
- setbit1 $0000
+ setevent $0000
; 0x7a4db
UnknownScript_0x7a4db: ; 0x7a4db
@@ -26,7 +26,7 @@
playmusic $004e
showemote $0, $2, 15
spriteface $0, $2
- checkbit1 $0000
+ checkevent $0000
iffalse UnknownScript_0x7a4f2
applymovement $2, MovementData_0x7a5fc
2jump UnknownScript_0x7a4f6
@@ -44,8 +44,8 @@
setbit2 $0002
addcellnum $1
dotrigger $1
- setbit1 $06c7
- clearbit1 $06c8
+ setevent $06c7
+ clearevent $06c8
2writetext UnknownText_0x7a6bd
keeptextopen
special $0025
@@ -86,9 +86,9 @@
2writetext UnknownText_0x7a850
closetext
loadmovesprites
- checkbit1 $0000
+ checkevent $0000
iftrue UnknownScript_0x7a55d
- checkbit1 $0001
+ checkevent $0001
iffalse UnknownScript_0x7a564
2jump UnknownScript_0x7a56b
; 0x7a55d
@@ -125,17 +125,17 @@
MomScript_0x7a582: ; 0x7a582
faceplayer
- setbit1 $0001
+ setevent $0001
checktriggers
iffalse UnknownScript_0x7a572
loadfont
- checkbit1 $0076
+ checkevent $0076
iftrue UnknownScript_0x7a5af
- checkbit1 EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
+ checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
iftrue UnknownScript_0x7a5b8
- checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iftrue UnknownScript_0x7a5b5
- checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM
+ checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue UnknownScript_0x7a5a9
2writetext UnknownText_0x7a8b5
closetext
@@ -158,9 +158,9 @@
; 0x7a5b5
UnknownScript_0x7a5b5: ; 0x7a5b5
- setbit1 $0076
+ setevent $0076
UnknownScript_0x7a5b8: ; 0x7a5b8
- setbit1 EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
+ setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
special $0022
closetext
loadmovesprites
--- a/maps/KrissHouse2F.asm
+++ b/maps/KrissHouse2F.asm
@@ -18,8 +18,8 @@
UnknownScript_0x7abb4: ; 0x7abb4
special $004a
- setbit1 $0007
- checkbit1 $0036
+ setevent $0007
+ checkevent $0036
iftrue UnknownScript_0x7abc4
jumpstd $0018
return
@@ -55,7 +55,7 @@
; 0x7abd4
MapKrissHouse2FSignpost4: ; 0x7abd4
- dw $02cc ; bit1
+ dw $02cc ; event
dw MapKrissHouse2FSignpost4Script
; 0x7abd8
@@ -64,9 +64,9 @@
; 0x7abda
MapKrissHouse2FSignpost2Script: ; 0x7abda
- checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM
+ checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue UnknownScript_0x7ac07
- checkbit1 EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE
+ checkevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE
iftrue UnknownScript_0x7ac0a
playmusic $001d
loadfont
@@ -80,7 +80,7 @@
2writetext UnknownText_0x7ac84
pause 45
loadmovesprites
- setbit1 EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE
+ setevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE
end
; 0x7ac07
--- a/maps/KrissNeighborsHouse.asm
+++ b/maps/KrissNeighborsHouse.asm
@@ -19,9 +19,9 @@
; 0x7acf7
MapKrissNeighborsHouseSignpost2Script: ; 0x7acf7
- checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM
+ checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue UnknownScript_0x7ad24
- checkbit1 EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE
+ checkevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE
iftrue UnknownScript_0x7ad27
playmusic $001d
loadfont
@@ -35,7 +35,7 @@
2writetext UnknownText_0x7ae9b
pause 45
loadmovesprites
- setbit1 EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE
+ setevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE
end
; 0x7ad24
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -11,9 +11,9 @@
; 0x18e154
UnknownScript_0x18e154: ; 0x18e154
- checkbit1 EVENT_CLEARED_SLOWPOKE_WELL
+ checkevent EVENT_CLEARED_SLOWPOKE_WELL
iffalse UnknownScript_0x18e177
- checkbit1 $00c0
+ checkevent $00c0
iftrue UnknownScript_0x18e177
checkbit2 $0050
iftrue UnknownScript_0x18e16f
@@ -36,15 +36,15 @@
KurtScript_0x18e178: ; 0x18e178
faceplayer
loadfont
- checkbit1 $0035
+ checkevent $0035
iftrue UnknownScript_0x18e1cc
- checkbit1 EVENT_CLEARED_SLOWPOKE_WELL
+ checkevent EVENT_CLEARED_SLOWPOKE_WELL
iftrue UnknownScript_0x18e1bf
2writetext UnknownText_0x18e473
closetext
loadmovesprites
special $006a
- setbit1 $06fa
+ setevent $06fa
checkcode $9
if_equal $1, UnknownScript_0x18e1ab
spriteface $0, $0
@@ -73,30 +73,30 @@
keeptextopen
verbosegiveitem LURE_BALL, 1
iffalse UnknownScript_0x18e2b2
- setbit1 $0035
+ setevent $0035
UnknownScript_0x18e1cc: ; 0x18e1cc
- checkbit1 $0000
+ checkevent $0000
iftrue UnknownScript_0x18e29f
- checkbit1 $0258
+ checkevent $0258
iftrue UnknownScript_0x18e2b4
- checkbit1 $0259
+ checkevent $0259
iftrue UnknownScript_0x18e2ca
- checkbit1 $025a
+ checkevent $025a
iftrue UnknownScript_0x18e2e0
- checkbit1 $025b
+ checkevent $025b
iftrue UnknownScript_0x18e2f6
- checkbit1 $025c
+ checkevent $025c
iftrue UnknownScript_0x18e30c
- checkbit1 $025d
+ checkevent $025d
iftrue UnknownScript_0x18e322
- checkbit1 $025e
+ checkevent $025e
iftrue UnknownScript_0x18e338
- checkbit1 EVENT_CAN_GIVE_GS_BALL_TO_KURT
+ checkevent EVENT_CAN_GIVE_GS_BALL_TO_KURT
iftrue UnknownScript_0x18e34e
UnknownScript_0x18e202: ; 0x18e202
- checkbit1 $0001
+ checkevent $0001
iftrue UnknownScript_0x18e212
- checkbit1 $0002
+ checkevent $0002
iftrue UnknownScript_0x18e212
2writetext UnknownText_0x18e6c9
closetext
@@ -115,9 +115,9 @@
iftrue UnknownScript_0x18e249
checkitem PNK_APRICORN
iftrue UnknownScript_0x18e249
- checkbit1 $0001
+ checkevent $0001
iftrue UnknownScript_0x18e2ae
- checkbit1 $0002
+ checkevent $0002
iftrue UnknownScript_0x18e243
loadmovesprites
end
@@ -133,7 +133,7 @@
UnknownScript_0x18e249: ; 0x18e249
2writetext UnknownText_0x18e736
keeptextopen
- setbit1 $0002
+ setevent $0002
special $0056
if_equal $0, UnknownScript_0x18e2a5
if_equal $59, UnknownScript_0x18e275
@@ -142,42 +142,42 @@
if_equal $61, UnknownScript_0x18e287
if_equal $63, UnknownScript_0x18e28d
if_equal $65, UnknownScript_0x18e293
- setbit1 $0258
+ setevent $0258
2jump UnknownScript_0x18e299
; 0x18e275
UnknownScript_0x18e275: ; 0x18e275
- setbit1 $0259
+ setevent $0259
2jump UnknownScript_0x18e299
; 0x18e27b
UnknownScript_0x18e27b: ; 0x18e27b
- setbit1 $025a
+ setevent $025a
2jump UnknownScript_0x18e299
; 0x18e281
UnknownScript_0x18e281: ; 0x18e281
- setbit1 $025b
+ setevent $025b
2jump UnknownScript_0x18e299
; 0x18e287
UnknownScript_0x18e287: ; 0x18e287
- setbit1 $025c
+ setevent $025c
2jump UnknownScript_0x18e299
; 0x18e28d
UnknownScript_0x18e28d: ; 0x18e28d
- setbit1 $025d
+ setevent $025d
2jump UnknownScript_0x18e299
; 0x18e293
UnknownScript_0x18e293: ; 0x18e293
- setbit1 $025e
+ setevent $025e
2jump UnknownScript_0x18e299
; 0x18e299
UnknownScript_0x18e299: ; 0x18e299
- setbit1 $0000
+ setevent $0000
setbit2 $0050
UnknownScript_0x18e29f: ; 0x18e29f
2writetext UnknownText_0x18e779
@@ -194,7 +194,7 @@
; 0x18e2ab
UnknownScript_0x18e2ab: ; 0x18e2ab
- setbit1 $0001
+ setevent $0001
UnknownScript_0x18e2ae: ; 0x18e2ae
2writetext UnknownText_0x18e82a
closetext
@@ -211,7 +211,7 @@
verbosegiveitem2 LEVEL_BALL, $16
iffalse UnknownScript_0x18e2b2
UnknownScript_0x18e2c4: ; 0x18e2c4
- clearbit1 $0258
+ clearevent $0258
2jump UnknownScript_0x18e2ab
; 0x18e2ca
@@ -223,7 +223,7 @@
verbosegiveitem2 LURE_BALL, $16
iffalse UnknownScript_0x18e2b2
UnknownScript_0x18e2da: ; 0x18e2da
- clearbit1 $0259
+ clearevent $0259
2jump UnknownScript_0x18e2ab
; 0x18e2e0
@@ -235,7 +235,7 @@
verbosegiveitem2 MOON_BALL, $16
iffalse UnknownScript_0x18e2b2
UnknownScript_0x18e2f0: ; 0x18e2f0
- clearbit1 $025a
+ clearevent $025a
2jump UnknownScript_0x18e2ab
; 0x18e2f6
@@ -247,7 +247,7 @@
verbosegiveitem2 FRIEND_BALL, $16
iffalse UnknownScript_0x18e2b2
UnknownScript_0x18e306: ; 0x18e306
- clearbit1 $025b
+ clearevent $025b
2jump UnknownScript_0x18e2ab
; 0x18e30c
@@ -259,7 +259,7 @@
verbosegiveitem2 FAST_BALL, $16
iffalse UnknownScript_0x18e2b2
UnknownScript_0x18e31c: ; 0x18e31c
- clearbit1 $025c
+ clearevent $025c
2jump UnknownScript_0x18e2ab
; 0x18e322
@@ -271,7 +271,7 @@
verbosegiveitem2 HEAVY_BALL, $16
iffalse UnknownScript_0x18e2b2
UnknownScript_0x18e332: ; 0x18e332
- clearbit1 $025d
+ clearevent $025d
2jump UnknownScript_0x18e2ab
; 0x18e338
@@ -283,12 +283,12 @@
verbosegiveitem2 LOVE_BALL, $16
iffalse UnknownScript_0x18e2b2
UnknownScript_0x18e348: ; 0x18e348
- clearbit1 $025e
+ clearevent $025e
2jump UnknownScript_0x18e2ab
; 0x18e34e
UnknownScript_0x18e34e: ; 0x18e34e
- checkbit1 $00bf
+ checkevent $00bf
iftrue UnknownScript_0x18e368
checkitem GS_BALL
iffalse UnknownScript_0x18e202
@@ -295,7 +295,7 @@
2writetext UnknownText_0x18e8ab
closetext
loadmovesprites
- setbit1 $00bf
+ setevent $00bf
takeitem GS_BALL, 1
setbit2 $0050
end
@@ -316,9 +316,9 @@
2writetext UnknownText_0x18e95c
closetext
loadmovesprites
- setbit1 $00c0
- clearbit1 EVENT_CAN_GIVE_GS_BALL_TO_KURT
- clearbit1 $00bf
+ setevent $00c0
+ clearevent EVENT_CAN_GIVE_GS_BALL_TO_KURT
+ clearevent $00bf
special $006a
pause 20
showemote $0, $2, 30
@@ -337,7 +337,7 @@
UnknownScript_0x18e3ac: ; 0x18e3ac
playsound $0023
disappear $2
- clearbit1 $07a4
+ clearevent $07a4
waitbutton
special $003d
domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $2
@@ -347,10 +347,10 @@
KurtScript_0x18e3bd: ; 0x18e3bd
faceplayer
loadfont
- checkbit1 $00bf
+ checkevent $00bf
iftrue UnknownScript_0x18e3e0
UnknownScript_0x18e3c5: ; 0x18e3c5
- checkbit1 $00bb
+ checkevent $00bb
iffalse UnknownScript_0x18e3d4
2writetext UnknownText_0x18e7d8
closetext
@@ -364,7 +364,7 @@
closetext
loadmovesprites
spriteface $5, $1
- setbit1 $00bb
+ setevent $00bb
end
; 0x18e3e0
@@ -380,17 +380,17 @@
TwinScript_0x18e3ed: ; 0x18e3ed
faceplayer
- checkbit1 $0000
+ checkevent $0000
iftrue UnknownScript_0x18e42f
- checkbit1 $0001
+ checkevent $0001
iftrue UnknownScript_0x18e448
- checkbit1 $00c0
+ checkevent $00c0
iftrue UnknownScript_0x18e420
- checkbit1 $0030
+ checkevent $0030
iftrue UnknownScript_0x18e427
- checkbit1 EVENT_CLEARED_SLOWPOKE_WELL
+ checkevent EVENT_CLEARED_SLOWPOKE_WELL
iftrue UnknownScript_0x18e419
- checkbit1 $06fa
+ checkevent $06fa
iftrue UnknownScript_0x18e420
loadfont
2writetext UnknownText_0x18e9b5
@@ -427,7 +427,7 @@
faceplayer
UnknownScript_0x18e42f: ; 0x18e42f
loadfont
- checkbit1 $00bf
+ checkevent $00bf
iftrue UnknownScript_0x18e43f
2writetext UnknownText_0x18eab2
closetext
--- a/maps/LakeofRage.asm
+++ b/maps/LakeofRage.asm
@@ -42,7 +42,7 @@
; 0x70022
LanceScript_0x70022: ; 0x70022
- checkbit1 EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE
+ checkevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE
iftrue UnknownScript_0x70057
loadfont
2writetext UnknownText_0x70157
@@ -58,8 +58,8 @@
playsound $0013
applymovement $2, MovementData_0x70155
disappear $2
- clearbit1 $06d5
- setbit1 EVENT_DECIDED_TO_HELP_LANCE
+ clearevent $06d5
+ setevent EVENT_DECIDED_TO_HELP_LANCE
domaptrigger GROUP_MAHOGANY_MART_1F, MAP_MAHOGANY_MART_1F, $1
end
; 0x7004e
@@ -68,7 +68,7 @@
2writetext UnknownText_0x70371
closetext
loadmovesprites
- setbit1 EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE
+ setevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE
end
; 0x70057
@@ -110,7 +110,7 @@
GrampsScript_0x7008e: ; 0x7008e
faceplayer
loadfont
- checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT
+ checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x7009c
2writetext UnknownText_0x703f8
closetext
@@ -140,7 +140,7 @@
MapLakeofRageSignpost1Script: ; 0x700ab
loadfont
2writetext UnknownText_0x70903
- checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT
+ checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x700b8
closetext
loadmovesprites
@@ -273,21 +273,21 @@
SuperNerdScript_0x7010e: ; 0x7010e
faceplayer
loadfont
- checkbit1 EVENT_GOT_BLACKBELT_FROM_WESLEY
+ checkevent EVENT_GOT_BLACKBELT_FROM_WESLEY
iftrue UnknownScript_0x7013c
checkcode $b
if_not_equal WEDNESDAY, UnknownScript_0x70142
- checkbit1 EVENT_MET_WESLEY_OF_WEDNESDAY
+ checkevent EVENT_MET_WESLEY_OF_WEDNESDAY
iftrue UnknownScript_0x70129
2writetext UnknownText_0x70784
keeptextopen
- setbit1 EVENT_MET_WESLEY_OF_WEDNESDAY
+ setevent EVENT_MET_WESLEY_OF_WEDNESDAY
UnknownScript_0x70129: ; 0x70129
2writetext UnknownText_0x707dd
keeptextopen
verbosegiveitem BLACKBELT, 1
iffalse UnknownScript_0x70140
- setbit1 EVENT_GOT_BLACKBELT_FROM_WESLEY
+ setevent EVENT_GOT_BLACKBELT_FROM_WESLEY
2writetext UnknownText_0x7080b
closetext
loadmovesprites
--- a/maps/LakeofRageHiddenPowerHouse.asm
+++ b/maps/LakeofRageHiddenPowerHouse.asm
@@ -9,13 +9,13 @@
FisherScript_0x19a527: ; 0x19a527
faceplayer
loadfont
- checkbit1 EVENT_GOT_TM10_HIDDEN_POWER
+ checkevent EVENT_GOT_TM10_HIDDEN_POWER
iftrue UnknownScript_0x19a542
2writetext UnknownText_0x19a54b
keeptextopen
verbosegiveitem TM_10, 1
iffalse UnknownScript_0x19a546
- setbit1 EVENT_GOT_TM10_HIDDEN_POWER
+ setevent EVENT_GOT_TM10_HIDDEN_POWER
2writetext UnknownText_0x19a5de
closetext
loadmovesprites
--- a/maps/LakeofRageMagikarpHouse.asm
+++ b/maps/LakeofRageMagikarpHouse.asm
@@ -9,18 +9,18 @@
FishingGuruScript_0x19a6ae: ; 0x19a6ae
faceplayer
loadfont
- checkbit1 $003a
+ checkevent $003a
iftrue UnknownScript_0x19a6fe
- checkbit1 $0039
+ checkevent $0039
iftrue UnknownScript_0x19a6e0
- checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT
+ checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x19a6d7
- checkbit1 $0038
+ checkevent $0038
iftrue UnknownScript_0x19a6d1
2writetext UnknownText_0x19a72e
closetext
loadmovesprites
- setbit1 $0038
+ setevent $0038
end
; 0x19a6d1
@@ -35,7 +35,7 @@
2writetext UnknownText_0x19a890
closetext
loadmovesprites
- setbit1 $0039
+ setevent $0039
end
; 0x19a6e0
@@ -60,13 +60,13 @@
2writetext UnknownText_0x19a9c3
closetext
loadmovesprites
- clearbit1 $003a
+ clearevent $003a
end
; 0x19a711
UnknownScript_0x19a711: ; 0x19a711
loadmovesprites
- setbit1 $003a
+ setevent $003a
end
; 0x19a716
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -24,11 +24,11 @@
; 0x180e3e
UnknownScript_0x180e3e: ; 0x180e3e
- checkbit1 EVENT_LANCES_ROOM_ENTRANCE_CLOSED
+ checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
iffalse UnknownScript_0x180e48
changeblock $4, $16, $34
UnknownScript_0x180e48: ; 0x180e48
- checkbit1 $0312
+ checkevent $0312
iffalse UnknownScript_0x180e52
changeblock $4, $0, $b
UnknownScript_0x180e52: ; 0x180e52
@@ -44,7 +44,7 @@
reloadmappart
loadmovesprites
dotrigger $1
- setbit1 EVENT_LANCES_ROOM_ENTRANCE_CLOSED
+ setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
end
; 0x180e6a
@@ -69,7 +69,7 @@
startbattle
reloadmapmusic
returnafterbattle
- setbit1 EVENT_BEAT_CHAMPION_LANCE
+ setevent EVENT_BEAT_CHAMPION_LANCE
loadfont
2writetext UnknownText_0x181132
closetext
@@ -78,7 +78,7 @@
changeblock $4, $0, $b
reloadmappart
loadmovesprites
- setbit1 EVENT_LANCES_ROOM_ENTRANCE_CLOSED
+ setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
musicfadeout $0038, $10
pause 30
showemote $0, $2, 15
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -23,7 +23,7 @@
loadfont
checkbit2 $0003
iftrue .UnknownScript_0x7ee8e
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue .UnknownScript_0x7ee80
2writetext UnknownText_0x7effb
closetext
--- a/maps/LavenderPokeCenter1F.asm
+++ b/maps/LavenderPokeCenter1F.asm
@@ -21,7 +21,7 @@
YoungsterScript_0x7e6a9: ; 0x7e6a9
faceplayer
loadfont
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x7e6b7
2writetext UnknownText_0x7e779
closetext
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -9,7 +9,7 @@
PryceScript_0x199a9e: ; 0x199a9e
faceplayer
loadfont
- checkbit1 EVENT_BEAT_PRYCE
+ checkevent EVENT_BEAT_PRYCE
iftrue UnknownScript_0x199ac8
2writetext UnknownText_0x199b8d
closetext
@@ -18,7 +18,7 @@
loadtrainer PRYCE, 1
startbattle
returnafterbattle
- setbit1 EVENT_BEAT_PRYCE
+ setevent EVENT_BEAT_PRYCE
loadfont
2writetext UnknownText_0x199d3b
playsound $009c
@@ -27,18 +27,18 @@
checkcode $7
2call UnknownScript_0x199af6
UnknownScript_0x199ac8: ; 0x199ac8
- checkbit1 EVENT_GOT_TM16_ICY_WIND
+ checkevent EVENT_GOT_TM16_ICY_WIND
iftrue UnknownScript_0x199af0
- setbit1 EVENT_BEAT_SKIER_ROXANNE
- setbit1 EVENT_BEAT_SKIER_CLARISSA
- setbit1 EVENT_BEAT_BOARDER_RONALD
- setbit1 EVENT_BEAT_BOARDER_BRAD
- setbit1 EVENT_BEAT_BOARDER_DOUGLAS
+ setevent EVENT_BEAT_SKIER_ROXANNE
+ setevent EVENT_BEAT_SKIER_CLARISSA
+ setevent EVENT_BEAT_BOARDER_RONALD
+ setevent EVENT_BEAT_BOARDER_BRAD
+ setevent EVENT_BEAT_BOARDER_DOUGLAS
2writetext UnknownText_0x199d55
keeptextopen
verbosegiveitem TM_16, 1
iffalse UnknownScript_0x199af4
- setbit1 EVENT_GOT_TM16_ICY_WIND
+ setevent EVENT_GOT_TM16_ICY_WIND
2writetext UnknownText_0x199def
closetext
loadmovesprites
@@ -215,7 +215,7 @@
MahoganyGymGuyScript: ; 0x199b69
faceplayer
loadfont
- checkbit1 EVENT_BEAT_PRYCE
+ checkevent EVENT_BEAT_PRYCE
iftrue .MahoganyGymGuyWinScript
2writetext MahoganyGymGuyText
closetext
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -24,7 +24,7 @@
; 0x6c35b
UnknownScript_0x6c35b: ; 0x6c35b
- checkbit1 EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
+ checkevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
iftrue UnknownScript_0x6c362
return
; 0x6c362
@@ -37,7 +37,7 @@
PharmacistScript_0x6c367: ; 0x6c367
faceplayer
loadfont
- checkbit1 EVENT_DECIDED_TO_HELP_LANCE
+ checkevent EVENT_DECIDED_TO_HELP_LANCE
iftrue UnknownScript_0x6c375
pokemart $0, $000f
loadmovesprites
@@ -54,7 +54,7 @@
BlackBeltScript_0x6c37b: ; 0x6c37b
faceplayer
loadfont
- checkbit1 EVENT_DECIDED_TO_HELP_LANCE
+ checkevent EVENT_DECIDED_TO_HELP_LANCE
iftrue UnknownScript_0x6c389
2writetext UnknownText_0x6c494
closetext
@@ -99,7 +99,7 @@
changeblock $6, $2, $1e
reloadmappart
loadmovesprites
- setbit1 EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
+ setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
spriteface $4, $2
loadfont
2writetext UnknownText_0x6c5ba
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -42,7 +42,7 @@
PokefanMScript_0x19002e: ; 0x19002e
faceplayer
UnknownScript_0x19002f: ; 0x19002f
- checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT
+ checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x190039
2call UnknownScript_0x190040
end
@@ -100,7 +100,7 @@
GrampsScript_0x19007e: ; 0x19007e
faceplayer
loadfont
- checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT
+ checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x19008c
2writetext UnknownText_0x1901e5
closetext
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -9,9 +9,9 @@
RockerScript_0x9d278: ; 0x9d278
faceplayer
loadfont
- checkbit1 EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
+ checkevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
iftrue UnknownScript_0x9d2fa
- checkbit1 EVENT_GOT_SHUCKIE
+ checkevent EVENT_GOT_SHUCKIE
iftrue UnknownScript_0x9d2a4
2writetext UnknownText_0x9d303
yesorno
@@ -25,7 +25,7 @@
playsound $0091
waitbutton
loadmovesprites
- setbit1 EVENT_GOT_SHUCKIE
+ setevent EVENT_GOT_SHUCKIE
end
; 0x9d2a4
@@ -64,7 +64,7 @@
2writetext UnknownText_0x9d4b1
closetext
loadmovesprites
- setbit1 EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
+ setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
end
; 0x9d2df
@@ -79,7 +79,7 @@
2writetext UnknownText_0x9d4e3
closetext
loadmovesprites
- setbit1 EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
+ setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
end
; 0x9d2ee
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -30,9 +30,9 @@
2writetext UnknownText_0x74105
closetext
loadmovesprites
- checkbit1 EVENT_GOT_TOTODILE_FROM_ELM
+ checkevent EVENT_GOT_TOTODILE_FROM_ELM
iftrue UnknownScript_0x740c3
- checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM
+ checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue UnknownScript_0x740d3
winlosstext UnknownText_0x7419d, UnknownText_0x742e0
setlasttalked $2
@@ -72,7 +72,7 @@
applymovement $2, MovementData_0x740fd
disappear $2
dotrigger $1
- setbit1 EVENT_BEAT_RIVAL_IN_MT_MOON
+ setevent EVENT_BEAT_RIVAL_IN_MT_MOON
playmapmusic
end
; 0x740f9
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -20,7 +20,7 @@
; 0x77093
UnknownScript_0x77093: ; 0x77093
- setbit1 $00ec
+ setevent $00ec
return
; 0x77097
@@ -72,7 +72,7 @@
disappear $2
disappear $3
stopfollow
- clearbit1 $00ec
+ clearevent $00ec
setbit2 $0058
end
; 0x77117
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -9,9 +9,9 @@
BlackBeltScript_0x7e1f6: ; 0x7e1f6
faceplayer
loadfont
- checkbit1 EVENT_GOT_TYROGUE_FROM_KIYO
+ checkevent EVENT_GOT_TYROGUE_FROM_KIYO
iftrue UnknownScript_0x7e231
- checkbit1 $04a9
+ checkevent $04a9
iftrue UnknownScript_0x7e217
2writetext UnknownText_0x7e24d
closetext
@@ -20,7 +20,7 @@
loadtrainer BLACKBELT_T, KIYO
startbattle
returnafterbattle
- setbit1 $04a9
+ setevent $04a9
loadfont
UnknownScript_0x7e217: ; 0x7e217
2writetext UnknownText_0x7e2c0
@@ -32,7 +32,7 @@
playsound $0002
waitbutton
givepoke TYROGUE, 10, 0, 0
- setbit1 EVENT_GOT_TYROGUE_FROM_KIYO
+ setevent EVENT_GOT_TYROGUE_FROM_KIYO
UnknownScript_0x7e231: ; 0x7e231
2writetext UnknownText_0x7e36a
closetext
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -36,7 +36,7 @@
playsound $0091
waitbutton
itemnotify
- setbit1 EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON
+ setevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON
blackoutmod GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY
2writetext UnknownText_0x196feb
keeptextopen
@@ -56,7 +56,7 @@
loadfont
checkitem RED_SCALE
iftrue UnknownScript_0x196eb0
- checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iftrue UnknownScript_0x196eaa
2writetext UnknownText_0x197134
closetext
@@ -128,29 +128,29 @@
2writetext UnknownText_0x197134
closetext
loadmovesprites
- setbit1 $06bd
- setbit1 $0792
- clearbit1 $0793
+ setevent $06bd
+ setevent $0792
+ clearevent $0793
dotrigger $1
domaptrigger GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY, $1
domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $3
specialphonecall $2
- clearbit1 $0702
- checkbit1 EVENT_GOT_TOTODILE_FROM_ELM
+ clearevent $0702
+ checkevent EVENT_GOT_TOTODILE_FROM_ELM
iftrue UnknownScript_0x196f49
- checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM
+ checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue UnknownScript_0x196f4d
- setbit1 $0641
+ setevent $0641
end
; 0x196f49
UnknownScript_0x196f49: ; 0x196f49
- setbit1 $0642
+ setevent $0642
end
; 0x196f4d
UnknownScript_0x196f4d: ; 0x196f4d
- setbit1 $0640
+ setevent $0640
end
; 0x196f51
--- a/maps/MrPsychicsHouse.asm
+++ b/maps/MrPsychicsHouse.asm
@@ -9,13 +9,13 @@
FishingGuruScript_0x18a77a: ; 0x18a77a
faceplayer
loadfont
- checkbit1 EVENT_GOT_TM29_PSYCHIC
+ checkevent EVENT_GOT_TM29_PSYCHIC
iftrue UnknownScript_0x18a78f
2writetext UnknownText_0x18a798
keeptextopen
verbosegiveitem TM_29, 1
iffalse UnknownScript_0x18a793
- setbit1 EVENT_GOT_TM29_PSYCHIC
+ setevent EVENT_GOT_TM29_PSYCHIC
UnknownScript_0x18a78f: ; 0x18a78f
2writetext UnknownText_0x18a7bb
closetext
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -17,13 +17,13 @@
TeacherScript_0x5c008: ; 0x5c008
faceplayer
loadfont
- checkbit1 EVENT_GOT_QUICK_CLAW
+ checkevent EVENT_GOT_QUICK_CLAW
iftrue UnknownScript_0x5c01d
2writetext UnknownText_0x5c265
keeptextopen
verbosegiveitem QUICK_CLAW, 1
iffalse UnknownScript_0x5c021
- setbit1 EVENT_GOT_QUICK_CLAW
+ setevent EVENT_GOT_QUICK_CLAW
UnknownScript_0x5c01d: ; 0x5c01d
2writetext UnknownText_0x5c30d
closetext
@@ -92,11 +92,11 @@
iftrue UnknownScript_0x5c088
checkcellnum $5
iftrue UnknownScript_0x5c108
- checkbit1 $025f
+ checkevent $025f
iftrue UnknownScript_0x5c071
2writetext UnknownText_0x5c4f3
keeptextopen
- setbit1 $025f
+ setevent $025f
2call UnknownScript_0x5c0fc
2jump UnknownScript_0x5c074
; 0x5c071
@@ -122,13 +122,13 @@
if_equal $1, UnknownScript_0x5c0b9
if_equal $0, UnknownScript_0x5c0bf
UnknownScript_0x5c0a7: ; 0x5c0a7
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x5c0f3
UnknownScript_0x5c0ad: ; 0x5c0ad
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x5c0e6
UnknownScript_0x5c0b3: ; 0x5c0b3
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x5c0d9
UnknownScript_0x5c0b9: ; 0x5c0b9
checkbit2 $0047
@@ -271,11 +271,11 @@
iftrue UnknownScript_0x5c19b
checkpoke MARILL
iffalse UnknownScript_0x5c189
- checkbit1 EVENT_SHOWED_BEVERLY_MARILL
+ checkevent EVENT_SHOWED_BEVERLY_MARILL
iftrue UnknownScript_0x5c160
2writetext UnknownText_0x5c5bd
keeptextopen
- setbit1 EVENT_SHOWED_BEVERLY_MARILL
+ setevent EVENT_SHOWED_BEVERLY_MARILL
2call UnknownScript_0x5c18f
2jump UnknownScript_0x5c163
; 0x5c160
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -24,7 +24,7 @@
UnknownScript_0x1a800f: ; 0x1a800f
setbit2 $0041
- clearbit1 $0076
+ clearevent $0076
return
; 0x1a8016
@@ -80,11 +80,11 @@
TeacherScript_0x1a806f: ; 0x1a806f
faceplayer
loadfont
- checkbit1 EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
+ checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
iftrue UnknownScript_0x1a8095
- checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iftrue UnknownScript_0x1a808f
- checkbit1 EVENT_GOT_A_POKEMON_FROM_ELM
+ checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue UnknownScript_0x1a8089
2writetext UnknownText_0x1a80f7
closetext
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -13,13 +13,13 @@
OakScript_0x19b3c8: ; 0x19b3c8
faceplayer
loadfont
- checkbit1 $074f
+ checkevent $074f
iftrue UnknownScript_0x19b3ea
- checkbit1 $00e1
+ checkevent $00e1
iftrue UnknownScript_0x19b3dd
2writetext UnknownText_0x19b427
keeptextopen
- setbit1 $00e1
+ setevent $00e1
UnknownScript_0x19b3dd: ; 0x19b3dd
checkcode $7
if_equal $10, UnknownScript_0x19b3f7
@@ -40,7 +40,7 @@
UnknownScript_0x19b3f7: ; 0x19b3f7
2writetext UnknownText_0x19b4fc
keeptextopen
- setbit1 $074f
+ setevent $074f
2jump UnknownScript_0x19b3ea
; 0x19b401
--- a/maps/OlivineCafe.asm
+++ b/maps/OlivineCafe.asm
@@ -9,12 +9,12 @@
SailorScript_0x9c8c1: ; 0x9c8c1
faceplayer
loadfont
- checkbit1 EVENT_GOT_HM04_STRENGTH
+ checkevent EVENT_GOT_HM04_STRENGTH
iftrue UnknownScript_0x9c8d3
2writetext UnknownText_0x9c8df
keeptextopen
verbosegiveitem HM_04, 1
- setbit1 EVENT_GOT_HM04_STRENGTH
+ setevent EVENT_GOT_HM04_STRENGTH
UnknownScript_0x9c8d3: ; 0x9c8d3
2writetext UnknownText_0x9c965
closetext
--- a/maps/OlivineGoodRodHouse.asm
+++ b/maps/OlivineGoodRodHouse.asm
@@ -9,7 +9,7 @@
FishingGuruScript_0x9c71b: ; 0x9c71b
faceplayer
loadfont
- checkbit1 EVENT_GOT_GOOD_ROD
+ checkevent EVENT_GOT_GOOD_ROD
iftrue UnknownScript_0x9c740
2writetext UnknownText_0x9c749
yesorno
@@ -20,7 +20,7 @@
2writetext UnknownText_0x9c807
closetext
loadmovesprites
- setbit1 EVENT_GOT_GOOD_ROD
+ setevent EVENT_GOT_GOOD_ROD
end
; 0x9c73a
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -9,7 +9,7 @@
JasmineScript_0x9c12f: ; 0x9c12f
faceplayer
loadfont
- checkbit1 EVENT_BEAT_JASMINE
+ checkevent EVENT_BEAT_JASMINE
iftrue UnknownScript_0x9c159
2writetext UnknownText_0x9c1b9
closetext
@@ -18,7 +18,7 @@
loadtrainer JASMINE, 1
startbattle
returnafterbattle
- setbit1 EVENT_BEAT_JASMINE
+ setevent EVENT_BEAT_JASMINE
loadfont
2writetext UnknownText_0x9c33a
playsound $009c
@@ -27,13 +27,13 @@
checkcode $7
2call UnknownScript_0x9c178
UnknownScript_0x9c159: ; 0x9c159
- checkbit1 EVENT_GOT_TM23_IRON_TAIL
+ checkevent EVENT_GOT_TM23_IRON_TAIL
iftrue UnknownScript_0x9c172
2writetext UnknownText_0x9c354
keeptextopen
verbosegiveitem TM_23, 1
iffalse UnknownScript_0x9c176
- setbit1 EVENT_GOT_TM23_IRON_TAIL
+ setevent EVENT_GOT_TM23_IRON_TAIL
2writetext UnknownText_0x9c3a5
closetext
loadmovesprites
@@ -64,9 +64,9 @@
OlivineGymGuyScript: ; 0x9c187
faceplayer
- checkbit1 EVENT_BEAT_JASMINE
+ checkevent EVENT_BEAT_JASMINE
iftrue .OlivineGymGuyWinScript
- checkbit1 EVENT_JASMINE_RETURNED_TO_GYM
+ checkevent EVENT_JASMINE_RETURNED_TO_GYM
iffalse .OlivineGymGuyPreScript
loadfont
2writetext OlivineGymGuyText
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -63,9 +63,9 @@
iftrue UnknownScript_0x5afc7
checkcellnum $7
iftrue UnknownScript_0x5b05f
- checkbit1 $0263
+ checkevent $0263
iftrue UnknownScript_0x5afb0
- setbit1 $0263
+ setevent $0263
2call UnknownScript_0x5b053
2jump UnknownScript_0x5afb3
; 0x5afb0
@@ -90,13 +90,13 @@
if_equal $1, UnknownScript_0x5afee
if_equal $0, UnknownScript_0x5aff4
UnknownScript_0x5afe2: ; 0x5afe2
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x5b01b
UnknownScript_0x5afe8: ; 0x5afe8
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x5b00e
UnknownScript_0x5afee: ; 0x5afee
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x5b001
UnknownScript_0x5aff4: ; 0x5aff4
loadtrainer SAILOR, HUEY1
@@ -130,14 +130,14 @@
startbattle
returnafterbattle
clearbit2 $0066
- checkbit1 EVENT_HUEY_PROTEIN
+ checkevent EVENT_HUEY_PROTEIN
iftrue UnknownScript_0x5b03f
- checkbit1 $0265
+ checkevent $0265
iftrue UnknownScript_0x5b03e
2call UnknownScript_0x5b076
verbosegiveitem PROTEIN, 1
iffalse UnknownScript_0x5b06f
- setbit1 $0265
+ setevent $0265
2jump UnknownScript_0x5b05f
; 0x5b03e
@@ -151,8 +151,8 @@
closetext
verbosegiveitem PROTEIN, 1
iffalse UnknownScript_0x5b06f
- clearbit1 EVENT_HUEY_PROTEIN
- setbit1 $0265
+ clearevent EVENT_HUEY_PROTEIN
+ setevent $0265
2jump UnknownScript_0x5b05f
; 0x5b053
@@ -192,7 +192,7 @@
; 0x5b06f
UnknownScript_0x5b06f: ; 0x5b06f
- setbit1 EVENT_HUEY_PROTEIN
+ setevent EVENT_HUEY_PROTEIN
jumpstd $0021
end
; 0x5b076
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -11,11 +11,11 @@
loadfont
checkitem SECRETPOTION
iftrue UnknownScript_0x60bab
- checkbit1 $0037
+ checkevent $0037
iftrue UnknownScript_0x60ba5
2writetext UnknownText_0x60c81
keeptextopen
- setbit1 $0037
+ setevent $0037
UnknownScript_0x60ba5: ; 0x60ba5
2writetext UnknownText_0x60d64
closetext
@@ -64,8 +64,8 @@
2writetext UnknownText_0x60e6c
closetext
loadmovesprites
- setbit1 EVENT_JASMINE_RETURNED_TO_GYM
- clearbit1 $06d3
+ setevent EVENT_JASMINE_RETURNED_TO_GYM
+ clearevent $06d3
checkcode $9
if_equal $0, UnknownScript_0x60c17
if_equal $3, UnknownScript_0x60c1e
@@ -107,7 +107,7 @@
MonsterScript_0x60c3a: ; 0x60c3a
faceplayer
loadfont
- checkbit1 EVENT_JASMINE_RETURNED_TO_GYM
+ checkevent EVENT_JASMINE_RETURNED_TO_GYM
iftrue UnknownScript_0x60c51
2writetext UnknownText_0x60f03
writebyte AMPHAROS
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -23,7 +23,7 @@
applymovement $0, MovementData_0x74a32
appear $2
dotrigger $0
- setbit1 $0000
+ setevent $0000
blackoutmod GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY
end
; 0x748c0
@@ -31,7 +31,7 @@
SailorScript_0x748c0: ; 0x748c0
faceplayer
loadfont
- checkbit1 $0000
+ checkevent $0000
iftrue UnknownScript_0x74919
2writetext UnknownText_0x74a55
closetext
@@ -45,21 +45,21 @@
playsound $0023
special $002e
waitbutton
- checkbit1 $0030
+ checkevent $0030
iffalse UnknownScript_0x7490a
- clearbit1 $073a
- setbit1 $073b
- clearbit1 EVENT_BEAT_COOLTRAINERM_SEAN
- clearbit1 EVENT_BEAT_COOLTRAINERF_CAROL
- clearbit1 EVENT_BEAT_GENTLEMAN_EDWARD
- clearbit1 EVENT_BEAT_BEAUTY_CASSIE
- clearbit1 EVENT_BEAT_PSYCHIC_RODNEY
- clearbit1 EVENT_BEAT_SUPER_NERD_SHAWN
- clearbit1 EVENT_BEAT_SAILOR_GARRETT
- clearbit1 EVENT_BEAT_FISHER_JONAH
- clearbit1 EVENT_BEAT_BLACKBELT_WAI
+ clearevent $073a
+ setevent $073b
+ clearevent EVENT_BEAT_COOLTRAINERM_SEAN
+ clearevent EVENT_BEAT_COOLTRAINERF_CAROL
+ clearevent EVENT_BEAT_GENTLEMAN_EDWARD
+ clearevent EVENT_BEAT_BEAUTY_CASSIE
+ clearevent EVENT_BEAT_PSYCHIC_RODNEY
+ clearevent EVENT_BEAT_SUPER_NERD_SHAWN
+ clearevent EVENT_BEAT_SAILOR_GARRETT
+ clearevent EVENT_BEAT_FISHER_JONAH
+ clearevent EVENT_BEAT_BLACKBELT_WAI
UnknownScript_0x7490a: ; 0x7490a
- clearbit1 $002f
+ clearevent $002f
appear $2
domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $1
warp GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $19, $1
@@ -75,13 +75,13 @@
UnknownScript_0x7491f: ; 0x7491f
spriteface $4, $3
- checkbit1 $0000
+ checkevent $0000
iftrue UnknownScript_0x7498b
- checkbit1 $0001
+ checkevent $0001
iftrue UnknownScript_0x7498b
spriteface $0, $2
loadfont
- checkbit1 $0030
+ checkevent $0030
iffalse UnknownScript_0x7494e
checkcode $b
if_equal SUNDAY, UnknownScript_0x74977
@@ -100,7 +100,7 @@
2writetext UnknownText_0x74b11
closetext
loadmovesprites
- setbit1 $0001
+ setevent $0001
applymovement $0, MovementData_0x74a37
2jump SailorScript_0x748c0
; 0x7496d
@@ -151,9 +151,9 @@
SailorScript_0x7499c: ; 0x7499c
faceplayer
loadfont
- checkbit1 $0000
+ checkevent $0000
iftrue UnknownScript_0x74919
- checkbit1 $0030
+ checkevent $0030
iffalse UnknownScript_0x749c0
checkcode $b
if_equal SUNDAY, UnknownScript_0x749f2
@@ -172,7 +172,7 @@
2writetext UnknownText_0x74b11
closetext
loadmovesprites
- setbit1 $0001
+ setevent $0001
checkcode $9
if_equal $3, UnknownScript_0x749e5
applymovement $0, MovementData_0x74a3f
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -26,12 +26,12 @@
GrampsScript_0x18c00f: ; 0x18c00f
faceplayer
loadfont
- checkbit1 EVENT_GOT_SILVER_WING
+ checkevent EVENT_GOT_SILVER_WING
iftrue UnknownScript_0x18c023
2writetext UnknownText_0x18c0c6
keeptextopen
verbosegiveitem SILVER_WING, 1
- setbit1 EVENT_GOT_SILVER_WING
+ setevent EVENT_GOT_SILVER_WING
loadmovesprites
end
; 0x18c023
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -18,8 +18,8 @@
loadtrainer BROCK, 1
startbattle
returnafterbattle
- setbit1 EVENT_BEAT_BROCK
- setbit1 EVENT_BEAT_CAMPER_JERRY
+ setevent EVENT_BEAT_BROCK
+ setevent EVENT_BEAT_CAMPER_JERRY
loadfont
2writetext UnknownText_0x1a2a3d
playsound $009c
@@ -70,7 +70,7 @@
PewterGymGuyScript: ; 0x1a28ac
faceplayer
loadfont
- checkbit1 EVENT_BEAT_BROCK
+ checkevent EVENT_BEAT_BROCK
iftrue .PewterGymGuyWinScript
2writetext PewterGymGuyText
closetext
--- a/maps/PokeCenter2F.asm
+++ b/maps/PokeCenter2F.asm
@@ -17,8 +17,8 @@
UnknownScript_0x19285f: ; 0x19285f
special $0011
if_equal $0, UnknownScript_0x192872
- clearbit1 $0711
- checkbit1 $0001
+ clearevent $0711
+ checkevent $0001
iftrue UnknownScript_0x192872
priorityjump UnknownScript_0x192887
; 0x192872
@@ -54,7 +54,7 @@
UnknownScript_0x192887: ; 0x192887
appear $5
- setbit1 $0001
+ setevent $0001
end
; 0x19288d
@@ -77,7 +77,7 @@
; 0x19289d
LinkReceptionistScript_0x19289d: ; 0x19289d
- checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iffalse UnknownScript_0x19288d
loadfont
2writetext UnknownText_0x192e3a
@@ -190,7 +190,7 @@
; 0x192952
LinkReceptionistScript_0x192952: ; 0x192952
- checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iffalse UnknownScript_0x192895
loadfont
2writetext UnknownText_0x192de0
@@ -331,7 +331,7 @@
; 0x192a2d
LinkReceptionistScript_0x192a2d: ; 0x192a2d
- checkbit1 $0712
+ checkevent $0712
iftrue UnknownScript_0x192a25
checkbit2 $0053
iftrue UnknownScript_0x192a25
@@ -653,7 +653,7 @@
OfficerScript_0x192c9a: ; 0x192c9a
faceplayer
loadfont
- checkbit1 $0711
+ checkevent $0711
iftrue UnknownScript_0x192cb8
2writetext UnknownText_0x193190
yesorno
@@ -664,7 +664,7 @@
special $0012
iffalse UnknownScript_0x192cbe
itemnotify
- setbit1 $0711
+ setevent $0711
UnknownScript_0x192cb8: ; 0x192cb8
2writetext UnknownText_0x1931d2
closetext
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -9,9 +9,9 @@
GentlemanScript_0x1917e9: ; 0x1917e9
faceplayer
loadfont
- checkbit1 EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT
+ checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT
iftrue UnknownScript_0x191815
- checkbit1 EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL
+ checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL
iftrue UnknownScript_0x191802
2writetext UnknownText_0x191881
yesorno
@@ -23,7 +23,7 @@
keeptextopen
verbosegiveitem RARE_CANDY, 1
iffalse UnknownScript_0x19181f
- setbit1 EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT
+ setevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT
2writetext UnknownText_0x191a72
closetext
loadmovesprites
@@ -52,9 +52,9 @@
FisherScript_0x191824: ; 0x191824
faceplayer
loadfont
- checkbit1 EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB
+ checkevent EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB
iftrue UnknownScript_0x19185f
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x191838
2writetext UnknownText_0x191ba0
closetext
@@ -64,7 +64,7 @@
UnknownScript_0x191838: ; 0x191838
2writetext UnknownText_0x191bff
- checkbit1 EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM
+ checkevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM
iftrue UnknownScript_0x191844
closetext
loadmovesprites
@@ -83,7 +83,7 @@
playsound $0091
waitbutton
itemnotify
- setbit1 EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB
+ setevent EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB
loadmovesprites
end
; 0x19185f
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -45,9 +45,9 @@
OfficerScript_0x188df5: ; 0x188df5
faceplayer
loadfont
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x188e0f
- checkbit1 EVENT_MET_MANAGER_AT_POWER_PLANT
+ checkevent EVENT_MET_MANAGER_AT_POWER_PLANT
iftrue UnknownScript_0x188e09
2writetext UnknownText_0x188ee0
closetext
@@ -72,7 +72,7 @@
GymGuyScript_0x188e15: ; 0x188e15
faceplayer
loadfont
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x188e23
2writetext UnknownText_0x188fcf
closetext
@@ -90,7 +90,7 @@
GymGuyScript_0x188e29: ; 0x188e29
faceplayer
loadfont
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x188e37
2writetext UnknownText_0x189079
closetext
@@ -108,7 +108,7 @@
OfficerScript_0x188e3d: ; 0x188e3d
faceplayer
loadfont
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x188e4b
2writetext UnknownText_0x18910e
closetext
@@ -126,7 +126,7 @@
GymGuyScript_0x188e51: ; 0x188e51
faceplayer
loadfont
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x188e5f
2writetext UnknownText_0x1891c2
closetext
@@ -144,18 +144,18 @@
FisherScript_0x188e65: ; 0x188e65
faceplayer
loadfont
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x188eac
checkitem MACHINE_PART
iftrue UnknownScript_0x188e93
- checkbit1 EVENT_MET_MANAGER_AT_POWER_PLANT
+ checkevent EVENT_MET_MANAGER_AT_POWER_PLANT
iftrue UnknownScript_0x188e8d
2writetext UnknownText_0x189264
closetext
loadmovesprites
- setbit1 EVENT_MET_MANAGER_AT_POWER_PLANT
- clearbit1 $076d
- clearbit1 EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM
+ setevent EVENT_MET_MANAGER_AT_POWER_PLANT
+ clearevent $076d
+ clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM
domaptrigger GROUP_CERULEAN_GYM, MAP_CERULEAN_GYM, $1
dotrigger $1
end
@@ -172,20 +172,20 @@
2writetext UnknownText_0x18936e
keeptextopen
takeitem MACHINE_PART, 1
- setbit1 EVENT_RETURNED_MACHINE_PART
- clearbit1 $0772
- setbit1 $0771
- setbit1 $076c
- setbit1 EVENT_RESTORED_POWER_TO_KANTO
- clearbit1 $0749
+ setevent EVENT_RETURNED_MACHINE_PART
+ clearevent $0772
+ setevent $0771
+ setevent $076c
+ setevent EVENT_RESTORED_POWER_TO_KANTO
+ clearevent $0749
UnknownScript_0x188eac: ; 0x188eac
- checkbit1 EVENT_GOT_TM07_ZAP_CANNON
+ checkevent EVENT_GOT_TM07_ZAP_CANNON
iftrue UnknownScript_0x188ec5
2writetext UnknownText_0x1893c4
keeptextopen
verbosegiveitem TM_07, 1
iffalse UnknownScript_0x188ec3
- setbit1 EVENT_GOT_TM07_ZAP_CANNON
+ setevent EVENT_GOT_TM07_ZAP_CANNON
2writetext UnknownText_0x1893f4
closetext
UnknownScript_0x188ec3: ; 0x188ec3
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -170,7 +170,7 @@
loadfont
checkbit2 $0013
iftrue UnknownScript_0x5d865
- checkbit1 EVENT_MET_BUENA
+ checkevent EVENT_MET_BUENA
iffalse UnknownScript_0x5d800
checkbit2 $0060
iftrue UnknownScript_0x5d82f
@@ -231,7 +231,7 @@
UnknownScript_0x5d800: ; 0x5d800
2writetext UnknownText_0x5dcf4
keeptextopen
- setbit1 EVENT_MET_BUENA
+ setevent EVENT_MET_BUENA
verbosegiveitem BLUE_CARD, 1
UnknownScript_0x5d80a: ; 0x5d80a
2writetext UnknownText_0x5de10
@@ -239,7 +239,7 @@
loadmovesprites
checkcellnum $25
iftrue UnknownScript_0x5d81a
- checkbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
+ checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
iftrue UnknownScript_0x5d8cc
UnknownScript_0x5d81a: ; 0x5d81a
spriteface $b, $3
@@ -263,7 +263,7 @@
loadmovesprites
checkcellnum $25
iftrue UnknownScript_0x5d83f
- checkbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
+ checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
iftrue UnknownScript_0x5d8cc
UnknownScript_0x5d83f: ; 0x5d83f
spriteface $b, $3
@@ -303,7 +303,7 @@
loadmovesprites
checkcellnum $25
iftrue UnknownScript_0x5d87b
- checkbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
+ checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
iftrue UnknownScript_0x5d8cc
UnknownScript_0x5d87b: ; 0x5d87b
spriteface $b, $3
@@ -316,7 +316,7 @@
loadmovesprites
checkcellnum $25
iftrue UnknownScript_0x5d88f
- checkbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
+ checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
iftrue UnknownScript_0x5d8cc
UnknownScript_0x5d88f: ; 0x5d88f
spriteface $b, $3
@@ -329,7 +329,7 @@
loadmovesprites
checkcellnum $25
iftrue UnknownScript_0x5d8a3
- checkbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
+ checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
iftrue UnknownScript_0x5d8cc
UnknownScript_0x5d8a3: ; 0x5d8a3
end
@@ -343,11 +343,11 @@
pause 15
spriteface $0, $1
pause 15
- checkbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
+ checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
iftrue UnknownScript_0x5d8cc
showemote $0, $b, 15
- setbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
- setbit1 EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
+ setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
+ setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
loadfont
2writetext UnknownText_0x5e1ee
2jump UnknownScript_0x5d8d0
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -11,7 +11,7 @@
; 0x5e543
UnknownScript_0x5e543: ; 0x5e543
- checkbit1 EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
+ checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
iftrue UnknownScript_0x5e54a
return
; 0x5e54a
@@ -29,7 +29,7 @@
GymGuyScript_0x5e556: ; 0x5e556
faceplayer
loadfont
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x5e564
2writetext UnknownText_0x5e682
closetext
@@ -47,11 +47,11 @@
CooltrainerFScript_0x5e56a: ; 0x5e56a
faceplayer
loadfont
- checkbit1 EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER
+ checkevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER
iftrue UnknownScript_0x5e59d
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x5e58a
- checkbit1 EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
+ checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
iftrue UnknownScript_0x5e584
2writetext UnknownText_0x5e754
closetext
@@ -74,7 +74,7 @@
2writetext UnknownText_0x5e821
closetext
loadmovesprites
- setbit1 EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER
+ setevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER
end
; 0x5e59d
@@ -206,7 +206,7 @@
loadfont
2writetext UnknownText_0x5eaa4
closetext
- checkbit1 EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
+ checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
iftrue UnknownScript_0x5e603
checkitem CARD_KEY
iftrue UnknownScript_0x5e605
@@ -218,7 +218,7 @@
UnknownScript_0x5e605: ; 0x5e605
2writetext UnknownText_0x5eabc
closetext
- setbit1 EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
+ setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
playsound $001f
changeblock $e, $2, $2a
changeblock $e, $4, $1
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -13,9 +13,9 @@
TeacherScript_0x5eb85: ; 0x5eb85
faceplayer
loadfont
- checkbit1 EVENT_GOT_PINK_BOW_FROM_MARY
+ checkevent EVENT_GOT_PINK_BOW_FROM_MARY
iftrue UnknownScript_0x5ebac
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x5eb99
2writetext UnknownText_0x5ec68
closetext
@@ -31,7 +31,7 @@
2writetext UnknownText_0x5ecef
closetext
loadmovesprites
- setbit1 EVENT_GOT_PINK_BOW_FROM_MARY
+ setevent EVENT_GOT_PINK_BOW_FROM_MARY
end
; 0x5ebac
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -47,7 +47,7 @@
verbosegiveitem BASEMENT_KEY, 1
loadmovesprites
dotrigger $1
- setbit1 $0573
+ setevent $0573
end
; 0x60046
@@ -54,7 +54,7 @@
GentlemanScript_0x60046: ; 0x60046
faceplayer
loadfont
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x60054
2writetext UnknownText_0x60246
closetext
@@ -121,18 +121,18 @@
disappear $4
pause 15
special $0032
- setbit1 $0571
- setbit1 EVENT_CLEARED_RADIO_TOWER
+ setevent $0571
+ setevent EVENT_CLEARED_RADIO_TOWER
clearbit2 $0013
- setbit1 $06cc
- setbit1 $06cd
- setbit1 $06ce
- clearbit1 $0736
+ setevent $06cc
+ setevent $06cd
+ setevent $06ce
+ clearevent $0736
clearbit2 $0017
- clearbit1 $06cf
- clearbit1 $06d0
- setbit1 $06e3
- clearbit1 $06e4
+ clearevent $06cf
+ clearevent $06d0
+ setevent $06e3
+ clearevent $06e4
special $003c
disappear $2
moveperson $2, $c, $0
@@ -148,8 +148,8 @@
loadmovesprites
dotrigger $2
domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $0
- setbit1 EVENT_GOT_CLEAR_BELL
- setbit1 $0761
+ setevent EVENT_GOT_CLEAR_BELL
+ setevent $0761
2jump UnknownScript_0x600f1
; 0x600f1
--- a/maps/RedsHouse1F.asm
+++ b/maps/RedsHouse1F.asm
@@ -16,12 +16,12 @@
RedsMomScript_0x19aea3: ; 0x19aea3
faceplayer
loadfont
- checkbit1 EVENT_MET_REDS_MOM
+ checkevent EVENT_MET_REDS_MOM
iftrue UnknownScript_0x19aeb4
2writetext UnknownText_0x19aec0
closetext
loadmovesprites
- setbit1 EVENT_MET_REDS_MOM
+ setevent EVENT_MET_REDS_MOM
end
; 0x19aeb4
--- a/maps/Route10PokeCenter1F.asm
+++ b/maps/Route10PokeCenter1F.asm
@@ -17,7 +17,7 @@
GymGuyScript_0x188bda: ; 0x188bda
faceplayer
loadfont
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x188be8
2writetext UnknownText_0x188c26
closetext
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -9,7 +9,7 @@
FishingGuruScript_0x7f484: ; 0x7f484
faceplayer
loadfont
- checkbit1 EVENT_GOT_SUPER_ROD
+ checkevent EVENT_GOT_SUPER_ROD
iftrue UnknownScript_0x7f4a0
2writetext UnknownText_0x7f4af
yesorno
@@ -18,7 +18,7 @@
keeptextopen
verbosegiveitem SUPER_ROD, 1
iffalse UnknownScript_0x7f4aa
- setbit1 EVENT_GOT_SUPER_ROD
+ setevent EVENT_GOT_SUPER_ROD
UnknownScript_0x7f4a0: ; 0x7f4a0
2writetext UnknownText_0x7f57c
closetext
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -11,7 +11,7 @@
; 0x19e9de
UnknownScript_0x19e9de: ; 0x19e9de
- checkbit1 $00d7
+ checkevent $00d7
iftrue UnknownScript_0x19e9fc
changeblock $6, $6, $7a
changeblock $8, $6, $7a
@@ -142,7 +142,7 @@
FisherScript_0x19ea4d: ; 0x19ea4d
faceplayer
loadfont
- checkbit1 $00d7
+ checkevent $00d7
iftrue UnknownScript_0x19ea5b
2writetext UnknownText_0x19ecaf
closetext
@@ -160,7 +160,7 @@
FisherScript_0x19ea61: ; 0x19ea61
faceplayer
loadfont
- checkbit1 $00d7
+ checkevent $00d7
iftrue UnknownScript_0x19ea6f
2writetext UnknownText_0x19ed45
closetext
--- a/maps/Route19FuchsiaGate.asm
+++ b/maps/Route19FuchsiaGate.asm
@@ -9,7 +9,7 @@
OfficerScript_0x1ab3f6: ; 0x1ab3f6
faceplayer
loadfont
- checkbit1 $00d7
+ checkevent $00d7
iftrue UnknownScript_0x1ab404
2writetext UnknownText_0x1ab40a
closetext
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -11,7 +11,7 @@
; 0x1acd25
UnknownScript_0x1acd25: ; 0x1acd25
- setbit1 $00d7
+ setevent $00d7
return
; 0x1acd29
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -39,7 +39,7 @@
spriteface $0, $2
applymovement $2, MovementData_0x19f000
disappear $2
- clearbit1 $076f
+ clearevent $076f
dotrigger $0
special $003d
end
@@ -66,7 +66,7 @@
spriteface $0, $2
applymovement $2, MovementData_0x19f000
disappear $2
- clearbit1 $076f
+ clearevent $076f
dotrigger $0
special $003d
end
@@ -278,15 +278,15 @@
CooltrainerMScript_0x19efac: ; 0x19efac
faceplayer
loadfont
- checkbit1 $0558
+ checkevent $0558
iftrue UnknownScript_0x19efda
- checkbit1 EVENT_CLEARED_NUGGET_BRIDGE
+ checkevent EVENT_CLEARED_NUGGET_BRIDGE
iftrue UnknownScript_0x19efc7
2writetext UnknownText_0x19f43b
keeptextopen
verbosegiveitem NUGGET, 1
iffalse UnknownScript_0x19efde
- setbit1 EVENT_CLEARED_NUGGET_BRIDGE
+ setevent EVENT_CLEARED_NUGGET_BRIDGE
UnknownScript_0x19efc7: ; 0x19efc7
2writetext UnknownText_0x19f49d
closetext
@@ -295,7 +295,7 @@
loadtrainer COOLTRAINERM, KEVIN
startbattle
returnafterbattle
- setbit1 $0558
+ setevent $0558
loadfont
UnknownScript_0x19efda: ; 0x19efda
2writetext UnknownText_0x19f520
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -63,11 +63,11 @@
iftrue UnknownScript_0x1a4d79
checkcellnum $b
iftrue UnknownScript_0x1a4dcb
- checkbit1 $026b
+ checkevent $026b
iftrue UnknownScript_0x1a4d62
2writetext UnknownText_0x1a4fe4
keeptextopen
- setbit1 $026b
+ setevent $026b
2call UnknownScript_0x1a4dbf
2jump UnknownScript_0x1a4d65
; 0x1a4d62
@@ -91,10 +91,10 @@
if_equal $1, UnknownScript_0x1a4d96
if_equal $0, UnknownScript_0x1a4d9c
UnknownScript_0x1a4d90: ; 0x1a4d90
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a4db6
UnknownScript_0x1a4d96: ; 0x1a4d96
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x1a4da9
UnknownScript_0x1a4d9c: ; 0x1a4d9c
loadtrainer COOLTRAINERM, GAVEN3
@@ -214,11 +214,11 @@
iftrue UnknownScript_0x1a4e35
checkcellnum $c
iftrue UnknownScript_0x1a4e87
- checkbit1 $026d
+ checkevent $026d
iftrue UnknownScript_0x1a4e1e
2writetext UnknownText_0x1a51d9
keeptextopen
- setbit1 $026d
+ setevent $026d
2call UnknownScript_0x1a4e7b
2jump UnknownScript_0x1a4e21
; 0x1a4e1e
@@ -242,10 +242,10 @@
if_equal $1, UnknownScript_0x1a4e52
if_equal $0, UnknownScript_0x1a4e58
UnknownScript_0x1a4e4c: ; 0x1a4e4c
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a4e72
UnknownScript_0x1a4e52: ; 0x1a4e52
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x1a4e65
UnknownScript_0x1a4e58: ; 0x1a4e58
loadtrainer COOLTRAINERF, BETH1
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -104,11 +104,11 @@
iftrue UnknownScript_0x1a0945
checkcellnum $d
iftrue UnknownScript_0x1a0963
- checkbit1 $026f
+ checkevent $026f
iftrue UnknownScript_0x1a08e8
2writetext UnknownText_0x1a0e42
keeptextopen
- setbit1 $026f
+ setevent $026f
2call UnknownScript_0x1a0957
2jump UnknownScript_0x1a08eb
; 0x1a08e8
@@ -132,10 +132,10 @@
if_equal $1, UnknownScript_0x1a091c
if_equal $0, UnknownScript_0x1a0922
UnknownScript_0x1a0916: ; 0x1a0916
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a093c
UnknownScript_0x1a091c: ; 0x1a091c
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x1a092f
UnknownScript_0x1a0922: ; 0x1a0922
loadtrainer BIRD_KEEPER, JOSE2
@@ -306,11 +306,11 @@
iftrue UnknownScript_0x1a09e9
checkcellnum $e
iftrue UnknownScript_0x1a0a3b
- checkbit1 $0271
+ checkevent $0271
iftrue UnknownScript_0x1a09d2
2writetext UnknownText_0x1a0c35
keeptextopen
- setbit1 $0271
+ setevent $0271
2call UnknownScript_0x1a0a2f
2jump UnknownScript_0x1a09d5
; 0x1a09d2
@@ -334,10 +334,10 @@
if_equal $1, UnknownScript_0x1a0a06
if_equal $0, UnknownScript_0x1a0a0c
UnknownScript_0x1a0a00: ; 0x1a0a00
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a0a26
UnknownScript_0x1a0a06: ; 0x1a0a06
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x1a0a19
UnknownScript_0x1a0a0c: ; 0x1a0a0c
loadtrainer COOLTRAINERF, REENA1
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -9,7 +9,7 @@
GrannyScript_0x7b394: ; 0x7b394
faceplayer
loadfont
- checkbit1 EVENT_GOT_TM37_SANDSTORM
+ checkevent EVENT_GOT_TM37_SANDSTORM
iftrue UnknownScript_0x7b3b7
special $0059
2writetext UnknownText_0x7b3c6
@@ -23,7 +23,7 @@
keeptextopen
verbosegiveitem TM_37, 1
iffalse UnknownScript_0x7b3bb
- setbit1 EVENT_GOT_TM37_SANDSTORM
+ setevent EVENT_GOT_TM37_SANDSTORM
UnknownScript_0x7b3b7: ; 0x7b3b7
2writetext UnknownText_0x7b48f
closetext
--- a/maps/Route28FamousSpeechHouse.asm
+++ b/maps/Route28FamousSpeechHouse.asm
@@ -16,13 +16,13 @@
CooltrainerFScript_0x1ae658: ; 0x1ae658
faceplayer
loadfont
- checkbit1 EVENT_GOT_TM47_STEEL_WING
+ checkevent EVENT_GOT_TM47_STEEL_WING
iftrue UnknownScript_0x1ae66f
2writetext UnknownText_0x1ae682
keeptextopen
verbosegiveitem TM_47, 1
iffalse UnknownScript_0x1ae66d
- setbit1 EVENT_GOT_TM47_STEEL_WING
+ setevent EVENT_GOT_TM47_STEEL_WING
UnknownScript_0x1ae66d: ; 0x1ae66d
loadmovesprites
end
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -42,7 +42,7 @@
showemote $0, $2, 15
applymovement $2, MovementData_0x1a108d
spriteface $0, $2
- setbit1 EVENT_DUDE_TALKED_TO_YOU
+ setevent EVENT_DUDE_TALKED_TO_YOU
loadfont
2writetext UnknownText_0x1a10df
yesorno
@@ -59,7 +59,7 @@
closetext
loadmovesprites
dotrigger $0
- setbit1 EVENT_LEARNED_TO_CATCH_POKEMON
+ setevent EVENT_LEARNED_TO_CATCH_POKEMON
end
; 0x1a0fa3
@@ -68,7 +68,7 @@
showemote $0, $2, 15
applymovement $2, MovementData_0x1a1094
spriteface $0, $2
- setbit1 EVENT_DUDE_TALKED_TO_YOU
+ setevent EVENT_DUDE_TALKED_TO_YOU
loadfont
2writetext UnknownText_0x1a10df
yesorno
@@ -85,7 +85,7 @@
closetext
loadmovesprites
dotrigger $0
- setbit1 EVENT_LEARNED_TO_CATCH_POKEMON
+ setevent EVENT_LEARNED_TO_CATCH_POKEMON
end
; 0x1a0fd9
@@ -112,9 +112,9 @@
loadfont
checkcode $10
if_equal $0, UnknownScript_0x1a101c
- checkbit1 EVENT_LEARNED_TO_CATCH_POKEMON
+ checkevent EVENT_LEARNED_TO_CATCH_POKEMON
iftrue UnknownScript_0x1a101c
- checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iffalse UnknownScript_0x1a101c
2writetext UnknownText_0x1a11e3
yesorno
@@ -126,7 +126,7 @@
2writetext UnknownText_0x1a114d
closetext
loadmovesprites
- setbit1 EVENT_LEARNED_TO_CATCH_POKEMON
+ setevent EVENT_LEARNED_TO_CATCH_POKEMON
end
; 0x1a101c
@@ -180,21 +180,21 @@
TeacherScript_0x1a1049: ; 0x1a1049
faceplayer
loadfont
- checkbit1 EVENT_GOT_PINK_BOW_FROM_TUSCANY
+ checkevent EVENT_GOT_PINK_BOW_FROM_TUSCANY
iftrue UnknownScript_0x1a1077
checkcode $b
if_not_equal TUESDAY, UnknownScript_0x1a107d
- checkbit1 EVENT_MET_TUSCANY_OF_TUESDAY
+ checkevent EVENT_MET_TUSCANY_OF_TUESDAY
iftrue UnknownScript_0x1a1064
2writetext UnknownText_0x1a13b2
keeptextopen
- setbit1 EVENT_MET_TUSCANY_OF_TUESDAY
+ setevent EVENT_MET_TUSCANY_OF_TUESDAY
UnknownScript_0x1a1064: ; 0x1a1064
2writetext UnknownText_0x1a142f
keeptextopen
verbosegiveitem PINK_BOW, 1
iffalse UnknownScript_0x1a107b
- setbit1 EVENT_GOT_PINK_BOW_FROM_TUSCANY
+ setevent EVENT_GOT_PINK_BOW_FROM_TUSCANY
2writetext UnknownText_0x1a146f
closetext
loadmovesprites
--- a/maps/Route2NuggetSpeechHouse.asm
+++ b/maps/Route2NuggetSpeechHouse.asm
@@ -9,13 +9,13 @@
FisherScript_0x9b847: ; 0x9b847
faceplayer
loadfont
- checkbit1 $00c8
+ checkevent $00c8
iftrue UnknownScript_0x9b85c
2writetext UnknownText_0x9b865
keeptextopen
verbosegiveitem NUGGET, 1
iffalse UnknownScript_0x9b860
- setbit1 $00c8
+ setevent $00c8
UnknownScript_0x9b85c: ; 0x9b85c
2writetext UnknownText_0x9b8e5
closetext
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -55,11 +55,11 @@
iftrue UnknownScript_0x1a16e0
checkcellnum $f
iftrue UnknownScript_0x1a178f
- checkbit1 $0273
+ checkevent $0273
iftrue UnknownScript_0x1a16c9
2writetext UnknownText_0x1a18c2
keeptextopen
- setbit1 $0273
+ setevent $0273
2call UnknownScript_0x1a1783
2jump UnknownScript_0x1a16cc
; 0x1a16c9
@@ -85,10 +85,10 @@
if_equal $1, UnknownScript_0x1a1711
if_equal $0, UnknownScript_0x1a1717
UnknownScript_0x1a16ff: ; 0x1a16ff
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x1a174b
UnknownScript_0x1a1705: ; 0x1a1705
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1a173e
UnknownScript_0x1a170b: ; 0x1a170b
checkbit2 $0047
@@ -137,14 +137,14 @@
startbattle
returnafterbattle
clearbit2 $006b
- checkbit1 EVENT_JOEY_HP_UP
+ checkevent EVENT_JOEY_HP_UP
iftrue UnknownScript_0x1a176f
- checkbit1 $0266
+ checkevent $0266
iftrue UnknownScript_0x1a176e
2call UnknownScript_0x1a17a6
verbosegiveitem HP_UP, 1
iffalse UnknownScript_0x1a179f
- setbit1 $0266
+ setevent $0266
2jump UnknownScript_0x1a178f
; 0x1a176e
@@ -158,8 +158,8 @@
closetext
verbosegiveitem HP_UP, 1
iffalse UnknownScript_0x1a179f
- clearbit1 EVENT_JOEY_HP_UP
- setbit1 $0266
+ clearevent EVENT_JOEY_HP_UP
+ setevent $0266
2jump UnknownScript_0x1a178f
; 0x1a1783
@@ -199,7 +199,7 @@
; 0x1a179f
UnknownScript_0x1a179f: ; 0x1a179f
- setbit1 EVENT_JOEY_HP_UP
+ setevent EVENT_JOEY_HP_UP
jumpstd $0021
end
; 0x1a17a6
@@ -270,7 +270,7 @@
YoungsterScript_0x1a17d2: ; 0x1a17d2
faceplayer
loadfont
- checkbit1 EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iftrue UnknownScript_0x1a17e0
2writetext UnknownText_0x1a1a6a
closetext
--- a/maps/Route30BerrySpeechHouse.asm
+++ b/maps/Route30BerrySpeechHouse.asm
@@ -9,13 +9,13 @@
PokefanMScript_0x196d64: ; 0x196d64
faceplayer
loadfont
- checkbit1 EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
+ checkevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
iftrue UnknownScript_0x196d79
2writetext UnknownText_0x196d82
keeptextopen
verbosegiveitem BERRY, 1
iffalse UnknownScript_0x196d7d
- setbit1 EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
+ setevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
UnknownScript_0x196d79: ; 0x196d79
2writetext UnknownText_0x196dec
closetext
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -11,7 +11,7 @@
; 0x1a543c
UnknownScript_0x1a543c: ; 0x1a543c
- checkbit1 EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
+ checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
iffalse UnknownScript_0x1a5443
return
; 0x1a5443
@@ -51,11 +51,11 @@
iftrue UnknownScript_0x1a5507
checkcellnum $10
iftrue UnknownScript_0x1a5558
- checkbit1 $0275
+ checkevent $0275
iftrue UnknownScript_0x1a547c
2writetext UnknownText_0x1a5671
closetext
- setbit1 $0275
+ setevent $0275
2call UnknownScript_0x1a554c
2jump UnknownScript_0x1a547f
; 0x1a547c
@@ -81,10 +81,10 @@
if_equal $1, UnknownScript_0x1a54c4
if_equal $0, UnknownScript_0x1a54ca
UnknownScript_0x1a54b2: ; 0x1a54b2
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x1a54fe
UnknownScript_0x1a54b8: ; 0x1a54b8
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1a54f1
UnknownScript_0x1a54be: ; 0x1a54be
checkbit2 $0049
@@ -138,13 +138,13 @@
UnknownScript_0x1a5507: ; 0x1a5507
2call UnknownScript_0x1a5568
- checkbit1 EVENT_WADE_HAS_BERRY
+ checkevent EVENT_WADE_HAS_BERRY
iftrue UnknownScript_0x1a5522
- checkbit1 EVENT_WADE_HAS_PSNCUREBERRY
+ checkevent EVENT_WADE_HAS_PSNCUREBERRY
iftrue UnknownScript_0x1a552b
- checkbit1 EVENT_WADE_HAS_PRZCUREBERRY
+ checkevent EVENT_WADE_HAS_PRZCUREBERRY
iftrue UnknownScript_0x1a5534
- checkbit1 EVENT_WADE_HAS_BITTER_BERRY
+ checkevent EVENT_WADE_HAS_BITTER_BERRY
iftrue UnknownScript_0x1a553d
UnknownScript_0x1a5522: ; 0x1a5522
verbosegiveitem BERRY, 1
@@ -224,9 +224,9 @@
FisherScript_0x1a5570: ; 0x1a5570
faceplayer
loadfont
- checkbit1 EVENT_GOT_TM50_NIGHTMARE
+ checkevent EVENT_GOT_TM50_NIGHTMARE
iftrue UnknownScript_0x1a55af
- checkbit1 EVENT_GOT_KENYA
+ checkevent EVENT_GOT_KENYA
iftrue UnknownScript_0x1a5584
2writetext UnknownText_0x1a56d9
closetext
@@ -246,10 +246,10 @@
keeptextopen
2writetext UnknownText_0x1a57ba
keeptextopen
- setbit1 EVENT_GAVE_KENYA
+ setevent EVENT_GAVE_KENYA
verbosegiveitem TM_50, 1
iffalse UnknownScript_0x1a55b3
- setbit1 EVENT_GOT_TM50_NIGHTMARE
+ setevent EVENT_GOT_TM50_NIGHTMARE
UnknownScript_0x1a55af: ; 0x1a55af
2writetext UnknownText_0x1a5896
closetext
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -43,11 +43,11 @@
faceplayer
UnknownScript_0x190470: ; 0x190470
loadfont
- checkbit1 EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32
+ checkevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32
iftrue UnknownScript_0x1904a5
checkbit2 $001b
iffalse UnknownScript_0x19049f
- checkbit1 EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
+ checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
iftrue UnknownScript_0x19048f
2writetext UnknownText_0x1907ab
closetext
@@ -67,7 +67,7 @@
keeptextopen
verbosegiveitem MIRACLE_SEED, 1
iffalse UnknownScript_0x1904a9
- setbit1 EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32
+ setevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32
2jump UnknownScript_0x1904a5
; 0x19049f
@@ -106,13 +106,13 @@
FisherScript_0x1904ce: ; 0x1904ce
faceplayer
loadfont
- checkbit1 EVENT_GOT_TM05_ROAR
+ checkevent EVENT_GOT_TM05_ROAR
iftrue UnknownScript_0x1904e3
2writetext UnknownText_0x191133
keeptextopen
verbosegiveitem TM_05, 1
iffalse UnknownScript_0x1904e7
- setbit1 EVENT_GOT_TM05_ROAR
+ setevent EVENT_GOT_TM05_ROAR
UnknownScript_0x1904e3: ; 0x1904e3
2writetext UnknownText_0x19118c
closetext
@@ -236,11 +236,11 @@
iftrue UnknownScript_0x1905f1
checkcellnum $11
iftrue UnknownScript_0x190603
- checkbit1 $0277
+ checkevent $0277
iftrue UnknownScript_0x190566
2writetext UnknownText_0x190bf8
keeptextopen
- setbit1 $0277
+ setevent $0277
2call UnknownScript_0x1905f7
2jump UnknownScript_0x190569
; 0x190566
@@ -266,10 +266,10 @@
if_equal $1, UnknownScript_0x1905ae
if_equal $0, UnknownScript_0x1905b4
UnknownScript_0x19059c: ; 0x19059c
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1905e8
UnknownScript_0x1905a2: ; 0x1905a2
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x1905db
UnknownScript_0x1905a8: ; 0x1905a8
checkbit2 $004a
@@ -420,11 +420,11 @@
iftrue UnknownScript_0x19066d
checkcellnum $12
iftrue UnknownScript_0x1906ed
- checkbit1 $0279
+ checkevent $0279
iftrue UnknownScript_0x190656
2writetext UnknownText_0x191060
keeptextopen
- setbit1 $0279
+ setevent $0279
2call UnknownScript_0x1906e1
2jump UnknownScript_0x190659
; 0x190656
@@ -450,13 +450,13 @@
if_equal $1, UnknownScript_0x19069e
if_equal $0, UnknownScript_0x1906a4
UnknownScript_0x19068c: ; 0x19068c
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x1906d8
UnknownScript_0x190692: ; 0x190692
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1906cb
UnknownScript_0x190698: ; 0x190698
- checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT
+ checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x1906be
UnknownScript_0x19069e: ; 0x19069e
checkbit2 $0048
@@ -630,21 +630,21 @@
LassScript_0x190739: ; 0x190739
faceplayer
loadfont
- checkbit1 EVENT_GOT_POISON_BARB_FROM_FRIEDA
+ checkevent EVENT_GOT_POISON_BARB_FROM_FRIEDA
iftrue UnknownScript_0x190767
checkcode $b
if_not_equal FRIDAY, UnknownScript_0x19076d
- checkbit1 EVENT_MET_FRIEDA_OF_FRIDAY
+ checkevent EVENT_MET_FRIEDA_OF_FRIDAY
iftrue UnknownScript_0x190754
2writetext UnknownText_0x1911c1
keeptextopen
- setbit1 EVENT_MET_FRIEDA_OF_FRIDAY
+ setevent EVENT_MET_FRIEDA_OF_FRIDAY
UnknownScript_0x190754: ; 0x190754
2writetext UnknownText_0x191204
keeptextopen
verbosegiveitem POISON_BARB, 1
iffalse UnknownScript_0x19076b
- setbit1 EVENT_GOT_POISON_BARB_FROM_FRIEDA
+ setevent EVENT_GOT_POISON_BARB_FROM_FRIEDA
2writetext UnknownText_0x191222
closetext
loadmovesprites
--- a/maps/Route32PokeCenter1F.asm
+++ b/maps/Route32PokeCenter1F.asm
@@ -13,7 +13,7 @@
FishingGuruScript_0x69b55: ; 0x69b55
faceplayer
loadfont
- checkbit1 EVENT_GOT_OLD_ROD
+ checkevent EVENT_GOT_OLD_ROD
iftrue UnknownScript_0x69b7a
2writetext UnknownText_0x69b83
yesorno
@@ -24,7 +24,7 @@
2writetext UnknownText_0x69c1b
closetext
loadmovesprites
- setbit1 EVENT_GOT_OLD_ROD
+ setevent EVENT_GOT_OLD_ROD
end
; 0x69b74
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -40,11 +40,11 @@
iftrue UnknownScript_0x1ac0c5
checkcellnum $13
iftrue UnknownScript_0x1ac0d7
- checkbit1 $027b
+ checkevent $027b
iftrue UnknownScript_0x1ac03a
2writetext UnknownText_0x1ac153
keeptextopen
- setbit1 $027b
+ setevent $027b
2call UnknownScript_0x1ac0cb
2jump UnknownScript_0x1ac03d
; 0x1ac03a
@@ -70,13 +70,13 @@
if_equal $1, UnknownScript_0x1ac082
if_equal $0, UnknownScript_0x1ac088
UnknownScript_0x1ac070: ; 0x1ac070
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1ac0bc
UnknownScript_0x1ac076: ; 0x1ac076
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x1ac0af
UnknownScript_0x1ac07c: ; 0x1ac07c
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1ac0a2
UnknownScript_0x1ac082: ; 0x1ac082
checkbit2 $0047
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -13,14 +13,14 @@
UnknownScript_0x78005: ; 0x78005
checkbit2 $0005
iftrue UnknownScript_0x78014
- clearbit1 $06e5
- setbit1 $06e6
+ clearevent $06e5
+ setevent $06e6
2jump UnknownScript_0x7801d
; 0x78014
UnknownScript_0x78014: ; 0x78014
- setbit1 $06e5
- clearbit1 $06e6
+ setevent $06e5
+ clearevent $06e6
2jump UnknownScript_0x7801d
; 0x7801d
@@ -27,12 +27,12 @@
UnknownScript_0x7801d: ; 0x7801d
checkbit2 $0006
iffalse UnknownScript_0x78029
- clearbit1 $06e7
+ clearevent $06e7
2jump UnknownScript_0x7802f
; 0x78029
UnknownScript_0x78029: ; 0x78029
- setbit1 $06e7
+ setevent $06e7
2jump UnknownScript_0x7802f
; 0x7802f
@@ -39,12 +39,12 @@
UnknownScript_0x7802f: ; 0x7802f
checkbit2 $0007
iffalse UnknownScript_0x78039
- clearbit1 $06e8
+ clearevent $06e8
return
; 0x78039
UnknownScript_0x78039: ; 0x78039
- setbit1 $06e8
+ setevent $06e8
return
; 0x7803d
@@ -116,11 +116,11 @@
iftrue UnknownScript_0x78131
checkcellnum $14
iftrue UnknownScript_0x78143
- checkbit1 $027d
+ checkevent $027d
iftrue UnknownScript_0x780a6
2writetext UnknownText_0x784f0
keeptextopen
- setbit1 $027d
+ setevent $027d
2call UnknownScript_0x78137
2jump UnknownScript_0x780a9
; 0x780a6
@@ -146,10 +146,10 @@
if_equal $1, UnknownScript_0x780ee
if_equal $0, UnknownScript_0x780f4
UnknownScript_0x780dc: ; 0x780dc
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x78128
UnknownScript_0x780e2: ; 0x780e2
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x7811b
UnknownScript_0x780e8: ; 0x780e8
checkbit2 $004b
@@ -273,11 +273,11 @@
iftrue UnknownScript_0x78213
checkcellnum $15
iftrue UnknownScript_0x78234
- checkbit1 $027f
+ checkevent $027f
iftrue UnknownScript_0x78188
2writetext UnknownText_0x785b8
keeptextopen
- setbit1 $027f
+ setevent $027f
2call UnknownScript_0x78228
2jump UnknownScript_0x7818b
; 0x78188
@@ -303,13 +303,13 @@
if_equal $1, UnknownScript_0x781d0
if_equal $0, UnknownScript_0x781d6
UnknownScript_0x781be: ; 0x781be
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x7820a
UnknownScript_0x781c4: ; 0x781c4
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x781fd
UnknownScript_0x781ca: ; 0x781ca
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x781f0
UnknownScript_0x781d0: ; 0x781d0
checkbit2 $0049
@@ -363,7 +363,7 @@
verbosegiveitem LEAF_STONE, 1
iffalse UnknownScript_0x78225
clearbit2 $0080
- setbit1 $0100
+ setevent $0100
2jump UnknownScript_0x78234
; 0x78225
@@ -421,7 +421,7 @@
loadfont
checktime $4
iffalse UnknownScript_0x78276
- checkbit1 $0546
+ checkevent $0546
iftrue UnknownScript_0x78270
playmusic $000c
2writetext UnknownText_0x785e4
@@ -431,7 +431,7 @@
loadtrainer OFFICER, KEITH
startbattle
returnafterbattle
- setbit1 $0546
+ setevent $0546
loadmovesprites
end
; 0x78270
@@ -560,7 +560,7 @@
CooltrainerfIreneScript: ; 0x782c4
talkaftercancel
loadfont
- checkbit1 EVENT_GOT_SOFT_SAND_FROM_KATE
+ checkevent EVENT_GOT_SOFT_SAND_FROM_KATE
iftrue UnknownScript_0x782d2
2writetext UnknownText_0x7877f
closetext
@@ -598,7 +598,7 @@
CooltrainerfJennScript: ; 0x782e4
talkaftercancel
loadfont
- checkbit1 EVENT_GOT_SOFT_SAND_FROM_KATE
+ checkevent EVENT_GOT_SOFT_SAND_FROM_KATE
iftrue UnknownScript_0x782f2
2writetext UnknownText_0x78836
closetext
@@ -636,13 +636,13 @@
CooltrainerfKateScript: ; 0x78304
talkaftercancel
loadfont
- checkbit1 EVENT_GOT_SOFT_SAND_FROM_KATE
+ checkevent EVENT_GOT_SOFT_SAND_FROM_KATE
iftrue UnknownScript_0x78319
2writetext UnknownText_0x788e2
keeptextopen
verbosegiveitem SOFT_SAND, 1
iffalse UnknownScript_0x7831d
- setbit1 EVENT_GOT_SOFT_SAND_FROM_KATE
+ setevent EVENT_GOT_SOFT_SAND_FROM_KATE
UnknownScript_0x78319: ; 0x78319
2writetext UnknownText_0x7892b
closetext
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -11,7 +11,7 @@
; 0x62d2d
UnknownScript_0x62d2d: ; 0x62d2d
- checkbit1 $00c0
+ checkevent $00c0
iffalse UnknownScript_0x62d38
disappear $2
appear $5
@@ -25,7 +25,7 @@
; 0x62d3d
UnknownScript_0x62d3d: ; 0x62d3d
- checkbit1 $00c0
+ checkevent $00c0
iffalse UnknownScript_0x62d62
showemote $0, $5, 20
spriteface $5, $2
@@ -46,15 +46,15 @@
TeacherScript_0x62d63: ; 0x62d63
faceplayer
loadfont
- checkbit1 $00c0
+ checkevent $00c0
iftrue UnknownScript_0x62d84
- checkbit1 EVENT_GOT_TM12_SWEET_SCENT
+ checkevent EVENT_GOT_TM12_SWEET_SCENT
iftrue UnknownScript_0x62d7e
2writetext UnknownText_0x62d9d
keeptextopen
verbosegiveitem TM_12, 1
iffalse UnknownScript_0x62d82
- setbit1 EVENT_GOT_TM12_SWEET_SCENT
+ setevent EVENT_GOT_TM12_SWEET_SCENT
UnknownScript_0x62d7e: ; 0x62d7e
2writetext UnknownText_0x62df6
closetext
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -61,11 +61,11 @@
loadfont
checkcellnum $16
iftrue UnknownScript_0x19c90f
- checkbit1 $0281
+ checkevent $0281
iftrue UnknownScript_0x19c8ec
2writetext UnknownText_0x19cd5a
keeptextopen
- setbit1 $0281
+ setevent $0281
2call UnknownScript_0x19c903
2jump UnknownScript_0x19c8ef
; 0x19c8ec
@@ -262,11 +262,11 @@
iftrue UnknownScript_0x19ca2f
checkcellnum $17
iftrue UnknownScript_0x19c90f
- checkbit1 $0283
+ checkevent $0283
iftrue UnknownScript_0x19c9a4
2writetext UnknownText_0x19cdf6
keeptextopen
- setbit1 $0283
+ setevent $0283
2call UnknownScript_0x19c903
2jump UnknownScript_0x19c9a7
; 0x19c9a4
@@ -292,10 +292,10 @@
if_equal $1, UnknownScript_0x19c9ec
if_equal $0, UnknownScript_0x19c9f2
UnknownScript_0x19c9da: ; 0x19c9da
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x19ca26
UnknownScript_0x19c9e0: ; 0x19c9e0
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x19ca19
UnknownScript_0x19c9e6: ; 0x19c9e6
checkbit2 $004b
@@ -388,7 +388,7 @@
loadfont
checktime $4
iffalse UnknownScript_0x19ca73
- checkbit1 $0547
+ checkevent $0547
iftrue UnknownScript_0x19ca6d
playmusic $000c
2writetext UnknownText_0x19ceea
@@ -398,7 +398,7 @@
loadtrainer OFFICER, DIRK
startbattle
returnafterbattle
- setbit1 $0547
+ setevent $0547
loadmovesprites
end
; 0x19ca6d
--- a/maps/Route35Goldenrodgate.asm
+++ b/maps/Route35Goldenrodgate.asm
@@ -9,11 +9,11 @@
OfficerScript_0x69d37: ; 0x69d37
faceplayer
loadfont
- checkbit1 EVENT_GOT_HP_UP_FROM_RANDY
+ checkevent EVENT_GOT_HP_UP_FROM_RANDY
iftrue UnknownScript_0x69d92
- checkbit1 EVENT_GAVE_KENYA
+ checkevent EVENT_GAVE_KENYA
iftrue UnknownScript_0x69d85
- checkbit1 EVENT_GOT_KENYA
+ checkevent EVENT_GOT_KENYA
iftrue UnknownScript_0x69d73
2writetext UnknownText_0x69ddd
yesorno
@@ -28,7 +28,7 @@
waitbutton
givepoke SPEAROW, 10, 0, 1, GiftSpearowName, GiftSpearowOTName
givepokeitem GiftSpearowMail
- setbit1 EVENT_GOT_KENYA
+ setevent EVENT_GOT_KENYA
UnknownScript_0x69d73: ; 0x69d73
2writetext UnknownText_0x69ed6
closetext
@@ -55,7 +55,7 @@
keeptextopen
verbosegiveitem HP_UP, 1
iffalse UnknownScript_0x69d96
- setbit1 EVENT_GOT_HP_UP_FROM_RANDY
+ setevent EVENT_GOT_HP_UP_FROM_RANDY
UnknownScript_0x69d92: ; 0x69d92
2writetext UnknownText_0x69fd9
closetext
@@ -77,7 +77,7 @@
PokefanFScript_0x69dc6: ; 0x69dc6
faceplayer
loadfont
- checkbit1 EVENT_FOUGHT_SUDOWOODO
+ checkevent EVENT_FOUGHT_SUDOWOODO
iftrue UnknownScript_0x69dd4
2writetext UnknownText_0x6a00a
closetext
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -107,7 +107,7 @@
checkcode $1
if_less_than $1, UnknownScript_0x6a271
special $0016
- clearbit1 $0308
+ clearevent $0308
UnknownScript_0x6a234: ; 0x6a234
setbit2 $0011
special $003c
@@ -153,7 +153,7 @@
iffalse UnknownScript_0x6a2a9
special $0016
iftrue UnknownScript_0x6a2af
- setbit1 $0308
+ setevent $0308
2writetext UnknownText_0x6a537
keeptextopen
2writetext UnknownText_0x6a56b
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -44,7 +44,7 @@
spriteface $0, $0
pause 10
dotrigger $0
- clearbit1 EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
+ clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $1
end
; 0x19403c
@@ -81,7 +81,7 @@
loadmovesprites
loadpokedata SUDOWOODO, 20
startbattle
- setbit1 EVENT_FOUGHT_SUDOWOODO
+ setevent EVENT_FOUGHT_SUDOWOODO
if_equal $2, UnknownScript_0x19407b
disappear $4
variablesprite $4, $26
@@ -107,13 +107,13 @@
LassScript_0x19408c: ; 0x19408c
faceplayer
loadfont
- checkbit1 $00ba
+ checkevent $00ba
iftrue UnknownScript_0x1940b3
- setbit1 $00b9
+ setevent $00b9
2writetext UnknownText_0x1942f1
closetext
loadmovesprites
- clearbit1 $0768
+ clearevent $0768
checkcode $9
if_equal $1, UnknownScript_0x1940ac
applymovement $9, MovementData_0x19424e
@@ -137,9 +137,9 @@
FisherScript_0x1940b9: ; 0x1940b9
faceplayer
loadfont
- checkbit1 EVENT_GOT_TM08_ROCK_SMASH
+ checkevent EVENT_GOT_TM08_ROCK_SMASH
iftrue UnknownScript_0x1940da
- checkbit1 EVENT_FOUGHT_SUDOWOODO
+ checkevent EVENT_FOUGHT_SUDOWOODO
iftrue UnknownScript_0x1940cd
2writetext UnknownText_0x19446f
closetext
@@ -152,7 +152,7 @@
keeptextopen
verbosegiveitem TM_08, 1
iffalse UnknownScript_0x1940de
- setbit1 EVENT_GOT_TM08_ROCK_SMASH
+ setevent EVENT_GOT_TM08_ROCK_SMASH
UnknownScript_0x1940da: ; 0x1940da
2writetext UnknownText_0x19452c
closetext
@@ -164,7 +164,7 @@
LassScript_0x1940e0: ; 0x1940e0
faceplayer
loadfont
- checkbit1 EVENT_FOUGHT_SUDOWOODO
+ checkevent EVENT_FOUGHT_SUDOWOODO
iftrue UnknownScript_0x1940ee
2writetext UnknownText_0x194626
closetext
@@ -209,11 +209,11 @@
iftrue UnknownScript_0x1941b4
checkcellnum $18
iftrue UnknownScript_0x1941d5
- checkbit1 $0285
+ checkevent $0285
iftrue UnknownScript_0x194129
2writetext UnknownText_0x1947aa
keeptextopen
- setbit1 $0285
+ setevent $0285
2call UnknownScript_0x1941c9
2jump UnknownScript_0x19412c
; 0x194129
@@ -239,10 +239,10 @@
if_equal $1, UnknownScript_0x194171
if_equal $0, UnknownScript_0x194177
UnknownScript_0x19415f: ; 0x19415f
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1941ab
UnknownScript_0x194165: ; 0x194165
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x19419e
UnknownScript_0x19416b: ; 0x19416b
checkbit2 $004b
@@ -299,7 +299,7 @@
verbosegiveitem FIRE_STONE, 1
iffalse UnknownScript_0x1941c6
clearbit2 $0081
- setbit1 $0101
+ setevent $0101
2jump UnknownScript_0x1941d5
; 0x1941c6
@@ -384,21 +384,21 @@
YoungsterScript_0x194201: ; 0x194201
faceplayer
loadfont
- checkbit1 EVENT_GOT_HARD_STONE_FROM_ARTHUR
+ checkevent EVENT_GOT_HARD_STONE_FROM_ARTHUR
iftrue UnknownScript_0x19422f
checkcode $b
if_not_equal THURSDAY, UnknownScript_0x194235
- checkbit1 EVENT_MET_ARTHUR_OF_THURSDAY
+ checkevent EVENT_MET_ARTHUR_OF_THURSDAY
iftrue UnknownScript_0x19421c
2writetext UnknownText_0x194800
keeptextopen
- setbit1 EVENT_MET_ARTHUR_OF_THURSDAY
+ setevent EVENT_MET_ARTHUR_OF_THURSDAY
UnknownScript_0x19421c: ; 0x19421c
2writetext UnknownText_0x19482d
keeptextopen
verbosegiveitem HARD_STONE, 1
iffalse UnknownScript_0x194233
- setbit1 EVENT_GOT_HARD_STONE_FROM_ARTHUR
+ setevent EVENT_GOT_HARD_STONE_FROM_ARTHUR
2writetext UnknownText_0x194847
closetext
loadmovesprites
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -43,7 +43,7 @@
; 0x6ab23
UnknownScript_0x6ab23: ; 0x6ab23
- checkbit1 $02d2
+ checkevent $02d2
iftrue UnknownScript_0x6ab46
checkcode $b
if_equal TUESDAY, UnknownScript_0x6ab42
@@ -99,43 +99,43 @@
; 0x6ab8c
UnknownScript_0x6ab8c: ; 0x6ab8c
- checkbit1 $0716
+ checkevent $0716
iftrue UnknownScript_0x6ab94
appear $3
UnknownScript_0x6ab94: ; 0x6ab94
- checkbit1 $0717
+ checkevent $0717
iftrue UnknownScript_0x6ab9c
appear $4
UnknownScript_0x6ab9c: ; 0x6ab9c
- checkbit1 $0718
+ checkevent $0718
iftrue UnknownScript_0x6aba4
appear $5
UnknownScript_0x6aba4: ; 0x6aba4
- checkbit1 $0719
+ checkevent $0719
iftrue UnknownScript_0x6abac
appear $6
UnknownScript_0x6abac: ; 0x6abac
- checkbit1 $071a
+ checkevent $071a
iftrue UnknownScript_0x6abb4
appear $7
UnknownScript_0x6abb4: ; 0x6abb4
- checkbit1 $071b
+ checkevent $071b
iftrue UnknownScript_0x6abbc
appear $8
UnknownScript_0x6abbc: ; 0x6abbc
- checkbit1 $071c
+ checkevent $071c
iftrue UnknownScript_0x6abc4
appear $9
UnknownScript_0x6abc4: ; 0x6abc4
- checkbit1 $071d
+ checkevent $071d
iftrue UnknownScript_0x6abcc
appear $a
UnknownScript_0x6abcc: ; 0x6abcc
- checkbit1 $071e
+ checkevent $071e
iftrue UnknownScript_0x6abd4
appear $b
UnknownScript_0x6abd4: ; 0x6abd4
- checkbit1 $071f
+ checkevent $071f
iftrue UnknownScript_0x6abdc
appear $c
UnknownScript_0x6abdc: ; 0x6abdc
@@ -160,7 +160,7 @@
checkcode $1
if_less_than $1, UnknownScript_0x6ac41
special $0016
- clearbit1 $0308
+ clearevent $0308
UnknownScript_0x6ac10: ; 0x6ac10
setbit2 $0011
special $003c
@@ -197,7 +197,7 @@
iffalse UnknownScript_0x6ac79
special $0016
iftrue UnknownScript_0x6ac7f
- setbit1 $0308
+ setevent $0308
2writetext UnknownText_0x6b021
keeptextopen
2writetext UnknownText_0x6b055
@@ -243,13 +243,13 @@
; 0x6ac91
UnknownScript_0x6ac91: ; 0x6ac91
- checkbit1 $0313
+ checkevent $0313
iftrue UnknownScript_0x6acaf
- checkbit1 $0314
+ checkevent $0314
iftrue UnknownScript_0x6acbe
- checkbit1 $0315
+ checkevent $0315
iftrue UnknownScript_0x6accd
- checkbit1 $0316
+ checkevent $0316
iftrue UnknownScript_0x6acdc
2writetext UnknownText_0x6b32b
closetext
@@ -262,7 +262,7 @@
keeptextopen
verbosegiveitem SUN_STONE, 1
iffalse UnknownScript_0x6aceb
- clearbit1 $0313
+ clearevent $0313
loadmovesprites
end
; 0x6acbe
@@ -272,7 +272,7 @@
keeptextopen
verbosegiveitem EVERSTONE, 1
iffalse UnknownScript_0x6aceb
- clearbit1 $0314
+ clearevent $0314
loadmovesprites
end
; 0x6accd
@@ -282,7 +282,7 @@
keeptextopen
verbosegiveitem GOLD_BERRY, 1
iffalse UnknownScript_0x6aceb
- clearbit1 $0315
+ clearevent $0315
loadmovesprites
end
; 0x6acdc
@@ -292,7 +292,7 @@
keeptextopen
verbosegiveitem BERRY, 1
iffalse UnknownScript_0x6aceb
- clearbit1 $0316
+ clearevent $0316
loadmovesprites
end
; 0x6aceb
@@ -327,7 +327,7 @@
YoungsterScript_0x6ad06: ; 0x6ad06
faceplayer
loadfont
- checkbit1 $0000
+ checkevent $0000
iffalse UnknownScript_0x6ad14
2writetext UnknownText_0x6b399
closetext
@@ -345,7 +345,7 @@
YoungsterScript_0x6ad1a: ; 0x6ad1a
faceplayer
loadfont
- checkbit1 $0000
+ checkevent $0000
iffalse UnknownScript_0x6ad28
2writetext UnknownText_0x6b40f
closetext
@@ -363,7 +363,7 @@
RockerScript_0x6ad2e: ; 0x6ad2e
faceplayer
loadfont
- checkbit1 $0000
+ checkevent $0000
iffalse UnknownScript_0x6ad3c
2writetext UnknownText_0x6b462
closetext
@@ -381,7 +381,7 @@
PokefanMScript_0x6ad42: ; 0x6ad42
faceplayer
loadfont
- checkbit1 $0000
+ checkevent $0000
iffalse UnknownScript_0x6ad50
2writetext UnknownText_0x6b4da
closetext
@@ -399,7 +399,7 @@
YoungsterScript_0x6ad56: ; 0x6ad56
faceplayer
loadfont
- checkbit1 $0000
+ checkevent $0000
iffalse UnknownScript_0x6ad64
2writetext UnknownText_0x6b54e
closetext
@@ -417,7 +417,7 @@
YoungsterScript_0x6ad6a: ; 0x6ad6a
faceplayer
loadfont
- checkbit1 $0000
+ checkevent $0000
iffalse UnknownScript_0x6ad78
2writetext UnknownText_0x6b5b0
closetext
@@ -435,7 +435,7 @@
LassScript_0x6ad7e: ; 0x6ad7e
faceplayer
loadfont
- checkbit1 $0000
+ checkevent $0000
iffalse UnknownScript_0x6ad8c
2writetext UnknownText_0x6b64b
closetext
@@ -453,7 +453,7 @@
YoungsterScript_0x6ad92: ; 0x6ad92
faceplayer
loadfont
- checkbit1 $0000
+ checkevent $0000
iffalse UnknownScript_0x6ada0
2writetext UnknownText_0x6b6b8
closetext
@@ -471,7 +471,7 @@
YoungsterScript_0x6ada6: ; 0x6ada6
faceplayer
loadfont
- checkbit1 $0000
+ checkevent $0000
iffalse UnknownScript_0x6adb4
2writetext UnknownText_0x6b71b
closetext
@@ -489,7 +489,7 @@
YoungsterScript_0x6adba: ; 0x6adba
faceplayer
loadfont
- checkbit1 $0000
+ checkevent $0000
iffalse UnknownScript_0x6adc8
2writetext UnknownText_0x6b76f
closetext
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -112,15 +112,15 @@
BugCatcherScript_0x1a8dbf: ; 0x1a8dbf
faceplayer
loadfont
- checkbit1 EVENT_GOT_MAGNET_FROM_SUNNY
+ checkevent EVENT_GOT_MAGNET_FROM_SUNNY
iftrue UnknownScript_0x1a8dfa
checkcode $b
if_not_equal SUNDAY, UnknownScript_0x1a8e00
- checkbit1 EVENT_MET_SUNNY_OF_SUNDAY
+ checkevent EVENT_MET_SUNNY_OF_SUNDAY
iftrue UnknownScript_0x1a8dda
2writetext UnknownText_0x1a8fc8
keeptextopen
- setbit1 EVENT_MET_SUNNY_OF_SUNDAY
+ setevent EVENT_MET_SUNNY_OF_SUNDAY
UnknownScript_0x1a8dda: ; 0x1a8dda
checkbit2 $0063
iftrue UnknownScript_0x1a8de7
@@ -135,7 +135,7 @@
UnknownScript_0x1a8deb: ; 0x1a8deb
verbosegiveitem MAGNET, 1
iffalse UnknownScript_0x1a8dfe
- setbit1 EVENT_GOT_MAGNET_FROM_SUNNY
+ setevent EVENT_GOT_MAGNET_FROM_SUNNY
2writetext UnknownText_0x1a905a
closetext
loadmovesprites
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -94,11 +94,11 @@
iftrue UnknownScript_0x1a1df6
checkcellnum $1a
iftrue UnknownScript_0x1a1e17
- checkbit1 $0289
+ checkevent $0289
iftrue UnknownScript_0x1a1d6b
2writetext UnknownText_0x1a20ec
keeptextopen
- setbit1 $0289
+ setevent $0289
2call UnknownScript_0x1a1e0b
2jump UnknownScript_0x1a1d6e
; 0x1a1d6b
@@ -124,13 +124,13 @@
if_equal $1, UnknownScript_0x1a1db3
if_equal $0, UnknownScript_0x1a1db9
UnknownScript_0x1a1da1: ; 0x1a1da1
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a1ded
UnknownScript_0x1a1da7: ; 0x1a1da7
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x1a1de0
UnknownScript_0x1a1dad: ; 0x1a1dad
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1a1dd3
UnknownScript_0x1a1db3: ; 0x1a1db3
checkbit2 $0045
@@ -184,7 +184,7 @@
verbosegiveitem THUNDERSTONE, 1
iffalse UnknownScript_0x1a1e08
clearbit2 $0082
- setbit1 $0102
+ setevent $0102
2jump UnknownScript_0x1a1e17
; 0x1a1e08
@@ -265,11 +265,11 @@
iftrue UnknownScript_0x1a1e75
checkcellnum $1b
iftrue UnknownScript_0x1a1ef5
- checkbit1 $028b
+ checkevent $028b
iftrue UnknownScript_0x1a1e5e
2writetext UnknownText_0x1a200e
keeptextopen
- setbit1 $028b
+ setevent $028b
2call UnknownScript_0x1a1ee9
2jump UnknownScript_0x1a1e61
; 0x1a1e5e
@@ -295,13 +295,13 @@
if_equal $1, UnknownScript_0x1a1ea6
if_equal $0, UnknownScript_0x1a1eac
UnknownScript_0x1a1e94: ; 0x1a1e94
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a1ee0
UnknownScript_0x1a1e9a: ; 0x1a1e9a
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x1a1ed3
UnknownScript_0x1a1ea0: ; 0x1a1ea0
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1a1ec6
UnknownScript_0x1a1ea6: ; 0x1a1ea6
checkbit2 $0049
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -45,11 +45,11 @@
iftrue UnknownScript_0x1a5b6e
checkpoke PIKACHU
iffalse UnknownScript_0x1a5b5c
- checkbit1 EVENT_SHOWED_DEREK_PIKACHU
+ checkevent EVENT_SHOWED_DEREK_PIKACHU
iftrue UnknownScript_0x1a5b33
2writetext UnknownText_0x1a5cf8
keeptextopen
- setbit1 EVENT_SHOWED_DEREK_PIKACHU
+ setevent EVENT_SHOWED_DEREK_PIKACHU
2call UnknownScript_0x1a5b62
2jump UnknownScript_0x1a5b36
; 0x1a5b33
@@ -216,7 +216,7 @@
loadfont
checktime $4
iffalse UnknownScript_0x1a5be5
- checkbit1 $05c2
+ checkevent $05c2
iftrue UnknownScript_0x1a5bdf
2writetext UnknownText_0x1a5ee8
closetext
@@ -225,7 +225,7 @@
loadtrainer POKEFANF, JAIME
startbattle
returnafterbattle
- setbit1 $05c2
+ setevent $05c2
loadmovesprites
end
; 0x1a5bdf
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -9,7 +9,7 @@
TwinScript_0x9cc76: ; 0x9cc76
faceplayer
loadfont
- checkbit1 EVENT_HEALED_MOOMOO
+ checkevent EVENT_HEALED_MOOMOO
iftrue UnknownScript_0x9cc87
2writetext UnknownText_0x9cd2e
closetext
@@ -29,7 +29,7 @@
TwinScript_0x9cc90: ; 0x9cc90
faceplayer
loadfont
- checkbit1 EVENT_HEALED_MOOMOO
+ checkevent EVENT_HEALED_MOOMOO
iftrue UnknownScript_0x9cca1
2writetext UnknownText_0x9cd2e
closetext
@@ -48,7 +48,7 @@
TaurosScript_0x9ccaa: ; 0x9ccaa
loadfont
- checkbit1 EVENT_HEALED_MOOMOO
+ checkevent EVENT_HEALED_MOOMOO
iftrue UnknownScript_0x9cd25
2writetext UnknownText_0x9cd70
writebyte MILTANK
@@ -55,7 +55,7 @@
special $005f
keeptextopen
2writetext UnknownText_0x9cd80
- checkbit1 EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO
+ checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO
iftrue UnknownScript_0x9ccc6
closetext
loadmovesprites
@@ -109,7 +109,7 @@
2writetext UnknownText_0x9ce1b
closetext
loadmovesprites
- setbit1 EVENT_HEALED_MOOMOO
+ setevent EVENT_HEALED_MOOMOO
end
; 0x9cd19
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -9,12 +9,12 @@
PokefanMScript_0x9ceb4: ; 0x9ceb4
faceplayer
loadfont
- checkbit1 EVENT_HEALED_MOOMOO
+ checkevent EVENT_HEALED_MOOMOO
iftrue UnknownScript_0x9cec5
2writetext UnknownText_0x9cf38
closetext
loadmovesprites
- setbit1 EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO
+ setevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO
end
; 0x9cec5
@@ -71,9 +71,9 @@
PokefanFScript_0x9cf0e: ; 0x9cf0e
faceplayer
loadfont
- checkbit1 EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM
+ checkevent EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM
iftrue UnknownScript_0x9cf2f
- checkbit1 EVENT_HEALED_MOOMOO
+ checkevent EVENT_HEALED_MOOMOO
iftrue UnknownScript_0x9cf22
2writetext UnknownText_0x9d0f6
closetext
@@ -86,7 +86,7 @@
keeptextopen
verbosegiveitem TM_13, 1
iffalse UnknownScript_0x9cf33
- setbit1 EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM
+ setevent EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM
UnknownScript_0x9cf2f: ; 0x9cf2f
2writetext UnknownText_0x9d1c7
closetext
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -11,7 +11,7 @@
; 0x1a6165
UnknownScript_0x1a6165: ; 0x1a6165
- clearbit1 $07cf
+ clearevent $07cf
checkcode $b
if_equal MONDAY, UnknownScript_0x1a6171
disappear $a
@@ -164,21 +164,21 @@
BuenaScript_0x1a61d9: ; 0x1a61d9
faceplayer
loadfont
- checkbit1 EVENT_GOT_SHARP_BEAK_FROM_MONICA
+ checkevent EVENT_GOT_SHARP_BEAK_FROM_MONICA
iftrue UnknownScript_0x1a6207
checkcode $b
if_not_equal MONDAY, UnknownScript_0x1a620d
- checkbit1 EVENT_MET_MONICA_OF_MONDAY
+ checkevent EVENT_MET_MONICA_OF_MONDAY
iftrue UnknownScript_0x1a61f4
2writetext UnknownText_0x1a6606
keeptextopen
- setbit1 EVENT_MET_MONICA_OF_MONDAY
+ setevent EVENT_MET_MONICA_OF_MONDAY
UnknownScript_0x1a61f4: ; 0x1a61f4
2writetext UnknownText_0x1a6636
keeptextopen
verbosegiveitem SHARP_BEAK, 1
iffalse UnknownScript_0x1a620b
- setbit1 EVENT_GOT_SHARP_BEAK_FROM_MONICA
+ setevent EVENT_GOT_SHARP_BEAK_FROM_MONICA
2writetext UnknownText_0x1a666c
closetext
loadmovesprites
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -11,7 +11,7 @@
; 0x9f665
UnknownScript_0x9f665: ; 0x9f665
- clearbit1 $07cf
+ clearevent $07cf
return
; 0x9f669
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -26,7 +26,7 @@
disappear $a
pause 10
dotrigger $0
- clearbit1 EVENT_SAW_SUICUNE_ON_ROUTE_36
+ clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36
domaptrigger GROUP_ROUTE_36, MAP_ROUTE_36, $1
end
; 0x1a9233
@@ -61,11 +61,11 @@
iftrue UnknownScript_0x1a92dc
checkcellnum $1d
iftrue UnknownScript_0x1a92fd
- checkbit1 $028f
+ checkevent $028f
iftrue UnknownScript_0x1a9268
2writetext UnknownText_0x1a93ab
keeptextopen
- setbit1 $028f
+ setevent $028f
2call UnknownScript_0x1a92f1
2jump UnknownScript_0x1a926b
; 0x1a9268
@@ -90,13 +90,13 @@
if_equal $1, UnknownScript_0x1a92a6
if_equal $0, UnknownScript_0x1a92ac
UnknownScript_0x1a929a: ; 0x1a929a
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a92d3
UnknownScript_0x1a92a0: ; 0x1a92a0
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x1a92c6
UnknownScript_0x1a92a6: ; 0x1a92a6
- checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT
+ checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x1a92b9
UnknownScript_0x1a92ac: ; 0x1a92ac
loadtrainer FISHER, TULLY1
@@ -138,7 +138,7 @@
verbosegiveitem WATER_STONE, 1
iffalse UnknownScript_0x1a92ee
clearbit2 $0084
- setbit1 $0103
+ setevent $0103
2jump UnknownScript_0x1a92fd
; 0x1a92ee
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -11,7 +11,7 @@
; 0x19d051
UnknownScript_0x19d051: ; 0x19d051
- checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT
+ checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x19d05c
domaptrigger GROUP_ROUTE_43_GATE, MAP_ROUTE_43_GATE, $0
return
@@ -108,11 +108,11 @@
iftrue UnknownScript_0x19d0cf
checkcellnum $1e
iftrue UnknownScript_0x19d138
- checkbit1 $0291
+ checkevent $0291
iftrue UnknownScript_0x19d0b8
2writetext UnknownText_0x19d359
keeptextopen
- setbit1 $0291
+ setevent $0291
2call UnknownScript_0x19d12c
2jump UnknownScript_0x19d0bb
; 0x19d0b8
@@ -137,13 +137,13 @@
if_equal $1, UnknownScript_0x19d0f6
if_equal $0, UnknownScript_0x19d0fc
UnknownScript_0x19d0ea: ; 0x19d0ea
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x19d123
UnknownScript_0x19d0f0: ; 0x19d0f0
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x19d116
UnknownScript_0x19d0f6: ; 0x19d0f6
- checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT
+ checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x19d109
UnknownScript_0x19d0fc: ; 0x19d0fc
loadtrainer POKEMANIAC, BRENT1
@@ -305,11 +305,11 @@
iftrue UnknownScript_0x19d245
checkpoke CLEFAIRY
iffalse UnknownScript_0x19d233
- checkbit1 EVENT_SHOWED_TIFFANY_CLEFAIRY
+ checkevent EVENT_SHOWED_TIFFANY_CLEFAIRY
iftrue UnknownScript_0x19d1aa
2writetext UnknownText_0x19d618
keeptextopen
- setbit1 EVENT_SHOWED_TIFFANY_CLEFAIRY
+ setevent EVENT_SHOWED_TIFFANY_CLEFAIRY
2call UnknownScript_0x19d239
2jump UnknownScript_0x19d1ad
; 0x19d1aa
@@ -334,13 +334,13 @@
if_equal $1, UnknownScript_0x19d1e8
if_equal $0, UnknownScript_0x19d1ee
UnknownScript_0x19d1dc: ; 0x19d1dc
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x19d215
UnknownScript_0x19d1e2: ; 0x19d1e2
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x19d208
UnknownScript_0x19d1e8: ; 0x19d1e8
- checkbit1 EVENT_CLEARED_RADIO_TOWER
+ checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x19d1fb
UnknownScript_0x19d1ee: ; 0x19d1ee
loadtrainer PICNICKER, TIFFANY3
@@ -382,7 +382,7 @@
verbosegiveitem PINK_BOW, 1
iffalse UnknownScript_0x19d230
clearbit2 $0085
- setbit1 $0104
+ setevent $0104
2jump UnknownScript_0x19d245
; 0x19d230
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -24,7 +24,7 @@
; 0x19abca
UnknownScript_0x19abca: ; 0x19abca
- checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT
+ checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x19abd5
domaptrigger GROUP_ROUTE_43, MAP_ROUTE_43, $0
return
@@ -124,13 +124,13 @@
OfficerScript_0x19ac85: ; 0x19ac85
faceplayer
loadfont
- checkbit1 EVENT_GOT_TM36_SLUDGE_BOMB
+ checkevent EVENT_GOT_TM36_SLUDGE_BOMB
iftrue UnknownScript_0x19ac9c
2writetext UnknownText_0x19ad9b
keeptextopen
verbosegiveitem TM_36, 1
iffalse UnknownScript_0x19aca0
- setbit1 EVENT_GOT_TM36_SLUDGE_BOMB
+ setevent EVENT_GOT_TM36_SLUDGE_BOMB
loadmovesprites
end
; 0x19ac9c
--- a/maps/Route43MahoganyGate.asm
+++ b/maps/Route43MahoganyGate.asm
@@ -9,7 +9,7 @@
OfficerScript_0x19ab0b: ; 0x19ab0b
faceplayer
loadfont
- checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT
+ checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x19ab19
2writetext UnknownText_0x19ab1f
closetext
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -34,11 +34,11 @@
iftrue UnknownScript_0x19d86a
checkcellnum $20
iftrue UnknownScript_0x19d8eb
- checkbit1 $0295
+ checkevent $0295
iftrue UnknownScript_0x19d853
2writetext UnknownText_0x19dbf3
keeptextopen
- setbit1 $0295
+ setevent $0295
2call UnknownScript_0x19d8df
2jump UnknownScript_0x19d856
; 0x19d853
@@ -62,10 +62,10 @@
if_equal $1, UnknownScript_0x19d887
if_equal $0, UnknownScript_0x19d88d
UnknownScript_0x19d881: ; 0x19d881
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x19d8a7
UnknownScript_0x19d887: ; 0x19d887
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x19d89a
UnknownScript_0x19d88d: ; 0x19d88d
loadtrainer BIRD_KEEPER, VANCE1
@@ -90,14 +90,14 @@
startbattle
returnafterbattle
clearbit2 $0079
- checkbit1 EVENT_VANCE_CARBOS
+ checkevent EVENT_VANCE_CARBOS
iftrue UnknownScript_0x19d8cb
- checkbit1 $0267
+ checkevent $0267
iftrue UnknownScript_0x19d8ca
2call UnknownScript_0x19d90a
verbosegiveitem CARBOS, 1
iffalse UnknownScript_0x19d903
- setbit1 $0267
+ setevent $0267
2jump UnknownScript_0x19d8eb
; 0x19d8ca
@@ -111,8 +111,8 @@
closetext
verbosegiveitem CARBOS, 1
iffalse UnknownScript_0x19d903
- clearbit1 EVENT_VANCE_CARBOS
- setbit1 $0267
+ clearevent EVENT_VANCE_CARBOS
+ setevent $0267
2jump UnknownScript_0x19d8eb
; 0x19d8df
@@ -162,7 +162,7 @@
; 0x19d903
UnknownScript_0x19d903: ; 0x19d903
- setbit1 EVENT_VANCE_CARBOS
+ setevent EVENT_VANCE_CARBOS
jumpstd $0021
end
; 0x19d90a
@@ -231,11 +231,11 @@
iftrue UnknownScript_0x19d9b4
checkcellnum $21
iftrue UnknownScript_0x19d8eb
- checkbit1 $0297
+ checkevent $0297
iftrue UnknownScript_0x19d957
2writetext UnknownText_0x19daa8
keeptextopen
- setbit1 $0297
+ setevent $0297
2call UnknownScript_0x19d8df
2jump UnknownScript_0x19d95a
; 0x19d957
@@ -259,10 +259,10 @@
if_equal $1, UnknownScript_0x19d98b
if_equal $0, UnknownScript_0x19d991
UnknownScript_0x19d985: ; 0x19d985
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x19d9ab
UnknownScript_0x19d98b: ; 0x19d98b
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x19d99e
UnknownScript_0x19d991: ; 0x19d991
loadtrainer FISHER, WILTON1
@@ -292,11 +292,11 @@
UnknownScript_0x19d9b4: ; 0x19d9b4
2call UnknownScript_0x19d8fb
- checkbit1 EVENT_WILTON_HAS_ULTRA_BALL
+ checkevent EVENT_WILTON_HAS_ULTRA_BALL
iftrue UnknownScript_0x19d9c9
- checkbit1 EVENT_WILTON_HAS_GREAT_BALL
+ checkevent EVENT_WILTON_HAS_GREAT_BALL
iftrue UnknownScript_0x19d9d2
- checkbit1 EVENT_WILTON_HAS_POKE_BALL
+ checkevent EVENT_WILTON_HAS_POKE_BALL
iftrue UnknownScript_0x19d9db
UnknownScript_0x19d9c9: ; 0x19d9c9
verbosegiveitem ULTRA_BALL, 1
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -32,12 +32,12 @@
loadfont
checkcellnum $22
iftrue UnknownScript_0x19e0e4
- checkbit1 $0299
+ checkevent $0299
iftrue UnknownScript_0x19e0cd
special $0095
2writetext UnknownText_0x19e5e2
closetext
- setbit1 $0299
+ setevent $0299
2call UnknownScript_0x19e11b
2jump UnknownScript_0x19e0d0
; 0x19e0cd
@@ -60,12 +60,12 @@
iftrue UnknownScript_0x19e10c
checktime $4
iftrue UnknownScript_0x19e112
- checkbit1 $026a
+ checkevent $026a
iffalse UnknownScript_0x19e127
2call UnknownScript_0x19e137
verbosegiveitem PP_UP, 1
iffalse UnknownScript_0x19e118
- clearbit1 $026a
+ clearevent $026a
special $0095
2jump UnknownScript_0x19e127
; 0x19e10c
@@ -134,7 +134,7 @@
; 0x19e13f
UnknownScript_0x19e13f: ; 0x19e13f
- setbit1 EVENT_PARRY_IRON
+ setevent EVENT_PARRY_IRON
jumpstd $0021
end
; 0x19e146
@@ -230,11 +230,11 @@
iftrue UnknownScript_0x19e1b8
checkcellnum $23
iftrue UnknownScript_0x19e127
- checkbit1 $029b
+ checkevent $029b
iftrue UnknownScript_0x19e1a1
2writetext UnknownText_0x19e434
keeptextopen
- setbit1 $029b
+ setevent $029b
2call UnknownScript_0x19e11b
2jump UnknownScript_0x19e1a4
; 0x19e1a1
@@ -258,10 +258,10 @@
if_equal $1, UnknownScript_0x19e1d5
if_equal $0, UnknownScript_0x19e1db
UnknownScript_0x19e1cf: ; 0x19e1c
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x19e1f5
UnknownScript_0x19e1d5: ; 0x19e1d5
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x19e1e8
UnknownScript_0x19e1db: ; 0x19e1db
loadtrainer HIKER, PARRY3
@@ -286,14 +286,14 @@
startbattle
returnafterbattle
clearbit2 $007b
- checkbit1 EVENT_PARRY_IRON
+ checkevent EVENT_PARRY_IRON
iftrue UnknownScript_0x19e219
- checkbit1 $0268
+ checkevent $0268
iftrue UnknownScript_0x19e218
2call UnknownScript_0x19e146
verbosegiveitem IRON, 1
iffalse UnknownScript_0x19e13f
- setbit1 $0268
+ setevent $0268
2jump UnknownScript_0x19e127
; 0x19e218
@@ -307,8 +307,8 @@
closetext
verbosegiveitem IRON, 1
iffalse UnknownScript_0x19e13f
- clearbit1 EVENT_PARRY_IRON
- setbit1 $0268
+ clearevent EVENT_PARRY_IRON
+ setevent $0268
2jump UnknownScript_0x19e127
; 0x19e22d
@@ -402,7 +402,7 @@
YoungsterScript_0x19e269: ; 0x19e269
faceplayer
loadfont
- checkbit1 $05c3
+ checkevent $05c3
iftrue UnknownScript_0x19e285
2writetext UnknownText_0x19e87f
closetext
@@ -411,7 +411,7 @@
loadtrainer CAMPER, QUENTIN
startbattle
returnafterbattle
- setbit1 $05c3
+ setevent $05c3
loadmovesprites
end
; 0x19e285
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -63,11 +63,11 @@
iftrue UnknownScript_0x1a96da
checkcellnum $24
iftrue UnknownScript_0x1a975b
- checkbit1 $029d
+ checkevent $029d
iftrue UnknownScript_0x1a96c3
2writetext UnknownText_0x1a98c6
keeptextopen
- setbit1 $029d
+ setevent $029d
2call UnknownScript_0x1a974f
2jump UnknownScript_0x1a96c6
; 0x1a96c3
@@ -91,10 +91,10 @@
if_equal $1, UnknownScript_0x1a96f7
if_equal $0, UnknownScript_0x1a96fd
UnknownScript_0x1a96f1: ; 0x1a96f1
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a9717
UnknownScript_0x1a96f7: ; 0x1a96f7
- checkbit1 $0044
+ checkevent $0044
iftrue UnknownScript_0x1a970a
UnknownScript_0x1a96fd: ; 0x1a96fd
loadtrainer PICNICKER, ERIN1
@@ -119,14 +119,14 @@
startbattle
returnafterbattle
clearbit2 $007c
- checkbit1 EVENT_ERIN_CALCIUM
+ checkevent EVENT_ERIN_CALCIUM
iftrue UnknownScript_0x1a973b
- checkbit1 $0269
+ checkevent $0269
iftrue UnknownScript_0x1a973a
2call UnknownScript_0x1a9772
verbosegiveitem CALCIUM, 1
iffalse UnknownScript_0x1a976b
- setbit1 $0269
+ setevent $0269
2jump UnknownScript_0x1a975b
; 0x1a973a
@@ -140,8 +140,8 @@
closetext
verbosegiveitem CALCIUM, 1
iffalse UnknownScript_0x1a976b
- clearbit1 EVENT_ERIN_CALCIUM
- setbit1 $0269
+ clearevent EVENT_ERIN_CALCIUM
+ setevent $0269
2jump UnknownScript_0x1a975b
; 0x1a974f
@@ -181,7 +181,7 @@
; 0x1a976b
UnknownScript_0x1a976b: ; 0x1a976b
- setbit1 EVENT_ERIN_CALCIUM
+ setevent EVENT_ERIN_CALCIUM
jumpstd $002b
end
; 0x1a9772
--- a/maps/Route5CleanseTagSpeechHouse.asm
+++ b/maps/Route5CleanseTagSpeechHouse.asm
@@ -9,13 +9,13 @@
GrannyScript_0x18b634: ; 0x18b634
faceplayer
loadfont
- checkbit1 EVENT_GOT_CLEANSE_TAG
+ checkevent EVENT_GOT_CLEANSE_TAG
iftrue UnknownScript_0x18b649
2writetext UnknownText_0x18b655
keeptextopen
verbosegiveitem CLEANSE_TAG, 1
iffalse UnknownScript_0x18b64d
- setbit1 EVENT_GOT_CLEANSE_TAG
+ setevent EVENT_GOT_CLEANSE_TAG
UnknownScript_0x18b649: ; 0x18b649
2writetext UnknownText_0x18b6a7
closetext
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -16,7 +16,7 @@
OfficerScript_0x1926ea: ; 0x1926ea
faceplayer
loadfont
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x1926f8
2writetext UnknownText_0x1926fe
closetext
--- a/maps/Route7SaffronGate.asm
+++ b/maps/Route7SaffronGate.asm
@@ -9,7 +9,7 @@
OfficerScript_0x73518: ; 0x73518
faceplayer
loadfont
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x73526
2writetext UnknownText_0x7352c
closetext
--- a/maps/RuinsofAlphAerodactylChamber.asm
+++ b/maps/RuinsofAlphAerodactylChamber.asm
@@ -15,7 +15,7 @@
; 0x58dad
UnknownScript_0x58dad: ; 0x58dad
- checkbit1 EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
+ checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
iftrue UnknownScript_0x58db4
end
; 0x58db4
@@ -30,11 +30,11 @@
; 0x58db9
UnknownScript_0x58db9: ; 0x58db9
- checkbit1 EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
+ checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
iftrue UnknownScript_0x58dc3
changeblock $4, $0, $2e
UnknownScript_0x58dc3: ; 0x58dc3
- checkbit1 $02a3
+ checkevent $02a3
iffalse UnknownScript_0x58dca
return
; 0x58dca
@@ -69,8 +69,8 @@
; 0x58df7
UnknownScript_0x58df7: ; 0x58df7
- setbit1 $0705
- setbit1 $02a3
+ setevent $0705
+ setevent $02a3
setbit2 $002d
domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1
earthquake 30
@@ -106,7 +106,7 @@
; 0x58e35
MapRuinsofAlphAerodactylChamberSignpost5Script: ; 0x58e35
- checkbit1 EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
+ checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
iftrue UnknownScript_0x58e46
loadfont
2writetext UnknownText_0x58e81
--- a/maps/RuinsofAlphHoOhChamber.asm
+++ b/maps/RuinsofAlphHoOhChamber.asm
@@ -16,7 +16,7 @@
UnknownScript_0x5856d: ; 0x5856d
special $008d
- checkbit1 EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
+ checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
iftrue UnknownScript_0x58577
end
; 0x58577
@@ -31,11 +31,11 @@
; 0x5857c
UnknownScript_0x5857c: ; 0x5857c
- checkbit1 EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
+ checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
iftrue UnknownScript_0x58586
changeblock $4, $0, $2e
UnknownScript_0x58586: ; 0x58586
- checkbit1 $02a0
+ checkevent $02a0
iffalse UnknownScript_0x5858d
return
; 0x5858d
@@ -70,8 +70,8 @@
; 0x585ba
UnknownScript_0x585ba: ; 0x585ba
- setbit1 $0705
- setbit1 $02a0
+ setevent $0705
+ setevent $02a0
setbit2 $002e
domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1
earthquake 30
@@ -107,7 +107,7 @@
; 0x585f8
MapRuinsofAlphHoOhChamberSignpost5Script: ; 0x585f8
- checkbit1 EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
+ checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
iftrue UnknownScript_0x58609
loadfont
2writetext UnknownText_0x58644
--- a/maps/RuinsofAlphInnerChamber.asm
+++ b/maps/RuinsofAlphInnerChamber.asm
@@ -28,8 +28,8 @@
closetext
loadmovesprites
dotrigger $0
- setbit1 EVENT_MADE_UNOWN_APPEAR_IN_RUINS
- clearbit1 $078e
+ setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
+ clearevent $078e
end
; 0x58f7d
--- a/maps/RuinsofAlphKabutoChamber.asm
+++ b/maps/RuinsofAlphKabutoChamber.asm
@@ -15,7 +15,7 @@
; 0x5872b
UnknownScript_0x5872b: ; 0x5872b
- checkbit1 EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
+ checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
iftrue UnknownScript_0x58732
end
; 0x58732
@@ -33,11 +33,11 @@
; 0x58737
UnknownScript_0x58737: ; 0x58737
- checkbit1 EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
+ checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
iftrue UnknownScript_0x58741
changeblock $4, $0, $2e
UnknownScript_0x58741: ; 0x58741
- checkbit1 $02a1
+ checkevent $02a1
iffalse UnknownScript_0x58748
return
; 0x58748
@@ -76,10 +76,10 @@
; 0x58778
UnknownScript_0x58778: ; 0x58778
- setbit1 $0705
- setbit1 $02a1
+ setevent $0705
+ setevent $02a1
setbit2 $002b
- setbit1 $074e
+ setevent $074e
domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1
earthquake 30
showemote $0, $0, 15
@@ -101,9 +101,9 @@
loadfont
checkcode $e
if_equal 26, UnknownScript_0x587cf
- checkbit1 EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
+ checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
iftrue UnknownScript_0x587c9
- checkbit1 $02a1
+ checkevent $02a1
iffalse UnknownScript_0x587c0
2writetext UnknownText_0x589b8
keeptextopen
@@ -147,7 +147,7 @@
; 0x587e6
MapRuinsofAlphKabutoChamberSignpost5Script: ; 0x587e6
- checkbit1 EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
+ checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
iftrue UnknownScript_0x587f7
loadfont
2writetext UnknownText_0x58ad9
--- a/maps/RuinsofAlphOmanyteChamber.asm
+++ b/maps/RuinsofAlphOmanyteChamber.asm
@@ -16,7 +16,7 @@
UnknownScript_0x58be9: ; 0x58be9
special $0084
- checkbit1 EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
+ checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
iftrue UnknownScript_0x58bf3
end
; 0x58bf3
@@ -31,11 +31,11 @@
; 0x58bf8
UnknownScript_0x58bf8: ; 0x58bf8
- checkbit1 EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
+ checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
iftrue UnknownScript_0x58c02
changeblock $4, $0, $2e
UnknownScript_0x58c02: ; 0x58c02
- checkbit1 $02a2
+ checkevent $02a2
iffalse UnknownScript_0x58c09
return
; 0x58c09
@@ -70,8 +70,8 @@
; 0x58c36
UnknownScript_0x58c36: ; 0x58c36
- setbit1 $0705
- setbit1 $02a2
+ setevent $0705
+ setevent $02a2
setbit2 $002c
domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1
earthquake 30
@@ -107,7 +107,7 @@
; 0x58c74
MapRuinsofAlphOmanyteChamberSignpost5Script: ; 0x58c74
- checkbit1 EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
+ checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
iftrue UnknownScript_0x58c85
loadfont
2writetext UnknownText_0x58cc0
--- a/maps/RuinsofAlphOutside.asm
+++ b/maps/RuinsofAlphOutside.asm
@@ -25,7 +25,7 @@
UnknownScript_0x5800f: ; 0x5800f
checkbit2 $000c
iftrue UnknownScript_0x5802c
- checkbit1 EVENT_MADE_UNOWN_APPEAR_IN_RUINS
+ checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
iftrue UnknownScript_0x5801e
2jump UnknownScript_0x5802c
; 0x5801e
@@ -81,9 +81,9 @@
FisherScript_0x58061: ; 0x58061
faceplayer
loadfont
- checkbit1 $00bc
+ checkevent $00bc
iftrue UnknownScript_0x58070
- setbit1 $00bc
+ setevent $00bc
2writetext UnknownText_0x583a4
keeptextopen
UnknownScript_0x58070: ;0x58070
--- a/maps/RuinsofAlphResearchCenter.asm
+++ b/maps/RuinsofAlphResearchCenter.asm
@@ -90,7 +90,7 @@
if_equal 26, UnknownScript_0x5920b
checkbit2 $000c
iftrue UnknownScript_0x59205
- checkbit1 EVENT_MADE_UNOWN_APPEAR_IN_RUINS
+ checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
iftrue UnknownScript_0x591ff
2writetext UnknownText_0x593ed
closetext
@@ -116,7 +116,7 @@
2writetext UnknownText_0x594cb
closetext
loadmovesprites
- clearbit1 $078f
+ clearevent $078f
end
; 0x59214
@@ -125,7 +125,7 @@
loadfont
checkcode $e
if_equal 26, UnknownScript_0x5922e
- checkbit1 EVENT_MADE_UNOWN_APPEAR_IN_RUINS
+ checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
iftrue UnknownScript_0x59228
2writetext UnknownText_0x5954f
closetext
@@ -149,7 +149,7 @@
MapRuinsofAlphResearchCenterSignpost1Script: ; 0x59234
loadfont
- checkbit1 $0704
+ checkevent $0704
iftrue UnknownScript_0x59241
checkcode $e
if_equal 26, UnknownScript_0x59247
@@ -169,7 +169,7 @@
MapRuinsofAlphResearchCenterSignpost2Script: ; 0x5924d
loadfont
- checkbit1 $0704
+ checkevent $0704
iftrue UnknownScript_0x5925a
checkcode $e
if_equal 26, UnknownScript_0x59260
--- a/maps/SafariZoneWardensHome.asm
+++ b/maps/SafariZoneWardensHome.asm
@@ -9,12 +9,12 @@
LassScript_0x1965c6: ; 0x1965c6
faceplayer
loadfont
- checkbit1 EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER
+ checkevent EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER
iftrue UnknownScript_0x1965d7
2writetext UnknownText_0x1965e6
closetext
loadmovesprites
- setbit1 EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER
+ setevent EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER
end
; 0x1965d7
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -18,7 +18,7 @@
LassScript_0x19932a: ; 0x19932a
faceplayer
loadfont
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x199338
2writetext UnknownText_0x19938d
closetext
@@ -36,7 +36,7 @@
PokefanMScript_0x19933e: ; 0x19933e
faceplayer
loadfont
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x19934c
2writetext UnknownText_0x199460
closetext
@@ -62,7 +62,7 @@
FisherScript_0x199358: ; 0x199358
faceplayer
loadfont
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x199366
2writetext UnknownText_0x1995fc
closetext
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -18,11 +18,11 @@
loadtrainer SABRINA, 1
startbattle
returnafterbattle
- setbit1 EVENT_BEAT_SABRINA
- setbit1 EVENT_BEAT_MEDIUM_REBECCA
- setbit1 EVENT_BEAT_MEDIUM_DORIS
- setbit1 EVENT_BEAT_PSYCHIC_FRANKLIN
- setbit1 EVENT_BEAT_PSYCHIC_JARED
+ setevent EVENT_BEAT_SABRINA
+ setevent EVENT_BEAT_MEDIUM_REBECCA
+ setevent EVENT_BEAT_MEDIUM_DORIS
+ setevent EVENT_BEAT_PSYCHIC_FRANKLIN
+ setevent EVENT_BEAT_PSYCHIC_JARED
loadfont
2writetext UnknownText_0x189e95
playsound $009c
@@ -160,7 +160,7 @@
SaffronGymGuyScript: ; 0x189cbb
faceplayer
loadfont
- checkbit1 EVENT_BEAT_SABRINA
+ checkevent EVENT_BEAT_SABRINA
iftrue .SaffronGymGuyWinScript
2writetext SaffronGymGuyText
closetext
--- a/maps/SaffronPokeCenter1F.asm
+++ b/maps/SaffronPokeCenter1F.asm
@@ -23,7 +23,7 @@
FisherScript_0x18a48c: ; 0x18a48c
faceplayer
loadfont
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x18a49a
2writetext UnknownText_0x18a5d3
closetext
--- a/maps/SaffronTrainStation.asm
+++ b/maps/SaffronTrainStation.asm
@@ -16,7 +16,7 @@
OfficerScript_0x18a81e: ; 0x18a81e
faceplayer
loadfont
- checkbit1 EVENT_RESTORED_POWER_TO_KANTO
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x18a82c
2writetext UnknownText_0x18a8a9
closetext
@@ -77,7 +77,7 @@
GymGuyScript_0x18a875: ; 0x18a875
faceplayer
loadfont
- checkbit1 EVENT_RETURNED_MACHINE_PART
+ checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x18a883
2writetext UnknownText_0x18a9ca
closetext
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -28,7 +28,7 @@
appear $3
UnknownScript_0x1ab516: ; 0x1ab516
returnafterbattle
- setbit1 $04cb
+ setevent $04cb
loadfont
2writetext UnknownText_0x1ab683
playsound $009c
@@ -50,12 +50,12 @@
SeafoamGymGuyScript: ; 0x1ab531
faceplayer
loadfont
- checkbit1 EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE
+ checkevent EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE
iftrue .TalkedToSeafoamGymGuyScript
2writetext SeafoamGymGuyWinText
closetext
loadmovesprites
- setbit1 EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE
+ setevent EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE
end
.TalkedToSeafoamGymGuyScript
--- a/maps/SilphCo1F.asm
+++ b/maps/SilphCo1F.asm
@@ -13,13 +13,13 @@
OfficerScript_0x18abe8: ; 0x18abe8
faceplayer
loadfont
- checkbit1 EVENT_GOT_UP_GRADE
+ checkevent EVENT_GOT_UP_GRADE
iftrue UnknownScript_0x18abfd
2writetext UnknownText_0x18ac36
keeptextopen
verbosegiveitem UP_GRADE, 1
iffalse UnknownScript_0x18ac01
- setbit1 EVENT_GOT_UP_GRADE
+ setevent EVENT_GOT_UP_GRADE
UnknownScript_0x18abfd: ; 0x18abfd
2writetext UnknownText_0x18aca8
closetext
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -81,18 +81,18 @@
2writetext KurtLeaveSlowpokeWellText
closetext
loadmovesprites
- setbit1 EVENT_CLEARED_SLOWPOKE_WELL
+ setevent EVENT_CLEARED_SLOWPOKE_WELL
variablesprite $6, $4
domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $1
- clearbit1 $06f3
- clearbit1 $06e9
- setbit1 $06f5
- setbit1 $06f6
- setbit1 $06fb
- setbit1 $0740
- clearbit1 $06f9
- clearbit1 $06fd
- clearbit1 $073e
+ clearevent $06f3
+ clearevent $06e9
+ setevent $06f5
+ setevent $06f6
+ setevent $06fb
+ setevent $0740
+ clearevent $06f9
+ clearevent $06fd
+ clearevent $073e
special $002e
special $001b
pause 15
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -9,13 +9,13 @@
GymGuyScript_0x5ad0b: ; 0x5ad0b
faceplayer
loadfont
- checkbit1 EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL
+ checkevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL
iftrue UnknownScript_0x5ad22
2writetext UnknownText_0x5ad2a
keeptextopen
verbosegiveitem KINGS_ROCK, 1
iffalse UnknownScript_0x5ad20
- setbit1 EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL
+ setevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL
UnknownScript_0x5ad20: ; 0x5ad20
loadmovesprites
end
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -63,7 +63,7 @@
SageLiScript: ; 0x1849a6
faceplayer
loadfont
- checkbit1 EVENT_GOT_HM05_FLASH
+ checkevent EVENT_GOT_HM05_FLASH
iftrue UnknownScript_0x1849d1
2writetext SageLiSeenText
closetext
@@ -76,8 +76,8 @@
2writetext UnknownText_0x184cc2
keeptextopen
verbosegiveitem HM_05, 1
- setbit1 EVENT_GOT_HM05_FLASH
- setbit1 EVENT_BEAT_SAGE_LI
+ setevent EVENT_GOT_HM05_FLASH
+ setevent EVENT_BEAT_SAGE_LI
2writetext UnknownText_0x184d13
closetext
loadmovesprites
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -23,10 +23,10 @@
; 0x6c65e
SecurityCamera1a: ; 0x6c65e
- checkbit1 EVENT_SECURITY_CAMERA_1
+ checkevent EVENT_SECURITY_CAMERA_1
iftrue NoSecurityCamera
2call PlaySecurityCameraSounds
- checkbit1 $06da
+ checkevent $06da
iftrue NoSecurityCamera
showemote $0, $0, 15
playmusic $0039
@@ -44,15 +44,15 @@
applymovement $2, SecurityCameraMovement1
2call TrainerCameraGrunt2
if_equal $1, NoSecurityCamera
- setbit1 EVENT_SECURITY_CAMERA_1
+ setevent EVENT_SECURITY_CAMERA_1
end
; 0x6c6a7
SecurityCamera1b: ; 0x6c6a7
- checkbit1 EVENT_SECURITY_CAMERA_1
+ checkevent EVENT_SECURITY_CAMERA_1
iftrue NoSecurityCamera
2call PlaySecurityCameraSounds
- checkbit1 $06da
+ checkevent $06da
iftrue NoSecurityCamera
showemote $0, $0, 15
playmusic $0039
@@ -70,15 +70,15 @@
applymovement $2, SecurityCameraMovement1
2call TrainerCameraGrunt2
if_equal $1, NoSecurityCamera
- setbit1 EVENT_SECURITY_CAMERA_1
+ setevent EVENT_SECURITY_CAMERA_1
end
; 0x6c6f0
SecurityCamera2a: ; 0x6c6f0
- checkbit1 EVENT_SECURITY_CAMERA_2
+ checkevent EVENT_SECURITY_CAMERA_2
iftrue NoSecurityCamera
2call PlaySecurityCameraSounds
- checkbit1 $06da
+ checkevent $06da
iftrue NoSecurityCamera
showemote $0, $0, 15
playmusic $0039
@@ -97,15 +97,15 @@
applymovement $2, SecurityCameraMovement3
2call TrainerCameraGrunt2
if_equal $1, NoSecurityCamera
- setbit1 EVENT_SECURITY_CAMERA_2
+ setevent EVENT_SECURITY_CAMERA_2
end
; 0x6c73c
SecurityCamera2b: ; 0x6c73c
- checkbit1 EVENT_SECURITY_CAMERA_2
+ checkevent EVENT_SECURITY_CAMERA_2
iftrue NoSecurityCamera
2call PlaySecurityCameraSounds
- checkbit1 $06da
+ checkevent $06da
iftrue NoSecurityCamera
showemote $0, $0, 15
playmusic $0039
@@ -124,15 +124,15 @@
applymovement $2, SecurityCameraMovement5
2call TrainerCameraGrunt2
if_equal $1, NoSecurityCamera
- setbit1 EVENT_SECURITY_CAMERA_2
+ setevent EVENT_SECURITY_CAMERA_2
end
; 0x6c788
SecurityCamera3a: ; 0x6c788
- checkbit1 EVENT_SECURITY_CAMERA_3
+ checkevent EVENT_SECURITY_CAMERA_3
iftrue NoSecurityCamera
2call PlaySecurityCameraSounds
- checkbit1 $06da
+ checkevent $06da
iftrue NoSecurityCamera
showemote $0, $0, 15
playmusic $0039
@@ -151,15 +151,15 @@
applymovement $2, SecurityCameraMovement6
2call TrainerCameraGrunt2
if_equal $1, NoSecurityCamera
- setbit1 EVENT_SECURITY_CAMERA_3
+ setevent EVENT_SECURITY_CAMERA_3
end
; 0x6c7d4
SecurityCamera3b: ; 0x6c7d4
- checkbit1 EVENT_SECURITY_CAMERA_3
+ checkevent EVENT_SECURITY_CAMERA_3
iftrue NoSecurityCamera
2call PlaySecurityCameraSounds
- checkbit1 $06da
+ checkevent $06da
iftrue NoSecurityCamera
showemote $0, $0, 15
playmusic $0039
@@ -178,15 +178,15 @@
applymovement $2, SecurityCameraMovement7
2call TrainerCameraGrunt2
if_equal $1, NoSecurityCamera
- setbit1 EVENT_SECURITY_CAMERA_3
+ setevent EVENT_SECURITY_CAMERA_3
end
; 0x6c820
SecurityCamera4: ; 0x6c820
- checkbit1 EVENT_SECURITY_CAMERA_4
+ checkevent EVENT_SECURITY_CAMERA_4
iftrue NoSecurityCamera
2call PlaySecurityCameraSounds
- checkbit1 $06da
+ checkevent $06da
iftrue NoSecurityCamera
showemote $0, $0, 15
playmusic $0039
@@ -205,15 +205,15 @@
applymovement $2, SecurityCameraMovement8
2call TrainerCameraGrunt2
if_equal $1, NoSecurityCamera
- setbit1 EVENT_SECURITY_CAMERA_4
+ setevent EVENT_SECURITY_CAMERA_4
end
; 0x6c86c
SecurityCamera5: ; 0x6c86c
- checkbit1 EVENT_SECURITY_CAMERA_5
+ checkevent EVENT_SECURITY_CAMERA_5
iftrue NoSecurityCamera
2call PlaySecurityCameraSounds
- checkbit1 $06da
+ checkevent $06da
iftrue NoSecurityCamera
showemote $0, $0, 15
playmusic $0039
@@ -232,7 +232,7 @@
applymovement $2, SecurityCameraMovement9
2call TrainerCameraGrunt2
if_equal $1, NoSecurityCamera
- setbit1 EVENT_SECURITY_CAMERA_5
+ setevent EVENT_SECURITY_CAMERA_5
end
; 0x6c8b8
@@ -284,179 +284,179 @@
; 0x6c900
ExplodingTrap1: ; 0x6c900
- checkbit1 EVENT_EXPLODING_TRAP_1
+ checkevent EVENT_EXPLODING_TRAP_1
iftrue NoExplodingTrap
2call KoffingExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_1
+ setevent EVENT_EXPLODING_TRAP_1
end
ExplodingTrap2: ; 0x6c90e
- checkbit1 EVENT_EXPLODING_TRAP_2
+ checkevent EVENT_EXPLODING_TRAP_2
iftrue NoExplodingTrap
2call VoltorbExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_2
+ setevent EVENT_EXPLODING_TRAP_2
end
ExplodingTrap3: ; 0x6c91c
- checkbit1 EVENT_EXPLODING_TRAP_3
+ checkevent EVENT_EXPLODING_TRAP_3
iftrue NoExplodingTrap
2call GeodudeExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_3
+ setevent EVENT_EXPLODING_TRAP_3
end
ExplodingTrap4: ; 0x6c92a
- checkbit1 EVENT_EXPLODING_TRAP_4
+ checkevent EVENT_EXPLODING_TRAP_4
iftrue NoExplodingTrap
2call VoltorbExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_4
+ setevent EVENT_EXPLODING_TRAP_4
end
ExplodingTrap5: ; 0x6c938
- checkbit1 EVENT_EXPLODING_TRAP_5
+ checkevent EVENT_EXPLODING_TRAP_5
iftrue NoExplodingTrap
2call GeodudeExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_5
+ setevent EVENT_EXPLODING_TRAP_5
end
ExplodingTrap6: ; 0x6c946
- checkbit1 EVENT_EXPLODING_TRAP_6
+ checkevent EVENT_EXPLODING_TRAP_6
iftrue NoExplodingTrap
2call KoffingExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_6
+ setevent EVENT_EXPLODING_TRAP_6
end
ExplodingTrap7: ; 0x6c954
- checkbit1 EVENT_EXPLODING_TRAP_7
+ checkevent EVENT_EXPLODING_TRAP_7
iftrue NoExplodingTrap
2call VoltorbExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_7
+ setevent EVENT_EXPLODING_TRAP_7
end
ExplodingTrap8: ; 0x6c962
- checkbit1 EVENT_EXPLODING_TRAP_8
+ checkevent EVENT_EXPLODING_TRAP_8
iftrue NoExplodingTrap
2call KoffingExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_8
+ setevent EVENT_EXPLODING_TRAP_8
end
ExplodingTrap9: ; 0x6c970
- checkbit1 EVENT_EXPLODING_TRAP_9
+ checkevent EVENT_EXPLODING_TRAP_9
iftrue NoExplodingTrap
2call KoffingExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_9
+ setevent EVENT_EXPLODING_TRAP_9
end
ExplodingTrap10: ; 0x6c97e
- checkbit1 EVENT_EXPLODING_TRAP_10
+ checkevent EVENT_EXPLODING_TRAP_10
iftrue NoExplodingTrap
2call VoltorbExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_10
+ setevent EVENT_EXPLODING_TRAP_10
end
ExplodingTrap11: ; 0x6c98c
- checkbit1 EVENT_EXPLODING_TRAP_11
+ checkevent EVENT_EXPLODING_TRAP_11
iftrue NoExplodingTrap
2call GeodudeExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_11
+ setevent EVENT_EXPLODING_TRAP_11
end
ExplodingTrap12: ; 0x6c99a
- checkbit1 EVENT_EXPLODING_TRAP_12
+ checkevent EVENT_EXPLODING_TRAP_12
iftrue NoExplodingTrap
2call GeodudeExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_12
+ setevent EVENT_EXPLODING_TRAP_12
end
ExplodingTrap13: ; 0x6c9a8
- checkbit1 EVENT_EXPLODING_TRAP_13
+ checkevent EVENT_EXPLODING_TRAP_13
iftrue NoExplodingTrap
2call GeodudeExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_13
+ setevent EVENT_EXPLODING_TRAP_13
end
ExplodingTrap14: ; 0x6c9b6
- checkbit1 EVENT_EXPLODING_TRAP_14
+ checkevent EVENT_EXPLODING_TRAP_14
iftrue NoExplodingTrap
2call KoffingExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_14
+ setevent EVENT_EXPLODING_TRAP_14
end
ExplodingTrap15: ; 0x6c9c4
- checkbit1 EVENT_EXPLODING_TRAP_15
+ checkevent EVENT_EXPLODING_TRAP_15
iftrue NoExplodingTrap
2call VoltorbExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_15
+ setevent EVENT_EXPLODING_TRAP_15
end
ExplodingTrap16: ; 0x6c9d2
- checkbit1 EVENT_EXPLODING_TRAP_16
+ checkevent EVENT_EXPLODING_TRAP_16
iftrue NoExplodingTrap
2call KoffingExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_16
+ setevent EVENT_EXPLODING_TRAP_16
end
ExplodingTrap17: ; 0x6c9e0
- checkbit1 EVENT_EXPLODING_TRAP_17
+ checkevent EVENT_EXPLODING_TRAP_17
iftrue NoExplodingTrap
2call VoltorbExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_17
+ setevent EVENT_EXPLODING_TRAP_17
end
ExplodingTrap18: ; 0x6c9ee
- checkbit1 EVENT_EXPLODING_TRAP_18
+ checkevent EVENT_EXPLODING_TRAP_18
iftrue NoExplodingTrap
2call GeodudeExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_18
+ setevent EVENT_EXPLODING_TRAP_18
end
ExplodingTrap19: ; 0x6c9fc
- checkbit1 EVENT_EXPLODING_TRAP_19
+ checkevent EVENT_EXPLODING_TRAP_19
iftrue NoExplodingTrap
2call GeodudeExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_19
+ setevent EVENT_EXPLODING_TRAP_19
end
ExplodingTrap20: ; 0x6ca0a
- checkbit1 EVENT_EXPLODING_TRAP_20
+ checkevent EVENT_EXPLODING_TRAP_20
iftrue NoExplodingTrap
2call VoltorbExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_20
+ setevent EVENT_EXPLODING_TRAP_20
end
ExplodingTrap21: ; 0x6ca18
- checkbit1 EVENT_EXPLODING_TRAP_21
+ checkevent EVENT_EXPLODING_TRAP_21
iftrue NoExplodingTrap
2call KoffingExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_21
+ setevent EVENT_EXPLODING_TRAP_21
end
ExplodingTrap22: ; 0x6ca26
- checkbit1 EVENT_EXPLODING_TRAP_22
+ checkevent EVENT_EXPLODING_TRAP_22
iftrue NoExplodingTrap
2call VoltorbExplodingTrap
returnafterbattle
- setbit1 EVENT_EXPLODING_TRAP_22
+ setevent EVENT_EXPLODING_TRAP_22
end
VoltorbExplodingTrap: ; 0x6ca34
@@ -561,18 +561,18 @@
MapTeamRocketBaseB1FSignpost0Script: ; 0x6ca9c
loadfont
- checkbit1 EVENT_TURNED_OFF_SECURITY_CAMERAS
+ checkevent EVENT_TURNED_OFF_SECURITY_CAMERAS
iftrue UnknownScript_0x6cabe
2writetext UnknownText_0x6cdad
playsound $0021
closetext
loadmovesprites
- setbit1 EVENT_TURNED_OFF_SECURITY_CAMERAS
- setbit1 EVENT_SECURITY_CAMERA_1
- setbit1 EVENT_SECURITY_CAMERA_2
- setbit1 EVENT_SECURITY_CAMERA_3
- setbit1 EVENT_SECURITY_CAMERA_4
- setbit1 EVENT_SECURITY_CAMERA_5
+ setevent EVENT_TURNED_OFF_SECURITY_CAMERAS
+ setevent EVENT_SECURITY_CAMERA_1
+ setevent EVENT_SECURITY_CAMERA_2
+ setevent EVENT_SECURITY_CAMERA_3
+ setevent EVENT_SECURITY_CAMERA_4
+ setevent EVENT_SECURITY_CAMERA_5
end
; 0x6cabe
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -33,7 +33,7 @@
; 0x6cf89
UnknownScript_0x6cf89: ; 0x6cf89
- checkbit1 EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER
+ checkevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER
iftrue UnknownScript_0x6cf90
return
; 0x6cf90
@@ -97,11 +97,11 @@
loadtrainer EXECUTIVEF, 2
startbattle
disappear $5
- setbit1 $06dd
- setbit1 $06de
- setbit1 $06d6
+ setevent $06dd
+ setevent $06de
+ setevent $06d6
returnafterbattle
- setbit1 $0570
+ setevent $0570
loadfont
2writetext UnknownText_0x6d4c6
closetext
@@ -116,7 +116,7 @@
pause 15
special $0032
dotrigger $2
- clearbit1 $06d6
+ clearevent $06d6
spriteface $4, $0
loadfont
2writetext UnknownText_0x6d5d8
@@ -177,7 +177,7 @@
closetext
loadmovesprites
dotrigger $1
- setbit1 $004c
+ setevent $004c
checkcode $9
if_equal $3, UnknownScript_0x6d0be
applymovement $4, MovementData_0x6d212
@@ -285,11 +285,11 @@
iftrue UnknownScript_0x6d182
disappear $6
disappear $9
- checkbit1 $06e0
+ checkevent $06e0
iffalse UnknownScript_0x6d182
- checkbit1 $06e1
+ checkevent $06e1
iffalse UnknownScript_0x6d182
- checkbit1 $06e2
+ checkevent $06e2
iffalse UnknownScript_0x6d182
returnafterbattle
special $003c
@@ -304,11 +304,11 @@
iftrue UnknownScript_0x6d182
disappear $7
disappear $a
- checkbit1 $06e0
+ checkevent $06e0
iffalse UnknownScript_0x6d182
- checkbit1 $06e1
+ checkevent $06e1
iffalse UnknownScript_0x6d182
- checkbit1 $06e2
+ checkevent $06e2
iffalse UnknownScript_0x6d182
returnafterbattle
special $003c
@@ -323,11 +323,11 @@
iftrue UnknownScript_0x6d182
disappear $8
disappear $b
- checkbit1 $06e0
+ checkevent $06e0
iffalse UnknownScript_0x6d182
- checkbit1 $06e1
+ checkevent $06e1
iffalse UnknownScript_0x6d182
- checkbit1 $06e2
+ checkevent $06e2
iffalse UnknownScript_0x6d182
returnafterbattle
special $003c
@@ -349,7 +349,7 @@
2writetext UnknownText_0x6d809
keeptextopen
verbosegiveitem HM_06, 1
- setbit1 EVENT_GOT_HM06_WHIRLPOOL
+ setevent EVENT_GOT_HM06_WHIRLPOOL
2writetext UnknownText_0x6d8f8
closetext
loadmovesprites
@@ -361,18 +361,18 @@
spriteface $0, $0
applymovement $4, MovementData_0x6d283
disappear $4
- setbit1 EVENT_CLEARED_ROCKET_HIDEOUT
+ setevent EVENT_CLEARED_ROCKET_HIDEOUT
clearbit2 $000e
- setbit1 $06dc
- setbit1 $0757
+ setevent $06dc
+ setevent $0757
dotrigger $3
- clearbit1 $0735
- setbit1 EVENT_TURNED_OFF_SECURITY_CAMERAS
- setbit1 EVENT_SECURITY_CAMERA_1
- setbit1 EVENT_SECURITY_CAMERA_2
- setbit1 EVENT_SECURITY_CAMERA_3
- setbit1 EVENT_SECURITY_CAMERA_4
- setbit1 EVENT_SECURITY_CAMERA_5
+ clearevent $0735
+ setevent EVENT_TURNED_OFF_SECURITY_CAMERAS
+ setevent EVENT_SECURITY_CAMERA_1
+ setevent EVENT_SECURITY_CAMERA_2
+ setevent EVENT_SECURITY_CAMERA_3
+ setevent EVENT_SECURITY_CAMERA_4
+ setevent EVENT_SECURITY_CAMERA_5
end
; 0x6d1d7
@@ -384,7 +384,7 @@
MapTeamRocketBaseB2FSignpost1Script: ; 0x6d1db
loadfont
- checkbit1 EVENT_LEARNED_HAIL_GIOVANNI
+ checkevent EVENT_LEARNED_HAIL_GIOVANNI
iftrue UnknownScript_0x6d1e8
2writetext UnknownText_0x6dd39
closetext
@@ -399,7 +399,7 @@
changeblock $e, $c, $7
reloadmappart
loadmovesprites
- setbit1 EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER
+ setevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER
waitbutton
end
; 0x6d1fa
@@ -406,7 +406,7 @@
MapTeamRocketBaseB2FSignpost21Script: ; 0x6d1fa
loadfont
- checkbit1 EVENT_CLEARED_ROCKET_HIDEOUT
+ checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x6d207
2writetext UnknownText_0x6dda7
closetext
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -34,7 +34,7 @@
; 0x6dff0
UnknownScript_0x6dff0: ; 0x6dff0
- checkbit1 $0303
+ checkevent $0303
iftrue UnknownScript_0x6dff7
return
; 0x6dff7
@@ -107,7 +107,7 @@
loadtrainer EXECUTIVEM, 4
startbattle
returnafterbattle
- setbit1 $0574
+ setevent $0574
loadfont
2writetext UnknownText_0x6e548
closetext
@@ -125,7 +125,7 @@
2writetext UnknownText_0x6e585
closetext
loadmovesprites
- setbit1 EVENT_LEARNED_HAIL_GIOVANNI
+ setevent EVENT_LEARNED_HAIL_GIOVANNI
end
; 0x6e09b
@@ -155,7 +155,7 @@
2writetext UnknownText_0x6e611
closetext
loadmovesprites
- setbit1 $0301
+ setevent $0301
end
; 0x6e0b2
@@ -185,7 +185,7 @@
2writetext UnknownText_0x6e737
closetext
loadmovesprites
- setbit1 $0302
+ setevent $0302
end
; 0x6e0c9
@@ -255,9 +255,9 @@
MapTeamRocketBaseB3FSignpost1Script: ; 0x6e0f5
loadfont
- checkbit1 $0301
+ checkevent $0301
iffalse UnknownScript_0x6e105
- checkbit1 $0302
+ checkevent $0302
iffalse UnknownScript_0x6e105
2jump UnknownScript_0x6e10b
; 0x6e105
@@ -276,7 +276,7 @@
changeblock $a, $8, $7
reloadmappart
loadmovesprites
- setbit1 $0303
+ setevent $0303
waitbutton
end
; 0x6e11d
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -26,16 +26,16 @@
; 0x18502f
UnknownScript_0x18502f: ; 0x18502f
- checkbit1 EVENT_GOT_RAINBOW_WING
+ checkevent EVENT_GOT_RAINBOW_WING
iftrue UnknownScript_0x185047
- checkbit1 $0044
+ checkevent $0044
iffalse UnknownScript_0x185050
special $0096
iffalse UnknownScript_0x185050
- clearbit1 $07c5
- setbit1 $07b6
+ clearevent $07c5
+ setevent $07b6
UnknownScript_0x185047: ; 0x185047
- checkbit1 EVENT_FOUGHT_HO_OH
+ checkevent EVENT_FOUGHT_HO_OH
iffalse UnknownScript_0x18504f
appear $5
UnknownScript_0x18504f: ; 0x18504f
@@ -43,7 +43,7 @@
; 0x185050
UnknownScript_0x185050: ; 0x185050
- checkbit1 EVENT_FOUGHT_SUICUNE
+ checkevent EVENT_FOUGHT_SUICUNE
iftrue UnknownScript_0x185077
appear $2
writebyte RAIKOU
@@ -73,13 +73,13 @@
disappear $2
disappear $3
disappear $4
- clearbit1 $07b6
- setbit1 $07c5
+ clearevent $07b6
+ setevent $07c5
return
; 0x185084
UnknownScript_0x185084: ; 0x185084
- checkbit1 EVENT_GOT_RAINBOW_WING
+ checkevent EVENT_GOT_RAINBOW_WING
iftrue UnknownScript_0x18508e
changeblock $a, $2, $9
UnknownScript_0x18508e: ; 0x18508e
@@ -126,15 +126,15 @@
startbattle
reloadmapmusic
disappear $2
- setbit1 EVENT_FOUGHT_SUICUNE
- setbit1 EVENT_SAW_SUICUNE_ON_ROUTE_42
+ setevent EVENT_FOUGHT_SUICUNE
+ setevent EVENT_SAW_SUICUNE_ON_ROUTE_42
domaptrigger GROUP_ROUTE_42, MAP_ROUTE_42, $0
- setbit1 EVENT_SAW_SUICUNE_ON_ROUTE_36
+ setevent EVENT_SAW_SUICUNE_ON_ROUTE_36
domaptrigger GROUP_ROUTE_36, MAP_ROUTE_36, $0
- setbit1 EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
+ setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $0
dotrigger $1
- clearbit1 EVENT_SET_WHEN_FOUGHT_HO_OH
+ clearevent EVENT_SET_WHEN_FOUGHT_HO_OH
returnafterbattle
pause 20
spriteface $0, $0
@@ -186,7 +186,7 @@
; 0x18517c
SageScript_0x18517c: ; 0x18517c
- checkbit1 EVENT_FOUGHT_HO_OH
+ checkevent EVENT_FOUGHT_HO_OH
iftrue UnknownScript_0x185185
jumptextfaceplayer UnknownText_0x1855ee
; 0x185185
@@ -198,9 +198,9 @@
SageScript_0x185188: ; 0x185188
faceplayer
loadfont
- checkbit1 EVENT_FOUGHT_HO_OH
+ checkevent EVENT_FOUGHT_HO_OH
iftrue UnknownScript_0x1851b6
- checkbit1 EVENT_GOT_RAINBOW_WING
+ checkevent EVENT_GOT_RAINBOW_WING
iftrue UnknownScript_0x1851b0
2writetext UnknownText_0x185629
keeptextopen
@@ -212,7 +212,7 @@
playsound $001b
changeblock $a, $2, $20
reloadmappart
- setbit1 EVENT_GOT_RAINBOW_WING
+ setevent EVENT_GOT_RAINBOW_WING
loadmovesprites
loadfont
UnknownScript_0x1851b0: ; 0x1851b0
@@ -230,7 +230,7 @@
; 0x1851bc
SageScript_0x1851bc: ; 0x1851bc
- checkbit1 EVENT_FOUGHT_HO_OH
+ checkevent EVENT_FOUGHT_HO_OH
iftrue UnknownScript_0x1851c5
jumptextfaceplayer UnknownText_0x185654
; 0x1851c5
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -11,7 +11,7 @@
; 0x77230
UnknownScript_0x77230: ; 0x77230
- checkbit1 EVENT_FOUGHT_HO_OH
+ checkevent EVENT_FOUGHT_HO_OH
iftrue UnknownScript_0x77241
checkitem RAINBOW_WING
iftrue UnknownScript_0x7723e
@@ -35,13 +35,13 @@
cry HO_OH
pause 15
loadmovesprites
- setbit1 EVENT_FOUGHT_HO_OH
+ setevent EVENT_FOUGHT_HO_OH
writecode $3, $a
loadpokedata HO_OH, 60
startbattle
disappear $2
returnafterbattle
- setbit1 EVENT_SET_WHEN_FOUGHT_HO_OH
+ setevent EVENT_SET_WHEN_FOUGHT_HO_OH
end
; 0x77260
--- a/maps/UndergroundPathSwitchRoomEntrances.asm
+++ b/maps/UndergroundPathSwitchRoomEntrances.asm
@@ -23,51 +23,51 @@
; 0x7c9f7
UnknownScript_0x7c9f7: ; 0x7c9f7
- checkbit1 EVENT_SWITCH_4
+ checkevent EVENT_SWITCH_4
iffalse UnknownScript_0x7ca01
changeblock $10, $6, $2d
UnknownScript_0x7ca01: ; 0x7ca01
- checkbit1 EVENT_SWITCH_5
+ checkevent EVENT_SWITCH_5
iffalse UnknownScript_0x7ca0b
changeblock $a, $6, $2d
UnknownScript_0x7ca0b: ; 0x7ca0b
- checkbit1 EVENT_SWITCH_6
+ checkevent EVENT_SWITCH_6
iffalse UnknownScript_0x7ca15
changeblock $2, $6, $2d
UnknownScript_0x7ca15: ; 0x7ca15
- checkbit1 EVENT_SWITCH_7
+ checkevent EVENT_SWITCH_7
iffalse UnknownScript_0x7ca1f
changeblock $2, $a, $2d
UnknownScript_0x7ca1f: ; 0x7ca15
- checkbit1 EVENT_SWITCH_8
+ checkevent EVENT_SWITCH_8
iffalse UnknownScript_0x7ca29
changeblock $a, $a, $2d
UnknownScript_0x7ca29: ; 0x7ca29
- checkbit1 EVENT_SWITCH_9
+ checkevent EVENT_SWITCH_9
iffalse UnknownScript_0x7ca33
changeblock $10, $a, $2d
UnknownScript_0x7ca33: ; 0x7ca33
- checkbit1 EVENT_SWITCH_10
+ checkevent EVENT_SWITCH_10
iffalse UnknownScript_0x7ca41
changeblock $c, $6, $2a
changeblock $c, $8, $2d
UnknownScript_0x7ca41: ; 0x7ca41
- checkbit1 EVENT_SWITCH_11
+ checkevent EVENT_SWITCH_11
iffalse UnknownScript_0x7ca4f
changeblock $6, $6, $2a
changeblock $6, $8, $2d
UnknownScript_0x7ca4f: ; 0x7ca4f
- checkbit1 EVENT_SWITCH_12
+ checkevent EVENT_SWITCH_12
iffalse UnknownScript_0x7ca5d
changeblock $c, $a, $2a
changeblock $c, $c, $2d
UnknownScript_0x7ca5d: ; 0x7ca5d
- checkbit1 EVENT_SWITCH_13
+ checkevent EVENT_SWITCH_13
iffalse UnknownScript_0x7ca6b
changeblock $6, $a, $2a
changeblock $6, $c, $2d
UnknownScript_0x7ca6b: ; 0x7ca6b
- checkbit1 EVENT_SWITCH_14
+ checkevent EVENT_SWITCH_14
iffalse UnknownScript_0x7ca79
changeblock $12, $a, $2a
changeblock $12, $c, $2d
@@ -124,9 +124,9 @@
; 0x7cad4
UnknownScript_0x7cad4: ; 0x7cad4
- checkbit1 $06c5
+ checkevent $06c5
iftrue UnknownScript_0x7cae1
- setbit1 $06c5
+ setevent $06c5
domaptrigger GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F, $1
UnknownScript_0x7cae1: ; 0x7cae1
playmusic $001f
@@ -134,10 +134,10 @@
2writetext UnknownText_0x7ce9d
closetext
loadmovesprites
- setbit1 $06c1
- checkbit1 EVENT_GOT_TOTODILE_FROM_ELM
+ setevent $06c1
+ checkevent EVENT_GOT_TOTODILE_FROM_ELM
iftrue UnknownScript_0x7cb09
- checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM
+ checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue UnknownScript_0x7cb19
winlosstext UnknownText_0x7cf5d, UnknownText_0x7d102
setlasttalked $c
@@ -355,7 +355,7 @@
loadfont
2writetext UnknownText_0x7d554
keeptextopen
- checkbit1 EVENT_SWITCH_1
+ checkevent EVENT_SWITCH_1
iftrue UnknownScript_0x7cbcb
2writetext UnknownText_0x7d617
yesorno
@@ -363,7 +363,7 @@
copybytetovar UndergroundSwitchPositions
addvar $1
copyvartobyte UndergroundSwitchPositions
- setbit1 EVENT_SWITCH_1
+ setevent EVENT_SWITCH_1
2jump UnknownScript_0x7cc8d
; 0x7cbcb
@@ -374,7 +374,7 @@
copybytetovar UndergroundSwitchPositions
addvar -1
copyvartobyte UndergroundSwitchPositions
- clearbit1 EVENT_SWITCH_1
+ clearevent EVENT_SWITCH_1
2jump UnknownScript_0x7cc8d
; 0x7cbe0
@@ -382,7 +382,7 @@
loadfont
2writetext UnknownText_0x7d643
keeptextopen
- checkbit1 EVENT_SWITCH_2
+ checkevent EVENT_SWITCH_2
iftrue UnknownScript_0x7cc00
2writetext UnknownText_0x7d617
yesorno
@@ -390,7 +390,7 @@
copybytetovar UndergroundSwitchPositions
addvar $2
copyvartobyte UndergroundSwitchPositions
- setbit1 EVENT_SWITCH_2
+ setevent EVENT_SWITCH_2
2jump UnknownScript_0x7cc8d
; 0x7cc00
@@ -401,7 +401,7 @@
copybytetovar UndergroundSwitchPositions
addvar -2
copyvartobyte UndergroundSwitchPositions
- clearbit1 EVENT_SWITCH_2
+ clearevent EVENT_SWITCH_2
2jump UnknownScript_0x7cc8d
; 0x7cc15
@@ -409,7 +409,7 @@
loadfont
2writetext UnknownText_0x7d65a
keeptextopen
- checkbit1 EVENT_SWITCH_3
+ checkevent EVENT_SWITCH_3
iftrue UnknownScript_0x7cc35
2writetext UnknownText_0x7d617
yesorno
@@ -417,7 +417,7 @@
copybytetovar UndergroundSwitchPositions
addvar $3
copyvartobyte UndergroundSwitchPositions
- setbit1 EVENT_SWITCH_3
+ setevent EVENT_SWITCH_3
2jump UnknownScript_0x7cc8d
; 0x7cc35
@@ -428,7 +428,7 @@
copybytetovar UndergroundSwitchPositions
addvar -3
copyvartobyte UndergroundSwitchPositions
- clearbit1 EVENT_SWITCH_3
+ clearevent EVENT_SWITCH_3
2jump UnknownScript_0x7cc8d
; 0x7cc4a
@@ -436,7 +436,7 @@
loadfont
2writetext UnknownText_0x7d671
keeptextopen
- checkbit1 EVENT_EMERGENCY_SWITCH
+ checkevent EVENT_EMERGENCY_SWITCH
iftrue UnknownScript_0x7cc70
2writetext UnknownText_0x7d617
yesorno
@@ -443,10 +443,10 @@
iffalse UnknownScript_0x7cc8b
writebyte $7
copyvartobyte UndergroundSwitchPositions
- setbit1 EVENT_EMERGENCY_SWITCH
- setbit1 EVENT_SWITCH_1
- setbit1 EVENT_SWITCH_2
- setbit1 EVENT_SWITCH_3
+ setevent EVENT_EMERGENCY_SWITCH
+ setevent EVENT_SWITCH_1
+ setevent EVENT_SWITCH_2
+ setevent EVENT_SWITCH_3
2jump UnknownScript_0x7cc8d
; 0x7cc70
@@ -456,10 +456,10 @@
iffalse UnknownScript_0x7cc8b
writebyte $0
copyvartobyte UndergroundSwitchPositions
- clearbit1 EVENT_EMERGENCY_SWITCH
- clearbit1 EVENT_SWITCH_1
- clearbit1 EVENT_SWITCH_2
- clearbit1 EVENT_SWITCH_3
+ clearevent EVENT_EMERGENCY_SWITCH
+ clearevent EVENT_SWITCH_1
+ clearevent EVENT_SWITCH_2
+ clearevent EVENT_SWITCH_3
2jump UnknownScript_0x7cc8d
; 0x7cc8b
@@ -602,37 +602,37 @@
UnknownScript_0x7cda5: ; 0x7cda5
changeblock $10, $6, $2d
- setbit1 EVENT_SWITCH_4
+ setevent EVENT_SWITCH_4
end
; 0x7cdad
UnknownScript_0x7cdad: ; 0x7cdad
changeblock $a, $6, $2d
- setbit1 EVENT_SWITCH_5
+ setevent EVENT_SWITCH_5
end
; 0x7cdb5
UnknownScript_0x7cdb5: ; 0x7cdb5
changeblock $2, $6, $2d
- setbit1 EVENT_SWITCH_6
+ setevent EVENT_SWITCH_6
end
; 0x7cdbd
UnknownScript_0x7cdbd: ; 0x7cdbd
changeblock $2, $a, $2d
- setbit1 EVENT_SWITCH_7
+ setevent EVENT_SWITCH_7
end
; 0x7cdc5
UnknownScript_0x7cdc5: ; 0x7cdc5
changeblock $a, $a, $2d
- setbit1 EVENT_SWITCH_8
+ setevent EVENT_SWITCH_8
end
; 0x7cdcd
UnknownScript_0x7cdcd: ; 0x7cdcd
changeblock $10, $a, $2d
- setbit1 EVENT_SWITCH_9
+ setevent EVENT_SWITCH_9
end
; 0x7cdd5
@@ -639,7 +639,7 @@
UnknownScript_0x7cdd5: ; 0x7cdd5
changeblock $c, $6, $2a
changeblock $c, $8, $2d
- setbit1 EVENT_SWITCH_10
+ setevent EVENT_SWITCH_10
end
; 0x7cde1
@@ -646,7 +646,7 @@
UnknownScript_0x7cde1: ; 0x7cde1
changeblock $6, $6, $2a
changeblock $6, $8, $2d
- setbit1 EVENT_SWITCH_11
+ setevent EVENT_SWITCH_11
end
; 0x7cded
@@ -653,7 +653,7 @@
UnknownScript_0x7cded: ; 0x7cded
changeblock $c, $a, $2a
changeblock $c, $c, $2d
- setbit1 EVENT_SWITCH_12
+ setevent EVENT_SWITCH_12
end
; 0x7cdf9
@@ -660,7 +660,7 @@
UnknownScript_0x7cdf9: ; 0x7cdf9
changeblock $6, $a, $2a
changeblock $6, $c, $2d
- setbit1 EVENT_SWITCH_13
+ setevent EVENT_SWITCH_13
end
; 0x7ce05
@@ -667,43 +667,43 @@
UnknownScript_0x7ce05: ; 0x7ce05
changeblock $12, $a, $2a
changeblock $12, $c, $2d
- setbit1 EVENT_SWITCH_14
+ setevent EVENT_SWITCH_14
end
; 0x7ce11
UnknownScript_0x7ce11: ; 0x7ce11
changeblock $10, $6, $3e
- clearbit1 EVENT_SWITCH_4
+ clearevent EVENT_SWITCH_4
end
; 0x7ce19
UnknownScript_0x7ce19: ; 0x7ce19
changeblock $a, $6, $3e
- clearbit1 EVENT_SWITCH_5
+ clearevent EVENT_SWITCH_5
end
; 0x7ce21
UnknownScript_0x7ce21: ; 0x7ce21
changeblock $2, $6, $3e
- clearbit1 EVENT_SWITCH_6
+ clearevent EVENT_SWITCH_6
end
; 0x7ce29
UnknownScript_0x7ce29: ; 0x7ce29
changeblock $2, $a, $3e
- clearbit1 EVENT_SWITCH_7
+ clearevent EVENT_SWITCH_7
end
; 0x7ce31
UnknownScript_0x7ce31: ; 0x7ce31
changeblock $a, $a, $3e
- clearbit1 EVENT_SWITCH_8
+ clearevent EVENT_SWITCH_8
end
; 0x7ce39
UnknownScript_0x7ce39: ; 0x7ce39
changeblock $10, $a, $3e
- clearbit1 EVENT_SWITCH_9
+ clearevent EVENT_SWITCH_9
end
; 0x7ce41
@@ -710,7 +710,7 @@
UnknownScript_0x7ce41: ; 0x7ce41
changeblock $c, $6, $3f
changeblock $c, $8, $3d
- clearbit1 EVENT_SWITCH_10
+ clearevent EVENT_SWITCH_10
end
; 0x7ce4d
@@ -717,7 +717,7 @@
UnknownScript_0x7ce4d: ; 0x7ce4d
changeblock $6, $6, $3f
changeblock $6, $8, $3d
- clearbit1 EVENT_SWITCH_11
+ clearevent EVENT_SWITCH_11
end
; 0x7ce59
@@ -724,7 +724,7 @@
UnknownScript_0x7ce59: ; 0x7ce59
changeblock $c, $a, $3f
changeblock $c, $c, $3d
- clearbit1 EVENT_SWITCH_12
+ clearevent EVENT_SWITCH_12
end
; 0x7ce65
@@ -731,7 +731,7 @@
UnknownScript_0x7ce65: ; 0x7ce65
changeblock $6, $a, $3f
changeblock $6, $c, $3d
- clearbit1 EVENT_SWITCH_13
+ clearevent EVENT_SWITCH_13
end
; 0x7ce71
@@ -738,7 +738,7 @@
UnknownScript_0x7ce71: ; 0x7ce71
changeblock $12, $a, $3f
changeblock $12, $c, $3d
- clearbit1 EVENT_SWITCH_14
+ clearevent EVENT_SWITCH_14
end
; 0x7ce7d
--- a/maps/UndergroundWarehouse.asm
+++ b/maps/UndergroundWarehouse.asm
@@ -11,21 +11,21 @@
; 0x7d950
UnknownScript_0x7d950: ; 0x7d950
- clearbit1 EVENT_SWITCH_1
- clearbit1 EVENT_SWITCH_2
- clearbit1 EVENT_SWITCH_3
- clearbit1 EVENT_EMERGENCY_SWITCH
- clearbit1 EVENT_SWITCH_4
- clearbit1 EVENT_SWITCH_5
- clearbit1 EVENT_SWITCH_6
- clearbit1 EVENT_SWITCH_7
- clearbit1 EVENT_SWITCH_8
- clearbit1 EVENT_SWITCH_9
- clearbit1 EVENT_SWITCH_10
- clearbit1 EVENT_SWITCH_11
- clearbit1 EVENT_SWITCH_12
- clearbit1 EVENT_SWITCH_13
- clearbit1 EVENT_SWITCH_14
+ clearevent EVENT_SWITCH_1
+ clearevent EVENT_SWITCH_2
+ clearevent EVENT_SWITCH_3
+ clearevent EVENT_EMERGENCY_SWITCH
+ clearevent EVENT_SWITCH_4
+ clearevent EVENT_SWITCH_5
+ clearevent EVENT_SWITCH_6
+ clearevent EVENT_SWITCH_7
+ clearevent EVENT_SWITCH_8
+ clearevent EVENT_SWITCH_9
+ clearevent EVENT_SWITCH_10
+ clearevent EVENT_SWITCH_11
+ clearevent EVENT_SWITCH_12
+ clearevent EVENT_SWITCH_13
+ clearevent EVENT_SWITCH_14
writebyte $0
copyvartobyte UndergroundSwitchPositions
return
@@ -121,15 +121,15 @@
GentlemanScript_0x7d9bf: ; 0x7d9bf
faceplayer
loadfont
- checkbit1 $004a
+ checkevent $004a
iftrue UnknownScript_0x7d9de
2writetext UnknownText_0x7dbc6
keeptextopen
verbosegiveitem CARD_KEY, 1
- setbit1 $004a
- setbit1 $0304
- clearbit1 $0305
- clearbit1 $0306
+ setevent $004a
+ setevent $0304
+ clearevent $0305
+ clearevent $0306
2writetext UnknownText_0x7dc5b
keeptextopen
UnknownScript_0x7d9de: ; 0x7d9de
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -60,7 +60,7 @@
loadpokedata SNORLAX, 50
startbattle
disappear $6
- setbit1 EVENT_FOUGHT_SNORLAX
+ setevent EVENT_FOUGHT_SNORLAX
returnafterbattle
end
; 0x1aa9c2
@@ -68,7 +68,7 @@
PokefanMScript_0x1aa9c2: ; 0x1aa9c2
faceplayer
loadfont
- checkbit1 $00e2
+ checkevent $00e2
iftrue UnknownScript_0x1aa9f7
checkcode $7
if_equal $10, UnknownScript_0x1aa9ea
@@ -99,7 +99,7 @@
keeptextopen
verbosegiveitem HP_UP, 1
iffalse UnknownScript_0x1aa9fb
- setbit1 $00e2
+ setevent $00e2
UnknownScript_0x1aa9f7: ; 0x1aa9f7
2writetext UnknownText_0x1aad4a
closetext
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -18,10 +18,10 @@
loadtrainer LT_SURGE, 1
startbattle
returnafterbattle
- setbit1 EVENT_BEAT_LTSURGE
- setbit1 EVENT_BEAT_GENTLEMAN_GREGORY
- setbit1 EVENT_BEAT_GUITARIST_VINCENT
- setbit1 EVENT_BEAT_JUGGLER_HORTON
+ setevent EVENT_BEAT_LTSURGE
+ setevent EVENT_BEAT_GENTLEMAN_GREGORY
+ setevent EVENT_BEAT_GUITARIST_VINCENT
+ setevent EVENT_BEAT_JUGGLER_HORTON
loadfont
2writetext UnknownText_0x192277
playsound $009c
@@ -130,7 +130,7 @@
VermilionGymGuyScript: ; 0x19211b
faceplayer
loadfont
- checkbit1 EVENT_BEAT_LTSURGE
+ checkevent EVENT_BEAT_LTSURGE
iftrue .VermilionGymGuyWinScript
2writetext VermilionGymGuyText
closetext
--- a/maps/VermilionPokeCenter1F.asm
+++ b/maps/VermilionPokeCenter1F.asm
@@ -13,7 +13,7 @@
FishingGuruScript_0x191606: ; 0x191606
faceplayer
loadfont
- checkbit1 EVENT_FOUGHT_SNORLAX
+ checkevent EVENT_FOUGHT_SNORLAX
iftrue UnknownScript_0x191614
2writetext UnknownText_0x191620
closetext
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -32,12 +32,12 @@
applymovement $0, MovementData_0x74ef3
appear $2
dotrigger $0
- setbit1 $0731
- setbit1 $0730
- setbit1 $0739
- clearbit1 $0733
- setbit1 $0030
- setbit1 $0000
+ setevent $0731
+ setevent $0730
+ setevent $0739
+ clearevent $0733
+ setevent $0030
+ setevent $0000
blackoutmod GROUP_VERMILION_CITY, MAP_VERMILION_CITY
end
; 0x74dc4
@@ -45,7 +45,7 @@
SailorScript_0x74dc4: ; 0x74dc4
faceplayer
loadfont
- checkbit1 $0000
+ checkevent $0000
iftrue UnknownScript_0x74e1a
2writetext UnknownText_0x74f06
closetext
@@ -59,19 +59,19 @@
playsound $0023
special $002e
waitbutton
- setbit1 $073a
- clearbit1 $073b
- clearbit1 EVENT_BEAT_POKEMANIAC_ETHAN
- clearbit1 EVENT_BEAT_BURGLAR_COREY
- clearbit1 EVENT_BEAT_BUG_CATCHER_KEN
- clearbit1 EVENT_BEAT_GUITARIST_CLYDE
- clearbit1 EVENT_BEAT_POKEFANM_JEREMY
- clearbit1 EVENT_BEAT_POKEFANF_GEORGIA
- clearbit1 EVENT_BEAT_SAILOR_KENNETH
- clearbit1 EVENT_BEAT_TEACHER_SHIRLEY
- clearbit1 EVENT_BEAT_SCHOOLBOY_NATE
- clearbit1 EVENT_BEAT_SCHOOLBOY_RICKY
- setbit1 $002f
+ setevent $073a
+ clearevent $073b
+ clearevent EVENT_BEAT_POKEMANIAC_ETHAN
+ clearevent EVENT_BEAT_BURGLAR_COREY
+ clearevent EVENT_BEAT_BUG_CATCHER_KEN
+ clearevent EVENT_BEAT_GUITARIST_CLYDE
+ clearevent EVENT_BEAT_POKEFANM_JEREMY
+ clearevent EVENT_BEAT_POKEFANF_GEORGIA
+ clearevent EVENT_BEAT_SAILOR_KENNETH
+ clearevent EVENT_BEAT_TEACHER_SHIRLEY
+ clearevent EVENT_BEAT_SCHOOLBOY_NATE
+ clearevent EVENT_BEAT_SCHOOLBOY_RICKY
+ setevent $002f
appear $2
domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $1
warp GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $19, $1
@@ -87,9 +87,9 @@
UnknownScript_0x74e20: ; 0x74e20
spriteface $3, $3
- checkbit1 $0000
+ checkevent $0000
iftrue UnknownScript_0x74e86
- checkbit1 $0001
+ checkevent $0001
iftrue UnknownScript_0x74e86
spriteface $0, $2
loadfont
@@ -109,7 +109,7 @@
2writetext UnknownText_0x74fc2
closetext
loadmovesprites
- setbit1 $0001
+ setevent $0001
applymovement $0, MovementData_0x74ef8
2jump SailorScript_0x74dc4
; 0x74e68
@@ -160,7 +160,7 @@
SailorScript_0x74e97: ; 0x74e97
faceplayer
loadfont
- checkbit1 $0000
+ checkevent $0000
iftrue UnknownScript_0x74e1a
checkcode $b
if_equal MONDAY, UnknownScript_0x74eda
@@ -178,7 +178,7 @@
2writetext UnknownText_0x74fc2
closetext
loadmovesprites
- setbit1 $0001
+ setevent $0001
applymovement $0, MovementData_0x74efe
2jump SailorScript_0x74dc4
; 0x74ed4
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -56,10 +56,10 @@
2writetext UnknownText_0x7455f
closetext
loadmovesprites
- setbit1 $06c2
- checkbit1 EVENT_GOT_TOTODILE_FROM_ELM
+ setevent $06c2
+ checkevent EVENT_GOT_TOTODILE_FROM_ELM
iftrue UnknownScript_0x744ff
- checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM
+ checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue UnknownScript_0x7450f
winlosstext UnknownText_0x7463d, UnknownText_0x747aa
setlasttalked $2
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -51,7 +51,7 @@
applymovement $2, MovementData_0x1a8463
playsound $001f
disappear $2
- clearbit1 $06cb
+ clearevent $06cb
waitbutton
end
; 0x1a8403
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -9,7 +9,7 @@
FalknerScript_0x683c2: ; 0x683c2
faceplayer
loadfont
- checkbit1 EVENT_BEAT_FALKNER
+ checkevent EVENT_BEAT_FALKNER
iftrue UnknownScript_0x683ec
2writetext UnknownText_0x68473
closetext
@@ -18,7 +18,7 @@
loadtrainer FALKNER, 1
startbattle
returnafterbattle
- setbit1 EVENT_BEAT_FALKNER
+ setevent EVENT_BEAT_FALKNER
loadfont
2writetext UnknownText_0x685af
playsound $009c
@@ -27,10 +27,10 @@
checkcode $7
2call UnknownScript_0x68418
UnknownScript_0x683ec: ; 0x683ec
- checkbit1 EVENT_GOT_TM31_MUD_SLAP
+ checkevent EVENT_GOT_TM31_MUD_SLAP
iftrue UnknownScript_0x68412
- setbit1 EVENT_BEAT_BIRD_KEEPER_ROD
- setbit1 EVENT_BEAT_BIRD_KEEPER_ABE
+ setevent EVENT_BEAT_BIRD_KEEPER_ROD
+ setevent EVENT_BEAT_BIRD_KEEPER_ABE
domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $2
specialphonecall $3
2writetext UnknownText_0x685c8
@@ -37,7 +37,7 @@
keeptextopen
verbosegiveitem TM_31, 1
iffalse UnknownScript_0x68416
- setbit1 EVENT_GOT_TM31_MUD_SLAP
+ setevent EVENT_GOT_TM31_MUD_SLAP
2writetext UnknownText_0x68648
closetext
loadmovesprites
@@ -127,7 +127,7 @@
VioletGymGuyScript: ; 0x6844f
faceplayer
loadfont
- checkbit1 EVENT_BEAT_FALKNER
+ checkevent EVENT_BEAT_FALKNER
iftrue .VioletGymGuyWinScript
2writetext VioletGymGuyText
closetext
--- a/maps/VioletPokeCenter1F.asm
+++ b/maps/VioletPokeCenter1F.asm
@@ -13,7 +13,7 @@
ScientistScript_0x694cc: ; 0x694cc
faceplayer
loadfont
- checkbit1 EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE
+ checkevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE
iftrue UnknownScript_0x6953a
2writetext UnknownText_0x69555
UnknownScript_0x694d7: ; 0x694d7
@@ -24,9 +24,9 @@
giveegg TOGEPI, 5
stringtotext .eggname, $1
2call UnknownScript_0x69527
- setbit1 EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
- clearbit1 EVENT_ELMS_AIDE_IN_LAB
- clearbit1 EVENT_TOGEPI_HATCHED
+ setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
+ clearevent EVENT_ELMS_AIDE_IN_LAB
+ clearevent EVENT_TOGEPI_HATCHED
domaptrigger GROUP_ROUTE_32, MAP_ROUTE_32, $1
2writetext UnknownText_0x695c5
closetext
@@ -70,7 +70,7 @@
2writetext UnknownText_0x696f2
closetext
loadmovesprites
- setbit1 EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE
+ setevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE
end
; 0x6953a
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -37,7 +37,7 @@
GrampsScript_0x1a9a61: ; 0x1a9a61
faceplayer
loadfont
- checkbit1 $0775
+ checkevent $0775
iftrue UnknownScript_0x1a9a6f
2writetext UnknownText_0x1a9c11
closetext
@@ -55,13 +55,13 @@
FisherScript_0x1a9a75: ; 0x1a9a75
faceplayer
loadfont
- checkbit1 EVENT_GOT_TM42_DREAM_EATER
+ checkevent EVENT_GOT_TM42_DREAM_EATER
iftrue UnknownScript_0x1a9a8a
2writetext UnknownText_0x1a9cc4
keeptextopen
verbosegiveitem TM_42, 1
iffalse UnknownScript_0x1a9a8e
- setbit1 EVENT_GOT_TM42_DREAM_EATER
+ setevent EVENT_GOT_TM42_DREAM_EATER
UnknownScript_0x1a9a8a: ; 0x1a9a8a
2writetext UnknownText_0x1a9d86
closetext
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -18,7 +18,7 @@
loadtrainer BLUE, 1
startbattle
returnafterbattle
- setbit1 EVENT_BEAT_BLUE
+ setevent EVENT_BEAT_BLUE
loadfont
2writetext UnknownText_0x9ac0f
playsound $009c
@@ -40,7 +40,7 @@
ViridianGymGuyScript: ; 0x9aa57
faceplayer
loadfont
- checkbit1 EVENT_BEAT_BLUE
+ checkevent EVENT_BEAT_BLUE
iftrue .ViridianGymGuyWinScript
2writetext ViridianGymGuyText
closetext
--- a/maps/ViridianPokeCenter1F.asm
+++ b/maps/ViridianPokeCenter1F.asm
@@ -13,7 +13,7 @@
CooltrainerMScript_0x9b693: ; 0x9b693
faceplayer
loadfont
- checkbit1 $0775
+ checkevent $0775
iftrue UnknownScript_0x9b6a1
2writetext UnknownText_0x9b6ad
closetext
--- a/maps/WarehouseEntrance.asm
+++ b/maps/WarehouseEntrance.asm
@@ -15,21 +15,21 @@
; 0x7c043
UnknownScript_0x7c043: ; 0x7c043
- clearbit1 EVENT_SWITCH_1
- clearbit1 EVENT_SWITCH_2
- clearbit1 EVENT_SWITCH_3
- clearbit1 EVENT_EMERGENCY_SWITCH
- clearbit1 EVENT_SWITCH_4
- clearbit1 EVENT_SWITCH_5
- clearbit1 EVENT_SWITCH_6
- clearbit1 EVENT_SWITCH_7
- clearbit1 EVENT_SWITCH_8
- clearbit1 EVENT_SWITCH_9
- clearbit1 EVENT_SWITCH_10
- clearbit1 EVENT_SWITCH_11
- clearbit1 EVENT_SWITCH_12
- clearbit1 EVENT_SWITCH_13
- clearbit1 EVENT_SWITCH_14
+ clearevent EVENT_SWITCH_1
+ clearevent EVENT_SWITCH_2
+ clearevent EVENT_SWITCH_3
+ clearevent EVENT_EMERGENCY_SWITCH
+ clearevent EVENT_SWITCH_4
+ clearevent EVENT_SWITCH_5
+ clearevent EVENT_SWITCH_6
+ clearevent EVENT_SWITCH_7
+ clearevent EVENT_SWITCH_8
+ clearevent EVENT_SWITCH_9
+ clearevent EVENT_SWITCH_10
+ clearevent EVENT_SWITCH_11
+ clearevent EVENT_SWITCH_12
+ clearevent EVENT_SWITCH_13
+ clearevent EVENT_SWITCH_14
writebyte $0
copyvartobyte UndergroundSwitchPositions
return
@@ -36,7 +36,7 @@
; 0x7c076
UnknownScript_0x7c076: ; 0x7c076
- checkbit1 EVENT_USED_BASEMENT_KEY
+ checkevent EVENT_USED_BASEMENT_KEY
iffalse UnknownScript_0x7c07d
return
; 0x7c07d
@@ -290,23 +290,23 @@
; 0x7c1a9
UnknownScript_0x7c1a9: ; 0x7c1a9
- setbit1 $0000
- clearbit1 $0001
- clearbit1 $0002
+ setevent $0000
+ clearevent $0001
+ clearevent $0002
2jump UnknownScript_0x7c1cd
; 0x7c1b5
UnknownScript_0x7c1b5: ; 0x7c1b5
- clearbit1 $0000
- setbit1 $0001
- clearbit1 $0002
+ clearevent $0000
+ setevent $0001
+ clearevent $0002
2jump UnknownScript_0x7c1cd
; 0x7c1c1
UnknownScript_0x7c1c1: ; 0x7c1c1
- clearbit1 $0000
- clearbit1 $0001
- setbit1 $0002
+ clearevent $0000
+ clearevent $0001
+ setevent $0002
2jump UnknownScript_0x7c1cd
; 0x7c1cd
@@ -324,9 +324,9 @@
loadfont
2writetext UnknownText_0x7c6d8
closetext
- checkbit1 $0000
+ checkevent $0000
iftrue UnknownScript_0x7c2bb
- checkbit1 $0001
+ checkevent $0001
iftrue UnknownScript_0x7c2c4
2jump UnknownScript_0x7c2cd
; 0x7c1fc
@@ -382,23 +382,23 @@
; 0x7c256
UnknownScript_0x7c256: ; 0x7c256
- setbit1 $0000
- clearbit1 $0001
- clearbit1 $0002
+ setevent $0000
+ clearevent $0001
+ clearevent $0002
2jump UnknownScript_0x7c27a
; 0x7c262
UnknownScript_0x7c262: ; 0x7c262
- clearbit1 $0000
- setbit1 $0001
- clearbit1 $0002
+ clearevent $0000
+ setevent $0001
+ clearevent $0002
2jump UnknownScript_0x7c27a
; 0x7c26e
UnknownScript_0x7c26e: ; 0x7c26e
- clearbit1 $0000
- clearbit1 $0001
- setbit1 $0002
+ clearevent $0000
+ clearevent $0001
+ setevent $0002
2jump UnknownScript_0x7c27a
; 0x7c27a
@@ -416,9 +416,9 @@
loadfont
2writetext UnknownText_0x7c82a
closetext
- checkbit1 $0000
+ checkevent $0000
iftrue UnknownScript_0x7c2bb
- checkbit1 $0001
+ checkevent $0001
iftrue UnknownScript_0x7c2c4
2jump UnknownScript_0x7c2cd
; 0x7c2a9
@@ -470,7 +470,7 @@
MapWarehouseEntranceSignpost0Script: ; 0x7c2d6
loadfont
- checkbit1 EVENT_USED_BASEMENT_KEY
+ checkevent EVENT_USED_BASEMENT_KEY
iftrue UnknownScript_0x7c2fa
checkitem BASEMENT_KEY
iftrue UnknownScript_0x7c2e8
@@ -488,7 +488,7 @@
changeblock $12, $6, $2e
reloadmappart
loadmovesprites
- setbit1 EVENT_USED_BASEMENT_KEY
+ setevent EVENT_USED_BASEMENT_KEY
end
; 0x7c2fa
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -11,7 +11,7 @@
; 0x18c504
UnknownScript_0x18c504: ; 0x18c504
- checkbit1 EVENT_FOUGHT_LUGIA
+ checkevent EVENT_FOUGHT_LUGIA
iftrue UnknownScript_0x18c515
checkitem SILVER_WING
iftrue UnknownScript_0x18c512
@@ -35,7 +35,7 @@
cry LUGIA
pause 15
loadmovesprites
- setbit1 EVENT_FOUGHT_LUGIA
+ setevent EVENT_FOUGHT_LUGIA
writecode $3, $a
loadpokedata LUGIA, 60
startbattle
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -24,11 +24,11 @@
; 0x1804cb
UnknownScript_0x1804cb: ; 0x1804cb
- checkbit1 $0309
+ checkevent $0309
iffalse UnknownScript_0x1804d5
changeblock $4, $e, $2a
UnknownScript_0x1804d5: ; 0x1804d5
- checkbit1 EVENT_WILLS_ROOM_EXIT_OPEN
+ checkevent EVENT_WILLS_ROOM_EXIT_OPEN
iffalse UnknownScript_0x1804df
changeblock $4, $2, $16
UnknownScript_0x1804df: ; 0x1804df
@@ -44,7 +44,7 @@
reloadmappart
loadmovesprites
dotrigger $1
- setbit1 $0309
+ setevent $0309
waitbutton
end
; 0x1804f8
@@ -52,7 +52,7 @@
WillScript_0x1804f8: ; 0x1804f8
faceplayer
loadfont
- checkbit1 $05b8
+ checkevent $05b8
iftrue UnknownScript_0x180526
2writetext UnknownText_0x180531
closetext
@@ -61,7 +61,7 @@
loadtrainer WILL, 1
startbattle
returnafterbattle
- setbit1 $05b8
+ setevent $05b8
loadfont
2writetext UnknownText_0x180644
closetext
@@ -70,7 +70,7 @@
changeblock $4, $2, $16
reloadmappart
loadmovesprites
- setbit1 EVENT_WILLS_ROOM_EXIT_OPEN
+ setevent EVENT_WILLS_ROOM_EXIT_OPEN
waitbutton
end
; 0x180526
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -23,26 +23,26 @@
; 0x98574
UnknownScript_0x98574: ; 0x98574
- checkbit1 EVENT_FOUGHT_SUICUNE
+ checkevent EVENT_FOUGHT_SUICUNE
iftrue UnknownScript_0x98593
- checkbit1 EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
+ checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
iftrue UnknownScript_0x9858c
checkitem CLEAR_BELL
iftrue UnknownScript_0x9858c
- clearbit1 $07ab
- setbit1 $07ac
+ clearevent $07ab
+ setevent $07ac
return
; 0x9858c
UnknownScript_0x9858c: ; 0x9858c
- setbit1 $07ab
- clearbit1 $07ac
+ setevent $07ab
+ clearevent $07ac
return
; 0x98593
UnknownScript_0x98593: ; 0x98593
- setbit1 $07ab
- setbit1 $07ac
+ setevent $07ab
+ setevent $07ac
return
; 0x9859a
@@ -152,7 +152,7 @@
; 0x985f8
SageKojiScript: ; 0x985f8
- checkbit1 EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
+ checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
iftrue UnknownScript_0x9861b
pause 10
showemote $0, $7, 20
@@ -164,7 +164,7 @@
loadmovesprites
applymovement $7, MovementData_0x98628
spriteface $7, $1
- setbit1 EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
+ setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
dotrigger $1
end
; 0x9861b