berry.s decompiled

This commit is contained in:
DizzyEggg committed 2017-09-13 11:16:26 +02:00
1 parent a83d07e1b3
commit 5f4c5e280c
49 files changed
+1089 -1780

No files matched your search

+592 -173
View File
File diff suppressed because it is too large. Load diff
+3 -2
View File
@@ -1,5 +1,6 @@
#include "global.h"
#include "item.h"
#include "items.h"
#include "string_util.h"
#include "text.h"
#include "event_data.h"
@@ -86,10 +87,10 @@ void CopyItemName(u16 itemId, u8 *string)
void CopyItemNameHandlePlural(u16 itemId, u8 *string, u32 quantity)
{
if (itemId == 4)
if (itemId == ITEM_POKE_BALL)
{
if (quantity < 2)
StringCopy(string, ItemId_GetItem(4)->name);
StringCopy(string, ItemId_GetItem(ITEM_POKE_BALL)->name);
else
StringCopy(string, gOtherText_PokeBalls);
}