Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-10-01 05:51:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve some PokemonSprite names

Browse Source
This commit is contained in:
RavePossum
2025-03-03 13:51:32 -05:00
parent cb30afbe26
commit bf5ac11a52
6 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
include/pokemon_sprite.h
View File

@@ -18,17 +18,17 @@ enum PokemonSpriteAttribute {
MON_SPRITE_X_OFFSET,
MON_SPRITE_Y_OFFSET,
MON_SPRITE_Z_OFFSET,
MON_SPRITE_HAS_VANISHED,
MON_SPRITE_HIDE,
MON_SPRITE_ROTATION_X,
MON_SPRITE_ROTATION_Y,
MON_SPRITE_ROTATION_Z,
MON_SPRITE_X_PIVOT,
MON_SPRITE_Y_PIVOT,
MON_SPRITE_AFFINE_WIDTH,
MON_SPRITE_AFFINE_HEIGHT,
MON_SPRITE_SCALE_X,
MON_SPRITE_SCALE_Y,
MON_SPRITE_VISIBLE,
MON_SPRITE_X_OFFSET_2,
MON_SPRITE_Y_OFFSET_2,
MON_SPRITE_TEXTURE_X_OFFSET,
MON_SPRITE_TEXTURE_Y_OFFSET,
MON_SPRITE_WIDTH,
MON_SPRITE_HEIGHT,
MON_SPRITE_SHADOW_X,
@@ -49,14 +49,14 @@ enum PokemonSpriteAttribute {
MON_SPRITE_FADE_DELAY_COUNTER,
MON_SPRITE_FLIP_H,
MON_SPRITE_FLIP_V,
MON_SPRITE_HIDE,
MON_SPRITE_HIDE_2,
MON_SPRITE_CURR_SPRITE_FRAME,
MON_SPRITE_DUMMY,
MON_SPRITE_MOSAIC_INTENSITY,
MON_SPRITE_SHADOW_HEIGHT,
MON_SPRITE_SHADOW_PLTT_SLOT,
MON_SPRITE_SHADOW_SHOULD_ADJUST_X,
MON_SPRITE_SHADOW_SHOULD_ADJUST_Y,
MON_SPRITE_SHADOW_SHOULD_FOLLOW_X,
MON_SPRITE_SHADOW_SHOULD_FOLLOW_Y,
MON_SPRITE_SHADOW_IS_AFFINE,
MON_SPRITE_SHADOW_SIZE,
};
@@ -84,16 +84,16 @@ struct PokemonSpriteTransforms {
s16 xOffset;
s16 yOffset;
int zOffset;
s16 affineWidth;
s16 affineHeight;
s16 scaleX; // 256 is the normal scale. Smaller values than 256 shrink; higher ones stretch. Negative values flip the sprite.
s16 scaleY;
u16 rotationX;
u16 rotationY;
u16 rotationZ;
u16 padding_1A;
s16 xPivot;
s16 yPivot;
u8 xOffset2;
u8 yOffset2;
u8 textureXOffset;
u8 textureYOffset;
u8 width;
u8 height;
u8 fadeInitAlpha;
@@ -108,13 +108,13 @@ struct PokemonSpriteTransforms {
u32 ambientG : 5;
u32 ambientB : 5;
u32 padding_2C_30 : 2;
u32 hasVanished : 1;
u32 hide : 1;
u32 visible : 1;
u32 alpha : 5;
u32 padding_30_07 : 2;
u32 flipH : 1;
u32 flipV : 1;
u32 hide : 1;
u32 hide2 : 1; // It's unclear why there are 2 members that do the same thing. (3 if you count visible which is the same but with states flipped)
u32 fadeActive : 1;
u32 mosaicIntensity : 4;
u32 padding_30_17 : 15;
@@ -122,8 +122,8 @@ struct PokemonSpriteTransforms {
typedef struct PokemonSpriteShadow {
u16 plttSlot : 2;
u16 shouldAdjustX : 1;
u16 shouldAdjustY : 1;
u16 shouldFollowX : 1;
u16 shouldFollowY : 1;
u16 isAffine : 1;
u16 size : 2;
u16 padding_00 : 9;
@@ -202,12 +202,12 @@ void PokemonSpriteManager_DeleteAll(PokemonSpriteManager *monSpriteMan);
void PokemonSprite_SetAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttribute attribute, int value);
int PokemonSprite_GetAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttribute attribute);
void PokemonSprite_AddAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttribute attribute, int delta);
void PokemonSprite_SetVisible(PokemonSprite *monSprite, int x, int y, int width, int height);
void PokemonSprite_ShowAndSetTexturePos(PokemonSprite *monSprite, int x, int y, int width, int height);
void PokemonSprite_StartFade(PokemonSprite *monSprite, int initAlpha, int targetAlpha, int delay, int color);
void PokemonSpriteManager_StartFadeAll(PokemonSpriteManager *monSpriteMan, int initAlpha, int targetAlpha, int delay, int color);
void PokemonSprite_ClearFade(PokemonSprite *monSprite);
BOOL PokemonSprite_IsFadeActive(PokemonSprite *monSprite);
void PokemonSprite_CalcAffineYOffset(PokemonSprite *monSprite, int height);
void PokemonSprite_CalcScaledYOffset(PokemonSprite *monSprite, int height);
void PokemonSpriteTaskAnim_Init(PokemonSpriteTaskAnim *anim, const SpriteAnimationFrame *animFrames);
int PokemonSpriteTaskAnim_Run(PokemonSpriteTaskAnim *anim);
void PokemonSprite_ScheduleReloadFromNARC(PokemonSprite *monSprite);

8
src/battle/battle_display.c
View File

@@ -1844,7 +1844,7 @@ static void ov16_0225EA80(SysTask *param0, void *param1)
} else {
PokemonSprite_AddAttribute(v0->unk_04->unk_20, 12, 0x20);
PokemonSprite_AddAttribute(v0->unk_04->unk_20, 13, 0x20);
PokemonSprite_CalcAffineYOffset(v0->unk_04->unk_20, v0->unk_90);
PokemonSprite_CalcScaledYOffset(v0->unk_04->unk_20, v0->unk_90);
}
break;
case 5:
@@ -2036,7 +2036,7 @@ static void ov16_0225F0C0(SysTask *param0, void *param1)
} else {
PokemonSprite_AddAttribute(v0->unk_04->unk_20, 12, 0x20);
PokemonSprite_AddAttribute(v0->unk_04->unk_20, 13, 0x20);
PokemonSprite_CalcAffineYOffset(v0->unk_04->unk_20, v0->unk_90);
PokemonSprite_CalcScaledYOffset(v0->unk_04->unk_20, v0->unk_90);
}
break;
case 5:
@@ -2204,7 +2204,7 @@ static void ov16_0225F764(SysTask *param0, void *param1)
case 6:
PokemonSprite_AddAttribute(v0->unk_08, 12, -0x20);
PokemonSprite_AddAttribute(v0->unk_08, 13, -0x20);
PokemonSprite_CalcAffineYOffset(v0->unk_08, v0->unk_6C);
PokemonSprite_CalcScaledYOffset(v0->unk_08, v0->unk_6C);
if (PokemonSprite_GetAttribute(v0->unk_08, 12) <= 0x0) {
PokemonSprite_Delete(v0->unk_08);
@@ -4805,7 +4805,7 @@ static void ov16_02262A9C(SysTask *param0, void *param1)
case 8:
v3 = LoadPokemonSpriteYOffset(v0->unk_68, v0->unk_6A, v0->unk_67, v0->unk_6B, v0->unk_6C);
v3 = 80 - v3;
PokemonSprite_SetVisible(v0->unk_08, 0, 0, 80, v3);
PokemonSprite_ShowAndSetTexturePos(v0->unk_08, 0, 0, 80, v3);
v0->unk_66++;
break;
case 9:

10
src/overlay012/ov12_02226B84.c
View File

@@ -2489,7 +2489,7 @@ void ov12_02229304(UnkStruct_ov12_0221FCDC *param0)
v0->unk_44 = ov12_02220280(param0, 4);
v0->unk_4C = 0;
PokemonSprite_SetVisible(v0->unk_1C.unk_08, v0->unk_30, v0->unk_34, v0->unk_38, v0->unk_3C);
PokemonSprite_ShowAndSetTexturePos(v0->unk_1C.unk_08, v0->unk_30, v0->unk_34, v0->unk_38, v0->unk_3C);
}
ov12_022201E8(v0->unk_00.unk_04, ov12_02229278, v0);
@@ -2605,7 +2605,7 @@ static void ov12_022295C4(SysTask *param0, void *param1)
v0->unk_00.unk_00++;
}
PokemonSprite_SetVisible(v0->unk_28.unk_08, 0, v0->unk_3C, 80, v0->unk_40);
PokemonSprite_ShowAndSetTexturePos(v0->unk_28.unk_08, 0, v0->unk_3C, 80, v0->unk_40);
break;
case 1:
PokemonSprite_SetAttribute(v0->unk_28.unk_08, 14, 0);
@@ -2641,7 +2641,7 @@ void ov12_02229638(UnkStruct_ov12_0221FCDC *param0)
v0->unk_3C = 80 - v0->unk_3C;
v0->unk_40 = 0;
PokemonSprite_SetVisible(v0->unk_28.unk_08, 0, v0->unk_3C, 80, v0->unk_40);
PokemonSprite_ShowAndSetTexturePos(v0->unk_28.unk_08, 0, v0->unk_3C, 80, v0->unk_40);
ov12_022201E8(v0->unk_00.unk_04, ov12_022295C4, v0);
return;
@@ -2654,13 +2654,13 @@ void ov12_02229638(UnkStruct_ov12_0221FCDC *param0)
v0->unk_40 = v0->unk_3C;
if (v0->unk_1C > 0) {
PokemonSprite_SetVisible(v0->unk_28.unk_08, 0, 0, 80, v0->unk_3C);
PokemonSprite_ShowAndSetTexturePos(v0->unk_28.unk_08, 0, 0, 80, v0->unk_3C);
ov12_022201E8(v0->unk_00.unk_04, ov12_02229538, v0);
} else {
v0->unk_3C = 0;
v0->unk_44 += v0->unk_40;
PokemonSprite_SetAttribute(v0->unk_28.unk_08, 1, v0->unk_44);
PokemonSprite_SetVisible(v0->unk_28.unk_08, 0, 0, 80, v0->unk_3C);
PokemonSprite_ShowAndSetTexturePos(v0->unk_28.unk_08, 0, 0, 80, v0->unk_3C);
ov12_022201E8(v0->unk_00.unk_04, ov12_022294AC, v0);
}
}

