rename bit1 script commands to event

This commit is contained in:
yenatch
2013-09-24 03:48:58 -04:00
parent 8da8dff7cf
commit 3134b26f7b
184 changed files with 1644 additions and 1644 deletions

View File

@@ -48,9 +48,9 @@ ScriptCommandTable: ; 0x96cb1
dw Script_giveegg dw Script_giveegg
dw Script_givepokeitem dw Script_givepokeitem
dw Script_checkpokeitem dw Script_checkpokeitem
dw Script_checkbit1 dw Script_checkevent
dw Script_clearbit1 dw Script_clearevent
dw Script_setbit1 dw Script_setevent
dw Script_checkbit2 dw Script_checkbit2
dw Script_clearbit2 dw Script_clearbit2
dw Script_setbit2 dw Script_setbit2
@@ -2667,7 +2667,7 @@ Script_giveegg: ; 0x97968
ret ret
; 0x97988 ; 0x97988
Script_setbit1: ; 0x97988 Script_setevent: ; 0x97988
; script command 0x33 ; script command 0x33
; parameters: ; parameters:
; bit_number (MultiByteParam) ; bit_number (MultiByteParam)
@@ -2681,7 +2681,7 @@ Script_setbit1: ; 0x97988
ret ret
; 0x97996 ; 0x97996
Script_clearbit1: ; 0x97996 Script_clearevent: ; 0x97996
; script command 0x32 ; script command 0x32
; parameters: ; parameters:
; bit_number (MultiByteParam) ; bit_number (MultiByteParam)
@@ -2695,7 +2695,7 @@ Script_clearbit1: ; 0x97996
ret ret
; 0x979a4 ; 0x979a4
Script_checkbit1: ; 0x979a4 Script_checkevent: ; 0x979a4
; script command 0x31 ; script command 0x31
; parameters: ; parameters:
; bit_number (MultiByteParam) ; bit_number (MultiByteParam)

File diff suppressed because it is too large Load Diff

View File

@@ -9,7 +9,7 @@ AzaleaGym_MapScriptHeader: ; 0x18ec1c
BugsyScript_0x18ec1e: ; 0x18ec1e BugsyScript_0x18ec1e: ; 0x18ec1e
faceplayer faceplayer
loadfont loadfont
checkbit1 EVENT_BEAT_BUGSY checkevent EVENT_BEAT_BUGSY
iftrue UnknownScript_0x18ec48 iftrue UnknownScript_0x18ec48
2writetext UnknownText_0x18ed0b 2writetext UnknownText_0x18ed0b
closetext closetext
@@ -18,7 +18,7 @@ BugsyScript_0x18ec1e: ; 0x18ec1e
loadtrainer BUGSY, 1 loadtrainer BUGSY, 1
startbattle startbattle
returnafterbattle returnafterbattle
setbit1 EVENT_BEAT_BUGSY setevent EVENT_BEAT_BUGSY
loadfont loadfont
2writetext UnknownText_0x18ee14 2writetext UnknownText_0x18ee14
playsound $009c playsound $009c
@@ -27,17 +27,17 @@ BugsyScript_0x18ec1e: ; 0x18ec1e
checkcode $7 checkcode $7
2call UnknownScript_0x18ec73 2call UnknownScript_0x18ec73
UnknownScript_0x18ec48: ; 0x18ec48 UnknownScript_0x18ec48: ; 0x18ec48
checkbit1 EVENT_GOT_TM49_FURY_CUTTER checkevent EVENT_GOT_TM49_FURY_CUTTER
iftrue UnknownScript_0x18ec6d iftrue UnknownScript_0x18ec6d
setbit1 EVENT_BEAT_TWINS_AMY_AND_MAY setevent EVENT_BEAT_TWINS_AMY_AND_MAY
setbit1 EVENT_BEAT_BUG_CATCHER_BENNY setevent EVENT_BEAT_BUG_CATCHER_BENNY
setbit1 EVENT_BEAT_BUG_CATCHER_AL setevent EVENT_BEAT_BUG_CATCHER_AL
setbit1 EVENT_BEAT_BUG_CATCHER_JOSH setevent EVENT_BEAT_BUG_CATCHER_JOSH
2writetext UnknownText_0x18ee2b 2writetext UnknownText_0x18ee2b
keeptextopen keeptextopen
verbosegiveitem TM_49, 1 verbosegiveitem TM_49, 1
iffalse UnknownScript_0x18ec71 iffalse UnknownScript_0x18ec71
setbit1 EVENT_GOT_TM49_FURY_CUTTER setevent EVENT_GOT_TM49_FURY_CUTTER
2writetext UnknownText_0x18eefa 2writetext UnknownText_0x18eefa
closetext closetext
loadmovesprites loadmovesprites
@@ -213,7 +213,7 @@ Bug_catcherJoshScript: ; 0x18ecde
AzaleaGymGuyScript: ; 0x18ece6 AzaleaGymGuyScript: ; 0x18ece6
faceplayer faceplayer
checkbit1 EVENT_BEAT_BUGSY checkevent EVENT_BEAT_BUGSY
iftrue .AzaleaGymGuyWinScript iftrue .AzaleaGymGuyWinScript
loadfont loadfont
2writetext AzaleaGymGuyText 2writetext AzaleaGymGuyText

View File

