dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #536 from GriffinRichards/sync-data

Browse Source 
Sync data.c
This commit is contained in:
GriffinR
2022-08-17 11:36:07 -04:00
committed by GitHub
parent 5dc80c492a 874f1c9832
commit 56f8b1a47c
5 changed files with 429 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/data.h
+8 -13
View File
@@ -16,10 +16,6 @@ struct MonCoords
extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
extern const u8 gMoveNames[][13]; 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]; extern const u8 gTrainerClassNames[][13];
@@ -32,6 +28,7 @@ extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[]; extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
extern const struct MonCoords gTrainerFrontPicCoords[]; extern const struct MonCoords gTrainerFrontPicCoords[];
extern const struct CompressedSpriteSheet gTrainerFrontPicTable[]; extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[]; extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[];
extern const struct MonCoords gTrainerBackPicCoords[]; extern const struct MonCoords gTrainerBackPicCoords[];
@@ -45,15 +42,13 @@ extern const u8 gEnemyMonElevation[NUM_SPECIES];
extern const u8 *const gBattleAnims_General[]; extern const u8 *const gBattleAnims_General[];
extern const u8 *const gBattleAnims_Special[]; extern const u8 *const gBattleAnims_Special[];
extern const struct OamData gUnknown_824F010; extern const union AnimCmd *const gAnims_MonPic[];
extern const struct OamData gUnknown_824F018; extern const union AffineAnimCmd *const gAffineAnims_BattleSpritePlayerSide[];
extern const union AnimCmd *const gSpriteAnimTable_82349BC[]; extern const union AffineAnimCmd *const gAffineAnims_BattleSpriteOpponentSide[];
extern const union AffineAnimCmd *const gSpriteAffineAnimTable_BattlerPlayer[]; extern const struct SpriteFrameImage gBattlerPicTable_PlayerLeft[];
extern const union AffineAnimCmd *const gSpriteAffineAnimTable_BattlerOpponent[]; extern const struct SpriteFrameImage gBattlerPicTable_OpponentLeft[];
extern const struct SpriteFrameImage gSpriteImages_BattlerPlayerLeft[]; extern const struct SpriteFrameImage gBattlerPicTable_PlayerRight[];
extern const struct SpriteFrameImage gSpriteImages_BattlerOpponentLeft[]; extern const struct SpriteFrameImage gBattlerPicTable_OpponentRight[];
extern const struct SpriteFrameImage gSpriteImages_BattlerPlayerRight[];
extern const struct SpriteFrameImage gSpriteImages_BattlerOpponentRight[];
extern const struct SpriteFrameImage gTrainerBackPicTable_Red[]; extern const struct SpriteFrameImage gTrainerBackPicTable_Red[];
extern const struct SpriteFrameImage gTrainerBackPicTable_Leaf[]; extern const struct SpriteFrameImage gTrainerBackPicTable_Leaf[];
extern const struct SpriteFrameImage gTrainerBackPicTable_Pokedude[]; extern const struct SpriteFrameImage gTrainerBackPicTable_Pokedude[];
src/data.c
+107 -100
View File
@@ -8,36 +8,38 @@
#include "constants/battle_ai.h" #include "constants/battle_ai.h"
#include "constants/trainers.h" #include "constants/trainers.h"
const struct SpriteFrameImage gSpriteImages_BattlerPlayerLeft[] = #define BATTLER_OFFSET(i) (gHeap + 0x8000 + MON_PIC_SIZE * (i))
const struct SpriteFrameImage gBattlerPicTable_PlayerLeft[] =
{ {
gHeap + 0x8000, 0x800, BATTLER_OFFSET(0), MON_PIC_SIZE,
gHeap + 0x8800, 0x800, BATTLER_OFFSET(1), MON_PIC_SIZE,
gHeap + 0x9000, 0x800, BATTLER_OFFSET(2), MON_PIC_SIZE,
gHeap + 0x9800, 0x800, BATTLER_OFFSET(3), MON_PIC_SIZE,
}; };
const struct SpriteFrameImage gSpriteImages_BattlerOpponentLeft[] = const struct SpriteFrameImage gBattlerPicTable_OpponentLeft[] =
{ {
gHeap + 0xA000, 0x800, BATTLER_OFFSET(4), MON_PIC_SIZE,
gHeap + 0xA800, 0x800, BATTLER_OFFSET(5), MON_PIC_SIZE,
gHeap + 0xB000, 0x800, BATTLER_OFFSET(6), MON_PIC_SIZE,
gHeap + 0xB800, 0x800, BATTLER_OFFSET(7), MON_PIC_SIZE,
}; };
const struct SpriteFrameImage gSpriteImages_BattlerPlayerRight[] = const struct SpriteFrameImage gBattlerPicTable_PlayerRight[] =
{ {
gHeap + 0xC000, 0x800, BATTLER_OFFSET(8), MON_PIC_SIZE,
gHeap + 0xC800, 0x800, BATTLER_OFFSET(9), MON_PIC_SIZE,
gHeap + 0xD000, 0x800, BATTLER_OFFSET(10), MON_PIC_SIZE,
gHeap + 0xD800, 0x800, BATTLER_OFFSET(11), MON_PIC_SIZE,
}; };
const struct SpriteFrameImage gSpriteImages_BattlerOpponentRight[] = const struct SpriteFrameImage gBattlerPicTable_OpponentRight[] =
{ {
gHeap + 0xE000, 0x800, BATTLER_OFFSET(12), MON_PIC_SIZE,
gHeap + 0xE800, 0x800, BATTLER_OFFSET(13), MON_PIC_SIZE,
gHeap + 0xF000, 0x800, BATTLER_OFFSET(14), MON_PIC_SIZE,
gHeap + 0xF800, 0x800, BATTLER_OFFSET(15), MON_PIC_SIZE,
}; };
const struct SpriteFrameImage gTrainerBackPicTable_Red[] = const struct SpriteFrameImage gTrainerBackPicTable_Red[] =
@@ -102,172 +104,177 @@ static const union AnimCmd sAnim_GeneralFrame3[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AffineAnimCmd gSpriteAffineAnim_82347F8[] = // Many of these affine anims seem to go unused, and
// instead SetSpriteRotScale is used to manipulate
// the battler sprites directly (for instance, in AnimTask_SwitchOutShrinkMon).
// Those with explicit indexes are referenced elsewhere.
static const union AffineAnimCmd sAffineAnim_Battler_Normal[] =
{ {
AFFINEANIMCMD_FRAME(0x0100, 0x0100, 0x00, 0x00), AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gSpriteAffineAnim_8234808[] = static const union AffineAnimCmd sAffineAnim_Battler_Flipped[] =
{ {
AFFINEANIMCMD_FRAME(0xff00, 0x0100, 0x00, 0x00), AFFINEANIMCMD_FRAME(-0x100, 0x0100, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gSpriteAffineAnim_8234818[] = static const union AffineAnimCmd sAffineAnim_Battler_Emerge[] =
{ {
AFFINEANIMCMD_FRAME(0x0028, 0x0028, 0x00, 0x00), AFFINEANIMCMD_FRAME(0x28, 0x28, 0, 0),
AFFINEANIMCMD_FRAME(0x0012, 0x0012, 0x00, 0x0c), AFFINEANIMCMD_FRAME(0x12, 0x12, 0, 12),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gSpriteAffineAnim_8234830[] = static const union AffineAnimCmd sAffineAnim_Battler_Return[] =
{ {
AFFINEANIMCMD_FRAME(0xfffe, 0xfffe, 0x00, 0x12), AFFINEANIMCMD_FRAME(-0x2, -0x2, 0, 18),
AFFINEANIMCMD_FRAME(0xfff0, 0xfff0, 0x00, 0x0f), AFFINEANIMCMD_FRAME(-0x10, -0x10, 0, 15),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gSpriteAffineAnim_8234848[] = static const union AffineAnimCmd sAffineAnim_Battler_HorizontalSquishLoop[] =
{ {
AFFINEANIMCMD_FRAME(0x00a0, 0x0100, 0x00, 0x00), AFFINEANIMCMD_FRAME(0xA0, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(0x0004, 0x0000, 0x00, 0x08), AFFINEANIMCMD_FRAME( 0x4, 0x0, 0, 8),
AFFINEANIMCMD_FRAME(0xfffc, 0x0000, 0x00, 0x08), AFFINEANIMCMD_FRAME(-0x4, 0x0, 0, 8),
AFFINEANIMCMD_JUMP(1), AFFINEANIMCMD_JUMP(1),
}; };
static const union AffineAnimCmd gSpriteAffineAnim_8234868[] = static const union AffineAnimCmd sAffineAnim_Battler_Grow[] =
{ {
AFFINEANIMCMD_FRAME(0x0002, 0x0002, 0x00, 0x14), AFFINEANIMCMD_FRAME(0x2, 0x2, 0, 20),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gSpriteAffineAnim_8234878[] = static const union AffineAnimCmd sAffineAnim_Battler_Shrink[] =
{ {
AFFINEANIMCMD_FRAME(0xfffe, 0xfffe, 0x00, 0x14), AFFINEANIMCMD_FRAME(-0x2, -0x2, 0, 20),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gSpriteAffineAnim_8234888[] = static const union AffineAnimCmd sAffineAnim_Battler_BigToSmall[] =
{ {
AFFINEANIMCMD_FRAME(0x0100, 0x0100, 0x00, 0000), AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(0xfff0, 0xfff0, 0x00, 0x09), AFFINEANIMCMD_FRAME(-0x10, -0x10, 0, 9),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gSpriteAffineAnim_82348A0[] = static const union AffineAnimCmd sAffineAnim_Battler_GrowLarge[] =
{ {
AFFINEANIMCMD_FRAME(0x0004, 0x0004, 0x00, 0x3f), AFFINEANIMCMD_FRAME(0x4, 0x4, 0, 63),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gSpriteAffineAnim_82348B0[] = static const union AffineAnimCmd sAffineAnim_Battler_TipRight[] =
{ {
AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0xfd, 0x05), AFFINEANIMCMD_FRAME(0x0, 0x0, -3, 5),
AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x03, 0x05), AFFINEANIMCMD_FRAME(0x0, 0x0, 3, 5),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd *const gSpriteAffineAnimTable_BattlerPlayer[] = const union AffineAnimCmd *const gAffineAnims_BattleSpritePlayerSide[] =
{ {
gSpriteAffineAnim_82347F8, [BATTLER_AFFINE_NORMAL] = sAffineAnim_Battler_Normal,
gSpriteAffineAnim_8234818, [BATTLER_AFFINE_EMERGE] = sAffineAnim_Battler_Emerge,
gSpriteAffineAnim_8234830, [BATTLER_AFFINE_RETURN] = sAffineAnim_Battler_Return,
gSpriteAffineAnim_8234848, sAffineAnim_Battler_HorizontalSquishLoop,
gSpriteAffineAnim_8234868, sAffineAnim_Battler_Grow,
gSpriteAffineAnim_8234878, sAffineAnim_Battler_Shrink,
gSpriteAffineAnim_82348A0, sAffineAnim_Battler_GrowLarge,
gSpriteAffineAnim_82348B0, sAffineAnim_Battler_TipRight,
gSpriteAffineAnim_8234888, sAffineAnim_Battler_BigToSmall,
}; };
static const union AffineAnimCmd gSpriteAffineAnim_82348EC[] = static const union AffineAnimCmd sAffineAnim_Battler_SpinShrink[] =
{ {
AFFINEANIMCMD_FRAME(0xfffc, 0xfffc, 0x04, 0x3f), AFFINEANIMCMD_FRAME(-0x4, -0x4, 4, 63),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gSpriteAffineAnim_82348FC[] = static const union AffineAnimCmd sAffineAnim_Battler_TipLeft[] =
{ {
AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x03, 0x05), AFFINEANIMCMD_FRAME(0x0, 0x0, 3, 5),
AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0xfd, 0x05), AFFINEANIMCMD_FRAME(0x0, 0x0, -3, 5),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gSpriteAffineAnim_8234914[] = static const union AffineAnimCmd sAffineAnim_Battler_RotateUpAndBack[] =
{ {
AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0xfb, 0x14), AFFINEANIMCMD_FRAME(0x0, 0x0, -5, 20),
AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x00, 0x14), AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 20),
AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x05, 0x14), AFFINEANIMCMD_FRAME(0x0, 0x0, 5, 20),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gSpriteAffineAnim_8234934[] = static const union AffineAnimCmd sAffineAnim_Battler_Spin[] =
{ {
AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x09, 0x6e), AFFINEANIMCMD_FRAME(0x0, 0x0, 9, 110),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
const union AffineAnimCmd *const gSpriteAffineAnimTable_BattlerOpponent[] = const union AffineAnimCmd *const gAffineAnims_BattleSpriteOpponentSide[] =
{ {
gSpriteAffineAnim_82347F8, [BATTLER_AFFINE_NORMAL] = sAffineAnim_Battler_Normal,
gSpriteAffineAnim_8234818, [BATTLER_AFFINE_EMERGE] = sAffineAnim_Battler_Emerge,
gSpriteAffineAnim_8234830, [BATTLER_AFFINE_RETURN] = sAffineAnim_Battler_Return,
gSpriteAffineAnim_8234848, sAffineAnim_Battler_HorizontalSquishLoop,
gSpriteAffineAnim_8234868, sAffineAnim_Battler_Grow,
gSpriteAffineAnim_8234878, sAffineAnim_Battler_Shrink,
gSpriteAffineAnim_82348EC, sAffineAnim_Battler_SpinShrink,
gSpriteAffineAnim_82348FC, sAffineAnim_Battler_TipLeft,
gSpriteAffineAnim_8234914, sAffineAnim_Battler_RotateUpAndBack,
gSpriteAffineAnim_8234888, sAffineAnim_Battler_BigToSmall,
gSpriteAffineAnim_8234934, sAffineAnim_Battler_Spin,
}; };
const union AffineAnimCmd *const gSpriteAffineAnimTable_82349470[] = const union AffineAnimCmd *const gAffineAnims_BattleSpriteContest[] =
{ {
gSpriteAffineAnim_8234808, [BATTLER_AFFINE_NORMAL] = sAffineAnim_Battler_Flipped,
gSpriteAffineAnim_8234818, [BATTLER_AFFINE_EMERGE] = sAffineAnim_Battler_Emerge,
gSpriteAffineAnim_8234830, [BATTLER_AFFINE_RETURN] = sAffineAnim_Battler_Return,
gSpriteAffineAnim_8234848, sAffineAnim_Battler_HorizontalSquishLoop,
gSpriteAffineAnim_8234868, sAffineAnim_Battler_Grow,
gSpriteAffineAnim_8234878, sAffineAnim_Battler_Shrink,
gSpriteAffineAnim_82348EC, sAffineAnim_Battler_SpinShrink,
gSpriteAffineAnim_82348FC, sAffineAnim_Battler_TipLeft,
gSpriteAffineAnim_8234914, sAffineAnim_Battler_RotateUpAndBack,
gSpriteAffineAnim_8234888, sAffineAnim_Battler_BigToSmall,
gSpriteAffineAnim_8234934, sAffineAnim_Battler_Spin,
}; };
static const union AnimCmd gSpriteAnim_823499C[] = static const union AnimCmd sAnim_MonPic_0[] =
{ {
ANIMCMD_FRAME(0, 0), ANIMCMD_FRAME(0, 0),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gSpriteAnim_82349A4[] = static const union AnimCmd sAnim_MonPic_1[] =
{ {
ANIMCMD_FRAME(1, 0), ANIMCMD_FRAME(1, 0),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gSpriteAnim_82349AC[] = static const union AnimCmd sAnim_MonPic_2[] =
{ {
ANIMCMD_FRAME(2, 0), ANIMCMD_FRAME(2, 0),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd gSpriteAnim_82349B4[] = static const union AnimCmd sAnim_MonPic_3[] =
{ {
ANIMCMD_FRAME(3, 0), ANIMCMD_FRAME(3, 0),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gSpriteAnimTable_82349BC[] = const union AnimCmd *const gAnims_MonPic[] =
{ {
gSpriteAnim_823499C, sAnim_MonPic_0,
gSpriteAnim_82349A4, sAnim_MonPic_1,
gSpriteAnim_82349AC, sAnim_MonPic_2,
gSpriteAnim_82349B4, sAnim_MonPic_3,
}; };
#define SPECIES_SPRITE(species, sprite) [SPECIES_##species] = {sprite, 0x800, SPECIES_##species} #define SPECIES_SPRITE(species, sprite) [SPECIES_##species] = {sprite, 0x800, SPECIES_##species}
src/data/trainer_graphics/front_pic_anims.h
+296 -296
View File
File diff suppressed because it is too large Load Diff
src/pokemon.c
+16 -16
View File
@@ -1473,8 +1473,8 @@ const struct SpriteTemplate gSpriteTemplates_Battlers[] =
.paletteTag = 0, .paletteTag = 0,
.oam = &gOamData_BattlerPlayer, .oam = &gOamData_BattlerPlayer,
.anims = NULL, .anims = NULL,
.images = gSpriteImages_BattlerPlayerLeft, .images = gBattlerPicTable_PlayerLeft,
.affineAnims = gSpriteAffineAnimTable_BattlerPlayer, .affineAnims = gAffineAnims_BattleSpritePlayerSide,
.callback = SpriteCB_AllyMon, .callback = SpriteCB_AllyMon,
}, },
[B_POSITION_OPPONENT_LEFT] = { [B_POSITION_OPPONENT_LEFT] = {
@@ -1482,8 +1482,8 @@ const struct SpriteTemplate gSpriteTemplates_Battlers[] =
.paletteTag = 0, .paletteTag = 0,
.oam = &gOamData_BattlerOpponent, .oam = &gOamData_BattlerOpponent,
.anims = NULL, .anims = NULL,
.images = gSpriteImages_BattlerOpponentLeft, .images = gBattlerPicTable_OpponentLeft,
.affineAnims = gSpriteAffineAnimTable_BattlerOpponent, .affineAnims = gAffineAnims_BattleSpriteOpponentSide,
.callback = SpriteCB_EnemyMon, .callback = SpriteCB_EnemyMon,
}, },
[B_POSITION_PLAYER_RIGHT] = { [B_POSITION_PLAYER_RIGHT] = {
@@ -1491,8 +1491,8 @@ const struct SpriteTemplate gSpriteTemplates_Battlers[] =
.paletteTag = 0, .paletteTag = 0,
.oam = &gOamData_BattlerPlayer, .oam = &gOamData_BattlerPlayer,
.anims = NULL, .anims = NULL,
.images = gSpriteImages_BattlerPlayerRight, .images = gBattlerPicTable_PlayerRight,
.affineAnims = gSpriteAffineAnimTable_BattlerPlayer, .affineAnims = gAffineAnims_BattleSpritePlayerSide,
.callback = SpriteCB_AllyMon, .callback = SpriteCB_AllyMon,
}, },
[B_POSITION_OPPONENT_RIGHT] = { [B_POSITION_OPPONENT_RIGHT] = {
@@ -1500,8 +1500,8 @@ const struct SpriteTemplate gSpriteTemplates_Battlers[] =
.paletteTag = 0, .paletteTag = 0,
.oam = &gOamData_BattlerOpponent, .oam = &gOamData_BattlerOpponent,
.anims = NULL, .anims = NULL,
.images = gSpriteImages_BattlerOpponentRight, .images = gBattlerPicTable_OpponentRight,
.affineAnims = gSpriteAffineAnimTable_BattlerOpponent, .affineAnims = gAffineAnims_BattleSpriteOpponentSide,
.callback = SpriteCB_EnemyMon, .callback = SpriteCB_EnemyMon,
}, },
}; };
@@ -1514,7 +1514,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
.oam = &gOamData_BattlerPlayer, .oam = &gOamData_BattlerPlayer,
.anims = NULL, .anims = NULL,
.images = gTrainerBackPicTable_Red, .images = gTrainerBackPicTable_Red,
.affineAnims = gSpriteAffineAnimTable_BattlerPlayer, .affineAnims = gAffineAnims_BattleSpritePlayerSide,
.callback = SpriteCB_AllyMon, .callback = SpriteCB_AllyMon,
}, },
{ {
@@ -1523,7 +1523,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
.oam = &gOamData_BattlerPlayer, .oam = &gOamData_BattlerPlayer,
.anims = NULL, .anims = NULL,
.images = gTrainerBackPicTable_Leaf, .images = gTrainerBackPicTable_Leaf,
.affineAnims = gSpriteAffineAnimTable_BattlerPlayer, .affineAnims = gAffineAnims_BattleSpritePlayerSide,
.callback = SpriteCB_AllyMon, .callback = SpriteCB_AllyMon,
}, },
{ {
@@ -1532,7 +1532,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
.oam = &gOamData_BattlerPlayer, .oam = &gOamData_BattlerPlayer,
.anims = NULL, .anims = NULL,
.images = gTrainerBackPicTable_RSBrendan, .images = gTrainerBackPicTable_RSBrendan,
.affineAnims = gSpriteAffineAnimTable_BattlerPlayer, .affineAnims = gAffineAnims_BattleSpritePlayerSide,
.callback = SpriteCB_AllyMon, .callback = SpriteCB_AllyMon,
}, },
{ {
@@ -1541,7 +1541,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
.oam = &gOamData_BattlerPlayer, .oam = &gOamData_BattlerPlayer,
.anims = NULL, .anims = NULL,
.images = gTrainerBackPicTable_RSMay, .images = gTrainerBackPicTable_RSMay,
.affineAnims = gSpriteAffineAnimTable_BattlerPlayer, .affineAnims = gAffineAnims_BattleSpritePlayerSide,
.callback = SpriteCB_AllyMon, .callback = SpriteCB_AllyMon,
}, },
{ {
@@ -1550,7 +1550,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
.oam = &gOamData_BattlerPlayer, .oam = &gOamData_BattlerPlayer,
.anims = NULL, .anims = NULL,
.images = gTrainerBackPicTable_Pokedude, .images = gTrainerBackPicTable_Pokedude,
.affineAnims = gSpriteAffineAnimTable_BattlerPlayer, .affineAnims = gAffineAnims_BattleSpritePlayerSide,
.callback = SpriteCB_AllyMon, .callback = SpriteCB_AllyMon,
}, },
{ {
@@ -1559,7 +1559,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
.oam = &gOamData_BattlerPlayer, .oam = &gOamData_BattlerPlayer,
.anims = NULL, .anims = NULL,
.images = gTrainerBackPicTable_OldMan, .images = gTrainerBackPicTable_OldMan,
.affineAnims = gSpriteAffineAnimTable_BattlerPlayer, .affineAnims = gAffineAnims_BattleSpritePlayerSide,
.callback = SpriteCB_AllyMon, .callback = SpriteCB_AllyMon,
}, },
}; };
@@ -2747,7 +2747,7 @@ void SetMultiuseSpriteTemplateToPokemon(u16 speciesTag, u8 battlerPosition)
} }
} }
gMultiuseSpriteTemplate.paletteTag = speciesTag; gMultiuseSpriteTemplate.paletteTag = speciesTag;
gMultiuseSpriteTemplate.anims = gSpriteAnimTable_82349BC; gMultiuseSpriteTemplate.anims = gAnims_MonPic;
} }
void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosition) void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosition)
@@ -6125,7 +6125,7 @@ static void OakSpeechNidoranFSetupTemplateDummy(struct OakSpeechNidoranFStruct *
for (j = 0; j < structPtr->frameCount; ++j) for (j = 0; j < structPtr->frameCount; ++j)
structPtr->frameImages[i * structPtr->spriteCount + j].data = &structPtr->bufferPtrs[i][j * 0x800]; structPtr->frameImages[i * structPtr->spriteCount + j].data = &structPtr->bufferPtrs[i][j * 0x800];
structPtr->templates[i].images = &structPtr->frameImages[i * structPtr->spriteCount]; // should be frameCount logically structPtr->templates[i].images = &structPtr->frameImages[i * structPtr->spriteCount]; // should be frameCount logically
structPtr->templates[i].anims = gSpriteAnimTable_82349BC; structPtr->templates[i].anims = gAnims_MonPic;
structPtr->templates[i].paletteTag = i; structPtr->templates[i].paletteTag = i;
} }
} }
src/trainer_pokemon_sprites.c
+2 -11
View File
@@ -1,16 +1,7 @@
#include "global.h" #include "global.h"
#include "gflib.h" #include "gflib.h"
#include "decompress.h" #include "decompress.h"
#include "data.h"
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const struct CompressedSpriteSheet gMonBackPicTable[];
extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const union AnimCmd *const gSpriteAnimTable_82349BC[];
extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
// Static type declarations
struct PicData struct PicData
{ {
@@ -131,7 +122,7 @@ void LoadPicPaletteBySlot(u16 species, u32 otId, u32 personality, u8 paletteSlot
void AssignSpriteAnimsTable(bool8 isTrainer) void AssignSpriteAnimsTable(bool8 isTrainer)
{ {
if (!isTrainer) if (!isTrainer)
sCreatingSpriteTemplate.anims = gSpriteAnimTable_82349BC; sCreatingSpriteTemplate.anims = gAnims_MonPic;
else else
sCreatingSpriteTemplate.anims = gTrainerFrontAnimsPtrTable[0]; sCreatingSpriteTemplate.anims = gTrainerFrontAnimsPtrTable[0];
} }