Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union
This commit is contained in:
GriffinR
@@ -1,35 +1,35 @@
|
||||
Route16_MapScripts:: @ 81680E5
|
||||
Route16_MapScripts::
|
||||
map_script MAP_SCRIPT_ON_RESUME, Route16_OnResume
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, Route16_OnTransition
|
||||
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route16_OnWarp
|
||||
.byte 0
|
||||
|
||||
Route16_OnResume:: @ 81680F5
|
||||
Route16_OnResume::
|
||||
call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, Route16_EventScript_RemoveSnorlax
|
||||
end
|
||||
|
||||
Route16_EventScript_RemoveSnorlax:: @ 81680FF
|
||||
Route16_EventScript_RemoveSnorlax::
|
||||
removeobject VAR_LAST_TALKED
|
||||
return
|
||||
|
||||
Route16_OnTransition:: @ 8168103
|
||||
Route16_OnTransition::
|
||||
compare VAR_MAP_SCENE_ROUTE16, 1
|
||||
call_if_eq Route16_OnTransitionCyclingRoad
|
||||
end
|
||||
|
||||
Route16_OnTransitionCyclingRoad:: @ 816810F
|
||||
Route16_OnTransitionCyclingRoad::
|
||||
setflag FLAG_SYS_ON_CYCLING_ROAD
|
||||
return
|
||||
|
||||
Route16_OnWarp:: @ 8168113
|
||||
Route16_OnWarp::
|
||||
map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route16_OnWarpCyclingRoad
|
||||
.2byte 0
|
||||
|
||||
Route16_OnWarpCyclingRoad:: @ 816811D
|
||||
Route16_OnWarpCyclingRoad::
|
||||
special ForcePlayerOntoBike
|
||||
end
|
||||
|
||||
Route16_EventScript_Snorlax:: @ 8168121
|
||||
Route16_EventScript_Snorlax::
|
||||
lock
|
||||
faceplayer
|
||||
goto_if_unset FLAG_GOT_POKE_FLUTE, Route16_EventScript_SnorlaxNoPokeFlute
|
||||
@@ -41,7 +41,7 @@ Route16_EventScript_Snorlax:: @ 8168121
|
||||
call EventScript_AwakenSnorlax
|
||||
setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
|
||||
waitse
|
||||
playmoncry SPECIES_SNORLAX, 2
|
||||
playmoncry SPECIES_SNORLAX, CRY_MODE_ENCOUNTER
|
||||
delay 40
|
||||
waitmoncry
|
||||
setflag FLAG_HIDE_ROUTE_16_SNORLAX
|
||||
@@ -58,24 +58,24 @@ Route16_EventScript_Snorlax:: @ 8168121
|
||||
release
|
||||
end
|
||||
|
||||
Route16_EventScript_DontUsePokeFlute:: @ 8168197
|
||||
Route16_EventScript_DontUsePokeFlute::
|
||||
release
|
||||
end
|
||||
|
||||
Route16_EventScript_FoughtSnorlax:: @ 8168199
|
||||
Route16_EventScript_FoughtSnorlax::
|
||||
msgbox Text_SnorlaxReturnedToMountains
|
||||
release
|
||||
end
|
||||
|
||||
Route16_EventScript_SnorlaxNoPokeFlute:: @ 81681A3
|
||||
Route16_EventScript_SnorlaxNoPokeFlute::
|
||||
msgbox Route16_Text_MonSprawledOutInSlumber
|
||||
release
|
||||
end
|
||||
|
||||
Route16_EventScript_CyclingRoadSign:: @ 81681AD
|
||||
Route16_EventScript_CyclingRoadSign::
|
||||
msgbox Route16_Text_CyclingRoadSign, MSGBOX_SIGN
|
||||
end
|
||||
|
||||
Route16_EventScript_RouteSign:: @ 81681B6
|
||||
Route16_EventScript_RouteSign::
|
||||
msgbox Route16_Text_RouteSign, MSGBOX_SIGN
|
||||
end
|
||||
|
||||
+29
-29
@@ -1,112 +1,112 @@
|
||||
Route16_Text_LaoIntro:: @ 8186C4D
|
||||
Route16_Text_LaoIntro::
|
||||
.string "What do you want?$"
|
||||
|
||||
Route16_Text_LaoDefeat:: @ 8186C5F
|
||||
Route16_Text_LaoDefeat::
|
||||
.string "Don't you dare laugh!$"
|
||||
|
||||
Route16_Text_LaoPostBattle:: @ 8186C75
|
||||
Route16_Text_LaoPostBattle::
|
||||
.string "We like just hanging here.\n"
|
||||
.string "What's it to you?$"
|
||||
|
||||
Route16_Text_KojiIntro:: @ 8186CA2
|
||||
Route16_Text_KojiIntro::
|
||||
.string "Nice BIKE!\n"
|
||||
.string "Hand it over!$"
|
||||
|
||||
Route16_Text_KojiDefeat:: @ 8186CBB
|
||||
Route16_Text_KojiDefeat::
|
||||
.string "Knockout!$"
|
||||
|
||||
Route16_Text_KojiPostBattle:: @ 8186CC5
|
||||
Route16_Text_KojiPostBattle::
|
||||
.string "Forget it, who needs your BIKE!$"
|
||||
|
||||
Route16_Text_LukeIntro:: @ 8186CE5
|
||||
Route16_Text_LukeIntro::
|
||||
.string "Come out and play, little mouse!$"
|
||||
|
||||
Route16_Text_LukeDefeat:: @ 8186D06
|
||||
Route16_Text_LukeDefeat::
|
||||
.string "You little rat!$"
|
||||
|
||||
Route16_Text_LukePostBattle:: @ 8186D16
|
||||
Route16_Text_LukePostBattle::
|
||||
.string "I hate losing!\n"
|
||||
.string "Get out of my face!$"
|
||||
|
||||
Route16_Text_HideoIntro:: @ 8186D39
|
||||
Route16_Text_HideoIntro::
|
||||
.string "Hey, you just bumped me!$"
|
||||
|
||||
Route16_Text_HideoDefeat:: @ 8186D52
|
||||
Route16_Text_HideoDefeat::
|
||||
.string "Kaboom!$"
|
||||
|
||||
Route16_Text_HideoPostBattle:: @ 8186D5A
|
||||
Route16_Text_HideoPostBattle::
|
||||
.string "We'll always be hanging around here\n"
|
||||
.string "even if you don't like it.\p"
|
||||
.string "You can detour to VERMILION from\n"
|
||||
.string "FUCHSIA going along the coast.$"
|
||||
|
||||
Route16_Text_CamronIntro:: @ 8186DD9
|
||||
Route16_Text_CamronIntro::
|
||||
.string "I'm feeling hungry and mean!\n"
|
||||
.string "I need a punching bag!$"
|
||||
|
||||
Route16_Text_CamronDefeat:: @ 8186E0D
|
||||
Route16_Text_CamronDefeat::
|
||||
.string "Bad, bad, bad!$"
|
||||
|
||||
Route16_Text_CamronPostBattle:: @ 8186E1C
|
||||
Route16_Text_CamronPostBattle::
|
||||
.string "If I'm going to have POKéMON, they\n"
|
||||
.string "may as well be ferocious.\p"
|
||||
.string "I'd use them to leave my enemies\n"
|
||||
.string "in tatters.$"
|
||||
|
||||
Route16_Text_RubenIntro:: @ 8186E86
|
||||
Route16_Text_RubenIntro::
|
||||
.string "Hey, there!\n"
|
||||
.string "Let's have ourselves a good time!$"
|
||||
|
||||
Route16_Text_RubenDefeat:: @ 8186EB4
|
||||
Route16_Text_RubenDefeat::
|
||||
.string "Don't make me mad!$"
|
||||
|
||||
Route16_Text_RubenPostBattle:: @ 8186EC7
|
||||
Route16_Text_RubenPostBattle::
|
||||
.string "I get my kicks by harassing people\n"
|
||||
.string "with my stinking POKéMON.\p"
|
||||
.string "They're great for startling people.\n"
|
||||
.string "And, they bite, too.$"
|
||||
|
||||
Route16_Text_MonSprawledOutInSlumber:: @ 8186F3D
|
||||
Route16_Text_MonSprawledOutInSlumber::
|
||||
.string "A POKéMON is sprawled out in\n"
|
||||
.string "a deep and comfortable slumber.$"
|
||||
|
||||
Route16_Text_CyclingRoadSign:: @ 8186F7A
|
||||
Route16_Text_CyclingRoadSign::
|
||||
.string "Enjoy the slope!\n"
|
||||
.string "CYCLING ROAD$"
|
||||
|
||||
Route16_Text_RouteSign:: @ 8186F98
|
||||
Route16_Text_RouteSign::
|
||||
.string "ROUTE 16\n"
|
||||
.string "CELADON CITY - FUCHSIA CITY$"
|
||||
|
||||
Route16_Text_JedIntro:: @ 8186FBD
|
||||
Route16_Text_JedIntro::
|
||||
.string "JED: Our love knows no bounds.\n"
|
||||
.string "We're in love and we show it!$"
|
||||
|
||||
Route16_Text_JedDefeat:: @ 8186FFA
|
||||
Route16_Text_JedDefeat::
|
||||
.string "JED: Oh, no!\n"
|
||||
.string "My love has seen me as a loser!$"
|
||||
|
||||
Route16_Text_JedPostBattle:: @ 8187027
|
||||
Route16_Text_JedPostBattle::
|
||||
.string "JED: Listen, LEA.\n"
|
||||
.string "You need to focus less on me.$"
|
||||
|
||||
Route16_Text_JedNotEnoughMons:: @ 8187057
|
||||
Route16_Text_JedNotEnoughMons::
|
||||
.string "JED: You have just one POKéMON?\n"
|
||||
.string "Is there no love in your heart?$"
|
||||
|
||||
Route16_Text_LeaIntro:: @ 8187097
|
||||
Route16_Text_LeaIntro::
|
||||
.string "LEA: Sometimes, the intensity of\n"
|
||||
.string "our love scares me.$"
|
||||
|
||||
Route16_Text_LeaDefeat:: @ 81870CC
|
||||
Route16_Text_LeaDefeat::
|
||||
.string "LEA: Ohh! But JED looks cool\n"
|
||||
.string "even in a loss!$"
|
||||
|
||||
Route16_Text_LeaPostBattle:: @ 81870F9
|
||||
Route16_Text_LeaPostBattle::
|
||||
.string "LEA: Ehehe, I'm sorry.\n"
|
||||
.string "JED is so cool.$"
|
||||
|
||||
Route16_Text_LeaNotEnoughMons:: @ 8187120
|
||||
Route16_Text_LeaNotEnoughMons::
|
||||
.string "LEA: Oh, you don't have two\n"
|
||||
.string "POKéMON with you?\p"
|
||||
.string "Doesn't it feel lonely for you or\n"
|
||||
|
||||
Reference in New Issue
Block a user