atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Display the correct shadow size when sending out a new Pokemon (#5618)

Browse source
This commit is contained in:
Rachel 2024-10-30 10:09:54 -07:00 committed by GitHub
parent fa8e1782d0
commit 13a26c462e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/battle_gfx_sfx_util.c
View file

@ -26,6 +26,7 @@
#include "constants/rgb.h" #include "constants/rgb.h"
#include "constants/battle_palace.h" #include "constants/battle_palace.h"
#include "constants/battle_move_effects.h" #include "constants/battle_move_effects.h"
#include "constants/event_objects.h" // only for SHADOW_SIZE constants
// this file's functions // this file's functions
static u8 GetBattlePalaceMoveGroup(u8 battler, u16 move); static u8 GetBattlePalaceMoveGroup(u8 battler, u16 move);
@ -1130,8 +1131,9 @@ void SetBattlerSpriteAffineMode(u8 affineMode)
} }
} }
#define tBattlerId data[0] #define tBattlerId data[0]
#define tSpriteSide data[1] #define tSpriteSide data[1]
#define tBaseTileNum data[2]
#define SPRITE_SIDE_LEFT 0 #define SPRITE_SIDE_LEFT 0
#define SPRITE_SIDE_RIGHT 1 #define SPRITE_SIDE_RIGHT 1
@ -1152,7 +1154,8 @@ void CreateEnemyShadowSprite(u32 battler)
struct Sprite *sprite = &gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].shadowSpriteIdPrimary]; struct Sprite *sprite = &gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].shadowSpriteIdPrimary];
sprite->tBattlerId = battler; sprite->tBattlerId = battler;
sprite->tSpriteSide = SPRITE_SIDE_LEFT; sprite->tSpriteSide = SPRITE_SIDE_LEFT;
sprite->oam.tileNum += 8 * size; sprite->tBaseTileNum = sprite->oam.tileNum;
sprite->oam.tileNum = sprite->tBaseTileNum + (8 * size);
sprite->invisible = TRUE; sprite->invisible = TRUE;
} }
@ -1165,7 +1168,8 @@ void CreateEnemyShadowSprite(u32 battler)
struct Sprite *sprite = &gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].shadowSpriteIdSecondary]; struct Sprite *sprite = &gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].shadowSpriteIdSecondary];
sprite->tBattlerId = battler; sprite->tBattlerId = battler;
sprite->tSpriteSide = SPRITE_SIDE_RIGHT; sprite->tSpriteSide = SPRITE_SIDE_RIGHT;
sprite->oam.tileNum += (8 * size) + 4; sprite->tBaseTileNum = sprite->oam.tileNum + 4;
sprite->oam.tileNum = sprite->tBaseTileNum + (8 * size);
sprite->invisible = TRUE; sprite->invisible = TRUE;
} }
} }
@ -1179,6 +1183,7 @@ void CreateEnemyShadowSprite(u32 battler)
{ {
struct Sprite *sprite = &gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].shadowSpriteIdPrimary]; struct Sprite *sprite = &gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].shadowSpriteIdPrimary];
sprite->tBattlerId = battler; sprite->tBattlerId = battler;
sprite->tBaseTileNum = sprite->oam.tileNum;
sprite->invisible = TRUE; sprite->invisible = TRUE;
} }
} }
@ -1234,13 +1239,14 @@ void SpriteCB_EnemyShadow(struct Sprite *shadowSprite)
return; return;
} }
s8 xOffset = 0, yOffset = 0; s8 xOffset = 0, yOffset = 0, size = SHADOW_SIZE_S;
if (gAnimScriptActive || battlerSprite->invisible) if (gAnimScriptActive || battlerSprite->invisible)
invisible = TRUE; invisible = TRUE;
else if (transformSpecies != SPECIES_NONE) else if (transformSpecies != SPECIES_NONE)
{ {
xOffset = gSpeciesInfo[transformSpecies].enemyShadowXOffset; xOffset = gSpeciesInfo[transformSpecies].enemyShadowXOffset;
yOffset = gSpeciesInfo[transformSpecies].enemyShadowYOffset; yOffset = gSpeciesInfo[transformSpecies].enemyShadowYOffset;
size = gSpeciesInfo[transformSpecies].enemyShadowSize;
invisible = (B_ENEMY_MON_SHADOW_STYLE >= GEN_4 && P_GBA_STYLE_SPECIES_GFX == FALSE) invisible = (B_ENEMY_MON_SHADOW_STYLE >= GEN_4 && P_GBA_STYLE_SPECIES_GFX == FALSE)
? gSpeciesInfo[transformSpecies].suppressEnemyShadow ? gSpeciesInfo[transformSpecies].suppressEnemyShadow
@ -1251,6 +1257,7 @@ void SpriteCB_EnemyShadow(struct Sprite *shadowSprite)
u16 species = SanitizeSpeciesId(gBattleMons[battler].species); u16 species = SanitizeSpeciesId(gBattleMons[battler].species);
xOffset = gSpeciesInfo[species].enemyShadowXOffset + (shadowSprite->tSpriteSide == SPRITE_SIDE_LEFT ? -16 : 16); xOffset = gSpeciesInfo[species].enemyShadowXOffset + (shadowSprite->tSpriteSide == SPRITE_SIDE_LEFT ? -16 : 16);
yOffset = gSpeciesInfo[species].enemyShadowYOffset + 16; yOffset = gSpeciesInfo[species].enemyShadowYOffset + 16;
size = gSpeciesInfo[species].enemyShadowSize;
} }
else else
{ {
@ -1264,6 +1271,9 @@ void SpriteCB_EnemyShadow(struct Sprite *shadowSprite)
shadowSprite->x2 = battlerSprite->x2; shadowSprite->x2 = battlerSprite->x2;
shadowSprite->y = battlerSprite->y + yOffset; shadowSprite->y = battlerSprite->y + yOffset;
shadowSprite->invisible = invisible; shadowSprite->invisible = invisible;
if (B_ENEMY_MON_SHADOW_STYLE >= GEN_4 && P_GBA_STYLE_SPECIES_GFX == FALSE)
shadowSprite->oam.tileNum = shadowSprite->tBaseTileNum + (8 * size);
} }
#undef tBattlerId #undef tBattlerId