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

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source 
# Conflicts:
#	maps/Route25.asm
#	maps/Route27.asm
#	maps/Route35.asm
#	maps/Route39.asm
#	maps/Route42.asm
#	maps/Route43.asm
#	maps/Route43MahoganyGate.asm
#	maps/Route45.asm
#	maps/Route5CleanseTagHouse.asm
#	maps/Route6SaffronGate.asm
#	maps/Route7SaffronGate.asm
#	maps/ViridianCity.asm
This commit is contained in:
Rangi
2018-01-30 22:01:20 -05:00
parent 6e00101b89 7547ad839c
commit 72cdcb621c
19 changed files with 610 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
maps/Route44.asm
View File

@@ -24,29 +24,29 @@ TrainerBirdKeeperVance1:
end_if_just_battled
opentext
checkflag ENGINE_VANCE
iftrue UnknownScript_0x19d86a
iftrue .WantsBattle
checkcellnum PHONE_BIRDKEEPER_VANCE
iftrue UnknownScript_0x19d8eb
iftrue Route44NumberAcceptedM
checkevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x19d853
writetext UnknownText_0x19dbf3
iftrue .AskedAlready
writetext BirdKeeperVanceLegendaryBirdsText
buttonsound
setevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x19d8df
jump UnknownScript_0x19d856
scall Route44AskNumber1M
jump .AskForNumber
UnknownScript_0x19d853:
scall UnknownScript_0x19d8e3
UnknownScript_0x19d856:
.AskedAlready:
scall Route44AskNumber2M
.AskForNumber:
askforphonenumber PHONE_BIRDKEEPER_VANCE
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d8f3
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d8ef
if_equal PHONE_CONTACTS_FULL, Route44PhoneFullM
if_equal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
trainertotext BIRD_KEEPER, VANCE1, MEM_BUFFER_0
scall UnknownScript_0x19d8e7
jump UnknownScript_0x19d8eb
scall Route44RegisteredNumberM
jump Route44NumberAcceptedM
UnknownScript_0x19d86a:
scall UnknownScript_0x19d8f7
.WantsBattle:
scall Route44RematchM
winlosstext BirdKeeperVance1BeatenText, 0
copybytetovar wVanceFightCount
if_equal 2, .Fight2
@@ -80,70 +80,70 @@ UnknownScript_0x19d86a:
reloadmapafterbattle
clearflag ENGINE_VANCE
checkevent EVENT_VANCE_CARBOS
iftrue UnknownScript_0x19d8cb
iftrue .Carbos
checkevent EVENT_GOT_CARBOS_FROM_VANCE
iftrue UnknownScript_0x19d8ca
scall UnknownScript_0x19d90a
iftrue .ReceivedCarbosBefore
scall Route44RematchGiftM
verbosegiveitem CARBOS
iffalse UnknownScript_0x19d903
iffalse VancePackFull
setevent EVENT_GOT_CARBOS_FROM_VANCE
jump UnknownScript_0x19d8eb
jump Route44NumberAcceptedM
UnknownScript_0x19d8ca:
.ReceivedCarbosBefore:
end
UnknownScript_0x19d8cb:
.Carbos:
opentext
writetext UnknownText_0x19dc67
writetext BirdKeeperVance2BeatenText
waitbutton
verbosegiveitem CARBOS
iffalse UnknownScript_0x19d903
iffalse VancePackFull
clearevent EVENT_VANCE_CARBOS
setevent EVENT_GOT_CARBOS_FROM_VANCE
jump UnknownScript_0x19d8eb
jump Route44NumberAcceptedM
UnknownScript_0x19d8df:
Route44AskNumber1M:
jumpstd asknumber1m
end
UnknownScript_0x19d8e3:
Route44AskNumber2M:
jumpstd asknumber2m
end
UnknownScript_0x19d8e7:
Route44RegisteredNumberM:
jumpstd registerednumberm
end
UnknownScript_0x19d8eb:
Route44NumberAcceptedM:
jumpstd numberacceptedm
end
UnknownScript_0x19d8ef:
Route44NumberDeclinedM:
jumpstd numberdeclinedm
end
UnknownScript_0x19d8f3:
Route44PhoneFullM:
jumpstd phonefullm
end
UnknownScript_0x19d8f7:
Route44RematchM:
jumpstd rematchm
end
UnknownScript_0x19d8fb:
Route44GiftM:
jumpstd giftm
end
UnknownScript_0x19d8ff:
Route44PackFullM:
jumpstd packfullm
end
UnknownScript_0x19d903:
VancePackFull:
setevent EVENT_VANCE_CARBOS
jumpstd packfullm
end
UnknownScript_0x19d90a:
Route44RematchGiftM:
jumpstd rematchgiftm
end
@@ -166,31 +166,31 @@ TrainerFisherWilton1:
end_if_just_battled
opentext
checkflag ENGINE_WILTON
iftrue UnknownScript_0x19d96e
iftrue .WantsBattle
checkflag ENGINE_WILTON_HAS_ITEM
iftrue UnknownScript_0x19d9b4
iftrue .HasItem
checkcellnum PHONE_FISHER_WILTON
iftrue UnknownScript_0x19d8eb
iftrue Route44NumberAcceptedM
checkevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x19d957
writetext UnknownText_0x19daa8
iftrue .AskedAlready
writetext FisherWiltonHugePoliwagText
buttonsound
setevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x19d8df
jump UnknownScript_0x19d95a
scall Route44AskNumber1M
jump .AskForNumber
UnknownScript_0x19d957:
scall UnknownScript_0x19d8e3
UnknownScript_0x19d95a:
.AskedAlready:
scall Route44AskNumber2M
.AskForNumber:
askforphonenumber PHONE_FISHER_WILTON
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d8f3
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d8ef
if_equal PHONE_CONTACTS_FULL, Route44PhoneFullM
if_equal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
trainertotext FISHER, WILTON1, MEM_BUFFER_0
scall UnknownScript_0x19d8e7
jump UnknownScript_0x19d8eb
scall Route44RegisteredNumberM
jump Route44NumberAcceptedM
UnknownScript_0x19d96e:
scall UnknownScript_0x19d8f7
.WantsBattle:
scall Route44RematchM
winlosstext FisherWilton1BeatenText, 0
copybytetovar wWiltonFightCount
if_equal 2, .Fight2
@@ -225,33 +225,33 @@ UnknownScript_0x19d96e:
clearflag ENGINE_WILTON
end
UnknownScript_0x19d9b4:
scall UnknownScript_0x19d8fb
.HasItem:
scall Route44GiftM
checkevent EVENT_WILTON_HAS_ULTRA_BALL
iftrue UnknownScript_0x19d9c9
iftrue .UltraBall
checkevent EVENT_WILTON_HAS_GREAT_BALL
iftrue UnknownScript_0x19d9d2
iftrue .GreatBall
checkevent EVENT_WILTON_HAS_POKE_BALL
iftrue UnknownScript_0x19d9db
UnknownScript_0x19d9c9:
iftrue .PokeBall
.UltraBall:
verbosegiveitem ULTRA_BALL
iffalse UnknownScript_0x19d9e7
jump UnknownScript_0x19d9e1
iffalse .Route44PackFullM
jump .ItemReceived
UnknownScript_0x19d9d2:
.GreatBall:
verbosegiveitem GREAT_BALL
iffalse UnknownScript_0x19d9e7
jump UnknownScript_0x19d9e1
iffalse .Route44PackFullM
jump .ItemReceived
UnknownScript_0x19d9db:
.PokeBall:
verbosegiveitem POKE_BALL
iffalse UnknownScript_0x19d9e7
UnknownScript_0x19d9e1:
iffalse .Route44PackFullM
.ItemReceived:
clearflag ENGINE_WILTON_HAS_ITEM
jump UnknownScript_0x19d8eb
jump Route44NumberAcceptedM
UnknownScript_0x19d9e7:
jump UnknownScript_0x19d8ff
.Route44PackFullM:
jump Route44PackFullM
TrainerFisherEdgar:
trainer FISHER, EDGAR, EVENT_BEAT_FISHER_EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script
@@ -331,7 +331,7 @@ FisherWilton1BeatenText:
line "it."
done
UnknownText_0x19daa8:
FisherWiltonHugePoliwagText:
text "That POLIWAG that"
line "got away…"
cont "It was huge."
@@ -376,7 +376,7 @@ BirdKeeperVance1BeatenText:
line "stuff."
done
UnknownText_0x19dbf3:
BirdKeeperVanceLegendaryBirdsText:
text "ARTICUNO, ZAPDOS"
line "and MOLTRES are"
@@ -388,7 +388,7 @@ UnknownText_0x19dbf3:
cont "birds, though."
done
UnknownText_0x19dc67:
BirdKeeperVance2BeatenText:
text "Why can't I ever"
line "beat you?"