diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
| commit | f719abf104e304ed2f886a413d1132a75e3379b1 (patch) | |
| tree | 352be6d36f1db3f697394bc193adb7fa8142be71 /include/graphics.h | |
| parent | 2d604191592fbac2618d4a626f61ff1423cac828 (diff) | |
| parent | bd4a6520eaaaac186b6b26557305be8939a7ea2a (diff) | |
fix merge conflicts
Diffstat (limited to 'include/graphics.h')
| -rwxr-xr-x[-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 c3fe20996..36b11fd0a 100644..100755 --- a/include/graphics.h +++ b/include/graphics.h @@ -2435,4 +2435,12 @@ extern const u8 gMonFrontPic_UnownQuestionMark[]; extern const u8 gMonBackPic_UnownQuestionMark[]; extern const u8 gMonIcon_UnownQuestionMark[]; +// src/pokeblock.c +extern const u8 gMenuPokeblock_Gfx[]; +extern const u8 gMenuPokeblock_Tilemap[]; +extern const u8 gMenuPokeblock_Pal[]; + +extern const u8 gMenuPokeblockDevice_Gfx[]; +extern const u8 gMenuPokeblockDevice_Pal[]; + #endif // GUARD_GRAPHICS_H |