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

Merge pull request #605 from GriffinRichards/partymenugfx

Browse Source 
Clean up party menu graphics
This commit is contained in:
GriffinR
2023-02-15 10:06:07 -05:00
committed by GitHub
parent f54a3966aa cc776ab95f
commit 114c6bc3fc
19 changed files with 37 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/interface/party_menu_hpbar.png → graphics/interface/hpbar_unused.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 136 B

After

Width:  |  Height:  |  Size: 136 B

graphics/interface/party_menu_misc.pal
-179
View File
@@ -1,179 +0,0 @@
JASC-PAL
0100
176
123 156 115
255 255 255
106 106 106
0 0 0
65 205 255
0 139 189
49 189 238
255 156 148
189 90 82
222 123 115
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
139 148 123
74 74 98
65 156 148
32 106 98
74 172 164
57 139 139
82 65 74
32 16 24
255 0 255
255 0 255
255 255 255
123 205 180
57 148 123
255 0 255
255 0 255
115 90 180
139 148 123
255 115 49
65 156 148
32 106 98
74 172 164
57 139 139
82 65 74
82 82 90
255 0 255
255 0 255
255 255 255
123 205 180
57 148 123
255 0 255
255 0 255
164 115 246
123 156 115
74 74 98
115 115 115
255 255 255
131 197 222
57 148 222
41 123 180
131 197 222
41 123 180
115 255 172
90 213 131
65 205 255
0 98 148
82 82 82
255 213 82
255 180 65
123 156 115
74 74 98
115 115 115
255 255 255
213 197 90
197 164 24
156 156 32
213 197 90
156 156 32
255 230 57
205 172 8
255 156 148
156 65 57
82 82 82
255 213 82
255 180 65
123 156 115
74 74 98
115 115 115
255 255 255
213 164 32
197 106 16
164 74 0
213 164 32
164 74 0
255 115 49
197 57 0
255 0 255
255 0 255
82 82 82
255 213 82
255 180 65
123 156 115
255 115 49
115 115 115
255 255 255
180 255 164
123 222 131
123 156 98
255 115 49
255 115 49
255 0 255
255 0 255
255 0 255
255 0 255
82 82 82
255 213 82
255 180 65
57 156 255
255 115 49
115 115 115
255 255 255
172 238 255
123 213 238
74 172 205
255 115 49
255 115 49
255 0 255
255 0 255
255 0 255
255 0 255
82 82 82
255 213 82
255 180 65
57 156 255
255 115 49
115 115 115
255 255 255
246 246 148
246 230 98
222 197 32
255 115 49
255 115 49
255 0 255
255 0 255
255 0 255
255 0 255
82 82 82
255 213 82
255 180 65
57 156 255
255 115 49
115 115 115
255 255 255
255 213 222
255 189 148
238 164 131
255 115 49
255 115 49
255 0 255
255 0 255
255 0 255
255 0 255
82 82 82
255 213 82
255 180 65
57 156 255
255 255 115
115 115 115
255 255 255
180 255 164
123 222 131
131 172 106
255 255 115
255 255 115
255 0 255
255 0 255
255 0 255
255 0 255
82 82 82
255 213 82
255 180 65
graphics/interface/party_menu_misc.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 613 B

graphics/interface/party_menu_misc.bin → graphics/party_menu/bg.bin
View File
graphics/party_menu/bg.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

graphics/interface/party_menu_cancel_button.bin → graphics/party_menu/cancel_button.bin
View File
graphics/interface/party_menu_confirm_button.bin → graphics/party_menu/confirm_button.bin
View File
graphics/interface/hold_icons.png → graphics/party_menu/hold_icons.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 177 B

After

Width:  |  Height:  |  Size: 177 B

graphics/interface/party_menu_pokeball.png → graphics/party_menu/pokeball.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 330 B

After

Width:  |  Height:  |  Size: 330 B

graphics/interface/party_menu_pokeball_small.png → graphics/party_menu/pokeball_small.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 261 B

After

Width:  |  Height:  |  Size: 261 B

graphics/party_menu/slot_main.bin
Executable
+1
View File
@@ -0,0 +1 @@
 !!!!!!!!" !!!!!!!!" !!!!!!!!"(;<::::::=.////////0
graphics/party_menu/slot_main_no_hp.bin
Executable
+1
View File
@@ -0,0 +1 @@
 !!!!!!!!" !!!!!!!!" !!!!!!!!"())))))))*.////////0
