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.c302
1 files changed, 151 insertions, 151 deletions
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 78364e264..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,
@@ -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
@@ -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;
@@ -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:40:36 +0000