@@ -58,10 +58,10 @@ UnknownScript_0x198049: ; 0x198049
2writetext UnknownText_0x19814d 2writetext UnknownText_0x19814d
closetext closetext
loadmovesprites loadmovesprites
setbit1 $06bf setevent $06bf
checkbit1 EVENT_GOT_TOTODILE_FROM_ELM checkevent EVENT_GOT_TOTODILE_FROM_ELM
iftrue UnknownScript_0x198071 iftrue UnknownScript_0x198071
checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue UnknownScript_0x198081 iftrue UnknownScript_0x198081
winlosstext UnknownText_0x1981e6, UnknownText_0x19835b winlosstext UnknownText_0x1981e6, UnknownText_0x19835b
setlasttalked $b setlasttalked $b
@@ -119,7 +119,7 @@ AzaleaRocketScript_0x1980ae: ; 0x1980ae
GrampsScript_0x1980b1: ; 0x1980b1 GrampsScript_0x1980b1: ; 0x1980b1
faceplayer faceplayer
loadfont loadfont
checkbit1 EVENT_CLEARED_SLOWPOKE_WELL checkevent EVENT_CLEARED_SLOWPOKE_WELL
iftrue UnknownScript_0x1980bf iftrue UnknownScript_0x1980bf
2writetext UnknownText_0x19841b 2writetext UnknownText_0x19841b
closetext closetext
@@ -176,8 +176,8 @@ UnknownScript_0x1980e5: ; 0x1980e5
verbosegiveitem GS_BALL, 1 verbosegiveitem GS_BALL, 1
spriteface $d, $2 spriteface $d, $2
setbit2 $0064 setbit2 $0064
clearbit1 $06ed clearevent $06ed
setbit1 $06eb setevent $06eb
dotrigger $0 dotrigger $0
loadmovesprites loadmovesprites
end end

View File

@@ -17,7 +17,7 @@ UnknownScript_0x9f85a: ; 0x9f85a
; 0x9f85b ; 0x9f85b
UnknownScript_0x9f85b: ; 0x9f85b UnknownScript_0x9f85b: ; 0x9f85b
clearbit1 $07cf clearevent $07cf
return return
; 0x9f85f ; 0x9f85f

View File

@@ -9,25 +9,25 @@ BillsHouse_MapScriptHeader: ; 0x189536
GrampsScript_0x189538: ; 0x189538 GrampsScript_0x189538: ; 0x189538
faceplayer faceplayer
loadfont loadfont
checkbit1 $0000 checkevent $0000
iftrue UnknownScript_0x1896ba iftrue UnknownScript_0x1896ba
checkbit1 EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x1896c0 iftrue UnknownScript_0x1896c0
checkbit1 EVENT_MET_BILLS_GRANDPA checkevent EVENT_MET_BILLS_GRANDPA
iftrue UnknownScript_0x189553 iftrue UnknownScript_0x189553
2writetext UnknownText_0x1896ce 2writetext UnknownText_0x1896ce
keeptextopen keeptextopen
setbit1 EVENT_MET_BILLS_GRANDPA setevent EVENT_MET_BILLS_GRANDPA
UnknownScript_0x189553: ; 0x189553 UnknownScript_0x189553: ; 0x189553
checkbit1 EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA checkevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
iftrue UnknownScript_0x189697 iftrue UnknownScript_0x189697
checkbit1 EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA checkevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
iftrue UnknownScript_0x189680 iftrue UnknownScript_0x189680
checkbit1 EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA checkevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
iftrue UnknownScript_0x189669 iftrue UnknownScript_0x189669
checkbit1 EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA checkevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
iftrue UnknownScript_0x189652 iftrue UnknownScript_0x189652
checkbit1 EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA checkevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
iftrue UnknownScript_0x18963b iftrue UnknownScript_0x18963b
2writetext UnknownText_0x1898c0 2writetext UnknownText_0x1898c0
keeptextopen keeptextopen
@@ -39,7 +39,7 @@ UnknownScript_0x189553: ; 0x189553
iffalse UnknownScript_0x1896aa iffalse UnknownScript_0x1896aa
if_not_equal LICKITUNG, UnknownScript_0x1896c6 if_not_equal LICKITUNG, UnknownScript_0x1896c6
2call UnknownScript_0x1896b0 2call UnknownScript_0x1896b0
setbit1 EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
2jump UnknownScript_0x18963b 2jump UnknownScript_0x18963b
; 0x189592 ; 0x189592
@@ -54,7 +54,7 @@ UnknownScript_0x189592: ; 0x189592
iffalse UnknownScript_0x1896aa iffalse UnknownScript_0x1896aa
if_not_equal ODDISH, UnknownScript_0x1896c6 if_not_equal ODDISH, UnknownScript_0x1896c6
2call UnknownScript_0x1896b0 2call UnknownScript_0x1896b0
setbit1 EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
2jump UnknownScript_0x189652 2jump UnknownScript_0x189652
; 0x1895b3 ; 0x1895b3
@@ -69,7 +69,7 @@ UnknownScript_0x1895b3: ; 0x1895b3
iffalse UnknownScript_0x1896aa iffalse UnknownScript_0x1896aa
if_not_equal STARYU, UnknownScript_0x1896c6 if_not_equal STARYU, UnknownScript_0x1896c6
2call UnknownScript_0x1896b0 2call UnknownScript_0x1896b0
setbit1 EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
2jump UnknownScript_0x189669 2jump UnknownScript_0x189669
; 0x1895d4 ; 0x1895d4
@@ -86,7 +86,7 @@ UnknownScript_0x1895d4: ; 0x1895d4
iffalse UnknownScript_0x1896aa iffalse UnknownScript_0x1896aa
if_not_equal GROWLITHE, UnknownScript_0x1896c6 if_not_equal GROWLITHE, UnknownScript_0x1896c6
2call UnknownScript_0x1896b0 2call UnknownScript_0x1896b0
setbit1 EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
2jump UnknownScript_0x189680 2jump UnknownScript_0x189680
; 0x1895f9 ; 0x1895f9
@@ -101,7 +101,7 @@ UnknownScript_0x1895f9: ; 0x1895f9
iffalse UnknownScript_0x1896aa iffalse UnknownScript_0x1896aa
if_not_equal VULPIX, UnknownScript_0x1896c6 if_not_equal VULPIX, UnknownScript_0x1896c6
2call UnknownScript_0x1896b0 2call UnknownScript_0x1896b0
setbit1 EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
2jump UnknownScript_0x189680 2jump UnknownScript_0x189680
; 0x18961a ; 0x18961a
@@ -116,54 +116,54 @@ UnknownScript_0x18961a: ; 0x18961a
iffalse UnknownScript_0x1896aa iffalse UnknownScript_0x1896aa
if_not_equal PICHU, UnknownScript_0x1896c6 if_not_equal PICHU, UnknownScript_0x1896c6
2call UnknownScript_0x1896b0 2call UnknownScript_0x1896b0
setbit1 EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
2jump UnknownScript_0x189697 2jump UnknownScript_0x189697
; 0x18963b ; 0x18963b
UnknownScript_0x18963b: ; 0x18963b UnknownScript_0x18963b: ; 0x18963b
checkbit1 EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x189592 iftrue UnknownScript_0x189592
2call UnknownScript_0x1896b5 2call UnknownScript_0x1896b5
verbosegiveitem EVERSTONE, 1 verbosegiveitem EVERSTONE, 1
iffalse UnknownScript_0x1896cc iffalse UnknownScript_0x1896cc
setbit1 EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
setbit1 $0000 setevent $0000
loadmovesprites loadmovesprites
end end
; 0x189652 ; 0x189652
UnknownScript_0x189652: ; 0x189652 UnknownScript_0x189652: ; 0x189652
checkbit1 EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA checkevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x1895b3 iftrue UnknownScript_0x1895b3
2call UnknownScript_0x1896b5 2call UnknownScript_0x1896b5
verbosegiveitem LEAF_STONE, 1 verbosegiveitem LEAF_STONE, 1
iffalse UnknownScript_0x1896cc iffalse UnknownScript_0x1896cc
setbit1 EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
setbit1 $0000 setevent $0000
loadmovesprites loadmovesprites
end end
; 0x189669 ; 0x189669
UnknownScript_0x189669: ; 0x189669 UnknownScript_0x189669: ; 0x189669
checkbit1 EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA checkevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x1895d4 iftrue UnknownScript_0x1895d4
2call UnknownScript_0x1896b5 2call UnknownScript_0x1896b5
verbosegiveitem WATER_STONE, 1 verbosegiveitem WATER_STONE, 1
iffalse UnknownScript_0x1896cc iffalse UnknownScript_0x1896cc
setbit1 EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
setbit1 $0000 setevent $0000
loadmovesprites loadmovesprites
end end
; 0x189680 ; 0x189680
UnknownScript_0x189680: ; 0x189680 UnknownScript_0x189680: ; 0x189680
checkbit1 EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA checkevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x18961a iftrue UnknownScript_0x18961a
2call UnknownScript_0x1896b5 2call UnknownScript_0x1896b5
verbosegiveitem FIRE_STONE, 1 verbosegiveitem FIRE_STONE, 1
iffalse UnknownScript_0x1896cc iffalse UnknownScript_0x1896cc
setbit1 EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
setbit1 $0000 setevent $0000
loadmovesprites loadmovesprites
end end
; 0x189697 ; 0x189697
@@ -172,7 +172,7 @@ UnknownScript_0x189697: ; 0x189697
2call UnknownScript_0x1896b5 2call UnknownScript_0x1896b5
verbosegiveitem THUNDERSTONE, 1 verbosegiveitem THUNDERSTONE, 1
iffalse UnknownScript_0x1896cc iffalse UnknownScript_0x1896cc
setbit1 EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA setevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
loadmovesprites loadmovesprites
end end
; 0x1896a5 ; 0x1896a5

View File

@@ -32,9 +32,9 @@ UnknownScript_0x1a46e5: ; 0x1a46e5
SuperNerdScript_0x1a46e8: ; 0x1a46e8 SuperNerdScript_0x1a46e8: ; 0x1a46e8
faceplayer faceplayer
loadfont loadfont
checkbit1 EVENT_BEAT_CLAIR checkevent EVENT_BEAT_CLAIR
iftrue UnknownScript_0x1a4702 iftrue UnknownScript_0x1a4702
checkbit1 EVENT_CLEARED_RADIO_TOWER checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1a46fc iftrue UnknownScript_0x1a46fc
2writetext UnknownText_0x1a477a 2writetext UnknownText_0x1a477a
closetext closetext
@@ -67,7 +67,7 @@ GrampsScript_0x1a470b: ; 0x1a470b
BlackBeltScript_0x1a470e: ; 0x1a470e BlackBeltScript_0x1a470e: ; 0x1a470e
faceplayer faceplayer
loadfont loadfont
checkbit1 EVENT_CLEARED_RADIO_TOWER checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1a471c iftrue UnknownScript_0x1a471c
2writetext UnknownText_0x1a494a 2writetext UnknownText_0x1a494a
closetext closetext
@@ -97,21 +97,21 @@ CooltrainerFScript_0x1a4728: ; 0x1a4728
YoungsterScript_0x1a472b: ; 0x1a472b YoungsterScript_0x1a472b: ; 0x1a472b
faceplayer faceplayer
loadfont loadfont
checkbit1 EVENT_GOT_SPELL_TAG_FROM_SANTOS checkevent EVENT_GOT_SPELL_TAG_FROM_SANTOS
iftrue UnknownScript_0x1a4759 iftrue UnknownScript_0x1a4759
checkcode $b checkcode $b
if_not_equal SATURDAY, UnknownScript_0x1a475f if_not_equal SATURDAY, UnknownScript_0x1a475f
checkbit1 EVENT_MET_SANTOS_OF_SATURDAY checkevent EVENT_MET_SANTOS_OF_SATURDAY
iftrue UnknownScript_0x1a4746 iftrue UnknownScript_0x1a4746
2writetext UnknownText_0x1a4a27 2writetext UnknownText_0x1a4a27
keeptextopen keeptextopen
setbit1 EVENT_MET_SANTOS_OF_SATURDAY setevent EVENT_MET_SANTOS_OF_SATURDAY
UnknownScript_0x1a4746: ; 0x1a4746 UnknownScript_0x1a4746: ; 0x1a4746
2writetext UnknownText_0x1a4a57 2writetext UnknownText_0x1a4a57
keeptextopen keeptextopen
verbosegiveitem SPELL_TAG, 1 verbosegiveitem SPELL_TAG, 1
iffalse UnknownScript_0x1a475d iffalse UnknownScript_0x1a475d
setbit1 EVENT_GOT_SPELL_TAG_FROM_SANTOS setevent EVENT_GOT_SPELL_TAG_FROM_SANTOS
2writetext UnknownText_0x1a4a6b 2writetext UnknownText_0x1a4a6b
closetext closetext
loadmovesprites loadmovesprites

View File

@@ -11,15 +11,15 @@ BlackthornGym1F_MapScriptHeader: ; 0x194e00
; 0x194e05 ; 0x194e05
UnknownScript_0x194e05: ; 0x194e05 UnknownScript_0x194e05: ; 0x194e05
checkbit1 $0706 checkevent $0706
iffalse UnknownScript_0x194e0f iffalse UnknownScript_0x194e0f
changeblock $8, $2, $3b changeblock $8, $2, $3b
UnknownScript_0x194e0f: ; 0x194e0f UnknownScript_0x194e0f: ; 0x194e0f
checkbit1 $0707 checkevent $0707
iffalse UnknownScript_0x194e19 iffalse UnknownScript_0x194e19
changeblock $2, $4, $3a changeblock $2, $4, $3a
UnknownScript_0x194e19: ; 0x194e19 UnknownScript_0x194e19: ; 0x194e19
checkbit1 $0708 checkevent $0708
iffalse UnknownScript_0x194e23 iffalse UnknownScript_0x194e23
changeblock $8, $6, $3b changeblock $8, $6, $3b
UnknownScript_0x194e23: ; 0x194e23 UnknownScript_0x194e23: ; 0x194e23
@@ -31,7 +31,7 @@ ClairScript_0x194e24: ; 0x194e24
loadfont loadfont
checkbit2 $0022 checkbit2 $0022
iftrue UnknownScript_0x194e69 iftrue UnknownScript_0x194e69
checkbit1 EVENT_BEAT_CLAIR checkevent EVENT_BEAT_CLAIR
iftrue UnknownScript_0x194e63 iftrue UnknownScript_0x194e63
2writetext UnknownText_0x194efa 2writetext UnknownText_0x194efa
closetext closetext
@@ -40,19 +40,19 @@ ClairScript_0x194e24: ; 0x194e24
loadtrainer CLAIR, 1 loadtrainer CLAIR, 1
startbattle startbattle
returnafterbattle returnafterbattle
setbit1 EVENT_BEAT_CLAIR setevent EVENT_BEAT_CLAIR
loadfont loadfont
2writetext UnknownText_0x19500e 2writetext UnknownText_0x19500e
closetext closetext
loadmovesprites loadmovesprites
setbit1 EVENT_BEAT_COOLTRAINERM_PAUL setevent EVENT_BEAT_COOLTRAINERM_PAUL
setbit1 EVENT_BEAT_COOLTRAINERM_CODY setevent EVENT_BEAT_COOLTRAINERM_CODY
setbit1 EVENT_BEAT_COOLTRAINERM_MIKE setevent EVENT_BEAT_COOLTRAINERM_MIKE
setbit1 EVENT_BEAT_COOLTRAINERF_FRAN setevent EVENT_BEAT_COOLTRAINERF_FRAN
setbit1 EVENT_BEAT_COOLTRAINERF_LOLA setevent EVENT_BEAT_COOLTRAINERF_LOLA
clearbit1 $0736 clearevent $0736
setbit1 $074c setevent $074c
clearbit1 $074d clearevent $074d
end end
; 0x194e63 ; 0x194e63
@@ -64,7 +64,7 @@ UnknownScript_0x194e63: ; 0x194e63
; 0x194e69 ; 0x194e69
UnknownScript_0x194e69: ; 0x194e69 UnknownScript_0x194e69: ; 0x194e69
checkbit1 EVENT_GOT_TM24_DRAGONBREATH checkevent EVENT_GOT_TM24_DRAGONBREATH
iftrue UnknownScript_0x194e94 iftrue UnknownScript_0x194e94
2writetext UnknownText_0x195196 2writetext UnknownText_0x195196
keeptextopen keeptextopen
@@ -75,7 +75,7 @@ UnknownScript_0x194e69: ; 0x194e69
playsound $0001 playsound $0001
waitbutton waitbutton
itemnotify itemnotify
setbit1 EVENT_GOT_TM24_DRAGONBREATH setevent EVENT_GOT_TM24_DRAGONBREATH
2writetext UnknownText_0x1951d1 2writetext UnknownText_0x1951d1
keeptextopen keeptextopen
2jump UnknownScript_0x194e94 2jump UnknownScript_0x194e94
@@ -185,7 +185,7 @@ CooltrainerfLolaScript: ; 0x194ece
BlackthornGymGuyScript: ; 0x194ed6 BlackthornGymGuyScript: ; 0x194ed6
faceplayer faceplayer
loadfont loadfont
checkbit1 EVENT_BEAT_CLAIR checkevent EVENT_BEAT_CLAIR
iftrue .BlackthornGymGuyWinScript iftrue .BlackthornGymGuyWinScript
2writetext BlackthornGymGuyText 2writetext BlackthornGymGuyText
closetext closetext