graphics/party_menu/slot_wide.bin
Executable
+1
View File
@@ -0,0 +1 @@
+,,,,,,,,,,,,,,,,-1!!!!!!!!453333336788888888888888889
graphics/party_menu/slot_wide_empty.bin
Executable
BIN
View File
Binary file not shown.
graphics/party_menu/slot_wide_no_hp.bin
Executable
+1
View File
@@ -0,0 +1 @@
+,,,,,,,,,,,,,,,,-1!!!!!!!!!!!!!!!!2788888888888888889
graphics_file_rules.mk
+2 -1
View File
@@ -2,6 +2,7 @@ TILESETGFXDIR := data/tilesets
FONTGFXDIR := graphics/fonts
FAMECHECKERGFXDIR := graphics/fame_checker
INTERFACEGFXDIR := graphics/interface
PARTYMENUGFXDIR := graphics/party_menu
BTLANMSPRGFXDIR := graphics/battle_anims/sprites
UNUSEDGFXDIR := graphics/unused
UNKNOWNGFXDIR := graphics/unknown
@@ -198,7 +199,7 @@ $(MASKSGFXDIR)/unknown_D2EC24.4bpp: %.4bpp: %.png
$(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 16 -Wnum_tiles
$(INTERFACEGFXDIR)/party_menu_misc.4bpp: %.4bpp: %.png
$(PARTYMENUGFXDIR)/bg.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 62 -Wnum_tiles
$(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp)
src/data/party_menu.h
+12 -46
View File
@@ -108,8 +108,8 @@ static const u8 sPartyMenuSpriteCoords[PARTY_LAYOUT_COUNT][PARTY_SIZE][4 * 2] =
},
};
static const u32 sConfirmButton_Tilemap[] = INCBIN_U32("graphics/interface/party_menu_confirm_button.bin");
static const u32 sCancelButton_Tilemap[] = INCBIN_U32("graphics/interface/party_menu_cancel_button.bin");
static const u32 sConfirmButton_Tilemap[] = INCBIN_U32("graphics/party_menu/confirm_button.bin");
static const u32 sCancelButton_Tilemap[] = INCBIN_U32("graphics/party_menu/cancel_button.bin");
static const u8 sFontColorTable[][3] =
{
@@ -549,48 +549,14 @@ static const struct WindowTemplate sFieldMoveDescriptionWindowTemplate =
.baseBlock = 0x373,
};
static const u8 sMainSlotTileNums[] =
{
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, 59, 60, 58, 58, 58, 58, 58, 58, 61,
15, 16, 16, 16, 16, 16, 16, 16, 16, 17,
46, 47, 47, 47, 47, 47, 47, 47, 47, 48,
};
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,
};
// Plain tilemaps for party menu slots.
// 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.
static const u8 sSlotTilemap_Main[] = INCBIN_U8("graphics/party_menu/slot_main.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_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 sGenderPalOffsets[] = {11, 12};
@@ -695,8 +661,8 @@ static const u8 *const sFieldMoveDescriptionTable[] =
[FIELD_MOVE_SWEET_SCENT] = gText_LureWildPokemon,
};
static const u32 sHeldItemGfx[] = INCBIN_U32("graphics/interface/hold_icons.4bpp");
static const u16 sHeldItemPalette[] = INCBIN_U16("graphics/interface/hold_icons.gbapal");
static const u32 sHeldItemGfx[] = INCBIN_U32("graphics/party_menu/hold_icons.4bpp");
static const u16 sHeldItemPalette[] = INCBIN_U16("graphics/party_menu/hold_icons.gbapal");
static const struct OamData sOamData_HeldItem =
{
src/graphics.c
+7 -7
View File
@@ -148,7 +148,7 @@ const u32 gBattleAnimSpriteGfx_ClawSlash[] = INCBIN_U32("graphics/battle_anims/s
const u32 gBattleAnimSpriteGfx_Scratch3[] = INCBIN_U32("graphics/battle_anims/sprites/scratch_3.4bpp.lz");
const u32 gBattleAnimSpriteGfx_Scratch2[] = INCBIN_U32("graphics/battle_anims/sprites/scratch_2.4bpp.lz");
const u32 gPartyMenuHpBar_Gfx[] = INCBIN_U32("graphics/interface/party_menu_hpbar.4bpp.lz");
const u32 gUnusedHpBar_Gfx[] = INCBIN_U32("graphics/interface/hpbar_unused.4bpp.lz");
const u32 gBattleAnimSpriteGfx_BubbleBurst2[] = INCBIN_U32("graphics/battle_anims/sprites/bubble_burst_2.4bpp.lz");
@@ -1074,13 +1074,13 @@ const u32 gBattleAnimSpritePal_Slash2[] = INCBIN_U32("graphics/battle_anims/spri
const u32 gBattleAnimSpriteGfx_WhiteShadow[] = INCBIN_U32("graphics/battle_anims/sprites/white_shadow.4bpp.lz");
const u32 gBattleAnimSpritePal_WhiteShadow[] = INCBIN_U32("graphics/battle_anims/sprites/white_shadow.gbapal.lz");
const u32 gPartyMenuBg_Gfx[] = INCBIN_U32("graphics/interface/party_menu_misc.4bpp.lz");
const u32 gPartyMenuBg_Pal[] = INCBIN_U32("graphics/interface/party_menu_misc.gbapal.lz");
const u32 gPartyMenuBg_Tilemap[] = INCBIN_U32("graphics/interface/party_menu_misc.bin.lz");
const u32 gPartyMenuBg_Gfx[] = INCBIN_U32("graphics/party_menu/bg.4bpp.lz");
const u32 gPartyMenuBg_Pal[] = INCBIN_U32("graphics/party_menu/bg.gbapal.lz");
const u32 gPartyMenuBg_Tilemap[] = INCBIN_U32("graphics/party_menu/bg.bin.lz");
const u32 gPartyMenuPokeball_Gfx[] = INCBIN_U32("graphics/interface/party_menu_pokeball.4bpp.lz");
const u32 gPartyMenuPokeballSmall_Gfx[] = INCBIN_U32("graphics/interface/party_menu_pokeball_small.4bpp.lz"); //unused
const u32 gPartyMenuPokeball_Pal[] = INCBIN_U32("graphics/interface/party_menu_pokeball.gbapal.lz");
const u32 gPartyMenuPokeball_Gfx[] = INCBIN_U32("graphics/party_menu/pokeball.4bpp.lz");
const u32 gPartyMenuPokeballSmall_Gfx[] = INCBIN_U32("graphics/party_menu/pokeball_small.4bpp.lz"); //unused
const u32 gPartyMenuPokeball_Pal[] = INCBIN_U32("graphics/party_menu/pokeball.gbapal.lz");
const u32 gStatusGfx_Icons[] = INCBIN_U32("graphics/interface/status_icons.4bpp.lz");
const u32 gStatusPal_Icons[] = INCBIN_U32("graphics/interface/status_icons.gbapal.lz");
src/party_menu.c
+12 -12
View File
@@ -110,7 +110,7 @@ enum
struct PartyMenuBoxInfoRects
{
void (*blitFunc)(u8 windowId, u8 x, u8 y, u8 width, u8 height, bool8 isEgg);
void (*blitFunc)(u8 windowId, u8 x, u8 y, u8 width, u8 height, bool8 hideHP);
u8 dimensions[24];
u8 descTextLeft;
u8 descTextTop;
@@ -145,8 +145,8 @@ struct PartyMenuBox
u8 statusSpriteId;
};
static void BlitBitmapToPartyWindow_LeftColumn(u8 windowId, u8 x, u8 y, u8 width, u8 height, bool8 isEgg);
static void BlitBitmapToPartyWindow_RightColumn(u8 windowId, u8 x, u8 y, u8 width, u8 height, bool8 isEgg);
static void BlitBitmapToPartyWindow_LeftColumn(u8 windowId, u8 x, u8 y, u8 width, u8 height, bool8 hideHP);
static void BlitBitmapToPartyWindow_RightColumn(u8 windowId, u8 x, u8 y, u8 width, u8 height, bool8 hideHP);
static void CursorCB_Summary(u8 taskId);
static void CursorCB_Switch(u8 taskId);
static void CursorCB_Cancel1(u8 taskId);
@@ -2184,35 +2184,35 @@ static void BlitBitmapToPartyWindow(u8 windowId, const u8 *tileNums, u8 menuBoxW
}
}
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)
{
width = 10;
height = 7;
}
if (!isEgg)
BlitBitmapToPartyWindow(windowId, sMainSlotTileNums, 10, x, y, width, height);
if (!hideHP)
BlitBitmapToPartyWindow(windowId, sSlotTilemap_Main, 10, x, y, width, height);
else
BlitBitmapToPartyWindow(windowId, sMainSlotTileNums_Egg, 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)
{
width = 18;
height = 3;
}
if (!isEgg)
BlitBitmapToPartyWindow(windowId, sOtherSlotsTileNums, 18, x, y, width, height);
if (!hideHP)
BlitBitmapToPartyWindow(windowId, sSlotTilemap_Wide, 18, x, y, width, height);
else
BlitBitmapToPartyWindow(windowId, sOtherSlotsTileNums_Egg, 18, x, y, width, height);
BlitBitmapToPartyWindow(windowId, sSlotTilemap_WideNoHP, 18, x, y, width, height);
}
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) \