diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-09 20:15:22 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-05-09 20:27:03 -0700 |
| commit | 43f7bec067280fd558f0e6b824302954a145df9c (patch) | |
| tree | 959f2dbde54a884aa8a8aa93fadbc24e04a8b0b5 /src/berry.c | |
| parent | 37f5080ea893b79867726aad92425514e866a5dc (diff) | |
Misc labeling and cleanup, mostly item-related
Diffstat (limited to 'src/berry.c')
| -rw-r--r-- | src/berry.c | 13 |
1 files changed, 1 insertions, 12 deletions
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") |