Merge branch 'master' into decompile_use_pokeblock

src/pokemon_3.c

@@ -1,25 +1,25 @@
 #include "global.h"
 #include "pokemon.h"
 #include "main.h"
-#include "items.h"
+#include "constants/items.h"
 #include "string_util.h"
 #include "battle_message.h"
 #include "rtc.h"
 #include "item.h"
 #include "battle.h"
-#include "species.h"
+#include "constants/species.h"
 #include "link.h"
-#include "hold_effects.h"
+#include "constants/hold_effects.h"
 #include "random.h"
 #include "trainer_classes.h"
 #include "trainer_ids.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "m4a.h"
 #include "task.h"
 #include "sprite.h"
 #include "text.h"
-#include "abilities.h"
+#include "constants/abilities.h"
 #include "pokemon_animation.h"
 #include "pokedex.h"
 #include "pokeblock.h"