diff --git a/data/v2/csv/item_names.csv b/data/v2/csv/item_names.csv
index ba895daaf..a9c08f824 100644
--- a/data/v2/csv/item_names.csv
+++ b/data/v2/csv/item_names.csv
@@ -17823,4 +17823,120 @@ item_id,local_language_id,name
 2159,9,Poltchageist Powder
 2159,11,チャデスのこな
 2160,9,Linking Cord
-2160,11, つながりのヒモ
\ No newline at end of file
+2160,11, つながりのヒモ
+2161,9,TM172
+2161,11,わざマシン１７２
+2162,9,TM173
+2162,11,わざマシン１７３
+2163,9,TM174
+2163,11,わざマシン１７４
+2164,9,TM175
+2164,11,わざマシン１７５
+2165,9,TM176
+2165,11,わざマシン１７６
+2166,9,TM177
+2166,11,わざマシン１７７
+2167,9,TM178
+2167,11,わざマシン１７８
+2168,9,TM179
+2168,11,わざマシン１７９
+2169,9,TM180
+2169,11,わざマシン１８０
+2170,9,TM181
+2170,11,わざマシン１８１
+2171,9,TM182
+2171,11,わざマシン１８２
+2172,9,TM183
+2172,11,わざマシン１８３
+2173,9,TM184
+2173,11,わざマシン１８４
+2174,9,TM185
+2174,11,わざマシン１８５
+2175,9,TM186
+2175,11,わざマシン１８６
+2176,9,TM187
+2176,11,わざマシン１８７
+2177,9,TM188
+2177,11,わざマシン１８８
+2178,9,TM189
+2178,11,わざマシン１８９
+2179,9,TM190
+2179,11,わざマシン１９０
+2180,9,TM191
+2180,11,わざマシン１９１
+2181,9,TM192
+2181,11,わざマシン１９２
+2182,9,TM193
+2182,11,わざマシン１９３
+2183,9,TM194
+2183,11,わざマシン１９４
+2184,9,TM195
+2184,11,わざマシン１９５
+2185,9,TM196
+2185,11,わざマシン１９６
+2186,9,TM197
+2186,11,わざマシン１９７
+2187,9,TM198
+2187,11,わざマシン１９８
+2188,9,TM199
+2188,11,わざマシン１９９
+2189,9,TM200
+2189,11,わざマシン２００
+2190,9,TM201
+2190,11,わざマシン２０１
+2191,9,TM202
+2191,11,わざマシン２０２
+2192,9,TM203
+2192,11,わざマシン２０３
+2193,9,TM204
+2193,11,わざマシン２０４
+2194,9,TM205
+2194,11,わざマシン２０５
+2195,9,TM206
+2195,11,わざマシン２０６
+2196,9,TM207
+2196,11,わざマシン２０７
+2197,9,TM208
+2197,11,わざマシン２０８
+2198,9,TM209
+2198,11,わざマシン２０９
+2199,9,TM210
+2199,11,わざマシン２１０
+2200,9,TM211
+2200,11,わざマシン２１１
+2201,9,TM212
+2201,11,わざマシン２１２
+2202,9,TM213
+2202,11,わざマシン２１３
+2203,9,TM214
+2203,11,わざマシン２１４
+2204,9,TM215
+2204,11,わざマシン２１５
+2205,9,TM216
+2205,11,わざマシン２１６
+2206,9,TM217
+2206,11,わざマシン２１７
+2207,9,TM218
+2207,11,わざマシン２１８
+2208,9,TM219
+2208,11,わざマシン２１９
+2209,9,TM220
+2209,11,わざマシン２２０
+2210,9,TM221
+2210,11,わざマシン２２１
+2211,9,TM222
+2211,11,わざマシン２２２
+2212,9,TM223
+2212,11,わざマシン２２３
+2213,9,TM224
+2213,11,わざマシン２２４
+2214,9,TM225
+2214,11,わざマシン２２５
+2215,9,TM226
+2215,11,わざマシン２２６
+2216,9,TM227
+2216,11,わざマシン２２７
+2217,9,TM228
+2217,11,わざマシン２２８
+2218,9,TM229
+2218,11,わざマシン２２９
diff --git a/data/v2/csv/items.csv b/data/v2/csv/items.csv
index cac23fbd2..2415c7323 100644
--- a/data/v2/csv/items.csv
+++ b/data/v2/csv/items.csv
@@ -2108,5 +2108,63 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 2158,morpeko-snack,54,15,,
 2159,poltchageist-powder,54,30,,
 2160,linking-cord,10,8000,,
