diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-27 10:11:29 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-27 10:11:29 -0600 |
| commit | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (patch) | |
| tree | 99bc2544695e94e72417138648ed9744e37698fe /src/pokedex.c | |
| parent | 977e0bc34514244d4afc35bb1edece166386f051 (diff) | |
| parent | 556bdd52e1ba5bf1c1cc3b00baab3bf7fc60d9f9 (diff) | |
Merge pull request #403 from nullableVoidPtr/master
Clean up aligned variables in src/
Diffstat (limited to 'src/pokedex.c')
| -rw-r--r-- | src/pokedex.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/pokedex.c b/src/pokedex.c index 6d8e701f9..66a68f0bd 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -798,8 +798,7 @@ static const u8 gUnknown_0855D2B8[] = _("{NO}000"); static const u8 gUnknown_0855D2BE[] = INCBIN_U8("graphics/pokedex/caught_ball.4bpp"); static const u8 sText_TenDashes[] = _("----------"); -asm(".align 2"); -static const u8 gUnknown_0855D30C[] = _(""); +ALIGNED(4) static const u8 gExpandedPlaceholder_PokedexDescription[] = _(""); #include "data/pokemon/pokedex_text.h" #include "data/pokemon/pokedex_entries.h" @@ -3919,7 +3918,7 @@ void sub_80C020C(u32 num, u32 value, u32 c, u32 d) if (c) text3 = gPokedexEntries[num].description; else - text3 = gUnknown_0855D30C; + text3 = gExpandedPlaceholder_PokedexDescription; sub_80BE8DC(text3, GetStringCenterAlignXOffset(1, text3, 0xF0), 0x5F); } |