Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions 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

46
maps/Route25.asm
View File

@@ -24,7 +24,7 @@ Route25_MapScripts:
.DummyScene1:
end
UnknownScript_0x19eea0:
Route25MistyDate1Script:
showemote EMOTE_HEART, ROUTE25_MISTY, 15
pause 30
showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10
@@ -37,7 +37,7 @@ UnknownScript_0x19eea0:
pause 10
applymovement ROUTE25_MISTY, MovementData_0x19efed
opentext
writetext UnknownText_0x19f006
writetext Route25MistyDateText
waitbutton
closetext
spriteface PLAYER, DOWN
@@ -50,7 +50,7 @@ UnknownScript_0x19eea0:
special RestartMapMusic
end
UnknownScript_0x19eee0:
Route25MistyDate2Script:
showemote EMOTE_HEART, ROUTE25_MISTY, 15
pause 30
showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10
@@ -63,7 +63,7 @@ UnknownScript_0x19eee0:
pause 10
applymovement ROUTE25_MISTY, MovementData_0x19eff4
opentext
writetext UnknownText_0x19f006
writetext Route25MistyDateText
waitbutton
closetext
spriteface PLAYER, UP
@@ -153,32 +153,32 @@ TrainerSupernerdPat:
closetext
end
CooltrainerMScript_0x19efac:
TrainerCooltrainermKevin:
faceplayer
opentext
checkevent EVENT_BEAT_COOLTRAINERM_KEVIN
iftrue UnknownScript_0x19efda
iftrue .AfterBattle
checkevent EVENT_CLEARED_NUGGET_BRIDGE
iftrue UnknownScript_0x19efc7
writetext UnknownText_0x19f43b
iftrue .AfterNuggetBridge
writetext CooltrainermKevinNuggetText
buttonsound
verbosegiveitem NUGGET
iffalse UnknownScript_0x19efde
iffalse .NoRoomForNugget
setevent EVENT_CLEARED_NUGGET_BRIDGE
UnknownScript_0x19efc7:
writetext UnknownText_0x19f49d
.AfterNuggetBridge:
writetext CooltrainermKevinSeenText
waitbutton
closetext
winlosstext UnknownText_0x19f4fd, 0
winlosstext CooltrainermKevinBeatenText, 0
loadtrainer COOLTRAINERM, KEVIN
startbattle
reloadmapafterbattle
setevent EVENT_BEAT_COOLTRAINERM_KEVIN
opentext
UnknownScript_0x19efda:
writetext UnknownText_0x19f520
.AfterBattle:
writetext CooltrainermKevinAfterBattleText
waitbutton
UnknownScript_0x19efde:
.NoRoomForNugget:
closetext
end
@@ -235,7 +235,7 @@ MovementData_0x19f000:
step LEFT
step_end
UnknownText_0x19f006:
Route25MistyDateText:
text "MISTY: Aww! Why"
line "did you have to"
@@ -382,7 +382,7 @@ SupernerdPatAfterBattleText:
line "cheat anymore…"
done
UnknownText_0x19f43b:
CooltrainermKevinNuggetText:
text "You took on one"
line "more battle than"
@@ -393,7 +393,7 @@ UnknownText_0x19f43b:
line "win a prize."
done
UnknownText_0x19f49d:
CooltrainermKevinSeenText:
text "But after seeing"
line "how you battle, I"
@@ -404,12 +404,12 @@ UnknownText_0x19f49d:
line "me take you on."
done
UnknownText_0x19f4fd:
CooltrainermKevinBeatenText:
text "I've never had a"
line "battle this good!"
done
UnknownText_0x19f520:
CooltrainermKevinAfterBattleText:
text "That was a great"
line "battle!"
@@ -434,8 +434,8 @@ Route25_MapEvents:
warp_event 47, 5, 1, BILLS_HOUSE
db 2 ; coord events
coord_event 42, 6, 1, UnknownScript_0x19eea0
coord_event 42, 7, 1, UnknownScript_0x19eee0
coord_event 42, 6, 1, Route25MistyDate1Script
coord_event 42, 7, 1, Route25MistyDate2Script
db 2 ; bg events
bg_event 45, 5, BGEVENT_READ, BillsHouseSign
@@ -451,5 +451,5 @@ Route25_MapEvents:
object_event 25, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperLloyd, -1
object_event 28, 11, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassShannon, -1
object_event 31, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerSupernerdPat, -1
object_event 37, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19efac, -1
object_event 37, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerCooltrainermKevin, -1
object_event 32, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN