diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-05 22:44:02 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-05 22:44:02 -0400 |
| commit | f150a5cd9f15c368a3e520168b56acd3628d6852 (patch) | |
| tree | 6e1316f7f9d1a1eb68a5714835bf4031b29c29fa /include/data2.h | |
| parent | 56d822f9e3fe9ed65377151c0b839e4eaa7caea9 (diff) | |
| parent | b1d091e233b81262e0905ce06607cfa7c4d4c9dd (diff) | |
Merge branch 'master' into nakamura
Diffstat (limited to 'include/data2.h')
| -rw-r--r-- | include/data2.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/data2.h b/include/data2.h index 2fe8d39f8..593d04480 100644 --- a/include/data2.h +++ b/include/data2.h @@ -24,32 +24,32 @@ extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7BEC[]; extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7C18[]; extern const union AnimCmd *const gSpriteAnimTable_81E7C64[]; -extern struct MonCoords gMonFrontPicCoords[]; -extern struct MonCoords gMonBackPicCoords[]; -extern struct CompressedSpriteSheet gMonFrontPicTable[]; -extern struct CompressedSpriteSheet gMonBackPicTable[]; +extern const struct MonCoords gMonFrontPicCoords[]; +extern const struct MonCoords gMonBackPicCoords[]; +extern const struct CompressedSpriteSheet gMonFrontPicTable[]; +extern const struct CompressedSpriteSheet gMonBackPicTable[]; extern const struct CompressedSpritePalette gMonPaletteTable[]; extern const struct CompressedSpritePalette gMonShinyPaletteTable[]; extern const union AnimCmd *const *const gUnknown_081EC2A4[]; extern const union AnimCmd *const *const gUnknown_081ECACC[]; -extern struct MonCoords gTrainerBackPicCoords[]; -extern struct CompressedSpriteSheet gTrainerBackPicTable[]; +extern const struct MonCoords gTrainerBackPicCoords[]; +extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; -extern u8 gEnemyMonElevation[]; +extern const u8 gEnemyMonElevation[]; extern const u8 gTrainerClassNames[][13]; extern const struct Trainer gTrainers[]; -extern u8 gSpeciesNames[][11]; +extern const u8 gSpeciesNames[][11]; extern const u8 gMoveNames[][13]; extern const u8 gAbilityNames[][13]; extern const u8 gTypeNames[][7]; extern const struct ScanlineEffectParams gUnknown_081F9674; extern const u8 gUnknown_081F96C8[]; -extern struct CompressedSpriteSheet gUnknown_081FAEA4; -extern struct CompressedSpritePalette gUnknown_081FAEAC; +extern const struct CompressedSpriteSheet gUnknown_081FAEA4; +extern const struct CompressedSpritePalette gUnknown_081FAEAC; extern const struct SpriteTemplate gSpriteTemplate_81FAF0C; extern u8 *const gUnknown_081FAF4C[]; //extern u8 (*const gUnknown_081FAF4C[])[0x800]; -extern struct BattleMove gBattleMoves[]; +extern const struct BattleMove gBattleMoves[]; // data/graphics/trainers/front_pic_coords.inc extern const struct MonCoords gTrainerFrontPicCoords[]; |