Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg
This commit is contained in:
+2
-2
@@ -840,7 +840,7 @@ static const u8 sText_No000[] = _("{NO}000");
|
||||
static const u8 sCaughtBall_Gfx[] = INCBIN_U8("graphics/pokedex/caught_ball.4bpp");
|
||||
static const u8 sText_TenDashes[] = _("----------");
|
||||
|
||||
ALIGNED(4) static const u8 gExpandedPlaceholder_PokedexDescription[] = _("");
|
||||
ALIGNED(4) static const u8 sExpandedPlaceholder_PokedexDescription[] = _("");
|
||||
|
||||
#include "data/pokemon/pokedex_text.h"
|
||||
#include "data/pokemon/pokedex_entries.h"
|
||||
@@ -4138,7 +4138,7 @@ static void PrintMonInfo(u32 num, u32 value, u32 owned, u32 newEntry)
|
||||
if (owned)
|
||||
description = gPokedexEntries[num].description;
|
||||
else
|
||||
description = gExpandedPlaceholder_PokedexDescription;
|
||||
description = sExpandedPlaceholder_PokedexDescription;
|
||||
PrintInfoScreenText(description, GetStringCenterAlignXOffset(FONT_NORMAL, description, 0xF0), 0x5F);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user