Merge branch 'master' into feature/gen-iv-trophy-garden

Author: Machine-Maker

data/v2/csv/encounter_condition_prose.csv

@@ -36,3 +36,7 @@ encounter_condition_id,local_language_id,name
 15,9,Trade a specific Pokemon to an NPC
 16,9,Redeem Coins for a Pokemon at the Prize Corner or Game Corner
 17,9,Friend Safari Slot assignment
+18,9,Great Marsh Daily Slot
+19,9,Honey Tree Group
+20,9,Headbutt Tree Type
+21,9,Mr. Backlot Trophy Garden