Merge branch 'master' into record_mixing

2018-02-11 20:12:40 -05:00
parent bc063b45d0 14a76793e5
commit 590c4b500b
6672 changed files with 937954 additions and 212286 deletions
@@ -2,4 +2,4 @@
 	.set POCKET_POKE_BALLS, 0x02
 	.set POCKET_TM_HM,      0x03
 	.set POCKET_BERRIES,    0x04
-	.set POCKET_KEY_ITEMS,  0x05
+	.set BAG_KEYITEMS,  0x05