Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim
This commit is contained in:
+8
-13
@@ -20,10 +20,6 @@ struct MonCoords
|
||||
|
||||
extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
|
||||
extern const u8 gMoveNames[][13];
|
||||
extern const u16 gUnknown_8251CB8[];
|
||||
extern const u16 gUnknown_8251FEE[];
|
||||
extern const u16 gUnknown_8252324[];
|
||||
extern const u16 gUnknown_82539D4[];
|
||||
|
||||
extern const u8 gTrainerClassNames[][13];
|
||||
|
||||
@@ -36,6 +32,7 @@ extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
|
||||
extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
|
||||
extern const struct MonCoords gTrainerFrontPicCoords[];
|
||||
extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
|
||||
extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
|
||||
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
|
||||
extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[];
|
||||
extern const struct MonCoords gTrainerBackPicCoords[];
|
||||
@@ -49,15 +46,13 @@ extern const u8 gEnemyMonElevation[NUM_SPECIES];
|
||||
extern const u8 *const gBattleAnims_General[];
|
||||
extern const u8 *const gBattleAnims_Special[];
|
||||
|
||||
extern const struct OamData gUnknown_824F010;
|
||||
extern const struct OamData gUnknown_824F018;
|
||||
extern const union AnimCmd *const gSpriteAnimTable_82349BC[];
|
||||
extern const union AffineAnimCmd *const gSpriteAffineAnimTable_BattlerPlayer[];
|
||||
extern const union AffineAnimCmd *const gSpriteAffineAnimTable_BattlerOpponent[];
|
||||
extern const struct SpriteFrameImage gSpriteImages_BattlerPlayerLeft[];
|
||||
extern const struct SpriteFrameImage gSpriteImages_BattlerOpponentLeft[];
|
||||
extern const struct SpriteFrameImage gSpriteImages_BattlerPlayerRight[];
|
||||
extern const struct SpriteFrameImage gSpriteImages_BattlerOpponentRight[];
|
||||
extern const union AnimCmd *const gAnims_MonPic[];
|
||||
extern const union AffineAnimCmd *const gAffineAnims_BattleSpritePlayerSide[];
|
||||
extern const union AffineAnimCmd *const gAffineAnims_BattleSpriteOpponentSide[];
|
||||
extern const struct SpriteFrameImage gBattlerPicTable_PlayerLeft[];
|
||||
extern const struct SpriteFrameImage gBattlerPicTable_OpponentLeft[];
|
||||
extern const struct SpriteFrameImage gBattlerPicTable_PlayerRight[];
|
||||
extern const struct SpriteFrameImage gBattlerPicTable_OpponentRight[];
|
||||
extern const struct SpriteFrameImage gTrainerBackPicTable_Red[];
|
||||
extern const struct SpriteFrameImage gTrainerBackPicTable_Leaf[];
|
||||
extern const struct SpriteFrameImage gTrainerBackPicTable_Pokedude[];
|
||||
|
||||
Reference in New Issue
Block a user