+2161,tm172,37,0,,
+2162,tm173,37,0,,
+2163,tm174,37,0,,
+2164,tm175,37,0,,
+2165,tm176,37,0,,
+2166,tm177,37,0,,
+2167,tm178,37,0,,
+2168,tm179,37,0,,
+2169,tm180,37,0,,
+2170,tm181,37,0,,
+2171,tm182,37,0,,
+2172,tm183,37,0,,
+2173,tm184,37,0,,
+2174,tm185,37,0,,
+2175,tm186,37,0,,
+2176,tm187,37,0,,
+2177,tm188,37,0,,
+2178,tm189,37,0,,
+2179,tm190,37,0,,
+2180,tm191,37,0,,
+2181,tm192,37,0,,
+2182,tm193,37,0,,
+2183,tm194,37,0,,
+2184,tm195,37,0,,
+2185,tm196,37,0,,
+2186,tm197,37,0,,
+2187,tm198,37,0,,
+2188,tm199,37,0,,
+2189,tm200,37,0,,
+2190,tm201,37,0,,
+2191,tm202,37,0,,
+2192,tm203,37,0,,
+2193,tm204,37,0,,
+2194,tm205,37,0,,
+2195,tm206,37,0,,
+2196,tm207,37,0,,
+2197,tm208,37,0,,
+2198,tm209,37,0,,
+2199,tm210,37,0,,
+2200,tm211,37,0,,
+2201,tm212,37,0,,
+2202,tm213,37,0,,
+2203,tm214,37,0,,
+2204,tm215,37,0,,
+2205,tm216,37,0,,
+2206,tm217,37,0,,
+2207,tm218,37,0,,
+2208,tm219,37,0,,
+2209,tm220,37,0,,
+2210,tm221,37,0,,
+2211,tm222,37,0,,
+2212,tm223,37,0,,
+2213,tm224,37,0,,
+2214,tm225,37,0,,
+2215,tm226,37,0,,
+2216,tm227,37,0,,
+2217,tm228,37,0,,
+2218,tm229,37,0,,
 10001,black-augurite,10,0,,
 10002,peat-block,10,0,,
diff --git a/data/v2/csv/machines.csv b/data/v2/csv/machines.csv
index 288089de1..59022bb76 100644
--- a/data/v2/csv/machines.csv
+++ b/data/v2/csv/machines.csv
@@ -1687,3 +1687,417 @@ machine_number,version_group_id,item_id,move_id
 197,20,1285,706
 198,20,1286,710
 199,20,1287,776
