Merge branch 'master' into horde-encounter-info

Author: Naramsim

data/v2/csv/item_names.csv

@@ -17298,11 +17298,6 @@ item_id,local_language_id,name
 1942,5,Mucus d'Axoloto
 1942,9,Wooper Slime
 1942,11,ウパーのねんえき
-1943,1,わざマシン１００
-1943,4,招式学习器１００
-1943,5,CT100
-1943,9,TM100
-1943,11,わざマシン１００
 1944,1,わざマシン１０１
 1944,4,招式学习器１０１
 1944,5,CT101

data/v2/csv/items.csv

@@ -1890,7 +1890,6 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 1940,charcadet-soot,54,160,,
 1941,toedscool-flaps,54,100,,
 1942,wooper-slime,54,60,,
-1943,tm100,37,0,,
 1944,tm101,37,0,,
 1945,tm102,37,0,,
 1946,tm103,37,0,,

data/v2/csv/machines.csv

@@ -1913,7 +1913,7 @@ machine_number,version_group_id,item_id,move_id
 97,25,746,19
 98,25,747,285
 99,25,748,442
-100,25,1943,349
+100,25,749,349
 101,25,1944,408
 102,25,1945,441
 103,25,1946,164
@@ -2114,7 +2114,7 @@ machine_number,version_group_id,item_id,move_id
 93,27,659,430
 94,27,660,399
 99,27,748,442
-100,27,1943,349
+100,27,749,349
 103,27,1946,164
 104,27,1947,334
 106,27,1949,529