From 565dd243098013c8665bc7f95106e2b5657e4e82 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 11 Jan 2022 11:37:13 -0500 Subject: Move party menu graphics out of interface --- graphics/interface/party_menu_bg.bin | Bin 2048 -> 0 bytes graphics/interface/party_menu_bg.pal | 179 ----------------------- graphics/interface/party_menu_bg.png | Bin 613 -> 0 bytes graphics/interface/party_menu_cancel_button.bin | 2 - graphics/interface/party_menu_confirm_button.bin | 1 - graphics/interface/party_menu_hpbar.png | Bin 136 -> 0 bytes graphics/interface/party_menu_pokeball.png | Bin 330 -> 0 bytes graphics/interface/party_menu_pokeball_small.png | Bin 261 -> 0 bytes graphics/interface/unused_hpbar.png | Bin 0 -> 136 bytes graphics/party_menu/bg.bin | Bin 0 -> 2048 bytes graphics/party_menu/bg.pal | 179 +++++++++++++++++++++++ graphics/party_menu/bg.png | Bin 0 -> 613 bytes graphics/party_menu/cancel_button.bin | 2 + graphics/party_menu/confirm_button.bin | 1 + graphics/party_menu/pokeball.png | Bin 0 -> 330 bytes graphics/party_menu/pokeball_small.png | Bin 0 -> 261 bytes graphics_file_rules.mk | 2 +- src/data/party_menu.h | 32 ++-- src/graphics.c | 14 +- 19 files changed, 209 insertions(+), 203 deletions(-) delete mode 100644 graphics/interface/party_menu_bg.bin delete mode 100644 graphics/interface/party_menu_bg.pal delete mode 100644 graphics/interface/party_menu_bg.png delete mode 100644 graphics/interface/party_menu_cancel_button.bin delete mode 100644 graphics/interface/party_menu_confirm_button.bin delete mode 100644 graphics/interface/party_menu_hpbar.png delete mode 100644 graphics/interface/party_menu_pokeball.png delete mode 100644 graphics/interface/party_menu_pokeball_small.png create mode 100644 graphics/interface/unused_hpbar.png create mode 100644 graphics/party_menu/bg.bin create mode 100644 graphics/party_menu/bg.pal create mode 100644 graphics/party_menu/bg.png create mode 100644 graphics/party_menu/cancel_button.bin create mode 100644 graphics/party_menu/confirm_button.bin create mode 100644 graphics/party_menu/pokeball.png create mode 100644 graphics/party_menu/pokeball_small.png diff --git a/graphics/interface/party_menu_bg.bin b/graphics/interface/party_menu_bg.bin deleted file mode 100644 index d6ff1114d..000000000 Binary files a/graphics/interface/party_menu_bg.bin and /dev/null differ diff --git a/graphics/interface/party_menu_bg.pal b/graphics/interface/party_menu_bg.pal deleted file mode 100644 index 0b4b30f81..000000000 --- a/graphics/interface/party_menu_bg.pal +++ /dev/null @@ -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 -139 156 41 -205 213 123 -180 180 90 -82 65 74 -32 16 24 -255 0 255 -255 0 255 -255 255 255 -230 238 139 -98 90 0 -255 0 255 -255 0 255 -115 90 180 -139 148 123 -255 115 49 -65 156 148 -139 156 41 -205 213 123 -180 180 90 -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 diff --git a/graphics/interface/party_menu_bg.png b/graphics/interface/party_menu_bg.png deleted file mode 100644 index c58f3aae9..000000000 Binary files a/graphics/interface/party_menu_bg.png and /dev/null differ diff --git a/graphics/interface/party_menu_cancel_button.bin b/graphics/interface/party_menu_cancel_button.bin deleted file mode 100644 index 7f11aaf4e..000000000 --- a/graphics/interface/party_menu_cancel_button.bin +++ /dev/null @@ -1,2 +0,0 @@ - -            \ No newline at end of file diff --git a/graphics/interface/party_menu_confirm_button.bin b/graphics/interface/party_menu_confirm_button.bin deleted file mode 100644 index 8c3c1be3d..000000000 --- a/graphics/interface/party_menu_confirm_button.bin +++ /dev/null @@ -1 +0,0 @@ -#$ \ No newline at end of file diff --git a/graphics/interface/party_menu_hpbar.png b/graphics/interface/party_menu_hpbar.png deleted file mode 100644 index 763b91210..000000000 Binary files a/graphics/interface/party_menu_hpbar.png and /dev/null differ diff --git a/graphics/interface/party_menu_pokeball.png b/graphics/interface/party_menu_pokeball.png deleted file mode 100644 index 2aad54de8..000000000 Binary files a/graphics/interface/party_menu_pokeball.png and /dev/null differ diff --git a/graphics/interface/party_menu_pokeball_small.png b/graphics/interface/party_menu_pokeball_small.png deleted file mode 100644 index d2eec4d45..000000000 Binary files a/graphics/interface/party_menu_pokeball_small.png and /dev/null differ diff --git a/graphics/interface/unused_hpbar.png b/graphics/interface/unused_hpbar.png new file mode 100644 index 000000000..763b91210 Binary files /dev/null and b/graphics/interface/unused_hpbar.png differ diff --git a/graphics/party_menu/bg.bin b/graphics/party_menu/bg.bin new file mode 100644 index 000000000..d6ff1114d Binary files /dev/null and b/graphics/party_menu/bg.bin differ diff --git a/graphics/party_menu/bg.pal b/graphics/party_menu/bg.pal new file mode 100644 index 000000000..0b4b30f81 --- /dev/null +++ b/graphics/party_menu/bg.pal @@ -0,0 +1,179 @@ +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 +139 156 41 +205 213 123 +180 180 90 +82 65 74 +32 16 24 +255 0 255 +255 0 255 +255 255 255 +230 238 139 +98 90 0 +255 0 255 +255 0 255 +115 90 180 +139 148 123 +255 115 49 +65 156 148 +139 156 41 +205 213 123 +180 180 90 +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 diff --git a/graphics/party_menu/bg.png b/graphics/party_menu/bg.png new file mode 100644 index 000000000..c58f3aae9 Binary files /dev/null and b/graphics/party_menu/bg.png differ diff --git a/graphics/party_menu/cancel_button.bin b/graphics/party_menu/cancel_button.bin new file mode 100644 index 000000000..7f11aaf4e --- /dev/null +++ b/graphics/party_menu/cancel_button.bin @@ -0,0 +1,2 @@ + +            \ No newline at end of file diff --git a/graphics/party_menu/confirm_button.bin b/graphics/party_menu/confirm_button.bin new file mode 100644 index 000000000..8c3c1be3d --- /dev/null +++ b/graphics/party_menu/confirm_button.bin @@ -0,0 +1 @@ +#$ \ No newline at end of file diff --git a/graphics/party_menu/pokeball.png b/graphics/party_menu/pokeball.png new file mode 100644 index 000000000..2aad54de8 Binary files /dev/null and b/graphics/party_menu/pokeball.png differ diff --git a/graphics/party_menu/pokeball_small.png b/graphics/party_menu/pokeball_small.png new file mode 100644 index 000000000..d2eec4d45 Binary files /dev/null and b/graphics/party_menu/pokeball_small.png differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 7a37c5e4f..3b4bbeabf 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -429,7 +429,7 @@ $(MASKSGFXDIR)/unused_level_up.4bpp: %.4bpp: %.png $(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 16 -$(INTERFACEGFXDIR)/party_menu_bg.4bpp: %.4bpp: %.png +graphics/party_menu/bg.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 62 $(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp) diff --git a/src/data/party_menu.h b/src/data/party_menu.h index f3a8a50ec..f8321298c 100644 --- a/src/data/party_menu.h +++ b/src/data/party_menu.h @@ -1,3 +1,9 @@ +enum { + TAG_POKEBALL = 1200, + TAG_POKEBALL_SMALL, + TAG_STATUS_ICONS, +}; + static const struct BgTemplate sPartyMenuBgTemplates[] = { { @@ -112,8 +118,8 @@ static const u8 sPartyMenuSpriteCoords[PARTY_LAYOUT_COUNT][PARTY_SIZE][4 * 2] = }; // Used only when both Cancel and Confirm are present -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"); // Text colors for BG, FG, and Shadow in that order static const u8 sFontColorTable[][3] = @@ -969,19 +975,19 @@ static const union AnimCmd *const sSpriteAnimTable_MenuPokeball[] = static const struct CompressedSpriteSheet sSpriteSheet_MenuPokeball = { - gPartyMenuPokeball_Gfx, 0x400, 0x04b0 + gPartyMenuPokeball_Gfx, 0x400, TAG_POKEBALL }; static const struct CompressedSpritePalette sSpritePalette_MenuPokeball = { - gPartyMenuPokeball_Pal, 0x04b0 + gPartyMenuPokeball_Pal, TAG_POKEBALL }; // Used for the pokeball sprite on each party slot / Cancel button static const struct SpriteTemplate sSpriteTemplate_MenuPokeball = { - .tileTag = 0x04b0, - .paletteTag = 0x04b0, + .tileTag = TAG_POKEBALL, + .paletteTag = TAG_POKEBALL, .oam = &sOamData_MenuPokeball, .anims = sSpriteAnimTable_MenuPokeball, .images = NULL, @@ -1055,14 +1061,14 @@ static const union AnimCmd *const sSpriteAnimTable_MenuPokeballSmall[] = static const struct CompressedSpriteSheet sSpriteSheet_MenuPokeballSmall = { - gPartyMenuPokeballSmall_Gfx, 0x0300, 0x04b1 + gPartyMenuPokeballSmall_Gfx, 0x0300, TAG_POKEBALL_SMALL }; // Used for the pokeball sprite next to Cancel and Confirm when both are present, otherwise sSpriteTemplate_MenuPokeball is used static const struct SpriteTemplate sSpriteTemplate_MenuPokeballSmall = { - .tileTag = 1201, - .paletteTag = 1200, + .tileTag = TAG_POKEBALL_SMALL, + .paletteTag = TAG_POKEBALL, .oam = &sOamData_MenuPokeballSmall, .anims = sSpriteAnimTable_MenuPokeballSmall, .images = NULL, @@ -1149,18 +1155,18 @@ static const union AnimCmd *const sSpriteTemplate_StatusCondition[] = static const struct CompressedSpriteSheet sSpriteSheet_StatusIcons = { - gStatusGfx_Icons, 0x400, 1202 + gStatusGfx_Icons, 0x400, TAG_STATUS_ICONS }; static const struct CompressedSpritePalette sSpritePalette_StatusIcons = { - gStatusPal_Icons, 1202 + gStatusPal_Icons, TAG_STATUS_ICONS }; static const struct SpriteTemplate sSpriteTemplate_StatusIcons = { - .tileTag = 1202, - .paletteTag = 1202, + .tileTag = TAG_STATUS_ICONS, + .paletteTag = TAG_STATUS_ICONS, .oam = &sOamData_StatusCondition, .anims = sSpriteTemplate_StatusCondition, .images = NULL, diff --git a/src/graphics.c b/src/graphics.c index 51e585489..fda9a3fd5 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -147,7 +147,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/unused_hpbar.4bpp.lz"); const u32 gBattleAnimSpriteGfx_BubbleBurst2[] = INCBIN_U32("graphics/battle_anims/sprites/bubble_burst_2.4bpp.lz"); @@ -1112,13 +1112,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_bg.4bpp.lz"); -const u32 gPartyMenuBg_Pal[] = INCBIN_U32("graphics/interface/party_menu_bg.gbapal.lz"); -const u32 gPartyMenuBg_Tilemap[] = INCBIN_U32("graphics/interface/party_menu_bg.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"); -- cgit v1.2.3