View File

@@ -24,11 +24,11 @@ UnknownScript_0x180997: ; 0x180997
; 0x180998 ; 0x180998
UnknownScript_0x180998: ; 0x180998 UnknownScript_0x180998: ; 0x180998
checkbit1 EVENT_KOGAS_ROOM_ENTRANCE_CLOSED checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
iffalse UnknownScript_0x1809a2 iffalse UnknownScript_0x1809a2
changeblock $4, $e, $2a changeblock $4, $e, $2a
UnknownScript_0x1809a2: ; 0x1809a2 UnknownScript_0x1809a2: ; 0x1809a2
checkbit1 EVENT_BRUNOS_ROOM_EXIT_OPEN checkevent EVENT_BRUNOS_ROOM_EXIT_OPEN
iffalse UnknownScript_0x1809ac iffalse UnknownScript_0x1809ac
changeblock $4, $2, $16 changeblock $4, $2, $16
UnknownScript_0x1809ac: ; 0x1809ac UnknownScript_0x1809ac: ; 0x1809ac
@@ -44,7 +44,7 @@ UnknownScript_0x1809ad: ; 0x1809ad
reloadmappart reloadmappart
loadmovesprites loadmovesprites
dotrigger $1 dotrigger $1
setbit1 EVENT_KOGAS_ROOM_ENTRANCE_CLOSED setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
waitbutton waitbutton
end end
; 0x1809c5 ; 0x1809c5
@@ -52,7 +52,7 @@ UnknownScript_0x1809ad: ; 0x1809ad
BrunoScript_0x1809c5: ; 0x1809c5 BrunoScript_0x1809c5: ; 0x1809c5
faceplayer faceplayer
loadfont loadfont
checkbit1 $05ba checkevent $05ba
iftrue UnknownScript_0x1809f3 iftrue UnknownScript_0x1809f3
2writetext UnknownText_0x1809fe 2writetext UnknownText_0x1809fe
closetext closetext
@@ -61,7 +61,7 @@ BrunoScript_0x1809c5: ; 0x1809c5
loadtrainer BRUNO, 1 loadtrainer BRUNO, 1
startbattle startbattle
returnafterbattle returnafterbattle
setbit1 $05ba setevent $05ba
loadfont loadfont
2writetext UnknownText_0x180b3c 2writetext UnknownText_0x180b3c
closetext closetext
@@ -70,7 +70,7 @@ BrunoScript_0x1809c5: ; 0x1809c5
changeblock $4, $2, $16 changeblock $4, $2, $16
reloadmappart reloadmappart
loadmovesprites loadmovesprites
setbit1 EVENT_BRUNOS_ROOM_EXIT_OPEN setevent EVENT_BRUNOS_ROOM_EXIT_OPEN
waitbutton waitbutton
end end
; 0x1809f3 ; 0x1809f3

View File

@@ -29,11 +29,11 @@ UnknownScript_0x185bf7: ; 0x185bf7
; 0x185bf8 ; 0x185bf8
UnknownScript_0x185bf8: ; 0x185bf8 UnknownScript_0x185bf8: ; 0x185bf8
checkbit1 $0332 checkevent $0332
iftrue UnknownScript_0x185c02 iftrue UnknownScript_0x185c02
changeblock $a, $8, $32 changeblock $a, $8, $32
UnknownScript_0x185c02: ; 0x185c02 UnknownScript_0x185c02: ; 0x185c02
checkbit1 EVENT_RELEASED_THE_BEASTS checkevent EVENT_RELEASED_THE_BEASTS
iftrue UnknownScript_0x185c0c iftrue UnknownScript_0x185c0c
changeblock $6, $e, $9 changeblock $6, $e, $9
UnknownScript_0x185c0c: ; 0x185c0c UnknownScript_0x185c0c: ; 0x185c0c
@@ -66,9 +66,9 @@ UnknownScript_0x185c25: ; 0x185c25
2writetext UnknownText_0x185cd9 2writetext UnknownText_0x185cd9
closetext closetext
loadmovesprites loadmovesprites
checkbit1 EVENT_GOT_TOTODILE_FROM_ELM checkevent EVENT_GOT_TOTODILE_FROM_ELM
iftrue UnknownScript_0x185c60 iftrue UnknownScript_0x185c60
checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue UnknownScript_0x185c70 iftrue UnknownScript_0x185c70
winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c
setlasttalked $4 setlasttalked $4
@@ -106,7 +106,7 @@ UnknownScript_0x185c80: ; 0x185c80
closetext closetext
loadmovesprites loadmovesprites
dotrigger $2 dotrigger $2
setbit1 $06c5 setevent $06c5
special $006a special $006a
pause 15 pause 15
earthquake 50 earthquake 50
@@ -123,7 +123,7 @@ UnknownScript_0x185c80: ; 0x185c80
2writetext UnknownText_0x185e75 2writetext UnknownText_0x185e75
closetext closetext
loadmovesprites loadmovesprites
setbit1 $0332 setevent $0332
pause 15 pause 15
warpcheck warpcheck
end end

View File

@@ -23,7 +23,7 @@ UnknownScript_0x18615f: ; 0x18615f
; 0x186160 ; 0x186160
UnknownScript_0x186160: ; 0x186160 UnknownScript_0x186160: ; 0x186160
checkbit1 EVENT_RELEASED_THE_BEASTS checkevent EVENT_RELEASED_THE_BEASTS
iftrue UnknownScript_0x18616a iftrue UnknownScript_0x18616a
changeblock $6, $e, $2 changeblock $6, $e, $2
UnknownScript_0x18616a: ; 0x18616a UnknownScript_0x18616a: ; 0x18616a
@@ -80,15 +80,15 @@ UnknownScript_0x18616b: ; 0x18616b
waitbutton waitbutton
special $003d special $003d
dotrigger $1 dotrigger $1
setbit1 EVENT_RELEASED_THE_BEASTS setevent EVENT_RELEASED_THE_BEASTS
special $0069 special $0069
domaptrigger GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM, $1 domaptrigger GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM, $1
domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $1 domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $1
clearbit1 EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
setbit1 $07a8 setevent $07a8
clearbit1 $07a9 clearevent $07a9
setbit1 $0764 setevent $0764
setbit1 $0765 setevent $0765
appear $a appear $a
refreshscreen $0 refreshscreen $0
changeblock $6, $e, $1b changeblock $6, $e, $1b

View File

@@ -92,7 +92,7 @@ MapCeladonCafeSignpost0Script: ; 0x730ad
; 0x730b0 ; 0x730b0
MapCeladonCafeSignpost1Script: ; 0x730b0 MapCeladonCafeSignpost1Script: ; 0x730b0
checkbit1 EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE checkevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE
iftrue UnknownScript_0x730db iftrue UnknownScript_0x730db
giveitem LEFTOVERS, $1 giveitem LEFTOVERS, $1
iffalse UnknownScript_0x730cd iffalse UnknownScript_0x730cd
@@ -103,7 +103,7 @@ MapCeladonCafeSignpost1Script: ; 0x730b0
waitbutton waitbutton
itemnotify itemnotify
loadmovesprites loadmovesprites
setbit1 EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE setevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE
end end
; 0x730cd ; 0x730cd

View File

@@ -47,7 +47,7 @@ FishingGuruScript_0x72139: ; 0x72139
FisherScript_0x72144: ; 0x72144 FisherScript_0x72144: ; 0x72144
faceplayer faceplayer
loadfont loadfont
checkbit1 EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON checkevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON
iftrue .UnknownScript_0x72169 iftrue .UnknownScript_0x72169
2writetext UnknownText_0x722dc 2writetext UnknownText_0x722dc
keeptextopen keeptextopen
@@ -58,7 +58,7 @@ FisherScript_0x72144: ; 0x72144
stringtotext .coinname, $1 stringtotext .coinname, $1
2call .UnknownScript_0x72172 2call .UnknownScript_0x72172
givecoins 18 givecoins 18
setbit1 EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON
.UnknownScript_0x72169 ; 0x72169 .UnknownScript_0x72169 ; 0x72169
2writetext UnknownText_0x72345 2writetext UnknownText_0x72345
closetext closetext

View File

@@ -18,24 +18,24 @@ ErikaScript_0x72a6a: ; 0x72a6a
loadtrainer ERIKA, 1 loadtrainer ERIKA, 1
startbattle startbattle
returnafterbattle returnafterbattle
setbit1 $04c8 setevent $04c8
setbit1 EVENT_BEAT_LASS_MICHELLE setevent EVENT_BEAT_LASS_MICHELLE
setbit1 EVENT_BEAT_PICNICKER_TANYA setevent EVENT_BEAT_PICNICKER_TANYA
setbit1 EVENT_BEAT_BEAUTY_JULIA setevent EVENT_BEAT_BEAUTY_JULIA
setbit1 EVENT_BEAT_TWINS_JO_AND_ZOE setevent EVENT_BEAT_TWINS_JO_AND_ZOE
loadfont loadfont
2writetext UnknownText_0x72c96 2writetext UnknownText_0x72c96
playsound $009c playsound $009c
waitbutton waitbutton
setbit2 $0026 setbit2 $0026
UnknownScript_0x72a9b: ; 0x72a9b UnknownScript_0x72a9b: ; 0x72a9b
checkbit1 EVENT_GOT_TM19_GIGA_DRAIN checkevent EVENT_GOT_TM19_GIGA_DRAIN
iftrue UnknownScript_0x72aae iftrue UnknownScript_0x72aae
2writetext UnknownText_0x72cb0 2writetext UnknownText_0x72cb0
keeptextopen keeptextopen
verbosegiveitem TM_19, 1 verbosegiveitem TM_19, 1
iffalse UnknownScript_0x72aae iffalse UnknownScript_0x72aae
setbit1 EVENT_GOT_TM19_GIGA_DRAIN setevent EVENT_GOT_TM19_GIGA_DRAIN
UnknownScript_0x72aae: ; 0x72aae UnknownScript_0x72aae: ; 0x72aae
2writetext UnknownText_0x72d8f 2writetext UnknownText_0x72d8f
closetext closetext

