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

2018-04-25 00:28:57 -04:00
parent 069a7e71fc 867b496f2e
commit 6a401b5386
68 changed files with 4728 additions and 8948 deletions
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2873,4 +2873,8 @@ extern const u8 gBerryPalette_Enigma[];
 //credits
 extern const u8 gCreditsCopyrightEnd_Gfx[];

+//pokenav condition marker
+extern const u8 gPokenavConditionMarker_Gfx[];
+extern const u16 gPokenavConditionMarker_Pal[];
+
 #endif //GUARD_GRAPHICS_H