diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-14 14:15:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-14 14:15:51 -0500 |
| commit | a85ac11b28affab06ddb9aa16dceb0d835de9c23 (patch) | |
| tree | 29a3df5b5e53aacb75d8f3db1a1c0be98124be70 /src | |
| parent | 78925916f3fcceca714b8a9ffa8400e33470eae3 (diff) | |
| parent | 20b76c6071ee6630a825aee9c34cf72efcc9a35f (diff) | |
Merge pull request #1325 from GriffinRichards/constants-berrytree
Add berry tree id constants
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_message.c | 1 | ||||
| -rw-r--r-- | src/battle_util.c | 1 | ||||
| -rw-r--r-- | src/berry.c | 1 | ||||
| -rw-r--r-- | src/berry_blender.c | 1 | ||||
| -rw-r--r-- | src/berry_tag_screen.c | 1 | ||||
| -rw-r--r-- | src/menu_specialized.c | 1 | ||||
| -rw-r--r-- | src/pokeblock.c | 1 |
7 files changed, 0 insertions, 7 deletions
diff --git a/src/battle_message.c b/src/battle_message.c index 3920f94cf..46444a8fa 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -21,7 +21,6 @@ #include "window.h" #include "constants/battle_dome.h" #include "constants/battle_string_ids.h" -#include "constants/berry.h" #include "constants/frontier_util.h" #include "constants/items.h" #include "constants/moves.h" diff --git a/src/battle_util.c b/src/battle_util.c index b7919f904..210e418c6 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -29,7 +29,6 @@ #include "constants/battle_move_effects.h" #include "constants/battle_script_commands.h" #include "constants/battle_string_ids.h" -#include "constants/berry.h" #include "constants/hold_effects.h" #include "constants/items.h" #include "constants/moves.h" diff --git a/src/berry.c b/src/berry.c index 022fdc934..ea62deabf 100644 --- a/src/berry.c +++ b/src/berry.c @@ -11,7 +11,6 @@ #include "random.h" #include "string_util.h" #include "text.h" -#include "constants/berry.h" #include "constants/event_object_movement.h" #include "constants/items.h" diff --git a/src/berry_blender.c b/src/berry_blender.c index 08a25c58a..252407562 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -34,7 +34,6 @@ #include "new_game.h" #include "save.h" #include "strings.h" -#include "constants/berry.h" #include "constants/game_stat.h" #include "constants/items.h" #include "constants/rgb.h" diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 089228b17..5be149b0f 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -26,7 +26,6 @@ #include "item_menu_icons.h" #include "decompress.h" #include "international_string_util.h" -#include "constants/berry.h" #include "constants/items.h" #include "constants/rgb.h" #include "constants/songs.h" diff --git a/src/menu_specialized.c b/src/menu_specialized.c index 7de963893..74e3455c3 100644 --- a/src/menu_specialized.c +++ b/src/menu_specialized.c @@ -23,7 +23,6 @@ #include "text_window.h" #include "trig.h" #include "window.h" -#include "constants/berry.h" #include "constants/songs.h" #include "gba/io_reg.h" diff --git a/src/pokeblock.c b/src/pokeblock.c index 0bfb10632..4485fe1ef 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -29,7 +29,6 @@ #include "task.h" #include "text.h" #include "text_window.h" -#include "constants/berry.h" #include "constants/items.h" #include "constants/songs.h" #include "constants/rgb.h" |