Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union
This commit is contained in:
GriffinR
@@ -1,47 +1,47 @@
|
||||
.set LOCALID_DOOR_GUARD_GRUNT, 6
|
||||
|
||||
SaffronCity_MapScripts:: @ 816735F
|
||||
SaffronCity_MapScripts::
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_OnTransition
|
||||
.byte 0
|
||||
|
||||
SaffronCity_OnTransition:: @ 8167365
|
||||
SaffronCity_OnTransition::
|
||||
setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY
|
||||
call_if_unset FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_MoveDoorGuardGrunt
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_MoveDoorGuardGrunt:: @ 8167372
|
||||
SaffronCity_EventScript_MoveDoorGuardGrunt::
|
||||
setobjectxyperm LOCALID_DOOR_GUARD_GRUNT, 33, 31
|
||||
return
|
||||
|
||||
SaffronCity_EventScript_RocketGrunt1:: @ 816737A
|
||||
SaffronCity_EventScript_RocketGrunt1::
|
||||
msgbox SaffronCity_Text_WhatDoYouWantGetLost, MSGBOX_NPC
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_RocketGrunt2:: @ 8167383
|
||||
SaffronCity_EventScript_RocketGrunt2::
|
||||
msgbox SaffronCity_Text_BossTakeTownForTeamRocket, MSGBOX_NPC
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_RocketGrunt3:: @ 816738C
|
||||
SaffronCity_EventScript_RocketGrunt3::
|
||||
msgbox SaffronCity_Text_DontGetDefiantOrIllHurtYou, MSGBOX_NPC
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_RocketGrunt4:: @ 8167395
|
||||
SaffronCity_EventScript_RocketGrunt4::
|
||||
msgbox SaffronCity_Text_SaffronBelongsToTeamRocket, MSGBOX_NPC
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_RocketGrunt5:: @ 816739E
|
||||
SaffronCity_EventScript_RocketGrunt5::
|
||||
msgbox SaffronCity_Text_CriminalLifeMakesMeFeelAlive, MSGBOX_NPC
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_RocketGrunt6:: @ 81673A7
|
||||
SaffronCity_EventScript_RocketGrunt6::
|
||||
msgbox SaffronCity_Text_WatchWhereYoureWalking, MSGBOX_NPC
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_RocketGrunt7:: @ 81673B0
|
||||
SaffronCity_EventScript_RocketGrunt7::
|
||||
msgbox SaffronCity_Text_WeCanExploitMonsAroundWorld, MSGBOX_NPC
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_DoorGuardGrunt:: @ 81673B9
|
||||
SaffronCity_EventScript_DoorGuardGrunt::
|
||||
lock
|
||||
goto_if_set FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_DoorGuardAsleep
|
||||
applymovement LOCALID_DOOR_GUARD_GRUNT, Movement_FacePlayer
|
||||
@@ -50,77 +50,77 @@ SaffronCity_EventScript_DoorGuardGrunt:: @ 81673B9
|
||||
release
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_DoorGuardAsleep:: @ 81673D7
|
||||
SaffronCity_EventScript_DoorGuardAsleep::
|
||||
textcolor 3
|
||||
msgbox SaffronCity_Text_HesTakingASnooze
|
||||
release
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_WorkerM:: @ 81673E3
|
||||
SaffronCity_EventScript_WorkerM::
|
||||
msgbox SaffronCity_Text_YouBeatTeamRocket, MSGBOX_NPC
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_Youngster:: @ 81673EC
|
||||
SaffronCity_EventScript_Youngster::
|
||||
msgbox SaffronCity_Text_SafeToGoOutAgain, MSGBOX_NPC
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_Lass:: @ 81673F5
|
||||
SaffronCity_EventScript_Lass::
|
||||
msgbox SaffronCity_Text_PeopleComingBackToSaffron, MSGBOX_NPC
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_Boy:: @ 81673FE
|
||||
SaffronCity_EventScript_Boy::
|
||||
msgbox SaffronCity_Text_FlewHereOnPidgeot, MSGBOX_NPC
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_Pidgeot:: @ 8167407
|
||||
SaffronCity_EventScript_Pidgeot::
|
||||
lock
|
||||
faceplayer
|
||||
waitse
|
||||
playmoncry SPECIES_PIDGEOT, 0
|
||||
playmoncry SPECIES_PIDGEOT, CRY_MODE_NORMAL
|
||||
msgbox SaffronCity_Text_Pidgeot
|
||||
waitmoncry
|
||||
release
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_Man:: @ 816741A
|
||||
SaffronCity_EventScript_Man::
|
||||
msgbox SaffronCity_Text_SawRocketBossEscaping, MSGBOX_NPC
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_CitySign:: @ 8167423
|
||||
SaffronCity_EventScript_CitySign::
|
||||
msgbox SaffronCity_Text_CitySign, MSGBOX_SIGN
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_DojoSign:: @ 816742C
|
||||
SaffronCity_EventScript_DojoSign::
|
||||
msgbox SaffronCity_Text_FightingDojo, MSGBOX_SIGN
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_GymSign:: @ 8167435
|
||||
SaffronCity_EventScript_GymSign::
|
||||
lockall
|
||||
famechecker FAMECHECKER_SABRINA, 0
|
||||
msgbox SaffronCity_Text_GymSign
|
||||
releaseall
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_TrainerTips1:: @ 816744D
|
||||
SaffronCity_EventScript_TrainerTips1::
|
||||
msgbox SaffronCity_Text_FullHealCuresStatus, MSGBOX_SIGN
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_TrainerTips2:: @ 8167456
|
||||
SaffronCity_EventScript_TrainerTips2::
|
||||
msgbox SaffronCity_Text_GreatBallImprovedCatchRate, MSGBOX_SIGN
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_SilphCoSign:: @ 816745F
|
||||
SaffronCity_EventScript_SilphCoSign::
|
||||
msgbox SaffronCity_Text_SilphCoSign, MSGBOX_SIGN
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_MrPsychicsHouseSign:: @ 8167468
|
||||
SaffronCity_EventScript_MrPsychicsHouseSign::
|
||||
msgbox SaffronCity_Text_MrPsychicsHouse, MSGBOX_SIGN
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_SilphProductSign:: @ 8167471
|
||||
SaffronCity_EventScript_SilphProductSign::
|
||||
msgbox SaffronCity_Text_SilphsLatestProduct, MSGBOX_SIGN
|
||||
end
|
||||
|
||||
SaffronCity_EventScript_TrainerFanClubSign:: @ 816747A
|
||||
SaffronCity_EventScript_TrainerFanClubSign::
|
||||
msgbox SaffronCity_Text_TrainerFanClubSign, MSGBOX_SIGN
|
||||
end
|
||||
|
||||
@@ -1,80 +1,80 @@
|
||||
SaffronCity_Text_WhatDoYouWantGetLost:: @ 8181003
|
||||
SaffronCity_Text_WhatDoYouWantGetLost::
|
||||
.string "What do you want?\n"
|
||||
.string "Get lost!$"
|
||||
|
||||
SaffronCity_Text_BossTakeTownForTeamRocket:: @ 818101F
|
||||
SaffronCity_Text_BossTakeTownForTeamRocket::
|
||||
.string "BOSS said he'll take this town\n"
|
||||
.string "in the name of TEAM ROCKET!$"
|
||||
|
||||
SaffronCity_Text_DontGetDefiantOrIllHurtYou:: @ 818105A
|
||||
SaffronCity_Text_DontGetDefiantOrIllHurtYou::
|
||||
.string "Don't get defiant!\n"
|
||||
.string "Or I'll have to hurt you!$"
|
||||
|
||||
SaffronCity_Text_SaffronBelongsToTeamRocket:: @ 8181087
|
||||
SaffronCity_Text_SaffronBelongsToTeamRocket::
|
||||
.string "SAFFRON belongs to TEAM ROCKET!$"
|
||||
|
||||
SaffronCity_Text_CriminalLifeMakesMeFeelAlive:: @ 81810A7
|
||||
SaffronCity_Text_CriminalLifeMakesMeFeelAlive::
|
||||
.string "My life as a criminal makes me feel\n"
|
||||
.string "so alive!$"
|
||||
|
||||
SaffronCity_Text_WatchWhereYoureWalking:: @ 81810D5
|
||||
SaffronCity_Text_WatchWhereYoureWalking::
|
||||
.string "Ow!\n"
|
||||
.string "Watch where you're walking!$"
|
||||
|
||||
SaffronCity_Text_WeCanExploitMonsAroundWorld:: @ 81810F5
|
||||
SaffronCity_Text_WeCanExploitMonsAroundWorld::
|
||||
.string "With SILPH under control, we can\n"
|
||||
.string "exploit POKéMON around the world!\p"
|
||||
.string "We'll get stinking rich, yeahah!$"
|
||||
|
||||
SaffronCity_Text_YouBeatTeamRocket:: @ 8181159
|
||||
SaffronCity_Text_YouBeatTeamRocket::
|
||||
.string "You beat TEAM ROCKET all alone?\n"
|
||||
.string "That's amazing!$"
|
||||
|
||||
SaffronCity_Text_SafeToGoOutAgain:: @ 8181189
|
||||
SaffronCity_Text_SafeToGoOutAgain::
|
||||
.string "Yeah! TEAM ROCKET is gone!\n"
|
||||
.string "It's safe to go out again!$"
|
||||
|
||||
SaffronCity_Text_PeopleComingBackToSaffron:: @ 81811BF
|
||||
SaffronCity_Text_PeopleComingBackToSaffron::
|
||||
.string "People fled from here in droves\n"
|
||||
.string "when those ROCKETS came.\p"
|
||||
.string "They should be flocking back to\n"
|
||||
.string "SAFFRON now.$"
|
||||
|
||||
SaffronCity_Text_FlewHereOnPidgeot:: @ 8181225
|
||||
SaffronCity_Text_FlewHereOnPidgeot::
|
||||
.string "I flew here on my PIDGEOT when\n"
|
||||
.string "I read about SILPH.\p"
|
||||
.string "It's already over?\n"
|
||||
.string "I missed the media action…$"
|
||||
|
||||
SaffronCity_Text_Pidgeot:: @ 8181286
|
||||
SaffronCity_Text_Pidgeot::
|
||||
.string "PIDGEOT: Bi bibii!$"
|
||||
|
||||
SaffronCity_Text_SawRocketBossEscaping:: @ 8181299
|
||||
SaffronCity_Text_SawRocketBossEscaping::
|
||||
.string "I saw the ROCKET BOSS escaping\n"
|
||||
.string "SILPH's building.$"
|
||||
|
||||
SaffronCity_Text_ImASecurityGuard:: @ 81812CA
|
||||
SaffronCity_Text_ImASecurityGuard::
|
||||
.string "I'm a security guard.\p"
|
||||
.string "Suspicious kids I don't allow in!$"
|
||||
|
||||
SaffronCity_Text_HesTakingASnooze:: @ 8181302
|
||||
SaffronCity_Text_HesTakingASnooze::
|
||||
.string "…\n"
|
||||
.string "Snore…\p"
|
||||
.string "Hah! He's taking a snooze!$"
|
||||
|
||||
SaffronCity_Text_CitySign:: @ 8181326
|
||||
SaffronCity_Text_CitySign::
|
||||
.string "SAFFRON CITY\n"
|
||||
.string "Shining, Golden Land of Commerce$"
|
||||
|
||||
SaffronCity_Text_FightingDojo:: @ 8181354
|
||||
SaffronCity_Text_FightingDojo::
|
||||
.string "FIGHTING DOJO$"
|
||||
|
||||
SaffronCity_Text_GymSign:: @ 8181362
|
||||
SaffronCity_Text_GymSign::
|
||||
.string "SAFFRON CITY POKéMON GYM\n"
|
||||
.string "LEADER: SABRINA\l"
|
||||
.string "The Master of PSYCHIC POKéMON!$"
|
||||
|
||||
SaffronCity_Text_FullHealCuresStatus:: @ 81813AA
|
||||
SaffronCity_Text_FullHealCuresStatus::
|
||||
.string "TRAINER TIPS\p"
|
||||
.string "FULL HEAL cures all ailments like\n"
|
||||
.string "burns, paralysis, poisoning,\l"
|
||||
@@ -82,29 +82,29 @@ SaffronCity_Text_FullHealCuresStatus:: @ 81813AA
|
||||
.string "It costs a bit more, but it's more\n"
|
||||
.string "convenient than buying other items.$"
|
||||
|
||||
SaffronCity_Text_GreatBallImprovedCatchRate:: @ 8181452
|
||||
SaffronCity_Text_GreatBallImprovedCatchRate::
|
||||
.string "TRAINER TIPS\p"
|
||||
.string "The new GREAT BALL offers improved\n"
|
||||
.string "catching rates.\p"
|
||||
.string "Try it on those hard-to-catch\n"
|
||||
.string "POKéMON.$"
|
||||
|
||||
SaffronCity_Text_SilphCoSign:: @ 81814B9
|
||||
SaffronCity_Text_SilphCoSign::
|
||||
.string "SILPH CO. OFFICE BUILDING$"
|
||||
|
||||
SaffronCity_Text_MrPsychicsHouse:: @ 81814D3
|
||||
SaffronCity_Text_MrPsychicsHouse::
|
||||
.string "MR. PSYCHIC'S HOUSE$"
|
||||
|
||||
SaffronCity_Text_SilphsLatestProduct:: @ 81814E7
|
||||
SaffronCity_Text_SilphsLatestProduct::
|
||||
.string "SILPH's latest product!\n"
|
||||
.string "Release to be determined…$"
|
||||
|
||||
SaffronCity_Text_TrainerFanClubSign:: @ 8181519
|
||||
SaffronCity_Text_TrainerFanClubSign::
|
||||
.string "POKéMON TRAINER FAN CLUB\p"
|
||||
.string "Many TRAINERS have scribbled their\n"
|
||||
.string "names on this sign.$"
|
||||
|
||||
SaffronCity_Text_HowCanClubNotRecognizeLance:: @ 8181569
|
||||
SaffronCity_Text_HowCanClubNotRecognizeLance::
|
||||
.string "This FAN CLUB…\n"
|
||||
.string "No one here has a clue!\p"
|
||||
.string "How could they not recognize\n"
|
||||
|
||||
Reference in New Issue
Block a user