diff --git a/data/sound_data.s b/data/sound_data.s index d1951ecc7c..b52f9d2f86 100644 --- a/data/sound_data.s +++ b/data/sound_data.s @@ -1,5 +1,8 @@ .section .rodata + .include "asm/macros.inc" + .include "constants/constants.inc" + .include "asm/macros/m4a.inc" .include "asm/macros/music_voice.inc" .include "include/config/general.h" diff --git a/include/config/species_enabled.h b/include/config/species_enabled.h index 8b6b9d87b7..5866d24399 100644 --- a/include/config/species_enabled.h +++ b/include/config/species_enabled.h @@ -1,9 +1,6 @@ #ifndef GUARD_CONFIG_SPECIES_ENABLED_H #define GUARD_CONFIG_SPECIES_ENABLED_H -// WARNING: For some reason, using 1/0 instead of TRUE/FALSE causes cry IDs to be shifted. -// Please use TRUE/FALSE when using the family toggles. - // Modifying the latest generation WILL change the saveblock due to Dex flags and will require a new save file. // Generations of Pokémon are defined by the first member introduced, // so Pikachu depends on the Gen 1 setting despite Pichu being the lowest member of the evolution tree.