From 43f7bec067280fd558f0e6b824302954a145df9c Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 9 May 2018 20:15:22 -0700 Subject: Misc labeling and cleanup, mostly item-related --- src/berry.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'src/berry.c') diff --git a/src/berry.c b/src/berry.c index 16b5b2b22..349703299 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1,4 +1,5 @@ #include "global.h" +#include "constants/items.h" #include "berry.h" #include "field_control_avatar.h" #include "event_object_movement.h" @@ -6,24 +7,12 @@ #include "item.h" #include "item_menu.h" #include "item_use.h" -#include "constants/items.h" #include "main.h" #include "menu.h" #include "random.h" #include "task.h" #include "text.h" -#define BERRY_NAME_LENGTH 6 -#define BERRY_REGROW_LIMIT 10 -#define MAX_BERRY_TREES 128 - -#define BERRY_NONE 0 -#define FIRST_BERRY ITEM_CHERI_BERRY -#define LAST_BERRY ITEM_ENIGMA_BERRY - -#define GETBERRYID(berry) ((berry - FIRST_BERRY) + 1) -#define GETITEMID(berry) ((berry + FIRST_BERRY) - 1) - #ifdef ENGLISH #define NAME_CHERI_BERRY _("CHERI") #define NAME_CHESTO_BERRY _("CHESTO") -- cgit v1.2.3