diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-13 22:19:14 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-13 22:19:14 -0500 |
| commit | e1bd37dca9a53298e733c53189b5fdba9dff050b (patch) | |
| tree | 0dabac229ff7c9a64e3c2bdc862f133a97d5ba4f /include/data2.h | |
| parent | e5b6d15f9163cca8688cd67ca5a0563ce6667601 (diff) | |
| parent | bb8c53f8988be6cad8f270c46f24e0f6f1e862cc (diff) | |
fix merge conflicts
Diffstat (limited to 'include/data2.h')
| -rw-r--r-- | include/data2.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/data2.h b/include/data2.h index be0f33ab8..df71f6e88 100644 --- a/include/data2.h +++ b/include/data2.h @@ -16,5 +16,9 @@ extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; extern const u8 gMoveNames[][13]; extern const u8 gAbilityNames[][13]; extern const u8 gTypeNames[][7]; +extern struct CompressedSpriteSheet gUnknown_0831C620; +extern struct CompressedSpritePalette gUnknown_0831C628; +extern const struct SpriteTemplate gUnknown_0831C688; + #endif // GUARD_DATA2_H |