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

Merge pull request #503 from colonelsalt/document_transform

Browse Source 
Some documentation of transform types
This commit is contained in:
GriffinR
2022-05-13 05:17:42 -04:00
committed by GitHub
parent 6cf06255c0 1bca7cadc1
commit 0ef7307040
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/battle_gfx_sfx_util.h
+1 -1
View File
@@ -23,7 +23,7 @@ bool8 BattleInitAllSprites(u8 *state, u8 *battlerId);
void ClearSpritesHealthboxAnimData(void);
void CopyAllBattleSpritesInvisibilities(void);
void CopyBattleSpriteInvisibility(u8 battlerId);
void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 notTransform);
void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 transformType);
void BattleLoadSubstituteOrMonSpriteGfx(u8 battlerId, bool8 loadMonSprite);
void LoadBattleMonGfxAndAnimate(u8 battlerId, bool8 loadMonSprite, u8 spriteId);
void TrySetBehindSubstituteSpriteBit(u8 battlerId, u16 move);
src/battle_gfx_sfx_util.c
+4 -5
View File
@@ -650,7 +650,7 @@ void CopyBattleSpriteInvisibility(u8 battlerId)
gBattleSpritesDataPtr->battlerData[battlerId].invisible = gSprites[gBattlerSpriteIds[battlerId]].invisible;
}
void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 notTransform)
void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 transformType)
{
u16 paletteOffset, targetSpecies;
u32 personalityValue;
@@ -659,8 +659,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 notTransform)
const u32 *lzPaletteData;
void *buffer;
//TODO: notTransform is bool8 in pokeem. Document it with a more reasonable name here.
if (notTransform == 255)
if (transformType == 255) // Ghost unveiled with Silph Scope
{
const void *src;
void *dst;
@@ -688,7 +687,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 notTransform)
UpdateNickInHealthbox(gHealthboxSpriteIds[battlerAtk], &gEnemyParty[gBattlerPartyIndexes[battlerAtk]]);
TryAddPokeballIconToHealthbox(gHealthboxSpriteIds[battlerAtk], 1);
}
else if (notTransform)
else if (transformType) // Castform form change
{
StartSpriteAnim(&gSprites[gBattlerSpriteIds[battlerAtk]], gBattleSpritesDataPtr->animationData->animArg);
paletteOffset = 0x100 + battlerAtk * 16;
@@ -701,7 +700,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 notTransform)
}
gSprites[gBattlerSpriteIds[battlerAtk]].y = GetBattlerSpriteDefault_Y(battlerAtk);
}
else
else // Transform move
{
const void *src;
void *dst;