2
src/overlay012/ov12_0222E91C.c
View File

@@ -589,7 +589,7 @@ void ov12_0222F2F8(UnkStruct_ov12_0221FCDC *param0)
static void ov12_0222F44C(PokemonSprite *param0, int param1, int param2, int param3, int param4)
{
PokemonSprite_SetVisible(param0, param1, 80 - param3, param2, param4);
PokemonSprite_ShowAndSetTexturePos(param0, param1, 80 - param3, param2, param4);
}
static void ov12_0222F464(SysTask *param0, void *param1)

4
src/overlay076/ov76_0223D338.c
View File

@@ -733,7 +733,7 @@ static BOOL ov76_0223DE78(UnkStruct_ov76_0223DE00 *param0)
} else {
PokemonSprite_AddAttribute(param0->unk_D4.unk_D4, 12, 0x20);
PokemonSprite_AddAttribute(param0->unk_D4.unk_D4, 13, 0x20);
PokemonSprite_CalcAffineYOffset(param0->unk_D4.unk_D4, param0->unk_D4.unk_D8);
PokemonSprite_CalcScaledYOffset(param0->unk_D4.unk_D4, param0->unk_D4.unk_D8);
}
return 1;
@@ -750,7 +750,7 @@ static BOOL ov76_0223DEF4(UnkStruct_ov76_0223DE00 *param0)
} else {
PokemonSprite_AddAttribute(param0->unk_D4.unk_D4, 12, -0x20);
PokemonSprite_AddAttribute(param0->unk_D4.unk_D4, 13, -0x20);
PokemonSprite_CalcAffineYOffset(param0->unk_D4.unk_D4, param0->unk_D4.unk_D8);
PokemonSprite_CalcScaledYOffset(param0->unk_D4.unk_D4, param0->unk_D4.unk_D8);
}
return 1;

142
src/pokemon_sprite.c
View File

@@ -371,8 +371,8 @@ void PokemonSpriteManager_DrawSprites(PokemonSpriteManager *monSpriteMan)
for (int i = 0; i < MAX_POKEMON_SPRITES; i++) {
if (monSpriteMan->sprites[i].active
&& monSpriteMan->sprites[i].transforms.hasVanished == FALSE
&& monSpriteMan->sprites[i].transforms.hide == FALSE) {
&& monSpriteMan->sprites[i].transforms.hide == FALSE
&& monSpriteMan->sprites[i].transforms.hide2 == FALSE) {
if (monSpriteMan->sprites[i].callback != NULL) {
monSpriteMan->sprites[i].callback(&monSpriteMan->sprites[i], &monSpriteMan->sprites[i].transforms);
}
@@ -396,14 +396,14 @@ void PokemonSpriteManager_DrawSprites(PokemonSpriteManager *monSpriteMan)
G3_PolygonAttr(GX_LIGHTMASK_NONE, GX_POLYGONMODE_MODULATE, GX_CULL_NONE, monSpriteMan->sprites[i].polygonID, monSpriteMan->sprites[i].transforms.alpha, 0);
if (monSpriteMan->sprites[i].transforms.visible) {
u0 = sMonSpriteTextureCoords[i][monSpriteMan->sprites[i].currSpriteFrame][0] + monSpriteMan->sprites[i].transforms.xOffset2;
u1 = sMonSpriteTextureCoords[i][monSpriteMan->sprites[i].currSpriteFrame][0] + monSpriteMan->sprites[i].transforms.xOffset2 + monSpriteMan->sprites[i].transforms.width;
v0 = sMonSpriteTextureCoords[i][monSpriteMan->sprites[i].currSpriteFrame][1] + monSpriteMan->sprites[i].transforms.yOffset2;
v1 = sMonSpriteTextureCoords[i][monSpriteMan->sprites[i].currSpriteFrame][1] + monSpriteMan->sprites[i].transforms.yOffset2 + monSpriteMan->sprites[i].transforms.height;
u0 = sMonSpriteTextureCoords[i][monSpriteMan->sprites[i].currSpriteFrame][0] + monSpriteMan->sprites[i].transforms.textureXOffset;
u1 = sMonSpriteTextureCoords[i][monSpriteMan->sprites[i].currSpriteFrame][0] + monSpriteMan->sprites[i].transforms.textureXOffset + monSpriteMan->sprites[i].transforms.width;
v0 = sMonSpriteTextureCoords[i][monSpriteMan->sprites[i].currSpriteFrame][1] + monSpriteMan->sprites[i].transforms.textureYOffset;
v1 = sMonSpriteTextureCoords[i][monSpriteMan->sprites[i].currSpriteFrame][1] + monSpriteMan->sprites[i].transforms.textureYOffset + monSpriteMan->sprites[i].transforms.height;
NNS_G2dDrawSpriteFast(
monSpriteMan->sprites[i].transforms.xCenter - 80 / 2 + monSpriteMan->sprites[i].transforms.xOffset2 + monSpriteMan->sprites[i].transforms.xOffset,
monSpriteMan->sprites[i].transforms.yCenter - 80 / 2 + monSpriteMan->sprites[i].transforms.yOffset2 + monSpriteMan->sprites[i].transforms.yOffset - monSpriteMan->sprites[i].shadow.height,
monSpriteMan->sprites[i].transforms.xCenter - 80 / 2 + monSpriteMan->sprites[i].transforms.textureXOffset + monSpriteMan->sprites[i].transforms.xOffset,
monSpriteMan->sprites[i].transforms.yCenter - 80 / 2 + monSpriteMan->sprites[i].transforms.textureYOffset + monSpriteMan->sprites[i].transforms.yOffset - monSpriteMan->sprites[i].shadow.height,
monSpriteMan->sprites[i].transforms.zCenter + monSpriteMan->sprites[i].transforms.zOffset,
monSpriteMan->sprites[i].transforms.width,
monSpriteMan->sprites[i].transforms.height,
@@ -412,8 +412,8 @@ void PokemonSpriteManager_DrawSprites(PokemonSpriteManager *monSpriteMan)
u1,
v1);
} else {
width = (80 * monSpriteMan->sprites[i].transforms.affineWidth) >> 8;
height = (80 * monSpriteMan->sprites[i].transforms.affineHeight) >> 8;
width = (80 * monSpriteMan->sprites[i].transforms.scaleX) >> 8;
height = (80 * monSpriteMan->sprites[i].transforms.scaleY) >> 8;
u0 = sMonSpriteTextureCoords[i][monSpriteMan->sprites[i].currSpriteFrame][0];
u1 = sMonSpriteTextureCoords[i][monSpriteMan->sprites[i].currSpriteFrame][2];
v0 = sMonSpriteTextureCoords[i][monSpriteMan->sprites[i].currSpriteFrame][1];
@@ -443,18 +443,18 @@ void PokemonSpriteManager_DrawSprites(PokemonSpriteManager *monSpriteMan)
G3_TexPlttBase(monSpriteMan->plttBaseAddr + 32 * (3 + monSpriteMan->sprites[i].shadow.plttSlot), monSpriteMan->imageProxy.attr.fmt);
if (monSpriteMan->sprites[i].shadow.isAffine) {
width = (64 * monSpriteMan->sprites[i].transforms.affineWidth) >> 8;
height = (16 * monSpriteMan->sprites[i].transforms.affineHeight) >> 8;
width = (64 * monSpriteMan->sprites[i].transforms.scaleX) >> 8;
height = (16 * monSpriteMan->sprites[i].transforms.scaleY) >> 8;
} else {
width = 64;
height = 16;
}
if (monSpriteMan->sprites[i].shadow.shouldAdjustX) {
if (monSpriteMan->sprites[i].shadow.shouldFollowX) {
monSpriteMan->sprites[i].shadow.x = monSpriteMan->sprites[i].transforms.xCenter + monSpriteMan->sprites[i].transforms.xOffset + monSpriteMan->sprites[i].shadow.xOffset;
}
if (monSpriteMan->sprites[i].shadow.shouldAdjustY) {
if (monSpriteMan->sprites[i].shadow.shouldFollowY) {
monSpriteMan->sprites[i].shadow.y = monSpriteMan->sprites[i].transforms.yCenter + monSpriteMan->sprites[i].transforms.yOffset + monSpriteMan->sprites[i].shadow.yOffset;
}
@@ -537,8 +537,8 @@ PokemonSprite *PokemonSpriteManager_CreateSpriteAtIndex(PokemonSpriteManager *mo
monSpriteMan->sprites[index].transforms.xCenter = x;
monSpriteMan->sprites[index].transforms.yCenter = y;
monSpriteMan->sprites[index].transforms.zCenter = z;
monSpriteMan->sprites[index].transforms.affineWidth = 256;
monSpriteMan->sprites[index].transforms.affineHeight = 256;
monSpriteMan->sprites[index].transforms.scaleX = 256;
monSpriteMan->sprites[index].transforms.scaleY = 256;
monSpriteMan->sprites[index].transforms.alpha = 31;
monSpriteMan->sprites[index].transforms.diffuseR = 31;
monSpriteMan->sprites[index].transforms.diffuseG = 31;
@@ -549,8 +549,8 @@ PokemonSprite *PokemonSpriteManager_CreateSpriteAtIndex(PokemonSpriteManager *mo
monSpriteMan->sprites[index].callback = callback;
monSpriteMan->sprites[index].shadow.x = x;
monSpriteMan->sprites[index].shadow.y = y;
monSpriteMan->sprites[index].shadow.shouldAdjustX = TRUE;
monSpriteMan->sprites[index].shadow.shouldAdjustY = TRUE;
monSpriteMan->sprites[index].shadow.shouldFollowX = TRUE;
monSpriteMan->sprites[index].shadow.shouldFollowY = TRUE;
monSpriteMan->sprites[index].shadow.isAffine = TRUE;
if (animFrames != NULL) {
@@ -593,8 +593,8 @@ void PokemonSprite_SetAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttr
case MON_SPRITE_Z_OFFSET:
monSprite->transforms.zOffset = value;
break;
case MON_SPRITE_HAS_VANISHED:
monSprite->transforms.hasVanished = value;
case MON_SPRITE_HIDE:
monSprite->transforms.hide = value;
break;
case MON_SPRITE_ROTATION_X:
monSprite->transforms.rotationX = value;
@@ -611,20 +611,20 @@ void PokemonSprite_SetAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttr
case MON_SPRITE_Y_PIVOT:
monSprite->transforms.yPivot = value;
break;
case MON_SPRITE_AFFINE_WIDTH:
monSprite->transforms.affineWidth = value;
case MON_SPRITE_SCALE_X:
monSprite->transforms.scaleX = value;
break;
case MON_SPRITE_AFFINE_HEIGHT:
monSprite->transforms.affineHeight = value;
case MON_SPRITE_SCALE_Y:
monSprite->transforms.scaleY = value;
break;
case MON_SPRITE_VISIBLE:
monSprite->transforms.visible = value;
break;
case MON_SPRITE_X_OFFSET_2:
monSprite->transforms.xOffset2 = value;
case MON_SPRITE_TEXTURE_X_OFFSET:
monSprite->transforms.textureXOffset = value;
break;
case MON_SPRITE_Y_OFFSET_2:
monSprite->transforms.yOffset2 = value;
case MON_SPRITE_TEXTURE_Y_OFFSET:
monSprite->transforms.textureYOffset = value;
break;
case MON_SPRITE_WIDTH:
monSprite->transforms.width = value;
@@ -692,8 +692,8 @@ void PokemonSprite_SetAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttr
monSprite->transforms.flipV = value;
monSprite->needReloadChar = TRUE;
break;
case MON_SPRITE_HIDE:
monSprite->transforms.hide = value;
case MON_SPRITE_HIDE_2:
monSprite->transforms.hide2 = value;
break;
case MON_SPRITE_CURR_SPRITE_FRAME:
monSprite->currSpriteFrame = value;
@@ -709,11 +709,11 @@ void PokemonSprite_SetAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttr
monSprite->shadow.plttSlot = value;
monSprite->needReloadPltt = TRUE;
break;
case MON_SPRITE_SHADOW_SHOULD_ADJUST_X:
monSprite->shadow.shouldAdjustX = value;
case MON_SPRITE_SHADOW_SHOULD_FOLLOW_X:
monSprite->shadow.shouldFollowX = value;
break;
case MON_SPRITE_SHADOW_SHOULD_ADJUST_Y:
monSprite->shadow.shouldAdjustY = value;
case MON_SPRITE_SHADOW_SHOULD_FOLLOW_Y:
monSprite->shadow.shouldFollowY = value;
break;
case MON_SPRITE_SHADOW_IS_AFFINE:
monSprite->shadow.isAffine = value;
@@ -739,8 +739,8 @@ int PokemonSprite_GetAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttri
return monSprite->transforms.yOffset;
case MON_SPRITE_Z_OFFSET:
return monSprite->transforms.zOffset;
case MON_SPRITE_HAS_VANISHED:
return monSprite->transforms.hasVanished;
case MON_SPRITE_HIDE:
return monSprite->transforms.hide;
case MON_SPRITE_ROTATION_X:
return monSprite->transforms.rotationX;
case MON_SPRITE_ROTATION_Y:
@@ -751,16 +751,16 @@ int PokemonSprite_GetAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttri
return monSprite->transforms.xPivot;
case MON_SPRITE_Y_PIVOT:
return monSprite->transforms.yPivot;
case MON_SPRITE_AFFINE_WIDTH:
return monSprite->transforms.affineWidth;
case MON_SPRITE_AFFINE_HEIGHT:
return monSprite->transforms.affineHeight;
case MON_SPRITE_SCALE_X:
return monSprite->transforms.scaleX;
case MON_SPRITE_SCALE_Y:
return monSprite->transforms.scaleY;
case MON_SPRITE_VISIBLE:
return monSprite->transforms.visible;
case MON_SPRITE_X_OFFSET_2:
return monSprite->transforms.xOffset2;
case MON_SPRITE_Y_OFFSET_2:
return monSprite->transforms.yOffset2;
case MON_SPRITE_TEXTURE_X_OFFSET:
return monSprite->transforms.textureXOffset;
case MON_SPRITE_TEXTURE_Y_OFFSET:
return monSprite->transforms.textureYOffset;
case MON_SPRITE_WIDTH:
return monSprite->transforms.width;
case MON_SPRITE_HEIGHT:
@@ -801,8 +801,8 @@ int PokemonSprite_GetAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttri
return monSprite->transforms.flipH;
case MON_SPRITE_FLIP_V:
return monSprite->transforms.flipV;
case MON_SPRITE_HIDE:
return monSprite->transforms.hide;
case MON_SPRITE_HIDE_2:
return monSprite->transforms.hide2;
case MON_SPRITE_CURR_SPRITE_FRAME:
return monSprite->currSpriteFrame;
case MON_SPRITE_MOSAIC_INTENSITY:
@@ -811,10 +811,10 @@ int PokemonSprite_GetAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttri
return monSprite->shadow.height;
case MON_SPRITE_SHADOW_PLTT_SLOT:
return monSprite->shadow.plttSlot;
case MON_SPRITE_SHADOW_SHOULD_ADJUST_X:
return monSprite->shadow.shouldAdjustX;
case MON_SPRITE_SHADOW_SHOULD_ADJUST_Y:
return monSprite->shadow.shouldAdjustY;
case MON_SPRITE_SHADOW_SHOULD_FOLLOW_X:
return monSprite->shadow.shouldFollowX;
case MON_SPRITE_SHADOW_SHOULD_FOLLOW_Y:
return monSprite->shadow.shouldFollowY;
case MON_SPRITE_SHADOW_IS_AFFINE:
return monSprite->shadow.isAffine;
case MON_SPRITE_SHADOW_SIZE:
@@ -846,8 +846,8 @@ void PokemonSprite_AddAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttr
case MON_SPRITE_Z_OFFSET:
monSprite->transforms.zOffset += delta;
break;
case MON_SPRITE_HAS_VANISHED:
monSprite->transforms.hasVanished += delta;
case MON_SPRITE_HIDE:
monSprite->transforms.hide += delta;
break;
case MON_SPRITE_ROTATION_X:
monSprite->transforms.rotationX += delta;
@@ -864,20 +864,20 @@ void PokemonSprite_AddAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttr
case MON_SPRITE_Y_PIVOT:
monSprite->transforms.yPivot += delta;
break;
case MON_SPRITE_AFFINE_WIDTH:
monSprite->transforms.affineWidth += delta;
case MON_SPRITE_SCALE_X:
monSprite->transforms.scaleX += delta;
break;
case MON_SPRITE_AFFINE_HEIGHT:
monSprite->transforms.affineHeight += delta;
case MON_SPRITE_SCALE_Y:
monSprite->transforms.scaleY += delta;
break;
case MON_SPRITE_VISIBLE:
monSprite->transforms.visible += delta;
break;
case MON_SPRITE_X_OFFSET_2:
monSprite->transforms.xOffset2 += delta;
case MON_SPRITE_TEXTURE_X_OFFSET:
monSprite->transforms.textureXOffset += delta;
break;
case MON_SPRITE_Y_OFFSET_2:
monSprite->transforms.yOffset2 += delta;
case MON_SPRITE_TEXTURE_Y_OFFSET:
monSprite->transforms.textureYOffset += delta;
break;
case MON_SPRITE_WIDTH:
monSprite->transforms.width += delta;
@@ -945,8 +945,8 @@ void PokemonSprite_AddAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttr
monSprite->transforms.flipV += delta;
monSprite->needReloadChar = TRUE;
break;
case MON_SPRITE_HIDE:
monSprite->transforms.hide += delta;
case MON_SPRITE_HIDE_2:
monSprite->transforms.hide2 += delta;
break;
case MON_SPRITE_CURR_SPRITE_FRAME:
monSprite->currSpriteFrame += delta;
@@ -962,11 +962,11 @@ void PokemonSprite_AddAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttr
monSprite->shadow.plttSlot += delta;
monSprite->needReloadPltt = TRUE;
break;
case MON_SPRITE_SHADOW_SHOULD_ADJUST_X:
monSprite->shadow.shouldAdjustX += delta;
case MON_SPRITE_SHADOW_SHOULD_FOLLOW_X:
monSprite->shadow.shouldFollowX += delta;
break;
case MON_SPRITE_SHADOW_SHOULD_ADJUST_Y:
monSprite->shadow.shouldAdjustY += delta;
case MON_SPRITE_SHADOW_SHOULD_FOLLOW_Y:
monSprite->shadow.shouldFollowY += delta;
break;
case MON_SPRITE_SHADOW_IS_AFFINE:
monSprite->shadow.isAffine += delta;
@@ -977,11 +977,11 @@ void PokemonSprite_AddAttribute(PokemonSprite *monSprite, enum PokemonSpriteAttr
}
}
void PokemonSprite_SetVisible(PokemonSprite *monSprite, int x, int y, int width, int height)
void PokemonSprite_ShowAndSetTexturePos(PokemonSprite *monSprite, int x, int y, int width, int height)
{
monSprite->transforms.visible = TRUE;
monSprite->transforms.xOffset2 = x;
monSprite->transforms.yOffset2 = y;
monSprite->transforms.textureXOffset = x;
monSprite->transforms.textureYOffset = y;
monSprite->transforms.width = width;
monSprite->transforms.height = height;
}
@@ -1026,9 +1026,9 @@ BOOL PokemonSprite_IsFadeActive(PokemonSprite *monSprite)
return monSprite->transforms.fadeActive == TRUE;
}
void PokemonSprite_CalcAffineYOffset(PokemonSprite *monSprite, int height)
void PokemonSprite_CalcScaledYOffset(PokemonSprite *monSprite, int height)
{
monSprite->transforms.yOffset = ((80 / 2) - height) - ((((80 / 2) - height) * monSprite->transforms.affineHeight) >> 8);
monSprite->transforms.yOffset = ((80 / 2) - height) - ((((80 / 2) - height) * monSprite->transforms.scaleY) >> 8);
}
static inline void RunPokemonSpriteTaskAnim(u8 *active, u8 *currSpriteFrame, u8 *currAnimFrame, u8 *frameDelay, u8 *loopTimers, const SpriteAnimationFrame *animFrames)