Merge branch 'master' of github.com:pret/pokefirered into modern_gcc

src/player_pc.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "palette.h"
+#include "gflib.h"
 #include "item.h"
 #include "task.h"
 #include "menu_indicators.h"
@@ -9,7 +9,6 @@
 #include "mail.h"
 #include "mail_data.h"
 #include "help_system.h"
-#include "sound.h"
 #include "overworld.h"
 #include "script.h"
 #include "mailbox_pc.h"
@@ -17,7 +16,6 @@
 #include "field_weather.h"
 #include "event_scripts.h"
 #include "field_fadetransition.h"
-#include "string_util.h"
 #include "item_menu.h"
 #include "item_pc.h"
 #include "party_menu.h"