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

142
maps/Route43.asm
View File

@@ -46,38 +46,38 @@ TrainerPokemaniacBen:
closetext
end
TrainerPokemaniacBrent1:
trainer POKEMANIAC, BRENT1, EVENT_BEAT_POKEMANIAC_BRENT, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, 0, .Script
TrainerPokemaniacBrent:
trainer POKEMANIAC, BRENT1, EVENT_BEAT_POKEMANIAC_BRENT, PokemaniacBrentSeenText, PokemaniacBrentBeatenText, 0, .Script
.Script:
writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT
end_if_just_battled
opentext
checkflag ENGINE_BRENT
iftrue UnknownScript_0x19d0cf
iftrue .WantsBattle
checkcellnum PHONE_POKEMANIAC_BRENT
iftrue UnknownScript_0x19d138
iftrue .NumberAccepted
checkevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x19d0b8
writetext UnknownText_0x19d359
iftrue .AskedAlready
writetext PokemaniacBrentAfterBattleText
buttonsound
setevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x19d12c
jump UnknownScript_0x19d0bb
scall .AskNumber1
jump .AskForNumber
UnknownScript_0x19d0b8:
scall UnknownScript_0x19d130
UnknownScript_0x19d0bb:
.AskedAlready:
scall .AskNumber2
.AskForNumber:
askforphonenumber PHONE_POKEMANIAC_BRENT
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d140
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d13c
if_equal PHONE_CONTACTS_FULL, .PhoneFull
if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0
scall UnknownScript_0x19d134
jump UnknownScript_0x19d138
scall .RegisteredNumber
jump .NumberAccepted
UnknownScript_0x19d0cf:
scall UnknownScript_0x19d144
winlosstext PokemaniacBrent1BeatenText, 0
.WantsBattle:
scall .Rematch
winlosstext PokemaniacBrentBeatenText, 0
copybytetovar wBrentFightCount
if_equal 3, .Fight3
if_equal 2, .Fight2
@@ -123,31 +123,31 @@ UnknownScript_0x19d0cf:
clearflag ENGINE_BRENT
end
UnknownScript_0x19d12c:
.AskNumber1:
jumpstd asknumber1m
end
UnknownScript_0x19d130:
.AskNumber2:
jumpstd asknumber2m
end
UnknownScript_0x19d134:
.RegisteredNumber:
jumpstd registerednumberm
end
UnknownScript_0x19d138:
.NumberAccepted:
jumpstd numberacceptedm
end
UnknownScript_0x19d13c:
.NumberDeclined:
jumpstd numberdeclinedm
end
UnknownScript_0x19d140:
.PhoneFull:
jumpstd phonefullm
end
UnknownScript_0x19d144:
.Rematch:
jumpstd rematchm
end
@@ -173,42 +173,42 @@ TrainerFisherMarvin:
closetext
end
TrainerPicnickerTiffany3:
trainer PICNICKER, TIFFANY3, EVENT_BEAT_PICNICKER_TIFFANY, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, 0, .Script
TrainerPicnickerTiffany:
trainer PICNICKER, TIFFANY3, EVENT_BEAT_PICNICKER_TIFFANY, PicnickerTiffanySeenText, PicnickerTiffanyBeatenText, 0, .Script
.Script:
writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY
end_if_just_battled
opentext
checkflag ENGINE_TIFFANY
iftrue UnknownScript_0x19d1c1
iftrue .WantsBattle
checkflag ENGINE_TIFFANY_HAS_PINK_BOW
iftrue UnknownScript_0x19d21e
iftrue .HasPinkBow
checkcellnum PHONE_PICNICKER_TIFFANY
iftrue UnknownScript_0x19d245
iftrue .NumberAccepted
checkpoke CLEFAIRY
iffalse UnknownScript_0x19d233
iffalse .NoClefairy
checkevent EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x19d1aa
writetext UnknownText_0x19d618
iftrue .AskedAlready
writetext PicnickerTiffanyWantsPicnicText
buttonsound
setevent EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER
scall UnknownScript_0x19d239
jump UnknownScript_0x19d1ad
scall .AskNumber1
jump .AskForNumber
UnknownScript_0x19d1aa:
scall UnknownScript_0x19d23d
UnknownScript_0x19d1ad:
.AskedAlready:
scall .AskNumber2
.AskForNumber:
askforphonenumber PHONE_PICNICKER_TIFFANY
if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d24d
if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d249
if_equal PHONE_CONTACTS_FULL, .PhoneFull
if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext PICNICKER, TIFFANY3, MEM_BUFFER_0
scall UnknownScript_0x19d241
jump UnknownScript_0x19d245
scall .RegisteredNumber
jump .NumberAccepted
UnknownScript_0x19d1c1:
scall UnknownScript_0x19d251
winlosstext PicnickerTiffany3BeatenText, 0
.WantsBattle:
scall .Rematch
winlosstext PicnickerTiffanyBeatenText, 0
copybytetovar wTiffanyFightCount
if_equal 3, .Fight3
if_equal 2, .Fight2
@@ -254,56 +254,56 @@ UnknownScript_0x19d1c1:
clearflag ENGINE_TIFFANY
end
UnknownScript_0x19d21e:
scall UnknownScript_0x19d255
.HasPinkBow:
scall .Gift
verbosegiveitem PINK_BOW
iffalse UnknownScript_0x19d230
iffalse .NoRoom
clearflag ENGINE_TIFFANY_HAS_PINK_BOW
setevent EVENT_TIFFANY_GAVE_PINK_BOW
jump UnknownScript_0x19d245
jump .NumberAccepted
UnknownScript_0x19d230:
jump UnknownScript_0x19d259
.NoRoom:
jump .PackFull
UnknownScript_0x19d233:
writetext UnknownText_0x19d64b
.NoClefairy:
writetext PicnickerTiffanyClefairyText
waitbutton
closetext
end
UnknownScript_0x19d239:
.AskNumber1:
jumpstd asknumber1f
end
UnknownScript_0x19d23d:
.AskNumber2:
jumpstd asknumber2f
end
UnknownScript_0x19d241:
.RegisteredNumber:
jumpstd registerednumberf
end
UnknownScript_0x19d245:
.NumberAccepted:
jumpstd numberacceptedf
end
UnknownScript_0x19d249:
.NumberDeclined:
jumpstd numberdeclinedf
end
UnknownScript_0x19d24d:
.PhoneFull:
jumpstd phonefullf
end
UnknownScript_0x19d251:
.Rematch:
jumpstd rematchf
end
UnknownScript_0x19d255:
.Gift:
jumpstd giftf
end
UnknownScript_0x19d259:
.PackFull:
jumpstd packfullf
end
@@ -346,17 +346,17 @@ PokemaniacBenAfterBattleText:
line "I bet she's cute!"
done
PokemaniacBrent1SeenText:
PokemaniacBrentSeenText:
text "Hey! Do you have"
line "any rare #MON?"
done
PokemaniacBrent1BeatenText:
PokemaniacBrentBeatenText:
text "Oh, my poor #-"
line "MON! Darlings!"
done
UnknownText_0x19d359:
PokemaniacBrentAfterBattleText:
text "I'd be happy just"
line "to own a single"
cont "rare #MON."
@@ -437,7 +437,7 @@ CamperSpencerAfterBattleText:
line "to camp there."
done
PicnickerTiffany3SeenText:
PicnickerTiffanySeenText:
text "Are you going to"
line "LAKE OF RAGE too?"
@@ -445,18 +445,18 @@ PicnickerTiffany3SeenText:
line "little while!"
done
PicnickerTiffany3BeatenText:
PicnickerTiffanyBeatenText:
text "I played too much!"
done
UnknownText_0x19d618:
PicnickerTiffanyWantsPicnicText:
text "I'm having a pic-"
line "nic with #MON."
para "Won't you join us?"
done
UnknownText_0x19d64b:
PicnickerTiffanyClefairyText:
text "Isn't my CLEFAIRY"
line "just the most"
cont "adorable thing?"
@@ -517,10 +517,10 @@ Route43_MapEvents:
db 8 ; object events
object_event 13, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1
object_event 13, 20, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacBrent1, -1
object_event 13, 20, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacBrent, -1
object_event 14, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1
object_event 4, 16, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerFisherMarvin, -1
object_event 9, 25, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany3, -1
object_event 9, 25, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany, -1
object_event 13, 40, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperSpencer, -1
object_event 1, 26, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1
object_event 12, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER