Merge pull request #209 from yenatch/script-commands

use updated script commands from pokemontools
This commit is contained in:
Bryan Bishop
2013-09-30 23:17:04 -07:00
204 changed files with 2079 additions and 2073 deletions

View File

@@ -11015,7 +11015,7 @@ Function0x37e77: ; 37e77
BattleCommandaa: ; 37e80 BattleCommandaa: ; 37e80
; wait ; movedelay
; Wait 40 frames. ; Wait 40 frames.
ld c, 40 ld c, 40
jp DelayFrames jp DelayFrames

View File

@@ -2201,7 +2201,7 @@ Teleport:
BeatUp: BeatUp:
checkobedience checkobedience
usedmovetext usedmovetext
wait movedelay
doturn doturn
startloop startloop
effect0x0a effect0x0a

View File

@@ -9,8 +9,8 @@ ScriptCommandTable: ; 0x96cb1
dw Script_if_not_equal dw Script_if_not_equal
dw Script_iffalse dw Script_iffalse
dw Script_iftrue dw Script_iftrue
dw Script_if_less_than
dw Script_if_greater_than dw Script_if_greater_than
dw Script_if_less_than
dw Script_jumpstd dw Script_jumpstd
dw Script_callstd dw Script_callstd
dw Script_3callasm dw Script_3callasm
@@ -48,14 +48,14 @@ 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_checkflag
dw Script_clearbit2 dw Script_clearflag
dw Script_setbit2 dw Script_setflag
dw Script_wildoff
dw Script_wildon dw Script_wildon
dw Script_wildoff
dw Script_xycompare dw Script_xycompare
dw Script_warpmod dw Script_warpmod
dw Script_blackoutmod dw Script_blackoutmod
@@ -165,9 +165,9 @@ ScriptCommandTable: ; 0x96cb1
dw Script_warpfacing dw Script_warpfacing
dw Script_storetext dw Script_storetext
dw Script_displaylocation dw Script_displaylocation
dw Script_unknown0xa6 dw Script_trainerclassname
dw Script_unknown0xa7 dw Script_name
dw Script_unknown0xa8 dw Script_wait
dw Script_unknown0xa9 dw Script_unknown0xa9
; 0x96e05 ; 0x96e05
@@ -1734,7 +1734,7 @@ Script_if_not_equal: ; 0x9754b
jr SkipTwoScriptBytes ; 0x97554 $40 jr SkipTwoScriptBytes ; 0x97554 $40
; 0x97556 ; 0x97556
Script_if_less_than: ; 0x97556 Script_if_greater_than: ; 0x97556
; script command 0xa ; script command 0xa
; parameters: ; parameters:
; byte (SingleByteParam) ; byte (SingleByteParam)
@@ -1748,7 +1748,7 @@ Script_if_less_than: ; 0x97556
jr SkipTwoScriptBytes ; 0x97560 $34 jr SkipTwoScriptBytes ; 0x97560 $34
; 0x97562 ; 0x97562
Script_if_greater_than: ; 0x97562 Script_if_less_than: ; 0x97562
; script command 0xb ; script command 0xb
; parameters: ; parameters:
; byte (SingleByteParam) ; byte (SingleByteParam)
@@ -2151,6 +2151,7 @@ Script_displaylocation: ; 0x97701
; script command 0xa5 ; script command 0xa5
; parameters: ; parameters:
; id (SingleByteParam) ; id (SingleByteParam)
; memory (SingleByteParam)
call GetScriptByte call GetScriptByte
jr Unknown_976f4 ; 0x97704 $ee jr Unknown_976f4 ; 0x97704 $ee
@@ -2173,8 +2174,11 @@ Script_trainertotext: ; 0x97706
jr Unknown_976c0 ; 0x97714 $aa jr Unknown_976c0 ; 0x97714 $aa
; 0x97716 ; 0x97716
Script_unknown0xa7: ; 0x97716 Script_name: ; 0x97716
; script command 0xa7 ; script command 0xa7
; parameters:
; type (SingleByteParam)
; id (SingleByteParam)
call GetScriptByte call GetScriptByte
ld [$cf61], a ld [$cf61], a
@@ -2187,7 +2191,7 @@ Unknown_9771c: ; 0x9771c
jp Unknown_976c0 jp Unknown_976c0
; 0x9772b ; 0x9772b
Script_unknown0xa6: ; 0x9772b Script_trainerclassname: ; 0x9772b
; script command 0xa6 ; script command 0xa6
ld a, $7 ld a, $7
@@ -2667,7 +2671,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 +2685,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 +2699,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)
@@ -2715,7 +2719,7 @@ Script_checkbit1: ; 0x979a4
ret ret
; 0x979bb ; 0x979bb
Script_setbit2: ; 0x979bb Script_setflag: ; 0x979bb
; script command 0x36 ; script command 0x36
; parameters: ; parameters:
; bit_number (MultiByteParam) ; bit_number (MultiByteParam)
@@ -2729,7 +2733,7 @@ Script_setbit2: ; 0x979bb
ret ret
; 0x979c9 ; 0x979c9
Script_clearbit2: ; 0x979c9 Script_clearflag: ; 0x979c9
; script command 0x35 ; script command 0x35
; parameters: ; parameters:
; bit_number (MultiByteParam) ; bit_number (MultiByteParam)
@@ -2743,7 +2747,7 @@ Script_clearbit2: ; 0x979c9
ret ret
; 0x979d7 ; 0x979d7
Script_checkbit2: ; 0x979d7 Script_checkflag: ; 0x979d7
; script command 0x34 ; script command 0x34
; parameters: ; parameters:
; bit_number (MultiByteParam) ; bit_number (MultiByteParam)
@@ -2770,18 +2774,18 @@ Unknown_0x979ee: ; 0x979ee
ret ret
; 0x979f5 ; 0x979f5
Script_wildon: ; 0x979f5 Script_wildoff: ; 0x979f5
; script command 0x38 ; script command 0x38
ld hl, $d84c ld hl, StatusFlags
set 5, [hl] set 5, [hl]
ret ret
; 0x979fb ; 0x979fb
Script_wildoff: ; 0x979fb Script_wildon: ; 0x979fb
; script command 0x37 ; script command 0x37
ld hl, $d84c ld hl, StatusFlags
res 5, [hl] res 5, [hl]
ret ret
; 0x97a01 ; 0x97a01
@@ -3211,7 +3215,7 @@ DisplayCredits:
ret ret
; 0x97c05 ; 0x97c05
Script_unknown0xa8: ; 0x97c05 Script_wait: ; 0x97c05
; script command 0xa8 ; script command 0xa8
; parameters: ; parameters:
; unknown (SingleByteParam) ; unknown (SingleByteParam)

