Merge branch 'master' into clone-union

This commit is contained in:
GriffinR authored and GitHub committed 2022-08-17 15:41:50 -04:00
commit ab56ac41a1
322 files changed
+12564 -12748

No files matched your search

+1 -1
View File
@@ -24,7 +24,7 @@ PewterCity_House1_EventScript_Nidoran::
end
PewterCity_House1_EventScript_DoNidoranCry::
textcolor 3
textcolor NPC_TEXT_COLOR_NEUTRAL
waitse
playmoncry SPECIES_NIDORAN_M, CRY_MODE_NORMAL
msgbox PewterCity_House1_Text_Nidoran