View File

@@ -28,14 +28,14 @@ UnknownScript_0x7167e: ; 0x7167e
2writetext UnknownText_0x71763 2writetext UnknownText_0x71763
closetext closetext
loadmovesprites loadmovesprites
setbit1 EVENT_ENABLE_DIPLOMA_PRINTING setevent EVENT_ENABLE_DIPLOMA_PRINTING
end end
; 0x71696 ; 0x71696
GymGuyScript_0x71696: ; 0x71696 GymGuyScript_0x71696: ; 0x71696
faceplayer faceplayer
loadfont loadfont
checkbit1 EVENT_ENABLE_DIPLOMA_PRINTING checkevent EVENT_ENABLE_DIPLOMA_PRINTING
iftrue UnknownScript_0x716a4 iftrue UnknownScript_0x716a4
2writetext UnknownText_0x717b4 2writetext UnknownText_0x717b4
closetext closetext

View File

@@ -9,7 +9,7 @@ CeladonMansionRoofHouse_MapScriptHeader: ; 0x71afb
PharmacistScript_0x71afd: ; 0x71afd PharmacistScript_0x71afd: ; 0x71afd
faceplayer faceplayer
loadfont loadfont
checkbit1 EVENT_GOT_TM03_CURSE checkevent EVENT_GOT_TM03_CURSE
iftrue UnknownScript_0x71b21 iftrue UnknownScript_0x71b21
2writetext UnknownText_0x71b27 2writetext UnknownText_0x71b27
keeptextopen keeptextopen
@@ -26,7 +26,7 @@ UnknownScript_0x71b14: ; 0x71b14
keeptextopen keeptextopen
verbosegiveitem TM_03, 1 verbosegiveitem TM_03, 1
iffalse UnknownScript_0x71b25 iffalse UnknownScript_0x71b25
setbit1 EVENT_GOT_TM03_CURSE setevent EVENT_GOT_TM03_CURSE
UnknownScript_0x71b21: ; 0x71b21 UnknownScript_0x71b21: ; 0x71b21
2writetext UnknownText_0x71db3 2writetext UnknownText_0x71db3
closetext closetext

View File

@@ -18,7 +18,7 @@ UnknownScript_0x184005: ; 0x184005
CooltrainerMScript_0x184009: ; 0x184009 CooltrainerMScript_0x184009: ; 0x184009
faceplayer faceplayer
loadfont loadfont
checkbit1 EVENT_RETURNED_MACHINE_PART checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x184017 iftrue UnknownScript_0x184017
2writetext UnknownText_0x1840bc 2writetext UnknownText_0x1840bc
closetext closetext
@@ -72,9 +72,9 @@ CooltrainerFScript_0x18402a: ; 0x18402a
FisherScript_0x18404a: ; 0x18404a FisherScript_0x18404a: ; 0x18404a
faceplayer faceplayer
loadfont loadfont
checkbit1 EVENT_RETURNED_MACHINE_PART checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x184058 iftrue UnknownScript_0x184058
checkbit1 EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM checkevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
iftrue UnknownScript_0x18405e iftrue UnknownScript_0x18405e
UnknownScript_0x184058: ; 0x184058 UnknownScript_0x184058: ; 0x184058
2writetext UnknownText_0x18424e 2writetext UnknownText_0x18424e
@@ -96,7 +96,7 @@ YoungsterScript_0x184064: ; 0x184064
2writetext UnknownText_0x1842a9 2writetext UnknownText_0x1842a9
closetext closetext
loadmovesprites loadmovesprites
checkbit1 $00fa checkevent $00fa
iffalse UnknownScript_0x184072 iffalse UnknownScript_0x184072
end end
; 0x184072 ; 0x184072

View File

@@ -42,9 +42,9 @@ UnknownScript_0x1883de: ; 0x1883de
applymovement $2, MovementData_0x1884e8 applymovement $2, MovementData_0x1884e8
playsound $0023 playsound $0023
disappear $2 disappear $2
setbit1 EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
clearbit1 $076c clearevent $076c
clearbit1 $076e clearevent $076e
dotrigger $0 dotrigger $0
domaptrigger GROUP_ROUTE_25, MAP_ROUTE_25, $1 domaptrigger GROUP_ROUTE_25, MAP_ROUTE_25, $1
domaptrigger GROUP_POWER_PLANT, MAP_POWER_PLANT, $0 domaptrigger GROUP_POWER_PLANT, MAP_POWER_PLANT, $0
@@ -68,10 +68,10 @@ MistyScript_0x188432: ; 0x188432
loadtrainer MISTY, 1 loadtrainer MISTY, 1
startbattle startbattle
returnafterbattle returnafterbattle
setbit1 EVENT_BEAT_MISTY setevent EVENT_BEAT_MISTY
setbit1 EVENT_BEAT_SWIMMERF_DIANA setevent EVENT_BEAT_SWIMMERF_DIANA
setbit1 EVENT_BEAT_SWIMMERF_BRIANA setevent EVENT_BEAT_SWIMMERF_BRIANA
setbit1 EVENT_BEAT_SWIMMERM_PARKER setevent EVENT_BEAT_SWIMMERM_PARKER
loadfont loadfont
2writetext UnknownText_0x188768 2writetext UnknownText_0x188768
playsound $009c playsound $009c
@@ -174,7 +174,7 @@ SwimmermParkerScript: ; 0x18849a
CeruleanGymGuyScript: ; 0x1884a2 CeruleanGymGuyScript: ; 0x1884a2
faceplayer faceplayer
loadfont loadfont
checkbit1 EVENT_BEAT_MISTY checkevent EVENT_BEAT_MISTY
iftrue .CeruleanGymGuyWinScript iftrue .CeruleanGymGuyWinScript
2writetext CeruleanGymGuyText 2writetext CeruleanGymGuyText
closetext closetext
@@ -195,7 +195,7 @@ MapCeruleanGymSignpostItem0: ; 0x1884b6
; 0x1884b9 ; 0x1884b9
MapCeruleanGymSignpost1Script: ; 0x1884b9 MapCeruleanGymSignpost1Script: ; 0x1884b9
checkbit1 $076f checkevent $076f
iffalse UnknownScript_0x1884d3 iffalse UnknownScript_0x1884d3
loadfont loadfont
2writetext UnknownText_0x188610 2writetext UnknownText_0x188610
@@ -205,7 +205,7 @@ MapCeruleanGymSignpost1Script: ; 0x1884b9
; 0x1884c6 ; 0x1884c6
MapCeruleanGymSignpost2Script: ; 0x1884c6 MapCeruleanGymSignpost2Script: ; 0x1884c6
checkbit1 $076f checkevent $076f
iffalse UnknownScript_0x1884d3 iffalse UnknownScript_0x1884d3
loadfont loadfont
2writetext UnknownText_0x188642 2writetext UnknownText_0x188642

