Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More syncing with pokegold

Browse Source
This commit is contained in:
Rangi
2020-11-03 10:13:06 -05:00
parent 01d6e6c758
commit 826e070f04
14 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
maps/DanceTheatre.asm
View File

@@ -14,13 +14,13 @@ DanceTheatre_MapScripts:
def_callbacks
TrainerKimonoGirlNaoko2:
trainer KIMONO_GIRL, NAOKO2, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script
TrainerKimonoGirlNaoko:
trainer KIMONO_GIRL, NAOKO, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaokoSeenText, KimonoGirlNaokoBeatenText, 0, .Script
.Script:
endifjustbattled
opentext
writetext KimonoGirlNaoko2AfterBattleText
writetext KimonoGirlNaokoAfterBattleText
waitbutton
closetext
end
@@ -135,18 +135,18 @@ DanceTheatreGrannyScript:
DanceTheatreFancyPanel:
jumptext DanceTheatreFancyPanelText
KimonoGirlNaoko2SeenText:
KimonoGirlNaokoSeenText:
text "You have lovely"
line "#MON. May I see"
cont "them in battle?"
done
KimonoGirlNaoko2BeatenText:
KimonoGirlNaokoBeatenText:
text "Oh, you are very"
line "strong."
done
KimonoGirlNaoko2AfterBattleText:
KimonoGirlNaokoAfterBattleText:
text "I enjoyed that"
line "bout. I would like"
cont "to see you again."
@@ -349,7 +349,7 @@ DanceTheatre_MapEvents:
bg_event 6, 6, BGEVENT_UP, DanceTheatreFancyPanel
def_object_events
object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1
object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko, -1
object_event 2, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1
object_event 6, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1
object_event 9, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlKuni, -1

2
maps/Route29.asm
View File

@@ -322,7 +322,7 @@ Route29FisherText:
line "progress."
done
Text_WaitingForDay: ; unreferenced
Route29CooltrainerMText_WaitingForDay: ; unreferenced
text "I'm waiting for"
line "#MON that"

6
maps/Route35GoldenrodGate.asm
View File

@@ -20,7 +20,7 @@ RandyScript:
writetext Route35GoldenrodGateRandyAskTakeThisMonToMyFriendText
yesorno
iffalse .refused
writetext Route35GoldenrodGateRandyThanksKidText
writetext Route35GoldenrodGateRandyThanksText
promptbutton
waitsfx
readvar VAR_PARTYCOUNT
@@ -73,7 +73,7 @@ GiftSpearowName:
GiftSpearowOTName:
db "RANDY@"
db 0 ; filler
db 0 ; unused
Route35GoldenrodGatePokefanFScript:
faceplayer
@@ -106,7 +106,7 @@ Route35GoldenrodGateRandyAskTakeThisMonToMyFriendText:
para "He's on ROUTE 31."
done
Route35GoldenrodGateRandyThanksKidText:
Route35GoldenrodGateRandyThanksText:
text "You will? Perfect!"
line "Thanks, kid!"