diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-26 10:23:13 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-26 10:23:13 -0400 |
| commit | 93f0703fcdda810062071fde4febe111146c18cc (patch) | |
| tree | 241164c7e5fd5e71a9e3eca6eb8d6a918566d963 /include/data.h | |
| parent | fd78afa5a7d4441fe0d76693e301deb6bc2557dc (diff) | |
| parent | 1f569f0136952135a0e17fe22cf180c0e87dd007 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into script_menu
Diffstat (limited to 'include/data.h')
| -rw-r--r-- | include/data.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/data.h b/include/data.h index 99594209b..9ea1f7c96 100644 --- a/include/data.h +++ b/include/data.h @@ -5,6 +5,7 @@ #include "constants/species.h" #define SPECIES_SHINY_TAG 500 +#define TRAINER_ENCOUNTER_MUSIC(trainer)((gTrainers[trainer].encounterMusic_gender & 0x7F)) struct MonCoords { @@ -16,8 +17,6 @@ struct MonCoords extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; extern const u8 gMoveNames[][13]; -extern const u8 gAbilityNames[][13]; -extern const u8 gTypeNames[][7]; extern const u16 gUnknown_8251CB8[]; extern const u16 gUnknown_8251FEE[]; extern const u16 gUnknown_8252324[]; |