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

[LEAK-INFORMED] fix InitItemIconSpriteState fakematch

Browse Source
This commit is contained in:
Kurausukun
2021-03-22 23:44:08 -04:00
parent fcd39ec726
commit 3f236d09c6
1 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokemon_special_anim_scene.c
+26 -21
View File
@@ -1038,14 +1038,8 @@ void PSA_UseItem_CleanUpForCancel(void)
static void InitItemIconSpriteState(struct PokemonSpecialAnimScene * scene, struct Sprite * sprite, u8 closeness) static void InitItemIconSpriteState(struct PokemonSpecialAnimScene * scene, struct Sprite * sprite, u8 closeness)
{ {
u16 species; u16 species, x, y;
u32 personality; u32 personality;
#ifndef NONMATCHING
register int x asm("r4"); // FIXME
#else
int x;
#endif
u8 y;
if (closeness == 3) if (closeness == 3)
{ {
sprite->pos1.x = 120; sprite->pos1.x = 120;
@@ -1060,22 +1054,33 @@ static void InitItemIconSpriteState(struct PokemonSpecialAnimScene * scene, stru
sprite->pos1.y += 4; sprite->pos1.y += 4;
species = PSA_GetMonSpecies(); species = PSA_GetMonSpecies();
personality = PSA_GetMonPersonality(); personality = PSA_GetMonPersonality();
if (PSA_GetAnimType() == 4) switch (PSA_GetAnimType())
{ {
x = Menu2_GetMonSpriteAnchorCoord(species, personality, 0); case 4:
y = Menu2_GetMonSpriteAnchorCoord(species, personality, 1); {
x = Menu2_GetMonSpriteAnchorCoord(species, personality, 0);
y = Menu2_GetMonSpriteAnchorCoord(species, personality, 1);
if (x == 0xFF)
x = 0;
if (y == 0xFF)
y = 0;
sprite->data[6] = x;
sprite->data[7] = y;
break;
}
default:
{
x = Menu2_GetMonSpriteAnchorCoord(species, personality, 3);
y = Menu2_GetMonSpriteAnchorCoord(species, personality, 4);
if (x == 0xFF)
x = 0;
if (y == 0xFF)
y = 0;
sprite->data[6] = x;
sprite->data[7] = y;
break;
}
} }
else
{
x = Menu2_GetMonSpriteAnchorCoord(species, personality, 3);
y = Menu2_GetMonSpriteAnchorCoord(species, personality, 4);
}
if (x == 0xFF)
x = 0;
if (y == 0xFF)
y = 0;
sprite->data[6] = x;
sprite->data[7] = y;
ItemSpriteZoom_UpdateYPos(sprite, closeness); ItemSpriteZoom_UpdateYPos(sprite, closeness);
} }