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

GetBattlerSpriteCoord and GetBattlerSpriteCoord2 using BATTLER_COORD_* constants

Browse Source
This commit is contained in:
Eduardo Quezada
2022-08-18 12:00:13 -04:00
parent 57374b796b
commit 5f81a9834f
21 changed files with 165 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_controller_link_opponent.c
+8 -7
View File
@@ -772,14 +772,14 @@ static void LinkOpponentHandleSetMonData(void)
u8 monToCheck;
u8 i;
if (!gBattleBufferA[gActiveBattler][2])
if (gBattleBufferA[gActiveBattler][2] == 0)
{
SetLinkOpponentMonData(gBattlerPartyIndexes[gActiveBattler]);
}
else
{
monToCheck = gBattleBufferA[gActiveBattler][2];
for (i = 0; i < PARTY_SIZE; ++i)
for (i = 0; i < PARTY_SIZE; i++)
{
if (monToCheck & 1)
SetLinkOpponentMonData(i);
@@ -1010,8 +1010,9 @@ static void LinkOpponentHandleSetRawMonData(void)
u8 *dst = (u8 *)&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
u8 i;
for (i = 0; i < gBattleBufferA[gActiveBattler][2]; ++i)
for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
dst[i] = gBattleBufferA[gActiveBattler][3 + i];
LinkOpponentBufferExecCompleted();
}
@@ -1022,10 +1023,10 @@ static void LinkOpponentHandleLoadMonSprite(void)
BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(gActiveBattler));
gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate,
GetBattlerSpriteCoord(gActiveBattler, 2),
GetBattlerSpriteCoord(gActiveBattler, BATTLER_COORD_X_2),
GetBattlerSpriteDefault_Y(gActiveBattler),
GetBattlerSpriteSubpriority(gActiveBattler));
gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -240;
gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -DISPLAY_WIDTH;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
@@ -1051,7 +1052,7 @@ static void StartSendOutAnim(u8 battlerId, bool8 dontClearSubstituteBit)
BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[battlerId]], battlerId);
SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(battlerId));
gBattlerSpriteIds[battlerId] = CreateSprite(&gMultiuseSpriteTemplate,
GetBattlerSpriteCoord(battlerId, 2),
GetBattlerSpriteCoord(battlerId, BATTLER_COORD_X_2),
GetBattlerSpriteDefault_Y(battlerId),
GetBattlerSpriteSubpriority(battlerId));
gSprites[gBattleControllerData[battlerId]].data[1] = gBattlerSpriteIds[battlerId];
@@ -1066,7 +1067,7 @@ static void StartSendOutAnim(u8 battlerId, bool8 dontClearSubstituteBit)
static void LinkOpponentHandleReturnMonToBall(void)
{
if (!gBattleBufferA[gActiveBattler][1])
if (gBattleBufferA[gActiveBattler][1] == 0)
{
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
gBattlerControllerFuncs[gActiveBattler] = DoSwitchOutAnimation;