pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Disambiguating the wrapper functions.

Browse Source
This commit is contained in:
surskitty 2018-01-15 21:59:48 -05:00
parent d53881a0d4
commit 2548f75feb
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
maps/Route44.asm
View File

@ -28,27 +28,27 @@ TrainerBirdKeeperVance1:
checkflag ENGINE_VANCE checkflag ENGINE_VANCE
iftrue VanceWantsBattle iftrue VanceWantsBattle
checkcellnum PHONE_BIRDKEEPER_VANCE checkcellnum PHONE_BIRDKEEPER_VANCE
iftrue NumberAcceptedM iftrue Rt44NumberAcceptedM
checkevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER checkevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER
iftrue .AskedAlready iftrue .AskedAlready
writetext BirdKeeperVanceLegendaryBirdsText writetext BirdKeeperVanceLegendaryBirdsText
buttonsound buttonsound
setevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER setevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER
scall AskNumber1M scall Rt44AskNumber1M
jump .AskForNumber jump .AskForNumber
.AskedAlready: .AskedAlready:
scall AskNumber2M scall Rt44AskNumber2M
.AskForNumber: .AskForNumber:
askforphonenumber PHONE_BIRDKEEPER_VANCE askforphonenumber PHONE_BIRDKEEPER_VANCE
if_equal $1, PhoneFullM if_equal $1, Rt44PhoneFullM
if_equal $2, NumberDeclinedM if_equal $2, Rt44NumberDeclinedM
trainertotext BIRD_KEEPER, VANCE1, $0 trainertotext BIRD_KEEPER, VANCE1, $0
scall RegisteredNumberM scall Rt44RegisteredNumberM
jump NumberAcceptedM jump Rt44NumberAcceptedM
VanceWantsBattle: VanceWantsBattle:
scall RematchM scall Rt44RematchM
winlosstext BirdKeeperVance1BeatenText, 0 winlosstext BirdKeeperVance1BeatenText, 0
copybytetovar wVanceFightCount copybytetovar wVanceFightCount
if_equal 2, .Fight2 if_equal 2, .Fight2
@ -85,11 +85,11 @@ VanceWantsBattle:
iftrue .Carbos iftrue .Carbos
checkevent EVENT_GOT_CARBOS_FROM_VANCE checkevent EVENT_GOT_CARBOS_FROM_VANCE
iftrue .ReceivedCarbosBefore iftrue .ReceivedCarbosBefore
scall RematchGiftM scall Rt44RematchGiftM
verbosegiveitem CARBOS verbosegiveitem CARBOS
iffalse VancePackFull iffalse VancePackFull
setevent EVENT_GOT_CARBOS_FROM_VANCE setevent EVENT_GOT_CARBOS_FROM_VANCE
jump NumberAcceptedM jump Rt44NumberAcceptedM
.ReceivedCarbosBefore: .ReceivedCarbosBefore:
end end
@ -102,41 +102,41 @@ VanceWantsBattle:
iffalse VancePackFull iffalse VancePackFull
clearevent EVENT_VANCE_CARBOS clearevent EVENT_VANCE_CARBOS
setevent EVENT_GOT_CARBOS_FROM_VANCE setevent EVENT_GOT_CARBOS_FROM_VANCE
jump NumberAcceptedM jump Rt44NumberAcceptedM
AskNumber1M: Rt44AskNumber1M:
jumpstd asknumber1m jumpstd asknumber1m
end end
AskNumber2M: Rt44AskNumber2M:
jumpstd asknumber2m jumpstd asknumber2m
end end
RegisteredNumberM: Rt44RegisteredNumberM:
jumpstd registerednumberm jumpstd registerednumberm
end end
NumberAcceptedM: Rt44NumberAcceptedM:
jumpstd numberacceptedm jumpstd numberacceptedm
end end
NumberDeclinedM: Rt44NumberDeclinedM:
jumpstd numberdeclinedm jumpstd numberdeclinedm
end end
PhoneFullM: Rt44PhoneFullM:
jumpstd phonefullm jumpstd phonefullm
end end
RematchM: Rt44RematchM:
jumpstd rematchm jumpstd rematchm
end end
GiftM: Rt44GiftM:
jumpstd giftm jumpstd giftm
end end
PackFullM: Rt44PackFullM:
jumpstd packfullm jumpstd packfullm
end end
@ -145,7 +145,7 @@ VancePackFull:
jumpstd packfullm jumpstd packfullm
end end
RematchGiftM: Rt44RematchGiftM:
jumpstd rematchgiftm jumpstd rematchgiftm
end end
@ -172,27 +172,27 @@ TrainerFisherWilton1:
checkflag ENGINE_WILTON_HAS_ITEM checkflag ENGINE_WILTON_HAS_ITEM
iftrue WiltonHasItem iftrue WiltonHasItem
checkcellnum PHONE_FISHER_WILTON checkcellnum PHONE_FISHER_WILTON
iftrue NumberAcceptedM iftrue Rt44NumberAcceptedM
checkevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER checkevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER
iftrue .AskedAlready iftrue .AskedAlready
writetext FisherWiltonHugePoliwagText writetext FisherWiltonHugePoliwagText
buttonsound buttonsound
setevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER setevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER
scall AskNumber1M scall Rt44AskNumber1M
jump .AskForNumber jump .AskForNumber
.AskedAlready: .AskedAlready:
scall AskNumber2M scall Rt44AskNumber2M
.AskForNumber: .AskForNumber:
askforphonenumber PHONE_FISHER_WILTON askforphonenumber PHONE_FISHER_WILTON
if_equal $1, PhoneFullM if_equal $1, Rt44PhoneFullM
if_equal $2, NumberDeclinedM if_equal $2, Rt44NumberDeclinedM
trainertotext FISHER, WILTON1, $0 trainertotext FISHER, WILTON1, $0
scall RegisteredNumberM scall Rt44RegisteredNumberM
jump NumberAcceptedM jump Rt44NumberAcceptedM
WiltonWantsBattle: WiltonWantsBattle:
scall RematchM scall Rt44RematchM
winlosstext FisherWilton1BeatenText, 0 winlosstext FisherWilton1BeatenText, 0
copybytetovar wWiltonFightCount copybytetovar wWiltonFightCount
if_equal 2, .Fight2 if_equal 2, .Fight2
@ -228,7 +228,7 @@ WiltonWantsBattle:
end end
WiltonHasItem: WiltonHasItem:
scall GiftM scall Rt44GiftM
checkevent EVENT_WILTON_HAS_ULTRA_BALL checkevent EVENT_WILTON_HAS_ULTRA_BALL
iftrue .UltraBall iftrue .UltraBall
checkevent EVENT_WILTON_HAS_GREAT_BALL checkevent EVENT_WILTON_HAS_GREAT_BALL
@ -237,23 +237,23 @@ WiltonHasItem:
iftrue .PokeBall iftrue .PokeBall
.UltraBall: .UltraBall:
verbosegiveitem ULTRA_BALL verbosegiveitem ULTRA_BALL
iffalse .PackFullM iffalse .Rt44PackFullM
jump .ItemReceived jump .ItemReceived
.GreatBall: .GreatBall:
verbosegiveitem GREAT_BALL verbosegiveitem GREAT_BALL
iffalse .PackFullM iffalse .Rt44PackFullM
jump .ItemReceived jump .ItemReceived
.PokeBall: .PokeBall:
verbosegiveitem POKE_BALL verbosegiveitem POKE_BALL
iffalse .PackFullM iffalse .Rt44PackFullM
.ItemReceived: .ItemReceived:
clearflag ENGINE_WILTON_HAS_ITEM clearflag ENGINE_WILTON_HAS_ITEM
jump NumberAcceptedM jump Rt44NumberAcceptedM
.PackFullM: .Rt44PackFullM:
jump PackFullM jump Rt44PackFullM
TrainerFisherEdgar: TrainerFisherEdgar:
trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script