diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-05-09 05:10:23 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-05-09 05:10:23 -0500 |
| commit | b570f87152bcde1d108e5e8302ef6d783ecbbbbd (patch) | |
| tree | e00c31c3c2dc5a8c884ab7bdee51bb05ce391cf1 /src/pokemon_summary_screen.c | |
| parent | d66c1c642c60191887fc4dda6d33bb5b8e9ff69c (diff) | |
| parent | f14d2765da6f01eccb08967fd6b22c3bdef2be98 (diff) | |
Merge master from pret
Diffstat (limited to 'src/pokemon_summary_screen.c')
| -rw-r--r-- | src/pokemon_summary_screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index e7fcce629..f77b7c38c 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -3173,11 +3173,11 @@ void sub_81C3554(u8 taskId) void sub_81C35E4() { - u8 *text; + const u8 *text; int offset; if (gUnknown_0203CF1C->summary.item == ITEM_ENIGMA_BERRY && sub_81B1250() == 1 && (gUnknown_0203CF1C->unk40BE == 1 || gUnknown_0203CF1C->unk40BE == 4 || gUnknown_0203CF1C->unk40BE == 5)) { - text = (u8*)ItemId_GetItem(ITEM_ENIGMA_BERRY); + text = ItemId_GetName(ITEM_ENIGMA_BERRY); } else if (gUnknown_0203CF1C->summary.item == ITEM_NONE) text = gText_None; |