Merge branch 'master' of https://github.com/pret/pokeemerald into dump_songs

This commit is contained in:
sceptillion committed 2017-12-22 00:17:34 -08:00
commit 3c286feec6
98 files changed
+12920 -14984

No files matched your search

-2
View File
@@ -134,8 +134,6 @@ extern u8 gInGameOpponentsNo;
extern u8 gUnknown_020322D5;
extern u8 gResultsWindowId;
extern const u8 * const gPokeblockNames[];
// graphics
extern const u8 gBerryBlenderArrowTiles[];
extern const u8 gBerryBlenderStartTiles[];