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
src/pokemon.c
+16 -16
View File
@@ -1473,8 +1473,8 @@ const struct SpriteTemplate gSpriteTemplates_Battlers[] =
.paletteTag = 0,
.oam = &gOamData_BattlerPlayer,
.anims = NULL,
.images = gSpriteImages_BattlerPlayerLeft,
.affineAnims = gSpriteAffineAnimTable_BattlerPlayer,
.images = gBattlerPicTable_PlayerLeft,
.affineAnims = gAffineAnims_BattleSpritePlayerSide,
.callback = SpriteCB_AllyMon,
},
[B_POSITION_OPPONENT_LEFT] = {
@@ -1482,8 +1482,8 @@ const struct SpriteTemplate gSpriteTemplates_Battlers[] =
.paletteTag = 0,
.oam = &gOamData_BattlerOpponent,
.anims = NULL,
.images = gSpriteImages_BattlerOpponentLeft,
.affineAnims = gSpriteAffineAnimTable_BattlerOpponent,
.images = gBattlerPicTable_OpponentLeft,
.affineAnims = gAffineAnims_BattleSpriteOpponentSide,
.callback = SpriteCB_EnemyMon,
},
[B_POSITION_PLAYER_RIGHT] = {
@@ -1491,8 +1491,8 @@ const struct SpriteTemplate gSpriteTemplates_Battlers[] =
.paletteTag = 0,
.oam = &gOamData_BattlerPlayer,
.anims = NULL,
.images = gSpriteImages_BattlerPlayerRight,
.affineAnims = gSpriteAffineAnimTable_BattlerPlayer,
.images = gBattlerPicTable_PlayerRight,
.affineAnims = gAffineAnims_BattleSpritePlayerSide,
.callback = SpriteCB_AllyMon,
},
[B_POSITION_OPPONENT_RIGHT] = {
@@ -1500,8 +1500,8 @@ const struct SpriteTemplate gSpriteTemplates_Battlers[] =
.paletteTag = 0,
.oam = &gOamData_BattlerOpponent,
.anims = NULL,
.images = gSpriteImages_BattlerOpponentRight,
.affineAnims = gSpriteAffineAnimTable_BattlerOpponent,
.images = gBattlerPicTable_OpponentRight,
.affineAnims = gAffineAnims_BattleSpriteOpponentSide,
.callback = SpriteCB_EnemyMon,
},
};
@@ -1514,7 +1514,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
.oam = &gOamData_BattlerPlayer,
.anims = NULL,
.images = gTrainerBackPicTable_Red,
.affineAnims = gSpriteAffineAnimTable_BattlerPlayer,
.affineAnims = gAffineAnims_BattleSpritePlayerSide,
.callback = SpriteCB_AllyMon,
},
{
@@ -1523,7 +1523,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
.oam = &gOamData_BattlerPlayer,
.anims = NULL,
.images = gTrainerBackPicTable_Leaf,
.affineAnims = gSpriteAffineAnimTable_BattlerPlayer,
.affineAnims = gAffineAnims_BattleSpritePlayerSide,
.callback = SpriteCB_AllyMon,
},
{
@@ -1532,7 +1532,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
.oam = &gOamData_BattlerPlayer,
.anims = NULL,
.images = gTrainerBackPicTable_RSBrendan,
.affineAnims = gSpriteAffineAnimTable_BattlerPlayer,
.affineAnims = gAffineAnims_BattleSpritePlayerSide,
.callback = SpriteCB_AllyMon,
},
{
@@ -1541,7 +1541,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
.oam = &gOamData_BattlerPlayer,
.anims = NULL,
.images = gTrainerBackPicTable_RSMay,
.affineAnims = gSpriteAffineAnimTable_BattlerPlayer,
.affineAnims = gAffineAnims_BattleSpritePlayerSide,
.callback = SpriteCB_AllyMon,
},
{
@@ -1550,7 +1550,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
.oam = &gOamData_BattlerPlayer,
.anims = NULL,
.images = gTrainerBackPicTable_Pokedude,
.affineAnims = gSpriteAffineAnimTable_BattlerPlayer,
.affineAnims = gAffineAnims_BattleSpritePlayerSide,
.callback = SpriteCB_AllyMon,
},
{
@@ -1559,7 +1559,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
.oam = &gOamData_BattlerPlayer,
.anims = NULL,
.images = gTrainerBackPicTable_OldMan,
.affineAnims = gSpriteAffineAnimTable_BattlerPlayer,
.affineAnims = gAffineAnims_BattleSpritePlayerSide,
.callback = SpriteCB_AllyMon,
},
};
@@ -2747,7 +2747,7 @@ void SetMultiuseSpriteTemplateToPokemon(u16 speciesTag, u8 battlerPosition)
}
}
gMultiuseSpriteTemplate.paletteTag = speciesTag;
gMultiuseSpriteTemplate.anims = gSpriteAnimTable_82349BC;
gMultiuseSpriteTemplate.anims = gAnims_MonPic;
}
void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosition)
@@ -6125,7 +6125,7 @@ static void OakSpeechNidoranFSetupTemplateDummy(struct OakSpeechNidoranFStruct *
for (j = 0; j < structPtr->frameCount; ++j)
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].anims = gSpriteAnimTable_82349BC;
structPtr->templates[i].anims = gAnims_MonPic;
structPtr->templates[i].paletteTag = i;
}
}