File diff suppressed because it is too large Load Diff

2
extras

Submodule extras updated: f3fb1f24ea...1089cf99d0

View File

@@ -19116,9 +19116,9 @@ BoxNameInputUpper:
INCBIN "baserom.gbc", $11e5d, $122c1 - $11e5d INCBIN "baserom.gbc", $11e5d, $122c1 - $11e5d
UnknownScript_0x122c1: ; 0x122c1 UnknownScript_0x122c1: ; 0x122c1
checkbit2 $0011 checkflag $0011
iffalse .script_122cd iffalse .script_122cd
setbit2 $0051 setflag $0051
special $0017 special $0017
.script_122cd .script_122cd
end end
@@ -19409,7 +19409,7 @@ UnknownScript_0x124c8: ; 0x124c8
special $002e special $002e
pause 40 pause 40
special $001b special $001b
checkbit2 $0011 checkflag $0011
iftrue .script_64f2 iftrue .script_64f2
3callasm BANK(HalveMoney), HalveMoney 3callasm BANK(HalveMoney), HalveMoney
3callasm BANK(Function12527), Function12527 3callasm BANK(Function12527), Function12527
@@ -54426,7 +54426,7 @@ UnknownScript_0x506c8: ; 0x506c8
closetext closetext
3callasm BANK(Function506ef), Function506ef 3callasm BANK(Function506ef), Function506ef
iffalse UnknownScript_0x506e9 iffalse UnknownScript_0x506e9
checkbit2 $0011 checkflag $0011
iftrue UnknownScript_0x506e5 iftrue UnknownScript_0x506e5
battlecheck battlecheck
startbattle startbattle

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,26 +18,26 @@ 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
waitbutton waitbutton
setbit2 $001c setflag $001c
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
@@ -230,7 +230,7 @@ AzaleaGymGuyScript: ; 0x18ece6
; 0x18ecfb ; 0x18ecfb
MapAzaleaGymSignpost1Script: ; 0x18ecfb MapAzaleaGymSignpost1Script: ; 0x18ecfb
checkbit2 $001c checkflag $001c
iftrue UnknownScript_0x18ed04 iftrue UnknownScript_0x18ed04
jumpstd $002d jumpstd $002d
; 0x18ed04 ; 0x18ed04

