diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-03-31 10:39:11 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-03-31 10:39:11 -0400 |
commit | db4e9505adb121b35b50d3b6fbc7e4595c2f90a8 (patch) | |
tree | 17c6d45f75cfb684fdc87825ca8d857d40bcc0c2 /include/graphics.h | |
parent | 0ba4d0cadcb2cf22dabc791964038457aa5b46ec (diff) | |
parent | 500d009b5c52345afce3dfd103113cfa77e7b262 (diff) |
Merge branch 'master' into mystery_gift
Diffstat (limited to 'include/graphics.h')
-rw-r--r-- | include/graphics.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/graphics.h b/include/graphics.h index b49b2a661..e6d6ae350 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4917,4 +4917,12 @@ extern const u16 gLinkMiscMenu_Pal[]; extern const u32 gLinkMiscMenu_Gfx[]; extern const u32 gLinkMiscMenu_Tilemap[]; +// Use Pokeblock +extern const u8 gPokenavConditionCancel_Gfx[]; +extern const u16 gPokenavConditionCancel_Pal[]; + +// Berry Crush +extern const u32 gUnknown_08DE34B8[]; +extern const u16 gUnknown_08DE3398[]; + #endif //GUARD_GRAPHICS_H |