ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Generalize name of party slot without HP

Browse Source
This commit is contained in:
GriffinR 2022-02-15 16:24:19 -05:00
parent 49eca60955
commit 131ed1916e
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
graphics/party_menu/slot_main_egg.bin → graphics/party_menu/slot_main_no_hp.bin
View File

0
graphics/party_menu/slot_wide_egg.bin → graphics/party_menu/slot_wide_no_hp.bin
View File

6
src/data/party_menu.h
View File

@ -572,12 +572,12 @@ static const struct WindowTemplate sUnusedWindowTemplate2 =
}; };
// Plain tilemaps for party menu slots. // Plain tilemaps for party menu slots.
// The difference between the egg and regular versions is the lack of an HP bar. // The versions with no HP bar are used by eggs, and in certain displays like registering at a battle facility.
// There is no empty version of the main slot because it shouldn't ever be empty. // There is no empty version of the main slot because it shouldn't ever be empty.
static const u8 sSlotTilemap_Main[] = INCBIN_U8("graphics/party_menu/slot_main.bin"); static const u8 sSlotTilemap_Main[] = INCBIN_U8("graphics/party_menu/slot_main.bin");
static const u8 sSlotTilemap_MainEgg[] = INCBIN_U8("graphics/party_menu/slot_main_egg.bin"); static const u8 sSlotTilemap_MainNoHP[] = INCBIN_U8("graphics/party_menu/slot_main_no_hp.bin");
static const u8 sSlotTilemap_Wide[] = INCBIN_U8("graphics/party_menu/slot_wide.bin"); static const u8 sSlotTilemap_Wide[] = INCBIN_U8("graphics/party_menu/slot_wide.bin");
static const u8 sSlotTilemap_WideEgg[] = INCBIN_U8("graphics/party_menu/slot_wide_egg.bin"); static const u8 sSlotTilemap_WideNoHP[] = INCBIN_U8("graphics/party_menu/slot_wide_no_hp.bin");
static const u8 sSlotTilemap_WideEmpty[] = INCBIN_U8("graphics/party_menu/slot_wide_empty.bin"); static const u8 sSlotTilemap_WideEmpty[] = INCBIN_U8("graphics/party_menu/slot_wide_empty.bin");
// Palette offsets // Palette offsets

18
src/party_menu.c
View File

@ -97,7 +97,7 @@ enum
struct PartyMenuBoxInfoRects struct PartyMenuBoxInfoRects
{ {
void (*blitFunc)(u8, u8, u8, u8, u8, u8); void (*blitFunc)(u8, u8, u8, u8, u8, bool8);
u8 dimensions[24]; u8 dimensions[24];
u8 descTextLeft; u8 descTextLeft;
u8 descTextTop; u8 descTextTop;
@ -377,8 +377,8 @@ static void Task_ChooseMonForMoveRelearner(u8);
static void CB2_ChooseMonForMoveRelearner(void); static void CB2_ChooseMonForMoveRelearner(void);
static void Task_BattlePyramidChooseMonHeldItems(u8); static void Task_BattlePyramidChooseMonHeldItems(u8);
static void ShiftMoveSlot(struct Pokemon*, u8, u8); static void ShiftMoveSlot(struct Pokemon*, u8, u8);
static void BlitBitmapToPartyWindow_LeftColumn(u8, u8, u8, u8, u8, u8); static void BlitBitmapToPartyWindow_LeftColumn(u8, u8, u8, u8, u8, bool8);
static void BlitBitmapToPartyWindow_RightColumn(u8, u8, u8, u8, u8, u8); static void BlitBitmapToPartyWindow_RightColumn(u8, u8, u8, u8, u8, bool8);
static void CursorCb_Summary(u8); static void CursorCb_Summary(u8);
static void CursorCb_Switch(u8); static void CursorCb_Switch(u8);
static void CursorCb_Cancel1(u8); static void CursorCb_Cancel1(u8);
@ -2086,30 +2086,30 @@ static void BlitBitmapToPartyWindow(u8 windowId, const u8 *b, u8 c, u8 x, u8 y,
} }
} }
static void BlitBitmapToPartyWindow_LeftColumn(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 isEgg) static void BlitBitmapToPartyWindow_LeftColumn(u8 windowId, u8 x, u8 y, u8 width, u8 height, bool8 hideHP)
{ {
if (width == 0 && height == 0) if (width == 0 && height == 0)
{ {
width = 10; width = 10;
height = 7; height = 7;
} }
if (isEgg == FALSE) if (hideHP == FALSE)
BlitBitmapToPartyWindow(windowId, sSlotTilemap_Main, 10, x, y, width, height); BlitBitmapToPartyWindow(windowId, sSlotTilemap_Main, 10, x, y, width, height);
else else
BlitBitmapToPartyWindow(windowId, sSlotTilemap_MainEgg, 10, x, y, width, height); BlitBitmapToPartyWindow(windowId, sSlotTilemap_MainNoHP, 10, x, y, width, height);
} }
static void BlitBitmapToPartyWindow_RightColumn(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 isEgg) static void BlitBitmapToPartyWindow_RightColumn(u8 windowId, u8 x, u8 y, u8 width, u8 height, bool8 hideHP)
{ {
if (width == 0 && height == 0) if (width == 0 && height == 0)
{ {
width = 18; width = 18;
height = 3; height = 3;
} }
if (isEgg == FALSE) if (hideHP == FALSE)
BlitBitmapToPartyWindow(windowId, sSlotTilemap_Wide, 18, x, y, width, height); BlitBitmapToPartyWindow(windowId, sSlotTilemap_Wide, 18, x, y, width, height);
else else
BlitBitmapToPartyWindow(windowId, sSlotTilemap_WideEgg, 18, x, y, width, height); BlitBitmapToPartyWindow(windowId, sSlotTilemap_WideNoHP, 18, x, y, width, height);
} }
static void DrawEmptySlot(u8 windowId) static void DrawEmptySlot(u8 windowId)