View File

@@ -28,7 +28,7 @@ UnknownScript_0x198013: ; 0x198013
; 0x198014 ; 0x198014
UnknownScript_0x198014: ; 0x198014 UnknownScript_0x198014: ; 0x198014
setbit2 $0044 setflag $0044
return return
; 0x198018 ; 0x198018
@@ -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
@@ -175,9 +175,9 @@ UnknownScript_0x1980e5: ; 0x1980e5
closetext closetext
verbosegiveitem GS_BALL, 1 verbosegiveitem GS_BALL, 1
spriteface $d, $2 spriteface $d, $2
setbit2 $0064 setflag $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

@@ -13,7 +13,7 @@ BlackthornCity_MapScriptHeader: ; 0x1a46d0
; 0x1a46d8 ; 0x1a46d8
UnknownScript_0x1a46d8: ; 0x1a46d8 UnknownScript_0x1a46d8: ; 0x1a46d8
setbit2 $004b setflag $004b
return return
; 0x1a46dc ; 0x1a46dc
@@ -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
@@ -29,9 +29,9 @@ UnknownScript_0x194e23: ; 0x194e23
ClairScript_0x194e24: ; 0x194e24 ClairScript_0x194e24: ; 0x194e24
faceplayer faceplayer
loadfont loadfont
checkbit2 $0022 checkflag $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
@@ -200,7 +200,7 @@ BlackthornGymGuyScript: ; 0x194ed6
; 0x194eea ; 0x194eea
MapBlackthornGym1FSignpost1Script: ; 0x194eea MapBlackthornGym1FSignpost1Script: ; 0x194eea
checkbit2 $0022 checkflag $0022
iftrue UnknownScript_0x194ef3 iftrue UnknownScript_0x194ef3
jumpstd $002d jumpstd $002d
; 0x194ef3 ; 0x194ef3

View File

@@ -18,7 +18,7 @@ DaisyScript_0x19b0d0: ; 0x19b0d0
; 0x19b0de ; 0x19b0de
UnknownScript_0x19b0de: ; 0x19b0de UnknownScript_0x19b0de: ; 0x19b0de
checkbit2 $005c checkflag $005c
iftrue UnknownScript_0x19b11e iftrue UnknownScript_0x19b11e
2writetext UnknownText_0x19b1b6 2writetext UnknownText_0x19b1b6
yesorno yesorno
@@ -28,7 +28,7 @@ UnknownScript_0x19b0de: ; 0x19b0de
special $0063 special $0063
if_equal $0, UnknownScript_0x19b124 if_equal $0, UnknownScript_0x19b124
if_equal $1, UnknownScript_0x19b12a if_equal $1, UnknownScript_0x19b12a
setbit2 $005c setflag $005c
2writetext UnknownText_0x19b266 2writetext UnknownText_0x19b266
closetext closetext
loadmovesprites loadmovesprites

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

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

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

@@ -9,7 +9,7 @@ CeladonGym_MapScriptHeader: ; 0x72a68
ErikaScript_0x72a6a: ; 0x72a6a ErikaScript_0x72a6a: ; 0x72a6a
faceplayer faceplayer
loadfont loadfont
checkbit2 $0026 checkflag $0026
iftrue UnknownScript_0x72a9b iftrue UnknownScript_0x72a9b
2writetext UnknownText_0x72b28 2writetext UnknownText_0x72b28
closetext closetext
@@ -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 setflag $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
@@ -189,7 +189,7 @@ TwinsJoandzoe2Script: ; 0x72b10
; 0x72b18 ; 0x72b18
MapCeladonGymSignpost1Script: ; 0x72b18 MapCeladonGymSignpost1Script: ; 0x72b18
checkbit2 $0026 checkflag $0026
iftrue UnknownScript_0x72b21 iftrue UnknownScript_0x72b21
jumpstd $002d jumpstd $002d
; 0x72b21 ; 0x72b21

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