summaryrefslogtreecommitdiff
path: root/src/battle_interface.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_interface.c')
-rw-r--r--src/battle_interface.c392
1 files changed, 196 insertions, 196 deletions
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 50eb5373a..77308cb3c 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -103,11 +103,11 @@ enum
HEALTHBOX_GFX_63, //hp bar red [7 pixels]
HEALTHBOX_GFX_64, //hp bar red [8 pixels]
HEALTHBOX_GFX_65, //hp bar frame end
- HEALTHBOX_GFX_66, //status ball [full]
- HEALTHBOX_GFX_67, //status ball [empty]
- HEALTHBOX_GFX_68, //status ball [fainted]
- HEALTHBOX_GFX_69, //status ball [statused]
- HEALTHBOX_GFX_70, //status ball [unused extra]
+ HEALTHBOX_GFX_STATUS_BALL, // Full
+ HEALTHBOX_GFX_STATUS_BALL_EMPTY,
+ HEALTHBOX_GFX_STATUS_BALL_FAINTED,
+ HEALTHBOX_GFX_STATUS_BALL_STATUSED,
+ HEALTHBOX_GFX_STATUS_BALL_CAUGHT,
HEALTHBOX_GFX_STATUS_PSN_BATTLER1, //status2 "PSN"
HEALTHBOX_GFX_72,
HEALTHBOX_GFX_73,
@@ -153,8 +153,8 @@ enum
HEALTHBOX_GFX_STATUS_BRN_BATTLER3, //status4 "BRN"
HEALTHBOX_GFX_114,
HEALTHBOX_GFX_115,
- HEALTHBOX_GFX_116, //unknown_D12FEC
- HEALTHBOX_GFX_117, //unknown_D1300C
+ HEALTHBOX_GFX_FRAME_END,
+ HEALTHBOX_GFX_FRAME_END_BAR,
};
// strings
@@ -330,43 +330,43 @@ static const struct SpriteTemplate sHealthbarSpriteTemplates[MAX_BATTLERS_COUNT]
static const struct Subsprite sUnknown_0832C220[] =
{
{
- .x = DISPLAY_WIDTH,
- .y = 0,
- .shape = SPRITE_SHAPE(64x32),
- .size = SPRITE_SIZE(64x32),
- .tileOffset = 0,
+ .x = DISPLAY_WIDTH,
+ .y = 0,
+ .shape = SPRITE_SHAPE(64x32),
+ .size = SPRITE_SIZE(64x32),
+ .tileOffset = 0,
.priority = 1
},
{
- .x = 48,
- .y = 0,
- .shape = SPRITE_SHAPE(32x32),
- .size = SPRITE_SIZE(32x32),
- .tileOffset = 32,
+ .x = 48,
+ .y = 0,
+ .shape = SPRITE_SHAPE(32x32),
+ .size = SPRITE_SIZE(32x32),
+ .tileOffset = 32,
.priority = 1
},
{
- .x = DISPLAY_WIDTH,
- .y = 32,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 48,
+ .x = DISPLAY_WIDTH,
+ .y = 32,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 48,
.priority = 1
},
{
- .x = 16,
- .y = 32,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 52,
+ .x = 16,
+ .y = 32,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 52,
.priority = 1
},
{
- .x = 48,
- .y = 32,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 56,
+ .x = 48,
+ .y = 32,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 56,
.priority = 1
}
};
@@ -374,43 +374,43 @@ static const struct Subsprite sUnknown_0832C220[] =
static const struct Subsprite sUnknown_0832C234[] =
{
{
- .x = DISPLAY_WIDTH,
- .y = 0,
- .shape = SPRITE_SHAPE(64x32),
- .size = SPRITE_SIZE(64x32),
- .tileOffset = 64,
+ .x = DISPLAY_WIDTH,
+ .y = 0,
+ .shape = SPRITE_SHAPE(64x32),
+ .size = SPRITE_SIZE(64x32),
+ .tileOffset = 64,
.priority = 1
},
{
- .x = 48,
- .y = 0,
- .shape = SPRITE_SHAPE(32x32),
- .size = SPRITE_SIZE(32x32),
- .tileOffset = 96,
+ .x = 48,
+ .y = 0,
+ .shape = SPRITE_SHAPE(32x32),
+ .size = SPRITE_SIZE(32x32),
+ .tileOffset = 96,
.priority = 1
},
{
- .x = DISPLAY_WIDTH,
- .y = 32,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 112,
+ .x = DISPLAY_WIDTH,
+ .y = 32,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 112,
.priority = 1
},
{
- .x = 16,
- .y = 32,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 116,
+ .x = 16,
+ .y = 32,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 116,
.priority = 1
},
{
- .x = 48,
- .y = 32,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 120,
+ .x = 48,
+ .y = 32,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 120,
.priority = 1
}
};
@@ -418,19 +418,19 @@ static const struct Subsprite sUnknown_0832C234[] =
static const struct Subsprite sUnknown_0832C248[] =
{
{
- .x = DISPLAY_WIDTH,
- .y = 0,
- .shape = SPRITE_SHAPE(64x32),
+ .x = DISPLAY_WIDTH,
+ .y = 0,
+ .shape = SPRITE_SHAPE(64x32),
.size = SPRITE_SIZE(64x32),
- .tileOffset = 0,
+ .tileOffset = 0,
.priority = 1
},
{
- .x = 48,
- .y = 0,
- .shape = SPRITE_SHAPE(32x32),
- .size = SPRITE_SIZE(32x32),
- .tileOffset = 32,
+ .x = 48,
+ .y = 0,
+ .shape = SPRITE_SHAPE(32x32),
+ .size = SPRITE_SIZE(32x32),
+ .tileOffset = 32,
.priority = 1
}
};
@@ -438,19 +438,19 @@ static const struct Subsprite sUnknown_0832C248[] =
static const struct Subsprite sUnknown_0832C250[] =
{
{
- .x = DISPLAY_WIDTH,
- .y = 0,
- .shape = SPRITE_SHAPE(64x32),
+ .x = DISPLAY_WIDTH,
+ .y = 0,
+ .shape = SPRITE_SHAPE(64x32),
.size = SPRITE_SIZE(64x32),
- .tileOffset = 0,
+ .tileOffset = 0,
.priority = 1
},
{
- .x = 48,
- .y = 0,
- .shape = SPRITE_SHAPE(32x32),
- .size = SPRITE_SIZE(32x32),
- .tileOffset = 32,
+ .x = 48,
+ .y = 0,
+ .shape = SPRITE_SHAPE(32x32),
+ .size = SPRITE_SIZE(32x32),
+ .tileOffset = 32,
.priority = 1
}
};
@@ -458,19 +458,19 @@ static const struct Subsprite sUnknown_0832C250[] =
static const struct Subsprite sUnknown_0832C258[] =
{
{
- .x = DISPLAY_WIDTH,
- .y = 0,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 0,
+ .x = DISPLAY_WIDTH,
+ .y = 0,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 0,
.priority = 1
},
{
- .x = 16,
- .y = 0,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 4,
+ .x = 16,
+ .y = 0,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 4,
.priority = 1
}
};
@@ -478,27 +478,27 @@ static const struct Subsprite sUnknown_0832C258[] =
static const struct Subsprite sUnknown_0832C260[] =
{
{
- .x = DISPLAY_WIDTH,
- .y = 0,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 0,
+ .x = DISPLAY_WIDTH,
+ .y = 0,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 0,
.priority = 1
},
{
- .x = 16,
- .y = 0,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 4,
+ .x = 16,
+ .y = 0,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 4,
.priority = 1
},
{
- .x = DISPLAY_WIDTH - 16,
- .y = 0,
- .shape = SPRITE_SHAPE(8x8),
- .size = SPRITE_SIZE(8x8),
- .tileOffset = 8,
+ .x = DISPLAY_WIDTH - 16,
+ .y = 0,
+ .shape = SPRITE_SHAPE(8x8),
+ .size = SPRITE_SIZE(8x8),
+ .tileOffset = 8,
.priority = 1
}
};
@@ -521,35 +521,35 @@ static const struct SubspriteTable sUnknown_0832C28C[] =
static const struct Subsprite sStatusSummaryBar_Subsprites_0[] =
{
{
- .x = 160,
- .y = 0,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 0,
+ .x = 160,
+ .y = 0,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 0,
.priority = 1
},
{
- .x = 192,
- .y = 0,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 4,
+ .x = 192,
+ .y = 0,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 4,
.priority = 1
},
{
- .x = 224,
- .y = 0,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 8,
+ .x = 224,
+ .y = 0,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 8,
.priority = 1
},
{
- .x = 0,
- .y = 0,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 12,
+ .x = 0,
+ .y = 0,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 12,
.priority = 1
}
};
@@ -557,51 +557,51 @@ static const struct Subsprite sStatusSummaryBar_Subsprites_0[] =
static const struct Subsprite sUnknown_0832C2AC[] =
{
{
- .x = 160,
- .y = 0,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 0,
+ .x = 160,
+ .y = 0,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 0,
.priority = 1
},
{
- .x = 192,
- .y = 0,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 4,
+ .x = 192,
+ .y = 0,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 4,
.priority = 1
},
{
- .x = 224,
- .y = 0,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 8,
+ .x = 224,
+ .y = 0,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 8,
.priority = 1
},
{
- .x = 0,
- .y = 0,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 8,
+ .x = 0,
+ .y = 0,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 8,
.priority = 1
},
{
- .x = 32,
- .y = 0,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 8,
+ .x = 32,
+ .y = 0,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 8,
.priority = 1
},
{
- .x = 64,
- .y = 0,
- .shape = SPRITE_SHAPE(32x8),
- .size = SPRITE_SIZE(32x8),
- .tileOffset = 12,
+ .x = 64,
+ .y = 0,
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .tileOffset = 12,
.priority = 1
}
};
@@ -636,7 +636,7 @@ static const struct SpritePalette sStatusSummaryBallsSpritePal =
static const struct SpriteSheet sStatusSummaryBallsSpriteSheet =
{
- gBattleInterface_BallDisplayGfx, 0x80, TAG_STATUS_SUMMARY_BALLS_TILE
+ &gHealthboxElementsGfxTable[HEALTHBOX_GFX_STATUS_BALL], 0x80, TAG_STATUS_SUMMARY_BALLS_TILE
};
// unused oam data
@@ -975,33 +975,33 @@ static void SpriteCB_HealthBar(struct Sprite *sprite)
switch (sprite->hBar_Data6)
{
case 0:
- sprite->pos1.x = gSprites[healthboxSpriteId].pos1.x + 16;
- sprite->pos1.y = gSprites[healthboxSpriteId].pos1.y;
+ sprite->x = gSprites[healthboxSpriteId].x + 16;
+ sprite->y = gSprites[healthboxSpriteId].y;
break;
case 1:
- sprite->pos1.x = gSprites[healthboxSpriteId].pos1.x + 16;
- sprite->pos1.y = gSprites[healthboxSpriteId].pos1.y;
+ sprite->x = gSprites[healthboxSpriteId].x + 16;
+ sprite->y = gSprites[healthboxSpriteId].y;
break;
case 2:
default:
- sprite->pos1.x = gSprites[healthboxSpriteId].pos1.x + 8;
- sprite->pos1.y = gSprites[healthboxSpriteId].pos1.y;
+ sprite->x = gSprites[healthboxSpriteId].x + 8;
+ sprite->y = gSprites[healthboxSpriteId].y;
break;
}
- sprite->pos2.x = gSprites[healthboxSpriteId].pos2.x;
- sprite->pos2.y = gSprites[healthboxSpriteId].pos2.y;
+ sprite->x2 = gSprites[healthboxSpriteId].x2;
+ sprite->y2 = gSprites[healthboxSpriteId].y2;
}
static void SpriteCB_HealthBoxOther(struct Sprite *sprite)
{
u8 healthboxMainSpriteId = sprite->hOther_HealthBoxSpriteId;
- sprite->pos1.x = gSprites[healthboxMainSpriteId].pos1.x + 64;
- sprite->pos1.y = gSprites[healthboxMainSpriteId].pos1.y;
+ sprite->x = gSprites[healthboxMainSpriteId].x + 64;
+ sprite->y = gSprites[healthboxMainSpriteId].y;
- sprite->pos2.x = gSprites[healthboxMainSpriteId].pos2.x;
- sprite->pos2.y = gSprites[healthboxMainSpriteId].pos2.y;
+ sprite->x2 = gSprites[healthboxMainSpriteId].x2;
+ sprite->y2 = gSprites[healthboxMainSpriteId].y2;
}
void SetBattleBarStruct(u8 battlerId, u8 healthboxSpriteId, s32 maxVal, s32 oldVal, s32 receivedValue)
@@ -1029,8 +1029,8 @@ void SetHealthboxSpriteVisible(u8 healthboxSpriteId)
static void UpdateSpritePos(u8 spriteId, s16 x, s16 y)
{
- gSprites[spriteId].pos1.x = x;
- gSprites[spriteId].pos1.y = y;
+ gSprites[spriteId].x = x;
+ gSprites[spriteId].y = y;
}
void DestoryHealthboxSprite(u8 healthboxSpriteId)
@@ -1101,7 +1101,7 @@ static void UpdateLvlInHealthbox(u8 healthboxSpriteId, u8 lvl)
u8 text[16];
u32 xPos;
u8 *objVram;
-
+
text[0] = CHAR_EXTRA_SYMBOL;
text[1] = CHAR_LV_2;
@@ -1225,7 +1225,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8
windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, 0, 5, 0, &windowId);
HpTextIntoHealthboxObject((void*)(OBJ_VRAM0) + spriteTileNum + 0xC0, windowTileData, 2);
RemoveWindowOnHealthbox(windowId);
- CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_116),
+ CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_FRAME_END),
(void*)(OBJ_VRAM0 + 0x680) + (gSprites[healthboxSpriteId].oam.tileNum * TILE_SIZE_4BPP),
0x20);
}
@@ -1291,7 +1291,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8
{
if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) // Impossible to reach part, because the battlerId is from the opponent's side.
{
- CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_116),
+ CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_FRAME_END),
(void*)(OBJ_VRAM0) + ((gSprites[healthboxSpriteId].oam.tileNum + 52) * TILE_SIZE_4BPP),
0x20);
}
@@ -1399,7 +1399,7 @@ void SwapHpBarsWithHpText(void)
{
UpdateStatusIconInHealthbox(gHealthboxSpriteIds[i]);
UpdateHealthboxAttribute(gHealthboxSpriteIds[i], &gPlayerParty[gBattlerPartyIndexes[i]], HEALTHBOX_HEALTH_BAR);
- CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_117), (void*)(OBJ_VRAM0 + 0x680 + gSprites[gHealthboxSpriteIds[i]].oam.tileNum * TILE_SIZE_4BPP), 32);
+ CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_FRAME_END_BAR), (void*)(OBJ_VRAM0 + 0x680 + gSprites[gHealthboxSpriteIds[i]].oam.tileNum * TILE_SIZE_4BPP), 32);
}
}
else
@@ -1485,17 +1485,17 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
summaryBarSpriteId = CreateSprite(&sStatusSummaryBarSpriteTemplates[isOpponent], bar_X, bar_Y, 10);
SetSubspriteTables(&gSprites[summaryBarSpriteId], sStatusSummaryBar_SubspriteTable);
- gSprites[summaryBarSpriteId].pos2.x = bar_pos2_X;
+ gSprites[summaryBarSpriteId].x2 = bar_pos2_X;
gSprites[summaryBarSpriteId].data[0] = bar_data0;
if (isOpponent)
{
- gSprites[summaryBarSpriteId].pos1.x -= 96;
+ gSprites[summaryBarSpriteId].x -= 96;
gSprites[summaryBarSpriteId].oam.matrixNum = ST_OAM_HFLIP;
}
else
{
- gSprites[summaryBarSpriteId].pos1.x += 96;
+ gSprites[summaryBarSpriteId].x += 96;
}
for (i = 0; i < PARTY_SIZE; i++)
@@ -1507,23 +1507,23 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
if (!isOpponent)
{
- gSprites[ballIconSpritesIds[i]].pos2.x = 0;
- gSprites[ballIconSpritesIds[i]].pos2.y = 0;
+ gSprites[ballIconSpritesIds[i]].x2 = 0;
+ gSprites[ballIconSpritesIds[i]].y2 = 0;
}
gSprites[ballIconSpritesIds[i]].data[0] = summaryBarSpriteId;
if (!isOpponent)
{
- gSprites[ballIconSpritesIds[i]].pos1.x += 10 * i + 24;
+ gSprites[ballIconSpritesIds[i]].x += 10 * i + 24;
gSprites[ballIconSpritesIds[i]].data[1] = i * 7 + 10;
- gSprites[ballIconSpritesIds[i]].pos2.x = 120;
+ gSprites[ballIconSpritesIds[i]].x2 = 120;
}
else
{
- gSprites[ballIconSpritesIds[i]].pos1.x -= 10 * (5 - i) + 24;
+ gSprites[ballIconSpritesIds[i]].x -= 10 * (5 - i) + 24;
gSprites[ballIconSpritesIds[i]].data[1] = (6 - i) * 7 + 10;
- gSprites[ballIconSpritesIds[i]].pos2.x = -120;
+ gSprites[ballIconSpritesIds[i]].x2 = -120;
}
gSprites[ballIconSpritesIds[i]].data[2] = isOpponent;
@@ -1793,17 +1793,17 @@ static void sub_8073F98(u8 taskId)
static void SpriteCB_StatusSummaryBar(struct Sprite *sprite)
{
- if (sprite->pos2.x != 0)
- sprite->pos2.x += sprite->data[0];
+ if (sprite->x2 != 0)
+ sprite->x2 += sprite->data[0];
}
static void sub_8074090(struct Sprite *sprite)
{
sprite->data[1] += 32;
if (sprite->data[0] > 0)
- sprite->pos2.x += sprite->data[1] >> 4;
+ sprite->x2 += sprite->data[1] >> 4;
else
- sprite->pos2.x -= sprite->data[1] >> 4;
+ sprite->x2 -= sprite->data[1] >> 4;
sprite->data[1] &= 0xF;
}
@@ -1826,18 +1826,18 @@ static void SpriteCB_StatusSummaryBallsOnBattleStart(struct Sprite *sprite)
if (var1 != 0)
{
- sprite->pos2.x += var2 >> 4;
- if (sprite->pos2.x > 0)
- sprite->pos2.x = 0;
+ sprite->x2 += var2 >> 4;
+ if (sprite->x2 > 0)
+ sprite->x2 = 0;
}
else
{
- sprite->pos2.x -= var2 >> 4;
- if (sprite->pos2.x < 0)
- sprite->pos2.x = 0;
+ sprite->x2 -= var2 >> 4;
+ if (sprite->x2 < 0)
+ sprite->x2 = 0;
}
- if (sprite->pos2.x == 0)
+ if (sprite->x2 == 0)
{
pan = SOUND_PAN_TARGET;
if (var1 != 0)
@@ -1867,11 +1867,11 @@ static void sub_8074158(struct Sprite *sprite)
var2 += 56;
sprite->data[3] = var2 & 0xFFF0;
if (var1 != 0)
- sprite->pos2.x += var2 >> 4;
+ sprite->x2 += var2 >> 4;
else
- sprite->pos2.x -= var2 >> 4;
- if (sprite->pos2.x + sprite->pos1.x > 248
- || sprite->pos2.x + sprite->pos1.x < -8)
+ sprite->x2 -= var2 >> 4;
+ if (sprite->x2 + sprite->x > 248
+ || sprite->x2 + sprite->x < -8)
{
sprite->invisible = TRUE;
sprite->callback = SpriteCallbackDummy;
@@ -1882,8 +1882,8 @@ static void SpriteCB_StatusSummaryBallsOnSwitchout(struct Sprite *sprite)
{
u8 barSpriteId = sprite->data[0];
- sprite->pos2.x = gSprites[barSpriteId].pos2.x;
- sprite->pos2.y = gSprites[barSpriteId].pos2.y;
+ sprite->x2 = gSprites[barSpriteId].x2;
+ sprite->y2 = gSprites[barSpriteId].y2;
}
static void UpdateNickInHealthbox(u8 healthboxSpriteId, struct Pokemon *mon)
@@ -1962,7 +1962,7 @@ static void TryAddPokeballIconToHealthbox(u8 healthboxSpriteId, bool8 noStatus)
healthBarSpriteId = gSprites[healthboxSpriteId].hMain_HealthBarSpriteId;
if (noStatus)
- CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_70), (void*)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 8) * TILE_SIZE_4BPP), 32);
+ CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_STATUS_BALL_CAUGHT), (void*)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 8) * TILE_SIZE_4BPP), 32);
else
CpuFill32(0, (void*)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 8) * TILE_SIZE_4BPP), 32);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 06:45:35 +0000