+10,23,314,526
+21,23,325,605
+27,23,331,490
+43,23,347,521
+49,23,353,503
+62,23,366,405
+63,23,367,417
+78,23,382,555
+83,23,387,523
+93,23,397,15
+94,23,398,19
+95,23,399,57
+96,23,400,70
+97,23,401,432
+98,23,402,249
+99,23,403,127
+100,23,404,431
+1,25,305,36
+2,25,306,204
+3,25,307,313
+4,25,308,97
+5,25,309,189
+6,25,310,184
+7,25,311,182
+8,25,312,424
+9,25,313,422
+10,25,314,423
+11,25,315,352
+12,25,316,67
+13,25,317,491
+14,25,318,512
+15,25,319,522
+16,25,320,60
+17,25,321,109
+18,25,322,168
+19,25,323,574
+20,25,324,885
+21,25,325,884
+22,25,326,886
+23,25,327,451
+24,25,328,83
+25,25,329,263
+26,25,330,342
+27,25,331,332
+28,25,332,523
+29,25,333,506
+30,25,334,555
+31,25,335,232
+32,25,336,129
+33,25,337,345
+34,25,338,196
+35,25,339,341
+36,25,340,317
+37,25,341,577
+38,25,342,488
+39,25,343,490
+40,25,344,314
+41,25,345,500
+42,25,346,101
+43,25,347,374
+44,25,348,525
+45,25,349,474
+46,25,350,419
+47,25,351,203
+48,25,352,521
+49,25,353,241
+50,25,354,240
+51,25,355,201
+52,25,356,883
+53,25,357,684
+54,25,358,473
+55,25,359,91
+56,25,360,331
+57,25,361,206
+58,25,362,280
+59,25,363,428
+60,25,364,369
+61,25,365,421
+62,25,366,492
+63,25,367,706
+64,25,368,339
+65,25,369,403
+66,25,370,34
+67,25,371,7
+68,25,372,9
+69,25,373,8
+70,25,374,214
+71,25,375,402
+72,25,376,486
+73,25,377,409
+74,25,378,115
+75,25,379,113
+76,25,380,350
+77,25,381,127
+78,25,382,337
+79,25,383,605
+80,25,384,118
+81,25,385,447
+82,25,386,86
+83,25,387,398
+84,25,388,707
+85,25,389,156
+86,25,390,157
+87,25,391,269
+88,25,392,14
+89,25,393,776
+90,25,394,191
+91,25,395,390
+92,25,396,286
+93,25,659,430
+94,25,660,399
+95,25,661,141
+96,25,745,598
+97,25,746,19
+98,25,747,285
+99,25,748,442
+100,25,1943,349
+101,25,1944,408
+102,25,1945,441
+103,25,1946,164
+104,25,1947,334
+105,25,1948,404
+106,25,1949,529
+107,25,1950,261
+108,25,1951,242
+109,25,1952,271
+110,25,1953,710
+111,25,1954,202
+112,25,1955,396
+113,25,1956,366
+114,25,1957,247
+115,25,1958,406
+116,25,1959,446
+117,25,1960,304
+118,25,1961,257
+119,25,1962,412
+120,25,1963,94
+121,25,1964,484
+122,25,1965,227
+123,25,1966,57
+124,25,1967,861
+125,25,1968,53
+126,25,1969,85
+127,25,1970,583
+128,25,1971,133
+129,25,1972,347
+130,25,1973,270
+131,25,1974,676
+132,25,1975,226
+133,25,1976,414
+134,25,1977,179
+135,25,1978,58
+136,25,1979,604
+137,25,1980,580
+138,25,1981,678
+139,25,1982,581
+140,25,1983,417
+141,25,1984,126
+142,25,1985,56
+143,25,1986,59
+144,25,1987,519
+145,25,1988,518
+146,25,1989,520
+147,25,1990,528
+148,25,1991,188
+149,25,1992,89
+150,25,1993,444
+151,25,1994,566
+152,25,1995,416
+153,25,1996,307
+154,25,1997,308
+155,25,1998,338
+156,25,1999,200
+157,25,2000,315
+158,25,2001,411
+159,25,2002,437
+160,25,2003,542
+161,25,2004,433
+162,25,2005,405
+163,25,2006,63
+164,25,2007,413
+165,25,2008,394
+166,25,2009,87
+167,25,2010,370
+168,25,2011,76
+169,25,2012,434
+170,25,2013,796
+171,25,2014,851
+172,25,2161,46
+173,25,2162,268
+174,25,2163,114
+175,25,2164,92
+176,25,2165,328
+177,25,2166,180
+178,25,2167,356
+179,25,2168,479
+180,25,2169,360
+181,25,2170,282
+182,25,2171,450
+183,25,2172,162
+184,25,2173,410
+185,25,2174,679
+186,25,2175,667
+187,25,2176,333
+188,25,2177,503
+189,25,2178,535
+190,25,2179,669
+191,25,2180,253
+192,25,2181,264
+193,25,2182,311
+194,25,2183,803
+195,25,2184,807
+196,25,2185,812
+197,25,2186,814
+198,25,2187,809
+199,25,2188,808
+200,25,2189,799
+201,25,2190,802
+202,25,2191,220
+203,25,2192,244
+204,25,2193,38
+205,25,2194,283
+206,25,2195,572
+207,25,2196,915
+208,25,2197,250
+209,25,2198,330
+210,25,2199,916
+211,25,2200,527
+212,25,2201,813
+213,25,2202,811
+214,25,2203,482
+215,25,2204,815
+216,25,2205,297
+217,25,2206,248
+218,25,2207,797
+219,25,2208,806
+220,25,2209,800
+221,25,2210,675
+222,25,2211,784
+223,25,2212,319
+224,25,2213,174
+225,25,2214,912
+226,25,2215,913
+227,25,2216,914
+228,25,2217,917
+229,25,2218,918
+67,26,371,7
+68,26,372,9
+69,26,373,8
+132,26,1975,226
+170,26,2013,796
+172,26,2161,46
+173,26,2162,268
+174,26,2163,114
+175,26,2164,92
+176,26,2165,328
+177,26,2166,180
+178,26,2167,356
+179,26,2168,479
+180,26,2169,360
+181,26,2170,282
+182,26,2171,450
+183,26,2172,162
+184,26,2173,410
+185,26,2174,679
+186,26,2175,667
+187,26,2176,333
+188,26,2177,503
+189,26,2178,535
+190,26,2179,669
+191,26,2180,253
+192,26,2181,264
+193,26,2182,311
+194,26,2183,803
+195,26,2184,807
+196,26,2185,812
+197,26,2186,814
+198,26,2187,809
+199,26,2188,808
+200,26,2189,799
+201,26,2190,802
+2,27,306,204
+7,27,311,182
+13,27,317,491
+29,27,333,506
+30,27,334,555
+34,27,338,196
+39,27,343,490
+41,27,345,500
+44,27,348,525
+49,27,353,241
+50,27,354,240
+51,27,355,201
+52,27,356,883
+53,27,357,684
+59,27,363,428
+60,27,364,369
+63,27,367,706
+64,27,368,339
+67,27,371,7
+68,27,372,9
+69,27,373,8
+74,27,378,115
+75,27,379,113
+76,27,380,350
+77,27,381,127
+78,27,382,337
+81,27,385,447
+82,27,386,86
+83,27,387,398
+86,27,390,157
+87,27,391,269
+88,27,392,14
+89,27,393,776
+93,27,659,430
+94,27,660,399
+99,27,748,442
+100,27,1943,349
+103,27,1946,164
+104,27,1947,334
+106,27,1949,529
+107,27,1950,261
+108,27,1951,242
+109,27,1952,271
+110,27,1953,710
+111,27,1954,202
+112,27,1955,396
+113,27,1956,366
+115,27,1958,406
+117,27,1960,304
+118,27,1961,257
+119,27,1962,412
+121,27,1964,484
+124,27,1967,861
+125,27,1968,53
+126,27,1969,85
+127,27,1970,583
+128,27,1971,133
+129,27,1972,347
+130,27,1973,270
+131,27,1974,676
+133,27,1976,414
+135,27,1978,58
+136,27,1979,604
+137,27,1980,580
+138,27,1981,678
+139,27,1982,581
+140,27,1983,417
+141,27,1984,126
+142,27,1985,56
+143,27,1986,59
+144,27,1987,519
+145,27,1988,518
+146,27,1989,520
+148,27,1991,188
+149,27,1992,89
+150,27,1993,444
+153,27,1996,307
+154,27,1997,308
+155,27,1998,338
+156,27,1999,200
+157,27,2000,315
+158,27,2001,411
+159,27,2002,437
+160,27,2003,542
+161,27,2004,433
+162,27,2005,405
+163,27,2006,63
+164,27,2007,413
+165,27,2008,394
+166,27,2009,87
+168,27,2011,76
+171,27,2014,851
+174,27,2163,114
+181,27,2170,282
+185,27,2174,679
+186,27,2175,667
+187,27,2176,333
+188,27,2177,503
+190,27,2179,669
+193,27,2182,311
+194,27,2183,803
+196,27,2185,812
+197,27,2186,814
+200,27,2189,799
+201,27,2190,802
+202,27,2191,220
+203,27,2192,244
+204,27,2193,38
+205,27,2194,283
+206,27,2195,572
+207,27,2196,915
+208,27,2197,250
+209,27,2198,330
+210,27,2199,916
+211,27,2200,527
+212,27,2201,813
+213,27,2202,811
+214,27,2203,482
+215,27,2204,815
+216,27,2205,297
+217,27,2206,248
+218,27,2207,797
+219,27,2208,806
+220,27,2209,800
+221,27,2210,675
+222,27,2211,784
+223,27,2212,319
+224,27,2213,174
+225,27,2214,912
+226,27,2215,913
+227,27,2216,914
+228,27,2217,917
+229,27,2218,918