summaryrefslogtreecommitdiff
path: root/src/engine/trade.c
diff options
context:
space:
mode:
authorCameron Hall <camthesaxman@users.noreply.github.com>2017-11-27 14:07:31 -0600
committerGitHub <noreply@github.com>2017-11-27 14:07:31 -0600
commit5498eaf94849bbc7b56d8c280862b61ecefa0643 (patch)
tree518b0b12e669c09c31a33c7a071f10bcd4ea76b9 /src/engine/trade.c
parent66f2ac4ba38cb32eb210545536a487969b593d10 (diff)
parent5d74d11d3e3047b4b53153365325db9e6999c627 (diff)
Merge pull request #477 from camthesaxman/constant_headers
Use common headers for constants in assembly and C
Diffstat (limited to 'src/engine/trade.c')
-rw-r--r--src/engine/trade.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/engine/trade.c b/src/engine/trade.c
index e09942589..06a6b96c7 100644
--- a/src/engine/trade.c
+++ b/src/engine/trade.c
@@ -3,10 +3,10 @@
#include "string_util.h"
#include "text.h"
#include "main.h"
-#include "species.h"
-#include "items.h"
-#include "moves.h"
-#include "easy_chat.h"
+#include "constants/species.h"
+#include "constants/items.h"
+#include "constants/moves.h"
+#include "constants/easy_chat.h"
#include "link.h"
#include "strings2.h"
#include "graphics.h"
@@ -17,7 +17,7 @@
#include "pokemon_icon.h"
#include "cable_club.h"
#include "party_menu.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "data2.h"
#include "pokemon_summary_screen.h"