fix record mixing merge conflicts

This commit is contained in:
DizzyEggg committed 2018-05-19 12:32:44 +02:00
commit e44f35c7b7
26 files changed
+1631 -2452

No files matched your search

+5
View File
@@ -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