Merge branch 'master' into document-gyms2

This commit is contained in:
GriffinR authored and GitHub committed 2019-10-16 04:22:34 -04:00
commit b4a9298205
361 files changed
+10596 -11077

No files matched your search

+1 -1
View File
@@ -72,7 +72,7 @@ FortreeCity_EventScript_1E2630:: @ 81E2630
FortreeCity_EventScript_1E2645:: @ 81E2645
msgbox FortreeCity_Text_1E2A48, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, FortreeCity_Movement_2723C7
applymovement VAR_LAST_TALKED, Movement_KecleonAppears
waitmovement 0
waitse
playmoncry SPECIES_KECLEON, 2