View File

@@ -9,9 +9,9 @@ CharcoalKiln_MapScriptHeader: ; 0x18dd18
BlackBeltScript_0x18dd1a: ; 0x18dd1a BlackBeltScript_0x18dd1a: ; 0x18dd1a
faceplayer faceplayer
loadfont loadfont
checkbit1 EVENT_GOT_HM01_CUT checkevent EVENT_GOT_HM01_CUT
iftrue UnknownScript_0x18dd34 iftrue UnknownScript_0x18dd34
checkbit1 EVENT_CLEARED_SLOWPOKE_WELL checkevent EVENT_CLEARED_SLOWPOKE_WELL
iftrue UnknownScript_0x18dd2e iftrue UnknownScript_0x18dd2e
2writetext UnknownText_0x18dd74 2writetext UnknownText_0x18dd74
closetext closetext
@@ -36,9 +36,9 @@ UnknownScript_0x18dd34: ; 0x18dd34
YoungsterScript_0x18dd3a: ; 0x18dd3a YoungsterScript_0x18dd3a: ; 0x18dd3a
faceplayer faceplayer
loadfont loadfont
checkbit1 EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN checkevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN
iftrue UnknownScript_0x18dd5d iftrue UnknownScript_0x18dd5d
checkbit1 EVENT_GOT_HM01_CUT checkevent EVENT_GOT_HM01_CUT
iftrue UnknownScript_0x18dd4e iftrue UnknownScript_0x18dd4e
2writetext UnknownText_0x18dee0 2writetext UnknownText_0x18dee0
closetext closetext
@@ -51,7 +51,7 @@ UnknownScript_0x18dd4e: ; 0x18dd4e
keeptextopen keeptextopen
verbosegiveitem CHARCOAL, 1 verbosegiveitem CHARCOAL, 1
iffalse UnknownScript_0x18dd61 iffalse UnknownScript_0x18dd61
setbit1 EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN setevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN
loadmovesprites loadmovesprites
end end
; 0x18dd5d ; 0x18dd5d

View File

@@ -87,7 +87,7 @@ UnknownScript_0x19c01f: ; 0x19c01f
applymovement $2, MovementData_0x19c1cb applymovement $2, MovementData_0x19c1cb
playsound $001f playsound $001f
disappear $2 disappear $2
clearbit1 EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE clearevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
waitbutton waitbutton
end end
@@ -123,9 +123,9 @@ UnknownScript_0x19c0ae: ; 0x19c0ae
2writetext UnknownText_0x19c4e2 2writetext UnknownText_0x19c4e2
closetext closetext
loadmovesprites loadmovesprites
checkbit1 EVENT_GOT_TOTODILE_FROM_ELM checkevent EVENT_GOT_TOTODILE_FROM_ELM
iftrue UnknownScript_0x19c0ee iftrue UnknownScript_0x19c0ee
checkbit1 EVENT_GOT_CHIKORITA_FROM_ELM checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue UnknownScript_0x19c104 iftrue UnknownScript_0x19c104
winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6 winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6
setlasttalked $3 setlasttalked $3
@@ -228,13 +228,13 @@ UnknownScript_0x19c168: ; 0x19c168
FisherScript_0x19c16e: ; 0x19c16e FisherScript_0x19c16e: ; 0x19c16e
faceplayer faceplayer
loadfont loadfont
checkbit1 EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE checkevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE
iftrue UnknownScript_0x19c183 iftrue UnknownScript_0x19c183
2writetext UnknownText_0x19c766 2writetext UnknownText_0x19c766
keeptextopen keeptextopen
verbosegiveitem MYSTIC_WATER, 1 verbosegiveitem MYSTIC_WATER, 1
iffalse UnknownScript_0x19c187 iffalse UnknownScript_0x19c187
setbit1 EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE setevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE
UnknownScript_0x19c183: ; 0x19c183 UnknownScript_0x19c183: ; 0x19c183
2writetext UnknownText_0x19c7c1 2writetext UnknownText_0x19c7c1
closetext closetext

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