Merge branch 'master' into pok_jump

This commit is contained in:
DizzyEggg committed 2019-08-04 00:02:13 +02:00
commit 1641579297
44 files changed
+6484 -12643

No files matched your search

+3
View File
@@ -4939,6 +4939,9 @@ extern const u32 gLinkMiscMenu_Tilemap[];
// Use Pokeblock
extern const u8 gPokenavConditionCancel_Gfx[];
extern const u16 gPokenavConditionCancel_Pal[];
extern const u8 gUsePokeblockUpDown_Gfx[];
extern const u16 gUsePokeblockUpDown_Pal[];
extern const u16 gUsePokeblockCondition_Pal[];
// Berry Crush
extern const u32 gUnknown_08DE34B8[];