diff options
| author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2017-06-21 22:08:35 +0200 |
|---|---|---|
| committer | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2017-06-23 21:52:37 +0200 |
| commit | ffdfce02107bbb2e176a6af42d29aa08d4bac48d (patch) | |
| tree | ace795800b81c71fe7c5ee9e2a95c2298f271e93 /src/pokedex.c | |
| parent | 8694fa69f8e17f3437d1dd29e53984497e6267fd (diff) | |
Integrate Pokedex data
Diffstat (limited to 'src/pokedex.c')
| -rw-r--r-- | src/pokedex.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/pokedex.c b/src/pokedex.c index 17ae9a597..bfeab981e 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -178,7 +178,12 @@ static const u16 sNationalPokedexPalette[] = INCBIN_U16("graphics/pokedex/nation const u8 gEmptySpacce_839F7FC[0xA4] = {0}; static const u8 gUnknown_0839F8A0[] = INCBIN_U8("graphics/pokedex/pokedex_cry_layout.bin.lz"); static const u8 gUnknown_0839F988[] = INCBIN_U8("graphics/pokedex/pokedex_size_layout.bin.lz"); +#if ENGLISH static const u8 gUnknown_0839FA7C[] = INCBIN_U8("graphics/pokedex/noball.4bpp.lz"); +#elif GERMAN +extern const u8 gUnknown_0839FA7C[]; +#endif + #include "data/pokedex_orders.h" static const struct OamData gOamData_83A0404 = { @@ -507,8 +512,11 @@ static const u8 gUnknown_083A05EC[] = {2, 4, 8, 16, 32}; static const u8 gUnknown_083A05F1[] = {16, 8, 4, 2, 1}; const u8 gEmptySpacce_83A05F6[] = {0, 0}; // Padding, maybe? static const u8 gUnknown_083A05F8[] = _(""); -// TODO: include German entries +#if ENGLISH #include "data/pokedex_entries_en.h" +#elif GERMAN +#include "data/pokedex_entries_de.h" +#endif static const u16 gUnknown_083B4EC4[16] = {0}; static const u8 *const sMonFootprintTable[] = { |