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

Convert party menu slots to bin files

Browse Source
This commit is contained in:
GriffinR 2022-02-15 16:04:51 -05:00
parent eb07617a20
commit 49eca60955
7 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
graphics/party_menu/slot_main.bin Executable file
View File

@ -0,0 +1 @@
 !!!!!!!!" !!!!!!!!" !!!!!!!!"(;<::::::=.////////0

1
graphics/party_menu/slot_main_egg.bin Executable file
View File

@ -0,0 +1 @@
 !!!!!!!!" !!!!!!!!" !!!!!!!!"())))))))*.////////0

1
graphics/party_menu/slot_wide.bin Executable file
View File

@ -0,0 +1 @@
+,,,,,,,,,,,,,,,,-1!!!!!!!!453333336788888888888888889

1
graphics/party_menu/slot_wide_egg.bin Executable file
View File

@ -0,0 +1 @@
+,,,,,,,,,,,,,,,,-1!!!!!!!!!!!!!!!!2788888888888888889

BIN
graphics/party_menu/slot_wide_empty.bin Executable file
View File

Binary file not shown.

36
src/data/party_menu.h
View File

@ -571,34 +571,14 @@ static const struct WindowTemplate sUnusedWindowTemplate2 =
.baseBlock = 0x39D, .baseBlock = 0x39D,
}; };
// Tile nums // Plain tilemaps for party menu slots.
static const u8 sMainSlotTileNums[] = {24, 25, 25, 25, 25, 25, 25, 25, 25, 26, // The difference between the egg and regular versions is the lack of an HP bar.
32, 33, 33, 33, 33, 33, 33, 33, 33, 34, // There is no empty version of the main slot because it shouldn't ever be empty.
32, 33, 33, 33, 33, 33, 33, 33, 33, 34, static const u8 sSlotTilemap_Main[] = INCBIN_U8("graphics/party_menu/slot_main.bin");
32, 33, 33, 33, 33, 33, 33, 33, 33, 34, static const u8 sSlotTilemap_MainEgg[] = INCBIN_U8("graphics/party_menu/slot_main_egg.bin");
40, 59, 60, 58, 58, 58, 58, 58, 58, 61, static const u8 sSlotTilemap_Wide[] = INCBIN_U8("graphics/party_menu/slot_wide.bin");
15, 16, 16, 16, 16, 16, 16, 16, 16, 17, static const u8 sSlotTilemap_WideEgg[] = INCBIN_U8("graphics/party_menu/slot_wide_egg.bin");
46, 47, 47, 47, 47, 47, 47, 47, 47, 48}; static const u8 sSlotTilemap_WideEmpty[] = INCBIN_U8("graphics/party_menu/slot_wide_empty.bin");
static const u8 sMainSlotTileNums_Egg[] = {24, 25, 25, 25, 25, 25, 25, 25, 25, 26,
32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
40, 41, 41, 41, 41, 41, 41, 41, 41, 42,
15, 16, 16, 16, 16, 16, 16, 16, 16, 17,
46, 47, 47, 47, 47, 47, 47, 47, 47, 48};
static const u8 sOtherSlotsTileNums[] = {43, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 45,
49, 33, 33, 33, 33, 33, 33, 33, 33, 52, 53, 51, 51, 51, 51, 51, 51, 54,
55, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 57};
static const u8 sOtherSlotsTileNums_Egg[] = {43, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 45,
49, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 50,
55, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 57};
static const u8 sEmptySlotTileNums[] = {21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23,
30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31,
37, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 39};
// Palette offsets // Palette offsets
static const u8 sGenderPalOffsets[] = {11, 12}; static const u8 sGenderPalOffsets[] = {11, 12};

10
src/party_menu.c
View File

@ -2094,9 +2094,9 @@ static void BlitBitmapToPartyWindow_LeftColumn(u8 windowId, u8 x, u8 y, u8 width
height = 7; height = 7;
} }
if (isEgg == FALSE) if (isEgg == FALSE)
BlitBitmapToPartyWindow(windowId, sMainSlotTileNums, 10, x, y, width, height); BlitBitmapToPartyWindow(windowId, sSlotTilemap_Main, 10, x, y, width, height);
else else
BlitBitmapToPartyWindow(windowId, sMainSlotTileNums_Egg, 10, x, y, width, height); BlitBitmapToPartyWindow(windowId, sSlotTilemap_MainEgg, 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, u8 isEgg)
@ -2107,14 +2107,14 @@ static void BlitBitmapToPartyWindow_RightColumn(u8 windowId, u8 x, u8 y, u8 widt
height = 3; height = 3;
} }
if (isEgg == FALSE) if (isEgg == FALSE)
BlitBitmapToPartyWindow(windowId, sOtherSlotsTileNums, 18, x, y, width, height); BlitBitmapToPartyWindow(windowId, sSlotTilemap_Wide, 18, x, y, width, height);
else else
BlitBitmapToPartyWindow(windowId, sOtherSlotsTileNums_Egg, 18, x, y, width, height); BlitBitmapToPartyWindow(windowId, sSlotTilemap_WideEgg, 18, x, y, width, height);
} }
static void DrawEmptySlot(u8 windowId) static void DrawEmptySlot(u8 windowId)
{ {
BlitBitmapToPartyWindow(windowId, sEmptySlotTileNums, 18, 0, 0, 18, 3); BlitBitmapToPartyWindow(windowId, sSlotTilemap_WideEmpty, 18, 0, 0, 18, 3);
} }
#define LOAD_PARTY_BOX_PAL(paletteIds, paletteOffsets) \ #define LOAD_PARTY_BOX_PAL(paletteIds, paletteOffsets) \