fix record mixing merge conflicts

2018-05-19 12:32:44 +02:00
parent 0c1f85f200 db898d0e48
commit e44f35c7b7
26 changed files with 1631 additions and 2452 deletions
@@ -0,0 +1,5 @@
+	.set POCKET_ITEMS,      0x01
+	.set POCKET_POKE_BALLS, 0x02
+	.set POCKET_TM_HM,      0x03
+	.set POCKET_BERRIES,    0x04
+	.set BAG_KEYITEMS,  0x05