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

2018-10-21 00:20:09 +01:00
parent 7a072d4527 2a3ba78831
commit 3d8874d919
422 changed files with 7626 additions and 12999 deletions
@@ -976,13 +976,4 @@ struct UnkStruct_8054FF8
    u16 field_C;
 };

-struct Bitmap           // TODO: Find a better spot for this
-{
-    u8* pixels;
-    u32 width:16;
-    u32 height:16;
-};
-
-extern u8 gReservedSpritePaletteCount;
-
 #endif // GUARD_GLOBAL_H